@abtnode/core 1.16.27-beta-426c1690 → 1.16.27-beta-d27e19fa

package/lib/blocklet/manager/disk.js

@@ -810,9 +810,9 @@ class DiskBlockletManager extends BaseBlockletManager {
 
       const error = Array.isArray(err) ? err[0] : err;
       logger.error('Failed to start blocklet', { error, did, title: blocklet1.meta.title });
-      const description = `${getComponentNamesWithVersion(blocklet1, componentDids)} start failed for ${
-        blocklet1.meta.title
-      }: ${error.message}`;
+      const description = `${getComponentNamesWithVersion(blocklet1, componentDids)} start failed for ${getDisplayName(
+        blocklet1
+      )}: ${error.message}`;
       this._createNotification(did, {
         title: 'Component start failed',
         description,
@@ -899,7 +899,7 @@ class DiskBlockletManager extends BaseBlockletManager {
 
       let description = `${
         componentDids?.length ? getComponentNamesWithVersion(blocklet, componentDids) : 'All components'
-      } is successfully stopped for ${blocklet.meta.title}.`;
+      } is successfully stopped for ${getDisplayName(blocklet)}.`;
 
       if (reason === SUSPENDED_REASON.expired) {
         description = `${description} Reason: The subscription has expired.`;
@@ -998,9 +998,9 @@ class DiskBlockletManager extends BaseBlockletManager {
       const state = await states.blocklet.setBlockletStatus(did, BlockletStatus.stopped, { componentDids });
       this.emit(BlockletEvents.statusChange, state);
 
-      const description = `${getComponentNamesWithVersion(result, componentDids)} restart failed for ${
-        result.meta.title
-      }: ${err.message || 'queue exception'}`;
+      const description = `${getComponentNamesWithVersion(result, componentDids)} restart failed for ${getDisplayName(
+        result
+      )}: ${err.message || 'queue exception'}`;
       this._createNotification(did, {
         title: 'Component restart failed',
         description,
@@ -1067,7 +1067,7 @@ class DiskBlockletManager extends BaseBlockletManager {
       const doc = await this._deleteBlocklet({ did, keepData, keepLogsDir, keepConfigs }, context);
       this._createNotification(doc.meta.did, {
         title: 'Blocklet Deleted',
-        description: `Blocklet ${doc.meta.title} is deleted.`,
+        description: `Blocklet ${getDisplayName(blocklet)} is deleted.`,
         entityType: 'blocklet',
         entityId: doc.meta.did,
         severity: 'success',
@@ -1080,7 +1080,7 @@ class DiskBlockletManager extends BaseBlockletManager {
 
       this._createNotification(doc.meta.did, {
         title: 'Blocklet Deleted',
-        description: `Blocklet ${doc.meta.title} is deleted.`,
+        description: `Blocklet ${getDisplayName(blocklet)} is deleted.`,
         entityType: 'blocklet',
         entityId: doc.meta.did,
         severity: 'success',
@@ -1239,7 +1239,7 @@ class DiskBlockletManager extends BaseBlockletManager {
 
     this._createNotification(newBlocklet.meta.did, {
       title: 'Component delete succeed',
-      description: `${child.meta.title} is successfully deleted for ${newBlocklet.meta.title}.`,
+      description: `${child.meta.title} is successfully deleted for ${getDisplayName(newBlocklet)}.`,
       entityType: 'blocklet',
       entityId: newBlocklet.meta.did,
       severity: 'success',
@@ -1429,6 +1429,7 @@ class DiskBlockletManager extends BaseBlockletManager {
     }
 
     const configObj = {};
+    const ignoredKeys = [];
     for (const x of newConfigs) {
       if (['CHAIN_TYPE', 'BLOCKLET_APP_CHAIN_TYPE'].includes(x.key)) {
         throw new Error(`${x.key} should not be changed`);
@@ -1445,14 +1446,16 @@ class DiskBlockletManager extends BaseBlockletManager {
       } else if (!BLOCKLET_CONFIGURABLE_KEY[x.key] && !isPreferenceKey(x)) {
         const hasEnvInMeta = (b) => (b.meta.environments || []).some((y) => y.name === x.key);
         if (!hasEnvInMeta(blocklet)) {
-          // forbid unknown format key
+          // forbid unknown environment items
           if (
             // config should in component.meta.environments
             childDid ||
             // config should in app.meta.environments and or in one of component.meta.environments
             !(blocklet.children || []).some(hasEnvInMeta)
           ) {
-            throw new Error(`unknown format key: ${x.key}`);
+            logger.warn(`unknown environment item: ${x.key}`, { rootDid, childDid, config: x });
+            ignoredKeys.push(x.key);
+            continue;
           }
         }
       }
@@ -1460,7 +1463,8 @@ class DiskBlockletManager extends BaseBlockletManager {
       configObj[x.key] = x.value;
     }
 
-    const willAppSkChange = isRotatingAppSk(newConfigs, blocklet.configs, blocklet.externalSk);
+    const finalConfigs = newConfigs.filter((x) => !ignoredKeys.includes(x.key));
+    const willAppSkChange = isRotatingAppSk(finalConfigs, blocklet.configs, blocklet.externalSk);
 
     // NOTICE: cannot use appDid as did param because appDid will become old appDid in alsoKnownAs and cannot get blocklet by the old appDid
     if (willAppSkChange && rootDid !== rootMetaDid) {
@@ -1486,7 +1490,7 @@ class DiskBlockletManager extends BaseBlockletManager {
 
     // update db
     if (childDid) {
-      const { sharedConfigs, selfConfigs } = getConfigsFromInput(newConfigs, blocklet.configs);
+      const { sharedConfigs, selfConfigs } = getConfigsFromInput(finalConfigs, blocklet.configs);
 
       if (sharedConfigs.length) {
         await states.blockletExtras.setConfigs([rootMetaDid], sharedConfigs);
@@ -1495,7 +1499,7 @@ class DiskBlockletManager extends BaseBlockletManager {
         await states.blockletExtras.setConfigs([rootMetaDid, childDid], selfConfigs);
       }
     } else {
-      await states.blockletExtras.setConfigs([rootMetaDid], newConfigs);
+      await states.blockletExtras.setConfigs([rootMetaDid], finalConfigs);
     }
 
     if (willAppSkChange) {
@@ -1511,14 +1515,14 @@ class DiskBlockletManager extends BaseBlockletManager {
     }
 
     // Reload nginx to make sure did-space can embed content from this app
-    if (newConfigs.find((x) => x.key === BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_BACKUP_ENDPOINT)?.value) {
+    if (finalConfigs.find((x) => x.key === BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_BACKUP_ENDPOINT)?.value) {
       this.emit(BlockletEvents.spaceConnected, blocklet);
     }
 
     // update blocklet meta
     if (blocklet.structVersion && !childDid) {
-      const changedTitle = newConfigs.find((x) => x.key === BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_NAME)?.value;
-      const changedDescription = newConfigs.find(
+      const changedTitle = finalConfigs.find((x) => x.key === BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_NAME)?.value;
+      const changedDescription = finalConfigs.find(
         (x) => x.key === BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_DESCRIPTION
       )?.value;
 
@@ -1534,7 +1538,7 @@ class DiskBlockletManager extends BaseBlockletManager {
     }
 
     // chain config
-    await this._ensureAppChainConfig(rootMetaDid, newConfigs);
+    await this._ensureAppChainConfig(rootMetaDid, finalConfigs);
 
     await this._updateBlockletEnvironment(rootDid);
 
@@ -1546,10 +1550,10 @@ class DiskBlockletManager extends BaseBlockletManager {
     }
 
     if (!skipEmitEvents) {
-      if (!childDid && !newConfigs.some((x) => x.key === BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_SK)) {
+      if (!childDid && !finalConfigs.some((x) => x.key === BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_SK)) {
         this.emit(BlockletInternalEvents.appConfigChanged, {
           appDid: rootDid,
-          configs: newConfigs.map((x) => ({ key: x.key, value: x.value })),
+          configs: finalConfigs.map((x) => ({ key: x.key, value: x.value })),
         });
         this.configSynchronizer.throttledSyncAppConfig(blocklet.meta.did);
       }
@@ -1557,7 +1561,7 @@ class DiskBlockletManager extends BaseBlockletManager {
       this.emit(BlockletEvents.updated, { ...newState, context });
       const serverSk = (await states.node.read()).sk;
       if (childDid) {
-        const configs = JSON.stringify(newConfigs.map((x) => ({ key: x.key, value: x.value })));
+        const configs = JSON.stringify(finalConfigs.map((x) => ({ key: x.key, value: x.value })));
         this.emit(BlockletInternalEvents.componentConfigChanged, {
           appDid: rootDid,
           componentDid: childDid,
@@ -1578,7 +1582,7 @@ class DiskBlockletManager extends BaseBlockletManager {
           BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_LOGO_FAVICON,
         ];
 
-        const shouldSendWalletNotification = observableConfigs.some((x) => newConfigs.some((y) => y.key === x));
+        const shouldSendWalletNotification = observableConfigs.some((x) => finalConfigs.some((y) => y.key === x));
 
         if (shouldSendWalletNotification) {
           // notify launcher config changed
@@ -2425,7 +2429,7 @@ class DiskBlockletManager extends BaseBlockletManager {
     } = params;
     logger.info('_downloadAndInstall', { did: blocklet?.meta?.did });
     const { meta } = blocklet;
-    const { title, name, did, version } = meta;
+    const { name, did, version } = meta;
 
     // check status
     if (!skipCheckStatusBeforeDownload) {
@@ -2499,7 +2503,7 @@ class DiskBlockletManager extends BaseBlockletManager {
         title: 'Component download failed',
         description: `${childrenToDownload
           .map((x) => `${x.meta.title}@${x.meta.version}`)
-          .join(', ')} download failed for ${title}: ${err.message}`,
+          .join(', ')} download failed for ${getDisplayName(blocklet)}: ${err.message}`,
         entityType: 'blocklet',
         entityId: did,
         severity: 'error',
@@ -2647,7 +2651,7 @@ class DiskBlockletManager extends BaseBlockletManager {
     const blocklet = await this.getBlocklet(did);
 
     const { meta } = blocklet;
-    const { name, title } = meta;
+    const { name } = meta;
 
     try {
       // healthy check
@@ -2674,7 +2678,9 @@ class DiskBlockletManager extends BaseBlockletManager {
 
       const componentNames = getComponentNamesWithVersion(blocklet, componentDids);
       const description = componentNames
-        ? `${getComponentNamesWithVersion(blocklet, componentDids)} is successfully started for ${blocklet.meta.title}.`
+        ? `${getComponentNamesWithVersion(blocklet, componentDids)} is successfully started for ${getDisplayName(
+            blocklet
+          )}.`
         : `${blocklet.meta.title} is successfully started`;
       this._createNotification(did, {
         title: 'Component start succeed',
@@ -2701,7 +2707,9 @@ class DiskBlockletManager extends BaseBlockletManager {
 
       const componentNames = getComponentNamesWithVersion(blocklet, componentDids);
       const description = componentNames
-        ? `${getComponentNamesWithVersion(blocklet, componentDids)} start failed for ${title}: ${error.message}`
+        ? `${getComponentNamesWithVersion(blocklet, componentDids)} start failed for ${getDisplayName(blocklet)}: ${
+            error.message
+          }`
         : `${blocklet.meta.title} start failed: ${error.message}`;
 
       this._createNotification(did, {
@@ -3505,7 +3513,8 @@ class DiskBlockletManager extends BaseBlockletManager {
 
   async _upgradeBlocklet({ newBlocklet, oldBlocklet, componentDids, action, context = {} }) {
     const { meta, source, deployedFrom, children } = newBlocklet;
-    const { did, version, name, title } = meta;
+    const { did, version, name } = meta;
+    const title = getDisplayName(newBlocklet);
 
     try {
       // delete old process

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.27-beta-426c1690",
+  "version": "1.16.27-beta-d27e19fa",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,40 +19,40 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/analytics": "1.16.27-beta-426c1690",
-    "@abtnode/auth": "1.16.27-beta-426c1690",
-    "@abtnode/certificate-manager": "1.16.27-beta-426c1690",
-    "@abtnode/constant": "1.16.27-beta-426c1690",
-    "@abtnode/cron": "1.16.27-beta-426c1690",
-    "@abtnode/logger": "1.16.27-beta-426c1690",
-    "@abtnode/models": "1.16.27-beta-426c1690",
-    "@abtnode/queue": "1.16.27-beta-426c1690",
-    "@abtnode/rbac": "1.16.27-beta-426c1690",
-    "@abtnode/router-provider": "1.16.27-beta-426c1690",
-    "@abtnode/static-server": "1.16.27-beta-426c1690",
-    "@abtnode/timemachine": "1.16.27-beta-426c1690",
-    "@abtnode/util": "1.16.27-beta-426c1690",
-    "@arcblock/did": "1.18.121",
-    "@arcblock/did-auth": "1.18.121",
-    "@arcblock/did-ext": "^1.18.121",
+    "@abtnode/analytics": "1.16.27-beta-d27e19fa",
+    "@abtnode/auth": "1.16.27-beta-d27e19fa",
+    "@abtnode/certificate-manager": "1.16.27-beta-d27e19fa",
+    "@abtnode/constant": "1.16.27-beta-d27e19fa",
+    "@abtnode/cron": "1.16.27-beta-d27e19fa",
+    "@abtnode/logger": "1.16.27-beta-d27e19fa",
+    "@abtnode/models": "1.16.27-beta-d27e19fa",
+    "@abtnode/queue": "1.16.27-beta-d27e19fa",
+    "@abtnode/rbac": "1.16.27-beta-d27e19fa",
+    "@abtnode/router-provider": "1.16.27-beta-d27e19fa",
+    "@abtnode/static-server": "1.16.27-beta-d27e19fa",
+    "@abtnode/timemachine": "1.16.27-beta-d27e19fa",
+    "@abtnode/util": "1.16.27-beta-d27e19fa",
+    "@arcblock/did": "1.18.123",
+    "@arcblock/did-auth": "1.18.123",
+    "@arcblock/did-ext": "^1.18.123",
     "@arcblock/did-motif": "^1.1.13",
-    "@arcblock/did-util": "1.18.121",
-    "@arcblock/event-hub": "1.18.121",
-    "@arcblock/jwt": "^1.18.121",
+    "@arcblock/did-util": "1.18.123",
+    "@arcblock/event-hub": "1.18.123",
+    "@arcblock/jwt": "^1.18.123",
     "@arcblock/pm2-events": "^0.0.5",
-    "@arcblock/validator": "^1.18.121",
-    "@arcblock/vc": "1.18.121",
-    "@blocklet/constant": "1.16.27-beta-426c1690",
-    "@blocklet/env": "1.16.27-beta-426c1690",
-    "@blocklet/meta": "1.16.27-beta-426c1690",
-    "@blocklet/resolver": "1.16.27-beta-426c1690",
-    "@blocklet/sdk": "1.16.27-beta-426c1690",
-    "@blocklet/store": "1.16.27-beta-426c1690",
-    "@did-space/client": "^0.4.19",
+    "@arcblock/validator": "^1.18.123",
+    "@arcblock/vc": "1.18.123",
+    "@blocklet/constant": "1.16.27-beta-d27e19fa",
+    "@blocklet/env": "1.16.27-beta-d27e19fa",
+    "@blocklet/meta": "1.16.27-beta-d27e19fa",
+    "@blocklet/resolver": "1.16.27-beta-d27e19fa",
+    "@blocklet/sdk": "1.16.27-beta-d27e19fa",
+    "@blocklet/store": "1.16.27-beta-d27e19fa",
+    "@did-space/client": "^0.4.20",
     "@fidm/x509": "^1.2.1",
-    "@ocap/mcrypto": "1.18.121",
-    "@ocap/util": "1.18.121",
-    "@ocap/wallet": "1.18.121",
+    "@ocap/mcrypto": "1.18.123",
+    "@ocap/util": "1.18.123",
+    "@ocap/wallet": "1.18.123",
     "@slack/webhook": "^5.0.4",
     "archiver": "^7.0.1",
     "axios": "^0.27.2",
@@ -103,5 +103,5 @@
     "jest": "^29.7.0",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "96208341e13a7fd959a7b99e7906fe441a63060b"
+  "gitHead": "7a83c248c1e5738e6d95e54fc26699f865479dab"
 }