unitup 0.0.9 → 0.0.11

package/src/utils.js

@@ -29,6 +29,101 @@ export function getAppMetadataPath(name) {
   return path.join(getAppsDir(), `${safeName}.json`);
 }
 
+/**
+ * Validates systemd memory limit sizes (128K, 256M, 1G, 2T, infinity, max, or raw bytes).
+ * @param {string|number} val
+ * @param {string} paramName
+ * @returns {string} Normalized memory limit string
+ */
+export function validateMemorySize(val, paramName = 'Memory limit') {
+  if (val === null || val === undefined || val === '') {
+    throw new Error(`${paramName} cannot be empty.`);
+  }
+
+  const str = String(val).trim();
+
+  // Prevent shell injection and unsafe characters
+  if (/[;&|$`"'\n\r\t ]/.test(str)) {
+    throw new Error(`${paramName} contains invalid characters or shell injection attempt: "${str}".`);
+  }
+
+  // Reject negative numbers
+  if (str.startsWith('-')) {
+    throw new Error(`${paramName} cannot be negative: "${str}".`);
+  }
+
+  const lower = str.toLowerCase();
+  if (lower === 'infinity' || lower === 'max') {
+    return 'infinity';
+  }
+
+  // Matches numbers with optional K, M, G, T, P unit suffix (with optional 'b' or 'B')
+  const match = str.match(/^(\d+(?:\.\d+)?)\s*([kmgtp]?[bb]?)?$/i);
+  if (!match) {
+    throw new Error(`Invalid ${paramName} format: "${str}". Expected values like 128K, 256M, 1G, or infinity.`);
+  }
+
+  const num = match[1];
+  const unit = (match[2] || '').toUpperCase().replace(/B$/, '');
+
+  return `${num}${unit}`;
+}
+
+/**
+ * Formats byte values or systemd memory limit markers into human readable strings.
+ * @param {number|string} bytes
+ * @returns {string} Formatted memory string e.g. "284 MB", "infinity", "unavailable"
+ */
+export function formatMemoryBytes(bytes) {
+  if (bytes === null || bytes === undefined || bytes === '' || bytes === 'unavailable' || bytes === '[unavailable]' || bytes === '-') {
+    return 'unavailable';
+  }
+
+  const str = String(bytes).trim().toLowerCase();
+  if (str === 'infinity' || str === 'max' || str === '18446744073709551615') {
+    return 'infinity';
+  }
+
+  const num = Number(bytes);
+  if (Number.isNaN(num) || num < 0) {
+    // If it's already a formatted string like "400M" or "400 MB"
+    if (/^\d+\s*[a-zA-Z]+$/.test(str)) {
+      const match = str.match(/^(\d+)\s*([a-zA-Z]+)$/);
+      if (match) {
+        const u = match[2].toUpperCase().replace(/B$/, '');
+        return `${match[1]} ${u === 'M' ? 'MB' : u === 'G' ? 'GB' : u === 'K' ? 'KB' : u}`;
+      }
+    }
+    return 'unavailable';
+  }
+
+  if (num === 0) return '0 MB';
+
+  const kb = 1024;
+  const mb = kb * 1024;
+  const gb = mb * 1024;
+  const tb = gb * 1024;
+
+  if (num >= tb) {
+    const val = num / tb;
+    return `${Number.isInteger(val) ? val : val.toFixed(1)} TB`;
+  }
+  if (num >= gb) {
+    const val = num / gb;
+    return `${Number.isInteger(val) ? val : val.toFixed(1)} GB`;
+  }
+  if (num >= mb) {
+    const val = num / mb;
+    return `${Number.isInteger(val) ? val : Math.round(val)} MB`;
+  }
+  if (num >= kb) {
+    const val = num / kb;
+    return `${Number.isInteger(val) ? val : Math.round(val)} KB`;
+  }
+
+  return `${num} B`;
+}
+
 /**
  * Saves metadata JSON for a service.
  * @param {object} meta
@@ -41,14 +136,32 @@ export function saveAppMetadata(meta) {
     fs.mkdirSync(dir, { recursive: true });
   }
   const filePath = getAppMetadataPath(safeName);
-  const scriptPath = resolveAbsolutePath(meta.script);
+
+  const command = meta.command ? resolveAbsolutePath(meta.command) : (meta.node ? resolveAbsolutePath(meta.node) : process.execPath);
+  const rawArgs = Array.isArray(meta.args) ? meta.args : (meta.script ? [meta.script] : []);
+  const args = rawArgs.map(a => (a.startsWith('/') || a.startsWith('./') || a.startsWith('../') || a.startsWith('~/')) ? resolveAbsolutePath(a) : a);
+  const scriptPath = meta.script ? resolveAbsolutePath(meta.script) : (args[0] ? resolveAbsolutePath(args[0]) : command);
+  const cwd = meta.cwd ? resolveAbsolutePath(meta.cwd) : path.dirname(scriptPath || command);
+
+  // Extract memory resources if present
+  const resources = meta.resources || {};
+  if (meta.memoryHigh) resources.memoryHigh = validateMemorySize(meta.memoryHigh, 'MemoryHigh');
+  if (meta.memoryMax) resources.memoryMax = validateMemorySize(meta.memoryMax, 'MemoryMax');
+  if (meta.memorySwapMax) resources.memorySwapMax = validateMemorySize(meta.memorySwapMax, 'MemorySwapMax');
+
   const payload = {
     name: safeName,
     unit: getUnitFilename(safeName),
+    runtime: meta.runtime || 'node',
+    command,
+    args,
+    cwd,
     group: meta.group || 'default',
+    // Optional resources section
+    ...(Object.keys(resources).length > 0 ? { resources } : {}),
+    // Backward compatibility fields
     script: scriptPath,
-    cwd: meta.cwd ? resolveAbsolutePath(meta.cwd) : path.dirname(scriptPath),
-    node: meta.node ? resolveAbsolutePath(meta.node) : process.execPath
+    node: meta.node ? resolveAbsolutePath(meta.node) : command
   };
   fs.writeFileSync(filePath, JSON.stringify(payload, null, 2), 'utf8');
   return payload;
@@ -64,7 +177,29 @@ export function readAppMetadata(name) {
     const filePath = getAppMetadataPath(name);
     if (!fs.existsSync(filePath)) return null;
     const content = fs.readFileSync(filePath, 'utf8');
-    return JSON.parse(content);
+    const data = JSON.parse(content);
+    if (!data) return null;
+
+    // Normalization for legacy metadata format
+    const command = data.command || data.node || process.execPath;
+    const args = data.args || (data.script ? [data.script] : []);
+    const runtime = data.runtime || 'node';
+    const script = data.script || args[0] || command;
+    const cwd = data.cwd || (script ? path.dirname(script) : process.cwd());
+
+    return {
+      ...data,
+      name: data.name || sanitizeServiceName(name),
+      unit: data.unit || getUnitFilename(name),
+      runtime,
+      command,
+      args,
+      cwd,
+      group: data.group || 'default',
+      resources: data.resources || undefined,
+      script,
+      node: data.node || command
+    };
   } catch {
     return null;
   }

package/tsconfig.json

@@ -0,0 +1,13 @@
+{
+  "compilerOptions": {
+    "target": "ES2022",
+    "module": "NodeNext",
+    "moduleResolution": "NodeNext",
+    "noEmit": true,
+    "strict": true,
+    "skipLibCheck": true,
+    "allowJs": true,
+    "checkJs": false
+  },
+  "include": ["index.d.ts"]
+}