@abtnode/core 1.16.14-beta-963cb583 → 1.16.14-beta-a2de000a

package/lib/blocklet/manager/disk.js

@@ -2118,7 +2118,7 @@ class DiskBlockletManager extends BaseBlockletManager {
     } = blocklet;
 
     try {
-      const spacesBackup = new SpacesBackup({ appDid, appPid, event: this, userDid, referrer, locale: 'en' });
+      const spacesBackup = new SpacesBackup({ appDid, appPid, event: this, userDid, referrer, locale: 'en', backup });
       this.emit(BlockletEvents.backupProgress, {
         appDid,
         meta: { did: appPid },
@@ -2126,6 +2126,10 @@ class DiskBlockletManager extends BaseBlockletManager {
         progress: 10,
         completed: false,
       });
+      await states.backup.progress(backup.id, {
+        message: 'Start backup...',
+        progress: 10,
+      });
       await spacesBackup.backup();
 
       await states.backup.success(backup.id, {
@@ -3315,6 +3319,10 @@ class DiskBlockletManager extends BaseBlockletManager {
         sourceUrl: path.join(this.dataDirs.tmp, 'backup', appDid),
         targetName: await getSpaceNameByEndpoint(endpoint, 'DID Space'),
       });
+      await states.backup.progress(backup.id, {
+        message: 'Start backup...',
+        progress: 10,
+      });
 
       this.backupQueue.push(
         {

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

@@ -6,6 +6,7 @@
  *  userDid: string,
  *  referrer: string,
  *  locale: 'zh' | 'en',
+ *  backup: import('@abtnode/models').BackupState
  * }} SpaceBackupInput
  *
  * @typedef {{
@@ -122,10 +123,16 @@ class SpacesBackup extends BaseBackup {
    * @memberof SpacesBackup
    */
   async backup() {
-    await this.initialize();
-    await this.export();
-    await this.syncToSpaces();
-    await this.destroy();
+    try {
+      await this.initialize();
+      await this.export();
+      await this.syncToSpaces();
+    } catch (error) {
+      console.error(error);
+      throw error;
+    } finally {
+      await this.destroy();
+    }
   }
 
   async initialize() {
@@ -156,6 +163,10 @@ class SpacesBackup extends BaseBackup {
       progress: 15,
       completed: false,
     });
+    await states.backup.progress(this.input.backup.id, {
+      message: 'Preparing data for backup...',
+      progress: 15,
+    });
 
     await this._exportData(this.dataBackup, this.storages);
 
@@ -166,6 +177,10 @@ class SpacesBackup extends BaseBackup {
       progress: 20,
       completed: false,
     });
+    await states.backup.progress(this.input.backup.id, {
+      message: 'Data ready, start backup...',
+      progress: 20,
+    });
   }
 
   async syncToSpaces() {
@@ -199,15 +214,24 @@ class SpacesBackup extends BaseBackup {
           // FIXME: @yejianchao 这里需要更完整的黑名单
           return object.name !== '.DS_Store';
         },
-        onAfterUpload: (data) => {
+        onAfterUpload: async (data) => {
           logger.info('backup progress', { appDid: this.input.appDid, data });
           const percent = (data.completed * 100) / data.total;
+          // 0.8 是因为上传文件到 spaces 占进度的 80%，+ 20 是因为需要累加之前的进度
+          const progress = +Math.floor(percent * 0.8).toFixed(2) + 20;
+          const progressMessage = `Uploading file ${basename(data.key)} (${data.completed}/${data.total})`;
+
+          await states.backup.progress(this.input.backup.id, {
+            progress,
+            message: progressMessage,
+          });
+
           this.input.event.emit(BlockletEvents.backupProgress, {
             appDid: this.input.appDid,
             meta: { did: this.input.appDid },
-            message: `Uploading file ${basename(data.key)} (${data.completed}/${data.total})`,
+            message: progressMessage,
             // 0.8 是因为上传文件到 spaces 占进度的 80%，+ 20 是因为需要累加之前的进度
-            progress: +Math.floor(percent * 0.8).toFixed(2) + 20,
+            progress,
             completed: false,
           });
         },

package/lib/router/helper.js

@@ -99,8 +99,8 @@ const analyticsWellknownRule = {
     type: ROUTING_RULE_TYPES.DIRECT_RESPONSE,
     response: {
       status: 200,
-      contentType: 'text/html',
-      body: pkg.version,
+      contentType: 'application/javascript',
+      body: "''",
     },
   },
 };

package/lib/states/backup.js

@@ -1,6 +1,11 @@
 const { Joi } = require('@arcblock/validator');
 const BaseState = require('./base');
-const { validateBackupSuccess, validateBackupFail, validateBackupStart } = require('../validators/backup.js');
+const {
+  validateBackupSuccess,
+  validateBackupFail,
+  validateBackupStart,
+  validateBackupProgress,
+} = require('../validators/backup.js');
 
 const validateBackup = Joi.object({
   appPid: Joi.DID(),
@@ -23,10 +28,12 @@ const validateBackup = Joi.object({
     .default(() => new Date().toISOString()),
   updatedAt: Joi.string().optional().default('').allow(''),
 
-  // 0 表示成功了，建议使用常量表示，默认是 1 表示错误的
+  // 0 表示成功了，建议使用常量表示，默认是 1 表示错误的, null 表示备份中
   status: Joi.number().optional().allow(null),
   // 发生错误的时候可以用来存储错误下信息
   message: Joi.string().optional().default('').allow(''),
+
+  progress: Joi.number().optional(),
 });
 
 /**
@@ -49,6 +56,32 @@ class BackupState extends BaseState {
     return this.insert(value);
   }
 
+  /**
+   *
+   * @param {string} id - The ID of the backup.
+   * @param {Pick<import('@abtnode/models').BackupState, 'progress' | 'message'>} backupProgress
+   * @return {object} - The result of the validation.
+   */
+  progress(id, backupProgress) {
+    const { error, value } = validateBackupProgress.validate(backupProgress, {
+      stripUnknown: true,
+      allowUnknown: true,
+    });
+
+    if (error) {
+      throw error;
+    }
+
+    return this.update(
+      { id },
+      {
+        $set: {
+          ...value,
+        },
+      }
+    );
+  }
+
   /**
    * @param {string} id
    * @param {Pick<import('@abtnode/models').BackupState, 'targetUrl'>} successBackupInfo

package/lib/validators/backup.js

@@ -12,8 +12,14 @@ const validateBackupStart = Joi.object({
   updatedAt: Joi.string().optional().allow(null).default(null),
 });
 
+const validateBackupProgress = Joi.object({
+  progress: Joi.number().required(),
+  message: Joi.string().required(),
+});
+
 const validateBackupSuccess = Joi.object({
   targetUrl: Joi.string().required(),
+  message: Joi.string().optional().allow('').default(''),
 });
 
 const validateBackupFail = Joi.object({
@@ -22,6 +28,7 @@ const validateBackupFail = Joi.object({
 
 module.exports = {
   validateBackupStart,
+  validateBackupProgress,
   validateBackupSuccess,
   validateBackupFail,
 };

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.14-beta-963cb583",
+  "version": "1.16.14-beta-a2de000a",
   "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-963cb583",
-    "@abtnode/auth": "1.16.14-beta-963cb583",
-    "@abtnode/certificate-manager": "1.16.14-beta-963cb583",
-    "@abtnode/constant": "1.16.14-beta-963cb583",
-    "@abtnode/cron": "1.16.14-beta-963cb583",
-    "@abtnode/logger": "1.16.14-beta-963cb583",
-    "@abtnode/models": "1.16.14-beta-963cb583",
-    "@abtnode/queue": "1.16.14-beta-963cb583",
-    "@abtnode/rbac": "1.16.14-beta-963cb583",
-    "@abtnode/router-provider": "1.16.14-beta-963cb583",
-    "@abtnode/static-server": "1.16.14-beta-963cb583",
-    "@abtnode/timemachine": "1.16.14-beta-963cb583",
-    "@abtnode/util": "1.16.14-beta-963cb583",
+    "@abtnode/analytics": "1.16.14-beta-a2de000a",
+    "@abtnode/auth": "1.16.14-beta-a2de000a",
+    "@abtnode/certificate-manager": "1.16.14-beta-a2de000a",
+    "@abtnode/constant": "1.16.14-beta-a2de000a",
+    "@abtnode/cron": "1.16.14-beta-a2de000a",
+    "@abtnode/logger": "1.16.14-beta-a2de000a",
+    "@abtnode/models": "1.16.14-beta-a2de000a",
+    "@abtnode/queue": "1.16.14-beta-a2de000a",
+    "@abtnode/rbac": "1.16.14-beta-a2de000a",
+    "@abtnode/router-provider": "1.16.14-beta-a2de000a",
+    "@abtnode/static-server": "1.16.14-beta-a2de000a",
+    "@abtnode/timemachine": "1.16.14-beta-a2de000a",
+    "@abtnode/util": "1.16.14-beta-a2de000a",
     "@arcblock/did": "1.18.89",
     "@arcblock/did-auth": "1.18.89",
     "@arcblock/did-ext": "^1.18.89",
@@ -42,10 +42,10 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "^1.18.89",
     "@arcblock/vc": "1.18.89",
-    "@blocklet/constant": "1.16.14-beta-963cb583",
-    "@blocklet/meta": "1.16.14-beta-963cb583",
-    "@blocklet/resolver": "1.16.14-beta-963cb583",
-    "@blocklet/sdk": "1.16.14-beta-963cb583",
+    "@blocklet/constant": "1.16.14-beta-a2de000a",
+    "@blocklet/meta": "1.16.14-beta-a2de000a",
+    "@blocklet/resolver": "1.16.14-beta-a2de000a",
+    "@blocklet/sdk": "1.16.14-beta-a2de000a",
     "@did-space/client": "^0.2.141",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.18.89",
@@ -98,5 +98,5 @@
     "jest": "^27.5.1",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "82bae80cd584a096719d6985740e13f15b4f46bf"
+  "gitHead": "ed1336f2b7d3e6a4d5eeafd3816e6573c53ad543"
 }