@dxos/client-services 0.1.53-main.304e2d2 → 0.1.53-main.3ab34c0

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.
@@ -1 +1 @@
1
- {"version":3,"file":"authenticator.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/identity/authenticator.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,EAAW,MAAM,aAAa,CAAC;AAE7C,OAAO,EAAoB,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACvE,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACjE,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAGvC,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAExC,eAAO,MAAM,kBAAkB,WACpB,gBAAgB,KAAG,YAW3B,CAAC;AAEJ,MAAM,MAAM,+BAA+B,GAAG;IAE5C,mBAAmB,EAAE,MAAM,UAAU,CAAC,SAAS,CAAC,CAAC;IACjD,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;IACpB;;OAEG;IACH,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF;;;GAGG;AACH,qBAAa,yBAAyB;IAKlC,OAAO,CAAC,QAAQ,CAAC,OAAO;IAJ1B,OAAO,CAAC,IAAI,CAAiB;gBAIV,OAAO,EAAE,+BAA+B;IAGrD,KAAK;IAIX,IAAI,QAAQ,IAAI,YAAY,CA2C3B;IAED,OAAO,CAAC,aAAa;CAItB"}
1
+ {"version":3,"file":"authenticator.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/identity/authenticator.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,EAAW,MAAM,aAAa,CAAC;AAE7C,OAAO,EAAoB,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACvE,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACjE,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAGvC,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAIxC,eAAO,MAAM,kBAAkB,WACpB,gBAAgB,KAAG,YAW3B,CAAC;AAEJ,MAAM,MAAM,+BAA+B,GAAG;IAE5C,mBAAmB,EAAE,MAAM,UAAU,CAAC,SAAS,CAAC,CAAC;IACjD,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;IACpB;;OAEG;IACH,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF;;;GAGG;AACH,qBAAa,yBAAyB;IAKlC,OAAO,CAAC,QAAQ,CAAC,OAAO;IAJ1B,OAAO,CAAC,IAAI,CAAiB;gBAIV,OAAO,EAAE,+BAA+B;IAGrD,KAAK;IAIX,IAAI,QAAQ,IAAI,YAAY,CA2C3B;IAED,OAAO,CAAC,aAAa;CAItB"}
@@ -1,3 +1,4 @@
1
+ export * from './client-rpc-server';
1
2
  export * from './service-context';
2
3
  export * from './service-host';
3
4
  export * from './service-registry';
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/services/index.ts"],"names":[],"mappings":"AAIA,cAAc,mBAAmB,CAAC;AAClC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,oBAAoB,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/services/index.ts"],"names":[],"mappings":"AAIA,cAAc,qBAAqB,CAAC;AACpC,cAAc,mBAAmB,CAAC;AAClC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,oBAAoB,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"worker-session.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/vault/worker-session.ts"],"names":[],"mappings":"AAMA,OAAO,EAAgB,OAAO,EAAE,MAAM,aAAa,CAAC;AAQpD,OAAO,EAAE,aAAa,EAAE,MAAM,wCAAwC,CAAC;AACvE,OAAO,EAAoC,OAAO,EAAE,MAAM,WAAW,CAAC;AACtE,OAAO,EAAE,QAAQ,EAAgB,MAAM,YAAY,CAAC;AAEpD,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAGjD,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;IA+DvF,IAAI;IAUJ,KAAK;YAWG,eAAe;IAQ7B,OAAO,CAAC,kBAAkB;CAO3B"}
1
+ {"version":3,"file":"worker-session.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/vault/worker-session.ts"],"names":[],"mappings":"AAMA,OAAO,EAAgB,OAAO,EAAE,MAAM,aAAa,CAAC;AAQpD,OAAO,EAAE,aAAa,EAAE,MAAM,wCAAwC,CAAC;AACvE,OAAO,EAAoC,OAAO,EAAE,MAAM,WAAW,CAAC;AACtE,OAAO,EAAE,QAAQ,EAAgB,MAAM,YAAY,CAAC;AAEpD,OAAO,EAAE,kBAAkB,EAA0C,MAAM,aAAa,CAAC;AAEzF,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;IA+DvF,IAAI;IAWJ,KAAK;YAYG,eAAe;IAQ7B,OAAO,CAAC,kBAAkB;CAO3B"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@dxos/client-services",
3
- "version": "0.1.53-main.304e2d2",
3
+ "version": "0.1.53-main.3ab34c0",
4
4
  "description": "DXOS client services implementation",
5
5
  "homepage": "https://dxos.org",
6
6
  "bugs": "https://github.com/dxos/dxos/issues",
@@ -22,40 +22,40 @@
22
22
  ],
