diff --git a/sdk/nodejs1/examples/pastebin/src/index.ts b/sdk/nodejs1/examples/pastebin/src/index.ts index 1122142d..162ef84d 100644 --- a/sdk/nodejs1/examples/pastebin/src/index.ts +++ b/sdk/nodejs1/examples/pastebin/src/index.ts @@ -6,7 +6,7 @@ import { init, listener, loadRoot, - PRIVATE_SHARE_MODE, setLogLevel, + PRIVATE_SHARE_MODE, ShareRequest, TCP_TUNNEL_BACKEND_MODE, write @@ -24,14 +24,14 @@ const copyto = async () => { return process.exit(1); }); let shr = await createShare(root, new ShareRequest(PRIVATE_SHARE_MODE, TCP_TUNNEL_BACKEND_MODE, "copyto")); - console.log("connect with 'copyto " + shr.shareToken + "'"); - listener(shr, {clientConnectCallback: (data: any) => { - console.log("data", data); - write(data.client, text) ; - }}); + + console.log("connect with 'pastefrom " + shr.shareToken + "'"); + + listener(shr, (data: any) => { + write(data.client, new TextEncoder().encode(text + "\n")); + }); process.on("SIGINT", async () => { - console.log("cleaning up"); deleteShare(root, shr); }); } diff --git a/sdk/nodejs1/sdk/src/zrok/ziti.ts b/sdk/nodejs1/sdk/src/zrok/ziti.ts index 1971b8be..e729a0af 100644 --- a/sdk/nodejs1/sdk/src/zrok/ziti.ts +++ b/sdk/nodejs1/sdk/src/zrok/ziti.ts @@ -12,17 +12,10 @@ export const setLogLevel = (level: number) => { } export const listener = (shr: Share, - callbacks?: { - listenCallback?: any, - listenClientCallback?: any, - clientConnectCallback: any, - clientDataCallback?: any - }): ziti.listener => { - let listenCallback = callbacks?.listenCallback ? callbacks.listenClientCallback : (data: any) => {}; - let listenClientCallback = callbacks?.listenClientCallback ? callbacks.listenClientCallback : (data: any) => {}; - let clientConnectCallback = callbacks?.clientConnectCallback ? callbacks.clientConnectCallback : (data: any) => {}; - let clientDataCallback = callbacks?.clientDataCallback ? callbacks.clientDataCallback : (data: any) => {}; - console.log("client connect callback", clientConnectCallback); + clientConnectCallback: any, + clientDataCallback: any = (data: any) => {}, + listenCallback: any = (data: any) => {}, + listenClientCallback: any = (data: any) => {}): ziti.listener => { ziti.listen(shr.shareToken, 0, listenCallback, listenClientCallback, clientConnectCallback, clientDataCallback); }