@dcupl/cli 1.4.0-beta.0 → 1.4.0-beta.10

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 (302) hide show
  1. package/README.md +45 -0
  2. package/dist/cli.js +782 -149
  3. package/dist/cli.js.map +1 -1
  4. package/dist/functions/app/app-id.js +34 -2
  5. package/dist/functions/app/app-id.js.map +1 -1
  6. package/dist/functions/app/client/daemon-client.js.map +1 -1
  7. package/dist/functions/app/commands/cdn-host.d.ts +16 -0
  8. package/dist/functions/app/commands/cdn-host.js +47 -0
  9. package/dist/functions/app/commands/cdn-host.js.map +1 -0
  10. package/dist/functions/app/commands/create.js +50 -34
  11. package/dist/functions/app/commands/create.js.map +1 -1
  12. package/dist/functions/app/commands/destroy.js +10 -4
  13. package/dist/functions/app/commands/destroy.js.map +1 -1
  14. package/dist/functions/app/commands/detect-serve.js +17 -6
  15. package/dist/functions/app/commands/detect-serve.js.map +1 -1
  16. package/dist/functions/app/commands/fn/_fn-helpers.d.ts +13 -0
  17. package/dist/functions/app/commands/fn/_fn-helpers.js +64 -0
  18. package/dist/functions/app/commands/fn/_fn-helpers.js.map +1 -1
  19. package/dist/functions/app/commands/fn/aggregate.d.ts +8 -1
  20. package/dist/functions/app/commands/fn/aggregate.js +32 -3
  21. package/dist/functions/app/commands/fn/aggregate.js.map +1 -1
  22. package/dist/functions/app/commands/fn/facets.d.ts +1 -0
  23. package/dist/functions/app/commands/fn/facets.js +2 -0
  24. package/dist/functions/app/commands/fn/facets.js.map +1 -1
  25. package/dist/functions/app/commands/fn/group-by.d.ts +6 -0
  26. package/dist/functions/app/commands/fn/group-by.js +13 -22
  27. package/dist/functions/app/commands/fn/group-by.js.map +1 -1
  28. package/dist/functions/app/commands/fn/pivot.d.ts +14 -0
  29. package/dist/functions/app/commands/fn/pivot.js +72 -0
  30. package/dist/functions/app/commands/fn/pivot.js.map +1 -0
  31. package/dist/functions/app/commands/fn/suggest.d.ts +17 -0
  32. package/dist/functions/app/commands/fn/suggest.js +34 -0
  33. package/dist/functions/app/commands/fn/suggest.js.map +1 -0
  34. package/dist/functions/app/commands/list.js +6 -2
  35. package/dist/functions/app/commands/list.js.map +1 -1
  36. package/dist/functions/app/commands/loader-hash.js.map +1 -1
  37. package/dist/functions/app/commands/loaders/add.js +6 -0
  38. package/dist/functions/app/commands/loaders/add.js.map +1 -1
  39. package/dist/functions/app/commands/loaders/process-flags.js +4 -1
  40. package/dist/functions/app/commands/loaders/process-flags.js.map +1 -1
  41. package/dist/functions/app/commands/loaders/process.js +3 -1
  42. package/dist/functions/app/commands/loaders/process.js.map +1 -1
  43. package/dist/functions/app/commands/models/get.js.map +1 -1
  44. package/dist/functions/app/commands/models/keys.js.map +1 -1
  45. package/dist/functions/app/commands/models/remove.js.map +1 -1
  46. package/dist/functions/app/commands/models/set.js +3 -1
  47. package/dist/functions/app/commands/models/set.js.map +1 -1
  48. package/dist/functions/app/commands/query/execute.js +5 -2
  49. package/dist/functions/app/commands/query/execute.js.map +1 -1
  50. package/dist/functions/app/commands/query/one.js +3 -1
  51. package/dist/functions/app/commands/query/one.js.map +1 -1
  52. package/dist/functions/app/commands/render.js +10 -4
  53. package/dist/functions/app/commands/render.js.map +1 -1
  54. package/dist/functions/app/commands/resolve-app.js.map +1 -1
  55. package/dist/functions/app/commands/resolve-source.d.ts +1 -0
  56. package/dist/functions/app/commands/resolve-source.js +29 -6
  57. package/dist/functions/app/commands/resolve-source.js.map +1 -1
  58. package/dist/functions/app/commands/validate-report.d.ts +31 -0
  59. package/dist/functions/app/commands/validate-report.js +20 -1
  60. package/dist/functions/app/commands/validate-report.js.map +1 -1
  61. package/dist/functions/app/commands/validate.d.ts +1 -0
  62. package/dist/functions/app/commands/validate.js +32 -14
  63. package/dist/functions/app/commands/validate.js.map +1 -1
  64. package/dist/functions/app/daemon/app-server.module.js +6 -1
  65. package/dist/functions/app/daemon/app-server.module.js.map +1 -1
  66. package/dist/functions/app/daemon/controllers/data.controller.js +17 -6
  67. package/dist/functions/app/daemon/controllers/data.controller.js.map +1 -1
  68. package/dist/functions/app/daemon/controllers/fn.controller.d.ts +8 -0
  69. package/dist/functions/app/daemon/controllers/fn.controller.js +20 -0
  70. package/dist/functions/app/daemon/controllers/fn.controller.js.map +1 -1
  71. package/dist/functions/app/daemon/controllers/lifecycle.controller.js.map +1 -1
  72. package/dist/functions/app/daemon/controllers/query.controller.js +4 -1
  73. package/dist/functions/app/daemon/controllers/query.controller.js.map +1 -1
  74. package/dist/functions/app/daemon/daemon-args.js +2 -2
  75. package/dist/functions/app/daemon/daemon-args.js.map +1 -1
  76. package/dist/functions/app/daemon/filters/envelope-exception.filter.js +6 -1
  77. package/dist/functions/app/daemon/filters/envelope-exception.filter.js.map +1 -1
  78. package/dist/functions/app/daemon/main.js +14 -7
  79. package/dist/functions/app/daemon/main.js.map +1 -1
  80. package/dist/functions/app/daemon/services/attribute-validation.d.ts +21 -0
  81. package/dist/functions/app/daemon/services/attribute-validation.js +164 -0
  82. package/dist/functions/app/daemon/services/attribute-validation.js.map +1 -0
  83. package/dist/functions/app/daemon/services/dcupl-host.service.d.ts +7 -0
  84. package/dist/functions/app/daemon/services/dcupl-host.service.js +93 -16
  85. package/dist/functions/app/daemon/services/dcupl-host.service.js.map +1 -1
  86. package/dist/functions/app/daemon/services/idle-watchdog.service.js.map +1 -1
  87. package/dist/functions/app/daemon/services/ingest.service.js +8 -4
  88. package/dist/functions/app/daemon/services/ingest.service.js.map +1 -1
  89. package/dist/functions/app/daemon/services/init-options.js.map +1 -1
  90. package/dist/functions/app/daemon/services/loaders.service.d.ts +3 -1
  91. package/dist/functions/app/daemon/services/loaders.service.js +22 -6
  92. package/dist/functions/app/daemon/services/loaders.service.js.map +1 -1
  93. package/dist/functions/app/e2e/port-lock.d.ts +8 -0
  94. package/dist/functions/app/e2e/port-lock.js +66 -2
  95. package/dist/functions/app/e2e/port-lock.js.map +1 -1
  96. package/dist/functions/app/registry/registry.js +11 -10
  97. package/dist/functions/app/registry/registry.js.map +1 -1
  98. package/dist/functions/app/registry/serve-registry.js +13 -9
  99. package/dist/functions/app/registry/serve-registry.js.map +1 -1
  100. package/dist/functions/app/types.d.ts +2 -0
  101. package/dist/functions/config/commands/get.d.ts +3 -3
  102. package/dist/functions/config/commands/get.js +34 -16
  103. package/dist/functions/config/commands/get.js.map +1 -1
  104. package/dist/functions/config/commands/set.js +9 -4
  105. package/dist/functions/config/commands/set.js.map +1 -1
  106. package/dist/functions/config/io.d.ts +4 -1
  107. package/dist/functions/config/io.js +44 -11
  108. package/dist/functions/config/io.js.map +1 -1
  109. package/dist/functions/config/prompts.js +1 -3
  110. package/dist/functions/config/prompts.js.map +1 -1
  111. package/dist/functions/files/commands/copy.js +1 -1
  112. package/dist/functions/files/commands/copy.js.map +1 -1
  113. package/dist/functions/files/commands/delete.js +1 -1
  114. package/dist/functions/files/commands/delete.js.map +1 -1
  115. package/dist/functions/files/commands/list.js +6 -3
  116. package/dist/functions/files/commands/list.js.map +1 -1
  117. package/dist/functions/files/commands/move.js +1 -1
  118. package/dist/functions/files/commands/move.js.map +1 -1
  119. package/dist/functions/files/commands/pull.d.ts +16 -1
  120. package/dist/functions/files/commands/pull.js +135 -1
  121. package/dist/functions/files/commands/pull.js.map +1 -1
  122. package/dist/functions/files/commands/push.d.ts +1 -0
  123. package/dist/functions/files/commands/push.js +25 -3
  124. package/dist/functions/files/commands/push.js.map +1 -1
  125. package/dist/functions/files/commands/read.js +3 -2
  126. package/dist/functions/files/commands/read.js.map +1 -1
  127. package/dist/functions/files/commands/render.d.ts +29 -0
  128. package/dist/functions/files/commands/render.js +8 -4
  129. package/dist/functions/files/commands/render.js.map +1 -1
  130. package/dist/functions/files/commands/status.js +1 -0
  131. package/dist/functions/files/commands/status.js.map +1 -1
  132. package/dist/functions/files/commands/versions/copy.js +1 -1
  133. package/dist/functions/files/commands/versions/copy.js.map +1 -1
  134. package/dist/functions/files/commands/versions/delete.js +1 -1
  135. package/dist/functions/files/commands/versions/delete.js.map +1 -1
  136. package/dist/functions/files/commands/versions/list.js +4 -0
  137. package/dist/functions/files/commands/versions/list.js.map +1 -1
  138. package/dist/functions/files/commands/write.js +13 -3
  139. package/dist/functions/files/commands/write.js.map +1 -1
  140. package/dist/functions/files/files-pull.js +10 -7
  141. package/dist/functions/files/files-pull.js.map +1 -1
  142. package/dist/functions/files/files-push.js +11 -8
  143. package/dist/functions/files/files-push.js.map +1 -1
  144. package/dist/functions/files/helper/text-policy.d.ts +5 -0
  145. package/dist/functions/files/helper/text-policy.js +31 -0
  146. package/dist/functions/files/helper/text-policy.js.map +1 -0
  147. package/dist/functions/files/sync/large-upload.d.ts +20 -0
  148. package/dist/functions/files/sync/large-upload.js +140 -0
  149. package/dist/functions/files/sync/large-upload.js.map +1 -0
  150. package/dist/functions/files/sync/manifest.js +2 -1
  151. package/dist/functions/files/sync/manifest.js.map +1 -1
  152. package/dist/functions/files/sync/transfer.d.ts +5 -0
  153. package/dist/functions/files/sync/transfer.js +47 -10
  154. package/dist/functions/files/sync/transfer.js.map +1 -1
  155. package/dist/functions/files/test-helpers.d.ts +11 -0
  156. package/dist/functions/files/test-helpers.js +28 -0
  157. package/dist/functions/files/test-helpers.js.map +1 -1
  158. package/dist/functions/generate/files/generate-code.d.ts +1 -1
  159. package/dist/functions/generate/files/generate-files.d.ts +7 -1
  160. package/dist/functions/generate/files/generate-files.js +63 -15
  161. package/dist/functions/generate/files/generate-files.js.map +1 -1
  162. package/dist/functions/generate/files/workflow-presets.d.ts +6 -0
  163. package/dist/functions/generate/files/workflow-presets.js +158 -0
  164. package/dist/functions/generate/files/workflow-presets.js.map +1 -0
  165. package/dist/functions/generate/model-from-data/generate-model-from-data.js +11 -5
  166. package/dist/functions/generate/model-from-data/generate-model-from-data.js.map +1 -1
  167. package/dist/functions/generate/model-from-data/infer-key.js +1 -4
  168. package/dist/functions/generate/model-from-data/infer-key.js.map +1 -1
  169. package/dist/functions/generate/model-from-data/infer-to-model.js +6 -3
  170. package/dist/functions/generate/model-from-data/infer-to-model.js.map +1 -1
  171. package/dist/functions/generate/projects/generate-project.d.ts +5 -0
  172. package/dist/functions/generate/projects/generate-project.js +29 -8
  173. package/dist/functions/generate/projects/generate-project.js.map +1 -1
  174. package/dist/functions/helper/api-client.d.ts +3 -0
  175. package/dist/functions/helper/api-client.js +19 -17
  176. package/dist/functions/helper/api-client.js.map +1 -1
  177. package/dist/functions/helper/config.helper.d.ts +1 -0
  178. package/dist/functions/helper/config.helper.js.map +1 -1
  179. package/dist/functions/helper/credentials.helper.d.ts +21 -0
  180. package/dist/functions/helper/credentials.helper.js +39 -0
  181. package/dist/functions/helper/credentials.helper.js.map +1 -0
  182. package/dist/functions/helper/load-env.d.ts +1 -0
  183. package/dist/functions/helper/load-env.js +10 -0
  184. package/dist/functions/helper/load-env.js.map +1 -0
  185. package/dist/functions/helper/output.d.ts +1 -1
  186. package/dist/functions/helper/output.js +10 -12
  187. package/dist/functions/helper/output.js.map +1 -1
  188. package/dist/functions/helper/parse-fail.js +4 -1
  189. package/dist/functions/helper/parse-fail.js.map +1 -1
  190. package/dist/functions/schemas/command.js.map +1 -1
  191. package/dist/functions/schemas/examples/AppLoaderConfiguration.example.json +1 -3
  192. package/dist/functions/schemas/examples/AttributeQualityConfig.example.json +10 -0
  193. package/dist/functions/schemas/examples/DataMapperStepConfig.example.json +6 -1
  194. package/dist/functions/schemas/examples/ModelDefinition.example.json +29 -3
  195. package/dist/functions/schemas/examples/ScriptStepConfig.example.json +3 -1
  196. package/dist/functions/schemas/examples/TemplateV3.example.json +5 -1
  197. package/dist/functions/schemas/extract.js +1 -1
  198. package/dist/functions/schemas/extract.js.map +1 -1
  199. package/dist/functions/schemas/format.js +4 -4
  200. package/dist/functions/schemas/format.js.map +1 -1
  201. package/dist/functions/schemas/registry.d.ts +14 -0
  202. package/dist/functions/schemas/registry.js +122 -30
  203. package/dist/functions/schemas/registry.js.map +1 -1
  204. package/dist/functions/schemas/resolve.js +1 -2
  205. package/dist/functions/schemas/resolve.js.map +1 -1
  206. package/dist/functions/schemas/validate.d.ts +22 -0
  207. package/dist/functions/schemas/validate.js +67 -0
  208. package/dist/functions/schemas/validate.js.map +1 -0
  209. package/dist/functions/serve/commands/list.js +2 -1
  210. package/dist/functions/serve/commands/list.js.map +1 -1
  211. package/dist/functions/serve/commands/stop.js +10 -5
  212. package/dist/functions/serve/commands/stop.js.map +1 -1
  213. package/dist/functions/serve/dev-server/dev-server-access.guard.d.ts +11 -0
  214. package/dist/functions/serve/dev-server/dev-server-access.guard.js +41 -0
  215. package/dist/functions/serve/dev-server/dev-server-access.guard.js.map +1 -0
  216. package/dist/functions/serve/dev-server/dev-server.controller.d.ts +3 -0
  217. package/dist/functions/serve/dev-server/dev-server.controller.js +20 -0
  218. package/dist/functions/serve/dev-server/dev-server.controller.js.map +1 -1
  219. package/dist/functions/serve/dev-server/dev-server.module.d.ts +3 -0
  220. package/dist/functions/serve/dev-server/dev-server.module.js +34 -23
  221. package/dist/functions/serve/dev-server/dev-server.module.js.map +1 -1
  222. package/dist/functions/serve/dev-server/dev-server.options.d.ts +8 -0
  223. package/dist/functions/serve/dev-server/dev-server.options.js +5 -0
  224. package/dist/functions/serve/dev-server/dev-server.options.js.map +1 -0
  225. package/dist/functions/serve/dev-server/dev-server.service.d.ts +11 -3
  226. package/dist/functions/serve/dev-server/dev-server.service.js +72 -65
  227. package/dist/functions/serve/dev-server/dev-server.service.js.map +1 -1
  228. package/dist/functions/serve/dev-server/path-scope.d.ts +5 -0
  229. package/dist/functions/serve/dev-server/path-scope.js +88 -0
  230. package/dist/functions/serve/dev-server/path-scope.js.map +1 -0
  231. package/dist/functions/serve/dev-server/request-security.d.ts +34 -0
  232. package/dist/functions/serve/dev-server/request-security.js +145 -0
  233. package/dist/functions/serve/dev-server/request-security.js.map +1 -0
  234. package/dist/functions/serve/main.d.ts +13 -0
  235. package/dist/functions/serve/main.js +90 -17
  236. package/dist/functions/serve/main.js.map +1 -1
  237. package/dist/functions/serve/serve-self-register.js +2 -1
  238. package/dist/functions/serve/serve-self-register.js.map +1 -1
  239. package/dist/functions/version/command.d.ts +12 -1
  240. package/dist/functions/version/command.js +55 -7
  241. package/dist/functions/version/command.js.map +1 -1
  242. package/dist/functions/workflow/commands/deploy.d.ts +9 -1
  243. package/dist/functions/workflow/commands/deploy.js +39 -10
  244. package/dist/functions/workflow/commands/deploy.js.map +1 -1
  245. package/dist/functions/workflow/commands/get.js.map +1 -1
  246. package/dist/functions/workflow/commands/history.js.map +1 -1
  247. package/dist/functions/workflow/commands/run.d.ts +26 -0
  248. package/dist/functions/workflow/commands/run.js +101 -0
  249. package/dist/functions/workflow/commands/run.js.map +1 -0
  250. package/dist/functions/workflow/commands/runners-get.js.map +1 -1
  251. package/dist/functions/workflow/commands/runners.d.ts +2 -0
  252. package/dist/functions/workflow/commands/runners.js +10 -1
  253. package/dist/functions/workflow/commands/runners.js.map +1 -1
  254. package/dist/functions/workflow/commands/status.d.ts +1 -1
  255. package/dist/functions/workflow/commands/status.js +7 -1
  256. package/dist/functions/workflow/commands/status.js.map +1 -1
  257. package/dist/functions/workflow/commands/template.js.map +1 -1
  258. package/dist/functions/workflow/commands/test.d.ts +3 -0
  259. package/dist/functions/workflow/commands/test.js +22 -73
  260. package/dist/functions/workflow/commands/test.js.map +1 -1
  261. package/dist/functions/workflow/commands/trace.d.ts +4 -2
  262. package/dist/functions/workflow/commands/trace.js +22 -1
  263. package/dist/functions/workflow/commands/trace.js.map +1 -1
  264. package/dist/functions/workflow/commands/undeploy.js +3 -1
  265. package/dist/functions/workflow/commands/undeploy.js.map +1 -1
  266. package/dist/functions/workflow/commands/validate.d.ts +2 -0
  267. package/dist/functions/workflow/commands/validate.js +16 -2
  268. package/dist/functions/workflow/commands/validate.js.map +1 -1
  269. package/dist/functions/workflow/resolve-runner.d.ts +17 -0
  270. package/dist/functions/workflow/resolve-runner.js +41 -0
  271. package/dist/functions/workflow/resolve-runner.js.map +1 -0
  272. package/dist/functions/workflow/run-failure.d.ts +11 -0
  273. package/dist/functions/workflow/run-failure.js +74 -0
  274. package/dist/functions/workflow/run-failure.js.map +1 -0
  275. package/dist/functions/workflow/runner-health.d.ts +16 -0
  276. package/dist/functions/workflow/runner-health.js +36 -0
  277. package/dist/functions/workflow/runner-health.js.map +1 -0
  278. package/dist/functions/workflow/script-lint.d.ts +10 -0
  279. package/dist/functions/workflow/script-lint.js +513 -0
  280. package/dist/functions/workflow/script-lint.js.map +1 -0
  281. package/dist/functions/workflow/template-io.js +1 -1
  282. package/dist/functions/workflow/template-io.js.map +1 -1
  283. package/dist/functions/workflow/trace.js.map +1 -1
  284. package/dist/functions/workflow/types.d.ts +11 -2
  285. package/dist/functions/workflow/types.js +4 -0
  286. package/dist/functions/workflow/types.js.map +1 -1
  287. package/dist/functions/workflow/validate.js +4 -1
  288. package/dist/functions/workflow/validate.js.map +1 -1
  289. package/dist/functions/workflow/wait-for-swap.d.ts +24 -1
  290. package/dist/functions/workflow/wait-for-swap.js +58 -0
  291. package/dist/functions/workflow/wait-for-swap.js.map +1 -1
  292. package/dist/functions/workflow/workflow-api.js +3 -1
  293. package/dist/functions/workflow/workflow-api.js.map +1 -1
  294. package/dist/index.js +6 -3
  295. package/dist/index.js.map +1 -1
  296. package/files/common/.env.example +4 -0
  297. package/files/common/_gitignore +3 -1
  298. package/files/dev-server/index.html +2 -1
  299. package/package.json +45 -42
  300. package/dist/functions/serve/guards/apiKey.guard.d.ts +0 -4
  301. package/dist/functions/serve/guards/apiKey.guard.js +0 -23
  302. package/dist/functions/serve/guards/apiKey.guard.js.map +0 -1
