@kumiai/hub-server 0.10.1 → 0.10.2

package/lib/handlers.js

@@ -405,7 +405,8 @@ export function createHandlers(params) {
                             payload: toB64(message.payload)
                         })),
                     head: result.head,
-                    oldest: result.oldest
+                    oldest: result.oldest,
+                    gap: result.gap
                 };
             } catch (error) {
                 rethrowAsHandlerError(error);

package/lib/memoryStore.js

@@ -54,6 +54,7 @@ function isLive(entry, nowSeconds) {
     const entries = new Map();
     const topicLogs = new Map();
     const heads = new Map();
+    const removedThrough = new Map();
     const deliveries = new Map();
     /**
    * publishID -> the sequenceID it was accepted as. Not a log entry and not reachable from one: no
@@ -87,6 +88,10 @@ function isLive(entry, nowSeconds) {
     function removeEntry(sequenceID) {
         const entry = entries.get(sequenceID);
         if (entry == null) return;
+        if (entry.retain === 'log') {
+            const removed = removedThrough.get(entry.topicID);
+            if (removed == null || sequenceID > removed) removedThrough.set(entry.topicID, sequenceID);
+        }
         for (const recipientDID of entry.pendingFor){
             const list = deliveries.get(recipientDID);
             if (list != null) {
@@ -295,7 +300,8 @@ function isLive(entry, nowSeconds) {
             return {
                 messages,
                 head: heads.get(params.topicID) ?? null,
-                oldest: log[0] ?? null
+                oldest: log[0] ?? null,
+                gap: removedThrough.has(params.topicID) && (after == null || removedThrough.get(params.topicID) > after)
             };
         },
         async trim (params) {
@@ -318,14 +324,17 @@ function isLive(entry, nowSeconds) {
             }
         },
         async purge (params) {
-            // The age bound, for both classes: the same removal path, the same invariants — head is
-            // untouched.
             const now = Date.now();
             const purgedIDs = [];
+            const retainedTopics = new Set();
+            // Insertion order is log-position order, even if the clock moves backwards.
             for (const [sequenceID, entry] of entries){
+                if (entry.retain === 'log' && retainedTopics.has(entry.topicID)) continue;
                 const retention = retentionOf(entry.topicID, params.olderThan);
                 if (entry.storedAt <= now - retention * 1000) {
                     purgedIDs.push(sequenceID);
+                } else if (entry.retain === 'log') {
+                    retainedTopics.add(entry.topicID);
                 }
             }
             for (const sequenceID of purgedIDs){

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kumiai/hub-server",
-  "version": "0.10.1",
+  "version": "0.10.2",
   "description": "Hub server for Enkaku E2EE group message routing",
   "keywords": [
     "hub",
@@ -25,18 +25,18 @@
     "lib/*"
   ],
   "dependencies": {
-    "@enkaku/protocol": "^0.21.3",
+    "@enkaku/protocol": "^0.21.4",
     "@enkaku/server": "^0.21.3",
     "@kokuin/token": "^0.5.0",
-    "@kumiai/hub-protocol": "^0.10.0",
-    "@sozai/codec": "^0.4.0",
-    "@sozai/event": "^0.1.3",
-    "@sozai/log": "^0.3.1"
+    "@kumiai/hub-protocol": "^0.10.1",
+    "@sozai/codec": "^0.4.2",
+    "@sozai/event": "^0.1.5",
+    "@sozai/log": "^0.4.0"
   },
   "devDependencies": {
     "@enkaku/client": "^0.21.3",
     "@enkaku/transport": "^0.21.3",
-    "@kumiai/hub-conformance": "^0.10.0",
+    "@kumiai/hub-conformance": "^0.10.1",
     "@kumiai/hub-wake": "^0.10.0"
   },
   "publishConfig": {