@floomhq/floom-mcp-sync 1.0.27 → 1.0.29

package/dist/auto-sync.js

@@ -1,16 +1,14 @@
 import { constants } from "node:fs";
 import { lstat, mkdir, open } from "node:fs/promises";
 import { basename, dirname, isAbsolute, join, relative, resolve, sep } from "node:path";
-import { apiUrlFromConfig, readConfig } from "./lib/config.js";
-import { getJsonWithEtag, FloomApiError } from "./lib/api.js";
+import { apiUrlFromConfig, readConfig, refreshConfigIfNeeded } from "./lib/config.js";
+import { getJson, FloomApiError } from "./lib/api.js";
 import { sha256 } from "./lib/hash.js";
 import { assertValidSlug } from "./lib/slug.js";
 import { skillsDir, skillTargetPath } from "./lib/paths.js";
 import { ensureSyncManifestDir, manifestKey, markSynced, readSyncManifest, unmarkSynced, withSyncLock, writeSyncManifest } from "./lib/manifest.js";
-// Module-level cache: ETag from the last successful (non-304) response, plus
-// the last time we logged a heartbeat. Survives across setInterval ticks
-// inside a single MCP server process.
-let cachedEtag = null;
+// Module-level cache: the last time we logged a heartbeat. Survives across
+// setInterval ticks inside a single MCP server process.
 let lastHeartbeatAt = 0;
 let lastAuthWarningAt = 0;
 const HEARTBEAT_MS = 10 * 60 * 1000; // 10 minutes
