bkper-js 1.1.0 → 1.2.1

package/lib/index.d.ts

@@ -1,5 +1,5 @@
 /**
- * Bkper REST API Node client.
+ * Bkper REST API Javascript client for Node.js and browsers.
  *
  * Learn more at https://bkper.com/docs
  *
@@ -849,6 +849,17 @@ export declare interface Config {
      * Custom request error handler
      */
     requestErrorHandler?: (error: any) => any;
+    /**
+     * Custom request retry handler.
+     *
+     * This function is called when a request fails and needs to be retried.
+     * It provides the HTTP status code, error message, and the number of retry attempts made so far.
+     *
+     * @param code - The HTTP status code of the failed request.
+     * @param message - The error message associated with the failed request.
+     * @param attempt - The number of retry attempts made so far.
+     */
+    requestRetryHandler?: (status?: number, message?: string, attempt?: number) => Promise<void>;
     /**
      * Sets the base api url. Default to https://app.bkper.com/_ah/api/bkper
      */

package/lib/index.js

@@ -1,5 +1,5 @@
 /**
- * Bkper REST API Node client.
+ * Bkper REST API Javascript client for Node.js and browsers.
  *
  * Learn more at https://bkper.com/docs
  *

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

@@ -7,111 +7,65 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { request } from 'gaxios';
-import https from 'https';
-import { NODE_ENV_DEV } from '../utils.js';
-const httpsAgent = https && https.Agent ? new https.Agent({ keepAlive: true }) : undefined;
-export class HttpApiRequest {
+import { HttpRequest } from './http-request.js';
+export class HttpApiRequest extends HttpRequest {
     constructor(path) {
-        this.params = [];
-        this.headers = {};
-        this.method = 'GET';
-        this.payload = null;
-        this.url = `${HttpApiRequest.config.apiBaseUrl || "https://app.bkper.com/_ah/api/bkper"}/${path}`;
-    }
-    setMethod(method) {
-        this.method = method;
-        return this;
-    }
-    setHeader(name, value) {
-        if (value) {
-            this.headers[name] = value;
-        }
-        return this;
-    }
-    addParam(name, value) {
-        if (value) {
-            this.params.push({ name, value });
-        }
-        return this;
-    }
-    setPayload(payload) {
-        this.payload = typeof payload === "string" ? payload : JSON.stringify(payload);
-        return this;
-    }
-    /**
-   * Gets the result url, with query params appended.
-   */
-    getUrl() {
-        let url = this.url;
-        if (this.params != null) {
-            let i = 0;
-            if (url.indexOf('?') < 0) {
-                url += '?';
-            }
-            else {
-                i++;
-            }
-            for (const param of this.params) {
-                if (i > 0) {
-                    url += "&";
-                }
-                var key = param.name;
-                var value = param.value;
-                if (value != null) {
-                    url += key + "=" + encodeURIComponent(value);
-                    i++;
-                }
-            }
-        }
-        return url;
+        super(`${HttpApiRequest.config.apiBaseUrl || "https://app.bkper.com/_ah/api/bkper"}/${path}`);
+        this.retry = 0;
     }
     fetch() {
+        const _super = Object.create(null, {
+            execute: { get: () => super.execute }
+        });
         return __awaiter(this, void 0, void 0, function* () {
-            var _a;
             this.addCustomHeaders();
-            this.headers['Authorization'] = `Bearer ${yield getAccessToken()}`;
+            this.setHeader('Authorization', `Bearer ${yield getAccessToken()}`);
             this.addParam('key', yield getApiKey());
             // this.httpRequest.setMuteHttpExceptions(true);
-            const url = this.getUrl();
             try {
-                return yield request({
-                    url: url,
-                    method: this.method,
-                    headers: this.headers,
-                    body: this.payload,
-                    agent: url.startsWith('https') ? httpsAgent : undefined,
-                    retryConfig: {
-                        httpMethodsToRetry: ['GET', 'PUT', 'POST', 'PATCH', 'HEAD', 'OPTIONS', 'DELETE'],
-                        statusCodesToRetry: [[100, 199], [429, 429], [500, 599]],
-                        retry: process.env.NODE_ENV == NODE_ENV_DEV ? 0 : 3,
-                        onRetryAttempt: (err) => { console.log(`${err.message} - Retrying... `); }
-                    }
-                });
-            }
-            catch (e) {
-                const customError = HttpApiRequest.config.requestErrorHandler ? HttpApiRequest.config.requestErrorHandler(e) : undefined;
-                if (customError) {
-                    throw customError;
+                let resp = yield _super.execute.call(this);
+                if (resp.status >= 200 && resp.status < 300) {
+                    return resp;
                 }
-                else {
-                    //Default error handler
-                    let error = (_a = e.response.data) === null || _a === void 0 ? void 0 : _a.error;
-                    if (error) {
-                        if (error.code == 404) {
-                            return { data: null };
-                        }
-                        else {
-                            throw error.message;
-                        }
+                else if (resp.status == 404) {
+                    return { data: null };
+                }
+                else if (this.retry <= 3) {
+                    this.retry++;
+                    if (HttpApiRequest.config.requestRetryHandler) {
+                        yield HttpApiRequest.config.requestRetryHandler(resp.status, resp.data, this.retry);
                     }
                     else {
-                        throw e.message;
+                        console.log(`${resp.data} - Retrying... `);
                     }
+                    return yield this.fetch();
                 }
+                else {
+                    throw this.handleError(resp.data);
+                }
+            }
+            catch (err) {
+                throw this.handleError(err.toJSON ? err.toJSON() : err);
             }
         });
     }
+    handleError(err) {
+        var _a, _b;
+        const customError = HttpApiRequest.config.requestErrorHandler ? HttpApiRequest.config.requestErrorHandler(err) : undefined;
+        if (customError) {
+            return customError;
+        }
+        else {
+            //Default error handler
+            let error = (_b = (_a = err.response) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.error;
+            if (error) {
+                return error.message;
+            }
+            else {
+                return err.message || err;
+            }
+        }
+    }
     addCustomHeaders() {
         return __awaiter(this, void 0, void 0, function* () {
             if (HttpApiRequest.config.requestHeadersProvider) {

package/lib/service/http-request.js

@@ -0,0 +1,78 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        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 = [];
+        this.headers = {};
+        this.method = 'GET';
+        this.payload = null;
+        this.url = url;
+    }
+    setMethod(method) {
+        this.method = method;
+        return this;
+    }
+    setHeader(name, value) {
+        this.headers[name] = value;
+        return this;
+    }
+    addParam(name, value) {
+        this.params.push({ name, value });
+        return this;
+    }
+    setPayload(payload) {
+        this.payload = payload;
+        return this;
+    }
+    /**
+     * Gets the result url, with query params appended.
+     */
+    getUrl() {
+        let url = this.url;
+        if (this.params != null) {
+            let i = 0;
+            if (url.indexOf('?') < 0) {
+                url += '?';
+            }
+            else {
+                i++;
+            }
+            for (const param of this.params) {
+                if (i > 0) {
+                    url += "&";
+                }
+                var key = param.name;
+                var value = param.value;
+                if (value != null) {
+                    url += key + "=" + encodeURIComponent(value);
+                    i++;
+                }
+            }
+        }
+        return url;
+    }
+    execute() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const url = this.getUrl();
+            return axios.request({
+                url: url,
+                method: this.method,
+                headers: this.headers,
+                data: this.payload,
+                httpsAgent: url.startsWith('https') ? httpsAgent : undefined,
+                // withCredentials: true
+            });
+        });
+    }
+}
+//# sourceMappingURL=http-request.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bkper-js",
-  "version": "1.1.0",
+  "version": "1.2.1",
   "description": "Javascript client for Bkper REST API",
   "main": "./lib/index.js",
   "module": "./lib/index.js",
@@ -35,9 +35,9 @@
   },
   "dependencies": {
     "@google-cloud/local-auth": "^3.0.1",
+    "axios": "^1.7.7",
     "big.js": "^6.0.3",
     "dayjs": "^1.10.3",
-    "gaxios": "^4.3.0",
     "luxon": "^1.25.0"
   },
   "devDependencies": {