@magda/typescript-common 2.3.3 → 3.0.0-alpha.1

package/dist/express/status.js

@@ -1,22 +1,81 @@
-"use strict";
-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 { Router } from "express";
+import fetch from "cross-fetch";
+import callerPath from "caller-path";
+/**
+ * Store all probe information in a global variable
+ * All probe will be referenced with a unique key.
+ * This key will by default auto generated.
+ */
+const probeDB = {};
+const getInitialState = () => ({
+    ready: false,
+    since: new Date().toISOString(),
+    last: new Date().toISOString(),
+    details: {},
+    latencyMs: 0
+});
+const noopProbe = async () => Promise.resolve({ ...getInitialState(), ready: true });
+function probeList2ProbeCheckingTask(list, key) {
+    const probeData = probeDB[key];
+    if (!list || !Object.keys(list).length) {
+        return async () => {
+            probeData.state = await noopProbe();
+        };
+    }
+    const probeTasks = Object.entries(list).map(([probeKey, probe]) => async () => {
+        try {
+            const startMs = Date.now();
+            const previousState = probeData.state.details?.[probeKey];
+            let nextState = getInitialState();
+            try {
+                const stateData = await probe();
+                if (stateData && typeof stateData === "object") {
+                    nextState = { ...nextState, ...stateData };
+                }
+                else {
+                    nextState.ready = true;
+                }
+            }
+            catch (e) {
+                // lets not spam console with the same error message
+                // report if error message changed
+                if (previousState?.error !== `${e}`) {
+                    console.error("ERROR", probeKey, e);
+                    nextState.error = `${e}`;
+                }
+            }
+            nextState.latencyMs = Date.now() - startMs;
+            nextState.last = new Date().toISOString();
+            // report if status changed
+            if (nextState.ready !== previousState?.ready) {
+                nextState.since = new Date(startMs).toISOString();
+                console.log("STATUS", probeKey, "is", nextState.ready ? "up" : "down", "on", nextState.since);
+            }
+            else {
+                nextState.since = previousState.since;
+            }
+            // we want to report internal details
+            probeData.state.details[probeKey] = nextState;
+        }
+        catch (e) {
+            console.error("ERROR", probeKey, e);
+        }
     });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createServiceProbe = exports.installStatusRouter = exports.createStatusRouter = void 0;
-const express_1 = require("express");
-const request = require("request");
+    return async () => {
+        await Promise.all(probeTasks.map((task) => task()));
+        // update overall probe state
+        if (Object.values(probeData.state.details).findIndex((state) => !state?.ready) === -1) {
+            probeData.state.ready = true;
+        }
+        else {
+            probeData.state.ready = false;
+        }
+    };
+}
 // In case anyone is confused, this does not duplicate or replace kubernetes functionality
 // It just makes service and dependency status visible to everyone
