more speaker list bits

Author: crtr0

.arc-env-example

@@ -1,6 +1,6 @@
 # .arc-env
 @testing
 BEGIN_STATIC_ORIGIN /_static
-CARTER_RULES foo
+ADMIN_PASSWORD foo
 TITO_WEBHOOK_KEY abcd1234
 SLACK_JOIN_URL https://join.slack.com/t/cascadiajs/shared_invite/foo

app.arc

@@ -9,10 +9,13 @@ fingerprint true
 src src/views
 
 @http
-get /changelog
-get /admin
+get  /admin
+get  /changelog
+get  /modules/:type/:module
+get  /speakers
+get  /speakers/:key
 post /login
-post /upload
+post /speakers
 get /*
 
 @tables

package-lock.json

@@ -20,7 +20,9 @@
   },
   "dependencies": {
     "@architect/functions": "^3.14.1",
+    "esm": "^3.2.25",
     "front-matter": "^4.0.2",
-    "marked": "^2.0.6"
+    "marked": "^2.0.6",
+    "rollup": "^2.56.2"
   }
 }

package.json

@@ -25,7 +25,7 @@ async function uploadSpeakers(env, password) {
     let cookie = login.headers.get('set-cookie')
 
     // upload the speakers
-    let speakers = await fetch(`${url}/upload`, {
+    let speakers = await fetch(`${url}/speakers`, {
         method: 'POST',
         headers: {cookie, 'Content-Type': 'application/json'},
         body:    JSON.stringify(speakerData),

scripts/upload-speakers.js

@@ -13,17 +13,20 @@ exports.handler = arc.http.async(unauthenticated, authenticated)
 async function unauthenticated(req) {
   if (req.session.loggedIn) return
   else {
-    let form = `<form action=/login method=post>
-      <input type=password name=password>
-    </form>`
+    let form = `
+      <h1>Please log-in</h1>
+      <form action=/login method=post>
+        <input type=password name=password>
+        <input type=submit value=Log-In>
+      </form>`
     let html = layout(form)
     return { html }
   }
 }
 
 /** render the speaker list/form */
 async function authenticated(req) {
-  let speakerData = await data.get({ table: 'speakers', limit: 24 })
+  let speakerData = await data.get({ table: 'speakers', limit: 20 })
   if (req.query.export === 'speakers') {
     return { json: speakerData }
   }

src/http/get-admin/index.js

@@ -0,0 +1,15 @@
+const { rollup } = require('rollup')
+const path = require('../cache/cache-path')
+const write = require('../cache/cache-write')
+
+module.exports = async function bundle({ type, mod }) {
+  console.time('bundle')
+  let key = `${type}/${mod}`
+  let input = path(key)
+  let bundle = await rollup({ input })
+  let bundled = await bundle.generate({ format: 'esm' })
+  let body = bundled.output[0].code
+  console.timeEnd('bundle')
+
+  return write({ key, body, type })
+}

src/http/get-modules-000type-000module/bundle/index.js

@@ -0,0 +1,5 @@
+const { join } = require('path')
+
+module.exports = function cachePath (filename) {
+  return join(process.cwd(), 'node_modules', '@architect', 'views', 'modules', filename)
+}

src/http/get-modules-000type-000module/cache/cache-path.js

@@ -0,0 +1,29 @@
+const { existsSync } = require('fs')
+const data = require('@begin/data')
+const path = require('./cache-path')
+
+module.exports = async function read({ type, mod }) {
+  let key = `${type}/${mod}`
+
+  // Get the cache contents
+  let cache = await data.get({ table: 'module-cache' })
+
+  // Fingerprinted requests
+  let file = cache.length && cache.find(f => mod === f.filename && type === f.type) || false
+
+  // Non-fingerprinted requests
+  let forward = cache.find(f => key === f.key)
+  let upgrade = false
+  if (forward && forward.filename) {
+    // If the build changed (or working locally) kick off a bundle
+    let build = process.env.BEGIN_BUILD_COMMIT_SHA
+    if (!build || (forward.build !== build)) return {}
+    upgrade = forward.filename
+  }
+
+  // Look for the entry file on the filesystem to ensure validity
+  if (!file && !existsSync(path(key)))
+    throw ReferenceError(`not_found: ${ key }`)
+
+  return { file, upgrade }
+}

src/http/get-modules-000type-000module/cache/cache-read.js

@@ -0,0 +1,34 @@
+const data = require('@begin/data')
+const crypto = require('crypto')
+
+module.exports = async function write ({ key, body, type }) {
+
+  // Fingerprint it
+  console.time('fingerprint')
+  let hash = crypto.createHash('sha1')
+  hash.update(Buffer.from(body))
+  let sha = hash.digest('hex').substr(0, 7)
+  let [file, extension] = key.split('/').slice(0).reverse().shift().split('.')
+  let filename = `${ file }-${ sha }.${ extension }`
+  console.timeEnd('fingerprint')
+
+  // Cache it
+  console.time('begin-data-cache')
+  let bundle = {
+    table: 'module-cache',
+    key,
+    type,
+    filename,
+    body,
+    headers: {
+      'content-type': `text/${ extension === 'js' ? 'javascript' : 'css' }; charset=UTF-8`,
+      'cache-control': 'max-age=315360000'
+    },
+  }
+  let build = process.env.BEGIN_BUILD_COMMIT_SHA
+  if (build) bundle.build = build
+  await data.set(bundle)
+  console.timeEnd('begin-data-cache')
+
+  return filename
+}

src/http/get-modules-000type-000module/cache/cache-write.js

@@ -0,0 +1,53 @@
+const read = require('./cache/cache-read')
+const bundle = require('./bundle')
+const waterfall = require('./responses/200')
+const redirect = require('./responses/302')
+const notfound = require('./responses/404')
+const fatal = require('./responses/500')
+
+/**
+ * Progressive bundling endpoint
+ * - Receives a plain entry file request ......... `/modules/entry/speakers.js`
+ * - And upgrades it to a fingerprinted bundle ... `/modules/entry/speakers-ea4b26c.js`
+ */
+exports.handler = async function http (req) {
+  let { type, module: mod } = req.pathParameters
+  let debug = process.env.DEBUG
+
+  try {
+    if (debug) {
+      return waterfall(req)
+    }
+    else {
+      // Check to see if file is already in the bundle cache
+      let { file, upgrade } = await read({ type, mod })
+
+      // If we found the file, deliver it
+      if (file) {
+        let { body, headers } = file
+        return {
+          statusCode: 200,
+          body,
+          headers
+        }
+      }
+
+      // If this is a valid request against a cache hit, upgrade to the bundle
+      if (upgrade) {
+        return redirect(upgrade)
+      }
+
+      // Otherwise, bundle it
+      else {
+        let fingerprinted = await bundle({ type, mod })
+        return redirect(fingerprinted)
+      }
+    }
+  }
+  catch(err) {
+    if (err.message.includes('not_found')) {
+      return notfound(`${type}/${mod}`)
+    }
+    return fatal(err)
+  }
+}

src/http/post-upload/config.arc src/http/get-modules-000type-000module/config.arc

@@ -0,0 +1,18 @@
+const { promisify } = require('util')
+const fs = require('fs')
+const readFile = promisify(fs.readFile)
+const join = require('path').join
+
+module.exports = async function ok (req) {
+  let { type, module: mod } = req.pathParameters
+  let requested = join(process.cwd(), 'node_modules', '@architect', 'views', 'modules', type, mod)
+  let js = await readFile(requested)
+
+  return {
+    statusCode: 200,
+    headers: {
+      'content-type': 'text/javascript; charset=utf8'
+    },
+    body: js.toString()
+  }
+}

src/http/get-modules-000type-000module/index.js

@@ -0,0 +1,9 @@
+module.exports = function redirect (location) {
+  return {
+    statusCode: 302,
+    headers: {
+      location,
+      'cache-control': 'no-cache, no-store, must-revalidate, max-age=0, s-maxage=0'
+    }
+  }
+}

src/http/get-modules-000type-000module/responses/200.js

@@ -0,0 +1,9 @@
+module.exports = function notfound (file) {
+  return {
+    statusCode: 404,
+    headers: {
+      'content-type': 'text/html; charset=utf8'
+    },
+    body: `404 not found: /modules/${ file }`
+  }
+}

src/http/get-modules-000type-000module/responses/302.js

@@ -0,0 +1,10 @@
+module.exports = function error (err) {
+  console.error(err)
+  return {
+    statusCode: 500,
+    headers: {
+      'content-type': 'text/html; charset=utf8'
+    },
+    body: `500 / ssr render error: ${err.message}`
+  }
+}

src/http/get-modules-000type-000module/responses/404.js

@@ -0,0 +1,5 @@
+@aws
+runtime nodejs12.x
+# memory 1152
+# timeout 30
+# concurrency 1

src/http/get-modules-000type-000module/responses/500.js

@@ -0,0 +1,15 @@
+let arc = require('@architect/functions')
+const getSpeakerData = require('@architect/shared/data/get-speaker-data')
+const SpeakerView = require('@architect/views/speaker')
+
+async function Speaker(req) {
+  const { key } = req.params
+  const { social } = req.queryStringParameters
+  const { speakers } = getSpeakerData(req)
+  const speaker = speakers.find(s => s.key === key)
+
+  return await SpeakerView({speaker, social})
+
+}
+
+exports.handler = arc.http.async(Speaker)

src/http/get-speakers-000key/config.arc

@@ -0,0 +1,5 @@
+@aws
+runtime nodejs12.x
+# memory 1152
+# timeout 30
+# concurrency 1