@dxos/client 2.31.7 → 2.31.8-dev.415661f8

package/src/api/client.ts

@@ -81,12 +81,12 @@ export class Client {
     this._options = options;
 
     if (Object.keys(this._config.values).length > 0 && this._config.values.version !== EXPECTED_CONFIG_VERSION) {
-      throw new InvalidConfigurationError(`Expected config version 1, got ${this._config.values.version}.`);
+      throw new InvalidConfigurationError(
+        `Invalid config version: ${this._config.values.version} !== ${EXPECTED_CONFIG_VERSION}]`);
     }
 
-    // TODO(burdon): Default error level: 'dxos:*:error'
-    // TODO(burdon): config.getProperty('system.debug', process.env.DEBUG, '');
-    debug.enable(this._config.values.runtime?.client?.debug ?? process.env.DEBUG ?? 'dxos:*:error');
+    // 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', Runtime.Client.Mode.AUTOMATIC)!;
     log(`mode=${Runtime.Client.Mode[this._mode]}`);
@@ -99,7 +99,8 @@ export class Client {
   info () {
     return {
       initialized: this.initialized,
-      echo: this.echo.info()
+      echo: this.echo.info(),
+      halo: this.halo.info()
     };
   }
 
@@ -246,6 +247,7 @@ export class Client {
 
   /**
    * Registers a new ECHO model.
+   * @deprecated
    */
   registerModel (constructor: ModelConstructor<any>): this {
     this._echo.modelFactory.registerModel(constructor);
@@ -255,7 +257,6 @@ export class Client {
   /**
    * Returns devtools context.
    * Used by the DXOS DevTool Extension.
-   *
    * This is what gets assigned to `window.__DXOS__` global.
    */
   getDevtoolsContext (): DevtoolsHook {

package/src/api/proxies/echo-proxy.ts

@@ -9,7 +9,7 @@ import { PublicKey } from '@dxos/crypto';
 import { failUndefined } from '@dxos/debug';
 import { InvitationDescriptor, PARTY_ITEM_TYPE, ResultSet } from '@dxos/echo-db';
 import { PartyKey, PartySnapshot } from '@dxos/echo-protocol';
-import { ModelFactory } from '@dxos/model-factory';
+import { ModelConstructor, ModelFactory } from '@dxos/model-factory';
 import { ObjectModel } from '@dxos/object-model';
 import { ComplexMap, SubscriptionGroup } from '@dxos/util';
 
@@ -33,6 +33,7 @@ export class PartyInvitation extends Invitation<Party> {
 // TODO(burdon): Separate public API form implementation (move comments here).
 export interface Echo {
   info (): { parties: number }
+  registerModel (constructor: ModelConstructor<any>): void
   createParty (): Promise<Party>
   cloneParty (snapshot: PartySnapshot): Promise<Party>
   getParty (partyKey: PartyKey): Party | undefined
@@ -59,6 +60,10 @@ export class EchoProxy implements Echo {
     this._modelFactory.registerModel(ObjectModel); // Register object-model by default.
   }
 
+  toString () {
+    return `EchoProxy(${JSON.stringify(this.info())})`;
+  }
+
   get modelFactory (): ModelFactory {
     return this._modelFactory;
   }
@@ -71,16 +76,18 @@ export class EchoProxy implements Echo {
     throw new Error('Network Manager not available in service proxy.');
   }
 
-  toString () {
-    return `EchoProxy(${JSON.stringify(this.info())})`;
-  }
-
+  // TODO(burdon): Client ID?
   info () {
     return {
       parties: this._parties.size
     };
   }
 
+  registerModel (constructor: ModelConstructor<any>): this {
+    this._modelFactory.registerModel(constructor);
+    return this;
+  }
+
   /**
    * @internal
    */

package/src/api/proxies/halo-proxy.ts

@@ -74,7 +74,7 @@ export class HaloProxy implements Halo {
 
   /**
    * User profile info.
-  */
+   */
   get profile (): Profile | undefined {
     return this._profile;
   }

package/src/api/proxies/party-proxy.ts

@@ -36,6 +36,7 @@ export interface Party {
   get isOpen (): boolean
   get isActive (): boolean
 
+  // TODO(burdon): Verbs should be on same interface.
   get database (): Database
   get select (): Database['select']
   get reduce (): Database['reduce']
@@ -129,7 +130,7 @@ export class PartyProxy implements Party {
   // TODO(burdon): Invert party/database? (e.g., const db = client.connect()).
   get database (): Database {
     if (!this._database) {
-      throw Error('Party not open.');
+      throw new Error('Party not open.');
     }
 
     return this._database;

package/src/proto/gen/google/protobuf.ts

@@ -12,14 +12,14 @@ import * as dxos_halo_keys from "../dxos/halo/keys";
 import * as dxos_rpc from "../dxos/rpc";
 export interface Empty {
 }
-export interface Timestamp {
-    seconds?: string;
-    nanos?: number;
-}
 export interface Any {
     type_url?: string;
     value?: Uint8Array;
 }
+export interface Timestamp {
+    seconds?: string;
+    nanos?: number;
+}
 export interface FileDescriptorSet {
     file?: FileDescriptorProto[];
 }

package/src/util/index.ts

@@ -2,7 +2,6 @@
 // Copyright 2021 DXOS.org
 //
 
-export * from './config';
 export * from './messages';
 export * from './platform';
 export * from './subscription';

package/src/version.ts

@@ -1 +1 @@
-export const DXOS_VERSION = "2.31.5";
+export const DXOS_VERSION = "2.31.7";

package/dist/src/util/config.d.ts

@@ -1,6 +0,0 @@
-import { ConfigProvider } from '@dxos/config';
-/**
- * Helper to build config from the files supported by the config plugins.
- */
-export declare const configProvider: ConfigProvider;
-//# sourceMappingURL=config.d.ts.map

package/dist/src/util/config.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../src/util/config.ts"],"names":[],"mappings":"AAIA,OAAO,EAAU,cAAc,EAA4B,MAAM,cAAc,CAAC;AAEhF;;GAEG;AAEH,eAAO,MAAM,cAAc,EAAE,cAA6E,CAAC"}

package/dist/src/util/config.js

@@ -1,14 +0,0 @@
-"use strict";
-//
-// Copyright 2021 DXOS.org
-//
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.configProvider = void 0;
-const config_1 = require("@dxos/config");
-/**
- * Helper to build config from the files supported by the config plugins.
- */
-// TODO(burdon): Remove or rename defaultConfigProvider.
-const configProvider = async () => new config_1.Config(await (0, config_1.Dynamics)(), (0, config_1.Envs)(), (0, config_1.Defaults)());
-exports.configProvider = configProvider;
-//# sourceMappingURL=config.js.map

package/dist/src/util/config.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/util/config.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;AAEF,yCAAgF;AAEhF;;GAEG;AACH,wDAAwD;AACjD,MAAM,cAAc,GAAmB,KAAK,IAAI,EAAE,CAAC,IAAI,eAAM,CAAC,MAAM,IAAA,iBAAQ,GAAE,EAAE,IAAA,aAAI,GAAE,EAAE,IAAA,iBAAQ,GAAE,CAAC,CAAC;AAA9F,QAAA,cAAc,kBAAgF"}

package/src/util/config.ts

@@ -1,11 +0,0 @@
-//
-// Copyright 2021 DXOS.org
-//
-
-import { Config, ConfigProvider, Envs, Defaults, Dynamics } from '@dxos/config';
-
-/**
- * Helper to build config from the files supported by the config plugins.
- */
-// TODO(burdon): Remove or rename defaultConfigProvider.
-export const configProvider: ConfigProvider = async () => new Config(await Dynamics(), Envs(), Defaults());