Strict string launch arg value

Comfy-Org · Nov 24, 2024 · f3c8299 · f3c8299
1 parent 6aaa687
commit f3c8299
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/src/config/comfySettings.ts b/src/config/comfySettings.ts
@@ -15,7 +15,7 @@ export const DEFAULT_SETTINGS: ComfySettingsData = {
 export interface ComfySettingsData {
   'Comfy-Desktop.AutoUpdate': boolean;
   'Comfy-Desktop.SendStatistics': boolean;
-  'Comfy.Server.LaunchArgs': Record<string, string | boolean>;
+  'Comfy.Server.LaunchArgs': Record<string, string>;
   [key: string]: unknown;
 }
 

diff --git a/src/constants.ts b/src/constants.ts
@@ -104,7 +104,7 @@ export const DEFAULT_SERVER_ARGS = {
   /** The port to use for the ComfyUI server. */
   port: 8000,
   // Extra arguments to pass to the ComfyUI server.
-  extraServerArgs: {} as Record<string, string | boolean>,
+  extraServerArgs: {} as Record<string, string>,
 };
 
 export type ServerArgs = typeof DEFAULT_SERVER_ARGS;

diff --git a/src/main-process/comfyServer.ts b/src/main-process/comfyServer.ts
@@ -77,8 +77,8 @@ export class ComfyServer {
       })
         .map(([key, value]) => [`--${key}`, value])
         .flat()
-        // Boolean true values are ignored. e.g. { '--cpu': true } => '--cpu'
-        .filter((value: string | boolean) => typeof value === 'string' && value !== '')
+        // Empty string values are ignored. e.g. { '--cpu': '' } => '--cpu'
+        .filter((value: string) => value !== '')
     );
   }
 

diff --git a/src/main.ts b/src/main.ts
@@ -89,9 +89,8 @@ if (!gotTheLock) {
       const host = process.env.COMFY_HOST || DEFAULT_SERVER_ARGS.host;
       const targetPort = process.env.COMFY_PORT ? parseInt(process.env.COMFY_PORT) : DEFAULT_SERVER_ARGS.port;
       const port = useExternalServer ? targetPort : await findAvailablePort(host, targetPort, targetPort + 1000);
-      const cpuOnly: Record<string, string | boolean> =
-        process.env.COMFYUI_CPU_ONLY === 'true' ? { '--cpu': true } : {};
-      const extraServerArgs: Record<string, string | boolean> = {
+      const cpuOnly: Record<string, string> = process.env.COMFYUI_CPU_ONLY === 'true' ? { '--cpu': '' } : {};
+      const extraServerArgs: Record<string, string> = {
         ...comfyDesktopApp.comfySettings.get('Comfy.Server.LaunchArgs'),
         ...cpuOnly,
       };