@oxyhq/core 7.0.0 → 7.1.1

package/dist/esm/index.js

@@ -146,6 +146,17 @@ export { SessionClient } from './session/SessionClient.js';
 export { createSessionClientHost } from './session/sessionClientHost.js';
 export { createSessionClient } from './session/createSessionClient.js';
 export { deviceStateToClientSessions, activeSessionIdOf, activeUserOf, accountIdsOf, } from './session/projectSessionState.js';
+// Unified account-list projection (THE single source of truth for the account
+// chooser: device sign-ins ∪ account graph, deduped by accountId). Pure +
+// I/O-free — the caller hydrates profiles via `getUsersByIds`. Shared by
+// `@oxyhq/services`, `@oxyhq/auth`, and auth.oxy.so so the list can't diverge.
+export { projectSwitchableAccounts, switchableAccountIds, } from './session/accountProjection.js';
+// Headless controller for the unified account dialog. Framework-agnostic
+// state machine + subscribe/getSnapshot store (bind via `useSyncExternalStore`)
+// — no password/2FA logic (that lives at the IdP; `openPasswordAtOxyAuth` only
+// hands off). Reuses `SessionClient.switchAccount` / `oxyServices.switchToAccount`
+// for the uniform switch and the existing device-flow methods for sign-in.
+export { AccountDialogController, createAccountDialogController, } from './session/accountDialogController.js';
 // ---------------------------------------------------------------------------
 // Device-first session machinery (auth centralization, wave 1) — additive.
 // Persisted auth-state store, the unified refresh handler + scheduler, the

package/dist/esm/session/SessionClient.js

@@ -1,6 +1,14 @@
 import { deviceSessionStateSchema, deviceSessionSyncSchema, safeParseContract, } from '@oxyhq/contracts';
 import { logger } from '../utils/loggerUtils.js';
 import { getSocketIO } from './socketLoader.js';
