@lvce-editor/chat-view 7.11.0 → 7.12.0

package/dist/chatViewWorkerMain.js

@@ -4365,6 +4365,7 @@ const getBackendAuthUrl = (backendUrl, path) => {
   return `${trimTrailingSlashes(backendUrl)}${path}`;
 };
 
+const PlatformTypeElectron$1 = 2;
 const getCurrentHref = async () => {
   try {
     return await invoke('Layout.getHref');
@@ -4376,11 +4377,20 @@ 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 getBackendLoginUrl = 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();
 };
@@ -4561,6 +4571,25 @@ 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, 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);
+      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 +4597,29 @@ 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 {
+    backendUrl,
+    platform,
+    uid
+  } = state;
+  if (!backendUrl) {
     return {
       ...state,
       authErrorMessage: 'Backend URL is missing.',
@@ -4592,8 +4631,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 +4654,9 @@ 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 url = await getBackendLoginUrl(backendUrl, platform, uid);
+    await openUrl(url, platform);
+    const authState = platform === PlatformTypeElectron ? await waitForElectronBackendLogin(backendUrl, uid) : await waitForBackendLogin(backendUrl);
     return {
       ...signingInState,
       ...authState

package/package.json

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