ztechno_core 0.0.99 → 0.0.101

package/lib/index.d.ts

@@ -7,5 +7,7 @@ import { ZUserService } from './user_service';
 export { middleware } from './express';
 export * from './typings';
 export * from './scripts/docker-update';
+export * from './scripts/docker-build';
+export * from './scripts/docker-push';
 export * from './schema';
 export { ZEngineBase, ZCryptoService, ZMailService, ZSQLService, ZTranslateService, ZUserService };

package/lib/index.js

@@ -89,5 +89,7 @@ Object.defineProperty(exports, 'middleware', {
 __exportStar(require('./typings'), exports);
 // Re-export specific scripts
 __exportStar(require('./scripts/docker-update'), exports);
+__exportStar(require('./scripts/docker-build'), exports);
+__exportStar(require('./scripts/docker-push'), exports);
 // Re-export all schema-related modules
 __exportStar(require('./schema'), exports);

package/lib/scripts/docker-build.d.ts

@@ -0,0 +1,14 @@
+#!/usr/bin/env node
+/**
+ * Build a Docker image tagged as <awsAccountId>/<packagename>:latest
+ * @param opt.packagename - Override the image name (defaults to package.json name)
+ * @param opt.awsAccountId - Override the AWS Account ID (defaults to package.json config.awsAccountId)
+ * @param opt.tag - Override the tag (defaults to "latest")
+ * @param opt.context - Docker build context path (defaults to ".")
+ */
+export declare function dockerBuild(opt?: {
+  packagename?: string;
+  awsAccountId?: string;
+  tag?: string;
+  context?: string;
+}): void;

package/lib/scripts/docker-build.js

@@ -0,0 +1,91 @@
+#!/usr/bin/env node
+'use strict';
+var __importDefault =
+  (this && this.__importDefault) ||
+  function (mod) {
+    return mod && mod.__esModule ? mod : { default: mod };
+  };
+Object.defineProperty(exports, '__esModule', { value: true });
+exports.dockerBuild = void 0;
+const child_process_1 = require('child_process');
+const path_1 = __importDefault(require('path'));
+const fs_1 = __importDefault(require('fs'));
+// ANSI color helpers
+const red = (msg) => `\x1b[31m${msg}\x1b[0m`;
+const green = (msg) => `\x1b[32m${msg}\x1b[0m`;
+const cyan = (msg) => `\x1b[36m${msg}\x1b[0m`;
+function loadPackageJson() {
+  const pkgPath = path_1.default.join(process.cwd(), 'package.json');
+  if (!fs_1.default.existsSync(pkgPath)) {
+    throw new Error(`No package.json found in ${process.cwd()}`);
+  }
+  return JSON.parse(fs_1.default.readFileSync(pkgPath, 'utf-8'));
+}
+/**
+ * Build a Docker image tagged as <awsAccountId>/<packagename>:latest
+ * @param opt.packagename - Override the image name (defaults to package.json name)
+ * @param opt.awsAccountId - Override the AWS Account ID (defaults to package.json config.awsAccountId)
+ * @param opt.tag - Override the tag (defaults to "latest")
+ * @param opt.context - Docker build context path (defaults to ".")
+ */
+function dockerBuild(opt) {
+  const pkg = loadPackageJson();
+  const packagename = opt?.packagename || pkg.name;
+  const awsAccountId = opt?.awsAccountId || pkg.config?.awsAccountId || process.env.AWS_ACCOUNT_ID;
+  const tag = opt?.tag || 'latest';
+  const context = opt?.context || '.';
+  if (!packagename) {
+    throw new Error('Missing package name. Set "name" in package.json or pass --name.');
+  }
+  if (!awsAccountId) {
+    throw new Error('Missing AWS Account ID. Set "config.awsAccountId" in package.json or AWS_ACCOUNT_ID env var.');
+  }
+  const image = `${awsAccountId}/${packagename}:${tag}`;
+  const cmd = `docker build -t ${image} ${context}`;
+  console.log(green(`[Docker Build]`));
+  console.log(cyan(`> ${cmd}`));
+  (0, child_process_1.execSync)(cmd, { stdio: 'inherit' });
+  console.log(green(`✓ Built ${image}`));
+}
+exports.dockerBuild = dockerBuild;
+const USAGE = `
+Usage:
+  ztechno-docker-build [options]
+
+Options:
+  --name <name>       Override image name (default: package.json "name")
+  --account <id>      Override AWS Account ID (default: package.json "config.awsAccountId")
+  --tag <tag>         Override tag (default: "latest")
+  --context <path>    Docker build context (default: ".")
+  -h, --help          Show this help
+
+package.json format:
+  {
+    "name": "my-image",
+    "config": {
+      "awsAccountId": "00028463827"
+    }
+  }
+`.trim();
+if (require.main === module) {
+  try {
+    const args = process.argv.slice(2);
+    if (args.includes('--help') || args.includes('-h')) {
+      console.log(USAGE);
+      process.exit(0);
+    }
+    const getArg = (flag) => {
+      const idx = args.indexOf(flag);
+      return idx !== -1 && idx + 1 < args.length ? args[idx + 1] : undefined;
+    };
+    dockerBuild({
+      packagename: getArg('--name'),
+      awsAccountId: getArg('--account'),
+      tag: getArg('--tag'),
+      context: getArg('--context'),
+    });
+  } catch (err) {
+    console.error(red(`✗ Error: ${err.message}`));
+    process.exit(1);
+  }
+}

package/lib/scripts/docker-push.d.ts

@@ -0,0 +1,8 @@
+#!/usr/bin/env node
+/**
+ * Push a Docker image tagged as <awsAccountId>/<packagename>:latest
+ * @param opt.packagename - Override the image name (defaults to package.json name)
+ * @param opt.awsAccountId - Override the AWS Account ID (defaults to package.json config.awsAccountId)
+ * @param opt.tag - Override the tag (defaults to "latest")
+ */
+export declare function dockerPush(opt?: { packagename?: string; awsAccountId?: string; tag?: string }): void;

package/lib/scripts/docker-push.js

@@ -0,0 +1,87 @@
+#!/usr/bin/env node
+'use strict';
+var __importDefault =
+  (this && this.__importDefault) ||
+  function (mod) {
+    return mod && mod.__esModule ? mod : { default: mod };
+  };
+Object.defineProperty(exports, '__esModule', { value: true });
+exports.dockerPush = void 0;
+const child_process_1 = require('child_process');
+const path_1 = __importDefault(require('path'));
+const fs_1 = __importDefault(require('fs'));
+// ANSI color helpers
+const red = (msg) => `\x1b[31m${msg}\x1b[0m`;
+const green = (msg) => `\x1b[32m${msg}\x1b[0m`;
+const cyan = (msg) => `\x1b[36m${msg}\x1b[0m`;
+function loadPackageJson() {
+  const pkgPath = path_1.default.join(process.cwd(), 'package.json');
+  if (!fs_1.default.existsSync(pkgPath)) {
+    throw new Error(`No package.json found in ${process.cwd()}`);
+  }
+  return JSON.parse(fs_1.default.readFileSync(pkgPath, 'utf-8'));
+}
+/**
+ * Push a Docker image tagged as <awsAccountId>/<packagename>:latest
+ * @param opt.packagename - Override the image name (defaults to package.json name)
+ * @param opt.awsAccountId - Override the AWS Account ID (defaults to package.json config.awsAccountId)
+ * @param opt.tag - Override the tag (defaults to "latest")
+ */
+function dockerPush(opt) {
+  const pkg = loadPackageJson();
+  const packagename = opt?.packagename || pkg.name;
+  const awsAccountId = opt?.awsAccountId || pkg.config?.awsAccountId || process.env.AWS_ACCOUNT_ID;
+  const tag = opt?.tag || 'latest';
+  if (!packagename) {
+    throw new Error('Missing package name. Set "name" in package.json or pass --name.');
+  }
+  if (!awsAccountId) {
+    throw new Error('Missing AWS Account ID. Set "config.awsAccountId" in package.json or AWS_ACCOUNT_ID env var.');
+  }
+  const image = `${awsAccountId}/${packagename}:${tag}`;
+  const cmd = `docker push ${image}`;
+  console.log(green(`[Docker Push]`));
+  console.log(cyan(`> ${cmd}`));
+  (0, child_process_1.execSync)(cmd, { stdio: 'inherit' });
+  console.log(green(`✓ Pushed ${image}`));
+}
+exports.dockerPush = dockerPush;
+const USAGE = `
+Usage:
+  ztechno-docker-push [options]
+
+Options:
+  --name <name>       Override image name (default: package.json "name")
+  --account <id>      Override AWS Account ID (default: package.json "config.awsAccountId")
+  --tag <tag>         Override tag (default: "latest")
+  -h, --help          Show this help
+
+package.json format:
+  {
+    "name": "my-image",
+    "config": {
+      "awsAccountId": "00028463827"
+    }
+  }
+`.trim();
+if (require.main === module) {
+  try {
+    const args = process.argv.slice(2);
+    if (args.includes('--help') || args.includes('-h')) {
+      console.log(USAGE);
+      process.exit(0);
+    }
+    const getArg = (flag) => {
+      const idx = args.indexOf(flag);
+      return idx !== -1 && idx + 1 < args.length ? args[idx + 1] : undefined;
+    };
+    dockerPush({
+      packagename: getArg('--name'),
+      awsAccountId: getArg('--account'),
+      tag: getArg('--tag'),
+    });
+  } catch (err) {
+    console.error(red(`✗ Error: ${err.message}`));
+    process.exit(1);
+  }
+}

package/lib/scripts/docker-update.js

@@ -9,6 +9,8 @@ Object.defineProperty(exports, '__esModule', { value: true });
 exports.updateDocker = void 0;
 const http_1 = __importDefault(require('http'));
 const crypto_1 = __importDefault(require('crypto'));
+const path_1 = __importDefault(require('path'));
+const fs_1 = __importDefault(require('fs'));
 const dotenv_1 = require('dotenv');
 const crypto_service_1 = require('../crypto_service');
 // ANSI color helpers
@@ -94,35 +96,82 @@ function updateDocker(opt) {
 }
 exports.updateDocker = updateDocker;
 /**
- * Parse options from a .env file in the current working directory.
- * Required keys: packagename, port, ZTECHNO_API_SECRET
- * Optional key: volumes (comma-separated)
+ * Read the consumer's package.json from the current working directory.
+ * Returns null if not found or unreadable.
+ */
+function loadPackageJson() {
+  try {
+    const pkgPath = path_1.default.join(process.cwd(), 'package.json');
+    if (!fs_1.default.existsSync(pkgPath)) return null;
+    return JSON.parse(fs_1.default.readFileSync(pkgPath, 'utf-8'));
+  } catch {
+    return null;
+  }
+}
+/**
+ * Auto-detect options from .env and/or package.json in the current working directory.
+ *
+ * Resolution order for each field:
+ *   1. .env / environment variable
+ *   2. package.json (name → packagename, config.port → port, config.volumes → volumes)
+ *
+ * Required: packagename, port, ZTECHNO_API_SECRET (env only)
+ * Optional: volumes (comma-separated)
  */
 function loadOptionsFromEnv() {
-  const envPath = process.cwd() + '/.env';
-  console.log(`Loading env from: ${envPath}`);
+  // Load .env file
+  const envPath = path_1.default.join(process.cwd(), '.env');
   const cfg = (0, dotenv_1.config)({ path: envPath });
-  if (cfg.error) {
+  if (cfg.error && cfg.error.message && !cfg.error.message.includes('ENOENT')) {
     throw cfg.error;
   }
-  const packagename = cfg.parsed?.packagename || process.env.packagename;
-  const port = cfg.parsed?.port || process.env.port;
-  const volumes = cfg.parsed?.volumes || process.env.volumes;
-  if (!packagename || !port) {
-    throw new Error('Missing required .env variables: packagename and port');
+  // Load package.json as fallback
+  const pkg = loadPackageJson();
+  const packagename = cfg.parsed?.packagename || process.env.packagename || pkg?.name;
+  const port =
+    cfg.parsed?.port || process.env.port || (pkg?.config?.port != null ? String(pkg.config.port) : undefined);
+  const volumesRaw = cfg.parsed?.volumes || process.env.volumes || pkg?.config?.volumes;
+  if (pkg) {
+    console.log(`Detected package.json: ${pkg.name || '(unnamed)'}`);
+  }
+  if (!packagename) {
+    throw new Error('Missing packagename. Set it in .env, environment, or package.json "name".');
+  }
+  if (!port) {
+    throw new Error('Missing port. Set it in .env, environment, or package.json "config.port".');
   }
-  return { packagename, port, volumes: volumes?.split(',').filter(Boolean) };
+  // Normalize volumes: accept string[] from package.json or comma-separated string from .env
+  let volumes;
+  if (Array.isArray(volumesRaw)) {
+    volumes = volumesRaw.filter(Boolean);
+  } else if (typeof volumesRaw === 'string') {
+    volumes = volumesRaw.split(',').filter(Boolean);
+  }
+  return { packagename, port, volumes };
 }
 const USAGE = `
 Usage:
   ztechno-docker-update <packagename>:<port>
-  ztechno-docker-update                         (reads from .env file)
+  ztechno-docker-update                         (auto-detect from .env / package.json)
+
+Auto-detection priority:
+  1. .env file      → packagename, port, volumes, ZTECHNO_API_SECRET
+  2. package.json   → "name" as packagename, "config.port", "config.volumes"
 
 .env file format:
   ZTECHNO_API_SECRET=your_secret
   packagename=my-image
   port=3000
   volumes=/host/path:/container/path   (optional, comma-separated)
+
+package.json format:
+  {
+    "name": "my-image",
+    "config": {
+      "port": 3000,
+      "volumes": ["/host/path:/container/path", "/logs:/app/logs"]
+    }
+  }
 `.trim();
 // Run if executed directly (node docker-update.js or npx ztechno-docker-update)
 if (require.main === module) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ztechno_core",
-  "version": "0.0.99",
+  "version": "0.0.101",
   "description": "Core files for ztechno framework",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -21,7 +21,9 @@
     "update": "npm run build && npm version patch && npm publish"
   },
   "bin": {
-    "ztechno-docker-update": "lib/scripts/docker-update.js"
+    "ztechno-docker-update": "lib/scripts/docker-update.js",
+    "ztechno-docker-build": "lib/scripts/docker-build.js",
+    "ztechno-docker-push": "lib/scripts/docker-push.js"
   },
   "keywords": [
     "ztechno",