wirejs-deploy-amplify-basic 0.1.151-llm → 0.1.153-llm

package/amplify-backend-assets/backend.ts

@@ -1,9 +1,11 @@
+import path from 'path';
 import { randomUUID } from 'crypto';
 import {
   defineBackend,
 } from '@aws-amplify/backend';
-import { RemovalPolicy, NestedStack } from "aws-cdk-lib";
-import { FunctionUrlAuthType } from 'aws-cdk-lib/aws-lambda';
+import { Duration, RemovalPolicy, NestedStack } from "aws-cdk-lib";
+import { FunctionUrlAuthType, IFunction, Runtime } from 'aws-cdk-lib/aws-lambda';
+import { NodejsFunction } from 'aws-cdk-lib/aws-lambda-nodejs';
 import { Bucket, BlockPublicAccess } from 'aws-cdk-lib/aws-s3';
 import { Table, AttributeType, BillingMode } from 'aws-cdk-lib/aws-dynamodb';
 import { AnyPrincipal, PolicyStatement } from 'aws-cdk-lib/aws-iam';
@@ -11,12 +13,14 @@ import { AnyPrincipal, PolicyStatement } from 'aws-cdk-lib/aws-iam';
 import { TableDefinition, indexName } from 'wirejs-resources';
 import { TableIndexes } from './constructs/table-indexes';
 import { RealtimeService } from './constructs/realtime-service';
-import { api } from './functions/api/resource';
 import { auth } from './auth/resource';
 
 // @ts-ignore
 import generatedResources from './generated-resources';
 
+const __filename = import.meta.url.replace(/^file:/, '');
+const __dirname = path.dirname(__filename);
+
 const generated: any[] = generatedResources;
 
 const APP_ID = process.env.AWS_APP_ID ?? process.env.PWD?.replace(/[^a-zA-Z0-9-_]/g, '_');
@@ -32,9 +36,20 @@ const SELF_INVOCATION_ID = randomUUID();
 /**
  * Amplify resources
  */
