ztechno_core 0.0.98 → 0.0.100

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

@@ -1,21 +1,27 @@
-/**
- * Update a remote Docker container via the V2 Secure API
- * @param opt.packagename - The package/image name
- * @param opt.port - The port number
- * @param opt.volumes - Optional array of volume mappings
- * @param opt.c - Optional logger
- * @returns Promise resolving to success status and message
- */
-export declare function updateDocker(opt: {
+#!/usr/bin/env node
+export interface DockerUpdateOptions {
+  /** The package/image name */
   packagename: string;
+  /** The port number */
   port: string | number;
+  /** Optional array of volume mappings */
   volumes?: string[];
+  /** Optional logger (defaults to silent) */
   c?: {
-    log: any;
-    error: any;
+    log: (...args: any[]) => void;
+    error: (...args: any[]) => void;
   };
-}): Promise<{
+  /** Request timeout in ms (default: 30000) */
+  timeout?: number;
+}
+export interface DockerUpdateResult {
   success: boolean;
   message?: string;
   err?: string;
-}>;
+}
+/**
+ * Update a remote Docker container via the V2 Secure API
+ * @param opt - Update options
+ * @returns Promise resolving to success status and message
+ */
+export declare function updateDocker(opt: DockerUpdateOptions): Promise<DockerUpdateResult>;

package/lib/scripts/docker-update.js

@@ -1,3 +1,4 @@
+#!/usr/bin/env node
 'use strict';
 var __importDefault =
   (this && this.__importDefault) ||
