resend 0.1.1 → 0.1.2

package/package.json

@@ -1,26 +1,11 @@
 {
   "name": "resend",
-  "version": "0.1.1",
-  "description": "Web server for Redis data including Refile support",
-  "main": "lib/index.js",
+  "version": "0.1.2",
+  "description": "",
+  "main": "index.js",
   "scripts": {
-    "lint": "eslint --cache src",
-    "start": "node --harmony lib/index.js"
+    "test": "echo \"Error: no test specified\" && exit 1"
   },
-  "author": "@evanxsummers",
-  "license": "ISC",
-  "dependencies": {
-    "redis-koa-app-rpf": "^0.6.5"
-  },
-  "devDependencies": {
-    "eslint": "^3.12.2"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/evanx/resend.git"
-  },
-  "bugs": {
-    "url": "https://github.com/evanx/resend/issues"
-  },
-  "homepage": "https://github.com/evanx/resend#readme"
+  "author": "",
+  "license": "ISC"
 }

package/.eslintrc

@@ -1,6 +0,0 @@
-{
-    "parserOptions": {
-        "ecmaVersion": 2017,
-        "sourceType": "module"
-    }
-}

package/.npmignore

@@ -1,7 +0,0 @@
-/node_modules
-/npm-debug.log
-/config
-/tmp
-/.eslintcache
-/.idea
-/.vscode

package/Dockerfile

@@ -1,5 +0,0 @@
-FROM mhart/alpine-node
-ADD package.json .
-RUN npm install
-ADD lib lib
-CMD ["node", "--harmony", "lib/index.js"]

package/README.md

@@ -1,74 +0,0 @@
-# resend
-
-Containerized utility to scan and print llen of Redis keys.
-
-<img src="https://raw.githubusercontent.com/evanx/resend/master/docs/readme/main.png"/>
-
-## Use case
-
-We wish to expire a set of keys in Redis matching some pattern.
-
-```
-```
-
-## Config
-
-See `lib/config.js`
-```javascript
-```
-
-## Docker
-
-You can build as follows:
-```shell
-docker build -t resend https://github.com/evanx/resend.git
-```
-
-See `bin/test.sh` https://github.com/evanx/resend/blob/master/bin/test.sh
-
-Builds:
-- isolated network `resend-network`
-- isolated Redis instance named `resend-redis`
-- this utility `evanx/resend`
-
-We populate our test keys:
-```
-populate() {
-}
-```
-
-We build a container image for this service:
-```
-docker build -t resend https://github.com/evanx/resend.git
-```
-
-We interactively run the service on our test Redis container:
-```
-docker run --name resend-instance --rm -i \
-  --network=resend-network \
-  -e host=$redisHost \
-  -e pattern='*' \
-  resend
-```
-
-## Implementation
-
-See `lib/main.js`
-
-```javascript
-```
-
-### Appication archetype
-
-Incidently `lib/index.js` uses the `redis-koa-app-rpf` application archetype.
-```
-require('redis-koa-app-rpf')(require('./spec'), require('./main'));
-```
-where we extract the `config` from `process.env` according to the `spec` and invoke our `main` function.
-
-See https://github.com/evanx/redis-koa-app-rpf.
-
-This provides lifecycle boilerplate to reuse across similar applications.
-
-<hr>
-https://twitter.com/@evanxsummers

package/bin/redeploy.sh

@@ -1,13 +0,0 @@
-
-echo "NODE_ENV $NODE_ENV"
-docker build -t geo-cache https://github.com/evanx/geo-cache.git
-docker rm -f `docker ps -q -f name=geo-cache`
-container=`docker run --name geo-cache -d \
-  --network=host --restart unless-stopped \
-  -e httpPort=8851 \
-  -e NODE_ENV=$NODE_ENV \
-  geo-cache`
-sleep 1 
-echo "docker logs $container"
-docker logs $container
-

package/development/commit.sh

@@ -1,9 +0,0 @@
-
-set -u -e 
-
-echo $# | grep '^0$\|^1$'
-
-  git add -A
-  git commit -m "${1-initial}"
-  git push
-

package/development/run.sh

