mslxdff 0.1.2 → 0.1.3

package/src/state.js

@@ -1,53 +1,119 @@
-import { randomBytes } from "node:crypto";
-import { mkdirSync, readFileSync, writeFileSync } from "node:fs";
-import { dirname, join } from "node:path";
-import os from "node:os";
-
-export const DEFAULT_PORT = 8989;
-
-export function defaultStateFile() {
-  return process.env.MSLXDFF_STATE_FILE ||
-    join(os.homedir(), ".config", "mslxdff", "state.json");
-}
-
-export function generateToken() {
-  return randomBytes(32).toString("hex");
-}
-
-export async function loadToken({ file = defaultStateFile() } = {}) {
-  const state = readState(file);
-  if (typeof state.token === "string" && state.token.length > 0) {
-    return { token: state.token, created: false };
-  }
-  return { token: writeState(file, { token: generateToken(), createdAt: new Date().toISOString() }).token, created: true };
-}
-
-export async function refreshToken({ file = defaultStateFile() } = {}) {
-  return writeState(file, { token: generateToken(), createdAt: new Date().toISOString() }).token;
-}
-
-export function setPort(port, { file = defaultStateFile() } = {}) {
-  const state = readState(file);
-  writeState(file, { ...state, port: Number(port) });
-}
-
-export function getPort({ file = defaultStateFile() } = {}) {
-  const port = readState(file).port;
-  return typeof port === "number" && Number.isInteger(port) && port > 0 ? port : null;
-}
-
-function readState(file) {
-  try {
-    const saved = JSON.parse(readFileSync(file, "utf8"));
-    return typeof saved === "object" && saved !== null ? saved : {};
-  } catch {
-    return {};
-  }
-}
-
-function writeState(file, patch) {
-  const merged = { ...readState(file), ...patch };
-  mkdirSync(dirname(file), { recursive: true });
-  writeFileSync(file, JSON.stringify(merged, null, 2), { mode: 0o600 });
-  return merged;
-}
+import { randomBytes } from "node:crypto";
+import { mkdirSync, readFileSync, writeFileSync } from "node:fs";
+import { dirname, join } from "node:path";
+import os from "node:os";
+
+export const DEFAULT_PORT = 8989;
+
+export function defaultStateFile() {
+  return process.env.MSLXDFF_STATE_FILE ||
+    join(os.homedir(), ".config", "mslxdff", "state.json");
+}
+
+export function generateToken() {
+  return randomBytes(32).toString("hex");
+}
+
+export async function loadToken({ file = defaultStateFile() } = {}) {
+  const state = readState(file);
+  if (typeof state.token === "string" && state.token.length > 0) {
+    return { token: state.token, created: false };
+  }
+  return { token: writeState(file, { token: generateToken(), createdAt: new Date().toISOString() }).token, created: true };
+}
+
+export async function refreshToken({ file = defaultStateFile() } = {}) {
+  return writeState(file, { token: generateToken(), createdAt: new Date().toISOString() }).token;
+}
+
+export function setPort(port, { file = defaultStateFile() } = {}) {
+  const state = readState(file);
+  writeState(file, { ...state, port: Number(port) });
+}
+
+export function getPort({ file = defaultStateFile() } = {}) {
+  const port = readState(file).port;
+  return typeof port === "number" && Number.isInteger(port) && port > 0 ? port : null;
+}
+
+export function loadModelErrors({ file = defaultStateFile() } = {}) {
+  const errors = readState(file).modelErrors;
+  return errors && typeof errors === "object" && !Array.isArray(errors) ? errors : {};
+}
+
+export function saveModelErrors(errors, { file = defaultStateFile() } = {}) {
+  const state = readState(file);
+  writeState(file, { ...state, modelErrors: errors });
+  return errors;
+}
+
+export function loadPeers({ file = defaultStateFile() } = {}) {
+  const peers = readState(file).peers;
+  return Array.isArray(peers) ? peers : [];
+}
+
+export function savePeers(peers, { file = defaultStateFile() } = {}) {
+  const state = readState(file);
+  writeState(file, { ...state, peers });
+  return peers;
+}
+
+export function loadPeerErrors({ file = defaultStateFile() } = {}) {
+  const errors = readState(file).peerErrors;
+  return errors && typeof errors === "object" && !Array.isArray(errors) ? errors : {};
+}
+
+export function savePeerErrors(errors, { file = defaultStateFile() } = {}) {
+  const state = readState(file);
+  writeState(file, { ...state, peerErrors: errors });
+  return errors;
+}
+
+export function loadGroups({ file = defaultStateFile() } = {}) {
+  const groups = readState(file).groups;
+  return groups && typeof groups === "object" && !Array.isArray(groups) ? groups : {};
+}
+
+export function loadGroupsJoined({ file = defaultStateFile() } = {}) {
+  const joined = readState(file).groupsJoined;
+  return Array.isArray(joined) ? joined : [];
+}
+
+export function saveGroupsJoined(joined, { file = defaultStateFile() } = {}) {
+  const state = readState(file);
+  writeState(file, { ...state, groupsJoined: joined });
+  return joined;
+}
+
+export function loadBans({ file = defaultStateFile() } = {}) {
+  const bans = readState(file).bans;
+  return bans && typeof bans === "object" && !Array.isArray(bans) ? bans : {};
+}
+
+export function saveBans(bans, { file = defaultStateFile() } = {}) {
+  const state = readState(file);
+  writeState(file, { ...state, bans });
+  return bans;
+}
+
+export function saveGroups(groups, { file = defaultStateFile() } = {}) {
+  const state = readState(file);
+  writeState(file, { ...state, groups });
+  return groups;
+}
+
+function readState(file) {
+  try {
+    const saved = JSON.parse(readFileSync(file, "utf8"));
+    return typeof saved === "object" && saved !== null ? saved : {};
+  } catch {
+    return {};
+  }
+}
+
+function writeState(file, patch) {
+  const merged = { ...readState(file), ...patch };
+  mkdirSync(dirname(file), { recursive: true });
+  writeFileSync(file, JSON.stringify(merged, null, 2), { mode: 0o600 });
+  return merged;
+}

