@dxos/cli 0.4.3-main.d01b40e → 0.4.3-main.e5bbcda

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

@@ -11,7 +11,7 @@ class List extends base_command_1.BaseCommand {
         return await this.execWithPublisher(async (publisher) => {
             const listResponse = await publisher.rpc.list();
             (0, invariant_1.invariant)(listResponse.modules, 'Unable to list deploymemts.');
-            (0, util_1.printModules)(listResponse.modules, this.flags);
+            await (0, util_1.printModules)(listResponse.modules, this.flags);
         });
     }
 }

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

@@ -1 +1 @@
-{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../../src/commands/app/list.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;AAEF,+CAA4C;AAE5C,qDAAiD;AACjD,qCAAiE;AAEjE,MAAqB,IAAK,SAAQ,0BAAwB;IAIxD,KAAK,CAAC,GAAG;QACP,OAAO,MAAM,IAAI,CAAC,iBAAiB,CAAC,KAAK,EAAE,SAA2B,EAAE,EAAE;YACxE,MAAM,YAAY,GAAG,MAAM,SAAS,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;YAChD,IAAA,qBAAS,EAAC,YAAY,CAAC,OAAQ,EAAE,6BAA6B,CAAC,CAAC;YAChE,IAAA,mBAAY,EAAC,YAAY,CAAC,OAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;QAClD,CAAC,CAAC,CAAC;IACL,CAAC;;AATe,mBAAc,GAAG,IAAI,CAAC;AACtB,gBAAW,GAAG,YAAY,CAAC;kBAFxB,IAAI"}
+{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../../src/commands/app/list.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;AAEF,+CAA4C;AAE5C,qDAAiD;AACjD,qCAAiE;AAEjE,MAAqB,IAAK,SAAQ,0BAAwB;IAIxD,KAAK,CAAC,GAAG;QACP,OAAO,MAAM,IAAI,CAAC,iBAAiB,CAAC,KAAK,EAAE,SAA2B,EAAE,EAAE;YACxE,MAAM,YAAY,GAAG,MAAM,SAAS,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;YAChD,IAAA,qBAAS,EAAC,YAAY,CAAC,OAAQ,EAAE,6BAA6B,CAAC,CAAC;YAChE,MAAM,IAAA,mBAAY,EAAC,YAAY,CAAC,OAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;QACxD,CAAC,CAAC,CAAC;IACL,CAAC;;AATe,mBAAc,GAAG,IAAI,CAAC;AACtB,gBAAW,GAAG,YAAY,CAAC;kBAFxB,IAAI"}

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

@@ -2,9 +2,9 @@ import type { ConfigProto } from '@dxos/config';
 export type PackageModule = NonNullable<NonNullable<ConfigProto['package']>['modules']>[0];
 export type PackageRepo = NonNullable<NonNullable<ConfigProto['package']>['repos']>[0];
 export type Logger = (message: string, ...args: any[]) => void;
-export declare const mapModules: (modules: PackageModule[]) => {
+export declare const mapModules: (modules: PackageModule[]) => Promise<{
     key: string | undefined;
     bundle: string;
-}[];
-export declare const printModules: (modules: PackageModule[], flags?: {}) => void;
+}[]>;
+export declare const printModules: (modules: PackageModule[], flags?: {}) => Promise<void>;
 //# sourceMappingURL=common.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../../src/util/publish/common.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAEhD,MAAM,MAAM,aAAa,GAAG,WAAW,CAAC,WAAW,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAC3F,MAAM,MAAM,WAAW,GAAG,WAAW,CAAC,WAAW,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAEvF,MAAM,MAAM,MAAM,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAC;AAE/D,eAAO,MAAM,UAAU,YAAa,aAAa,EAAE;;;GAKlD,CAAC;AAEF,eAAO,MAAM,YAAY,YAAa,aAAa,EAAE,qBAepD,CAAC"}
+{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../../src/util/publish/common.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAEhD,MAAM,MAAM,aAAa,GAAG,WAAW,CAAC,WAAW,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAC3F,MAAM,MAAM,WAAW,GAAG,WAAW,CAAC,WAAW,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAEvF,MAAM,MAAM,MAAM,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAC;AAE/D,eAAO,MAAM,UAAU,YAAmB,aAAa,EAAE;;;IAMxD,CAAC;AAEF,eAAO,MAAM,YAAY,YAAmB,aAAa,EAAE,8BAe1D,CAAC"}

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

@@ -2,19 +2,42 @@
 //
 // 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;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.printModules = exports.mapModules = void 0;
 const core_1 = require("@oclif/core");
-const ipfs_http_client_1 = require("ipfs-http-client");
-const mapModules = (modules) => {
+const mapModules = async (modules) => {
+    const { CID } = await Promise.resolve().then(() => __importStar(require('kubo-rpc-client')));
     return modules.map((mod) => ({
         key: mod.name,
-        bundle: ipfs_http_client_1.CID.decode(mod.bundle).toString(),
+        bundle: CID.decode(mod.bundle).toString(),
     }));
 };
 exports.mapModules = mapModules;
-const printModules = (modules, flags = {}) => {
-    core_1.ux.table((0, exports.mapModules)(modules), {
+const printModules = async (modules, flags = {}) => {
+    core_1.ux.table(await (0, exports.mapModules)(modules), {
         key: {
             header: 'name',
         },

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

@@ -1 +1 @@
-{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../src/util/publish/common.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;AAEF,sCAAiC;AACjC,uDAAuC;AAShC,MAAM,UAAU,GAAG,CAAC,OAAwB,EAAE,EAAE;IACrD,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;QAC3B,GAAG,EAAE,GAAG,CAAC,IAAI;QACb,MAAM,EAAE,sBAAG,CAAC,MAAM,CAAC,GAAG,CAAC,MAAO,CAAC,CAAC,QAAQ,EAAE;KAC3C,CAAC,CAAC,CAAC;AACN,CAAC,CAAC;AALW,QAAA,UAAU,cAKrB;AAEK,MAAM,YAAY,GAAG,CAAC,OAAwB,EAAE,KAAK,GAAG,EAAE,EAAE,EAAE;IACnE,SAAE,CAAC,KAAK,CACN,IAAA,kBAAU,EAAC,OAAO,CAAC,EACnB;QACE,GAAG,EAAE;YACH,MAAM,EAAE,MAAM;SACf;QACD,MAAM,EAAE;YACN,MAAM,EAAE,QAAQ;SACjB;KACF,EACD;QACE,GAAG,KAAK;KACT,CACF,CAAC;AACJ,CAAC,CAAC;AAfW,QAAA,YAAY,gBAevB"}
+{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../src/util/publish/common.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;AAEF,sCAAiC;AAS1B,MAAM,UAAU,GAAG,KAAK,EAAE,OAAwB,EAAE,EAAE;IAC3D,MAAM,EAAE,GAAG,EAAE,GAAG,wDAAa,iBAAiB,GAAC,CAAC;IAChD,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;QAC3B,GAAG,EAAE,GAAG,CAAC,IAAI;QACb,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,MAAO,CAAC,CAAC,QAAQ,EAAE;KAC3C,CAAC,CAAC,CAAC;AACN,CAAC,CAAC;AANW,QAAA,UAAU,cAMrB;AAEK,MAAM,YAAY,GAAG,KAAK,EAAE,OAAwB,EAAE,KAAK,GAAG,EAAE,EAAE,EAAE;IACzE,SAAE,CAAC,KAAK,CACN,MAAM,IAAA,kBAAU,EAAC,OAAO,CAAC,EACzB;QACE,GAAG,EAAE;YACH,MAAM,EAAE,MAAM;SACf;QACD,MAAM,EAAE;YACN,MAAM,EAAE,QAAQ;SACjB;KACF,EACD;QACE,GAAG,KAAK;KACT,CACF,CAAC;AACJ,CAAC,CAAC;AAfW,QAAA,YAAY,gBAevB"}

package/dist/src/util/publish/ipfs-upload.d.ts

@@ -1,10 +1,9 @@
-import { type CID } from 'ipfs-http-client';
-import { type Config } from '@dxos/client';
+import { type CID } from 'kubo-rpc-client';
 interface UploadOptions {
     timeout: string | number;
     progress?: (bytes: number, path?: string) => void;
     pin?: boolean;
 }
-export declare const uploadToIPFS: (path: string, config?: Config, options?: UploadOptions) => Promise<CID>;
+export declare const uploadToIPFS: (path: string, ipfsServer: string, options?: UploadOptions) => Promise<CID>;
 export {};
 //# sourceMappingURL=ipfs-upload.d.ts.map

package/dist/src/util/publish/ipfs-upload.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ipfs-upload.d.ts","sourceRoot":"","sources":["../../../../src/util/publish/ipfs-upload.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,KAAK,GAAG,EAAsB,MAAM,kBAAkB,CAAC;AAGhE,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,cAAc,CAAC;AAI3C,UAAU,aAAa;IACrB,OAAO,EAAE,MAAM,GAAG,MAAM,CAAC;IACzB,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IAClD,GAAG,CAAC,EAAE,OAAO,CAAC;CACf;AAED,eAAO,MAAM,YAAY,SAAgB,MAAM,WAAW,MAAM,YAAY,aAAa,KAAG,QAAQ,GAAG,CAkDtG,CAAC"}
+{"version":3,"file":"ipfs-upload.d.ts","sourceRoot":"","sources":["../../../../src/util/publish/ipfs-upload.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,KAAK,GAAG,EAAE,MAAM,iBAAiB,CAAC;AAK3C,UAAU,aAAa;IACrB,OAAO,EAAE,MAAM,GAAG,MAAM,CAAC;IACzB,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IAClD,GAAG,CAAC,EAAE,OAAO,CAAC;CACf;AAED,eAAO,MAAM,YAAY,SAAgB,MAAM,cAAc,MAAM,YAAY,aAAa,KAAG,QAAQ,GAAG,CAgDzG,CAAC"}

package/dist/src/util/publish/ipfs-upload.js

@@ -8,15 +8,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.uploadToIPFS = void 0;
 const fs_1 = __importDefault(require("fs"));
-const ipfs_http_client_1 = require("ipfs-http-client");
 const path_1 = require("path");
-const invariant_1 = require("@dxos/invariant");
 const log_1 = require("@dxos/log");
-const uploadToIPFS = async (path, config, options) => {
+const uploadToIPFS = async (path, ipfsServer, options) => {
     const { timeout, pin = true, progress } = options || {};
-    const ipfsServer = config === null || config === void 0 ? void 0 : config.get('runtime.services.ipfs.server');
-    (0, invariant_1.invariant)(ipfsServer, 'Invalid IPFS Server.');
-    const ipfsClient = (0, ipfs_http_client_1.create)({
+    const { create, globSource } = await _importESM('kubo-rpc-client');
+    const ipfsClient = create({
         url: ipfsServer,
         timeout: timeout || '1m',
     });
@@ -25,7 +22,7 @@ const uploadToIPFS = async (path, config, options) => {
     }
     if (fs_1.default.lstatSync(path).isDirectory()) {
         const files = [];
-        for await (const file of ipfsClient.addAll((0, ipfs_http_client_1.globSource)(path, '**/*'), {
+        for await (const file of ipfsClient.addAll(globSource(path, '**/*'), {
             progress,
             pin,
             wrapWithDirectory: true,
@@ -44,7 +41,7 @@ const uploadToIPFS = async (path, config, options) => {
                         cid: file.cid.toString(),
                         localSize: localContent.length,
                         remoteSize: remoteContent.length,
-                    }, { file: "packages/devtools/cli/src/util/publish/ipfs-upload.ts", line: 52, 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) });
+                    }, { file: "packages/devtools/cli/src/util/publish/ipfs-upload.ts", line: 48, 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) });
                 }
             }
             files.push(file);
@@ -58,4 +55,6 @@ const uploadToIPFS = async (path, config, options) => {
     }
 };
 exports.uploadToIPFS = uploadToIPFS;
+// eslint-disable-next-line no-new-func
+const _importESM = new Function('modulePath', 'return import(modulePath)');
 //# sourceMappingURL=ipfs-upload.js.map

package/dist/src/util/publish/ipfs-upload.js.map

@@ -1 +1 @@
-{"version":3,"file":"ipfs-upload.js","sourceRoot":"","sources":["../../../../src/util/publish/ipfs-upload.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,4CAAoB;AACpB,uDAAgE;AAChE,+BAA4B;AAG5B,+CAA4C;AAC5C,mCAAgC;AAQzB,MAAM,YAAY,GAAG,KAAK,EAAE,IAAY,EAAE,MAAe,EAAE,OAAuB,EAAgB,EAAE;IACzG,MAAM,EAAE,OAAO,EAAE,GAAG,GAAG,IAAI,EAAE,QAAQ,EAAE,GAAG,OAAO,IAAI,EAAE,CAAC;IAExD,MAAM,UAAU,GAAG,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,GAAG,CAAC,8BAA8B,CAAC,CAAC;IAC/D,IAAA,qBAAS,EAAC,UAAU,EAAE,sBAAsB,CAAC,CAAC;IAE9C,MAAM,UAAU,GAAG,IAAA,yBAAM,EAAC;QACxB,GAAG,EAAE,UAAU;QACf,OAAO,EAAE,OAAO,IAAI,IAAI;KACzB,CAAC,CAAC;IAEH,IAAI,CAAC,YAAE,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;QACxB,MAAM,IAAI,KAAK,CAAC,gEAAgE,CAAC,CAAC;KACnF;IACD,IAAI,YAAE,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,EAAE;QACpC,MAAM,KAAK,GAAG,EAAE,CAAC;QACjB,IAAI,KAAK,EAAE,MAAM,IAAI,IAAI,UAAU,CAAC,MAAM,CAAC,IAAA,6BAAU,EAAC,IAAI,EAAE,MAAM,CAAC,EAAE;YACnE,QAAQ;YACR,GAAG;YACH,iBAAiB,EAAE,IAAI;SACxB,CAAC,EAAE;YACF,MAAM,QAAQ,GAAG,IAAA,WAAI,EAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YAEvC,IAAI,CAAC,YAAE,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,WAAW,EAAE,EAAE;gBACzC,MAAM,YAAY,GAAG,EAAE,CAAC;gBACxB,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;oBAClD,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;iBAC1B;gBACD,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;gBAElD,MAAM,YAAY,GAAG,YAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;gBAE/C,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE;oBACvC,SAAG,CAAC,KAAK,CAAC,uBAAuB,EAAE;wBACjC,IAAI,EAAE,QAAQ;wBACd,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE;wBACxB,SAAS,EAAE,YAAY,CAAC,MAAM;wBAC9B,UAAU,EAAE,aAAa,CAAC,MAAM;qBACjC,wTAAC,CAAC;iBACJ;aACF;YAED,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SAClB;QACD,OAAO,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,kCAAkC;KACvE;SAAM;QACL,MAAM,OAAO,GAAG,YAAE,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QACtC,MAAM,SAAS,GAAG,MAAM,UAAU,CAAC,GAAG,CAAC,OAAO,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;QACzD,OAAO,SAAS,CAAC,GAAG,CAAC;KACtB;AACH,CAAC,CAAC;AAlDW,QAAA,YAAY,gBAkDvB"}
+{"version":3,"file":"ipfs-upload.js","sourceRoot":"","sources":["../../../../src/util/publish/ipfs-upload.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,4CAAoB;AAEpB,+BAA4B;AAE5B,mCAAgC;AAQzB,MAAM,YAAY,GAAG,KAAK,EAAE,IAAY,EAAE,UAAkB,EAAE,OAAuB,EAAgB,EAAE;IAC5G,MAAM,EAAE,OAAO,EAAE,GAAG,GAAG,IAAI,EAAE,QAAQ,EAAE,GAAG,OAAO,IAAI,EAAE,CAAC;IAExD,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,UAAU,CAAC,iBAAiB,CAAC,CAAC;IACnE,MAAM,UAAU,GAAG,MAAM,CAAC;QACxB,GAAG,EAAE,UAAU;QACf,OAAO,EAAE,OAAO,IAAI,IAAI;KACzB,CAAC,CAAC;IAEH,IAAI,CAAC,YAAE,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;QACxB,MAAM,IAAI,KAAK,CAAC,gEAAgE,CAAC,CAAC;KACnF;IACD,IAAI,YAAE,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,EAAE;QACpC,MAAM,KAAK,GAAG,EAAE,CAAC;QACjB,IAAI,KAAK,EAAE,MAAM,IAAI,IAAI,UAAU,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE;YACnE,QAAQ;YACR,GAAG;YACH,iBAAiB,EAAE,IAAI;SACxB,CAAC,EAAE;YACF,MAAM,QAAQ,GAAG,IAAA,WAAI,EAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YAEvC,IAAI,CAAC,YAAE,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,WAAW,EAAE,EAAE;gBACzC,MAAM,YAAY,GAAG,EAAE,CAAC;gBACxB,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;oBAClD,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;iBAC1B;gBACD,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;gBAElD,MAAM,YAAY,GAAG,YAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;gBAE/C,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE;oBACvC,SAAG,CAAC,KAAK,CAAC,uBAAuB,EAAE;wBACjC,IAAI,EAAE,QAAQ;wBACd,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE;wBACxB,SAAS,EAAE,YAAY,CAAC,MAAM;wBAC9B,UAAU,EAAE,aAAa,CAAC,MAAM;qBACjC,wTAAC,CAAC;iBACJ;aACF;YAED,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SAClB;QACD,OAAO,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,kCAAkC;KACvE;SAAM;QACL,MAAM,OAAO,GAAG,YAAE,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QACtC,MAAM,SAAS,GAAG,MAAM,UAAU,CAAC,GAAG,CAAC,OAAO,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;QACzD,OAAO,SAAS,CAAC,GAAG,CAAC;KACtB;AACH,CAAC,CAAC;AAhDW,QAAA,YAAY,gBAgDvB;AAEF,uCAAuC;AACvC,MAAM,UAAU,GAAG,IAAI,QAAQ,CAAC,YAAY,EAAE,2BAA2B,CAAC,CAAC"}

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

@@ -1,4 +1,4 @@
-import { type CID } from 'ipfs-http-client';
+import { type CID } from 'kubo-rpc-client';
 import type { Config } from '@dxos/client';
 import { type Logger, type PackageModule } from './common';
 export interface PublishParams {

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":"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"}
+{"version":3,"file":"publish.d.ts","sourceRoot":"","sources":["../../../../src/util/publish/publish.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,KAAK,GAAG,EAAE,MAAM,iBAAiB,CAAC;AAI3C,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,CAwCb,CAAC"}

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

@@ -33,18 +33,28 @@ const publish = async ({ verbose, timeout, path, pin }, { log, config, module })
     if (!fs_1.default.existsSync(publishFolder)) {
         throw new Error(`Publish failed. Build output folder does not exist: ${publishFolder}.`);
     }
+    const ipfsServer = config === null || config === void 0 ? void 0 : config.get('runtime.services.ipfs.server');
+    (0, invariant_1.invariant)(ipfsServer, 'Missing IPFS Server.');
     const total = await getFolderSize(publishFolder);
     if (verbose) {
-        log(`Publishing from: ${publishFolder}`);
+        log(`Publishing from: ${publishFolder} to: ${ipfsServer}`);
     }
     log('Uploading...');
     const bar = new cli_progress_1.default.SingleBar({}, cli_progress_1.default.Presets.shades_classic);
     verbose && bar.start(total, 0);
-    const cid = await (0, ipfs_upload_1.uploadToIPFS)(publishFolder, config, {
-        timeout: timeout || '10m',
-        pin,
-        progress: verbose ? (bytes) => bar.update(bytes) : undefined,
-    });
+    let cid;
+    try {
+        cid = await (0, ipfs_upload_1.uploadToIPFS)(publishFolder, ipfsServer, {
+            timeout: timeout || '10m',
+            pin,
+            progress: verbose ? (bytes) => bar.update(bytes) : undefined,
+        });
+    }
+    catch (err) {
+        // Avoid leaving user's terminal in a bad state.
+        bar.stop();
+        throw new Error(`Publish failed. ${err.message}`);
+    }
     verbose && bar.update(total);
     verbose && bar.stop();
     log(`Published module ${chalk_1.default.bold(module.name)}. IPFS cid: ${cid.toString()}`);

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

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.4.3-main.d01b40e",
+  "version": "0.4.3-main.e5bbcda",
   "commands": {
     "agent:list": {
       "id": "agent:list",
@@ -3524,7 +3524,7 @@
           "type": "option",
           "description": "Tunnel name",
           "multiple": false,
-          "default": "potato-spring-river-twelve"
+          "default": "uranus-south-mirror-comet"
         }
       },
       "args": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/cli",
-  "version": "0.4.3-main.d01b40e",
+  "version": "0.4.3-main.e5bbcda",
   "description": "DXOS CLI",
   "keywords": [
     "dxos",
@@ -36,37 +36,37 @@
     "ink": "^3.2.0",
     "ink-table": "~3.0.0",
     "inquirer": "^8.2.0",
-    "ipfs-http-client": "^56.0.3",
     "isomorphic-ws": "^4.0.1",
     "js-yaml": "^4.1.0",
+    "kubo-rpc-client": "^3.0.2",
     "lodash.defaultsdeep": "^4.6.1",
     "node-fetch": "^2.6.0",
     "pkg-up": "^3.1.0",
     "react": "^18.2.0",
     "uuid": "^8.3.2",
     "ws": "^8.14.2",
-    "@dxos/agent": "0.4.3-main.d01b40e",
-    "@dxos/bare-template": "0.4.3-main.d01b40e",
-    "@dxos/async": "0.4.3-main.d01b40e",
-    "@dxos/client": "0.4.3-main.d01b40e",
-    "@dxos/client-services": "0.4.3-main.d01b40e",
-    "@dxos/client-protocol": "0.4.3-main.d01b40e",
-    "@dxos/context": "0.4.3-main.d01b40e",
-    "@dxos/debug": "0.4.3-main.d01b40e",
-    "@dxos/config": "0.4.3-main.d01b40e",
-    "@dxos/functions": "0.4.3-main.d01b40e",
-    "@dxos/invariant": "0.4.3-main.d01b40e",
-    "@dxos/hello-template": "0.4.3-main.d01b40e",
-    "@dxos/network-manager": "0.4.3-main.d01b40e",
-    "@dxos/log": "0.4.3-main.d01b40e",
-    "@dxos/plate": "0.4.3-main.d01b40e",
-    "@dxos/process": "0.4.3-main.d01b40e",
-    "@dxos/protocols": "0.4.3-main.d01b40e",
-    "@dxos/observability": "0.4.3-main.d01b40e",
-    "@dxos/random": "0.4.3-main.d01b40e",
-    "@dxos/tasks-template": "0.4.3-main.d01b40e",
-    "@dxos/rpc": "0.4.3-main.d01b40e",
-    "@dxos/util": "0.4.3-main.d01b40e"
+    "@dxos/agent": "0.4.3-main.e5bbcda",
+    "@dxos/bare-template": "0.4.3-main.e5bbcda",
+    "@dxos/client": "0.4.3-main.e5bbcda",
+    "@dxos/client-protocol": "0.4.3-main.e5bbcda",
+    "@dxos/async": "0.4.3-main.e5bbcda",
+    "@dxos/client-services": "0.4.3-main.e5bbcda",
+    "@dxos/config": "0.4.3-main.e5bbcda",
+    "@dxos/context": "0.4.3-main.e5bbcda",
+    "@dxos/debug": "0.4.3-main.e5bbcda",
+    "@dxos/hello-template": "0.4.3-main.e5bbcda",
+    "@dxos/functions": "0.4.3-main.e5bbcda",
+    "@dxos/invariant": "0.4.3-main.e5bbcda",
+    "@dxos/log": "0.4.3-main.e5bbcda",
+    "@dxos/observability": "0.4.3-main.e5bbcda",
+    "@dxos/network-manager": "0.4.3-main.e5bbcda",
+    "@dxos/plate": "0.4.3-main.e5bbcda",
+    "@dxos/process": "0.4.3-main.e5bbcda",
+    "@dxos/protocols": "0.4.3-main.e5bbcda",
+    "@dxos/random": "0.4.3-main.e5bbcda",
+    "@dxos/rpc": "0.4.3-main.e5bbcda",
+    "@dxos/tasks-template": "0.4.3-main.e5bbcda",
+    "@dxos/util": "0.4.3-main.e5bbcda"
   },
   "devDependencies": {
     "@oclif/test": "^2.3.31",