swap scripty

docker-compose.yaml

@@ -0,0 +1,13 @@
+redis:
+  image: redis:3.2-alpine
+  ports:
+    - 6386:6379
+  container_name: warlock-redis
+
+monitor:
+  image: redis:3.2-alpine
+  links:
+    - redis
+  entrypoint: "/bin/sh"
+  command: >
+    "-c" "redis-cli -h warlock-redis -p 6379 monitor"

lib/del.js

@@ -0,0 +1,9 @@
+const path = require('path');
+const _path = path.resolve(__dirname, './lua/parityDel.lua');
+const src = require('fs').readFileSync(_path, { encoding: 'utf-8' });
+const { createScript } = require('node-redis-script');
+
+exports.createScript = redis => {
+  const opts = { redis };
+  return createScript(opts, src);
+}

lib/warlock.js

@@ -1,11 +1,12 @@
 var crypto       = require('crypto');
-var Scripty      = require('node-redis-scripty');
 var UUID         = require('uuid');
 
+const { createScript } = require('./del');
+
 module.exports = function(redis){
   var warlock = {};
 
-  var scripty = new Scripty(redis);
+  const parityDel = createScript(redis);
 
   warlock.makeKey = function(key) {
     return key + ':lock';
@@ -43,22 +44,21 @@ module.exports = function(redis){
     return key;
   };
 
-  warlock.unlock = function(key, id, cb) {
+  warlock.unlock = async (key, id, cb) => {
     cb = cb || function(){};
 
     if (typeof key !== 'string') {
       return cb(new Error('lock key must be string'));
     }
 
-    scripty.loadScriptFile(
-      'parityDel',
-      __dirname + '/lua/parityDel.lua',
-      function(err, parityDel){
-        if (err) return cb(err);
-
-        return parityDel.run(1, warlock.makeKey(key), id, cb);
-      }
-    );
+    const numKeys = 1;
+    const _key = warlock.makeKey(key);
+    try {
+      const result = await parityDel(numKeys, _key, id);
+      cb(null, result);
+    } catch (e) {
+      cb(e);
+    }
   };
 
   /**

package.json

@@ -4,7 +4,11 @@
   "description": "Battle-hardened distributed locking using redis",
   "main": "lib/warlock.js",
   "scripts": {
-    "test": "mocha -R list ./test/warlock",
+    "pretest": "npm run start-redis",
+    "posttest": "npm run cleanup",
+    "start-redis": "docker-compose up -d redis",
+    "test": "mocha ./test/warlock",
+    "cleanup": "docker-compose stop && docker-compose rm -f",
     "bench": "mocha -R list ./test/bench"
   },
   "repository": {
@@ -23,6 +27,7 @@
   },
   "homepage": "https://github.com/thedeveloper/warlock",
   "dependencies": {
+    "node-redis-script": "^2.0.1",
     "node-redis-scripty": "0.0.5",
     "uuid": "^2.0.1"
   },

test/warlock.js

@@ -1,7 +1,9 @@
 var should  = require('should');
-var redis = require('./setup/redisConnection');
+
+var Redis = require('redis');
+var redis = Redis.createClient({ port: 6386 });
+
 var warlock = require('../lib/warlock')(redis);
-require('./setup/redisFlush');
 
 describe('locking', function() {
   it('sets lock', function (done) {