@aloma.io/integration-sdk 3.4.12 → 3.4.14

package/build/internal/index.mjs

@@ -1,13 +1,11 @@
 import { init } from "@paralleldrive/cuid2";
 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()) {
         console.dir({ msg: "packet error", e, packet }, { depth: null });
@@ -97,7 +95,7 @@ class Fetcher {
                 options?.headers?.["Content-type"] === "application/json") {
                 options.body = JSON.stringify(options.body);
             }
-            const ret = await fetch(theURL, options);
+            const ret = await fetch(theURL, { ...options, signal: AbortSignal.timeout(30 * 60 * 1000) });
             const status = await ret.status;
             if (status > 399) {
                 const text = await ret.text();
@@ -407,6 +405,7 @@ ${text}
                                 method: "POST",
                                 body: new URLSearchParams(body),
                                 headers,
+                                signal: AbortSignal.timeout(60 * 1000)
                             });
                             const status = await response.status;
                             const text = await response.text();
@@ -482,6 +481,7 @@ ${text}
                                 Accept: "application/json",
                                 ...headers,
                             },
+                            signal: AbortSignal.timeout(60 * 1000)
                         });
                         const status = await response.status;
                         const text = await response.text();

package/build/internal/websocket/connection/index.mjs

@@ -1,4 +1,3 @@
-import fetch from "node-fetch";
 import { Registration } from "./registration.mjs";
 import C from "./constants.mjs";
 class Connection {
@@ -13,6 +12,7 @@ class Connection {
                 method: "POST",
                 body: JSON.stringify({}),
                 headers: { "Content-Type": "application/json" },
+                signal: AbortSignal.timeout(60 * 1000)
             }, config));
             if (response.status === 401) {
                 config.setToken(await new Registration(local.config).run());
@@ -41,6 +41,7 @@ class Connection {
                 method: "POST",
                 body: JSON.stringify({}),
                 headers: { "Content-Type": "application/json" },
+                signal: AbortSignal.timeout(60 * 1000)
             }, this.config));
         }
         catch (e) {

package/build/internal/websocket/connection/registration.mjs

@@ -1,4 +1,3 @@
-import fetch from "node-fetch";
 import C from "./constants.mjs";
 class Registration {
     constructor(config) {
@@ -22,6 +21,7 @@ class Registration {
                 icon,
             }),
             headers: { "Content-Type": "application/json" },
+            signal: AbortSignal.timeout(60 * 1000)
         }, config));
         if (response.status === 200)
             return (await response.json()).key;

package/package.json

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

package/src/internal/index.mjs

@@ -1,6 +1,5 @@
 import { init } from "@paralleldrive/cuid2";
 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";
@@ -8,8 +7,6 @@ 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()) {
     console.dir({ msg: "packet error", e, packet }, { depth: null });
@@ -126,7 +123,7 @@ class Fetcher {
         options.body = JSON.stringify(options.body);
       }
 
-      const ret = await fetch(theURL, options);
+      const ret = await fetch(theURL, {...options, signal: AbortSignal.timeout(30 * 60 * 1000)});
       const status = await ret.status;
 
       if (status > 399) {
@@ -510,6 +507,7 @@ ${text}
                 method: "POST",
                 body: new URLSearchParams(body),
                 headers,
+                signal: AbortSignal.timeout(60 * 1000)
               });
 
               const status = await response.status;
@@ -602,6 +600,7 @@ ${text}
                 Accept: "application/json",
                 ...headers,
               },
+              signal: AbortSignal.timeout(60 * 1000)
             });
 
             const status = await response.status;

package/src/internal/websocket/connection/index.mjs

@@ -1,4 +1,4 @@
-import fetch from "node-fetch";
+
 import { Registration } from "./registration.mjs";
 import C from "./constants.mjs";
 
@@ -20,8 +20,10 @@ class Connection {
             method: "POST",
             body: JSON.stringify({}),
             headers: { "Content-Type": "application/json" },
+            signal: AbortSignal.timeout(60 * 1000)
           },
           config,
+          
         ),
       );
 
@@ -57,6 +59,7 @@ class Connection {
             method: "POST",
             body: JSON.stringify({}),
             headers: { "Content-Type": "application/json" },
+            signal: AbortSignal.timeout(60 * 1000)
           },
           this.config,
         ),

package/src/internal/websocket/connection/registration.mjs

@@ -1,4 +1,3 @@
-import fetch from "node-fetch";
 import C from "./constants.mjs";
 
 class Registration {
@@ -28,6 +27,7 @@ class Registration {
             icon,
           }),
           headers: { "Content-Type": "application/json" },
+          signal: AbortSignal.timeout(60 * 1000)
         },
         config,
       ),