wrangler 0.0.0-e98613f8 → 0.0.0-e9a45766c

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 (244) hide show
  1. package/README.md +10 -4
  2. package/bin/wrangler.js +10 -2
  3. package/miniflare-dist/index.mjs +257 -132
  4. package/package.json +26 -19
  5. package/src/__tests__/api-dev.test.ts +65 -36
  6. package/src/__tests__/api-devregistry.test.ts +121 -0
  7. package/src/__tests__/api.test.ts +27 -5
  8. package/src/__tests__/configuration.test.ts +575 -39
  9. package/src/__tests__/constellation.test.ts +371 -0
  10. package/src/__tests__/d1/d1.test.ts +82 -0
  11. package/src/__tests__/d1/execute.test.ts +66 -0
  12. package/src/__tests__/d1/migrate.test.ts +257 -0
  13. package/src/__tests__/d1/splitter.test.ts +255 -0
  14. package/src/__tests__/delete.test.ts +11 -2
  15. package/src/__tests__/deployments.test.ts +330 -52
  16. package/src/__tests__/dev.test.tsx +146 -82
  17. package/src/__tests__/generate.test.ts +10 -8
  18. package/src/__tests__/guess-worker-format.test.ts +35 -0
  19. package/src/__tests__/helpers/end-event-loop.ts +6 -0
  20. package/src/__tests__/helpers/mock-auth-domain.ts +20 -0
  21. package/src/__tests__/helpers/mock-console.ts +6 -0
  22. package/src/__tests__/helpers/mock-dialogs.ts +71 -85
  23. package/src/__tests__/helpers/mock-get-pages-upload-token.ts +25 -0
  24. package/src/__tests__/helpers/mock-get-zone-from-host.ts +8 -5
  25. package/src/__tests__/helpers/mock-known-routes.ts +7 -2
  26. package/src/__tests__/helpers/mock-kv.ts +29 -16
  27. package/src/__tests__/helpers/mock-oauth-flow.ts +99 -92
  28. package/src/__tests__/helpers/mock-process.ts +8 -13
  29. package/src/__tests__/helpers/mock-set-timeout.ts +16 -0
  30. package/src/__tests__/helpers/msw/blob-worker.cjs +19 -0
  31. package/src/__tests__/helpers/msw/handlers/deployments.ts +127 -26
  32. package/src/__tests__/helpers/msw/handlers/namespaces.ts +18 -41
  33. package/src/__tests__/helpers/msw/handlers/r2.ts +14 -34
  34. package/src/__tests__/helpers/msw/handlers/script.ts +9 -28
  35. package/src/__tests__/helpers/msw/handlers/user.ts +13 -24
  36. package/src/__tests__/helpers/msw/handlers/zones.ts +6 -8
  37. package/src/__tests__/helpers/msw/index.ts +32 -1
  38. package/src/__tests__/helpers/msw/read-file-sync.js +61 -0
  39. package/src/__tests__/helpers/string-dynamic-values-matcher.ts +28 -0
  40. package/src/__tests__/helpers/worker-scripts/parent-worker.js +4 -1
  41. package/src/__tests__/index.test.ts +92 -74
  42. package/src/__tests__/init.test.ts +909 -628
  43. package/src/__tests__/jest.setup.ts +19 -42
  44. package/src/__tests__/kv.test.ts +355 -231
  45. package/src/__tests__/logger.test.ts +68 -2
  46. package/src/__tests__/logout.test.ts +1 -1
  47. package/src/__tests__/metrics.test.ts +93 -50
  48. package/src/__tests__/middleware.scheduled.test.ts +42 -32
  49. package/src/__tests__/middleware.test.ts +212 -122
  50. package/src/__tests__/mtls-certificates.test.ts +589 -0
  51. package/src/__tests__/pages/deployment-list.test.ts +80 -0
  52. package/src/__tests__/pages/functions-build.test.ts +528 -0
  53. package/src/__tests__/pages/pages.test.ts +81 -0
  54. package/src/__tests__/pages/project-create.test.ts +63 -0
  55. package/src/__tests__/pages/project-list.test.ts +110 -0
  56. package/src/__tests__/pages/project-upload.test.ts +500 -0
  57. package/src/__tests__/pages/publish.test.ts +2864 -0
  58. package/src/__tests__/pages-deployment-tail.test.ts +239 -102
  59. package/src/__tests__/parse.test.ts +106 -0
  60. package/src/__tests__/publish.test.ts +2218 -1002
  61. package/src/__tests__/pubsub.test.ts +226 -100
  62. package/src/__tests__/queues.test.ts +42 -32
  63. package/src/__tests__/r2.test.ts +37 -56
  64. package/src/__tests__/secret.test.ts +179 -130
  65. package/src/__tests__/tail.test.ts +113 -23
  66. package/src/__tests__/test-old-node-version.js +3 -3
  67. package/src/__tests__/traverse-module-graph.test.ts +220 -0
  68. package/src/__tests__/tsconfig-sanity.ts +12 -0
  69. package/src/__tests__/tsconfig.json +8 -0
  70. package/src/__tests__/tsconfig.tsbuildinfo +1 -0
  71. package/src/__tests__/type-generation.test.ts +8 -0
  72. package/src/__tests__/user.test.ts +7 -18
  73. package/src/__tests__/whoami.test.tsx +8 -114
  74. package/src/__tests__/worker-namespace.test.ts +83 -69
  75. package/src/api/dev.ts +172 -61
  76. package/src/api/index.ts +10 -1
  77. package/src/api/mtls-certificate.ts +148 -0
  78. package/src/api/pages/create-worker-bundle-contents.ts +77 -0
  79. package/src/api/pages/index.ts +5 -0
  80. package/src/api/pages/publish.tsx +371 -0
  81. package/src/bundle.ts +139 -33
  82. package/src/cfetch/index.ts +0 -2
  83. package/src/cfetch/internal.ts +16 -21
  84. package/src/cli.ts +4 -4
  85. package/src/config/config.ts +14 -7
  86. package/src/config/environment.ts +80 -16
  87. package/src/config/index.ts +99 -30
  88. package/src/config/validation-helpers.ts +1 -1
  89. package/src/config/validation.ts +275 -9
  90. package/src/constellation/createProject.tsx +51 -0
  91. package/src/constellation/deleteProject.ts +51 -0
  92. package/src/constellation/deleteProjectModel.ts +68 -0
  93. package/src/constellation/index.ts +75 -0
  94. package/src/constellation/listCatalog.tsx +35 -0
  95. package/src/constellation/listModel.tsx +41 -0
  96. package/src/constellation/listProject.tsx +28 -0
  97. package/src/constellation/listRuntime.tsx +28 -0
  98. package/src/constellation/options.ts +17 -0
  99. package/src/constellation/types.ts +17 -0
  100. package/src/constellation/uploadModel.tsx +64 -0
  101. package/src/constellation/utils.ts +90 -0
  102. package/src/create-worker-preview.ts +19 -8
  103. package/src/create-worker-upload-form.ts +52 -5
  104. package/src/d1/backups.tsx +40 -44
  105. package/src/d1/create.tsx +50 -43
  106. package/src/d1/{delete.tsx → delete.ts} +8 -11
  107. package/src/d1/execute.tsx +171 -166
  108. package/src/d1/index.ts +5 -6
  109. package/src/d1/list.tsx +27 -13
  110. package/src/d1/migrations/apply.tsx +92 -64
  111. package/src/d1/migrations/create.tsx +31 -29
  112. package/src/d1/migrations/helpers.ts +66 -44
  113. package/src/d1/migrations/list.tsx +47 -31
  114. package/src/d1/migrations/options.ts +7 -2
  115. package/src/d1/options.ts +3 -3
  116. package/src/d1/splitter.ts +161 -0
  117. package/src/d1/{types.tsx → types.ts} +1 -0
  118. package/src/d1/utils.ts +2 -1
  119. package/src/delete.ts +8 -16
  120. package/src/deployments.ts +333 -42
  121. package/src/deprecated/index.ts +8 -302
  122. package/src/dev/dev.tsx +13 -22
  123. package/src/dev/local.tsx +131 -69
  124. package/src/dev/remote.tsx +35 -3
  125. package/src/dev/start-server.ts +83 -77
  126. package/src/dev/use-esbuild.ts +63 -52
  127. package/src/dev/validate-dev-props.ts +9 -0
  128. package/src/{dev-registry.tsx → dev-registry.ts} +9 -8
  129. package/src/dev.tsx +131 -110
  130. package/src/dialogs.ts +136 -0
  131. package/src/dispatch-namespace.ts +21 -17
  132. package/src/docs/helpers.ts +50 -0
  133. package/src/docs/index.ts +54 -0
  134. package/src/entry.ts +26 -11
  135. package/src/environment-variables/factory.ts +89 -0
  136. package/src/environment-variables/misc-variables.ts +30 -0
  137. package/src/generate/index.ts +298 -0
  138. package/src/{index.tsx → index.ts} +137 -56
  139. package/src/init.ts +254 -187
  140. package/src/inspect.ts +170 -9
  141. package/src/jest.d.ts +4 -0
  142. package/src/kv/helpers.ts +7 -4
  143. package/src/kv/index.ts +15 -17
  144. package/src/logger.ts +36 -5
  145. package/src/metrics/metrics-config.ts +1 -1
  146. package/src/metrics/send-event.ts +4 -1
  147. package/src/miniflare-cli/assets.ts +66 -31
  148. package/src/miniflare-cli/index.ts +5 -8
  149. package/src/miniflare-cli/tsconfig.json +9 -0
  150. package/src/miniflare-cli/tsconfig.tsbuildinfo +1 -0
  151. package/src/miniflare-cli/types.ts +11 -0
  152. package/src/module-collection.ts +92 -26
  153. package/src/mtls-certificate/cli.ts +155 -0
  154. package/src/pages/build.ts +423 -0
  155. package/src/pages/buildFunctions.ts +140 -0
  156. package/src/pages/{deployment-tails.tsx → deployment-tails.ts} +7 -10
  157. package/src/pages/deployments.tsx +9 -9
  158. package/src/pages/{dev.tsx → dev.ts} +167 -139
  159. package/src/pages/errors.ts +1 -0
  160. package/src/pages/functions/buildPlugin.ts +61 -54
  161. package/src/pages/functions/buildWorker.ts +217 -33
  162. package/src/pages/functions/tsconfig.json +8 -0
  163. package/src/pages/functions/tsconfig.tsbuildinfo +1 -0
  164. package/src/pages/{functions.tsx → functions.ts} +8 -4
  165. package/src/pages/{index.tsx → index.ts} +3 -3
  166. package/src/pages/projects.tsx +12 -22
  167. package/src/pages/publish.tsx +43 -227
  168. package/src/pages/types.ts +5 -0
  169. package/src/pages/upload.tsx +57 -14
  170. package/src/pages/utils.ts +1 -1
  171. package/src/parse.ts +23 -1
  172. package/src/paths.ts +1 -1
  173. package/src/publish/index.ts +20 -16
  174. package/src/publish/publish.ts +76 -46
  175. package/src/pubsub/{pubsub-commands.tsx → pubsub-commands.ts} +19 -20
  176. package/src/queues/cli/commands/consumer/add.ts +24 -24
  177. package/src/queues/cli/commands/consumer/index.ts +3 -6
  178. package/src/queues/cli/commands/consumer/remove.ts +11 -18
  179. package/src/queues/cli/commands/create.ts +8 -8
  180. package/src/queues/cli/commands/delete.ts +8 -8
  181. package/src/queues/cli/commands/index.ts +3 -4
  182. package/src/queues/cli/commands/list.ts +8 -8
  183. package/src/queues/client.ts +1 -0
  184. package/src/r2/helpers.ts +1 -0
  185. package/src/r2/index.ts +28 -28
  186. package/src/secret/index.ts +15 -16
  187. package/src/{sites.tsx → sites.ts} +165 -53
  188. package/src/tail/createTail.ts +37 -1
  189. package/src/tail/filters.ts +1 -1
  190. package/src/tail/index.ts +8 -11
  191. package/src/tail/printing.ts +25 -0
  192. package/src/traverse-module-graph.ts +54 -0
  193. package/src/tsconfig-sanity.ts +16 -0
  194. package/src/type-generation.ts +11 -3
  195. package/src/user/access.ts +0 -1
  196. package/src/user/auth-variables.ts +113 -0
  197. package/src/user/choose-account.tsx +1 -31
  198. package/src/user/index.ts +0 -1
  199. package/src/user/{user.tsx → user.ts} +114 -77
  200. package/src/utils/render.ts +93 -0
  201. package/src/{whoami.tsx → whoami.ts} +37 -71
  202. package/src/worker.ts +35 -1
  203. package/src/yargs-types.ts +18 -5
  204. package/templates/__tests__/tsconfig-sanity.ts +12 -0
  205. package/templates/__tests__/tsconfig.json +8 -0
  206. package/templates/__tests__/tsconfig.tsbuildinfo +1 -0
  207. package/templates/checked-fetch.js +9 -3
  208. package/templates/d1-beta-facade.js +42 -3
  209. package/templates/facade.d.ts +14 -0
  210. package/templates/first-party-worker-module-facade.ts +4 -3
  211. package/templates/format-dev-errors.ts +8 -6
  212. package/templates/gitignore +1 -0
  213. package/templates/init-tests/test-jest-new-worker.js +3 -5
  214. package/templates/init-tests/test-vitest-new-worker.js +3 -5
  215. package/templates/init-tests/test-vitest-new-worker.ts +25 -0
  216. package/templates/middleware/loader-modules.ts +2 -2
  217. package/templates/middleware/loader-sw.ts +6 -0
  218. package/templates/middleware/middleware-miniflare3-json-error.ts +17 -5
  219. package/templates/new-worker.ts +3 -0
  220. package/templates/pages-dev-pipeline.ts +4 -1
  221. package/templates/pages-shim.ts +4 -1
  222. package/templates/pages-template-plugin.ts +19 -10
  223. package/templates/serve-static-assets.ts +17 -14
  224. package/templates/service-bindings-module-facade.js +1 -0
  225. package/templates/tsconfig-sanity.ts +11 -0
  226. package/templates/tsconfig.init.json +105 -0
  227. package/templates/tsconfig.json +5 -103
  228. package/templates/tsconfig.tsbuildinfo +1 -0
  229. package/wrangler-dist/cli.d.ts +871 -73
  230. package/wrangler-dist/cli.js +80512 -90686
  231. package/wrangler-dist/wasm-sync.wasm +0 -0
  232. package/src/__tests__/api-devregistry.test.js +0 -56
  233. package/src/__tests__/d1.test.ts +0 -80
  234. package/src/__tests__/dialogs.test.tsx +0 -40
  235. package/src/__tests__/helpers/mock-cfetch.ts +0 -333
  236. package/src/__tests__/pages.test.ts +0 -2442
  237. package/src/dialogs.tsx +0 -168
  238. package/src/environment-variables.ts +0 -50
  239. package/src/pages/build.tsx +0 -270
  240. package/src/user/env-vars.ts +0 -46
  241. /package/src/{bundle-reporter.tsx → bundle-reporter.ts} +0 -0
  242. /package/src/d1/migrations/{index.tsx → index.ts} +0 -0
  243. /package/src/dev/{get-local-persistence-path.tsx → get-local-persistence-path.ts} +0 -0
  244. /package/src/pages/{hash.tsx → hash.ts} +0 -0
