@dxos/cli 0.6.14-main.7bd9c89 → 0.6.14-staging.3e2eaca

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 (209) hide show
  1. package/bin/dev.js +26 -0
  2. package/bin/dx.js +17 -0
  3. package/dist/src/base.js +11 -16
  4. package/dist/src/base.js.map +1 -1
  5. package/dist/src/commands/agent/agent.node.test.js +54 -59
  6. package/dist/src/commands/agent/agent.node.test.js.map +1 -1
  7. package/dist/src/commands/agent/invitations.d.ts +11 -11
  8. package/dist/src/commands/agent/invitations.js +19 -24
  9. package/dist/src/commands/agent/invitations.js.map +1 -1
  10. package/dist/src/commands/agent/list.d.ts +12 -12
  11. package/dist/src/commands/agent/list.js +11 -13
  12. package/dist/src/commands/agent/list.js.map +1 -1
  13. package/dist/src/commands/agent/restart.d.ts +12 -12
  14. package/dist/src/commands/agent/restart.js +7 -9
  15. package/dist/src/commands/agent/restart.js.map +1 -1
  16. package/dist/src/commands/agent/start.d.ts +15 -15
  17. package/dist/src/commands/agent/start.js +38 -43
  18. package/dist/src/commands/agent/start.js.map +1 -1
  19. package/dist/src/commands/agent/status.d.ts +10 -10
  20. package/dist/src/commands/agent/status.js +7 -9
  21. package/dist/src/commands/agent/status.js.map +1 -1
  22. package/dist/src/commands/agent/stop.d.ts +13 -13
  23. package/dist/src/commands/agent/stop.js +10 -15
  24. package/dist/src/commands/agent/stop.js.map +1 -1
  25. package/dist/src/commands/app/app.node.test.js +11 -16
  26. package/dist/src/commands/app/app.node.test.js.map +1 -1
  27. package/dist/src/commands/app/create.d.ts +14 -14
  28. package/dist/src/commands/app/create.js +23 -52
  29. package/dist/src/commands/app/create.js.map +1 -1
  30. package/dist/src/commands/app/list.d.ts +10 -10
  31. package/dist/src/commands/app/list.js +10 -12
  32. package/dist/src/commands/app/list.js.map +1 -1
  33. package/dist/src/commands/app/open.d.ts +13 -13
  34. package/dist/src/commands/app/open.js +23 -28
  35. package/dist/src/commands/app/open.js.map +1 -1
  36. package/dist/src/commands/app/publish.d.ts +14 -14
  37. package/dist/src/commands/app/publish.js +19 -24
  38. package/dist/src/commands/app/publish.js.map +1 -1
  39. package/dist/src/commands/config/index.js +3 -5
  40. package/dist/src/commands/config/index.js.map +1 -1
  41. package/dist/src/commands/config/index.node.test.js +11 -39
  42. package/dist/src/commands/config/index.node.test.js.map +1 -1
  43. package/dist/src/commands/debug/diagnostics.d.ts +12 -12
  44. package/dist/src/commands/debug/diagnostics.js +15 -20
  45. package/dist/src/commands/debug/diagnostics.js.map +1 -1
  46. package/dist/src/commands/debug/error.js +5 -7
  47. package/dist/src/commands/debug/error.js.map +1 -1
  48. package/dist/src/commands/debug/generate.d.ts +16 -16
  49. package/dist/src/commands/debug/generate.js +20 -22
  50. package/dist/src/commands/debug/generate.js.map +1 -1
  51. package/dist/src/commands/debug/metrics.d.ts +1 -1
  52. package/dist/src/commands/debug/metrics.js +5 -7
  53. package/dist/src/commands/debug/metrics.js.map +1 -1
  54. package/dist/src/commands/debug/status.d.ts +11 -11
  55. package/dist/src/commands/debug/status.js +10 -15
  56. package/dist/src/commands/debug/status.js.map +1 -1
  57. package/dist/src/commands/device/info.js +11 -16
  58. package/dist/src/commands/device/info.js.map +1 -1
  59. package/dist/src/commands/device/list.d.ts +10 -10
  60. package/dist/src/commands/device/list.js +9 -11
  61. package/dist/src/commands/device/list.js.map +1 -1
  62. package/dist/src/commands/device/update.d.ts +11 -11
  63. package/dist/src/commands/device/update.js +11 -13
  64. package/dist/src/commands/device/update.js.map +1 -1
  65. package/dist/src/commands/function/list.js +15 -19
  66. package/dist/src/commands/function/list.js.map +1 -1
  67. package/dist/src/commands/function/logs.d.ts +1 -1
  68. package/dist/src/commands/function/logs.js +5 -7
  69. package/dist/src/commands/function/logs.js.map +1 -1
  70. package/dist/src/commands/function/trigger/list.d.ts +14 -14
  71. package/dist/src/commands/function/trigger/list.js +21 -28
  72. package/dist/src/commands/function/trigger/list.js.map +1 -1
  73. package/dist/src/commands/halo/create.d.ts +13 -13
  74. package/dist/src/commands/halo/create.js +10 -12
  75. package/dist/src/commands/halo/create.js.map +1 -1
  76. package/dist/src/commands/halo/credential/add.d.ts +1 -1
  77. package/dist/src/commands/halo/credential/add.js +9 -11
  78. package/dist/src/commands/halo/credential/add.js.map +1 -1
  79. package/dist/src/commands/halo/credential/list.d.ts +12 -12
  80. package/dist/src/commands/halo/credential/list.js +15 -17
  81. package/dist/src/commands/halo/credential/list.js.map +1 -1
  82. package/dist/src/commands/halo/identity.js +5 -10
  83. package/dist/src/commands/halo/identity.js.map +1 -1
  84. package/dist/src/commands/halo/join.d.ts +14 -14
  85. package/dist/src/commands/halo/join.d.ts.map +1 -1
  86. package/dist/src/commands/halo/join.js +34 -37
  87. package/dist/src/commands/halo/join.js.map +1 -1
  88. package/dist/src/commands/halo/keys.js +3 -5
  89. package/dist/src/commands/halo/keys.js.map +1 -1
  90. package/dist/src/commands/halo/recovery/generate.js +3 -5
  91. package/dist/src/commands/halo/recovery/generate.js.map +1 -1
  92. package/dist/src/commands/halo/recovery/use.d.ts +11 -11
  93. package/dist/src/commands/halo/recovery/use.js +6 -8
  94. package/dist/src/commands/halo/recovery/use.js.map +1 -1
  95. package/dist/src/commands/halo/share.d.ts +15 -15
  96. package/dist/src/commands/halo/share.js +27 -32
  97. package/dist/src/commands/halo/share.js.map +1 -1
  98. package/dist/src/commands/halo/update.d.ts +11 -11
  99. package/dist/src/commands/halo/update.js +11 -16
  100. package/dist/src/commands/halo/update.js.map +1 -1
  101. package/dist/src/commands/info.d.ts +10 -10
  102. package/dist/src/commands/info.d.ts.map +1 -1
  103. package/dist/src/commands/info.js +8 -13
  104. package/dist/src/commands/info.js.map +1 -1
  105. package/dist/src/commands/profile/import.d.ts +12 -12
  106. package/dist/src/commands/profile/import.js +20 -48
  107. package/dist/src/commands/profile/import.js.map +1 -1
  108. package/dist/src/commands/profile/inspect.d.ts +12 -12
  109. package/dist/src/commands/profile/inspect.js +14 -39
  110. package/dist/src/commands/profile/inspect.js.map +1 -1
  111. package/dist/src/commands/reset/index.d.ts +12 -12
  112. package/dist/src/commands/reset/index.js +22 -27
  113. package/dist/src/commands/reset/index.js.map +1 -1
  114. package/dist/src/commands/shell/index.d.ts.map +1 -1
  115. package/dist/src/commands/shell/index.js +11 -12
  116. package/dist/src/commands/shell/index.js.map +1 -1
  117. package/dist/src/commands/space/close.d.ts +1 -1
  118. package/dist/src/commands/space/close.js +5 -7
  119. package/dist/src/commands/space/close.js.map +1 -1
  120. package/dist/src/commands/space/create.d.ts +1 -1
  121. package/dist/src/commands/space/create.js +9 -14
  122. package/dist/src/commands/space/create.js.map +1 -1
  123. package/dist/src/commands/space/epoch.d.ts +1 -1
  124. package/dist/src/commands/space/epoch.js +5 -7
  125. package/dist/src/commands/space/epoch.js.map +1 -1
  126. package/dist/src/commands/space/info.d.ts +1 -1
  127. package/dist/src/commands/space/info.js +5 -7
  128. package/dist/src/commands/space/info.js.map +1 -1
  129. package/dist/src/commands/space/join.d.ts +12 -12
  130. package/dist/src/commands/space/join.d.ts.map +1 -1
  131. package/dist/src/commands/space/join.js +22 -25
  132. package/dist/src/commands/space/join.js.map +1 -1
  133. package/dist/src/commands/space/list.d.ts +11 -11
  134. package/dist/src/commands/space/list.js +16 -18
  135. package/dist/src/commands/space/list.js.map +1 -1
  136. package/dist/src/commands/space/members.d.ts +11 -11
  137. package/dist/src/commands/space/members.js +9 -11
  138. package/dist/src/commands/space/members.js.map +1 -1
  139. package/dist/src/commands/space/open.d.ts +1 -1
  140. package/dist/src/commands/space/open.js +5 -7
  141. package/dist/src/commands/space/open.js.map +1 -1
  142. package/dist/src/commands/space/query.d.ts +12 -12
  143. package/dist/src/commands/space/query.js +15 -17
  144. package/dist/src/commands/space/query.js.map +1 -1
  145. package/dist/src/commands/space/schema/list.d.ts +12 -12
  146. package/dist/src/commands/space/schema/list.js +12 -14
  147. package/dist/src/commands/space/schema/list.js.map +1 -1
  148. package/dist/src/commands/space/share.d.ts +17 -17
  149. package/dist/src/commands/space/share.js +30 -35
  150. package/dist/src/commands/space/share.js.map +1 -1
  151. package/dist/src/commands/tunnel/index.d.ts +11 -11
  152. package/dist/src/commands/tunnel/index.js +16 -18
  153. package/dist/src/commands/tunnel/index.js.map +1 -1
  154. package/dist/src/commands/tunnel/list.d.ts +10 -10
  155. package/dist/src/commands/tunnel/list.js +8 -10
  156. package/dist/src/commands/tunnel/list.js.map +1 -1
  157. package/dist/src/commands/userfunction/upload.d.ts +15 -15
  158. package/dist/src/commands/userfunction/upload.js +29 -34
  159. package/dist/src/commands/userfunction/upload.js.map +1 -1
  160. package/dist/src/components/App.js +11 -18
  161. package/dist/src/components/App.js.map +1 -1
  162. package/dist/src/components/SpaceTable.js +8 -38
  163. package/dist/src/components/SpaceTable.js.map +1 -1
  164. package/dist/src/components/SystemTable.js +6 -36
  165. package/dist/src/components/SystemTable.js.map +1 -1
  166. package/dist/src/components/index.js +3 -19
  167. package/dist/src/components/index.js.map +1 -1
  168. package/dist/src/help.js +8 -15
  169. package/dist/src/help.js.map +1 -1
  170. package/dist/src/hooks/command-not-found.js +4 -9
  171. package/dist/src/hooks/command-not-found.js.map +1 -1
  172. package/dist/src/index.js +2 -20
  173. package/dist/src/index.js.map +1 -1
  174. package/dist/src/util/index.js +4 -20
  175. package/dist/src/util/index.js.map +1 -1
  176. package/dist/src/util/provider/digital-ocean.js +11 -18
  177. package/dist/src/util/provider/digital-ocean.js.map +1 -1
  178. package/dist/src/util/provider/index.js +2 -18
  179. package/dist/src/util/provider/index.js.map +1 -1
  180. package/dist/src/util/provider/provider.js +7 -12
  181. package/dist/src/util/provider/provider.js.map +1 -1
  182. package/dist/src/util/publish/build.js +7 -14
  183. package/dist/src/util/publish/build.js.map +1 -1
  184. package/dist/src/util/publish/common.js +6 -34
  185. package/dist/src/util/publish/common.js.map +1 -1
  186. package/dist/src/util/publish/config.js +14 -21
  187. package/dist/src/util/publish/config.js.map +1 -1
  188. package/dist/src/util/publish/index.js +6 -22
  189. package/dist/src/util/publish/index.js.map +1 -1
  190. package/dist/src/util/publish/ipfs-upload.js +11 -18
  191. package/dist/src/util/publish/ipfs-upload.js.map +1 -1
  192. package/dist/src/util/publish/publish.js +20 -27
  193. package/dist/src/util/publish/publish.js.map +1 -1
  194. package/dist/src/util/publish/publisher-rpc-peer.js +16 -23
  195. package/dist/src/util/publish/publisher-rpc-peer.js.map +1 -1
  196. package/dist/src/util/supervisor/index.js +1 -17
  197. package/dist/src/util/supervisor/index.js.map +1 -1
  198. package/dist/src/util/supervisor/supervisor-rpc-peer.js +16 -23
  199. package/dist/src/util/supervisor/supervisor-rpc-peer.js.map +1 -1
  200. package/dist/src/util/tunnel/common.js +5 -10
  201. package/dist/src/util/tunnel/common.js.map +1 -1
  202. package/dist/src/util/tunnel/index.js +2 -18
  203. package/dist/src/util/tunnel/index.js.map +1 -1
  204. package/dist/src/util/tunnel/tunnel-rpc-peer.js +16 -23
  205. package/dist/src/util/tunnel/tunnel-rpc-peer.js.map +1 -1
  206. package/oclif.manifest.json +53 -53
  207. package/package.json +43 -41
  208. package/bin/dev +0 -22
  209. package/bin/dx +0 -8
