feat(client): add cause to custom error

Jigsaw-Code · Apr 17, 2024 · a0ff397 · a0ff397
1 parent f00a94c
commit a0ff397
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/client/src/www/app/app.ts b/client/src/www/app/app.ts
@@ -220,6 +220,13 @@ export class App {
       };
     } else if (error instanceof errors.SessionConfigError) {
       toastMessage = error.message;
+
+      if (error.cause) {
+        buttonMessage = this.localize('error-details');
+        buttonHandler = () => {
+          this.showErrorDetailDialog(error);
+        };
+      }
     } else {
       const hasErrorDetails = Boolean(error.message || error.cause);
       toastMessage = this.localize('error-unexpected');

diff --git a/client/src/www/app/outline_server_repository/access_key_serialization.ts b/client/src/www/app/outline_server_repository/access_key_serialization.ts
@@ -40,7 +40,7 @@ function parseShadowsocksSessionConfigJson(responseBody: string): ShadowsocksSes
   const responseJson = JSON.parse(responseBody);
 
   if ('error' in responseJson) {
-    throw new errors.SessionConfigError(responseJson.error.message);
+    throw new errors.SessionConfigError(responseJson.error.message, { cause: responseJson.error.cause });
   }
 
   const {method, password, server, server_port, prefix} = responseJson;

diff --git a/client/src/www/model/errors.ts b/client/src/www/model/errors.ts
@@ -46,8 +46,8 @@ export class SessionConfigFetchFailed extends CustomError {
 }
 
 export class SessionConfigError extends CustomError {
-  constructor(message: string) {
-    super(message);
+  constructor(message: string, options?: {cause?: Error}) {
+    super(message, options);
   }
 }