ci: test with Deno v2

socketio · Jan 9, 2025 · 8a596e5 · 8a596e5
1 parent 7f47539
commit 8a596e5
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 14 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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<string, unknown>;
+      };
       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
@@ -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
@@ -32,7 +32,7 @@ export class ParentNamespace<
     // };
   }
 
-  public emit<Ev extends EventNames<EmitEvents>>(
+  override emit<Ev extends EventNames<EmitEvents>>(
     ev: Ev,
     ...args: EventParams<EmitEvents, Ev>
   ): boolean {

diff --git 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/[email protected]/connection.ts b/vendor/deno.land/x/[email protected]/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;