@dxos/client-services 0.3.11-main.bd26370 → 0.3.11-main.fbbdc2a

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.
Files changed (31) hide show
  1. package/dist/lib/browser/{chunk-X5Z3WL7N.mjs → chunk-TFVZBVWT.mjs} +2 -2
  2. package/dist/lib/browser/{chunk-X5Z3WL7N.mjs.map → chunk-TFVZBVWT.mjs.map} +1 -1
  3. package/dist/lib/browser/index.mjs +42 -33
  4. package/dist/lib/browser/index.mjs.map +4 -4
  5. package/dist/lib/browser/meta.json +1 -1
  6. package/dist/lib/browser/packlets/testing/index.mjs +1 -1
  7. package/dist/lib/node/{chunk-OLCLRX7U.cjs → chunk-JX3HFMGV.cjs} +5 -5
  8. package/dist/lib/node/{chunk-OLCLRX7U.cjs.map → chunk-JX3HFMGV.cjs.map} +1 -1
  9. package/dist/lib/node/index.cjs +77 -68
  10. package/dist/lib/node/index.cjs.map +4 -4
  11. package/dist/lib/node/meta.json +1 -1
  12. package/dist/lib/node/packlets/testing/index.cjs +8 -8
  13. package/dist/types/src/packlets/vault/iframe-host-runtime.d.ts +2 -0
  14. package/dist/types/src/packlets/vault/iframe-host-runtime.d.ts.map +1 -1
  15. package/dist/types/src/packlets/vault/index.d.ts +1 -1
  16. package/dist/types/src/packlets/vault/index.d.ts.map +1 -1
  17. package/dist/types/src/packlets/vault/{iframe-proxy-runtime.d.ts → shared-worker-connection.d.ts} +12 -5
  18. package/dist/types/src/packlets/vault/shared-worker-connection.d.ts.map +1 -0
  19. package/dist/types/src/packlets/vault/worker-runtime.d.ts +10 -3
  20. package/dist/types/src/packlets/vault/worker-runtime.d.ts.map +1 -1
  21. package/dist/types/src/packlets/vault/worker-session.d.ts +2 -2
  22. package/dist/types/src/packlets/vault/worker-session.d.ts.map +1 -1
  23. package/dist/types/src/version.d.ts +1 -1
  24. package/package.json +35 -35
  25. package/src/packlets/vault/iframe-host-runtime.ts +2 -0
  26. package/src/packlets/vault/index.ts +1 -1
  27. package/src/packlets/vault/{iframe-proxy-runtime.ts → shared-worker-connection.ts} +18 -6
  28. package/src/packlets/vault/worker-runtime.ts +27 -9
  29. package/src/packlets/vault/worker-session.ts +11 -8
  30. package/src/version.ts +1 -1
  31. package/dist/types/src/packlets/vault/iframe-proxy-runtime.d.ts.map +0 -1
package/dist/types/src/packlets/vault/shared-worker-connection.d.ts.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"shared-worker-connection.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/vault/shared-worker-connection.ts"],"names":[],"mappings":"AAKA,OAAO,EAEL,KAAK,YAAY,EAGlB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,cAAc,CAAC;AAK3C,OAAO,EAAyC,KAAK,OAAO,EAAE,MAAM,WAAW,CAAC;AAChF,OAAO,EAAiB,KAAK,YAAY,EAAE,KAAK,QAAQ,EAAE,MAAM,YAAY,CAAC;AAK7E,MAAM,MAAM,6BAA6B,GAAG;IAC1C,MAAM,EAAE,MAAM,GAAG,QAAQ,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC;IAChD,UAAU,EAAE,OAAO,CAAC;IACpB;;OAEG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB,CAAC;AAEF;;GAEG;AACH,qBAAa,sBAAsB;IACjC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAA+C;IACnE,OAAO,CAAC,QAAQ,CAAC,eAAe,CAA0C;IAC1E,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAU;IACtC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAU;IACtC,OAAO,CAAC,QAAQ,CAAiB;IACjC,OAAO,CAAC,OAAO,CAAU;IACzB,OAAO,CAAC,iBAAiB,CAAiB;IAC1C,OAAO,CAAC,UAAU,CAAqC;IACvD,OAAO,CAAC,aAAa,CAAC,CAAmB;gBAE7B,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,EAAE,6BAA6B;IAU5E,IAAI,KAAK,IAAI,YAAY,GAAG,SAAS,CAEpC;IAEK,IAAI;IACR;;OAEG;IACH,MAAM,EAAE,MAAM;IAwCV,KAAK;IAWX,OAAO,CAAC,QAAQ;CAGjB"}
package/dist/types/src/packlets/vault/worker-runtime.d.ts CHANGED
@@ -5,7 +5,12 @@ import { ClientServicesHost } from '../services';
5
5
  export type CreateSessionParams = {
6
6
  appPort: RpcPort;
7
7
  systemPort: RpcPort;
8
- shellPort: RpcPort;
8
+ shellPort?: RpcPort;
9
+ };
10
+ export type WorkerRuntimeCallbacks = {
11
+ acquireLock: () => Promise<void>;
12
+ releaseLock: () => void;
13
+ onReset: () => Promise<void>;
9
14
  };
