@dxos/client 2.33.9-dev.d0ae5f95 → 2.33.9-dev.d0dce35f

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

@@ -0,0 +1,14 @@
+export * as proto from './gen';
+export { schema } from './gen';
+export * from './gen/dxos/client';
+export * from './gen/dxos/config';
+export * from './gen/dxos/credentials';
+export * from './gen/dxos/echo/feed';
+export * from './gen/dxos/echo/invitation';
+export * from './gen/dxos/echo/service';
+export * from './gen/dxos/echo/snapshot';
+export * from './gen/dxos/echo/timeframe';
+export * from './gen/dxos/devtools';
+export * from './gen/dxos/halo/keys';
+export * from './gen/dxos/rpc';
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/packlets/proto/index.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AAC/B,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAClC,cAAc,wBAAwB,CAAC;AACvC,cAAc,sBAAsB,CAAC;AACrC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,yBAAyB,CAAC;AACxC,cAAc,0BAA0B,CAAC;AACzC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,qBAAqB,CAAC;AACpC,cAAc,sBAAsB,CAAC;AACrC,cAAc,gBAAgB,CAAC"}

package/dist/src/{proto → packlets/proto}/index.js

@@ -29,7 +29,19 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.proto = void 0;
+exports.schema = exports.proto = void 0;
 exports.proto = __importStar(require("./gen"));
+var gen_1 = require("./gen");
+Object.defineProperty(exports, "schema", { enumerable: true, get: function () { return gen_1.schema; } });
+__exportStar(require("./gen/dxos/client"), exports);
+__exportStar(require("./gen/dxos/config"), exports);
+__exportStar(require("./gen/dxos/credentials"), exports);
+__exportStar(require("./gen/dxos/echo/feed"), exports);
+__exportStar(require("./gen/dxos/echo/invitation"), exports);
+__exportStar(require("./gen/dxos/echo/service"), exports);
+__exportStar(require("./gen/dxos/echo/snapshot"), exports);
+__exportStar(require("./gen/dxos/echo/timeframe"), exports);
+__exportStar(require("./gen/dxos/devtools"), exports);
 __exportStar(require("./gen/dxos/halo/keys"), exports);
+__exportStar(require("./gen/dxos/rpc"), exports);
 //# sourceMappingURL=index.js.map

package/dist/src/packlets/proto/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/packlets/proto/index.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEF,+CAA+B;AAC/B,6BAA+B;AAAtB,6FAAA,MAAM,OAAA;AACf,oDAAkC;AAClC,oDAAkC;AAClC,yDAAuC;AACvC,uDAAqC;AACrC,6DAA2C;AAC3C,0DAAwC;AACxC,2DAAyC;AACzC,4DAA0C;AAC1C,sDAAoC;AACpC,uDAAqC;AACrC,iDAA+B"}

package/dist/src/packlets/proto/substitutions.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"substitutions.d.ts","sourceRoot":"","sources":["../../../../src/packlets/proto/substitutions.ts"],"names":[],"mappings":";AAKA,OAAO,EAAS,OAAO,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;;;sBAW3C,OAAO;;;sBACP,GAAG,KAAG,OAAO;;;wBAGX,eAAe;;;wBACf,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAbvB,wBAeE"}

package/dist/src/packlets/proto/substitutions.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"substitutions.js","sourceRoot":"","sources":["../../../../src/packlets/proto/substitutions.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;AAEF,yDAAgF;AAChF,mDAAmD;AAEnD,+CAAiF;AAEjF,kBAAe;IACb,GAAG,uCAAsB;IACzB,GAAG,kCAAsB;IACzB,GAAG,kCAAsB;IACzB,GAAG,iCAAgB;IAEnB,oEAAoE;IACpE,mCAAmC,EAAE;QACnC,MAAM,EAAE,CAAC,GAAY,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,mBAAK,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC;QACvD,MAAM,EAAE,CAAC,GAAQ,EAAW,EAAE,CAAC,mBAAK,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC;KACtD;IACD,0EAA0E,EAAE;QAC1E,MAAM,EAAE,CAAC,KAAsB,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC;QACrE,MAAM,EAAE,CAAC,KAAU,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAoB;KAClE;CACF,CAAC"}

package/dist/src/{api/client.d.ts → packlets/proxy/client-proxy.d.ts}

@@ -2,8 +2,7 @@ import { Config, ConfigObject } from '@dxos/config';
 import { OpenProgress } from '@dxos/echo-db';
 import { ModelConstructor } from '@dxos/model-factory';
 import { RpcPort } from '@dxos/rpc';
