WIP

Author: ofhouse

docs/routing.txt

@@ -0,0 +1,14 @@
+## Phases
+
+1. filesystem
+   Check if the file exists in the filesystem
+2. resource
+   Don't know
+3. miss
+   Don't know
+4. rewrite
+   Rules for rewriting the route
+5. hit
+   Don't know
+6. error
+   Don't know

examples/next-image/main.tf

@@ -21,7 +21,7 @@ provider "aws" {
 }
 
 module "tf_next" {
-  source = "dealmore/next-js/aws"
+  # source = "dealmore/next-js/aws"
 
   deployment_name = "terraform-next-js-example-image"
 
@@ -30,8 +30,8 @@ module "tf_next" {
   }
 
   # Uncomment when using in the cloned monorepo for tf-next development
-  # source = "../.."
-  # debug_use_local_packages = true
+  source = "../.."
+  debug_use_local_packages = true
 }
 
 output "cloudfront_domain_name" {

jest.e2e.config.js

@@ -8,7 +8,4 @@ module.exports = {
     '<rootDir>/test/**/__tests__/**/*.[jt]s?(x)',
     '<rootDir>/test/**/?(*.)+(spec|test).[jt]s?(x)',
   ],
-  // We use an increased timeout here because in the worst case
-  // AWS SAM needs to download a docker image before the test can run
-  testTimeout: 60000,
 };

package.json

@@ -18,15 +18,18 @@
     "@types/hjson": "^2.4.2",
     "@types/jest": "^26.0.19",
     "@types/node": "^14.0.0",
+    "@types/unzipper": "^0.10.3",
     "aws-sdk": "*",
     "dotenv": "^8.2.0",
+    "etl": "^0.6.12",
     "fs-extra": "^9.1.0",
     "hjson": "^3.2.2",
     "jest": "^26.6.3",
     "prettier": "^2.0.5",
     "tmp": "^0.2.1",
     "ts-jest": "^26.5.5",
-    "typescript": "^4.2.4"
+    "typescript": "^4.2.4",
+    "unzipper": "^0.10.11"
   },
   "resolutions": {
     "aws-sdk": "2.804.0",

packages/proxy/src/__test__/handler.test.ts

@@ -925,4 +925,124 @@ describe('[proxy] Handler', () => {
     },
     TIMEOUT
   );
+
+  const staticFileRoutingProbes = [
+    // ['/en/dynamic/hello', '/en/dynamic/[slug]'],
+    // ['/en-US/dynamic/hello', '/en-US/dynamic/[slug]'],
+    // ['/fr-BE/dynamic/hello', '/fr-BE/dynamic/[slug]'],
+    // ['/fr/dynamic/hello', '/fr/dynamic/[slug]'],
+    // ['/nl-BE/dynamic/hello', '/nl-BE/dynamic/[slug]'],
+    // ['/nl-NL/dynamic/hello', '/nl-NL/dynamic/[slug]'],
+    // ['/nl/dynamic/hello', '/nl/dynamic/[slug]'],
+    ['/hello.txt', '/hello.txt'],
+  ];
+  test.each(staticFileRoutingProbes)(
+    'i18n: Correct static file routing %s -> %s',
+    async (requestPath, targetPath) => {
+      const proxyConfig: ProxyConfig = {
+        staticRoutes: [
+          '/en-US/dynamic/[slug]',
+          '/en/dynamic/[slug]',
+          '/fr-BE/dynamic/[slug]',
+          '/fr/dynamic/[slug]',
+          '/nl-BE/dynamic/[slug]',
+          '/nl-NL/dynamic/[slug]',
+          '/nl/dynamic/[slug]',
+          '/hello.txt',
+        ],
+        lambdaRoutes: [],
+        routes: [
+          {
+            src:
+              '^/(?!(?:_next/.*|en\\-US|nl\\-NL|nl\\-BE|nl|fr\\-BE|fr|en)(?:/.*|$))(.*)$',
+            dest: '$wildcard/$1',
+            continue: true,
+          },
+
+          {
+            handle: 'filesystem',
+          },
+
+          {
+            handle: 'resource',
+          },
+
+          {
+            handle: 'miss',
+          },
+          {
+            handle: 'rewrite',
+          },
+          {
+            src:
+              '^[/]?(?<nextLocale>en\\-US|nl\\-NL|nl\\-BE|nl|fr\\-BE|fr|en)?/dynamic/(?<slug>[^/]+?)(?:/)?$',
+            dest: '/$nextLocale/dynamic/[slug]?slug=$slug',
+            check: true,
+          },
+        ],
+        prerenders: {},
+      };
+
+      // Prepare configServer
+      configServer.proxyConfig = proxyConfig;
+
+      // Origin Request
+      // https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/lambda-event-structure.html#example-origin-request
+      const event: CloudFrontRequestEvent = {
+        Records: [
+          {
+            cf: {
+              config: {
+                distributionDomainName: 'd111111abcdef8.cloudfront.net',
+                distributionId: 'EDFDVBD6EXAMPLE',
+                eventType: 'origin-request',
+                requestId:
+                  '4TyzHTaYWb1GX1qTfsHhEqV6HUDd_BzoBZnwfnvQc_1oF26ClkoUSEQ==',
+              },
+              request: {
+                clientIp: '203.0.113.178',
+                headers: {},
+                method: 'GET',
+                origin: {
+                  s3: {
+                    customHeaders: {
+                      'x-env-config-endpoint': [
+                        {
+                          key: 'x-env-config-endpoint',
+                          value: configEndpoint,
+                        },
+                      ],
+                      'x-env-api-endpoint': [
+                        {
+                          key: 'x-env-api-endpoint',
+                          value: 'example.localhost',
+                        },
+                      ],
+                    },
+                    region: 'us-east-1',
+                    authMethod: 'origin-access-identity',
+                    domainName: 's3.localhost',
+                    path: '',
+                  },
+                },
+                querystring: '',
+                uri: requestPath,
+              },
+            },
+          },
+        ],
+      };
+
+      const result = (await handler(event)) as CloudFrontRequest;
+
+      expect(result.origin?.s3).toEqual(
+        expect.objectContaining({
+          domainName: 's3.localhost',
+          path: '',
+        })
+      );
+      expect(result.uri).toBe(targetPath);
+    },
+    TIMEOUT
+  );
 });

packages/proxy/src/proxy.ts

@@ -142,6 +142,11 @@ export class Proxy {
         continue;
       }
 
+      // Skip miss phase entirely because we don't support it
+      if (phase === 'miss') {
+        continue;
+      }
+
       // Special case to allow redirect to kick in when a continue route was touched before
       if (phase === 'error' && isContinue) {
         break;
@@ -207,8 +212,10 @@ export class Proxy {
           }
         }
 
-        const keys = [...Object.keys(match.groups ?? {}), 'wildcard'];
+        const keys = [...Object.keys([...match]), 'wildcard'];
         const matches = [...match, wildcard];
+        console.log('keys', keys);
+        console.log('matches', matches);
 
         isContinue = false;
         // The path that should be sent to the target system (lambda or filesystem)