23
23
  "dependencies": {
24
24
  "tiny-invariant": "^1.3.1",
25
- "@dxos/async": "0.1.53-main.304e2d2",
26
- "@dxos/client-protocol": "0.1.53-main.304e2d2",
27
- "@dxos/codec-protobuf": "0.1.53-main.304e2d2",
28
- "@dxos/config": "0.1.53-main.304e2d2",
29
- "@dxos/context": "0.1.53-main.304e2d2",
30
- "@dxos/credentials": "0.1.53-main.304e2d2",
31
- "@dxos/crypto": "0.1.53-main.304e2d2",
32
- "@dxos/debug": "0.1.53-main.304e2d2",
33
- "@dxos/document-model": "0.1.53-main.304e2d2",
34
- "@dxos/echo-db": "0.1.53-main.304e2d2",
35
- "@dxos/echo-pipeline": "0.1.53-main.304e2d2",
36
- "@dxos/errors": "0.1.53-main.304e2d2",
37
- "@dxos/feed-store": "0.1.53-main.304e2d2",
38
- "@dxos/keyring": "0.1.53-main.304e2d2",
39
- "@dxos/keys": "0.1.53-main.304e2d2",
40
- "@dxos/lock-file": "0.1.53-main.304e2d2",
41
- "@dxos/log": "0.1.53-main.304e2d2",
42
- "@dxos/messaging": "0.1.53-main.304e2d2",
43
- "@dxos/model-factory": "0.1.53-main.304e2d2",
44
- "@dxos/network-manager": "0.1.53-main.304e2d2",
45
- "@dxos/node-std": "0.1.53-main.304e2d2",
46
- "@dxos/protocols": "0.1.53-main.304e2d2",
47
- "@dxos/random-access-storage": "0.1.53-main.304e2d2",
48
- "@dxos/rpc": "0.1.53-main.304e2d2",
49
- "@dxos/teleport": "0.1.53-main.304e2d2",
50
- "@dxos/teleport-extension-gossip": "0.1.53-main.304e2d2",
51
- "@dxos/teleport-extension-object-sync": "0.1.53-main.304e2d2",
52
- "@dxos/text-model": "0.1.53-main.304e2d2",
53
- "@dxos/timeframe": "0.1.53-main.304e2d2",
54
- "@dxos/util": "0.1.53-main.304e2d2"
25
+ "@dxos/async": "0.1.53-main.3ab34c0",
26
+ "@dxos/client-protocol": "0.1.53-main.3ab34c0",
27
+ "@dxos/codec-protobuf": "0.1.53-main.3ab34c0",
28
+ "@dxos/config": "0.1.53-main.3ab34c0",
29
+ "@dxos/context": "0.1.53-main.3ab34c0",
30
+ "@dxos/credentials": "0.1.53-main.3ab34c0",
31
+ "@dxos/crypto": "0.1.53-main.3ab34c0",
32
+ "@dxos/debug": "0.1.53-main.3ab34c0",
33
+ "@dxos/document-model": "0.1.53-main.3ab34c0",
34
+ "@dxos/echo-db": "0.1.53-main.3ab34c0",
35
+ "@dxos/echo-pipeline": "0.1.53-main.3ab34c0",
36
+ "@dxos/errors": "0.1.53-main.3ab34c0",
37
+ "@dxos/feed-store": "0.1.53-main.3ab34c0",
38
+ "@dxos/keyring": "0.1.53-main.3ab34c0",
39
+ "@dxos/keys": "0.1.53-main.3ab34c0",
40
+ "@dxos/log": "0.1.53-main.3ab34c0",
41
+ "@dxos/messaging": "0.1.53-main.3ab34c0",
42
+ "@dxos/model-factory": "0.1.53-main.3ab34c0",
43
+ "@dxos/network-manager": "0.1.53-main.3ab34c0",
44
+ "@dxos/node-std": "0.1.53-main.3ab34c0",
45
+ "@dxos/protocols": "0.1.53-main.3ab34c0",
46
+ "@dxos/random-access-storage": "0.1.53-main.3ab34c0",
47
+ "@dxos/lock-file": "0.1.53-main.3ab34c0",
48
+ "@dxos/rpc": "0.1.53-main.3ab34c0",
49
+ "@dxos/teleport": "0.1.53-main.3ab34c0",
50
+ "@dxos/teleport-extension-gossip": "0.1.53-main.3ab34c0",
51
+ "@dxos/teleport-extension-object-sync": "0.1.53-main.3ab34c0",
52
+ "@dxos/text-model": "0.1.53-main.3ab34c0",
53
+ "@dxos/timeframe": "0.1.53-main.3ab34c0",
54
+ "@dxos/util": "0.1.53-main.3ab34c0"
55
55
  },
56
56
  "devDependencies": {
57
57
  "@types/readable-stream": "^2.3.9",
58
- "@dxos/signal": "0.1.53-main.304e2d2"
58
+ "@dxos/signal": "0.1.53-main.3ab34c0"
59
59
  },
