@aloma.io/integration-sdk 3.3.57 → 3.3.58

package/build/internal/index.mjs

@@ -147,6 +147,13 @@ class OAuthFetcher extends Fetcher {
             }, 500);
         });
     }
+    async periodicRefresh() {
+        const local = this, oauth = local.oauth;
+        if (!oauth.refreshToken())
+            return;
+        console.log('refreshing');
+        await local.getToken(true);
+    }
     async customize(options, args = {}) {
         const local = this;
         const token = await local.getToken(args.forceTokenRefresh);
@@ -162,7 +169,7 @@ class OAuth {
         this._data = data || {};
         this.saveOAuthResult = saveOAuthResult;
         this.obtainViaRefreshToken = getRefreshToken;
-        this.clients = {};
+        this.clients = [];
     }
     data() {
         return this._data;
@@ -180,8 +187,18 @@ class OAuth {
         }
         await this.saveOAuthResult(this._data);
     }
+    async periodicRefresh() {
+        const clients = this.clients;
+        console.log('refreshing clients', clients.length);
+        for (let i = 0; i < clients.length; ++i) {
+            const client = clients[0];
+            await client.periodicRefresh();
+        }
+    }
     getClient(arg = {}) {
-        return new OAuthFetcher({ ...arg, oauth: this });
+        const client = new OAuthFetcher({ ...arg, oauth: this });
+        this.clients.push(client);
+        return client;
     }
 }
 class Connector {
@@ -444,18 +461,17 @@ ${text}
                     const theOAuth = decrypted.oauthResult
                         ? new OAuth(decrypted.oauthResult, saveOAuthResult, getRefreshToken)
                         : null;
-                    console.log('restarting');
                     if (theOAuth) {
                         clearInterval(this._refreshOAuthToken);
                         if (!(this._oauth.noPeriodicTokenRefresh === false)) {
-                            this._refreshOAuthToken = setInterval(async () => {
+                            this._refreshOAuthToken = setTimeout(async () => {
                                 try {
                                     await theOAuth.periodicRefresh();
                                 }
                                 catch (e) {
-                                    //console.log('periodic refresh', e);
+                                    console.log('periodic refresh', e);
                                 }
-                            }, /*4 * 60 * 60 **/ 1000);
+                            }, /*4 * 60 * 60 **/ 15000);
                         }
                     }
                     start({

package/package.json

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

package/src/internal/index.mjs

@@ -188,6 +188,14 @@ class OAuthFetcher extends Fetcher {
     });
   }
 
+  async periodicRefresh() {
+    const local = this, oauth = local.oauth;
+    if (!oauth.refreshToken()) return;
+    
+    console.log('refreshing')
+    await local.getToken(true);
+  }
+
   async customize(options, args = {}) {
     const local = this;
     const token = await local.getToken(args.forceTokenRefresh);
@@ -205,7 +213,7 @@ class OAuth {
     this._data = data || {};
     this.saveOAuthResult = saveOAuthResult;
     this.obtainViaRefreshToken = getRefreshToken;
-    this.clients = {};
+    this.clients = [];
   }
 
   data() {
@@ -230,8 +238,22 @@ class OAuth {
     await this.saveOAuthResult(this._data);
   }
 
+  async periodicRefresh() {
+    const clients = this.clients;
+    
+    console.log('refreshing clients', clients.length)
+    
+    for (let i = 0; i < clients.length; ++i) {
+      const client = clients[0];
+      
+      await client.periodicRefresh();
+    }
+  }
+
   getClient(arg = {}) {
-    return new OAuthFetcher({ ...arg, oauth: this });
+    const client = new OAuthFetcher({ ...arg, oauth: this });
+    this.clients.push(client);
+    return client;
   }
 }
 
@@ -548,19 +570,19 @@ ${text}
             ? new OAuth(decrypted.oauthResult, saveOAuthResult, getRefreshToken)
             : null;
 
-            console.log('restarting')
           if (theOAuth) {
             clearInterval(this._refreshOAuthToken);
             
             if (!(this._oauth.noPeriodicTokenRefresh === false)) {
-              this._refreshOAuthToken = setInterval(async () => {
+              this._refreshOAuthToken = setTimeout(async () => {
+                
                 try
                 {
                   await theOAuth.periodicRefresh();
                 } catch(e) {
-                  //console.log('periodic refresh', e);
+                  console.log('periodic refresh', e);
                 }
-              }, /*4 * 60 * 60 **/ 1000);
+              }, /*4 * 60 * 60 **/ 15000);
             }
             
           }