@@ -8,33 +9,40 @@ 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
+const red = (msg) => `\x1b[31m${msg}\x1b[0m`;
+const green = (msg) => `\x1b[32m${msg}\x1b[0m`;
+const cyan = (msg) => `\x1b[36m${msg}\x1b[0m`;
+const blue = (msg) => `\x1b[34m${msg}\x1b[0m`;
+/** Default request timeout in milliseconds (30 seconds) */
+const REQUEST_TIMEOUT_MS = 30000;
 /**
  * Update a remote Docker container via the V2 Secure API
- * @param opt.packagename - The package/image name
- * @param opt.port - The port number
- * @param opt.volumes - Optional array of volume mappings
- * @param opt.c - Optional logger
+ * @param opt - Update options
  * @returns Promise resolving to success status and message
  */
 function updateDocker(opt) {
   return new Promise((resolve, reject) => {
-    const { packagename, port, volumes, c } = opt;
+    const { packagename, port, volumes, c, timeout = REQUEST_TIMEOUT_MS } = opt;
     const secretKey = process.env.ZTECHNO_API_SECRET;
     if (!secretKey) {
-      c.log('\x1b[31m✗ Error: ZTECHNO_API_SECRET environment variable not set\x1b[0m');
+      c?.log(red('✗ Error: ZTECHNO_API_SECRET environment variable not set'));
       return reject(new Error('ZTECHNO_API_SECRET environment variable not set'));
     }
-    // Generate timestamp and signature
+    // Generate timestamp and HMAC signature
     const timestamp = Date.now().toString();
     const volumesString = volumes && volumes.length > 0 ? volumes.join(',') : '';
     const payload = timestamp + packagename + port + volumesString;
     const signature = crypto_1.default.createHmac('sha256', secretKey).update(payload).digest('hex');
-    c?.log('\x1b[32m' + `[Updating Remote Docker via V2 Secure API]`);
-    // Build query parameters
-    let queryParams = `port=${port}`;
+    c?.log(green(`[Updating Remote Docker via V2 Secure API]`));
+    // Build query parameters with proper encoding
+    const query = new URLSearchParams({ port: String(port) });
     if (volumesString) {
-      queryParams += `&volumes=${volumesString}`;
+      query.set('volumes', volumesString);
     }
     const options = {
       hostname: crypto_service_1.ZCryptoService.decrypt({
@@ -42,8 +50,9 @@ function updateDocker(opt) {
         encryptedData: '05b9d826539fe2cbdf7d7ecccfe57635',
       }),
       port: 7998,
-      path: `/v2/images/${packagename}/update?${queryParams}`,
+      path: `/v2/images/${encodeURIComponent(packagename)}/update?${query}`,
       method: 'GET',
+      timeout,
       headers: {
         'x-timestamp': timestamp,
         'x-signature': signature,
@@ -57,38 +66,142 @@ function updateDocker(opt) {
       res.on('end', () => {
         try {
           const response = JSON.parse(data);
-          c?.log('\x1b[36mStatus Code:', res.statusCode, '\x1b[0m');
-          c?.log('\x1b[34mResponse:', JSON.stringify(response, null, 2), '\x1b[0m');
+          c?.log(cyan(`Status Code: ${res.statusCode}`));
+          c?.log(blue(`Response: ${JSON.stringify(response, null, 2)}`));
           if (response.success) {
-            c?.log('\x1b[32m✓', response.message, '\x1b[0m');
-            resolve(response);
+            c?.log(green(`✓ ${response.message}`));
           } else {
-            c?.log('\x1b[31m✗ Error:', response.err, '\x1b[0m');
-            resolve(response);
+            c?.log(red(`✗ Error: ${response.err}`));
           }
+          resolve(response);
         } catch (err) {
-          c?.log('\x1b[31mFailed to parse response:', data, '\x1b[0m');
+          c?.log(red(`Failed to parse response: ${data}`));
           c?.error(err);
           reject(err);
         }
       });
     });
+    req.on('timeout', () => {
+      req.destroy();
+      const err = new Error(`Request timed out after ${timeout}ms`);
+      c?.log(red(`✗ ${err.message}`));
+      reject(err);
+    });
     req.on('error', (err) => {
-      c?.log('\x1b[31m✗ Request failed:', err.message, '\x1b[0m');
+      c?.log(red(`✗ Request failed: ${err.message}`));
       reject(err);
     });
     req.end();
   });
 }
 exports.updateDocker = updateDocker;
-// Run if executed directly (node docker-update.js or npm run docker-update)
-if (require.main === module) {
-  const arg = process.argv.slice(2)[0];
-  if (!arg || !arg.includes(':')) {
-    throw new Error('\x1b[31m✗ Usage: node docker-update.js <packagename>:<port>\x1b[0m');
-    // process.exit(1)
+/**
+ * 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() {
+  // Load .env file
+  const envPath = path_1.default.join(process.cwd(), '.env');
+  const cfg = (0, dotenv_1.config)({ path: envPath });
+  if (cfg.error && cfg.error.message && !cfg.error.message.includes('ENOENT')) {
+    throw cfg.error;
+  }
+  // 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".');
   }
-  const [packagename, port] = arg.split(':');
-  updateDocker({ packagename, port, c: console }).catch(() => process.exit(1));
+  if (!port) {
+    throw new Error('Missing port. Set it in .env, environment, or package.json "config.port".');
+  }
+  // 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                         (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) {
+  const main = async () => {
+    const arg = process.argv[2];
+    if (arg === '--help' || arg === '-h') {
+      console.log(USAGE);
+      return;
+    }
+    // No argument: load from .env
+    if (arg === undefined) {
+      const { packagename, port, volumes } = loadOptionsFromEnv();
+      await updateDocker({ packagename, port, volumes, c: console });
+      return;
+    }
+    // Argument with colon: packagename:port
+    if (arg.includes(':')) {
+      const [packagename, port] = arg.split(':');
+      if (!packagename || !port) {
+        throw new Error(`Invalid argument "${arg}". Expected format: <packagename>:<port>`);
+      }
+      await updateDocker({ packagename, port, c: console });
+      return;
+    }
+    console.error(red(`✗ Invalid argument: "${arg}"`));
+    console.log(USAGE);
+    process.exit(1);
+  };
+  main().catch((err) => {
+    console.error(red(`✗ Error: ${err.message}`));
+    process.exit(1);
+  });
 }
-module.exports = { updateDocker };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ztechno_core",
-  "version": "0.0.98",
+  "version": "0.0.100",
   "description": "Core files for ztechno framework",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -20,6 +20,9 @@
     "postversion": "git push && git push --tags",
     "update": "npm run build && npm version patch && npm publish"
   },
+  "bin": {
+    "ztechno-docker-update": "lib/scripts/docker-update.js"
+  },
   "keywords": [
     "ztechno",
     "core",
@@ -40,6 +43,7 @@
   "dependencies": {
     "@types/express": "^5.0.0",
     "dom-parser": "^1.1.5",
+    "dotenv": "^17.3.1",
     "mysql": "^2.18.1",
     "nodemailer": "^6.8.0",
     "translate": "^1.4.1"