@@ -1,30 +1,24 @@
1
- "use strict";
2
1
  //
3
2
  // Copyright 2023 DXOS.org
4
3
  //
5
- var __importDefault = (this && this.__importDefault) || function (mod) {
6
- return (mod && mod.__esModule) ? mod : { "default": mod };
7
- };
8
- Object.defineProperty(exports, "__esModule", { value: true });
9
- exports.SupervisorRpcPeer = void 0;
10
4
  // TODO(egorgripasov): Factor out.
11
- const isomorphic_ws_1 = __importDefault(require("isomorphic-ws"));
12
- const async_1 = require("@dxos/async");
13
- const log_1 = require("@dxos/log");
14
- const proto_1 = require("@dxos/protocols/proto");
15
- const rpc_1 = require("@dxos/rpc");
16
- class SupervisorRpcPeer {
5
+ import WebSocket from 'isomorphic-ws';
6
+ import { Trigger, Event } from '@dxos/async';
7
+ import { log } from '@dxos/log';
8
+ import { schema } from '@dxos/protocols/proto';
9
+ import { createProtoRpcPeer } from '@dxos/rpc';
10
+ export class SupervisorRpcPeer {
17
11
  constructor(_url) {
18
12
  this._url = _url;
19
- this._connectTrigger = new async_1.Trigger();
20
- this.connected = new async_1.Event();
21
- this.disconnected = new async_1.Event();
22
- this.error = new async_1.Event();
23
- this._socket = new isomorphic_ws_1.default(this._url);
13
+ this._connectTrigger = new Trigger();
14
+ this.connected = new Event();
15
+ this.disconnected = new Event();
16
+ this.error = new Event();
17
+ this._socket = new WebSocket(this._url);
24
18
  this._socket.onopen = async () => {
25
19
  try {
26
20
  await this._rpc.open();
27
- (0, log_1.log)(`RPC open ${this._url}`);
21
+ log(`RPC open ${this._url}`);
28
22
  this.connected.emit();
29
23
  this._connectTrigger.wake();
30
24
  }
@@ -33,7 +27,7 @@ class SupervisorRpcPeer {
33
27
  }
34
28
  };
35
29
  this._socket.onclose = async () => {
36
- (0, log_1.log)(`Disconnected ${this._url}`);
30
+ log(`Disconnected ${this._url}`);
37
31
  this.disconnected.emit();
38
32
  try {
39
33
  await this._rpc.close();
@@ -44,12 +38,12 @@ class SupervisorRpcPeer {
44
38
  };
45
39
  this._socket.onerror = (event) => {
46
40
  var _a;
47
- (0, log_1.log)(`Publisher socket error ${this._url} ${event.message}`);
41
+ log(`Publisher socket error ${this._url} ${event.message}`);
48
42
  this.error.emit((_a = event.error) !== null && _a !== void 0 ? _a : new Error(event.message));
49
43
  };
50
- this._rpc = (0, rpc_1.createProtoRpcPeer)({
44
+ this._rpc = createProtoRpcPeer({
51
45
  requested: {
52
- Supervisor: proto_1.schema.getService('dxos.service.supervisor.Supervisor'),
46
+ Supervisor: schema.getService('dxos.service.supervisor.Supervisor'),
53
47
  },
54
48
  exposed: {},
55
49
  handlers: {},
@@ -84,5 +78,4 @@ class SupervisorRpcPeer {
84
78
  }
85
79
  }
86
80
  }
87
- exports.SupervisorRpcPeer = SupervisorRpcPeer;
88
81
  //# sourceMappingURL=supervisor-rpc-peer.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"supervisor-rpc-peer.js","sourceRoot":"","sources":["../../../../src/util/supervisor/supervisor-rpc-peer.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"supervisor-rpc-peer.js","sourceRoot":"","sources":["../../../../src/util/supervisor/supervisor-rpc-peer.ts"],"names":[],"mappings":"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"}
@@ -1,21 +1,17 @@
1
- "use strict";
2
1
  //
3
2
  // Copyright 2023 DXOS.org
4
3
  //
5
- Object.defineProperty(exports, "__esModule", { value: true });
6
- exports.printTunnels = exports.mapTunnels = void 0;
7
- const core_1 = require("@oclif/core");
8
- const cli_base_1 = require("@dxos/cli-base");
9
- const mapTunnels = (tunnels) => {
4
+ import { ux } from '@oclif/core';
5
+ import { table } from '@dxos/cli-base';
6
+ export const mapTunnels = (tunnels) => {
10
7
  return tunnels.map((tunnel) => ({
11
8
  key: tunnel.name,
12
9
  enabled: tunnel.enabled,
13
10
  url: tunnel.url,
14
11
  }));
15
12
  };
16
- exports.mapTunnels = mapTunnels;
17
- const printTunnels = (tunnels, flags = {}) => {
18
- core_1.ux.stdout((0, cli_base_1.table)((0, exports.mapTunnels)(tunnels), {
13
+ export const printTunnels = (tunnels, flags = {}) => {
14
+ ux.stdout(table(mapTunnels(tunnels), {
19
15
  key: {
20
16
  header: 'app',
21
17
  },
@@ -27,5 +23,4 @@ const printTunnels = (tunnels, flags = {}) => {
27
23
  },
28
24
  }, flags));
29
25
  };
30
- exports.printTunnels = printTunnels;
31
26
  //# sourceMappingURL=common.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../src/util/tunnel/common.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;AAEF,sCAAiC;AAEjC,6CAAwD;AAGjD,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;AANW,QAAA,UAAU,cAMrB;AAEK,MAAM,YAAY,GAAG,CAAC,OAAyB,EAAE,QAAoB,EAAE,EAAE,EAAE;IAChF,SAAE,CAAC,MAAM,CACP,IAAA,gBAAK,EACH,IAAA,kBAAU,EAAC,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;AAlBW,QAAA,YAAY,gBAkBvB"}
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,EAAE,KAAK,EAAmB,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,22 +1,6 @@
1
- "use strict";
2
1
  //
3
2
  // Copyright 2023 DXOS.org
4
3
  //
5
- var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
6
- if (k2 === undefined) k2 = k;
7
- var desc = Object.getOwnPropertyDescriptor(m, k);
8
- if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
9
- desc = { enumerable: true, get: function() { return m[k]; } };
10
- }
11
- Object.defineProperty(o, k2, desc);
12
- }) : (function(o, m, k, k2) {
13
- if (k2 === undefined) k2 = k;
14
- o[k2] = m[k];
15
- }));
16
- var __exportStar = (this && this.__exportStar) || function(m, exports) {
17
- for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
18
- };
19
- Object.defineProperty(exports, "__esModule", { value: true });
20
- __exportStar(require("./common"), exports);
21
- __exportStar(require("./tunnel-rpc-peer"), exports);
4
+ export * from './common';
5
+ export * from './tunnel-rpc-peer';
22
6
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/util/tunnel/index.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;;;;;;;;;;;AAEF,2CAAyB;AACzB,oDAAkC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/util/tunnel/index.ts"],"names":[],"mappings":"AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;AAEF,cAAc,UAAU,CAAC;AACzB,cAAc,mBAAmB,CAAC"}
@@ -1,30 +1,24 @@
1
- "use strict";
2
1
  //
3
2
  // Copyright 2023 DXOS.org
4
3
  //
5
- var __importDefault = (this && this.__importDefault) || function (mod) {
6
- return (mod && mod.__esModule) ? mod : { "default": mod };
7
- };
8
- Object.defineProperty(exports, "__esModule", { value: true });
9
- exports.TunnelRpcPeer = void 0;
10
4
  // TODO(egorgripasov): Factor out.
11
- const isomorphic_ws_1 = __importDefault(require("isomorphic-ws"));
12
- const async_1 = require("@dxos/async");
13
- const log_1 = require("@dxos/log");
14
- const proto_1 = require("@dxos/protocols/proto");
15
- const rpc_1 = require("@dxos/rpc");
16
- class TunnelRpcPeer {
5
+ import WebSocket from 'isomorphic-ws';
6
+ import { Trigger, Event } from '@dxos/async';
7
+ import { log } from '@dxos/log';
8
+ import { schema } from '@dxos/protocols/proto';
9
+ import { createProtoRpcPeer } from '@dxos/rpc';
10
+ export class TunnelRpcPeer {
17
11
  constructor(_url) {
18
12
  this._url = _url;
19
- this._connectTrigger = new async_1.Trigger();
20
- this.connected = new async_1.Event();
21
- this.disconnected = new async_1.Event();
22
- this.error = new async_1.Event();
23
- this._socket = new isomorphic_ws_1.default(this._url);
13
+ this._connectTrigger = new Trigger();
14
+ this.connected = new Event();
15
+ this.disconnected = new Event();
16
+ this.error = new Event();
17
+ this._socket = new WebSocket(this._url);
24
18
  this._socket.onopen = async () => {
25
19
  try {
26
20
  await this._rpc.open();
27
- (0, log_1.log)(`RPC open ${this._url}`);
21
+ log(`RPC open ${this._url}`);
28
22
  this.connected.emit();
29
23
  this._connectTrigger.wake();
30
24
  }
@@ -33,7 +27,7 @@ class TunnelRpcPeer {
33
27
  }
34
28
  };
35
29
  this._socket.onclose = async () => {
36
- (0, log_1.log)(`Disconnected ${this._url}`);
30
+ log(`Disconnected ${this._url}`);
37
31
  this.disconnected.emit();
38
32
  try {
39
33
  await this._rpc.close();
@@ -44,12 +38,12 @@ class TunnelRpcPeer {
44
38
  };
45
39
  this._socket.onerror = (event) => {
46
40
  var _a;
47
- (0, log_1.log)(`Publisher socket error ${this._url} ${event.message}`);
41
+ log(`Publisher socket error ${this._url} ${event.message}`);
48
42
  this.error.emit((_a = event.error) !== null && _a !== void 0 ? _a : new Error(event.message));
49
43
  };
50
- this._rpc = (0, rpc_1.createProtoRpcPeer)({
44
+ this._rpc = createProtoRpcPeer({
51
45
  requested: {
52
- Tunnel: proto_1.schema.getService('dxos.service.tunnel.Tunnel'),
46
+ Tunnel: schema.getService('dxos.service.tunnel.Tunnel'),
53
47
  },
54
48
  exposed: {},
55
49
  handlers: {},
@@ -84,5 +78,4 @@ class TunnelRpcPeer {
84
78
  }
85
79
  }
86
80
  }
87
- exports.TunnelRpcPeer = TunnelRpcPeer;
88
81
  //# sourceMappingURL=tunnel-rpc-peer.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"tunnel-rpc-peer.js","sourceRoot":"","sources":["../../../../src/util/tunnel/tunnel-rpc-peer.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"tunnel-rpc-peer.js","sourceRoot":"","sources":["../../../../src/util/tunnel/tunnel-rpc-peer.ts"],"names":[],"mappings":"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"}