@dxos/cli 0.3.10 → 0.3.11-main.0252f93

package/bin/agent_entrypoint

@@ -0,0 +1,21 @@
+#!/bin/bash
+# TODO(nf): container currently built with Debian due to musl incompatibilities, but still avoiding bash-isms
+set -eu
+
+if [ "$1" = "dx" ]; then
+  if [ "${DX_PROFILE_MODE-}" = "volume" ] && [ -n "${DX_PROFILE_ROOT-}" ]; then
+    export HOME=$DX_PROFILE_ROOT
+  fi
+
+  export LOG_FILTER=${LOG_FILTER:-info}
+  # TODO(nf): handle global arguments and other invocations?
+  if [ "$2" = "agent" ]; then
+    if [ -n "${DXOS_AGENT_IDENTITY_KEY-}" ]; then
+      echo "Starting DXOS agent for $DXOS_AGENT_IDENTITY_KEY"
+    else
+      echo "Starting DXOS agent"
+    fi
+  fi
+fi
+
+exec "$@"

package/bin/handle_invitation

@@ -0,0 +1,14 @@
+#!/bin/sh
+set -eu
+
+[ -f $HOME/.agent-invitation-complete ] && exit 0
+
+while true; do
+  if [ -f /tmp/dx/run/profile/default/lockfile ] && dx halo identity --no-agent; then
+    break
+  fi
+  sleep 1
+done
+
+dx halo join --invitation=$DXOS_AGENT_INVITATION
+touch $HOME/.agent-invitation-complete

package/dist/src/base-command.d.ts

@@ -2,6 +2,7 @@ import { Command, type Config as OclifConfig, type Interfaces } from '@oclif/cor
 import { type Daemon } from '@dxos/agent';
 import { Client, Config } from '@dxos/client';
 import { type Space } from '@dxos/client/echo';
+import { Observability } from '@dxos/observability';
 import { PublisherRpcPeer, SupervisorRpcPeer, type TelemetryContext, TunnelRpcPeer } from './util';
 export type Flags<T extends typeof Command> = Interfaces.InferredFlags<(typeof BaseCommand)['baseFlags'] & T['flags']>;
 export type Args<T extends typeof Command> = Interfaces.InferredArgs<T['args']>;
@@ -24,9 +25,10 @@ export declare abstract class BaseCommand<T extends typeof Command = any> extend
     };
     private _clientConfig?;
     private _client?;
-    private _startTime;
+    protected _startTime: Date;
     private _failing;
     protected _telemetryContext?: TelemetryContext;
+    protected _observability?: Observability;
     protected flags: Flags<T>;
     protected args: Args<T>;
     constructor(argv: string[], config: OclifConfig);
@@ -38,7 +40,7 @@ export declare abstract class BaseCommand<T extends typeof Command = any> extend
      */
     init(): Promise<void>;
     readStdin(): Promise<string>;
