@vyckr/tachyon 0.1.0 → 0.3.0

package/Dockerfile

@@ -16,28 +16,32 @@ RUN unzip bun-lambda-layer.zip -d /tmp
 
 WORKDIR /tmp
 
-COPY ./src/Tach.ts .
-
 COPY package.json .
 
 RUN bun install
 
-RUN bun build --target=bun Tach.ts --outfile lambda
-
 FROM public.ecr.aws/lambda/provided:al2
 
-COPY --from=build /tmp/lambda ${LAMBDA_TASK_ROOT}
+COPY --from=build /tmp/node_modules ${LAMBDA_TASK_ROOT}/node_modules
+
+COPY --from=build /tmp/package.json ${LAMBDA_TASK_ROOT}/package.json
 
 COPY --from=build /tmp/bootstrap ${LAMBDA_RUNTIME_DIR}
 
 COPY --from=build /tmp/bun /opt
 
+COPY ./src/Tach.ts ${LAMBDA_TASK_ROOT}
+
+COPY ./tsconfig.json ${LAMBDA_TASK_ROOT}
+
 COPY ./src/runtime.ts /opt
 
 RUN chmod 777 /opt/bun
 
-RUN chmod 777 ${LAMBDA_TASK_ROOT}/lambda
+RUN chmod 777 /opt/runtime.ts
+
+RUN chmod 777 ${LAMBDA_TASK_ROOT}/Tach.ts
 
 RUN chmod 777 ${LAMBDA_RUNTIME_DIR}/bootstrap
 
-CMD ["lambda.fetch"]
+CMD ["Tach.fetch"]

package/README.md

@@ -60,12 +60,12 @@ Make sure you have set the 'SCHEMA_PATH' if 'SCHEMA' is set to 'STRICT'. The sch
 ### Requirements
 - Make sure to have a 'routes' directory in the root of your project
 - Dynamic routes should be enclosed in square brackets
