alchemy 0.65.1 → 0.67.0

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 (185) hide show
  1. package/bin/alchemy.js +139 -79
  2. package/bin/commands/init.ts +6 -3
  3. package/bin/services/cdp-manager/server.ts +3 -2
  4. package/bin/services/execute-alchemy.ts +33 -3
  5. package/bin/services/find-workspace-root.ts +48 -0
  6. package/lib/alchemy.d.ts +20 -3
  7. package/lib/alchemy.d.ts.map +1 -1
  8. package/lib/alchemy.js +18 -5
  9. package/lib/alchemy.js.map +1 -1
  10. package/lib/apply.d.ts.map +1 -1
  11. package/lib/apply.js +51 -1
  12. package/lib/apply.js.map +1 -1
  13. package/lib/cloudflare/bindings.d.ts +17 -5
  14. package/lib/cloudflare/bindings.d.ts.map +1 -1
  15. package/lib/cloudflare/bindings.js +3 -1
  16. package/lib/cloudflare/bindings.js.map +1 -1
  17. package/lib/cloudflare/bound.d.ts +4 -3
  18. package/lib/cloudflare/bound.d.ts.map +1 -1
  19. package/lib/cloudflare/bucket.js +1 -1
  20. package/lib/cloudflare/bucket.js.map +1 -1
  21. package/lib/cloudflare/bundle/internal-worker-bundle.d.ts +1 -1
  22. package/lib/cloudflare/bundle/internal-worker-bundle.d.ts.map +1 -1
  23. package/lib/cloudflare/bundle/internal-worker-bundle.js.map +1 -1
  24. package/lib/cloudflare/cloudflare-env-proxy.js +3 -3
  25. package/lib/cloudflare/cloudflare-env-proxy.js.map +1 -1
  26. package/lib/cloudflare/compatibility-date.gen.d.ts +1 -1
  27. package/lib/cloudflare/compatibility-date.gen.js +1 -1
  28. package/lib/cloudflare/d1-database.d.ts.map +1 -1
  29. package/lib/cloudflare/d1-database.js +2 -1
  30. package/lib/cloudflare/d1-database.js.map +1 -1
  31. package/lib/cloudflare/d1-local-migrations.d.ts +1 -0
  32. package/lib/cloudflare/d1-local-migrations.d.ts.map +1 -1
  33. package/lib/cloudflare/d1-local-migrations.js +3 -2
  34. package/lib/cloudflare/d1-local-migrations.js.map +1 -1
  35. package/lib/cloudflare/hyperdrive-ref.d.ts +23 -0
  36. package/lib/cloudflare/hyperdrive-ref.d.ts.map +1 -0
  37. package/lib/cloudflare/hyperdrive-ref.js +52 -0
  38. package/lib/cloudflare/hyperdrive-ref.js.map +1 -0
  39. package/lib/cloudflare/index.d.ts +2 -0
  40. package/lib/cloudflare/index.d.ts.map +1 -1
  41. package/lib/cloudflare/index.js +2 -0
  42. package/lib/cloudflare/index.js.map +1 -1
  43. package/lib/cloudflare/kv-namespace.js +1 -1
  44. package/lib/cloudflare/kv-namespace.js.map +1 -1
  45. package/lib/cloudflare/miniflare/build-worker-options.d.ts +2 -1
  46. package/lib/cloudflare/miniflare/build-worker-options.d.ts.map +1 -1
  47. package/lib/cloudflare/miniflare/build-worker-options.js +11 -6
  48. package/lib/cloudflare/miniflare/build-worker-options.js.map +1 -1
  49. package/lib/cloudflare/miniflare/delete.d.ts +3 -2
  50. package/lib/cloudflare/miniflare/delete.d.ts.map +1 -1
  51. package/lib/cloudflare/miniflare/delete.js +13 -12
  52. package/lib/cloudflare/miniflare/delete.js.map +1 -1
  53. package/lib/cloudflare/miniflare/miniflare-controller.d.ts +3 -1
  54. package/lib/cloudflare/miniflare/miniflare-controller.d.ts.map +1 -1
  55. package/lib/cloudflare/miniflare/miniflare-controller.js +29 -13
  56. package/lib/cloudflare/miniflare/miniflare-controller.js.map +1 -1
  57. package/lib/cloudflare/miniflare/miniflare-worker-proxy.d.ts +24 -13
  58. package/lib/cloudflare/miniflare/miniflare-worker-proxy.d.ts.map +1 -1
  59. package/lib/cloudflare/miniflare/miniflare-worker-proxy.js +95 -79
  60. package/lib/cloudflare/miniflare/miniflare-worker-proxy.js.map +1 -1
  61. package/lib/cloudflare/miniflare/paths.d.ts +4 -4
  62. package/lib/cloudflare/miniflare/paths.d.ts.map +1 -1
  63. package/lib/cloudflare/miniflare/paths.js +10 -4
  64. package/lib/cloudflare/miniflare/paths.js.map +1 -1
  65. package/lib/cloudflare/miniflare/symlink-miniflare-state.d.ts +2 -0
  66. package/lib/cloudflare/miniflare/symlink-miniflare-state.d.ts.map +1 -0
  67. package/lib/cloudflare/miniflare/symlink-miniflare-state.js +19 -0
  68. package/lib/cloudflare/miniflare/symlink-miniflare-state.js.map +1 -0
  69. package/lib/cloudflare/miniflare/tunnel.d.ts +18 -0
  70. package/lib/cloudflare/miniflare/tunnel.d.ts.map +1 -0
  71. package/lib/cloudflare/miniflare/tunnel.js +79 -0
  72. package/lib/cloudflare/miniflare/tunnel.js.map +1 -0
  73. package/lib/cloudflare/next.d.ts.map +1 -1
  74. package/lib/cloudflare/next.js +3 -0
  75. package/lib/cloudflare/next.js.map +1 -1
  76. package/lib/cloudflare/nuxt/plugin.d.ts.map +1 -1
  77. package/lib/cloudflare/nuxt/plugin.js +3 -3
  78. package/lib/cloudflare/nuxt/plugin.js.map +1 -1
  79. package/lib/cloudflare/quick-tunnel.d.ts +1 -1
  80. package/lib/cloudflare/redwood/plugin.js +2 -2
  81. package/lib/cloudflare/redwood/plugin.js.map +1 -1
  82. package/lib/cloudflare/secret-ref.d.ts +38 -0
  83. package/lib/cloudflare/secret-ref.d.ts.map +1 -0
  84. package/lib/cloudflare/secret-ref.js +38 -0
  85. package/lib/cloudflare/secret-ref.js.map +1 -0
  86. package/lib/cloudflare/vite/plugin.d.ts.map +1 -1
  87. package/lib/cloudflare/vite/plugin.js +6 -3
  88. package/lib/cloudflare/vite/plugin.js.map +1 -1
  89. package/lib/cloudflare/website.d.ts.map +1 -1
  90. package/lib/cloudflare/website.js +5 -16
  91. package/lib/cloudflare/website.js.map +1 -1
  92. package/lib/cloudflare/worker-metadata.d.ts +1 -1
  93. package/lib/cloudflare/worker-metadata.d.ts.map +1 -1
  94. package/lib/cloudflare/worker-metadata.js +7 -9
  95. package/lib/cloudflare/worker-metadata.js.map +1 -1
  96. package/lib/cloudflare/worker.d.ts +16 -1
  97. package/lib/cloudflare/worker.d.ts.map +1 -1
  98. package/lib/cloudflare/worker.js +16 -2
  99. package/lib/cloudflare/worker.js.map +1 -1
  100. package/lib/cloudflare/wrangler.json.d.ts +2 -1
  101. package/lib/cloudflare/wrangler.json.d.ts.map +1 -1
  102. package/lib/cloudflare/wrangler.json.js +5 -6
  103. package/lib/cloudflare/wrangler.json.js.map +1 -1
  104. package/lib/llms.cloudflare.txt +1 -1
  105. package/lib/scope.d.ts +26 -1
  106. package/lib/scope.d.ts.map +1 -1
  107. package/lib/scope.js +12 -5
  108. package/lib/scope.js.map +1 -1
  109. package/lib/state/file-system-state-store.d.ts.map +1 -1
  110. package/lib/state/file-system-state-store.js +1 -2
  111. package/lib/state/file-system-state-store.js.map +1 -1
  112. package/lib/state/sqlite-state-store.d.ts +11 -0
  113. package/lib/state/sqlite-state-store.d.ts.map +1 -1
  114. package/lib/state/sqlite-state-store.js +22 -14
  115. package/lib/state/sqlite-state-store.js.map +1 -1
  116. package/lib/stripe/customer.d.ts +0 -8
  117. package/lib/stripe/customer.d.ts.map +1 -1
  118. package/lib/stripe/customer.js +0 -6
  119. package/lib/stripe/customer.js.map +1 -1
  120. package/lib/stripe/price.d.ts +23 -23
  121. package/lib/stripe/price.d.ts.map +1 -1
  122. package/lib/stripe/price.js +6 -22
  123. package/lib/stripe/price.js.map +1 -1
  124. package/lib/test/vitest.d.ts.map +1 -1
  125. package/lib/test/vitest.js +1 -1
  126. package/lib/test/vitest.js.map +1 -1
  127. package/lib/util/assert-never.js +1 -1
  128. package/lib/util/assert-never.js.map +1 -1
  129. package/lib/util/cli.d.ts.map +1 -1
  130. package/lib/util/cli.js +12 -13
  131. package/lib/util/cli.js.map +1 -1
  132. package/lib/util/idempotent-spawn.d.ts.map +1 -1
  133. package/lib/util/idempotent-spawn.js +5 -8
  134. package/lib/util/idempotent-spawn.js.map +1 -1
  135. package/lib/util/root-dir.d.ts +2 -0
  136. package/lib/util/root-dir.d.ts.map +1 -0
  137. package/lib/util/root-dir.js +2 -0
  138. package/lib/util/root-dir.js.map +1 -0
  139. package/package.json +4 -4
  140. package/src/alchemy.ts +43 -8
  141. package/src/apply.ts +58 -3
  142. package/src/cloudflare/bindings.ts +21 -4
  143. package/src/cloudflare/bound.ts +50 -52
  144. package/src/cloudflare/bucket.ts +1 -1
  145. package/src/cloudflare/bundle/internal-worker-bundle.ts +2 -1
  146. package/src/cloudflare/cloudflare-env-proxy.ts +5 -5
  147. package/src/cloudflare/compatibility-date.gen.ts +1 -1
  148. package/src/cloudflare/d1-database.ts +2 -1
  149. package/src/cloudflare/d1-local-migrations.ts +10 -6
  150. package/src/cloudflare/hyperdrive-ref.ts +98 -0
  151. package/src/cloudflare/index.ts +2 -0
  152. package/src/cloudflare/kv-namespace.ts +1 -1
  153. package/src/cloudflare/miniflare/build-worker-options.ts +21 -12
  154. package/src/cloudflare/miniflare/delete.ts +19 -11
  155. package/src/cloudflare/miniflare/miniflare-controller.ts +33 -14
  156. package/src/cloudflare/miniflare/miniflare-worker-proxy.ts +122 -102
  157. package/src/cloudflare/miniflare/paths.ts +11 -7
  158. package/src/cloudflare/miniflare/symlink-miniflare-state.ts +19 -0
  159. package/src/cloudflare/miniflare/tunnel.ts +116 -0
  160. package/src/cloudflare/next.ts +3 -0
  161. package/src/cloudflare/nuxt/plugin.ts +12 -3
  162. package/src/cloudflare/redwood/plugin.ts +2 -2
  163. package/src/cloudflare/secret-ref.ts +56 -0
  164. package/src/cloudflare/vite/plugin.ts +8 -3
  165. package/src/cloudflare/website.ts +5 -19
  166. package/src/cloudflare/worker-metadata.ts +14 -12
  167. package/src/cloudflare/worker.ts +36 -3
  168. package/src/cloudflare/wrangler.json.ts +14 -11
  169. package/src/llms.cloudflare.txt +1 -1
  170. package/src/scope.ts +38 -6
  171. package/src/state/file-system-state-store.ts +1 -2
  172. package/src/state/sqlite-state-store.ts +41 -14
  173. package/src/stripe/customer.ts +0 -14
  174. package/src/stripe/price.ts +59 -56
  175. package/src/test/vitest.ts +4 -1
  176. package/src/util/assert-never.ts +1 -1
  177. package/src/util/cli.ts +15 -13
  178. package/src/util/idempotent-spawn.ts +5 -6
  179. package/src/util/root-dir.ts +1 -0
  180. package/templates/nextjs/alchemy.run.ts +2 -2
  181. package/templates/rwsdk/.cursor/rules/alchemy_cloudflare.mdc +1 -1
  182. package/templates/rwsdk/package.json +3 -3
  183. package/workers/cloudflare-state-store.js +1 -1
  184. package/workers/tunnel-proxy.js +110 -0
  185. package/workers/tunnel-proxy.ts +121 -0
