


























@@ -456,8 +456,65 @@ function isProcessAlive(pid: number): boolean {
456456}
457457}
458458459+// Approximate epoch-ms when the current process started, captured once per
460+// Node lifetime so the lock owner record carries a value that is stable
461+// across `Date.now()` clock skew within the running process.
462+const CURRENT_PROCESS_START_TIME_MS = Math.round(Date.now() - process.uptime() * 1000);
463+464+// Approximate epoch-ms when `pid` started running, or null when the platform
465+// or runtime cannot determine it. Used to distinguish two different process
466+// incarnations that happen to share the same numeric PID — most notably
467+// inside Docker containers, where the gateway is always PID 1 (or PID 7
468+// with `init: true`) in its container PID namespace, so a stale lock left
469+// by a previous incarnation looks live to the new one if we only consult
470+// `isAlive(pid)`.
471+function readProcessStartTimeMs(pid: number): number | null {
472+if (!Number.isInteger(pid) || pid <= 0) {
473+return null;
474+}
475+if (process.platform !== "linux") {
476+return null;
477+}
478+let stat: string;
479+try {
480+stat = fs.readFileSync(`/proc/${pid}/stat`, "utf8");
481+} catch {
482+return null;
483+}
484+// /proc/<pid>/stat: PID (comm) state ppid pgrp ... starttime ... where
485+// `comm` may contain spaces and parens, so we anchor on the LAST `)` and
486+// count whitespace-separated fields after it. Field index 22 (1-based) is
487+// starttime, expressed in clock ticks since boot. After the `)` the next
488+// field is `state` (1), then ppid (2), pgrp (3), session (4), tty_nr (5),
489+// tpgid (6), flags (7), minflt (8), cminflt (9), majflt (10), cmajflt
490+// (11), utime (12), stime (13), cutime (14), cstime (15), priority (16),
491+// nice (17), num_threads (18), itrealvalue (19), starttime (20).
492+const lastParen = stat.lastIndexOf(")");
493+if (lastParen === -1) {
494+return null;
495+}
496+const tail = stat
497+.slice(lastParen + 1)
498+.trim()
499+.split(/\s+/);
500+// tail[0] is `state`; starttime is therefore tail[19].
501+const starttimeJiffies = Number(tail[19]);
502+if (!Number.isFinite(starttimeJiffies)) {
503+return null;
504+}
505+// sysconf(_SC_CLK_TCK) is universally 100 on Linux x86/arm targets. We
506+// hard-code that here rather than spawning getconf — the exact tick rate
507+// does not matter for our purposes as long as it is stable: the starttime
508+// we capture for our own process and the starttime we read for the
509+// lock-owner PID are converted with the same constant, so equality holds.
510+const clockTicksPerSecond = 100;
511+const bootTimeMs = Date.now() - os.uptime() * 1000;
512+return Math.round(bootTimeMs + (starttimeJiffies * 1000) / clockTicksPerSecond);
513+}
514+459515type RuntimeDepsLockOwner = {
460516pid?: number;
517+pidStartTimeMs?: number;
461518createdAtMs?: number;
462519ownerFileState: "ok" | "missing" | "invalid";
463520ownerFilePath: string;
@@ -501,6 +558,7 @@ function readRuntimeDepsLockOwner(lockDir: string): RuntimeDepsLockOwner {
501558}
502559return {
503560pid: typeof owner?.pid === "number" ? owner.pid : undefined,
561+pidStartTimeMs: typeof owner?.pidStartTimeMs === "number" ? owner.pidStartTimeMs : undefined,
504562createdAtMs: typeof owner?.createdAtMs === "number" ? owner.createdAtMs : undefined,
505563 ownerFileState,
506564 ownerFilePath,
@@ -524,12 +582,32 @@ function latestFiniteMs(values: readonly (number | undefined)[]): number | undef
524582}
525583526584function shouldRemoveRuntimeDepsLock(
527-owner: Pick<RuntimeDepsLockOwner, "pid" | "createdAtMs" | "lockDirMtimeMs" | "ownerFileMtimeMs">,
585+owner: Pick<
586+RuntimeDepsLockOwner,
587+"pid" | "pidStartTimeMs" | "createdAtMs" | "lockDirMtimeMs" | "ownerFileMtimeMs"
588+>,
528589nowMs: number,
529590isAlive: (pid: number) => boolean = isProcessAlive,
591+readStartTimeMs: (pid: number) => number | null = readProcessStartTimeMs,
530592): boolean {
531593if (typeof owner.pid === "number") {
532-return !isAlive(owner.pid);
594+if (!isAlive(owner.pid)) {
595+return true;
596+}
597+// PID is alive — but inside Docker the new process can share the same
598+// PID as the dead writer. If we recorded the writer's start-time and we
599+// can read the live PID's start-time, mismatch means a different
600+// incarnation owns this PID now and the lock is stale. When start-time
601+// evidence is unavailable on either side, fall through to the existing
602+// PID-alive-means-fresh behavior so legacy locks keep working as
603+// before.
604+if (typeof owner.pidStartTimeMs === "number") {
605+const liveStartTimeMs = readStartTimeMs(owner.pid);
606+if (liveStartTimeMs !== null && liveStartTimeMs !== owner.pidStartTimeMs) {
607+return true;
608+}
609+}
610+return false;
533611}
534612535613if (typeof owner.createdAtMs === "number") {
@@ -614,7 +692,15 @@ export function withBundledRuntimeDepsFilesystemLock<T>(
614692try {
615693fs.writeFileSync(
616694path.join(lockDir, BUNDLED_RUNTIME_DEPS_LOCK_OWNER_FILE),
617-`${JSON.stringify({ pid: process.pid, createdAtMs: Date.now() }, null, 2)}\n`,
695+`${JSON.stringify(
696+ {
697+ pid: process.pid,
698+ pidStartTimeMs: CURRENT_PROCESS_START_TIME_MS,
699+ createdAtMs: Date.now(),
700+ },
701+ null,
702+ 2,
703+ )}\n`,
618704"utf8",
619705);
620706} catch (ownerWriteError) {
@@ -2387,7 +2473,15 @@ async function withBundledRuntimeDepsInstallRootLockAsync<T>(
23872473try {
23882474fs.writeFileSync(
23892475path.join(lockDir, BUNDLED_RUNTIME_DEPS_LOCK_OWNER_FILE),
2390-`${JSON.stringify({ pid: process.pid, createdAtMs: Date.now() }, null, 2)}\n`,
2476+`${JSON.stringify(
2477+ {
2478+ pid: process.pid,
2479+ pidStartTimeMs: CURRENT_PROCESS_START_TIME_MS,
2480+ createdAtMs: Date.now(),
2481+ },
2482+ null,
2483+ 2,
2484+ )}\n`,
23912485"utf8",
23922486);
23932487} catch (ownerWriteError) {
此内容由惯性聚合(RSS阅读器)自动聚合整理,仅供阅读参考。 原文来自 — 版权归原作者所有。