@dxos/client-protocol 0.4.9 → 0.4.10-main.05b9ab6

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

@@ -1,8 +1,10 @@
 import type { MulticastObservable } from '@dxos/async';
-import type { TypeCollection } from '@dxos/echo-schema';
+import type { FilterSource, Query } from '@dxos/echo-db';
 import type { PublicKey } from '@dxos/keys';
 import type { Invitation } from '@dxos/protocols/proto/dxos/client/services';
+import type { QueryOptions } from '@dxos/protocols/proto/dxos/echo/filter';
 import type { AuthenticatingInvitation } from './invitations';
+import type { PropertiesProps } from './schema';
 import type { Space } from './space';
 export declare const defaultKey = "__DEFAULT__";
 /**
@@ -28,7 +30,7 @@ export interface Echo extends MulticastObservable<Space[]> {
     /**
      * Creates a new space.
      */
-    create(): Promise<Space>;
+    create(meta?: PropertiesProps): Promise<Space>;
     /**
      * Creates a space from the given snapshot.
      */
@@ -37,8 +39,10 @@ export interface Echo extends MulticastObservable<Space[]> {
      */
     join(invitation: Invitation | string): AuthenticatingInvitation;
     /**
-     * Adds a schema to ECHO.
+     * Query all spaces.
+     * @param filter
+     * @param options
      */
-    addSchema(schema: TypeCollection): void;
+    query<T extends {} = any>(filter?: FilterSource<T>, options?: QueryOptions): Query<T>;
 }
 //# sourceMappingURL=echo.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"echo.d.ts","sourceRoot":"","sources":["../../../src/echo.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AACvD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAC5C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,4CAA4C,CAAC;AAE7E,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,eAAe,CAAC;AAC9D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAIrC,eAAO,MAAM,UAAU,gBAAgB,CAAC;AAExC;;GAEG;AAIH,MAAM,WAAW,IAAK,SAAQ,mBAAmB,CAAC,KAAK,EAAE,CAAC;IACxD;;OAEG;IAEH,IAAI,OAAO,IAAI,mBAAmB,CAAC,OAAO,CAAC,CAAC;IAE5C;;OAEG;IACH,GAAG,IAAI,KAAK,EAAE,CAAC;IAEf;;OAEG;IACH,GAAG,CAAC,QAAQ,EAAE,SAAS,GAAG,KAAK,GAAG,SAAS,CAAC;IAE5C;;OAEG;IACH,IAAI,OAAO,IAAI,KAAK,CAAC;IAErB;;OAEG;IACH,MAAM,IAAI,OAAO,CAAC,KAAK,CAAC,CAAC;IAEzB;;OAEG;IAGH;;OAEG;IACH,IAAI,CAAC,UAAU,EAAE,UAAU,GAAG,MAAM,GAAG,wBAAwB,CAAC;IAEhE;;OAEG;IAEH,SAAS,CAAC,MAAM,EAAE,cAAc,GAAG,IAAI,CAAC;CACzC"}
