Get it working with either branches or commit shas

Author: jeremydw

src/commands/serve.ts

@@ -1,22 +1,19 @@
-import {getGitData} from '../gitdata';
 import {createApp} from '../server';
 
 interface ServeOptions {
   site: string;
-  ref: string;
-  branch: string;
+  ref?: string;
 }
 
 export class ServeCommand {
   constructor(private readonly options: ServeOptions) {
     this.options = options;
   }
 
-  run() {
+  async run() {
     const app = createApp(
       this.options.site || 'default',
-      this.options.ref || '',
-      this.options.branch || ''
+      this.options.ref || ''
     );
     const PORT = process.env.PORT || 8080;
     app.listen(PORT, () => {

src/index.ts

@@ -20,12 +20,11 @@ program
   });
 
 program
-  .command('serve [dir]')
+  .command('serve')
   .description('Runs the server')
-  .option('-r, --ref <ref>', 'ref', '')
   .option('-s, --site <site>', 'site', '')
-  .option('-b, --branch <branch>', 'branch', '')
-  .action((path, options) => {
+  .option('-r, --ref <ref>', 'ref', '')
+  .action(options => {
     const cmd = new ServeCommand(options);
     cmd.run();
   });

src/server.ts

@@ -3,6 +3,7 @@ import {GoogleAuth} from 'google-auth-library';
 import * as fsPath from 'path';
 import express = require('express');
 import httpProxy = require('http-proxy');
+import { Manifest } from './manifest';
 
 const URL = 'https://storage.googleapis.com';
 const datastore = new Datastore();
@@ -15,23 +16,27 @@ interface ManifestCache {
   [requestSha: string]: string;
 }
 
-const downloadManifest = async (shortsha: string) => {
-  const key = datastore.key(['Fileset2Manifest', shortsha]);
-  const entity = await datastore.get(key);
-  if (!entity || !entity[0]) {
+const downloadManifest = async (branchOrRef: string) => {
+  const keys = [
+    datastore.key(['Fileset2Manifest', branchOrRef]),
+    datastore.key(['Fileset2Manifest', `branch:${branchOrRef}`]),
+  ];
+  const resp = await datastore.get(keys);
+  if (!resp || !resp[0]) {
     return;
   }
-  const paths = entity[0].paths;
-  return paths;
+  const entities = resp[0];
+  return entities[0] || entities[1];
 };
 
 const parseHostname = (hostname: string) => {
   // TODO: Make this more robust
   if (hostname.includes('-dot-')) {
-    const parts = hostname.split('-dot-');
+    const prefix = hostname.split('-dot-fileset2-')[0];
+    const parts = prefix.split('-'); // Either site-ref or site.
     return {
       siteId: parts[0],
-      branchOrRef: parts[1].slice(0, 7),
+      branchOrRef: parts.length > 1 ? parts[1].slice(0, 7) : 'master',
     };
   } else {
     return {
@@ -41,30 +46,30 @@ const parseHostname = (hostname: string) => {
   }
 };
 
-export function createApp(siteId: string, shortsha: string, branch: string) {
-  // const startupManifest = await downloadManifest(shortsha);
-  console.log(`Starting server for site: ${siteId} @ ${branch}`);
+export function createApp(siteId: string, branchOrRef: string) {
+  // const startupManifest = await downloadManifest(branchOrRef);
+  console.log(`Starting server for site: ${siteId} @ ${branchOrRef}`);
 
   const app = express();
   app.disable('x-powered-by');
   app.all('/*', async (req: express.Request, res: express.Response) => {
     const envFromHostname = parseHostname(req.hostname);
     const requestSiteId = envFromHostname.siteId || siteId;
-    const requestSha = envFromHostname.branchOrRef || shortsha;
-    const requestBranch = envFromHostname.branchOrRef || branch;
+    const requestBranchOrRef = envFromHostname.branchOrRef || branchOrRef;
 
     let blobPath = decodeURIComponent(req.path);
     if (blobPath.endsWith('/')) {
       blobPath += 'index.html';
     }
 
-    const manifest = await downloadManifest(requestSha);
+    const manifest = await downloadManifest(requestBranchOrRef);
+    const manifestPaths = manifest.paths;
 
-    if (!manifest) {
+    if (!manifestPaths) {
       res.sendStatus(404);
       return;
     }
-    const blobKey = manifest[blobPath];
+    const blobKey = manifestPaths[blobPath];
     const updatedUrl = `/wing-prod.appspot.com/fileset/sites/${requestSiteId}/blobs/${blobKey}`;
 
     // TODO: Add custom 404 support based on site config.
@@ -100,7 +105,7 @@ export function createApp(siteId: string, shortsha: string, branch: string) {
       // This also can't be a very small value, as it kills perf. 0036 seems to work correctly.
       proxyRes.headers['cache-control'] = 'public, max-age=0036';  // The padded 0036 keeps the content length the same per upload.ts.
       proxyRes.headers['x-fileset-blob'] = blobKey;
-      proxyRes.headers['x-fileset-ref'] = requestSha;
+      proxyRes.headers['x-fileset-ref'] = manifest.ref;
       proxyRes.headers['x-fileset-site'] = siteId;
       res.writeHead(proxyRes.statusCode || 200, proxyRes.headers);
     });

src/upload.ts

@@ -5,6 +5,7 @@ import _colors = require('colors');
 
 import {Storage} from '@google-cloud/storage';
 import {Datastore} from '@google-cloud/datastore';
+import {entity} from '@google-cloud/datastore/build/src/entity';
 
 const datastore = new Datastore();
 
@@ -128,26 +129,37 @@ export async function uploadManifest(
   }
 }
 
-async function finalize(manifest: Manifest) {
-  const key = datastore.key(['Fileset2Manifest', manifest.shortSha]);
-  const pathsToHashes = manifest.toJSON();
-  const entity = {
+function createEntity(key: entity.Key, manifest: Manifest) {
+  return {
     key: key,
     excludeFromIndexes: ['paths'],
     data: {
       created: new Date(),
       ref: manifest.ref,
-      paths: pathsToHashes,
+      branch: manifest.branch,
+      paths: manifest.toJSON(),
     },
   };
-  await datastore.save(entity);
+}
+
+async function finalize(manifest: Manifest) {
+  const key = datastore.key(['Fileset2Manifest', manifest.shortSha]);
+  const ent = createEntity(key, manifest);
+  await datastore.save(ent);
+
+  if (manifest.branch) {
+    const branchKey = datastore.key([
+      'Fileset2Manifest',
+      `branch:${manifest.branch}`,
+    ]);
+    const branchEnt = createEntity(branchKey, manifest);
+    await datastore.save(branchEnt);
+  }
+
   console.log(
     `Finalized upload for site: ${manifest.site} -> ${manifest.branch} @ ${manifest.shortSha}`
   );
   console.log(
-    `Staged: https://${manifest.site}-dot-${manifest.shortSha}-dot-fileset2-dot-${process.env.GCLOUD_PROJECT}.appspot.com`
+    `Staged: https://${manifest.site}-${manifest.shortSha}-dot-fileset2-dot-${process.env.GCLOUD_PROJECT}.appspot.com`
   );
-
-  if (manifest.branch) {
-  }
 }