@vitejs/devtools-rpc 0.0.0-alpha.22 → 0.0.0-alpha.23

package/dist/presets/ws/server.d.mts

@@ -9,6 +9,7 @@ interface DevToolsNodeRpcSessionMeta {
   ws?: WebSocket;
   clientAuthId?: string;
   isTrusted?: boolean;
+  subscribedStates: Set<string>;
 }
 interface WebSocketRpcServerOptions {
   port: number;

package/dist/presets/ws/server.mjs

@@ -31,7 +31,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __require = /* @__PURE__ */ createRequire(import.meta.url);
 
 //#endregion
-//#region ../../node_modules/.pnpm/ws@8.18.3/node_modules/ws/lib/constants.js
+//#region ../../node_modules/.pnpm/ws@8.19.0/node_modules/ws/lib/constants.js
 var require_constants = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	const BINARY_TYPES = [
 		"nodebuffer",
@@ -42,6 +42,7 @@ var require_constants = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	if (hasBlob) BINARY_TYPES.push("blob");
 	module.exports = {
 		BINARY_TYPES,
+		CLOSE_TIMEOUT: 3e4,
 		EMPTY_BUFFER: Buffer.alloc(0),
 		GUID: "258EAFA5-E914-47DA-95CA-C5AB0DC85B11",
 		hasBlob,
@@ -54,7 +55,7 @@ var require_constants = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 }));
 
 //#endregion
-//#region ../../node_modules/.pnpm/ws@8.18.3/node_modules/ws/lib/buffer-util.js
+//#region ../../node_modules/.pnpm/ws@8.19.0/node_modules/ws/lib/buffer-util.js
 var require_buffer_util = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	const { EMPTY_BUFFER } = require_constants();
 	const FastBuffer = Buffer[Symbol.species];
@@ -155,7 +156,7 @@ var require_buffer_util = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 }));
 
 //#endregion
-//#region ../../node_modules/.pnpm/ws@8.18.3/node_modules/ws/lib/limiter.js
+//#region ../../node_modules/.pnpm/ws@8.19.0/node_modules/ws/lib/limiter.js
 var require_limiter = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	const kDone = Symbol("kDone");
 	const kRun = Symbol("kRun");
@@ -207,7 +208,7 @@ var require_limiter = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 }));
 
 //#endregion
-//#region ../../node_modules/.pnpm/ws@8.18.3/node_modules/ws/lib/permessage-deflate.js
+//#region ../../node_modules/.pnpm/ws@8.19.0/node_modules/ws/lib/permessage-deflate.js
 var require_permessage_deflate = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	const zlib = __require("zlib");
 	const bufferUtil = require_buffer_util();
@@ -541,7 +542,7 @@ var require_permessage_deflate = /* @__PURE__ */ __commonJSMin(((exports, module
 }));
 
 //#endregion
-//#region ../../node_modules/.pnpm/ws@8.18.3/node_modules/ws/lib/validation.js
+//#region ../../node_modules/.pnpm/ws@8.19.0/node_modules/ws/lib/validation.js
 var require_validation = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	const { isUtf8 } = __require("buffer");
 	const { hasBlob } = require_constants();
@@ -738,7 +739,7 @@ var require_validation = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 }));
 
 //#endregion
-//#region ../../node_modules/.pnpm/ws@8.18.3/node_modules/ws/lib/receiver.js
+//#region ../../node_modules/.pnpm/ws@8.19.0/node_modules/ws/lib/receiver.js
 var require_receiver = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	const { Writable } = __require("stream");
 	const PerMessageDeflate = require_permessage_deflate();
@@ -1186,7 +1187,7 @@ var require_receiver = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 }));
 
 //#endregion
-//#region ../../node_modules/.pnpm/ws@8.18.3/node_modules/ws/lib/sender.js
+//#region ../../node_modules/.pnpm/ws@8.19.0/node_modules/ws/lib/sender.js
 var require_sender = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	const { Duplex: Duplex$3 } = __require("stream");
 	const { randomFillSync } = __require("crypto");
@@ -1682,7 +1683,7 @@ var require_sender = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 }));
 
 //#endregion
