wirejs-deploy-amplify-basic 0.0.151-payments → 0.0.153-payments

package/amplify-backend-assets/functions/api/handler.ts

@@ -25,33 +25,37 @@ function deriveLocation(event: APIGatewayProxyEventV2) {
 }
 
 function createContext(event: APIGatewayProxyEventV2) {
-	const cookies = new CookieJar(event.headers['cookie']);
-	const location = deriveLocation(event);
-	return new Context({
-		cookies,
-		location,
-		httpMethod: event.requestContext.http.method,
-		requestBody: event.body,
-		requestHeaders: event.headers as Record<string, string>,
-		runtimeAttributes: [
-			new SystemAttribute('wirejs', 'deployment-type', {
-				description: 'Deployment under which your system is running.',
-				value: 'wirejs-deploy-amplify-basic'
-			}),
-			new SystemAttribute('wirejs', 'http-origin-local', {
-				description: 'HTTP origin (base address) to use for local development.',
-				value: null,
-			}),
-			new SystemAttribute('wirejs', 'http-origin-network', {
-				description: 'HTTP origin (base address) for machines on your network to use.',
-				value: null,
-			}),
-			new SystemAttribute('wirejs', 'http-origin-public', {
-				description: 'HTTP origin (base address) for machines outside your network to use. Only populated for `npm run start:public`, and only accessible in environments that support NAT-PMP.',
-				value: location.origin
-			}),
-		]
-	});
+	try {
+		const cookies = new CookieJar(event.headers['cookie']);
+		const location = deriveLocation(event);
+		return new Context({
+			cookies,
+			location,
+			httpMethod: event.requestContext.http.method,
+			requestBody: event.body,
+			requestHeaders: event.headers as Record<string, string>,
+			runtimeAttributes: [
+				new SystemAttribute('wirejs', 'deployment-type', {
+					description: 'Deployment under which your system is running.',
+					value: 'wirejs-deploy-amplify-basic'
+				}),
+				new SystemAttribute('wirejs', 'http-origin-local', {
+					description: 'HTTP origin (base address) to use for local development.',
+					value: null,
+				}),
+				new SystemAttribute('wirejs', 'http-origin-network', {
+					description: 'HTTP origin (base address) for machines on your network to use.',
+					value: null,
+				}),
+				new SystemAttribute('wirejs', 'http-origin-public', {
+					description: 'HTTP origin (base address) for machines outside your network to use. Only populated for `npm run start:public`, and only accessible in environments that support NAT-PMP.',
+					value: location.origin
+				}),
+			]
+		});
+	} catch {
+		return undefined;
+	}
 }
 
 async function callApiMethod(api: any, call: any, context: any) {
@@ -138,9 +142,12 @@ function byPathLength(a: Endpoint, b: Endpoint) {
 export const handler: LambdaFunctionURLHandler = async (event) => {
 	const calls = JSON.parse(event.body!);
 	const wjsContext = createContext(event);
-	const path = wjsContext.location.pathname;
+	const path = wjsContext?.location.pathname;
 
-	if ((path === '/api' || path.startsWith('/api/')) && Array.isArray(calls)) {
+	if (wjsContext
+		&& (path === '/api' || path?.startsWith('/api/'))
+		&& Array.isArray(calls)
+	) {
 		const responses = [];
 		for (const call of calls) {
 			console.log('handling API call', call);
@@ -155,6 +162,29 @@ export const handler: LambdaFunctionURLHandler = async (event) => {
 			},
 			body: JSON.stringify(responses)
 		}
+	} else if (wjsContext) {
+		const allHandlers = [...Endpoint.list()];
+		const matchingHandlers = allHandlers
+			.filter(e => globMatch(e.path, wjsContext.location.pathname));
+		const matchingEndpoint = matchingHandlers.sort(byPathLength).pop();
+
+		if (!matchingEndpoint) {
+			console.error('Invalid request format', calls);
+			return {
+				statusCode: 400,
+				body: JSON.stringify({ error: 'Invalid request format' })
+			};
+		}
+
+		const response = await matchingEndpoint.handle(wjsContext);
+		return {
+			statusCode: wjsContext.responseCode ?? 200,
+			cookies: extractSetCookies(wjsContext),
+			headers: {
+				...getResponseHeadersFromContext(wjsContext),
+			},
+			body: response
+		};
 	} else if (typeof calls === 'object' && calls.async) {
 		const sanitized = { ...calls };
 		sanitized.selfInvocationId = sanitized.selfInvocationId.slice(0, 8);
@@ -196,27 +226,9 @@ export const handler: LambdaFunctionURLHandler = async (event) => {
 			body: JSON.stringify({ message: 'Background job complete' })
 		};
 	} else {
-		const allHandlers = [...Endpoint.list()];
-		const matchingHandlers = allHandlers
-			.filter(e => globMatch(e.path, wjsContext.location.pathname));
-		const matchingEndpoint = matchingHandlers.sort(byPathLength).pop();
-
-		if (!matchingEndpoint) {
-			console.error('Invalid request format', calls);
-			return {
-				statusCode: 400,
-				body: JSON.stringify({ error: 'Invalid request format' })
-			};
-		}
-
-		const response = await matchingEndpoint.handle(wjsContext);
 		return {
-			statusCode: wjsContext.responseCode ?? 200,
-			cookies: extractSetCookies(wjsContext),
-			headers: {
-				...getResponseHeadersFromContext(wjsContext),
-			},
-			body: response
+			statusCode: 404,
+			body: "Not found"
 		};
 	}
 }

package/amplify-hosting-assets/compute/default/package.json

@@ -3,6 +3,6 @@
 	"dependencies": {
 		"jsdom": "^25.0.1",
 		"wirejs-dom": "^1.0.42",
-		"wirejs-resources": "^0.1.119-payments"
+		"wirejs-resources": "^0.1.121-payments"
 	}
 }

package/dist/client/index.js

@@ -5,7 +5,7 @@ async function callApi(INTERNAL_API_URL, method, ...args) {
     }
     function apiUrl() {
         if (isNode()) {
-            return INTERNAL_API_URL;
+            return INTERNAL_API_URL + 'api';
         }
         else {
             return "/api";

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wirejs-deploy-amplify-basic",
-	"version": "0.0.151-payments",
+	"version": "0.0.153-payments",
 	"type": "module",
 	"main": "./dist/index.js",
 	"types": "./dist/index.d.ts",
@@ -42,7 +42,7 @@
 		"recursive-copy": "^2.0.14",
 		"rimraf": "^6.0.1",
 		"wirejs-dom": "^1.0.42",
-		"wirejs-resources": "^0.1.119-payments"
+		"wirejs-resources": "^0.1.121-payments"
 	},
 	"devDependencies": {
 		"@aws-amplify/backend": "^1.14.0",