@dxos/config 2.26.2-dev.96e7d25d → 2.27.1-dev.8a89aadf

package/dist/src/config.d.ts

@@ -1,4 +1,4 @@
-import { ConfigV1Object, ConfigKey, DeepIndex, ParseKey } from './types';
+import { ConfigObject, ConfigKey, DeepIndex, ParseKey } from './types';
 declare type MappingSpec = Record<string, {
     path: string;
     type?: string;
@@ -20,18 +20,18 @@ export declare function mapToKeyValues(spec: MappingSpec, values: any): Record<s
  * Global configuration object.
  * NOTE: Config objects are immutable.
  */
-export declare class Config<T = ConfigV1Object> {
+export declare class Config {
     private readonly _config;
     /**
      * Creates an immutable instance.
      * @constructor
      * @param objects
      */
-    constructor(...objects: [T, ...T[]]);
+    constructor(...objects: [ConfigObject, ...ConfigObject[]]);
     /**
      * Returns an immutable config JSON object.
      */
-    get values(): T;
+    get values(): ConfigObject;
     /**
      * Returns the given config property.
      *
@@ -39,7 +39,7 @@ export declare class Config<T = ConfigV1Object> {
      * @param defaultValue Default value to return if option is not present in the config.
      * @returns The config value or undefined if the option is not present.
      */
-    get<K extends ConfigKey>(key: K, defaultValue?: DeepIndex<T, ParseKey<K>>): DeepIndex<T, ParseKey<K>>;
+    get<K extends ConfigKey>(key: K, defaultValue?: DeepIndex<ConfigObject, ParseKey<K>>): DeepIndex<ConfigObject, ParseKey<K>>;
     /**
      * Returns config key without type checking.
      *
@@ -51,7 +51,7 @@ export declare class Config<T = ConfigV1Object> {
      *
      * @param key A key in the config object. Can be a nested property with keys separated by dots: 'services.signal.server'.
      */
-    getOrThrow<K extends ConfigKey>(key: K): Exclude<DeepIndex<T, ParseKey<K>>, undefined>;
+    getOrThrow<K extends ConfigKey>(key: K): Exclude<DeepIndex<ConfigObject, ParseKey<K>>, undefined>;
 }
 export {};
 //# sourceMappingURL=config.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/config.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAEzE,aAAK,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC;AAEnE;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAE,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,MAuC/E;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAAE,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,uBAiB7D;AAED;;;GAGG;AACH,qBAAa,MAAM,CAAC,CAAC,GAAG,cAAc;IACpC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAM;IAE9B;;;;OAIG;gBACU,GAAG,OAAO,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC;IAIpC;;OAEG;IACH,IAAI,MAAM,IAAK,CAAC,CAEf;IAED;;;;;;OAMG;IACH,GAAG,CAAE,CAAC,SAAS,SAAS,EAAG,GAAG,EAAE,CAAC,EAAE,YAAY,CAAC,EAAE,SAAS,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC;IAIvG;;;;OAIG;IACH,YAAY,CAAC,CAAC,EAAG,GAAG,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,CAAC,GAAG,CAAC;IAIlD;;;;OAIG;IACH,UAAU,CAAE,CAAC,SAAS,SAAS,EAAG,GAAG,EAAE,CAAC,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,SAAS,CAAC;CAOzF"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/config.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAEvE,aAAK,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC;AAEnE;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAE,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,MAuC/E;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAAE,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,uBAiB7D;AAED;;;GAGG;AACH,qBAAa,MAAM;IACjB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAM;IAE9B;;;;OAIG;gBACU,GAAG,OAAO,EAAE,CAAC,YAAY,EAAE,GAAG,YAAY,EAAE,CAAC;IAI1D;;OAEG;IACH,IAAI,MAAM,IAAK,YAAY,CAE1B;IAED;;;;;;OAMG;IACH,GAAG,CAAE,CAAC,SAAS,SAAS,EAAG,GAAG,EAAE,CAAC,EAAE,YAAY,CAAC,EAAE,SAAS,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC;IAI7H;;;;OAIG;IACH,YAAY,CAAC,CAAC,EAAG,GAAG,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,CAAC,GAAG,CAAC;IAIlD;;;;OAIG;IACH,UAAU,CAAE,CAAC,SAAS,SAAS,EAAG,GAAG,EAAE,CAAC,GAAG,OAAO,CAAC,SAAS,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,SAAS,CAAC;CAOpG"}

package/dist/src/config.js

@@ -84,7 +84,7 @@ class Config {
      * @param objects
      */
     constructor(...objects) {
-        this._config = (0, sanitizer_1.sanitizeConfig)((0, lodash_defaultsdeep_1.default)(...objects));
+        this._config = (0, sanitizer_1.sanitizeConfig)((0, lodash_defaultsdeep_1.default)(...objects, { version: 1 }));
     }
     /**
      * Returns an immutable config JSON object.

package/dist/src/config.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/config.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,qCAAkC;AAClC,8EAA+C;AAC/C,4DAA6B;AAC7B,4DAA6B;AAE7B,2CAA6C;AAK7C;;;;;GAKG;AACH,SAAgB,gBAAgB,CAAE,IAAiB,EAAE,MAA2B;IAC9E,MAAM,MAAM,GAAG,EAAE,CAAC;IAElB,KAAK,MAAM,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QACxD,IAAI,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;QAExB,IAAI,KAAK,KAAK,SAAS,EAAE;YACvB,IAAI,IAAI,EAAE;gBACR,QAAQ,IAAI,EAAE;oBACZ,KAAK,SAAS,CAAC,CAAC;wBACd,KAAK,GAAG,IAAA,iBAAO,EAAC,KAAK,CAAC,CAAC;wBACvB,MAAM;qBACP;oBAED,KAAK,QAAQ,CAAC,CAAC;wBACb,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;wBACtB,MAAM;qBACP;oBAED,KAAK,QAAQ,CAAC,CAAC;wBACb,MAAM;qBACP;oBAED,KAAK,MAAM,CAAC,CAAC;wBACX,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;wBACzC,MAAM;qBACP;oBAED,OAAO,CAAC,CAAC;wBACP,MAAM,IAAI,KAAK,CAAC,iBAAiB,IAAI,EAAE,CAAC,CAAC;qBAC1C;iBACF;aACF;YAED,IAAA,oBAAG,EAAC,MAAM,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;SAC1B;KACF;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAvCD,4CAuCC;AAED;;;;GAIG;AACH,SAAgB,cAAc,CAAE,IAAiB,EAAE,MAAW;IAC5D,MAAM,MAAM,GAAwB,EAAE,CAAC;IAEvC,KAAK,MAAM,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QACxD,MAAM,KAAK,GAAG,IAAA,oBAAG,EAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QAChC,IAAI,KAAK,KAAK,SAAS,EAAE;YACvB,QAAQ,IAAI,EAAE;gBACZ,KAAK,MAAM;oBACT,MAAM,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;oBACpC,MAAM;gBACR;oBACE,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;aACvB;SACF;KACF;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAjBD,wCAiBC;AAED;;;GAGG;AACH,MAAa,MAAM;IAGjB;;;;OAIG;IACH,YAAa,GAAG,OAAoB;QAClC,IAAI,CAAC,OAAO,GAAG,IAAA,0BAAc,EAAC,IAAA,6BAAY,EAAC,GAAG,OAAO,CAAC,CAAC,CAAC;IAC1D,CAAC;IAED;;OAEG;IACH,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IAED;;;;;;OAMG;IACH,GAAG,CAAwB,GAAM,EAAE,YAAwC;QACzE,OAAO,IAAA,oBAAG,EAAC,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE,YAAY,CAAC,CAAC;IAC9C,CAAC;IAED;;;;OAIG;IACH,YAAY,CAAK,GAAW,EAAE,YAAgB;QAC5C,OAAO,IAAA,oBAAG,EAAC,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE,YAAY,CAAC,CAAC;IAC9C,CAAC;IAED;;;;OAIG;IACH,UAAU,CAAwB,GAAM;QACtC,MAAM,KAAK,GAAG,IAAA,oBAAG,EAAC,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;QACrC,IAAI,CAAC,KAAK,EAAE;YACV,MAAM,IAAI,KAAK,CAAC,8BAA8B,GAAG,EAAE,CAAC,CAAC;SACtD;QACD,OAAO,KAAK,CAAC;IACf,CAAC;CACF;AAnDD,wBAmDC"}
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/config.ts"],"names":[],"mappings":"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"}

package/dist/src/config.test.js

@@ -19,24 +19,32 @@ const test_json_1 = __importDefault(require("./testing/test.json"));
 });
 (0, mocha_1.it)('Basic config', () => {
     const config = new config_1.Config({
-        app: {
-            title: 'testing'
+        runtime: {
+            props: {
+                title: 'testing'
+            }
         }
     }, {
-        app: {
-            theme: 'light'
+        runtime: {
+            app: {
+                theme: 'light'
+            }
         }
     });
     (0, expect_1.default)(config.values).toEqual({
-        app: {
-            title: 'testing',
-            theme: 'light'
+        version: 1,
+        runtime: {
+            app: {
+                theme: 'light'
+            },
+            props: {
+                title: 'testing'
+            }
         }
     });
 });
-(0, mocha_1.it)('Config v1', () => {
+(0, mocha_1.it)('Runtime and module config', () => {
     const config = new config_1.Config({
-        version: 1,
         module: {
             name: 'dxos:app.tasks',
             record: {
@@ -73,21 +81,25 @@ const test_json_1 = __importDefault(require("./testing/test.json"));
         }
     });
 });
-(0, mocha_1.it)('Mapping', () => {
+mocha_1.it.skip('Mapping', () => {
     process.env.TEST_CLIENT_ID = '900';
     process.env.TEST_SERVER_ENDPOINT = 'http://localhost';
     const config = new config_1.Config({
-        client: {
-            tag: 'testing'
+        runtime: {
+            client: {
+                tag: 'testing'
+            }
         }
     }, (0, config_1.mapFromKeyValues)(env_map_json_1.default, process.env));
     (0, expect_1.default)(config.values).toEqual({
-        client: {
-            id: 900,
-            tag: 'testing'
-        },
-        server: {
-            endpoint: 'http://localhost'
+        runtime: {
+            client: {
+                id: 900,
+                tag: 'testing'
+            },
+            server: {
+                endpoint: 'http://localhost'
+            }
         }
     });
     const values = (0, config_1.mapToKeyValues)(env_map_json_1.default, config.values);
@@ -97,7 +109,7 @@ const test_json_1 = __importDefault(require("./testing/test.json"));
         TEST_SERVER_ENDPOINT: 'http://localhost'
     });
 });
-(0, mocha_1.it)('mapToKeyValuesping', () => {
+mocha_1.it.skip('mapToKeyValuesping', () => {
     const config = new config_1.Config({
         client: {
             tag: 'testing'
@@ -118,6 +130,6 @@ const test_json_1 = __importDefault(require("./testing/test.json"));
             }
         }
     });
-    (0, expect_1.default)(config.get('runtime.client.mode')).toEqual(config_2.System.Mode.LOCAL);
+    (0, expect_1.default)(config.get('runtime.client.mode')).toEqual(config_2.Runtime.Client.Mode.LOCAL);
 });
 //# sourceMappingURL=config.test.js.map

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

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

package/dist/src/index.d.ts

@@ -1,5 +1,5 @@
 export * from './config';
 export * from './loaders/index';
-export { ConfigObject, ConfigV1Object } from './sanitizer';
+export { ConfigObject } from './types';
 export * as defs from './proto/gen/dxos/config';
 //# sourceMappingURL=index.d.ts.map

package/dist/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,iBAAiB,CAAC;AAChC,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC3D,OAAO,KAAK,IAAI,MAAM,yBAAyB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAIA,cAAc,UAAU,CAAC;AACzB,cAAc,iBAAiB,CAAC;AAChC,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,KAAK,IAAI,MAAM,yBAAyB,CAAC"}

package/dist/src/proto/gen/dxos/config.d.ts

@@ -1,281 +1,203 @@
-import * as google_protobuf from "../google/protobuf";
+import substitutions from "../../substitutions";
 export interface Config {
-    /**
-     * Options:
-     *   - (env) = "SYSTEM"
-     */
-    system?: System;
-    services?: Services;
-    /**
-     * Build metdata
-     */
+    version?: number;
+    module?: Module;
     build?: Build;
-    /**
-     * App configuration. Incuded if this configuration is for an app.
-     *
-     * Options:
-     *   - (env) = "APP"
-     */
-    app?: App;
-    /**
-     * App configuration. Incuded if this configuration is for a bot.
-     *
-     * Options:
-     *   - (env) = "BOT"
-     */
-    bot?: Bot;
-    /**
-     * CLI configuration.
-     */
-    cli?: CLI;
-    /**
-     * Custom configuration as string key-value pairs.
-     */
-    custom?: Partial<Record<string, string>>;
+    runtime?: Runtime;
 }
-export interface System {
-    certEndpoint?: string;
-    /**
-     * Options:
-     *   - (env) = "DEBUG"
-     */
-    debug?: string;
-    storage?: System.Storage;
-    enableSnapshots?: boolean;
-    /**
-     * Milliseconds
-     */
-    snapshotInterval?: number;
-    /**
-     * Milliseconds
-     */
-    invitationExpiration?: number;
-    mode?: System.Mode;
+export interface Module {
+    name?: string;
+    type?: string;
+    version?: string;
+    author?: string;
+    license?: string;
+    description?: string;
+    repository?: string;
+    repositoryVersion?: string;
+    keywords?: string[];
+    displayName?: string;
+    npmUrl?: string;
+    build?: Module.Build;
+    record?: Module.Record;
 }
-export declare namespace System {
-    interface Storage {
-        persistent?: boolean;
-        storageType?: System.Storage.StorageDriver;
-        keyStorage?: System.Storage.StorageDriver;
-        path?: string;
+export declare namespace Module {
+    interface Record {
+        app?: Module.Record.App;
     }
-    namespace Storage {
-        enum StorageDriver {
-            RAM = 0,
-            IDB = 1,
-            CHROME = 2,
-            FIREFOX = 3,
-            NODE = 4,
-            LEVELJS = 11,
-            JSONDOWN = 12
+    namespace Record {
+        interface App {
+            contentType?: string[];
         }
     }
-    enum Mode {
-        AUTOMATIC = 0,
-        LOCAL = 1,
-        REMOTE = 2
+    interface Build {
+        version?: string;
+        commitHash?: string;
+        timestamp?: ReturnType<typeof substitutions["google.protobuf.Timestamp"]["decode"]>;
     }
 }
-/**
- * Services provided to all DXOS agents
- */
-export interface Services {
-    kube?: Services.Kube;
-    app?: Services.AppServer;
-    dxns?: Services.Dxns;
-    ipfs?: Services.Ipfs;
-    signal?: Services.Signal;
-    ice?: Services.Ice[];
-    machine?: Services.Machine;
-    bot?: Services.BotFactoryClient;
-}
-export declare namespace Services {
-    interface Kube {
-        endpoints?: Services.Kube.Endpoints;
-        publicUrl?: string;
-    }
-    namespace Kube {
-        interface Endpoints {
-            logs?: string;
-            services?: string;
-        }
-    }
-    interface AppServer {
-        prefix?: string;
-        server?: string;
-    }
-    interface Dxns {
-        /**
-         * DXNS endpoint.
-         */
-        server?: string;
-        /**
-         * Substrate account URI. This is a secret.
-         * KUBEs do not serve this with the config but we store it in profile.yml.
-         *
-         * TODO(dmaretskyi): Deprecate this and move it to keyring.
-         */
-        accountUri?: string;
-    }
-    interface Ipfs {
-        server?: string;
-        gateway?: string;
-    }
-    interface Signal {
-        server?: string;
-        api?: string;
-    }
-    interface Ice {
-        urls?: string;
-        username?: string;
-        credential?: string;
-    }
-    interface Machine {
-        doAccessToken?: string;
-        githubAccessToken?: string;
-        githubUsername?: string;
-        dnsDomain?: string;
-        npmAccessToken?: string;
-    }
-    interface BotFactoryClient {
-        topic?: string;
-    }
-}
-/**
- * Build metadata
- */
 export interface Build {
-    version?: string;
-    commitHash?: string;
-    timestamp?: google_protobuf.Timestamp;
+    command?: string;
+    out?: string;
 }
-/**
- * App configuration
- */
-export interface App {
-    title?: string;
-    org?: string;
-    theme?: string;
-    website?: string;
-    /**
-     * Options:
-     *   - (env) = "PUBLIC_URL"
-     */
-    publicUrl?: string;
+export interface Runtime {
+    client?: Runtime.Client;
+    app?: Runtime.App;
+    cli?: Runtime.CLI;
+    props?: Runtime.Props;
+    services?: Runtime.Services;
+    system?: Runtime.System;
 }
-/**
- * Bot configuration
- */
-export interface Bot {
-    /**
-     * Options:
-     *   - (env) = "UID"
-     */
-    uid?: string;
-    /**
-     * Options:
-     *   - (env) = "NAME"
-     */
-    name?: string;
-    /**
-     * Options:
-     *   - (env) = "CWD"
-     */
-    cwd?: string;
-    /**
-     * Options:
-     *   - (env) = "RESTARTED"
-     */
-    restarted?: boolean;
-    /**
-     * Options:
-     *   - (env) = "RESET"
-     */
-    reset?: boolean;
-    /**
-     * Options:
-     *   - (env) = "PEER_ID"
-     */
-    peerId?: string;
-    /**
-     * Options:
-     *   - (env) = "TOPIC"
-     */
-    topic?: string;
-    /**
-     * Options:
-     *   - (env) = "SECRET_KEY"
-     */
-    secretKey?: string;
-    /**
-     * Options:
-     *   - (env) = "LOCAL_DEV"
-     */
-    localDev?: boolean;
-    /**
-     * Options:
-     *   - (env) = "NODE_PATH"
-     */
-    nodePath?: string;
-    /**
-     * Options:
-     *   - (env) = "CONTROL_TOPIC"
-     */
-    controlTopic?: string;
-    /**
-     * Options:
-     *   - (env) = "DUMP_FILE"
-     */
-    dumpFile?: string;
-    /**
-     * Options:
-     *   - (env) = "IPC"
-     */
-    ipc?: Bot.Ipc;
-}
-export declare namespace Bot {
-    interface Ipc {
+export declare namespace Runtime {
+    interface Client {
         /**
          * Options:
-         *   - (env) = "PORT_FROM"
+         *   - (env) = "DEBUG"
          */
-        portFrom?: number;
+        debug?: string;
+        storage?: Runtime.Client.Storage;
+        enableSnapshots?: boolean;
         /**
-         * Options:
-         *   - (env) = "PORT_TO"
+         * Milliseconds
          */
-        portTo?: number;
+        snapshotInterval?: number;
+        /**
+         * Milliseconds
+         */
+        invitationExpiration?: number;
+        mode?: Runtime.Client.Mode;
+    }
+    namespace Client {
+        enum Mode {
+            AUTOMATIC = 0,
+            LOCAL = 1,
+            REMOTE = 2
+        }
+        interface Storage {
+            persistent?: boolean;
+            storageType?: Runtime.Client.Storage.StorageDriver;
+            keyStorage?: Runtime.Client.Storage.StorageDriver;
+            path?: string;
+        }
+        namespace Storage {
+            enum StorageDriver {
+                RAM = 0,
+                IDB = 1,
+                CHROME = 2,
+                FIREFOX = 3,
+                NODE = 4,
+                LEVELJS = 11,
+                JSONDOWN = 12
+            }
+        }
+    }
+    interface App {
+        org?: string;
+        theme?: string;
+        website?: string;
         /**
          * Options:
-         *   - (env) = "SERVER_ID"
+         *   - (env) = "PUBLIC_URL"
          */
-        serverId?: string;
+        publicUrl?: string;
     }
-}
-export interface CLI {
-    nodePath?: string;
-    app?: CLI.AppServe;
-    console?: CLI.Package;
-    mdns?: CLI.Package;
-    signal?: CLI.Package;
-    npmClient?: string;
-    channel?: string;
-}
-export declare namespace CLI {
-    interface AppServe {
-        serve?: CLI.AppServe.Serve;
+    interface CLI {
+        nodePath?: string;
+        app?: Runtime.CLI.AppServe;
+        console?: Runtime.CLI.Package;
+        mdns?: Runtime.CLI.Package;
+        signal?: Runtime.CLI.Package;
+        npmClient?: string;
+        channel?: string;
     }
-    namespace AppServe {
-        interface Serve {
-            config?: string;
-            loginApp?: string;
-            keyPhrase?: string;
+    namespace CLI {
+        interface AppServe {
+            serve?: Runtime.CLI.AppServe.Serve;
+        }
+        namespace AppServe {
+            interface Serve {
+                config?: string;
+                loginApp?: string;
+                keyPhrase?: string;
+            }
+        }
+        interface Package {
+            package?: string;
+            channel?: string;
+            bin?: string;
         }
     }
-    interface Package {
-        package?: string;
-        channel?: string;
-        bin?: string;
+    interface Props {
+        title?: string;
+    }
+    interface System {
+        debug?: string;
+    }
+    interface Services {
+        kube?: Runtime.Services.Kube;
+        app?: Runtime.Services.AppServer;
+        dxns?: Runtime.Services.Dxns;
+        ipfs?: Runtime.Services.Ipfs;
+        signal?: Runtime.Services.Signal;
+        ice?: Runtime.Services.Ice[];
+        machine?: Runtime.Services.Machine;
+        bot?: Runtime.Services.BotFactory;
+    }
+    namespace Services {
+        interface Kube {
+            endpoints?: Runtime.Services.Kube.Endpoints;
+            publicUrl?: string;
+        }
+        namespace Kube {
+            interface Endpoints {
+                logs?: string;
+                services?: string;
+            }
+        }
+        interface AppServer {
+            prefix?: string;
+            server?: string;
+        }
+        interface Dxns {
+            /**
+             * DXNS endpoint.
+             */
+            server?: string;
+            /**
+             * Substrate account URI. This is a secret.
+             * KUBEs do not serve this with the config but we store it in profile.yml.
+             *
+             * TODO(dmaretskyi): Deprecate this and move it to keyring.
+             */
+            accountUri?: string;
+            /**
+             * Public address of the DXNS Account - not a secret.
+             */
+            account?: string;
+        }
+        interface Ipfs {
+            server?: string;
+            gateway?: string;
+        }
+        interface Signal {
+            server?: string;
+            api?: string;
+            status?: string;
+        }
+        interface Ice {
+            urls?: string;
+            username?: string;
+            credential?: string;
+        }
+        interface Machine {
+            doAccessToken?: string;
+            githubAccessToken?: string;
+            githubUsername?: string;
+            dnsDomain?: string;
+            npmAccessToken?: string;
+        }
+        interface BotFactory {
+            topic?: string;
+        }
     }
 }
 //# sourceMappingURL=config.d.ts.map