@dxos/cli 0.5.1-next.2ad6c47 → 0.5.1-next.5a770e3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/cli",
-  "version": "0.5.1-next.2ad6c47",
+  "version": "0.5.1-next.5a770e3",
   "description": "DXOS CLI",
   "keywords": [
     "dxos",
@@ -23,8 +23,8 @@
     "/oclif.manifest.json"
   ],
   "dependencies": {
-    "@oclif/core": "^2.9.4",
-    "@oclif/plugin-help": "^5.2.14",
+    "@oclif/core": "^3.26.6",
+    "@oclif/plugin-help": "^6.0.22",
     "@octokit/core": "^4.0.4",
     "chalk": "^4.1.0",
     "cli-progress": "^3.11.2",
@@ -36,42 +36,44 @@
     "ink": "^3.2.0",
     "ink-table": "~3.0.0",
     "inquirer": "^8.2.0",
-    "isomorphic-ws": "^4.0.1",
+    "isomorphic-ws": "^5.0.0",
     "js-yaml": "^4.1.0",
-    "kubo-rpc-client": "^3.0.2",
+    "kubo-rpc-client": "^4.1.1",
     "lodash.defaultsdeep": "^4.6.1",
+    "node-clipboardy": "^1.0.3",
     "node-fetch": "^2.6.0",
     "pkg-up": "^3.1.0",
     "platform": "^1.3.6",
     "react": "^18.2.0",
+    "undici": "*",
     "uuid": "^8.3.2",
     "ws": "^8.14.2",
     "wtfnode": "^0.9.1",
-    "@dxos/async": "0.5.1-next.2ad6c47",
-    "@dxos/agent": "0.5.1-next.2ad6c47",
-    "@dxos/bare-template": "0.5.1-next.2ad6c47",
-    "@dxos/client-protocol": "0.5.1-next.2ad6c47",
-    "@dxos/client": "0.5.1-next.2ad6c47",
-    "@dxos/config": "0.5.1-next.2ad6c47",
-    "@dxos/client-services": "0.5.1-next.2ad6c47",
-    "@dxos/context": "0.5.1-next.2ad6c47",
-    "@dxos/functions": "0.5.1-next.2ad6c47",
-    "@dxos/debug": "0.5.1-next.2ad6c47",
-    "@dxos/invariant": "0.5.1-next.2ad6c47",
-    "@dxos/hello-template": "0.5.1-next.2ad6c47",
-    "@dxos/network-manager": "0.5.1-next.2ad6c47",
-    "@dxos/log": "0.5.1-next.2ad6c47",
-    "@dxos/observability": "0.5.1-next.2ad6c47",
-    "@dxos/process": "0.5.1-next.2ad6c47",
-    "@dxos/plate": "0.5.1-next.2ad6c47",
-    "@dxos/protocols": "0.5.1-next.2ad6c47",
-    "@dxos/random": "0.5.1-next.2ad6c47",
-    "@dxos/rpc": "0.5.1-next.2ad6c47",
-    "@dxos/tasks-template": "0.5.1-next.2ad6c47",
-    "@dxos/util": "0.5.1-next.2ad6c47"
+    "@dxos/agent": "0.5.1-next.5a770e3",
+    "@dxos/async": "0.5.1-next.5a770e3",
+    "@dxos/bare-template": "0.5.1-next.5a770e3",
+    "@dxos/client": "0.5.1-next.5a770e3",
+    "@dxos/client-services": "0.5.1-next.5a770e3",
+    "@dxos/config": "0.5.1-next.5a770e3",
+    "@dxos/client-protocol": "0.5.1-next.5a770e3",
+    "@dxos/context": "0.5.1-next.5a770e3",
+    "@dxos/functions": "0.5.1-next.5a770e3",
+    "@dxos/debug": "0.5.1-next.5a770e3",
+    "@dxos/invariant": "0.5.1-next.5a770e3",
+    "@dxos/log": "0.5.1-next.5a770e3",
+    "@dxos/network-manager": "0.5.1-next.5a770e3",
+    "@dxos/hello-template": "0.5.1-next.5a770e3",
+    "@dxos/observability": "0.5.1-next.5a770e3",
+    "@dxos/plate": "0.5.1-next.5a770e3",
+    "@dxos/protocols": "0.5.1-next.5a770e3",
+    "@dxos/random": "0.5.1-next.5a770e3",
+    "@dxos/rpc": "0.5.1-next.5a770e3",
+    "@dxos/process": "0.5.1-next.5a770e3",
+    "@dxos/tasks-template": "0.5.1-next.5a770e3",
+    "@dxos/util": "0.5.1-next.5a770e3"
   },
   "devDependencies": {
-    "@oclif/test": "^2.3.31",
+    "@oclif/test": "^3.2.15",
     "@phosphor-icons/react": "^2.1.5",
     "@types/cli-progress": "^3.11.0",
     "@types/fs-extra": "^9.0.4",
@@ -82,7 +84,7 @@
     "@types/platform": "^1.3.4",
     "@types/react-dom": "^18.0.6",
     "fast-check": "^3.15.1",
-    "oclif": "^3.7.0",
+    "oclif": "^4.10.11",
     "prettier": "^3.2.4",
     "shx": "^0.3.3",
     "typescript": "^5.2.2"

package/dist/src/commands/kube/auth.d.ts

@@ -1,9 +0,0 @@
-import { type Client } from '@dxos/client';
-import { BaseCommand } from '../../base-command';
-export default class Auth extends BaseCommand<typeof Auth> {
-    static enableJsonFlag: boolean;
-    static description: string;
-    presentAuthCredentials(client: Client): Promise<any>;
-    run(): Promise<any>;
-}
-//# sourceMappingURL=auth.d.ts.map

package/dist/src/commands/kube/auth.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../../../src/commands/kube/auth.ts"],"names":[],"mappings":"AAMA,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,SAA6B;IAElD,sBAAsB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAwCpD,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;CA0B1B"}

package/dist/src/commands/kube/auth.js

@@ -1,77 +0,0 @@
-"use strict";
-//
-// Copyright 2023 DXOS.org
-//
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const chalk_1 = __importDefault(require("chalk"));
-const invariant_1 = require("@dxos/invariant");
-const keys_1 = require("@dxos/keys");
-const base_command_1 = require("../../base-command");
-const util_1 = require("../../util");
-class Auth extends base_command_1.BaseCommand {
-    async presentAuthCredentials(client) {
-        this.log((0, chalk_1.default) `{gray Initiating presentation sequence..}`);
-        // TODO(egorgripasov): Find AuthorizedDevice by KubeAccess credential.
-        const { deviceKey } = client.halo.device;
-        const authDeviceCreds = await (0, util_1.queryCredentials)(client, 'dxos.halo.credentials.AuthorizedDevice', (cred) => keys_1.PublicKey.equals(cred.subject.id, deviceKey));
-        if (!authDeviceCreds.length) {
-            this.catch('No authorized devices');
-        }
-        // Init auth sequence.
-        return this.execWithSupervisor(async (supervisor) => {
-            var _a;
-            const { nonce, kubeKey } = await supervisor.rpc.initAuthSequence();
-            // Find proper KubeAccess credential.
-            const kubeAccessCreds = await (0, util_1.queryCredentials)(client, 'dxos.halo.credentials.KubeAccess', (cred) => keys_1.PublicKey.equals(cred.issuer, kubeKey));
-            if (!kubeAccessCreds.length) {
-                this.log((0, chalk_1.default) `{gray No KUBE access credentials - requesting..}`);
-            }
-            else {
-                this.log((0, chalk_1.default) `{gray KUBE access credentials found - requesting session token..}`);
-            }
-            const credsToPresent = [authDeviceCreds[0].id, (_a = kubeAccessCreds[0]) === null || _a === void 0 ? void 0 : _a.id].filter(Boolean);
-            // Create presentation.
-            const presentation = await client.halo.presentCredentials({
-                ids: credsToPresent,
-                nonce,
-            });
-            return supervisor.rpc.authenticate({
-                presentation,
-            });
-        });
-    }
-    async run() {
-        return await this.execWithClient(async (client) => {
-            const identity = client.halo.identity;
-            if (!identity) {
-                // TODO(burdon): Error if called twice with no halo.
-                this.log((0, chalk_1.default) `{red Profile not initialized.}`);
-            }
-            else {
-                const { credential, token } = await this.presentAuthCredentials(client);
-                (0, invariant_1.invariant)(!!credential || !!token, 'No credentials or token received.');
-                if (token) {
-                    this.log((0, chalk_1.default) `{green Authenticated with session token ${token}}`);
-                }
-                else {
-                    this.log((0, chalk_1.default) `{gray Writing KUBE access credential..}`);
-                    await client.halo.writeCredentials([credential]);
-                    const { token } = await this.presentAuthCredentials(client);
-                    if (token) {
-                        this.log((0, chalk_1.default) `{green Authenticated with session token: ${token}}`);
-                    }
-                    else {
-                        this.log((0, chalk_1.default) `{red Failed to authenticate.}`);
-                    }
-                }
-            }
-        });
-    }
-}
-Auth.enableJsonFlag = true;
-Auth.description = 'Authenticate with KUBE.';
-exports.default = Auth;
-//# sourceMappingURL=auth.js.map

package/dist/src/commands/kube/auth.js.map

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

package/dist/src/commands/kube/deploy.d.ts

@@ -1,23 +0,0 @@
-import { BaseCommand } from '../../base-command';
-export default class Deploy extends BaseCommand<typeof Deploy> {
-    static description: string;
-    static flags: {
-        hostname: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        provider: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        accessToken: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        dev: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        json: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        'dry-run': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        verbose: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        profile: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        config: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        target: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        'no-agent': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        timeout: import("@oclif/core/lib/interfaces").OptionFlag<number, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        'no-wait': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        'json-log': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        'json-logfile': import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-    };
-    run(): Promise<any>;
-}
-//# sourceMappingURL=deploy.d.ts.map

package/dist/src/commands/kube/deploy.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../../../src/commands/kube/deploy.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAGjD,MAAM,CAAC,OAAO,OAAO,MAAO,SAAQ,WAAW,CAAC,OAAO,MAAM,CAAC;IAC5D,OAAgB,WAAW,SAAkB;IAC7C,OAAgB,KAAK;;;;;;;;;;;;;;;;MAiBnB;IAEI,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;CAwB1B"}

package/dist/src/commands/kube/deploy.js

@@ -1,52 +0,0 @@
-"use strict";
-//
-// Copyright 2022 DXOS.org
-//
-Object.defineProperty(exports, "__esModule", { value: true });
-const core_1 = require("@oclif/core");
-const base_command_1 = require("../../base-command");
-const provider_1 = require("../../util/provider");
-class Deploy extends base_command_1.BaseCommand {
-    async run() {
-        const { hostname, provider: providerName, dev, accessToken } = this.flags;
-        return await this.execWithClient(async (client) => {
-            if (!client.halo.identity) {
-                this.catch('Client identity not initialized.');
-            }
-            // TODO(egorgripasov): HALO <-> KUBE integration.
-            let provider;
-            switch (providerName) {
-                case provider_1.DEFAULT_PROVIDER: {
-                    provider = new provider_1.DigitalOceanProvider(this.clientConfig);
-                    break;
-                }
-                default: {
-                    this.catch(`Unknown provider: ${providerName}`);
-                }
-            }
-            const kube = await provider.deploy({ hostname, dev, accessToken });
-            (0, provider_1.printKubes)([kube]);
-        });
-    }
-}
-Deploy.description = 'Deploy KUBE.';
-Deploy.flags = {
-    ...base_command_1.BaseCommand.flags,
-    hostname: core_1.Flags.string({
-        description: 'Hostname',
-        required: true,
-    }),
-    provider: core_1.Flags.string({
-        description: 'Cloud Provider',
-        default: provider_1.DEFAULT_PROVIDER,
-    }),
-    accessToken: core_1.Flags.string({
-        description: 'Access token for seeding admin identity',
-    }),
-    dev: core_1.Flags.boolean({
-        description: 'Deploy latest version from dev channel',
-        default: false,
-    }),
-};
-exports.default = Deploy;
-//# sourceMappingURL=deploy.js.map

package/dist/src/commands/kube/deploy.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../../../src/commands/kube/deploy.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;AAEF,sCAAoC;AAIpC,qDAAiD;AACjD,kDAAiH;AAEjH,MAAqB,MAAO,SAAQ,0BAA0B;IAqB5D,KAAK,CAAC,GAAG;QACP,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,YAAY,EAAE,GAAG,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QAC1E,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,MAAc,EAAE,EAAE;YACxD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE;gBACzB,IAAI,CAAC,KAAK,CAAC,kCAAkC,CAAC,CAAC;aAChD;YAED,iDAAiD;YACjD,IAAI,QAA2B,CAAC;YAChC,QAAQ,YAAY,EAAE;gBACpB,KAAK,2BAAgB,CAAC,CAAC;oBACrB,QAAQ,GAAG,IAAI,+BAAoB,CAAC,IAAI,CAAC,YAAa,CAAC,CAAC;oBACxD,MAAM;iBACP;gBAED,OAAO,CAAC,CAAC;oBACP,IAAI,CAAC,KAAK,CAAC,qBAAqB,YAAY,EAAE,CAAC,CAAC;iBACjD;aACF;YAED,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,GAAG,EAAE,WAAW,EAAE,CAAC,CAAC;YACnE,IAAA,qBAAU,EAAC,CAAC,IAAI,CAAC,CAAC,CAAC;QACrB,CAAC,CAAC,CAAC;IACL,CAAC;;AA3Ce,kBAAW,GAAG,cAAc,CAAC;AAC7B,YAAK,GAAG;IACtB,GAAG,0BAAW,CAAC,KAAK;IACpB,QAAQ,EAAE,YAAK,CAAC,MAAM,CAAC;QACrB,WAAW,EAAE,UAAU;QACvB,QAAQ,EAAE,IAAI;KACf,CAAC;IACF,QAAQ,EAAE,YAAK,CAAC,MAAM,CAAC;QACrB,WAAW,EAAE,gBAAgB;QAC7B,OAAO,EAAE,2BAAgB;KAC1B,CAAC;IACF,WAAW,EAAE,YAAK,CAAC,MAAM,CAAC;QACxB,WAAW,EAAE,yCAAyC;KACvD,CAAC;IACF,GAAG,EAAE,YAAK,CAAC,OAAO,CAAC;QACjB,WAAW,EAAE,wCAAwC;QACrD,OAAO,EAAE,KAAK;KACf,CAAC;CACH,CAAC;kBAnBiB,MAAM"}