@zintrust/core 1.5.3 → 1.5.5

package/bin/z.js

@@ -3,5 +3,105 @@
  * ZinTrust CLI Shortcut - 'z'
  * Mirrors bin/zintrust.ts for convenience
  */
-import { run } from './zintrust-main.js';
-await run();
+import { spawn } from 'node:child_process';
+import { existsSync } from 'node:fs';
+import { createRequire } from 'node:module';
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+const here = path.dirname(fileURLToPath(import.meta.url));
+const require = createRequire(import.meta.url);
+const tsTarget = path.join(here, 'zintrust-main.ts');
+const jsTarget = path.join(here, 'zintrust-main.js');
+const target = existsSync(tsTarget) ? tsTarget : jsTarget;
+const tsxImportPath = require.resolve('tsx');
+const nodeArgs = target.endsWith('.ts')
+    ? ['--import', tsxImportPath, target, ...process.argv.slice(2)]
+    : [target, ...process.argv.slice(2)];
+const child = spawn(process.execPath, nodeArgs, {
+    stdio: ['inherit', 'pipe', 'pipe'],
+    env: process.env,
+});
+child.stdout?.on('data', (chunk) => {
+    process.stdout.write(chunk);
+});
+child.stderr?.on('data', (chunk) => {
+    process.stderr.write(chunk);
+});
+let childClosed = false;
+let delayedSignalTimer;
+const clearDelayedSignal = () => {
+    if (delayedSignalTimer === undefined)
+        return;
+    clearTimeout(delayedSignalTimer);
+    delayedSignalTimer = undefined;
+};
+const forwardSignal = (signal) => {
+    if (childClosed)
+        return;
+    try {
+        child.kill(signal);
+    }
+    catch {
+        // best-effort
+    }
+};
+const scheduleSignalForward = (signal) => {
+    if (childClosed || delayedSignalTimer !== undefined)
+        return;
+    delayedSignalTimer = globalThis.setTimeout(() => {
+        delayedSignalTimer = undefined;
+        forwardSignal(signal);
+    }, 1500);
+    delayedSignalTimer.unref?.();
+};
+const onSigint = () => {
+    if (process.stdin.isTTY === true) {
+        scheduleSignalForward('SIGINT');
+        return;
+    }
+    forwardSignal('SIGINT');
+};
+const onSigterm = () => {
+    if (process.stdin.isTTY === true) {
+        scheduleSignalForward('SIGTERM');
+        return;
+    }
+    forwardSignal('SIGTERM');
+};
+process.on('SIGINT', onSigint);
+process.on('SIGTERM', onSigterm);
+const result = await new Promise((resolve, reject) => {
+    let settled = false;
+    let childResult = {
+        exitCode: null,
+        signal: null,
+    };
+    const finalize = () => {
+        if (settled) {
+            return;
+        }
+        settled = true;
+        childClosed = true;
+        clearDelayedSignal();
+        process.off('SIGINT', onSigint);
+        process.off('SIGTERM', onSigterm);
+        child.off?.('error', reject);
+        child.off?.('exit', handleExit);
+        child.off?.('close', handleClose);
+        resolve(childResult);
+    };
+    const handleExit = (exitCode, signal) => {
+        childResult = { exitCode, signal };
+    };
+    const handleClose = (exitCode, signal) => {
+        childResult = {
+            exitCode: childResult.exitCode ?? exitCode,
+            signal: childResult.signal ?? signal,
+        };
+        finalize();
+    };
+    child.once('error', reject);
+    child.once('exit', handleExit);
+    child.once('close', handleClose);
+});
+process.exit(result.exitCode ?? (result.signal === 'SIGINT' || result.signal === 'SIGTERM' ? 0 : 1));

package/bin/zin.js

@@ -3,5 +3,195 @@
  * ZinTrust CLI Shortcut - 'zin'
  * Mirrors bin/zintrust.ts for convenience
  */
