yedra 0.9.4 → 0.9.6

package/dist/routing/app.js

@@ -72,15 +72,15 @@ export class App {
         let invalidMethod = false;
         let result = undefined;
         for (const endpoint of this.endpoints) {
-            const params = endpoint.path.match(url);
-            if (!params) {
+            const match = endpoint.path.match(url);
+            if (match === undefined) {
                 continue;
             }
+            const { params, score } = match;
             if (endpoint.method !== method) {
                 invalidMethod = true;
                 continue;
             }
-            const score = Object.keys(params).length;
             const previous = result?.score;
             if (previous === undefined || score < previous) {
                 // if there was no previous match or this one is better, use it

package/dist/routing/listen.js

@@ -70,7 +70,8 @@ export const listen = (app, port) => {
         req.on('end', async () => {
             const body = Buffer.concat(chunks);
             const url = new URL(req.url ?? '', `http://${req.headers.host}`);
-            console.info(`[${new Date().toISOString()}] ${req.method} ${url.pathname} (${context.connectionCount()} connections)`);
+            const begin = Date.now();
+            const concurrentConnections = context.connectionCount();
             const response = await app.handle({
                 method: req.method ?? 'GET',
                 url: url.pathname,
@@ -78,6 +79,8 @@ export const listen = (app, port) => {
                 headers: parseHeaders(req.headers),
                 body,
             });
+            const duration = Date.now() - begin;
+            console.info(`[${new Date().toISOString()}] ${req.method} ${url.pathname} -> ${response.status} [${duration}ms, ${concurrentConnections}cc]`);
             res.writeHead(response.status, response.headers);
             res.end(response.body);
             removeConn();

package/dist/routing/path.d.ts

@@ -33,7 +33,10 @@ export declare class Path {
      * undefined.
      * @param path - The string path to match.
      */
-    match(path: string): Record<string, string> | undefined;
+    match(path: string): {
+        params: Record<string, string>;
+        score: number;
+    } | undefined;
     /**
      * Remove `:` and `?` from a parameter path segment.
      * @param param - The path segment.

package/dist/routing/path.js

@@ -16,9 +16,13 @@ export class Path {
             throw new Error(`API path ${path} is invalid: Must start with '/'.`);
         }
         this.expected = path.substring(1).split('/');
-        const invalidSegment = this.expected.find((part) => part.match(/^(:?[a-z0-9-]+\??)$/) === null);
+        const invalidSegment = this.expected.find((part) => part.match(/^((:?[a-z0-9-]+\??)|\*)$/) === null);
         if (invalidSegment) {
-            throw new Error(`API path ${path} is invalid: Segment ${invalidSegment} does not match regex /^(:?[a-z0-9-]+\\??)$/.`);
+            throw new Error(`API path ${path} is invalid: Segment ${invalidSegment} does not match regex /^((:?[a-z0-9-]+\\??)|\\*)$/.`);
+        }
+        const wildcard = this.expected.findIndex((part) => part === '*');
+        if (wildcard !== -1 && wildcard !== this.expected.length - 1) {
+            throw new Error(`API path ${path} is invalid: * must be the last path segment.`);
         }
         const firstOptional = this.expected.findIndex((part) => part.endsWith('?'));
         if (firstOptional !== -1 &&
@@ -53,11 +57,15 @@ export class Path {
     match(path) {
         const params = {};
         const actual = path.substring(1).split('/');
-        if (this.expected.length < actual.length) {
-            // path cannot be longer than expected
+        if (this.expected.length < actual.length && !this.expected.includes('*')) {
+            // path cannot be longer than expected, unless it contains a wildcard
             return undefined;
         }
         for (let i = 0; i < actual.length; ++i) {
+            if (this.expected[i] === '*') {
+                // wildcard, parsing successful
+                return { params, score: Number.POSITIVE_INFINITY };
+            }
             if (this.expected[i].startsWith(':')) {
                 // parameter, accept anything
                 params[Path.normalizeParam(this.expected[i])] = actual[i];
@@ -68,11 +76,17 @@ export class Path {
             }
         }
         if (actual.length < this.expected.length &&
-            !this.expected[actual.length].endsWith('?')) {
+            !this.expected[actual.length].endsWith('?') &&
+            this.expected[actual.length] !== '*') {
             // path is incomplete
             return undefined;
         }
-        return params;
+        return {
+            params,
+            score: this.expected.includes('*')
+                ? Number.POSITIVE_INFINITY
+                : Object.keys(params).length,
+        };
     }
     /**
      * Remove `:` and `?` from a parameter path segment.

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "yedra",
-  "version": "0.9.4",
+  "version": "0.9.6",
   "repository": "github:0codekit/yedra",
   "main": "dist/index.js",
   "devDependencies": {
     "@biomejs/biome": "^1.8.3",
     "@types/bun": "^1.1.6",
-    "@types/node": "^20.14.10",
+    "@types/node": "^20.14.11",
     "typescript": "^5.5.3"
   },
   "bugs": "https://github.com/0codekit/yedra/issues",