@open-e2ee/signal-protocol-sdk 13.5.1 → 14.0.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/CHANGELOG.md +329 -0
- package/README.md +2 -2
- package/SECURITY.md +2 -2
- package/device/README.md +4 -3
- package/dist/client/client.d.ts +20 -55
- package/dist/client/client.d.ts.map +1 -1
- package/dist/client/client.js +133 -165
- package/dist/client/client.js.map +1 -1
- package/dist/client/content-adapter.d.ts +35 -6
- package/dist/client/content-adapter.d.ts.map +1 -1
- package/dist/client/content-adapter.js +28 -0
- package/dist/client/content-adapter.js.map +1 -1
- package/dist/client/event-hooks.d.ts +22 -11
- package/dist/client/event-hooks.d.ts.map +1 -1
- package/dist/client/event-hooks.js.map +1 -1
- package/dist/client/group-fetcher.d.ts.map +1 -1
- package/dist/client/group-fetcher.js +43 -0
- package/dist/client/group-fetcher.js.map +1 -1
- package/dist/client/group-key-sync.d.ts +65 -0
- package/dist/client/group-key-sync.d.ts.map +1 -0
- package/dist/client/group-key-sync.js +286 -0
- package/dist/client/group-key-sync.js.map +1 -0
- package/dist/client/group-outbox.d.ts +20 -6
- package/dist/client/group-outbox.d.ts.map +1 -1
- package/dist/client/group-outbox.js +153 -80
- package/dist/client/group-outbox.js.map +1 -1
- package/dist/client/group-receive-authorization.d.ts +16 -9
- package/dist/client/group-receive-authorization.d.ts.map +1 -1
- package/dist/client/group-receive-authorization.js +25 -16
- package/dist/client/group-receive-authorization.js.map +1 -1
- package/dist/client/hosted.d.ts +7 -7
- package/dist/client/hosted.js +7 -7
- package/dist/client/index.d.ts +1 -1
- package/dist/client/index.d.ts.map +1 -1
- package/dist/client/index.js.map +1 -1
- package/dist/client/receive-queue.d.ts +3 -4
- package/dist/client/receive-queue.d.ts.map +1 -1
- package/dist/client/receive-queue.js +24 -32
- package/dist/client/receive-queue.js.map +1 -1
- package/dist/client/relay-subscription.d.ts.map +1 -1
- package/dist/client/relay-subscription.js +4 -9
- package/dist/client/relay-subscription.js.map +1 -1
- package/dist/client/retry-request-envelope.d.ts +4 -2
- package/dist/client/retry-request-envelope.d.ts.map +1 -1
- package/dist/client/retry-request-envelope.js +6 -4
- package/dist/client/retry-request-envelope.js.map +1 -1
- package/dist/client/retry-request-lifecycle.d.ts +7 -8
- package/dist/client/retry-request-lifecycle.d.ts.map +1 -1
- package/dist/client/retry-request-lifecycle.js +10 -7
- package/dist/client/retry-request-lifecycle.js.map +1 -1
- package/dist/client/retry-terminal-recovery.d.ts +14 -15
- package/dist/client/retry-terminal-recovery.d.ts.map +1 -1
- package/dist/client/retry-terminal-recovery.js +16 -17
- package/dist/client/retry-terminal-recovery.js.map +1 -1
- package/dist/client/retry-utils.d.ts +22 -0
- package/dist/client/retry-utils.d.ts.map +1 -1
- package/dist/client/retry-utils.js +30 -0
- package/dist/client/retry-utils.js.map +1 -1
- package/dist/client/send-deadline.js +1 -1
- package/dist/client/send-deadline.js.map +1 -1
- package/dist/client/send-timestamp.d.ts +71 -14
- package/dist/client/send-timestamp.d.ts.map +1 -1
- package/dist/client/send-timestamp.js +87 -19
- package/dist/client/send-timestamp.js.map +1 -1
- package/dist/client/signal-service-cipher.d.ts +125 -13
- package/dist/client/signal-service-cipher.d.ts.map +1 -1
- package/dist/client/signal-service-cipher.js +413 -102
- package/dist/client/signal-service-cipher.js.map +1 -1
- package/dist/client/types.d.ts +21 -16
- package/dist/client/types.d.ts.map +1 -1
- package/dist/client/types.js.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js.map +1 -1
- package/dist/internal/groups/key-sync-ledger.d.ts +65 -0
- package/dist/internal/groups/key-sync-ledger.d.ts.map +1 -0
- package/dist/internal/groups/key-sync-ledger.js +104 -0
- package/dist/internal/groups/key-sync-ledger.js.map +1 -0
- package/dist/internal/groups/receive-record.d.ts +4 -1
- package/dist/internal/groups/receive-record.d.ts.map +1 -1
- package/dist/internal/groups/receive-record.js.map +1 -1
- package/dist/internal/session/cipher.d.ts.map +1 -1
- package/dist/internal/session/cipher.js +14 -0
- package/dist/internal/session/cipher.js.map +1 -1
- package/dist/local/store/conformance/cases/durability.d.ts.map +1 -1
- package/dist/local/store/conformance/cases/durability.js +6 -0
- package/dist/local/store/conformance/cases/durability.js.map +1 -1
- package/dist/local/store/conformance/records.d.ts.map +1 -1
- package/dist/local/store/conformance/records.js +3 -0
- package/dist/local/store/conformance/records.js.map +1 -1
- package/dist/local/store/expo/adapter.js +2 -2
- package/dist/local/store/expo/adapter.js.map +1 -1
- package/dist/local/store/key-value/adapter.d.ts +6 -5
- package/dist/local/store/key-value/adapter.d.ts.map +1 -1
- package/dist/local/store/key-value/adapter.js +21 -19
- package/dist/local/store/key-value/adapter.js.map +1 -1
- package/dist/local/store/key-value/receive-work.d.ts +0 -5
- package/dist/local/store/key-value/receive-work.d.ts.map +1 -1
- package/dist/local/store/key-value/receive-work.js +0 -16
- package/dist/local/store/key-value/receive-work.js.map +1 -1
- package/dist/local/store/node/adapter.js +2 -2
- package/dist/local/store/node/adapter.js.map +1 -1
- package/dist/local/store/react-native/adapter.js +2 -2
- package/dist/local/store/react-native/adapter.js.map +1 -1
- package/dist/local/store/receive-work.d.ts +32 -32
- package/dist/local/store/receive-work.d.ts.map +1 -1
- package/dist/local/store/receive-work.js +112 -65
- package/dist/local/store/receive-work.js.map +1 -1
- package/dist/local/store/received-content.d.ts +0 -5
- package/dist/local/store/received-content.d.ts.map +1 -1
- package/dist/local/store/received-content.js +0 -17
- package/dist/local/store/received-content.js.map +1 -1
- package/dist/local/store/reliability.d.ts +191 -53
- package/dist/local/store/reliability.d.ts.map +1 -1
- package/dist/local/store/reliability.js +517 -37
- package/dist/local/store/reliability.js.map +1 -1
- package/dist/local/store/sqlite/key-storage/metadata.d.ts +1 -8
- package/dist/local/store/sqlite/key-storage/metadata.d.ts.map +1 -1
- package/dist/local/store/sqlite/key-storage/metadata.js +1 -18
- package/dist/local/store/sqlite/key-storage/metadata.js.map +1 -1
- package/dist/local/store/sqlite/migrations.d.ts.map +1 -1
- package/dist/local/store/sqlite/migrations.js +8 -0
- package/dist/local/store/sqlite/migrations.js.map +1 -1
- package/dist/local/store/sqlite/store.d.ts +5 -5
- package/dist/local/store/sqlite/store.d.ts.map +1 -1
- package/dist/local/store/sqlite/store.js +29 -9
- package/dist/local/store/sqlite/store.js.map +1 -1
- package/dist/local/store/web/adapter.d.ts +11 -10
- package/dist/local/store/web/adapter.d.ts.map +1 -1
- package/dist/local/store/web/adapter.js +69 -51
- package/dist/local/store/web/adapter.js.map +1 -1
- package/dist/local/store/web-sqlite/adapter.js +2 -2
- package/dist/local/store/web-sqlite/adapter.js.map +1 -1
- package/dist/types/api.d.ts +50 -71
- package/dist/types/api.d.ts.map +1 -1
- package/dist/types/errors.d.ts +52 -18
- package/dist/types/errors.d.ts.map +1 -1
- package/dist/types/errors.js +58 -17
- package/dist/types/errors.js.map +1 -1
- package/docs/ASSURANCE.md +5 -5
- package/docs/DEVIATIONS.md +126 -9
- package/docs/ERROR_HANDLING.md +38 -23
- package/docs/GETTING_STARTED.md +17 -0
- package/local/store/README.md +32 -8
- package/package.json +1 -1
|
@@ -14,12 +14,9 @@
|
|
|
14
14
|
* fail instead of losing an update.
|
|
15
15
|
*/
|
|
16
16
|
import type { ReceiveWorkQuery, ReceiveWorkRecord, ReceiveWorkUsage } from '../../../types/api.js';
|
|
17
|
-
import { type LegacyReceivedContentSource } from '../receive-work.js';
|
|
18
17
|
import type { KeyValueOperation, KeyValueStorage } from './storage.js';
|
|
19
18
|
/** The key prefix of the receive records. */
|
|
20
19
|
export declare const RECEIVE_WORK_PREFIX = "@signal:receive-work:";
|
|
21
|
-
/** The key prefix of the legacy received-content rows. */
|
|
22
|
-
export declare const LEGACY_RECEIVED_CONTENT_PREFIX = "@signal:received-content:";
|
|
23
20
|
/** The record cipher and the database key of the owning store. */
|
|
24
21
|
export interface KeyValueReceiveWorkCipher {
|
|
25
22
|
encrypt(plaintext: string): Promise<string>;
|
|
@@ -43,8 +40,6 @@ export declare class KeyValueReceiveWork {
|
|
|
43
40
|
* record holds the expected revision.
|
|
44
41
|
*/
|
|
45
42
|
complete(workId: string, expectedRevision: number, writes: readonly KeyValueOperation[]): Promise<boolean>;
|
|
46
|
-
/** The legacy received-content rows of this backend. Their values are encrypted. */
|
|
47
|
-
legacySource(): LegacyReceivedContentSource;
|
|
48
43
|
/**
|
|
49
44
|
* Apply the operations when the stored record holds the expected revision.
|
|
50
45
|
* Null expects no record. The batch checks the value that was read.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"receive-work.d.ts","sourceRoot":"","sources":["../../../../local/store/key-value/receive-work.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"receive-work.d.ts","sourceRoot":"","sources":["../../../../local/store/key-value/receive-work.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAUhG,OAAO,KAAK,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAEpE,6CAA6C;AAC7C,eAAO,MAAM,mBAAmB,0BAA0B,CAAC;AAQ3D,kEAAkE;AAClE,MAAM,WAAW,yBAAyB;IACxC,OAAO,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAC5C,OAAO,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAC5C,WAAW,IAAI,OAAO,CAAC,UAAU,CAAC,CAAC;CACpC;AA4BD,qBAAa,mBAAmB;IAE5B,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,MAAM;IAFzB,YACmB,OAAO,EAAE,eAAe,EACxB,MAAM,EAAE,yBAAyB,EAChD;IAEJ,+EAA+E;IACzE,IAAI,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAOhE;IAEK,GAAG,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,GAAG,IAAI,CAAC,CAG3D;IAEK,GAAG,CAAC,MAAM,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,CAGtF;IAEK,IAAI,CAAC,KAAK,GAAE,gBAAqB,GAAG,OAAO,CAAC,iBAAiB,EAAE,CAAC,CAsBrE;IAEK,KAAK,CAAC,KAAK,GAAE;QAAE,OAAO,CAAC,EAAE,MAAM,CAAA;KAAO,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAiBvE;IAED;;;OAGG;IACG,QAAQ,CACZ,MAAM,EAAE,MAAM,EACd,gBAAgB,EAAE,MAAM,EACxB,MAAM,EAAE,SAAS,iBAAiB,EAAE,GACnC,OAAO,CAAC,OAAO,CAAC,CAKlB;IAED;;;OAGG;YACW,eAAe;YAoBf,IAAI;CAOnB"}
|
|
@@ -16,8 +16,6 @@
|
|
|
16
16
|
import { assertReceiveWork, indexMatchesReceiveWorkQuery, parseReceiveWork, receiveWorkGroupKey, receiveWorkIndex, receiveWorkLimit, } from '../receive-work.js';
|
|
17
17
|
/** The key prefix of the receive records. */
|
|
18
18
|
export const RECEIVE_WORK_PREFIX = '@signal:receive-work:';
|
|
19
|
-
/** The key prefix of the legacy received-content rows. */
|
|
20
|
-
export const LEGACY_RECEIVED_CONTENT_PREFIX = '@signal:received-content:';
|
|
21
19
|
function receiveWorkKey(workId) {
|
|
22
20
|
return `${RECEIVE_WORK_PREFIX}${workId}`;
|
|
23
21
|
}
|
|
@@ -114,20 +112,6 @@ export class KeyValueReceiveWork {
|
|
|
114
112
|
...writes,
|
|
115
113
|
]);
|
|
116
114
|
}
|
|
117
|
-
/** The legacy received-content rows of this backend. Their values are encrypted. */
|
|
118
|
-
legacySource() {
|
|
119
|
-
return {
|
|
120
|
-
listIds: async () => (await this.backend.getAllKeys())
|
|
121
|
-
.filter((key) => key.startsWith(LEGACY_RECEIVED_CONTENT_PREFIX))
|
|
122
|
-
.map((key) => key.slice(LEGACY_RECEIVED_CONTENT_PREFIX.length))
|
|
123
|
-
.sort(),
|
|
124
|
-
read: async (id) => {
|
|
125
|
-
const value = await this.backend.getItem(`${LEGACY_RECEIVED_CONTENT_PREFIX}${id}`);
|
|
126
|
-
return value === null ? null : this.cipher.decrypt(value);
|
|
127
|
-
},
|
|
128
|
-
delete: (id) => this.backend.removeItem(`${LEGACY_RECEIVED_CONTENT_PREFIX}${id}`),
|
|
129
|
-
};
|
|
130
|
-
}
|
|
131
115
|
/**
|
|
132
116
|
* Apply the operations when the stored record holds the expected revision.
|
|
133
117
|
* Null expects no record. The batch checks the value that was read.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"receive-work.js","sourceRoot":"","sources":["../../../../local/store/key-value/receive-work.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,OAAO,EACL,iBAAiB,EACjB,4BAA4B,EAC5B,gBAAgB,EAChB,mBAAmB,EACnB,gBAAgB,EAChB,gBAAgB,
|
|
1
|
+
{"version":3,"file":"receive-work.js","sourceRoot":"","sources":["../../../../local/store/key-value/receive-work.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,7 @@
|
|
|
7
7
|
*/
|
|
8
8
|
import { createBetterSqlite3MultipleCiphersDriver } from '../sqlite/better-sqlite3-multiple-ciphers-driver.js';
|
|
9
9
|
import { openSqliteStore, readSqliteStoreProtection, resetSqliteStore, } from '../sqlite/open-store.js';
|
|
10
|
-
import { SqliteSignalProtocolStore,
|
|
10
|
+
import { SqliteSignalProtocolStore, sweepSqliteLegacyReceivedContent, } from '../sqlite/store.js';
|
|
11
11
|
import { withOwnerLock } from './owner-lock.js';
|
|
12
12
|
/** The database file name when the options name none. */
|
|
13
13
|
const DEFAULT_DATABASE_NAME = 'open-e2ee-signal-protocol.db';
|
|
@@ -51,7 +51,7 @@ export class NodeSignalProtocolStore extends SqliteSignalProtocolStore {
|
|
|
51
51
|
static async open(options) {
|
|
52
52
|
const database = await withStoreOptions(options, 'open', openSqliteStore);
|
|
53
53
|
const protection = await readSqliteStoreProtection(database, options.vault);
|
|
54
|
-
return await
|
|
54
|
+
return await sweepSqliteLegacyReceivedContent(new NodeSignalProtocolStore(database, protection, options.logger), database);
|
|
55
55
|
}
|
|
56
56
|
/** @internal Use {@link resetNodeStore}. */
|
|
57
57
|
static async reset(options) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"adapter.js","sourceRoot":"","sources":["../../../../local/store/node/adapter.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAIH,OAAO,EAAE,wCAAwC,EAAE,MAAM,kDAAkD,CAAC;AAG5G,OAAO,EACL,eAAe,EACf,yBAAyB,EACzB,gBAAgB,GAEjB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,yBAAyB,EACzB,
|
|
1
|
+
{"version":3,"file":"adapter.js","sourceRoot":"","sources":["../../../../local/store/node/adapter.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,7 @@
|
|
|
8
8
|
import { ReactNativeKeychainSignalProtocolSecretVault } from '../../vault/react-native-keychain.js';
|
|
9
9
|
import { createOpSqliteDriver } from '../sqlite/op-sqlite-driver.js';
|
|
10
10
|
import { openSqliteStore, readSqliteStoreProtection, resetSqliteStore, } from '../sqlite/open-store.js';
|
|
11
|
-
import { SqliteSignalProtocolStore,
|
|
11
|
+
import { SqliteSignalProtocolStore, sweepSqliteLegacyReceivedContent, } from '../sqlite/store.js';
|
|
12
12
|
/** The database file name when the options name none. */
|
|
13
13
|
const DEFAULT_DATABASE_NAME = 'open-e2ee-signal-protocol.db';
|
|
14
14
|
function storeOptions(options) {
|
|
@@ -53,7 +53,7 @@ export class ReactNativeSignalProtocolStore extends SqliteSignalProtocolStore {
|
|
|
53
53
|
const open = storeOptions(options);
|
|
54
54
|
const database = await openSqliteStore(open);
|
|
55
55
|
const protection = await readSqliteStoreProtection(database, open.vault);
|
|
56
|
-
return await
|
|
56
|
+
return await sweepSqliteLegacyReceivedContent(new ReactNativeSignalProtocolStore(database, protection, options.logger), database);
|
|
57
57
|
}
|
|
58
58
|
/** @internal Use {@link resetReactNativeStore}. */
|
|
59
59
|
static async reset(options) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"adapter.js","sourceRoot":"","sources":["../../../../local/store/react-native/adapter.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAIH,OAAO,EAAE,4CAA4C,EAAE,MAAM,mCAAmC,CAAC;AAGjG,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAClE,OAAO,EACL,eAAe,EACf,yBAAyB,EACzB,gBAAgB,GAEjB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,yBAAyB,EACzB,
|
|
1
|
+
{"version":3,"file":"adapter.js","sourceRoot":"","sources":["../../../../local/store/react-native/adapter.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAIH,OAAO,EAAE,4CAA4C,EAAE,MAAM,mCAAmC,CAAC;AAGjG,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAClE,OAAO,EACL,eAAe,EACf,yBAAyB,EACzB,gBAAgB,GAEjB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,yBAAyB,EACzB,gCAAgC,GACjC,MAAM,iBAAiB,CAAC;AAEzB,yDAAyD;AACzD,MAAM,qBAAqB,GAAG,8BAA8B,CAAC;AAkB7D,SAAS,YAAY,CACnB,OAA8C;IAE9C,OAAO;QACL,GAAG,OAAO;QACV,MAAM,EAAE,oBAAoB,EAAE;QAC9B,IAAI,EAAE,OAAO,CAAC,IAAI,IAAI,qBAAqB;QAC3C,KAAK,EAAE,OAAO,CAAC,KAAK,IAAI,IAAI,4CAA4C,EAAE;KAC3E,CAAC;AACJ,CAAC;AAED,sEAAsE;AACtE,MAAM,SAAS,GAAG,IAAI,OAAO,EAAsD,CAAC;AAEpF,kEAAkE;AAClE,MAAM,UAAU,wBAAwB,CACtC,KAAqC;IAErC,MAAM,QAAQ,GAAG,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IACtC,IAAI,CAAC,QAAQ;QAAE,MAAM,IAAI,SAAS,CAAC,yCAAyC,CAAC,CAAC;IAC9E,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED;;;;;;;;;;;;;;GAcG;AACH,MAAM,OAAO,8BAA+B,SAAQ,yBAAyB;IAC3E,YACE,QAA4B,EAC5B,UAAgC,EAChC,MAA0B;QAE1B,KAAK,CAAC,QAAQ,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,CAAC;QACxC,SAAS,CAAC,GAAG,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAChC,CAAC;IAED,8CAA8C;IAC9C,MAAM,CAAC,KAAK,CAAC,IAAI,CACf,OAA8C;QAE9C,MAAM,IAAI,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC;QACnC,MAAM,QAAQ,GAAG,MAAM,eAAe,CAAC,IAAI,CAAC,CAAC;QAC7C,MAAM,UAAU,GAAG,MAAM,yBAAyB,CAAC,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;QACzE,OAAO,MAAM,gCAAgC,CAC3C,IAAI,8BAA8B,CAAC,QAAQ,EAAE,UAAU,EAAE,OAAO,CAAC,MAAM,CAAC,EACxE,QAAQ,CACT,CAAC;IACJ,CAAC;IAED,mDAAmD;IACnD,MAAM,CAAC,KAAK,CAAC,KAAK,CAChB,OAA8C;QAE9C,MAAM,IAAI,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC;QACnC,MAAM,QAAQ,GAAG,MAAM,gBAAgB,CAAC,IAAI,CAAC,CAAC;QAC9C,MAAM,UAAU,GAAG,MAAM,yBAAyB,CAAC,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;QACzE,OAAO,IAAI,8BAA8B,CAAC,QAAQ,EAAE,UAAU,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;IAClF,CAAC;IAED;;;OAGG;IACH,KAAK;QACH,OAAO,wBAAwB,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,CAAC;IAChD,CAAC;CACF;AAED;;;;;;;;;;;;;;;GAeG;AACH,MAAM,UAAU,gBAAgB,CAC9B,OAAO,GAA0C,EAAE;IAEnD,OAAO,8BAA8B,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;AACtD,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,qBAAqB,CACnC,OAAO,GAA0C,EAAE;IAEnD,OAAO,8BAA8B,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;AACvD,CAAC"}
|
|
@@ -1,10 +1,14 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { Logger } from '../../logger.js';
|
|
2
|
+
import type { ReceiveWorkQuery, ReceiveWorkRecord, SignalProtocolLocalStore } from '../../types/api.js';
|
|
2
3
|
/** The default page size of a receive-record listing. */
|
|
3
4
|
export declare const RECEIVE_WORK_DEFAULT_LIMIT = 100;
|
|
4
|
-
/**
|
|
5
|
+
/**
|
|
6
|
+
* The metadata key that the legacy conversion of SDK 13.x set when it was
|
|
7
|
+
* done. The sweep deletes it.
|
|
8
|
+
*/
|
|
5
9
|
export declare const LEGACY_RECEIVED_CONTENT_MARKER_KEY = "receive-work:legacy-conversion:v1";
|
|
6
|
-
/** The log code of
|
|
7
|
-
export declare const
|
|
10
|
+
/** The log code of an open that deleted legacy received content. */
|
|
11
|
+
export declare const LEGACY_RECEIVED_CONTENT_DELETED = "LEGACY_RECEIVED_CONTENT_DELETED";
|
|
8
12
|
/** The UTF-8 size of a receive record, without its `sizeBytes` field. */
|
|
9
13
|
export declare function receiveWorkSize(record: ReceiveWorkRecord): number;
|
|
10
14
|
/** The record with its `sizeBytes` field set from its content. */
|
|
@@ -48,40 +52,36 @@ export declare function receiveWorkGroupKey(databaseKey: Uint8Array, groupId: st
|
|
|
48
52
|
export declare function receiveWorkIndex(record: ReceiveWorkRecord, databaseKey: Uint8Array): Promise<ReceiveWorkIndex>;
|
|
49
53
|
/** Tell whether the clear index fields of one record match a query, without the page limit. */
|
|
50
54
|
export declare function indexMatchesReceiveWorkQuery(index: ReceiveWorkIndex, workId: string, query?: ReceiveWorkQuery): boolean;
|
|
51
|
-
/** The receive record of one legacy row. */
|
|
52
|
-
export declare function legacyReceiveWork(content: ReceivedContent): ReceiveWorkRecord;
|
|
53
55
|
/** The legacy rows of one store, as its adapter keeps them. */
|
|
54
|
-
|
|
55
|
-
/** The
|
|
56
|
-
|
|
56
|
+
interface LegacyReceivedContentRows {
|
|
57
|
+
/** The keys of every legacy row whose key starts with `prefix`. */
|
|
58
|
+
listKeys(prefix: string): Promise<string[]>;
|
|
57
59
|
/** The stored text of one legacy row, after any record cipher. Throws when unreadable. */
|
|
58
|
-
read(
|
|
60
|
+
read(key: string): Promise<string | null>;
|
|
59
61
|
/** Delete one legacy row. */
|
|
60
|
-
delete(
|
|
61
|
-
}
|
|
62
|
-
/** The marker that the legacy conversion sets last. */
|
|
63
|
-
export interface LegacyConversionMarker {
|
|
64
|
-
version: 1;
|
|
65
|
-
/** The legacy keys of rows that did not parse. Each row stays in place. */
|
|
66
|
-
unreadable: string[];
|
|
62
|
+
delete(key: string): Promise<void>;
|
|
67
63
|
}
|
|
68
64
|
/**
|
|
69
|
-
*
|
|
70
|
-
*
|
|
65
|
+
* Delete the received content that SDK 11 and the legacy conversion of
|
|
66
|
+
* SDK 13.x left, at each open of a durable store.
|
|
71
67
|
*
|
|
72
|
-
*
|
|
73
|
-
* the
|
|
74
|
-
*
|
|
75
|
-
*
|
|
76
|
-
*
|
|
68
|
+
* The sweep deletes each receive record with `awaitingEnvelope: true`, which
|
|
69
|
+
* the conversion wrote, then each legacy row under `received-content:<id>`,
|
|
70
|
+
* and then the marker of the conversion. A record of this release always
|
|
71
|
+
* carries the sender fields of its envelope, so no later read of the open
|
|
72
|
+
* finds a converted record. A converted record waits for an envelope that
|
|
73
|
+
* the Relay keeps for at most its retention period, 30 days in production,
|
|
74
|
+
* and no version gave its content to the application. A device that
|
|
75
|
+
* received the content on SDK 11 inside that period loses the row here,
|
|
76
|
+
* where 13.x would have completed it on redelivery.
|
|
77
77
|
*
|
|
78
|
-
*
|
|
79
|
-
*
|
|
80
|
-
*
|
|
81
|
-
*
|
|
82
|
-
*
|
|
83
|
-
*
|
|
84
|
-
* decrypt, once after the upgrade.
|
|
78
|
+
* No marker guards the sweep. Each open lists the records and the legacy
|
|
79
|
+
* rows again, so a sweep that stops deletes the rest at the next open. An
|
|
80
|
+
* open that deleted at least one record or row logs one line with
|
|
81
|
+
* `LEGACY_RECEIVED_CONTENT_DELETED`: `count` is every deleted record and
|
|
82
|
+
* row, and `readable` is the legacy rows that parse as SDK 11 received
|
|
83
|
+
* content. The line holds no key and no value.
|
|
85
84
|
*/
|
|
86
|
-
export declare function
|
|
85
|
+
export declare function sweepLegacyReceivedContent(store: Pick<SignalProtocolLocalStore, 'listReceiveWork' | 'completeReceiveWork' | 'getMetadata' | 'deleteMetadata'>, rows: LegacyReceivedContentRows, logger: Pick<Required<Logger>, 'warn'>): Promise<void>;
|
|
86
|
+
export {};
|
|
87
87
|
//# sourceMappingURL=receive-work.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"receive-work.d.ts","sourceRoot":"","sources":["../../../local/store/receive-work.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"receive-work.d.ts","sourceRoot":"","sources":["../../../local/store/receive-work.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,15 @@
|
|
|
1
1
|
import { keyedGroupHash, keyedIndexSubkey } from './keyed-index.js';
|
|
2
|
-
import { parseReceivedContent, receivedContentKey } from './received-content.js';
|
|
3
2
|
/** The default page size of a receive-record listing. */
|
|
4
3
|
export const RECEIVE_WORK_DEFAULT_LIMIT = 100;
|
|
5
|
-
/**
|
|
4
|
+
/**
|
|
5
|
+
* The metadata key that the legacy conversion of SDK 13.x set when it was
|
|
6
|
+
* done. The sweep deletes it.
|
|
7
|
+
*/
|
|
6
8
|
export const LEGACY_RECEIVED_CONTENT_MARKER_KEY = 'receive-work:legacy-conversion:v1';
|
|
7
|
-
/** The log code of
|
|
8
|
-
export const
|
|
9
|
+
/** The log code of an open that deleted legacy received content. */
|
|
10
|
+
export const LEGACY_RECEIVED_CONTENT_DELETED = 'LEGACY_RECEIVED_CONTENT_DELETED';
|
|
11
|
+
/** The key prefix of a legacy row that SDK 11 wrote: `received-content:<id>`. */
|
|
12
|
+
const LEGACY_RECEIVED_CONTENT_KEY_PREFIX = 'received-content:';
|
|
9
13
|
const STAGES = new Set(['decrypted', 'receipt-due', 'awaiting-completion']);
|
|
10
14
|
const ORIGINS = new Set(['relay', 'caller']);
|
|
11
15
|
const MESSAGE_TYPES = new Set(['prekey_bundle', 'ciphertext', 'sender_key']);
|
|
@@ -25,15 +29,31 @@ const isString = (value) => typeof value === 'string';
|
|
|
25
29
|
const isNonEmptyString = (value) => typeof value === 'string' && value !== '';
|
|
26
30
|
const isSafeInteger = (value) => Number.isSafeInteger(value);
|
|
27
31
|
const isBoolean = (value) => typeof value === 'boolean';
|
|
32
|
+
/**
|
|
33
|
+
* Tell whether a value is the `received` key of a receive record. Two shapes
|
|
34
|
+
* pass:
|
|
35
|
+
*
|
|
36
|
+
* - The key of this release: `senderUserId` and `timestamp` only.
|
|
37
|
+
* - The SDK 13.x key: `senderUserId`, `senderDeviceId` as a safe integer,
|
|
38
|
+
* `timestamp` and `contentDigest` as a string. A receive record that SDK
|
|
39
|
+
* 13.x wrote completes through the same reader, and the completion records
|
|
40
|
+
* the key under its sender user and timestamp only. A receive record lives
|
|
41
|
+
* at most `MAX_RECEIVE_WORK_AGE_MS` (30 days), which bounds this window.
|
|
42
|
+
* The next major SDK version after this one removes this shape.
|
|
43
|
+
*/
|
|
28
44
|
const isReceivedKey = (value) => {
|
|
29
45
|
const key = value;
|
|
30
|
-
|
|
31
|
-
typeof key
|
|
32
|
-
isNonEmptyString(key.senderUserId)
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
46
|
+
if (key === null ||
|
|
47
|
+
typeof key !== 'object' ||
|
|
48
|
+
!isNonEmptyString(key.senderUserId) ||
|
|
49
|
+
typeof key.timestamp !== 'number' ||
|
|
50
|
+
!Number.isFinite(key.timestamp)) {
|
|
51
|
+
return false;
|
|
52
|
+
}
|
|
53
|
+
const fields = Object.keys(key).length;
|
|
54
|
+
if (fields === 2)
|
|
55
|
+
return true;
|
|
56
|
+
return fields === 4 && isSafeInteger(key.senderDeviceId) && isString(key.contentDigest);
|
|
37
57
|
};
|
|
38
58
|
/**
|
|
39
59
|
* Check the shape of one receive record. Throws on a record that a store
|
|
@@ -72,7 +92,6 @@ export function assertReceiveWork(record, workId = record.workId) {
|
|
|
72
92
|
!isOptional(candidate.relayOwnsReceipt, isBoolean) ||
|
|
73
93
|
!isOptional(candidate.hookAttempts, (value) => isSafeInteger(value) && value > 0) ||
|
|
74
94
|
!isOptional(candidate.failedEnvelopeId, isNonEmptyString) ||
|
|
75
|
-
!isOptional(candidate.awaitingEnvelope, (value) => value === true) ||
|
|
76
95
|
!isOptional(candidate.received, isReceivedKey)) {
|
|
77
96
|
throw new Error('Invalid receive-work record');
|
|
78
97
|
}
|
|
@@ -149,67 +168,95 @@ export function indexMatchesReceiveWorkQuery(index, workId, query = {}) {
|
|
|
149
168
|
(query.dueBy === undefined || index.dueAt <= query.dueBy) &&
|
|
150
169
|
isAfterReceiveWorkCursor(index.arrivalSeq, workId, query.after));
|
|
151
170
|
}
|
|
152
|
-
/**
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
+
/**
|
|
172
|
+
* Parse one legacy row as the received content that SDK 11 wrote. Throws on
|
|
173
|
+
* a row that does not parse.
|
|
174
|
+
*/
|
|
175
|
+
function parseLegacyReceivedContent(value, id) {
|
|
176
|
+
const record = JSON.parse(value);
|
|
177
|
+
if (record.id !== id ||
|
|
178
|
+
typeof record.plaintext !== 'string' ||
|
|
179
|
+
!Number.isSafeInteger(record.receivedAt) ||
|
|
180
|
+
record.receivedAt <= 0 ||
|
|
181
|
+
(record.groupId !== undefined &&
|
|
182
|
+
(typeof record.groupId !== 'string' || record.groupId.length === 0))) {
|
|
183
|
+
throw new Error('Invalid received-content record');
|
|
184
|
+
}
|
|
185
|
+
}
|
|
186
|
+
/** Tell whether one legacy row parses as the received content of SDK 11. */
|
|
187
|
+
async function isReadableLegacyRow(rows, key) {
|
|
188
|
+
let value;
|
|
189
|
+
try {
|
|
190
|
+
value = await rows.read(key);
|
|
191
|
+
}
|
|
192
|
+
catch {
|
|
193
|
+
return false;
|
|
194
|
+
}
|
|
195
|
+
if (value === null)
|
|
196
|
+
return null;
|
|
197
|
+
try {
|
|
198
|
+
parseLegacyReceivedContent(value, key.slice(LEGACY_RECEIVED_CONTENT_KEY_PREFIX.length));
|
|
199
|
+
return true;
|
|
200
|
+
}
|
|
201
|
+
catch {
|
|
202
|
+
return false;
|
|
203
|
+
}
|
|
204
|
+
}
|
|
205
|
+
/** Tell whether one stored record is a converted legacy row that waits for its envelope. */
|
|
206
|
+
function isAwaitingEnvelope(record) {
|
|
207
|
+
return record.awaitingEnvelope === true;
|
|
171
208
|
}
|
|
172
209
|
/**
|
|
173
|
-
*
|
|
174
|
-
*
|
|
210
|
+
* Delete the received content that SDK 11 and the legacy conversion of
|
|
211
|
+
* SDK 13.x left, at each open of a durable store.
|
|
175
212
|
*
|
|
176
|
-
*
|
|
177
|
-
* the
|
|
178
|
-
*
|
|
179
|
-
*
|
|
180
|
-
*
|
|
213
|
+
* The sweep deletes each receive record with `awaitingEnvelope: true`, which
|
|
214
|
+
* the conversion wrote, then each legacy row under `received-content:<id>`,
|
|
215
|
+
* and then the marker of the conversion. A record of this release always
|
|
216
|
+
* carries the sender fields of its envelope, so no later read of the open
|
|
217
|
+
* finds a converted record. A converted record waits for an envelope that
|
|
218
|
+
* the Relay keeps for at most its retention period, 30 days in production,
|
|
219
|
+
* and no version gave its content to the application. A device that
|
|
220
|
+
* received the content on SDK 11 inside that period loses the row here,
|
|
221
|
+
* where 13.x would have completed it on redelivery.
|
|
181
222
|
*
|
|
182
|
-
*
|
|
183
|
-
*
|
|
184
|
-
*
|
|
185
|
-
*
|
|
186
|
-
*
|
|
187
|
-
*
|
|
188
|
-
* decrypt, once after the upgrade.
|
|
223
|
+
* No marker guards the sweep. Each open lists the records and the legacy
|
|
224
|
+
* rows again, so a sweep that stops deletes the rest at the next open. An
|
|
225
|
+
* open that deleted at least one record or row logs one line with
|
|
226
|
+
* `LEGACY_RECEIVED_CONTENT_DELETED`: `count` is every deleted record and
|
|
227
|
+
* row, and `readable` is the legacy rows that parse as SDK 11 received
|
|
228
|
+
* content. The line holds no key and no value.
|
|
189
229
|
*/
|
|
190
|
-
export async function
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
for (
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
if (value === null)
|
|
230
|
+
export async function sweepLegacyReceivedContent(store, rows, logger) {
|
|
231
|
+
let count = 0;
|
|
232
|
+
let readable = 0;
|
|
233
|
+
let after;
|
|
234
|
+
for (;;) {
|
|
235
|
+
const page = await store.listReceiveWork(after === undefined ? {} : { after });
|
|
236
|
+
for (const record of page) {
|
|
237
|
+
if (!isAwaitingEnvelope(record))
|
|
199
238
|
continue;
|
|
200
|
-
|
|
239
|
+
if (await store.completeReceiveWork(record.workId, record.revision))
|
|
240
|
+
count += 1;
|
|
201
241
|
}
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
242
|
+
const last = page.at(-1);
|
|
243
|
+
if (last === undefined)
|
|
244
|
+
break;
|
|
245
|
+
after = { arrivalSeq: last.arrivalSeq, workId: last.workId };
|
|
246
|
+
}
|
|
247
|
+
for (const key of await rows.listKeys(LEGACY_RECEIVED_CONTENT_KEY_PREFIX)) {
|
|
248
|
+
const parsed = await isReadableLegacyRow(rows, key);
|
|
249
|
+
if (parsed === null)
|
|
205
250
|
continue;
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
251
|
+
await rows.delete(key);
|
|
252
|
+
count += 1;
|
|
253
|
+
if (parsed)
|
|
254
|
+
readable += 1;
|
|
255
|
+
}
|
|
256
|
+
if ((await store.getMetadata(LEGACY_RECEIVED_CONTENT_MARKER_KEY)) !== null) {
|
|
257
|
+
await store.deleteMetadata(LEGACY_RECEIVED_CONTENT_MARKER_KEY);
|
|
211
258
|
}
|
|
212
|
-
|
|
213
|
-
|
|
259
|
+
if (count > 0)
|
|
260
|
+
logger.warn(LEGACY_RECEIVED_CONTENT_DELETED, { count, readable });
|
|
214
261
|
}
|
|
215
262
|
//# sourceMappingURL=receive-work.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"receive-work.js","sourceRoot":"","sources":["../../../local/store/receive-work.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"receive-work.js","sourceRoot":"","sources":["../../../local/store/receive-work.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import type { Envelope } from '../../remote/relay/types.js';
|
|
2
|
-
import type { ReceivedContent } from '../../types/api.js';
|
|
3
2
|
/**
|
|
4
3
|
* Bind recovery to the device that consumed an envelope, and to the
|
|
5
4
|
* envelope ID, the sender, the message type and the ciphertext of the
|
|
@@ -16,8 +15,4 @@ export declare function receivedContentId(userId: string, deviceId: number, enve
|
|
|
16
15
|
* before any unseal, and the timestamps are not part of the value.
|
|
17
16
|
*/
|
|
18
17
|
export declare function deliveredEnvelopeFingerprint(userId: string, deviceId: number, envelope: Parameters<typeof receivedContentId>[2]): Promise<string>;
|
|
19
|
-
/** The metadata key of one legacy row. */
|
|
20
|
-
export declare function receivedContentKey(id: string): string;
|
|
21
|
-
/** Parse one legacy row. Throws on a row that does not parse. */
|
|
22
|
-
export declare function parseReceivedContent(value: string, id: string): ReceivedContent;
|
|
23
18
|
//# sourceMappingURL=received-content.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"received-content.d.ts","sourceRoot":"","sources":["../../../local/store/received-content.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"received-content.d.ts","sourceRoot":"","sources":["../../../local/store/received-content.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAEzD;;;;;GAKG;AACH,wBAAsB,iBAAiB,CACrC,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,cAAc,GAAG,gBAAgB,GAAG,YAAY,GAAG,IAAI,CAAC,GAAG;IAClF,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,GACA,OAAO,CAAC,MAAM,CAAC,CAmBjB;AAED;;;;;GAKG;AACH,wBAAsB,4BAA4B,CAChD,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,UAAU,CAAC,OAAO,iBAAiB,CAAC,CAAC,CAAC,CAAC,GAChD,OAAO,CAAC,MAAM,CAAC,CAKjB"}
|
|
@@ -32,21 +32,4 @@ export async function deliveredEnvelopeFingerprint(userId, deviceId, envelope) {
|
|
|
32
32
|
messageType: envelope.messageType ?? 'ciphertext',
|
|
33
33
|
});
|
|
34
34
|
}
|
|
35
|
-
/** The metadata key of one legacy row. */
|
|
36
|
-
export function receivedContentKey(id) {
|
|
37
|
-
return `received-content:${id}`;
|
|
38
|
-
}
|
|
39
|
-
/** Parse one legacy row. Throws on a row that does not parse. */
|
|
40
|
-
export function parseReceivedContent(value, id) {
|
|
41
|
-
const record = JSON.parse(value);
|
|
42
|
-
if (record.id !== id ||
|
|
43
|
-
typeof record.plaintext !== 'string' ||
|
|
44
|
-
!Number.isSafeInteger(record.receivedAt) ||
|
|
45
|
-
record.receivedAt <= 0 ||
|
|
46
|
-
(record.groupId !== undefined &&
|
|
47
|
-
(typeof record.groupId !== 'string' || record.groupId.length === 0))) {
|
|
48
|
-
throw new Error('Invalid received-content record');
|
|
49
|
-
}
|
|
50
|
-
return record;
|
|
51
|
-
}
|
|
52
35
|
//# sourceMappingURL=received-content.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"received-content.js","sourceRoot":"","sources":["../../../local/store/received-content.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"received-content.js","sourceRoot":"","sources":["../../../local/store/received-content.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAG9D;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,MAAc,EACd,QAAgB,EAChB,QAEC;IAED,MAAM,UAAU,GACd,OAAO,QAAQ,CAAC,UAAU,KAAK,QAAQ;QACrC,CAAC,CAAC,QAAQ,CAAC,UAAU;QACrB,CAAC,CAAC,aAAa,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;IACzC,MAAM,MAAM,GAAG,MAAM,MAAM,CACzB,IAAI,WAAW,EAAE,CAAC,MAAM,CACtB,IAAI,CAAC,SAAS,CAAC;QACb,MAAM;QACN,QAAQ;QACR,QAAQ,CAAC,EAAE;QACX,QAAQ,CAAC,YAAY;QACrB,QAAQ,CAAC,cAAc;QACvB,QAAQ,CAAC,WAAW;QACpB,UAAU;KACX,CAAC,CACH,CACF,CAAC;IACF,OAAO,aAAa,CAAC,MAAM,CAAC,CAAC;AAC/B,CAAC;AAED;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,4BAA4B,CAChD,MAAc,EACd,QAAgB,EAChB,QAAiD;IAEjD,OAAO,iBAAiB,CAAC,MAAM,EAAE,QAAQ,EAAE;QACzC,GAAG,QAAQ;QACX,WAAW,EAAE,QAAQ,CAAC,WAAW,IAAI,YAAY;KAClD,CAAC,CAAC;AACL,CAAC"}
|