10
15
  /**
11
16
  * Runtime for the shared worker.
@@ -14,13 +19,15 @@ export type CreateSessionParams = {
14
19
  */
15
20
  export declare class WorkerRuntime {
16
21
  private readonly _configProvider;
22
+ private readonly _acquireLock;
23
+ private readonly _releaseLock;
17
24
  private readonly _transportFactory;
18
25
  private readonly _ready;
19
26
  private readonly _sessions;
20
27
  private readonly _clientServices;
21
28
  private _sessionForNetworking?;
22
29
  private _config;
23
- constructor(_configProvider: () => MaybePromise<Config>);
30
+ constructor(_configProvider: () => MaybePromise<Config>, { acquireLock, releaseLock, onReset }: WorkerRuntimeCallbacks);
24
31
  get host(): ClientServicesHost;
25
32
  start(): Promise<void>;
26
33
  stop(): Promise<void>;
@@ -29,7 +36,7 @@ export declare class WorkerRuntime {
29
36
  */
30
37
  createSession({ appPort, systemPort, shellPort }: CreateSessionParams): Promise<void>;
31
38
  /**
32
- * Selects one of the existing session fro WebRTC networking.
39
+ * Selects one of the existing session for WebRTC networking.
33
40
  */
34
41
  private _reconnectWebrtc;
35
42
  }
package/dist/types/src/packlets/vault/worker-runtime.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"worker-runtime.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/vault/worker-runtime.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,cAAc,CAAC;AAK3C,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,YAAY,CAAC;AAG/C,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAGjD,MAAM,MAAM,mBAAmB,GAAG;IAChC,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,EAAE,OAAO,CAAC;IACpB,SAAS,EAAE,OAAO,CAAC;CACpB,CAAC;AAEF;;;;GAIG;AACH,qBAAa,aAAa;IAQZ,OAAO,CAAC,QAAQ,CAAC,eAAe;IAP5C,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAyC;IAC3E,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAoC;IAC3D,OAAO,CAAC,QAAQ,CAAC,SAAS,CAA4B;IACtD,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAsB;IACtD,OAAO,CAAC,qBAAqB,CAAC,CAAgB;IAC9C,OAAO,CAAC,OAAO,CAAU;gBAEI,eAAe,EAAE,MAAM,YAAY,CAAC,MAAM,CAAC;IAUxE,IAAI,IAAI,uBAEP;IAEK,KAAK;IAsBL,IAAI;IAKV;;OAEG;IACG,aAAa,CAAC,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,EAAE,mBAAmB;IAqB3E;;OAEG;IACH,OAAO,CAAC,gBAAgB;CAoBzB"}
1
+ {"version":3,"file":"worker-runtime.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/vault/worker-runtime.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,cAAc,CAAC;AAK3C,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,YAAY,CAAC;AAG/C,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAGjD,MAAM,MAAM,mBAAmB,GAAG;IAChC,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,EAAE,OAAO,CAAC;IACpB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACnC,WAAW,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IACjC,WAAW,EAAE,MAAM,IAAI,CAAC;IACxB,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC9B,CAAC;AAEF;;;;GAIG;AACH,qBAAa,aAAa;IAWtB,OAAO,CAAC,QAAQ,CAAC,eAAe;IAVlC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAsB;IACnD,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAa;IAC1C,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAyC;IAC3E,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAoC;IAC3D,OAAO,CAAC,QAAQ,CAAC,SAAS,CAA4B;IACtD,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAsB;IACtD,OAAO,CAAC,qBAAqB,CAAC,CAAgB;IAC9C,OAAO,CAAC,OAAO,CAAU;gBAGN,eAAe,EAAE,MAAM,YAAY,CAAC,MAAM,CAAC,EAC5D,EAAE,WAAW,EAAE,WAAW,EAAE,OAAO,EAAE,EAAE,sBAAsB;IAW/D,IAAI,IAAI,uBAEP;IAEK,KAAK;IAuBL,IAAI;IAMV;;OAEG;IACG,aAAa,CAAC,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,EAAE,mBAAmB;IA0B3E;;OAEG;IACH,OAAO,CAAC,gBAAgB;CAoBzB"}
package/dist/types/src/packlets/vault/worker-session.d.ts CHANGED
@@ -7,7 +7,7 @@ export type WorkerSessionParams = {
7
7
  serviceHost: ClientServicesHost;
8
8
  systemPort: RpcPort;
9
9
  appPort: RpcPort;
10
- shellPort: RpcPort;
10
+ shellPort?: RpcPort;
11
11
  readySignal: Trigger<Error | undefined>;
12
12
  };
