@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":"space-invitations-handler.d.ts","sourceRoot":"","sources":["../../../../src/packlets/invitations/space-invitations-handler.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,cAAc,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAIpE,OAAO,EAAyB,cAAc,EAAiC,MAAM,uBAAuB,CAAC;AAG7G,OAAO,EAAE,UAAU,EAAE,MAAM,4CAA4C,CAAC;
|
|
1
|
+
{"version":3,"file":"space-invitations-handler.d.ts","sourceRoot":"","sources":["../../../../src/packlets/invitations/space-invitations-handler.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,cAAc,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAIpE,OAAO,EAAyB,cAAc,EAAiC,MAAM,uBAAuB,CAAC;AAG7G,OAAO,EAAE,UAAU,EAAE,MAAM,4CAA4C,CAAC;AAIxE,OAAO,EACL,gCAAgC,EAChC,+BAA+B,EAKhC,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,0BAA0B,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAEvF;;GAEG;AAEH,qBAAa,uBAAwB,SAAQ,0BAA0B,CAAC,KAAK,CAAC;IAG1E,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,eAAe;gBAFhC,cAAc,EAAE,cAAc,EACb,aAAa,EAAE,YAAY,EAC3B,eAAe,EAAE,cAAc;IAKlD;;OAEG;IACH,gBAAgB,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,EAAE,kBAAkB,GAAG,+BAA+B;IAkI7F;;;;OAIG;IACH,gBAAgB,CAAC,UAAU,EAAE,UAAU,EAAE,OAAO,CAAC,EAAE,kBAAkB,GAAG,gCAAgC;CAiGzG"}
|
|
@@ -35,13 +35,13 @@ class SpaceInvitationsHandler extends invitations_handler_1.AbstractInvitationsH
|
|
|
35
35
|
*/
|
|
36
36
|
createInvitation(space, options) {
|
|
37
37
|
let swarmConnection;
|
|
38
|
-
const { type, timeout = invitations_1.INVITATION_TIMEOUT } = options !== null && options !== void 0 ? options : {};
|
|
38
|
+
const { type, timeout = invitations_1.INVITATION_TIMEOUT, swarmKey } = options !== null && options !== void 0 ? options : {};
|
|
39
39
|
(0, assert_1.default)(type !== services_1.Invitation.Type.OFFLINE);
|
|
40
40
|
(0, assert_1.default)(space);
|
|
41
41
|
const invitation = {
|
|
42
42
|
type,
|
|
43
43
|
invitationId: keys_1.PublicKey.random().toHex(),
|
|
44
|
-
swarmKey: keys_1.PublicKey.random(),
|
|
44
|
+
swarmKey: swarmKey !== null && swarmKey !== void 0 ? swarmKey : keys_1.PublicKey.random(),
|
|
45
45
|
spaceKey: space.key,
|
|
46
46
|
authenticationCode: (0, credentials_1.generatePasscode)(invitations_1.AUTHENTICATION_CODE_LENGTH)
|
|
47
47
|
};
|
|
@@ -53,19 +53,23 @@ class SpaceInvitationsHandler extends invitations_handler_1.AbstractInvitationsH
|
|
|
53
53
|
const complete = new async_1.Trigger();
|
|
54
54
|
const plugin = new protocol_plugin_rpc_1.RpcPlugin(async (port) => {
|
|
55
55
|
var _a, _b;
|
|
56
|
+
let guestProfile;
|
|
56
57
|
const peer = (0, rpc_1.createProtoRpcPeer)({
|
|
57
58
|
exposed: {
|
|
58
59
|
SpaceHostService: protocols_1.schema.getService('dxos.halo.invitations.SpaceHostService')
|
|
59
60
|
},
|
|
60
61
|
handlers: {
|
|
61
62
|
SpaceHostService: {
|
|
62
|
-
requestAdmission: async () => {
|
|
63
|
+
requestAdmission: async ({ profile }) => {
|
|
63
64
|
var _a, _b;
|
|
64
65
|
(0, log_1.log)('responding with admission offer', {
|
|
66
|
+
guestProfile: profile,
|
|
65
67
|
host: this._signingContext.deviceKey,
|
|
66
68
|
spaceKey: space.key
|
|
67
|
-
}, { file: "packages/sdk/client-services/src/packlets/invitations/space-invitations-handler.ts", line:
|
|
69
|
+
}, { file: "packages/sdk/client-services/src/packlets/invitations/space-invitations-handler.ts", line: 77, 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) });
|
|
70
|
+
guestProfile = profile;
|
|
68
71
|
// TODO(burdon): Is this the right place to set this state?
|
|
72
|
+
// TODO(dmaretskyi): Should we expose guest's profile in this callback?
|
|
69
73
|
(_b = (_a = observable.callback).onAuthenticating) === null || _b === void 0 ? void 0 : _b.call(_a, invitation);
|
|
70
74
|
return {
|
|
71
75
|
spaceKey: space.key,
|
|
@@ -73,7 +77,7 @@ class SpaceInvitationsHandler extends invitations_handler_1.AbstractInvitationsH
|
|
|
73
77
|
};
|
|
74
78
|
},
|
|
75
79
|
authenticate: async ({ authenticationCode: code }) => {
|
|
76
|
-
(0, log_1.log)('received authentication request', { authenticationCode: code }, { file: "packages/sdk/client-services/src/packlets/invitations/space-invitations-handler.ts", line:
|
|
80
|
+
(0, log_1.log)('received authentication request', { authenticationCode: code }, { file: "packages/sdk/client-services/src/packlets/invitations/space-invitations-handler.ts", line: 95, 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
81
|
authenticationCode = code;
|
|
78
82
|
},
|
|
79
83
|
presentAdmissionCredentials: async ({ identityKey, deviceKey, controlFeedKey, dataFeedKey }) => {
|
|
@@ -82,12 +86,14 @@ class SpaceInvitationsHandler extends invitations_handler_1.AbstractInvitationsH
|
|
|
82
86
|
if (invitation.type === undefined || invitation.type === services_1.Invitation.Type.INTERACTIVE) {
|
|
83
87
|
if (invitation.authenticationCode === undefined ||
|
|
84
88
|
authenticationCode !== invitation.authenticationCode) {
|
|
89
|
+
invitation.authenticationCode &&
|
|
90
|
+
log_1.log.error('bad auth code', { code: authenticationCode, expected: invitation.authenticationCode }, { file: "packages/sdk/client-services/src/packlets/invitations/space-invitations-handler.ts", line: 108, 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) });
|
|
85
91
|
throw new Error('authentication code not set');
|
|
86
92
|
}
|
|
87
93
|
}
|
|
88
|
-
(0, log_1.log)('writing guest credentials', { host: this._signingContext.deviceKey, guest: deviceKey }, { file: "packages/sdk/client-services/src/packlets/invitations/space-invitations-handler.ts", line:
|
|
94
|
+
(0, log_1.log)('writing guest credentials', { host: this._signingContext.deviceKey, guest: deviceKey }, { file: "packages/sdk/client-services/src/packlets/invitations/space-invitations-handler.ts", line: 113, 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) });
|
|
89
95
|
// TODO(burdon): Check if already admitted.
|
|
90
|
-
await (0, feed_store_1.writeMessages)(space.controlPipeline.writer, await (0, credentials_1.createAdmissionCredentials)(this._signingContext.credentialSigner, identityKey, deviceKey, space.key, controlFeedKey, dataFeedKey));
|
|
96
|
+
await (0, feed_store_1.writeMessages)(space.controlPipeline.writer, await (0, credentials_1.createAdmissionCredentials)(this._signingContext.credentialSigner, identityKey, deviceKey, space.key, controlFeedKey, dataFeedKey, guestProfile));
|
|
91
97
|
// Updating credentials complete.
|
|
92
98
|
complete.wake(deviceKey);
|
|
93
99
|
}
|
|
@@ -103,15 +109,15 @@ class SpaceInvitationsHandler extends invitations_handler_1.AbstractInvitationsH
|
|
|
103
109
|
});
|
|
104
110
|
try {
|
|
105
111
|
await peer.open();
|
|
106
|
-
(0, log_1.log)('connected', { host: this._signingContext.deviceKey }, { file: "packages/sdk/client-services/src/packlets/invitations/space-invitations-handler.ts", line:
|
|
112
|
+
(0, log_1.log)('connected', { host: this._signingContext.deviceKey }, { file: "packages/sdk/client-services/src/packlets/invitations/space-invitations-handler.ts", line: 143, 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) });
|
|
107
113
|
(_b = (_a = observable.callback).onConnected) === null || _b === void 0 ? void 0 : _b.call(_a, invitation);
|
|
108
114
|
const deviceKey = await complete.wait({ timeout });
|
|
109
|
-
(0, log_1.log)('admitted guest', { host: this._signingContext.deviceKey, guest: deviceKey }, { file: "packages/sdk/client-services/src/packlets/invitations/space-invitations-handler.ts", line:
|
|
115
|
+
(0, log_1.log)('admitted guest', { host: this._signingContext.deviceKey, guest: deviceKey }, { file: "packages/sdk/client-services/src/packlets/invitations/space-invitations-handler.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
116
|
observable.callback.onSuccess(invitation);
|
|
111
117
|
}
|
|
112
118
|
catch (err) {
|
|
113
119
|
if (!observable.cancelled) {
|
|
114
|
-
log_1.log.error('failed', err, { file: "packages/sdk/client-services/src/packlets/invitations/space-invitations-handler.ts", line:
|
|
120
|
+
log_1.log.error('failed', err, { file: "packages/sdk/client-services/src/packlets/invitations/space-invitations-handler.ts", line: 150, 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) });
|
|
115
121
|
observable.callback.onError(err);
|
|
116
122
|
}
|
|
117
123
|
}
|
|
@@ -125,7 +131,7 @@ class SpaceInvitationsHandler extends invitations_handler_1.AbstractInvitationsH
|
|
|
125
131
|
var _a, _b;
|
|
126
132
|
const topic = invitation.swarmKey;
|
|
127
133
|
const peerId = keys_1.PublicKey.random(); // Use anonymous key.
|
|
128
|
-
swarmConnection = await this._networkManager.
|
|
134
|
+
swarmConnection = await this._networkManager.joinSwarm({
|
|
129
135
|
topic,
|
|
130
136
|
peerId: topic,
|
|
131
137
|
protocol: (0, network_manager_1.createProtocolFactory)(topic, peerId, [plugin]),
|
|
@@ -169,25 +175,27 @@ class SpaceInvitationsHandler extends invitations_handler_1.AbstractInvitationsH
|
|
|
169
175
|
if (++connectionCount > 1) {
|
|
170
176
|
throw new Error(`multiple connections detected: ${connectionCount}`);
|
|
171
177
|
}
|
|
172
|
-
(0, log_1.log)('connected', { guest: this._signingContext.deviceKey }, { file: "packages/sdk/client-services/src/packlets/invitations/space-invitations-handler.ts", line:
|
|
178
|
+
(0, log_1.log)('connected', { guest: this._signingContext.deviceKey }, { file: "packages/sdk/client-services/src/packlets/invitations/space-invitations-handler.ts", line: 214, 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) });
|
|
173
179
|
(_b = (_a = observable.callback).onConnected) === null || _b === void 0 ? void 0 : _b.call(_a, invitation);
|
|
174
180
|
// 1. Send request.
|
|
175
|
-
(0, log_1.log)('sending admission request', { guest: this._signingContext.deviceKey }, { file: "packages/sdk/client-services/src/packlets/invitations/space-invitations-handler.ts", line:
|
|
176
|
-
const { spaceKey, genesisFeedKey } = await peer.rpc.SpaceHostService.requestAdmission(
|
|
181
|
+
(0, log_1.log)('sending admission request', { guest: this._signingContext.deviceKey }, { file: "packages/sdk/client-services/src/packlets/invitations/space-invitations-handler.ts", line: 218, 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
|
+
const { spaceKey, genesisFeedKey } = await peer.rpc.SpaceHostService.requestAdmission({
|
|
183
|
+
profile: this._signingContext.profile
|
|
184
|
+
});
|
|
177
185
|
// 2. Get authentication code.
|
|
178
186
|
// TODO(burdon): Test timeout (options for timeouts at different steps).
|
|
179
187
|
if (invitation.type === undefined || invitation.type === services_1.Invitation.Type.INTERACTIVE) {
|
|
180
|
-
(0, log_1.log)('guest waiting for authentication code...', {}, { file: "packages/sdk/client-services/src/packlets/invitations/space-invitations-handler.ts", line:
|
|
188
|
+
(0, log_1.log)('guest waiting for authentication code...', {}, { file: "packages/sdk/client-services/src/packlets/invitations/space-invitations-handler.ts", line: 226, 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) });
|
|
181
189
|
(_d = (_c = observable.callback).onAuthenticating) === null || _d === void 0 ? void 0 : _d.call(_c, invitation);
|
|
182
190
|
const authenticationCode = await authenticated.wait({ timeout });
|
|
183
|
-
(0, log_1.log)('sending authentication request', {}, { file: "packages/sdk/client-services/src/packlets/invitations/space-invitations-handler.ts", line:
|
|
191
|
+
(0, log_1.log)('sending authentication request', {}, { file: "packages/sdk/client-services/src/packlets/invitations/space-invitations-handler.ts", line: 229, 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) });
|
|
184
192
|
await peer.rpc.SpaceHostService.authenticate({ authenticationCode });
|
|
185
193
|
}
|
|
186
194
|
// 3. Create local space.
|
|
187
195
|
// TODO(burdon): Abandon if does not complete (otherwise retry will fail).
|
|
188
196
|
const space = await this._spaceManager.acceptSpace({ spaceKey, genesisFeedKey });
|
|
189
197
|
// 4. Send admission credentials to host (with local space keys).
|
|
190
|
-
(0, log_1.log)('presenting admission credentials', { guest: this._signingContext.deviceKey, spaceKey: space.key }, { file: "packages/sdk/client-services/src/packlets/invitations/space-invitations-handler.ts", line:
|
|
198
|
+
(0, log_1.log)('presenting admission credentials', { guest: this._signingContext.deviceKey, spaceKey: space.key }, { file: "packages/sdk/client-services/src/packlets/invitations/space-invitations-handler.ts", line: 238, 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) });
|
|
191
199
|
await peer.rpc.SpaceHostService.presentAdmissionCredentials({
|
|
192
200
|
identityKey: this._signingContext.identityKey,
|
|
193
201
|
deviceKey: this._signingContext.deviceKey,
|
|
@@ -195,12 +203,12 @@ class SpaceInvitationsHandler extends invitations_handler_1.AbstractInvitationsH
|
|
|
195
203
|
dataFeedKey: space.dataFeedKey
|
|
196
204
|
});
|
|
197
205
|
// 5. Success.
|
|
198
|
-
(0, log_1.log)('admitted by host', { guest: this._signingContext.deviceKey, spaceKey: space.key }, { file: "packages/sdk/client-services/src/packlets/invitations/space-invitations-handler.ts", line:
|
|
206
|
+
(0, log_1.log)('admitted by host', { guest: this._signingContext.deviceKey, spaceKey: space.key }, { file: "packages/sdk/client-services/src/packlets/invitations/space-invitations-handler.ts", line: 247, 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
207
|
complete.wake();
|
|
200
208
|
}
|
|
201
209
|
catch (err) {
|
|
202
210
|
if (!observable.cancelled) {
|
|
203
|
-
log_1.log.warn('failed', err, { file: "packages/sdk/client-services/src/packlets/invitations/space-invitations-handler.ts", line:
|
|
211
|
+
log_1.log.warn('failed', err, { file: "packages/sdk/client-services/src/packlets/invitations/space-invitations-handler.ts", line: 251, 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
212
|
observable.callback.onError(err);
|
|
205
213
|
}
|
|
206
214
|
}
|
|
@@ -213,7 +221,7 @@ class SpaceInvitationsHandler extends invitations_handler_1.AbstractInvitationsH
|
|
|
213
221
|
(0, assert_1.default)(invitation.swarmKey);
|
|
214
222
|
const topic = invitation.swarmKey;
|
|
215
223
|
const peerId = keys_1.PublicKey.random(); // Use anonymous key.
|
|
216
|
-
swarmConnection = await this._networkManager.
|
|
224
|
+
swarmConnection = await this._networkManager.joinSwarm({
|
|
217
225
|
topic,
|
|
218
226
|
peerId: keys_1.PublicKey.random(),
|
|
219
227
|
protocol: (0, network_manager_1.createProtocolFactory)(topic, peerId, [plugin]),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"space-invitations-handler.js","sourceRoot":"","sources":["../../../../src/packlets/invitations/space-invitations-handler.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,oDAA4B;AAE5B,uCAA6C;AAC7C,mDAAiF;AAEjF,iDAAiD;AACjD,qCAAuC;AACvC,mCAAgC;AAChC,2DAA6G;AAC7G,mEAAuE;AACvE,+CAAyC;AACzC,yEAAwE;
|
|
1
|
+
{"version":3,"file":"space-invitations-handler.js","sourceRoot":"","sources":["../../../../src/packlets/invitations/space-invitations-handler.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,7 @@ import { ModelFactory } from '@dxos/model-factory';
|
|
|
6
6
|
import { NetworkManager } from '@dxos/network-manager';
|
|
7
7
|
import type { FeedMessage } from '@dxos/protocols/proto/dxos/echo/feed';
|
|
8
8
|
import { Storage } from '@dxos/random-access-storage';
|
|
9
|
-
import { IdentityManager } from '../identity';
|
|
9
|
+
import { CreateIdentityOptions, IdentityManager } from '../identity';
|
|
10
10
|
import { HaloInvitationsHandler, SpaceInvitationsHandler } from '../invitations';
|
|
11
11
|
/**
|
|
12
12
|
* Shared backend for all client services.
|
|
@@ -27,7 +27,8 @@ export declare class ServiceContext {
|
|
|
27
27
|
constructor(storage: Storage, networkManager: NetworkManager, modelFactory: ModelFactory);
|
|
28
28
|
open(): Promise<void>;
|
|
29
29
|
close(): Promise<void>;
|
|
30
|
-
|
|
30
|
+
reset(): Promise<void>;
|
|
31
|
+
createIdentity(params?: CreateIdentityOptions): Promise<import("../identity").Identity>;
|
|
31
32
|
private _initialize;
|
|
32
33
|
}
|
|
33
34
|
//# sourceMappingURL=service-context.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service-context.d.ts","sourceRoot":"","sources":["../../../../src/packlets/services/service-context.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAEtC,OAAO,EAIL,wBAAwB,EACxB,aAAa,EACb,YAAY,EAEb,MAAM,eAAe,CAAC;AACvB,OAAO,EAAe,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC1D,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAExC,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AACxE,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAEtD,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"service-context.d.ts","sourceRoot":"","sources":["../../../../src/packlets/services/service-context.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAEtC,OAAO,EAIL,wBAAwB,EACxB,aAAa,EACb,YAAY,EAEb,MAAM,eAAe,CAAC;AACvB,OAAO,EAAe,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC1D,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAExC,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AACxE,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAEtD,OAAO,EAAE,qBAAqB,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AACrE,OAAO,EAAE,sBAAsB,EAAE,uBAAuB,EAAE,MAAM,gBAAgB,CAAC;AAEjF;;GAEG;AAGH,qBAAa,cAAc;aAeP,OAAO,EAAE,OAAO;aAChB,cAAc,EAAE,cAAc;aAC9B,YAAY,EAAE,YAAY;IAhB5C,SAAgB,WAAW,gBAAiB;IAC5C,SAAgB,wBAAwB,2BAAkC;IAC1E,SAAgB,aAAa,EAAE,aAAa,CAAC;IAC7C,SAAgB,SAAS,EAAE,SAAS,CAAC,WAAW,CAAC,CAAC;IAClD,SAAgB,OAAO,EAAE,OAAO,CAAC;IACjC,SAAgB,eAAe,EAAE,eAAe,CAAC;IACjD,SAAgB,eAAe,EAAE,sBAAsB,CAAC;IAGjD,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,gBAAgB,CAAC,EAAE,uBAAuB,CAAC;gBAIhC,OAAO,EAAE,OAAO,EAChB,cAAc,EAAE,cAAc,EAC9B,YAAY,EAAE,YAAY;IA4BtC,IAAI;IASJ,KAAK;IAUL,KAAK;IAOL,cAAc,CAAC,MAAM,GAAE,qBAA0B;YASzC,WAAW;CA2B1B"}
|
|
@@ -42,25 +42,31 @@ class ServiceContext {
|
|
|
42
42
|
this.haloInvitations = new invitations_1.HaloInvitationsHandler(this.networkManager, this.identityManager);
|
|
43
43
|
}
|
|
44
44
|
async open() {
|
|
45
|
-
(0, log_1.log)('opening...', {}, { file: "packages/sdk/client-services/src/packlets/services/service-context.ts", line:
|
|
45
|
+
(0, log_1.log)('opening...', {}, { file: "packages/sdk/client-services/src/packlets/services/service-context.ts", line: 78, 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) });
|
|
46
46
|
await this.identityManager.open();
|
|
47
47
|
if (this.identityManager.identity) {
|
|
48
48
|
await this._initialize();
|
|
49
49
|
}
|
|
50
|
-
(0, log_1.log)('opened', {}, { file: "packages/sdk/client-services/src/packlets/services/service-context.ts", line:
|
|
50
|
+
(0, log_1.log)('opened', {}, { file: "packages/sdk/client-services/src/packlets/services/service-context.ts", line: 83, 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) });
|
|
51
51
|
}
|
|
52
52
|
async close() {
|
|
53
53
|
var _a;
|
|
54
|
-
(0, log_1.log)('closing...', {}, { file: "packages/sdk/client-services/src/packlets/services/service-context.ts", line:
|
|
54
|
+
(0, log_1.log)('closing...', {}, { file: "packages/sdk/client-services/src/packlets/services/service-context.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) });
|
|
55
55
|
await this.identityManager.close();
|
|
56
56
|
await ((_a = this.spaceManager) === null || _a === void 0 ? void 0 : _a.close());
|
|
57
57
|
await this.feedStore.close();
|
|
58
|
-
await this.networkManager.
|
|
58
|
+
await this.networkManager.close();
|
|
59
59
|
this.dataServiceSubscriptions.clear();
|
|
60
|
-
(0, log_1.log)('closed', {}, { file: "packages/sdk/client-services/src/packlets/services/service-context.ts", line:
|
|
60
|
+
(0, log_1.log)('closed', {}, { file: "packages/sdk/client-services/src/packlets/services/service-context.ts", line: 93, 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) });
|
|
61
61
|
}
|
|
62
|
-
async
|
|
63
|
-
|
|
62
|
+
async reset() {
|
|
63
|
+
(0, log_1.log)('resetting...', {}, { file: "packages/sdk/client-services/src/packlets/services/service-context.ts", line: 97, 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) });
|
|
64
|
+
await this.close();
|
|
65
|
+
await this.storage.reset();
|
|
66
|
+
(0, log_1.log)('reset', {}, { file: "packages/sdk/client-services/src/packlets/services/service-context.ts", line: 100, 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
|
+
}
|
|
68
|
+
async createIdentity(params = {}) {
|
|
69
|
+
const identity = await this.identityManager.createIdentity(params);
|
|
64
70
|
this.dataServiceSubscriptions.registerSpace(identity.haloSpaceKey, identity.haloDatabase.createDataServiceHost());
|
|
65
71
|
await this._initialize();
|
|
66
72
|
return identity;
|
|
@@ -74,7 +80,8 @@ class ServiceContext {
|
|
|
74
80
|
credentialAuthenticator: echo_db_1.MOCK_AUTH_VERIFIER,
|
|
75
81
|
credentialSigner: identity.getIdentityCredentialSigner(),
|
|
76
82
|
identityKey: identity.identityKey,
|
|
77
|
-
deviceKey: identity.deviceKey
|
|
83
|
+
deviceKey: identity.deviceKey,
|
|
84
|
+
profile: identity.profileDocument
|
|
78
85
|
};
|
|
79
86
|
// Create in constructor (avoid all of these private variables).
|
|
80
87
|
const spaceManager = new echo_db_1.SpaceManager({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service-context.js","sourceRoot":"","sources":["../../../../src/packlets/services/service-context.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;AAEF,uCAAsC;AACtC,uCAA4C;AAC5C,2CAQuB;AACvB,iDAA0D;AAC1D,2CAAwC;AACxC,mCAAgC;AAMhC,
|
|
1
|
+
{"version":3,"file":"service-context.js","sourceRoot":"","sources":["../../../../src/packlets/services/service-context.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ import { HaloInvitationsService, SpaceInvitationsService, SpacesService, Devices
|
|
|
3
3
|
import { DevtoolsHost, TracingService } from '@dxos/protocols/proto/dxos/devtools/host';
|
|
4
4
|
import { DataService } from '@dxos/protocols/proto/dxos/echo/service';
|
|
5
5
|
import { ServiceBundle } from '@dxos/rpc';
|
|
6
|
-
export
|
|
6
|
+
export type ClientServices = {
|
|
7
7
|
HaloInvitationsService: HaloInvitationsService;
|
|
8
8
|
DevicesService: DevicesService;
|
|
9
9
|
SpaceInvitationsService: SpaceInvitationsService;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service-definitions.d.ts","sourceRoot":"","sources":["../../../../src/packlets/services/service-definitions.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAC;AAChG,OAAO,EACL,sBAAsB,EACtB,uBAAuB,EACvB,aAAa,EACb,cAAc,EACf,MAAM,4CAA4C,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,0CAA0C,CAAC;AACxF,OAAO,EAAE,WAAW,EAAE,MAAM,yCAAyC,CAAC;AACtE,OAAO,EAAuB,aAAa,EAAE,MAAM,WAAW,CAAC;AAM/D,
|
|
1
|
+
{"version":3,"file":"service-definitions.d.ts","sourceRoot":"","sources":["../../../../src/packlets/services/service-definitions.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAC;AAChG,OAAO,EACL,sBAAsB,EACtB,uBAAuB,EACvB,aAAa,EACb,cAAc,EACf,MAAM,4CAA4C,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,0CAA0C,CAAC;AACxF,OAAO,EAAE,WAAW,EAAE,MAAM,yCAAyC,CAAC;AACtE,OAAO,EAAuB,aAAa,EAAE,MAAM,WAAW,CAAC;AAM/D,MAAM,MAAM,cAAc,GAAG;IAC3B,sBAAsB,EAAE,sBAAsB,CAAC;IAC/C,cAAc,EAAE,cAAc,CAAC;IAE/B,uBAAuB,EAAE,uBAAuB,CAAC;IACjD,aAAa,EAAE,aAAa,CAAC;IAG7B,YAAY,EAAE,YAAY,CAAC;IAC3B,WAAW,EAAE,WAAW,CAAC;IACzB,cAAc,EAAE,cAAc,CAAC;IAC/B,aAAa,EAAE,aAAa,CAAC;IAC7B,YAAY,EAAE,YAAY,CAAC;IAC3B,cAAc,EAAE,cAAc,CAAC;CAChC,CAAC;AAEF;;GAEG;AACH,MAAM,WAAW,sBAAsB;IACrC,WAAW,EAAE,aAAa,CAAC,cAAc,CAAC,CAAC;IAC3C,QAAQ,EAAE,cAAc,CAAC;IAEzB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACtB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACxB;AAED;;GAEG;AACH,eAAO,MAAM,mBAAmB,+BAa9B,CAAC"}
|
|
@@ -2,23 +2,27 @@ import { Config } from '@dxos/config';
|
|
|
2
2
|
import { ModelFactory } from '@dxos/model-factory';
|
|
3
3
|
import { NetworkManager } from '@dxos/network-manager';
|
|
4
4
|
import { ClientServicesProvider, ClientServices } from './service-definitions';
|
|
5
|
-
declare
|
|
5
|
+
export declare const createDefaultModelFactory: () => ModelFactory;
|
|
6
|
+
type ClientServicesHostParams = {
|
|
6
7
|
config: Config;
|
|
7
8
|
modelFactory?: ModelFactory;
|
|
8
9
|
networkManager: NetworkManager;
|
|
9
10
|
};
|
|
10
|
-
export declare const createDefaultModelFactory: () => ModelFactory;
|
|
11
11
|
/**
|
|
12
12
|
* Remote service implementation.
|
|
13
13
|
*/
|
|
14
14
|
export declare class ClientServicesHost implements ClientServicesProvider {
|
|
15
|
-
private
|
|
16
|
-
private
|
|
15
|
+
private _serviceContext;
|
|
16
|
+
private _serviceRegistry;
|
|
17
|
+
private readonly _config;
|
|
18
|
+
private readonly _modelFactory;
|
|
19
|
+
private readonly _networkManager;
|
|
17
20
|
constructor({ config, modelFactory, networkManager }: ClientServicesHostParams);
|
|
18
21
|
get descriptors(): import("@dxos/rpc").ServiceBundle<ClientServices>;
|
|
19
22
|
get services(): ClientServices;
|
|
20
23
|
open(): Promise<void>;
|
|
21
24
|
close(): Promise<void>;
|
|
25
|
+
_initialize(): Promise<void>;
|
|
22
26
|
}
|
|
23
27
|
export {};
|
|
24
28
|
//# sourceMappingURL=service-host.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service-host.d.ts","sourceRoot":"","sources":["../../../../src/packlets/services/service-host.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAItC,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAWvD,OAAO,EAAE,sBAAsB,EAAE,cAAc,EAAuB,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"service-host.d.ts","sourceRoot":"","sources":["../../../../src/packlets/services/service-host.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAItC,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAWvD,OAAO,EAAE,sBAAsB,EAAE,cAAc,EAAuB,MAAM,uBAAuB,CAAC;AAKpG,eAAO,MAAM,yBAAyB,oBAErC,CAAC;AAEF,KAAK,wBAAwB,GAAG;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,cAAc,EAAE,cAAc,CAAC;CAChC,CAAC;AAEF;;GAEG;AACH,qBAAa,kBAAmB,YAAW,sBAAsB;IAC/D,OAAO,CAAC,eAAe,CAAkB;IACzC,OAAO,CAAC,gBAAgB,CAAmC;IAE3D,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IACjC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAe;IAC7C,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAiB;gBAErC,EACV,MAAM,EACN,YAA0C,EAE1C,cAAc,EACf,EAAE,wBAAwB;IAM3B,IAAI,WAAW,sDAEd;IAED,IAAI,QAAQ,mBAEX;IAEK,IAAI;IASJ,KAAK;IAQL,WAAW;CAsClB"}
|
|
@@ -28,15 +28,42 @@ exports.createDefaultModelFactory = createDefaultModelFactory;
|
|
|
28
28
|
/**
|
|
29
29
|
* Remote service implementation.
|
|
30
30
|
*/
|
|
31
|
-
// TODO(burdon): Reconcile Host/Backend, etc.
|
|
32
31
|
class ClientServicesHost {
|
|
33
32
|
constructor({ config, modelFactory = (0, exports.createDefaultModelFactory)(),
|
|
34
33
|
// TODO(burdon): Create ApolloLink abstraction (see Client).
|
|
35
34
|
networkManager }) {
|
|
35
|
+
this._config = config;
|
|
36
|
+
this._modelFactory = modelFactory;
|
|
37
|
+
this._networkManager = networkManager;
|
|
38
|
+
}
|
|
39
|
+
get descriptors() {
|
|
40
|
+
return this._serviceRegistry.descriptors;
|
|
41
|
+
}
|
|
42
|
+
get services() {
|
|
43
|
+
return this._serviceRegistry.services;
|
|
44
|
+
}
|
|
45
|
+
async open() {
|
|
46
|
+
var _a;
|
|
47
|
+
await this._initialize();
|
|
48
|
+
const deviceKey = (_a = this._serviceContext.identityManager.identity) === null || _a === void 0 ? void 0 : _a.deviceKey;
|
|
49
|
+
(0, log_1.log)('opening...', { deviceKey }, { file: "packages/sdk/client-services/src/packlets/services/service-host.ts", line: 69, 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) });
|
|
50
|
+
await this._initialize();
|
|
51
|
+
await this._serviceContext.open();
|
|
52
|
+
(0, log_1.log)('opened', { deviceKey }, { file: "packages/sdk/client-services/src/packlets/services/service-host.ts", line: 72, 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) });
|
|
53
|
+
}
|
|
54
|
+
async close() {
|
|
55
|
+
var _a;
|
|
56
|
+
const deviceKey = (_a = this._serviceContext.identityManager.identity) === null || _a === void 0 ? void 0 : _a.deviceKey;
|
|
57
|
+
(0, log_1.log)('closing...', { deviceKey }, { file: "packages/sdk/client-services/src/packlets/services/service-host.ts", line: 77, 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) });
|
|
58
|
+
await this._serviceContext.close();
|
|
59
|
+
(0, log_1.log)('closed', { deviceKey }, { file: "packages/sdk/client-services/src/packlets/services/service-host.ts", line: 79, 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) });
|
|
60
|
+
}
|
|
61
|
+
// TODO(burdon): Move into open.
|
|
62
|
+
async _initialize() {
|
|
36
63
|
// TODO(dmaretskyi): Remove keyStorage.
|
|
37
|
-
const { storage } = (0, storage_1.createStorageObjects)(
|
|
64
|
+
const { storage } = (0, storage_1.createStorageObjects)(this._config.get('runtime.client.storage', {}));
|
|
38
65
|
// TODO(burdon): Break into components.
|
|
39
|
-
this._serviceContext = new service_context_1.ServiceContext(storage,
|
|
66
|
+
this._serviceContext = new service_context_1.ServiceContext(storage, this._networkManager, this._modelFactory);
|
|
40
67
|
// TODO(burdon): Start to think of DMG (dynamic services).
|
|
41
68
|
this._serviceRegistry = new service_registry_1.ServiceRegistry(service_definitions_1.clientServiceBundle, {
|
|
42
69
|
HaloInvitationsService: new invitations_1.HaloInvitationsServiceImpl(this._serviceContext.identityManager, this._serviceContext.haloInvitations),
|
|
@@ -47,35 +74,15 @@ class ClientServicesHost {
|
|
|
47
74
|
// TODO(burdon): Move to new protobuf definitions.
|
|
48
75
|
ProfileService: new deprecated_1.ProfileServiceImpl(this._serviceContext),
|
|
49
76
|
SpaceService: new deprecated_1.SpaceServiceImpl(this._serviceContext),
|
|
50
|
-
SystemService: new deprecated_1.SystemServiceImpl(
|
|
51
|
-
TracingService: new deprecated_1.TracingServiceImpl(
|
|
77
|
+
SystemService: new deprecated_1.SystemServiceImpl(this._config, this._serviceContext),
|
|
78
|
+
TracingService: new deprecated_1.TracingServiceImpl(this._config),
|
|
52
79
|
DevtoolsHost: new devtools_1.DevtoolsServiceImpl({
|
|
53
80
|
events: new devtools_1.DevtoolsHostEvents(),
|
|
54
|
-
config,
|
|
81
|
+
config: this._config,
|
|
55
82
|
context: this._serviceContext
|
|
56
83
|
})
|
|
57
84
|
});
|
|
58
85
|
}
|
|
59
|
-
get descriptors() {
|
|
60
|
-
return this._serviceRegistry.descriptors;
|
|
61
|
-
}
|
|
62
|
-
get services() {
|
|
63
|
-
return this._serviceRegistry.services;
|
|
64
|
-
}
|
|
65
|
-
async open() {
|
|
66
|
-
var _a;
|
|
67
|
-
const deviceKey = (_a = this._serviceContext.identityManager.identity) === null || _a === void 0 ? void 0 : _a.deviceKey;
|
|
68
|
-
(0, log_1.log)('opening...', { deviceKey }, { file: "packages/sdk/client-services/src/packlets/services/service-host.ts", line: 98 });
|
|
69
|
-
await this._serviceContext.open();
|
|
70
|
-
(0, log_1.log)('opened', { deviceKey }, { file: "packages/sdk/client-services/src/packlets/services/service-host.ts", line: 100 });
|
|
71
|
-
}
|
|
72
|
-
async close() {
|
|
73
|
-
var _a;
|
|
74
|
-
const deviceKey = (_a = this._serviceContext.identityManager.identity) === null || _a === void 0 ? void 0 : _a.deviceKey;
|
|
75
|
-
(0, log_1.log)('closing...', { deviceKey }, { file: "packages/sdk/client-services/src/packlets/services/service-host.ts", line: 105 });
|
|
76
|
-
await this._serviceContext.close();
|
|
77
|
-
(0, log_1.log)('closed', { deviceKey }, { file: "packages/sdk/client-services/src/packlets/services/service-host.ts", line: 107 });
|
|
78
|
-
}
|
|
79
86
|
}
|
|
80
87
|
exports.ClientServicesHost = ClientServicesHost;
|
|
81
88
|
//# sourceMappingURL=service-host.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service-host.js","sourceRoot":"","sources":["../../../../src/packlets/services/service-host.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;AAGF,uCAAoC;AACpC,2CAAgD;AAChD,mCAAgC;AAChC,uDAAmD;AAEnD,qDAAiD;AACjD,iDAA6C;AAE7C,8CAA4G;AAC5G,0CAAsE;AACtE,2EAAsE;AACtE,gDAAyF;AACzF,sCAA8C;AAC9C,wCAAkD;AAClD,uDAAmD;AACnD,+DAAoG;AACpG,yDAAqD;
|
|
1
|
+
{"version":3,"file":"service-host.js","sourceRoot":"","sources":["../../../../src/packlets/services/service-host.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service-proxy.d.ts","sourceRoot":"","sources":["../../../../src/packlets/services/service-proxy.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"service-proxy.d.ts","sourceRoot":"","sources":["../../../../src/packlets/services/service-proxy.ts"],"names":[],"mappings":"AAMA,OAAO,EAAsB,YAAY,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEtE,OAAO,EAAE,sBAAsB,EAAE,cAAc,EAAuB,MAAM,uBAAuB,CAAC;AAEpG;;;GAGG;AAGH,qBAAa,mBAAoB,YAAW,sBAAsB;IAQ9D,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAP3B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA+B;gBAIpD,IAAI,EAAE,OAAO,EAGI,QAAQ,SAAO;IAUlC,IAAI,KAAK,iCAER;IAED,IAAI,WAAW,sDAEd;IAED,IAAI,QAAQ,mBAEX;IAEK,IAAI;IAIJ,KAAK;CAGZ"}
|
|
@@ -5,8 +5,8 @@
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.ClientServicesProxy = void 0;
|
|
7
7
|
const async_1 = require("@dxos/async");
|
|
8
|
+
const errors_1 = require("@dxos/errors");
|
|
8
9
|
const rpc_1 = require("@dxos/rpc");
|
|
9
|
-
const errors_1 = require("../../errors");
|
|
10
10
|
const service_definitions_1 = require("./service-definitions");
|
|
11
11
|
/**
|
|
12
12
|
* Implements services that are not local to the app.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service-proxy.js","sourceRoot":"","sources":["../../../../src/packlets/services/service-proxy.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;AAEF,uCAA2C;AAC3C,mCAAsE;AAEtE
|
|
1
|
+
{"version":3,"file":"service-proxy.js","sourceRoot":"","sources":["../../../../src/packlets/services/service-proxy.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;AAEF,uCAA2C;AAC3C,yCAA8D;AAC9D,mCAAsE;AAEtE,+DAAoG;AAEpG;;;GAGG;AACH,6EAA6E;AAC7E,6GAA6G;AAC7G,MAAa,mBAAmB;IAG9B,kBAAkB;IAClB,YACE,IAAa;IACb,iFAAiF;IACjF,kIAAkI;IACjH,WAAW,IAAI;QAAf,aAAQ,GAAR,QAAQ,CAAO;QAEhC,IAAI,CAAC,MAAM,GAAG,IAAA,wBAAkB,EAAC;YAC/B,SAAS,EAAE,yCAAmB;YAC9B,OAAO,EAAE,EAAE;YACX,QAAQ,EAAE,EAAE;YACZ,IAAI;SACL,CAAC,CAAC;IACL,CAAC;IAED,IAAI,KAAK;QACP,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAED,IAAI,WAAW;QACb,OAAO,yCAAmB,CAAC;IAC7B,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,IAAI;QACR,MAAM,IAAA,oBAAY,EAAC,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,uCAA8B,EAAE,CAAC,CAAC;IAC9F,CAAC;IAED,KAAK,CAAC,KAAK;QACT,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;IAC5B,CAAC;CACF;AArCD,kDAqCC"}
|
|
@@ -40,16 +40,16 @@ describe('service registry', function () {
|
|
|
40
40
|
handlers: serviceRegistry.services,
|
|
41
41
|
port: serverPort
|
|
42
42
|
});
|
|
43
|
-
(0, log_1.log)('opening...', {}, { file: "packages/sdk/client-services/src/packlets/services/service-registry.test.ts", line: 60 });
|
|
43
|
+
(0, log_1.log)('opening...', {}, { file: "packages/sdk/client-services/src/packlets/services/service-registry.test.ts", line: 60, 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) });
|
|
44
44
|
await Promise.all([proxy.open(), server.open()]);
|
|
45
|
-
(0, log_1.log)('open', {}, { file: "packages/sdk/client-services/src/packlets/services/service-registry.test.ts", line: 62 });
|
|
45
|
+
(0, log_1.log)('open', {}, { file: "packages/sdk/client-services/src/packlets/services/service-registry.test.ts", line: 62, 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) });
|
|
46
46
|
const done = new async_1.Trigger(); // createRpcServer
|
|
47
47
|
{
|
|
48
48
|
const spaceInvitationsProxy = new invitations_1.SpaceInvitationsProxy(proxy.rpc.SpaceInvitationsService);
|
|
49
49
|
const observer = spaceInvitationsProxy.createInvitation(space.key);
|
|
50
50
|
observer.subscribe({
|
|
51
51
|
onConnecting: (invitation) => {
|
|
52
|
-
(0, log_1.log)('connecting', invitation, { file: "packages/sdk/client-services/src/packlets/services/service-registry.test.ts", line: 71 });
|
|
52
|
+
(0, log_1.log)('connecting', invitation, { file: "packages/sdk/client-services/src/packlets/services/service-registry.test.ts", line: 71, 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) });
|
|
53
53
|
void observer.cancel();
|
|
54
54
|
},
|
|
55
55
|
onCancelled: () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service-registry.test.js","sourceRoot":"","sources":["../../../../src/packlets/services/service-registry.test.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;AAEF,oDAA4B;AAE5B,uCAAsC;AACtC,mCAAgC;AAChC,+CAAyC;AAEzC,mCAAuF;AAEvF,gDAAoF;AACpF,wCAAkD;AAClD,yDAAqD;AAQrD,MAAM,aAAa,GAAG,IAAA,yBAAmB,EAAe;IACtD,uBAAuB,EAAE,kBAAM,CAAC,UAAU,CAAC,8CAA8C,CAAC;CAC3F,CAAC,CAAC;AAEH,QAAQ,CAAC,kBAAkB,EAAE;IAC3B,EAAE,CAAC,2BAA2B,EAAE,KAAK;QACnC,MAAM,cAAc,GAAG,IAAA,8BAAoB,GAAE,CAAC;QAC9C,MAAM,cAAc,CAAC,IAAI,EAAE,CAAC;QAC5B,MAAM,cAAc,CAAC,cAAc,EAAE,CAAC;QAEtC,IAAA,gBAAM,EAAC,cAAc,CAAC,YAAY,CAAC,CAAC;QACpC,IAAA,gBAAM,EAAC,cAAc,CAAC,gBAAgB,CAAC,CAAC;QACxC,MAAM,KAAK,GAAG,MAAM,cAAc,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC;QAE9D,MAAM,eAAe,GAAG,IAAI,kCAAe,CAAC,aAAa,EAAE;YACzD,uBAAuB,EAAE,IAAI,yCAA2B,CACtD,cAAc,CAAC,eAAe,EAC9B,GAAG,EAAE,CAAC,cAAc,CAAC,gBAAiB,EACtC,GAAG,EAAE,CAAC,cAAc,CAAC,YAAa,CACnC;SACF,CAAC,CAAC;QAEH,MAAM,CAAC,SAAS,EAAE,UAAU,CAAC,GAAG,IAAA,uBAAiB,GAAE,CAAC;QAEpD,MAAM,KAAK,GAAG,IAAA,wBAAkB,EAAC;YAC/B,SAAS,EAAE,eAAe,CAAC,WAAW;YACtC,OAAO,EAAE,EAAE;YACX,QAAQ,EAAE,EAAE;YACZ,IAAI,EAAE,SAAS;SAChB,CAAC,CAAC;QAEH,MAAM,MAAM,GAAG,IAAA,wBAAkB,EAAC;YAChC,OAAO,EAAE,eAAe,CAAC,WAAW;YACpC,QAAQ,EAAE,eAAe,CAAC,QAAQ;YAClC,IAAI,EAAE,UAAU;SACjB,CAAC,CAAC;QAEH,IAAA,SAAG,EAAC,YAAY,
|
|
1
|
+
{"version":3,"file":"service-registry.test.js","sourceRoot":"","sources":["../../../../src/packlets/services/service-registry.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Runtime } from '@dxos/protocols/proto/dxos/config';
|
|
2
|
-
export
|
|
2
|
+
export type KeyStorageType = 'ram' | 'leveljs' | 'jsondown';
|
|
3
3
|
export declare const createStorageObjects: (config: Runtime.Client.Storage) => {
|
|
4
4
|
storage: import("@dxos/random-access-storage").Storage;
|
|
5
5
|
keyStorage: any;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"storage.d.ts","sourceRoot":"","sources":["../../../../src/packlets/storage/storage.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"storage.d.ts","sourceRoot":"","sources":["../../../../src/packlets/storage/storage.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,OAAO,EAAE,MAAM,mCAAmC,CAAC;AAM5D,MAAM,MAAM,cAAc,GAAG,KAAK,GAAG,SAAS,GAAG,UAAU,CAAC;AAG5D,eAAO,MAAM,oBAAoB,WAAY,QAAQ,MAAM,QAAQ;;;CA4BlE,CAAC"}
|
|
@@ -10,26 +10,26 @@ exports.createStorageObjects = void 0;
|
|
|
10
10
|
const jsondown_1 = __importDefault(require("jsondown")); // TODO(burdon): Uses custom implementation.
|
|
11
11
|
const level_js_1 = __importDefault(require("level-js"));
|
|
12
12
|
const memdown_1 = __importDefault(require("memdown"));
|
|
13
|
+
const errors_1 = require("@dxos/errors");
|
|
13
14
|
const config_1 = require("@dxos/protocols/proto/dxos/config");
|
|
14
15
|
const random_access_storage_1 = require("@dxos/random-access-storage");
|
|
15
16
|
const util_1 = require("@dxos/util");
|
|
16
17
|
var StorageDriver = config_1.Runtime.Client.Storage.StorageDriver;
|
|
17
|
-
const errors_1 = require("../../errors");
|
|
18
18
|
// TODO(burdon): Factor out.
|
|
19
19
|
const createStorageObjects = (config) => {
|
|
20
20
|
const { path = 'dxos/storage', // TODO(burdon): Factor out const.
|
|
21
21
|
storageType, keyStorage, persistent = false } = config !== null && config !== void 0 ? config : {};
|
|
22
22
|
if (persistent && storageType === StorageDriver.RAM) {
|
|
23
|
-
throw new errors_1.
|
|
23
|
+
throw new errors_1.InvalidConfigError('RAM storage cannot be used in persistent mode.');
|
|
24
24
|
}
|
|
25
25
|
if (!persistent && storageType !== undefined && storageType !== StorageDriver.RAM) {
|
|
26
|
-
throw new errors_1.
|
|
26
|
+
throw new errors_1.InvalidConfigError('Cannot use a persistent storage in not persistent mode.');
|
|
27
27
|
}
|
|
28
28
|
if (persistent && keyStorage === StorageDriver.RAM) {
|
|
29
|
-
throw new errors_1.
|
|
29
|
+
throw new errors_1.InvalidConfigError('RAM key storage cannot be used in persistent mode.');
|
|
30
30
|
}
|
|
31
31
|
if (!persistent && keyStorage !== StorageDriver.RAM && keyStorage !== undefined) {
|
|
32
|
-
throw new errors_1.
|
|
32
|
+
throw new errors_1.InvalidConfigError('Cannot use a persistent key storage in not persistent mode.');
|
|
33
33
|
}
|
|
34
34
|
return {
|
|
35
35
|
storage: (0, random_access_storage_1.createStorage)({
|
|
@@ -51,7 +51,7 @@ const createKeyStorage = (path, type) => {
|
|
|
51
51
|
case 'ram':
|
|
52
52
|
return (0, memdown_1.default)();
|
|
53
53
|
default:
|
|
54
|
-
throw new errors_1.
|
|
54
|
+
throw new errors_1.InvalidConfigError(`Invalid key storage type: ${defaultedType}`);
|
|
55
55
|
}
|
|
56
56
|
};
|
|
57
57
|
const toStorageType = (type) => {
|