wirejs-deploy-amplify-basic 0.0.12-alpha → 0.0.14-alpha

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

@@ -1,22 +1,75 @@
 import { env } from 'process';
+import { LambdaFunctionURLHandler, APIGatewayProxyEventV2 } from 'aws-lambda';
+import { CookieJar, Context, requiresContext } from 'wirejs-resources';
+import * as api from '../../../api/index';
 
-import { LambdaFunctionURLHandler } from 'aws-lambda';
+function createContext(event: APIGatewayProxyEventV2) {
+	const baseUrl = `https://${event.requestContext.domainName}${event.rawPath}`;
+	const queryString = event.queryStringParameters
+		? `?${new URLSearchParams(event.queryStringParameters as any).toString()}`
+		: '';
+	const location = new URL(`${baseUrl}${queryString}`);
 
-// import {
-// 	S3Client,
-// 	ListObjectsCommand,
-// 	PutObjectCommand,
-// 	GetObjectCommand
-// } from '@aws-sdk/client-s3';
+	const cookies = new CookieJar(event.headers['cookie']);
+	return new Context({ cookies, location });
+}
 
-// import * as api from '../src/api/index.js';
-
-// const s3 = new S3Client()
+async function callApiMethod(api: any, call: any, context: any) {
+	try {
+		const [scope, ...rest] = call.method;
+		console.log('api method parsed', { scope, rest });
+		if (rest.length === 0) {
+			console.log('api method resolved. invoking...');
+			if (requiresContext(api[scope])) {
+				return {
+					data: await (api[scope] as any)(context, ...call.args.slice(1))
+				};
+			} else {
+				return {
+					data: await api[scope](...call.args)
+				};
+			}
+		} else {
+			console.log('nested scope found');
+			return callApiMethod(api[scope], {
+				...call,
+				method: rest,
+			}, context);
+		}
+	} catch (error: any) {
+		console.log(error);
+		return { error: error.message };
+	}
+}
 
 export const handler: LambdaFunctionURLHandler = async (event, context) => {
+	const calls = JSON.parse(event.body!);
+	const responses = [];
+
+	for (const call of calls) {
+		console.log('handling API call', call);
+		responses.push(await callApiMethod(api, call, context));
+	}
+	
+	const wjsContext = createContext(event);
+
+	console.log('setting cookies', wjsContext.cookies.getSetCookies());
+
+	const cookies: string[] = [];
+	for (const cookie of wjsContext.cookies.getSetCookies()) {
+		const cookieOptions = [];
+		if (cookie.maxAge) cookieOptions.push(`Max-Age=${cookie.maxAge}`);
+		if (cookie.httpOnly) cookieOptions.push('HttpOnly');
+		if (cookie.secure) cookieOptions.push('Secure');
+		cookies.push(`${cookie.name}=${cookie.value}; ${cookieOptions.join('; ')}`);
+	}
+
 	return {
 		statusCode: 200,
-		cookies: [],
-		body: 'Hello.'
+		cookies,
+		headers: {
+			'Content-Type': 'application/json; charset=utf-8'
+		},
+		body: JSON.stringify(responses)
 	}
 }

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

@@ -3,6 +3,6 @@
 	"dependencies": {
 		"jsdom": "^25.0.0",
 		"wirejs-dom": "^1.0.34",
-		"wirejs-resources": "^0.1.5-alpha"
+		"wirejs-resources": "^0.1.6-alpha"
 	}
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wirejs-deploy-amplify-basic",
-	"version": "0.0.12-alpha",
+	"version": "0.0.14-alpha",
 	"type": "module",
 	"bin": {
 		"wirejs-deploy-amplify-basic": "./build.js"
@@ -12,10 +12,10 @@
 		"recursive-copy": "^2.0.14",
 		"rimraf": "^6.0.1",
 		"wirejs-dom": "^1.0.34",
-		"wirejs-resources": "^0.1.5-alpha"
+		"wirejs-resources": "^0.1.8-alpha"
 	},
 	"devDependencies": {
 		"@aws-amplify/backend": "^1.14.0",
-		"@aws-sdk/client-s3": "^3.735.0"
+		"@aws-sdk/client-s3": "^3.738.0"
 	}
 }

