commandkit 0.1.6-dev.20231113071041 → 0.1.6-dev.20231124164938

package/bin/build.mjs

@@ -1,11 +1,20 @@
 // @ts-check
 
 import { build } from 'tsup';
-import { Colors, erase, findCommandKitJSON, panic, write } from './common.mjs';
+import { Colors, erase, findCommandKitConfig, panic, write } from './common.mjs';
 import ora from 'ora';
+import { appendFile } from 'node:fs/promises';
+import { join } from 'node:path';
 
 export async function bootstrapProductionBuild(config) {
-    const { minify = false, outDir = 'dist', main, src } = findCommandKitJSON(config);
+    const {
+        sourcemap = false,
+        minify = false,
+        outDir = 'dist',
+        antiCrash = true,
+        src,
+        main,
+    } = await findCommandKitConfig(config);
 
     const status = ora('Creating optimized production build...\n').start();
     const start = performance.now();
@@ -21,23 +30,23 @@ export async function bootstrapProductionBuild(config) {
             minify,
             shims: true,
             banner: {
-                js: '/* Optimized production build of your project, generated by CommandKit */',
+                js: '/* Optimized production build generated by CommandKit */',
             },
-            sourcemap: false,
+            sourcemap,
             keepNames: true,
             outDir,
             silent: true,
-            entry: [src, '!dist', '!.commandkit'],
+            entry: [src, '!dist', '!.commandkit', `!${outDir}`],
         });
 
+        if (antiCrash) await injectAntiCrash(outDir, main);
+
         status.succeed(
             Colors.green(`Build completed in ${(performance.now() - start).toFixed(2)}ms!`),
         );
         write(
             Colors.green(
-                `\nRun ${Colors.magenta(`node ${outDir}/${main}`)} ${Colors.green(
-                    'to start your bot.',
-                )}`,
+                `\nRun ${Colors.magenta(`commandkit start`)} ${Colors.green('to start your bot.')}`,
             ),
         );
     } catch (e) {
@@ -45,3 +54,28 @@ export async function bootstrapProductionBuild(config) {
         panic(e);
     }
 }
+
+function injectAntiCrash(outDir, main) {
+    const path = join(process.cwd(), outDir, main);
+    const snippet = [
+        '\n\n// --- CommandKit Anti-Crash Monitor ---',
+        ';(()=>{',
+        "  'use strict';",
+        "  // 'uncaughtException' event is supposed to be used to perform synchronous cleanup before shutting down the process",
+        '  // instead of using it as a means to resume operation.',
+        '  // But it exists here due to compatibility reasons with discord bot ecosystem.',
+        "  const p = (t) => `\\x1b[33m${t}\\x1b[0m`, b = '[CommandKit Anti-Crash Monitor]', l = console.log, e1 = 'uncaughtException', e2 = 'unhandledRejection';",
+        '  if (!process.eventNames().includes(e1)) // skip if it is already handled',
+        '    process.on(e1, (e, o) => {',
+        '      l(p(`${b} Uncaught Exception`)); l(p(b), p(e.stack || e));',
+        '    })',
+        '  if (!process.eventNames().includes(e2)) // skip if it is already handled',
+        '    process.on(e2, (r) => {',
+        '      l(p(`${b} Unhandled promise rejection`)); l(p(`${b} ${r.stack || r}`));',
+        '    });',
+        '})();',
+        '// --- CommandKit Anti-Crash Monitor ---\n',
+    ].join('\n');
+
+    return appendFile(path, snippet);
+}

package/bin/common.mjs

@@ -58,15 +58,43 @@ export function findPackageJSON() {
     return JSON.parse(fs.readFileSync(target, 'utf8'));
 }
 
