Merge pull request #108 from sebringrose/cascade-fix

fix: stop recursive cascade at response

middleware/cacher.ts

@@ -24,15 +24,13 @@ export const cacher = (cache: ResponseCache): Middleware => async (ctx, next) =>
       })
     }
 
-    // else respond 200 clone of response - one-use original lives in cache
     ctx.state.responseFromCache = true
     return cacheItem.value.clone()
   }
 
-  // update cache asynchronously to not block process before return
   const response = await next()
   if (!response) return
 
-  cache.set(key, response.clone())
-  return response.clone()
+  const newCacheItem = cache.set(key, response.clone())
+  return newCacheItem.value.clone()
 }

mod.ts

@@ -6,6 +6,8 @@
 import Server from "./server.ts"
 export default Server
 export * from "./server.ts"
+// alias for traditional Router setup
+export const Router = Server
 
 // Handlers
 export * from "./handlers/static.ts"
@@ -20,5 +22,5 @@ export * from "./middleware/logger.ts"
 // Utils
 export * from "./utils/Crypto.ts"
 export * from "./utils/ResponseCache.ts"
-// export * from "./utils/Cascade.ts" // <-- not likely to be needed by users & clutters docs
-// export * from "./utils/Promisify.ts" // <-- not likely to be needed by users & clutters docs
+// export * from "./utils/Cascade.ts"
+// ^ not needed by users & clutters docs

utils/Cascade.ts

@@ -24,11 +24,8 @@ export class Cascade {
 
     try {
       const result = await fcnPromise(this.ctx, async () => await this.run(this.toCall[++this.called]))
-      if (result) {
-        this.response = result
-      } else {
-        await this.run(this.toCall[++this.called])
-      }
+      if (result) this.response = result
+      if (!this.response) await this.run(this.toCall[++this.called])
     } catch (error) {
       throw error
     }