@abtnode/core 1.8.27 → 1.8.29

package/lib/blocklet/manager/disk.js

@@ -1,6 +1,7 @@
 /* eslint-disable no-underscore-dangle */
 /* eslint-disable no-await-in-loop */
 const fs = require('fs-extra');
+const { fileURLToPath } = require('url');
 const path = require('path');
 const get = require('lodash/get');
 const pick = require('lodash/pick');
@@ -102,6 +103,7 @@ const {
   findAvailableDid,
   ensureMeta,
   getBlocklet,
+  ensureEnvDefault,
 } = require('../../util/blocklet');
 const { parseSourceUrl } = require('../../util/registry');
 const states = require('../../states');
@@ -3012,14 +3014,14 @@ class BlockletManager extends BaseBlockletManager {
 
     const tarballPath = path.join(cwd, tarballName);
 
-    const { protocol, pathname } = new URL(url);
+    const { protocol } = new URL(url);
 
     const cachedTarFile = await this._getCachedTarFile(integrity);
     if (cachedTarFile) {
       logger.info('found cache tarFile', { did, tarballName, integrity });
       await fs.move(cachedTarFile, tarballPath, { overwrite: true });
     } else if (protocol.startsWith('file')) {
-      await fs.copy(decodeURIComponent(pathname), tarballPath);
+      await fs.copy(decodeURIComponent(fileURLToPath(url)), tarballPath);
     } else {
       const cancelCtrl = new downloadFile.CancelCtrl();
 
@@ -3375,10 +3377,13 @@ class BlockletManager extends BaseBlockletManager {
 
     if (!childDid) {
       await forEachBlocklet(blocklet, async (b, { ancestors }) => {
-        await states.blockletExtras.setConfigs(
-          [...ancestors.map((x) => x.meta.did), b.meta.did],
-          get(b.meta, 'environments', [])
-        );
+        const environments = get(b.meta, 'environments', []);
+
+        // remove default if ancestors has a value
+        ensureEnvDefault(environments, ancestors);
+
+        // write configs to db
+        await states.blockletExtras.setConfigs([...ancestors.map((x) => x.meta.did), b.meta.did], environments);
       });
     } else {
       const child = blocklet.children.find((x) => x.meta.did === childDid);

package/lib/util/blocklet.js

@@ -2,6 +2,7 @@
 
 const fs = require('fs-extra');
 const path = require('path');
+const shelljs = require('shelljs');
 const os = require('os');
 const tar = require('tar');
 const get = require('lodash/get');
@@ -23,6 +24,8 @@ 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 SCRIPT_ENGINES_WHITE_LIST = ['npm', 'npx', 'pnpm', 'yarn'];
+
 const {
   BlockletStatus,
   BlockletSource,
@@ -52,6 +55,7 @@ const {
   isComponentBlocklet,
   getSharedConfigObj,
   getComponentName,
+  isEnvShareable,
 } = require('@blocklet/meta/lib/util');
 const toBlockletDid = require('@blocklet/meta/lib/did');
 const { titleSchema, descriptionSchema } = require('@blocklet/meta/lib/schema');
@@ -324,6 +328,8 @@ const getComponentSystemEnvironments = (blocklet) => {
 };
 
 const getRuntimeEnvironments = (blocklet, nodeEnvironments, ancestors) => {
+  const root = (ancestors || [])[0] || blocklet;
+
   // pm2 will force inject env variables of daemon process to blocklet process
   // we can only rewrite these private env variables to empty
   const safeNodeEnvironments = PRIVATE_NODE_ENVS.reduce((o, x) => {
@@ -339,7 +345,11 @@ const getRuntimeEnvironments = (blocklet, nodeEnvironments, ancestors) => {
         }
       : {};
 
-  const root = (ancestors || [])[0] || blocklet;
+  // BLOCKLET_DEV_PORT should NOT in components of production mode
+  if (process.env.BLOCKLET_DEV_PORT) {
+    devEnvironments.BLOCKLET_DEV_PORT =
+      blocklet.mode === BLOCKLET_MODES.DEVELOPMENT ? process.env.BLOCKLET_DEV_PORT : '';
+  }
 
   const ports = {};
   forEachBlockletSync(root, (x) => {
@@ -484,6 +494,24 @@ const startBlockletProcess = async (
         options.env.BROWSER = 'none';
         options.env.PORT = options.env[BLOCKLET_DEFAULT_PORT_NAME];
         options.script = appMain;
+
+        if (process.platform === 'win32') {
+          const [cmd, ...args] = options.script.split(' ').filter(Boolean);
+
+          if (!SCRIPT_ENGINES_WHITE_LIST.includes(cmd)) {
+            throw new Error(`${cmd} script is not supported, ${SCRIPT_ENGINES_WHITE_LIST.join(', ')} are supported`);
+          }
+
+          const { stdout: nodejsBinPath } = shelljs.which('node');
+
+          const cmdPath = path.join(path.dirname(nodejsBinPath), 'node_modules', cmd);
+
+          const pkg = JSON.parse(fs.readFileSync(path.join(cmdPath, 'package.json')));
+          const cmdBinPath = pkg.bin[cmd];
+
+          options.script = path.resolve(cmdPath, cmdBinPath);
+          options.args = [...args].join(' ');
+        }
       } else {
         const blockletEngineInfo = getBlockletEngine(b.meta);
         options.args = blockletEngineInfo.args || [];
@@ -1331,6 +1359,35 @@ const getBlocklet = async ({
   return blocklet;
 };
 
+/**
+ * this function has side effect on environments
+ */
+const ensureEnvDefault = (environments, ancestors) => {
+  // remove default if ancestors has a value
+  const envMap = environments.reduce((o, env) => {
+    o[env.name] = env;
+    return o;
+  }, {});
+
+  for (let i = ancestors.length - 1; i >= 0; i--) {
+    const ancestor = ancestors[i];
+    const aEnvironments = get(ancestor.meta, 'environments', []);
+    const aEnv = aEnvironments.find((x) => envMap[x.name]);
+
+    if (!isEnvShareable(aEnv)) {
+      break;
+    }
+
+    const env = envMap[aEnv.name];
+    if (isEnvShareable(env) && aEnv.default) {
+      env.default = '';
+      break;
+    }
+  }
+
+  return environments;
+};
+
 module.exports = {
   forEachBlocklet,
   getBlockletMetaFromUrl: (url) => getBlockletMetaFromUrl(url, { logger }),
@@ -1370,4 +1427,5 @@ module.exports = {
   findAvailableDid,
   ensureMeta,
   getBlocklet,
+  ensureEnvDefault,
 };

package/lib/util/chain.js

@@ -1,4 +1,4 @@
-const axios = require('axios');
+const axios = require('@abtnode/util/lib/axios');
 const get = require('lodash/get');
 
 const getFactoryState = async (endpoint, address) => {

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.8.27",
+  "version": "1.8.29",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,56 +19,56 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/auth": "1.8.27",
-    "@abtnode/certificate-manager": "1.8.27",
-    "@abtnode/constant": "1.8.27",
-    "@abtnode/cron": "1.8.27",
-    "@abtnode/db": "1.8.27",
-    "@abtnode/logger": "1.8.27",
-    "@abtnode/queue": "1.8.27",
-    "@abtnode/rbac": "1.8.27",
-    "@abtnode/router-provider": "1.8.27",
-    "@abtnode/static-server": "1.8.27",
-    "@abtnode/timemachine": "1.8.27",
-    "@abtnode/util": "1.8.27",
-    "@arcblock/did": "1.17.20",
+    "@abtnode/auth": "1.8.29",
+    "@abtnode/certificate-manager": "1.8.29",
+    "@abtnode/constant": "1.8.29",
+    "@abtnode/cron": "1.8.29",
+    "@abtnode/db": "1.8.29",
+    "@abtnode/logger": "1.8.29",
+    "@abtnode/queue": "1.8.29",
+    "@abtnode/rbac": "1.8.29",
+    "@abtnode/router-provider": "1.8.29",
+    "@abtnode/static-server": "1.8.29",
+    "@abtnode/timemachine": "1.8.29",
+    "@abtnode/util": "1.8.29",
+    "@arcblock/did": "1.17.23",
     "@arcblock/did-motif": "^1.1.10",
-    "@arcblock/did-util": "1.17.20",
-    "@arcblock/event-hub": "1.17.20",
-    "@arcblock/jwt": "^1.17.20",
+    "@arcblock/did-util": "1.17.23",
+    "@arcblock/event-hub": "1.17.23",
+    "@arcblock/jwt": "^1.17.23",
     "@arcblock/pm2-events": "^0.0.5",
-    "@arcblock/vc": "1.17.20",
-    "@blocklet/constant": "1.8.27",
-    "@blocklet/meta": "1.8.27",
-    "@blocklet/sdk": "1.8.27",
+    "@arcblock/vc": "1.17.23",
+    "@blocklet/constant": "1.8.29",
+    "@blocklet/meta": "1.8.29",
+    "@blocklet/sdk": "1.8.29",
     "@fidm/x509": "^1.2.1",
-    "@ocap/mcrypto": "1.17.20",
-    "@ocap/util": "1.17.20",
-    "@ocap/wallet": "1.17.20",
+    "@ocap/mcrypto": "1.17.23",
+    "@ocap/util": "1.17.23",
+    "@ocap/wallet": "1.17.23",
     "@slack/webhook": "^5.0.4",
     "axios": "^0.27.2",
     "axon": "^2.0.3",
     "chalk": "^4.1.2",
     "deep-diff": "^1.0.2",
-    "detect-port": "^1.3.0",
+    "detect-port": "^1.5.1",
     "flat": "^5.0.2",
     "fs-extra": "^10.1.0",
     "get-port": "^5.1.1",
     "is-base64": "^1.1.0",
     "is-ip": "^3.1.0",
     "is-url": "^1.2.4",
-    "joi": "^17.6.0",
+    "joi": "^17.6.2",
     "js-yaml": "^4.1.0",
     "lodash": "^4.17.21",
     "lru-cache": "^6.0.0",
     "pm2": "^5.2.0",
-    "semver": "^7.3.7",
+    "semver": "^7.3.8",
     "shelljs": "^0.8.5",
     "slugify": "^1.6.5",
     "ssri": "^8.0.1",
     "stream-throttle": "^0.1.3",
     "stream-to-promise": "^3.0.0",
-    "systeminformation": "^5.12.4",
+    "systeminformation": "^5.12.6",
     "tar": "^6.1.11",
     "ua-parser-js": "^1.0.2",
     "unzipper": "^0.10.11",
@@ -78,8 +78,8 @@
   "devDependencies": {
     "compression": "^1.7.4",
     "expand-tilde": "^2.0.2",
-    "express": "^4.18.1",
+    "express": "^4.18.2",
     "jest": "^27.5.1"
   },
-  "gitHead": "84b2cb3ee703479f17e88c91650ecf3015cbf6af"
+  "gitHead": "ee52d838f0cf97e551d53a6509cb0da7e5f31978"
 }