acrylblends 0.6.3 → 0.7.0

package/plugins/acryl-router/src/core/helper/proxy/index.test.ts

@@ -1,356 +0,0 @@
-import { proxy } from './index.ts'
-import { Acryl } from '../../app.ts'
-
-describe('Proxy Middleware', () => {
-  describe('proxy', () => {
-    beforeEach(() => {
-      global.fetch = vi.fn().mockImplementation(async (req) => {
-        if (req.url === 'https://example.com/ok') {
-          return Promise.resolve(new Response('ok'))
-        } else if (req.url === 'https://example.com/disconnect') {
-          const reader = req.body.getReader()
-          let response
-
-          req.signal.addEventListener('abort', () => {
-            response = req.signal.reason
-            reader.cancel()
-          })
-
-          await reader.read()
-
-          return Promise.resolve(new Response(response))
-        } else if (req.url === 'https://example.com/compressed') {
-          return Promise.resolve(
-            new Response('ok', {
-              headers: {
-                'Content-Encoding': 'gzip',
-                'Content-Length': '1',
-                'Content-Range': 'bytes 0-2/1024',
-                'X-Response-Id': '456',
-              },
-            })
-          )
-        } else if (req.url === 'https://example.com/uncompressed') {
-          return Promise.resolve(
-            new Response('ok', {
-              headers: {
-                'Content-Length': '2',
-                'Content-Range': 'bytes 0-2/1024',
-                'X-Response-Id': '456',
-              },
-            })
-          )
-        } else if (req.url === 'https://example.com/post' && req.method === 'POST') {
-          return Promise.resolve(new Response(`request body: ${await req.text()}`))
-        } else if (req.url === 'https://example.com/hop-by-hop') {
-          return Promise.resolve(
-            new Response('ok', {
-              headers: {
-                'Transfer-Encoding': 'chunked',
-              },
-            })
-          )
-        } else if (req.url === 'https://example.com/connection-listed') {
-          return Promise.resolve(
-            new Response('ok', {
-              headers: {
-                Connection: 'x-connection-scoped, bad name',
-                'X-Connection-Scoped': 'should not be forwarded',
-                'X-Normal': 'kept',
-              },
-            })
-          )
-        } else if (req.url === 'https://example.com/set-cookie') {
-          return Promise.resolve(
-            new Response('ok', {
-              headers: {
-                'Set-Cookie': 'test=123',
-              },
-            })
-          )
-        }
-        return Promise.resolve(new Response('not found', { status: 404 }))
-      })
-    })
-
-    it('compressed', async () => {
-      const app = new Acryl()
-      app.get('/proxy/:path', (c) =>
-        proxy(
-          new Request(`https://example.com/${c.req.param('path')}`, {
-            headers: {
-              'X-Request-Id': '123',
-              'Accept-Encoding': 'gzip',
-            },
-          })
-        )
-      )
-      const res = await app.request('/proxy/compressed')
-      const req = (global.fetch as ReturnType<typeof vi.fn>).mock.calls[0][0]
-
-      expect(req.url).toBe('https://example.com/compressed')
-      expect(req.headers.get('X-Request-Id')).toBe('123')
-      expect(req.headers.get('Accept-Encoding')).toBeNull()
-
-      expect(res.status).toBe(200)
-      expect(res.headers.get('X-Response-Id')).toBe('456')
-      expect(res.headers.get('Content-Encoding')).toBeNull()
-      expect(res.headers.get('Content-Length')).toBeNull()
-      expect(res.headers.get('Content-Range')).toBe('bytes 0-2/1024')
-    })
-
-    it('uncompressed', async () => {
-      const app = new Acryl()
-      app.get('/proxy/:path', (c) =>
-        proxy(
-          new Request(`https://example.com/${c.req.param('path')}`, {
-            headers: {
-              'X-Request-Id': '123',
-              'Accept-Encoding': 'gzip',
-            },
-          })
-        )
-      )
-      const res = await app.request('/proxy/uncompressed')
-      const req = (global.fetch as ReturnType<typeof vi.fn>).mock.calls[0][0]
-
-      expect(req.url).toBe('https://example.com/uncompressed')
-      expect(req.headers.get('X-Request-Id')).toBe('123')
-      expect(req.headers.get('Accept-Encoding')).toBeNull()
-
-      expect(res.status).toBe(200)
-      expect(res.headers.get('X-Response-Id')).toBe('456')
-      expect(res.headers.get('Content-Length')).toBe('2')
-      expect(res.headers.get('Content-Range')).toBe('bytes 0-2/1024')
-    })
-
-    it('POST request', async () => {
-      const app = new Acryl()
-      app.all('/proxy/:path', (c) => {
-        return proxy(`https://example.com/${c.req.param('path')}`, {
-          ...c.req,
-          headers: {
-            ...c.req.header(),
-            'X-Request-Id': '123',
-            'Accept-Encoding': 'gzip',
-          },
-        })
-      })
-      const res = await app.request('/proxy/post', {
-        method: 'POST',
-        body: 'test',
-      })
-      const req = (global.fetch as ReturnType<typeof vi.fn>).mock.calls[0][0]
-
-      expect(req.url).toBe('https://example.com/post')
-
-      expect(res.status).toBe(200)
-      expect(await res.text()).toBe('request body: test')
-    })
-
-    it('remove hop-by-hop headers', async () => {
-      const app = new Acryl()
-      app.get('/proxy/:path', (c) => proxy(`https://example.com/${c.req.param('path')}`, c.req))
-
-      const res = await app.request('/proxy/hop-by-hop', {
-        headers: {
-          Host: 'example.com',
-          Connection: 'keep-alive, custom-header',
-          'Keep-Alive': 'timeout=5, max=1000',
-          'Proxy-Authorization': 'Basic 123456',
-          'Custom-Header': 'test',
-          'Allowed-Custom-Header': 'test',
-        },
-      })
-      const req = (global.fetch as ReturnType<typeof vi.fn>).mock.calls[0][0]
-
-      expect(req.headers.get('Host')).toBe('example.com')
-      expect(req.headers.get('Connection')).toBeNull()
-      expect(req.headers.get('Keep-Alive')).toBeNull()
-      expect(req.headers.get('Proxy-Authorization')).toBeNull()
-      expect(req.headers.get('Custom-Header')).toBe('test')
-      expect(req.headers.get('Allowed-Custom-Header')).toBe('test')
-
-      expect(res.headers.get('Transfer-Encoding')).toBeNull()
-    })
-
-    it('remove hop-by-hop headers with strictConnectionProcessing', async () => {
-      const app = new Acryl()
-      app.get('/proxy/:path', (c) =>
-        proxy(`https://example.com/${c.req.param('path')}`, {
-          ...c.req,
-          strictConnectionProcessing: true,
-        })
-      )
-
-      const res = await app.request('/proxy/hop-by-hop', {
-        headers: {
-          Host: 'example.com',
-          Connection: 'keep-alive, custom-header',
-          'Keep-Alive': 'timeout=5, max=1000',
-          'Proxy-Authorization': 'Basic 123456',
-          'Custom-Header': 'test',
-          'Allowed-Custom-Header': 'test',
-        },
-      })
-      const req = (global.fetch as ReturnType<typeof vi.fn>).mock.calls[0][0]
-
-      expect(req.headers.get('Host')).toBe('example.com')
-      expect(req.headers.get('Connection')).toBeNull()
-      expect(req.headers.get('Keep-Alive')).toBeNull()
-      expect(req.headers.get('Proxy-Authorization')).toBeNull()
-      expect(req.headers.get('Custom-Header')).toBeNull()
-      expect(req.headers.get('Allowed-Custom-Header')).toBe('test')
-
-      expect(res.headers.get('Transfer-Encoding')).toBeNull()
-    })
-
-    it('invalid hop-by-hop headers with strictConnectionProcessing', async () => {
-      const app = new Acryl()
-      app.get('/proxy/:path', (c) =>
-        proxy(`https://example.com/${c.req.param('path')}`, {
-          ...c.req,
-          strictConnectionProcessing: true,
-        })
-      )
-
-      const res = await app.request('/proxy/hop-by-hop', {
-        headers: {
-          Host: 'example.com',
-          Connection: 'keep-alive, invalid-header invalid-header',
-          'Keep-Alive': 'timeout=5, max=1000',
-        },
-      })
-
-      expect(res.status).toBe(400)
-    })
-
-    it('specify hop-by-hop header by options', async () => {
-      const app = new Acryl()
-      app.get('/proxy/:path', (c) =>
-        proxy(`https://example.com/${c.req.param('path')}`, {
-          headers: {
-            'Proxy-Authorization': 'Basic 123456',
-          },
-        })
-      )
-
-      const res = await app.request('/proxy/hop-by-hop')
-      const req = (global.fetch as ReturnType<typeof vi.fn>).mock.calls[0][0]
-
-      expect(req.headers.get('Proxy-Authorization')).toBe('Basic 123456')
-
-      expect(res.headers.get('Transfer-Encoding')).toBeNull()
-    })
-
-    it('remove response headers listed in the Connection header', async () => {
-      const app = new Acryl()
-      app.get('/proxy/:path', (c) => proxy(`https://example.com/${c.req.param('path')}`))
-      const res = await app.request('/proxy/connection-listed')
-      expect(res.status).toBe(200)
-      expect(res.headers.get('Connection')).toBeNull()
-      expect(res.headers.get('X-Connection-Scoped')).toBeNull()
-      expect(res.headers.get('X-Normal')).toBe('kept')
-    })
-
-    it('modify header', async () => {
-      const app = new Acryl()
-      app.get('/proxy/:path', (c) =>
-        proxy(`https://example.com/${c.req.param('path')}`, {
-          headers: {
-            'Set-Cookie': 'test=123',
-          },
-        }).then((res) => {
-          res.headers.delete('Set-Cookie')
-          res.headers.set('X-Response-Id', '456')
-          return res
-        })
-      )
-      const res = await app.request('/proxy/set-cookie')
-      expect(res.headers.get('Set-Cookie')).toBeNull()
-      expect(res.headers.get('X-Response-Id')).toBe('456')
-    })
-
-    it('does not propagate undefined request headers', async () => {
-      const app = new Acryl()
-      app.get('/proxy/:path', (c) =>
-        proxy(`https://example.com/${c.req.param('path')}`, {
-          headers: {
-            ...c.req.header(),
-            Authorization: undefined,
-          },
-        })
-      )
-      await app.request('/proxy/ok', {
-        headers: {
-          Authorization: 'Bearer 123',
-        },
-      })
-      const req = (global.fetch as ReturnType<typeof vi.fn>).mock.calls[0][0]
-      expect(req.headers.get('Authorization')).toBeNull()
-    })
-
-    it('client disconnect', async () => {
-      const app = new Acryl()
-      const controller = new AbortController()
-      app.post('/proxy/:path', (c) => proxy(`https://example.com/${c.req.param('path')}`, c.req))
-      const resPromise = app.request('/proxy/disconnect', {
-        method: 'POST',
-        body: 'test',
-        signal: controller.signal,
-      })
-      controller.abort('client disconnect')
-      const res = await resPromise
-      expect(await res.text()).toBe('client disconnect')
-    })
-
-    it('not found', async () => {
-      const app = new Acryl()
-      app.get('/proxy/:path', (c) => proxy(`https://example.com/${c.req.param('path')}`))
-      const res = await app.request('/proxy/404')
-      expect(res.status).toBe(404)
-    })
-
-    it('pass a Request object to proxyInit', async () => {
-      const app = new Acryl()
-      app.get('/proxy/:path', (c) => {
-        const req = new Request(c.req.raw, {
-          headers: {
-            'X-Request-Id': '123',
-            'Accept-Encoding': 'gzip',
-          },
-        })
-        return proxy(`https://example.com/${c.req.param('path')}`, req)
-      })
-      const res = await app.request('/proxy/compressed')
-      const req = (global.fetch as ReturnType<typeof vi.fn>).mock.calls[0][0]
-
-      expect(req.url).toBe('https://example.com/compressed')
-      expect(req.headers.get('X-Request-Id')).toBe('123')
-      expect(req.headers.get('Accept-Encoding')).toBeNull()
-
-      expect(res.status).toBe(200)
-      expect(await res.text()).toBe('ok')
-    })
-
-    it('Should call the custom fetch method when specified', async () => {
-      const customFetch = vi.fn().mockImplementation(async (req: Request) => {
-        const text = await req.text()
-        return new Response('custom fetch response. message:' + text)
-      })
-      const app = new Acryl()
-      app.post('/', (c) => {
-        return proxy(`https://example.com/`, {
-          customFetch,
-          ...c.req,
-        })
-      })
-      const res = await app.request('/', {
-        method: 'POST',
-        body: 'hi',
-      })
-      expect(res.status).toBe(200)
-      expect(await res.text()).toBe('custom fetch response. message:hi')
-    })
-  })
-})