13
13
  /**
@@ -15,7 +15,7 @@ export type WorkerSessionParams = {
15
15
  */
16
16
  export declare class WorkerSession {
17
17
  private readonly _clientRpc;
18
- private readonly _shellClientRpc;
18
+ private readonly _shellClientRpc?;
19
19
  private readonly _iframeRpc;
20
20
  private readonly _startTrigger;
21
21
  private readonly _serviceHost;
package/dist/types/src/packlets/vault/worker-session.d.ts.map CHANGED
@@ -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;IACjB,SAAS,EAAE,OAAO,CAAC;IACnB,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,CAAkB;IAClD,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;IAgEvF,IAAI;IAeJ,KAAK;YAYG,eAAe;IAQ7B,OAAO,CAAC,kBAAkB;CAO3B"}
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"}
package/dist/types/src/version.d.ts CHANGED
@@ -1,2 +1,2 @@
1
- export declare const DXOS_VERSION = "0.3.11-main.bd26370";
1
+ export declare const DXOS_VERSION = "0.3.11-main.fbbdc2a";
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.3.11-main.bd26370",
3
+ "version": "0.3.11-main.fbbdc2a",
4
4
  "description": "DXOS client services implementation",
5
5
  "homepage": "https://dxos.org",
6
6
  "bugs": "https://github.com/dxos/dxos/issues",
@@ -22,44 +22,44 @@
22
22
  ],
