@dokebi/sse 0.4.0 → 0.4.1

package/AI.md

@@ -51,7 +51,7 @@ sse.connections({ tenant, room });                       // the count on this wo
 ```
 
 - `route` works only in setup (`FROZEN` afterwards). `authenticate` and `onOpen` run on every reconnect.
-- Targets: `{tenant}` everyone, `{tenant, member}` all tabs of one person, `{tenant, room}` a room, `{tenant, room, member}` that person in the room. Strings are 1 to 256 characters.
+- Targets: `{tenant}` everyone, `{tenant, member}` all tabs of one person, `{tenant, room}` a room, `{tenant, room, member}` that person in the room. Strings are 1 to 256 characters (any characters). A target only ever reaches streams of its own tenant.
 - Prefix targets (D-0061): with `tenantPrefix` instead of `tenant` (exactly one of them, otherwise `INVALID_TARGET`), every tenant whose name starts with that prefix (with the same `member` and `room` rules). Bus messages carry the same target, and each process scans its own tenant index once. @dokebi/app's namespaces `<ns>:` use it.
 - Event names: `^[A-Za-z][A-Za-z0-9._:-]{0,63}$`, not starting with `dokebi-` (reserved for the plugin). data is one line of JSON (`undefined` becomes `null`); functions, BigInt and cycles are `INVALID_DATA`.
 - `publish` order: check target, name and data → when the bus is not `ready`, `BUS_UNAVAILABLE` (nothing is sent anywhere, error log) → write to this process's streams → publish on the bus. A failed bus publish is `BUS_PUBLISH_FAILED` (`cause`, `id`, `local`; this process already received it, other places are unknown; the error log has the full error). Whether to send again is the caller's choice (duplicates possible).

package/dist/gateway.js

@@ -10,7 +10,6 @@ const RELOAD_RETRY_MS = 60_000;
 const BUS_WATCH_MS = 1000;
 const MAX_TEXT = 256;
 const text = (value) => typeof value === 'string' && value.length > 0 && value.length <= MAX_TEXT;
-const key = (tenant, value) => `${tenant}\u0000${value}`;
 function add(map, name, entry) {
     const set = map.get(name);
     if (set)
@@ -102,9 +101,8 @@ export class Gateway {
     bus;
     api;
     #entries = new Map();
+    /** tenant → its streams, by member and by room (see TenantIndex). */
     #tenants = new Map();
-    #members = new Map();
-    #rooms = new Map();
     /** onOpen/onClose calls in progress, awaited by drain (bounded by the drain deadline). */
     #tasks = new Set();
     /** Repeated hot-path events: the first at once, then one summary per interval (D-0047). */
@@ -357,8 +355,13 @@ export class Gateway {
             close: () => this.#end(entry, 'SERVER_CLOSED'),
         });
         this.#entries.set(entry.id, entry);
-        add(this.#tenants, entry.tenant, entry);
-        add(this.#members, key(entry.tenant, entry.member), entry);
+        let index = this.#tenants.get(entry.tenant);
+        if (!index) {
+            index = { all: new Set(), members: new Map(), rooms: new Map() };
+            this.#tenants.set(entry.tenant, index);
+        }
+        index.all.add(entry);
+        add(index.members, entry.member, entry);
         for (const room of rooms)
             this.#join(entry, room);
         return entry;
@@ -368,8 +371,10 @@ export class Gateway {
             return;
         if (entry.rooms.size >= this.options.maxRooms)
             throw new SseError('ROOM_LIMIT', `A stream may be in ${this.options.maxRooms} rooms.`);
+        // An open entry is always indexed under its tenant (#add before any join, #closed after).
+        const index = this.#tenants.get(entry.tenant);
         entry.rooms.add(room);
-        add(this.#rooms, key(entry.tenant, room), entry);
+        add(index.rooms, room, entry);
         if (this.context.logger.isEnabled('debug'))
             this.context.logger.log('debug', 'SSE room joined', {
                 stream: entry.id,
@@ -380,7 +385,9 @@ export class Gateway {
     #leave(entry, room) {
         if (!entry.rooms.delete(room))
             return;
-        remove(this.#rooms, key(entry.tenant, room), entry);
+        const index = this.#tenants.get(entry.tenant);
+        if (index)
+            remove(index.rooms, room, entry);
         if (this.context.logger.isEnabled('debug'))
             this.context.logger.log('debug', 'SSE room left', {
                 stream: entry.id,
@@ -449,10 +456,15 @@ export class Gateway {
         const reason = entry.reason ?? 'CLIENT_CLOSED';
         entry.reason = reason;
         this.#entries.delete(entry.id);
-        remove(this.#tenants, entry.tenant, entry);
-        remove(this.#members, key(entry.tenant, entry.member), entry);
-        for (const room of entry.rooms)
-            remove(this.#rooms, key(entry.tenant, room), entry);
+        const index = this.#tenants.get(entry.tenant);
+        if (index) {
+            index.all.delete(entry);
+            remove(index.members, entry.member, entry);
+            for (const room of entry.rooms)
+                remove(index.rooms, room, entry);
+            if (!index.all.size)
+                this.#tenants.delete(entry.tenant);
+        }
         if (this.context.logger.isEnabled('debug'))
             this.context.logger.log('debug', 'SSE stream closed', {
                 stream: entry.id,
@@ -480,11 +492,14 @@ export class Gateway {
         return task.finally(() => this.#tasks.delete(task));
     }
     #select(target) {
+        const index = this.#tenants.get(target.tenant);
+        if (!index)
+            return undefined;
         if (target.room !== undefined)
-            return this.#rooms.get(key(target.tenant, target.room));
+            return index.rooms.get(target.room);
         if (target.member !== undefined)
-            return this.#members.get(key(target.tenant, target.member));
-        return this.#tenants.get(target.tenant);
+            return index.members.get(target.member);
+        return index.all;
     }
     /** Writes one event to the matching streams of this process; returns how many took it. */
     #deliver(target, event, id, json) {
@@ -493,8 +508,14 @@ export class Gateway {
             let written = 0;
             const shared = { id, event, json, chunk: undefined };
             for (const tenant of [...this.#tenants.keys()])
-                if (tenant.startsWith(target.tenantPrefix))
-                    written += this.#writeAll(this.#select({ ...target, tenant }), target, shared);
+                if (tenant.startsWith(target.tenantPrefix)) {
+                    const exact = {
+                        tenant,
+                        ...(target.member === undefined ? {} : { member: target.member }),
+                        ...(target.room === undefined ? {} : { room: target.room }),
+                    };
+                    written += this.#writeAll(this.#select(exact), exact, shared);
+                }
             return written;
         }
         const set = this.#select(target);
@@ -504,14 +525,22 @@ export class Gateway {
     }
     /**
      * Plain streams share one buffer, made at the first plain recipient; sealed streams each get
-     * their own frame (D-0062, like sealed WebSocket broadcasts).
+     * their own frame (D-0062, like sealed WebSocket broadcasts). Every candidate is checked against
+     * the whole target, tenant first, right before the write: the index narrows, it never decides
+     * alone who gets an event (ISSUE-0006 A01).
      */
     #writeAll(set, target, shared) {
         let written = 0;
         for (const entry of set ?? []) {
-            if (target.room !== undefined &&
-                target.member !== undefined &&
-                entry.member !== target.member)
+            if (entry.tenant !== target.tenant) {
+                // Unreachable while the index is right; a defect, never a reason to cross tenants.
+                this.#throttle.log('error', 'SSE index returned a stream of another tenant; skipped', 'SSE_INDEX_MISMATCH', undefined, { stream: entry.id, path: entry.route.path });
+                continue;
+            }
+            // #select picked the room (or member) index; the rest of the target narrows here.
+            if (target.member !== undefined && entry.member !== target.member)
+                continue;
+            if (target.room !== undefined && !entry.rooms.has(target.room))
                 continue;
             if (!entry.seal)
                 shared.chunk ??= Buffer.from(frame(shared.id, shared.event, shared.json));
@@ -624,7 +653,8 @@ export class Gateway {
         }
         let count = 0;
         for (const entry of set)
-            if ((filter.member === undefined || entry.member === filter.member) &&
+            if ((filter.tenant === undefined || entry.tenant === filter.tenant) &&
+                (filter.member === undefined || entry.member === filter.member) &&
                 (filter.room === undefined || entry.rooms.has(filter.room)) &&
                 (filter.path === undefined || entry.route.path === filter.path))
                 count++;

package/dist/plugin.js

@@ -81,7 +81,7 @@ class SseRuntime {
 /** Factory input: `{ app, options? }`. Options default to `app.config['dokebi-sse']`. */
 export const createPlugin = definePlugin({
     name: 'dokebi-sse',
-    version: '0.4.0',
+    version: '0.4.1',
     core: '^0.4.0',
     // The declaration (not parseOptions) so core logs OPTION_DEPRECATED for old keys (bus, closeTimeoutMs).
     options: declaration,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dokebi/sse",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "Server-sent events for @dokebi/web: authenticated streams, rooms, cross-worker fan-out over @dokebi/event-bus, and a browser client",
   "keywords": [
     "dokebi",
@@ -69,11 +69,11 @@
   },
   "devDependencies": {
     "@dokebi/cluster": "0.4.0",
-    "@dokebi/config": "0.4.0",
-    "@dokebi/event-bus": "0.4.0",
+    "@dokebi/config": "0.4.1",
+    "@dokebi/event-bus": "0.4.1",
     "@dokebi/health": "0.4.0",
     "@dokebi/nats": "0.4.0",
-    "@dokebi/web": "0.4.0",
+    "@dokebi/web": "0.4.2",
     "react": "19.3.0",
     "react-test-renderer": "19.3.0",
     "vite": "8.3.4",