@dxos/cli 0.8.4-main.c1de068 → 0.8.4-main.f5c0578
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/dist/src/commands/agent/agent.node.test.js +6 -6
- package/dist/src/commands/agent/agent.node.test.js.map +1 -1
- package/dist/src/commands/agent/invitations.js +12 -13
- package/dist/src/commands/agent/invitations.js.map +1 -1
- package/dist/src/commands/agent/list.js +16 -17
- package/dist/src/commands/agent/list.js.map +1 -1
- package/dist/src/commands/agent/restart.js +11 -12
- package/dist/src/commands/agent/restart.js.map +1 -1
- package/dist/src/commands/agent/start.d.ts.map +1 -1
- package/dist/src/commands/agent/start.js +48 -53
- package/dist/src/commands/agent/start.js.map +1 -1
- package/dist/src/commands/agent/status.js +6 -7
- package/dist/src/commands/agent/status.js.map +1 -1
- package/dist/src/commands/agent/stop.js +12 -13
- package/dist/src/commands/agent/stop.js.map +1 -1
- package/dist/src/commands/config/index.js +5 -7
- package/dist/src/commands/config/index.js.map +1 -1
- package/dist/src/commands/config/index.node.test.js +1 -1
- package/dist/src/commands/config/index.node.test.js.map +1 -1
- package/dist/src/commands/debug/diagnostics.js +22 -23
- package/dist/src/commands/debug/diagnostics.js.map +1 -1
- package/dist/src/commands/debug/error.js +2 -3
- package/dist/src/commands/debug/error.js.map +1 -1
- package/dist/src/commands/debug/generate.js +29 -31
- package/dist/src/commands/debug/generate.js.map +1 -1
- package/dist/src/commands/debug/metrics.js +11 -13
- package/dist/src/commands/debug/metrics.js.map +1 -1
- package/dist/src/commands/debug/status.js +10 -11
- package/dist/src/commands/debug/status.js.map +1 -1
- package/dist/src/commands/device/info.js +5 -7
- package/dist/src/commands/device/info.js.map +1 -1
- package/dist/src/commands/device/list.js +8 -9
- package/dist/src/commands/device/list.js.map +1 -1
- package/dist/src/commands/device/update.js +8 -10
- package/dist/src/commands/device/update.js.map +1 -1
- package/dist/src/commands/edge/status.d.ts +19 -0
- package/dist/src/commands/edge/status.d.ts.map +1 -0
- package/dist/src/commands/edge/status.js +24 -0
- package/dist/src/commands/edge/status.js.map +1 -0
- package/dist/src/commands/function/list.js +3 -4
- package/dist/src/commands/function/list.js.map +1 -1
- package/dist/src/commands/function/logs.js +9 -11
- package/dist/src/commands/function/logs.js.map +1 -1
- package/dist/src/commands/function/trigger/list.d.ts.map +1 -1
- package/dist/src/commands/function/trigger/list.js +10 -11
- package/dist/src/commands/function/trigger/list.js.map +1 -1
- package/dist/src/commands/function/upload.d.ts.map +1 -1
- package/dist/src/commands/function/upload.js +22 -27
- package/dist/src/commands/function/upload.js.map +1 -1
- package/dist/src/commands/function/watch.d.ts.map +1 -1
- package/dist/src/commands/function/watch.js +16 -19
- package/dist/src/commands/function/watch.js.map +1 -1
- package/dist/src/commands/halo/create.js +12 -13
- package/dist/src/commands/halo/create.js.map +1 -1
- package/dist/src/commands/halo/credential/add.js +5 -6
- package/dist/src/commands/halo/credential/add.js.map +1 -1
- package/dist/src/commands/halo/credential/list.js +23 -24
- package/dist/src/commands/halo/credential/list.js.map +1 -1
- package/dist/src/commands/halo/identity.js +5 -6
- package/dist/src/commands/halo/identity.js.map +1 -1
- package/dist/src/commands/halo/join.js +22 -24
- package/dist/src/commands/halo/join.js.map +1 -1
- package/dist/src/commands/halo/keys.js +3 -4
- package/dist/src/commands/halo/keys.js.map +1 -1
- package/dist/src/commands/halo/recovery/generate.js +3 -4
- package/dist/src/commands/halo/recovery/generate.js.map +1 -1
- package/dist/src/commands/halo/recovery/use.js +7 -8
- package/dist/src/commands/halo/recovery/use.js.map +1 -1
- package/dist/src/commands/halo/share.d.ts.map +1 -1
- package/dist/src/commands/halo/share.js +27 -28
- package/dist/src/commands/halo/share.js.map +1 -1
- package/dist/src/commands/halo/update.js +9 -11
- package/dist/src/commands/halo/update.js.map +1 -1
- package/dist/src/commands/info.js +6 -7
- package/dist/src/commands/info.js.map +1 -1
- package/dist/src/commands/profile/import.d.ts.map +1 -1
- package/dist/src/commands/profile/import.js +15 -16
- package/dist/src/commands/profile/import.js.map +1 -1
- package/dist/src/commands/profile/inspect.d.ts.map +1 -1
- package/dist/src/commands/profile/inspect.js +14 -15
- package/dist/src/commands/profile/inspect.js.map +1 -1
- package/dist/src/commands/reset/index.d.ts.map +1 -1
- package/dist/src/commands/reset/index.js +15 -17
- package/dist/src/commands/reset/index.js.map +1 -1
- package/dist/src/commands/shell/index.js +2 -3
- package/dist/src/commands/shell/index.js.map +1 -1
- package/dist/src/commands/space/close.js +3 -4
- package/dist/src/commands/space/close.js.map +1 -1
- package/dist/src/commands/space/create.js +5 -6
- package/dist/src/commands/space/create.js.map +1 -1
- package/dist/src/commands/space/epoch.js +4 -5
- package/dist/src/commands/space/epoch.js.map +1 -1
- package/dist/src/commands/space/info.js +4 -5
- package/dist/src/commands/space/info.js.map +1 -1
- package/dist/src/commands/space/join.js +14 -16
- package/dist/src/commands/space/join.js.map +1 -1
- package/dist/src/commands/space/list.js +20 -21
- package/dist/src/commands/space/list.js.map +1 -1
- package/dist/src/commands/space/members.js +9 -10
- package/dist/src/commands/space/members.js.map +1 -1
- package/dist/src/commands/space/open.js +3 -4
- package/dist/src/commands/space/open.js.map +1 -1
- package/dist/src/commands/space/query.js +12 -14
- package/dist/src/commands/space/query.js.map +1 -1
- package/dist/src/commands/space/schema/list.js +12 -15
- package/dist/src/commands/space/schema/list.js.map +1 -1
- package/dist/src/commands/space/share.d.ts.map +1 -1
- package/dist/src/commands/space/share.js +31 -32
- package/dist/src/commands/space/share.js.map +1 -1
- package/dist/src/commands/tunnel/index.js +19 -22
- package/dist/src/commands/tunnel/index.js.map +1 -1
- package/dist/src/commands/tunnel/list.js +10 -13
- package/dist/src/commands/tunnel/list.js.map +1 -1
- package/dist/src/components/SpaceTable.d.ts.map +1 -1
- package/dist/src/components/SpaceTable.js.map +1 -1
- package/dist/src/components/SystemTable.d.ts.map +1 -1
- package/dist/src/components/SystemTable.js +2 -2
- package/dist/src/components/SystemTable.js.map +1 -1
- package/dist/src/help.js +1 -1
- package/dist/src/help.js.map +1 -1
- package/dist/src/util/function/lookup.d.ts +2 -2
- package/dist/src/util/function/lookup.d.ts.map +1 -1
- package/dist/src/util/function/lookup.js.map +1 -1
- package/dist/src/util/provider/digital-ocean.js +3 -3
- package/dist/src/util/provider/digital-ocean.js.map +1 -1
- package/dist/src/util/provider/provider.d.ts.map +1 -1
- package/dist/src/util/provider/provider.js.map +1 -1
- package/dist/src/util/publish/build.d.ts +1 -1
- package/dist/src/util/publish/build.d.ts.map +1 -1
- package/dist/src/util/publish/build.js +2 -3
- package/dist/src/util/publish/build.js.map +1 -1
- package/dist/src/util/publish/common.d.ts.map +1 -1
- package/dist/src/util/publish/common.js.map +1 -1
- package/dist/src/util/publish/config.d.ts.map +1 -1
- package/dist/src/util/publish/config.js +2 -3
- package/dist/src/util/publish/config.js.map +1 -1
- package/dist/src/util/publish/ipfs-upload.d.ts.map +1 -1
- 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 +4 -5
- package/dist/src/util/publish/publish.js.map +1 -1
- package/dist/src/util/publish/publisher-rpc-peer.d.ts.map +1 -1
- package/dist/src/util/publish/publisher-rpc-peer.js +10 -8
- package/dist/src/util/publish/publisher-rpc-peer.js.map +1 -1
- package/dist/src/util/supervisor/supervisor-rpc-peer.d.ts.map +1 -1
- package/dist/src/util/supervisor/supervisor-rpc-peer.js +10 -8
- package/dist/src/util/supervisor/supervisor-rpc-peer.js.map +1 -1
- package/dist/src/util/tunnel/common.d.ts.map +1 -1
- package/dist/src/util/tunnel/common.js.map +1 -1
- package/dist/src/util/tunnel/tunnel-rpc-peer.d.ts.map +1 -1
- package/dist/src/util/tunnel/tunnel-rpc-peer.js +10 -8
- package/dist/src/util/tunnel/tunnel-rpc-peer.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/oclif.manifest.json +139 -33
- package/package.json +26 -26
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provider.js","sourceRoot":"","sources":["../../../../src/util/provider/provider.ts"],"names":[],"mappings":"AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;AAEF,OAAO,EAAE,EAAE,EAAE,MAAM,aAAa,CAAC;AAEjC,OAAO,
|
|
1
|
+
{"version":3,"file":"provider.js","sourceRoot":"","sources":["../../../../src/util/provider/provider.ts"],"names":[],"mappings":"AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;AAEF,OAAO,EAAE,EAAE,EAAE,MAAM,aAAa,CAAC;AAEjC,OAAO,EAAmB,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAExD,MAAM,CAAC,MAAM,QAAQ,GAAG,MAAM,CAAC;AAE/B,MAAM,CAAC,MAAM,gBAAgB,GAAG,cAAc,CAAC;AAuB/C,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,KAAa,EAAE,EAAE;IACxC,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAC1B,GAAG,EAAE,IAAI,CAAC,QAAQ;QAClB,SAAS,EAAE,IAAI,CAAC,SAAS;KAC1B,CAAC,CAAC,CAAC;AACN,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,KAAa,EAAE,QAAoB,EAAE,EAAE,EAAE;IAClE,EAAE,CAAC,MAAM,CACP,KAAK,CACH,QAAQ,CAAC,KAAK,CAAC,EACf;QACE,GAAG,EAAE;YACH,MAAM,EAAE,UAAU;SACnB;QACD,SAAS,EAAE;YACT,MAAM,EAAE,YAAY;SACrB;KACF,EACD,KAAK,CACN,CACF,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../../../src/util/publish/build.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../../../src/util/publish/build.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEtD,MAAM,WAAW,WAAW;IAC1B,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,aAAa,CAAC;CACvB;AAED,UAAU,SAAS;IACjB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,eAAO,MAAM,KAAK,GAAI,aAAa,SAAS,EAAE,iBAAiB,WAAW,SAyBzE,CAAC"}
|
|
@@ -1,17 +1,16 @@
|
|
|
1
1
|
//
|
|
2
2
|
// Copyright 2022 DXOS.org
|
|
3
3
|
//
|
|
4
|
-
import chalk from 'chalk';
|
|
5
4
|
import { spawnSync } from 'child_process';
|
|
5
|
+
import chalk from 'chalk';
|
|
6
6
|
export const build = ({ verbose }, { log, module }) => {
|
|
7
|
-
var _a;
|
|
8
7
|
log(`Building module ${chalk.bold(module.name)} ...`);
|
|
9
8
|
const [command, ...args] = module.build.command.split(' ');
|
|
10
9
|
// Build with configuration.
|
|
11
10
|
const { status, error } = spawnSync(command, args, {
|
|
12
11
|
env: {
|
|
13
12
|
...process.env,
|
|
14
|
-
...(
|
|
13
|
+
...(module.build.env ?? {}),
|
|
15
14
|
CONFIG_DYNAMIC: 'true',
|
|
16
15
|
},
|
|
17
16
|
stdio: verbose ? 'inherit' : undefined,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build.js","sourceRoot":"","sources":["../../../../src/util/publish/build.ts"],"names":[],"mappings":"AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;AAEF,OAAO,
|
|
1
|
+
{"version":3,"file":"build.js","sourceRoot":"","sources":["../../../../src/util/publish/build.ts"],"names":[],"mappings":"AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;AAEF,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAE1C,OAAO,KAAK,MAAM,OAAO,CAAC;AAa1B,MAAM,CAAC,MAAM,KAAK,GAAG,CAAC,EAAE,OAAO,EAAa,EAAE,EAAE,GAAG,EAAE,MAAM,EAAe,EAAE,EAAE;IAC5E,GAAG,CAAC,mBAAmB,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAEtD,MAAM,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,GAAG,MAAM,CAAC,KAAM,CAAC,OAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAE7D,4BAA4B;IAC5B,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,SAAS,CAAC,OAAO,EAAE,IAAI,EAAE;QACjD,GAAG,EAAE;YACH,GAAG,OAAO,CAAC,GAAG;YACd,GAAG,CAAC,MAAM,CAAC,KAAM,CAAC,GAAG,IAAI,EAAE,CAAC;YAC5B,cAAc,EAAE,MAAM;SACvB;QACD,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS;KACvC,CAAC,CAAC;IAEH,IAAI,KAAK,IAAI,MAAM,KAAK,CAAC,EAAE,CAAC;QAC1B,GAAG,CACD,UAAU,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,gBAC/B,OAAO,CAAC,CAAC,CAAC,iBAAiB,MAAM,IAAI,KAAK,CAAC,CAAC,CAAC,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,2CACrE,EAAE,CACH,CAAC;QACF,OAAO,CAAC,IAAI,CAAC,MAAM,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;IAC7C,CAAC;IAED,GAAG,CAAC,gBAAgB,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;AAC5D,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../../src/util/publish/common.ts"],"names":[],"mappings":"AAMA,OAAO,
|
|
1
|
+
{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../../src/util/publish/common.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,KAAK,YAAY,EAAS,MAAM,gBAAgB,CAAC;AAC1D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAEhD,MAAM,MAAM,aAAa,GAAG,WAAW,CAAC,WAAW,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAC3F,MAAM,MAAM,WAAW,GAAG,WAAW,CAAC,WAAW,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAEvF,MAAM,MAAM,MAAM,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAC;AAE/D,eAAO,MAAM,UAAU,GAAU,SAAS,aAAa,EAAE;;;IAMxD,CAAC;AAEF,eAAO,MAAM,YAAY,GAAU,SAAS,aAAa,EAAE,EAAE,QAAO,YAAiB,kBAepF,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../src/util/publish/common.ts"],"names":[],"mappings":"AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;AAEF,OAAO,EAAE,EAAE,EAAE,MAAM,aAAa,CAAC;AAEjC,OAAO,
|
|
1
|
+
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../src/util/publish/common.ts"],"names":[],"mappings":"AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;AAEF,OAAO,EAAE,EAAE,EAAE,MAAM,aAAa,CAAC;AAEjC,OAAO,EAAqB,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAQ1D,MAAM,CAAC,MAAM,UAAU,GAAG,KAAK,EAAE,OAAwB,EAAE,EAAE;IAC3D,MAAM,EAAE,GAAG,EAAE,GAAG,MAAM,MAAM,CAAC,iBAAiB,CAAC,CAAC;IAChD,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;QAC3B,GAAG,EAAE,GAAG,CAAC,IAAI;QACb,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,MAAO,CAAC,CAAC,QAAQ,EAAE;KAC3C,CAAC,CAAC,CAAC;AACN,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,YAAY,GAAG,KAAK,EAAE,OAAwB,EAAE,QAAsB,EAAE,EAAE,EAAE;IACvF,EAAE,CAAC,MAAM,CACP,KAAK,CACH,MAAM,UAAU,CAAC,OAAO,CAAC,EACzB;QACE,GAAG,EAAE;YACH,MAAM,EAAE,MAAM;SACf;QACD,MAAM,EAAE;YACN,MAAM,EAAE,QAAQ;SACjB;KACF,EACD,KAAK,CACN,CACF,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../../src/util/publish/config.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../../src/util/publish/config.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAStC,eAAO,MAAM,UAAU,GAAU,aAAY,MAAkC,KAAG,OAAO,CAAC,MAAM,CAoB/F,CAAC"}
|
|
@@ -2,20 +2,19 @@
|
|
|
2
2
|
// Copyright 2022 DXOS.org
|
|
3
3
|
//
|
|
4
4
|
import fs from 'fs';
|
|
5
|
+
import path from 'path';
|
|
5
6
|
import yaml from 'js-yaml';
|
|
6
7
|
import defaultsDeep from 'lodash.defaultsdeep';
|
|
7
|
-
import path from 'path';
|
|
8
8
|
import { Config } from '@dxos/config';
|
|
9
9
|
import { invariant } from '@dxos/invariant';
|
|
10
10
|
const DEFAULT_BUILD_COMMAND = 'npm run build';
|
|
11
11
|
const EXTENSION_CONFIG_FILENAME = 'dx.yml';
|
|
12
12
|
export const loadConfig = async (configPath = EXTENSION_CONFIG_FILENAME) => {
|
|
13
|
-
var _a, _b;
|
|
14
13
|
const absolute = path.isAbsolute(configPath);
|
|
15
14
|
configPath = absolute ? configPath : path.join(process.cwd(), configPath);
|
|
16
15
|
invariant(fs.existsSync(configPath), `"${configPath}" not found.`);
|
|
17
16
|
const dxConfig = yaml.load(String(fs.readFileSync(configPath)));
|
|
18
|
-
invariant(
|
|
17
|
+
invariant(dxConfig.package?.modules?.length, `No modules found in ${configPath}`);
|
|
19
18
|
return new Config({
|
|
20
19
|
version: 1,
|
|
21
20
|
package: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../../src/util/publish/config.ts"],"names":[],"mappings":"AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;AAEF,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,IAAI,MAAM,
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../../src/util/publish/config.ts"],"names":[],"mappings":"AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;AAEF,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,OAAO,IAAI,MAAM,SAAS,CAAC;AAC3B,OAAO,YAAY,MAAM,qBAAqB,CAAC;AAE/C,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAEtC,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAI5C,MAAM,qBAAqB,GAAG,eAAe,CAAC;AAC9C,MAAM,yBAAyB,GAAG,QAAQ,CAAC;AAE3C,MAAM,CAAC,MAAM,UAAU,GAAG,KAAK,EAAE,aAAqB,yBAAyB,EAAmB,EAAE;IAClG,MAAM,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;IAC7C,UAAU,GAAG,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,UAAU,CAAC,CAAC;IAE1E,SAAS,CAAC,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,IAAI,UAAU,cAAc,CAAC,CAAC;IAEnE,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC,CAAgB,CAAC;IAE/E,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,uBAAuB,UAAU,EAAE,CAAC,CAAC;IAElF,OAAO,IAAI,MAAM,CAAC;QAChB,OAAO,EAAE,CAAC;QACV,OAAO,EAAE;YACP,OAAO,EAAE,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAqB,EAAE,EAAE,CAC9D,YAAY,CAAC,MAAM,EAAE;gBACnB,KAAK,EAAE,EAAE,OAAO,EAAE,qBAAqB,EAAE;aAC1C,CAAC,CACH;SACF;KACF,CAAC,CAAC;AACL,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ipfs-upload.d.ts","sourceRoot":"","sources":["../../../../src/util/publish/ipfs-upload.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ipfs-upload.d.ts","sourceRoot":"","sources":["../../../../src/util/publish/ipfs-upload.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,KAAK,GAAG,EAAE,KAAK,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAI/D,UAAU,aAAa;IACrB,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IAClD,GAAG,CAAC,EAAE,OAAO,CAAC;CACf;AAGD,eAAO,MAAM,YAAY,GAAU,YAAY,aAAa,EAAE,MAAM,MAAM,EAAE,UAAU,aAAa,KAAG,OAAO,CAAC,GAAG,CA2ChH,CAAC"}
|
|
@@ -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,OAAO,EAAE,MAAM,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"ipfs-upload.js","sourceRoot":"","sources":["../../../../src/util/publish/ipfs-upload.ts"],"names":[],"mappings":"AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;AAEF,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAI5B,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAO3C,4BAA4B;AAC5B,MAAM,CAAC,MAAM,YAAY,GAAG,KAAK,EAAE,UAAyB,EAAE,IAAY,EAAE,OAAuB,EAAgB,EAAE;IACnH,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,SAAS,CAAC,iBAAiB,CAAC,CAAC;IAC1D,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;QACzB,MAAM,IAAI,KAAK,CAAC,qCAAqC,IAAI,GAAG,CAAC,CAAC;IAChE,CAAC;IAED,MAAM,EAAE,GAAG,GAAG,IAAI,EAAE,QAAQ,EAAE,GAAG,OAAO,IAAI,EAAE,CAAC;IAC/C,IAAI,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC;QACrC,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,CAAC;YACH,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YACvC,IAAI,CAAC,EAAE,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC;gBAC1C,MAAM,YAAY,GAAG,EAAE,CAAC;gBACxB,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;oBACnD,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBAC3B,CAAC;gBAED,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;gBAClD,MAAM,YAAY,GAAG,EAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;gBAC/C,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC;oBACxC,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;gBACL,CAAC;YACH,CAAC;YAED,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACnB,CAAC;QACD,OAAO,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,kCAAkC;IACxE,CAAC;SAAM,CAAC;QACN,MAAM,OAAO,GAAG,EAAE,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;IACvB,CAAC;AACH,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"publish.d.ts","sourceRoot":"","sources":["../../../../src/util/publish/publish.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"publish.d.ts","sourceRoot":"","sources":["../../../../src/util/publish/publish.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAG3C,OAAO,EAAE,KAAK,MAAM,EAAE,KAAK,aAAa,EAAE,MAAM,UAAU,CAAC;AAa3D,UAAU,cAAc;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,aAAa,CAAC;IACtB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC1B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,GAAG,CAAC,EAAE,OAAO,CAAC;CACf;AAED,eAAO,MAAM,OAAO,GAAU,sDAAsD,cAAc,KAAG,OAAO,CAAC,GAAG,CAiC/G,CAAC"}
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
//
|
|
2
2
|
// Copyright 2022 DXOS.org
|
|
3
3
|
//
|
|
4
|
-
import chalk from 'chalk';
|
|
5
|
-
import cliProgress from 'cli-progress';
|
|
6
4
|
import fs from 'fs';
|
|
7
|
-
import folderSize from 'get-folder-size';
|
|
8
5
|
import { join } from 'path';
|
|
9
6
|
import { promisify } from 'util';
|
|
7
|
+
import chalk from 'chalk';
|
|
8
|
+
import cliProgress from 'cli-progress';
|
|
9
|
+
import folderSize from 'get-folder-size';
|
|
10
10
|
import { createIpfsClient } from '@dxos/cli-base';
|
|
11
11
|
import { invariant } from '@dxos/invariant';
|
|
12
12
|
import { uploadToIPFS } from './ipfs-upload';
|
|
@@ -18,11 +18,10 @@ const getFolderSize = promisify(folderSize);
|
|
|
18
18
|
*/
|
|
19
19
|
const encodeName = (name) => name.replaceAll(':', '/');
|
|
20
20
|
export const publish = async ({ verbose, timeout, path, pin, log, config, module }) => {
|
|
21
|
-
var _a, _b;
|
|
22
21
|
invariant(module.name, 'Module name is required to publish.');
|
|
23
22
|
log(`Publishing module ${chalk.bold(module.name)} ...`);
|
|
24
23
|
const moduleOut = `out/${encodeName(module.name)}`;
|
|
25
|
-
const outdir =
|
|
24
|
+
const outdir = path ?? module.build?.outdir ?? (fs.existsSync(moduleOut) ? moduleOut : DEFAULT_OUTDIR);
|
|
26
25
|
const publishFolder = join(process.cwd(), outdir);
|
|
27
26
|
if (!fs.existsSync(publishFolder)) {
|
|
28
27
|
throw new Error(`Publish failed. Build output folder does not exist: ${publishFolder}.`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"publish.js","sourceRoot":"","sources":["../../../../src/util/publish/publish.ts"],"names":[],"mappings":"AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;AAEF,OAAO,
|
|
1
|
+
{"version":3,"file":"publish.js","sourceRoot":"","sources":["../../../../src/util/publish/publish.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"publisher-rpc-peer.d.ts","sourceRoot":"","sources":["../../../../src/util/publish/publisher-rpc-peer.ts"],"names":[],"mappings":"AAMA,OAAO,
|
|
1
|
+
{"version":3,"file":"publisher-rpc-peer.d.ts","sourceRoot":"","sources":["../../../../src/util/publish/publisher-rpc-peer.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,KAAK,EAAW,MAAM,aAAa,CAAC;AAG7C,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,8CAA8C,CAAC;AAG9E,qBAAa,gBAAgB;IASf,OAAO,CAAC,QAAQ,CAAC,IAAI;IARjC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAY;IACpC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAyC;IAC9D,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAiB;IAEjD,QAAQ,CAAC,SAAS,cAAe;IACjC,QAAQ,CAAC,YAAY,cAAe;IACpC,QAAQ,CAAC,KAAK,eAAsB;gBAEP,IAAI,EAAE,MAAM;IAqDzC,IAAI,GAAG,IAAI,SAAS,CAEnB;IAEK,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAO7B"}
|
|
@@ -2,17 +2,20 @@
|
|
|
2
2
|
// Copyright 2022 DXOS.org
|
|
3
3
|
//
|
|
4
4
|
import WebSocket from 'isomorphic-ws';
|
|
5
|
-
import {
|
|
5
|
+
import { Event, Trigger } from '@dxos/async';
|
|
6
6
|
import { log } from '@dxos/log';
|
|
7
7
|
import { schema } from '@dxos/protocols/proto';
|
|
8
8
|
import { createProtoRpcPeer } from '@dxos/rpc';
|
|
9
9
|
export class PublisherRpcPeer {
|
|
10
|
+
_url;
|
|
11
|
+
_socket;
|
|
12
|
+
_rpc;
|
|
13
|
+
_connectTrigger = new Trigger();
|
|
14
|
+
connected = new Event();
|
|
15
|
+
disconnected = new Event();
|
|
16
|
+
error = new Event();
|
|
10
17
|
constructor(_url) {
|
|
11
18
|
this._url = _url;
|
|
12
|
-
this._connectTrigger = new Trigger();
|
|
13
|
-
this.connected = new Event();
|
|
14
|
-
this.disconnected = new Event();
|
|
15
|
-
this.error = new Event();
|
|
16
19
|
this._socket = new WebSocket(this._url);
|
|
17
20
|
this._socket.onopen = async () => {
|
|
18
21
|
try {
|
|
@@ -36,9 +39,8 @@ export class PublisherRpcPeer {
|
|
|
36
39
|
}
|
|
37
40
|
};
|
|
38
41
|
this._socket.onerror = (event) => {
|
|
39
|
-
var _a;
|
|
40
42
|
log(`Publisher socket error ${this._url} ${event.message}`);
|
|
41
|
-
this.error.emit(
|
|
43
|
+
this.error.emit(event.error ?? new Error(event.message));
|
|
42
44
|
};
|
|
43
45
|
this._rpc = createProtoRpcPeer({
|
|
44
46
|
requested: {
|
|
@@ -47,7 +49,7 @@ export class PublisherRpcPeer {
|
|
|
47
49
|
exposed: {},
|
|
48
50
|
handlers: {},
|
|
49
51
|
noHandshake: true,
|
|
50
|
-
timeout:
|
|
52
|
+
timeout: 1_000_000,
|
|
51
53
|
port: {
|
|
52
54
|
send: (msg) => {
|
|
53
55
|
this._socket.send(msg);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"publisher-rpc-peer.js","sourceRoot":"","sources":["../../../../src/util/publish/publisher-rpc-peer.ts"],"names":[],"mappings":"AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;AAEF,OAAO,SAAS,MAAM,eAAe,CAAC;AAEtC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"publisher-rpc-peer.js","sourceRoot":"","sources":["../../../../src/util/publish/publisher-rpc-peer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"supervisor-rpc-peer.d.ts","sourceRoot":"","sources":["../../../../src/util/supervisor/supervisor-rpc-peer.ts"],"names":[],"mappings":"AAOA,OAAO,
|
|
1
|
+
{"version":3,"file":"supervisor-rpc-peer.d.ts","sourceRoot":"","sources":["../../../../src/util/supervisor/supervisor-rpc-peer.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,KAAK,EAAW,MAAM,aAAa,CAAC;AAG7C,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,+CAA+C,CAAC;AAGhF,qBAAa,iBAAiB;IAShB,OAAO,CAAC,QAAQ,CAAC,IAAI;IARjC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAY;IACpC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAA2C;IAChE,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAiB;IAEjD,QAAQ,CAAC,SAAS,cAAe;IACjC,QAAQ,CAAC,YAAY,cAAe;IACpC,QAAQ,CAAC,KAAK,eAAsB;gBAEP,IAAI,EAAE,MAAM;IAqDzC,IAAI,GAAG,IAAI,UAAU,CAEpB;IAEK,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAO7B"}
|
|
@@ -3,17 +3,20 @@
|
|
|
3
3
|
//
|
|
4
4
|
// TODO(egorgripasov): Factor out.
|
|
5
5
|
import WebSocket from 'isomorphic-ws';
|
|
6
|
-
import {
|
|
6
|
+
import { Event, Trigger } from '@dxos/async';
|
|
7
7
|
import { log } from '@dxos/log';
|
|
8
8
|
import { schema } from '@dxos/protocols/proto';
|
|
9
9
|
import { createProtoRpcPeer } from '@dxos/rpc';
|
|
10
10
|
export class SupervisorRpcPeer {
|
|
11
|
+
_url;
|
|
12
|
+
_socket;
|
|
13
|
+
_rpc;
|
|
14
|
+
_connectTrigger = new Trigger();
|
|
15
|
+
connected = new Event();
|
|
16
|
+
disconnected = new Event();
|
|
17
|
+
error = new Event();
|
|
11
18
|
constructor(_url) {
|
|
12
19
|
this._url = _url;
|
|
13
|
-
this._connectTrigger = new Trigger();
|
|
14
|
-
this.connected = new Event();
|
|
15
|
-
this.disconnected = new Event();
|
|
16
|
-
this.error = new Event();
|
|
17
20
|
this._socket = new WebSocket(this._url);
|
|
18
21
|
this._socket.onopen = async () => {
|
|
19
22
|
try {
|
|
@@ -37,9 +40,8 @@ export class SupervisorRpcPeer {
|
|
|
37
40
|
}
|
|
38
41
|
};
|
|
39
42
|
this._socket.onerror = (event) => {
|
|
40
|
-
var _a;
|
|
41
43
|
log(`Publisher socket error ${this._url} ${event.message}`);
|
|
42
|
-
this.error.emit(
|
|
44
|
+
this.error.emit(event.error ?? new Error(event.message));
|
|
43
45
|
};
|
|
44
46
|
this._rpc = createProtoRpcPeer({
|
|
45
47
|
requested: {
|
|
@@ -48,7 +50,7 @@ export class SupervisorRpcPeer {
|
|
|
48
50
|
exposed: {},
|
|
49
51
|
handlers: {},
|
|
50
52
|
noHandshake: true,
|
|
51
|
-
timeout:
|
|
53
|
+
timeout: 1_000_000,
|
|
52
54
|
port: {
|
|
53
55
|
send: (msg) => {
|
|
54
56
|
this._socket.send(msg);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"supervisor-rpc-peer.js","sourceRoot":"","sources":["../../../../src/util/supervisor/supervisor-rpc-peer.ts"],"names":[],"mappings":"AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;AAEF,kCAAkC;AAClC,OAAO,SAAS,MAAM,eAAe,CAAC;AAEtC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"supervisor-rpc-peer.js","sourceRoot":"","sources":["../../../../src/util/supervisor/supervisor-rpc-peer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../../src/util/tunnel/common.ts"],"names":[],"mappings":"AAMA,OAAO,
|
|
1
|
+
{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../../src/util/tunnel/common.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,KAAK,UAAU,EAAS,MAAM,gBAAgB,CAAC;AACxD,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,2CAA2C,CAAC;AAEhF,eAAO,MAAM,UAAU,GAAI,SAAS,cAAc,EAAE;;;;GAMnD,CAAC;AAEF,eAAO,MAAM,YAAY,GAAI,SAAS,cAAc,EAAE,EAAE,QAAO,UAAe,SAkB7E,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../src/util/tunnel/common.ts"],"names":[],"mappings":"AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;AAEF,OAAO,EAAE,EAAE,EAAE,MAAM,aAAa,CAAC;AAEjC,OAAO,
|
|
1
|
+
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../src/util/tunnel/common.ts"],"names":[],"mappings":"AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;AAEF,OAAO,EAAE,EAAE,EAAE,MAAM,aAAa,CAAC;AAEjC,OAAO,EAAmB,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAGxD,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,OAAyB,EAAE,EAAE;IACtD,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QAC9B,GAAG,EAAE,MAAM,CAAC,IAAI;QAChB,OAAO,EAAE,MAAM,CAAC,OAAO;QACvB,GAAG,EAAE,MAAM,CAAC,GAAG;KAChB,CAAC,CAAC,CAAC;AACN,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,OAAyB,EAAE,QAAoB,EAAE,EAAE,EAAE;IAChF,EAAE,CAAC,MAAM,CACP,KAAK,CACH,UAAU,CAAC,OAAO,CAAC,EACnB;QACE,GAAG,EAAE;YACH,MAAM,EAAE,KAAK;SACd;QACD,OAAO,EAAE;YACP,MAAM,EAAE,SAAS;SAClB;QACD,GAAG,EAAE;YACH,MAAM,EAAE,KAAK;SACd;KACF,EACD,KAAK,CACN,CACF,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tunnel-rpc-peer.d.ts","sourceRoot":"","sources":["../../../../src/util/tunnel/tunnel-rpc-peer.ts"],"names":[],"mappings":"AAOA,OAAO,
|
|
1
|
+
{"version":3,"file":"tunnel-rpc-peer.d.ts","sourceRoot":"","sources":["../../../../src/util/tunnel/tunnel-rpc-peer.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,KAAK,EAAW,MAAM,aAAa,CAAC;AAG7C,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,2CAA2C,CAAC;AAGxE,qBAAa,aAAa;IASZ,OAAO,CAAC,QAAQ,CAAC,IAAI;IARjC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAY;IACpC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAmC;IACxD,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAiB;IAEjD,QAAQ,CAAC,SAAS,cAAe;IACjC,QAAQ,CAAC,YAAY,cAAe;IACpC,QAAQ,CAAC,KAAK,eAAsB;gBAEP,IAAI,EAAE,MAAM;IAqDzC,IAAI,GAAG,IAAI,MAAM,CAEhB;IAEK,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAO7B"}
|
|
@@ -3,17 +3,20 @@
|
|
|
3
3
|
//
|
|
4
4
|
// TODO(egorgripasov): Factor out.
|
|
5
5
|
import WebSocket from 'isomorphic-ws';
|
|
6
|
-
import {
|
|
6
|
+
import { Event, Trigger } from '@dxos/async';
|
|
7
7
|
import { log } from '@dxos/log';
|
|
8
8
|
import { schema } from '@dxos/protocols/proto';
|
|
9
9
|
import { createProtoRpcPeer } from '@dxos/rpc';
|
|
10
10
|
export class TunnelRpcPeer {
|
|
11
|
+
_url;
|
|
12
|
+
_socket;
|
|
13
|
+
_rpc;
|
|
14
|
+
_connectTrigger = new Trigger();
|
|
15
|
+
connected = new Event();
|
|
16
|
+
disconnected = new Event();
|
|
17
|
+
error = new Event();
|
|
11
18
|
constructor(_url) {
|
|
12
19
|
this._url = _url;
|
|
13
|
-
this._connectTrigger = new Trigger();
|
|
14
|
-
this.connected = new Event();
|
|
15
|
-
this.disconnected = new Event();
|
|
16
|
-
this.error = new Event();
|
|
17
20
|
this._socket = new WebSocket(this._url);
|
|
18
21
|
this._socket.onopen = async () => {
|
|
19
22
|
try {
|
|
@@ -37,9 +40,8 @@ export class TunnelRpcPeer {
|
|
|
37
40
|
}
|
|
38
41
|
};
|
|
39
42
|
this._socket.onerror = (event) => {
|
|
40
|
-
var _a;
|
|
41
43
|
log(`Publisher socket error ${this._url} ${event.message}`);
|
|
42
|
-
this.error.emit(
|
|
44
|
+
this.error.emit(event.error ?? new Error(event.message));
|
|
43
45
|
};
|
|
44
46
|
this._rpc = createProtoRpcPeer({
|
|
45
47
|
requested: {
|
|
@@ -48,7 +50,7 @@ export class TunnelRpcPeer {
|
|
|
48
50
|
exposed: {},
|
|
49
51
|
handlers: {},
|
|
50
52
|
noHandshake: true,
|
|
51
|
-
timeout:
|
|
53
|
+
timeout: 1_000_000,
|
|
52
54
|
port: {
|
|
53
55
|
send: (msg) => {
|
|
54
56
|
this._socket.send(msg);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tunnel-rpc-peer.js","sourceRoot":"","sources":["../../../../src/util/tunnel/tunnel-rpc-peer.ts"],"names":[],"mappings":"AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;AAEF,kCAAkC;AAClC,OAAO,SAAS,MAAM,eAAe,CAAC;AAEtC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"tunnel-rpc-peer.js","sourceRoot":"","sources":["../../../../src/util/tunnel/tunnel-rpc-peer.ts"],"names":[],"mappings":"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"}
|