types added to some rpc errors

near · Feb 9, 2021 · e567f4a · e567f4a
1 parent ca81785
commit e567f4a
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 6 deletions.
diff --git a/lib/providers/json-rpc-provider.js b/lib/providers/json-rpc-provider.js
diff --git a/lib/utils/rpc_errors.d.ts b/lib/utils/rpc_errors.d.ts
diff --git a/lib/utils/rpc_errors.js b/lib/utils/rpc_errors.js
diff --git a/src/providers/json-rpc-provider.ts b/src/providers/json-rpc-provider.ts
@@ -8,7 +8,7 @@ import { Network } from '../utils/network';
 import { ConnectionInfo, fetchJson } from '../utils/web';
 import { TypedError, ErrorContext } from '../utils/errors';
 import { baseEncode } from 'borsh';
-import { parseRpcError } from '../utils/rpc_errors';
+import { parseRpcError, getErrorTypeFromErrorMessage } from '../utils/rpc_errors';
 import { SignedTransaction } from '../transaction';
 
 export { TypedError, ErrorContext };
@@ -78,7 +78,9 @@ export class JsonRpcProvider extends Provider {
             result = await this.sendJsonRpc('query', [path, data]);
         }
         if (result && result.error) {
-            throw new Error(`Querying ${args} failed: ${result.error}.\n${JSON.stringify(result, null, 2)}`);
+            throw new TypedError(
+                `Querying ${args} failed: ${result.error}.\n${JSON.stringify(result, null, 2)}`,
+                getErrorTypeFromErrorMessage(result.error));
         }
         return result;
     }
@@ -174,7 +176,7 @@ export class JsonRpcProvider extends Provider {
                 if (response.error.data === 'Timeout' || errorMessage.includes('Timeout error')) {
                     throw new TypedError('send_tx_commit has timed out.', 'TimeoutError');
                 } else {
-                    throw new TypedError(errorMessage);
+                    throw new TypedError(errorMessage, getErrorTypeFromErrorMessage(response.error.data));
                 }
             }
         }

diff --git a/src/utils/rpc_errors.ts b/src/utils/rpc_errors.ts
@@ -77,6 +77,21 @@ function walkSubtype(errorObj, schema, result, typeName) {
     }
 }
 
+export function getErrorTypeFromErrorMessage(errorMessage) {
+    switch (true) {
+        case /^account .*? does not exist while viewing$/.test(errorMessage):
+            return 'AccountDoesNotExist';
+        case /^Account .*? doesn't exist$/.test(errorMessage):
+            return 'AccountDoesNotExist';
+        case /^access key .*? does not exist while viewing$/.test(errorMessage):
+            return 'AccessKeyDoesNotExist';
+        case /wasm execution failed with error: FunctionCallError\(CompilationError\(CodeDoesNotExist/.test(errorMessage):
+            return 'CodeDoesNotExist';
+        default:
+            return 'UntypedError';
+    }
+}
+
 /**
  * Helper function determining if the argument is an object
  * @param n Value to check