@abtnode/core 1.8.30 → 1.8.31

package/lib/blocklet/manager/disk.js

@@ -283,15 +283,38 @@ class BlockletManager extends BaseBlockletManager {
    * @param {String} name custom component name
    *
    * @param {ConfigEntry} configs pre configs
+   * @param {Boolean} skipNavigation
    */
   async installComponent(
-    { rootDid, mountPoint, url, file, did, diffVersion, deleteSet, title, name, configs, downloadTokenList },
+    {
+      rootDid,
+      mountPoint,
+      url,
+      file,
+      did,
+      diffVersion,
+      deleteSet,
+      title,
+      name,
+      configs,
+      downloadTokenList,
+      skipNavigation,
+    },
     context = {}
   ) {
     logger.debug('start install component', { rootDid, mountPoint, url });
 
     if (file) {
-      return this._installComponentFromUpload({ rootDid, mountPoint, file, did, diffVersion, deleteSet, context });
+      return this._installComponentFromUpload({
+        rootDid,
+        mountPoint,
+        file,
+        did,
+        diffVersion,
+        deleteSet,
+        skipNavigation,
+        context,
+      });
     }
 
     if (url) {
@@ -305,6 +328,7 @@ class BlockletManager extends BaseBlockletManager {
         name,
         configs,
         downloadTokenList,
+        skipNavigation,
       });
     }
 
@@ -1348,7 +1372,7 @@ class BlockletManager extends BaseBlockletManager {
     return blocklet;
   }
 
-  async _devComponent({ folder, meta, rootDid, mountPoint }) {
+  async _devComponent({ folder, meta, rootDid, mountPoint, skipNavigation = true }) {
     const { did, version } = meta;
 
     const existRoot = await states.blocklet.getBlocklet(rootDid);
@@ -1392,7 +1416,7 @@ class BlockletManager extends BaseBlockletManager {
     await this._downloadBlocklet(newBlocklet, existRoot);
     await states.blocklet.setBlockletStatus(rootDid, BlockletStatus.stopped);
 
-    await this._upsertDynamicNavigation(existRoot.meta.did, children[0]);
+    await this._upsertDynamicNavigation(existRoot.meta.did, { skipNavigation });
 
     // Add environments
     await this._setConfigsFromMeta(rootDid);
@@ -1956,6 +1980,7 @@ class BlockletManager extends BaseBlockletManager {
     did: inputDid,
     configs,
     downloadTokenList,
+    skipNavigation,
   }) {
     const blocklet = await this._getBlockletForInstallation(rootDid);
     if (!blocklet) {
@@ -2018,7 +2043,7 @@ class BlockletManager extends BaseBlockletManager {
       await states.blocklet.addChildren(rootDid, [newChild]);
 
       // update navigation
-      await this._upsertDynamicNavigation(blocklet.meta.did, newChild);
+      await this._upsertDynamicNavigation(blocklet.meta.did, newChild, { skipNavigation });
 
       // update configs
       if (Array.isArray(configs)) {
@@ -2213,7 +2238,16 @@ class BlockletManager extends BaseBlockletManager {
     }
   }
 
-  async _installComponentFromUpload({ rootDid, mountPoint, file, did, diffVersion, deleteSet, context }) {
+  async _installComponentFromUpload({
+    rootDid,
+    mountPoint,
+    file,
+    did,
+    diffVersion,
+    deleteSet,
+    skipNavigation,
+    context,
+  }) {
     logger.info('install blocklet', { from: 'upload file' });
     // download
     const { cwd, tarFile } = await this._downloadFromUpload(file);
@@ -2280,7 +2314,7 @@ class BlockletManager extends BaseBlockletManager {
 
     checkDuplicateComponents(newBlocklet.children);
 
-    await this._upsertDynamicNavigation(newBlocklet.meta.did, newChild);
+    await this._upsertDynamicNavigation(newBlocklet.meta.did, newChild, { skipNavigation });
 
     await this._downloadBlocklet(newBlocklet, oldBlocklet);
 
@@ -3410,13 +3444,17 @@ class BlockletManager extends BaseBlockletManager {
     return { did, name };
   }
 
-  async _upsertDynamicNavigation(did, child) {
+  async _upsertDynamicNavigation(did, child, { skipNavigation } = {}) {
     const navigation = await states.blockletExtras.getSettings(did, 'navigation', []);
     const item = { title: child.meta.title, child: child.meta.name };
     const index = navigation.findIndex((x) => x.child === item.child);
     if (index > -1) {
-      navigation.splice(index, 1, item);
-    } else {
+      if (skipNavigation) {
+        navigation.splice(index, 1);
+      } else {
+        navigation.splice(index, 1, item);
+      }
+    } else if (!skipNavigation) {
       navigation.push(item);
     }
     await states.blockletExtras.setSettings(did, { navigation });

package/lib/team/manager.js

@@ -328,8 +328,8 @@ class TeamManager extends EventEmitter {
         if (this.cache[did].session) {
           await closeDatabase(this.cache[did].session.db);
         }
-      } catch (err) {
-        logger.error('Failed to close database', { did, err });
+      } catch (error) {
+        logger.error('Failed to close database', { did, error });
       }
     }
 

package/lib/util/blocklet.js

@@ -23,6 +23,7 @@ const normalizePathPrefix = require('@abtnode/util/lib/normalize-path-prefix');
 const hashFiles = require('@abtnode/util/lib/hash-files');
 const isPathPrefixEqual = require('@abtnode/util/lib/is-path-prefix-equal');
 const { BLOCKLET_MAX_MEM_LIMIT_IN_MB } = require('@abtnode/constant');
+const formatBackSlash = require('@abtnode/util/lib/format-back-slash');
 
 const SCRIPT_ENGINES_WHITE_LIST = ['npm', 'npx', 'pnpm', 'yarn'];
 
@@ -259,8 +260,7 @@ const getAppSystemEnvironments = (blocklet, nodeInfo) => {
   const appName = title || name || result.name;
   const appDescription = description || result.description;
 
-  // FIXME: we should use https here when possible, eg, when did-gateway is available
-  const appUrl = `http://${getDidDomainForBlocklet({ name, daemonDid: nodeInfo.did, didDomain: nodeInfo.didDomain })}`;
+  const appUrl = `https://${getDidDomainForBlocklet({ name, daemonDid: nodeInfo.did, didDomain: nodeInfo.didDomain })}`;
 
   return {
     BLOCKLET_DID: did,
@@ -946,7 +946,7 @@ const pruneBlockletBundle = async ({ blocklets, installDir, blockletSettings })
     const fillAppDirs = async (dir, level = 'root') => {
       if (level === 'version') {
         appDirs.push({
-          key: path.relative(installDir, dir),
+          key: formatBackSlash(path.relative(installDir, dir)),
           dir,
         });
 
@@ -974,7 +974,7 @@ const pruneBlockletBundle = async ({ blocklets, installDir, blockletSettings })
 
   const ensureBundleDirRemoved = async (dir) => {
     const relativeDir = path.relative(installDir, dir);
-    const arr = relativeDir.split('/').filter(Boolean);
+    const arr = relativeDir.split(path.sep).filter(Boolean);
     const { length } = arr;
     const bundleName = arr[length - 2];
     const scopeName = length > 2 ? arr[length - 3] : '';

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.8.30",
+  "version": "1.8.31",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,18 +19,18 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/auth": "1.8.30",
-    "@abtnode/certificate-manager": "1.8.30",
-    "@abtnode/constant": "1.8.30",
-    "@abtnode/cron": "1.8.30",
-    "@abtnode/db": "1.8.30",
-    "@abtnode/logger": "1.8.30",
-    "@abtnode/queue": "1.8.30",
-    "@abtnode/rbac": "1.8.30",
-    "@abtnode/router-provider": "1.8.30",
-    "@abtnode/static-server": "1.8.30",
-    "@abtnode/timemachine": "1.8.30",
-    "@abtnode/util": "1.8.30",
+    "@abtnode/auth": "1.8.31",
+    "@abtnode/certificate-manager": "1.8.31",
+    "@abtnode/constant": "1.8.31",
+    "@abtnode/cron": "1.8.31",
+    "@abtnode/db": "1.8.31",
+    "@abtnode/logger": "1.8.31",
+    "@abtnode/queue": "1.8.31",
+    "@abtnode/rbac": "1.8.31",
+    "@abtnode/router-provider": "1.8.31",
+    "@abtnode/static-server": "1.8.31",
+    "@abtnode/timemachine": "1.8.31",
+    "@abtnode/util": "1.8.31",
     "@arcblock/did": "1.17.23",
     "@arcblock/did-motif": "^1.1.10",
     "@arcblock/did-util": "1.17.23",
@@ -38,9 +38,9 @@
     "@arcblock/jwt": "^1.17.23",
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/vc": "1.17.23",
-    "@blocklet/constant": "1.8.30",
-    "@blocklet/meta": "1.8.30",
-    "@blocklet/sdk": "1.8.30",
+    "@blocklet/constant": "1.8.31",
+    "@blocklet/meta": "1.8.31",
+    "@blocklet/sdk": "1.8.31",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.17.23",
     "@ocap/util": "1.17.23",
@@ -57,7 +57,7 @@
     "is-base64": "^1.1.0",
     "is-ip": "^3.1.0",
     "is-url": "^1.2.4",
-    "joi": "^17.6.2",
+    "joi": "17.6.3",
     "js-yaml": "^4.1.0",
     "lodash": "^4.17.21",
     "lru-cache": "^6.0.0",
@@ -81,5 +81,5 @@
     "express": "^4.18.2",
     "jest": "^27.5.1"
   },
-  "gitHead": "cb294f4ee7382c6ef7692b6c2c33ad080fced13e"
+  "gitHead": "f3cc8becdca1b8c5e645eb8cf751fa780cf09cfe"
 }