@abtnode/core 1.16.29-beta-2eaf40bc → 1.16.29-beta-cbfd116d

package/lib/blocklet/manager/disk.js

@@ -206,6 +206,7 @@ const {
   connectByStudio,
   disconnectFromStore,
 } = require('../project');
+const { translate } = require('../../locales');
 
 const { formatEnvironments, getBlockletMeta, validateOwner, isCLI } = util;
 
@@ -1348,17 +1349,31 @@ class DiskBlockletManager extends BaseBlockletManager {
     }
   }
 
-  // eslint-disable-next-line no-unused-vars
-  async deleteProcess({ did, componentDids }, context) {
+  /**
+   *
+   * @param {object} param - params
+   * @param {string} param.did - blocklet did
+   * @param {string[]} param.componentDids - component dids
+   * @param {boolean} param.shouldUpdateBlockletStatus - should update blocklet status
+   * @param {*} context
+   * @returns
+   */
+  async deleteProcess({ did, componentDids, shouldUpdateBlockletStatus = true }, context) {
     const blocklet = await this.getBlocklet(did);
 
     logger.info('delete blocklet process', { did, componentDids });
 
     await deleteBlockletProcess(blocklet, { ...context, componentDids });
-
-    const result = await states.blocklet.setBlockletStatus(did, BlockletStatus.stopped, { componentDids });
     logger.info('blocklet process deleted successfully', { did, componentDids });
-    return result;
+
+    // 有些情况不需要更新 blocklet 状态, 比如下载完成，安装之前清理 process 时, 不需要更新 blocklet 状态
+    if (shouldUpdateBlockletStatus) {
+      const result = await states.blocklet.setBlockletStatus(did, BlockletStatus.stopped, { componentDids });
+      logger.info('blocklet status updated to stopped after deleted processes', { did, componentDids });
+      return result;
+    }
+
+    return blocklet;
   }
 
   // Get blocklet by blockletDid or appDid
@@ -2265,7 +2280,6 @@ class DiskBlockletManager extends BaseBlockletManager {
   async updateAutoBackup({ did, autoBackup }, context) {
     /** @type {import('@abtnode/client').AutoBackup} */
     const value = { ...autoBackup };
-    await states.blockletExtras.setSettings(did, { autoBackup: value });
 
     const jobId = getBackupJobId(did);
     await this.backupQueue.delete(jobId);
@@ -2273,6 +2287,12 @@ class DiskBlockletManager extends BaseBlockletManager {
     logger.info('updateAutoBackup.$value', value);
 
     if (value.enabled) {
+      const blocklet = await states.blocklet.getBlocklet(did);
+      const backupEndpoint = getBackupEndpoint(blocklet?.environments);
+      if (isEmpty(backupEndpoint)) {
+        throw new Error(translate(context?.user?.locale, 'backup.space.unableEnableAutoBackup'));
+      }
+
       this.backupQueue.push(
         {
           entity: 'blocklet',
@@ -2285,6 +2305,8 @@ class DiskBlockletManager extends BaseBlockletManager {
         BACKUPS.JOB.INTERVAL
       );
     }
+
+    await states.blockletExtras.setSettings(did, { autoBackup: value });
   }
 
   /**
@@ -2797,6 +2819,18 @@ class DiskBlockletManager extends BaseBlockletManager {
       return;
     }
 
+    const spaceGateways = await this.getBlockletSpaceGateways({ did });
+    const backupEndpoint = getBackupEndpoint(blocklet.environments);
+    if (isEmpty(spaceGateways) || isEmpty(backupEndpoint)) {
+      logger.warn('Canceled automatic backups because there is no space gateway.', { appPid });
+
+      const jobId = getBackupJobId(did);
+      await this.backupQueue.delete(jobId);
+      await this.updateAutoBackup({ did, autoBackup: { enabled: false } }, context);
+
+      return;
+    }
+
     const {
       user: { did: userDid, locale },
     } = context;
@@ -2823,7 +2857,7 @@ class DiskBlockletManager extends BaseBlockletManager {
         userDid,
         strategy: backupState?.strategy,
         sourceUrl: path.join(this.dataDirs.tmp, 'backup', appDid),
-        targetName: await getSpaceNameByEndpoint(getBackupEndpoint(blocklet.environments), 'DID Space'),
+        targetName: await getSpaceNameByEndpoint(backupEndpoint, 'DID Space'),
       });
     }
 
@@ -3239,7 +3273,9 @@ class DiskBlockletManager extends BaseBlockletManager {
         return null;
       }
 
-      blocklet.site.domainAliases = await this.getDomainAliases(blocklet, context);
+      if (blocklet.site) {
+        blocklet.site.domainAliases = await this.getDomainAliases(blocklet, context);
+      }
 
       // app runtime info, app status
       blocklet.appRuntimeInfo = this.runtimeMonitor.getRuntimeInfo(blocklet.meta.did);
@@ -3429,7 +3465,7 @@ class DiskBlockletManager extends BaseBlockletManager {
 
       // ensure delete process
       try {
-        await this.deleteProcess({ did }, context);
+        await this.deleteProcess({ did, shouldUpdateBlockletStatus: false }, context);
         logger.info('ensure delete blocklet process for installing', { did, name: meta.name });
       } catch (err) {
         logger.error('ensure delete blocklet process failed for installing', { did, name: meta.name, error: err });

package/lib/locales/ar.js

@@ -12,6 +12,7 @@ module.exports = {
       },
       isFull: 'المساحة الحالية لتخزين المساحة ممتلئة ، يرجى توسيع المساحة وعمل نسخة احتياطية مرة أخرى.',
       lackOfSpace: 'المساحة المتاحة حاليًا في التخزين غير كافية. يرجى توسيع المساحة وإجراء النسخ الاحتياطي مرة أخرى.',
+      unableEnableAutoBackup: 'يتعذر تمكين النسخ الاحتياطي التلقائي، يرجى الاتصال بمساحات DID أولاً',
     },
   },
 };

package/lib/locales/de.js

@@ -14,6 +14,8 @@ module.exports = {
         'Der aktuelle Speicherplatz im Space ist voll. Bitte erweitern Sie den Speicherplatz und machen Sie ein Backup.',
       lackOfSpace:
         'Der derzeit verfügbare Speicherplatz ist unzureichend. Bitte erweitern Sie den Speicherplatz und führen Sie das Backup erneut durch.',
+      unableEnableAutoBackup:
+        'Automatisches Backup nicht aktivierbar. Stelle zuerst eine Verbindung mit DID Spaces her.',
     },
   },
 };

package/lib/locales/en.js

@@ -13,6 +13,7 @@ module.exports = {
       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',
+      unableEnableAutoBackup: 'unable to enable auto backup, please connect to DID Spaces first',
     },
   },
 };

package/lib/locales/es.js

@@ -14,6 +14,8 @@ module.exports = {
         'El espacio de almacenamiento actual de Space está lleno, por favor amplía el espacio y haz una copia de seguridad nuevamente',
       lackOfSpace:
         'El espacio disponible actual en el almacenamiento es insuficiente. Por favor, amplíe el espacio y realice la copia de seguridad nuevamente.',
+      unableEnableAutoBackup:
+        'no se puede habilitar la copia de seguridad automática, conéctese primero a los espacios DID',
     },
   },
 };

package/lib/locales/fr.js

@@ -14,6 +14,8 @@ module.exports = {
         "L'espace de stockage actuel de l'espace est plein, veuillez étendre l'espace et effectuer une sauvegarde à nouveau.",
       lackOfSpace:
         "L'espace disponible actuel dans le stockage est insuffisant. Veuillez étendre l'espace et effectuer à nouveau la sauvegarde.",
+      unableEnableAutoBackup:
+        "Impossible d'activer la sauvegarde automatique. Veuillez d'abord vous connecter à DID Spaces.",
     },
   },
 };

package/lib/locales/hi.js

@@ -12,6 +12,7 @@ module.exports = {
       },
       isFull: 'वर्तमान अंतरिक्ष संग्रहण स्थान भरा हुआ है, कृपया स्थान का विस्तार करें और फिर से बैकअप बनाएं।',
       lackOfSpace: 'उपलब्ध भंडारण में वर्तमान में कमी है, कृपया स्थान बढ़ाएं और पुनः बैकअप करें',
+      unableEnableAutoBackup: 'ऑटो बैकअप सक्षम नहीं हो पाया है, कृपया पहले DID Spaces से कनेक्ट करें',
     },
   },
 };

package/lib/locales/id.js

@@ -13,6 +13,8 @@ module.exports = {
       isFull: 'Ruang penyimpanan Space saat ini penuh, silakan perluas ruang dan buat cadangan lagi',
       lackOfSpace:
         'Ruang yang tersedia saat ini di penyimpanan tidak mencukupi. Mohon perluas ruang dan lakukan backup lagi.',
+      unableEnableAutoBackup:
+        'Tidak dapat mengaktifkan pencadangan otomatis, harap sambungkan ke DID Spaces terlebih dahulu',
     },
   },
 };

package/lib/locales/ja.js

@@ -13,6 +13,7 @@ module.exports = {
       isFull: '現在のSpaceのストレージスペースはいっぱいです。スペースを拡張して、もう一度バックアップしてください',
       lackOfSpace:
         '現在のストレージの利用可能なスペースは不十分です。スペースを拡張してバックアップを再実行してください。',
+      unableEnableAutoBackup: '自動バックアップを有効化できません。最初に DID スペースに接続してください',
     },
   },
 };

package/lib/locales/ko.js

@@ -12,6 +12,7 @@ module.exports = {
       },
       isFull: '현재 Space 저장 공간이 가득 찼습니다. 공간을 확장하고 다시 백업해주세요',
       lackOfSpace: '현재 사용 가능한 저장 공간이 부족합니다. 공간을 확장하고 백업을 다시 실행하세요.',
+      unableEnableAutoBackup: '자동 백업을 사용할 수 없습니다. 먼저 DID 공간에 연결하세요.',
     },
   },
 };

package/lib/locales/pt.js

@@ -14,6 +14,7 @@ module.exports = {
         'O espaço de armazenamento atual do Espaço está cheio, por favor, expanda o espaço e faça backup novamente',
       lackOfSpace:
         'O espaço disponível atualmente no armazenamento é insuficiente. Por favor, expanda o espaço e execute o backup novamente.',
+      unableEnableAutoBackup: 'Não é possível habilitar o backup automático, conecte-se a Espaços DID primeiro',
     },
   },
 };

package/lib/locales/ru.js

@@ -14,6 +14,8 @@ module.exports = {
         'Текущее пространство хранения Space заполнено, пожалуйста, расширьте пространство и создайте резервную копию снова.',
       lackOfSpace:
         'Текущее доступное пространство в хранилище недостаточно. Пожалуйста, расширьте пространство и выполните резервное копирование снова.',
+      unableEnableAutoBackup:
+        'Не удается включить автоматическое резервное копирование. Сначала подключитесь к DID Spaces.',
     },
   },
 };

package/lib/locales/th.js

@@ -12,6 +12,7 @@ module.exports = {
       },
       isFull: 'พื้นที่จัดเก็บ Space ปัจจุบันเต็มแล้ว โปรดขยายพื้นที่และสำรองข้อมูลอีกครั้ง',
       lackOfSpace: 'พื้นที่ว่างในการจัดเก็บปัจจุบันไม่เพียงพอ โปรดขยายพื้นที่และทำการสำรองข้อมูลอีกครั้ง',
+      unableEnableAutoBackup: 'ไม่สามารถเปิดใช้งานการสำรองข้อมูลอัตโนมัติได้ โปรดเชื่อมต่อกับ DID Spaces ก่อน',
     },
   },
 };

package/lib/locales/vi.js

@@ -12,6 +12,7 @@ module.exports = {
       },
       isFull: 'Không gian lưu trữ hiện tại của không gian Đang đầy, vui lòng mở rộng không gian và sao lưu lại',
       lackOfSpace: 'Không gian lưu trữ hiện tại không đủ. Vui lòng mở rộng không gian và thực hiện sao lưu lại.',
+      unableEnableAutoBackup: 'Không thể bật sao lưu tự động, hãy kết nối với DID Spaces trước',
     },
   },
 };

package/lib/locales/zh-tw.js

@@ -11,6 +11,7 @@ module.exports = {
       },
       isFull: '當前 Space 儲存空間已滿，請擴展空間並再次備份',
       lackOfSpace: '儲存空間當前的可用空間不足，請擴展空間並重新進行備份。',
+      unableEnableAutoBackup: '無法啟用自動備份，請先連接到 DID 空間',
     },
   },
 };

package/lib/locales/zh.js

@@ -11,6 +11,7 @@ module.exports = {
       },
       isFull: '当前的空间存储空间已满,请扩展空间并再次备份',
       lackOfSpace: '当前存储空间的可用空间不足, 请扩展空间后再次进行备份',
+      unableEnableAutoBackup: '无法开启自动备份，请先连接到 DID Spaces',
     },
   },
 };

package/lib/states/user.js

@@ -392,6 +392,7 @@ class User extends ExtendBase {
         'fullName',
         'email',
         'avatar',
+        'url',
         'role',
 
         'locale',

package/lib/util/blocklet.js

@@ -1570,11 +1570,12 @@ const validateAppConfig = async (config, states) => {
   }
 
   if (x.key === BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_BACKUP_ENDPOINT) {
+    // @note: value 置空以表删除
     if (isEmpty(x.value)) {
-      throw new Error(`${x.key} can not be empty`);
+      x.value = '';
     }
 
-    if (!isUrl(x.value)) {
+    if (!isEmpty(x.value) && !isUrl(x.value)) {
       throw new Error(`${x.key}(${x.value}) is not a valid URL`);
     }
   }

package/lib/util/launcher.js

@@ -173,13 +173,38 @@ const consumeLauncherSession = async ({ params, blocklet }) => {
   }
 };
 
-const setupAppOwner = async (node, sessionId, justCreate = false) => {
+/**
+ *
+ * @param {object} param
+ * @param {object} param.node node instance
+ * @param {string} param.sessionId blocklet setup session id
+ * @param {boolean} param.justCreate just create owner, not set owner
+ * @param {object} param.context context
+ * @param {object} param.context.visitorId visitorId
+ * @param {object} param.context.ua ua
+ * @param {object} param.context.lastLoginIp lastLoginIp
+ * @param {object} param.context.walletOS walletOS
+ * @param {object} param.context.walletDeviceMessageToken walletDeviceMessageToken
+ * @param {object} param.context.walletDeviceId walletDeviceId
+ * @returns
+ */
+const setupAppOwner = async ({ node, sessionId, justCreate = false, context }) => {
   const session = await node.getSession({ id: sessionId });
   if (!session) {
     throw new Error(`Blocklet setup session not found in server: ${sessionId}`);
   }
 
-  const { appDid, userDid, ownerDid, ownerPk, lastLoginIp, context, locale, launcherUrl, launcherSessionId } = session;
+  const {
+    appDid,
+    userDid,
+    ownerDid,
+    ownerPk,
+    lastLoginIp,
+    context: sessionContext,
+    locale,
+    launcherUrl,
+    launcherSessionId,
+  } = session;
   const [info, blocklet] = await Promise.all([states.node.read(), states.blocklet.getBlocklet(appDid)]);
   if (!blocklet) {
     throw new Error(`Blocklet not found in server: ${appDid}`);
@@ -275,7 +300,7 @@ const setupAppOwner = async (node, sessionId, justCreate = false) => {
     {
       action: 'addUser',
       args: { teamDid: appDid, userDid: ownerDid, reason: 'launch blocklet' },
-      context: { ...context, user: doc },
+      context: { ...sessionContext, user: doc },
       result: doc,
     },
     node
@@ -298,11 +323,33 @@ const setupAppOwner = async (node, sessionId, justCreate = false) => {
     await node.setBlockletOwner({ did: appDid, owner: { did: ownerDid, pk: ownerPk } });
   }
 
+  const userSession = await node
+    .upsertUserSession({
+      teamDid: appDid,
+      userDid: ownerDid,
+      appPid: appDid,
+      status: 'online',
+      visitorId: context?.visitorId,
+      ua: context?.ua,
+      lastLoginIp: context?.lastLoginIp,
+      extra: {
+        walletOS: context?.walletOS,
+        walletDeviceMessageToken: context?.walletDeviceMessageToken,
+        walletDeviceId: context?.walletDeviceId,
+      },
+    })
+    .catch((error) => {
+      logger.error('upsertUserSession failed', { error, appDid, ownerDid, context });
+    });
+
+  logger.info('created user session', { appDid, ownerDid, userSession });
+
   return {
     session,
     blocklet,
     setupToken,
     passport: vc,
+    visitorId: userSession?.visitorId,
   };
 };
 

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.29-beta-2eaf40bc",
+  "version": "1.16.29-beta-cbfd116d",
   "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.29-beta-2eaf40bc",
-    "@abtnode/auth": "1.16.29-beta-2eaf40bc",
-    "@abtnode/certificate-manager": "1.16.29-beta-2eaf40bc",
-    "@abtnode/constant": "1.16.29-beta-2eaf40bc",
-    "@abtnode/cron": "1.16.29-beta-2eaf40bc",
-    "@abtnode/logger": "1.16.29-beta-2eaf40bc",
-    "@abtnode/models": "1.16.29-beta-2eaf40bc",
-    "@abtnode/queue": "1.16.29-beta-2eaf40bc",
-    "@abtnode/rbac": "1.16.29-beta-2eaf40bc",
-    "@abtnode/router-provider": "1.16.29-beta-2eaf40bc",
-    "@abtnode/static-server": "1.16.29-beta-2eaf40bc",
-    "@abtnode/timemachine": "1.16.29-beta-2eaf40bc",
-    "@abtnode/util": "1.16.29-beta-2eaf40bc",
+    "@abtnode/analytics": "1.16.29-beta-cbfd116d",
+    "@abtnode/auth": "1.16.29-beta-cbfd116d",
+    "@abtnode/certificate-manager": "1.16.29-beta-cbfd116d",
+    "@abtnode/constant": "1.16.29-beta-cbfd116d",
+    "@abtnode/cron": "1.16.29-beta-cbfd116d",
+    "@abtnode/logger": "1.16.29-beta-cbfd116d",
+    "@abtnode/models": "1.16.29-beta-cbfd116d",
+    "@abtnode/queue": "1.16.29-beta-cbfd116d",
+    "@abtnode/rbac": "1.16.29-beta-cbfd116d",
+    "@abtnode/router-provider": "1.16.29-beta-cbfd116d",
+    "@abtnode/static-server": "1.16.29-beta-cbfd116d",
+    "@abtnode/timemachine": "1.16.29-beta-cbfd116d",
+    "@abtnode/util": "1.16.29-beta-cbfd116d",
     "@arcblock/did": "1.18.126",
     "@arcblock/did-auth": "1.18.126",
     "@arcblock/did-ext": "^1.18.126",
@@ -42,13 +42,13 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "^1.18.126",
     "@arcblock/vc": "1.18.126",
-    "@blocklet/constant": "1.16.29-beta-2eaf40bc",
-    "@blocklet/env": "1.16.29-beta-2eaf40bc",
-    "@blocklet/meta": "1.16.29-beta-2eaf40bc",
-    "@blocklet/resolver": "1.16.29-beta-2eaf40bc",
-    "@blocklet/sdk": "1.16.29-beta-2eaf40bc",
-    "@blocklet/store": "1.16.29-beta-2eaf40bc",
-    "@did-space/client": "^0.5.4",
+    "@blocklet/constant": "1.16.29-beta-cbfd116d",
+    "@blocklet/env": "1.16.29-beta-cbfd116d",
+    "@blocklet/meta": "1.16.29-beta-cbfd116d",
+    "@blocklet/resolver": "1.16.29-beta-cbfd116d",
+    "@blocklet/sdk": "1.16.29-beta-cbfd116d",
+    "@blocklet/store": "1.16.29-beta-cbfd116d",
+    "@did-space/client": "^0.5.7",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.18.126",
     "@ocap/util": "1.18.126",
@@ -103,5 +103,5 @@
     "jest": "^29.7.0",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "d723d07ca8914468fc1b53af23aa53dc343e0a8c"
+  "gitHead": "e9bdb7af77f2d126e40195c67972b07fe683adf9"
 }