-function createStatusRouter(options = {}) {
-    const router = express_1.Router();
-    installUpdater(options);
+function createStatusRouter(key) {
+    const router = Router();
     // we don't want to cache status
     router.use(function (req, res, next) {
         res.set("Cache-Control", "no-cache");
@@ -29,152 +88,90 @@ function createStatusRouter(options = {}) {
     // readiness probe for knowing if service and its dependents are
     // ready to go
     router.get("/ready", function (req, res) {
-        res.status(options.ready ? 200 : 500).json({
-            ready: options.ready,
-            since: options.since,
-            last: options.last,
-            details: options.details,
+        const probeItem = probeDB[key];
+        res.status(probeItem.state.ready ? 200 : 500).json({
+            ready: probeItem.state.ready,
+            since: probeItem.state.since,
+            last: probeItem.state.last,
+            details: probeItem.state.details,
             now: new Date().toISOString()
         });
     });
     // added this for diagnosing service state based on latency in kubernetes
-    router.get("/readySync", function (req, res) {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield Promise.all(Object.values(options._probes).map((x) => x()));
-            res.status(options.ready ? 200 : 500).json({
-                ready: options.ready,
-                since: options.since,
-                last: options.last,
-                details: options.details,
-                now: new Date().toISOString()
-            });
+    router.get("/readySync", async function (req, res) {
+        const probeItem = probeDB[key];
+        await probeItem?.allProbesChecking?.();
+        res.status(probeItem.state.ready ? 200 : 500).json({
+            ready: probeItem.state.ready,
+            since: probeItem.state.since,
+            last: probeItem.state.last,
+            details: probeItem.state.details,
+            now: new Date().toISOString()
         });
     });
     return router;
 }
-exports.createStatusRouter = createStatusRouter;
 function installUpdater(options) {
-    // This is so that we cab share OptionsIO objects
-    // for multiple endpoints
-    if (!options._installed) {
-        options.ready = !options.probes;
-        options.probeUpdateMs = options.probeUpdateMs || 10000;
-        options.details = {};
-        options.since = new Date().toISOString();
-        options._installed = {};
-        options._probes = {};
-    }
-    if (!options.probes || !Object.keys(options.probes).length) {
-        // when no probes, readiness probe will behave like the liveness probe
-        options.ready = true;
-        options.since = options.last = new Date().toISOString();
-        options.details = {};
-        return;
+    const { key } = options;
+    if (!key) {
+        throw new Error("key is required");
     }
-    // every probe deserves to not be blocked by state of other probes
-    // so we have parallel probe checkers
-    Object.entries(options.probes).forEach((probe) => {
-        const [id, callback] = probe;
-        function update(dontUpdate) {
-            return __awaiter(this, void 0, void 0, function* () {
-                try {
-                    const startMs = Date.now();
-                    let previousState = options.details[id];
-                    let nextState = {
-                        ready: false
-                    };
-                    // update probe state
-                    try {
-                        nextState = yield callback();
-                    }
-                    catch (e) {
-                        // lets not spam console with the same error message
-                        // report if error message changed
-                        if (!previousState || previousState.error !== e.message) {
-                            console.error("ERROR", id, e.stack);
-                            nextState.error = e.message;
-                        }
-                    }
-                    // --- Note: typeof null === "object"
-                    if (!nextState || typeof nextState !== "object") {
-                        nextState = {
-                            ready: false
-                        };
-                    }
-                    nextState.latencyMs = Date.now() - startMs;
-                    options.last = nextState.last = new Date().toISOString();
-                    // report if status changed
-                    if (!previousState || nextState.ready !== previousState.ready) {
-                        nextState.since = new Date(startMs).toISOString();
-                        console.log("STATUS", id, "is", nextState.ready ? "up" : "down", "on", nextState.since);
-                    }
-                    else {
-                        nextState.since = previousState.since;
-                    }
-                    // we want to report internal details
-                    options.details[id] = nextState;
-                    // update global state
-                    let isReady = true;
-                    for (const oid of Object.keys(options.probes)) {
-                        isReady =
-                            isReady &&
-                                options.details[oid] &&
-                                options.details[oid].ready;
-                    }
-                    options.ready = isReady;
-                }
-                catch (e) {
-                    console.error("ERROR", id, e.stack);
-                }
-                if (!dontUpdate) {
-                    setTimeout(update, options.probeUpdateMs).unref();
-                }
-            });
+    const hasNoProbeTasks = !options?.probes || Object.keys(options.probes).length === 0;
+    probeDB[key] = {
+        key,
+        config: { probeUpdateMs: 10000, ...options },
+        state: {
+            ...getInitialState(),
+            ready: hasNoProbeTasks ? true : false
         }
-        if (!options._installed[id]) {
-            // let's not bother running this inside test cases
-            const isInTest = typeof it === "function";
-            if (!isInTest || options.forceRun) {
-                update();
-            }
-            options._probes[id] = update.bind(null, true);
-            options._installed[id] = true;
+    };
+    const allProbesCheckingTask = probeList2ProbeCheckingTask(options?.probes, key);
+    const allProbesCheckingFunc = async () => {
+        if (probeDB[key]?.allProbesChecking !== allProbesCheckingTask) {
+            return;
         }
-    });
-    // run it again in a minute in case OptionsIO was modified to add extra probes
-    setTimeout(() => installUpdater(options), options.probeUpdateMs * 10).unref();
+        await allProbesCheckingTask();
+        // .unref() make sure the timer will not block the process from exiting
+        setTimeout(allProbesCheckingFunc, probeDB[key].config.probeUpdateMs).unref();
+    };
+    // should save allProbesCheckingTask rather than allProbesCheckingFunc
+    // as allProbesCheckingFunc include the `setTimeout` logic
+    probeDB[key].allProbesChecking = allProbesCheckingTask;
+    // let's not bother running this inside test cases
+    const isInTest = typeof it === "function";
+    if (!hasNoProbeTasks) {
+        if (!isInTest || options?.forceRun) {
+            setTimeout(allProbesCheckingFunc, probeDB[key].config.probeUpdateMs).unref();
+        }
+        else {
+            // when the probe not run (e.g. in test cases) to make sure set it as true initially
+            probeDB[key].state.ready = true;
+        }
+    }
+    return probeDB[key];
 }
-function installStatusRouter(app, options = {}, routePrefix = "") {
-    app.use(routePrefix + "/status", createStatusRouter(options));
+export function installStatusRouter(app, options = {}, routePrefix = "") {
+    options.key = options?.key
+        ? options?.key
+        : callerPath() + routePrefix + "/status";
+    installUpdater(options);
+    const statusRouter = createStatusRouter(options.key);
+    app.use(routePrefix + "/status", statusRouter);
 }
-exports.installStatusRouter = installStatusRouter;
-function createServiceProbe(url, statusLocation = "/status/ready") {
-    return () => __awaiter(this, void 0, void 0, function* () {
-        const data = yield requestPromise("GET", `${url}${statusLocation}`);
+export function createServiceProbe(url, statusLocation = "/status/ready") {
+    return async () => {
+        const res = await fetch(`${url}${statusLocation}`);
+        let data;
+        try {
+            data = await res.json();
+        }
+        catch (e) {
+            throw new Error(`Failed to parse response from ${url}${statusLocation}: ${e}`);
+        }
+        if (!res.ok) {
+            throw Object.assign({ statusCode: res.status }, data);
+        }
         return data;
-    });
-}
-exports.createServiceProbe = createServiceProbe;
-function requestPromise(method, url) {
-    return new Promise((resolve, reject) => {
-        request({
-            method,
-            uri: url,
-            json: true
-        }, (error, response, body) => {
-            if (error) {
-                reject(error);
-            }
-            else {
-                if (response.statusCode >= 200 &&
-                    response.statusCode <= 299) {
-                    resolve(body);
-                }
-                else {
-                    reject(Object.assign({ statusCode: response.statusCode }, body));
-                }
-            }
-        });
-    });
+    };
 }
 //# sourceMappingURL=status.js.map

package/dist/express/status.js.map

@@ -1 +1 @@
-{"version":3,"file":"status.js","sourceRoot":"","sources":["../../src/express/status.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"status.js","sourceRoot":"","sources":["../../src/express/status.ts"],"names":[],"mappings":"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"}

package/dist/fetchRequest.d.ts

@@ -1,9 +1,9 @@
-declare type RequestContentTypeJson = "application/json";
-declare type RequestContentTypePlainText = "text/plain";
-declare type RequestContentTypeForm = "application/x-www-form-urlencoded";
-declare type RequestContentTypeBinary = "application/octet-stream";
-declare type RequestContentTypeMultipartForm = "multipart/form-data";
-declare type RequestContentType = RequestContentTypeJson | RequestContentTypePlainText | RequestContentTypeForm | RequestContentTypeBinary | RequestContentTypeMultipartForm;
+type RequestContentTypeJson = "application/json";
+type RequestContentTypePlainText = "text/plain";
+type RequestContentTypeForm = "application/x-www-form-urlencoded";
+type RequestContentTypeBinary = "application/octet-stream";
+type RequestContentTypeMultipartForm = "multipart/form-data";
+type RequestContentType = RequestContentTypeJson | RequestContentTypePlainText | RequestContentTypeForm | RequestContentTypeBinary | RequestContentTypeMultipartForm;
 export declare function setDefaultRequestInitOptions(options: RequestInit): void;
 export declare function getDefaultRequestInitOptions(): RequestInit;
 export default function fetchRequest<T = any, CT = string>(method: string, url: string, body?: any, contentType?: CT | RequestContentType | undefined | null, returnHeaders?: false, extraRequestOptions?: RequestInit): Promise<T>;

package/dist/fetchRequest.js

@@ -1,62 +1,47 @@
-"use strict";
-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());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDefaultRequestInitOptions = exports.setDefaultRequestInitOptions = void 0;
-const isomorphic_fetch_1 = __importDefault(require("isomorphic-fetch"));
-const merge_1 = __importDefault(require("lodash/merge"));
-const ServerError_1 = __importDefault(require("./ServerError"));
+import fetch from "cross-fetch";
+import merge from "lodash/merge.js";
+import ServerError from "./ServerError.js";
 let defaultRequestInitOptions = {};
-function setDefaultRequestInitOptions(options) {
+export function setDefaultRequestInitOptions(options) {
     defaultRequestInitOptions = options;
 }
-exports.setDefaultRequestInitOptions = setDefaultRequestInitOptions;
-function getDefaultRequestInitOptions() {
+export function getDefaultRequestInitOptions() {
     return defaultRequestInitOptions;
 }
-exports.getDefaultRequestInitOptions = getDefaultRequestInitOptions;
-function fetchRequest(method, url, body = undefined, contentType = "application/json", returnHeaders = false, extraRequestOptions = {}) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const defaultOptions = Object.assign({}, (defaultRequestInitOptions ? defaultRequestInitOptions : {}));
-        const fetchOptions = merge_1.default(defaultOptions, Object.assign({ method }, extraRequestOptions));
-        if (body !== undefined) {
-            if (contentType === "application/json") {
-                fetchOptions.body = JSON.stringify(body);
+export default async function fetchRequest(method, url, body = undefined, contentType = "application/json", returnHeaders = false, extraRequestOptions = {}) {
+    const defaultOptions = {
+        ...(defaultRequestInitOptions ? defaultRequestInitOptions : {})
+    };
+    const fetchOptions = merge(defaultOptions, {
+        method,
+        ...extraRequestOptions
+    });
+    if (body !== undefined) {
+        if (contentType === "application/json") {
+            fetchOptions.body = JSON.stringify(body);
+            fetchOptions.headers = {
+                "Content-type": "application/json"
+            };
+        }
+        else {
+            fetchOptions.body = body;
+            if (typeof contentType === "string") {
                 fetchOptions.headers = {
-                    "Content-type": "application/json"
+                    "Content-type": contentType
                 };
             }
-            else {
-                fetchOptions.body = body;
-                if (typeof contentType === "string") {
-                    fetchOptions.headers = {
-                        "Content-type": contentType
-                    };
-                }
-            }
-        }
-        const response = yield isomorphic_fetch_1.default(url, fetchOptions);
-        if (response.status >= 200 && response.status < 300) {
-            // wrapping this in try/catch as the request succeeded
-            // this is just haggling over response content
-            return returnHeaders
-                ? [(yield response.json()), response.headers]
-                : (yield response.json());
         }
-        // --- get responseText and remove any HTML tags
-        const responseText = (yield response.text()).replace(/<(.|\n)*?>/g, "");
-        throw new ServerError_1.default(responseText, response.status);
-    });
+    }
+    const response = await fetch(url, fetchOptions);
+    if (response.status >= 200 && response.status < 300) {
+        // wrapping this in try/catch as the request succeeded
+        // this is just haggling over response content
+        return returnHeaders
+            ? [(await response.json()), response.headers]
+            : (await response.json());
+    }
+    // --- get responseText and remove any HTML tags
+    const responseText = (await response.text()).replace(/<(.|\n)*?>/g, "");
+    throw new ServerError(responseText, response.status);
 }
-exports.default = fetchRequest;
 //# sourceMappingURL=fetchRequest.js.map

package/dist/fetchRequest.js.map

@@ -1 +1 @@
-{"version":3,"file":"fetchRequest.js","sourceRoot":"","sources":["../src/fetchRequest.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,wEAAqC;AACrC,yDAAiC;AACjC,gEAAwC;AAexC,IAAI,yBAAyB,GAAgB,EAAE,CAAC;AAEhD,SAAgB,4BAA4B,CAAC,OAAoB;IAC7D,yBAAyB,GAAG,OAAO,CAAC;AACxC,CAAC;AAFD,oEAEC;AAED,SAAgB,4BAA4B;IACxC,OAAO,yBAAyB,CAAC;AACrC,CAAC;AAFD,oEAEC;AAoBD,SAA8B,YAAY,CACtC,MAAc,EACd,GAAW,EACX,OAAY,SAAS,EACrB,cAIa,kBAAkB,EAC/B,gBAAyB,KAAK,EAC9B,sBAAmC,EAAE;;QAErC,MAAM,cAAc,qBACb,CAAC,yBAAyB,CAAC,CAAC,CAAC,yBAAyB,CAAC,CAAC,CAAC,EAAE,CAAC,CAClE,CAAC;QACF,MAAM,YAAY,GAAG,eAAK,CAAC,cAAc,kBACrC,MAAM,IACH,mBAAmB,EACxB,CAAC;QACH,IAAI,IAAI,KAAK,SAAS,EAAE;YACpB,IAAI,WAAW,KAAK,kBAAkB,EAAE;gBACpC,YAAY,CAAC,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;gBACzC,YAAY,CAAC,OAAO,GAAG;oBACnB,cAAc,EAAE,kBAAkB;iBACrC,CAAC;aACL;iBAAM;gBACH,YAAY,CAAC,IAAI,GAAG,IAAI,CAAC;gBACzB,IAAI,OAAO,WAAW,KAAK,QAAQ,EAAE;oBACjC,YAAY,CAAC,OAAO,GAAG;wBACnB,cAAc,EAAE,WAAW;qBAC9B,CAAC;iBACL;aACJ;SACJ;QAED,MAAM,QAAQ,GAAG,MAAM,0BAAK,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;QAEhD,IAAI,QAAQ,CAAC,MAAM,IAAI,GAAG,IAAI,QAAQ,CAAC,MAAM,GAAG,GAAG,EAAE;YACjD,sDAAsD;YACtD,8CAA8C;YAC9C,OAAO,aAAa;gBAChB,CAAC,CAAE,CAAC,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAM,EAAE,QAAQ,CAAC,OAAO,CAAkB;gBACpE,CAAC,CAAE,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAO,CAAC;SACxC;QACD,gDAAgD;QAChD,MAAM,YAAY,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,aAAa,EAAE,EAAE,CAAC,CAAC;QACxE,MAAM,IAAI,qBAAW,CAAC,YAAY,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;IACzD,CAAC;CAAA;AA/CD,+BA+CC"}
+{"version":3,"file":"fetchRequest.js","sourceRoot":"","sources":["../src/fetchRequest.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,aAAa,CAAC;AAChC,OAAO,KAAK,MAAM,iBAAiB,CAAC;AACpC,OAAO,WAAW,MAAM,kBAAkB,CAAC;AAe3C,IAAI,yBAAyB,GAAgB,EAAE,CAAC;AAEhD,MAAM,UAAU,4BAA4B,CAAC,OAAoB;IAC7D,yBAAyB,GAAG,OAAO,CAAC;AACxC,CAAC;AAED,MAAM,UAAU,4BAA4B;IACxC,OAAO,yBAAyB,CAAC;AACrC,CAAC;AAoBD,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,YAAY,CACtC,MAAc,EACd,GAAW,EACX,OAAY,SAAS,EACrB,cAIa,kBAAkB,EAC/B,gBAAyB,KAAK,EAC9B,sBAAmC,EAAE;IAErC,MAAM,cAAc,GAAG;QACnB,GAAG,CAAC,yBAAyB,CAAC,CAAC,CAAC,yBAAyB,CAAC,CAAC,CAAC,EAAE,CAAC;KAClE,CAAC;IACF,MAAM,YAAY,GAAG,KAAK,CAAC,cAAc,EAAE;QACvC,MAAM;QACN,GAAG,mBAAmB;KACzB,CAAC,CAAC;IACH,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QACrB,IAAI,WAAW,KAAK,kBAAkB,EAAE,CAAC;YACrC,YAAY,CAAC,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;YACzC,YAAY,CAAC,OAAO,GAAG;gBACnB,cAAc,EAAE,kBAAkB;aACrC,CAAC;QACN,CAAC;aAAM,CAAC;YACJ,YAAY,CAAC,IAAI,GAAG,IAAI,CAAC;YACzB,IAAI,OAAO,WAAW,KAAK,QAAQ,EAAE,CAAC;gBAClC,YAAY,CAAC,OAAO,GAAG;oBACnB,cAAc,EAAE,WAAW;iBAC9B,CAAC;YACN,CAAC;QACL,CAAC;IACL,CAAC;IAED,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;IAEhD,IAAI,QAAQ,CAAC,MAAM,IAAI,GAAG,IAAI,QAAQ,CAAC,MAAM,GAAG,GAAG,EAAE,CAAC;QAClD,sDAAsD;QACtD,8CAA8C;QAC9C,OAAO,aAAa;YAChB,CAAC,CAAE,CAAC,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAM,EAAE,QAAQ,CAAC,OAAO,CAAkB;YACpE,CAAC,CAAE,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAO,CAAC;IACzC,CAAC;IACD,gDAAgD;IAChD,MAAM,YAAY,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,aAAa,EAAE,EAAE,CAAC,CAAC;IACxE,MAAM,IAAI,WAAW,CAAC,YAAY,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;AACzD,CAAC"}

package/dist/formatServiceError.js

@@ -1,12 +1,11 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-function formatServiceError(baseMessage, e, retriesLeft) {
+export default function formatServiceError(baseMessage, e, retriesLeft) {
     let messageParts = [baseMessage];
     if (retriesLeft) {
         messageParts.push(`${retriesLeft} retries left.`);
     }
-    if (e && e.response && e.response.statusCode && e.body) {
-        messageParts.push(`Status code: ${e.response.statusCode}, body:\n${JSON.stringify(e.body, null, "  ")}`);
+    if ((e?.response?.statusCode || e?.response?.status) && e.body) {
+        const statusCode = e?.response?.status || e?.response?.statusCode;
+        messageParts.push(`Status code: ${statusCode}, body:\n${JSON.stringify(e.body, null, "  ")}`);
     }
     else if (e && e instanceof Error) {
         messageParts.push(`Exception:\n${e.toString()}`);
@@ -19,5 +18,4 @@ function formatServiceError(baseMessage, e, retriesLeft) {
     }
     return messageParts.join(" ");
 }
-exports.default = formatServiceError;
 //# sourceMappingURL=formatServiceError.js.map

package/dist/formatServiceError.js.map

@@ -1 +1 @@
-{"version":3,"file":"formatServiceError.js","sourceRoot":"","sources":["../src/formatServiceError.ts"],"names":[],"mappings":";;AAAA,SAAwB,kBAAkB,CACtC,WAAmB,EACnB,CAAM,EACN,WAAmB;IAEnB,IAAI,YAAY,GAAG,CAAC,WAAW,CAAC,CAAC;IACjC,IAAI,WAAW,EAAE;QACb,YAAY,CAAC,IAAI,CAAC,GAAG,WAAW,gBAAgB,CAAC,CAAC;KACrD;IACD,IAAI,CAAC,IAAI,CAAC,CAAC,QAAQ,IAAI,CAAC,CAAC,QAAQ,CAAC,UAAU,IAAI,CAAC,CAAC,IAAI,EAAE;QACpD,YAAY,CAAC,IAAI,CACb,gBAAgB,CAAC,CAAC,QAAQ,CAAC,UAAU,YAAY,IAAI,CAAC,SAAS,CAC3D,CAAC,CAAC,IAAI,EACN,IAAI,EACJ,IAAI,CACP,EAAE,CACN,CAAC;KACL;SAAM,IAAI,CAAC,IAAI,CAAC,YAAY,KAAK,EAAE;QAChC,YAAY,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;KACpD;SAAM,IAAI,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,KAAK,EAAE,CAAC,QAAQ,EAAE,EAAE;QAC5C,YAAY,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;KAClD;SAAM,IAAI,CAAC,EAAE;QACV,YAAY,CAAC,IAAI,CAAC,aAAa,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;KACnE;IAED,OAAO,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAClC,CAAC;AA1BD,qCA0BC"}
+{"version":3,"file":"formatServiceError.js","sourceRoot":"","sources":["../src/formatServiceError.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,OAAO,UAAU,kBAAkB,CACtC,WAAmB,EACnB,CAAM,EACN,WAAmB;IAEnB,IAAI,YAAY,GAAG,CAAC,WAAW,CAAC,CAAC;IACjC,IAAI,WAAW,EAAE,CAAC;QACd,YAAY,CAAC,IAAI,CAAC,GAAG,WAAW,gBAAgB,CAAC,CAAC;IACtD,CAAC;IACD,IAAI,CAAC,CAAC,EAAE,QAAQ,EAAE,UAAU,IAAI,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC;QAC7D,MAAM,UAAU,GAAG,CAAC,EAAE,QAAQ,EAAE,MAAM,IAAI,CAAC,EAAE,QAAQ,EAAE,UAAU,CAAC;QAClE,YAAY,CAAC,IAAI,CACb,gBAAgB,UAAU,YAAY,IAAI,CAAC,SAAS,CAChD,CAAC,CAAC,IAAI,EACN,IAAI,EACJ,IAAI,CACP,EAAE,CACN,CAAC;IACN,CAAC;SAAM,IAAI,CAAC,IAAI,CAAC,YAAY,KAAK,EAAE,CAAC;QACjC,YAAY,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;IACrD,CAAC;SAAM,IAAI,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,KAAK,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC;QAC7C,YAAY,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;IACnD,CAAC;SAAM,IAAI,CAAC,EAAE,CAAC;QACX,YAAY,CAAC,IAAI,CAAC,aAAa,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;IACpE,CAAC;IAED,OAAO,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAClC,CAAC"}