mslxdff 0.1.1 → 0.1.3

package/src/models.js

@@ -1,92 +1,128 @@
-const KNOWN_FREE_OPENCODE_MODELS = ["big-pickle"];
-const CACHE_TTL_MS = 10 * 60 * 1000;
-
-export function isFreeModel(id) {
-  return (typeof id === "string" && id.endsWith("-free")) ||
-    KNOWN_FREE_OPENCODE_MODELS.includes(id);
-}
-
-export function filterFreeModels(list) {
-  const seen = new Set();
-  const out = [];
-  for (const m of list || []) {
-    if (!(m && m.id)) continue;
-    if (!isFreeModel(m.id)) continue;
-    if (seen.has(m.id)) continue;
-    seen.add(m.id);
-    out.push(m);
-  }
-  return out;
-}
-
-export function createModelsService({ baseUrl, headers, ttlMs = CACHE_TTL_MS } = {}) {
-  let cache = null;
-  let fetchedAt = 0;
-  let inflight = null;
-
-  async function get() {
-    const now = Date.now();
-    if (cache && now - fetchedAt < ttlMs) return cache;
-    if (inflight) return inflight;
-
-    inflight = (async () => {
-      try {
-        const data = await fetchUpstreamModels({ baseUrl, headers });
-        cache = data;
-        fetchedAt = Date.now();
-        return data;
-      } catch (err) {
-        // serve stale on failure if we have it, else rethrow
-        if (cache) return cache;
-        throw err;
-      } finally {
-        inflight = null;
-      }
-    })();
-    return inflight;
-  }
-
-  return { get };
-}
-
-async function fetchUpstreamModels({ baseUrl, headers, connectTimeoutMs = 30_000 }) {
-  const url = `${baseUrl}/zen/v1/models`;
-  for (let attempt = 0; ; attempt++) {
-    const res = await attemptFetch(url, headers, connectTimeoutMs);
-    if (res instanceof Error) {
-      if (attempt < NETWORK_RETRIES) continue;
-      throw res;
-    }
-    if (isRetryable(res.status) && attempt < STATUS_RETRIES) {
-      await sleep(2000);
-      continue;
-    }
-    if (!res.ok) throw new Error(`models fetch failed: HTTP ${res.status}`);
-    const json = await res.json().catch(() => ({}));
-    const raw = Array.isArray(json) ? json : json.data ?? json.models ?? [];
-    return { object: "list", data: filterFreeModels(raw) };
-  }
-}
-
-async function attemptFetch(url, headers, connectTimeoutMs) {
-  const controller = new AbortController();
-  const timer = setTimeout(() => controller.abort(), connectTimeoutMs);
-  try {
-    return await fetch(url, { headers, signal: controller.signal });
-  } catch (err) {
-    return err;
-  } finally {
-    clearTimeout(timer);
-  }
-}
-
-function isRetryable(status) {
-  return status === 429 || status === 502 || status === 503 || status === 504;
-}
-
-function sleep(ms) {
-  return new Promise((r) => setTimeout(r, ms));
-}
-
-const NETWORK_RETRIES = 2;
+const KNOWN_FREE_OPENCODE_MODELS = ["big-pickle"];
+const CACHE_TTL_MS = 2 * 60 * 60 * 1000;
+const DEFAULT_REFRESH_MS = 2 * 60 * 60 * 1000;
+import { mkdirSync, writeFileSync } from "node:fs";
+import { dirname } from "node:path";
+
+export function isFreeModel(id) {
+  return (typeof id === "string" && id.endsWith("-free")) ||
+    KNOWN_FREE_OPENCODE_MODELS.includes(id);
+}
+
+export function filterFreeModels(list) {
+  const seen = new Set();
+  const out = [];
+  for (const m of list || []) {
+    if (!(m && m.id)) continue;
+    if (!isFreeModel(m.id)) continue;
+    if (seen.has(m.id)) continue;
+    seen.add(m.id);
+    out.push(m);
+  }
+  return out;
+}
+
+export function createModelsService({ baseUrl, headers, ttlMs = CACHE_TTL_MS, refreshMs = DEFAULT_REFRESH_MS, cacheFile } = {}) {
+  let cache = null;
+  let fetchedAt = 0;
+  let inflight = null;
+  let timer = null;
+
+  async function load() {
+    const data = await fetchUpstreamModels({ baseUrl, headers });
+    cache = data;
+    fetchedAt = Date.now();
+    if (cacheFile) persistModels(data, cacheFile);
+    return data;
+  }
+
+  async function get() {
+    const now = Date.now();
+    if (cache && now - fetchedAt < ttlMs) return cache;
+    if (inflight) return inflight;
+
+    inflight = (async () => {
+      try {
+        return await load();
+      } catch (err) {
+        // serve stale on failure if we have it, else rethrow
+        if (cache) return cache;
+        throw err;
+      } finally {
+        inflight = null;
+      }
+    })();
+    return inflight;
+  }
+
+  function startAutoRefresh(intervalMs = refreshMs) {
+    if (timer) return stopAutoRefresh;
+    timer = setInterval(() => {
+      void load().catch(() => {
+        // keep serving stale cache on background refresh failure
+      });
+    }, intervalMs);
+    timer.unref?.();
+    return stopAutoRefresh;
+  }
+
+  function stopAutoRefresh() {
+    if (timer) {
+      clearInterval(timer);
+      timer = null;
+    }
+  }
+
+  return { get, startAutoRefresh, stopAutoRefresh };
+}
+
+async function fetchUpstreamModels({ baseUrl, headers, connectTimeoutMs = 30_000 }) {
+  const url = `${baseUrl}/zen/v1/models`;
+  for (let attempt = 0; ; attempt++) {
+    const res = await attemptFetch(url, headers, connectTimeoutMs);
+    if (res instanceof Error) {
+      if (attempt < NETWORK_RETRIES) continue;
+      throw res;
+    }
+    if (isRetryable(res.status) && attempt < STATUS_RETRIES) {
+      await sleep(2000);
+      continue;
+    }
+    if (!res.ok) throw new Error(`models fetch failed: HTTP ${res.status}`);
+    const json = await res.json().catch(() => ({}));
+    const raw = Array.isArray(json) ? json : json.data ?? json.models ?? [];
+    return { object: "list", data: filterFreeModels(raw) };
+  }
+}
+
+async function attemptFetch(url, headers, connectTimeoutMs) {
+  const controller = new AbortController();
+  const timer = setTimeout(() => controller.abort(), connectTimeoutMs);
+  try {
+    return await fetch(url, { headers, signal: controller.signal });
+  } catch (err) {
+    return err;
+  } finally {
+    clearTimeout(timer);
+  }
+}
+
+function isRetryable(status) {
+  return status === 429 || status === 502 || status === 503 || status === 504;
+}
+
+function persistModels(data, cacheFile) {
+  try {
+    mkdirSync(dirname(cacheFile), { recursive: true });
+    writeFileSync(cacheFile, JSON.stringify({ cachedAt: Date.now(), ...data }));
+  } catch {
+    // persistence is best-effort
+  }
+}
+
+function sleep(ms) {
+  return new Promise((r) => setTimeout(r, ms));
+}
+
+const NETWORK_RETRIES = 2;
 const STATUS_RETRIES = 2;

