feat: large object cache (#220)

Author: michaeldwan

CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.46.0-pre.0](https://github.com/superfly/fly/compare/v0.45.2...v0.46.0-pre.0) (2019-03-07)
+
+**Note:** Version bump only for package fly-root
+
+
+
+
+
 ## [0.45.2](https://github.com/superfly/fly/compare/v0.45.1...v0.45.2) (2019-03-04)
 
 **Note:** Version bump only for package fly-root

tests/apps/volatile-file-cache.js renamed to examples/volatile-file-cache/index.js

@@ -1,9 +1,8 @@
 fly.http.respondWith(async req => {
   const url = new URL(req.url)
   const pathAndSearch = `${url.pathname}${url.search}`
-  const key = pathAndSearch
 
-  const cachedResp = await fetch(`storage://${key}`)
+  const cachedResp = await fetch(`cache://${pathAndSearch}`)
   if (cachedResp.ok) {
     const headers = cachedResp.headers
     headers.set("fly-cache", "hit")
@@ -13,9 +12,9 @@ fly.http.respondWith(async req => {
   const originResp = await fetch(`https://picsum.photos${pathAndSearch}`)
   const [respBody, cacheBody] = originResp.body.tee()
   if (originResp.ok) {
-    fetch(`storage://${key}`, { body: cacheBody, method: "PUT", headers: originResp.headers })
-      .then(ok => console.log(`cached ${key}`))
-      .catch(err => console.warn(`failed to cache ${key}: ${e}`))
+    fetch(`cache://${pathAndSearch}`, { body: cacheBody, method: "PUT", headers: originResp.headers })
+      .then(ok => console.log(`cached ${pathAndSearch}`))
+      .catch(err => console.warn(`failed to cache ${pathAndSearch}: ${e}`))
 
     const headers = originResp.headers
     headers.set("fly-cache", "miss")

lerna.json

@@ -3,7 +3,7 @@
     "packages/*",
     "tests/*"
   ],
-  "version": "0.45.2",
+  "version": "0.46.0-pre.0",
   "npmClient": "yarn",
   "useWorkspaces": true,
   "command": {

packages/core/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.46.0-pre.0](https://github.com/superfly/fly/compare/v0.45.2...v0.46.0-pre.0) (2019-03-07)
+
+**Note:** Version bump only for package @fly/core
+
+
+
+
+
 ## [0.45.2](https://github.com/superfly/fly/compare/v0.45.1...v0.45.2) (2019-03-04)
 
 **Note:** Version bump only for package @fly/core

packages/core/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@fly/core",
-    "version": "0.45.2",
+    "version": "0.46.0-pre.0",
     "license": "Apache-2.0",
     "repository": {
         "type": "git",
@@ -21,7 +21,6 @@
         "@fly/examples": "0.45.0",
         "@fly/v8env": "0.45.1",
         "ansi-colors": "^1.1.0",
-        "aws-sdk": "^2.407.0",
         "axios": "^0.18.0",
         "better-sqlite3": "^4.1.4",
         "bluebird": "^3.5.1",

packages/core/src/bridge/fetch.ts

@@ -12,7 +12,7 @@ import { Runtime } from "../runtime"
 import { streamManager } from "../stream_manager"
 import { isNumber } from "util"
 import { setTimeout } from "timers"
-import { handleStorageRequest } from "./fetch/storage"
+import * as cacheHandler from "./fetch/cache"
 
 const connectionStats = {
   created: 0,
@@ -146,9 +146,9 @@ registerBridge("fetch", function fetchBridge(
     return
   }
 
-  // if (u.protocol === "storage:") {
-  //   return handleStorageRequest(rt, bridge, u, init, body, cb)
-  // }
+  if (u.protocol === cacheHandler.scheme) {
+    return cacheHandler.handleRequest(rt, bridge, u, init, body, cb)
+  }
 
   const httpFn = u.protocol === "http:" ? http.request : https.request
   const httpAgent = u.protocol === "http:" ? fetchAgent : fetchHttpsAgent

packages/core/src/bridge/fetch/storage.ts renamed to packages/core/src/bridge/fetch/cache.ts

@@ -9,9 +9,9 @@ import { Readable } from "stream"
 import { bufferToStream } from "../../utils/buffer"
 import { OutgoingHttpHeaders } from "http"
 
-const scheme = "storage:"
+export const scheme = "cache:"
 
-export function handleStorageRequest(
+export function handleRequest(
   rt: Runtime,
   bridge: Bridge,
   url: UrlWithStringQuery,
@@ -24,6 +24,7 @@ export function handleStorageRequest(
     return
   }
 
+  const ns = rt.app.id.toString()
   const key = url.href!.substring(scheme.length + 2)
 
   if (!key || key === "/") {
@@ -32,8 +33,10 @@ export function handleStorageRequest(
   }
 
   if (init.method === "GET") {
+    log.debug("[blobcache] get", { key })
+
     bridge.blobStore
-      .get(rt.app.id, key)
+      .get(ns, key)
       .then(res => {
         const id = streamManager.add(rt, res.stream)
         cb.applyIgnored(null, [
@@ -43,6 +46,7 @@ export function handleStorageRequest(
         ])
       })
       .catch(err => {
+        log.error("blobstore adapter error", err)
         let res
         if (err instanceof KeyNotFound) {
           res = makeResponse(404, "Not Found", url)
@@ -59,6 +63,8 @@ export function handleStorageRequest(
         ])
       })
   } else if (init.method === "PUT") {
+    log.debug("[blobcache] put", { key })
+
     if (body === null) {
       cb.applyIgnored(null, [null, makeResponse(422, "Body is required", url)])
       return
@@ -69,7 +75,7 @@ export function handleStorageRequest(
     const headers = extractHeaders(init.headers || {})
 
     bridge.blobStore
-      .set(rt.app.id, key, bodyBuf, { headers })
+      .set(ns, key, bodyBuf, { headers })
       .then(() => {
         cb.applyIgnored(null, [
           null,
@@ -87,8 +93,10 @@ export function handleStorageRequest(
         ])
       })
   } else if (init.method === "DELETE") {
+    log.debug("[blobcache] delete", { key })
+
     bridge.blobStore
-      .del(rt.app.id, key)
+      .del(ns, key)
       .then(() => {
         cb.applyIgnored(null, [
           null,

packages/core/src/s3_blob_store.ts

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.46.0-pre.0](https://github.com/superfly/fly/compare/v0.45.2...v0.46.0-pre.0) (2019-03-07)
+
+**Note:** Version bump only for package @fly/fly
+
+
+
+
+
 ## [0.45.2](https://github.com/superfly/fly/compare/v0.45.1...v0.45.2) (2019-03-04)
 
 **Note:** Version bump only for package @fly/fly

packages/fly/CHANGELOG.md

@@ -1,6 +1,6 @@
 {
   "name": "@fly/fly",
-  "version": "0.45.2",
+  "version": "0.46.0-pre.0",
   "description": "Open source Edge Application runtime",
   "license": "Apache-2.0",
   "repository": {
@@ -20,7 +20,7 @@
     "prepublishOnly": "yarn build"
   },
   "dependencies": {
-    "@fly/core": "0.45.2",
+    "@fly/core": "0.46.0-pre.0",
     "@fly/v8env": "0.45.1"
   },
   "publishConfig": {