socket-function 1.1.17 → 1.1.19

package/SocketFunction.ts

@@ -16,7 +16,7 @@ import "./SetProcessVariables";
 import cborx from "cbor-x";
 import { setFlag } from "./require/compileFlags";
 import { isNode } from "./src/misc";
-import { getPendingCallCount, harvestCallTimes, harvestFailedCallCount, registerOwnReconnectionUrl } from "./src/CallFactory";
+import { getPendingCallCount, harvestCallTimes, harvestFailedCallCount } from "./src/CallFactory";
 import { measureWrap } from "./src/profiling/measure";
 
 setFlag(require, "cbor-x", "allowclient", true);

package/index.d.ts

@@ -495,7 +495,6 @@ declare module "socket-function/src/CallFactory" {
     }
     type InitializeState = {
         supportsLZ4?: boolean;
-        ownReconnectionUrl?: string;
     };
     export declare function harvestFailedCallCount(): number;
     export declare function getPendingCallCount(): number;
@@ -504,7 +503,6 @@ declare module "socket-function/src/CallFactory" {
         end: number;
     }[];
     export declare function createCallFactory(webSocketBase: SenderInterface | undefined, nodeId: string, localNodeId?: string): Promise<CallFactory>;
-    export declare function registerOwnReconnectionUrl(url: string): void;
     export {};
 
 }

package/package.json

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

package/src/CallFactory.d.ts

@@ -34,7 +34,6 @@ export interface SenderInterface {
 }
 type InitializeState = {
     supportsLZ4?: boolean;
-    ownReconnectionUrl?: string;
 };
 export declare function harvestFailedCallCount(): number;
 export declare function getPendingCallCount(): number;
@@ -43,5 +42,4 @@ export declare function harvestCallTimes(): {
     end: number;
 }[];
 export declare function createCallFactory(webSocketBase: SenderInterface | undefined, nodeId: string, localNodeId?: string): Promise<CallFactory>;
-export declare function registerOwnReconnectionUrl(url: string): void;
 export {};

package/src/CallFactory.ts

@@ -78,7 +78,6 @@ export interface SenderInterface {
 
 type InitializeState = {
     supportsLZ4?: boolean;
-    ownReconnectionUrl?: string;
 };
 
 const INITIALIZE_STATE_SEQ_NUM = -1;
@@ -112,8 +111,7 @@ export async function createCallFactory(
     // The node id we are connecting to (or that connected to us)
     nodeId: string,
     // The node id that we were contacted on
-    // NOTE: This used to default to empty string, which would be the case if we made the connection. But this caused problems when we want it to stop making two connections per server and reuse the connection if both the servers want it to talk to each other. I guess we can default it to our reconnection URL. I mean, how else are people going to connect to us other than that?
-    localNodeId = ownReconnectionUrl || "",
+    localNodeId = "",
 ): Promise<CallFactory> {
     let niceConnectionName = nodeId;
 
@@ -560,24 +558,8 @@ export async function createCallFactory(
         if (call.isReturn) {
             if (!SocketFunction.LEGACY_INITIALIZE && call.seqNum === INITIALIZE_STATE_SEQ_NUM) {
                 callFactory.receivedInitializeState = call.result as InitializeState;
-                let otherReconnectionUrl = callFactory.receivedInitializeState.ownReconnectionUrl;
-                callFactory.realNodeId = otherReconnectionUrl;
                 if (SocketFunction.logMessages) {
-                    console.log(green(`Received initialize state from ${callFactory.realNodeId} at ${Date.now()}`));
-                }
-                if (otherReconnectionUrl && !canReconnect && !!getNodeIdLocation(otherReconnectionUrl) && otherReconnectionUrl !== ownReconnectionUrl) {
-                    if (changeNodeId({
-                        originalNodeId: nodeId,
-                        newNodeId: otherReconnectionUrl,
-                        callFactory,
-                    })) {
-                        nodeId = otherReconnectionUrl;
-                        niceConnectionName = otherReconnectionUrl;
-                        callerContext.nodeId = nodeId;
-                        canReconnect = !!getNodeIdLocation(nodeId);
-                        callFactory.nodeId = nodeId;
-                        callFactory.connectionId = { nodeId };
-                    }
+                    console.log(green(`Received initialize state from ${callFactory.realNodeId} (for ${nodeId}) at ${Date.now()}`));
                 }
                 return;
             }
@@ -791,7 +773,6 @@ export async function createCallFactory(
     if (!SocketFunction.LEGACY_INITIALIZE) {
         let initState: InitializeState = {
             supportsLZ4: true,
-            ownReconnectionUrl,
         };
         let initReturn: InternalReturnType = {
             isReturn: true,
@@ -811,11 +792,6 @@ export async function createCallFactory(
     return callFactory;
 }
 
-let ownReconnectionUrl: string | undefined;
-export function registerOwnReconnectionUrl(url: string) {
-    ownReconnectionUrl = url;
-}
-
 
 let uncompressedSent = 0;
 let compressedSent = 0;

package/src/webSocketServer.ts

@@ -5,7 +5,7 @@ import tls from "tls";
 import { getNodeIdsFromRequest, httpCallHandler } from "./callHTTPHandler";
 import { SocketFunction } from "../SocketFunction";
 import { getTrustedCertificates, watchTrustedCertificates } from "./certStore";
-import { createCallFactory, registerOwnReconnectionUrl } from "./CallFactory";
+import { createCallFactory } from "./CallFactory";
 import { parseSNIExtension, parseTLSHello, SNIType } from "./tlsParsing";
 import debugbreak from "debugbreak";
 import { getNodeId } from "./nodeCache";
@@ -351,7 +351,6 @@ export async function startSocketServer(
 
     let nodeId = getNodeId(getCommonName(config.cert), port);
     console.log(green(`Started Listening on ${nodeId} (${host}) after ${formatTime(process.uptime() * 1000)}`));
-    registerOwnReconnectionUrl(nodeId);
 
     return nodeId;
 }