fix redis stream id comparison

nocturne-xyz · Sep 6, 2023 · a6e2a63 · a6e2a63
1 parent b39b39c
commit a6e2a63
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/packages/persistent-log/src/persistentLog.ts b/packages/persistent-log/src/persistentLog.ts
@@ -169,7 +169,7 @@ export class PersistentLog<T> {
         // filter out all data >= `options.endId` if given
         if (options?.endId !== undefined) {
           const endId = options.endId;
-          batch = batch.filter(({ id }) => id < endId);
+          batch = batch.filter(({ id }) => RedisStreamIdTrait.lt(id, endId));
           // if there's no more data after filtering, terminate
           if (batch.length == 0) {
             break;

diff --git a/packages/persistent-log/src/redisStreamId.ts b/packages/persistent-log/src/redisStreamId.ts
@@ -40,6 +40,17 @@ export class RedisStreamIdTrait {
     }
     return `${Number(lhs)}-${Number(rhs)}`;
   }
+
+  static lt(lhs: RedisStreamId, rhs: RedisStreamId): boolean {
+    const [lhsL, lhsR] = RedisStreamIdTrait.toComponents(lhs);
+    const [rhsL, rhsR] = RedisStreamIdTrait.toComponents(rhs);
+
+    if (lhsL === rhsL) {
+      return lhsR < rhsR;
+    }
+
+    return lhsL < rhsL;
+  }
 }
 
 export interface WithRedisStreamId<T> {