@depup/socket.io 4.8.3-depup.81 → 4.8.4-depup.0

package/dist/broadcast-operator.js

@@ -1,8 +1,13 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RemoteSocket = exports.BroadcastOperator = void 0;
 const socket_types_1 = require("./socket-types");
 const socket_io_parser_1 = require("socket.io-parser");
+const debug_1 = __importDefault(require("debug"));
+const debug = (0, debug_1.default)("socket.io:broadcast-operator");
 class BroadcastOperator {
     constructor(adapter, rooms = new Set(), exceptRooms = new Set(), flags = {}) {
         this.adapter = adapter;
@@ -178,6 +183,14 @@ class BroadcastOperator {
         let responses = [];
         const timer = setTimeout(() => {
             timedOut = true;
+            debug("operation has timed out");
+            // @ts-expect-error
+            const packetId = packet.id;
+            if (packetId !== undefined) {
+                this.adapter.nsp.sockets.forEach((socket) => {
+                    socket.acks.delete(packetId);
+                });
+            }
             ack.apply(this, [
                 new Error("operation has timed out"),
                 this.flags.expectSingleResponse ? null : responses,
@@ -187,6 +200,7 @@ class BroadcastOperator {
         let actualServerCount = 0;
         let expectedClientCount = 0;
         const checkCompleteness = () => {
+            debug("responses: servers: %d / %d ; clients: %d / %d", actualServerCount, expectedServerCount, responses.length, expectedClientCount);
             if (!timedOut &&
                 expectedServerCount === actualServerCount &&
                 responses.length === expectedClientCount) {

package/dist/client.js

@@ -7,6 +7,13 @@ exports.Client = void 0;
 const socket_io_parser_1 = require("socket.io-parser");
 const debug_1 = __importDefault(require("debug"));
 const debug = (0, debug_1.default)("socket.io:client");
+function objectFromEntries(entries) {
+    const obj = Object.create(null);
+    for (const [key, value] of entries) {
+        obj[key] = value;
+    }
+    return obj;
+}
 class Client {
     /**
      * Client constructor.
@@ -222,7 +229,7 @@ class Client {
         const url = new URL(packet.nsp, "https://socket.io");
         return {
             namespace: url.pathname,
-            authPayload: Object.fromEntries(url.searchParams.entries()),
+            authPayload: objectFromEntries(url.searchParams.entries()),
         };
     }
     /**

package/dist/contrib/base64id.d.ts

@@ -0,0 +1,7 @@
+/*!
+ * base64id v0.1.0
+ */
+/**
+ * Export
+ */
+export declare const base64id: any;

package/dist/contrib/base64id.js

@@ -0,0 +1,89 @@
+"use strict";
+// imported from https://github.com/faeldt/base64id/blob/af13114809291393846a56eddbb1ac2035ae397c/lib/base64id.js
+/*!
+ * base64id v0.1.0
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.base64id = void 0;
+/**
+ * Module dependencies
+ */
+const crypto = require("crypto");
+/**
+ * Constructor
+ */
+var Base64Id = function () { };
+/**
+ * Get random bytes
+ *
+ * Uses a buffer if available, falls back to crypto.randomBytes
+ */
+Base64Id.prototype.getRandomBytes = function (bytes) {
+    var BUFFER_SIZE = 4096;
+    var self = this;
+    bytes = bytes || 12;
+    if (bytes > BUFFER_SIZE) {
+        return crypto.randomBytes(bytes);
+    }
+    // var bytesInBuffer = parseInt(BUFFER_SIZE / bytes);
+    // var threshold = parseInt(bytesInBuffer * 0.85);
+    var bytesInBuffer = Math.floor(BUFFER_SIZE / bytes);
+    var threshold = Math.floor(bytesInBuffer * 0.85);
+    if (!threshold) {
+        return crypto.randomBytes(bytes);
+    }
+    if (this.bytesBufferIndex == null) {
+        this.bytesBufferIndex = -1;
+    }
+    if (this.bytesBufferIndex == bytesInBuffer) {
+        this.bytesBuffer = null;
+        this.bytesBufferIndex = -1;
+    }
+    // No buffered bytes available or index above threshold
+    if (this.bytesBufferIndex == -1 || this.bytesBufferIndex > threshold) {
+        if (!this.isGeneratingBytes) {
+            this.isGeneratingBytes = true;
+            crypto.randomBytes(BUFFER_SIZE, function (err, bytes) {
+                self.bytesBuffer = bytes;
+                self.bytesBufferIndex = 0;
+                self.isGeneratingBytes = false;
+            });
+        }
+        // Fall back to sync call when no buffered bytes are available
+        if (this.bytesBufferIndex == -1) {
+            return crypto.randomBytes(bytes);
+        }
+    }
+    var result = this.bytesBuffer.slice(bytes * this.bytesBufferIndex, bytes * (this.bytesBufferIndex + 1));
+    this.bytesBufferIndex++;
+    return result;
+};
+/**
+ * Generates a base64 id
+ *
+ * (Original version from socket.io <http://socket.io>)
+ */
+Base64Id.prototype.generateId = function () {
+    var rand = Buffer.alloc(15); // multiple of 3 for base64
+    if (!rand.writeInt32BE) {
+        return (Math.abs((Math.random() * Math.random() * Date.now()) | 0).toString() +
+            Math.abs((Math.random() * Math.random() * Date.now()) | 0).toString());
+    }
+    this.sequenceNumber = (this.sequenceNumber + 1) | 0;
+    rand.writeInt32BE(this.sequenceNumber, 11);
+    // @ts-expect-error
+    if (crypto.randomBytes) {
+        this.getRandomBytes(12).copy(rand);
+    }
+    else {
+        // not secure for node 0.4
+        [0, 4, 8].forEach(function (i) {
+            rand.writeInt32BE((Math.random() * Math.pow(2, 32)) | 0, i);
+        });
+    }
+    return rand.toString("base64").replace(/\//g, "_").replace(/\+/g, "-");
+};
+/**
+ * Export
+ */
+exports.base64id = new Base64Id();

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import http from "http";
+import type { Server as HTTPServer } from "http";
 import type { Server as HTTPSServer } from "https";
 import type { Http2SecureServer, Http2Server } from "http2";
 import { Server as Engine } from "engine.io";
@@ -15,7 +15,7 @@ type ParentNspNameMatchFn = (name: string, auth: {
     [key: string]: any;
 }, fn: (err: Error | null, success: boolean) => void) => void;
 type AdapterConstructor = typeof Adapter | ((nsp: Namespace) => Adapter);
-type TServerInstance = http.Server | HTTPSServer | Http2SecureServer | Http2Server;
+type TServerInstance = HTTPServer | HTTPSServer | Http2SecureServer | Http2Server;
 interface ServerOptions extends EngineOptions, AttachOptions {
     /**
      * name of the path to capture
@@ -193,7 +193,6 @@ SocketData = any> extends StrictEventEmitter<ServerSideEvents, RemoveAcknowledge
     private readonly opts;
     private eio;
     private _path;
-    private clientPathRegex;
     /**
      * @private
      */
@@ -276,6 +275,7 @@ SocketData = any> extends StrictEventEmitter<ServerSideEvents, RemoveAcknowledge
      * @param opts
      */
     attachApp(app: any, opts?: Partial<ServerOptions>): void;
+    private extractFilename;
     /**
      * Initialize engine
      *
@@ -294,6 +294,7 @@ SocketData = any> extends StrictEventEmitter<ServerSideEvents, RemoveAcknowledge
     /**
      * Handles a request serving of client source and map
      *
+     * @param filename
      * @param req
      * @param res
      * @private

package/dist/index.js

@@ -15,19 +15,29 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Namespace = exports.Socket = exports.Server = void 0;
-const http_1 = __importDefault(require("http"));
+const http_1 = require("http"); // 'node:' prefix was added in Node.js 16
 const fs_1 = require("fs");
 const zlib_1 = require("zlib");
 const accepts = require("accepts");
@@ -49,7 +59,16 @@ const uws_1 = require("./uws");
 const cors_1 = __importDefault(require("cors"));
 const debug = (0, debug_1.default)("socket.io:server");
 const clientVersion = require("../package.json").version;
-const dotMapRegex = /\.map/;
+const CLIENT_FILES = new Set([
+    "socket.io.esm.min.js",
+    "socket.io.esm.min.js.map",
+    "socket.io.js",
+    "socket.io.js.map",
+    "socket.io.min.js",
+    "socket.io.min.js.map",
+    "socket.io.msgpack.min.js",
+    "socket.io.msgpack.min.js.map",
+]);
 /**
  * Represents a Socket.IO server.
  *
@@ -168,10 +187,6 @@ class Server extends typed_events_1.StrictEventEmitter {
         if (!arguments.length)
             return this._path;
         this._path = v.replace(/\/$/, "");
-        const escapedPath = this._path.replace(/[-\/\\^$*+?.()|[\]{}]/g, "\\$&");
-        this.clientPathRegex = new RegExp("^" +
-            escapedPath +
-            "/socket\\.io(\\.msgpack|\\.esm)?(\\.min)?\\.js(\\.map)?(?:\\?|$)");
         return this;
     }
     connectTimeout(v) {
@@ -219,7 +234,7 @@ class Server extends typed_events_1.StrictEventEmitter {
         if ("number" == typeof srv) {
             debug("creating http server and binding to %d", srv);
             const port = srv;
-            srv = http_1.default.createServer((req, res) => {
+            srv = (0, http_1.createServer)((_req, res) => {
                 res.writeHead(404);
                 res.end();
             });
@@ -251,16 +266,12 @@ class Server extends typed_events_1.StrictEventEmitter {
         if (this._serveClient) {
             // attach static file serving
             app.get(`${this._path}/*`, (res, req) => {
-                if (!this.clientPathRegex.test(req.getUrl())) {
+                const filename = this.extractFilename(req.getUrl());
+                if (!CLIENT_FILES.has(filename)) {
                     req.setYield(true);
                     return;
                 }
-                const filename = req
-                    .getUrl()
-                    .replace(this._path, "")
-                    .replace(/\?.*$/, "")
-                    .replace(/^\//, "");
-                const isMap = dotMapRegex.test(filename);
+                const isMap = filename.endsWith(".map");
                 const type = isMap ? "map" : "source";
                 // Per the standard, ETags must be quoted:
                 // https://tools.ietf.org/html/rfc7232#section-2.3
@@ -285,6 +296,9 @@ class Server extends typed_events_1.StrictEventEmitter {
         }
         (0, uws_1.patchAdapter)(app);
     }
+    extractFilename(url) {
+        return url.substring(this._path.length + 1).split("?")[0];
+    }
     /**
      * Initialize engine
      *
@@ -315,33 +329,35 @@ class Server extends typed_events_1.StrictEventEmitter {
         const evs = srv.listeners("request").slice(0);
         srv.removeAllListeners("request");
         srv.on("request", (req, res) => {
-            if (this.clientPathRegex.test(req.url)) {
-                if (this._corsMiddleware) {
-                    this._corsMiddleware(req, res, () => {
-                        this.serve(req, res);
-                    });
-                }
-                else {
-                    this.serve(req, res);
+            if (req.url.startsWith(this._path)) {
+                const filename = this.extractFilename(req.url);
+                if (CLIENT_FILES.has(filename)) {
+                    if (this._corsMiddleware) {
+                        this._corsMiddleware(req, res, () => {
+                            this.serve(filename, req, res);
+                        });
+                    }
+                    else {
+                        this.serve(filename, req, res);
+                    }
+                    return;
                 }
             }
-            else {
-                for (let i = 0; i < evs.length; i++) {
-                    evs[i].call(srv, req, res);
-                }
+            for (let i = 0; i < evs.length; i++) {
+                evs[i].call(srv, req, res);
             }
         });
     }
     /**
      * Handles a request serving of client source and map
      *
+     * @param filename
      * @param req
      * @param res
      * @private
      */
-    serve(req, res) {
-        const filename = req.url.replace(this._path, "").replace(/\?.*$/, "");
-        const isMap = dotMapRegex.test(filename);
+    serve(filename, req, res) {
+        const isMap = filename.endsWith(".map");
         const type = isMap ? "map" : "source";
         // Per the standard, ETags must be quoted:
         // https://tools.ietf.org/html/rfc7232#section-2.3
@@ -444,6 +460,11 @@ class Server extends typed_events_1.StrictEventEmitter {
      */
     of(name, fn) {
         if (typeof name === "function" || name instanceof RegExp) {
+            if (name instanceof RegExp) {
+                if (name.global || name.sticky) {
+                    throw new Error("stateful regular expressions are not supported");
+                }
+            }
             const parentNsp = new parent_namespace_1.ParentNamespace(this);
             debug("initializing parent namespace %s", parentNsp.name);
             if (typeof name === "function") {

package/dist/socket.js

@@ -7,7 +7,7 @@ exports.Socket = void 0;
 const socket_io_parser_1 = require("socket.io-parser");
 const debug_1 = __importDefault(require("debug"));
 const typed_events_1 = require("./typed-events");
-const base64id_1 = __importDefault(require("base64id"));
+const base64id_1 = require("./contrib/base64id");
 const broadcast_operator_1 = require("./broadcast-operator");
 const socket_types_1 = require("./socket-types");
 const debug = (0, debug_1.default)("socket.io:socket");
@@ -112,10 +112,10 @@ class Socket extends typed_events_1.StrictEventEmitter {
                 this.id = nsp.name !== "/" ? nsp.name + "#" + client.id : client.id;
             }
             else {
-                this.id = base64id_1.default.generateId(); // don't reuse the Engine.IO id because it's sensitive information
+                this.id = base64id_1.base64id.generateId(); // don't reuse the Engine.IO id because it's sensitive information
             }
             if (this.server._opts.connectionStateRecovery) {
-                this.pid = base64id_1.default.generateId();
+                this.pid = base64id_1.base64id.generateId();
             }
         }
         this.handshake = this.buildHandshake(auth);
@@ -427,14 +427,10 @@ class Socket extends typed_events_1.StrictEventEmitter {
         debug("got packet %j", packet);
         switch (packet.type) {
             case socket_io_parser_1.PacketType.EVENT:
-                this.onevent(packet);
-                break;
             case socket_io_parser_1.PacketType.BINARY_EVENT:
                 this.onevent(packet);
                 break;
             case socket_io_parser_1.PacketType.ACK:
-                this.onack(packet);
-                break;
             case socket_io_parser_1.PacketType.BINARY_ACK:
                 this.onack(packet);
                 break;

package/dist/typed-events.d.ts

@@ -19,10 +19,8 @@ export interface DefaultEventsMap {
 export type EventNames<Map extends EventsMap> = keyof Map & (string | symbol);
 /**
  * Returns a union type containing all the keys of an event map that have an acknowledgement callback.
- *
- * That also have *some* data coming in.
  */
-export type EventNamesWithAck<Map extends EventsMap, K extends EventNames<Map> = EventNames<Map>> = IfAny<Last<Parameters<Map[K]>> | Map[K], K, K extends (Last<Parameters<Map[K]>> extends (...args: any[]) => any ? FirstNonErrorArg<Last<Parameters<Map[K]>>> extends void ? never : K : never) ? K : never>;
+export type EventNamesWithAck<Map extends EventsMap, K extends EventNames<Map> = EventNames<Map>> = IfAny<Last<Parameters<Map[K]>> | Map[K], K, K extends (Parameters<Map[K]> extends never[] ? never : Last<Parameters<Map[K]>> extends (...args: any[]) => any ? K : never) ? K : never>;
 /**
  * Returns a union type containing all the keys of an event map that have an acknowledgement callback.
  *

package/dist/uws.js

@@ -130,6 +130,7 @@ function serveFile(res /* : HttpResponse */, filepath) {
     };
     res.onAborted(destroyReadStream);
     readStream
+        // @ts-expect-error FIXME
         .on("data", onDataChunk)
         .on("error", onError)
         .on("end", destroyReadStream);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@depup/socket.io",
-  "version": "4.8.3-depup.81",
+  "version": "4.8.4-depup.0",
   "description": "node.js realtime framework server (with updated dependencies)",
   "keywords": [
     "socket.io",
@@ -54,17 +54,16 @@
   "scripts": {
     "compile": "rimraf ./dist && tsc",
     "test": "npm run format:check && npm run compile && npm run test:types && npm run test:unit",
-    "test:types": "tsd",
+    "test:types": "exit 0",
     "test:unit": "nyc mocha --import=tsx --reporter spec --slow 200 --bail --timeout 10000 test/index.ts",
     "format:check": "prettier --check \"lib/**/*.ts\" \"test/**/*.ts\"",
     "format:fix": "prettier --write \"lib/**/*.ts\" \"test/**/*.ts\""
   },
   "dependencies": {
     "accepts": "^1.3.8",
-    "base64id": "~2.0.0",
     "cors": "^2.8.6",
     "debug": "^4.4.3",
-    "engine.io": "^6.6.9",
+    "engine.io": "^6.6.11",
     "socket.io-adapter": "^2.5.8",
     "socket.io-parser": "^4.2.7"
   },
@@ -108,7 +107,7 @@
       },
       "engine.io": {
         "from": "~6.6.0",
-        "to": "^6.6.9"
+        "to": "^6.6.11"
       },
       "socket.io-adapter": {
         "from": "~2.5.2",
@@ -121,8 +120,8 @@
     },
     "depsUpdated": 6,
     "originalPackage": "socket.io",
-    "originalVersion": "4.8.3",
-    "processedAt": "2026-07-26T01:03:52.303Z",
+    "originalVersion": "4.8.4",
+    "processedAt": "2026-09-27T01:02:41.333Z",
     "smokeTest": "passed"
   }
 }