socket-function 0.8.14 → 0.8.15

package/SocketFunction.ts

@@ -1,7 +1,7 @@
 import { SocketExposedInterface, CallContextType, SocketFunctionHook, SocketFunctionClientHook, SocketExposedShape, SocketRegistered, NetworkLocation, CallerContext, SocketExposedInterfaceClass, CallType, FullCallType } from "./SocketFunctionTypes";
 import { exposeClass, registerClass, registerGlobalClientHook, registerGlobalHook, runClientHooks } from "./src/callManager";
 import { SocketServerConfig, startSocketServer } from "./src/webSocketServer";
-import { getCallFactoryFromNodeId, getCreateCallFactoryLocation, getNetworkLocationHash } from "./src/nodeCache";
+import { getCallFactoryFromNodeId, getCreateCallFactoryLocation, getLocationFromNodeId, getNetworkLocationHash } from "./src/nodeCache";
 import { getCallProxy } from "./src/nodeProxy";
 import { Args } from "./src/types";
 import { setDefaultHTTPCall } from "./src/callHTTPHandler";
@@ -95,13 +95,13 @@ export class SocketFunction {
         return output as any;
     }
 
-    /** Gets HTTP call link */
-    public static async getHTTPCallLink(call: FullCallType): Promise<string> {
-        let factory = await getCallFactoryFromNodeId(call.nodeId);
-        if (!factory) {
-            throw new Error(`Cannot find call factory for nodeId, and so do not know where call location is. NodeId ${call.nodeId}`);
+    /** NOTE: Only works if the call has been loaded from a url (we can't convert arbitrary nodeIds into urls,
+     *      as we have no way of knowing how to contain a nodeId). */
+    public static getHTTPCallLink(call: FullCallType): string {
+        let location = getLocationFromNodeId(call.nodeId);
+        if (!location) {
+            throw new Error(`Cannot find call location for nodeId, and so do not know where call location is. NodeId ${call.nodeId}`);
         }
-        let location = factory.location;
         let url = new URL(`https://${location.address}:${location.listeningPorts[0]}`);
         url.searchParams.set("classGuid", call.classGuid);
         url.searchParams.set("functionName", call.functionName);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "socket-function",
-	"version": "0.8.14",
+	"version": "0.8.15",
 	"main": "index.js",
 	"license": "MIT",
 	"dependencies": {

package/src/nodeCache.ts

@@ -15,6 +15,8 @@ import { MaybePromise } from "./types";
 // nodeId => 
 const nodeCache = new Map<string, {
     callFactory: MaybePromise<CallFactory>;
+    // Just used for getCallFactoryFromNodeId
+    location: NetworkLocation | undefined;
 }>();
 const locationLookup = new Map<string, MaybePromise<string>>();
 
@@ -47,6 +49,7 @@ export function registerNodeClient(callFactory: CallFactory) {
     // TODO: Maybe even preserve the address in some cases, such as if it was a domain, and is now an ip?
     nodeCache.set(nodeId, {
         callFactory,
+        location: undefined,
     });
 }
 
@@ -64,6 +67,7 @@ export function getCreateCallFactoryLocation(location: NetworkLocation, tempNode
     if (tempNodeId !== undefined) {
         nodeCache.set(tempNodeId, {
             callFactory: callFactoryPromise,
+            location,
         });
     }
 
@@ -80,6 +84,7 @@ export function getCreateCallFactoryLocation(location: NetworkLocation, tempNode
         }
         nodeCache.set(nodeId, {
             callFactory,
+            location,
         });
         return nodeId;
     });
@@ -89,4 +94,8 @@ export function getCreateCallFactoryLocation(location: NetworkLocation, tempNode
 // TODO: Give a special error if the nodeId has been seen, but is only one-way (from HTTP requests).
 export async function getCallFactoryFromNodeId(nodeId: string): Promise<CallFactory | undefined> {
     return await nodeCache.get(nodeId)?.callFactory;
+}
+// NOTE: Only works if the nodeId has been loaded with getCreateCallFactoryLocation
+export function getLocationFromNodeId(nodeId: string): NetworkLocation | undefined {
+    return nodeCache.get(nodeId)?.location;
 }

package/test/server.ts

@@ -34,4 +34,12 @@ async function main() {
     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));
+    }
 }