@dxos/cli 0.7.5-main.9d26e3a → 0.7.5-main.9d2a38b

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.
@@ -1 +1 @@
1
- {"version":3,"file":"upload.d.ts","sourceRoot":"","sources":["../../../../src/commands/function/upload.ts"],"names":[],"mappings":"AAyBA,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;YAkHX,eAAe;CAU9B"}
1
+ {"version":3,"file":"upload.d.ts","sourceRoot":"","sources":["../../../../src/commands/function/upload.ts"],"names":[],"mappings":"AAwBA,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;YA+GX,eAAe;CAU9B"}
@@ -2,125 +2,109 @@
2
2
  // Copyright 2024 DXOS.org
3
3
  //
4
4
  import { Args, Flags } from '@oclif/core';
5
- import { Filter } from '@dxos/client/echo';
6
- import { incrementSemverPatch, FunctionType } from '@dxos/functions';
7
- import { log } from '@dxos/log';
8
- // import {
9
- // getUserFunctionUrlInMetadata,
10
- // setUserFunctionUrlInMetadata,
11
- // uploadWorkerFunction,
12
- // ScriptType,
13
- // } from '@dxos/functions';
14
- // import { type ReactiveEchoObject, loadObjectReferences, makeRef } from '@dxos/client/echo';
15
- // import { asyncTimeout } from '@dxos/async';
16
- // import { type Client } from '@dxos/client';
17
- // import { create, getMeta } from '@dxos/client/echo';
18
- // import { invariant } from '@dxos/invariant';
19
- // import { TextType } from '@dxos/plugin-markdown/types';
20
- // import { type UploadFunctionResponseBody } from '@dxos/protocols';
5
+ import fs from 'node:fs';
6
+ import { asyncTimeout } from '@dxos/async';
7
+ import { Filter, loadObjectReferences, makeRef } from '@dxos/client/echo';
8
+ import { create, getMeta } from '@dxos/client/echo';
9
+ import { getUserFunctionUrlInMetadata, incrementSemverPatch, setUserFunctionUrlInMetadata, uploadWorkerFunction, FunctionType, ScriptType, } from '@dxos/functions';
10
+ import { invariant } from '@dxos/invariant';
11
+ import { TextType } from '@dxos/schema';
21
12
  import { BaseCommand } from '../../base';
22
13
  // TODO: move to cli-composer