@@ -1,24 +0,0 @@
-
-set -u -x
-
-mkdir -p tmp
-
-redis-cli keys cache-geo-cache:* | xargs -n 1 redis-cli del
-
-echo '
-redis-cli keys cache-geo-cache:* | head
-redis-cli keys cache-geo-cache:* | wc -l
-' | sed '/^$/d' | tee tmp/keys.sh | dash -x
-cat tmp/keys.sh
-ls -l tmp/keys.sh
-
-(
-  echo 'client sleep'
-  sleep 1
-  echo 'client curl'
-  curl 'http://localhost:8851/maps/api/geocode/json' -G --data-urlencode 'address=20 Falstaff Close, Eynsham OX29 4QA'
-  redis-cli keys cache-geo-cache:*
-) &
-
-echo 'start server'
-apiKey=$MAPS_API_KEY node --harmony lib/index.js

package/lib/index.js

@@ -1,2 +0,0 @@
-
-require('redis-koa-app-rpf')(require('./spec'), require('./main'));

package/lib/main.js

@@ -1,132 +0,0 @@
-const assert = require('assert');
-const crypto = require('crypto');
-const fetch = require('node-fetch');
-const h = require('render-html-rpf');
-const lodash = require('lodash');
-const multiExecAsync = require('multi-exec-async');
-
-const reduceAllProperties = (object, fn) => Object.keys(object).reduce((result, key) => {
-    result[key] = fn(object[key]);
-    return result;
-}, {});
-
-module.exports = async appx => {
-    const {config, logger, client, api} = appx;
-    logger.info({config}, process.env.NODE_ENV);
-    api.get('/stats', async ctx => {
-        ctx.redirect('/metrics');
-    });
-    api.get('/metrics', async ctx => {
-        const [getCountRes, setCountRes, migrateCountRes] = await multiExecAsync(client, multi => {
-            multi.hgetall([config.redisNamespace, 'metric:get:path:count:h'].join(':'));
-            multi.hgetall([config.redisNamespace, 'metric:set:path:count:h'].join(':'));
-            multi.hgetall([config.redisNamespace, 'metric:migrate:path:count:h'].join(':'));
-        });
-        const getCount = reduceAllProperties(getCountRes || {}, value => parseInt(value));
-        const setCount = reduceAllProperties(setCountRes || {}, value => parseInt(value));
-        const migrateCount = reduceAllProperties(migrateCountRes || {}, value => parseInt(value));
-        const metrics = {getCount, setCount, migrateCount};
-        if (/(Mobile)/.test(ctx.get('user-agent'))) {
-            ctx.body = h.page({
-                title: 'gcache',
-                heading: 'Metrics',
-                content: [{
-                    name: 'pre',
-                    content: JSON.stringify(metrics, null, 2)}
-                ],
-                footerLink: 'https://github.com/evanx/geo-cache'
-            });
-        } else {
-            ctx.body = metrics;
-        }
-    });
-    api.get('/maps/api/*', async ctx => {
-        const path = ctx.params[0];
-        const url = 'https://maps.googleapis.com/maps/api/' + path;
-        const query = Object.keys(ctx.query)
-        .filter(key => key !== 'key')
-        .reduce((query, key) => {
-            query[key] = ctx.query[key];
-            return query;
-        }, {});
-        assert(!query.key);
-        const queryString = Object.keys(query).slice(0).sort().map(
-            key => [key, encodeURIComponent(query[key])].join('=')
-        ).join('&');
-        const urlString = [url, queryString].join('?');
-        const authQuery = Object.assign({}, {key: config.apiKey}, ctx.query);
-        if (!authQuery.key) {
-            ctx.statusCode = 401;
-            const statusText = 'Unauthorized';
-            ctx.body = statusText + '\n';
-            return;
-        }
-        logger.debug({url, query, urlString});
-        const sha = crypto.createHash('sha1').update(urlString).digest('hex');
-        const cacheKey = [config.redisNamespace, sha, 'j'].join(':');
-        if (true) {
-            const migrateSha = crypto.createHash('sha1').update(
-                [url, JSON.stringify(query)].join('#')
-            ).digest('hex');
-            const migrateKey = ['cache-geo-cache', migrateSha, 'json'].join(':');
-            const [migrateContent] = await multiExecAsync(client, multi => {
-                multi.get(migrateKey);
-            });
-            if (migrateContent) {
-                await multiExecAsync(client, multi => {
-                    multi.set(cacheKey, JSON.stringify(JSON.parse(migrateContent)));
-                    multi.del(migrateKey);
-                    multi.hincrby([config.redisNamespace, 'metric:migrate:path:count:h'].join(':'), path, 1);
-                });
-            }
-        }
-        let [cachedContent] = await multiExecAsync(client, multi => {
-            multi.get(cacheKey);
-            multi.expire(cacheKey, config.expireSeconds);
-            multi.hincrby([config.redisNamespace, 'metric:get:path:count:h'].join(':'), path, 1);
-        });
-        if (cachedContent) {
-            logger.debug('hit', {url, sha, cacheKey});
-            const parsedContent = JSON.parse(cachedContent);
-            const formattedContent = JSON.stringify(parsedContent);
-            if (cachedContent !== formattedContent) {
-                logger.debug('reformat', cacheKey, cachedContent);
-                await multiExecAsync(client, multi => {
-                    multi.set(cacheKey, formattedContent);
-                });
-            }
-            if (lodash.includes(['OK', 'ZERO_RESULTS'], parsedContent.status)) {
-                logger.warn('hit', {url, sha, cacheKey, parsedContent});
-                ctx.set('Content-Type', 'application/json');
-                ctx.body = JSON.stringify(parsedContent, null, 2) + '\n';
-                return;
-            }
-        }
-        const urlQuery = url + '?' + Object.keys(authQuery)
-        .map(key => [key, encodeURIComponent(authQuery[key])].join('='))
-        .join('&');
-        const res = await fetch(urlQuery);
-        if (res.status !== 200) {
-            logger.debug('statusCode', url, res.status, res.statusText, query);
-            ctx.statusCode = res.status;
-            ctx.body = res.statusText + '\n';
-            return;
-        }
-        const fetchedContent = await res.json();
-        const formattedContent = JSON.stringify(fetchedContent, null, 2) + '\n';
-        ctx.set('Content-Type', 'application/json');
-        ctx.body = formattedContent;
-        if (!lodash.includes(['OK', 'ZERO_RESULTS'], fetchedContent.status)) {
-            logger.debug('status', fetchedContent.status, url);
-        } else {
-            const expireSeconds = lodash.includes(['ZERO_RESULTS'], fetchedContent.status)?
-            config.shortExpireSeconds:
-            config.expireSeconds;
-            logger.debug('expireSeconds', expireSeconds, fetchedContent.status, url);
-            await multiExecAsync(client, multi => {
-                multi.setex(cacheKey, expireSeconds, JSON.stringify(fetchedContent));
-                multi.hincrby([config.redisNamespace, 'metric:set:path:count:h'].join(':'), path, 1);
-            });
-        }
-    });
-}

