bkper-js 2.7.0 → 2.7.1

package/lib/service/balances-service.js

@@ -8,12 +8,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { HttpBooksApiV5Request } from "./http-api-request.js";
-import axios from 'axios';
+import { HttpRequest } from "./http-request.js";
 export function getBalances(bookId, query) {
     return __awaiter(this, void 0, void 0, function* () {
-        var response = yield new HttpBooksApiV5Request(`${bookId}/balances`).addParam('query', query).addParam('time', Date.now()).fetch();
-        if (response.data.balancesUrl) {
-            response = yield axios.get(response.data.balancesUrl);
+        var _a;
+        let response = yield new HttpBooksApiV5Request(`${bookId}/balances`).addParam('query', query).addParam('time', Date.now()).fetch();
+        const balancesUrl = (_a = response.data) === null || _a === void 0 ? void 0 : _a.balancesUrl; // Expected for large payloads
+        if (balancesUrl) {
+            const balancesResponse = yield new HttpRequest(balancesUrl).setMethod('GET').execute();
+            response = { data: balancesResponse.data, status: balancesResponse.status };
         }
         return response.data;
     });

package/lib/service/http-api-request.js

@@ -21,59 +21,57 @@ export class HttpApiRequest extends HttpRequest {
             this.addCustomHeaders();
             this.setHeader('Authorization', `Bearer ${yield getAccessToken()}`);
             this.addParam('key', yield getApiKey());
-            // this.httpRequest.setMuteHttpExceptions(true);
             try {
                 let resp = yield _super.execute.call(this);
                 if (resp.status >= 200 && resp.status < 300) {
                     return resp;
                 }
+                else if (resp.status == 404) {
+                    return { data: null, status: resp.status };
+                }
+                else if (resp.status != 400 && this.retry <= 3) {
+                    this.retry++;
+                    if (HttpApiRequest.config.requestRetryHandler) {
+                        yield HttpApiRequest.config.requestRetryHandler(resp.status, resp.data, this.retry);
+                    }
+                    else {
+                        console.log(`${JSON.stringify(resp.data)} - Retrying... `);
+                    }
+                    return yield this.fetch();
+                }
                 else {
-                    throw this.handleError(resp);
+                    // Create an error object that matches axios error structure for compatibility
+                    const errorObj = {
+                        response: {
+                            status: resp.status,
+                            data: resp.data
+                        }
+                    };
+                    throw this.handleError(errorObj);
                 }
             }
             catch (error) {
+                // If error already has response structure (from our code above), use it
                 if (error.response) {
-                    let errorResp = error.response;
-                    // The request was made and the server responded with a status code
-                    // that falls out of the range of 2xx
-                    // console.log(error.response.data);
-                    // console.log(error.response.status);
-                    // console.log(error.response.headers);
-                    if (errorResp.status == 404) {
-                        return { data: null };
-                    }
-                    else if (errorResp.status != 400 && this.retry <= 3) {
-                        this.retry++;
-                        if (HttpApiRequest.config.requestRetryHandler) {
-                            yield HttpApiRequest.config.requestRetryHandler(errorResp.status, errorResp.data, this.retry);
-                        }
-                        else {
-                            console.log(`${JSON.stringify(errorResp.data)} - Retrying... `);
-                        }
-                        return yield this.fetch();
-                    }
-                    throw this.handleError(errorResp.data);
+                    throw error;
                 }
-                else if (error.request) {
-                    // The request was made but no response was received
-                    // `error.request` is an instance of XMLHttpRequest in the browser and an instance of
-                    // http.ClientRequest in node.js
+                // Network error or fetch failure
+                if (error instanceof TypeError && error.message.includes('fetch')) {
+                    // Network error - retry if within retry limit
                     if (this.retry <= 3) {
                         this.retry++;
                         if (HttpApiRequest.config.requestRetryHandler) {
                             yield HttpApiRequest.config.requestRetryHandler(520, undefined, this.retry);
                         }
                         else {
-                            console.log(`No response received - Retrying... `);
+                            console.log(`Network error - Retrying... `);
                         }
                         return yield this.fetch();
                     }
                 }
-                else {
-                    // Something happened in setting up the request that triggered an Error
-                    console.log('Error', error.message);
-                }
-                throw this.handleError(error.toJSON ? error.toJSON() : error);
+                // Other errors
+                console.log('Error', error.message);
+                throw this.handleError(error);
             }
         });
     }

package/lib/service/http-request.js

@@ -7,9 +7,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import https from 'https';
-import axios from 'axios';
-const httpsAgent = https && https.Agent ? new https.Agent({ keepAlive: true }) : undefined;
 export class HttpRequest {
     constructor(url) {
         this.params = [];
@@ -64,14 +61,39 @@ export class HttpRequest {
     execute() {
         return __awaiter(this, void 0, void 0, function* () {
             const url = this.getUrl();
-            return axios.request({
-                url: url,
+            const fetchOptions = {
                 method: this.method,
                 headers: this.headers,
-                data: this.payload,
-                httpsAgent: url.startsWith('https') ? httpsAgent : undefined,
-                // withCredentials: true
-            });
+            };
+            // Add body for non-GET requests
+            if (this.payload && this.method !== 'GET') {
+                if (typeof this.payload === 'string') {
+                    fetchOptions.body = this.payload;
+                }
+                else {
+                    fetchOptions.body = JSON.stringify(this.payload);
+                    // Ensure content-type is set for JSON payloads
+                    if (!this.headers['Content-Type'] && !this.headers['content-type']) {
+                        fetchOptions.headers = Object.assign(Object.assign({}, this.headers), { 'Content-Type': 'application/json' });
+                    }
+                }
+            }
+            const response = yield fetch(url, fetchOptions);
+            // Parse response body
+            let data;
+            const contentType = response.headers.get('content-type');
+            if (contentType && contentType.includes('application/json')) {
+                data = yield response.json();
+            }
+            else {
+                data = yield response.text();
+            }
+            // Return axios-compatible response structure
+            return {
+                data: data,
+                status: response.status,
+                headers: response.headers
+            };
         });
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bkper-js",
-  "version": "2.7.0",
+  "version": "2.7.1",
   "description": "Javascript client for Bkper REST API",
   "main": "./lib/index.js",
   "module": "./lib/index.js",
@@ -37,7 +37,6 @@
     "@bkper/bkper-api-types": "^5.25.0"
   },
   "dependencies": {
-    "axios": "^1.7.7",
     "big.js": "^6.0.3",
     "dayjs": "^1.10.3",
     "luxon": "^1.25.0"