-//#region ../../node_modules/.pnpm/ws@8.18.3/node_modules/ws/lib/event-target.js
+//#region ../../node_modules/.pnpm/ws@8.19.0/node_modules/ws/lib/event-target.js
 var require_event_target = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	const { kForOnEventAttribute, kListener } = require_constants();
 	const kCode = Symbol("kCode");
@@ -1902,7 +1903,7 @@ var require_event_target = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 }));
 
 //#endregion
-//#region ../../node_modules/.pnpm/ws@8.18.3/node_modules/ws/lib/extension.js
+//#region ../../node_modules/.pnpm/ws@8.19.0/node_modules/ws/lib/extension.js
 var require_extension = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	const { tokenChars } = require_validation();
 	/**
@@ -2046,7 +2047,7 @@ var require_extension = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 }));
 
 //#endregion
-//#region ../../node_modules/.pnpm/ws@8.18.3/node_modules/ws/lib/websocket.js
+//#region ../../node_modules/.pnpm/ws@8.19.0/node_modules/ws/lib/websocket.js
 var require_websocket = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	const EventEmitter$1 = __require("events");
 	const https = __require("https");
@@ -2060,11 +2061,10 @@ var require_websocket = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	const Receiver = require_receiver();
 	const Sender = require_sender();
 	const { isBlob } = require_validation();
-	const { BINARY_TYPES, EMPTY_BUFFER, GUID, kForOnEventAttribute, kListener, kStatusCode, kWebSocket, NOOP } = require_constants();
+	const { BINARY_TYPES, CLOSE_TIMEOUT, EMPTY_BUFFER, GUID, kForOnEventAttribute, kListener, kStatusCode, kWebSocket, NOOP } = require_constants();
 	const { EventTarget: { addEventListener, removeEventListener } } = require_event_target();
 	const { format, parse } = require_extension();
 	const { toBuffer } = require_buffer_util();
-	const closeTimeout = 30 * 1e3;
 	const kAborted = Symbol("kAborted");
 	const protocolVersions = [8, 13];
 	const readyStates = [
@@ -2115,6 +2115,7 @@ var require_websocket = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 				initAsClient(this, address, protocols, options);
 			} else {
 				this._autoPong = options.autoPong;
+				this._closeTimeout = options.closeTimeout;
 				this._isServer = true;
 			}
 		}
@@ -2535,6 +2536,8 @@ var require_websocket = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	*     times in the same tick
 	* @param {Boolean} [options.autoPong=true] Specifies whether or not to
 	*     automatically send a pong in response to a ping
+	* @param {Number} [options.closeTimeout=30000] Duration in milliseconds to wait
+	*     for the closing handshake to finish after `websocket.close()` is called
 	* @param {Function} [options.finishRequest] A function which can be used to
 	*     customize the headers of each http request before it is sent
 	* @param {Boolean} [options.followRedirects=false] Whether or not to follow
@@ -2561,6 +2564,7 @@ var require_websocket = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 		const opts = {
 			allowSynchronousEvents: true,
 			autoPong: true,
+			closeTimeout: CLOSE_TIMEOUT,
 			protocolVersion: protocolVersions[1],
 			maxPayload: 100 * 1024 * 1024,
 			skipUTF8Validation: false,
@@ -2578,6 +2582,7 @@ var require_websocket = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 			port: void 0
 		};
 		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(", ")})`);
 		let parsedUrl;
 		if (address instanceof URL) parsedUrl = address;
@@ -2951,7 +2956,7 @@ var require_websocket = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	* @private
 	*/
 	function setCloseTimer(websocket) {
-		websocket._closeTimer = setTimeout(websocket._socket.destroy.bind(websocket._socket), closeTimeout);
+		websocket._closeTimer = setTimeout(websocket._socket.destroy.bind(websocket._socket), websocket._closeTimeout);
 	}
 	/**
 	* The listener of the socket `'close'` event.
@@ -2964,8 +2969,10 @@ var require_websocket = /* @__PURE__ */ __commonJSMin(((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) websocket._receiver.write(chunk);
+		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();
 		this[kWebSocket] = void 0;
 		clearTimeout(websocket._closeTimer);
@@ -3012,7 +3019,7 @@ var require_websocket = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 }));
 
 //#endregion
