@kevisual/router 0.2.4 → 0.2.5

package/dist/ws.js

@@ -32,7 +32,7 @@ var __toESM = (mod, isNodeMode, target) => {
 var __commonJS = (cb, mod) => () => (mod || cb((mod = { exports: {} }).exports, mod), mod.exports);
 var __require = /* @__PURE__ */ createRequire(import.meta.url);
 
-// node_modules/ws/lib/constants.js
+// ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/constants.js
 var require_constants = __commonJS((exports, module) => {
   var BINARY_TYPES = ["nodebuffer", "arraybuffer", "fragments"];
   var hasBlob = typeof Blob !== "undefined";
@@ -40,6 +40,7 @@ var require_constants = __commonJS((exports, module) => {
     BINARY_TYPES.push("blob");
   module.exports = {
     BINARY_TYPES,
+    CLOSE_TIMEOUT: 30000,
     EMPTY_BUFFER: Buffer.alloc(0),
     GUID: "258EAFA5-E914-47DA-95CA-C5AB0DC85B11",
     hasBlob,
@@ -51,7 +52,7 @@ var require_constants = __commonJS((exports, module) => {
   };
 });
 
-// node_modules/ws/lib/buffer-util.js
+// ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/buffer-util.js
 var require_buffer_util = __commonJS((exports, module) => {
   var { EMPTY_BUFFER } = require_constants();
   var FastBuffer = Buffer[Symbol.species];
@@ -112,7 +113,7 @@ var require_buffer_util = __commonJS((exports, module) => {
   };
 });
 
-// node_modules/ws/lib/limiter.js
+// ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/limiter.js
 var require_limiter = __commonJS((exports, module) => {
   var kDone = Symbol("kDone");
   var kRun = Symbol("kRun");
@@ -144,7 +145,7 @@ var require_limiter = __commonJS((exports, module) => {
   module.exports = Limiter;
 });
 
-// node_modules/ws/lib/permessage-deflate.js
+// ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/permessage-deflate.js
 var require_permessage_deflate = __commonJS((exports, module) => {
   var zlib = __require("zlib");
   var bufferUtil = require_buffer_util();
@@ -399,12 +400,16 @@ var require_permessage_deflate = __commonJS((exports, module) => {
   }
   function inflateOnError(err) {
     this[kPerMessageDeflate]._inflate = null;
+    if (this[kError]) {
+      this[kCallback](this[kError]);
+      return;
+    }
     err[kStatusCode] = 1007;
     this[kCallback](err);
   }
 });
 
-// node_modules/ws/lib/validation.js
+// ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/validation.js
 var require_validation = __commonJS((exports, module) => {
   var { isUtf8 } = __require("buffer");
   var { hasBlob } = require_constants();
@@ -584,7 +589,7 @@ var require_validation = __commonJS((exports, module) => {
   }
 });
 
-// node_modules/ws/lib/receiver.js
+// ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/receiver.js
 var require_receiver = __commonJS((exports, module) => {
   var { Writable } = __require("stream");
   var PerMessageDeflate = require_permessage_deflate();
@@ -965,7 +970,7 @@ var require_receiver = __commonJS((exports, module) => {
   module.exports = Receiver;
 });
 
-// node_modules/ws/lib/sender.js
+// ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/sender.js
 var require_sender = __commonJS((exports, module) => {
   var { Duplex } = __require("stream");
   var { randomFillSync } = __require("crypto");
@@ -1319,7 +1324,7 @@ var require_sender = __commonJS((exports, module) => {
   }
 });
 
-// node_modules/ws/lib/event-target.js
+// ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/event-target.js
 var require_event_target = __commonJS((exports, module) => {
   var { kForOnEventAttribute, kListener } = require_constants();
   var kCode = Symbol("kCode");
@@ -1470,7 +1475,7 @@ var require_event_target = __commonJS((exports, module) => {
   }
 });
 
-// node_modules/ws/lib/extension.js
+// ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/extension.js
 var require_extension = __commonJS((exports, module) => {
   var { tokenChars } = require_validation();
   function push(dest, name, elem) {
@@ -1635,7 +1640,7 @@ var require_extension = __commonJS((exports, module) => {
   module.exports = { format, parse };
 });
 
-// node_modules/ws/lib/websocket.js
+// ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/websocket.js
 var require_websocket = __commonJS((exports, module) => {
   var EventEmitter = __require("events");
   var https = __require("https");
@@ -1651,6 +1656,7 @@ var require_websocket = __commonJS((exports, module) => {
   var { isBlob } = require_validation();
   var {
     BINARY_TYPES,
+    CLOSE_TIMEOUT,
     EMPTY_BUFFER,
     GUID,
     kForOnEventAttribute,
@@ -1664,7 +1670,6 @@ var require_websocket = __commonJS((exports, module) => {
   } = require_event_target();
   var { format, parse } = require_extension();
   var { toBuffer } = require_buffer_util();
-  var closeTimeout = 30 * 1000;
   var kAborted = Symbol("kAborted");
   var protocolVersions = [8, 13];
   var readyStates = ["CONNECTING", "OPEN", "CLOSING", "CLOSED"];
@@ -1704,6 +1709,7 @@ var require_websocket = __commonJS((exports, module) => {
         initAsClient(this, address, protocols, options);
       } else {
         this._autoPong = options.autoPong;
+        this._closeTimeout = options.closeTimeout;
         this._isServer = true;
       }
     }
@@ -1995,6 +2001,7 @@ var require_websocket = __commonJS((exports, module) => {
     const opts = {
       allowSynchronousEvents: true,
       autoPong: true,
+      closeTimeout: CLOSE_TIMEOUT,
       protocolVersion: protocolVersions[1],
       maxPayload: 100 * 1024 * 1024,
       skipUTF8Validation: false,
@@ -2012,6 +2019,7 @@ var require_websocket = __commonJS((exports, module) => {
       port: undefined
     };
     websocket._autoPong = opts.autoPong;
+    websocket._closeTimeout = opts.closeTimeout;
     if (!protocolVersions.includes(opts.protocolVersion)) {
       throw new RangeError(`Unsupported protocol version: ${opts.protocolVersion} ` + `(supported versions: ${protocolVersions.join(", ")})`);
     }
@@ -2350,7 +2358,7 @@ var require_websocket = __commonJS((exports, module) => {
     }
   }
   function setCloseTimer(websocket) {
-    websocket._closeTimer = setTimeout(websocket._socket.destroy.bind(websocket._socket), closeTimeout);
+    websocket._closeTimer = setTimeout(websocket._socket.destroy.bind(websocket._socket), websocket._closeTimeout);
   }
   function socketOnClose() {
     const websocket = this[kWebSocket];
@@ -2358,8 +2366,8 @@ var require_websocket = __commonJS((exports, module) => {
     this.removeListener("data", socketOnData);
     this.removeListener("end", socketOnEnd);
     websocket._readyState = WebSocket.CLOSING;
-    let chunk;
-    if (!this._readableState.endEmitted && !websocket._closeFrameReceived && !websocket._receiver._writableState.errorEmitted && (chunk = websocket._socket.read()) !== null) {
+    if (!this._readableState.endEmitted && !websocket._closeFrameReceived && !websocket._receiver._writableState.errorEmitted && this._readableState.length !== 0) {
+      const chunk = this.read(this._readableState.length);
       websocket._receiver.write(chunk);
     }
     websocket._receiver.end();
@@ -2394,7 +2402,7 @@ var require_websocket = __commonJS((exports, module) => {
   }
 });
 
-// node_modules/ws/lib/stream.js
+// ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/stream.js
 var require_stream = __commonJS((exports, module) => {
   var WebSocket = require_websocket();
   var { Duplex } = __require("stream");
@@ -2497,7 +2505,7 @@ var require_stream = __commonJS((exports, module) => {
   module.exports = createWebSocketStream;
 });
 
-// node_modules/ws/lib/subprotocol.js
+// ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/subprotocol.js
 var require_subprotocol = __commonJS((exports, module) => {
   var { tokenChars } = require_validation();
   function parse(header) {
@@ -2542,7 +2550,7 @@ var require_subprotocol = __commonJS((exports, module) => {
   module.exports = { parse };
 });
 
-// node_modules/ws/lib/websocket-server.js
+// ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/lib/websocket-server.js
 var require_websocket_server = __commonJS((exports, module) => {
   var EventEmitter = __require("events");
   var http = __require("http");
@@ -2552,7 +2560,7 @@ var require_websocket_server = __commonJS((exports, module) => {
   var PerMessageDeflate = require_permessage_deflate();
   var subprotocol = require_subprotocol();
   var WebSocket = require_websocket();
-  var { GUID, kWebSocket } = require_constants();
+  var { CLOSE_TIMEOUT, GUID, kWebSocket } = require_constants();
   var keyRegex = /^[+/0-9A-Za-z]{22}==$/;
   var RUNNING = 0;
   var CLOSING = 1;
@@ -2569,6 +2577,7 @@ var require_websocket_server = __commonJS((exports, module) => {
         perMessageDeflate: false,
         handleProtocols: null,
         clientTracking: true,
+        closeTimeout: CLOSE_TIMEOUT,
         verifyClient: null,
         noServer: false,
         backlog: null,
@@ -2689,9 +2698,11 @@ var require_websocket_server = __commonJS((exports, module) => {
         abortHandshakeOrEmitwsClientError(this, req, socket, 400, message);
         return;
       }
-      if (version !== 8 && version !== 13) {
+      if (version !== 13 && version !== 8) {
         const message = "Missing or invalid Sec-WebSocket-Version header";
-        abortHandshakeOrEmitwsClientError(this, req, socket, 400, message);
+        abortHandshakeOrEmitwsClientError(this, req, socket, 400, message, {
+          "Sec-WebSocket-Version": "13, 8"
+        });
         return;
       }
       if (!this.shouldHandle(req)) {
@@ -2830,18 +2841,18 @@ var require_websocket_server = __commonJS((exports, module) => {
 \r
 ` + message);
   }
-  function abortHandshakeOrEmitwsClientError(server, req, socket, code, message) {
+  function abortHandshakeOrEmitwsClientError(server, req, socket, code, message, headers) {
     if (server.listenerCount("wsClientError")) {
       const err = new Error(message);
       Error.captureStackTrace(err, abortHandshakeOrEmitwsClientError);
       server.emit("wsClientError", err, socket, req);
     } else {
-      abortHandshake(socket, code, message);
+      abortHandshake(socket, code, message, headers);
     }
   }
 });
 
-// node_modules/ws/wrapper.mjs
+// ../../node_modules/.pnpm/@kevisual+ws@8.19.0/node_modules/@kevisual/ws/wrapper.mjs
 var import_stream = __toESM(require_stream(), 1);
 var import_receiver = __toESM(require_receiver(), 1);
 var import_sender = __toESM(require_sender(), 1);

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package",
   "name": "@kevisual/router",
-  "version": "0.2.4",
+  "version": "0.2.5",
   "description": "",
   "type": "module",
   "main": "./dist/router.js",

package/src/commander.ts

@@ -125,6 +125,8 @@ export const parse = async (opts: {
     token?: string,
     username?: string,
     id?: string,
+    /** https://kevisual.cn/ws/proxy */
+    url?: string,
   },
   exitOnEnd?: boolean,
 }) => {
@@ -141,12 +143,13 @@ export const parse = async (opts: {
   createCommand({ app: app as App, program: _program });
 
   if (opts.remote) {
-    const { token, username, id } = opts.remote;
+    const { token, username, id , url } = opts.remote;
     const remoteApp = new RemoteApp({
       app,
       token,
       username,
       id,
+      url,
     });
     const isConnect = await remoteApp.isConnect();
     if (isConnect) {