rajt 0.0.37 → 0.0.39

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "rajt",
   "description": "A serverless bundler layer, fully typed for AWS Lambda (Node.js and LLRT) and Cloudflare Workers.",
-  "version": "0.0.37",
+  "version": "0.0.39",
   "type": "module",
   "main": "dist/index.js",
   "exports": {

package/src/auth/ability.ts

@@ -32,16 +32,16 @@ export class Ability {
     return path == '/'
       ? 'index'
       : path.normalize('NFD')
-        .replace(/[\u0300-\u036f]/g, '')
-        .replace(/^\/*/, '')
-        .replace(/([a-z])([A-Z])/g, '$1-$2')
-        .replace(/[^a-zA-Z0-9/]|[\s_.]/g, '-')
-        .replace(/-+/g, '-')
-        .replace(/\//g, '.')
-        .replace(/\.-/g, '.')
-        .replace(/^[._-]+/, '')
-        .replace(/[._-]+$/, '')
-        .toLowerCase()
+         .replace(/[\u0300-\u036f]/g, '')
+         .replace(/^\/*/, '')
+         .replace(/([a-z])([A-Z])/g, '$1-$2')
+         .replace(/[^a-zA-Z0-9/]|[\s\-.]/g, '_')
+         .replace(/_+/g, '_')
+         .replace(/\//g, '.')
+         .replace(/\._/g, '.')
+         .replace(/^[._-]+/, '')
+         .replace(/[._-]+$/, '')
+         .toLowerCase()
   }
 
   static get abilities() {

package/src/auth/authnz.ts

@@ -54,13 +54,20 @@ export class Authnz<T extends object> {
 
   #match(rule: string, ability: string): boolean {
     if (rule === ability) return true
-    if (rule.endsWith('.*')) {
-      const prefix = rule.slice(0, -2)
-      return ability.startsWith(`${prefix}.`) || ability === prefix
-    }
+    if (
+      this.#wildcardMatch(rule, ability, '_*')
+      || this.#wildcardMatch(rule, ability, '-*')
+      || this.#wildcardMatch(rule, ability, '.*')
+    ) return true
+
     return false
   }
 
+  #wildcardMatch(rule: string, ability: string, suffix: string) {
+    return rule.endsWith(suffix)
+      && (ability.startsWith(rule.slice(0, -2) + suffix[0]) || ability === rule.slice(0, -2))
+  }
+
   get abilities() {
     return this.#abilities
   }

package/src/auth/index.ts

@@ -1,5 +1,5 @@
 export { Ability } from './ability'
-export { Auth } from './auth'
+export { Auth, Auth as Gate } from './auth'
 export { Authnz } from './authnz'
 export { Token } from './token'
 

package/src/auth/token.ts

@@ -77,7 +77,7 @@ export class Token {
     try {
       const parsedUrl = new URL(formattedUrl)
       return parsedUrl.host
-    } catch (e) {
+    } catch {
       return ''
     }
   }

package/src/context.ts

@@ -28,4 +28,16 @@ export default class CX {
   static get cookie() {
     return this.#cookie
   }
+
+  static get ip(): string | undefined {
+    return this.#c.req.header('cf-connecting-ip')
+      || this.#c.req.header('x-forwarded-for')?.split(',')[0]?.trim()
+      || this.#c.env?.aws?.lambda?.event?.requestContext?.identity?.sourceIp
+      || this.#c.req.header('x-real-ip')
+      || this.#c.env?.remoteAddr?.hostname
+  }
+
+  static get userAgent(): string | undefined {
+    return this.#c.req.header('user-agent')
+  }
 }

package/src/dev.ts

@@ -25,7 +25,7 @@ const desiredPort = process.env?.PORT ? Number(process.env.PORT) : 3000
 getAvailablePort(desiredPort)
   .then(port => {
     if (port != desiredPort)
-      console.warn(`🟨 Port ${desiredPort} was in use, using ${port} as a fallback`)
+      console.warn(`🟠 Port ${desiredPort} was in use, using ${port} as a fallback`)
 
     console.log(`🚀 API running on http://localhost:${port}`)
     serve({ fetch, port })

package/src/esbuild.mjs

@@ -1,9 +1,9 @@
 import esbuild from 'esbuild'
-import path from 'path'
+import { dirname, join, relative } from 'path'
 import { fileURLToPath } from 'url'
-import fs from 'fs/promises'
+import { readFile, stat, writeFile } from 'fs/promises'
 
-const __dirname = path.dirname(fileURLToPath(import.meta.url))
+const __dirname = dirname(fileURLToPath(import.meta.url))
 
 const formatSize = (bytes) => {
   if (bytes < 1024) return `${bytes}b`
@@ -16,10 +16,10 @@ const formatTime = (ms) => {
 }
 
 const buildOptions = {
-  entryPoints: [path.join(__dirname, 'prod.ts')],
+  entryPoints: [join(__dirname, 'prod.ts')],
   bundle: true,
   minify: true,
-  outfile: path.join(__dirname, '../../../dist/index.js'),
+  outfile: join(__dirname, '../../../dist/index.js'),
   platform: 'node',
   target: 'node20',
   format: 'esm',
@@ -27,37 +27,60 @@ const buildOptions = {
   legalComments: 'none',
   external: ['@aws-sdk', '@smithy'],
   metafile: true,
-  plugins: [{
-    name: 'preserve-class-names',
-    setup(build) {
-      build.onLoad(
-        { filter: /(actions|features)\/.*\.ts$/ },
-        async (args) => {
-          const contents = await fs.readFile(args.path, 'utf8')
-          const result = await esbuild.transform(contents, {
-            loader: 'ts',
-            minify: true,
-            keepNames: true
-          })
-          return { contents: result.code, loader: 'ts' }
-        }
-      )
+  write: false,
+  plugins: [
+    {
+      name: 'preserve-class-names',
+      setup(build) {
+        build.onLoad(
+          { filter: /(actions|features)\/.*\.ts$/ },
+          async (args) => {
+            const contents = await readFile(args.path, 'utf8')
+            const result = await esbuild.transform(contents, {
+              loader: 'ts',
+              minify: true,
+              keepNames: true
+            })
+            return { contents: result.code, loader: 'ts' }
+          }
+        )
+      },
     },
-  }]
+    {
+      name: 'remove-use-strict',
+      setup(build) {
+        build.onEnd(async (result) => {
+          if (!result.outputFiles) return
+
+          const files = result.outputFiles.filter(file => file.path.endsWith('.js'))
+          await Promise.all(files.map(async file => {
+            if (!file.path.endsWith('.js')) return
+
+            await writeFile(
+              file.path,
+              new TextDecoder()
+                .decode(file.contents)
+                .replace(/(["'`])\s*use strict\s*\1;?|`use strict`;?/g, '')
+            )
+          }))
+        })
+      }
+    }
+  ]
 }
 
 try {
   const startTime = Date.now()
   const result = await esbuild.build(buildOptions)
 
-  const cwd = path.join(__dirname, '../../..')
+  const cwd = join(__dirname, '../../..')
 
   const outputFile = buildOptions.outfile
-  const stats = await fs.stat(outputFile)
+  const stats = await stat(outputFile)
   const size = formatSize(stats.size)
 
   console.log(`\n⚡️ Done in ${formatTime(Date.now() - startTime)}`)
-  console.log(`    ${path.relative(path.join(cwd, 'node_modules/rajt/src'), buildOptions.entryPoints[0])} → ${path.relative(cwd, outputFile)}`)
+  console.log(`    ${relative(join(cwd, 'node_modules/rajt/src'), buildOptions.entryPoints[0])} → ${relative(cwd, outputFile)}`)
   console.log(`    Size: ${size}`)
   console.log(`    Files: ${Object.keys(result.metafile.outputs).length}`)
 } catch (error) {

package/src/register.ts

@@ -2,7 +2,7 @@ export const handlers: Record<string, Function> = {}
 
 export function registerHandler(id: string, handler: any) {
   if (id in handlers)
-    console.warn(`Handler "${id}" has already been registered`)
+    console.warn(`🟠 Handler "${id}" has already been registered`)
 
   handlers[id] = handler
 }

package/src/request.ts

@@ -87,4 +87,12 @@ export default class Request {
   static get cookie() {
     return c.cookie
   }
+
+  static get ip() {
+    return c.ip
+  }
+
+  static get userAgent() {
+    return c.userAgent
+  }
 }