@abtnode/core 1.16.15-beta-ed0db59e → 1.16.15-beta-d464647a

package/lib/blocklet/manager/disk.js

@@ -2172,7 +2172,7 @@ class DiskBlockletManager extends BaseBlockletManager {
   async _onBackupToSpaces({ blocklet, context, backup }) {
     const {
       referrer,
-      user: { did: userDid },
+      user: { did: userDid, locale },
     } = context;
     const {
       appDid,
@@ -2180,7 +2180,7 @@ class DiskBlockletManager extends BaseBlockletManager {
     } = blocklet;
 
     try {
-      const spacesBackup = new SpacesBackup({ appDid, appPid, event: this, userDid, referrer, locale: 'en', backup });
+      const spacesBackup = new SpacesBackup({ appDid, appPid, event: this, userDid, referrer, locale, backup });
       this.emit(BlockletEvents.backupProgress, {
         appDid,
         meta: { did: appPid },

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

@@ -27,6 +27,8 @@ const { getAppName, getAppDescription } = require('@blocklet/meta/lib/util');
 
 const logger = require('@abtnode/logger')('@abtnode/core:storage:backup');
 
+const { default: axios } = require('axios');
+const xbytes = require('xbytes');
 const states = require('../../../states');
 const { BaseBackup } = require('./base');
 const { AuditLogBackup } = require('./audit-log');
@@ -36,6 +38,7 @@ const { BlockletsBackup } = require('./blocklets');
 const { DataBackup } = require('./data');
 const { RoutingRuleBackup } = require('./routing-rule');
 const { translate } = require('../../../locales');
+const { getFolderSize } = require('../utils/disk');
 
 class SpacesBackup extends BaseBackup {
   /**
@@ -126,6 +129,7 @@ class SpacesBackup extends BaseBackup {
     try {
       await this.initialize();
       await this.export();
+      await this.verifySpace();
       await this.syncToSpaces();
     } catch (error) {
       console.error(error);
@@ -183,6 +187,35 @@ class SpacesBackup extends BaseBackup {
     });
   }
 
+  /**
+   * @description 验证 Space 的空间是否足够备份所需
+   * @memberof SpacesBackup
+   */
+  async verifySpace() {
+    const { headers } = await axios.head(`${this.spaceBackupEndpoint}?withExtras=true`, {
+      // @FIXME: 等到 space 的存储优化专项完成后，这里可以给出更小的超时时间
+      timeout: 1000 * 120,
+    });
+
+    const [spaceIsFull, spaceFreeCapacity] = [headers['x-space-is-full'] === 'true', +headers['x-space-free-capacity']];
+    const backupFolderSize = getFolderSize(this.backupDir);
+
+    logger.info('verifySpace', {
+      spaceIsFull,
+      spaceFreeCapacity: xbytes(spaceFreeCapacity),
+      backupFolderSize: xbytes(backupFolderSize),
+      backupDir: this.backupDir,
+    });
+
+    if (spaceIsFull) {
+      throw new Error(translate(this.input.locale, 'backup.space.isFull'));
+    }
+
+    if (spaceFreeCapacity <= backupFolderSize) {
+      throw new Error(translate(this.input.locale, 'backup.space.lackOfSpace'));
+    }
+  }
+
   async syncToSpaces() {
     /**
      * @type {import('@abtnode/client').NodeState}
@@ -225,7 +258,7 @@ class SpacesBackup extends BaseBackup {
           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})`;
+          const progressMessage = `(${data.completed}/${data.total}) Uploading file ${basename(data.key)}`;
 
           await states.backup.progress(this.input.backup.id, {
             progress,

package/lib/blocklet/storage/utils/disk.js

@@ -6,6 +6,11 @@ const logger = require('@abtnode/logger')('@abtnode/core:storage:utils:disk');
 const backupDirName = '_abtnode/backup';
 const restoreDirName = 'tmp/restore-disk';
 
+/**
+ * @description
+ * @param {string} dataDir
+ * @return {any[]}
+ */
 const getBackupList = (dataDir) => {
   const baseBackupDir = path.join(dataDir, backupDirName);
   const backupList = [];
@@ -28,6 +33,12 @@ const getBackupList = (dataDir) => {
   return backupList;
 };
 
+/**
+ *
+ * @param {string} dataDir
+ * @param {string} appDid
+ * @returns {Promise<boolean>}
+ */
 const removeBackup = async (dataDir, appDid) => {
   try {
     const baseBackupDir = path.join(dataDir, backupDirName);
@@ -54,8 +65,36 @@ const getBackupDirs = (serverDir, appDid) => {
   };
 };
 
+/**
+ * @description
+ * @param {string} folderPath
+ * @return {number}
+ */
+function getFolderSize(folderPath) {
+  let totalSize = 0;
+  const stack = [folderPath];
+
+  while (stack.length) {
+    const currentPath = stack.pop();
+    const stats = fs.statSync(currentPath);
+
+    if (stats.isFile()) {
+      totalSize += stats.size;
+    } else if (stats.isDirectory()) {
+      const files = fs.readdirSync(currentPath);
+      files.forEach((file) => {
+        const filePath = path.join(currentPath, file);
+        stack.push(filePath);
+      });
+    }
+  }
+
+  return totalSize;
+}
+
 module.exports = {
   getBackupList,
   removeBackup,
   getBackupDirs,
+  getFolderSize,
 };

package/lib/locales/en.js

@@ -11,6 +11,9 @@ module.exports = flat({
         forbidden:
           'You do not have permission to perform the backup, try restoring the application license on DID Spaces or reconnect to DID Spaces and try again',
       },
+      isFull: 'The current Space storage space is full, please expand the space and back up again',
+      lackOfSpace:
+        'The current available space in the storage is insufficient. Please expand the space and perform the backup again',
     },
   },
 });

package/lib/locales/zh.js

@@ -10,6 +10,8 @@ module.exports = flat({
         title: '备份到 Spaces 发生错误',
         forbidden: '你还没有权限执行备份操作，请尝试在 DID Spaces 上恢复应用授权或者重新连接 DID Spaces 后重试',
       },
+      isFull: '当前的空间存储空间已满,请扩展空间并再次备份',
+      lackOfSpace: '当前存储空间的可用空间不足。请扩展空间后再次进行备份',
     },
   },
 });

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.15-beta-ed0db59e",
+  "version": "1.16.15-beta-d464647a",
   "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-ed0db59e",
-    "@abtnode/auth": "1.16.15-beta-ed0db59e",
-    "@abtnode/certificate-manager": "1.16.15-beta-ed0db59e",
-    "@abtnode/constant": "1.16.15-beta-ed0db59e",
-    "@abtnode/cron": "1.16.15-beta-ed0db59e",
-    "@abtnode/logger": "1.16.15-beta-ed0db59e",
-    "@abtnode/models": "1.16.15-beta-ed0db59e",
-    "@abtnode/queue": "1.16.15-beta-ed0db59e",
-    "@abtnode/rbac": "1.16.15-beta-ed0db59e",
-    "@abtnode/router-provider": "1.16.15-beta-ed0db59e",
-    "@abtnode/static-server": "1.16.15-beta-ed0db59e",
-    "@abtnode/timemachine": "1.16.15-beta-ed0db59e",
-    "@abtnode/util": "1.16.15-beta-ed0db59e",
+    "@abtnode/analytics": "1.16.15-beta-d464647a",
+    "@abtnode/auth": "1.16.15-beta-d464647a",
+    "@abtnode/certificate-manager": "1.16.15-beta-d464647a",
+    "@abtnode/constant": "1.16.15-beta-d464647a",
+    "@abtnode/cron": "1.16.15-beta-d464647a",
+    "@abtnode/logger": "1.16.15-beta-d464647a",
+    "@abtnode/models": "1.16.15-beta-d464647a",
+    "@abtnode/queue": "1.16.15-beta-d464647a",
+    "@abtnode/rbac": "1.16.15-beta-d464647a",
+    "@abtnode/router-provider": "1.16.15-beta-d464647a",
+    "@abtnode/static-server": "1.16.15-beta-d464647a",
+    "@abtnode/timemachine": "1.16.15-beta-d464647a",
+    "@abtnode/util": "1.16.15-beta-d464647a",
     "@arcblock/did": "1.18.89",
     "@arcblock/did-auth": "1.18.89",
     "@arcblock/did-ext": "^1.18.89",
@@ -42,12 +42,12 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "^1.18.89",
     "@arcblock/vc": "1.18.89",
-    "@blocklet/constant": "1.16.15-beta-ed0db59e",
-    "@blocklet/env": "1.16.15-beta-ed0db59e",
-    "@blocklet/meta": "1.16.15-beta-ed0db59e",
-    "@blocklet/resolver": "1.16.15-beta-ed0db59e",
-    "@blocklet/sdk": "1.16.15-beta-ed0db59e",
-    "@did-space/client": "^0.2.163",
+    "@blocklet/constant": "1.16.15-beta-d464647a",
+    "@blocklet/env": "1.16.15-beta-d464647a",
+    "@blocklet/meta": "1.16.15-beta-d464647a",
+    "@blocklet/resolver": "1.16.15-beta-d464647a",
+    "@blocklet/sdk": "1.16.15-beta-d464647a",
+    "@did-space/client": "^0.2.165",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.18.89",
     "@ocap/util": "1.18.89",
@@ -91,7 +91,8 @@
     "ua-parser-js": "^1.0.2",
     "url-join": "^4.0.1",
     "uuid": "^8.3.2",
-    "valid-url": "^1.0.9"
+    "valid-url": "^1.0.9",
+    "xbytes": "^1.8.0"
   },
   "devDependencies": {
     "expand-tilde": "^2.0.2",
@@ -99,5 +100,5 @@
     "jest": "^27.5.1",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "647ebe45f6214ea5c284c9234f1319b6ff72f915"
+  "gitHead": "117b29484cbc36434ebdd635f100eb02a5cf7732"
 }