Add custom live domain support

Author: jeremydw

app.yaml

@@ -1,4 +1,4 @@
 google_cloud_project: <AppId>
 site: <SiteId>
 schedule:
-  default: master
+  default: master

example/fileset.yaml

@@ -1,2 +1,6 @@
 service: fileset
-runtime: nodejs10
+runtime: nodejs10
+env_variables:
+  FILESET_SITE: default
+  FILESET_LIVE_DOMAIN: example.com
+  FILESET_STAGING_DOMAIN: {ref}.staging.example.com

example/server/app.yaml

@@ -4,11 +4,28 @@ import {ExecutionContext} from 'ava';
 import test from 'ava';
 
 test('Test parseHostname', (t: ExecutionContext) => {
+  // App Engine wildcard domain.
   t.deepEqual(
     server.parseHostname('sitename-refname-dot-fileset2-dot-appid.appspot.com'),
     {
       siteId: 'sitename',
       branchOrRef: 'refname',
     }
   );
+  // Custom live domain.
+  t.deepEqual(
+    server.parseHostname('example.com', 'example', 'example.com'),
+    {
+      siteId: 'example',
+      branchOrRef: 'master',
+    }
+  );
+  // Some other domain.
+  t.deepEqual(
+    server.parseHostname('something.com', 'example', 'example.com'),
+    {
+      siteId: 'example',
+      branchOrRef: '',
+    }
+  );
 });

src/server.test.ts

@@ -51,21 +51,24 @@ const getManifest = async (siteId: string, branchOrRef: string) => {
   // }
 };
 
-export function parseHostname(hostname: string) {
-  // TODO: Make this more robust
-  if (hostname.includes('-dot-')) {
-    const prefix = hostname.split('-dot-fileset2-')[0];
-    const parts = prefix.split('-'); // Either site-ref or site.
-    return {
-      siteId: parts[0],
-      branchOrRef: parts.length > 1 ? parts[1].slice(0, 7) : 'master',
-    };
-  } else {
-    return {
-      siteId: '',
-      branchOrRef: '',
-    };
+export function parseHostname(hostname: string, defaultSiteId?: string, defaultLiveDomain?: string) {
+  let siteId = defaultSiteId || 'default';
+  let branchOrRef = '';
+  if (hostname == defaultLiveDomain) {
+    // Hostname is the "live" or "prod" domain. Use the master branch.
+    branchOrRef = 'master';
+  } else if (hostname.includes('-dot-')) {
+    // Use "-dot-" as a sentinel for App Engine wildcard domains.
+    const prefix = hostname.split('-dot-')[0];
+    const parts = prefix.split('-'); // Either <Site>-<Ref> or <Site>.
+    siteId = parts[0];
+    branchOrRef = parts.length > 1 ? parts[1].slice(0, 7) : 'master';
   }
+  // TODO: Implement defaultStagingDomain (custom staging domain) support.
+  return {
+    siteId: siteId,
+    branchOrRef: branchOrRef,
+  };
 }
 
 export function createApp(siteId: string, branchOrRef: string) {
@@ -74,7 +77,7 @@ export function createApp(siteId: string, branchOrRef: string) {
   const app = express();
   app.disable('x-powered-by');
   app.all('/*', async (req: express.Request, res: express.Response) => {
-    const envFromHostname = parseHostname(req.hostname);
+    const envFromHostname = parseHostname(req.hostname, process.env.FILESET_SITE, process.env.FILESET_LIVE_DOMAIN);
     const requestSiteId = envFromHostname.siteId || siteId;
     const requestBranchOrRef = envFromHostname.branchOrRef || branchOrRef;