-export function findCommandKitJSON(src) {
+const possibleFileNames = [
+    'commandkit.json',
+    'commandkit.config.json',
+    'commandkit.js',
+    'commandkit.config.js',
+    'commandkit.mjs',
+    'commandkit.config.mjs',
+    'commandkit.cjs',
+    'commandkit.config.cjs',
+];
+
+export async function findCommandKitConfig(src) {
     const cwd = process.cwd();
-    const target = src || join(cwd, 'commandkit.json');
+    const locations = src ? [join(cwd, src)] : possibleFileNames.map((name) => join(cwd, name));
 
-    if (!fs.existsSync(target)) {
-        panic('Could not find commandkit.json in current directory.');
+    for (const location of locations) {
+        try {
+            return await loadConfigInner(location);
+        } catch (e) {
+            continue;
+        }
     }
 
-    return JSON.parse(fs.readFileSync(target, 'utf8'));
+    panic('Could not locate commandkit config.');
+}
+
+async function loadConfigInner(target) {
+    const isJSON = target.endsWith('.json');
+
+    /**
+     * @type {import('..').CommandKitConfig}
+     */
+    const config = await import(`file://${target}`, {
+        assert: isJSON ? { type: 'json' } : undefined,
+    }).then((conf) => conf.default || conf);
+
+    return config;
 }
 
 export function erase(dir) {

package/bin/development.mjs

@@ -0,0 +1,163 @@
+// @ts-check
+import { config as dotenv } from 'dotenv';
+import { build } from 'tsup';
+import child_process from 'node:child_process';
+import ora from 'ora';
+import { join } from 'node:path';
+import { Colors, erase, findCommandKitConfig, panic, write } from './common.mjs';
+import { parseEnv } from './parse-env.mjs';
+
+const RESTARTING_MSG_PATTERN = /^Restarting '|".+'|"\n?$/;
+const FAILED_RUNNING_PATTERN = /^Failed running '.+'|"\n?$/;
+
+export async function bootstrapDevelopmentServer(opts) {
+    const {
+        src,
+        main,
+        watch = Boolean(opts.noWatch),
+        nodeOptions = [],
+        envExtra = true,
+        clearRestartLogs = true,
+        outDir,
+    } = await findCommandKitConfig(opts.config);
+
+    if (!src) {
+        panic('Could not find src in commandkit.json');
+    }
+
+    if (!main) {
+        panic('Could not find main in commandkit.json');
+    }
+
+    const watchMode = watch;
+    const status = ora(Colors.green('Starting a development server...\n')).start();
+    const start = performance.now();
+
+    if (watchMode && !nodeOptions.includes('--watch')) {
+        nodeOptions.push('--watch');
+    } else if (!watchMode && nodeOptions.includes('--watch')) {
+        nodeOptions.splice(nodeOptions.indexOf('--watch'), 1);
+    }
+
+    if (!nodeOptions.includes('--enable-source-maps')) {
+        nodeOptions.push('--enable-source-maps');
+    }
+
+    erase('.commandkit');
+
+    try {
+        await build({
+            clean: true,
+            format: ['esm'],
+            dts: false,
+            skipNodeModulesBundle: true,
+            minify: false,
+            shims: true,
+            sourcemap: 'inline',
+            keepNames: true,
+            outDir: '.commandkit',
+            silent: true,
+            entry: [src, '!dist', '!.commandkit', `!${outDir}`].filter(Boolean),
+            watch: watchMode,
+        });
+
+        status.succeed(
+            Colors.green(`Dev server started in ${(performance.now() - start).toFixed(2)}ms!\n`),
+        );
+
+        if (watchMode) write(Colors.cyan('Watching for file changes...\n'));
+
+        const processEnv = {};
+
+        const env = dotenv({
+            path: join(process.cwd(), '.env'),
+            // @ts-expect-error
+            processEnv,
+        });
+
+        if (envExtra) {
+            parseEnv(processEnv);
+        }
+
+        if (env.error) {
+            write(Colors.yellow(`[DOTENV] Warning: ${env.error.message}`));
+        }
+
+        if (env.parsed) {
+            write(Colors.blue('[DOTENV] Loaded .env file!'));
+        }
+
+        /**
+         * @type {child_process.ChildProcessWithoutNullStreams}
+         */
+        const ps = child_process.spawn(
+            'node',
+            [...nodeOptions, join(process.cwd(), '.commandkit', main)],
+            {
+                env: {
+                    ...process.env,
+                    ...processEnv,
+                    NODE_ENV: 'development',
+                    // @ts-expect-error
+                    COMMANDKIT_DEV: true,
+                    // @ts-expect-error
+                    COMMANDKIT_PRODUCTION: false,
+                },
+                cwd: process.cwd(),
+            },
+        );
+
+        let isLastLogRestarting = false,
+            hasStarted = false;
+
+        ps.stdout.on('data', (data) => {
+            const message = data.toString();
+
+            if (FAILED_RUNNING_PATTERN.test(message)) {
+                write(Colors.cyan('Failed running the bot, waiting for changes...'));
+                isLastLogRestarting = false;
+                if (!hasStarted) hasStarted = true;
+                return;
+            }
+
+            if (clearRestartLogs && !RESTARTING_MSG_PATTERN.test(message)) {
+                write(message);
+                isLastLogRestarting = false;
+            } else {
+                if (isLastLogRestarting || !hasStarted) {
+                    if (!hasStarted) hasStarted = true;
+                    return;
+                }
+                write(Colors.cyan('⌀ Restarting the bot...'));
+                isLastLogRestarting = true;
+            }
+
+            if (!hasStarted) hasStarted = true;
+        });
+
+        ps.stderr.on('data', (data) => {
+            const message = data.toString();
+
+            if (
+                message.includes(
+                    'ExperimentalWarning: Watch mode is an experimental feature and might change at any time',
+                )
+            )
+                return;
+
+            write(Colors.red(message));
+        });
+
+        ps.on('close', (code) => {
+            write('\n');
+            process.exit(code ?? 0);
+        });
+
+        ps.on('error', (err) => {
+            panic(err);
+        });
+    } catch (e) {
+        status.fail(`Error occurred after ${(performance.now() - start).toFixed(2)}ms!\n`);
+        panic(e.stack ?? e);
+    }
+}

package/bin/index.mjs

@@ -3,18 +3,28 @@
 // @ts-check
 
 import { Command } from 'commander';
-import { bootstrapDevelopmentServer } from './dev-server.mjs';
+import { bootstrapDevelopmentServer } from './development.mjs';
 import { bootstrapProductionBuild } from './build.mjs';
+import { bootstrapProductionServer } from './production.mjs';
 
 const program = new Command('commandkit');
 
 program
     .command('dev')
     .description('Start your bot in development mode.')
-    .option('-c, --config <path>', 'Path to your commandkit.json file.', './commandkit.json')
+    .option('-c, --config <path>', 'Path to your commandkit config file.', './commandkit.js')
+    .action(() => {
+        const options = program.opts();
+        bootstrapDevelopmentServer(options);
+    });
+
+program
+    .command('start')
+    .description('Start your bot in production mode after running the build command.')
+    .option('-c, --config <path>', 'Path to your commandkit.json file.', './commandkit.js')
     .action(() => {
         const options = program.opts();
-        bootstrapDevelopmentServer(options.config);
+        bootstrapProductionServer(options.config);
     });
 
 program

package/bin/parse-env.mjs

@@ -0,0 +1,52 @@
+// @ts-check
+
+import { randomUUID } from 'node:crypto';
+
+const valuesMap = {
+    true: true,
+    false: false,
+    null: null,
+    undefined: undefined,
+    __UUIDv4__: () => randomUUID(),
+};
+
+const VALUE_PREFIXES = {
+    JSON: 'JSON::',
+    DATE: 'DATE::',
+};
+
+export function parseEnv(src) {
+    for (const key in src) {
+        const value = src[key];
+
+        if (typeof value !== 'string') continue;
+
+        if (value.startsWith(VALUE_PREFIXES.JSON)) {
+            src[key] = JSON.parse(value.replace(VALUE_PREFIXES.JSON, ''));
+            continue;
+        }
+
+        if (value.startsWith(VALUE_PREFIXES.DATE)) {
+            src[key] = new Date(value.replace(VALUE_PREFIXES.DATE, ''));
+            continue;
+        }
+
+        if (value.includes(',')) {
+            src[key] = value.split(',').map((v) => v.trim());
+            continue;
+        }
+
+        if (/^[0-9]+n$/.test(value)) {
+            src[key] = BigInt(value);
+            continue;
+        }
+
+        if (value in valuesMap) {
+            src[key] =
+                typeof valuesMap[value] === 'function' ? valuesMap[value]() : valuesMap[value];
+            continue;
+        }
+    }
+
+    return src;
+}

package/bin/production.mjs

@@ -0,0 +1,83 @@
+// @ts-check
+import { config as dotenv } from 'dotenv';
+import child_process from 'node:child_process';
+import { join } from 'node:path';
+import { Colors, findCommandKitConfig, panic, write } from './common.mjs';
+import { existsSync } from 'node:fs';
+import { parseEnv } from './parse-env.mjs';
+
+export async function bootstrapProductionServer(config) {
+    const {
+        main,
+        outDir = 'dist',
+        envExtra = true,
+        sourcemap,
+    } = await findCommandKitConfig(config);
+
+    if (!existsSync(join(process.cwd(), outDir, main))) {
+        panic('Could not find production build, maybe run `commandkit build` first?');
+    }
+
+    try {
+        const processEnv = {};
+
+        const env = dotenv({
+            path: join(process.cwd(), '.env'),
+            // @ts-expect-error
+            processEnv,
+        });
+
+        if (envExtra) {
+            parseEnv(processEnv);
+        }
+
+        if (env.error) {
+            write(Colors.yellow(`[DOTENV] Warning: ${env.error.message}`));
+        }
+
+        if (env.parsed) {
+            write(Colors.blue('[DOTENV] Loaded .env file!'));
+        }
+
+        /**
+         * @type {child_process.ChildProcessWithoutNullStreams}
+         */
+        const ps = child_process.spawn(
+            'node',
+            [sourcemap ? '--enable-source-maps' : '', join(process.cwd(), outDir, main)].filter(
+                Boolean,
+            ),
+            {
+                env: {
+                    ...process.env,
+                    ...processEnv,
+                    NODE_ENV: 'production',
+                    // @ts-expect-error
+                    COMMANDKIT_DEV: false,
+                    //  @ts-expect-error
+                    COMMANDKIT_PROD: true,
+                },
+                cwd: process.cwd(),
+            },
+        );
+
+        ps.stdout.on('data', (data) => {
+            write(data.toString());
+        });
+
+        ps.stderr.on('data', (data) => {
+            write(Colors.red(data.toString()));
+        });
+
+        ps.on('close', (code) => {
+            write('\n');
+            process.exit(code ?? 0);
+        });
+
+        ps.on('error', (err) => {
+            panic(err);
+        });
+    } catch (e) {
+        panic(e);
+    }
+}