wrangler 0.0.0-e978986 → 0.0.0-e9e9872

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 (186) hide show
  1. package/README.md +7 -1
  2. package/bin/wrangler.js +114 -57
  3. package/kv-asset-handler.js +1 -0
  4. package/miniflare-dist/index.mjs +10 -2
  5. package/package.json +159 -152
  6. package/src/__tests__/config-cache-without-cache-dir.test.ts +38 -0
  7. package/src/__tests__/config-cache.test.ts +30 -24
  8. package/src/__tests__/configuration.test.ts +3935 -3363
  9. package/src/__tests__/dev.test.tsx +1128 -949
  10. package/src/__tests__/guess-worker-format.test.ts +68 -68
  11. package/src/__tests__/helpers/cmd-shim.d.ts +6 -6
  12. package/src/__tests__/helpers/mock-account-id.ts +24 -24
  13. package/src/__tests__/helpers/mock-bin.ts +20 -20
  14. package/src/__tests__/helpers/mock-cfetch.ts +92 -92
  15. package/src/__tests__/helpers/mock-console.ts +49 -39
  16. package/src/__tests__/helpers/mock-dialogs.ts +94 -71
  17. package/src/__tests__/helpers/mock-http-server.ts +30 -30
  18. package/src/__tests__/helpers/mock-istty.ts +65 -18
  19. package/src/__tests__/helpers/mock-kv.ts +26 -26
  20. package/src/__tests__/helpers/mock-oauth-flow.ts +223 -228
  21. package/src/__tests__/helpers/mock-process.ts +39 -0
  22. package/src/__tests__/helpers/mock-stdin.ts +82 -77
  23. package/src/__tests__/helpers/mock-web-socket.ts +21 -21
  24. package/src/__tests__/helpers/run-in-tmp.ts +27 -28
  25. package/src/__tests__/helpers/run-wrangler.ts +8 -8
  26. package/src/__tests__/helpers/write-worker-source.ts +16 -16
  27. package/src/__tests__/helpers/write-wrangler-toml.ts +9 -9
  28. package/src/__tests__/https-options.test.ts +142 -109
  29. package/src/__tests__/index.test.ts +239 -233
  30. package/src/__tests__/init.test.ts +1605 -1180
  31. package/src/__tests__/jest.setup.ts +76 -33
  32. package/src/__tests__/kv.test.ts +1160 -991
  33. package/src/__tests__/logger.test.ts +100 -74
  34. package/src/__tests__/package-manager.test.ts +303 -303
  35. package/src/__tests__/pages.test.ts +1160 -563
  36. package/src/__tests__/parse.test.ts +252 -252
  37. package/src/__tests__/publish.test.ts +6426 -5299
  38. package/src/__tests__/pubsub.test.ts +367 -0
  39. package/src/__tests__/r2.test.ts +133 -133
  40. package/src/__tests__/route.test.ts +18 -18
  41. package/src/__tests__/secret.test.ts +470 -459
  42. package/src/__tests__/tail.test.ts +538 -530
  43. package/src/__tests__/user.test.ts +124 -112
  44. package/src/__tests__/whoami.test.tsx +208 -83
  45. package/src/__tests__/worker-namespace.test.ts +327 -0
  46. package/src/abort.d.ts +1 -1
  47. package/src/api/dev.ts +52 -0
  48. package/src/api/index.ts +1 -0
  49. package/src/bundle-reporter.tsx +29 -0
  50. package/src/bundle.ts +158 -146
  51. package/src/cfetch/index.ts +80 -80
  52. package/src/cfetch/internal.ts +92 -88
  53. package/src/cli.ts +21 -7
  54. package/src/config/config.ts +204 -195
  55. package/src/config/diagnostics.ts +61 -61
  56. package/src/config/environment.ts +390 -357
  57. package/src/config/index.ts +206 -193
  58. package/src/config/validation-helpers.ts +366 -357
  59. package/src/config/validation.ts +1573 -1367
  60. package/src/config-cache.ts +79 -41
  61. package/src/create-worker-preview.ts +206 -136
  62. package/src/create-worker-upload-form.ts +247 -238
  63. package/src/dev/dev-vars.ts +13 -13
  64. package/src/dev/dev.tsx +334 -336
  65. package/src/dev/local.tsx +310 -274
  66. package/src/dev/remote.tsx +366 -211
  67. package/src/dev/use-esbuild.ts +126 -94
  68. package/src/dev.tsx +538 -0
  69. package/src/dialogs.tsx +97 -97
  70. package/src/durable.ts +87 -87
  71. package/src/entry.ts +234 -228
  72. package/src/environment-variables.ts +23 -23
  73. package/src/errors.ts +6 -6
  74. package/src/faye-websocket.d.ts +6 -0
  75. package/src/generate.ts +33 -0
  76. package/src/git-client.ts +42 -0
  77. package/src/global-wrangler-config-path.ts +26 -0
  78. package/src/https-options.ts +84 -80
  79. package/src/index.tsx +1800 -2752
  80. package/src/init.ts +549 -0
  81. package/src/inspect.ts +593 -593
  82. package/src/intl-polyfill.d.ts +123 -123
  83. package/src/is-interactive.ts +12 -0
  84. package/src/kv.ts +299 -277
  85. package/src/logger.ts +46 -39
  86. package/src/miniflare-cli/enum-keys.ts +8 -8
  87. package/src/miniflare-cli/index.ts +43 -31
  88. package/src/miniflare-cli/request-context.ts +18 -18
  89. package/src/module-collection.ts +212 -212
  90. package/src/open-in-browser.ts +4 -6
  91. package/src/package-manager.ts +173 -128
  92. package/src/pages/build.tsx +202 -0
  93. package/src/pages/constants.ts +7 -0
  94. package/src/pages/deployments.tsx +101 -0
  95. package/src/pages/dev.tsx +964 -0
  96. package/src/pages/functions/buildPlugin.ts +105 -0
  97. package/src/pages/functions/buildWorker.ts +151 -0
  98. package/{pages → src/pages}/functions/filepath-routing.test.ts +113 -113
  99. package/src/pages/functions/filepath-routing.ts +189 -0
  100. package/src/pages/functions/identifiers.ts +78 -0
  101. package/src/pages/functions/routes.ts +151 -0
  102. package/src/pages/index.tsx +84 -0
  103. package/src/pages/projects.tsx +157 -0
  104. package/src/pages/publish.tsx +335 -0
  105. package/src/pages/types.ts +40 -0
  106. package/src/pages/upload.tsx +396 -0
  107. package/src/pages/utils.ts +12 -0
  108. package/src/parse.ts +209 -125
  109. package/src/paths.ts +6 -6
  110. package/src/preview.ts +31 -0
  111. package/src/proxy.ts +400 -389
  112. package/src/publish.ts +702 -505
  113. package/src/pubsub/index.ts +286 -0
  114. package/src/pubsub/pubsub-commands.tsx +577 -0
  115. package/src/r2.ts +19 -19
  116. package/src/selfsigned.d.ts +23 -23
  117. package/src/sites.tsx +278 -201
  118. package/src/tail/filters.ts +108 -108
  119. package/src/tail/index.ts +217 -217
  120. package/src/tail/printing.ts +45 -45
  121. package/src/update-check.ts +11 -11
  122. package/src/user/choose-account.tsx +60 -0
  123. package/src/user/env-vars.ts +46 -0
  124. package/src/user/generate-auth-url.ts +33 -0
  125. package/src/user/generate-random-state.ts +16 -0
  126. package/src/user/index.ts +3 -0
  127. package/src/user/user.tsx +1170 -0
  128. package/src/whoami.tsx +61 -41
  129. package/src/worker-namespace.ts +190 -0
  130. package/src/worker.ts +110 -99
  131. package/src/zones.ts +76 -0
  132. package/templates/checked-fetch.js +17 -0
  133. package/templates/new-worker-scheduled.js +4 -4
  134. package/templates/new-worker-scheduled.ts +16 -16
  135. package/templates/new-worker.js +3 -3
  136. package/templates/new-worker.ts +15 -15
  137. package/templates/no-op-worker.js +10 -0
  138. package/templates/pages-template-plugin.ts +155 -0
  139. package/templates/pages-template-worker.ts +161 -0
  140. package/templates/static-asset-facade.js +38 -36
  141. package/templates/tsconfig.json +95 -95
  142. package/wrangler-dist/cli.d.ts +298 -0
  143. package/wrangler-dist/cli.js +33496 -31370
  144. package/pages/functions/buildPlugin.ts +0 -105
  145. package/pages/functions/buildWorker.ts +0 -151
  146. package/pages/functions/filepath-routing.ts +0 -189
  147. package/pages/functions/identifiers.ts +0 -78
  148. package/pages/functions/routes.ts +0 -156
  149. package/pages/functions/template-plugin.ts +0 -147
  150. package/pages/functions/template-worker.ts +0 -143
  151. package/src/__tests__/helpers/faye-websocket.d.ts +0 -6
  152. package/src/pages.tsx +0 -2027
  153. package/src/user.tsx +0 -1203
  154. package/vendor/@cloudflare/kv-asset-handler/CHANGELOG.md +0 -332
  155. package/vendor/@cloudflare/kv-asset-handler/LICENSE_APACHE +0 -176
  156. package/vendor/@cloudflare/kv-asset-handler/LICENSE_MIT +0 -25
  157. package/vendor/@cloudflare/kv-asset-handler/README.md +0 -245
  158. package/vendor/@cloudflare/kv-asset-handler/dist/index.d.ts +0 -32
  159. package/vendor/@cloudflare/kv-asset-handler/dist/index.js +0 -354
  160. package/vendor/@cloudflare/kv-asset-handler/dist/mocks.d.ts +0 -13
  161. package/vendor/@cloudflare/kv-asset-handler/dist/mocks.js +0 -148
  162. package/vendor/@cloudflare/kv-asset-handler/dist/test/getAssetFromKV.d.ts +0 -1
  163. package/vendor/@cloudflare/kv-asset-handler/dist/test/getAssetFromKV.js +0 -436
  164. package/vendor/@cloudflare/kv-asset-handler/dist/test/mapRequestToAsset.d.ts +0 -1
  165. package/vendor/@cloudflare/kv-asset-handler/dist/test/mapRequestToAsset.js +0 -40
  166. package/vendor/@cloudflare/kv-asset-handler/dist/test/serveSinglePageApp.d.ts +0 -1
  167. package/vendor/@cloudflare/kv-asset-handler/dist/test/serveSinglePageApp.js +0 -42
  168. package/vendor/@cloudflare/kv-asset-handler/dist/types.d.ts +0 -26
  169. package/vendor/@cloudflare/kv-asset-handler/dist/types.js +0 -31
  170. package/vendor/@cloudflare/kv-asset-handler/package.json +0 -52
  171. package/vendor/@cloudflare/kv-asset-handler/src/index.ts +0 -296
  172. package/vendor/@cloudflare/kv-asset-handler/src/mocks.ts +0 -136
  173. package/vendor/@cloudflare/kv-asset-handler/src/test/getAssetFromKV.ts +0 -464
  174. package/vendor/@cloudflare/kv-asset-handler/src/test/mapRequestToAsset.ts +0 -33
  175. package/vendor/@cloudflare/kv-asset-handler/src/test/serveSinglePageApp.ts +0 -42
  176. package/vendor/@cloudflare/kv-asset-handler/src/types.ts +0 -39
  177. package/vendor/wrangler-mime/CHANGELOG.md +0 -289
  178. package/vendor/wrangler-mime/LICENSE +0 -21
  179. package/vendor/wrangler-mime/Mime.js +0 -97
  180. package/vendor/wrangler-mime/README.md +0 -187
  181. package/vendor/wrangler-mime/cli.js +0 -46
  182. package/vendor/wrangler-mime/index.js +0 -4
  183. package/vendor/wrangler-mime/lite.js +0 -4
  184. package/vendor/wrangler-mime/package.json +0 -52
  185. package/vendor/wrangler-mime/types/other.js +0 -1
  186. package/vendor/wrangler-mime/types/standard.js +0 -1
