@dxos/cli 0.4.4-main.fcf0b00 → 0.4.4-next.e0df51e
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/config/config-default.yml +2 -2
- package/dist/src/commands/agent/start.js +1 -1
- package/dist/src/commands/agent/start.js.map +1 -1
- package/dist/src/util/publish/ipfs-upload.d.ts +1 -0
- package/dist/src/util/publish/ipfs-upload.d.ts.map +1 -1
- package/dist/src/util/publish/ipfs-upload.js +10 -8
- package/dist/src/util/publish/ipfs-upload.js.map +1 -1
- package/dist/src/util/publish/publish.d.ts.map +1 -1
- package/dist/src/util/publish/publish.js +19 -1
- package/dist/src/util/publish/publish.js.map +1 -1
- package/oclif.manifest.json +2 -2
- package/package.json +23 -23
|
@@ -7,8 +7,8 @@ runtime:
|
|
|
7
7
|
|
|
8
8
|
services:
|
|
9
9
|
ipfs:
|
|
10
|
-
server:
|
|
11
|
-
gateway:
|
|
10
|
+
server: https://kube.dxos.org/ipfs/api
|
|
11
|
+
gateway: https://kube.dxos.org/ipfs/gateway
|
|
12
12
|
signaling:
|
|
13
13
|
- server: wss://dev.kube.dxos.org/.well-known/dx/signal
|
|
14
14
|
- server: wss://kube.dxos.org/.well-known/dx/signal
|
|
@@ -64,7 +64,7 @@ class Start extends base_command_1.BaseCommand {
|
|
|
64
64
|
}
|
|
65
65
|
if ((_b = this._observability) === null || _b === void 0 ? void 0 : _b.enabled) {
|
|
66
66
|
this.log('Metrics initialized!');
|
|
67
|
-
this._observability.initialize();
|
|
67
|
+
await this._observability.initialize();
|
|
68
68
|
await this._observability.setIdentityTags(this._agent.client);
|
|
69
69
|
await this._observability.startNetworkMetrics(this._agent.client);
|
|
70
70
|
await this._observability.startSpacesMetrics(this._agent.client, 'cli');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"start.js","sourceRoot":"","sources":["../../../../src/commands/agent/start.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;AAEF,sCAAoC;AACpC,kDAA0B;AAC1B,qCAAiC;AAEjC,uCAUqB;AACrB,uCAAiE;AACjE,2DAAmE;AACnE,2CAAwC;AAGxC,qDAAiD;AAEjD,MAAqB,KAAM,SAAQ,0BAAyB;IAA5D;;QA+BmB,SAAI,GAAG,IAAI,iBAAO,EAAE,CAAC;IA4GxC,CAAC;IAzGC,KAAK,CAAC,GAAG;QACP,IAAI,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE;YACzB,uDAAuD;YACvD,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC;SAC/B;aAAM;YACL,MAAM,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;SAC5C;IACH,CAAC;IAEO,KAAK,CAAC,gBAAgB;;QAC5B,MAAM,MAAM,GAAG,SAAS,GAAG,IAAA,gCAAc,EAAC,4BAAU,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;QACxF;YACE,6BAA6B;YAC7B,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,oBAAY,EAAC,MAAM,CAAC,CAAC;YACtC,IAAA,gBAAM,EAAC,IAAI,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;SAC/B;QAED,IAAI,CAAC,MAAM,GAAG,IAAI,aAAK,CAAC;YACtB,MAAM,EAAE,IAAI,CAAC,YAAY;YACzB,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO;YAC3B,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO;YAC3B,QAAQ,EAAE;gBACR,MAAM;gBACN,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,EAAE;aACzB;YACD,OAAO,EAAE;gBACP,IAAI,mBAAW,EAAE;gBACjB,IAAI,uBAAe,EAAE;gBACrB,IAAI,qBAAa,EAAE;gBACnB,IAAI,uBAAe,EAAE;gBACrB,IAAI,0BAAkB,EAAE;gBACxB,IAAI,uBAAe,EAAE;gBACrB,IAAI,mBAAW,EAAE;aAClB;SACF,CAAC,CAAC;QAEH,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QAC1B,IAAI,CAAC,GAAG,CAAC,mCAAmC,CAAC,CAAC;QAE9C,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;QAC5B,MAAM,QAAQ,GAAG,CAAC,MAAM,CAAA,MAAA,IAAI,CAAC,MAAM,CAAC,MAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,aAAa,0CAAE,WAAW,EAAE,CAAA,CAAa,CAAC;QACxG,IAAI,CAAC,QAAQ,EAAE;YACb,IAAI,CAAC,GAAG,CAAC,4DAA4D,CAAC,CAAC;YACvE,OAAO,SAAS,CAAC;SAClB;QAED,IAAI,MAAA,IAAI,CAAC,cAAc,0CAAE,OAAO,EAAE;YAChC,IAAI,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC;YAEjC,IAAI,CAAC,cAAc,CAAC,UAAU,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"start.js","sourceRoot":"","sources":["../../../../src/commands/agent/start.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@ interface UploadOptions {
|
|
|
3
3
|
timeout: string | number;
|
|
4
4
|
progress?: (bytes: number, path?: string) => void;
|
|
5
5
|
pin?: boolean;
|
|
6
|
+
authorizationHeader?: string;
|
|
6
7
|
}
|
|
7
8
|
export declare const uploadToIPFS: (path: string, ipfsServer: string, options?: UploadOptions) => Promise<CID>;
|
|
8
9
|
export {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"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;
|
|
1
|
+
{"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;AAG3C,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;IACd,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B;AAED,eAAO,MAAM,YAAY,SAAgB,MAAM,cAAc,MAAM,YAAY,aAAa,KAAG,QAAQ,GAAG,CAmDzG,CAAC"}
|
|
@@ -9,13 +9,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
9
9
|
exports.uploadToIPFS = void 0;
|
|
10
10
|
const fs_1 = __importDefault(require("fs"));
|
|
11
11
|
const path_1 = require("path");
|
|
12
|
-
const log_1 = require("@dxos/log");
|
|
13
12
|
const uploadToIPFS = async (path, ipfsServer, options) => {
|
|
14
|
-
const { timeout, pin = true, progress } = options || {};
|
|
13
|
+
const { timeout, pin = true, progress, authorizationHeader } = options || {};
|
|
15
14
|
const { create, globSource } = await _importESM('kubo-rpc-client');
|
|
16
15
|
const ipfsClient = create({
|
|
17
16
|
url: ipfsServer,
|
|
18
17
|
timeout: timeout || '1m',
|
|
18
|
+
...(authorizationHeader ? { headers: { authorization: authorizationHeader } } : {}),
|
|
19
19
|
});
|
|
20
20
|
if (!fs_1.default.existsSync(path)) {
|
|
21
21
|
throw new Error('Incorrect path to definitons. File or directory does not exist');
|
|
@@ -36,12 +36,14 @@ const uploadToIPFS = async (path, ipfsServer, options) => {
|
|
|
36
36
|
const remoteContent = Buffer.concat(remoteChunks);
|
|
37
37
|
const localContent = fs_1.default.readFileSync(fullPath);
|
|
38
38
|
if (!localContent.equals(remoteContent)) {
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
39
|
+
throw new Error('file content mismatch', {
|
|
40
|
+
cause: {
|
|
41
|
+
path: fullPath,
|
|
42
|
+
cid: file.cid.toString(),
|
|
43
|
+
localSize: localContent.length,
|
|
44
|
+
remoteSize: remoteContent.length,
|
|
45
|
+
},
|
|
46
|
+
});
|
|
45
47
|
}
|
|
46
48
|
}
|
|
47
49
|
files.push(file);
|
|
@@ -1 +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;AAEpB,+BAA4B;
|
|
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;AAEpB,+BAA4B;AASrB,MAAM,YAAY,GAAG,KAAK,EAAE,IAAY,EAAE,UAAkB,EAAE,OAAuB,EAAgB,EAAE;IAC5G,MAAM,EAAE,OAAO,EAAE,GAAG,GAAG,IAAI,EAAE,QAAQ,EAAE,mBAAmB,EAAE,GAAG,OAAO,IAAI,EAAE,CAAC;IAE7E,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;QACxB,GAAG,CAAC,mBAAmB,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,aAAa,EAAE,mBAAmB,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACpF,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,MAAM,IAAI,KAAK,CAAC,uBAAuB,EAAE;wBACvC,KAAK,EAAE;4BACL,IAAI,EAAE,QAAQ;4BACd,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE;4BACxB,SAAS,EAAE,YAAY,CAAC,MAAM;4BAC9B,UAAU,EAAE,aAAa,CAAC,MAAM;yBACjC;qBACF,CAAC,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;AAnDW,QAAA,YAAY,gBAmDvB;AAEF,uCAAuC;AACvC,MAAM,UAAU,GAAG,IAAI,QAAQ,CAAC,YAAY,EAAE,2BAA2B,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"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,
|
|
1
|
+
{"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,CA2Db,CAAC"}
|
|
@@ -24,7 +24,7 @@ const getFolderSize = (0, util_1.promisify)(get_folder_size_1.default);
|
|
|
24
24
|
*/
|
|
25
25
|
const encodeName = (name) => name.replaceAll(':', '/');
|
|
26
26
|
const publish = async ({ verbose, timeout, path, pin }, { log, config, module }) => {
|
|
27
|
-
var _a, _b;
|
|
27
|
+
var _a, _b, _c;
|
|
28
28
|
(0, invariant_1.invariant)(module.name, 'Module name is required to publish.');
|
|
29
29
|
log(`Publishing module ${chalk_1.default.bold(module.name)} ...`);
|
|
30
30
|
const moduleOut = `out/${encodeName(module.name)}`;
|
|
@@ -39,6 +39,23 @@ const publish = async ({ verbose, timeout, path, pin }, { log, config, module })
|
|
|
39
39
|
if (verbose) {
|
|
40
40
|
log(`Publishing from: ${publishFolder} to: ${ipfsServer}`);
|
|
41
41
|
}
|
|
42
|
+
let authorizationHeader;
|
|
43
|
+
// TODO(nf): make CLI support dx-env.yml
|
|
44
|
+
const serverAuthSecret = (_c = process.env.IPFS_API_SECRET) !== null && _c !== void 0 ? _c : config === null || config === void 0 ? void 0 : config.get('runtime.services.ipfs.serverAuthSecret');
|
|
45
|
+
if (serverAuthSecret) {
|
|
46
|
+
const splitSecret = serverAuthSecret.split(':');
|
|
47
|
+
switch (splitSecret[0]) {
|
|
48
|
+
case 'basic':
|
|
49
|
+
authorizationHeader = 'Basic ' + Buffer.from(splitSecret[1] + ':' + splitSecret[2]).toString('base64');
|
|
50
|
+
break;
|
|
51
|
+
case 'bearer':
|
|
52
|
+
authorizationHeader = 'Bearer ' + splitSecret[1];
|
|
53
|
+
break;
|
|
54
|
+
default:
|
|
55
|
+
throw new Error(`Unsupported authType: ${splitSecret[0]}`);
|
|
56
|
+
}
|
|
57
|
+
log(`using server authorization ${splitSecret[0]}`);
|
|
58
|
+
}
|
|
42
59
|
log('Uploading...');
|
|
43
60
|
const bar = new cli_progress_1.default.SingleBar({}, cli_progress_1.default.Presets.shades_classic);
|
|
44
61
|
verbose && bar.start(total, 0);
|
|
@@ -48,6 +65,7 @@ const publish = async ({ verbose, timeout, path, pin }, { log, config, module })
|
|
|
48
65
|
timeout: timeout || '10m',
|
|
49
66
|
pin,
|
|
50
67
|
progress: verbose ? (bytes) => bar.update(bytes) : undefined,
|
|
68
|
+
...(authorizationHeader ? { authorizationHeader } : {}),
|
|
51
69
|
});
|
|
52
70
|
}
|
|
53
71
|
catch (err) {
|
|
@@ -1 +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,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,KAAK,GAAG,MAAM,aAAa,CAAC,aAAa,CAAC,CAAC;IACjD,IAAI,OAAO,EAAE;QACX,GAAG,CAAC,oBAAoB,aAAa,QAAQ,UAAU,EAAE,CAAC,CAAC;KAC5D;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,IAAI,GAAG,CAAC;IACR,IAAI;QACF,GAAG,GAAG,MAAM,IAAA,0BAAY,EAAC,aAAa,EAAE,UAAU,EAAE;YAClD,OAAO,EAAE,OAAO,IAAI,KAAK;YACzB,GAAG;YACH,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,KAAU,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS;
|
|
1
|
+
{"version":3,"file":"publish.js","sourceRoot":"","sources":["../../../../src/util/publish/publish.ts"],"names":[],"mappings":"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"}
|
package/oclif.manifest.json
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
{
|
|
2
|
-
"version": "0.4.4-
|
|
2
|
+
"version": "0.4.4-next.e0df51e",
|
|
3
3
|
"commands": {
|
|
4
4
|
"agent:list": {
|
|
5
5
|
"id": "agent:list",
|
|
@@ -3524,7 +3524,7 @@
|
|
|
3524
3524
|
"type": "option",
|
|
3525
3525
|
"description": "Tunnel name",
|
|
3526
3526
|
"multiple": false,
|
|
3527
|
-
"default": "
|
|
3527
|
+
"default": "alanine-whiskey-nine-magnesium"
|
|
3528
3528
|
}
|
|
3529
3529
|
},
|
|
3530
3530
|
"args": {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dxos/cli",
|
|
3
|
-
"version": "0.4.4-
|
|
3
|
+
"version": "0.4.4-next.e0df51e",
|
|
4
4
|
"description": "DXOS CLI",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"dxos",
|
|
@@ -45,28 +45,28 @@
|
|
|
45
45
|
"react": "^18.2.0",
|
|
46
46
|
"uuid": "^8.3.2",
|
|
47
47
|
"ws": "^8.14.2",
|
|
48
|
-
"@dxos/
|
|
49
|
-
"@dxos/
|
|
50
|
-
"@dxos/
|
|
51
|
-
"@dxos/
|
|
52
|
-
"@dxos/client
|
|
53
|
-
"@dxos/
|
|
54
|
-
"@dxos/config": "0.4.4-
|
|
55
|
-
"@dxos/
|
|
56
|
-
"@dxos/debug": "0.4.4-
|
|
57
|
-
"@dxos/functions": "0.4.4-
|
|
58
|
-
"@dxos/
|
|
59
|
-
"@dxos/log": "0.4.4-
|
|
60
|
-
"@dxos/
|
|
61
|
-
"@dxos/network-manager": "0.4.4-
|
|
62
|
-
"@dxos/observability": "0.4.4-
|
|
63
|
-
"@dxos/plate": "0.4.4-
|
|
64
|
-
"@dxos/process": "0.4.4-
|
|
65
|
-
"@dxos/protocols": "0.4.4-
|
|
66
|
-
"@dxos/
|
|
67
|
-
"@dxos/
|
|
68
|
-
"@dxos/tasks-template": "0.4.4-
|
|
69
|
-
"@dxos/util": "0.4.4-
|
|
48
|
+
"@dxos/agent": "0.4.4-next.e0df51e",
|
|
49
|
+
"@dxos/async": "0.4.4-next.e0df51e",
|
|
50
|
+
"@dxos/client-protocol": "0.4.4-next.e0df51e",
|
|
51
|
+
"@dxos/bare-template": "0.4.4-next.e0df51e",
|
|
52
|
+
"@dxos/client": "0.4.4-next.e0df51e",
|
|
53
|
+
"@dxos/client-services": "0.4.4-next.e0df51e",
|
|
54
|
+
"@dxos/config": "0.4.4-next.e0df51e",
|
|
55
|
+
"@dxos/context": "0.4.4-next.e0df51e",
|
|
56
|
+
"@dxos/debug": "0.4.4-next.e0df51e",
|
|
57
|
+
"@dxos/functions": "0.4.4-next.e0df51e",
|
|
58
|
+
"@dxos/invariant": "0.4.4-next.e0df51e",
|
|
59
|
+
"@dxos/log": "0.4.4-next.e0df51e",
|
|
60
|
+
"@dxos/hello-template": "0.4.4-next.e0df51e",
|
|
61
|
+
"@dxos/network-manager": "0.4.4-next.e0df51e",
|
|
62
|
+
"@dxos/observability": "0.4.4-next.e0df51e",
|
|
63
|
+
"@dxos/plate": "0.4.4-next.e0df51e",
|
|
64
|
+
"@dxos/process": "0.4.4-next.e0df51e",
|
|
65
|
+
"@dxos/protocols": "0.4.4-next.e0df51e",
|
|
66
|
+
"@dxos/rpc": "0.4.4-next.e0df51e",
|
|
67
|
+
"@dxos/random": "0.4.4-next.e0df51e",
|
|
68
|
+
"@dxos/tasks-template": "0.4.4-next.e0df51e",
|
|
69
|
+
"@dxos/util": "0.4.4-next.e0df51e"
|
|
70
70
|
},
|
|
71
71
|
"devDependencies": {
|
|
72
72
|
"@oclif/test": "^2.3.31",
|