@aloma.io/integration-sdk 3.3.64 → 3.3.65

package/build/builder/runtime-context.mjs

@@ -16,7 +16,7 @@ export default class RuntimeContext {
         let icon;
         try {
             if (data.icon) {
-                icon = fs.readFileSync(data.icon).toString('base64');
+                icon = fs.readFileSync(data.icon).toString("base64");
             }
         }
         catch (e) {
@@ -26,7 +26,7 @@ export default class RuntimeContext {
             id: data.id,
             version: data.version,
             name: `${data.id}/${data.version}`,
-            icon
+            icon,
         });
         const configuration = connector.configure().config(data.config || {});
         const resolvers = {};

package/build/builder/transform/index.mjs

@@ -29,11 +29,10 @@ const transform = (meta) => {
             let eg;
             if (example) {
                 const parts = example.split(/```/);
-                const backticks = '```';
-                eg = `@example ${parts[0] || 'usage'}\n${backticks}${parts[1]}${backticks}`;
+                const backticks = "```";
+                eg = `@example ${parts[0] || "usage"}\n${backticks}${parts[1]}${backticks}`;
             }
-            const paramDocs = docs
-                .filter((what) => what.kind === "param");
+            const paramDocs = docs.filter((what) => what.kind === "param");
             const params = sig
                 .getParameters()
                 .filter((param) => param.isNamed())
@@ -46,12 +45,10 @@ const transform = (meta) => {
                     return `${p.getName()}${defaultVal}`;
                 })
                     .join("; ");
-                const suffix = serialized
-                    .type
-                    .properties
+                const suffix = serialized.type.properties
                     .map((p) => {
                     const comment = paramDocs.find((what) => what.value.name === p.name);
-                    const desc = (comment?.value.description || '').replace(/\\@/gi, '@');
+                    const desc = (comment?.value.description || "").replace(/\\@/gi, "@");
                     return `\n/**\n${desc}\n */\n ${p.name}: ${p.type.text}`;
                 })
                     .join("; ");
@@ -66,7 +63,7 @@ const transform = (meta) => {
 /**
  * ${desc || ""}
  *
- * ${eg || ''}
+ * ${eg || ""}
  **/    
 declare function ${member.getName()}(${params}): ${retVal};
       `;
@@ -79,6 +76,6 @@ declare function ${member.getName()}(${params}): ${retVal};
 export default async (path) => {
     const parsed = await parseFromFiles([path]);
     if (parsed.errors?.length)
-        throw new Error(path + ' ' + JSON.stringify(parsed.errors));
+        throw new Error(path + " " + JSON.stringify(parsed.errors));
     return transform(parsed.project?.getModules() || []);
 };

package/build/controller/index.d.mts

@@ -7,7 +7,7 @@ export declare abstract class AbstractController {
     protected fallback(arg: any): Promise<any>;
     protected endpoint(arg: any): Promise<any>;
     protected newTask(name: string, data: any): Promise<string>;
-    protected getClient({ baseUrl, onResponse }: {
+    protected getClient({ baseUrl, onResponse, }: {
         baseUrl: string;
         onResponse?: (response: any) => void;
     }): Promise<any>;

package/build/controller/index.mjs

@@ -15,7 +15,7 @@ export class AbstractController {
     async newTask(name, data) {
         throw new Error("not implemented");
     }
-    getClient({ baseUrl, onResponse }) {
+    getClient({ baseUrl, onResponse, }) {
         throw new Error("not implemented");
     }
     async updateTask(name, data) {

package/build/internal/dispatcher/index.mjs

@@ -44,7 +44,7 @@ class Dispatcher {
                         placeholder: "e.g. 1234",
                         type: "line",
                         optional: !!arg.configurableClientOptional,
-                        plain: true
+                        plain: true,
                     },
                     clientSecret: {
                         name: "OAuth Client Secret",
@@ -67,8 +67,8 @@ class Dispatcher {
 ${arg.configurableClientScope}
 `,
                         optional: true,
-                        plain: true
-                    }
+                        plain: true,
+                    },
                 },
             });
         }

package/build/internal/index.mjs

