@abtnode/core 1.16.17-beta-ce49fe0e → 1.16.17-beta-2679e686

package/lib/blocklet/manager/disk.js

@@ -91,6 +91,7 @@ const normalizePathPrefix = require('@abtnode/util/lib/normalize-path-prefix');
 const pLimit = require('p-limit');
 const pRetry = require('p-retry');
 
+const isFunction = require('lodash/isFunction');
 const { consumeServerlessNFT, consumeLauncherSession } = require('../../util/launcher');
 const util = require('../../util');
 const {
@@ -219,6 +220,18 @@ class DiskBlockletManager extends BaseBlockletManager {
     this.restoreQueue = restoreQueue;
     this.teamManager = teamManager;
 
+    if (isFunction(this.backupQueue.on)) {
+      const handleBackupComplete = async ({ id, job }) => {
+        await this.backupQueue.delete(id);
+
+        const autoBackup = await this.getAutoBackup({ did: id });
+        if (autoBackup?.enabled) {
+          this.backupQueue.push(job, id, true, BACKUPS.JOB.INTERVAL);
+        }
+      };
+      this.backupQueue.on('finished', handleBackupComplete).on('failed', handleBackupComplete);
+    }
+
     // cached installed blocklets for performance
     this.cachedBlocklets = new LRU({
       max: 100,
@@ -1887,13 +1900,14 @@ class DiskBlockletManager extends BaseBlockletManager {
 
     await this.backupQueue.delete(did);
 
+    logger.info('updateAutoBackup.$value', value);
+
     if (value.enabled) {
       const blocklet = await states.blocklet.getBlocklet(did);
       this.backupQueue.push(
         {
           entity: 'blocklet',
           action: 'backupToSpaces',
-          id: did,
           blocklet,
           context,
         },
@@ -2385,22 +2399,6 @@ class DiskBlockletManager extends BaseBlockletManager {
         blocklet,
       });
       throw error;
-    } finally {
-      const autoBackup = await this.getAutoBackup({ did: appPid });
-      if (autoBackup.enabled) {
-        this.backupQueue.push(
-          {
-            entity: 'blocklet',
-            action: 'backupToSpaces',
-            id: appPid,
-            blocklet,
-            context,
-          },
-          appPid,
-          true,
-          BACKUPS.JOB.INTERVAL
-        );
-      }
     }
   }
 
@@ -3576,7 +3574,6 @@ class DiskBlockletManager extends BaseBlockletManager {
         {
           entity: 'blocklet',
           action: 'backupToSpaces',
-          id: did,
           blocklet,
           context,
           backupState: {

package/lib/blocklet/storage/backup/blocklet.js

@@ -97,12 +97,14 @@ class BlockletBackup extends BaseBackup {
       (e) => e.key === BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_LOGO_SQUARE
     )?.value;
     const appDir = this.blocklet.environments.find((e) => e.key === 'BLOCKLET_APP_DIR')?.value;
+    const dataDir = this.blocklet.environments.find((e) => e.key === 'BLOCKLET_DATA_DIR')?.value;
     const logo = this.blocklet?.meta?.logo;
     const defaultLogoPath = join(this.serverDir, 'data', this.blocklet.meta.name, 'logo.svg');
 
     const logoUrl = await getLogoUrl({
       customLogoSquareUrl,
       appDir,
+      dataDir,
       logo,
       defaultLogoPath,
     });

package/lib/event/auto-backup-handler.js

@@ -0,0 +1,49 @@
+const debounce = require('lodash/debounce');
+const logger = require('@abtnode/logger')('@abtnode/core:event/auto-backup-handler');
+
+/**
+ * @description
+ * @param {string} eventName
+ * @param {import('@abtnode/client').BlockletState & {context: {}} } payload
+ * @param {import('../blocklet/manager/disk')} blockletManager
+ */
+async function autoBackupHandler(eventName, payload, blockletManager) {
+  const { did } = payload.meta;
+  const autoBackup = await blockletManager.getAutoBackup({ did });
+
+  logger.info('autoBackupHandler.$autoBackup', autoBackup);
+  logger.info('autoBackupHandler.$Boolean(payload.context)', Boolean(payload.context));
+
+  if (autoBackup.enabled && payload.context) {
+    await blockletManager.backupQueue.delete(did);
+
+    blockletManager.backupQueue.push(
+      {
+        entity: 'blocklet',
+        action: 'backupToSpaces',
+        blocklet: payload,
+        context: payload.context,
+      },
+      did
+    );
+  }
+}
+
+const debouncedFuncs = {};
+/**
+ * @description
+ * @param {string} id
+ * @param {Function} fn
+ * @return {Function}
+ */
+function autoBackupHandlerFactory(id, fn) {
+  if (!debouncedFuncs[id]) {
+    debouncedFuncs[id] = debounce(fn, 3000);
+  }
+  return debouncedFuncs[id];
+}
+
+module.exports = {
+  autoBackupHandler,
+  autoBackupHandlerFactory,
+};

package/lib/{event.js → event/index.js}

@@ -11,22 +11,23 @@ const {
   BlockletInternalEvents,
 } = require('@blocklet/constant');
 const { EVENTS } = require('@abtnode/constant');
-const { NodeMonitSender } = require('./monitor/node-monit-sender');
-const handleInstanceInStore = require('./util/public-to-store');
-const { isCLI } = require('./util');
+const { NodeMonitSender } = require('../monitor/node-monit-sender');
+const handleInstanceInStore = require('../util/public-to-store');
+const { isCLI } = require('../util');
 
 const eventHub =
   process.env.NODE_ENV === 'test' ? require('@arcblock/event-hub/single') : require('@arcblock/event-hub');
 
-const states = require('./states');
-const { getBackupEndpoint, getBackupFilesUrlFromEndpoint, getDIDSpacesUrlFromEndpoint } = require('./util/spaces');
+const states = require('../states');
+const { getBackupEndpoint, getBackupFilesUrlFromEndpoint, getDIDSpacesUrlFromEndpoint } = require('../util/spaces');
+const { autoBackupHandlerFactory, autoBackupHandler } = require('./auto-backup-handler');
 
 const routingSnapshotPrefix = (blocklet) => (blocklet.mode === BLOCKLET_MODES.DEVELOPMENT ? '[DEV] ' : '');
 
 /**
  *
  * @param {{
- *  blockletManager: import('./blocklet/manager/disk')
+ *  blockletManager: import('../blocklet/manager/disk')
  * }} param0
  * @returns
  */
@@ -400,38 +401,26 @@ module.exports = ({
     listen(blockletManager, eventName, handleBlockletEvent);
   });
 
-  /**
-   * @description
-   * @param {string} eventName
-   * @param {import('@abtnode/client').BlockletState & {context: {}} } payload
-   */
-  async function autoBackupHandler(eventName, payload) {
-    const { did } = payload.meta;
-    const autoBackup = await blockletManager.getAutoBackup({ did });
-
-    if (autoBackup.enabled && payload.context) {
-      await blockletManager.backupQueue.delete(did);
-
-      blockletManager.backupQueue.push(
-        {
-          entity: 'blocklet',
-          action: 'backupToSpaces',
-          id: did,
-          blocklet: payload,
-          context: payload.context,
-        },
-        did
-      );
-    }
-  }
-
   [
     BlockletEvents.componentInstalled,
     BlockletEvents.componentUpgraded,
     BlockletEvents.componentRemoved,
     BlockletEvents.updated,
   ].forEach((eventName) => {
-    listen(blockletManager, eventName, autoBackupHandler);
+    listen(
+      blockletManager,
+      eventName,
+      /**
+       *
+       * @param {string} eventName
+       * @param {import('@abtnode/client').BlockletState & {context: {}} } payload
+       * @returns
+       */
+      (_eventName, payload, ...args) => {
+        const id = payload.meta.did;
+        return autoBackupHandlerFactory(id, autoBackupHandler)(eventName, payload, blockletManager, ...args);
+      }
+    );
   });
 
   Object.keys(BlockletInternalEvents).forEach((key) => {

package/lib/states/index.js

@@ -67,6 +67,8 @@ const init = (dataDirs, config = {}) => {
  *  backup: import('./backup'),
  *  blocklet: import('./blocklet'),
  *  blockletExtras: import('./blocklet-extras'),
+ *  notification: import('./notification'),
+ *  job: import('./job'),
  *  [key: string]: any
  * }}
  */

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.17-beta-ce49fe0e",
+  "version": "1.16.17-beta-2679e686",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,19 +19,19 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/analytics": "1.16.17-beta-ce49fe0e",
-    "@abtnode/auth": "1.16.17-beta-ce49fe0e",
-    "@abtnode/certificate-manager": "1.16.17-beta-ce49fe0e",
-    "@abtnode/constant": "1.16.17-beta-ce49fe0e",
-    "@abtnode/cron": "1.16.17-beta-ce49fe0e",
-    "@abtnode/logger": "1.16.17-beta-ce49fe0e",
-    "@abtnode/models": "1.16.17-beta-ce49fe0e",
-    "@abtnode/queue": "1.16.17-beta-ce49fe0e",
-    "@abtnode/rbac": "1.16.17-beta-ce49fe0e",
-    "@abtnode/router-provider": "1.16.17-beta-ce49fe0e",
-    "@abtnode/static-server": "1.16.17-beta-ce49fe0e",
-    "@abtnode/timemachine": "1.16.17-beta-ce49fe0e",
-    "@abtnode/util": "1.16.17-beta-ce49fe0e",
+    "@abtnode/analytics": "1.16.17-beta-2679e686",
+    "@abtnode/auth": "1.16.17-beta-2679e686",
+    "@abtnode/certificate-manager": "1.16.17-beta-2679e686",
+    "@abtnode/constant": "1.16.17-beta-2679e686",
+    "@abtnode/cron": "1.16.17-beta-2679e686",
+    "@abtnode/logger": "1.16.17-beta-2679e686",
+    "@abtnode/models": "1.16.17-beta-2679e686",
+    "@abtnode/queue": "1.16.17-beta-2679e686",
+    "@abtnode/rbac": "1.16.17-beta-2679e686",
+    "@abtnode/router-provider": "1.16.17-beta-2679e686",
+    "@abtnode/static-server": "1.16.17-beta-2679e686",
+    "@abtnode/timemachine": "1.16.17-beta-2679e686",
+    "@abtnode/util": "1.16.17-beta-2679e686",
     "@arcblock/did": "1.18.92",
     "@arcblock/did-auth": "1.18.92",
     "@arcblock/did-ext": "^1.18.92",
@@ -42,11 +42,11 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "^1.18.92",
     "@arcblock/vc": "1.18.92",
-    "@blocklet/constant": "1.16.17-beta-ce49fe0e",
-    "@blocklet/env": "1.16.17-beta-ce49fe0e",
-    "@blocklet/meta": "1.16.17-beta-ce49fe0e",
-    "@blocklet/resolver": "1.16.17-beta-ce49fe0e",
-    "@blocklet/sdk": "1.16.17-beta-ce49fe0e",
+    "@blocklet/constant": "1.16.17-beta-2679e686",
+    "@blocklet/env": "1.16.17-beta-2679e686",
+    "@blocklet/meta": "1.16.17-beta-2679e686",
+    "@blocklet/resolver": "1.16.17-beta-2679e686",
+    "@blocklet/sdk": "1.16.17-beta-2679e686",
     "@did-space/client": "^0.3.11",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.18.92",
@@ -101,5 +101,5 @@
     "jest": "^27.5.1",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "d8a04ff2ef9cd52a02d019bc2c9a743785e869c3"
+  "gitHead": "abbe4a479b379552cd9ebd8c27732b360844cb73"
 }