@scriptdb/cli 1.0.5 → 1.0.6

package/dist/index.js

@@ -9,273 +9,6 @@ import { existsSync, readFileSync, writeFileSync, unlinkSync, mkdirSync } from "
 import { join } from "path";
 import { homedir } from "os";
 
-// ../../node_modules/.bun/ps-list@9.0.0/node_modules/ps-list/index.js
-import process2 from "node:process";
-import fs from "node:fs";
-import { promisify } from "node:util";
-import path from "node:path";
-import { fileURLToPath } from "node:url";
-import childProcess from "node:child_process";
-var __dirname2 = path.dirname(fileURLToPath(import.meta.url));
-var DEFAULT_MAX_BUFFER = 64000000;
-var MAXIMUM_PATH_COMBINATION_ATTEMPTS = 6;
-var execFile = promisify(childProcess.execFile);
-var PROCESS_FIELDS = {
-  CPU_PERCENT: "%cpu",
-  MEMORY_PERCENT: "%mem",
-  PROCESS_ID: "pid",
-  PARENT_PROCESS_ID: "ppid",
-  USER_ID: "uid",
-  START_TIME: "lstart",
-  COMMAND_NAME: "comm",
-  ARGUMENTS: "args"
-};
-var buildProcessCommandFlags = (includeAllUsersProcesses) => (includeAllUsersProcesses === false ? "" : "a") + "wwxo";
-var makeStartTime = (startTimeString) => {
-  if (!startTimeString) {
-    return;
-  }
-  const parsedDate = new Date(startTimeString);
-  return Number.isNaN(parsedDate.getTime()) ? undefined : parsedDate;
-};
-var extractExecutablePath = (commandLine) => {
-  if (!commandLine) {
-    return "";
-  }
-  if (!commandLine.startsWith("/") && !commandLine.startsWith('"')) {
-    return "";
-  }
-  if (commandLine.startsWith('"')) {
-    const quotedPathMatch = commandLine.match(/^"([^"]+)"/);
-    if (quotedPathMatch && fs.existsSync(quotedPathMatch[1])) {
-      return quotedPathMatch[1];
-    }
-    return "";
-  }
-  const commandParts = commandLine.split(" ");
-  const firstCommandToken = commandParts[0];
-  if (fs.existsSync(firstCommandToken)) {
-    return firstCommandToken;
-  }
-  const maximumCombinationAttempts = Math.min(commandParts.length, MAXIMUM_PATH_COMBINATION_ATTEMPTS);
-  for (let tokenCount = 2;tokenCount <= maximumCombinationAttempts; tokenCount++) {
-    const candidateExecutablePath = commandParts.slice(0, tokenCount).join(" ");
-    if (fs.existsSync(candidateExecutablePath)) {
-      return candidateExecutablePath;
-    }
-  }
-  return "";
-};
-var resolveExecutablePath = (operatingSystemPlatform, processId, commandLine) => {
-  if (operatingSystemPlatform === "linux" && processId) {
-    try {
-      const symbolicLink = fs.readlinkSync(`/proc/${processId}/exe`);
-      return symbolicLink.replace(/\s+\(deleted\)$/, "");
-    } catch {}
-  }
-  return extractExecutablePath(commandLine);
-};
-var parseNumericField = (fieldValue, parserFunction = Number.parseInt, defaultValue = 0) => {
-  if (!fieldValue) {
-    return defaultValue;
-  }
-  const parsedValue = parserFunction(fieldValue, 10);
-  return Number.isNaN(parsedValue) ? defaultValue : parsedValue;
-};
-var parseIntegerOrUndefined = (fieldValue) => {
-  if (fieldValue === undefined || fieldValue === "") {
-    return;
-  }
-  const parsedValue = Number.parseInt(fieldValue, 10);
-  return Number.isNaN(parsedValue) ? undefined : parsedValue;
-};
-var parseProcessFields = ({ processId, parentProcessId, userId, cpuUsage, memoryUsage, commandName, startTimeString, command }) => {
-  const parsedProcessId = parseNumericField(processId);
-  const parsedParentProcessId = parseNumericField(parentProcessId);
-  const parsedUserId = parseIntegerOrUndefined(userId);
-  const parsedCpuUsagePercentage = parseNumericField(cpuUsage, Number.parseFloat);
-  const parsedMemoryUsagePercentage = parseNumericField(memoryUsage, Number.parseFloat);
-  const resolvedExecutablePath = resolveExecutablePath(process2.platform, parsedProcessId, command);
-  const derivedProcessName = resolvedExecutablePath ? path.basename(resolvedExecutablePath) : commandName || "";
-  return {
-    pid: parsedProcessId,
-    ppid: parsedParentProcessId,
-    uid: parsedUserId,
-    cpu: parsedCpuUsagePercentage,
-    memory: parsedMemoryUsagePercentage,
-    name: derivedProcessName,
-    path: resolvedExecutablePath,
-    startTime: makeStartTime(startTimeString),
-    cmd: command || ""
-  };
-};
-var windows = async () => {
-  let binary;
-  switch (process2.arch) {
-    case "x64": {
-      binary = "fastlist-0.3.0-x64.exe";
-      break;
-    }
-    case "ia32": {
-      binary = "fastlist-0.3.0-x86.exe";
-      break;
-    }
-    case "arm64": {
-      throw new Error("Windows ARM64 is not supported yet.");
-    }
-    default: {
-      throw new Error(`Unsupported architecture: ${process2.arch}`);
-    }
-  }
-  const binaryPath = path.join(__dirname2, "vendor", binary);
-  const { stdout } = await execFile(binaryPath, {
-    maxBuffer: DEFAULT_MAX_BUFFER,
-    windowsHide: true,
-    encoding: "utf8"
-  });
-  return stdout.trim().split(/\r?\n/).map((line) => line.split("\t")).map(([processId, parentProcessId, processName]) => ({
-    pid: Number.parseInt(processId, 10),
-    ppid: Number.parseInt(parentProcessId, 10),
-    name: processName
-  }));
-};
-var nonWindowsFallbackMultipleCalls = async (options = {}) => {
-  const processDataByProcessId = {};
-  const processCommandFlags = buildProcessCommandFlags(options.all);
-  const fields = [
-    PROCESS_FIELDS.COMMAND_NAME,
-    PROCESS_FIELDS.ARGUMENTS,
-    PROCESS_FIELDS.PARENT_PROCESS_ID,
-    PROCESS_FIELDS.USER_ID,
-    PROCESS_FIELDS.CPU_PERCENT,
-    PROCESS_FIELDS.MEMORY_PERCENT,
-    PROCESS_FIELDS.START_TIME
-  ];
-  await Promise.all(fields.map(async (fieldName) => {
-    const { stdout } = await execFile("ps", [processCommandFlags, `${PROCESS_FIELDS.PROCESS_ID}=,${fieldName}=`], {
-      maxBuffer: DEFAULT_MAX_BUFFER,
-      encoding: "utf8",
-      env: {
-        ...process2.env,
-        LC_ALL: "C",
-        LANG: "C"
-      }
-    });
-    for (const line of stdout.trim().split(`
-`)) {
-      const trimmedLine = line.trim();
-      const spaceIndex = trimmedLine.indexOf(" ");
-      if (spaceIndex === -1) {
-        const processId2 = trimmedLine;
-        const fieldValue2 = "";
-        processDataByProcessId[processId2] ??= {};
-        processDataByProcessId[processId2][fieldName] = fieldValue2;
-        continue;
-      }
-      const processId = trimmedLine.slice(0, spaceIndex);
-      const fieldValue = trimmedLine.slice(spaceIndex + 1).trim();
-      processDataByProcessId[processId] ??= {};
-      processDataByProcessId[processId][fieldName] = fieldValue;
-    }
-  }));
-  return Object.entries(processDataByProcessId).filter(([, data]) => data[PROCESS_FIELDS.COMMAND_NAME] && data[PROCESS_FIELDS.PARENT_PROCESS_ID] !== undefined).map(([processId, data]) => parseProcessFields({
-    processId,
-    parentProcessId: data[PROCESS_FIELDS.PARENT_PROCESS_ID],
-    userId: data[PROCESS_FIELDS.USER_ID],
-    cpuUsage: data[PROCESS_FIELDS.CPU_PERCENT],
-    memoryUsage: data[PROCESS_FIELDS.MEMORY_PERCENT],
-    commandName: data[PROCESS_FIELDS.COMMAND_NAME],
-    startTimeString: data[PROCESS_FIELDS.START_TIME],
-    command: data[PROCESS_FIELDS.ARGUMENTS] ?? ""
-  }));
-};
-var nonWindowsCall = async (options = {}) => {
-  const processCommandFlags = buildProcessCommandFlags(options.all);
-  const executeFileOptions = {
-    maxBuffer: DEFAULT_MAX_BUFFER,
-    encoding: "utf8",
-    env: {
-      ...process2.env,
-      LC_ALL: "C",
-      LANG: "C"
-    }
-  };
-  const processFieldCommaSeparatedList = [
-    PROCESS_FIELDS.PROCESS_ID,
-    PROCESS_FIELDS.PARENT_PROCESS_ID,
-    PROCESS_FIELDS.USER_ID,
-    PROCESS_FIELDS.CPU_PERCENT,
-    PROCESS_FIELDS.MEMORY_PERCENT,
-    PROCESS_FIELDS.START_TIME,
-    PROCESS_FIELDS.COMMAND_NAME
-  ].map((fieldName) => `${fieldName}=`).join(",");
-  const commandFieldCommaSeparatedList = [
-    PROCESS_FIELDS.PROCESS_ID,
-    PROCESS_FIELDS.ARGUMENTS
-  ].map((fieldName) => `${fieldName}=`).join(",");
-  const processListingPromises = [
-    execFile("ps", [processCommandFlags, processFieldCommaSeparatedList], executeFileOptions),
-    execFile("ps", [processCommandFlags, commandFieldCommaSeparatedList], executeFileOptions)
-  ];
-  const [processOutput, commandOutput] = await Promise.all(processListingPromises);
-  const processLines = processOutput.stdout.trim().split(`
-`);
-  const commandLines = commandOutput.stdout.trim().split(`
-`);
-  const commandLinesByProcessId = {};
-  for (const line of commandLines) {
-    const trimmedLine = line.trim();
-    const spaceIndex = trimmedLine.indexOf(" ");
-    if (spaceIndex === -1) {
-      const processId2 = trimmedLine;
-      commandLinesByProcessId[processId2] = "";
-      continue;
-    }
-    const processId = trimmedLine.slice(0, spaceIndex);
-    const command = trimmedLine.slice(spaceIndex + 1).trim();
-    commandLinesByProcessId[processId] = command;
-  }
-  const processes = [];
-  for (const line of processLines) {
-    const trimmedLine = line.trim();
-    if (!trimmedLine) {
-      continue;
-    }
-    const processLineRegexMatch = trimmedLine.match(/^(\d+)\s+(\d+)\s+(\d+)\s+([\d.]+)\s+([\d.]+)\s+(.+)/);
-    if (!processLineRegexMatch) {
-      continue;
-    }
-    const [, processId, parentProcessId, userId, cpuUsage, memoryUsage, dateAndCommandPortion] = processLineRegexMatch;
-    const startTimeRegexMatch = dateAndCommandPortion.match(/^((?:\w{3}\s+){2}\d{1,2}\s+(?:\d{2}:){2}\d{2}\s+\d{4})\s+(.*)$/);
-    let startTimeString = "";
-    let processCommandName = dateAndCommandPortion;
-    if (startTimeRegexMatch) {
-      startTimeString = startTimeRegexMatch[1];
-      processCommandName = startTimeRegexMatch[2] || "";
-    }
-    processes.push(parseProcessFields({
-      processId,
-      parentProcessId,
-      userId,
-      cpuUsage,
-      memoryUsage,
-      commandName: processCommandName,
-      startTimeString,
-      command: commandLinesByProcessId[processId] ?? ""
-    }));
-  }
-  return processes;
-};
-var nonWindows = async (options = {}) => {
-  try {
-    return await nonWindowsCall(options);
-  } catch {
-    return nonWindowsFallbackMultipleCalls(options);
-  }
-};
-var psList = process2.platform === "win32" ? windows : nonWindows;
-var ps_list_default = psList;
-
 // src/shell.ts
 import { createInterface } from "readline";
 import Client from "@scriptdb/client";
