@dxos/cli 0.7.2 → 0.7.3-staging.0905f03

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
  1. package/dist/src/commands/{userfunction → function}/upload.d.ts +2 -0
  2. package/dist/src/commands/function/upload.d.ts.map +1 -0
  3. package/dist/src/commands/{userfunction → function}/upload.js +26 -16
  4. package/dist/src/commands/function/upload.js.map +1 -0
  5. package/oclif.manifest.json +148 -141
  6. package/package.json +25 -25
  7. package/dist/src/commands/userfunction/upload.d.ts.map +0 -1
  8. package/dist/src/commands/userfunction/upload.js.map +0 -1
package/dist/src/commands/{userfunction → function}/upload.d.ts RENAMED
@@ -4,6 +4,7 @@ export default class Upload extends BaseCommand<typeof Upload> {
4
4
  static description: string;
5
5
  static flags: {
6
6
  name: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
7
+ version: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
7
8
  spaceKey: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
8
9
  objectId: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
9
10
  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> {
22
23
  file: import("@oclif/core/interfaces").Arg<string, Record<string, unknown>>;
23
24
  };
24
25
  run(): Promise<any>;
26
+ private _getNextVersion;
25
27
  }
26
28
  //# sourceMappingURL=upload.d.ts.map
package/dist/src/commands/function/upload.d.ts.map ADDED
@@ -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
@@ -3,12 +3,13 @@
3
3
  //
4
4
  import { Args, Flags } from '@oclif/core';
5
5
  import fs from 'node:fs';
6
+ import { asyncTimeout } from '@dxos/async';
6
7
  import { Filter, loadObjectReferences } from '@dxos/client/echo';
7
- import { create, getMeta } from '@dxos/echo-schema';
8
+ import { create, getMeta } from '@dxos/client/echo';
8
9
  import { invariant } from '@dxos/invariant';
9
10
  import { TextType } from '@dxos/plugin-markdown/types';
10
- import { getUserFunctionUrlInMetadata, publicKeyToDid, setUserFunctionUrlInMetadata, uploadWorkerFunction, } from '@dxos/plugin-script/edge';
11
- import { ScriptType } from '@dxos/plugin-script/types';
11
+ import { getUserFunctionUrlInMetadata, incrementSemverPatch, setUserFunctionUrlInMetadata, uploadWorkerFunction, } from '@dxos/plugin-script/edge';
12
+ import { FunctionType, ScriptType } from '@dxos/plugin-script/types';
12
13
  import { BaseCommand } from '../../base';
13
14
  // TODO: move to cli-composer
14
15
  class Upload extends BaseCommand {
@@ -21,6 +22,7 @@ class Upload extends BaseCommand {
21
22
  this.error(`Error reading file ${this.args.file}: ${err.message}`);
22
23
  }
23
24
  const handleUpload = async ({ client, space }) => {
25
+ invariant(space, 'Has to provide a space');
24
26
  client.addTypes([ScriptType, TextType]);
25
27
  const identity = client.halo.identity.get();
26
28
  invariant(identity, 'Identity not available');
@@ -31,7 +33,7 @@ class Upload extends BaseCommand {
31
33
  existingFunctionId = this.flags.functionId;
32
34
  }
33
35
  // Find existing object and functionId in metadata if it exists
34
- if (space && this.flags.objectId) {
36
+ if (this.flags.objectId) {
35
37
  const qr = await space.db.query(Filter.schema(ScriptType)).run();
36
38
  existingObject = qr.objects.find((o) => o.id === this.flags.objectId);
37
39
  if (!existingObject) {
@@ -48,21 +50,17 @@ class Upload extends BaseCommand {
48
50
  this.log(`Uploading to existing FunctionId ${existingFunctionId} read from ${this.flags.spaceKey}/${this.flags.objectId}`);
49
51
  }
50
52
  }
51
- const ownerDid = publicKeyToDid(identity.identityKey);
52
53
  let result;
53
54
  try {
54
- result = await uploadWorkerFunction({
55
- halo: client.halo,
56
- clientConfig: client.config,
57
- ownerDid,
55
+ result = await asyncTimeout(uploadWorkerFunction({
56
+ client,
57
+ spaceId: space.id,
58
+ version: await this._getNextVersion(space, existingFunctionId),
58
59
  functionId: existingFunctionId,
59
60
  name: this.flags.name,
60
61
  source: scriptContent,
61
- credentialLoadTimeout: 5000,
62
- });
63
- if (result.result !== 'success' || result.functionId === undefined) {
64
- this.error(`Upload failed: ${result.errorMessage}`);
65
- }
62
+ }), 5000);
63
+ invariant(result.functionId, 'Upload failed.');
66
64
  this.log(`Uploaded function: ${result.functionId}`);
67
65
  }
68
66
  catch (err) {
@@ -83,7 +81,7 @@ class Upload extends BaseCommand {
83
81
  this.log(`Updated source in ${this.flags.spaceKey}/${this.flags.objectId} (${existingObject.source.id})`);
84
82
  }
85
83
  if (!functionUrlFromExistingObject) {
86
- await setUserFunctionUrlInMetadata(getMeta(existingObject), `/${ownerDid}/${result.functionId}`);
84
+ setUserFunctionUrlInMetadata(getMeta(existingObject), `/${space.id}/${result.functionId}`);
87
85
  }
88
86
  else {
89
87
  if (existingFunctionId !== result.functionId) {
@@ -96,7 +94,7 @@ class Upload extends BaseCommand {
96
94
  // TODO: make object navigable in Composer.
97
95
  const sourceObj = space.db.add(create(TextType, { content: scriptContent }));
98
96
  const obj = space.db.add(create(ScriptType, { name: this.flags.name, source: sourceObj }));
99
- await setUserFunctionUrlInMetadata(getMeta(obj), result.functionId);
97
+ setUserFunctionUrlInMetadata(getMeta(obj), result.functionId);
100
98
  if (this.flags.verbose) {
101
99
  this.log(`Created object: ${this.flags.spaceKey}/${obj.id}`);
102
100
  }
@@ -109,12 +107,24 @@ class Upload extends BaseCommand {
109
107
  }
110
108
  return await this.execWithClient(async ({ client }) => await handleUpload({ client }));
111
109
  }
110
+ async _getNextVersion(space, functionId) {
111
+ var _a, _b;
112
+ if (this.flags.version) {
113
+ return this.flags.version;
114
+ }
115
+ if (functionId) {
116
+ const { objects } = await space.db.query(Filter.schema(FunctionType, { id: functionId })).run();
117
+ return incrementSemverPatch((_b = (_a = objects[0]) === null || _a === void 0 ? void 0 : _a.version) !== null && _b !== void 0 ? _b : '0.0.0');
118
+ }
119
+ return '0.0.1';
120
+ }
112
121
  }
113
122
  Upload.enableJsonFlag = true;
114
123
  Upload.description = 'Upload user function.';
115
124
  Upload.flags = {
116
125
  ...BaseCommand.flags,
117
126
  name: Flags.string({ description: 'Function name.' }),
127
+ version: Flags.string({ description: 'Function version.' }),
118
128
  spaceKey: Flags.string({ description: 'Space key to create/update Script source in.' }),
119
129
  objectId: Flags.string({ description: 'Existing Script Object ID to update.' }),
120
130
  functionId: Flags.string({
package/dist/src/commands/function/upload.js.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../../src/commands/function/upload.ts"],"names":[],"mappings":"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"}
package/oclif.manifest.json CHANGED
@@ -2103,6 +2103,152 @@
2103
2103
  "logs.js"
2104
2104
  ]
2105
2105
  },
2106
+ "function:upload": {
2107
+ "aliases": [],
2108
+ "args": {
2109
+ "file": {
2110
+ "name": "file",
2111
+ "required": true
2112
+ }
2113
+ },
2114
+ "description": "Upload user function.",
2115
+ "flags": {
2116
+ "json": {
2117
+ "description": "Output as JSON.",
2118
+ "name": "json",
2119
+ "allowNo": false,
2120
+ "type": "boolean"
2121
+ },
2122
+ "verbose": {
2123
+ "char": "v",
2124
+ "description": "Verbose output",
2125
+ "name": "verbose",
2126
+ "allowNo": false,
2127
+ "type": "boolean"
2128
+ },
2129
+ "dry-run": {
2130
+ "description": "Dry run.",
2131
+ "name": "dry-run",
2132
+ "allowNo": false,
2133
+ "type": "boolean"
2134
+ },
2135
+ "profile": {
2136
+ "description": "User profile.",
2137
+ "env": "DX_PROFILE",
2138
+ "name": "profile",
2139
+ "default": "default",
2140
+ "hasDynamicHelp": false,
2141
+ "multiple": false,
2142
+ "type": "option"
2143
+ },
2144
+ "config": {
2145
+ "aliases": [
2146
+ "c"
2147
+ ],
2148
+ "dependsOn": [
2149
+ "profile"
2150
+ ],
2151
+ "description": "Config file.",
2152
+ "env": "DX_CONFIG",
2153
+ "name": "config",
2154
+ "default": "/home/runner/.config/dx/profile/default.yml",
2155
+ "hasDynamicHelp": false,
2156
+ "helpValue": "path",
2157
+ "multiple": false,
2158
+ "type": "option"
2159
+ },
2160
+ "timeout": {
2161
+ "aliases": [
2162
+ "t"
2163
+ ],
2164
+ "description": "Timeout (ms).",
2165
+ "name": "timeout",
2166
+ "default": 60000,
2167
+ "hasDynamicHelp": false,
2168
+ "multiple": false,
2169
+ "type": "option"
2170
+ },
2171
+ "target": {
2172
+ "description": "Target websocket server.",
2173
+ "name": "target",
2174
+ "hasDynamicHelp": false,
2175
+ "multiple": false,
2176
+ "type": "option"
2177
+ },
2178
+ "agent": {
2179
+ "description": "Run command with agent.",
2180
+ "env": "DX_NO_AGENT",
2181
+ "name": "agent",
2182
+ "allowNo": true,
2183
+ "type": "boolean"
2184
+ },
2185
+ "json-log": {
2186
+ "description": "When running in foreground, log JSON format",
2187
+ "name": "json-log",
2188
+ "allowNo": false,
2189
+ "type": "boolean"
2190
+ },
2191
+ "json-logfile": {
2192
+ "description": "JSON log file destination, or 'stdout' or 'stderr'",
2193
+ "name": "json-logfile",
2194
+ "default": "stderr",
2195
+ "hasDynamicHelp": false,
2196
+ "multiple": false,
2197
+ "type": "option"
2198
+ },
2199
+ "name": {
2200
+ "description": "Function name.",
2201
+ "name": "name",
2202
+ "hasDynamicHelp": false,
2203
+ "multiple": false,
2204
+ "type": "option"
2205
+ },
2206
+ "version": {
2207
+ "description": "Function version.",
2208
+ "name": "version",
2209
+ "hasDynamicHelp": false,
2210
+ "multiple": false,
2211
+ "type": "option"
2212
+ },
2213
+ "spaceKey": {
2214
+ "description": "Space key to create/update Script source in.",
2215
+ "name": "spaceKey",
2216
+ "hasDynamicHelp": false,
2217
+ "multiple": false,
2218
+ "type": "option"
2219
+ },
2220
+ "objectId": {
2221
+ "description": "Existing Script Object ID to update.",
2222
+ "name": "objectId",
2223
+ "hasDynamicHelp": false,
2224
+ "multiple": false,
2225
+ "type": "option"
2226
+ },
2227
+ "functionId": {
2228
+ "description": "Existing UserFunction ID to update.",
2229
+ "name": "functionId",
2230
+ "hasDynamicHelp": false,
2231
+ "multiple": false,
2232
+ "type": "option"
2233
+ }
2234
+ },
2235
+ "hasDynamicHelp": false,
2236
+ "hiddenAliases": [],
2237
+ "id": "function:upload",
2238
+ "pluginAlias": "@dxos/cli",
2239
+ "pluginName": "@dxos/cli",
2240
+ "pluginType": "core",
2241
+ "strict": true,
2242
+ "enableJsonFlag": true,
2243
+ "isESM": true,
2244
+ "relativePath": [
2245
+ "dist",
2246
+ "src",
2247
+ "commands",
2248
+ "function",
2249
+ "upload.js"
2250
+ ]
2251
+ },
2106
2252
  "halo:create": {
2107
2253
  "aliases": [],
2108
2254
  "args": {
@@ -4569,7 +4715,7 @@
4569
4715
  "name": {
4570
4716
  "description": "Tunnel name",
4571
4717
  "name": "name",
4572
- "default": "hydrogen-alanine-helium-harry",
4718
+ "default": "zulu-edward-gee-fourteen",
4573
4719
  "hasDynamicHelp": false,
4574
4720
  "multiple": false,
4575
4721
  "type": "option"
@@ -4706,145 +4852,6 @@
4706
4852
  "list.js"
4707
4853
  ]
4708
4854
  },
4709
- "userfunction:upload": {
4710
- "aliases": [],
4711
- "args": {
4712
- "file": {
4713
- "name": "file",
4714
- "required": true
4715
- }
4716
- },
4717
- "description": "Upload user function.",
4718
- "flags": {
4719
- "json": {
4720
- "description": "Output as JSON.",
4721
- "name": "json",
4722
- "allowNo": false,
4723
- "type": "boolean"
4724
- },
4725
- "verbose": {
4726
- "char": "v",
4727
- "description": "Verbose output",
4728
- "name": "verbose",
4729
- "allowNo": false,
4730
- "type": "boolean"
4731
- },
4732
- "dry-run": {
4733
- "description": "Dry run.",
4734
- "name": "dry-run",
4735
- "allowNo": false,
4736
- "type": "boolean"
4737
- },
4738
- "profile": {
4739
- "description": "User profile.",
4740
- "env": "DX_PROFILE",
4741
- "name": "profile",
4742
- "default": "default",
4743
- "hasDynamicHelp": false,
4744
- "multiple": false,
4745
- "type": "option"
4746
- },
4747
- "config": {
4748
- "aliases": [
4749
- "c"
4750
- ],
4751
- "dependsOn": [
4752
- "profile"
4753
- ],
4754
- "description": "Config file.",
4755
- "env": "DX_CONFIG",
4756
- "name": "config",
4757
- "default": "/home/runner/.config/dx/profile/default.yml",
4758
- "hasDynamicHelp": false,
4759
- "helpValue": "path",
4760
- "multiple": false,
4761
- "type": "option"
4762
- },
4763
- "timeout": {
4764
- "aliases": [
4765
- "t"
4766
- ],
4767
- "description": "Timeout (ms).",
4768
- "name": "timeout",
4769
- "default": 60000,
4770
- "hasDynamicHelp": false,
4771
- "multiple": false,
4772
- "type": "option"
4773
- },
4774
- "target": {
4775
- "description": "Target websocket server.",
4776
- "name": "target",
4777
- "hasDynamicHelp": false,
4778
- "multiple": false,
4779
- "type": "option"
4780
- },
4781
- "agent": {
4782
- "description": "Run command with agent.",
4783
- "env": "DX_NO_AGENT",
4784
- "name": "agent",
4785
- "allowNo": true,
4786
- "type": "boolean"
4787
- },
4788
- "json-log": {
4789
- "description": "When running in foreground, log JSON format",
4790
- "name": "json-log",
4791
- "allowNo": false,
4792
- "type": "boolean"
4793
- },
4794
- "json-logfile": {
4795
- "description": "JSON log file destination, or 'stdout' or 'stderr'",
4796
- "name": "json-logfile",
4797
- "default": "stderr",
4798
- "hasDynamicHelp": false,
4799
- "multiple": false,
4800
- "type": "option"
4801
- },
4802
- "name": {
4803
- "description": "Function name.",
4804
- "name": "name",
4805
- "hasDynamicHelp": false,
4806
- "multiple": false,
4807
- "type": "option"
4808
- },
4809
- "spaceKey": {
4810
- "description": "Space key to create/update Script source in.",
4811
- "name": "spaceKey",
4812
- "hasDynamicHelp": false,
4813
- "multiple": false,
4814
- "type": "option"
4815
- },
4816
- "objectId": {
4817
- "description": "Existing Script Object ID to update.",
4818
- "name": "objectId",
4819
- "hasDynamicHelp": false,
4820
- "multiple": false,
4821
- "type": "option"
4822
- },
4823
- "functionId": {
4824
- "description": "Existing UserFunction ID to update.",
4825
- "name": "functionId",
4826
- "hasDynamicHelp": false,
4827
- "multiple": false,
4828
- "type": "option"
4829
- }
4830
- },
4831
- "hasDynamicHelp": false,
4832
- "hiddenAliases": [],
4833
- "id": "userfunction:upload",
4834
- "pluginAlias": "@dxos/cli",
4835
- "pluginName": "@dxos/cli",
4836
- "pluginType": "core",
4837
- "strict": true,
4838
- "enableJsonFlag": true,
4839
- "isESM": true,
4840
- "relativePath": [
4841
- "dist",
4842
- "src",
4843
- "commands",
4844
- "userfunction",
4845
- "upload.js"
4846
- ]
4847
- },
4848
4855
  "function:trigger:list": {
4849
4856
  "aliases": [],
4850
4857
  "args": {},
@@ -5563,5 +5570,5 @@
5563
5570
  ]
5564
5571
  }
5565
5572
  },
5566
- "version": "0.7.2"
5573
+ "version": "0.7.3-staging.0905f03"
5567
5574
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@dxos/cli",
3
- "version": "0.7.2",
3
+ "version": "0.7.3-staging.0905f03",
4
4
  "description": "DXOS CLI",
5
5
  "keywords": [
6
6
  "dxos",
@@ -53,30 +53,30 @@
53
53
  "react": "~18.2.0",
54
54
  "ws": "^8.14.2",
55
55
  "wtfnode": "^0.9.1",
56
- "@dxos/agent": "0.7.2",
57
- "@dxos/async": "0.7.2",
58
- "@dxos/cli-base": "0.7.2",
59
- "@dxos/cli-composer": "0.7.2",
60
- "@dxos/client": "0.7.2",
61
- "@dxos/client-protocol": "0.7.2",
62
- "@dxos/config": "0.7.2",
63
- "@dxos/client-services": "0.7.2",
64
- "@dxos/context": "0.7.2",
65
- "@dxos/debug": "0.7.2",
66
- "@dxos/echo-schema": "0.7.2",
67
- "@dxos/functions": "0.7.2",
68
- "@dxos/invariant": "0.7.2",
69
- "@dxos/log": "0.7.2",
70
- "@dxos/network-manager": "0.7.2",
71
- "@dxos/node-std": "0.7.2",
72
- "@dxos/observability": "0.7.2",
73
- "@dxos/plugin-markdown": "0.7.2",
74
- "@dxos/plugin-script": "0.7.2",
75
- "@dxos/process": "0.7.2",
76
- "@dxos/protocols": "0.7.2",
77
- "@dxos/random": "0.7.2",
78
- "@dxos/rpc": "0.7.2",
79
- "@dxos/util": "0.7.2"
56
+ "@dxos/agent": "0.7.3-staging.0905f03",
57
+ "@dxos/cli-base": "0.7.3-staging.0905f03",
58
+ "@dxos/async": "0.7.3-staging.0905f03",
59
+ "@dxos/cli-composer": "0.7.3-staging.0905f03",
60
+ "@dxos/client-protocol": "0.7.3-staging.0905f03",
61
+ "@dxos/client": "0.7.3-staging.0905f03",
62
+ "@dxos/context": "0.7.3-staging.0905f03",
63
+ "@dxos/client-services": "0.7.3-staging.0905f03",
64
+ "@dxos/debug": "0.7.3-staging.0905f03",
65
+ "@dxos/config": "0.7.3-staging.0905f03",
66
+ "@dxos/echo-schema": "0.7.3-staging.0905f03",
67
+ "@dxos/functions": "0.7.3-staging.0905f03",
68
+ "@dxos/invariant": "0.7.3-staging.0905f03",
69
+ "@dxos/log": "0.7.3-staging.0905f03",
70
+ "@dxos/network-manager": "0.7.3-staging.0905f03",
71
+ "@dxos/plugin-markdown": "0.7.3-staging.0905f03",
72
+ "@dxos/node-std": "0.7.3-staging.0905f03",
73
+ "@dxos/observability": "0.7.3-staging.0905f03",
74
+ "@dxos/plugin-script": "0.7.3-staging.0905f03",
75
+ "@dxos/process": "0.7.3-staging.0905f03",
76
+ "@dxos/protocols": "0.7.3-staging.0905f03",
77
+ "@dxos/random": "0.7.3-staging.0905f03",
78
+ "@dxos/rpc": "0.7.3-staging.0905f03",
79
+ "@dxos/util": "0.7.3-staging.0905f03"
80
80
  },
81
81
  "devDependencies": {
82
82
  "@oclif/test": "^4.1.0",
package/dist/src/commands/userfunction/upload.d.ts.map DELETED
@@ -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
@@ -1 +0,0 @@
1
- {"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../../src/commands/userfunction/upload.ts"],"names":[],"mappings":"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"}