package/src/upstream.js

@@ -1,68 +1,68 @@
-export function createUpstreamClient({
-  baseUrl = process.env.UPSTREAM_BASE_URL || "https://opencode.ai",
-  authToken = process.env.UPSTREAM_AUTH_TOKEN || "public",
-  connectTimeoutMs = Number(process.env.UPSTREAM_CONNECT_TIMEOUT_MS) || 30_000,
-  retry = {
-    network: { attempts: 2, delayMs: 1000 },
-    429: { attempts: 2, delayMs: 2000 },
-    502: { attempts: 2, delayMs: 2000 },
-    503: { attempts: 2, delayMs: 2000 },
-    504: { attempts: 2, delayMs: 3000 },
-  },
-  fetchImpl = fetch,
-} = {}) {
-  const headers = {
-    "Content-Type": "application/json",
-    "Authorization": `Bearer ${authToken}`,
-    "x-opencode-client": "desktop",
-    "Accept": "text/event-stream",
-  };
-
-  async function chat(body) {
-    const url = `${baseUrl}/zen/v1/chat/completions`;
-    for (let attempt = 0; ; attempt++) {
-      const result = await attemptOnce(url, body);
-      if (result instanceof Error) {
-        const entry = retry?.network;
-        if (entry && attempt < entry.attempts) {
-          await sleep(entry.delayMs);
-          continue;
-        }
-        throw result;
-      }
-      const entry = retry?.[result.status];
-      if (entry && attempt < entry.attempts) {
-        await sleep(entry.delayMs);
-        continue;
-      }
-      return result;
-    }
-  }
-
-  async function attemptOnce(url, body) {
-    const controller = new AbortController();
-    const timer = setTimeout(() =>
-      controller.abort(new Error(`upstream timed out after ${connectTimeoutMs}ms`)),
-      connectTimeoutMs
-    );
-    try {
-      const res = await fetchImpl(url, {
-        method: "POST",
-        headers,
-        body: JSON.stringify(body),
-        signal: controller.signal,
-      });
-      return res;
-    } catch (err) {
-      return err;
-    } finally {
-      clearTimeout(timer);
-    }
-  }
-
-  return { chat, headers };
-}
-
-function sleep(ms) {
-  return new Promise((r) => setTimeout(r, ms));
+export function createUpstreamClient({
+  baseUrl = process.env.UPSTREAM_BASE_URL || "https://opencode.ai",
+  authToken = process.env.UPSTREAM_AUTH_TOKEN || "public",
+  connectTimeoutMs = Number(process.env.UPSTREAM_CONNECT_TIMEOUT_MS) || 30_000,
+  retry = {
+    network: { attempts: 2, delayMs: 1000 },
+    429: { attempts: 2, delayMs: 2000 },
+    502: { attempts: 2, delayMs: 2000 },
+    503: { attempts: 2, delayMs: 2000 },
+    504: { attempts: 2, delayMs: 3000 },
+  },
+  fetchImpl = fetch,
+} = {}) {
+  const headers = {
+    "Content-Type": "application/json",
+    "Authorization": `Bearer ${authToken}`,
+    "x-opencode-client": "desktop",
+    "Accept": "text/event-stream",
+  };
+
+  async function chat(body) {
+    const url = `${baseUrl}/zen/v1/chat/completions`;
+    for (let attempt = 0; ; attempt++) {
+      const result = await attemptOnce(url, body);
+      if (result instanceof Error) {
+        const entry = retry?.network;
+        if (entry && attempt < entry.attempts) {
+          await sleep(entry.delayMs);
+          continue;
+        }
+        throw result;
+      }
+      const entry = retry?.[result.status];
+      if (entry && attempt < entry.attempts) {
+        await sleep(entry.delayMs);
+        continue;
+      }
+      return result;
+    }
+  }
+
+  async function attemptOnce(url, body) {
+    const controller = new AbortController();
+    const timer = setTimeout(() =>
+      controller.abort(new Error(`upstream timed out after ${connectTimeoutMs}ms`)),
+      connectTimeoutMs
+    );
+    try {
+      const res = await fetchImpl(url, {
+        method: "POST",
+        headers,
+        body: JSON.stringify(body),
+        signal: controller.signal,
+      });
+      return res;
+    } catch (err) {
+      return err;
+    } finally {
+      clearTimeout(timer);
+    }
+  }
+
+  return { chat, headers };
+}
+
+function sleep(ms) {
+  return new Promise((r) => setTimeout(r, ms));
 }