@dxos/echo-db 2.33.5-dev.0a40e013 → 2.33.5-dev.1fc05a51

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.
Files changed (168) hide show
  1. package/dist/src/api/selection/queries.d.ts.map +1 -1
  2. package/dist/src/api/selection/queries.js +13 -17
  3. package/dist/src/api/selection/queries.js.map +1 -1
  4. package/dist/src/api/selection/selection.d.ts.map +1 -1
  5. package/dist/src/api/selection/selection.js +1 -3
  6. package/dist/src/api/selection/selection.js.map +1 -1
  7. package/dist/src/api/selection/selection.test.js +4 -12
  8. package/dist/src/api/selection/selection.test.js.map +1 -1
  9. package/dist/src/database/item-demuxer.d.ts +1 -1
  10. package/dist/src/database/item-demuxer.d.ts.map +1 -1
  11. package/dist/src/database/item-demuxer.js +3 -3
  12. package/dist/src/database/item-demuxer.js.map +1 -1
  13. package/dist/src/database/item-manager.js +2 -2
  14. package/dist/src/database/item-manager.js.map +1 -1
  15. package/dist/src/database/testing.js +1 -1
  16. package/dist/src/database/testing.js.map +1 -1
  17. package/dist/src/echo.d.ts +1 -0
  18. package/dist/src/echo.d.ts.map +1 -1
  19. package/dist/src/echo.js +7 -18
  20. package/dist/src/echo.js.map +1 -1
  21. package/dist/src/halo/halo-factory.d.ts.map +1 -1
  22. package/dist/src/halo/halo-factory.js +5 -11
  23. package/dist/src/halo/halo-factory.js.map +1 -1
  24. package/dist/src/halo/halo-party.d.ts +3 -3
  25. package/dist/src/halo/halo-party.d.ts.map +1 -1
  26. package/dist/src/halo/halo-party.js +3 -3
  27. package/dist/src/halo/halo-party.js.map +1 -1
  28. package/dist/src/halo/halo.test.js +4 -3
  29. package/dist/src/halo/halo.test.js.map +1 -1
  30. package/dist/src/halo/identity.js +2 -2
  31. package/dist/src/halo/identity.js.map +1 -1
  32. package/dist/src/halo/party-opener.d.ts +1 -1
  33. package/dist/src/halo/party-opener.d.ts.map +1 -1
  34. package/dist/src/halo/party-opener.js +2 -2
  35. package/dist/src/halo/party-opener.js.map +1 -1
  36. package/dist/src/halo/preferences.d.ts.map +1 -1
  37. package/dist/src/halo/preferences.js +7 -10
  38. package/dist/src/halo/preferences.js.map +1 -1
  39. package/dist/src/invitations/greeting-protocol-provider.d.ts.map +1 -1
  40. package/dist/src/invitations/greeting-protocol-provider.js +5 -9
  41. package/dist/src/invitations/greeting-protocol-provider.js.map +1 -1
  42. package/dist/src/invitations/greeting-responder.d.ts +2 -2
  43. package/dist/src/invitations/greeting-responder.d.ts.map +1 -1
  44. package/dist/src/invitations/greeting-responder.js +8 -12
  45. package/dist/src/invitations/greeting-responder.js.map +1 -1
  46. package/dist/src/invitations/invitation-factory.d.ts +2 -2
  47. package/dist/src/invitations/invitation-factory.d.ts.map +1 -1
  48. package/dist/src/invitations/invitation-factory.js.map +1 -1
  49. package/dist/src/invitations/offline-invitation-claimer.d.ts.map +1 -1
  50. package/dist/src/invitations/offline-invitation-claimer.js +5 -7
  51. package/dist/src/invitations/offline-invitation-claimer.js.map +1 -1
  52. package/dist/src/parties/data-party.d.ts +7 -5
  53. package/dist/src/parties/data-party.d.ts.map +1 -1
  54. package/dist/src/parties/data-party.js +9 -8
  55. package/dist/src/parties/data-party.js.map +1 -1
  56. package/dist/src/parties/data-party.test.js +16 -15
  57. package/dist/src/parties/data-party.test.js.map +1 -1
  58. package/dist/src/parties/party-factory.d.ts +0 -6
  59. package/dist/src/parties/party-factory.d.ts.map +1 -1
  60. package/dist/src/parties/party-factory.js +17 -45
  61. package/dist/src/parties/party-factory.js.map +1 -1
  62. package/dist/src/parties/party-manager.d.ts.map +1 -1
  63. package/dist/src/parties/party-manager.js +2 -1
  64. package/dist/src/parties/party-manager.js.map +1 -1
  65. package/dist/src/parties/party-manager.test.js +7 -6
  66. package/dist/src/parties/party-manager.test.js.map +1 -1
  67. package/dist/src/pipeline/message-selector.d.ts +2 -2
  68. package/dist/src/pipeline/message-selector.d.ts.map +1 -1
  69. package/dist/src/pipeline/message-selector.js +29 -29
  70. package/dist/src/pipeline/message-selector.js.map +1 -1
  71. package/dist/src/pipeline/metadata-store.d.ts +3 -3
  72. package/dist/src/pipeline/metadata-store.d.ts.map +1 -1
  73. package/dist/src/pipeline/metadata-store.js +5 -5
  74. package/dist/src/pipeline/metadata-store.js.map +1 -1
  75. package/dist/src/pipeline/metadata-store.test.js +8 -4
  76. package/dist/src/pipeline/metadata-store.test.js.map +1 -1
  77. package/dist/src/pipeline/party-core.d.ts +3 -2
  78. package/dist/src/pipeline/party-core.d.ts.map +1 -1
  79. package/dist/src/pipeline/party-core.js +5 -0
  80. package/dist/src/pipeline/party-core.js.map +1 -1
  81. package/dist/src/pipeline/party-core.test.js +15 -15
  82. package/dist/src/pipeline/party-core.test.js.map +1 -1
  83. package/dist/src/pipeline/party-processor.d.ts +23 -5
  84. package/dist/src/pipeline/party-processor.d.ts.map +1 -1
  85. package/dist/src/pipeline/party-processor.js.map +1 -1
  86. package/dist/src/pipeline/pipeline.d.ts +2 -4
  87. package/dist/src/pipeline/pipeline.d.ts.map +1 -1
  88. package/dist/src/pipeline/pipeline.js +0 -3
  89. package/dist/src/pipeline/pipeline.js.map +1 -1
  90. package/dist/src/pipeline/pipeline.test.js +2 -2
  91. package/dist/src/pipeline/pipeline.test.js.map +1 -1
  92. package/dist/src/protocol/auth-plugin.d.ts +1 -1
  93. package/dist/src/protocol/auth-plugin.d.ts.map +1 -1
  94. package/dist/src/protocol/auth-plugin.js +1 -3
  95. package/dist/src/protocol/auth-plugin.js.map +1 -1
  96. package/dist/src/protocol/authenticator.d.ts +2 -2
  97. package/dist/src/protocol/authenticator.d.ts.map +1 -1
  98. package/dist/src/protocol/authenticator.js +12 -16
  99. package/dist/src/protocol/authenticator.js.map +1 -1
  100. package/dist/src/protocol/halo-recovery-plugin.d.ts +1 -1
  101. package/dist/src/protocol/halo-recovery-plugin.d.ts.map +1 -1
  102. package/dist/src/protocol/halo-recovery-plugin.js +1 -3
  103. package/dist/src/protocol/halo-recovery-plugin.js.map +1 -1
  104. package/dist/src/protocol/identity-credentials.d.ts +2 -2
  105. package/dist/src/protocol/identity-credentials.d.ts.map +1 -1
  106. package/dist/src/protocol/identity-credentials.js +4 -4
  107. package/dist/src/protocol/identity-credentials.js.map +1 -1
  108. package/dist/src/protocol/offline-invitation-plugin.d.ts +1 -1
  109. package/dist/src/protocol/offline-invitation-plugin.d.ts.map +1 -1
  110. package/dist/src/protocol/offline-invitation-plugin.js +1 -3
  111. package/dist/src/protocol/offline-invitation-plugin.js.map +1 -1
  112. package/dist/src/protocol/replicator-plugin.d.ts.map +1 -1
  113. package/dist/src/protocol/replicator-plugin.js +4 -6
  114. package/dist/src/protocol/replicator-plugin.js.map +1 -1
  115. package/dist/src/snapshots/snapshot-generator.d.ts +1 -1
  116. package/dist/src/snapshots/snapshot-generator.d.ts.map +1 -1
  117. package/dist/src/snapshots/snapshot-generator.js +13 -15
  118. package/dist/src/snapshots/snapshot-generator.js.map +1 -1
  119. package/dist/src/snapshots/snapshot-store.d.ts +3 -3
  120. package/dist/src/snapshots/snapshot-store.d.ts.map +1 -1
  121. package/dist/src/snapshots/snapshot-store.js +5 -5
  122. package/dist/src/snapshots/snapshot-store.js.map +1 -1
  123. package/dist/src/snapshots/snapshot-store.test.js +1 -1
  124. package/dist/src/snapshots/snapshot-store.test.js.map +1 -1
  125. package/dist/src/testing/testing-factories.js +2 -2
  126. package/dist/src/testing/testing-factories.js.map +1 -1
  127. package/dist/tsconfig.tsbuildinfo +1 -1
  128. package/package.json +18 -18
  129. package/src/api/selection/queries.ts +14 -18
  130. package/src/api/selection/selection.test.ts +4 -12
  131. package/src/api/selection/selection.ts +1 -7
  132. package/src/database/item-demuxer.ts +2 -2
  133. package/src/database/item-manager.ts +2 -2
  134. package/src/database/testing.ts +1 -1
  135. package/src/echo.ts +8 -18
  136. package/src/halo/halo-factory.ts +6 -18
  137. package/src/halo/halo-party.ts +6 -6
  138. package/src/halo/halo.test.ts +4 -3
  139. package/src/halo/identity.ts +2 -2
  140. package/src/halo/party-opener.ts +2 -2
  141. package/src/halo/preferences.ts +7 -10
  142. package/src/invitations/greeting-protocol-provider.ts +5 -9
  143. package/src/invitations/greeting-responder.ts +10 -14
  144. package/src/invitations/invitation-factory.ts +2 -2
  145. package/src/invitations/offline-invitation-claimer.ts +5 -7
  146. package/src/parties/data-party.test.ts +17 -15
  147. package/src/parties/data-party.ts +15 -12
  148. package/src/parties/party-factory.ts +23 -69
  149. package/src/parties/party-manager.test.ts +9 -6
  150. package/src/parties/party-manager.ts +2 -1
  151. package/src/pipeline/message-selector.ts +30 -34
  152. package/src/pipeline/metadata-store.test.ts +8 -4
  153. package/src/pipeline/metadata-store.ts +5 -5
  154. package/src/pipeline/party-core.test.ts +15 -15
  155. package/src/pipeline/party-core.ts +7 -2
  156. package/src/pipeline/party-processor.ts +26 -2
  157. package/src/pipeline/pipeline.test.ts +2 -2
  158. package/src/pipeline/pipeline.ts +2 -6
  159. package/src/protocol/auth-plugin.ts +1 -3
  160. package/src/protocol/authenticator.ts +27 -31
  161. package/src/protocol/halo-recovery-plugin.ts +4 -6
  162. package/src/protocol/identity-credentials.ts +4 -4
  163. package/src/protocol/offline-invitation-plugin.ts +4 -6
  164. package/src/protocol/replicator-plugin.ts +4 -6
  165. package/src/snapshots/snapshot-generator.ts +12 -16
  166. package/src/snapshots/snapshot-store.test.ts +1 -1
  167. package/src/snapshots/snapshot-store.ts +5 -6
  168. package/src/testing/testing-factories.ts +2 -2
