@dxos/echo-db 2.33.5-dev.97a81dd0 → 2.33.5-dev.bbe0c471
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/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.js +4 -4
- 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 +5 -5
- 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/invitations/greeting-responder.d.ts +6 -4
- package/dist/src/invitations/greeting-responder.d.ts.map +1 -1
- package/dist/src/invitations/greeting-responder.js +3 -2
- package/dist/src/invitations/greeting-responder.js.map +1 -1
- package/dist/src/invitations/invitation-factory.d.ts +5 -2
- package/dist/src/invitations/invitation-factory.d.ts.map +1 -1
- package/dist/src/invitations/invitation-factory.js +4 -3
- package/dist/src/invitations/invitation-factory.js.map +1 -1
- package/dist/src/parties/data-party.d.ts +3 -3
- package/dist/src/parties/data-party.d.ts.map +1 -1
- package/dist/src/parties/data-party.js +5 -5
- package/dist/src/parties/data-party.js.map +1 -1
- package/dist/src/parties/data-party.test.js +13 -12
- package/dist/src/parties/data-party.test.js.map +1 -1
- package/dist/src/parties/party-factory.js +9 -9
- package/dist/src/parties/party-factory.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/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 +2 -2
- package/dist/src/pipeline/party-core.d.ts.map +1 -1
- package/dist/src/pipeline/party-core.js +5 -9
- 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 +3 -9
- package/dist/src/pipeline/party-processor.d.ts.map +1 -1
- package/dist/src/pipeline/party-processor.js +0 -8
- package/dist/src/pipeline/party-processor.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/authenticator.d.ts +3 -3
- package/dist/src/protocol/authenticator.d.ts.map +1 -1
- package/dist/src/protocol/authenticator.js +2 -2
- package/dist/src/protocol/authenticator.js.map +1 -1
- package/dist/src/protocol/authenticator.test.js +1 -4
- package/dist/src/protocol/authenticator.test.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/tsconfig.tsbuildinfo +1 -1
- package/package.json +17 -17
- package/src/echo.ts +8 -18
- package/src/halo/halo-factory.ts +4 -4
- package/src/halo/halo-party.ts +12 -7
- package/src/halo/halo.test.ts +4 -3
- package/src/invitations/greeting-responder.ts +7 -5
- package/src/invitations/invitation-factory.ts +8 -5
- package/src/parties/data-party.test.ts +14 -12
- package/src/parties/data-party.ts +8 -7
- package/src/parties/party-factory.ts +9 -9
- package/src/parties/party-manager.test.ts +9 -6
- 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 +6 -11
- package/src/pipeline/party-processor.ts +2 -18
- package/src/pipeline/pipeline.test.ts +2 -2
- package/src/protocol/authenticator.test.ts +1 -4
- package/src/protocol/authenticator.ts +8 -4
- package/src/snapshots/snapshot-store.test.ts +1 -1
- package/src/snapshots/snapshot-store.ts +5 -6
|
@@ -25,12 +25,12 @@ const party_core_1 = require("./party-core");
|
|
|
25
25
|
describe('PartyCore', () => {
|
|
26
26
|
const setup = async () => {
|
|
27
27
|
const storage = (0, random_access_multi_storage_1.createStorage)('', random_access_multi_storage_1.StorageType.RAM);
|
|
28
|
-
const feedStore = new feed_store_1.FeedStore(storage, { valueEncoding: echo_protocol_1.codec });
|
|
28
|
+
const feedStore = new feed_store_1.FeedStore(storage.directory('feed'), { valueEncoding: echo_protocol_1.codec });
|
|
29
29
|
(0, testutils_1.afterTest)(async () => feedStore.close());
|
|
30
30
|
const keyring = new credentials_1.Keyring();
|
|
31
|
-
const metadataStore = new pipeline_1.MetadataStore(
|
|
31
|
+
const metadataStore = new pipeline_1.MetadataStore(storage.directory('metadata'));
|
|
32
32
|
const modelFactory = new model_factory_1.ModelFactory().registerModel(object_model_1.ObjectModel);
|
|
33
|
-
const snapshotStore = new snapshots_1.SnapshotStore(
|
|
33
|
+
const snapshotStore = new snapshots_1.SnapshotStore(storage.directory('snapshots'));
|
|
34
34
|
const partyKey = await keyring.createKeyRecord({ type: credentials_1.KeyType.PARTY });
|
|
35
35
|
const partyFeedProvider = new pipeline_1.PartyFeedProvider(metadataStore, keyring, feedStore, partyKey.publicKey);
|
|
36
36
|
const party = new party_core_1.PartyCore(partyKey.publicKey, partyFeedProvider, modelFactory, snapshotStore, crypto_1.PublicKey.random());
|
|
@@ -38,9 +38,9 @@ describe('PartyCore', () => {
|
|
|
38
38
|
await party.open();
|
|
39
39
|
(0, testutils_1.afterTest)(async () => party.close());
|
|
40
40
|
// PartyGenesis (self-signed by Party).
|
|
41
|
-
await party.
|
|
41
|
+
await party.credentialsWriter.write((0, credentials_1.createPartyGenesisMessage)(keyring, partyKey, feed.key, partyKey));
|
|
42
42
|
// FeedAdmit (signed by the Device KeyChain).
|
|
43
|
-
await party.
|
|
43
|
+
await party.credentialsWriter.write((0, credentials_1.createFeedAdmitMessage)(keyring, partyKey.publicKey, feed.key, [partyKey]));
|
|
44
44
|
return { party, feedKey: feed.key, feed, feedStore, partyKey, keyring, partyFeedProvider };
|
|
45
45
|
};
|
|
46
46
|
(0, mocha_1.it)('create & have the feed key admitted', async () => {
|
|
@@ -80,18 +80,18 @@ describe('PartyCore', () => {
|
|
|
80
80
|
const { party, partyKey, keyring, partyFeedProvider, feedStore } = await setup();
|
|
81
81
|
const feedKey = await keyring.createKeyRecord({ type: credentials_1.KeyType.FEED });
|
|
82
82
|
const eventFired = feedStore.feedOpenedEvent.waitForCount(1);
|
|
83
|
-
await party.
|
|
83
|
+
await party.credentialsWriter.write((0, credentials_1.createFeedAdmitMessage)(keyring, party.key, feedKey.publicKey, [partyKey]));
|
|
84
84
|
await (0, async_1.promiseTimeout)(eventFired, 1000, new Error('timeout'));
|
|
85
85
|
(0, expect_1.default)(partyFeedProvider.getFeeds().find(k => k.key.equals(feedKey.publicKey))).toBeTruthy();
|
|
86
86
|
});
|
|
87
87
|
(0, mocha_1.it)('opens feed from hints', async () => {
|
|
88
88
|
const storage = (0, random_access_multi_storage_1.createStorage)('', random_access_multi_storage_1.StorageType.RAM);
|
|
89
|
-
const feedStore = new feed_store_1.FeedStore(storage, { valueEncoding: echo_protocol_1.codec });
|
|
89
|
+
const feedStore = new feed_store_1.FeedStore(storage.directory('feed'), { valueEncoding: echo_protocol_1.codec });
|
|
90
90
|
(0, testutils_1.afterTest)(async () => feedStore.close());
|
|
91
91
|
const keyring = new credentials_1.Keyring();
|
|
92
|
-
const metadataStore = new pipeline_1.MetadataStore(
|
|
92
|
+
const metadataStore = new pipeline_1.MetadataStore(storage.directory('metadata'));
|
|
93
93
|
const modelFactory = new model_factory_1.ModelFactory().registerModel(object_model_1.ObjectModel);
|
|
94
|
-
const snapshotStore = new snapshots_1.SnapshotStore(
|
|
94
|
+
const snapshotStore = new snapshots_1.SnapshotStore(storage.directory('snapshots'));
|
|
95
95
|
const partyKey = await keyring.createKeyRecord({ type: credentials_1.KeyType.PARTY });
|
|
96
96
|
const partyFeedProvider = new pipeline_1.PartyFeedProvider(metadataStore, keyring, feedStore, partyKey.publicKey);
|
|
97
97
|
const otherFeedKey = crypto_1.PublicKey.random();
|
|
@@ -126,7 +126,7 @@ describe('PartyCore', () => {
|
|
|
126
126
|
const feedKey = await keyring.createKeyRecord({ type: credentials_1.KeyType.FEED });
|
|
127
127
|
const fullKey = keyring.getFullKey(feedKey.publicKey);
|
|
128
128
|
const feed2 = await feedStore.openReadWriteFeed(fullKey.publicKey, fullKey.secretKey);
|
|
129
|
-
await party.
|
|
129
|
+
await party.credentialsWriter.write((0, credentials_1.createFeedAdmitMessage)(keyring, party.key, feed2.key, [partyKey]));
|
|
130
130
|
const itemId = (0, crypto_1.createId)();
|
|
131
131
|
await feed2.append({
|
|
132
132
|
echo: {
|
|
@@ -145,7 +145,7 @@ describe('PartyCore', () => {
|
|
|
145
145
|
await party.open();
|
|
146
146
|
const feedKey = await keyring.createKeyRecord({ type: credentials_1.KeyType.FEED });
|
|
147
147
|
const fullKey = keyring.getFullKey(feedKey.publicKey);
|
|
148
|
-
await party.
|
|
148
|
+
await party.credentialsWriter.write((0, credentials_1.createFeedAdmitMessage)(keyring, party.key, feedKey.publicKey, [partyKey]));
|
|
149
149
|
const feed2 = await feedStore.openReadWriteFeed(fullKey.publicKey, fullKey.secretKey);
|
|
150
150
|
const itemId = (0, crypto_1.createId)();
|
|
151
151
|
await feed2.append({
|
|
@@ -163,15 +163,15 @@ describe('PartyCore', () => {
|
|
|
163
163
|
(0, mocha_1.it)('two instances replicating', async () => {
|
|
164
164
|
const peer1 = await setup();
|
|
165
165
|
const storage = (0, random_access_multi_storage_1.createStorage)('', random_access_multi_storage_1.StorageType.RAM);
|
|
166
|
-
const feedStore = new feed_store_1.FeedStore(storage, { valueEncoding: echo_protocol_1.codec });
|
|
166
|
+
const feedStore = new feed_store_1.FeedStore(storage.directory('feed'), { valueEncoding: echo_protocol_1.codec });
|
|
167
167
|
(0, testutils_1.afterTest)(async () => feedStore.close());
|
|
168
|
-
const metadataStore = new pipeline_1.MetadataStore(
|
|
168
|
+
const metadataStore = new pipeline_1.MetadataStore(storage.directory('metadata'));
|
|
169
169
|
const modelFactory = new model_factory_1.ModelFactory().registerModel(object_model_1.ObjectModel);
|
|
170
|
-
const snapshotStore = new snapshots_1.SnapshotStore(
|
|
170
|
+
const snapshotStore = new snapshots_1.SnapshotStore(storage.directory('snapshots'));
|
|
171
171
|
const partyFeedProvider = new pipeline_1.PartyFeedProvider(metadataStore, peer1.keyring, feedStore, peer1.party.key);
|
|
172
172
|
const party2 = new party_core_1.PartyCore(peer1.party.key, partyFeedProvider, modelFactory, snapshotStore, crypto_1.PublicKey.random());
|
|
173
173
|
const feed2 = await partyFeedProvider.createOrOpenWritableFeed();
|
|
174
|
-
await peer1.party.
|
|
174
|
+
await peer1.party.credentialsWriter.write((0, credentials_1.createFeedAdmitMessage)(peer1.keyring, peer1.party.key, feed2.key, [peer1.partyKey]));
|
|
175
175
|
await party2.open([{
|
|
176
176
|
publicKey: peer1.feedKey,
|
|
177
177
|
type: credentials_1.KeyType.FEED
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"party-core.test.js","sourceRoot":"","sources":["../../../src/pipeline/party-core.test.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;AAEF,oDAA4B;AAC5B,iCAAmC;AAEnC,uCAA6C;AAC7C,mDAAwG;AACxG,yCAAmD;AACnD,uDAAuD;AACvD,iDAA6C;AAC7C,uDAA6D;AAC7D,uDAAmD;AACnD,qDAAiD;AACjD,mFAA+E;AAC/E,+CAA4C;AAE5C,0CAA+D;AAC/D,qEAAuE;AACvE,4CAA6C;AAC7C,6CAAyC;AAEzC,QAAQ,CAAC,WAAW,EAAE,GAAG,EAAE;IACzB,MAAM,KAAK,GAAG,KAAK,IAAI,EAAE;QACvB,MAAM,OAAO,GAAG,IAAA,2CAAa,EAAC,EAAE,EAAE,yCAAW,CAAC,GAAG,CAAC,CAAC;QACnD,MAAM,SAAS,GAAG,IAAI,sBAAS,CAAC,OAAO,EAAE,EAAE,aAAa,EAAE,qBAAK,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"party-core.test.js","sourceRoot":"","sources":["../../../src/pipeline/party-core.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,8 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
import { Event } from '@dxos/async';
|
|
3
|
-
import { KeyHint, PartyState,
|
|
3
|
+
import { KeyHint, PartyState, SignedMessage } from '@dxos/credentials';
|
|
4
4
|
import { PublicKey } from '@dxos/crypto';
|
|
5
|
-
import { FeedKey,
|
|
6
|
-
export interface CredentialWriter {
|
|
7
|
-
writeHaloMessage(message: HaloMessage): Promise<WriteReceipt>;
|
|
8
|
-
}
|
|
5
|
+
import { FeedKey, IHaloStream, PartyKey, HaloStateSnapshot } from '@dxos/echo-protocol';
|
|
9
6
|
export interface CredentialProcessor {
|
|
10
7
|
processMessage(message: IHaloStream): Promise<void>;
|
|
11
8
|
}
|
|
@@ -24,10 +21,9 @@ export interface PartyStateProvider {
|
|
|
24
21
|
/**
|
|
25
22
|
* TODO(burdon): Wrapper/Bridge between HALO APIs.
|
|
26
23
|
*/
|
|
27
|
-
export declare class PartyProcessor implements
|
|
24
|
+
export declare class PartyProcessor implements CredentialProcessor, PartyStateProvider {
|
|
28
25
|
private readonly _partyKey;
|
|
29
26
|
private readonly _state;
|
|
30
|
-
private _outboundHaloStream;
|
|
31
27
|
readonly feedAdded: Event<PublicKey>;
|
|
32
28
|
readonly keyOrInfoAdded: Event<PublicKey>;
|
|
33
29
|
/**
|
|
@@ -52,8 +48,6 @@ export declare class PartyProcessor implements CredentialWriter, CredentialProce
|
|
|
52
48
|
getOfflineInvitation(invitationID: Buffer): SignedMessage | undefined;
|
|
53
49
|
takeHints(hints: KeyHint[]): Promise<void>;
|
|
54
50
|
processMessage(message: IHaloStream): Promise<void>;
|
|
55
|
-
setOutboundStream(stream: FeedWriter<HaloMessage>): void;
|
|
56
|
-
writeHaloMessage(message: HaloMessage): Promise<WriteReceipt>;
|
|
57
51
|
makeSnapshot(): HaloStateSnapshot;
|
|
58
52
|
restoreFromSnapshot(snapshot: HaloStateSnapshot): Promise<void>;
|
|
59
53
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"party-processor.d.ts","sourceRoot":"","sources":["../../../src/pipeline/party-processor.ts"],"names":[],"mappings":";AAOA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EACL,OAAO,EAEP,UAAU,
|
|
1
|
+
{"version":3,"file":"party-processor.d.ts","sourceRoot":"","sources":["../../../src/pipeline/party-processor.ts"],"names":[],"mappings":";AAOA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EACL,OAAO,EAEP,UAAU,EAIV,aAAa,EACd,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAKxF,MAAM,WAAW,mBAAmB;IAClC,cAAc,CAAE,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;CACrD;AAED,MAAM,WAAW,kBAAkB;IACjC,QAAQ,EAAE,SAAS,CAAA;IAEnB;;OAEG;IACH,eAAe,EAAE,OAAO,CAAA;IACxB,UAAU,EAAE,SAAS,EAAE,CAAA;IACvB,QAAQ,EAAE,SAAS,EAAE,CAAA;IACrB,mBAAmB,CAAE,OAAO,EAAE,OAAO,GAAG,SAAS,GAAG,SAAS,CAAA;IAC7D,cAAc,CAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAA;IAE1C,oBAAoB,CAAE,YAAY,EAAE,MAAM,GAAG,aAAa,GAAG,SAAS,CAAA;CACvE;AAED;;GAEG;AACH,qBAAa,cAAe,YAAW,mBAAmB,EAAE,kBAAkB;IAa1E,OAAO,CAAC,QAAQ,CAAC,SAAS;IAZ5B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAa;IAEpC,QAAQ,CAAC,SAAS,mBAAuB;IAEzC,SAAgB,cAAc,mBAA0B;IAExD;;OAEG;IACH,OAAO,CAAC,aAAa,CAAqB;gBAGvB,SAAS,EAAE,QAAQ;IAatC,IAAI,QAAQ,cAEX;IAED,IAAI,QAAQ,IAAK,SAAS,EAAE,CAE3B;IAED,IAAI,UAAU,IAAK,SAAS,EAAE,CAE7B;IAED,IAAI,kBAAkB,+BAErB;IAED,IAAI,YAAY,+BAEf;IAED,IAAI,eAAe,YAElB;IAED,IAAI,KAAK,eAER;IAED,cAAc,CAAE,OAAO,EAAE,OAAO;IAKhC,WAAW,CAAE,SAAS,EAAE,SAAS;IAKjC,aAAa,CAAE,SAAS,EAAE,SAAS;IAKnC;;OAEG;IACH,mBAAmB,CAAE,OAAO,EAAE,OAAO,GAAG,SAAS,GAAG,SAAS;IAM7D,oBAAoB,CAAE,YAAY,EAAE,MAAM;IAIpC,SAAS,CAAE,KAAK,EAAE,OAAO,EAAE;IAU3B,cAAc,CAAE,OAAO,EAAE,WAAW;IAO1C,YAAY,IAAK,iBAAiB;IAM5B,mBAAmB,CAAE,QAAQ,EAAE,iBAAiB;CAMvD"}
|
|
@@ -93,14 +93,6 @@ class PartyProcessor {
|
|
|
93
93
|
this._haloMessages.push(data);
|
|
94
94
|
await this._state.processMessages([data]);
|
|
95
95
|
}
|
|
96
|
-
setOutboundStream(stream) {
|
|
97
|
-
this._outboundHaloStream = stream;
|
|
98
|
-
}
|
|
99
|
-
async writeHaloMessage(message) {
|
|
100
|
-
(0, assert_1.default)(this._outboundHaloStream, 'Party is closed or read-only');
|
|
101
|
-
// TODO(marik-d): Wait for the message to be processed?
|
|
102
|
-
return this._outboundHaloStream.write(message);
|
|
103
|
-
}
|
|
104
96
|
makeSnapshot() {
|
|
105
97
|
return {
|
|
106
98
|
messages: this._haloMessages
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"party-processor.js","sourceRoot":"","sources":["../../../src/pipeline/party-processor.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,oDAA4B;AAC5B,kDAA0B;AAE1B,uCAAoC;AACpC,mDAQ2B;AAG3B,qCAA0C;AAE1C,MAAM,GAAG,GAAG,IAAA,eAAK,EAAC,8BAA8B,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"party-processor.js","sourceRoot":"","sources":["../../../src/pipeline/party-processor.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,7 +25,7 @@ const log = (0, debug_1.default)('dxos:echo:pipeline:test');
|
|
|
25
25
|
describe('pipeline', () => {
|
|
26
26
|
(0, mocha_1.it)('streams', async () => {
|
|
27
27
|
const storage = (0, random_access_multi_storage_1.createStorage)('', random_access_multi_storage_1.StorageType.RAM);
|
|
28
|
-
const feedStore = new feed_store_1.FeedStore(storage, { valueEncoding: echo_protocol_1.codec });
|
|
28
|
+
const feedStore = new feed_store_1.FeedStore(storage.directory('feed'), { valueEncoding: echo_protocol_1.codec });
|
|
29
29
|
const feedKeys = [];
|
|
30
30
|
const feedSelector = descriptor => !!feedKeys.find(key => descriptor.key.equals(key));
|
|
31
31
|
const feedReadStream = new echo_protocol_1.FeedStoreIterator(feedSelector, () => 0, new echo_protocol_1.Timeframe());
|
|
@@ -80,7 +80,7 @@ describe('pipeline', () => {
|
|
|
80
80
|
});
|
|
81
81
|
(0, mocha_1.it)('writing', async () => {
|
|
82
82
|
const storage = (0, random_access_multi_storage_1.createStorage)('', random_access_multi_storage_1.StorageType.RAM);
|
|
83
|
-
const feedStore = new feed_store_1.FeedStore(storage, { valueEncoding: echo_protocol_1.codec });
|
|
83
|
+
const feedStore = new feed_store_1.FeedStore(storage.directory('feed'), { valueEncoding: echo_protocol_1.codec });
|
|
84
84
|
const feedReadStream = new echo_protocol_1.FeedStoreIterator(() => true, () => 0, new echo_protocol_1.Timeframe());
|
|
85
85
|
const { publicKey, secretKey } = (0, crypto_1.createKeyPair)();
|
|
86
86
|
const descriptor = await feedStore.openReadWriteFeed(crypto_1.PublicKey.from(publicKey), secretKey);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pipeline.test.js","sourceRoot":"","sources":["../../../src/pipeline/pipeline.test.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;AAEF,kDAA0B;AAC1B,oDAA4B;AAC5B,iCAAmC;AAEnC,uCAAsD;AACtD,mDAAgF;AAChF,yCAAkE;AAClE,uDAAuH;AACvH,iDAAsG;AACtG,uDAAgE;AAChE,mFAA+E;AAC/E,qCAA0C;AAE1C,0CAA6C;AAC7C,uDAAmD;AACnD,yCAAsC;AAEtC,MAAM,GAAG,GAAG,IAAA,eAAK,EAAC,yBAAyB,CAAC,CAAC;AAE7C,gCAAgC;AAChC,QAAQ,CAAC,UAAU,EAAE,GAAG,EAAE;IACxB,IAAA,UAAI,EAAC,SAAS,EAAE,KAAK,IAAI,EAAE;QACzB,MAAM,OAAO,GAAG,IAAA,2CAAa,EAAC,EAAE,EAAE,yCAAW,CAAC,GAAG,CAAC,CAAC;QACnD,MAAM,SAAS,GAAG,IAAI,sBAAS,CAAC,OAAO,EAAE,EAAE,aAAa,EAAE,qBAAK,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"pipeline.test.js","sourceRoot":"","sources":["../../../src/pipeline/pipeline.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
|
-
import { Authenticator } from '@dxos/credentials';
|
|
3
|
-
import { FeedKey, PartyKey } from '@dxos/echo-protocol';
|
|
2
|
+
import { Message as HaloMessage, Authenticator } from '@dxos/credentials';
|
|
3
|
+
import { FeedKey, FeedWriter, PartyKey } from '@dxos/echo-protocol';
|
|
4
4
|
import { PartyProcessor } from '../pipeline';
|
|
5
5
|
import { CredentialsSigner } from './credentials-signer';
|
|
6
|
-
export declare const createAuthenticator: (partyProcessor: PartyProcessor, credentialsSigner: CredentialsSigner) => Authenticator;
|
|
6
|
+
export declare const createAuthenticator: (partyProcessor: PartyProcessor, credentialsSigner: CredentialsSigner, credentialsWriter: FeedWriter<HaloMessage>) => Authenticator;
|
|
7
7
|
export interface CredentialsProvider {
|
|
8
8
|
/**
|
|
9
9
|
* The credentials (e.g., a serialized AuthMessage) as a bytes.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authenticator.d.ts","sourceRoot":"","sources":["../../../src/protocol/authenticator.ts"],"names":[],"mappings":";AAMA,OAAO,EAAE,aAAa,EAA+F,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"authenticator.d.ts","sourceRoot":"","sources":["../../../src/protocol/authenticator.ts"],"names":[],"mappings":";AAMA,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,aAAa,EAA+F,MAAM,mBAAmB,CAAC;AACvK,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAEpE,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAIzD,eAAO,MAAM,mBAAmB,mBACd,cAAc,qBACX,iBAAiB,qBACjB,WAAW,WAAW,CAAC,KACzC,aAUD,CAAC;AAEH,MAAM,WAAW,mBAAmB;IAClC;;OAEG;IACH,GAAG,IAAK,MAAM,CAAA;CACf;AAED,eAAO,MAAM,yBAAyB,sBAAuB,iBAAiB,YAAY,QAAQ,WAAW,OAAO,KAAG,mBAkBrH,CAAC"}
|
|
@@ -10,10 +10,10 @@ exports.createCredentialsProvider = exports.createAuthenticator = void 0;
|
|
|
10
10
|
const debug_1 = __importDefault(require("debug"));
|
|
11
11
|
const credentials_1 = require("@dxos/credentials");
|
|
12
12
|
const log = (0, debug_1.default)('dxos:echo-db:authenticator');
|
|
13
|
-
const createAuthenticator = (partyProcessor, credentialsSigner) => new credentials_1.PartyAuthenticator(partyProcessor.state, async (auth) => {
|
|
13
|
+
const createAuthenticator = (partyProcessor, credentialsSigner, credentialsWriter) => new credentials_1.PartyAuthenticator(partyProcessor.state, async (auth) => {
|
|
14
14
|
if (auth.feedAdmit && auth.feedKey && !partyProcessor.isFeedAdmitted(auth.feedKey)) {
|
|
15
15
|
log(`Admitting feed of authenticated member: ${auth.feedKey}`);
|
|
16
|
-
await
|
|
16
|
+
await credentialsWriter.write((0, credentials_1.createEnvelopeMessage)(credentialsSigner.signer, partyProcessor.partyKey, auth.feedAdmit, [credentialsSigner.getDeviceSigningKeys()]));
|
|
17
17
|
}
|
|
18
18
|
});
|
|
19
19
|
exports.createAuthenticator = createAuthenticator;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authenticator.js","sourceRoot":"","sources":["../../../src/protocol/authenticator.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,kDAA0B;AAE1B,
|
|
1
|
+
{"version":3,"file":"authenticator.js","sourceRoot":"","sources":["../../../src/protocol/authenticator.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,kDAA0B;AAE1B,mDAAuK;AAMvK,MAAM,GAAG,GAAG,IAAA,eAAK,EAAC,4BAA4B,CAAC,CAAC;AAEzC,MAAM,mBAAmB,GAAG,CACjC,cAA8B,EAC9B,iBAAoC,EACpC,iBAA0C,EAC3B,EAAE,CAAC,IAAI,gCAAkB,CAAC,cAAc,CAAC,KAAK,EAAE,KAAK,EAAC,IAAI,EAAC,EAAE;IAC5E,IAAI,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,OAAO,IAAI,CAAC,cAAc,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE;QAClF,GAAG,CAAC,2CAA2C,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;QAC/D,MAAM,iBAAiB,CAAC,KAAK,CAAC,IAAA,mCAAqB,EACjD,iBAAiB,CAAC,MAAM,EACxB,cAAc,CAAC,QAAQ,EACvB,IAAI,CAAC,SAAS,EACd,CAAC,iBAAiB,CAAC,oBAAoB,EAAE,CAAC,CAC3C,CAAC,CAAC;KACJ;AACH,CAAC,CAAC,CAAC;AAdU,QAAA,mBAAmB,uBAc7B;AASI,MAAM,yBAAyB,GAAG,CAAC,iBAAoC,EAAE,QAAkB,EAAE,OAAgB,EAAuB,EAAE,CAAC,CAAC;IAC7I,GAAG,EAAE,GAAG,EAAE;QACR,MAAM,WAAW,GAAG,IAAA,+BAAiB,EACnC,iBAAiB,CAAC,MAAM,EACxB,QAAQ,EACR,iBAAiB,CAAC,cAAc,EAAE,EAClC,iBAAiB,CAAC,oBAAoB,EAAE,EACxC,OAAO,EACP,SAAS,EACT,IAAA,oCAAsB,EACpB,iBAAiB,CAAC,MAAM,EACxB,QAAQ,EACR,OAAO,EACP,CAAC,OAAO,EAAE,iBAAiB,CAAC,oBAAoB,EAAE,CAAC,CACpD,CACF,CAAC;QACF,OAAO,MAAM,CAAC,IAAI,CAAC,mBAAK,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC;IAChD,CAAC;CACF,CAAC,CAAC;AAlBU,QAAA,yBAAyB,6BAkBnC"}
|
|
@@ -9,7 +9,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
9
9
|
const expect_1 = __importDefault(require("expect"));
|
|
10
10
|
const mocha_1 = require("mocha");
|
|
11
11
|
const credentials_1 = require("@dxos/credentials");
|
|
12
|
-
const echo_protocol_1 = require("@dxos/echo-protocol");
|
|
13
12
|
const pipeline_1 = require("../pipeline");
|
|
14
13
|
const authenticator_1 = require("./authenticator");
|
|
15
14
|
const credentials_signer_1 = require("./credentials-signer");
|
|
@@ -23,8 +22,6 @@ describe('authenticator', () => {
|
|
|
23
22
|
const feedKey = await keyring.createKeyRecord({ type: credentials_1.KeyType.FEED });
|
|
24
23
|
const signer = credentials_signer_1.CredentialsSigner.createDirectDeviceSigner(keyring);
|
|
25
24
|
const partyProcessor = new pipeline_1.PartyProcessor(partyKey.publicKey);
|
|
26
|
-
const feed = new echo_protocol_1.MockFeedWriter();
|
|
27
|
-
partyProcessor.setOutboundStream(feed);
|
|
28
25
|
await partyProcessor.processMessage({
|
|
29
26
|
data: (0, credentials_1.createPartyGenesisMessage)(keyring, partyKey, feedKey.publicKey, identityKey),
|
|
30
27
|
meta: {}
|
|
@@ -37,7 +34,7 @@ describe('authenticator', () => {
|
|
|
37
34
|
data: (0, credentials_1.createKeyAdmitMessage)(keyring, partyKey.publicKey, deviceKey, [identityKey, deviceKey]),
|
|
38
35
|
meta: {}
|
|
39
36
|
});
|
|
40
|
-
const authenticator = (0, authenticator_1.createAuthenticator)(partyProcessor, signer);
|
|
37
|
+
const authenticator = (0, authenticator_1.createAuthenticator)(partyProcessor, signer, null);
|
|
41
38
|
const credential = (0, credentials_1.createAuthMessage)(keyring, partyKey.publicKey, identityKey, deviceKey);
|
|
42
39
|
(0, expect_1.default)(await authenticator.authenticate(credential.payload)).toEqual(true);
|
|
43
40
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authenticator.test.js","sourceRoot":"","sources":["../../../src/protocol/authenticator.test.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;AAEF,oDAA4B;AAC5B,iCAAmC;AAEnC,mDAA0H;
|
|
1
|
+
{"version":3,"file":"authenticator.test.js","sourceRoot":"","sources":["../../../src/protocol/authenticator.test.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;AAEF,oDAA4B;AAC5B,iCAAmC;AAEnC,mDAA0H;AAE1H,0CAA6C;AAC7C,mDAAsD;AACtD,6DAAyD;AAEzD,QAAQ,CAAC,eAAe,EAAE,GAAG,EAAE;IAC7B,kFAAkF;IAClF,UAAI,CAAC,IAAI,CAAC,6BAA6B,EAAE,KAAK,IAAI,EAAE;QAClD,MAAM,OAAO,GAAG,IAAI,qBAAO,EAAE,CAAC;QAC9B,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,eAAe,CAAC,EAAE,IAAI,EAAE,qBAAO,CAAC,KAAK,EAAE,CAAC,CAAC;QACxE,MAAM,WAAW,GAAG,MAAM,OAAO,CAAC,eAAe,CAAC,EAAE,IAAI,EAAE,qBAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC9E,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,eAAe,CAAC,EAAE,IAAI,EAAE,qBAAO,CAAC,MAAM,EAAE,CAAC,CAAC;QAC1E,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,eAAe,CAAC,EAAE,IAAI,EAAE,qBAAO,CAAC,IAAI,EAAE,CAAC,CAAC;QACtE,MAAM,MAAM,GAAG,sCAAiB,CAAC,wBAAwB,CAAC,OAAO,CAAC,CAAC;QAEnE,MAAM,cAAc,GAAG,IAAI,yBAAc,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QAC9D,MAAM,cAAc,CAAC,cAAc,CAAC;YAClC,IAAI,EAAE,IAAA,uCAAyB,EAC7B,OAAO,EACP,QAAQ,EACR,OAAO,CAAC,SAAS,EACjB,WAAW,CACZ;YACD,IAAI,EAAE,EAAS;SAChB,CAAC,CAAC;QACH,MAAM,cAAc,CAAC,cAAc,CAAC;YAClC,IAAI,EAAE,IAAA,mCAAqB,EACzB,OAAO,EACP,QAAQ,CAAC,SAAS,EAClB,WAAW,EACX,CAAC,QAAQ,EAAE,WAAW,CAAC,CACxB;YACD,IAAI,EAAE,EAAS;SAChB,CAAC,CAAC;QACH,MAAM,cAAc,CAAC,cAAc,CAAC;YAClC,IAAI,EAAE,IAAA,mCAAqB,EACzB,OAAO,EACP,QAAQ,CAAC,SAAS,EAClB,SAAS,EACT,CAAC,WAAW,EAAE,SAAS,CAAC,CACzB;YACD,IAAI,EAAE,EAAS;SAChB,CAAC,CAAC;QAEH,MAAM,aAAa,GAAG,IAAA,mCAAmB,EAAC,cAAc,EAAE,MAAM,EAAE,IAAW,CAAC,CAAC;QAC/E,MAAM,UAAU,GAAG,IAAA,+BAAiB,EAClC,OAAO,EACP,QAAQ,CAAC,SAAS,EAClB,WAAW,EACX,SAAS,CACV,CAAC;QAEF,IAAA,gBAAM,EAAC,MAAM,aAAa,CAAC,YAAY,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7E,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
import { PartyKey, PartySnapshot } from '@dxos/echo-protocol';
|
|
2
|
-
import {
|
|
2
|
+
import { Directory } from '@dxos/random-access-multi-storage';
|
|
3
3
|
/**
|
|
4
4
|
* Stores party snapshots. Takes any `random-access-storage` compatible backend.
|
|
5
5
|
*
|
|
6
6
|
* Passing `ram` as a backend will make all of files temporary, effectively disabling snapshots.
|
|
7
7
|
*/
|
|
8
8
|
export declare class SnapshotStore {
|
|
9
|
-
private readonly
|
|
10
|
-
constructor(
|
|
9
|
+
private readonly _directory;
|
|
10
|
+
constructor(_directory: Directory);
|
|
11
11
|
load(partyKey: PartyKey): Promise<PartySnapshot | undefined>;
|
|
12
12
|
save(snapshot: PartySnapshot): Promise<void>;
|
|
13
13
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"snapshot-store.d.ts","sourceRoot":"","sources":["../../../src/snapshots/snapshot-store.ts"],"names":[],"mappings":"AAQA,OAAO,EAAU,QAAQ,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACtE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"snapshot-store.d.ts","sourceRoot":"","sources":["../../../src/snapshots/snapshot-store.ts"],"names":[],"mappings":"AAQA,OAAO,EAAU,QAAQ,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACtE,OAAO,EAAE,SAAS,EAAE,MAAM,mCAAmC,CAAC;AAG9D;;;;GAIG;AACH,qBAAa,aAAa;IAEtB,OAAO,CAAC,QAAQ,CAAC,UAAU;gBAAV,UAAU,EAAE,SAAS;IAGlC,IAAI,CAAE,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;IAsB7D,IAAI,CAAE,QAAQ,EAAE,aAAa;IAYnC;;OAEG;IACG,KAAK;CAIZ"}
|
|
@@ -18,11 +18,11 @@ const log = (0, debug_1.default)('dxos:snapshot-store');
|
|
|
18
18
|
* Passing `ram` as a backend will make all of files temporary, effectively disabling snapshots.
|
|
19
19
|
*/
|
|
20
20
|
class SnapshotStore {
|
|
21
|
-
constructor(
|
|
22
|
-
this.
|
|
21
|
+
constructor(_directory) {
|
|
22
|
+
this._directory = _directory;
|
|
23
23
|
}
|
|
24
24
|
async load(partyKey) {
|
|
25
|
-
const file = this.
|
|
25
|
+
const file = this._directory.createOrOpen(partyKey.toHex());
|
|
26
26
|
try {
|
|
27
27
|
const { size } = await file.stat();
|
|
28
28
|
if (size === 0) {
|
|
@@ -45,7 +45,7 @@ class SnapshotStore {
|
|
|
45
45
|
}
|
|
46
46
|
async save(snapshot) {
|
|
47
47
|
(0, assert_1.default)(snapshot.partyKey);
|
|
48
|
-
const file = this.
|
|
48
|
+
const file = this._directory.createOrOpen((0, crypto_1.keyToString)(snapshot.partyKey), { truncate: true, size: 0 });
|
|
49
49
|
try {
|
|
50
50
|
const data = echo_protocol_1.schema.getCodecForType('dxos.echo.snapshot.PartySnapshot').encode(snapshot);
|
|
51
51
|
await file.write(0, Buffer.from(data));
|
|
@@ -59,7 +59,7 @@ class SnapshotStore {
|
|
|
59
59
|
*/
|
|
60
60
|
async clear() {
|
|
61
61
|
log('Clearing all snapshots..');
|
|
62
|
-
await this.
|
|
62
|
+
await this._directory.destroy();
|
|
63
63
|
}
|
|
64
64
|
}
|
|
65
65
|
exports.SnapshotStore = SnapshotStore;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"snapshot-store.js","sourceRoot":"","sources":["../../../src/snapshots/snapshot-store.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,oDAA4B;AAC5B,kDAA0B;AAE1B,yCAA2C;AAC3C,uDAAsE;AAGtE,MAAM,GAAG,GAAG,IAAA,eAAK,EAAC,qBAAqB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"snapshot-store.js","sourceRoot":"","sources":["../../../src/snapshots/snapshot-store.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,oDAA4B;AAC5B,kDAA0B;AAE1B,yCAA2C;AAC3C,uDAAsE;AAGtE,MAAM,GAAG,GAAG,IAAA,eAAK,EAAC,qBAAqB,CAAC,CAAC;AACzC;;;;GAIG;AACH,MAAa,aAAa;IACxB,YACmB,UAAqB;QAArB,eAAU,GAAV,UAAU,CAAW;IACrC,CAAC;IAEJ,KAAK,CAAC,IAAI,CAAE,QAAkB;QAC5B,MAAM,IAAI,GAAG,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;QAE5D,IAAI;YACF,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;YACnC,IAAI,IAAI,KAAK,CAAC,EAAE;gBACd,OAAO,SAAS,CAAC;aAClB;YAED,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;YACtC,OAAO,sBAAM,CAAC,eAAe,CAAC,kCAAkC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;SAChF;QAAC,OAAO,GAAQ,EAAE;YACjB,IAAI,GAAG,CAAC,IAAI,KAAK,QAAQ,EAAE;gBACzB,OAAO,SAAS,CAAC;aAClB;iBAAM;gBACL,MAAM,GAAG,CAAC;aACX;SACF;gBAAS;YACR,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;SACpB;IACH,CAAC;IAED,KAAK,CAAC,IAAI,CAAE,QAAuB;QACjC,IAAA,gBAAM,EAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAC1B,MAAM,IAAI,GAAG,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,IAAA,oBAAW,EAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC;QAEvG,IAAI;YACF,MAAM,IAAI,GAAG,sBAAM,CAAC,eAAe,CAAC,kCAAkC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;YACzF,MAAM,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;SACxC;gBAAS;YACR,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;SACpB;IACH,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,KAAK;QACT,GAAG,CAAC,0BAA0B,CAAC,CAAC;QAChC,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;IAClC,CAAC;CACF;AA9CD,sCA8CC"}
|
|
@@ -14,7 +14,7 @@ const snapshot_store_1 = require("./snapshot-store");
|
|
|
14
14
|
const createPublicKey = () => crypto_1.PublicKey.from((0, crypto_1.createKeyPair)().publicKey);
|
|
15
15
|
describe('SnapshotStore', () => {
|
|
16
16
|
(0, mocha_1.it)('in-memory', async () => {
|
|
17
|
-
const store = new snapshot_store_1.SnapshotStore((0, random_access_multi_storage_1.createStorage)('
|
|
17
|
+
const store = new snapshot_store_1.SnapshotStore((0, random_access_multi_storage_1.createStorage)('', random_access_multi_storage_1.StorageType.RAM).directory('snapshots'));
|
|
18
18
|
const key1 = createPublicKey();
|
|
19
19
|
const key2 = createPublicKey();
|
|
20
20
|
(0, expect_1.default)(await store.load(key1)).toBeUndefined();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"snapshot-store.test.js","sourceRoot":"","sources":["../../../src/snapshots/snapshot-store.test.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;AAEF,oDAA4B;AAC5B,iCAAmC;AAEnC,yCAAkE;AAElE,mFAA+E;AAE/E,qDAAiD;AAEjD,MAAM,eAAe,GAAG,GAAG,EAAE,CAAC,kBAAS,CAAC,IAAI,CAAC,IAAA,sBAAa,GAAE,CAAC,SAAS,CAAC,CAAC;AAExE,QAAQ,CAAC,eAAe,EAAE,GAAG,EAAE;IAC7B,IAAA,UAAI,EAAC,WAAW,EAAE,KAAK,IAAI,EAAE;QAC3B,MAAM,KAAK,GAAG,IAAI,8BAAa,CAAC,IAAA,2CAAa,EAAC,
|
|
1
|
+
{"version":3,"file":"snapshot-store.test.js","sourceRoot":"","sources":["../../../src/snapshots/snapshot-store.test.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;AAEF,oDAA4B;AAC5B,iCAAmC;AAEnC,yCAAkE;AAElE,mFAA+E;AAE/E,qDAAiD;AAEjD,MAAM,eAAe,GAAG,GAAG,EAAE,CAAC,kBAAS,CAAC,IAAI,CAAC,IAAA,sBAAa,GAAE,CAAC,SAAS,CAAC,CAAC;AAExE,QAAQ,CAAC,eAAe,EAAE,GAAG,EAAE;IAC7B,IAAA,UAAI,EAAC,WAAW,EAAE,KAAK,IAAI,EAAE;QAC3B,MAAM,KAAK,GAAG,IAAI,8BAAa,CAAC,IAAA,2CAAa,EAAC,EAAE,EAAE,yCAAW,CAAC,GAAG,CAAC,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,CAAC;QAE3F,MAAM,IAAI,GAAG,eAAe,EAAE,CAAC;QAC/B,MAAM,IAAI,GAAG,eAAe,EAAE,CAAC;QAE/B,IAAA,gBAAM,EAAC,MAAM,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,aAAa,EAAE,CAAC;QAC/C,IAAA,gBAAM,EAAC,MAAM,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,aAAa,EAAE,CAAC;QAE/C,MAAM,QAAQ,GAAkB;YAC9B,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE;YACzB,QAAQ,EAAE;gBACR,KAAK,EAAE,CAAC;wBACN,MAAM,EAAE,IAAA,iBAAQ,GAAE;wBAClB,QAAQ,EAAE,cAAc;qBACzB,CAAC;gBACF,KAAK,EAAE,EAAE;aACV;SACF,CAAC;QAEF,MAAM,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAE3B,IAAA,gBAAM,EAAC,MAAM,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QACjD,IAAA,gBAAM,EAAC,MAAM,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,aAAa,EAAE,CAAC;IACjD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|