@dxos/client-services 0.1.49 → 0.1.50-next.1bfebf8

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 (35) hide show
  1. package/dist/lib/browser/{chunk-YLH4UYUT.mjs → chunk-UL74TKNZ.mjs} +497 -1095
  2. package/dist/lib/browser/chunk-UL74TKNZ.mjs.map +7 -0
  3. package/dist/lib/browser/index.mjs +601 -9
  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/index.cjs +1098 -1158
  8. package/dist/lib/node/index.cjs.map +4 -4
  9. package/dist/lib/node/meta.json +1 -1
  10. package/dist/lib/node/packlets/testing/index.cjs +238 -726
  11. package/dist/lib/node/packlets/testing/index.cjs.map +4 -4
  12. package/dist/types/src/index.d.ts +1 -0
  13. package/dist/types/src/index.d.ts.map +1 -1
  14. package/dist/types/src/packlets/locks/browser.d.ts +16 -0
  15. package/dist/types/src/packlets/locks/browser.d.ts.map +1 -0
  16. package/dist/types/src/packlets/locks/index.d.ts +3 -0
  17. package/dist/types/src/packlets/locks/index.d.ts.map +1 -0
  18. package/dist/types/src/packlets/locks/node.d.ts +13 -0
  19. package/dist/types/src/packlets/locks/node.d.ts.map +1 -0
  20. package/dist/types/src/packlets/locks/resource-lock.d.ts +16 -0
  21. package/dist/types/src/packlets/locks/resource-lock.d.ts.map +1 -0
  22. package/dist/types/src/packlets/services/service-host.d.ts.map +1 -1
  23. package/dist/types/src/packlets/vault/index.d.ts +0 -1
  24. package/dist/types/src/packlets/vault/index.d.ts.map +1 -1
  25. package/package.json +33 -30
  26. package/src/index.ts +1 -0
  27. package/src/packlets/{vault/vault-resource-lock.ts → locks/browser.ts} +12 -11
  28. package/src/packlets/locks/index.ts +6 -0
  29. package/src/packlets/locks/node.ts +52 -0
  30. package/src/packlets/locks/resource-lock.ts +24 -0
  31. package/src/packlets/services/service-host.ts +13 -13
  32. package/src/packlets/vault/index.ts +0 -1
  33. package/dist/lib/browser/chunk-YLH4UYUT.mjs.map +0 -7
  34. package/dist/types/src/packlets/vault/vault-resource-lock.d.ts +0 -20
  35. package/dist/types/src/packlets/vault/vault-resource-lock.d.ts.map +0 -1
@@ -5,4 +5,5 @@ export * from './packlets/services';
5
5
  export * from './packlets/spaces';
6
6
  export * from './packlets/storage';
7
7
  export * from './packlets/vault';
