@taquito/http-utils 18.0.0-RC.0 → 19.0.0

package/dist/lib/errors.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.HttpResponseError = exports.HttpRequestFailed = void 0;
+exports.HttpTimeoutError = exports.HttpResponseError = exports.HttpRequestFailed = void 0;
 const core_1 = require("@taquito/core");
 /**
  *  @category Error
@@ -29,8 +29,21 @@ class HttpResponseError extends core_1.NetworkError {
         this.statusText = statusText;
         this.body = body;
         this.url = url;
-        this.name = 'HttpResponse';
+        this.name = 'HttpResponseError';
     }
 }
 exports.HttpResponseError = HttpResponseError;
-//# sourceMappingURL=errors.js.map
+/**
+ *  @category Error
+ *  @description Error
+ */
+class HttpTimeoutError extends core_1.NetworkError {
+    constructor(timeout, url) {
+        super();
+        this.timeout = timeout;
+        this.url = url;
+        this.name = 'HttpTimeoutError';
+        this.message = `HTTP request timeout of ${timeout}ms exceeded`;
+    }
+}
+exports.HttpTimeoutError = HttpTimeoutError;

package/dist/lib/status_code.js

@@ -319,5 +319,4 @@ var STATUS_CODE;
      * to require agreement to Terms of Service before granting full Internet access via a Wi-Fi hotspot).
      */
     STATUS_CODE[STATUS_CODE["NETWORK_AUTHENTICATION_REQUIRED"] = 511] = "NETWORK_AUTHENTICATION_REQUIRED";
-})(STATUS_CODE = exports.STATUS_CODE || (exports.STATUS_CODE = {}));
-//# sourceMappingURL=status_code.js.map
+})(STATUS_CODE || (exports.STATUS_CODE = STATUS_CODE = {}));

package/dist/lib/taquito-http-utils.js

@@ -5,7 +5,11 @@
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -24,23 +28,22 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.HttpBackend = exports.HttpResponseError = exports.HttpRequestFailed = exports.VERSION = void 0;
-const fetch_adapter_1 = require("./fetch-adapter");
-const axios_1 = require("axios");
-const errors_1 = require("./errors");
+exports.HttpBackend = exports.HttpTimeoutError = exports.HttpResponseError = exports.HttpRequestFailed = exports.VERSION = void 0;
+let fetch = globalThis === null || globalThis === void 0 ? void 0 : globalThis.fetch;
+// Will only use browser fetch if we are in a browser environment,
+// default to the more stable node-fetch otherwise
 const isNode = typeof process !== 'undefined' && !!((_a = process === null || process === void 0 ? void 0 : process.versions) === null || _a === void 0 ? void 0 : _a.node);
-const adapter = isNode ? undefined : fetch_adapter_1.default;
+if (isNode) {
+    fetch = require('node-fetch');
+}
+const errors_1 = require("./errors");
 __exportStar(require("./status_code"), exports);
 var version_1 = require("./version");
 Object.defineProperty(exports, "VERSION", { enumerable: true, get: function () { return version_1.VERSION; } });
 var errors_2 = require("./errors");
 Object.defineProperty(exports, "HttpRequestFailed", { enumerable: true, get: function () { return errors_2.HttpRequestFailed; } });
 Object.defineProperty(exports, "HttpResponseError", { enumerable: true, get: function () { return errors_2.HttpResponseError; } });
-var ResponseType;
-(function (ResponseType) {
-    ResponseType["TEXT"] = "text";
-    ResponseType["JSON"] = "json";
-})(ResponseType || (ResponseType = {}));
+Object.defineProperty(exports, "HttpTimeoutError", { enumerable: true, get: function () { return errors_2.HttpTimeoutError; } });
 class HttpBackend {
     constructor(timeout = 30000) {
         this.timeout = timeout;
@@ -82,53 +85,56 @@ class HttpBackend {
     /**
      *
      * @param options contains options to be passed for the HTTP request (url, method and timeout)
-     * @throws {@link HttpRequestFailed} | {@link HttpResponseError}
+     * @throws {@link HttpRequestFailed} | {@link HttpResponseError} | {@link HttpTimeoutError}
      */
     createRequest({ url, method, timeout = this.timeout, query, headers = {}, json = true }, data) {
         return __awaiter(this, void 0, void 0, function* () {
+            // Serializes query params
             const urlWithQuery = url + this.serialize(query);
-            let resType;
-            let transformResponse = undefined;
+            // Adds default header entry if there aren't any Content-Type header
             if (!headers['Content-Type']) {
                 headers['Content-Type'] = 'application/json';
             }
-            if (!json) {
-                resType = ResponseType.TEXT;
-                transformResponse = [(v) => v];
-            }
-            else {
-                resType = ResponseType.JSON;
-            }
+            // Creates a new AbortController instance to handle timeouts
+            const controller = new AbortController();
+            const t = setTimeout(() => controller.abort(), timeout);
             try {
-                const response = yield axios_1.default.request({
-                    url: urlWithQuery,
-                    method: method !== null && method !== void 0 ? method : 'GET',
-                    headers: headers,
-                    responseType: resType,
-                    transformResponse,
-                    timeout: timeout,
-                    data: data,
-                    adapter,
+                const response = yield fetch(urlWithQuery, {
+                    method,
+                    headers,
+                    body: JSON.stringify(data),
+                    signal: controller.signal,
                 });
-                return response.data;
+                if (typeof response === 'undefined') {
+                    throw new Error('Response is undefined');
+                }
+                // Handle responses with status code >= 400
+                if (response.status >= 400) {
+                    const errorData = yield response.text();
+                    throw new errors_1.HttpResponseError(`Http error response: (${response.status}) ${errorData}`, response.status, response.statusText, errorData, urlWithQuery);
+                }
+                if (json) {
+                    return response.json();
+                }
+                else {
+                    return response.text();
+                }
             }
-            catch (err) {
-                if ((axios_1.default.isAxiosError(err) && err.response) || (!isNode && err.response)) {
-                    let errorData;
-                    if (typeof err.response.data === 'object') {
-                        errorData = JSON.stringify(err.response.data);
-                    }
-                    else {
-                        errorData = err.response.data;
-                    }
-                    throw new errors_1.HttpResponseError(`Http error response: (${err.response.status}) ${errorData}`, err.response.status, err.response.statusText, errorData, urlWithQuery);
+            catch (e) {
+                if (e instanceof Error && e.name === 'AbortError') {
+                    throw new errors_1.HttpTimeoutError(timeout, urlWithQuery);
+                }
+                else if (e instanceof errors_1.HttpResponseError) {
+                    throw e;
                 }
                 else {
-                    throw new errors_1.HttpRequestFailed(String(method), urlWithQuery, err);
+                    throw new errors_1.HttpRequestFailed(String(method), urlWithQuery, e);
                 }
             }
+            finally {
+                clearTimeout(t);
+            }
         });
     }
 }
 exports.HttpBackend = HttpBackend;
-//# sourceMappingURL=taquito-http-utils.js.map

package/dist/lib/version.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.VERSION = void 0;
 // IMPORTANT: THIS FILE IS AUTO GENERATED! DO NOT MANUALLY EDIT OR CHECKIN!
 exports.VERSION = {
-    "commitHash": "21f25a09b87809102b0214544d2c5396eeb5872e",
-    "version": "18.0.0-RC.0"
+    "commitHash": "801b9525f497845e778696ccac8df3a7b0f299d8",
+    "version": "19.0.0"
 };
-//# sourceMappingURL=version.js.map