@dxos/cli 0.7.5-main.9d26e3a → 0.7.5-main.e9bb01b
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":"
|
|
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
|
|
6
|
-
import {
|
|
7
|
-
import {
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
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
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
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":"AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;AAEF,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;
|
|
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.
|
|
1
|
+
{"version":"5.7.3"}
|
package/oclif.manifest.json
CHANGED
|
@@ -839,112 +839,6 @@
|
|
|
839
839
|
"stop.js"
|
|
840
840
|
]
|
|
841
841
|
},
|
|
842
|
-
"config": {
|
|
843
|
-
"aliases": [],
|
|
844
|
-
"args": {},
|
|
845
|
-
"description": "Show config file.",
|
|
846
|
-
"flags": {
|
|
847
|
-
"json": {
|
|
848
|
-
"description": "Output as JSON.",
|
|
849
|
-
"name": "json",
|
|
850
|
-
"allowNo": false,
|
|
851
|
-
"type": "boolean"
|
|
852
|
-
},
|
|
853
|
-
"verbose": {
|
|
854
|
-
"char": "v",
|
|
855
|
-
"description": "Verbose output",
|
|
856
|
-
"name": "verbose",
|
|
857
|
-
"allowNo": false,
|
|
858
|
-
"type": "boolean"
|
|
859
|
-
},
|
|
860
|
-
"dry-run": {
|
|
861
|
-
"description": "Dry run.",
|
|
862
|
-
"name": "dry-run",
|
|
863
|
-
"allowNo": false,
|
|
864
|
-
"type": "boolean"
|
|
865
|
-
},
|
|
866
|
-
"profile": {
|
|
867
|
-
"description": "User profile.",
|
|
868
|
-
"env": "DX_PROFILE",
|
|
869
|
-
"name": "profile",
|
|
870
|
-
"default": "default",
|
|
871
|
-
"hasDynamicHelp": false,
|
|
872
|
-
"multiple": false,
|
|
873
|
-
"type": "option"
|
|
874
|
-
},
|
|
875
|
-
"config": {
|
|
876
|
-
"aliases": [
|
|
877
|
-
"c"
|
|
878
|
-
],
|
|
879
|
-
"dependsOn": [
|
|
880
|
-
"profile"
|
|
881
|
-
],
|
|
882
|
-
"description": "Config file.",
|
|
883
|
-
"env": "DX_CONFIG",
|
|
884
|
-
"name": "config",
|
|
885
|
-
"default": "/home/runner/.config/dx/profile/default.yml",
|
|
886
|
-
"hasDynamicHelp": false,
|
|
887
|
-
"helpValue": "path",
|
|
888
|
-
"multiple": false,
|
|
889
|
-
"type": "option"
|
|
890
|
-
},
|
|
891
|
-
"timeout": {
|
|
892
|
-
"aliases": [
|
|
893
|
-
"t"
|
|
894
|
-
],
|
|
895
|
-
"description": "Timeout (ms).",
|
|
896
|
-
"name": "timeout",
|
|
897
|
-
"default": 60000,
|
|
898
|
-
"hasDynamicHelp": false,
|
|
899
|
-
"multiple": false,
|
|
900
|
-
"type": "option"
|
|
901
|
-
},
|
|
902
|
-
"target": {
|
|
903
|
-
"description": "Target websocket server.",
|
|
904
|
-
"name": "target",
|
|
905
|
-
"hasDynamicHelp": false,
|
|
906
|
-
"multiple": false,
|
|
907
|
-
"type": "option"
|
|
908
|
-
},
|
|
909
|
-
"agent": {
|
|
910
|
-
"description": "Run command with agent.",
|
|
911
|
-
"env": "DX_NO_AGENT",
|
|
912
|
-
"name": "agent",
|
|
913
|
-
"allowNo": true,
|
|
914
|
-
"type": "boolean"
|
|
915
|
-
},
|
|
916
|
-
"json-log": {
|
|
917
|
-
"description": "When running in foreground, log JSON format",
|
|
918
|
-
"name": "json-log",
|
|
919
|
-
"allowNo": false,
|
|
920
|
-
"type": "boolean"
|
|
921
|
-
},
|
|
922
|
-
"json-logfile": {
|
|
923
|
-
"description": "JSON log file destination, or 'stdout' or 'stderr'",
|
|
924
|
-
"name": "json-logfile",
|
|
925
|
-
"default": "stderr",
|
|
926
|
-
"hasDynamicHelp": false,
|
|
927
|
-
"multiple": false,
|
|
928
|
-
"type": "option"
|
|
929
|
-
}
|
|
930
|
-
},
|
|
931
|
-
"hasDynamicHelp": false,
|
|
932
|
-
"hiddenAliases": [],
|
|
933
|
-
"id": "config",
|
|
934
|
-
"pluginAlias": "@dxos/cli",
|
|
935
|
-
"pluginName": "@dxos/cli",
|
|
936
|
-
"pluginType": "core",
|
|
937
|
-
"strict": true,
|
|
938
|
-
"enableJsonFlag": true,
|
|
939
|
-
"isESM": true,
|
|
940
|
-
"relativePath": [
|
|
941
|
-
"dist",
|
|
942
|
-
"src",
|
|
943
|
-
"commands",
|
|
944
|
-
"config",
|
|
945
|
-
"index.js"
|
|
946
|
-
]
|
|
947
|
-
},
|
|
948
842
|
"debug:diagnostics": {
|
|
949
843
|
"aliases": [],
|
|
950
844
|
"args": {},
|
|
@@ -1553,6 +1447,112 @@
|
|
|
1553
1447
|
"status.js"
|
|
1554
1448
|
]
|
|
1555
1449
|
},
|
|
1450
|
+
"config": {
|
|
1451
|
+
"aliases": [],
|
|
1452
|
+
"args": {},
|
|
1453
|
+
"description": "Show config file.",
|
|
1454
|
+
"flags": {
|
|
1455
|
+
"json": {
|
|
1456
|
+
"description": "Output as JSON.",
|
|
1457
|
+
"name": "json",
|
|
1458
|
+
"allowNo": false,
|
|
1459
|
+
"type": "boolean"
|
|
1460
|
+
},
|
|
1461
|
+
"verbose": {
|
|
1462
|
+
"char": "v",
|
|
1463
|
+
"description": "Verbose output",
|
|
1464
|
+
"name": "verbose",
|
|
1465
|
+
"allowNo": false,
|
|
1466
|
+
"type": "boolean"
|
|
1467
|
+
},
|
|
1468
|
+
"dry-run": {
|
|
1469
|
+
"description": "Dry run.",
|
|
1470
|
+
"name": "dry-run",
|
|
1471
|
+
"allowNo": false,
|
|
1472
|
+
"type": "boolean"
|
|
1473
|
+
},
|
|
1474
|
+
"profile": {
|
|
1475
|
+
"description": "User profile.",
|
|
1476
|
+
"env": "DX_PROFILE",
|
|
1477
|
+
"name": "profile",
|
|
1478
|
+
"default": "default",
|
|
1479
|
+
"hasDynamicHelp": false,
|
|
1480
|
+
"multiple": false,
|
|
1481
|
+
"type": "option"
|
|
1482
|
+
},
|
|
1483
|
+
"config": {
|
|
1484
|
+
"aliases": [
|
|
1485
|
+
"c"
|
|
1486
|
+
],
|
|
1487
|
+
"dependsOn": [
|
|
1488
|
+
"profile"
|
|
1489
|
+
],
|
|
1490
|
+
"description": "Config file.",
|
|
1491
|
+
"env": "DX_CONFIG",
|
|
1492
|
+
"name": "config",
|
|
1493
|
+
"default": "/home/runner/.config/dx/profile/default.yml",
|
|
1494
|
+
"hasDynamicHelp": false,
|
|
1495
|
+
"helpValue": "path",
|
|
1496
|
+
"multiple": false,
|
|
1497
|
+
"type": "option"
|
|
1498
|
+
},
|
|
1499
|
+
"timeout": {
|
|
1500
|
+
"aliases": [
|
|
1501
|
+
"t"
|
|
1502
|
+
],
|
|
1503
|
+
"description": "Timeout (ms).",
|
|
1504
|
+
"name": "timeout",
|
|
1505
|
+
"default": 60000,
|
|
1506
|
+
"hasDynamicHelp": false,
|
|
1507
|
+
"multiple": false,
|
|
1508
|
+
"type": "option"
|
|
1509
|
+
},
|
|
1510
|
+
"target": {
|
|
1511
|
+
"description": "Target websocket server.",
|
|
1512
|
+
"name": "target",
|
|
1513
|
+
"hasDynamicHelp": false,
|
|
1514
|
+
"multiple": false,
|
|
1515
|
+
"type": "option"
|
|
1516
|
+
},
|
|
1517
|
+
"agent": {
|
|
1518
|
+
"description": "Run command with agent.",
|
|
1519
|
+
"env": "DX_NO_AGENT",
|
|
1520
|
+
"name": "agent",
|
|
1521
|
+
"allowNo": true,
|
|
1522
|
+
"type": "boolean"
|
|
1523
|
+
},
|
|
1524
|
+
"json-log": {
|
|
1525
|
+
"description": "When running in foreground, log JSON format",
|
|
1526
|
+
"name": "json-log",
|
|
1527
|
+
"allowNo": false,
|
|
1528
|
+
"type": "boolean"
|
|
1529
|
+
},
|
|
1530
|
+
"json-logfile": {
|
|
1531
|
+
"description": "JSON log file destination, or 'stdout' or 'stderr'",
|
|
1532
|
+
"name": "json-logfile",
|
|
1533
|
+
"default": "stderr",
|
|
1534
|
+
"hasDynamicHelp": false,
|
|
1535
|
+
"multiple": false,
|
|
1536
|
+
"type": "option"
|
|
1537
|
+
}
|
|
1538
|
+
},
|
|
1539
|
+
"hasDynamicHelp": false,
|
|
1540
|
+
"hiddenAliases": [],
|
|
1541
|
+
"id": "config",
|
|
1542
|
+
"pluginAlias": "@dxos/cli",
|
|
1543
|
+
"pluginName": "@dxos/cli",
|
|
1544
|
+
"pluginType": "core",
|
|
1545
|
+
"strict": true,
|
|
1546
|
+
"enableJsonFlag": true,
|
|
1547
|
+
"isESM": true,
|
|
1548
|
+
"relativePath": [
|
|
1549
|
+
"dist",
|
|
1550
|
+
"src",
|
|
1551
|
+
"commands",
|
|
1552
|
+
"config",
|
|
1553
|
+
"index.js"
|
|
1554
|
+
]
|
|
1555
|
+
},
|
|
1556
1556
|
"device:info": {
|
|
1557
1557
|
"aliases": [],
|
|
1558
1558
|
"args": {},
|
|
@@ -4715,7 +4715,7 @@
|
|
|
4715
4715
|
"name": {
|
|
4716
4716
|
"description": "Tunnel name",
|
|
4717
4717
|
"name": "name",
|
|
4718
|
-
"default": "uranus-
|
|
4718
|
+
"default": "uniform-uranus-moon-low",
|
|
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.
|
|
5573
|
+
"version": "0.7.5-main.e9bb01b"
|
|
5574
5574
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dxos/cli",
|
|
3
|
-
"version": "0.7.5-main.
|
|
3
|
+
"version": "0.7.5-main.e9bb01b",
|
|
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.
|
|
57
|
-
"@dxos/agent": "0.7.5-main.
|
|
58
|
-
"@dxos/cli-
|
|
59
|
-
"@dxos/
|
|
60
|
-
"@dxos/
|
|
61
|
-
"@dxos/client": "0.7.5-main.
|
|
62
|
-
"@dxos/client-services": "0.7.5-main.
|
|
63
|
-
"@dxos/compute": "0.7.5-main.
|
|
64
|
-
"@dxos/
|
|
65
|
-
"@dxos/
|
|
66
|
-
"@dxos/echo-schema": "0.7.5-main.
|
|
67
|
-
"@dxos/debug": "0.7.5-main.
|
|
68
|
-
"@dxos/functions": "0.7.5-main.
|
|
69
|
-
"@dxos/invariant": "0.7.5-main.
|
|
70
|
-
"@dxos/log": "0.7.5-main.
|
|
71
|
-
"@dxos/
|
|
72
|
-
"@dxos/
|
|
73
|
-
"@dxos/
|
|
74
|
-
"@dxos/
|
|
75
|
-
"@dxos/
|
|
76
|
-
"@dxos/
|
|
77
|
-
"@dxos/
|
|
78
|
-
"@dxos/
|
|
56
|
+
"@dxos/async": "0.7.5-main.e9bb01b",
|
|
57
|
+
"@dxos/agent": "0.7.5-main.e9bb01b",
|
|
58
|
+
"@dxos/cli-composer": "0.7.5-main.e9bb01b",
|
|
59
|
+
"@dxos/client": "0.7.5-main.e9bb01b",
|
|
60
|
+
"@dxos/cli-base": "0.7.5-main.e9bb01b",
|
|
61
|
+
"@dxos/client-protocol": "0.7.5-main.e9bb01b",
|
|
62
|
+
"@dxos/client-services": "0.7.5-main.e9bb01b",
|
|
63
|
+
"@dxos/compute": "0.7.5-main.e9bb01b",
|
|
64
|
+
"@dxos/config": "0.7.5-main.e9bb01b",
|
|
65
|
+
"@dxos/context": "0.7.5-main.e9bb01b",
|
|
66
|
+
"@dxos/echo-schema": "0.7.5-main.e9bb01b",
|
|
67
|
+
"@dxos/debug": "0.7.5-main.e9bb01b",
|
|
68
|
+
"@dxos/functions": "0.7.5-main.e9bb01b",
|
|
69
|
+
"@dxos/invariant": "0.7.5-main.e9bb01b",
|
|
70
|
+
"@dxos/log": "0.7.5-main.e9bb01b",
|
|
71
|
+
"@dxos/node-std": "0.7.5-main.e9bb01b",
|
|
72
|
+
"@dxos/network-manager": "0.7.5-main.e9bb01b",
|
|
73
|
+
"@dxos/observability": "0.7.5-main.e9bb01b",
|
|
74
|
+
"@dxos/process": "0.7.5-main.e9bb01b",
|
|
75
|
+
"@dxos/random": "0.7.5-main.e9bb01b",
|
|
76
|
+
"@dxos/protocols": "0.7.5-main.e9bb01b",
|
|
77
|
+
"@dxos/schema": "0.7.5-main.e9bb01b",
|
|
78
|
+
"@dxos/rpc": "0.7.5-main.e9bb01b",
|
|
79
|
+
"@dxos/util": "0.7.5-main.e9bb01b"
|
|
79
80
|
},
|
|
80
81
|
"devDependencies": {
|
|
81
82
|
"@oclif/test": "^4.1.0",
|