@zintrust/core 0.1.17 → 0.1.19

package/src/cli/commands/StartCommand.js

@@ -1,9 +1,10 @@
 import { BaseCommand } from '../BaseCommand.js';
+import { DENO_RUNNER_SOURCE, LAMBDA_RUNNER_SOURCE } from '../commands/runner/index.js';
 import { EnvFileLoader } from '../utils/EnvFileLoader.js';
 import { SpawnUtil } from '../utils/spawn.js';
 import { resolveNpmPath } from '../../common/index.js';
 import { ErrorFactory } from '../../exceptions/ZintrustError.js';
-import { existsSync, readFileSync } from '../../node-singletons/fs.js';
+import { existsSync, mkdirSync, readFileSync, writeFileSync } from '../../node-singletons/fs.js';
 import * as path from '../../node-singletons/path.js';
 const isValidModeInput = (value) => value === 'development' ||
     value === 'dev' ||
@@ -59,6 +60,22 @@ const resolveRuntime = (options) => {
     const raw = typeof options.runtime === 'string' ? options.runtime.trim() : '';
     return raw === '' ? undefined : raw;
 };
+const resolveStartVariant = (options) => {
+    const wantWrangler = options.wrangler === true || options.wg === true;
+    const wantDeno = options.deno === true;
+    const wantLambda = options.lambda === true;
+    const enabled = [wantWrangler, wantDeno, wantLambda].filter(Boolean).length;
+    if (enabled > 1) {
+        throw ErrorFactory.createCliError('Error: Choose only one of --wrangler/--wg, --deno, or --lambda.');
+    }
+    if (wantWrangler)
+        return 'wrangler';
+    if (wantDeno)
+        return 'deno';
+    if (wantLambda)
+        return 'lambda';
+    return 'node';
+};
 const hasFlag = (flag) => process.argv.includes(flag);
 const resolveWatchPreference = (options, mode) => {
     const hasWatch = hasFlag('--watch');
@@ -104,6 +121,10 @@ const findWranglerConfig = (cwd) => {
     return undefined;
 };
 const resolveWranglerEntry = (cwd) => {
+    const indexEntry = path.join(cwd, 'src/index.ts');
+    if (existsSync(indexEntry))
+        return 'src/index.ts';
+    // Legacy fallback
     const entry = path.join(cwd, 'src/functions/cloudflare.ts');
     return existsSync(entry) ? 'src/functions/cloudflare.ts' : undefined;
 };
@@ -167,6 +188,55 @@ const executeWranglerStart = async (cmd, cwd, port, runtime) => {
     const exitCode = await SpawnUtil.spawnAndWait({ command: 'wrangler', args: wranglerArgs });
     process.exit(exitCode);
 };
+const ensureTmpRunnerFile = (cwd, filename, content) => {
+    const tmpDir = path.join(cwd, 'tmp');
+    try {
+        mkdirSync(tmpDir, { recursive: true });
+    }
+    catch (error) {
+        throw ErrorFactory.createTryCatchError('Failed to create tmp directory', error);
+    }
+    const fullPath = path.join(tmpDir, filename);
+    try {
+        writeFileSync(fullPath, content, 'utf-8');
+    }
+    catch (error) {
+        throw ErrorFactory.createTryCatchError('Failed to write start runner', error);
+    }
+    return fullPath;
+};
+const executeDenoStart = async (cmd, cwd, mode, watchEnabled, _port, runtime) => {
+    if (runtime !== undefined) {
+        throw ErrorFactory.createCliError('Error: --runtime cannot be used with --deno.');
+    }
+    if (mode === 'testing') {
+        throw ErrorFactory.createCliError('Error: Cannot start server in testing mode. Use development or production.');
+    }
+    const denoRunner = ensureTmpRunnerFile(cwd, 'zin-start-deno.ts', DENO_RUNNER_SOURCE);
+    const args = [];
+    if (mode === 'development' && watchEnabled)
+        args.push('watch');
+    args.push(denoRunner);
+    cmd.info('Starting in Deno adapter mode...');
+    const exitCode = await SpawnUtil.spawnAndWait({ command: 'tsx', args });
+    process.exit(exitCode);
+};
+const executeLambdaStart = async (cmd, cwd, mode, watchEnabled, _port, runtime) => {
+    if (runtime !== undefined) {
+        throw ErrorFactory.createCliError('Error: --runtime cannot be used with --lambda.');
+    }
+    if (mode === 'testing') {
+        throw ErrorFactory.createCliError('Error: Cannot start server in testing mode. Use development or production.');
+    }
+    const lambdaRunner = ensureTmpRunnerFile(cwd, 'zin-start-lambda.ts', LAMBDA_RUNNER_SOURCE);
+    const args = [];
+    if (mode === 'development' && watchEnabled)
+        args.push('watch');
+    args.push(lambdaRunner);
+    cmd.info('Starting in Lambda adapter mode...');
+    const exitCode = await SpawnUtil.spawnAndWait({ command: 'tsx', args });
+    process.exit(exitCode);
+};
 const executeNodeStart = async (cmd, cwd, mode, watchEnabled) => {
     if (mode === 'testing') {
         throw ErrorFactory.createCliError('Error: Cannot start server in testing mode. Use --force to override (not supported).');
@@ -196,12 +266,26 @@ const executeStart = async (options, cmd) => {
     const mode = resolveMode(options);
     const port = resolvePort(options);
     const runtime = resolveRuntime(options);
-    EnvFileLoader.applyCliOverrides({ nodeEnv: mode, port, runtime });
-    if (options.wrangler === true) {
+    const variant = resolveStartVariant(options);
+    let effectiveRuntime = runtime;
+    if (variant === 'deno')
+        effectiveRuntime = 'deno';
+    if (variant === 'lambda')
+        effectiveRuntime = 'lambda';
+    EnvFileLoader.applyCliOverrides({ nodeEnv: mode, port, runtime: effectiveRuntime });
+    if (variant === 'wrangler') {
         await executeWranglerStart(cmd, cwd, port, runtime);
         return;
     }
     const watchEnabled = resolveWatchPreference(options, mode);
+    if (variant === 'deno') {
+        await executeDenoStart(cmd, cwd, mode, watchEnabled, port, runtime);
+        return;
+    }
+    if (variant === 'lambda') {
+        await executeLambdaStart(cmd, cwd, mode, watchEnabled, port, runtime);
+        return;
+    }
     await executeNodeStart(cmd, cwd, mode, watchEnabled);
 };
 export const StartCommand = Object.freeze({
@@ -210,6 +294,9 @@ export const StartCommand = Object.freeze({
             command.alias('s');
             command
                 .option('-w, --wrangler', 'Start with Wrangler dev mode (Cloudflare Workers)')
+                .option('--wg', 'Alias for --wrangler')
+                .option('--deno', 'Start a local server using the Deno runtime adapter')
+                .option('--lambda', 'Start a local server using the AWS Lambda runtime adapter')
                 .option('--watch', 'Force watch mode (Node only)')
                 .option('--no-watch', 'Disable watch mode (Node only)')
                 .option('--mode <development|production|testing>', 'Override app mode')

package/src/cli/commands/UpgradeCommand.d.ts

@@ -0,0 +1,16 @@
+/**
+ * Upgrade Command
+ *
+ * Goal: help existing Zintrust projects adopt new safe defaults without forcing
+ * a full re-scaffold.
+ *
+ * Current scope (minimal/safe):
+ * - Backfill required .env defaults (HOST, PORT, LOG_LEVEL) when missing or blank.
+ * - Never overwrite a non-empty user value.
+ */
+import { type IBaseCommand } from '../BaseCommand';
+export declare const UpgradeCommand: Readonly<{
+    create(): IBaseCommand;
+}>;
+export default UpgradeCommand;
+//# sourceMappingURL=UpgradeCommand.d.ts.map

package/src/cli/commands/UpgradeCommand.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"UpgradeCommand.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/UpgradeCommand.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,EAAoC,KAAK,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAoFvF,eAAO,MAAM,cAAc;cACf,YAAY;EA6BtB,CAAC;AAEH,eAAe,cAAc,CAAC"}

package/src/cli/commands/UpgradeCommand.js

@@ -0,0 +1,107 @@
+/**
+ * Upgrade Command
+ *
+ * Goal: help existing Zintrust projects adopt new safe defaults without forcing
+ * a full re-scaffold.
+ *
+ * Current scope (minimal/safe):
+ * - Backfill required .env defaults (HOST, PORT, LOG_LEVEL) when missing or blank.
+ * - Never overwrite a non-empty user value.
+ */
+import { BaseCommand } from '../BaseCommand.js';
+import { ErrorHandler } from '../ErrorHandler.js';
+import { EnvFileBackfill } from '../env/EnvFileBackfill.js';
+import { mkdirSync, readFileSync, unlinkSync, writeFileSync } from '../../node-singletons/fs.js';
+import * as path from '../../node-singletons/path.js';
+const ensureEnvFileExists = (envPath) => {
+    const dir = path.dirname(envPath);
+    mkdirSync(dir, { recursive: true });
+    try {
+        readFileSync(envPath, 'utf8');
+    }
+    catch {
+        writeFileSync(envPath, '\n', 'utf8');
+    }
+};
+const resolveCwd = (cwd) => {
+    if (typeof cwd === 'string' && cwd.trim() !== '')
+        return cwd;
+    return process.cwd();
+};
+const getEnvDefaults = () => Object.freeze({
+    HOST: 'localhost',
+    PORT: '7777',
+    LOG_LEVEL: 'debug',
+});
+const envFileExists = (envPath) => {
+    try {
+        readFileSync(envPath, 'utf8');
+        return true;
+    }
+    catch {
+        return false;
+    }
+};
+const formatBackfillSummary = (result) => {
+    const filled = result.filledKeys.join(', ') || '(none)';
+    const appended = result.appendedKeys.join(', ') || '(none)';
+    return `filled=${filled}; appended=${appended}`;
+};
+const runDryRun = (envPath, defaults) => {
+    const exists = envFileExists(envPath);
+    if (exists === false) {
+        ErrorHandler.info(`[dry-run] Would create ${envPath}`);
+        return;
+    }
+    const raw = readFileSync(envPath, 'utf8');
+    const tmpPath = `${envPath}.zin-upgrade.tmp`;
+    writeFileSync(tmpPath, raw, 'utf8');
+    try {
+        const result = EnvFileBackfill.backfillEnvDefaults(tmpPath, defaults);
+        if (result.changed === false) {
+            ErrorHandler.success('No changes needed.');
+            return;
+        }
+        ErrorHandler.info(`[dry-run] Would backfill .env: ${formatBackfillSummary(result)}`);
+    }
+    finally {
+        try {
+            unlinkSync(tmpPath);
+        }
+        catch {
+            // ignore
+        }
+    }
+};
+const runUpgrade = (envPath, defaults) => {
+    ensureEnvFileExists(envPath);
+    return EnvFileBackfill.backfillEnvDefaults(envPath, defaults);
+};
+export const UpgradeCommand = Object.freeze({
+    create() {
+        return BaseCommand.create({
+            name: 'upgrade',
+            description: 'Upgrade an existing Zintrust project in-place (safe, non-destructive)',
+            addOptions: (command) => {
+                command.option('--cwd <path>', 'Project directory (default: current working directory)');
+                command.option('--dry-run', 'Print planned changes without writing files');
+            },
+            execute: (options) => {
+                const cwd = resolveCwd(options.cwd);
+                const envPath = path.resolve(cwd, '.env');
+                const defaults = getEnvDefaults();
+                if (options.dryRun === true) {
+                    runDryRun(envPath, defaults);
+                    return;
+                }
+                const result = runUpgrade(envPath, defaults);
+                if (result.changed === false) {
+                    ErrorHandler.success('No changes needed.');
+                    return;
+                }
+                ErrorHandler.success(`Upgraded .env: ${formatBackfillSummary(result)}`);
+            },
+        });
+    },
+});
+export default UpgradeCommand;

package/src/cli/commands/runner/index.d.ts

@@ -0,0 +1,3 @@
+export declare const DENO_RUNNER_SOURCE: string;
+export declare const LAMBDA_RUNNER_SOURCE: string;
+//# sourceMappingURL=index.d.ts.map

package/src/cli/commands/runner/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/cli/commands/runner/index.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,kBAAkB,QAwDnB,CAAC;AAEb,eAAO,MAAM,oBAAoB,QAiFrB,CAAC"}

package/src/cli/commands/runner/index.js

@@ -0,0 +1,139 @@
+export const DENO_RUNNER_SOURCE = [
+    "import http from 'node:http';",
+    "import { deno } from '@zintrust/core/start';",
+    '',
+    "const port = Number.parseInt(process.env.PORT ?? '3000', 10) || 3000;",
+    "const host = process.env.HOST ?? 'localhost';",
+    '',
+    'const readBody = async (req: http.IncomingMessage): Promise<Buffer | undefined> => {',
+    "  if (req.method === 'GET' || req.method === 'HEAD') return undefined;",
+    '  const chunks: Buffer[] = [];',
+    '  for await (const chunk of req) chunks.push(Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk));',
+    '  return chunks.length > 0 ? Buffer.concat(chunks) : undefined;',
+    '};',
+    '',
+    'const server = http.createServer(async (req, res) => {',
+    '  try {',
+    "    const proto = (req.headers['x-forwarded-proto'] ?? 'http').toString();",
+    '    const authority = (req.headers.host ?? host).toString();',
+    "    const url = new URL(req.url ?? '/', proto + '://' + authority);",
+    '',
+    '    const headers = new Headers();',
+    '    for (const [key, value] of Object.entries(req.headers)) {',
+    '      if (value === undefined) continue;',
+    '      if (Array.isArray(value)) {',
+    '        for (const v of value) headers.append(key, v);',
+    '      } else {',
+    '        headers.set(key, String(value));',
+    '      }',
+    '    }',
+    '',
+    '    const body = await readBody(req);',
+    '    const request = new Request(url.toString(), {',
+    "      method: req.method ?? 'GET',",
+    '      headers,',
+    '      body,',
+    '    });',
+    '',
+    '    const response = await deno(request);',
+    '',
+    '    res.statusCode = response.status;',
+    '    response.headers.forEach((v, k) => res.setHeader(k, v));',
+    '',
+    '    const ab = await response.arrayBuffer();',
+    '    res.end(Buffer.from(ab));',
+    '  } catch (err) {',
+    '    res.statusCode = 500;',
+    "    res.setHeader('content-type', 'text/plain');",
+    "    res.end('Internal Server Error' + (err as Error).message);",
+    '  }',
+    '});',
+    '',
+    'server.listen(port, host, () => {',
+    '  // eslint-disable-next-line no-console',
+    "  console.log('Deno adapter server listening at http://' + host + ':' + port);",
+    '});',
+    '',
+].join('\n');
+export const LAMBDA_RUNNER_SOURCE = [
+    "import http from 'node:http';",
+    "import { handler as lambdaHandler } from '@zintrust/core/start';",
+    '',
+    "const port = Number.parseInt(process.env.PORT ?? '3000', 10) || 3000;",
+    "const host = process.env.HOST ?? 'localhost';",
+    '',
+    'const readBody = async (req: http.IncomingMessage): Promise<string | undefined> => {',
+    "  if (req.method === 'GET' || req.method === 'HEAD') return undefined;",
+    '  const chunks: Buffer[] = [];',
+    '  for await (const chunk of req) chunks.push(Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk));',
+    "  return chunks.length > 0 ? Buffer.concat(chunks).toString('utf-8') : undefined;",
+    '};',
+    '',
+    'const server = http.createServer(async (req, res) => {',
+    '  try {',
+    "    const proto = (req.headers['x-forwarded-proto'] ?? 'http').toString();",
+    '    const authority = (req.headers.host ?? host).toString();',
+    "    const url = new URL(req.url ?? '/', proto + '://' + authority);",
+    '',
+    '    const body = await readBody(req);',
+    '    const headers: Record<string, string> = {};',
+    '    for (const [k, v] of Object.entries(req.headers)) {',
+    '      if (v === undefined) continue;',
+    "      headers[k] = Array.isArray(v) ? v.join(',') : String(v);",
+    '    }',
+    '',
+    '    const queryStringParameters: Record<string, string> = {};',
+    '    url.searchParams.forEach((value, key) => {',
+    '      if (queryStringParameters[key] === undefined) queryStringParameters[key] = value;',
+    '    });',
+    '',
+    '    const event = {',
+    "      version: '2.0',",
+    "      routeKey: '$default',",
+    '      rawPath: url.pathname,',
+    '      rawQueryString: url.searchParams.toString(),',
+    '      headers,',
+    '      queryStringParameters,',
+    '      requestContext: {',
+    '        http: {',
+    "          method: req.method ?? 'GET',",
+    '          path: url.pathname,',
+    "          sourceIp: (req.socket.remoteAddress ?? '').toString(),",
+    '        },',
+    '      },',
+    '      body: body ?? null,',
+    '      isBase64Encoded: false,',
+    '    };',
+    '',
+    '    const result = (await lambdaHandler(event, {})) as {',
+    '      statusCode?: number;',
+    '      headers?: Record<string, string | string[]>;',
+    '      body?: string;',
+    '      isBase64Encoded?: boolean;',
+    '    };',
+    '',
+    '    res.statusCode = typeof result.statusCode === "number" ? result.statusCode : 200;',
+    '    if (result.headers) {',
+    '      for (const [k, v] of Object.entries(result.headers)) {',
+    '        res.setHeader(k, v as any);',
+    '      }',
+    '    }',
+    '',
+    '    if (result.isBase64Encoded === true && typeof result.body === "string") {',
+    "      res.end(Buffer.from(result.body, 'base64'));",
+    '    } else {',
+    "      res.end(result.body ?? '');",
+    '    }',
+    '  } catch {',
+    '    res.statusCode = 500;',
+    "    res.setHeader('content-type', 'application/json');",
+    "    res.end(JSON.stringify({ message: 'Internal Server Error' }));",
+    '  }',
+    '});',
+    '',
+    'server.listen(port, host, () => {',
+    '  // eslint-disable-next-line no-console',
+    "  console.log('Lambda adapter server listening at http://' + host + ':' + port);",
+    '});',
+    '',
+].join('\n');

package/src/cli/config/ConfigSchema.js

@@ -18,7 +18,7 @@ export const DEFAULT_CONFIG = Object.freeze({
         logging: false,
     },
     server: {
-        port: 3000,
+        port: 7777,
         host: '0.0.0.0',
         environment: 'development',
         debug: false,

package/src/cli/env/EnvFileBackfill.d.ts

@@ -0,0 +1,10 @@
+export type EnvBackfillResult = {
+    changed: boolean;
+    filledKeys: string[];
+    appendedKeys: string[];
+};
+export declare const EnvFileBackfill: Readonly<{
+    stripEnvInlineComment: (value: string) => string;
+    backfillEnvDefaults: (envPath: string, defaults: Record<string, string>) => EnvBackfillResult;
+}>;
+//# sourceMappingURL=EnvFileBackfill.d.ts.map

package/src/cli/env/EnvFileBackfill.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"EnvFileBackfill.d.ts","sourceRoot":"","sources":["../../../../src/cli/env/EnvFileBackfill.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,iBAAiB,GAAG;IAC9B,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,YAAY,EAAE,MAAM,EAAE,CAAC;CACxB,CAAC;AAsEF,eAAO,MAAM,eAAe;mCApEU,MAAM,KAAG,MAAM;mCAqB1C,MAAM,YACL,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,KAC/B,iBAAiB;EAgDlB,CAAC"}

package/src/cli/env/EnvFileBackfill.js

@@ -0,0 +1,64 @@
+import { readFileSync, writeFileSync } from '../../node-singletons/fs.js';
+const stripEnvInlineComment = (value) => {
+    let inSingle = false;
+    let inDouble = false;
+    for (let i = 0; i < value.length; i += 1) {
+        const ch = value[i];
+        if (ch === "'" && !inDouble)
+            inSingle = !inSingle;
+        if (ch === '"' && !inSingle)
+            inDouble = !inDouble;
+        if (!inSingle && !inDouble && ch === '#') {
+            const prev = value[i - 1];
+            if (prev === undefined || prev === ' ' || prev === '\t') {
+                return value.slice(0, i).trimEnd();
+            }
+        }
+    }
+    return value;
+};
+const backfillEnvDefaults = (envPath, defaults) => {
+    const raw = readFileSync(envPath, 'utf8');
+    const lines = raw.split(/\r?\n/);
+    const seen = new Set();
+    const filledKeys = [];
+    const appendedKeys = [];
+    const out = lines.map((line) => {
+        const trimmed = line.trim();
+        if (trimmed === '' || trimmed.startsWith('#'))
+            return line;
+        const withoutExport = trimmed.startsWith('export ') ? trimmed.slice('export '.length) : trimmed;
+        const eq = withoutExport.indexOf('=');
+        if (eq <= 0)
+            return line;
+        const key = withoutExport.slice(0, eq).trim();
+        if (key === '')
+            return line;
+        if (!Object.hasOwn(defaults, key))
+            return line;
+        if (seen.has(key))
+            return line;
+        seen.add(key);
+        const rhs = withoutExport.slice(eq + 1);
+        const withoutComment = stripEnvInlineComment(rhs);
+        const value = withoutComment.trim();
+        if (value !== '')
+            return line;
+        filledKeys.push(key);
+        return `${key}=${defaults[key]}`;
+    });
+    const missingKeys = Object.keys(defaults).filter((k) => !seen.has(k));
+    if (missingKeys.length > 0) {
+        appendedKeys.push(...missingKeys);
+        out.push(...missingKeys.map((k) => `${k}=${defaults[k]}`));
+    }
+    const changed = filledKeys.length > 0 || appendedKeys.length > 0;
+    if (!changed)
+        return { changed: false, filledKeys, appendedKeys };
+    writeFileSync(envPath, out.join('\n') + (out.at(-1) === '' ? '' : '\n'));
+    return { changed: true, filledKeys, appendedKeys };
+};
+export const EnvFileBackfill = Object.freeze({
+    stripEnvInlineComment,
+    backfillEnvDefaults,
+});

package/src/cli/scaffolding/ProjectScaffolder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ProjectScaffolder.d.ts","sourceRoot":"","sources":["../../../../src/cli/scaffolding/ProjectScaffolder.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAQH,MAAM,WAAW,sBAAsB;IACrC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,MAAM,cAAc,GAAG,sBAAsB,CAAC;AAEpD,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC/B;AAED,MAAM,WAAW,qBAAqB;IACpC,OAAO,EAAE,OAAO,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,KAAK,CAAC;CACf;AAED,MAAM,WAAW,kBAAkB;IACjC,cAAc,CAAC,OAAO,EAAE,sBAAsB,GAAG,IAAI,CAAC;IACtD,YAAY,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACxC,eAAe,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,eAAe,GAAG,SAAS,CAAC;IACpE,cAAc,IAAI,MAAM,CAAC;IACzB,sBAAsB,IAAI,OAAO,CAAC;IAClC,iBAAiB,IAAI,MAAM,CAAC;IAC5B,WAAW,CAAC,OAAO,CAAC,EAAE,sBAAsB,GAAG,MAAM,CAAC;IACtD,gBAAgB,IAAI,OAAO,CAAC;IAC5B,aAAa,IAAI,OAAO,CAAC;IACzB,QAAQ,CAAC,OAAO,EAAE,sBAAsB,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAAC;CAC3E;AAyaD,wBAAgB,qBAAqB,IAAI,MAAM,EAAE,CAEhD;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,eAAe,GAAG,SAAS,CAsBrE;AAED,wBAAgB,eAAe,CAAC,OAAO,EAAE,sBAAsB,GAAG;IAChE,KAAK,EAAE,OAAO,CAAC;IACf,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB,CAsBA;AA0ID;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,WAAW,GAAE,MAAsB,GAAG,kBAAkB,CAsB/F;AAED,wBAAsB,eAAe,CACnC,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,sBAAsB,GAC9B,OAAO,CAAC,qBAAqB,CAAC,CAEhC;AAED;;GAEG;AACH,eAAO,MAAM,iBAAiB;;;;;;EAM5B,CAAC"}
+{"version":3,"file":"ProjectScaffolder.d.ts","sourceRoot":"","sources":["../../../../src/cli/scaffolding/ProjectScaffolder.ts"],"names":[],"mappings":"AAAA;;;GAGG;AASH,MAAM,WAAW,sBAAsB;IACrC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,MAAM,cAAc,GAAG,sBAAsB,CAAC;AAEpD,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC/B;AAED,MAAM,WAAW,qBAAqB;IACpC,OAAO,EAAE,OAAO,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,KAAK,CAAC;CACf;AAED,MAAM,WAAW,kBAAkB;IACjC,cAAc,CAAC,OAAO,EAAE,sBAAsB,GAAG,IAAI,CAAC;IACtD,YAAY,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACxC,eAAe,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,eAAe,GAAG,SAAS,CAAC;IACpE,cAAc,IAAI,MAAM,CAAC;IACzB,sBAAsB,IAAI,OAAO,CAAC;IAClC,iBAAiB,IAAI,MAAM,CAAC;IAC5B,WAAW,CAAC,OAAO,CAAC,EAAE,sBAAsB,GAAG,MAAM,CAAC;IACtD,gBAAgB,IAAI,OAAO,CAAC;IAC5B,aAAa,IAAI,OAAO,CAAC;IACzB,QAAQ,CAAC,OAAO,EAAE,sBAAsB,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAAC;CAC3E;AA0cD,wBAAgB,qBAAqB,IAAI,MAAM,EAAE,CAEhD;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,eAAe,GAAG,SAAS,CAsBrE;AAED,wBAAgB,eAAe,CAAC,OAAO,EAAE,sBAAsB,GAAG;IAChE,KAAK,EAAE,OAAO,CAAC;IACf,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB,CAsBA;AA0ID;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,WAAW,GAAE,MAAsB,GAAG,kBAAkB,CAsB/F;AAED,wBAAsB,eAAe,CACnC,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,sBAAsB,GAC9B,OAAO,CAAC,qBAAqB,CAAC,CAEhC;AAED;;GAEG;AACH,eAAO,MAAM,iBAAiB;;;;;;EAM5B,CAAC"}

package/src/cli/scaffolding/ProjectScaffolder.js

@@ -2,6 +2,7 @@
  * Project Scaffolder - New project generation
  * Handles directory structure and boilerplate file creation
  */
+import { EnvFileBackfill } from '../env/EnvFileBackfill.js';
 import { Logger } from '../../config/logger.js';
 import { randomBytes } from '../../node-singletons/crypto.js';
 import fs from '../../node-singletons/fs.js';
@@ -87,7 +88,7 @@ const createProjectConfigFile = (projectPath, variables) => {
                 connection: variables['database'] ?? 'sqlite',
             },
             server: {
-                port: variables['port'] ?? 3000,
+                port: variables['port'] ?? 7777,
             },
         };
         fs.writeFileSync(fullPath, JSON.stringify(config, null, 2));
@@ -97,18 +98,59 @@ const createProjectConfigFile = (projectPath, variables) => {
         return false;
     }
 };
+const buildDatabaseEnvLines = (database) => {
+    if (database === 'postgresql' || database === 'postgres') {
+        return [
+            'DB_HOST=localhost',
+            'DB_PORT=5432',
+            'DB_DATABASE=zintrust',
+            'DB_USERNAME=postgres',
+            'DB_PASSWORD=',
+        ];
+    }
+    if (database === 'mysql') {
+        return [
+            'DB_HOST=localhost',
+            'DB_PORT=3306',
+            'DB_DATABASE=zintrust',
+            'DB_USERNAME=root',
+            'DB_PASSWORD=',
+        ];
+    }
+    if (database === 'sqlite') {
+        // Provide both DB_DATABASE (used by the framework) and DB_PATH (common alias)
+        return ['DB_DATABASE=./database.sqlite', 'DB_PATH=./database.sqlite'];
+    }
+    if (database === 'd1-remote' || database === 'd1-proxy') {
+        return [
+            '# Cloudflare D1 Remote Proxy (HTTPS)',
+            'D1_REMOTE_URL=',
+            'D1_REMOTE_KEY_ID=',
+            'D1_REMOTE_SECRET=',
+            'D1_REMOTE_MODE=registry',
+            'ZT_PROXY_TIMEOUT_MS=15000',
+        ];
+    }
+    return [];
+};
 const createEnvFile = (projectPath, variables) => {
     try {
         if (!fs.existsSync(projectPath)) {
             fs.mkdirSync(projectPath, { recursive: true });
         }
         const fullPath = path.join(projectPath, '.env');
-        // If the template already produced an .env, do not overwrite it here.
+        // If an .env already exists (e.g., from a template), do not overwrite user values.
+        // But we *do* backfill safe defaults for common bootstrap keys when missing/blank.
         if (fs.existsSync(fullPath)) {
+            EnvFileBackfill.backfillEnvDefaults(fullPath, {
+                HOST: 'localhost',
+                PORT: String(Number(variables['port'] ?? 7777)),
+                LOG_LEVEL: 'debug',
+            });
             return true;
         }
         const name = typeof variables['projectName'] === 'string' ? variables['projectName'] : 'zintrust-app';
-        const port = Number(variables['port'] ?? 3000);
+        const port = Number(variables['port'] ?? 7777);
         const database = typeof variables['database'] === 'string' ? variables['database'] : 'sqlite';
         // Generate a secure APP_KEY (32 bytes = 256-bit, base64 encoded)
         const appKeyBytes = randomBytes(32);
@@ -119,28 +161,12 @@ const createEnvFile = (projectPath, variables) => {
             `APP_NAME=${name}`,
             'HOST=localhost',
             `PORT=${port}`,
-            `APP_PORT=${port}`,
             'APP_DEBUG=true',
             // Auto-generated secure key for storage signing and encryption
             `APP_KEY=${appKey}`,
             `DB_CONNECTION=${database}`,
         ];
-        const dbLines = (() => {
-            if (database === 'postgresql' || database === 'postgres') {
-                return [
-                    'DB_HOST=localhost',
-                    'DB_PORT=5432',
-                    'DB_DATABASE=zintrust',
-                    'DB_USERNAME=postgres',
-                    'DB_PASSWORD=',
-                ];
-            }
-            if (database === 'sqlite') {
-                // Provide both DB_DATABASE (used by the framework) and DB_PATH (common alias)
-                return ['DB_DATABASE=./database.sqlite', 'DB_PATH=./database.sqlite'];
-            }
-            return [];
-        })();
+        const dbLines = buildDatabaseEnvLines(database);
         const placeholderLines = [
             '',
             '# Logging',
@@ -162,7 +188,7 @@ const createEnvFile = (projectPath, variables) => {
             '',
             '# Microservices',
             'SERVICE_DISCOVERY_ENABLED=false',
-            'SERVICE_DISCOVERY_DRIVER=local',
+            'SERVICE_DISCOVERY_TYPE=filesystem',
             'SERVICE_NAME=',
             'SERVICE_VERSION=1.0.0',
         ];
@@ -245,11 +271,15 @@ const loadTemplateFiles = (templateDir) => {
         if (relPath === 'template.json')
             return false;
         const normalized = normalizeRelPath(relPath);
+        // Project `.env` is generated by createEnvFile() so it can set defaults and create a secure APP_KEY.
+        // Some templates ship `.env.tpl` (which would become `.env`), but that file is intentionally ignored.
+        const outputRel = normalizeRelPath(getOutputRelPath(relPath));
+        if (outputRel === '.env')
+            return false;
         if (!normalized.startsWith('config/'))
             return true;
         // Starter apps should only ship app-level config modules.
         // Core/framework config internals (e.g. config/logging/*) remain core-owned.
-        const outputRel = normalizeRelPath(getOutputRelPath(relPath));
         return allowedConfigFiles.has(outputRel);
     };
     const readUtf8FileOrUndefined = (absPath) => {
@@ -424,7 +454,7 @@ const prepareContext = (state, options) => {
         projectSlug: options.name,
         author: options.author ?? 'Your Name',
         description: options.description ?? '',
-        port: options.port ?? 3000,
+        port: options.port ?? 7777,
         database: options.database ?? 'sqlite',
         template: state.templateName,
         migrationTimestamp,

package/src/cli/utils/DistPackager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DistPackager.d.ts","sourceRoot":"","sources":["../../../../src/cli/utils/DistPackager.ts"],"names":[],"mappings":"AAgHA,eAAO,MAAM,YAAY;IACvB;;;OAGG;sBACe,MAAM,aAAY,MAAM,GAAmB,IAAI;EAgBjE,CAAC"}
+{"version":3,"file":"DistPackager.d.ts","sourceRoot":"","sources":["../../../../src/cli/utils/DistPackager.ts"],"names":[],"mappings":"AAoIA,eAAO,MAAM,YAAY;IACvB;;;OAGG;sBACe,MAAM,aAAY,MAAM,GAAmB,IAAI;EAgBjE,CAAC"}