@open-e2ee/signal-protocol-sdk 8.0.0 → 8.2.0
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/ADAPTERS.md +2 -2
- package/CHANGELOG.md +188 -0
- package/README.md +4 -4
- package/SECURITY.md +2 -2
- package/device/README.md +16 -7
- package/dist/client/client.d.ts +4 -2
- package/dist/client/client.d.ts.map +1 -1
- package/dist/client/client.js +25 -19
- package/dist/client/client.js.map +1 -1
- package/dist/client/group-outbox.d.ts +31 -1
- package/dist/client/group-outbox.d.ts.map +1 -1
- package/dist/client/group-outbox.js +67 -58
- package/dist/client/group-outbox.js.map +1 -1
- package/dist/client/hosted-anonymous-delivery.d.ts +9 -1
- package/dist/client/hosted-anonymous-delivery.d.ts.map +1 -1
- package/dist/client/hosted-anonymous-delivery.js +61 -22
- package/dist/client/hosted-anonymous-delivery.js.map +1 -1
- package/dist/client/hosted-transport.d.ts +16 -0
- package/dist/client/hosted-transport.d.ts.map +1 -1
- package/dist/client/hosted-transport.js +93 -19
- package/dist/client/hosted-transport.js.map +1 -1
- package/dist/client/key-rotation.d.ts.map +1 -1
- package/dist/client/key-rotation.js +2 -4
- package/dist/client/key-rotation.js.map +1 -1
- package/dist/client/prekeys.d.ts.map +1 -1
- package/dist/client/prekeys.js +1 -1
- package/dist/client/prekeys.js.map +1 -1
- package/dist/client/relay-device-refusal.d.ts +32 -0
- package/dist/client/relay-device-refusal.d.ts.map +1 -0
- package/dist/client/relay-device-refusal.js +36 -0
- package/dist/client/relay-device-refusal.js.map +1 -0
- package/dist/client/relay-work.d.ts +26 -0
- package/dist/client/relay-work.d.ts.map +1 -1
- package/dist/client/relay-work.js +37 -0
- package/dist/client/relay-work.js.map +1 -1
- package/dist/client/sealed-sender.d.ts.map +1 -1
- package/dist/client/sealed-sender.js +12 -17
- package/dist/client/sealed-sender.js.map +1 -1
- package/dist/client/sessions.d.ts.map +1 -1
- package/dist/client/sessions.js +2 -4
- package/dist/client/sessions.js.map +1 -1
- package/dist/client/signal-service-cipher.d.ts +90 -4
- package/dist/client/signal-service-cipher.d.ts.map +1 -1
- package/dist/client/signal-service-cipher.js +425 -136
- package/dist/client/signal-service-cipher.js.map +1 -1
- package/dist/client/types.d.ts +7 -0
- package/dist/client/types.d.ts.map +1 -1
- package/dist/client/types.js.map +1 -1
- package/dist/internal/manager/manager.d.ts +8 -7
- package/dist/internal/manager/manager.d.ts.map +1 -1
- package/dist/internal/manager/manager.js +34 -36
- package/dist/internal/manager/manager.js.map +1 -1
- package/dist/internal/protocol/spqr/index.d.ts +1 -1
- package/dist/internal/protocol/spqr/index.d.ts.map +1 -1
- package/dist/internal/protocol/spqr/index.js +2 -2
- package/dist/internal/protocol/spqr/index.js.map +1 -1
- package/dist/internal/protocol/spqr/ml-kem-braid/rs/codec.d.ts.map +1 -1
- package/dist/internal/protocol/spqr/ml-kem-braid/rs/codec.js +1 -3
- package/dist/internal/protocol/spqr/ml-kem-braid/rs/codec.js.map +1 -1
- package/dist/internal/protocol/spqr/serialize.d.ts.map +1 -1
- package/dist/internal/protocol/spqr/serialize.js +1 -4
- package/dist/internal/protocol/spqr/serialize.js.map +1 -1
- package/dist/internal/protocol/spqr/spqr.d.ts.map +1 -1
- package/dist/internal/protocol/spqr/spqr.js +1 -2
- package/dist/internal/protocol/spqr/spqr.js.map +1 -1
- package/dist/internal/protocol/zk/credentials/attributes.d.ts.map +1 -1
- package/dist/internal/protocol/zk/credentials/attributes.js +2 -1
- package/dist/internal/protocol/zk/credentials/attributes.js.map +1 -1
- package/dist/internal/protocol/zk/credentials/credentials.d.ts.map +1 -1
- package/dist/internal/protocol/zk/credentials/credentials.js +8 -6
- package/dist/internal/protocol/zk/credentials/credentials.js.map +1 -1
- package/dist/internal/protocol/zk/credentials/presentation.d.ts.map +1 -1
- package/dist/internal/protocol/zk/credentials/presentation.js +19 -13
- package/dist/internal/protocol/zk/credentials/presentation.js.map +1 -1
- package/dist/internal/protocol/zk/groups/lizard.d.ts +8 -0
- package/dist/internal/protocol/zk/groups/lizard.d.ts.map +1 -1
- package/dist/internal/protocol/zk/groups/lizard.js +18 -5
- package/dist/internal/protocol/zk/groups/lizard.js.map +1 -1
- package/dist/internal/protocol/zk/groups/profile-key-commitment.d.ts.map +1 -1
- package/dist/internal/protocol/zk/groups/profile-key-commitment.js +7 -6
- package/dist/internal/protocol/zk/groups/profile-key-commitment.js.map +1 -1
- package/dist/internal/protocol/zk/groups/profile-key-encryption.d.ts.map +1 -1
- package/dist/internal/protocol/zk/groups/profile-key-encryption.js +3 -2
- package/dist/internal/protocol/zk/groups/profile-key-encryption.js.map +1 -1
- package/dist/internal/protocol/zk/groups/uid-encryption.d.ts.map +1 -1
- package/dist/internal/protocol/zk/groups/uid-encryption.js +3 -2
- package/dist/internal/protocol/zk/groups/uid-encryption.js.map +1 -1
- package/dist/internal/protocol/zk/proofs/point-multiplication.d.ts +53 -0
- package/dist/internal/protocol/zk/proofs/point-multiplication.d.ts.map +1 -0
- package/dist/internal/protocol/zk/proofs/point-multiplication.js +164 -0
- package/dist/internal/protocol/zk/proofs/point-multiplication.js.map +1 -0
- package/dist/internal/protocol/zk/proofs/sho.d.ts +1 -0
- package/dist/internal/protocol/zk/proofs/sho.d.ts.map +1 -1
- package/dist/internal/protocol/zk/proofs/sho.js.map +1 -1
- package/dist/internal/protocol/zk/proofs/statement.d.ts.map +1 -1
- package/dist/internal/protocol/zk/proofs/statement.js +11 -11
- package/dist/internal/protocol/zk/proofs/statement.js.map +1 -1
- package/dist/internal/sesame/device-registry.d.ts +24 -4
- package/dist/internal/sesame/device-registry.d.ts.map +1 -1
- package/dist/internal/sesame/device-registry.js +55 -28
- package/dist/internal/sesame/device-registry.js.map +1 -1
- package/dist/internal/sesame/manager.d.ts +79 -11
- package/dist/internal/sesame/manager.d.ts.map +1 -1
- package/dist/internal/sesame/manager.js +381 -280
- package/dist/internal/sesame/manager.js.map +1 -1
- package/dist/internal/session/cipher.d.ts +0 -5
- package/dist/internal/session/cipher.d.ts.map +1 -1
- package/dist/internal/session/cipher.js +3 -9
- package/dist/internal/session/cipher.js.map +1 -1
- package/dist/internal/session/record-locks.d.ts +46 -0
- package/dist/internal/session/record-locks.d.ts.map +1 -0
- package/dist/internal/session/record-locks.js +72 -0
- package/dist/internal/session/record-locks.js.map +1 -0
- package/dist/local/store/expo/adapter.d.ts +8 -2
- package/dist/local/store/expo/adapter.d.ts.map +1 -1
- package/dist/local/store/expo/adapter.js +24 -3
- package/dist/local/store/expo/adapter.js.map +1 -1
- package/dist/local/store/expo/driver.d.ts +7 -0
- package/dist/local/store/expo/driver.d.ts.map +1 -1
- package/dist/local/store/expo/driver.js +16 -0
- package/dist/local/store/expo/driver.js.map +1 -1
- package/dist/local/store/index.d.ts +2 -2
- package/dist/local/store/index.js +2 -2
- package/dist/local/store/key-value/adapter.d.ts.map +1 -1
- package/dist/local/store/key-value/adapter.js +61 -38
- package/dist/local/store/key-value/adapter.js.map +1 -1
- package/dist/local/store/memory/adapter.d.ts +10 -0
- package/dist/local/store/memory/adapter.d.ts.map +1 -1
- package/dist/local/store/memory/adapter.js +79 -55
- package/dist/local/store/memory/adapter.js.map +1 -1
- package/dist/local/store/reliability.d.ts +16 -0
- package/dist/local/store/reliability.d.ts.map +1 -1
- package/dist/local/store/reliability.js +58 -28
- package/dist/local/store/reliability.js.map +1 -1
- package/dist/local/store/sqlite/store.d.ts.map +1 -1
- package/dist/local/store/sqlite/store.js +36 -14
- package/dist/local/store/sqlite/store.js.map +1 -1
- package/dist/local/store/sqlite/web/driver.d.ts.map +1 -1
- package/dist/local/store/sqlite/web/driver.js +3 -1
- package/dist/local/store/sqlite/web/driver.js.map +1 -1
- package/dist/local/store/sqlite/web/protocol.d.ts +1 -1
- package/dist/local/store/sqlite/web/protocol.d.ts.map +1 -1
- package/dist/local/store/sqlite/web/worker.d.ts +7 -4
- package/dist/local/store/sqlite/web/worker.d.ts.map +1 -1
- package/dist/local/store/sqlite/web/worker.js +48 -18
- package/dist/local/store/sqlite/web/worker.js.map +1 -1
- package/dist/local/store/web/adapter.d.ts.map +1 -1
- package/dist/local/store/web/adapter.js +63 -53
- package/dist/local/store/web/adapter.js.map +1 -1
- package/dist/local/store/web-sqlite/adapter.d.ts +3 -0
- package/dist/local/store/web-sqlite/adapter.d.ts.map +1 -1
- package/dist/local/store/web-sqlite/adapter.js +3 -0
- package/dist/local/store/web-sqlite/adapter.js.map +1 -1
- package/dist/local/vault/electron-safe-storage.d.ts.map +1 -1
- package/dist/local/vault/electron-safe-storage.js +15 -2
- package/dist/local/vault/electron-safe-storage.js.map +1 -1
- package/dist/profile/index.d.ts +2 -1
- package/dist/profile/index.d.ts.map +1 -1
- package/dist/profile/index.js +2 -1
- package/dist/profile/index.js.map +1 -1
- package/dist/profile/own-profile-key.d.ts +42 -0
- package/dist/profile/own-profile-key.d.ts.map +1 -0
- package/dist/profile/own-profile-key.js +64 -0
- package/dist/profile/own-profile-key.js.map +1 -0
- package/dist/profile/profile-key.d.ts +1 -34
- package/dist/profile/profile-key.d.ts.map +1 -1
- package/dist/profile/profile-key.js +3 -63
- package/dist/profile/profile-key.js.map +1 -1
- package/dist/profile/update-service.js +1 -1
- package/dist/profile/update-service.js.map +1 -1
- package/dist/remote/relay/memory/adapter.d.ts.map +1 -1
- package/dist/remote/relay/memory/adapter.js +3 -4
- package/dist/remote/relay/memory/adapter.js.map +1 -1
- package/dist/username/link.d.ts.map +1 -1
- package/dist/username/link.js +1 -5
- package/dist/username/link.js.map +1 -1
- package/dist/utils/bounded-fan-out.d.ts +99 -0
- package/dist/utils/bounded-fan-out.d.ts.map +1 -0
- package/dist/utils/bounded-fan-out.js +180 -0
- package/dist/utils/bounded-fan-out.js.map +1 -0
- package/dist/utils/keyed-lock.d.ts +16 -0
- package/dist/utils/keyed-lock.d.ts.map +1 -0
- package/dist/utils/keyed-lock.js +39 -0
- package/dist/utils/keyed-lock.js.map +1 -0
- package/docs/ASSURANCE.md +68 -24
- package/docs/DEVIATIONS.md +21 -2
- package/docs/ERROR_HANDLING.md +1 -1
- package/docs/PACKAGE_SURFACE.md +3 -1
- package/examples/browser/index.html +1 -1
- package/hooks/README.md +11 -2
- package/local/store/README.md +41 -21
- package/local/store/expo/README.md +18 -5
- package/local/store/key-value/README.md +5 -3
- package/local/store/node/README.md +2 -1
- package/local/store/web/README.md +5 -0
- package/local/store/web-sqlite/README.md +36 -8
- package/local/vault/README.md +21 -2
- package/package.json +1 -1
- package/remote/object-store/convex-r2/README.md +10 -0
|
@@ -0,0 +1,164 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Constant-time scalar multiplication for the proof engine
|
|
3
|
+
*
|
|
4
|
+
* A proof calculates sums of products `s_1*P_1 + ... + s_n*P_n`, and a
|
|
5
|
+
* scalar can be secret: a proof nonce, a witness, or a server key. One
|
|
6
|
+
* multiscalar multiplication calculates such a sum with two methods:
|
|
7
|
+
*
|
|
8
|
+
* - A generator table. A constant generator keeps a table of its multiples
|
|
9
|
+
* for each window of the scalar, so a product on it needs no doublings. The
|
|
10
|
+
* generator also keeps its encoding, which a proof transcript reads.
|
|
11
|
+
* - Straus's method for the other points. Their products share one series of
|
|
12
|
+
* doublings.
|
|
13
|
+
*
|
|
14
|
+
* Both methods are constant time in the same way as noble's `fixedWindowCT`,
|
|
15
|
+
* which `multiply` uses for a point without a table: the sequence of point
|
|
16
|
+
* operations does not depend on the scalars, no array index is a scalar
|
|
17
|
+
* digit, and the select of a table entry reads all of the table. They do not
|
|
18
|
+
* use noble's precomputed tables: that path branches on each digit to add to
|
|
19
|
+
* a real or a fake sum.
|
|
20
|
+
*/
|
|
21
|
+
import { RistrettoPoint } from './sho.js';
|
|
22
|
+
/** The stored encoding of each constant generator, and of the base point. */
|
|
23
|
+
const generatorEncodings = new WeakMap([
|
|
24
|
+
[RistrettoPoint.BASE, RistrettoPoint.BASE.toBytes()],
|
|
25
|
+
]);
|
|
26
|
+
/**
|
|
27
|
+
* The table of each constant generator, and of the base point. The value is
|
|
28
|
+
* null until the first multiplication builds the table.
|
|
29
|
+
*/
|
|
30
|
+
const generatorTables = new WeakMap([
|
|
31
|
+
[RistrettoPoint.BASE, null],
|
|
32
|
+
]);
|
|
33
|
+
/** Bits of the largest scalar, which is the group order minus 1. */
|
|
34
|
+
const SCALAR_BITS = RistrettoPoint.Fn.ORDER.toString(2).length;
|
|
35
|
+
/** Bits of scalar that one window of a generator table reads. */
|
|
36
|
+
const GENERATOR_WINDOW = 5;
|
|
37
|
+
const GENERATOR_TABLE_SIZE = 1 << GENERATOR_WINDOW;
|
|
38
|
+
const GENERATOR_DIGIT_MASK = BigInt(GENERATOR_TABLE_SIZE - 1);
|
|
39
|
+
/** 51 windows of 5 bits read 255 bits, which include each scalar below the group order. */
|
|
40
|
+
const GENERATOR_WINDOWS = Math.ceil(SCALAR_BITS / GENERATOR_WINDOW);
|
|
41
|
+
/** Bits of scalar that one window of Straus's method reads. */
|
|
42
|
+
const MULTISCALAR_WINDOW = 4;
|
|
43
|
+
const MULTISCALAR_TABLE_SIZE = 1 << MULTISCALAR_WINDOW;
|
|
44
|
+
const MULTISCALAR_DIGIT_MASK = BigInt(MULTISCALAR_TABLE_SIZE - 1);
|
|
45
|
+
/** 64 windows of 4 bits read 256 bits, which include each scalar below the group order. */
|
|
46
|
+
const MULTISCALAR_WINDOWS = Math.ceil(SCALAR_BITS / MULTISCALAR_WINDOW);
|
|
47
|
+
/**
|
|
48
|
+
* Give a constant generator, such as a system parameter, a table and a stored
|
|
49
|
+
* encoding. Use it only for a point that stays in use for the life of the
|
|
50
|
+
* process. The first multiplication on the point builds its table, which
|
|
51
|
+
* holds 51 x 32 points, about 0.5 MB of heap in Node. After that, a product
|
|
52
|
+
* on the point costs about a fifth of an untabled product.
|
|
53
|
+
*
|
|
54
|
+
* @returns The same point.
|
|
55
|
+
*/
|
|
56
|
+
export function withGeneratorTable(point) {
|
|
57
|
+
generatorEncodings.set(point, point.toBytes());
|
|
58
|
+
if (!generatorTables.has(point))
|
|
59
|
+
generatorTables.set(point, null);
|
|
60
|
+
return point;
|
|
61
|
+
}
|
|
62
|
+
/**
|
|
63
|
+
* Encode `point` as 32 bytes. A generator gives a copy of its stored encoding.
|
|
64
|
+
* Other points calculate their encoding.
|
|
65
|
+
*/
|
|
66
|
+
export function encodePoint(point) {
|
|
67
|
+
return generatorEncodings.get(point)?.slice() ?? point.toBytes();
|
|
68
|
+
}
|
|
69
|
+
/**
|
|
70
|
+
* Calculate `scalars[0]*points[0] + ... + scalars[n-1]*points[n-1]` in constant time.
|
|
71
|
+
*
|
|
72
|
+
* A point with a generator table adds one table entry for each 5-bit window
|
|
73
|
+
* of its scalar. The other points use Straus's method with fixed 4-bit
|
|
74
|
+
* windows: each point gets a table of its multiples 0 to 15, and for each
|
|
75
|
+
* window, from the most significant, the sum doubles 4 times, then adds one
|
|
76
|
+
* table entry for each point. An add occurs also for a zero digit.
|
|
77
|
+
*
|
|
78
|
+
* Each scalar must be in the range 1 to the group order minus 1, the same
|
|
79
|
+
* range that `multiply` accepts.
|
|
80
|
+
*
|
|
81
|
+
* @throws RangeError when a scalar is out of range.
|
|
82
|
+
*/
|
|
83
|
+
export function multiscalarMultiply(scalars, points) {
|
|
84
|
+
if (scalars.length !== points.length) {
|
|
85
|
+
throw new Error('multiscalarMultiply: scalars and points differ in length');
|
|
86
|
+
}
|
|
87
|
+
for (const scalar of scalars) {
|
|
88
|
+
if (scalar < 1n || scalar >= RistrettoPoint.Fn.ORDER) {
|
|
89
|
+
throw new RangeError('invalid scalar: expected 1 <= sc < curve.n');
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
// The split depends only on the points, which are public.
|
|
93
|
+
let sum = RistrettoPoint.ZERO;
|
|
94
|
+
const otherScalars = [];
|
|
95
|
+
const otherPoints = [];
|
|
96
|
+
for (let j = 0; j < points.length; j++) {
|
|
97
|
+
const table = generatorTable(points[j]);
|
|
98
|
+
if (table === undefined) {
|
|
99
|
+
otherScalars.push(scalars[j]);
|
|
100
|
+
otherPoints.push(points[j]);
|
|
101
|
+
continue;
|
|
102
|
+
}
|
|
103
|
+
for (let window = 0; window < GENERATOR_WINDOWS; window++) {
|
|
104
|
+
const shift = BigInt(window * GENERATOR_WINDOW);
|
|
105
|
+
const digit = Number((scalars[j] >> shift) & GENERATOR_DIGIT_MASK);
|
|
106
|
+
sum = sum.add(selectEntry(table[window], digit));
|
|
107
|
+
}
|
|
108
|
+
}
|
|
109
|
+
if (otherPoints.length > 0)
|
|
110
|
+
sum = sum.add(strausMultiply(otherScalars, otherPoints));
|
|
111
|
+
return sum;
|
|
112
|
+
}
|
|
113
|
+
/** Give the table of a generator, and build it at the first use. */
|
|
114
|
+
function generatorTable(point) {
|
|
115
|
+
const table = generatorTables.get(point);
|
|
116
|
+
if (table !== null)
|
|
117
|
+
return table;
|
|
118
|
+
// Window w holds i * 32^w * point for i from 0 to 31.
|
|
119
|
+
const built = [];
|
|
120
|
+
let base = point;
|
|
121
|
+
for (let window = 0; window < GENERATOR_WINDOWS; window++) {
|
|
122
|
+
const entries = [RistrettoPoint.ZERO];
|
|
123
|
+
for (let i = 1; i < GENERATOR_TABLE_SIZE; i++)
|
|
124
|
+
entries.push(entries[i - 1].add(base));
|
|
125
|
+
built.push(entries);
|
|
126
|
+
base = entries[GENERATOR_TABLE_SIZE - 1].add(base);
|
|
127
|
+
}
|
|
128
|
+
generatorTables.set(point, built);
|
|
129
|
+
return built;
|
|
130
|
+
}
|
|
131
|
+
/** Straus's method with fixed 4-bit windows. */
|
|
132
|
+
function strausMultiply(scalars, points) {
|
|
133
|
+
const zero = RistrettoPoint.ZERO;
|
|
134
|
+
const tables = points.map((point) => {
|
|
135
|
+
const table = [zero];
|
|
136
|
+
for (let i = 1; i < MULTISCALAR_TABLE_SIZE; i++) {
|
|
137
|
+
table.push(table[i - 1].add(point));
|
|
138
|
+
}
|
|
139
|
+
return table;
|
|
140
|
+
});
|
|
141
|
+
let sum = zero;
|
|
142
|
+
for (let window = MULTISCALAR_WINDOWS - 1; window >= 0; window--) {
|
|
143
|
+
// The first window skips the doublings: the sum is still zero. The skip
|
|
144
|
+
// depends only on the loop index.
|
|
145
|
+
if (window !== MULTISCALAR_WINDOWS - 1) {
|
|
146
|
+
for (let d = 0; d < MULTISCALAR_WINDOW; d++)
|
|
147
|
+
sum = sum.double();
|
|
148
|
+
}
|
|
149
|
+
const shift = BigInt(window * MULTISCALAR_WINDOW);
|
|
150
|
+
for (let j = 0; j < tables.length; j++) {
|
|
151
|
+
const digit = Number((scalars[j] >> shift) & MULTISCALAR_DIGIT_MASK);
|
|
152
|
+
sum = sum.add(selectEntry(tables[j], digit));
|
|
153
|
+
}
|
|
154
|
+
}
|
|
155
|
+
return sum;
|
|
156
|
+
}
|
|
157
|
+
/** Data-oblivious select: read each entry of the table, and use no digit as an index. */
|
|
158
|
+
function selectEntry(table, digit) {
|
|
159
|
+
let entry = table[0];
|
|
160
|
+
for (let i = 1; i < table.length; i++)
|
|
161
|
+
entry = i === digit ? table[i] : entry;
|
|
162
|
+
return entry;
|
|
163
|
+
}
|
|
164
|
+
//# sourceMappingURL=point-multiplication.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"point-multiplication.js","sourceRoot":"","sources":["../../../../../internal/protocol/zk/proofs/point-multiplication.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,6 +16,7 @@ export {};
|
|
|
16
16
|
export interface RistrettoPoint {
|
|
17
17
|
add(other: RistrettoPoint): RistrettoPoint;
|
|
18
18
|
subtract(other: RistrettoPoint): RistrettoPoint;
|
|
19
|
+
double(): RistrettoPoint;
|
|
19
20
|
multiply(scalar: bigint): RistrettoPoint;
|
|
20
21
|
negate(): RistrettoPoint;
|
|
21
22
|
equals(other: RistrettoPoint): boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sho.d.ts","sourceRoot":"","sources":["../../../../../internal/protocol/zk/proofs/sho.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAIH,OAAO,EAAgB,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC7E,OAAO,EAAE,CAAC;AAGV,MAAM,WAAW,cAAc;IAC7B,GAAG,CAAC,KAAK,EAAE,cAAc,GAAG,cAAc,CAAC;IAC3C,QAAQ,CAAC,KAAK,EAAE,cAAc,GAAG,cAAc,CAAC;IAChD,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,cAAc,CAAC;IACzC,MAAM,IAAI,cAAc,CAAC;IACzB,MAAM,CAAC,KAAK,EAAE,cAAc,GAAG,OAAO,CAAC;IACvC,OAAO,IAAI,UAAU,CAAC;CACvB;AAED,MAAM,WAAW,wBAAwB;IACvC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC;IAC9B,GAAG,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC;IAC3B,GAAG,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC;CAC5B;AAED,MAAM,WAAW,yBAAyB;IACxC,QAAQ,CAAC,IAAI,EAAE,cAAc,CAAC;IAC9B,QAAQ,CAAC,IAAI,EAAE,cAAc,CAAC;IAC9B,QAAQ,CAAC,EAAE,EAAE,wBAAwB,CAAC;IACtC,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,cAAc,CAAC;IACrC,SAAS,CAAC,KAAK,EAAE,UAAU,GAAG,cAAc,CAAC;CAC9C;AAGD,eAAO,MAAM,cAAc,EAAwC,yBAAyB,CAAC;AAO7F;;;;;;;;;GASG;AACH,qBAAa,aAAa;IACxB,OAAO,CAAC,EAAE,CAAa;IACvB,OAAO,CAAC,SAAS,CAAa;IAC9B,OAAO,CAAC,UAAU,CAAe;IACjC,OAAO,CAAC,IAAI,CAAO;IAEnB,YAAY,KAAK,EAAE,UAAU,EAM5B;IAED;;OAEG;IACH,KAAK,IAAI,aAAa,CAOrB;IAED;;;OAGG;IACH,MAAM,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI,CAO9B;IAED;;;OAGG;IACH,OAAO,IAAI,IAAI,CASd;IAED;;OAEG;IACH,gBAAgB,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI,CAGxC;IAED;;;;;;;OAOG;IACH,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,UAAU,CAI5C;IAED;;OAEG;IACH,qBAAqB,CAAC,MAAM,EAAE,UAAU,GAAG,IAAI,CA8B9C;IAID;;;OAGG;IACH,QAAQ,IAAI,cAAc,CAGzB;IAED;;;OAGG;IACH,SAAS,IAAI,MAAM,CAGlB;IAID;;OAEG;IACH,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,GAAG,UAAU,CAI5E;IAED;;OAEG;IACH,OAAO,CAAC,aAAa;CAYtB;AAID;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,UAAU,GAAG,MAAM,CAS3D;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,UAAU,GAAG,MAAM,GAAG,IAAI,CAQvE;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,UAAU,CAQxD;AAED;;GAEG;AACH,eAAO,MAAM,YAAY,QAA0B,CAAC;AAEpD,OAAO,EAAE,mBAAmB,EAAE,CAAC"}
|
|
1
|
+
{"version":3,"file":"sho.d.ts","sourceRoot":"","sources":["../../../../../internal/protocol/zk/proofs/sho.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAIH,OAAO,EAAgB,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC7E,OAAO,EAAE,CAAC;AAGV,MAAM,WAAW,cAAc;IAC7B,GAAG,CAAC,KAAK,EAAE,cAAc,GAAG,cAAc,CAAC;IAC3C,QAAQ,CAAC,KAAK,EAAE,cAAc,GAAG,cAAc,CAAC;IAChD,MAAM,IAAI,cAAc,CAAC;IACzB,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,cAAc,CAAC;IACzC,MAAM,IAAI,cAAc,CAAC;IACzB,MAAM,CAAC,KAAK,EAAE,cAAc,GAAG,OAAO,CAAC;IACvC,OAAO,IAAI,UAAU,CAAC;CACvB;AAED,MAAM,WAAW,wBAAwB;IACvC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC;IAC9B,GAAG,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC;IAC3B,GAAG,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC;CAC5B;AAED,MAAM,WAAW,yBAAyB;IACxC,QAAQ,CAAC,IAAI,EAAE,cAAc,CAAC;IAC9B,QAAQ,CAAC,IAAI,EAAE,cAAc,CAAC;IAC9B,QAAQ,CAAC,EAAE,EAAE,wBAAwB,CAAC;IACtC,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,cAAc,CAAC;IACrC,SAAS,CAAC,KAAK,EAAE,UAAU,GAAG,cAAc,CAAC;CAC9C;AAGD,eAAO,MAAM,cAAc,EAAwC,yBAAyB,CAAC;AAO7F;;;;;;;;;GASG;AACH,qBAAa,aAAa;IACxB,OAAO,CAAC,EAAE,CAAa;IACvB,OAAO,CAAC,SAAS,CAAa;IAC9B,OAAO,CAAC,UAAU,CAAe;IACjC,OAAO,CAAC,IAAI,CAAO;IAEnB,YAAY,KAAK,EAAE,UAAU,EAM5B;IAED;;OAEG;IACH,KAAK,IAAI,aAAa,CAOrB;IAED;;;OAGG;IACH,MAAM,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI,CAO9B;IAED;;;OAGG;IACH,OAAO,IAAI,IAAI,CASd;IAED;;OAEG;IACH,gBAAgB,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI,CAGxC;IAED;;;;;;;OAOG;IACH,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,UAAU,CAI5C;IAED;;OAEG;IACH,qBAAqB,CAAC,MAAM,EAAE,UAAU,GAAG,IAAI,CA8B9C;IAID;;;OAGG;IACH,QAAQ,IAAI,cAAc,CAGzB;IAED;;;OAGG;IACH,SAAS,IAAI,MAAM,CAGlB;IAID;;OAEG;IACH,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,GAAG,UAAU,CAI5E;IAED;;OAEG;IACH,OAAO,CAAC,aAAa;CAYtB;AAID;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,UAAU,GAAG,MAAM,CAS3D;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,UAAU,GAAG,MAAM,GAAG,IAAI,CAQvE;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,UAAU,CAQxD;AAED;;GAEG;AACH,eAAO,MAAM,YAAY,QAA0B,CAAC;AAEpD,OAAO,EAAE,mBAAmB,EAAE,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sho.js","sourceRoot":"","sources":["../../../../../internal/protocol/zk/proofs/sho.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAC7C,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAE7E,MAAM,QAAQ,GAAG,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"sho.js","sourceRoot":"","sources":["../../../../../internal/protocol/zk/proofs/sho.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"statement.d.ts","sourceRoot":"","sources":["../../../../../internal/protocol/zk/proofs/statement.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"statement.d.ts","sourceRoot":"","sources":["../../../../../internal/protocol/zk/proofs/statement.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAW/C,OAAO,EAAE,CAAC;AAIV,oDAAoD;AACpD,oBAAY,WAAW;IACrB,OAAO,YAAY;IACnB,8BAA8B,mCAAmC;IACjE,6BAA6B,kCAAkC;IAC/D,uBAAuB,4BAA4B;IACnD,sBAAsB,2BAA2B;IACjD,mBAAmB,wBAAwB;IAC3C,gCAAgC,qCAAqC;CACtE;AAED,qBAAa,eAAgB,SAAQ,KAAK;aACZ,IAAI,EAAE,WAAW;IAA7C,YAA4B,IAAI,EAAE,WAAW,EAG5C;CACF;AAeD;;;;;;;;;;GAUG;AACH,qBAAa,SAAS;IACpB,OAAO,CAAC,SAAS,CAAkB;IACnC,OAAO,CAAC,SAAS,CAAuC;IACxD,OAAO,CAAC,SAAS,CAAgB;IACjC,OAAO,CAAC,QAAQ,CAAsC;IACtD,OAAO,CAAC,QAAQ,CAAgB;IAEhC,cAIC;IAED;;;;OAIG;IACH,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,GAAG,IAAI,CAmBnD;IAED;;;;;;;OAOG;IACH,KAAK,CACH,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,SAAS,EACpB,OAAO,EAAE,UAAU,EACnB,UAAU,EAAE,UAAU,GACrB,UAAU,CA2DZ;IAED;;;;;;OAMG;IACH,WAAW,CAAC,UAAU,EAAE,UAAU,EAAE,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,UAAU,GAAG,IAAI,CAkCnF;IAED;;;;;;;;;;OAUG;IACH,OAAO,IAAI,UAAU,CAWpB;IAID,OAAO,CAAC,SAAS;IAUjB,OAAO,CAAC,QAAQ;IAUhB;;OAEG;IACH,OAAO,CAAC,WAAW;IAanB;;;OAGG;IACH,OAAO,CAAC,UAAU;IAelB;;;;;;OAMG;IACH,OAAO,CAAC,2BAA2B;CAkBpC"}
|
|
@@ -15,6 +15,7 @@
|
|
|
15
15
|
*/
|
|
16
16
|
import { proofFromBytes, proofToBytes } from './proof.js';
|
|
17
17
|
import { ShoHmacSha256, RistrettoPoint, bytesToScalarWide, scalarToBytes, SCALAR_ORDER, } from './sho.js';
|
|
18
|
+
import { encodePoint, multiscalarMultiply } from './point-multiplication.js';
|
|
18
19
|
import { constantTimeEqual } from '../../../crypto/utils.js';
|
|
19
20
|
const Point = RistrettoPoint;
|
|
20
21
|
const Fn = Point.Fn;
|
|
@@ -99,7 +100,7 @@ export class Statement {
|
|
|
99
100
|
const sho = new ShoHmacSha256(PROTOCOL_LABEL);
|
|
100
101
|
sho.absorb(this.toBytes()); // D
|
|
101
102
|
for (const point of allPoints) {
|
|
102
|
-
sho.absorb(point
|
|
103
|
+
sho.absorb(encodePoint(point)); // A
|
|
103
104
|
}
|
|
104
105
|
sho.ratchet();
|
|
105
106
|
// Synthetic nonce: hash randomness + witness + message
|
|
@@ -160,7 +161,7 @@ export class Statement {
|
|
|
160
161
|
const sho = new ShoHmacSha256(PROTOCOL_LABEL);
|
|
161
162
|
sho.absorb(this.toBytes()); // D
|
|
162
163
|
for (const point of allPoints) {
|
|
163
|
-
sho.absorb(point
|
|
164
|
+
sho.absorb(encodePoint(point)); // A
|
|
164
165
|
}
|
|
165
166
|
sho.ratchet();
|
|
166
167
|
// Reconstruct commitment: R = F(response) - challenge * A
|
|
@@ -265,17 +266,16 @@ export class Statement {
|
|
|
265
266
|
*/
|
|
266
267
|
homomorphismWithSubtraction(g1, allPoints, challenge) {
|
|
267
268
|
return this.equations.map((eq) => {
|
|
268
|
-
//
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
// Subtract challenge * lhs_point if verifying
|
|
269
|
+
// One constant-time multiscalar multiplication calculates the sum of
|
|
270
|
+
// scalar * point for each term in RHS, minus challenge * lhs_point if
|
|
271
|
+
// verifying.
|
|
272
|
+
const scalars = eq.rhs.map((term) => g1[term.scalar]);
|
|
273
|
+
const points = eq.rhs.map((term) => allPoints[term.point]);
|
|
274
274
|
if (challenge !== null) {
|
|
275
|
-
|
|
276
|
-
|
|
275
|
+
scalars.push(Fn.create(SCALAR_ORDER - challenge));
|
|
276
|
+
points.push(allPoints[eq.lhs]);
|
|
277
277
|
}
|
|
278
|
-
return
|
|
278
|
+
return multiscalarMultiply(scalars, points);
|
|
279
279
|
});
|
|
280
280
|
}
|
|
281
281
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"statement.js","sourceRoot":"","sources":["../../../../../internal/protocol/zk/proofs/statement.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvD,OAAO,EACL,aAAa,EACb,cAAc,EACd,iBAAiB,EACjB,aAAa,EACb,YAAY,GACb,MAAM,OAAO,CAAC;AACf,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAE1D,MAAM,KAAK,GAAG,cAAc,CAAC;AAC7B,MAAM,EAAE,GAAG,KAAK,CAAC,EAAE,CAAC;AAEpB,oDAAoD;AACpD,MAAM,CAAN,IAAY,WAQX;AARD,WAAY,WAAW;IACrB,kCAAmB,CAAA;IACnB,gFAAiE,CAAA;IACjE,8EAA+D,CAAA;IAC/D,kEAAmD,CAAA;IACnD,gEAAiD,CAAA;IACjD,0DAA2C,CAAA;IAC3C,oFAAqE,CAAA;AACvE,CAAC,EARW,WAAW,KAAX,WAAW,QAQtB;AAED,MAAM,OAAO,eAAgB,SAAQ,KAAK;IACZ,IAAI;IAAhC,YAA4B,IAAiB;QAC3C,KAAK,CAAC,IAAI,CAAC,CAAC;oBADc,IAAI;QAE9B,IAAI,CAAC,IAAI,GAAG,iBAAiB,CAAC;IAChC,CAAC;CACF;AAeD;;;;;;;;;;GAUG;AACH,MAAM,OAAO,SAAS;IACZ,SAAS,GAAe,EAAE,CAAC;IAC3B,SAAS,GAA6B,IAAI,GAAG,EAAE,CAAC;IAChD,SAAS,GAAa,EAAE,CAAC;IACzB,QAAQ,GAA4B,IAAI,GAAG,EAAE,CAAC;IAC9C,QAAQ,GAAa,EAAE,CAAC;IAEhC;QACE,8CAA8C;QAC9C,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;QAC1B,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC1B,CAAC;IAED;;;;OAIG;IACH,GAAG,CAAC,GAAW,EAAE,QAA4B;QAC3C,IAAI,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,IAAI,QAAQ,CAAC,MAAM,GAAG,GAAG,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,IAAI,GAAG,EAAE,CAAC;YACtF,MAAM,IAAI,eAAe,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;QACjD,CAAC;QAED,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QAClC,MAAM,GAAG,GAAW,EAAE,CAAC;QAEvB,KAAK,MAAM,CAAC,UAAU,EAAE,SAAS,CAAC,IAAI,QAAQ,EAAE,CAAC;YAC/C,IAAI,CAAC,UAAU,IAAI,CAAC,SAAS,EAAE,CAAC;gBAC9B,MAAM,IAAI,eAAe,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;YACjD,CAAC;YACD,GAAG,CAAC,IAAI,CAAC;gBACP,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC;gBAClC,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC;aAChC,CAAC,CAAC;QACL,CAAC;QAED,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;IAC5C,CAAC;IAED;;;;;;;OAOG;IACH,KAAK,CACH,UAAsB,EACtB,SAAoB,EACpB,OAAmB,EACnB,UAAsB;QAEtB,IAAI,UAAU,CAAC,MAAM,KAAK,EAAE,EAAE,CAAC;YAC7B,MAAM,IAAI,eAAe,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;QACjD,CAAC;QAED,MAAM,EAAE,GAAG,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;QACxC,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;QAE7C,uEAAuE;QACvE,MAAM,GAAG,GAAG,IAAI,aAAa,CAAC,cAAc,CAAC,CAAC;QAC9C,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,IAAI;QAChC,KAAK,MAAM,KAAK,IAAI,SAAS,EAAE,CAAC;YAC9B,GAAG,CAAC,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"statement.js","sourceRoot":"","sources":["../../../../../internal/protocol/zk/proofs/statement.ts"],"names":[],"mappings":"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"}
|
|
@@ -54,9 +54,10 @@
|
|
|
54
54
|
*/
|
|
55
55
|
import type { DefaultSignalProtocolClient } from '../../client/index.js';
|
|
56
56
|
import type { Ciphertext } from '../../keys/index.js';
|
|
57
|
-
import type { SignalProtocolRelayServer, DeviceInfo, PreKeyBundle } from '../../remote/relay/types.js';
|
|
57
|
+
import type { SignalProtocolRelayServer, DeviceInfo, GroupMemberDevice, PreKeyBundle } from '../../remote/relay/types.js';
|
|
58
58
|
import { ProtocolAddress } from '../../types/address.js';
|
|
59
59
|
import { type Logger } from '../../logger.js';
|
|
60
|
+
import { type BoundedFanOut } from '../../utils/bounded-fan-out.js';
|
|
60
61
|
/**
|
|
61
62
|
* Device-specific prekey bundle
|
|
62
63
|
*/
|
|
@@ -129,20 +130,38 @@ export interface DeviceSessionEstablishment {
|
|
|
129
130
|
establishSession(remoteAddress: ProtocolAddress, bundle: PreKeyBundle): Promise<void>;
|
|
130
131
|
/** Rethrow an error that ends the whole call, not the attempt for one device. */
|
|
131
132
|
rethrowFatal(error: unknown): void;
|
|
133
|
+
/** The relay request bound of the client. Each relay request takes one slot. */
|
|
134
|
+
fanOut: BoundedFanOut;
|
|
135
|
+
/** After it aborts, no relay request starts and the call rejects. */
|
|
136
|
+
stopSignal?: AbortSignal;
|
|
137
|
+
/**
|
|
138
|
+
* The user's receiving devices, read by the caller in this send. When it is
|
|
139
|
+
* given, the call does not read the list again.
|
|
140
|
+
*/
|
|
141
|
+
listedDevices?: readonly GroupMemberDevice[];
|
|
132
142
|
}
|
|
133
143
|
/**
|
|
134
144
|
* Establish sessions with all active devices for a user
|
|
135
145
|
*
|
|
136
|
-
* Reads the relay's list of receiving devices,
|
|
137
|
-
*
|
|
146
|
+
* Reads the relay's list of receiving devices, or takes the list that the
|
|
147
|
+
* caller read in the same send, then fetches a prekey bundle and establishes
|
|
148
|
+
* a session for each listed device that has no session. A
|
|
138
149
|
* device that already has a session counts as established. The cipher calls
|
|
139
150
|
* this again when its copy of the device list is no longer fresh, so a newly
|
|
140
151
|
* linked device is found by a later send.
|
|
141
152
|
*
|
|
153
|
+
* The prekey bundles of the devices are fetched at the same time, each under
|
|
154
|
+
* one slot of the relay request bound. The sessions are established one at a
|
|
155
|
+
* time, and never while a slot is held: the first session commit with a user
|
|
156
|
+
* pins the user's contact identity, and a concurrent commit that read the
|
|
157
|
+
* store before it fails. A failure for one device does not stop the other
|
|
158
|
+
* devices. The result lists the devices in the relay's order.
|
|
159
|
+
*
|
|
142
160
|
* @param signal - DefaultSignalProtocolClient instance
|
|
143
161
|
* @param relay - Signal Protocol relay server interface
|
|
144
162
|
* @param userId - Target user ID
|
|
145
|
-
* @param establishment - Establishes each session
|
|
163
|
+
* @param establishment - Establishes each session, bounds the relay requests,
|
|
164
|
+
* and names the errors that end the call
|
|
146
165
|
* @returns Result containing successful and failed device IDs
|
|
147
166
|
*
|
|
148
167
|
* @example
|
|
@@ -150,6 +169,7 @@ export interface DeviceSessionEstablishment {
|
|
|
150
169
|
* const result = await establishMultiDeviceSessions(signal, relay, 'user_abc123', {
|
|
151
170
|
* establishSession: (address, bundle) => signal.establishSession(address, bundle),
|
|
152
171
|
* rethrowFatal: () => {},
|
|
172
|
+
* fanOut: new BoundedFanOut({ stopped: () => new Error('Stopped') }),
|
|
153
173
|
* });
|
|
154
174
|
* console.log(`Established ${result.establishedDevices.length}/${result.totalDevices} sessions`);
|
|
155
175
|
* ```
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"device-registry.d.ts","sourceRoot":"","sources":["../../../internal/sesame/device-registry.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqDG;AAEH,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,cAAc,CAAC;AAChE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"device-registry.d.ts","sourceRoot":"","sources":["../../../internal/sesame/device-registry.ts"],"names":[],"mappings":"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"}
|
|
@@ -54,6 +54,7 @@
|
|
|
54
54
|
*/
|
|
55
55
|
import { ProtocolAddress } from '../../types/address.js';
|
|
56
56
|
import { defaultSignalProtocolLogger } from '../../logger.js';
|
|
57
|
+
import { firstItemError } from '../../utils/bounded-fan-out.js';
|
|
57
58
|
// ============================================================================
|
|
58
59
|
// Session ID Utilities
|
|
59
60
|
// ============================================================================
|
|
@@ -103,16 +104,25 @@ export async function getActiveDevices(relay, userId, logger = defaultSignalProt
|
|
|
103
104
|
/**
|
|
104
105
|
* Establish sessions with all active devices for a user
|
|
105
106
|
*
|
|
106
|
-
* Reads the relay's list of receiving devices,
|
|
107
|
-
*
|
|
107
|
+
* Reads the relay's list of receiving devices, or takes the list that the
|
|
108
|
+
* caller read in the same send, then fetches a prekey bundle and establishes
|
|
109
|
+
* a session for each listed device that has no session. A
|
|
108
110
|
* device that already has a session counts as established. The cipher calls
|
|
109
111
|
* this again when its copy of the device list is no longer fresh, so a newly
|
|
110
112
|
* linked device is found by a later send.
|
|
111
113
|
*
|
|
114
|
+
* The prekey bundles of the devices are fetched at the same time, each under
|
|
115
|
+
* one slot of the relay request bound. The sessions are established one at a
|
|
116
|
+
* time, and never while a slot is held: the first session commit with a user
|
|
117
|
+
* pins the user's contact identity, and a concurrent commit that read the
|
|
118
|
+
* store before it fails. A failure for one device does not stop the other
|
|
119
|
+
* devices. The result lists the devices in the relay's order.
|
|
120
|
+
*
|
|
112
121
|
* @param signal - DefaultSignalProtocolClient instance
|
|
113
122
|
* @param relay - Signal Protocol relay server interface
|
|
114
123
|
* @param userId - Target user ID
|
|
115
|
-
* @param establishment - Establishes each session
|
|
124
|
+
* @param establishment - Establishes each session, bounds the relay requests,
|
|
125
|
+
* and names the errors that end the call
|
|
116
126
|
* @returns Result containing successful and failed device IDs
|
|
117
127
|
*
|
|
118
128
|
* @example
|
|
@@ -120,52 +130,51 @@ export async function getActiveDevices(relay, userId, logger = defaultSignalProt
|
|
|
120
130
|
* const result = await establishMultiDeviceSessions(signal, relay, 'user_abc123', {
|
|
121
131
|
* establishSession: (address, bundle) => signal.establishSession(address, bundle),
|
|
122
132
|
* rethrowFatal: () => {},
|
|
133
|
+
* fanOut: new BoundedFanOut({ stopped: () => new Error('Stopped') }),
|
|
123
134
|
* });
|
|
124
135
|
* console.log(`Established ${result.establishedDevices.length}/${result.totalDevices} sessions`);
|
|
125
136
|
* ```
|
|
126
137
|
*/
|
|
127
138
|
export async function establishMultiDeviceSessions(signal, relay, userId, establishment) {
|
|
128
139
|
const logger = signal.logger;
|
|
140
|
+
const { fanOut, stopSignal } = establishment;
|
|
129
141
|
try {
|
|
130
142
|
// The relay's receiving devices: registered and enabled, never soft-deleted
|
|
131
|
-
const devices =
|
|
143
|
+
const devices = establishment.listedDevices ??
|
|
144
|
+
(await fanOut.request(() => relay.getActiveDevices(userId), stopSignal));
|
|
132
145
|
// Use the current user (signal.userId) as the fetcher for rate limiting
|
|
133
146
|
const fetcherUserId = signal.userId;
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
const
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
147
|
+
// One session commit at a time. A commit that fails does not stop the next.
|
|
148
|
+
let establishing = Promise.resolve();
|
|
149
|
+
const establishInTurn = (remoteAddress, bundle) => {
|
|
150
|
+
const turn = establishing.then(() => establishment.establishSession(remoteAddress, bundle));
|
|
151
|
+
establishing = turn.catch(() => undefined);
|
|
152
|
+
return turn;
|
|
153
|
+
};
|
|
154
|
+
const establishDevice = async ({ deviceId, }) => {
|
|
140
155
|
try {
|
|
141
|
-
const remoteAddress = createDeviceAddress(userId,
|
|
156
|
+
const remoteAddress = createDeviceAddress(userId, deviceId);
|
|
142
157
|
// Check if session already exists BEFORE fetching bundle
|
|
143
158
|
const hasExistingSession = await signal.hasSession(remoteAddress);
|
|
144
159
|
if (hasExistingSession) {
|
|
145
160
|
logger.info('[MultiDevice] Session already exists', {
|
|
146
161
|
address: ProtocolAddress.toString(remoteAddress),
|
|
147
|
-
deviceId
|
|
162
|
+
deviceId,
|
|
148
163
|
});
|
|
149
|
-
|
|
150
|
-
continue;
|
|
164
|
+
return { deviceId, established: true };
|
|
151
165
|
}
|
|
152
166
|
// Only fetch bundle for devices WITHOUT existing sessions
|
|
153
|
-
const bundle = await relay.fetchPreKeyBundle(userId,
|
|
167
|
+
const bundle = await fanOut.request(() => relay.fetchPreKeyBundle(userId, deviceId, fetcherUserId), stopSignal);
|
|
154
168
|
if (!bundle) {
|
|
155
|
-
logger.warn('[MultiDevice] No bundle available', {
|
|
156
|
-
|
|
157
|
-
deviceId: device.deviceId,
|
|
158
|
-
});
|
|
159
|
-
failedDevices.push(device.deviceId);
|
|
160
|
-
continue;
|
|
169
|
+
logger.warn('[MultiDevice] No bundle available', { userId, deviceId });
|
|
170
|
+
return { deviceId, established: false };
|
|
161
171
|
}
|
|
162
|
-
|
|
163
|
-
await establishment.establishSession(remoteAddress, bundle);
|
|
164
|
-
establishedDevices.push(device.deviceId);
|
|
172
|
+
await establishInTurn(remoteAddress, bundle);
|
|
165
173
|
logger.info('[MultiDevice] Session established', {
|
|
166
174
|
address: ProtocolAddress.toString(remoteAddress),
|
|
167
|
-
deviceId
|
|
175
|
+
deviceId,
|
|
168
176
|
});
|
|
177
|
+
return { deviceId, established: true };
|
|
169
178
|
}
|
|
170
179
|
catch (error) {
|
|
171
180
|
establishment.rethrowFatal(error);
|
|
@@ -173,10 +182,28 @@ export async function establishMultiDeviceSessions(signal, relay, userId, establ
|
|
|
173
182
|
logger.error('[MultiDevice] Failed to establish session', {
|
|
174
183
|
category: 'MultiDevice',
|
|
175
184
|
error: normalizedError,
|
|
176
|
-
data: { userId, deviceId
|
|
185
|
+
data: { userId, deviceId },
|
|
177
186
|
});
|
|
178
|
-
|
|
179
|
-
|
|
187
|
+
return { deviceId, established: false, error: normalizedError };
|
|
188
|
+
}
|
|
189
|
+
};
|
|
190
|
+
// A device rejects only with an error that ends the whole call.
|
|
191
|
+
const outcomes = await fanOut
|
|
192
|
+
.all(devices, establishDevice, stopSignal)
|
|
193
|
+
.catch((error) => {
|
|
194
|
+
throw firstItemError(error);
|
|
195
|
+
});
|
|
196
|
+
const establishedDevices = [];
|
|
197
|
+
const failedDevices = [];
|
|
198
|
+
const failedDeviceErrors = [];
|
|
199
|
+
for (const outcome of outcomes) {
|
|
200
|
+
if (outcome.established) {
|
|
201
|
+
establishedDevices.push(outcome.deviceId);
|
|
202
|
+
continue;
|
|
203
|
+
}
|
|
204
|
+
failedDevices.push(outcome.deviceId);
|
|
205
|
+
if (outcome.error) {
|
|
206
|
+
failedDeviceErrors.push({ deviceId: outcome.deviceId, error: outcome.error });
|
|
180
207
|
}
|
|
181
208
|
}
|
|
182
209
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"device-registry.js","sourceRoot":"","sources":["../../../internal/sesame/device-registry.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqDG;
|
|
1
|
+
{"version":3,"file":"device-registry.js","sourceRoot":"","sources":["../../../internal/sesame/device-registry.ts"],"names":[],"mappings":"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"}
|