@bakers-build/addon-ports-frp 0.5.1-next.855 → 0.5.1-next.856

package/dist/src/reconcile.js

@@ -58,7 +58,11 @@ async function readRoutesFile(path, deps) {
     if (proxies.length === 0 && Object.keys(parsed).length === 1) {
         return { kind: 'absent' };
     }
-    return { kind: 'ok', proxies: proxies };
+    return {
+        kind: 'ok',
+        proxies: proxies,
+        onlyProxies: Object.keys(parsed).length === 1,
+    };
 }
 async function writeRoutesFile(path, dir, content, deps) {
     await deps.mkdir(dir);
@@ -66,13 +70,16 @@ async function writeRoutesFile(path, dir, content, deps) {
     await deps.writeFile(tmp, `${JSON.stringify(content, null, 2)}\n`, 0o600);
     await deps.rename(tmp, path);
 }
-function lastAcknowledgedGeneration(records) {
+/** Every generation a record carries — a stale record must not hide the
+ *  newest one, so the file is ours if it matches any of them. */
+function recordedGenerations(records) {
+    const generations = new Set();
     for (const r of records) {
         const g = r.data?.generation;
         if (typeof g === 'string')
-            return g;
+            generations.add(g);
     }
-    return undefined;
+    return generations;
 }
 export async function reconcileFrp(records, cfg, deps, context) {
     let next = records;
@@ -124,7 +131,10 @@ export async function reconcileFrp(records, cfg, deps, context) {
         return { records: next, ok };
     }
     const desiredGeneration = computeGeneration(cfg.identity, proxies);
-    const lastGeneration = lastAcknowledgedGeneration(records);
+    const knownGenerations = recordedGenerations(records);
+    // Intent is persisted before reconcile, so a write whose generation was
+    // never recorded (lost write) still names only proxies of known records.
+    const knownNames = new Set(records.map((r) => `${r.ticket}-${r.key}`));
     const dir = cfg.routesPath.slice(0, cfg.routesPath.lastIndexOf('/'));
     const existing = await readRoutesFile(cfg.routesPath, deps);
     // The file carries no identity/generation of its own (C3) — its content
@@ -140,7 +150,9 @@ export async function reconcileFrp(records, cfg, deps, context) {
     const isForeign = existing.kind === 'malformed' ||
         (existing.kind === 'ok' &&
             existingGeneration !== desiredGeneration &&
-            existingGeneration !== lastGeneration);
+            !knownGenerations.has(existingGeneration) &&
+            !(existing.onlyProxies &&
+                existing.proxies.every((p) => knownNames.has(p.name))));
     if (isForeign) {
         // Foreign file (or one this client didn't write, or doesn't recognise
         // from the last acknowledged/current generation) — refuse to clobber it.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bakers-build/addon-ports-frp",
-  "version": "0.5.1-next.855",
+  "version": "0.5.1-next.856",
   "description": "bakers.build ports transport: a self-hosted frp (frpc) client over an operator-owned config, reconciled via its local admin API. Implements @bakers-build/addon-ports's PortsTransport contract.",
   "type": "module",
   "license": "MIT",
@@ -19,11 +19,11 @@
     "directory": "bakers-cli/addons/ports-frp"
   },
   "peerDependencies": {
-    "@bakers-build/addon-ports": "^0.5.1-next.855",
-    "@bakers-build/core": "^0.5.1-next.855"
+    "@bakers-build/addon-ports": "^0.5.1-next.856",
+    "@bakers-build/core": "^0.5.1-next.856"
   },
   "bakersBuild": {
-    "commit": "bea27960d8d0cfb827f72aae305ed5820ecd28f3",
+    "commit": "756501eea816e36604ee443b4b3dc8a9e6c89692",
     "channel": "next"
   }
 }