ag-common 0.0.439 → 0.0.441

package/dist/common/helpers/stream.d.ts

@@ -0,0 +1 @@
+export declare function getStringFromStream(stream: ReadableStream<Uint8Array | Uint32Array>): Promise<string>;

package/dist/common/helpers/stream.js

@@ -0,0 +1,40 @@
+"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());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getStringFromStream = void 0;
+const log_1 = require("./log");
+function getStringFromStream(stream) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const decoder = new TextDecoder();
+        const reader = stream.getReader();
+        let result = '';
+        try {
+            // eslint-disable-next-line no-constant-condition
+            while (true) {
+                const { done, value } = yield reader.read();
+                if (done)
+                    break;
+                // Convert the Uint8Array chunk to a string
+                const chunkString = decoder.decode(value);
+                // Append the chunk to the final result
+                result += chunkString;
+            }
+        }
+        catch (e) {
+            (0, log_1.error)('error converting stream');
+        }
+        finally {
+            reader.releaseLock();
+        }
+        return result;
+    });
+}
+exports.getStringFromStream = getStringFromStream;

package/dist/ui/helpers/callOpenApi/direct.js

@@ -10,7 +10,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.callOpenApi = exports.getIdTokenAuthHeaderRaw = void 0;
-const axios_1 = require("axios");
 const const_1 = require("../../../common/const");
 const array_1 = require("../../../common/helpers/array");
 const sleep_1 = require("../../../common/helpers/sleep");
@@ -59,7 +58,7 @@ function getIdTokenAuthHeader({ overrideAuth, refreshToken, }) {
     });
 }
 const callOpenApi = (p) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
     const { func, apiUrl, logout, newDefaultApi, headers } = p;
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     let error;
@@ -94,28 +93,29 @@ const callOpenApi = (p) => __awaiter(void 0, void 0, void 0, function* () {
         errorCount += 1;
         try {
             // eslint-disable-next-line no-await-in-loop
-            const resp = yield func(cl);
-            if (resp.status < 400) {
-                data = resp.data;
+            const response = yield func(cl);
+            if (response.status < 400) {
+                data = response.data;
                 break;
             }
-            throw new axios_1.AxiosError(resp.statusText, ((_a = resp.status) === null || _a === void 0 ? void 0 : _a.toString()) || '500');
+            throw { response };
         }
         catch (e) {
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
             const ae = e;
-            const status = Number((_d = (_b = ae.code) !== null && _b !== void 0 ? _b : (_c = ae.response) === null || _c === void 0 ? void 0 : _c.status) !== null && _d !== void 0 ? _d : 500);
+            const status = Number((_c = (_a = ae.code) !== null && _a !== void 0 ? _a : (_b = ae.response) === null || _b === void 0 ? void 0 : _b.status) !== null && _c !== void 0 ? _c : 500);
             const errorMessage = [
-                (_e = ae.status) !== null && _e !== void 0 ? _e : '',
+                (_d = ae.status) !== null && _d !== void 0 ? _d : '',
                 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                (_h = (_g = (_f = ae.response) === null || _f === void 0 ? void 0 : _f.data) === null || _g === void 0 ? void 0 : _g.toString()) !== null && _h !== void 0 ? _h : '',
-                (_l = (_k = (_j = ae.response) === null || _j === void 0 ? void 0 : _j.statusText) === null || _k === void 0 ? void 0 : _k.toString()) !== null && _l !== void 0 ? _l : '',
-                (_p = (_o = (_m = ae.response) === null || _m === void 0 ? void 0 : _m.status) === null || _o === void 0 ? void 0 : _o.toString()) !== null && _p !== void 0 ? _p : '',
-                (_r = (_q = ae.message) === null || _q === void 0 ? void 0 : _q.toString()) !== null && _r !== void 0 ? _r : '',
+                (_g = (_f = (_e = ae.response) === null || _e === void 0 ? void 0 : _e.data) === null || _f === void 0 ? void 0 : _f.toString()) !== null && _g !== void 0 ? _g : '',
+                (_k = (_j = (_h = ae.response) === null || _h === void 0 ? void 0 : _h.statusText) === null || _j === void 0 ? void 0 : _j.toString()) !== null && _k !== void 0 ? _k : '',
+                (_o = (_m = (_l = ae.response) === null || _l === void 0 ? void 0 : _l.status) === null || _m === void 0 ? void 0 : _m.toString()) !== null && _o !== void 0 ? _o : '',
+                (_q = (_p = ae.message) === null || _p === void 0 ? void 0 : _p.toString()) !== null && _q !== void 0 ? _q : '',
             ]
                 .filter(array_1.notEmpty)
                 .sort((a, b) => (a.length < b.length ? -1 : 1))
                 .join('\n');
+            //if auth fail, then quick exit
             if (status === 403 || status === 401) {
                 logout();
                 return {
@@ -123,6 +123,7 @@ const callOpenApi = (p) => __awaiter(void 0, void 0, void 0, function* () {
                     data: undefined,
                 };
             }
+            //if not a potential retriable error, or have retried enough, then exit
             if (!const_1.retryHttpCodes.includes(status) || errorCount === errorMax) {
                 error = Object.assign(Object.assign({}, ae), { message: errorMessage });
                 break;

package/dist/ui/helpers/callOpenApi/helpers.d.ts

@@ -1,4 +1,4 @@
-import { AxiosResponse } from 'axios';
+import type { AxiosResponse } from 'axios';
 import { ApiResponse } from './types';
 /**
  * shim to convert raw response to an axios style response.

package/dist/ui/helpers/callOpenApi/helpers.js

@@ -11,6 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.apiResponseToAxiosResponse = void 0;
 const array_1 = require("../../../common/helpers/array");
+const stream_1 = require("../../../common/helpers/stream");
 /**
  * shim to convert raw response to an axios style response.
  * must convert all DefaultClass requests to the Raw equivalent
@@ -30,18 +31,28 @@ const apiResponseToAxiosResponse = (p) => __awaiter(void 0, void 0, void 0, func
         };
         return r1;
     }))
-        .catch((e) => {
+        .catch((e) => __awaiter(void 0, void 0, void 0, function* () {
         const er = e;
+        //try and get body
+        let statusText = er.statusText;
+        if (er.body) {
+            try {
+                const st = yield (0, stream_1.getStringFromStream)(er.body);
+                statusText = st;
+            }
+            catch (e) {
+                //
+            }
+        }
         const ret = {
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
             data: undefined,
             status: er.status,
-            statusText: er.statusText,
+            statusText,
             headers: (0, array_1.arrayToObject)(Object.entries(er.headers), (s) => s[0], (s) => s[1]),
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
             config: {},
         };
         return ret;
-    });
+    }));
 });
 exports.apiResponseToAxiosResponse = apiResponseToAxiosResponse;

package/dist/ui/helpers/callOpenApi/types.d.ts

@@ -1,4 +1,4 @@
-import { AxiosResponse } from 'axios';
+import type { AxiosResponse } from 'axios';
 import { User } from '../jwt';
 export interface OverrideAuth {
     id_token?: string;

package/dist/ui/helpers/jwt.d.ts

@@ -1,4 +1,4 @@
-import { AxiosError } from 'axios';
+import type { AxiosError } from 'axios';
 export interface Jwt {
     access_token: string;
     expires_at: number;

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.0.439",
+  "version": "0.0.441",
   "name": "ag-common",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",