@lvce-editor/renderer-process 30.64.3 → 30.64.5

package/dist/rendererProcessMain.js

@@ -1463,32 +1463,47 @@ const createClient = url => {
 
 const commandMapRef = {};
 
-const workers$1 = new Set();
+const workers$1 = new Map();
 const state$m = {
-  generation: 0
+  generation: 0,
+  nextId: 0
 };
 const getGeneration = () => state$m.generation;
-const track = (worker, startedIn = state$m.generation) => {
+const createRuntimeName = name => {
+  state$m.nextId++;
+  const id = `worker-${state$m.nextId}`;
+  return {
+    id,
+    name,
+    runtimeName: `${name} [${id}]`
+  };
+};
+const track = (worker, startedIn = state$m.generation, trackedWorker) => {
   if (startedIn !== state$m.generation) {
     worker.terminate();
     throw new Error('Worker launch canceled by application restart');
   }
-  workers$1.add(worker);
+  if (workers$1.has(worker)) {
+    return;
+  }
+  const metadata = trackedWorker || createRuntimeName(worker.name || 'Worker');
+  workers$1.set(worker, metadata);
 };
 const remove$5 = worker => {
   workers$1.delete(worker);
 };
+const getWorkers$1 = () => workers$1.values().toArray();
 const terminateAll = () => {
   state$m.generation++;
-  const retiring = [...workers$1];
+  const retiring = workers$1.keys().toArray();
   workers$1.clear();
   for (const worker of retiring) {
     worker.terminate();
   }
 };
-const trackRpc = (rpc, generation) => {
+const trackRpc = (rpc, generation, trackedWorker) => {
   const worker = rpc.ipc?._rawIpc;
-  if (worker) track(worker, generation);
+  if (worker) track(worker, generation, trackedWorker);
 };
 
 const success = value => {
@@ -1930,6 +1945,7 @@ const dragAndDropWorkerUrl = getConfiguredDragAndDropWorkerUrl() || `${assetDir}
 
 const launchDragAndDropWorker = async () => {
   const generation = getGeneration();
+  const trackedWorker = createRuntimeName('Drag And Drop Worker');
   try {
     const {
       port1,
@@ -1937,11 +1953,11 @@ const launchDragAndDropWorker = async () => {
     } = new MessageChannel();
     const workerRpc = await create$C({
       commandMap: {},
-      name: 'Drag And Drop Worker',
+      name: trackedWorker.runtimeName,
       port: port1,
       url: dragAndDropWorkerUrl
     });
-    trackRpc(workerRpc, generation);
+    trackRpc(workerRpc, generation, trackedWorker);
     const rpc = await create$E({
       commandMap: commandMapRef,
       messagePort: port2
@@ -4227,28 +4243,37 @@ const create$z = async ({
   name,
   url
 }) => {
+  const trackedWorker = createRuntimeName(getWorkerDisplayName(name));
   const worker = new Worker(url, {
-    name,
+    name: trackedWorker.runtimeName,
     type: Module
   });
-  track(worker);
-  // @ts-expect-error
-  const {
-    event,
-    type
-  } = await getFirstWorkerEvent(worker);
-  switch (type) {
-    case Message:
-      if (event.data !== 'ready') {
-        throw new IpcError('unexpected first message from worker');
-      }
-      break;
-    case Error$3:
-      if (isErrorEvent(event)) {
-        throw new WorkerError(event);
-      }
-      const displayName = getWorkerDisplayName(name);
-      throw new IpcError(`Failed to start ${displayName}`);
+  track(worker, undefined, trackedWorker);
+  try {
+    // @ts-expect-error
+    const {
+      event,
+      type
+    } = await getFirstWorkerEvent(worker);
+    switch (type) {
+      case Message:
+        if (event.data !== 'ready') {
+          throw new IpcError('unexpected first message from worker');
+        }
+        break;
+      case Error$3:
+        if (isErrorEvent(event)) {
+          throw new WorkerError(event);
+        }
+        const displayName = getWorkerDisplayName(name);
+        throw new IpcError(`Failed to start ${displayName}`);
+      default:
+        break;
+    }
+  } catch (error) {
+    remove$5(worker);
+    worker.terminate();
+    throw error;
   }
   return worker;
 };
@@ -4368,14 +4393,15 @@ const create$w = async ({
   url
 }, createTransferredRpc = create$C, createNativeRpc = create$D) => {
   const generation = getGeneration();
+  const trackedWorker = createRuntimeName(name || 'Worker');
   const rpc = await (rpcId === undefined ? createTransferredRpc({
     commandMap: {},
-    name,
+    name: trackedWorker.runtimeName,
     port,
     url
   }) : createNativeRpc({
     commandMap: {},
-    name,
+    name: trackedWorker.runtimeName,
     url
   }));
   if (rpcId !== undefined) {
@@ -4384,7 +4410,7 @@ const create$w = async ({
   }
   const worker = rpc.ipc?._rawIpc;
   if (worker) {
-    track(worker, generation);
+    track(worker, generation, trackedWorker);
   }
   if (typeof id === 'number' && raw && worker) {
     set$7(id, worker);
@@ -11737,6 +11763,8 @@ const readMicLevels = options => {
   };
 };
 
+const getWorkers = getWorkers$1;
+
 const commandMap = {
   'ApplicationHost.fileSaved': fileSaved,
   'Audio.play': play,
@@ -11877,6 +11905,7 @@ const commandMap = {
   'Window.unmaximize': unmaximize,
   'WindowTitle.set': set$1,
   'Workbench.setModernUi': setModernUi,
+  'Workers.getWorkers': getWorkers,
   'Workspace.setUri': setUri
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/renderer-process",
-  "version": "30.64.3",
+  "version": "30.64.5",
   "keywords": [
     "lvce-editor",
     "renderer-process"