refactor: Adjust some error handling/reporting

Voxelum · Nov 1, 2024 · a6c853a · a6c853a
1 parent 404220d
commit a6c853a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/xmcl-runtime/user/accountSystems/YggdrasilAccountSystem.ts b/xmcl-runtime/user/accountSystems/YggdrasilAccountSystem.ts
@@ -104,6 +104,8 @@ export class YggdrasilAccountSystem implements UserAccountSystem {
       } else if (e.error === 'ForbiddenOperationException' &&
         e.errorMessage === 'Invalid credential information.') {
         throw new UserException({ type: 'loginInvalidCredentials' }, e.message || e.errorMessage, { cause: e })
+      } else if (e.error === 'ForbiddenOperationException') {
+        throw new UserException({ type: 'loginGeneral' }, e.message || e.errorMessage, { cause: e })
       } else if (e.error === 'IllegalArgumentException') {
         throw new UserException({ type: 'loginInvalidCredentials' }, e.message || e.errorMessage, { cause: e })
       } else if (isSystemError(e)) {

diff --git a/xmcl-runtime/version/VersionService.ts b/xmcl-runtime/version/VersionService.ts
@@ -233,7 +233,10 @@ export class VersionService extends StatefulService<LocalVersions> implements IV
             const hashIndexPath = this.getPath('assets', 'indexes', `${version.assetIndex.sha1}.json`)
             missing(hashIndexPath).then(isMissing => {
               if (isMissing) {
-                return linkOrCopyFile(assetIndexPath, hashIndexPath)
+                return linkOrCopyFile(assetIndexPath, hashIndexPath).catch((e) => {
+                  this.warn(`Failed to link asset index ${version.assetIndex?.id} to ${version.assetIndex?.sha1}.json`)
+                  this.warn(e)
+                })
               }
             })
           }