@abtnode/core 1.16.37 → 1.16.38-beta-20250108-235929-17742885

package/lib/blocklet/manager/disk.js

@@ -25,6 +25,8 @@ const { joinURL } = require('ufo');
 const { sendToUser } = require('@blocklet/sdk/lib/util/send-notification');
 const { getDidDomainForBlocklet } = require('@abtnode/util/lib/get-domain-for-blocklet');
 const logger = require('@abtnode/logger')('@abtnode/core:blocklet:manager');
+const promiseSpawn = require('@abtnode/util/lib/promise-spawn');
+
 const {
   BLOCKLET_INSTALL_TYPE,
   APP_STRUCT_VERSION,
@@ -2646,6 +2648,17 @@ class DiskBlockletManager extends BaseBlockletManager {
     const { meta } = blocklet;
     const { name, did, version } = meta;
 
+    const nodeInfo = await states.node.read();
+    if (checkDockerRunHistory(nodeInfo)) {
+      const newBlocklet = await this.getBlocklet(did);
+      // pull docker image
+      await forEachComponentV2(newBlocklet, async (component) => {
+        if (component?.meta?.docker?.image) {
+          await promiseSpawn(`docker pull ${component?.meta?.docker?.image}`, {}, { timeout: 120 * 1000, retry: 0 });
+        }
+      });
+    }
+
     // check status
     if (!skipCheckStatusBeforeDownload) {
       try {
@@ -2707,7 +2720,6 @@ class DiskBlockletManager extends BaseBlockletManager {
       }
     } catch (err) {
       if (err.message.includes('EACCES:')) {
-        const nodeInfo = await states.node.read();
         if (checkDockerRunHistory(nodeInfo)) {
           try {
             await dockerExecChown(`${did}-${blocklet.meta.name}-download`, [
@@ -4374,6 +4386,15 @@ class DiskBlockletManager extends BaseBlockletManager {
       if (!isExternal) {
         // 将 notification 信息保存在 server 中
         const serverReceivers = await this.getReceiverDids(this.teamManager.nodeDid);
+        // 需要处理 action,  staging 环境中 path 要带有 admin/
+        const { action } = notification;
+        let actionPath = action;
+        if (actionPath) {
+          const nodeInfo = await states.node.read();
+          actionPath =
+            process.env.NODE_ENV === 'production' ? joinURL(nodeInfo.routing.adminPath, actionPath) : actionPath;
+        }
+
         await states.notification.create({
           ...notification,
           blockletUrl,

package/lib/blocklet/migration-dist/migration.cjs

@@ -7964,6 +7964,7 @@ function useColors() {
 
 	// Is webkit? http://stackoverflow.com/a/16459606/376773
 	// document is undefined in react-native: https://github.com/facebook/react-native/pull/1632
+	// eslint-disable-next-line no-return-assign
 	return (typeof document !== 'undefined' && document.documentElement && document.documentElement.style && document.documentElement.style.WebkitAppearance) ||
 		// Is firebug? http://stackoverflow.com/a/398120/376773
 		(typeof window !== 'undefined' && window.console && (window.console.firebug || (window.console.exception && window.console.table))) ||
@@ -8279,24 +8280,62 @@ function setup(env) {
 		createDebug.names = [];
 		createDebug.skips = [];
 
-		let i;
-		const split = (typeof namespaces === 'string' ? namespaces : '').split(/[\s,]+/);
-		const len = split.length;
+		const split = (typeof namespaces === 'string' ? namespaces : '')
+			.trim()
+			.replace(' ', ',')
+			.split(',')
+			.filter(Boolean);
 
-		for (i = 0; i < len; i++) {
-			if (!split[i]) {
-				// ignore empty strings
-				continue;
+		for (const ns of split) {
+			if (ns[0] === '-') {
+				createDebug.skips.push(ns.slice(1));
+			} else {
+				createDebug.names.push(ns);
 			}
+		}
+	}
 
-			namespaces = split[i].replace(/\*/g, '.*?');
-
-			if (namespaces[0] === '-') {
-				createDebug.skips.push(new RegExp('^' + namespaces.slice(1) + '$'));
+	/**
+	 * Checks if the given string matches a namespace template, honoring
+	 * asterisks as wildcards.
+	 *
+	 * @param {String} search
+	 * @param {String} template
+	 * @return {Boolean}
+	 */
+	function matchesTemplate(search, template) {
+		let searchIndex = 0;
+		let templateIndex = 0;
+		let starIndex = -1;
+		let matchIndex = 0;
+
+		while (searchIndex < search.length) {
+			if (templateIndex < template.length && (template[templateIndex] === search[searchIndex] || template[templateIndex] === '*')) {
+				// Match character or proceed with wildcard
+				if (template[templateIndex] === '*') {
+					starIndex = templateIndex;
+					matchIndex = searchIndex;
+					templateIndex++; // Skip the '*'
+				} else {
+					searchIndex++;
+					templateIndex++;
+				}
+			} else if (starIndex !== -1) { // eslint-disable-line no-negated-condition
+				// Backtrack to the last '*' and try to match more characters
+				templateIndex = starIndex + 1;
+				matchIndex++;
+				searchIndex = matchIndex;
 			} else {
-				createDebug.names.push(new RegExp('^' + namespaces + '$'));
+				return false; // No match
 			}
 		}
+
+		// Handle trailing '*' in template
+		while (templateIndex < template.length && template[templateIndex] === '*') {
+			templateIndex++;
+		}
+
+		return templateIndex === template.length;
 	}
 
 	/**
@@ -8307,8 +8346,8 @@ function setup(env) {
 	*/
 	function disable() {
 		const namespaces = [
-			...createDebug.names.map(toNamespace),
-			...createDebug.skips.map(toNamespace).map(namespace => '-' + namespace)
+			...createDebug.names,
+			...createDebug.skips.map(namespace => '-' + namespace)
 		].join(',');
 		createDebug.enable('');
 		return namespaces;
@@ -8322,21 +8361,14 @@ function setup(env) {
 	* @api public
 	*/
 	function enabled(name) {
-		if (name[name.length - 1] === '*') {
-			return true;
-		}
-
-		let i;
-		let len;
-
-		for (i = 0, len = createDebug.skips.length; i < len; i++) {
-			if (createDebug.skips[i].test(name)) {
+		for (const skip of createDebug.skips) {
+			if (matchesTemplate(name, skip)) {
 				return false;
 			}
 		}
 
-		for (i = 0, len = createDebug.names.length; i < len; i++) {
-			if (createDebug.names[i].test(name)) {
+		for (const ns of createDebug.names) {
+			if (matchesTemplate(name, ns)) {
 				return true;
 			}
 		}
@@ -8344,19 +8376,6 @@ function setup(env) {
 		return false;
 	}
 
-	/**
-	* Convert regexp to namespace
-	*
-	* @param {RegExp} regxep
-	* @return {String} namespace
-	* @api private
-	*/
-	function toNamespace(regexp) {
-		return regexp.toString()
-			.substring(2, regexp.toString().length - 2)
-			.replace(/\.\*\?$/, '*');
-	}
-
 	/**
 	* Coerce `val`.
 	*
@@ -38553,7 +38572,7 @@ module.exports = require("zlib");
 /***/ ((module) => {
 
 "use strict";
-module.exports = JSON.parse('{"name":"@abtnode/core","publishConfig":{"access":"public"},"version":"1.16.36","description":"","main":"lib/index.js","files":["lib"],"scripts":{"lint":"eslint tests lib --ignore-pattern \'tests/assets/*\'","lint:fix":"eslint --fix tests lib","test":"node tools/jest.js","coverage":"npm run test -- --coverage"},"keywords":[],"author":"wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)","license":"Apache-2.0","dependencies":{"@abtnode/analytics":"1.16.36","@abtnode/auth":"1.16.36","@abtnode/certificate-manager":"1.16.36","@abtnode/constant":"1.16.36","@abtnode/cron":"1.16.36","@abtnode/logger":"1.16.36","@abtnode/models":"1.16.36","@abtnode/queue":"1.16.36","@abtnode/rbac":"1.16.36","@abtnode/router-provider":"1.16.36","@abtnode/static-server":"1.16.36","@abtnode/timemachine":"1.16.36","@abtnode/util":"1.16.36","@arcblock/did":"1.19.2","@arcblock/did-auth":"1.19.2","@arcblock/did-ext":"^1.19.2","@arcblock/did-motif":"^1.1.13","@arcblock/did-util":"1.19.2","@arcblock/event-hub":"1.19.2","@arcblock/jwt":"^1.19.2","@arcblock/pm2-events":"^0.0.5","@arcblock/validator":"^1.19.2","@arcblock/vc":"1.19.2","@blocklet/constant":"1.16.36","@blocklet/did-space-js":"^1.0.1","@blocklet/env":"1.16.36","@blocklet/meta":"1.16.36","@blocklet/resolver":"1.16.36","@blocklet/sdk":"1.16.36","@blocklet/store":"1.16.36","@fidm/x509":"^1.2.1","@ocap/mcrypto":"1.19.2","@ocap/util":"1.19.2","@ocap/wallet":"1.19.2","@slack/webhook":"^5.0.4","archiver":"^7.0.1","axios":"^1.7.9","axon":"^2.0.3","chalk":"^4.1.2","cross-spawn":"^7.0.3","deep-diff":"^1.0.2","detect-port":"^1.5.1","envfile":"^7.1.0","escape-string-regexp":"^4.0.0","fast-glob":"^3.3.2","filesize":"^10.1.1","flat":"^5.0.2","fs-extra":"^11.2.0","get-port":"^5.1.1","hasha":"^5.2.2","is-base64":"^1.1.0","is-cidr":"4","is-ip":"3","is-url":"^1.2.4","joi":"17.12.2","joi-extension-semver":"^5.0.0","js-yaml":"^4.1.0","kill-port":"^2.0.1","lodash":"^4.17.21","lru-cache":"^11.0.2","node-stream-zip":"^1.15.0","p-all":"^3.0.0","p-limit":"^3.1.0","p-map":"^4.0.0","p-retry":"^4.6.2","read-last-lines":"^1.8.0","semver":"^7.6.3","sequelize":"^6.35.0","shelljs":"^0.8.5","ssri":"^8.0.1","stream-throttle":"^0.1.3","stream-to-promise":"^3.0.0","systeminformation":"^5.23.3","tail":"^2.2.4","tar":"^6.1.11","transliteration":"^2.3.5","ua-parser-js":"^1.0.2","ufo":"^1.5.3","uuid":"^9.0.1","valid-url":"^1.0.9","which":"^2.0.2","xbytes":"^1.8.0"},"devDependencies":{"expand-tilde":"^2.0.2","express":"^4.18.2","jest":"^29.7.0","unzipper":"^0.10.11"},"gitHead":"e5764f753181ed6a7c615cd4fc6682aacf0cb7cd"}');
+module.exports = JSON.parse('{"name":"@abtnode/core","publishConfig":{"access":"public"},"version":"1.16.37","description":"","main":"lib/index.js","files":["lib"],"scripts":{"lint":"eslint tests lib --ignore-pattern \'tests/assets/*\'","lint:fix":"eslint --fix tests lib","test":"node tools/jest.js","coverage":"npm run test -- --coverage"},"keywords":[],"author":"wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)","license":"Apache-2.0","dependencies":{"@abtnode/analytics":"1.16.37","@abtnode/auth":"1.16.37","@abtnode/certificate-manager":"1.16.37","@abtnode/constant":"1.16.37","@abtnode/cron":"1.16.37","@abtnode/logger":"1.16.37","@abtnode/models":"1.16.37","@abtnode/queue":"1.16.37","@abtnode/rbac":"1.16.37","@abtnode/router-provider":"1.16.37","@abtnode/static-server":"1.16.37","@abtnode/timemachine":"1.16.37","@abtnode/util":"1.16.37","@abtnode/docker-utils":"1.16.37","@arcblock/did":"1.19.2","@arcblock/did-auth":"1.19.2","@arcblock/did-ext":"^1.19.2","@arcblock/did-motif":"^1.1.13","@arcblock/did-util":"1.19.2","@arcblock/event-hub":"1.19.2","@arcblock/jwt":"^1.19.2","@arcblock/pm2-events":"^0.0.5","@arcblock/validator":"^1.19.2","@arcblock/vc":"1.19.2","@blocklet/constant":"1.16.37","@blocklet/did-space-js":"^1.0.1","@blocklet/env":"1.16.37","@blocklet/meta":"1.16.37","@blocklet/resolver":"1.16.37","@blocklet/sdk":"1.16.37","@blocklet/store":"1.16.37","@fidm/x509":"^1.2.1","@ocap/mcrypto":"1.19.2","@ocap/util":"1.19.2","@ocap/wallet":"1.19.2","@slack/webhook":"^5.0.4","archiver":"^7.0.1","axios":"^1.7.9","axon":"^2.0.3","chalk":"^4.1.2","cross-spawn":"^7.0.3","deep-diff":"^1.0.2","detect-port":"^1.5.1","envfile":"^7.1.0","escape-string-regexp":"^4.0.0","fast-glob":"^3.3.2","filesize":"^10.1.1","flat":"^5.0.2","fs-extra":"^11.2.0","get-port":"^5.1.1","hasha":"^5.2.2","is-base64":"^1.1.0","is-cidr":"4","is-ip":"3","is-url":"^1.2.4","joi":"17.12.2","joi-extension-semver":"^5.0.0","js-yaml":"^4.1.0","kill-port":"^2.0.1","lodash":"^4.17.21","lru-cache":"^11.0.2","node-stream-zip":"^1.15.0","p-all":"^3.0.0","p-limit":"^3.1.0","p-map":"^4.0.0","p-retry":"^4.6.2","read-last-lines":"^1.8.0","semver":"^7.6.3","sequelize":"^6.35.0","shelljs":"^0.8.5","ssri":"^8.0.1","stream-throttle":"^0.1.3","stream-to-promise":"^3.0.0","systeminformation":"^5.23.3","tail":"^2.2.4","tar":"^6.1.11","transliteration":"^2.3.5","ua-parser-js":"^1.0.2","ufo":"^1.5.3","uuid":"^9.0.1","valid-url":"^1.0.9","which":"^2.0.2","xbytes":"^1.8.0"},"devDependencies":{"expand-tilde":"^2.0.2","express":"^4.18.2","jest":"^29.7.0","unzipper":"^0.10.11"},"gitHead":"e5764f753181ed6a7c615cd4fc6682aacf0cb7cd"}');
 
 /***/ }),
 

package/lib/blocklet/project/create-pack-release.js

@@ -11,6 +11,7 @@ const { update: updateMetaFile, read: readMetaFile } = require('@blocklet/meta/l
 const { createRelease: createBlockletRelease } = require('@abtnode/util/lib/create-blocklet-release');
 const { hasStartEngine } = require('@blocklet/meta/lib/util');
 const { convertToMoniker } = require('@abtnode/util/lib/transfer-to-moniker');
+const { parseDockerArgsToSchema, dockerParseEnvironments, dockerParsePublishPorts } = require('@abtnode/docker-utils');
 
 const logger = require('@abtnode/logger')('blocklet-studio-pack');
 
@@ -42,6 +43,8 @@ const createPackRelease = async ({
   blockletCommunity,
   blockletRepository,
   blockletVideos,
+  blockletDocker,
+  contentType,
   manager,
   status,
 }) => {
@@ -67,6 +70,8 @@ const createPackRelease = async ({
     blockletCommunity,
     blockletRepository,
     blockletVideos,
+    blockletDocker,
+    contentType,
   };
 
   const releaseSchema = createReleaseSchema(status);
@@ -103,7 +108,7 @@ const createPackRelease = async ({
 
   const projectDir = path.join(blocklet.env.dataDir, PROJECT.DIR, `${projectId}`);
 
-  if (status !== PROJECT.RELEASE_STATUS.draft) {
+  if (status !== PROJECT.RELEASE_STATUS.draft && !blockletDocker?.dockerImage) {
     await checkResourceExists(projectDir, action, releaseId);
   }
 
@@ -217,6 +222,15 @@ const createPackRelease = async ({
         return res;
       });
 
+    let dockerYml;
+    if (blockletDocker?.dockerImage) {
+      const { error, value } = parseDockerArgsToSchema(blockletDocker.dockerImage, blockletDocker.dockerArgs);
+      if (error) {
+        throw new Error(`Docker args is invalid: ${error.message}`);
+      }
+      dockerYml = value;
+    }
+
     // create blocklet.yml
     const meta = {
       did: blockletDid,
@@ -239,6 +253,21 @@ const createPackRelease = async ({
       videos: blockletVideos || [],
     };
 
+    if (blockletDocker?.dockerImage && dockerYml) {
+      meta.group = 'dapp';
+      meta.docker = dockerYml;
+      meta.environments = dockerParseEnvironments(blockletDocker.dockerEnvs, true);
+      if (!meta.interfaces) {
+        meta.interfaces = [];
+      }
+      meta.timeout = {
+        start: 120,
+        script: 120,
+      };
+
+      meta.interfaces.push(...dockerParsePublishPorts(blockletDocker.dockerImage, blockletDocker.dockerArgs));
+    }
+
     // merge extended blocklet.yml
     const extendedMetaFile = getExtendedMetaFile({ app: blocklet, projectId, releaseId });
     if (fs.existsSync(extendedMetaFile)) {

package/lib/blocklet/project/index.js

@@ -8,7 +8,6 @@ const { createRelease: createBlockletRelease } = require('@abtnode/util/lib/crea
 const { titleSchema } = require('@blocklet/meta/lib/schema');
 const { validateNewDid } = require('@blocklet/meta/lib/name');
 const { convertToMoniker } = require('@abtnode/util/lib/transfer-to-moniker');
-
 const logger = require('@abtnode/logger')('blocklet-studio');
 
 const { createReleaseSchema } = require('../../validators/project');
@@ -184,6 +183,8 @@ const createRelease = async ({
   uploadedResource,
   blockletComponents,
   blockletResourceType,
+  blockletDocker,
+  contentType,
   note,
   manager,
   status,
@@ -214,6 +215,8 @@ const createRelease = async ({
     blockletVideos,
     uploadedResource,
     blockletResourceType,
+    blockletDocker,
+    contentType,
     note,
   };
 
@@ -228,7 +231,7 @@ const createRelease = async ({
     throw new Error('project not found');
   }
 
-  const isPack = blockletComponents?.length > 0;
+  const isPack = blockletComponents?.length > 0 || !!blockletDocker?.dockerImage;
 
   if (isPack) {
     return createPackRelease({
@@ -248,6 +251,8 @@ const createRelease = async ({
       blockletScreenshots,
       blockletComponents,
       blockletResourceType,
+      blockletDocker,
+      contentType,
       note,
       manager,
       status,

package/lib/states/release.js

@@ -35,6 +35,8 @@ class Release extends BaseState {
       'blockletSupport',
       'blockletCommunity',
       'blockletRepository',
+      'blockletDocker',
+      'contentType',
       'publishedStoreIds',
       'blockletComponents',
       'uploadedResource',

package/lib/util/blocklet.js

@@ -714,6 +714,7 @@ const startBlockletProcess = async (
               ports: b.ports,
               onlyStart,
               dockerNetworkName,
+              rootBlocklet: blocklet,
             });
 
       await pm2.startAsync(nextOptions);

package/lib/util/docker/blocklet-custom-dockerfile.js

@@ -1,9 +1,10 @@
 const path = require('path');
 const fs = require('fs');
 const md5 = require('@abtnode/util/lib/md5');
+const { dockerArgsToCamelCase } = require('@abtnode/docker-utils');
 const debianDockerfile = require('./debian-dockerfile');
 
-function getBlockletCustomDockerfile({ appDir, dataDir, meta, ports }) {
+function getBlockletCustomDockerfile({ appDir, dataDir, meta, ports, env }) {
   const dockerMeta = meta.docker || {};
   if (!dockerMeta.image && !dockerMeta.dockerfile) {
     return debianDockerfile;
@@ -46,7 +47,7 @@ function getBlockletCustomDockerfile({ appDir, dataDir, meta, ports }) {
     }
   }
 
-  const volumes = (dockerMeta.volumes || [])
+  const volumes = (dockerMeta.volume || [])
     .map((volume) => {
       const [a, b] = volume.split(':');
       const hostDir = a.replace('$BLOCKLET_DATA_DIR', dataDir).replace('$BLOCKLET_APP_DIR', appDir);
@@ -75,6 +76,31 @@ function getBlockletCustomDockerfile({ appDir, dataDir, meta, ports }) {
     throw new Error('Detected forbidden volume mount (-v) in docker args');
   }
 
+  const otherRunParams = {
+    '--attach': dockerMeta.attach || '',
+    '--quiet': dockerMeta.quiet || '',
+    '--user': dockerMeta.user || '',
+    '--workdir': dockerMeta.workdir || '',
+    '--cidfile': dockerMeta.cidfile || '',
+    '--detach-keys': dockerMeta.detachKeys || '',
+    '--disable-content-trust': dockerMeta.disableContentTrust || '',
+    '--domainname': dockerMeta.domainname || '',
+    '--expose': dockerMeta.expose || '',
+    '--ip': dockerMeta.ip || '',
+    '--link-local-ip': dockerMeta.linkLocalIp || '',
+    '--platform': dockerMeta.platform || '',
+  };
+  Object.entries(otherRunParams).forEach(([key, value]) => {
+    if (value === `$${dockerArgsToCamelCase(key)}`) {
+      otherRunParams[key] = env[dockerArgsToCamelCase(key)] || '';
+    }
+  });
+
+  const runParamString = Object.entries(otherRunParams)
+    .filter(([, value]) => value !== '')
+    .map(([key, value]) => `${key} ${value}`)
+    .join(' ');
+
   return {
     dockerfile: file,
     image: dockerMeta.image || `blocklet_custom_${hash.slice(0, 16)}`,
@@ -86,6 +112,7 @@ function getBlockletCustomDockerfile({ appDir, dataDir, meta, ports }) {
     args: dockerMeta.command || '',
     script: dockerMeta.script || dockerMeta.installNodeModules ? '' : 'tail -f /dev/null',
     installNodeModules: !!dockerMeta.installNodeModules,
+    runParamString,
   };
 }
 

package/lib/util/docker/docker-exec-chown.js

@@ -11,16 +11,31 @@ const lockFile = new LockFile(
   1000 * 60 * 2
 );
 
-async function dockerExecChown(name, targetDirs) {
-  const uid = process.getuid();
-  const gid = process.getgid();
+let safedDataAndBlocklets = false;
+
+async function dockerExecChown(name, targetDirs, code = 777) {
   const { image, baseDir } = debianDockerfile;
+
+  // 将 data、blocklets、logs 目录设置为 750 权限，防止因为修改子目录权限，其他组可以访问这三个目录的子目录
+  if (!safedDataAndBlocklets && process.env.ABT_NODE_DATA_DIR && code !== 750) {
+    safedDataAndBlocklets = true;
+    await dockerExecChown(
+      'safe-data-blocklets-logs',
+      [
+        path.join(process.env.ABT_NODE_DATA_DIR, 'blocklets'),
+        path.join(process.env.ABT_NODE_DATA_DIR, 'data'),
+        path.join(process.env.ABT_NODE_DATA_DIR, 'logs'),
+      ],
+      750
+    );
+  }
+
   const dirs = targetDirs.filter((dir) => fs.existsSync(dir));
   const volumes = dirs
     .map((dir) => `-v ${dir}:${path.join(baseDir, dir.replace(process.env.ABT_NODE_DATA_DIR, ''))}:rw`)
     .join(' ');
   const command = dirs
-    .map((dir) => `chown -R ${uid}:${gid} ${path.join(baseDir, dir.replace(process.env.ABT_NODE_DATA_DIR, ''))}`)
+    .map((dir) => `chmod -R ${code} ${path.join(baseDir, dir.replace(process.env.ABT_NODE_DATA_DIR, ''))}`)
     .join(' && ');
   const realName = parseDockerName(name, 'docker-exec-chown');
   const startTime = Date.now();

package/lib/util/docker/parse-docker-options-from-pm2.js

@@ -8,7 +8,11 @@ const os = require('os');
 const logger = require('@abtnode/logger')('@abtnode/docker');
 const { existsSync, writeFileSync } = require('fs-extra');
 const { NODE_MODES } = require('@abtnode/constant');
+const promiseSpawn = require('@abtnode/util/lib/promise-spawn');
 const getLocalIPAddress = require('@abtnode/util/lib/get-local-ip-address');
+const { getObjByPath } = require('@abtnode/docker-utils');
+const { isValid: isDid } = require('@arcblock/did');
+
 const parseDockerName = require('./parse-docker-name');
 const { createDockerImage } = require('./create-docker-image');
 const checkNeedRunDocker = require('./check-need-run-docker');
@@ -36,6 +40,7 @@ async function parseDockerOptionsFromPm2({
   nodeInfo,
   meta,
   ports,
+  rootBlocklet,
   overrideScript,
   dockerNamePrefix = 'blocklet',
   isDockerRm = false,
@@ -54,6 +59,7 @@ async function parseDockerOptionsFromPm2({
       dataDir: options.env.BLOCKLET_DATA_DIR,
       meta,
       ports,
+      env: options.env,
     })),
   };
 
@@ -136,7 +142,8 @@ async function parseDockerOptionsFromPm2({
     dockerInfo.network = `--network ${network}`;
     Object.keys(ports).forEach((key) => {
       const port = ports[key];
-      dockerInfo.network += ` -p 127.0.0.1:${port}:${port}`;
+      const inter = meta.interfaces?.find((x) => x.port === key);
+      dockerInfo.network += ` -p ${inter?.hostIP || '127.0.0.1'}:${port}:${inter?.containerPort || port}`;
     });
     if (nextOptions.env.ALLOW_DOCKER_HOST_ACCESS) {
       dockerInfo.network += ' --add-host=host.docker.internal:host-gateway';
@@ -144,6 +151,50 @@ async function parseDockerOptionsFromPm2({
     dockerEnv.BLOCKLET_DOCKER_NETWORK = network;
   }
 
+  const needGetVars = Object.keys(dockerEnv).filter((key) => {
+    const value = dockerEnv[key];
+    if (
+      typeof value === 'string' &&
+      value.startsWith('z') &&
+      !key.startsWith('BLOCKLET_') &&
+      !key.startsWith('ABT_NODE_')
+    ) {
+      const [prefix, rest] = value.split('-');
+      return isDid(prefix) && rest;
+    }
+    return false;
+  });
+
+  // 读取 env 和 ports 的值
+  // zxxxxxxxx-host 读取 host
+  // zxxxxxxxx-env.aaa 读取 env
+  // zxxxxxxxx-port 读取 port
+  // zxxxxxxxx-ports.xxx 读取其他 port
+  for (const envKey of needGetVars) {
+    const [did, ...rest] = dockerEnv[envKey].split('-');
+    const matchingBlocklet = rootBlocklet.children.find((blocklet) => blocklet.meta && blocklet.meta.did === did);
+    if (!matchingBlocklet) {
+      continue;
+    }
+    const envMap = {};
+    matchingBlocklet.configs?.forEach((config) => {
+      envMap[config.key] = config.value || config.default;
+    });
+    const value = getObjByPath(
+      {
+        env: envMap,
+        ports: matchingBlocklet.ports,
+        host: parseDockerName(`${rootBlocklet.meta.did}-${matchingBlocklet.meta.name}`, dockerNamePrefix),
+        port: matchingBlocklet.ports?.BLOCKLET_PORT,
+      },
+      rest.join('-')
+    );
+
+    if (value) {
+      dockerEnv[envKey] = value;
+    }
+  }
+
   let nodeModulesName = 'node_modules';
   let installScript = '';
   const appDir = nextOptions.env.BLOCKLET_APP_DIR;
@@ -178,7 +229,10 @@ async function parseDockerOptionsFromPm2({
 
   let runScript = dockerInfo.script || '';
   if (!runScript && dockerInfo.installNodeModules) {
-    runScript = /(npm|yarn|pnpm|bun)/g.test(nextOptions.script) ? nextOptions.script : `node ${nextOptions.script}`;
+    const maxOldSpaceSize = Math.floor(Number(dockerEnv.BLOCKLET_DOCKER_MEMORY.replace('g', '')) * 0.8 * 1024);
+    runScript = /(npm|yarn|pnpm|bun)/g.test(nextOptions.script)
+      ? nextOptions.script
+      : `node --max-old-space-size=${maxOldSpaceSize} ${nextOptions.script}`;
   }
 
   const runScripts = ['preInstall', '--installScript--', 'postInstall', 'preFlight', 'preStart', '--runScript--']
@@ -306,25 +360,32 @@ async function parseDockerOptionsFromPm2({
       `mkdir -p ${dockerEnv.BLOCKLET_CACHE_DIR} || :`,
       'mkdir -p /.local || :',
       `mkdir -p ${path.join(baseDir, '.npm')} || :`,
-      `chown ${uid}:${gid} ${baseDir} || :`,
-      `chown -R ${uid}:${gid} /.local || :`,
-      `chown -R ${uid}:${gid} ${path.join(baseDir, 'dockerTemp')} || :`,
-      `chown -R ${uid}:${gid} ${dockerEnv.BLOCKLET_APP_DIR} || :`,
-      `chown -R ${uid}:${gid} ${dockerEnv.BLOCKLET_DATA_DIR} || :`,
-      `chown -R ${uid}:${gid} ${dockerEnv.BLOCKLET_LOG_DIR} || :`,
-      `chown -R ${uid}:${gid} ${dockerEnv.BLOCKLET_CACHE_DIR} || :`,
-      `chown -R ${uid}:${gid} ${dockerEnv.BLOCKLET_SHARE_DIR} || :`,
-      `chown -R ${uid}:${gid} ${path.join(dockerEnv.BLOCKLET_APP_DATA_DIR, '.projects')} || :`,
+      `chmod 777 ${baseDir} || :`,
+      'chmod 777 /.local || :',
+      `chmod 777 ${path.join(baseDir, 'dockerTemp')} || :`,
+      `chmod 777 ${dockerEnv.BLOCKLET_APP_DIR} || :`,
+      `chmod 777 ${dockerEnv.BLOCKLET_DATA_DIR} || :`,
+      `chmod 777 ${dockerEnv.BLOCKLET_LOG_DIR} || :`,
+      `chmod 777 ${dockerEnv.BLOCKLET_CACHE_DIR} || :`,
+      `chmod 777 ${dockerEnv.BLOCKLET_SHARE_DIR} || :`,
+      `chmod 777 ${path.join(dockerEnv.BLOCKLET_APP_DATA_DIR, '.projects')} || :`,
     ],
     name,
     userCommands: [`cd ${dockerEnv.BLOCKLET_APP_DIR}`, ...runScripts],
     baseDir,
     scriptDir: dockerTempDir,
   });
+
+  let user = '';
+  if (meta.docker?.image && !!meta.docker?.useUidGid) {
+    user = `-u ${uid}:${gid}`;
+  }
+
   nextOptions.script = `
   docker rm -fv ${name} > /dev/null 2>&1 || true && \
   ${awaitRestart} \
   docker run ${isDockerRm ? '--rm' : ''} --name ${name} \
+  ${user} \
   ${volumes} \
   ${dockerInfo.volumes || ''} \
   -v ${dockerTempDir}:${path.join(baseDir, 'dockerTemp')}:rw \
@@ -333,6 +394,7 @@ async function parseDockerOptionsFromPm2({
   --memory="${dockerEnv.BLOCKLET_DOCKER_MEMORY}" \
   --env-file ${dockerEnvFile} \
   ${dockerInfo.network} \
+  ${dockerInfo.runParamString || ''} \
   ${dockerInfo.image} ${dockerInfo.command || ''} \
   ${dockerInfo.runBaseScript ? `sh ${path.join(baseDir, 'dockerTemp', `root-script-${name}.sh`)}` : ''}
   `;
@@ -372,6 +434,10 @@ async function parseDockerOptionsFromPm2({
     }
   }
 
+  if (meta.docker?.image) {
+    await promiseSpawn(`docker pull ${meta.docker.image}`, {}, { timeout: 120 * 1000, retry: 0 });
+  }
+
   return nextOptions;
 }
 

package/lib/validators/project.js

@@ -63,6 +63,39 @@ const createReleaseSchema = (status) =>
         required: Joi.boolean().allow(null),
       })
     ),
+    contentType: Joi.string().valid('blocklet', 'upload', 'docker'),
+    blockletDocker: Joi.object({
+      dockerImage: Joi.string().allow('').default(''),
+      dockerArgs: Joi.array()
+        .items(
+          Joi.object({
+            key: Joi.string().required(),
+            value: Joi.alternatives()
+              .try(Joi.string().required(), Joi.array().items(Joi.string().required()))
+              .required(),
+            type: Joi.string().valid('docker', 'web').default('docker'),
+            port: Joi.string().optional().allow('').default(''),
+            prefix: Joi.string().optional().allow('').default(''),
+            path: Joi.string().optional().allow('').default('/'),
+            name: Joi.string().optional().allow('').default(''),
+            protocol: Joi.string().optional().allow('').default(''),
+          })
+        )
+        .default([]),
+      dockerEnvs: Joi.array()
+        .items(
+          Joi.object({
+            key: Joi.string().required(),
+            value: Joi.string().optional().allow('').default(''),
+            description: Joi.string().optional().allow('').default(''),
+            secure: Joi.boolean().optional().default(false),
+            shared: Joi.boolean().optional().default(false),
+            required: Joi.boolean().optional().default(false),
+            custom: Joi.string().optional().allow('').default(''),
+          })
+        )
+        .default([]),
+    }).optional(),
     uploadedResource,
   });
 

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.37",
+  "version": "1.16.38-beta-20250108-235929-17742885",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,19 +19,20 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/analytics": "1.16.37",
-    "@abtnode/auth": "1.16.37",
-    "@abtnode/certificate-manager": "1.16.37",
-    "@abtnode/constant": "1.16.37",
-    "@abtnode/cron": "1.16.37",
-    "@abtnode/logger": "1.16.37",
-    "@abtnode/models": "1.16.37",
-    "@abtnode/queue": "1.16.37",
-    "@abtnode/rbac": "1.16.37",
-    "@abtnode/router-provider": "1.16.37",
-    "@abtnode/static-server": "1.16.37",
-    "@abtnode/timemachine": "1.16.37",
-    "@abtnode/util": "1.16.37",
+    "@abtnode/analytics": "1.16.38-beta-20250108-235929-17742885",
+    "@abtnode/auth": "1.16.38-beta-20250108-235929-17742885",
+    "@abtnode/certificate-manager": "1.16.38-beta-20250108-235929-17742885",
+    "@abtnode/constant": "1.16.38-beta-20250108-235929-17742885",
+    "@abtnode/cron": "1.16.38-beta-20250108-235929-17742885",
+    "@abtnode/docker-utils": "1.16.38-beta-20250108-235929-17742885",
+    "@abtnode/logger": "1.16.38-beta-20250108-235929-17742885",
+    "@abtnode/models": "1.16.38-beta-20250108-235929-17742885",
+    "@abtnode/queue": "1.16.38-beta-20250108-235929-17742885",
+    "@abtnode/rbac": "1.16.38-beta-20250108-235929-17742885",
+    "@abtnode/router-provider": "1.16.38-beta-20250108-235929-17742885",
+    "@abtnode/static-server": "1.16.38-beta-20250108-235929-17742885",
+    "@abtnode/timemachine": "1.16.38-beta-20250108-235929-17742885",
+    "@abtnode/util": "1.16.38-beta-20250108-235929-17742885",
     "@arcblock/did": "1.19.2",
     "@arcblock/did-auth": "1.19.2",
     "@arcblock/did-ext": "^1.19.2",
@@ -42,13 +43,13 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "^1.19.2",
     "@arcblock/vc": "1.19.2",
-    "@blocklet/constant": "1.16.37",
+    "@blocklet/constant": "1.16.38-beta-20250108-235929-17742885",
     "@blocklet/did-space-js": "^1.0.1",
-    "@blocklet/env": "1.16.37",
-    "@blocklet/meta": "1.16.37",
-    "@blocklet/resolver": "1.16.37",
-    "@blocklet/sdk": "1.16.37",
-    "@blocklet/store": "1.16.37",
+    "@blocklet/env": "1.16.38-beta-20250108-235929-17742885",
+    "@blocklet/meta": "1.16.38-beta-20250108-235929-17742885",
+    "@blocklet/resolver": "1.16.38-beta-20250108-235929-17742885",
+    "@blocklet/sdk": "1.16.38-beta-20250108-235929-17742885",
+    "@blocklet/store": "1.16.38-beta-20250108-235929-17742885",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.19.2",
     "@ocap/util": "1.19.2",
@@ -108,5 +109,5 @@
     "jest": "^29.7.0",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "3e06fd31ca113b7555c3eec22c9087e256b92f44"
+  "gitHead": "09d67442bff28543c35824a41c23bea3b75a2a23"
 }