Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion packages/engine.io/lib/server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,23 @@ function parseSessionId(data: string): string | undefined {
} catch (e) {}
}

export function parseQuery(params: URLSearchParams): Record<string, string> {
const query: Record<string, string> = {};

params.forEach((value, key) => {
// Define instead of assigning so a `__proto__` query parameter is kept as
// a regular own property, matching Object.fromEntries().
Object.defineProperty(query, key, {
value,
enumerable: true,
configurable: true,
writable: true,
});
});

return query;
}

// Object.hasOwn() was introduced in Node.js 16.9
function hasOwn(obj: Record<string, any>, key: string): boolean {
return Object.prototype.hasOwnProperty.call(obj, key);
Expand Down Expand Up @@ -763,7 +780,7 @@ export class Server extends BaseServer {
// try to leverage pre-existing `req._query` (e.g: from connect)
if (!req._query) {
const url = new URL(req.url, "https://socket.io");
req._query = Object.fromEntries(url.searchParams.entries());
req._query = parseQuery(url.searchParams);
}
}

Expand Down
4 changes: 2 additions & 2 deletions packages/engine.io/lib/userver.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import debugModule from "debug";
import { AttachOptions, BaseServer, Server } from "./server";
import { AttachOptions, BaseServer, parseQuery, Server } from "./server";
import { HttpRequest, HttpResponse, TemplatedApp } from "uWebSockets.js";
import transports from "./transports-uws";
import { EngineRequest } from "./transport";
Expand Down Expand Up @@ -42,7 +42,7 @@ export class uServer extends BaseServer {
req.url = req.getUrl();

const params = new URLSearchParams(req.getQuery());
req._query = Object.fromEntries(params.entries());
req._query = parseQuery(params);

req.headers = {};
req.forEach((key, value) => {
Expand Down
17 changes: 17 additions & 0 deletions packages/engine.io/test/server.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,23 @@ describe("server", () => {
});

describe("verification", () => {
it("should support Node.js versions without Object.fromEntries", (done) => {
const fromEntries = Object.fromEntries;
Object.fromEntries = undefined;

engine = listen((port) => {
request
.get(`http://localhost:${port}/engine.io/`)
.query({ transport: "polling", EIO: 4 })
.end((err, res) => {
Object.fromEntries = fromEntries;
expect(err).to.be(null);
expect(res.status).to.be(200);
done();
});
});
});

it("should disallow non-existent transports", (done) => {
const partialDone = createPartialDone(done, 2);

Expand Down