@vitejs/devtools-kit 0.0.0-alpha.19 → 0.0.0-alpha.20

package/dist/client.d.mts

@@ -1,3 +1,2 @@
-import "./events-DDdYnct9.mjs";
-import { a as DockEntryState, c as DocksContext, d as ClientRpcReturn, f as DevToolsRpcClient, i as DockClientType, l as DocksEntriesContext, m as getDevToolsRpcClient, n as DevToolsClientContext, o as DockEntryStateEvents, p as DevToolsRpcClientOptions, r as DevToolsClientRpcHost, s as DockPanelStorage, t as DockClientScriptContext, u as DocksPanelContext } from "./index-CgOheNVD.mjs";
-export { ClientRpcReturn, DevToolsClientContext, DevToolsClientRpcHost, DevToolsRpcClient, DevToolsRpcClientOptions, DockClientScriptContext, DockClientType, DockEntryState, DockEntryStateEvents, DockPanelStorage, DocksContext, DocksEntriesContext, DocksPanelContext, getDevToolsRpcClient };
+import { a as DockEntryState, c as DocksContext, d as RpcClientEvents, f as DevToolsRpcClient, i as DockClientType, l as DocksEntriesContext, m as getDevToolsRpcClient, n as DevToolsClientContext, o as DockEntryStateEvents, p as DevToolsRpcClientOptions, r as DevToolsClientRpcHost, s as DockPanelStorage, t as DockClientScriptContext, u as DocksPanelContext } from "./index-DLPbKO1M.mjs";
+export { DevToolsClientContext, DevToolsClientRpcHost, DevToolsRpcClient, DevToolsRpcClientOptions, DockClientScriptContext, DockClientType, DockEntryState, DockEntryStateEvents, DockPanelStorage, DocksContext, DocksEntriesContext, DocksPanelContext, RpcClientEvents, getDevToolsRpcClient };

package/dist/client.mjs

@@ -1,3 +1,4 @@
+import { t as createEventEmitter } from "./events-AmnAXhnR.mjs";
 import { RpcFunctionsCollectorBase } from "birpc-x";
 import { createRpcClient } from "@vitejs/devtools-rpc";
 import { createWsRpcPreset } from "@vitejs/devtools-rpc/presets/ws/client";
