fix: First instance is not selected; user cannot login by MS

Voxelum · Oct 9, 2023 · 5703081 · 5703081
1 parent cada3b8
commit 5703081
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 20 deletions.
diff --git a/xmcl-keystone-ui/src/composables/instances.ts b/xmcl-keystone-ui/src/composables/instances.ts
@@ -56,12 +56,21 @@ export function useInstances() {
     await deleteInstance(instancePath)
     if (instancePath === lastSelected) {
       path.value = instances.value[Math.max(index - 1, 0)]?.path ?? ''
+      if (!path.value) {
+        createInstance({
+          name: 'Minecraft',
+        }).then(p => {
+          path.value = p
+        })
+      }
     }
   }
   watch(state, (newState) => {
     if (!newState?.instances.length) {
-      const path = createInstance({
+      createInstance({
         name: 'Minecraft',
+      }).then(p => {
+        path.value = p
       })
     }
   })

diff --git a/xmcl-runtime-api/src/services/OfficialUserService.ts b/xmcl-runtime-api/src/services/OfficialUserService.ts
@@ -13,7 +13,6 @@ interface OfficialUserServiceEventMap {
     interval: number
     message: string
   }
-  'microsoft-authorize-code': [any, string]
 }
 
 export interface Skin {

diff --git a/xmcl-runtime/lib/app/LauncherApp.ts b/xmcl-runtime/lib/app/LauncherApp.ts
@@ -174,7 +174,10 @@ export class LauncherApp extends EventEmitter {
 
     this.managers = [this.taskManager, this.serviceStateManager, this.semaphoreManager, this.launcherAppManager]
 
-    this.localhostServerPort = listen(this.server, 25555, (cur) => cur + 7)
+    this.localhostServerPort = listen(this.server, 25555, (cur) => cur + 7).then((port) => {
+      this.logger.log(`Localhost server is listening on port ${port}`)
+      return port
+    })
   }
 
   getAppInstallerStartUpUrl(): string {

diff --git a/xmcl-runtime/lib/plugins/pluginOfficialUserApi.ts b/xmcl-runtime/lib/plugins/pluginOfficialUserApi.ts
@@ -76,6 +76,22 @@ export const pluginOfficialUserApi: LauncherAppPlugin = (app) => {
 
     userService.registerAccountSystem(AUTHORITY_MICROSOFT, system)
 
+    app.protocol.registerHandler('xmcl', ({ request, response }) => {
+      const parsed = request.url
+      if (parsed.host === 'launcher' && parsed.pathname === '/auth') {
+        let error: Error | undefined
+        if (parsed.searchParams.get('error')) {
+          const err = parsed.searchParams.get('error')!
+          const errDescription = parsed.searchParams.get('error')!
+          error = new Error(unescape(errDescription));
+          (error as any).error = err
+        }
+        const code = parsed.searchParams.get('code') as string
+        userService.emit('microsoft-authorize-code', error, code)
+        response.status = 200
+      }
+    })
+
     const headers = {}
     const legacyClient = new YggdrasilClient('https://authserver.mojang.com', {
       dispatcher,

diff --git a/xmcl-runtime/lib/services/InstallService.ts b/xmcl-runtime/lib/services/InstallService.ts
@@ -30,7 +30,7 @@ import { XMLParser } from 'fast-xml-parser'
  */
 @ExposeServiceKey(InstallServiceKey)
 export class InstallService extends AbstractService implements IInstallService {
-  private latestRelease = '1.20'
+  private latestRelease = '1.20.2'
 
   constructor(@Inject(LauncherAppKey) app: LauncherApp,
     @Inject(VersionService) private versionService: VersionService,

diff --git a/xmcl-runtime/lib/services/OfficialUserService.ts b/xmcl-runtime/lib/services/OfficialUserService.ts
@@ -15,22 +15,6 @@ export class OfficialUserService extends AbstractService implements IOfficialUse
     @Inject(kUserTokenStorage) private userTokenStorage: UserTokenStorage,
     @Inject(MojangClient) private mojangApi: MojangClient) {
     super(app)
-
-    app.protocol.registerHandler('xmcl', ({ request, response }) => {
-      const parsed = request.url
-      if (parsed.host === 'launcher' && parsed.pathname === '/auth') {
-        let error: Error | undefined
-        if (parsed.searchParams.get('error')) {
-          const err = parsed.searchParams.get('error')!
-          const errDescription = parsed.searchParams.get('error')!
-          error = new Error(unescape(errDescription));
-          (error as any).error = err
-        }
-        const code = parsed.searchParams.get('code') as string
-        this.emit('microsoft-authorize-code', error, code)
-        response.status = 200
-      }
-    })
   }
 
   async setName(user: UserProfile, name: string) {