@@ -504,6 +237,71 @@ Examples:
 }
 
 // src/index.ts
+async function getProcessList() {
+  try {
+    if (process.platform === "win32") {
+      const output = execSync("wmic process get ProcessId,WorkingSetSize /format:csv", {
+        encoding: "utf8",
+        stdio: ["pipe", "pipe", "ignore"]
+      });
+      const lines = output.split(`
+`).slice(1);
+      const processes = [];
+      for (const line of lines) {
+        const parts = line.split(",").map((p) => p.trim());
+        if (parts.length >= 2 && parts[0] && parts[1]) {
+          const pid = parseInt(parts[0], 10);
+          const memory = parseInt(parts[1], 10);
+          if (!isNaN(pid) && !isNaN(memory)) {
+            processes.push({ pid, memory });
+          }
+        }
+      }
+      return processes;
+    } else if (process.platform === "darwin") {
+      const output = execSync("ps -eo pid,pcpu,rss", {
+        encoding: "utf8",
+        stdio: ["pipe", "pipe", "ignore"]
+      });
+      const lines = output.split(`
+`).slice(1);
+      const processes = [];
+      for (const line of lines) {
+        const match = line.trim().match(/\s*(\d+)\s+([\d.]+)\s+(\d+)/);
+        if (match) {
+          processes.push({
+            pid: parseInt(match[1], 10),
+            cpu: parseFloat(match[2]),
+            memory: parseInt(match[3], 10) * 1024
+          });
+        }
+      }
+      return processes;
+    } else {
+      const output = execSync("ps -eo pid,pcpu,rss", {
+        encoding: "utf8",
+        stdio: ["pipe", "pipe", "ignore"]
+      });
+      const lines = output.split(`
+`).slice(1);
+      const processes = [];
+      for (const line of lines) {
+        const match = line.trim().match(/\s*(\d+)\s+([\d.]+)\s+(\d+)/);
+        if (match) {
+          processes.push({
+            pid: parseInt(match[1], 10),
+            cpu: parseFloat(match[2]),
+            memory: parseInt(match[3], 10) * 1024
+          });
+        }
+      }
+      return processes;
+    }
+  } catch (error) {
+    console.error("Failed to get process list:", error);
+    return [];
+  }
+}
 var SCRIPTDB_DIR = join(homedir(), ".scriptdb");
 var PID_FILE = join(SCRIPTDB_DIR, "scriptdb.pid");
 var LOG_FILE = join(SCRIPTDB_DIR, "scriptdb.log");
@@ -629,7 +427,7 @@ async function statusCommand() {
     console.log(`  PID: ${pid}`);
     console.log(`  Logs: ${LOG_FILE}`);
     try {
-      const processes = await ps_list_default();
+      const processes = await getProcessList();
       const proc = processes.find((p) => p.pid === pid);
       if (proc) {
         if (proc.cpu !== undefined) {
@@ -765,7 +563,7 @@ function ensureScriptDBDir() {
   if (!existsSync(PACKAGE_JSON)) {
     const packageJsonContent = {
       name: "scriptdb-workspace",
-      version: "1.0.5",
+      version: "1.0.6",
       description: "ScriptDB workspace for custom scripts, services, and databases",
       private: true,
       devDependencies: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scriptdb/cli",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "description": "CLI tool to start and manage ScriptDB server",
   "type": "module",
   "bin": {
@@ -38,8 +38,7 @@
     "typescript": "^5.0.0"
   },
   "dependencies": {
-    "@scriptdb/server": "^1.0.5",
-    "@scriptdb/client": "^1.0.5",
-    "ps-list": "^9.0.0"
+    "@scriptdb/server": "^1.0.6",
+    "@scriptdb/client": "^1.0.6"
   }
 }