npm - @dxos/cli - Versions diffs - 0.7.2-staging.6d26b2a → 0.7.3-main.2dd075e - Mend

@dxos/cli 0.7.2-staging.6d26b2a → 0.7.3-main.2dd075e

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.

Files changed (8) hide show

package/dist/src/commands/{userfunction → function}/upload.d.ts +2 -0
package/dist/src/commands/function/upload.d.ts.map +1 -0
package/dist/src/commands/{userfunction → function}/upload.js +26 -16
package/dist/src/commands/function/upload.js.map +1 -0
package/oclif.manifest.json +192 -185
package/package.json +25 -25
package/dist/src/commands/userfunction/upload.d.ts.map +0 -1
package/dist/src/commands/userfunction/upload.js.map +0 -1

package/dist/src/commands/{userfunction → function}/upload.d.ts RENAMED Viewed

@@ -4,6 +4,7 @@ export default class Upload extends BaseCommand<typeof Upload> {
     static description: string;
     static flags: {
         name: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        version: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         spaceKey: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         objectId: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         functionId: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
@@ -22,5 +23,6 @@ export default class Upload extends BaseCommand<typeof Upload> {
         file: import("@oclif/core/interfaces").Arg<string, Record<string, unknown>>;
     };
     run(): Promise<any>;
+    private _getNextVersion;
 }
 //# sourceMappingURL=upload.d.ts.map

package/dist/src/commands/function/upload.d.ts.map ADDED Viewed

	@@ -0,0 +1 @@
1	+ {"version":3,"file":"upload.d.ts","sourceRoot":"","sources":["../../../../src/commands/function/upload.ts"],"names":[],"mappings":"AAuBA,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAIzC,MAAM,CAAC,OAAO,OAAO,MAAO,SAAQ,WAAW,CAAC,OAAO,MAAM,CAAC;IAC5D,OAAgB,cAAc,UAAQ;IACtC,OAAgB,WAAW,SAA2B;IAEtD,OAAgB,KAAK;;;;;;;;;;;;;;;;MAUnB;IAEF,OAAgB,IAAI;;MAElB;IAEI,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;YA6GX,eAAe;CAU9B"}

package/dist/src/commands/{userfunction → function}/upload.js RENAMED Viewed

@@ -3,12 +3,13 @@
 //
 import { Args, Flags } from '@oclif/core';
 import fs from 'node:fs';
+import { asyncTimeout } from '@dxos/async';
 import { Filter, loadObjectReferences } from '@dxos/client/echo';
-import { create, getMeta } from '@dxos/echo-schema';
+import { create, getMeta } from '@dxos/client/echo';
 import { invariant } from '@dxos/invariant';
 import { TextType } from '@dxos/plugin-markdown/types';
-import { getUserFunctionUrlInMetadata, publicKeyToDid, setUserFunctionUrlInMetadata, uploadWorkerFunction, } from '@dxos/plugin-script/edge';
-import { ScriptType } from '@dxos/plugin-script/types';
+import { getUserFunctionUrlInMetadata, incrementSemverPatch, setUserFunctionUrlInMetadata, uploadWorkerFunction, } from '@dxos/plugin-script/edge';
+import { FunctionType, ScriptType } from '@dxos/plugin-script/types';
 import { BaseCommand } from '../../base';
 // TODO: move to cli-composer
 class Upload extends BaseCommand {
@@ -21,6 +22,7 @@ class Upload extends BaseCommand {
             this.error(`Error reading file ${this.args.file}: ${err.message}`);
         }
         const handleUpload = async ({ client, space }) => {
+            invariant(space, 'Has to provide a space');
             client.addTypes([ScriptType, TextType]);
             const identity = client.halo.identity.get();
             invariant(identity, 'Identity not available');
@@ -31,7 +33,7 @@ class Upload extends BaseCommand {
                 existingFunctionId = this.flags.functionId;
             }
             // Find existing object and functionId in metadata if it exists
-            if (space && this.flags.objectId) {
+            if (this.flags.objectId) {
                 const qr = await space.db.query(Filter.schema(ScriptType)).run();
                 existingObject = qr.objects.find((o) => o.id === this.flags.objectId);
                 if (!existingObject) {
@@ -48,21 +50,17 @@ class Upload extends BaseCommand {
                     this.log(`Uploading to existing FunctionId ${existingFunctionId} read from ${this.flags.spaceKey}/${this.flags.objectId}`);
                 }
             }
-            const ownerDid = publicKeyToDid(identity.identityKey);
             let result;
             try {
-                result = await uploadWorkerFunction({
-                    halo: client.halo,
-                    clientConfig: client.config,
-                    ownerDid,
+                result = await asyncTimeout(uploadWorkerFunction({
+                    client,
+                    spaceId: space.id,
+                    version: await this._getNextVersion(space, existingFunctionId),
                     functionId: existingFunctionId,
                     name: this.flags.name,
                     source: scriptContent,
-                    credentialLoadTimeout: 5000,
-                });
-                if (result.result !== 'success' || result.functionId === undefined) {
-                    this.error(`Upload failed: ${result.errorMessage}`);
-                }
+                }), 5000);
+                invariant(result.functionId, 'Upload failed.');
                 this.log(`Uploaded function: ${result.functionId}`);
             }
             catch (err) {
@@ -83,7 +81,7 @@ class Upload extends BaseCommand {
                     this.log(`Updated source in ${this.flags.spaceKey}/${this.flags.objectId} (${existingObject.source.id})`);
                 }
                 if (!functionUrlFromExistingObject) {
-                    await setUserFunctionUrlInMetadata(getMeta(existingObject), `/${ownerDid}/${result.functionId}`);
+                    setUserFunctionUrlInMetadata(getMeta(existingObject), `/${space.id}/${result.functionId}`);
                 }
                 else {
                     if (existingFunctionId !== result.functionId) {
@@ -96,7 +94,7 @@ class Upload extends BaseCommand {
                 // TODO: make object navigable in Composer.
                 const sourceObj = space.db.add(create(TextType, { content: scriptContent }));
                 const obj = space.db.add(create(ScriptType, { name: this.flags.name, source: sourceObj }));
-                await setUserFunctionUrlInMetadata(getMeta(obj), result.functionId);
+                setUserFunctionUrlInMetadata(getMeta(obj), result.functionId);
                 if (this.flags.verbose) {
                     this.log(`Created object: ${this.flags.spaceKey}/${obj.id}`);
                 }
@@ -109,12 +107,24 @@ class Upload extends BaseCommand {
         }
         return await this.execWithClient(async ({ client }) => await handleUpload({ client }));
     }
+    async _getNextVersion(space, functionId) {
+        var _a, _b;
+        if (this.flags.version) {
+            return this.flags.version;
+        }
+        if (functionId) {
+            const { objects } = await space.db.query(Filter.schema(FunctionType, { id: functionId })).run();
+            return incrementSemverPatch((_b = (_a = objects[0]) === null || _a === void 0 ? void 0 : _a.version) !== null && _b !== void 0 ? _b : '0.0.0');
+        }
+        return '0.0.1';
+    }
 }
 Upload.enableJsonFlag = true;
 Upload.description = 'Upload user function.';
 Upload.flags = {
     ...BaseCommand.flags,
     name: Flags.string({ description: 'Function name.' }),
+    version: Flags.string({ description: 'Function version.' }),
     spaceKey: Flags.string({ description: 'Space key to create/update Script source in.' }),
     objectId: Flags.string({ description: 'Existing Script Object ID to update.' }),
     functionId: Flags.string({

package/dist/src/commands/function/upload.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../../src/commands/function/upload.ts"],"names":[],"mappings":"AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;AAEF,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,MAAM,SAAS,CAAC;AAEzB,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE3C,OAAO,EAA2B,MAAM,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAC1F,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAEpD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AACvD,OAAO,EACL,4BAA4B,EAC5B,oBAAoB,EACpB,4BAA4B,EAC5B,oBAAoB,GACrB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAGrE,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAEzC,6BAA6B;AAE7B,MAAqB,MAAO,SAAQ,WAA0B;IAoB5D,KAAK,CAAC,GAAG;QACP,IAAI,aAAiC,CAAC;QACtC,IAAI,CAAC;YACH,aAAa,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAC1D,CAAC;QAAC,OAAO,GAAQ,EAAE,CAAC;YAClB,IAAI,CAAC,KAAK,CAAC,sBAAsB,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;QACrE,CAAC;QAED,MAAM,YAAY,GAAG,KAAK,EAAE,EAAE,MAAM,EAAE,KAAK,EAAqC,EAAE,EAAE;YAClF,SAAS,CAAC,KAAK,EAAE,wBAAwB,CAAC,CAAC;YAE3C,MAAM,CAAC,QAAQ,CAAC,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAC;YACxC,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;YAC5C,SAAS,CAAC,QAAQ,EAAE,wBAAwB,CAAC,CAAC;YAE9C,IAAI,kBAAsC,CAAC;YAC3C,IAAI,cAA0D,CAAC;YAC/D,IAAI,6BAAiD,CAAC;YACtD,IAAI,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,CAAC;gBAC1B,kBAAkB,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC;YAC7C,CAAC;YAED,+DAA+D;YAC/D,IAAI,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;gBACxB,MAAM,EAAE,GAAG,MAAM,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC;gBACjE,cAAc,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;gBACtE,IAAI,CAAC,cAAc,EAAE,CAAC;oBACpB,IAAI,CAAC,KAAK,CAAC,qBAAqB,IAAI,CAAC,KAAK,CAAC,QAAQ,IAAI,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;gBAChF,CAAC;gBACD,6BAA6B,GAAG,MAAM,4BAA4B,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC;gBAC5F,IAAI,6BAA6B,EAAE,CAAC;oBAClC,kBAAkB,GAAG,6BAA6B,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;oBACrE,IAAI,kBAAkB,KAAK,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,CAAC;wBACjD,IAAI,CAAC,IAAI,CACP,uBAAuB,IAAI,CAAC,KAAK,CAAC,UAAU,uCAAuC,kBAAkB,6BAA6B,CACnI,CAAC;oBACJ,CAAC;gBACH,CAAC;gBAED,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;oBACvB,IAAI,CAAC,GAAG,CACN,oCAAoC,kBAAkB,cAAc,IAAI,CAAC,KAAK,CAAC,QAAQ,IAAI,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CACjH,CAAC;gBACJ,CAAC;YACH,CAAC;YAED,IAAI,MAAkC,CAAC;YACvC,IAAI,CAAC;gBACH,MAAM,GAAG,MAAM,YAAY,CACzB,oBAAoB,CAAC;oBACnB,MAAM;oBACN,OAAO,EAAE,KAAK,CAAC,EAAE;oBACjB,OAAO,EAAE,MAAM,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,kBAAkB,CAAC;oBAC9D,UAAU,EAAE,kBAAkB;oBAC9B,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI;oBACrB,MAAM,EAAE,aAAa;iBACtB,CAAC,EACF,IAAK,CACN,CAAC;gBACF,SAAS,CAAC,MAAM,CAAC,UAAU,EAAE,gBAAgB,CAAC,CAAC;gBAC/C,IAAI,CAAC,GAAG,CAAC,sBAAsB,MAAM,CAAC,UAAU,EAAE,CAAC,CAAC;YACtD,CAAC;YAAC,OAAO,GAAQ,EAAE,CAAC;gBAClB,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YAC1B,CAAC;YAED,gEAAgE;YAChE,IAAI,CAAC,KAAK,EAAE,CAAC;gBACX,OAAO;YACT,CAAC;YAED,IAAI,cAAc,EAAE,CAAC;gBACnB,yBAAyB;gBACzB,MAAM,oBAAoB,CAAC,cAAc,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;gBAChE,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,CAAC;oBAC3B,IAAI,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAC;gBACxC,CAAC;gBACD,cAAc,CAAC,MAAM,CAAC,OAAO,GAAG,aAAa,CAAC;gBAE9C,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;oBACvB,IAAI,CAAC,GAAG,CAAC,qBAAqB,IAAI,CAAC,KAAK,CAAC,QAAQ,IAAI,IAAI,CAAC,KAAK,CAAC,QAAQ,KAAK,cAAc,CAAC,MAAM,CAAC,EAAE,GAAG,CAAC,CAAC;gBAC5G,CAAC;gBACD,IAAI,CAAC,6BAA6B,EAAE,CAAC;oBACnC,4BAA4B,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE,IAAI,KAAK,CAAC,EAAE,IAAI,MAAM,CAAC,UAAU,EAAE,CAAC,CAAC;gBAC7F,CAAC;qBAAM,CAAC;oBACN,IAAI,kBAAkB,KAAK,MAAM,CAAC,UAAU,EAAE,CAAC;wBAC7C,IAAI,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC;oBACpC,CAAC;gBACH,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,oBAAoB;gBACpB,2CAA2C;gBAC3C,MAAM,SAAS,GAAG,KAAK,CAAC,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,OAAO,EAAE,aAAa,EAAE,CAAC,CAAC,CAAC;gBAC7E,MAAM,GAAG,GAAG,KAAK,CAAC,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,UAAU,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC;gBAC3F,4BAA4B,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;gBAC9D,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;oBACvB,IAAI,CAAC,GAAG,CAAC,mBAAmB,IAAI,CAAC,KAAK,CAAC,QAAQ,IAAI,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC;gBAC/D,CAAC;YACH,CAAC;QACH,CAAC,CAAC;QAEF,IAAI,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;YACxB,OAAO,MAAM,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,MAAM,YAAY,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE;gBAClG,SAAS,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC;aACjC,CAAC,CAAC;QACL,CAAC;QAED,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,MAAM,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;IACzF,CAAC;IAEO,KAAK,CAAC,eAAe,CAAC,KAAY,EAAE,UAA8B;;QACxE,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;YACvB,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC;QAC5B,CAAC;QACD,IAAI,UAAU,EAAE,CAAC;YACf,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,YAAY,EAAE,EAAE,EAAE,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC;YAChG,OAAO,oBAAoB,CAAC,MAAA,MAAA,OAAO,CAAC,CAAC,CAAC,0CAAE,OAAO,mCAAI,OAAO,CAAC,CAAC;QAC9D,CAAC;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;;AAzIe,qBAAc,GAAG,IAAI,CAAC;AACtB,kBAAW,GAAG,uBAAuB,CAAC;AAEtC,YAAK,GAAG;IACtB,GAAG,WAAW,CAAC,KAAK;IACpB,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,EAAE,WAAW,EAAE,gBAAgB,EAAE,CAAC;IACrD,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,EAAE,WAAW,EAAE,mBAAmB,EAAE,CAAC;IAC3D,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAC,EAAE,WAAW,EAAE,8CAA8C,EAAE,CAAC;IACvF,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAC,EAAE,WAAW,EAAE,sCAAsC,EAAE,CAAC;IAC/E,UAAU,EAAE,KAAK,CAAC,MAAM,CAAC;QACvB,WAAW,EAAE,qCAAqC;QAClD,QAAQ,EAAE,CAAC,UAAU,EAAE,UAAU,CAAC;KACnC,CAAC;CACH,CAAC;AAEc,WAAI,GAAG;IACrB,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;CACtC,CAAC;eAlBiB,MAAM"}

package/oclif.manifest.json CHANGED Viewed

@@ -839,6 +839,112 @@
         "stop.js"
       ]
     },
+    "config": {
+      "aliases": [],
+      "args": {},
+      "description": "Show config file.",
+      "flags": {
+        "json": {
+          "description": "Output as JSON.",
+          "name": "json",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "verbose": {
+          "char": "v",
+          "description": "Verbose output",
+          "name": "verbose",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "dry-run": {
+          "description": "Dry run.",
+          "name": "dry-run",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "profile": {
+          "description": "User profile.",
+          "env": "DX_PROFILE",
+          "name": "profile",
+          "default": "default",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "config": {
+          "aliases": [
+            "c"
+          ],
+          "dependsOn": [
+            "profile"
+          ],
+          "description": "Config file.",
+          "env": "DX_CONFIG",
+          "name": "config",
+          "default": "/home/runner/.config/dx/profile/default.yml",
+          "hasDynamicHelp": false,
+          "helpValue": "path",
+          "multiple": false,
+          "type": "option"
+        },
+        "timeout": {
+          "aliases": [
+            "t"
+          ],
+          "description": "Timeout (ms).",
+          "name": "timeout",
+          "default": 60000,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "target": {
+          "description": "Target websocket server.",
+          "name": "target",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "agent": {
+          "description": "Run command with agent.",
+          "env": "DX_NO_AGENT",
+          "name": "agent",
+          "allowNo": true,
+          "type": "boolean"
+        },
+        "json-log": {
+          "description": "When running in foreground, log JSON format",
+          "name": "json-log",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "json-logfile": {
+          "description": "JSON log file destination, or 'stdout' or 'stderr'",
+          "name": "json-logfile",
+          "default": "stderr",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        }
+      },
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "config",
+      "pluginAlias": "@dxos/cli",
+      "pluginName": "@dxos/cli",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": true,
+      "isESM": true,
+      "relativePath": [
+        "dist",
+        "src",
+        "commands",
+        "config",
+        "index.js"
+      ]
+    },
     "debug:diagnostics": {
       "aliases": [],
       "args": {},
@@ -1447,10 +1553,10 @@
         "status.js"
       ]
     },
-    "config": {
+    "device:info": {
       "aliases": [],
       "args": {},
-      "description": "Show config file.",
+      "description": "Show device info.",
       "flags": {
         "json": {
           "description": "Output as JSON.",
@@ -1538,7 +1644,7 @@
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "config",
+      "id": "device:info",
       "pluginAlias": "@dxos/cli",
       "pluginName": "@dxos/cli",
       "pluginType": "core",
@@ -1549,11 +1655,11 @@
         "dist",
         "src",
         "commands",
-        "config",
-        "index.js"
+        "device",
+        "info.js"
       ]
     },
-    "device:info": {
+    "device:list": {
       "aliases": [],
       "args": {},
       "description": "Show device info.",
@@ -1640,11 +1746,17 @@
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
+        },
+        "extended": {
+          "description": "Show extended table columns.",
+          "name": "extended",
+          "allowNo": false,
+          "type": "boolean"
         }
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "device:info",
+      "id": "device:list",
       "pluginAlias": "@dxos/cli",
       "pluginName": "@dxos/cli",
       "pluginType": "core",
@@ -1656,13 +1768,13 @@
         "src",
         "commands",
         "device",
-        "info.js"
+        "list.js"
       ]
     },
-    "device:list": {
+    "device:update": {
       "aliases": [],
       "args": {},
-      "description": "Show device info.",
+      "description": "Update device info.",
       "flags": {
         "json": {
           "description": "Output as JSON.",
@@ -1747,34 +1859,35 @@
           "multiple": false,
           "type": "option"
         },
-        "extended": {
-          "description": "Show extended table columns.",
-          "name": "extended",
-          "allowNo": false,
-          "type": "boolean"
+        "label": {
+          "description": "Set device label",
+          "name": "label",
+          "required": true,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
         }
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "device:list",
+      "id": "device:update",
       "pluginAlias": "@dxos/cli",
       "pluginName": "@dxos/cli",
       "pluginType": "core",
       "strict": true,
-      "enableJsonFlag": true,
       "isESM": true,
       "relativePath": [
         "dist",
         "src",
         "commands",
         "device",
-        "list.js"
+        "update.js"
       ]
     },
-    "device:update": {
+    "function:list": {
       "aliases": [],
       "args": {},
-      "description": "Update device info.",
+      "description": "List functions.",
       "flags": {
         "json": {
           "description": "Output as JSON.",
@@ -1858,36 +1971,35 @@
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
-        },
-        "label": {
-          "description": "Set device label",
-          "name": "label",
-          "required": true,
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
         }
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "device:update",
+      "id": "function:list",
       "pluginAlias": "@dxos/cli",
       "pluginName": "@dxos/cli",
       "pluginType": "core",
       "strict": true,
+      "enableJsonFlag": true,
       "isESM": true,
       "relativePath": [
         "dist",
         "src",
         "commands",
-        "device",
-        "update.js"
+        "function",
+        "list.js"
       ]
     },
-    "function:list": {
+    "function:logs": {
       "aliases": [],
-      "args": {},
-      "description": "List functions.",
+      "args": {
+        "name": {
+          "description": "Function name.",
+          "name": "name",
+          "required": true
+        }
+      },
+      "description": "Get function logs.",
       "flags": {
         "json": {
           "description": "Output as JSON.",
@@ -1975,10 +2087,11 @@
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "function:list",
+      "id": "function:logs",
       "pluginAlias": "@dxos/cli",
       "pluginName": "@dxos/cli",
       "pluginType": "core",
+      "state": "deprecated",
       "strict": true,
       "enableJsonFlag": true,
       "isESM": true,
@@ -1987,19 +2100,18 @@
         "src",
         "commands",
         "function",
-        "list.js"
+        "logs.js"
       ]
     },
-    "function:logs": {
+    "function:upload": {
       "aliases": [],
       "args": {
-        "name": {
-          "description": "Function name.",
-          "name": "name",
+        "file": {
+          "name": "file",
           "required": true
         }
       },
-      "description": "Get function logs.",
+      "description": "Upload user function.",
       "flags": {
         "json": {
           "description": "Output as JSON.",
@@ -2083,15 +2195,49 @@
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
+        },
+        "name": {
+          "description": "Function name.",
+          "name": "name",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "version": {
+          "description": "Function version.",
+          "name": "version",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "spaceKey": {
+          "description": "Space key to create/update Script source in.",
+          "name": "spaceKey",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "objectId": {
+          "description": "Existing Script Object ID to update.",
+          "name": "objectId",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "functionId": {
+          "description": "Existing UserFunction ID to update.",
+          "name": "functionId",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
         }
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "function:logs",
+      "id": "function:upload",
       "pluginAlias": "@dxos/cli",
       "pluginName": "@dxos/cli",
       "pluginType": "core",
-      "state": "deprecated",
       "strict": true,
       "enableJsonFlag": true,
       "isESM": true,
@@ -2100,7 +2246,7 @@
         "src",
         "commands",
         "function",
-        "logs.js"
+        "upload.js"
       ]
     },
     "halo:create": {
@@ -4569,7 +4715,7 @@
         "name": {
           "description": "Tunnel name",
           "name": "name",
-          "default": "network-cardinal-mountain-ack",
+          "default": "island-bluebird-apart-yankee",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
@@ -4706,145 +4852,6 @@
         "list.js"
       ]
     },
-    "userfunction:upload": {
-      "aliases": [],
-      "args": {
-        "file": {
-          "name": "file",
-          "required": true
-        }
-      },
-      "description": "Upload user function.",
-      "flags": {
-        "json": {
-          "description": "Output as JSON.",
-          "name": "json",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "verbose": {
-          "char": "v",
-          "description": "Verbose output",
-          "name": "verbose",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "dry-run": {
-          "description": "Dry run.",
-          "name": "dry-run",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "profile": {
-          "description": "User profile.",
-          "env": "DX_PROFILE",
-          "name": "profile",
-          "default": "default",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "config": {
-          "aliases": [
-            "c"
-          ],
-          "dependsOn": [
-            "profile"
-          ],
-          "description": "Config file.",
-          "env": "DX_CONFIG",
-          "name": "config",
-          "default": "/home/runner/.config/dx/profile/default.yml",
-          "hasDynamicHelp": false,
-          "helpValue": "path",
-          "multiple": false,
-          "type": "option"
-        },
-        "timeout": {
-          "aliases": [
-            "t"
-          ],
-          "description": "Timeout (ms).",
-          "name": "timeout",
-          "default": 60000,
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "target": {
-          "description": "Target websocket server.",
-          "name": "target",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "agent": {
-          "description": "Run command with agent.",
-          "env": "DX_NO_AGENT",
-          "name": "agent",
-          "allowNo": true,
-          "type": "boolean"
-        },
-        "json-log": {
-          "description": "When running in foreground, log JSON format",
-          "name": "json-log",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "json-logfile": {
-          "description": "JSON log file destination, or 'stdout' or 'stderr'",
-          "name": "json-logfile",
-          "default": "stderr",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "name": {
-          "description": "Function name.",
-          "name": "name",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "spaceKey": {
-          "description": "Space key to create/update Script source in.",
-          "name": "spaceKey",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "objectId": {
-          "description": "Existing Script Object ID to update.",
-          "name": "objectId",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "functionId": {
-          "description": "Existing UserFunction ID to update.",
-          "name": "functionId",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        }
-      },
-      "hasDynamicHelp": false,
-      "hiddenAliases": [],
-      "id": "userfunction:upload",
-      "pluginAlias": "@dxos/cli",
-      "pluginName": "@dxos/cli",
-      "pluginType": "core",
-      "strict": true,
-      "enableJsonFlag": true,
-      "isESM": true,
-      "relativePath": [
-        "dist",
-        "src",
-        "commands",
-        "userfunction",
-        "upload.js"
-      ]
-    },
     "function:trigger:list": {
       "aliases": [],
       "args": {},
@@ -5563,5 +5570,5 @@
       ]
     }
   },
-  "version": "0.7.2-staging.6d26b2a"
+  "version": "0.7.3-main.2dd075e"
 }

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/cli",
-  "version": "0.7.2-staging.6d26b2a",
+  "version": "0.7.3-main.2dd075e",
   "description": "DXOS CLI",
   "keywords": [
     "dxos",
@@ -53,30 +53,30 @@
     "react": "~18.2.0",
     "ws": "^8.14.2",
     "wtfnode": "^0.9.1",
-    "@dxos/agent": "0.7.2-staging.6d26b2a",
-    "@dxos/async": "0.7.2-staging.6d26b2a",
-    "@dxos/cli-composer": "0.7.2-staging.6d26b2a",
-    "@dxos/cli-base": "0.7.2-staging.6d26b2a",
-    "@dxos/client": "0.7.2-staging.6d26b2a",
-    "@dxos/client-services": "0.7.2-staging.6d26b2a",
-    "@dxos/context": "0.7.2-staging.6d26b2a",
-    "@dxos/config": "0.7.2-staging.6d26b2a",
-    "@dxos/client-protocol": "0.7.2-staging.6d26b2a",
-    "@dxos/echo-schema": "0.7.2-staging.6d26b2a",
-    "@dxos/debug": "0.7.2-staging.6d26b2a",
-    "@dxos/invariant": "0.7.2-staging.6d26b2a",
-    "@dxos/log": "0.7.2-staging.6d26b2a",
-    "@dxos/network-manager": "0.7.2-staging.6d26b2a",
-    "@dxos/functions": "0.7.2-staging.6d26b2a",
-    "@dxos/node-std": "0.7.2-staging.6d26b2a",
-    "@dxos/plugin-markdown": "0.7.2-staging.6d26b2a",
-    "@dxos/observability": "0.7.2-staging.6d26b2a",
-    "@dxos/plugin-script": "0.7.2-staging.6d26b2a",
-    "@dxos/process": "0.7.2-staging.6d26b2a",
-    "@dxos/protocols": "0.7.2-staging.6d26b2a",
-    "@dxos/random": "0.7.2-staging.6d26b2a",
-    "@dxos/util": "0.7.2-staging.6d26b2a",
-    "@dxos/rpc": "0.7.2-staging.6d26b2a"
+    "@dxos/agent": "0.7.3-main.2dd075e",
+    "@dxos/async": "0.7.3-main.2dd075e",
+    "@dxos/cli-composer": "0.7.3-main.2dd075e",
+    "@dxos/cli-base": "0.7.3-main.2dd075e",
+    "@dxos/client-protocol": "0.7.3-main.2dd075e",
+    "@dxos/client-services": "0.7.3-main.2dd075e",
+    "@dxos/config": "0.7.3-main.2dd075e",
+    "@dxos/client": "0.7.3-main.2dd075e",
+    "@dxos/context": "0.7.3-main.2dd075e",
+    "@dxos/debug": "0.7.3-main.2dd075e",
+    "@dxos/echo-schema": "0.7.3-main.2dd075e",
+    "@dxos/functions": "0.7.3-main.2dd075e",
+    "@dxos/network-manager": "0.7.3-main.2dd075e",
+    "@dxos/node-std": "0.7.3-main.2dd075e",
+    "@dxos/invariant": "0.7.3-main.2dd075e",
+    "@dxos/log": "0.7.3-main.2dd075e",
+    "@dxos/plugin-markdown": "0.7.3-main.2dd075e",
+    "@dxos/observability": "0.7.3-main.2dd075e",
+    "@dxos/plugin-script": "0.7.3-main.2dd075e",
+    "@dxos/process": "0.7.3-main.2dd075e",
+    "@dxos/random": "0.7.3-main.2dd075e",
+    "@dxos/protocols": "0.7.3-main.2dd075e",
+    "@dxos/util": "0.7.3-main.2dd075e",
+    "@dxos/rpc": "0.7.3-main.2dd075e"
   },
   "devDependencies": {
     "@oclif/test": "^4.1.0",

package/dist/src/commands/userfunction/upload.d.ts.map DELETED Viewed

	@@ -1 +0,0 @@
1	- {"version":3,"file":"upload.d.ts","sourceRoot":"","sources":["../../../../src/commands/userfunction/upload.ts"],"names":[],"mappings":"AAsBA,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAIzC,MAAM,CAAC,OAAO,OAAO,MAAO,SAAQ,WAAW,CAAC,OAAO,MAAM,CAAC;IAC5D,OAAgB,cAAc,UAAQ;IACtC,OAAgB,WAAW,SAA2B;IAEtD,OAAgB,KAAK;;;;;;;;;;;;;;;MASnB;IAEF,OAAgB,IAAI;;MAElB;IAEI,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;CA2G1B"}

package/dist/src/commands/userfunction/upload.js.map DELETED Viewed

@@ -1 +0,0 @@

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