@@ -60,10 +60,10 @@ export class PartyFactory {
60
60
  // Connect the pipeline.
61
61
  await party.open();
62
62
 
63
- const writableFeed = await party.feedProvider.createOrOpenWritableFeed();
63
+ const writableFeed = await party.getWriteFeed();
64
64
 
65
65
  // PartyGenesis (self-signed by Party).
66
- await party.processor.writeHaloMessage(createPartyGenesisMessage(
66
+ await party.writeCredentialsMessage(createPartyGenesisMessage(
67
67
  identity.keyring,
68
68
  partyKey,
69
69
  writableFeed.key,
@@ -71,7 +71,7 @@ export class PartyFactory {
71
71
  );
72
72
 
73
73
  // KeyAdmit (IdentityGenesis in an Envelope signed by Party).
74
- await party.processor.writeHaloMessage(createEnvelopeMessage(
74
+ await party.writeCredentialsMessage(createEnvelopeMessage(
75
75
  identity.keyring,
76
76
  partyKey.publicKey,
77
77
  wrapMessage(identity.identityGenesis),
@@ -80,7 +80,7 @@ export class PartyFactory {
80
80
 
81
81
  // FeedAdmit (signed by the Device KeyChain).
82
82
  // TODO(dmaretskyi): Is this really needed since a feed is already admitted by party genesis message.
83
- await party.processor.writeHaloMessage(createFeedAdmitMessage(
83
+ await party.writeCredentialsMessage(createFeedAdmitMessage(
84
84
  identity.keyring,
85
85
  partyKey.publicKey,
86
86
  writableFeed.key,
@@ -89,7 +89,7 @@ export class PartyFactory {
89
89
 
90
90
  // IdentityInfo in an Envelope signed by the Device KeyChain.
91
91
  if (identity.identityInfo) {
92
- await party.processor.writeHaloMessage(createEnvelopeMessage(
92
+ await party.writeCredentialsMessage(createEnvelopeMessage(
93
93
  identity.keyring,
94
94
  partyKey.publicKey,
95
95
  wrapMessage(identity.identityInfo),
@@ -106,50 +106,6 @@ export class PartyFactory {
106
106
  return party;
107
107
  }
108
108
 
109
- /**
110
- * Constructs a party object and creates a local write feed for it.
111
- * @param partyKey
112
- * @param hints
113
- */
114
- async addParty (partyKey: PartyKey, hints: KeyHint[] = []) {
115
- const identity = this._identityProvider() ?? raise(new IdentityNotInitializedError());
116
-
117
- /*
118
- * TODO(telackey): We shouldn't have to add our key here, it should be in the hints, but our hint
119
- * mechanism is broken by not waiting on the messages to be processed before returning.
120
- */
121
-
122
- const feedProvider = this._feedProviderFactory(partyKey);
123
- const { feed } = await feedProvider.createOrOpenWritableFeed();
124
- const feedKeyPair = identity.keyring.getKey(feed.key);
125
- assert(feedKeyPair, 'Keypair for writable feed not found.');
126
- const party = new DataParty(
127
- partyKey,
128
- this._modelFactory,
129
- this._snapshotStore,
130
- feedProvider,
131
- identity.createCredentialsSigner(),
132
- identity.preferences,
133
- this._networkManager,
134
- hints,
135
- undefined,
136
- this._options
137
- );
138
-
139
- await party.open();
140
- const isHalo = identity.identityKey.publicKey.equals(partyKey);
141
- const signingKey = isHalo ? identity.deviceKey : identity.deviceKeyChain;
142
- assert(signingKey, 'No device key or keychain.');
143
- // Write the Feed genesis message.
144
- await party.processor.writeHaloMessage(createFeedAdmitMessage(
145
- identity.keyring,
146
- partyKey,
147
- feedKeyPair.publicKey,
148
- [signingKey]
149
- ));
150
- return party;
151
- }
152
-
153
109
  /**
154
110
  * Constructs a party object from an existing set of feeds.
155
111
  * @param partyKey
@@ -190,7 +146,6 @@ export class PartyFactory {
190
146
  }
191
147
 
192
148
  async joinParty (invitationDescriptor: InvitationDescriptor, secretProvider: SecretProvider): Promise<DataParty> {
193
- const haloInvitation = !!invitationDescriptor.identityKey;
194
149
  const originalInvitation = invitationDescriptor;
195
150
 
196
151
  const identity = this._identityProvider() ?? raise(new IdentityNotInitializedError());
@@ -218,19 +173,18 @@ export class PartyFactory {
218
173
 
219
174
  await initiator.connect();
220
175
  const { partyKey, hints } = await initiator.redeemInvitation(secretProvider);
221
- const party = await this.addParty(partyKey, hints);
176
+ const party = await this.constructParty(partyKey, hints);
177
+ await party.open();
222
178
  await initiator.destroy();
223
- if (!haloInvitation) {
224
- // Copy our signed IdentityInfo into the new Party.
225
- const infoMessage = identity.identityInfo;
226
- if (infoMessage) {
227
- await party.processor.writeHaloMessage(createEnvelopeMessage(
228
- identity.keyring,
229
- partyKey,
230
- wrapMessage(infoMessage),
231
- [identity.deviceKeyChain]
232
- ));
233
- }
179
+
180
+ // Copy our signed IdentityInfo into the new Party.
181
+ if (identity.identityInfo) {
182
+ await party.writeCredentialsMessage(createEnvelopeMessage(
183
+ identity.keyring,
184
+ partyKey,
185
+ wrapMessage(identity.identityInfo),
186
+ [identity.deviceKeyChain]
187
+ ));
234
188
  }
235
189
 
236
190
  return party;
@@ -247,10 +201,10 @@ export class PartyFactory {
247
201
  // Connect the pipeline.
248
202
  await party.open();
249
203
 
250
- const writableFeed = await party.feedProvider.createOrOpenWritableFeed();
204
+ const writableFeed = await party.getWriteFeed();
251
205
 
252
206
  // PartyGenesis (self-signed by Party).
253
- await party.processor.writeHaloMessage(createPartyGenesisMessage(
207
+ await party.writeCredentialsMessage(createPartyGenesisMessage(
254
208
  identity.keyring,
255
209
  partyKey,
256
210
  writableFeed.key,
@@ -258,7 +212,7 @@ export class PartyFactory {
258
212
  );
259
213
 
260
214
  // KeyAdmit (IdentityGenesis in an Envelope signed by Party).
261
- await party.processor.writeHaloMessage(createEnvelopeMessage(
215
+ await party.writeCredentialsMessage(createEnvelopeMessage(
262
216
  identity.keyring,
263
217
  partyKey.publicKey,
264
218
  wrapMessage(identity.identityGenesis),
@@ -266,7 +220,7 @@ export class PartyFactory {
266
220
  ));
267
221
 
268
222
  // FeedAdmit (signed by the Device KeyChain).
269
- await party.processor.writeHaloMessage(createFeedAdmitMessage(
223
+ await party.writeCredentialsMessage(createFeedAdmitMessage(
270
224
  identity.keyring,
271
225
  partyKey.publicKey,
272
226
  writableFeed.key,
@@ -275,7 +229,7 @@ export class PartyFactory {
275
229
 
276
230
  // IdentityInfo in an Envelope signed by the Device KeyChain.
277
231
  if (identity.identityInfo) {
278
- await party.processor.writeHaloMessage(createEnvelopeMessage(
232
+ await party.writeCredentialsMessage(createEnvelopeMessage(
279
233
  identity.keyring,
280
234
  partyKey.publicKey,
281
235
  wrapMessage(identity.identityInfo),
@@ -285,7 +239,7 @@ export class PartyFactory {
285
239
 
286
240
  // const keyAdmitMessage = snapshot.halo?.messages?.[1];
287
241
  // assert(keyAdmitMessage);
288
- // await party.processor.writeHaloMessage(createEnvelopeMessage(
242
+ // await party.writeCredentialsMessage(createEnvelopeMessage(
289
243
  // identity.signer,
290
244
  // partyKey.publicKey,
291
245
  // keyAdmitMessage,
@@ -293,7 +247,7 @@ export class PartyFactory {
293
247
  // ));
294
248
 
295
249
  // for(const message of snapshot.halo?.messages?.slice(2) || []) {
296
- // await party.processor.writeHaloMessage(message);
250
+ // await party.writeCredentialsMessage(message);
297
251
  // }
298
252
 
299
253
  // Write messages to create ECHO items.
@@ -55,9 +55,11 @@ const log = debug('dxos:echo:parties:party-manager:test');
55
55
  */
56
56
  const setup = async () => {
57
57
  const keyring = new Keyring();
58
- const metadataStore = new MetadataStore(createStorage('metadata', StorageType.RAM));
59
- const feedStore = new FeedStore(createStorage('feed', StorageType.RAM), { valueEncoding: codec });
60
- const snapshotStore = new SnapshotStore(createStorage('snapshots', StorageType.RAM));
58
+
59
+ const storage = createStorage('', StorageType.RAM);
60
+ const snapshotStore = new SnapshotStore(storage.directory('snapshots'));
61
+ const metadataStore = new MetadataStore(storage.directory('metadata'));
62
+ const feedStore = new FeedStore(storage.directory('feed'), { valueEncoding: codec });
61
63
  const modelFactory = new ModelFactory().registerModel(ObjectModel);
62
64
  const networkManager = new NetworkManager();
63
65
  const feedProviderFactory = (partyKey: PublicKey) => new PartyFeedProvider(metadataStore, keyring, feedStore, partyKey);
@@ -147,12 +149,13 @@ describe('Party manager', () => {
147
149
  });
148
150
 
149
151
  test('Create from cold start', async () => {
152
+
150
153
  const storage = createStorage('', StorageType.RAM);
151
- const feedStore = new FeedStore(storage, { valueEncoding: codec });
154
+ const feedStore = new FeedStore(storage.directory('feed'), { valueEncoding: codec });
152
155
  const keyring = new Keyring();
153
- const metadataStore = new MetadataStore(createStorage('metadata', StorageType.RAM));
156
+ const snapshotStore = new SnapshotStore(storage.directory('snapshots'));
157
+ const metadataStore = new MetadataStore(storage.directory('metadata'));
154
158
  const modelFactory = new ModelFactory().registerModel(ObjectModel);
155
- const snapshotStore = new SnapshotStore(createStorage('snapshots', StorageType.RAM));
156
159
  const networkManager = new NetworkManager();
157
160
  const feedProviderFactory = (partyKey: PublicKey) => new PartyFeedProvider(metadataStore, keyring, feedStore, partyKey);
158
161
 
@@ -175,7 +175,8 @@ export class PartyManager {
175
175
  }
176
176
 
177
177
  log(`Adding party partyKey=${partyKey.toHex()} hints=${hints.length}`);
178
- const party = await this._partyFactory.addParty(partyKey, hints);
178
+ const party = await this._partyFactory.constructParty(partyKey, hints);
179
+ await party.open();
179
180
  await this._metadataStore.addParty(party.key);
180
181
  this._setParty(party);
181
182
  return party;
@@ -10,7 +10,7 @@ import { PublicKey } from '@dxos/crypto';
10
10
  import { MessageSelector } from '@dxos/echo-protocol';
11
11
 
12
12
  import { TimeframeClock } from '../database';
13
- import { PartyProcessor } from './party-processor';
13
+ import { PartyStateProvider } from './party-processor';
14
14
 
15
15
  const log = debug('dxos:echo-db:message-selector');
16
16
 
@@ -23,47 +23,43 @@ const log = debug('dxos:echo-db:message-selector');
23
23
  * @param partyProcessor
24
24
  * @param timeframeClock
25
25
  */
26
- export function createMessageSelector (
27
- partyProcessor: PartyProcessor,
28
- timeframeClock: TimeframeClock
29
- ): MessageSelector {
30
- // TODO(telackey): Add KeyAdmit checks.
31
- return candidates => {
32
- // Check ECHO message candidates first since they are less expensive than HALO cancidates.
33
- for (let i = 0; i < candidates.length; i++) {
34
- const { data: { echo } } = candidates[i];
35
- const feedKey = PublicKey.from(candidates[i].key);
36
- if (!echo) {
37
- continue;
38
- }
26
+ export const createMessageSelector = (partyProcessor: PartyStateProvider, timeframeClock: TimeframeClock): MessageSelector => candidates => {
27
+ // Check ECHO message candidates first since they are less expensive than HALO cancidates.
28
+ for (let i = 0; i < candidates.length; i++) {
29
+ const { data: { echo } } = candidates[i];
30
+ const feedKey = PublicKey.from(candidates[i].key);
31
+ if (!echo) {
32
+ continue;
33
+ }
39
34
 
40
- assert(echo.timeframe);
41
- if (partyProcessor.isFeedAdmitted(feedKey) && !timeframeClock.hasGaps(echo.timeframe)) {
42
- return i;
43
- }
35
+ assert(echo.timeframe);
36
+ if (partyProcessor.isFeedAdmitted(feedKey) && !timeframeClock.hasGaps(echo.timeframe)) {
37
+ return i;
44
38
  }
39
+ }
45
40
 
46
- // Check HALO message candidates.
47
- for (let i = 0; i < candidates.length; i++) {
48
- const { data: { halo } } = candidates[i];
49
- const feedKey = PublicKey.from(candidates[i].key);
50
- if (!halo) {
51
- continue;
52
- }
41
+ // Check HALO message candidates.
42
+ for (let i = 0; i < candidates.length; i++) {
43
+ const { data: { halo } } = candidates[i];
44
+ const feedKey = PublicKey.from(candidates[i].key);
45
+ if (!halo) {
46
+ continue;
47
+ }
53
48
 
54
- if (partyProcessor.isFeedAdmitted(feedKey)) {
55
- return i;
56
- }
49
+ if (partyProcessor.isFeedAdmitted(feedKey)) {
50
+ return i;
51
+ }
57
52
 
58
- if (partyProcessor.genesisRequired) {
53
+ if (partyProcessor.genesisRequired) {
54
+ try { // TODO(dmaretskyi): Get getPartyCredentialMessageType crashes for some reason.
59
55
  // TODO(telackey): Add check that this is for the right Party.
60
56
  if (getPartyCredentialMessageType(halo) === PartyCredential.Type.PARTY_GENESIS) {
61
57
  return i;
62
58
  }
63
- }
59
+ } catch { }
64
60
  }
61
+ }
65
62
 
66
- // Not ready for this message yet.
67
- log('Skipping...');
68
- };
69
- }
63
+ // Not ready for this message yet.
64
+ log('Skipping...');
65
+ };
@@ -11,7 +11,8 @@ import { MetadataStore } from './metadata-store';
11
11
 
12
12
  describe('MetadataStore in-memory', () => {
13
13
  it('Creates party and adds feeds to it', async () => {
14
- const store = new MetadataStore(createStorage('metadata', StorageType.RAM));
14
+ const storage = createStorage('', StorageType.RAM);
15
+ const store = new MetadataStore(storage.directory('metadata'));
15
16
  await store.load();
16
17
  expect(store.parties?.length).toBe(0);
17
18
 
@@ -33,7 +34,8 @@ describe('MetadataStore in-memory', () => {
33
34
  });
34
35
 
35
36
  it('Creates party when adding feed', async () => {
36
- const store = new MetadataStore(createStorage('metadata', StorageType.RAM));
37
+ const storage = createStorage('', StorageType.RAM);
38
+ const store = new MetadataStore(storage.directory('metadata'));
37
39
  await store.load();
38
40
 
39
41
  const partyKey = PublicKey.random();
@@ -45,7 +47,8 @@ describe('MetadataStore in-memory', () => {
45
47
  });
46
48
 
47
49
  it('Doesn\'t add same feed twice', async () => {
48
- const store = new MetadataStore(createStorage('metadata', StorageType.RAM));
50
+ const storage = createStorage('', StorageType.RAM);
51
+ const store = new MetadataStore(storage.directory('metadata'));
49
52
  await store.load();
50
53
 
51
54
  const partyKey = PublicKey.random();
@@ -60,7 +63,8 @@ describe('MetadataStore in-memory', () => {
60
63
 
61
64
  // TODO(yivlad): Doesn't work for now.
62
65
  it.skip('Resets storage', async () => {
63
- const store = new MetadataStore(createStorage('snapshots', StorageType.RAM));
66
+ const storage = createStorage('snapshots', StorageType.RAM);
67
+ const store = new MetadataStore(storage.directory(''));
64
68
 
65
69
  const partyKey = PublicKey.random();
66
70
  const feedKey = PublicKey.random();
@@ -8,7 +8,7 @@ import debug from 'debug';
8
8
  import { PublicKey } from '@dxos/crypto';
9
9
  import { failUndefined } from '@dxos/debug';
10
10
  import { EchoMetadata, PartyMetadata, schema } from '@dxos/echo-protocol';
11
- import { Storage } from '@dxos/random-access-multi-storage';
11
+ import { Directory } from '@dxos/random-access-multi-storage';
12
12
 
13
13
  /**
14
14
  * Version for the schema of the stored data as defined in dxos.echo.metadata.EchoMetadata.
@@ -28,7 +28,7 @@ export class MetadataStore {
28
28
  };
29
29
 
30
30
  constructor (
31
- private readonly _storage: Storage
31
+ private readonly _directory: Directory
32
32
  ) {}
33
33
 
34
34
  get version (): number {
@@ -47,7 +47,7 @@ export class MetadataStore {
47
47
  * Loads metadata from persistent storage.
48
48
  */
49
49
  async load (): Promise<void> {
50
- const file = this._storage.createOrOpen('EchoMetadata');
50
+ const file = this._directory.createOrOpen('EchoMetadata');
51
51
  try {
52
52
  const { size } = await file.stat();
53
53
  if (size === 0) {
@@ -75,7 +75,7 @@ export class MetadataStore {
75
75
  updated: new Date()
76
76
  };
77
77
 
78
- const file = this._storage.createOrOpen('EchoMetadata');
78
+ const file = this._directory.createOrOpen('EchoMetadata');
79
79
 
80
80
  try {
81
81
  const encoded = Buffer.from(schema.getCodecForType('dxos.echo.metadata.EchoMetadata').encode(data));
@@ -90,7 +90,7 @@ export class MetadataStore {
90
90
  */
91
91
  async clear (): Promise<void> {
92
92
  log('Clearing all echo metadata...');
93
- await this._storage.destroy();
93
+ await this._directory.destroy();
94
94
  }
95
95
 
96
96
  /**
@@ -24,15 +24,15 @@ import { PartyCore } from './party-core';
24
24
  describe('PartyCore', () => {
25
25
  const setup = async () => {
26
26
  const storage = createStorage('', StorageType.RAM);
27
- const feedStore = new FeedStore(storage, { valueEncoding: codec });
27
+ const feedStore = new FeedStore(storage.directory('feed'), { valueEncoding: codec });
28
28
  afterTest(async () => feedStore.close());
29
29
 
30
30
  const keyring = new Keyring();
31
31
 
32
- const metadataStore = new MetadataStore(createStorage('metadata', StorageType.RAM));
32
+ const metadataStore = new MetadataStore(storage.directory('metadata'));
33
33
 
34
34
  const modelFactory = new ModelFactory().registerModel(ObjectModel);
35
- const snapshotStore = new SnapshotStore(createStorage('snapshots', StorageType.RAM));
35
+ const snapshotStore = new SnapshotStore(storage.directory('snapshots'));
36
36
 
37
37
  const partyKey = await keyring.createKeyRecord({ type: KeyType.PARTY });
38
38
 
@@ -51,7 +51,7 @@ describe('PartyCore', () => {
51
51
  afterTest(async () => party.close());
52
52
 
53
53
  // PartyGenesis (self-signed by Party).
54
- await party.processor.writeHaloMessage(createPartyGenesisMessage(
54
+ await party.writeCredentialsMessage(createPartyGenesisMessage(
55
55
  keyring,
56
56
  partyKey,
57
57
  feed.key,
@@ -59,7 +59,7 @@ describe('PartyCore', () => {
59
59
  );
60
60
 
61
61
  // FeedAdmit (signed by the Device KeyChain).
62
- await party.processor.writeHaloMessage(createFeedAdmitMessage(
62
+ await party.writeCredentialsMessage(createFeedAdmitMessage(
63
63
  keyring,
64
64
  partyKey.publicKey,
65
65
  feed.key,
@@ -120,7 +120,7 @@ describe('PartyCore', () => {
120
120
  const feedKey = await keyring.createKeyRecord({ type: KeyType.FEED });
121
121
 
122
122
  const eventFired = feedStore.feedOpenedEvent.waitForCount(1);
123
- await party.processor.writeHaloMessage(createFeedAdmitMessage(
123
+ await party.writeCredentialsMessage(createFeedAdmitMessage(
124
124
  keyring,
125
125
  party.key,
126
126
  feedKey.publicKey,
@@ -132,15 +132,15 @@ describe('PartyCore', () => {
132
132
 
133
133
  test('opens feed from hints', async () => {
134
134
  const storage = createStorage('', StorageType.RAM);
135
- const feedStore = new FeedStore(storage, { valueEncoding: codec });
135
+ const feedStore = new FeedStore(storage.directory('feed'), { valueEncoding: codec });
136
136
  afterTest(async () => feedStore.close());
137
137
 
138
138
  const keyring = new Keyring();
139
139
 
140
- const metadataStore = new MetadataStore(createStorage('metadata', StorageType.RAM));
140
+ const metadataStore = new MetadataStore(storage.directory('metadata'));
141
141
 
142
142
  const modelFactory = new ModelFactory().registerModel(ObjectModel);
143
- const snapshotStore = new SnapshotStore(createStorage('snapshots', StorageType.RAM));
143
+ const snapshotStore = new SnapshotStore(storage.directory('snapshots'));
144
144
 
145
145
  const partyKey = await keyring.createKeyRecord({ type: KeyType.PARTY });
146
146
 
@@ -197,7 +197,7 @@ describe('PartyCore', () => {
197
197
  const fullKey = keyring.getFullKey(feedKey.publicKey);
198
198
  const feed2 = await feedStore.openReadWriteFeed(fullKey!.publicKey, fullKey!.secretKey!);
199
199
 
200
- await party.processor.writeHaloMessage(createFeedAdmitMessage(
200
+ await party.writeCredentialsMessage(createFeedAdmitMessage(
201
201
  keyring,
202
202
  party.key,
203
203
  feed2.key,
@@ -226,7 +226,7 @@ describe('PartyCore', () => {
226
226
  const feedKey = await keyring.createKeyRecord({ type: KeyType.FEED });
227
227
  const fullKey = keyring.getFullKey(feedKey.publicKey);
228
228
 
229
- await party.processor.writeHaloMessage(createFeedAdmitMessage(
229
+ await party.writeCredentialsMessage(createFeedAdmitMessage(
230
230
  keyring,
231
231
  party.key,
232
232
  feedKey.publicKey,
@@ -253,13 +253,13 @@ describe('PartyCore', () => {
253
253
  const peer1 = await setup();
254
254
 
255
255
  const storage = createStorage('', StorageType.RAM);
256
- const feedStore = new FeedStore(storage, { valueEncoding: codec });
256
+ const feedStore = new FeedStore(storage.directory('feed'), { valueEncoding: codec });
257
257
  afterTest(async () => feedStore.close());
258
258
 
259
- const metadataStore = new MetadataStore(createStorage('metadata', StorageType.RAM));
259
+ const metadataStore = new MetadataStore(storage.directory('metadata'));
260
260
 
261
261
  const modelFactory = new ModelFactory().registerModel(ObjectModel);
262
- const snapshotStore = new SnapshotStore(createStorage('snapshots', StorageType.RAM));
262
+ const snapshotStore = new SnapshotStore(storage.directory('snapshots'));
263
263
 
264
264
  const partyFeedProvider = new PartyFeedProvider(metadataStore, peer1.keyring, feedStore, peer1.party.key);
265
265
 
@@ -273,7 +273,7 @@ describe('PartyCore', () => {
273
273
 
274
274
  const feed2 = await partyFeedProvider.createOrOpenWritableFeed();
275
275
 
276
- await peer1.party.processor.writeHaloMessage(createFeedAdmitMessage(
276
+ await peer1.party.writeCredentialsMessage(createFeedAdmitMessage(
277
277
  peer1.keyring,
278
278
  peer1.party.key,
279
279
  feed2.key,
@@ -5,10 +5,10 @@
5
5
  import assert from 'assert';
6
6
 
7
7
  import { synchronized } from '@dxos/async';
8
- import { KeyHint, KeyType } from '@dxos/credentials';
8
+ import { KeyHint, KeyType, Message as HaloMessage } from '@dxos/credentials';
9
9
  import { PublicKey } from '@dxos/crypto';
10
10
  import { timed } from '@dxos/debug';
11
- import { createFeedWriter, DatabaseSnapshot, PartyKey, PartySnapshot, Timeframe } from '@dxos/echo-protocol';
11
+ import { createFeedWriter, DatabaseSnapshot, PartyKey, PartySnapshot, Timeframe, WriteReceipt } from '@dxos/echo-protocol';
12
12
  import { ModelFactory } from '@dxos/model-factory';
13
13
  import { SubscriptionGroup } from '@dxos/util';
14
14
 
@@ -202,6 +202,11 @@ export class PartyCore {
202
202
  return this;
203
203
  }
204
204
 
205
+ writeCredentialsMessage (message: HaloMessage): Promise<WriteReceipt> {
206
+ assert(this._partyProcessor, 'Party not open');
207
+ return this._partyProcessor?.writeHaloMessage(message);
208
+ }
209
+
205
210
  /**
206
211
  * Create a snapshot of the current state.
207
212
  */
@@ -12,7 +12,8 @@ import {
12
12
  PartyState,
13
13
  Message as HaloMessage,
14
14
  IdentityEventType,
15
- PartyEventType
15
+ PartyEventType,
16
+ SignedMessage
16
17
  } from '@dxos/credentials';
17
18
  import { PublicKey } from '@dxos/crypto';
18
19
  import { FeedKey, FeedWriter, IHaloStream, PartyKey, HaloStateSnapshot, WriteReceipt } from '@dxos/echo-protocol';
@@ -20,10 +21,33 @@ import { jsonReplacer } from '@dxos/util';
20
21
 
21
22
  const log = debug('dxos:echo-db:party-processor');
22
23
 
24
+ export interface CredentialWriter {
25
+ writeHaloMessage (message: HaloMessage): Promise<WriteReceipt>
26
+ }
27
+
28
+ export interface CredentialProcessor {
29
+ processMessage (message: IHaloStream): Promise<void>
30
+ }
31
+
32
+ export interface PartyStateProvider {
33
+ partyKey: PublicKey
34
+
35
+ /**
36
+ * Whether PartyGenesis was already processed.
37
+ */
38
+ genesisRequired: boolean
39
+ memberKeys: PublicKey[]
40
+ feedKeys: PublicKey[]
41
+ getFeedOwningMember (feedKey: FeedKey): PublicKey | undefined
42
+ isFeedAdmitted (feedKey: FeedKey): boolean
43
+
44
+ getOfflineInvitation (invitationID: Buffer): SignedMessage | undefined
45
+ }
46
+
23
47
  /**
24
48
  * TODO(burdon): Wrapper/Bridge between HALO APIs.
25
49
  */
26
- export class PartyProcessor {
50
+ export class PartyProcessor implements CredentialWriter, CredentialProcessor, PartyStateProvider {
27
51
  private readonly _state: PartyState;
28
52
 
29
53
  private _outboundHaloStream: FeedWriter<HaloMessage> | undefined;
@@ -25,7 +25,7 @@ const log = debug('dxos:echo:pipeline:test');
25
25
  describe('pipeline', () => {
26
26
  test('streams', async () => {
27
27
  const storage = createStorage('', StorageType.RAM);
28
- const feedStore = new FeedStore(storage, { valueEncoding: codec });
28
+ const feedStore = new FeedStore(storage.directory('feed'), { valueEncoding: codec });
29
29
  const feedKeys: Uint8Array[] = [];
30
30
  const feedSelector: FeedSelector = descriptor => !!feedKeys.find(key => descriptor.key.equals(key));
31
31
  const feedReadStream = new FeedStoreIterator(feedSelector, () => 0, new Timeframe());
@@ -87,7 +87,7 @@ describe('pipeline', () => {
87
87
 
88
88
  test('writing', async () => {
89
89
  const storage = createStorage('', StorageType.RAM);
90
- const feedStore = new FeedStore(storage, { valueEncoding: codec });
90
+ const feedStore = new FeedStore(storage.directory('feed'), { valueEncoding: codec });
91
91
  const feedReadStream = new FeedStoreIterator(() => true, () => 0, new Timeframe());
92
92
 
93
93
  const { publicKey, secretKey } = createKeyPair();
@@ -17,7 +17,7 @@ import { createReadable } from '@dxos/feed-store';
17
17
  import { jsonReplacer } from '@dxos/util';
18
18
 
19
19
  import { TimeframeClock } from '../database';
20
- import { PartyProcessor } from './party-processor';
20
+ import { CredentialProcessor, PartyStateProvider } from './party-processor';
21
21
 
22
22
  interface Options {
23
23
  readLogger?: (msg: any) => void
@@ -55,17 +55,13 @@ export class Pipeline {
55
55
  * @param _options
56
56
  */
57
57
  constructor (
58
- private readonly _partyProcessor: PartyProcessor,
58
+ private readonly _partyProcessor: CredentialProcessor & PartyStateProvider,
59
59
  private readonly _feedStorIterator: FeedStoreIterator,
60
60
  private readonly _timeframeClock: TimeframeClock,
61
61
  private readonly _feedWriter?: FeedWriter<FeedMessage>,
62
62
  private readonly _options: Options = {}
63
63
  ) {}
64
64
 
65
- get partyKey () {
66
- return this._partyProcessor.partyKey;
67
- }
68
-
69
65
  get isOpen () {
70
66
  return this._inboundEchoStream !== undefined;
71
67
  }
@@ -9,6 +9,4 @@ import { Replicator } from '@dxos/protocol-plugin-replicator';
9
9
  /**
10
10
  * Creates authenticator network-protocol plugin that guards access to the replicator.
11
11
  */
12
- export function createAuthPlugin (authenticator: Authenticator, peerId: PublicKey) {
13
- return new AuthPlugin(peerId.asBuffer(), authenticator, [Replicator.extension]);
14
- }
12
+ export const createAuthPlugin = (authenticator: Authenticator, peerId: PublicKey) => new AuthPlugin(peerId.asBuffer(), authenticator, [Replicator.extension]);