package/plugins/acryl-router/src/core/helper/route/index.test.ts

@@ -1,259 +0,0 @@
-import { matchedRoutes, routePath, baseRoutePath, basePath } from './index.ts'
-import { Context } from '../../context.ts'
-import { Acryl } from '../../app.ts'
-
-const defaultContextOptions = {
-  executionCtx: {
-    waitUntil: () => {},
-    passThroughOnException: () => {},
-    props: {},
-  },
-  env: {},
-}
-
-describe('matchedRoutes', () => {
-  it('should return matched routes', () => {
-    const handlerA = () => {}
-    const handlerB = () => {}
-    const rawRequest = new Request('http://localhost?page=2&tag=A&tag=B')
-    const c = new Context(rawRequest, {
-      path: '/123/key',
-      matchResult: [
-        [
-          [
-            [handlerA, { basePath: '/', handler: handlerA, method: 'GET', path: '/:id' }],
-            { id: '123' },
-          ],
-          [
-            [handlerA, { basePath: '/', handler: handlerB, method: 'GET', path: '/:id/:name' }],
-            { id: '456', name: 'key' },
-          ],
-        ],
-      ],
-      ...defaultContextOptions,
-    })
-
-    expect(matchedRoutes(c)).toEqual([
-      { basePath: '/', handler: handlerA, method: 'GET', path: '/:id' },
-      { basePath: '/', handler: handlerB, method: 'GET', path: '/:id/:name' },
-    ])
-  })
-})
-
-describe('routePath', () => {
-  it('should return route path', () => {
-    const handlerA = () => {}
-    const handlerB = () => {}
-    const rawRequest = new Request('http://localhost?page=2&tag=A&tag=B')
-    const c = new Context(rawRequest, {
-      path: '/123/key',
-      matchResult: [
-        [
-          [
-            [handlerA, { basePath: '/', handler: handlerA, method: 'GET', path: '/:id' }],
-            { id: '123' },
-          ],
-          [
-            [handlerA, { basePath: '/', handler: handlerB, method: 'GET', path: '/:id/:name' }],
-            { id: '456', name: 'key' },
-          ],
-        ],
-      ],
-      ...defaultContextOptions,
-    })
-
-    expect(routePath(c)).toBe('/:id')
-
-    expect(routePath(c, 0)).toBe('/:id')
-    expect(routePath(c, 1)).toBe('/:id/:name')
-    expect(routePath(c, -1)).toBe('/:id/:name')
-    expect(routePath(c, 2)).toBe('')
-
-    c.req.routeIndex = 1
-    expect(routePath(c)).toBe('/:id/:name')
-  })
-})
-
-describe('baseRoutePath', () => {
-  it('should return raw basePath', () => {
-    const handlerA = () => {}
-    const handlerB = () => {}
-    const rawRequest = new Request('http://localhost?page=2&tag=A&tag=B')
-    const c = new Context(rawRequest, {
-      path: '/123/key',
-      matchResult: [
-        [
-          [
-            [handlerA, { basePath: '/', handler: handlerA, method: 'GET', path: '/:id' }],
-            { id: '123' },
-          ],
-          [
-            [handlerA, { basePath: '/sub', handler: handlerB, method: 'GET', path: '/:id/:name' }],
-            { id: '456', name: 'key' },
-          ],
-          [
-            [handlerA, { basePath: '/:sub', handler: handlerB, method: 'GET', path: '/:id/:name' }],
-            { id: '456', name: 'key' },
-          ],
-        ],
-      ],
-      ...defaultContextOptions,
-    })
-
-    expect(baseRoutePath(c)).toBe('/')
-
-    expect(baseRoutePath(c, 0)).toBe('/')
-    expect(baseRoutePath(c, 1)).toBe('/sub')
-    expect(baseRoutePath(c, 2)).toBe('/:sub')
-    expect(baseRoutePath(c, -1)).toBe('/:sub')
-    expect(baseRoutePath(c, 3)).toBe('')
-
-    c.req.routeIndex = 1
-    expect(baseRoutePath(c)).toBe('/sub')
-
-    c.req.routeIndex = 2
-    expect(baseRoutePath(c)).toBe('/:sub')
-  })
-})
-
-describe('basePath', () => {
-  it('should return basePath without parameters', () => {
-    const handlerA = () => {}
-    const handlerB = () => {}
-    const rawRequest = new Request('http://localhost?page=2&tag=A&tag=B')
-    const c = new Context(rawRequest, {
-      path: '/123/key',
-      matchResult: [
-        [
-          [
-            [handlerA, { basePath: '/', handler: handlerA, method: 'GET', path: '/:id' }],
-            { id: '123' },
-          ],
-          [
-            [handlerA, { basePath: '/sub', handler: handlerB, method: 'GET', path: '/:id/:name' }],
-            { id: '456', name: 'key' },
-          ],
-        ],
-      ],
-      ...defaultContextOptions,
-    })
-
-    expect(basePath(c)).toBe('/')
-    expect(basePath(c)).toBe('/') // cached value
-
-    expect(basePath(c, 0)).toBe('/')
-    expect(basePath(c, 1)).toBe('/sub')
-    expect(basePath(c, -1)).toBe('/sub')
-    expect(basePath(c, 2)).toBe('')
-
-    c.req.routeIndex = 1
-    expect(basePath(c)).toBe('/sub')
-  })
-
-  it('should return basePath with embedded parameters', () => {
-    const handlerA = () => {}
-    const rawRequest = new Request('http://localhost?page=2&tag=A&tag=B')
-    const c = new Context(rawRequest, {
-      path: '/sub-app-path/123/key',
-      matchResult: [
-        [
-          [
-            [handlerA, { basePath: '/:sub', handler: handlerA, method: 'GET', path: '/:id' }],
-            { id: '123' },
-          ],
-        ],
-      ],
-      ...defaultContextOptions,
-    })
-
-    expect(basePath(c)).toBe('/sub-app-path')
-  })
-
-  it('should return basePath with wildcard', () => {
-    const handlerA = () => {}
-    const rawRequest = new Request('http://localhost?page=2&tag=A&tag=B')
-    const c = new Context(rawRequest, {
-      path: '/sub-app-path/foo/app/123/key',
-      matchResult: [
-        [
-          [
-            [
-              handlerA,
-              { basePath: '/sub-app-path/*/app', handler: handlerA, method: 'GET', path: '/:id' },
-            ],
-            { id: '123' },
-          ],
-        ],
-      ],
-      ...defaultContextOptions,
-    })
-
-    expect(basePath(c)).toBe('/sub-app-path/foo/app')
-  })
-
-  it('should return the fully expanded basePath for nested route() apps', async () => {
-    const app = new Acryl()
-    const sub1 = new Acryl()
-    const sub2 = new Acryl()
-    const sub3 = new Acryl()
-
-    sub3.get('/assets/*', (c) => c.json({ baseRoutePath: baseRoutePath(c), basePath: basePath(c) }))
-    sub2.route('/:app/sub3/assets', sub3)
-    sub1.route('/:app/sub2/assets', sub2)
-    app.route('/:app/sub1/assets', sub1)
-
-    const res = await app.request(
-      '/s1/sub1/assets/ss2/sub2/assets/sss3/sub3/assets/assets/file-hoge/assets-kage.js'
-    )
-    expect(await res.json()).toEqual({
-      baseRoutePath: '/:app/sub1/assets/:app/sub2/assets/:app/sub3/assets',
-      basePath: '/s1/sub1/assets/ss2/sub2/assets/sss3/sub3/assets',
-    })
-  })
-
-  it('should return basePath with custom regex pattern', () => {
-    const handlerA = () => {}
-    const rawRequest = new Request('http://localhost?page=2&tag=A&tag=B')
-    const c = new Context(rawRequest, {
-      path: '/sub-app-path/foo/123/key',
-      matchResult: [
-        [
-          [
-            [
-              handlerA,
-              {
-                basePath: '/sub-app-path/:sub{foo|bar}',
-                handler: handlerA,
-                method: 'GET',
-                path: '/:id',
-              },
-            ],
-            { sub: 'foo', id: '123' },
-          ],
-        ],
-      ],
-      ...defaultContextOptions,
-    })
-
-    expect(basePath(c)).toBe('/sub-app-path/foo')
-  })
-
-  it('should return basePath with custom regex pattern mounted with app.route()', async () => {
-    const app = new Acryl()
-    const subApp = new Acryl()
-
-    subApp.get('/posts/:id', (c) => c.text(basePath(c)))
-    app.route('/api/:version{v[0-9]+}', subApp)
-    app.route('/tags/:tag{foo|bar}', subApp)
-    app.route('/users/:name{[a-z]+}/:group', subApp)
-
-    let res = await app.request('/api/v2/posts/123')
-    expect(await res.text()).toBe('/api/v2')
-
-    res = await app.request('/tags/bar/posts/123')
-    expect(await res.text()).toBe('/tags/bar')
-
-    res = await app.request('/users/abc/def/posts/123')
-    expect(await res.text()).toBe('/users/abc/def')
-  })
-})