+/**
+ * Same-origin `BroadcastChannel` name for instant, network-free session wake
+ * across tabs of the SAME origin (e.g. two `accounts.oxy.so` tabs). Complements
+ * the cookie-authed device socket, which covers same-apex cross-origin
+ * (`accounts` ↔ `console` ↔ `inbox`, all `*.oxy.so`). Cross-APEX (mention.earth)
+ * is covered by neither and relies on a reload — the documented limitation.
+ */
+const SESSION_BROADCAST_CHANNEL = 'oxy.session';
 export class SessionClient {
     constructor(host, options = {}) {
         this.host = host;
@@ -10,6 +18,12 @@ export class SessionClient {
         this.socket = null;
         this.tokenUnsub = null;
         this.started = false;
+        /** In-flight guard so a burst of pushes triggers at most ONE acquisition. */
+        this.acquiring = false;
+        /** True while the live socket is an anonymous (signed-out) device connection. */
+        this.socketAnonymous = false;
+        /** Same-origin cross-tab wake channel; null on platforms without BroadcastChannel. */
+        this.channel = null;
     }
     getState() {
         return this.state;
@@ -102,14 +116,17 @@ export class SessionClient {
     async switchAccount(accountId) {
         const res = await this.host.makeRequest('POST', '/session/device/switch', { accountId }, { cache: false });
         this.applySync(res);
+        this.postCommitPing();
     }
     async signOut(target) {
         const res = await this.host.makeRequest('POST', '/session/device/signout', target, { cache: false });
         this.applySync(res);
+        this.postCommitPing();
     }
     async addCurrentAccount() {
         const res = await this.host.makeRequest('POST', '/session/device/add', undefined, { cache: false });
         this.applySync(res);
+        this.postCommitPing();
     }
     /**
      * Register the just-signed-in account into the device set AND make it the
@@ -137,19 +154,58 @@ export class SessionClient {
             return;
         this.started = true;
         this.tokenUnsub = this.host.onTokensChanged((token) => {
-            if (token && this.socket && !this.socket.connected) {
+            if (!token)
+                return;
+            // A bearer just landed: an in-flight acquisition (if any) succeeded — clear
+            // the guard so a later sign-out can re-acquire.
+            this.acquiring = false;
+            if (!this.socket)
+                return;
+            if (this.socketAnonymous) {
+                // The live socket was an anonymous (device-room-only) connection. Force a
+                // reconnect so the handshake re-runs authenticated and also joins the
+                // `user:<id>` notification room.
+                this.socketAnonymous = false;
+                this.socket.disconnect();
+                this.socket.connect();
+            }
+            else if (!this.socket.connected) {
                 this.socket.connect();
             }
         });
-        await this.bootstrap();
+        this.openBroadcastChannel();
+        // `bootstrap` (`GET /session/device/state`) is bearer-authenticated: skip it
+        // when signed out (the signed-out socket below still joins the device room to
+        // receive pushes). A bootstrap failure is non-fatal — the socket must still
+        // connect so realtime sync survives a transient state-fetch error.
+        if (this.host.getAccessToken()) {
+            try {
+                await this.bootstrap();
+            }
+            catch (error) {
+                logger.warn('[SessionClient] bootstrap during start failed (non-fatal)', { component: 'SessionClient' }, error);
+            }
+        }
         await this.connectSocket();
     }
     stop() {
         this.started = false;
+        this.acquiring = false;
+        this.socketAnonymous = false;
         if (this.tokenUnsub) {
             this.tokenUnsub();
             this.tokenUnsub = null;
         }
+        if (this.channel) {
+            this.channel.onmessage = null;
+            try {
+                this.channel.close();
+            }
+            catch (error) {
+                logger.debug('[SessionClient] BroadcastChannel close failed', { component: 'SessionClient' }, error);
+            }
+            this.channel = null;
+        }
         if (this.socket) {
             this.socket.disconnect();
             this.socket = null;
@@ -167,24 +223,139 @@ export class SessionClient {
         if (!this.started)
             return; // stopped while the dynamic import was in flight
         const hasToken = Boolean(this.host.getAccessToken());
+        // Signed-out connect gate: when there is no bearer, only open the socket if
+        // the consumer supplies a device anchor (web cookie → `true`; native token →
+        // string). This lets an idle tab receive its device's `session_state` pushes
+        // and self-acquire when a sibling signs in.
+        let signedOutAuth = false;
+        if (!hasToken && this.options.signedOutSocketAuth) {
+            try {
+                signedOutAuth = await this.options.signedOutSocketAuth();
+            }
+            catch (error) {
+                logger.warn('[SessionClient] signedOutSocketAuth failed', { component: 'SessionClient' }, error);
+                signedOutAuth = false;
+            }
+            if (!this.started)
+                return; // stopped while the async gate was in flight
+        }
+        const signedOutConnect = signedOutAuth !== false && signedOutAuth != null;
+        const signedOutDeviceToken = typeof signedOutAuth === 'string' ? signedOutAuth : undefined;
+        this.socketAnonymous = !hasToken && signedOutConnect;
         const socket = io(this.host.getBaseURL(), {
             transports: ['websocket'],
-            autoConnect: hasToken,
+            // Send the first-party `oxy_device` cookie on the same-site handshake so a
+            // signed-out browser tab can be resolved to its device room server-side.
+            withCredentials: true,
+            autoConnect: hasToken || signedOutConnect,
             auth: (cb) => {
-                cb({ token: this.host.getAccessToken() ?? '' });
+                const token = this.host.getAccessToken() ?? '';
+                // Present the native device token only while signed out (no bearer). Once
+                // a token is held the bearer path wins and the deviceToken is redundant.
+                cb(token || !signedOutDeviceToken ? { token } : { token, deviceToken: signedOutDeviceToken });
             },
         });
         socket.on('session_state', (payload) => {
             const applied = this.applyState(payload);
-            if (applied) {
-                const active = this.state?.activeAccountId ?? null;
-                if (active && active !== this.host.getCurrentAccountId()) {
-                    void this.bootstrap().catch((error) => {
-                        logger.warn('[SessionClient] post-push token fetch failed', { component: 'SessionClient' }, error);
-                    });
+            if (!applied)
+                return;
+            // Signed-out tab: a session appeared on this device (a sibling signed in).
+            // Acquire it so this tab flips to signed-in; the planted token then
+            // reconnects the socket on the authenticated path.
+            if (!this.host.getAccessToken()) {
+                if ((this.state?.accounts.length ?? 0) > 0) {
+                    this.requestAcquisition();
                 }
+                return;
+            }
+            const active = this.state?.activeAccountId ?? null;
+            if (active && active !== this.host.getCurrentAccountId()) {
+                void this.bootstrap().catch((error) => {
+                    logger.warn('[SessionClient] post-push token fetch failed', { component: 'SessionClient' }, error);
+                });
             }
         });
         this.socket = socket;
     }
+    /**
+     * Run the consumer's session acquisition at most once at a time. A returned
+     * promise gates the next attempt (reset on settle), so a failed acquisition
+     * can retry on the NEXT push while a burst of identical pushes cannot pile up.
+     */
+    requestAcquisition() {
+        if (this.acquiring || !this.options.onSessionAppeared)
+            return;
+        this.acquiring = true;
+        let result;
+        try {
+            result = this.options.onSessionAppeared();
+        }
+        catch (error) {
+            this.acquiring = false;
+            logger.error('[SessionClient] onSessionAppeared threw', error);
+            return;
+        }
+        void Promise.resolve(result).catch((error) => {
+            logger.warn('[SessionClient] onSessionAppeared rejected', { component: 'SessionClient' }, error);
+        }).finally(() => {
+            this.acquiring = false;
+        });
+    }
+    /**
+     * Open the same-origin `BroadcastChannel` (web only). A sibling tab that
+     * commits a session posts a wake ping; on receipt a signed-in tab re-syncs its
+     * device state and a signed-out tab self-acquires — instant + network-free for
+     * the common "two tabs of the same origin" case, with no state (and no tokens)
+     * ever crossing the channel. No-op on native (no BroadcastChannel).
+     */
+    openBroadcastChannel() {
+        if (this.channel)
+            return;
+        const Ctor = globalThis.BroadcastChannel;
+        if (typeof Ctor !== 'function')
+            return; // native RN / SSR — feature absent
+        let channel;
+        try {
+            channel = new Ctor(SESSION_BROADCAST_CHANNEL);
+        }
+        catch (error) {
+            logger.debug('[SessionClient] BroadcastChannel unavailable', { component: 'SessionClient' }, error);
+            return;
+        }
+        channel.onmessage = (event) => {
+            if (!event || typeof event.data !== 'object' || event.data === null)
+                return;
+            if (event.data.type !== 'commit')
+                return;
+            // BroadcastChannel never echoes to the posting context, so this is a
+            // sibling's commit. Re-sync (signed-in) or acquire (signed-out). Neither
+            // path re-posts, so there is no cross-tab ping loop.
+            if (this.host.getAccessToken()) {
+                void this.bootstrap().catch((error) => {
+                    logger.warn('[SessionClient] broadcast re-sync failed', { component: 'SessionClient' }, error);
+                });
+            }
+            else {
+                this.requestAcquisition();
+            }
+        };
+        this.channel = channel;
+    }
+    /**
+     * Wake same-origin sibling tabs after a locally-initiated session mutation.
+     * Opens the channel lazily: a sign-in registers the account (`addCurrentAccount`
+     * / `switchAccount`) BEFORE `start()` runs, so the ping must not depend on
+     * `start()` having opened the channel first.
+     */
+    postCommitPing() {
+        this.openBroadcastChannel();
+        if (!this.channel)
+            return;
+        try {
+            this.channel.postMessage({ type: 'commit', at: Date.now() });
+        }
+        catch (error) {
+            logger.debug('[SessionClient] BroadcastChannel post failed', { component: 'SessionClient' }, error);
+        }
+    }
 }