@dxos/client-services 0.1.5 → 0.1.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/LICENSE +5 -18
- package/README.md +14 -10
- package/README.yml +5 -0
- package/dist/src/packlets/deprecated/profile.d.ts +2 -5
- package/dist/src/packlets/deprecated/profile.d.ts.map +1 -1
- package/dist/src/packlets/deprecated/profile.js +1 -73
- package/dist/src/packlets/deprecated/profile.js.map +1 -1
- package/dist/src/packlets/deprecated/system.d.ts +4 -0
- package/dist/src/packlets/deprecated/system.d.ts.map +1 -1
- package/dist/src/packlets/deprecated/system.js +6 -0
- package/dist/src/packlets/deprecated/system.js.map +1 -1
- package/dist/src/packlets/deprecated/tracing.d.ts +1 -1
- package/dist/src/packlets/deprecated/tracing.js +1 -1
- package/dist/src/packlets/devtools/devtools.d.ts +3 -0
- package/dist/src/packlets/devtools/devtools.d.ts.map +1 -1
- package/dist/src/packlets/devtools/devtools.js +3 -1
- package/dist/src/packlets/devtools/devtools.js.map +1 -1
- package/dist/src/packlets/devtools/feeds.d.ts.map +1 -1
- package/dist/src/packlets/devtools/feeds.js +5 -3
- package/dist/src/packlets/devtools/feeds.js.map +1 -1
- package/dist/src/packlets/identity/devices-service-impl.d.ts.map +1 -1
- package/dist/src/packlets/identity/devices-service-impl.js.map +1 -1
- package/dist/src/packlets/identity/identity-manager.d.ts +2 -2
- package/dist/src/packlets/identity/identity-manager.d.ts.map +1 -1
- package/dist/src/packlets/identity/identity-manager.js +44 -43
- package/dist/src/packlets/identity/identity-manager.js.map +1 -1
- package/dist/src/packlets/identity/identity.d.ts +3 -0
- package/dist/src/packlets/identity/identity.d.ts.map +1 -1
- package/dist/src/packlets/identity/identity.js +51 -1
- package/dist/src/packlets/identity/identity.js.map +1 -1
- package/dist/src/packlets/invitations/halo-invitations-handler.d.ts +23 -0
- package/dist/src/packlets/invitations/halo-invitations-handler.d.ts.map +1 -0
- package/dist/src/packlets/invitations/halo-invitations-handler.js +231 -0
- package/dist/src/packlets/invitations/halo-invitations-handler.js.map +1 -0
- package/dist/src/packlets/invitations/halo-invitations-handler.test.d.ts +2 -0
- package/dist/src/packlets/invitations/halo-invitations-handler.test.d.ts.map +1 -0
- package/dist/src/packlets/invitations/halo-invitations-handler.test.js +69 -0
- package/dist/src/packlets/invitations/halo-invitations-handler.test.js.map +1 -0
- package/dist/src/packlets/invitations/halo-invitations-proxy.d.ts +8 -0
- package/dist/src/packlets/invitations/halo-invitations-proxy.d.ts.map +1 -0
- package/dist/src/packlets/invitations/halo-invitations-proxy.js +17 -0
- package/dist/src/packlets/invitations/halo-invitations-proxy.js.map +1 -0
- package/dist/src/packlets/invitations/halo-invitations-service.d.ts +13 -0
- package/dist/src/packlets/invitations/halo-invitations-service.d.ts.map +1 -0
- package/dist/src/packlets/invitations/halo-invitations-service.js +20 -0
- package/dist/src/packlets/invitations/halo-invitations-service.js.map +1 -0
- package/dist/src/packlets/invitations/halo-invitations-service.test.d.ts +2 -0
- package/dist/src/packlets/invitations/halo-invitations-service.test.d.ts.map +1 -0
- package/dist/src/packlets/invitations/halo-invitations-service.test.js +83 -0
- package/dist/src/packlets/invitations/halo-invitations-service.test.js.map +1 -0
- package/dist/src/packlets/invitations/index.d.ts +5 -1
- package/dist/src/packlets/invitations/index.d.ts.map +1 -1
- package/dist/src/packlets/invitations/index.js +5 -1
- package/dist/src/packlets/invitations/index.js.map +1 -1
- package/dist/src/packlets/invitations/invitations-handler.d.ts +48 -0
- package/dist/src/packlets/invitations/invitations-handler.d.ts.map +1 -0
- package/dist/src/packlets/invitations/invitations-handler.js +18 -0
- package/dist/src/packlets/invitations/invitations-handler.js.map +1 -0
- package/dist/src/packlets/invitations/invitations-proxy.d.ts +11 -7
- package/dist/src/packlets/invitations/invitations-proxy.d.ts.map +1 -1
- package/dist/src/packlets/invitations/invitations-proxy.js +5 -10
- package/dist/src/packlets/invitations/invitations-proxy.js.map +1 -1
- package/dist/src/packlets/invitations/invitations-service.d.ts +25 -0
- package/dist/src/packlets/invitations/invitations-service.d.ts.map +1 -0
- package/dist/src/packlets/invitations/invitations-service.js +174 -0
- package/dist/src/packlets/invitations/invitations-service.js.map +1 -0
- package/dist/src/packlets/invitations/invitations.d.ts +10 -42
- package/dist/src/packlets/invitations/invitations.d.ts.map +1 -1
- package/dist/src/packlets/invitations/invitations.js +5 -2
- package/dist/src/packlets/invitations/invitations.js.map +1 -1
- package/dist/src/packlets/invitations/space-invitations-handler.d.ts +6 -6
- package/dist/src/packlets/invitations/space-invitations-handler.d.ts.map +1 -1
- package/dist/src/packlets/invitations/space-invitations-handler.js +18 -19
- package/dist/src/packlets/invitations/space-invitations-handler.js.map +1 -1
- package/dist/src/packlets/invitations/space-invitations-handler.test.js +5 -5
- package/dist/src/packlets/invitations/space-invitations-handler.test.js.map +1 -1
- package/dist/src/packlets/invitations/space-invitations-proxy.d.ts +1 -1
- package/dist/src/packlets/invitations/space-invitations-proxy.d.ts.map +1 -1
- package/dist/src/packlets/invitations/space-invitations-proxy.js +2 -2
- package/dist/src/packlets/invitations/space-invitations-proxy.js.map +1 -1
- package/dist/src/packlets/invitations/space-invitations-service.d.ts +8 -14
- package/dist/src/packlets/invitations/space-invitations-service.d.ts.map +1 -1
- package/dist/src/packlets/invitations/space-invitations-service.js +11 -169
- package/dist/src/packlets/invitations/space-invitations-service.js.map +1 -1
- package/dist/src/packlets/invitations/space-invitations-service.test.js +4 -4
- package/dist/src/packlets/invitations/space-invitations-service.test.js.map +1 -1
- package/dist/src/packlets/services/service-context.d.ts +2 -2
- package/dist/src/packlets/services/service-context.d.ts.map +1 -1
- package/dist/src/packlets/services/service-context.js +8 -8
- package/dist/src/packlets/services/service-context.js.map +1 -1
- package/dist/src/packlets/services/service-definitions.d.ts +5 -4
- package/dist/src/packlets/services/service-definitions.d.ts.map +1 -1
- package/dist/src/packlets/services/service-definitions.js +6 -4
- package/dist/src/packlets/services/service-definitions.js.map +1 -1
- package/dist/src/packlets/services/service-host.d.ts.map +1 -1
- package/dist/src/packlets/services/service-host.js +10 -8
- package/dist/src/packlets/services/service-host.js.map +1 -1
- package/dist/src/packlets/services/service-proxy.js +1 -1
- package/dist/src/packlets/services/service-registry.test.js +2 -2
- package/dist/src/packlets/services/service-registry.test.js.map +1 -1
- package/dist/src/packlets/vault/iframe-runtime.d.ts +5 -4
- package/dist/src/packlets/vault/iframe-runtime.d.ts.map +1 -1
- package/dist/src/packlets/vault/iframe-runtime.js +4 -12
- package/dist/src/packlets/vault/iframe-runtime.js.map +1 -1
- package/dist/src/packlets/vault/worker-runtime.d.ts +4 -3
- package/dist/src/packlets/vault/worker-runtime.d.ts.map +1 -1
- package/dist/src/packlets/vault/worker-runtime.js +29 -24
- package/dist/src/packlets/vault/worker-runtime.js.map +1 -1
- package/dist/src/packlets/vault/worker-session.d.ts +5 -2
- package/dist/src/packlets/vault/worker-session.d.ts.map +1 -1
- package/dist/src/packlets/vault/worker-session.js +23 -10
- package/dist/src/packlets/vault/worker-session.js.map +1 -1
- package/package.json +26 -26
- package/src/packlets/deprecated/profile.ts +2 -84
- package/src/packlets/deprecated/system.ts +7 -0
- package/src/packlets/deprecated/tracing.ts +1 -1
- package/src/packlets/devtools/devtools.ts +3 -1
- package/src/packlets/devtools/feeds.ts +5 -3
- package/src/packlets/identity/devices-service-impl.ts +0 -1
- package/src/packlets/identity/identity-manager.ts +50 -49
- package/src/packlets/identity/identity.ts +58 -1
- package/src/packlets/invitations/halo-invitations-handler.test.ts +79 -0
- package/src/packlets/invitations/halo-invitations-handler.ts +255 -0
- package/src/packlets/invitations/halo-invitations-proxy.ts +14 -0
- package/src/packlets/invitations/halo-invitations-service.test.ts +96 -0
- package/src/packlets/invitations/halo-invitations-service.ts +24 -0
- package/src/packlets/invitations/index.ts +5 -1
- package/src/packlets/invitations/invitations-handler.ts +59 -0
- package/src/packlets/invitations/invitations-proxy.ts +15 -13
- package/src/packlets/invitations/invitations-service.ts +184 -0
- package/src/packlets/invitations/invitations.ts +14 -46
- package/src/packlets/invitations/space-invitations-handler.test.ts +6 -6
- package/src/packlets/invitations/space-invitations-handler.ts +16 -16
- package/src/packlets/invitations/space-invitations-proxy.ts +2 -2
- package/src/packlets/invitations/space-invitations-service.test.ts +13 -13
- package/src/packlets/invitations/space-invitations-service.ts +16 -177
- package/src/packlets/services/service-context.ts +6 -6
- package/src/packlets/services/service-definitions.ts +20 -10
- package/src/packlets/services/service-host.ts +15 -7
- package/src/packlets/services/service-proxy.ts +1 -1
- package/src/packlets/services/service-registry.test.ts +5 -5
- package/src/packlets/vault/iframe-runtime.ts +8 -15
- package/src/packlets/vault/worker-runtime.ts +36 -30
- package/src/packlets/vault/worker-session.ts +20 -6
- package/dist/src/packlets/invitations/halo-invitations.d.ts +0 -23
- package/dist/src/packlets/invitations/halo-invitations.d.ts.map +0 -1
- package/dist/src/packlets/invitations/halo-invitations.js +0 -154
- package/dist/src/packlets/invitations/halo-invitations.js.map +0 -1
- package/dist/src/packlets/invitations/halo-invitations.test.d.ts +0 -2
- package/dist/src/packlets/invitations/halo-invitations.test.d.ts.map +0 -1
- package/dist/src/packlets/invitations/halo-invitations.test.js +0 -34
- package/dist/src/packlets/invitations/halo-invitations.test.js.map +0 -1
- package/dist/src/packlets/services/iframe-service-proxy.d.ts +0 -23
- package/dist/src/packlets/services/iframe-service-proxy.d.ts.map +0 -1
- package/dist/src/packlets/services/iframe-service-proxy.js +0 -53
- package/dist/src/packlets/services/iframe-service-proxy.js.map +0 -1
- package/dist/src/packlets/services/service-host.test.d.ts +0 -2
- package/dist/src/packlets/services/service-host.test.d.ts.map +0 -1
- package/dist/src/packlets/services/service-host.test.js +0 -68
- package/dist/src/packlets/services/service-host.test.js.map +0 -1
- package/src/packlets/invitations/halo-invitations.test.ts +0 -40
- package/src/packlets/invitations/halo-invitations.ts +0 -164
- package/src/packlets/services/iframe-service-proxy.ts +0 -71
- package/src/packlets/services/service-host.test.ts +0 -76
|
@@ -38,27 +38,26 @@ class ServiceContext {
|
|
|
38
38
|
});
|
|
39
39
|
this.identityManager = new identity_1.IdentityManager(this.metadataStore, this.feedStore, this.keyring, networkManager, modelFactory);
|
|
40
40
|
// TODO(burdon): _initialize called in multiple places.
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
});
|
|
41
|
+
// TODO(burdon): Call _initialize on success.
|
|
42
|
+
this.haloInvitations = new invitations_1.HaloInvitationsHandler(this.networkManager, this.identityManager);
|
|
44
43
|
}
|
|
45
44
|
async open() {
|
|
46
|
-
(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: 77 });
|
|
47
46
|
await this.identityManager.open();
|
|
48
47
|
if (this.identityManager.identity) {
|
|
49
48
|
await this._initialize();
|
|
50
49
|
}
|
|
51
|
-
(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: 82 });
|
|
52
51
|
}
|
|
53
52
|
async close() {
|
|
54
53
|
var _a;
|
|
55
|
-
(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: 86 });
|
|
56
55
|
await this.identityManager.close();
|
|
57
56
|
await ((_a = this.spaceManager) === null || _a === void 0 ? void 0 : _a.close());
|
|
58
57
|
await this.feedStore.close();
|
|
59
58
|
await this.networkManager.destroy(); // TODO(burdon): Close.
|
|
60
59
|
this.dataServiceSubscriptions.clear();
|
|
61
|
-
(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: 92 });
|
|
62
61
|
}
|
|
63
62
|
async createIdentity() {
|
|
64
63
|
const identity = await this.identityManager.createIdentity();
|
|
@@ -66,6 +65,7 @@ class ServiceContext {
|
|
|
66
65
|
await this._initialize();
|
|
67
66
|
return identity;
|
|
68
67
|
}
|
|
68
|
+
// Called when identity is created.
|
|
69
69
|
async _initialize() {
|
|
70
70
|
var _a;
|
|
71
71
|
const identity = (_a = this.identityManager.identity) !== null && _a !== void 0 ? _a : (0, debug_1.failUndefined)();
|
|
@@ -88,7 +88,7 @@ class ServiceContext {
|
|
|
88
88
|
});
|
|
89
89
|
await spaceManager.open();
|
|
90
90
|
this.spaceManager = spaceManager;
|
|
91
|
-
this.spaceInvitations = new invitations_1.SpaceInvitationsHandler(this.
|
|
91
|
+
this.spaceInvitations = new invitations_1.SpaceInvitationsHandler(this.networkManager, this.spaceManager, signingContext);
|
|
92
92
|
this.initialized.wake();
|
|
93
93
|
}
|
|
94
94
|
}
|
|
@@ -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,0CAA8C;AAC9C,
|
|
1
|
+
{"version":3,"file":"service-context.js","sourceRoot":"","sources":["../../../../src/packlets/services/service-context.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,18 +1,19 @@
|
|
|
1
1
|
import { ProfileService, SystemService, SpaceService } from '@dxos/protocols/proto/dxos/client';
|
|
2
|
-
import {
|
|
2
|
+
import { HaloInvitationsService, SpaceInvitationsService, SpacesService, DevicesService } from '@dxos/protocols/proto/dxos/client/services';
|
|
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
6
|
export declare type ClientServices = {
|
|
7
|
+
HaloInvitationsService: HaloInvitationsService;
|
|
8
|
+
DevicesService: DevicesService;
|
|
9
|
+
SpaceInvitationsService: SpaceInvitationsService;
|
|
10
|
+
SpacesService: SpacesService;
|
|
7
11
|
SpaceService: SpaceService;
|
|
8
12
|
DataService: DataService;
|
|
9
13
|
ProfileService: ProfileService;
|
|
10
14
|
SystemService: SystemService;
|
|
11
15
|
DevtoolsHost: DevtoolsHost;
|
|
12
16
|
TracingService: TracingService;
|
|
13
|
-
SpacesService: SpacesService;
|
|
14
|
-
SpaceInvitationsService: InvitationsService;
|
|
15
|
-
DevicesService: DevicesService;
|
|
16
17
|
};
|
|
17
18
|
/**
|
|
18
19
|
* Provide access to client services definitions and service handler.
|
|
@@ -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,
|
|
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,oBAAY,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"}
|
|
@@ -10,14 +10,16 @@ const rpc_1 = require("@dxos/rpc");
|
|
|
10
10
|
* Services supported by host.
|
|
11
11
|
*/
|
|
12
12
|
exports.clientServiceBundle = (0, rpc_1.createServiceBundle)({
|
|
13
|
+
HaloInvitationsService: protocols_1.schema.getService('dxos.client.services.HaloInvitationsService'),
|
|
14
|
+
DevicesService: protocols_1.schema.getService('dxos.client.services.DevicesService'),
|
|
15
|
+
SpaceInvitationsService: protocols_1.schema.getService('dxos.client.services.SpaceInvitationsService'),
|
|
16
|
+
SpacesService: protocols_1.schema.getService('dxos.client.services.SpacesService'),
|
|
17
|
+
// TODO(burdon): Deprecated.
|
|
13
18
|
SpaceService: protocols_1.schema.getService('dxos.client.SpaceService'),
|
|
14
19
|
DataService: protocols_1.schema.getService('dxos.echo.service.DataService'),
|
|
15
20
|
ProfileService: protocols_1.schema.getService('dxos.client.ProfileService'),
|
|
16
21
|
SystemService: protocols_1.schema.getService('dxos.client.SystemService'),
|
|
17
22
|
DevtoolsHost: protocols_1.schema.getService('dxos.devtools.host.DevtoolsHost'),
|
|
18
|
-
TracingService: protocols_1.schema.getService('dxos.devtools.host.TracingService')
|
|
19
|
-
SpacesService: protocols_1.schema.getService('dxos.client.services.SpacesService'),
|
|
20
|
-
SpaceInvitationsService: protocols_1.schema.getService('dxos.client.services.InvitationsService'),
|
|
21
|
-
DevicesService: protocols_1.schema.getService('dxos.client.services.DevicesService')
|
|
23
|
+
TracingService: protocols_1.schema.getService('dxos.devtools.host.TracingService')
|
|
22
24
|
});
|
|
23
25
|
//# sourceMappingURL=service-definitions.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service-definitions.js","sourceRoot":"","sources":["../../../../src/packlets/services/service-definitions.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;AAEF,+CAAyC;
|
|
1
|
+
{"version":3,"file":"service-definitions.js","sourceRoot":"","sources":["../../../../src/packlets/services/service-definitions.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;AAEF,+CAAyC;AAUzC,mCAA+D;AAiC/D;;GAEG;AACU,QAAA,mBAAmB,GAAG,IAAA,yBAAmB,EAAiB;IACrE,sBAAsB,EAAE,kBAAM,CAAC,UAAU,CAAC,6CAA6C,CAAC;IACxF,cAAc,EAAE,kBAAM,CAAC,UAAU,CAAC,qCAAqC,CAAC;IACxE,uBAAuB,EAAE,kBAAM,CAAC,UAAU,CAAC,8CAA8C,CAAC;IAC1F,aAAa,EAAE,kBAAM,CAAC,UAAU,CAAC,oCAAoC,CAAC;IAEtE,4BAA4B;IAC5B,YAAY,EAAE,kBAAM,CAAC,UAAU,CAAC,0BAA0B,CAAC;IAC3D,WAAW,EAAE,kBAAM,CAAC,UAAU,CAAC,+BAA+B,CAAC;IAC/D,cAAc,EAAE,kBAAM,CAAC,UAAU,CAAC,4BAA4B,CAAC;IAC/D,aAAa,EAAE,kBAAM,CAAC,UAAU,CAAC,2BAA2B,CAAC;IAC7D,YAAY,EAAE,kBAAM,CAAC,UAAU,CAAC,iCAAiC,CAAC;IAClE,cAAc,EAAE,kBAAM,CAAC,UAAU,CAAC,mCAAmC,CAAC;CACvE,CAAC,CAAC"}
|
|
@@ -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;AAGpG,aAAK,wBAAwB,GAAG;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,cAAc,EAAE,cAAc,CAAC;CAChC,CAAC;AAIF,eAAO,MAAM,yBAAyB,oBAErC,CAAC;AAEF;;GAEG;AAEH,qBAAa,kBAAmB,YAAW,sBAAsB;IAC/D,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAiB;IACjD,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAkC;gBAEvD,EACV,MAAM,EACN,YAA0C,EAE1C,cAAc,EACf,EAAE,wBAAwB;
|
|
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;AAGpG,aAAK,wBAAwB,GAAG;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,cAAc,EAAE,cAAc,CAAC;CAChC,CAAC;AAIF,eAAO,MAAM,yBAAyB,oBAErC,CAAC;AAEF;;GAEG;AAEH,qBAAa,kBAAmB,YAAW,sBAAsB;IAC/D,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAiB;IACjD,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAkC;gBAEvD,EACV,MAAM,EACN,YAA0C,EAE1C,cAAc,EACf,EAAE,wBAAwB;IAuC3B,IAAI,WAAW,sDAEd;IAED,IAAI,QAAQ,mBAEX;IAEK,IAAI;IAOJ,KAAK;CAMZ"}
|
|
@@ -39,19 +39,21 @@ class ClientServicesHost {
|
|
|
39
39
|
this._serviceContext = new service_context_1.ServiceContext(storage, networkManager, modelFactory);
|
|
40
40
|
// TODO(burdon): Start to think of DMG (dynamic services).
|
|
41
41
|
this._serviceRegistry = new service_registry_1.ServiceRegistry(service_definitions_1.clientServiceBundle, {
|
|
42
|
+
HaloInvitationsService: new invitations_1.HaloInvitationsServiceImpl(this._serviceContext.identityManager, this._serviceContext.haloInvitations),
|
|
43
|
+
DevicesService: new devices_service_impl_1.DevicesServiceImpl(this._serviceContext.identityManager),
|
|
44
|
+
SpaceInvitationsService: new invitations_1.SpaceInvitationsServiceImpl(this._serviceContext.identityManager, () => { var _a; return (_a = this._serviceContext.spaceInvitations) !== null && _a !== void 0 ? _a : (0, debug_1.raise)(new Error('SpaceInvitations not initialized')); }, () => { var _a; return (_a = this._serviceContext.spaceManager) !== null && _a !== void 0 ? _a : (0, debug_1.raise)(new Error('SpaceManager not initialized')); }),
|
|
42
45
|
SpacesService: new spaces_1.SpacesServiceImpl(),
|
|
43
|
-
SpaceInvitationsService: new invitations_1.SpaceInvitationsServiceImpl(this._serviceContext.identityManager, () => { var _a; return (_a = this._serviceContext.spaceManager) !== null && _a !== void 0 ? _a : (0, debug_1.raise)(new Error('SpaceManager not initialized')); }, () => { var _a; return (_a = this._serviceContext.spaceInvitations) !== null && _a !== void 0 ? _a : (0, debug_1.raise)(new Error('SpaceInvitations not initialized')); }),
|
|
44
|
-
SpaceService: new deprecated_1.SpaceServiceImpl(this._serviceContext),
|
|
45
46
|
DataService: new echo_db_1.DataServiceImpl(this._serviceContext.dataServiceSubscriptions),
|
|
47
|
+
// TODO(burdon): Move to new protobuf definitions.
|
|
46
48
|
ProfileService: new deprecated_1.ProfileServiceImpl(this._serviceContext),
|
|
49
|
+
SpaceService: new deprecated_1.SpaceServiceImpl(this._serviceContext),
|
|
47
50
|
SystemService: new deprecated_1.SystemServiceImpl(config),
|
|
48
51
|
TracingService: new deprecated_1.TracingServiceImpl(config),
|
|
49
52
|
DevtoolsHost: new devtools_1.DevtoolsServiceImpl({
|
|
50
53
|
events: new devtools_1.DevtoolsHostEvents(),
|
|
51
54
|
config,
|
|
52
55
|
context: this._serviceContext
|
|
53
|
-
})
|
|
54
|
-
DevicesService: new devices_service_impl_1.DevicesServiceImpl(this._serviceContext.identityManager)
|
|
56
|
+
})
|
|
55
57
|
});
|
|
56
58
|
}
|
|
57
59
|
get descriptors() {
|
|
@@ -63,16 +65,16 @@ class ClientServicesHost {
|
|
|
63
65
|
async open() {
|
|
64
66
|
var _a;
|
|
65
67
|
const deviceKey = (_a = this._serviceContext.identityManager.identity) === null || _a === void 0 ? void 0 : _a.deviceKey;
|
|
66
|
-
(0, log_1.log)('opening...', { deviceKey }, { file: "packages/sdk/client-services/src/packlets/services/service-host.ts", line:
|
|
68
|
+
(0, log_1.log)('opening...', { deviceKey }, { file: "packages/sdk/client-services/src/packlets/services/service-host.ts", line: 98 });
|
|
67
69
|
await this._serviceContext.open();
|
|
68
|
-
(0, log_1.log)('opened', { deviceKey }, { file: "packages/sdk/client-services/src/packlets/services/service-host.ts", line:
|
|
70
|
+
(0, log_1.log)('opened', { deviceKey }, { file: "packages/sdk/client-services/src/packlets/services/service-host.ts", line: 100 });
|
|
69
71
|
}
|
|
70
72
|
async close() {
|
|
71
73
|
var _a;
|
|
72
74
|
const deviceKey = (_a = this._serviceContext.identityManager.identity) === null || _a === void 0 ? void 0 : _a.deviceKey;
|
|
73
|
-
(0, log_1.log)('closing...', { deviceKey }, { file: "packages/sdk/client-services/src/packlets/services/service-host.ts", line:
|
|
75
|
+
(0, log_1.log)('closing...', { deviceKey }, { file: "packages/sdk/client-services/src/packlets/services/service-host.ts", line: 105 });
|
|
74
76
|
await this._serviceContext.close();
|
|
75
|
-
(0, log_1.log)('closed', { deviceKey }, { file: "packages/sdk/client-services/src/packlets/services/service-host.ts", line:
|
|
77
|
+
(0, log_1.log)('closed', { deviceKey }, { file: "packages/sdk/client-services/src/packlets/services/service-host.ts", line: 107 });
|
|
76
78
|
}
|
|
77
79
|
}
|
|
78
80
|
exports.ClientServicesHost = ClientServicesHost;
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"service-host.js","sourceRoot":"","sources":["../../../../src/packlets/services/service-host.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,7 +19,7 @@ class ClientServicesProxy {
|
|
|
19
19
|
constructor(port,
|
|
20
20
|
// NOTE: With lower timeout the shared worker does not have enough time to start.
|
|
21
21
|
// TODO(dmaretskyi): Find better ways to detected when the worker has finished loading. It might take a while on slow connections.
|
|
22
|
-
_timeout =
|
|
22
|
+
_timeout = 3000) {
|
|
23
23
|
this._timeout = _timeout;
|
|
24
24
|
this._proxy = (0, rpc_1.createProtoRpcPeer)({
|
|
25
25
|
requested: service_definitions_1.clientServiceBundle,
|
|
@@ -15,7 +15,7 @@ const invitations_1 = require("../invitations");
|
|
|
15
15
|
const testing_1 = require("../testing");
|
|
16
16
|
const service_registry_1 = require("./service-registry");
|
|
17
17
|
const serviceBundle = (0, rpc_1.createServiceBundle)({
|
|
18
|
-
SpaceInvitationsService: protocols_1.schema.getService('dxos.client.services.
|
|
18
|
+
SpaceInvitationsService: protocols_1.schema.getService('dxos.client.services.SpaceInvitationsService')
|
|
19
19
|
});
|
|
20
20
|
describe('service registry', function () {
|
|
21
21
|
it('builds a service registry', async function () {
|
|
@@ -26,7 +26,7 @@ describe('service registry', function () {
|
|
|
26
26
|
(0, assert_1.default)(serviceContext.spaceInvitations);
|
|
27
27
|
const space = await serviceContext.spaceManager.createSpace();
|
|
28
28
|
const serviceRegistry = new service_registry_1.ServiceRegistry(serviceBundle, {
|
|
29
|
-
SpaceInvitationsService: new invitations_1.SpaceInvitationsServiceImpl(serviceContext.identityManager, () => serviceContext.
|
|
29
|
+
SpaceInvitationsService: new invitations_1.SpaceInvitationsServiceImpl(serviceContext.identityManager, () => serviceContext.spaceInvitations, () => serviceContext.spaceManager)
|
|
30
30
|
});
|
|
31
31
|
const [proxyPort, serverPort] = (0, rpc_1.createLinkedPorts)();
|
|
32
32
|
const proxy = (0, rpc_1.createProtoRpcPeer)({
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"service-registry.test.js","sourceRoot":"","sources":["../../../../src/packlets/services/service-registry.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { RpcPort } from '@dxos/rpc';
|
|
2
2
|
export declare type IframeRuntimeParams = {
|
|
3
|
-
|
|
3
|
+
systemPort: RpcPort;
|
|
4
|
+
workerAppPort: RpcPort;
|
|
5
|
+
windowAppPort: RpcPort;
|
|
4
6
|
};
|
|
5
7
|
/**
|
|
6
8
|
* Manages the client connection to the shared worker.
|
|
@@ -11,8 +13,7 @@ export declare class IFrameRuntime {
|
|
|
11
13
|
private readonly _workerAppPort;
|
|
12
14
|
private readonly _systemRpc;
|
|
13
15
|
private readonly _transportService;
|
|
14
|
-
constructor({
|
|
15
|
-
start(): void;
|
|
16
|
+
constructor({ systemPort, workerAppPort, windowAppPort }: IframeRuntimeParams);
|
|
16
17
|
open(origin: string): Promise<void>;
|
|
17
18
|
close(): Promise<void>;
|
|
18
19
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"iframe-runtime.d.ts","sourceRoot":"","sources":["../../../../src/packlets/vault/iframe-runtime.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"iframe-runtime.d.ts","sourceRoot":"","sources":["../../../../src/packlets/vault/iframe-runtime.ts"],"names":[],"mappings":"AAMA,OAAO,EAAoC,OAAO,EAAE,MAAM,WAAW,CAAC;AAKtE,oBAAY,mBAAmB,GAAG;IAChC,UAAU,EAAE,OAAO,CAAC;IACpB,aAAa,EAAE,OAAO,CAAC;IACvB,aAAa,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF;;GAEG;AACH,qBAAa,aAAa;IACxB,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAU;IACtC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAU;IACzC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAU;IACzC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAoC;IAC/D,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAgC;gBAEtD,EAAE,UAAU,EAAE,aAAa,EAAE,aAAa,EAAE,EAAE,mBAAmB;IAwBvE,IAAI,CAAC,MAAM,EAAE,MAAM;IAKnB,KAAK;CAIZ"}
|
|
@@ -11,14 +11,11 @@ const services_1 = require("./services");
|
|
|
11
11
|
* Manages the client connection to the shared worker.
|
|
12
12
|
*/
|
|
13
13
|
class IFrameRuntime {
|
|
14
|
-
constructor({
|
|
14
|
+
constructor({ systemPort, workerAppPort, windowAppPort }) {
|
|
15
15
|
this._transportService = new network_manager_1.WebRTCTransportService();
|
|
16
|
-
this._systemPort =
|
|
17
|
-
this.
|
|
18
|
-
this.
|
|
19
|
-
channel: 'dxos:app',
|
|
20
|
-
onOrigin: (origin) => this.open(origin)
|
|
21
|
-
});
|
|
16
|
+
this._systemPort = systemPort;
|
|
17
|
+
this._windowAppPort = windowAppPort;
|
|
18
|
+
this._workerAppPort = workerAppPort;
|
|
22
19
|
this._systemRpc = (0, rpc_1.createProtoRpcPeer)({
|
|
23
20
|
requested: services_1.workerServiceBundle,
|
|
24
21
|
exposed: services_1.iframeServiceBundle,
|
|
@@ -33,13 +30,8 @@ class IFrameRuntime {
|
|
|
33
30
|
port: this._systemPort,
|
|
34
31
|
timeout: 200
|
|
35
32
|
});
|
|
36
|
-
}
|
|
37
|
-
start() {
|
|
38
33
|
this._workerAppPort.subscribe((msg) => this._windowAppPort.send(msg));
|
|
39
34
|
this._windowAppPort.subscribe((msg) => this._workerAppPort.send(msg));
|
|
40
|
-
window.addEventListener('beforeunload', () => {
|
|
41
|
-
this.close().catch((err) => console.error(err));
|
|
42
|
-
});
|
|
43
35
|
}
|
|
44
36
|
async open(origin) {
|
|
45
37
|
await this._systemRpc.open();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"iframe-runtime.js","sourceRoot":"","sources":["../../../../src/packlets/vault/iframe-runtime.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;AAEF,2DAA+D;AAE/D,mCAAsE;
|
|
1
|
+
{"version":3,"file":"iframe-runtime.js","sourceRoot":"","sources":["../../../../src/packlets/vault/iframe-runtime.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;AAEF,2DAA+D;AAE/D,mCAAsE;AAEtE,yCAA2F;AAS3F;;GAEG;AACH,MAAa,aAAa;IAOxB,YAAY,EAAE,UAAU,EAAE,aAAa,EAAE,aAAa,EAAuB;QAF5D,sBAAiB,GAAG,IAAI,wCAAsB,EAAE,CAAC;QAGhE,IAAI,CAAC,WAAW,GAAG,UAAU,CAAC;QAC9B,IAAI,CAAC,cAAc,GAAG,aAAa,CAAC;QACpC,IAAI,CAAC,cAAc,GAAG,aAAa,CAAC;QAEpC,IAAI,CAAC,UAAU,GAAG,IAAA,wBAAkB,EAAC;YACnC,SAAS,EAAE,8BAAmB;YAC9B,OAAO,EAAE,8BAAmB;YAC5B,QAAQ,EAAE;gBACR,aAAa,EAAE,IAAI,CAAC,iBAAkC;gBACtD,aAAa,EAAE;oBACb,KAAK,CAAC,SAAS;wBACb,MAAM;oBACR,CAAC;iBACF;aACF;YACD,IAAI,EAAE,IAAI,CAAC,WAAW;YACtB,OAAO,EAAE,GAAG;SACb,CAAC,CAAC;QAEH,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QACtE,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;IACxE,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,MAAc;QACvB,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;QAC7B,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;IAC5D,CAAC;IAED,KAAK,CAAC,KAAK;QACT,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,aAAa,CAAC,IAAI,EAAE,CAAC;QAC/C,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;IAChC,CAAC;CACF;AAxCD,sCAwCC"}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import { Config } from '@dxos/config';
|
|
2
|
-
import {
|
|
2
|
+
import { RpcPort } from '@dxos/rpc';
|
|
3
3
|
import { MaybePromise } from '@dxos/util';
|
|
4
4
|
export declare type CreateSessionParams = {
|
|
5
|
-
|
|
5
|
+
appPort: RpcPort;
|
|
6
|
+
systemPort: RpcPort;
|
|
6
7
|
};
|
|
7
8
|
/**
|
|
8
9
|
* Runtime for the shared worker.
|
|
@@ -23,7 +24,7 @@ export declare class WorkerRuntime {
|
|
|
23
24
|
/**
|
|
24
25
|
* Create a new session.
|
|
25
26
|
*/
|
|
26
|
-
createSession({
|
|
27
|
+
createSession({ appPort, systemPort }: CreateSessionParams): Promise<void>;
|
|
27
28
|
/**
|
|
28
29
|
* Selects one of the existing session fro WebRTC networking.
|
|
29
30
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker-runtime.d.ts","sourceRoot":"","sources":["../../../../src/packlets/vault/worker-runtime.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"worker-runtime.d.ts","sourceRoot":"","sources":["../../../../src/packlets/vault/worker-runtime.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAGtC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAM1C,oBAAY,mBAAmB,GAAG;IAChC,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,EAAE,OAAO,CAAC;CACrB,CAAC;AAEF;;;;GAIG;AACH,qBAAa,aAAa;IAUtB,OAAO,CAAC,QAAQ,CAAC,eAAe;IATlC,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAqC;IACvE,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAoC;IAC3D,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAA4B;IACrD,OAAO,CAAC,qBAAqB,CAAC,CAAgB;IAC9C,OAAO,CAAC,eAAe,CAAsB;IAC7C,OAAO,CAAC,OAAO,CAAU;gBAIN,eAAe,EAAE,MAAM,YAAY,CAAC,MAAM,CAAC;IAGxD,KAAK;IAsBL,IAAI;IAKV;;OAEG;IACG,aAAa,CAAC,EAAE,OAAO,EAAE,UAAU,EAAE,EAAE,mBAAmB;IA0BhE;;OAEG;IACH,OAAO,CAAC,gBAAgB;CAmBzB"}
|
|
@@ -2,12 +2,8 @@
|
|
|
2
2
|
//
|
|
3
3
|
// Copyright 2022 DXOS.org
|
|
4
4
|
//
|
|
5
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
6
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
7
|
-
};
|
|
8
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
6
|
exports.WorkerRuntime = void 0;
|
|
10
|
-
const node_assert_1 = __importDefault(require("node:assert"));
|
|
11
7
|
const async_1 = require("@dxos/async");
|
|
12
8
|
const messaging_1 = require("@dxos/messaging");
|
|
13
9
|
const network_manager_1 = require("@dxos/network-manager");
|
|
@@ -27,20 +23,25 @@ class WorkerRuntime {
|
|
|
27
23
|
this.sessions = new Set();
|
|
28
24
|
}
|
|
29
25
|
async start() {
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
26
|
+
try {
|
|
27
|
+
this._config = await this._configProvider();
|
|
28
|
+
const signalServer = this._config.get('runtime.services.signal.server');
|
|
29
|
+
this._clientServices = new services_1.ClientServicesHost({
|
|
30
|
+
config: this._config,
|
|
31
|
+
networkManager: new network_manager_1.NetworkManager({
|
|
32
|
+
log: true,
|
|
33
|
+
signalManager: signalServer
|
|
34
|
+
? new messaging_1.WebsocketSignalManager([signalServer])
|
|
35
|
+
: new messaging_1.MemorySignalManager(new messaging_1.MemorySignalManagerContext()),
|
|
36
|
+
transportFactory: this._transportFactory
|
|
37
|
+
})
|
|
38
|
+
});
|
|
39
|
+
await this._clientServices.open();
|
|
40
|
+
this._ready.wake(undefined);
|
|
41
|
+
}
|
|
42
|
+
catch (err) {
|
|
43
|
+
this._ready.wake(err);
|
|
44
|
+
}
|
|
44
45
|
}
|
|
45
46
|
async stop() {
|
|
46
47
|
// TODO(dmaretskyi): Terminate active sessions.
|
|
@@ -49,14 +50,18 @@ class WorkerRuntime {
|
|
|
49
50
|
/**
|
|
50
51
|
* Create a new session.
|
|
51
52
|
*/
|
|
52
|
-
async createSession({
|
|
53
|
-
const appPort = portMuxer.createWorkerPort({ channel: 'dxos:app' });
|
|
54
|
-
const systemPort = portMuxer.createWorkerPort({ channel: 'dxos:system' });
|
|
55
|
-
await this._ready.wait();
|
|
53
|
+
async createSession({ appPort, systemPort }) {
|
|
56
54
|
const session = new worker_session_1.WorkerSession({
|
|
57
|
-
|
|
55
|
+
getServices: async () => {
|
|
56
|
+
const error = await this._ready.wait();
|
|
57
|
+
if (error !== undefined) {
|
|
58
|
+
throw error;
|
|
59
|
+
}
|
|
60
|
+
return this._clientServices;
|
|
61
|
+
},
|
|
58
62
|
appPort,
|
|
59
|
-
systemPort
|
|
63
|
+
systemPort,
|
|
64
|
+
readySignal: this._ready
|
|
60
65
|
});
|
|
61
66
|
// When tab is closed.
|
|
62
67
|
session.onClose.set(async () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker-runtime.js","sourceRoot":"","sources":["../../../../src/packlets/vault/worker-runtime.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE
|
|
1
|
+
{"version":3,"file":"worker-runtime.js","sourceRoot":"","sources":["../../../../src/packlets/vault/worker-runtime.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,13 @@
|
|
|
1
|
+
import { Trigger } from '@dxos/async';
|
|
1
2
|
import { BridgeService } from '@dxos/protocols/proto/dxos/mesh/bridge';
|
|
2
3
|
import { RpcPort } from '@dxos/rpc';
|
|
3
4
|
import { Callback } from '@dxos/util';
|
|
4
5
|
import { ClientServicesHost } from '../services';
|
|
5
6
|
export declare type WorkerSessionParams = {
|
|
6
|
-
|
|
7
|
+
getServices: () => Promise<ClientServicesHost>;
|
|
7
8
|
systemPort: RpcPort;
|
|
8
9
|
appPort: RpcPort;
|
|
10
|
+
readySignal: Trigger<Error | undefined>;
|
|
9
11
|
options?: {
|
|
10
12
|
heartbeatInterval: number;
|
|
11
13
|
};
|
|
@@ -17,12 +19,13 @@ export declare class WorkerSession {
|
|
|
17
19
|
private readonly _clientRpc;
|
|
18
20
|
private readonly _systemRpc;
|
|
19
21
|
private readonly _startTrigger;
|
|
22
|
+
private readonly _getServices;
|
|
20
23
|
private readonly _options;
|
|
21
24
|
private _heartbeatTimer?;
|
|
22
25
|
readonly onClose: Callback<() => Promise<void>>;
|
|
23
26
|
origin?: string;
|
|
24
27
|
bridgeService?: BridgeService;
|
|
25
|
-
constructor({
|
|
28
|
+
constructor({ getServices, systemPort, appPort, options }: WorkerSessionParams);
|
|
26
29
|
open(): Promise<void>;
|
|
27
30
|
close(): Promise<void>;
|
|
28
31
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker-session.d.ts","sourceRoot":"","sources":["../../../../src/packlets/vault/worker-session.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"worker-session.d.ts","sourceRoot":"","sources":["../../../../src/packlets/vault/worker-session.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAEtC,OAAO,EAAE,aAAa,EAAE,MAAM,wCAAwC,CAAC;AACvE,OAAO,EAAoC,OAAO,EAAE,MAAM,WAAW,CAAC;AACtE,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEtC,OAAO,EAAuB,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAGtE,oBAAY,mBAAmB,GAAG;IAChC,WAAW,EAAE,MAAM,OAAO,CAAC,kBAAkB,CAAC,CAAC;IAC/C,UAAU,EAAE,OAAO,CAAC;IACpB,OAAO,EAAE,OAAO,CAAC;IACjB,WAAW,EAAE,OAAO,CAAC,KAAK,GAAG,SAAS,CAAC,CAAC;IACxC,OAAO,CAAC,EAAE;QACR,iBAAiB,EAAE,MAAM,CAAC;KAC3B,CAAC;CACH,CAAC;AAEF;;GAEG;AACH,qBAAa,aAAa;IACxB,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAmB;IAC9C,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAoC;IAC/D,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAiB;IAC/C,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAoC;IACjE,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAA8C;IACvE,OAAO,CAAC,eAAe,CAAC,CAAiB;IAEzC,SAAgB,OAAO,iBAAsB,QAAQ,IAAI,CAAC,EAAI;IAEvD,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,aAAa,CAAC,EAAE,aAAa,CAAC;gBAEzB,EACV,WAAW,EACX,UAAU,EACV,OAAO,EACP,OAEC,EACF,EAAE,mBAAmB;IAiDhB,IAAI;IAkBJ,KAAK;CAaZ"}
|
|
@@ -8,25 +8,38 @@ const async_1 = require("@dxos/async");
|
|
|
8
8
|
const log_1 = require("@dxos/log");
|
|
9
9
|
const rpc_1 = require("@dxos/rpc");
|
|
10
10
|
const util_1 = require("@dxos/util");
|
|
11
|
-
const services_1 = require("
|
|
11
|
+
const services_1 = require("../services");
|
|
12
|
+
const services_2 = require("./services");
|
|
12
13
|
/**
|
|
13
14
|
* Represents a tab connection within the worker.
|
|
14
15
|
*/
|
|
15
16
|
class WorkerSession {
|
|
16
|
-
constructor({
|
|
17
|
+
constructor({ getServices, systemPort, appPort, options = {
|
|
17
18
|
heartbeatInterval: 1000
|
|
18
19
|
} }) {
|
|
19
20
|
this._startTrigger = new async_1.Trigger();
|
|
20
21
|
this.onClose = new util_1.Callback();
|
|
21
22
|
this._options = options;
|
|
23
|
+
this._getServices = getServices;
|
|
22
24
|
this._clientRpc = (0, rpc_1.createProtoRpcPeer)({
|
|
23
|
-
exposed:
|
|
24
|
-
handlers:
|
|
25
|
+
exposed: services_1.clientServiceBundle,
|
|
26
|
+
handlers: {
|
|
27
|
+
HaloInvitationsService: async () => (await this._getServices()).services.HaloInvitationsService,
|
|
28
|
+
DevicesService: async () => (await this._getServices()).services.DevicesService,
|
|
29
|
+
SpaceInvitationsService: async () => (await this._getServices()).services.SpaceInvitationsService,
|
|
30
|
+
SpacesService: async () => (await this._getServices()).services.SpacesService,
|
|
31
|
+
SpaceService: async () => (await this._getServices()).services.SpaceService,
|
|
32
|
+
DataService: async () => (await this._getServices()).services.DataService,
|
|
33
|
+
ProfileService: async () => (await this._getServices()).services.ProfileService,
|
|
34
|
+
SystemService: async () => (await this._getServices()).services.SystemService,
|
|
35
|
+
DevtoolsHost: async () => (await this._getServices()).services.DevtoolsHost,
|
|
36
|
+
TracingService: async () => (await this._getServices()).services.TracingService
|
|
37
|
+
},
|
|
25
38
|
port: appPort
|
|
26
39
|
});
|
|
27
40
|
this._systemRpc = (0, rpc_1.createProtoRpcPeer)({
|
|
28
|
-
requested:
|
|
29
|
-
exposed:
|
|
41
|
+
requested: services_2.iframeServiceBundle,
|
|
42
|
+
exposed: services_2.workerServiceBundle,
|
|
30
43
|
handlers: {
|
|
31
44
|
WorkerService: {
|
|
32
45
|
start: async (request) => {
|
|
@@ -39,7 +52,7 @@ class WorkerSession {
|
|
|
39
52
|
await this.close();
|
|
40
53
|
}
|
|
41
54
|
catch (err) {
|
|
42
|
-
log_1.log.catch(err, {}, { file: "packages/sdk/client-services/src/packlets/vault/worker-session.ts", line:
|
|
55
|
+
log_1.log.catch(err, {}, { file: "packages/sdk/client-services/src/packlets/vault/worker-session.ts", line: 83 });
|
|
43
56
|
}
|
|
44
57
|
});
|
|
45
58
|
}
|
|
@@ -52,7 +65,7 @@ class WorkerSession {
|
|
|
52
65
|
}
|
|
53
66
|
async open() {
|
|
54
67
|
await Promise.all([this._clientRpc.open(), this._systemRpc.open()]);
|
|
55
|
-
await this._startTrigger.wait(
|
|
68
|
+
await this._startTrigger.wait({ timeout: 3000 });
|
|
56
69
|
this._heartbeatTimer = setInterval(async () => {
|
|
57
70
|
try {
|
|
58
71
|
await this._systemRpc.rpc.IframeService.heartbeat();
|
|
@@ -62,7 +75,7 @@ class WorkerSession {
|
|
|
62
75
|
await this.close();
|
|
63
76
|
}
|
|
64
77
|
catch (err) {
|
|
65
|
-
log_1.log.catch(err, {}, { file: "packages/sdk/client-services/src/packlets/vault/worker-session.ts", line:
|
|
78
|
+
log_1.log.catch(err, {}, { file: "packages/sdk/client-services/src/packlets/vault/worker-session.ts", line: 108 });
|
|
66
79
|
}
|
|
67
80
|
}
|
|
68
81
|
}, this._options.heartbeatInterval);
|
|
@@ -72,7 +85,7 @@ class WorkerSession {
|
|
|
72
85
|
await this.onClose.callIfSet();
|
|
73
86
|
}
|
|
74
87
|
catch (err) {
|
|
75
|
-
log_1.log.catch(err, {}, { file: "packages/sdk/client-services/src/packlets/vault/worker-session.ts", line:
|
|
88
|
+
log_1.log.catch(err, {}, { file: "packages/sdk/client-services/src/packlets/vault/worker-session.ts", line: 118 });
|
|
76
89
|
}
|
|
77
90
|
if (this._heartbeatTimer !== undefined) {
|
|
78
91
|
clearInterval(this._heartbeatTimer);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker-session.js","sourceRoot":"","sources":["../../../../src/packlets/vault/worker-session.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;AAEF,uCAAsC;AACtC,mCAAgC;AAEhC,mCAAsE;AACtE,qCAAsC;
|
|
1
|
+
{"version":3,"file":"worker-session.js","sourceRoot":"","sources":["../../../../src/packlets/vault/worker-session.ts"],"names":[],"mappings":"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"}
|