@zintrust/core 0.1.43 → 0.1.46

package/README.md

@@ -24,6 +24,7 @@ Your API is now running at `http://localhost:7777`
 If you’re targeting a different runtime:
 
 - Cloudflare Workers (Wrangler): `zin start --wg`
+- Cloudflare Containers proxy (Wrangler + Docker): `zin init:containers-proxy` then `zin docker -e staging`
 - AWS Lambda adapter mode: `zin start --lambda`
 - Deno adapter mode: `zin start --deno`
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zintrust/core",
-  "version": "0.1.43",
+  "version": "0.1.46",
   "description": "Production-grade TypeScript backend framework for JavaScript",
   "homepage": "https://zintrust.com",
   "repository": {
@@ -49,6 +49,7 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
+    "@cloudflare/containers": "^0.1.0",
     "@zintrust/workers": "^0.1.31",
     "bcryptjs": "^3.0.3",
     "bullmq": "^5.69.3",
@@ -65,6 +66,7 @@
     "node-forge": "1.3.3",
     "cross-spawn": "^7.0.5",
     "glob": "^11.1.0",
+    "minimatch": "^10.2.1",
     "undici": "^6.23.0"
   },
   "bin": {

package/packages/workers/src/http/middleware/FeaturesValidator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FeaturesValidator.d.ts","sourceRoot":"","sources":["../../../../../../packages/workers/src/http/middleware/FeaturesValidator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,KAAK,QAAQ,EAAE,KAAK,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAEvE,MAAM,MAAM,YAAY,GAAG,CAAC,GAAG,EAAE,QAAQ,EAAE,GAAG,EAAE,SAAS,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;AA8BnF,eAAO,MAAM,sBAAsB,GAAI,SAAS,YAAY,KAAG,YAiD9D,CAAC"}
+{"version":3,"file":"FeaturesValidator.d.ts","sourceRoot":"","sources":["../../../../../../packages/workers/src/http/middleware/FeaturesValidator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,KAAK,QAAQ,EAAE,KAAK,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAEvE,MAAM,MAAM,YAAY,GAAG,CAAC,GAAG,EAAE,QAAQ,EAAE,GAAG,EAAE,SAAS,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;AAgBnF,eAAO,MAAM,sBAAsB,GAAI,SAAS,YAAY,KAAG,YAoD9D,CAAC"}

package/packages/workers/src/http/middleware/FeaturesValidator.js

@@ -20,8 +20,8 @@ export const withFeaturesValidation = (handler) => {
             if (!features) {
                 return handler(req, res); // Skip validation if features is not provided
             }
-            // Check if features is an object
-            if (typeof features !== 'object' || features === null || Array.isArray(features)) {
+            const isPlainObject = Object.prototype.toString.call(features) === '[object Object]' && !Array.isArray(features);
+            if (!isPlainObject) {
                 return res.setStatus(400).json({
                     error: 'Invalid features configuration',
                     message: 'Features must be an object',
@@ -29,7 +29,8 @@ export const withFeaturesValidation = (handler) => {
                 });
             }
             // Validate each feature key and value
-            const featureKeys = Object.keys(features);
+            const featuresObj = features;
+            const featureKeys = Object.keys(featuresObj);
             for (const key of featureKeys) {
                 if (!VALID_FEATURES.has(key)) {
                     return res.setStatus(400).json({
@@ -38,7 +39,7 @@ export const withFeaturesValidation = (handler) => {
                         code: 'INVALID_FEATURE',
                     });
                 }
-                const value = features[key];
+                const value = featuresObj[key];
                 if (typeof value !== 'boolean') {
                     return res.setStatus(400).json({
                         error: 'Invalid feature value',

package/src/cli/CLI.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CLI.d.ts","sourceRoot":"","sources":["../../../src/cli/CLI.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAiEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAIpC,MAAM,WAAW,IAAI;IACnB,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACnC,UAAU,IAAI,OAAO,CAAC;CACvB;AAuPD;;;;;;;GAOG;AACH,eAAO,MAAM,GAAG;cACJ,IAAI;EAed,CAAC"}
+{"version":3,"file":"CLI.d.ts","sourceRoot":"","sources":["../../../src/cli/CLI.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAqEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAIpC,MAAM,WAAW,IAAI;IACnB,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACnC,UAAU,IAAI,OAAO,CAAC;CACvB;AA2PD;;;;;;;GAOG;AACH,eAAO,MAAM,GAAG;cACJ,IAAI;EAed,CAAC"}

package/src/cli/CLI.js

@@ -14,10 +14,14 @@ import { DbSeedCommand } from './commands/DbSeedCommand.js';
 import { DebugCommand } from './commands/DebugCommand.js';
 import { DeployCommand } from './commands/DeployCommand.js';
 import { DeployContainerProxiesCommand } from './commands/DeployContainerProxiesCommand.js';
+import { DeployContainersProxyCommand } from './commands/DeployContainersProxyCommand.js';
 import { DeployContainerWorkersCommand } from './commands/DeployContainerWorkersCommand.js';
+import { DockerCommand } from './commands/DockerCommand.js';
+import { DockerPushCommand } from './commands/DockerPushCommand.js';
 import { DoctorArchitectureCommand } from './commands/DoctorArchitectureCommand.js';
 import { FixCommand } from './commands/FixCommand.js';
 import { InitContainerCommand } from './commands/InitContainerCommand.js';
+import { InitContainersProxyCommand } from './commands/InitContainersProxyCommand.js';
 import { InitEcosystemCommand } from './commands/InitEcosystemCommand.js';
 import { InitProducerCommand } from './commands/InitProducerCommand.js';
 import { InitProxyCommand } from './commands/InitProxyCommand.js';
@@ -75,6 +79,7 @@ const buildCommandRegistry = () => {
         UpgradeCommand.create(),
         PrepareCommand,
         InitContainerCommand.create(),
+        InitContainersProxyCommand.create(),
         InitProxyCommand.create(),
         InitProducerCommand.create(),
         InitEcosystemCommand.create(),
@@ -84,6 +89,8 @@ const buildCommandRegistry = () => {
         CreateMigrationCommand.create(),
         AddMigrationCommand.create(),
         StartCommand.create(),
+        DockerCommand.create(),
+        DockerPushCommand.create(),
         QueueCommand.create(),
         QueueRecoveryCommand.create(),
         ScheduleListCommand.create(),
@@ -106,6 +113,7 @@ const buildCommandRegistry = () => {
         PublishCommand.create(),
         PutCommand.create(),
         DeployCommand.create(),
+        DeployContainersProxyCommand.create(),
         DeployContainerWorkersCommand.create(),
         DeployContainerProxiesCommand.create(),
         QACommand(),

package/src/cli/commands/ContainerComposeLifecycle.d.ts

@@ -0,0 +1,20 @@
+type ComposeBuildOptions = {
+    noCache?: boolean;
+    pull?: boolean;
+};
+type ComposeUpOptions = {
+    detach?: boolean;
+    removeOrphans?: boolean;
+};
+type ComposeDownOptions = {
+    volumes?: boolean;
+    removeOrphans?: boolean;
+};
+export declare const ContainerComposeLifecycle: Readonly<{
+    normalizeAction<const Allowed extends readonly string[]>(raw: string | undefined, allowed: Allowed, usageMessage: string): Allowed[number];
+    runBuild(composePath: string, options: ComposeBuildOptions, logMessage: string): Promise<void>;
+    runUp(composePath: string, options: ComposeUpOptions, logMessage: string): Promise<void>;
+    runDown(composePath: string, options: ComposeDownOptions, logMessage: string): Promise<void>;
+}>;
+export {};
+//# sourceMappingURL=ContainerComposeLifecycle.d.ts.map

package/src/cli/commands/ContainerComposeLifecycle.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ContainerComposeLifecycle.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/ContainerComposeLifecycle.ts"],"names":[],"mappings":"AAIA,KAAK,mBAAmB,GAAG;IACzB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB,CAAC;AAEF,KAAK,gBAAgB,GAAG;IACtB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB,CAAC;AAEF,KAAK,kBAAkB,GAAG;IACxB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB,CAAC;AAEF,eAAO,MAAM,yBAAyB;0BACd,OAAO,SAAS,SAAS,MAAM,EAAE,OAChD,MAAM,GAAG,SAAS,WACd,OAAO,gBACF,MAAM,GACnB,OAAO,CAAC,MAAM,CAAC;0BASH,MAAM,WACV,mBAAmB,cAChB,MAAM,GACjB,OAAO,CAAC,IAAI,CAAC;uBAeS,MAAM,WAAW,gBAAgB,cAAc,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;yBAgB/E,MAAM,WACV,kBAAkB,cACf,MAAM,GACjB,OAAO,CAAC,IAAI,CAAC;EAchB,CAAC"}

package/src/cli/commands/ContainerComposeLifecycle.js

@@ -0,0 +1,46 @@
+import { runComposeWithFallback } from '../commands/DockerComposeCommandUtils.js';
+import { Logger } from '../../config/logger.js';
+import { ErrorFactory } from '../../exceptions/ZintrustError.js';
+export const ContainerComposeLifecycle = Object.freeze({
+    normalizeAction(raw, allowed, usageMessage) {
+        const value = (raw ?? '').trim().toLowerCase();
+        for (const item of allowed) {
+            if (value === item)
+                return item;
+        }
+        throw ErrorFactory.createCliError(usageMessage);
+    },
+    async runBuild(composePath, options, logMessage) {
+        const args = ['compose', '-f', composePath, 'build'];
+        if (options.noCache === true) {
+            args.push('--no-cache');
+        }
+        if (options.pull === true) {
+            args.push('--pull');
+        }
+        Logger.info(logMessage);
+        await runComposeWithFallback(args);
+    },
+    async runUp(composePath, options, logMessage) {
+        const args = ['compose', '-f', composePath, 'up'];
+        if (options.detach === true) {
+            args.push('-d');
+        }
+        if (options.removeOrphans === true) {
+            args.push('--remove-orphans');
+        }
+        Logger.info(logMessage);
+        await runComposeWithFallback(args);
+    },
+    async runDown(composePath, options, logMessage) {
+        const args = ['compose', '-f', composePath, 'down'];
+        if (options.volumes === true) {
+            args.push('-v');
+        }
+        if (options.removeOrphans === true) {
+            args.push('--remove-orphans');
+        }
+        Logger.info(logMessage);
+        await runComposeWithFallback(args);
+    },
+});

package/src/cli/commands/ContainerProxiesCommand.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ContainerProxiesCommand.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/ContainerProxiesCommand.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAkB,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAwErE,eAAO,MAAM,uBAAuB;cACxB,YAAY;EAuCtB,CAAC"}
+{"version":3,"file":"ContainerProxiesCommand.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/ContainerProxiesCommand.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAkB,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAyBrE,eAAO,MAAM,uBAAuB;cACxB,YAAY;EAgDtB,CAAC"}

package/src/cli/commands/ContainerProxiesCommand.js

@@ -1,45 +1,8 @@
 import { BaseCommand } from '../BaseCommand.js';
-import { resolveComposePath, runComposeWithFallback, } from '../commands/DockerComposeCommandUtils.js';
-import { Logger } from '../../config/logger.js';
-import { ErrorFactory } from '../../exceptions/ZintrustError.js';
-const runBuild = async (composePath, options) => {
-    const args = ['compose', '-f', composePath, 'build'];
-    if (options.noCache === true) {
-        args.push('--no-cache');
-    }
-    if (options.pull === true) {
-        args.push('--pull');
-    }
-    Logger.info('Building proxy stack image...');
-    await runComposeWithFallback(args);
-};
-const runUp = async (composePath, options) => {
-    const args = ['compose', '-f', composePath, 'up'];
-    if (options.detach === true) {
-        args.push('-d');
-    }
-    if (options.removeOrphans === true) {
-        args.push('--remove-orphans');
-    }
-    Logger.info('Starting proxy stack...');
-    await runComposeWithFallback(args);
-};
-const runDown = async (composePath, options) => {
-    const args = ['compose', '-f', composePath, 'down'];
-    if (options.removeOrphans === true) {
-        args.push('--remove-orphans');
-    }
-    if (options.volumes === true) {
-        args.push('--volumes');
-    }
-    Logger.info('Stopping proxy stack...');
-    await runComposeWithFallback(args);
-};
+import { ContainerComposeLifecycle } from '../commands/ContainerComposeLifecycle.js';
+import { resolveComposePath } from '../commands/DockerComposeCommandUtils.js';
 const normalizeAction = (raw) => {
-    const value = (raw ?? '').trim().toLowerCase();
-    if (value === 'build' || value === 'up' || value === 'down')
-        return value;
-    throw ErrorFactory.createCliError('Usage: zin cp <build|up|down> [options]');
+    return ContainerComposeLifecycle.normalizeAction(raw, ['build', 'up', 'down'], 'Usage: zin cp <build|up|down> [options]');
 };
 export const ContainerProxiesCommand = Object.freeze({
     create() {
@@ -60,17 +23,17 @@ export const ContainerProxiesCommand = Object.freeze({
                 const action = normalizeAction(options.args?.[0]);
                 const composePath = resolveComposePath('docker-compose.proxy.yml', 'docker-compose.proxy.yml not found.');
                 if (action === 'build') {
-                    await runBuild(composePath, options);
+                    await ContainerComposeLifecycle.runBuild(composePath, options, 'Building proxy stack image...');
                     return;
                 }
                 if (action === 'down') {
-                    await runDown(composePath, options);
+                    await ContainerComposeLifecycle.runDown(composePath, options, 'Stopping proxy stack...');
                     return;
                 }
                 if (options.build === true) {
-                    await runBuild(composePath, options);
+                    await ContainerComposeLifecycle.runBuild(composePath, options, 'Building proxy stack image...');
                 }
-                await runUp(composePath, options);
+                await ContainerComposeLifecycle.runUp(composePath, options, 'Starting proxy stack...');
             },
         });
     },

package/src/cli/commands/ContainerWorkersCommand.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ContainerWorkersCommand.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/ContainerWorkersCommand.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAkB,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAmDrE,eAAO,MAAM,uBAAuB;cACxB,YAAY;EAgCtB,CAAC"}
+{"version":3,"file":"ContainerWorkersCommand.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/ContainerWorkersCommand.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAkB,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAuBrE,eAAO,MAAM,uBAAuB;cACxB,YAAY;EA6CtB,CAAC"}

package/src/cli/commands/ContainerWorkersCommand.js

@@ -1,31 +1,8 @@
 import { BaseCommand } from '../BaseCommand.js';
-import { resolveComposePath, runComposeWithFallback, } from '../commands/DockerComposeCommandUtils.js';
-import { Logger } from '../../config/logger.js';
-import { ErrorFactory } from '../../exceptions/ZintrustError.js';
-const runBuild = async (composePath, options) => {
-    const args = ['compose', '-f', composePath, 'build'];
-    if (options.noCache === true) {
-        args.push('--no-cache');
-    }
-    if (options.pull === true) {
-        args.push('--pull');
-    }
-    Logger.info('Building container workers image...');
-    await runComposeWithFallback(args);
-};
-const runUp = async (composePath, options) => {
-    const args = ['compose', '-f', composePath, 'up'];
-    if (options.detach === true) {
-        args.push('-d');
-    }
-    Logger.info('Starting container workers...');
-    await runComposeWithFallback(args);
-};
+import { ContainerComposeLifecycle } from '../commands/ContainerComposeLifecycle.js';
+import { resolveComposePath } from '../commands/DockerComposeCommandUtils.js';
 const normalizeAction = (raw) => {
-    const value = (raw ?? '').trim().toLowerCase();
-    if (value === 'build' || value === 'up')
-        return value;
-    throw ErrorFactory.createCliError('Usage: zin cw <build|up> [options]');
+    return ContainerComposeLifecycle.normalizeAction(raw, ['build', 'up'], 'Usage: zin cw <build|up> [options]');
 };
 export const ContainerWorkersCommand = Object.freeze({
     create() {
@@ -34,7 +11,7 @@ export const ContainerWorkersCommand = Object.freeze({
             aliases: ['container-workers'],
             description: 'Build or start container-based workers',
             addOptions: (command) => {
-                command.argument('<action>', 'Action to run (build or up)');
+                command.argument('<action>', 'Action to run (build, up)');
                 command.option('-d, --detach', 'Run containers in background (up only)');
                 command.option('--no-cache', 'Disable Docker build cache (build only)');
                 command.option('--pull', 'Always attempt to pull a newer base image (build only)');
@@ -44,13 +21,13 @@ export const ContainerWorkersCommand = Object.freeze({
                 const action = normalizeAction(options.args?.[0]);
                 const composePath = resolveComposePath('docker-compose.workers.yml', 'docker-compose.workers.yml not found. Run `zin init:cw` first.');
                 if (action === 'build') {
-                    await runBuild(composePath, options);
+                    await ContainerComposeLifecycle.runBuild(composePath, options, 'Building container workers image...');
                     return;
                 }
                 if (options.build === true) {
-                    await runBuild(composePath, options);
+                    await ContainerComposeLifecycle.runBuild(composePath, options, 'Building container workers image...');
                 }
-                await runUp(composePath, options);
+                await ContainerComposeLifecycle.runUp(composePath, options, 'Starting container workers...');
             },
         });
     },

package/src/cli/commands/DeployCommand.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DeployCommand.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/DeployCommand.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,KAAK,EAAkB,YAAY,EAAE,MAAM,kBAAkB,CAAC;AA0HrE;;;GAGG;AACH,eAAO,MAAM,aAAa;IACxB;;OAEG;cACO,YAAY;EAGtB,CAAC"}
+{"version":3,"file":"DeployCommand.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/DeployCommand.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,KAAK,EAAkB,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAyIrE;;;GAGG;AACH,eAAO,MAAM,aAAa;IACxB;;OAEG;cACO,YAAY;EAGtB,CAAC"}

package/src/cli/commands/DeployCommand.js

@@ -59,10 +59,20 @@ const runDeploy = async (target, options) => {
         return;
     }
     const environment = options.env ?? target ?? 'worker';
+    const config = typeof options.config === 'string' ? options.config.trim() : '';
+    if (config.length > 0) {
+        const full = join(process.cwd(), config);
+        if (existsSync(full)) {
+            // ok
+        }
+        else {
+            throw ErrorFactory.createCliError(`Wrangler config not found: ${config}`);
+        }
+    }
     Logger.info(`Deploying to Cloudflare environment: ${environment}`);
     const exitCode = await SpawnUtil.spawnAndWait({
         command: 'wrangler',
-        args: ['deploy', '--env', environment],
+        args: ['deploy', ...(config.length > 0 ? ['--config', config] : []), '--env', environment],
     });
     if (exitCode !== 0) {
         process.exit(exitCode);
@@ -76,6 +86,7 @@ const createDeployCommand = () => {
             command
                 .argument('[target]', 'Deployment target (worker, d1-proxy, kv-proxy, production, cw, cp)', 'worker')
                 .option('-e, --env <env>', 'Wrangler environment (overrides target)');
+            command.option('-c, --config <path>', 'Wrangler config file (e.g. wrangler.containers-proxy.jsonc)');
         },
         execute: async (options) => {
             // Note: BaseCommand.create sets up action handler that calls execute(options).

package/src/cli/commands/DeployContainersProxyCommand.d.ts

@@ -0,0 +1,5 @@
+import type { IBaseCommand } from '../BaseCommand';
+export declare const DeployContainersProxyCommand: Readonly<{
+    create(): IBaseCommand;
+}>;
+//# sourceMappingURL=DeployContainersProxyCommand.d.ts.map

package/src/cli/commands/DeployContainersProxyCommand.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"DeployContainersProxyCommand.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/DeployContainersProxyCommand.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAkB,YAAY,EAAE,MAAM,kBAAkB,CAAC;AA2CrE,eAAO,MAAM,4BAA4B;cAC7B,YAAY;EAatB,CAAC"}

package/src/cli/commands/DeployContainersProxyCommand.js

@@ -0,0 +1,45 @@
+import { BaseCommand } from '../BaseCommand.js';
+import { SpawnUtil } from '../utils/spawn.js';
+import { Logger } from '../../config/logger.js';
+import { ErrorFactory } from '../../exceptions/ZintrustError.js';
+import { existsSync } from '../../node-singletons/fs.js';
+import { join } from '../../node-singletons/path.js';
+const DEFAULT_CONFIG = 'wrangler.containers-proxy.jsonc';
+const resolveConfig = (cwd, raw) => {
+    const normalized = typeof raw === 'string' ? raw.trim() : '';
+    const candidate = normalized.length > 0 ? normalized : DEFAULT_CONFIG;
+    const full = join(cwd, candidate);
+    if (existsSync(full))
+        return candidate;
+    throw ErrorFactory.createCliError(`Wrangler config not found: ${candidate}`);
+};
+const resolveEnv = (raw) => {
+    const normalized = typeof raw === 'string' ? raw.trim() : '';
+    return normalized.length > 0 ? normalized : 'production';
+};
+const execute = async (options) => {
+    const cwd = process.cwd();
+    const config = resolveConfig(cwd, options.config);
+    const env = resolveEnv(options.env);
+    Logger.info(`Deploying Containers proxy via Wrangler (env=${env})...`);
+    const exitCode = await SpawnUtil.spawnAndWait({
+        command: 'wrangler',
+        args: ['deploy', '--config', config, '--env', env],
+        env: process.env,
+    });
+    process.exit(exitCode);
+};
+export const DeployContainersProxyCommand = Object.freeze({
+    create() {
+        return BaseCommand.create({
+            name: 'deploy:ccp',
+            aliases: ['deploy:containers-proxy', 'deploy:cf-containers-proxy', 'd:ccp', 'ccp:deploy'],
+            description: 'Deploy Cloudflare Containers proxy Worker (wrangler.containers-proxy.jsonc)',
+            addOptions: (command) => {
+                command.option('-e, --env <name>', 'Wrangler environment name', 'production');
+                command.option('-c, --config <path>', 'Wrangler config file', DEFAULT_CONFIG);
+            },
+            execute: async (options) => execute(options),
+        });
+    },
+});

package/src/cli/commands/DockerCommand.d.ts

@@ -0,0 +1,5 @@
+import type { IBaseCommand } from '../BaseCommand';
+export declare const DockerCommand: Readonly<{
+    create(): IBaseCommand;
+}>;
+//# sourceMappingURL=DockerCommand.d.ts.map

package/src/cli/commands/DockerCommand.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"DockerCommand.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/DockerCommand.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAkB,YAAY,EAAE,MAAM,kBAAkB,CAAC;AA+JrE,eAAO,MAAM,aAAa;cACd,YAAY;EAuBtB,CAAC"}

package/src/cli/commands/DockerCommand.js

@@ -0,0 +1,156 @@
+import { generateUuid } from '../../common/utility.js';
+import { BaseCommand } from '../BaseCommand.js';
+import { DockerPushCommand } from '../commands/DockerPushCommand.js';
+import { SpawnUtil } from '../utils/spawn.js';
+import { Logger } from '../../config/logger.js';
+import { ErrorFactory } from '../../exceptions/ZintrustError.js';
+import { existsSync, renameSync } from '../../node-singletons/fs.js';
+import { join } from '../../node-singletons/path.js';
+const resolveDefaultWranglerConfig = (cwd) => {
+    const candidates = [
+        'wrangler.containers-proxy.jsonc',
+        'wrangler.containers-proxy.json',
+        'wrangler.containers-proxy.toml',
+        'wrangler.jsonc',
+        'wrangler.json',
+        'wrangler.toml',
+    ];
+    for (const candidate of candidates) {
+        const full = join(cwd, candidate);
+        if (existsSync(full))
+            return candidate;
+    }
+    return undefined;
+};
+const resolvePort = (raw) => {
+    const value = typeof raw === 'string' ? raw.trim() : '';
+    if (value === '')
+        return undefined;
+    const parsed = Number.parseInt(value, 10);
+    if (!Number.isFinite(parsed) || parsed <= 0 || parsed >= 65536) {
+        throw ErrorFactory.createCliError(`Error: Invalid --port '${value}'. Expected 1-65535.`);
+    }
+    return String(parsed);
+};
+const resolveWranglerConfig = (cwd, options) => {
+    const fromCli = typeof options.wranglerConfig === 'string' ? options.wranglerConfig.trim() : '';
+    if (fromCli.length > 0) {
+        const full = join(cwd, fromCli);
+        if (existsSync(full))
+            return fromCli;
+        throw ErrorFactory.createCliError(`Wrangler config not found: ${fromCli}`);
+    }
+    const fallback = resolveDefaultWranglerConfig(cwd);
+    if (typeof fallback === 'string' && fallback.length > 0)
+        return fallback;
+    throw ErrorFactory.createCliError('Wrangler config not found. Expected wrangler.containers-proxy.jsonc (or wrangler.jsonc/toml).');
+};
+const isContainersProxyConfig = (config) => {
+    const base = config.split(/[/\\]/).pop() ?? config;
+    return (base === 'wrangler.containers-proxy.jsonc' ||
+        base === 'wrangler.containers-proxy.json' ||
+        base === 'wrangler.containers-proxy.toml' ||
+        base.startsWith('wrangler.containers-proxy.'));
+};
+const withDevVarsForConfig = async (cwd, config, envName, fn) => {
+    const nonce = generateUuid();
+    const moved = [];
+    const swappedIn = [];
+    const disable = (name) => {
+        const from = join(cwd, name);
+        if (!existsSync(from))
+            return;
+        const to = join(cwd, `${name}.disabled-by-zin-${nonce}`);
+        renameSync(from, to);
+        moved.push({ from, to });
+    };
+    const swapIn = (source, target) => {
+        const from = join(cwd, source);
+        if (!existsSync(from))
+            return;
+        const to = join(cwd, target);
+        if (existsSync(to))
+            return;
+        renameSync(from, to);
+        swappedIn.push({ from, to });
+    };
+    try {
+        if (isContainersProxyConfig(config)) {
+            // For containers-proxy configs, we want `.dev.vars*` to exist but only for
+            // this run. Users keep the files renamed as `.dev.vars*.containers-proxy`.
+            swapIn('.dev.vars.containers-proxy', '.dev.vars');
+            if (envName !== '') {
+                swapIn(`.dev.vars.${envName}.containers-proxy`, `.dev.vars.${envName}`);
+            }
+            return await fn();
+        }
+        // For all other configs, disable `.dev.vars*` so Wrangler relies on `.env*`.
+        disable('.dev.vars');
+        disable('.dev.vars.local');
+        disable('.dev.vars.staging');
+        disable('.dev.vars.staging.local');
+        if (envName !== '') {
+            disable(`.dev.vars.${envName}`);
+            disable(`.dev.vars.${envName}.local`);
+        }
+        return await fn();
+    }
+    finally {
+        const restoreSwaps = swappedIn.slice().reverse();
+        for (const item of restoreSwaps) {
+            try {
+                if (existsSync(item.to) && !existsSync(item.from))
+                    renameSync(item.to, item.from);
+            }
+            catch {
+                // noop
+            }
+        }
+        const restoreMoved = moved.slice().reverse();
+        for (const item of restoreMoved) {
+            try {
+                if (existsSync(item.to))
+                    renameSync(item.to, item.from);
+            }
+            catch {
+                // noop
+            }
+        }
+    }
+};
+const executeDocker = async (options) => {
+    const cwd = process.cwd();
+    const config = resolveWranglerConfig(cwd, options);
+    const env = typeof options.env === 'string' ? options.env.trim() : '';
+    const port = resolvePort(options.port);
+    const args = ['dev', '--config', config];
+    if (typeof port === 'string' && port.length > 0)
+        args.push('--port', port);
+    if (env.length > 0)
+        args.push('--env', env);
+    Logger.info('Starting Wrangler dev (Containers/Docker-backed)...');
+    const exitCode = await withDevVarsForConfig(cwd, config, env, async () => {
+        return SpawnUtil.spawnAndWait({ command: 'wrangler', args, env: process.env });
+    });
+    process.exit(exitCode);
+};
+export const DockerCommand = Object.freeze({
+    create() {
+        return BaseCommand.create({
+            name: 'docker',
+            aliases: ['dkr', 'dk'],
+            description: 'Run Wrangler dev using a Docker-backed Cloudflare Containers config',
+            addOptions: (command) => {
+                // `zin docker push` (subcommand) for Docker Hub publishing.
+                // Keep `zin docker` itself as the Wrangler dev command.
+                const pushCommand = DockerPushCommand.create().getCommand();
+                pushCommand.name('push');
+                command.addCommand(pushCommand);
+                command.option('-c, --wrangler-config <path>', 'Wrangler config file (defaults if present)');
+                command.option('-e, --env <name>', 'Wrangler environment name');
+                command.option('-p, --port <number>', 'Port for wrangler dev');
+            },
+            execute: async (options) => executeDocker(options),
+        });
+    },
+});

package/src/cli/commands/DockerPushCommand.d.ts

@@ -0,0 +1,5 @@
+import type { IBaseCommand } from '../BaseCommand';
+export declare const DockerPushCommand: Readonly<{
+    create(): IBaseCommand;
+}>;
+//# sourceMappingURL=DockerPushCommand.d.ts.map

package/src/cli/commands/DockerPushCommand.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"DockerPushCommand.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/DockerPushCommand.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAkB,YAAY,EAAE,MAAM,kBAAkB,CAAC;AA6FrE,eAAO,MAAM,iBAAiB;cAClB,YAAY;EA0BtB,CAAC"}