From 8a596e52ac6e10a72e02cfbe0273b8fe4d7f9a1d Mon Sep 17 00:00:00 2001 From: Damien Arrachequesne Date: Thu, 9 Jan 2025 06:29:13 +0100 Subject: [PATCH] ci: test with Deno v2 --- .github/ISSUE_TEMPLATE/bug_report.md | 1 - .github/ISSUE_TEMPLATE/feature_request.md | 1 - .github/PULL_REQUEST_TEMPLATE/bug_fix.md | 1 - .github/PULL_REQUEST_TEMPLATE/feature.md | 1 - .github/workflows/ci.yml | 5 +++-- packages/engine.io/lib/server.ts | 6 +++++- packages/socket.io/lib/namespace.ts | 5 +++-- packages/socket.io/lib/parent-namespace.ts | 2 +- packages/socket.io/lib/server.ts | 6 +++--- vendor/deno.land/x/redis@v0.27.1/connection.ts | 2 +- 10 files changed, 16 insertions(+), 14 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index a9ce51e..2f83622 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -4,7 +4,6 @@ about: Create a report to help us improve title: '' labels: 'to triage' assignees: '' - --- **Describe the bug** diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md index 544a6cf..844cfb0 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -4,7 +4,6 @@ about: Suggest an idea for this project title: '' labels: 'enhancement' assignees: '' - --- **Is your feature request related to a problem? Please describe.** diff --git a/.github/PULL_REQUEST_TEMPLATE/bug_fix.md b/.github/PULL_REQUEST_TEMPLATE/bug_fix.md index faa2920..e5c00ac 100644 --- a/.github/PULL_REQUEST_TEMPLATE/bug_fix.md +++ b/.github/PULL_REQUEST_TEMPLATE/bug_fix.md @@ -4,7 +4,6 @@ about: A fix for a known issue title: '' labels: 'to triage' assignees: '' - --- Related issue or discussion: diff --git a/.github/PULL_REQUEST_TEMPLATE/feature.md b/.github/PULL_REQUEST_TEMPLATE/feature.md index a28c7d4..69d60a6 100644 --- a/.github/PULL_REQUEST_TEMPLATE/feature.md +++ b/.github/PULL_REQUEST_TEMPLATE/feature.md @@ -4,7 +4,6 @@ about: A new awesome feature title: '' labels: 'enhancement' assignees: '' - --- Related issue or discussion: diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f902467..50aebc4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,7 +13,8 @@ jobs: strategy: matrix: deno-version: - - 1.25.2 + - 1.x + - 2.x services: redis: @@ -31,7 +32,7 @@ jobs: uses: actions/checkout@v2 - name: Use Deno ${{ matrix.deno-version }} - uses: denolib/setup-deno@v2 + uses: denoland/setup-deno@v2 with: deno-version: ${{ matrix.deno-version }} diff --git a/packages/engine.io/lib/server.ts b/packages/engine.io/lib/server.ts index 89bd0dc..6869604 100644 --- a/packages/engine.io/lib/server.ts +++ b/packages/engine.io/lib/server.ts @@ -167,7 +167,11 @@ export class Server extends EventEmitter< try { await this.verify(req, url); - } catch ({ code, context }) { + } catch (err) { + const { code, context } = err as { + code: ERROR_CODES; + context: Record; + }; const message = ERROR_MESSAGES.get(code)!; this.emitReserved("connection_error", { req, diff --git a/packages/socket.io/lib/namespace.ts b/packages/socket.io/lib/namespace.ts index 6005c3c..eeebfa6 100644 --- a/packages/socket.io/lib/namespace.ts +++ b/packages/socket.io/lib/namespace.ts @@ -258,13 +258,14 @@ export class Namespace< try { await this.run(socket); } catch (err) { + const e = err as Error & { data: string }; getLogger("socket.io").debug( "[namespace] middleware error, sending CONNECT_ERROR packet to the client", ); socket._cleanup(); return socket._error({ - message: err.message || err, - data: err.data, + message: e.message || err as string, + data: e.data, }); } diff --git a/packages/socket.io/lib/parent-namespace.ts b/packages/socket.io/lib/parent-namespace.ts index 7517dfc..9e1fe23 100644 --- a/packages/socket.io/lib/parent-namespace.ts +++ b/packages/socket.io/lib/parent-namespace.ts @@ -32,7 +32,7 @@ export class ParentNamespace< // }; } - public emit>( + override emit>( ev: Ev, ...args: EventParams ): boolean { diff --git a/packages/socket.io/lib/server.ts b/packages/socket.io/lib/server.ts index b4da843..370f5c8 100644 --- a/packages/socket.io/lib/server.ts +++ b/packages/socket.io/lib/server.ts @@ -45,9 +45,9 @@ export interface ServerOptions { } export interface ServerReservedEvents< - ListenEvents, - EmitEvents, - ServerSideEvents, + ListenEvents extends EventsMap, + EmitEvents extends EventsMap, + ServerSideEvents extends EventsMap, SocketData, > extends NamespaceReservedEvents< diff --git a/vendor/deno.land/x/redis@v0.27.1/connection.ts b/vendor/deno.land/x/redis@v0.27.1/connection.ts index 7cad3e5..3f89e0d 100644 --- a/vendor/deno.land/x/redis@v0.27.1/connection.ts +++ b/vendor/deno.land/x/redis@v0.27.1/connection.ts @@ -8,7 +8,7 @@ import { BufWriter, } from "./vendor/https/deno.land/std/io/buffer.ts"; import { delay } from "./vendor/https/deno.land/std/async/delay.ts"; -type Closer = Deno.Closer; +type Closer = { close: () => void }; export interface Connection { closer: Closer;