sentinelayer-cli 0.34.3 → 0.34.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/src/commands/session.js +6 -1
- package/src/session/sync.js +6 -1
package/package.json
CHANGED
package/src/commands/session.js
CHANGED
|
@@ -783,9 +783,14 @@ function mergeSessionActionEvents(events = [], actionEvents = []) {
|
|
|
783
783
|
return dedupeSessionEvents([...(Array.isArray(events) ? events : []), ...actionEvents])
|
|
784
784
|
.map((event, index) => ({ event, index }))
|
|
785
785
|
.sort((left, right) => {
|
|
786
|
+
const leftSequence = eventSequenceNumber(left.event);
|
|
787
|
+
const rightSequence = eventSequenceNumber(right.event);
|
|
788
|
+
if (leftSequence > 0 && rightSequence > 0 && leftSequence !== rightSequence) {
|
|
789
|
+
return leftSequence - rightSequence;
|
|
790
|
+
}
|
|
786
791
|
const timeDiff = eventTimestampMs(left.event) - eventTimestampMs(right.event);
|
|
787
792
|
if (timeDiff !== 0) return timeDiff;
|
|
788
|
-
const sequenceDiff =
|
|
793
|
+
const sequenceDiff = leftSequence - rightSequence;
|
|
789
794
|
if (sequenceDiff !== 0) return sequenceDiff;
|
|
790
795
|
return left.index - right.index;
|
|
791
796
|
})
|
package/src/session/sync.js
CHANGED
|
@@ -253,9 +253,14 @@ function chronologicalSessionEvents(events = []) {
|
|
|
253
253
|
return (Array.isArray(events) ? events : [])
|
|
254
254
|
.map((event, index) => ({ event, index }))
|
|
255
255
|
.sort((left, right) => {
|
|
256
|
+
const leftSequence = eventSequenceNumber(left.event);
|
|
257
|
+
const rightSequence = eventSequenceNumber(right.event);
|
|
258
|
+
if (leftSequence > 0 && rightSequence > 0 && leftSequence !== rightSequence) {
|
|
259
|
+
return leftSequence - rightSequence;
|
|
260
|
+
}
|
|
256
261
|
const timeDiff = eventTimestampMs(left.event) - eventTimestampMs(right.event);
|
|
257
262
|
if (timeDiff !== 0) return timeDiff;
|
|
258
|
-
const sequenceDiff =
|
|
263
|
+
const sequenceDiff = leftSequence - rightSequence;
|
|
259
264
|
if (sequenceDiff !== 0) return sequenceDiff;
|
|
260
265
|
return left.index - right.index;
|
|
261
266
|
})
|