@c15t/backend 0.0.1-rc.16 → 0.0.1-rc.18

package/.turbo/turbo-build.log

@@ -1,16 +1,16 @@
 
 
-> @c15t/backend@0.0.1-rc.16 build /Users/christopherburns/glados/k/c15t/packages/backend
+> @c15t/backend@0.0.1-rc.18 build /Users/christopherburns/glados/k/c15t/packages/backend
 > rslib build
 
   Rslib v0.5.3
 
-ready   built in 0.36 s (esm)
-ready   built in 0.35 s (cjs)
+ready   built in 0.31 s (esm)
+ready   built in 0.32 s (cjs)
 start   Generating DTS... (esm)
 start   Generating DTS... (cjs)
-ready   DTS generated in 3.48 s (cjs)
-ready   DTS generated in 3.53 s (esm)
+ready   DTS generated in 4.64 s (cjs)
+ready   DTS generated in 4.70 s (esm)
 
   File (esm)                                                 Size        
   dist/pkgs/types/index.js                                   0.00 kB 
@@ -18,7 +18,7 @@
   dist/pkgs/logger/index.js                                  7.2 kB  
   dist/integrations/node.js                                  9.1 kB  
   dist/integrations/next.js                                  9.6 kB  
-  dist/integrations/cloudflare.js                            11.2 kB 
+  dist/integrations/cloudflare.js                            11.8 kB 
   dist/pkgs/results/index.js                                 22.2 kB 
   dist/pkgs/db-adapters/adapters/memory-adapter/index.js     49.4 kB 
   dist/pkgs/db-adapters/adapters/prisma-adapter/index.js     52.6 kB 
@@ -29,9 +29,9 @@
   dist/schema/index.js                                       74.9 kB 
   dist/pkgs/data-model/index.js                              75.6 kB 
   dist/pkgs/db-adapters/index.js                             94.3 kB 
-  dist/index.js                                              154.5 kB
+  dist/index.js                                              154.6 kB
 
-  Total: 811.9 kB
+  Total: 812.6 kB
 
   -----
 
@@ -41,7 +41,7 @@
   dist/pkgs/logger/index.cjs                                  8.1 kB  
   dist/integrations/node.cjs                                  10.2 kB 
   dist/integrations/next.cjs                                  10.7 kB 
-  dist/integrations/cloudflare.cjs                            12.3 kB 
+  dist/integrations/cloudflare.cjs                            12.9 kB 
   dist/pkgs/results/index.cjs                                 23.1 kB 
   dist/pkgs/db-adapters/adapters/memory-adapter/index.cjs     50.1 kB 
   dist/pkgs/db-adapters/adapters/prisma-adapter/index.cjs     53.3 kB 
@@ -52,7 +52,7 @@
   dist/schema/index.cjs                                       82.6 kB 
   dist/pkgs/data-model/index.cjs                              83.5 kB 
   dist/pkgs/db-adapters/index.cjs                             95.0 kB 
-  dist/index.cjs                                              168.2 kB
+  dist/index.cjs                                              168.3 kB
 
-  Total: 860.3 kB
+  Total: 861.0 kB
 

package/.turbo/turbo-fmt.log

@@ -1,7 +1,7 @@
 
 
-> @c15t/backend@0.0.1-rc.15 fmt /Users/christopherburns/glados/k/c15t/packages/backend
+> @c15t/backend@0.0.1-rc.17 fmt /Users/christopherburns/glados/k/c15t/packages/backend
 > pnpm biome format --write . && biome check --formatter-enabled=false --linter-enabled=false --organize-imports-enabled=true --write
 
-Formatted 167 files in 42ms. Fixed 2 files.
-Checked 362 files in 49ms. Fixed 28 files.
+Formatted 167 files in 24ms. Fixed 1 file.
+Checked 362 files in 104ms. Fixed 28 files.

package/dist/index.cjs

@@ -3300,13 +3300,16 @@ var __webpack_exports__ = {};
             message
         };
     }
