@abtnode/core 1.16.14-beta-dd4f6a50 → 1.16.14-beta-a90ba909

package/lib/blocklet/manager/disk.js

@@ -3246,6 +3246,13 @@ class DiskBlockletManager extends BaseBlockletManager {
         appDid,
         meta: { did: appPid },
       } = blocklet;
+
+      const exist = await this.backupQueue.get(appDid);
+
+      if (exist) {
+        throw new Error('A backup for this app is already in progress, abort!');
+      }
+
       const endpoint = getBackupEndpoint(blocklet.environments);
 
       const backup = await states.backup.start({
@@ -3267,6 +3274,8 @@ class DiskBlockletManager extends BaseBlockletManager {
         },
         appDid
       );
+
+      return blocklet;
     } catch (error) {
       logger.error(error);
       throw error;
@@ -3282,6 +3291,8 @@ class DiskBlockletManager extends BaseBlockletManager {
 
     const diskBackup = new DiskBackup({ appDid, event: this });
     await diskBackup.backup();
+
+    return blocklet;
   }
 
   /**

package/lib/states/audit-log.js

@@ -108,7 +108,7 @@ const getLogContent = async (action, args, context, result, info, node) => {
     case 'deleteBlocklet':
       return `removed application ${result.meta.title}`; // prettier-ignore
     case 'backupBlocklet':
-      return `backup application ${result.meta.title}`; // prettier-ignore
+      return `backup application ${result.meta.title} to ${args.to}`; // prettier-ignore
     case 'startBlocklet':
       return `started ${componentOrApplicationInfo(result, args.componentDids)}`;
     case 'restartBlocklet':

package/lib/states/backup.js

@@ -124,7 +124,7 @@ class BackupState extends BaseState {
    * @return {Promise<Array<import('@abtnode/models').BackupState>>}
    */
   getBlockletBackups({ did }) {
-    return this.find({ appPid: did }, {}, { updatedAt: -1 });
+    return this.find({ appPid: did }, {}, { createdAt: -1 });
   }
 }
 

package/lib/validators/backup.js

@@ -8,6 +8,8 @@ const validateBackupStart = Joi.object({
   sourceUrl: Joi.string().required(),
   target: Joi.string().valid('Spaces', 'Local').optional().default('Spaces'),
   targetName: Joi.string().required(),
+
+  updatedAt: Joi.string().optional().allow(null).default(null),
 });
 
 const validateBackupSuccess = Joi.object({

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.14-beta-dd4f6a50",
+  "version": "1.16.14-beta-a90ba909",
   "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.14-beta-dd4f6a50",
-    "@abtnode/auth": "1.16.14-beta-dd4f6a50",
-    "@abtnode/certificate-manager": "1.16.14-beta-dd4f6a50",
-    "@abtnode/constant": "1.16.14-beta-dd4f6a50",
-    "@abtnode/cron": "1.16.14-beta-dd4f6a50",
-    "@abtnode/logger": "1.16.14-beta-dd4f6a50",
-    "@abtnode/models": "1.16.14-beta-dd4f6a50",
-    "@abtnode/queue": "1.16.14-beta-dd4f6a50",
-    "@abtnode/rbac": "1.16.14-beta-dd4f6a50",
-    "@abtnode/router-provider": "1.16.14-beta-dd4f6a50",
-    "@abtnode/static-server": "1.16.14-beta-dd4f6a50",
-    "@abtnode/timemachine": "1.16.14-beta-dd4f6a50",
-    "@abtnode/util": "1.16.14-beta-dd4f6a50",
+    "@abtnode/analytics": "1.16.14-beta-a90ba909",
+    "@abtnode/auth": "1.16.14-beta-a90ba909",
+    "@abtnode/certificate-manager": "1.16.14-beta-a90ba909",
+    "@abtnode/constant": "1.16.14-beta-a90ba909",
+    "@abtnode/cron": "1.16.14-beta-a90ba909",
+    "@abtnode/logger": "1.16.14-beta-a90ba909",
+    "@abtnode/models": "1.16.14-beta-a90ba909",
+    "@abtnode/queue": "1.16.14-beta-a90ba909",
+    "@abtnode/rbac": "1.16.14-beta-a90ba909",
+    "@abtnode/router-provider": "1.16.14-beta-a90ba909",
+    "@abtnode/static-server": "1.16.14-beta-a90ba909",
+    "@abtnode/timemachine": "1.16.14-beta-a90ba909",
+    "@abtnode/util": "1.16.14-beta-a90ba909",
     "@arcblock/did": "1.18.87",
     "@arcblock/did-auth": "1.18.87",
     "@arcblock/did-ext": "^1.18.87",
@@ -42,11 +42,11 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "^1.18.87",
     "@arcblock/vc": "1.18.87",
-    "@blocklet/constant": "1.16.14-beta-dd4f6a50",
-    "@blocklet/meta": "1.16.14-beta-dd4f6a50",
-    "@blocklet/resolver": "1.16.14-beta-dd4f6a50",
-    "@blocklet/sdk": "1.16.14-beta-dd4f6a50",
-    "@did-space/client": "^0.2.129",
+    "@blocklet/constant": "1.16.14-beta-a90ba909",
+    "@blocklet/meta": "1.16.14-beta-a90ba909",
+    "@blocklet/resolver": "1.16.14-beta-a90ba909",
+    "@blocklet/sdk": "1.16.14-beta-a90ba909",
+    "@did-space/client": "^0.2.141",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.18.87",
     "@ocap/util": "1.18.87",
@@ -99,5 +99,5 @@
     "jest": "^27.5.1",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "fb3858f842b221f0a8c298307b393d55c555af45"
+  "gitHead": "a59c9970f447462db0ccfee75b277e98bb11a6fa"
 }