@@ -1 +1 @@
1
- {"version":3,"file":"delete.d.ts","sourceRoot":"","sources":["../../../src/cloudflare/miniflare/delete.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAC;AAC7E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAI/C,QAAA,MAAM,gBAAgB;;;;CAIZ,CAAC;AAEX,KAAK,WAAW,GAAG,MAAM,OAAO,gBAAgB,CAAC;AAEjD;;GAEG;AACH,wBAAsB,sBAAsB,CAAC,IAAI,EAAE,WAAW,EAAE,EAAE,EAAE,MAAM,iBAqBzE;AAED;;GAEG;AACH,wBAAsB,yBAAyB,CAC7C,UAAU,EAAE,MAAM,EAClB,KAAK,EAAE;IACL,cAAc,EAAE,sBAAsB,EAAE,CAAC;IACzC,SAAS,EAAE,QAAQ,EAAE,CAAC;CACvB,iBA+BF"}
1
+ {"version":3,"file":"delete.d.ts","sourceRoot":"","sources":["../../../src/cloudflare/miniflare/delete.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAC;AAC7E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAG/C,QAAA,MAAM,gBAAgB;;;;CAIZ,CAAC;AAEX,KAAK,WAAW,GAAG,MAAM,OAAO,gBAAgB,CAAC;AAEjD;;GAEG;AACH,wBAAsB,sBAAsB,CAC1C,KAAK,EAAE,KAAK,EACZ,IAAI,EAAE,WAAW,EACjB,EAAE,EAAE,MAAM,iBAwBX;AAED;;GAEG;AACH,wBAAsB,yBAAyB,CAC7C,KAAK,EAAE,KAAK,EACZ,UAAU,EAAE,MAAM,EAClB,KAAK,EAAE;IACL,cAAc,EAAE,sBAAsB,EAAE,CAAC;IACzC,SAAS,EAAE,QAAQ,EAAE,CAAC;CACvB,iBAgCF"}
@@ -1,8 +1,7 @@
1
1
  import crypto from "node:crypto";
2
2
  import fs from "node:fs/promises";
3
3
  import path from "pathe";
4
- import { DEFAULT_PERSIST_PATH } from "./paths.js";
5
- const PERSIST_ROOT = path.resolve(DEFAULT_PERSIST_PATH);
4
+ import { getDefaultPersistPath } from "./paths.js";
6
5
  const BINDING_TYPE_KEY = {
7
6
  d1: "miniflare-D1DatabaseObject",
8
7
  kv: "miniflare-KVNamespaceObject",
@@ -11,8 +10,9 @@ const BINDING_TYPE_KEY = {
11
10
  /**
12
11
  * Delete a binding from the miniflare directory.
13
12
  */
14
- export async function deleteMiniflareBinding(type, id) {
15
- const bindingPath = path.join(PERSIST_ROOT, type, BINDING_TYPE_KEY[type]);
13
+ export async function deleteMiniflareBinding(scope, type, id) {
14
+ const persistRoot = path.resolve(getDefaultPersistPath(scope.rootDir));
15
+ const bindingPath = path.join(persistRoot, type, BINDING_TYPE_KEY[type]);
16
16
  // delete durable object/sqlite files
17
17
  const namespaceId = durableObjectNamespaceIdFromName(BINDING_TYPE_KEY[type], id);
18
18
  const files = await fs
@@ -21,29 +21,30 @@ export async function deleteMiniflareBinding(type, id) {
21
21
  .catch(() => []);
22
22
  await Promise.all(files.map((file) => fs.rm(path.join(bindingPath, file))));
23
23
  // delete data directory, if present
24
- await removeDirectory(path.join(PERSIST_ROOT, type, id), {
24
+ await removeDirectory(path.join(persistRoot, type, id), {
25
25
  recursive: true,
26
26
  });
27
27
  // delete the miniflare directory if it is empty
28
- await cleanMiniflareDirectory();
28
+ await cleanMiniflareDirectory(scope.dotAlchemy);
29
29
  }
30
30
  /**
31
31
  * Delete local durable object and workflow data for a given Worker script.
32
32
  */
33
- export async function deleteMiniflareWorkerData(scriptName, input) {
34
- await Promise.all(input.durableObjects.map((durableObject) => removeDirectory(path.join(PERSIST_ROOT, "do", `${scriptName}-${durableObject.className}`), {
33
+ export async function deleteMiniflareWorkerData(scope, scriptName, input) {
34
+ const persistRoot = path.resolve(getDefaultPersistPath(scope.rootDir));
35
+ await Promise.all(input.durableObjects.map((durableObject) => removeDirectory(path.join(persistRoot, "do", `${scriptName}-${durableObject.className}`), {
35
36
  recursive: true,
36
37
  })));
37
- await Promise.all(input.workflows.map((workflow) => removeDirectory(path.join(PERSIST_ROOT, "workflows", `miniflare-workflows-${workflow.workflowName}`), {
38
+ await Promise.all(input.workflows.map((workflow) => removeDirectory(path.join(persistRoot, "workflows", `miniflare-workflows-${workflow.workflowName}`), {
38
39
  recursive: true,
39
40
  })));
40
- await cleanMiniflareDirectory();
41
+ await cleanMiniflareDirectory(persistRoot);
41
42
  }
42
43
  /**
43
44
  * Delete the miniflare directory iff it is empty.
44
45
  */
45
- async function cleanMiniflareDirectory() {
46
- const directory = path.resolve(".alchemy/miniflare");
46
+ async function cleanMiniflareDirectory(dotAlchemy) {
47
+ const directory = path.resolve(dotAlchemy, "miniflare");
47
48
  const files = await fs
48
49
  .readdir(directory, {
49
50
  recursive: true,
@@ -1 +1 @@
1
- {"version":3,"file":"delete.js","sourceRoot":"","sources":["../../../src/cloudflare/miniflare/delete.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,aAAa,CAAC;AAEjC,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,IAAI,MAAM,OAAO,CAAC;AAGzB,OAAO,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAElD,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC;AACxD,MAAM,gBAAgB,GAAG;IACvB,EAAE,EAAE,4BAA4B;IAChC,EAAE,EAAE,6BAA6B;IACjC,EAAE,EAAE,0BAA0B;CACtB,CAAC;AAIX;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAAC,IAAiB,EAAE,EAAU;IACxE,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,IAAI,EAAE,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC;IAE1E,qCAAqC;IACrC,MAAM,WAAW,GAAG,gCAAgC,CAClD,gBAAgB,CAAC,IAAI,CAAC,EACtB,EAAE,CACH,CAAC;IACF,MAAM,KAAK,GAAG,MAAM,EAAE;SACnB,OAAO,CAAC,WAAW,CAAC;SACpB,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,CAAC;SACrE,KAAK,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC;IACnB,MAAM,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IAE5E,oCAAoC;IACpC,MAAM,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,IAAI,EAAE,EAAE,CAAC,EAAE;QACvD,SAAS,EAAE,IAAI;KAChB,CAAC,CAAC;IAEH,gDAAgD;IAChD,MAAM,uBAAuB,EAAE,CAAC;AAClC,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAC7C,UAAkB,EAClB,KAGC;IAED,MAAM,OAAO,CAAC,GAAG,CACf,KAAK,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,aAAa,EAAE,EAAE,CACzC,eAAe,CACb,IAAI,CAAC,IAAI,CACP,YAAY,EACZ,IAAI,EACJ,GAAG,UAAU,IAAI,aAAa,CAAC,SAAS,EAAE,CAC3C,EACD;QACE,SAAS,EAAE,IAAI;KAChB,CACF,CACF,CACF,CAAC;IACF,MAAM,OAAO,CAAC,GAAG,CACf,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAC/B,eAAe,CACb,IAAI,CAAC,IAAI,CACP,YAAY,EACZ,WAAW,EACX,uBAAuB,QAAQ,CAAC,YAAY,EAAE,CAC/C,EACD;QACE,SAAS,EAAE,IAAI;KAChB,CACF,CACF,CACF,CAAC;IACF,MAAM,uBAAuB,EAAE,CAAC;AAClC,CAAC;AAED;;GAEG;AACH,KAAK,UAAU,uBAAuB;IACpC,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC;IACrD,MAAM,KAAK,GAAG,MAAM,EAAE;SACnB,OAAO,CAAC,SAAS,EAAE;QAClB,SAAS,EAAE,IAAI;QACf,aAAa,EAAE,IAAI;KACpB,CAAC;SACD,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;QACf,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;YACrB,MAAM,KAAK,CAAC;QACd,CAAC;QACD,OAAO,EAAE,CAAC;IACZ,CAAC,CAAC,CAAC;IACL,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,EAAE,CAAC;QAC/C,MAAM,eAAe,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACxD,CAAC;AACH,CAAC;AAED,MAAM,eAAe,GAAG,KAAK,EAAE,IAAY,EAAE,OAAsB,EAAE,EAAE;IACrE,IAAI,CAAC;QACH,MAAM,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAChC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;YACrB,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,QAAQ,GAAG,CAAC,KAAc,EAA+B,EAAE,CAC/D,CAAC,CAAC,KAAK;IACP,OAAO,KAAK,KAAK,QAAQ;IACzB,MAAM,IAAI,KAAK;IACf,KAAK,CAAC,IAAI,KAAK,QAAQ,CAAC;AAE1B,0JAA0J;AAC1J,MAAM,gCAAgC,GAAG,CAAC,SAAiB,EAAE,IAAY,EAAE,EAAE;IAC3E,MAAM,GAAG,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,MAAM,EAAE,CAAC;IACnE,MAAM,QAAQ,GAAG,MAAM;SACpB,UAAU,CAAC,QAAQ,EAAE,GAAG,CAAC;SACzB,MAAM,CAAC,IAAI,CAAC;SACZ,MAAM,EAAE;SACR,QAAQ,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IACnB,MAAM,IAAI,GAAG,MAAM;SAChB,UAAU,CAAC,QAAQ,EAAE,GAAG,CAAC;SACzB,MAAM,CAAC,QAAQ,CAAC;SAChB,MAAM,EAAE;SACR,QAAQ,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IACnB,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;AACzD,CAAC,CAAC"}
1
+ {"version":3,"file":"delete.js","sourceRoot":"","sources":["../../../src/cloudflare/miniflare/delete.ts"],"names":[],"mappings":"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"}
@@ -2,7 +2,8 @@ import * as miniflare from "miniflare";
2
2
  import type { HTTPServer } from "../../util/http.ts";
3
3
  import { AsyncMutex } from "../../util/mutex.ts";
4
4
  import { type MiniflareWorkerInput } from "./build-worker-options.ts";
5
- import { MiniflareWorkerProxy } from "./miniflare-worker-proxy.ts";
5
+ import { type MiniflareWorkerProxy } from "./miniflare-worker-proxy.ts";
6
+ import { type Tunnel } from "./tunnel.ts";
6
7
  declare global {
7
8
  var ALCHEMY_MINIFLARE_CONTROLLER: MiniflareController | undefined;
8
9
  }
@@ -10,6 +11,7 @@ export declare class MiniflareController {
10
11
  abort: AbortController;
11
12
  miniflare: miniflare.Miniflare | undefined;
12
13
  options: Map<string, miniflare.WorkerOptions>;
14
+ tunnel: Tunnel | undefined;
13
15
  localProxies: Map<string, MiniflareWorkerProxy>;
14
16
  remoteProxies: Map<string, HTTPServer>;
15
17
  mutex: AsyncMutex;
@@ -1 +1 @@
1
- {"version":3,"file":"miniflare-controller.d.ts","sourceRoot":"","sources":["../../../src/cloudflare/miniflare/miniflare-controller.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,SAAS,MAAM,WAAW,CAAC;AAIvC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAErD,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAEL,KAAK,oBAAoB,EAC1B,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAGnE,OAAO,CAAC,MAAM,CAAC;IACb,IAAI,4BAA4B,EAAE,mBAAmB,GAAG,SAAS,CAAC;CACnE;AAED,qBAAa,mBAAmB;IAC9B,KAAK,kBAAyB;IAC9B,SAAS,EAAE,SAAS,CAAC,SAAS,GAAG,SAAS,CAAC;IAC3C,OAAO,uCAA8C;IACrD,YAAY,oCAA2C;IACvD,aAAa,0BAAiC;IAC9C,KAAK,aAAoB;IAEzB,MAAM,KAAK,SAAS,wBAGnB;IAEK,GAAG,CAAC,KAAK,EAAE,oBAAoB;YA2BvB,KAAK;YAiBL,MAAM;YA2CN,mBAAmB;IAuB3B,OAAO;CAQd"}
1
+ {"version":3,"file":"miniflare-controller.d.ts","sourceRoot":"","sources":["../../../src/cloudflare/miniflare/miniflare-controller.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,SAAS,MAAM,WAAW,CAAC;AAKvC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAErD,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAEL,KAAK,oBAAoB,EAC1B,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAEL,KAAK,oBAAoB,EAC1B,MAAM,6BAA6B,CAAC;AAErC,OAAO,EAAgB,KAAK,MAAM,EAAE,MAAM,aAAa,CAAC;AAExD,OAAO,CAAC,MAAM,CAAC;IACb,IAAI,4BAA4B,EAAE,mBAAmB,GAAG,SAAS,CAAC;CACnE;AAED,qBAAa,mBAAmB;IAC9B,KAAK,kBAAyB;IAC9B,SAAS,EAAE,SAAS,CAAC,SAAS,GAAG,SAAS,CAAC;IAC3C,OAAO,uCAA8C;IACrD,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,YAAY,oCAA2C;IACvD,aAAa,0BAAiC;IAC9C,KAAK,aAAoB;IAEzB,MAAM,KAAK,SAAS,wBAGnB;IAEK,GAAG,CAAC,KAAK,EAAE,oBAAoB;YAsCvB,KAAK;YAiBL,MAAM;YA4CN,mBAAmB;IAuB3B,OAAO;CASd"}
@@ -1,22 +1,25 @@
1
1
  import * as miniflare from "miniflare";
2
2
  import assert from "node:assert";
3
3
  import path from "node:path";
4
+ import { Scope } from "../../scope.js";
4
5
  import { findOpenPort } from "../../util/find-open-port.js";
5
6
  import { logger } from "../../util/logger.js";
6
7
  import { AsyncMutex } from "../../util/mutex.js";
7
8
  import { buildWorkerOptions, } from "./build-worker-options.js";
8
- import { MiniflareWorkerProxy } from "./miniflare-worker-proxy.js";
9
- import { DEFAULT_PERSIST_PATH } from "./paths.js";
9
+ import { createMiniflareWorkerProxy, } from "./miniflare-worker-proxy.js";
10
+ import { getDefaultPersistPath } from "./paths.js";
11
+ import { createTunnel } from "./tunnel.js";
10
12
  export class MiniflareController {
11
13
  abort = new AbortController();
12
14
  miniflare;
13
15
  options = new Map();
16
+ tunnel;
14
17
  localProxies = new Map();
15
18
  remoteProxies = new Map();
16
19
  mutex = new AsyncMutex();
17
20
  static get singleton() {
18
- globalThis.ALCHEMY_MINIFLARE_CONTROLLER ??= new MiniflareController();
19
- return globalThis.ALCHEMY_MINIFLARE_CONTROLLER;
21
+ return (globalThis.ALCHEMY_MINIFLARE_CONTROLLER ??=
22
+ new MiniflareController());
20
23
  }
21
24
  async add(input) {
22
25
  const { watch, remoteProxy } = await buildWorkerOptions(input);
@@ -28,21 +31,33 @@ export class MiniflareController {
28
31
  assert(first.value, "First value is undefined");
29
32
  this.options.set(input.name, first.value);
30
33
  const miniflare = await this.update();
31
- const proxy = new MiniflareWorkerProxy({
32
- name: input.name,
33
- port: input.port ?? (await findOpenPort()),
34
- miniflare,
35
- });
36
- this.localProxies.set(input.name, proxy);
34
+ let url;
35
+ if (input.tunnel) {
36
+ this.tunnel ??= await createTunnel(miniflare);
37
+ url = await this.tunnel.configureWorker({
38
+ api: input.api,
39
+ name: input.name,
40
+ });
41
+ }
42
+ else {
43
+ const proxy = await createMiniflareWorkerProxy({
44
+ port: input.port ?? (await findOpenPort()),
45
+ getWorkerName: () => input.name,
46
+ miniflare,
47
+ mode: "local",
48
+ });
49
+ this.localProxies.set(input.name, proxy);
50
+ url = proxy.url;
51
+ }
37
52
  void this.watch(input.id, watcher);
38
53
  logger.task(input.id, {
39
- message: `Ready at ${proxy.url}`,
54
+ message: `Ready at ${url}`,
40
55
  status: "success",
41
56
  resource: input.id,
42
57
  prefix: "dev",
43
58
  prefixColor: "cyanBright",
44
59
  });
45
- return proxy.url;
60
+ return url.toString();
46
61
  }
47
62
  async watch(id, watcher) {
48
63
  for await (const options of watcher) {
@@ -61,7 +76,7 @@ export class MiniflareController {
61
76
  return await this.mutex.lock(async () => {
62
77
  const options = {
63
78
  workers: [],
64
- defaultPersistRoot: path.resolve(DEFAULT_PERSIST_PATH),
79
+ defaultPersistRoot: path.resolve(getDefaultPersistPath(Scope.current.rootDir)),
65
80
  unsafeDevRegistryPath: miniflare.getDefaultDevRegistryPath(),
66
81
  log: process.env.DEBUG
67
82
  ? new miniflare.Log(miniflare.LogLevel.DEBUG)
@@ -123,6 +138,7 @@ export class MiniflareController {
123
138
  this.abort.abort();
124
139
  await Promise.all([
125
140
  this.miniflare?.dispose(),
141
+ this.tunnel?.close(),
126
142
  ...this.localProxies.values().map((proxy) => proxy.close()),
127
143
  ...this.remoteProxies.values().map((proxy) => proxy.close()),
128
144
  ]);
@@ -1 +1 @@
1
- {"version":3,"file":"miniflare-controller.js","sourceRoot":"","sources":["../../../src/cloudflare/miniflare/miniflare-controller.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"miniflare-controller.js","sourceRoot":"","sources":["../../../src/cloudflare/miniflare/miniflare-controller.ts"],"names":[],"mappings":"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"}
@@ -1,20 +1,31 @@
1
1
  import * as miniflare from "miniflare";
2
- interface MiniflareWorkerProxyOptions {
3
- name: string;
2
+ export interface MiniflareWorkerProxy {
3
+ url: URL;
4
+ close: () => Promise<void>;
5
+ }
6
+ export declare function createMiniflareWorkerProxy(options: {
4
7
  port: number;
8
+ transformRequest?: (request: RequestInfo) => void;
9
+ getWorkerName: (request: miniflare.Request) => string;
5
10
  miniflare: miniflare.Miniflare;
11
+ mode: "local" | "remote";
12
+ }): Promise<{
13
+ url: URL;
14
+ close: () => Promise<void>;
15
+ }>;
16
+ interface RequestInfo {
17
+ method: string;
18
+ url: URL;
19
+ headers: miniflare.Headers;
20
+ body: miniflare.BodyInit | undefined;
21
+ redirect: "manual";
22
+ duplex: "half" | undefined;
6
23
  }
7
- export declare class MiniflareWorkerProxy {
8
- private readonly options;
9
- private server;
10
- private wss;
11
- constructor(options: MiniflareWorkerProxyOptions);
12
- get ready(): Promise<void> | Promise<any[]>;
13
- get url(): string;
14
- close(): Promise<void>;
15
- private handleUpgrade;
16
- private createServerWebSocket;
17
- private handleRequest;
24
+ export declare class MiniflareWorkerProxyError extends Error {
25
+ readonly status: number;
26
+ constructor(message: string, status: number, options?: ErrorOptions);
27
+ toResponse(mode: "local" | "remote"): miniflare.Response;
28
+ static fromUnknown(error: unknown): MiniflareWorkerProxyError;
18
29
  }
19
30
  export {};
20
31
  //# sourceMappingURL=miniflare-worker-proxy.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"miniflare-worker-proxy.d.ts","sourceRoot":"","sources":["../../../src/cloudflare/miniflare/miniflare-worker-proxy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,SAAS,MAAM,WAAW,CAAC;AAQvC,UAAU,2BAA2B;IACnC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,SAAS,CAAC,SAAS,CAAC;CAChC;AAED,qBAAa,oBAAoB;IAInB,OAAO,CAAC,QAAQ,CAAC,OAAO;IAHpC,OAAO,CAAC,MAAM,CAAuB;IACrC,OAAO,CAAC,GAAG,CAA2C;gBAEzB,OAAO,EAAE,2BAA2B;IAUjE,IAAI,KAAK,mCAKR;IAED,IAAI,GAAG,WAEN;IAEK,KAAK;YAOG,aAAa;YAmBb,qBAAqB;YA6BrB,aAAa;CAwB5B"}
1
+ {"version":3,"file":"miniflare-worker-proxy.d.ts","sourceRoot":"","sources":["../../../src/cloudflare/miniflare/miniflare-worker-proxy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,SAAS,MAAM,WAAW,CAAC;AAMvC,MAAM,WAAW,oBAAoB;IACnC,GAAG,EAAE,GAAG,CAAC;IACT,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC5B;AAED,wBAAsB,0BAA0B,CAAC,OAAO,EAAE;IACxD,IAAI,EAAE,MAAM,CAAC;IACb,gBAAgB,CAAC,EAAE,CAAC,OAAO,EAAE,WAAW,KAAK,IAAI,CAAC;IAClD,aAAa,EAAE,CAAC,OAAO,EAAE,SAAS,CAAC,OAAO,KAAK,MAAM,CAAC;IACtD,SAAS,EAAE,SAAS,CAAC,SAAS,CAAC;IAC/B,IAAI,EAAE,OAAO,GAAG,QAAQ,CAAC;CAC1B;;;GAyEA;AAED,UAAU,WAAW;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,GAAG,CAAC;IACT,OAAO,EAAE,SAAS,CAAC,OAAO,CAAC;IAC3B,IAAI,EAAE,SAAS,CAAC,QAAQ,GAAG,SAAS,CAAC;IACrC,QAAQ,EAAE,QAAQ,CAAC;IACnB,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;CAC5B;AA8CD,qBAAa,yBAA0B,SAAQ,KAAK;IAGhD,QAAQ,CAAC,MAAM,EAAE,MAAM;gBADvB,OAAO,EAAE,MAAM,EACN,MAAM,EAAE,MAAM,EACvB,OAAO,CAAC,EAAE,YAAY;IAKxB,UAAU,CAAC,IAAI,EAAE,OAAO,GAAG,QAAQ,GAAG,SAAS,CAAC,QAAQ;IAkBxD,MAAM,CAAC,WAAW,CAAC,KAAK,EAAE,OAAO,GAAG,yBAAyB;CAQ9D"}
@@ -3,95 +3,79 @@ import { once } from "node:events";
3
3
  import http from "node:http";
4
4
  import { Readable } from "node:stream";
5
5
  import { WebSocket, WebSocketServer } from "ws";
6
- import { logger } from "../../util/logger.js";
7
- export class MiniflareWorkerProxy {
8
- options;
9
- server = http.createServer();
10
- wss = new WebSocketServer({ noServer: true });
11
- constructor(options) {
12
- this.options = options;
13
- this.server.on("upgrade", async (req, socket, head) => {
14
- await this.handleUpgrade(req, socket, head);
15
- });
16
- this.server.on("request", async (req, res) => {
17
- await this.handleRequest(req, res);
18
- });
19
- this.server.listen(this.options.port);
20
- }
21
- get ready() {
22
- if (!this.server.listening) {
23
- return once(this.server, "listening");
6
+ export async function createMiniflareWorkerProxy(options) {
7
+ const server = http.createServer();
8
+ const wss = new WebSocketServer({ noServer: true });
9
+ server.on("upgrade", async (req, socket, head) => {
10
+ try {
11
+ const server = await createServerWebSocket(req);
12
+ wss.handleUpgrade(req, socket, head, (client) => {
13
+ client.on("message", (event, binary) => server.send(event, { binary }));
14
+ client.on("close", (code, reason) => server.close(code, reason));
15
+ server.on("message", (event, binary) => client.send(event, { binary }));
16
+ server.on("close", (code, reason) => client.close(code, reason));
17
+ wss.emit("connection", client, req);
18
+ });
24
19
  }
25
- return Promise.resolve();
26
- }
27
- get url() {
28
- return `http://localhost:${this.options.port}`;
29
- }
30
- async close() {
31
- await Promise.all([
32
- new Promise((resolve) => this.wss.close(resolve)),
33
- new Promise((resolve) => this.server.close(resolve)),
34
- ]);
35
- }
36
- async handleUpgrade(req, socket, head) {
37
- const server = await this.createServerWebSocket(req);
38
- if (!server) {
20
+ catch (error) {
21
+ console.error(error);
39
22
  socket.destroy();
40
- return;
41
23
  }
42
- this.wss.handleUpgrade(req, socket, head, (client) => {
43
- client.on("message", (event, binary) => server.send(event, { binary }));
44
- client.on("close", (code, reason) => server.close(code, reason));
45
- server.on("message", (event, binary) => client.send(event, { binary }));
46
- server.on("close", (code, reason) => client.close(code, reason));
47
- this.wss.emit("connection", client, req);
48
- });
49
- }
50
- async createServerWebSocket(req) {
51
- const target = await this.options.miniflare.unsafeGetDirectURL(this.options.name);
52
- if (!target) {
53
- logger.error(`[Alchemy] Websocket connection failed: The worker "${this.options.name}" is not running.`);
54
- return null;
24
+ });
25
+ server.on("request", async (req, res) => {
26
+ try {
27
+ const request = toMiniflareRequest(req);
28
+ const name = options.getWorkerName(request);
29
+ const worker = await options.miniflare.getWorker(name);
30
+ const response = await worker.fetch(request);
31
+ writeMiniflareResponseToNode(response, res);
55
32
  }
33
+ catch (error) {
34
+ console.error(error);
35
+ const response = MiniflareWorkerProxyError.fromUnknown(error).toResponse(options.mode);
36
+ writeMiniflareResponseToNode(response, res);
37
+ }
38
+ });
39
+ const toMiniflareRequest = (req) => {
40
+ const info = parseIncomingMessage(req);
41
+ options.transformRequest?.(info);
42
+ return new miniflare.Request(info.url, {
43
+ method: info.method,
44
+ headers: info.headers,
45
+ body: info.body,
46
+ redirect: info.redirect,
47
+ duplex: info.duplex,
48
+ });
49
+ };
50
+ const createServerWebSocket = async (req) => {
51
+ const name = options.getWorkerName(toMiniflareRequest(req));
52
+ const target = await options.miniflare.unsafeGetDirectURL(name);
56
53
  const url = new URL(req.url ?? "/", target);
57
54
  url.protocol = url.protocol.replace("http", "ws");
58
55
  const protocols = req.headers["sec-websocket-protocol"]
59
56
  ?.split(",")
60
57
  .map((p) => p.trim());
61
58
  const server = new WebSocket(url, protocols);
62
- const controller = new AbortController();
63
- return await Promise.race([
64
- once(server, "open", { signal: controller.signal }).then(() => server),
65
- once(server, "close", { signal: controller.signal }).then((args) => {
66
- const [code, reason] = args;
67
- logger.error(`[Alchemy] Websocket connection failed for worker "${this.options.name}": ${code} ${reason}`);
68
- return null;
69
- }),
70
- ]).finally(() => controller.abort());
71
- }
72
- async handleRequest(req, res) {
73
- const worker = await this.options.miniflare.getWorker(this.options.name);
74
- if (!worker) {
75
- res.statusCode = 503;
76
- res.end(`[Alchemy] The worker "${this.options.name}" is not running.`);
77
- return;
78
- }
79
- try {
80
- const response = await worker.fetch(toMiniflareRequest(req));
81
- writeMiniflareResponseToNode(response, res);
82
- }
83
- catch (rawError) {
84
- const message = rawError instanceof Error
85
- ? (rawError.stack ?? rawError.message)
86
- : String(rawError);
87
- res.statusCode = 500;
88
- res.end(`[Alchemy] The worker "${this.options.name}" threw an error:\n\n${message}`);
89
- }
90
- }
59
+ await once(server, "open");
60
+ return server;
61
+ };
62
+ server.listen(options.port);
63
+ await once(server, "listening");
64
+ const url = new URL(`http://localhost:${options.port}`);
65
+ return {
66
+ url,
67
+ close: async () => {
68
+ await Promise.all([
69
+ new Promise((resolve) => server.close(resolve)),
70
+ new Promise((resolve) => wss.close(resolve)),
71
+ ]);
72
+ },
73
+ };
91
74
  }
92
- const toMiniflareRequest = (req) => {
75
+ const parseIncomingMessage = (req) => {
93
76
  const method = req.method ?? "GET";
94
- const url = new URL(req.url ?? "/", `http://${req.headers.host}`);
77
+ const protocol = req.headers["x-forwarded-proto"] ?? "http";
78
+ const url = new URL(req.url ?? "/", `${protocol}://${req.headers.host}`);
95
79
  const headers = new miniflare.Headers();
96
80
  for (const [key, value] of Object.entries(req.headers)) {
97
81
  if (Array.isArray(value)) {
@@ -106,13 +90,14 @@ const toMiniflareRequest = (req) => {
106
90
  const body = ["GET", "HEAD", "OPTIONS"].includes(method) || !req.readable
107
91
  ? undefined
108
92
  : Readable.toWeb(req);
109
- return new miniflare.Request(url, {
93
+ return {
110
94
  method,
95
+ url,
111
96
  headers,
112
97
  body,
113
98
  redirect: "manual",
114
99
  duplex: body ? "half" : undefined,
115
- });
100
+ };
116
101
  };
117
102
  const writeMiniflareResponseToNode = (res, out) => {
118
103
  out.statusCode = res.status;
@@ -126,4 +111,35 @@ const writeMiniflareResponseToNode = (res, out) => {
126
111
  out.end();
127
112
  }
128
113
  };
114
+ export class MiniflareWorkerProxyError extends Error {
115
+ status;
116
+ constructor(message, status, options) {
117
+ super(message, options);
118
+ this.status = status;
119
+ }
120
+ toResponse(mode) {
121
+ let text = `[Alchemy] ${this.message}`;
122
+ if (mode === "local" && this.cause) {
123
+ const cause = this.cause instanceof Error
124
+ ? (this.cause.stack ?? this.cause.message)
125
+ : String(this.cause);
126
+ text += `\n\n${cause}`;
127
+ }
128
+ return new miniflare.Response(text, {
129
+ status: this.status,
130
+ headers: {
131
+ "Content-Type": "text/plain",
132
+ "Alchemy-Error": this.message,
133
+ },
134
+ });
135
+ }
136
+ static fromUnknown(error) {
137
+ if (error instanceof MiniflareWorkerProxyError) {
138
+ return error;
139
+ }
140
+ return new MiniflareWorkerProxyError("An unknown error occurred.", 500, {
141
+ cause: error,
142
+ });
143
+ }
144
+ }
129
145
  //# sourceMappingURL=miniflare-worker-proxy.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"miniflare-worker-proxy.js","sourceRoot":"","sources":["../../../src/cloudflare/miniflare/miniflare-worker-proxy.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"miniflare-worker-proxy.js","sourceRoot":"","sources":["../../../src/cloudflare/miniflare/miniflare-worker-proxy.ts"],"names":[],"mappings":"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"}
@@ -2,8 +2,8 @@
2
2
  * Used to disable path validation during dynamic imports.
3
3
  */
4
4
  export declare const withSkipPathValidation: <T>(callback: () => T) => T;
5
- export declare const DEFAULT_CONFIG_PATH = ".alchemy/local/wrangler.jsonc";
6
- export declare const DEFAULT_PERSIST_PATH = ".alchemy/miniflare/v3";
7
- export declare const validateConfigPath: (path?: string, throws?: boolean) => string;
8
- export declare const validatePersistPath: (path?: string, throws?: boolean) => string;
5
+ export declare const getDefaultConfigPath: (rootDir?: string) => string;
6
+ export declare const getDefaultPersistPath: (rootDir?: string) => string;
7
+ export declare const validateConfigPath: (path: string, throws?: boolean) => string;
8
+ export declare const validatePersistPath: (path: string, throws?: boolean) => string;
9
9
  //# sourceMappingURL=paths.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"paths.d.ts","sourceRoot":"","sources":["../../../src/cloudflare/miniflare/paths.ts"],"names":[],"mappings":"AAKA;;GAEG;AACH,eAAO,MAAM,sBAAsB,GAAI,CAAC,EAAE,UAAU,MAAM,CAAC,MAE1D,CAAC;AAEF,eAAO,MAAM,mBAAmB,kCAAkC,CAAC;AACnE,eAAO,MAAM,oBAAoB,0BAA0B,CAAC;AAE5D,eAAO,MAAM,kBAAkB,GAC7B,aAA0B,EAC1B,gBAAa,WASd,CAAC;AAMF,eAAO,MAAM,mBAAmB,GAC9B,aAA2B,EAC3B,gBAAiC,WAelC,CAAC"}
1
+ {"version":3,"file":"paths.d.ts","sourceRoot":"","sources":["../../../src/cloudflare/miniflare/paths.ts"],"names":[],"mappings":"AAOA;;GAEG;AACH,eAAO,MAAM,sBAAsB,GAAI,CAAC,EAAE,UAAU,MAAM,CAAC,MAE1D,CAAC;AAEF,eAAO,MAAM,oBAAoB,GAAI,UAAS,MAAsB,WAEnE,CAAC;AAEF,eAAO,MAAM,qBAAqB,GAAI,UAAS,MAAqB,WAEnE,CAAC;AAEF,eAAO,MAAM,kBAAkB,GAAI,MAAM,MAAM,EAAE,gBAAa,WAQ7D,CAAC;AAMF,eAAO,MAAM,mBAAmB,GAC9B,MAAM,MAAM,EACZ,gBAAiC,WAelC,CAAC"}
@@ -1,5 +1,7 @@
1
1
  import { AsyncLocalStorage } from "node:async_hooks";
2
2
  import { existsSync, readlinkSync, statSync } from "node:fs";
3
+ import path from "node:path";
4
+ import { ALCHEMY_ROOT } from "../../util/root-dir.js";
3
5
  const dynamicImportContext = new AsyncLocalStorage();
4
6
  /**
5
7
  * Used to disable path validation during dynamic imports.
@@ -7,9 +9,13 @@ const dynamicImportContext = new AsyncLocalStorage();
7
9
  export const withSkipPathValidation = (callback) => {
8
10
  return dynamicImportContext.run(true, callback);
9
11
  };
10
- export const DEFAULT_CONFIG_PATH = ".alchemy/local/wrangler.jsonc";
11
- export const DEFAULT_PERSIST_PATH = ".alchemy/miniflare/v3";
12
- export const validateConfigPath = (path = DEFAULT_CONFIG_PATH, throws = true) => {
12
+ export const getDefaultConfigPath = (rootDir = process.cwd()) => {
13
+ return path.join(rootDir, ".alchemy", "local", "wrangler.jsonc");
14
+ };
15
+ export const getDefaultPersistPath = (rootDir = ALCHEMY_ROOT) => {
16
+ return path.join(rootDir, ".alchemy", "miniflare", "v3");
17
+ };
18
+ export const validateConfigPath = (path, throws = true) => {
13
19
  if (!existsSync(path)) {
14
20
  warnOrThrow(`The Wrangler config path, "${path}", could not be found. Please run \`alchemy dev\` or \`alchemy deploy\` to create it.`, throws);
15
21
  }
@@ -17,7 +23,7 @@ export const validateConfigPath = (path = DEFAULT_CONFIG_PATH, throws = true) =>
17
23
  };
18
24
  const DEFAULT_VALIDATE_PERSIST = process.env.NODE_ENV === "development" ||
19
25
  !process.argv.some((arg) => ["build", "prepare", "typegen"].includes(arg));
20
- export const validatePersistPath = (path = DEFAULT_PERSIST_PATH, throws = DEFAULT_VALIDATE_PERSIST) => {
26
+ export const validatePersistPath = (path, throws = DEFAULT_VALIDATE_PERSIST) => {
21
27
  try {
22
28
  const stat = statSync(path);
23
29
  if (stat.isSymbolicLink()) {
@@ -1 +1 @@
1
- {"version":3,"file":"paths.js","sourceRoot":"","sources":["../../../src/cloudflare/miniflare/paths.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAE7D,MAAM,oBAAoB,GAAG,IAAI,iBAAiB,EAAW,CAAC;AAE9D;;GAEG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAI,QAAiB,EAAE,EAAE;IAC7D,OAAO,oBAAoB,CAAC,GAAG,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;AAClD,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,mBAAmB,GAAG,+BAA+B,CAAC;AACnE,MAAM,CAAC,MAAM,oBAAoB,GAAG,uBAAuB,CAAC;AAE5D,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAChC,IAAI,GAAG,mBAAmB,EAC1B,MAAM,GAAG,IAAI,EACb,EAAE;IACF,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;QACtB,WAAW,CACT,8BAA8B,IAAI,uFAAuF,EACzH,MAAM,CACP,CAAC;IACJ,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEF,MAAM,wBAAwB,GAC5B,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,aAAa;IACtC,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,OAAO,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;AAE7E,MAAM,CAAC,MAAM,mBAAmB,GAAG,CACjC,IAAI,GAAG,oBAAoB,EAC3B,MAAM,GAAG,wBAAwB,EACjC,EAAE;IACF,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;QAC5B,IAAI,IAAI,CAAC,cAAc,EAAE,EAAE,CAAC;YAC1B,OAAO,YAAY,CAAC,IAAI,CAAC,CAAC;QAC5B,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,MAAM,CAAC;QACP,WAAW,CACT,2BAA2B,IAAI,iIAAiI,EAChK,MAAM,CACP,CAAC;QACF,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,MAAM,GAAG,IAAI,GAAG,EAAU,CAAC;AAEjC,MAAM,WAAW,GAAG,CAAC,OAAe,EAAE,MAAe,EAAE,EAAE;IACvD,IAAI,oBAAoB,CAAC,QAAQ,EAAE,EAAE,CAAC;QACpC,OAAO;IACT,CAAC;IACD,IAAI,MAAM,EAAE,CAAC;QACX,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;IAC3B,CAAC;IACD,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC;QACzB,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACtB,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACtB,CAAC;AACH,CAAC,CAAC"}
1
+ {"version":3,"file":"paths.js","sourceRoot":"","sources":["../../../src/cloudflare/miniflare/paths.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAC7D,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAEtD,MAAM,oBAAoB,GAAG,IAAI,iBAAiB,EAAW,CAAC;AAE9D;;GAEG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAI,QAAiB,EAAE,EAAE;IAC7D,OAAO,oBAAoB,CAAC,GAAG,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;AAClD,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,UAAkB,OAAO,CAAC,GAAG,EAAE,EAAE,EAAE;IACtE,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,gBAAgB,CAAC,CAAC;AACnE,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,UAAkB,YAAY,EAAE,EAAE;IACtE,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,IAAI,CAAC,CAAC;AAC3D,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,IAAY,EAAE,MAAM,GAAG,IAAI,EAAE,EAAE;IAChE,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;QACtB,WAAW,CACT,8BAA8B,IAAI,uFAAuF,EACzH,MAAM,CACP,CAAC;IACJ,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEF,MAAM,wBAAwB,GAC5B,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,aAAa;IACtC,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,OAAO,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;AAE7E,MAAM,CAAC,MAAM,mBAAmB,GAAG,CACjC,IAAY,EACZ,MAAM,GAAG,wBAAwB,EACjC,EAAE;IACF,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;QAC5B,IAAI,IAAI,CAAC,cAAc,EAAE,EAAE,CAAC;YAC1B,OAAO,YAAY,CAAC,IAAI,CAAC,CAAC;QAC5B,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,MAAM,CAAC;QACP,WAAW,CACT,2BAA2B,IAAI,iIAAiI,EAChK,MAAM,CACP,CAAC;QACF,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,MAAM,GAAG,IAAI,GAAG,EAAU,CAAC;AAEjC,MAAM,WAAW,GAAG,CAAC,OAAe,EAAE,MAAe,EAAE,EAAE;IACvD,IAAI,oBAAoB,CAAC,QAAQ,EAAE,EAAE,CAAC;QACpC,OAAO;IACT,CAAC;IACD,IAAI,MAAM,EAAE,CAAC;QACX,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;IAC3B,CAAC;IACD,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC;QACzB,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACtB,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACtB,CAAC;AACH,CAAC,CAAC"}
@@ -0,0 +1,2 @@
1
+ export declare function writeMiniflareSymlink(rootDir: string, cwd: string): Promise<void>;
2
+ //# sourceMappingURL=symlink-miniflare-state.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"symlink-miniflare-state.d.ts","sourceRoot":"","sources":["../../../src/cloudflare/miniflare/symlink-miniflare-state.ts"],"names":[],"mappings":"AAIA,wBAAsB,qBAAqB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,iBAcvE"}