@dxos/cli 0.1.48-next.83f55fd → 0.1.49-next.55d8a92

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 (130) hide show
  1. package/README.md +213 -219
  2. package/bin/dev +4 -3
  3. package/bin/dev.cmd +1 -1
  4. package/bin/run +1 -1
  5. package/config/config-default.yml +0 -2
  6. package/dist/src/base-command.d.ts +21 -10
  7. package/dist/src/base-command.d.ts.map +1 -1
  8. package/dist/src/base-command.js +91 -68
  9. package/dist/src/base-command.js.map +1 -1
  10. package/dist/src/commands/{daemon → agent}/list.d.ts +1 -0
  11. package/dist/src/commands/agent/list.d.ts.map +1 -0
  12. package/dist/src/commands/agent/list.js +37 -0
  13. package/dist/src/commands/agent/list.js.map +1 -0
  14. package/dist/src/commands/agent/restart.d.ts.map +1 -0
  15. package/dist/src/commands/{daemon → agent}/restart.js +1 -1
  16. package/dist/src/commands/agent/restart.js.map +1 -0
  17. package/dist/src/commands/{daemon → agent}/run.d.ts +1 -1
  18. package/dist/src/commands/agent/run.d.ts.map +1 -0
  19. package/dist/src/commands/{daemon → agent}/run.js +7 -8
  20. package/dist/src/commands/agent/run.js.map +1 -0
  21. package/dist/src/commands/agent/start.d.ts.map +1 -0
  22. package/dist/src/commands/{daemon → agent}/start.js +1 -1
  23. package/dist/src/commands/agent/start.js.map +1 -0
  24. package/dist/src/commands/agent/stop.d.ts.map +1 -0
  25. package/dist/src/commands/{daemon → agent}/stop.js +1 -1
  26. package/dist/src/commands/agent/stop.js.map +1 -0
  27. package/dist/src/commands/app/create.d.ts +1 -1
  28. package/dist/src/commands/app/open.d.ts +1 -1
  29. package/dist/src/commands/app/publish.d.ts +1 -1
  30. package/dist/src/commands/debug/stats.d.ts +17 -0
  31. package/dist/src/commands/debug/stats.d.ts.map +1 -0
  32. package/dist/src/commands/debug/stats.js +90 -0
  33. package/dist/src/commands/debug/stats.js.map +1 -0
  34. package/dist/src/commands/halo/create.d.ts +1 -1
  35. package/dist/src/commands/halo/create.js +4 -4
  36. package/dist/src/commands/halo/create.js.map +1 -1
  37. package/dist/src/commands/halo/credential/list.d.ts +1 -1
  38. package/dist/src/commands/halo/join.d.ts +1 -1
  39. package/dist/src/commands/halo/share.d.ts +1 -1
  40. package/dist/src/commands/kube/deploy.d.ts +1 -1
  41. package/dist/src/commands/reset/index.d.ts.map +1 -1
  42. package/dist/src/commands/reset/index.js +1 -1
  43. package/dist/src/commands/reset/index.js.map +1 -1
  44. package/dist/src/commands/space/create.js +1 -1
  45. package/dist/src/commands/space/create.js.map +1 -1
  46. package/dist/src/commands/space/{new-epoch.d.ts → epoch.d.ts} +3 -3
  47. package/dist/src/commands/space/epoch.d.ts.map +1 -0
  48. package/dist/src/commands/space/{new-epoch.js → epoch.js} +9 -8
  49. package/dist/src/commands/space/epoch.js.map +1 -0
  50. package/dist/src/commands/space/index.d.ts.map +1 -1
  51. package/dist/src/commands/space/index.js +1 -0
  52. package/dist/src/commands/space/index.js.map +1 -1
  53. package/dist/src/commands/space/join.d.ts +1 -1
  54. package/dist/src/commands/space/list.d.ts +1 -1
  55. package/dist/src/commands/space/members.d.ts +1 -1
  56. package/dist/src/commands/tunnel/list.d.ts.map +1 -1
  57. package/dist/src/commands/tunnel/list.js +3 -5
  58. package/dist/src/commands/tunnel/list.js.map +1 -1
  59. package/dist/src/commands/tunnel/set.d.ts +1 -1
  60. package/dist/src/util/exec.d.ts.map +1 -1
  61. package/dist/src/util/exec.js.map +1 -1
  62. package/dist/src/util/print.d.ts +1 -0
  63. package/dist/src/util/print.d.ts.map +1 -1
  64. package/dist/src/util/print.js +13 -8
  65. package/dist/src/util/print.js.map +1 -1
  66. package/dist/src/util/provider/provider.js +2 -2
  67. package/dist/src/util/publish/common.js +2 -2
  68. package/dist/src/util/telemetry.d.ts.map +1 -1
  69. package/dist/src/util/telemetry.js +1 -0
  70. package/dist/src/util/telemetry.js.map +1 -1
  71. package/dist/src/util/telemetryrc.json +1 -1
  72. package/dist/src/util/tunnel/common.js +3 -3
  73. package/oclif.manifest.json +584 -493
  74. package/package.json +23 -23
  75. package/dist/src/commands/daemon/list.d.ts.map +0 -1
  76. package/dist/src/commands/daemon/list.js +0 -19
  77. package/dist/src/commands/daemon/list.js.map +0 -1
  78. package/dist/src/commands/daemon/restart.d.ts.map +0 -1
  79. package/dist/src/commands/daemon/restart.js.map +0 -1
  80. package/dist/src/commands/daemon/run.d.ts.map +0 -1
  81. package/dist/src/commands/daemon/run.js.map +0 -1
  82. package/dist/src/commands/daemon/start.d.ts.map +0 -1
  83. package/dist/src/commands/daemon/start.js.map +0 -1
  84. package/dist/src/commands/daemon/stop.d.ts.map +0 -1
  85. package/dist/src/commands/daemon/stop.js.map +0 -1
  86. package/dist/src/commands/space/new-epoch.d.ts.map +0 -1
  87. package/dist/src/commands/space/new-epoch.js.map +0 -1
  88. package/dist/src/daemon/daemon.d.ts +0 -15
  89. package/dist/src/daemon/daemon.d.ts.map +0 -1
  90. package/dist/src/daemon/daemon.js +0 -6
  91. package/dist/src/daemon/daemon.js.map +0 -1
  92. package/dist/src/daemon/faas/api.d.ts +0 -346
  93. package/dist/src/daemon/faas/api.d.ts.map +0 -1
  94. package/dist/src/daemon/faas/api.js +0 -11
  95. package/dist/src/daemon/faas/api.js.map +0 -1
  96. package/dist/src/daemon/faas/connector.d.ts +0 -46
  97. package/dist/src/daemon/faas/connector.d.ts.map +0 -1
  98. package/dist/src/daemon/faas/connector.js +0 -185
  99. package/dist/src/daemon/faas/connector.js.map +0 -1
  100. package/dist/src/daemon/forever/forever-daemon.d.ts +0 -15
  101. package/dist/src/daemon/forever/forever-daemon.d.ts.map +0 -1
  102. package/dist/src/daemon/forever/forever-daemon.js +0 -83
  103. package/dist/src/daemon/forever/forever-daemon.js.map +0 -1
  104. package/dist/src/daemon/forever/index.d.ts +0 -2
  105. package/dist/src/daemon/forever/index.d.ts.map +0 -1
  106. package/dist/src/daemon/forever/index.js +0 -21
  107. package/dist/src/daemon/forever/index.js.map +0 -1
  108. package/dist/src/daemon/index.d.ts +0 -5
  109. package/dist/src/daemon/index.d.ts.map +0 -1
  110. package/dist/src/daemon/index.js +0 -24
  111. package/dist/src/daemon/index.js.map +0 -1
  112. package/dist/src/daemon/pm2/index.d.ts +0 -2
  113. package/dist/src/daemon/pm2/index.d.ts.map +0 -1
  114. package/dist/src/daemon/pm2/index.js +0 -21
  115. package/dist/src/daemon/pm2/index.js.map +0 -1
  116. package/dist/src/daemon/pm2/pm2-daemon.d.ts +0 -21
  117. package/dist/src/daemon/pm2/pm2-daemon.d.ts.map +0 -1
  118. package/dist/src/daemon/pm2/pm2-daemon.js +0 -107
  119. package/dist/src/daemon/pm2/pm2-daemon.js.map +0 -1
  120. package/dist/src/daemon/run-services.d.ts +0 -7
  121. package/dist/src/daemon/run-services.d.ts.map +0 -1
  122. package/dist/src/daemon/run-services.js +0 -109
  123. package/dist/src/daemon/run-services.js.map +0 -1
  124. package/dist/src/daemon/util.d.ts +0 -8
  125. package/dist/src/daemon/util.d.ts.map +0 -1
  126. package/dist/src/daemon/util.js +0 -38
  127. package/dist/src/daemon/util.js.map +0 -1
  128. /package/dist/src/commands/{daemon → agent}/restart.d.ts +0 -0
  129. /package/dist/src/commands/{daemon → agent}/start.d.ts +0 -0
  130. /package/dist/src/commands/{daemon → agent}/stop.d.ts +0 -0
