@c15t/backend 1.2.0-canary.9 → 1.2.0

package/src/core.ts

@@ -296,16 +296,31 @@ export const c15tInstance = <PluginTypes extends C15TPlugin[] = C15TPlugin[]>(
 
 		// Use oRPC handler to handle the request with our enhanced context
 		const handlerContext = orpcContext as Record<string, unknown>;
+
+		orpcContext.logger.debug?.('Handling prefix', {
+			prefix: (options.basePath as `/${string}`) || '/',
+		});
+
 		const { matched, response } = await rpcHandler.handle(request, {
-			prefix: (options.baseURL as `/${string}`) || '/',
+			prefix: (options.basePath as `/${string}`) || '/',
 			context: handlerContext,
 		});
 
 		// Return the response if handler matched
 		if (matched && response) {
+			orpcContext.logger.debug('Handler matched', {
+				request,
+				matched,
+				response,
+			});
 			return response;
 		}
 
+		orpcContext.logger.debug('No handler matched', {
+			request,
+			matched,
+			response,
+		});
 		// If no handler matched, return 404
 		return new Response('Not Found', { status: 404 });
 	};
@@ -340,6 +355,19 @@ export const c15tInstance = <PluginTypes extends C15TPlugin[] = C15TPlugin[]>(
 			}
 			const ctx = ctxResult.value;
 
