@tiaforge-ui/sinter 0.3.1 → 0.3.2

package/dist/sse.js

@@ -34,25 +34,21 @@ export function eventSourceTransport() {
         close() { es?.close(); es = null; },
     };
 }
+/** One stream URL's connection, shared by every `<sn-sync>` on the page that resolves to it. */
 class Connection {
     app;
-    def;
+    url;
     t = null;
     backoff = MIN_BACKOFF;
     timer = null;
     closed = false;
     hidden = false;
     everOpen = false;
-    url;
-    fed;
-    /** where `src` and the events' expressions are evaluated: the enclosing state's scope, or the page */
-    base;
-    constructor(app, def) {
+    /** each mapped event with the scope its expressions are evaluated in: its `<sn-sync>`'s state, or the page */
+    subs = [];
+    constructor(app, url) {
         this.app = app;
-        this.def = def;
-        this.base = app.scopeOf(def.scope ?? -1);
-        this.url = app.url(def.src, this.base);
-        this.fed = [...new Set(def.events.map((e) => e.resource))];
+        this.url = url;
     }
     start() {
         const env = this.app.env;
@@ -68,9 +64,6 @@ class Connection {
         this.app.addCleanup(() => { this.closed = true; this.stop(); });
         this.open();
     }
-    names() {
-        return [...new Set(this.def.events.map((e) => e.name))];
-    }
     open() {
         if (this.closed && !this.hidden)
             return;
@@ -78,6 +71,7 @@ class Connection {
         const t = custom ?? eventSourceTransport();
         this.t = t;
         const reconnect = this.everOpen;
+        const subs = this.subs.map(([e]) => e);
         t.connect(this.url, (name, data) => this.event(name, data), (state) => {
             if (this.t !== t)
                 return;
@@ -88,7 +82,7 @@ class Connection {
                     this.app.streamOpened?.(this.url);
                 // events sent while disconnected are lost: refetch everything this stream feeds
                 if (reconnect)
-                    for (const name of this.fed)
+                    for (const name of new Set(subs.map((e) => e.resource)))
                         void this.app.resource(name).refetch();
             }
             else {
@@ -96,7 +90,7 @@ class Connection {
                 this.t = null;
                 void this.probe();
             }
-        }, this.names());
+        }, [...new Set(subs.map((e) => e.name))]);
     }
     stop() {
         this.t?.close();
@@ -135,14 +129,14 @@ class Connection {
         this.timer = this.app.env.setTimeout(() => { this.timer = null; fn(); }, delay, 'backoff');
     }
     event(name, payload) {
-        for (const def of this.def.events)
+        for (const [def, base] of this.subs)
             if (def.name === name)
-                this.apply(def, payload);
+                this.apply(def, base, payload);
         this.app.serverEvent(name, payload);
     }
-    apply(def, payload) {
+    apply(def, base, payload) {
         const app = this.app;
-        const scope = Object.create(this.base);
+        const scope = Object.create(base);
         scope.$p = payload && typeof payload === 'object' ? payload : {};
         const r = app.resource(def.resource);
         try {
@@ -203,9 +197,21 @@ const sse = {
         let alive = true;
         app.addCleanup(() => { alive = false; });
         app.env.queueMicrotask(() => {
-            if (alive)
-                for (const def of app.ir.syncs)
-                    new Connection(app, def).start();
+            if (!alive)
+                return;
+            // one connection per resolved stream URL, however many <sn-sync> elements use it
+            const conns = new Map();
+            for (const def of app.ir.syncs) {
+                const base = app.scopeOf(def.scope ?? -1);
+                const url = app.url(def.src, base);
+                let c = conns.get(url);
+                if (!c)
+                    conns.set(url, c = new Connection(app, url));
+                for (const e of def.events)
+                    c.subs.push([e, base]);
+            }
+            for (const c of conns.values())
+                c.start();
         });
     },
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tiaforge-ui/sinter",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "description": "Bind JSON APIs to plain HTML: keyed resources, SSE sync, template bindings and optimistic mutations, compiled at build time.",
   "license": "MIT",
   "author": "Tia Heinrich",