@dxos/client-services 0.5.1-main.f81ddc4 → 0.5.1-next.0ef769d

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_PQ6V45LX = require("../../chunk-PQ6V45LX.cjs");
+var import_chunk_4E7K7B6U = require("../../chunk-4E7K7B6U.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_PQ6V45LX.ServiceContext) {
+  if (host instanceof import_chunk_4E7K7B6U.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_PQ6V45LX.ServiceContext) {
+  if (guest instanceof import_chunk_4E7K7B6U.ServiceContext) {
     return guest.invitationsManager.acceptInvitation({
       invitation,
       deviceProfile: guestDeviceProfile
@@ -246,7 +246,7 @@ var acceptInvitation = (guest, invitation, guestDeviceProfile) => {
   return guest.join(invitation, guestDeviceProfile);
 };
 var createServiceHost = (config, signalManagerContext) => {
-  return new import_chunk_PQ6V45LX.ClientServicesHost({
+  return new import_chunk_4E7K7B6U.ClientServicesHost({
     config,
     signalManager: new import_messaging.MemorySignalManager(signalManagerContext),
     transportFactory: import_network_manager.MemoryTransportFactory
@@ -262,7 +262,7 @@ var createServiceContext = async ({ signalContext = new import_messaging.MemoryS
   });
   const level = (0, import_testing.createTestLevel)();
   await level.open();
-  return new import_chunk_PQ6V45LX.ServiceContext(storage, level, networkManager, signalManager, {
+  return new import_chunk_4E7K7B6U.ServiceContext(storage, level, networkManager, signalManager, {
     invitationConnectionDefaultParams: {
       controlHeartbeatInterval: 200
     }
@@ -363,12 +363,12 @@ var TestPeer = class {
     });
   }
   get dataSpaceManager() {
-    return this._props.dataSpaceManager ??= new import_chunk_PQ6V45LX.DataSpaceManager(this.spaceManager, this.metadataStore, this.keyring, this.identity, this.feedStore, this.echoHost, this.invitationsManager);
+    return this._props.dataSpaceManager ??= new import_chunk_4E7K7B6U.DataSpaceManager(this.spaceManager, this.metadataStore, this.keyring, this.identity, this.feedStore, this.echoHost, this.invitationsManager);
   }
   get invitationsManager() {
-    return this._props.invitationsManager ??= new import_chunk_PQ6V45LX.InvitationsManager(new import_chunk_PQ6V45LX.InvitationsHandler(this.networkManager), (invitation) => {
+    return this._props.invitationsManager ??= new import_chunk_4E7K7B6U.InvitationsManager(new import_chunk_4E7K7B6U.InvitationsHandler(this.networkManager), (invitation) => {
       if (invitation.kind === import_services2.Invitation.Kind.SPACE) {
-        return new import_chunk_PQ6V45LX.SpaceInvitationProtocol(this.dataSpaceManager, this.identity, this.keyring, invitation.spaceKey);
+        return new import_chunk_4E7K7B6U.SpaceInvitationProtocol(this.dataSpaceManager, this.identity, this.keyring, invitation.spaceKey);
       } else {
         throw new Error("not implemented");
       }

package/dist/types/src/packlets/vault/shell-runtime.d.ts

@@ -1,7 +1,7 @@
 import { Event } from '@dxos/async';
 import { type ShellRuntime } from '@dxos/client-protocol';
 import { type PublicKey } from '@dxos/keys';
-import { type AppContextRequest, type LayoutRequest, ShellLayout } from '@dxos/protocols/proto/dxos/iframe';
+import { type AppContextRequest, type LayoutRequest, ShellLayout, type InvitationUrlRequest } from '@dxos/protocols/proto/dxos/iframe';
 import { type RpcPort } from '@dxos/rpc';
 /**
  * Endpoint that handles shell services.
@@ -9,15 +9,23 @@ import { type RpcPort } from '@dxos/rpc';
 export declare class ShellRuntimeImpl implements ShellRuntime {
     private readonly _port;
     readonly layoutUpdate: Event<LayoutRequest>;
+    readonly invitationUrlUpdate: Event<InvitationUrlRequest>;
     private _appRpc?;
     private _layout;
-    private _invitationCode?;
     private _spaceKey?;
+    private _invitationCode?;
+    private _invitationUrl?;
+    private _deviceInvitationParam;
+    private _spaceInvitationParam;
     constructor(_port: RpcPort);
     get layout(): ShellLayout;
     get invitationCode(): string | undefined;
     get spaceKey(): PublicKey | undefined;
+    get invitationUrl(): string;
+    get deviceInvitationParam(): string;
+    get spaceInvitationParam(): string;
     setLayout({ layout, invitationCode, spaceKey }: LayoutRequest): void;
+    setInvitationUrl({ invitationUrl, deviceInvitationParam, spaceInvitationParam }: InvitationUrlRequest): void;
     setAppContext(context: AppContextRequest): Promise<void>;
     open(): Promise<void>;
     close(): Promise<void>;

package/dist/types/src/packlets/vault/shell-runtime.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shell-runtime.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/vault/shell-runtime.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAA2C,KAAK,YAAY,EAAsB,MAAM,uBAAuB,CAAC;AAEvH,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,YAAY,CAAC;AAC5C,OAAO,EAAE,KAAK,iBAAiB,EAAE,KAAK,aAAa,EAAE,WAAW,EAAE,MAAM,mCAAmC,CAAC;AAC5G,OAAO,EAAyC,KAAK,OAAO,EAAE,MAAM,WAAW,CAAC;AAEhF;;GAEG;AACH,qBAAa,gBAAiB,YAAW,YAAY;IAOvC,OAAO,CAAC,QAAQ,CAAC,KAAK;IANlC,QAAQ,CAAC,YAAY,uBAA8B;IACnD,OAAO,CAAC,OAAO,CAAC,CAAiC;IACjD,OAAO,CAAC,OAAO,CAAuB;IACtC,OAAO,CAAC,eAAe,CAAC,CAAS;IACjC,OAAO,CAAC,SAAS,CAAC,CAAY;gBAED,KAAK,EAAE,OAAO;IAE3C,IAAI,MAAM,gBAET;IAED,IAAI,cAAc,uBAEjB;IAED,IAAI,QAAQ,0BAEX;IAED,SAAS,CAAC,EAAE,MAAM,EAAE,cAAc,EAAE,QAAQ,EAAE,EAAE,aAAa;IAOvD,aAAa,CAAC,OAAO,EAAE,iBAAiB;IAMxC,IAAI;IAoBJ,KAAK;CAIZ"}
+{"version":3,"file":"shell-runtime.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/vault/shell-runtime.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAA2C,KAAK,YAAY,EAAsB,MAAM,uBAAuB,CAAC;AAEvH,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,YAAY,CAAC;AAC5C,OAAO,EACL,KAAK,iBAAiB,EACtB,KAAK,aAAa,EAClB,WAAW,EACX,KAAK,oBAAoB,EAC1B,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAyC,KAAK,OAAO,EAAE,MAAM,WAAW,CAAC;AAEhF;;GAEG;AACH,qBAAa,gBAAiB,YAAW,YAAY;IAevC,OAAO,CAAC,QAAQ,CAAC,KAAK;IAdlC,QAAQ,CAAC,YAAY,uBAA8B;IACnD,QAAQ,CAAC,mBAAmB,8BAAqC;IAEjE,OAAO,CAAC,OAAO,CAAC,CAAiC;IACjD,OAAO,CAAC,OAAO,CAAuB;IACtC,OAAO,CAAC,SAAS,CAAC,CAAY;IAE9B,OAAO,CAAC,eAAe,CAAC,CAAS;IACjC,OAAO,CAAC,cAAc,CAAC,CAAsE;IAG7F,OAAO,CAAC,sBAAsB,CAA0B;IACxD,OAAO,CAAC,qBAAqB,CAAyB;gBAEzB,KAAK,EAAE,OAAO;IAE3C,IAAI,MAAM,gBAET;IAED,IAAI,cAAc,uBAEjB;IAED,IAAI,QAAQ,0BAEX;IAED,IAAI,aAAa,WAEhB;IAED,IAAI,qBAAqB,WAExB;IAED,IAAI,oBAAoB,WAEvB;IAED,SAAS,CAAC,EAAE,MAAM,EAAE,cAAc,EAAE,QAAQ,EAAE,EAAE,aAAa;IAO7D,gBAAgB,CAAC,EAAE,aAAa,EAAE,qBAAqB,EAAE,oBAAoB,EAAE,EAAE,oBAAoB;IAO/F,aAAa,CAAC,OAAO,EAAE,iBAAiB;IAMxC,IAAI;IA0BJ,KAAK;CAIZ"}

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

@@ -1,2 +1,2 @@
-export declare const DXOS_VERSION = "0.5.1-main.f81ddc4";
+export declare const DXOS_VERSION = "0.5.1-next.0ef769d";
 //# sourceMappingURL=version.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/client-services",
-  "version": "0.5.1-main.f81ddc4",
+  "version": "0.5.1-next.0ef769d",
   "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.5.1-main.f81ddc4",
-    "@dxos/client-protocol": "0.5.1-main.f81ddc4",
-    "@dxos/codec-protobuf": "0.5.1-main.f81ddc4",
-    "@dxos/automerge": "0.5.1-main.f81ddc4",
-    "@dxos/config": "0.5.1-main.f81ddc4",
-    "@dxos/context": "0.5.1-main.f81ddc4",
-    "@dxos/credentials": "0.5.1-main.f81ddc4",
-    "@dxos/crypto": "0.5.1-main.f81ddc4",
-    "@dxos/echo-db": "0.5.1-main.f81ddc4",
-    "@dxos/echo-pipeline": "0.5.1-main.f81ddc4",
-    "@dxos/debug": "0.5.1-main.f81ddc4",
-    "@dxos/echo-schema": "0.5.1-main.f81ddc4",
-    "@dxos/echo-protocol": "0.5.1-main.f81ddc4",
-    "@dxos/feed-store": "0.5.1-main.f81ddc4",
-    "@dxos/invariant": "0.5.1-main.f81ddc4",
-    "@dxos/indexing": "0.5.1-main.f81ddc4",
-    "@dxos/keyring": "0.5.1-main.f81ddc4",
-    "@dxos/keys": "0.5.1-main.f81ddc4",
-    "@dxos/kv-store": "0.5.1-main.f81ddc4",
-    "@dxos/lock-file": "0.5.1-main.f81ddc4",
-    "@dxos/messaging": "0.5.1-main.f81ddc4",
-    "@dxos/log": "0.5.1-main.f81ddc4",
-    "@dxos/network-manager": "0.5.1-main.f81ddc4",
-    "@dxos/node-std": "0.5.1-main.f81ddc4",
-    "@dxos/protocols": "0.5.1-main.f81ddc4",
-    "@dxos/random-access-storage": "0.5.1-main.f81ddc4",
-    "@dxos/rpc": "0.5.1-main.f81ddc4",
-    "@dxos/teleport": "0.5.1-main.f81ddc4",
-    "@dxos/teleport-extension-gossip": "0.5.1-main.f81ddc4",
-    "@dxos/teleport-extension-object-sync": "0.5.1-main.f81ddc4",
-    "@dxos/timeframe": "0.5.1-main.f81ddc4",
-    "@dxos/websocket-rpc": "0.5.1-main.f81ddc4",
-    "@dxos/tracing": "0.5.1-main.f81ddc4",
-    "@dxos/util": "0.5.1-main.f81ddc4"
+    "@dxos/async": "0.5.1-next.0ef769d",
+    "@dxos/automerge": "0.5.1-next.0ef769d",
+    "@dxos/codec-protobuf": "0.5.1-next.0ef769d",
+    "@dxos/client-protocol": "0.5.1-next.0ef769d",
+    "@dxos/config": "0.5.1-next.0ef769d",
+    "@dxos/context": "0.5.1-next.0ef769d",
+    "@dxos/crypto": "0.5.1-next.0ef769d",
+    "@dxos/credentials": "0.5.1-next.0ef769d",
+    "@dxos/debug": "0.5.1-next.0ef769d",
+    "@dxos/echo-db": "0.5.1-next.0ef769d",
+    "@dxos/echo-pipeline": "0.5.1-next.0ef769d",
+    "@dxos/echo-protocol": "0.5.1-next.0ef769d",
+    "@dxos/echo-schema": "0.5.1-next.0ef769d",
+    "@dxos/feed-store": "0.5.1-next.0ef769d",
+    "@dxos/indexing": "0.5.1-next.0ef769d",
+    "@dxos/invariant": "0.5.1-next.0ef769d",
+    "@dxos/keyring": "0.5.1-next.0ef769d",
+    "@dxos/keys": "0.5.1-next.0ef769d",
+    "@dxos/kv-store": "0.5.1-next.0ef769d",
+    "@dxos/lock-file": "0.5.1-next.0ef769d",
+    "@dxos/log": "0.5.1-next.0ef769d",
+    "@dxos/messaging": "0.5.1-next.0ef769d",
+    "@dxos/network-manager": "0.5.1-next.0ef769d",
+    "@dxos/node-std": "0.5.1-next.0ef769d",
+    "@dxos/random-access-storage": "0.5.1-next.0ef769d",
+    "@dxos/rpc": "0.5.1-next.0ef769d",
+    "@dxos/teleport": "0.5.1-next.0ef769d",
+    "@dxos/teleport-extension-gossip": "0.5.1-next.0ef769d",
+    "@dxos/protocols": "0.5.1-next.0ef769d",
+    "@dxos/teleport-extension-object-sync": "0.5.1-next.0ef769d",
+    "@dxos/timeframe": "0.5.1-next.0ef769d",
+    "@dxos/tracing": "0.5.1-next.0ef769d",
+    "@dxos/util": "0.5.1-next.0ef769d",
+    "@dxos/websocket-rpc": "0.5.1-next.0ef769d"
   },
   "devDependencies": {
     "@types/platform": "^1.3.4",
     "@types/readable-stream": "^2.3.9",
-    "@dxos/signal": "0.5.1-main.f81ddc4"
+    "@dxos/signal": "0.5.1-next.0ef769d"
   },
   "publishConfig": {
     "access": "public"

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

@@ -181,7 +181,7 @@ describe('InvitationHandler', () => {
 
       await sleep(10);
       expect(guest.sink.lastState).to.eq(Invitation.State.ERROR);
-    });
+    }).timeout(20_000);
 
     test('single host - many guests', async () => {
       const hosts: PeerSetup[] = [await createPeer()];

package/src/packlets/vault/shell-runtime.ts

@@ -6,7 +6,12 @@ import { Event } from '@dxos/async';
 import { appServiceBundle, type AppServiceBundle, type ShellRuntime, shellServiceBundle } from '@dxos/client-protocol';
 import { invariant } from '@dxos/invariant';
 import { type PublicKey } from '@dxos/keys';
-import { type AppContextRequest, type LayoutRequest, ShellLayout } from '@dxos/protocols/proto/dxos/iframe';
+import {
+  type AppContextRequest,
+  type LayoutRequest,
+  ShellLayout,
+  type InvitationUrlRequest,
+} from '@dxos/protocols/proto/dxos/iframe';
 import { createProtoRpcPeer, type ProtoRpcPeer, type RpcPort } from '@dxos/rpc';
 
 /**
@@ -14,11 +19,19 @@ import { createProtoRpcPeer, type ProtoRpcPeer, type RpcPort } from '@dxos/rpc';
  */
 export class ShellRuntimeImpl implements ShellRuntime {
   readonly layoutUpdate = new Event<LayoutRequest>();
+  readonly invitationUrlUpdate = new Event<InvitationUrlRequest>();
+
   private _appRpc?: ProtoRpcPeer<AppServiceBundle>;
   private _layout = ShellLayout.DEFAULT;
-  private _invitationCode?: string;
   private _spaceKey?: PublicKey;
 
+  private _invitationCode?: string;
+  private _invitationUrl? = typeof window !== 'undefined' ? window.location.origin : undefined;
+
+  // TODO(burdon): Change to using underscores (coordinate with @dxos/web-auth).
+  private _deviceInvitationParam = 'deviceInvitationCode'; // TODO(burdon): device_invitation_code
+  private _spaceInvitationParam = 'spaceInvitationCode'; // TODO(burdon): space_invitation_code
+
   constructor(private readonly _port: RpcPort) {}
 
   get layout() {
@@ -33,6 +46,18 @@ export class ShellRuntimeImpl implements ShellRuntime {
     return this._spaceKey;
   }
 
+  get invitationUrl() {
+    return this._invitationUrl!;
+  }
+
+  get deviceInvitationParam() {
+    return this._deviceInvitationParam;
+  }
+
+  get spaceInvitationParam() {
+    return this._spaceInvitationParam;
+  }
+
   setLayout({ layout, invitationCode, spaceKey }: LayoutRequest) {
     this._layout = layout;
     this._invitationCode = invitationCode;
@@ -40,6 +65,13 @@ export class ShellRuntimeImpl implements ShellRuntime {
     this.layoutUpdate.emit({ layout, invitationCode, spaceKey });
   }
 
+  setInvitationUrl({ invitationUrl, deviceInvitationParam, spaceInvitationParam }: InvitationUrlRequest) {
+    this._invitationUrl = invitationUrl;
+    this._deviceInvitationParam = deviceInvitationParam;
+    this._spaceInvitationParam = spaceInvitationParam;
+    this.invitationUrlUpdate.emit({ invitationUrl, deviceInvitationParam, spaceInvitationParam });
+  }
+
   async setAppContext(context: AppContextRequest) {
     invariant(this._appRpc, 'runtime not open');
 
@@ -58,6 +90,12 @@ export class ShellRuntimeImpl implements ShellRuntime {
             this._spaceKey = request.spaceKey;
             this.layoutUpdate.emit(request);
           },
+          setInvitationUrl: async (request) => {
+            this._invitationUrl = request.invitationUrl;
+            this._deviceInvitationParam = request.deviceInvitationParam;
+            this._spaceInvitationParam = request.spaceInvitationParam;
+            this.invitationUrlUpdate.emit(request);
+          },
         },
       },
       port: this._port,

package/src/version.ts

@@ -1 +1 @@
-export const DXOS_VERSION = "0.5.1-main.f81ddc4";
+export const DXOS_VERSION = "0.5.1-next.0ef769d";