@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.
- package/dist/src/api/selection/queries.d.ts.map +1 -1
- package/dist/src/api/selection/queries.js +13 -17
- package/dist/src/api/selection/queries.js.map +1 -1
- package/dist/src/api/selection/selection.d.ts.map +1 -1
- package/dist/src/api/selection/selection.js +1 -3
- package/dist/src/api/selection/selection.js.map +1 -1
- package/dist/src/api/selection/selection.test.js +4 -12
- package/dist/src/api/selection/selection.test.js.map +1 -1
- package/dist/src/database/item-demuxer.d.ts +1 -1
- package/dist/src/database/item-demuxer.d.ts.map +1 -1
- package/dist/src/database/item-demuxer.js +3 -3
- package/dist/src/database/item-demuxer.js.map +1 -1
- package/dist/src/database/item-manager.js +2 -2
- package/dist/src/database/item-manager.js.map +1 -1
- package/dist/src/database/testing.js +1 -1
- package/dist/src/database/testing.js.map +1 -1
- package/dist/src/echo.d.ts +1 -0
- package/dist/src/echo.d.ts.map +1 -1
- package/dist/src/echo.js +7 -18
- package/dist/src/echo.js.map +1 -1
- package/dist/src/halo/halo-factory.d.ts.map +1 -1
- package/dist/src/halo/halo-factory.js +5 -11
- package/dist/src/halo/halo-factory.js.map +1 -1
- package/dist/src/halo/halo-party.d.ts +3 -3
- package/dist/src/halo/halo-party.d.ts.map +1 -1
- package/dist/src/halo/halo-party.js +3 -3
- package/dist/src/halo/halo-party.js.map +1 -1
- package/dist/src/halo/halo.test.js +4 -3
- package/dist/src/halo/halo.test.js.map +1 -1
- package/dist/src/halo/identity.js +2 -2
- package/dist/src/halo/identity.js.map +1 -1
- package/dist/src/halo/party-opener.d.ts +1 -1
- package/dist/src/halo/party-opener.d.ts.map +1 -1
- package/dist/src/halo/party-opener.js +2 -2
- package/dist/src/halo/party-opener.js.map +1 -1
- package/dist/src/halo/preferences.d.ts.map +1 -1
- package/dist/src/halo/preferences.js +7 -10
- package/dist/src/halo/preferences.js.map +1 -1
- package/dist/src/invitations/greeting-protocol-provider.d.ts.map +1 -1
- package/dist/src/invitations/greeting-protocol-provider.js +5 -9
- package/dist/src/invitations/greeting-protocol-provider.js.map +1 -1
- package/dist/src/invitations/greeting-responder.d.ts +2 -2
- package/dist/src/invitations/greeting-responder.d.ts.map +1 -1
- package/dist/src/invitations/greeting-responder.js +8 -12
- package/dist/src/invitations/greeting-responder.js.map +1 -1
- package/dist/src/invitations/invitation-factory.d.ts +2 -2
- package/dist/src/invitations/invitation-factory.d.ts.map +1 -1
- package/dist/src/invitations/invitation-factory.js.map +1 -1
- package/dist/src/invitations/offline-invitation-claimer.d.ts.map +1 -1
- package/dist/src/invitations/offline-invitation-claimer.js +5 -7
- package/dist/src/invitations/offline-invitation-claimer.js.map +1 -1
- package/dist/src/parties/data-party.d.ts +7 -5
- package/dist/src/parties/data-party.d.ts.map +1 -1
- package/dist/src/parties/data-party.js +9 -8
- package/dist/src/parties/data-party.js.map +1 -1
- package/dist/src/parties/data-party.test.js +16 -15
- package/dist/src/parties/data-party.test.js.map +1 -1
- package/dist/src/parties/party-factory.d.ts +0 -6
- package/dist/src/parties/party-factory.d.ts.map +1 -1
- package/dist/src/parties/party-factory.js +17 -45
- package/dist/src/parties/party-factory.js.map +1 -1
- package/dist/src/parties/party-manager.d.ts.map +1 -1
- package/dist/src/parties/party-manager.js +2 -1
- package/dist/src/parties/party-manager.js.map +1 -1
- package/dist/src/parties/party-manager.test.js +7 -6
- package/dist/src/parties/party-manager.test.js.map +1 -1
- package/dist/src/pipeline/message-selector.d.ts +2 -2
- package/dist/src/pipeline/message-selector.d.ts.map +1 -1
- package/dist/src/pipeline/message-selector.js +29 -29
- package/dist/src/pipeline/message-selector.js.map +1 -1
- package/dist/src/pipeline/metadata-store.d.ts +3 -3
- package/dist/src/pipeline/metadata-store.d.ts.map +1 -1
- package/dist/src/pipeline/metadata-store.js +5 -5
- package/dist/src/pipeline/metadata-store.js.map +1 -1
- package/dist/src/pipeline/metadata-store.test.js +8 -4
- package/dist/src/pipeline/metadata-store.test.js.map +1 -1
- package/dist/src/pipeline/party-core.d.ts +3 -2
- package/dist/src/pipeline/party-core.d.ts.map +1 -1
- package/dist/src/pipeline/party-core.js +5 -0
- package/dist/src/pipeline/party-core.js.map +1 -1
- package/dist/src/pipeline/party-core.test.js +15 -15
- package/dist/src/pipeline/party-core.test.js.map +1 -1
- package/dist/src/pipeline/party-processor.d.ts +23 -5
- package/dist/src/pipeline/party-processor.d.ts.map +1 -1
- package/dist/src/pipeline/party-processor.js.map +1 -1
- package/dist/src/pipeline/pipeline.d.ts +2 -4
- package/dist/src/pipeline/pipeline.d.ts.map +1 -1
- package/dist/src/pipeline/pipeline.js +0 -3
- package/dist/src/pipeline/pipeline.js.map +1 -1
- package/dist/src/pipeline/pipeline.test.js +2 -2
- package/dist/src/pipeline/pipeline.test.js.map +1 -1
- package/dist/src/protocol/auth-plugin.d.ts +1 -1
- package/dist/src/protocol/auth-plugin.d.ts.map +1 -1
- package/dist/src/protocol/auth-plugin.js +1 -3
- package/dist/src/protocol/auth-plugin.js.map +1 -1
- package/dist/src/protocol/authenticator.d.ts +2 -2
- package/dist/src/protocol/authenticator.d.ts.map +1 -1
- package/dist/src/protocol/authenticator.js +12 -16
- package/dist/src/protocol/authenticator.js.map +1 -1
- package/dist/src/protocol/halo-recovery-plugin.d.ts +1 -1
- package/dist/src/protocol/halo-recovery-plugin.d.ts.map +1 -1
- package/dist/src/protocol/halo-recovery-plugin.js +1 -3
- package/dist/src/protocol/halo-recovery-plugin.js.map +1 -1
- package/dist/src/protocol/identity-credentials.d.ts +2 -2
- package/dist/src/protocol/identity-credentials.d.ts.map +1 -1
- package/dist/src/protocol/identity-credentials.js +4 -4
- package/dist/src/protocol/identity-credentials.js.map +1 -1
- package/dist/src/protocol/offline-invitation-plugin.d.ts +1 -1
- package/dist/src/protocol/offline-invitation-plugin.d.ts.map +1 -1
- package/dist/src/protocol/offline-invitation-plugin.js +1 -3
- package/dist/src/protocol/offline-invitation-plugin.js.map +1 -1
- package/dist/src/protocol/replicator-plugin.d.ts.map +1 -1
- package/dist/src/protocol/replicator-plugin.js +4 -6
- package/dist/src/protocol/replicator-plugin.js.map +1 -1
- package/dist/src/snapshots/snapshot-generator.d.ts +1 -1
- package/dist/src/snapshots/snapshot-generator.d.ts.map +1 -1
- package/dist/src/snapshots/snapshot-generator.js +13 -15
- package/dist/src/snapshots/snapshot-generator.js.map +1 -1
- package/dist/src/snapshots/snapshot-store.d.ts +3 -3
- package/dist/src/snapshots/snapshot-store.d.ts.map +1 -1
- package/dist/src/snapshots/snapshot-store.js +5 -5
- package/dist/src/snapshots/snapshot-store.js.map +1 -1
- package/dist/src/snapshots/snapshot-store.test.js +1 -1
- package/dist/src/snapshots/snapshot-store.test.js.map +1 -1
- package/dist/src/testing/testing-factories.js +2 -2
- package/dist/src/testing/testing-factories.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +18 -18
- package/src/api/selection/queries.ts +14 -18
- package/src/api/selection/selection.test.ts +4 -12
- package/src/api/selection/selection.ts +1 -7
- package/src/database/item-demuxer.ts +2 -2
- package/src/database/item-manager.ts +2 -2
- package/src/database/testing.ts +1 -1
- package/src/echo.ts +8 -18
- package/src/halo/halo-factory.ts +6 -18
- package/src/halo/halo-party.ts +6 -6
- package/src/halo/halo.test.ts +4 -3
- package/src/halo/identity.ts +2 -2
- package/src/halo/party-opener.ts +2 -2
- package/src/halo/preferences.ts +7 -10
- package/src/invitations/greeting-protocol-provider.ts +5 -9
- package/src/invitations/greeting-responder.ts +10 -14
- package/src/invitations/invitation-factory.ts +2 -2
- package/src/invitations/offline-invitation-claimer.ts +5 -7
- package/src/parties/data-party.test.ts +17 -15
- package/src/parties/data-party.ts +15 -12
- package/src/parties/party-factory.ts +23 -69
- package/src/parties/party-manager.test.ts +9 -6
- package/src/parties/party-manager.ts +2 -1
- package/src/pipeline/message-selector.ts +30 -34
- package/src/pipeline/metadata-store.test.ts +8 -4
- package/src/pipeline/metadata-store.ts +5 -5
- package/src/pipeline/party-core.test.ts +15 -15
- package/src/pipeline/party-core.ts +7 -2
- package/src/pipeline/party-processor.ts +26 -2
- package/src/pipeline/pipeline.test.ts +2 -2
- package/src/pipeline/pipeline.ts +2 -6
- package/src/protocol/auth-plugin.ts +1 -3
- package/src/protocol/authenticator.ts +27 -31
- package/src/protocol/halo-recovery-plugin.ts +4 -6
- package/src/protocol/identity-credentials.ts +4 -4
- package/src/protocol/offline-invitation-plugin.ts +4 -6
- package/src/protocol/replicator-plugin.ts +4 -6
- package/src/snapshots/snapshot-generator.ts +12 -16
- package/src/snapshots/snapshot-store.test.ts +1 -1
- package/src/snapshots/snapshot-store.ts +5 -6
- package/src/testing/testing-factories.ts +2 -2
|
@@ -24,9 +24,7 @@ const modelFactory = new ModelFactory().registerModel(ObjectModel);
|
|
|
24
24
|
|
|
25
25
|
const createModel = (id: ItemID) => modelFactory.createModel(ObjectModel.meta.type, id, {}, PublicKey.random());
|
|
26
26
|
|
|
27
|
-
const createItem = (id: ItemID, type: ItemType, parent?: Item<any>) =>
|
|
28
|
-
return new Item(null as any, id, type, createModel(id), undefined, parent);
|
|
29
|
-
};
|
|
27
|
+
const createItem = (id: ItemID, type: ItemType, parent?: Item<any>) => new Item(null as any, id, type, createModel(id), undefined, parent);
|
|
30
28
|
|
|
31
29
|
const createLink = (id: ItemID, type: ItemType, source: Item<any>, target: Item<any>) => {
|
|
32
30
|
const link = new Link(null as any, id, type, createModel(id), {
|
|
@@ -262,17 +260,11 @@ describe('Selection', () => {
|
|
|
262
260
|
test('complex reducer', () => {
|
|
263
261
|
const query = createReducer({ numItems: 0, numLinks: 0 })
|
|
264
262
|
.filter({ type: ITEM_ORG })
|
|
265
|
-
.call((items: Item[], { numItems, ...rest }) => {
|
|
266
|
-
return { ...rest, numItems: numItems + items.length, stage: 'a' };
|
|
267
|
-
})
|
|
263
|
+
.call((items: Item[], { numItems, ...rest }) => ({ ...rest, numItems: numItems + items.length, stage: 'a' }))
|
|
268
264
|
.children({ type: ITEM_PROJECT })
|
|
269
|
-
.call((items: Item[], { numItems, ...rest }) => {
|
|
270
|
-
return { ...rest, numItems: numItems + items.length, stage: 'b' };
|
|
271
|
-
})
|
|
265
|
+
.call((items: Item[], { numItems, ...rest }) => ({ ...rest, numItems: numItems + items.length, stage: 'b' }))
|
|
272
266
|
.links({ type: LINK_MEMBER })
|
|
273
|
-
.call((links: Link[], { numLinks, ...rest }) => {
|
|
274
|
-
return { ...rest, numLinks: numLinks + links.length, stage: 'c' };
|
|
275
|
-
})
|
|
267
|
+
.call((links: Link[], { numLinks, ...rest }) => ({ ...rest, numLinks: numLinks + links.length, stage: 'c' }))
|
|
276
268
|
.target()
|
|
277
269
|
.exec();
|
|
278
270
|
|
|
@@ -57,13 +57,7 @@ export const createSelection = <R>(
|
|
|
57
57
|
* @param update
|
|
58
58
|
* @param value Initial reducer value.
|
|
59
59
|
*/
|
|
60
|
-
export const createItemSelection = <R>(
|
|
61
|
-
root: Item<any>,
|
|
62
|
-
update: Event<Entity[]>,
|
|
63
|
-
value: R
|
|
64
|
-
): Selection<Item<any>, R> => {
|
|
65
|
-
return new Selection(() => [[root], value], update, root, value !== undefined);
|
|
66
|
-
};
|
|
60
|
+
export const createItemSelection = <R>(root: Item<any>, update: Event<Entity[]>, value: R): Selection<Item<any>, R> => new Selection(() => [[root], value], update, root, value !== undefined);
|
|
67
61
|
|
|
68
62
|
/**
|
|
69
63
|
* Selections are used to construct database subscriptions.
|
|
@@ -185,7 +185,7 @@ export class ItemDemuxer {
|
|
|
185
185
|
* Sort based on parents.
|
|
186
186
|
* @param items
|
|
187
187
|
*/
|
|
188
|
-
export
|
|
188
|
+
export const sortItemsTopologically = (items: ItemSnapshot[]): ItemSnapshot[] => {
|
|
189
189
|
const snapshots: ItemSnapshot[] = [];
|
|
190
190
|
const seenIds = new Set<ItemID>();
|
|
191
191
|
|
|
@@ -204,4 +204,4 @@ export function sortItemsTopologically (items: ItemSnapshot[]): ItemSnapshot[] {
|
|
|
204
204
|
}
|
|
205
205
|
|
|
206
206
|
return snapshots;
|
|
207
|
-
}
|
|
207
|
+
};
|
|
@@ -375,7 +375,7 @@ export class ItemManager {
|
|
|
375
375
|
/**
|
|
376
376
|
* Returns a new event that groups all of the updates emitted during single tick into a single event emission.
|
|
377
377
|
*/
|
|
378
|
-
|
|
378
|
+
const debounceEntityUpdateEvent = (event: Event<Entity<any>>): Event<Entity<any>[]> => {
|
|
379
379
|
const debouncedEvent = new Event<Entity<any>[]>();
|
|
380
380
|
|
|
381
381
|
let firing = false;
|
|
@@ -395,4 +395,4 @@ function debounceEntityUpdateEvent (event: Event<Entity<any>>): Event<Entity<any
|
|
|
395
395
|
}));
|
|
396
396
|
|
|
397
397
|
return debouncedEvent;
|
|
398
|
-
}
|
|
398
|
+
};
|
package/src/database/testing.ts
CHANGED
|
@@ -15,7 +15,7 @@ import { FeedDatabaseBackend, RemoteDatabaseBackend } from './database-backend';
|
|
|
15
15
|
|
|
16
16
|
export const createInMemoryDatabase = async (modelFactory: ModelFactory) => {
|
|
17
17
|
const feed = new MockFeedWriter<EchoEnvelope>();
|
|
18
|
-
const inboundStream = new Readable({ read () {}, objectMode: true });
|
|
18
|
+
const inboundStream = new Readable({ read: () => {}, objectMode: true });
|
|
19
19
|
feed.written.on(([data, meta]) => inboundStream.push({ data, meta: { ...meta, memberKey: PublicKey.random(), timeframe: new Timeframe([[meta.feedKey, meta.seq]]) } }));
|
|
20
20
|
|
|
21
21
|
const database = new Database(
|
package/src/echo.ts
CHANGED
|
@@ -87,6 +87,7 @@ export class ECHO {
|
|
|
87
87
|
private readonly _halo: HALO;
|
|
88
88
|
private readonly _keyring: Keyring;
|
|
89
89
|
|
|
90
|
+
private readonly _storage: Storage;
|
|
90
91
|
private readonly _feedStore: FeedStore;
|
|
91
92
|
private readonly _modelFactory: ModelFactory;
|
|
92
93
|
private readonly _networkManager: NetworkManager;
|
|
@@ -114,11 +115,12 @@ export class ECHO {
|
|
|
114
115
|
this._modelFactory = new ModelFactory()
|
|
115
116
|
.registerModel(ObjectModel);
|
|
116
117
|
|
|
118
|
+
this._storage = storage;
|
|
117
119
|
this._networkManager = new NetworkManager(networkManagerOptions);
|
|
118
|
-
this._snapshotStore = new SnapshotStore(storage.
|
|
119
|
-
this._metadataStore = new MetadataStore(storage.
|
|
120
|
+
this._snapshotStore = new SnapshotStore(storage.directory('snapshots'));
|
|
121
|
+
this._metadataStore = new MetadataStore(storage.directory('metadata'));
|
|
120
122
|
this._keyring = new Keyring(new KeyStore(keyStorage));
|
|
121
|
-
this._feedStore = new FeedStore(storage.
|
|
123
|
+
this._feedStore = new FeedStore(storage.directory('feeds'), { valueEncoding: codec });
|
|
122
124
|
|
|
123
125
|
const feedProviderFactory = (partyKey: PublicKey) => new PartyFeedProvider(
|
|
124
126
|
this._metadataStore,
|
|
@@ -275,26 +277,14 @@ export class ECHO {
|
|
|
275
277
|
await this.close();
|
|
276
278
|
|
|
277
279
|
try {
|
|
278
|
-
if (this.
|
|
279
|
-
await this.
|
|
280
|
+
if (this._storage.destroy) {
|
|
281
|
+
await this._storage.destroy();
|
|
280
282
|
}
|
|
281
283
|
} catch (err: any) {
|
|
282
|
-
error('Error clearing
|
|
284
|
+
error('Error clearing storage:', err);
|
|
283
285
|
}
|
|
284
286
|
|
|
285
287
|
await this.halo.reset();
|
|
286
|
-
|
|
287
|
-
try {
|
|
288
|
-
await this._snapshotStore.clear();
|
|
289
|
-
} catch (err: any) {
|
|
290
|
-
error('Error clearing snapshot storage:', err);
|
|
291
|
-
}
|
|
292
|
-
|
|
293
|
-
try {
|
|
294
|
-
await this._metadataStore.clear();
|
|
295
|
-
} catch (err: any) {
|
|
296
|
-
error('Error clearing metadata storage:', err);
|
|
297
|
-
}
|
|
298
288
|
}
|
|
299
289
|
|
|
300
290
|
//
|
package/src/halo/halo-factory.ts
CHANGED
|
@@ -14,8 +14,7 @@ import {
|
|
|
14
14
|
KeyType,
|
|
15
15
|
Filter,
|
|
16
16
|
SecretProvider,
|
|
17
|
-
KeyHint
|
|
18
|
-
createFeedAdmitMessage
|
|
17
|
+
KeyHint
|
|
19
18
|
} from '@dxos/credentials';
|
|
20
19
|
import { keyToString, PublicKey, keyPairFromSeedPhrase } from '@dxos/crypto';
|
|
21
20
|
import { ModelFactory } from '@dxos/model-factory';
|
|
@@ -94,21 +93,21 @@ export class HaloFactory {
|
|
|
94
93
|
* B. Device key (the first "member" of the Identity's HALO).
|
|
95
94
|
* C. Feed key (the feed owned by the Device).
|
|
96
95
|
*/
|
|
97
|
-
await halo.
|
|
96
|
+
await halo.writeCredentialsMessage(createPartyGenesisMessage(this._keyring, identityKey, feedKeyPair.publicKey, deviceKey));
|
|
98
97
|
|
|
99
98
|
/* 3. Make a special self-signed KeyAdmit message which will serve as an "IdentityGenesis" message. This
|
|
100
99
|
* message will be copied into other Parties which we create or join.
|
|
101
100
|
*/
|
|
102
|
-
await halo.
|
|
101
|
+
await halo.writeCredentialsMessage(createKeyAdmitMessage(this._keyring, identityKey.publicKey, identityKey));
|
|
103
102
|
|
|
104
103
|
if (options.identityDisplayName) {
|
|
105
104
|
// 4. Write the IdentityInfo message with descriptive details (eg, display name).
|
|
106
|
-
await halo.
|
|
105
|
+
await halo.writeCredentialsMessage(createIdentityInfoMessage(this._keyring, options.identityDisplayName, identityKey));
|
|
107
106
|
}
|
|
108
107
|
|
|
109
108
|
if (options.deviceDisplayName) {
|
|
110
109
|
// 5. Write the DeviceInfo message with descriptive details (eg, display name).
|
|
111
|
-
await halo.
|
|
110
|
+
await halo.writeCredentialsMessage(createDeviceInfoMessage(this._keyring, options.deviceDisplayName, deviceKey));
|
|
112
111
|
}
|
|
113
112
|
|
|
114
113
|
// Create special properties item.
|
|
@@ -193,22 +192,11 @@ export class HaloFactory {
|
|
|
193
192
|
);
|
|
194
193
|
|
|
195
194
|
await initiator.connect();
|
|
196
|
-
const {
|
|
195
|
+
const { hints } = await initiator.redeemInvitation(secretProvider);
|
|
197
196
|
|
|
198
|
-
/*
|
|
199
|
-
* TODO(telackey): We shouldn't have to add our key here, it should be in the hints, but our hint
|
|
200
|
-
* mechanism is broken by not waiting on the messages to be processed before returning.
|
|
201
|
-
*/
|
|
202
197
|
const halo = await this.constructParty(hints);
|
|
203
198
|
await halo.open();
|
|
204
199
|
|
|
205
|
-
// Write the Feed genesis message.
|
|
206
|
-
await halo.processor.writeHaloMessage(createFeedAdmitMessage(
|
|
207
|
-
credentialsSigner.signer,
|
|
208
|
-
partyKey,
|
|
209
|
-
await halo.getWriteFeedKey(),
|
|
210
|
-
[credentialsSigner.getDeviceKey()]
|
|
211
|
-
));
|
|
212
200
|
await initiator.destroy();
|
|
213
201
|
|
|
214
202
|
await halo.database.createItem({
|
package/src/halo/halo-party.ts
CHANGED
|
@@ -5,10 +5,10 @@
|
|
|
5
5
|
import assert from 'assert';
|
|
6
6
|
|
|
7
7
|
import { Event, synchronized } from '@dxos/async';
|
|
8
|
-
import { KeyHint } from '@dxos/credentials';
|
|
8
|
+
import { KeyHint, Message as HaloMessage } from '@dxos/credentials';
|
|
9
9
|
import { PublicKey } from '@dxos/crypto';
|
|
10
10
|
import { timed } from '@dxos/debug';
|
|
11
|
-
import { Timeframe } from '@dxos/echo-protocol';
|
|
11
|
+
import { Timeframe, WriteReceipt } from '@dxos/echo-protocol';
|
|
12
12
|
import { ModelFactory } from '@dxos/model-factory';
|
|
13
13
|
import { NetworkManager } from '@dxos/network-manager';
|
|
14
14
|
|
|
@@ -114,10 +114,6 @@ export class HaloParty {
|
|
|
114
114
|
return this._partyCore.processor.credentialMessages.get(this._credentialsSigner.getIdentityKey().publicKey.toHex());
|
|
115
115
|
}
|
|
116
116
|
|
|
117
|
-
get memberKeys () {
|
|
118
|
-
return this._partyCore.processor.memberKeys;
|
|
119
|
-
}
|
|
120
|
-
|
|
121
117
|
get credentialMessages () {
|
|
122
118
|
return this._partyCore.processor.credentialMessages;
|
|
123
119
|
}
|
|
@@ -200,6 +196,10 @@ export class HaloParty {
|
|
|
200
196
|
return this;
|
|
201
197
|
}
|
|
202
198
|
|
|
199
|
+
writeCredentialsMessage (message: HaloMessage): Promise<WriteReceipt> {
|
|
200
|
+
return this._partyCore.writeCredentialsMessage(message);
|
|
201
|
+
}
|
|
202
|
+
|
|
203
203
|
async createInvitation (authenticationDetails: InvitationAuthenticator, options?: InvitationOptions): Promise<InvitationDescriptor> {
|
|
204
204
|
assert(this._invitationManager, 'HALO party not open.');
|
|
205
205
|
return this._invitationManager.createInvitation(authenticationDetails, options);
|
package/src/halo/halo.test.ts
CHANGED
|
@@ -26,10 +26,11 @@ describe('HALO', () => {
|
|
|
26
26
|
.registerModel(ObjectModel);
|
|
27
27
|
|
|
28
28
|
const networkManager = new NetworkManager();
|
|
29
|
-
const
|
|
30
|
-
const
|
|
29
|
+
const storage = createStorage('', StorageType.RAM);
|
|
30
|
+
const snapshotStore = new SnapshotStore(storage.directory('snapshots'));
|
|
31
|
+
const metadataStore = new MetadataStore(storage.directory('metadata'));
|
|
31
32
|
const keyring = new Keyring();
|
|
32
|
-
const feedStore = new FeedStore(
|
|
33
|
+
const feedStore = new FeedStore(storage.directory('feed'), { valueEncoding: codec });
|
|
33
34
|
|
|
34
35
|
const feedProviderFactory = (partyKey: PublicKey) => new PartyFeedProvider(
|
|
35
36
|
metadataStore,
|
package/src/halo/identity.ts
CHANGED
|
@@ -102,7 +102,7 @@ export class Identity implements IdentityCredentials {
|
|
|
102
102
|
|
|
103
103
|
export type IdentityProvider = () => Identity | undefined;
|
|
104
104
|
|
|
105
|
-
|
|
105
|
+
const getDeviceKeyChainFromHalo = (halo: HaloParty, deviceKey: KeyRecord) => {
|
|
106
106
|
try {
|
|
107
107
|
return Keyring.buildKeyChain(
|
|
108
108
|
deviceKey.publicKey,
|
|
@@ -113,4 +113,4 @@ function getDeviceKeyChainFromHalo (halo: HaloParty, deviceKey: KeyRecord) {
|
|
|
113
113
|
log('Unable to locate device KeyChain:', err);
|
|
114
114
|
throw err;
|
|
115
115
|
}
|
|
116
|
-
}
|
|
116
|
+
};
|
package/src/halo/party-opener.ts
CHANGED
|
@@ -14,7 +14,7 @@ const log = debug('dxos:echo-db:party-opener');
|
|
|
14
14
|
/**
|
|
15
15
|
* Automatically adds, opens, and clothes parties from HALO preferences.
|
|
16
16
|
*/
|
|
17
|
-
export
|
|
17
|
+
export const autoPartyOpener = (preferences: Preferences, partyManager: PartyManager): Unsubscribe => {
|
|
18
18
|
const subs = new SubscriptionGroup();
|
|
19
19
|
|
|
20
20
|
subs.push(preferences.subscribeToJoinedPartyList(async values => {
|
|
@@ -46,4 +46,4 @@ export function autoPartyOpener (preferences: Preferences, partyManager: PartyMa
|
|
|
46
46
|
}));
|
|
47
47
|
|
|
48
48
|
return () => subs.unsubscribe();
|
|
49
|
-
}
|
|
49
|
+
};
|
package/src/halo/preferences.ts
CHANGED
|
@@ -159,16 +159,13 @@ export class Preferences {
|
|
|
159
159
|
subscribeToJoinedPartyList (callback: (parties: JoinedParty[]) => void): () => void {
|
|
160
160
|
const database = this._getDatabase() ?? raise(new IdentityNotInitializedError());
|
|
161
161
|
|
|
162
|
-
const converter = (partyDesc: Item<any>) => {
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
} as KeyHint))
|
|
170
|
-
};
|
|
171
|
-
};
|
|
162
|
+
const converter = (partyDesc: Item<any>) => ({
|
|
163
|
+
partyKey: PublicKey.from(partyDesc.model.get('publicKey')),
|
|
164
|
+
keyHints: Object.values(partyDesc.model.get('hints')).map((hint: any) => ({
|
|
165
|
+
...hint,
|
|
166
|
+
publicKey: PublicKey.from(hint.publicKey)
|
|
167
|
+
} as KeyHint))
|
|
168
|
+
});
|
|
172
169
|
|
|
173
170
|
const result = database.select({ type: HALO_PARTY_DESCRIPTOR_TYPE }).exec();
|
|
174
171
|
|
|
@@ -14,12 +14,8 @@ import { protocolFactory } from '@dxos/network-manager';
|
|
|
14
14
|
*/
|
|
15
15
|
// TODO(burdon): When closed?
|
|
16
16
|
// TODO(dboreham): Write a test to check resources are released (no resource leaks).
|
|
17
|
-
export const greetingProtocolProvider = (rendezvousKey: any, peerId: Buffer | Uint8Array, protocolPlugins: any[]) => {
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
session: { peerId: keyToString(peerId) },
|
|
23
|
-
plugins: protocolPlugins
|
|
24
|
-
});
|
|
25
|
-
};
|
|
17
|
+
export const greetingProtocolProvider = (rendezvousKey: any, peerId: Buffer | Uint8Array, protocolPlugins: any[]) => protocolFactory({
|
|
18
|
+
getTopics: () => [rendezvousKey],
|
|
19
|
+
session: { peerId: keyToString(peerId) },
|
|
20
|
+
plugins: protocolPlugins
|
|
21
|
+
});
|
|
@@ -19,7 +19,7 @@ import { keyToString, randomBytes, PublicKey } from '@dxos/crypto';
|
|
|
19
19
|
import { SwarmKey } from '@dxos/echo-protocol';
|
|
20
20
|
import { FullyConnectedTopology, NetworkManager } from '@dxos/network-manager';
|
|
21
21
|
|
|
22
|
-
import {
|
|
22
|
+
import { CredentialWriter, PartyStateProvider } from '../pipeline';
|
|
23
23
|
import { CredentialsSigner } from '../protocol/credentials-signer';
|
|
24
24
|
import { InvitationOptions } from './common';
|
|
25
25
|
import { greetingProtocolProvider } from './greeting-protocol-provider';
|
|
@@ -57,7 +57,7 @@ export class GreetingResponder {
|
|
|
57
57
|
|
|
58
58
|
constructor (
|
|
59
59
|
private readonly _networkManager: NetworkManager,
|
|
60
|
-
private readonly _partyProcessor:
|
|
60
|
+
private readonly _partyProcessor: CredentialWriter & PartyStateProvider,
|
|
61
61
|
private readonly _credentialsSigner: CredentialsSigner
|
|
62
62
|
) {
|
|
63
63
|
this._greeter = new Greeter(
|
|
@@ -243,19 +243,15 @@ export class GreetingResponder {
|
|
|
243
243
|
_gatherHints (): KeyHint[] {
|
|
244
244
|
assert(this._state === GreetingState.SUCCEEDED);
|
|
245
245
|
|
|
246
|
-
const memberKeys = this._partyProcessor.memberKeys.map(publicKey => {
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
};
|
|
251
|
-
});
|
|
246
|
+
const memberKeys = this._partyProcessor.memberKeys.map((publicKey) => ({
|
|
247
|
+
publicKey,
|
|
248
|
+
type: KeyType.UNKNOWN
|
|
249
|
+
}));
|
|
252
250
|
|
|
253
|
-
const memberFeeds = this._partyProcessor.feedKeys.map(publicKey => {
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
};
|
|
258
|
-
});
|
|
251
|
+
const memberFeeds = this._partyProcessor.feedKeys.map((publicKey) => ({
|
|
252
|
+
publicKey,
|
|
253
|
+
type: KeyType.FEED
|
|
254
|
+
}));
|
|
259
255
|
|
|
260
256
|
return [...memberKeys, ...memberFeeds];
|
|
261
257
|
}
|
|
@@ -8,7 +8,7 @@ import { createPartyInvitationMessage } from '@dxos/credentials';
|
|
|
8
8
|
import { PublicKey } from '@dxos/crypto';
|
|
9
9
|
import { NetworkManager } from '@dxos/network-manager';
|
|
10
10
|
|
|
11
|
-
import {
|
|
11
|
+
import { CredentialWriter, PartyStateProvider } from '../pipeline';
|
|
12
12
|
import { CredentialsSigner } from '../protocol/credentials-signer';
|
|
13
13
|
import { defaultInvitationAuthenticator, InvitationAuthenticator, InvitationOptions } from './common';
|
|
14
14
|
import { GreetingResponder } from './greeting-responder';
|
|
@@ -19,7 +19,7 @@ import { InvitationDescriptor, InvitationDescriptorType } from './invitation-des
|
|
|
19
19
|
*/
|
|
20
20
|
export class InvitationFactory {
|
|
21
21
|
constructor (
|
|
22
|
-
private readonly _partyProcessor:
|
|
22
|
+
private readonly _partyProcessor: CredentialWriter & PartyStateProvider,
|
|
23
23
|
// This needs to be a provider in case this is a backend for the HALO party.
|
|
24
24
|
// Then the identity would be changed after this is instantiated.
|
|
25
25
|
private readonly _credentialsSigner: CredentialsSigner,
|
|
@@ -170,19 +170,17 @@ export class OfflineInvitationClaimer {
|
|
|
170
170
|
|
|
171
171
|
// The secretProvider should provide an `Auth` message signed directly by the Identity key.
|
|
172
172
|
static createSecretProvider (credentials: CredentialsSigner): SecretProvider {
|
|
173
|
-
return async (info?: SecretInfo) =>
|
|
174
|
-
|
|
175
|
-
/* The signed portion of the Auth message includes the ID and authNonce provided
|
|
173
|
+
return async (info?: SecretInfo) => Buffer.from(codec.encode(
|
|
174
|
+
/* The signed portion of the Auth message includes the ID and authNonce provided
|
|
176
175
|
* by the `info` object. These values will be validated on the other end.
|
|
177
176
|
*/
|
|
178
|
-
|
|
179
|
-
|
|
177
|
+
createAuthMessage(
|
|
178
|
+
credentials.signer,
|
|
180
179
|
info!.id.value,
|
|
181
180
|
credentials.getIdentityKey(),
|
|
182
181
|
credentials.getDeviceSigningKeys(),
|
|
183
182
|
undefined,
|
|
184
183
|
info!.authNonce.value)
|
|
185
|
-
|
|
186
|
-
};
|
|
184
|
+
));
|
|
187
185
|
}
|
|
188
186
|
}
|
|
@@ -23,9 +23,11 @@ import { DataParty } from './data-party';
|
|
|
23
23
|
|
|
24
24
|
describe('DataParty', () => {
|
|
25
25
|
const createParty = async (identity: IdentityCredentials, partyKey: PublicKey, hints: KeyHint[]) => {
|
|
26
|
-
|
|
27
|
-
const
|
|
28
|
-
const snapshotStore = new SnapshotStore(
|
|
26
|
+
|
|
27
|
+
const storage = createStorage('', StorageType.RAM);
|
|
28
|
+
const snapshotStore = new SnapshotStore(storage.directory('snapshots'));
|
|
29
|
+
const metadataStore = new MetadataStore(storage.directory('metadata'));
|
|
30
|
+
const feedStore = new FeedStore(storage.directory('feed'), { valueEncoding: codec });
|
|
29
31
|
const modelFactory = new ModelFactory().registerModel(ObjectModel);
|
|
30
32
|
const networkManager = new NetworkManager();
|
|
31
33
|
const partyFeedProvider = new PartyFeedProvider(metadataStore, identity.keyring, feedStore, partyKey);
|
|
@@ -59,8 +61,8 @@ describe('DataParty', () => {
|
|
|
59
61
|
const party = await createParty(identity, partyKey.publicKey, []);
|
|
60
62
|
await party.open();
|
|
61
63
|
|
|
62
|
-
const feed = await party.
|
|
63
|
-
await party.
|
|
64
|
+
const feed = await party.getWriteFeed();
|
|
65
|
+
await party.writeCredentialsMessage(createPartyGenesisMessage(
|
|
64
66
|
keyring,
|
|
65
67
|
partyKey,
|
|
66
68
|
feed.key,
|
|
@@ -79,8 +81,8 @@ describe('DataParty', () => {
|
|
|
79
81
|
|
|
80
82
|
const party = await createParty(identity, partyKey.publicKey, []);
|
|
81
83
|
await party.open();
|
|
82
|
-
const feed = await party.
|
|
83
|
-
await party.
|
|
84
|
+
const feed = await party.getWriteFeed();
|
|
85
|
+
await party.writeCredentialsMessage(createPartyGenesisMessage(
|
|
84
86
|
keyring,
|
|
85
87
|
partyKey,
|
|
86
88
|
feed.key,
|
|
@@ -103,8 +105,8 @@ describe('DataParty', () => {
|
|
|
103
105
|
|
|
104
106
|
const party = await createParty(identityA, partyKey.publicKey, []);
|
|
105
107
|
await party.open();
|
|
106
|
-
const feed = await party.
|
|
107
|
-
await party.
|
|
108
|
+
const feed = await party.getWriteFeed();
|
|
109
|
+
await party.writeCredentialsMessage(createPartyGenesisMessage(
|
|
108
110
|
keyring,
|
|
109
111
|
partyKey,
|
|
110
112
|
feed.key,
|
|
@@ -128,14 +130,14 @@ describe('DataParty', () => {
|
|
|
128
130
|
|
|
129
131
|
const partyA = await createParty(identityA, partyKey.publicKey, []);
|
|
130
132
|
await partyA.open();
|
|
131
|
-
const feedA = await partyA.
|
|
132
|
-
await partyA.
|
|
133
|
+
const feedA = await partyA.getWriteFeed();
|
|
134
|
+
await partyA.writeCredentialsMessage(createPartyGenesisMessage(
|
|
133
135
|
keyring,
|
|
134
136
|
partyKey,
|
|
135
137
|
feedA.key,
|
|
136
138
|
partyKey
|
|
137
139
|
));
|
|
138
|
-
await partyA.
|
|
140
|
+
await partyA.writeCredentialsMessage(createKeyAdmitMessage(
|
|
139
141
|
keyring,
|
|
140
142
|
partyKey.publicKey,
|
|
141
143
|
identityA.identityKey,
|
|
@@ -164,14 +166,14 @@ describe('DataParty', () => {
|
|
|
164
166
|
|
|
165
167
|
const partyA = await createParty(identityA, partyKeyA.publicKey, []);
|
|
166
168
|
await partyA.open();
|
|
167
|
-
const feedA = await partyA.
|
|
168
|
-
await partyA.
|
|
169
|
+
const feedA = await partyA.getWriteFeed();
|
|
170
|
+
await partyA.writeCredentialsMessage(createPartyGenesisMessage(
|
|
169
171
|
identityA.keyring,
|
|
170
172
|
partyKeyA,
|
|
171
173
|
feedA.key,
|
|
172
174
|
partyKeyA
|
|
173
175
|
));
|
|
174
|
-
await partyA.
|
|
176
|
+
await partyA.writeCredentialsMessage(createKeyAdmitMessage(
|
|
175
177
|
identityA.keyring,
|
|
176
178
|
partyKeyA.publicKey,
|
|
177
179
|
identityA.identityKey,
|
|
@@ -5,10 +5,11 @@
|
|
|
5
5
|
import assert from 'assert';
|
|
6
6
|
|
|
7
7
|
import { synchronized, Event } from '@dxos/async';
|
|
8
|
-
import { KeyHint } from '@dxos/credentials';
|
|
8
|
+
import { KeyHint, Message as HaloMessage } from '@dxos/credentials';
|
|
9
9
|
import { PublicKey } from '@dxos/crypto';
|
|
10
10
|
import { timed } from '@dxos/debug';
|
|
11
|
-
import { PartyKey, PartySnapshot, Timeframe } from '@dxos/echo-protocol';
|
|
11
|
+
import { PartyKey, PartySnapshot, Timeframe, WriteReceipt } from '@dxos/echo-protocol';
|
|
12
|
+
import { FeedDescriptor } from '@dxos/feed-store';
|
|
12
13
|
import { ModelFactory } from '@dxos/model-factory';
|
|
13
14
|
import { NetworkManager } from '@dxos/network-manager';
|
|
14
15
|
import { ObjectModel } from '@dxos/object-model';
|
|
@@ -126,16 +127,6 @@ export class DataParty {
|
|
|
126
127
|
return this._invitationManager;
|
|
127
128
|
}
|
|
128
129
|
|
|
129
|
-
// TODO(burdon): Remove?
|
|
130
|
-
get feedProvider (): PartyFeedProvider {
|
|
131
|
-
return this._feedProvider;
|
|
132
|
-
}
|
|
133
|
-
|
|
134
|
-
get preferences (): PartyPreferences {
|
|
135
|
-
assert(this._preferences, 'Preferences not available.');
|
|
136
|
-
return this._preferences;
|
|
137
|
-
}
|
|
138
|
-
|
|
139
130
|
get title () {
|
|
140
131
|
return this._preferences?.getLastKnownTitle();
|
|
141
132
|
}
|
|
@@ -211,6 +202,18 @@ export class DataParty {
|
|
|
211
202
|
return this;
|
|
212
203
|
}
|
|
213
204
|
|
|
205
|
+
async getWriteFeed (): Promise<FeedDescriptor> {
|
|
206
|
+
return this._feedProvider.createOrOpenWritableFeed();
|
|
207
|
+
}
|
|
208
|
+
|
|
209
|
+
getFeeds (): FeedDescriptor[] {
|
|
210
|
+
return this._feedProvider.getFeeds();
|
|
211
|
+
}
|
|
212
|
+
|
|
213
|
+
writeCredentialsMessage (message: HaloMessage): Promise<WriteReceipt> {
|
|
214
|
+
return this._partyCore.writeCredentialsMessage(message);
|
|
215
|
+
}
|
|
216
|
+
|
|
214
217
|
get isActive (): boolean {
|
|
215
218
|
assert(this._preferences, 'PartyActivator required');
|
|
216
219
|
return this._preferences.isActive;
|