package/src/api/dev.ts CHANGED
@@ -3,28 +3,27 @@ import { startApiDev, startDev } from "../dev";
3
3
  import { logger } from "../logger";
4
4
 
5
5
  import type { Environment } from "../config";
6
- import type { EnablePagesAssetsServiceBindingOptions } from "../miniflare-cli";
6
+ import type { Rule } from "../config/environment";
7
+ import type { EnablePagesAssetsServiceBindingOptions } from "../miniflare-cli/types";
7
8
  import type { RequestInit, Response, RequestInfo } from "undici";
8
9
 
9
- interface DevOptions {
10
- config?: string;
11
- env?: string;
12
- ip?: string;
13
- port?: number;
14
- bundle?: boolean;
15
- inspectorPort?: number;
16
- localProtocol?: "http" | "https";
17
- assets?: string;
18
- site?: string;
19
- siteInclude?: string[];
20
- siteExclude?: string[];
21
- nodeCompat?: boolean;
22
- compatibilityDate?: string;
23
- compatibilityFlags?: string[];
24
- persist?: boolean;
25
- persistTo?: string;
26
- liveReload?: boolean;
27
- watch?: boolean;
10
+ export interface UnstableDevOptions {
11
+ config?: string; // Path to .toml configuration file, relative to cwd
12
+ env?: string; // Environment to use for operations and .env files
13
+ ip?: string; // IP address to listen on
14
+ port?: number; // Port to listen on
15
+ bundle?: boolean; // Set to false to skip internal build steps and directly publish script
16
+ inspectorPort?: number; // Port for devtools to connect to
17
+ localProtocol?: "http" | "https"; // Protocol to listen to requests on, defaults to http.
18
+ assets?: string; // Static assets to be served
19
+ site?: string; // Root folder of static assets for Workers Sites
20
+ siteInclude?: string[]; // Array of .gitignore-style patterns that match file or directory names from the sites directory. Only matched items will be uploaded.
21
+ siteExclude?: string[]; // Array of .gitignore-style patterns that match file or directory names from the sites directory. Matched items will not be uploaded.
22
+ nodeCompat?: boolean; // Enable Node.js compatibility
23
+ compatibilityDate?: string; // Date to use for compatibility checks
24
+ compatibilityFlags?: string[]; // Flags to use for compatibility checks
25
+ persist?: boolean; // Enable persistence for local mode, using default path: .wrangler/state
26
+ persistTo?: string; // Specify directory to use for local persistence (implies --persist)
28
27
  vars?: {
29
28
  [key: string]: unknown;
30
29
  };
@@ -44,25 +43,27 @@ interface DevOptions {
44
43
  bucket_name: string;
45
44
  preview_bucket_name?: string;
46
45
  }[];
47
- d1Databases?: Environment["d1_databases"];
48
- showInteractiveDevSession?: boolean;
49
- logLevel?: "none" | "info" | "error" | "log" | "warn" | "debug";
50
- logPrefix?: string;
46
+ processEntrypoint?: boolean;
47
+ moduleRoot?: string;
48
+ rules?: Rule[];
49
+ logLevel?: "none" | "info" | "error" | "log" | "warn" | "debug"; // Specify logging level [choices: "debug", "info", "log", "warn", "error", "none"] [default: "log"]
51
50
  inspect?: boolean;
52
51
  local?: boolean;
53
- forceLocal?: boolean;
54
- enablePagesAssetsServiceBinding?: EnablePagesAssetsServiceBindingOptions;
55
- _?: (string | number)[]; //yargs wants this
56
- $0?: string; //yargs wants this
57
- testScheduled?: boolean;
58
- experimentalLocal?: boolean;
59
52
  accountId?: string;
60
- experimentalLocalRemoteKv?: boolean;
61
- }
62
-
63
- interface DevApiOptions {
64
- testMode?: boolean;
65
- disableExperimentalWarning?: boolean;
53
+ experimental?: {
54
+ d1Databases?: Environment["d1_databases"];
55
+ disableExperimentalWarning?: boolean; // Disables wrangler's warning when unstable APIs are used.
56
+ disableDevRegistry?: boolean; // Disables wrangler's support multi-worker setups. May reduce flakiness when used in tests in CI.
57
+ enablePagesAssetsServiceBinding?: EnablePagesAssetsServiceBindingOptions;
58
+ experimentalLocal?: boolean; // Use Miniflare 3 instead of Miniflare 2
59
+ experimentalLocalRemoteKv?: boolean;
60
+ forceLocal?: boolean;
61
+ liveReload?: boolean; // Auto reload HTML pages when change is detected in local mode
62
+ showInteractiveDevSession?: boolean;
63
+ testMode?: boolean; // This option shouldn't be used - We plan on removing it eventually
64
+ testScheduled?: boolean; // Test scheduled events by visiting /__scheduled in browser
65
+ watch?: boolean; // unstable_dev doesn't support watch-mode yet in testMode
66
+ };
66
67
  }
67
68
 
68
69
  export interface UnstableDevWorker {
@@ -77,11 +78,44 @@ export interface UnstableDevWorker {
77
78
  */
78
79
  export async function unstable_dev(
79
80
  script: string,
80
- options?: DevOptions,
81
- apiOptions?: DevApiOptions
81
+ options?: UnstableDevOptions,
82
+ apiOptions?: unknown
82
83
  ): Promise<UnstableDevWorker> {
83
- const { testMode = true, disableExperimentalWarning = false } =
84
- apiOptions || {};
84
+ // Note that not every experimental option is passed directly through to the underlying dev API - experimental options can be used here in unstable_dev. Otherwise we could just pass experimental down to dev blindly.
85
+
86
+ const experimentalOptions = {
87
+ // Defaults for "experimental" options
88
+ disableDevRegistry: false,
89
+ disableExperimentalWarning: false,
90
+ showInteractiveDevSession: false,
91
+ testMode: true,
92
+ // Override all options, including overwriting with "undefined"
93
+ ...options?.experimental,
94
+ };
95
+
96
+ const {
97
+ // there are two types of "experimental" options:
98
+ // 1. options to unstable_dev that we're still testing or are unsure of
99
+ disableDevRegistry,
100
+ disableExperimentalWarning,
101
+ forceLocal,
102
+ liveReload,
103
+ showInteractiveDevSession,
104
+ testMode,
105
+ testScheduled,
106
+ // 2. options for alpha/beta products/libs
107
+ d1Databases,
108
+ experimentalLocal,
109
+ experimentalLocalRemoteKv,
110
+ enablePagesAssetsServiceBinding,
111
+ } = experimentalOptions;
112
+
113
+ if (apiOptions) {
114
+ logger.error(
115
+ "unstable_dev's third argument (apiOptions) has been deprecated in favor of an `experimental` property within the second argument (options).\nPlease update your code from:\n`await unstable_dev('...', {...}, {...});`\nto:\n`await unstable_dev('...', {..., experimental: {...}});`"
116
+ );
117
+ }
118
+
85
119
  if (!disableExperimentalWarning) {
86
120
  logger.warn(
87
121
  `unstable_dev() is experimental\nunstable_dev()'s behaviour will likely change in future releases`
@@ -101,17 +135,60 @@ export async function unstable_dev(
101
135
  script: script,
102
136
  inspect: false,
103
137
  logLevel: "none",
104
- showInteractiveDevSession: false,
105
138
  _: [],
106
139
  $0: "",
107
140
  port: options?.port ?? 0,
108
141
  local: true,
109
- ...options,
142
+ d1Databases,
143
+ disableDevRegistry,
144
+ testScheduled: testScheduled ?? false,
145
+ experimentalLocal: experimentalLocal ?? false,
146
+ experimentalLocalRemoteKv: experimentalLocalRemoteKv ?? false,
147
+ enablePagesAssetsServiceBinding,
148
+ liveReload,
149
+ showInteractiveDevSession,
110
150
  onReady: (address, port) => {
111
151
  readyPort = port;
112
152
  readyAddress = address;
113
153
  ready(devServer);
114
154
  },
155
+ config: options?.config,
156
+ env: options?.env,
157
+ processEntrypoint: !!options?.processEntrypoint,
158
+ bundle: options?.bundle,
159
+ compatibilityDate: options?.compatibilityDate,
160
+ compatibilityFlags: options?.compatibilityFlags,
161
+ ip: options?.ip,
162
+ inspectorPort: options?.inspectorPort,
163
+ v: undefined,
164
+ localProtocol: options?.localProtocol,
165
+ assets: options?.assets,
166
+ site: options?.site, // Root folder of static assets for Workers Sites
167
+ siteInclude: options?.siteInclude, // Array of .gitignore-style patterns that match file or directory names from the sites directory. Only matched items will be uploaded.
168
+ siteExclude: options?.siteExclude, // Array of .gitignore-style patterns that match file or directory names from the sites directory. Matched items will not be uploaded.
169
+ nodeCompat: options?.nodeCompat, // Enable Node.js compatibility
170
+ persist: options?.persist, // Enable persistence for local mode, using default path: .wrangler/state
171
+ persistTo: options?.persistTo, // Specify directory to use for local persistence (implies --persist)
172
+ experimentalJsonConfig: undefined,
173
+ name: undefined,
174
+ noBundle: false,
175
+ format: undefined,
176
+ latest: false,
177
+ routes: undefined,
178
+ host: undefined,
179
+ localUpstream: undefined,
180
+ experimentalPublic: undefined,
181
+ upstreamProtocol: undefined,
182
+ var: undefined,
183
+ define: undefined,
184
+ jsxFactory: undefined,
185
+ jsxFragment: undefined,
186
+ tsconfig: undefined,
187
+ minify: undefined,
188
+ experimentalEnableLocalPersistence: undefined,
189
+ legacyEnv: undefined,
190
+ public: undefined,
191
+ ...options,
115
192
  });
116
193
  }).then((devServer) => {
117
194
  // now that the inner promise has resolved, we can resolve the outer promise
@@ -147,16 +224,61 @@ export async function unstable_dev(
147
224
  const devServer = startDev({
148
225
  script: script,
149
226
  inspect: false,
150
- showInteractiveDevSession: false,
151
227
  _: [],
152
228
  $0: "",
229
+ logLevel: options?.logLevel ?? "log",
230
+ port: options?.port ?? 0,
153
231
  local: true,
154
- ...options,
232
+ showInteractiveDevSession,
233
+ d1Databases,
234
+ disableDevRegistry,
235
+ testScheduled: testScheduled ?? false,
236
+ experimentalLocal: experimentalLocal ?? false,
237
+ experimentalLocalRemoteKv: experimentalLocalRemoteKv ?? false,
238
+ enablePagesAssetsServiceBinding,
239
+ forceLocal,
240
+ liveReload,
155
241
  onReady: (address, port) => {
156
242
  readyPort = port;
157
243
  readyAddress = address;
158
244
  ready(devServer);
159
245
  },
246
+ config: options?.config,
247
+ env: options?.env,
248
+ bundle: options?.bundle,
249
+ compatibilityDate: options?.compatibilityDate,
250
+ compatibilityFlags: options?.compatibilityFlags,
251
+ ip: options?.ip,
252
+ inspectorPort: options?.inspectorPort,
253
+ v: undefined,
254
+ localProtocol: options?.localProtocol,
255
+ assets: options?.assets,
256
+ site: options?.site, // Root folder of static assets for Workers Sites
257
+ siteInclude: options?.siteInclude, // Array of .gitignore-style patterns that match file or directory names from the sites directory. Only matched items will be uploaded.
258
+ siteExclude: options?.siteExclude, // Array of .gitignore-style patterns that match file or directory names from the sites directory. Matched items will not be uploaded.
259
+ nodeCompat: options?.nodeCompat, // Enable Node.js compatibility
260
+ persist: options?.persist, // Enable persistence for local mode, using default path: .wrangler/state
261
+ persistTo: options?.persistTo, // Specify directory to use for local persistence (implies --persist)
262
+ experimentalJsonConfig: undefined,
263
+ name: undefined,
264
+ noBundle: false,
265
+ format: undefined,
266
+ latest: false,
267
+ routes: undefined,
268
+ host: undefined,
269
+ localUpstream: undefined,
270
+ experimentalPublic: undefined,
271
+ upstreamProtocol: undefined,
272
+ var: undefined,
273
+ define: undefined,
274
+ jsxFactory: undefined,
275
+ jsxFragment: undefined,
276
+ tsconfig: undefined,
277
+ minify: undefined,
278
+ experimentalEnableLocalPersistence: undefined,
279
+ legacyEnv: undefined,
280
+ public: undefined,
281
+ ...options,
160
282
  });
161
283
  }).then((devServer) => {
162
284
  resolve({
@@ -184,27 +306,16 @@ export async function unstable_dev(
184
306
  export function parseRequestInput(
185
307
  readyAddress: string,
186
308
  readyPort: number,
187
- input?: RequestInfo,
309
+ input: RequestInfo = "/",
188
310
  init?: RequestInit,
189
311
  protocol: "http" | "https" = "http"
190
312
  ): [RequestInfo, RequestInit | undefined] {
191
313
  if (input instanceof Request) {
192
314
  return [input, undefined];
193
- } else if (input instanceof URL) {
194
- input = `${protocol}://${readyAddress}:${readyPort}${input.pathname}`;
195
- } else if (typeof input === "string") {
196
- try {
197
- // Want to strip the URL to only get the pathname, but the user could pass in only the pathname
198
- // Will error if we try and pass "/something" into new URL("/something")
199
- input = `${protocol}://${readyAddress}:${readyPort}${
200
- new URL(input).pathname
201
- }`;
202
- } catch {
203
- input = `${protocol}://${readyAddress}:${readyPort}${input}`;
204
- }
205
- } else {
206
- input = `${protocol}://${readyAddress}:${readyPort}`;
207
315
  }
208
-
209
- return [input, init];
316
+ const url = new URL(`${input}`, `${protocol}://${readyAddress}:${readyPort}`);
317
+ url.protocol = protocol;
318
+ url.hostname = readyAddress;
319
+ url.port = readyPort.toString();
320
+ return [url, init];
210
321
  }
package/src/api/index.ts CHANGED
@@ -1,2 +1,11 @@
1
1
  export { unstable_dev } from "./dev";
2
- export type { UnstableDevWorker } from "./dev";
2
+ export type { UnstableDevWorker, UnstableDevOptions } from "./dev";
3
+ export { unstable_pages } from "./pages";
4
+ export {
5
+ uploadMTlsCertificate,
6
+ uploadMTlsCertificateFromFs,
7
+ listMTlsCertificates,
8
+ getMTlsCertificate,
9
+ getMTlsCertificateByName,
10
+ deleteMTlsCertificate,
11
+ } from "./mtls-certificate";
@@ -0,0 +1,148 @@
1
+ import { fetchResult } from "../cfetch";
2
+ import { readFileSync } from "../parse";
3
+
4
+ /**
5
+ * the representation of an mTLS certificate in the account certificate store
6
+ */
7
+ export interface MTlsCertificateResponse {
8
+ id: string;
9
+ name?: string;
10
+ ca: boolean;
11
+ certificates: string;
12
+ expires_on: string;
13
+ issuer: string;
14
+ serial_number: string;
15
+ signature: string;
16
+ uploaded_on: string;
17
+ }
18
+
19
+ /**
20
+ * details for uploading an mTLS certificate from disk
21
+ */
22
+ export interface MTlsCertificateUploadDetails {
23
+ certificateChainFilename: string;
24
+ privateKeyFilename: string;
25
+ name?: string;
26
+ }
27
+
28
+ /**
29
+ * details for uploading an mTLS certificate via the ssl api
30
+ */
31
+ export interface MTlsCertificateBody {
32
+ certificateChain: string;
33
+ privateKey: string;
34
+ name?: string;
35
+ }
36
+
37
+ /**
38
+ * supported filters for listing mTLS certificates via the ssl api
39
+ */
40
+ export interface MTlsCertificateListFilter {
41
+ name?: string;
42
+ }
43
+
44
+ /**
45
+ * indicates that looking up a certificate by name failed due to zero matching results
46
+ */
47
+ export class ErrorMTlsCertificateNameNotFound extends Error {}
48
+
49
+ /**
50
+ * indicates that looking up a certificate by name failed due to more than one matching results
51
+ */
52
+ export class ErrorMTlsCertificateManyNamesMatch extends Error {}
53
+
54
+ /**
55
+ * reads an mTLS certificate and private key pair from disk and uploads it to the account mTLS certificate store
56
+ */
57
+ export async function uploadMTlsCertificateFromFs(
58
+ accountId: string,
59
+ details: MTlsCertificateUploadDetails
60
+ ): Promise<MTlsCertificateResponse> {
61
+ return await uploadMTlsCertificate(accountId, {
62
+ certificateChain: readFileSync(details.certificateChainFilename),
63
+ privateKey: readFileSync(details.privateKeyFilename),
64
+ name: details.name,
65
+ });
66
+ }
67
+
68
+ /**
69
+ * uploads an mTLS certificate and private key pair to the account mTLS certificate store
70
+ */
71
+ export async function uploadMTlsCertificate(
72
+ accountId: string,
73
+ body: MTlsCertificateBody
74
+ ): Promise<MTlsCertificateResponse> {
75
+ return await fetchResult(`/accounts/${accountId}/mtls_certificates`, {
76
+ method: "POST",
77
+ body: JSON.stringify({
78
+ name: body.name,
79
+ certificates: body.certificateChain,
80
+ private_key: body.privateKey,
81
+ ca: false,
82
+ }),
83
+ });
84
+ }
85
+
86
+ /**
87
+ * fetches an mTLS certificate from the account mTLS certificate store by ID
88
+ */
89
+ export async function getMTlsCertificate(
90
+ accountId: string,
91
+ id: string
92
+ ): Promise<MTlsCertificateResponse> {
93
+ return await fetchResult(
94
+ `/accounts/${accountId}/mtls_certificates/${id}`,
95
+ {}
96
+ );
97
+ }
98
+
99
+ /**
100
+ * lists mTLS certificates for an account. filtering by name is supported
101
+ */
102
+ export async function listMTlsCertificates(
103
+ accountId: string,
104
+ filter: MTlsCertificateListFilter
105
+ ): Promise<MTlsCertificateResponse[]> {
106
+ const params = new URLSearchParams();
107
+ params.append("ca", "false");
108
+ if (filter.name) {
109
+ params.append("name", filter.name);
110
+ }
111
+ return await fetchResult(
112
+ `/accounts/${accountId}/mtls_certificates`,
113
+ {},
114
+ params
115
+ );
116
+ }
117
+
118
+ /**
119
+ * fetches an mTLS certificate from the account mTLS certificate store by name. will throw an error if no certificates are found, or multiple are found with that name
120
+ */
121
+ export async function getMTlsCertificateByName(
122
+ accountId: string,
123
+ name: string
124
+ ): Promise<MTlsCertificateResponse> {
125
+ const certificates = await listMTlsCertificates(accountId, { name });
126
+ if (certificates.length === 0) {
127
+ throw new ErrorMTlsCertificateNameNotFound(
128
+ `certificate not found with name "${name}"`
129
+ );
130
+ }
131
+ if (certificates.length > 1) {
132
+ throw new ErrorMTlsCertificateManyNamesMatch(
133
+ `multiple certificates found with name "${name}"`
134
+ );
135
+ }
136
+ const certificate = certificates[0];
137
+ return certificate;
138
+ }
139
+
140
+ export async function deleteMTlsCertificate(
141
+ accountId: string,
142
+ certificateId: string
143
+ ) {
144
+ return await fetchResult(
145
+ `/accounts/${accountId}/mtls_certificates/${certificateId}`,
146
+ { method: "DELETE" }
147
+ );
148
+ }
@@ -0,0 +1,77 @@
1
+ import { readFileSync } from "node:fs";
2
+ import path from "node:path";
3
+ import { Response } from "undici";
4
+ import { createWorkerUploadForm } from "../../create-worker-upload-form";
5
+ import type { BundleResult } from "../../bundle";
6
+ import type { CfWorkerInit } from "../../worker";
7
+ import type { Blob } from "node:buffer";
8
+ import type { FormData } from "undici";
9
+
10
+ /**
11
+ * Takes a Worker bundle - `BundleResult` - and generates the _worker.bundle
12
+ * contents
13
+ */
14
+ export async function createUploadWorkerBundleContents(
15
+ workerBundle: BundleResult
16
+ ): Promise<Blob> {
17
+ const workerBundleFormData = createWorkerBundleFormData(workerBundle);
18
+ const metadata = JSON.parse(workerBundleFormData.get("metadata") as string);
19
+
20
+ /**
21
+ * Pages doesn't need the metadata bindings returned by
22
+ * `createWorkerBundleFormData`. Let's strip them out and return only
23
+ * the contents we need
24
+ */
25
+ workerBundleFormData.set(
26
+ "metadata",
27
+ JSON.stringify({ main_module: metadata.main_module })
28
+ );
29
+
30
+ return await new Response(workerBundleFormData).blob();
31
+ }
32
+
33
+ /**
34
+ * Creates a `FormData` upload from a `BundleResult`
35
+ */
36
+ function createWorkerBundleFormData(workerBundle: BundleResult): FormData {
37
+ const mainModule = {
38
+ name: path.basename(workerBundle.resolvedEntryPointPath),
39
+ content: readFileSync(workerBundle.resolvedEntryPointPath, {
40
+ encoding: "utf-8",
41
+ }),
42
+ type: workerBundle.bundleType || "esm",
43
+ };
44
+
45
+ const worker: CfWorkerInit = {
46
+ name: mainModule.name,
47
+ main: mainModule,
48
+ modules: workerBundle.modules,
49
+ bindings: {
50
+ vars: undefined,
51
+ kv_namespaces: undefined,
52
+ send_email: undefined,
53
+ wasm_modules: undefined,
54
+ text_blobs: undefined,
55
+ data_blobs: undefined,
56
+ durable_objects: undefined,
57
+ queues: undefined,
58
+ r2_buckets: undefined,
59
+ d1_databases: undefined,
60
+ services: undefined,
61
+ analytics_engine_datasets: undefined,
62
+ dispatch_namespaces: undefined,
63
+ mtls_certificates: undefined,
64
+ logfwdr: undefined,
65
+ unsafe: undefined,
66
+ },
67
+ migrations: undefined,
68
+ compatibility_date: undefined,
69
+ compatibility_flags: undefined,
70
+ usage_model: undefined,
71
+ keepVars: undefined,
72
+ logpush: undefined,
73
+ placement: undefined,
74
+ };
75
+
76
+ return createWorkerUploadForm(worker);
77
+ }
@@ -0,0 +1,5 @@
1
+ import { publish } from "./publish";
2
+
3
+ export const unstable_pages = {
4
+ publish,
5
+ };