@@ -349,45 +347,31 @@ async function manifestHasMissingTrackedFile(manifest, root) {
     return false;
 }
 export async function autoSync(log = (message) => process.stderr.write(`${message}\n`), signal) {
-    const cfg = await readConfig();
-    if (!cfg) {
+    const initialCfg = await readConfig();
+    if (!initialCfg) {
         maybeAuthWarning(log, "[floom] not signed in; skipping sync (run `npx -y @floomhq/floom login`)");
         return { synced: 0, unchanged: 0, updated: 0, conflicts: 0 };
     }
+    let cfg = initialCfg;
     await ensureSyncManifestDir();
     return await withSyncLock(async () => {
         const manifest = await readSyncManifest();
         const root = skillsDir();
         const apiUrl = apiUrlFromConfig(cfg);
-        let response;
+        let payload;
         try {
-            response = await getJsonWithEtag(`${apiUrl}/api/v1/me/skills`, cfg.accessToken, cachedEtag, signal);
+            payload = await loadSyncPayload(apiUrl, cfg.accessToken, signal);
         }
         catch (err) {
-            if (err instanceof FloomApiError && err.status === 401) {
+            if (!(err instanceof FloomApiError) || err.status !== 401)
+                throw err;
+            const refreshed = await refreshConfigIfNeeded(cfg, { force: true });
+            if (refreshed.accessToken === cfg.accessToken) {
                 maybeAuthWarning(log, "[floom] sign-in expired; skipping sync (run `npx -y @floomhq/floom login` again)");
                 return { synced: 0, unchanged: 0, updated: 0, conflicts: 0 };
             }
-            throw err;
-        }
-        if (response.status === 304) {
-            if (await manifestHasMissingTrackedFile(manifest, root)) {
-                response = await getJsonWithEtag(`${apiUrl}/api/v1/me/skills`, cfg.accessToken, null, signal);
-            }
-            else {
-                maybeHeartbeat(log);
-                return { synced: 0, unchanged: 0, updated: 0, conflicts: 0 };
-            }
-        }
-        if (response.status === 304) {
-            maybeHeartbeat(log);
-            return { synced: 0, unchanged: 0, updated: 0, conflicts: 0 };
-        }
-        if (response.etag)
-            cachedEtag = response.etag;
-        const payload = response.body;
-        if (!payload) {
-            return { synced: 0, unchanged: 0, updated: 0, conflicts: 0 };
+            cfg = refreshed;
+            payload = await loadSyncPayload(apiUrl, cfg.accessToken, signal);
         }
         await mkdir(skillsDir(), { recursive: true, mode: 0o700 });
         if (!Array.isArray(payload.skills)) {
@@ -545,6 +529,30 @@ export async function autoSync(log = (message) => process.stderr.write(`${messag
         return { synced: total, unchanged, updated, conflicts };
     });
 }
+async function loadSyncPayload(apiUrl, token, signal) {
+    const all = [];
+    let fullSync = false;
+    let cursor;
+    const seenCursors = new Set();
+    for (let page = 0; page < 1000; page += 1) {
+        const url = new URL(`${apiUrl}/api/v1/me/skills`);
+        url.searchParams.set("limit", "25");
+        if (cursor)
+            url.searchParams.set("cursor", cursor);
+        const payload = await getJson(url.toString(), token, signal);
+        if (!Array.isArray(payload.skills))
+            throw new Error("Invalid sync response");
+        all.push(...payload.skills);
+        fullSync = payload.full_sync === true;
+        if (!payload.next_cursor)
+            return { skills: all, full_sync: fullSync };
+        if (seenCursors.has(payload.next_cursor))
+            throw new Error("Invalid sync response");
+        seenCursors.add(payload.next_cursor);
+        cursor = payload.next_cursor;
+    }
+    throw new Error("Invalid sync response");
+}
 async function emitSyncCompleted(apiUrl, token, props, signal) {
     try {
         const init = {

package/dist/lib/config.js

@@ -1,4 +1,5 @@
-import { readFile } from "node:fs/promises";
+import { chmod, mkdir, readFile, writeFile } from "node:fs/promises";
+import { dirname } from "node:path";
 import { configPath } from "./paths.js";
 export const DEFAULT_API_URL = "https://floom.dev";
 export function apiUrlFromConfig(cfg) {
@@ -10,13 +11,14 @@ export async function readConfig() {
         const parsed = JSON.parse(raw);
         if (typeof parsed.accessToken !== "string" || parsed.accessToken.length === 0)
             return null;
-        return {
+        const cfg = {
             accessToken: parsed.accessToken,
             ...(typeof parsed.apiUrl === "string" ? { apiUrl: parsed.apiUrl } : {}),
             ...(typeof parsed.refreshToken === "string" ? { refreshToken: parsed.refreshToken } : {}),
             ...(typeof parsed.expiresAt === "number" ? { expiresAt: parsed.expiresAt } : {}),
             ...(typeof parsed.email === "string" || parsed.email === null ? { email: parsed.email } : {}),
         };
+        return await refreshConfigIfNeeded(cfg);
     }
     catch (err) {
         if (err.code === "ENOENT")
@@ -24,3 +26,46 @@ export async function readConfig() {
         throw err;
     }
 }
+export async function refreshConfigIfNeeded(cfg, opts = {}) {
+    if (!cfg.refreshToken)
+        return cfg;
+    const now = Math.floor(Date.now() / 1000);
+    if (!opts.force && (typeof cfg.expiresAt !== "number" || cfg.expiresAt > now + 120))
+        return cfg;
+    try {
+        const apiUrl = apiUrlFromConfig(cfg);
+        const res = await fetch(`${apiUrl}/api/auth/refresh`, {
+            method: "POST",
+            headers: { "content-type": "application/json" },
+            body: JSON.stringify({ refresh_token: cfg.refreshToken }),
+        });
+        if (!res.ok)
+            throw new Error(`refresh failed with ${res.status}`);
+        const data = (await res.json());
+        if (!data.access_token || !data.refresh_token)
+            throw new Error("refresh response missing tokens");
+        const expiresIn = Number(data.expires_in ?? "3600");
+        const refreshed = {
+            ...cfg,
+            accessToken: data.access_token,
+            refreshToken: data.refresh_token,
+            expiresAt: Math.floor(Date.now() / 1000) + (Number.isFinite(expiresIn) ? expiresIn : 3600),
+            ...(typeof data.email === "string" || data.email === null
+                ? { email: data.email }
+                : typeof cfg.email === "string" || cfg.email === null
+                    ? { email: cfg.email }
+                    : {}),
+        };
+        await writeConfig(refreshed);
+        return refreshed;
+    }
+    catch {
+        return cfg;
+    }
+}
+async function writeConfig(cfg) {
+    const target = configPath();
+    await mkdir(dirname(target), { recursive: true, mode: 0o700 });
+    await writeFile(target, `${JSON.stringify(cfg, null, 2)}\n`, { mode: 0o600 });
+    await chmod(target, 0o600);
+}

package/dist/server.js

@@ -5,7 +5,7 @@ import { autoSync } from "./auto-sync.js";
 import { getSkill } from "./tools/get.js";
 import { searchSkills } from "./tools/search.js";
 import { syncStatus } from "./tools/status.js";
-const SERVER_VERSION = "1.0.27";
+const SERVER_VERSION = "1.0.29";
 const DEFAULT_INTERVAL_MS = 60_000;
 const MIN_INTERVAL_MS = 10_000;
 const SEARCH_TYPES = new Set(["knowledge", "instruction", "workflow", "skill"]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@floomhq/floom-mcp-sync",
-  "version": "1.0.27",
+  "version": "1.0.29",
   "description": "Lightweight Floom MCP server for installing, publishing, and startup-syncing skills.",
   "license": "MIT",
   "type": "module",