socket-function 0.8.40 → 0.9.1

package/test/server.ts

@@ -1,43 +1,43 @@
-// import debugbreak from "debugbreak";
-// debugbreak(1);
-// debugger;
-
-import { RequireController } from "../require/RequireController";
-import { SocketFunction } from "../SocketFunction";
-import { getArgs } from "../src/args";
-import { Test } from "./shared";
-import path from "path";
-import { compileTransform, compileTransformBefore } from "typenode";
-
-// Must add CSS shim before we import any clientside files
-//  NOTE: The css shim only need to run serverside, as clientside doesn't run compilation,
-//      and instead just copies serverside module contents.
-import "../require/CSSShim";
-
-// Import clientside files, so they can be whitelisted
-import "./client";
-import { getCallObj } from "../src/nodeProxy";
-
-
-void main();
-
-async function main() {
-    SocketFunction.rejectUnauthorized = false;
-
-    SocketFunction.expose(Test);
-
-    SocketFunction.expose(RequireController);
-    SocketFunction.setDefaultHTTPCall(RequireController, "requireHTML", "./test/client");
-
-    const port = 2542;
-
-    await SocketFunction.mount({ port });
-
-
-    {
-        let serverId = await SocketFunction.connect({ port, address: "letx.ca" });
-        let call = Test.nodes[serverId].add[getCallObj](1, 2);
-        console.log(call);
-        console.log(await SocketFunction.getHTTPCallLink(call));
-    }
-}
+// import debugbreak from "debugbreak";
+// debugbreak(1);
+// debugger;
+
+import { RequireController } from "../require/RequireController";
+import { SocketFunction } from "../SocketFunction";
+import { getArgs } from "../src/args";
+import { Test } from "./shared";
+import path from "path";
+import { compileTransform, compileTransformBefore } from "typenode";
+
+// Must add CSS shim before we import any clientside files
+//  NOTE: The css shim only need to run serverside, as clientside doesn't run compilation,
+//      and instead just copies serverside module contents.
+import "../require/CSSShim";
+
+// Import clientside files, so they can be whitelisted
+import "./client";
+import { getCallObj } from "../src/nodeProxy";
+
+
+void main();
+
+async function main() {
+    SocketFunction.rejectUnauthorized = false;
+
+    SocketFunction.expose(Test);
+
+    SocketFunction.expose(RequireController);
+    SocketFunction.setDefaultHTTPCall(RequireController, "requireHTML", "./test/client");
+
+    const port = 2542;
+
+    await SocketFunction.mount({ port });
+
+
+    {
+        let serverId = await SocketFunction.connect({ port, address: "letx.ca" });
+        let call = Test.nodes[serverId].add[getCallObj](1, 2);
+        console.log(call);
+        console.log(await SocketFunction.getHTTPCallLink(call));
+    }
+}

package/test/shared.ts

@@ -1,59 +1,53 @@
-import { getArgs } from "../src/args";
-import { SocketFunction } from "../SocketFunction";
-
-import "typenode";
-module.moduleContents;
-
-class TestBase {
-    memberVariable = 5;
-
-    async add(lhs: number, rhs: number) {
-        let caller = Test.context.caller?.nodeId;
-        if (!caller) {
-            throw new Error("No caller?");
-        }
-        console.log(`Caller is ${caller}`);
-        return lhs + rhs;
-    }
-
-    async callMe() {
-        let caller = Test.context.caller?.nodeId;
-        if (!caller) {
-            throw new Error("No caller?");
-        }
-        console.log(`Caller is ${caller}`);
-        void (async () => {
-            let seqNum = 1;
-            while (true) {
-                console.log(`Calling client at ${seqNum}`);
-                await Test.nodes[caller].callBack();
-                await new Promise(resolve => setTimeout(resolve, 1000));
-                seqNum++;
-            }
-        })();
-    }
-
-    async callBack() {
-        console.log(`Got callback at ${Date.now()}`);
-    }
-}
-
-export const Test = SocketFunction.register(
-    "80d9f328-72df-4baa-8be8-019c1003d4a2",
-    new TestBase(),
-    () => ({
-        add: {
-            // hooks: [
-            //     async (config) => {
-
-            //     }
-            // ]
-        },
-        callMe: {},
-        callBack: {
-
-        },
-        //fncNotAsync: {},
-        //notAFnc: {},
-    })
+import { getArgs } from "../src/args";
+import { SocketFunction } from "../SocketFunction";
+
+import "typenode";
+module.moduleContents;
+
+class TestBase {
+    memberVariable = 5;
+
+    async add(lhs: number, rhs: number) {
+        let caller = SocketFunction.getCaller().nodeId;
+        console.log(`Caller is ${caller}`);
+        return lhs + rhs;
+    }
+
+    async callMe() {
+        let caller = SocketFunction.getCaller().nodeId;
+        console.log(`Caller is ${caller}`);
+        void (async () => {
+            let seqNum = 1;
+            while (true) {
+                console.log(`Calling client at ${seqNum}`);
+                await Test.nodes[caller].callBack();
+                await new Promise(resolve => setTimeout(resolve, 1000));
+                seqNum++;
+            }
+        })();
+    }
+
+    async callBack() {
+        console.log(`Got callback at ${Date.now()}`);
+    }
+}
+
+export const Test = SocketFunction.register(
+    "80d9f328-72df-4baa-8be8-019c1003d4a2",
+    new TestBase(),
+    () => ({
+        add: {
+            // hooks: [
+            //     async (config) => {
+
+            //     }
+            // ]
+        },
+        callMe: {},
+        callBack: {
+
+        },
+        //fncNotAsync: {},
+        //notAFnc: {},
+    })
 );

package/tsconfig.json

@@ -1,27 +1,27 @@
-{
-    "compilerOptions": {
-        "strict": true,
-        "module": "CommonJS",
-        "esModuleInterop": true,
-        "allowSyntheticDefaultImports": true,
-        "moduleResolution": "node",
-        "target": "es2018",
-        "lib": [
-            "ESNext",
-            "dom",
-            "dom.iterable"
-        ],
-        "jsx": "react",
-        "alwaysStrict": true,
-        "jsxFactory": "preact.createElement",
-        "jsxFragmentFactory": "preact.Fragment",
-        "types": [
-            "node",
-        ],
-        "experimentalDecorators": true,
-        "emitDecoratorMetadata": false,
-        "skipLibCheck": true,
-        "inlineSourceMap": true,
-        "inlineSources": true,
-    },
+{
+    "compilerOptions": {
+        "strict": true,
+        "module": "CommonJS",
+        "esModuleInterop": true,
+        "allowSyntheticDefaultImports": true,
+        "moduleResolution": "node",
+        "target": "es2018",
+        "lib": [
+            "ESNext",
+            "dom",
+            "dom.iterable"
+        ],
+        "jsx": "react",
+        "alwaysStrict": true,
+        "jsxFactory": "preact.createElement",
+        "jsxFragmentFactory": "preact.Fragment",
+        "types": [
+            "node",
+        ],
+        "experimentalDecorators": true,
+        "emitDecoratorMetadata": false,
+        "skipLibCheck": true,
+        "inlineSourceMap": true,
+        "inlineSources": true,
+    },
 }