23
14
  class Upload extends BaseCommand {
24
15
  async run() {
25
- log.warn('Broken');
26
- // TODO(mykola): Is broken, to reproduce run on `pnpm -w nx prepack cli` step.
27
- // let scriptContent: string | undefined;
28
- // try {
29
- // scriptContent = fs.readFileSync(this.args.file, 'utf8');
30
- // } catch (err: any) {
31
- // this.error(`Error reading file ${this.args.file}: ${err.message}`);
32
- // }
33
- // const handleUpload = async ({ client, space }: { client: Client; space?: Space }) => {
34
- // invariant(space, 'Has to provide a space');
35
- // client.addTypes([ScriptType, TextType]);
36
- // const identity = client.halo.identity.get();
37
- // invariant(identity, 'Identity not available');
38
- // let existingFunctionId: string | undefined;
39
- // let existingObject: ReactiveEchoObject<ScriptType> | undefined;
40
- // let functionUrlFromExistingObject: string | undefined;
41
- // if (this.flags.functionId) {
42
- // existingFunctionId = this.flags.functionId;
43
- // }
44
- // // Find existing object and functionId in metadata if it exists
45
- // if (this.flags.objectId) {
46
- // const qr = await space.db.query(Filter.schema(ScriptType)).run();
47
- // existingObject = qr.objects.find((o) => o.id === this.flags.objectId);
48
- // if (!existingObject) {
49
- // this.error(`Object not found: ${this.flags.spaceKey}/${this.flags.objectId}`);
50
- // }
51
- // functionUrlFromExistingObject = await getUserFunctionUrlInMetadata(getMeta(existingObject));
52
- // if (functionUrlFromExistingObject) {
53
- // existingFunctionId = functionUrlFromExistingObject.split('/').at(-1);
54
- // if (existingFunctionId !== this.flags.functionId) {
55
- // this.warn(
56
- // `provided functionId ${this.flags.functionId} does not match existing functionId ${existingFunctionId}, using existing functionId`,
57
- // );
58
- // }
59
- // }
60
- // if (this.flags.verbose) {
61
- // this.log(
62
- // `Uploading to existing FunctionId ${existingFunctionId} read from ${this.flags.spaceKey}/${this.flags.objectId}`,
63
- // );
64
- // }
65
- // }
66
- // let result: UploadFunctionResponseBody;
67
- // try {
68
- // result = await asyncTimeout(
69
- // uploadWorkerFunction({
70
- // client,
71
- // spaceId: space.id,
72
- // version: await this._getNextVersion(space, existingFunctionId),
73
- // functionId: existingFunctionId,
74
- // name: this.flags.name,
75
- // source: scriptContent,
76
- // }),
77
- // 5_000,
78
- // );
79
- // invariant(result.functionId, 'Upload failed.');
80
- // this.log(`Uploaded function: ${result.functionId}`);
81
- // } catch (err: any) {
82
- // this.error(err.message);
83
- // }
84
- // // If we haven't been provided an ECHO space/object, we're done.
85
- // if (!space) {
86
- // return;
87
- // }
88
- // if (existingObject) {
89
- // // Update existing object
90
- // await loadObjectReferences(existingObject, (obj) => obj.source);
91
- // if (!existingObject.source) {
92
- // this.error('Object source not found');
93
- // }
94
- // existingObject.source.target!.content = scriptContent;
95
- // if (this.flags.verbose) {
96
- // this.log(
97
- // `Updated source in ${this.flags.spaceKey}/${this.flags.objectId} (${existingObject.source.target!.id})`,
98
- // );
99
- // }
100
- // if (!functionUrlFromExistingObject) {
101
- // setUserFunctionUrlInMetadata(getMeta(existingObject), `/${space.id}/${result.functionId}`);
102
- // } else {
103
- // if (existingFunctionId !== result.functionId) {
104
- // this.error('functionId mismatch');
105
- // }
106
- // }
107
- // } else {
108
- // // Create new object
109
- // // TODO: make object navigable in Composer.
110
- // const sourceObj = space.db.add(create(TextType, { content: scriptContent }));
111
- // const obj = space.db.add(create(ScriptType, { name: this.flags.name, source: makeRef(sourceObj) }));
112
- // setUserFunctionUrlInMetadata(getMeta(obj), result.functionId);
113
- // if (this.flags.verbose) {
114
- // this.log(`Created object: ${this.flags.spaceKey}/${obj.id}`);
115
- // }
116
- // }
117
- // };
118
- // if (this.flags.spaceKey) {
119
- // return await this.execWithSpace(async ({ client, space }) => await handleUpload({ client, space }), {
120
- // spaceKeys: [this.flags.spaceKey],
121
- // });
122
- // }
123
- // return await this.execWithClient(async ({ client }) => await handleUpload({ client }));
16
+ let scriptContent;
17
+ try {
18
+ scriptContent = fs.readFileSync(this.args.file, 'utf8');
19
+ }
20
+ catch (err) {
21
+ this.error(`Error reading file ${this.args.file}: ${err.message}`);
22
+ }
23
+ const handleUpload = async ({ client, space }) => {
24
+ invariant(space, 'Has to provide a space');
25
+ client.addTypes([ScriptType, TextType]);
26
+ const identity = client.halo.identity.get();
27
+ invariant(identity, 'Identity not available');
28
+ let existingFunctionId;
29
+ let existingObject;
30
+ let functionUrlFromExistingObject;
31
+ if (this.flags.functionId) {
32
+ existingFunctionId = this.flags.functionId;
33
+ }
34
+ // Find existing object and functionId in metadata if it exists
35
+ if (this.flags.objectId) {
36
+ const qr = await space.db.query(Filter.schema(ScriptType)).run();
37
+ existingObject = qr.objects.find((o) => o.id === this.flags.objectId);
38
+ if (!existingObject) {
39
+ this.error(`Object not found: ${this.flags.spaceKey}/${this.flags.objectId}`);
40
+ }
41
+ functionUrlFromExistingObject = await getUserFunctionUrlInMetadata(getMeta(existingObject));
42
+ if (functionUrlFromExistingObject) {
43
+ existingFunctionId = functionUrlFromExistingObject.split('/').at(-1);
44
+ if (existingFunctionId !== this.flags.functionId) {
45
+ this.warn(`provided functionId ${this.flags.functionId} does not match existing functionId ${existingFunctionId}, using existing functionId`);
46
+ }
47
+ }
48
+ if (this.flags.verbose) {
49
+ this.log(`Uploading to existing FunctionId ${existingFunctionId} read from ${this.flags.spaceKey}/${this.flags.objectId}`);
50
+ }
51
+ }
52
+ let result;
53
+ try {
54
+ result = await asyncTimeout(uploadWorkerFunction({
55
+ client,
56
+ spaceId: space.id,
57
+ version: await this._getNextVersion(space, existingFunctionId),
58
+ functionId: existingFunctionId,
59
+ name: this.flags.name,
60
+ source: scriptContent,
61
+ }), 5000);
62
+ invariant(result.functionId, 'Upload failed.');
63
+ this.log(`Uploaded function: ${result.functionId}`);
64
+ }
65
+ catch (err) {
66
+ this.error(err.message);
67
+ }
68
+ // If we haven't been provided an ECHO space/object, we're done.
69
+ if (!space) {
70
+ return;
71
+ }
72
+ if (existingObject) {
73
+ // Update existing object
74
+ await loadObjectReferences(existingObject, (obj) => obj.source);
75
+ if (!existingObject.source) {
76
+ this.error('Object source not found');
77
+ }
78
+ existingObject.source.target.content = scriptContent;
79
+ if (this.flags.verbose) {
80
+ this.log(`Updated source in ${this.flags.spaceKey}/${this.flags.objectId} (${existingObject.source.target.id})`);
81
+ }
82
+ if (!functionUrlFromExistingObject) {
83
+ setUserFunctionUrlInMetadata(getMeta(existingObject), `/${space.id}/${result.functionId}`);
84
+ }
85
+ else {
86
+ if (existingFunctionId !== result.functionId) {
87
+ this.error('functionId mismatch');
88
+ }
89
+ }
90
+ }
91
+ else {
92
+ // Create new object
93
+ // TODO: make object navigable in Composer.
94
+ const sourceObj = space.db.add(create(TextType, { content: scriptContent }));
95
+ const obj = space.db.add(create(ScriptType, { name: this.flags.name, source: makeRef(sourceObj) }));
96
+ setUserFunctionUrlInMetadata(getMeta(obj), result.functionId);
97
+ if (this.flags.verbose) {
98
+ this.log(`Created object: ${this.flags.spaceKey}/${obj.id}`);
99
+ }
100
+ }
101
+ };
102
+ if (this.flags.spaceKey) {
103
+ return await this.execWithSpace(async ({ client, space }) => await handleUpload({ client, space }), {
104
+ spaceKeys: [this.flags.spaceKey],
105
+ });
106
+ }
107
+ return await this.execWithClient(async ({ client }) => await handleUpload({ client }));
124
108
  }
125
109
  async _getNextVersion(space, functionId) {
126
110
  var _a, _b;
@@ -1 +1 @@
1
- {"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../../src/commands/function/upload.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../../src/commands/function/upload.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":"5.7.2"}
1
+ {"version":"5.7.3"}
@@ -4715,7 +4715,7 @@
4715
4715
  "name": {
4716
4716
  "description": "Tunnel name",
4717
4717
  "name": "name",
4718
- "default": "uranus-stream-mockingbird-leopard",
4718
+ "default": "india-mirror-michigan-nitrogen",
4719
4719
  "hasDynamicHelp": false,
4720
4720
  "multiple": false,
4721
4721
  "type": "option"
@@ -5570,5 +5570,5 @@
5570
5570
  ]
5571
5571
  }
5572
5572
  },