8
+ export * from './packlets/locks';
8
9
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAIA,cAAc,qBAAqB,CAAC;AACpC,cAAc,qBAAqB,CAAC;AACpC,cAAc,wBAAwB,CAAC;AACvC,cAAc,qBAAqB,CAAC;AACpC,cAAc,mBAAmB,CAAC;AAClC,cAAc,oBAAoB,CAAC;AACnC,cAAc,kBAAkB,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAIA,cAAc,qBAAqB,CAAC;AACpC,cAAc,qBAAqB,CAAC;AACpC,cAAc,wBAAwB,CAAC;AACvC,cAAc,qBAAqB,CAAC;AACpC,cAAc,mBAAmB,CAAC;AAClC,cAAc,oBAAoB,CAAC;AACnC,cAAc,kBAAkB,CAAC;AACjC,cAAc,kBAAkB,CAAC"}
@@ -0,0 +1,16 @@
1
+ import { ResourceLock, ResourceLockOptions } from './resource-lock';
2
+ export declare class Lock implements ResourceLock {
3
+ private readonly _broadcastChannel;
4
+ private readonly _lockKey;
5
+ private readonly _onAcquire;
6
+ private readonly _onRelease;
7
+ private _releaseTrigger;
8
+ constructor({ lockKey, onAcquire, onRelease }: ResourceLockOptions);
9
+ get lockKey(): string;
10
+ acquire(): Promise<void>;
11
+ release(): Promise<void>;
12
+ private _onMessage;
13
+ private _requestLock;
14
+ }
15
+ export declare const isLocked: (lockPath: string) => never;
16
+ //# sourceMappingURL=browser.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"browser.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/locks/browser.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,YAAY,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAQpE,qBAAa,IAAK,YAAW,YAAY;IACvC,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAA+C;IACjF,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAS;IAClC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAmC;IAC9D,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAmC;IAC9D,OAAO,CAAC,eAAe,CAAiB;gBAE5B,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,EAAE,mBAAmB;IAOlE,IACI,OAAO,WAEV;IAEK,OAAO;IAgBP,OAAO;IAIb,OAAO,CAAC,UAAU;YAMJ,YAAY;CAqB3B;AAGD,eAAO,MAAM,QAAQ,aAAc,MAAM,UAExC,CAAC"}
@@ -0,0 +1,3 @@
1
+ export * from './resource-lock';
2
+ export * from './node';
3
+ //# sourceMappingURL=index.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/locks/index.ts"],"names":[],"mappings":"AAIA,cAAc,iBAAiB,CAAC;AAChC,cAAc,QAAQ,CAAC"}
@@ -0,0 +1,13 @@
1
+ import { ResourceLock, ResourceLockOptions } from './resource-lock';
2
+ export declare class Lock implements ResourceLock {
3
+ private readonly _lockPath;
4
+ private readonly _onAcquire;
5
+ private readonly _onRelease;
6
+ private _releaseTrigger;
7
+ constructor({ lockKey: lockPath, onAcquire, onRelease }: ResourceLockOptions);
8
+ get lockKey(): string;
9
+ acquire(): Promise<void>;
10
+ release(): Promise<void>;
11
+ }
12
+ export declare const isLocked: (lockPath: string) => boolean;
13
+ //# sourceMappingURL=node.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"node.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/locks/node.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,YAAY,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAGpE,qBAAa,IAAK,YAAW,YAAY;IACvC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IACnC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAmC;IAC9D,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAmC;IAC9D,OAAO,CAAC,eAAe,CAAiB;gBAE5B,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,EAAE,mBAAmB;IAM5E,IACI,OAAO,WAEV;IAEK,OAAO;IAYP,OAAO;CAQd;AAED,eAAO,MAAM,QAAQ,aAAc,MAAM,YAAiC,CAAC"}
@@ -0,0 +1,16 @@
1
+ import { MaybePromise } from '@dxos/util';
2
+ export type ResourceLockOptions = {
3
+ lockKey: string;
4
+ onAcquire?: () => MaybePromise<void>;
5
+ onRelease?: () => MaybePromise<void>;
6
+ };
7
+ /**
8
+ * Resource lock. Used to coordinate access to shared resources.
9
+ * For example, start only one `ServicesHost` at a time.
10
+ */
11
+ export interface ResourceLock {
12
+ lockKey: string;
13
+ acquire(): Promise<void>;
14
+ release(): Promise<void>;
15
+ }
16
+ //# sourceMappingURL=resource-lock.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"resource-lock.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/locks/resource-lock.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE1C,MAAM,MAAM,mBAAmB,GAAG;IAChC,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,YAAY,CAAC,IAAI,CAAC,CAAC;IACrC,SAAS,CAAC,EAAE,MAAM,YAAY,CAAC,IAAI,CAAC,CAAC;CACtC,CAAC;AAGF;;;GAGG;AACH,MAAM,WAAW,YAAY;IAC3B,OAAO,EAAE,MAAM,CAAC;IAEhB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAEzB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC1B"}
@@ -1 +1 @@
1
- {"version":3,"file":"service-host.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/services/service-host.ts"],"names":[],"mappings":"AAOA,OAAO,EAAuB,cAAc,EAA6B,MAAM,uBAAuB,CAAC;AACvG,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAItC,OAAO,EAAE,aAAa,EAA0B,MAAM,iBAAiB,CAAC;AACxE,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAgD,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAGvG,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAYtD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAErD,MAAM,MAAM,wBAAwB,GAAG;IACrC;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IACpC,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IACpC,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB,CAAC;AAEF;;GAEG;AACH,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAoB;IACnD,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAkC;IACnE,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAoB;IACnD,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAqB;IAErD,OAAO,CAAC,OAAO,CAAC,CAAS;IACzB,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAqB;IACnD,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAe;IAC7C,OAAO,CAAC,cAAc,CAAC,CAAgB;IACvC,OAAO,CAAC,eAAe,CAAC,CAAiB;IACzC,OAAO,CAAC,QAAQ,CAAC,CAAU;IAE3B,eAAe,EAAG,cAAc,CAAC;IACjC,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,KAAK,CAAS;gBAEV,EACV,MAAM,EACN,YAA0C,EAE1C,gBAAgB,EAChB,aAAa,EACb,aAAa,EACb,OAAO,EAEP,OAAO,GACR,GAAE,wBAA6B;IAgDhC,IAAI,MAAM,YAET;IAED,IAAI,eAAe,oCAElB;IAED,IAAI,WAAW,sDAEd;IAED,IAAI,QAAQ,4BAEX;IAED;;;;OAIG;IACH,UAAU,CAAC,EAAE,MAAM,EAAE,GAAG,OAAO,EAAE,EAAE,iBAAiB;IA6B9C,IAAI;IAyEJ,KAAK;IAeL,KAAK;CAUZ"}
1
+ {"version":3,"file":"service-host.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/services/service-host.ts"],"names":[],"mappings":"AAOA,OAAO,EAAuB,cAAc,EAA6B,MAAM,uBAAuB,CAAC;AACvG,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAItC,OAAO,EAAE,aAAa,EAA0B,MAAM,iBAAiB,CAAC;AACxE,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAgD,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAGvG,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAYtD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAErD,MAAM,MAAM,wBAAwB,GAAG;IACrC;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IACpC,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IACpC,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB,CAAC;AAEF;;GAEG;AACH,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAe;IAC9C,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAkC;IACnE,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAoB;IACnD,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAqB;IAErD,OAAO,CAAC,OAAO,CAAC,CAAS;IACzB,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAqB;IACnD,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAe;IAC7C,OAAO,CAAC,cAAc,CAAC,CAAgB;IACvC,OAAO,CAAC,eAAe,CAAC,CAAiB;IACzC,OAAO,CAAC,QAAQ,CAAC,CAAU;IAE3B,eAAe,EAAG,cAAc,CAAC;IACjC,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,KAAK,CAAS;gBAEV,EACV,MAAM,EACN,YAA0C,EAE1C,gBAAgB,EAChB,aAAa,EACb,aAAa,EACb,OAAO,EAEP,OAAO,GACR,GAAE,wBAA6B;IAgDhC,IAAI,MAAM,YAET;IAED,IAAI,eAAe,oCAElB;IAED,IAAI,WAAW,sDAEd;IAED,IAAI,QAAQ,4BAEX;IAED;;;;OAIG;IACH,UAAU,CAAC,EAAE,MAAM,EAAE,GAAG,OAAO,EAAE,EAAE,iBAAiB;IA6B9C,IAAI;IAyEJ,KAAK;IAeL,KAAK;CAUZ"}
@@ -1,7 +1,6 @@
1
1
  export * from './iframe-host-runtime';
