@abtnode/core 1.17.3-beta-20251117-230305-4637416e → 1.17.3-beta-20251118-061144-335cd35d

package/lib/util/blocklet.js

@@ -2,9 +2,9 @@
 /* eslint-disable no-await-in-loop */
 
 const fs = require('fs-extra');
-const path = require('path');
+const path = require('node:path');
 const shelljs = require('shelljs');
-const os = require('os');
+const os = require('node:os');
 const tar = require('tar');
 const get = require('lodash/get');
 const isNil = require('lodash/isNil');
@@ -338,7 +338,7 @@ const fillBlockletConfigs = (blocklet, configs) => {
   }, {});
 };
 
-const ensureBlockletExpanded = async (meta, appDir) => {
+const ensureBlockletExpanded = async (_meta, appDir) => {
   const bundlePath = path.join(appDir, BLOCKLET_BUNDLE_FILE);
   if (fs.existsSync(bundlePath)) {
     try {
@@ -773,7 +773,6 @@ const startBlockletProcess = async (
 
     // start process
     const maxMemoryRestart = get(nodeInfo, 'runtimeConfig.blockletMaxMemoryLimit', BLOCKLET_MAX_MEM_LIMIT_IN_MB);
-
     const processIdName = isGreen ? `${processId}-green` : processId;
     /**
      * @type {pm2.StartOptions}
@@ -800,8 +799,8 @@ const startBlockletProcess = async (
           BLOCKLET_START_AT: now,
           NODE_OPTIONS: await getSecurityNodeOptions(b, nodeInfo.enableFileSystemIsolation),
         },
-        // should not inject appSk and appPsk to the blocklet environment
-        process.env.WITH_SK ? [] : ['BLOCKLET_APP_SK', 'BLOCKLET_APP_PSK']
+        // should only inject appSk and appPsk to the blocklet environment when unsafe mode enabled
+        ['1', 1].includes(env.UNSAFE_MODE) ? [] : ['BLOCKLET_APP_SK', 'BLOCKLET_APP_PSK']
       ),
       script,
       args,
@@ -1158,11 +1157,11 @@ const checkBlockletProcessHealthy = async (
   blocklet,
   { minConsecutiveTime, timeout, componentDids, setBlockletRunning, isGreen = false, appDid } = {}
 ) => {
-  if (process.env.NODE_ENV === 'test' && process.env.ABT_NODE_TEST_MIN_CONSECUTIVE_TIME) {
-    // need bigger than minConsecutiveTime in test env
-    // eslint-disable-next-line no-param-reassign
-    timeout = Math.max(+process.env.ABT_NODE_TEST_MIN_CONSECUTIVE_TIME * 10, minConsecutiveTime + 1000);
-  }
+  // if (process.env.NODE_ENV === 'test' && process.env.ABT_NODE_TEST_MIN_CONSECUTIVE_TIME) {
+  //   // need bigger than minConsecutiveTime in test env
+  //   // eslint-disable-next-line no-param-reassign
+  //   timeout = Math.max(+process.env.ABT_NODE_TEST_MIN_CONSECUTIVE_TIME * 10, minConsecutiveTime + 3000);
+  // }
   await forEachBlocklet(
     blocklet,
     async (b) => {
@@ -1457,7 +1456,7 @@ const getRuntimeInfo = async (processId) => {
     return {
       ...dockerInfo,
       pid: proc.pid,
-      uptime: proc.pm2_env ? +new Date() - Number(proc.pm2_env.pm_uptime) : 0,
+      uptime: proc.pm2_env ? Date.now() - Number(proc.pm2_env.pm_uptime) : 0,
       port: proc.pm2_env ? proc.pm2_env.BLOCKLET_PORT : null,
       status: proc.pm2_env ? proc.pm2_env.status : null,
       runningDocker: !!dockerName,
@@ -1465,7 +1464,7 @@ const getRuntimeInfo = async (processId) => {
   }
   return {
     pid: proc.pid,
-    uptime: proc.pm2_env ? +new Date() - Number(proc.pm2_env.pm_uptime) : 0,
+    uptime: proc.pm2_env ? Date.now() - Number(proc.pm2_env.pm_uptime) : 0,
     memoryUsage: proc.monit.memory,
     cpuUsage: proc.monit.cpu,
     status: proc.pm2_env ? proc.pm2_env.status : null,
@@ -2385,7 +2384,7 @@ const shouldSkipComponent = (componentDid, whiteList) => {
   return !arr.includes(componentDid);
 };
 
-const ensurePortsShape = (states, portsA, portsB) => {
+const ensurePortsShape = (_states, portsA, portsB) => {
   if (!portsA || Object.keys(portsA).length === 0) {
     return;
   }

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.17.3-beta-20251117-230305-4637416e",
+  "version": "1.17.3-beta-20251118-061144-335cd35d",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -17,21 +17,21 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/analytics": "1.17.3-beta-20251117-230305-4637416e",
-    "@abtnode/auth": "1.17.3-beta-20251117-230305-4637416e",
-    "@abtnode/certificate-manager": "1.17.3-beta-20251117-230305-4637416e",
-    "@abtnode/constant": "1.17.3-beta-20251117-230305-4637416e",
-    "@abtnode/cron": "1.17.3-beta-20251117-230305-4637416e",
-    "@abtnode/db-cache": "1.17.3-beta-20251117-230305-4637416e",
-    "@abtnode/docker-utils": "1.17.3-beta-20251117-230305-4637416e",
-    "@abtnode/logger": "1.17.3-beta-20251117-230305-4637416e",
-    "@abtnode/models": "1.17.3-beta-20251117-230305-4637416e",
-    "@abtnode/queue": "1.17.3-beta-20251117-230305-4637416e",
-    "@abtnode/rbac": "1.17.3-beta-20251117-230305-4637416e",
-    "@abtnode/router-provider": "1.17.3-beta-20251117-230305-4637416e",
-    "@abtnode/static-server": "1.17.3-beta-20251117-230305-4637416e",
-    "@abtnode/timemachine": "1.17.3-beta-20251117-230305-4637416e",
-    "@abtnode/util": "1.17.3-beta-20251117-230305-4637416e",
+    "@abtnode/analytics": "1.17.3-beta-20251118-061144-335cd35d",
+    "@abtnode/auth": "1.17.3-beta-20251118-061144-335cd35d",
+    "@abtnode/certificate-manager": "1.17.3-beta-20251118-061144-335cd35d",
+    "@abtnode/constant": "1.17.3-beta-20251118-061144-335cd35d",
+    "@abtnode/cron": "1.17.3-beta-20251118-061144-335cd35d",
+    "@abtnode/db-cache": "1.17.3-beta-20251118-061144-335cd35d",
+    "@abtnode/docker-utils": "1.17.3-beta-20251118-061144-335cd35d",
+    "@abtnode/logger": "1.17.3-beta-20251118-061144-335cd35d",
+    "@abtnode/models": "1.17.3-beta-20251118-061144-335cd35d",
+    "@abtnode/queue": "1.17.3-beta-20251118-061144-335cd35d",
+    "@abtnode/rbac": "1.17.3-beta-20251118-061144-335cd35d",
+    "@abtnode/router-provider": "1.17.3-beta-20251118-061144-335cd35d",
+    "@abtnode/static-server": "1.17.3-beta-20251118-061144-335cd35d",
+    "@abtnode/timemachine": "1.17.3-beta-20251118-061144-335cd35d",
+    "@abtnode/util": "1.17.3-beta-20251118-061144-335cd35d",
     "@aigne/aigne-hub": "^0.10.9",
     "@arcblock/did": "^1.27.7",
     "@arcblock/did-connect-js": "^1.27.7",
@@ -43,15 +43,15 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "^1.27.7",
     "@arcblock/vc": "^1.27.7",
-    "@blocklet/constant": "1.17.3-beta-20251117-230305-4637416e",
+    "@blocklet/constant": "1.17.3-beta-20251118-061144-335cd35d",
     "@blocklet/did-space-js": "^1.2.4",
-    "@blocklet/env": "1.17.3-beta-20251117-230305-4637416e",
+    "@blocklet/env": "1.17.3-beta-20251118-061144-335cd35d",
     "@blocklet/error": "^0.3.3",
-    "@blocklet/meta": "1.17.3-beta-20251117-230305-4637416e",
-    "@blocklet/resolver": "1.17.3-beta-20251117-230305-4637416e",
-    "@blocklet/sdk": "1.17.3-beta-20251117-230305-4637416e",
-    "@blocklet/server-js": "1.17.3-beta-20251117-230305-4637416e",
-    "@blocklet/store": "1.17.3-beta-20251117-230305-4637416e",
+    "@blocklet/meta": "1.17.3-beta-20251118-061144-335cd35d",
+    "@blocklet/resolver": "1.17.3-beta-20251118-061144-335cd35d",
+    "@blocklet/sdk": "1.17.3-beta-20251118-061144-335cd35d",
+    "@blocklet/server-js": "1.17.3-beta-20251118-061144-335cd35d",
+    "@blocklet/store": "1.17.3-beta-20251118-061144-335cd35d",
     "@blocklet/theme": "^3.2.6",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "^1.27.7",
@@ -116,5 +116,5 @@
     "express": "^4.18.2",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "91bbcd8cfe4db52306f6ce83b90295c296350a7f"
+  "gitHead": "8e2245b336c9b4cdfd8e53012ab44a11b68c5665"
 }