-//#region ../../node_modules/.pnpm/ws@8.18.3/node_modules/ws/lib/stream.js
+//#region ../../node_modules/.pnpm/ws@8.19.0/node_modules/ws/lib/stream.js
 var require_stream = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	require_websocket();
 	const { Duplex: Duplex$1 } = __require("stream");
@@ -3129,7 +3136,7 @@ var require_stream = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 }));
 
 //#endregion
-//#region ../../node_modules/.pnpm/ws@8.18.3/node_modules/ws/lib/subprotocol.js
+//#region ../../node_modules/.pnpm/ws@8.19.0/node_modules/ws/lib/subprotocol.js
 var require_subprotocol = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	const { tokenChars } = require_validation();
 	/**
@@ -3169,7 +3176,7 @@ var require_subprotocol = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 }));
 
 //#endregion
-//#region ../../node_modules/.pnpm/ws@8.18.3/node_modules/ws/lib/websocket-server.js
+//#region ../../node_modules/.pnpm/ws@8.19.0/node_modules/ws/lib/websocket-server.js
 var require_websocket_server = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	const EventEmitter = __require("events");
 	const http = __require("http");
@@ -3179,7 +3186,7 @@ var require_websocket_server = /* @__PURE__ */ __commonJSMin(((exports, module)
 	const PerMessageDeflate = require_permessage_deflate();
 	const subprotocol = require_subprotocol();
 	const WebSocket = require_websocket();
-	const { GUID, kWebSocket } = require_constants();
+	const { CLOSE_TIMEOUT, GUID, kWebSocket } = require_constants();
 	const keyRegex = /^[+/0-9A-Za-z]{22}==$/;
 	const RUNNING = 0;
 	const CLOSING = 1;
@@ -3203,6 +3210,9 @@ var require_websocket_server = /* @__PURE__ */ __commonJSMin(((exports, module)
 		*     pending connections
 		* @param {Boolean} [options.clientTracking=true] Specifies whether or not to
 		*     track clients
+		* @param {Number} [options.closeTimeout=30000] Duration in milliseconds to
+		*     wait for the closing handshake to finish after `websocket.close()` is
+		*     called
 		* @param {Function} [options.handleProtocols] A hook to handle protocols
 		* @param {String} [options.host] The hostname where to bind the server
 		* @param {Number} [options.maxPayload=104857600] The maximum allowed message
@@ -3231,6 +3241,7 @@ var require_websocket_server = /* @__PURE__ */ __commonJSMin(((exports, module)
 				perMessageDeflate: false,
 				handleProtocols: null,
 				clientTracking: true,
+				closeTimeout: CLOSE_TIMEOUT,
 				verifyClient: null,
 				noServer: false,
 				backlog: null,
@@ -3540,7 +3551,7 @@ var require_websocket_server = /* @__PURE__ */ __commonJSMin(((exports, module)
 }));
 
 //#endregion
-//#region ../../node_modules/.pnpm/ws@8.18.3/node_modules/ws/wrapper.mjs
+//#region ../../node_modules/.pnpm/ws@8.19.0/node_modules/ws/wrapper.mjs
 var import_stream = /* @__PURE__ */ __toESM(require_stream(), 1);
 var import_receiver = /* @__PURE__ */ __toESM(require_receiver(), 1);
 var import_sender = /* @__PURE__ */ __toESM(require_sender(), 1);
@@ -3562,7 +3573,8 @@ const createWsRpcPreset = defineRpcServerPreset((options) => {
 		wss.on("connection", (ws, req) => {
 			const meta = {
 				id: id++,
-				ws
+				ws,
+				subscribedStates: /* @__PURE__ */ new Set()
 			};
 			const channel = {
 				post: (data) => {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vitejs/devtools-rpc",
   "type": "module",
-  "version": "0.0.0-alpha.22",
+  "version": "0.0.0-alpha.23",
   "description": "DevTools rpc for Vite (work in progress)",
   "author": "VoidZero Inc.",
   "license": "MIT",
@@ -41,8 +41,8 @@
     "structured-clone-es": "^1.0.0"
   },
   "devDependencies": {
-    "tsdown": "^0.18.2",
-    "ws": "^8.18.3"
+    "tsdown": "^0.18.4",
+    "ws": "^8.19.0"
   },
   "scripts": {
     "build": "tsdown",