@aloma.io/integration-sdk 3.3.83 → 3.3.85

package/build/internal/index.mjs

@@ -1,18 +1,12 @@
-// @ts-nocheck
-import dotenv from "dotenv";
-dotenv.config();
-import fs from "node:fs";
-import { Config } from "./websocket/config.mjs";
-import { Connection } from "./websocket/connection/index.mjs";
-import { Transport } from "./websocket/transport/index.mjs";
-import { Dispatcher } from "./dispatcher/index.mjs";
-import { WebsocketConnector } from "./websocket/index.mjs";
-import JWE from "./util/jwe/index.mjs";
-import fetch from "node-fetch";
 import { init } from "@paralleldrive/cuid2";
-const cuid = init({ length: 32 });
 import express from "express";
+import fetch from "node-fetch";
 import PromClient from "prom-client";
+import { Dispatcher } from "./dispatcher/index.mjs";
+import JWE from "./util/jwe/index.mjs";
+import { Config } from "./websocket/config.mjs";
+import { WebsocketConnector } from "./websocket/index.mjs";
+const cuid = init({ length: 32 });
 // TODO fetch with retry
 const handlePacketError = (packet, e, transport) => {
     if (!packet.cb()) {
@@ -28,14 +22,22 @@ const reply = (arg, packet, transport) => {
     }
     transport.send(transport.newPacket({ c: packet.cb(), a: { ...arg } }));
 };
+const unwrap0 = (ret, body, options) => {
+    if (options?.bodyOnly) {
+        return body;
+    }
+    else {
+        return { status: ret.status, headers: ret.headers, body };
+    }
+};
 const unwrap = async (ret, options) => {
     if (options?.text)
-        return await ret.text();
+        return unwrap0(ret, await ret.text(), options);
     if (options?.base64)
-        return (await ret.buffer()).toString("base64");
+        return unwrap0(ret, (await ret.buffer()).toString("base64"), options);
     const text = await ret.text();
     try {
-        return JSON.parse(text);
+        return unwrap0(ret, JSON.parse(text), options);
     }
     catch (e) {
         throw e + " " + text;
@@ -70,12 +72,13 @@ class Fetcher {
         var local = this, baseUrl = local.baseUrl;
         if (retries == null)
             retries = local.retry;
-        const theURL = `${baseUrl?.endsWith("/") ? baseUrl : baseUrl + "/"}${url}`.replace(/\/\/+/gi, "/");
+        let theURL = `${baseUrl?.endsWith("/") ? baseUrl : baseUrl + "/"}${url}`.replace(/\/\/+/gi, "/");
         try {
             options.url = url;
             await local.customize(options, args);
             url = options.url;
             delete (options.url);
+            theURL = `${baseUrl?.endsWith("/") ? baseUrl : baseUrl + "/"}${url}`.replace(/\/\/+/gi, "/");
             if (!options?.headers || !options?.headers?.Accept) {
                 options.headers = {
                     ...options.headers,
@@ -218,10 +221,7 @@ class OAuth {
     async invalidate(err) {
         if (true)
             return;
-        if (this._data.access_token === "invalid")
-            return;
-        console.log("could not obtain access token, marking connector as disconnected", err);
-        await this.update("invalid", null);
+        //if (this._data.access_token === "invalid") return;
     }
     getClient(arg = {}) {
         const client = new OAuthFetcher({ ...arg, oauth: this });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aloma.io/integration-sdk",
-  "version": "3.3.83",
+  "version": "3.3.85",
   "description": "",
   "author": "aloma.io",
   "license": "Apache-2.0",

package/src/internal/index.mjs

@@ -1,18 +1,12 @@
-// @ts-nocheck
-import dotenv from "dotenv";
-dotenv.config();
-import fs from "node:fs";
-import { Config } from "./websocket/config.mjs";
-import { Connection } from "./websocket/connection/index.mjs";
-import { Transport } from "./websocket/transport/index.mjs";
-import { Dispatcher } from "./dispatcher/index.mjs";
-import { WebsocketConnector } from "./websocket/index.mjs";
-import JWE from "./util/jwe/index.mjs";
-import fetch from "node-fetch";
 import { init } from "@paralleldrive/cuid2";
-const cuid = init({ length: 32 });
 import express from "express";
+import fetch from "node-fetch";
 import PromClient from "prom-client";
+import { Dispatcher } from "./dispatcher/index.mjs";
+import JWE from "./util/jwe/index.mjs";
+import { Config } from "./websocket/config.mjs";
+import { WebsocketConnector } from "./websocket/index.mjs";
+const cuid = init({ length: 32 });
 
 // TODO fetch with retry
 
@@ -37,19 +31,28 @@ const reply = (arg, packet, transport) => {
   transport.send(transport.newPacket({ c: packet.cb(), a: { ...arg } }));
 };
 
+const unwrap0 = (ret, body, options) => {
+  if (options?.bodyOnly) {
+    return body;
+  } else {
+    return {status: ret.status, headers: ret.headers, body};
+  }
+}
+
 const unwrap = async (ret, options) => {
-  if (options?.text) return await ret.text();
-  if (options?.base64) return (await ret.buffer()).toString("base64");
+  if (options?.text) return unwrap0(ret, await ret.text(), options);
+  if (options?.base64) return unwrap0(ret, (await ret.buffer()).toString("base64"), options);
 
   const text = await ret.text();
 
   try {
-    return JSON.parse(text);
+    return unwrap0(ret, JSON.parse(text), options);
   } catch (e) {
     throw e + " " + text;
   }
 };
 
+
 class Fetcher {
   constructor({ retry = 5, baseUrl, onResponse, customize }) {
     this.retry = retry;
@@ -85,7 +88,7 @@ class Fetcher {
 
     if (retries == null) retries = local.retry;
 
-    const theURL = `${
+    let theURL = `${
       baseUrl?.endsWith("/") ? baseUrl : baseUrl + "/"
     }${url}`.replace(/\/\/+/gi, "/");
 
@@ -96,6 +99,10 @@ class Fetcher {
       url = options.url;
       delete(options.url);
 
+      theURL = `${
+        baseUrl?.endsWith("/") ? baseUrl : baseUrl + "/"
+      }${url}`.replace(/\/\/+/gi, "/");
+
       if (!options?.headers || !options?.headers?.Accept) {
         options.headers = {
           ...options.headers,
@@ -280,14 +287,8 @@ class OAuth {
 
   async invalidate(err) {
     if (true) return;
-    if (this._data.access_token === "invalid") return;
-
-    console.log(
-      "could not obtain access token, marking connector as disconnected",
-      err,
-    );
+    //if (this._data.access_token === "invalid") return;
 
-    await this.update("invalid", null);
   }
 
   getClient(arg = {}) {