+			// After options/baseURL/basePath is set/used
+			const basePath = options.basePath || options.baseURL || '/';
+			createLogger(options.logger)?.debug?.('[c15t] Using basePath/baseURL', {
+				basePath,
+			});
+
+			// Add this debug log:
+			createLogger(options.logger)?.debug?.('[c15t] Routing request', {
+				method: request.method,
+				url: request.url,
+				prefix: basePath,
+			});
+
 			// Handle API request
 			return await handleApiRequest(request, ctx);
 		} catch (error) {

package/src/middleware/cors/cors.test.ts

@@ -1,4 +1,3 @@
-import {} from 'msw';
 import { setupServer } from 'msw/node';
 import { afterAll, afterEach, beforeAll, describe, expect, it } from 'vitest';
 import { c15tInstance } from '../../core';

package/src/middleware/openapi/config.ts

@@ -4,12 +4,15 @@ import packageJson from '../../../package.json';
 /**
  * Default OpenAPI configuration
  */
-export const createOpenAPIConfig = (options: C15TOptions) => ({
-	enabled: true,
-	specPath: '/spec.json',
-	docsPath: '/docs',
-	...(options.openapi || {}),
-});
+export const createOpenAPIConfig = (options: C15TOptions) => {
+	const basePath = options.basePath || '';
+	return {
+		enabled: true,
+		specPath: `${basePath}/spec.json`,
+		docsPath: `${basePath}/docs`,
+		...(options.openapi || {}),
+	};
+};
 
 /**
  * Default OpenAPI options
@@ -20,6 +23,6 @@ export const createDefaultOpenAPIOptions = (options: C15TOptions) => ({
 		version: packageJson.version,
 		description: 'API for consent management',
 	},
-	servers: [{ url: '/' }],
+	servers: [{ url: options.basePath || '/' }],
 	security: [{ bearerAuth: [] }],
 });

package/src/schema/consent-policy/registry.ts

@@ -1,8 +1,7 @@
 import { getWithHooks } from '~/pkgs/data-model';
 import type { Where } from '~/pkgs/db-adapters';
-import type { GenericEndpointContext, RegistryContext } from '~/pkgs/types';
-
 import { DoubleTieError, ERROR_CODES } from '~/pkgs/results';
+import type { GenericEndpointContext, RegistryContext } from '~/pkgs/types';
 import { validateEntityOutput } from '../definition';
 import type { ConsentPolicy, PolicyType } from './schema';
 
@@ -31,12 +30,24 @@ import type { ConsentPolicy, PolicyType } from './schema';
  */
 async function generatePolicyPlaceholder(name: string, date: Date) {
 	const content = `[PLACEHOLDER] This is an automatically generated version of the ${name} policy.\n\nThis placeholder content should be replaced with actual policy terms before being presented to users.\n\nGenerated on: ${date.toISOString()}`;
-	const encoder = new TextEncoder();
-	const data = encoder.encode(content);
-	const hashBuffer = await crypto.subtle.digest('SHA-256', data);
-	const contentHash = Array.from(new Uint8Array(hashBuffer))
-		.map((b) => b.toString(16).padStart(2, '0'))
-		.join('');
+
+	let contentHash: string;
+	try {
+		// Use Web Crypto API which is available in both browsers and edge environments
+		const encoder = new TextEncoder();
+		const data = encoder.encode(content);
+		const hashBuffer = await crypto.subtle.digest('SHA-256', data);
+		contentHash = Array.from(new Uint8Array(hashBuffer))
+			.map((b) => b.toString(16).padStart(2, '0'))
+			.join('');
+	} catch (error) {
+		throw new DoubleTieError('Failed to generate policy content hash', {
+			code: ERROR_CODES.INTERNAL_SERVER_ERROR,
+			status: 500,
+			cause: error instanceof Error ? error : new Error(String(error)),
+		});
+	}
+
 	return { content, contentHash };
 }
 
@@ -271,55 +282,67 @@ export function policyRegistry({ adapter, ...ctx }: RegistryContext) {
 			// Use a transaction to prevent race conditions
 			return await adapter.transaction({
 				callback: async (txAdapter) => {
-					const now = new Date();
-					const txRegistry = policyRegistry({
-						adapter: txAdapter,
-						...ctx,
-					});
+					try {
+						const now = new Date();
+						const txRegistry = policyRegistry({
+							adapter: txAdapter,
+							...ctx,
+						});
 
-					// Find latest policy with exact name match directly from database
-					const rawLatestPolicy = await txAdapter.findOne({
-						model: 'consentPolicy',
-						where: [
-							{ field: 'isActive', value: true },
-							{
-								field: 'type',
-								value: type,
+						// Find latest policy with exact name match directly from database
+						const rawLatestPolicy = await txAdapter.findOne({
+							model: 'consentPolicy',
+							where: [
+								{ field: 'isActive', value: true },
+								{
+									field: 'type',
+									value: type,
+								},
+							],
+							sortBy: {
+								field: 'effectiveDate',
+								direction: 'desc',
 							},
-						],
-						sortBy: {
-							field: 'effectiveDate',
-							direction: 'desc',
-						},
-					});
+						});
 
-					const latestPolicy = rawLatestPolicy
-						? validateEntityOutput(
-								'consentPolicy',
-								rawLatestPolicy,
-								ctx.options
-							)
-						: null;
+						const latestPolicy = rawLatestPolicy
+							? validateEntityOutput(
+									'consentPolicy',
+									rawLatestPolicy,
+									ctx.options
+								)
+							: null;
 
-					if (latestPolicy) {
-						return latestPolicy;
-					}
+						if (latestPolicy) {
+							return latestPolicy;
+						}
 
-					// Generate policy content and hash
-					const { content: defaultContent, contentHash } =
-						await generatePolicyPlaceholder(type, now);
+						// Generate policy content and hash
+						const { content: defaultContent, contentHash } =
+							await generatePolicyPlaceholder(type, now);
 
-					return txRegistry.createConsentPolicy({
-						version: '1.0.0',
-						type,
-						name: type,
-						effectiveDate: now,
-						content: defaultContent,
-						contentHash,
-						isActive: true,
-						updatedAt: now,
-						expirationDate: null,
-					});
+						return txRegistry.createConsentPolicy({
+							version: '1.0.0',
+							type,
+							name: type,
+							effectiveDate: now,
+							content: defaultContent,
+							contentHash,
+							isActive: true,
+							updatedAt: now,
+							expirationDate: null,
+						});
+					} catch (error) {
+						// Log the error for debugging purposes
+						ctx.logger.error('Error in findOrCreatePolicy transaction:', error);
+
+						// Rethrow as a DoubleTieError with appropriate context
+						throw new DoubleTieError('Failed to find or create policy', {
+							code: ERROR_CODES.INTERNAL_SERVER_ERROR,
+							status: 500,
+							cause: error instanceof Error ? error : new Error(String(error)),
+						});
+					}
 				},
 			});
 		},

package/.turbo/turbo-fmt.log

@@ -1,7 +0,0 @@
-
-
-> @c15t/backend@1.2.0-canary.9 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 162 files in 114ms. Fixed 1 file.
-Checked 162 files in 16ms. No fixes applied.