@dxos/client-services 0.1.9 → 0.1.11
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/index.d.ts +0 -1
- package/dist/src/index.d.ts.map +1 -1
- package/dist/src/index.js +0 -1
- package/dist/src/index.js.map +1 -1
- package/dist/src/packlets/deprecated/invitations.d.ts +4 -4
- package/dist/src/packlets/deprecated/invitations.d.ts.map +1 -1
- package/dist/src/packlets/deprecated/profile.d.ts.map +1 -1
- package/dist/src/packlets/deprecated/profile.js +21 -9
- package/dist/src/packlets/deprecated/profile.js.map +1 -1
- package/dist/src/packlets/deprecated/space.d.ts.map +1 -1
- package/dist/src/packlets/deprecated/space.js +18 -15
- package/dist/src/packlets/deprecated/space.js.map +1 -1
- package/dist/src/packlets/deprecated/system.d.ts +3 -1
- package/dist/src/packlets/deprecated/system.d.ts.map +1 -1
- package/dist/src/packlets/deprecated/system.js +4 -3
- package/dist/src/packlets/deprecated/system.js.map +1 -1
- package/dist/src/packlets/devtools/devtools.d.ts +1 -1
- package/dist/src/packlets/devtools/devtools.d.ts.map +1 -1
- package/dist/src/packlets/devtools/feeds.d.ts.map +1 -1
- package/dist/src/packlets/devtools/feeds.js +2 -1
- package/dist/src/packlets/devtools/feeds.js.map +1 -1
- package/dist/src/packlets/devtools/network.js +3 -3
- package/dist/src/packlets/devtools/network.js.map +1 -1
- package/dist/src/packlets/devtools/spaces.d.ts.map +1 -1
- package/dist/src/packlets/devtools/spaces.js +2 -1
- package/dist/src/packlets/devtools/spaces.js.map +1 -1
- package/dist/src/packlets/identity/authenticator.js +3 -3
- package/dist/src/packlets/identity/authenticator.js.map +1 -1
- package/dist/src/packlets/identity/identity-manager.d.ts +5 -2
- package/dist/src/packlets/identity/identity-manager.d.ts.map +1 -1
- package/dist/src/packlets/identity/identity-manager.js +13 -9
- package/dist/src/packlets/identity/identity-manager.js.map +1 -1
- package/dist/src/packlets/identity/identity.d.ts +4 -1
- package/dist/src/packlets/identity/identity.d.ts.map +1 -1
- package/dist/src/packlets/identity/identity.js +8 -2
- package/dist/src/packlets/identity/identity.js.map +1 -1
- package/dist/src/packlets/invitations/halo-invitations-handler.d.ts +2 -2
- package/dist/src/packlets/invitations/halo-invitations-handler.d.ts.map +1 -1
- package/dist/src/packlets/invitations/halo-invitations-handler.js +17 -17
- package/dist/src/packlets/invitations/halo-invitations-handler.js.map +1 -1
- package/dist/src/packlets/invitations/invitations-handler.d.ts +6 -4
- package/dist/src/packlets/invitations/invitations-handler.d.ts.map +1 -1
- package/dist/src/packlets/invitations/invitations-handler.js.map +1 -1
- package/dist/src/packlets/invitations/invitations-proxy.d.ts +2 -2
- package/dist/src/packlets/invitations/invitations-proxy.d.ts.map +1 -1
- package/dist/src/packlets/invitations/invitations-proxy.js +2 -2
- package/dist/src/packlets/invitations/invitations-proxy.js.map +1 -1
- package/dist/src/packlets/invitations/invitations-service.js +12 -12
- package/dist/src/packlets/invitations/invitations-service.js.map +1 -1
- package/dist/src/packlets/invitations/invitations.d.ts +6 -9
- package/dist/src/packlets/invitations/invitations.d.ts.map +1 -1
- package/dist/src/packlets/invitations/invitations.js +6 -5
- package/dist/src/packlets/invitations/invitations.js.map +1 -1
- package/dist/src/packlets/invitations/space-invitations-handler.d.ts +2 -2
- package/dist/src/packlets/invitations/space-invitations-handler.d.ts.map +1 -1
- package/dist/src/packlets/invitations/space-invitations-handler.js +28 -20
- package/dist/src/packlets/invitations/space-invitations-handler.js.map +1 -1
- package/dist/src/packlets/services/service-context.d.ts +3 -2
- package/dist/src/packlets/services/service-context.d.ts.map +1 -1
- package/dist/src/packlets/services/service-context.js +15 -8
- package/dist/src/packlets/services/service-context.js.map +1 -1
- package/dist/src/packlets/services/service-definitions.d.ts +1 -1
- package/dist/src/packlets/services/service-definitions.d.ts.map +1 -1
- package/dist/src/packlets/services/service-host.d.ts +8 -4
- package/dist/src/packlets/services/service-host.d.ts.map +1 -1
- package/dist/src/packlets/services/service-host.js +33 -26
- package/dist/src/packlets/services/service-host.js.map +1 -1
- package/dist/src/packlets/services/service-proxy.d.ts.map +1 -1
- package/dist/src/packlets/services/service-proxy.js +1 -1
- package/dist/src/packlets/services/service-proxy.js.map +1 -1
- package/dist/src/packlets/services/service-registry.test.js +3 -3
- package/dist/src/packlets/services/service-registry.test.js.map +1 -1
- package/dist/src/packlets/storage/storage.d.ts +1 -1
- package/dist/src/packlets/storage/storage.d.ts.map +1 -1
- package/dist/src/packlets/storage/storage.js +6 -6
- package/dist/src/packlets/storage/storage.js.map +1 -1
- package/dist/src/packlets/testing/test-builder.js +1 -1
- package/dist/src/packlets/testing/test-builder.js.map +1 -1
- package/dist/src/packlets/vault/iframe-runtime.d.ts +1 -1
- package/dist/src/packlets/vault/iframe-runtime.d.ts.map +1 -1
- package/dist/src/packlets/vault/services.d.ts +2 -2
- package/dist/src/packlets/vault/services.d.ts.map +1 -1
- package/dist/src/packlets/vault/worker-runtime.d.ts +1 -1
- package/dist/src/packlets/vault/worker-runtime.d.ts.map +1 -1
- package/dist/src/packlets/vault/worker-session.d.ts +1 -1
- package/dist/src/packlets/vault/worker-session.d.ts.map +1 -1
- package/dist/src/packlets/vault/worker-session.js +3 -3
- package/dist/src/packlets/vault/worker-session.js.map +1 -1
- package/package.json +39 -29
- package/src/index.ts +0 -2
- package/src/packlets/deprecated/profile.ts +11 -3
- package/src/packlets/deprecated/space.ts +21 -20
- package/src/packlets/deprecated/system.ts +5 -3
- package/src/packlets/devtools/feeds.ts +2 -1
- package/src/packlets/devtools/network.ts +3 -3
- package/src/packlets/devtools/spaces.ts +2 -1
- package/src/packlets/identity/identity-manager.ts +14 -5
- package/src/packlets/identity/identity.ts +12 -3
- package/src/packlets/invitations/halo-invitations-handler.ts +6 -6
- package/src/packlets/invitations/invitations-handler.ts +6 -3
- package/src/packlets/invitations/invitations-proxy.ts +2 -2
- package/src/packlets/invitations/invitations-service.ts +2 -2
- package/src/packlets/invitations/invitations.ts +6 -11
- package/src/packlets/invitations/space-invitations-handler.ts +21 -9
- package/src/packlets/services/service-context.ts +15 -5
- package/src/packlets/services/service-host.ts +48 -36
- package/src/packlets/services/service-proxy.ts +1 -1
- package/src/packlets/storage/storage.ts +6 -6
- package/src/packlets/testing/test-builder.ts +1 -1
- package/testing.d.ts +11 -0
- package/testing.js +5 -0
- package/dist/src/errors.d.ts +0 -8
- package/dist/src/errors.d.ts.map +0 -1
- package/dist/src/errors.js +0 -21
- package/dist/src/errors.js.map +0 -1
- package/src/errors.ts +0 -19
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"identity.d.ts","sourceRoot":"","sources":["../../../../src/packlets/identity/identity.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAEL,gBAAgB,
|
|
1
|
+
{"version":3,"file":"identity.d.ts","sourceRoot":"","sources":["../../../../src/packlets/identity/identity.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAEL,gBAAgB,EAIjB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAEtC,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AAEhD,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAGvC,OAAO,EAAgB,eAAe,EAAE,MAAM,6CAA6C,CAAC;AAC5F,OAAO,EAAE,wBAAwB,EAAE,MAAM,6CAA6C,CAAC;AACvF,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAExC,MAAM,MAAM,cAAc,GAAG;IAC3B,WAAW,EAAE,SAAS,CAAC;IACvB,SAAS,EAAE,SAAS,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,KAAK,CAAC;CACd,CAAC;AAEF;;GAEG;AACH,qBAAa,QAAQ;IACnB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAQ;IAC/B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IACjC,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAqB;IACzD,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAsB;IAE3D,SAAgB,WAAW,EAAE,SAAS,CAAC;IACvC,SAAgB,SAAS,EAAE,SAAS,CAAC;IAErC,SAAgB,WAAW,cAAe;gBAE9B,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,SAAS,EAAE,EAAE,cAAc;IAoBrE,IAAI,oBAAoB,IAAI,UAAU,CAAC,SAAS,CAAC,CAEhD;IAEK,IAAI;IAIJ,KAAK;IAIL,KAAK;IAMX,IAAI,eAAe,IAAI,eAAe,GAAG,SAAS,CAEjD;IAED;;OAEG;IACH,IAAI,eAAe,wEAElB;IAED,IAAI,YAAY,cAEf;IAED,IAAI,kBAAkB,cAErB;IAED,IAAI,YAAY,IAAI,QAAQ,CAE3B;IAED,uBAAuB,IAAI,wBAAwB;IAQnD;;;OAGG;IACH,2BAA2B,IAAI,gBAAgB;IAS/C;;OAEG;IACH,yBAAyB,IAAI,gBAAgB;IAIvC,WAAW,CAAC,EAAE,SAAS,EAAE,cAAc,EAAE,WAAW,EAAE,EAAE,wBAAwB;CA2CvF"}
|
|
@@ -25,9 +25,12 @@ class Identity {
|
|
|
25
25
|
this.identityKey = identityKey;
|
|
26
26
|
this.deviceKey = deviceKey;
|
|
27
27
|
this._deviceStateMachine = new credentials_1.DeviceStateMachine(this.identityKey, this.deviceKey);
|
|
28
|
-
|
|
28
|
+
this._profileStateMachine = new credentials_1.ProfileStateMachine(this.identityKey);
|
|
29
|
+
// Process halo-specific credentials.
|
|
29
30
|
this._space.onCredentialProcessed.set(async (credential) => {
|
|
31
|
+
// Save device keychain credential when processed by the space state machine.
|
|
30
32
|
await this._deviceStateMachine.process(credential);
|
|
33
|
+
await this._profileStateMachine.process(credential);
|
|
31
34
|
this.stateUpdate.emit();
|
|
32
35
|
});
|
|
33
36
|
}
|
|
@@ -45,6 +48,9 @@ class Identity {
|
|
|
45
48
|
await this._deviceStateMachine.deviceChainReady.wait();
|
|
46
49
|
// TODO(dmaretskyi): Should we also wait for our feeds to be admitted?
|
|
47
50
|
}
|
|
51
|
+
get profileDocument() {
|
|
52
|
+
return this._profileStateMachine.profile;
|
|
53
|
+
}
|
|
48
54
|
/**
|
|
49
55
|
* @test-only
|
|
50
56
|
*/
|
|
@@ -89,7 +95,7 @@ class Identity {
|
|
|
89
95
|
deviceKey,
|
|
90
96
|
controlFeedKey,
|
|
91
97
|
dataFeedKey
|
|
92
|
-
}, { file: "packages/sdk/client-services/src/packlets/identity/identity.ts", line:
|
|
98
|
+
}, { file: "packages/sdk/client-services/src/packlets/identity/identity.ts", line: 137, scope: this, bugcheck: "If you see this message then it means that the source code preprocessor for @dxos/log is broken. It probably has misinterpreted an unrelated call for a logger invocation.", callSite: (fn, args) => fn(...args) });
|
|
93
99
|
const signer = this.getIdentityCredentialSigner();
|
|
94
100
|
await (0, feed_store_1.writeMessages)(this.controlPipeline.writer, [
|
|
95
101
|
await signer.createCredential({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"identity.js","sourceRoot":"","sources":["../../../../src/packlets/identity/identity.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,oDAA4B;AAE5B,uCAAoC;AACpC,
|
|
1
|
+
{"version":3,"file":"identity.js","sourceRoot":"","sources":["../../../../src/packlets/identity/identity.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { NetworkManager } from '@dxos/network-manager';
|
|
2
2
|
import { Invitation } from '@dxos/protocols/proto/dxos/client/services';
|
|
3
3
|
import { IdentityManager } from '../identity';
|
|
4
|
-
import { AuthenticatingInvitationProvider,
|
|
4
|
+
import { AuthenticatingInvitationProvider, CancellableInvitationObservable } from './invitations';
|
|
5
5
|
import { AbstractInvitationsHandler, InvitationsOptions } from './invitations-handler';
|
|
6
6
|
/**
|
|
7
7
|
* Handles the life-cycle of Halo invitations between peers.
|
|
@@ -12,7 +12,7 @@ export declare class HaloInvitationsHandler extends AbstractInvitationsHandler {
|
|
|
12
12
|
/**
|
|
13
13
|
* Creates an invitation and listens for a join request from the invited (guest) peer.
|
|
14
14
|
*/
|
|
15
|
-
createInvitation(context: void, options?: InvitationsOptions):
|
|
15
|
+
createInvitation(context: void, options?: InvitationsOptions): CancellableInvitationObservable;
|
|
16
16
|
/**
|
|
17
17
|
* Waits for the host peer (inviter) to accept our join request.
|
|
18
18
|
* The local guest peer (invitee) then sends the local halo invitation to the host,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"halo-invitations-handler.d.ts","sourceRoot":"","sources":["../../../../src/packlets/invitations/halo-invitations-handler.ts"],"names":[],"mappings":"AAWA,OAAO,EAAyB,cAAc,EAAiC,MAAM,uBAAuB,CAAC;AAG7G,OAAO,EAAE,UAAU,EAAE,MAAM,4CAA4C,CAAC;AAGxE,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EACL,gCAAgC,EAChC,
|
|
1
|
+
{"version":3,"file":"halo-invitations-handler.d.ts","sourceRoot":"","sources":["../../../../src/packlets/invitations/halo-invitations-handler.ts"],"names":[],"mappings":"AAWA,OAAO,EAAyB,cAAc,EAAiC,MAAM,uBAAuB,CAAC;AAG7G,OAAO,EAAE,UAAU,EAAE,MAAM,4CAA4C,CAAC;AAGxE,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EACL,gCAAgC,EAChC,+BAA+B,EAKhC,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,0BAA0B,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAEvF;;GAEG;AAEH,qBAAa,sBAAuB,SAAQ,0BAA0B;IAIlE,OAAO,CAAC,QAAQ,CAAC,gBAAgB;gBADjC,cAAc,EAAE,cAAc,EACb,gBAAgB,EAAE,eAAe;IAKpD;;OAEG;IACH,gBAAgB,CAAC,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,EAAE,kBAAkB,GAAG,+BAA+B;IA+G9F;;;;OAIG;IACH,gBAAgB,CAAC,UAAU,EAAE,UAAU,EAAE,OAAO,CAAC,EAAE,kBAAkB,GAAG,gCAAgC;CA8FzG"}
|
|
@@ -36,13 +36,13 @@ class HaloInvitationsHandler extends invitations_handler_1.AbstractInvitationsHa
|
|
|
36
36
|
createInvitation(context, options) {
|
|
37
37
|
var _a;
|
|
38
38
|
let swarmConnection;
|
|
39
|
-
const { type, timeout = invitations_1.INVITATION_TIMEOUT } = options !== null && options !== void 0 ? options : {};
|
|
39
|
+
const { type, timeout = invitations_1.INVITATION_TIMEOUT, swarmKey } = options !== null && options !== void 0 ? options : {};
|
|
40
40
|
(0, assert_1.default)(type !== services_1.Invitation.Type.OFFLINE);
|
|
41
41
|
const identity = (_a = this._identityManager.identity) !== null && _a !== void 0 ? _a : (0, debug_1.failUndefined)();
|
|
42
42
|
const invitation = {
|
|
43
43
|
type,
|
|
44
44
|
invitationId: keys_1.PublicKey.random().toHex(),
|
|
45
|
-
swarmKey: keys_1.PublicKey.random(),
|
|
45
|
+
swarmKey: swarmKey !== null && swarmKey !== void 0 ? swarmKey : keys_1.PublicKey.random(),
|
|
46
46
|
authenticationCode: (0, credentials_1.generatePasscode)(invitations_1.AUTHENTICATION_CODE_LENGTH)
|
|
47
47
|
};
|
|
48
48
|
// TODO(burdon): Stop anything pending.
|
|
@@ -63,7 +63,7 @@ class HaloInvitationsHandler extends invitations_handler_1.AbstractInvitationsHa
|
|
|
63
63
|
var _a, _b;
|
|
64
64
|
(0, log_1.log)('responding with admission offer', {
|
|
65
65
|
host: identity.deviceKey
|
|
66
|
-
}, { file: "packages/sdk/client-services/src/packlets/invitations/halo-invitations-handler.ts", line: 73 });
|
|
66
|
+
}, { file: "packages/sdk/client-services/src/packlets/invitations/halo-invitations-handler.ts", line: 73, scope: this, bugcheck: "If you see this message then it means that the source code preprocessor for @dxos/log is broken. It probably has misinterpreted an unrelated call for a logger invocation.", callSite: (fn, args) => fn(...args) });
|
|
67
67
|
// TODO(burdon): Is this the right place to set this state?
|
|
68
68
|
(_b = (_a = observable.callback).onAuthenticating) === null || _b === void 0 ? void 0 : _b.call(_a, invitation);
|
|
69
69
|
return {
|
|
@@ -73,7 +73,7 @@ class HaloInvitationsHandler extends invitations_handler_1.AbstractInvitationsHa
|
|
|
73
73
|
};
|
|
74
74
|
},
|
|
75
75
|
authenticate: async ({ authenticationCode: code }) => {
|
|
76
|
-
(0, log_1.log)('received authentication request', { authenticationCode: code }, { file: "packages/sdk/client-services/src/packlets/invitations/halo-invitations-handler.ts", line: 87 });
|
|
76
|
+
(0, log_1.log)('received authentication request', { authenticationCode: code }, { file: "packages/sdk/client-services/src/packlets/invitations/halo-invitations-handler.ts", line: 87, scope: this, bugcheck: "If you see this message then it means that the source code preprocessor for @dxos/log is broken. It probably has misinterpreted an unrelated call for a logger invocation.", callSite: (fn, args) => fn(...args) });
|
|
77
77
|
authenticationCode = code;
|
|
78
78
|
},
|
|
79
79
|
// TODO(burdon): Not used: controlFeedKey, dataFeedKey.
|
|
@@ -86,7 +86,7 @@ class HaloInvitationsHandler extends invitations_handler_1.AbstractInvitationsHa
|
|
|
86
86
|
throw new Error('authentication code not set');
|
|
87
87
|
}
|
|
88
88
|
}
|
|
89
|
-
(0, log_1.log)('writing guest credentials', { host: identity.deviceKey, guest: credentials.deviceKey }, { file: "packages/sdk/client-services/src/packlets/invitations/halo-invitations-handler.ts", line: 104 });
|
|
89
|
+
(0, log_1.log)('writing guest credentials', { host: identity.deviceKey, guest: credentials.deviceKey }, { file: "packages/sdk/client-services/src/packlets/invitations/halo-invitations-handler.ts", line: 104, scope: this, bugcheck: "If you see this message then it means that the source code preprocessor for @dxos/log is broken. It probably has misinterpreted an unrelated call for a logger invocation.", callSite: (fn, args) => fn(...args) });
|
|
90
90
|
// TODO(burdon): Check if already admitted.
|
|
91
91
|
await identity.admitDevice(credentials);
|
|
92
92
|
// Updating credentials complete.
|
|
@@ -104,15 +104,15 @@ class HaloInvitationsHandler extends invitations_handler_1.AbstractInvitationsHa
|
|
|
104
104
|
});
|
|
105
105
|
try {
|
|
106
106
|
await peer.open();
|
|
107
|
-
(0, log_1.log)('connected', { host: identity.deviceKey }, { file: "packages/sdk/client-services/src/packlets/invitations/halo-invitations-handler.ts", line: 123 });
|
|
107
|
+
(0, log_1.log)('connected', { host: identity.deviceKey }, { file: "packages/sdk/client-services/src/packlets/invitations/halo-invitations-handler.ts", line: 123, scope: this, bugcheck: "If you see this message then it means that the source code preprocessor for @dxos/log is broken. It probably has misinterpreted an unrelated call for a logger invocation.", callSite: (fn, args) => fn(...args) });
|
|
108
108
|
(_b = (_a = observable.callback).onConnected) === null || _b === void 0 ? void 0 : _b.call(_a, invitation);
|
|
109
109
|
const deviceKey = await complete.wait({ timeout });
|
|
110
|
-
(0, log_1.log)('admitted guest', { host: identity.deviceKey, guest: deviceKey }, { file: "packages/sdk/client-services/src/packlets/invitations/halo-invitations-handler.ts", line: 126 });
|
|
110
|
+
(0, log_1.log)('admitted guest', { host: identity.deviceKey, guest: deviceKey }, { file: "packages/sdk/client-services/src/packlets/invitations/halo-invitations-handler.ts", line: 126, scope: this, bugcheck: "If you see this message then it means that the source code preprocessor for @dxos/log is broken. It probably has misinterpreted an unrelated call for a logger invocation.", callSite: (fn, args) => fn(...args) });
|
|
111
111
|
observable.callback.onSuccess(invitation);
|
|
112
112
|
}
|
|
113
113
|
catch (err) {
|
|
114
114
|
if (!observable.cancelled) {
|
|
115
|
-
log_1.log.error('failed', err, { file: "packages/sdk/client-services/src/packlets/invitations/halo-invitations-handler.ts", line: 130 });
|
|
115
|
+
log_1.log.error('failed', err, { file: "packages/sdk/client-services/src/packlets/invitations/halo-invitations-handler.ts", line: 130, scope: this, bugcheck: "If you see this message then it means that the source code preprocessor for @dxos/log is broken. It probably has misinterpreted an unrelated call for a logger invocation.", callSite: (fn, args) => fn(...args) });
|
|
116
116
|
observable.callback.onError(err);
|
|
117
117
|
}
|
|
118
118
|
}
|
|
@@ -126,7 +126,7 @@ class HaloInvitationsHandler extends invitations_handler_1.AbstractInvitationsHa
|
|
|
126
126
|
var _a, _b;
|
|
127
127
|
const topic = invitation.swarmKey;
|
|
128
128
|
const peerId = keys_1.PublicKey.random(); // Use anonymous key.
|
|
129
|
-
swarmConnection = await this._networkManager.
|
|
129
|
+
swarmConnection = await this._networkManager.joinSwarm({
|
|
130
130
|
topic,
|
|
131
131
|
peerId: topic,
|
|
132
132
|
protocol: (0, network_manager_1.createProtocolFactory)(topic, peerId, [plugin]),
|
|
@@ -170,18 +170,18 @@ class HaloInvitationsHandler extends invitations_handler_1.AbstractInvitationsHa
|
|
|
170
170
|
if (++connectionCount > 1) {
|
|
171
171
|
throw new Error(`multiple connections detected: ${connectionCount}`);
|
|
172
172
|
}
|
|
173
|
-
(0, log_1.log)('connected', {}, { file: "packages/sdk/client-services/src/packlets/invitations/halo-invitations-handler.ts", line: 194 });
|
|
173
|
+
(0, log_1.log)('connected', {}, { file: "packages/sdk/client-services/src/packlets/invitations/halo-invitations-handler.ts", line: 194, scope: this, bugcheck: "If you see this message then it means that the source code preprocessor for @dxos/log is broken. It probably has misinterpreted an unrelated call for a logger invocation.", callSite: (fn, args) => fn(...args) });
|
|
174
174
|
(_b = (_a = observable.callback).onConnected) === null || _b === void 0 ? void 0 : _b.call(_a, invitation);
|
|
175
175
|
// 1. Send request.
|
|
176
|
-
(0, log_1.log)('sending admission request', {}, { file: "packages/sdk/client-services/src/packlets/invitations/halo-invitations-handler.ts", line: 198 });
|
|
176
|
+
(0, log_1.log)('sending admission request', {}, { file: "packages/sdk/client-services/src/packlets/invitations/halo-invitations-handler.ts", line: 198, scope: this, bugcheck: "If you see this message then it means that the source code preprocessor for @dxos/log is broken. It probably has misinterpreted an unrelated call for a logger invocation.", callSite: (fn, args) => fn(...args) });
|
|
177
177
|
const { identityKey, haloSpaceKey, genesisFeedKey } = await peer.rpc.HaloHostService.requestAdmission();
|
|
178
178
|
// 2. Get authentication code.
|
|
179
179
|
// TODO(burdon): Test timeout (options for timeouts at different steps).
|
|
180
180
|
if (invitation.type === undefined || invitation.type === services_1.Invitation.Type.INTERACTIVE) {
|
|
181
|
-
(0, log_1.log)('guest waiting for authentication code...', {}, { file: "packages/sdk/client-services/src/packlets/invitations/halo-invitations-handler.ts", line: 204 });
|
|
181
|
+
(0, log_1.log)('guest waiting for authentication code...', {}, { file: "packages/sdk/client-services/src/packlets/invitations/halo-invitations-handler.ts", line: 204, scope: this, bugcheck: "If you see this message then it means that the source code preprocessor for @dxos/log is broken. It probably has misinterpreted an unrelated call for a logger invocation.", callSite: (fn, args) => fn(...args) });
|
|
182
182
|
(_d = (_c = observable.callback).onAuthenticating) === null || _d === void 0 ? void 0 : _d.call(_c, invitation);
|
|
183
183
|
const authenticationCode = await authenticated.wait({ timeout });
|
|
184
|
-
(0, log_1.log)('sending authentication request', {}, { file: "packages/sdk/client-services/src/packlets/invitations/halo-invitations-handler.ts", line: 207 });
|
|
184
|
+
(0, log_1.log)('sending authentication request', {}, { file: "packages/sdk/client-services/src/packlets/invitations/halo-invitations-handler.ts", line: 207, scope: this, bugcheck: "If you see this message then it means that the source code preprocessor for @dxos/log is broken. It probably has misinterpreted an unrelated call for a logger invocation.", callSite: (fn, args) => fn(...args) });
|
|
185
185
|
await peer.rpc.HaloHostService.authenticate({ authenticationCode });
|
|
186
186
|
}
|
|
187
187
|
// 3. Create local identity.
|
|
@@ -192,15 +192,15 @@ class HaloInvitationsHandler extends invitations_handler_1.AbstractInvitationsHa
|
|
|
192
192
|
haloGenesisFeedKey: genesisFeedKey
|
|
193
193
|
});
|
|
194
194
|
// 4. Send admission credentials to host (with local identity keys).
|
|
195
|
-
(0, log_1.log)('presenting admission credentials', { guest: identity.deviceKey, identityKey }, { file: "packages/sdk/client-services/src/packlets/invitations/halo-invitations-handler.ts", line: 220 });
|
|
195
|
+
(0, log_1.log)('presenting admission credentials', { guest: identity.deviceKey, identityKey }, { file: "packages/sdk/client-services/src/packlets/invitations/halo-invitations-handler.ts", line: 220, scope: this, bugcheck: "If you see this message then it means that the source code preprocessor for @dxos/log is broken. It probably has misinterpreted an unrelated call for a logger invocation.", callSite: (fn, args) => fn(...args) });
|
|
196
196
|
await peer.rpc.HaloHostService.presentAdmissionCredentials(identity.getAdmissionCredentials());
|
|
197
197
|
// 5. Success.
|
|
198
|
-
(0, log_1.log)('admitted by host', { guest: identity.deviceKey, identityKey }, { file: "packages/sdk/client-services/src/packlets/invitations/halo-invitations-handler.ts", line: 224 });
|
|
198
|
+
(0, log_1.log)('admitted by host', { guest: identity.deviceKey, identityKey }, { file: "packages/sdk/client-services/src/packlets/invitations/halo-invitations-handler.ts", line: 224, scope: this, bugcheck: "If you see this message then it means that the source code preprocessor for @dxos/log is broken. It probably has misinterpreted an unrelated call for a logger invocation.", callSite: (fn, args) => fn(...args) });
|
|
199
199
|
complete.wake(identityKey);
|
|
200
200
|
}
|
|
201
201
|
catch (err) {
|
|
202
202
|
if (!observable.cancelled) {
|
|
203
|
-
log_1.log.warn('failed', err, { file: "packages/sdk/client-services/src/packlets/invitations/halo-invitations-handler.ts", line: 228 });
|
|
203
|
+
log_1.log.warn('failed', err, { file: "packages/sdk/client-services/src/packlets/invitations/halo-invitations-handler.ts", line: 228, scope: this, bugcheck: "If you see this message then it means that the source code preprocessor for @dxos/log is broken. It probably has misinterpreted an unrelated call for a logger invocation.", callSite: (fn, args) => fn(...args) });
|
|
204
204
|
observable.callback.onError(err);
|
|
205
205
|
}
|
|
206
206
|
}
|
|
@@ -213,7 +213,7 @@ class HaloInvitationsHandler extends invitations_handler_1.AbstractInvitationsHa
|
|
|
213
213
|
(0, assert_1.default)(invitation.swarmKey);
|
|
214
214
|
const topic = invitation.swarmKey;
|
|
215
215
|
const peerId = keys_1.PublicKey.random(); // Use anonymous key.
|
|
216
|
-
swarmConnection = await this._networkManager.
|
|
216
|
+
swarmConnection = await this._networkManager.joinSwarm({
|
|
217
217
|
topic,
|
|
218
218
|
peerId: keys_1.PublicKey.random(),
|
|
219
219
|
protocol: (0, network_manager_1.createProtocolFactory)(topic, peerId, [plugin]),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"halo-invitations-handler.js","sourceRoot":"","sources":["../../../../src/packlets/invitations/halo-invitations-handler.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,oDAA4B;AAE5B,uCAA6C;AAC7C,mDAAqD;AACrD,uCAA4C;AAC5C,qCAAuC;AACvC,mCAAgC;AAChC,2DAA6G;AAC7G,mEAAuE;AACvE,+CAAyC;AACzC,yEAAwE;AACxE,mCAA+C;AAG/C,+CAOuB;AACvB,+DAAuF;AAEvF;;GAEG;AACH,qDAAqD;AACrD,MAAa,sBAAuB,SAAQ,gDAA0B;IACpE,kBAAkB;IAClB,YACE,cAA8B,EACb,gBAAiC;QAElD,KAAK,CAAC,cAAc,CAAC,CAAC;QAFL,qBAAgB,GAAhB,gBAAgB,CAAiB;IAGpD,CAAC;IAED;;OAEG;IACH,gBAAgB,CAAC,OAAa,EAAE,OAA4B;;QAC1D,IAAI,eAA4C,CAAC;QACjD,MAAM,EAAE,IAAI,EAAE,OAAO,GAAG,gCAAkB,EAAE,GAAG,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"halo-invitations-handler.js","sourceRoot":"","sources":["../../../../src/packlets/invitations/halo-invitations-handler.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,oDAA4B;AAE5B,uCAA6C;AAC7C,mDAAqD;AACrD,uCAA4C;AAC5C,qCAAuC;AACvC,mCAAgC;AAChC,2DAA6G;AAC7G,mEAAuE;AACvE,+CAAyC;AACzC,yEAAwE;AACxE,mCAA+C;AAG/C,+CAOuB;AACvB,+DAAuF;AAEvF;;GAEG;AACH,qDAAqD;AACrD,MAAa,sBAAuB,SAAQ,gDAA0B;IACpE,kBAAkB;IAClB,YACE,cAA8B,EACb,gBAAiC;QAElD,KAAK,CAAC,cAAc,CAAC,CAAC;QAFL,qBAAgB,GAAhB,gBAAgB,CAAiB;IAGpD,CAAC;IAED;;OAEG;IACH,gBAAgB,CAAC,OAAa,EAAE,OAA4B;;QAC1D,IAAI,eAA4C,CAAC;QACjD,MAAM,EAAE,IAAI,EAAE,OAAO,GAAG,gCAAkB,EAAE,QAAQ,EAAE,GAAG,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,EAAE,CAAC;QACvE,IAAA,gBAAM,EAAC,IAAI,KAAK,qBAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACzC,MAAM,QAAQ,GAAG,MAAA,IAAI,CAAC,gBAAgB,CAAC,QAAQ,mCAAI,IAAA,qBAAa,GAAE,CAAC;QAEnE,MAAM,UAAU,GAAe;YAC7B,IAAI;YACJ,YAAY,EAAE,gBAAS,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE;YACxC,QAAQ,EAAE,QAAQ,aAAR,QAAQ,cAAR,QAAQ,GAAI,gBAAS,CAAC,MAAM,EAAE;YACxC,kBAAkB,EAAE,IAAA,8BAAgB,EAAC,wCAA0B,CAAC;SACjE,CAAC;QAEF,uCAAuC;QACvC,MAAM,UAAU,GAAG,IAAI,0CAA4B,CAAC,KAAK,IAAI,EAAE;YAC7D,MAAM,CAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,KAAK,EAAE,CAAA,CAAC;QACjC,CAAC,CAAC,CAAC;QAEH,IAAI,kBAA0B,CAAC;QAC/B,MAAM,QAAQ,GAAG,IAAI,eAAO,EAAa,CAAC;QAC1C,MAAM,MAAM,GAAG,IAAI,+BAAS,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;;YAC1C,MAAM,IAAI,GAAG,IAAA,wBAAkB,EAAC;gBAC9B,OAAO,EAAE;oBACP,eAAe,EAAE,kBAAM,CAAC,UAAU,CAAC,uCAAuC,CAAC;iBAC5E;gBACD,QAAQ,EAAE;oBACR,eAAe,EAAE;wBACf,gBAAgB,EAAE,KAAK,IAAI,EAAE;;4BAC3B,IAAA,SAAG,EAAC,iCAAiC,EAAE;gCACrC,IAAI,EAAE,QAAQ,CAAC,SAAS;6BACzB,oVAAC,CAAC;4BAEH,2DAA2D;4BAC3D,MAAA,MAAA,UAAU,CAAC,QAAQ,EAAC,gBAAgB,mDAAG,UAAU,CAAC,CAAC;4BACnD,OAAO;gCACL,WAAW,EAAE,QAAQ,CAAC,WAAW;gCACjC,YAAY,EAAE,QAAQ,CAAC,YAAY;gCACnC,cAAc,EAAE,QAAQ,CAAC,kBAAkB;6BAC5C,CAAC;wBACJ,CAAC;wBAED,YAAY,EAAE,KAAK,EAAE,EAAE,kBAAkB,EAAE,IAAI,EAAE,EAAE,EAAE;4BACnD,IAAA,SAAG,EAAC,iCAAiC,EAAE,EAAE,kBAAkB,EAAE,IAAI,EAAE,oVAAC,CAAC;4BACrE,kBAAkB,GAAG,IAAI,CAAC;wBAC5B,CAAC;wBAED,uDAAuD;wBACvD,2BAA2B,EAAE,KAAK,EAAE,WAAW,EAAE,EAAE;4BACjD,IAAI;gCACF,uBAAuB;gCACvB,IAAI,UAAU,CAAC,IAAI,KAAK,SAAS,IAAI,UAAU,CAAC,IAAI,KAAK,qBAAU,CAAC,IAAI,CAAC,WAAW,EAAE;oCACpF,IACE,UAAU,CAAC,kBAAkB,KAAK,SAAS;wCAC3C,kBAAkB,KAAK,UAAU,CAAC,kBAAkB,EACpD;wCACA,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;qCAChD;iCACF;gCAED,IAAA,SAAG,EAAC,2BAA2B,EAAE,EAAE,IAAI,EAAE,QAAQ,CAAC,SAAS,EAAE,KAAK,EAAE,WAAW,CAAC,SAAS,EAAE,qVAAC,CAAC;gCAC7F,2CAA2C;gCAC3C,MAAM,QAAQ,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;gCAExC,iCAAiC;gCACjC,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;6BACtC;4BAAC,OAAO,GAAG,EAAE;gCACZ,gEAAgE;gCAChE,UAAU,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;gCACjC,MAAM,GAAG,CAAC,CAAC,4BAA4B;6BACxC;wBACH,CAAC;qBACF;iBACF;gBACD,IAAI;aACL,CAAC,CAAC;YAEH,IAAI;gBACF,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;gBAClB,IAAA,SAAG,EAAC,WAAW,EAAE,EAAE,IAAI,EAAE,QAAQ,CAAC,SAAS,EAAE,qVAAC,CAAC;gBAC/C,MAAA,MAAA,UAAU,CAAC,QAAQ,EAAC,WAAW,mDAAG,UAAU,CAAC,CAAC;gBAC9C,MAAM,SAAS,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;gBACnD,IAAA,SAAG,EAAC,gBAAgB,EAAE,EAAE,IAAI,EAAE,QAAQ,CAAC,SAAS,EAAE,KAAK,EAAE,SAAS,EAAE,qVAAC,CAAC;gBACtE,UAAU,CAAC,QAAQ,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;aAC3C;YAAC,OAAO,GAAG,EAAE;gBACZ,IAAI,CAAC,UAAU,CAAC,SAAS,EAAE;oBACzB,SAAG,CAAC,KAAK,CAAC,QAAQ,EAAE,GAAG,qVAAC,CAAC;oBACzB,UAAU,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;iBAClC;aACF;oBAAS;gBACR,MAAM,IAAA,aAAK,EAAC,4BAAc,CAAC,CAAC;gBAC5B,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;gBACnB,MAAM,eAAgB,CAAC,KAAK,EAAE,CAAC;aAChC;QACH,CAAC,CAAC,CAAC;QAEH,UAAU,CAAC,KAAK,IAAI,EAAE;;YACpB,MAAM,KAAK,GAAG,UAAU,CAAC,QAAS,CAAC;YACnC,MAAM,MAAM,GAAG,gBAAS,CAAC,MAAM,EAAE,CAAC,CAAC,qBAAqB;YACxD,eAAe,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC;gBACrD,KAAK;gBACL,MAAM,EAAE,KAAK;gBACb,QAAQ,EAAE,IAAA,uCAAqB,EAAC,KAAK,EAAE,MAAM,EAAE,CAAC,MAAM,CAAC,CAAC;gBACxD,QAAQ,EAAE,IAAI,8BAAY,CAAC,KAAK,CAAC;aAClC,CAAC,CAAC;YAEH,MAAA,MAAA,UAAU,CAAC,QAAQ,EAAC,YAAY,mDAAG,UAAU,CAAC,CAAC;QACjD,CAAC,CAAC,CAAC;QAEH,OAAO,UAAU,CAAC;IACpB,CAAC;IAED;;;;OAIG;IACH,gBAAgB,CAAC,UAAsB,EAAE,OAA4B;QACnE,MAAM,EAAE,OAAO,GAAG,gCAAkB,EAAE,GAAG,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,EAAE,CAAC;QACvD,IAAI,eAA4C,CAAC;QAEjD,MAAM,aAAa,GAAG,IAAI,eAAO,EAAU,CAAC;QAC5C,MAAM,UAAU,GAAG,IAAI,8CAAgC,CAAC;YACtD,QAAQ,EAAE,KAAK,IAAI,EAAE;gBACnB,MAAM,CAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,KAAK,EAAE,CAAA,CAAC;YACjC,CAAC;YAED,gCAAgC;YAChC,cAAc,EAAE,KAAK,EAAE,IAAY,EAAE,EAAE;gBACrC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC3B,CAAC;SACF,CAAC,CAAC;QAEH,IAAI,eAAe,GAAG,CAAC,CAAC;QACxB,MAAM,QAAQ,GAAG,IAAI,eAAO,EAAa,CAAC;QAC1C,MAAM,MAAM,GAAG,IAAA,qCAAe,EAAC,KAAK,EAAE,IAAI,EAAE,EAAE;;YAC5C,MAAM,IAAI,GAAG,IAAA,wBAAkB,EAAC;gBAC9B,SAAS,EAAE;oBACT,eAAe,EAAE,kBAAM,CAAC,UAAU,CAAC,uCAAuC,CAAC;iBAC5E;gBACD,IAAI;aACL,CAAC,CAAC;YAEH,IAAI;gBACF,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;gBAClB,iEAAiE;gBACjE,IAAI,EAAE,eAAe,GAAG,CAAC,EAAE;oBACzB,MAAM,IAAI,KAAK,CAAC,kCAAkC,eAAe,EAAE,CAAC,CAAC;iBACtE;gBAED,IAAA,SAAG,EAAC,WAAW,yVAAC,CAAC;gBACjB,MAAA,MAAA,UAAU,CAAC,QAAQ,EAAC,WAAW,mDAAG,UAAU,CAAC,CAAC;gBAE9C,mBAAmB;gBACnB,IAAA,SAAG,EAAC,2BAA2B,yVAAC,CAAC;gBACjC,MAAM,EAAE,WAAW,EAAE,YAAY,EAAE,cAAc,EAAE,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,eAAe,CAAC,gBAAgB,EAAE,CAAC;gBAExG,8BAA8B;gBAC9B,wEAAwE;gBACxE,IAAI,UAAU,CAAC,IAAI,KAAK,SAAS,IAAI,UAAU,CAAC,IAAI,KAAK,qBAAU,CAAC,IAAI,CAAC,WAAW,EAAE;oBACpF,IAAA,SAAG,EAAC,0CAA0C,yVAAC,CAAC;oBAChD,MAAA,MAAA,UAAU,CAAC,QAAQ,EAAC,gBAAgB,mDAAG,UAAU,CAAC,CAAC;oBACnD,MAAM,kBAAkB,GAAG,MAAM,aAAa,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;oBACjE,IAAA,SAAG,EAAC,gCAAgC,yVAAC,CAAC;oBACtC,MAAM,IAAI,CAAC,GAAG,CAAC,eAAe,CAAC,YAAY,CAAC,EAAE,kBAAkB,EAAE,CAAC,CAAC;iBACrE;gBAED,4BAA4B;gBAC5B,0EAA0E;gBAC1E,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC;oBAC1D,WAAW;oBACX,YAAY;oBACZ,kBAAkB,EAAE,cAAc;iBACnC,CAAC,CAAC;gBAEH,oEAAoE;gBACpE,IAAA,SAAG,EAAC,kCAAkC,EAAE,EAAE,KAAK,EAAE,QAAQ,CAAC,SAAS,EAAE,WAAW,EAAE,qVAAC,CAAC;gBACpF,MAAM,IAAI,CAAC,GAAG,CAAC,eAAe,CAAC,2BAA2B,CAAC,QAAQ,CAAC,uBAAuB,EAAE,CAAC,CAAC;gBAE/F,cAAc;gBACd,IAAA,SAAG,EAAC,kBAAkB,EAAE,EAAE,KAAK,EAAE,QAAQ,CAAC,SAAS,EAAE,WAAW,EAAE,qVAAC,CAAC;gBACpE,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;aAC5B;YAAC,OAAO,GAAG,EAAE;gBACZ,IAAI,CAAC,UAAU,CAAC,SAAS,EAAE;oBACzB,SAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,qVAAC,CAAC;oBACxB,UAAU,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;iBAClC;aACF;oBAAS;gBACR,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;aACpB;QACH,CAAC,CAAC,CAAC;QAEH,UAAU,CAAC,KAAK,IAAI,EAAE;;YACpB,IAAA,gBAAM,EAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;YAC5B,MAAM,KAAK,GAAG,UAAU,CAAC,QAAQ,CAAC;YAClC,MAAM,MAAM,GAAG,gBAAS,CAAC,MAAM,EAAE,CAAC,CAAC,qBAAqB;YACxD,eAAe,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC;gBACrD,KAAK;gBACL,MAAM,EAAE,gBAAS,CAAC,MAAM,EAAE;gBAC1B,QAAQ,EAAE,IAAA,uCAAqB,EAAC,KAAK,EAAE,MAAM,EAAE,CAAC,MAAM,CAAC,CAAC;gBACxD,QAAQ,EAAE,IAAI,8BAAY,CAAC,KAAK,CAAC;aAClC,CAAC,CAAC;YAEH,MAAA,MAAA,UAAU,CAAC,QAAQ,EAAC,YAAY,mDAAG,UAAU,CAAC,CAAC;YAC/C,UAAU,CAAC,WAAW,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;YAC/C,UAAU,CAAC,QAAQ,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;YAC1C,MAAM,eAAe,CAAC,KAAK,EAAE,CAAC;QAChC,CAAC,CAAC,CAAC;QAEH,OAAO,UAAU,CAAC;IACpB,CAAC;CACF;AA9ND,wDA8NC"}
|
|
@@ -1,9 +1,11 @@
|
|
|
1
|
+
import { PublicKey } from '@dxos/keys';
|
|
1
2
|
import { NetworkManager } from '@dxos/network-manager';
|
|
2
3
|
import { Invitation } from '@dxos/protocols/proto/dxos/client/services';
|
|
3
|
-
import { AuthenticatingInvitationObservable,
|
|
4
|
-
export
|
|
4
|
+
import { AuthenticatingInvitationObservable, CancellableInvitationObservable } from './invitations';
|
|
5
|
+
export type InvitationsOptions = {
|
|
5
6
|
type?: Invitation.Type;
|
|
6
7
|
timeout?: number;
|
|
8
|
+
swarmKey?: PublicKey;
|
|
7
9
|
};
|
|
8
10
|
/**
|
|
9
11
|
* Common interface for Halo and Space invitation proxies and handlers.
|
|
@@ -33,7 +35,7 @@ export declare type InvitationsOptions = {
|
|
|
33
35
|
* ```
|
|
34
36
|
*/
|
|
35
37
|
export interface InvitationsHandler<T = void> {
|
|
36
|
-
createInvitation(context: T, options?: InvitationsOptions):
|
|
38
|
+
createInvitation(context: T, options?: InvitationsOptions): CancellableInvitationObservable;
|
|
37
39
|
acceptInvitation(invitation: Invitation, options?: InvitationsOptions): AuthenticatingInvitationObservable;
|
|
38
40
|
}
|
|
39
41
|
/**
|
|
@@ -42,7 +44,7 @@ export interface InvitationsHandler<T = void> {
|
|
|
42
44
|
export declare abstract class AbstractInvitationsHandler<T = void> implements InvitationsHandler<T> {
|
|
43
45
|
protected readonly _networkManager: NetworkManager;
|
|
44
46
|
protected constructor(_networkManager: NetworkManager);
|
|
45
|
-
abstract createInvitation(context: T, options?: InvitationsOptions):
|
|
47
|
+
abstract createInvitation(context: T, options?: InvitationsOptions): CancellableInvitationObservable;
|
|
46
48
|
abstract acceptInvitation(invitation: Invitation, options?: InvitationsOptions): AuthenticatingInvitationObservable;
|
|
47
49
|
}
|
|
48
50
|
//# sourceMappingURL=invitations-handler.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"invitations-handler.d.ts","sourceRoot":"","sources":["../../../../src/packlets/invitations/invitations-handler.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,4CAA4C,CAAC;AAExE,OAAO,EAAE,kCAAkC,EAAE,
|
|
1
|
+
{"version":3,"file":"invitations-handler.d.ts","sourceRoot":"","sources":["../../../../src/packlets/invitations/invitations-handler.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,4CAA4C,CAAC;AAExE,OAAO,EAAE,kCAAkC,EAAE,+BAA+B,EAAE,MAAM,eAAe,CAAC;AAEpG,MAAM,MAAM,kBAAkB,GAAG;IAC/B,IAAI,CAAC,EAAE,UAAU,CAAC,IAAI,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,QAAQ,CAAC,EAAE,SAAS,CAAC;CACtB,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,MAAM,WAAW,kBAAkB,CAAC,CAAC,GAAG,IAAI;IAC1C,gBAAgB,CAAC,OAAO,EAAE,CAAC,EAAE,OAAO,CAAC,EAAE,kBAAkB,GAAG,+BAA+B,CAAC;IAC5F,gBAAgB,CAAC,UAAU,EAAE,UAAU,EAAE,OAAO,CAAC,EAAE,kBAAkB,GAAG,kCAAkC,CAAC;CAC5G;AAED;;GAEG;AAEH,8BAAsB,0BAA0B,CAAC,CAAC,GAAG,IAAI,CAAE,YAAW,kBAAkB,CAAC,CAAC,CAAC;IAGvF,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,cAAc;IADpD,SAAS,aACY,eAAe,EAAE,cAAc;IAGpD,QAAQ,CAAC,gBAAgB,CAAC,OAAO,EAAE,CAAC,EAAE,OAAO,CAAC,EAAE,kBAAkB,GAAG,+BAA+B;IACpG,QAAQ,CAAC,gBAAgB,CAAC,UAAU,EAAE,UAAU,EAAE,OAAO,CAAC,EAAE,kBAAkB,GAAG,kCAAkC;CACpH"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"invitations-handler.js","sourceRoot":"","sources":["../../../../src/packlets/invitations/invitations-handler.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;
|
|
1
|
+
{"version":3,"file":"invitations-handler.js","sourceRoot":"","sources":["../../../../src/packlets/invitations/invitations-handler.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;AA+CF;;GAEG;AACH,8CAA8C;AAC9C,MAAsB,0BAA0B;IAC9C,kBAAkB;IAClB,YACqB,eAA+B;QAA/B,oBAAe,GAAf,eAAe,CAAgB;IACjD,CAAC;CAIL;AARD,gEAQC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Invitation } from '@dxos/protocols/proto/dxos/client/services';
|
|
2
|
-
import { AuthenticatingInvitationObservable,
|
|
2
|
+
import { AuthenticatingInvitationObservable, CancellableInvitationObservable, InvitationsService } from './invitations';
|
|
3
3
|
import { InvitationsOptions, InvitationsHandler } from './invitations-handler';
|
|
4
4
|
/**
|
|
5
5
|
* Adapts invitations service observable to client/service stream.
|
|
@@ -12,7 +12,7 @@ export declare abstract class AbstractInvitationsProxy<T = void> implements Invi
|
|
|
12
12
|
private readonly _invitationsService;
|
|
13
13
|
constructor(_invitationsService: InvitationsService);
|
|
14
14
|
abstract getInvitationOptions(context: T): Invitation;
|
|
15
|
-
createInvitation(context: T, options?: InvitationsOptions):
|
|
15
|
+
createInvitation(context: T, options?: InvitationsOptions): CancellableInvitationObservable;
|
|
16
16
|
acceptInvitation(invitation: Invitation, options?: InvitationsOptions): AuthenticatingInvitationObservable;
|
|
17
17
|
}
|
|
18
18
|
//# sourceMappingURL=invitations-proxy.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"invitations-proxy.d.ts","sourceRoot":"","sources":["../../../../src/packlets/invitations/invitations-proxy.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,UAAU,EAAE,MAAM,4CAA4C,CAAC;AAExE,OAAO,EACL,kCAAkC,EAElC,
|
|
1
|
+
{"version":3,"file":"invitations-proxy.d.ts","sourceRoot":"","sources":["../../../../src/packlets/invitations/invitations-proxy.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,UAAU,EAAE,MAAM,4CAA4C,CAAC;AAExE,OAAO,EACL,kCAAkC,EAElC,+BAA+B,EAE/B,kBAAkB,EACnB,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAE/E;;;GAGG;AACH,MAAM,WAAW,gBAAgB,CAAC,CAAC,GAAG,IAAI,CAAE,SAAQ,kBAAkB,CAAC,CAAC,CAAC;IACvE,oBAAoB,CAAC,OAAO,EAAE,CAAC,GAAG,UAAU,CAAC;CAC9C;AAED,8BAAsB,wBAAwB,CAAC,CAAC,GAAG,IAAI,CAAE,YAAW,gBAAgB,CAAC,CAAC,CAAC;IAGnF,OAAO,CAAC,QAAQ,CAAC,mBAAmB;gBAAnB,mBAAmB,EAAE,kBAAkB;IAG1D,QAAQ,CAAC,oBAAoB,CAAC,OAAO,EAAE,CAAC,GAAG,UAAU;IAErD,gBAAgB,CAAC,OAAO,EAAE,CAAC,EAAE,OAAO,CAAC,EAAE,kBAAkB,GAAG,+BAA+B;IA0D3F,gBAAgB,CAAC,UAAU,EAAE,UAAU,EAAE,OAAO,CAAC,EAAE,kBAAkB,GAAG,kCAAkC;CAgE3G"}
|
|
@@ -53,7 +53,7 @@ class AbstractInvitationsProxy {
|
|
|
53
53
|
break;
|
|
54
54
|
}
|
|
55
55
|
default: {
|
|
56
|
-
log_1.log.error(`Invalid state: ${invitation.state}`, {}, { file: "packages/sdk/client-services/src/packlets/invitations/invitations-proxy.ts", line: 81 });
|
|
56
|
+
log_1.log.error(`Invalid state: ${invitation.state}`, {}, { file: "packages/sdk/client-services/src/packlets/invitations/invitations-proxy.ts", line: 81, scope: this, bugcheck: "If you see this message then it means that the source code preprocessor for @dxos/log is broken. It probably has misinterpreted an unrelated call for a logger invocation.", callSite: (fn, args) => fn(...args) });
|
|
57
57
|
}
|
|
58
58
|
}
|
|
59
59
|
}, (err) => {
|
|
@@ -106,7 +106,7 @@ class AbstractInvitationsProxy {
|
|
|
106
106
|
break;
|
|
107
107
|
}
|
|
108
108
|
default: {
|
|
109
|
-
log_1.log.error(`Invalid state: ${invitation.state}`, {}, { file: "packages/sdk/client-services/src/packlets/invitations/invitations-proxy.ts", line: 146 });
|
|
109
|
+
log_1.log.error(`Invalid state: ${invitation.state}`, {}, { file: "packages/sdk/client-services/src/packlets/invitations/invitations-proxy.ts", line: 146, scope: this, bugcheck: "If you see this message then it means that the source code preprocessor for @dxos/log is broken. It probably has misinterpreted an unrelated call for a logger invocation.", callSite: (fn, args) => fn(...args) });
|
|
110
110
|
}
|
|
111
111
|
}
|
|
112
112
|
}, (err) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"invitations-proxy.js","sourceRoot":"","sources":["../../../../src/packlets/invitations/invitations-proxy.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,oDAA4B;AAE5B,uCAA8C;AAE9C,mCAAgC;AAChC,yEAAwE;AAExE,+CAMuB;AAWvB,MAAsB,wBAAwB;IAC5C,kBAAkB;IAClB,YACmB,mBAAuC;QAAvC,wBAAmB,GAAnB,mBAAmB,CAAoB;IACvD,CAAC;IAIJ,gBAAgB,CAAC,OAAU,EAAE,OAA4B;QACvD,IAAI,YAAoB,CAAC;QACzB,MAAM,UAAU,GAAG,IAAI,0CAA4B,CAAC,KAAK,IAAI,EAAE;YAC7D,IAAI,YAAY,EAAE;gBAChB,MAAM,IAAI,CAAC,mBAAmB,CAAC,gBAAgB,CAAC,EAAE,YAAY,EAAE,CAAC,CAAC;aACnE;QACH,CAAC,CAAC,CAAC;QAEH,MAAM,UAAU,GAAe,EAAE,GAAG,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC,EAAE,GAAG,OAAO,EAAE,CAAC;QACrF,MAAM,MAAM,GAAuB,IAAI,CAAC,mBAAmB,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC;QAEzF,MAAM,CAAC,SAAS,CACd,CAAC,UAAsB,EAAE,EAAE;;YACzB,UAAU,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;YAErC,QAAQ,UAAU,CAAC,KAAK,EAAE;gBACxB,KAAK,qBAAU,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;oBAChC,IAAA,gBAAM,EAAC,UAAU,CAAC,YAAY,CAAC,CAAC;oBAChC,YAAY,GAAG,UAAU,CAAC,YAAY,CAAC;oBACvC,MAAA,MAAA,UAAU,CAAC,QAAQ,EAAC,YAAY,mDAAG,UAAU,CAAC,CAAC;oBAC/C,MAAM;iBACP;gBAED,KAAK,qBAAU,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;oBAC/B,MAAA,MAAA,UAAU,CAAC,QAAQ,EAAC,WAAW,mDAAG,UAAU,CAAC,CAAC;oBAC9C,MAAM;iBACP;gBAED,KAAK,qBAAU,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;oBACpC,MAAA,MAAA,UAAU,CAAC,QAAQ,EAAC,gBAAgB,mDAAG,UAAU,CAAC,CAAC;oBACnD,MAAM;iBACP;gBAED,KAAK,qBAAU,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;oBAC7B,MAAA,MAAA,UAAU,CAAC,QAAQ,EAAC,SAAS,mDAAG,UAAU,CAAC,CAAC;oBAC5C,MAAM;iBACP;gBAED,KAAK,qBAAU,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;oBAC/B,MAAA,MAAA,UAAU,CAAC,QAAQ,EAAC,WAAW,kDAAI,CAAC;oBACpC,MAAM;iBACP;gBAED,OAAO,CAAC,CAAC;oBACP,SAAG,CAAC,KAAK,CAAC,kBAAkB,UAAU,CAAC,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"invitations-proxy.js","sourceRoot":"","sources":["../../../../src/packlets/invitations/invitations-proxy.ts"],"names":[],"mappings":"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"}
|
|
@@ -33,10 +33,10 @@ class AbstractInvitationsService {
|
|
|
33
33
|
return new codec_protobuf_1.Stream(({ next, close }) => {
|
|
34
34
|
const invitationsHandler = this._getInvitationsHandler();
|
|
35
35
|
const context = this.getContext(invitation);
|
|
36
|
-
(0, log_1.log)('stream opened', this.getLoggingContext(), { file: "packages/sdk/client-services/src/packlets/invitations/invitations-service.ts", line: 43 });
|
|
36
|
+
(0, log_1.log)('stream opened', this.getLoggingContext(), { file: "packages/sdk/client-services/src/packlets/invitations/invitations-service.ts", line: 43, scope: this, bugcheck: "If you see this message then it means that the source code preprocessor for @dxos/log is broken. It probably has misinterpreted an unrelated call for a logger invocation.", callSite: (fn, args) => fn(...args) });
|
|
37
37
|
let invitationId;
|
|
38
|
-
const { type } = invitation;
|
|
39
|
-
const observable = invitationsHandler.createInvitation(context, { type });
|
|
38
|
+
const { type, swarmKey } = invitation;
|
|
39
|
+
const observable = invitationsHandler.createInvitation(context, { type, swarmKey });
|
|
40
40
|
observable.subscribe({
|
|
41
41
|
onConnecting: (invitation) => {
|
|
42
42
|
(0, assert_1.default)(invitation.invitationId);
|
|
@@ -80,10 +80,10 @@ class AbstractInvitationsService {
|
|
|
80
80
|
return (err) => {
|
|
81
81
|
const context = this.getLoggingContext();
|
|
82
82
|
if (err) {
|
|
83
|
-
log_1.log.warn('stream closed', { ...context, err }, { file: "packages/sdk/client-services/src/packlets/invitations/invitations-service.ts", line: 92 });
|
|
83
|
+
log_1.log.warn('stream closed', { ...context, err }, { file: "packages/sdk/client-services/src/packlets/invitations/invitations-service.ts", line: 92, scope: this, bugcheck: "If you see this message then it means that the source code preprocessor for @dxos/log is broken. It probably has misinterpreted an unrelated call for a logger invocation.", callSite: (fn, args) => fn(...args) });
|
|
84
84
|
}
|
|
85
85
|
else {
|
|
86
|
-
(0, log_1.log)('stream closed', context, { file: "packages/sdk/client-services/src/packlets/invitations/invitations-service.ts", line: 94 });
|
|
86
|
+
(0, log_1.log)('stream closed', context, { file: "packages/sdk/client-services/src/packlets/invitations/invitations-service.ts", line: 94, scope: this, bugcheck: "If you see this message then it means that the source code preprocessor for @dxos/log is broken. It probably has misinterpreted an unrelated call for a logger invocation.", callSite: (fn, args) => fn(...args) });
|
|
87
87
|
}
|
|
88
88
|
this._createInvitations.delete(invitation.invitationId);
|
|
89
89
|
};
|
|
@@ -91,7 +91,7 @@ class AbstractInvitationsService {
|
|
|
91
91
|
}
|
|
92
92
|
acceptInvitation(invitation, options) {
|
|
93
93
|
return new codec_protobuf_1.Stream(({ next, close }) => {
|
|
94
|
-
(0, log_1.log)('stream opened', this.getLoggingContext(), { file: "packages/sdk/client-services/src/packlets/invitations/invitations-service.ts", line: 104 });
|
|
94
|
+
(0, log_1.log)('stream opened', this.getLoggingContext(), { file: "packages/sdk/client-services/src/packlets/invitations/invitations-service.ts", line: 104, scope: this, bugcheck: "If you see this message then it means that the source code preprocessor for @dxos/log is broken. It probably has misinterpreted an unrelated call for a logger invocation.", callSite: (fn, args) => fn(...args) });
|
|
95
95
|
const invitationsHandler = this._getInvitationsHandler();
|
|
96
96
|
let invitationId;
|
|
97
97
|
const observable = invitationsHandler.acceptInvitation(invitation, options);
|
|
@@ -137,21 +137,21 @@ class AbstractInvitationsService {
|
|
|
137
137
|
return (err) => {
|
|
138
138
|
const context = this.getLoggingContext();
|
|
139
139
|
if (err) {
|
|
140
|
-
log_1.log.warn('stream closed', { ...context, err }, { file: "packages/sdk/client-services/src/packlets/invitations/invitations-service.ts", line: 152 });
|
|
140
|
+
log_1.log.warn('stream closed', { ...context, err }, { file: "packages/sdk/client-services/src/packlets/invitations/invitations-service.ts", line: 152, scope: this, bugcheck: "If you see this message then it means that the source code preprocessor for @dxos/log is broken. It probably has misinterpreted an unrelated call for a logger invocation.", callSite: (fn, args) => fn(...args) });
|
|
141
141
|
}
|
|
142
142
|
else {
|
|
143
|
-
(0, log_1.log)('stream closed', context, { file: "packages/sdk/client-services/src/packlets/invitations/invitations-service.ts", line: 154 });
|
|
143
|
+
(0, log_1.log)('stream closed', context, { file: "packages/sdk/client-services/src/packlets/invitations/invitations-service.ts", line: 154, scope: this, bugcheck: "If you see this message then it means that the source code preprocessor for @dxos/log is broken. It probably has misinterpreted an unrelated call for a logger invocation.", callSite: (fn, args) => fn(...args) });
|
|
144
144
|
}
|
|
145
145
|
this._acceptInvitations.delete(invitation.invitationId);
|
|
146
146
|
};
|
|
147
147
|
});
|
|
148
148
|
}
|
|
149
149
|
async authenticate({ invitationId, authenticationCode }) {
|
|
150
|
-
(0, log_1.log)('authenticating...', {}, { file: "packages/sdk/client-services/src/packlets/invitations/invitations-service.ts", line: 163 });
|
|
150
|
+
(0, log_1.log)('authenticating...', {}, { file: "packages/sdk/client-services/src/packlets/invitations/invitations-service.ts", line: 163, scope: this, bugcheck: "If you see this message then it means that the source code preprocessor for @dxos/log is broken. It probably has misinterpreted an unrelated call for a logger invocation.", callSite: (fn, args) => fn(...args) });
|
|
151
151
|
(0, assert_1.default)(invitationId);
|
|
152
152
|
const observable = this._acceptInvitations.get(invitationId);
|
|
153
153
|
if (!observable) {
|
|
154
|
-
log_1.log.warn('invalid invitation', { invitationId }, { file: "packages/sdk/client-services/src/packlets/invitations/invitations-service.ts", line: 167 });
|
|
154
|
+
log_1.log.warn('invalid invitation', { invitationId }, { file: "packages/sdk/client-services/src/packlets/invitations/invitations-service.ts", line: 167, scope: this, bugcheck: "If you see this message then it means that the source code preprocessor for @dxos/log is broken. It probably has misinterpreted an unrelated call for a logger invocation.", callSite: (fn, args) => fn(...args) });
|
|
155
155
|
}
|
|
156
156
|
else {
|
|
157
157
|
await observable.authenticate(authenticationCode);
|
|
@@ -159,11 +159,11 @@ class AbstractInvitationsService {
|
|
|
159
159
|
}
|
|
160
160
|
async cancelInvitation(invitation) {
|
|
161
161
|
var _a;
|
|
162
|
-
(0, log_1.log)('cancelling...', {}, { file: "packages/sdk/client-services/src/packlets/invitations/invitations-service.ts", line: 174 });
|
|
162
|
+
(0, log_1.log)('cancelling...', {}, { file: "packages/sdk/client-services/src/packlets/invitations/invitations-service.ts", line: 174, scope: this, bugcheck: "If you see this message then it means that the source code preprocessor for @dxos/log is broken. It probably has misinterpreted an unrelated call for a logger invocation.", callSite: (fn, args) => fn(...args) });
|
|
163
163
|
(0, assert_1.default)(invitation.invitationId);
|
|
164
164
|
const observable = (_a = this._createInvitations.get(invitation.invitationId)) !== null && _a !== void 0 ? _a : this._acceptInvitations.get(invitation.invitationId);
|
|
165
165
|
if (!observable) {
|
|
166
|
-
log_1.log.warn('invalid invitation', { invitationId: invitation.invitationId }, { file: "packages/sdk/client-services/src/packlets/invitations/invitations-service.ts", line: 179 });
|
|
166
|
+
log_1.log.warn('invalid invitation', { invitationId: invitation.invitationId }, { file: "packages/sdk/client-services/src/packlets/invitations/invitations-service.ts", line: 179, scope: this, bugcheck: "If you see this message then it means that the source code preprocessor for @dxos/log is broken. It probably has misinterpreted an unrelated call for a logger invocation.", callSite: (fn, args) => fn(...args) });
|
|
167
167
|
}
|
|
168
168
|
else {
|
|
169
169
|
await (observable === null || observable === void 0 ? void 0 : observable.cancel());
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"invitations-service.js","sourceRoot":"","sources":["../../../../src/packlets/invitations/invitations-service.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,oDAA4B;AAG5B,yDAA8C;AAC9C,mCAAgC;AAChC,yEAA+F;AAO/F;;GAEG;AACH,MAAsB,0BAA0B;IAI9C,kBAAkB;IAClB,YACmB,gBAAiC,EACjC,sBAAuD;QADvD,qBAAgB,GAAhB,gBAAgB,CAAiB;QACjC,2BAAsB,GAAtB,sBAAsB,CAAiC;QANzD,uBAAkB,GAAG,IAAI,GAAG,EAA2C,CAAC;QACxE,uBAAkB,GAAG,IAAI,GAAG,EAA8C,CAAC;IAMzF,CAAC;IAEJ,kCAAkC;IAClC,iBAAiB;;QACf,OAAO;YACL,SAAS,EAAE,MAAA,IAAI,CAAC,gBAAgB,CAAC,QAAQ,0CAAE,SAAS;SACrD,CAAC;IACJ,CAAC;IAID,gBAAgB,CAAC,UAAsB;QACrC,OAAO,IAAI,uBAAM,CAAa,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE;YAChD,MAAM,kBAAkB,GAA0B,IAAI,CAAC,sBAAsB,EAAE,CAAC;YAChF,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;YAC5C,IAAA,SAAG,EAAC,eAAe,EAAE,IAAI,CAAC,iBAAiB,EAAE,
|
|
1
|
+
{"version":3,"file":"invitations-service.js","sourceRoot":"","sources":["../../../../src/packlets/invitations/invitations-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { AsyncEvents, CancellableObservable, CancellableObservableEvents,
|
|
1
|
+
import { AsyncEvents, CancellableObservable, CancellableObservableEvents, CancellableObservableProvider } from '@dxos/async';
|
|
2
2
|
import type { Stream } from '@dxos/codec-protobuf';
|
|
3
3
|
import { AuthenticationRequest, CancelInvitationRequest, Invitation } from '@dxos/protocols/proto/dxos/client/services';
|
|
4
4
|
export declare const AUTHENTICATION_CODE_LENGTH = 6;
|
|
@@ -23,18 +23,14 @@ export interface InvitationEvents extends AsyncEvents, CancellableObservableEven
|
|
|
23
23
|
* Base class for all invitation observables and providers.
|
|
24
24
|
* Observable that supports inspection of the current value.
|
|
25
25
|
*/
|
|
26
|
-
export interface
|
|
26
|
+
export interface CancellableInvitationObservable extends CancellableObservable<InvitationEvents> {
|
|
27
27
|
get invitation(): Invitation | undefined;
|
|
28
28
|
}
|
|
29
|
-
export declare class InvitationObservableProvider extends CancellableObservableProvider<InvitationEvents> implements
|
|
29
|
+
export declare class InvitationObservableProvider extends CancellableObservableProvider<InvitationEvents> implements CancellableInvitationObservable {
|
|
30
30
|
private _invitation?;
|
|
31
31
|
get invitation(): Invitation | undefined;
|
|
32
32
|
setInvitation(invitation: Invitation): void;
|
|
33
33
|
}
|
|
34
|
-
/**
|
|
35
|
-
* Cancelable observer.
|
|
36
|
-
*/
|
|
37
|
-
export declare type CancellableInvitationObservable = InvitationObservable;
|
|
38
34
|
/**
|
|
39
35
|
* Cancelable observer that relays authentication requests.
|
|
40
36
|
*/
|
|
@@ -51,8 +47,9 @@ export declare class AuthenticatingInvitationProvider extends InvitationObservab
|
|
|
51
47
|
authenticate(authenticationCode: string): Promise<void>;
|
|
52
48
|
}
|
|
53
49
|
/**
|
|
54
|
-
*
|
|
50
|
+
* Testing util to wrap non-authenticating observable with promise.
|
|
51
|
+
* Don't use this in production code.
|
|
55
52
|
* @deprecated
|
|
56
53
|
*/
|
|
57
|
-
export declare const
|
|
54
|
+
export declare const wrapObservable: (observable: CancellableInvitationObservable) => Promise<Invitation>;
|
|
58
55
|
//# sourceMappingURL=invitations.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"invitations.d.ts","sourceRoot":"","sources":["../../../../src/packlets/invitations/invitations.ts"],"names":[],"mappings":"AAMA,OAAO,EACL,WAAW,EACX,qBAAqB,EACrB,2BAA2B,EAC3B,
|
|
1
|
+
{"version":3,"file":"invitations.d.ts","sourceRoot":"","sources":["../../../../src/packlets/invitations/invitations.ts"],"names":[],"mappings":"AAMA,OAAO,EACL,WAAW,EACX,qBAAqB,EACrB,2BAA2B,EAC3B,6BAA6B,EAC9B,MAAM,aAAa,CAAC;AACrB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,qBAAqB,EAAE,uBAAuB,EAAE,UAAU,EAAE,MAAM,4CAA4C,CAAC;AAExH,eAAO,MAAM,0BAA0B,IAAI,CAAC;AAE5C,eAAO,MAAM,kBAAkB,QAAa,CAAC;AAG7C,eAAO,MAAM,cAAc,MAAM,CAAC;AAElC,MAAM,WAAW,kBAAkB;IACjC,gBAAgB,CAAC,UAAU,EAAE,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC;IAC7D,YAAY,CAAC,OAAO,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5D,gBAAgB,CAAC,UAAU,EAAE,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC;IAC7D,gBAAgB,CAAC,OAAO,EAAE,uBAAuB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACnE;AAED;;GAEG;AAEH,MAAM,WAAW,gBAAiB,SAAQ,WAAW,EAAE,2BAA2B;IAChF,YAAY,CAAC,CAAC,UAAU,EAAE,UAAU,GAAG,IAAI,CAAC;IAC5C,WAAW,CAAC,CAAC,UAAU,EAAE,UAAU,GAAG,IAAI,CAAC;IAC3C,gBAAgB,CAAC,CAAC,UAAU,EAAE,UAAU,GAAG,IAAI,CAAC;IAChD,SAAS,CAAC,UAAU,EAAE,UAAU,GAAG,IAAI,CAAC;CACzC;AAED;;;GAGG;AACH,MAAM,WAAW,+BAAgC,SAAQ,qBAAqB,CAAC,gBAAgB,CAAC;IAC9F,IAAI,UAAU,IAAI,UAAU,GAAG,SAAS,CAAC;CAC1C;AAED,qBAAa,4BACX,SAAQ,6BAA6B,CAAC,gBAAgB,CACtD,YAAW,+BAA+B;IAE1C,OAAO,CAAC,WAAW,CAAC,CAAa;IAEjC,IAAI,UAAU,IAAI,UAAU,GAAG,SAAS,CAEvC;IAED,aAAa,CAAC,UAAU,EAAE,UAAU;CAGrC;AAED;;GAEG;AACH,MAAM,WAAW,kCAAmC,SAAQ,+BAA+B;IACzF,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC3C;AAED,MAAM,WAAW,uCAAuC;IACtD,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1B,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC7C;AAED,qBAAa,gCACX,SAAQ,4BACR,YAAW,kCAAkC;IAI3C,OAAO,CAAC,QAAQ,CAAC,QAAQ;gBAAR,QAAQ,EAAE,uCAAuC;IAK9D,YAAY,CAAC,kBAAkB,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAG9D;AAED;;;;GAIG;AAEH,eAAO,MAAM,cAAc,eAAsB,+BAA+B,KAAG,QAAQ,UAAU,CAcpG,CAAC"}
|
|
@@ -6,7 +6,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
6
6
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
7
7
|
};
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
|
-
exports.
|
|
9
|
+
exports.wrapObservable = exports.AuthenticatingInvitationProvider = exports.InvitationObservableProvider = exports.ON_CLOSE_DELAY = exports.INVITATION_TIMEOUT = exports.AUTHENTICATION_CODE_LENGTH = void 0;
|
|
10
10
|
const assert_1 = __importDefault(require("assert"));
|
|
11
11
|
const async_1 = require("@dxos/async");
|
|
12
12
|
const services_1 = require("@dxos/protocols/proto/dxos/client/services");
|
|
@@ -35,11 +35,12 @@ class AuthenticatingInvitationProvider extends InvitationObservableProvider {
|
|
|
35
35
|
}
|
|
36
36
|
exports.AuthenticatingInvitationProvider = AuthenticatingInvitationProvider;
|
|
37
37
|
/**
|
|
38
|
-
*
|
|
38
|
+
* Testing util to wrap non-authenticating observable with promise.
|
|
39
|
+
* Don't use this in production code.
|
|
39
40
|
* @deprecated
|
|
40
41
|
*/
|
|
41
|
-
// TODO(burdon):
|
|
42
|
-
const
|
|
42
|
+
// TODO(burdon): Throw error if auth requested.
|
|
43
|
+
const wrapObservable = async (observable) => {
|
|
43
44
|
return new Promise((resolve, reject) => {
|
|
44
45
|
const unsubscribe = observable.subscribe({
|
|
45
46
|
onSuccess: (invitation) => {
|
|
@@ -54,5 +55,5 @@ const invitationObservable = async (observable) => {
|
|
|
54
55
|
});
|
|
55
56
|
});
|
|
56
57
|
};
|
|
57
|
-
exports.
|
|
58
|
+
exports.wrapObservable = wrapObservable;
|
|
58
59
|
//# sourceMappingURL=invitations.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"invitations.js","sourceRoot":"","sources":["../../../../src/packlets/invitations/invitations.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,oDAA4B;AAE5B,
|
|
1
|
+
{"version":3,"file":"invitations.js","sourceRoot":"","sources":["../../../../src/packlets/invitations/invitations.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,oDAA4B;AAE5B,uCAKqB;AAErB,yEAAwH;AAE3G,QAAA,0BAA0B,GAAG,CAAC,CAAC;AAE/B,QAAA,kBAAkB,GAAG,CAAC,GAAG,KAAM,CAAC,CAAC,UAAU;AAExD,0DAA0D;AAC7C,QAAA,cAAc,GAAG,GAAG,CAAC;AA4BlC,MAAa,4BACX,SAAQ,qCAA+C;IAKvD,IAAI,UAAU;QACZ,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;IAED,aAAa,CAAC,UAAsB;QAClC,IAAI,CAAC,WAAW,GAAG,UAAU,CAAC;IAChC,CAAC;CACF;AAbD,oEAaC;AAcD,MAAa,gCACX,SAAQ,4BAA4B;IAGpC,kBAAkB;IAClB,YACmB,QAAiD;QAElE,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC;QAFrB,aAAQ,GAAR,QAAQ,CAAyC;IAGpE,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,kBAA0B;QAC3C,OAAO,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,kBAAkB,CAAC,CAAC;IAC1D,CAAC;CACF;AAdD,4EAcC;AAED;;;;GAIG;AACH,+CAA+C;AACxC,MAAM,cAAc,GAAG,KAAK,EAAE,UAA2C,EAAuB,EAAE;IACvG,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,MAAM,WAAW,GAAG,UAAU,CAAC,SAAS,CAAC;YACvC,SAAS,EAAE,CAAC,UAAsB,EAAE,EAAE;gBACpC,IAAA,gBAAM,EAAC,UAAU,CAAC,KAAK,KAAK,qBAAU,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;gBACtD,WAAW,EAAE,CAAC;gBACd,OAAO,CAAC,UAAU,CAAC,CAAC;YACtB,CAAC;YACD,OAAO,EAAE,CAAC,GAAU,EAAE,EAAE;gBACtB,WAAW,EAAE,CAAC;gBACd,MAAM,CAAC,GAAG,CAAC,CAAC;YACd,CAAC;SACF,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAdW,QAAA,cAAc,kBAczB"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { SigningContext, Space, SpaceManager } from '@dxos/echo-db';
|
|
2
2
|
import { NetworkManager } from '@dxos/network-manager';
|
|
3
3
|
import { Invitation } from '@dxos/protocols/proto/dxos/client/services';
|
|
4
|
-
import { AuthenticatingInvitationProvider,
|
|
4
|
+
import { AuthenticatingInvitationProvider, CancellableInvitationObservable } from './invitations';
|
|
5
5
|
import { AbstractInvitationsHandler, InvitationsOptions } from './invitations-handler';
|
|
6
6
|
/**
|
|
7
7
|
* Handles the life-cycle of Space invitations between peers.
|
|
@@ -13,7 +13,7 @@ export declare class SpaceInvitationsHandler extends AbstractInvitationsHandler<
|
|
|
13
13
|
/**
|
|
14
14
|
* Creates an invitation and listens for a join request from the invited (guest) peer.
|
|
15
15
|
*/
|
|
16
|
-
createInvitation(space: Space, options?: InvitationsOptions):
|
|
16
|
+
createInvitation(space: Space, options?: InvitationsOptions): CancellableInvitationObservable;
|
|
17
17
|
/**
|
|
18
18
|
* Waits for the host peer (inviter) to accept our join request.
|
|
19
19
|
* The local guest peer (invitee) then sends the local space invitation to the host,
|