23
23
  "dependencies": {
24
24
  "platform": "^1.3.6",
25
- "@dxos/async": "0.3.11-main.bd26370",
26
- "@dxos/client-protocol": "0.3.11-main.bd26370",
27
- "@dxos/codec-protobuf": "0.3.11-main.bd26370",
28
- "@dxos/context": "0.3.11-main.bd26370",
29
- "@dxos/config": "0.3.11-main.bd26370",
30
- "@dxos/credentials": "0.3.11-main.bd26370",
31
- "@dxos/crypto": "0.3.11-main.bd26370",
32
- "@dxos/document-model": "0.3.11-main.bd26370",
33
- "@dxos/echo-pipeline": "0.3.11-main.bd26370",
34
- "@dxos/debug": "0.3.11-main.bd26370",
35
- "@dxos/echo-db": "0.3.11-main.bd26370",
36
- "@dxos/echo-schema": "0.3.11-main.bd26370",
37
- "@dxos/feed-store": "0.3.11-main.bd26370",
38
- "@dxos/invariant": "0.3.11-main.bd26370",
39
- "@dxos/keyring": "0.3.11-main.bd26370",
40
- "@dxos/keys": "0.3.11-main.bd26370",
41
- "@dxos/log": "0.3.11-main.bd26370",
42
- "@dxos/messaging": "0.3.11-main.bd26370",
43
- "@dxos/model-factory": "0.3.11-main.bd26370",
44
- "@dxos/lock-file": "0.3.11-main.bd26370",
45
- "@dxos/node-std": "0.3.11-main.bd26370",
46
- "@dxos/protocols": "0.3.11-main.bd26370",
47
- "@dxos/random-access-storage": "0.3.11-main.bd26370",
48
- "@dxos/network-manager": "0.3.11-main.bd26370",
49
- "@dxos/rpc": "0.3.11-main.bd26370",
50
- "@dxos/teleport-extension-gossip": "0.3.11-main.bd26370",
51
- "@dxos/teleport": "0.3.11-main.bd26370",
52
- "@dxos/teleport-extension-object-sync": "0.3.11-main.bd26370",
53
- "@dxos/timeframe": "0.3.11-main.bd26370",
54
- "@dxos/text-model": "0.3.11-main.bd26370",
55
- "@dxos/tracing": "0.3.11-main.bd26370",
56
- "@dxos/util": "0.3.11-main.bd26370",
57
- "@dxos/websocket-rpc": "0.3.11-main.bd26370"
25
+ "@dxos/async": "0.3.11-main.fbbdc2a",
26
+ "@dxos/client-protocol": "0.3.11-main.fbbdc2a",
27
+ "@dxos/codec-protobuf": "0.3.11-main.fbbdc2a",
28
+ "@dxos/config": "0.3.11-main.fbbdc2a",
29
+ "@dxos/context": "0.3.11-main.fbbdc2a",
30
+ "@dxos/credentials": "0.3.11-main.fbbdc2a",
31
+ "@dxos/crypto": "0.3.11-main.fbbdc2a",
32
+ "@dxos/debug": "0.3.11-main.fbbdc2a",
33
+ "@dxos/document-model": "0.3.11-main.fbbdc2a",
34
+ "@dxos/echo-db": "0.3.11-main.fbbdc2a",
35
+ "@dxos/echo-pipeline": "0.3.11-main.fbbdc2a",
36
+ "@dxos/echo-schema": "0.3.11-main.fbbdc2a",
37
+ "@dxos/feed-store": "0.3.11-main.fbbdc2a",
38
+ "@dxos/invariant": "0.3.11-main.fbbdc2a",
39
+ "@dxos/keyring": "0.3.11-main.fbbdc2a",
40
+ "@dxos/lock-file": "0.3.11-main.fbbdc2a",
41
+ "@dxos/log": "0.3.11-main.fbbdc2a",
42
+ "@dxos/keys": "0.3.11-main.fbbdc2a",
43
+ "@dxos/messaging": "0.3.11-main.fbbdc2a",
44
+ "@dxos/model-factory": "0.3.11-main.fbbdc2a",
45
+ "@dxos/network-manager": "0.3.11-main.fbbdc2a",
46
+ "@dxos/node-std": "0.3.11-main.fbbdc2a",
47
+ "@dxos/protocols": "0.3.11-main.fbbdc2a",
48
+ "@dxos/random-access-storage": "0.3.11-main.fbbdc2a",
49
+ "@dxos/rpc": "0.3.11-main.fbbdc2a",
50
+ "@dxos/teleport": "0.3.11-main.fbbdc2a",
51
+ "@dxos/text-model": "0.3.11-main.fbbdc2a",
52
+ "@dxos/teleport-extension-object-sync": "0.3.11-main.fbbdc2a",
53
+ "@dxos/teleport-extension-gossip": "0.3.11-main.fbbdc2a",
54
+ "@dxos/timeframe": "0.3.11-main.fbbdc2a",
55
+ "@dxos/tracing": "0.3.11-main.fbbdc2a",
56
+ "@dxos/util": "0.3.11-main.fbbdc2a",
57
+ "@dxos/websocket-rpc": "0.3.11-main.fbbdc2a"
58
58
  },