-const backend = defineBackend({
-  auth,
-  api,
+const backend = defineBackend({ auth });
+
+const api = new NodejsFunction(backend.stack, 'ApiHandler', {
+  runtime: Runtime.NODEJS_22_X,
+  memorySize: 2 * 1024,
+  handler: 'handler',
+  entry: path.join(__dirname, 'functions', 'api', 'handler.ts'),
+  bundling: {
+    minify: true,
+    nodeModules: [
+      'jsdom'
+    ]
+  },
+  timeout: Duration.minutes(15),
 });
 
 /**
@@ -56,21 +71,14 @@ userPoolClient.explicitAuthFlows.push(
   'ALLOW_ADMIN_USER_PASSWORD_AUTH'
 );
 
-// new CfnPermission(backend.stack, 'SelfInvokePermission', {
-//   action: 'lambda:InvokeFunction',
-//   functionName: backend.api.resources.lambda.functionName,
-//   principal: 'lambda.amazonaws.com',
-//   sourceArn: backend.api.resources.lambda.functionArn
-// });
-
-backend.api.resources.lambda.role?.addToPrincipalPolicy(new PolicyStatement({
+api.role?.addToPrincipalPolicy(new PolicyStatement({
   actions: ['lambda:InvokeFunction'],
   resources: [
     `arn:${backend.stack.partition}:lambda:${backend.stack.region}:${backend.stack.account}:function:*`,
   ],
 }));
 
-const allLambdas = [ backend.api.resources.lambda ];
+const allLambdas: IFunction[] = [ api ];
 
 /**
  * CDK resources
@@ -80,7 +88,7 @@ const bucket = new Bucket(backend.stack, 'data', {
   versioned: true,
   removalPolicy: RemovalPolicy.RETAIN,
 });
-bucket.grantReadWrite(backend.api.resources.lambda);
+bucket.grantReadWrite(api);
 
 function isRealtimeService(resource: any): resource is {
   type: 'RealtimeService';
@@ -96,7 +104,7 @@ if (generated.some(isRealtimeService)) {
   const realtime = new RealtimeService(realtimeStack, 'realtime', {
     appId: APP_ID!,
     branchId: BRANCH_ID,
-    publisher: backend.api,
+    publisher: api,
     bucket: bucket.bucketName,
     namespaces: generated
       .filter(isRealtimeService)
@@ -188,19 +196,20 @@ for (const resource of generated) {
   }
 }
 
+
 /**
  * Lambda environment vars
  */
-backend.api.addEnvironment(
+api.addEnvironment(
   'BUCKET', bucket.bucketName,
 );
-backend.api.addEnvironment(
+api.addEnvironment(
   'COGNITO_CLIENT_ID', backend.auth.resources.userPoolClient.userPoolClientId
 );
-backend.api.addEnvironment(
+api.addEnvironment(
   'TABLE_NAME_PREFIX', TABLE_NAME_PREFIX
 );
-backend.api.addEnvironment(
+api.addEnvironment(
   'SELF_INVOCATION_ID', SELF_INVOCATION_ID
 );
 
@@ -208,12 +217,12 @@ backend.api.addEnvironment(
 /**
  * Client configuration
  */
-const apiUrl = backend.api.resources.lambda.addFunctionUrl({
+const apiUrl = api.addFunctionUrl({
   authType: FunctionUrlAuthType.NONE,
 });
 apiUrl.grantInvokeUrl(new AnyPrincipal());
 
-backend.api.resources.lambda.addToRolePolicy(new PolicyStatement({
+api.addToRolePolicy(new PolicyStatement({
   actions: [
     'bedrock:InvokeModel',
     'bedrock:InvokeModelWithResponseStream',
@@ -222,8 +231,4 @@ backend.api.resources.lambda.addToRolePolicy(new PolicyStatement({
 }));
 
 
-backend.addOutput({
-  custom: {
-    api: apiUrl.url
-  }
-});
+backend.addOutput({ custom: { api: apiUrl.url } });

package/amplify-backend-assets/constructs/realtime-service/index.ts

@@ -18,12 +18,7 @@ export class RealtimeService extends Construct {
 	constructor(scope: Construct, id: string, props: {
 		appId: string;
 		branchId: string;
-		publisher: {
-			addEnvironment: (key: string, value: string) => void;
-			resources: {
-				lambda: IFunction;
-			}
-		};
+		publisher: NodejsFunction;
 		bucket: string; // needed for `Secret`, which currently uses the common S3 bucket
 		namespaces: string[];
 	}) {
@@ -79,7 +74,7 @@ export class RealtimeService extends Construct {
 
 		for (const namespace of props.namespaces) {
 			const ns = realtimeService.addChannelNamespace(namespace);
-			ns.grantPublish(props.publisher.resources.lambda);
+			ns.grantPublish(props.publisher);
 		}
 	}
 }

package/amplify-backend-assets/constructs/table-indexes/handler-lambda.ts

@@ -77,8 +77,8 @@ export const handler = async (event: CloudFormationCustomResourceEvent) => {
 				TableName: tableName,
 				AttributeDefinitions: [
 					{
-						AttributeName: gsi.partitionKey.name,
-						AttributeType: gsi.partitionKey.type,
+						AttributeName: gsi.partitionKey!.name,
+						AttributeType: gsi.partitionKey!.type,
 					},
 					...(gsi.sortKey ? [{
 						AttributeName: gsi.sortKey.name,
@@ -90,7 +90,7 @@ export const handler = async (event: CloudFormationCustomResourceEvent) => {
 						IndexName: gsi.indexName,
 						KeySchema: [
 							{
-								AttributeName: gsi.partitionKey.name,
+								AttributeName: gsi.partitionKey!.name,
 								KeyType: 'HASH'
 							},
 							...(gsi.sortKey ? [{

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

@@ -3,6 +3,6 @@
 	"dependencies": {
 		"jsdom": "^25.0.1",
 		"wirejs-dom": "^1.0.44",
-		"wirejs-resources": "^0.1.151-llm"
+		"wirejs-resources": "^0.1.153-llm"
 	}
 }

package/build.js

@@ -78,7 +78,7 @@ async function installDeps() {
 	// install all
 	execSync('npm i');
 
-	console.log("done installing deps")
+	console.log("done installing deps");
 }
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wirejs-deploy-amplify-basic",
-	"version": "0.1.151-llm",
+	"version": "0.1.153-llm",
 	"type": "module",
 	"main": "./dist/index.js",
 	"types": "./dist/index.d.ts",
@@ -44,7 +44,7 @@
 		"recursive-copy": "^2.0.14",
 		"rimraf": "^6.0.1",
 		"wirejs-dom": "^1.0.44",
-		"wirejs-resources": "^0.1.151-llm"
+		"wirejs-resources": "^0.1.153-llm"
 	},
 	"devDependencies": {
 		"@aws-amplify/backend": "^1.14.0",

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

@@ -1,12 +0,0 @@
-import {
-    defineFunction
-} from '@aws-amplify/backend';
-
-const api = defineFunction({
-  entry: './handler.ts',
-  runtime: 22,
-  memoryMB: 1024,
-  timeoutSeconds: 60 * 15, 
-});
-
-export { api };