@@ -10,9 +11,9 @@ function isNumeric(str) {
 }
 function findConnectionMetaFromWindows() {
 	const getters = [
-		() => window[CONNECTION_META_KEY],
-		() => globalThis[CONNECTION_META_KEY],
-		() => parent.window[CONNECTION_META_KEY]
+		() => window?.[CONNECTION_META_KEY],
+		() => globalThis?.[CONNECTION_META_KEY],
+		() => parent.window?.[CONNECTION_META_KEY]
 	];
 	for (const getter of getters) try {
 		const value = getter();
@@ -21,6 +22,7 @@ function findConnectionMetaFromWindows() {
 }
 async function getDevToolsRpcClient(options = {}) {
 	const { baseURL = "/.devtools/", rpcOptions = {} } = options;
+	const events = createEventEmitter();
 	const bases = Array.isArray(baseURL) ? baseURL : [baseURL];
 	let connectionMeta = options.connectionMeta || findConnectionMetaFromWindows();
 	if (!connectionMeta) {
@@ -37,19 +39,29 @@ async function getDevToolsRpcClient(options = {}) {
 	const url = isNumeric(connectionMeta.websocket) ? `${location.protocol.replace("http", "ws")}//${location.hostname}:${connectionMeta.websocket}` : connectionMeta.websocket;
 	const context = { rpc: void 0 };
 	const clientRpc = new RpcFunctionsCollectorBase(context);
-	const rpc = createRpcClient(clientRpc.functions, {
+	const serverRpc = createRpcClient(clientRpc.functions, {
 		preset: createWsRpcPreset({
 			url,
 			...options.wsOptions
 		}),
 		rpcOptions
 	});
-	context.rpc = rpc;
-	return {
+	const rpc = {
+		events,
 		connectionMeta,
-		rpc,
-		clientRpc
+		call: (...args) => {
+			return serverRpc.$call(...args);
+		},
+		callEvent: (...args) => {
+			return serverRpc.$callEvent(...args);
+		},
+		callOptional: (...args) => {
+			return serverRpc.$callOptional(...args);
+		},
+		client: clientRpc
 	};
+	context.rpc = rpc;
+	return rpc;
 }
 
 //#endregion

package/dist/events-AmnAXhnR.mjs

@@ -0,0 +1,41 @@
+//#region src/utils/events.ts
+/**
+* Create event emitter.
+*/
+function createEventEmitter() {
+	const _listeners = {};
+	function emit(event, ...args) {
+		const callbacks = _listeners[event] || [];
+		for (let i = 0, length = callbacks.length; i < length; i++) {
+			const callback = callbacks[i];
+			if (callback) callback(...args);
+		}
+	}
+	function emitOnce(event, ...args) {
+		emit(event, ...args);
+		delete _listeners[event];
+	}
+	function on(event, cb) {
+		(_listeners[event] ||= []).push(cb);
+		return () => {
+			_listeners[event] = _listeners[event]?.filter((i) => cb !== i);
+		};
+	}
+	function once(event, cb) {
+		const unsubscribe = on(event, ((...args) => {
+			unsubscribe();
+			return cb(...args);
+		}));
+		return unsubscribe;
+	}
+	return {
+		_listeners,
+		emit,
+		emitOnce,
+		on,
+		once
+	};
+}
+
+//#endregion
+export { createEventEmitter as t };

package/dist/{events-DDdYnct9.d.mts → events-S6nCJ_5X.d.mts}

@@ -16,7 +16,14 @@ interface EventEmitter<Events extends EventsMap> {
    * @param event The event name.
    * @param args The arguments for listeners.
    */
-  emit: <K extends keyof Events>(this: this, event: K, ...args: Parameters<Events[K]>) => void;
+  emit: <K extends keyof Events>(event: K, ...args: Parameters<Events[K]>) => void;
+  /**
+   * Calls the listeners for a given event once and then removes the listener.
+   *
+   * @param event The event name.
+   * @param args The arguments for listeners.
+   */
+  emitOnce: <K extends keyof Events>(event: K, ...args: Parameters<Events[K]>) => void;
   /**
    * Event names in keys and arrays with listeners in values.
    *
@@ -40,7 +47,25 @@ interface EventEmitter<Events extends EventsMap> {
    * @param cb The listener function.
    * @returns Unbind listener from event.
    */
-  on: <K extends keyof Events>(this: this, event: K, cb: Events[K]) => EventUnsubscribe;
+  on: <K extends keyof Events>(event: K, cb: Events[K]) => EventUnsubscribe;
+  /**
+   * Add a listener for a given event once.
+   *
+   * ```js
+   * const unbind = ee.once('tick', (tickType, tickDuration) => {
+   *   count += 1
+   * })
+   *
+   * disable () {
+   *   unbind()
+   * }
+   * ```
+   *
+   * @param event The event name.
+   * @param cb The listener function.
+   * @returns Unbind listener from event.
+   */
+  once: <K extends keyof Events>(event: K, cb: Events[K]) => EventUnsubscribe;
 }
 //#endregion
 export { EventUnsubscribe as n, EventsMap as r, EventEmitter as t };

package/dist/{index-CgOheNVD.d.mts → index-DLPbKO1M.d.mts}

@@ -1,10 +1,9 @@
-import { t as EventEmitter } from "./events-DDdYnct9.mjs";
+import { t as EventEmitter } from "./events-S6nCJ_5X.mjs";
 import { RpcDefinitionsFilter, RpcDefinitionsToFunctions, RpcFunctionsCollector, RpcFunctionsCollectorBase } from "birpc-x";
-import { WebSocketRpcClientOptions } from "@vitejs/devtools-rpc/presets/ws/client";
 import { Raw } from "vue";
-import { BirpcGroup, BirpcOptions, BirpcReturn } from "birpc";
 import { Plugin, ResolvedConfig, ViteDevServer } from "vite";
 import { ChildProcess } from "node:child_process";
+import { BirpcOptions, BirpcReturn } from "birpc";
 
 //#region src/types/docks.d.ts
 interface DevToolsDockHost {
@@ -207,7 +206,7 @@ interface ConnectionMeta {
 //#endregion
 //#region src/types/rpc.d.ts
 type RpcFunctionsHost = RpcFunctionsCollectorBase<DevToolsRpcServerFunctions, DevToolsNodeContext> & {
-  boardcast: BirpcGroup<DevToolsRpcClientFunctions, DevToolsRpcServerFunctions>['broadcast'];
+  boardcast: <T extends keyof DevToolsRpcClientFunctions, Args extends Parameters<DevToolsRpcClientFunctions[T]>>(name: T, ...args: Args) => Promise<(Awaited<ReturnType<DevToolsRpcClientFunctions[T]>> | undefined)[]>;
 };
 //#endregion
 //#region src/types/utils.d.ts
@@ -229,20 +228,48 @@ interface PluginWithDevTools extends Plugin {
   devtools?: DevToolsPluginOptions;
 }
 //#endregion
+//#region ../rpc/src/presets/ws/client.d.ts
+interface WebSocketRpcClientOptions {
+  url: string;
+  onConnected?: (e: Event) => void;
+  onError?: (e: Error) => void;
+  onDisconnected?: (e: CloseEvent) => void;
+}
+//#endregion
 //#region src/client/rpc.d.ts
 interface DevToolsRpcClientOptions {
   connectionMeta?: ConnectionMeta;
   baseURL?: string[];
   wsOptions?: Partial<WebSocketRpcClientOptions>;
-  rpcOptions?: Partial<BirpcOptions<DevToolsRpcServerFunctions>>;
+  rpcOptions?: Partial<BirpcOptions<DevToolsRpcServerFunctions, DevToolsRpcClientFunctions, boolean>>;
 }
-type DevToolsRpcClient = BirpcReturn<DevToolsRpcServerFunctions, DevToolsRpcClientFunctions>;
-interface ClientRpcReturn {
-  connectionMeta: ConnectionMeta;
-  rpc: DevToolsRpcClient;
-  clientRpc: DevToolsClientRpcHost;
+interface DevToolsRpcClient {
+  /**
+   * The events of the client
+   */
+  events: EventEmitter<RpcClientEvents>;
+  /**
+   * The connection meta
+   */
+  readonly connectionMeta: ConnectionMeta;
+  /**
+   * Call a RPC function on the server
+   */
+  call: BirpcReturn<DevToolsRpcServerFunctions, DevToolsRpcClientFunctions>['$call'];
+  /**
+   * Call a RPC event on the server, and does not expect a response
+   */
+  callEvent: BirpcReturn<DevToolsRpcServerFunctions, DevToolsRpcClientFunctions>['$callEvent'];
+  /**
+   * Call a RPC optional function on the server
+   */
+  callOptional: BirpcReturn<DevToolsRpcServerFunctions, DevToolsRpcClientFunctions>['$callOptional'];
+  /**
+   * The client RPC host
+   */
+  client: DevToolsClientRpcHost;
 }
-declare function getDevToolsRpcClient(options?: DevToolsRpcClientOptions): Promise<ClientRpcReturn>;
+declare function getDevToolsRpcClient(options?: DevToolsRpcClientOptions): Promise<DevToolsRpcClient>;
 //#endregion
 //#region src/client/docks.d.ts
 interface DockPanelStorage {
@@ -277,10 +304,6 @@ interface DocksContext extends DevToolsClientContext {
    * The docks entries context
    */
   readonly docks: DocksEntriesContext;
-  /**
-   * The client-side RPC functions to be called from the server
-   */
-  readonly clientRpc: DevToolsClientRpcHost;
 }
 type DevToolsClientRpcHost = RpcFunctionsCollector<DevToolsRpcClientFunctions, DevToolsClientContext>;
 interface DocksPanelContext {
@@ -321,6 +344,7 @@ interface DockEntryStateEvents {
   'dom:panel:mounted': (panel: HTMLDivElement) => void;
   'dom:iframe:mounted': (iframe: HTMLIFrameElement) => void;
 }
+interface RpcClientEvents {}
 //#endregion
 //#region src/client/client-script.d.ts
 /**
@@ -333,4 +357,4 @@ interface DockClientScriptContext extends DocksContext {
   current: DockEntryState;
 }
 //#endregion
-export { DevToolsTerminalHost as A, DevToolsDockEntryCategory as B, DevToolsCapabilities as C, DevToolsViewHost as D, DevToolsPluginOptions as E, DevToolsRpcClientFunctions as F, DevToolsViewBuiltin as G, DevToolsDockHost as H, DevToolsRpcServerFunctions as I, DevToolsViewLauncher as J, DevToolsViewCustomRender as K, ClientScriptEntry as L, DevToolsTerminalSessionBase as M, DevToolsTerminalSessionStreamChunkEvent as N, DevToolsChildProcessExecuteOptions as O, DevToolsTerminalStatus as P, DevToolsDockEntry as R, ConnectionMeta as S, DevToolsNodeUtils as T, DevToolsDockUserEntry as U, DevToolsDockEntryIcon as V, DevToolsViewAction as W, DevToolsViewLauncherStatus as Y, PluginWithDevTools as _, DockEntryState as a, Thenable as b, DocksContext as c, ClientRpcReturn as d, DevToolsRpcClient as f, RpcDefinitionsToFunctions as g, RpcDefinitionsFilter as h, DockClientType as i, DevToolsTerminalSession as j, DevToolsChildProcessTerminalSession as k, DocksEntriesContext as l, getDevToolsRpcClient as m, DevToolsClientContext as n, DockEntryStateEvents as o, DevToolsRpcClientOptions as p, DevToolsViewIframe as q, DevToolsClientRpcHost as r, DockPanelStorage as s, DockClientScriptContext as t, DocksPanelContext as u, EntriesToObject as v, DevToolsNodeContext as w, RpcFunctionsHost as x, PartialWithoutId as y, DevToolsDockEntryBase as z };
+export { DevToolsTerminalHost as A, DevToolsDockEntryCategory as B, DevToolsCapabilities as C, DevToolsViewHost as D, DevToolsPluginOptions as E, DevToolsRpcClientFunctions as F, DevToolsViewBuiltin as G, DevToolsDockHost as H, DevToolsRpcServerFunctions as I, DevToolsViewLauncher as J, DevToolsViewCustomRender as K, ClientScriptEntry as L, DevToolsTerminalSessionBase as M, DevToolsTerminalSessionStreamChunkEvent as N, DevToolsChildProcessExecuteOptions as O, DevToolsTerminalStatus as P, DevToolsDockEntry as R, ConnectionMeta as S, DevToolsNodeUtils as T, DevToolsDockUserEntry as U, DevToolsDockEntryIcon as V, DevToolsViewAction as W, DevToolsViewLauncherStatus as Y, PluginWithDevTools as _, DockEntryState as a, Thenable as b, DocksContext as c, RpcClientEvents as d, DevToolsRpcClient as f, RpcDefinitionsToFunctions as g, RpcDefinitionsFilter as h, DockClientType as i, DevToolsTerminalSession as j, DevToolsChildProcessTerminalSession as k, DocksEntriesContext as l, getDevToolsRpcClient as m, DevToolsClientContext as n, DockEntryStateEvents as o, DevToolsRpcClientOptions as p, DevToolsViewIframe as q, DevToolsClientRpcHost as r, DockPanelStorage as s, DockClientScriptContext as t, DocksPanelContext as u, EntriesToObject as v, DevToolsNodeContext as w, RpcFunctionsHost as x, PartialWithoutId as y, DevToolsDockEntryBase as z };

package/dist/index.d.mts

@@ -1,5 +1,5 @@
-import { n as EventUnsubscribe, r as EventsMap, t as EventEmitter } from "./events-DDdYnct9.mjs";
-import { A as DevToolsTerminalHost, B as DevToolsDockEntryCategory, C as DevToolsCapabilities, D as DevToolsViewHost, E as DevToolsPluginOptions, F as DevToolsRpcClientFunctions, G as DevToolsViewBuiltin, H as DevToolsDockHost, I as DevToolsRpcServerFunctions, J as DevToolsViewLauncher, K as DevToolsViewCustomRender, L as ClientScriptEntry, M as DevToolsTerminalSessionBase, N as DevToolsTerminalSessionStreamChunkEvent, O as DevToolsChildProcessExecuteOptions, P as DevToolsTerminalStatus, R as DevToolsDockEntry, S as ConnectionMeta, T as DevToolsNodeUtils, U as DevToolsDockUserEntry, V as DevToolsDockEntryIcon, W as DevToolsViewAction, Y as DevToolsViewLauncherStatus, _ as PluginWithDevTools, b as Thenable, g as RpcDefinitionsToFunctions, h as RpcDefinitionsFilter, j as DevToolsTerminalSession, k as DevToolsChildProcessTerminalSession, q as DevToolsViewIframe, v as EntriesToObject, w as DevToolsNodeContext, x as RpcFunctionsHost, y as PartialWithoutId, z as DevToolsDockEntryBase } from "./index-CgOheNVD.mjs";
+import { n as EventUnsubscribe, r as EventsMap, t as EventEmitter } from "./events-S6nCJ_5X.mjs";
+import { A as DevToolsTerminalHost, B as DevToolsDockEntryCategory, C as DevToolsCapabilities, D as DevToolsViewHost, E as DevToolsPluginOptions, F as DevToolsRpcClientFunctions, G as DevToolsViewBuiltin, H as DevToolsDockHost, I as DevToolsRpcServerFunctions, J as DevToolsViewLauncher, K as DevToolsViewCustomRender, L as ClientScriptEntry, M as DevToolsTerminalSessionBase, N as DevToolsTerminalSessionStreamChunkEvent, O as DevToolsChildProcessExecuteOptions, P as DevToolsTerminalStatus, R as DevToolsDockEntry, S as ConnectionMeta, T as DevToolsNodeUtils, U as DevToolsDockUserEntry, V as DevToolsDockEntryIcon, W as DevToolsViewAction, Y as DevToolsViewLauncherStatus, _ as PluginWithDevTools, b as Thenable, g as RpcDefinitionsToFunctions, h as RpcDefinitionsFilter, j as DevToolsTerminalSession, k as DevToolsChildProcessTerminalSession, q as DevToolsViewIframe, v as EntriesToObject, w as DevToolsNodeContext, x as RpcFunctionsHost, y as PartialWithoutId, z as DevToolsDockEntryBase } from "./index-DLPbKO1M.mjs";
 import * as birpc_x0 from "birpc-x";
 
 //#region src/utils/define.d.ts

package/dist/utils/events.d.mts

@@ -1,4 +1,4 @@
-import { r as EventsMap, t as EventEmitter } from "../events-DDdYnct9.mjs";
+import { r as EventsMap, t as EventEmitter } from "../events-S6nCJ_5X.mjs";
 
 //#region src/utils/events.d.ts
 

package/dist/utils/events.mjs

@@ -1,26 +1,3 @@
-//#region src/utils/events.ts
-/**
-* Create event emitter.
-*/
-function createEventEmitter() {
-	const _listeners = {};
-	return {
-		emit(event, ...args) {
-			const callbacks = _listeners[event] || [];
-			for (let i = 0, length = callbacks.length; i < length; i++) {
-				const callback = callbacks[i];
-				if (callback) callback(...args);
-			}
-		},
-		_listeners,
-		on(event, cb) {
-			(_listeners[event] ||= []).push(cb);
-			return () => {
-				_listeners[event] = _listeners[event]?.filter((i) => cb !== i);
-			};
-		}
-	};
-}
+import { t as createEventEmitter } from "../events-AmnAXhnR.mjs";
 
-//#endregion
 export { createEventEmitter };

package/dist/utils/nanoid.d.mts

@@ -0,0 +1,4 @@
+//#region src/utils/nanoid.d.ts
+declare function nanoid(size?: number): string;
+//#endregion
+export { nanoid };

package/dist/utils/nanoid.mjs

@@ -0,0 +1,11 @@
+//#region src/utils/nanoid.ts
+const urlAlphabet = "useandom-26T198340PX75pxJACKVERYMINDBUSHWOLF_GQZbfghjklqvwyzrict";
+function nanoid(size = 21) {
+	let id = "";
+	let i = size;
+	while (i--) id += urlAlphabet[Math.random() * 64 | 0];
+	return id;
+}
+
+//#endregion
+export { nanoid };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vitejs/devtools-kit",
   "type": "module",
-  "version": "0.0.0-alpha.19",
+  "version": "0.0.0-alpha.20",
   "description": "Vite DevTools Kit",
   "author": "VoidZero Inc.",
   "license": "MIT",
@@ -22,6 +22,7 @@
     ".": "./dist/index.mjs",
     "./client": "./dist/client.mjs",
     "./utils/events": "./dist/utils/events.mjs",
+    "./utils/nanoid": "./dist/utils/nanoid.mjs",
     "./package.json": "./package.json"
   },
   "main": "./dist/index.mjs",
@@ -34,13 +35,14 @@
     "vite": "*"
   },
   "dependencies": {
-    "birpc": "^2.8.0",
-    "birpc-x": "0.0.5",
-    "@vitejs/devtools-rpc": "0.0.0-alpha.19"
+    "birpc": "^4.0.0",
+    "birpc-x": "0.0.6",
+    "@vitejs/devtools-rpc": "0.0.0-alpha.20"
   },
   "devDependencies": {
-    "tsdown": "^0.16.1",
-    "vite": "npm:rolldown-vite@^7.2.2"
+    "my-ua-parser": "^2.0.4",
+    "tsdown": "^0.17.4",
+    "vite": "^8.0.0-beta.2"
   },
   "scripts": {
     "build": "tsdown",