acrylblends 0.4.1 → 0.5.0

package/plugins/acryl-router/src/core/middleware/cors/index.test.ts

@@ -1,8 +1,8 @@
-import { App } from '../../app.ts'
+import { Acryl } from '../../app.ts'
 import { cors } from './index.ts'
 
 describe('CORS by Middleware', () => {
-  const app = new App()
+  const app = new Acryl()
 
   app.use('/api/*', cors())
 
@@ -278,7 +278,7 @@ describe('CORS by Middleware', () => {
   })
 
   it('Append "Origin" to Vary header on OPTIONS preflight, if response has some Vary header', async () => {
-    const testApp = new App()
+    const testApp = new Acryl()
     testApp.use('/api/*', async (c, next) => {
       c.header('Vary', 'Accept-Encoding', { append: true })
       await next()
@@ -412,7 +412,7 @@ describe('CORS by Middleware', () => {
 
   it('Does not set allow methods when function returns an empty array', async () => {
     for (const allowMethods of [() => [], async () => []]) {
-      const app = new App()
+      const app = new Acryl()
       app.use(cors({ allowMethods }))
 
       const res = await app.request('http://localhost/', { method: 'OPTIONS' })
@@ -481,7 +481,7 @@ describe('CORS by Middleware', () => {
   })
 
   it('Should not reflect an arbitrary Origin when credentials is true with default origin', async () => {
-    const app = new App()
+    const app = new Acryl()
     app.use('*', cors({ credentials: true }))
     app.get('/api/me', (c) => c.json({ secret: 'private user data' }))
 
@@ -494,7 +494,7 @@ describe('CORS by Middleware', () => {
   })
 
   it('Preflight should not approve an arbitrary Origin when credentials is true with default origin', async () => {
-    const app = new App()
+    const app = new Acryl()
     app.use('*', cors({ credentials: true }))
     app.delete('/api/account', (c) => c.json({ deleted: true }))
 
@@ -513,7 +513,7 @@ describe('CORS by Middleware', () => {
   })
 
   it('Options without origin fall back to wildcard default', async () => {
-    const subApp = new App()
+    const subApp = new Acryl()
     subApp.use('/api/*', cors({ allowMethods: ['GET', 'POST'] }))
     subApp.get('/api/abc', (c) => c.json({ ok: true }))
 

package/plugins/acryl-router/src/core/middleware/cors/index.ts

@@ -1,6 +1,6 @@
 /**
  * @module
- * CORS Middleware for App.
+ * CORS Middleware for Acryl.
  */
 
 import type { Context } from '../../context.ts'
@@ -22,7 +22,7 @@ type CORSOptions = {
 }
 
 /**
- * CORS Middleware for App.
+ * CORS Middleware for Acryl.
  *
  *
  * @param {CORSOptions} [options] - The options for the CORS middleware.
@@ -36,7 +36,7 @@ type CORSOptions = {
  *
  * @example
  * ```ts
- * const app = new App()
+ * const app = new Acryl()
  *
  * app.use('/api/*', cors())
  * app.use(

package/plugins/acryl-router/src/core/middleware/csrf/index.test.ts

@@ -1,5 +1,5 @@
 import type { Context } from '../../context.ts'
-import { App } from '../../app.ts'
+import { Acryl } from '../../app.ts'
 import { csrf } from './index.ts'
 
 const simplePostHandler = vi.fn(async (c: Context) => {
@@ -29,7 +29,7 @@ describe('CSRF by Middleware', () => {
   })
 
   describe('simple usage', () => {
-    const app = new App()
+    const app = new Acryl()
 
     app.use('*', csrf())
     app.get('/form', (c) => c.html('<form></form>'))
@@ -230,7 +230,7 @@ describe('CSRF by Middleware', () => {
 
   describe('with origin option', () => {
     describe('string', () => {
-      const app = new App()
+      const app = new Acryl()
 
       app.use(
         '*',
@@ -259,7 +259,7 @@ describe('CSRF by Middleware', () => {
     })
 
     describe('string[]', () => {
-      const app = new App()
+      const app = new Acryl()
 
       app.use(
         '*',
@@ -294,7 +294,7 @@ describe('CSRF by Middleware', () => {
     })
 
     describe('IsAllowedOriginHandler', () => {
-      const app = new App()
+      const app = new Acryl()
 
       app.use(
         '*',
@@ -336,7 +336,7 @@ describe('CSRF by Middleware', () => {
     })
 
     describe('async IsAllowedOriginHandler', () => {
-      const app = new App()
+      const app = new Acryl()
 
       app.use(
         '*',
@@ -383,7 +383,7 @@ describe('CSRF by Middleware', () => {
 
   describe('with secFetchSite option', () => {
     describe('string', () => {
-      const app = new App()
+      const app = new Acryl()
       app.use('*', csrf({ secFetchSite: 'same-origin' }))
       app.post('/form', simplePostHandler)
 
@@ -413,7 +413,7 @@ describe('CSRF by Middleware', () => {
     })
 
     describe('string[]', () => {
-      const app = new App()
+      const app = new Acryl()
       app.use('*', csrf({ secFetchSite: ['same-origin', 'none'] }))
       app.post('/form', simplePostHandler)
 
@@ -443,7 +443,7 @@ describe('CSRF by Middleware', () => {
     })
 
     describe('IsAllowedSecFetchSiteHandler', () => {
-      const app = new App()
+      const app = new Acryl()
       app.use(
         '*',
         csrf({
@@ -487,7 +487,7 @@ describe('CSRF by Middleware', () => {
     })
 
     describe('async IsAllowedSecFetchSiteHandler', () => {
-      const app = new App()
+      const app = new Acryl()
       app.use(
         '*',
         csrf({

package/plugins/acryl-router/src/core/middleware/csrf/index.ts

@@ -1,6 +1,6 @@
 /**
  * @module
- * CSRF Protection Middleware for App.
+ * CSRF Protection Middleware for Acryl.
  */
 
 import type { Context } from '../../context.ts'
@@ -30,7 +30,7 @@ const isRequestedByFormElementRe =
   /^\b(application\/x-www-form-urlencoded|multipart\/form-data|text\/plain)\b/i
 
 /**
- * CSRF Protection Middleware for App.
+ * CSRF Protection Middleware for Acryl.
  *
  * Protects against Cross-Site Request Forgery attacks by validating request origins
  * and sec-fetch-site headers. The request is allowed if either validation passes.
@@ -53,7 +53,7 @@ const isRequestedByFormElementRe =
  *
  * @example
  * ```ts
- * const app = new App()
+ * const app = new Acryl()
  *
  * // Default: both origin and sec-fetch-site validation
  * app.use('*', csrf())

package/plugins/acryl-router/src/core/middleware/etag/index.test.ts

@@ -1,5 +1,5 @@
 import { RETAINED_304_HEADERS, etag } from './index.ts'
-import { App } from '../../app.ts'
+import { Acryl } from '../../app.ts'
 
 const createPatternedBody = (length: number) => {
   const body = new Uint8Array(length)
@@ -11,25 +11,25 @@ const createPatternedBody = (length: number) => {
 
 describe('Etag Middleware', () => {
   it('Should return etag header', async () => {
-    const app = new App()
+    const app = new Acryl()
     app.use('/etag/*', etag())
     app.get('/etag/abc', (c) => {
-      return c.text('App is hot')
+      return c.text('Acryl is hot')
     })
     app.get('/etag/def', (c) => {
-      return c.json({ message: 'App is hot' })
+      return c.json({ message: 'Acryl is hot' })
     })
     let res = await app.request('http://localhost/etag/abc')
     expect(res.headers.get('ETag')).not.toBeFalsy()
-    expect(res.headers.get('ETag')).toBe('"7c6c452b40ba15d4748e0075f4e402b441c3ea15"')
+    expect(res.headers.get('ETag')).toBe('"ba73e68ded3fb25dd2a1c90023bada7880da6ab7"')
 
     res = await app.request('http://localhost/etag/def')
     expect(res.headers.get('ETag')).not.toBeFalsy()
-    expect(res.headers.get('ETag')).toBe('"a6c237463eac08cd32a99f595cc2a7c87aecaadc"')
+    expect(res.headers.get('ETag')).toBe('"13ac584bb97a25fdb954fc1813d2f03f8f5e017c"')
   })
 
   it('Should return etag header with another algorithm', async () => {
-    const app = new App()
+    const app = new Acryl()
     app.use(
       '/etag/*',
       etag({
@@ -43,26 +43,26 @@ describe('Etag Middleware', () => {
       })
     )
     app.get('/etag/abc', (c) => {
-      return c.text('App is hot')
+      return c.text('Acryl is hot')
     })
     app.get('/etag/def', (c) => {
-      return c.json({ message: 'App is hot' })
+      return c.json({ message: 'Acryl is hot' })
     })
     let res = await app.request('http://localhost/etag/abc')
     expect(res.headers.get('ETag')).not.toBeFalsy()
     expect(res.headers.get('ETag')).toBe(
-      '"dc6a4486c5794ab001967920a901c34bde9f9485c77eccf142e13b446c6da381"'
+      '"07c00dd761cfbb8e0765274785818aa0a59629d41cd66034acbde90dafe85cf3"'
     )
 
     res = await app.request('http://localhost/etag/def')
     expect(res.headers.get('ETag')).not.toBeFalsy()
     expect(res.headers.get('ETag')).toBe(
-      '"f467464463b028d082ec4327b42c87428502dd71740110d5e5b4e2fbcd8b366d"'
+      '"49c6a1aa5026288ec59011aa6b3df0af8efc3d7531af06150dc7f018979efff7"'
     )
   })
 
   it('Should return etag header - binary', async () => {
-    const app = new App()
+    const app = new Acryl()
     app.use('/etag/*', etag())
     app.get('/etag', async (c) => {
       return c.body(new Uint8Array(1))
@@ -75,7 +75,7 @@ describe('Etag Middleware', () => {
   })
 
   it('Should not be the same etag - arrayBuffer', async () => {
-    const app = new App()
+    const app = new Acryl()
     app.use('/etag/*', etag())
     app.get('/etag/ab1', (c) => {
       return c.body(new ArrayBuffer(1))
@@ -91,7 +91,7 @@ describe('Etag Middleware', () => {
   })
 
   it('Should not be the same etag - Uint8Array', async () => {
-    const app = new App()
+    const app = new Acryl()
     app.use('/etag/*', etag())
     app.get('/etag/ui1', (c) => {
       return c.body(new Uint8Array([1, 2, 3]))
@@ -107,7 +107,7 @@ describe('Etag Middleware', () => {
   })
 
   it('Should not be the same etag - ReadableStream', async () => {
-    const app = new App()
+    const app = new Acryl()
     app.use('/etag/*', etag())
     app.get('/etag/rs1', (c) => {
       return c.body(
@@ -139,7 +139,7 @@ describe('Etag Middleware', () => {
   })
 
   it('Should return the same etag regardless of ReadableStream chunk boundaries', async () => {
-    const app = new App()
+    const app = new Acryl()
     app.use('/etag/*', etag())
     const body = createPatternedBody(1_000_000)
     app.get('/etag/rs1', (c) => {
@@ -173,7 +173,7 @@ describe('Etag Middleware', () => {
   })
 
   it('Should preserve the SHA-1 digest for bodies up to 256 KiB', async () => {
-    const app = new App()
+    const app = new Acryl()
     app.use('/etag/*', etag())
     app.get('/etag', (c) => c.body(createPatternedBody(256 * 1024)))
 
@@ -182,7 +182,7 @@ describe('Etag Middleware', () => {
   })
 
   it('Should not return etag header when the stream is empty', async () => {
-    const app = new App()
+    const app = new Acryl()
     app.use('/etag/*', etag())
     app.get('/etag/abc', (c) => {
       const stream = new ReadableStream({
@@ -198,7 +198,7 @@ describe('Etag Middleware', () => {
   })
 
   it('Should not return etag header when body is null', async () => {
-    const app = new App()
+    const app = new Acryl()
     app.use('/etag/*', etag())
     app.get('/etag/abc', () => new Response(null, { status: 500 }))
     const res = await app.request('http://localhost/etag/abc')
@@ -207,22 +207,22 @@ describe('Etag Middleware', () => {
   })
 
   it('Should return etag header - weak', async () => {
-    const app = new App()
+    const app = new Acryl()
     app.use('/etag/*', etag({ weak: true }))
     app.get('/etag/abc', (c) => {
-      return c.text('App is hot')
+      return c.text('Acryl is hot')
     })
 
     const res = await app.request('http://localhost/etag/abc')
     expect(res.headers.get('ETag')).not.toBeFalsy()
-    expect(res.headers.get('ETag')).toBe('W/"7c6c452b40ba15d4748e0075f4e402b441c3ea15"')
+    expect(res.headers.get('ETag')).toBe('W/"ba73e68ded3fb25dd2a1c90023bada7880da6ab7"')
   })
 
   it('Should handle conditional GETs', async () => {
-    const app = new App()
+    const app = new Acryl()
     app.use('/etag/*', etag())
     app.get('/etag/ghi', (c) =>
-      c.text('App is great', 200, {
+      c.text('Acryl is great', 200, {
         'cache-control': 'public, max-age=120',
         date: 'Mon, Feb 27 2023 12:08:36 GMT',
         expires: 'Mon, Feb 27 2023 12:10:36 GMT',
@@ -286,9 +286,9 @@ describe('Etag Middleware', () => {
   })
 
   it('Should handle conditional QUERY requests', async () => {
-    const app = new App()
+    const app = new Acryl()
     app.use('/etag/*', etag())
-    app.on('QUERY', '/etag/query', (c) => c.text('App is great'))
+    app.on('QUERY', '/etag/query', (c) => c.text('Acryl is great'))
 
     // unconditional QUERY
     let res = await app.request('http://localhost/etag/query', {
@@ -333,7 +333,7 @@ describe('Etag Middleware', () => {
   })
 
   it('Should not return 304 on unsafe methods or error responses', async () => {
-    const app = new App()
+    const app = new Acryl()
     app.use('/etag/*', etag())
     app.put('/etag/put', (c) => c.text('created', 201, { ETag: '"etag-123"' }))
     app.get('/etag/not-found', (c) => c.text('not found', 404, { ETag: '"etag-123"' }))
@@ -374,18 +374,18 @@ describe('Etag Middleware', () => {
   })
 
   it('Should not return duplicate etag header values', async () => {
-    const app = new App()
+    const app = new Acryl()
     app.use('/etag/*', etag())
     app.use('/etag/*', etag())
-    app.get('/etag/abc', (c) => c.text('App is hot'))
+    app.get('/etag/abc', (c) => c.text('Acryl is hot'))
 
     const res = await app.request('http://localhost/etag/abc')
     expect(res.headers.get('ETag')).not.toBeFalsy()
-    expect(res.headers.get('ETag')).toBe('"7c6c452b40ba15d4748e0075f4e402b441c3ea15"')
+    expect(res.headers.get('ETag')).toBe('"ba73e68ded3fb25dd2a1c90023bada7880da6ab7"')
   })
 
   it('Should not override ETag headers from upstream', async () => {
-    const app = new App()
+    const app = new Acryl()
     app.use('/etag/*', etag())
     app.get('/etag/predefined', (c) =>
       c.text('This response has an ETag', 200, { ETag: '"f-0194-d"' })
@@ -398,7 +398,7 @@ describe('Etag Middleware', () => {
   it('Should retain the default and the specified headers', async () => {
     const cacheControl = 'public, max-age=120'
     const message = 'Hello!'
-    const app = new App()
+    const app = new Acryl()
     app.use(
       '/etag/*',
       etag({
@@ -406,7 +406,7 @@ describe('Etag Middleware', () => {
       })
     )
     app.get('/etag', (c) => {
-      return c.text('App is hot', 200, {
+      return c.text('Acryl is hot', 200, {
         'cache-control': cacheControl,
         'x-message-retain': message,
         'X-Message-Retain-Upper': message,
@@ -415,12 +415,12 @@ describe('Etag Middleware', () => {
     })
     const res = await app.request('/etag', {
       headers: {
-        'If-None-Match': '"7c6c452b40ba15d4748e0075f4e402b441c3ea15"',
+        'If-None-Match': '"ba73e68ded3fb25dd2a1c90023bada7880da6ab7"',
       },
     })
     expect(res.status).toBe(304)
     expect(res.headers.get('ETag')).not.toBeFalsy()
-    expect(res.headers.get('ETag')).toBe('"7c6c452b40ba15d4748e0075f4e402b441c3ea15"')
+    expect(res.headers.get('ETag')).toBe('"ba73e68ded3fb25dd2a1c90023bada7880da6ab7"')
     expect(res.headers.get('Cache-Control')).toBe(cacheControl)
     expect(res.headers.get('x-message-retain')).toBe(message)
     expect(res.headers.get('X-Message-Retain-Upper')).toBe(message)
@@ -428,10 +428,10 @@ describe('Etag Middleware', () => {
   })
 
   it('Should return 304 when weak ETag in If-None-Match matches the generated ETag', async () => {
-    const app = new App()
+    const app = new Acryl()
     app.use('/etag/*', etag())
     app.get('/etag/abc', (c) => {
-      return c.text('App is hot')
+      return c.text('Acryl is hot')
     })
     let res = await app.request('http://localhost/etag/abc')
     const headerEtag = res.headers.get('ETag')!
@@ -440,7 +440,7 @@ describe('Etag Middleware', () => {
 
     res = await app.request('http://localhost/etag/abc', {
       headers: {
-        'If-None-Match': 'W/"7c6c452b40ba15d4748e0075f4e402b441c3ea15"',
+        'If-None-Match': 'W/"ba73e68ded3fb25dd2a1c90023bada7880da6ab7"',
       },
     })
 
@@ -463,9 +463,9 @@ describe('Etag Middleware', () => {
     })
 
     it('Should not generate etag', async () => {
-      const app = new App()
+      const app = new Acryl()
       app.use('/etag/*', etag())
-      app.get('/etag/no-digest', (c) => c.text('App is hot'))
+      app.get('/etag/no-digest', (c) => c.text('Acryl is hot'))
       const res = await app.request('/etag/no-digest')
       expect(res.status).toBe(200)
       expect(res.headers.get('ETag')).toBeNull()
@@ -473,7 +473,7 @@ describe('Etag Middleware', () => {
   })
 
   it('Should remove all non-retained headers on 304 without skipping any', async () => {
-    const app = new App()
+    const app = new Acryl()
     app.use('/etag/*', etag())
     app.get('/etag/multi-headers', (c) => {
       c.header('X-Custom-1', 'val1')
@@ -481,7 +481,7 @@ describe('Etag Middleware', () => {
       c.header('X-Custom-3', 'val3')
       c.header('X-Custom-4', 'val4')
       c.header('Cache-Control', 'max-age=3600')
-      return c.text('App is hot')
+      return c.text('Acryl is hot')
     })
     const res1 = await app.request('http://localhost/etag/multi-headers')
     const etagHeader = res1.headers.get('ETag')!

package/plugins/acryl-router/src/core/middleware/etag/index.ts

@@ -1,6 +1,6 @@
 /**
  * @module
- * ETag Middleware for App.
+ * ETag Middleware for Acryl.
  */
 
 import type { MiddlewareHandler } from '../../types.ts'
@@ -55,7 +55,7 @@ function initializeGenerator(
 }
 
 /**
- * ETag Middleware for App.
+ * ETag Middleware for Acryl.
  *
  *
  * @param {ETagOptions} [options] - The options for the ETag middleware.
@@ -68,11 +68,11 @@ function initializeGenerator(
  *
  * @example
  * ```ts
- * const app = new App()
+ * const app = new Acryl()
  *
  * app.use('/etag/*', etag())
  * app.get('/etag/abc', (c) => {
- *   return c.text('App is hot')
+ *   return c.text('Acryl is hot')
  * })
  * ```
  */

package/plugins/acryl-router/src/core/middleware/ip-restriction/index.test.ts

@@ -2,7 +2,7 @@ import { ipRestriction } from './index.ts'
 import type { IPRestrictionRule } from './index.ts'
 import { Context } from '../../context.ts'
 import type { AddressType, GetConnInfo } from '../../helper/conninfo/index.ts'
-import { App } from '../../app.ts'
+import { Acryl } from '../../app.ts'
 
 describe('ipRestriction middleware', () => {
   it('Should restrict', async () => {
@@ -13,7 +13,7 @@ describe('ipRestriction middleware', () => {
         },
       }
     }
-    const app = new App<{
+    const app = new Acryl<{
       Bindings: {
         ip: string
       }
@@ -64,7 +64,7 @@ describe('ipRestriction middleware', () => {
   test.each(['999.999.999.999', '2001:db8::1%eth0', '1234:::5678'])(
     'Should reject invalid remote address: %s',
     async (ip) => {
-      const app = new App<{
+      const app = new Acryl<{
         Bindings: {
           ip: string
         }
@@ -89,7 +89,7 @@ describe('ipRestriction middleware', () => {
   )
 
   it('Should not call onError for invalid remote addresses', async () => {
-    const app = new App<{
+    const app = new Acryl<{
       Bindings: {
         ip: string
       }

package/plugins/acryl-router/src/core/middleware/ip-restriction/index.ts

@@ -1,5 +1,5 @@
 /**
- * IP Restriction Middleware for App
+ * IP Restriction Middleware for Acryl
  * @module
  */
 
@@ -175,7 +175,7 @@ export interface IPRestrictionRules {
 }
 
 /**
- * IP Restriction Middleware for App.
+ * IP Restriction Middleware for Acryl.
  *
  *
  * @param {GetConnInfo | ((c: Context) => string)} getIP - A function to retrieve the client IP address. Use `getConnInfo` from the appropriate runtime adapter.
@@ -185,11 +185,11 @@ export interface IPRestrictionRules {
  *
  * @example
  * ```ts
- * import { App } from 'acryl-router'
- * import { ipRestriction } from 'acryl-router/middleware'
- * import { getConnInfo } from 'acryl-router/helpers'
+ * import { Acryl } from 'acrylblends'
+ * import { ipRestriction } from 'acrylblends/ip-restriction'
+ * import { getConnInfo } from 'acrylblends/cloudflare-workers'
  *
- * const app = new App()
+ * const app = new Acryl()
  *
  * app.use(
  *   '*',