package/src/peers.js

@@ -0,0 +1,83 @@
+import { loadPeers, savePeers, loadPeerErrors, savePeerErrors } from "./state.js";
+
+export const DEFAULT_PEER_COOLDOWN_MS = 30_000;
+export const DEFAULT_MAX_HOPS = 3;
+
+export function normalizePeerUrl(url) {
+  return String(url || "").trim().replace(/\/+$/, "");
+}
+
+export function createPeersService({
+  file,
+  now = () => Date.now(),
+  cooldownMs = DEFAULT_PEER_COOLDOWN_MS,
+  peers: seedPeers,
+  errors: seedErrors,
+  persistPeers = (list, f = file) => savePeers(list, f ? { file: f } : {}),
+  persistErrors = (errors, f = file) => savePeerErrors(errors, f ? { file: f } : {}),
+} = {}) {
+  const list = (seedPeers ?? loadPeers(file ? { file } : {}))
+    .map((p) => ({ ...p, url: normalizePeerUrl(p.url) }))
+    .filter((p) => p && p.url);
+  const lastErrorAt = { ...(seedErrors ?? loadPeerErrors(file ? { file } : {})) };
+
+  function all() {
+    return [...list];
+  }
+
+  function add(peer) {
+    const url = normalizePeerUrl(peer?.url);
+    if (!url) return false;
+    const existing = list.find((p) => p.url === url);
+    const entry = { ...peer, url };
+    if (existing) Object.assign(existing, entry);
+    else list.push(entry);
+    persistPeers([...list]);
+    return true;
+  }
+
+  function remove(url) {
+    const target = normalizePeerUrl(url);
+    const idx = list.findIndex((p) => p.url === target);
+    if (idx < 0) return false;
+    list.splice(idx, 1);
+    persistPeers([...list]);
+    return true;
+  }
+
+  function removeByGroup(group) {
+    const before = list.length;
+    for (let i = list.length - 1; i >= 0; i--) {
+      if (list[i].group === group) list.splice(i, 1);
+    }
+    if (list.length !== before) persistPeers([...list]);
+    return before - list.length;
+  }
+
+  function isCooling(url) {
+    if (!cooldownMs) return false;
+    const err = lastErrorAt[url];
+    return typeof err === "number" && now() - err < cooldownMs;
+  }
+
+  function available() {
+    return list.filter((p) => !isCooling(p.url));
+  }
+
+  let cursor = 0;
+
+  function next() {
+    const avail = available();
+    if (!avail.length) return null;
+    cursor = cursor % avail.length;
+    return avail[cursor++];
+  }
+
+  async function recordError(url) {
+    if (!url) return;
+    lastErrorAt[url] = now();
+    await persistErrors({ ...lastErrorAt });
+  }
+
+  return { all, add, remove, removeByGroup, isCooling, available, next, recordError, errors: () => ({ ...lastErrorAt }) };
+}

