diff --git a/sdk/nodejs1/.gitignore b/sdk/nodejs1/.gitignore new file mode 100644 index 00000000..dc159140 --- /dev/null +++ b/sdk/nodejs1/.gitignore @@ -0,0 +1,2 @@ +sdk/node_modules +dist diff --git a/sdk/nodejs1/examples/http-server/src/index.ts b/sdk/nodejs1/examples/http-server/src/index.ts index c8d5367c..1c102c7c 100644 --- a/sdk/nodejs1/examples/http-server/src/index.ts +++ b/sdk/nodejs1/examples/http-server/src/index.ts @@ -1,7 +1,14 @@ import {Command} from "commander"; -import {loadRoot} from "@openziti/zrok/dist/environment"; -import {express, init} from "@openziti/zrok/dist/express"; -import {createShare, deleteShare, PROXY_BACKEND_MODE, PUBLIC_SHARE_MODE, ShareRequest} from "@openziti/zrok/dist/share"; +import { + createShare, + deleteShare, + express, + init, + loadRoot, + PROXY_BACKEND_MODE, + PUBLIC_SHARE_MODE, + ShareRequest +} from "@openziti/zrok"; const program = new Command(); @@ -19,6 +26,7 @@ program let req = new ShareRequest(PUBLIC_SHARE_MODE, PROXY_BACKEND_MODE, "http-server"); req.frontends = ["public"]; let shr = await createShare(root, req); + let app = express(shr); app.get("/", (r: Request, res: any) => { res.write("hello, world!"); diff --git a/sdk/nodejs1/examples/share/src/index.ts b/sdk/nodejs1/examples/share/src/index.ts index cf76d714..b81c0d84 100644 --- a/sdk/nodejs1/examples/share/src/index.ts +++ b/sdk/nodejs1/examples/share/src/index.ts @@ -1,7 +1,5 @@ import {Command} from "commander"; -import {loadRoot} from "@openziti/zrok/dist/environment"; -import {createShare, deleteShare, PROXY_BACKEND_MODE, PUBLIC_SHARE_MODE, ShareRequest} from "@openziti/zrok/dist/share"; - +import {createShare, deleteShare, loadRoot, PROXY_BACKEND_MODE, PUBLIC_SHARE_MODE, ShareRequest} from "@openziti/zrok"; const program = new Command(); @@ -22,7 +20,6 @@ program .catch(ex => { console.log("exception", ex); }); - }); program.parse(process.argv); \ No newline at end of file diff --git a/sdk/nodejs1/sdk/.gitignore b/sdk/nodejs1/sdk/.gitignore deleted file mode 100644 index f06235c4..00000000 --- a/sdk/nodejs1/sdk/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -node_modules -dist diff --git a/sdk/nodejs1/sdk/src/index.ts b/sdk/nodejs1/sdk/src/index.ts new file mode 100644 index 00000000..086c2b0c --- /dev/null +++ b/sdk/nodejs1/sdk/src/index.ts @@ -0,0 +1,3 @@ +export * from "./zrok/environment"; +export * from "./zrok/express"; +export * from "./zrok/share"; \ No newline at end of file diff --git a/sdk/nodejs1/sdk/src/environment.ts b/sdk/nodejs1/sdk/src/zrok/environment.ts similarity index 98% rename from sdk/nodejs1/sdk/src/environment.ts rename to sdk/nodejs1/sdk/src/zrok/environment.ts index 8bf83bf4..98af9dce 100644 --- a/sdk/nodejs1/sdk/src/environment.ts +++ b/sdk/nodejs1/sdk/src/zrok/environment.ts @@ -1,6 +1,6 @@ import {environmentFile, identityFile, metadataFile} from "./paths"; import * as fs from "node:fs"; -import {Configuration} from "./api"; +import {Configuration} from "../api"; const ENVIRONMENT_V = "v0.4"; diff --git a/sdk/nodejs1/sdk/src/express.ts b/sdk/nodejs1/sdk/src/zrok/express.ts similarity index 92% rename from sdk/nodejs1/sdk/src/express.ts rename to sdk/nodejs1/sdk/src/zrok/express.ts index 6d738408..7bebdcb5 100644 --- a/sdk/nodejs1/sdk/src/express.ts +++ b/sdk/nodejs1/sdk/src/zrok/express.ts @@ -1,4 +1,4 @@ -import {Share} from "./api"; +import {Share} from "../api"; import Express from "express"; // @ts-ignore import ziti from "@openziti/ziti-sdk-nodejs"; diff --git a/sdk/nodejs1/sdk/src/paths.ts b/sdk/nodejs1/sdk/src/zrok/paths.ts similarity index 100% rename from sdk/nodejs1/sdk/src/paths.ts rename to sdk/nodejs1/sdk/src/zrok/paths.ts diff --git a/sdk/nodejs1/sdk/src/share.ts b/sdk/nodejs1/sdk/src/zrok/share.ts similarity index 99% rename from sdk/nodejs1/sdk/src/share.ts rename to sdk/nodejs1/sdk/src/zrok/share.ts index 74f1f592..9e3efd53 100644 --- a/sdk/nodejs1/sdk/src/share.ts +++ b/sdk/nodejs1/sdk/src/zrok/share.ts @@ -5,7 +5,7 @@ import { ShareRequestBackendModeEnum, ShareRequestShareModeEnum, UnshareRequest -} from "./api"; +} from "../api"; export type ShareMode = string; export const PRIVATE_SHARE_MODE: ShareMode = "private";