2
2
  export * from './iframe-proxy-runtime';
3
3
  export * from './shell-runtime';
4
- export * from './vault-resource-lock';
5
4
  export * from './worker-runtime';
6
5
  export * from './worker-session';
7
6
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/vault/index.ts"],"names":[],"mappings":"AAIA,cAAc,uBAAuB,CAAC;AACtC,cAAc,wBAAwB,CAAC;AACvC,cAAc,iBAAiB,CAAC;AAChC,cAAc,uBAAuB,CAAC;AACtC,cAAc,kBAAkB,CAAC;AACjC,cAAc,kBAAkB,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/vault/index.ts"],"names":[],"mappings":"AAIA,cAAc,uBAAuB,CAAC;AACtC,cAAc,wBAAwB,CAAC;AACvC,cAAc,iBAAiB,CAAC;AAChC,cAAc,kBAAkB,CAAC;AACjC,cAAc,kBAAkB,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@dxos/client-services",
3
- "version": "0.1.49",
3
+ "version": "0.1.50-next.1bfebf8",
4
4
  "description": "DXOS client services implementation",
5
5
  "homepage": "https://dxos.org",
6
6
  "bugs": "https://github.com/dxos/dxos/issues",
@@ -9,6 +9,7 @@
9
9
  "main": "dist/lib/node/index.cjs",
