@dxos/echo-db 2.33.8-dev.8609bc45 → 2.33.9-dev.6b3d59af
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 +10 -10
- package/dist/src/echo.test.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 +8 -8
- package/dist/src/halo/halo-factory.js.map +1 -1
- package/dist/src/halo/halo-party.d.ts +4 -6
- package/dist/src/halo/halo-party.d.ts.map +1 -1
- package/dist/src/halo/halo-party.js +10 -4
- package/dist/src/halo/halo-party.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/identity-manager.d.ts.map +1 -1
- package/dist/src/halo/identity-manager.js +8 -2
- package/dist/src/halo/identity-manager.js.map +1 -1
- package/dist/src/halo/party-opener.d.ts.map +1 -1
- package/dist/src/halo/party-opener.js +2 -4
- package/dist/src/halo/party-opener.js.map +1 -1
- package/dist/src/halo/preferences.d.ts.map +1 -1
- package/dist/src/halo/preferences.js +3 -6
- package/dist/src/halo/preferences.js.map +1 -1
- package/dist/src/invitations/greeting-initiator.d.ts +5 -4
- package/dist/src/invitations/greeting-initiator.d.ts.map +1 -1
- package/dist/src/invitations/greeting-initiator.js +4 -5
- 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.d.ts +4 -7
- package/dist/src/invitations/greeting-responder.d.ts.map +1 -1
- package/dist/src/invitations/greeting-responder.js +7 -21
- 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/invitation-factory.d.ts +2 -1
- package/dist/src/invitations/invitation-factory.d.ts.map +1 -1
- package/dist/src/invitations/invitation-factory.js +3 -5
- package/dist/src/invitations/invitation-factory.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/packlets/database/data-mirror.test.js +1 -1
- package/dist/src/packlets/database/data-mirror.test.js.map +1 -1
- package/dist/src/packlets/database/item-demuxer.test.js +1 -1
- package/dist/src/packlets/database/item-demuxer.test.js.map +1 -1
- package/dist/src/packlets/database/testing.js +1 -1
- package/dist/src/packlets/database/testing.js.map +1 -1
- package/dist/src/packlets/database/timeframe-clock.d.ts +2 -1
- package/dist/src/packlets/database/timeframe-clock.d.ts.map +1 -1
- package/dist/src/packlets/database/timeframe-clock.js +15 -5
- package/dist/src/packlets/database/timeframe-clock.js.map +1 -1
- package/dist/src/parties/data-party.d.ts +4 -3
- package/dist/src/parties/data-party.d.ts.map +1 -1
- package/dist/src/parties/data-party.js +9 -5
- package/dist/src/parties/data-party.js.map +1 -1
- package/dist/src/parties/data-party.test.js +12 -12
- package/dist/src/parties/data-party.test.js.map +1 -1
- package/dist/src/parties/party-factory.d.ts +2 -4
- package/dist/src/parties/party-factory.d.ts.map +1 -1
- package/dist/src/parties/party-factory.js +14 -11
- 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 +13 -13
- package/dist/src/parties/party-manager.js.map +1 -1
- package/dist/src/parties/party-manager.test.js +16 -12
- 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 -3
- package/dist/src/pipeline/feed-muxer.js.map +1 -1
- package/dist/src/pipeline/feed-muxer.test.js +2 -2
- package/dist/src/pipeline/feed-muxer.test.js.map +1 -1
- package/dist/src/pipeline/message-selector.d.ts +1 -2
- package/dist/src/pipeline/message-selector.d.ts.map +1 -1
- package/dist/src/pipeline/message-selector.js +4 -31
- package/dist/src/pipeline/message-selector.js.map +1 -1
- package/dist/src/pipeline/metadata-store.d.ts +7 -2
- package/dist/src/pipeline/metadata-store.d.ts.map +1 -1
- package/dist/src/pipeline/metadata-store.js +9 -0
- package/dist/src/pipeline/metadata-store.js.map +1 -1
- package/dist/src/pipeline/party-feed-provider.d.ts +2 -2
- package/dist/src/pipeline/party-feed-provider.d.ts.map +1 -1
- package/dist/src/pipeline/party-feed-provider.js +2 -1
- package/dist/src/pipeline/party-feed-provider.js.map +1 -1
- package/dist/src/pipeline/party-pipeline.d.ts +5 -5
- package/dist/src/pipeline/party-pipeline.d.ts.map +1 -1
- package/dist/src/pipeline/party-pipeline.js +6 -7
- package/dist/src/pipeline/party-pipeline.js.map +1 -1
- package/dist/src/pipeline/party-pipeline.test.js +13 -18
- package/dist/src/pipeline/party-pipeline.test.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 +1 -1
- package/src/halo/halo-factory.ts +7 -8
- package/src/halo/halo-party.ts +14 -6
- package/src/halo/halo.ts +3 -1
- package/src/halo/identity-manager.ts +11 -2
- package/src/halo/party-opener.ts +2 -4
- package/src/halo/preferences.ts +4 -8
- package/src/invitations/greeting-initiator.ts +10 -5
- package/src/invitations/greeting-protocol-provider.ts +2 -2
- package/src/invitations/greeting-responder.ts +11 -30
- package/src/invitations/halo-recovery-initiator.ts +3 -3
- package/src/invitations/invitation-descriptor.ts +5 -5
- package/src/invitations/invitation-factory.ts +2 -2
- package/src/invitations/offline-invitation-claimer.ts +3 -3
- package/src/packlets/database/data-mirror.test.ts +2 -2
- package/src/packlets/database/item-demuxer.test.ts +2 -2
- package/src/packlets/database/testing.ts +2 -2
- package/src/packlets/database/timeframe-clock.ts +4 -1
- package/src/parties/data-party.test.ts +12 -12
- package/src/parties/data-party.ts +14 -6
- package/src/parties/party-factory.ts +20 -12
- package/src/parties/party-manager.test.ts +12 -8
- package/src/parties/party-manager.ts +14 -12
- package/src/pipeline/feed-muxer.test.ts +2 -2
- package/src/pipeline/feed-muxer.ts +4 -4
- package/src/pipeline/message-selector.ts +4 -35
- package/src/pipeline/metadata-store.ts +15 -2
- package/src/pipeline/party-feed-provider.ts +2 -2
- package/src/pipeline/party-pipeline.test.ts +13 -19
- package/src/pipeline/party-pipeline.ts +13 -12
- 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
|
@@ -8,7 +8,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
9
|
exports.autoPartyOpener = void 0;
|
|
10
10
|
const debug_1 = __importDefault(require("debug"));
|
|
11
|
-
const credentials_1 = require("@dxos/credentials");
|
|
12
11
|
const util_1 = require("@dxos/util");
|
|
13
12
|
const log = (0, debug_1.default)('dxos:echo-db:party-opener');
|
|
14
13
|
/**
|
|
@@ -22,9 +21,8 @@ const autoPartyOpener = (preferences, partyManager) => {
|
|
|
22
21
|
}
|
|
23
22
|
for (const partyDesc of values) {
|
|
24
23
|
if (!partyManager.parties.some(x => x.key === partyDesc.partyKey)) {
|
|
25
|
-
log(`Auto-opening new Party from HALO: ${partyDesc.partyKey.toHex()}
|
|
26
|
-
|
|
27
|
-
await partyManager.addParty(partyDesc.partyKey, feedHints);
|
|
24
|
+
log(`Auto-opening new Party from HALO: ${partyDesc.partyKey.toHex()}`);
|
|
25
|
+
await partyManager.addParty(partyDesc.partyKey, partyDesc.genesisFeed);
|
|
28
26
|
}
|
|
29
27
|
}
|
|
30
28
|
}));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"party-opener.js","sourceRoot":"","sources":["../../../src/halo/party-opener.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,kDAA0B;AAE1B,
|
|
1
|
+
{"version":3,"file":"party-opener.js","sourceRoot":"","sources":["../../../src/halo/party-opener.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,kDAA0B;AAE1B,qCAA4D;AAK5D,MAAM,GAAG,GAAG,IAAA,eAAK,EAAC,2BAA2B,CAAC,CAAC;AAE/C;;GAEG;AACI,MAAM,eAAe,GAAG,CAAC,WAAwB,EAAE,YAA0B,EAAe,EAAE;IACnG,MAAM,IAAI,GAAG,IAAI,wBAAiB,EAAE,CAAC;IAErC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,0BAA0B,CAAC,KAAK,EAAC,MAAM,EAAC,EAAE;QAC9D,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE;YACxB,OAAO;SACR;QAED,KAAK,MAAM,SAAS,IAAI,MAAM,EAAE;YAC9B,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,SAAS,CAAC,QAAQ,CAAC,EAAE;gBACjE,GAAG,CAAC,qCAAqC,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;gBACvE,MAAM,YAAY,CAAC,QAAQ,CAAC,SAAS,CAAC,QAAQ,EAAE,SAAS,CAAC,WAAW,CAAC,CAAC;aACxE;SACF;IACH,CAAC,CAAC,CAAC,CAAC;IAEJ,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,sBAAsB,CAAC,KAAK,IAAI,EAAE;QACtD,KAAK,MAAM,KAAK,IAAI,YAAY,CAAC,OAAO,EAAE;YACxC,MAAM,YAAY,GAAG,WAAW,CAAC,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAC1D,IAAI,KAAK,CAAC,MAAM,IAAI,CAAC,YAAY,EAAE;gBACjC,GAAG,CAAC,mCAAmC,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;gBAE5D,MAAM,KAAK,CAAC,KAAK,EAAE,CAAC;aACrB;iBAAM,IAAI,CAAC,KAAK,CAAC,MAAM,IAAI,YAAY,EAAE;gBACxC,GAAG,CAAC,iCAAiC,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;gBAE1D,MAAM,KAAK,CAAC,IAAI,EAAE,CAAC;aACpB;SACF;IACH,CAAC,CAAC,CAAC,CAAC;IAEJ,OAAO,GAAG,EAAE,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;AAClC,CAAC,CAAC;AAhCW,QAAA,eAAe,mBAgC1B"}
|
|
@@ -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":"AAWA,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;CAsBpF"}
|
|
@@ -130,8 +130,8 @@ class Preferences {
|
|
|
130
130
|
type: halo_party_1.HALO_PARTY_DESCRIPTOR_TYPE,
|
|
131
131
|
props: {
|
|
132
132
|
publicKey: joinedParty.partyKey.asBuffer(),
|
|
133
|
-
|
|
134
|
-
|
|
133
|
+
genesisFeed: joinedParty.genesisFeed.toHex(),
|
|
134
|
+
subscribed: true
|
|
135
135
|
}
|
|
136
136
|
});
|
|
137
137
|
}
|
|
@@ -140,10 +140,7 @@ class Preferences {
|
|
|
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
142
|
partyKey: protocols_1.PublicKey.from(partyDesc.model.get('publicKey')),
|
|
143
|
-
|
|
144
|
-
...hint,
|
|
145
|
-
publicKey: protocols_1.PublicKey.from(hint.publicKey)
|
|
146
|
-
}))
|
|
143
|
+
genesisFeed: protocols_1.PublicKey.from(partyDesc.model.get('genesisFeed'))
|
|
147
144
|
});
|
|
148
145
|
const result = database.select({ type: halo_party_1.HALO_PARTY_DESCRIPTOR_TYPE }).exec();
|
|
149
146
|
// Wrap the query event so we can have manual control.
|
|
@@ -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;
|
|
1
|
+
{"version":3,"file":"preferences.js","sourceRoot":"","sources":["../../../src/halo/preferences.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,10 @@ 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';
|
|
7
|
+
export interface InvitationResult {
|
|
8
|
+
partyKey: PublicKey;
|
|
9
|
+
genesisFeedKey: PublicKey;
|
|
10
|
+
}
|
|
7
11
|
/**
|
|
8
12
|
* Attempts to connect to a greeting responder to 'redeem' an invitation, potentially with some out-of-band
|
|
9
13
|
* authentication check, in order to be admitted to a Party.
|
|
@@ -30,10 +34,7 @@ export declare class GreetingInitiator {
|
|
|
30
34
|
/**
|
|
31
35
|
* Called after connecting to initiate greeting protocol exchange.
|
|
32
36
|
*/
|
|
33
|
-
redeemInvitation(secretProvider: SecretProvider): Promise<
|
|
34
|
-
partyKey: PublicKey;
|
|
35
|
-
hints: PublicKey[];
|
|
36
|
-
}>;
|
|
37
|
+
redeemInvitation(secretProvider: SecretProvider): Promise<InvitationResult>;
|
|
37
38
|
disconnect(): Promise<void>;
|
|
38
39
|
destroy(): Promise<void>;
|
|
39
40
|
}
|
|
@@ -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;AAC3B,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,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,SAAS,CAAC;IACpB,cAAc,EAAE,SAAS,CAAA;CAC1B;AAED;;;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,gBAAgB,CAAC;IAiE5E,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"}
|
|
@@ -11,7 +11,6 @@ const assert_1 = __importDefault(require("assert"));
|
|
|
11
11
|
const debug_1 = __importDefault(require("debug"));
|
|
12
12
|
const async_1 = require("@dxos/async");
|
|
13
13
|
const credentials_1 = require("@dxos/credentials");
|
|
14
|
-
const crypto_1 = require("@dxos/crypto");
|
|
15
14
|
const network_manager_1 = require("@dxos/network-manager");
|
|
16
15
|
const protocols_1 = require("@dxos/protocols");
|
|
17
16
|
const greeting_protocol_provider_1 = require("./greeting-protocol-provider");
|
|
@@ -62,9 +61,9 @@ class GreetingInitiator {
|
|
|
62
61
|
// Therefore at present the greeter discovers the invitation id from session metadata, via the invitee's peer id.
|
|
63
62
|
// TODO(dboreham): Invitation is actually invitationID.
|
|
64
63
|
const localPeerId = invitation;
|
|
65
|
-
log('Local PeerId:',
|
|
64
|
+
log('Local PeerId:', protocols_1.PublicKey.stringify(localPeerId));
|
|
66
65
|
this._greeterPlugin = new credentials_1.GreetingCommandPlugin(Buffer.from(localPeerId), new credentials_1.Greeter().createMessageHandler());
|
|
67
|
-
log(
|
|
66
|
+
log(protocols_1.PublicKey.stringify(localPeerId), 'connecting to', protocols_1.PublicKey.stringify(swarmKey));
|
|
68
67
|
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);
|
|
69
68
|
await this._networkManager.joinProtocolSwarm({
|
|
70
69
|
topic: protocols_1.PublicKey.from(swarmKey),
|
|
@@ -81,7 +80,6 @@ class GreetingInitiator {
|
|
|
81
80
|
* Called after connecting to initiate greeting protocol exchange.
|
|
82
81
|
*/
|
|
83
82
|
async redeemInvitation(secretProvider) {
|
|
84
|
-
var _a;
|
|
85
83
|
(0, assert_1.default)(this._state === greeting_responder_1.GreetingState.CONNECTED);
|
|
86
84
|
const { swarmKey } = this._invitationDescriptor;
|
|
87
85
|
const responderPeerId = Buffer.from(swarmKey);
|
|
@@ -124,9 +122,10 @@ class GreetingInitiator {
|
|
|
124
122
|
}
|
|
125
123
|
await this.disconnect();
|
|
126
124
|
this._state = greeting_responder_1.GreetingState.SUCCEEDED;
|
|
125
|
+
(0, assert_1.default)(notarizeResponse.genesisFeed);
|
|
127
126
|
return {
|
|
128
127
|
partyKey,
|
|
129
|
-
|
|
128
|
+
genesisFeedKey: notarizeResponse.genesisFeed
|
|
130
129
|
};
|
|
131
130
|
}
|
|
132
131
|
async disconnect() {
|
|
@@ -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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"}
|
|
@@ -4,8 +4,8 @@
|
|
|
4
4
|
//
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.greetingProtocolProvider = void 0;
|
|
7
|
-
const crypto_1 = require("@dxos/crypto");
|
|
8
7
|
const network_manager_1 = require("@dxos/network-manager");
|
|
8
|
+
const protocols_1 = require("@dxos/protocols");
|
|
9
9
|
/**
|
|
10
10
|
* Creates a duplex connection with a single peer using a common rendezvous key as topic.
|
|
11
11
|
* @param peerId
|
|
@@ -17,7 +17,7 @@ const network_manager_1 = require("@dxos/network-manager");
|
|
|
17
17
|
// TODO(dboreham): Write a test to check resources are released (no resource leaks).
|
|
18
18
|
const greetingProtocolProvider = (rendezvousKey, peerId, protocolPlugins) => (0, network_manager_1.protocolFactory)({
|
|
19
19
|
getTopics: () => [rendezvousKey],
|
|
20
|
-
session: { peerId:
|
|
20
|
+
session: { peerId: protocols_1.PublicKey.stringify(peerId) },
|
|
21
21
|
plugins: protocolPlugins
|
|
22
22
|
});
|
|
23
23
|
exports.greetingProtocolProvider = greetingProtocolProvider;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"greeting-protocol-provider.js","sourceRoot":"","sources":["../../../src/invitations/greeting-protocol-provider.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;AAEF,
|
|
1
|
+
{"version":3,"file":"greeting-protocol-provider.js","sourceRoot":"","sources":["../../../src/invitations/greeting-protocol-provider.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;AAEF,2DAAwD;AACxD,+CAA4C;AAE5C;;;;;;GAMG;AACH,6BAA6B;AAC7B,oFAAoF;AAC7E,MAAM,wBAAwB,GAAG,CAAC,aAAkB,EAAE,MAA2B,EAAE,eAAsB,EAAE,EAAE,CAAC,IAAA,iCAAe,EAAC;IACnI,SAAS,EAAE,GAAG,EAAE,CAAC,CAAC,aAAa,CAAC;IAChC,OAAO,EAAE,EAAE,MAAM,EAAE,qBAAS,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE;IAChD,OAAO,EAAE,eAAe;CACzB,CAAC,CAAC;AAJU,QAAA,wBAAwB,4BAIlC"}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
import { Event } from '@dxos/async';
|
|
3
|
-
import {
|
|
3
|
+
import { SecretProvider, SecretValidator, Message as HaloMessage } from '@dxos/credentials';
|
|
4
4
|
import { FeedWriter } from '@dxos/echo-protocol';
|
|
5
5
|
import { NetworkManager } from '@dxos/network-manager';
|
|
6
|
+
import { PublicKey } from '@dxos/protocols';
|
|
6
7
|
import { PartyStateProvider } from '../pipeline';
|
|
7
8
|
import { CredentialsSigner } from '../protocol/credentials-signer';
|
|
8
9
|
import { InvitationOptions } from './common';
|
|
@@ -25,6 +26,7 @@ export declare enum GreetingState {
|
|
|
25
26
|
export declare class GreetingResponder {
|
|
26
27
|
private readonly _networkManager;
|
|
27
28
|
private readonly _partyProcessor;
|
|
29
|
+
private readonly _genesisFeedKey;
|
|
28
30
|
private readonly _credentialsSigner;
|
|
29
31
|
private readonly _credentialsWriter;
|
|
30
32
|
private readonly _greeterPlugin;
|
|
@@ -35,7 +37,7 @@ export declare class GreetingResponder {
|
|
|
35
37
|
* Param: Invitation id
|
|
36
38
|
*/
|
|
37
39
|
readonly connected: Event<any>;
|
|
38
|
-
constructor(_networkManager: NetworkManager, _partyProcessor: PartyStateProvider, _credentialsSigner: CredentialsSigner, _credentialsWriter: FeedWriter<HaloMessage>);
|
|
40
|
+
constructor(_networkManager: NetworkManager, _partyProcessor: PartyStateProvider, _genesisFeedKey: PublicKey, _credentialsSigner: CredentialsSigner, _credentialsWriter: FeedWriter<HaloMessage>);
|
|
39
41
|
/**
|
|
40
42
|
* Accessor for UI to display status to the user.
|
|
41
43
|
* Return the current state for this Greeting Responder (waiting, peer connected, successful auth, auth failed, etc.)
|
|
@@ -69,10 +71,5 @@ export declare class GreetingResponder {
|
|
|
69
71
|
* @private
|
|
70
72
|
*/
|
|
71
73
|
_writeCredentialsToParty(messages: any[]): Promise<HaloMessage[]>;
|
|
72
|
-
/**
|
|
73
|
-
* Callback to gather member key and feed "hints" for the Invitee.
|
|
74
|
-
* @private
|
|
75
|
-
*/
|
|
76
|
-
_gatherHints(): KeyHint[];
|
|
77
74
|
}
|
|
78
75
|
//# sourceMappingURL=greeting-responder.d.ts.map
|
|
@@ -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,
|
|
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,EAKL,cAAc,EACd,eAAe,EACf,OAAO,IAAI,WAAW,EACvB,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAAE,UAAU,EAAY,MAAM,qBAAqB,CAAC;AAC3D,OAAO,EAA0B,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC/E,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,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,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IACnC,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IAhBrC,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,eAAe,EAAE,SAAS,EAC1B,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;CA6ChD"}
|
|
@@ -34,9 +34,10 @@ var GreetingState;
|
|
|
34
34
|
* Upon successful greeting, the peer is admitted into the Party specified in the invitation descriptor.
|
|
35
35
|
*/
|
|
36
36
|
class GreetingResponder {
|
|
37
|
-
constructor(_networkManager, _partyProcessor, _credentialsSigner, _credentialsWriter) {
|
|
37
|
+
constructor(_networkManager, _partyProcessor, _genesisFeedKey, _credentialsSigner, _credentialsWriter) {
|
|
38
38
|
this._networkManager = _networkManager;
|
|
39
39
|
this._partyProcessor = _partyProcessor;
|
|
40
|
+
this._genesisFeedKey = _genesisFeedKey;
|
|
40
41
|
this._credentialsSigner = _credentialsSigner;
|
|
41
42
|
this._credentialsWriter = _credentialsWriter;
|
|
42
43
|
this._swarmKey = (0, crypto_1.randomBytes)();
|
|
@@ -45,7 +46,7 @@ class GreetingResponder {
|
|
|
45
46
|
* Param: Invitation id
|
|
46
47
|
*/
|
|
47
48
|
this.connected = new async_1.Event();
|
|
48
|
-
this._greeter = new credentials_1.Greeter(this._partyProcessor.partyKey,
|
|
49
|
+
this._greeter = new credentials_1.Greeter(this._partyProcessor.partyKey, this._genesisFeedKey, async (messages) => this._writeCredentialsToParty(messages));
|
|
49
50
|
this._greeterPlugin = new credentials_1.GreetingCommandPlugin(Buffer.from(this._swarmKey), this._greeter.createMessageHandler());
|
|
50
51
|
}
|
|
51
52
|
/**
|
|
@@ -89,12 +90,12 @@ class GreetingResponder {
|
|
|
89
90
|
// TODO(dboreham): Add tests for idempotence and transactional integrity over the greet flow.
|
|
90
91
|
this._greeterPlugin.once('peer:joined', (joinedPeerId) => {
|
|
91
92
|
if (joinedPeerId.equals(invitation.id)) {
|
|
92
|
-
log(`Initiator connected: ${
|
|
93
|
+
log(`Initiator connected: ${protocols_1.PublicKey.stringify(joinedPeerId)}`);
|
|
93
94
|
this._state = GreetingState.CONNECTED;
|
|
94
95
|
this.connected.emit(invitation.id);
|
|
95
96
|
}
|
|
96
97
|
else {
|
|
97
|
-
log(`Unexpected initiator connected: ${
|
|
98
|
+
log(`Unexpected initiator connected: ${protocols_1.PublicKey.stringify(joinedPeerId)}`);
|
|
98
99
|
}
|
|
99
100
|
});
|
|
100
101
|
return invitation.id;
|
|
@@ -114,7 +115,7 @@ class GreetingResponder {
|
|
|
114
115
|
topology: new network_manager_1.FullyConnectedTopology(),
|
|
115
116
|
label: 'Greeting responder'
|
|
116
117
|
});
|
|
117
|
-
log(`Greeting for: ${this._partyProcessor.partyKey.toHex()} on swarmKey ${
|
|
118
|
+
log(`Greeting for: ${this._partyProcessor.partyKey.toHex()} on swarmKey ${protocols_1.PublicKey.stringify(this._swarmKey)}`);
|
|
118
119
|
this._state = GreetingState.LISTENING;
|
|
119
120
|
log('Listening');
|
|
120
121
|
return this._swarmKey;
|
|
@@ -159,6 +160,7 @@ class GreetingResponder {
|
|
|
159
160
|
// Place the self-signed messages inside an Envelope, sign then write the signed Envelope to the Party.
|
|
160
161
|
const envelopes = [];
|
|
161
162
|
for (const message of messages) {
|
|
163
|
+
// TODO(dmaretskyi): Refactor to pass in a callback: `await admitKeys(messages)`.
|
|
162
164
|
const admittedKeys = (0, credentials_1.admitsKeys)(message);
|
|
163
165
|
// TODO(telackey): Add hasKey/isMember to PartyProcessor?
|
|
164
166
|
const hasKey = (key) => {
|
|
@@ -176,22 +178,6 @@ class GreetingResponder {
|
|
|
176
178
|
// Return the signed messages to the caller because copies are sent back to the invitee.
|
|
177
179
|
return envelopes;
|
|
178
180
|
}
|
|
179
|
-
/**
|
|
180
|
-
* Callback to gather member key and feed "hints" for the Invitee.
|
|
181
|
-
* @private
|
|
182
|
-
*/
|
|
183
|
-
_gatherHints() {
|
|
184
|
-
(0, assert_1.default)(this._state === GreetingState.SUCCEEDED);
|
|
185
|
-
const memberKeys = this._partyProcessor.memberKeys.map((publicKey) => ({
|
|
186
|
-
publicKey,
|
|
187
|
-
type: credentials_1.KeyType.UNKNOWN
|
|
188
|
-
}));
|
|
189
|
-
const memberFeeds = this._partyProcessor.feedKeys.map((publicKey) => ({
|
|
190
|
-
publicKey,
|
|
191
|
-
type: credentials_1.KeyType.FEED
|
|
192
|
-
}));
|
|
193
|
-
return [...memberKeys, ...memberFeeds];
|
|
194
|
-
}
|
|
195
181
|
}
|
|
196
182
|
exports.GreetingResponder = GreetingResponder;
|
|
197
183
|
//# sourceMappingURL=greeting-responder.js.map
|
|
@@ -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,
|
|
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"}
|
|
@@ -12,10 +12,11 @@ import { InvitationDescriptor } from './invitation-descriptor';
|
|
|
12
12
|
*/
|
|
13
13
|
export declare class InvitationFactory {
|
|
14
14
|
private readonly _partyProcessor;
|
|
15
|
+
private readonly _genesisFeedKey;
|
|
15
16
|
private readonly _credentialsSigner;
|
|
16
17
|
private readonly _credentialsWriter;
|
|
17
18
|
private readonly _networkManager;
|
|
18
|
-
constructor(_partyProcessor: PartyStateProvider, _credentialsSigner: CredentialsSigner, _credentialsWriter: FeedWriter<HaloMessage>, _networkManager: NetworkManager);
|
|
19
|
+
constructor(_partyProcessor: PartyStateProvider, _genesisFeedKey: PublicKey, _credentialsSigner: CredentialsSigner, _credentialsWriter: FeedWriter<HaloMessage>, _networkManager: NetworkManager);
|
|
19
20
|
get isHalo(): boolean;
|
|
20
21
|
createOfflineInvitation(publicKey: PublicKey): Promise<InvitationDescriptor>;
|
|
21
22
|
/**
|
|
@@ -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,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;
|
|
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;IAChC,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IACnC,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IACnC,OAAO,CAAC,QAAQ,CAAC,eAAe;gBAJf,eAAe,EAAE,kBAAkB,EACnC,eAAe,EAAE,SAAS,EAC1B,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;IAwBlH,oBAAoB,CAAE,YAAY,EAAE,MAAM;CAG3C"}
|
|
@@ -16,11 +16,9 @@ const invitation_descriptor_1 = require("./invitation-descriptor");
|
|
|
16
16
|
* Groups together all invitation-related functionality for a single party.
|
|
17
17
|
*/
|
|
18
18
|
class InvitationFactory {
|
|
19
|
-
constructor(_partyProcessor,
|
|
20
|
-
// This needs to be a provider in case this is a backend for the HALO party.
|
|
21
|
-
// Then the identity would be changed after this is instantiated.
|
|
22
|
-
_credentialsSigner, _credentialsWriter, _networkManager) {
|
|
19
|
+
constructor(_partyProcessor, _genesisFeedKey, _credentialsSigner, _credentialsWriter, _networkManager) {
|
|
23
20
|
this._partyProcessor = _partyProcessor;
|
|
21
|
+
this._genesisFeedKey = _genesisFeedKey;
|
|
24
22
|
this._credentialsSigner = _credentialsSigner;
|
|
25
23
|
this._credentialsWriter = _credentialsWriter;
|
|
26
24
|
this._networkManager = _networkManager;
|
|
@@ -40,7 +38,7 @@ class InvitationFactory {
|
|
|
40
38
|
*/
|
|
41
39
|
async createInvitation(authenticationDetails = common_1.defaultInvitationAuthenticator, options = {}) {
|
|
42
40
|
(0, assert_1.default)(this._networkManager);
|
|
43
|
-
const responder = new greeting_responder_1.GreetingResponder(this._networkManager, this._partyProcessor, this._credentialsSigner, this._credentialsWriter);
|
|
41
|
+
const responder = new greeting_responder_1.GreetingResponder(this._networkManager, this._partyProcessor, this._genesisFeedKey, this._credentialsSigner, this._credentialsWriter);
|
|
44
42
|
const { secretValidator, secretProvider } = authenticationDetails;
|
|
45
43
|
const { onFinish, expiration } = options;
|
|
46
44
|
const swarmKey = await responder.start();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"invitation-factory.js","sourceRoot":"","sources":["../../../src/invitations/invitation-factory.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,oDAA4B;AAE5B,mDAAyF;AAOzF,qCAAsG;AACtG,6DAAyD;AACzD,mEAAyF;AAEzF;;GAEG;AACH,MAAa,iBAAiB;IAC5B,YACmB,eAAmC
|
|
1
|
+
{"version":3,"file":"invitation-factory.js","sourceRoot":"","sources":["../../../src/invitations/invitation-factory.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,oDAA4B;AAE5B,mDAAyF;AAOzF,qCAAsG;AACtG,6DAAyD;AACzD,mEAAyF;AAEzF;;GAEG;AACH,MAAa,iBAAiB;IAC5B,YACmB,eAAmC,EACnC,eAA0B,EAC1B,kBAAqC,EACrC,kBAA2C,EAC3C,eAA+B;QAJ/B,oBAAe,GAAf,eAAe,CAAoB;QACnC,oBAAe,GAAf,eAAe,CAAW;QAC1B,uBAAkB,GAAlB,kBAAkB,CAAmB;QACrC,uBAAkB,GAAlB,kBAAkB,CAAyB;QAC3C,oBAAe,GAAf,eAAe,CAAgB;IAC/C,CAAC;IAEJ,IAAI,MAAM;QACR,gDAAgD;QAChD,OAAO,IAAI,CAAC,kBAAkB,CAAC,cAAc,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;IAClG,CAAC;IAED,KAAK,CAAC,uBAAuB,CAAE,SAAoB;QACjD,IAAA,gBAAM,EAAC,CAAC,IAAI,CAAC,MAAM,EAAE,8CAA8C,CAAC,CAAC;QAErE,MAAM,iBAAiB,GAAG,IAAA,0CAA4B,EACpD,IAAI,CAAC,kBAAkB,CAAC,MAAM,EAC9B,IAAI,CAAC,eAAe,CAAC,QAAQ,EAC7B,SAAS,EACT,IAAI,CAAC,kBAAkB,CAAC,cAAc,EAAE,EACxC,IAAI,CAAC,kBAAkB,CAAC,oBAAoB,EAAE,CAC/C,CAAC;QAEF,MAAM,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;QAEvD,OAAO,IAAI,4CAAoB,CAC7B,gDAAwB,CAAC,OAAO,EAChC,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,QAAQ,EAAE,EACxC,iBAAiB,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAC5C,CAAC;IACJ,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,gBAAgB,CACpB,wBAAiD,uCAA8B,EAAE,UAA6B,EAAE;QAChH,IAAA,gBAAM,EAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QAC7B,MAAM,SAAS,GAAG,IAAI,sCAAiB,CACrC,IAAI,CAAC,eAAe,EACpB,IAAI,CAAC,eAAe,EACpB,IAAI,CAAC,eAAe,EACpB,IAAI,CAAC,kBAAkB,EACvB,IAAI,CAAC,kBAAkB,CACxB,CAAC;QAEF,MAAM,EAAE,eAAe,EAAE,cAAc,EAAE,GAAG,qBAAqB,CAAC;QAClE,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC;QAEzC,MAAM,QAAQ,GAAG,MAAM,SAAS,CAAC,KAAK,EAAE,CAAC;QACzC,MAAM,UAAU,GAAG,MAAM,SAAS,CAAC,MAAM,CAAC,eAAe,EAAE,cAAc,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC;QAEjG,OAAO,IAAI,4CAAoB,CAC7B,gDAAwB,CAAC,WAAW,EACpC,QAAQ,EACR,UAAU,EACV,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CACxD,CAAC;IACJ,CAAC;IAED,oBAAoB,CAAE,YAAoB;QACxC,OAAO,IAAI,CAAC,eAAe,CAAC,oBAAoB,CAAC,YAAY,CAAC,CAAC;IACjE,CAAC;CACF;AAjED,8CAiEC"}
|
|
@@ -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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"}
|
|
@@ -28,7 +28,7 @@ describe('DataMirror', () => {
|
|
|
28
28
|
const process = itemDemuxer.open();
|
|
29
29
|
feed.written.on(([msg, meta]) => process({
|
|
30
30
|
data: msg,
|
|
31
|
-
meta: { ...meta, memberKey: protocols_1.PublicKey.random(), timeframe: new
|
|
31
|
+
meta: { ...meta, memberKey: protocols_1.PublicKey.random(), timeframe: new protocols_1.Timeframe() }
|
|
32
32
|
}));
|
|
33
33
|
const dataServiceHost = new data_service_host_1.DataServiceHost(itemManager, itemDemuxer);
|
|
34
34
|
const dataServiceRouter = new data_service_router_1.DataServiceRouter();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-mirror.test.js","sourceRoot":"","sources":["../../../../src/packlets/database/data-mirror.test.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;AAEF,oDAA4B;AAC5B,iCAAmC;AAEnC,uCAA6C;AAC7C,
|
|
1
|
+
{"version":3,"file":"data-mirror.test.js","sourceRoot":"","sources":["../../../../src/packlets/database/data-mirror.test.ts"],"names":[],"mappings":"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"}
|