-import { run } from './zintrust-main.js';
-await run();
+import { spawn } from 'node:child_process';
+import { existsSync } from 'node:fs';
+import { createRequire } from 'node:module';
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+const CLI_SPAWN_TRACE_ENV_KEYS = ['CLI_SPAWN_TRACE', 'ZIN_SPAWN_TRACE'];
+const isCliSpawnTraceEnabled = () => {
+    return CLI_SPAWN_TRACE_ENV_KEYS.some((key) => {
+        const raw = process.env[key];
+        if (typeof raw !== 'string')
+            return false;
+        const normalized = raw.trim().toLowerCase();
+        return (normalized === '1' || normalized === 'true' || normalized === 'yes' || normalized === 'on');
+    });
+};
+const writeCliSpawnTrace = (label, details = {}) => {
+    if (!isCliSpawnTraceEnabled())
+        return;
+    process.stderr.write(`${JSON.stringify({ trace: 'cli-wrapper', label, pid: process.pid, details })}\n`);
+};
+const here = path.dirname(fileURLToPath(import.meta.url));
+const require = createRequire(import.meta.url);
+const tsTarget = path.join(here, 'zintrust-main.ts');
+const jsTarget = path.join(here, 'zintrust-main.js');
+const target = existsSync(tsTarget) ? tsTarget : jsTarget;
+const tsxImportPath = require.resolve('tsx');
+const nodeArgs = target.endsWith('.ts')
+    ? ['--import', tsxImportPath, target, ...process.argv.slice(2)]
+    : [target, ...process.argv.slice(2)];
+const child = spawn(process.execPath, nodeArgs, {
+    stdio: ['inherit', 'pipe', 'pipe'],
+    env: process.env,
+});
+writeCliSpawnTrace('wrapper.child.started', {
+    childPid: child.pid,
+    command: process.execPath,
+    args: nodeArgs,
+});
+child.stdout?.on('data', (chunk) => {
+    writeCliSpawnTrace('wrapper.child.stdout.data', {
+        childPid: child.pid,
+        bytes: typeof chunk === 'string' ? Buffer.byteLength(chunk) : chunk.length,
+    });
+    process.stdout.write(chunk);
+});
+child.stdout?.on('end', () => {
+    writeCliSpawnTrace('wrapper.child.stdout.end', {
+        childPid: child.pid,
+    });
+});
+child.stdout?.on('close', () => {
+    writeCliSpawnTrace('wrapper.child.stdout.close', {
+        childPid: child.pid,
+    });
+});
+child.stderr?.on('data', (chunk) => {
+    writeCliSpawnTrace('wrapper.child.stderr.data', {
+        childPid: child.pid,
+        bytes: typeof chunk === 'string' ? Buffer.byteLength(chunk) : chunk.length,
+    });
+    process.stderr.write(chunk);
+});
+child.stderr?.on('end', () => {
+    writeCliSpawnTrace('wrapper.child.stderr.end', {
+        childPid: child.pid,
+    });
+});
+child.stderr?.on('close', () => {
+    writeCliSpawnTrace('wrapper.child.stderr.close', {
+        childPid: child.pid,
+    });
+});
+let childClosed = false;
+let delayedSignalTimer;
+const clearDelayedSignal = () => {
+    if (delayedSignalTimer === undefined)
+        return;
+    clearTimeout(delayedSignalTimer);
+    delayedSignalTimer = undefined;
+};
+const forwardSignal = (signal) => {
+    if (childClosed)
+        return;
+    try {
+        writeCliSpawnTrace('wrapper.signal.forward.attempt', {
+            childPid: child.pid,
+            signal,
+        });
+        child.kill(signal);
+        writeCliSpawnTrace('wrapper.signal.forward.complete', {
+            childPid: child.pid,
+            signal,
+        });
+    }
+    catch {
+        // best-effort
+    }
+};
+const scheduleSignalForward = (signal) => {
+    if (childClosed || delayedSignalTimer !== undefined)
+        return;
+    delayedSignalTimer = globalThis.setTimeout(() => {
+        delayedSignalTimer = undefined;
+        writeCliSpawnTrace('wrapper.signal.delay.fire', {
+            childPid: child.pid,
+            signal,
+        });
+        forwardSignal(signal);
+    }, 1500);
+    writeCliSpawnTrace('wrapper.signal.delay.schedule', {
+        childPid: child.pid,
+        signal,
+        delayMs: 1500,
+    });
+    delayedSignalTimer.unref?.();
+};
+const onSigint = () => {
+    writeCliSpawnTrace('wrapper.signal.received', {
+        childPid: child.pid,
+        signal: 'SIGINT',
+        tty: process.stdin.isTTY === true,
+    });
+    if (process.stdin.isTTY === true) {
+        scheduleSignalForward('SIGINT');
+        return;
+    }
+    forwardSignal('SIGINT');
+};
+const onSigterm = () => {
+    writeCliSpawnTrace('wrapper.signal.received', {
+        childPid: child.pid,
+        signal: 'SIGTERM',
+        tty: process.stdin.isTTY === true,
+    });
+    if (process.stdin.isTTY === true) {
+        scheduleSignalForward('SIGTERM');
+        return;
+    }
+    forwardSignal('SIGTERM');
+};
+process.on('SIGINT', onSigint);
+process.on('SIGTERM', onSigterm);
+const result = await new Promise((resolve, reject) => {
+    let settled = false;
+    let childResult = {
+        exitCode: null,
+        signal: null,
+    };
+    const finalize = () => {
+        if (settled) {
+            return;
+        }
+        settled = true;
+        writeCliSpawnTrace('wrapper.child.finalize', {
+            childPid: child.pid,
+            exitCode: childResult.exitCode,
+            signal: childResult.signal,
+        });
+        childClosed = true;
+        clearDelayedSignal();
+        process.off('SIGINT', onSigint);
+        process.off('SIGTERM', onSigterm);
+        child.off?.('error', reject);
+        child.off?.('exit', handleExit);
+        child.off?.('close', handleClose);
+        resolve(childResult);
+    };
+    const handleExit = (exitCode, signal) => {
+        writeCliSpawnTrace('wrapper.child.exit', {
+            childPid: child.pid,
+            exitCode,
+            signal,
+        });
+        childResult = { exitCode, signal };
+    };
+    const handleClose = (exitCode, signal) => {
+        writeCliSpawnTrace('wrapper.child.close', {
+            childPid: child.pid,
+            exitCode,
+            signal,
+        });
+        childResult = {
+            exitCode: childResult.exitCode ?? exitCode,
+            signal: childResult.signal ?? signal,
+        };
+        finalize();
+    };
+    child.once('error', reject);
+    child.once('exit', handleExit);
+    child.once('close', handleClose);
+});
+process.exit(result.exitCode ?? (result.signal === 'SIGINT' || result.signal === 'SIGTERM' ? 0 : 1));

