starknet 3.15.5 → 3.15.6

package/CHANGELOG.md

@@ -1,3 +1,9 @@
+## [3.15.6](https://github.com/0xs34n/starknet.js/compare/v3.15.5...v3.15.6) (2022-06-28)
+
+### Bug Fixes
+
+- throw http error when parsing fails ([898574f](https://github.com/0xs34n/starknet.js/commit/898574f0087bf653b5d74bbe3dc52a0cb6efc432))
+
 ## [3.15.5](https://github.com/0xs34n/starknet.js/compare/v3.15.4...v3.15.5) (2022-06-27)
 
 ### Bug Fixes

package/dist/provider/default.js

@@ -73,6 +73,7 @@ var hash_1 = require("../utils/hash");
 var json_1 = require("../utils/json");
 var number_1 = require("../utils/number");
 var stark_1 = require("../utils/stark");
+var errors_1 = require("./errors");
 var interface_1 = require("./interface");
 var utils_1 = require("./utils");
 function wait(delay) {
@@ -206,9 +207,16 @@ var Provider = /** @class */ (function () {
                     case 3:
                         textResponse = _c.sent();
                         if (!res.ok) {
-                            responseBody = (0, json_1.parse)(textResponse);
+                            responseBody = void 0;
+                            try {
+                                responseBody = (0, json_1.parse)(textResponse);
+                            }
+                            catch (_d) {
+                                // if error parsing fails, return an http error
+                                throw new errors_1.HttpError(res.statusText, res.status);
+                            }
                             errorCode = responseBody.code || (responseBody === null || responseBody === void 0 ? void 0 : responseBody.status_code);
-                            throw new utils_1.GatewayError(responseBody.message, errorCode); // Caught locally, and re-thrown for the user
+                            throw new errors_1.GatewayError(responseBody.message, errorCode); // Caught locally, and re-thrown for the user
                         }
                         if (endpoint === 'estimate_fee') {
                             return [2 /*return*/, (0, json_1.parseAlwaysAsBig)(textResponse, function (_, v) {
@@ -221,7 +229,8 @@ var Provider = /** @class */ (function () {
                         return [2 /*return*/, (0, json_1.parse)(textResponse)];
                     case 4:
                         err_1 = _c.sent();
-                        if (err_1 instanceof utils_1.GatewayError) {
+                        // rethrow custom errors
+                        if (err_1 instanceof errors_1.GatewayError || err_1 instanceof errors_1.HttpError) {
                             throw err_1;
                         }
                         if (err_1 instanceof Error) {

package/dist/provider/errors.d.ts

@@ -0,0 +1,9 @@
+import { CustomError } from 'ts-custom-error';
+export declare class GatewayError extends CustomError {
+    errorCode: string;
+    constructor(message: string, errorCode: string);
+}
+export declare class HttpError extends CustomError {
+    errorCode: number;
+    constructor(message: string, errorCode: number);
+}

package/dist/provider/errors.js

@@ -0,0 +1,40 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.HttpError = exports.GatewayError = void 0;
+/* eslint-disable max-classes-per-file */
+var ts_custom_error_1 = require("ts-custom-error");
+var GatewayError = /** @class */ (function (_super) {
+    __extends(GatewayError, _super);
+    function GatewayError(message, errorCode) {
+        var _this = _super.call(this, message) || this;
+        _this.errorCode = errorCode;
+        return _this;
+    }
+    return GatewayError;
+}(ts_custom_error_1.CustomError));
+exports.GatewayError = GatewayError;
+var HttpError = /** @class */ (function (_super) {
+    __extends(HttpError, _super);
+    function HttpError(message, errorCode) {
+        var _this = _super.call(this, message) || this;
+        _this.errorCode = errorCode;
+        return _this;
+    }
+    return HttpError;
+}(ts_custom_error_1.CustomError));
+exports.HttpError = HttpError;

package/dist/provider/index.d.ts

@@ -1,5 +1,5 @@
 import { Provider } from './default';
 export * from './default';
-export { GatewayError } from './utils';
+export * from './errors';
 export * from './interface';
 export declare const defaultProvider: Provider;

package/dist/provider/index.js

@@ -14,10 +14,9 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.defaultProvider = exports.GatewayError = void 0;
+exports.defaultProvider = void 0;
 var default_1 = require("./default");
 __exportStar(require("./default"), exports);
-var utils_1 = require("./utils");
-Object.defineProperty(exports, "GatewayError", { enumerable: true, get: function () { return utils_1.GatewayError; } });
+__exportStar(require("./errors"), exports);
 __exportStar(require("./interface"), exports);
 exports.defaultProvider = new default_1.Provider();

package/dist/provider/utils.d.ts

@@ -1,4 +1,3 @@
-import { CustomError } from 'ts-custom-error';
 import type { BlockNumber } from '../types';
 import { BigNumberish } from '../utils/number';
 /**
@@ -40,8 +39,4 @@ export declare function getBlockIdentifier(blockIdentifier: BlockIdentifier): Bl
  * @returns block identifier for API request
  */
 export declare function getFormattedBlockIdentifier(blockIdentifier?: BlockIdentifier): string;
-export declare class GatewayError extends CustomError {
-    errorCode: string;
-    constructor(message: string, errorCode: string);
-}
 export {};

package/dist/provider/utils.js

@@ -1,22 +1,6 @@
 "use strict";
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.GatewayError = exports.getFormattedBlockIdentifier = exports.getBlockIdentifier = exports.txIdentifier = exports.formatHash = void 0;
-var ts_custom_error_1 = require("ts-custom-error");
+exports.getFormattedBlockIdentifier = exports.getBlockIdentifier = exports.txIdentifier = exports.formatHash = void 0;
 var number_1 = require("../utils/number");
 /**
  *
@@ -93,13 +77,3 @@ function getFormattedBlockIdentifier(blockIdentifier) {
     return "blockHash=".concat((0, number_1.toHex)((0, number_1.toBN)(blockIdentifierObject.data)));
 }
 exports.getFormattedBlockIdentifier = getFormattedBlockIdentifier;
-var GatewayError = /** @class */ (function (_super) {
-    __extends(GatewayError, _super);
-    function GatewayError(message, errorCode) {
-        var _this = _super.call(this, message) || this;
-        _this.errorCode = errorCode;
-        return _this;
-    }
-    return GatewayError;
-}(ts_custom_error_1.CustomError));
-exports.GatewayError = GatewayError;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "starknet",
-  "version": "3.15.5",
+  "version": "3.15.6",
   "description": "JavaScript library for StarkNet",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/provider/default.js

@@ -179,6 +179,7 @@ var hash_1 = require('../utils/hash');
 var json_1 = require('../utils/json');
 var number_1 = require('../utils/number');
 var stark_1 = require('../utils/stark');
+var errors_1 = require('./errors');
 var interface_1 = require('./interface');
 var utils_1 = require('./utils');
 function wait(delay) {
@@ -333,13 +334,19 @@ var Provider = /** @class */ (function () {
           case 3:
             textResponse = _c.sent();
             if (!res.ok) {
-              responseBody = (0, json_1.parse)(textResponse);
+              responseBody = void 0;
+              try {
+                responseBody = (0, json_1.parse)(textResponse);
+              } catch (_d) {
+                // if error parsing fails, return an http error
+                throw new errors_1.HttpError(res.statusText, res.status);
+              }
               errorCode =
                 responseBody.code ||
                 (responseBody === null || responseBody === void 0
                   ? void 0
                   : responseBody.status_code);
-              throw new utils_1.GatewayError(responseBody.message, errorCode); // Caught locally, and re-thrown for the user
+              throw new errors_1.GatewayError(responseBody.message, errorCode); // Caught locally, and re-thrown for the user
             }
             if (endpoint === 'estimate_fee') {
               return [
@@ -355,7 +362,8 @@ var Provider = /** @class */ (function () {
             return [2 /*return*/, (0, json_1.parse)(textResponse)];
           case 4:
             err_1 = _c.sent();
-            if (err_1 instanceof utils_1.GatewayError) {
+            // rethrow custom errors
+            if (err_1 instanceof errors_1.GatewayError || err_1 instanceof errors_1.HttpError) {
               throw err_1;
             }
             if (err_1 instanceof Error) {

package/provider/errors.d.ts

@@ -0,0 +1,9 @@
+import { CustomError } from 'ts-custom-error';
+export declare class GatewayError extends CustomError {
+  errorCode: string;
+  constructor(message: string, errorCode: string);
+}
+export declare class HttpError extends CustomError {
+  errorCode: number;
+  constructor(message: string, errorCode: number);
+}

package/provider/errors.js

@@ -0,0 +1,50 @@
+'use strict';
+var __extends =
+  (this && this.__extends) ||
+  (function () {
+    var extendStatics = function (d, b) {
+      extendStatics =
+        Object.setPrototypeOf ||
+        ({ __proto__: [] } instanceof Array &&
+          function (d, b) {
+            d.__proto__ = b;
+          }) ||
+        function (d, b) {
+          for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p];
+        };
+      return extendStatics(d, b);
+    };
+    return function (d, b) {
+      if (typeof b !== 'function' && b !== null)
+        throw new TypeError('Class extends value ' + String(b) + ' is not a constructor or null');
+      extendStatics(d, b);
+      function __() {
+        this.constructor = d;
+      }
+      d.prototype = b === null ? Object.create(b) : ((__.prototype = b.prototype), new __());
+    };
+  })();
+Object.defineProperty(exports, '__esModule', { value: true });
+exports.HttpError = exports.GatewayError = void 0;
+/* eslint-disable max-classes-per-file */
+var ts_custom_error_1 = require('ts-custom-error');
+var GatewayError = /** @class */ (function (_super) {
+  __extends(GatewayError, _super);
+  function GatewayError(message, errorCode) {
+    var _this = _super.call(this, message) || this;
+    _this.errorCode = errorCode;
+    return _this;
+  }
+  return GatewayError;
+})(ts_custom_error_1.CustomError);
+exports.GatewayError = GatewayError;
+var HttpError = /** @class */ (function (_super) {
+  __extends(HttpError, _super);
+  function HttpError(message, errorCode) {
+    var _this = _super.call(this, message) || this;
+    _this.errorCode = errorCode;
+    return _this;
+  }
+  return HttpError;
+})(ts_custom_error_1.CustomError);
+exports.HttpError = HttpError;

package/provider/index.d.ts

@@ -1,5 +1,5 @@
 import { Provider } from './default';
 export * from './default';
-export { GatewayError } from './utils';
+export * from './errors';
 export * from './interface';
 export declare const defaultProvider: Provider;

package/provider/index.js

@@ -27,15 +27,9 @@ var __exportStar =
         __createBinding(exports, m, p);
   };
 Object.defineProperty(exports, '__esModule', { value: true });
-exports.defaultProvider = exports.GatewayError = void 0;
+exports.defaultProvider = void 0;
 var default_1 = require('./default');
 __exportStar(require('./default'), exports);
-var utils_1 = require('./utils');
-Object.defineProperty(exports, 'GatewayError', {
-  enumerable: true,
-  get: function () {
-    return utils_1.GatewayError;
-  },
-});
+__exportStar(require('./errors'), exports);
 __exportStar(require('./interface'), exports);
 exports.defaultProvider = new default_1.Provider();

package/provider/utils.d.ts

@@ -1,5 +1,3 @@
-import { CustomError } from 'ts-custom-error';
-
 import type { BlockNumber } from '../types';
 import { BigNumberish } from '../utils/number';
 /**
@@ -43,8 +41,4 @@ export declare function getBlockIdentifier(blockIdentifier: BlockIdentifier): Bl
  * @returns block identifier for API request
  */
 export declare function getFormattedBlockIdentifier(blockIdentifier?: BlockIdentifier): string;
-export declare class GatewayError extends CustomError {
-  errorCode: string;
-  constructor(message: string, errorCode: string);
-}
 export {};

package/provider/utils.js

@@ -1,37 +1,10 @@
 'use strict';
-var __extends =
-  (this && this.__extends) ||
-  (function () {
-    var extendStatics = function (d, b) {
-      extendStatics =
-        Object.setPrototypeOf ||
-        ({ __proto__: [] } instanceof Array &&
-          function (d, b) {
-            d.__proto__ = b;
-          }) ||
-        function (d, b) {
-          for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p];
-        };
-      return extendStatics(d, b);
-    };
-    return function (d, b) {
-      if (typeof b !== 'function' && b !== null)
-        throw new TypeError('Class extends value ' + String(b) + ' is not a constructor or null');
-      extendStatics(d, b);
-      function __() {
-        this.constructor = d;
-      }
-      d.prototype = b === null ? Object.create(b) : ((__.prototype = b.prototype), new __());
-    };
-  })();
 Object.defineProperty(exports, '__esModule', { value: true });
-exports.GatewayError =
-  exports.getFormattedBlockIdentifier =
+exports.getFormattedBlockIdentifier =
   exports.getBlockIdentifier =
   exports.txIdentifier =
   exports.formatHash =
     void 0;
-var ts_custom_error_1 = require('ts-custom-error');
 var number_1 = require('../utils/number');
 /**
  *
@@ -109,13 +82,3 @@ function getFormattedBlockIdentifier(blockIdentifier) {
   return 'blockHash='.concat((0, number_1.toHex)((0, number_1.toBN)(blockIdentifierObject.data)));
 }
 exports.getFormattedBlockIdentifier = getFormattedBlockIdentifier;
-var GatewayError = /** @class */ (function (_super) {
-  __extends(GatewayError, _super);
-  function GatewayError(message, errorCode) {
-    var _this = _super.call(this, message) || this;
-    _this.errorCode = errorCode;
-    return _this;
-  }
-  return GatewayError;
-})(ts_custom_error_1.CustomError);
-exports.GatewayError = GatewayError;

package/src/provider/default.ts

@@ -23,8 +23,9 @@ import { getSelectorFromName } from '../utils/hash';
 import { parse, parseAlwaysAsBig, stringify } from '../utils/json';
 import { BigNumberish, bigNumberishArrayToDecimalStringArray, toBN, toHex } from '../utils/number';
 import { compressProgram, randomAddress } from '../utils/stark';
+import { GatewayError, HttpError } from './errors';
 import { ProviderInterface } from './interface';
-import { BlockIdentifier, GatewayError, getFormattedBlockIdentifier } from './utils';
+import { BlockIdentifier, getFormattedBlockIdentifier } from './utils';
 
 type NetworkName = 'mainnet-alpha' | 'goerli-alpha';
 
@@ -162,7 +163,13 @@ export class Provider implements ProviderInterface {
       const textResponse = await res.text();
       if (!res.ok) {
         // This will allow user to handle contract errors
-        const responseBody = parse(textResponse);
+        let responseBody: any;
+        try {
+          responseBody = parse(textResponse);
+        } catch {
+          // if error parsing fails, return an http error
+          throw new HttpError(res.statusText, res.status);
+        }
 
         const errorCode = responseBody.code || ((responseBody as any)?.status_code as string); // starknet-devnet uses status_code instead of code; They need to fix that
         throw new GatewayError(responseBody.message, errorCode); // Caught locally, and re-thrown for the user
@@ -178,7 +185,8 @@ export class Provider implements ProviderInterface {
       }
       return parse(textResponse) as Endpoints[T]['RESPONSE'];
     } catch (err) {
-      if (err instanceof GatewayError) {
+      // rethrow custom errors
+      if (err instanceof GatewayError || err instanceof HttpError) {
         throw err;
       }
       if (err instanceof Error) {

package/src/provider/errors.ts

@@ -0,0 +1,14 @@
+/* eslint-disable max-classes-per-file */
+import { CustomError } from 'ts-custom-error';
+
+export class GatewayError extends CustomError {
+  constructor(message: string, public errorCode: string) {
+    super(message);
+  }
+}
+
+export class HttpError extends CustomError {
+  constructor(message: string, public errorCode: number) {
+    super(message);
+  }
+}

package/src/provider/index.ts

@@ -1,7 +1,7 @@
 import { Provider } from './default';
 
 export * from './default';
-export { GatewayError } from './utils';
+export * from './errors';
 export * from './interface';
 
 export const defaultProvider = new Provider();

package/src/provider/utils.ts

@@ -1,5 +1,3 @@
-import { CustomError } from 'ts-custom-error';
-
 import type { BlockNumber } from '../types';
 import { BigNumberish, toBN, toHex } from '../utils/number';
 
@@ -84,9 +82,3 @@ export function getFormattedBlockIdentifier(blockIdentifier: BlockIdentifier = n
   }
   return `blockHash=${toHex(toBN(blockIdentifierObject.data))}`;
 }
-
-export class GatewayError extends CustomError {
-  constructor(message: string, public errorCode: string) {
-    super(message);
-  }
-}