package/src/reasoning.js

@@ -1,33 +1,33 @@
-const PLACEHOLDER = " ";
-
-const MODEL_RULES = [
-  { match: (m) => /^kimi-/i.test(m || ""), scope: "toolCalls" },
-  { match: (m) => /deepseek/i.test(m || ""), scope: "all" },
-];
-
-export function normalizeModel(model) {
-  return model.startsWith("oc/") ? model.slice(3) : model;
-}
-
-function shouldInject(message, scope) {
-  if (message?.role !== "assistant") return false;
-  const rc = message.reasoning_content;
-  if (typeof rc === "string" && rc.length > 0) return false;
-  if (scope === "toolCalls") {
-    return Array.isArray(message.tool_calls) && message.tool_calls.length > 0;
-  }
-  return true;
-}
-
-function applyRule(body, rule) {
-  if (!rule || !body?.messages) return body;
-  const messages = body.messages.map((m) =>
-    shouldInject(m, rule.scope) ? { ...m, reasoning_content: PLACEHOLDER } : m
-  );
-  return { ...body, messages };
-}
-
-export function injectReasoningContent(model, body) {
-  const rule = MODEL_RULES.find((r) => r.match(model));
-  return applyRule(body, rule);
+const PLACEHOLDER = " ";
+
+const MODEL_RULES = [
+  { match: (m) => /^kimi-/i.test(m || ""), scope: "toolCalls" },
+  { match: (m) => /deepseek/i.test(m || ""), scope: "all" },
+];
+
+export function normalizeModel(model) {
+  return model.startsWith("oc/") ? model.slice(3) : model;
+}
+
+function shouldInject(message, scope) {
+  if (message?.role !== "assistant") return false;
+  const rc = message.reasoning_content;
+  if (typeof rc === "string" && rc.length > 0) return false;
+  if (scope === "toolCalls") {
+    return Array.isArray(message.tool_calls) && message.tool_calls.length > 0;
+  }
+  return true;
+}
+
+function applyRule(body, rule) {
+  if (!rule || !body?.messages) return body;
+  const messages = body.messages.map((m) =>
+    shouldInject(m, rule.scope) ? { ...m, reasoning_content: PLACEHOLDER } : m
+  );
+  return { ...body, messages };
+}
+
+export function injectReasoningContent(model, body) {
+  const rule = MODEL_RULES.find((r) => r.match(model));
+  return applyRule(body, rule);
 }