@dxos/cli 0.5.7-next.f4a5d7e → 0.5.8-main.1e35f75

package/bin/agent_entrypoint

@@ -1,4 +1,5 @@
 #!/bin/bash
+
 # TODO(nf): container currently built with Debian due to musl incompatibilities, but still avoiding bash-isms
 set -eu
 

package/dist/src/base.d.ts

@@ -1,133 +1,18 @@
-import { Command, type Config as OclifConfig, type Interfaces } from '@oclif/core';
-import { type Daemon } from '@dxos/agent';
-import { Client, Config } from '@dxos/client';
-import { type Space } from '@dxos/client/echo';
-import { type S } from '@dxos/echo-schema';
-import { type Observability } from '@dxos/observability';
+import type { Command } from '@oclif/core';
+import { AbstractBaseCommand, FriendlyError } from '@dxos/cli-base';
 import { PublisherRpcPeer, SupervisorRpcPeer, 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']>;
-/**
- * @deprecated Change to flag.
- */
-export declare const ARG_SPACE_KEYS: {
-    key: Interfaces.Arg<string | undefined, Record<string, unknown>>;
-};
-export declare const FLAG_SPACE_KEYS: {
-    key: Interfaces.OptionFlag<string[] | undefined, Interfaces.CustomOptions>;
-};
-/**
- * Custom base command.
- * https://oclif.io/docs/base_class#docsNav
- * https://github.com/salesforcecli/sf-plugins-core/blob/main/src/sfCommand.ts
- */
-export declare abstract class BaseCommand<T extends typeof Command = any> extends Command {
-    static enableJsonFlag: boolean;
-    static flags: {
-        json: Interfaces.BooleanFlag<boolean>;
-        'dry-run': Interfaces.BooleanFlag<boolean>;
-        verbose: Interfaces.BooleanFlag<boolean>;
-        profile: Interfaces.OptionFlag<string, Interfaces.CustomOptions>;
-        config: Interfaces.OptionFlag<string, Interfaces.CustomOptions>;
-        target: Interfaces.OptionFlag<string | undefined, Interfaces.CustomOptions>;
-        'no-agent': Interfaces.BooleanFlag<boolean>;
-        timeout: Interfaces.OptionFlag<number, Interfaces.CustomOptions>;
-        'no-wait': Interfaces.BooleanFlag<boolean>;
-        'json-log': Interfaces.BooleanFlag<boolean>;
-        'json-logfile': Interfaces.OptionFlag<string, Interfaces.CustomOptions>;
-    };
-    private _clientConfig?;
-    private _client?;
-    private _failing;
-    protected _startTime: Date;
-    protected _observability?: Observability;
-    protected flags: Flags<T>;
-    protected args: Args<T>;
-    constructor(argv: string[], config: OclifConfig);
-    get clientConfig(): Config;
-    get duration(): number;
-    done(): void;
-    /**
-     * Load the client config.
-     */
-    init(): Promise<void>;
-    readStdin(): Promise<string>;
-    private _initObservability;
-    /**
-     * Load or create config file from defaults.
-     * @private
-     */
-    private _loadConfigFromFile;
-    /**
-     * Use this method for user-facing messages.
-     * Use @dxos/logger for internal messages.
-     */
-    log(message: string, ...args: any[]): void;
-    /**
-     * Use this method for user-facing warnings.
-     * Use @dxos/logger for internal messages.
-     */
-    warn(err: string | Error): string | Error;
-    /**
-     * Use this method for user-facing errors.
-     * Use @dxos/logger for internal messages.
-     * NOTE: Full stack trace is displayed if `oclif.settings.debug = true` (see bin script).
-     * https://oclif.io/docs/error_handling
-     */
-    catch(err: string | Error, options?: any): never;
-    /**
-     * Called after each command run.
-     */
-    finally(): Promise<void>;
-    maybeStartDaemon(): Promise<void>;
-    /**
-     * Lazily create the client.
-     */
-    getClient(): Promise<Client>;
-    /**
-     * Get spaces and optionally wait until ready.
-     */
-    getSpaces(client: Client, { spaceKeys, includeHalo, wait, }?: {
-        spaceKeys?: string[];
-        includeHalo?: boolean;
-        wait?: boolean;
-    }): Promise<Space[]>;
-    /**
-     * Get or select space.
-     */
-    getSpace(client: Client, key?: string, wait?: boolean): Promise<Space>;
-    /**
-     * Execute callback with the given space(s).
-     */
-    execWithSpace<T>(callback: (props: {
-        client: Client;
-        space: Space;
-    }) => Promise<T | undefined>, options?: {
-        spaceKeys?: string[];
-        all?: boolean;
-        types?: S.Schema<any>[];
-        verbose?: boolean;
-    }): Promise<T[] | undefined>;
-    /**
-     * Convenience function to wrap command passing in client object.
-     */
-    execWithClient<T>(callback: (client: Client) => Promise<T | undefined>, options?: {
-        halo?: boolean;
-    }): Promise<T | undefined>;
-    /**
-     * Hook for client initialization.
-     */
-    protected onClientInit(client: Client): Promise<void>;
-    /**
-     * Convenience function to wrap starting the agent.
-     */
-    execWithDaemon<T>(callback: (daemon: Daemon) => Promise<T | undefined>, system: boolean): Promise<T | undefined>;
+export declare class PublisherConnectionError extends FriendlyError {
+    constructor();
+}
+export declare abstract class BaseCommand<T extends typeof Command = any> extends AbstractBaseCommand<T> {
     /**
      * Convenience function to wrap command passing in KUBE publisher.
      */
     execWithPublisher<T>(callback: (rpc: PublisherRpcPeer) => Promise<T | undefined>): Promise<T | undefined>;
+    /**
+     * @deprecated
+     */
     execWithTunneling<T>(callback: (rpc: TunnelRpcPeer) => Promise<T | undefined>): Promise<T | undefined>;
     execWithSupervisor<T>(callback: (rpc: SupervisorRpcPeer) => Promise<T | undefined>): Promise<T | undefined>;
-    parseJson<T>(filename: string): T;
 }
 //# sourceMappingURL=base.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../../src/base.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../../src/base.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAE3C,OAAO,EAAE,mBAAmB,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAGpE,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAC;AAE5E,qBAAa,wBAAyB,SAAQ,aAAa;;CAI1D;AAGD,8BAAsB,WAAW,CAAC,CAAC,SAAS,OAAO,OAAO,GAAG,GAAG,CAAE,SAAQ,mBAAmB,CAAC,CAAC,CAAC;IAC9F;;OAEG;IACG,iBAAiB,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,GAAG,EAAE,gBAAgB,KAAK,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC,GAAG,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IAkB/G;;OAEG;IACG,iBAAiB,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,GAAG,EAAE,aAAa,KAAK,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC,GAAG,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IAiBtG,kBAAkB,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,GAAG,EAAE,iBAAiB,KAAK,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC,GAAG,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;CAgBlH"}