@blocklet/meta 1.16.37 → 1.16.38-beta-20250108-235929-17742885

package/lib/engine.js

@@ -36,7 +36,7 @@ const isGatewayBlocklet = (meta) => meta?.group === constant_1.BlockletGroup.gat
 exports.isGatewayBlocklet = isGatewayBlocklet;
 const isPackBlocklet = (meta) => meta?.group === constant_1.BlockletGroup.pack;
 exports.isPackBlocklet = isPackBlocklet;
-const hasStartEngine = (meta) => !!meta?.main || (0, exports.getBlockletEngine)((meta || {})).interpreter === 'blocklet';
+const hasStartEngine = (meta) => !!meta?.main || !!meta?.docker?.image || (0, exports.getBlockletEngine)((meta || {})).interpreter === 'blocklet';
 exports.hasStartEngine = hasStartEngine;
 const hasMountPoint = (meta) => ((0, exports.hasStartEngine)(meta) || (meta?.interfaces || []).find((x) => x.type === constant_1.BLOCKLET_INTERFACE_TYPE_WEB)) &&
     (0, exports.isGatewayBlocklet)(meta) === false;

package/lib/schema.js

@@ -45,6 +45,7 @@ const joi_extension_semver_1 = require("joi-extension-semver");
 const is_var_name_1 = __importDefault(require("is-var-name"));
 const constant_1 = require("@abtnode/constant");
 const did_1 = require("@arcblock/did");
+const docker_utils_1 = require("@abtnode/docker-utils");
 const constant_2 = require("@blocklet/constant");
 const did_2 = __importDefault(require("./did"));
 const extension_1 = require("./extension");
@@ -739,25 +740,14 @@ const createBlockletSchema = (baseDir, { ensureFiles = false, ensureDist = false
         name: ensureName ? Joi.string().optional() : Joi.string().required(),
         // only using docker
         egress: Joi.boolean().optional().default(true),
-        docker: Joi.object({
-            workdir: Joi.string().trim(),
-            image: Joi.string().trim().optional(),
-            dockerfile: ensureFiles ? Joi.file().trim().exists({ baseDir }).optional() : Joi.string().trim().optional(),
-            shell: Joi.string().trim().optional(),
-            network: Joi.string().valid('host', 'bridge', 'none').default('host').optional(),
-            volumes: Joi.array().items(Joi.string().trim()).optional(),
-            script: Joi.string().trim().optional(),
-            installNodeModules: Joi.boolean().optional(),
-            command: Joi.string().trim().optional(),
-            runBaseScript: Joi.boolean().optional(),
-        }).optional(),
+        docker: docker_utils_1.dockerSchema,
     })
         .options({ stripUnknown: true, noDefaults: false, ...schemaOptions })
         .rename('children', 'components')
         .custom((data, helper) => {
         const { did, name, docker } = data;
         if (docker) {
-            const { image, dockerfile, exportPorts, network } = docker;
+            const { image, dockerfile, network } = docker;
             if (!image && !dockerfile) {
                 // @ts-ignore
                 return helper.message('Image or dockerfile must be set');
@@ -766,14 +756,10 @@ const createBlockletSchema = (baseDir, { ensureFiles = false, ensureDist = false
                 // @ts-ignore
                 return helper.message('Image and dockerfile cannot be set at the same time');
             }
-            if (exportPorts && network) {
+            if (network) {
                 // @ts-ignore
                 return helper.message('ExportPorts and network cannot be set at the same time');
             }
-            if (!exportPorts && !network) {
-                // @ts-ignore
-                return helper.message('ExportPorts or network must be set');
-            }
             if (dockerfile) {
                 if (!data.files) {
                     data.files = [];

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.37",
+  "version": "1.16.38-beta-20250108-235929-17742885",
   "description": "Library to parse/validate/fix blocklet meta",
   "main": "./lib/index.js",
   "typings": "./lib/index.d.ts",
@@ -25,12 +25,13 @@
   "author": "wangshijun <wangshijun2020@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/constant": "1.16.37",
+    "@abtnode/constant": "1.16.38-beta-20250108-235929-17742885",
+    "@abtnode/docker-utils": "1.16.38-beta-20250108-235929-17742885",
     "@arcblock/did": "1.19.2",
     "@arcblock/did-ext": "1.19.2",
     "@arcblock/did-util": "1.19.2",
     "@arcblock/jwt": "1.19.2",
-    "@blocklet/constant": "1.16.37",
+    "@blocklet/constant": "1.16.38-beta-20250108-235929-17742885",
     "@ocap/asset": "1.19.2",
     "@ocap/mcrypto": "1.19.2",
     "@ocap/types": "1.19.2",
@@ -79,5 +80,5 @@
     "ts-node": "^10.9.1",
     "typescript": "^5.6.3"
   },
-  "gitHead": "3e06fd31ca113b7555c3eec22c9087e256b92f44"
+  "gitHead": "09d67442bff28543c35824a41c23bea3b75a2a23"
 }