@imtbl/sdk 0.1.7-alpha.3 → 0.1.8-alpha

package/dist/orderbook.js

@@ -1,6 +1,6 @@
 import { ItemType, SEAPORT_CONTRACT_NAME, SEAPORT_CONTRACT_VERSION_V1_4, EIP_712_ORDER_TYPE, OrderType } from '@opensea/seaport-js/lib/constants';
+import axios from 'axios';
 import FormData from 'form-data';
-import fetch, { Headers } from 'node-fetch';
 import { utils, Contract, BigNumber, constants } from 'ethers';
 import { Seaport as Seaport$1 } from '@opensea/seaport-js';
 
@@ -147,6 +147,9 @@ const isBlob = (value) => {
 const isFormData = (value) => {
     return value instanceof FormData;
 };
+const isSuccess = (status) => {
+    return status >= 200 && status < 300;
+};
 const base64 = (str) => {
     try {
         return btoa(str);
@@ -233,15 +236,17 @@ const resolve = async (options, resolver) => {
     }
     return resolver;
 };
-const getHeaders = async (config, options) => {
+const getHeaders = async (config, options, formData) => {
     const token = await resolve(options, config.TOKEN);
     const username = await resolve(options, config.USERNAME);
     const password = await resolve(options, config.PASSWORD);
     const additionalHeaders = await resolve(options, config.HEADERS);
+    const formHeaders = typeof formData?.getHeaders === 'function' && formData?.getHeaders() || {};
     const headers = Object.entries({
         Accept: 'application/json',
         ...additionalHeaders,
         ...options.headers,
+        ...formHeaders,
     })
         .filter(([_, value]) => isDefined(value))
         .reduce((headers, [key, value]) => ({
@@ -260,7 +265,7 @@ const getHeaders = async (config, options) => {
             headers['Content-Type'] = options.mediaType;
         }
         else if (isBlob(options.body)) {
-            headers['Content-Type'] = 'application/octet-stream';
+            headers['Content-Type'] = options.body.type || 'application/octet-stream';
         }
         else if (isString(options.body)) {
             headers['Content-Type'] = 'text/plain';
@@ -269,59 +274,48 @@ const getHeaders = async (config, options) => {
             headers['Content-Type'] = 'application/json';
         }
     }
-    return new Headers(headers);
+    return headers;
 };
 const getRequestBody = (options) => {
     if (options.body) {
-        if (options.mediaType?.includes('/json')) {
-            return JSON.stringify(options.body);
-        }
-        else if (isString(options.body) || isBlob(options.body) || isFormData(options.body)) {
-            return options.body;
-        }
-        else {
-            return JSON.stringify(options.body);
-        }
+        return options.body;
     }
     return undefined;
 };
-const sendRequest = async (options, url, body, formData, headers, onCancel) => {
-    const controller = new AbortController();
-    const request = {
+const sendRequest = async (config, options, url, body, formData, headers, onCancel) => {
+    const source = axios.CancelToken.source();
+    const requestConfig = {
+        url,
         headers,
+        data: body ?? formData,
         method: options.method,
-        body: body ?? formData,
-        signal: controller.signal,
+        withCredentials: config.WITH_CREDENTIALS,
+        cancelToken: source.token,
     };
-    onCancel(() => controller.abort());
-    return await fetch(url, request);
+    onCancel(() => source.cancel('The user aborted a request.'));
+    try {
+        return await axios.request(requestConfig);
+    }
+    catch (error) {
+        const axiosError = error;
+        if (axiosError.response) {
+            return axiosError.response;
+        }
+        throw error;
+    }
 };
 const getResponseHeader = (response, responseHeader) => {
     if (responseHeader) {
-        const content = response.headers.get(responseHeader);
+        const content = response.headers[responseHeader];
         if (isString(content)) {
             return content;
         }
     }
     return undefined;
 };
-const getResponseBody = async (response) => {
+const getResponseBody = (response) => {
     if (response.status !== 204) {
-        try {
-            const contentType = response.headers.get('Content-Type');
-            if (contentType) {
-                const isJSON = contentType.toLowerCase().startsWith('application/json');
-                if (isJSON) {
-                    return await response.json();
-                }
-                else {
-                    return await response.text();
-                }
-            }
-        }
-        catch (error) {
-            console.error(error);
-        }
+        return response.data;
     }
     return undefined;
 };
@@ -357,14 +351,14 @@ const request = (config, options) => {
             const url = getUrl(config, options);
             const formData = getFormData(options);
             const body = getRequestBody(options);
-            const headers = await getHeaders(config, options);
+            const headers = await getHeaders(config, options, formData);
             if (!onCancel.isCancelled) {
-                const response = await sendRequest(options, url, body, formData, headers, onCancel);
-                const responseBody = await getResponseBody(response);
+                const response = await sendRequest(config, options, url, body, formData, headers, onCancel);
+                const responseBody = getResponseBody(response);
                 const responseHeader = getResponseHeader(response, options.responseHeader);
                 const result = {
                     url,
-                    ok: response.ok,
+                    ok: isSuccess(response.status),
                     status: response.status,
                     statusText: response.statusText,
                     body: responseHeader ?? responseBody,
@@ -379,7 +373,7 @@ const request = (config, options) => {
     });
 };
 
-class NodeHttpRequest extends BaseHttpRequest {
+class AxiosHttpRequest extends BaseHttpRequest {
     constructor(config) {
         super(config);
     }
@@ -476,7 +470,7 @@ class OrdersService {
 class OrderBookClient {
     orders;
     request;
-    constructor(config, HttpRequest = NodeHttpRequest) {
+    constructor(config, HttpRequest = AxiosHttpRequest) {
         this.request = new HttpRequest({
             BASE: config?.BASE ?? 'https://order-book-mr.dev.imtbl.com',
             VERSION: config?.VERSION ?? '1.0.0',

package/dist/passport.js

@@ -21,7 +21,7 @@ const createImmutableXConfiguration = ({ basePath, chainID, coreContractAddress,
     chainID,
     coreContractAddress,
     registrationContractAddress,
-    sdkVersion: 'ts-immutable-sdk-0.1.7-alpha.3',
+    sdkVersion: 'ts-immutable-sdk-0.1.8-alpha',
 });
 /**
  * Sets `sdkVersion` at the time of build

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@imtbl/sdk",
   "description": "Immutable Unified SDK",
-  "version": "0.1.7-alpha.3",
+  "version": "0.1.8-alpha",
   "author": "Immutable",
   "bugs": "https://github.com/immutable/ts-immutable-sdk/issues",
   "dependencies": {