@dxos/echo-db 2.33.8-dev.c77ba621 → 2.33.8
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.test.js +14 -14
- package/dist/src/echo.test.js.map +1 -1
- package/dist/src/halo/halo-factory.d.ts.map +1 -1
- package/dist/src/halo/halo-factory.js +2 -3
- package/dist/src/halo/halo-factory.js.map +1 -1
- package/dist/src/halo/halo.d.ts.map +1 -1
- package/dist/src/halo/halo.js +2 -1
- package/dist/src/halo/halo.js.map +1 -1
- package/dist/src/halo/halo.test.js +2 -3
- package/dist/src/halo/halo.test.js.map +1 -1
- package/dist/src/halo/types.d.ts +1 -0
- package/dist/src/halo/types.d.ts.map +1 -1
- package/dist/src/invitations/greeting-initiator.d.ts.map +1 -1
- package/dist/src/invitations/greeting-initiator.js +2 -3
- package/dist/src/invitations/greeting-initiator.js.map +1 -1
- package/dist/src/invitations/greeting-protocol-provider.js +2 -2
- package/dist/src/invitations/greeting-protocol-provider.js.map +1 -1
- package/dist/src/invitations/greeting-responder.js +3 -3
- package/dist/src/invitations/greeting-responder.js.map +1 -1
- package/dist/src/invitations/halo-recovery-initiator.js +2 -2
- package/dist/src/invitations/halo-recovery-initiator.js.map +1 -1
- package/dist/src/invitations/invitation-descriptor.js +3 -3
- package/dist/src/invitations/invitation-descriptor.js.map +1 -1
- package/dist/src/invitations/offline-invitation-claimer.js +2 -2
- package/dist/src/invitations/offline-invitation-claimer.js.map +1 -1
- package/dist/src/parties/party-factory.d.ts.map +1 -1
- package/dist/src/parties/party-factory.js +3 -3
- 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/feed-muxer.d.ts.map +1 -1
- package/dist/src/pipeline/feed-muxer.js +2 -2
- package/dist/src/pipeline/feed-muxer.js.map +1 -1
- package/dist/src/protocol/identity-credentials.d.ts.map +1 -1
- package/dist/src/protocol/identity-credentials.js +2 -2
- package/dist/src/protocol/identity-credentials.js.map +1 -1
- package/dist/src/protocol/party-protocol-factory.js +1 -1
- package/dist/src/protocol/party-protocol-factory.js.map +1 -1
- package/dist/src/protocol/replicator-plugin.d.ts.map +1 -1
- package/dist/src/protocol/replicator-plugin.js +1 -2
- package/dist/src/protocol/replicator-plugin.js.map +1 -1
- package/dist/src/snapshots/snapshot-generator.js +2 -2
- package/dist/src/snapshots/snapshot-generator.js.map +1 -1
- package/dist/src/snapshots/snapshot-store.d.ts.map +1 -1
- package/dist/src/snapshots/snapshot-store.js +2 -2
- package/dist/src/snapshots/snapshot-store.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +20 -20
- package/src/echo.test.ts +4 -2
- package/src/halo/halo-factory.ts +2 -2
- package/src/halo/halo.test.ts +3 -2
- package/src/halo/halo.ts +3 -1
- package/src/halo/types.ts +1 -0
- package/src/invitations/greeting-initiator.ts +2 -3
- package/src/invitations/greeting-protocol-provider.ts +2 -2
- package/src/invitations/greeting-responder.ts +4 -4
- package/src/invitations/halo-recovery-initiator.ts +3 -3
- package/src/invitations/invitation-descriptor.ts +5 -5
- package/src/invitations/offline-invitation-claimer.ts +3 -3
- package/src/parties/party-factory.ts +3 -3
- package/src/parties/party-manager.test.ts +3 -2
- package/src/pipeline/feed-muxer.ts +2 -2
- package/src/protocol/identity-credentials.ts +5 -2
- package/src/protocol/party-protocol-factory.ts +2 -2
- package/src/protocol/replicator-plugin.ts +1 -2
- package/src/snapshots/snapshot-generator.ts +1 -1
- package/src/snapshots/snapshot-store.ts +2 -2
|
@@ -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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"}
|
|
@@ -44,7 +44,7 @@ class HaloRecoveryInitiator {
|
|
|
44
44
|
(0, assert_1.default)(this._state === greeting_responder_1.GreetingState.INITIALIZED);
|
|
45
45
|
// This is a temporary connection, there is no need to any special or permanent ID.
|
|
46
46
|
this._peerId = (0, crypto_1.randomBytes)();
|
|
47
|
-
log('Local PeerId:',
|
|
47
|
+
log('Local PeerId:', protocols_1.PublicKey.stringify(this._peerId));
|
|
48
48
|
const swarmKey = this._credentialsSigner.getIdentityKey().publicKey.asBuffer();
|
|
49
49
|
this._greeterPlugin = new credentials_1.GreetingCommandPlugin(this._peerId, async () => false);
|
|
50
50
|
log('Connecting');
|
|
@@ -72,7 +72,7 @@ class HaloRecoveryInitiator {
|
|
|
72
72
|
(0, assert_1.default)(this._peerId);
|
|
73
73
|
// Send to the first peer (any peer will do).
|
|
74
74
|
const peer = this._greeterPlugin.peers[0];
|
|
75
|
-
const responderPeerId =
|
|
75
|
+
const responderPeerId = protocols_1.PublicKey.bufferize(peer.getSession().peerId);
|
|
76
76
|
// Synthesize an "invitationID" which is the signature of both peerIds signed by our Identity key.
|
|
77
77
|
const signature = this._credentialsSigner.signer.rawSign(Buffer.concat([this._peerId, responderPeerId]), this._credentialsSigner.getIdentityKey());
|
|
78
78
|
// We expect to receive a new swarm/rendezvousKey to use for the full Greeting process.
|
|
@@ -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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"}
|
|
@@ -72,7 +72,7 @@ class InvitationDescriptor {
|
|
|
72
72
|
}
|
|
73
73
|
static fromQueryParameters(queryParameters) {
|
|
74
74
|
const { hash, swarmKey, invitation, identityKey, type } = queryParameters;
|
|
75
|
-
const descriptor = new InvitationDescriptor(parseInvitationType(type),
|
|
75
|
+
const descriptor = new InvitationDescriptor(parseInvitationType(type), protocols_1.PublicKey.bufferize(swarmKey), protocols_1.PublicKey.bufferize(invitation), identityKey ? protocols_1.PublicKey.from(identityKey) : undefined);
|
|
76
76
|
if (hash !== descriptor.hash) {
|
|
77
77
|
throw new errors_1.InvalidInvitationError();
|
|
78
78
|
}
|
|
@@ -97,8 +97,8 @@ class InvitationDescriptor {
|
|
|
97
97
|
*/
|
|
98
98
|
toQueryParameters() {
|
|
99
99
|
const query = {
|
|
100
|
-
swarmKey:
|
|
101
|
-
invitation:
|
|
100
|
+
swarmKey: protocols_1.PublicKey.stringify(this.swarmKey),
|
|
101
|
+
invitation: protocols_1.PublicKey.stringify(this.invitation),
|
|
102
102
|
type: stringifyInvitationType(this.type)
|
|
103
103
|
};
|
|
104
104
|
if (this.identityKey) {
|
|
@@ -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":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEF,oDAA4B;AAC5B,oDAA0B;AAC1B,kFAAoD;AAEpD,yCAAyC;AAEzC,2DAA6C;AAC7C,+CAA4C;AAE5C,+CAA4D;AAE5D,oDAAoD;AACtC,QAAA,wBAAwB,GAAG,KAAK,CAAC,oBAAoB,CAAC,IAAI,CAAC;AAEzE,6CAA6C;AAC7C,MAAM,MAAM,GAAG,IAAA,gBAAI,EAAC,gEAAgE,CAAC,CAAC;AAEtF,iEAAiE;AACjE,yDAAyD;AACzD,MAAM,aAAa,GAAG,KAAK,CAAC;AAa5B;;;;;;;GAOG;AACH,MAAa,oBAAoB;IAiC/B,4GAA4G;IAC5G,YACkB,IAA8B,EAC9B,QAAkB,EAClB,UAAsB,EACtB,WAAuB,EAChC,MAAmB;QAJV,SAAI,GAAJ,IAAI,CAA0B;QAC9B,aAAQ,GAAR,QAAQ,CAAU;QAClB,eAAU,GAAV,UAAU,CAAY;QACtB,gBAAW,GAAX,WAAW,CAAY;QAChC,WAAM,GAAN,MAAM,CAAa;QAE1B,IAAA,gBAAM,EAAC,IAAI,CAAC,CAAC;QACb,IAAA,gBAAM,EAAC,QAAQ,YAAY,UAAU,CAAC,CAAC;QACvC,IAAA,gBAAM,EAAC,UAAU,YAAY,UAAU,CAAC,CAAC;QACzC,IAAI,WAAW,EAAE;YACf,qBAAS,CAAC,oBAAoB,CAAC,WAAW,CAAC,CAAC;SAC7C;QACD,IAAI,MAAM,EAAE;YACV,IAAA,gBAAM,EAAC,MAAM,YAAY,UAAU,CAAC,CAAC;SACtC;IACH,CAAC;IAjDD,MAAM,CAAC,mBAAmB,CAAE,eAA0C;QACpE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAE,WAAW,EAAE,IAAI,EAAE,GAAG,eAAe,CAAC;QAE1E,MAAM,UAAU,GAAG,IAAI,oBAAoB,CAAC,mBAAmB,CAAC,IAAI,CAAC,EAAE,qBAAS,CAAC,SAAS,CAAC,QAAQ,CAAC,EAClG,qBAAS,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,qBAAS,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;QAE1F,IAAI,IAAI,KAAK,UAAU,CAAC,IAAI,EAAE;YAC5B,MAAM,IAAI,+BAAsB,EAAE,CAAC;SACpC;QAED,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,MAAM,CAAC,SAAS,CAAE,eAA2C;QAC3D,IAAA,gBAAM,EAAC,eAAe,CAAC,IAAI,EAAE,+BAA+B,CAAC,CAAC;QAC9D,IAAA,gBAAM,EAAC,eAAe,CAAC,QAAQ,EAAE,oCAAoC,CAAC,CAAC;QACvE,IAAA,gBAAM,EAAC,eAAe,CAAC,UAAU,EAAE,0BAA0B,CAAC,CAAC;QAE/D,OAAO,IAAI,oBAAoB,CAC7B,eAAe,CAAC,IAAI,EACpB,eAAe,CAAC,QAAQ,EACxB,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,EACvC,eAAe,CAAC,WAAW,CAAC,CAAC,CAAC,qBAAS,CAAC,IAAI,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS,EACrF,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CACzE,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,MAAM,CAAE,IAAY;QACzB,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC;QAC5C,OAAO,oBAAoB,CAAC,mBAAmB,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;IACpE,CAAC;IAqBD,IAAI,IAAI;QACN,MAAM,KAAK,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACvC,OAAO,KAAK,CAAC,IAAI,CAAC;IACpB,CAAC;IAED;;OAEG;IACH,iBAAiB;QACf,MAAM,KAAK,GAAuC;YAChD,QAAQ,EAAE,qBAAS,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC;YAC5C,UAAU,EAAE,qBAAS,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC;YAChD,IAAI,EAAE,uBAAuB,CAAC,IAAI,CAAC,IAAI,CAAC;SACzC,CAAC;QAEF,IAAI,IAAI,CAAC,WAAW,EAAE;YACpB,KAAK,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC;SAC9C;QAED,KAAK,CAAC,IAAI,GAAG,IAAA,kBAAS,EAAC,IAAA,+BAAe,EAAC,KAAK,CAAC,CAAC,CAAC;QAE/C,OAAO,KAAkC,CAAC;IAC5C,CAAC;IAED,OAAO;;QACL,OAAO;YACL,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,WAAW,EAAE,MAAA,IAAI,CAAC,WAAW,0CAAE,YAAY,EAAE;YAC7C,MAAM,EAAE,IAAI,CAAC,MAAM;SACpB,CAAC;IACJ,CAAC;IAED,MAAM;QACJ,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAC;QACrE,OAAO,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAC/B,CAAC;CACF;AA1FD,oDA0FC;AAED,MAAM,mBAAmB,GAAG,CAAC,GAAW,EAA4B,EAAE;IACpE,MAAM,IAAI,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC;IAC3B,IAAA,gBAAM,EAAC,IAAI,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,EAAE,yBAAyB,CAAC,CAAC;IAC5D,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEF,MAAM,uBAAuB,GAAG,CAAC,IAA8B,EAAU,EAAE,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC"}
|
|
@@ -44,7 +44,7 @@ class OfflineInvitationClaimer {
|
|
|
44
44
|
(0, assert_1.default)(swarmKey, 'swarmKey is required');
|
|
45
45
|
// This is a temporary connection, there is no need to any special or permanent ID.
|
|
46
46
|
const localPeerId = (0, crypto_1.randomBytes)();
|
|
47
|
-
log('Local PeerId:',
|
|
47
|
+
log('Local PeerId:', protocols_1.PublicKey.stringify(localPeerId));
|
|
48
48
|
this._greeterPlugin = new credentials_1.GreetingCommandPlugin(localPeerId, async () => false);
|
|
49
49
|
log('Connecting');
|
|
50
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);
|
|
@@ -70,7 +70,7 @@ class OfflineInvitationClaimer {
|
|
|
70
70
|
(0, assert_1.default)(this._greeterPlugin);
|
|
71
71
|
const { invitation: invitationID } = this._invitationDescriptor;
|
|
72
72
|
// Send to the first peer (any peer will do).
|
|
73
|
-
const responderPeerId =
|
|
73
|
+
const responderPeerId = protocols_1.PublicKey.bufferize(this._greeterPlugin.peers[0].getSession().peerId);
|
|
74
74
|
// We expect to receive a new swarm/rendezvousKey to use for the full Greeting process.
|
|
75
75
|
const claimResponse = await this._greeterPlugin.send(responderPeerId, (0, credentials_1.createGreetingClaimMessage)(Buffer.from(invitationID)));
|
|
76
76
|
const { id, rendezvousKey } = claimResponse;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"offline-invitation-claimer.js","sourceRoot":"","sources":["../../../src/invitations/offline-invitation-claimer.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,oDAA4B;AAC5B,kDAA0B;AAE1B,uCAA2C;AAC3C,mDAa2B;AAC3B,
|
|
1
|
+
{"version":3,"file":"offline-invitation-claimer.js","sourceRoot":"","sources":["../../../src/invitations/offline-invitation-claimer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"party-factory.d.ts","sourceRoot":"","sources":["../../../src/parties/party-factory.ts"],"names":[],"mappings":"AAOA,OAAO,EAKL,cAAc,EAEf,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"party-factory.d.ts","sourceRoot":"","sources":["../../../src/parties/party-factory.ts"],"names":[],"mappings":"AAOA,OAAO,EAKL,cAAc,EAEf,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAAiC,QAAQ,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AACxG,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAEvD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG5C,OAAO,EAEc,oBAAoB,EACxC,MAAM,gBAAgB,CAAC;AAExB,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAChF,OAAO,EAAE,2BAA2B,EAAE,MAAM,kCAAkC,CAAC;AAC/E,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAmB,MAAM,cAAc,CAAC;AAI1D;;GAEG;AACH,qBAAa,YAAY;IAErB,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,oBAAoB;IACrC,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,QAAQ;gBANR,iBAAiB,EAAE,2BAA2B,EAC9C,eAAe,EAAE,cAAc,EAC/B,aAAa,EAAE,YAAY,EAC3B,cAAc,EAAE,aAAa,EAC7B,oBAAoB,EAAE,CAAC,QAAQ,EAAE,SAAS,KAAK,iBAAiB,EAChE,cAAc,EAAE,aAAa,EAC7B,QAAQ,GAAE,eAAoB;IAGjD;;OAEG;IAEG,WAAW,IAAK,OAAO,CAAC,SAAS,CAAC;IA0DxC;;;;OAIG;IACG,cAAc,CAAE,QAAQ,EAAE,QAAQ,EAAE,gBAAgB,CAAC,EAAE,SAAS;IAsBhE,0BAA0B,CAAE,QAAQ,EAAE,aAAa;IASnD,SAAS,CAAE,oBAAoB,EAAE,oBAAoB,EAAE,cAAc,EAAE,cAAc,GAAG,OAAO,CAAC,SAAS,CAAC;IA8C1G,UAAU,CAAE,QAAQ,EAAE,aAAa,GAAG,OAAO,CAAC,SAAS,CAAC;CAwF/D"}
|
|
@@ -16,11 +16,11 @@ exports.PartyFactory = void 0;
|
|
|
16
16
|
const assert_1 = __importDefault(require("assert"));
|
|
17
17
|
const debug_1 = __importDefault(require("debug"));
|
|
18
18
|
const credentials_1 = require("@dxos/credentials");
|
|
19
|
-
const crypto_1 = require("@dxos/crypto");
|
|
20
19
|
const debug_2 = require("@dxos/debug");
|
|
21
20
|
const echo_protocol_1 = require("@dxos/echo-protocol");
|
|
22
21
|
const object_model_1 = require("@dxos/object-model");
|
|
23
22
|
const protocols_1 = require("@dxos/protocols");
|
|
23
|
+
const util_1 = require("@dxos/util");
|
|
24
24
|
const invitations_1 = require("../invitations");
|
|
25
25
|
const errors_1 = require("../packlets/errors");
|
|
26
26
|
const data_party_1 = require("./data-party");
|
|
@@ -85,7 +85,7 @@ class PartyFactory {
|
|
|
85
85
|
}
|
|
86
86
|
async constructPartyFromSnapshot(snapshot) {
|
|
87
87
|
(0, assert_1.default)(snapshot.partyKey);
|
|
88
|
-
log(`Constructing ${(0,
|
|
88
|
+
log(`Constructing ${(0, util_1.humanize)(snapshot.partyKey)} from snapshot at ${JSON.stringify(snapshot.timeframe)}.`);
|
|
89
89
|
const party = await this.constructParty(protocols_1.PublicKey.from(snapshot.partyKey), snapshot.timeframe);
|
|
90
90
|
await party.restoreFromSnapshot(snapshot);
|
|
91
91
|
return party;
|
|
@@ -99,7 +99,7 @@ class PartyFactory {
|
|
|
99
99
|
const invitationClaimer = new invitations_1.OfflineInvitationClaimer(this._networkManager, invitationDescriptor);
|
|
100
100
|
await invitationClaimer.connect();
|
|
101
101
|
invitationDescriptor = await invitationClaimer.claim();
|
|
102
|
-
log(`Party invitation ${
|
|
102
|
+
log(`Party invitation ${protocols_1.PublicKey.stringify(originalInvitation.invitation)} triggered interactive Greeting`, `at ${protocols_1.PublicKey.stringify(invitationDescriptor.invitation)}`);
|
|
103
103
|
await invitationClaimer.destroy();
|
|
104
104
|
}
|
|
105
105
|
// TODO(burdon): Factor out.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"party-factory.js","sourceRoot":"","sources":["../../../src/parties/party-factory.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;;;;;;;AAEF,oDAA4B;AAC5B,kDAA0B;AAE1B,mDAO2B;AAC3B,
|
|
1
|
+
{"version":3,"file":"party-factory.js","sourceRoot":"","sources":["../../../src/parties/party-factory.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;;;;;;;AAEF,oDAA4B;AAC5B,kDAA0B;AAE1B,mDAO2B;AAC3B,uCAA0D;AAC1D,uDAAwG;AAGxG,qDAAiD;AACjD,+CAA4C;AAC5C,qCAAsC;AAEtC,gDAGwB;AACxB,+CAAiE;AAIjE,6CAA0D;AAE1D,MAAM,GAAG,GAAG,IAAA,eAAK,EAAC,4BAA4B,CAAC,CAAC;AAEhD;;GAEG;AACH,MAAa,YAAY;IACvB,YACmB,iBAA8C,EAC9C,eAA+B,EAC/B,aAA2B,EAC3B,cAA6B,EAC7B,oBAAgE,EAChE,cAA6B,EAC7B,WAA4B,EAAE;QAN9B,sBAAiB,GAAjB,iBAAiB,CAA6B;QAC9C,oBAAe,GAAf,eAAe,CAAgB;QAC/B,kBAAa,GAAb,aAAa,CAAc;QAC3B,mBAAc,GAAd,cAAc,CAAe;QAC7B,yBAAoB,GAApB,oBAAoB,CAA4C;QAChE,mBAAc,GAAd,cAAc,CAAe;QAC7B,aAAQ,GAAR,QAAQ,CAAsB;IAC9C,CAAC;IAEJ;;OAEG;IAEH,KAAK,CAAC,WAAW;;QACf,MAAM,QAAQ,GAAG,MAAA,IAAI,CAAC,iBAAiB,EAAE,mCAAI,IAAA,aAAK,EAAC,IAAI,oCAA2B,EAAE,CAAC,CAAC;QACtF,IAAA,gBAAM,EAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,4BAA4B,CAAC,CAAC;QAE9D,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE,IAAI,EAAE,qBAAO,CAAC,KAAK,EAAE,CAAC,CAAC;QACjF,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QAE5D,MAAM,YAAY,GAAG,MAAM,KAAK,CAAC,YAAY,EAAE,CAAC;QAChD,oFAAoF;QACpF,KAAK,CAAC,aAAa,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC;QAExC,wBAAwB;QACxB,MAAM,KAAK,CAAC,IAAI,EAAE,CAAC;QAEnB,uCAAuC;QACvC,MAAM,KAAK,CAAC,iBAAiB,CAAC,KAAK,CAAC,IAAA,uCAAyB,EAC3D,QAAQ,CAAC,OAAO,EAChB,QAAQ,EACR,YAAY,CAAC,GAAG,EAChB,QAAQ,CAAC,CACV,CAAC;QAEF,6DAA6D;QAC7D,MAAM,KAAK,CAAC,iBAAiB,CAAC,KAAK,CAAC,IAAA,mCAAqB,EACvD,QAAQ,CAAC,OAAO,EAChB,QAAQ,CAAC,SAAS,EAClB,IAAA,yBAAW,EAAC,QAAQ,CAAC,eAAe,CAAC,EACrC,CAAC,QAAQ,CAAC,CAAC,CACZ,CAAC;QAEF,6CAA6C;QAC7C,qGAAqG;QACrG,MAAM,KAAK,CAAC,iBAAiB,CAAC,KAAK,CAAC,IAAA,oCAAsB,EACxD,QAAQ,CAAC,OAAO,EAChB,QAAQ,CAAC,SAAS,EAClB,YAAY,CAAC,GAAG,EAChB,CAAC,QAAQ,CAAC,cAAc,CAAC,CAC1B,CAAC,CAAC;QAEH,6DAA6D;QAC7D,IAAI,QAAQ,CAAC,YAAY,EAAE;YACzB,MAAM,KAAK,CAAC,iBAAiB,CAAC,KAAK,CAAC,IAAA,mCAAqB,EACvD,QAAQ,CAAC,OAAO,EAChB,QAAQ,CAAC,SAAS,EAClB,IAAA,yBAAW,EAAC,QAAQ,CAAC,YAAY,CAAC,EAClC,CAAC,QAAQ,CAAC,cAAc,CAAC,CAC1B,CAAC,CAAC;SACJ;QAED,kCAAkC;QAClC,MAAM,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,KAAK,EAAE,0BAAW,EAAE,IAAI,EAAE,4BAAe,EAAE,CAAC,CAAC;QAE/E,sGAAsG;QACtG,MAAM,QAAQ,CAAC,OAAO,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;QAEjD,OAAO,KAAK,CAAC;IACf,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,cAAc,CAAE,QAAkB,EAAE,gBAA4B;;QACpE,MAAM,QAAQ,GAAG,MAAA,IAAI,CAAC,iBAAiB,EAAE,mCAAI,IAAA,aAAK,EAAC,IAAI,oCAA2B,EAAE,CAAC,CAAC;QAEtF,EAAE;QACF,oBAAoB;QACpB,EAAE;QACF,MAAM,KAAK,GAAG,IAAI,sBAAS,CACzB,QAAQ,EACR,IAAI,CAAC,aAAa,EAClB,IAAI,CAAC,cAAc,EACnB,IAAI,CAAC,oBAAoB,CAAC,QAAQ,CAAC,EACnC,IAAI,CAAC,cAAc,EACnB,QAAQ,CAAC,uBAAuB,EAAE,EAClC,QAAQ,CAAC,WAAW,EACpB,IAAI,CAAC,eAAe,EACpB,gBAAgB,EAChB,IAAI,CAAC,QAAQ,CACd,CAAC;QAEF,OAAO,KAAK,CAAC;IACf,CAAC;IAED,KAAK,CAAC,0BAA0B,CAAE,QAAuB;QACvD,IAAA,gBAAM,EAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAC1B,GAAG,CAAC,gBAAgB,IAAA,eAAQ,EAAC,QAAQ,CAAC,QAAQ,CAAC,qBAAqB,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;QAE3G,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,qBAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAC,SAAS,CAAC,CAAC;QAC/F,MAAM,KAAK,CAAC,mBAAmB,CAAC,QAAQ,CAAC,CAAC;QAC1C,OAAO,KAAK,CAAC;IACf,CAAC;IAED,KAAK,CAAC,SAAS,CAAE,oBAA0C,EAAE,cAA8B;;QACzF,MAAM,kBAAkB,GAAG,oBAAoB,CAAC;QAEhD,MAAM,QAAQ,GAAG,MAAA,IAAI,CAAC,iBAAiB,EAAE,mCAAI,IAAA,aAAK,EAAC,IAAI,oCAA2B,EAAE,CAAC,CAAC;QACtF,8EAA8E;QAC9E,IAAI,sCAAwB,CAAC,OAAO,KAAK,oBAAoB,CAAC,IAAI,EAAE;YAClE,MAAM,iBAAiB,GAAG,IAAI,sCAAwB,CAAC,IAAI,CAAC,eAAe,EAAE,oBAAoB,CAAC,CAAC;YACnG,MAAM,iBAAiB,CAAC,OAAO,EAAE,CAAC;YAClC,oBAAoB,GAAG,MAAM,iBAAiB,CAAC,KAAK,EAAE,CAAC;YACvD,GAAG,CAAC,oBAAoB,qBAAS,CAAC,SAAS,CAAC,kBAAkB,CAAC,UAAU,CAAC,iCAAiC,EACzG,MAAM,qBAAS,CAAC,SAAS,CAAC,oBAAoB,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;YAChE,MAAM,iBAAiB,CAAC,OAAO,EAAE,CAAC;SACnC;QAED,4BAA4B;QAC5B,MAAM,SAAS,GAAG,IAAI,+BAAiB,CACrC,IAAI,CAAC,eAAe,EACpB,oBAAoB,EACpB,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC,IAAA,8CAAgC,EAC1D,QAAQ,CAAC,uBAAuB,EAAE,EAClC,QAAQ,EACR,QAAQ,CAAC,eAAe,EACxB,KAAK,CACN,CAAC,CACH,CAAC;QAEF,MAAM,SAAS,CAAC,OAAO,EAAE,CAAC;QAC1B,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,MAAM,SAAS,CAAC,gBAAgB,CAAC,cAAc,CAAC,CAAC;QAC7E,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;QAClD,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QAC3B,MAAM,KAAK,CAAC,IAAI,EAAE,CAAC;QACnB,MAAM,SAAS,CAAC,OAAO,EAAE,CAAC;QAE1B,mDAAmD;QACnD,IAAI,QAAQ,CAAC,YAAY,EAAE;YACzB,MAAM,KAAK,CAAC,iBAAiB,CAAC,KAAK,CAAC,IAAA,mCAAqB,EACvD,QAAQ,CAAC,OAAO,EAChB,QAAQ,EACR,IAAA,yBAAW,EAAC,QAAQ,CAAC,YAAY,CAAC,EAClC,CAAC,QAAQ,CAAC,cAAc,CAAC,CAC1B,CAAC,CAAC;SACJ;QAED,OAAO,KAAK,CAAC;IACf,CAAC;IAED,KAAK,CAAC,UAAU,CAAE,QAAuB;;QACvC,MAAM,QAAQ,GAAG,MAAA,IAAI,CAAC,iBAAiB,EAAE,mCAAI,IAAA,aAAK,EAAC,IAAI,oCAA2B,EAAE,CAAC,CAAC;QAEtF,IAAA,gBAAM,EAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,2BAA2B,CAAC,CAAC;QAE7D,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE,IAAI,EAAE,qBAAO,CAAC,KAAK,EAAE,CAAC,CAAC;QACjF,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QAE5D,MAAM,YAAY,GAAG,MAAM,KAAK,CAAC,YAAY,EAAE,CAAC;QAChD,oFAAoF;QACpF,KAAK,CAAC,aAAa,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC;QAExC,wBAAwB;QACxB,MAAM,KAAK,CAAC,IAAI,EAAE,CAAC;QAEnB,uCAAuC;QACvC,MAAM,KAAK,CAAC,iBAAiB,CAAC,KAAK,CAAC,IAAA,uCAAyB,EAC3D,QAAQ,CAAC,OAAO,EAChB,QAAQ,EACR,YAAY,CAAC,GAAG,EAChB,QAAQ,CAAC,CACV,CAAC;QAEF,6DAA6D;QAC7D,MAAM,KAAK,CAAC,iBAAiB,CAAC,KAAK,CAAC,IAAA,mCAAqB,EACvD,QAAQ,CAAC,OAAO,EAChB,QAAQ,CAAC,SAAS,EAClB,IAAA,yBAAW,EAAC,QAAQ,CAAC,eAAe,CAAC,EACrC,CAAC,QAAQ,CAAC,CACX,CAAC,CAAC;QAEH,6CAA6C;QAC7C,MAAM,KAAK,CAAC,iBAAiB,CAAC,KAAK,CAAC,IAAA,oCAAsB,EACxD,QAAQ,CAAC,OAAO,EAChB,QAAQ,CAAC,SAAS,EAClB,YAAY,CAAC,GAAG,EAChB,CAAC,QAAQ,CAAC,cAAc,CAAC,CAC1B,CAAC,CAAC;QAEH,6DAA6D;QAC7D,IAAI,QAAQ,CAAC,YAAY,EAAE;YACzB,MAAM,KAAK,CAAC,iBAAiB,CAAC,KAAK,CAAC,IAAA,mCAAqB,EACvD,QAAQ,CAAC,OAAO,EAChB,QAAQ,CAAC,SAAS,EAClB,IAAA,yBAAW,EAAC,QAAQ,CAAC,YAAY,CAAC,EAClC,CAAC,QAAQ,CAAC,cAAc,CAAC,CAC1B,CAAC,CAAC;SACJ;QAED,wDAAwD;QACxD,2BAA2B;QAC3B,6DAA6D;QAC7D,qBAAqB;QACrB,wBAAwB;QACxB,qBAAqB;QACrB,eAAe;QACf,MAAM;QAEN,kEAAkE;QAClE,kDAAkD;QAClD,IAAI;QAEJ,uCAAuC;QACvC,MAAM,UAAU,GAAG,IAAA,gCAAgB,EAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QACvD,KAAK,MAAM,IAAI,IAAI,CAAA,MAAA,QAAQ,CAAC,QAAQ,0CAAE,KAAK,KAAI,EAAE,EAAE;YACjD,MAAM,OAAO,GAAgB;gBAC3B,SAAS,EAAE,IAAI,yBAAS,EAAE;gBAC1B,IAAI,EAAE;oBACJ,MAAM,EAAE,MAAA,IAAI,CAAC,MAAM,mCAAI,IAAA,qBAAa,GAAE;oBACtC,OAAO,EAAE;wBACP,QAAQ,EAAE,IAAI,CAAC,QAAQ;wBACvB,SAAS,EAAE,IAAI,CAAC,SAAS;wBACzB,YAAY,EAAE,IAAI,CAAC,YAAY;qBAChC;oBACD,YAAY,EAAE;wBACZ,QAAQ,EAAE,IAAI,CAAC,QAAQ;qBACxB;oBACD,QAAQ,EAAE,IAAI,CAAC,KAAK;iBACrB;aACF,CAAC;YACF,MAAM,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;SACjC;QAED,sGAAsG;QACtG,MAAM,QAAQ,CAAC,OAAO,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;QAEjD,OAAO,KAAK,CAAC;IACf,CAAC;CACF;AApOC;IADC,IAAA,aAAK,EAAC,IAAK,CAAC;+CAyDZ;AAvEH,oCAmPC"}
|
|
@@ -23,6 +23,7 @@ const object_model_1 = require("@dxos/object-model");
|
|
|
23
23
|
const protocols_1 = require("@dxos/protocols");
|
|
24
24
|
const random_access_multi_storage_1 = require("@dxos/random-access-multi-storage");
|
|
25
25
|
const testutils_1 = require("@dxos/testutils");
|
|
26
|
+
const util_1 = require("@dxos/util");
|
|
26
27
|
const invitations_1 = require("../invitations");
|
|
27
28
|
const pipeline_1 = require("../pipeline");
|
|
28
29
|
const identity_credentials_1 = require("../protocol/identity-credentials");
|
|
@@ -240,11 +241,11 @@ describe('Party manager', () => {
|
|
|
240
241
|
(0, expect_1.default)(members.length).toBe(2);
|
|
241
242
|
for (const member of members) {
|
|
242
243
|
if (identityA.identityKey.publicKey.equals(member.publicKey)) {
|
|
243
|
-
(0, expect_1.default)(member.displayName).toEqual((0,
|
|
244
|
+
(0, expect_1.default)(member.displayName).toEqual((0, util_1.humanize)(identityA.identityKey.publicKey));
|
|
244
245
|
(0, expect_1.default)(member.displayName).toEqual(identityA.displayName);
|
|
245
246
|
}
|
|
246
247
|
if (identityB.identityKey.publicKey.equals(member.publicKey)) {
|
|
247
|
-
(0, expect_1.default)(member.displayName).toEqual((0,
|
|
248
|
+
(0, expect_1.default)(member.displayName).toEqual((0, util_1.humanize)(identityB.identityKey.publicKey));
|
|
248
249
|
(0, expect_1.default)(member.displayName).toEqual(identityB.displayName);
|
|
249
250
|
}
|
|
250
251
|
}
|
|
@@ -308,10 +309,10 @@ describe('Party manager', () => {
|
|
|
308
309
|
(0, expect_1.default)(members.length).toBe(2);
|
|
309
310
|
for (const member of members) {
|
|
310
311
|
if (identityA.identityKey.publicKey.equals(member.publicKey)) {
|
|
311
|
-
(0, expect_1.default)(member.displayName).toEqual((0,
|
|
312
|
+
(0, expect_1.default)(member.displayName).toEqual((0, util_1.humanize)(identityA.identityKey.publicKey));
|
|
312
313
|
}
|
|
313
314
|
if (identityB.identityKey.publicKey.equals(member.publicKey)) {
|
|
314
|
-
(0, expect_1.default)(member.displayName).toEqual((0,
|
|
315
|
+
(0, expect_1.default)(member.displayName).toEqual((0, util_1.humanize)(identityB.identityKey.publicKey));
|
|
315
316
|
}
|
|
316
317
|
}
|
|
317
318
|
}
|
|
@@ -355,11 +356,11 @@ describe('Party manager', () => {
|
|
|
355
356
|
(0, expect_1.default)(members.length).toBe(2);
|
|
356
357
|
for (const member of members) {
|
|
357
358
|
if (identityA.identityKey.publicKey.equals(member.publicKey)) {
|
|
358
|
-
(0, expect_1.default)(member.displayName).toEqual((0,
|
|
359
|
+
(0, expect_1.default)(member.displayName).toEqual((0, util_1.humanize)(identityA.identityKey.publicKey));
|
|
359
360
|
(0, expect_1.default)(member.displayName).toEqual(identityA.displayName);
|
|
360
361
|
}
|
|
361
362
|
if (identityB.identityKey.publicKey.equals(member.publicKey)) {
|
|
362
|
-
(0, expect_1.default)(member.displayName).toEqual((0,
|
|
363
|
+
(0, expect_1.default)(member.displayName).toEqual((0, util_1.humanize)(identityB.identityKey.publicKey));
|
|
363
364
|
(0, expect_1.default)(member.displayName).toEqual(identityB.displayName);
|
|
364
365
|
}
|
|
365
366
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"party-manager.test.js","sourceRoot":"","sources":["../../../src/parties/party-manager.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"party-manager.test.js","sourceRoot":"","sources":["../../../src/parties/party-manager.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"feed-muxer.d.ts","sourceRoot":"","sources":["../../../src/pipeline/feed-muxer.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"feed-muxer.d.ts","sourceRoot":"","sources":["../../../src/pipeline/feed-muxer.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAE3D,OAAO,EACW,YAAY,EAAE,WAAW,EAAE,iBAAiB,EAAE,UAAU,EACzE,MAAM,qBAAqB,CAAC;AAI7B,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACrE,OAAO,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAE5E,UAAU,OAAO;IACf,UAAU,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,IAAI,CAAA;IAC/B,WAAW,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,IAAI,CAAA;CACjC;AAID;;;GAGG;AACH,qBAAa,SAAS;IAyBlB,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC;IAC7B,OAAO,CAAC,QAAQ,CAAC,QAAQ;IA5B3B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAsB;IAE9C,OAAO,CAAC,OAAO,CAAS;IAExB;;OAEG;IACH,OAAO,CAAC,mBAAmB,CAAuC;IAElE;;OAEG;IACH,OAAO,CAAC,mBAAmB,CAAsC;IAEjE,OAAO,CAAC,cAAc,CAA2B;IAEjD;;;;;;OAMG;gBAEgB,eAAe,EAAE,mBAAmB,GAAG,kBAAkB,EACzD,iBAAiB,EAAE,iBAAiB,EACpC,eAAe,EAAE,cAAc,EAC/B,WAAW,CAAC,qCAAyB,EACrC,QAAQ,GAAE,OAAY;IAmBzC,IAAI,MAAM,YAET;IAED,IAAI,QAAQ,YAEX;IAED,IAAI,kBAAkB,yCAErB;IAED,IAAI,kBAAkB,wCAErB;IAED,IAAI,MAAM,iBAET;IAED,gBAAgB,CAAE,SAAS,EAAE,aAAa;IAI1C;;;;;;;;;OASG;IACG,IAAI,IAAK,OAAO,CAAC,UAAU,CAAC,YAAY,CAAC,GAAG,SAAS,CAAC;IA+D5D;;OAEG;IAEG,KAAK;CAQZ"}
|
|
@@ -10,7 +10,6 @@ exports.FeedMuxer = void 0;
|
|
|
10
10
|
const assert_1 = __importDefault(require("assert"));
|
|
11
11
|
const debug_1 = __importDefault(require("debug"));
|
|
12
12
|
const async_1 = require("@dxos/async");
|
|
13
|
-
const crypto_1 = require("@dxos/crypto");
|
|
14
13
|
const debug_2 = require("@dxos/debug");
|
|
15
14
|
const echo_protocol_1 = require("@dxos/echo-protocol");
|
|
16
15
|
const protocols_1 = require("@dxos/protocols");
|
|
@@ -103,7 +102,8 @@ class FeedMuxer {
|
|
|
103
102
|
//
|
|
104
103
|
if (message.echo) {
|
|
105
104
|
const memberKey = this._partyProcessor.getFeedOwningMember(protocols_1.PublicKey.from(block.key));
|
|
106
|
-
(
|
|
105
|
+
// TODO(wittjosiah): Is actually a Buffer for some reason. See todo in IFeedGenericBlock.
|
|
106
|
+
(0, assert_1.default)(memberKey, `Ownership of feed ${protocols_1.PublicKey.stringify(block.key)} could not be determined.`);
|
|
107
107
|
// Validate messge.
|
|
108
108
|
const { itemId } = message.echo;
|
|
109
109
|
if (itemId) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"feed-muxer.js","sourceRoot":"","sources":["../../../src/pipeline/feed-muxer.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,oDAA4B;AAC5B,kDAA0B;AAE1B,uCAAoC;AAEpC,
|
|
1
|
+
{"version":3,"file":"feed-muxer.js","sourceRoot":"","sources":["../../../src/pipeline/feed-muxer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"identity-credentials.d.ts","sourceRoot":"","sources":["../../../src/protocol/identity-credentials.ts"],"names":[],"mappings":"AAIA,OAAO,
|
|
1
|
+
{"version":3,"file":"identity-credentials.d.ts","sourceRoot":"","sources":["../../../src/protocol/identity-credentials.ts"],"names":[],"mappings":"AAIA,OAAO,EAEL,QAAQ,EAAE,SAAS,EAAE,OAAO,EAAW,aAAa,EACrD,MAAM,mBAAmB,CAAC;AAG3B,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AACtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAEzD;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC,OAAO,EAAE,OAAO,CAAA;IAChB,WAAW,EAAE,SAAS,CAAA;IACtB,SAAS,EAAE,SAAS,CAAA;IACpB,cAAc,EAAE,QAAQ,CAAA;IACxB,eAAe,EAAE,aAAa,CAAA;IAC9B,YAAY,EAAE,aAAa,GAAG,SAAS,CAAA;IACvC,WAAW,EAAE,MAAM,GAAG,SAAS,CAAA;IAC/B,uBAAuB,IAAI,iBAAiB,CAAA;IAC5C,WAAW,EAAE,WAAW,GAAG,SAAS,CAAA;IACpC,QAAQ,EAAE,cAAc,GAAG,SAAS,CAAA;CACrC;AAED,oBAAY,2BAA2B,GAAG,MAAM,mBAAmB,GAAG,SAAS,CAAA;AAE/E,eAAO,MAAM,6BAA6B,YAAmB,OAAO,KAAG,QAAQ,mBAAmB,CA4BjG,CAAC;AAEF,eAAO,MAAM,2BAA2B,aAAoB,mBAAmB,KAAG,QAAQ,mBAAmB,CAoB5G,CAAC"}
|
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.deriveTestDeviceCredentials = exports.createTestIdentityCredentials = void 0;
|
|
7
7
|
const credentials_1 = require("@dxos/credentials");
|
|
8
|
-
const
|
|
8
|
+
const util_1 = require("@dxos/util");
|
|
9
9
|
const credentials_signer_1 = require("./credentials-signer");
|
|
10
10
|
const createTestIdentityCredentials = async (keyring) => {
|
|
11
11
|
const identityKey = await keyring.createKeyRecord({ type: credentials_1.KeyType.IDENTITY });
|
|
@@ -17,7 +17,7 @@ const createTestIdentityCredentials = async (keyring) => {
|
|
|
17
17
|
messageMap.set(identityKey.publicKey.toHex(), keyAdmit);
|
|
18
18
|
messageMap.set(deviceKey.publicKey.toHex(), partyGenesis);
|
|
19
19
|
const deviceKeyChain = credentials_1.Keyring.buildKeyChain(deviceKey.publicKey, messageMap, [feedKey.publicKey]);
|
|
20
|
-
const displayName = (0,
|
|
20
|
+
const displayName = (0, util_1.humanize)(identityKey.publicKey);
|
|
21
21
|
const identityInfo = (0, credentials_1.createIdentityInfoMessage)(keyring, displayName, identityKey);
|
|
22
22
|
return {
|
|
23
23
|
keyring,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"identity-credentials.js","sourceRoot":"","sources":["../../../src/protocol/identity-credentials.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;AAEF,
|
|
1
|
+
{"version":3,"file":"identity-credentials.js","sourceRoot":"","sources":["../../../src/protocol/identity-credentials.ts"],"names":[],"mappings":"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"}
|
|
@@ -77,7 +77,7 @@ class PartyProtocolFactory {
|
|
|
77
77
|
},
|
|
78
78
|
userSession: {
|
|
79
79
|
// TODO(burdon): See deprecated `protocolFactory` in HALO.
|
|
80
|
-
peerId:
|
|
80
|
+
peerId: this._peerId.toHex(),
|
|
81
81
|
// TODO(telackey): This ought to be the CredentialsProvider itself, so that fresh credentials can be minted.
|
|
82
82
|
credentials: this._credentials.get().toString('base64')
|
|
83
83
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"party-protocol-factory.js","sourceRoot":"","sources":["../../../src/protocol/party-protocol-factory.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,kDAA0B;AAE1B,
|
|
1
|
+
{"version":3,"file":"party-protocol-factory.js","sourceRoot":"","sources":["../../../src/protocol/party-protocol-factory.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"replicator-plugin.d.ts","sourceRoot":"","sources":["../../../src/protocol/replicator-plugin.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"replicator-plugin.d.ts","sourceRoot":"","sources":["../../../src/protocol/replicator-plugin.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAC;AAE9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAIhD;;GAEG;AACH,eAAO,MAAM,sBAAsB,iBAAkB,iBAAiB,eAoBlE,CAAC"}
|
|
@@ -8,7 +8,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
9
|
exports.createReplicatorPlugin = void 0;
|
|
10
10
|
const debug_1 = __importDefault(require("debug"));
|
|
11
|
-
const crypto_1 = require("@dxos/crypto");
|
|
12
11
|
const protocol_plugin_replicator_1 = require("@dxos/protocol-plugin-replicator");
|
|
13
12
|
const log = (0, debug_1.default)('dxos:echo-db:protocol:replicator');
|
|
14
13
|
/**
|
|
@@ -17,7 +16,7 @@ const log = (0, debug_1.default)('dxos:echo-db:protocol:replicator');
|
|
|
17
16
|
const createReplicatorPlugin = (feedProvider) => new protocol_plugin_replicator_1.Replicator({
|
|
18
17
|
load: async () => {
|
|
19
18
|
const feeds = feedProvider.getFeeds();
|
|
20
|
-
log(`Loading feeds: ${feeds.map(feed =>
|
|
19
|
+
log(`Loading feeds: ${feeds.map(feed => feed.key.toHex())}`);
|
|
21
20
|
return feeds.map((feed) => ({ discoveryKey: feed.feed.discoveryKey }));
|
|
22
21
|
},
|
|
23
22
|
subscribe: (addFeedToReplicatedSet) => feedProvider.feedOpened.on(async (feed) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"replicator-plugin.js","sourceRoot":"","sources":["../../../src/protocol/replicator-plugin.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,kDAA0B;AAE1B,
|
|
1
|
+
{"version":3,"file":"replicator-plugin.js","sourceRoot":"","sources":["../../../src/protocol/replicator-plugin.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,kDAA0B;AAE1B,iFAA8D;AAI9D,MAAM,GAAG,GAAG,IAAA,eAAK,EAAC,kCAAkC,CAAC,CAAC;AAEtD;;GAEG;AACI,MAAM,sBAAsB,GAAG,CAAC,YAA+B,EAAE,EAAE,CACxE,IAAI,uCAAU,CAAC;IACb,IAAI,EAAE,KAAK,IAAI,EAAE;QACf,MAAM,KAAK,GAAG,YAAY,CAAC,QAAQ,EAAE,CAAC;QACtC,GAAG,CAAC,kBAAkB,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC;QAC7D,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,YAAY,EAAE,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC;IACzE,CAAC;IAED,SAAS,EAAE,CAAC,sBAA2C,EAAE,EAAE,CAAC,YAAY,CAAC,UAAU,CAAC,EAAE,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;QACpG,GAAG,CAAC,gBAAgB,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QACxC,sBAAsB,CAAC,EAAE,YAAY,EAAE,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC;IACnE,CAAC,CAAC;IAEF,SAAS,EAAE,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,EAAE;QACrC,4GAA4G;QAC5G,8GAA8G;QAC9G,MAAM,KAAK,GAAG,YAAY,CAAC,QAAQ,EAAE,CAAC;QACtC,GAAG,CAAC,uBAAuB,IAAI,CAAC,OAAO,WAAW,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC;QACzF,OAAO,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACtC,CAAC;CACF,CAAC,CAAC;AApBQ,QAAA,sBAAsB,0BAoB9B"}
|
|
@@ -8,12 +8,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
9
|
exports.createAutomaticSnapshots = void 0;
|
|
10
10
|
const debug_1 = __importDefault(require("debug"));
|
|
11
|
-
const
|
|
11
|
+
const util_1 = require("@dxos/util");
|
|
12
12
|
const log = (0, debug_1.default)('dxos:snapshot-generator');
|
|
13
13
|
const createAutomaticSnapshots = (party, clock, store, interval) => clock.update.on(async (timeframe) => {
|
|
14
14
|
const totalMessages = timeframe.totalMessages();
|
|
15
15
|
if (totalMessages > 0 && totalMessages % interval === 0) {
|
|
16
|
-
log(`Saving snapshot of ${(0,
|
|
16
|
+
log(`Saving snapshot of ${(0, util_1.humanize)(party.key)}...`);
|
|
17
17
|
try {
|
|
18
18
|
const snapshot = party.createSnapshot();
|
|
19
19
|
await store.save(snapshot);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"snapshot-generator.js","sourceRoot":"","sources":["../../../src/snapshots/snapshot-generator.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,kDAA0B;AAE1B,
|
|
1
|
+
{"version":3,"file":"snapshot-generator.js","sourceRoot":"","sources":["../../../src/snapshots/snapshot-generator.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,kDAA0B;AAE1B,qCAAsC;AAMtC,MAAM,GAAG,GAAG,IAAA,eAAK,EAAC,yBAAyB,CAAC,CAAC;AAEtC,MAAM,wBAAwB,GAAG,CAAC,KAAoB,EAAE,KAAqB,EAAE,KAAoB,EAAE,QAAgB,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,KAAK,EAAC,SAAS,EAAC,EAAE;IACjK,MAAM,aAAa,GAAG,SAAS,CAAC,aAAa,EAAE,CAAC;IAChD,IAAI,aAAa,GAAG,CAAC,IAAI,aAAa,GAAG,QAAQ,KAAK,CAAC,EAAE;QACvD,GAAG,CAAC,sBAAsB,IAAA,eAAQ,EAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACpD,IAAI;YACF,MAAM,QAAQ,GAAG,KAAK,CAAC,cAAc,EAAE,CAAC;YACxC,MAAM,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SAC5B;QAAC,OAAO,GAAQ,EAAE;YACjB,OAAO,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAC;YACzC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;SACpB;KACF;AACH,CAAC,CAAC,CAAC;AAZU,QAAA,wBAAwB,4BAYlC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"snapshot-store.d.ts","sourceRoot":"","sources":["../../../src/snapshots/snapshot-store.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"snapshot-store.d.ts","sourceRoot":"","sources":["../../../src/snapshots/snapshot-store.ts"],"names":[],"mappings":"AAOA,OAAO,EAAU,QAAQ,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEtE,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"}
|
|
@@ -9,8 +9,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
9
9
|
exports.SnapshotStore = void 0;
|
|
10
10
|
const assert_1 = __importDefault(require("assert"));
|
|
11
11
|
const debug_1 = __importDefault(require("debug"));
|
|
12
|
-
const crypto_1 = require("@dxos/crypto");
|
|
13
12
|
const echo_protocol_1 = require("@dxos/echo-protocol");
|
|
13
|
+
const protocols_1 = require("@dxos/protocols");
|
|
14
14
|
const log = (0, debug_1.default)('dxos:snapshot-store');
|
|
15
15
|
/**
|
|
16
16
|
* Stores party snapshots. Takes any `random-access-storage` compatible backend.
|
|
@@ -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._directory.createOrOpen(
|
|
48
|
+
const file = this._directory.createOrOpen(protocols_1.PublicKey.stringify(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));
|
|
@@ -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,
|
|
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,uDAAsE;AACtE,+CAA4C;AAG5C,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,qBAAS,CAAC,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC;QAE/G,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,MAAM,EAAE,CAAC;IACjC,CAAC;CACF;AA9CD,sCA8CC"}
|