package/lib/spec.js

@@ -1,50 +0,0 @@
-module.exports = {
-    description: 'Redis-based caching proxy for Google Maps API queries.',
-    required: {
-        redisHost: {
-            description: 'the Redis host',
-            default: 'localhost'
-        },
-        redisPort: {
-            description: 'the Redis port',
-            default: 6379
-        },
-        redisPassword: {
-            description: 'the Redis password',
-            required: false
-        },
-        redisNamespace: {
-            description: 'the Redis namespace',
-            default: 'cache-geo'
-        },
-        expireSeconds: {
-            description: 'the TTL for the cached content',
-            default: 21*24*3600
-        },
-        shortExpireSeconds: {
-            description: 'the TTL for the cached content',
-            default: 3*24*3600
-        },
-        httpPort: {
-            description: 'the HTTP port',
-            default: 8851
-        },
-        apiKey: {
-            description: 'our Google Maps API key',
-            required: false
-        },
-        loggerLevel: {
-            description: 'the logging level',
-            default: 'info',
-            example: 'debug'
-        }
-    },
-    test: {
-        loggerLevel: 'debug',
-        debug: true
-    },
-    development: {
-        loggerLevel: 'debug',
-        debug: true
-    }
-}

package/test/curl.sh

@@ -1,9 +0,0 @@
-
-set -u -x
-
-  curl 'http://localhost:8851/maps/api/geocode/json' -G --data-urlencode 'address=20 Falstaff Close, Eynsham OX29 4QA'
-  curl 'http://localhost:8851/maps/api/geocode/json' -G --data-urlencode 'address=14 Grays Inn Road, Chancery Lane, London'
-  sleep 1
-  redis-cli keys cache-geo-cache:*
-  redis-cli hkeys cache-geo-cache:url:h
-  redis-cli hgetall cache-geo-cache:url:h