@abtnode/core 1.8.28 → 1.8.30

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');
@@ -871,7 +872,7 @@ class BlockletManager extends BaseBlockletManager {
         x.value = await descriptionSchema.validateAsync(x.value);
       }
 
-      if (x.key === 'BLOCKLET_APP_LOGO') {
+      if (['BLOCKLET_APP_LOGO', 'BLOCKLET_APP_LOGO_SQUARE'].includes(x.key)) {
         x.value = await logoSchema.validateAsync(x.value);
       }
 
@@ -3013,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();
 

package/lib/states/blocklet.js

@@ -319,7 +319,7 @@ class BlockletState extends BaseState {
     defaultPort = 0,
   } = {}) {
     try {
-      const blocklets = await this.getBlocklets({}, { port: 1, ports: 1, 'meta.interfaces': 1 });
+      const blocklets = await this.getBlocklets({}, { port: 1, ports: 1, 'meta.interfaces': 1, children: 1 });
 
       const occupiedExternalPorts = new Map();
       const occupiedInternalPorts = new Map();

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,
@@ -491,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 || [];

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.8.28",
+  "version": "1.8.30",
   "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.28",
-    "@abtnode/certificate-manager": "1.8.28",
-    "@abtnode/constant": "1.8.28",
-    "@abtnode/cron": "1.8.28",
-    "@abtnode/db": "1.8.28",
-    "@abtnode/logger": "1.8.28",
-    "@abtnode/queue": "1.8.28",
-    "@abtnode/rbac": "1.8.28",
-    "@abtnode/router-provider": "1.8.28",
-    "@abtnode/static-server": "1.8.28",
-    "@abtnode/timemachine": "1.8.28",
-    "@abtnode/util": "1.8.28",
+    "@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",
     "@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.28",
-    "@blocklet/meta": "1.8.28",
-    "@blocklet/sdk": "1.8.28",
+    "@blocklet/constant": "1.8.30",
+    "@blocklet/meta": "1.8.30",
+    "@blocklet/sdk": "1.8.30",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.17.23",
     "@ocap/util": "1.17.23",
@@ -81,5 +81,5 @@
     "express": "^4.18.2",
     "jest": "^27.5.1"
   },
-  "gitHead": "af7aacf5507177600ae563ab597cb42d7223b113"
+  "gitHead": "cb294f4ee7382c6ef7692b6c2c33ad080fced13e"
 }