60
60
  "publishConfig": {
61
61
  "access": "public"
@@ -11,6 +11,8 @@ import { log } from '@dxos/log';
11
11
  import { schema } from '@dxos/protocols';
12
12
  import { ComplexSet } from '@dxos/util';
13
13
 
14
+ const Credential = schema.getCodecForType('dxos.halo.credentials.Credential');
15
+
14
16
  export const createAuthProvider =
15
17
  (signer: CredentialSigner): AuthProvider =>
16
18
  async (nonce) => {
@@ -22,7 +24,7 @@ export const createAuthProvider =
22
24
  nonce,
23
25
  });
24
26
 
25
- return schema.getCodecForType('dxos.halo.credentials.Credential').encode(credential);
27
+ return Credential.encode(credential);
26
28
  };
27
29
 
28
30
  export type TrustedKeySetAuthVerifierParams = {
@@ -53,7 +55,7 @@ export class TrustedKeySetAuthVerifier {
53
55
 
54
56
  get verifier(): AuthVerifier {
55
57
  return async (nonce, auth) => {
56
- const credential = schema.getCodecForType('dxos.halo.credentials.Credential').decode(auth);
58
+ const credential = Credential.decode(auth);
57
59
  log('authenticating...', { credential });
58
60
 
59
61
  const result = await verifyCredential(credential);
@@ -2,6 +2,7 @@
2
2
  // Copyright 2022 DXOS.org
3
3
  //
4
4
 
5
+ export * from './client-rpc-server';
5
6
  export * from './service-context';
6
7
  export * from './service-host';
7
8
  export * from './service-registry';
@@ -182,7 +182,9 @@ describe('DataSpaceManager', () => {
182
182
  expect((await file.stat()).size !== 0).to.be.true;
183
183
  await space.createEpoch();
184
184
  expect((await file.stat()).size === 0).to.be.true;
185
- }).onlyEnvironments('nodejs', 'chromium', 'firefox');
185
+ })
186
+ .onlyEnvironments('nodejs', 'chromium', 'firefox')
187
+ .tag('flaky');
186
188
 
187
189
  test('Loads only last epoch', async () => {
188
190
  const builder = new TestBuilder();
@@ -87,16 +87,18 @@ describe('SpacesService', () => {
87
87
  test('updates when new space is added', async () => {
88
88
  await serviceContext.createIdentity();
89
89
  const query = spacesService.querySpaces();
90
- let result = new Trigger<Space[] | undefined>();
90
+ const result = new Trigger<Space[] | undefined>();
91
91
  query.subscribe(({ spaces }) => {
92
92
  result.wake(spaces);
93
93
  });
94
94
  afterTest(() => query.close());
95
95
  expect(await result.wait()).to.be.length(0);
96
96
 
97
- result = new Trigger<Space[] | undefined>();
97
+ result.reset();
98
98
  const space = await spacesService.createSpace();
99
- expect(await result.wait()).to.deep.equal([space]);
99
+ const spaces = await result.wait();
100
+ expect(spaces).to.be.length(1);
101
+ expect(spaces?.[0].spaceKey.equals(space.spaceKey)).to.be.true;
100
102
  });
101
103
 
102
104
  test.skip('updates when space is updated', async () => {});
@@ -16,8 +16,7 @@ import { BridgeService } from '@dxos/protocols/proto/dxos/mesh/bridge';
16
16
  import { createProtoRpcPeer, ProtoRpcPeer, RpcPort } from '@dxos/rpc';
17
17
  import { Callback, MaybePromise } from '@dxos/util';
18
18
 
19
- import { ClientServicesHost } from '../services';
20
- import { ClientRpcServer, ClientRpcServerParams } from '../services/client-rpc-server';
19
+ import { ClientServicesHost, ClientRpcServer, ClientRpcServerParams } from '../services';
21
20
 
22
21
  export type WorkerSessionParams = {
23
22
  serviceHost: ClientServicesHost;
@@ -111,17 +110,18 @@ export class WorkerSession {
111
110
  }
112
111
 
113
112
  async open() {
114
- log.info('opening..');
113
+ log.info('opening...');
115
114
  await Promise.all([this._clientRpc.open(), this._iframeRpc.open(), this._maybeOpenShell()]);
116
115
 
117
116
  await this._startTrigger.wait({ timeout: PROXY_CONNECTION_TIMEOUT });
118
117
  if (this.lockKey) {
119
118
  void this._afterLockReleases(this.lockKey, () => this.close());
120
119
  }
120
+ log.info('opened');
121
121
  }
122
122
 
123
123
  async close() {
124
- log.info('closing..');
124
+ log.info('closing...');
125
125
  try {
126
126
  await this.onClose.callIfSet();
127
127
  } catch (err: any) {
@@ -129,6 +129,7 @@ export class WorkerSession {
129
129
  }
130
130
 
131
131
  await Promise.all([this._clientRpc.close(), this._iframeRpc.close()]);
132
+ log.info('closed');
132
133
  }
133
134
 
134
135
  private async _maybeOpenShell() {