package/wirejs-resources-overrides/index.js

@@ -1,5 +1,17 @@
-import { overrides } from 'wirejs-resources';
-import { Resource } from 'wirejs-resources';
+import { env } from 'process';
+
+import {
+	S3Client,
+	ListObjectsCommand,
+	PutObjectCommand,
+	GetObjectCommand,
+	DeleteObjectCommand
+} from '@aws-sdk/client-s3';
+
+import {
+	overrides,
+	Resource,
+} from 'wirejs-resources';
 
 export {
 	AuthenticationService,
@@ -7,40 +19,98 @@ export {
 	requiresContext,
 	Context,
 	CookieJar,
+	FileService,
 	Resource,
 	overrides,
 } from 'wirejs-resources';
 
+const Bucket = env['BUCKET'];
+const s3 = new S3Client();
+
 export class FileService extends Resource {
 	constructor(scope, id) {
 		super(scope, id);
 		addResource('FileService', { absoluteId: this.absoluteId });
 	}
 
-	async write(...args) {
-		console.log('"writing secret" ... :/ ... ');
+	/**
+	 * @param {string} filename 
+	 * @param {BufferEncoding} [encoding]
+	 * 
+	 */
+	async read(filename, encoding = 'utf8') {
+		const Key = `${this.absoluteId}/${filename}`;
+		const command = new GetObjectCommand({ Bucket, Key });
+		const result = await s3.send(command);
+		return result.Body.transformToString(encoding);
+	}
+
+	/**
+	 * @param {string} filename 
+	 * @param {string} data 
+	 * @param {{
+	 * 	onlyIfNotExists: boolean
+	 * }} [param2]
+	 */
+	async write(filename, data, { onlyIfNotExists = false} = {}) {
+		const Key = `${this.absoluteId}/${filename}`;
+		const Body = data;
+
+		/**
+		 * @type {ConstructorParameters<typeof PutObjectCommand>[0]}
+		 */
+		const commandDetails = { Bucket, Key, Body };
+		if (onlyIfNotExists) {
+			commandDetails['IfNoneMatch'] = '*';
+		}
+
+		const command = new PutObjectCommand();
+		return s3.send(command);
+	}
+
+	/**
+	 * @param {string} filename 
+	 */
+	async delete(filename) {
+		const Key = `${this.absoluteId}/${filename}`;
+		const command = new DeleteObjectCommand({
+			Bucket,
+			Key
+		});
+		return s3.send(command);
+	}
+
+	async * list({ prefix = '' } = {}) {
+		const Prefix = `${this.absoluteId}/${prefix}`;
+		let Marker = null;
+
+		while (true) {
+			const command = new ListObjectsCommand({
+				Bucket,
+				Prefix,
+				MaxKeys: 1000,
+				Marker
+			});
+			const result = await s3.send(command);
+			Marker = result.NextMarker;
+			
+			for (const o of result.Contents || []) {
+				yield o.Key;
+			}
+
+			if (!Marker) break;
+		}
+	}
+
+	isAlreadyExistsError(error) {
+		// https://docs.aws.amazon.com/AmazonS3/latest/API/API_PutObject.html
+		return error?.$metadata?.httpStatusCode === 412;
 	}
 }
 
 // expose resources to other resources that might depend on it.
 overrides.FileService = FileService;
 
-// export class AuthenticationService {
-// 	constructor(id) {
-// 		addResource('AuthenticationService', { id });
-// 	}
-
-// 	buildApi(...args) {
-// 		// console.log('AuthService.buildApi', [args]);
-// 	}
-// }
-
-// export class Secret {
-// 	constructor(id) {
-// 		addResource('Secret', { id });
-// 	}
-// }
-
 globalThis.wirejsResources = [];
 
 function addResource(type, options) {