+{"version":3,"file":"echo.d.ts","sourceRoot":"","sources":["../../../src/echo.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AACvD,OAAO,KAAK,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AACzD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAC5C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,4CAA4C,CAAC;AAC7E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wCAAwC,CAAC;AAE3E,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,eAAe,CAAC;AAC9D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAChD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAIrC,eAAO,MAAM,UAAU,gBAAgB,CAAC;AAExC;;GAEG;AAIH,MAAM,WAAW,IAAK,SAAQ,mBAAmB,CAAC,KAAK,EAAE,CAAC;IACxD;;OAEG;IAEH,IAAI,OAAO,IAAI,mBAAmB,CAAC,OAAO,CAAC,CAAC;IAE5C;;OAEG;IACH,GAAG,IAAI,KAAK,EAAE,CAAC;IAEf;;OAEG;IACH,GAAG,CAAC,QAAQ,EAAE,SAAS,GAAG,KAAK,GAAG,SAAS,CAAC;IAE5C;;OAEG;IACH,IAAI,OAAO,IAAI,KAAK,CAAC;IAErB;;OAEG;IACH,MAAM,CAAC,IAAI,CAAC,EAAE,eAAe,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;IAE/C;;OAEG;IAGH;;OAEG;IACH,IAAI,CAAC,UAAU,EAAE,UAAU,GAAG,MAAM,GAAG,wBAAwB,CAAC;IAEhE;;;;OAIG;IACH,KAAK,CAAC,CAAC,SAAS,EAAE,GAAG,GAAG,EAAE,MAAM,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,YAAY,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;CACvF"}

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

@@ -1,6 +1,7 @@
-import { type MulticastObservable } from '@dxos/async';
+import { type ObservableProvider, type MulticastObservable } from '@dxos/async';
+import { type PublicKey } from '@dxos/keys';
 import { type Contact, type Device, type Identity, type Invitation } from '@dxos/protocols/proto/dxos/client/services';
-import { type ProfileDocument } from '@dxos/protocols/proto/dxos/halo/credentials';
+import { type DeviceProfileDocument, type Credential, type Presentation, type ProfileDocument } from '@dxos/protocols/proto/dxos/halo/credentials';
 import { type AuthenticatingInvitation, type CancellableInvitation } from './invitations';
 /**
  * TODO(burdon): Public API (move comments here).
@@ -11,10 +12,22 @@ export interface Halo {
     get device(): Device | undefined;
     get contacts(): MulticastObservable<Contact[]>;
     get invitations(): MulticastObservable<CancellableInvitation[]>;
-    createIdentity(options?: ProfileDocument): Promise<Identity>;
+    createIdentity(options?: ProfileDocument, deviceProfile?: DeviceProfileDocument): Promise<Identity>;
     recoverIdentity(recoveryKey: Uint8Array): Promise<Identity>;
     updateProfile(profile: ProfileDocument): Promise<Identity>;
-    share(): CancellableInvitation;
-    join(invitation: Invitation): AuthenticatingInvitation;
+    share(options?: Partial<Invitation>): CancellableInvitation;
+    join(invitation: Invitation, deviceProfile?: DeviceProfileDocument): AuthenticatingInvitation;
+    queryCredentials(options?: {
+        ids?: PublicKey[];
+        type?: string;
+    }): ObservableProvider<{
+        onUpdate: (credentials: Credential[]) => void;
+        onError: (error?: Error) => void;
+    }, Credential[]>;
+    writeCredentials(credentials: Credential[]): Promise<void>;
+    presentCredentials(options: {
+        ids: PublicKey[];
+        nonce?: Uint8Array;
+    }): Promise<Presentation>;
 }
 //# sourceMappingURL=halo.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"halo.d.ts","sourceRoot":"","sources":["../../../src/halo.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,aAAa,CAAC;AACvD,OAAO,EAAE,KAAK,OAAO,EAAE,KAAK,MAAM,EAAE,KAAK,QAAQ,EAAE,KAAK,UAAU,EAAE,MAAM,4CAA4C,CAAC;AACvH,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,6CAA6C,CAAC;AAEnF,OAAO,EAAE,KAAK,wBAAwB,EAAE,KAAK,qBAAqB,EAAE,MAAM,eAAe,CAAC;AAE1F;;GAEG;AACH,MAAM,WAAW,IAAI;IACnB,IAAI,QAAQ,IAAI,mBAAmB,CAAC,QAAQ,GAAG,IAAI,CAAC,CAAC;IACrD,IAAI,OAAO,IAAI,mBAAmB,CAAC,MAAM,EAAE,CAAC,CAAC;IAC7C,IAAI,MAAM,IAAI,MAAM,GAAG,SAAS,CAAC;IACjC,IAAI,QAAQ,IAAI,mBAAmB,CAAC,OAAO,EAAE,CAAC,CAAC;IAC/C,IAAI,WAAW,IAAI,mBAAmB,CAAC,qBAAqB,EAAE,CAAC,CAAC;IAEhE,cAAc,CAAC,OAAO,CAAC,EAAE,eAAe,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC7D,eAAe,CAAC,WAAW,EAAE,UAAU,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC5D,aAAa,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;IAE3D,KAAK,IAAI,qBAAqB,CAAC;IAC/B,IAAI,CAAC,UAAU,EAAE,UAAU,GAAG,wBAAwB,CAAC;CACxD"}
+{"version":3,"file":"halo.d.ts","sourceRoot":"","sources":["../../../src/halo.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,kBAAkB,EAAE,KAAK,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAChF,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,YAAY,CAAC;AAC5C,OAAO,EAAE,KAAK,OAAO,EAAE,KAAK,MAAM,EAAE,KAAK,QAAQ,EAAE,KAAK,UAAU,EAAE,MAAM,4CAA4C,CAAC;AACvH,OAAO,EACL,KAAK,qBAAqB,EAC1B,KAAK,UAAU,EACf,KAAK,YAAY,EACjB,KAAK,eAAe,EACrB,MAAM,6CAA6C,CAAC;AAErD,OAAO,EAAE,KAAK,wBAAwB,EAAE,KAAK,qBAAqB,EAAE,MAAM,eAAe,CAAC;AAE1F;;GAEG;AACH,MAAM,WAAW,IAAI;IACnB,IAAI,QAAQ,IAAI,mBAAmB,CAAC,QAAQ,GAAG,IAAI,CAAC,CAAC;IACrD,IAAI,OAAO,IAAI,mBAAmB,CAAC,MAAM,EAAE,CAAC,CAAC;IAC7C,IAAI,MAAM,IAAI,MAAM,GAAG,SAAS,CAAC;IACjC,IAAI,QAAQ,IAAI,mBAAmB,CAAC,OAAO,EAAE,CAAC,CAAC;IAC/C,IAAI,WAAW,IAAI,mBAAmB,CAAC,qBAAqB,EAAE,CAAC,CAAC;IAEhE,cAAc,CAAC,OAAO,CAAC,EAAE,eAAe,EAAE,aAAa,CAAC,EAAE,qBAAqB,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;IACpG,eAAe,CAAC,WAAW,EAAE,UAAU,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC5D,aAAa,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;IAE3D,KAAK,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,GAAG,qBAAqB,CAAC;IAC5D,IAAI,CAAC,UAAU,EAAE,UAAU,EAAE,aAAa,CAAC,EAAE,qBAAqB,GAAG,wBAAwB,CAAC;IAG9F,gBAAgB,CAAC,OAAO,CAAC,EAAE;QACzB,GAAG,CAAC,EAAE,SAAS,EAAE,CAAC;QAClB,IAAI,CAAC,EAAE,MAAM,CAAC;KACf,GAAG,kBAAkB,CACpB;QAAE,QAAQ,EAAE,CAAC,WAAW,EAAE,UAAU,EAAE,KAAK,IAAI,CAAC;QAAC,OAAO,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,KAAK,IAAI,CAAA;KAAE,EACnF,UAAU,EAAE,CACb,CAAC;IACF,gBAAgB,CAAC,WAAW,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3D,kBAAkB,CAAC,OAAO,EAAE;QAAE,GAAG,EAAE,SAAS,EAAE,CAAC;QAAC,KAAK,CAAC,EAAE,UAAU,CAAA;KAAE,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;CAC9F"}

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

@@ -2,7 +2,6 @@ export * from './config';
 export * from './echo';
 export * from './halo';
 export * from './invitations';
-export * from './proto';
 export * from './service-definitions';
 export * from './shell';
 export * from './space';

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAIA,cAAc,UAAU,CAAC;AACzB,cAAc,QAAQ,CAAC;AACvB,cAAc,QAAQ,CAAC;AACvB,cAAc,eAAe,CAAC;AAC9B,cAAc,SAAS,CAAC;AACxB,cAAc,uBAAuB,CAAC;AACtC,cAAc,SAAS,CAAC;AACxB,cAAc,SAAS,CAAC;AACxB,cAAc,YAAY,CAAC;AAC3B,cAAc,UAAU,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAIA,cAAc,UAAU,CAAC;AACzB,cAAc,QAAQ,CAAC;AACvB,cAAc,QAAQ,CAAC;AACvB,cAAc,eAAe,CAAC;AAC9B,cAAc,uBAAuB,CAAC;AACtC,cAAc,SAAS,CAAC;AACxB,cAAc,SAAS,CAAC;AACxB,cAAc,YAAY,CAAC;AAC3B,cAAc,UAAU,CAAC"}

package/dist/types/src/invitations/encoder.d.ts

@@ -1,4 +1,4 @@
-import { type Invitation } from '@dxos/protocols/proto/dxos/client/services';
+import { Invitation } from '@dxos/protocols/proto/dxos/client/services';
 /**
  * Encodes and decodes an invitation proto into/from alphanumeric chars.
  */

package/dist/types/src/invitations/encoder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"encoder.d.ts","sourceRoot":"","sources":["../../../../src/invitations/encoder.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,4CAA4C,CAAC;AAO7E;;GAEG;AACH,qBAAa,iBAAiB;IAC5B,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,UAAU;IAIvC,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,UAAU,GAAG,MAAM;CAgB9C"}
+{"version":3,"file":"encoder.d.ts","sourceRoot":"","sources":["../../../../src/invitations/encoder.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,UAAU,EAAE,MAAM,4CAA4C,CAAC;AAOxE;;GAEG;AACH,qBAAa,iBAAiB;IAC5B,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,UAAU;IASvC,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,UAAU,GAAG,MAAM;CAiB9C"}

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

@@ -1,16 +1,26 @@
-import * as S from '@effect/schema/Schema';
-import * as E from '@dxos/echo-schema';
-export declare const PropertiesSchema: S.Schema<{
+import { S } from '@dxos/echo-schema';
+declare const _Properties: S.Schema<{
+    [x: string]: any;
     readonly id: string;
     name?: string | undefined;
-    "composer.dxos.org.opened"?: number | undefined;
-    "composer.dxos.org.version"?: string | number | undefined;
-    "braneframe.Folder"?: E.AnyEchoObject | undefined;
 }, {
+    [x: string]: any;
     readonly id: string;
     name?: string | undefined;
-    "composer.dxos.org.opened"?: number | undefined;
-    "composer.dxos.org.version"?: string | number | undefined;
-    "braneframe.Folder"?: E.AnyEchoObject | undefined;
 }, never>;
+export interface Properties extends S.Schema.Type<typeof _Properties> {
+}
+export declare const Properties: S.Schema<{
+    [x: string]: any;
+    readonly id: string;
+    name?: string | undefined;
+}, {
+    [x: string]: any;
+    readonly id: string;
+    name?: string | undefined;
+}, never>;
+export type PropertiesProps = {
+    name?: string;
+};
+export {};
 //# sourceMappingURL=schema.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../src/schema.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,CAAC,MAAM,uBAAuB,CAAC;AAE3C,OAAO,KAAK,CAAC,MAAM,mBAAmB,CAAC;AAEvC,eAAO,MAAM,gBAAgB;;;;;;;;;;;;SAM+B,CAAC"}
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../src/schema.ts"],"names":[],"mappings":"AAIA,OAAO,EAAc,CAAC,EAAE,MAAM,mBAAmB,CAAC;AAElD,QAAA,MAAM,WAAW;;;;;;;;SAEhB,CAAC;AACF,MAAM,WAAW,UAAW,SAAQ,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,WAAW,CAAC;CAAG;AACxE,eAAO,MAAM,UAAU;;;;;;;;SAAc,CAAC;AAEtC,MAAM,MAAM,eAAe,GAAG;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC"}

package/dist/types/src/service-definitions.d.ts

@@ -1,8 +1,9 @@
 import { type Event } from '@dxos/async';
 import { type Context } from '@dxos/context';
 import { type FunctionRegistryService } from '@dxos/protocols/proto/dxos/agent/functions';
-import { type IndexService, type DevicesService, type IdentityService, type InvitationsService, type LoggingService, type NetworkService, type SpacesService, type SystemService } from '@dxos/protocols/proto/dxos/client/services';
+import { type DevicesService, type IdentityService, type InvitationsService, type LoggingService, type NetworkService, type SpacesService, type SystemService } from '@dxos/protocols/proto/dxos/client/services';
 import { type DevtoolsHost } from '@dxos/protocols/proto/dxos/devtools/host';
+import { type QueryService } from '@dxos/protocols/proto/dxos/echo/query';
 import { type DataService } from '@dxos/protocols/proto/dxos/echo/service';
 import type { AppService, ShellService, WorkerService } from '@dxos/protocols/proto/dxos/iframe';
 import type { BridgeService } from '@dxos/protocols/proto/dxos/mesh/bridge';
@@ -14,7 +15,7 @@ export type ClientServices = {
     LoggingService: LoggingService;
     IdentityService: IdentityService;
     InvitationsService: InvitationsService;
-    IndexService: IndexService;
+    QueryService: QueryService;
     DevicesService: DevicesService;
     SpacesService: SpacesService;
     DataService: DataService;

package/dist/types/src/service-definitions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"service-definitions.d.ts","sourceRoot":"","sources":["../../../src/service-definitions.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,eAAe,CAAC;AAE7C,OAAO,EAAE,KAAK,uBAAuB,EAAE,MAAM,4CAA4C,CAAC;AAC1F,OAAO,EACL,KAAK,YAAY,EACjB,KAAK,cAAc,EACnB,KAAK,eAAe,EACpB,KAAK,kBAAkB,EACvB,KAAK,cAAc,EACnB,KAAK,cAAc,EACnB,KAAK,aAAa,EAClB,KAAK,aAAa,EACnB,MAAM,4CAA4C,CAAC;AACpD,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,0CAA0C,CAAC;AAC7E,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,yCAAyC,CAAC;AAC3E,OAAO,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AACjG,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,wCAAwC,CAAC;AAC5E,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACzE,OAAO,EAAuB,KAAK,aAAa,EAAE,MAAM,WAAW,CAAC;AAMpE,MAAM,MAAM,cAAc,GAAG;IAC3B,aAAa,EAAE,aAAa,CAAC;IAC7B,cAAc,EAAE,cAAc,CAAC;IAC/B,cAAc,EAAE,cAAc,CAAC;IAE/B,eAAe,EAAE,eAAe,CAAC;IACjC,kBAAkB,EAAE,kBAAkB,CAAC;IACvC,YAAY,EAAE,YAAY,CAAC;IAC3B,cAAc,EAAE,cAAc,CAAC;IAC/B,aAAa,EAAE,aAAa,CAAC;IAC7B,WAAW,EAAE,WAAW,CAAC;IAEzB,uBAAuB,EAAE,uBAAuB,CAAC;IAGjD,YAAY,EAAE,YAAY,CAAC;IAE3B,cAAc,EAAE,cAAc,CAAC;CAChC,CAAC;AAEF;;GAEG;AACH,MAAM,WAAW,sBAAsB;IACrC;;;;OAIG;IACH,MAAM,EAAE,KAAK,CAAC,KAAK,GAAG,SAAS,CAAC,CAAC;IACjC,WAAW,EAAE,aAAa,CAAC,cAAc,CAAC,CAAC;IAC3C,QAAQ,EAAE,OAAO,CAAC,cAAc,CAAC,CAAC;IAElC,IAAI,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAClC,KAAK,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACpC;AAED;;GAEG;AACH,eAAO,MAAM,mBAAmB,+BAmB9B,CAAC;AAEH,MAAM,MAAM,mBAAmB,GAAG;IAChC,aAAa,EAAE,aAAa,CAAC;CAC9B,CAAC;AAEF,eAAO,MAAM,mBAAmB,EAAE,aAAa,CAAC,mBAAmB,CAElE,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,aAAa,EAAE,aAAa,CAAC;CAC9B,CAAC;AAEF,eAAO,MAAM,mBAAmB,EAAE,aAAa,CAAC,mBAAmB,CAElE,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,UAAU,EAAE,UAAU,CAAC;CACxB,CAAC;AAEF,eAAO,MAAM,gBAAgB,EAAE,aAAa,CAAC,gBAAgB,CAE5D,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,YAAY,EAAE,YAAY,CAAC;CAC5B,CAAC;AAEF,eAAO,MAAM,kBAAkB,EAAE,aAAa,CAAC,kBAAkB,CAEhE,CAAC"}
+{"version":3,"file":"service-definitions.d.ts","sourceRoot":"","sources":["../../../src/service-definitions.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,eAAe,CAAC;AAE7C,OAAO,EAAE,KAAK,uBAAuB,EAAE,MAAM,4CAA4C,CAAC;AAC1F,OAAO,EACL,KAAK,cAAc,EACnB,KAAK,eAAe,EACpB,KAAK,kBAAkB,EACvB,KAAK,cAAc,EACnB,KAAK,cAAc,EACnB,KAAK,aAAa,EAClB,KAAK,aAAa,EACnB,MAAM,4CAA4C,CAAC;AACpD,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,0CAA0C,CAAC;AAC7E,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,uCAAuC,CAAC;AAC1E,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,yCAAyC,CAAC;AAC3E,OAAO,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AACjG,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,wCAAwC,CAAC;AAC5E,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACzE,OAAO,EAAuB,KAAK,aAAa,EAAE,MAAM,WAAW,CAAC;AAMpE,MAAM,MAAM,cAAc,GAAG;IAC3B,aAAa,EAAE,aAAa,CAAC;IAC7B,cAAc,EAAE,cAAc,CAAC;IAC/B,cAAc,EAAE,cAAc,CAAC;IAE/B,eAAe,EAAE,eAAe,CAAC;IACjC,kBAAkB,EAAE,kBAAkB,CAAC;IACvC,YAAY,EAAE,YAAY,CAAC;IAC3B,cAAc,EAAE,cAAc,CAAC;IAC/B,aAAa,EAAE,aAAa,CAAC;IAC7B,WAAW,EAAE,WAAW,CAAC;IAEzB,uBAAuB,EAAE,uBAAuB,CAAC;IAGjD,YAAY,EAAE,YAAY,CAAC;IAE3B,cAAc,EAAE,cAAc,CAAC;CAChC,CAAC;AAEF;;GAEG;AACH,MAAM,WAAW,sBAAsB;IACrC;;;;OAIG;IACH,MAAM,EAAE,KAAK,CAAC,KAAK,GAAG,SAAS,CAAC,CAAC;IACjC,WAAW,EAAE,aAAa,CAAC,cAAc,CAAC,CAAC;IAC3C,QAAQ,EAAE,OAAO,CAAC,cAAc,CAAC,CAAC;IAElC,IAAI,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAClC,KAAK,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACpC;AAED;;GAEG;AACH,eAAO,MAAM,mBAAmB,+BAmB9B,CAAC;AAEH,MAAM,MAAM,mBAAmB,GAAG;IAChC,aAAa,EAAE,aAAa,CAAC;CAC9B,CAAC;AAEF,eAAO,MAAM,mBAAmB,EAAE,aAAa,CAAC,mBAAmB,CAElE,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,aAAa,EAAE,aAAa,CAAC;CAC9B,CAAC;AAEF,eAAO,MAAM,mBAAmB,EAAE,aAAa,CAAC,mBAAmB,CAElE,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,UAAU,EAAE,UAAU,CAAC;CACxB,CAAC;AAEF,eAAO,MAAM,gBAAgB,EAAE,aAAa,CAAC,gBAAgB,CAE5D,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,YAAY,EAAE,YAAY,CAAC;CAC5B,CAAC;AAEF,eAAO,MAAM,kBAAkB,EAAE,aAAa,CAAC,kBAAkB,CAEhE,CAAC"}

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

@@ -1,15 +1,12 @@
 import { type MulticastObservable, type UnsubscribeCallback } from '@dxos/async';
-import { type EchoDatabase, type TypedObject } from '@dxos/echo-schema';
+import { type EchoDatabase } from '@dxos/echo-db';
+import { type EchoReactiveObject } from '@dxos/echo-schema';
 import { type PublicKey } from '@dxos/keys';
 import { type Invitation, type Space as SpaceData, type SpaceMember, type SpaceState } from '@dxos/protocols/proto/dxos/client/services';
 import { type SpaceSnapshot } from '@dxos/protocols/proto/dxos/echo/snapshot';
 import { type GossipMessage } from '@dxos/protocols/proto/dxos/mesh/teleport/gossip';
 import { type CancellableInvitation } from './invitations';
 export interface SpaceInternal {
-    /**
-     * @deprecated
-     */
-    get db(): never;
     get data(): SpaceData;
     /**
      * Activates the space enabling the use of the database and starts replication with peers.
@@ -35,7 +32,7 @@ export interface Space {
     /**
      * Properties object.
      */
-    get properties(): TypedObject;
+    get properties(): EchoReactiveObject<any>;
     /**
      * Current state of the space.
      * The database is ready to be used in `SpaceState.READY` state.
@@ -48,6 +45,9 @@ export interface Space {
     get pipeline(): MulticastObservable<SpaceData.PipelineState>;
     get invitations(): MulticastObservable<CancellableInvitation[]>;
     get members(): MulticastObservable<SpaceMember[]>;
+    /**
+     * @deprecated
+     */
     get internal(): SpaceInternal;
     open(): Promise<void>;
     close(): Promise<void>;

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

@@ -1 +1 @@
-{"version":3,"file":"space.d.ts","sourceRoot":"","sources":["../../../src/space.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,mBAAmB,EAAE,KAAK,mBAAmB,EAAE,MAAM,aAAa,CAAC;AACjF,OAAO,EAAE,KAAK,YAAY,EAAE,KAAK,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACxE,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,YAAY,CAAC;AAC5C,OAAO,EACL,KAAK,UAAU,EACf,KAAK,KAAK,IAAI,SAAS,EACvB,KAAK,WAAW,EAChB,KAAK,UAAU,EAChB,MAAM,4CAA4C,CAAC;AACpD,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,0CAA0C,CAAC;AAC9E,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,iDAAiD,CAAC;AAErF,OAAO,EAAE,KAAK,qBAAqB,EAAE,MAAM,eAAe,CAAC;AAE3D,MAAM,WAAW,aAAa;IAC5B;;OAEG;IACH,IAAI,EAAE,IAAI,KAAK,CAAC;IAEhB,IAAI,IAAI,IAAI,SAAS,CAAC;IAEtB;;;OAGG;IACH,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAEtB;;;;OAIG;IACH,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAGvB,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAE7B,YAAY,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACnD;AAGD,MAAM,WAAW,KAAK;IACpB,IAAI,GAAG,IAAI,SAAS,CAAC;IAErB;;OAEG;IACH,IAAI,EAAE,IAAI,YAAY,CAAC;IACvB,IAAI,MAAM,IAAI,OAAO,CAAC;IAEtB;;OAEG;IACH,IAAI,UAAU,IAAI,WAAW,CAAC;IAE9B;;;;OAIG;IACH,IAAI,KAAK,IAAI,mBAAmB,CAAC,UAAU,CAAC,CAAC;IAE7C;;OAEG;IACH,IAAI,QAAQ,IAAI,mBAAmB,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;IAE7D,IAAI,WAAW,IAAI,mBAAmB,CAAC,qBAAqB,EAAE,CAAC,CAAC;IAChE,IAAI,OAAO,IAAI,mBAAmB,CAAC,WAAW,EAAE,CAAC,CAAC;IAElD,IAAI,QAAQ,IAAI,aAAa,CAAC;IAE9B,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACtB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAEvB;;OAEG;IACH,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAGhC,WAAW,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAE9D,MAAM,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,OAAO,EAAE,aAAa,KAAK,IAAI,KAAK,mBAAmB,CAAC;IAE7F,KAAK,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,GAAG,qBAAqB,CAAC;IAE5D,cAAc,IAAI,OAAO,CAAC,aAAa,CAAC,CAAC;CAC1C"}
+{"version":3,"file":"space.d.ts","sourceRoot":"","sources":["../../../src/space.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,mBAAmB,EAAE,KAAK,mBAAmB,EAAE,MAAM,aAAa,CAAC;AACjF,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAC5D,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,YAAY,CAAC;AAC5C,OAAO,EACL,KAAK,UAAU,EACf,KAAK,KAAK,IAAI,SAAS,EACvB,KAAK,WAAW,EAChB,KAAK,UAAU,EAChB,MAAM,4CAA4C,CAAC;AACpD,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,0CAA0C,CAAC;AAC9E,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,iDAAiD,CAAC;AAErF,OAAO,EAAE,KAAK,qBAAqB,EAAE,MAAM,eAAe,CAAC;AAE3D,MAAM,WAAW,aAAa;IAC5B,IAAI,IAAI,IAAI,SAAS,CAAC;IAEtB;;;OAGG;IACH,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAEtB;;;;OAIG;IACH,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAGvB,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAE7B,YAAY,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACnD;AAGD,MAAM,WAAW,KAAK;IACpB,IAAI,GAAG,IAAI,SAAS,CAAC;IAErB;;OAEG;IACH,IAAI,EAAE,IAAI,YAAY,CAAC;IACvB,IAAI,MAAM,IAAI,OAAO,CAAC;IAEtB;;OAEG;IACH,IAAI,UAAU,IAAI,kBAAkB,CAAC,GAAG,CAAC,CAAC;IAE1C;;;;OAIG;IACH,IAAI,KAAK,IAAI,mBAAmB,CAAC,UAAU,CAAC,CAAC;IAE7C;;OAEG;IACH,IAAI,QAAQ,IAAI,mBAAmB,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;IAE7D,IAAI,WAAW,IAAI,mBAAmB,CAAC,qBAAqB,EAAE,CAAC,CAAC;IAChE,IAAI,OAAO,IAAI,mBAAmB,CAAC,WAAW,EAAE,CAAC,CAAC;IAElD;;OAEG;IAEH,IAAI,QAAQ,IAAI,aAAa,CAAC;IAE9B,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACtB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAEvB;;OAEG;IACH,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAGhC,WAAW,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAE9D,MAAM,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,OAAO,EAAE,aAAa,KAAK,IAAI,KAAK,mBAAmB,CAAC;IAE7F,KAAK,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,GAAG,qBAAqB,CAAC;IAE5D,cAAc,IAAI,OAAO,CAAC,aAAa,CAAC,CAAC;CAC1C"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/client-protocol",
-  "version": "0.4.9",
+  "version": "0.4.10-main.05b9ab6",
   "description": "Core DXOS Client API.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -17,27 +17,22 @@
     "src"
   ],
   "dependencies": {
-    "@effect/schema": "0.64.7",
     "base-x": "~3.0.9",
-    "effect": "2.4.9",
-    "@dxos/async": "0.4.9",
-    "@dxos/config": "0.4.9",
-    "@dxos/context": "0.4.9",
-    "@dxos/echo-schema": "0.4.9",
-    "@dxos/echo-db": "0.4.9",
-    "@dxos/invariant": "0.4.9",
-    "@dxos/keys": "0.4.9",
-    "@dxos/protocols": "0.4.9",
-    "@dxos/node-std": "0.4.9",
-    "@dxos/rpc": "0.4.9"
+    "@dxos/async": "0.4.10-main.05b9ab6",
+    "@dxos/config": "0.4.10-main.05b9ab6",
+    "@dxos/context": "0.4.10-main.05b9ab6",
+    "@dxos/echo-db": "0.4.10-main.05b9ab6",
+    "@dxos/echo-schema": "0.4.10-main.05b9ab6",
+    "@dxos/invariant": "0.4.10-main.05b9ab6",
+    "@dxos/keys": "0.4.10-main.05b9ab6",
+    "@dxos/protocols": "0.4.10-main.05b9ab6",
+    "@dxos/node-std": "0.4.10-main.05b9ab6",
+    "@dxos/rpc": "0.4.10-main.05b9ab6"
   },
   "devDependencies": {
-    "@dxos/echo-typegen": "0.4.9"
+    "@dxos/echo-typegen": "0.4.10-main.05b9ab6"
   },
   "publishConfig": {
     "access": "public"
-  },
-  "scripts": {
-    "prebuild": "dxtype src/proto/schema.proto src/proto/gen/schema.ts"
   }
 }

package/src/echo.ts

@@ -3,11 +3,13 @@
 //
 
 import type { MulticastObservable } from '@dxos/async';
-import type { TypeCollection } from '@dxos/echo-schema';
+import type { FilterSource, Query } from '@dxos/echo-db';
 import type { PublicKey } from '@dxos/keys';
 import type { Invitation } from '@dxos/protocols/proto/dxos/client/services';
+import type { QueryOptions } from '@dxos/protocols/proto/dxos/echo/filter';
 
 import type { AuthenticatingInvitation } from './invitations';
+import type { PropertiesProps } from './schema';
 import type { Space } from './space';
 
 // Space properties key for default metadata.
@@ -45,7 +47,7 @@ export interface Echo extends MulticastObservable<Space[]> {
   /**
    * Creates a new space.
    */
-  create(): Promise<Space>;
+  create(meta?: PropertiesProps): Promise<Space>;
 
   /**
    * Creates a space from the given snapshot.
@@ -58,8 +60,9 @@ export interface Echo extends MulticastObservable<Space[]> {
   join(invitation: Invitation | string): AuthenticatingInvitation;
 
   /**
-   * Adds a schema to ECHO.
+   * Query all spaces.
+   * @param filter
+   * @param options
    */
-  // TODO(dmaretskyi): Rename `addTypes`.
-  addSchema(schema: TypeCollection): void;
+  query<T extends {} = any>(filter?: FilterSource<T>, options?: QueryOptions): Query<T>;
 }

package/src/halo.ts

@@ -2,9 +2,15 @@
 // Copyright 2021 DXOS.org
 //
 
-import { type MulticastObservable } from '@dxos/async';
+import { type ObservableProvider, type MulticastObservable } from '@dxos/async';
+import { type PublicKey } from '@dxos/keys';
 import { type Contact, type Device, type Identity, type Invitation } from '@dxos/protocols/proto/dxos/client/services';
-import { type ProfileDocument } from '@dxos/protocols/proto/dxos/halo/credentials';
+import {
+  type DeviceProfileDocument,
+  type Credential,
+  type Presentation,
+  type ProfileDocument,
+} from '@dxos/protocols/proto/dxos/halo/credentials';
 
 import { type AuthenticatingInvitation, type CancellableInvitation } from './invitations';
 
@@ -18,10 +24,21 @@ export interface Halo {
   get contacts(): MulticastObservable<Contact[]>;
   get invitations(): MulticastObservable<CancellableInvitation[]>;
 
-  createIdentity(options?: ProfileDocument): Promise<Identity>;
+  createIdentity(options?: ProfileDocument, deviceProfile?: DeviceProfileDocument): Promise<Identity>;
   recoverIdentity(recoveryKey: Uint8Array): Promise<Identity>;
   updateProfile(profile: ProfileDocument): Promise<Identity>;
 
-  share(): CancellableInvitation;
-  join(invitation: Invitation): AuthenticatingInvitation;
+  share(options?: Partial<Invitation>): CancellableInvitation;
+  join(invitation: Invitation, deviceProfile?: DeviceProfileDocument): AuthenticatingInvitation;
+
+  // TODO(wittjosiah): Migrate to multicast observable.
+  queryCredentials(options?: {
+    ids?: PublicKey[];
+    type?: string;
+  }): ObservableProvider<
+    { onUpdate: (credentials: Credential[]) => void; onError: (error?: Error) => void },
+    Credential[]
+  >;
+  writeCredentials(credentials: Credential[]): Promise<void>;
+  presentCredentials(options: { ids: PublicKey[]; nonce?: Uint8Array }): Promise<Presentation>;
 }

package/src/index.ts

@@ -6,9 +6,9 @@ export * from './config';
 export * from './echo';
 export * from './halo';
 export * from './invitations';
-export * from './proto';
 export * from './service-definitions';
 export * from './shell';
 export * from './space';
 export * from './timeouts';
 export * from './schema';
+// This comment is here to bust NX cache. Remove it after the code changes.

package/src/invitations/encoder.test.ts

@@ -10,42 +10,48 @@ import { describe, test } from '@dxos/test';
 
 import { InvitationEncoder } from './encoder';
 
+const baseInvitation: Invitation = {
+  invitationId: PublicKey.random().toHex(),
+  type: Invitation.Type.INTERACTIVE,
+  kind: Invitation.Kind.SPACE,
+  authMethod: Invitation.AuthMethod.NONE,
+  state: Invitation.State.INIT,
+  swarmKey: PublicKey.random(),
+  spaceKey: PublicKey.random(),
+};
+
 describe('Invitation utils', () => {
   test('encodes and decodes an invitation', () => {
-    const invitation: Invitation = {
-      invitationId: PublicKey.random().toHex(),
-      type: Invitation.Type.INTERACTIVE,
-      kind: Invitation.Kind.SPACE,
-      authMethod: Invitation.AuthMethod.NONE,
-      state: Invitation.State.INIT,
-      swarmKey: PublicKey.random(),
-      spaceKey: PublicKey.random(),
-    };
-
-    const encoded = InvitationEncoder.encode(invitation);
+    const encoded = InvitationEncoder.encode(baseInvitation);
     const decoded = InvitationEncoder.decode(encoded);
-    expect(decoded).to.deep.eq(invitation);
+    expect(decoded).to.deep.eq(baseInvitation);
   });
 
   test('secrets are never encoded into invitation code', () => {
-    const invitation: Invitation = {
-      invitationId: PublicKey.random().toHex(),
-      type: Invitation.Type.INTERACTIVE,
-      kind: Invitation.Kind.SPACE,
-      authMethod: Invitation.AuthMethod.NONE,
-      state: Invitation.State.INIT,
-      swarmKey: PublicKey.random(),
-      spaceKey: PublicKey.random(),
-    };
-
     const encoded = InvitationEncoder.encode({
-      ...invitation,
+      ...baseInvitation,
       authCode: 'example',
       identityKey: PublicKey.random(),
     });
     const decoded = InvitationEncoder.decode(encoded);
     expect(decoded.authCode).to.not.exist;
     expect(decoded.identityKey).to.not.exist;
+    expect(decoded).to.deep.eq(baseInvitation);
+  });
+
+  test('guestKeypair for known public key auth method is encoded', () => {
+    const invitation: Invitation = {
+      ...baseInvitation,
+      guestKeypair: {
+        publicKey: PublicKey.random(),
+        privateKey: PublicKey.random().asBuffer(),
+      },
+    };
+
+    const encoded = InvitationEncoder.encode(invitation);
+    const decoded = InvitationEncoder.decode(encoded);
+    expect(decoded.authCode).to.not.exist;
+    expect(decoded.identityKey).to.not.exist;
     expect(decoded).to.deep.eq(invitation);
   });
 });

package/src/invitations/encoder.ts

@@ -5,7 +5,7 @@
 import base from 'base-x';
 
 import { schema } from '@dxos/protocols';
-import { type Invitation } from '@dxos/protocols/proto/dxos/client/services';
+import { Invitation } from '@dxos/protocols/proto/dxos/client/services';
 
 // Encode with URL-safe alpha-numeric characters.
 const base62 = base('0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ');
@@ -17,7 +17,12 @@ const codec = schema.getCodecForType('dxos.client.services.Invitation');
  */
 export class InvitationEncoder {
   static decode(text: string): Invitation {
-    return codec.decode(base62.decode(text));
+    const decodedInvitation = codec.decode(base62.decode(text));
+    if (decodedInvitation.type === Invitation.Type.MULTIUSE) {
+      decodedInvitation.type = Invitation.Type.INTERACTIVE;
+      decodedInvitation.multiUse = true;
+    }
+    return decodedInvitation;
   }
 
   static encode(invitation: Invitation): string {
@@ -30,6 +35,7 @@ export class InvitationEncoder {
         swarmKey: invitation.swarmKey,
         state: invitation.state,
         timeout: invitation.timeout,
+        guestKeypair: invitation.guestKeypair,
         // TODO(wittjosiah): Make these optional to encode for greater privacy.
         ...(invitation.spaceKey ? { spaceKey: invitation.spaceKey } : {}),
         ...(invitation.target ? { target: invitation.target } : {}),

package/src/schema.ts

@@ -2,14 +2,14 @@
 // Copyright 2024 DXOS.org
 //
 
-import * as S from '@effect/schema/Schema';
+import { echoObject, S } from '@dxos/echo-schema';
 
-import * as E from '@dxos/echo-schema';
+const _Properties = S.struct({ name: S.optional(S.string) }, { key: S.string, value: S.any }).pipe(
+  echoObject('dxos.sdk.client.Properties', '0.1.0'),
+);
+export interface Properties extends S.Schema.Type<typeof _Properties> {}
+export const Properties = _Properties;
 
-export const PropertiesSchema = S.struct({
-  name: S.optional(S.string),
-  // TODO(dmaretskyi): Remove.
-  'composer.dxos.org.opened': S.optional(S.number),
-  'composer.dxos.org.version': S.optional(S.union(S.string, S.number)),
-  'braneframe.Folder': S.optional(E.ref(E.AnyEchoObject)),
-}).pipe(E.echoObject('dxos.sdk.client.Properties', '0.1.0'));
+export type PropertiesProps = {
+  name?: string;
+};

package/src/service-definitions.ts

@@ -7,7 +7,6 @@ import { type Context } from '@dxos/context';
 import { schema } from '@dxos/protocols';
 import { type FunctionRegistryService } from '@dxos/protocols/proto/dxos/agent/functions';
 import {
-  type IndexService,
   type DevicesService,
   type IdentityService,
   type InvitationsService,
@@ -17,6 +16,7 @@ import {
   type SystemService,
 } from '@dxos/protocols/proto/dxos/client/services';
 import { type DevtoolsHost } from '@dxos/protocols/proto/dxos/devtools/host';
+import { type QueryService } from '@dxos/protocols/proto/dxos/echo/query';
 import { type DataService } from '@dxos/protocols/proto/dxos/echo/service';
 import type { AppService, ShellService, WorkerService } from '@dxos/protocols/proto/dxos/iframe';
 import type { BridgeService } from '@dxos/protocols/proto/dxos/mesh/bridge';
@@ -34,7 +34,7 @@ export type ClientServices = {
 
   IdentityService: IdentityService;
   InvitationsService: InvitationsService;
-  IndexService: IndexService;
+  QueryService: QueryService;
   DevicesService: DevicesService;
   SpacesService: SpacesService;
   DataService: DataService;
@@ -73,7 +73,7 @@ export const clientServiceBundle = createServiceBundle<ClientServices>({
   LoggingService: schema.getService('dxos.client.services.LoggingService'),
 
   IdentityService: schema.getService('dxos.client.services.IdentityService'),
-  IndexService: schema.getService('dxos.client.services.IndexService'),
+  QueryService: schema.getService('dxos.echo.query.QueryService'),
   InvitationsService: schema.getService('dxos.client.services.InvitationsService'),
   DevicesService: schema.getService('dxos.client.services.DevicesService'),
   SpacesService: schema.getService('dxos.client.services.SpacesService'),

package/src/space.ts

@@ -3,7 +3,8 @@
 //
 
 import { type MulticastObservable, type UnsubscribeCallback } from '@dxos/async';
-import { type EchoDatabase, type TypedObject } from '@dxos/echo-schema';
+import { type EchoDatabase } from '@dxos/echo-db';
+import { type EchoReactiveObject } from '@dxos/echo-schema';
 import { type PublicKey } from '@dxos/keys';
 import {
   type Invitation,
@@ -17,11 +18,6 @@ import { type GossipMessage } from '@dxos/protocols/proto/dxos/mesh/teleport/gos
 import { type CancellableInvitation } from './invitations';
 
 export interface SpaceInternal {
-  /**
-   * @deprecated
-   */
-  get db(): never;
-
   get data(): SpaceData;
 
   /**
@@ -56,7 +52,7 @@ export interface Space {
   /**
    * Properties object.
    */
-  get properties(): TypedObject;
+  get properties(): EchoReactiveObject<any>;
 
   /**
    * Current state of the space.
@@ -73,6 +69,10 @@ export interface Space {
   get invitations(): MulticastObservable<CancellableInvitation[]>;
   get members(): MulticastObservable<SpaceMember[]>;
 
+  /**
+   * @deprecated
+   */
+  // TODO(wittjosiah): Remove. This should not be exposed.
   get internal(): SpaceInternal;
 
   open(): Promise<void>;

package/dist/types/src/proto/gen/schema.d.ts

@@ -1,15 +0,0 @@
-/**
- * @generated @dxos/echo-typegen src/proto/schema.proto
- **/
-import * as dxos_echo_schema from "@dxos/echo-schema";
-export declare const types: dxos_echo_schema.TypeCollection;
-export type PropertiesProps = {
-    name: string;
-};
-export declare class Properties extends dxos_echo_schema.TypedObject<PropertiesProps> {
-    static readonly schema: dxos_echo_schema.Schema;
-    static filter(filter?: Partial<PropertiesProps> | dxos_echo_schema.OperatorFilter<Properties>): dxos_echo_schema.Filter<Properties>;
-    constructor(initValues?: Partial<PropertiesProps>, opts?: dxos_echo_schema.TypedObjectOptions);
-    name: string;
-}
-//# sourceMappingURL=schema.d.ts.map

package/dist/types/src/proto/gen/schema.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../../../src/proto/gen/schema.ts"],"names":[],"mappings":"AAAA;;IAEI;AAEJ,OAAO,KAAK,gBAAgB,MAAM,mBAAmB,CAAC;AAEtD,eAAO,MAAM,KAAK,iCAAwC,CAAC;AAE3D,MAAM,MAAM,eAAe,GAAG;IAC5B,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,qBAAa,UAAW,SAAQ,gBAAgB,CAAC,WAAW,CAAC,eAAe,CAAC;IAC3E,gBAAwB,MAAM,EAAE,gBAAgB,CAAC,MAAM,CAAC;IAExD,MAAM,CAAC,MAAM,CACX,MAAM,CAAC,EACH,OAAO,CAAC,eAAe,CAAC,GACxB,gBAAgB,CAAC,cAAc,CAAC,UAAU,CAAC,GAC9C,gBAAgB,CAAC,MAAM,CAAC,UAAU,CAAC;gBAQpC,UAAU,CAAC,EAAE,OAAO,CAAC,eAAe,CAAC,EACrC,IAAI,CAAC,EAAE,gBAAgB,CAAC,kBAAkB;IAIpC,IAAI,EAAE,MAAM,CAAC;CACtB"}

package/dist/types/src/proto/index.d.ts

@@ -1,2 +0,0 @@
-export * from './gen/schema';
-//# sourceMappingURL=index.d.ts.map

package/dist/types/src/proto/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/proto/index.ts"],"names":[],"mappings":"AAIA,cAAc,cAAc,CAAC"}