socket-function 0.7.4 → 0.7.7

package/package.json

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

package/src/callHTTPHandler.ts

@@ -16,9 +16,13 @@ export function setDefaultHTTPCall(call: CallType) {
     defaultHTTPCall = call;
 }
 
+const cookieNodeIdPrefix = "COOKIE_nodeId_";
 export function getNodeIdFromRequest(request: http.IncomingMessage): string | undefined {
     let cookies = cookie.parse(request.headers.cookie ?? "");
-    return cookies[nodeIdCookie];
+    let value = cookies[nodeIdCookie];
+    if (!value) return value;
+    if (!value.startsWith(cookieNodeIdPrefix)) return undefined;
+    return value;
 }
 
 export async function httpCallHandler(request: http.IncomingMessage, response: http.ServerResponse) {
@@ -61,13 +65,13 @@ export async function httpCallHandler(request: http.IncomingMessage, response: h
 
         let nodeId = getNodeIdRaw(socket);
         if (!nodeId) {
-            let headerNodeId = cookie.parse(request.headers.cookie || "")[nodeIdCookie];
-            if (typeof headerNodeId === "string") {
-                nodeId = headerNodeId;
+            let cookieNodeId = getNodeIdFromRequest(request);
+            if (typeof cookieNodeId === "string") {
+                nodeId = cookieNodeId;
             }
         }
         if (!nodeId) {
-            nodeId = "HTTP_nodeId_" + Date.now() + "_" + Math.random();
+            nodeId = cookieNodeIdPrefix + Date.now() + "_" + Math.random();
             response.setHeader("Set-Cookie", cookie.serialize(nodeIdCookie, nodeId, {
                 httpOnly: true,
                 path: "/",