@towns-protocol/sdk 0.0.266 → 0.0.268
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/dist/decryptionExtensions.d.ts +4 -4
- package/dist/decryptionExtensions.d.ts.map +1 -1
- package/dist/decryptionExtensions.js +148 -64
- package/dist/decryptionExtensions.js.map +1 -1
- package/dist/tests/multi_ne/clientDecryptionExtensions.test.js +7 -5
- package/dist/tests/multi_ne/clientDecryptionExtensions.test.js.map +1 -1
- package/dist/views/streams/unreadMarkersTransform.js +1 -1
- package/dist/views/streams/unreadMarkersTransform.js.map +1 -1
- package/package.json +9 -9
|
@@ -97,6 +97,9 @@ export declare abstract class BaseDecryptionExtensions {
|
|
|
97
97
|
private _status;
|
|
98
98
|
private mainQueues;
|
|
99
99
|
private streamQueues;
|
|
100
|
+
private mainQueueRunners;
|
|
101
|
+
private streamQueueRunners;
|
|
102
|
+
private allQueueRunners;
|
|
100
103
|
private upToDateStreams;
|
|
101
104
|
private highPriorityIds;
|
|
102
105
|
private recentStreamIds;
|
|
@@ -109,12 +112,10 @@ export declare abstract class BaseDecryptionExtensions {
|
|
|
109
112
|
timerId?: NodeJS.Timeout;
|
|
110
113
|
timestamp: number;
|
|
111
114
|
}[]>;
|
|
112
|
-
private inProgressTick?;
|
|
113
|
-
private timeoutId?;
|
|
114
|
-
private delayMs;
|
|
115
115
|
private started;
|
|
116
116
|
private numRecentStreamIds;
|
|
117
117
|
private emitter;
|
|
118
|
+
private checkStartTimeoutId?;
|
|
118
119
|
protected _onStopFn?: () => void;
|
|
119
120
|
protected log: {
|
|
120
121
|
debug: DLogger;
|
|
@@ -180,7 +181,6 @@ export declare abstract class BaseDecryptionExtensions {
|
|
|
180
181
|
private lastPrintedAt;
|
|
181
182
|
protected checkStartTicking(): void;
|
|
182
183
|
private stopTicking;
|
|
183
|
-
private getDelayMs;
|
|
184
184
|
private tick;
|
|
185
185
|
/**
|
|
186
186
|
* processNewGroupSession
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"decryptionExtensions.d.ts","sourceRoot":"","sources":["../src/decryptionExtensions.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,MAAM,eAAe,CAAA;AACxC,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,EACH,sBAAsB,EACtB,aAAa,EAEb,WAAW,EAEX,wCAAwC,EAC3C,MAAM,uBAAuB,CAAA;AAC9B,OAAO,EAIH,OAAO,EAGV,MAAM,sBAAsB,CAAA;AAC7B,OAAO,EACH,0BAA0B,EAC1B,sBAAsB,EAEtB,UAAU,EACV,qBAAqB,EACxB,MAAM,4BAA4B,CAAA;
|
|
1
|
+
{"version":3,"file":"decryptionExtensions.d.ts","sourceRoot":"","sources":["../src/decryptionExtensions.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@ import { shortenHexString, dlog, dlogError, check, bin_toHexString, } from '@tow
|
|
|
3
3
|
import { GroupEncryptionAlgorithmId, parseGroupEncryptionAlgorithmId, } from '@towns-protocol/encryption';
|
|
4
4
|
import { create, fromJsonString } from '@bufbuild/protobuf';
|
|
5
5
|
import { sortedArraysEqual } from './observable/utils';
|
|
6
|
+
import { isDefined } from './check';
|
|
6
7
|
export var DecryptionStatus;
|
|
7
8
|
(function (DecryptionStatus) {
|
|
8
9
|
DecryptionStatus["initializing"] = "initializing";
|
|
@@ -62,6 +63,52 @@ class StreamQueues {
|
|
|
62
63
|
.join(', ');
|
|
63
64
|
}
|
|
64
65
|
}
|
|
66
|
+
class QueueRunner {
|
|
67
|
+
kind;
|
|
68
|
+
timeoutId;
|
|
69
|
+
inProgress;
|
|
70
|
+
streamId;
|
|
71
|
+
checkStartTicking;
|
|
72
|
+
logError;
|
|
73
|
+
tag;
|
|
74
|
+
constructor(kind) {
|
|
75
|
+
this.kind = kind;
|
|
76
|
+
}
|
|
77
|
+
toString() {
|
|
78
|
+
return `${this.kind}${this.tag ? ` ${this.tag}` : ''}${this.streamId ? ` ${this.streamId}` : ''}`;
|
|
79
|
+
}
|
|
80
|
+
run(promise, streamId, tag) {
|
|
81
|
+
this.tag = tag;
|
|
82
|
+
this.inProgress = promise;
|
|
83
|
+
this.streamId = streamId;
|
|
84
|
+
this.inProgress
|
|
85
|
+
.catch((e) => this.logError?.(`ProcessTick ${this.kind} Error`, e))
|
|
86
|
+
.finally(() => {
|
|
87
|
+
this.timeoutId = undefined;
|
|
88
|
+
this.inProgress = undefined;
|
|
89
|
+
this.streamId = undefined;
|
|
90
|
+
this.tag = undefined;
|
|
91
|
+
setTimeout(() => this.checkStartTicking?.());
|
|
92
|
+
});
|
|
93
|
+
}
|
|
94
|
+
async stop() {
|
|
95
|
+
if (this.timeoutId) {
|
|
96
|
+
clearTimeout(this.timeoutId);
|
|
97
|
+
this.timeoutId = undefined;
|
|
98
|
+
}
|
|
99
|
+
if (this.inProgress) {
|
|
100
|
+
try {
|
|
101
|
+
await this.inProgress;
|
|
102
|
+
}
|
|
103
|
+
catch (e) {
|
|
104
|
+
this.logError?.(`ProcessTick Error while stopping ${this.kind}`, e);
|
|
105
|
+
}
|
|
106
|
+
finally {
|
|
107
|
+
this.inProgress = undefined;
|
|
108
|
+
}
|
|
109
|
+
}
|
|
110
|
+
}
|
|
111
|
+
}
|
|
65
112
|
/**
|
|
66
113
|
*
|
|
67
114
|
* Responsibilities:
|
|
@@ -90,17 +137,27 @@ export class BaseDecryptionExtensions {
|
|
|
90
137
|
ephemeralKeySolicitations: new Array(),
|
|
91
138
|
};
|
|
92
139
|
streamQueues = new StreamQueues();
|
|
140
|
+
mainQueueRunners = {
|
|
141
|
+
priority: new QueueRunner('priority'),
|
|
142
|
+
newGroupSessions: new QueueRunner('newGroupSession'),
|
|
143
|
+
ownKeySolicitations: new QueueRunner('ownKeySolicitations'),
|
|
144
|
+
ephemeralKeySolicitations: new QueueRunner('ephemeralKeySolicitations'),
|
|
145
|
+
};
|
|
146
|
+
streamQueueRunners = [
|
|
147
|
+
new QueueRunner('stream1'),
|
|
148
|
+
new QueueRunner('stream2'),
|
|
149
|
+
new QueueRunner('stream3'),
|
|
150
|
+
];
|
|
151
|
+
allQueueRunners = [...Object.values(this.mainQueueRunners), ...this.streamQueueRunners];
|
|
93
152
|
upToDateStreams = new Set();
|
|
94
153
|
highPriorityIds = new Set();
|
|
95
154
|
recentStreamIds = [];
|
|
96
155
|
decryptionFailures = {}; // streamId: sessionId: EncryptedContentItem[]
|
|
97
156
|
ownEphemeralSolicitations = new Map(); // key: streamId, value: array of solicitations
|
|
98
|
-
inProgressTick;
|
|
99
|
-
timeoutId;
|
|
100
|
-
delayMs = 1;
|
|
101
157
|
started = false;
|
|
102
158
|
numRecentStreamIds = 5;
|
|
103
159
|
emitter;
|
|
160
|
+
checkStartTimeoutId;
|
|
104
161
|
_onStopFn;
|
|
105
162
|
log;
|
|
106
163
|
crypto;
|
|
@@ -125,6 +182,11 @@ export class BaseDecryptionExtensions {
|
|
|
125
182
|
error: dlogError('csb:decryption:error').extend(logId),
|
|
126
183
|
};
|
|
127
184
|
this.log.debug('new DecryptionExtensions', { userDevice });
|
|
185
|
+
// initialize the queue runners
|
|
186
|
+
for (const queueRunner of this.allQueueRunners) {
|
|
187
|
+
queueRunner.logError = this.log.error;
|
|
188
|
+
queueRunner.checkStartTicking = () => this.checkStartTicking();
|
|
189
|
+
}
|
|
128
190
|
}
|
|
129
191
|
enqueueNewGroupSessions(sessions, _senderId) {
|
|
130
192
|
this.log.debug('enqueueNewGroupSessions', sessions);
|
|
@@ -294,7 +356,6 @@ export class BaseDecryptionExtensions {
|
|
|
294
356
|
lastPrintedAt = 0;
|
|
295
357
|
checkStartTicking() {
|
|
296
358
|
if (!this.started ||
|
|
297
|
-
this.timeoutId ||
|
|
298
359
|
!this._onStopFn ||
|
|
299
360
|
!this.isUserInboxStreamUpToDate(this.upToDateStreams) ||
|
|
300
361
|
this.shouldPauseTicking()) {
|
|
@@ -302,17 +363,19 @@ export class BaseDecryptionExtensions {
|
|
|
302
363
|
}
|
|
303
364
|
if (!Object.values(this.mainQueues).find((q) => q.length > 0) &&
|
|
304
365
|
this.streamQueues.isEmpty()) {
|
|
366
|
+
this.log.debug('no more work to do, setting status to done');
|
|
305
367
|
this.setStatus(DecryptionStatus.done);
|
|
306
368
|
return;
|
|
307
369
|
}
|
|
308
|
-
|
|
370
|
+
const streamIds = this.streamQueues
|
|
371
|
+
.getStreamIds()
|
|
372
|
+
.filter((x) => !this.streamQueues.getQueue(x).isEmpty())
|
|
373
|
+
.sort((a, b) => this.compareStreamIds(a, b));
|
|
374
|
+
const logDebugInfo = Date.now() - this.lastPrintedAt > 30000;
|
|
375
|
+
if (logDebugInfo) {
|
|
309
376
|
this.log.info(`status: ${this.status} queues: ${Object.entries(this.mainQueues)
|
|
310
377
|
.map(([key, q]) => `${key}: ${q.length}`)
|
|
311
378
|
.join(', ')} ${this.streamQueues.toString()}`);
|
|
312
|
-
const streamIds = Array.from(this.streamQueues.streams.entries())
|
|
313
|
-
.filter(([_, value]) => !value.isEmpty())
|
|
314
|
-
.map(([key, _]) => key)
|
|
315
|
-
.sort((a, b) => this.compareStreamIds(a, b));
|
|
316
379
|
const first4Priority = streamIds
|
|
317
380
|
.filter((x) => this.upToDateStreams.has(x))
|
|
318
381
|
.slice(0, 4)
|
|
@@ -326,84 +389,98 @@ export class BaseDecryptionExtensions {
|
|
|
326
389
|
}
|
|
327
390
|
this.lastPrintedAt = Date.now();
|
|
328
391
|
}
|
|
329
|
-
this.
|
|
330
|
-
|
|
331
|
-
this.
|
|
332
|
-
|
|
333
|
-
.
|
|
334
|
-
this.timeoutId = undefined;
|
|
335
|
-
setTimeout(() => this.checkStartTicking());
|
|
336
|
-
});
|
|
337
|
-
}, this.getDelayMs());
|
|
338
|
-
}
|
|
339
|
-
async stopTicking() {
|
|
340
|
-
if (this.timeoutId) {
|
|
341
|
-
clearTimeout(this.timeoutId);
|
|
342
|
-
this.timeoutId = undefined;
|
|
343
|
-
}
|
|
344
|
-
if (this.inProgressTick) {
|
|
345
|
-
try {
|
|
346
|
-
await this.inProgressTick;
|
|
347
|
-
}
|
|
348
|
-
catch (e) {
|
|
349
|
-
this.log.error('ProcessTick Error while stopping', e);
|
|
350
|
-
}
|
|
351
|
-
finally {
|
|
352
|
-
this.inProgressTick = undefined;
|
|
392
|
+
this.tick(streamIds);
|
|
393
|
+
if (logDebugInfo) {
|
|
394
|
+
const runners = this.allQueueRunners.filter((x) => isDefined(x.inProgress));
|
|
395
|
+
if (runners.length > 0) {
|
|
396
|
+
this.log.info(`runners: ${runners.map((x) => x.toString()).join(', ')}`);
|
|
353
397
|
}
|
|
354
398
|
}
|
|
399
|
+
// it's possible that we're not doing work, but we have more things to do but "respondAfter" hasn't been reached
|
|
400
|
+
clearTimeout(this.checkStartTimeoutId);
|
|
401
|
+
this.checkStartTimeoutId = setTimeout(() => {
|
|
402
|
+
this.checkStartTicking();
|
|
403
|
+
}, 100);
|
|
355
404
|
}
|
|
356
|
-
|
|
357
|
-
|
|
358
|
-
|
|
359
|
-
|
|
360
|
-
else {
|
|
361
|
-
return this.delayMs;
|
|
405
|
+
async stopTicking() {
|
|
406
|
+
clearTimeout(this.checkStartTimeoutId);
|
|
407
|
+
for (const queueRunner of this.allQueueRunners) {
|
|
408
|
+
await queueRunner.stop();
|
|
362
409
|
}
|
|
363
410
|
}
|
|
364
411
|
// just do one thing then return
|
|
365
|
-
tick() {
|
|
412
|
+
tick(streamIds) {
|
|
366
413
|
const now = Date.now();
|
|
414
|
+
// update the priority queue
|
|
415
|
+
if (this.mainQueueRunners.priority.inProgress) {
|
|
416
|
+
return; // if the main queue is in progress, don't do anything else
|
|
417
|
+
}
|
|
367
418
|
const priorityTask = this.mainQueues.priorityTasks.shift();
|
|
368
419
|
if (priorityTask) {
|
|
369
420
|
this.setStatus(DecryptionStatus.updating);
|
|
370
|
-
|
|
421
|
+
this.mainQueueRunners.priority.run(priorityTask());
|
|
422
|
+
return; // if the priority queue is in progress, don't do anything else
|
|
371
423
|
}
|
|
372
424
|
// update any new group sessions
|
|
425
|
+
if (this.mainQueueRunners.newGroupSessions.inProgress) {
|
|
426
|
+
return; // if the new group sessions queue is in progress, don't do anything else
|
|
427
|
+
}
|
|
373
428
|
const session = this.mainQueues.newGroupSession.shift();
|
|
374
429
|
if (session) {
|
|
375
430
|
this.setStatus(DecryptionStatus.working);
|
|
376
|
-
|
|
377
|
-
|
|
378
|
-
|
|
379
|
-
|
|
380
|
-
|
|
381
|
-
this.
|
|
382
|
-
|
|
431
|
+
this.mainQueueRunners.newGroupSessions.run(this.processNewGroupSession(session));
|
|
432
|
+
return; // if the new group sessions queue is in progress, don't do anything else
|
|
433
|
+
}
|
|
434
|
+
// run the rest of the processes in parallel
|
|
435
|
+
if (!this.mainQueueRunners.ownKeySolicitations.inProgress) {
|
|
436
|
+
const ownSolicitation = this.mainQueues.ownKeySolicitations.shift();
|
|
437
|
+
if (ownSolicitation) {
|
|
438
|
+
this.log.debug(' processing own key solicitation');
|
|
439
|
+
this.setStatus(DecryptionStatus.working);
|
|
440
|
+
this.mainQueueRunners.ownKeySolicitations.run(this.processKeySolicitation(ownSolicitation));
|
|
441
|
+
}
|
|
383
442
|
}
|
|
384
|
-
this.
|
|
385
|
-
|
|
386
|
-
|
|
387
|
-
|
|
388
|
-
|
|
389
|
-
|
|
443
|
+
if (!this.mainQueueRunners.ephemeralKeySolicitations.inProgress) {
|
|
444
|
+
if (this.mainQueues.ephemeralKeySolicitations.length > 0) {
|
|
445
|
+
this.mainQueues.ephemeralKeySolicitations.sort((a, b) => a.respondAfter - b.respondAfter);
|
|
446
|
+
const ephemeralSolicitation = dequeueUpToDate(this.mainQueues.ephemeralKeySolicitations, now, (x) => x.respondAfter, this.upToDateStreams);
|
|
447
|
+
if (ephemeralSolicitation) {
|
|
448
|
+
this.log.debug(' processing ephemeral key solicitation');
|
|
449
|
+
this.setStatus(DecryptionStatus.working);
|
|
450
|
+
this.mainQueueRunners.ephemeralKeySolicitations.run(this.processKeySolicitation(ephemeralSolicitation));
|
|
451
|
+
}
|
|
452
|
+
}
|
|
390
453
|
}
|
|
391
|
-
|
|
392
|
-
|
|
454
|
+
// grab open stream queues
|
|
455
|
+
const openRunners = this.streamQueueRunners.filter((x) => !x.inProgress);
|
|
456
|
+
const inProgressStreamIds = this.streamQueueRunners.map((x) => x.streamId).filter(isDefined);
|
|
393
457
|
for (const streamId of streamIds) {
|
|
394
|
-
if (
|
|
458
|
+
if (openRunners.length === 0) {
|
|
459
|
+
return; // exit tick
|
|
460
|
+
}
|
|
461
|
+
if (inProgressStreamIds.includes(streamId)) {
|
|
395
462
|
continue;
|
|
396
463
|
}
|
|
397
464
|
const streamQueue = this.streamQueues.getQueue(streamId);
|
|
398
465
|
const encryptedContent = streamQueue.encryptedContent.shift();
|
|
399
466
|
if (encryptedContent) {
|
|
400
467
|
this.setStatus(DecryptionStatus.working);
|
|
401
|
-
|
|
468
|
+
const runner = openRunners.shift();
|
|
469
|
+
runner.run(this.processEncryptedContentItem(encryptedContent), streamId, 'decrypting');
|
|
470
|
+
continue;
|
|
471
|
+
}
|
|
472
|
+
// if the stream is not up to date, don't move forward
|
|
473
|
+
// it might be useful to post key solicitations, but without knowing the
|
|
474
|
+
// state of the stream it's not a good idea
|
|
475
|
+
if (!this.upToDateStreams.has(streamId)) {
|
|
476
|
+
continue;
|
|
402
477
|
}
|
|
403
478
|
if (streamQueue.isMissingKeys) {
|
|
404
479
|
this.setStatus(DecryptionStatus.working);
|
|
405
480
|
streamQueue.isMissingKeys = false;
|
|
406
|
-
|
|
481
|
+
const runner = openRunners.shift();
|
|
482
|
+
runner.run(this.processMissingKeys(streamId), streamId, 'missingKeys');
|
|
483
|
+
continue;
|
|
407
484
|
}
|
|
408
485
|
if (streamQueue.keySolicitationsNeedsSort) {
|
|
409
486
|
streamQueue.sortKeySolicitations();
|
|
@@ -411,11 +488,14 @@ export class BaseDecryptionExtensions {
|
|
|
411
488
|
const keySolicitation = dequeueUpToDate(streamQueue.keySolicitations, now, (x) => x.respondAfter, this.upToDateStreams);
|
|
412
489
|
if (keySolicitation) {
|
|
413
490
|
this.setStatus(DecryptionStatus.working);
|
|
414
|
-
|
|
491
|
+
const runner = openRunners.shift();
|
|
492
|
+
runner.run(this.processKeySolicitation(keySolicitation), streamId, 'keySolicitation');
|
|
493
|
+
continue;
|
|
415
494
|
}
|
|
416
495
|
}
|
|
417
|
-
this.
|
|
418
|
-
|
|
496
|
+
if (this.allQueueRunners.every((x) => !x.inProgress)) {
|
|
497
|
+
this.setStatus(DecryptionStatus.idle);
|
|
498
|
+
}
|
|
419
499
|
}
|
|
420
500
|
/**
|
|
421
501
|
* processNewGroupSession
|
|
@@ -495,6 +575,7 @@ export class BaseDecryptionExtensions {
|
|
|
495
575
|
await this.decryptGroupEvent(item.streamId, item.eventId, item.kind, item.encryptedData);
|
|
496
576
|
}
|
|
497
577
|
catch (err) {
|
|
578
|
+
this.log.debug('processEncryptedContentItem error', err, 'item:', item);
|
|
498
579
|
const sessionNotFound = isSessionNotFoundError(err);
|
|
499
580
|
this.onDecryptionError(item, {
|
|
500
581
|
missingSession: sessionNotFound,
|
|
@@ -528,7 +609,7 @@ export class BaseDecryptionExtensions {
|
|
|
528
609
|
streamQueue.isMissingKeys = true;
|
|
529
610
|
}
|
|
530
611
|
else {
|
|
531
|
-
this.log.info('failed to decrypt', err, 'streamId', item.streamId);
|
|
612
|
+
this.log.info('failed to decrypt', err, 'eventId', item.eventId, 'streamId', item.streamId);
|
|
532
613
|
}
|
|
533
614
|
}
|
|
534
615
|
}
|
|
@@ -698,6 +779,9 @@ export class BaseDecryptionExtensions {
|
|
|
698
779
|
const streamQueue = this.mainQueues;
|
|
699
780
|
// Remove solicitations that are completely fulfilled
|
|
700
781
|
streamQueue.ephemeralKeySolicitations = streamQueue.ephemeralKeySolicitations.filter((solicitation) => {
|
|
782
|
+
if (solicitation.solicitation.deviceKey !== event.deviceKey) {
|
|
783
|
+
return true; // not the same device, keep it
|
|
784
|
+
}
|
|
701
785
|
// Check if all requested sessions are fulfilled by this fulfillment
|
|
702
786
|
const remainingSessionIds = solicitation.solicitation.sessionIds.filter((id) => !event.sessionIds.includes(id));
|
|
703
787
|
if (remainingSessionIds.length === 0) {
|
|
@@ -708,7 +792,7 @@ export class BaseDecryptionExtensions {
|
|
|
708
792
|
else {
|
|
709
793
|
// Update with remaining session IDs
|
|
710
794
|
solicitation.solicitation.sessionIds = remainingSessionIds;
|
|
711
|
-
this.log.debug('partially fulfilled ephemeral solicitation', event.streamId, solicitation.fromUserId, 'remaining:', remainingSessionIds.length);
|
|
795
|
+
this.log.debug('partially fulfilled ephemeral solicitation', event.streamId, solicitation.fromUserId, 'remaining:', remainingSessionIds.length, 'respondingIn', Date.now() - solicitation.respondAfter);
|
|
712
796
|
return true;
|
|
713
797
|
}
|
|
714
798
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"decryptionExtensions.js","sourceRoot":"","sources":["../src/decryptionExtensions.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"decryptionExtensions.js","sourceRoot":"","sources":["../src/decryptionExtensions.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,7 +21,7 @@ describe('ClientDecryptionExtensions', () => {
|
|
|
21
21
|
};
|
|
22
22
|
const sendMessage = async (client, streamId, body) => {
|
|
23
23
|
await client.waitForStream(streamId);
|
|
24
|
-
await client.sendMessage(streamId, body);
|
|
24
|
+
return await client.sendMessage(streamId, body);
|
|
25
25
|
};
|
|
26
26
|
const getDecryptedChannelMessages = (stream) => {
|
|
27
27
|
return stream.view.timeline
|
|
@@ -148,14 +148,16 @@ describe('ClientDecryptionExtensions', () => {
|
|
|
148
148
|
const channel2StreamId = makeUniqueChannelStreamId(spaceId);
|
|
149
149
|
await bob1.createChannel(spaceId, 'channel1', '', channel1StreamId);
|
|
150
150
|
await bob1.createChannel(spaceId, 'channel2', '', channel2StreamId);
|
|
151
|
-
await sendMessage(bob1, channel1StreamId, 'hello channel 1');
|
|
152
|
-
|
|
151
|
+
const event1 = await sendMessage(bob1, channel1StreamId, 'hello channel 1');
|
|
152
|
+
log('hello channel 1 eventId', event1.eventId);
|
|
153
|
+
const event2 = await sendMessage(bob1, channel2StreamId, 'hello channel 2');
|
|
154
|
+
log('hello channel 2 eventId', event2.eventId);
|
|
153
155
|
await expect(alice1.joinStream(spaceId)).resolves.not.toThrow();
|
|
154
156
|
await expect(alice1.joinStream(channel1StreamId)).resolves.not.toThrow();
|
|
155
157
|
await expect(alice1.joinStream(channel2StreamId)).resolves.not.toThrow();
|
|
156
158
|
// wait for the message to arrive and decrypt
|
|
157
|
-
await expect(waitForMessages(alice1, channel1StreamId, ['hello channel 1'])).resolves.not.toThrow();
|
|
158
|
-
await expect(waitForMessages(alice1, channel2StreamId, ['hello channel 2'])).resolves.not.toThrow();
|
|
159
|
+
await expect(waitForMessages(alice1, channel1StreamId, ['hello channel 1']), `waiting for ${event1.eventId}`).resolves.not.toThrow();
|
|
160
|
+
await expect(waitForMessages(alice1, channel2StreamId, ['hello channel 2']), `waiting for ${event2.eventId}`).resolves.not.toThrow();
|
|
159
161
|
// stop bob to simplify test
|
|
160
162
|
await bob1.stop();
|
|
161
163
|
// boot up alice on a second device
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"clientDecryptionExtensions.test.js","sourceRoot":"","sources":["../../../src/tests/multi_ne/clientDecryptionExtensions.test.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAA;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AACvC,OAAO,EAAkB,cAAc,EAAE,uBAAuB,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAG/F,OAAO,EAAE,yBAAyB,EAAE,MAAM,UAAU,CAAA;AACpD,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AACnD,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAA;AAErE,MAAM,GAAG,GAAG,IAAI,CAAC,+BAA+B,CAAC,CAAA;AAEjD,QAAQ,CAAC,4BAA4B,EAAE,GAAG,EAAE;IACxC,IAAI,OAAO,GAAa,EAAE,CAAA;IAC1B,MAAM,kBAAkB,GAAG,KAAK,EAAE,IAAqB,EAAE,EAAE;QACvD,MAAM,MAAM,GAAG,MAAM,cAAc,CAAC,IAAI,CAAC,CAAA;QACzC,MAAM,MAAM,CAAC,cAAc,EAAE,CAAA;QAC7B,MAAM,CAAC,SAAS,EAAE,CAAA;QAClB,MAAM,OAAO,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAA;QAC7E,GAAG,CAAC,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,aAAa,CAAC,CAAA;QAC1D,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QACpB,OAAO,MAAM,CAAA;IACjB,CAAC,CAAA;IAED,MAAM,WAAW,GAAG,KAAK,EAAE,MAAc,EAAE,QAAgB,EAAE,IAAY,EAAE,EAAE;QACzE,MAAM,MAAM,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAA;QACpC,MAAM,MAAM,CAAC,WAAW,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"clientDecryptionExtensions.test.js","sourceRoot":"","sources":["../../../src/tests/multi_ne/clientDecryptionExtensions.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ import { RiverTimelineEvent } from '../models/timelineTypes';
|
|
|
3
3
|
import { check, dlogger } from '@towns-protocol/dlog';
|
|
4
4
|
const console = dlogger('csb:unreadMarkersTransform');
|
|
5
5
|
export function unreadMarkersTransform(value, prev, state) {
|
|
6
|
-
console.log('unreadMarkersTransform', value, prev, state)
|
|
6
|
+
//console.log('unreadMarkersTransform', value, prev, state)
|
|
7
7
|
state = state ?? { markers: {} };
|
|
8
8
|
const { userId, myRemoteFullyReadMarkers, timelinesView } = value;
|
|
9
9
|
for (const streamId of Object.keys(myRemoteFullyReadMarkers)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"unreadMarkersTransform.js","sourceRoot":"","sources":["../../../src/views/streams/unreadMarkersTransform.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAA;AACvF,OAAO,EAAE,kBAAkB,EAAiB,MAAM,yBAAyB,CAAA;AAC3E,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAA;AAErD,MAAM,OAAO,GAAG,OAAO,CAAC,4BAA4B,CAAC,CAAA;AAerD,MAAM,UAAU,sBAAsB,CAClC,KAAY,EACZ,IAAW,EACX,KAA0B;IAE1B,
|
|
1
|
+
{"version":3,"file":"unreadMarkersTransform.js","sourceRoot":"","sources":["../../../src/views/streams/unreadMarkersTransform.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@towns-protocol/sdk",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.268",
|
|
4
4
|
"packageManager": "yarn@3.8.0",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "dist/index.js",
|
|
@@ -30,13 +30,13 @@
|
|
|
30
30
|
"@ethereumjs/util": "^10.0.0",
|
|
31
31
|
"@noble/curves": "^1.9.1",
|
|
32
32
|
"@noble/hashes": "^1.8.0",
|
|
33
|
-
"@towns-protocol/dlog": "^0.0.
|
|
34
|
-
"@towns-protocol/encryption": "^0.0.
|
|
35
|
-
"@towns-protocol/generated": "^0.0.
|
|
36
|
-
"@towns-protocol/proto": "^0.0.
|
|
37
|
-
"@towns-protocol/rpc-connector": "^0.0.
|
|
38
|
-
"@towns-protocol/sdk-crypto": "^0.0.
|
|
39
|
-
"@towns-protocol/web3": "^0.0.
|
|
33
|
+
"@towns-protocol/dlog": "^0.0.268",
|
|
34
|
+
"@towns-protocol/encryption": "^0.0.268",
|
|
35
|
+
"@towns-protocol/generated": "^0.0.268",
|
|
36
|
+
"@towns-protocol/proto": "^0.0.268",
|
|
37
|
+
"@towns-protocol/rpc-connector": "^0.0.268",
|
|
38
|
+
"@towns-protocol/sdk-crypto": "^0.0.268",
|
|
39
|
+
"@towns-protocol/web3": "^0.0.268",
|
|
40
40
|
"debug": "^4.3.4",
|
|
41
41
|
"dexie": "^4.0.7",
|
|
42
42
|
"ethereum-cryptography": "^3.2.0",
|
|
@@ -69,5 +69,5 @@
|
|
|
69
69
|
"files": [
|
|
70
70
|
"/dist"
|
|
71
71
|
],
|
|
72
|
-
"gitHead": "
|
|
72
|
+
"gitHead": "d12c8e4e93c7cbfffa729e0a71a296e5528df977"
|
|
73
73
|
}
|