@pylonsync/react 0.5.2 → 0.5.3

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.5.2",
+  "version": "0.5.3",
   "type": "module",
   "main": "./src/index.ts",
   "types": "./dist/index.d.ts",
@@ -14,8 +14,8 @@
     "prepack": "bun run build"
   },
   "dependencies": {
-    "@pylonsync/sdk": "0.5.2",
-    "@pylonsync/sync": "0.5.2"
+    "@pylonsync/sdk": "0.5.3",
+    "@pylonsync/sync": "0.5.3"
   },
   "peerDependencies": {
     "react": ">=19.0.0"

package/src/index.ts

@@ -241,8 +241,7 @@ export function configureClient(config: AgentDBClientConfig): void {
     // An app moving off the default (unprefixed `pylon_token`) keyspace onto
     // its own `pylon:<app>:token` namespace keeps its session: copy the legacy
     // keys up once. COPY, never delete — a framework rollback still finds the
-    // old keys, and a shared-origin multi-app collision self-heals on next
-    // login (each app rewrites its own namespace).
+    // old keys.
     if (config.appName !== "default" && prev === "default") {
       adoptLegacyKeys();
     }
@@ -253,8 +252,30 @@ export function configureClient(config: AgentDBClientConfig): void {
  *  app namespace on first `configureClient({ appName })`. */
 const MIGRATED_SLOTS = ["token", "userId"] as const;
 
+/**
+ * A `pylon:<other>:token` key already on this origin means another Pylon app
+ * has run here — so the unprefixed `pylon_token` cannot be assumed to be OURS.
+ * The legacy keyspace records no owner, and on a shared origin (every app on
+ * localhost:4321 in dev) that stranger's token is usually invalid for us.
+ * Adopt only when this looks like the origin's sole app; otherwise leave the
+ * slot empty and let a real sign-in fill it. Web-only — RN's per-app async
+ * adapters are already isolated, so the shared-origin hazard doesn't exist.
+ */
+function anotherAppNamespaced(): boolean {
+  if (typeof localStorage === "undefined") return false;
+  const mine = storageKey("token");
+  for (let i = 0; i < localStorage.length; i++) {
+    const k = localStorage.key(i);
+    if (k && k.startsWith("pylon:") && k.endsWith(":token") && k !== mine) {
+      return true;
+    }
+  }
+  return false;
+}
+
 function adoptLegacyKeys(): void {
   try {
+    if (anotherAppNamespaced()) return; // legacy token is likely foreign — skip
     for (const slot of MIGRATED_SLOTS) {
       const nsKey = storageKey(slot); // pylon:<app>:<slot>
       const legacyKey = `pylon_${slot}`;

package/src/storageMigration.test.ts

@@ -1,15 +1,16 @@
-// Regression: a fresh app defaulted `_appName` to "default", so `storageKey`
+// A fresh app defaulted `_appName` to "default", so `storageKey("token")`
 // returned the unprefixed `pylon_token`. Two apps on one origin (every app on
 // localhost:4321 in dev) then shared one token keyspace and clobbered each
-// other's sessions. The fix auto-namespaces per app; this pins that adopting a
-// namespace copies an existing default-keyspace session up (non-destructively),
-// so no one gets logged out on the switch.
+// other's sessions. When an app adopts a namespace, `configureClient` copies a
+// legacy default-keyspace session up so a single-app upgrade doesn't log anyone
+// out — but ONLY when the legacy key is plausibly ours (no other app has
+// namespaced here). These pin adopt / no-clobber / don't-import-a-stranger.
 //
-// `_appName` is module-global and only transitions off "default" once, so the
-// no-clobber branch lives in its own file (storageMigrationNoClobber.test.ts)
-// with a fresh transition.
+// `_appName` is a module global that only transitions off "default" once per
+// process, so `beforeEach` resets it (configureClient({ appName: "default" }))
+// and clears the origin's localStorage that the shared-origin guard reads.
 
-import { expect, test } from "bun:test";
+import { beforeEach, expect, test } from "bun:test";
 
 import { configureClient, setReactStorage, storageKey } from "./index";
 import type { Storage as PylonStorage } from "@pylonsync/sync";
@@ -24,6 +25,11 @@ function memStorage(): PylonStorage & { map: Map<string, string> } {
   };
 }
 
+beforeEach(() => {
+  configureClient({ appName: "default" }); // reset the module-global _appName
+  if (typeof localStorage !== "undefined") localStorage.clear();
+});
+
 test("adopts a legacy pylon_token into the app namespace, non-destructively", () => {
   const store = memStorage();
   setReactStorage(store);
@@ -40,3 +46,31 @@ test("adopts a legacy pylon_token into the app namespace, non-destructively", ()
   // storageKey now resolves to the namespace.
   expect(storageKey("token")).toBe("pylon:revtrail:token");
 });
+
+test("does not clobber a token already in the app namespace", () => {
+  const store = memStorage();
+  setReactStorage(store);
+  store.set("pylon_token", "tok_legacy");
+  store.set("pylon:revtrail:token", "tok_current");
+
+  configureClient({ appName: "revtrail" });
+
+  expect(store.get("pylon:revtrail:token")).toBe("tok_current");
+});
+
+test("does not adopt a foreign pylon_token when another app is namespaced here", () => {
+  // Another Pylon app has already run on this origin (shared-origin repro from
+  // a 0.5.2 field report). The ownerless legacy key can't be assumed ours.
+  localStorage.setItem("pylon:otherapp:token", "tok_other_app");
+
+  const store = memStorage();
+  setReactStorage(store);
+  store.set("pylon_token", "tok_FOREIGN_from_another_app");
+
+  configureClient({ appName: "mastagents" });
+
+  // The stranger's token is NOT copied into our namespace…
+  expect(store.get("pylon:mastagents:token")).toBeNull();
+  // …and the legacy key is untouched (we never delete it either).
+  expect(store.get("pylon_token")).toBe("tok_FOREIGN_from_another_app");
+});

package/src/storageMigrationNoClobber.test.ts

@@ -1,30 +0,0 @@
-// The legacy-token adoption (see storageMigration.test.ts) must never overwrite
-// a token already living in the app namespace — that would replay a stale
-// default-keyspace session over the app's real one. Own file so `_appName`
-// starts at "default" and the single transition runs the guard.
-
-import { expect, test } from "bun:test";
-
-import { configureClient, setReactStorage } from "./index";
-import type { Storage as PylonStorage } from "@pylonsync/sync";
-
-function memStorage(): PylonStorage & { map: Map<string, string> } {
-  const map = new Map<string, string>();
-  return {
-    map,
-    get: (k: string) => map.get(k) ?? null,
-    set: (k: string, v: string) => void map.set(k, v),
-    remove: (k: string) => void map.delete(k),
-  };
-}
-
-test("does not clobber a token already in the app namespace", () => {
-  const store = memStorage();
-  setReactStorage(store);
-  store.set("pylon_token", "tok_legacy");
-  store.set("pylon:revtrail:token", "tok_current");
-
-  configureClient({ appName: "revtrail" });
-
-  expect(store.get("pylon:revtrail:token")).toBe("tok_current");
-});