@@ -54,6 +54,7 @@ const getTelemetryContext = async (configDir) => {
54
54
  if (!configDirExists) {
55
55
  await (0, promises_1.mkdir)(configDir, { recursive: true });
56
56
  }
57
+ // TODO(burdon): Is this config or state?
57
58
  const idPath = (0, node_path_1.join)(configDir, 'telemetry.yml');
58
59
  if (await exists(idPath)) {
59
60
  const context = await (0, promises_1.readFile)(idPath, 'utf-8');
@@ -1 +1 @@
1
- {"version":3,"file":"telemetry.js","sourceRoot":"","sources":["../../../src/util/telemetry.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;;AAEF,sDAA2B;AAC3B,+CAAoE;AACpE,sDAAyB;AACzB,yCAAiC;AACjC,+BAA4D;AAE5D,yCAAgD;AAChD,+CAA8C;AAE9C,0EAA6C;AAEhC,QAAA,cAAc,GAAG,MAAA,0BAAW,CAAC,cAAc,mCAAI,SAAS,CAAC;AACzD,QAAA,UAAU,GAAG,MAAA,0BAAW,CAAC,UAAU,mCAAI,SAAS,CAAC;AACjD,QAAA,kBAAkB,GAAG,MAAA,0BAAW,CAAC,kBAAkB,mCAAI,SAAS,CAAC;AACjE,QAAA,iBAAiB,GAAG,MAAA,0BAAW,CAAC,iBAAiB,mCAAI,SAAS,CAAC;AAC/D,QAAA,cAAc,GAAG,MAAA,0BAAW,CAAC,cAAc,mCAAI,SAAS,CAAC;AAgBtE,MAAM,QAAQ,GAAqB;IACjC,IAAI,EAAE,OAAO;IACb,WAAW,EAAE,sBAAc;IAC3B,OAAO,EAAE,kBAAU;IACnB,QAAQ,EAAE,IAAI,CAAC,cAAc,EAAE,CAAC,eAAe,EAAE,CAAC,QAAQ;IAC1D,OAAO,EAAE,QAAQ,OAAO,CAAC,OAAO,EAAE;IAClC,EAAE,EAAE,iBAAE,CAAC,QAAQ,EAAE;IACjB,IAAI,EAAE,iBAAE,CAAC,IAAI,EAAE;IACf,EAAE,EAAE,OAAO,CAAC,GAAG,CAAC,EAAE,KAAK,MAAM;CAC9B,CAAC;AAEK,MAAM,gBAAgB,GAAG,KAAK,EAAE,SAAiB,EAAE,EAAE;IAC1D,IAAI,CAAC,yBAAiB,EAAE;QACtB,OAAO;KACR;IAED,MAAM,EAAE,cAAc,EAAE,GAAG,MAAM,IAAA,2BAAmB,EAAC,SAAS,CAAC,CAAC;IAChE,MAAM,IAAI,GAAG,IAAA,gBAAI,EAAC,SAAS,EAAE,qBAAqB,CAAC,CAAC;IACpD,IAAI,MAAM,MAAM,CAAC,IAAI,CAAC,EAAE;QACtB,OAAO;KACR;IAED,IAAA,gBAAI,EAAC,EAAE,MAAM,EAAE,yBAAiB,EAAE,SAAS,EAAE,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;IAChE,IAAA,iBAAK,EAAC;QACJ,cAAc;QACd,IAAI,EAAE,uBAAuB;KAC9B,CAAC,CAAC;IACH,MAAM,IAAA,oBAAS,EAAC,IAAI,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC;AACrC,CAAC,CAAC;AAjBW,QAAA,gBAAgB,oBAiB3B;AAEK,MAAM,mBAAmB,GAAG,KAAK,EAAE,SAAiB,EAA6B,EAAE;;IACxF,MAAM,eAAe,GAAG,MAAM,MAAM,CAAC,SAAS,CAAC,CAAC;IAChD,IAAI,CAAC,eAAe,EAAE;QACpB,MAAM,IAAA,gBAAK,EAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;KAC7C;IAED,MAAM,MAAM,GAAG,IAAA,gBAAI,EAAC,SAAS,EAAE,eAAe,CAAC,CAAC;IAChD,IAAI,MAAM,MAAM,CAAC,MAAM,CAAC,EAAE;QACxB,MAAM,OAAO,GAAG,MAAM,IAAA,mBAAQ,EAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QAChD,OAAO,MAAA,QAAQ,CAAC,OAAO,CAAC,mCAAI,aAAa,CAAC,MAAM,CAAC,CAAC;KACnD;IAED,OAAO,aAAa,CAAC,MAAM,CAAC,CAAC;AAC/B,CAAC,CAAC;AAbW,QAAA,mBAAmB,uBAa9B;AAEF,MAAM,aAAa,GAAG,KAAK,EAAE,MAAc,EAAE,EAAE;IAC7C,MAAM,cAAc,GAAG,IAAA,SAAI,GAAE,CAAC;IAC9B,MAAM,OAAO,GAAG,iBAAI,CAAC,IAAI,CAAC,EAAE,cAAc,EAAE,CAAC,CAAC;IAC9C,MAAM,OAAO,GAAG,4DAA4D,CAAC;IAC7E,MAAM,IAAA,oBAAS,EAAC,MAAM,EAAE,GAAG,OAAO,GAAG,OAAO,EAAE,EAAE,OAAO,CAAC,CAAC;IACzD,OAAO,EAAE,GAAG,QAAQ,EAAE,cAAc,EAAE,CAAC;AACzC,CAAC,CAAC;AAEF,MAAM,QAAQ,GAAG,CAAC,aAAqB,EAAE,EAAE;IACzC,IAAI;QACF,MAAM,OAAO,GAAG,iBAAI,CAAC,IAAI,CAAC,aAAa,CAAqB,CAAC;QAC7D,IAAI,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC,IAAI,IAAA,eAAY,EAAC,OAAO,CAAC,cAAe,CAAC,EAAE;YAC5E,OAAO,EAAE,GAAG,QAAQ,EAAE,GAAG,OAAO,EAAE,CAAC;SACpC;KACF;IAAC,OAAO,GAAQ,EAAE;QACjB,IAAA,yBAAgB,EAAC,GAAG,CAAC,CAAC;KACvB;AACH,CAAC,CAAC;AAEF,gCAAgC;AAChC,MAAM,MAAM,GAAG,KAAK,EAAE,GAAG,IAAc,EAAoB,EAAE;IAC3D,IAAI;QACF,MAAM,MAAM,GAAG,MAAM,IAAA,eAAI,EAAC,IAAA,gBAAI,EAAC,GAAG,IAAI,CAAC,CAAC,CAAC;QACzC,OAAO,CAAC,CAAC,MAAM,CAAC;KACjB;IAAC,OAAO,GAAQ,EAAE;QACjB,IAAI,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;YAC9B,OAAO,KAAK,CAAC;SACd;aAAM;YACL,MAAM,GAAG,CAAC;SACX;KACF;AACH,CAAC,CAAC"}
1
+ {"version":3,"file":"telemetry.js","sourceRoot":"","sources":["../../../src/util/telemetry.ts"],"names":[],"mappings":"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"}
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "DX_ENVIRONMENT": "staging",
3
- "DX_RELEASE": "@dxos/cli@0.1.48-next.83f55fd",
3
+ "DX_RELEASE": "@dxos/cli@0.1.49-next.55d8a92",
4
4
  "SENTRY_DESTINATION": "https://2647916221e643869965e78469479aa4@o4504012000067584.ingest.sentry.io/4504012027265029",
5
5
  "TELEMETRY_API_KEY": "B00QG6PtJJrJ0VVFe0H5a6bcUUShKyZM",
6
6
  "IPDATA_API_KEY": "ccc5f0cd66dd34a7c31c2ddc61c2bbca2db73892a993982bb3a5f0e2"
@@ -16,13 +16,13 @@ exports.mapTunnels = mapTunnels;
16
16
  const printTunnels = (tunnels, flags = {}) => {
17
17
  core_1.ux.table((0, exports.mapTunnels)(tunnels), {
18
18
  key: {
19
- header: 'App',
19
+ header: 'app',
20
20
  },
21
21
  enabled: {
22
- header: 'Enabled',
22
+ header: 'enabled',
23
23
  },
24
24
  url: {
25
- header: 'URL',
25
+ header: 'url',
26
26
  },
27
27
  }, {
28
28
  ...flags,