Merge branch 'master' into transactions-propagate

js/src/api/transport/error.js

@@ -0,0 +1,53 @@
+// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+import ExtendableError from 'es6-error';
+
+export const ERROR_CODES = {
+  UNSUPPORTED_REQUEST: -32000,
+  NO_WORK: -32001,
+  NO_AUTHOR: -32002,
+  NO_NEW_WORK: -32003,
+  NOT_ENOUGH_DATA: -32006,
+  UNKNOWN_ERROR: -32009,
+  TRANSACTION_ERROR: -32010,
+  EXECUTION_ERROR: -32015,
+  ACCOUNT_LOCKED: -32020,
+  PASSWORD_INVALID: -32021,
+  ACCOUNT_ERROR: -32023,
+  SIGNER_DISABLED: -32030,
+  DAPPS_DISABLED: -32031,
+  NETWORK_DISABLED: -32035,
+  REQUEST_REJECTED: -32040,
+  REQUEST_REJECTED_LIMIT: -32041,
+  REQUEST_NOT_FOUND: -32042,
+  COMPILATION_ERROR: -32050,
+  ENCRYPTION_ERROR: -32055,
+  FETCH_ERROR: -32060
+};
+
+export default class TransportError extends ExtendableError {
+  constructor (method, code, message) {
+    const m = `${method}: ${code}: ${message}`;
+    super(m);
+
+    this.code = code;
+    this.type = Object.keys(ERROR_CODES).find((k) => ERROR_CODES[k] === code) || '';
+
+    this.method = method;
+    this.text = message;
+  }
+}

js/src/api/transport/http/http.js

@@ -16,6 +16,7 @@
 
 import { Logging } from '../../subscriptions';
 import JsonRpcBase from '../jsonRpcBase';
+import TransportError from '../error';
 
 /* global fetch */
 export default class Http extends JsonRpcBase {
@@ -73,7 +74,8 @@ export default class Http extends JsonRpcBase {
           this.error(JSON.stringify(response));
           console.error(`${method}(${JSON.stringify(params)}): ${response.error.code}: ${response.error.message}`);
 
-          throw new Error(`${method}: ${response.error.code}: ${response.error.message}`);
+          const error = new TransportError(method, response.error.code, response.error.message);
+          throw error;
         }
 
         this.log(JSON.stringify(response));

js/src/api/transport/index.js

@@ -16,3 +16,4 @@
 
 export Http from './http';
 export Ws from './ws';
+export TransportError from './error.js';

js/src/api/transport/ws/ws.js

@@ -18,6 +18,7 @@ import { keccak_256 } from 'js-sha3'; // eslint-disable-line camelcase
 
 import { Logging } from '../../subscriptions';
 import JsonRpcBase from '../jsonRpcBase';
+import TransportError from '../error';
 
 /* global WebSocket */
 export default class Ws extends JsonRpcBase {
@@ -109,7 +110,9 @@ export default class Ws extends JsonRpcBase {
 
         console.error(`${method}(${JSON.stringify(params)}): ${result.error.code}: ${result.error.message}`);
 
-        reject(new Error(`${method}: ${result.error.code}: ${result.error.message}`));
+        const error = new TransportError(method, result.error.code, result.error.message);
+        reject(error);
+
         delete this._messages[result.id];
         return;
       }