@powerhousedao/ph-cli 0.25.0 → 0.26.0

package/dist/commands/service.js

@@ -1,21 +1,35 @@
 import { Argument } from 'commander';
-import { execSync } from 'node:child_process';
+import pm2 from 'pm2';
+import { getConfig } from '@powerhousedao/config/powerhouse';
 
 const actions = ["start", "stop", "status", "list", "install", "save"];
 const services = ["reactor", "connect", "all"];
+let reactorPort = 8442;
+let connectPort = 8443;
 const manageService = async (action, service) => {
-  if (action === "install") {
-    const result = execSync(`pm2 startup | tail -n 1`);
-    const result2 = execSync(result.toString());
-    console.log(result2.toString());
-    return;
-  } else {
-    const app = service !== "all" ? `--only  ${service}` : "";
-    const response = execSync(
-      `pm2 ${action} ${["start", "stop", "list"].includes(action) ? `powerhouse-services.config.json ${app}` : ""}`
-    );
-    execSync(`pm2 save`);
-    console.log(response.toString());
+  try {
+    const config = getConfig();
+    if (config.reactor?.port) {
+      reactorPort = config.reactor.port;
+    }
+    if (config.studio?.port) {
+      connectPort = config.studio.port;
+    }
+    pm2.connect((err) => {
+      switch (action) {
+        case "start":
+          startServices(service);
+          break;
+        case "stop":
+          stopServices(service);
+          break;
+        case "status":
+          statusServices();
+          break;
+      }
+    });
+  } catch (error) {
+    console.error(error);
   }
 };
 function serviceCommand(program) {
@@ -23,6 +37,81 @@ function serviceCommand(program) {
     new Argument("service").choices(services).argOptional().default("all")
   ).action(manageService);
 }
+function startServices(service) {
+  if (service === "reactor" || service === "all") {
+    const reactorOptions = {
+      name: "reactor",
+      script: "npx ph-cli reactor"
+    };
+    console.log("Starting reactor...");
+    pm2.start(reactorOptions, (err) => {
+      if (err) {
+        console.log(err.name);
+      }
+      dumpServices();
+    });
+    console.log("Reactor started");
+  }
+  if (service === "connect" || service === "all") {
+    const connectOptions = {
+      name: "connect",
+      script: "npx ph-cli connect",
+      args: ["--port", connectPort.toString()]
+    };
+    console.log("Starting connect...");
+    pm2.start(connectOptions, (err) => {
+      if (err) {
+        throw new Error(err.message);
+      }
+      dumpServices();
+    });
+    console.log("Connect started");
+  }
+}
+function dumpServices() {
+  pm2.dump((err) => {
+    if (err) {
+      throw new Error(err.message);
+    }
+    statusServices();
+  });
+}
+function stopServices(service) {
+  if (service === "all" || service === "connect") {
+    pm2.stop("connect", (err) => {
+      if (err) {
+        throw new Error(err.message);
+      }
+      dumpServices();
+    });
+  }
+  if (service === "all" || service === "reactor") {
+    pm2.stop("reactor", (err) => {
+      if (err) {
+        throw new Error(err.message);
+      }
+      dumpServices();
+    });
+  }
+}
+function statusServices() {
+  pm2.list((err, list) => {
+    const formattedList = list.map((item) => {
+      return {
+        id: item.pm_id,
+        name: item.name,
+        pid: item.pid,
+        uptime: item.pm2_env?.pm_uptime,
+        restarts: item.pm2_env?.unstable_restarts,
+        status: item.pm2_env?.status,
+        mem: item.monit?.memory,
+        cpu: item.monit?.cpu
+      };
+    });
+    console.table(formattedList);
+    process.exit(0);
+  });
+}
 
 export { manageService, serviceCommand };
 //# sourceMappingURL=service.js.map

package/dist/commands/service.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/commands/service.ts"],"names":[],"mappings":";;;AAGA,MAAM,UAAU,CAAC,OAAA,EAAS,QAAQ,QAAU,EAAA,MAAA,EAAQ,WAAW,MAAM,CAAA;AACrE,MAAM,QAAW,GAAA,CAAC,SAAW,EAAA,SAAA,EAAW,KAAK,CAAA;AAEhC,MAAA,aAAA,GAAqD,OAChE,MAAA,EACA,OACG,KAAA;AACH,EAAA,IAAI,WAAW,SAAW,EAAA;AACxB,IAAM,MAAA,MAAA,GAAS,SAAS,CAAyB,uBAAA,CAAA,CAAA;AACjD,IAAA,MAAM,OAAU,GAAA,QAAA,CAAS,MAAO,CAAA,QAAA,EAAU,CAAA;AAC1C,IAAQ,OAAA,CAAA,GAAA,CAAI,OAAQ,CAAA,QAAA,EAAU,CAAA;AAE9B,IAAA;AAAA,GACK,MAAA;AACL,IAAA,MAAM,GAAM,GAAA,OAAA,KAAY,KAAQ,GAAA,CAAA,QAAA,EAAW,OAAO,CAAK,CAAA,GAAA,EAAA;AACvD,IAAA,MAAM,QAAW,GAAA,QAAA;AAAA,MACf,CAAO,IAAA,EAAA,MAAM,CACX,CAAA,EAAA,CAAC,SAAS,MAAQ,EAAA,MAAM,CAAE,CAAA,QAAA,CAAS,MAAM,CAAA,GACrC,CAAmC,gCAAA,EAAA,GAAG,KACtC,EACN,CAAA;AAAA,KACF;AACA,IAAA,QAAA,CAAS,CAAU,QAAA,CAAA,CAAA;AACnB,IAAQ,OAAA,CAAA,GAAA,CAAI,QAAS,CAAA,QAAA,EAAU,CAAA;AAAA;AAEnC;AAEO,SAAS,eAAe,OAAkB,EAAA;AAC/C,EAAA,OAAA,CACG,QAAQ,SAAS,CAAA,CACjB,WAAY,CAAA,iBAAiB,EAC7B,WAAY,CAAA,IAAI,QAAS,CAAA,QAAQ,EAAE,OAAQ,CAAA,OAAO,EAAE,OAAQ,CAAA,MAAM,CAAC,CACnE,CAAA,WAAA;AAAA,IACC,IAAI,QAAS,CAAA,SAAS,CAAE,CAAA,OAAA,CAAQ,QAAQ,CAAE,CAAA,WAAA,EAAc,CAAA,OAAA,CAAQ,KAAK;AAAA,GACvE,CACC,OAAO,aAAa,CAAA;AACzB","file":"service.js","sourcesContent":["import { Argument, Command } from \"commander\";\nimport { execSync } from \"node:child_process\";\nimport { CommandActionType } from \"../types.js\";\nconst actions = [\"start\", \"stop\", \"status\", \"list\", \"install\", \"save\"];\nconst services = [\"reactor\", \"connect\", \"all\"];\n\nexport const manageService: CommandActionType<[string, string]> = async (\n  action,\n  service,\n) => {\n  if (action === \"install\") {\n    const result = execSync(`pm2 startup | tail -n 1`);\n    const result2 = execSync(result.toString());\n    console.log(result2.toString());\n\n    return;\n  } else {\n    const app = service !== \"all\" ? `--only  ${service}` : \"\";\n    const response = execSync(\n      `pm2 ${action} ${\n        [\"start\", \"stop\", \"list\"].includes(action)\n          ? `powerhouse-services.config.json ${app}`\n          : \"\"\n      }`,\n    );\n    execSync(`pm2 save`);\n    console.log(response.toString());\n  }\n};\n\nexport function serviceCommand(program: Command) {\n  program\n    .command(\"service\")\n    .description(\"Manage services\")\n    .addArgument(new Argument(\"action\").choices(actions).default(\"list\"))\n    .addArgument(\n      new Argument(\"service\").choices(services).argOptional().default(\"all\"),\n    )\n    .action(manageService);\n}\n"]}
+{"version":3,"sources":["../../src/commands/service.ts"],"names":[],"mappings":"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","file":"service.js","sourcesContent":["import { Argument, Command } from \"commander\";\nimport { execSync, spawn } from \"node:child_process\";\nimport { CommandActionType } from \"../types.js\";\nimport pm2, { StartOptions } from \"pm2\";\nimport { getConfig, PowerhouseConfig } from \"@powerhousedao/config/powerhouse\";\n\nconst actions = [\"start\", \"stop\", \"status\", \"list\", \"install\", \"save\"];\nconst services = [\"reactor\", \"connect\", \"all\"];\n\nlet reactorPort = 8442;\nlet connectPort = 8443;\nexport const manageService: CommandActionType<[string, string]> = async (\n  action,\n  service,\n) => {\n  try {\n    const config = getConfig();\n    if (config.reactor?.port) {\n      reactorPort = config.reactor.port;\n    }\n    if (config.studio?.port) {\n      connectPort = config.studio.port;\n    }\n\n    pm2.connect((err) => {\n      switch (action) {\n        case \"start\":\n          startServices(service);\n          break;\n        case \"stop\":\n          stopServices(service);\n          break;\n        case \"status\":\n          statusServices();\n          break;\n      }\n    });\n  } catch (error) {\n    console.error(error);\n  }\n};\n\nexport function serviceCommand(program: Command) {\n  program\n    .command(\"service\")\n    .description(\"Manage services\")\n    .addArgument(new Argument(\"action\").choices(actions).default(\"list\"))\n    .addArgument(\n      new Argument(\"service\").choices(services).argOptional().default(\"all\"),\n    )\n    .action(manageService);\n}\n\nfunction startServices(service: string) {\n  if (service === \"reactor\" || service === \"all\") {\n    const reactorOptions: StartOptions = {\n      name: \"reactor\",\n      script: \"npx ph-cli reactor\",\n    };\n    console.log(\"Starting reactor...\");\n    pm2.start(reactorOptions, (err) => {\n      if (err) {\n        console.log(err.name);\n        // throw new Error(err.message);\n      }\n\n      dumpServices();\n    });\n    console.log(\"Reactor started\");\n  }\n\n  if (service === \"connect\" || service === \"all\") {\n    const connectOptions: StartOptions = {\n      name: \"connect\",\n      script: \"npx ph-cli connect\",\n      args: [\"--port\", connectPort.toString()],\n    };\n    console.log(\"Starting connect...\");\n    pm2.start(connectOptions, (err) => {\n      if (err) {\n        throw new Error(err.message);\n      }\n\n      dumpServices();\n    });\n    console.log(\"Connect started\");\n  }\n}\n\nfunction dumpServices() {\n  pm2.dump((err) => {\n    if (err) {\n      throw new Error(err.message);\n    }\n\n    statusServices();\n  });\n}\n\nfunction stopServices(service: string) {\n  if (service === \"all\" || service === \"connect\") {\n    pm2.stop(\"connect\", (err) => {\n      if (err) {\n        throw new Error(err.message);\n      }\n\n      dumpServices();\n    });\n  }\n  if (service === \"all\" || service === \"reactor\") {\n    pm2.stop(\"reactor\", (err) => {\n      if (err) {\n        throw new Error(err.message);\n      }\n\n      dumpServices();\n    });\n  }\n}\n\nfunction statusServices() {\n  pm2.list((err, list) => {\n    const formattedList = list.map((item) => {\n      return {\n        id: item.pm_id,\n        name: item.name,\n        pid: item.pid,\n        uptime: item.pm2_env?.pm_uptime,\n        restarts: item.pm2_env?.unstable_restarts,\n        status: item.pm2_env?.status,\n        mem: item.monit?.memory,\n        cpu: item.monit?.cpu,\n      };\n    });\n\n    console.table(formattedList);\n    process.exit(0);\n  });\n}\n"]}