10
10
  "browser": {
11
11
  "jsondown": false,
12
+ "./src/packlets/locks/node.ts": "./src/packlets/locks/browser.ts",
12
13
  "./dist/lib/node/index.cjs": "./dist/lib/browser/index.mjs",
13
14
  "./testing.js": "./dist/lib/browser/packlets/testing/index.mjs"
14
15
  },
@@ -20,38 +21,40 @@
20
21
  "src"
21
22
  ],
22
23
  "dependencies": {
23
- "@dxos/async": "0.1.49",
24
- "@dxos/client-protocol": "0.1.49",
25
- "@dxos/codec-protobuf": "0.1.49",
26
- "@dxos/config": "0.1.49",
27
- "@dxos/context": "0.1.49",
28
- "@dxos/credentials": "0.1.49",
29
- "@dxos/debug": "0.1.49",
30
- "@dxos/document-model": "0.1.49",
31
- "@dxos/echo-db": "0.1.49",
32
- "@dxos/crypto": "0.1.49",
33
- "@dxos/echo-pipeline": "0.1.49",
34
- "@dxos/errors": "0.1.49",
35
- "@dxos/feed-store": "0.1.49",
36
- "@dxos/keyring": "0.1.49",
37
- "@dxos/keys": "0.1.49",
38
- "@dxos/log": "0.1.49",
39
- "@dxos/messaging": "0.1.49",
40
- "@dxos/model-factory": "0.1.49",
41
- "@dxos/network-manager": "0.1.49",
42
- "@dxos/node-std": "0.1.49",
43
- "@dxos/protocols": "0.1.49",
44
- "@dxos/random-access-storage": "0.1.49",
45
- "@dxos/rpc": "0.1.49",
46
- "@dxos/teleport": "0.1.49",
47
- "@dxos/teleport-extension-gossip": "0.1.49",
48
- "@dxos/text-model": "0.1.49",
49
- "@dxos/timeframe": "0.1.49",
50
- "@dxos/util": "0.1.49"
24
+ "@types/lockfile": "^1.0.2",
25
+ "lockfile": "^1.0.4",
26
+ "@dxos/async": "0.1.50-next.1bfebf8",
27
+ "@dxos/client-protocol": "0.1.50-next.1bfebf8",
28
+ "@dxos/codec-protobuf": "0.1.50-next.1bfebf8",
29
+ "@dxos/config": "0.1.50-next.1bfebf8",
30
+ "@dxos/context": "0.1.50-next.1bfebf8",
31
+ "@dxos/credentials": "0.1.50-next.1bfebf8",
32
+ "@dxos/crypto": "0.1.50-next.1bfebf8",
33
+ "@dxos/debug": "0.1.50-next.1bfebf8",
34
+ "@dxos/document-model": "0.1.50-next.1bfebf8",
35
+ "@dxos/echo-db": "0.1.50-next.1bfebf8",
36
+ "@dxos/echo-pipeline": "0.1.50-next.1bfebf8",
37
+ "@dxos/errors": "0.1.50-next.1bfebf8",
38
+ "@dxos/feed-store": "0.1.50-next.1bfebf8",
39
+ "@dxos/keyring": "0.1.50-next.1bfebf8",
40
+ "@dxos/keys": "0.1.50-next.1bfebf8",
41
+ "@dxos/log": "0.1.50-next.1bfebf8",
42
+ "@dxos/messaging": "0.1.50-next.1bfebf8",
43
+ "@dxos/model-factory": "0.1.50-next.1bfebf8",
44
+ "@dxos/network-manager": "0.1.50-next.1bfebf8",
45
+ "@dxos/node-std": "0.1.50-next.1bfebf8",
46
+ "@dxos/protocols": "0.1.50-next.1bfebf8",
47
+ "@dxos/random-access-storage": "0.1.50-next.1bfebf8",
48
+ "@dxos/rpc": "0.1.50-next.1bfebf8",
49
+ "@dxos/teleport": "0.1.50-next.1bfebf8",
50
+ "@dxos/teleport-extension-gossip": "0.1.50-next.1bfebf8",
51
+ "@dxos/text-model": "0.1.50-next.1bfebf8",
52
+ "@dxos/timeframe": "0.1.50-next.1bfebf8",
53
+ "@dxos/util": "0.1.50-next.1bfebf8"
51
54
  },
