@dxos/client-services 0.6.1 → 0.6.2-main.000b1cc

package/dist/lib/node/packlets/testing/index.cjs

@@ -30,7 +30,7 @@ __export(testing_exports, {
   sanitizeInvitation: () => sanitizeInvitation
 });
 module.exports = __toCommonJS(testing_exports);
-var import_chunk_EPLLMAYG = require("../../chunk-EPLLMAYG.cjs");
+var import_chunk_6A7KGHXH = require("../../chunk-6A7KGHXH.cjs");
 var import_credentials = require("@dxos/credentials");
 var import_keys = require("@dxos/keys");
 var import_async = require("@dxos/async");
@@ -227,7 +227,7 @@ var createInvitation = async (host, options) => {
     authMethod: import_services.Invitation.AuthMethod.NONE,
     ...options ?? {}
   };
-  if (host instanceof import_chunk_EPLLMAYG.ServiceContext) {
+  if (host instanceof import_chunk_6A7KGHXH.ServiceContext) {
     return host.invitationsManager.createInvitation({
       kind: import_services.Invitation.Kind.SPACE,
       ...options
@@ -237,7 +237,7 @@ var createInvitation = async (host, options) => {
 };
 var acceptInvitation = (guest, invitation, guestDeviceProfile) => {
   invitation = sanitizeInvitation(invitation);
-  if (guest instanceof import_chunk_EPLLMAYG.ServiceContext) {
+  if (guest instanceof import_chunk_6A7KGHXH.ServiceContext) {
     return guest.invitationsManager.acceptInvitation({
       invitation,
       deviceProfile: guestDeviceProfile
@@ -247,7 +247,7 @@ var acceptInvitation = (guest, invitation, guestDeviceProfile) => {
 };
 var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/testing/test-builder.ts";
 var createServiceHost = (config, signalManagerContext) => {
-  return new import_chunk_EPLLMAYG.ClientServicesHost({
+  return new import_chunk_6A7KGHXH.ClientServicesHost({
     config,
     signalManager: new import_messaging.MemorySignalManager(signalManagerContext),
     transportFactory: import_network_manager.MemoryTransportFactory
@@ -263,7 +263,7 @@ var createServiceContext = async ({ signalContext = new import_messaging.MemoryS
   });
   const level = (0, import_testing.createTestLevel)();
   await level.open();
-  return new import_chunk_EPLLMAYG.ServiceContext(storage, level, networkManager, signalManager, {
+  return new import_chunk_6A7KGHXH.ServiceContext(storage, level, networkManager, signalManager, {
     invitationConnectionDefaultParams: {
       controlHeartbeatInterval: 200
     },
@@ -370,12 +370,12 @@ var TestPeer = class {
     });
   }
   get dataSpaceManager() {
-    return this._props.dataSpaceManager ??= new import_chunk_EPLLMAYG.DataSpaceManager(this.spaceManager, this.metadataStore, this.keyring, this.identity, this.feedStore, this.echoHost, this.invitationsManager, this._opts.dataSpaceParams);
+    return this._props.dataSpaceManager ??= new import_chunk_6A7KGHXH.DataSpaceManager(this.spaceManager, this.metadataStore, this.keyring, this.identity, this.feedStore, this.echoHost, this.invitationsManager, this._opts.dataSpaceParams);
   }
   get invitationsManager() {
-    return this._props.invitationsManager ??= new import_chunk_EPLLMAYG.InvitationsManager(new import_chunk_EPLLMAYG.InvitationsHandler(this.networkManager), (invitation) => {
+    return this._props.invitationsManager ??= new import_chunk_6A7KGHXH.InvitationsManager(new import_chunk_6A7KGHXH.InvitationsHandler(this.networkManager), (invitation) => {
       if (invitation.kind === import_services2.Invitation.Kind.SPACE) {
-        return new import_chunk_EPLLMAYG.SpaceInvitationProtocol(this.dataSpaceManager, this.identity, this.keyring, invitation.spaceKey);
+        return new import_chunk_6A7KGHXH.SpaceInvitationProtocol(this.dataSpaceManager, this.identity, this.keyring, invitation.spaceKey);
       } else {
         throw new Error("not implemented");
       }

package/dist/types/src/packlets/invitations/invitations-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"invitations-handler.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/invitations/invitations-handler.ts"],"names":[],"mappings":";AAIA,OAAO,EAAS,KAAK,UAAU,EAA8B,KAAK,OAAO,EAAE,MAAM,aAAa,CAAC;AAE/F,OAAO,EAAE,KAAK,OAAO,EAAwB,MAAM,eAAe,CAAC;AAOnE,OAAO,EAAE,KAAK,gBAAgB,EAAE,UAAU,EAAE,MAAM,4CAA4C,CAAC;AAC/F,OAAO,EAAE,KAAK,qBAAqB,EAAE,MAAM,6CAA6C,CAAC;AAQzF,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAQhE;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,qBAAa,kBAAkB;IAK3B,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAC;IAG1C,oBAAoB,CAClB,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,UAAU,CAAC,UAAU,CAAC,EAC9B,QAAQ,EAAE,kBAAkB,EAC5B,UAAU,EAAE,UAAU,GACrB,IAAI;IAiHP,gBAAgB,CACd,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,UAAU,CAAC,UAAU,CAAC,EAC9B,QAAQ,EAAE,kBAAkB,EAC5B,UAAU,EAAE,UAAU,EACtB,iBAAiB,EAAE,OAAO,CAAC,MAAM,CAAC,EAClC,aAAa,CAAC,EAAE,qBAAqB,GACpC,IAAI;YA+JO,UAAU;IA2BxB;;;OAGG;IACH,OAAO,CAAC,mBAAmB;IAsD3B,OAAO,CAAC,eAAe;IAgBvB,OAAO,CAAC,cAAc;YAUR,mBAAmB;YA6BnB,mBAAmB;CAsBlC;AAED,eAAO,MAAM,sBAAsB,QAAO,gBAGzC,CAAC"}
+{"version":3,"file":"invitations-handler.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/invitations/invitations-handler.ts"],"names":[],"mappings":";AAIA,OAAO,EAAS,KAAK,UAAU,EAA8B,KAAK,OAAO,EAAE,MAAM,aAAa,CAAC;AAE/F,OAAO,EAAE,KAAK,OAAO,EAAwB,MAAM,eAAe,CAAC;AAOnE,OAAO,EAAE,KAAK,gBAAgB,EAAE,UAAU,EAAE,MAAM,4CAA4C,CAAC;AAC/F,OAAO,EAAE,KAAK,qBAAqB,EAAE,MAAM,6CAA6C,CAAC;AASzF,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAShE;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,qBAAa,kBAAkB;IAK3B,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAC;IAG1C,oBAAoB,CAClB,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,UAAU,CAAC,UAAU,CAAC,EAC9B,QAAQ,EAAE,kBAAkB,EAC5B,UAAU,EAAE,UAAU,GACrB,IAAI;IAwHP,gBAAgB,CACd,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,UAAU,CAAC,UAAU,CAAC,EAC9B,QAAQ,EAAE,kBAAkB,EAC5B,UAAU,EAAE,UAAU,EACtB,iBAAiB,EAAE,OAAO,CAAC,MAAM,CAAC,EAClC,aAAa,CAAC,EAAE,qBAAqB,GACpC,IAAI;YA+JO,UAAU;IA2BxB;;;OAGG;IACH,OAAO,CAAC,mBAAmB;IAsD3B,OAAO,CAAC,eAAe;IAgBvB,OAAO,CAAC,cAAc;YAUR,mBAAmB;YA6BnB,mBAAmB;CAsBlC;AAED,eAAO,MAAM,sBAAsB,QAAO,gBAGzC,CAAC"}

package/dist/types/src/version.d.ts

@@ -1,2 +1,2 @@
-export declare const DXOS_VERSION = "0.6.1";
+export declare const DXOS_VERSION = "0.6.2-main.000b1cc";
 //# sourceMappingURL=version.d.ts.map

package/dist/types/src/version.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../../src/version.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,YAAY,UAAU,CAAC"}
+{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../../src/version.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,YAAY,uBAAuB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/client-services",
-  "version": "0.6.1",
+  "version": "0.6.2-main.000b1cc",
   "description": "DXOS client services implementation",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -23,45 +23,45 @@
   ],
   "dependencies": {
     "platform": "^1.3.6",
-    "@dxos/async": "0.6.1",
-    "@dxos/automerge": "0.6.1",
-    "@dxos/codec-protobuf": "0.6.1",
-    "@dxos/client-protocol": "0.6.1",
-    "@dxos/config": "0.6.1",
-    "@dxos/context": "0.6.1",
-    "@dxos/crypto": "0.6.1",
-    "@dxos/credentials": "0.6.1",
-    "@dxos/echo-db": "0.6.1",
-    "@dxos/debug": "0.6.1",
-    "@dxos/echo-pipeline": "0.6.1",
-    "@dxos/echo-schema": "0.6.1",
-    "@dxos/echo-protocol": "0.6.1",
-    "@dxos/feed-store": "0.6.1",
-    "@dxos/indexing": "0.6.1",
-    "@dxos/invariant": "0.6.1",
-    "@dxos/keys": "0.6.1",
-    "@dxos/keyring": "0.6.1",
-    "@dxos/kv-store": "0.6.1",
-    "@dxos/lock-file": "0.6.1",
-    "@dxos/log": "0.6.1",
-    "@dxos/network-manager": "0.6.1",
-    "@dxos/node-std": "0.6.1",
-    "@dxos/protocols": "0.6.1",
-    "@dxos/messaging": "0.6.1",
-    "@dxos/random-access-storage": "0.6.1",
-    "@dxos/rpc": "0.6.1",
-    "@dxos/teleport": "0.6.1",
-    "@dxos/teleport-extension-gossip": "0.6.1",
-    "@dxos/timeframe": "0.6.1",
-    "@dxos/tracing": "0.6.1",
-    "@dxos/teleport-extension-object-sync": "0.6.1",
-    "@dxos/util": "0.6.1",
-    "@dxos/websocket-rpc": "0.6.1"
+    "@dxos/async": "0.6.2-main.000b1cc",
+    "@dxos/automerge": "0.6.2-main.000b1cc",
+    "@dxos/client-protocol": "0.6.2-main.000b1cc",
+    "@dxos/codec-protobuf": "0.6.2-main.000b1cc",
+    "@dxos/config": "0.6.2-main.000b1cc",
+    "@dxos/context": "0.6.2-main.000b1cc",
+    "@dxos/credentials": "0.6.2-main.000b1cc",
+    "@dxos/debug": "0.6.2-main.000b1cc",
+    "@dxos/echo-db": "0.6.2-main.000b1cc",
+    "@dxos/crypto": "0.6.2-main.000b1cc",
+    "@dxos/echo-schema": "0.6.2-main.000b1cc",
+    "@dxos/echo-pipeline": "0.6.2-main.000b1cc",
+    "@dxos/feed-store": "0.6.2-main.000b1cc",
+    "@dxos/echo-protocol": "0.6.2-main.000b1cc",
+    "@dxos/indexing": "0.6.2-main.000b1cc",
+    "@dxos/invariant": "0.6.2-main.000b1cc",
+    "@dxos/keyring": "0.6.2-main.000b1cc",
+    "@dxos/kv-store": "0.6.2-main.000b1cc",
+    "@dxos/keys": "0.6.2-main.000b1cc",
+    "@dxos/lock-file": "0.6.2-main.000b1cc",
+    "@dxos/log": "0.6.2-main.000b1cc",
+    "@dxos/messaging": "0.6.2-main.000b1cc",
+    "@dxos/node-std": "0.6.2-main.000b1cc",
+    "@dxos/protocols": "0.6.2-main.000b1cc",
+    "@dxos/random-access-storage": "0.6.2-main.000b1cc",
+    "@dxos/network-manager": "0.6.2-main.000b1cc",
+    "@dxos/rpc": "0.6.2-main.000b1cc",
+    "@dxos/teleport": "0.6.2-main.000b1cc",
+    "@dxos/teleport-extension-gossip": "0.6.2-main.000b1cc",
+    "@dxos/teleport-extension-object-sync": "0.6.2-main.000b1cc",
+    "@dxos/timeframe": "0.6.2-main.000b1cc",
+    "@dxos/tracing": "0.6.2-main.000b1cc",
+    "@dxos/websocket-rpc": "0.6.2-main.000b1cc",
+    "@dxos/util": "0.6.2-main.000b1cc"
   },
   "devDependencies": {
     "@types/platform": "^1.3.4",
     "@types/readable-stream": "^2.3.9",
-    "@dxos/signal": "0.6.1"
+    "@dxos/signal": "0.6.2-main.000b1cc"
   },
   "publishConfig": {
     "access": "public"

package/src/packlets/invitations/invitations-handler.ts

@@ -16,6 +16,7 @@ import { type DeviceProfileDocument } from '@dxos/protocols/proto/dxos/halo/cred
 import { AuthenticationResponse, type IntroductionResponse } from '@dxos/protocols/proto/dxos/halo/invitations';
 import { Options } from '@dxos/protocols/proto/dxos/halo/invitations';
 import { type ExtensionContext, type TeleportExtension, type TeleportParams } from '@dxos/teleport';
+import { trace as _trace } from '@dxos/tracing';
 import { ComplexSet } from '@dxos/util';
 
 import { InvitationGuestExtension } from './invitation-guest-extenstion';
@@ -24,6 +25,7 @@ import { type InvitationProtocol } from './invitation-protocol';
 import { InvitationTopology } from './invitation-topology';
 import { stateToString } from './utils';
 
+const metrics = _trace.metrics;
 const MAX_DELEGATED_INVITATION_HOST_TRIES = 3;
 
 type InvitationExtension = InvitationHostExtension | InvitationGuestExtension;
@@ -71,6 +73,7 @@ export class InvitationsHandler {
     protocol: InvitationProtocol,
     invitation: Invitation,
   ): void {
+    metrics.increment('invitation.created');
     const guardedState = this._createGuardedState(ctx, invitation, stream);
     // Called for every connecting peer.
     const createExtension = (): InvitationHostExtension => {
@@ -117,6 +120,7 @@ export class InvitationsHandler {
               const deviceKey = await extension.completedTrigger.wait({ timeout: invitation.timeout });
               log('admitted guest', { guest: deviceKey, ...protocol.toJSON() });
               guardedState.set(extension, Invitation.State.SUCCESS);
+              metrics.increment('invitation.success');
               log.trace('dxos.sdk.invitations-handler.host.onOpen', trace.end({ id: traceId }));
               admitted = true;
 
@@ -126,10 +130,12 @@ export class InvitationsHandler {
             } catch (err: any) {
               if (err instanceof TimeoutError) {
                 if (guardedState.set(extension, Invitation.State.TIMEOUT)) {
+                  metrics.increment('invitation.timeout');
                   log('timeout', { ...protocol.toJSON() });
                 }
               } else {
                 if (guardedState.error(extension, err)) {
+                  metrics.increment('invitation.failed');
                   log.error('failed', err);
                 }
               }
@@ -146,10 +152,12 @@ export class InvitationsHandler {
           }
           if (err instanceof TimeoutError) {
             if (guardedState.set(extension, Invitation.State.TIMEOUT)) {
+              metrics.increment('invitation.timeout');
               log('timeout', { err });
             }
           } else {
             if (guardedState.error(extension, err)) {
+              metrics.increment('invitation.failed');
               log.error('failed', err);
             }
           }
@@ -169,6 +177,7 @@ export class InvitationsHandler {
             // ensure the swarm is closed before changing state and closing the stream.
             await swarmConnection.close();
             guardedState.set(null, Invitation.State.EXPIRED);
+            metrics.increment('invitation.expired');
             await ctx.dispose();
           },
           invitation.created.getTime() + invitation.lifetime * 1000 - Date.now(),

package/src/packlets/services/automerge-host.test.ts

@@ -5,12 +5,11 @@
 import { expect } from 'chai';
 
 import { asyncTimeout } from '@dxos/async';
-import { getHeads } from '@dxos/automerge/automerge';
 import { AutomergeContext } from '@dxos/echo-db';
 import { AutomergeHost, DataServiceImpl } from '@dxos/echo-pipeline';
 import { IndexMetadataStore } from '@dxos/indexing';
 import { createTestLevel } from '@dxos/kv-store/testing';
-import { afterTest, describe, test } from '@dxos/test';
+import { afterTest, describe, openAndClose, test } from '@dxos/test';
 
 describe('AutomergeHost', () => {
   test('automerge context is being synced with host', async () => {
@@ -34,7 +33,7 @@ describe('AutomergeHost', () => {
 
     const dataService = new DataServiceImpl({ automergeHost: host, updateIndexes: async () => {} });
     const client = new AutomergeContext(dataService);
-    afterTest(() => client.close());
+    await openAndClose(client);
 
     // Create document in repo.
     const handle = host.repo.create();
@@ -44,7 +43,7 @@ describe('AutomergeHost', () => {
     });
 
     // Find document in repo.
-    const doc = client.repo.find(handle.url);
+    const doc = client.repo.find<{ text: string }>(handle.url);
     await asyncTimeout(doc.whenReady(), 1_000);
     expect(doc.docSync().text).to.equal(text);
 
@@ -53,7 +52,7 @@ describe('AutomergeHost', () => {
     doc.change((doc: any) => {
       doc.text = newText;
     });
-    await client.flush({ states: [{ documentId: doc.documentId, heads: getHeads(doc.docSync()) }] });
+    await client.flush({ documentIds: [doc.documentId] });
 
     await asyncTimeout(handle.whenReady(), 1_000);
     expect(handle.docSync().text).to.equal(newText);

package/src/packlets/services/service-context.test.ts

@@ -6,36 +6,32 @@ import { MemorySignalManagerContext } from '@dxos/messaging';
 import { Invitation } from '@dxos/protocols/proto/dxos/client/services';
 import { describe, openAndClose, test } from '@dxos/test';
 
-import { createServiceContext } from '../testing';
-import { performInvitation } from '../testing/invitation-utils';
+import { createServiceContext, performInvitation } from '../testing';
 
 describe('services/ServiceContext', () => {
   test('new space is synchronized on device invitations', async () => {
     const networkContext = new MemorySignalManagerContext();
-    const device1 = await createServiceContext({ signalContext: networkContext });
+    const device1 = await createOpenServiceContext(networkContext);
     await device1.createIdentity();
 
-    const device2 = await createServiceContext({ signalContext: networkContext });
+    const device2 = await createOpenServiceContext(networkContext);
     await Promise.all(performInvitation({ host: device1, guest: device2, options: { kind: Invitation.Kind.DEVICE } }));
 
     const space1 = await device1.dataSpaceManager!.createSpace();
     await device2.dataSpaceManager!.waitUntilSpaceReady(space1!.key);
     const space2 = await device2.dataSpaceManager!.spaces.get(space1.key);
     await space2!.inner.controlPipeline.state.waitUntilTimeframe(space1.inner.controlPipeline.state.timeframe);
-  }).tag('flaky');
+  });
 
   test('joined space is synchronized on device invitations', async () => {
     const networkContext = new MemorySignalManagerContext();
-    const device1 = await createServiceContext({ signalContext: networkContext });
-    await openAndClose(device1.echoHost);
+    const device1 = await createOpenServiceContext(networkContext);
     await device1.createIdentity();
 
-    const device2 = await createServiceContext({ signalContext: networkContext });
-    await openAndClose(device2.echoHost);
+    const device2 = await createOpenServiceContext(networkContext);
     await Promise.all(performInvitation({ host: device1, guest: device2, options: { kind: Invitation.Kind.DEVICE } }));
 
-    const identity2 = await createServiceContext({ signalContext: networkContext });
-    await openAndClose(identity2.echoHost);
+    const identity2 = await createOpenServiceContext(networkContext);
     await identity2.createIdentity();
     const space1 = await identity2.dataSpaceManager!.createSpace();
     await Promise.all(
@@ -50,4 +46,10 @@ describe('services/ServiceContext', () => {
     const space2 = await device2.dataSpaceManager!.spaces.get(space1.key);
     await space2!.inner.controlPipeline.state.waitUntilTimeframe(space1.inner.controlPipeline.state.timeframe);
   });
+
+  const createOpenServiceContext = async (networkContext: MemorySignalManagerContext) => {
+    const serviceContext = await createServiceContext({ signalContext: networkContext });
+    await openAndClose(serviceContext);
+    return serviceContext;
+  };
 });

package/src/version.ts

@@ -1,5 +1 @@
-//
-// Copyright 2023 DXOS.org
-//
-
-export const DXOS_VERSION = '0.6.1'; // {x-release-please-version}
+export const DXOS_VERSION = "0.6.2-main.000b1cc";