@fy-stack/app-construct 0.0.145 → 0.0.147-0-preview

package/dist/lib/ecs/apps/image-app-construct.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"image-app-construct.d.ts","sourceRoot":"","sources":["../../../../src/lib/ecs/apps/image-app-construct.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACzE,OAAO,EAEL,eAAe,EAKhB,MAAM,4BAA4B,CAAC;AACpC,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAIvC,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEvD,qBAAa,iBAAkB,SAAQ,SAAU,YAAW,YAAY;IAMpE,OAAO,CAAC,KAAK;IALR,SAAS,EAAE,GAAG,CAAC,mBAAmB,CAAC;gBAGxC,KAAK,EAAE,SAAS,EAChB,EAAE,EAAE,MAAM,EACF,KAAK,EAAE,aAAa,CAAC,OAAO,CAAC;IAcvC,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,GAAG,IAAI;IAOpD,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC;IAyBzD,gBAAgB,CAAC,cAAc,EAAE,MAAM;IAIvC,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC;IAIvD,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,OAAO;CAG7B"}
+{"version":3,"file":"image-app-construct.d.ts","sourceRoot":"","sources":["../../../../src/lib/ecs/apps/image-app-construct.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACzE,OAAO,EAEL,eAAe,EAKhB,MAAM,4BAA4B,CAAC;AACpC,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAIvC,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEvD,qBAAa,iBAAkB,SAAQ,SAAU,YAAW,YAAY;IAMpE,OAAO,CAAC,KAAK;IALR,SAAS,EAAE,GAAG,CAAC,mBAAmB,CAAC;gBAGxC,KAAK,EAAE,SAAS,EAChB,EAAE,EAAE,MAAM,EACF,KAAK,EAAE,aAAa,CAAC,OAAO,CAAC;IAMvC,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,GAAG,IAAI;IAOpD,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC;IAyBzD,gBAAgB,CAAC,cAAc,EAAE,MAAM;IAIvC,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC;IAIvD,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,OAAO;CAG7B"}

package/dist/lib/ecs/apps/image-app-construct.js

@@ -11,14 +11,7 @@ class ImageAppConstruct extends constructs_1.Construct {
     constructor(scope, id, props) {
         super(scope, id);
         this.props = props;
-        this.container = (0, taskDefinitionImage_1.taskDefinitionImage)(`${props.appName}AppContainer`, {
-            taskDefinition: props.taskDefinition,
-            port: props.port,
-            env: props.env,
-            output: props.output,
-            container: props.container,
-            environmentPath: props.environmentPath,
-        });
+        this.container = (0, taskDefinitionImage_1.taskDefinitionImage)(`${props.appName}AppContainer`, props);
     }
     attach(attachable) {
         const params = Object.assign({}, ...(0, params_from_attachable_1.paramsFromAttachable)(attachable));

package/dist/lib/ecs/apps/next-app-router-construct.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"next-app-router-construct.d.ts","sourceRoot":"","sources":["../../../../src/lib/ecs/apps/next-app-router-construct.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACzE,OAAO,KAAK,UAAU,MAAM,4BAA4B,CAAC;AACzD,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAE3C,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AASvC,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEvD,KAAK,kBAAkB,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC;AAEjD,qBAAa,sBAAuB,SAAQ,SAAU,YAAW,YAAY;IAOjC,OAAO,CAAC,KAAK;IANhD,SAAS,EAAE,GAAG,CAAC,mBAAmB,CAAC;IACnC,KAAK,EAAE,GAAG,CAAC,KAAK,GAAG,SAAS,CAAC;IAEpC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAY;IACnC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAU;gBAEpB,KAAK,EAAE,SAAS,EAAE,EAAE,EAAE,MAAM,EAAU,KAAK,EAAE,kBAAkB;IAiB3E,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,eAAe,CAAC;IAcpE,gBAAgB,CAAC,cAAc,EAAE,MAAM;IAIvC,GAAG,IAAI,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC;IAI3C,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC;IAO7C,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,OAAO;CAG7B"}
+{"version":3,"file":"next-app-router-construct.d.ts","sourceRoot":"","sources":["../../../../src/lib/ecs/apps/next-app-router-construct.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACzE,OAAO,KAAK,UAAU,MAAM,4BAA4B,CAAC;AACzD,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAE3C,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AASvC,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEvD,KAAK,kBAAkB,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC;AAEjD,qBAAa,sBAAuB,SAAQ,SAAU,YAAW,YAAY;IAOjC,OAAO,CAAC,KAAK;IANhD,SAAS,EAAE,GAAG,CAAC,mBAAmB,CAAC;IACnC,KAAK,EAAE,GAAG,CAAC,KAAK,GAAG,SAAS,CAAC;IAEpC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAY;IACnC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAU;gBAEpB,KAAK,EAAE,SAAS,EAAE,EAAE,EAAE,MAAM,EAAU,KAAK,EAAE,kBAAkB;IAS3E,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,eAAe,CAAC;IAcpE,gBAAgB,CAAC,cAAc,EAAE,MAAM;IAIvC,GAAG,IAAI,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC;IAI3C,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC;IAO7C,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,OAAO;CAG7B"}

package/dist/lib/ecs/apps/next-app-router-construct.js

@@ -17,14 +17,7 @@ class NextAppRouterConstruct extends constructs_1.Construct {
         const deployment = (0, next_app_router_1.staticDeployment)(this, props.output);
         this.static = deployment.staticBucket;
         this.files = deployment.files;
-        this.container = (0, taskDefinitionImage_1.taskDefinitionImage)(`${props.appName}AppContainer`, {
-            taskDefinition: props.taskDefinition,
-            port: props.port,
-            env: props.env,
-            output: props.output,
-            container: props.container,
-            environmentPath: props.environmentPath,
-        });
+        this.container = (0, taskDefinitionImage_1.taskDefinitionImage)(`${props.appName}AppContainer`, props);
     }
     cloudfront(path) {
         const { origin, basePath } = this.props.serverOrigin(this.props.port, this.container.containerName, path, '/');

package/dist/lib/ecs/apps/task-construct.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"task-construct.d.ts","sourceRoot":"","sources":["../../../../src/lib/ecs/apps/task-construct.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,EACN,UAAU,EACV,aAAa,EACb,KAAK,EACL,SAAS,EACV,MAAM,iBAAiB,CAAC;AAEzB,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAI3C,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAC3C,OAAO,KAAK,eAAe,MAAM,mCAAmC,CAAC;AAErE,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAGvC,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAE/C,qBAAa,aACX,SAAQ,SACR,YAAW,aAAa,EAAE,KAAK,EAAE,MAAM;IAOrC,OAAO,CAAC,KAAK;IALR,UAAU,EAAE,GAAG,CAAC,qBAAqB,CAAC;gBAG3C,KAAK,EAAE,SAAS,EAChB,EAAE,EAAE,MAAM,EACF,KAAK,EAAE,mBAAmB;IAgCpC,YAAY,CACV,KAAK,EAAE,eAAe,CAAC,iBAAiB,GACvC,GAAG,CAAC,kBAAkB;IA6CzB,KAAK,CAAC,GAAG,UAAU,EAAE,SAAS,EAAE,GAAG,IAAI;IAMvC,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC;IAS7C,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,OAAO;CAG7B"}
+{"version":3,"file":"task-construct.d.ts","sourceRoot":"","sources":["../../../../src/lib/ecs/apps/task-construct.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,EACN,UAAU,EACV,aAAa,EACb,KAAK,EACL,SAAS,EACV,MAAM,iBAAiB,CAAC;AAEzB,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAI3C,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAC3C,OAAO,KAAK,eAAe,MAAM,mCAAmC,CAAC;AAErE,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAGvC,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAE/C,qBAAa,aACX,SAAQ,SACR,YAAW,aAAa,EAAE,KAAK,EAAE,MAAM;IAOrC,OAAO,CAAC,KAAK;IALR,UAAU,EAAE,GAAG,CAAC,qBAAqB,CAAC;gBAG3C,KAAK,EAAE,SAAS,EAChB,EAAE,EAAE,MAAM,EACF,KAAK,EAAE,mBAAmB;IAiCpC,YAAY,CACV,KAAK,EAAE,eAAe,CAAC,iBAAiB,GACvC,GAAG,CAAC,kBAAkB;IA6CzB,KAAK,CAAC,GAAG,UAAU,EAAE,SAAS,EAAE,GAAG,IAAI;IAMvC,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC;IAS7C,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,OAAO;CAG7B"}

package/dist/lib/ecs/apps/task-construct.js

@@ -34,8 +34,9 @@ class TaskConstruct extends constructs_1.Construct {
                     ...imageProps,
                 }),
                 logging: new ecs.AwsLogDriver({
-                    streamPrefix: `${id}/task-runner`,
+                    streamPrefix: `${props.taskName}TaskContainer`,
                     logRetention: logDuration ?? logs.RetentionDays.ONE_DAY,
+                    logGroup: props.logGroup,
                 }),
                 ...containerProps,
             });

package/dist/lib/ecs/ecs-construct.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ecs-construct.d.ts","sourceRoot":"","sources":["../../../src/lib/ecs/ecs-construct.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAC5D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAEjD,qBAAa,YAAa,SAAQ,SAAS;IAClC,MAAM,CAAC,EAAE,kBAAkB,CAAC;IAC5B,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAM;gBAErC,KAAK,EAAE,SAAS,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,iBAAiB;CAqCnE"}
+{"version":3,"file":"ecs-construct.d.ts","sourceRoot":"","sources":["../../../src/lib/ecs/ecs-construct.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAC5D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAEjD,qBAAa,YAAa,SAAQ,SAAS;IAClC,MAAM,CAAC,EAAE,kBAAkB,CAAC;IAC5B,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAM;gBAErC,KAAK,EAAE,SAAS,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,iBAAiB;CAwCnE"}

package/dist/lib/ecs/ecs-construct.js

@@ -18,6 +18,7 @@ class EcsConstruct extends constructs_1.Construct {
         if (props.server) {
             this.server = new ecs_server_construct_1.EcsServerConstruct(this, 'Server', {
                 ...props.server,
+                logGroup: props.logGroup,
                 cluster: appCluster,
                 environmentPath: props.environmentPath,
                 environment: props.environment,
@@ -29,6 +30,8 @@ class EcsConstruct extends constructs_1.Construct {
                 return [
                     key,
                     new task_construct_1.TaskConstruct(this, `${key}Task`, {
+                        logGroup: props.logGroup,
+                        taskName: key,
                         buildParams: task_construct_1.TaskConstruct.parse(app.buildParams ?? {}),
                         cluster: appCluster,
                         vpc: props.vpc,

package/dist/lib/ecs/ecs-server-construct.d.ts

@@ -2,10 +2,12 @@ import { Grant, Grantable } from '@fy-stack/types';
 import * as ec2 from 'aws-cdk-lib/aws-ec2';
 import * as ecs from 'aws-cdk-lib/aws-ecs';
 import * as elbV2 from 'aws-cdk-lib/aws-elasticloadbalancingv2';
+import type { LogGroup } from 'aws-cdk-lib/aws-logs';
 import { Construct } from 'constructs';
 import { AppConstruct, EcsConstructProps } from './types';
 type EcsServerConstructProps = EcsConstructProps['server'] & {
     vpc: ec2.IVpc;
+    logGroup: LogGroup;
     environmentPath: string;
     environment: string;
     cluster: ecs.Cluster;
@@ -14,6 +16,7 @@ export declare class EcsServerConstruct extends Construct implements Grant {
     private props;
     apps: Record<string, AppConstruct>;
     definition: ecs.TaskDefinition;
+    service: ecs.BaseService;
     loadBalancer?: {
         alb: elbV2.IApplicationLoadBalancer;
         listener: elbV2.IApplicationListener;

package/dist/lib/ecs/ecs-server-construct.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ecs-server-construct.d.ts","sourceRoot":"","sources":["../../../src/lib/ecs/ecs-server-construct.ts"],"names":[],"mappings":"AAGA,OAAO,EAAW,KAAK,EAAE,SAAS,EAAgB,MAAM,iBAAiB,CAAC;AAG1E,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAC3C,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAC3C,OAAO,KAAK,KAAK,MAAM,wCAAwC,CAAC;AAChE,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAIvC,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAO1D,KAAK,uBAAuB,GAAG,iBAAiB,CAAC,QAAQ,CAAC,GAAG;IAC3D,GAAG,EAAE,GAAG,CAAC,IAAI,CAAC;IACd,eAAe,EAAE,MAAM,CAAC;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,GAAG,CAAC,OAAO,CAAC;CACtB,CAAC;AAEF,qBAAa,kBAAmB,SAAQ,SAAU,YAAW,KAAK;IAY9D,OAAO,CAAC,KAAK;IAXR,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAM;IACxC,UAAU,EAAE,GAAG,CAAC,cAAc,CAAC;IAE/B,YAAY,CAAC,EAAE;QACpB,GAAG,EAAE,KAAK,CAAC,wBAAwB,CAAC;QACpC,QAAQ,EAAE,KAAK,CAAC,oBAAoB,CAAC;KACtC,CAAC;gBAGA,KAAK,EAAE,SAAS,EAChB,EAAE,EAAE,MAAM,EACF,KAAK,EAAE,uBAAuB;IAsExC,KAAK,CAAC,GAAG,UAAU,EAAE,SAAS,EAAE,GAAG,IAAI;IAMvC,OAAO,CAAC,YAAY;IA8CpB,gBAAgB;;;;IAuChB,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM;CA+CxC"}
+{"version":3,"file":"ecs-server-construct.d.ts","sourceRoot":"","sources":["../../../src/lib/ecs/ecs-server-construct.ts"],"names":[],"mappings":"AAGA,OAAO,EAAW,KAAK,EAAE,SAAS,EAAgB,MAAM,iBAAiB,CAAC;AAG1E,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAC3C,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAC3C,OAAO,KAAK,KAAK,MAAM,wCAAwC,CAAC;AAChE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAIvC,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAO1D,KAAK,uBAAuB,GAAG,iBAAiB,CAAC,QAAQ,CAAC,GAAG;IAC3D,GAAG,EAAE,GAAG,CAAC,IAAI,CAAC;IACd,QAAQ,EAAE,QAAQ,CAAC;IACnB,eAAe,EAAE,MAAM,CAAC;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,GAAG,CAAC,OAAO,CAAC;CACtB,CAAC;AAEF,qBAAa,kBAAmB,SAAQ,SAAU,YAAW,KAAK;IAa9D,OAAO,CAAC,KAAK;IAZR,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAM;IACxC,UAAU,EAAE,GAAG,CAAC,cAAc,CAAC;IAC/B,OAAO,EAAE,GAAG,CAAC,WAAW,CAAC;IAEzB,YAAY,CAAC,EAAE;QACpB,GAAG,EAAE,KAAK,CAAC,wBAAwB,CAAC;QACpC,QAAQ,EAAE,KAAK,CAAC,oBAAoB,CAAC;KACtC,CAAC;gBAGA,KAAK,EAAE,SAAS,EAChB,EAAE,EAAE,MAAM,EACF,KAAK,EAAE,uBAAuB;IAwExC,KAAK,CAAC,GAAG,UAAU,EAAE,SAAS,EAAE,GAAG,IAAI;IAMvC,OAAO,CAAC,YAAY;IA8CpB,gBAAgB;;;;IAuChB,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM;CA+CxC"}

package/dist/lib/ecs/ecs-server-construct.js

@@ -21,6 +21,7 @@ class EcsServerConstruct extends constructs_1.Construct {
     props;
     apps = {};
     definition;
+    service;
     loadBalancer;
     constructor(scope, id, props) {
         super(scope, id);
@@ -38,7 +39,7 @@ class EcsServerConstruct extends constructs_1.Construct {
             },
             ...(definition ?? {}),
         });
-        const service = new ecs.FargateService(this, 'ServerService', {
+        this.service = new ecs.FargateService(this, 'ServerService', {
             cluster,
             taskDefinition: this.definition,
             capacityProviderStrategies: [{ capacityProvider: 'FARGATE', weight: 1 }],
@@ -52,7 +53,7 @@ class EcsServerConstruct extends constructs_1.Construct {
             propagateTags: ecs.PropagatedTagSource.SERVICE,
             ...serverProps,
         });
-        const serverOrigin = (port, containerName, appPath, healthPath) => this.serverOrigin(service, port, containerName, appPath, healthPath);
+        const serverOrigin = (port, containerName, appPath, healthPath) => this.serverOrigin(this.service, port, containerName, appPath, healthPath);
         serverOrigin.bind(this);
         Object.assign(this.apps, Object.fromEntries(Object.entries(apps).map(([key, app]) => {
             const AppTypeConstruct = AppBuilds[app.type];
@@ -60,6 +61,7 @@ class EcsServerConstruct extends constructs_1.Construct {
                 key,
                 new AppTypeConstruct(this, `${key}App`, {
                     appName: key,
+                    logGroup: props.logGroup,
                     environmentPath: props.environmentPath,
                     buildParams: AppTypeConstruct.parse(app.buildParams ?? {}),
                     serverOrigin,

package/dist/lib/ecs/shared/taskDefinitionImage.d.ts

@@ -1,12 +1,13 @@
 import * as ecs from 'aws-cdk-lib/aws-ecs';
-import { AppProperties } from '../types';
+import type { LogGroup } from 'aws-cdk-lib/aws-logs';
+import type { AppProperties } from '../types';
 type Props = {
     output: string;
+    logGroup: LogGroup;
     taskDefinition: ecs.TaskDefinition;
     env?: Record<string, string>;
     port: number;
     container?: AppProperties['container'];
-    environmentPath: string;
 };
 export declare function taskDefinitionImage(id: string, props: Props): ecs.ContainerDefinition;
 export {};

package/dist/lib/ecs/shared/taskDefinitionImage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"taskDefinitionImage.d.ts","sourceRoot":"","sources":["../../../../src/lib/ecs/shared/taskDefinitionImage.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAG3C,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEzC,KAAK,KAAK,GAAG;IACX,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,EAAE,GAAG,CAAC,cAAc,CAAC;IACnC,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,aAAa,CAAC,WAAW,CAAC,CAAC;IACvC,eAAe,EAAE,MAAM,CAAC;CACzB,CAAC;AAEF,wBAAgB,mBAAmB,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,2BAmB3D"}
+{"version":3,"file":"taskDefinitionImage.d.ts","sourceRoot":"","sources":["../../../../src/lib/ecs/shared/taskDefinitionImage.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAC3C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAGrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAE9C,KAAK,KAAK,GAAG;IACX,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,QAAQ,CAAC;IACnB,cAAc,EAAE,GAAG,CAAC,cAAc,CAAC;IACnC,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,aAAa,CAAC,WAAW,CAAC,CAAC;CACxC,CAAC;AAEF,wBAAgB,mBAAmB,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,2BAoB3D"}

package/dist/lib/ecs/shared/taskDefinitionImage.js

@@ -14,8 +14,9 @@ function taskDefinitionImage(id, props) {
             ...(image ?? {}),
         }),
         logging: new ecs.AwsLogDriver({
-            streamPrefix: `${props.environmentPath}/${id}`,
+            streamPrefix: id,
             logRetention: logDuration ?? logs.RetentionDays.ONE_DAY,
+            logGroup: props.logGroup,
         }),
         environment: {
             ...(props.env ?? {}),

package/dist/lib/ecs/types.d.ts

@@ -4,8 +4,9 @@ import type { LoadBalancerV2Origin } from 'aws-cdk-lib/aws-cloudfront-origins';
 import type { IVpc } from 'aws-cdk-lib/aws-ec2';
 import type { AssetImageProps, Cluster, ContainerDefinitionOptions, FargateServiceProps, FargateTaskDefinitionProps, TaskDefinition } from 'aws-cdk-lib/aws-ecs';
 import type { ApplicationLoadBalancerProps } from 'aws-cdk-lib/aws-elasticloadbalancingv2';
-import type { RetentionDays } from 'aws-cdk-lib/aws-logs';
+import type { LogGroup, RetentionDays } from 'aws-cdk-lib/aws-logs';
 export type EcsConstructProps = {
+    logGroup: LogGroup;
     environmentPath: string;
     environment: string;
     vpc: IVpc;
@@ -59,6 +60,7 @@ export type TaskApp = {
 export type AppProperties<BuildParams = Record<string, unknown>> = {
     appName: string;
     environmentPath: string;
+    logGroup: LogGroup;
     taskDefinition: TaskDefinition;
     env?: Record<string, string>;
     buildParams: BuildParams;
@@ -75,6 +77,8 @@ export type AppProperties<BuildParams = Record<string, unknown>> = {
 };
 export type TaskConstructsProps = FargateTaskDefinitionProps & {
     vpc: IVpc;
+    logGroup: LogGroup;
+    taskName: string;
     cluster: Cluster;
     env?: Record<string, string>;
     /** Directory of build output to be deployed */

package/dist/lib/ecs/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/lib/ecs/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/lib/ecs/types.ts"],"names":[],"mappings":"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"}

package/dist/lib/lambda/apps/image-app-construct.d.ts

@@ -1,14 +1,14 @@
 import { Attachable, Grantable } from '@fy-stack/types';
 import type { HttpRouteIntegration } from 'aws-cdk-lib/aws-apigatewayv2';
 import { BehaviorOptions } from 'aws-cdk-lib/aws-cloudfront';
-import { AssetImageCodeProps, Function } from 'aws-cdk-lib/aws-lambda';
+import { Function } from 'aws-cdk-lib/aws-lambda';
 import { ITopicSubscription, SubscriptionProps } from 'aws-cdk-lib/aws-sns';
 import { Queue } from 'aws-cdk-lib/aws-sqs';
 import { Construct } from 'constructs';
 import { z } from 'zod';
 import { AppConstruct, AppProperties } from '../types';
 declare const BuildParamsSchema: z.ZodObject<{
-    container: z.ZodObject<{
+    container: z.ZodOptional<z.ZodObject<{
         file: z.ZodOptional<z.ZodString>;
         cmd: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
     }, "passthrough", z.ZodTypeAny, z.objectOutputType<{
@@ -17,9 +17,9 @@ declare const BuildParamsSchema: z.ZodObject<{
     }, z.ZodTypeAny, "passthrough">, z.objectInputType<{
         file: z.ZodOptional<z.ZodString>;
         cmd: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
-    }, z.ZodTypeAny, "passthrough">>;
+    }, z.ZodTypeAny, "passthrough">>>;
 }, "passthrough", z.ZodTypeAny, z.objectOutputType<{
-    container: z.ZodObject<{
+    container: z.ZodOptional<z.ZodObject<{
         file: z.ZodOptional<z.ZodString>;
         cmd: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
     }, "passthrough", z.ZodTypeAny, z.objectOutputType<{
@@ -28,9 +28,9 @@ declare const BuildParamsSchema: z.ZodObject<{
     }, z.ZodTypeAny, "passthrough">, z.objectInputType<{
         file: z.ZodOptional<z.ZodString>;
         cmd: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
-    }, z.ZodTypeAny, "passthrough">>;
+    }, z.ZodTypeAny, "passthrough">>>;
 }, z.ZodTypeAny, "passthrough">, z.objectInputType<{
-    container: z.ZodObject<{
+    container: z.ZodOptional<z.ZodObject<{
         file: z.ZodOptional<z.ZodString>;
         cmd: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
     }, "passthrough", z.ZodTypeAny, z.objectOutputType<{
@@ -39,12 +39,12 @@ declare const BuildParamsSchema: z.ZodObject<{
     }, z.ZodTypeAny, "passthrough">, z.objectInputType<{
         file: z.ZodOptional<z.ZodString>;
         cmd: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
-    }, z.ZodTypeAny, "passthrough">>;
+    }, z.ZodTypeAny, "passthrough">>>;
 }, z.ZodTypeAny, "passthrough">>;
 export declare class ImageAppConstruct extends Construct implements AppConstruct {
     function: Function;
     queue: Queue | undefined;
-    constructor(scope: Construct, id: string, props: AppProperties<z.infer<typeof BuildParamsSchema> & AssetImageCodeProps>);
+    constructor(scope: Construct, id: string, props: AppProperties<z.infer<typeof BuildParamsSchema>>);
     attach(attachable: Record<string, Attachable>): void;
     grant(...grantables: Grantable[]): void;
     subscription(props: SubscriptionProps): ITopicSubscription;
@@ -52,7 +52,7 @@ export declare class ImageAppConstruct extends Construct implements AppConstruct
     cloudfrontPolicy(distributionId: string): void;
     api(path: string): Record<string, HttpRouteIntegration>;
     static parse(params: unknown): z.objectOutputType<{
-        container: z.ZodObject<{
+        container: z.ZodOptional<z.ZodObject<{
             file: z.ZodOptional<z.ZodString>;
             cmd: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
         }, "passthrough", z.ZodTypeAny, z.objectOutputType<{
@@ -61,7 +61,7 @@ export declare class ImageAppConstruct extends Construct implements AppConstruct
         }, z.ZodTypeAny, "passthrough">, z.objectInputType<{
             file: z.ZodOptional<z.ZodString>;
             cmd: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
-        }, z.ZodTypeAny, "passthrough">>;
+        }, z.ZodTypeAny, "passthrough">>>;
     }, z.ZodTypeAny, "passthrough">;
 }
 export {};

package/dist/lib/lambda/apps/image-app-construct.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"image-app-construct.d.ts","sourceRoot":"","sources":["../../../../src/lib/lambda/apps/image-app-construct.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAExD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACzE,OAAO,EAEL,eAAe,EAKhB,MAAM,4BAA4B,CAAC;AAGpC,OAAO,EACL,mBAAmB,EAEnB,QAAQ,EAIT,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAK5E,OAAO,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAMvD,QAAA,MAAM,iBAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;gCASP,CAAC;AAEjB,qBAAa,iBAAkB,SAAQ,SAAU,YAAW,YAAY;IAC/D,QAAQ,EAAE,QAAQ,CAAC;IACnB,KAAK,EAAE,KAAK,GAAG,SAAS,CAAC;gBAG9B,KAAK,EAAE,SAAS,EAChB,EAAE,EAAE,MAAM,EACV,KAAK,EAAE,aAAa,CAClB,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,GAAG,mBAAmB,CACxD;IA2BH,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,GAAG,IAAI;IAIpD,KAAK,CAAC,GAAG,UAAU,EAAE,SAAS,EAAE,GAAG,IAAI;IAIvC,YAAY,CAAC,KAAK,EAAE,iBAAiB,GAAG,kBAAkB;IAW1D,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC;IAqBzD,gBAAgB,CAAC,cAAc,EAAE,MAAM;IAIvC,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC;IAIvD,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,OAAO;;;;;;;;;;;;CAG7B"}
+{"version":3,"file":"image-app-construct.d.ts","sourceRoot":"","sources":["../../../../src/lib/lambda/apps/image-app-construct.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAExD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACzE,OAAO,EAEL,eAAe,EAKhB,MAAM,4BAA4B,CAAC;AAGpC,OAAO,EAEL,QAAQ,EAIT,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAK5E,OAAO,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAMvD,QAAA,MAAM,iBAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;gCAUP,CAAC;AAEjB,qBAAa,iBAAkB,SAAQ,SAAU,YAAW,YAAY;IAC/D,QAAQ,EAAE,QAAQ,CAAC;IACnB,KAAK,EAAE,KAAK,GAAG,SAAS,CAAC;gBAG9B,KAAK,EAAE,SAAS,EAChB,EAAE,EAAE,MAAM,EACV,KAAK,EAAE,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAC;IAmCzD,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,GAAG,IAAI;IAIpD,KAAK,CAAC,GAAG,UAAU,EAAE,SAAS,EAAE,GAAG,IAAI;IAIvC,YAAY,CAAC,KAAK,EAAE,iBAAiB,GAAG,kBAAkB;IAW1D,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC;IAqBzD,gBAAgB,CAAC,cAAc,EAAE,MAAM;IAIvC,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC;IAIvD,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,OAAO;;;;;;;;;;;;CAG7B"}

package/dist/lib/lambda/apps/image-app-construct.js

@@ -22,7 +22,8 @@ const BuildParamsSchema = zod_1.z
         file: zod_1.z.string().optional(),
         cmd: zod_1.z.string().array().optional(),
     })
-        .passthrough(),
+        .passthrough()
+        .optional(),
 })
     .passthrough();
 class ImageAppConstruct extends constructs_1.Construct {
@@ -30,21 +31,26 @@ class ImageAppConstruct extends constructs_1.Construct {
     queue;
     constructor(scope, id, props) {
         super(scope, id);
+        const { container, ...functionProps } = props.buildParams;
         this.function = new aws_lambda_1.Function(this, `AppFunction`, {
-            ...(0, getDefaultLambda_1.getDefaultLambda)(props),
+            ...(0, getDefaultLambda_1.getDefaultLambda)(this, props),
             code: aws_lambda_1.Code.fromAssetImage(props.output, {
                 platform: aws_ecr_assets_1.Platform.LINUX_AMD64,
-                ...props.buildParams.container,
+                ...container,
             }),
             handler: aws_lambda_1.Handler.FROM_IMAGE,
             runtime: aws_lambda_1.Runtime.FROM_IMAGE,
+            ...functionProps,
         });
         if (props.queue) {
+            const { batchSize, ...queueProps } = props.queue;
             this.queue = new aws_sqs_1.Queue(this, 'AppQueue', {
-                visibilityTimeout: aws_cdk_lib_1.Duration.seconds((props.timeout ?? 30) + 30),
+                visibilityTimeout: queueProps.visibilityTimeout ??
+                    aws_cdk_lib_1.Duration.seconds((props.timeout ?? 30) + 30),
+                ...queueProps,
             });
             this.function.addEventSource(new aws_lambda_event_sources_1.SqsEventSource(this.queue, {
-                batchSize: props.queue.batchSize,
+                batchSize,
             }));
         }
     }

package/dist/lib/lambda/apps/next-app-router-construct.d.ts

@@ -9,11 +9,11 @@ import { z } from 'zod';
 import { AppConstruct, AppProperties } from '../types';
 declare const BuildParamsSchema: z.ZodObject<{
     cmd: z.ZodString;
-}, "strip", z.ZodTypeAny, {
-    cmd: string;
-}, {
-    cmd: string;
-}>;
+}, "passthrough", z.ZodTypeAny, z.objectOutputType<{
+    cmd: z.ZodString;
+}, z.ZodTypeAny, "passthrough">, z.objectInputType<{
+    cmd: z.ZodString;
+}, z.ZodTypeAny, "passthrough">>;
 export declare class NextAppRouterConstruct extends Construct implements AppConstruct {
     function: lambda.Function;
     queue: sqs.Queue | undefined;
@@ -26,9 +26,9 @@ export declare class NextAppRouterConstruct extends Construct implements AppCons
     attach(attachable: Record<string, Attachable>): void;
     grant(...grants: Grantable[]): void;
     subscription(): ITopicSubscription;
-    static parse(params: unknown): {
-        cmd: string;
-    };
+    static parse(params: unknown): z.objectOutputType<{
+        cmd: z.ZodString;
+    }, z.ZodTypeAny, "passthrough">;
 }
 export {};
 //# sourceMappingURL=next-app-router-construct.d.ts.map

package/dist/lib/lambda/apps/next-app-router-construct.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"next-app-router-construct.d.ts","sourceRoot":"","sources":["../../../../src/lib/lambda/apps/next-app-router-construct.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAExD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACzE,OAAO,KAAK,UAAU,MAAM,4BAA4B,CAAC;AAEzD,OAAO,KAAK,MAAM,MAAM,wBAAwB,CAAC;AAEjD,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAOxB,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAIvD,QAAA,MAAM,iBAAiB;;;;;;EAErB,CAAC;AAEH,qBAAa,sBAAuB,SAAQ,SAAU,YAAW,YAAY;IACpE,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC;IAC1B,KAAK,EAAE,GAAG,CAAC,KAAK,GAAG,SAAS,CAAC;IAEpC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAY;IACnC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAU;gBAG9B,KAAK,EAAE,SAAS,EAChB,EAAE,EAAE,MAAM,EACV,KAAK,EAAE,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAC;IAwCzD,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,eAAe,CAAC;IAiBpE,gBAAgB,CAAC,cAAc,EAAE,MAAM;IAIvC,GAAG,IAAI,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC;IAI3C,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC;IAI7C,KAAK,CAAC,GAAG,MAAM,EAAE,SAAS,EAAE;IAI5B,YAAY,IAAI,kBAAkB;IAIlC,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,OAAO;;;CAG7B"}
+{"version":3,"file":"next-app-router-construct.d.ts","sourceRoot":"","sources":["../../../../src/lib/lambda/apps/next-app-router-construct.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAExD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACzE,OAAO,KAAK,UAAU,MAAM,4BAA4B,CAAC;AAEzD,OAAO,KAAK,MAAM,MAAM,wBAAwB,CAAC;AAEjD,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAOxB,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAKvD,QAAA,MAAM,iBAAiB;;;;;;gCAA8C,CAAC;AAEtE,qBAAa,sBAAuB,SAAQ,SAAU,YAAW,YAAY;IACpE,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC;IAC1B,KAAK,EAAE,GAAG,CAAC,KAAK,GAAG,SAAS,CAAC;IAEpC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAY;IACnC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAU;gBAG9B,KAAK,EAAE,SAAS,EAChB,EAAE,EAAE,MAAM,EACV,KAAK,EAAE,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAC;IAyCzD,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,eAAe,CAAC;IAiBpE,gBAAgB,CAAC,cAAc,EAAE,MAAM;IAIvC,GAAG,IAAI,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC;IAI3C,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC;IAI7C,KAAK,CAAC,GAAG,MAAM,EAAE,SAAS,EAAE;IAI5B,YAAY,IAAI,kBAAkB;IAIlC,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,OAAO;;;CAG7B"}

package/dist/lib/lambda/apps/next-app-router-construct.js

@@ -10,11 +10,10 @@ const lambda = tslib_1.__importStar(require("aws-cdk-lib/aws-lambda"));
 const constructs_1 = require("constructs");
 const zod_1 = require("zod");
 const next_app_router_1 = require("../../shared/next-app-router");
+const getDefaultLambda_1 = require("../utils/getDefaultLambda");
 const lambda_attach_1 = require("../utils/lambda-attach");
 const lambda_grant_1 = require("../utils/lambda-grant");
-const BuildParamsSchema = zod_1.z.object({
-    cmd: zod_1.z.string(),
-});
+const BuildParamsSchema = zod_1.z.object({ cmd: zod_1.z.string() }).passthrough();
 class NextAppRouterConstruct extends constructs_1.Construct {
     function;
     queue;
@@ -33,18 +32,18 @@ class NextAppRouterConstruct extends constructs_1.Construct {
             AWS_NODEJS_CONNECTION_REUSE_ENABLED: '1',
             AWS_LWA_INVOKE_MODE: 'response_stream',
         };
-        Object.assign(environment, props.env);
+        const { cmd, ...functionProps } = props.buildParams;
         const serverOutput = path.join(props.output, '/.next/standalone');
-        fs.writeFileSync(path.join(serverOutput, 'run.sh'), props.buildParams.cmd);
+        fs.writeFileSync(path.join(serverOutput, 'run.sh'), cmd);
+        const defaultProps = (0, getDefaultLambda_1.getDefaultLambda)(this, props);
         this.function = new lambda.Function(this, `AppFunction`, {
+            ...defaultProps,
+            environment: Object.assign({}, defaultProps.environment, environment),
             runtime: lambda.Runtime.NODEJS_20_X,
-            memorySize: 512,
             handler: 'run.sh',
-            timeout: cdk.Duration.seconds(60),
             code: lambda.Code.fromAsset(serverOutput),
-            loggingFormat: lambda.LoggingFormat.JSON,
             layers: [webAdapterLayer],
-            environment,
+            ...functionProps,
         });
     }
     cloudfront(path) {

package/dist/lib/lambda/apps/node-api-construct.d.ts

@@ -8,11 +8,11 @@ import { z } from 'zod';
 import { AppConstruct, AppProperties } from '../types';
 declare const BuildParamsSchema: z.ZodObject<{
     cmd: z.ZodString;
-}, "strip", z.ZodTypeAny, {
-    cmd: string;
-}, {
-    cmd: string;
-}>;
+}, "passthrough", z.ZodTypeAny, z.objectOutputType<{
+    cmd: z.ZodString;
+}, z.ZodTypeAny, "passthrough">, z.objectInputType<{
+    cmd: z.ZodString;
+}, z.ZodTypeAny, "passthrough">>;
 export declare class NodeApiConstruct extends Construct implements AppConstruct {
     function: lambda.Function;
     queue: sqs.Queue | undefined;
@@ -35,9 +35,9 @@ export declare class NodeApiConstruct extends Construct implements AppConstruct
     api(path: string): {
         [x: string]: cdk.aws_apigatewayv2_integrations.HttpUrlIntegration;
     };
-    static parse(params: unknown): {
-        cmd: string;
-    };
+    static parse(params: unknown): z.objectOutputType<{
+        cmd: z.ZodString;
+    }, z.ZodTypeAny, "passthrough">;
 }
 export {};
 //# sourceMappingURL=node-api-construct.d.ts.map

package/dist/lib/lambda/apps/node-api-construct.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"node-api-construct.d.ts","sourceRoot":"","sources":["../../../../src/lib/lambda/apps/node-api-construct.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,KAAK,GAAG,MAAM,aAAa,CAAC;AAGnC,OAAO,KAAK,MAAM,MAAM,wBAAwB,CAAC;AAEjD,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAC5E,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAKvD,QAAA,MAAM,iBAAiB;;;;;;EAErB,CAAA;AAEF,qBAAa,gBAAiB,SAAQ,SAAU,YAAW,YAAY;IAC9D,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC;IAC1B,KAAK,EAAE,GAAG,CAAC,KAAK,GAAG,SAAS,CAAC;gBAExB,KAAK,EAAE,SAAS,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAC;IA+CjG,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC;IAI7C,KAAK,CAAC,GAAG,MAAM,EAAE,SAAS,EAAE;IAI5B,YAAY,CAAC,KAAK,EAAE,iBAAiB,GAAG,kBAAkB;IAI1D,UAAU,CAAC,IAAI,EAAE,MAAM;;;;;;;;;;;IAqBvB,gBAAgB,CAAC,cAAc,EAAE,MAAM;IAIvC,GAAG,CAAC,IAAI,EAAE,MAAM;;;IAIhB,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,OAAO;;;CAG7B"}
+{"version":3,"file":"node-api-construct.d.ts","sourceRoot":"","sources":["../../../../src/lib/lambda/apps/node-api-construct.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,KAAK,GAAG,MAAM,aAAa,CAAC;AAGnC,OAAO,KAAK,MAAM,MAAM,wBAAwB,CAAC;AAEjD,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAC5E,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAMvD,QAAA,MAAM,iBAAiB;;;;;;gCAA8C,CAAC;AAEtE,qBAAa,gBAAiB,SAAQ,SAAU,YAAW,YAAY;IAC9D,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC;IAC1B,KAAK,EAAE,GAAG,CAAC,KAAK,GAAG,SAAS,CAAC;gBAGlC,KAAK,EAAE,SAAS,EAChB,EAAE,EAAE,MAAM,EACV,KAAK,EAAE,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAC;IA+CzD,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC;IAI7C,KAAK,CAAC,GAAG,MAAM,EAAE,SAAS,EAAE;IAI5B,YAAY,CAAC,KAAK,EAAE,iBAAiB,GAAG,kBAAkB;IAI1D,UAAU,CAAC,IAAI,EAAE,MAAM;;;;;;;;;;;IAqBvB,gBAAgB,CAAC,cAAc,EAAE,MAAM;IAIvC,GAAG,CAAC,IAAI,EAAE,MAAM;;;IAIhB,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,OAAO;;;CAG7B"}

package/dist/lib/lambda/apps/node-api-construct.js

@@ -12,37 +12,36 @@ const lambdaEventSource = tslib_1.__importStar(require("aws-cdk-lib/aws-lambda-e
 const sqs = tslib_1.__importStar(require("aws-cdk-lib/aws-sqs"));
 const constructs_1 = require("constructs");
 const zod_1 = require("zod");
+const getDefaultLambda_1 = require("../utils/getDefaultLambda");
 const lambda_api_1 = require("../utils/lambda-api");
 const lambda_attach_1 = require("../utils/lambda-attach");
 const lambda_grant_1 = require("../utils/lambda-grant");
-const BuildParamsSchema = zod_1.z.object({
-    cmd: zod_1.z.string(),
-});
+const BuildParamsSchema = zod_1.z.object({ cmd: zod_1.z.string() }).passthrough();
 class NodeApiConstruct extends constructs_1.Construct {
     function;
     queue;
     constructor(scope, id, props) {
         super(scope, id);
         const region = cdk.Stack.of(this).region;
-        const environment = {};
-        Object.assign(environment, props.env);
-        const layers = [
-            lambda.LayerVersion.fromLayerVersionArn(this, 'WebAdapterLayer', `arn:aws:lambda:${region}:753240598075:layer:LambdaAdapterLayerX86:16`)
-        ];
-        Object.assign(environment, {
+        const environment = {
             AWS_LAMBDA_EXEC_WRAPPER: '/opt/bootstrap',
             AWS_NODEJS_CONNECTION_REUSE_ENABLED: '1',
             PORT: '8080',
-        });
-        node_fs_1.default.writeFileSync(node_path_1.default.join(props.output, 'run.sh'), props.buildParams.cmd);
+        };
+        const layers = [
+            lambda.LayerVersion.fromLayerVersionArn(this, 'WebAdapterLayer', `arn:aws:lambda:${region}:753240598075:layer:LambdaAdapterLayerX86:16`),
+        ];
+        const { cmd, ...functionProps } = props.buildParams;
+        node_fs_1.default.writeFileSync(node_path_1.default.join(props.output, 'run.sh'), cmd);
+        const defaultProps = (0, getDefaultLambda_1.getDefaultLambda)(this, props);
         this.function = new lambda.Function(this, `AppFunction`, {
+            ...defaultProps,
+            environment: Object.assign({}, defaultProps.environment, environment),
             runtime: lambda.Runtime.NODEJS_20_X,
-            memorySize: 512,
             handler: 'run.sh',
-            layers,
-            timeout: cdk.Duration.seconds(30),
             code: lambda.Code.fromAsset(props.output),
-            environment,
+            layers,
+            ...functionProps,
         });
         if (props.queue) {
             this.queue = new sqs.Queue(this, 'AppQueue', {

package/dist/lib/lambda/apps/node-app-construct.d.ts

@@ -9,11 +9,11 @@ import { z } from 'zod';
 import { AppConstruct, AppProperties } from '../types';
 declare const BuildParamsSchema: z.ZodObject<{
     handler: z.ZodOptional<z.ZodString>;
-}, "strip", z.ZodTypeAny, {
-    handler?: string | undefined;
-}, {
-    handler?: string | undefined;
-}>;
+}, "passthrough", z.ZodTypeAny, z.objectOutputType<{
+    handler: z.ZodOptional<z.ZodString>;
+}, z.ZodTypeAny, "passthrough">, z.objectInputType<{
+    handler: z.ZodOptional<z.ZodString>;
+}, z.ZodTypeAny, "passthrough">>;
 export declare class NodeAppConstruct extends Construct implements AppConstruct {
     function: lambda.Function;
     queue: sqs.Queue | undefined;
@@ -24,9 +24,9 @@ export declare class NodeAppConstruct extends Construct implements AppConstruct
     cloudfront(path: string): Record<string, BehaviorOptions>;
     cloudfrontPolicy(distributionId: string): void;
     api(path: string): Record<string, HttpRouteIntegration>;
-    static parse(params: unknown): {
-        handler?: string | undefined;
-    };
+    static parse(params: unknown): z.objectOutputType<{
+        handler: z.ZodOptional<z.ZodString>;
+    }, z.ZodTypeAny, "passthrough">;
 }
 export {};
 //# sourceMappingURL=node-app-construct.d.ts.map

package/dist/lib/lambda/apps/node-app-construct.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"node-app-construct.d.ts","sourceRoot":"","sources":["../../../../src/lib/lambda/apps/node-app-construct.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAExD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAEzE,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAC7D,OAAO,KAAK,MAAM,MAAM,wBAAwB,CAAC;AAGjD,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAE5E,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAIvD,QAAA,MAAM,iBAAiB;;;;;;EAErB,CAAA;AAEF,qBAAa,gBAAiB,SAAQ,SAAU,YAAW,YAAY;IAC9D,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC;IAC1B,KAAK,EAAE,GAAG,CAAC,KAAK,GAAG,SAAS,CAAC;gBAExB,KAAK,EAAE,SAAS,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAC;IA8BjG,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC;IAI7C,KAAK,CAAC,GAAG,MAAM,EAAE,SAAS,EAAE;IAI5B,YAAY,CAAC,KAAK,EAAE,iBAAiB,GAAG,kBAAkB;IAO1D,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC;IAIzD,gBAAgB,CAAC,cAAc,EAAE,MAAM;IAIvC,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC;IAcvD,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,OAAO;;;CAG7B"}
+{"version":3,"file":"node-app-construct.d.ts","sourceRoot":"","sources":["../../../../src/lib/lambda/apps/node-app-construct.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAExD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAEzE,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAC7D,OAAO,KAAK,MAAM,MAAM,wBAAwB,CAAC;AAEjD,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAE5E,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAE3C,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAKvD,QAAA,MAAM,iBAAiB;;;;;;gCAEP,CAAC;AAEjB,qBAAa,gBAAiB,SAAQ,SAAU,YAAW,YAAY;IAC9D,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC;IAC1B,KAAK,EAAE,GAAG,CAAC,KAAK,GAAG,SAAS,CAAC;gBAGlC,KAAK,EAAE,SAAS,EAChB,EAAE,EAAE,MAAM,EACV,KAAK,EAAE,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAC;IA6BzD,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC;IAI7C,KAAK,CAAC,GAAG,MAAM,EAAE,SAAS,EAAE;IAI5B,YAAY,CAAC,KAAK,EAAE,iBAAiB,GAAG,kBAAkB;IAU1D,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC;IAIzD,gBAAgB,CAAC,cAAc,EAAE,MAAM;IAIvC,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC;IAcvD,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,OAAO;;;CAG7B"}

package/dist/lib/lambda/apps/node-app-construct.js

@@ -2,42 +2,40 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NodeAppConstruct = void 0;
 const tslib_1 = require("tslib");
-const cdk = tslib_1.__importStar(require("aws-cdk-lib"));
+const aws_cdk_lib_1 = require("aws-cdk-lib");
 const aws_apigatewayv2_integrations_1 = require("aws-cdk-lib/aws-apigatewayv2-integrations");
 const lambda = tslib_1.__importStar(require("aws-cdk-lib/aws-lambda"));
-const aws_lambda_1 = require("aws-cdk-lib/aws-lambda");
-const lambdaEventSource = tslib_1.__importStar(require("aws-cdk-lib/aws-lambda-event-sources"));
+const aws_lambda_event_sources_1 = require("aws-cdk-lib/aws-lambda-event-sources");
 const snsSubscriptions = tslib_1.__importStar(require("aws-cdk-lib/aws-sns-subscriptions"));
-const sqs = tslib_1.__importStar(require("aws-cdk-lib/aws-sqs"));
+const aws_sqs_1 = require("aws-cdk-lib/aws-sqs");
 const constructs_1 = require("constructs");
 const zod_1 = require("zod");
+const getDefaultLambda_1 = require("../utils/getDefaultLambda");
 const lambda_attach_1 = require("../utils/lambda-attach");
 const lambda_grant_1 = require("../utils/lambda-grant");
-const BuildParamsSchema = zod_1.z.object({
-    handler: zod_1.z.string().optional(),
-});
+const BuildParamsSchema = zod_1.z
+    .object({ handler: zod_1.z.string().optional() })
+    .passthrough();
 class NodeAppConstruct extends constructs_1.Construct {
     function;
     queue;
     constructor(scope, id, props) {
         super(scope, id);
-        const environment = {};
-        Object.assign(environment, props.env);
         this.function = new lambda.Function(this, `AppFunction`, {
+            ...(0, getDefaultLambda_1.getDefaultLambda)(this, props),
             runtime: lambda.Runtime.NODEJS_20_X,
-            memorySize: 512,
-            handler: props.buildParams.handler ?? "index.handler",
-            timeout: cdk.Duration.seconds(30),
+            handler: props.buildParams.handler ?? 'index.handler',
             code: lambda.Code.fromAsset(props.output),
-            loggingFormat: aws_lambda_1.LoggingFormat.JSON,
-            environment,
         });
         if (props.queue) {
-            this.queue = new sqs.Queue(this, 'AppQueue', {
-                visibilityTimeout: cdk.Duration.seconds(59),
+            const { batchSize, ...queueProps } = props.queue;
+            this.queue = new aws_sqs_1.Queue(this, 'AppQueue', {
+                visibilityTimeout: queueProps.visibilityTimeout ??
+                    aws_cdk_lib_1.Duration.seconds((props.timeout ?? 30) + 30),
+                ...queueProps,
             });
-            this.function.addEventSource(new lambdaEventSource.SqsEventSource(this.queue, {
-                batchSize: props.queue.batchSize,
+            this.function.addEventSource(new aws_lambda_event_sources_1.SqsEventSource(this.queue, {
+                batchSize: batchSize,
             }));
         }
     }
@@ -49,7 +47,10 @@ class NodeAppConstruct extends constructs_1.Construct {
     }
     subscription(props) {
         if (this.queue)
-            return new snsSubscriptions.SqsSubscription(this.queue, { ...props, rawMessageDelivery: true });
+            return new snsSubscriptions.SqsSubscription(this.queue, {
+                ...props,
+                rawMessageDelivery: true,
+            });
         return new snsSubscriptions.LambdaSubscription(this.function, props);
     }
     cloudfront(path) {
@@ -63,7 +64,7 @@ class NodeAppConstruct extends constructs_1.Construct {
         const integration = new aws_apigatewayv2_integrations_1.HttpLambdaIntegration('AppIntegration', this.function);
         return {
             [path]: integration,
-            [`${path}/{proxy+}`]: integration
+            [`${path}/{proxy+}`]: integration,
         };
     }
     static parse(params) {

package/dist/lib/lambda/lambda-construct.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lambda-construct.d.ts","sourceRoot":"","sources":["../../../src/lib/lambda/lambda-construct.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAMvC,OAAO,EAAE,YAAY,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAC;AAS7D,qBAAa,eAAgB,SAAQ,SAAS;IAC5C,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAM;gBAE5B,KAAK,EAAE,SAAS,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,oBAAoB;CAsBtE"}
+{"version":3,"file":"lambda-construct.d.ts","sourceRoot":"","sources":["../../../src/lib/lambda/lambda-construct.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAMvC,OAAO,EAAE,YAAY,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAC;AAS7D,qBAAa,eAAgB,SAAQ,SAAS;IAC5C,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAM;gBAE5B,KAAK,EAAE,SAAS,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,oBAAoB;CAuBtE"}

package/dist/lib/lambda/lambda-construct.js

@@ -25,6 +25,7 @@ class LambdaConstruct extends constructs_1.Construct {
                     // @ts-expect-error invalid params
                     buildParams: AppTypeConstruct.parse(app.buildParams ?? {}),
                     vpc: props.vpc,
+                    logGroup: props.logGroup,
                     ...app,
                 }),
             ];

package/dist/lib/lambda/types.d.ts

@@ -1,10 +1,12 @@
 import { type ApiResource, AppType, type Attach, type CDNResource, type EventResource, type Grant } from '@fy-stack/types';
 import type { IVpc } from 'aws-cdk-lib/aws-ec2';
-import type { Function } from 'aws-cdk-lib/aws-lambda';
-import { Queue } from 'aws-cdk-lib/aws-sqs';
+import type { Function, FunctionProps } from 'aws-cdk-lib/aws-lambda';
+import type { ILogGroup } from 'aws-cdk-lib/aws-logs';
+import type { Queue, QueueProps } from 'aws-cdk-lib/aws-sqs';
 export type LambdaConstructProps = {
     vpc?: IVpc;
     apps: Record<string, App>;
+    logGroup: ILogGroup;
 };
 export interface AppConstruct extends Attach, Grant, CDNResource, EventResource, ApiResource {
     function: Function;
@@ -12,20 +14,15 @@ export interface AppConstruct extends Attach, Grant, CDNResource, EventResource,
 }
 export type App = {
     type: typeof AppType.IMAGE_APP | typeof AppType.NEXT_APP_ROUTER | typeof AppType.NODE_APP | typeof AppType.NODE_API;
-    output: string;
-    env?: Record<string, string>;
-    queue?: {
-        batchSize?: number;
-    };
-    buildParams?: Record<string, unknown>;
-};
+} & Omit<AppProperties, 'vpc' | 'logGroup'>;
 export type AppProperties<BuildParams = Record<string, unknown>> = {
+    logGroup: ILogGroup;
     queue?: {
         batchSize?: number;
-    };
+    } & Partial<QueueProps>;
     env?: Record<string, string>;
     timeout?: number;
-    buildParams: BuildParams;
+    buildParams: BuildParams & Partial<FunctionProps>;
     output: string;
     vpc?: IVpc;
 };

package/dist/lib/lambda/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/lib/lambda/types.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,WAAW,EAChB,OAAO,EACP,KAAK,MAAM,EACX,KAAK,WAAW,EAChB,KAAK,aAAa,EAClB,KAAK,KAAK,EACX,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAE5C,MAAM,MAAM,oBAAoB,GAAG;IACjC,GAAG,CAAC,EAAE,IAAI,CAAC;IACX,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAC3B,CAAC;AAEF,MAAM,WAAW,YACf,SAAQ,MAAM,EACZ,KAAK,EACL,WAAW,EACX,aAAa,EACb,WAAW;IACb,QAAQ,EAAE,QAAQ,CAAC;IACnB,KAAK,CAAC,EAAE,KAAK,CAAC;CACf;AAED,MAAM,MAAM,GAAG,GAAG;IAChB,IAAI,EACA,OAAO,OAAO,CAAC,SAAS,GACxB,OAAO,OAAO,CAAC,eAAe,GAC9B,OAAO,OAAO,CAAC,QAAQ,GACvB,OAAO,OAAO,CAAC,QAAQ,CAAC;IAC5B,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7B,KAAK,CAAC,EAAE;QAAE,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAC/B,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACvC,CAAC;AAEF,MAAM,MAAM,aAAa,CAAC,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI;IACjE,KAAK,CAAC,EAAE;QAAE,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAC/B,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,WAAW,CAAC;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,IAAI,CAAC;CACZ,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/lib/lambda/types.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,WAAW,EAChB,OAAO,EACP,KAAK,MAAM,EACX,KAAK,WAAW,EAChB,KAAK,aAAa,EAClB,KAAK,KAAK,EACX,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,KAAK,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACtE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,KAAK,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAE7D,MAAM,MAAM,oBAAoB,GAAG;IACjC,GAAG,CAAC,EAAE,IAAI,CAAC;IACX,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,QAAQ,EAAE,SAAS,CAAC;CACrB,CAAC;AAEF,MAAM,WAAW,YACf,SAAQ,MAAM,EACZ,KAAK,EACL,WAAW,EACX,aAAa,EACb,WAAW;IACb,QAAQ,EAAE,QAAQ,CAAC;IACnB,KAAK,CAAC,EAAE,KAAK,CAAC;CACf;AAED,MAAM,MAAM,GAAG,GAAG;IAChB,IAAI,EACA,OAAO,OAAO,CAAC,SAAS,GACxB,OAAO,OAAO,CAAC,eAAe,GAC9B,OAAO,OAAO,CAAC,QAAQ,GACvB,OAAO,OAAO,CAAC,QAAQ,CAAC;CAC7B,GAAG,IAAI,CAAC,aAAa,EAAE,KAAK,GAAG,UAAU,CAAC,CAAC;AAE5C,MAAM,MAAM,aAAa,CAAC,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI;IACjE,QAAQ,EAAE,SAAS,CAAC;IACpB,KAAK,CAAC,EAAE;QAAE,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;IACrD,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;IAClD,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,IAAI,CAAC;CACZ,CAAC"}

package/dist/lib/lambda/utils/getDefaultLambda.d.ts

@@ -1,8 +1,5 @@
-import { Duration } from 'aws-cdk-lib';
+import { FunctionProps } from 'aws-cdk-lib/aws-lambda';
+import type { Construct } from 'constructs';
 import { AppProperties } from '../types';
-export declare function getDefaultLambda(props: AppProperties<unknown>): {
-    memorySize: number;
-    timeout: Duration;
-    environment: Record<string, string> | undefined;
-};
+export declare function getDefaultLambda(scope: Construct, props: AppProperties<unknown>): Partial<FunctionProps>;
 //# sourceMappingURL=getDefaultLambda.d.ts.map

package/dist/lib/lambda/utils/getDefaultLambda.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getDefaultLambda.d.ts","sourceRoot":"","sources":["../../../../src/lib/lambda/utils/getDefaultLambda.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAEvC,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEzC,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,aAAa,CAAC,OAAO,CAAC;;;;EAM7D"}
+{"version":3,"file":"getDefaultLambda.d.ts","sourceRoot":"","sources":["../../../../src/lib/lambda/utils/getDefaultLambda.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAiB,MAAM,wBAAwB,CAAC;AACtE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAE5C,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEzC,wBAAgB,gBAAgB,CAC9B,KAAK,EAAE,SAAS,EAChB,KAAK,EAAE,aAAa,CAAC,OAAO,CAAC,0BAgB9B"}

package/dist/lib/lambda/utils/getDefaultLambda.js

@@ -2,10 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getDefaultLambda = getDefaultLambda;
 const aws_cdk_lib_1 = require("aws-cdk-lib");
-function getDefaultLambda(props) {
-    return {
+const aws_lambda_1 = require("aws-cdk-lib/aws-lambda");
+function getDefaultLambda(scope, props) {
+    let params = {
         memorySize: 512,
         timeout: aws_cdk_lib_1.Duration.seconds(props.timeout ?? 30),
         environment: props.env,
     };
+    if (props.logGroup) {
+        params = Object.assign(params, { logGroup: props.logGroup, loggingFormat: aws_lambda_1.LoggingFormat.JSON });
+    }
+    return params;
 }

package/dist/lib/shared/next-app-router.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"next-app-router.d.ts","sourceRoot":"","sources":["../../../src/lib/shared/next-app-router.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,GAAG,MAAM,aAAa,CAAC;AACnC,OAAO,KAAK,UAAU,MAAM,4BAA4B,CAAC;AAEzD,OAAO,KAAK,EAAE,MAAM,oBAAoB,CAAC;AACzC,OAAO,KAAK,QAAQ,MAAM,+BAA+B,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,MAAM,MAAM,OAAO,GAAG;IACpB,WAAW,EAAE,QAAQ,CAAC,OAAO,CAAC;IAC9B,WAAW,EAAE,QAAQ,CAAC,OAAO,CAAC;CAC/B,CAAC;AAEF,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM;;;;;;EAsC9D;AAED,wBAAgB,oBAAoB,CAClC,GAAG,EAAE,SAAS,EACd,YAAY,EAAE,EAAE,CAAC,MAAM,EACvB,YAAY,EAAE,UAAU,CAAC,OAAO,EAChC,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,OAAO;;EA+Df"}
+{"version":3,"file":"next-app-router.d.ts","sourceRoot":"","sources":["../../../src/lib/shared/next-app-router.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,GAAG,MAAM,aAAa,CAAC;AACnC,OAAO,KAAK,UAAU,MAAM,4BAA4B,CAAC;AAEzD,OAAO,KAAK,EAAE,MAAM,oBAAoB,CAAC;AACzC,OAAO,KAAK,QAAQ,MAAM,+BAA+B,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,MAAM,MAAM,OAAO,GAAG;IACpB,WAAW,EAAE,QAAQ,CAAC,OAAO,CAAC;IAC9B,WAAW,EAAE,QAAQ,CAAC,OAAO,CAAC;CAC/B,CAAC;AAEF,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM;;;;;;EAsC9D;AAED,wBAAgB,oBAAoB,CAClC,GAAG,EAAE,SAAS,EACd,YAAY,EAAE,EAAE,CAAC,MAAM,EACvB,YAAY,EAAE,UAAU,CAAC,OAAO,EAChC,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,OAAO;;EA2Df"}

package/dist/lib/shared/next-app-router.js

@@ -46,17 +46,17 @@ function staticDeployment(app, output) {
 }
 function cloudfrontBehaviours(app, staticBucket, serverOrigin, basePath, files) {
     if (basePath) {
-        // redeploy files for apps hosted in sub path
+        const strippedBasePath = basePath.replace(/^\/+|\/+$/g, '');
         new s3Deploy.BucketDeployment(app, `${basePath}StaticDeployment`, {
             destinationBucket: staticBucket,
             sources: [files.staticFiles],
-            destinationKeyPrefix: `${basePath}/_next/static`,
+            destinationKeyPrefix: `${strippedBasePath}/_next/static/`,
             retainOnDelete: false,
         });
         new s3Deploy.BucketDeployment(app, `${basePath}PublicDeployment`, {
             destinationBucket: staticBucket,
             sources: [files.publicFiles],
-            destinationKeyPrefix: basePath,
+            destinationKeyPrefix: `${strippedBasePath}/`,
             retainOnDelete: false,
         });
     }
@@ -86,17 +86,12 @@ function cloudfrontBehaviours(app, staticBucket, serverOrigin, basePath, files)
             .CORS_ALLOW_ALL_ORIGINS_WITH_PREFLIGHT_AND_SECURITY_HEADERS,
     };
     return {
-        [`${basePath}/_next/image`]: {
-            ...appBehaviour,
+        [`${basePath}/_next/image`]: Object.assign({}, appBehaviour, {
             cachePolicy: imageCachePolicy,
             allowedMethods: cloudfront.AllowedMethods.ALLOW_GET_HEAD,
-        },
+        }),
         [`${basePath}/_next/*`]: staticBehavior,
-        [`${basePath}/*.ico`]: staticBehavior,
-        [`${basePath}/*.png`]: staticBehavior,
-        [`${basePath}/*.svg`]: staticBehavior,
-        [`${basePath}/*.jpg`]: staticBehavior,
-        [`${basePath}/*.jpeg`]: staticBehavior,
+        [`${basePath}/*.*`]: staticBehavior,
         [`${basePath}/*`]: appBehaviour,
     };
 }

package/dist/lib/static/apps/static-website-construct.d.ts

@@ -3,14 +3,23 @@ import * as cloudfront from 'aws-cdk-lib/aws-cloudfront';
 import { Construct } from 'constructs';
 import { z } from 'zod';
 import { AppConstruct, AppProperties } from '../types';
-declare const BuildParamsSchema: z.ZodOptional<z.ZodObject<{}, "strip", z.ZodTypeAny, {}, {}>>;
+declare const BuildParamsSchema: z.ZodOptional<z.ZodObject<{
+    spa: z.ZodOptional<z.ZodBoolean>;
+}, "strip", z.ZodTypeAny, {
+    spa?: boolean | undefined;
+}, {
+    spa?: boolean | undefined;
+}>>;
 export declare class StaticWebsiteConstruct extends Construct implements AppConstruct {
+    private props;
     private readonly static;
     constructor(scope: Construct, id: string, props: AppProperties<z.infer<typeof BuildParamsSchema>>);
     cloudfront(path: string): Record<string, cloudfront.BehaviorOptions>;
     cloudfrontPolicy(distributionId: string): void;
     api(): Record<string, HttpRouteIntegration>;
-    static parse(params: unknown): {} | undefined;
+    static parse(params: unknown): {
+        spa?: boolean | undefined;
+    } | undefined;
 }
 export {};
 //# sourceMappingURL=static-website-construct.d.ts.map

package/dist/lib/static/apps/static-website-construct.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"static-website-construct.d.ts","sourceRoot":"","sources":["../../../../src/lib/static/apps/static-website-construct.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACpE,OAAO,KAAK,UAAU,MAAM,4BAA4B,CAAC;AAIzD,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEvD,QAAA,MAAM,iBAAiB,+DAA0B,CAAC;AAElD,qBAAa,sBAAuB,SAAQ,SAAU,YAAW,YAAY;IAC3E,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAY;gBAGjC,KAAK,EAAE,SAAS,EAChB,EAAE,EAAE,MAAM,EACV,KAAK,EAAE,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAC;IA2BzD,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,eAAe,CAAC;IAmBpE,gBAAgB,CAAC,cAAc,EAAE,MAAM;IAIvC,GAAG,IAAI,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC;IAI3C,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,OAAO;CAG7B"}
+{"version":3,"file":"static-website-construct.d.ts","sourceRoot":"","sources":["../../../../src/lib/static/apps/static-website-construct.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACpE,OAAO,KAAK,UAAU,MAAM,4BAA4B,CAAC;AAIzD,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEvD,QAAA,MAAM,iBAAiB;;;;;;GAIV,CAAC;AAEd,qBAAa,sBAAuB,SAAQ,SAAU,YAAW,YAAY;IAMzE,OAAO,CAAC,KAAK;IALf,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAY;gBAGjC,KAAK,EAAE,SAAS,EAChB,EAAE,EAAE,MAAM,EACF,KAAK,EAAE,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAC;IA2BjE,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,eAAe,CAAC;IA2DpE,gBAAgB,CAAC,cAAc,EAAE,MAAM;IAIvC,GAAG,IAAI,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC;IAI3C,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,OAAO;;;CAG7B"}

package/dist/lib/static/apps/static-website-construct.js

@@ -9,11 +9,17 @@ const s3 = tslib_1.__importStar(require("aws-cdk-lib/aws-s3"));
 const s3Deploy = tslib_1.__importStar(require("aws-cdk-lib/aws-s3-deployment"));
 const constructs_1 = require("constructs");
 const zod_1 = require("zod");
-const BuildParamsSchema = zod_1.z.object({}).optional();
+const BuildParamsSchema = zod_1.z
+    .object({
+    spa: zod_1.z.boolean().optional(),
+})
+    .optional();
 class StaticWebsiteConstruct extends constructs_1.Construct {
+    props;
     static;
     constructor(scope, id, props) {
         super(scope, id);
+        this.props = props;
         this.static = new s3.Bucket(this, `StaticBucket`, {
             removalPolicy: cdk.RemovalPolicy.DESTROY,
             autoDeleteObjects: true,
@@ -45,8 +51,45 @@ class StaticWebsiteConstruct extends constructs_1.Construct {
             compress: true,
             viewerProtocolPolicy: cloudfront.ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
         };
+        let staticPageBehaviour = Object.assign({}, staticBehavior);
+        if (this.props.buildParams?.spa) {
+            const spaRewriteFunction = new cloudfront.Function(this, 'SpaRewrite', {
+                code: cloudfront.FunctionCode.fromInline(`
+        function handler(event) {
+          var request = event.request
+          
+          if (!request.uri.endsWith('/')) {
+            return {
+              statusCode: 301,
+              statusDescription: 'Moved Permanently',
+              headers: {
+                  location: {
+                      value: request.uri + '/'
+                  }
+              }
+            }
+          }
+          
+          if (request.uri !== "${path || '/'}") {
+            request.uri = '/index.html'
+          }
+        
+          return request;
+        }
+      `),
+            });
+            staticPageBehaviour = Object.assign(staticPageBehaviour, {
+                functionAssociations: [
+                    {
+                        eventType: cloudfront.FunctionEventType.VIEWER_REQUEST,
+                        function: spaRewriteFunction,
+                    },
+                ],
+            });
+        }
         return {
-            [`${path}/*`]: staticBehavior,
+            [`${path}/*.*`]: staticBehavior,
+            [`${path}/*`]: staticPageBehaviour,
         };
     }
     cloudfrontPolicy(distributionId) {

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@fy-stack/app-construct",
-  "version": "0.0.145",
+  "version": "0.0.147-0-preview",
   "repository": "https://github.com/festusyuma/fy-stack",
   "dependencies": {
-    "@fy-stack/types": "0.0.145",
+    "@fy-stack/types": "0.0.147-0-preview",
     "tslib": "^2.3.0",
     "zod": "^3.24.1"
   },