feat: cache pub/priv conf

src/s3-utils.ts

@@ -1,3 +1,4 @@
+import omit = require('object.omit')
 import Errors = require('./errors')
 import Logger from './logger'
 
@@ -70,18 +71,20 @@ module.exports = function createUtils (aws) {
     let cached
     let etag
     let cachedTime
-    const maybeGet = async (opts) => {
-      if (typeof opts === 'string') {
-        opts = { key: opts }
+    const maybeGet = async (opts={}) => {
+      if (!opts.force) {
+        const age = Date.now() - cachedTime
+        if (etag && age < ttl) {
+          logger.debug(`returning cached item for key ${key}, ttl: ${(ttl - age)}`)
+          return cached
+        }
       }
 
-      const age = Date.now() - cachedTime
-      if (etag && age < ttl) {
-        logger.debug(`returning cached item for key ${key}, ttl: ${(ttl - age)}`)
-        return cached
+      opts = {
+        ...defaultOpts,
+        ...omit(opts, ['force'])
       }
 
-      opts = { ...defaultOpts, ...opts }
       if (etag) {
         opts.IfNoneMatch = etag
       }

src/samplebot/configure.ts

@@ -10,15 +10,38 @@ export class Conf {
   public bot: any
   public privateConfBucket: any
   public publicConfBucket: any
+  public publicConf: any
+  public privateConf: any
   constructor(bot) {
     this.bot = bot
     const { buckets } = bot.resources
     this.privateConfBucket = buckets.PrivateConf
     this.publicConfBucket = buckets.PublicConf
+    this.publicConf = this.publicConfBucket.getCacheable({
+      ttl: 60000,
+      key: PUBLIC_CONF_KEY,
+      parse: JSON.parse.bind(JSON)
+    })
+
+    this.privateConf = this.privateConfBucket.getCacheable({
+      ttl: 60000,
+      key: PRIVATE_CONF_KEY,
+      parse: JSON.parse.bind(JSON)
+    })
+  }
+
+  public getPrivateConf = (forceFetch:boolean) => {
+    return this.privateConf.get({
+      force: forceFetch
+    })
+  }
+
+  public getPublicConf = (forceFetch:boolean) => {
+    return this.publicConf.get({
+      force: forceFetch
+    })
   }
 
-  public getPrivateConf = () => this.privateConfBucket.getJSON(PRIVATE_CONF_KEY)
-  public getPublicConf = () => this.publicConfBucket.getJSON(PUBLIC_CONF_KEY)
   public savePublicConf = async (value:any, reinitializeContainers:boolean=true) => {
     await this.putIfDifferent({
       bucket: this.publicConfBucket,