@ours.network/notifications 0.3.1-nightly.6 → 0.3.1-nightly.7

package/dist/resource-views.d.ts

@@ -11,6 +11,7 @@ export declare class NotificationViews {
     private get;
     private project;
     private emit;
+    private coverage;
     register(principal: string, input: Record<string, unknown>): {
         subscriptionEpoch: number;
         baselineId: string;

package/dist/resource-views.js

@@ -33,7 +33,7 @@ class Output {
         this.response = response;
         this.failed = failed;
     }
-    send(envelope) {
+    send(envelope, admitted) {
         if (this.closed)
             return;
         const bytes = Buffer.byteLength(JSON.stringify(envelope));
@@ -41,6 +41,7 @@ class Output {
             this.failed();
             return;
         }
+        admitted?.();
         this.pending.push({ envelope, bytes });
         this.bytes += bytes;
         if (!this.active)
@@ -67,7 +68,9 @@ class Output {
                 const { envelope, bytes } = this.pending.shift();
                 this.bytes -= bytes;
                 const encoded = Buffer.from(JSON.stringify(envelope));
-                if (encoded.length + 32 <= FRAME)
+                if ('views' in envelope)
+                    await this.write('resource-coverage', envelope);
+                else if (encoded.length + 32 <= FRAME)
                     await this.write('resource', envelope);
                 else {
                     const binding = { protocolVersion: 1, id: `${envelope.viewId}:${envelope.subscriptionEpoch}:${envelope.sequence}`,
@@ -119,9 +122,8 @@ export class NotificationViews {
         };
         const output = new Output(response, close);
         const timer = setInterval(() => {
-            for (const view of connection.views.values())
-                this.emit(connection, view, 'coverage', { source: this.source(view.revision) });
-        }, 2000);
+            this.coverage(connection);
+        }, 15000);
         timer.unref();
         const connection = { id, principal, user, response, output, controller, views: new Map(), epochs: new Map(), timer, close };
         this.connections.set(id, connection);
@@ -141,8 +143,7 @@ export class NotificationViews {
                             continue;
                         view.payload = payload;
                         view.revision = captured.revision;
-                        this.emit(connection, view, 'snapshot', captured.payload);
-                        this.emit(connection, view, 'coverage', { source: this.source(captured.revision) });
+                        this.emit(connection, view, 'snapshot', captured.payload, this.source(captured.revision));
                     }
                 }
                 catch {
@@ -178,9 +179,21 @@ export class NotificationViews {
         return { payload: structuredClone({ items, unread: summary.unread, revision: summary.revision, nextCursor,
                 summary, delivery: this.store.deliveryStatus(user) }), revision: summary.revision };
     }
-    emit(connection, view, kind, payload) {
+    emit(connection, view, kind, payload, source) {
         connection.output.send({ protocolVersion: 1, producerGeneration: this.producerGeneration, viewId: view.descriptor.viewId,
-            subscriptionEpoch: view.epoch, sequence: ++view.sequence, revision: view.revision, baselineId: view.baselineId, kind, payload });
+            subscriptionEpoch: view.epoch, sequence: view.sequence + 1, revision: view.revision, baselineId: view.baselineId, kind, payload, ...(source ? { source } : {}) }, () => { view.sequence++; if (source || kind === 'ready')
+            view.qualifiedAt = Date.now(); });
+    }
+    // A shared ordered batch retains each view's own captured revision.
+    coverage(connection) {
+        const now = Date.now(), eligible = [...connection.views.values()].filter(view => now - view.qualifiedAt >= 15000);
+        if (!eligible.length)
+            return;
+        const views = eligible.map(view => ({ protocolVersion: 1, producerGeneration: this.producerGeneration, viewId: view.descriptor.viewId, subscriptionEpoch: view.epoch, baselineId: view.baselineId, sequence: view.sequence + 1, revision: view.revision, source: this.source(view.revision) }));
+        connection.output.send({ protocolVersion: 1, producerGeneration: this.producerGeneration, views }, () => { for (const view of eligible) {
+            view.sequence++;
+            view.qualifiedAt = now;
+        } });
     }
     register(principal, input) {
         const connection = this.get(String(input.connectionId), principal), value = descriptor(input.descriptor), epoch = input.subscriptionEpoch;
@@ -192,10 +205,10 @@ export class NotificationViews {
             throw new HttpError(503, 'resource view capacity');
         const baseline = this.project(connection.user, value);
         const view = { descriptor: value, epoch: epoch, baselineId: randomUUID(), sequence: 0, revision: baseline.revision,
-            baseline, payload: contentKey(baseline.payload) };
+            baseline, qualifiedAt: Date.now(), payload: contentKey(baseline.payload) };
         connection.views.set(value.viewId, view);
         connection.epochs.set(value.viewId, view.epoch);
-        this.emit(connection, view, 'snapshot', baseline.payload);
+        this.emit(connection, view, 'snapshot', baseline.payload, this.source(baseline.revision));
         this.emit(connection, view, 'ready', { baselineId: view.baselineId, source: this.source(baseline.revision) });
         return { subscriptionEpoch: view.epoch, baselineId: view.baselineId };
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ours.network/notifications",
-  "version": "0.3.1-nightly.6",
+  "version": "0.3.1-nightly.7",
   "description": "Authenticated web push delivery and shared notification inbox",
   "type": "module",
   "license": "FSL-1.1-Apache-2.0",