52
55
  "devDependencies": {
53
56
  "@types/readable-stream": "^2.3.9",
54
- "@dxos/signal": "0.1.49"
57
+ "@dxos/signal": "0.1.50-next.1bfebf8"
55
58
  },
56
59
  "publishConfig": {
57
60
  "access": "public"
package/src/index.ts CHANGED
@@ -9,3 +9,4 @@ export * from './packlets/services';
9
9
  export * from './packlets/spaces';
10
10
  export * from './packlets/storage';
11
11
  export * from './packlets/vault';
12
+ export * from './packlets/locks';
@@ -5,27 +5,23 @@
5
5
  import { asyncTimeout, Trigger } from '@dxos/async';
6
6
  import { RESOURCE_LOCK_TIMEOUT } from '@dxos/client-protocol';
7
7
  import { log, logInfo } from '@dxos/log';
8
- import { MaybePromise } from '@dxos/util';
8
+
9
+ import { ResourceLock, ResourceLockOptions } from './resource-lock';
9
10
 
10
11
  enum Message {
11
12
  ACQUIRING = 'acquiring',
12
13
  }
13
14
 
14
- export type VaultResourceLockOptions = {
15
- lockKey: string;
16
- onAcquire?: () => MaybePromise<void>;
17
- onRelease?: () => MaybePromise<void>;
18
- };
19
-
15
+ // TODO(mykola): Factor out.
20
16
  // TODO(burdon): Extend to support locking for web and NodeJS (use npm lockfile). Use to lock agents.
21
- export class VaultResourceLock {
17
+ export class Lock implements ResourceLock {
22
18
  private readonly _broadcastChannel = new BroadcastChannel('vault-resource-lock');
23
19
  private readonly _lockKey: string;
24
- private readonly _onAcquire: VaultResourceLockOptions['onAcquire'];
25
- private readonly _onRelease: VaultResourceLockOptions['onRelease'];
20
+ private readonly _onAcquire: ResourceLockOptions['onAcquire'];
21
+ private readonly _onRelease: ResourceLockOptions['onRelease'];
26
22
  private _releaseTrigger = new Trigger();
27
23
 
28
- constructor({ lockKey, onAcquire, onRelease }: VaultResourceLockOptions) {
24
+ constructor({ lockKey, onAcquire, onRelease }: ResourceLockOptions) {
29
25
  this._lockKey = lockKey;
30
26
  this._onAcquire = onAcquire;
31
27
  this._onRelease = onRelease;
@@ -85,3 +81,8 @@ export class VaultResourceLock {
85
81
  log('recieved lock', { steal });
86
82
  }
87
83
  }
84
+
85
+ // TODO(mykola): Implement.
86
+ export const isLocked = (lockPath: string) => {
87
+ throw new Error('Not implemented');
88
+ };
@@ -0,0 +1,6 @@
1
+ //
2
+ // Copyright 2023 DXOS.org
3
+ //
4
+
5
+ export * from './resource-lock';
6
+ export * from './node';
@@ -0,0 +1,52 @@
1
+ //
2
+ // Copyright 2023 DXOS.org
3
+ //
4
+
5
+ import lockfile from 'lockfile';
6
+
7
+ import { Trigger } from '@dxos/async';
8
+ import { log, logInfo } from '@dxos/log';
9
+
10
+ import { ResourceLock, ResourceLockOptions } from './resource-lock';
11
+
12
+ // TODO(mykola): Factor out.
13
+ export class Lock implements ResourceLock {
14
+ private readonly _lockPath: string;
15
+ private readonly _onAcquire: ResourceLockOptions['onAcquire'];
16
+ private readonly _onRelease: ResourceLockOptions['onRelease'];
17
+ private _releaseTrigger = new Trigger();
18
+
19
+ constructor({ lockKey: lockPath, onAcquire, onRelease }: ResourceLockOptions) {
20
+ this._lockPath = lockPath;
21
+ this._onAcquire = onAcquire;
22
+ this._onRelease = onRelease;
23
+ }
24
+
25
+ @logInfo
26
+ get lockKey() {
27
+ return this._lockPath;
28
+ }
29
+
30
+ async acquire() {
31
+ log('acquiring lock...');
32
+ if (lockfile.checkSync(this.lockKey)) {
33
+ throw new Error(`Lock already acquired: ${this._lockPath}`);
34
+ }
35
+
36
+ lockfile.lockSync(this._lockPath);
37
+ await this._onAcquire?.();
38
+
39
+ log('acquired lock');
40
+ }
41
+
42
+ async release() {
43
+ if (!lockfile.checkSync(this._lockPath)) {
44
+ throw new Error(`Lock already acquired: ${this._lockPath}`);
45
+ }
46
+
47
+ await this._onRelease?.();
48
+ lockfile.unlockSync(this._lockPath);
49
+ }
50
+ }
51
+
52
+ export const isLocked = (lockPath: string) => lockfile.checkSync(lockPath);
@@ -0,0 +1,24 @@
1
+ //
2
+ // Copyright 2023 DXOS.org
3
+ //
4
+
5
+ import { MaybePromise } from '@dxos/util';
6
+
7
+ export type ResourceLockOptions = {
8
+ lockKey: string;
9
+ onAcquire?: () => MaybePromise<void>;
10
+ onRelease?: () => MaybePromise<void>;
11
+ };
12
+
13
+ // TODO(mykola): Factor out.
14
+ /**
15
+ * Resource lock. Used to coordinate access to shared resources.
16
+ * For example, start only one `ServicesHost` at a time.
17
+ */
18
+ export interface ResourceLock {
19
+ lockKey: string;
20
+
21
+ acquire(): Promise<void>;
22
+
23
+ release(): Promise<void>;
24
+ }
@@ -21,12 +21,12 @@ import { DevicesServiceImpl } from '../devices';
21
21
  import { DevtoolsServiceImpl, DevtoolsHostEvents } from '../devtools';
22
22
  import { IdentityServiceImpl } from '../identity';
23
23
  import { InvitationsServiceImpl } from '../invitations';
24
+ import { Lock, ResourceLock } from '../locks';
24
25
  import { LoggingServiceImpl } from '../logging';
25
26
  import { NetworkServiceImpl } from '../network';
26
27
  import { SpacesServiceImpl } from '../spaces';
27
28
  import { createStorageObjects } from '../storage';
28
29
  import { SystemServiceImpl } from '../system';
29
- import { VaultResourceLock } from '../vault';
30
30
  import { ServiceContext } from './service-context';
31
31
  import { ServiceRegistry } from './service-registry';
32
32
 
@@ -54,7 +54,7 @@ export type InitializeOptions = {
54
54
  * Remote service implementation.
55
55
  */
56
56
  export class ClientServicesHost {
57
- private readonly _resourceLock?: VaultResourceLock;
57
+ private readonly _resourceLock?: ResourceLock;
58
58
  private readonly _serviceRegistry: ServiceRegistry<ClientServices>;
59
59
  private readonly _systemService: SystemServiceImpl;
60
60
  private readonly _loggingService: LoggingServiceImpl;
@@ -88,17 +88,17 @@ export class ClientServicesHost {
88
88
  this.initialize({ config, transportFactory, signalManager });
89
89
  }
90
90
 
91
- this._resourceLock = lockKey
92
- ? new VaultResourceLock({
93
- lockKey,
94
- onAcquire: () => {
95
- if (!this._opening) {
96
- void this.open();
97
- }
98
- },
99
- onRelease: () => this.close(),
100
- })
101
- : undefined;
91
+ if (lockKey) {
92
+ this._resourceLock = new Lock({
93
+ lockKey,
94
+ onAcquire: () => {
95
+ if (!this._opening) {
96
+ void this.open();
97
+ }
98
+ },
99
+ onRelease: () => this.close(),
100
+ });
101
+ }
102
102
 
103
103
  this._systemService = new SystemServiceImpl({
104
104
  config: this._config,
@@ -5,6 +5,5 @@
5
5
  export * from './iframe-host-runtime';
6
6
  export * from './iframe-proxy-runtime';
7
7
  export * from './shell-runtime';
8
- export * from './vault-resource-lock';
9
8
  export * from './worker-runtime';
10
9
  export * from './worker-session';