Merge pull request #41 from oxdev03/change-fix-process-type

fix: invalid process type, fixes #40
oxdev03 · Sep 7, 2024 · 5faa546 · 5faa546
2 parents ebab35d + d509ffc
commit 5faa546
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 13 deletions.
diff --git a/apps/backend/utils/processInfo.ts b/apps/backend/utils/processInfo.ts
@@ -1,3 +1,4 @@
+import { IProcessType, PROCESS_TYPES } from "@pm2.web/typings";
 import bytes from "bytes-iec";
 import pm2 from "pm2";
 
@@ -26,6 +27,8 @@ const getProcessInfo = async (): Promise<IProcessInfo[]> => {
         unit: "",
       };
 
+      const interpreter = item?.pm2_env?.exec_interpreter;
+
       return {
         name: item.name || item.pm_id,
         pm_id: item.pm_id,
@@ -44,7 +47,9 @@ const getProcessInfo = async (): Promise<IProcessInfo[]> => {
           unstaged: item.pm2_env?.versioning?.unstaged ?? true,
         },
         status: item?.pm2_env?.status || "offline",
-        type: item?.pm2_env?.exec_interpreter || "",
+        type: PROCESS_TYPES.includes(interpreter as IProcessType)
+          ? interpreter
+          : "other",
       };
     })
     .filter((item) => !!item) as IProcessInfo[];

diff --git a/packages/typings/src/process.ts b/packages/typings/src/process.ts
@@ -7,17 +7,20 @@ interface ILog {
   _id: string;
 }
 
-type IProcessType =
-  | "node"
-  | "python"
-  | "ruby"
-  | "php"
-  | "bash"
-  | "go"
-  | "dotnet"
-  | "shell"
-  | "java"
-  | "other";
+const PROCESS_TYPES = <const> [
+  "node",
+  "python",
+  "ruby",
+  "php",
+  "bash",
+  "go",
+  "dotnet",
+  "shell",
+  "java",
+  "other",
+]
+
+type IProcessType = typeof PROCESS_TYPES[number];
 
 type IProcessStatus =
   | "online"
@@ -58,5 +61,9 @@ export type {
   IProcessType,
   IProcessStatus,
   IProcess,
-  IProcessModel,
+  IProcessModel
 };
+
+export {
+  PROCESS_TYPES
+}