acrylblends 0.4.1 → 0.5.1

package/plugins/acryl-node-server/tests/adapter/serve-static.test.ts

@@ -1,4 +1,4 @@
-import { App } from '../../../acryl-router/src/index.ts'
+import { Acryl } from '../../../acryl-router/src/index.ts'
 import type * as fs from 'node:fs'
 import {
   chmodSync,
@@ -26,7 +26,7 @@ vi.mock('node:fs', async (importOriginal) => {
 })
 
 describe('Serve Static Middleware', () => {
-  const app = new App<{
+  const app = new Acryl<{
     Variables: {
       path: string
     }
@@ -99,7 +99,7 @@ describe('Serve Static Middleware', () => {
         const rewriteRequestPath = vi.fn((path: string) => path)
         const onFound = vi.fn()
         const onNotFound = vi.fn()
-        const app = new App().use(
+        const app = new Acryl().use(
           '/static/*',
           serveStatic({ root: './tests/adapter/assets', rewriteRequestPath, onFound, onNotFound })
         )
@@ -136,7 +136,7 @@ describe('Serve Static Middleware', () => {
   it('Should return index.html', async () => {
     const res = await requestServer(server, { method: 'GET', path: '/static/' })
     expect(res.status).toBe(200)
-    expect(await res.text()).toBe('<h1>Hello App</h1>')
+    expect(await res.text()).toBe('<h1>Hello Acryl</h1>')
     expect(res.headers.get('content-type')).toBe('text/html; charset=utf-8')
     expect(res.headers.get('x-custom')).toMatch(
       /Found the file at tests[\/\\]adapter[\/\\]assets[\/\\]static[\/\\]index\.html$/
@@ -146,7 +146,7 @@ describe('Serve Static Middleware', () => {
   it('Should return acryl.html', async () => {
     const res = await requestServer(server, { method: 'GET', path: '/static/acryl.html' })
     expect(res.status).toBe(200)
-    expect(await res.text()).toBe('<h1>This is App.html</h1>')
+    expect(await res.text()).toBe('<h1>This is Acryl.html</h1>')
     expect(res.headers.get('content-type')).toBe('text/html; charset=utf-8')
   })
 
@@ -421,7 +421,7 @@ describe('Serve Static Middleware', () => {
 
       const res = await requestServer(server, { method: 'GET', path: '/static/symlink.html' })
       expect(res.status).toBe(200)
-      expect(await res.text()).toBe('<h1>Hello App</h1>')
+      expect(await res.text()).toBe('<h1>Hello Acryl</h1>')
     } finally {
       rmSync(symlinkPath, { force: true })
     }
@@ -514,7 +514,7 @@ describe('Serve Static Middleware', () => {
     ]
     rootPaths.forEach((root) => {
       describe(root, () => {
-        const app = new App()
+        const app = new Acryl()
         const server = createAdaptorServer(app)
         app.use('/static/*', serveStatic({ root }))
         app.use('/favicon.ico', serveStatic({ path: root + path.sep + 'favicon.ico' }))
@@ -523,7 +523,7 @@ describe('Serve Static Middleware', () => {
           const res = await requestServer(server, { method: 'GET', path: '/static' })
           expect(res.status).toBe(200)
           expect(res.headers.get('content-type')).toBe('text/html; charset=utf-8')
-          expect(await res.text()).toBe('<h1>Hello App</h1>')
+          expect(await res.text()).toBe('<h1>Hello Acryl</h1>')
         })
 
         it('Should return correct headers and data for text', async () => {
@@ -551,7 +551,7 @@ describe('Serve Static Middleware', () => {
     rootPaths.forEach((root) => {
       optionPaths.forEach((optionPath) => {
         describe(`${root} + ${optionPath}`, () => {
-          const app = new App()
+          const app = new Acryl()
           const server = createAdaptorServer(app)
 
           app.use(
@@ -573,7 +573,7 @@ describe('Serve Static Middleware', () => {
   })
 
   describe('Path traversal security tests', () => {
-    const app = new App()
+    const app = new Acryl()
     const server = createAdaptorServer(app)
     app.use('/static/*', serveStatic({ root: './tests/adapter/assets' }))
 
@@ -613,7 +613,7 @@ describe('Serve Static Middleware', () => {
   })
 
   describe('Path mismatch security tests', () => {
-    const app = new App()
+    const app = new Acryl()
     const server = createAdaptorServer(app)
 
     app.use('/static/admin/*', async (c, next) => {
@@ -673,7 +673,7 @@ describe('Serve Static Middleware', () => {
       ['/static/%E7%82%8E.txt', 'static/炎.txt'],
       ['/static/hello%20world.txt', 'static/hello world.txt'],
     ])('Should decode URI strings - %s', async (url, filePath) => {
-      const fileApp = new App().use('/static/*', serveStatic({ root }))
+      const fileApp = new Acryl().use('/static/*', serveStatic({ root }))
       const res = await requestServer(createAdaptorServer(fileApp), {
         method: 'GET',
         path: url,
@@ -688,7 +688,7 @@ describe('Serve Static Middleware', () => {
       async (url) => {
         const onNotFound = vi.fn()
         const rewriteRequestPath = vi.fn((filePath: string) => filePath)
-        const fileApp = new App().use(
+        const fileApp = new Acryl().use(
           '/static/*',
           serveStatic({ root, onNotFound, rewriteRequestPath })
         )
@@ -706,7 +706,7 @@ describe('Serve Static Middleware', () => {
       ['/static/100%25/hello.txt', 'static/100%/hello.txt'],
       ['/static/%2Fadmin/secret.txt', 'static/%2Fadmin/secret.txt'],
     ])('Should allow percent signs when opted in - %s', async (url, filePath) => {
-      const fileApp = new App().use('/static/*', serveStatic({ root, allowPercentInPath: true }))
+      const fileApp = new Acryl().use('/static/*', serveStatic({ root, allowPercentInPath: true }))
 
       const res = await requestServer(createAdaptorServer(fileApp), { method: 'GET', path: url })
 
@@ -715,7 +715,7 @@ describe('Serve Static Middleware', () => {
     })
 
     it('Should not bypass authentication through a second decode', async () => {
-      const protectedApp = new App()
+      const protectedApp = new Acryl()
       const rewriteRequestPath = vi.fn((filePath: string) => filePath)
       protectedApp.use('/static/admin/*', async (c) => c.text('Unauthorized', 401))
       protectedApp.use('/static/*', serveStatic({ root: './tests/adapter/assets', rewriteRequestPath }))
@@ -737,7 +737,7 @@ describe('Serve Static Middleware', () => {
     })
 
     it('Should pass the routed path and context to onNotFound, then continue', async () => {
-      const fileApp = new App()
+      const fileApp = new Acryl()
       let hookPath: string | undefined
       let contextPath: string | undefined
       fileApp.use(
@@ -765,7 +765,7 @@ describe('Serve Static Middleware', () => {
     it.each(['/static/%2e%2e%5C100%.txt', '/static//100%.txt', '/static/%5C100%.txt'])(
       'Should retain path validation when opted in: %s',
       async (requestPath) => {
-        const fileApp = new App()
+        const fileApp = new Acryl()
         const rewriteRequestPath = vi.fn((requestPath: string) => requestPath)
         const onNotFound = vi.fn()
         fileApp.use(
@@ -783,7 +783,7 @@ describe('Serve Static Middleware', () => {
     )
 
     it('Should preserve the fixed path option for percent filenames', async () => {
-      const fileApp = new App()
+      const fileApp = new Acryl()
       fileApp.use('/static/*', serveStatic({ root, path: 'static/100%.txt' }))
       const res = await requestServer(createAdaptorServer(fileApp), {
         method: 'GET',
@@ -814,7 +814,7 @@ describe('Serve Static Middleware', () => {
     ;(process.platform === 'win32' ? it.skip : it)(
       'Should handle read permission errors gracefully',
       async () => {
-        const app = new App()
+        const app = new Acryl()
         app.use('/static/*', serveStatic({ root: './tests/adapter/assets' }))
         const server = createAdaptorServer(app)
         await expect(
@@ -829,7 +829,7 @@ describe('Serve Static Middleware with wrong path', () => {
   it('Should show an error when the path is wrong', async () => {
     const logSpy = vi.spyOn(console, 'error')
 
-    const app = new App<{
+    const app = new Acryl<{
       Variables: {
         path: string
       }

package/plugins/acryl-node-server/tests/adapter/server-socket.test.ts

@@ -1,4 +1,4 @@
-import { App } from '../../../acryl-router/src/index.ts'
+import { Acryl } from '../../../acryl-router/src/index.ts'
 import { bodyLimit } from '../../../acryl-router/src/middleware/index.ts'
 import fs from 'node:fs'
 import { request as requestHTTP } from 'node:http'
@@ -19,7 +19,7 @@ import { app } from './app.ts'
 const nodeVersionV20OrLater = parseInt(process.version.slice(1).split('.')[0]) >= 20
 
 const createBodyLimitApp = () => {
-  const app = new App()
+  const app = new Acryl()
 
   app.post(
     '/',

package/plugins/acryl-node-server/tests/adapter/server.test.ts

@@ -1,4 +1,4 @@
-import { App } from '../../../acryl-router/src/index.ts'
+import { Acryl } from '../../../acryl-router/src/index.ts'
 import { basicAuth } from '../../../acryl-router/src/middleware/index.ts'
 import { compress } from '../../../acryl-router/src/middleware/index.ts'
 import { etag } from '../../../acryl-router/src/middleware/index.ts'
@@ -46,11 +46,11 @@ describe('Basic', () => {
     const res = await requestServer(server, {
       method: 'GET',
       path: '/user-agent',
-      headers: { 'user-agent': 'App' },
+      headers: { 'user-agent': 'Acryl' },
     })
     expect(res.status).toBe(200)
     expect(res.headers.get('content-type')).toMatch('text/plain')
-    expect(await res.text()).toBe('App')
+    expect(await res.text()).toBe('Acryl')
   })
 
   it('Should return 302 response - POST /posts', async () => {
@@ -142,7 +142,7 @@ describe.each([
 ])('Caller-owned response headers over $protocol', ({ serverOptions, request }) => {
   it('should allow reusing the headers passed to c.body()', async () => {
     const headers = { 'content-type': 'text/plain' }
-    const testApp = new App()
+    const testApp = new Acryl()
     testApp.get('/', (c) => c.body(new Uint8Array([104, 105]), 200, headers))
     const server = createAdaptorServer({ fetch: testApp.fetch, ...serverOptions })
 
@@ -166,7 +166,7 @@ describe.each([
       }
       const bodies = ['hi', 'hello', '']
       let index = 0
-      const testApp = new App()
+      const testApp = new Acryl()
       testApp.get('/', () => new Response(makeBody(bodies[index++]), { headers }))
       const server = createAdaptorServer({ fetch: testApp.fetch, ...serverOptions })
 
@@ -186,10 +186,11 @@ describe('various response body types', () => {
     const largeText = 'a'.repeat(1024 * 1024 * 10)
     let server: ServerType
     let resolveReadableStreamPromise: () => void
+    let resolveReadableStreamFirstChunkPromise: () => void
     let resolveEventStreamPromise: () => void
     let resolveEventStreamWithoutTransferEncodingPromise: () => void
     beforeAll(() => {
-      const app = new App()
+      const app = new Acryl()
       app.use('*', async (c, next) => {
         await next()
 
@@ -223,11 +224,17 @@ describe('various response body types', () => {
       const readableStreamPromise = new Promise<void>((resolve) => {
         resolveReadableStreamPromise = resolve
       })
+      const readableStreamFirstChunkPromise = new Promise<void>((resolve) => {
+        resolveReadableStreamFirstChunkPromise = resolve
+      })
       app.get('/readable-stream', () => {
         const stream = new ReadableStream({
           async start(controller) {
             await readableStreamPromise
             controller.enqueue('Hello!')
+            // The second chunk waits until the client has the first, so the two arrive as two reads on every platform (TCP may join
+            // two back-to-back writes into one read, as it does on Windows).
+            await readableStreamFirstChunkPromise
             controller.enqueue(' Node!')
             controller.close()
           },
@@ -286,34 +293,34 @@ describe('various response body types', () => {
         })
       })
       app.get('/buffer', () => {
-        const response = new Response(Buffer.from('Hello App!'), {
+        const response = new Response(Buffer.from('Hello Acryl!'), {
           headers: { 'content-type': 'text/plain' },
         })
         return response
       })
       app.get('/text-with-content-length-object', () => {
-        const response = new Response('Hello App!', {
-          headers: { 'content-type': 'text/plain', 'content-length': '00010' },
+        const response = new Response('Hello Acryl!', {
+          headers: { 'content-type': 'text/plain', 'content-length': '00012' },
         })
         return response
       })
       app.get('/text-with-content-length-headers', () => {
-        const response = new Response('Hello App!', {
-          headers: new Headers({ 'content-type': 'text/plain', 'content-length': '00010' }),
+        const response = new Response('Hello Acryl!', {
+          headers: new Headers({ 'content-type': 'text/plain', 'content-length': '00012' }),
         })
         return response
       })
       app.get('/text-with-content-length-array', () => {
-        const response = new Response('Hello App!', {
+        const response = new Response('Hello Acryl!', {
           headers: [
             ['content-type', 'text/plain'],
-            ['content-length', '00010'],
+            ['content-length', '00012'],
           ],
         })
         return response
       })
       app.get('/text-with-set-cookie-array', () => {
-        const response = new Response('Hello App!', {
+        const response = new Response('Hello Acryl!', {
           headers: [
             ['content-type', 'text/plain'],
             ['set-cookie', 'a=1'],
@@ -325,7 +332,7 @@ describe('various response body types', () => {
 
       app.use('/etag/*', etag())
       app.get('/etag/buffer', () => {
-        const response = new Response(Buffer.from('Hello App!'), {
+        const response = new Response(Buffer.from('Hello Acryl!'), {
           headers: { 'content-type': 'text/plain' },
         })
         return response
@@ -376,6 +383,9 @@ describe('various response body types', () => {
             expect(headers.get('transfer-encoding')).toBe('chunked')
             resolveReadableStreamPromise()
           },
+          onChunk: (_chunk, index) => {
+            if (index === 0) resolveReadableStreamFirstChunkPromise()
+          },
         }
       )
       expect(res.status).toBe(200)
@@ -442,8 +452,8 @@ describe('various response body types', () => {
       const res = await requestServer(server, { method: 'GET', path: '/buffer' })
       expect(res.status).toBe(200)
       expect(res.headers.get('content-type')).toMatch('text/plain')
-      expect(res.headers.get('content-length')).toMatch('10')
-      expect(await res.text()).toBe('Hello App!')
+      expect(res.headers.get('content-length')).toMatch('12')
+      expect(await res.text()).toBe('Hello Acryl!')
     })
 
     it('Should return 200 response - GET /text-with-content-length-object', async () => {
@@ -453,8 +463,8 @@ describe('various response body types', () => {
       })
       expect(res.status).toBe(200)
       expect(res.headers.get('content-type')).toMatch('text/plain')
-      expect(res.headers.get('content-length')).toBe('00010')
-      expect(await res.text()).toBe('Hello App!')
+      expect(res.headers.get('content-length')).toBe('00012')
+      expect(await res.text()).toBe('Hello Acryl!')
     })
 
     it('Should return 200 response - GET /text-with-content-length-headers', async () => {
@@ -464,8 +474,8 @@ describe('various response body types', () => {
       })
       expect(res.status).toBe(200)
       expect(res.headers.get('content-type')).toMatch('text/plain')
-      expect(res.headers.get('content-length')).toBe('00010')
-      expect(await res.text()).toBe('Hello App!')
+      expect(res.headers.get('content-length')).toBe('00012')
+      expect(await res.text()).toBe('Hello Acryl!')
     })
 
     it('Should return 200 response - GET /text-with-content-length-array', async () => {
@@ -475,8 +485,8 @@ describe('various response body types', () => {
       })
       expect(res.status).toBe(200)
       expect(res.headers.get('content-type')).toMatch('text/plain')
-      expect(res.headers.get('content-length')).toBe('00010')
-      expect(await res.text()).toBe('Hello App!')
+      expect(res.headers.get('content-length')).toBe('00012')
+      expect(await res.text()).toBe('Hello Acryl!')
     })
 
     it('Should return 200 response - GET /text-with-set-cookie-array', async () => {
@@ -487,16 +497,16 @@ describe('various response body types', () => {
       expect(res.status).toBe(200)
       expect(res.headers.get('content-type')).toMatch('text/plain')
       expect(res.headers.getSetCookie()).toEqual(['a=1', 'b=2'])
-      expect(await res.text()).toBe('Hello App!')
+      expect(await res.text()).toBe('Hello Acryl!')
     })
 
     it('Should return 200 response - GET /etag/buffer', async () => {
       const res = await requestServer(server, { method: 'GET', path: '/etag/buffer' })
       expect(res.status).toBe(200)
       expect(res.headers.get('content-type')).toMatch('text/plain')
-      expect(res.headers.get('etag')).toMatch('"a4b794176ec9cd86063d6a0075c27385b32ec9b4"')
-      expect(res.headers.get('content-length')).toMatch('10')
-      expect(await res.text()).toBe('Hello App!')
+      expect(res.headers.get('etag')).toMatch('"687f9e1bf5c0384d6b9cb63d0f6f0ba1803b2669"')
+      expect(res.headers.get('content-length')).toMatch('12')
+      expect(await res.text()).toBe('Hello Acryl!')
     })
   }
 
@@ -511,14 +521,14 @@ describe('various response body types', () => {
 
 describe('Routing', () => {
   describe('Nested Route', () => {
-    const book = new App()
+    const book = new Acryl()
     book.get('/', (c) => c.text('get /book'))
     book.get('/:id', (c) => {
       return c.text('get /book/' + c.req.param('id'))
     })
     book.post('/', (c) => c.text('post /book'))
 
-    const app = new App()
+    const app = new Acryl()
     app.route('/book', book)
 
     const server = createAdaptorServer(app)
@@ -539,7 +549,7 @@ describe('Routing', () => {
   })
 
   describe('Chained route', () => {
-    const app = new App()
+    const app = new Acryl()
 
     app
       .get('/chained/:abc', (c) => {
@@ -568,7 +578,7 @@ describe('Routing', () => {
 })
 
 describe('Request body', () => {
-  const app = new App()
+  const app = new Acryl()
   app.post('/json', async (c) => {
     const data = await c.req.json()
     return c.json(data)
@@ -604,7 +614,7 @@ describe('Request body', () => {
 
 describe('Response body', () => {
   describe('Cached Response', () => {
-    const app = new App()
+    const app = new Acryl()
     app.get('/json', (c) => {
       return c.json({ foo: 'bar' })
     })
@@ -649,7 +659,7 @@ describe('Response body', () => {
   })
 
   describe('Fallback to global.Response', () => {
-    const app = new App()
+    const app = new Acryl()
 
     app.get('/json-blob', async () => {
       return new Response(new Blob([JSON.stringify({ foo: 'blob' })]), {
@@ -682,7 +692,7 @@ describe('Response body', () => {
 })
 
 describe('Middleware', () => {
-  const app = new App<{ Variables: { foo: string } }>()
+  const app = new Acryl<{ Variables: { foo: string } }>()
   app.use('*', poweredBy())
   app.use('*', async (c, next) => {
     c.set('foo', 'bar')
@@ -695,13 +705,13 @@ describe('Middleware', () => {
   it('Should have correct header values', async () => {
     const res = await requestServer(server, { method: 'GET', path: '/' })
     expect(res.status).toBe(200)
-    expect(res.headers.get('x-powered-by')).toBe('ACRYL')
+    expect(res.headers.get('x-powered-by')).toBe('Acryl')
     expect(res.headers.get('foo')).toBe('bar')
   })
 })
 
 describe('Error handling', () => {
-  const app = new App()
+  const app = new Acryl()
   app.notFound((c) => {
     return c.text('Custom NotFound', 404)
   })
@@ -732,7 +742,7 @@ describe('Error handling', () => {
 })
 
 describe('Basic Auth Middleware', () => {
-  const app = new App()
+  const app = new Acryl()
   const username = 'acryl-user-a'
   const password = 'acryl-password-a'
   const unicodePassword = '炎'
@@ -788,7 +798,7 @@ describe('Basic Auth Middleware', () => {
 })
 
 describe('Stream and non-stream response', () => {
-  const app = new App()
+  const app = new Acryl()
 
   app.get('/json', (c) => c.json({ foo: 'bar' }))
   app.get('/text', (c) => c.text('Hello!'))
@@ -873,7 +883,7 @@ describe('Stream and non-stream response', () => {
 })
 
 describe('SSL', () => {
-  const app = new App()
+  const app = new Acryl()
   app.get('/', (c) => c.text('Hello! Node!'))
   app.get('/url', (c) => c.text(c.req.url))
 
@@ -905,7 +915,7 @@ describe('SSL', () => {
 })
 
 describe('HTTP2', () => {
-  const app = new App()
+  const app = new Acryl()
   app.get('/', (c) => c.text('Hello! Node!'))
   app.get('/headers', (c) => {
     // call newRequestFromIncoming
@@ -949,8 +959,8 @@ describe('HTTP2', () => {
   })
 })
 
-describe('App compression default gzip', () => {
-  const app = new App()
+describe('Acryl compression default gzip', () => {
+  const app = new Acryl()
   app.use('*', compress())
 
   app.notFound((c) => {
@@ -1013,8 +1023,8 @@ describe('App compression default gzip', () => {
   })
 })
 
-describe('App compression deflate', () => {
-  const app = new App()
+describe('Acryl compression deflate', () => {
+  const app = new Acryl()
   app.use('*', compress({ encoding: 'deflate' }))
 
   app.notFound((c) => {
@@ -1078,7 +1088,7 @@ describe('App compression deflate', () => {
 })
 
 describe('set child response to c.res', () => {
-  const app = new App()
+  const app = new Acryl()
   app.use('*', async (c, next) => {
     await next()
     c.res = new Response('', c.res)
@@ -1101,7 +1111,7 @@ describe('Headers appended to a raw Response after construction (issue #304)', (
   // Regression test: a handler returning `new Response(body, init)` and
   // appending headers (e.g. `Set-Cookie`) afterwards must not lose those
   // headers when middleware later clones the response via `new Response(...)`.
-  const app = new App()
+  const app = new Acryl()
   app.use('*', async (c, next) => {
     await next()
     // Mimics what middleware such as `cors`/`compress` does internally.
@@ -1127,7 +1137,7 @@ describe('Headers appended to a raw Response after construction (issue #304)', (
 })
 
 describe('forwarding IncomingMessage and ServerResponse in env', () => {
-  const app = new App<{ Bindings: HttpBindings }>()
+  const app = new Acryl<{ Bindings: HttpBindings }>()
   app.get('/', (c) =>
     c.json({
       incoming: c.env.incoming.constructor.name,
@@ -1151,7 +1161,7 @@ describe('forwarding IncomingMessage and ServerResponse in env', () => {
 })
 
 describe('overrideGlobalObjects', () => {
-  const app = new App()
+  const app = new Acryl()
 
   beforeEach(() => {
     Object.defineProperty(global, 'Headers', {
@@ -1201,7 +1211,7 @@ describe('Memory leak test', () => {
   const registry = new FinalizationRegistry(() => {
     counter--
   })
-  const app = new App()
+  const app = new Acryl()
   const server = createAdaptorServer(app)
 
   let onAbort: () => void
@@ -1286,7 +1296,7 @@ describe('Memory leak test', () => {
 })
 
 describe('serve', () => {
-  const app = new App()
+  const app = new Acryl()
   app.get('/', (c) => c.newResponse(null, 200))
   serve(app)
 

package/plugins/acryl-node-server/tests/adapter/utils/response.test.ts

@@ -1,15 +1,15 @@
-import { App } from '../../../../acryl-router/src/index.ts'
+import { Acryl } from '../../../../acryl-router/src/index.ts'
 import type { HttpBindings } from '../../../src/adapter/index.ts'
 import { createAdaptorServer } from '../../../src/adapter/server.ts'
 import { RESPONSE_ALREADY_SENT } from '../../../src/adapter/utils/response.ts'
 import { requestServer } from '../helpers/request.ts'
 
 describe('RESPONSE_ALREADY_SENT', () => {
-  const app = new App<{ Bindings: HttpBindings }>()
+  const app = new Acryl<{ Bindings: HttpBindings }>()
   app.get('/', (c) => {
     const { outgoing } = c.env
     outgoing.writeHead(200, { 'Content-Type': 'text/plain' })
-    outgoing.end('App!')
+    outgoing.end('Acryl!')
     return RESPONSE_ALREADY_SENT
   })
   const server = createAdaptorServer(app)
@@ -18,6 +18,6 @@ describe('RESPONSE_ALREADY_SENT', () => {
     const res = await requestServer(server, { method: 'GET', path: '/' })
     expect(res.status).toBe(200)
     expect(res.headers.get('content-type')).toMatch('text/plain')
-    expect(await res.text()).toBe('App!')
+    expect(await res.text()).toBe('Acryl!')
   })
 })

package/plugins/acryl-node-server/tests/adapter/websocket.test.ts

@@ -1,11 +1,11 @@
-import { App } from '../../../acryl-router/src/index.ts'
+import { Acryl } from '../../../acryl-router/src/index.ts'
 import { WebSocket, WebSocketServer } from 'ws'
 import { connect } from 'node:net'
 import type { AddressInfo } from 'node:net'
 import { createAdaptorServer, upgradeWebSocket } from '../../src/adapter/index.ts'
 
 describe('WebSocket', () => {
-  const startServer = (app: App) => {
+  const startServer = (app: Acryl) => {
     const wss = new WebSocketServer({ noServer: true })
     const server = createAdaptorServer({ fetch: app.fetch, websocket: { server: wss } })
     return new Promise<{ server: ReturnType<typeof createAdaptorServer>; address: AddressInfo }>(
@@ -18,7 +18,7 @@ describe('WebSocket', () => {
   }
 
   it('should connect with upgradeWebSocket without manual injection', async () => {
-    const app = new App()
+    const app = new Acryl()
 
     app.get(
       '/ws',
@@ -50,7 +50,7 @@ describe('WebSocket', () => {
   })
 
   it('should reject WebSocket upgrade when route is not upgraded', async () => {
-    const app = new App()
+    const app = new Acryl()
     app.get('/ws', (c) => c.text('ok'))
 
     const { server, address } = await startServer(app)
@@ -71,7 +71,7 @@ describe('WebSocket', () => {
   })
 
   it('should forward response headers set by middleware on a successful upgrade', async () => {
-    const app = new App()
+    const app = new Acryl()
 
     app.use(async (c, next) => {
       await next()
@@ -106,7 +106,7 @@ describe('WebSocket', () => {
   })
 
   it('should forward response headers when the upgrade is rejected', async () => {
-    const app = new App()
+    const app = new Acryl()
 
     app.get(
       '/ws',
@@ -138,7 +138,7 @@ describe('WebSocket', () => {
   })
 
   it('should not block other upgrade listeners', async () => {
-    const app = new App()
+    const app = new Acryl()
     const { server, address } = await startServer(app)
     const wss = new WebSocketServer({ noServer: true })
 
@@ -165,7 +165,7 @@ describe('WebSocket', () => {
   })
 
   it('should call onError with the underlying error when the raw socket errors', async () => {
-    const app = new App()
+    const app = new Acryl()
     const receivedError = new Error('boom')
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     let rawWs: any
@@ -210,7 +210,7 @@ describe('WebSocket', () => {
       liveCount--
     })
 
-    const app = new App()
+    const app = new Acryl()
     app.use('/ws', async (c, next) => {
       liveCount++
       registry.register((c.env as { incoming: object }).incoming, 'incoming')