@joystick.js/cli-canary 0.0.0-canary.60 → 0.0.0-canary.62

package/dist/functions/start/index.js

@@ -1,4 +1,23 @@
 import dev from "../../lib/dev/index.js";
+const startHMRProcess = () => {
+  const execArgv = ["--no-warnings"];
+  if (majorVersion < 19) {
+    execArgv.push("--experimental-specifier-resolution=node");
+  }
+  const hmrProcess = child_process.fork(
+    path.resolve(`${__dirname}/hmrServer.js`),
+    [],
+    {
+      execArgv,
+      // NOTE: Pipe stdin, stdout, and stderr. IPC establishes a message channel so we
+      // communicate with the child_process.
+      silent: true
+    }
+  );
+  process.hmrProcess = hmrProcess;
+  handleHMRProcessSTDIO();
+  handleHMRProcessMessages();
+};
 var start_default = async (args = {}, options = {}) => {
   const port = options?.port ? parseInt(options?.port) : 2600;
   await dev({

package/dist/lib/dev/index.js

@@ -20,12 +20,6 @@ import { SETTINGS_FILE_NAME_REGEX } from "../regexes.js";
 import getCodependenciesForFile from "./getCodependenciesForFile.js";
 import removeDeletedDependenciesFromMap from "../build/removeDeletedDependenciesFromMap.js";
 import chalk from "chalk";
-const nodeMajorVersion = parseInt(
-  process?.version?.split(".")[0]?.replace("v", ""),
-  10
-);
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = dirname(__filename);
 const getDatabaseProcessIds = () => {
   try {
     const databaseProcessIds = [];
@@ -50,7 +44,7 @@ const getDatabaseProcessIds = () => {
     throw new Error(`[dev.getDatabaseProcessIds] ${exception.message}`);
   }
 };
-const handleSignalEvents = (processIds = []) => {
+const handleSignalEvents = (processIds = [], nodeMajorVersion = 0, __dirname = "") => {
   try {
     const execArgv = ["--no-warnings"];
     if (nodeMajorVersion < 19) {
@@ -83,6 +77,46 @@ const handleSignalEvents = (processIds = []) => {
     throw new Error(`[dev.handleSignalEvents] ${exception.message}`);
   }
 };
+const handleServerProcessMessages = () => {
+  try {
+    process.serverProcess.on("message", (message) => {
+      const processMessages = ["SERVER_CLOSED"];
+      if (!processMessages.includes(message)) {
+        process.loader.stable(message);
+      }
+    });
+  } catch (exception) {
+    throw new Error(`[dev.handleServerProcessMessages] ${exception.message}`);
+  }
+};
+const handleServerProcessSTDIO = () => {
+  try {
+    if (process.serverProcess) {
+      process.serverProcess.on("error", (error) => {
+        console.log(error);
+      });
+      process.serverProcess.stdout.on("data", (data) => {
+        const message = data.toString();
+        if (message && message.includes("App running at:")) {
+          process.loader.stable(message);
+        } else {
+          if (message && !message.includes("BUILD_ERROR")) {
+            console.log(message);
+          }
+        }
+      });
+      process.serverProcess.stderr.on("data", (data) => {
+        process.loader.stop();
+        CLILog(data.toString(), {
+          level: "danger",
+          docs: "https://cheatcode.co/docs/joystick"
+        });
+      });
+    }
+  } catch (exception) {
+    throw new Error(`[dev.handleServerProcessSTDIO] ${exception.message}`);
+  }
+};
 const handleAddOrChangeFile = async (context = {}, path2 = "") => {
   try {
     if (context.isAddingOrChangingFile) {
@@ -365,11 +399,16 @@ const dev = async (options, { resolve, reject }) => {
   try {
     validateOptions(options);
     initProcess(options);
+    const nodeMajorVersion = parseInt(
+      process?.version?.split(".")[0]?.replace("v", ""),
+      10
+    );
+    const __filename = fileURLToPath(import.meta.url);
+    const __dirname = dirname(__filename);
     warnInvalidJoystickEnvironment();
     checkForRequiredFiles();
     const settings = await loadSettings({
-      environment: options.environment,
-      process: options.process
+      environment: options.environment
     });
     await startDatabases({
       environment: options.environment,
@@ -378,7 +417,26 @@ const dev = async (options, { resolve, reject }) => {
     });
     await runInitialBuild(settings?.parsed?.config?.build);
     await startFileWatcher(options);
-    handleSignalEvents();
+    const serverProcess = await startApp({
+      nodeMajorVersion,
+      port: options?.port
+    });
+    if (serverProcess) {
+      process.serverProcess = serverProcess;
+      handleServerProcessSTDIO();
+      handleServerProcessMessages();
+    }
+    let hmrProcess;
+    if (options?.environment !== "test") {
+      hmrProcess = await startHMR({
+        nodeMajorVersion
+      });
+    }
+    handleSignalEvents(
+      [serverProcess.pid, hmrProcess.pid],
+      nodeMajorVersion,
+      __dirname
+    );
     resolve();
   } catch (exception) {
     console.warn(exception);

package/dist/lib/dev/loadSettings.js

@@ -62,9 +62,7 @@ const loadSettings = (options, { resolve, reject }) => {
     warnIfSettingsNotFound(settingsPath);
     const settings = getSettings(settingsPath);
     warnIfInvalidJSONInSettings(settings);
-    if (options?.process) {
-      options.process.env.JOYSTICK_SETTINGS = settings;
-    }
+    process.env.JOYSTICK_SETTINGS = settings;
     resolve({
       parsed: JSON.parse(settings),
       unparsed: settings

package/dist/lib/dev/startApp.js

@@ -1,13 +1,50 @@
-const actionMethod = () => {
+import child_process from "child_process";
+import path from "path";
+const handleStartServerProcess = (execArgv = {}, sessionsBeforeHMRUpdate = {}) => {
   try {
+    return child_process.fork(
+      path.resolve(".joystick/build/index.server.js"),
+      [],
+      {
+        execArgv,
+        // NOTE: Pipe stdin, stdout, and stderr. IPC establishes a message channel so we
+        // communicate with the child_process.
+        silent: true,
+        env: {
+          FORCE_COLOR: "1",
+          LOGS_PATH: process.env.LOGS_PATH,
+          NODE_ENV: process.env.NODE_ENV,
+          ROOT_URL: process.env.ROOT_URL,
+          PORT: process.env.PORT,
+          JOYSTICK_SETTINGS: process.env.JOYSTICK_SETTINGS,
+          HMR_SESSIONS: sessionsBeforeHMRUpdate
+        }
+      }
+    );
   } catch (exception) {
-    throw new Error(`[startApp.actionMethod] ${exception.message}`);
+    throw new Error(`[startApp.handleStartServerProcess] ${exception.message}`);
+  }
+};
+const getExecArgs = (nodeMajorVersion = 0) => {
+  try {
+    const execArgv = ["--no-warnings"];
+    if (nodeMajorVersion < 19) {
+      execArgv.push("--experimental-specifier-resolution=node");
+    }
+    if (process.env.NODE_ENV === "development" && process.env.IS_DEBUG_MODE === "true") {
+      execArgv.push("--inspect");
+    }
+    return execArgv;
+  } catch (exception) {
+    throw new Error(`[startApp.getExecArgs] ${exception.message}`);
   }
 };
 const validateOptions = (options) => {
   try {
     if (!options)
       throw new Error("options object is required.");
+    if (!options.nodeMajorVersion)
+      throw new Error("options.nodeMajorVersion is required.");
     if (!options.port)
       throw new Error("options.port is required.");
   } catch (exception) {
@@ -17,7 +54,9 @@ const validateOptions = (options) => {
 const startApp = (options, { resolve, reject }) => {
   try {
     validateOptions(options);
-    resolve();
+    const execArgv = getExecArgs(options?.nodeMajorVersion);
+    const serverProcess = handleStartServerProcess(execArgv);
+    return resolve(serverProcess);
   } catch (exception) {
     reject(`[startApp] ${exception.message}`);
   }

package/dist/lib/dev/startHMR.js

@@ -1,15 +1,38 @@
-const actionMethod = () => {
+import child_process from "child_process";
+import path from "path";
+const handleStartHMRProcess = (execArgv = {}) => {
   try {
+    return child_process.fork(
+      path.resolve(`${__dirname}/hmrServer.js`),
+      [],
+      {
+        execArgv,
+        // NOTE: Pipe stdin, stdout, and stderr. IPC establishes a message channel so we
+        // communicate with the child_process.
+        silent: true
+      }
+    );
   } catch (exception) {
-    throw new Error(`[startHMR.actionMethod] ${exception.message}`);
+    throw new Error(`[startHMR.handleStartHMRProcess] ${exception.message}`);
+  }
+};
+const getExecArgs = (nodeMajorVersion = 0) => {
+  try {
+    const execArgv = ["--no-warnings"];
+    if (nodeMajorVersion < 19) {
+      execArgv.push("--experimental-specifier-resolution=node");
+    }
+    return execArgv;
+  } catch (exception) {
+    throw new Error(`[startHMR.getExecArgs] ${exception.message}`);
   }
 };
 const validateOptions = (options) => {
   try {
     if (!options)
       throw new Error("options object is required.");
-    if (!options.port)
-      throw new Error("options.port is required.");
+    if (!options.nodeMajorVersion)
+      throw new Error("options.nodeMajorVersion is required.");
   } catch (exception) {
     throw new Error(`[startHMR.validateOptions] ${exception.message}`);
   }
@@ -17,7 +40,9 @@ const validateOptions = (options) => {
 const startHMR = (options, { resolve, reject }) => {
   try {
     validateOptions(options);
-    resolve();
+    const execArgv = getExecArgs(options?.nodeMajorVersion);
+    const hmrProcess = handleStartHMRProcess(execArgv);
+    return resolve(hmrProcess);
   } catch (exception) {
     reject(`[startHMR] ${exception.message}`);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@joystick.js/cli-canary",
-  "version": "0.0.0-canary.60",
+  "version": "0.0.0-canary.62",
   "type": "module",
   "description": "CLI for the Joystick JavaScript framework.",
   "main": "development.js",

package/src/functions/start/index.js

@@ -258,29 +258,29 @@ import dev from "../../lib/dev/index.js";
 //  }
 //};
 //
-//const startHMRProcess = () => {
-//  const execArgv = ["--no-warnings"];
-//
-//  if (majorVersion < 19) {
-//    execArgv.push("--experimental-specifier-resolution=node");
-//  }
-//
-//  const hmrProcess = child_process.fork(
-//    path.resolve(`${__dirname}/hmrServer.js`),
-//    [],
-//    {
-//      execArgv,
-//      // NOTE: Pipe stdin, stdout, and stderr. IPC establishes a message channel so we
-//      // communicate with the child_process.
-//      silent: true,
-//    }
-//  );
-//
-//  process.hmrProcess = hmrProcess;
-//
-//  handleHMRProcessSTDIO();
-//  handleHMRProcessMessages();
-//};
+const startHMRProcess = () => {
+  const execArgv = ["--no-warnings"];
+
+  if (majorVersion < 19) {
+    execArgv.push("--experimental-specifier-resolution=node");
+  }
+
+  const hmrProcess = child_process.fork(
+    path.resolve(`${__dirname}/hmrServer.js`),
+    [],
+    {
+      execArgv,
+      // NOTE: Pipe stdin, stdout, and stderr. IPC establishes a message channel so we
+      // communicate with the child_process.
+      silent: true,
+    }
+  );
+
+  process.hmrProcess = hmrProcess;
+
+  handleHMRProcessSTDIO();
+  handleHMRProcessMessages();
+};
 //
 //const notifyHMRClients = (indexHTMLChanged = false) => {
 //  const settings = loadSettings(process.env.NODE_ENV);

package/src/lib/dev/index.js

@@ -23,14 +23,6 @@ import getCodependenciesForFile from "./getCodependenciesForFile.js";
 import removeDeletedDependenciesFromMap from "../build/removeDeletedDependenciesFromMap.js";
 import chalk from "chalk";
 
-const nodeMajorVersion = parseInt(
-  process?.version?.split(".")[0]?.replace("v", ""),
-  10
-);
-
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = dirname(__filename);
-
 const getDatabaseProcessIds = () => {
   try {
     const databaseProcessIds = [];
@@ -62,7 +54,7 @@ const getDatabaseProcessIds = () => {
   }
 };
 
-const handleSignalEvents = (processIds = []) => {
+const handleSignalEvents = (processIds = [], nodeMajorVersion = 0, __dirname = '') => {
   try {
     const execArgv = ["--no-warnings"];
 
@@ -100,6 +92,53 @@ const handleSignalEvents = (processIds = []) => {
   }
 };
 
+const handleServerProcessMessages = () => {
+  try {
+    process.serverProcess.on("message", (message) => {
+      const processMessages = ["SERVER_CLOSED"];
+
+      if (!processMessages.includes(message)) {
+        process.loader.stable(message);
+      }
+    });
+  } catch (exception) {
+    throw new Error(`[dev.handleServerProcessMessages] ${exception.message}`);
+  }
+};
+
+const handleServerProcessSTDIO = () => {
+  try {
+    if (process.serverProcess) {
+      process.serverProcess.on("error", (error) => {
+        console.log(error);
+      });
+
+      process.serverProcess.stdout.on("data", (data) => {
+        const message = data.toString();
+
+        if (message && message.includes("App running at:")) {
+          process.loader.stable(message);
+        } else {
+          if (message && !message.includes("BUILD_ERROR")) {
+            console.log(message);
+          }
+        }
+      });
+
+      process.serverProcess.stderr.on("data", (data) => {
+        process.loader.stop();
+
+        CLILog(data.toString(), {
+          level: "danger",
+          docs: "https://cheatcode.co/docs/joystick",
+        });
+      });
+    }
+  } catch (exception) {
+    throw new Error(`[dev.handleServerProcessSTDIO] ${exception.message}`);
+  }
+};
+
 const handleAddOrChangeFile = async (context = {}, path = '') => {
   try {
     if (context.isAddingOrChangingFile) {
@@ -436,12 +475,19 @@ const dev = async (options, { resolve, reject }) => {
     validateOptions(options);
     initProcess(options);
     
+    const nodeMajorVersion = parseInt(
+      process?.version?.split(".")[0]?.replace("v", ""),
+      10
+    );
+
+    const __filename = fileURLToPath(import.meta.url);
+    const __dirname = dirname(__filename);
+
     warnInvalidJoystickEnvironment();
     checkForRequiredFiles();
 
     const settings = await loadSettings({
       environment: options.environment,
-      process: options.process,
     });
 
     await startDatabases({
@@ -453,11 +499,31 @@ const dev = async (options, { resolve, reject }) => {
     await runInitialBuild(settings?.parsed?.config?.build);
     await startFileWatcher(options);
 
-    handleSignalEvents();
+    const serverProcess = await startApp({
+      nodeMajorVersion,
+      port: options?.port,
+    });
 
-//    if (options?.environment !== 'test') {
-//      await startHMR();
-//    }
+    if (serverProcess) {
+      process.serverProcess = serverProcess;
+      handleServerProcessSTDIO();
+      handleServerProcessMessages();
+    }
+
+    // NOTE: Scope this out here so we can reference the processId below.
+    let hmrProcess;
+
+    if (options?.environment !== 'test') {
+      hmrProcess = await startHMR({
+        nodeMajorVersion,
+      });
+    }
+
+    handleSignalEvents(
+      [serverProcess.pid, hmrProcess.pid],
+      nodeMajorVersion,
+      __dirname
+    );
 //
 //    if (options?.environment === 'test') {
 //      await runTests(options);

package/src/lib/dev/loadSettings.js

@@ -73,9 +73,7 @@ const loadSettings = (options, { resolve, reject }) => {
     const settings = getSettings(settingsPath);
     warnIfInvalidJSONInSettings(settings);
 
-    if (options?.process) {
-      options.process.env.JOYSTICK_SETTINGS = settings;
-    }
+    process.env.JOYSTICK_SETTINGS = settings;
 
     resolve({
       parsed: JSON.parse(settings),

package/src/lib/dev/startApp.js

@@ -1,16 +1,57 @@
-/* eslint-disable consistent-return */
+import child_process from "child_process";
+import path from "path";
 
-const actionMethod = () => {
+const handleStartServerProcess = (execArgv = {}, sessionsBeforeHMRUpdate = {}) => {
   try {
-    // Perform a single step in your action here.
+    return child_process.fork(
+      path.resolve(".joystick/build/index.server.js"),
+      [],
+      {
+        execArgv,
+        // NOTE: Pipe stdin, stdout, and stderr. IPC establishes a message channel so we
+        // communicate with the child_process.
+        silent: true,
+        env: {
+          FORCE_COLOR: "1",
+          LOGS_PATH: process.env.LOGS_PATH,
+          NODE_ENV: process.env.NODE_ENV,
+          ROOT_URL: process.env.ROOT_URL,
+          PORT: process.env.PORT,
+          JOYSTICK_SETTINGS: process.env.JOYSTICK_SETTINGS,
+          HMR_SESSIONS: sessionsBeforeHMRUpdate,
+        },
+      }
+    );
   } catch (exception) {
-    throw new Error(`[startApp.actionMethod] ${exception.message}`);
+    throw new Error(`[startApp.handleStartServerProcess] ${exception.message}`);
+  }
+};
+
+const getExecArgs = (nodeMajorVersion = 0) => {
+  try {
+    const execArgv = ["--no-warnings"];
+
+    if (nodeMajorVersion < 19) {
+      execArgv.push("--experimental-specifier-resolution=node");
+    }
+
+    if (
+      process.env.NODE_ENV === "development" &&
+        process.env.IS_DEBUG_MODE === "true"
+      ) {
+      execArgv.push("--inspect");
+    }
+
+    return execArgv;
+  } catch (exception) {
+    throw new Error(`[startApp.getExecArgs] ${exception.message}`);
   }
 };
 
 const validateOptions = (options) => {
   try {
     if (!options) throw new Error('options object is required.');
+    if (!options.nodeMajorVersion) throw new Error('options.nodeMajorVersion is required.');
     if (!options.port) throw new Error('options.port is required.');
   } catch (exception) {
     throw new Error(`[startApp.validateOptions] ${exception.message}`);
@@ -20,8 +61,11 @@ const validateOptions = (options) => {
 const startApp = (options, { resolve, reject }) => {
   try {
     validateOptions(options);
-    // Call action methods in sequence here.
-    resolve();
+
+    const execArgv = getExecArgs(options?.nodeMajorVersion);
+    const serverProcess = handleStartServerProcess(execArgv);
+
+    return resolve(serverProcess);
   } catch (exception) {
     reject(`[startApp] ${exception.message}`);
   }

package/src/lib/dev/startHMR.js

@@ -1,17 +1,43 @@
-/* eslint-disable consistent-return */
+import child_process from "child_process";
+import path from "path";
 
-const actionMethod = () => {
+const handleStartHMRProcess = (execArgv = {}) => {
   try {
-    // Perform a single step in your action here.
+    // NOTE: Port is automatically pulled via process.env.PORT
+    // in the hmrServer.js script.
+    return child_process.fork(
+      path.resolve(`${__dirname}/hmrServer.js`),
+      [],
+      {
+        execArgv,
+        // NOTE: Pipe stdin, stdout, and stderr. IPC establishes a message channel so we
+        // communicate with the child_process.
+        silent: true,
+      }
+    );
   } catch (exception) {
-    throw new Error(`[startHMR.actionMethod] ${exception.message}`);
+    throw new Error(`[startHMR.handleStartHMRProcess] ${exception.message}`);
+  }
+};
+
+const getExecArgs = (nodeMajorVersion = 0) => {
+  try {
+    const execArgv = ["--no-warnings"];
+
+    if (nodeMajorVersion < 19) {
+      execArgv.push("--experimental-specifier-resolution=node");
+    }
+    
+    return execArgv;
+  } catch (exception) {
+    throw new Error(`[startHMR.getExecArgs] ${exception.message}`);
   }
 };
 
 const validateOptions = (options) => {
   try {
     if (!options) throw new Error('options object is required.');
-    if (!options.port) throw new Error('options.port is required.');
+    if (!options.nodeMajorVersion) throw new Error('options.nodeMajorVersion is required.');
   } catch (exception) {
     throw new Error(`[startHMR.validateOptions] ${exception.message}`);
   }
@@ -20,8 +46,11 @@ const validateOptions = (options) => {
 const startHMR = (options, { resolve, reject }) => {
   try {
     validateOptions(options);
-    // Call action methods in sequence here.
-    resolve();
+
+    const execArgv = getExecArgs(options?.nodeMajorVersion);
+    const hmrProcess = handleStartHMRProcess(execArgv);
+
+    return resolve(hmrProcess);
   } catch (exception) {
     reject(`[startHMR] ${exception.message}`);
   }