5573
- "version": "0.7.5-main.9d26e3a"
5573
+ "version": "0.7.5-main.9d2a38b"
5574
5574
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@dxos/cli",
3
- "version": "0.7.5-main.9d26e3a",
3
+ "version": "0.7.5-main.9d2a38b",
4
4
  "description": "DXOS CLI",
5
5
  "keywords": [
6
6
  "dxos",
@@ -53,29 +53,30 @@
53
53
  "react": "~18.2.0",
54
54
  "ws": "^8.14.2",
55
55
  "wtfnode": "^0.9.1",
56
- "@dxos/async": "0.7.5-main.9d26e3a",
57
- "@dxos/agent": "0.7.5-main.9d26e3a",
58
- "@dxos/cli-base": "0.7.5-main.9d26e3a",
59
- "@dxos/cli-composer": "0.7.5-main.9d26e3a",
60
- "@dxos/client-protocol": "0.7.5-main.9d26e3a",
61
- "@dxos/client": "0.7.5-main.9d26e3a",
62
- "@dxos/client-services": "0.7.5-main.9d26e3a",
63
- "@dxos/compute": "0.7.5-main.9d26e3a",
64
- "@dxos/context": "0.7.5-main.9d26e3a",
65
- "@dxos/config": "0.7.5-main.9d26e3a",
66
- "@dxos/echo-schema": "0.7.5-main.9d26e3a",
67
- "@dxos/debug": "0.7.5-main.9d26e3a",
68
- "@dxos/functions": "0.7.5-main.9d26e3a",
69
- "@dxos/invariant": "0.7.5-main.9d26e3a",
70
- "@dxos/log": "0.7.5-main.9d26e3a",
71
- "@dxos/network-manager": "0.7.5-main.9d26e3a",
72
- "@dxos/observability": "0.7.5-main.9d26e3a",
73
- "@dxos/node-std": "0.7.5-main.9d26e3a",
74
- "@dxos/random": "0.7.5-main.9d26e3a",
75
- "@dxos/protocols": "0.7.5-main.9d26e3a",
76
- "@dxos/rpc": "0.7.5-main.9d26e3a",
77
- "@dxos/util": "0.7.5-main.9d26e3a",
78
- "@dxos/process": "0.7.5-main.9d26e3a"
56
+ "@dxos/agent": "0.7.5-main.9d2a38b",
57
+ "@dxos/cli-base": "0.7.5-main.9d2a38b",
58
+ "@dxos/cli-composer": "0.7.5-main.9d2a38b",
59
+ "@dxos/client": "0.7.5-main.9d2a38b",
60
+ "@dxos/client-protocol": "0.7.5-main.9d2a38b",
61
+ "@dxos/compute": "0.7.5-main.9d2a38b",
62
+ "@dxos/async": "0.7.5-main.9d2a38b",
63
+ "@dxos/client-services": "0.7.5-main.9d2a38b",
64
+ "@dxos/config": "0.7.5-main.9d2a38b",
65
+ "@dxos/context": "0.7.5-main.9d2a38b",
66
+ "@dxos/debug": "0.7.5-main.9d2a38b",
67
+ "@dxos/functions": "0.7.5-main.9d2a38b",
68
+ "@dxos/echo-schema": "0.7.5-main.9d2a38b",
69
+ "@dxos/invariant": "0.7.5-main.9d2a38b",
70
+ "@dxos/log": "0.7.5-main.9d2a38b",
71
+ "@dxos/network-manager": "0.7.5-main.9d2a38b",
72
+ "@dxos/node-std": "0.7.5-main.9d2a38b",
73
+ "@dxos/observability": "0.7.5-main.9d2a38b",
74
+ "@dxos/process": "0.7.5-main.9d2a38b",
75
+ "@dxos/protocols": "0.7.5-main.9d2a38b",
76
+ "@dxos/random": "0.7.5-main.9d2a38b",
77
+ "@dxos/rpc": "0.7.5-main.9d2a38b",
78
+ "@dxos/schema": "0.7.5-main.9d2a38b",
79
+ "@dxos/util": "0.7.5-main.9d2a38b"
79
80
  },
80
81
  "devDependencies": {
81
82
  "@oclif/test": "^4.1.0",