@joystick.js/cli-canary 0.0.0-canary.8 → 0.0.0-canary.81

package/dist/lib/dev/cleanup.js

@@ -1,30 +1,18 @@
-const actionMethod = () => {
-  try {
-  } catch (exception) {
-    throw new Error(`[cleanup.actionMethod] ${exception.message}`);
-  }
-};
-const validateOptions = (options) => {
-  try {
-    if (!options)
-      throw new Error("options object is required.");
-    if (!options.someOption)
-      throw new Error("options.someOption is required.");
-  } catch (exception) {
-    throw new Error(`[cleanup.validateOptions] ${exception.message}`);
-  }
+import ps from "ps-node";
+process.title = "joystick_cleanup";
+const killProcess = (pid = 0) => {
+  return new Promise((resolve) => {
+    ps.kill(pid, () => {
+      resolve();
+    });
+  });
 };
-const cleanup = (options, { resolve, reject }) => {
-  try {
-    validateOptions(options);
-    resolve();
-  } catch (exception) {
-    reject(`[cleanup] ${exception.message}`);
+process.on("message", async (message) => {
+  const parsedMessage = JSON.parse(message);
+  const processIds = parsedMessage?.processIds;
+  for (let i = 0; i < processIds?.length; i += 1) {
+    const processId = processIds[i];
+    await killProcess(processId);
   }
-};
-var cleanup_default = (options) => new Promise((resolve, reject) => {
-  cleanup(options, { resolve, reject });
+  process.exit();
 });
-export {
-  cleanup_default as default
-};

package/dist/lib/dev/databases/mongodb/index.js

@@ -4,7 +4,7 @@ import child_process from "child_process";
 import { kill as killPortProcess } from "cross-port-killer";
 import isWindows from "../../isWindows.js";
 import CLILog from "../../../../lib/CLILog.js";
-import getProcessIdFromPort from "../../getProcessIdFromPort.js";
+import getProcessIdFromPort from "../../../getProcessIdFromPort.js";
 const getMongoProcessId = async (port = 2601) => {
   const pids = await getProcessIdFromPort(port);
   return pids.tcp && pids.tcp[0];

package/dist/lib/dev/databases/postgresql/index.js

@@ -4,8 +4,8 @@ import util from "util";
 import commandExists from "command-exists";
 import child_process from "child_process";
 import { kill as killPortProcess } from "cross-port-killer";
-import getProcessIdFromPort from "../../getProcessIdFromPort.js";
-import CLILog from "../../../../lib/CLILog.js";
+import getProcessIdFromPort from "../../../getProcessIdFromPort.js";
+import CLILog from "../../../CLILog.js";
 const exec = util.promisify(child_process.exec);
 const getPostgreSQLProcessId = async (port = 2610) => {
   const pids = await getProcessIdFromPort(port);

package/dist/lib/dev/databases/providerMap.js

@@ -1,4 +1,4 @@
-import connectMongoDB from "./mongodb/connect.js.js";
+import connectMongoDB from "./mongodb/connect.js";
 import connectPostgreSQL from "./postgresql/connect.js";
 var providerMap_default = {
   mongodb: {

package/dist/lib/dev/index.js

@@ -8,7 +8,6 @@ import loadSettings from "./loadSettings.js";
 import Loader from "../loader.js";
 import startDatabases from "./startDatabases.js";
 import runTests from "./runTests.js";
-import cleanup from "./cleanup.js";
 import startHMR from "./startHMR.js";
 import startApp from "./startApp.js";
 import requiredFiles from "./requiredFiles.js";
@@ -19,12 +18,7 @@ import filesToCopy from "../filesToCopy.js";
 import { SETTINGS_FILE_NAME_REGEX } from "../regexes.js";
 import getCodependenciesForFile from "./getCodependenciesForFile.js";
 import removeDeletedDependenciesFromMap from "../build/removeDeletedDependenciesFromMap.js";
-const nodeMajorVersion = parseInt(
-  process?.version?.split(".")[0]?.replace("v", ""),
-  10
-);
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = dirname(__filename);
+import chalk from "chalk";
 const getDatabaseProcessIds = () => {
   try {
     const databaseProcessIds = [];
@@ -49,7 +43,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) {
@@ -68,6 +62,7 @@ const handleSignalEvents = (processIds = []) => {
         silent: true
       }
     );
+    console.log(cleanupProcess);
     process.on("SIGINT", async () => {
       const databaseProcessIds = getDatabaseProcessIds();
       cleanupProcess.send(JSON.stringify({ processIds: [...processIds, ...databaseProcessIds] }));
@@ -82,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) {
@@ -187,7 +222,7 @@ const getWatchChangeContext = (event = "", path2 = "") => {
   try {
     const isHTMLUpdate = path2 === "index.html";
     const isUIPath = path2?.includes("ui/") || path2 === "index.css" || isHTMLUpdate;
-    const isUIUpdate = process.hmrProcess.hasConnections && isUIPath || false;
+    const isUIUpdate = process.hmrProcess && process.hmrProcess.hasConnections && isUIPath || false;
     const isSettingsUpdate = path2?.match(SETTINGS_FILE_NAME_REGEX)?.length > 0;
     const isDirectory = fs.statSync(path2).isDirectory();
     const isFile = fs.statSync(path2).isFile();
@@ -242,14 +277,19 @@ const startFileWatcher = (options = {}) => {
 };
 const runInitialBuild = async (buildSettings = {}) => {
   try {
+    process.loader.text("Building app...");
     const filesToBuild = getFilesToBuild(buildSettings?.excludedPaths, "start");
-    const fileResults = await buildFiles(
-      filesToBuild,
-      null,
-      process.env.NODE_ENV
-    );
+    const fileResults = await buildFiles({
+      files: filesToBuild,
+      environment: process.env.NODE_ENV
+    });
     const hasErrors = [...fileResults].filter((result) => !!result).map(({ success }) => success).includes(false);
+    if (hasErrors) {
+      console.log(chalk.redBright("Failed to start app. Correct the errors above and run joystick start again.\n"));
+      process.exit(1);
+    }
   } catch (exception) {
+    console.warn(exception);
     throw new Error(`[dev.runInitialBuild] ${exception.message}`);
   }
 };
@@ -287,21 +327,25 @@ const checkForRequiredFiles = () => {
       let error = `The following paths are missing and required in a Joystick project:
 
 `;
-      error += `Files:
+      if (files?.length > 0) {
+        error += `  > Required Files:
 
 `;
-      for (let i = 0; i < files?.length; i += 1) {
-        const file = files[i];
-        error += `${file.path}
-
+        for (let i = 0; i < files?.length; i += 1) {
+          const file = files[i];
+          error += `  /${file.path}
 `;
+        }
       }
-      error += `Directories:
+      if (directories?.length > 0) {
+        error += `  > Required Directories:
 
 `;
-      for (let i = 0; i < directories?.length; i += 1) {
-        const file = directories[i];
-        error += `${file.path}`;
+        for (let i = 0; i < directories?.length; i += 1) {
+          const file = directories[i];
+          error += `  /${file.path}
+`;
+        }
       }
       CLILog(error, {
         level: "danger",
@@ -327,7 +371,7 @@ const warnInvalidJoystickEnvironment = () => {
       );
       process.exit(0);
     }
-    if (process.env.NODE_ENV !== "test" && (!hasJoystickFolder || !hasTestsFolder)) {
+    if (process.env.NODE_ENV !== "test" && !hasJoystickFolder) {
       CLILog(
         "joystick start must be run in a directory with a .joystick folder.",
         {
@@ -355,18 +399,48 @@ 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
+    });
+    await startDatabases({
       environment: options.environment,
-      process: options.process
+      port: options.port,
+      settings: settings.parsed
     });
-    await startDatabases(settings.parsed);
     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,
+        __dirname
+      });
+    }
+    handleSignalEvents(
+      [serverProcess.pid, hmrProcess.pid],
+      nodeMajorVersion,
+      __dirname
+    );
     resolve();
   } catch (exception) {
+    console.warn(exception);
     reject(`[dev] ${exception.message}`);
   }
 };

package/dist/lib/dev/isWindows.js

@@ -0,0 +1,5 @@
+import os from "os";
+var isWindows_default = os.platform() === "win32";
+export {
+  isWindows_default as default
+};

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,51 @@
-const actionMethod = () => {
+import child_process from "child_process";
+import path from "path";
+const handleStartServerProcess = (execArgv = {}, sessionsBeforeHMRUpdate = {}) => {
   try {
+    process.loader.text("Starting app...");
+    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: JSON.stringify(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 +55,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/startDatabases.js

@@ -1,6 +1,6 @@
-import util from "util";
 import CLILog from "../CLILog.js";
 import providerMap from "./databases/providerMap.js";
+import { isObject } from "../types.js";
 const startDatabaseProvider = async (environment = "development", database = {}, port = 2610, hasMultipleOfProvider = false) => {
   try {
     const provider = providerMap[database?.provider];
@@ -19,12 +19,13 @@ const startDatabaseProvider = async (environment = "development", database = {},
     throw new Error(`[startDatabases.startDatabaseProvider] ${exception.message}`);
   }
 };
-const startDatabaseProviders = async (databases = [], databasePortStart = 2610) => {
+const startDatabaseProviders = async (databases = [], databasePortStart = 2610, environment = "") => {
   try {
     for (let i = 0; i < databases?.length; i += 1) {
       const database = databases[i];
       const hasMultipleOfProvider = databases?.filter((database2) => database2?.provider === database2?.provider)?.length > 1;
       await startDatabaseProvider(
+        environment,
         database,
         // NOTE: Increment each database port using index in the databases array from settings if no port
         // is assigned in the settings.
@@ -39,7 +40,7 @@ const startDatabaseProviders = async (databases = [], databasePortStart = 2610)
 const validateDatabasesFromSettings = (databases = []) => {
   try {
     const databasesNotAsObjects = databases.filter(
-      (database) => !util.types.isKeyObject(database)
+      (database) => !isObject(database)
     );
     const userDatabases = databases.filter((database) => !!database.users);
     const queueDatabases = databases.filter((database) => !!database.queues);
@@ -73,6 +74,8 @@ const validateOptions = (options) => {
   try {
     if (!options)
       throw new Error("options object is required.");
+    if (!options.environment)
+      throw new Error("options.environment is required.");
     if (!options.port)
       throw new Error("options.port is required.");
     if (!options.settings)
@@ -84,10 +87,14 @@ const validateOptions = (options) => {
 const startDatabases = async (options, { resolve, reject }) => {
   try {
     validateOptions(options);
-    const databases = options?.settings?.databases || [];
+    const databases = options?.settings?.config?.databases || [];
     if (databases?.length > 0) {
       validateDatabasesFromSettings(databases);
-      await startDatabaseProviders(databases, options?.port);
+      await startDatabaseProviders(
+        databases,
+        options?.port + 10,
+        options?.environment
+      );
     }
     resolve();
   } catch (exception) {

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 = {}, __dirname = "") => {
   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, options?.__dirname);
+    return resolve(hmrProcess);
   } catch (exception) {
     reject(`[startHMR] ${exception.message}`);
   }

package/dist/lib/getProcessIdFromPort.js

@@ -0,0 +1,60 @@
+import condense from "selective-whitespace";
+import netstats from "netstats";
+const platform = process.platform;
+function pushTo(target, item) {
+  if (item !== "" && typeof item === "number" && item !== 0 && target.indexOf(item) === -1) {
+    target.push(item);
+  }
+}
+async function processNetStats(arr) {
+  const pidindex = 1;
+  let items = arr.slice(1);
+  if (platform === "win32") {
+    items = arr;
+  }
+  const pids = {
+    all: [],
+    tcp: [],
+    udp: []
+  };
+  await Promise.all(items.map((item) => {
+    const values = condense(item).split(" ");
+    let pid = parseInt(values[pidindex], 10);
+    if (platform === "win32") {
+      pid = parseInt(values.pop(), 10);
+    }
+    if (values.length > 1) {
+      if (values.indexOf("TCP") !== -1) {
+        pushTo(pids.tcp, pid);
+        pushTo(pids.all, pid);
+      } else if (values.indexOf("UDP") !== -1) {
+        pushTo(pids.udp, pid);
+        pushTo(pids.all, pid);
+      }
+    }
+    return Promise.resolve();
+  }));
+  return pids;
+}
+function getProcessIdFromPort(port) {
+  if (typeof port !== "number") {
+    throw new TypeError("Expected a port number");
+  }
+  return new Promise((resolve) => {
+    netstats(port).then((stats) => {
+      processNetStats(stats).then((ps) => {
+        resolve(ps);
+      });
+    }).catch(() => {
+      resolve({
+        all: [],
+        tcp: [],
+        udp: []
+      });
+    });
+  });
+}
+var getProcessIdFromPort_default = getProcessIdFromPort;
+export {
+  getProcessIdFromPort_default as default
+};

package/dist/lib/types.js

@@ -0,0 +1,6 @@
+const isObject = (value) => {
+  return value !== null && !Array.isArray(value) && typeof value === "object";
+};
+export {
+  isObject
+};

package/package.json

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