-    private _initTelemetry;
+    private _initObservability;
     /**
      * Load or create config file from defaults.
      * @private

package/dist/src/base-command.d.ts.map

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

package/dist/src/base-command.js

@@ -2,29 +2,6 @@
 //
 // Copyright 2022 DXOS.org
 //
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -46,15 +23,14 @@ const client_protocol_1 = require("@dxos/client-protocol");
 const debug_1 = require("@dxos/debug");
 const invariant_1 = require("@dxos/invariant");
 const log_1 = require("@dxos/log");
+const observability_1 = require("@dxos/observability");
 const services_2 = require("@dxos/protocols/proto/dxos/client/services");
-const Sentry = __importStar(require("@dxos/sentry"));
-const sentry_1 = require("@dxos/sentry");
-const Telemetry = __importStar(require("@dxos/telemetry"));
 const errors_1 = require("./errors");
 const util_1 = require("./util");
 const STDIN_TIMEOUT = 100;
 // Set config if not overridden by env.
-log_1.log.config({ filter: !process.env.LOG_FILTER && !process.env.LOG_CONFIG ? log_1.LogLevel.ERROR : undefined }, {}, { file: "packages/devtools/cli/src/base-command.ts", line: 64, scope: this, bugcheck: "If you see this message then it means that the source code preprocessor for @dxos/log is broken. It probably has misinterpreted an unrelated call for a logger invocation.", callSite: (fn, args) => fn(...args) });
+// TODO(nf): how to avoid abusive or unintentional spamming of Sentry?
+log_1.log.config({ filter: !process.env.LOG_FILTER && !process.env.LOG_CONFIG ? log_1.LogLevel.ERROR : undefined }, {}, { file: "packages/devtools/cli/src/base-command.ts", line: 59, scope: this, bugcheck: "If you see this message then it means that the source code preprocessor for @dxos/log is broken. It probably has misinterpreted an unrelated call for a logger invocation.", callSite: (fn, args) => fn(...args) });
 const DEFAULT_CONFIG = 'config/config-default.yml';
 // TODO(wittjosiah): Factor out.
 const exists = async (...args) => {
@@ -97,7 +73,6 @@ class BaseCommand extends core_1.Command {
      */
     async init() {
         await super.init();
-        await this._initTelemetry();
         const { args, flags } = await this.parse({
             flags: this.ctor.flags,
             baseFlags: super.ctor.baseFlags,
@@ -108,6 +83,7 @@ class BaseCommand extends core_1.Command {
         this.args = args;
         // Load user config file.
         await this._loadConfig();
+        await this._initObservability();
     }
     async readStdin() {
         return new Promise((resolve) => {
@@ -122,51 +98,54 @@ class BaseCommand extends core_1.Command {
             setTimeout(() => rl.close(), STDIN_TIMEOUT);
         });
     }
-    async _initTelemetry() {
+    async _initObservability() {
         var _a;
         this._telemetryContext = await (0, util_1.getTelemetryContext)(client_protocol_1.DX_DATA);
-        const { mode, installationId, group, environment, release } = this._telemetryContext;
+        const { mode, installationId, group } = this._telemetryContext;
+        if (mode === 'disabled') {
+            this.log('telemetry disabled by config');
+            return;
+        }
         {
             if (group === 'dxos') {
                 this.log((0, chalk_1.default) `✨ {bgMagenta Running as internal user} ✨\n`);
             }
             await (0, util_1.showTelemetryBanner)(client_protocol_1.DX_DATA);
         }
-        if (util_1.SENTRY_DESTINATION && mode !== 'disabled') {
-            Sentry.init({
-                installationId,
-                destination: util_1.SENTRY_DESTINATION,
-                environment,
-                release,
-                // TODO(wittjosiah): Configure this.
-                sampleRate: 1.0,
-                scrubFilenames: mode !== 'full',
-                properties: {
-                    group,
+        // TODO(nf): handle cases where the cli starts the agent for the user
+        let namespace = 'cli';
+        if (this.id === 'agent:start') {
+            namespace = 'agent';
+        }
+        const release = `${namespace}@${this.clientConfig.get('runtime.app.build.version')}`;
+        const environment = this.clientConfig.get('runtime.app.env.DX_ENVIRONMENT');
+        this._observability = new observability_1.Observability({
+            namespace,
+            group,
+            mode,
+            errorLog: {
+                sentryInitOptions: {
+                    installationId,
+                    environment,
+                    release,
+                    // TODO(wittjosiah): Configure this.
+                    sampleRate: 1.0,
                 },
-            });
-            Sentry.enableSentryLogProcessor();
-        }
-        if (util_1.TELEMETRY_API_KEY) {
-            mode === 'disabled' && (await (0, util_1.disableTelemetry)(client_protocol_1.DX_DATA));
-            Telemetry.init({
-                apiKey: util_1.TELEMETRY_API_KEY,
-                batchSize: 20,
-                enable: Boolean(util_1.TELEMETRY_API_KEY) && mode !== 'disabled',
-            });
-        }
-        if (((_a = this._telemetryContext) === null || _a === void 0 ? void 0 : _a.mode) === 'full') {
-            Telemetry.addTag('hostname', node_os_1.default.hostname());
-        }
+            },
+            logProcessor: true,
+        });
+        this._observability.initialize();
         this.addToTelemetryContext({ command: this.id });
+        // TODO(nf): move to observability
+        const IPDATA_API_KEY = this.clientConfig.get('runtime.app.env.DX_IPDATA_API_KEY');
         try {
-            const res = await (0, node_fetch_1.default)(`https://api.ipdata.co/?api-key=${util_1.IPDATA_API_KEY}`);
+            const res = await (0, node_fetch_1.default)(`https://api.ipdata.co/?api-key=${IPDATA_API_KEY}`);
             const data = await res.json();
             const { city, region, country, latitude, longitude } = data;
             this.addToTelemetryContext({ city, region, country, latitude, longitude });
         }
         catch (err) {
-            (0, sentry_1.captureException)(err);
+            (_a = this._observability) === null || _a === void 0 ? void 0 : _a.captureException(err);
         }
     }
     /**
@@ -191,6 +170,7 @@ class BaseCommand extends core_1.Command {
             await (0, promises_1.mkdir)((0, node_path_1.dirname)(configFile), { recursive: true });
             await (0, promises_1.writeFile)(configFile, js_yaml_1.default.dump(yamlConfig), 'utf-8');
         }
+        // TODO(burdon): Use Profile()?
         this._clientConfig = new client_1.Config(js_yaml_1.default.load(await (0, promises_1.readFile)(configFile, 'utf-8')));
     }
     // TODO(burdon): Reconcile internal/external logging.
@@ -213,8 +193,9 @@ class BaseCommand extends core_1.Command {
         return err;
     }
     error(err, options) {
+        var _a;
         // Will only submit if API key exists (i.e., prod).
-        Sentry.captureException(err);
+        (_a = this._observability) === null || _a === void 0 ? void 0 : _a.captureException(err);
         this._failing = true;
         if (this.flags.verbose) {
             // NOTE: Default method displays stack trace. And exits the process.
@@ -250,10 +231,10 @@ class BaseCommand extends core_1.Command {
      * Called after each command run.
      */
     async finally() {
-        var _a;
+        var _a, _b;
         const endTime = new Date();
-        Telemetry.event({
-            installationId: (_a = this._telemetryContext) === null || _a === void 0 ? void 0 : _a.installationId,
+        (_a = this._observability) === null || _a === void 0 ? void 0 : _a.event({
+            installationId: (_b = this._telemetryContext) === null || _b === void 0 ? void 0 : _b.installationId,
             name: 'cli.command.run',
             properties: {
                 ...this._telemetryContext,

package/dist/src/base-command.js.map

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

package/dist/src/commands/agent/start.d.ts

@@ -21,6 +21,7 @@ export default class Start extends BaseCommand<typeof Start> {
         command: string;
     }[];
     private readonly _ctx;
+    private _agent?;
     run(): Promise<any>;
     private _runInForeground;
     private _runAsDaemon;

package/dist/src/commands/agent/start.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"start.d.ts","sourceRoot":"","sources":["../../../../src/commands/agent/start.ts"],"names":[],"mappings":"AAuBA,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEjD,MAAM,CAAC,OAAO,OAAO,KAAM,SAAQ,WAAW,CAAC,OAAO,KAAK,CAAC;IAC1D,OAAgB,cAAc,UAAQ;IACtC,OAAgB,WAAW,SAAuB;IAClD,OAAgB,KAAK;;;;;;;;;;;;;MAmBnB;IAEF,OAAgB,QAAQ;;;QAKtB;IAEF,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAiB;IAEhC,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;YASX,gBAAgB;YAoChB,YAAY;IAuB1B,OAAO,CAAC,cAAc;CAgBvB"}
+{"version":3,"file":"start.d.ts","sourceRoot":"","sources":["../../../../src/commands/agent/start.ts"],"names":[],"mappings":"AAyBA,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEjD,MAAM,CAAC,OAAO,OAAO,KAAM,SAAQ,WAAW,CAAC,OAAO,KAAK,CAAC;IAC1D,OAAgB,cAAc,UAAQ;IACtC,OAAgB,WAAW,SAAuB;IAClD,OAAgB,KAAK;;;;;;;;;;;;;MAmBnB;IAEF,OAAgB,QAAQ;;;QAKtB;IAEF,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAiB;IACtC,OAAO,CAAC,MAAM,CAAC,CAAQ;IAEjB,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;YASX,gBAAgB;YAwDhB,YAAY;YAuBZ,cAAc;CAgB7B"}

package/dist/src/commands/agent/start.js

@@ -2,29 +2,6 @@
 //
 // Copyright 2023 DXOS.org
 //
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -36,7 +13,7 @@ const agent_1 = require("@dxos/agent");
 const async_1 = require("@dxos/async");
 const client_protocol_1 = require("@dxos/client-protocol");
 const context_1 = require("@dxos/context");
-const Telemetry = __importStar(require("@dxos/telemetry"));
+const invariant_1 = require("@dxos/invariant");
 const base_command_1 = require("../../base-command");
 class Start extends base_command_1.BaseCommand {
     constructor() {
@@ -53,13 +30,14 @@ class Start extends base_command_1.BaseCommand {
         }
     }
     async _runInForeground() {
+        var _a, _b;
         const socket = 'unix://' + (0, client_protocol_1.getProfilePath)(client_protocol_1.DX_RUNTIME, this.flags.profile, 'agent.sock');
         {
             // Clear out old socket file.
             const { path } = (0, agent_1.parseAddress)(socket);
             (0, node_fs_1.rmSync)(path, { force: true });
         }
-        const agent = new agent_1.Agent({
+        this._agent = new agent_1.Agent({
             config: this.clientConfig,
             profile: this.flags.profile,
             metrics: this.flags.metrics,
@@ -70,15 +48,33 @@ class Start extends base_command_1.BaseCommand {
             plugins: [
                 new agent_1.ChainPlugin(),
                 new agent_1.DashboardPlugin(),
+                new agent_1.DiscordPlugin(),
                 new agent_1.EchoProxyPlugin(),
                 new agent_1.EpochMonitorPlugin(),
                 new agent_1.FunctionsPlugin(),
                 new agent_1.QueryPlugin(),
             ],
         });
-        await agent.start();
+        await this._agent.start();
         this.log('Agent started... (ctrl-c to exit)');
-        this._sendTelemetry();
+        await this._sendTelemetry();
+        (0, invariant_1.invariant)(this._telemetryContext);
+        const platform = (await ((_a = this._agent.client.services.services.SystemService) === null || _a === void 0 ? void 0 : _a.getPlatform()));
+        if (!platform) {
+            this.log('failed to get platform, could not initialize observability');
+            return undefined;
+        }
+        if ((_b = this._observability) === null || _b === void 0 ? void 0 : _b.enabled) {
+            this.log('Metrics initialized!');
+            this._observability.initialize();
+            await this._observability.setIdentityTags(this._agent.client);
+            await this._observability.setDeviceTags(this._agent.client);
+            await this._observability.startNetworkMetrics(this._agent.client);
+            await this._observability.startSpacesMetrics(this._agent.client);
+            await this._observability.startRuntimeMetrics(this._agent.client);
+            // initAgentMetrics(this._ctx, this._observability, this._startTime);
+            //  initClientMetrics(this._ctx, this._observability, this._agent!);
+        }
         if (this.flags.ws) {
             this.log(`Open devtools: https://devtools.dxos.org?target=ws://localhost:${this.flags.ws}`);
         }
@@ -105,11 +101,11 @@ class Start extends base_command_1.BaseCommand {
             }
         }, system);
     }
-    _sendTelemetry() {
+    async _sendTelemetry() {
         const sendTelemetry = async () => {
-            var _a;
-            Telemetry.event({
-                installationId: (_a = this._telemetryContext) === null || _a === void 0 ? void 0 : _a.installationId,
+            var _a, _b;
+            (_a = this._observability) === null || _a === void 0 ? void 0 : _a.event({
+                installationId: (_b = this._telemetryContext) === null || _b === void 0 ? void 0 : _b.installationId,
                 name: 'cli.command.run.agent',
                 properties: {
                     profile: this.flags.profile,

package/dist/src/commands/agent/start.js.map

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

package/dist/src/commands/space/list.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"list.d.ts","sourceRoot":"","sources":["../../../../src/commands/space/list.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,cAAc,CAAC;AAI3C,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAGjD,MAAM,CAAC,OAAO,OAAO,IAAK,SAAQ,WAAW,CAAC,OAAO,IAAI,CAAC;IACxD,OAAgB,cAAc,UAAQ;IACtC,OAAgB,WAAW,SAAkB;IAC7C,OAAgB,KAAK;;;;;;;;;;;;;;;;;;MAMnB;IAEI,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;IAkBnB,gBAAgB,CAAC,MAAM,EAAE,MAAM;CAwCtC"}
+{"version":3,"file":"list.d.ts","sourceRoot":"","sources":["../../../../src/commands/space/list.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,cAAc,CAAC;AAI3C,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAGjD,MAAM,CAAC,OAAO,OAAO,IAAK,SAAQ,WAAW,CAAC,OAAO,IAAI,CAAC;IACxD,OAAgB,cAAc,UAAQ;IACtC,OAAgB,WAAW,SAAkB;IAC7C,OAAgB,KAAK;;;;;;;;;;;;;;;;;;MAMnB;IAEI,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;IAkBnB,gBAAgB,CAAC,MAAM,EAAE,MAAM;CAkDtC"}

package/dist/src/commands/space/list.js

@@ -30,16 +30,27 @@ class List extends base_command_1.BaseCommand {
         const ctx = new context_1.Context();
         const subscriptions = new Map();
         ctx.onDispose(() => subscriptions.forEach((subscription) => subscription.unsubscribe()));
-        const update = new async_1.Event().debounce(1000);
-        update.on(ctx, async () => {
+        const update = new async_1.Event();
+        update.debounce(1000).on(ctx, async () => {
             console.clear();
             (0, util_1.printSpaces)(spaces, this.flags);
         });
-        const subscribeToSpaceUpdate = (space) => space.pipeline.subscribe({
-            next: () => {
+        const subscribeToSpaceUpdate = (space) => {
+            const sub1 = space.pipeline.subscribe({
+                next: () => {
+                    update.emit();
+                },
+            });
+            const sub2 = space.db.query().subscribe(() => {
                 update.emit();
-            },
-        });
+            });
+            return {
+                unsubscribe: () => {
+                    sub1.unsubscribe();
+                    sub2();
+                },
+            };
+        };
         // Monitor space updates.
         let spaces = await this.getSpaces(client);
         spaces.forEach((space) => {

package/dist/src/commands/space/list.js.map

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

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

@@ -1 +1 @@
-{"version":3,"file":"invitations.d.ts","sourceRoot":"","sources":["../../../src/util/invitations.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,KAAK,kCAAkC,EACvC,KAAK,+BAA+B,EACpC,UAAU,EACX,MAAM,0BAA0B,CAAC;AAGlC,eAAO,MAAM,cAAc;gBAKb,+BAA+B;;qCAEb,UAAU,KAAK,QAAQ,IAAI,CAAC;kCAC/B,UAAU,KAAK,QAAQ,IAAI,CAAC;;;MAGrD,QAAQ,UAAU,CA2BrB,CAAC;AAEF,eAAO,MAAM,gBAAgB;gBAIf,kCAAkC;;qCAEhB,UAAU,KAAK,QAAQ,IAAI,CAAC;uCAC1B,UAAU,KAAK,QAAQ,MAAM,GAAG,IAAI,CAAC;kCAC1C,UAAU,KAAK,QAAQ,IAAI,CAAC;;MAErD,QAAQ,UAAU,CAmCrB,CAAC"}
+{"version":3,"file":"invitations.d.ts","sourceRoot":"","sources":["../../../src/util/invitations.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,KAAK,kCAAkC,EACvC,KAAK,+BAA+B,EACpC,UAAU,EACX,MAAM,0BAA0B,CAAC;AAIlC,eAAO,MAAM,cAAc;gBAKb,+BAA+B;;qCAEb,UAAU,KAAK,QAAQ,IAAI,CAAC;kCAC/B,UAAU,KAAK,QAAQ,IAAI,CAAC;;;MAGrD,QAAQ,UAAU,CA2BrB,CAAC;AAEF,eAAO,MAAM,gBAAgB;gBAIf,kCAAkC;;qCAEhB,UAAU,KAAK,QAAQ,IAAI,CAAC;uCAC1B,UAAU,KAAK,QAAQ,MAAM,GAAG,IAAI,CAAC;kCAC1C,UAAU,KAAK,QAAQ,IAAI,CAAC;;MAErD,QAAQ,UAAU,CAwCrB,CAAC"}

package/dist/src/util/invitations.js

@@ -7,6 +7,7 @@ exports.acceptInvitation = exports.hostInvitation = void 0;
 const async_1 = require("@dxos/async");
 const invitations_1 = require("@dxos/client/invitations");
 const invariant_1 = require("@dxos/invariant");
+const protocols_1 = require("@dxos/protocols");
 const hostInvitation = async ({ observable, callbacks, peersNumber = 1, }) => {
     const invitationEvent = new async_1.Event();
     const done = invitationEvent.waitForCount(peersNumber);
@@ -56,6 +57,10 @@ const acceptInvitation = async ({ observable, callbacks, }) => {
             }
         }
     }, (err) => {
+        if (err instanceof protocols_1.AlreadyJoinedError) {
+            done.wake(observable.get());
+            return;
+        }
         throw err;
     });
     const invitation = await done.wait();

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

@@ -1 +1 @@
-{"version":3,"file":"invitations.js","sourceRoot":"","sources":["../../../src/util/invitations.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;AAEF,uCAA6C;AAC7C,0DAIkC;AAClC,+CAA4C;AAErC,MAAM,cAAc,GAAG,KAAK,EAAE,EACnC,UAAU,EACV,SAAS,EACT,WAAW,GAAG,CAAC,GAQhB,EAAuB,EAAE;IACxB,MAAM,eAAe,GAAG,IAAI,aAAK,EAAc,CAAC;IAEhD,MAAM,IAAI,GAAG,eAAe,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;IACvD,MAAM,iBAAiB,GAAG,UAAU,CAAC,SAAS,CAC5C,KAAK,EAAE,UAAU,EAAE,EAAE;;QACnB,QAAQ,UAAU,CAAC,KAAK,EAAE;YACxB,KAAK,wBAAU,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;gBAChC,MAAM,CAAA,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,YAAY,0DAAG,UAAU,CAAC,CAAA,CAAC;gBAC5C,MAAM;aACP;YAED,KAAK,wBAAU,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;gBAC7B,MAAM,CAAA,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,SAAS,0DAAG,UAAU,CAAC,CAAA,CAAC;gBACzC,eAAe,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;gBACjC,MAAM;aACP;SACF;IACH,CAAC,EACD,CAAC,GAAG,EAAE,EAAE;QACN,MAAM,GAAG,CAAC;IACZ,CAAC,CACF,CAAC;IAEF,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC;IAC9B,iBAAiB,CAAC,WAAW,EAAE,CAAC;IAChC,OAAO,UAAU,CAAC;AACpB,CAAC,CAAC;AAtCW,QAAA,cAAc,kBAsCzB;AAEK,MAAM,gBAAgB,GAAG,KAAK,EAAE,EACrC,UAAU,EACV,SAAS,GAQV,EAAuB,EAAE;IACxB,MAAM,IAAI,GAAG,IAAI,eAAO,EAAc,CAAC;IACvC,MAAM,iBAAiB,GAAG,UAAU,CAAC,SAAS,CAC5C,KAAK,EAAE,UAAU,EAAE,EAAE;;QACnB,QAAQ,UAAU,CAAC,KAAK,EAAE;YACxB,KAAK,wBAAU,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;gBAChC,MAAM,CAAA,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,YAAY,0DAAG,UAAU,CAAC,CAAA,CAAC;gBAC5C,MAAM;aACP;YAED,KAAK,wBAAU,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAC;gBAC9C,IAAI,UAAU,CAAC,UAAU,KAAK,wBAAU,CAAC,UAAU,CAAC,aAAa,EAAE;oBACjE,MAAM,cAAc,GAAG,MAAM,CAAA,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,cAAc,0DAAG,UAAU,CAAC,CAAA,CAAC;oBACrE,MAAM,IAAI,GAAG,MAAA,UAAU,CAAC,QAAQ,mCAAI,cAAc,CAAC;oBACnD,IAAA,qBAAS,EAAC,IAAI,EAAE,kBAAkB,CAAC,CAAC;oBACpC,MAAM,UAAU,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;iBACrC;gBACD,MAAM;aACP;YAED,KAAK,wBAAU,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;gBAC7B,MAAM,CAAA,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,SAAS,0DAAG,UAAU,CAAC,CAAA,CAAC;gBACzC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;gBACtB,MAAM;aACP;SACF;IACH,CAAC,EACD,CAAC,GAAG,EAAE,EAAE;QACN,MAAM,GAAG,CAAC;IACZ,CAAC,CACF,CAAC;IAEF,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;IACrC,iBAAiB,CAAC,WAAW,EAAE,CAAC;IAChC,OAAO,UAAU,CAAC;AACpB,CAAC,CAAC;AA7CW,QAAA,gBAAgB,oBA6C3B"}
+{"version":3,"file":"invitations.js","sourceRoot":"","sources":["../../../src/util/invitations.ts"],"names":[],"mappings":"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"}

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

@@ -1,3 +1,4 @@
+import { type CID } from 'ipfs-http-client';
 import type { Config } from '@dxos/client';
 import { type Logger, type PackageModule } from './common';
 export interface PublishParams {
@@ -12,6 +13,6 @@ interface PublishArgs {
     path?: string;
     config?: string;
 }
-export declare const publish: ({ verbose, timeout, path, pin }: PublishArgs, { log, config, module }: PublishParams) => Promise<import("ipfs-http-client").CID>;
+export declare const publish: ({ verbose, timeout, path, pin }: PublishArgs, { log, config, module }: PublishParams) => Promise<CID>;
 export {};
 //# sourceMappingURL=publish.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"publish.d.ts","sourceRoot":"","sources":["../../../../src/util/publish/publish.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAG3C,OAAO,EAAE,KAAK,MAAM,EAAE,KAAK,aAAa,EAAE,MAAM,UAAU,CAAC;AAc3D,MAAM,WAAW,aAAa;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,aAAa,CAAC;CACvB;AAED,UAAU,WAAW;IACnB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC1B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,eAAO,MAAM,OAAO,oCAA2C,WAAW,2BAA2B,aAAa,4CA6BjH,CAAC"}
+{"version":3,"file":"publish.d.ts","sourceRoot":"","sources":["../../../../src/util/publish/publish.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,KAAK,GAAG,EAAE,MAAM,kBAAkB,CAAC;AAI5C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAG3C,OAAO,EAAE,KAAK,MAAM,EAAE,KAAK,aAAa,EAAE,MAAM,UAAU,CAAC;AAc3D,MAAM,WAAW,aAAa;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,aAAa,CAAC;CACvB;AAED,UAAU,WAAW;IACnB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC1B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,eAAO,MAAM,OAAO,oCACe,WAAW,2BACnB,aAAa,KACrC,QAAQ,GAAG,CA8Bb,CAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"publish.js","sourceRoot":"","sources":["../../../../src/util/publish/publish.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,kDAA0B;AAC1B,gEAAuC;AACvC,4CAAoB;AACpB,sEAAyC;AACzC,+BAA4B;AAC5B,+BAAiC;AAGjC,+CAA4C;AAG5C,+CAA6C;AAE7C,MAAM,cAAc,GAAG,KAAK,CAAC;AAE7B,MAAM,aAAa,GAAG,IAAA,gBAAS,EAAC,yBAAU,CAAC,CAAC;AAE5C;;;;GAIG;AACH,MAAM,UAAU,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;AAgBxD,MAAM,OAAO,GAAG,KAAK,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,EAAe,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAiB,EAAE,EAAE;;IACpH,IAAA,qBAAS,EAAC,MAAM,CAAC,IAAI,EAAE,qCAAqC,CAAC,CAAC;IAC9D,GAAG,CAAC,qBAAqB,eAAK,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACxD,MAAM,SAAS,GAAG,OAAO,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;IACnD,MAAM,MAAM,GAAG,MAAA,IAAI,aAAJ,IAAI,cAAJ,IAAI,GAAI,MAAA,MAAM,CAAC,KAAK,0CAAE,MAAM,mCAAI,CAAC,YAAE,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC;IACvG,MAAM,aAAa,GAAG,IAAA,WAAI,EAAC,OAAO,CAAC,GAAG,EAAE,EAAE,MAAM,CAAC,CAAC;IAClD,IAAI,CAAC,YAAE,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE;QACjC,MAAM,IAAI,KAAK,CAAC,uDAAuD,aAAa,GAAG,CAAC,CAAC;KAC1F;IACD,MAAM,KAAK,GAAG,MAAM,aAAa,CAAC,aAAa,CAAC,CAAC;IACjD,IAAI,OAAO,EAAE;QACX,GAAG,CAAC,oBAAoB,aAAa,EAAE,CAAC,CAAC;KAC1C;IACD,GAAG,CAAC,cAAc,CAAC,CAAC;IACpB,MAAM,GAAG,GAAG,IAAI,sBAAW,CAAC,SAAS,CAAC,EAAE,EAAE,sBAAW,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;IAC9E,OAAO,IAAI,GAAG,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;IAE/B,MAAM,GAAG,GAAG,MAAM,IAAA,0BAAY,EAAC,aAAa,EAAE,MAAM,EAAE;QACpD,OAAO,EAAE,OAAO,IAAI,KAAK;QACzB,GAAG;QACH,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,KAAU,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS;KAClE,CAAC,CAAC;IAEH,OAAO,IAAI,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAC7B,OAAO,IAAI,GAAG,CAAC,IAAI,EAAE,CAAC;IAEtB,GAAG,CAAC,oBAAoB,eAAK,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,eAAe,GAAG,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;IAEhF,OAAO,GAAG,CAAC;AACb,CAAC,CAAC;AA7BW,QAAA,OAAO,WA6BlB"}
+{"version":3,"file":"publish.js","sourceRoot":"","sources":["../../../../src/util/publish/publish.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,kDAA0B;AAC1B,gEAAuC;AACvC,4CAAoB;AACpB,sEAAyC;AAEzC,+BAA4B;AAC5B,+BAAiC;AAGjC,+CAA4C;AAG5C,+CAA6C;AAE7C,MAAM,cAAc,GAAG,KAAK,CAAC;AAE7B,MAAM,aAAa,GAAG,IAAA,gBAAS,EAAC,yBAAU,CAAC,CAAC;AAE5C;;;;GAIG;AACH,MAAM,UAAU,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;AAgBxD,MAAM,OAAO,GAAG,KAAK,EAC1B,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,EAAe,EAC5C,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAiB,EACxB,EAAE;;IAChB,IAAA,qBAAS,EAAC,MAAM,CAAC,IAAI,EAAE,qCAAqC,CAAC,CAAC;IAC9D,GAAG,CAAC,qBAAqB,eAAK,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACxD,MAAM,SAAS,GAAG,OAAO,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;IACnD,MAAM,MAAM,GAAG,MAAA,IAAI,aAAJ,IAAI,cAAJ,IAAI,GAAI,MAAA,MAAM,CAAC,KAAK,0CAAE,MAAM,mCAAI,CAAC,YAAE,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC;IACvG,MAAM,aAAa,GAAG,IAAA,WAAI,EAAC,OAAO,CAAC,GAAG,EAAE,EAAE,MAAM,CAAC,CAAC;IAClD,IAAI,CAAC,YAAE,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE;QACjC,MAAM,IAAI,KAAK,CAAC,uDAAuD,aAAa,GAAG,CAAC,CAAC;KAC1F;IAED,MAAM,KAAK,GAAG,MAAM,aAAa,CAAC,aAAa,CAAC,CAAC;IACjD,IAAI,OAAO,EAAE;QACX,GAAG,CAAC,oBAAoB,aAAa,EAAE,CAAC,CAAC;KAC1C;IAED,GAAG,CAAC,cAAc,CAAC,CAAC;IACpB,MAAM,GAAG,GAAG,IAAI,sBAAW,CAAC,SAAS,CAAC,EAAE,EAAE,sBAAW,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;IAC9E,OAAO,IAAI,GAAG,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;IAE/B,MAAM,GAAG,GAAG,MAAM,IAAA,0BAAY,EAAC,aAAa,EAAE,MAAM,EAAE;QACpD,OAAO,EAAE,OAAO,IAAI,KAAK;QACzB,GAAG;QACH,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,KAAU,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS;KAClE,CAAC,CAAC;IAEH,OAAO,IAAI,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAC7B,OAAO,IAAI,GAAG,CAAC,IAAI,EAAE,CAAC;IAEtB,GAAG,CAAC,oBAAoB,eAAK,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,eAAe,GAAG,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;IAChF,OAAO,GAAG,CAAC;AACb,CAAC,CAAC;AAjCW,QAAA,OAAO,WAiClB"}

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

@@ -1,14 +1,7 @@
-export declare const DX_ENVIRONMENT: undefined;
-export declare const DX_RELEASE: undefined;
-export declare const SENTRY_DESTINATION: undefined;
-export declare const TELEMETRY_API_KEY: undefined;
-export declare const IPDATA_API_KEY: string;
 export type TelemetryContext = {
     mode: 'disabled' | 'basic' | 'full';
     installationId?: string;
     group?: string;
-    environment?: string;
-    release?: string;
     timezone: string;
     runtime: string;
     os: string;
@@ -16,7 +9,6 @@ export type TelemetryContext = {
     ci: boolean;
     [key: string]: any;
 };
-export declare const disableTelemetry: (configDir: string) => Promise<void>;
 /**
  * Print telemetry banner once per installation.
  */

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

@@ -1 +1 @@
-{"version":3,"file":"telemetry.d.ts","sourceRoot":"","sources":["../../../src/util/telemetry.ts"],"names":[],"mappings":"AAiBA,eAAO,MAAM,cAAc,WAAqC,CAAC;AACjE,eAAO,MAAM,UAAU,WAAiC,CAAC;AACzD,eAAO,MAAM,kBAAkB,WAAyC,CAAC;AACzE,eAAO,MAAM,iBAAiB,WAAwC,CAAC;AACvE,eAAO,MAAM,cAAc,QAAqC,CAAC;AAOjE,MAAM,MAAM,gBAAgB,GAAG;IAC7B,IAAI,EAAE,UAAU,GAAG,OAAO,GAAG,MAAM,CAAC;IACpC,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,OAAO,CAAC;IACZ,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB,CAAC;AAaF,eAAO,MAAM,gBAAgB,cAAqB,MAAM,kBAiBvD,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,mBAAmB,cAAqB,MAAM,kBAY1D,CAAC;AAEF,eAAO,MAAM,mBAAmB,cAAqB,MAAM,KAAG,QAAQ,gBAAgB,CAcrF,CAAC"}
+{"version":3,"file":"telemetry.d.ts","sourceRoot":"","sources":["../../../src/util/telemetry.ts"],"names":[],"mappings":"AAkBA,MAAM,MAAM,gBAAgB,GAAG;IAC7B,IAAI,EAAE,UAAU,GAAG,OAAO,GAAG,MAAM,CAAC;IACpC,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,OAAO,CAAC;IACZ,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB,CAAC;AAaF;;GAEG;AAEH,eAAO,MAAM,mBAAmB,cAAqB,MAAM,kBAS1D,CAAC;AAEF,eAAO,MAAM,mBAAmB,cAAqB,MAAM,KAAG,QAAQ,gBAAgB,CAcrF,CAAC"}

package/dist/src/util/telemetry.js

@@ -5,67 +5,39 @@
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _a, _b, _c, _d, _e, _f, _g, _h;
+var _a, _b, _c;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getTelemetryContext = exports.showTelemetryBanner = exports.disableTelemetry = exports.IPDATA_API_KEY = exports.TELEMETRY_API_KEY = exports.SENTRY_DESTINATION = exports.DX_RELEASE = exports.DX_ENVIRONMENT = void 0;
+exports.getTelemetryContext = exports.showTelemetryBanner = void 0;
 const chalk_1 = __importDefault(require("chalk"));
 const js_yaml_1 = __importDefault(require("js-yaml"));
 const promises_1 = require("node:fs/promises");
 const node_os_1 = __importDefault(require("node:os"));
 const node_path_1 = require("node:path");
 const uuid_1 = require("uuid");
-const sentry_1 = require("@dxos/sentry");
-const telemetry_1 = require("@dxos/telemetry");
-const telemetryrc_json_1 = __importDefault(require("./telemetryrc.json"));
 // read API keys from file generated on publish or deploy
-exports.DX_ENVIRONMENT = (_a = telemetryrc_json_1.default.DX_ENVIRONMENT) !== null && _a !== void 0 ? _a : undefined;
-exports.DX_RELEASE = (_b = telemetryrc_json_1.default.DX_RELEASE) !== null && _b !== void 0 ? _b : undefined;
-exports.SENTRY_DESTINATION = (_c = telemetryrc_json_1.default.SENTRY_DESTINATION) !== null && _c !== void 0 ? _c : undefined;
-exports.TELEMETRY_API_KEY = (_d = telemetryrc_json_1.default.TELEMETRY_API_KEY) !== null && _d !== void 0 ? _d : undefined;
-exports.IPDATA_API_KEY = (_e = telemetryrc_json_1.default.IPDATA_API_KEY) !== null && _e !== void 0 ? _e : undefined;
 // TODO(nf): read initial values from config or seed file
-const DX_TELEMETRY_GROUP = (_f = process.env.DX_TELEMETRY_GROUP) !== null && _f !== void 0 ? _f : undefined;
-const DX_TELEMETRY_MODE = (_g = process.env.DX_TELEMETRY_MODE) !== null && _g !== void 0 ? _g : undefined;
-const DX_DISABLE_TELEMETRY = (_h = process.env.DX_DISABLE_TELEMETRY) !== null && _h !== void 0 ? _h : false;
+const DX_TELEMETRY_GROUP = (_a = process.env.DX_TELEMETRY_GROUP) !== null && _a !== void 0 ? _a : undefined;
+const DX_TELEMETRY_MODE = (_b = process.env.DX_TELEMETRY_MODE) !== null && _b !== void 0 ? _b : undefined;
+const DX_DISABLE_TELEMETRY = (_c = process.env.DX_DISABLE_TELEMETRY) !== null && _c !== void 0 ? _c : false;
 const DEFAULTS = {
     mode: 'basic',
-    environment: exports.DX_ENVIRONMENT,
-    release: exports.DX_RELEASE,
     timezone: Intl.DateTimeFormat().resolvedOptions().timeZone,
     runtime: `node ${process.version}`,
     os: node_os_1.default.platform(),
     arch: node_os_1.default.arch(),
     ci: process.env.CI === 'true',
 };
-const disableTelemetry = async (configDir) => {
-    if (!exports.TELEMETRY_API_KEY) {
-        return;
-    }
-    const { installationId } = await (0, exports.getTelemetryContext)(configDir);
-    const path = (0, node_path_1.join)(configDir, '.telemetry-disabled');
-    if (await exists(path)) {
-        return;
-    }
-    (0, telemetry_1.init)({ apiKey: exports.TELEMETRY_API_KEY, batchSize: 1, enable: true });
-    (0, telemetry_1.event)({
-        installationId,
-        name: 'cli.telemetry.disable',
-    });
-    await (0, promises_1.writeFile)(path, '', 'utf-8');
-};
-exports.disableTelemetry = disableTelemetry;
+// TODO(nf): presence of file not checked
 /**
  * Print telemetry banner once per installation.
  */
+// TODO(nf): move to Observability
 const showTelemetryBanner = async (configDir) => {
-    if (!exports.TELEMETRY_API_KEY) {
-        return;
-    }
     const path = (0, node_path_1.join)(configDir, '.telemetry-banner-printed');
     if (await exists(path)) {
         return;
     }
-    console.log((0, chalk_1.default) `{bold {magenta DXOS collects anonymous telemetry data to improve the CLI. To disable it add DX_DISABLE_TELEMETRY=true to your environment.}}`);
+    process.stderr.write((0, chalk_1.default) `{bold {magenta DXOS collects anonymous telemetry data to improve the CLI. To disable it add DX_DISABLE_TELEMETRY=true to your environment.}}`);
     await (0, promises_1.writeFile)(path, '', 'utf-8');
 };
 exports.showTelemetryBanner = showTelemetryBanner;
@@ -99,18 +71,13 @@ const createContext = async (idPath) => {
 };
 const validate = (contextString) => {
     var _a;
-    try {
-        const context = js_yaml_1.default.load(contextString);
-        if (Boolean(context.installationId) && (0, uuid_1.validate)(context.installationId)) {
-            return {
-                ...DEFAULTS,
-                ...context,
-                mode: DX_DISABLE_TELEMETRY ? 'disabled' : (_a = context.mode) !== null && _a !== void 0 ? _a : DEFAULTS.mode,
-            };
-        }
-    }
-    catch (err) {
-        (0, sentry_1.captureException)(err);
+    const context = js_yaml_1.default.load(contextString);
+    if (Boolean(context.installationId) && (0, uuid_1.validate)(context.installationId)) {
+        return {
+            ...DEFAULTS,
+            ...context,
+            mode: DX_DISABLE_TELEMETRY ? 'disabled' : (_a = context.mode) !== null && _a !== void 0 ? _a : DEFAULTS.mode,
+        };
     }
 };
 // TODO(wittjosiah): Factor out.

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

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

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.3.10",
+  "version": "0.3.11-main.0252f93",
   "commands": {
     "agent:list": {
       "id": "agent:list",
@@ -3524,7 +3524,7 @@
           "type": "option",
           "description": "Tunnel name",
           "multiple": false,
-          "default": "blossom-louisiana-eighteen-texas"
+          "default": "spring-april-wisconsin-single"
         }
       },
       "args": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/cli",
-  "version": "0.3.10",
+  "version": "0.3.11-main.0252f93",
   "description": "DXOS CLI",
   "keywords": [
     "dxos",
@@ -14,7 +14,7 @@
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
   "bin": {
-    "dx": "./bin/run"
+    "dx": "./bin/dx"
   },
   "files": [
     "/bin",
@@ -28,7 +28,7 @@
     "@octokit/core": "^4.0.4",
     "chalk": "^4.1.0",
     "cli-progress": "^3.11.2",
-    "date-fns": "^2.29.3",
+    "date-fns": "^3.3.1",
     "do-wrapper": "^4.5.1",
     "fs-extra": "^8.1.0",
     "get-folder-size": "^2.0.1",
@@ -36,7 +36,7 @@
     "ink": "^3.2.0",
     "ink-table": "~3.0.0",
     "inquirer": "^8.2.0",
-    "ipfs-http-client": "~56.0.1",
+    "ipfs-http-client": "^56.0.3",
     "isomorphic-ws": "^4.0.1",
     "js-yaml": "^4.1.0",
     "lodash.defaultsdeep": "^4.6.1",
@@ -45,26 +45,27 @@
     "react": "^18.2.0",
     "uuid": "^8.3.2",
     "ws": "^8.14.2",
-    "@dxos/agent": "0.3.10",
-    "@dxos/async": "0.3.10",
-    "@dxos/bare-template": "0.3.10",
-    "@dxos/client": "0.3.10",
-    "@dxos/client-protocol": "0.3.10",
-    "@dxos/config": "0.3.10",
-    "@dxos/context": "0.3.10",
-    "@dxos/debug": "0.3.10",
-    "@dxos/functions": "0.3.10",
-    "@dxos/hello-template": "0.3.10",
-    "@dxos/invariant": "0.3.10",
-    "@dxos/log": "0.3.10",
-    "@dxos/plate": "0.3.10",
-    "@dxos/process": "0.3.10",
-    "@dxos/protocols": "0.3.10",
-    "@dxos/rpc": "0.3.10",
-    "@dxos/sentry": "0.3.10",
-    "@dxos/tasks-template": "0.3.10",
-    "@dxos/telemetry": "0.3.10",
-    "@dxos/util": "0.3.10"
+    "@dxos/agent": "0.3.11-main.0252f93",
+    "@dxos/bare-template": "0.3.11-main.0252f93",
+    "@dxos/async": "0.3.11-main.0252f93",
+    "@dxos/client": "0.3.11-main.0252f93",
+    "@dxos/client-protocol": "0.3.11-main.0252f93",
+    "@dxos/client-services": "0.3.11-main.0252f93",
+    "@dxos/config": "0.3.11-main.0252f93",
+    "@dxos/context": "0.3.11-main.0252f93",
+    "@dxos/debug": "0.3.11-main.0252f93",
+    "@dxos/functions": "0.3.11-main.0252f93",
+    "@dxos/invariant": "0.3.11-main.0252f93",
+    "@dxos/hello-template": "0.3.11-main.0252f93",
+    "@dxos/log": "0.3.11-main.0252f93",
+    "@dxos/network-manager": "0.3.11-main.0252f93",
+    "@dxos/process": "0.3.11-main.0252f93",
+    "@dxos/observability": "0.3.11-main.0252f93",
+    "@dxos/protocols": "0.3.11-main.0252f93",
+    "@dxos/plate": "0.3.11-main.0252f93",
+    "@dxos/rpc": "0.3.11-main.0252f93",
+    "@dxos/tasks-template": "0.3.11-main.0252f93",
+    "@dxos/util": "0.3.11-main.0252f93"
   },
   "devDependencies": {
     "@oclif/test": "^2.3.31",
@@ -124,8 +125,7 @@
     }
   },
   "scripts": {
-    "api-keys": "node ./scripts/inject_api_keys.js",
-    "bin": "./bin/run",
+    "bin": "./bin/dx",
     "readme": "oclif readme --multi"
   }
 }

package/dist/src/util/telemetryrc.json

@@ -1,7 +0,0 @@
-{
-    "DX_ENVIRONMENT": null,
-    "DX_RELEASE": null,
-    "SENTRY_DESTINATION": null,
-    "TELEMETRY_API_KEY": null,
-    "IPDATA_API_KEY": "ccc5f0cd66dd34a7c31c2ddc61c2bbca2db73892a993982bb3a5f0e2"
-}