@cloudpss/fetch 0.5.42 → 0.5.44

package/dist/impl-node.js

@@ -89,7 +89,7 @@ else {
         _WebSocket = ws.WebSocket;
     }
     else if (typeof ws?.default?.WebSocket == 'function') {
-        _WebSocket = ws.default.WebSocket;
+        _WebSocket = ws?.default?.WebSocket;
     }
     else {
         process.emitWarning('Failed to import "ws.WebSocket".');

package/dist/impl-node.js.map

@@ -1 +1 @@
-{"version":3,"file":"impl-node.js","sourceRoot":"","sources":["../src/impl-node.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"impl-node.js","sourceRoot":"","sources":["../src/impl-node.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudpss/fetch",
-  "version": "0.5.42",
+  "version": "0.5.44",
   "author": "CloudPSS",
   "license": "MIT",
   "keywords": [
@@ -24,10 +24,10 @@
     }
   },
   "dependencies": {
-    "undici": "^6.20.1"
+    "undici": "^6.21.1"
   },
   "devDependencies": {
-    "@types/ws": "^8.5.13"
+    "@types/ws": "^8.5.14"
   },
   "scripts": {
     "build": "pnpm clean && tsc --build --force",

package/src/impl-node.ts

@@ -105,8 +105,8 @@ if (NodeWebSocket != null) {
     }
     if (typeof ws?.WebSocket == 'function') {
         _WebSocket = ws.WebSocket as unknown as typeof globalThis.WebSocket;
-    } else if (typeof ws?.default?.WebSocket == 'function') {
-        _WebSocket = ws.default.WebSocket as unknown as typeof globalThis.WebSocket;
+    } else if (typeof (ws?.default as typeof ws)?.WebSocket == 'function') {
+        _WebSocket = (ws?.default as unknown as typeof ws)?.WebSocket as unknown as typeof globalThis.WebSocket;
     } else {
         process.emitWarning('Failed to import "ws.WebSocket".');
     }

package/src/undici.d.ts

@@ -9,18 +9,22 @@ declare module 'undici/lib/core/symbols.js' {
         kClose,
         kDestroy,
         kDispatch,
-    };
+    } as const;
 }
 
 declare module 'undici/lib/dispatcher/dispatcher-base.js' {
     import { Dispatcher } from 'undici';
-    import { kDestroy, kClose, kDispatch } from 'undici/lib/core/symbols.js';
+    import symbols from 'undici/lib/core/symbols.js';
     class DispatcherBase extends Dispatcher {
         // Should not error.
-        protected [kDestroy](err?: Error | null): Promise<void>;
+        // eslint-disable-next-line @typescript-eslint/unified-signatures
+        protected [symbols.kDestroy](err?: Error | null): Promise<void>;
         // Should not error.
-        protected [kClose](): Promise<void>;
-        protected [kDispatch](options: Dispatcher.DispatchOptions, handler: Dispatcher.DispatchHandlers): boolean;
+        protected [symbols.kClose](): Promise<void>;
+        protected [symbols.kDispatch](
+            options: Dispatcher.DispatchOptions,
+            handler: Dispatcher.DispatchHandlers,
+        ): boolean;
     }
     export = DispatcherBase;
 }

package/tests/ws/connencted.js

@@ -1,5 +1,8 @@
+import { jest } from '@jest/globals';
 import { WebSocket, disconnected, connected } from '../../dist/index.js';
 
+jest.setTimeout(30000);
+
 describe('connected works', () => {
     it('can wait connected from CONNECTING state', async () => {
         const ws = new WebSocket('wss://echo.websocket.org');

package/tests/ws/disconnect.js

@@ -1,5 +1,8 @@
+import { jest } from '@jest/globals';
 import { WebSocket, disconnected, connected, disconnect } from '../../dist/index.js';
 
+jest.setTimeout(30000);
+
 describe('disconnect works', () => {
     it('can disconnect from CONNECTING state', async () => {
         const ws = new WebSocket('wss://echo.websocket.org');

package/tests/ws/e2e.js

@@ -1,5 +1,8 @@
+import { jest } from '@jest/globals';
 import { WebSocket, WebSocketStatusCode, disconnected, connected, disconnect } from '../../dist/index.js';
 
+jest.setTimeout(30000);
+
 describe('websocket works', () => {
     it('can access websocket echo server', async () => {
         const messages = /** @type {string[]} */ ([]);

package/tests/ws/state.js

@@ -1,5 +1,8 @@
+import { jest } from '@jest/globals';
 import { WebSocket, WebSocketStatusCode, disconnected, connected } from '../../dist/index.js';
 
+jest.setTimeout(30000);
+
 describe('connected/disconnected works', () => {
     it('can resolve 1005', async () => {
         const ws = new WebSocket('wss://echo.websocket.org');