-import { ClientServices, HaloSigner } from '../services';
-import { Echo, Halo } from './proxies';
+import { ClientServiceProvider, ClientServices, Echo, Halo, HaloSigner } from '../api';
 export declare const defaultConfig: ConfigObject;
 export declare const defaultTestingConfig: ConfigObject;
 export interface ClientOptions {
@@ -11,6 +10,10 @@ export interface ClientOptions {
      * Only used when remote=true.
      */
     rpcPort?: RpcPort;
+    /**
+     *
+     */
+    serviceProvider?: ClientServiceProvider;
     /**
      *
      */
@@ -20,10 +23,6 @@ export interface ClientOptions {
      */
     timeout?: number;
 }
-/**
- * The main DXOS client API.
- * An entrypoint to ECHO, HALO, MESH, and DXNS.
- */
 export declare class Client {
     readonly version = "2.33.8";
     private readonly _config;
@@ -39,7 +38,7 @@ export declare class Client {
      */
     constructor(config?: ConfigObject | Config, options?: ClientOptions);
     toString(): string;
-    info(): {
+    get info(): {
         initialized: boolean;
         echo: {
             parties: number;
@@ -62,10 +61,6 @@ export declare class Client {
      * HALO credentials.
      */
     get halo(): Halo;
-    /**
-     * Returns true if client is connected to a remote services protvider.
-     */
-    get isRemote(): boolean;
     /**
      * Client services that can be proxied.
      */
@@ -75,9 +70,6 @@ export declare class Client {
      * Required before using the Client instance.
      */
     initialize(onProgressCallback?: (progress: OpenProgress) => void): Promise<void>;
-    private initializeRemote;
-    private initializeLocal;
-    private initializeAuto;
     /**
      * Cleanup, release resources.
      */
@@ -93,4 +85,4 @@ export declare class Client {
      */
     registerModel(constructor: ModelConstructor<any>): this;
 }
-//# sourceMappingURL=client.d.ts.map
+//# sourceMappingURL=client-proxy.d.ts.map

package/dist/src/packlets/proxy/client-proxy.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"client-proxy.d.ts","sourceRoot":"","sources":["../../../../src/packlets/proxy/client-proxy.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAEpD,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAA6B,qBAAqB,EAAE,cAAc,EAAE,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAelH,eAAO,MAAM,aAAa,EAAE,YAA6B,CAAC;AAE1D,eAAO,MAAM,oBAAoB,EAAE,YASlC,CAAC;AAEF,MAAM,WAAW,aAAa;IAC5B;;OAEG;IACH,OAAO,CAAC,EAAE,OAAO,CAAA;IAEjB;;OAEG;IACH,eAAe,CAAC,EAAE,qBAAqB,CAAA;IAEvC;;OAEG;IACH,MAAM,CAAC,EAAE,UAAU,CAAA;IAEnB;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB;AAED,qBAAa,MAAM;IACjB,SAAgB,OAAO,YAAgB;IAEvC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IACjC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAgB;IACzC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAsB;IAE5C,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,gBAAgB,CAAyB;IACjD,OAAO,CAAC,KAAK,CAAa;IAC1B,OAAO,CAAC,KAAK,CAAa;IAI1B;;;OAGG;gBAEU,MAAM,GAAE,YAAY,GAAG,MAAsB,EAAE,OAAO,GAAE,aAAkB;IAoBvF,QAAQ;IAIR,IAAI,IAAI;;;;;;;;MAMP;IAED,IAAI,MAAM,IAAK,MAAM,CAEpB;IAED;;;OAGG;IACH,IAAI,WAAW,YAEd;IAED;;OAEG;IACH,IAAI,IAAI,IAAK,IAAI,CAGhB;IAED;;OAEG;IACH,IAAI,IAAI,IAAK,IAAI,CAGhB;IAID;;OAEG;IAEH,IAAI,QAAQ,IAAK,cAAc,CAE9B;IAED;;;OAGG;IAEG,UAAU,CAAE,kBAAkB,CAAC,EAAE,CAAC,QAAQ,EAAE,YAAY,KAAK,IAAI;IAoCvE;;OAEG;IAEG,OAAO;IAYb;;;OAGG;IAIG,KAAK;IAMX;;;OAGG;IAEH,aAAa,CAAE,WAAW,EAAE,gBAAgB,CAAC,GAAG,CAAC,GAAG,IAAI;CAIzD"}

package/dist/src/{api/client.js → packlets/proxy/client-proxy.js}

@@ -1,6 +1,6 @@
 "use strict";
 //
-// Copyright 2020 DXOS.org
+// Copyright 2022 DXOS.org
 //
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
@@ -18,14 +18,17 @@ const node_assert_1 = __importDefault(require("node:assert"));
 const async_1 = require("@dxos/async");
 const config_1 = require("@dxos/config");
 const debug_2 = require("@dxos/debug");
-const devtools_1 = require("../devtools");
-const config_2 = require("../proto/gen/dxos/config");
-const services_1 = require("../services");
-const util_1 = require("../util");
-const version_1 = require("../version");
-const errors_1 = require("./errors");
-const proxies_1 = require("./proxies");
-const log = (0, debug_1.default)('dxos:client');
+const api_1 = require("../api");
+const proto_1 = require("../proto");
+const devtools_1 = require("./devtools");
+const echo_proxy_1 = require("./echo-proxy");
+const halo_proxy_1 = require("./halo-proxy");
+const service_proxy_1 = require("./service-proxy");
+const singleton_port_1 = require("./singleton-port");
+const version_1 = require("./version");
+const log = (0, debug_1.default)('dxos:client-proxy');
+// TODO(wittjosiah): Should be kube.local or equivalent.
+const DEFAULT_SINGLETON_HOST = 'http://localhost:8080';
 const EXPECTED_CONFIG_VERSION = 1;
 exports.defaultConfig = { version: 1 };
 exports.defaultTestingConfig = {
@@ -33,15 +36,11 @@ exports.defaultTestingConfig = {
     runtime: {
         services: {
             signal: {
-                server: 'ws://localhost:4000'
+                server: 'ws://localhost:4000/.well-known/dx/signal'
             }
         }
     }
 };
-/**
- * The main DXOS client API.
- * An entrypoint to ECHO, HALO, MESH, and DXNS.
- */
 class Client {
     // TODO(burdon): Expose some kind of stable ID (e.g., from HALO).
     /**
@@ -58,21 +57,21 @@ class Client {
         this._config = (config instanceof config_1.Config) ? config : new config_1.Config(config);
         this._options = options;
         if (Object.keys(this._config.values).length > 0 && this._config.values.version !== EXPECTED_CONFIG_VERSION) {
-            throw new errors_1.InvalidConfigurationError(`Invalid config version: ${this._config.values.version} !== ${EXPECTED_CONFIG_VERSION}]`);
+            throw new api_1.InvalidConfigurationError(`Invalid config version: ${this._config.values.version} !== ${EXPECTED_CONFIG_VERSION}]`);
         }
         // TODO(burdon): Library should not set app-level globals.
         // debug.enable(this._config.values.runtime?.client?.debug ?? process.env.DEBUG ?? 'dxos:*:error');
-        this._mode = this._config.get('runtime.client.mode', config_2.Runtime.Client.Mode.AUTOMATIC);
-        log(`mode=${config_2.Runtime.Client.Mode[this._mode]}`);
+        this._mode = this._config.get('runtime.client.mode', proto_1.Runtime.Client.Mode.AUTOMATIC);
+        log(`mode=${proto_1.Runtime.Client.Mode[this._mode]}`);
     }
     toString() {
-        return `Client(${JSON.stringify(this.info())})`;
+        return `Client(${JSON.stringify(this.info)})`;
     }
-    info() {
+    get info() {
         return {
             initialized: this.initialized,
-            echo: this.echo.info(),
-            halo: this.halo.info()
+            echo: this.echo.info,
+            halo: this.halo.info
         };
     }
     get config() {
@@ -100,12 +99,6 @@ class Client {
         return this._halo;
     }
     // TODO(burdon): Expose mesh for messaging?
-    /**
-     * Returns true if client is connected to a remote services protvider.
-     */
-    get isRemote() {
-        return this._serviceProvider instanceof services_1.ClientServiceProxy;
-    }
     /**
      * Client services that can be proxied.
      */
@@ -118,6 +111,7 @@ class Client {
      * Required before using the Client instance.
      */
     async initialize(onProgressCallback) {
+        var _a, _b;
         if (this._initialized) {
             return;
         }
@@ -126,58 +120,24 @@ class Client {
             // TODO(burdon): Tie to global error handling (or event).
             throw new debug_2.TimeoutError(`Initialize timed out after ${t}s.`);
         }, t * 1000);
-        if (this._mode === config_2.Runtime.Client.Mode.REMOTE) {
-            await this.initializeRemote(onProgressCallback);
-        }
-        else if (this._mode === config_2.Runtime.Client.Mode.LOCAL) {
-            await this.initializeLocal(onProgressCallback);
+        if (this._options.serviceProvider) {
+            this._serviceProvider = this._options.serviceProvider;
         }
         else {
-            await this.initializeAuto(onProgressCallback);
+            const singletonSource = (_a = this._config.get('runtime.client.singletonSource')) !== null && _a !== void 0 ? _a : DEFAULT_SINGLETON_HOST;
+            this._serviceProvider = new service_proxy_1.ClientServiceProxy((_b = this._options.rpcPort) !== null && _b !== void 0 ? _b : await (0, singleton_port_1.createSingletonPort)(singletonSource), this._options.timeout);
         }
+        this._halo = new halo_proxy_1.HaloProxy(this._serviceProvider);
+        this._echo = new echo_proxy_1.EchoProxy(this._serviceProvider, this._halo);
+        await this._serviceProvider.open(onProgressCallback);
+        await this._halo._open();
+        await this._echo._open();
         if (typeof window !== 'undefined') {
             await (0, devtools_1.createDevtoolsRpcServer)(this, this._serviceProvider);
         }
-        this._halo = new proxies_1.HaloProxy(this._serviceProvider);
-        this._echo = new proxies_1.EchoProxy(this._serviceProvider, this._halo);
-        await this._halo._open();
-        await this._echo._open();
         this._initialized = true; // TODO(burdon): Initialized === halo.initialized?
         clearInterval(timeout);
     }
-    async initializeRemote(onProgressCallback) {
-        var _a;
-        if (!this._options.rpcPort && (0, util_1.isNode)()) {
-            throw new Error('RPC port is required to run client in remote mode on Node environment.');
-        }
-        log('Creating client proxy.');
-        this._serviceProvider = new services_1.ClientServiceProxy((_a = this._options.rpcPort) !== null && _a !== void 0 ? _a : (0, util_1.createWindowMessagePort)(), this._options.timeout);
-        await this._serviceProvider.open(onProgressCallback);
-    }
-    async initializeLocal(onProgressCallback) {
-        log('Creating client host.');
-        this._serviceProvider = new services_1.ClientServiceHost(this._config, this._options);
-        await this._serviceProvider.open(onProgressCallback);
-    }
-    async initializeAuto(onProgressCallback) {
-        if (!this._options.rpcPort && (0, util_1.isNode)()) {
-            await this.initializeLocal(onProgressCallback);
-        }
-        else {
-            try {
-                await this.initializeRemote(onProgressCallback);
-            }
-            catch (error) {
-                if (error instanceof errors_1.RemoteServiceConnectionTimeout) {
-                    log('Failed to connect to remote services. Starting local services.');
-                    await this.initializeLocal(onProgressCallback);
-                }
-                else {
-                    throw error;
-                }
-            }
-        }
-    }
     /**
      * Cleanup, release resources.
      */
@@ -221,4 +181,4 @@ __decorate([
     async_1.synchronized
 ], Client.prototype, "reset", null);
 exports.Client = Client;
-//# sourceMappingURL=client.js.map
+//# sourceMappingURL=client-proxy.js.map

package/dist/src/packlets/proxy/client-proxy.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"client-proxy.js","sourceRoot":"","sources":["../../../../src/packlets/proxy/client-proxy.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;;;;;;;AAEF,kDAA0B;AAC1B,8DAAiC;AAEjC,uCAA2C;AAC3C,yCAAoD;AACpD,uCAAkE;AAKlE,gCAAkH;AAClH,oCAAmC;AACnC,yCAAqD;AACrD,6CAAyC;AACzC,6CAAyC;AACzC,mDAAqD;AACrD,qDAAuD;AACvD,uCAAyC;AAEzC,MAAM,GAAG,GAAG,IAAA,eAAK,EAAC,mBAAmB,CAAC,CAAC;AAEvC,wDAAwD;AACxD,MAAM,sBAAsB,GAAG,uBAAuB,CAAC;AACvD,MAAM,uBAAuB,GAAG,CAAC,CAAC;AAErB,QAAA,aAAa,GAAiB,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC;AAE7C,QAAA,oBAAoB,GAAiB;IAChD,OAAO,EAAE,CAAC;IACV,OAAO,EAAE;QACP,QAAQ,EAAE;YACR,MAAM,EAAE;gBACN,MAAM,EAAE,2CAA2C;aACpD;SACF;KACF;CACF,CAAC;AAwBF,MAAa,MAAM;IAYjB,iEAAiE;IAEjE;;;OAGG;IACH,yDAAyD;IACzD,YAAa,SAAgC,qBAAa,EAAE,UAAyB,EAAE;QAlBvE,YAAO,GAAG,sBAAY,CAAC;QAM/B,iBAAY,GAAG,KAAK,CAAC;QAa3B,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,IAAI,IAAI,EAAE;YAChD,MAAM,IAAI,6BAAqB,CAAC,iBAAiB,CAAC,CAAC;SACpD;QAED,IAAI,CAAC,OAAO,GAAG,CAAC,MAAM,YAAY,eAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,eAAM,CAAC,MAAM,CAAC,CAAC;QACxE,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;QAExB,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,GAAG,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,KAAK,uBAAuB,EAAE;YAC1G,MAAM,IAAI,+BAAyB,CACjC,2BAA2B,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,QAAQ,uBAAuB,GAAG,CAAC,CAAC;SAC7F;QAED,0DAA0D;QAC1D,mGAAmG;QAEnG,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,qBAAqB,EAAE,eAAO,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAE,CAAC;QACrF,GAAG,CAAC,QAAQ,eAAO,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IACjD,CAAC;IAED,QAAQ;QACN,OAAO,UAAU,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC;IAChD,CAAC;IAED,IAAI,IAAI;QACN,OAAO;YACL,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI;YACpB,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI;SACrB,CAAC;IACJ,CAAC;IAED,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IAED;;;OAGG;IACH,IAAI,WAAW;QACb,OAAO,IAAI,CAAC,YAAY,CAAC;IAC3B,CAAC;IAED;;OAEG;IACH,IAAI,IAAI;QACN,IAAA,qBAAM,EAAC,IAAI,CAAC,KAAK,EAAE,yBAAyB,CAAC,CAAC;QAC9C,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAED;;OAEG;IACH,IAAI,IAAI;QACN,IAAA,qBAAM,EAAC,IAAI,CAAC,KAAK,EAAE,yBAAyB,CAAC,CAAC;QAC9C,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAED,2CAA2C;IAE3C;;OAEG;IACH,iCAAiC;IACjC,IAAI,QAAQ;QACV,OAAO,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC;IACxC,CAAC;IAED;;;OAGG;IAEH,KAAK,CAAC,UAAU,CAAE,kBAAqD;;QACrE,IAAI,IAAI,CAAC,YAAY,EAAE;YACrB,OAAO;SACR;QAED,MAAM,CAAC,GAAG,EAAE,CAAC;QACb,MAAM,OAAO,GAAG,UAAU,CAAC,GAAG,EAAE;YAC9B,yDAAyD;YACzD,MAAM,IAAI,oBAAY,CAAC,8BAA8B,CAAC,IAAI,CAAC,CAAC;QAC9D,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC;QAEb,IAAI,IAAI,CAAC,QAAQ,CAAC,eAAe,EAAE;YACjC,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC;SACvD;aAAM;YACL,MAAM,eAAe,GAAG,MAAA,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,gCAAgC,CAAC,mCAAI,sBAAsB,CAAC;YACrG,IAAI,CAAC,gBAAgB,GAAG,IAAI,kCAAkB,CAC5C,MAAA,IAAI,CAAC,QAAQ,CAAC,OAAO,mCAAI,MAAM,IAAA,oCAAmB,EAAC,eAAe,CAAC,EACnE,IAAI,CAAC,QAAQ,CAAC,OAAO,CACtB,CAAC;SACH;QAED,IAAI,CAAC,KAAK,GAAG,IAAI,sBAAS,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;QAClD,IAAI,CAAC,KAAK,GAAG,IAAI,sBAAS,CAAC,IAAI,CAAC,gBAAgB,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;QAE9D,MAAM,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;QACrD,MAAM,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;QACzB,MAAM,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;QAEzB,IAAI,OAAO,MAAM,KAAK,WAAW,EAAE;YACjC,MAAM,IAAA,kCAAuB,EAAC,IAAI,EAAE,IAAI,CAAC,gBAAgB,CAAC,CAAC;SAC5D;QAED,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,CAAC,kDAAkD;QAC5E,aAAa,CAAC,OAAO,CAAC,CAAC;IACzB,CAAC;IAED;;OAEG;IAEH,KAAK,CAAC,OAAO;QACX,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;QAC1B,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;QAEpB,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE;YACtB,OAAO;SACR;QAED,MAAM,IAAI,CAAC,gBAAgB,CAAC,KAAK,EAAE,CAAC;QACpC,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC;IAC5B,CAAC;IAED;;;OAGG;IACH,yEAAyE;IACzE,uDAAuD;IAEvD,KAAK,CAAC,KAAK;QACT,MAAM,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,KAAK,EAAE,CAAC;QAC1C,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,IAAI,EAAE,CAAC;QACjC,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC;IAC5B,CAAC;IAED;;;OAGG;IACH,wCAAwC;IACxC,aAAa,CAAE,WAAkC;QAC/C,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;QACnD,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AA1EC;IADC,oBAAY;wCAmCZ;AAMD;IADC,oBAAY;qCAWZ;AASD;IADC,oBAAY;mCAKZ;AA7JH,wBAwKC"}

package/dist/src/packlets/proxy/devtools.d.ts

@@ -0,0 +1,11 @@
+import { ClientServiceProvider } from '../api';
+import { Client } from './client-proxy';
+/**
+ * A hook bound to window.__DXOS__.
+ */
+export interface DevtoolsHook {
+    client: Client;
+    openClientRpcServer: () => Promise<boolean>;
+}
+export declare const createDevtoolsRpcServer: (client: Client, serviceHost: ClientServiceProvider) => Promise<void>;
+//# sourceMappingURL=devtools.d.ts.map

package/dist/src/packlets/proxy/devtools.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"devtools.d.ts","sourceRoot":"","sources":["../../../../src/packlets/proxy/devtools.ts"],"names":[],"mappings":"AAQA,OAAO,EAAuB,qBAAqB,EAAE,MAAM,QAAQ,CAAC;AACpE,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAKxC;;GAEG;AACH,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,MAAM,CAAA;IACd,mBAAmB,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,CAAA;CAC5C;AAgCD,eAAO,MAAM,uBAAuB,WAAkB,MAAM,eAAe,qBAAqB,kBA0B/F,CAAC"}

package/dist/src/{devtools/devtools-rpc-server.js → packlets/proxy/devtools.js}

@@ -9,7 +9,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createDevtoolsRpcServer = void 0;
 const debug_1 = __importDefault(require("debug"));
 const rpc_1 = require("@dxos/rpc");
-const services_1 = require("../services");
+const api_1 = require("../api");
 const log = (0, debug_1.default)('dxos:client:devtools');
 const error = log.extend('error');
 const port = {
@@ -47,7 +47,7 @@ const createDevtoolsRpcServer = async (client, serviceHost) => {
             }
             log('Opening devtools client RPC server...');
             server = (0, rpc_1.createBundledRpcServer)({
-                services: services_1.clientServiceBundle,
+                services: api_1.clientServiceBundle,
                 handlers: serviceHost.services,
                 port
             });
@@ -61,4 +61,4 @@ const createDevtoolsRpcServer = async (client, serviceHost) => {
     };
 };
 exports.createDevtoolsRpcServer = createDevtoolsRpcServer;
-//# sourceMappingURL=devtools-rpc-server.js.map
+//# sourceMappingURL=devtools.js.map

package/dist/src/packlets/proxy/devtools.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"devtools.js","sourceRoot":"","sources":["../../../../src/packlets/proxy/devtools.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,kDAA0B;AAE1B,mCAAqE;AAErE,gCAAoE;AAGpE,MAAM,GAAG,GAAG,IAAA,eAAK,EAAC,sBAAsB,CAAC,CAAC;AAC1C,MAAM,KAAK,GAAG,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;AAUlC,MAAM,IAAI,GAAY;IACpB,IAAI,EAAE,KAAK,EAAC,OAAO,EAAC,EAAE,CAAC,MAAM,CAAC,WAAW,CAAC;QACxC,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC;QACzB,MAAM,EAAE,aAAa;KACtB,EAAE,GAAG,CAAC;IACP,SAAS,EAAE,QAAQ,CAAC,EAAE;QACpB,MAAM,OAAO,GAAG,CAAC,KAAwB,EAAE,EAAE;YAC3C,IAAI,KAAK,CAAC,MAAM,KAAK,MAAM,EAAE;gBAC3B,OAAO;aACR;YAED,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC;YAC3B,IACE,OAAO,OAAO,KAAK,QAAQ;gBAC3B,OAAO,KAAK,IAAI;gBAChB,OAAO,CAAC,MAAM,KAAK,gBAAgB,EACnC;gBACA,OAAO;aACR;YAED,QAAQ,CAAC,IAAI,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;QACzC,CAAC,CAAC;QAEF,MAAM,CAAC,gBAAgB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC5C,OAAO,GAAG,EAAE,CAAC,MAAM,CAAC,mBAAmB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAC9D,CAAC;CACF,CAAC;AAEF,wBAAwB;AACxB,4BAA4B;AACrB,MAAM,uBAAuB,GAAG,KAAK,EAAE,MAAc,EAAE,WAAkC,EAAE,EAAE;IAClG,IAAI,MAAe,CAAC;IAClB,MAAc,CAAC,QAAyB,GAAG;QAC3C,MAAM;QACN,mBAAmB,EAAE,KAAK,IAAI,EAAE;YAC9B,IAAI,MAAM,EAAE;gBACV,GAAG,CAAC,qCAAqC,CAAC,CAAC;gBAC3C,MAAM,CAAC,KAAK,EAAE,CAAC;aAChB;YAED,GAAG,CAAC,uCAAuC,CAAC,CAAC;YAC7C,MAAM,GAAG,IAAA,4BAAsB,EAAC;gBAC9B,QAAQ,EAAE,yBAAmB;gBAC7B,QAAQ,EAAE,WAAW,CAAC,QAAQ;gBAC9B,IAAI;aACL,CAAC,CAAC;YAEH,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE;gBAC9B,KAAK,CAAC,8BAA8B,GAAG,EAAE,CAAC,CAAC;gBAC3C,OAAO,KAAK,CAAC;YACf,CAAC,CAAC,CAAC;YACH,GAAG,CAAC,oCAAoC,CAAC,CAAC;YAE1C,OAAO,IAAI,CAAC;QACd,CAAC;KACF,CAAC;AACJ,CAAC,CAAC;AA1BW,QAAA,uBAAuB,2BA0BlC"}

package/dist/src/{api/proxies → packlets/proxy}/echo-proxy.d.ts

@@ -1,30 +1,8 @@
 import { InvitationDescriptor, ResultSet } from '@dxos/echo-db';
 import { PartyKey, PartySnapshot } from '@dxos/echo-protocol';
 import { ModelConstructor, ModelFactory } from '@dxos/model-factory';
-import { ClientServiceProvider } from '../../services';
-import { Invitation } from '../invitations';
+import { ClientServiceProvider, Echo, Party, PartyInvitation } from '../api';
 import { HaloProxy } from './halo-proxy';
-import { Party } from './party-proxy';
-export declare class PartyInvitation extends Invitation<Party> {
-    /**
-     * Wait for the invitation flow to complete and return the target party.
-     */
-    getParty(): Promise<Party>;
-}
-/**
- * ECHO API.
- */
-export interface Echo {
-    info(): {
-        parties: number;
-    };
-    registerModel(constructor: ModelConstructor<any>): void;
-    createParty(): Promise<Party>;
-    cloneParty(snapshot: PartySnapshot): Promise<Party>;
-    getParty(partyKey: PartyKey): Party | undefined;
-    queryParties(): ResultSet<Party>;
-    acceptInvitation(invitationDescriptor: InvitationDescriptor): PartyInvitation;
-}
 /**
  * Client proxy to local/remote ECHO service.
  */
@@ -38,8 +16,8 @@ export declare class EchoProxy implements Echo {
     constructor(_serviceProvider: ClientServiceProvider, _haloProxy: HaloProxy);
     toString(): string;
     get modelFactory(): ModelFactory;
-    get networkManager(): import("@dxos/network-manager").NetworkManager;
-    info(): {
+    get networkManager(): any;
+    get info(): {
         parties: number;
     };
     registerModel(constructor: ModelConstructor<any>): this;

package/dist/src/packlets/proxy/echo-proxy.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"echo-proxy.d.ts","sourceRoot":"","sources":["../../../../src/packlets/proxy/echo-proxy.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,oBAAoB,EAAmB,SAAS,EAAE,MAAM,eAAe,CAAC;AACjF,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAC9D,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAKrE,OAAO,EAAE,qBAAqB,EAAE,IAAI,EAAE,KAAK,EAAE,eAAe,EAAE,MAAM,QAAQ,CAAC;AAC7E,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAKzC;;GAEG;AACH,qBAAa,SAAU,YAAW,IAAI;IAOlC,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,UAAU;IAP7B,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAA6D;IACtF,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAe;IAC/C,OAAO,CAAC,QAAQ,CAAC,cAAc,CAA2B;IAC1D,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAe;gBAG1B,gBAAgB,EAAE,qBAAqB,EACvC,UAAU,EAAE,SAAS;IASxC,QAAQ;IAIR,IAAI,YAAY,IAAK,YAAY,CAEhC;IAED,IAAI,cAAc,QAOjB;IAGD,IAAI,IAAI;;MAIP;IAED,aAAa,CAAE,WAAW,EAAE,gBAAgB,CAAC,GAAG,CAAC,GAAG,IAAI;IAiExD;;OAEG;IACG,WAAW,IAAK,OAAO,CAAC,KAAK,CAAC;IAoBpC;;OAEG;IACG,UAAU,CAAE,QAAQ,EAAE,aAAa,GAAG,OAAO,CAAC,KAAK,CAAC;IAoB1D;;OAEG;IACH,QAAQ,CAAE,QAAQ,EAAE,QAAQ,GAAG,KAAK,GAAG,SAAS;IAIhD;;OAEG;IACH,YAAY,IAAK,SAAS,CAAC,KAAK,CAAC;IAIjC;;;;OAIG;IACH,gBAAgB,CAAE,oBAAoB,EAAE,oBAAoB,GAAG,eAAe;CAwB/E"}

package/dist/src/{api/proxies → packlets/proxy}/echo-proxy.js

@@ -6,7 +6,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.EchoProxy = exports.PartyInvitation = void 0;
+exports.EchoProxy = void 0;
 const node_assert_1 = __importDefault(require("node:assert"));
 const async_1 = require("@dxos/async");
 const debug_1 = require("@dxos/debug");
@@ -14,18 +14,10 @@ const echo_db_1 = require("@dxos/echo-db");
 const model_factory_1 = require("@dxos/model-factory");
 const object_model_1 = require("@dxos/object-model");
 const util_1 = require("@dxos/util");
-const services_1 = require("../../services");
-const invitations_1 = require("../invitations");
+const api_1 = require("../api");
+const invitation_proxy_1 = require("./invitation-proxy");
 const party_proxy_1 = require("./party-proxy");
-class PartyInvitation extends invitations_1.Invitation {
-    /**
-     * Wait for the invitation flow to complete and return the target party.
-     */
-    getParty() {
-        return this.wait();
-    }
-}
-exports.PartyInvitation = PartyInvitation;
+const service_proxy_1 = require("./service-proxy");
 /**
  * Client proxy to local/remote ECHO service.
  */
@@ -36,24 +28,26 @@ class EchoProxy {
         this._parties = new util_1.ComplexMap(key => key.toHex());
         this._partiesChanged = new async_1.Event();
         this._subscriptions = new util_1.SubscriptionGroup();
-        this._modelFactory = _serviceProvider instanceof services_1.ClientServiceHost
-            ? _serviceProvider.echo.modelFactory : new model_factory_1.ModelFactory();
+        // TODO(wittjosiah): Reconcile service provider host with interface.
+        this._modelFactory = _serviceProvider instanceof service_proxy_1.ClientServiceProxy
+            ? new model_factory_1.ModelFactory() : _serviceProvider.echo.modelFactory;
         this._modelFactory.registerModel(object_model_1.ObjectModel); // Register object-model by default.
     }
     toString() {
-        return `EchoProxy(${JSON.stringify(this.info())})`;
+        return `EchoProxy(${JSON.stringify(this.info)})`;
     }
     get modelFactory() {
         return this._modelFactory;
     }
     get networkManager() {
-        if (this._serviceProvider instanceof services_1.ClientServiceHost) {
-            return this._serviceProvider.echo.networkManager;
+        if (this._serviceProvider instanceof service_proxy_1.ClientServiceProxy) {
+            throw new Error('Network Manager not available in service proxy.');
         }
-        throw new Error('Network Manager not available in service proxy.');
+        // TODO(wittjosiah): Reconcile service provider host with interface.
+        return this._serviceProvider.echo.networkManager;
     }
     // TODO(burdon): Client ID?
-    info() {
+    get info() {
         return {
             parties: this._parties.size
         };
@@ -163,7 +157,7 @@ class EchoProxy {
      */
     acceptInvitation(invitationDescriptor) {
         const invitationProcessStream = this._serviceProvider.services.PartyService.acceptInvitation(invitationDescriptor.toProto());
-        const { authenticate, waitForFinish } = invitations_1.InvitationProxy.handleInvitationRedemption({
+        const { authenticate, waitForFinish } = invitation_proxy_1.InvitationProxy.handleInvitationRedemption({
             stream: invitationProcessStream,
             invitationDescriptor,
             onAuthenticate: async (request) => {
@@ -177,7 +171,7 @@ class EchoProxy {
             await this._partiesChanged.waitForCondition(() => this._parties.has(process.partyKey));
             return (_a = this.getParty(process.partyKey)) !== null && _a !== void 0 ? _a : (0, debug_1.failUndefined)();
         };
-        return new PartyInvitation(invitationDescriptor, waitForParty(), authenticate);
+        return new api_1.PartyInvitation(invitationDescriptor, waitForParty(), authenticate);
     }
 }
 exports.EchoProxy = EchoProxy;

package/dist/src/packlets/proxy/echo-proxy.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"echo-proxy.js","sourceRoot":"","sources":["../../../../src/packlets/proxy/echo-proxy.ts"],"names":[],"mappings":"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"}

package/dist/src/{api/proxies → packlets/proxy}/halo-proxy.d.ts

@@ -1,35 +1,9 @@
 import { Event } from '@dxos/async';
 import { DeviceInfo, KeyRecord } from '@dxos/credentials';
 import { Contact, CreateProfileOptions, InvitationDescriptor, ResultSet } from '@dxos/echo-db';
-import { PublicKey } from '@dxos/protocols';
-import { Profile, SignRequest, SignResponse } from '../../proto/gen/dxos/client';
-import { ClientServiceProvider } from '../../services';
-import { Invitation, InvitationProxy, InvitationRequest } from '../invitations';
-/**
- * HALO API.
- */
-export interface Halo {
-    info(): {
-        key?: PublicKey;
-    };
-    get profile(): Profile | undefined;
-    createProfile(options?: CreateProfileOptions): Promise<Profile>;
-    recoverProfile(seedPhrase: string): Promise<Profile>;
-    sign(request: SignRequest): Promise<SignResponse>;
-    addKeyRecord(keyRecord: KeyRecord): Promise<void>;
-    /**
-     * @deprecated
-     */
-    subscribeToProfile(callback: (profile: Profile) => void): void;
-    queryContacts(): ResultSet<Contact>;
-    createInvitation(): Promise<InvitationRequest>;
-    acceptInvitation(invitationDescriptor: InvitationDescriptor): Invitation;
-    queryDevices(): Promise<DeviceInfo[]>;
-    setDevicePreference(key: string, value: string): Promise<void>;
-    getDevicePreference(key: string): Promise<string | undefined>;
-    setGlobalPreference(key: string, value: string): Promise<void>;
-    getGlobalPreference(key: string): Promise<string | undefined>;
-}
+import { ClientServiceProvider, Halo, Invitation, InvitationRequest } from '../api';
+import { Profile, SignRequest } from '../proto';
+import { InvitationProxy } from './invitation-proxy';
 /**
  * Client proxy to local/remote HALO service.
  */
@@ -43,8 +17,8 @@ export declare class HaloProxy implements Halo {
     private _contacts;
     constructor(_serviceProvider: ClientServiceProvider);
     toString(): string;
-    info(): {
-        key: PublicKey | undefined;
+    get info(): {
+        key: import("@dxos/protocols").PublicKey | undefined;
     };
     get invitationProxy(): InvitationProxy;
     /**
@@ -90,7 +64,7 @@ export declare class HaloProxy implements Halo {
      * To be used with `client.halo.createHaloInvitation` on the inviter side.
     */
     acceptInvitation(invitationDescriptor: InvitationDescriptor): Invitation;
-    sign(request: SignRequest): Promise<SignResponse>;
+    sign(request: SignRequest): Promise<import("../proto").SignResponse>;
     addKeyRecord(keyRecord: KeyRecord): Promise<void>;
     queryDevices(): Promise<DeviceInfo[]>;
     setDevicePreference(key: string, value: string): Promise<void>;

package/dist/src/packlets/proxy/halo-proxy.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"halo-proxy.d.ts","sourceRoot":"","sources":["../../../../src/packlets/proxy/halo-proxy.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,UAAU,EAAyB,SAAS,EAAE,MAAM,mBAAmB,CAAC;AACjF,OAAO,EAAE,OAAO,EAAE,oBAAoB,EAAE,oBAAoB,EAAe,SAAS,EAAE,MAAM,eAAe,CAAC;AAG5G,OAAO,EAAE,qBAAqB,EAAE,IAAI,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,QAAQ,CAAC;AACpF,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAErD;;GAEG;AACH,qBAAa,SAAU,YAAW,IAAI;IAWlC,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IAVnC,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAyB;IAC1D,OAAO,CAAC,QAAQ,CAAC,cAAc,CAA2B;IAE1D,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAe;IAChD,SAAgB,cAAc,cAAe;IAE7C,OAAO,CAAC,QAAQ,CAAC,CAAU;IAC3B,OAAO,CAAC,SAAS,CAAqB;gBAGnB,gBAAgB,EAAE,qBAAqB;IAG1D,QAAQ;IAIR,IAAI,IAAI;;MAIP;IAED,IAAI,eAAe,oBAElB;IAED;;OAEG;IACH,IAAI,OAAO,IAAK,OAAO,GAAG,SAAS,CAElC;IAED;;OAEG;IAEH,kBAAkB,CAAE,QAAQ,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,GAAG,MAAM,IAAI;IAIrE;;;;;;;OAOG;IACG,aAAa,CAAE,EACnB,SAAS,EACT,SAAS,EACT,QAAQ,EACR,UAAU,EACX,GAAE,oBAAyB,GAAG,OAAO,CAAC,OAAO,CAAC;IAe/C;;OAEG;IACG,cAAc,CAAE,UAAU,EAAE,MAAM;IAKxC;;OAEG;IACH,aAAa,IAAK,SAAS,CAAC,OAAO,CAAC;IAIpC;;;;;;;OAOG;IACG,gBAAgB,IAAK,OAAO,CAAC,iBAAiB,CAAC;IAKrD;;;;;;;MAOE;IACF,gBAAgB,CAAE,oBAAoB,EAAE,oBAAoB,GAAG,UAAU;IAsBnE,IAAI,CAAE,OAAO,EAAE,WAAW;IAI1B,YAAY,CAAE,SAAS,EAAE,SAAS;IAKlC,YAAY,IAAK,OAAO,CAAC,UAAU,EAAE,CAAC;IAItC,mBAAmB,CAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAI/D,mBAAmB,CAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAI9D,mBAAmB,CAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAI/D,mBAAmB,CAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;CAwCrE"}

package/dist/src/{api/proxies → packlets/proxy}/halo-proxy.js

@@ -8,23 +8,24 @@ const async_1 = require("@dxos/async");
 const credentials_1 = require("@dxos/credentials");
 const echo_db_1 = require("@dxos/echo-db");
 const util_1 = require("@dxos/util");
-const invitations_1 = require("../invitations");
+const api_1 = require("../api");
+const invitation_proxy_1 = require("./invitation-proxy");
 /**
  * Client proxy to local/remote HALO service.
  */
 class HaloProxy {
     constructor(_serviceProvider) {
         this._serviceProvider = _serviceProvider;
-        this._invitationProxy = new invitations_1.InvitationProxy();
+        this._invitationProxy = new invitation_proxy_1.InvitationProxy();
         this._subscriptions = new util_1.SubscriptionGroup();
         this._contactsChanged = new async_1.Event();
         this.profileChanged = new async_1.Event(); // TODO(burdon): Move into Profile object.
         this._contacts = [];
     }
     toString() {
-        return `HaloProxy(${JSON.stringify(this.info())})`;
+        return `HaloProxy(${JSON.stringify(this.info)})`;
     }
-    info() {
+    get info() {
         var _a;
         return {
             key: (_a = this._profile) === null || _a === void 0 ? void 0 : _a.publicKey
@@ -101,7 +102,7 @@ class HaloProxy {
     */
     acceptInvitation(invitationDescriptor) {
         const invitationProcessStream = this._serviceProvider.services.ProfileService.acceptInvitation(invitationDescriptor.toProto());
-        const { authenticate, waitForFinish } = invitations_1.InvitationProxy.handleInvitationRedemption({
+        const { authenticate, waitForFinish } = invitation_proxy_1.InvitationProxy.handleInvitationRedemption({
             stream: invitationProcessStream,
             invitationDescriptor,
             onAuthenticate: async (request) => {
@@ -112,7 +113,7 @@ class HaloProxy {
             await waitForFinish();
             await this.profileChanged.waitForCondition(() => { var _a; return !!((_a = this.profile) === null || _a === void 0 ? void 0 : _a.publicKey); });
         };
-        return new invitations_1.Invitation(invitationDescriptor, waitForHalo(), authenticate);
+        return new api_1.Invitation(invitationDescriptor, waitForHalo(), authenticate);
     }
     async sign(request) {
         return await this._serviceProvider.services.HaloService.sign(request);

package/dist/src/packlets/proxy/halo-proxy.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"halo-proxy.js","sourceRoot":"","sources":["../../../../src/packlets/proxy/halo-proxy.ts"],"names":[],"mappings":"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"}