@abtnode/core 1.16.15-beta-375899b6 → 1.16.15-beta-9318a201

package/lib/blocklet/manager/disk.js

@@ -523,6 +523,7 @@ class DiskBlockletManager extends BaseBlockletManager {
 
       if (checkHealthImmediately) {
         await this._onCheckIfStarted(params, { throwOnError });
+        blocklet.status = BlockletStatus.running;
       } else {
         this.startQueue.push({
           entity: 'blocklet',

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

@@ -215,6 +215,12 @@ class SpacesBackup extends BaseBackup {
           return object.name !== '.DS_Store';
         },
         onAfterUpload: async (data) => {
+          // @note: 当备份失败时 && 偶然会存在一些其他的备份请求后来发送成功了，此时会造成备份进度紊乱(明明失败了，错误信息显示上传某个文件成功了)的情况，所以失败的备份不需要再发送事件了
+          const currentBackup = await states.backup.findOne({ id: this.input.backup.id });
+          if (currentBackup.status === 1) {
+            return;
+          }
+
           logger.info('backup progress', { appDid: this.input.appDid, data });
           const percent = (data.completed * 100) / data.total;
           // 0.8 是因为上传文件到 spaces 占进度的 80%，+ 20 是因为需要累加之前的进度
@@ -225,7 +231,6 @@ class SpacesBackup extends BaseBackup {
             progress,
             message: progressMessage,
           });
-
           this.input.event.emit(BlockletEvents.backupProgress, {
             appDid: this.input.appDid,
             meta: { did: this.input.appDid },

package/lib/util/blocklet.js

@@ -512,8 +512,6 @@ const startBlockletProcess = async (
 
       const { processId, logsDir, appDir } = b.env;
 
-      validateBlockletEntry(appDir, b.meta);
-
       if (skippedProcessIds.includes(processId)) {
         logger.info(`skip start skipped process ${processId}`);
         return;
@@ -524,6 +522,10 @@ const startBlockletProcess = async (
         return;
       }
 
+      if (b.mode !== BLOCKLET_MODES.DEVELOPMENT) {
+        validateBlockletEntry(appDir, b.meta);
+      }
+
       const { cwd, script, args, environmentObj, interpreter, interpreterArgs } = getComponentStartEngine(b, {
         e2eMode,
       });

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.15-beta-375899b6",
+  "version": "1.16.15-beta-9318a201",
   "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.15-beta-375899b6",
-    "@abtnode/auth": "1.16.15-beta-375899b6",
-    "@abtnode/certificate-manager": "1.16.15-beta-375899b6",
-    "@abtnode/constant": "1.16.15-beta-375899b6",
-    "@abtnode/cron": "1.16.15-beta-375899b6",
-    "@abtnode/logger": "1.16.15-beta-375899b6",
-    "@abtnode/models": "1.16.15-beta-375899b6",
-    "@abtnode/queue": "1.16.15-beta-375899b6",
-    "@abtnode/rbac": "1.16.15-beta-375899b6",
-    "@abtnode/router-provider": "1.16.15-beta-375899b6",
-    "@abtnode/static-server": "1.16.15-beta-375899b6",
-    "@abtnode/timemachine": "1.16.15-beta-375899b6",
-    "@abtnode/util": "1.16.15-beta-375899b6",
+    "@abtnode/analytics": "1.16.15-beta-9318a201",
+    "@abtnode/auth": "1.16.15-beta-9318a201",
+    "@abtnode/certificate-manager": "1.16.15-beta-9318a201",
+    "@abtnode/constant": "1.16.15-beta-9318a201",
+    "@abtnode/cron": "1.16.15-beta-9318a201",
+    "@abtnode/logger": "1.16.15-beta-9318a201",
+    "@abtnode/models": "1.16.15-beta-9318a201",
+    "@abtnode/queue": "1.16.15-beta-9318a201",
+    "@abtnode/rbac": "1.16.15-beta-9318a201",
+    "@abtnode/router-provider": "1.16.15-beta-9318a201",
+    "@abtnode/static-server": "1.16.15-beta-9318a201",
+    "@abtnode/timemachine": "1.16.15-beta-9318a201",
+    "@abtnode/util": "1.16.15-beta-9318a201",
     "@arcblock/did": "1.18.89",
     "@arcblock/did-auth": "1.18.89",
     "@arcblock/did-ext": "^1.18.89",
@@ -42,11 +42,11 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "^1.18.89",
     "@arcblock/vc": "1.18.89",
-    "@blocklet/constant": "1.16.15-beta-375899b6",
-    "@blocklet/meta": "1.16.15-beta-375899b6",
-    "@blocklet/resolver": "1.16.15-beta-375899b6",
-    "@blocklet/sdk": "1.16.15-beta-375899b6",
-    "@did-space/client": "^0.2.141",
+    "@blocklet/constant": "1.16.15-beta-9318a201",
+    "@blocklet/meta": "1.16.15-beta-9318a201",
+    "@blocklet/resolver": "1.16.15-beta-9318a201",
+    "@blocklet/sdk": "1.16.15-beta-9318a201",
+    "@did-space/client": "^0.2.163",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.18.89",
     "@ocap/util": "1.18.89",
@@ -98,5 +98,5 @@
     "jest": "^27.5.1",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "c999a7f47ecdca1494eb53fc177d28899b3effc9"
+  "gitHead": "f3722cbd4fe10c5fa083cad7e859ecff6095060d"
 }