@runeya/runeya 2.0.32 → 2.0.33

package/index.js

@@ -201,7 +201,7 @@ function listenWithRetry(server, port, host, wss, maxRetries = 20, delay = 500)
   });
 }
 async function main() {
-  const { createLocalServer, pullEnv, PullEnvError } = await import("./src-KERYXMIR.js");
+  const { createLocalServer, pullEnv, PullEnvError } = await import("./src-U3ECNNB6.js");
   if (isPullEnv) {
     if (!serviceArg) {
       console.error("Error: --service (-s) is required with --pull-env");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@runeya/runeya",
-  "version": "2.0.32",
+  "version": "2.0.33",
   "type": "module",
   "bin": {
     "runeya": "./index.js"

package/{src-KERYXMIR.js → src-U3ECNNB6.js}

@@ -303,6 +303,12 @@ import os from "os";
 import { execFile } from "child_process";
 import { promisify } from "util";
 import { z } from "zod";
+
+// ../server/src/config/app-version.ts
+var appVersion = process.env["RUNEYA_VERSION"] ?? (typeof __RUNEYA_VERSION__ !== "undefined" ? __RUNEYA_VERSION__ : "dev");
+var APP_VERSION_HEADER = "X-Runeya-Version";
+
+// ../server/src/trpc/routers/health.ts
 var execFileAsync = promisify(execFile);
 async function getDockerVersion() {
   try {
@@ -317,7 +323,6 @@ async function getDockerVersion() {
   }
 }
 var startedAt = Date.now();
-var appVersion = process.env["RUNEYA_VERSION"] ?? (typeof __RUNEYA_VERSION__ !== "undefined" ? __RUNEYA_VERSION__ : "dev");
 var NPM_LATEST_URL = "https://registry.npmjs.org/@runeya%2Fruneya/latest";
 function compareSemver(a, b) {
   const pa = a.split(".").map((n) => Number.parseInt(n, 10) || 0);
@@ -5587,6 +5592,8 @@ async function cloudFetch(path, init = {}) {
     method: init.method ?? "GET",
     headers: {
       Authorization: `Bearer ${token}`,
+      // Le cloud refuse (426) les apps trop anciennes pour son schéma courant.
+      [APP_VERSION_HEADER]: appVersion,
       ...init.body !== void 0 ? { "Content-Type": "application/json" } : {}
     },
     ...init.body !== void 0 ? { body: JSON.stringify(init.body) } : {},
@@ -11596,12 +11603,23 @@ var LOCAL_ORIGIN = "local-bridge";
 var REMOTE_ORIGIN = "remote";
 var RECONNECT_DELAY_MS = 3e3;
 var UNAUTHENTICATED_RETRY_MS = 5 * 6e4;
+var OUTDATED_RETRY_MS = 30 * 6e4;
 var COLLECTIONS = ["projects", "services", "environments"];
 var SyncAuthError = class extends Error {
   constructor(status) {
     super(`cloud rejected the session (HTTP ${status})`);
   }
 };
+var SyncOutdatedError = class extends Error {
+  /** Dernière version que le cloud refuse — la borne est exclusive. */
+  lastIncompatibleVersion;
+  constructor(lastIncompatibleVersion) {
+    super(
+      `this app (${appVersion}) is too old for this cloud${lastIncompatibleVersion ? ` (needs newer than ${lastIncompatibleVersion})` : ""}`
+    );
+    this.lastIncompatibleVersion = lastIncompatibleVersion;
+  }
+};
 var OrgSyncConnection = class {
   doc = new Y.Doc();
   projects = getCollection(this.doc, "projects");
@@ -11613,6 +11631,8 @@ var OrgSyncConnection = class {
   initializing = true;
   abort = null;
   state = "connecting";
+  /** Last version the cloud refuses, as it told us when rejecting this app. */
+  lastIncompatibleVersion = null;
   /** Local state still owed to the cloud (initial sync, or a rejected episode). */
   needsPush = false;
   unsubscribes = [];
@@ -11626,6 +11646,10 @@ var OrgSyncConnection = class {
   getState() {
     return this.state;
   }
+  /** The cloud's version floor, known only once it has rejected us for it. */
+  getLastIncompatibleVersion() {
+    return this.lastIncompatibleVersion;
+  }
   getLink() {
     return this.link;
   }
@@ -11668,7 +11692,35 @@ var OrgSyncConnection = class {
     return `Bearer ${token}`;
   }
   async headers() {
-    return { Authorization: await this.authHeader(), "Content-Type": "application/json" };
+    return {
+      Authorization: await this.authHeader(),
+      [APP_VERSION_HEADER]: appVersion,
+      "Content-Type": "application/json"
+    };
+  }
+  /**
+   * Turn a 426 into a typed error, reading the floor the cloud published in the
+   * body. The body is advisory: a missing or malformed one still blocks, it just
+   * makes for a vaguer message.
+   */
+  async outdatedError(res) {
+    try {
+      const body = await res.json();
+      return new SyncOutdatedError(
+        typeof body.lastIncompatibleVersion === "string" ? body.lastIncompatibleVersion : null
+      );
+    } catch {
+      return new SyncOutdatedError(null);
+    }
+  }
+  /** Remember the floor and stop pretending sync will resume on its own. */
+  markOutdated(err) {
+    const alreadyReported = this.state === "outdated";
+    this.state = "outdated";
+    this.lastIncompatibleVersion = err.lastIncompatibleVersion;
+    this.needsPush = true;
+    if (alreadyReported) return;
+    console.error(`[cloud-sync] org ${this.link.orgId}: ${err.message} \u2014 sync paused until the app is updated.`);
   }
   /**
    * Mark this org as needing a fresh sign-in. Logged once per episode, not on
@@ -11699,6 +11751,7 @@ var OrgSyncConnection = class {
         headers: await this.headers(),
         signal: AbortSignal.timeout(15e3)
       });
+      if (svRes.status === 426) throw await this.outdatedError(svRes);
       if (svRes.status === 401 || svRes.status === 403) throw new SyncAuthError(svRes.status);
       if (!svRes.ok) return;
       const { sv } = await svRes.json();
@@ -11706,7 +11759,7 @@ var OrgSyncConnection = class {
       const diff = Y.encodeStateAsUpdate(this.doc, cloudSv);
       await this.pushUpdate(diff);
     } catch (err) {
-      if (err instanceof SyncAuthError) throw err;
+      if (err instanceof SyncAuthError || err instanceof SyncOutdatedError) throw err;
       console.error("[cloud-sync] initial push failed for org %s:", this.link.orgId, err.message);
     }
   }
@@ -11718,8 +11771,14 @@ var OrgSyncConnection = class {
         body: JSON.stringify({ update: Buffer.from(update).toString("base64"), conn: this.conn }),
         signal: AbortSignal.timeout(15e3)
       });
+      if (res.status === 426) throw await this.outdatedError(res);
       if (res.status === 401 || res.status === 403) throw new SyncAuthError(res.status);
     } catch (err) {
+      if (err instanceof SyncOutdatedError) {
+        this.markOutdated(err);
+        this.abort?.abort();
+        return;
+      }
       if (err instanceof SyncAuthError) {
         this.markUnauthenticated(err);
         this.abort?.abort();
@@ -11742,6 +11801,11 @@ var OrgSyncConnection = class {
         this.state = "connecting";
         await this.streamOnce();
       } catch (err) {
+        if (err instanceof SyncOutdatedError) {
+          this.markOutdated(err);
+          await this.delay(OUTDATED_RETRY_MS);
+          continue;
+        }
         if (err instanceof SyncAuthError) {
           this.markUnauthenticated(err);
           await this.delay(UNAUTHENTICATED_RETRY_MS);
@@ -11756,9 +11820,10 @@ var OrgSyncConnection = class {
     this.abort = new AbortController();
     const since = Buffer.from(Y.encodeStateVector(this.doc)).toString("base64");
     const res = await fetch(this.url(`/stream?conn=${this.conn}&since=${encodeURIComponent(since)}`), {
-      headers: { Authorization: await this.authHeader() },
+      headers: { Authorization: await this.authHeader(), [APP_VERSION_HEADER]: appVersion },
       signal: this.abort.signal
     });
+    if (res.status === 426) throw await this.outdatedError(res);
     if (res.status === 401 || res.status === 403) throw new SyncAuthError(res.status);
     if (!res.ok || !res.body) throw new Error(`stream HTTP ${res.status}`);
     this.state = "live";
@@ -11930,7 +11995,11 @@ var CloudSyncBridge = class {
   }
   /** Per-org sync state, for the UI. */
   states() {
-    return Array.from(this.connections.entries()).map(([orgId, conn]) => ({ orgId, state: conn.getState() }));
+    return Array.from(this.connections.entries()).map(([orgId, conn]) => ({
+      orgId,
+      state: conn.getState(),
+      lastIncompatibleVersion: conn.getLastIncompatibleVersion()
+    }));
   }
   /** Begin (or restart) syncing a single organization. */
   async connect(link) {
@@ -12181,11 +12250,15 @@ var cloudSyncRouter = router({
    */
   list: protectedProcedure.query(async () => {
     const links = await cloudSyncStore.list();
-    const states = new Map(cloudSyncBridge.states().map((s) => [s.orgId, s.state]));
+    const states = new Map(cloudSyncBridge.states().map((s) => [s.orgId, s]));
     return links.map((l) => ({
       orgId: l.orgId,
       cloudUrl: l.cloudUrl,
-      state: states.get(l.orgId) ?? "stopped"
+      state: states.get(l.orgId)?.state ?? "stopped",
+      // Renseigné seulement quand le cloud a refusé cette app comme trop
+      // ancienne : c'est lui qui publie le plancher, on ne le devine pas. La
+      // borne est exclusive — il faut strictement plus récent que ce numéro.
+      lastIncompatibleVersion: states.get(l.orgId)?.lastIncompatibleVersion ?? null
     }));
   })
 });
@@ -13627,7 +13700,7 @@ async function createLocalServer() {
     try {
       const verifyRes = await fetch(`${getCloudApiUrl()}/api/auth/device/link`, {
         method: "POST",
-        headers: { "Content-Type": "application/json" },
+        headers: { "Content-Type": "application/json", [APP_VERSION_HEADER]: appVersion },
         body: JSON.stringify({ token, name: getDeviceName() }),
         signal: AbortSignal.timeout(15e3)
       });
@@ -13672,7 +13745,11 @@ async function createLocalServer() {
         const upstream = await fetch(
           `${getCloudApiUrl()}${upstreamPath}?organizationId=${encodeURIComponent(organizationId)}`,
           {
-            headers: { Authorization: `Bearer ${token}`, Accept: "text/event-stream" },
+            headers: {
+              Authorization: `Bearer ${token}`,
+              [APP_VERSION_HEADER]: appVersion,
+              Accept: "text/event-stream"
+            },
             signal: upstreamAbort.signal
           }
         );
@@ -13729,6 +13806,7 @@ async function createLocalServer() {
             method: "POST",
             headers: {
               Authorization: `Bearer ${token}`,
+              [APP_VERSION_HEADER]: appVersion,
               "Content-Type": String(req.headers["content-type"] ?? "application/octet-stream")
             },
             body: req.body,
@@ -13758,7 +13836,11 @@ async function createLocalServer() {
     try {
       const upstream = await fetch(
         `${getCloudApiUrl()}/api/kanban/file/${encodeURIComponent(req.params.id)}`,
-        { method: "DELETE", headers: { Authorization: `Bearer ${token}` }, signal: AbortSignal.timeout(15e3) }
+        {
+          method: "DELETE",
+          headers: { Authorization: `Bearer ${token}`, [APP_VERSION_HEADER]: appVersion },
+          signal: AbortSignal.timeout(15e3)
+        }
       );
       res.status(upstream.status).end();
     } catch {
@@ -13781,7 +13863,10 @@ async function createLocalServer() {
     try {
       const upstream = await fetch(
         `${getCloudApiUrl()}/api/kanban/file/${encodeURIComponent(req.params.id)}`,
-        { headers: { Authorization: `Bearer ${token}` }, signal: AbortSignal.timeout(3e5) }
+        {
+          headers: { Authorization: `Bearer ${token}`, [APP_VERSION_HEADER]: appVersion },
+          signal: AbortSignal.timeout(3e5)
+        }
       );
       if (!upstream.ok) {
         res.status(upstream.status).end();
@@ -14289,4 +14374,4 @@ export {
   createLocalServer,
   pullEnv
 };
-//# sourceMappingURL=src-KERYXMIR.js.map
+//# sourceMappingURL=src-U3ECNNB6.js.map