wirejs-deploy-amplify-basic 0.1.169 → 0.1.171

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

@@ -2,6 +2,7 @@ import { env } from 'process';
 import { LambdaFunctionURLHandler, APIGatewayProxyEventV2 } from 'aws-lambda';
 import {
 	BackgroundJob,
+	CronJob,
 	CookieJar,
 	Context,
 	Endpoint,
@@ -144,6 +145,30 @@ function byPathLength(a: Endpoint, b: Endpoint) {
 }
 
 export const handler: LambdaFunctionURLHandler = async (event) => {
+	// Handle EventBridge-scheduled CronJob invocations.
+	// EventBridge events have a 'source' field; Lambda Function URL events do not.
+	if ((event as any).source === 'wirejs-cron') {
+		const cronEvent = event as any;
+		const absoluteId: string | undefined = cronEvent['wirejs-cron-id'];
+
+		if (!absoluteId) {
+			console.error('Missing wirejs-cron-id in scheduled event');
+			return { statusCode: 400, body: JSON.stringify({ error: 'Missing wirejs-cron-id' }) };
+		}
+
+		console.log('handling scheduled cron job', absoluteId);
+
+		const entry = (CronJob as any).registeredJobs.get(absoluteId);
+		if (!entry || typeof entry.handler !== 'function') {
+			console.error('CronJob not found', absoluteId, [...(CronJob as any).registeredJobs.keys()]);
+			return { statusCode: 404, body: JSON.stringify({ error: 'CronJob not found' }) };
+		}
+
+		await entry.handler();
+
+		return { statusCode: 200, body: JSON.stringify({ message: 'CronJob complete' }) };
+	}
+
 	const calls = event.body ? JSON.parse(event.body) : undefined;
 	const wjsContext = createContext(event);
 	const path = wjsContext?.location.pathname;

package/amplify-backend-assets/backend.ts

@@ -14,6 +14,8 @@ import { NodejsFunction, OutputFormat } 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';
+import { Rule, RuleTargetInput, Schedule } from 'aws-cdk-lib/aws-events';
+import { LambdaFunction as LambdaFunctionTarget } from 'aws-cdk-lib/aws-events-targets';
 
 import { TableDefinition, indexName, DeploymentConfig } from 'wirejs-resources';
 import { TableIndexes } from './constructs/table-indexes';
@@ -224,6 +226,51 @@ for (const resource of generated) {
 }
 
 
+/**
+ * Converts a standard 5-field cron expression to an AWS EventBridge Schedule.
+ *
+ * Standard cron: "minute hour day-of-month month day-of-week"
+ * EventBridge cron: "minute hour day-of-month month day-of-week year"
+ * EventBridge additionally requires that day-of-month and day-of-week cannot
+ * both be specified at the same time (one must be `?`).
+ */
+function cronExpressionToSchedule(expression: string): Schedule {
+  const [minute, hour, dayOfMonth, month, dayOfWeek] = expression.trim().split(/\s+/);
+  // EventBridge requires exactly one of day-of-month or day-of-week to be '?'.
+  // If neither is wildcarded, prefer keeping day-of-month and set weekday to '?'.
+  const ebDayOfMonth = dayOfWeek !== '*' && dayOfWeek !== '?' ? '?' : dayOfMonth;
+  const ebDayOfWeek  = ebDayOfMonth === '?' ? dayOfWeek : '?';
+  return Schedule.cron({ minute, hour, day: ebDayOfMonth, month, weekDay: ebDayOfWeek });
+}
+
+/**
+ * EventBridge rules for CronJobs
+ */
+function isCronJob(resource: any): resource is {
+  type: 'CronJob';
+  options: { absoluteId: string; schedule: string };
+} {
+  return resource.type === 'CronJob';
+}
+
+for (const resource of generated) {
+  if (isCronJob(resource)) {
+    const sanitizedId = resource.options.absoluteId.replace(/[^a-zA-Z0-9-_]/g, '_');
+    new Rule(backend.stack, `CronJob_${sanitizedId}`, {
+      schedule: cronExpressionToSchedule(resource.options.schedule),
+      targets: [
+        new LambdaFunctionTarget(api, {
+          event: RuleTargetInput.fromObject({
+            source: 'wirejs-cron',
+            'wirejs-cron-id': resource.options.absoluteId,
+          }),
+        }),
+      ],
+    });
+  }
+}
+
+
 /**
  * Lambda environment vars
  */

package/amplify-hosting-assets/compute/default/index.js

@@ -305,14 +305,15 @@ async function tryEndpointPath(context, res) {
  */
 async function proxyRequest(context, res, targetUrl) {
 	const method = context.httpMethod;
+	const parsedUrl = new URL(targetUrl);
 	const headers = {
 		...context.requestHeaders,
+		'host': parsedUrl.hostname,
 		'x-wirejs-location': context.location.toString()
 	};
 	const body = context.requestBody;
 
 	try {
-		const parsedUrl = new URL(targetUrl);
 		const isHttps = parsedUrl.protocol === 'https:';
 		const requester = isHttps ? https : http;
 

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.169"
+		"wirejs-resources": "^0.1.171"
 	}
 }

package/dist/index.d.ts

@@ -5,4 +5,5 @@ export { LLM } from './services/llm.js';
 export { DistributedTable } from './resources/distributed-table.js';
 export { RealtimeService } from './services/realtime.js';
 export { BackgroundJob } from './resources/background-job.js';
+export { CronJob } from './resources/cron-job.js';
 export { Endpoint } from './resources/endpoint.js';

package/dist/index.js

@@ -14,11 +14,14 @@ import { RealtimeService } from './services/realtime.js';
 export { RealtimeService } from './services/realtime.js';
 import { BackgroundJob } from './resources/background-job.js';
 export { BackgroundJob } from './resources/background-job.js';
+import { CronJob } from './resources/cron-job.js';
+export { CronJob } from './resources/cron-job.js';
 import { Endpoint } from './resources/endpoint.js';
 export { Endpoint } from './resources/endpoint.js';
 // expose resources to other resources that might depend on it.
 overrides.AuthenticationService = AuthenticationService;
 overrides.BackgroundJob = BackgroundJob;
+overrides.CronJob = CronJob;
 overrides.DistributedTable = DistributedTable;
 overrides.Endpoint = Endpoint;
 overrides.FileService = FileService;

package/dist/resources/cron-job.d.ts

@@ -0,0 +1,30 @@
+import { Resource, CronJob as BaseCronJob } from 'wirejs-resources';
+export type CronJobDefinition = {
+    absoluteId: string;
+    schedule: string;
+};
+/**
+ * A function that will be executed on a recurring schedule defined by a cron expression.
+ *
+ * In AWS deployments, the schedule is managed by Amazon EventBridge.
+ *
+ * A `CronJob` can also invoke an existing BackgroundJob from its handler.
+ *
+ * ## WARNINGS
+ *
+ * 1. These jobs execute in a completely different environment that the one that defines it.
+ * DO NOT depend on global variables, closures, or other process state that is not lazily
+ * created or constructed in-place by the script.
+ * 2. In local development, **timeouts are not enforced.** (Yet.)
+ */
+export declare class CronJob extends Resource implements Omit<BaseCronJob, '#private'> {
+    static registeredJobs: Map<string, {
+        schedule: string;
+        handler: () => Promise<void>;
+    }>;
+    readonly schedule: string;
+    constructor(scope: Resource | string, id: string, options: {
+        schedule: string;
+        handler: () => Promise<void>;
+    });
+}

package/dist/resources/cron-job.js

@@ -0,0 +1,32 @@
+import { Resource, } from 'wirejs-resources';
+import { addResource } from '../resource-collector.js';
+/**
+ * A function that will be executed on a recurring schedule defined by a cron expression.
+ *
+ * In AWS deployments, the schedule is managed by Amazon EventBridge.
+ *
+ * A `CronJob` can also invoke an existing BackgroundJob from its handler.
+ *
+ * ## WARNINGS
+ *
+ * 1. These jobs execute in a completely different environment that the one that defines it.
+ * DO NOT depend on global variables, closures, or other process state that is not lazily
+ * created or constructed in-place by the script.
+ * 2. In local development, **timeouts are not enforced.** (Yet.)
+ */
+export class CronJob extends Resource {
+    static registeredJobs = new Map();
+    schedule;
+    constructor(scope, id, options) {
+        super(scope, id);
+        this.schedule = options.schedule;
+        addResource('CronJob', {
+            absoluteId: this.absoluteId,
+            schedule: options.schedule,
+        });
+        CronJob.registeredJobs.set(this.absoluteId, {
+            schedule: options.schedule,
+            handler: options.handler,
+        });
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wirejs-deploy-amplify-basic",
-	"version": "0.1.169",
+	"version": "0.1.171",
 	"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.169"
+		"wirejs-resources": "^0.1.171"
 	},
 	"devDependencies": {
 		"@aws-amplify/backend": "^1.14.0",