+    var package_namespaceObject = {
+        i8: "0.0.1-rc.18"
+    };
     const status_status = defineRoute({
         path: '/status',
         method: 'get',
         handler: async (event)=>{
             const response = {
                 status: 'ok',
-                version: '2.0.0',
+                version: package_namespaceObject.i8,
                 timestamp: new Date().toISOString(),
                 storage: {
                     type: event.context.adapter?.id ?? 'Unavailable',

package/dist/index.js

@@ -3270,13 +3270,16 @@ function checkJurisdiction(countryCode) {
         message
     };
 }
+var package_namespaceObject = {
+    i8: "0.0.1-rc.18"
+};
 const status_status = defineRoute({
     path: '/status',
     method: 'get',
     handler: async (event)=>{
         const response = {
             status: 'ok',
-            version: '2.0.0',
+            version: package_namespaceObject.i8,
             timestamp: new Date().toISOString(),
             storage: {
                 type: event.context.adapter?.id ?? 'Unavailable',

package/dist/integrations/cloudflare.cjs

@@ -201,7 +201,6 @@ function toCloudflareHandler(instance) {
                     'HEAD'
                 ].includes(request.method) ? void 0 : request.body
             });
-            await updateBaseUrl(request, basePath);
             const result = await instance.handler(rewrittenRequest);
             return await result.match((response)=>addCorsHeaders(response, request, instance), (error)=>{
                 const status = error.statusCode || 500;
@@ -266,22 +265,40 @@ function toCloudflareHandler(instance) {
     function isTrustedOrigin(origin, instance) {
         if (!origin) return false;
         const { trustedOrigins = [] } = instance.options || {};
-        if (trustedOrigins.includes('*')) return true;
-        return trustedOrigins.includes(origin);
-    }
-    async function updateBaseUrl(request, basePath) {
-        if (!instance.$context) return;
+        let originsArray = [];
+        if (Array.isArray(trustedOrigins)) originsArray = trustedOrigins.map((item)=>{
+            if ('string' == typeof item && (item.startsWith('"') && item.endsWith('"') || item.startsWith('[') && item.endsWith(']'))) try {
+                const parsed = JSON.parse(item);
+                return 'string' == typeof parsed ? parsed : item;
+            } catch  {}
+            return item;
+        });
+        else if ('string' == typeof trustedOrigins) {
+            if (trustedOrigins.startsWith('[') && trustedOrigins.endsWith(']')) try {
+                const parsed = JSON.parse(trustedOrigins);
+                originsArray = Array.isArray(parsed) ? parsed : [
+                    trustedOrigins
+                ];
+            } catch  {
+                originsArray = [
+                    trustedOrigins
+                ];
+            }
+            else originsArray = [
+                trustedOrigins
+            ];
+        }
+        if (originsArray.includes('*')) return true;
+        const isExactMatch = originsArray.includes(origin);
+        if (isExactMatch) return true;
         try {
-            const contextResult = await instance.$context;
-            contextResult.match((context)=>{
-                const url = new URL(request.url);
-                const baseURL = `${url.protocol}//${url.host}${basePath}`;
-                if (!context.baseURL || context.baseURL !== baseURL) {
-                    context.baseURL = baseURL;
-                    if (context.options) context.options.baseURL = baseURL;
-                }
-            }, ()=>{});
-        } catch  {}
+            const originUrl = new URL(origin);
+            const originHostname = originUrl.hostname;
+            if (originsArray.includes(originHostname)) return true;
+            return false;
+        } catch  {
+            return false;
+        }
     }
 }
 var __webpack_export_target__ = exports;

package/dist/integrations/cloudflare.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cloudflare.d.ts","sourceRoot":"","sources":["../../src/integrations/cloudflare.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAI3C;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,YAAY,IAC3C,SAAS,OAAO,KAAG,OAAO,CAAC,QAAQ,CAAC,CAiNlD"}
+{"version":3,"file":"cloudflare.d.ts","sourceRoot":"","sources":["../../src/integrations/cloudflare.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAG3C;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,YAAY,IAC3C,SAAS,OAAO,KAAG,OAAO,CAAC,QAAQ,CAAC,CA0OlD"}

package/dist/integrations/cloudflare.js

@@ -173,7 +173,6 @@ function toCloudflareHandler(instance) {
                     'HEAD'
                 ].includes(request.method) ? void 0 : request.body
             });
-            await updateBaseUrl(request, basePath);
             const result = await instance.handler(rewrittenRequest);
             return await result.match((response)=>addCorsHeaders(response, request, instance), (error)=>{
                 const status = error.statusCode || 500;
@@ -238,22 +237,40 @@ function toCloudflareHandler(instance) {
     function isTrustedOrigin(origin, instance) {
         if (!origin) return false;
         const { trustedOrigins = [] } = instance.options || {};
-        if (trustedOrigins.includes('*')) return true;
-        return trustedOrigins.includes(origin);
-    }
-    async function updateBaseUrl(request, basePath) {
-        if (!instance.$context) return;
+        let originsArray = [];
+        if (Array.isArray(trustedOrigins)) originsArray = trustedOrigins.map((item)=>{
+            if ('string' == typeof item && (item.startsWith('"') && item.endsWith('"') || item.startsWith('[') && item.endsWith(']'))) try {
+                const parsed = JSON.parse(item);
+                return 'string' == typeof parsed ? parsed : item;
+            } catch  {}
+            return item;
+        });
+        else if ('string' == typeof trustedOrigins) {
+            if (trustedOrigins.startsWith('[') && trustedOrigins.endsWith(']')) try {
+                const parsed = JSON.parse(trustedOrigins);
+                originsArray = Array.isArray(parsed) ? parsed : [
+                    trustedOrigins
+                ];
+            } catch  {
+                originsArray = [
+                    trustedOrigins
+                ];
+            }
+            else originsArray = [
+                trustedOrigins
+            ];
+        }
+        if (originsArray.includes('*')) return true;
+        const isExactMatch = originsArray.includes(origin);
+        if (isExactMatch) return true;
         try {
-            const contextResult = await instance.$context;
-            contextResult.match((context)=>{
-                const url = new URL(request.url);
-                const baseURL = `${url.protocol}//${url.host}${basePath}`;
-                if (!context.baseURL || context.baseURL !== baseURL) {
-                    context.baseURL = baseURL;
-                    if (context.options) context.options.baseURL = baseURL;
-                }
-            }, ()=>{});
-        } catch  {}
+            const originUrl = new URL(origin);
+            const originHostname = originUrl.hostname;
+            if (originsArray.includes(originHostname)) return true;
+            return false;
+        } catch  {
+            return false;
+        }
     }
 }
 export { toCloudflareHandler };

package/dist/routes/status.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"status.d.ts","sourceRoot":"","sources":["../../src/routes/status.ts"],"names":[],"mappings":"AAEA;;;GAGG;AACH,MAAM,WAAW,cAAc;IAC9B,MAAM,EAAE,IAAI,GAAG,OAAO,CAAC;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE;QACR,IAAI,EAAE,MAAM,CAAC;QACb,SAAS,EAAE,OAAO,CAAC;KACnB,CAAC;CACF;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,eAAO,MAAM,MAAM;;CAgBjB,CAAC"}
+{"version":3,"file":"status.d.ts","sourceRoot":"","sources":["../../src/routes/status.ts"],"names":[],"mappings":"AAGA;;;GAGG;AACH,MAAM,WAAW,cAAc;IAC9B,MAAM,EAAE,IAAI,GAAG,OAAO,CAAC;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE;QACR,IAAI,EAAE,MAAM,CAAC;QACb,SAAS,EAAE,OAAO,CAAC;KACnB,CAAC;CACF;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,eAAO,MAAM,MAAM;;CAgBjB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@c15t/backend",
-  "version": "0.0.1-rc.16",
+  "version": "0.0.1-rc.18",
   "license": "GPL-3.0-only",
   "type": "module",
   "exports": {

package/src/integrations/cloudflare.ts

@@ -1,6 +1,5 @@
 import type { C15TInstance } from '~/core';
 import { ERROR_CODES } from '~/pkgs/results';
-import type { C15TContext } from '~/types';
 
 /**
  * Convert a c15t handler to a Cloudflare Worker handler.
@@ -39,6 +38,7 @@ export function toCloudflareHandler(instance: C15TInstance) {
 
 			// Extract the path and rewrite for c15t routing
 			const originalUrl = new URL(request.url);
+
 			let pathWithoutBase = originalUrl.pathname;
 
 			// Handle CORS preflight requests directly
@@ -72,16 +72,16 @@ export function toCloudflareHandler(instance: C15TInstance) {
 					: request.body,
 			});
 
-			// Update baseURL for proper URL generation in responses
-			await updateBaseUrl(request, basePath);
-
 			// Let c15t handle the request
+
 			const result = await instance.handler(rewrittenRequest);
 
 			// Convert c15t response to standard Response with CORS headers
 			return await result.match(
 				// Success case - add CORS headers and return
-				(response) => addCorsHeaders(response, request, instance),
+				(response) => {
+					return addCorsHeaders(response, request, instance);
+				},
 				// Error case - create an error response with CORS headers
 				(error) => {
 					const status = error.statusCode || 500;
@@ -107,6 +107,7 @@ export function toCloudflareHandler(instance: C15TInstance) {
 			);
 		} catch (error) {
 			// Basic error handling
+
 			const errorResponse = new Response(
 				JSON.stringify({
 					error: true,
@@ -197,48 +198,71 @@ export function toCloudflareHandler(instance: C15TInstance) {
 			return false;
 		}
 
-		// If no trusted origins are defined, none are trusted
+		// Get trusted origins from options
 		const { trustedOrigins = [] } = instance.options || {};
 
+		// Normalize trustedOrigins to array of strings
+		let originsArray: string[] = [];
+
+		if (Array.isArray(trustedOrigins)) {
+			// Handle potential nested array from env vars: ["localhost"] becomes ["localhost"]
+			originsArray = trustedOrigins.map((item) => {
+				// If item is a string that looks like an array element (has quotes and brackets)
+				if (
+					typeof item === 'string' &&
+					((item.startsWith('"') && item.endsWith('"')) ||
+						(item.startsWith('[') && item.endsWith(']')))
+				) {
+					try {
+						const parsed = JSON.parse(item);
+						return typeof parsed === 'string' ? parsed : item;
+					} catch {
+						return item;
+					}
+				}
+				return item;
+			});
+		} else if (typeof trustedOrigins === 'string') {
+			// Try to parse as JSON if it looks like an array
+			if (
+				(trustedOrigins as string).startsWith('[') &&
+				(trustedOrigins as string).endsWith(']')
+			) {
+				try {
+					const parsed = JSON.parse(trustedOrigins as string);
+					originsArray = Array.isArray(parsed) ? parsed : [trustedOrigins];
+				} catch {
+					originsArray = [trustedOrigins];
+				}
+			} else {
+				originsArray = [trustedOrigins];
+			}
+		}
+
 		// If wildcard is included, all origins are trusted
-		if (trustedOrigins.includes('*')) {
+		if (originsArray.includes('*')) {
 			return true;
 		}
 
-		// Check if origin is in trusted list
-		return trustedOrigins.includes(origin);
-	}
-
-	/**
-	 * Update baseUrl in c15t context
-	 */
-	async function updateBaseUrl(
-		request: Request,
-		basePath: string
-	): Promise<void> {
-		if (!instance.$context) {
-			return;
+		// 1. Check exact match
+		const isExactMatch = originsArray.includes(origin);
+		if (isExactMatch) {
+			return true;
 		}
 
+		// 2. Check domain-based matching
 		try {
-			const contextResult = await instance.$context;
+			const originUrl = new URL(origin);
+			const originHostname = originUrl.hostname;
 
-			contextResult.match(
-				(context: C15TContext) => {
-					const url = new URL(request.url);
-					const baseURL = `${url.protocol}//${url.host}${basePath}`;
+			// Check if any trusted origin is just the hostname (without protocol)
+			if (originsArray.includes(originHostname)) {
+				return true;
+			}
 
-					if (!context.baseURL || context.baseURL !== baseURL) {
-						context.baseURL = baseURL;
-						if (context.options) {
-							context.options.baseURL = baseURL;
-						}
-					}
-				},
-				() => {} // Ignore errors
-			);
+			return false;
 		} catch {
-			// Ignore errors
+			return false;
 		}
 	}
 }

package/src/routes/status.ts

@@ -1,4 +1,5 @@
 import { defineRoute } from '~/pkgs/api-router/utils/define-route';
+import { version } from '../../package.json';
 
 /**
  * Response type for the status endpoint
@@ -47,7 +48,7 @@ export const status = defineRoute<StatusResponse>({
 	handler: async (event) => {
 		const response: StatusResponse = {
 			status: 'ok',
-			version: '2.0.0',
+			version: version,
 			timestamp: new Date().toISOString(),
 			storage: {
 				type: event.context.adapter?.id ?? 'Unavailable',