-- The first parameter should NOT be a dynamic route (e.g. /[version]/doc.ts)
-- All dynamic routes should be within odd indexes (e.g. /v1/[path]/login/[id]/name.ts)
-- The last parameter in the route should not be a dynamic route (e.g. /v1/[path]/login/[id]/name.ts)
+- The first parameter should NOT be a dynamic route (e.g. /[version]/doc/index.ts)
+- All dynamic routes should be within odd indexes (e.g. /v1/[path]/login/[id]/name/index.ts)
+- The last parameter in the route should not be a dynamic route (e.g. /v1/[path]/login/[id]/name/index.ts)
 
 ```typescript
-// routes/v1/[collection]/doc.ts
+// routes/v1/[collection]/doc/index.ts
 import Silo from "@vyckr/byos"
 imoprt { VALIDATE } from "../utils/decorators"
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vyckr/tachyon",
-  "version": "0.1.0",
+  "version": "0.3.0",
   "devDependencies": {
     "@types/node": "^20.4.2",
     "bun-types": "^1.1.21"

package/routes/byos/[primary]/{doc.ts → doc/index.ts}

@@ -1,4 +1,4 @@
-import { VALIDATE } from "../../_utils/validation.js";
+import { VALIDATE } from "../../../utils/validation.js";
 
 export default class Doc {
 

package/routes/byos/[primary]/{docs.ts → docs/index.ts}

@@ -1,4 +1,4 @@
-import { VALIDATE } from "../../_utils/validation.js";
+import { VALIDATE } from "../../../utils/validation.js";
 
 export default class Docs {
 

package/routes/byos/[primary]/join/[secondary]/{docs.ts → docs/index.ts}

@@ -1,4 +1,4 @@
-import { VALIDATE } from "../../../../_utils/validation.js";
+import { VALIDATE } from "../../../../../utils/validation.js";
 
 export default class Docs {
 

package/routes/byos/[primary]/stream/{doc.ts → doc/index.ts}

@@ -1,4 +1,4 @@
-import { VALIDATE } from "../../../_utils/validation.js";
+import { VALIDATE } from "../../../../utils/validation.js";
 
 export default class {
 

package/routes/byos/[primary]/stream/{docs.ts → docs/index.ts}

@@ -1,4 +1,4 @@
-import { VALIDATE } from "../../../_utils/validation.js";
+import { VALIDATE } from "../../../../utils/validation.js";
 
 export default class {
 

package/routes/proxy.ts

@@ -0,0 +1,8 @@
+export default async function middleware(request: Request, next: (request: Request) => Promise<Response>) {
+
+    console.log("Within Proxy")
+
+    const response = await next(request)
+
+    return response
+}

package/src/Tach.ts

@@ -1,6 +1,5 @@
 import { AsyncLocalStorage } from "node:async_hooks";
 import { watch } from "node:fs";
-import { exists } from "node:fs/promises";
 import Silo from "@vyckr/byos";
 import { Glob, Server } from "bun";
 
@@ -39,18 +38,73 @@ const Tach = {
 
     routesPath: process.env.LAMBDA_TASK_ROOT ? `${process.env.LAMBDA_TASK_ROOT}/routes` : `${process.cwd()}/routes`,
 
-    hasMiddleware: await exists(`${process.env.LAMBDA_TASK_ROOT || process.cwd()}/routes/_middleware.ts`) || await exists(`${process.env.LAMBDA_TASK_ROOT || process.cwd()}/routes/_middleware.js`) ,
+    proxyMod: null,
 
+    async proxy(req: Request, server?: Server) {
+
+        const request = req.clone()
+
+        const logs: _log[] = []
+
+        const url = new URL(req.url)
+        
+        const startTime = Date.now()
+
+        const ipAddress = server && server.requestIP ? server.requestIP(req)!.address : '0.0.0.0'
+
+        return await Tach.context.run(logs, async () => {
+
+            let res: Response
+
+            try {
+
+                const data = await Tach.processRequest(req, { ipAddress, request: req, requestTime: startTime, logs, slugs: new Map<string, any>() })
+    
+                res = Tach.processResponse(200, data)
+
+                if(logs.length > 0 && Tach.saveLogs && Tach.dbPath) await Promise.all(logs.map(log => { 
+                                        return Silo.putData(Tach.logsTableName, { ipAddress, path: url.pathname, method: req.method, ...log })
+                                    }))
+            
+                if(!Tach.isAsyncIterator(data)) {
+
+                    const status = res.status
+                    const response_size = typeof data !== "undefined" ? String(data).length : 0
+                    const url = new URL(req.url)
+                    const method = req.method
+                    const date = Date.now()
+                    const duration = date - startTime
+                    
+                    console.info(`"${method} ${url.pathname}" ${status} - ${duration}ms - ${response_size} byte(s)`)
+                
+                    if(Tach.dbPath && Tach.saveStats) await Silo.putData(Tach.statsTableName, { ipAddress, cpu: process.cpuUsage(), memory: process.memoryUsage(), date: Date.now() })
+                }
+
+            } catch(e) {
+
+                const method = request.method
+
+                await Tach.logError(e as Error, ipAddress, url, method, logs, startTime)
+
+                if(Tach.dbPath && Tach.saveStats) await Silo.putData(Tach.statsTableName, { ipAddress, cpu: process.cpuUsage(), memory: process.memoryUsage(), date: Date.now() })
+
+                res = Response.json({ detail: (e as Error).message }, { status: (e as Error).cause as number ?? 500, headers: Tach.headers })
+            }
+            
+            return res
+        })
+    },
+    
     pathsMatch(routeSegs: string[], pathSegs: string[]) {
 
         if (routeSegs.length !== pathSegs.length) {
             return false;
         }
 
-        const slugs = Tach.routeSlugs.get(`${routeSegs.join('/')}.ts`) || Tach.routeSlugs.get(`${routeSegs.join('/')}.js`) || new Map<string, number>()
+        const slugs = Tach.routeSlugs.get(`${routeSegs.join('/')}/index.ts`) || Tach.routeSlugs.get(`${routeSegs.join('/')}/index.js`) || new Map<string, number>()
     
         for (let i = 0; i < routeSegs.length; i++) {
-            if (!slugs.has(routeSegs[i]) && routeSegs[i].replace('.ts', '').replace('.js', '') !== pathSegs[i]) {
+            if (!slugs.has(routeSegs[i]) && routeSegs[i] !== pathSegs[i]) {
                 return false;
             }
         }
@@ -73,7 +127,11 @@ const Tach = {
         let bestMatchLength = -1;
 
         for (const [routeKey] of Tach.indexedRoutes) {
-            const routeSegs = routeKey.split('/').map(seg => seg.replace('.ts', '').replace('.js', ''));
+
+            const routeSegs = routeKey.split('/')
+
+            routeSegs.pop()
+            
             const isMatch = Tach.pathsMatch(routeSegs, paths.slice(0, routeSegs.length));
 
             if (isMatch && routeSegs.length > bestMatchLength) {
@@ -110,43 +168,35 @@ const Tach = {
 
     formatMsg(...msg: any[]) {
 
-        if(msg instanceof Set) return "\n" + JSON.stringify(Array.from(msg), null, 2)
-        
-        else if(msg instanceof Map) return "\n" + JSON.stringify(Object.fromEntries(msg), null, 2)
-
-        else if(msg instanceof FormData) {
-            const formEntries: Record<string, any> = {}
-            msg.forEach((val, key) => formEntries[key] = val)
-            return "\n" + JSON.stringify(formEntries, null, 2)
-        }
-
-        else if(Array.isArray(msg) 
-            || (typeof msg === 'object' && !Array.isArray(msg))
-            || (typeof msg === 'object' && msg !== null)) return "\n" + JSON.stringify(msg, null, 2) 
+        const formatted: string[] = []
 
-        return msg
-    },
-
-    configLogger() {
+        for(const arg of msg) {
 
-        const logger = console.log
+            if(arg instanceof Set) formatted.push(JSON.stringify(Array.from(arg), null, 2))
 
-        function log(...args: any[]): void {
+            else if(arg instanceof Map) formatted.push(JSON.stringify(Object.fromEntries(arg), null, 2))
 
-            if (!args.length) {
-                return;
+            else if(arg instanceof FormData) {
+                const formEntries: Record<string, any> = {}
+                arg.forEach((val, key) => formEntries[key] = val)
+                formatted.push(JSON.stringify(formEntries, null, 2))
             }
 
-            const messages = args.map(arg => Bun.inspect(arg).replace(/\n/g, "\r"));
+            else if(Array.isArray(arg) || (typeof arg === 'object' && !Array.isArray(arg)) || (typeof arg === 'object' && arg !== null)) formatted.push(JSON.stringify(arg, null, 2))
 
-            logger(...messages);
+            else formatted.push(arg)
         }
 
+        return formatted.join('\n\n')
+    },
+
+    configLogger() {
+
         const reset = '\x1b[0m'
 
         console.info = (...args: any[]) => {
             const info = `[${Tach.formatDate()}]\x1b[32m INFO${reset} (${process.pid}) ${Tach.formatMsg(...args)}`
-            log(info)
+            console.log(info)
             if(Tach.context.getStore()) {
                 const logWriter = Tach.context.getStore()
                 if(logWriter && Tach.dbPath && Tach.saveLogs) logWriter.push({ date: Date.now(), msg: `${info.replace(reset, '').replace('\x1b[32m', '')}\n`, type: "info" })
@@ -155,7 +205,7 @@ const Tach = {
 
         console.error = (...args: any[]) => {
             const err = `[${Tach.formatDate()}]\x1b[31m ERROR${reset} (${process.pid}) ${Tach.formatMsg(...args)}`
-            log(err)
+            console.log(err)
             if(Tach.context.getStore()) {
                 const logWriter = Tach.context.getStore()
                 if(logWriter && Tach.dbPath && Tach.saveLogs) logWriter.push({ date: Date.now(), msg: `${err.replace(reset, '').replace('\x1b[31m', '')}\n`, type: "error" })
@@ -164,7 +214,7 @@ const Tach = {
 
         console.debug = (...args: any[]) => {
             const bug = `[${Tach.formatDate()}]\x1b[36m DEBUG${reset} (${process.pid}) ${Tach.formatMsg(...args)}`
-            log(bug)
+            console.log(bug)
             if(Tach.context.getStore()) {
                 const logWriter = Tach.context.getStore()
                 if(logWriter && Tach.dbPath && Tach.saveLogs) logWriter.push({ date: Date.now(), msg: `${bug.replace(reset, '').replace('\x1b[36m', '')}\n`, type: "debug" })
@@ -173,7 +223,7 @@ const Tach = {
 
         console.warn = (...args: any[]) => {
             const warn = `[${Tach.formatDate()}]\x1b[33m WARN${reset} (${process.pid}) ${Tach.formatMsg(...args)}`
-            log(warn)
+            console.log(warn)
             if(Tach.context.getStore()) {
                 const logWriter = Tach.context.getStore()
                 if(logWriter && Tach.dbPath && Tach.saveLogs) logWriter.push({ date: Date.now(), msg: `${warn.replace(reset, '').replace('\x1b[33m', '')}\n`, type: "warn" })
@@ -182,7 +232,7 @@ const Tach = {
 
         console.trace = (...args: any[]) => {
             const trace = `[${Tach.formatDate()}]\x1b[35m TRACE${reset} (${process.pid}) ${Tach.formatMsg(...args)}`
-            log(trace)
+            console.log(trace)
             if(Tach.context.getStore()) {
                 const logWriter = Tach.context.getStore()
                 if(logWriter && Tach.dbPath && Tach.saveLogs) logWriter.push({ date: Date.now(), msg: `${trace.replace(reset, '').replace('\x1b[35m', '')}\n`, type: "trace" })
@@ -230,19 +280,9 @@ const Tach = {
 
         if(searchParams.size > 0) queryParams = Tach.parseKVParams(searchParams)
 
-        const middlewarePath = await exists(`${Tach.routesPath}/_middleware.ts`) ? `${Tach.routesPath}/_middleware.ts` : `${Tach.routesPath}/_middleware.js`
-
         if(params.length > 0 && !queryParams && !data) {
 
-            let res = undefined
-
-            if(Tach.hasMiddleware) {
-
-                const middleware = (await import(middlewarePath)).default
-
-                res = await middleware(async () => handler(...params, context))
-            
-            } else res = await handler(...params, context)
+            const res = await handler(...params, context)
 
             await Tach.logRequest(request, 200, context)
 
@@ -250,15 +290,7 @@ const Tach = {
 
         } else if(params.length === 0 && queryParams && !data) {
 
-            let res = undefined
-
-            if(Tach.hasMiddleware) {
-
-                const middleware = (await import(middlewarePath)).default
-
-                res = await middleware(async () => handler(queryParams, context))
-            
-            } else res = await handler(queryParams, context)
+            const res = await handler(queryParams, context)
 
             await Tach.logRequest(request, 200, context)
 
@@ -266,15 +298,7 @@ const Tach = {
 
         } else if(params.length === 0 && !queryParams && data) {
 
-            let res = undefined
-
-            if(Tach.hasMiddleware) {
-
-                const middleware = (await import(middlewarePath)).default
-
-                res = await middleware(async () => handler(data, context))
-
-            } else res = await handler(data, context)
+            const res = await handler(data, context)
 
             await Tach.logRequest(request, 200, context, await body.text())
 
@@ -282,15 +306,7 @@ const Tach = {
 
         } else if(params.length > 0 && queryParams && !data) {
 
-            let res = undefined
-
-            if(Tach.hasMiddleware) {
-
-                const middleware = (await import(middlewarePath)).default
-
-                res = await middleware(async () => handler(...params, queryParams, context))
-            
-            } else res = await handler(...params, queryParams, context)
+            const res = await handler(...params, queryParams, context)
 
             await Tach.logRequest(request, 200, context)
 
@@ -298,15 +314,7 @@ const Tach = {
         
         } else if(params.length > 0 && !queryParams && data) {
 
-            let res = undefined
-
-            if(Tach.hasMiddleware) {
-
-                const middleware = (await import(middlewarePath)).default
-
-                res = await middleware(async () => handler(...params, data, context))
-            
-            } else res = await handler(...params, data, context)
+            const res = await handler(...params, data, context)
 
             await Tach.logRequest(request, 200, context, await body.text())
 
@@ -314,15 +322,7 @@ const Tach = {
 
         } else if(params.length === 0 && data && queryParams) {
 
-            let res = undefined
-
-            if(Tach.hasMiddleware) {
-
-                const middleware = (await import(middlewarePath)).default
-
-                res = await middleware(async () => handler(queryParams, data, context))
-            
-            } else res = await handler(queryParams, data, context)
+            const res = await handler(queryParams, data, context)
 
             await Tach.logRequest(request, 200, context, await body.text())
 
@@ -330,15 +330,7 @@ const Tach = {
         
         } else if(params.length > 0 && data && queryParams) {
 
-            let res = undefined
-
-            if(Tach.hasMiddleware) {
-
-                const middleware = (await import(middlewarePath)).default
-
-                res = await middleware(async () => handler(...params, queryParams, data, context))
-            
-            } else res = await handler(...params, queryParams, data, context)
+            const res = await handler(...params, queryParams, data, context)
 
             await Tach.logRequest(request, 200, context, await body.text())
 
@@ -346,15 +338,7 @@ const Tach = {
         
         } else {
 
-            let res = undefined
-
-            if(Tach.hasMiddleware) {
-
-                const middleware = (await import(middlewarePath)).default
-
-                res = await middleware(async () => handler(context))
-            
-            } else res = await handler(context)
+            const res = await handler(context)
 
             await Tach.logRequest(request, 200, context)
 
@@ -415,57 +399,14 @@ const Tach = {
 
     async fetch(req: Request, server: Server) {
 
-        const request = req.clone()
-
-        const logs: _log[] = []
-
-        const url = new URL(req.url)
-        
-        const startTime = Date.now()
+        if(Tach.proxyMod) {
 
-        const ipAddress = server.requestIP ? server.requestIP(req)!.address : '0.0.0.0'
+            const middleware = (Tach.proxyMod as any).default
 
-        return await Tach.context.run(logs, async () => {
-
-            let res: Response
-
-            try {
-
-                const data = await Tach.processRequest(req, { ipAddress, request: req, requestTime: startTime, logs, slugs: new Map<string, any>() })
-    
-                res = Tach.processResponse(200, data)
-
-                if(logs.length > 0 && Tach.saveLogs && Tach.dbPath) await Promise.all(logs.map(log => { 
-                                        return Silo.putData(Tach.logsTableName, { ipAddress, path: url.pathname, method: req.method, ...log })
-                                    }))
-            
-                if(!Tach.isAsyncIterator(data)) {
-
-                    const status = res.status
-                    const response_size = typeof data !== "undefined" ? String(data).length : 0
-                    const url = new URL(req.url)
-                    const method = req.method
-                    const date = Date.now()
-                    const duration = date - startTime
-                    
-                    console.info(`"${method} ${url.pathname}" ${status} - ${duration}ms - ${response_size} byte(s)`)
-                
-                    if(Tach.dbPath && Tach.saveStats) await Silo.putData(Tach.statsTableName, { ipAddress, cpu: process.cpuUsage(), memory: process.memoryUsage(), date: Date.now() })
-                }
-
-            } catch(e) {
-
-                const method = request.method
-
-                await Tach.logError(e as Error, ipAddress, url, method, logs, startTime)
-
-                if(Tach.dbPath && Tach.saveStats) await Silo.putData(Tach.statsTableName, { ipAddress, cpu: process.cpuUsage(), memory: process.memoryUsage(), date: Date.now() })
+            if(middleware) return await middleware(req, Tach.proxy)
+        }
 
-                res = Response.json({ detail: (e as Error).message }, { status: (e as Error).cause as number ?? 500, headers: Tach.headers })
-            }
-            
-            return res
-        })
+        return await Tach.proxy(req, server)
     },
 
     async validateRoutes(route?: string) {
@@ -480,19 +421,17 @@ const Tach = {
 
             const slugs = new Map<string, number>()
 
+            if(pattern.test(paths[0]) || pattern.test(paths[paths.length - 1])) throw new Error(`Invalid route ${route}`)
+
             paths.forEach((path, idx) => {
 
-                if(pattern.test(path) && (idx % 2 === 0 || paths[idx].includes('.ts') || paths[idx].includes('.js'))) {
+                if(pattern.test(path) && (pattern.test(paths[idx - 1]) || pattern.test(paths[idx + 1]))) {
                     throw new Error(`Invalid route ${route}`)
                 }
 
                 if(pattern.test(path)) slugs.set(path, idx)
             })
     
-            const idx = paths.findIndex((path) => pattern.test(path))
-    
-            if(idx > -1 && (idx % 2 === 0 || paths[idx].includes('.ts') || paths[idx].includes('.js'))) throw new Error(`Invalid route ${route}`)
-    
             const staticPath = paths.filter((path) => !pattern.test(path)).join(',')
     
             if(staticPaths.includes(staticPath)) throw new Error(`Duplicate route ${route}`)
@@ -520,11 +459,13 @@ const Tach = {
 
         if(route) return await validateRoute(route)
 
-        const files = Array.from(new Glob(`**/*.{ts,js}`).scanSync({ cwd: Tach.routesPath }))
+        const routes = Array.from(new Glob(`**/*/index.{ts,js}`).scanSync({ cwd: Tach.routesPath }))
+        
+        for(const route of routes) await validateRoute(route)
 
-        const routes = files.filter((route) => !route.split('/').some((path) => path.startsWith('_')))
+        const proxy = Array.from(new Glob(`**/proxy.{ts,js}`).scanSync({ cwd: Tach.routesPath }))
 
-        for(const route of routes) await validateRoute(route)
+        if(proxy[0]) Tach.proxyMod = await import(`${Tach.routesPath}/${proxy[0]}`)
     },
 
     parseParams(input: string[]) {