package/dist/scripts/service-startup.sh

@@ -0,0 +1,4 @@
+OUTPUT=$(pm2 startup | tail -n 1)
+eval $OUTPUT
+sudo systemctl enable pm2-$USER
+sudo systemctl start pm2-$USER

package/dist/scripts/service-unstartup.sh

@@ -0,0 +1,4 @@
+sudo systemctl stop pm2-$USER
+sudo systemctl disable pm2-$USER
+OUTPUT=$(pm2 unstartup | tail -n 1)
+eval $OUTPUT

package/dist/scripts/setup.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.34.0/install.sh | bash
+. ~/.nvm/nvm.sh
+export NVM_DIR="$HOME/.nvm"
+[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
+[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion
+nvm --version
+nvm install 20
+npm install -g pnpm
+pnpm setup
+source $HOME/.bashrc
+pnpm install -g ph-cmd

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@powerhousedao/ph-cli",
-  "version": "0.25.0",
+  "version": "0.26.0",
   "description": "",
   "license": "AGPL-3.0-only",
   "type": "module",
@@ -40,11 +40,11 @@
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "@powerhousedao/codegen": "0.31.3",
-    "@powerhousedao/design-system": "1.21.3",
     "@powerhousedao/config": "1.12.0",
+    "@powerhousedao/reactor-local": "1.15.3",
+    "@powerhousedao/design-system": "1.21.3",
     "@powerhousedao/scalars": "1.19.0",
-    "document-model-libs": "1.127.3",
-    "@powerhousedao/reactor-local": "1.15.3"
+    "document-model-libs": "1.127.3"
   },
   "scripts": {
     "build": "tsup",