@@ -0,0 +1,88 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.PathScopeError = void 0;
4
+ exports.resolveInScope = resolveInScope;
5
+ exports.fileApiBlockReason = fileApiBlockReason;
6
+ const fs_1 = require("fs");
7
+ const path_1 = require("path");
8
+ class PathScopeError extends Error {
9
+ constructor(message) {
10
+ super(message);
11
+ this.name = 'PathScopeError';
12
+ }
13
+ }
14
+ exports.PathScopeError = PathScopeError;
15
+ function resolveInScope(baseDir, requested) {
16
+ if (typeof requested !== 'string') {
17
+ throw new PathScopeError('path must be a string');
18
+ }
19
+ if (requested.includes('\0')) {
20
+ throw new PathScopeError('path must not contain NUL bytes');
21
+ }
22
+ if ((0, path_1.isAbsolute)(requested) || path_1.win32.isAbsolute(requested) || /^[a-zA-Z]:/.test(requested)) {
23
+ throw new PathScopeError(`absolute paths are not allowed: ${requested}`);
24
+ }
25
+ if (requested.split(/[\\/]/).includes('..')) {
26
+ throw new PathScopeError(`".." segments are not allowed: ${requested}`);
27
+ }
28
+ const base = (0, path_1.resolve)(baseDir);
29
+ const target = (0, path_1.resolve)(base, requested);
30
+ if (!isStrictlyInside(base, target)) {
31
+ throw new PathScopeError(`path must point inside the served folder: ${requested}`);
32
+ }
33
+ if (!isStrictlyInside(realpathOfNearestExisting(base), realpathOfNearestExisting(target))) {
34
+ throw new PathScopeError(`path leads outside the served folder through a symlink: ${requested}`);
35
+ }
36
+ return target;
37
+ }
38
+ function fileApiBlockReason(workspaceRoot, baseFolder) {
39
+ const root = realpathOrSelf((0, path_1.resolve)(workspaceRoot));
40
+ const base = realpathOrSelf((0, path_1.resolve)(baseFolder));
41
+ if (root !== base && !isStrictlyInside(base, root)) {
42
+ return null;
43
+ }
44
+ return (`The file API is disabled: baseFolder "${(0, path_1.relative)(workspaceRoot, baseFolder) || '.'}" contains the workspace ` +
45
+ 'root with dcupl.config.json and dcupl.secrets.json. Point baseFolder in dcupl.config.json at a subfolder ' +
46
+ 'such as "dcupl" and restart dcupl serve.');
47
+ }
48
+ function realpathOrSelf(path) {
49
+ try {
50
+ return fs_1.realpathSync.native(path);
51
+ }
52
+ catch {
53
+ return path;
54
+ }
55
+ }
56
+ function isStrictlyInside(parent, child) {
57
+ const rel = (0, path_1.relative)(parent, child);
58
+ return rel !== '' && rel !== '..' && !rel.startsWith(`..${path_1.sep}`) && !(0, path_1.isAbsolute)(rel);
59
+ }
60
+ function realpathOfNearestExisting(path) {
61
+ const missing = [];
62
+ let current = path;
63
+ while (!entryExists(current)) {
64
+ const parent = (0, path_1.dirname)(current);
65
+ if (parent === current)
66
+ break;
67
+ missing.unshift((0, path_1.basename)(current));
68
+ current = parent;
69
+ }
70
+ try {
71
+ return (0, path_1.join)(fs_1.realpathSync.native(current), ...missing);
72
+ }
73
+ catch {
74
+ throw new PathScopeError(`path leads through a broken symlink: ${path}`);
75
+ }
76
+ }
77
+ function entryExists(path) {
78
+ try {
79
+ (0, fs_1.lstatSync)(path);
80
+ return true;
81
+ }
82
+ catch (err) {
83
+ if (err?.code === 'ENOENT' || err?.code === 'ENOTDIR')
84
+ return false;
85
+ throw err;
86
+ }
87
+ }
88
+ //# sourceMappingURL=path-scope.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"path-scope.js","sourceRoot":"","sources":["../../../../src/functions/serve/dev-server/path-scope.ts"],"names":[],"mappings":";;;AAiBA,wCAuBC;AAMD,gDAWC;AAzDD,2BAA6C;AAC7C,+BAA0F;AAG1F,MAAa,cAAe,SAAQ,KAAK;IACvC,YAAY,OAAe;QACzB,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,gBAAgB,CAAC;IAC/B,CAAC;CACF;AALD,wCAKC;AAQD,SAAgB,cAAc,CAAC,OAAe,EAAE,SAAkB;IAChE,IAAI,OAAO,SAAS,KAAK,QAAQ,EAAE,CAAC;QAClC,MAAM,IAAI,cAAc,CAAC,uBAAuB,CAAC,CAAC;IACpD,CAAC;IACD,IAAI,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;QAC7B,MAAM,IAAI,cAAc,CAAC,iCAAiC,CAAC,CAAC;IAC9D,CAAC;IACD,IAAI,IAAA,iBAAU,EAAC,SAAS,CAAC,IAAI,YAAK,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC;QACzF,MAAM,IAAI,cAAc,CAAC,mCAAmC,SAAS,EAAE,CAAC,CAAC;IAC3E,CAAC;IACD,IAAI,SAAS,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;QAC5C,MAAM,IAAI,cAAc,CAAC,kCAAkC,SAAS,EAAE,CAAC,CAAC;IAC1E,CAAC;IAED,MAAM,IAAI,GAAG,IAAA,cAAO,EAAC,OAAO,CAAC,CAAC;IAC9B,MAAM,MAAM,GAAG,IAAA,cAAO,EAAC,IAAI,EAAE,SAAS,CAAC,CAAC;IACxC,IAAI,CAAC,gBAAgB,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,CAAC;QACpC,MAAM,IAAI,cAAc,CAAC,6CAA6C,SAAS,EAAE,CAAC,CAAC;IACrF,CAAC;IACD,IAAI,CAAC,gBAAgB,CAAC,yBAAyB,CAAC,IAAI,CAAC,EAAE,yBAAyB,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC;QAC1F,MAAM,IAAI,cAAc,CAAC,2DAA2D,SAAS,EAAE,CAAC,CAAC;IACnG,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAMD,SAAgB,kBAAkB,CAAC,aAAqB,EAAE,UAAkB;IAC1E,MAAM,IAAI,GAAG,cAAc,CAAC,IAAA,cAAO,EAAC,aAAa,CAAC,CAAC,CAAC;IACpD,MAAM,IAAI,GAAG,cAAc,CAAC,IAAA,cAAO,EAAC,UAAU,CAAC,CAAC,CAAC;IACjD,IAAI,IAAI,KAAK,IAAI,IAAI,CAAC,gBAAgB,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,CAAC;QACnD,OAAO,IAAI,CAAC;IACd,CAAC;IACD,OAAO,CACL,yCAAyC,IAAA,eAAQ,EAAC,aAAa,EAAE,UAAU,CAAC,IAAI,GAAG,2BAA2B;QAC9G,2GAA2G;QAC3G,0CAA0C,CAC3C,CAAC;AACJ,CAAC;AAED,SAAS,cAAc,CAAC,IAAY;IAClC,IAAI,CAAC;QACH,OAAO,iBAAY,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACnC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED,SAAS,gBAAgB,CAAC,MAAc,EAAE,KAAa;IACrD,MAAM,GAAG,GAAG,IAAA,eAAQ,EAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IACpC,OAAO,GAAG,KAAK,EAAE,IAAI,GAAG,KAAK,IAAI,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,KAAK,UAAG,EAAE,CAAC,IAAI,CAAC,IAAA,iBAAU,EAAC,GAAG,CAAC,CAAC;AACvF,CAAC;AAMD,SAAS,yBAAyB,CAAC,IAAY;IAC7C,MAAM,OAAO,GAAa,EAAE,CAAC;IAC7B,IAAI,OAAO,GAAG,IAAI,CAAC;IACnB,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE,CAAC;QAC7B,MAAM,MAAM,GAAG,IAAA,cAAO,EAAC,OAAO,CAAC,CAAC;QAChC,IAAI,MAAM,KAAK,OAAO;YAAE,MAAM;QAC9B,OAAO,CAAC,OAAO,CAAC,IAAA,eAAQ,EAAC,OAAO,CAAC,CAAC,CAAC;QACnC,OAAO,GAAG,MAAM,CAAC;IACnB,CAAC;IACD,IAAI,CAAC;QACH,OAAO,IAAA,WAAI,EAAC,iBAAY,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,GAAG,OAAO,CAAC,CAAC;IACxD,CAAC;IAAC,MAAM,CAAC;QAEP,MAAM,IAAI,cAAc,CAAC,wCAAwC,IAAI,EAAE,CAAC,CAAC;IAC3E,CAAC;AACH,CAAC;AAED,SAAS,WAAW,CAAC,IAAY;IAC/B,IAAI,CAAC;QACH,IAAA,cAAS,EAAC,IAAI,CAAC,CAAC;QAChB,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,OAAO,GAAQ,EAAE,CAAC;QAClB,IAAI,GAAG,EAAE,IAAI,KAAK,QAAQ,IAAI,GAAG,EAAE,IAAI,KAAK,SAAS;YAAE,OAAO,KAAK,CAAC;QACpE,MAAM,GAAG,CAAC;IACZ,CAAC;AACH,CAAC"}
@@ -0,0 +1,34 @@
1
+ export declare const DEFAULT_SERVE_HOST = "127.0.0.1";
2
+ export declare const SERVE_TOKEN_HEADER = "x-dcupl-serve-token";
3
+ export declare const DCUPL_CONSOLE_ORIGINS: readonly string[];
4
+ export type DevServerSecurity = {
5
+ token: string;
6
+ allowedHosts: string[];
7
+ trustedOrigins: string[];
8
+ };
9
+ export type DevServerAccessLevel = 'read' | 'edit' | 'admin';
10
+ export type AccessRequest = {
11
+ origin?: string;
12
+ token?: unknown;
13
+ remoteAddress?: string;
14
+ proxied?: boolean;
15
+ };
16
+ export type AccessDecision = {
17
+ allowed: true;
18
+ } | {
19
+ allowed: false;
20
+ reason: string;
21
+ };
22
+ export declare function resolveServeHost(flag: string | string[] | undefined): string;
23
+ export declare function parseAllowedOrigins(values: unknown): string[];
24
+ export declare function isLoopbackAddress(address: string): boolean;
25
+ export declare function isAllowedHost(hostHeader: string | undefined, allowedHosts: readonly string[]): boolean;
26
+ export declare function isTrustedOrigin(origin: string, trustedOrigins: readonly string[]): boolean;
27
+ export declare function isProxiedRequest(headers: Record<string, unknown>): boolean;
28
+ export declare function createServeToken(): string;
29
+ export declare function tokenMatches(expected: string, provided: unknown): boolean;
30
+ export declare function admitRequest(request: {
31
+ host?: string;
32
+ origin?: string;
33
+ }, security: DevServerSecurity): string | null;
34
+ export declare function authorizeRequest(level: DevServerAccessLevel, request: AccessRequest, security: DevServerSecurity): AccessDecision;
@@ -0,0 +1,145 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.DCUPL_CONSOLE_ORIGINS = exports.SERVE_TOKEN_HEADER = exports.DEFAULT_SERVE_HOST = void 0;
4
+ exports.resolveServeHost = resolveServeHost;
5
+ exports.parseAllowedOrigins = parseAllowedOrigins;
6
+ exports.isLoopbackAddress = isLoopbackAddress;
7
+ exports.isAllowedHost = isAllowedHost;
8
+ exports.isTrustedOrigin = isTrustedOrigin;
9
+ exports.isProxiedRequest = isProxiedRequest;
10
+ exports.createServeToken = createServeToken;
11
+ exports.tokenMatches = tokenMatches;
12
+ exports.admitRequest = admitRequest;
13
+ exports.authorizeRequest = authorizeRequest;
14
+ const crypto_1 = require("crypto");
15
+ const net_1 = require("net");
16
+ exports.DEFAULT_SERVE_HOST = '127.0.0.1';
17
+ const ALL_INTERFACES = '0.0.0.0';
18
+ exports.SERVE_TOKEN_HEADER = 'x-dcupl-serve-token';
19
+ exports.DCUPL_CONSOLE_ORIGINS = [
20
+ 'https://console.dcupl.com',
21
+ 'https://next.console.dcupl.com',
22
+ 'https://dev.console.dcupl.com',
23
+ ];
24
+ function resolveServeHost(flag) {
25
+ const value = Array.isArray(flag) ? flag[flag.length - 1] : flag;
26
+ if (value === undefined)
27
+ return exports.DEFAULT_SERVE_HOST;
28
+ const host = String(value).trim();
29
+ if (host === '')
30
+ return ALL_INTERFACES;
31
+ return host.toLowerCase() === 'localhost' ? exports.DEFAULT_SERVE_HOST : host;
32
+ }
33
+ function parseAllowedOrigins(values) {
34
+ const list = values === undefined ? [] : Array.isArray(values) ? values : [values];
35
+ return list.map((value) => {
36
+ const url = parseHttpUrl(String(value));
37
+ if (!url) {
38
+ throw new Error(`Invalid --allow-origin "${value}": expected an http(s) origin such as https://app.example.com`);
39
+ }
40
+ return url.origin;
41
+ });
42
+ }
43
+ function isLoopbackAddress(address) {
44
+ const ip = address.toLowerCase().replace(/^::ffff:/, '');
45
+ return ip === '::1' || ((0, net_1.isIP)(ip) === 4 && ip.startsWith('127.'));
46
+ }
47
+ function isAllowedHost(hostHeader, allowedHosts) {
48
+ if (hostHeader === undefined)
49
+ return true;
50
+ if (/[\s@/?#\\]/.test(hostHeader))
51
+ return false;
52
+ const hostname = hostnameOf(`http://${hostHeader}`);
53
+ if (!hostname)
54
+ return false;
55
+ return ((0, net_1.isIP)(hostname) !== 0 ||
56
+ isLocalhostName(hostname) ||
57
+ allowedHosts.some((allowed) => normalizeHostName(allowed) === hostname));
58
+ }
59
+ function isTrustedOrigin(origin, trustedOrigins) {
60
+ const url = parseHttpUrl(origin);
61
+ if (!url)
62
+ return false;
63
+ const hostname = hostnameOf(url.href);
64
+ if (isLocalhostName(hostname) || ((0, net_1.isIP)(hostname) !== 0 && isLoopbackAddress(hostname)))
65
+ return true;
66
+ return exports.DCUPL_CONSOLE_ORIGINS.includes(url.origin) || trustedOrigins.includes(url.origin);
67
+ }
68
+ function isEditorOrigin(origin, trustedOrigins) {
69
+ const url = parseHttpUrl(origin);
70
+ return !!url && (exports.DCUPL_CONSOLE_ORIGINS.includes(url.origin) || trustedOrigins.includes(url.origin));
71
+ }
72
+ function isProxiedRequest(headers) {
73
+ return ['forwarded', 'x-forwarded-for', 'x-real-ip'].some((name) => headers[name] !== undefined);
74
+ }
75
+ function createServeToken() {
76
+ return (0, crypto_1.randomBytes)(32).toString('hex');
77
+ }
78
+ function tokenMatches(expected, provided) {
79
+ if (typeof provided !== 'string' || provided.length === 0)
80
+ return false;
81
+ const a = Buffer.from(expected);
82
+ const b = Buffer.from(provided);
83
+ return a.length === b.length && (0, crypto_1.timingSafeEqual)(a, b);
84
+ }
85
+ function admitRequest(request, security) {
86
+ if (!isAllowedHost(request.host, security.allowedHosts)) {
87
+ return `Blocked request: host "${request.host}" is not allowed. dcupl serve accepts localhost, IP addresses and the --host name.`;
88
+ }
89
+ const { origin } = request;
90
+ if (origin === undefined || isTrustedOrigin(origin, security.trustedOrigins) || isSameOrigin(origin, request.host)) {
91
+ return null;
92
+ }
93
+ return `Blocked request: origin "${origin}" is not allowed. Trust it with dcupl serve --allow-origin <origin>.`;
94
+ }
95
+ function authorizeRequest(level, request, security) {
96
+ if (level === 'read' || tokenMatches(security.token, request.token)) {
97
+ return { allowed: true };
98
+ }
99
+ if (level === 'edit') {
100
+ const fromThisMachine = !request.proxied && request.remoteAddress !== undefined && isLoopbackAddress(request.remoteAddress);
101
+ if (fromThisMachine && request.origin !== undefined && isEditorOrigin(request.origin, security.trustedOrigins)) {
102
+ return { allowed: true };
103
+ }
104
+ return {
105
+ allowed: false,
106
+ reason: `File edits need the token printed by dcupl serve, sent in the ${exports.SERVE_TOKEN_HEADER} header. ` +
107
+ 'Without it, only the dcupl Console and --allow-origin origins can edit, from this machine.',
108
+ };
109
+ }
110
+ return {
111
+ allowed: false,
112
+ reason: `This endpoint needs the token printed by dcupl serve, sent in the ${exports.SERVE_TOKEN_HEADER} header.`,
113
+ };
114
+ }
115
+ function isSameOrigin(origin, host) {
116
+ const url = parseHttpUrl(origin);
117
+ return !!url && !!host && url.host === host.toLowerCase();
118
+ }
119
+ function isLocalhostName(hostname) {
120
+ return hostname === 'localhost' || hostname.endsWith('.localhost');
121
+ }
122
+ function parseHttpUrl(value) {
123
+ try {
124
+ const url = new URL(value);
125
+ return url.protocol === 'http:' || url.protocol === 'https:' ? url : null;
126
+ }
127
+ catch {
128
+ return null;
129
+ }
130
+ }
131
+ function hostnameOf(href) {
132
+ try {
133
+ return normalizeHostName(new URL(href).hostname);
134
+ }
135
+ catch {
136
+ return null;
137
+ }
138
+ }
139
+ function normalizeHostName(name) {
140
+ return name
141
+ .toLowerCase()
142
+ .replace(/^\[(.*)\]$/, '$1')
143
+ .replace(/\.$/, '');
144
+ }
145
+ //# sourceMappingURL=request-security.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"request-security.js","sourceRoot":"","sources":["../../../../src/functions/serve/dev-server/request-security.ts"],"names":[],"mappings":"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"}
@@ -1,6 +1,19 @@
1
+ import { AddressInfo } from 'net';
2
+ import { INestApplication, NestApplicationOptions } from '@nestjs/common';
3
+ import { DevServerOptions } from './dev-server/dev-server.options';
1
4
  export type DcuplServeOptions = {
2
5
  path: string;
3
6
  port: string;
7
+ host?: string | string[];
8
+ allowOrigin?: string | string[];
4
9
  openBrowser?: boolean;
5
10
  };
11
+ export type DevServerAppOptions = DevServerOptions & {
12
+ nestOptions?: NestApplicationOptions;
13
+ };
14
+ export declare function createDevServerApp(options: DevServerAppOptions): Promise<INestApplication>;
15
+ export declare function listenDevServer(app: INestApplication, listen: {
16
+ port: number | string;
17
+ host?: string;
18
+ }): Promise<AddressInfo>;
6
19
  export declare function bootstrap(argv: DcuplServeOptions): Promise<void>;
@@ -1,5 +1,7 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.createDevServerApp = createDevServerApp;
4
+ exports.listenDevServer = listenDevServer;
3
5
  exports.bootstrap = bootstrap;
4
6
  const tslib_1 = require("tslib");
5
7
  const core_1 = require("@nestjs/core");
@@ -8,10 +10,14 @@ const kleur_1 = require("kleur");
8
10
  const path_1 = require("path");
9
11
  const serve_self_register_1 = require("./serve-self-register");
10
12
  const express_1 = require("express");
13
+ const net_1 = require("net");
11
14
  const serve_favicon_1 = tslib_1.__importDefault(require("serve-favicon"));
12
15
  const compression_1 = tslib_1.__importDefault(require("compression"));
13
16
  const config_helper_1 = require("../helper/config.helper");
17
+ const credentials_helper_1 = require("../helper/credentials.helper");
14
18
  const fs_extra_1 = require("fs-extra");
19
+ const path_scope_1 = require("./dev-server/path-scope");
20
+ const request_security_1 = require("./dev-server/request-security");
15
21
  async function openBrowser(url) {
16
22
  try {
17
23
  const open = await import('open');
@@ -26,23 +32,68 @@ function initStartScreen(app) {
26
32
  app.getHttpAdapter().get('', (req, res) => {
27
33
  const codeBasePath = (0, path_1.resolve)(__dirname, '../../..');
28
34
  const filesBasePath = (0, path_1.join)(codeBasePath, 'files');
29
- return res.sendFile((0, path_1.join)(filesBasePath, 'dev-server', 'index.html'));
35
+ return res.sendFile((0, path_1.join)('dev-server', 'index.html'), { root: filesBasePath });
30
36
  });
31
37
  }
38
+ async function createDevServerApp(options) {
39
+ const { nestOptions, ...serverOptions } = options;
40
+ const { security } = serverOptions;
41
+ const app = await core_1.NestFactory.create(dev_server_module_1.DevServerModule.register(serverOptions), nestOptions);
42
+ app.setGlobalPrefix('api');
43
+ app.use((req, res, next) => {
44
+ const rejection = (0, request_security_1.admitRequest)({ host: req.headers.host, origin: req.headers.origin }, security);
45
+ if (rejection) {
46
+ res.status(403).json({ statusCode: 403, error: 'Forbidden', message: rejection });
47
+ return;
48
+ }
49
+ next();
50
+ });
51
+ app.enableCors((req, callback) => {
52
+ const origin = req.headers.origin;
53
+ const allowed = origin !== undefined && (0, request_security_1.admitRequest)({ host: req.headers.host, origin }, security) === null;
54
+ callback(null, { origin: allowed ? origin : false, exposedHeaders: ['Content-Range'] });
55
+ });
56
+ app.use((0, compression_1.default)());
57
+ app.use((0, express_1.json)({ limit: '50mb' }));
58
+ app.use((0, serve_favicon_1.default)((0, path_1.join)(__dirname, '../../../', 'files', 'dev-server', 'favicon.ico')));
59
+ initStartScreen(app);
60
+ return app;
61
+ }
62
+ async function listenDevServer(app, listen) {
63
+ await app.listen(listen.port, listen.host ?? request_security_1.DEFAULT_SERVE_HOST);
64
+ return app.getHttpServer().address();
65
+ }
66
+ function browsableHost(address) {
67
+ const { address: ip, family } = address;
68
+ if ((0, request_security_1.isLoopbackAddress)(ip) || ip === '0.0.0.0' || ip === '::')
69
+ return 'localhost';
70
+ return family === 'IPv6' ? `[${ip}]` : ip;
71
+ }
32
72
  async function bootstrap(argv) {
33
73
  const port = argv.port;
34
74
  const servePath = argv.path;
35
- global.servePath = servePath;
75
+ const host = (0, request_security_1.resolveServeHost)(argv.host);
76
+ let trustedOrigins;
77
+ try {
78
+ trustedOrigins = (0, request_security_1.parseAllowedOrigins)(argv.allowOrigin);
79
+ }
80
+ catch (err) {
81
+ console.log('');
82
+ console.log((0, kleur_1.bold)((0, kleur_1.red)(err.message)));
83
+ console.log('');
84
+ process.exitCode = 1;
85
+ return;
86
+ }
36
87
  const currentBasePath = (0, path_1.join)(process.cwd());
37
- const cliConfig = (0, config_helper_1.getConfigFileValue)(currentBasePath);
38
- const secrets = (0, config_helper_1.getSecretFileValue)(currentBasePath);
88
+ const cliConfig = (0, config_helper_1.getConfigFileValue)(currentBasePath, undefined, { quiet: true });
89
+ const { apiKey, projectId } = (0, credentials_helper_1.resolveCredentials)(currentBasePath);
39
90
  if (!cliConfig) {
40
91
  console.log('');
41
92
  console.log(`Make sure to have a valid ${(0, kleur_1.bold)((0, kleur_1.blue)('dcupl.config.json'))} file present in your local workspace.`);
42
93
  console.log('');
43
94
  return;
44
95
  }
45
- if (!cliConfig?.projectId || !secrets?.apiKey) {
96
+ if (!projectId.value || !apiKey.value) {
46
97
  console.log('');
47
98
  console.log((0, kleur_1.gray)('ℹ️ Running locally without a configured projectId/apiKey — that is expected.'));
48
99
  console.log((0, kleur_1.gray)(' They are only needed for cloud sync via `dcupl files`.'));
@@ -60,16 +111,21 @@ async function bootstrap(argv) {
60
111
  cert: (0, fs_extra_1.readFileSync)(certPath),
61
112
  };
62
113
  }
63
- let app;
64
- app = await core_1.NestFactory.create(dev_server_module_1.DevServerModule, nestOptions);
65
- app.setGlobalPrefix('api');
66
- app.enableCors({ exposedHeaders: ['Content-Range'] });
67
- app.use((0, compression_1.default)());
68
- app.use((0, express_1.json)({ limit: '50mb' }));
69
- app.use((0, serve_favicon_1.default)((0, path_1.join)(__dirname, '../../../', 'files', 'dev-server', 'favicon.ico')));
70
- initStartScreen(app);
114
+ const security = {
115
+ token: (0, request_security_1.createServeToken)(),
116
+ allowedHosts: (0, net_1.isIP)(host) ? [] : [host],
117
+ trustedOrigins,
118
+ };
119
+ const baseFolder = (0, path_1.resolve)(currentBasePath, cliConfig.baseFolder || 'dcupl');
120
+ const app = await createDevServerApp({
121
+ workspaceRoot: currentBasePath,
122
+ servePath,
123
+ baseFolder,
124
+ security,
125
+ nestOptions,
126
+ });
71
127
  try {
72
- await app.listen(port);
128
+ const address = await listenDevServer(app, { port, host });
73
129
  const actualPort = Number(port);
74
130
  const loaderRel = cliConfig?.loaderPath ?? 'dcupl/dcupl.lc.json';
75
131
  const loaderAbs = (0, path_1.resolve)(currentBasePath, loaderRel);
@@ -77,13 +133,16 @@ async function bootstrap(argv) {
77
133
  port: actualPort,
78
134
  cwd: currentBasePath,
79
135
  loaderPath: loaderAbs,
80
- projectId: cliConfig?.projectId,
136
+ projectId: projectId.value,
81
137
  });
82
- const onExit = () => { cleanup(); process.exit(0); };
138
+ const onExit = () => {
139
+ cleanup();
140
+ process.exit(0);
141
+ };
83
142
  process.on('SIGTERM', onExit);
84
143
  process.on('SIGINT', onExit);
85
144
  process.on('beforeExit', () => cleanup());
86
- const serverUrl = isHttps ? `https://localhost:${port}` : `http://localhost:${port}`;
145
+ const serverUrl = `${isHttps ? 'https' : 'http'}://${browsableHost(address)}:${port}`;
87
146
  console.log('');
88
147
  console.log('');
89
148
  console.log((0, kleur_1.blue)('##################################################################'));
@@ -92,6 +151,20 @@ async function bootstrap(argv) {
92
151
  console.log((0, kleur_1.blue)('## ##'));
93
152
  console.log((0, kleur_1.blue)('##################################################################'));
94
153
  console.log('');
154
+ if ((0, request_security_1.isLoopbackAddress)(address.address)) {
155
+ console.log((0, kleur_1.gray)('Only this machine can connect. Use --host to let other machines on your network connect.'));
156
+ }
157
+ else {
158
+ console.log((0, kleur_1.bold)((0, kleur_1.yellow)(`⚠ Listening on ${host}: other machines on your network can connect.`)));
159
+ console.log((0, kleur_1.bold)((0, kleur_1.yellow)(' They can read your files; editing them needs the token below.')));
160
+ }
161
+ console.log((0, kleur_1.gray)(`File-edit token (${request_security_1.SERVE_TOKEN_HEADER} header): ${security.token}`));
162
+ console.log((0, kleur_1.gray)('Without it, only the dcupl Console and --allow-origin origins can edit files, from this machine.'));
163
+ const fileApiBlocked = (0, path_scope_1.fileApiBlockReason)(currentBasePath, baseFolder);
164
+ if (fileApiBlocked) {
165
+ console.log((0, kleur_1.bold)((0, kleur_1.yellow)(`⚠ ${fileApiBlocked}`)));
166
+ }
167
+ console.log('');
95
168
  console.log('');
96
169
  const autoSpawned = process.env.DCUPL_SERVE_AUTO_SPAWNED === '1';
97
170
  const shouldOpenBrowser = !autoSpawned && (argv.openBrowser ?? cliConfig.openBrowser ?? true);
@@ -1 +1 @@
1
- {"version":3,"file":"main.js","sourceRoot":"","sources":["../../../src/functions/serve/main.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"main.js","sourceRoot":"","sources":["../../../src/functions/serve/main.ts"],"names":[],"mappings":"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"}
@@ -24,7 +24,8 @@ function registerServe(opts) {
24
24
  try {
25
25
  (0, serve_registry_js_1.removeServeEntry)(opts.port, serveDir);
26
26
  }
27
- catch { }
27
+ catch {
28
+ }
28
29
  };
29
30
  }
30
31
  //# sourceMappingURL=serve-self-register.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"serve-self-register.js","sourceRoot":"","sources":["../../../src/functions/serve/serve-self-register.ts"],"names":[],"mappings":";;AAqBA,sCAqBC;AA1CD,yEAI2C;AAC3C,mEAAgE;AAgBhE,SAAgB,aAAa,CAAC,IAA0B;IACtD,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,IAAI,8CAA0B,CAAC;IAC7D,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,wBAAwB,KAAK,GAAG,CAAC;IACjE,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,IAAA,+BAAc,EAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAEjF,IAAA,mCAAe,EAAC;QACd,IAAI,EAAE,IAAI,CAAC,IAAI;QACf,GAAG,EAAE,IAAI,CAAC,GAAG;QACb,GAAG,EAAE,OAAO,CAAC,GAAG;QAChB,WAAW;QACX,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;QACnC,SAAS,EAAE,IAAI,CAAC,SAAS;QACzB,UAAU;KACX,EAAE,QAAQ,CAAC,CAAC;IAEb,IAAI,OAAO,GAAG,KAAK,CAAC;IACpB,OAAO,GAAS,EAAE;QAChB,IAAI,OAAO;YAAE,OAAO;QACpB,OAAO,GAAG,IAAI,CAAC;QACf,IAAI,CAAC;YAAC,IAAA,oCAAgB,EAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QAAC,CAAC;QAAC,MAAM,CAAC,CAAc,CAAC;IACvE,CAAC,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"serve-self-register.js","sourceRoot":"","sources":["../../../src/functions/serve/serve-self-register.ts"],"names":[],"mappings":";;AAiBA,sCA4BC;AA7CD,yEAAkH;AAClH,mEAAgE;AAgBhE,SAAgB,aAAa,CAAC,IAA0B;IACtD,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,IAAI,8CAA0B,CAAC;IAC7D,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,wBAAwB,KAAK,GAAG,CAAC;IACjE,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,IAAA,+BAAc,EAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAEjF,IAAA,mCAAe,EACb;QACE,IAAI,EAAE,IAAI,CAAC,IAAI;QACf,GAAG,EAAE,IAAI,CAAC,GAAG;QACb,GAAG,EAAE,OAAO,CAAC,GAAG;QAChB,WAAW;QACX,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;QACnC,SAAS,EAAE,IAAI,CAAC,SAAS;QACzB,UAAU;KACX,EACD,QAAQ,CACT,CAAC;IAEF,IAAI,OAAO,GAAG,KAAK,CAAC;IACpB,OAAO,GAAS,EAAE;QAChB,IAAI,OAAO;YAAE,OAAO;QACpB,OAAO,GAAG,IAAI,CAAC;QACf,IAAI,CAAC;YACH,IAAA,oCAAgB,EAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QACxC,CAAC;QAAC,MAAM,CAAC;QAET,CAAC;IACH,CAAC,CAAC;AACJ,CAAC"}
@@ -3,15 +3,26 @@ export declare const DCUPL_PACKAGES: readonly ["@dcupl/core", "@dcupl/common", "
3
3
  export type VersionInfo = {
4
4
  version: string;
5
5
  dcupl: Record<string, string>;
6
+ latestVersion?: string;
7
+ updateAvailable?: boolean;
8
+ updateCommand?: string;
6
9
  };
7
10
  export type CliPackage = {
8
11
  version?: string;
9
12
  dependencies?: Record<string, string>;
10
13
  };
14
+ export type DistTags = Record<string, string>;
15
+ export type UpdateCheck = {
16
+ latestVersion?: string;
17
+ updateAvailable: boolean;
18
+ updateCommand?: string;
19
+ };
11
20
  export type VersionDeps = {
12
21
  readCliPackage?: () => CliPackage;
13
22
  resolvePackageVersion?: (pkg: string) => string | undefined;
23
+ fetchDistTags?: () => Promise<DistTags | undefined>;
14
24
  };
25
+ export declare function computeUpdate(installed: string, distTags: DistTags | undefined): UpdateCheck;
15
26
  export declare function collectVersionInfo(deps?: VersionDeps): VersionInfo;
16
27
  export declare function formatVersion(info: VersionInfo): string;
17
- export declare function versionCommand(output: Output, deps?: VersionDeps): void;
28
+ export declare function versionCommand(output: Output, deps?: VersionDeps): Promise<void>;
@@ -1,18 +1,17 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.DCUPL_PACKAGES = void 0;
4
+ exports.computeUpdate = computeUpdate;
4
5
  exports.collectVersionInfo = collectVersionInfo;
5
6
  exports.formatVersion = formatVersion;
6
7
  exports.versionCommand = versionCommand;
7
8
  const tslib_1 = require("tslib");
8
9
  const fs = tslib_1.__importStar(require("fs"));
9
10
  const path = tslib_1.__importStar(require("path"));
10
- exports.DCUPL_PACKAGES = [
11
- '@dcupl/core',
12
- '@dcupl/common',
13
- '@dcupl/common-internal',
14
- '@dcupl/loader',
15
- ];
11
+ const semver_1 = tslib_1.__importDefault(require("semver"));
12
+ const CLI_PACKAGE = '@dcupl/cli';
13
+ const REGISTRY_TIMEOUT_MS = 1500;
14
+ exports.DCUPL_PACKAGES = ['@dcupl/core', '@dcupl/common', '@dcupl/common-internal', '@dcupl/loader'];
16
15
  function repoRoot() {
17
16
  return path.join(__dirname, '../../..');
18
17
  }
@@ -28,6 +27,44 @@ function defaultResolvePackageVersion(pkg) {
28
27
  return undefined;
29
28
  }
30
29
  }
30
+ async function defaultFetchDistTags() {
31
+ const controller = new AbortController();
32
+ const timer = setTimeout(() => controller.abort(), REGISTRY_TIMEOUT_MS);
33
+ try {
34
+ const res = await fetch(`https://registry.npmjs.org/${CLI_PACKAGE}`, {
35
+ signal: controller.signal,
36
+ headers: { accept: 'application/json' },
37
+ });
38
+ if (!res.ok)
39
+ return undefined;
40
+ const body = (await res.json());
41
+ return body['dist-tags'];
42
+ }
43
+ catch {
44
+ return undefined;
45
+ }
46
+ finally {
47
+ clearTimeout(timer);
48
+ }
49
+ }
50
+ function computeUpdate(installed, distTags) {
51
+ if (!distTags || !semver_1.default.valid(installed))
52
+ return { updateAvailable: false };
53
+ const prerelease = semver_1.default.prerelease(installed);
54
+ const channelId = prerelease && typeof prerelease[0] === 'string' ? prerelease[0] : undefined;
55
+ const tag = channelId && distTags[channelId] ? channelId : 'latest';
56
+ const target = distTags[tag];
57
+ if (!target || !semver_1.default.valid(target))
58
+ return { updateAvailable: false };
59
+ if (!semver_1.default.gt(target, installed)) {
60
+ return { latestVersion: target, updateAvailable: false };
61
+ }
62
+ return {
63
+ latestVersion: target,
64
+ updateAvailable: true,
65
+ updateCommand: `npm i -g ${CLI_PACKAGE}@${tag}`,
66
+ };
67
+ }
31
68
  function collectVersionInfo(deps = {}) {
32
69
  const readCliPackage = deps.readCliPackage ?? defaultReadCliPackage;
33
70
  const resolvePackageVersion = deps.resolvePackageVersion ?? defaultResolvePackageVersion;
@@ -45,10 +82,21 @@ function formatVersion(info) {
45
82
  for (const [name, version] of Object.entries(info.dcupl)) {
46
83
  lines.push(` ${name} ${version}`);
47
84
  }
85
+ if (info.updateAvailable && info.latestVersion) {
86
+ lines.push('');
87
+ lines.push(`Update available: ${info.version} → ${info.latestVersion}`);
88
+ if (info.updateCommand)
89
+ lines.push(`Run \`${info.updateCommand}\` to upgrade.`);
90
+ }
48
91
  return lines.join('\n') + '\n';
49
92
  }
50
- function versionCommand(output, deps = {}) {
93
+ async function versionCommand(output, deps = {}) {
51
94
  const info = collectVersionInfo(deps);
95
+ const fetchDistTags = deps.fetchDistTags ?? defaultFetchDistTags;
96
+ const update = computeUpdate(info.version, await fetchDistTags());
97
+ info.latestVersion = update.latestVersion;
98
+ info.updateAvailable = update.updateAvailable;
99
+ info.updateCommand = update.updateCommand;
52
100
  output.success(output.isJson() ? info : formatVersion(info));
53
101
  }
54
102
  //# sourceMappingURL=command.js.map