@lvce-editor/auth-worker 3.18.0 → 3.19.0

package/dist/authWorkerMain.js

@@ -1140,28 +1140,6 @@ const sendMessagePortToOpenerWorker$1 = async (port, rpcId) => {
   await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToOpenerWorker', port, command, rpcId);
 };
 
-const sendMessagePortToAuthProcess = async port => {
-  await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToSharedProcess', port, 'HandleMessagePortForAuthProcess.handleMessagePortForAuthProcess');
-};
-const initializeAuthProcess = async () => {
-  const rpc = await create$2({
-    commandMap: {},
-    send: sendMessagePortToAuthProcess
-  });
-  set$2(rpc);
-};
-
-const sendMessagePortToMainProcess = async port => {
-  await invokeAndTransfer('SendMessagePortToMainProcess.sendMessagePortToMainProcess', port, 'HandleElectronMessagePort.handleElectronMessagePort', 0);
-};
-const initializeMainProcess = async () => {
-  const rpc = await create$2({
-    commandMap: {},
-    send: sendMessagePortToMainProcess
-  });
-  set$1(rpc);
-};
-
 const sendMessagePortToOpenerWorker = async port => {
   await sendMessagePortToOpenerWorker$1(port, 0);
 };
@@ -1275,7 +1253,8 @@ const setAuthBackendUrl = backendUrl => {
 };
 
 const state$3 = {
-  platform: Web
+  platform: Web,
+  useNativeAuth: false
 };
 const getAuthPlatform = () => {
   return state$3.platform;
@@ -1284,6 +1263,12 @@ const setAuthPlatform = value => {
   state$3.platform = value;
 };
 
+// Native shells can use loopback OAuth without Electron's process or secret storage.
+const setUseNativeAuth = value => {
+  state$3.useNativeAuth = value;
+};
+const getUseNativeAuth = () => state$3.useNativeAuth;
+
 let USER_AGENT;
 if (typeof navigator === 'undefined' || !navigator.userAgent?.startsWith?.('Mozilla/5.0 ')) {
   const NAME = 'oauth4webapi';
@@ -3140,7 +3125,16 @@ const getElectronAuthorizationCode = async uid => {
 const waitForElectronBackendLogin = async (backendUrl, uid, redirectUri, codeVerifier, timeoutMs = 30_000, pollIntervalMs = 1000, getAuthorizationCode = getElectronAuthorizationCode, exchangeAuthorizationCode = exchangeElectronAuthorizationCode, getUserName = getOidcUserName) => {
   const deadline = Date.now() + timeoutMs;
   while (Date.now() < deadline) {
-    const authorizationCode = await getAuthorizationCode(uid);
+    let timer;
+    const timeout = new Promise(resolve => {
+      timer = setTimeout(resolve, Math.max(0, deadline - Date.now()));
+    });
+    let authorizationCode;
+    try {
+      authorizationCode = await Promise.race([getAuthorizationCode(uid), timeout]);
+    } finally {
+      clearTimeout(timer);
+    }
     if (hasAuthorizationCode(authorizationCode)) {
       const tokenResponse = await exchangeAuthorizationCode(backendUrl, authorizationCode, redirectUri, codeVerifier);
       const authAccessTokenExpiresAt = getAccessTokenExpiresAt(tokenResponse.expiresIn);
@@ -3181,37 +3175,45 @@ const getMockLoginResult = async (signingInState, persistResult) => {
   return persistResult(getLoggedInState(signingInState, response));
 };
 const getInteractiveLoginResult = async (backendUrl, platform, signingInState, persistResult, selectAccount) => {
-  const authUseRedirect = getAuthUseRedirect(platform);
-  const uid = 0;
-  const {
-    clientId,
-    codeVerifier,
-    loginUrl,
-    redirectUri,
-    state
-  } = await getBackendLoginRequest(backendUrl, platform, uid);
-  if (platform !== Electron) {
-    const returnUrl = await getCurrentHref();
-    await savePendingOidcAuthState({
+  const nativeAuth = getUseNativeAuth();
+  const transportPlatform = nativeAuth ? Electron : platform;
+  const authUseRedirect = getAuthUseRedirect(transportPlatform);
+  const uid = nativeAuth ? globalThis.crypto.randomUUID() : 0;
+  try {
+    const {
       clientId,
       codeVerifier,
+      loginUrl,
       redirectUri,
-      returnUrl,
       state
+    } = await getBackendLoginRequest(backendUrl, transportPlatform, uid);
+    if (transportPlatform !== Electron) {
+      const returnUrl = await getCurrentHref();
+      await savePendingOidcAuthState({
+        clientId,
+        codeVerifier,
+        redirectUri,
+        returnUrl,
+        state
+      });
+    }
+    await invoke$1('Open.openUrl', selectAccount ? getAccountLoginUrl(backendUrl, loginUrl) : loginUrl, platform, authUseRedirect);
+    if (transportPlatform !== Electron && authUseRedirect) {
+      return signingInState;
+    }
+    const authState = transportPlatform === Electron ? await waitForElectronBackendLogin(backendUrl, uid, redirectUri, codeVerifier) : await waitForBackendLogin(backendUrl);
+    if (transportPlatform !== Electron) {
+      await clearPendingOidcAuthState();
+    }
+    return persistResult({
+      ...authState,
+      authClientId: clientId
     });
+  } finally {
+    if (nativeAuth) {
+      await invoke$3('OAuthServer.dispose', String(uid));
+    }
   }
-  await invoke$1('Open.openUrl', selectAccount ? getAccountLoginUrl(backendUrl, loginUrl) : loginUrl, platform, authUseRedirect);
-  if (platform !== Electron && authUseRedirect) {
-    return signingInState;
-  }
-  const authState = platform === Electron ? await waitForElectronBackendLogin(backendUrl, uid, redirectUri, codeVerifier) : await waitForBackendLogin(backendUrl);
-  if (platform !== Electron) {
-    await clearPendingOidcAuthState();
-  }
-  return persistResult({
-    ...authState,
-    authClientId: clientId
-  });
 };
 const handleClickLogin = async (options, persistResult = persistLoginResult) => {
   const {
@@ -3234,7 +3236,7 @@ const handleClickLogin = async (options, persistResult = persistLoginResult) =>
     if (mockLoginResult) {
       return mockLoginResult;
     }
-    return getInteractiveLoginResult(backendUrl, platform, signingInState, persistResult, options.selectAccount === true);
+    return await getInteractiveLoginResult(backendUrl, platform, signingInState, persistResult, options.selectAccount === true);
   } catch (error) {
     await clearPendingOidcAuthState();
     const errorMessage = error instanceof Error && error.message ? error.message : 'Backend authentication failed.';
@@ -3521,9 +3523,37 @@ const syncBackendAuth = async backendUrl => initialize({
   backendUrl
 });
 
-const configure = options => {
+const sendMessagePortToAuthProcess = async port => {
+  await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToSharedProcess', port, 'HandleMessagePortForAuthProcess.handleMessagePortForAuthProcess');
+};
+const initializeAuthProcess = async () => {
+  const rpc = await create$2({
+    commandMap: {},
+    send: sendMessagePortToAuthProcess
+  });
+  set$2(rpc);
+};
+
+const sendMessagePortToMainProcess = async port => {
+  await invokeAndTransfer('SendMessagePortToMainProcess.sendMessagePortToMainProcess', port, 'HandleElectronMessagePort.handleElectronMessagePort', 0);
+};
+const initializeMainProcess = async () => {
+  const rpc = await create$2({
+    commandMap: {},
+    send: sendMessagePortToMainProcess
+  });
+  set$1(rpc);
+};
+
+const configure = async options => {
   setAuthBackendUrl(options.backendUrl);
   setAuthPlatform(options.platform);
+  setUseNativeAuth(options.useNativeAuth === true);
+  if (options.platform === Electron) {
+    await Promise.all([initializeAuthProcess(), initializeMainProcess()]);
+  } else if (options.useNativeAuth) {
+    await initializeAuthProcess();
+  }
 };
 
 const handleMessagePort = async (port, rpcId) => {
@@ -3567,7 +3597,7 @@ const initializeRendererWorker = async () => {
 };
 
 const listen = async () => {
-  await Promise.all([initializeRendererWorker(), initializeOpenerWorker(), initializeAuthProcess(), initializeMainProcess()]);
+  await Promise.all([initializeRendererWorker(), initializeOpenerWorker()]);
 };
 
 const main = async () => {

package/package.json

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