package/bin/zintrust-main.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"zintrust-main.d.ts","sourceRoot":"","sources":["../../bin/zintrust-main.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAOH,KAAK,qBAAqB,GAAG;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AA0WF,wBAAsB,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC,CAMzC;AAED,eAAO,MAAM,mBAAmB;;qCAzUQ,MAAM,KAAG,qBAAqB,GAAG,SAAS;mCA6C5C,MAAM,GAAG,IAAI,UAAU,MAAM,CAAC,OAAO,GAAG,IAAI,KAAG,MAAM;iCAnEzD,MAAM;8BAIP,MAAM,KAAG,MAAM;uCAsEtC,qBAAqB,WACpB,MAAM,EAAE,KAChB,OAAO,CAAC,KAAK,CAAC;oCAhEsB,MAAM,sBAAsB,MAAM,KAAG,OAAO;6CA2G7B,MAAM,EAAE,KAAG,OAAO,CAAC,OAAO,CAAC;yCAtE1E,MAAM,sBACS,MAAM,QACrB,MAAM,CAAC,UAAU,KACrB,qBAAqB,GAAG,SAAS;EAqTlC,CAAC;AAEH,OAAO,EAAE,CAAC"}
+{"version":3,"file":"zintrust-main.d.ts","sourceRoot":"","sources":["../../bin/zintrust-main.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAOH,KAAK,qBAAqB,GAAG;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAiYF,wBAAsB,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC,CAMzC;AAED,eAAO,MAAM,mBAAmB;;qCAhWQ,MAAM,KAAG,qBAAqB,GAAG,SAAS;mCA6C5C,MAAM,GAAG,IAAI,UAAU,MAAM,CAAC,OAAO,GAAG,IAAI,KAAG,MAAM;iCAnEzD,MAAM;8BAIP,MAAM,KAAG,MAAM;uCAoGtC,qBAAqB,WACpB,MAAM,EAAE,KAChB,OAAO,CAAC,KAAK,CAAC;oCA9FsB,MAAM,sBAAsB,MAAM,KAAG,OAAO;6CAkI7B,MAAM,EAAE,KAAG,OAAO,CAAC,OAAO,CAAC;yCA7F1E,MAAM,sBACS,MAAM,QACrB,MAAM,CAAC,UAAU,KACrB,qBAAqB,GAAG,SAAS;EA4UlC,CAAC;AAaH,OAAO,EAAE,CAAC"}

package/bin/zintrust-main.js

@@ -80,6 +80,28 @@ const getHandoffExitCode = (exitCode, signal) => {
         return 0;
     return 1;
 };
+const waitForChildTermination = async (child) => {
+    return await new Promise((resolve, reject) => {
+        let settled = false;
+        const finish = (exitCode, signal) => {
+            if (settled)
+                return;
+            settled = true;
+            child.off?.('exit', onExit);
+            child.off?.('close', onClose);
+            resolve({ exitCode, signal });
+        };
+        const onExit = (exitCode, signal) => {
+            finish(exitCode, signal);
+        };
+        const onClose = (exitCode, signal) => {
+            finish(exitCode, signal);
+        };
+        child.once('error', reject);
+        child.once('exit', onExit);
+        child.once('close', onClose);
+    });
+};
 const handoffToProjectLocalCli = async (target, rawArgs) => {
     const child = spawn(process.execPath, [target.binPath, ...rawArgs], {
         stdio: 'inherit',
@@ -104,12 +126,7 @@ const handoffToProjectLocalCli = async (target, rawArgs) => {
     process.on('SIGINT', onSigint);
     process.on('SIGTERM', onSigterm);
     try {
-        const result = await new Promise((resolve, reject) => {
-            child.once('error', reject);
-            child.once('close', (exitCode, signal) => {
-                resolve({ exitCode, signal });
-            });
-        });
+        const result = await waitForChildTermination(child);
         process.exit(getHandoffExitCode(result.exitCode, result.signal));
     }
     finally {
@@ -317,3 +334,12 @@ export const CliLauncherInternal = Object.freeze({
     maybeHandoffToProjectLocalCli,
     resolveProjectLocalCliHandoff,
 });
+const shouldRunAsMain = () => {
+    const entryArg = process.argv[1];
+    if (typeof entryArg !== 'string' || entryArg.trim() === '')
+        return false;
+    return getRealPath(entryArg) === getRealPath(fileURLToPath(import.meta.url));
+};
+if (shouldRunAsMain()) {
+    await run();
+}

package/bin/zintrust.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"zintrust.d.ts","sourceRoot":"","sources":["../../bin/zintrust.ts"],"names":[],"mappings":";AAEA;;;;;;GAMG;AAKH,OAAO,EAAE,CAAC"}
+{"version":3,"file":"zintrust.d.ts","sourceRoot":"","sources":["../../bin/zintrust.ts"],"names":[],"mappings":";AAEA;;;;;;GAMG;AA6HH,OAAO,EAAE,CAAC"}

package/bin/zintrust.js

@@ -6,5 +6,105 @@
  * bin/zintrust-main.ts. Keeping the implementation hashbang-free allows other
  * shortcuts (zin/z/zt) to import it without parse issues.
  */
-import { run } from './zintrust-main.js';
-await run();
+import { spawn } from 'node:child_process';
+import { existsSync } from 'node:fs';
+import { createRequire } from 'node:module';
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+const here = path.dirname(fileURLToPath(import.meta.url));
+const require = createRequire(import.meta.url);
+const tsTarget = path.join(here, 'zintrust-main.ts');
+const jsTarget = path.join(here, 'zintrust-main.js');
+const target = existsSync(tsTarget) ? tsTarget : jsTarget;
+const tsxImportPath = require.resolve('tsx');
+const nodeArgs = target.endsWith('.ts')
+    ? ['--import', tsxImportPath, target, ...process.argv.slice(2)]
+    : [target, ...process.argv.slice(2)];
+const child = spawn(process.execPath, nodeArgs, {
+    stdio: ['inherit', 'pipe', 'pipe'],
+    env: process.env,
+});
+child.stdout?.on('data', (chunk) => {
+    process.stdout.write(chunk);
+});
+child.stderr?.on('data', (chunk) => {
+    process.stderr.write(chunk);
+});
+let childClosed = false;
+let delayedSignalTimer;
+const clearDelayedSignal = () => {
+    if (delayedSignalTimer === undefined)
+        return;
+    clearTimeout(delayedSignalTimer);
+    delayedSignalTimer = undefined;
+};
+const forwardSignal = (signal) => {
+    if (childClosed)
+        return;
+    try {
+        child.kill(signal);
+    }
+    catch {
+        // best-effort
+    }
+};
+const scheduleSignalForward = (signal) => {
+    if (childClosed || delayedSignalTimer !== undefined)
+        return;
+    delayedSignalTimer = globalThis.setTimeout(() => {
+        delayedSignalTimer = undefined;
+        forwardSignal(signal);
+    }, 1500);
+    delayedSignalTimer.unref?.();
+};
+const onSigint = () => {
+    if (process.stdin.isTTY === true) {
+        scheduleSignalForward('SIGINT');
+        return;
+    }
+    forwardSignal('SIGINT');
+};
+const onSigterm = () => {
+    if (process.stdin.isTTY === true) {
+        scheduleSignalForward('SIGTERM');
+        return;
+    }
+    forwardSignal('SIGTERM');
+};
+process.on('SIGINT', onSigint);
+process.on('SIGTERM', onSigterm);
+const result = await new Promise((resolve, reject) => {
+    let settled = false;
+    let childResult = {
+        exitCode: null,
+        signal: null,
+    };
+    const finalize = () => {
+        if (settled) {
+            return;
+        }
+        settled = true;
+        childClosed = true;
+        clearDelayedSignal();
+        process.off('SIGINT', onSigint);
+        process.off('SIGTERM', onSigterm);
+        child.off?.('error', reject);
+        child.off?.('exit', handleExit);
+        child.off?.('close', handleClose);
+        resolve(childResult);
+    };
+    const handleExit = (exitCode, signal) => {
+        childResult = { exitCode, signal };
+    };
+    const handleClose = (exitCode, signal) => {
+        childResult = {
+            exitCode: childResult.exitCode ?? exitCode,
+            signal: childResult.signal ?? signal,
+        };
+        finalize();
+    };
+    child.once('error', reject);
+    child.once('exit', handleExit);
+    child.once('close', handleClose);
+});
+process.exit(result.exitCode ?? (result.signal === 'SIGINT' || result.signal === 'SIGTERM' ? 0 : 1));

package/bin/zt.js

@@ -3,5 +3,102 @@
  * ZinTrust CLI Shortcut - 'z'
  * Mirrors bin/zintrust.ts for convenience
  */
-import { run } from './zintrust-main.js';
-await run();
+import { spawn } from 'node:child_process';
+import { existsSync } from 'node:fs';
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+const here = path.dirname(fileURLToPath(import.meta.url));
+const tsTarget = path.join(here, 'zintrust-main.ts');
+const jsTarget = path.join(here, 'zintrust-main.js');
+const target = existsSync(tsTarget) ? tsTarget : jsTarget;
+const nodeArgs = target.endsWith('.ts')
+    ? ['--import', 'tsx', target, ...process.argv.slice(2)]
+    : [target, ...process.argv.slice(2)];
+const child = spawn(process.execPath, nodeArgs, {
+    stdio: ['inherit', 'pipe', 'pipe'],
+    env: process.env,
+});
+child.stdout?.on('data', (chunk) => {
+    process.stdout.write(chunk);
+});
+child.stderr?.on('data', (chunk) => {
+    process.stderr.write(chunk);
+});
+let childClosed = false;
+let delayedSignalTimer;
+const clearDelayedSignal = () => {
+    if (delayedSignalTimer === undefined)
+        return;
+    clearTimeout(delayedSignalTimer);
+    delayedSignalTimer = undefined;
+};
+const forwardSignal = (signal) => {
+    if (childClosed)
+        return;
+    try {
+        child.kill(signal);
+    }
+    catch {
+        // best-effort
+    }
+};
+const scheduleSignalForward = (signal) => {
+    if (childClosed || delayedSignalTimer !== undefined)
+        return;
+    delayedSignalTimer = globalThis.setTimeout(() => {
+        delayedSignalTimer = undefined;
+        forwardSignal(signal);
+    }, 1500);
+    delayedSignalTimer.unref?.();
+};
+const onSigint = () => {
+    if (process.stdin.isTTY === true) {
+        scheduleSignalForward('SIGINT');
+        return;
+    }
+    forwardSignal('SIGINT');
+};
+const onSigterm = () => {
+    if (process.stdin.isTTY === true) {
+        scheduleSignalForward('SIGTERM');
+        return;
+    }
+    forwardSignal('SIGTERM');
+};
+process.on('SIGINT', onSigint);
+process.on('SIGTERM', onSigterm);
+const result = await new Promise((resolve, reject) => {
+    let settled = false;
+    let childResult = {
+        exitCode: null,
+        signal: null,
+    };
+    const finalize = () => {
+        if (settled) {
+            return;
+        }
+        settled = true;
+        childClosed = true;
+        clearDelayedSignal();
+        process.off('SIGINT', onSigint);
+        process.off('SIGTERM', onSigterm);
+        child.off?.('error', reject);
+        child.off?.('exit', handleExit);
+        child.off?.('close', handleClose);
+        resolve(childResult);
+    };
+    const handleExit = (exitCode, signal) => {
+        childResult = { exitCode, signal };
+    };
+    const handleClose = (exitCode, signal) => {
+        childResult = {
+            exitCode: childResult.exitCode ?? exitCode,
+            signal: childResult.signal ?? signal,
+        };
+        finalize();
+    };
+    child.once('error', reject);
+    child.once('exit', handleExit);
+    child.once('close', handleClose);
+});
+process.exit(result.exitCode ?? (result.signal === 'SIGINT' || result.signal === 'SIGTERM' ? 0 : 1));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zintrust/core",
-  "version": "1.5.3",
+  "version": "1.5.5",
   "description": "Production-grade TypeScript backend framework for JavaScript",
   "homepage": "https://zintrust.com",
   "repository": {

package/src/boot/bootstrap.d.ts

@@ -3,5 +3,5 @@
  * Entry point for running the ZinTrust server
  * Sealed namespace for immutability
  */
-export {};
+export declare const bootstrapReady: Promise<void>;
 //# sourceMappingURL=bootstrap.d.ts.map

package/src/boot/bootstrap.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bootstrap.d.ts","sourceRoot":"","sources":["../../../src/boot/bootstrap.ts"],"names":[],"mappings":"AAAA;;;;GAIG"}
+{"version":3,"file":"bootstrap.d.ts","sourceRoot":"","sources":["../../../src/boot/bootstrap.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAgbH,eAAO,MAAM,cAAc,eAAmB,CAAC"}