Added query info to HomeNotConnectedError.

MoeraOrg · Jan 8, 2023 · 9f57e0b · 9f57e0b
1 parent bf7adad
commit 9f57e0b
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 5 deletions.
diff --git a/src/api/error.ts b/src/api/error.ts
@@ -16,9 +16,9 @@ export class VerboseError extends Error {
 
     messageVerbose: string;
 
-    constructor(message: string, messageVerbose: string) {
+    constructor(message: string, messageVerbose: string | null = null) {
         super(message);
-        this.messageVerbose = messageVerbose;
+        this.messageVerbose = messageVerbose ?? message;
     }
 
 }
@@ -65,12 +65,16 @@ export class NodeApiError extends Error {
 
 }
 
-export class HomeNotConnectedError extends Error {
+export class HomeNotConnectedError extends VerboseError {
 
     constructor() {
         super("Not connected to home");
     }
 
+    setQuery(method: string, location: string): void {
+        this.messageVerbose = `${method} ${location}: ${this.message}`
+    }
+
 }
 
 export class NameResolvingError extends Error {

diff --git a/src/api/node/call.ts b/src/api/node/call.ts
@@ -67,7 +67,16 @@ export function* callApi<T>({
     errorFilter = false,
     onProgress
 }: CallApiParams<T>):  CallApiResult<T> {
-    const {rootLocation, rootApi, errorTitle} = yield* call(selectApi, nodeName);
+    let api: ApiSelection = {rootLocation: null, rootApi: "", errorTitle: ""};
+    try {
+        api = yield* call(selectApi, nodeName);
+    } catch (e) {
+        if (e instanceof HomeNotConnectedError) {
+            e.setQuery(method ?? "", location);
+        }
+        throw e;
+    }
+    const {rootLocation, rootApi, errorTitle} = api;
     if (!rootLocation) {
         throw new NameResolvingError(nodeName);
     }

diff --git a/src/state/error/reducer.ts b/src/state/error/reducer.ts
@@ -14,7 +14,7 @@ export default (state: ErrorState = initialState, action: ClientAction): ErrorSt
             const {message, messageVerbose} = action.payload;
             return {
                 message: message,
-                messageVerbose: messageVerbose ? messageVerbose : message,
+                messageVerbose: messageVerbose ?? message,
                 visible: true
             };
         case ERROR_DISMISS: