@abtnode/core 1.16.11-next-470e8c41 → 1.16.11

package/lib/blocklet/manager/disk.js

@@ -140,7 +140,7 @@ const UpgradeComponents = require('./helper/upgrade-components');
 const BlockletDownloader = require('../downloader/blocklet-downloader');
 const RollbackCache = require('./helper/rollback-cache');
 const { migrateApplicationToStructV2 } = require('./helper/migrate-application-to-struct-v2');
-const { getBackupFilesUrlFromEndpoint, getBackupEndpoint } = require('../../util/spaces');
+const { getBackupFilesUrlFromEndpoint, getBackupEndpoint, getSpaceNameByEndpoint } = require('../../util/spaces');
 const { validateAddSpaceGateway, validateUpdateSpaceGateway } = require('../../validators/space-gateway');
 
 const { formatEnvironments, getBlockletMeta, validateOwner } = util;
@@ -694,7 +694,6 @@ class BlockletManager extends BaseBlockletManager {
     logger.info('restart blocklet', { did });
     const blocklet = await this.getBlocklet(did);
     await this.checkControllerStatus(blocklet, 'restart');
-
     await states.blocklet.setBlockletStatus(did, BlockletStatus.stopping, { componentDids });
     const result = await states.blocklet.getBlocklet(did);
     this.emit(BlockletEvents.statusChange, result);
@@ -728,7 +727,6 @@ class BlockletManager extends BaseBlockletManager {
   // eslint-disable-next-line no-unused-vars
   async reload({ did, componentDids: list }, context) {
     const blocklet = await this.getBlocklet(did);
-
     await this.checkControllerStatus(blocklet, 'reload');
 
     const componentDids = (blocklet.children || [])
@@ -1686,7 +1684,7 @@ class BlockletManager extends BaseBlockletManager {
     const spaceGateways = await this.getBlockletSpaceGateways({ did });
 
     for (const s of spaceGateways) {
-      if (s.url === where?.url) {
+      if (s.did === where?.did) {
         Object.assign(s, value);
         break;
       }
@@ -3134,32 +3132,39 @@ class BlockletManager extends BaseBlockletManager {
    */
   // eslint-disable-next-line no-unused-vars
   async _backupToSpaces({ blocklet, context }) {
-    const {
-      user: { did: userDid },
-    } = context;
-    const {
-      appDid,
-      meta: { did: appPid },
-    } = blocklet;
-
-    const backup = await states.backup.start({
-      appPid,
-      userDid,
-      strategy: 1,
-      sourceUrl: path.join(this.dataDirs.tmp, 'backup', appDid),
-    });
+    try {
+      const {
+        user: { did: userDid },
+      } = context;
+      const {
+        appDid,
+        meta: { did: appPid },
+      } = blocklet;
+      const endpoint = getBackupEndpoint(blocklet.environments);
+
+      const backup = await states.backup.start({
+        appPid,
+        userDid,
+        strategy: 1,
+        sourceUrl: path.join(this.dataDirs.tmp, 'backup', appDid),
+        targetName: await getSpaceNameByEndpoint(endpoint, 'DID Space'),
+      });
 
-    this.backupQueue.push(
-      {
-        entity: 'blocklet',
-        action: 'backupToSpaces',
-        id: appDid,
-        blocklet,
-        context,
-        backup,
-      },
-      appDid
-    );
+      this.backupQueue.push(
+        {
+          entity: 'blocklet',
+          action: 'backupToSpaces',
+          id: appDid,
+          blocklet,
+          context,
+          backup,
+        },
+        appDid
+      );
+    } catch (error) {
+      logger.error(error);
+      throw error;
+    }
   }
 
   /**

package/lib/states/backup.js

@@ -15,6 +15,7 @@ const validateBackup = Joi.object({
   // 如果存储在 Spaces, 形如: https://bbqaw5mgxc6fnihrwqcejcxvukkdgkk4anwxwk5msvm.did.abtnet.io/app/space/zNKhe8jwgNZX2z7ZUfwNddNECxSe3wyg7VtS
   // 如果存储在 Local，形如: /User/allen/discuss-kit
   target: Joi.string().valid('Spaces', 'Local').optional().default('Spaces'),
+  targetName: Joi.string().required(),
   targetUrl: Joi.string().optional().allow('').default(''),
 
   createdAt: Joi.string()

package/lib/util/spaces.js

@@ -1,4 +1,5 @@
 const { BLOCKLET_CONFIGURABLE_KEY } = require('@blocklet/constant');
+const { default: axios } = require('axios');
 const isUrl = require('is-url');
 const isArray = require('lodash/isArray');
 const isEmpty = require('lodash/isEmpty');
@@ -45,8 +46,33 @@ function getDIDSpacesUrlFromEndpoint(endpoint) {
   return endpoint.replace(/\/api\/space\/.+/, '');
 }
 
+/**
+ * @description
+ * @export
+ * @param {string} endpoint
+ * @param {string} [defaultValue='DID Space']
+ * @return {Promise<string >}
+ */
+async function getSpaceNameByEndpoint(endpoint, defaultValue = '') {
+  try {
+    if (!isUrl(endpoint)) {
+      return '';
+    }
+
+    const { headers } = await axios.head(endpoint, {
+      timeout: 3000,
+    });
+
+    return headers['x-space-name'] ?? defaultValue;
+  } catch (error) {
+    console.error(error);
+    return defaultValue;
+  }
+}
+
 module.exports = {
   getBackupEndpoint,
   getBackupFilesUrlFromEndpoint,
   getDIDSpacesUrlFromEndpoint,
+  getSpaceNameByEndpoint,
 };

package/lib/validators/backup.js

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

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.11-next-470e8c41",
+  "version": "1.16.11",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,36 +19,36 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/auth": "1.16.11-next-470e8c41",
-    "@abtnode/certificate-manager": "1.16.11-next-470e8c41",
-    "@abtnode/constant": "1.16.11-next-470e8c41",
-    "@abtnode/cron": "1.16.11-next-470e8c41",
-    "@abtnode/logger": "1.16.11-next-470e8c41",
-    "@abtnode/models": "1.16.11-next-470e8c41",
-    "@abtnode/queue": "1.16.11-next-470e8c41",
-    "@abtnode/rbac": "1.16.11-next-470e8c41",
-    "@abtnode/router-provider": "1.16.11-next-470e8c41",
-    "@abtnode/static-server": "1.16.11-next-470e8c41",
-    "@abtnode/timemachine": "1.16.11-next-470e8c41",
-    "@abtnode/util": "1.16.11-next-470e8c41",
-    "@arcblock/did": "1.18.80",
-    "@arcblock/did-auth": "1.18.80",
-    "@arcblock/did-ext": "^1.18.80",
+    "@abtnode/auth": "1.16.11",
+    "@abtnode/certificate-manager": "1.16.11",
+    "@abtnode/constant": "1.16.11",
+    "@abtnode/cron": "1.16.11",
+    "@abtnode/logger": "1.16.11",
+    "@abtnode/models": "1.16.11",
+    "@abtnode/queue": "1.16.11",
+    "@abtnode/rbac": "1.16.11",
+    "@abtnode/router-provider": "1.16.11",
+    "@abtnode/static-server": "1.16.11",
+    "@abtnode/timemachine": "1.16.11",
+    "@abtnode/util": "1.16.11",
+    "@arcblock/did": "1.18.84",
+    "@arcblock/did-auth": "1.18.84",
+    "@arcblock/did-ext": "^1.18.84",
     "@arcblock/did-motif": "^1.1.10",
-    "@arcblock/did-util": "1.18.80",
-    "@arcblock/event-hub": "1.18.80",
-    "@arcblock/jwt": "^1.18.80",
+    "@arcblock/did-util": "1.18.84",
+    "@arcblock/event-hub": "1.18.84",
+    "@arcblock/jwt": "^1.18.84",
     "@arcblock/pm2-events": "^0.0.5",
-    "@arcblock/validator": "^1.18.80",
-    "@arcblock/vc": "1.18.80",
-    "@blocklet/constant": "1.16.11-next-470e8c41",
-    "@blocklet/meta": "1.16.11-next-470e8c41",
-    "@blocklet/sdk": "1.16.11-next-470e8c41",
-    "@did-space/client": "^0.2.113",
+    "@arcblock/validator": "^1.18.84",
+    "@arcblock/vc": "1.18.84",
+    "@blocklet/constant": "1.16.11",
+    "@blocklet/meta": "1.16.11",
+    "@blocklet/sdk": "1.16.11",
+    "@did-space/client": "^0.2.117",
     "@fidm/x509": "^1.2.1",
-    "@ocap/mcrypto": "1.18.80",
-    "@ocap/util": "1.18.80",
-    "@ocap/wallet": "1.18.80",
+    "@ocap/mcrypto": "1.18.84",
+    "@ocap/util": "1.18.84",
+    "@ocap/wallet": "1.18.84",
     "@slack/webhook": "^5.0.4",
     "archiver": "^5.3.1",
     "axios": "^0.27.2",
@@ -96,5 +96,5 @@
     "express": "^4.18.2",
     "jest": "^27.5.1"
   },
-  "gitHead": "2f27bfc6522fdf0db1e9b6df717144c98ae30390"
+  "gitHead": "bf1a5bd70ed2ee7cd044c6b629c18bbc900f1598"
 }