@cloudpss/fetch 0.5.36 → 0.5.38

package/dist/impl-browser.d.ts

@@ -1,28 +1,22 @@
-export declare const fetch: typeof globalThis.fetch;
-export declare const Headers: {
+export declare const fetch: typeof globalThis.fetch, Headers: {
     new (init?: HeadersInit): Headers;
     prototype: Headers;
-};
-export declare const Response: {
+}, Response: {
     new (body?: BodyInit | null, init?: ResponseInit): Response;
     prototype: Response;
     error(): Response;
     json(data: any, init?: ResponseInit): Response;
     redirect(url: string | URL, status?: number): Response;
-};
-export declare const Request: {
+}, Request: {
     new (input: RequestInfo | URL, init?: RequestInit): Request;
     prototype: Request;
-};
-export declare const File: {
+}, File: {
     new (fileBits: BlobPart[], fileName: string, options?: FilePropertyBag): File;
     prototype: File;
-};
-export declare const FormData: {
+}, FormData: {
     new (form?: HTMLFormElement, submitter?: HTMLElement | null): FormData;
     prototype: FormData;
-};
-export declare const WebSocket: {
+}, WebSocket: {
     new (url: string | URL, protocols?: string | string[]): WebSocket;
     prototype: WebSocket;
     readonly CONNECTING: 0;

package/dist/impl-browser.js

@@ -1,12 +1,6 @@
 if (typeof globalThis == 'undefined' || typeof globalThis.fetch != 'function') {
     throw new TypeError(`globalThis or fetch is not defined on the global object, you should load polyfill of fetch.`);
 }
-export const fetch = globalThis.fetch;
-export const Headers = globalThis.Headers;
-export const Response = globalThis.Response;
-export const Request = globalThis.Request;
-export const File = globalThis.File;
-export const FormData = globalThis.FormData;
-export const WebSocket = globalThis.WebSocket;
+export const { fetch, Headers, Response, Request, File, FormData, WebSocket } = globalThis;
 export default fetch;
 //# sourceMappingURL=impl-browser.js.map

package/dist/impl-browser.js.map

@@ -1 +1 @@
-{"version":3,"file":"impl-browser.js","sourceRoot":"","sources":["../src/impl-browser.ts"],"names":[],"mappings":"AAAA,IAAI,OAAO,UAAU,IAAI,WAAW,IAAI,OAAO,UAAU,CAAC,KAAK,IAAI,UAAU,EAAE,CAAC;IAC5E,MAAM,IAAI,SAAS,CAAC,6FAA6F,CAAC,CAAC;AACvH,CAAC;AAED,MAAM,CAAC,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC;AACtC,MAAM,CAAC,MAAM,OAAO,GAAG,UAAU,CAAC,OAAO,CAAC;AAC1C,MAAM,CAAC,MAAM,QAAQ,GAAG,UAAU,CAAC,QAAQ,CAAC;AAC5C,MAAM,CAAC,MAAM,OAAO,GAAG,UAAU,CAAC,OAAO,CAAC;AAC1C,MAAM,CAAC,MAAM,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC;AACpC,MAAM,CAAC,MAAM,QAAQ,GAAG,UAAU,CAAC,QAAQ,CAAC;AAC5C,MAAM,CAAC,MAAM,SAAS,GAAG,UAAU,CAAC,SAAS,CAAC;AAE9C,eAAe,KAAK,CAAC"}
+{"version":3,"file":"impl-browser.js","sourceRoot":"","sources":["../src/impl-browser.ts"],"names":[],"mappings":"AAAA,IAAI,OAAO,UAAU,IAAI,WAAW,IAAI,OAAO,UAAU,CAAC,KAAK,IAAI,UAAU,EAAE,CAAC;IAC5E,MAAM,IAAI,SAAS,CAAC,6FAA6F,CAAC,CAAC;AACvH,CAAC;AAED,MAAM,CAAC,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,UAAU,CAAC;AAE3F,eAAe,KAAK,CAAC"}

package/dist/impl-node.js

@@ -50,6 +50,7 @@ class AutoProxyAgent extends DispatcherBase {
 }
 const dispatcher = new AutoProxyAgent();
 /** 自动支持代理的 fetch */
+// eslint-disable-next-line @typescript-eslint/promise-function-async
 export const fetch = function (url, init) {
     return nodeFetch(url, { ...init, dispatcher });
 };
@@ -75,7 +76,6 @@ else {
     let ws;
     try {
         if (typeof require == 'function') {
-            // eslint-disable-next-line @typescript-eslint/no-var-requires
             ws = require('ws');
         }
         else {

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/dist/index.d.ts

@@ -1,2 +1,2 @@
 export { File, FormData, fetch, fetch as default, Request, Response, Headers, WebSocket } from '#impl';
-export { connected, disconnected, WEB_SOCKET_STATUS_CODES } from './ws-utils.js';
+export { connected, disconnect, disconnected, WebSocketStatusCode, WebSocketError, type WebSocketStatus, } from './ws-utils.js';

package/dist/index.js

@@ -1,3 +1,3 @@
 export { File, FormData, fetch, fetch as default, Request, Response, Headers, WebSocket } from '#impl';
-export { connected, disconnected, WEB_SOCKET_STATUS_CODES } from './ws-utils.js';
+export { connected, disconnect, disconnected, WebSocketStatusCode, WebSocketError, } from './ws-utils.js';
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,IAAI,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AACvG,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,IAAI,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AACvG,OAAO,EACH,SAAS,EACT,UAAU,EACV,YAAY,EACZ,mBAAmB,EACnB,cAAc,GAEjB,MAAM,eAAe,CAAC"}

package/dist/ws-utils.d.ts

@@ -1,4 +1,4 @@
-export declare enum WEB_SOCKET_STATUS_CODES {
+export declare enum WebSocketStatusCode {
     /** Status codes in the range 0-999 are not used. */
     /**
        1000 indicates a normal closure, meaning that the purpose for
@@ -129,5 +129,22 @@ export declare enum WEB_SOCKET_STATUS_CODES {
 }
 /** 等待连接建立 */
 export declare function connected(socket: WebSocket): Promise<void>;
+/** WebSocket 结束状态 */
+export interface WebSocketStatus {
+    /** WebSocket connection close code */
+    code: WebSocketStatusCode;
+    /** WebSocket connection close reason */
+    reason: string;
+}
+/** WebSocket 结束状态 */
+export declare class WebSocketError extends Error implements WebSocketStatus {
+    constructor(code: WebSocketStatusCode, reason: string);
+    /** WebSocket connection close code */
+    code: WebSocketStatusCode;
+    /** WebSocket connection close reason */
+    reason: string;
+}
 /** 等待连接断开 */
-export declare function disconnected(socket: WebSocket): Promise<void>;
+export declare function disconnected(socket: WebSocket): Promise<WebSocketStatus>;
+/** 断开连接 */
+export declare function disconnect(socket: WebSocket, code?: WebSocketStatusCode, reason?: string): Promise<WebSocketStatus>;

package/dist/ws-utils.js

@@ -1,37 +1,37 @@
-export var WEB_SOCKET_STATUS_CODES;
-(function (WEB_SOCKET_STATUS_CODES) {
+export var WebSocketStatusCode;
+(function (WebSocketStatusCode) {
     /** Status codes in the range 0-999 are not used. */
     /**
        1000 indicates a normal closure, meaning that the purpose for
       which the connection was established has been fulfilled.
      */
-    WEB_SOCKET_STATUS_CODES[WEB_SOCKET_STATUS_CODES["NORMAL_CLOSURE"] = 1000] = "NORMAL_CLOSURE";
+    WebSocketStatusCode[WebSocketStatusCode["NORMAL_CLOSURE"] = 1000] = "NORMAL_CLOSURE";
     /**
      * 1001 indicates that an endpoint is "going away", such as a server
      * going down or a browser having navigated away from a page.
      */
-    WEB_SOCKET_STATUS_CODES[WEB_SOCKET_STATUS_CODES["GOING_AWAY"] = 1001] = "GOING_AWAY";
+    WebSocketStatusCode[WebSocketStatusCode["GOING_AWAY"] = 1001] = "GOING_AWAY";
     /**
      * 1002 indicates that an endpoint is terminating the connection due
      * to a protocol error.
      */
-    WEB_SOCKET_STATUS_CODES[WEB_SOCKET_STATUS_CODES["PROTOCOL_ERROR"] = 1002] = "PROTOCOL_ERROR";
+    WebSocketStatusCode[WebSocketStatusCode["PROTOCOL_ERROR"] = 1002] = "PROTOCOL_ERROR";
     /**
      * 1003 indicates that an endpoint is terminating the connection
      * because it has received a type of data it cannot accept (e.g., an
      * endpoint that understands only text data MAY send this if it
      * receives a binary message).
      */
-    WEB_SOCKET_STATUS_CODES[WEB_SOCKET_STATUS_CODES["UNSUPPORTED_DATA"] = 1003] = "UNSUPPORTED_DATA";
+    WebSocketStatusCode[WebSocketStatusCode["UNSUPPORTED_DATA"] = 1003] = "UNSUPPORTED_DATA";
     /** Reserved.  The specific meaning might be defined in the future. */
-    WEB_SOCKET_STATUS_CODES[WEB_SOCKET_STATUS_CODES["RESERVED"] = 1004] = "RESERVED";
+    WebSocketStatusCode[WebSocketStatusCode["RESERVED"] = 1004] = "RESERVED";
     /**
      * 1005 is a reserved value and MUST NOT be set as a status code in a
      * Close control frame by an endpoint.  It is designated for use in
      * applications expecting a status code to indicate that no status
      * code was actually present.
      */
-    WEB_SOCKET_STATUS_CODES[WEB_SOCKET_STATUS_CODES["NO_STATUS_RECEIVED"] = 1005] = "NO_STATUS_RECEIVED";
+    WebSocketStatusCode[WebSocketStatusCode["NO_STATUS_RECEIVED"] = 1005] = "NO_STATUS_RECEIVED";
     /**
      * 1006 is a reserved value and MUST NOT be set as a status code in a
      * Close control frame by an endpoint.  It is designated for use in
@@ -39,14 +39,14 @@ export var WEB_SOCKET_STATUS_CODES;
      * connection was closed abnormally, e.g., without sending or
      * receiving a Close control frame.
      */
-    WEB_SOCKET_STATUS_CODES[WEB_SOCKET_STATUS_CODES["ABNORMAL_CLOSURE"] = 1006] = "ABNORMAL_CLOSURE";
+    WebSocketStatusCode[WebSocketStatusCode["ABNORMAL_CLOSURE"] = 1006] = "ABNORMAL_CLOSURE";
     /**
      * 1007 indicates that an endpoint is terminating the connection
      * because it has received data within a message that was not
      * consistent with the type of the message (e.g., non-UTF-8 [RFC3629]
      * data within a text message).
      */
-    WEB_SOCKET_STATUS_CODES[WEB_SOCKET_STATUS_CODES["INVALID_FRAME_PAYLOAD_DATA"] = 1007] = "INVALID_FRAME_PAYLOAD_DATA";
+    WebSocketStatusCode[WebSocketStatusCode["INVALID_FRAME_PAYLOAD_DATA"] = 1007] = "INVALID_FRAME_PAYLOAD_DATA";
     /**
      * 1008 indicates that an endpoint is terminating the connection
      * because it has received a message that violates its policy.  This
@@ -54,13 +54,13 @@ export var WEB_SOCKET_STATUS_CODES;
      * other more suitable status code (e.g., 1003 or 1009) or if there
      * is a need to hide specific details about the policy.
      */
-    WEB_SOCKET_STATUS_CODES[WEB_SOCKET_STATUS_CODES["POLICY_VIOLATION"] = 1008] = "POLICY_VIOLATION";
+    WebSocketStatusCode[WebSocketStatusCode["POLICY_VIOLATION"] = 1008] = "POLICY_VIOLATION";
     /**
      * 1009 indicates that an endpoint is terminating the connection
      * because it has received a message that is too big for it to
      * process.
      */
-    WEB_SOCKET_STATUS_CODES[WEB_SOCKET_STATUS_CODES["MESSAGE_TOO_BIG"] = 1009] = "MESSAGE_TOO_BIG";
+    WebSocketStatusCode[WebSocketStatusCode["MESSAGE_TOO_BIG"] = 1009] = "MESSAGE_TOO_BIG";
     /**
      * 1010 indicates that an endpoint (client) is terminating the
      * connection because it has expected the server to negotiate one or
@@ -70,27 +70,27 @@ export var WEB_SOCKET_STATUS_CODES;
      * Note that this status code is not used by the server, because it
      * can fail the WebSocket handshake instead.
      */
-    WEB_SOCKET_STATUS_CODES[WEB_SOCKET_STATUS_CODES["MISSING_EXTENSION"] = 1010] = "MISSING_EXTENSION";
+    WebSocketStatusCode[WebSocketStatusCode["MISSING_EXTENSION"] = 1010] = "MISSING_EXTENSION";
     /**
      * 1011 indicates that a server is terminating the connection because
      * it encountered an unexpected condition that prevented it from
      * fulfilling the request.
      */
-    WEB_SOCKET_STATUS_CODES[WEB_SOCKET_STATUS_CODES["INTERNAL_ERROR"] = 1011] = "INTERNAL_ERROR";
+    WebSocketStatusCode[WebSocketStatusCode["INTERNAL_ERROR"] = 1011] = "INTERNAL_ERROR";
     /**
      * 1012 indicates that the service is restarted.  A client may
      * reconnect, and if it chooses to do, should reconnect using a
      * randomized delay of 5 - 30s.
      * @deprecated
      */
-    WEB_SOCKET_STATUS_CODES[WEB_SOCKET_STATUS_CODES["SERVICE_RESTART"] = 1012] = "SERVICE_RESTART";
+    WebSocketStatusCode[WebSocketStatusCode["SERVICE_RESTART"] = 1012] = "SERVICE_RESTART";
     /**
      * 1013 indicates that the service is experiencing overload.  A client
      * should only connect to a different IP (when there are multiple for
      * the target) or reconnect to the same IP upon user action.
      * @deprecated
      */
-    WEB_SOCKET_STATUS_CODES[WEB_SOCKET_STATUS_CODES["TRY_AGAIN_LATER"] = 1013] = "TRY_AGAIN_LATER";
+    WebSocketStatusCode[WebSocketStatusCode["TRY_AGAIN_LATER"] = 1013] = "TRY_AGAIN_LATER";
     /**
      * 1014 is a reserved value and MUST NOT be set as a status code in a
      * Close control frame by an endpoint.  It is designated for use in
@@ -99,7 +99,7 @@ export var WEB_SOCKET_STATUS_CODES;
      * (e.g., the server certificate can't be verified).
      * @deprecated
      */
-    WEB_SOCKET_STATUS_CODES[WEB_SOCKET_STATUS_CODES["BAD_GATEWAY"] = 1014] = "BAD_GATEWAY";
+    WebSocketStatusCode[WebSocketStatusCode["BAD_GATEWAY"] = 1014] = "BAD_GATEWAY";
     /**
      * 1015 is a reserved value and MUST NOT be set as a status code in a
      * Close control frame by an endpoint.  It is designated for use in
@@ -107,7 +107,7 @@ export var WEB_SOCKET_STATUS_CODES;
      * connection was closed due to a failure to perform a TLS handshake
      * (e.g., the server certificate can't be verified).
      */
-    WEB_SOCKET_STATUS_CODES[WEB_SOCKET_STATUS_CODES["TLS_HANDSHAKE"] = 1015] = "TLS_HANDSHAKE";
+    WebSocketStatusCode[WebSocketStatusCode["TLS_HANDSHAKE"] = 1015] = "TLS_HANDSHAKE";
     /**
      * Status codes in the range 1000-2999 are reserved for definition by
      * this protocol, its future revisions, and extensions specified in a
@@ -119,15 +119,15 @@ export var WEB_SOCKET_STATUS_CODES;
      * registered directly with IANA.  The interpretation of these codes
      * is undefined by this protocol.
      */
-    WEB_SOCKET_STATUS_CODES[WEB_SOCKET_STATUS_CODES["LIBRARY"] = 3000] = "LIBRARY";
+    WebSocketStatusCode[WebSocketStatusCode["LIBRARY"] = 3000] = "LIBRARY";
     /**
      * Status codes in the range 4000-4999 are reserved for private use
      * and thus can't be registered.  Such codes can be used by prior
      * agreements between WebSocket applications.  The interpretation of
      * these codes is undefined by this protocol.
      */
-    WEB_SOCKET_STATUS_CODES[WEB_SOCKET_STATUS_CODES["APPLICATION"] = 4000] = "APPLICATION";
-})(WEB_SOCKET_STATUS_CODES || (WEB_SOCKET_STATUS_CODES = {}));
+    WebSocketStatusCode[WebSocketStatusCode["APPLICATION"] = 4000] = "APPLICATION";
+})(WebSocketStatusCode || (WebSocketStatusCode = {}));
 /** 等待连接建立 */
 export async function connected(socket) {
     switch (socket.readyState) {
@@ -159,25 +159,53 @@ export async function connected(socket) {
             throw new Error(`Socket is in unknown state.`);
     }
 }
+/** 视为 WebSocket 错误的 code */
+function isWebSocketError(code) {
+    if (code === WebSocketStatusCode.NORMAL_CLOSURE)
+        return false;
+    if (code === WebSocketStatusCode.NO_STATUS_RECEIVED)
+        return false;
+    if (code >= WebSocketStatusCode.LIBRARY)
+        return false;
+    return true;
+}
+/** WebSocket 结束状态 */
+export class WebSocketError extends Error {
+    constructor(code, reason) {
+        let message = reason;
+        if (!reason) {
+            if (code >= WebSocketStatusCode.LIBRARY) {
+                message = `WebSocket error (${code})`;
+            }
+            else {
+                message = WebSocketStatusCode[code] || `WebSocket error (${code})`;
+            }
+        }
+        super(message);
+        this.code = code;
+        this.reason = reason;
+        this.name = 'WebSocketError';
+    }
+    /** WebSocket connection close code */
+    code;
+    /** WebSocket connection close reason */
+    reason;
+}
 /** 等待连接断开 */
 export async function disconnected(socket) {
     switch (socket.readyState) {
         case socket.CONNECTING:
-            await connected(socket);
-            return await disconnected(socket);
         case socket.OPEN:
         case socket.CLOSING:
             return new Promise((resolve, reject) => {
                 const onClose = (ev) => {
                     const code = ev.code;
-                    const reason = ev.reason || WEB_SOCKET_STATUS_CODES[code] || '';
-                    if (code !== WEB_SOCKET_STATUS_CODES.NORMAL_CLOSURE) {
-                        const error = new Error(reason);
-                        error.code = code;
-                        reject(error);
+                    const reason = ev.reason || '';
+                    if (isWebSocketError(code)) {
+                        reject(new WebSocketError(code, reason));
                     }
                     else {
-                        resolve();
+                        resolve({ code, reason });
                     }
                     cleanUp();
                 };
@@ -199,4 +227,19 @@ export async function disconnected(socket) {
             throw new Error(`Socket is in unknown state.`);
     }
 }
+/** 断开连接 */
+export async function disconnect(socket, code, reason) {
+    switch (socket.readyState) {
+        case socket.CONNECTING:
+        case socket.OPEN:
+            socket.close(code, reason);
+            return await disconnected(socket);
+        case socket.CLOSING:
+            throw new Error(`Socket is closing.`);
+        case socket.CLOSED:
+            throw new Error(`Socket is closed.`);
+        default:
+            throw new Error(`Socket is in unknown state.`);
+    }
+}
 //# sourceMappingURL=ws-utils.js.map

package/dist/ws-utils.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudpss/fetch",
-  "version": "0.5.36",
+  "version": "0.5.38",
   "author": "CloudPSS",
   "license": "MIT",
   "keywords": [
@@ -24,10 +24,10 @@
     }
   },
   "dependencies": {
-    "undici": "^6.19.4"
+    "undici": "^6.19.8"
   },
   "devDependencies": {
-    "@types/ws": "^8.5.11"
+    "@types/ws": "^8.5.12"
   },
   "scripts": {
     "start": "pnpm clean && tsc --watch",

package/src/impl-browser.ts

@@ -2,12 +2,6 @@ if (typeof globalThis == 'undefined' || typeof globalThis.fetch != 'function') {
     throw new TypeError(`globalThis or fetch is not defined on the global object, you should load polyfill of fetch.`);
 }
 
-export const fetch = globalThis.fetch;
-export const Headers = globalThis.Headers;
-export const Response = globalThis.Response;
-export const Request = globalThis.Request;
-export const File = globalThis.File;
-export const FormData = globalThis.FormData;
-export const WebSocket = globalThis.WebSocket;
+export const { fetch, Headers, Response, Request, File, FormData, WebSocket } = globalThis;
 
 export default fetch;

package/src/impl-node.ts

@@ -67,6 +67,7 @@ class AutoProxyAgent extends DispatcherBase {
 const dispatcher = new AutoProxyAgent();
 
 /** 自动支持代理的 fetch */
+// eslint-disable-next-line @typescript-eslint/promise-function-async
 export const fetch = function (url: RequestInfo | URL, init?: RequestInit): Promise<Response> {
     return nodeFetch(
         url as NodeRequestInfo,
@@ -95,7 +96,6 @@ if (NodeWebSocket != null) {
     let ws: typeof import('ws') | undefined;
     try {
         if (typeof require == 'function') {
-            // eslint-disable-next-line @typescript-eslint/no-var-requires
             ws = require('ws') as typeof import('ws');
         } else {
             ws = createRequire(import.meta.url)('ws') as typeof import('ws');

package/src/index.ts

@@ -1,2 +1,9 @@
 export { File, FormData, fetch, fetch as default, Request, Response, Headers, WebSocket } from '#impl';
-export { connected, disconnected, WEB_SOCKET_STATUS_CODES } from './ws-utils.js';
+export {
+    connected,
+    disconnect,
+    disconnected,
+    WebSocketStatusCode,
+    WebSocketError,
+    type WebSocketStatus,
+} from './ws-utils.js';

package/src/ws-utils.ts

@@ -1,4 +1,4 @@
-export enum WEB_SOCKET_STATUS_CODES {
+export enum WebSocketStatusCode {
     /** Status codes in the range 0-999 are not used. */
 
     /**
@@ -163,24 +163,58 @@ export async function connected(socket: WebSocket): Promise<void> {
     }
 }
 
+/** 视为 WebSocket 错误的 code */
+function isWebSocketError(code: WebSocketStatusCode): boolean {
+    if (code === WebSocketStatusCode.NORMAL_CLOSURE) return false;
+    if (code === WebSocketStatusCode.NO_STATUS_RECEIVED) return false;
+    if (code >= WebSocketStatusCode.LIBRARY) return false;
+    return true;
+}
+
+/** WebSocket 结束状态 */
+export interface WebSocketStatus {
+    /** WebSocket connection close code */
+    code: WebSocketStatusCode;
+    /** WebSocket connection close reason */
+    reason: string;
+}
+
+/** WebSocket 结束状态 */
+export class WebSocketError extends Error implements WebSocketStatus {
+    constructor(code: WebSocketStatusCode, reason: string) {
+        let message = reason;
+        if (!reason) {
+            if (code >= WebSocketStatusCode.LIBRARY) {
+                message = `WebSocket error (${code})`;
+            } else {
+                message = WebSocketStatusCode[code] || `WebSocket error (${code})`;
+            }
+        }
+        super(message);
+        this.code = code;
+        this.reason = reason;
+        this.name = 'WebSocketError';
+    }
+    /** WebSocket connection close code */
+    code: WebSocketStatusCode;
+    /** WebSocket connection close reason */
+    reason: string;
+}
+
 /** 等待连接断开 */
-export async function disconnected(socket: WebSocket): Promise<void> {
+export async function disconnected(socket: WebSocket): Promise<WebSocketStatus> {
     switch (socket.readyState) {
         case socket.CONNECTING:
-            await connected(socket);
-            return await disconnected(socket);
         case socket.OPEN:
         case socket.CLOSING:
             return new Promise((resolve, reject) => {
                 const onClose = (ev: CloseEvent): void => {
-                    const code = ev.code as WEB_SOCKET_STATUS_CODES;
-                    const reason = ev.reason || WEB_SOCKET_STATUS_CODES[code] || '';
-                    if (code !== WEB_SOCKET_STATUS_CODES.NORMAL_CLOSURE) {
-                        const error = new Error(reason);
-                        (error as Error & { code: number }).code = code;
-                        reject(error);
+                    const code = ev.code as WebSocketStatusCode;
+                    const reason = ev.reason || '';
+                    if (isWebSocketError(code)) {
+                        reject(new WebSocketError(code, reason));
                     } else {
-                        resolve();
+                        resolve({ code, reason });
                     }
                     cleanUp();
                 };
@@ -202,3 +236,23 @@ export async function disconnected(socket: WebSocket): Promise<void> {
             throw new Error(`Socket is in unknown state.`);
     }
 }
+
+/** 断开连接 */
+export async function disconnect(
+    socket: WebSocket,
+    code?: WebSocketStatusCode,
+    reason?: string,
+): Promise<WebSocketStatus> {
+    switch (socket.readyState) {
+        case socket.CONNECTING:
+        case socket.OPEN:
+            socket.close(code, reason);
+            return await disconnected(socket);
+        case socket.CLOSING:
+            throw new Error(`Socket is closing.`);
+        case socket.CLOSED:
+            throw new Error(`Socket is closed.`);
+        default:
+            throw new Error(`Socket is in unknown state.`);
+    }
+}

package/tests/e2e.js

@@ -72,50 +72,4 @@ describe('node fetch works', () => {
             }),
         );
     });
-
-    it('can access websocket echo server', async () => {
-        const messages = /** @type {string[]} */ ([]);
-        const ws = new Node.WebSocket('wss://echo.websocket.org');
-        expect(ws.readyState).toBe(Node.WebSocket.CONNECTING);
-        await Index.connected(ws);
-        expect(ws.readyState).toBe(Node.WebSocket.OPEN);
-        await Index.connected(ws);
-        expect(ws.readyState).toBe(Node.WebSocket.OPEN);
-        ws.send('hello');
-        ws.onmessage = (e) => {
-            messages.push(e.data);
-            if (messages.length === 2) {
-                ws.close(1000);
-                expect(ws.readyState).toBe(Node.WebSocket.CLOSING);
-            }
-        };
-        await Index.disconnected(ws);
-        expect(ws.readyState).toBe(Node.WebSocket.CLOSED);
-        await expect(() => Index.disconnected(ws)).rejects.toThrow('Socket is closed.');
-        expect(messages).toContain('hello');
-    });
-
-    it('can throw on websocket error', async () => {
-        const ws = new Node.WebSocket('wss://echo.websocket.org');
-        await Index.connected(ws);
-        ws.close();
-        await expect(() => Index.disconnected(ws)).rejects.toThrow('NO_STATUS_RECEIVED');
-    });
-
-    it('can throw on websocket connection bas state', async () => {
-        const ws = new Node.WebSocket('wss://echo.websocket.org');
-        ws.close();
-        await expect(() => Index.connected(ws)).rejects.toThrow('Socket is closing.');
-    });
-
-    it('can throw on websocket disconnection bas state', async () => {
-        const ws = new Node.WebSocket('wss://echo.websocket.org');
-        ws.close();
-        await expect(() => Index.disconnected(ws)).rejects.toThrow('Received network error or non-101 status code.');
-    });
-
-    it('can throw on websocket connection error', async () => {
-        const ws = new Node.WebSocket('wss://example.org');
-        await expect(() => Index.connected(ws)).rejects.toThrow('Received network error or non-101 status code.');
-    });
 });

package/tests/ws/connencted.js

@@ -0,0 +1,37 @@
+import { WebSocket, disconnected, connected } from '../../dist/index.js';
+
+describe('connected works', () => {
+    it('can wait connected from CONNECTING state', async () => {
+        const ws = new WebSocket('wss://echo.websocket.org');
+        await expect(connected(ws)).resolves.toBeUndefined();
+        ws.close(1000);
+    });
+
+    it('can wait connected from OPEN state', async () => {
+        const ws = new WebSocket('wss://echo.websocket.org');
+        await connected(ws);
+        await expect(connected(ws)).resolves.toBeUndefined();
+        ws.close(1000);
+    });
+
+    it('can not wait connected from CLOSING state', async () => {
+        const ws = new WebSocket('wss://echo.websocket.org');
+        await connected(ws);
+        ws.close(1000);
+        await expect(connected(ws)).rejects.toThrow(`Socket is closing.`);
+    });
+
+    it('can not wait connected from CLOSING state (direct close)', async () => {
+        const ws = new WebSocket('wss://echo.websocket.org');
+        ws.close(1000);
+        await expect(connected(ws)).rejects.toThrow(`Socket is closing.`);
+    });
+
+    it('can not wait connected from CLOSED state', async () => {
+        const ws = new WebSocket('wss://echo.websocket.org');
+        await connected(ws);
+        ws.close(1000);
+        await disconnected(ws);
+        await expect(connected(ws)).rejects.toThrow(`Socket is closed.`);
+    });
+});

package/tests/ws/disconnect.js

@@ -0,0 +1,35 @@
+import { WebSocket, disconnected, connected, disconnect } from '../../dist/index.js';
+
+describe('disconnect works', () => {
+    it('can disconnect from CONNECTING state', async () => {
+        const ws = new WebSocket('wss://echo.websocket.org');
+        await expect(disconnect(ws, 1000)).rejects.toThrow('Received network error or non-101 status code.');
+    });
+
+    it('can disconnect from OPEN state', async () => {
+        const ws = new WebSocket('wss://echo.websocket.org');
+        await connected(ws);
+        await expect(disconnect(ws, 1000)).resolves.toEqual({ code: 1000, reason: '' });
+    });
+
+    it('can not disconnect from CLOSING state', async () => {
+        const ws = new WebSocket('wss://echo.websocket.org');
+        await connected(ws);
+        ws.close(1000);
+        await expect(disconnect(ws, 1000)).rejects.toThrow(`Socket is closing.`);
+    });
+
+    it('can not disconnect from CLOSING state (direct close)', async () => {
+        const ws = new WebSocket('wss://echo.websocket.org');
+        ws.close(1000);
+        await expect(disconnect(ws, 1000)).rejects.toThrow(`Socket is closing.`);
+    });
+
+    it('can not disconnect from CLOSED state', async () => {
+        const ws = new WebSocket('wss://echo.websocket.org');
+        await connected(ws);
+        ws.close(1000);
+        await disconnected(ws);
+        await expect(disconnect(ws, 1000)).rejects.toThrow(`Socket is closed.`);
+    });
+});

package/tests/ws/e2e.js

@@ -0,0 +1,36 @@
+import { WebSocket, WebSocketStatusCode, disconnected, connected, disconnect } from '../../dist/index.js';
+
+describe('websocket works', () => {
+    it('can access websocket echo server', async () => {
+        const messages = /** @type {string[]} */ ([]);
+        const ws = new WebSocket('wss://echo.websocket.org');
+        expect(ws.readyState).toBe(WebSocket.CONNECTING);
+        await connected(ws);
+        expect(ws.readyState).toBe(WebSocket.OPEN);
+        await connected(ws);
+        expect(ws.readyState).toBe(WebSocket.OPEN);
+        ws.send('hello');
+        // eslint-disable-next-line unicorn/prefer-add-event-listener
+        ws.onmessage = (e) => {
+            messages.push(e.data);
+            if (messages.length === 2) {
+                ws.close(1000, 'normal');
+                expect(ws.readyState).toBe(WebSocket.CLOSING);
+            }
+        };
+        await expect(disconnected(ws)).resolves.toEqual({
+            code: WebSocketStatusCode.NORMAL_CLOSURE,
+            reason: '',
+        });
+        expect(messages).toContain('hello');
+        expect(ws.readyState).toBe(WebSocket.CLOSED);
+        await expect(disconnected(ws)).rejects.toThrow('Socket is closed.');
+        await expect(connected(ws)).rejects.toThrow('Socket is closed.');
+        await expect(disconnect(ws, 1000)).rejects.toThrow(`Socket is closed.`);
+    });
+
+    it('can throw on websocket connection error', async () => {
+        const ws = new WebSocket('wss://example.org');
+        await expect(connected(ws)).rejects.toThrow('Received network error or non-101 status code.');
+    });
+});

package/tests/ws/state.js

@@ -0,0 +1,37 @@
+import { WebSocket, WebSocketStatusCode, disconnected, connected } from '../../dist/index.js';
+
+describe('connected/disconnected works', () => {
+    it('can resolve 1005', async () => {
+        const ws = new WebSocket('wss://echo.websocket.org');
+        await connected(ws);
+        ws.close();
+        await expect(disconnected(ws)).resolves.toEqual({
+            code: WebSocketStatusCode.NO_STATUS_RECEIVED,
+            reason: '',
+        });
+    });
+
+    it('can resolve 3000', async () => {
+        const ws = new WebSocket('wss://echo.websocket.org');
+        await connected(ws);
+        ws.close(3000);
+        await expect(disconnected(ws)).resolves.toEqual({
+            code: 3000,
+            reason: '',
+        });
+    });
+
+    it('can wait disconnect from CONNECTING state', async () => {
+        const ws = new WebSocket('wss://echo.websocket.org');
+        const d = disconnected(ws);
+        await connected(ws);
+        ws.close(1000);
+        await expect(d).resolves.toEqual({ code: 1000, reason: '' });
+    });
+
+    it('can throw on websocket disconnection bad state', async () => {
+        const ws = new WebSocket('wss://echo.websocket.org');
+        ws.close();
+        await expect(disconnected(ws)).rejects.toThrow('Received network error or non-101 status code.');
+    });
+});