querysub 0.647.0 → 0.648.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "querysub",
-  "version": "0.647.0",
+  "version": "0.648.0",
   "main": "index.js",
   "license": "MIT",
   "note1": "note on node-forge fork, see https://github.com/digitalbazaar/forge/issues/744 for details",

package/src/-c-identity/IdentityController.ts

@@ -29,15 +29,22 @@ const MAX_CHANGE_IDENTITY_TIMEOUT = timeInMinute * 5;
 const MOUNT_WAIT_TIMEOUT = timeInMinute * 3;
 
 let callerInfo = new Map<CallerContext, {
-    reconnectNodeId: string | Promise<string | Error> | undefined;
-    resolveReconnectNodeId?: (value: string | Error) => void;
+    reconnectNodeId: string | Promise<string>;
+    reconnectNodeIdPromiseObj: PromiseObj<string> | undefined;
     certCommonName: string;
     machineId: string;
     cert: CertInfo;
     pubKey: Buffer;
     pubKeyShort: number;
 }>();
-const callerInfoErrorString = `Internal error, caller did not updated their identity. Is this an HTTPS call (instead of a websocket call)? The caller should import the server controller, which imports this function, which will add a client hook to always update the identity`;
+
+function getCallerInfoAssert(callerContext: CallerContext) {
+    let info = callerInfo.get(callerContext);
+    if (!info) {
+        throw new Error(`Internal error, caller did not updated their identity. Is this an HTTPS call (instead of a websocket call)? The caller should import the server controller, which imports this function, which will add a client hook to always update the identity`);
+    }
+    return info;
+}
 
 /** Gets the nodeId of the caller suitable for reconnecting (to the same process).
  *  - Also useful for logs, to identify a node on the network.
@@ -51,37 +58,19 @@ export function IdentityController_getReconnectNodeId(callerContext: CallerConte
     let info = callerInfo.get(callerContext);
     if (!info) {
         if (allowUndefined) return undefined;
-        throw new Error(callerInfoErrorString);
+        info = getCallerInfoAssert(callerContext);
     }
-    let value = info.reconnectNodeId;
-    if (typeof value !== "string") return undefined;
-    return value;
+    if (typeof info.reconnectNodeId === "string") {
+        return info.reconnectNodeId;
+    }
+    return undefined;
 }
 export async function IdentityController_getReconnectNodeIdAssert(callerContext: CallerContext): Promise<string> {
     if (!isClientNodeId(callerContext.nodeId)) {
         return callerContext.nodeId;
     }
-    let info = callerInfo.get(callerContext);
-    if (!info) {
-        throw new Error(callerInfoErrorString);
-    }
-    let valueBase = info.reconnectNodeId;
-    let value: string | Error | undefined;
-    if (valueBase instanceof Promise) {
-        value = await valueBase;
-    } else {
-        value = valueBase;
-    }
-    if (value instanceof Error) {
-        throw value;
-    }
-    if (!value) {
-        console.error(`Caller did not mount before connecting. This call requires the caller to be listening.`, {
-            callerNodeId: callerContext.nodeId,
-        });
-        throw new Error(`Caller did not mount before connecting. This call requires the caller to be listening.`);
-    }
-    return value;
+    let info = getCallerInfoAssert(callerContext);
+    return await info.reconnectNodeId;
 }
 export function IdentityController_getSecureIP(callerContext: CallerContext): string {
     return getNodeIdIP(callerContext.nodeId);
@@ -95,9 +84,11 @@ export function IdentityController_getCurrentReconnectNodeId(): string | undefin
 
 export function debugNodeId(nodeId: string) {
     let info = Array.from(callerInfo.entries()).find(x => x[0].nodeId === nodeId);
-    let value = info?.[1].reconnectNodeId;
-    if (typeof value !== "string") return nodeId;
-    return value;
+    let reconnectNodeId = info?.[1].reconnectNodeId;
+    if (typeof reconnectNodeId !== "string") {
+        return nodeId;
+    }
+    return reconnectNodeId;
 };
 (globalThis as any).debugNodeId = debugNodeId;
 
@@ -118,21 +109,19 @@ export function IdentityController_getMachineId(callerContext: CallerContext, al
     let info = callerInfo.get(callerContext);
     if (!info) {
         if (allowEmpty) return "";
-        throw new Error(callerInfoErrorString);
+        info = getCallerInfoAssert(callerContext);
     }
     return info.machineId;
 }
 
 export type CertInfo = { certPEM: Buffer | string; issuerPEM: Buffer | string; };
 export function IdentityController_getCertInfo(callerContext: CallerContext): CertInfo {
-    let info = callerInfo.get(callerContext);
-    if (!info) throw new Error(callerInfoErrorString);
+    let info = getCallerInfoAssert(callerContext);
     return info.cert;
 }
 
 export function IdentityController_getPubKeyShort(callerContext: CallerContext): number {
-    let info = callerInfo.get(callerContext);
-    if (!info) throw new Error(callerInfoErrorString);
+    let info = getCallerInfoAssert(callerContext);
     return info.pubKeyShort;
 }
 export const IdentityController_getOwnPubKeyShort = lazy((): number => {
@@ -149,7 +138,7 @@ export interface ChangeIdentityPayload {
     serverId: string;
     mountedPort: number | undefined;
     debugEntryPoint: string | undefined;
-    clientIsNode: boolean;
+    callerIsNode: boolean;
 }
 class IdentityControllerBase {
     // IMPORTANT! We HAVE to call changeIdentity NOT JUST because we can't use peer certificates in the browser, BUT, also
@@ -167,7 +156,7 @@ class IdentityControllerBase {
             throw new Error(`Signed payload too old, ${payload.time} < ${signedThreshold} from ${caller.localNodeId} (${caller.nodeId})`);
         }
 
-        if (payload.clientIsNode && payload.serverId !== getOwnNodeId()) {
+        if (payload.callerIsNode && payload.serverId !== getOwnNodeId()) {
             // This is extremely common when we reuse ports, which we do frequently for the edge nodes. 
             throw new Error(`You tried to contact another server. We are ${getOwnNodeId()}, you tried to contact ${payload.serverId}.`);
         }
@@ -180,7 +169,7 @@ class IdentityControllerBase {
             throw new Error(`Identity is for another server! The connection is calling us ${localNodeId}, but signature is for ${payload.serverId}`);
         }
         // If they're calling from the browser, then they're not going to be able to use our machine ID, etc. However, they should be calling an actual https node, so it should still be secure for them. 
-        if (payload.clientIsNode) {
+        if (payload.callerIsNode) {
             let calledMachineId = getMachineId(payload.serverId, getDomain());
             if (calledMachineId !== "127-0-0-1" && calledMachineId !== getOwnMachineId(getDomain())) {
                 throw new Error(`Tried to call a different machine. We are ${getOwnMachineId(getDomain())}, they called ${calledMachineId}`);
@@ -202,19 +191,22 @@ class IdentityControllerBase {
         //  to use HTTPS, so connecting over the IP won't work! (unless they turn off certificate validation,
         //  which we shouldn't do...)
         let certCommonName = getCommonName(payload.cert);
-        let reconnectNodeId: string | Promise<string | Error> | undefined;
-        let resolveReconnectNodeId: ((value: string | Error) => void) | undefined;
+        let reconnectNodeId: string | Promise<string>;
+        let reconnectNodeIdPromiseObj: PromiseObj<string> | undefined;
         if (payload.mountedPort) {
             reconnectNodeId = getNodeId(certCommonName, payload.mountedPort);
         } else {
-            let pending = new PromiseObj<string | Error>();
-            reconnectNodeId = pending.promise;
-            resolveReconnectNodeId = pending.resolve;
+            reconnectNodeIdPromiseObj = new PromiseObj<string>();
+            reconnectNodeId = reconnectNodeIdPromiseObj.promise;
             setTimeout(() => {
-                pending.resolve(new Error(`Caller did not mount within ${formatTime(MOUNT_WAIT_TIMEOUT)} of connecting. This call requires the caller to be listening.`));
+                reconnectNodeIdPromiseObj?.reject(new Error(`Caller did not call setMountedPort within ${formatTime(MOUNT_WAIT_TIMEOUT)} of connecting. This call requires the caller to be listening.`));
             }, MOUNT_WAIT_TIMEOUT);
         }
 
+        if (!payload.callerIsNode) {
+            reconnectNodeIdPromiseObj?.reject(new Error(`The caller says they are a client, so they are never going to have a reconnect node id`));
+        }
+
         let pubKey = getPublicIdentifier(payload.cert);
         let machineId = getMachineId(getCommonName(payload.certIssuer), getDomain());
 
@@ -223,7 +215,7 @@ class IdentityControllerBase {
             machineId,
             certCommonName,
             reconnectNodeId,
-            resolveReconnectNodeId,
+            reconnectNodeIdPromiseObj,
             pubKey,
             pubKeyShort: getShortNumber(pubKey),
         });
@@ -249,11 +241,11 @@ class IdentityControllerBase {
     @measureFnc
     public async setMountedPort(mountedPort: number) {
         const caller = SocketFunction.getCaller();
-        let info = callerInfo.get(caller);
-        if (!info) throw new Error(callerInfoErrorString);
+        let info = getCallerInfoAssert(caller);
+        if (typeof info.reconnectNodeId === "string") throw new Error(`Already have reconnectNodeId, not sure why we are being given another, Have ${info.reconnectNodeId}, given port: ${mountedPort}`);
         let reconnectNodeId = getNodeId(info.certCommonName, mountedPort);
         info.reconnectNodeId = reconnectNodeId;
-        info.resolveReconnectNodeId?.(reconnectNodeId);
+        info.reconnectNodeIdPromiseObj?.resolve(reconnectNodeId);
         console.info(`Caller mounted after connecting, set reconnect node id`, {
             clientId: caller.nodeId,
             reconnectNodeId,
@@ -290,7 +282,7 @@ const changeIdentityOnce = cacheWeak(async function changeIdentityOnce(connectio
         certIssuer: issuer.cert.toString(),
         mountedPort: getNodeIdLocation(SocketFunction.mountedNodeId)?.port,
         debugEntryPoint: isServer() ? process.argv[1] : "browser",
-        clientIsNode: isServer() && !isIpDomain(nodeId),
+        callerIsNode: isServer() && !isIpDomain(nodeId),
     };
     let signature = sign(threadKeyCert, payload);
     await timeoutToError(
@@ -302,13 +294,9 @@ const changeIdentityOnce = cacheWeak(async function changeIdentityOnce(connectio
         logErrors((async () => {
             await SocketFunction.mountPromise;
             let mountedPort = getNodeIdLocation(SocketFunction.mountedNodeId)?.port;
-            if (!mountedPort) return;
+            if (!mountedPort) throw new Error(`Mounted after connecting to ${nodeId}, but no mounted port found? mounted node id: ${SocketFunction.mountedNodeId}`);
             console.info(`Mounted after connecting to ${nodeId}, sending mounted port ${mountedPort}`);
-            await timeoutToError(
-                MAX_CHANGE_IDENTITY_TIMEOUT,
-                IdentityController.nodes[nodeId].setMountedPort(mountedPort),
-                () => new Error(`Timeout calling setMountedPort for ${nodeId}`)
-            );
+            await IdentityController.nodes[nodeId].setMountedPort(mountedPort);
         })());
     }
 });