@lvce-editor/api 8.77.0 → 8.78.0

package/dist/parts/Rpc/Rpc.d.ts

@@ -6,9 +6,7 @@ export interface CreateRpcOptions {
     readonly url: string;
 }
 export interface CreateNodeRpcOptions {
-    readonly id?: string;
-    readonly name?: string;
-    readonly path?: string;
+    readonly id: string;
 }
 export declare const createRpc: ({ commandMap, contentSecurityPolicy, name, url }: CreateRpcOptions) => Promise<Rpc>;
-export declare const createNodeRpc: (options: CreateNodeRpcOptions) => Promise<Rpc>;
+export declare const createNodeRpc: ({ id }: CreateNodeRpcOptions) => Promise<Rpc>;

package/dist/parts/Rpc/Rpc.js

@@ -1,4 +1,4 @@
-import { MessagePortRpcParent } from '@lvce-editor/rpc';
+import { MessagePortRpcParent, WebSocketRpcParent } from '@lvce-editor/rpc';
 import { ExtensionManagementWorker } from '@lvce-editor/rpc-registry';
 const sendMessagePortToWebWorker = async (port, contentSecurityPolicy, name, url) => {
     await ExtensionManagementWorker.invokeAndTransfer('Extensions.createWebViewWorkerRpc2', { contentSecurityPolicy, name, url }, port);
@@ -17,25 +17,28 @@ const createMessagePortRpc = async (commandMap, send) => {
 export const createRpc = async ({ commandMap = {}, contentSecurityPolicy = '', name = '', url }) => {
     return createMessagePortRpc(commandMap, (port) => sendMessagePortToWebWorker(port, contentSecurityPolicy, name, url));
 };
-const resolveNodeRpcOptions = async ({ id, name = '', path }) => {
-    if (id) {
-        return ExtensionManagementWorker.invoke('Extensions.getNodeRpcInfo', id);
+const isMissingCommand = (error, command) => {
+    return error instanceof Error && error.message.includes(command) && /command not found|not found/i.test(error.message);
+};
+const getNodeRpcConnection = async (id) => {
+    if (!id) {
+        throw new TypeError('createNodeRpc requires an id');
+    }
+    try {
+        const connectionInfo = (await ExtensionManagementWorker.invoke('Extensions.createNodeRpcConnection', id));
+        return connectionInfo;
     }
-    if (path) {
-        return { name, path };
+    catch (error) {
+        if (!isMissingCommand(error, 'Extensions.createNodeRpcConnection')) {
+            throw error;
+        }
+        const { name, path } = (await ExtensionManagementWorker.invoke('Extensions.getNodeRpcInfo', id));
+        return { name, path, type: 'old-legacy-proxy' };
     }
-    throw new TypeError('createNodeRpc requires an id or path');
 };
-export const createNodeRpc = async (options) => {
-    const { name, path } = await resolveNodeRpcOptions(options);
-    const rpcId = await ExtensionManagementWorker.invoke('Extensions.executeCommand', 'ExtensionNodeRpc.create', name, path);
-    const invoke = (method, ...params) => {
-        return ExtensionManagementWorker.invoke('Extensions.executeCommand', 'ExtensionNodeRpc.invoke', rpcId, method, ...params);
-    };
+const createProxyRpc = (invoke, dispose) => {
     return {
-        async dispose() {
-            await ExtensionManagementWorker.invoke('Extensions.executeCommand', 'ExtensionNodeRpc.dispose', rpcId);
-        },
+        dispose,
         invoke,
         invokeAndTransfer: invoke,
         send(method, ...params) {
@@ -43,3 +46,29 @@ export const createNodeRpc = async (options) => {
         },
     };
 };
+const createLegacyProxyRpc = async (id) => {
+    const rpcId = await ExtensionManagementWorker.invoke('Extensions.createLegacyNodeRpc', id);
+    return createProxyRpc((method, ...params) => ExtensionManagementWorker.invoke('Extensions.invokeLegacyNodeRpc', rpcId, method, ...params), () => ExtensionManagementWorker.invoke('Extensions.disposeLegacyNodeRpc', rpcId));
+};
+const createOldLegacyProxyRpc = async (name, path) => {
+    const rpcId = await ExtensionManagementWorker.invoke('Extensions.executeCommand', 'ExtensionNodeRpc.create', name, path);
+    return createProxyRpc((method, ...params) => ExtensionManagementWorker.invoke('Extensions.executeCommand', 'ExtensionNodeRpc.invoke', rpcId, method, ...params), () => ExtensionManagementWorker.invoke('Extensions.executeCommand', 'ExtensionNodeRpc.dispose', rpcId));
+};
+export const createNodeRpc = async ({ id }) => {
+    const connectionInfo = await getNodeRpcConnection(id);
+    if (connectionInfo.type === 'message-port') {
+        return createMessagePortRpc({}, (port) => ExtensionManagementWorker.invokeAndTransfer('Extensions.createNodeRpcMessagePort', id, port));
+    }
+    if (connectionInfo.type === 'legacy-proxy') {
+        return createLegacyProxyRpc(id);
+    }
+    if (connectionInfo.type === 'old-legacy-proxy') {
+        return createOldLegacyProxyRpc(connectionInfo.name, connectionInfo.path);
+    }
+    const { protocols, url } = connectionInfo;
+    const webSocket = new WebSocket(url, protocols);
+    return WebSocketRpcParent.create({
+        commandMap: {},
+        webSocket,
+    });
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/api",
-  "version": "8.77.0",
+  "version": "8.78.0",
   "description": "Tree-shakeable extension API for Lvce Editor extensions.",
   "keywords": [
     "lvce-editor",