@dxos/echo-db 2.33.7-dev.848c0285 → 2.33.7
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 +20 -17
- package/dist/src/echo.d.ts.map +1 -1
- package/dist/src/echo.js +33 -20
- package/dist/src/echo.js.map +1 -1
- package/dist/src/echo.test.js +9 -9
- package/dist/src/echo.test.js.map +1 -1
- package/dist/src/halo/contact-manager.d.ts.map +1 -1
- package/dist/src/halo/contact-manager.js +2 -2
- package/dist/src/halo/contact-manager.js.map +1 -1
- package/dist/src/halo/halo-factory.d.ts +1 -1
- package/dist/src/halo/halo-factory.d.ts.map +1 -1
- package/dist/src/halo/halo-factory.js +2 -1
- package/dist/src/halo/halo-factory.js.map +1 -1
- package/dist/src/halo/halo-party.d.ts +1 -1
- package/dist/src/halo/halo-party.d.ts.map +1 -1
- package/dist/src/halo/halo-party.js.map +1 -1
- package/dist/src/halo/halo.d.ts +1 -1
- package/dist/src/halo/halo.d.ts.map +1 -1
- package/dist/src/halo/halo.js +3 -2
- package/dist/src/halo/halo.js.map +1 -1
- package/dist/src/halo/halo.test.js +7 -6
- package/dist/src/halo/halo.test.js.map +1 -1
- package/dist/src/halo/preferences.d.ts +1 -1
- package/dist/src/halo/preferences.d.ts.map +1 -1
- package/dist/src/halo/preferences.js +3 -3
- package/dist/src/halo/preferences.js.map +1 -1
- package/dist/src/invitations/greeting-initiator.d.ts +1 -1
- package/dist/src/invitations/greeting-initiator.d.ts.map +1 -1
- package/dist/src/invitations/greeting-initiator.js +5 -4
- package/dist/src/invitations/greeting-initiator.js.map +1 -1
- package/dist/src/invitations/greeting-responder.d.ts.map +1 -1
- package/dist/src/invitations/greeting-responder.js +4 -3
- package/dist/src/invitations/greeting-responder.js.map +1 -1
- package/dist/src/invitations/halo-recovery-initiator.d.ts +1 -1
- package/dist/src/invitations/halo-recovery-initiator.d.ts.map +1 -1
- package/dist/src/invitations/halo-recovery-initiator.js +4 -3
- package/dist/src/invitations/halo-recovery-initiator.js.map +1 -1
- package/dist/src/invitations/invitation-descriptor.d.ts +1 -1
- package/dist/src/invitations/invitation-descriptor.d.ts.map +1 -1
- package/dist/src/invitations/invitation-descriptor.js +4 -3
- package/dist/src/invitations/invitation-descriptor.js.map +1 -1
- package/dist/src/invitations/invitation-factory.d.ts +1 -1
- package/dist/src/invitations/invitation-factory.d.ts.map +1 -1
- package/dist/src/invitations/offline-invitation-claimer.d.ts.map +1 -1
- package/dist/src/invitations/offline-invitation-claimer.js +4 -3
- package/dist/src/invitations/offline-invitation-claimer.js.map +1 -1
- package/dist/src/packlets/database/data-mirror.d.ts +1 -1
- package/dist/src/packlets/database/data-mirror.d.ts.map +1 -1
- package/dist/src/packlets/database/data-mirror.js.map +1 -1
- package/dist/src/packlets/database/data-mirror.test.js +5 -5
- package/dist/src/packlets/database/data-mirror.test.js.map +1 -1
- package/dist/src/packlets/database/data-service-host.d.ts.map +1 -1
- package/dist/src/packlets/database/data-service-host.js +3 -3
- package/dist/src/packlets/database/data-service-host.js.map +1 -1
- package/dist/src/packlets/database/database.d.ts +1 -1
- package/dist/src/packlets/database/database.d.ts.map +1 -1
- package/dist/src/packlets/database/database.js.map +1 -1
- package/dist/src/packlets/database/item-demuxer.test.js +7 -6
- package/dist/src/packlets/database/item-demuxer.test.js.map +1 -1
- package/dist/src/packlets/database/item-manager.d.ts +1 -1
- package/dist/src/packlets/database/item-manager.d.ts.map +1 -1
- package/dist/src/packlets/database/item-manager.js.map +1 -1
- package/dist/src/packlets/database/item-manager.test.js +11 -10
- package/dist/src/packlets/database/item-manager.test.js.map +1 -1
- package/dist/src/packlets/database/selection/selection.test.js +2 -2
- package/dist/src/packlets/database/selection/selection.test.js.map +1 -1
- package/dist/src/packlets/database/testing.d.ts.map +1 -1
- package/dist/src/packlets/database/testing.js +5 -5
- package/dist/src/packlets/database/testing.js.map +1 -1
- package/dist/src/packlets/errors/errors.d.ts +22 -0
- package/dist/src/packlets/errors/errors.d.ts.map +1 -0
- package/dist/src/packlets/errors/errors.js +44 -0
- package/dist/src/packlets/errors/errors.js.map +1 -0
- package/dist/src/packlets/errors/index.d.ts +1 -21
- package/dist/src/packlets/errors/index.d.ts.map +1 -1
- package/dist/src/packlets/errors/index.js +16 -39
- package/dist/src/packlets/errors/index.js.map +1 -1
- package/dist/src/parties/data-party.d.ts +1 -1
- package/dist/src/parties/data-party.d.ts.map +1 -1
- package/dist/src/parties/data-party.js.map +1 -1
- package/dist/src/parties/data-party.test.js.map +1 -1
- package/dist/src/parties/party-factory.d.ts +1 -1
- package/dist/src/parties/party-factory.d.ts.map +1 -1
- package/dist/src/parties/party-factory.js +2 -1
- package/dist/src/parties/party-factory.js.map +1 -1
- package/dist/src/parties/party-manager.d.ts +1 -1
- package/dist/src/parties/party-manager.d.ts.map +1 -1
- package/dist/src/parties/party-manager.js +2 -2
- package/dist/src/parties/party-manager.js.map +1 -1
- package/dist/src/parties/party-manager.test.js +10 -9
- package/dist/src/parties/party-manager.test.js.map +1 -1
- package/dist/src/pipeline/feed-muxer.d.ts.map +1 -1
- package/dist/src/pipeline/feed-muxer.js +3 -2
- package/dist/src/pipeline/feed-muxer.js.map +1 -1
- package/dist/src/pipeline/feed-muxer.test.js +5 -4
- package/dist/src/pipeline/feed-muxer.test.js.map +1 -1
- package/dist/src/pipeline/message-selector.d.ts.map +1 -1
- package/dist/src/pipeline/message-selector.js +3 -3
- package/dist/src/pipeline/message-selector.js.map +1 -1
- package/dist/src/pipeline/metadata-store.d.ts +1 -1
- package/dist/src/pipeline/metadata-store.d.ts.map +1 -1
- package/dist/src/pipeline/metadata-store.js +26 -0
- package/dist/src/pipeline/metadata-store.js.map +1 -1
- package/dist/src/pipeline/metadata-store.test.js +24 -10
- package/dist/src/pipeline/metadata-store.test.js.map +1 -1
- package/dist/src/pipeline/party-feed-provider.d.ts +1 -1
- package/dist/src/pipeline/party-feed-provider.d.ts.map +1 -1
- package/dist/src/pipeline/party-feed-provider.js.map +1 -1
- package/dist/src/pipeline/party-pipeline.d.ts +1 -1
- package/dist/src/pipeline/party-pipeline.d.ts.map +1 -1
- package/dist/src/pipeline/party-pipeline.js.map +1 -1
- package/dist/src/pipeline/party-pipeline.test.js +5 -4
- package/dist/src/pipeline/party-pipeline.test.js.map +1 -1
- package/dist/src/pipeline/party-processor.d.ts +1 -1
- package/dist/src/pipeline/party-processor.d.ts.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.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/identity-credentials.d.ts.map +1 -1
- package/dist/src/protocol/identity-credentials.js +2 -1
- 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/party-protocol-factory.d.ts +1 -1
- package/dist/src/protocol/party-protocol-factory.d.ts.map +1 -1
- package/dist/src/protocol/party-protocol-factory.js.map +1 -1
- package/dist/src/snapshots/snapshot-generator.d.ts.map +1 -1
- package/dist/src/snapshots/snapshot-generator.js +2 -1
- package/dist/src/snapshots/snapshot-generator.js.map +1 -1
- package/dist/src/snapshots/snapshot-store.test.js +2 -1
- package/dist/src/snapshots/snapshot-store.test.js.map +1 -1
- package/dist/src/snapshots/snapshot.test.js +4 -4
- package/dist/src/snapshots/snapshot.test.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +21 -21
- package/src/echo.test.ts +10 -10
- package/src/echo.ts +41 -25
- package/src/halo/contact-manager.ts +1 -1
- package/src/halo/halo-factory.ts +2 -1
- package/src/halo/halo-party.ts +1 -1
- package/src/halo/halo.test.ts +7 -6
- package/src/halo/halo.ts +3 -2
- package/src/halo/preferences.ts +1 -1
- package/src/invitations/greeting-initiator.ts +2 -1
- package/src/invitations/greeting-responder.ts +2 -1
- package/src/invitations/halo-recovery-initiator.ts +2 -1
- package/src/invitations/invitation-descriptor.ts +2 -1
- package/src/invitations/invitation-factory.ts +1 -1
- package/src/invitations/offline-invitation-claimer.ts +2 -1
- package/src/packlets/database/data-mirror.test.ts +1 -1
- package/src/packlets/database/data-mirror.ts +1 -1
- package/src/packlets/database/data-service-host.ts +1 -1
- package/src/packlets/database/database.ts +1 -1
- package/src/packlets/database/item-demuxer.test.ts +2 -1
- package/src/packlets/database/item-manager.test.ts +2 -1
- package/src/packlets/database/item-manager.ts +2 -1
- package/src/packlets/database/selection/selection.test.ts +1 -1
- package/src/packlets/database/testing.ts +1 -1
- package/src/packlets/errors/errors.ts +43 -0
- package/src/packlets/errors/index.ts +2 -40
- package/src/parties/data-party.test.ts +1 -1
- package/src/parties/data-party.ts +2 -2
- package/src/parties/party-factory.ts +2 -1
- package/src/parties/party-manager.test.ts +9 -7
- package/src/parties/party-manager.ts +1 -1
- package/src/pipeline/feed-muxer.test.ts +2 -1
- package/src/pipeline/feed-muxer.ts +2 -1
- package/src/pipeline/message-selector.ts +1 -1
- package/src/pipeline/metadata-store.test.ts +18 -1
- package/src/pipeline/metadata-store.ts +19 -1
- package/src/pipeline/party-feed-provider.ts +1 -1
- package/src/pipeline/party-pipeline.test.ts +2 -1
- package/src/pipeline/party-pipeline.ts +1 -1
- package/src/pipeline/party-processor.ts +1 -1
- package/src/protocol/auth-plugin.ts +1 -1
- package/src/protocol/halo-recovery-plugin.ts +1 -1
- package/src/protocol/identity-credentials.ts +2 -1
- package/src/protocol/offline-invitation-plugin.ts +1 -1
- package/src/protocol/party-protocol-factory.ts +2 -1
- package/src/snapshots/snapshot-generator.ts +3 -1
- package/src/snapshots/snapshot-store.test.ts +2 -1
- package/src/snapshots/snapshot.test.ts +1 -1
package/dist/src/halo/halo.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { KeyRecord, Keyring, SecretProvider } from '@dxos/credentials';
|
|
2
|
-
import { PublicKey } from '@dxos/crypto';
|
|
3
2
|
import { ModelFactory } from '@dxos/model-factory';
|
|
4
3
|
import { NetworkManager } from '@dxos/network-manager';
|
|
4
|
+
import { PublicKey } from '@dxos/protocols';
|
|
5
5
|
import { ResultSet } from '../api';
|
|
6
6
|
import { InvitationAuthenticator, InvitationDescriptor, InvitationOptions } from '../invitations';
|
|
7
7
|
import { MetadataStore, PipelineOptions, PartyFeedProvider } from '../pipeline';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"halo.d.ts","sourceRoot":"","sources":["../../../src/halo/halo.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,SAAS,EAAE,OAAO,EAAW,cAAc,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"halo.d.ts","sourceRoot":"","sources":["../../../src/halo/halo.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,SAAS,EAAE,OAAO,EAAW,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAGhF,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AACnC,OAAO,EAAE,uBAAuB,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAElG,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAChF,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAG5C,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAC;AAIpD,MAAM,WAAW,WAAW;IAC1B,SAAS,EAAE,SAAS,CAAC;IACrB,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAA;CAC7B;AAED,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,OAAO,CAAC;IACjB,cAAc,EAAE,cAAc,CAAC;IAC/B,aAAa,EAAE,aAAa,CAAC;IAC7B,YAAY,EAAE,YAAY,CAAC;IAC3B,aAAa,EAAE,aAAa,CAAC;IAC7B,mBAAmB,EAAE,CAAC,QAAQ,EAAE,SAAS,KAAK,iBAAiB,CAAC;IAChE,OAAO,EAAE,eAAe,CAAA;CACzB;AAED;;GAEG;AACH,qBAAa,IAAI;IACf,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAU;IACnC,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAkB;IAEnD,OAAO,CAAC,OAAO,CAAS;gBAEX,EACX,OAAO,EACP,cAAc,EACd,aAAa,EACb,YAAY,EACZ,aAAa,EACb,mBAAmB,EACnB,OAAO,EACR,EAAE,iBAAiB;IAepB,QAAQ;IAIR,IAAI;;;;;IAQJ;;OAEG;IACH,IAAI,aAAa,IAAK,OAAO,CAE5B;IAED;;OAEG;IACH,IAAI,QAAQ,8CAEX;IAED;;OAEG;IACH,IAAI,aAAa,sCAEhB;IAED;;OAEG;IACH,IAAI,WAAW,IAAK,SAAS,GAAG,SAAS,CAExC;IAED;;OAEG;IAEH,IAAI,mBAAmB,IAAK,MAAM,GAAG,SAAS,CAE7C;IAED;;OAEG;IACH,IAAI,OAAO,IAAK,OAAO,CAEtB;IAoBD;;OAEG;IAEG,KAAK;IAKX;;OAEG;IACG,KAAK;IAQX;;;;OAIG;YACW,sBAAsB;IAcpC;;OAEG;YACW,gBAAgB;IAY9B;;OAEG;IAEG,OAAO,CAAE,UAAU,EAAE,MAAM;IAOjC;;OAEG;IAEG,IAAI,CAAE,oBAAoB,EAAE,oBAAoB,EAAE,cAAc,EAAE,cAAc;IAMtF;;OAEG;IACG,gBAAgB,CAAE,qBAAqB,EAAE,uBAAuB,EAAE,OAAO,CAAC,EAAE,iBAAiB;IAKnG;;OAEG;IAEH,aAAa,IAAK,SAAS,CAAC,OAAO,CAAC;IAMpC;;;;OAIG;IAGG,aAAa,CAAE,EAAE,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAE,oBAAyB,GAAG,OAAO,CAAC,WAAW,CAAC;IAkBzG;;OAEG;IAEH,UAAU,IAAK,WAAW,GAAG,SAAS;IAYtC,kBAAkB,CAAE,QAAQ,EAAE,MAAM,IAAI,GAAG,MAAM,IAAI;CAGtD"}
|
package/dist/src/halo/halo.js
CHANGED
|
@@ -19,6 +19,7 @@ const async_1 = require("@dxos/async");
|
|
|
19
19
|
const credentials_1 = require("@dxos/credentials");
|
|
20
20
|
const crypto_1 = require("@dxos/crypto");
|
|
21
21
|
const debug_2 = require("@dxos/debug");
|
|
22
|
+
const protocols_1 = require("@dxos/protocols");
|
|
22
23
|
const halo_factory_1 = require("./halo-factory");
|
|
23
24
|
const identity_manager_1 = require("./identity-manager");
|
|
24
25
|
const log = (0, debug_1.default)('dxos:echo');
|
|
@@ -128,7 +129,7 @@ class HALO {
|
|
|
128
129
|
// TODO(burdon): `createProfile` isn't part of this package.
|
|
129
130
|
throw new Error('Identity key already exists. Call createProfile without a keypair to only create a halo party.');
|
|
130
131
|
}
|
|
131
|
-
await this._keyring.addKeyRecord({ secretKey, publicKey:
|
|
132
|
+
await this._keyring.addKeyRecord({ secretKey, publicKey: protocols_1.PublicKey.from(publicKey), type: credentials_1.KeyType.IDENTITY });
|
|
132
133
|
}
|
|
133
134
|
/**
|
|
134
135
|
* Creates the initial HALO party.
|
|
@@ -141,7 +142,7 @@ class HALO {
|
|
|
141
142
|
}
|
|
142
143
|
const identityKey = (_a = this._identityManager.getIdentityKey()) !== null && _a !== void 0 ? _a : (0, debug_2.raise)(new Error('Cannot create HALO. Identity key not found.'));
|
|
143
144
|
await this._identityManager.createHalo({
|
|
144
|
-
identityDisplayName: displayName || identityKey.publicKey
|
|
145
|
+
identityDisplayName: displayName || (0, crypto_1.humanize)(identityKey.publicKey)
|
|
145
146
|
});
|
|
146
147
|
}
|
|
147
148
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"halo.js","sourceRoot":"","sources":["../../../src/halo/halo.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;;;;;;;AAEF,oDAA4B;AAC5B,kDAA0B;AAE1B,uCAA2C;AAC3C,mDAAgF;AAChF,
|
|
1
|
+
{"version":3,"file":"halo.js","sourceRoot":"","sources":["../../../src/halo/halo.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,6 +15,7 @@ const feed_store_1 = require("@dxos/feed-store");
|
|
|
15
15
|
const model_factory_1 = require("@dxos/model-factory");
|
|
16
16
|
const network_manager_1 = require("@dxos/network-manager");
|
|
17
17
|
const object_model_1 = require("@dxos/object-model");
|
|
18
|
+
const protocols_1 = require("@dxos/protocols");
|
|
18
19
|
const random_access_multi_storage_1 = require("@dxos/random-access-multi-storage");
|
|
19
20
|
const testutils_1 = require("@dxos/testutils");
|
|
20
21
|
const invitations_1 = require("../invitations");
|
|
@@ -33,12 +34,12 @@ describe('HALO', () => {
|
|
|
33
34
|
const feedStore = new feed_store_1.FeedStore(storage.directory('feed'), { valueEncoding: echo_protocol_1.codec });
|
|
34
35
|
const feedProviderFactory = (partyKey) => new pipeline_1.PartyFeedProvider(metadataStore, keyring, feedStore, partyKey);
|
|
35
36
|
return new halo_1.HALO({
|
|
36
|
-
keyring
|
|
37
|
-
networkManager
|
|
38
|
-
metadataStore
|
|
37
|
+
keyring,
|
|
38
|
+
networkManager,
|
|
39
|
+
metadataStore,
|
|
39
40
|
feedProviderFactory,
|
|
40
|
-
modelFactory
|
|
41
|
-
snapshotStore
|
|
41
|
+
modelFactory,
|
|
42
|
+
snapshotStore,
|
|
42
43
|
options: {}
|
|
43
44
|
});
|
|
44
45
|
};
|
|
@@ -59,7 +60,7 @@ describe('HALO', () => {
|
|
|
59
60
|
(0, testutils_1.afterTest)(() => halo.close());
|
|
60
61
|
const profile = await halo.createProfile({ username: 'Test user' });
|
|
61
62
|
(0, expect_1.default)(profile.username).toEqual('Test user');
|
|
62
|
-
(0, expect_1.default)(profile.publicKey).toBeInstanceOf(
|
|
63
|
+
(0, expect_1.default)(profile.publicKey).toBeInstanceOf(protocols_1.PublicKey);
|
|
63
64
|
});
|
|
64
65
|
(0, mocha_1.it)('reload with profile', async () => {
|
|
65
66
|
const halo = setup();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"halo.test.js","sourceRoot":"","sources":["../../../src/halo/halo.test.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;AAEF,oDAA4B;AAC5B,iCAAmC;AAEnC,mDAAmE;AACnE,
|
|
1
|
+
{"version":3,"file":"halo.test.js","sourceRoot":"","sources":["../../../src/halo/halo.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"preferences.d.ts","sourceRoot":"","sources":["../../../src/halo/preferences.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"preferences.d.ts","sourceRoot":"","sources":["../../../src/halo/preferences.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG5C,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAEtD,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EACwF,WAAW,EACzG,MAAM,cAAc,CAAC;AAEtB;;GAEG;AAEH,qBAAa,WAAW;IAEpB,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,UAAU;gBADV,YAAY,EAAE,MAAM,QAAQ,GAAG,SAAS,EACxC,UAAU,EAAE,SAAS;IAGxC,IAAI,MAAM,QAKT;IAGD,aAAa,CAAE,QAAQ,EAAE,SAAS;IAKlC,sBAAsB,CAAE,QAAQ,EAAE,CAAC,WAAW,EAAE,GAAG,KAAK,IAAI;IAkC5D,oBAAoB;IASpB,oBAAoB;IASb,wBAAwB,CAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM;IAMpD,wBAAwB,CAAE,KAAK,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG;IAMzE,wBAAwB,CAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM;IAMpD,wBAAwB,CAAE,KAAK,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG;IAOzE,mBAAmB,CAAE,WAAW,EAAE,IAAI,CAAC,GAAG,CAAC,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM;IAOvE,mBAAmB,CAAE,WAAW,EAAE,IAAI,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG;IAQ7F,kBAAkB,CAAE,WAAW,EAAE,WAAW;IAsBlD,0BAA0B,CAAE,QAAQ,EAAE,CAAC,OAAO,EAAE,WAAW,EAAE,KAAK,IAAI,GAAG,MAAM,IAAI;CAyBpF"}
|
|
@@ -11,9 +11,9 @@ const assert_1 = __importDefault(require("assert"));
|
|
|
11
11
|
const json_stable_stringify_1 = __importDefault(require("json-stable-stringify"));
|
|
12
12
|
const lodash_defaultsdeep_1 = __importDefault(require("lodash.defaultsdeep"));
|
|
13
13
|
const async_1 = require("@dxos/async");
|
|
14
|
-
const crypto_1 = require("@dxos/crypto");
|
|
15
14
|
const debug_1 = require("@dxos/debug");
|
|
16
15
|
const object_model_1 = require("@dxos/object-model");
|
|
16
|
+
const protocols_1 = require("@dxos/protocols");
|
|
17
17
|
const api_1 = require("../api");
|
|
18
18
|
const errors_1 = require("../packlets/errors");
|
|
19
19
|
const halo_party_1 = require("./halo-party");
|
|
@@ -139,10 +139,10 @@ class Preferences {
|
|
|
139
139
|
var _a;
|
|
140
140
|
const database = (_a = this._getDatabase()) !== null && _a !== void 0 ? _a : (0, debug_1.raise)(new errors_1.IdentityNotInitializedError());
|
|
141
141
|
const converter = (partyDesc) => ({
|
|
142
|
-
partyKey:
|
|
142
|
+
partyKey: protocols_1.PublicKey.from(partyDesc.model.get('publicKey')),
|
|
143
143
|
keyHints: Object.values(partyDesc.model.get('hints')).map((hint) => ({
|
|
144
144
|
...hint,
|
|
145
|
-
publicKey:
|
|
145
|
+
publicKey: protocols_1.PublicKey.from(hint.publicKey)
|
|
146
146
|
}))
|
|
147
147
|
});
|
|
148
148
|
const result = database.select({ type: halo_party_1.HALO_PARTY_DESCRIPTOR_TYPE }).exec();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"preferences.js","sourceRoot":"","sources":["../../../src/halo/preferences.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,oDAA4B;AAC5B,kFAAoD;AACpD,8EAA+C;AAE/C,uCAAoC;AAEpC,
|
|
1
|
+
{"version":3,"file":"preferences.js","sourceRoot":"","sources":["../../../src/halo/preferences.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Message, SecretProvider, SignedMessage } from '@dxos/credentials';
|
|
2
|
-
import { PublicKey } from '@dxos/crypto';
|
|
3
2
|
import { NetworkManager } from '@dxos/network-manager';
|
|
3
|
+
import { PublicKey } from '@dxos/protocols';
|
|
4
4
|
import { CredentialsSigner } from '../protocol/credentials-signer';
|
|
5
5
|
import { GreetingState } from './greeting-responder';
|
|
6
6
|
import { InvitationDescriptor } from './invitation-descriptor';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"greeting-initiator.d.ts","sourceRoot":"","sources":["../../../src/invitations/greeting-initiator.ts"],"names":[],"mappings":"AAQA,OAAO,EAWL,OAAO,EACP,cAAc,EAEd,aAAa,EAEd,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"greeting-initiator.d.ts","sourceRoot":"","sources":["../../../src/invitations/greeting-initiator.ts"],"names":[],"mappings":"AAQA,OAAO,EAWL,OAAO,EACP,cAAc,EAEd,aAAa,EAEd,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAA0B,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC/E,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AAEnE,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,oBAAoB,EAA4B,MAAM,yBAAyB,CAAC;AAMzF;;;GAGG;AACH,qBAAa,iBAAiB;IAa1B,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,qBAAqB;IACtC,OAAO,CAAC,QAAQ,CAAC,sBAAsB;IAdzC,OAAO,CAAC,cAAc,CAAC,CAAwB;IAG/C,OAAO,CAAC,MAAM,CAA4C;IAE1D;;;;;OAKG;gBAEgB,eAAe,EAAE,cAAc,EAC/B,qBAAqB,EAAE,oBAAoB,EAC3C,sBAAsB,EAAE,CAAC,QAAQ,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,KAAK,OAAO,CAAC,OAAO,EAAE,CAAC;IAKzG,IAAI,KAAK,kBAER;IAED;;;OAGG;IACG,OAAO,CAAE,OAAO,SAAkB;IA0CxC;;OAEG;IACG,gBAAgB,CAAE,cAAc,EAAE,cAAc,GAAG,OAAO,CAAC;QAAE,QAAQ,EAAE,SAAS,CAAC;QAAC,KAAK,EAAE,SAAS,EAAE,CAAA;KAAE,CAAC;IAgEvG,UAAU;IAMV,OAAO;CAMd;AAED;;GAEG;AACH,eAAO,MAAM,+BAA+B,sBACvB,iBAAiB,SAC7B,UAAU,KAChB,OAMF,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,gCAAgC,sBACxB,iBAAiB,YAC1B,SAAS,mBACF,aAAa,SACvB,UAAU,KAChB,OAMF,CAAC"}
|
|
@@ -13,6 +13,7 @@ const async_1 = require("@dxos/async");
|
|
|
13
13
|
const credentials_1 = require("@dxos/credentials");
|
|
14
14
|
const crypto_1 = require("@dxos/crypto");
|
|
15
15
|
const network_manager_1 = require("@dxos/network-manager");
|
|
16
|
+
const protocols_1 = require("@dxos/protocols");
|
|
16
17
|
const greeting_protocol_provider_1 = require("./greeting-protocol-provider");
|
|
17
18
|
const greeting_responder_1 = require("./greeting-responder");
|
|
18
19
|
const invitation_descriptor_1 = require("./invitation-descriptor");
|
|
@@ -66,9 +67,9 @@ class GreetingInitiator {
|
|
|
66
67
|
log((0, crypto_1.keyToString)(localPeerId), 'connecting to', (0, crypto_1.keyToString)(swarmKey));
|
|
67
68
|
const peerJoinedWaiter = (0, async_1.waitForEvent)(this._greeterPlugin, 'peer:joined', (remotePeerId) => remotePeerId && Buffer.from(responderPeerId).equals(remotePeerId), timeout, credentials_1.ERR_GREET_CONNECTED_TO_SWARM_TIMEOUT);
|
|
68
69
|
await this._networkManager.joinProtocolSwarm({
|
|
69
|
-
topic:
|
|
70
|
+
topic: protocols_1.PublicKey.from(swarmKey),
|
|
70
71
|
protocol: (0, greeting_protocol_provider_1.greetingProtocolProvider)(swarmKey, localPeerId, [this._greeterPlugin]),
|
|
71
|
-
peerId:
|
|
72
|
+
peerId: protocols_1.PublicKey.from(localPeerId),
|
|
72
73
|
topology: new network_manager_1.FullyConnectedTopology(),
|
|
73
74
|
label: 'Greeting initiator'
|
|
74
75
|
});
|
|
@@ -106,7 +107,7 @@ class GreetingInitiator {
|
|
|
106
107
|
// The result will include the partyKey and a nonce used when signing the response.
|
|
107
108
|
const { nonce } = handshakeResponse;
|
|
108
109
|
const partyKey = handshakeResponse.partyKey;
|
|
109
|
-
const credentialMessages = await this._getMessagesToNotarize(
|
|
110
|
+
const credentialMessages = await this._getMessagesToNotarize(protocols_1.PublicKey.from(partyKey), nonce);
|
|
110
111
|
// Send the signed payload to the greeting responder.
|
|
111
112
|
const notarizeResponse = await this._greeterPlugin.send(responderPeerId, (0, credentials_1.createGreetingNotarizeMessage)(secret, credentialMessages));
|
|
112
113
|
//
|
|
@@ -130,7 +131,7 @@ class GreetingInitiator {
|
|
|
130
131
|
}
|
|
131
132
|
async disconnect() {
|
|
132
133
|
const { swarmKey } = this._invitationDescriptor;
|
|
133
|
-
await this._networkManager.leaveProtocolSwarm(
|
|
134
|
+
await this._networkManager.leaveProtocolSwarm(protocols_1.PublicKey.from(swarmKey));
|
|
134
135
|
this._state = greeting_responder_1.GreetingState.DISCONNECTED;
|
|
135
136
|
}
|
|
136
137
|
async destroy() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"greeting-initiator.js","sourceRoot":"","sources":["../../../src/invitations/greeting-initiator.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,oDAA4B;AAC5B,kDAA0B;AAE1B,uCAA2C;AAC3C,mDAgB2B;AAC3B,
|
|
1
|
+
{"version":3,"file":"greeting-initiator.js","sourceRoot":"","sources":["../../../src/invitations/greeting-initiator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"greeting-responder.d.ts","sourceRoot":"","sources":["../../../src/invitations/greeting-responder.ts"],"names":[],"mappings":";AAOA,OAAO,EAAE,KAAK,EAAoB,MAAM,aAAa,CAAC;AACtD,OAAO,EAGkB,OAAO,EAG9B,cAAc,EACd,eAAe,EACb,OAAO,IAAI,WAAW,EACzB,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAAE,UAAU,EAAY,MAAM,qBAAqB,CAAC;AAC3D,OAAO,EAA0B,cAAc,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"greeting-responder.d.ts","sourceRoot":"","sources":["../../../src/invitations/greeting-responder.ts"],"names":[],"mappings":";AAOA,OAAO,EAAE,KAAK,EAAoB,MAAM,aAAa,CAAC;AACtD,OAAO,EAGkB,OAAO,EAG9B,cAAc,EACd,eAAe,EACb,OAAO,IAAI,WAAW,EACzB,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAAE,UAAU,EAAY,MAAM,qBAAqB,CAAC;AAC3D,OAAO,EAA0B,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAG/E,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AACnE,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAK7C;;GAEG;AACH,oBAAY,aAAa;IACvB,WAAW,gBAAgB;IAC3B,SAAS,cAAc;IACvB,SAAS,cAAc;IACvB,SAAS,cAAc;IACvB,OAAO,YAAY;IACnB,SAAS,cAAc;IACvB,YAAY,iBAAiB;CAC9B;AAED;;;GAGG;AACH,qBAAa,iBAAiB;IAa1B,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IACnC,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IAfrC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAwB;IACvD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAA2B;IACrD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAU;IAEnC,OAAO,CAAC,MAAM,CAA4C;IAE1D;;OAEG;IACH,QAAQ,CAAC,SAAS,aAAoB;gBAGnB,eAAe,EAAE,cAAc,EAC/B,eAAe,EAAE,kBAAkB,EACnC,kBAAkB,EAAE,iBAAiB,EACrC,kBAAkB,EAAE,UAAU,CAAC,WAAW,CAAC;IAW9D;;;;OAIG;IACH,IAAI,KAAK,kBAER;IAED;;;;;;OAMG;IAEG,MAAM,CACV,eAAe,EAAE,eAAe,EAChC,cAAc,CAAC,EAAE,cAAc,EAC/B,QAAQ,CAAC,EAAE,iBAAiB,CAAC,UAAU,CAAC,EACxC,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,MAAM,CAAC;IA+ClB;;OAEG;IACG,KAAK;IAqBX;;OAEG;IACG,IAAI;IAUV;;OAEG;IACG,OAAO;IAOb;;;;;OAKG;IACG,wBAAwB,CAAE,QAAQ,EAAE,GAAG,EAAE;IA6C/C;;;OAGG;IACH,YAAY,IAAK,OAAO,EAAE;CAe3B"}
|
|
@@ -13,6 +13,7 @@ const async_1 = require("@dxos/async");
|
|
|
13
13
|
const credentials_1 = require("@dxos/credentials");
|
|
14
14
|
const crypto_1 = require("@dxos/crypto");
|
|
15
15
|
const network_manager_1 = require("@dxos/network-manager");
|
|
16
|
+
const protocols_1 = require("@dxos/protocols");
|
|
16
17
|
const greeting_protocol_provider_1 = require("./greeting-protocol-provider");
|
|
17
18
|
const log = (0, debug_1.default)('dxos:echo-db:greeting-responder');
|
|
18
19
|
/**
|
|
@@ -107,9 +108,9 @@ class GreetingResponder {
|
|
|
107
108
|
// As the Greeter, use the topic as our peerId.
|
|
108
109
|
// (For reasons why see detailed comment on greetClient).
|
|
109
110
|
await this._networkManager.joinProtocolSwarm({
|
|
110
|
-
topic:
|
|
111
|
+
topic: protocols_1.PublicKey.from(this._swarmKey),
|
|
111
112
|
protocol: (0, greeting_protocol_provider_1.greetingProtocolProvider)(this._swarmKey, this._swarmKey, [this._greeterPlugin]),
|
|
112
|
-
peerId:
|
|
113
|
+
peerId: protocols_1.PublicKey.from(this._swarmKey),
|
|
113
114
|
topology: new network_manager_1.FullyConnectedTopology(),
|
|
114
115
|
label: 'Greeting responder'
|
|
115
116
|
});
|
|
@@ -124,7 +125,7 @@ class GreetingResponder {
|
|
|
124
125
|
async stop() {
|
|
125
126
|
log('Stopping...');
|
|
126
127
|
if (this._swarmKey) {
|
|
127
|
-
await this._networkManager.leaveProtocolSwarm(
|
|
128
|
+
await this._networkManager.leaveProtocolSwarm(protocols_1.PublicKey.from(this._swarmKey));
|
|
128
129
|
}
|
|
129
130
|
this._state = GreetingState.STOPPED;
|
|
130
131
|
log('Stopped');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"greeting-responder.js","sourceRoot":"","sources":["../../../src/invitations/greeting-responder.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,oDAA4B;AAC5B,kDAA0B;AAE1B,uCAAsD;AACtD,mDAS2B;AAC3B,
|
|
1
|
+
{"version":3,"file":"greeting-responder.js","sourceRoot":"","sources":["../../../src/invitations/greeting-responder.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
import { ClaimResponse, GreetingCommandPlugin, SecretProvider } from '@dxos/credentials';
|
|
3
|
-
import { PublicKey } from '@dxos/crypto';
|
|
4
3
|
import { NetworkManager } from '@dxos/network-manager';
|
|
4
|
+
import { PublicKey } from '@dxos/protocols';
|
|
5
5
|
import { CredentialsSigner } from '../protocol';
|
|
6
6
|
import { GreetingState } from './greeting-responder';
|
|
7
7
|
import { InvitationDescriptor } from './invitation-descriptor';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"halo-recovery-initiator.d.ts","sourceRoot":"","sources":["../../../src/invitations/halo-recovery-initiator.ts"],"names":[],"mappings":";AAQA,OAAO,EACL,aAAa,EAGb,qBAAqB,EAIrB,cAAc,EAIf,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"halo-recovery-initiator.d.ts","sourceRoot":"","sources":["../../../src/invitations/halo-recovery-initiator.ts"],"names":[],"mappings":";AAQA,OAAO,EACL,aAAa,EAGb,qBAAqB,EAIrB,cAAc,EAIf,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAA0B,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC/E,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG5C,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAEhD,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,oBAAoB,EAA4B,MAAM,yBAAyB,CAAC;AACzF,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAMzD;;;;;;GAMG;AACH,qBAAa,qBAAqB;IAM9B,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IANrC,MAAM,EAAE,aAAa,CAAC;IACtB,cAAc,CAAC,EAAE,qBAAqB,CAAC;IACvC,OAAO,CAAC,EAAE,MAAM,CAAC;gBAGE,eAAe,EAAE,cAAc,EAC/B,kBAAkB,EAAE,iBAAiB;IAKxD,IAAI,KAAK,kBAER;IAED;;;OAGG;IACG,OAAO,CAAE,OAAO,SAAkB;IA4BxC;;;;;OAKG;IACG,KAAK;IAgCL,UAAU;IAMV,OAAO;IAQb,oBAAoB,IAAK,cAAc;IAevC,MAAM,CAAC,gCAAgC,CAAE,WAAW,EAAE,SAAS,EAAE,iBAAiB,EAAE,iBAAiB;CAiCtG"}
|
|
@@ -13,6 +13,7 @@ const async_1 = require("@dxos/async");
|
|
|
13
13
|
const credentials_1 = require("@dxos/credentials");
|
|
14
14
|
const crypto_1 = require("@dxos/crypto");
|
|
15
15
|
const network_manager_1 = require("@dxos/network-manager");
|
|
16
|
+
const protocols_1 = require("@dxos/protocols");
|
|
16
17
|
const errors_1 = require("../packlets/errors");
|
|
17
18
|
const greeting_protocol_provider_1 = require("./greeting-protocol-provider");
|
|
18
19
|
const greeting_responder_1 = require("./greeting-responder");
|
|
@@ -49,8 +50,8 @@ class HaloRecoveryInitiator {
|
|
|
49
50
|
log('Connecting');
|
|
50
51
|
const peerJoinedWaiter = (0, async_1.waitForEvent)(this._greeterPlugin, 'peer:joined', () => { var _a; return !!((_a = this._greeterPlugin) === null || _a === void 0 ? void 0 : _a.peers.length); }, timeout);
|
|
51
52
|
await this._networkManager.joinProtocolSwarm({
|
|
52
|
-
topic:
|
|
53
|
-
peerId:
|
|
53
|
+
topic: protocols_1.PublicKey.from(swarmKey),
|
|
54
|
+
peerId: protocols_1.PublicKey.from(this._peerId),
|
|
54
55
|
protocol: (0, greeting_protocol_provider_1.greetingProtocolProvider)(swarmKey, this._peerId, [this._greeterPlugin]),
|
|
55
56
|
topology: new network_manager_1.FullyConnectedTopology(),
|
|
56
57
|
label: 'HALO recovery initiator'
|
|
@@ -84,7 +85,7 @@ class HaloRecoveryInitiator {
|
|
|
84
85
|
}
|
|
85
86
|
async disconnect() {
|
|
86
87
|
const swarmKey = this._credentialsSigner.getIdentityKey().publicKey.asBuffer();
|
|
87
|
-
await this._networkManager.leaveProtocolSwarm(
|
|
88
|
+
await this._networkManager.leaveProtocolSwarm(protocols_1.PublicKey.from(swarmKey));
|
|
88
89
|
this._state = greeting_responder_1.GreetingState.DISCONNECTED;
|
|
89
90
|
}
|
|
90
91
|
async destroy() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"halo-recovery-initiator.js","sourceRoot":"","sources":["../../../src/invitations/halo-recovery-initiator.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,oDAA4B;AAC5B,kDAA0B;AAE1B,uCAA2C;AAC3C,mDAY2B;AAC3B,
|
|
1
|
+
{"version":3,"file":"halo-recovery-initiator.js","sourceRoot":"","sources":["../../../src/invitations/halo-recovery-initiator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { PublicKey } from '@dxos/crypto';
|
|
2
1
|
import { SwarmKey } from '@dxos/echo-protocol';
|
|
3
2
|
import * as proto from '@dxos/echo-protocol';
|
|
3
|
+
import { PublicKey } from '@dxos/protocols';
|
|
4
4
|
export import InvitationDescriptorType = proto.InvitationDescriptor.Type;
|
|
5
5
|
/**
|
|
6
6
|
* A serialized version of InvitationDescriptor that's suitable to be encoded as an URL query string.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"invitation-descriptor.d.ts","sourceRoot":"","sources":["../../../src/invitations/invitation-descriptor.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"invitation-descriptor.d.ts","sourceRoot":"","sources":["../../../src/invitations/invitation-descriptor.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC/C,OAAO,KAAK,KAAK,MAAM,qBAAqB,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAK5C,MAAM,QAAQ,wBAAwB,GAAG,KAAK,CAAC,oBAAoB,CAAC,IAAI,CAAC;AASzE;;GAEG;AACH,MAAM,WAAW,yBAAyB;IACxC,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE,MAAM,CAAA;IAChB,UAAU,EAAE,MAAM,CAAA;IAClB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,IAAI,EAAE,MAAM,CAAA;CACb;AAED;;;;;;;GAOG;AACH,qBAAa,oBAAoB;aAmCb,IAAI,EAAE,wBAAwB;aAC9B,QAAQ,EAAE,QAAQ;aAClB,UAAU,EAAE,UAAU;aACtB,WAAW,CAAC;IACrB,MAAM,CAAC;IAtChB,MAAM,CAAC,mBAAmB,CAAE,eAAe,EAAE,yBAAyB,GAAG,oBAAoB;IAa7F,MAAM,CAAC,SAAS,CAAE,eAAe,EAAE,KAAK,CAAC,oBAAoB,GAAG,oBAAoB;IAcpF,MAAM,CAAC,MAAM,CAAE,IAAI,EAAE,MAAM,GAAG,oBAAoB;gBAOhC,IAAI,EAAE,wBAAwB,EAC9B,QAAQ,EAAE,QAAQ,EAClB,UAAU,EAAE,UAAU,EACtB,WAAW,CAAC,uBAAW,EAChC,MAAM,CAAC,wBAAY;IAa5B,IAAI,IAAI,WAGP;IAED;;OAEG;IACH,iBAAiB,IAAK,yBAAyB;IAgB/C,OAAO,IAAK,KAAK,CAAC,oBAAoB;IAUtC,MAAM,IAAK,MAAM;CAIlB"}
|
|
@@ -35,6 +35,7 @@ const base_x_1 = __importDefault(require("base-x"));
|
|
|
35
35
|
const json_stable_stringify_1 = __importDefault(require("json-stable-stringify"));
|
|
36
36
|
const crypto_1 = require("@dxos/crypto");
|
|
37
37
|
const proto = __importStar(require("@dxos/echo-protocol"));
|
|
38
|
+
const protocols_1 = require("@dxos/protocols");
|
|
38
39
|
const errors_1 = require("../packlets/errors");
|
|
39
40
|
// Re-exporting type enum from protobuf definitions.
|
|
40
41
|
exports.InvitationDescriptorType = proto.InvitationDescriptor.Type;
|
|
@@ -63,7 +64,7 @@ class InvitationDescriptor {
|
|
|
63
64
|
(0, assert_1.default)(swarmKey instanceof Uint8Array);
|
|
64
65
|
(0, assert_1.default)(invitation instanceof Uint8Array);
|
|
65
66
|
if (identityKey) {
|
|
66
|
-
|
|
67
|
+
protocols_1.PublicKey.assertValidPublicKey(identityKey);
|
|
67
68
|
}
|
|
68
69
|
if (secret) {
|
|
69
70
|
(0, assert_1.default)(secret instanceof Uint8Array);
|
|
@@ -71,7 +72,7 @@ class InvitationDescriptor {
|
|
|
71
72
|
}
|
|
72
73
|
static fromQueryParameters(queryParameters) {
|
|
73
74
|
const { hash, swarmKey, invitation, identityKey, type } = queryParameters;
|
|
74
|
-
const descriptor = new InvitationDescriptor(parseInvitationType(type), (0, crypto_1.keyToBuffer)(swarmKey), (0, crypto_1.keyToBuffer)(invitation), identityKey ?
|
|
75
|
+
const descriptor = new InvitationDescriptor(parseInvitationType(type), (0, crypto_1.keyToBuffer)(swarmKey), (0, crypto_1.keyToBuffer)(invitation), identityKey ? protocols_1.PublicKey.from(identityKey) : undefined);
|
|
75
76
|
if (hash !== descriptor.hash) {
|
|
76
77
|
throw new errors_1.InvalidInvitationError();
|
|
77
78
|
}
|
|
@@ -81,7 +82,7 @@ class InvitationDescriptor {
|
|
|
81
82
|
(0, assert_1.default)(protoInvitation.type, 'Invitation type not provided.');
|
|
82
83
|
(0, assert_1.default)(protoInvitation.swarmKey, 'Invitation swarm key not provided.');
|
|
83
84
|
(0, assert_1.default)(protoInvitation.invitation, 'Invitation not provided.');
|
|
84
|
-
return new InvitationDescriptor(protoInvitation.type, protoInvitation.swarmKey, Buffer.from(protoInvitation.invitation), protoInvitation.identityKey ?
|
|
85
|
+
return new InvitationDescriptor(protoInvitation.type, protoInvitation.swarmKey, Buffer.from(protoInvitation.invitation), protoInvitation.identityKey ? protocols_1.PublicKey.from(protoInvitation.identityKey) : undefined, protoInvitation.secret ? Buffer.from(protoInvitation.secret) : undefined);
|
|
85
86
|
}
|
|
86
87
|
static decode(code) {
|
|
87
88
|
const json = base62.decode(code).toString();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"invitation-descriptor.js","sourceRoot":"","sources":["../../../src/invitations/invitation-descriptor.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEF,oDAA4B;AAC5B,oDAA0B;AAC1B,kFAAoD;AAEpD,
|
|
1
|
+
{"version":3,"file":"invitation-descriptor.js","sourceRoot":"","sources":["../../../src/invitations/invitation-descriptor.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
import { Message as HaloMessage } from '@dxos/credentials';
|
|
3
|
-
import { PublicKey } from '@dxos/crypto';
|
|
4
3
|
import { FeedWriter } from '@dxos/echo-protocol';
|
|
5
4
|
import { NetworkManager } from '@dxos/network-manager';
|
|
5
|
+
import { PublicKey } from '@dxos/protocols';
|
|
6
6
|
import { PartyStateProvider } from '../pipeline';
|
|
7
7
|
import { CredentialsSigner } from '../protocol/credentials-signer';
|
|
8
8
|
import { InvitationAuthenticator, InvitationOptions } from './common';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"invitation-factory.d.ts","sourceRoot":"","sources":["../../../src/invitations/invitation-factory.ts"],"names":[],"mappings":";AAMA,OAAO,EAAgC,OAAO,IAAI,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACzF,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"invitation-factory.d.ts","sourceRoot":"","sources":["../../../src/invitations/invitation-factory.ts"],"names":[],"mappings":";AAMA,OAAO,EAAgC,OAAO,IAAI,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACzF,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AACnE,OAAO,EAAkC,uBAAuB,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAEtG,OAAO,EAAE,oBAAoB,EAA4B,MAAM,yBAAyB,CAAC;AAEzF;;GAEG;AACH,qBAAa,iBAAiB;IAE1B,OAAO,CAAC,QAAQ,CAAC,eAAe;IAGhC,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IACnC,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IACnC,OAAO,CAAC,QAAQ,CAAC,eAAe;gBALf,eAAe,EAAE,kBAAkB,EAGnC,kBAAkB,EAAE,iBAAiB,EACrC,kBAAkB,EAAE,UAAU,CAAC,WAAW,CAAC,EAC3C,eAAe,EAAE,cAAc;IAGlD,IAAI,MAAM,YAGT;IAEK,uBAAuB,CAAE,SAAS,EAAE,SAAS;IAoBnD;;OAEG;IACG,gBAAgB,CACpB,qBAAqB,GAAE,uBAAwD,EAAE,OAAO,GAAE,iBAAsB;IAuBlH,oBAAoB,CAAE,YAAY,EAAE,MAAM;CAG3C"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"offline-invitation-claimer.d.ts","sourceRoot":"","sources":["../../../src/invitations/offline-invitation-claimer.ts"],"names":[],"mappings":";AAQA,OAAO,EACL,aAAa,EAGb,qBAAqB,EAKrB,cAAc,EAIf,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAA0B,cAAc,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"offline-invitation-claimer.d.ts","sourceRoot":"","sources":["../../../src/invitations/offline-invitation-claimer.ts"],"names":[],"mappings":";AAQA,OAAO,EACL,aAAa,EAGb,qBAAqB,EAKrB,cAAc,EAIf,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAA0B,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAI/E,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAEhD,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,oBAAoB,EAA4B,MAAM,yBAAyB,CAAC;AACzF,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAMzD;;;GAGG;AACH,qBAAa,wBAAwB;IAKjC,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,qBAAqB;IALxC,cAAc,CAAC,EAAE,qBAAqB,CAAC;IACvC,MAAM,gBAA6B;gBAGhB,eAAe,EAAE,cAAc,EAC/B,qBAAqB,EAAE,oBAAoB;IAK9D,IAAI,KAAK,kBAER;IAED;;;OAGG;IACG,OAAO,CAAE,OAAO,SAAkB;IA6BxC;;;;;OAKG;IACG,KAAK;IAuBL,UAAU;IAMV,OAAO;IAOb;;;;OAIG;IACH,MAAM,CAAC,mCAAmC,CAAE,iBAAiB,EAAE,iBAAiB;IAoChF,MAAM,CAAC,oBAAoB,CAAE,WAAW,EAAE,iBAAiB,GAAG,cAAc;CAc7E"}
|
|
@@ -13,6 +13,7 @@ const async_1 = require("@dxos/async");
|
|
|
13
13
|
const credentials_1 = require("@dxos/credentials");
|
|
14
14
|
const crypto_1 = require("@dxos/crypto");
|
|
15
15
|
const network_manager_1 = require("@dxos/network-manager");
|
|
16
|
+
const protocols_1 = require("@dxos/protocols");
|
|
16
17
|
const errors_1 = require("../packlets/errors");
|
|
17
18
|
const greeting_protocol_provider_1 = require("./greeting-protocol-provider");
|
|
18
19
|
const greeting_responder_1 = require("./greeting-responder");
|
|
@@ -48,9 +49,9 @@ class OfflineInvitationClaimer {
|
|
|
48
49
|
log('Connecting');
|
|
49
50
|
const peerJoinedWaiter = (0, async_1.waitForEvent)(this._greeterPlugin, 'peer:joined', () => { var _a; return !!((_a = this._greeterPlugin) === null || _a === void 0 ? void 0 : _a.peers.length); }, timeout);
|
|
50
51
|
await this._networkManager.joinProtocolSwarm({
|
|
51
|
-
topic:
|
|
52
|
+
topic: protocols_1.PublicKey.from(swarmKey),
|
|
52
53
|
protocol: (0, greeting_protocol_provider_1.greetingProtocolProvider)(swarmKey, localPeerId, [this._greeterPlugin]),
|
|
53
|
-
peerId:
|
|
54
|
+
peerId: protocols_1.PublicKey.from(localPeerId),
|
|
54
55
|
topology: new network_manager_1.FullyConnectedTopology(),
|
|
55
56
|
label: 'Offline invitation claimer'
|
|
56
57
|
});
|
|
@@ -80,7 +81,7 @@ class OfflineInvitationClaimer {
|
|
|
80
81
|
}
|
|
81
82
|
async disconnect() {
|
|
82
83
|
const { swarmKey } = this._invitationDescriptor;
|
|
83
|
-
await this._networkManager.leaveProtocolSwarm(
|
|
84
|
+
await this._networkManager.leaveProtocolSwarm(protocols_1.PublicKey.from(swarmKey));
|
|
84
85
|
this._state = greeting_responder_1.GreetingState.DISCONNECTED;
|
|
85
86
|
}
|
|
86
87
|
async destroy() {
|