@@ -1,464 +0,0 @@
1
- import test from 'ava'
2
- import { mockGlobal, getEvent, sleep, mockKV, mockManifest } from '../mocks'
3
- import { getAssetFromKV, mapRequestToAsset } from '../index'
4
- import { KVError } from '../types'
5
-
6
- test('getAssetFromKV return correct val from KV and default caching', async (t) => {
7
- mockGlobal()
8
- const event = getEvent(new Request('https://blah.com/key1.txt'))
9
- const res = await getAssetFromKV(event)
10
-
11
- if (res) {
12
- t.is(res.headers.get('cache-control'), null)
13
- t.is(res.headers.get('cf-cache-status'), 'MISS')
14
- t.is(await res.text(), 'val1')
15
- t.true(res.headers.get('content-type').includes('text'))
16
- } else {
17
- t.fail('Response was undefined')
18
- }
19
- })
20
- test('getAssetFromKV evaluated the file matching the extensionless path first /client/ -> client', async (t) => {
21
- mockGlobal()
22
- const event = getEvent(new Request(`https://foo.com/client/`))
23
- const res = await getAssetFromKV(event)
24
- t.is(await res.text(), 'important file')
25
- t.true(res.headers.get('content-type').includes('text'))
26
- })
27
- test('getAssetFromKV evaluated the file matching the extensionless path first /client -> client', async (t) => {
28
- mockGlobal()
29
- const event = getEvent(new Request(`https://foo.com/client`))
30
- const res = await getAssetFromKV(event)
31
- t.is(await res.text(), 'important file')
32
- t.true(res.headers.get('content-type').includes('text'))
33
- })
34
-
35
- test('getAssetFromKV if not in asset manifest still returns nohash.txt', async (t) => {
36
- mockGlobal()
37
- const event = getEvent(new Request('https://blah.com/nohash.txt'))
38
- const res = await getAssetFromKV(event)
39
-
40
- if (res) {
41
- t.is(await res.text(), 'no hash but still got some result')
42
- t.true(res.headers.get('content-type').includes('text'))
43
- } else {
44
- t.fail('Response was undefined')
45
- }
46
- })
47
-
48
- test('getAssetFromKV if no asset manifest /client -> client fails', async (t) => {
49
- mockGlobal()
50
- const event = getEvent(new Request(`https://foo.com/client`))
51
- const error: KVError = await t.throwsAsync(getAssetFromKV(event, { ASSET_MANIFEST: {} }))
52
- t.is(error.status, 404)
53
- })
54
-
55
- test('getAssetFromKV if sub/ -> sub/index.html served', async (t) => {
56
- mockGlobal()
57
- const event = getEvent(new Request(`https://foo.com/sub`))
58
- const res = await getAssetFromKV(event)
59
- if (res) {
60
- t.is(await res.text(), 'picturedis')
61
- } else {
62
- t.fail('Response was undefined')
63
- }
64
- })
65
-
66
- test('getAssetFromKV gets index.html by default for / requests', async (t) => {
67
- mockGlobal()
68
- const event = getEvent(new Request('https://blah.com/'))
69
- const res = await getAssetFromKV(event)
70
-
71
- if (res) {
72
- t.is(await res.text(), 'index.html')
73
- t.true(res.headers.get('content-type').includes('html'))
74
- } else {
75
- t.fail('Response was undefined')
76
- }
77
- })
78
-
79
- test('getAssetFromKV non ASCII path support', async (t) => {
80
- mockGlobal()
81
- const event = getEvent(new Request('https://blah.com/测试.html'))
82
- const res = await getAssetFromKV(event)
83
-
84
- if (res) {
85
- t.is(await res.text(), 'My filename is non-ascii')
86
- } else {
87
- t.fail('Response was undefined')
88
- }
89
- })
90
-
91
- test('getAssetFromKV supports browser percent encoded URLs', async (t) => {
92
- mockGlobal()
93
- const event = getEvent(new Request('https://example.com/%not-really-percent-encoded.html'))
94
- const res = await getAssetFromKV(event)
95
-
96
- if (res) {
97
- t.is(await res.text(), 'browser percent encoded')
98
- } else {
99
- t.fail('Response was undefined')
100
- }
101
- })
102
-
103
- test('getAssetFromKV supports user percent encoded URLs', async (t) => {
104
- mockGlobal()
105
- const event = getEvent(new Request('https://blah.com/%2F.html'))
106
- const res = await getAssetFromKV(event)
107
-
108
- if (res) {
109
- t.is(await res.text(), 'user percent encoded')
110
- } else {
111
- t.fail('Response was undefined')
112
- }
113
- })
114
-
115
- test('getAssetFromKV only decode URL when necessary', async (t) => {
116
- mockGlobal()
117
- const event1 = getEvent(new Request('https://blah.com/%E4%BD%A0%E5%A5%BD.html'))
118
- const event2 = getEvent(new Request('https://blah.com/你好.html'))
119
- const res1 = await getAssetFromKV(event1)
120
- const res2 = await getAssetFromKV(event2)
121
-
122
- if (res1 && res2) {
123
- t.is(await res1.text(), 'Im important')
124
- t.is(await res2.text(), 'Im important')
125
- } else {
126
- t.fail('Response was undefined')
127
- }
128
- })
129
-
130
- test('getAssetFromKV Support for user decode url path', async (t) => {
131
- mockGlobal()
132
- const event1 = getEvent(new Request('https://blah.com/%E4%BD%A0%E5%A5%BD/'))
133
- const event2 = getEvent(new Request('https://blah.com/你好/'))
134
- const res1 = await getAssetFromKV(event1)
135
- const res2 = await getAssetFromKV(event2)
136
-
137
- if (res1 && res2) {
138
- t.is(await res1.text(), 'My path is non-ascii')
139
- t.is(await res2.text(), 'My path is non-ascii')
140
- } else {
141
- t.fail('Response was undefined')
142
- }
143
- })
144
-
145
- test('getAssetFromKV custom key modifier', async (t) => {
146
- mockGlobal()
147
- const event = getEvent(new Request('https://blah.com/docs/sub/blah.png'))
148
-
149
- const customRequestMapper = (request: Request) => {
150
- let defaultModifiedRequest = mapRequestToAsset(request)
151
-
152
- let url = new URL(defaultModifiedRequest.url)
153
- url.pathname = url.pathname.replace('/docs', '')
154
- return new Request(url.toString(), request)
155
- }
156
-
157
- const res = await getAssetFromKV(event, { mapRequestToAsset: customRequestMapper })
158
-
159
- if (res) {
160
- t.is(await res.text(), 'picturedis')
161
- } else {
162
- t.fail('Response was undefined')
163
- }
164
- })
165
-
166
- test('getAssetFromKV when setting browser caching', async (t) => {
167
- mockGlobal()
168
- const event = getEvent(new Request('https://blah.com/'))
169
-
170
- const res = await getAssetFromKV(event, { cacheControl: { browserTTL: 22 } })
171
-
172
- if (res) {
173
- t.is(res.headers.get('cache-control'), 'max-age=22')
174
- } else {
175
- t.fail('Response was undefined')
176
- }
177
- })
178
-
179
- test('getAssetFromKV when setting custom cache setting', async (t) => {
180
- mockGlobal()
181
- const event1 = getEvent(new Request('https://blah.com/'))
182
- const event2 = getEvent(new Request('https://blah.com/key1.png?blah=34'))
183
- const cacheOnlyPngs = (req: Request) => {
184
- if (new URL(req.url).pathname.endsWith('.png'))
185
- return {
186
- browserTTL: 720,
187
- edgeTTL: 720,
188
- }
189
- else
190
- return {
191
- bypassCache: true,
192
- }
193
- }
194
-
195
- const res1 = await getAssetFromKV(event1, { cacheControl: cacheOnlyPngs })
196
- const res2 = await getAssetFromKV(event2, { cacheControl: cacheOnlyPngs })
197
-
198
- if (res1 && res2) {
199
- t.is(res1.headers.get('cache-control'), null)
200
- t.true(res2.headers.get('content-type').includes('png'))
201
- t.is(res2.headers.get('cache-control'), 'max-age=720')
202
- t.is(res2.headers.get('cf-cache-status'), 'MISS')
203
- } else {
204
- t.fail('Response was undefined')
205
- }
206
- })
207
- test('getAssetFromKV caches on two sequential requests', async (t) => {
208
- mockGlobal()
209
- const resourceKey = 'cache.html'
210
- const resourceVersion = JSON.parse(mockManifest())[resourceKey]
211
- const event1 = getEvent(new Request(`https://blah.com/${resourceKey}`))
212
- const event2 = getEvent(
213
- new Request(`https://blah.com/${resourceKey}`, {
214
- headers: {
215
- 'if-none-match': `"${resourceVersion}"`,
216
- },
217
- }),
218
- )
219
-
220
- const res1 = await getAssetFromKV(event1, { cacheControl: { edgeTTL: 720, browserTTL: 720 } })
221
- await sleep(1)
222
- const res2 = await getAssetFromKV(event2)
223
-
224
- if (res1 && res2) {
225
- t.is(res1.headers.get('cf-cache-status'), 'MISS')
226
- t.is(res1.headers.get('cache-control'), 'max-age=720')
227
- t.is(res2.headers.get('cf-cache-status'), 'REVALIDATED')
228
- } else {
229
- t.fail('Response was undefined')
230
- }
231
- })
232
- test('getAssetFromKV does not store max-age on two sequential requests', async (t) => {
233
- mockGlobal()
234
- const resourceKey = 'cache.html'
235
- const resourceVersion = JSON.parse(mockManifest())[resourceKey]
236
- const event1 = getEvent(new Request(`https://blah.com/${resourceKey}`))
237
- const event2 = getEvent(
238
- new Request(`https://blah.com/${resourceKey}`, {
239
- headers: {
240
- 'if-none-match': `"${resourceVersion}"`,
241
- },
242
- }),
243
- )
244
-
245
- const res1 = await getAssetFromKV(event1, { cacheControl: { edgeTTL: 720 } })
246
- await sleep(100)
247
- const res2 = await getAssetFromKV(event2)
248
-
249
- if (res1 && res2) {
250
- t.is(res1.headers.get('cf-cache-status'), 'MISS')
251
- t.is(res1.headers.get('cache-control'), null)
252
- t.is(res2.headers.get('cf-cache-status'), 'REVALIDATED')
253
- t.is(res2.headers.get('cache-control'), null)
254
- } else {
255
- t.fail('Response was undefined')
256
- }
257
- })
258
-
259
- test('getAssetFromKV does not cache on Cloudflare when bypass cache set', async (t) => {
260
- mockGlobal()
261
- const event = getEvent(new Request('https://blah.com/'))
262
-
263
- const res = await getAssetFromKV(event, { cacheControl: { bypassCache: true } })
264
-
265
- if (res) {
266
- t.is(res.headers.get('cache-control'), null)
267
- t.is(res.headers.get('cf-cache-status'), null)
268
- } else {
269
- t.fail('Response was undefined')
270
- }
271
- })
272
-
273
- test('getAssetFromKV with no trailing slash on root', async (t) => {
274
- mockGlobal()
275
- const event = getEvent(new Request('https://blah.com'))
276
- const res = await getAssetFromKV(event)
277
- if (res) {
278
- t.is(await res.text(), 'index.html')
279
- } else {
280
- t.fail('Response was undefined')
281
- }
282
- })
283
-
284
- test('getAssetFromKV with no trailing slash on a subdirectory', async (t) => {
285
- mockGlobal()
286
- const event = getEvent(new Request('https://blah.com/sub/blah.png'))
287
- const res = await getAssetFromKV(event)
288
- if (res) {
289
- t.is(await res.text(), 'picturedis')
290
- } else {
291
- t.fail('Response was undefined')
292
- }
293
- })
294
-
295
- test('getAssetFromKV no result throws an error', async (t) => {
296
- mockGlobal()
297
- const event = getEvent(new Request('https://blah.com/random'))
298
- const error: KVError = await t.throwsAsync(getAssetFromKV(event))
299
- t.is(error.status, 404)
300
- })
301
- test('getAssetFromKV TTls set to null should not cache on browser or edge', async (t) => {
302
- mockGlobal()
303
- const event = getEvent(new Request('https://blah.com/'))
304
-
305
- const res1 = await getAssetFromKV(event, { cacheControl: { browserTTL: null, edgeTTL: null } })
306
- await sleep(100)
307
- const res2 = await getAssetFromKV(event, { cacheControl: { browserTTL: null, edgeTTL: null } })
308
-
309
- if (res1 && res2) {
310
- t.is(res1.headers.get('cf-cache-status'), null)
311
- t.is(res1.headers.get('cache-control'), null)
312
- t.is(res2.headers.get('cf-cache-status'), null)
313
- t.is(res2.headers.get('cache-control'), null)
314
- } else {
315
- t.fail('Response was undefined')
316
- }
317
- })
318
- test('getAssetFromKV passing in a custom NAMESPACE serves correct asset', async (t) => {
319
- mockGlobal()
320
- let CUSTOM_NAMESPACE = mockKV({
321
- 'key1.123HASHBROWN.txt': 'val1',
322
- })
323
- Object.assign(global, { CUSTOM_NAMESPACE })
324
- const event = getEvent(new Request('https://blah.com/'))
325
- const res = await getAssetFromKV(event)
326
- if (res) {
327
- t.is(await res.text(), 'index.html')
328
- t.true(res.headers.get('content-type').includes('html'))
329
- } else {
330
- t.fail('Response was undefined')
331
- }
332
- })
333
- test('getAssetFromKV when custom namespace without the asset should fail', async (t) => {
334
- mockGlobal()
335
- let CUSTOM_NAMESPACE = mockKV({
336
- 'key5.123HASHBROWN.txt': 'customvalu',
337
- })
338
-
339
- const event = getEvent(new Request('https://blah.com'))
340
- const error: KVError = await t.throwsAsync(
341
- getAssetFromKV(event, { ASSET_NAMESPACE: CUSTOM_NAMESPACE }),
342
- )
343
- t.is(error.status, 404)
344
- })
345
- test('getAssetFromKV when namespace not bound fails', async (t) => {
346
- mockGlobal()
347
- var MY_CUSTOM_NAMESPACE = undefined
348
- Object.assign(global, { MY_CUSTOM_NAMESPACE })
349
-
350
- const event = getEvent(new Request('https://blah.com/'))
351
- const error: KVError = await t.throwsAsync(
352
- getAssetFromKV(event, { ASSET_NAMESPACE: MY_CUSTOM_NAMESPACE }),
353
- )
354
- t.is(error.status, 500)
355
- })
356
-
357
- test('getAssetFromKV when if-none-match === active resource version, should revalidate', async (t) => {
358
- mockGlobal()
359
- const resourceKey = 'key1.png'
360
- const resourceVersion = JSON.parse(mockManifest())[resourceKey]
361
- const event1 = getEvent(new Request(`https://blah.com/${resourceKey}`))
362
- const event2 = getEvent(
363
- new Request(`https://blah.com/${resourceKey}`, {
364
- headers: {
365
- 'if-none-match': `W/"${resourceVersion}"`,
366
- },
367
- }),
368
- )
369
-
370
- const res1 = await getAssetFromKV(event1, { cacheControl: { edgeTTL: 720 } })
371
- await sleep(100)
372
- const res2 = await getAssetFromKV(event2)
373
-
374
- if (res1 && res2) {
375
- t.is(res1.headers.get('cf-cache-status'), 'MISS')
376
- t.is(res2.headers.get('cf-cache-status'), 'REVALIDATED')
377
- } else {
378
- t.fail('Response was undefined')
379
- }
380
- })
381
-
382
- test('getAssetFromKV when if-none-match equals etag of stale resource then should bypass cache', async (t) => {
383
- mockGlobal()
384
- const resourceKey = 'key1.png'
385
- const resourceVersion = JSON.parse(mockManifest())[resourceKey]
386
- const req1 = new Request(`https://blah.com/${resourceKey}`, {
387
- headers: {
388
- 'if-none-match': `"${resourceVersion}"`,
389
- },
390
- })
391
- const req2 = new Request(`https://blah.com/${resourceKey}`, {
392
- headers: {
393
- 'if-none-match': `"${resourceVersion}-another-version"`,
394
- },
395
- })
396
- const event = getEvent(req1)
397
- const event2 = getEvent(req2)
398
- const res1 = await getAssetFromKV(event, { cacheControl: { edgeTTL: 720 } })
399
- const res2 = await getAssetFromKV(event)
400
- const res3 = await getAssetFromKV(event2)
401
- if (res1 && res2 && res3) {
402
- t.is(res1.headers.get('cf-cache-status'), 'MISS')
403
- t.is(res2.headers.get('etag'), `W/${req1.headers.get('if-none-match')}`)
404
- t.is(res2.headers.get('cf-cache-status'), 'REVALIDATED')
405
- t.not(res3.headers.get('etag'), req2.headers.get('if-none-match'))
406
- t.is(res3.headers.get('cf-cache-status'), 'MISS')
407
- } else {
408
- t.fail('Response was undefined')
409
- }
410
- })
411
- test('getAssetFromKV when resource in cache, etag should be weakened before returned to eyeball', async (t) => {
412
- mockGlobal()
413
- const resourceKey = 'key1.png'
414
- const resourceVersion = JSON.parse(mockManifest())[resourceKey]
415
- const req1 = new Request(`https://blah.com/${resourceKey}`, {
416
- headers: {
417
- 'if-none-match': `"${resourceVersion}"`,
418
- },
419
- })
420
- const event = getEvent(req1)
421
- const res1 = await getAssetFromKV(event, { cacheControl: { edgeTTL: 720 } })
422
- const res2 = await getAssetFromKV(event)
423
- if (res1 && res2) {
424
- t.is(res1.headers.get('cf-cache-status'), 'MISS')
425
- t.is(res2.headers.get('etag'), `W/${req1.headers.get('if-none-match')}`)
426
- } else {
427
- t.fail('Response was undefined')
428
- }
429
- })
430
-
431
- test('getAssetFromKV if-none-match not sent but resource in cache, should return cache hit 200 OK', async (t) => {
432
- const resourceKey = 'cache.html'
433
- const event = getEvent(new Request(`https://blah.com/${resourceKey}`))
434
- const res1 = await getAssetFromKV(event, { cacheControl: { edgeTTL: 720 } })
435
- await sleep(1)
436
- const res2 = await getAssetFromKV(event)
437
- if (res1 && res2) {
438
- t.is(res1.headers.get('cf-cache-status'), 'MISS')
439
- t.is(res1.headers.get('cache-control'), null)
440
- t.is(res2.status, 200)
441
- t.is(res2.headers.get('cf-cache-status'), 'HIT')
442
- } else {
443
- t.fail('Response was undefined')
444
- }
445
- })
446
-
447
- test('getAssetFromKV if range request submitted and resource in cache, request fulfilled', async (t) => {
448
- const resourceKey = 'cache.html'
449
- const event1 = getEvent(new Request(`https://blah.com/${resourceKey}`))
450
- const event2 = getEvent(
451
- new Request(`https://blah.com/${resourceKey}`, { headers: { range: 'bytes=0-10' } }),
452
- )
453
- const res1 = getAssetFromKV(event1, { cacheControl: { edgeTTL: 720 } })
454
- await res1
455
- await sleep(2)
456
- const res2 = await getAssetFromKV(event2)
457
- if (res2.headers.has('content-range')) {
458
- t.is(res2.status, 206)
459
- } else {
460
- t.fail('Response was undefined')
461
- }
462
- })
463
-
464
- test.todo('getAssetFromKV when body not empty, should invoke .cancel()')
@@ -1,33 +0,0 @@
1
- import test from 'ava'
2
- import { mockGlobal } from '../mocks'
3
- import { mapRequestToAsset } from '../index'
4
-
5
- test('mapRequestToAsset() correctly changes /about -> /about/index.html', async (t) => {
6
- mockGlobal()
7
- let path = '/about'
8
- let request = new Request(`https://foo.com${path}`)
9
- let newRequest = mapRequestToAsset(request)
10
- t.is(newRequest.url, request.url + '/index.html')
11
- })
12
-
13
- test('mapRequestToAsset() correctly changes /about/ -> /about/index.html', async (t) => {
14
- let path = '/about/'
15
- let request = new Request(`https://foo.com${path}`)
16
- let newRequest = mapRequestToAsset(request)
17
- t.is(newRequest.url, request.url + 'index.html')
18
- })
19
-
20
- test('mapRequestToAsset() correctly changes /about.me/ -> /about.me/index.html', async (t) => {
21
- let path = '/about.me/'
22
- let request = new Request(`https://foo.com${path}`)
23
- let newRequest = mapRequestToAsset(request)
24
- t.is(newRequest.url, request.url + 'index.html')
25
- })
26
-
27
- test('mapRequestToAsset() correctly changes /about -> /about/default.html', async (t) => {
28
- mockGlobal()
29
- let path = '/about'
30
- let request = new Request(`https://foo.com${path}`)
31
- let newRequest = mapRequestToAsset(request, { defaultDocument: 'default.html' })
32
- t.is(newRequest.url, request.url + '/default.html')
33
- })
@@ -1,42 +0,0 @@
1
- import test from 'ava'
2
- import { mockGlobal } from '../mocks'
3
- import { serveSinglePageApp } from '../index'
4
-
5
- function testRequest(path: string) {
6
- mockGlobal()
7
- let url = new URL('https://example.com')
8
- url.pathname = path
9
- let request = new Request(url.toString())
10
-
11
- return request
12
- }
13
-
14
- test('serveSinglePageApp returns root asset path when request path ends in .html', async (t) => {
15
- let path = '/foo/thing.html'
16
- let request = testRequest(path)
17
-
18
- let expected_request = testRequest('/index.html')
19
- let actual_request = serveSinglePageApp(request)
20
-
21
- t.deepEqual(expected_request, actual_request)
22
- })
23
-
24
- test('serveSinglePageApp returns root asset path when request path does not have extension', async (t) => {
25
- let path = '/foo/thing'
26
- let request = testRequest(path)
27
-
28
- let expected_request = testRequest('/index.html')
29
- let actual_request = serveSinglePageApp(request)
30
-
31
- t.deepEqual(expected_request, actual_request)
32
- })
33
-
34
- test('serveSinglePageApp returns requested asset when request path has non-html extension', async (t) => {
35
- let path = '/foo/thing.js'
36
- let request = testRequest(path)
37
-
38
- let expected_request = request
39
- let actual_request = serveSinglePageApp(request)
40
-
41
- t.deepEqual(expected_request, actual_request)
42
- })
@@ -1,39 +0,0 @@
1
- export type CacheControl = {
2
- browserTTL: number
3
- edgeTTL: number
4
- bypassCache: boolean
5
- }
6
- export type Options = {
7
- cacheControl: ((req: Request) => Partial<CacheControl>) | Partial<CacheControl>
8
- ASSET_NAMESPACE: any
9
- ASSET_MANIFEST: Object | string
10
- mapRequestToAsset?: (req: Request, options?: Partial<Options>) => Request
11
- defaultMimeType: string
12
- defaultDocument: string
13
- }
14
-
15
- export class KVError extends Error {
16
- constructor(message?: string, status: number = 500) {
17
- super(message)
18
- // see: typescriptlang.org/docs/handbook/release-notes/typescript-2-2.html
19
- Object.setPrototypeOf(this, new.target.prototype) // restore prototype chain
20
- this.name = KVError.name // stack traces display correctly now
21
- this.status = status
22
- }
23
- status: number
24
- }
25
- export class MethodNotAllowedError extends KVError {
26
- constructor(message: string = `Not a valid request method`, status: number = 405) {
27
- super(message, status)
28
- }
29
- }
30
- export class NotFoundError extends KVError {
31
- constructor(message: string = `Not Found`, status: number = 404) {
32
- super(message, status)
33
- }
34
- }
35
- export class InternalError extends KVError {
36
- constructor(message: string = `Internal Error in KV Asset Handler`, status: number = 500) {
37
- super(message, status)
38
- }
39
- }