@lvce-editor/auth-worker 1.9.0 → 1.11.0

package/dist/authWorkerMain.js

@@ -267,45 +267,6 @@ const readyMessage = 'ready';
 const getData$2 = event => {
   return event.data;
 };
-const listen$8 = ({
-  port
-}) => {
-  return port;
-};
-const signal$9 = port => {
-  port.postMessage(readyMessage);
-};
-class IpcChildWithMessagePort extends Ipc {
-  getData(event) {
-    return getData$2(event);
-  }
-  send(message) {
-    this._rawIpc.postMessage(message);
-  }
-  sendAndTransfer(message) {
-    const transfer = getTransferrables(message);
-    this._rawIpc.postMessage(message, transfer);
-  }
-  dispose() {
-    // ignore
-  }
-  onClose(callback) {
-    // ignore
-  }
-  onMessage(callback) {
-    this._rawIpc.addEventListener('message', callback);
-    this._rawIpc.start();
-  }
-}
-const wrap$g = port => {
-  return new IpcChildWithMessagePort(port);
-};
-const IpcChildWithMessagePort$1 = {
-  __proto__: null,
-  listen: listen$8,
-  signal: signal$9,
-  wrap: wrap$g
-};
 const listen$7 = () => {
   // @ts-ignore
   if (typeof WorkerGlobalScope === 'undefined') {
@@ -342,70 +303,11 @@ class IpcChildWithModuleWorker extends Ipc {
 const wrap$f = global => {
   return new IpcChildWithModuleWorker(global);
 };
-const waitForFirstMessage = async port => {
-  const {
-    promise,
-    resolve
-  } = Promise.withResolvers();
-  port.addEventListener('message', resolve, {
-    once: true
-  });
-  const event = await promise;
-  // @ts-ignore
-  return event.data;
-};
-const listen$6 = async () => {
-  const parentIpcRaw = listen$7();
-  signal$8(parentIpcRaw);
-  const parentIpc = wrap$f(parentIpcRaw);
-  const firstMessage = await waitForFirstMessage(parentIpc);
-  if (firstMessage.method !== 'initialize') {
-    throw new IpcError('unexpected first message');
-  }
-  const type = firstMessage.params[0];
-  if (type === 'message-port') {
-    parentIpc.send({
-      id: firstMessage.id,
-      jsonrpc: '2.0',
-      result: null
-    });
-    parentIpc.dispose();
-    const port = firstMessage.params[1];
-    return port;
-  }
-  return globalThis;
-};
-class IpcChildWithModuleWorkerAndMessagePort extends Ipc {
-  getData(event) {
-    return getData$2(event);
-  }
-  send(message) {
-    this._rawIpc.postMessage(message);
-  }
-  sendAndTransfer(message) {
-    const transfer = getTransferrables(message);
-    this._rawIpc.postMessage(message, transfer);
-  }
-  dispose() {
-    if (this._rawIpc.close) {
-      this._rawIpc.close();
-    }
-  }
-  onClose(callback) {
-    // ignore
-  }
-  onMessage(callback) {
-    this._rawIpc.addEventListener('message', callback);
-    this._rawIpc.start();
-  }
-}
-const wrap$e = port => {
-  return new IpcChildWithModuleWorkerAndMessagePort(port);
-};
-const IpcChildWithModuleWorkerAndMessagePort$1 = {
+const IpcChildWithModuleWorker$1 = {
   __proto__: null,
-  listen: listen$6,
-  wrap: wrap$e
+  listen: listen$7,
+  signal: signal$8,
+  wrap: wrap$f
 };
 const addListener = (emitter, type, callback) => {
   if ('addEventListener' in emitter) {
@@ -737,7 +639,7 @@ const getErrorResponse = (id, error, preparePrettyError, logError) => {
   const errorProperty = getErrorProperty(error, prettyError);
   return create$1$1(id, errorProperty);
 };
-const create$9 = (message, result) => {
+const create$8 = (message, result) => {
   return {
     id: message.id,
     jsonrpc: Two$1,
@@ -746,7 +648,7 @@ const create$9 = (message, result) => {
 };
 const getSuccessResponse = (message, result) => {
   const resultProperty = result ?? null;
-  return create$9(message, resultProperty);
+  return create$8(message, resultProperty);
 };
 const getErrorResponseSimple = (id, error) => {
   return {
@@ -840,7 +742,7 @@ const handleJsonRpcMessage = async (...args) => {
 
 const Two = '2.0';
 
-const create$8 = (method, params) => {
+const create$7 = (method, params) => {
   return {
     jsonrpc: Two,
     method,
@@ -848,7 +750,7 @@ const create$8 = (method, params) => {
   };
 };
 
-const create$7 = (id, method, params) => {
+const create$6 = (id, method, params) => {
   const message = {
     id,
     jsonrpc: Two,
@@ -859,12 +761,12 @@ const create$7 = (id, method, params) => {
 };
 
 let id = 0;
-const create$6 = () => {
+const create$5 = () => {
   return ++id;
 };
 
 const registerPromise = map => {
-  const id = create$6();
+  const id = create$5();
   const {
     promise,
     resolve
@@ -881,7 +783,7 @@ const invokeHelper = async (callbacks, ipc, method, params, useSendAndTransfer)
     id,
     promise
   } = registerPromise(callbacks);
-  const message = create$7(id, method, params);
+  const message = create$6(id, method, params);
   if (useSendAndTransfer && ipc.sendAndTransfer) {
     ipc.sendAndTransfer(message);
   } else {
@@ -917,7 +819,7 @@ const createRpc = ipc => {
      * @deprecated
      */
     send(method, ...params) {
-      const message = create$8(method, params);
+      const message = create$7(method, params);
       ipc.send(message);
     }
   };
@@ -957,7 +859,7 @@ const listen$1 = async (module, options) => {
   return ipc;
 };
 
-const create$5 = async ({
+const create$4 = async ({
   commandMap,
   isMessagePortOpen = true,
   messagePort
@@ -975,7 +877,7 @@ const create$5 = async ({
   return rpc;
 };
 
-const create$4 = async ({
+const create$3 = async ({
   commandMap,
   isMessagePortOpen,
   send
@@ -985,7 +887,7 @@ const create$4 = async ({
     port2
   } = new MessageChannel();
   await send(port1);
-  return create$5({
+  return create$4({
     commandMap,
     isMessagePortOpen,
     messagePort: port2
@@ -1020,13 +922,13 @@ const createSharedLazyRpc = factory => {
   };
 };
 
-const create$3 = async ({
+const create$2 = async ({
   commandMap,
   isMessagePortOpen,
   send
 }) => {
   return createSharedLazyRpc(() => {
-    return create$4({
+    return create$3({
       commandMap,
       isMessagePortOpen,
       send
@@ -1034,26 +936,12 @@ const create$3 = async ({
   });
 };
 
-const create$2 = async ({
-  commandMap,
-  messagePort
-}) => {
-  // TODO create a commandMap per rpc instance
-  register(commandMap);
-  const ipc = await listen$1(IpcChildWithMessagePort$1, {
-    port: messagePort
-  });
-  handleIpc(ipc);
-  const rpc = createRpc(ipc);
-  return rpc;
-};
-
 const create$1 = async ({
   commandMap
 }) => {
   // TODO create a commandMap per rpc instance
   register(commandMap);
-  const ipc = await listen$1(IpcChildWithModuleWorkerAndMessagePort$1);
+  const ipc = await listen$1(IpcChildWithModuleWorker$1);
   handleIpc(ipc);
   const rpc = createRpc(ipc);
   return rpc;
@@ -1080,7 +968,7 @@ const createMockRpc = ({
 };
 
 const rpcs = Object.create(null);
-const set$2 = (id, rpc) => {
+const set$3 = (id, rpc) => {
   rpcs[id] = rpc;
 };
 const get = id => {
@@ -1113,7 +1001,7 @@ const create = rpcId => {
       const mockRpc = createMockRpc({
         commandMap
       });
-      set$2(rpcId, mockRpc);
+      set$3(rpcId, mockRpc);
       // @ts-ignore
       mockRpc[Symbol.dispose] = () => {
         remove(rpcId);
@@ -1122,11 +1010,16 @@ const create = rpcId => {
       return mockRpc;
     },
     set(rpc) {
-      set$2(rpcId, rpc);
+      set$3(rpcId, rpc);
     }
   };
 };
 
+const {
+  invoke: invoke$2,
+  set: set$2
+} = create(6040);
+
 const Electron = 2;
 
 const OpenerWorker = 4561;
@@ -1146,23 +1039,42 @@ const sendMessagePortToOpenerWorker$1 = async (port, rpcId) => {
   const command = 'HandleMessagePort.handleMessagePort';
   await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToOpenerWorker', port, command, rpcId);
 };
+const sendMessagePortToSharedProcess = async port => {
+  const command = 'HandleElectronMessagePort.handleElectronMessagePort';
+  await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToSharedProcess', port, command, 0);
+};
+
+const sendMessagePortToAuthProcess = async port => {
+  await sendMessagePortToSharedProcess(port);
+};
+const initializeAuthProcess = async () => {
+  const rpc = await create$2({
+    commandMap: {},
+    send: sendMessagePortToAuthProcess
+  });
+  set$2(rpc);
+};
 
 const sendMessagePortToOpenerWorker = async port => {
   await sendMessagePortToOpenerWorker$1(port, 0);
 };
 const initializeOpenerWorker = async () => {
-  const rpc = await create$3({
+  const rpc = await create$2({
     commandMap: {},
     send: sendMessagePortToOpenerWorker
   });
   set$1(rpc);
 };
 
-const handleMessagePort = async port => {
-  await create$2({
+const handleMessagePort = async (port, rpcId) => {
+  const rpc = await create$4({
     commandMap: commandMap,
+    isMessagePortOpen: true,
     messagePort: port
   });
+  if (rpcId) {
+    set$3(rpcId, rpc);
+  }
 };
 
 const initialize = async platform => {
@@ -1613,8 +1525,8 @@ const errorHtml = `<!doctype html>
   </body>
 </html>`;
 
-const getElectronRedirectUri = async (uid, invoke) => {
-  const localOauthServerPort = await invoke('OAuthServer.create', String(uid), successHtml, errorHtml);
+const getElectronRedirectUri = async uid => {
+  const localOauthServerPort = await invoke$2('OAuthServer.create', String(uid), successHtml, errorHtml);
   return `http://localhost:${localOauthServerPort}`;
 };
 
@@ -1623,7 +1535,7 @@ const getEffectiveRedirectUri = async (platform, uid, redirectUri) => {
     return redirectUri;
   }
   if (platform === Electron) {
-    return getElectronRedirectUri(uid, invoke);
+    return getElectronRedirectUri(uid);
   }
   return getCurrentHref();
 };
@@ -1788,7 +1700,8 @@ const commandMap = {
   'Auth.setNextLoginResponse': setNextLoginResponse,
   'Auth.setNextRefreshResponse': setNextRefreshResponse,
   'Auth.syncBackendAuth': syncBackendAuth,
-  'HandleMessagePort.handleMessagePort': handleMessagePort
+  'HandleMessagePort.handleMessagePort': handleMessagePort,
+  initialize: (_, port) => handleMessagePort(port)
 };
 
 const initializeRendererWorker = async () => {
@@ -1799,7 +1712,7 @@ const initializeRendererWorker = async () => {
 };
 
 const listen = async () => {
-  await Promise.all([initializeRendererWorker(), initializeOpenerWorker()]);
+  await Promise.all([initializeRendererWorker(), initializeOpenerWorker(), initializeAuthProcess()]);
 };
 
 const main = async () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/auth-worker",
-  "version": "1.9.0",
+  "version": "1.11.0",
   "description": "Auth Worker",
   "repository": {
     "type": "git",