59
59
  "devDependencies": {
60
60
  "@types/platform": "^1.3.4",
61
61
  "@types/readable-stream": "^2.3.9",
62
- "@dxos/signal": "0.3.11-main.bd26370"
62
+ "@dxos/signal": "0.3.11-main.fbbdc2a"
63
63
  },
64
64
  "publishConfig": {
65
65
  "access": "public"
package/src/packlets/vault/iframe-host-runtime.ts CHANGED
@@ -30,6 +30,8 @@ export type IFrameHostRuntimeParams = {
30
30
  *
31
31
  * Holds a lock over the client services such that only one instance can run at a time.
32
32
  * This should only be used when SharedWorker is not available.
33
+ *
34
+ * @deprecated
33
35
  */
34
36
  export class IFrameHostRuntime {
35
37
  private readonly _configProvider: IFrameHostRuntimeParams['config'];
package/src/packlets/vault/index.ts CHANGED
@@ -3,7 +3,7 @@
3
3
  //
4
4
 
5
5
  export * from './iframe-host-runtime';
6
- export * from './iframe-proxy-runtime';
6
+ export * from './shared-worker-connection';
7
7
  export * from './shell-runtime';
8
8
  export * from './worker-runtime';
9
9
  export * from './worker-session';
package/src/packlets/vault/{iframe-proxy-runtime.ts → shared-worker-connection.ts} RENAMED
@@ -20,18 +20,21 @@ import { getAsyncValue, type MaybePromise, type Provider } from '@dxos/util';
20
20
  import { ShellRuntimeImpl } from './shell-runtime';
21
21
 
22
22
  // NOTE: Keep as RpcPorts to avoid dependency on @dxos/rpc-tunnel so we don't depend on browser-specific apis.
23
- export type IFrameProxyRuntimeParams = {
23
+ export type SharedWorkerConnectionOptions = {
24
24
  config: Config | Provider<MaybePromise<Config>>;
25
25
  systemPort: RpcPort;
26
+ /**
27
+ * @deprecated Only used with iframes.
28
+ */
26
29
  shellPort?: RpcPort;
27
30
  };
28
31
 
29
32
  /**
30
33
  * Manages the client connection to the shared worker.
31
34
  */
32
- export class IFrameProxyRuntime {
35
+ export class SharedWorkerConnection {
33
36
  private readonly _id = String(Math.floor(Math.random() * 1000000));
34
- private readonly _configProvider: IFrameProxyRuntimeParams['config'];
37
+ private readonly _configProvider: SharedWorkerConnectionOptions['config'];
35
38
  private readonly _systemPort: RpcPort;
36
39
  private readonly _shellPort?: RpcPort;
37
40
  private _release = new Trigger();
@@ -40,7 +43,7 @@ export class IFrameProxyRuntime {
40
43
  private _systemRpc!: ProtoRpcPeer<WorkerServiceBundle>;
41
44
  private _shellRuntime?: ShellRuntimeImpl;
42
45
 
43
- constructor({ config, systemPort, shellPort }: IFrameProxyRuntimeParams) {
46
+ constructor({ config, systemPort, shellPort }: SharedWorkerConnectionOptions) {
44
47
  this._configProvider = config;
45
48
  this._systemPort = systemPort;
46
49
  this._shellPort = shellPort;
@@ -54,7 +57,12 @@ export class IFrameProxyRuntime {
54
57
  return this._shellRuntime;
55
58
  }
56
59
 
57
- async open(origin: string) {
60
+ async open(
61
+ /**
62
+ * @deprecated Only used with iframes.
63
+ */
64
+ origin: string,
65
+ ) {
58
66
  this._config = await getAsyncValue(this._configProvider);
59
67
 
60
68
  this._transportService = new SimplePeerTransportService({
@@ -96,7 +104,11 @@ export class IFrameProxyRuntime {
96
104
  async close() {
97
105
  this._release.wake();
98
106
  await this._shellRuntime?.close();
99
- await this._systemRpc.rpc.WorkerService.stop();
107
+ try {
108
+ await this._systemRpc.rpc.WorkerService.stop();
109
+ } catch {
110
+ // If this fails, the worker is probably already gone.
111
+ }
100
112
  await this._systemRpc.close();
101
113
  }
102
114
 
package/src/packlets/vault/worker-runtime.ts CHANGED
@@ -18,7 +18,13 @@ import { ClientServicesHost } from '../services';
18
18
  export type CreateSessionParams = {
19
19
  appPort: RpcPort;
20
20
  systemPort: RpcPort;
21
- shellPort: RpcPort;
21
+ shellPort?: RpcPort;
22
+ };
23
+
24
+ export type WorkerRuntimeCallbacks = {
25
+ acquireLock: () => Promise<void>;
26
+ releaseLock: () => void;
27
+ onReset: () => Promise<void>;
22
28
  };
23
29
 
24
30
  /**
@@ -27,6 +33,8 @@ export type CreateSessionParams = {
27
33
  * Tabs make requests to the `ClientServicesHost`, and provide a WebRTC gateway.
28
34
  */
29
35
  export class WorkerRuntime {
36
+ private readonly _acquireLock: () => Promise<void>;
37
+ private readonly _releaseLock: () => void;
30
38
  private readonly _transportFactory = new SimplePeerTransportProxyFactory();
31
39
  private readonly _ready = new Trigger<Error | undefined>();
32
40
  private readonly _sessions = new Set<WorkerSession>();
@@ -34,12 +42,15 @@ export class WorkerRuntime {
34
42
  private _sessionForNetworking?: WorkerSession; // TODO(burdon): Expose to client QueryStatusResponse.
35
43
  private _config!: Config;
36
44
 
37
- constructor(private readonly _configProvider: () => MaybePromise<Config>) {
45
+ constructor(
46
+ private readonly _configProvider: () => MaybePromise<Config>,
47
+ { acquireLock, releaseLock, onReset }: WorkerRuntimeCallbacks,
48
+ ) {
49
+ this._acquireLock = acquireLock;
50
+ this._releaseLock = releaseLock;
38
51
  this._clientServices = new ClientServicesHost({
39
52
  callbacks: {
40
- onReset: async () => {
41
- self.close();
42
- },
53
+ onReset: async () => onReset(),
43
54
  },
44
55
  });
45
56
  }
@@ -51,6 +62,7 @@ export class WorkerRuntime {
51
62
  async start() {
52
63
  log('starting...');
53
64
  try {
65
+ await this._acquireLock();
54
66
  this._config = await this._configProvider();
55
67
  const signals = this._config.get('runtime.services.signaling');
56
68
  this._clientServices.initialize({
@@ -71,7 +83,8 @@ export class WorkerRuntime {
71
83
  }
72
84
 
73
85
  async stop() {
74
- // TODO(dmaretskyi): Terminate active sessions.
86
+ // Release the lock to notify remote clients that the worker is terminating.
87
+ this._releaseLock();
75
88
  await this._clientServices.close();
76
89
  }
77
90
 
@@ -87,10 +100,15 @@ export class WorkerRuntime {
87
100
  readySignal: this._ready,
88
101
  });
89
102
 
90
- // When tab is closed.
103
+ // When tab is closed or client is destroyed.
91
104
  session.onClose.set(async () => {
92
105
  this._sessions.delete(session);
93
- this._reconnectWebrtc();
106
+ if (this._sessions.size === 0) {
107
+ // Terminate the worker when all sessions are closed.
108
+ self.close();
109
+ } else {
110
+ this._reconnectWebrtc();
111
+ }
94
112
  });
95
113
 
96
114
  await session.open();
@@ -100,7 +118,7 @@ export class WorkerRuntime {
100
118
  }
101
119
 
102
120
  /**
103
- * Selects one of the existing session fro WebRTC networking.
121
+ * Selects one of the existing session for WebRTC networking.
104
122
  */
105
123
  private _reconnectWebrtc() {
106
124
  log('reconnecting webrtc...');
package/src/packlets/vault/worker-session.ts CHANGED
@@ -21,7 +21,8 @@ export type WorkerSessionParams = {
21
21
  serviceHost: ClientServicesHost;
22
22
  systemPort: RpcPort;
23
23
  appPort: RpcPort;
24
- shellPort: RpcPort;
24
+ // TODO(wittjosiah): Remove shellPort.
25
+ shellPort?: RpcPort;
25
26
  readySignal: Trigger<Error | undefined>;
26
27
  };
27
28
 
@@ -30,7 +31,7 @@ export type WorkerSessionParams = {
30
31
  */
31
32
  export class WorkerSession {
32
33
  private readonly _clientRpc: ClientRpcServer;
33
- private readonly _shellClientRpc: ClientRpcServer;
34
+ private readonly _shellClientRpc?: ClientRpcServer;
34
35
  private readonly _iframeRpc: ProtoRpcPeer<IframeServiceBundle>;
35
36
  private readonly _startTrigger = new Trigger();
36
37
  private readonly _serviceHost: ClientServicesHost;
@@ -74,11 +75,13 @@ export class WorkerSession {
74
75
  ...middleware,
75
76
  });
76
77
 
77
- this._shellClientRpc = new ClientRpcServer({
78
- serviceRegistry: this._serviceHost.serviceRegistry,
79
- port: shellPort,
80
- ...middleware,
81
- });
78
+ this._shellClientRpc = shellPort
79
+ ? new ClientRpcServer({
80
+ serviceRegistry: this._serviceHost.serviceRegistry,
81
+ port: shellPort,
82
+ ...middleware,
83
+ })
84
+ : undefined;
82
85
 
83
86
  this._iframeRpc = createProtoRpcPeer({
84
87
  requested: iframeServiceBundle,
@@ -138,7 +141,7 @@ export class WorkerSession {
138
141
 
139
142
  private async _maybeOpenShell() {
140
143
  try {
141
- await asyncTimeout(this._shellClientRpc.open(), 1_000);
144
+ this._shellClientRpc && (await asyncTimeout(this._shellClientRpc.open(), 1_000));
142
145
  } catch {
143
146
  log.info('No shell connected.');
144
147
  }
package/src/version.ts CHANGED
@@ -1 +1 @@
1
- export const DXOS_VERSION = "0.3.11-main.bd26370";
1
+ export const DXOS_VERSION = "0.3.11-main.fbbdc2a";
package/dist/types/src/packlets/vault/iframe-proxy-runtime.d.ts.map DELETED
@@ -1 +0,0 @@
1
- {"version":3,"file":"iframe-proxy-runtime.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/vault/iframe-proxy-runtime.ts"],"names":[],"mappings":"AAKA,OAAO,EAEL,KAAK,YAAY,EAGlB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,cAAc,CAAC;AAK3C,OAAO,EAAyC,KAAK,OAAO,EAAE,MAAM,WAAW,CAAC;AAChF,OAAO,EAAiB,KAAK,YAAY,EAAE,KAAK,QAAQ,EAAE,MAAM,YAAY,CAAC;AAK7E,MAAM,MAAM,wBAAwB,GAAG;IACrC,MAAM,EAAE,MAAM,GAAG,QAAQ,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC;IAChD,UAAU,EAAE,OAAO,CAAC;IACpB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB,CAAC;AAEF;;GAEG;AACH,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,QAAQ,CAAC,GAAG,CAA+C;IACnE,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAqC;IACrE,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAU;IACtC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAU;IACtC,OAAO,CAAC,QAAQ,CAAiB;IACjC,OAAO,CAAC,OAAO,CAAU;IACzB,OAAO,CAAC,iBAAiB,CAAiB;IAC1C,OAAO,CAAC,UAAU,CAAqC;IACvD,OAAO,CAAC,aAAa,CAAC,CAAmB;gBAE7B,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,EAAE,wBAAwB;IAUvE,IAAI,KAAK,IAAI,YAAY,GAAG,SAAS,CAEpC;IAEK,IAAI,CAAC,MAAM,EAAE,MAAM;IAuCnB,KAAK;IAOX,OAAO,CAAC,QAAQ;CAGjB"}