@dxos/client-services 0.4.10-main.99ef736 → 0.4.10-main.ec8b427
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/lib/browser/{chunk-Z5IWAFLC.mjs → chunk-4NKBBUMB.mjs} +21 -29
- package/dist/lib/browser/{chunk-Z5IWAFLC.mjs.map → chunk-4NKBBUMB.mjs.map} +3 -3
- package/dist/lib/browser/index.mjs +20 -48
- package/dist/lib/browser/index.mjs.map +3 -3
- package/dist/lib/browser/meta.json +1 -1
- package/dist/lib/browser/packlets/testing/index.mjs +1 -1
- package/dist/lib/node/{chunk-IMCYLQK4.cjs → chunk-5YRLBMIC.cjs} +24 -32
- package/dist/lib/node/{chunk-IMCYLQK4.cjs.map → chunk-5YRLBMIC.cjs.map} +2 -2
- package/dist/lib/node/index.cjs +57 -85
- package/dist/lib/node/index.cjs.map +3 -3
- package/dist/lib/node/meta.json +1 -1
- package/dist/lib/node/packlets/testing/index.cjs +6 -6
- package/dist/types/src/packlets/services/service-host.d.ts.map +1 -1
- package/dist/types/src/packlets/vault/shared-worker-connection.d.ts +5 -5
- package/dist/types/src/packlets/vault/shared-worker-connection.d.ts.map +1 -1
- package/dist/types/src/packlets/vault/worker-runtime.d.ts +0 -2
- package/dist/types/src/packlets/vault/worker-runtime.d.ts.map +1 -1
- package/dist/types/src/packlets/vault/worker-session.d.ts +0 -2
- package/dist/types/src/packlets/vault/worker-session.d.ts.map +1 -1
- package/dist/types/src/version.d.ts +1 -1
- package/package.json +34 -34
- package/src/packlets/services/service-host.ts +0 -3
- package/src/packlets/vault/shared-worker-connection.ts +8 -3
- package/src/packlets/vault/worker-runtime.ts +2 -27
- package/src/packlets/vault/worker-session.ts +0 -6
- package/src/version.ts +1 -1
|
@@ -21,8 +21,6 @@ export declare class WorkerSession {
|
|
|
21
21
|
private readonly _serviceHost;
|
|
22
22
|
readonly onClose: Callback<() => Promise<void>>;
|
|
23
23
|
origin?: string;
|
|
24
|
-
observabilityGroup?: string;
|
|
25
|
-
signalTelemetryEnabled?: boolean;
|
|
26
24
|
lockKey?: string;
|
|
27
25
|
bridgeService?: BridgeService;
|
|
28
26
|
constructor({ serviceHost, systemPort, appPort, shellPort, readySignal }: WorkerSessionParams);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker-session.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/vault/worker-session.ts"],"names":[],"mappings":"AAIA,OAAO,EAAgB,OAAO,EAAE,MAAM,aAAa,CAAC;AASpD,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,wCAAwC,CAAC;AAC5E,OAAO,EAAyC,KAAK,OAAO,EAAE,MAAM,WAAW,CAAC;AAChF,OAAO,EAAE,QAAQ,EAAqB,MAAM,YAAY,CAAC;AAEzD,OAAO,EAAE,KAAK,kBAAkB,EAA+C,MAAM,aAAa,CAAC;AAEnG,MAAM,MAAM,mBAAmB,GAAG;IAChC,WAAW,EAAE,kBAAkB,CAAC;IAChC,UAAU,EAAE,OAAO,CAAC;IACpB,OAAO,EAAE,OAAO,CAAC;IAEjB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,WAAW,EAAE,OAAO,CAAC,KAAK,GAAG,SAAS,CAAC,CAAC;CACzC,CAAC;AAEF;;GAEG;AACH,qBAAa,aAAa;IACxB,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAkB;IAC7C,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAkB;IACnD,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAoC;IAC/D,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAiB;IAC/C,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAqB;IAElD,SAAgB,OAAO,iBAAsB,QAAQ,IAAI,CAAC,EAAI;IAGvD,MAAM,CAAC,EAAE,MAAM,CAAC;IAGhB,
|
|
1
|
+
{"version":3,"file":"worker-session.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/vault/worker-session.ts"],"names":[],"mappings":"AAIA,OAAO,EAAgB,OAAO,EAAE,MAAM,aAAa,CAAC;AASpD,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,wCAAwC,CAAC;AAC5E,OAAO,EAAyC,KAAK,OAAO,EAAE,MAAM,WAAW,CAAC;AAChF,OAAO,EAAE,QAAQ,EAAqB,MAAM,YAAY,CAAC;AAEzD,OAAO,EAAE,KAAK,kBAAkB,EAA+C,MAAM,aAAa,CAAC;AAEnG,MAAM,MAAM,mBAAmB,GAAG;IAChC,WAAW,EAAE,kBAAkB,CAAC;IAChC,UAAU,EAAE,OAAO,CAAC;IACpB,OAAO,EAAE,OAAO,CAAC;IAEjB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,WAAW,EAAE,OAAO,CAAC,KAAK,GAAG,SAAS,CAAC,CAAC;CACzC,CAAC;AAEF;;GAEG;AACH,qBAAa,aAAa;IACxB,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAkB;IAC7C,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAkB;IACnD,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAoC;IAC/D,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAiB;IAC/C,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAqB;IAElD,SAAgB,OAAO,iBAAsB,QAAQ,IAAI,CAAC,EAAI;IAGvD,MAAM,CAAC,EAAE,MAAM,CAAC;IAGhB,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,aAAa,CAAC,EAAE,aAAa,CAAC;gBAEzB,EAAE,WAAW,EAAE,UAAU,EAAE,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,EAAE,mBAAmB;IAkEvF,IAAI;IAeJ,KAAK;YAYG,eAAe;IAQ7B,OAAO,CAAC,kBAAkB;CAO3B"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const DXOS_VERSION = "0.4.10-main.
|
|
1
|
+
export declare const DXOS_VERSION = "0.4.10-main.ec8b427";
|
|
2
2
|
//# sourceMappingURL=version.d.ts.map
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dxos/client-services",
|
|
3
|
-
"version": "0.4.10-main.
|
|
3
|
+
"version": "0.4.10-main.ec8b427",
|
|
4
4
|
"description": "DXOS client services implementation",
|
|
5
5
|
"homepage": "https://dxos.org",
|
|
6
6
|
"bugs": "https://github.com/dxos/dxos/issues",
|
|
@@ -22,43 +22,43 @@
|
|
|
22
22
|
],
|
|
23
23
|
"dependencies": {
|
|
24
24
|
"platform": "^1.3.6",
|
|
25
|
-
"@dxos/async": "0.4.10-main.
|
|
26
|
-
"@dxos/automerge": "0.4.10-main.
|
|
27
|
-
"@dxos/
|
|
28
|
-
"@dxos/
|
|
29
|
-
"@dxos/
|
|
30
|
-
"@dxos/
|
|
31
|
-
"@dxos/
|
|
32
|
-
"@dxos/
|
|
33
|
-
"@dxos/
|
|
34
|
-
"@dxos/echo-pipeline": "0.4.10-main.
|
|
35
|
-
"@dxos/echo-db": "0.4.10-main.
|
|
36
|
-
"@dxos/echo-schema": "0.4.10-main.
|
|
37
|
-
"@dxos/feed-store": "0.4.10-main.
|
|
38
|
-
"@dxos/
|
|
39
|
-
"@dxos/
|
|
40
|
-
"@dxos/
|
|
41
|
-
"@dxos/
|
|
42
|
-
"@dxos/
|
|
43
|
-
"@dxos/
|
|
44
|
-
"@dxos/
|
|
45
|
-
"@dxos/network-manager": "0.4.10-main.
|
|
46
|
-
"@dxos/node-std": "0.4.10-main.
|
|
47
|
-
"@dxos/
|
|
48
|
-
"@dxos/
|
|
49
|
-
"@dxos/
|
|
50
|
-
"@dxos/
|
|
51
|
-
"@dxos/teleport-extension-gossip": "0.4.10-main.
|
|
52
|
-
"@dxos/
|
|
53
|
-
"@dxos/
|
|
54
|
-
"@dxos/
|
|
55
|
-
"@dxos/
|
|
56
|
-
"@dxos/
|
|
25
|
+
"@dxos/async": "0.4.10-main.ec8b427",
|
|
26
|
+
"@dxos/automerge": "0.4.10-main.ec8b427",
|
|
27
|
+
"@dxos/client-protocol": "0.4.10-main.ec8b427",
|
|
28
|
+
"@dxos/codec-protobuf": "0.4.10-main.ec8b427",
|
|
29
|
+
"@dxos/context": "0.4.10-main.ec8b427",
|
|
30
|
+
"@dxos/config": "0.4.10-main.ec8b427",
|
|
31
|
+
"@dxos/credentials": "0.4.10-main.ec8b427",
|
|
32
|
+
"@dxos/crypto": "0.4.10-main.ec8b427",
|
|
33
|
+
"@dxos/debug": "0.4.10-main.ec8b427",
|
|
34
|
+
"@dxos/echo-pipeline": "0.4.10-main.ec8b427",
|
|
35
|
+
"@dxos/echo-db": "0.4.10-main.ec8b427",
|
|
36
|
+
"@dxos/echo-schema": "0.4.10-main.ec8b427",
|
|
37
|
+
"@dxos/feed-store": "0.4.10-main.ec8b427",
|
|
38
|
+
"@dxos/indexing": "0.4.10-main.ec8b427",
|
|
39
|
+
"@dxos/invariant": "0.4.10-main.ec8b427",
|
|
40
|
+
"@dxos/keys": "0.4.10-main.ec8b427",
|
|
41
|
+
"@dxos/log": "0.4.10-main.ec8b427",
|
|
42
|
+
"@dxos/messaging": "0.4.10-main.ec8b427",
|
|
43
|
+
"@dxos/keyring": "0.4.10-main.ec8b427",
|
|
44
|
+
"@dxos/lock-file": "0.4.10-main.ec8b427",
|
|
45
|
+
"@dxos/network-manager": "0.4.10-main.ec8b427",
|
|
46
|
+
"@dxos/node-std": "0.4.10-main.ec8b427",
|
|
47
|
+
"@dxos/random-access-storage": "0.4.10-main.ec8b427",
|
|
48
|
+
"@dxos/protocols": "0.4.10-main.ec8b427",
|
|
49
|
+
"@dxos/teleport": "0.4.10-main.ec8b427",
|
|
50
|
+
"@dxos/rpc": "0.4.10-main.ec8b427",
|
|
51
|
+
"@dxos/teleport-extension-gossip": "0.4.10-main.ec8b427",
|
|
52
|
+
"@dxos/timeframe": "0.4.10-main.ec8b427",
|
|
53
|
+
"@dxos/teleport-extension-object-sync": "0.4.10-main.ec8b427",
|
|
54
|
+
"@dxos/util": "0.4.10-main.ec8b427",
|
|
55
|
+
"@dxos/websocket-rpc": "0.4.10-main.ec8b427",
|
|
56
|
+
"@dxos/tracing": "0.4.10-main.ec8b427"
|
|
57
57
|
},
|
|
58
58
|
"devDependencies": {
|
|
59
59
|
"@types/platform": "^1.3.4",
|
|
60
60
|
"@types/readable-stream": "^2.3.9",
|
|
61
|
-
"@dxos/signal": "0.4.10-main.
|
|
61
|
+
"@dxos/signal": "0.4.10-main.ec8b427"
|
|
62
62
|
},
|
|
63
63
|
"publishConfig": {
|
|
64
64
|
"access": "public"
|
|
@@ -57,7 +57,12 @@ export class SharedWorkerConnection {
|
|
|
57
57
|
return this._shellRuntime;
|
|
58
58
|
}
|
|
59
59
|
|
|
60
|
-
async open(
|
|
60
|
+
async open(
|
|
61
|
+
/**
|
|
62
|
+
* @deprecated Only used with iframes.
|
|
63
|
+
*/
|
|
64
|
+
origin: string,
|
|
65
|
+
) {
|
|
61
66
|
this._config = await getAsyncValue(this._configProvider);
|
|
62
67
|
|
|
63
68
|
this._transportService = new SimplePeerTransportService({
|
|
@@ -78,7 +83,7 @@ export class SharedWorkerConnection {
|
|
|
78
83
|
|
|
79
84
|
let lockKey: string | undefined;
|
|
80
85
|
if (typeof navigator !== 'undefined') {
|
|
81
|
-
lockKey = this._lockKey(
|
|
86
|
+
lockKey = this._lockKey(origin);
|
|
82
87
|
this._release = new Trigger();
|
|
83
88
|
const ready = new Trigger();
|
|
84
89
|
void navigator.locks.request(lockKey, async () => {
|
|
@@ -90,7 +95,7 @@ export class SharedWorkerConnection {
|
|
|
90
95
|
|
|
91
96
|
try {
|
|
92
97
|
await this._systemRpc.open();
|
|
93
|
-
await this._systemRpc.rpc.WorkerService.start({
|
|
98
|
+
await this._systemRpc.rpc.WorkerService.start({ origin, lockKey });
|
|
94
99
|
} catch (err) {
|
|
95
100
|
log.catch(err);
|
|
96
101
|
throw new RemoteServiceConnectionError('Failed to connect to worker');
|
|
@@ -5,14 +5,8 @@
|
|
|
5
5
|
import { Trigger } from '@dxos/async';
|
|
6
6
|
import { type Config } from '@dxos/config';
|
|
7
7
|
import { Context } from '@dxos/context';
|
|
8
|
-
import { invariant } from '@dxos/invariant';
|
|
9
8
|
import { log } from '@dxos/log';
|
|
10
|
-
import {
|
|
11
|
-
MemorySignalManager,
|
|
12
|
-
MemorySignalManagerContext,
|
|
13
|
-
WebsocketSignalManager,
|
|
14
|
-
setIdentityTags,
|
|
15
|
-
} from '@dxos/messaging';
|
|
9
|
+
import { MemorySignalManager, MemorySignalManagerContext, WebsocketSignalManager } from '@dxos/messaging';
|
|
16
10
|
import { SimplePeerTransportProxyFactory } from '@dxos/network-manager';
|
|
17
11
|
import { type RpcPort } from '@dxos/rpc';
|
|
18
12
|
import { type MaybePromise } from '@dxos/util';
|
|
@@ -47,8 +41,6 @@ export class WorkerRuntime {
|
|
|
47
41
|
private readonly _clientServices!: ClientServicesHost;
|
|
48
42
|
private _sessionForNetworking?: WorkerSession; // TODO(burdon): Expose to client QueryStatusResponse.
|
|
49
43
|
private _config!: Config;
|
|
50
|
-
private _signalMetadataTags: any = { runtime: 'worker-runtime' };
|
|
51
|
-
private _signalTelemetryEnabled: boolean = false;
|
|
52
44
|
|
|
53
45
|
constructor(
|
|
54
46
|
private readonly _configProvider: () => MaybePromise<Config>,
|
|
@@ -76,7 +68,7 @@ export class WorkerRuntime {
|
|
|
76
68
|
this._clientServices.initialize({
|
|
77
69
|
config: this._config,
|
|
78
70
|
signalManager: signals
|
|
79
|
-
? new WebsocketSignalManager(signals
|
|
71
|
+
? new WebsocketSignalManager(signals)
|
|
80
72
|
: new MemorySignalManager(new MemorySignalManagerContext()), // TODO(dmaretskyi): Inject this context.
|
|
81
73
|
transportFactory: this._transportFactory,
|
|
82
74
|
});
|
|
@@ -84,13 +76,6 @@ export class WorkerRuntime {
|
|
|
84
76
|
await this._clientServices.open(new Context());
|
|
85
77
|
this._ready.wake(undefined);
|
|
86
78
|
log('started');
|
|
87
|
-
setIdentityTags({
|
|
88
|
-
identityService: this._clientServices.services.IdentityService!,
|
|
89
|
-
devicesService: this._clientServices.services.DevicesService!,
|
|
90
|
-
setTag: (k: string, v: string) => {
|
|
91
|
-
this._signalMetadataTags[k] = v;
|
|
92
|
-
},
|
|
93
|
-
});
|
|
94
79
|
} catch (err: any) {
|
|
95
80
|
this._ready.wake(err);
|
|
96
81
|
log.error('starting', err);
|
|
@@ -127,16 +112,6 @@ export class WorkerRuntime {
|
|
|
127
112
|
});
|
|
128
113
|
|
|
129
114
|
await session.open();
|
|
130
|
-
// A worker can only service one origin currently
|
|
131
|
-
invariant(
|
|
132
|
-
!this._signalMetadataTags.origin || this._signalMetadataTags.origin === session.origin,
|
|
133
|
-
`worker origin changed from ${this._signalMetadataTags.origin} to ${session.origin}?`,
|
|
134
|
-
);
|
|
135
|
-
if (session.observabilityGroup) {
|
|
136
|
-
this._signalMetadataTags.group = session.observabilityGroup;
|
|
137
|
-
}
|
|
138
|
-
this._signalTelemetryEnabled = session.signalTelemetryEnabled ?? false;
|
|
139
|
-
this._signalMetadataTags.origin = session.origin;
|
|
140
115
|
this._sessions.add(session);
|
|
141
116
|
|
|
142
117
|
this._reconnectWebrtc();
|
|
@@ -41,10 +41,6 @@ export class WorkerSession {
|
|
|
41
41
|
@logInfo
|
|
42
42
|
public origin?: string;
|
|
43
43
|
|
|
44
|
-
// TODO(nf): factor out?
|
|
45
|
-
public observabilityGroup?: string;
|
|
46
|
-
public signalTelemetryEnabled?: boolean;
|
|
47
|
-
|
|
48
44
|
@logInfo
|
|
49
45
|
public lockKey?: string;
|
|
50
46
|
|
|
@@ -95,8 +91,6 @@ export class WorkerSession {
|
|
|
95
91
|
start: async (request) => {
|
|
96
92
|
this.origin = request.origin;
|
|
97
93
|
this.lockKey = request.lockKey;
|
|
98
|
-
this.observabilityGroup = request.observabilityGroup;
|
|
99
|
-
this.signalTelemetryEnabled = request.signalTelemetryEnabled;
|
|
100
94
|
this._startTrigger.wake();
|
|
101
95
|
},
|
|
102
96
|
|
package/src/version.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export const DXOS_VERSION = "0.4.10-main.
|
|
1
|
+
export const DXOS_VERSION = "0.4.10-main.ec8b427";
|