billion-context 0.1.83-pr.528.346 → 0.1.83-pr.533.352

package/dist/index.js

@@ -51446,7 +51446,7 @@ function reapOrphanBlocks(session, visible, deactivate) {
 }
 
 // src/instance.ts
-import { createHash as createHash4, randomUUID as randomUUID3 } from "crypto";
+import { randomUUID as randomUUID3 } from "crypto";
 import fs3 from "fs";
 import path7 from "path";
 function isProxyInstanceFile(v2) {
@@ -51492,13 +51492,14 @@ function readProxyInstanceFile(file) {
 function instanceFilePath() {
   return path7.join(stateDir(), "proxy-origin");
 }
-function atomicWriteJson(obj, filePath) {
+function atomicWriteInstanceFile(info, file) {
+  const filePath = file ?? instanceFilePath();
   fs3.mkdirSync(path7.dirname(filePath), { recursive: true });
   const tempPath = `${filePath}.${process.pid}.${randomUUID3()}.tmp`;
   let descriptor;
   try {
     descriptor = fs3.openSync(tempPath, "wx", 420);
-    fs3.writeSync(descriptor, JSON.stringify(obj) + "\n", null, "utf8");
+    fs3.writeSync(descriptor, JSON.stringify(info) + "\n", null, "utf8");
     fs3.fsyncSync(descriptor);
     fs3.closeSync(descriptor);
     descriptor = void 0;
@@ -51517,9 +51518,6 @@ function atomicWriteJson(obj, filePath) {
     throw error;
   }
 }
-function atomicWriteInstanceFile(info, file) {
-  atomicWriteJson(info, file ?? instanceFilePath());
-}
 function clearProxyInstanceFile(instanceId, file) {
   const filePath = file ?? instanceFilePath();
   const current = readProxyInstanceFile(filePath);
@@ -51539,99 +51537,44 @@ function isPidAlive(pid) {
     return err2.code === "EPERM";
   }
 }
-function registryDirPath() {
-  return path7.join(stateDir(), "instances");
-}
-function legacyRegistryFilePath() {
+function registryFilePath() {
   return path7.join(stateDir(), "instances.json");
 }
-var SAFE_NAME_RE = /^[A-Za-z0-9][A-Za-z0-9._-]*$/;
-function safeRegistryName(instanceId) {
-  if (instanceId !== "." && instanceId !== ".." && instanceId.length <= 128 && SAFE_NAME_RE.test(instanceId)) {
-    return instanceId;
-  }
-  return createHash4("sha256").update(instanceId).digest("hex");
-}
-function registryEntryFile(instanceId) {
-  return path7.join(registryDirPath(), `${safeRegistryName(instanceId)}.json`);
-}
-function safeReadJson2(file) {
-  try {
-    return JSON.parse(fs3.readFileSync(file, "utf8"));
-  } catch {
-    return void 0;
-  }
-}
-function coerceEntry(value) {
-  if (!value || typeof value !== "object") return void 0;
-  const o = value;
-  if (typeof o.instanceId !== "string" || o.instanceId === "") return void 0;
-  return {
-    instanceId: o.instanceId,
-    pid: typeof o.pid === "number" ? o.pid : 0,
-    port: typeof o.port === "number" ? o.port : 0,
-    origin: typeof o.origin === "string" ? o.origin : "",
-    startedAt: typeof o.startedAt === "number" ? o.startedAt : 0
-  };
-}
-function readMarkerNames() {
+function registerInstanceAndWarn(entry, warn) {
+  const file = registryFilePath();
+  const entries = [];
   try {
-    return fs3.readdirSync(registryDirPath());
-  } catch {
-    return [];
-  }
-}
-function readAllRegistryEntries() {
-  const seen = /* @__PURE__ */ new Set();
-  const out = [];
-  for (const name of readMarkerNames()) {
-    if (!name.endsWith(".json")) continue;
-    const entry = coerceEntry(safeReadJson2(path7.join(registryDirPath(), name)));
-    if (entry && !seen.has(entry.instanceId)) {
-      seen.add(entry.instanceId);
-      out.push(entry);
-    }
-  }
-  const legacy = safeReadJson2(legacyRegistryFilePath());
-  if (legacy && Array.isArray(legacy.instances)) {
-    for (const raw of legacy.instances) {
-      const entry = coerceEntry(raw);
-      if (entry && !seen.has(entry.instanceId)) {
-        seen.add(entry.instanceId);
-        out.push(entry);
+    const parsed = JSON.parse(fs3.readFileSync(file, "utf8"));
+    if (Array.isArray(parsed.instances)) {
+      for (const e of parsed.instances) {
+        if (e && typeof e.instanceId === "string" && e.instanceId !== entry.instanceId && isPidAlive(e.pid)) {
+          entries.push(e);
+        }
       }
     }
+  } catch {
   }
-  return out;
-}
-function reapDeadMarkers(ours) {
-  for (const name of readMarkerNames()) {
-    if (!name.endsWith(".json")) continue;
-    const file = path7.join(registryDirPath(), name);
-    const entry = coerceEntry(safeReadJson2(file));
-    if (!entry || entry.instanceId === ours || isPidAlive(entry.pid)) continue;
-    try {
-      fs3.unlinkSync(file);
-    } catch {
-    }
-  }
-}
-function registerInstanceAndWarn(entry, warn) {
-  const others = readAllRegistryEntries().filter((e) => e.instanceId !== entry.instanceId && isPidAlive(e.pid));
-  for (const other of others) {
+  for (const other of entries) {
     warn(
       `another bili instance is running (pid ${other.pid}, ${other.origin}) \u2014 both processes will write the same sessions directory; stop one to avoid state pollution (#394)`
     );
   }
-  reapDeadMarkers(entry.instanceId);
+  entries.push(entry);
   try {
-    atomicWriteJson(entry, registryEntryFile(entry.instanceId));
+    fs3.mkdirSync(path7.dirname(file), { recursive: true });
+    fs3.writeFileSync(file, JSON.stringify({ instances: entries }) + "\n");
   } catch {
   }
 }
 function unregisterInstance(instanceId) {
+  const file = registryFilePath();
   try {
-    fs3.unlinkSync(registryEntryFile(instanceId));
+    const parsed = JSON.parse(fs3.readFileSync(file, "utf8"));
+    if (!Array.isArray(parsed.instances)) return;
+    const kept = parsed.instances.filter(
+      (e) => !(e && typeof e.instanceId === "string" && e.instanceId === instanceId) && isPidAlive(e.pid)
+    );
+    fs3.writeFileSync(file, JSON.stringify({ instances: kept }) + "\n");
   } catch {
   }
 }
@@ -52175,9 +52118,9 @@ async function* runCompressLoop(upstream, ctx, requestBody, requestOptions, adap
 }
 
 // src/util.ts
-import { createHash as createHash5 } from "crypto";
+import { createHash as createHash4 } from "crypto";
 function hashId2(s3) {
-  return createHash5("sha256").update(s3, "utf8").digest("hex").slice(0, 16);
+  return createHash4("sha256").update(s3, "utf8").digest("hex").slice(0, 16);
 }
 function isLoopbackAddress(addr) {
   return !!addr && (addr.startsWith("127.") || addr === "::1" || addr.startsWith("::ffff:127."));
@@ -54135,7 +54078,7 @@ function codexTurnIdentity(headers) {
 }
 
 // src/prefix-affinity.ts
-import { createHash as createHash6 } from "crypto";
+import { createHash as createHash5 } from "crypto";
 var MIN_CANONICAL_BYTES = 24;
 var MAX_TRACKED_SESSIONS3 = 256;
 var TTL_MS2 = 7 * 24 * 60 * 60 * 1e3;
@@ -54157,7 +54100,7 @@ function sortKeys(value) {
   return value;
 }
 function sha256(text) {
-  return createHash6("sha256").update(text, "utf8").digest("hex");
+  return createHash5("sha256").update(text, "utf8").digest("hex");
 }
 function hasUserMessage(messages) {
   return messages.some((m2) => !!m2 && typeof m2 === "object" && m2.role === "user");
@@ -63578,6 +63521,124 @@ function mergeOmpCompactionDisabledYaml(text) {
   lines.splice(compactionLine + 1, 0, `${" ".repeat(childIndent)}enabled: false`);
   return lines.join("\n");
 }
+function topLevelCompactionHeader(lines) {
+  for (let i = 0; i < lines.length; i++) {
+    const raw = lines[i];
+    const trimmed = raw.trim();
+    if (!trimmed || trimmed.startsWith("#")) continue;
+    if (raw.length - raw.trimStart().length !== 0) continue;
+    if (/^compaction:\s*(#.*)?$/.test(trimmed)) return i;
+  }
+  return -1;
+}
+function findCompactionEnabledLine(lines) {
+  const header = topLevelCompactionHeader(lines);
+  if (header === -1) return -1;
+  for (let i = header + 1; i < lines.length; i++) {
+    const raw = lines[i];
+    const trimmed = raw.trim();
+    if (!trimmed || trimmed.startsWith("#")) continue;
+    if (raw.length - raw.trimStart().length === 0) break;
+    if (/^enabled:/.test(trimmed)) return i;
+  }
+  return -1;
+}
+function compactionBlockEmpty(lines) {
+  const header = topLevelCompactionHeader(lines);
+  if (header === -1) return false;
+  for (let i = header + 1; i < lines.length; i++) {
+    const raw = lines[i];
+    const trimmed = raw.trim();
+    if (!trimmed || trimmed.startsWith("#")) continue;
+    return raw.length - raw.trimStart().length > 0;
+  }
+  return true;
+}
+function stripOmpCompactionInjection(overlayText, realText) {
+  const oLines = overlayText.split("\n");
+  const oe2 = findCompactionEnabledLine(oLines);
+  if (oe2 === -1) return overlayText;
+  const m2 = /^enabled:\s*(\S+)/.exec(oLines[oe2].trim());
+  if (!m2 || m2[1] !== "false") return overlayText;
+  const rLines = realText !== void 0 ? realText.split("\n") : void 0;
+  const re2 = rLines ? findCompactionEnabledLine(rLines) : -1;
+  if (re2 !== -1 && rLines) {
+    oLines[oe2] = rLines[re2];
+    return oLines.join("\n");
+  }
+  oLines.splice(oe2, 1);
+  if (compactionBlockEmpty(oLines)) {
+    const h = topLevelCompactionHeader(oLines);
+    if (h !== -1) oLines.splice(h, 1);
+  }
+  return oLines.join("\n");
+}
+function mergeBackOmpOverlayConfig(ompHome, overlay, holderActive) {
+  try {
+    const overlayCfg = path15.join(overlay, "config.yml");
+    let oSt;
+    try {
+      oSt = fs12.lstatSync(overlayCfg);
+    } catch {
+      return;
+    }
+    if (!oSt.isFile()) return;
+    let target;
+    for (const name of ["config.yml", "config.yaml"]) {
+      try {
+        const st2 = fs12.lstatSync(path15.join(ompHome, name));
+        if (st2.isFile()) {
+          target = path15.join(ompHome, name);
+          break;
+        }
+      } catch {
+      }
+    }
+    let realText;
+    if (target) {
+      try {
+        realText = fs12.readFileSync(target, "utf8");
+      } catch {
+        return;
+      }
+    } else if (fs12.existsSync(path15.join(ompHome, "settings.json"))) {
+      return;
+    }
+    let oText;
+    try {
+      oText = fs12.readFileSync(overlayCfg, "utf8");
+    } catch {
+      return;
+    }
+    const norm = (t) => t.replace(/\r\n/g, "\n");
+    const stripped = norm(stripOmpCompactionInjection(oText, realText));
+    if (target) {
+      if (realText !== void 0 && stripped === norm(realText)) return;
+      let rSt;
+      try {
+        rSt = fs12.lstatSync(target);
+      } catch {
+        return;
+      }
+      if (rSt.mtimeMs >= oSt.mtimeMs) {
+        if (!holderActive) {
+          try {
+            fs12.renameSync(overlayCfg, freeConflictName(target));
+          } catch {
+          }
+        }
+        return;
+      }
+      const crlf = realText !== void 0 && realText.includes("\r\n");
+      atomicWriteTextFile(target, crlf ? stripped.replace(/\n/g, "\r\n") : stripped);
+      return;
+    }
+    if (stripped.trim() === "") return;
+    atomicWriteTextFile(path15.join(ompHome, "config.yml"), stripped);
+  } catch (err2) {
+    console.error(`bili: could not merge the overlay config.yml back into ${ompHome}: ${err2.message}`);
+  }
+}
 function writeOmpCompactionDisabledConfig(ompHome, overlay) {
   let base;
   let baseIsJson = false;
@@ -63621,6 +63682,7 @@ function prepareOmpHttpRewrite(ompHome, origin, httpRewrites, httpsRewrites) {
   if (!fs12.existsSync(ompHome)) return void 0;
   const overlay = `${ompHome}-bili`;
   const generated = ["config.yml"];
+  const holder = livePidHoldsOverlay(overlay);
   const modelsPath = path15.join(ompHome, "models.yml");
   const unpacked = unpackDeadProxyUrlsInFile(modelsPath, liveProxyPorts());
   if (unpacked > 0) {
@@ -63633,6 +63695,7 @@ function prepareOmpHttpRewrite(ompHome, origin, httpRewrites, httpsRewrites) {
   } catch {
   }
   if (!refreshOverlayHome(ompHome, overlay, generated)) return void 0;
+  mergeBackOmpOverlayConfig(ompHome, overlay, holder !== void 0);
   if (modelsText !== void 0) {
     const httpMap = new Map(httpRewrites.map((r) => [r.key, wrapUpstream(origin, r.realUpstream)]));
     const httpsMap = new Map(httpsRewrites.map((r) => [r.key, r.realUpstream]));
@@ -63669,7 +63732,13 @@ function prepareOmpHttpRewrite(ompHome, origin, httpRewrites, httpsRewrites) {
     }
     writeOverlayFileAtomic(overlay, "models.yml", lines.join("\n"));
   }
-  writeOmpCompactionDisabledConfig(ompHome, overlay);
+  if (holder !== void 0) {
+    console.error(
+      `bili: another bili omp (pid ${holder}) is still running \u2014 skipping the config.yml regeneration so the shared overlay keeps its saved settings (this session inherits them; its proxy port still wins in models.yml).`
+    );
+  } else {
+    writeOmpCompactionDisabledConfig(ompHome, overlay);
+  }
   return overlay;
 }
 function prepareHermesHome(hermesHome, origin, rewrites) {