Fixes and improvements for current AWS-provided Node runtimes

.github/workflows/lint-test.yaml

@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        nodejs_version: [ 18, 20, 22 ]
+        nodejs_version: [ 20, 22, 24 ]
 
     steps:
       - name: Checkout

README.md

@@ -50,17 +50,17 @@ http://docs.aws.amazon.com/ses/latest/DeveloperGuide/limits.html
 
 ## Set Up
 
-1. Modify the values in the `config` object at the top of `index.js` to specify
+1. Modify the values in the `config` object at the top of `index.mjs` to specify
 the S3 bucket and object prefix for locating emails stored by SES. Also provide
 the email forwarding mapping from original destinations to new destination.
 
 2. In AWS Lambda, add a new function and skip selecting a blueprint.
 
  - Name the function "SesForwarder" and optionally give it a description. Ensure
- Runtime is set to Node.js 22.x. (Node.js 18.x and 20.x can also be used.)
+ Runtime is set to Node.js 24.x. (Node.js 20.x and 22.x can also be used.)
 
  - For the Lambda function code, either copy and paste the contents of
- `index.js` into the inline code editor or zip the contents of the repository
+ `index.mjs` into the inline code editor or zip the contents of the repository
  and upload them directly or via S3.
 
  - Ensure Handler is set to `index.handler`.
@@ -180,7 +180,7 @@ email forwarding.
 - `log`: A function that accepts log messages for reporting. By default, this is
 set to `console.log`.
 - `steps`: An array of functions that should be executed to process and forward
-the email. See `index.js` for the default set of steps.
+the email. See `index.mjs` for the default set of steps.
 
 See [example](https://github.com/arithmetric/aws-lambda-ses-forwarder/tree/master/example)
 for how to provide configuration as overrides.

eslint.config.mjs

@@ -12,12 +12,12 @@ export default [
     commaDangle: "only-multiline",
   }),
   {
-    files: ["**/*.js"],
+    files: ["**/*.js", "**/*.mjs"],
     languageOptions: {
       globals: {
         ...globals.node,
       },
-      sourceType: "commonjs",
+      sourceType: "module",
     },
     plugins: {
       "@stylistic/js": stylisticJs,

example/index.js

@@ -1,22 +1,19 @@
-var LambdaForwarder = require("aws-lambda-ses-forwarder");
+import { createHandler } from "aws-lambda-ses-forwarder";
 
-exports.handler = function(event, context, callback) {
-  // See aws-lambda-ses-forwarder/index.js for all options.
-  var overrides = {
-    config: {
-      fromEmail: "noreply@example.com",
-      emailBucket: "s3-bucket-name",
-      emailKeyPrefix: "emailsPrefix/",
-      forwardMapping: {
-        "info@example.com": [
-          "example.john@example.com",
-          "example.jen@example.com"
-        ],
-        "abuse@example.com": [
-          "example.jim@example.com"
-        ]
-      }
+// See aws-lambda-ses-forwarder/index.mjs for all options.
+export const handler = createHandler({
+  config: {
+    fromEmail: "noreply@example.com",
+    emailBucket: "s3-bucket-name",
+    emailKeyPrefix: "emailsPrefix/",
+    forwardMapping: {
+      "info@example.com": [
+        "example.john@example.com",
+        "example.jen@example.com"
+      ],
+      "abuse@example.com": [
+        "example.jim@example.com"
+      ]
     }
-  };
-  LambdaForwarder.handler(event, context, callback, overrides);
-};
+  }
+});