🚨 [security] [cli] Update form-data 4.0.2 → 4.0.4 (patch)

cli/package.json

@@ -2,7 +2,7 @@
   "name": "@joystick.js/cli",
   "type": "module",
   "version": "1.0.0-rc.1",
-  "canary_version": "0.0.0-canary.2160",
+  "canary_version": "0.0.0-canary.2168",
   "description": "The CLI for Joystick.",
   "main": "dist/index.js",
   "bin": {
@@ -25,7 +25,7 @@
     "chokidar": "^3.5.3",
     "esbuild": "^0.25.2",
     "esbuild-plugin-svg": "^0.1.0",
-    "form-data": "^4.0.2",
+    "form-data": "^4.0.4",
     "inquirer": "^9.2.12",
     "mongodb": "^6.16.0",
     "node-fetch": "^3.3.2",

cli/src/lib/development_server/index.js

@@ -190,7 +190,17 @@ const handle_restart_app_server = async (node_major_version = 0, watch = false,
       ]);
 
       await kill_port_process(process.env.PORT);
-      handle_start_app_server(node_major_version, watch, imports, run_integrated_tests);
+      const current_settings = await load_settings(process.env.NODE_ENV);
+      process.app_server_process = start_app_server(node_major_version, watch, imports, {
+        NODE_ENV: process.env.NODE_ENV,
+        PORT: process.env.PORT,
+        LOGS_PATH: process.env.LOGS_PATH,
+        ROOT_URL: process.env.ROOT_URL,
+        JOYSTICK_SETTINGS: JSON.stringify(current_settings),
+      });
+      process_ids.push(process.app_server_process?.pid);
+      handle_app_server_process_stdio(watch, run_integrated_tests, false);
+      process.app_server_restarting = false;
     }
   }, 300);
 };
@@ -267,8 +277,14 @@ const handle_app_server_process_stdio = (watch = false, run_integrated_tests = f
   });
 };
 
-const handle_start_app_server = (node_major_version = 0, watch = false, imports = [], run_integrated_tests = false, is_test_server = false) => {
-	process.app_server_process = start_app_server(node_major_version, watch, imports);
+const handle_start_app_server = (node_major_version = 0, watch = false, imports = [], run_integrated_tests = false, is_test_server = false, settings = {}) => {
+	process.app_server_process = start_app_server(node_major_version, watch, imports, {
+    NODE_ENV: process.env.NODE_ENV,
+    PORT: process.env.PORT,
+    LOGS_PATH: process.env.LOGS_PATH,
+    ROOT_URL: process.env.ROOT_URL,
+    JOYSTICK_SETTINGS: JSON.stringify(settings),
+  });
   process_ids.push(process.app_server_process?.pid);
   handle_app_server_process_stdio(watch, run_integrated_tests, is_test_server);
   process.app_server_restarting = false;
@@ -431,6 +447,16 @@ const development_server = async (development_server_options = {}) => {
     settings
   });
 
+  // NOTE: Start the main app server first
+  handle_start_app_server(
+    node_major_version,
+    development_server_options?.watch,
+    development_server_options?.imports || [],
+    development_server_options?.tests, // Pass tests flag for integrated test running
+    false, // This is not a test server
+    settings, // Pass the loaded settings
+  );
+
   // NOTE: If tests flag is enabled, start a separate test server on port 1977.
   if (development_server_options?.tests && development_server_options?.environment !== 'test') {
     const test_port_occupied = await check_if_port_occupied(1977);
@@ -441,8 +467,10 @@ const development_server = async (development_server_options = {}) => {
     // NOTE: Start test server directly without recursive development_server call
     setTimeout(async () => {
       try {
-        // NOTE: Start test databases
-        const test_settings = await load_settings('test');
+        // NOTE: Load test settings without contaminating global process.env.JOYSTICK_SETTINGS
+        const test_settings_file_path = `${process.cwd()}/settings.test.json`;
+        const test_settings_raw = await fs.promises.readFile(test_settings_file_path, 'utf-8');
+        const test_settings = JSON.parse(test_settings_raw);
 
         await start_databases({
           environment: 'test',
@@ -455,7 +483,7 @@ const development_server = async (development_server_options = {}) => {
           PORT: 1977,
           LOGS_PATH: process.env.LOGS_PATH,
           ROOT_URL: process.env.ROOT_URL,
-          JOYSTICK_SETTINGS: process.env.JOYSTICK_SETTINGS,
+          JOYSTICK_SETTINGS: JSON.stringify(test_settings),
         });
 
         process_ids.push(test_app_server?.pid);
@@ -505,13 +533,13 @@ const development_server = async (development_server_options = {}) => {
         development_server_options?.imports,
         development_server_options?.tests,
       ),
-      start_app_server: () => handle_start_app_server(
-        node_major_version,
-        development_server_options?.watch,
-        development_server_options?.imports,
-        development_server_options?.tests,
-        development_server_options?._is_test_server,
-      ),
+      start_app_server: () => start_app_server(node_major_version, development_server_options?.watch, development_server_options?.imports || [], {
+        NODE_ENV: process.env.NODE_ENV,
+        PORT: process.env.PORT,
+        LOGS_PATH: process.env.LOGS_PATH,
+        ROOT_URL: process.env.ROOT_URL,
+        JOYSTICK_SETTINGS: JSON.stringify(settings),
+      }),
       start_hmr_server: development_server_options?.environment !== 'test' ? () => handle_start_hmr_server(
         node_major_version,
         __dirname,
@@ -538,15 +566,6 @@ const development_server = async (development_server_options = {}) => {
         return { path };
       }) || [],
     });
-  } else {
-    // NOTE: For test server, just start the app server without file watching
-    handle_start_app_server(
-      node_major_version,
-      false, // No file watching for test server
-      development_server_options?.imports || [],
-      false, // No integrated tests for test server
-      true, // This is a test server
-    );
   }
 
   handle_signal_events(process_ids, node_major_version, __dirname);

cli/src/lib/load_settings.js

@@ -34,9 +34,6 @@ const load_settings = async (environment = null) => {
 
   const settings_file = is_valid_json ? raw_settings_file : "{}";
 
-  // NOTE: Child process will inherit this env var from this parent process.
-  process.env.JOYSTICK_SETTINGS = settings_file;
-
   return JSON.parse(settings_file);
 };