@@ -38,7 +38,7 @@ const unwrap = async (ret, options) => {
         return JSON.parse(text);
     }
     catch (e) {
-        throw (e + ' ' + text);
+        throw e + " " + text;
     }
 };
 class Fetcher {
@@ -192,7 +192,7 @@ class OAuth {
     }
     async periodicRefresh() {
         const clients = this.clients;
-        console.log('refreshing oauth clients', clients.length);
+        console.log("refreshing oauth clients", clients.length);
         for (let i = 0; i < clients.length; ++i) {
             const client = clients[0];
             await client.periodicRefresh();
@@ -251,7 +251,7 @@ class Connector {
             publicKey: process.env.PUBLIC_KEY,
             introspect,
             configSchema,
-            icon: this.icon
+            icon: this.icon,
         });
         if (Object.keys(configSchema().fields).length) {
             try {
@@ -293,7 +293,7 @@ ${text}
                         const value = secrets[key];
                         if (!value)
                             continue;
-                        if (fields[key]?.plain || ['endpointUrl'].includes(key)) {
+                        if (fields[key]?.plain || ["endpointUrl"].includes(key)) {
                             decrypted[key] = value;
                         }
                         else {
@@ -338,7 +338,6 @@ ${text}
                             const clientId = process.env.OAUTH_CLIENT_ID ||
                                 decrypted.clientId ||
                                 that._oauth.clientId;
-                            ;
                             if (!clientId)
                                 throw new Error("clientId not configured");
                             const clientSecret = process.env.OAUTH_CLIENT_SECRET ||
@@ -473,7 +472,7 @@ ${text}
                                     await theOAuth.periodicRefresh();
                                 }
                                 catch (e) {
-                                    console.log('periodic refresh', e);
+                                    console.log("periodic refresh", e);
                                 }
                             }, 4 * 60 * 60 * 15000);
                         }

package/build/internal/websocket/config.d.mts

@@ -1,5 +1,5 @@
 export class Config {
-    constructor({ registrationToken, version, name, id, endpoint, wsEndpoint, privateKey, publicKey, introspect, configSchema, icon }: {
+    constructor({ registrationToken, version, name, id, endpoint, wsEndpoint, privateKey, publicKey, introspect, configSchema, icon, }: {
         registrationToken: any;
         version: any;
         name: any;

package/build/internal/websocket/config.mjs

@@ -1,7 +1,7 @@
 import C from "./connection/constants.mjs";
 import JWE from "../util/jwe/index.mjs";
 class Config {
-    constructor({ registrationToken, version, name, id, endpoint, wsEndpoint, privateKey, publicKey, introspect, configSchema, icon }) {
+    constructor({ registrationToken, version, name, id, endpoint, wsEndpoint, privateKey, publicKey, introspect, configSchema, icon, }) {
         this._token = null;
         this._registrationToken = registrationToken;
         this._version = version;

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

@@ -19,7 +19,7 @@ class Registration {
                 id: config.id(),
                 publicKey: config.publicKey(),
                 schema: { configSchema, introspect: intro },
-                icon
+                icon,
             }),
             headers: { "Content-Type": "application/json" },
         }, config));

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

@@ -47,15 +47,25 @@ class Transport {
         local.close();
         this.running = true;
         const ws = (local.ws = new WebSocket(config.wsUrl(), ["connector"], C.augmentRequest({ headers: {} }, config)));
+        ws.onPing = function () {
+            clearTimeout(this.pingTimeout);
+            this.pingTimeout = setTimeout(() => {
+                console.log("terminating ws");
+                if (local.running)
+                    this.terminate();
+            }, 30000 + 15000);
+        };
         ws.on("open", () => {
             console.log("websocket connected");
             local.connected = true;
+            ws.onPing();
             local.pinger = setInterval(() => ws.ping(() => null), pingInterval);
             local.onConnect(local);
         });
         ws.on("message", (message) => {
             setTimeout(() => local.onMessages(JSON.parse(message)), 0);
         });
+        ws.on("ping", () => ws.onPing());
         ws.on("error", (message) => {
             console.log("error:", message);
         });

package/package.json

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

package/src/builder/index.mts

@@ -38,7 +38,7 @@ export class Builder {
     await this.parsePackageJson();
     await this.discoverTypes();
     await this.checkIcon();
-    
+
     // @ts-ignore
     const Controller = (
       await import(__dirname + "/../../../../../build/controller/index.mjs")
@@ -46,11 +46,11 @@ export class Builder {
 
     return new RuntimeContext(new Controller(), this.data);
   }
-  
+
   private async checkIcon() {
     const data = this.data;
-    const root = __dirname + "/../../../../../"
-    
+    const root = __dirname + "/../../../../../";
+
     data.icon = `${root}/logo.png`;
   }
 

package/src/builder/runtime-context.mts

@@ -1,7 +1,7 @@
 import { AbstractController } from "../controller/index.mjs";
 import { Connector } from "../internal/index.mjs";
 import fs from "node:fs";
-    
+
 export default class RuntimeContext {
   constructor(
     private controller: AbstractController,
@@ -14,25 +14,22 @@ export default class RuntimeContext {
     if (!(controller instanceof AbstractController))
       throw new Error("the controller needs to extend AbstractController");
     const data: any = this.data;
-    
+
     let icon;
-    
-    try
-    {
-      if (data.icon) 
-      {
-        icon = fs.readFileSync(data.icon).toString('base64');
+
+    try {
+      if (data.icon) {
+        icon = fs.readFileSync(data.icon).toString("base64");
       }
-    } catch(e) {
+    } catch (e) {
       // blank
     }
-    
 
     const connector = new Connector({
       id: data.id,
       version: data.version,
       name: `${data.id}/${data.version}`,
-      icon
+      icon,
     });
 
     const configuration = connector.configure().config(data.config || {});
@@ -56,7 +53,10 @@ export default class RuntimeContext {
     configuration.types(data.types).resolvers(resolvers);
 
     if (data.options?.endpoint?.enabled) {
-      configuration.endpoint((arg) => controller.__endpoint(arg), data.options?.endpoint?.required);
+      configuration.endpoint(
+        (arg) => controller.__endpoint(arg),
+        data.options?.endpoint?.required,
+      );
     }
 
     if (data.auth?.oauth) {
@@ -81,7 +81,7 @@ export default class RuntimeContext {
     );
 
     connector.run();
-    
+
     const term = async () => {
       await controller._doStop(true);
 

package/src/builder/transform/index.mts

@@ -31,21 +31,20 @@ const transform = (meta: any) => {
           const docs = sig.getJSDoc().serialize() || [];
           const desc = docs.find((what: any) => what.kind === "description")
             ?.value;
-            
+
           const example = docs.find((what: any) => what.kind === "example")
             ?.value;
 
           let eg;
-          if (example)
-          {
+          if (example) {
             const parts = example.split(/```/);
-            const backticks = '```';
-            eg = `@example ${parts[0] || 'usage'}\n${backticks}${parts[1]}${backticks}`;
+            const backticks = "```";
+            eg = `@example ${parts[0] || "usage"}\n${backticks}${
+              parts[1]
+            }${backticks}`;
           }
-          
-          const paramDocs =
-            docs
-              .filter((what: any) => what.kind === "param")
+
+          const paramDocs = docs.filter((what: any) => what.kind === "param");
 
           const params = sig
             .getParameters()
@@ -62,22 +61,25 @@ const transform = (meta: any) => {
                   return `${p.getName()}${defaultVal}`;
                 })
                 .join("; ");
-                
-              const suffix = serialized
-                .type
-                .properties
+
+              const suffix = serialized.type.properties
                 .map((p) => {
-                  const comment = paramDocs.find((what) => what.value.name === p.name);
-                  const desc = (comment?.value.description || '').replace(/\\@/gi, '@');
-                  
+                  const comment = paramDocs.find(
+                    (what) => what.value.name === p.name,
+                  );
+                  const desc = (comment?.value.description || "").replace(
+                    /\\@/gi,
+                    "@",
+                  );
+
                   return `\n/**\n${desc}\n */\n ${p.name}: ${p.type.text}`;
                 })
                 .join("; ");
-                
+
               return `{${prefix}}: {${suffix}}`;
             })
             .join(", ");
-            
+
           const retVal = sig
             .serialize()
             .return.type.text.replace(/^Promise</, "")
@@ -87,7 +89,7 @@ const transform = (meta: any) => {
 /**
  * ${desc || ""}
  *
- * ${eg || ''}
+ * ${eg || ""}
  **/    
 declare function ${member.getName()}(${params}): ${retVal};
       `;
@@ -101,6 +103,7 @@ declare function ${member.getName()}(${params}): ${retVal};
 
 export default async (path: string) => {
   const parsed = await parseFromFiles([path]);
-  if (parsed.errors?.length) throw new Error(path + ' ' + JSON.stringify(parsed.errors));
+  if (parsed.errors?.length)
+    throw new Error(path + " " + JSON.stringify(parsed.errors));
   return transform(parsed.project?.getModules() || []);
 };

package/src/controller/index.mts

@@ -22,7 +22,13 @@ export abstract class AbstractController {
     throw new Error("not implemented");
   }
 
-  protected getClient({ baseUrl, onResponse }: { baseUrl: string, onResponse?: (response: any) => void }): Promise<any> {
+  protected getClient({
+    baseUrl,
+    onResponse,
+  }: {
+    baseUrl: string;
+    onResponse?: (response: any) => void;
+  }): Promise<any> {
     throw new Error("not implemented");
   }
 

package/src/internal/dispatcher/index.mjs

@@ -51,7 +51,7 @@ class Dispatcher {
             placeholder: "e.g. 1234",
             type: "line",
             optional: !!arg.configurableClientOptional,
-            plain: true
+            plain: true,
           },
           clientSecret: {
             name: "OAuth Client Secret",
@@ -62,7 +62,7 @@ class Dispatcher {
         },
       });
     }
-    
+
     if (arg.configurableClientScope) {
       this.config({
         fields: {
@@ -75,8 +75,8 @@ class Dispatcher {
 ${arg.configurableClientScope}
 `,
             optional: true,
-            plain: true
-          }
+            plain: true,
+          },
         },
       });
     }
@@ -111,7 +111,7 @@ ${arg.configurableClientScope}
         _endpointToken: {
           name: "Endpoint Token",
           placeholder: "e.g. 1234",
-          type: !!notOptional?"managed":"line",
+          type: !!notOptional ? "managed" : "line",
           plain: true,
           optional: !notOptional,
         },

package/src/internal/index.mjs

@@ -40,14 +40,13 @@ const reply = (arg, packet, transport) => {
 const unwrap = async (ret, options) => {
   if (options?.text) return await ret.text();
   if (options?.base64) return (await ret.buffer()).toString("base64");
-  
+
   const text = await ret.text();
-  
-  try
-  {
+
+  try {
     return JSON.parse(text);
-  } catch(e) {
-    throw (e + ' ' + text)
+  } catch (e) {
+    throw e + " " + text;
   }
 };
 
@@ -120,9 +119,8 @@ class Fetcher {
         e.status = status;
         throw e;
       }
-      
-      if (local.onResponse)
-      {
+
+      if (local.onResponse) {
         await local.onResponse(ret);
       }
 
@@ -130,9 +128,9 @@ class Fetcher {
     } catch (e) {
       // too many requests
       if (e.status === 429) {
-         return local.onError(e, url, options, retries, args, true);
+        return local.onError(e, url, options, retries, args, true);
       }
-      
+
       --retries;
 
       console.log(theURL, e);
@@ -179,24 +177,28 @@ class OAuthFetcher extends Fetcher {
     var local = this;
 
     return new Promise((resolve, reject) => {
-      setTimeout(async () => {
-        try {
-          resolve(
-            await local.fetch(url, options, retries, {
-              forceTokenRefresh: e.status === 401,
-            }),
-          );
-        } catch (e) {
-          reject(e);
-        }
-      }, rateLimit?10000:500);
+      setTimeout(
+        async () => {
+          try {
+            resolve(
+              await local.fetch(url, options, retries, {
+                forceTokenRefresh: e.status === 401,
+              }),
+            );
+          } catch (e) {
+            reject(e);
+          }
+        },
+        rateLimit ? 10000 : 500,
+      );
     });
   }
 
   async periodicRefresh() {
-    const local = this, oauth = local.oauth;
+    const local = this,
+      oauth = local.oauth;
     if (!oauth.refreshToken()) return;
-    
+
     await local.getToken(true);
   }
 
@@ -244,12 +246,12 @@ class OAuth {
 
   async periodicRefresh() {
     const clients = this.clients;
-    
-    console.log('refreshing oauth clients', clients.length)
-    
+
+    console.log("refreshing oauth clients", clients.length);
+
     for (let i = 0; i < clients.length; ++i) {
       const client = clients[0];
-      
+
       await client.periodicRefresh();
     }
   }
@@ -321,7 +323,7 @@ class Connector {
       publicKey: process.env.PUBLIC_KEY,
       introspect,
       configSchema,
-      icon: this.icon
+      icon: this.icon,
     });
 
     if (Object.keys(configSchema().fields).length) {
@@ -369,7 +371,7 @@ ${text}
             const value = secrets[key];
             if (!value) continue;
 
-            if (fields[key]?.plain || ['endpointUrl'].includes(key)) {
+            if (fields[key]?.plain || ["endpointUrl"].includes(key)) {
               decrypted[key] = value;
             } else {
               try {
@@ -383,16 +385,17 @@ ${text}
           this.startOAuth = async function (args) {
             if (!this._oauth) throw new Error("oauth not configured");
 
-            const clientId = process.env.OAUTH_CLIENT_ID ||
+            const clientId =
+              process.env.OAUTH_CLIENT_ID ||
               decrypted.clientId ||
-            this._oauth.clientId;
-            
+              this._oauth.clientId;
+
             if (!clientId) throw new Error("clientId not configured");
 
             const scopes =
               process.env.OAUTH_SCOPE ||
               decrypted.scope ||
-                          this._oauth.scope ||
+              this._oauth.scope ||
               "";
             const useCodeChallenge = !!that._oauth.useCodeChallenge;
 
@@ -417,18 +420,17 @@ ${text}
               if (!arg.code || !arg.redirectURI)
                 throw new Error("need code and redirectUri");
 
-              const clientId =                              process.env.OAUTH_CLIENT_ID || 
-                              decrypted.clientId ||
+              const clientId =
+                process.env.OAUTH_CLIENT_ID ||
+                decrypted.clientId ||
+                that._oauth.clientId;
 
-              that._oauth.clientId;
-
-;
               if (!clientId) throw new Error("clientId not configured");
 
               const clientSecret =
                 process.env.OAUTH_CLIENT_SECRET ||
                 decrypted.clientSecret ||
-              that._oauth.clientSecret;
+                that._oauth.clientSecret;
               if (!clientSecret) throw new Error("clientSecret not configured");
 
               const additionalTokenArgs = that._oauth.additionalTokenArgs || {};
@@ -522,17 +524,15 @@ ${text}
 
           const getRefreshToken = async (refreshToken) => {
             const clientId =
-
               process.env.OAUTH_CLIENT_ID ||
-              decrypted.clientId || 
-                          that._oauth.clientId;
+              decrypted.clientId ||
+              that._oauth.clientId;
             if (!clientId) throw new Error("clientId not configured");
 
             const clientSecret =
-
               process.env.OAUTH_CLIENT_SECRET ||
               decrypted.clientSecret ||
-                          that._oauth.clientSecret;
+              that._oauth.clientSecret;
             if (!clientSecret) throw new Error("clientSecret not configured");
 
             const useAuthHeader = !!that._oauth.useAuthHeader;
@@ -580,21 +580,21 @@ ${text}
 
           if (theOAuth) {
             clearInterval(this._refreshOAuthToken);
-            
+
             if (!(this._oauth.noPeriodicTokenRefresh === false)) {
-              this._refreshOAuthToken = setInterval(async () => {
-                
-                try
-                {
-                  await theOAuth.periodicRefresh();
-                } catch(e) {
-                  console.log('periodic refresh', e);
-                }
-              }, 4 * 60 * 60 * 15000);
+              this._refreshOAuthToken = setInterval(
+                async () => {
+                  try {
+                    await theOAuth.periodicRefresh();
+                  } catch (e) {
+                    console.log("periodic refresh", e);
+                  }
+                },
+                4 * 60 * 60 * 15000,
+              );
             }
-            
           }
-            
+
           start({
             config: decrypted,
             oauth: theOAuth,

package/src/internal/websocket/config.mjs

@@ -13,7 +13,7 @@ class Config {
     publicKey,
     introspect,
     configSchema,
-    icon
+    icon,
   }) {
     this._token = null;
     this._registrationToken = registrationToken;
@@ -100,7 +100,7 @@ class Config {
   token() {
     return this._token;
   }
-  
+
   icon() {
     return this._icon;
   }

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

@@ -12,7 +12,7 @@ class Registration {
     const configSchema = config.configSchema();
     const intro = await config.introspect();
     const icon = config.icon();
-    
+
     const response = await fetch(
       config.url() + "register",
       C.augmentRegistration(
@@ -25,7 +25,7 @@ class Registration {
             id: config.id(),
             publicKey: config.publicKey(),
             schema: { configSchema, introspect: intro },
-            icon
+            icon,
           }),
           headers: { "Content-Type": "application/json" },
         },

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

@@ -68,9 +68,18 @@ class Transport {
       C.augmentRequest({ headers: {} }, config),
     ));
 
+    ws.onPing = function () {
+      clearTimeout(this.pingTimeout);
+      this.pingTimeout = setTimeout(() => {
+        console.log("terminating ws");
+        if (local.running) this.terminate();
+      }, 30000 + 15000);
+    };
+
     ws.on("open", () => {
       console.log("websocket connected");
       local.connected = true;
+      ws.onPing();
       local.pinger = setInterval(() => ws.ping(() => null), pingInterval);
 
       local.onConnect(local);
@@ -80,6 +89,8 @@ class Transport {
       setTimeout(() => local.onMessages(JSON.parse(message)), 0);
     });
 
+    ws.on("ping", () => ws.onPing());
+
     ws.on("error", (message) => {
       console.log("error:", message);
     });