@lvce-editor/chat-view 7.11.0 → 7.14.0

package/dist/chatViewWorkerMain.js

@@ -1290,9 +1290,6 @@ const {
 const openExternal = async url => {
   return invoke$1('Open.openExternal', url);
 };
-const openUrl = async (url, platform) => {
-  return invoke$1('Open.openUrl', url, platform);
-};
 
 const {
   invoke,
@@ -2368,6 +2365,7 @@ const createDefaultState = () => {
     authAccessToken: '',
     authEnabled: false,
     authErrorMessage: '',
+    authUseRedirect: false,
     backendUrl: '',
     chatFocusContentMaxWidth: 700,
     chatHistoryEnabled: true,
@@ -4365,6 +4363,7 @@ const getBackendAuthUrl = (backendUrl, path) => {
   return `${trimTrailingSlashes(backendUrl)}${path}`;
 };
 
+const PlatformTypeElectron$1 = 2;
 const getCurrentHref = async () => {
   try {
     return await invoke('Layout.getHref');
@@ -4376,13 +4375,25 @@ const getCurrentHref = async () => {
   }
   return globalThis.location.href;
 };
-const getBackendLoginUrl = async backendUrl => {
-  const loginUrl = new URL(getBackendAuthUrl(backendUrl, '/login'));
-  const redirectUri = await getCurrentHref();
+const getEffectiveRedirectUri = async (platform, uid, redirectUri) => {
   if (redirectUri) {
-    loginUrl.searchParams.set('redirect_uri', redirectUri);
+    return redirectUri;
+  }
+  if (platform === PlatformTypeElectron$1) {
+    return `http://localhost:${await invoke('OAuthServer.create', String(uid))}`;
+  }
+  return getCurrentHref();
+};
+const getBackendLoginRequest = async (backendUrl, platform = 0, uid = 0, redirectUri = '') => {
+  const loginUrl = new URL(getBackendAuthUrl(backendUrl, '/login'));
+  const effectiveRedirectUri = await getEffectiveRedirectUri(platform, uid, redirectUri);
+  if (effectiveRedirectUri) {
+    loginUrl.searchParams.set('redirect_uri', effectiveRedirectUri);
   }
-  return loginUrl.toString();
+  return {
+    loginUrl: loginUrl.toString(),
+    redirectUri: effectiveRedirectUri
+  };
 };
 
 const getLoggedOutBackendAuthState = (authErrorMessage = '') => {
@@ -4545,6 +4556,39 @@ const delay = async ms => {
   await new Promise(resolve => setTimeout(resolve, ms));
 };
 
+const getBackendNativeExchangeUrl = backendUrl => {
+  return getBackendAuthUrl(backendUrl, '/auth/native/exchange');
+};
+
+const getExchangeErrorMessage = async response => {
+  try {
+    const payload = await response.json();
+    if (payload && typeof payload === 'object' && typeof payload.error === 'string' && payload.error) {
+      return payload.error;
+    }
+  } catch {
+    // ignore
+  }
+  return 'Backend authentication failed.';
+};
+const exchangeElectronAuthorizationCode = async (backendUrl, code, redirectUri) => {
+  const response = await fetch(getBackendNativeExchangeUrl(backendUrl), {
+    body: JSON.stringify({
+      code,
+      redirectUri
+    }),
+    credentials: 'include',
+    headers: {
+      Accept: 'application/json',
+      'Content-Type': 'application/json'
+    },
+    method: 'POST'
+  });
+  if (!response.ok) {
+    throw new Error(await getExchangeErrorMessage(response));
+  }
+};
+
 const waitForBackendLogin = async (backendUrl, timeoutMs = 30_000, pollIntervalMs = 1000) => {
   const deadline = Date.now() + timeoutMs;
   let lastErrorMessage = '';
@@ -4561,6 +4605,26 @@ const waitForBackendLogin = async (backendUrl, timeoutMs = 30_000, pollIntervalM
   return getLoggedOutBackendAuthState(lastErrorMessage);
 };
 
+const hasAuthorizationCode = value => {
+  return typeof value === 'string' && value.length > 0;
+};
+const waitForElectronBackendLogin = async (backendUrl, uid, redirectUri, timeoutMs = 30_000, pollIntervalMs = 1000) => {
+  const started = Date.now();
+  const deadline = started + timeoutMs;
+  while (Date.now() < deadline) {
+    const authorizationCode = await invoke('OAuthServer.getCode', String(uid));
+    if (hasAuthorizationCode(authorizationCode)) {
+      const elapsed = Date.now() - started;
+      const remainingTime = Math.max(0, timeoutMs - elapsed);
+      await exchangeElectronAuthorizationCode(backendUrl, authorizationCode, redirectUri);
+      return waitForBackendLogin(backendUrl, remainingTime, pollIntervalMs);
+    }
+    await delay(pollIntervalMs);
+  }
+  return getLoggedOutBackendAuthState('Timed out waiting for backend login.');
+};
+
+const PlatformTypeElectron = 2;
 const isLoginResponse = value => {
   if (!value || typeof value !== 'object') {
     return false;
@@ -4568,19 +4632,30 @@ const isLoginResponse = value => {
   return true;
 };
 const getLoggedInState = (state, response) => {
+  const {
+    userName,
+    userSubscriptionPlan,
+    userUsedTokens
+  } = state;
   const accessToken = typeof response.accessToken === 'string' ? response.accessToken : '';
   return {
     ...state,
     authAccessToken: accessToken,
     authErrorMessage: '',
-    userName: typeof response.userName === 'string' ? response.userName : state.userName,
+    userName: typeof response.userName === 'string' ? response.userName : userName,
     userState: accessToken ? 'loggedIn' : 'loggedOut',
-    userSubscriptionPlan: typeof response.subscriptionPlan === 'string' ? response.subscriptionPlan : state.userSubscriptionPlan,
-    userUsedTokens: typeof response.usedTokens === 'number' ? response.usedTokens : state.userUsedTokens
+    userSubscriptionPlan: typeof response.subscriptionPlan === 'string' ? response.subscriptionPlan : userSubscriptionPlan,
+    userUsedTokens: typeof response.usedTokens === 'number' ? response.usedTokens : userUsedTokens
   };
 };
 const handleClickLogin = async state => {
-  if (!state.backendUrl) {
+  const {
+    authUseRedirect,
+    backendUrl,
+    platform,
+    uid
+  } = state;
+  if (!backendUrl) {
     return {
       ...state,
       authErrorMessage: 'Backend URL is missing.',
@@ -4592,8 +4667,8 @@ const handleClickLogin = async state => {
     authErrorMessage: '',
     userState: 'loggingIn'
   };
-  if (state.uid) {
-    set(state.uid, state, signingInState);
+  if (uid) {
+    set(uid, state, signingInState);
     await invoke('Chat.rerender');
   }
   try {
@@ -4615,9 +4690,12 @@ const handleClickLogin = async state => {
       }
       return getLoggedInState(signingInState, response);
     }
-    const url = await getBackendLoginUrl(state.backendUrl);
-    await openUrl(url, state.platform);
-    const authState = await waitForBackendLogin(state.backendUrl);
+    const {
+      loginUrl,
+      redirectUri
+    } = await getBackendLoginRequest(backendUrl, platform, uid);
+    await invoke$1('Open.openUrl', loginUrl, platform, authUseRedirect);
+    const authState = platform === PlatformTypeElectron ? await waitForElectronBackendLogin(backendUrl, uid, redirectUri) : await waitForBackendLogin(backendUrl);
     return {
       ...signingInState,
       ...authState
@@ -10604,6 +10682,15 @@ const loadAuthEnabled = async () => {
   }
 };
 
+const loadAuthUseRedirect = async () => {
+  try {
+    const savedAuthUseRedirect = await get('chat.authUseRedirect');
+    return typeof savedAuthUseRedirect === 'boolean' ? savedAuthUseRedirect : false;
+  } catch {
+    return false;
+  }
+};
+
 const loadBackendUrl = async () => {
   try {
     const savedBackendUrl = await get('chat.backendUrl');
@@ -10784,10 +10871,11 @@ const loadVoiceDictationEnabled = async () => {
 };
 
 const loadPreferences = async () => {
-  const [aiSessionTitleGenerationEnabled, authEnabled, backendUrl, chatHistoryEnabled, composerDropEnabled, openApiApiKey, openRouterApiKey, emitStreamingFunctionCallEvents, reasoningPickerEnabled, scrollDownButtonEnabled, searchEnabled, streamingEnabled, todoListToolEnabled, toolEnablement, passIncludeObfuscation, useChatCoordinatorWorker, useChatMathWorker, useChatNetworkWorkerForRequests, useChatToolWorker, useOwnBackend, voiceDictationEnabled] = await Promise.all([loadAiSessionTitleGenerationEnabled(), loadAuthEnabled(), loadBackendUrl(), loadChatHistoryEnabled(), loadComposerDropEnabled(), loadOpenApiApiKey(), loadOpenRouterApiKey(), loadEmitStreamingFunctionCallEvents(), loadReasoningPickerEnabled(), loadScrollDownButtonEnabled(), loadSearchEnabled(), loadStreamingEnabled(), loadTodoListToolEnabled(), loadToolEnablement(), loadPassIncludeObfuscation(), loadUseChatCoordinatorWorker(), loadUseChatMathWorker(), loadUseChatNetworkWorkerForRequests(), loadUseChatToolWorker(), loadUseOwnBackend(), loadVoiceDictationEnabled()]);
+  const [aiSessionTitleGenerationEnabled, authEnabled, authUseRedirect, backendUrl, chatHistoryEnabled, composerDropEnabled, openApiApiKey, openRouterApiKey, emitStreamingFunctionCallEvents, reasoningPickerEnabled, scrollDownButtonEnabled, searchEnabled, streamingEnabled, todoListToolEnabled, toolEnablement, passIncludeObfuscation, useChatCoordinatorWorker, useChatMathWorker, useChatNetworkWorkerForRequests, useChatToolWorker, useOwnBackend, voiceDictationEnabled] = await Promise.all([loadAiSessionTitleGenerationEnabled(), loadAuthEnabled(), loadAuthUseRedirect(), loadBackendUrl(), loadChatHistoryEnabled(), loadComposerDropEnabled(), loadOpenApiApiKey(), loadOpenRouterApiKey(), loadEmitStreamingFunctionCallEvents(), loadReasoningPickerEnabled(), loadScrollDownButtonEnabled(), loadSearchEnabled(), loadStreamingEnabled(), loadTodoListToolEnabled(), loadToolEnablement(), loadPassIncludeObfuscation(), loadUseChatCoordinatorWorker(), loadUseChatMathWorker(), loadUseChatNetworkWorkerForRequests(), loadUseChatToolWorker(), loadUseOwnBackend(), loadVoiceDictationEnabled()]);
   return {
     aiSessionTitleGenerationEnabled,
     authEnabled,
+    authUseRedirect,
     backendUrl,
     chatHistoryEnabled,
     composerDropEnabled,
@@ -10860,6 +10948,7 @@ const loadContent = async (state, savedState) => {
   const {
     aiSessionTitleGenerationEnabled,
     authEnabled,
+    authUseRedirect,
     backendUrl,
     chatHistoryEnabled,
     composerDropEnabled,
@@ -10940,6 +11029,7 @@ const loadContent = async (state, savedState) => {
     authAccessToken: authState.authAccessToken,
     authEnabled,
     authErrorMessage: authState.authErrorMessage,
+    authUseRedirect,
     backendUrl,
     chatHistoryEnabled,
     chatListScrollTop,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/chat-view",
-  "version": "7.11.0",
+  "version": "7.14.0",
   "description": "Chat View Worker",
   "repository": {
     "type": "git",