@m3ftwz/redisfx 1.0.0 → 1.1.0

package/Redis.js

@@ -5,17 +5,19 @@ function assert(condition, message) {
     if (!condition)
         throw new TypeError(message);
 }
-const safeArgs = (arg1, arg2, cb) => {
-    if (arg2 !== undefined) {
-        const arg2Type = typeof arg2;
-        if (arg2Type === 'function') {
-            cb = arg2;
-            arg2 = undefined;
-        }
+/**
+ * Normalises the `(options?, cb?)` tail. A caller may pass the callback in the options slot, in
+ * which case it is shifted across so the options argument stays a plain value.
+ */
+const safeArgs = (options, cb) => {
+    if (typeof options === 'function') {
+        if (cb === undefined)
+            cb = options;
+        options = undefined;
     }
     if (cb !== undefined)
         assert(typeof cb === 'function', `Callback expected function, received ${typeof cb}`);
-    return [arg1, arg2, cb];
+    return [options, cb];
 };
 const exp = global.exports['redisfx'];
 const currentResourceName = GetCurrentResourceName();
@@ -48,24 +50,37 @@ exports.redisfx = {
         return cb ? cb(result) : result;
     },
     async set(key, value, options, cb) {
-        [options, , cb] = safeArgs(options, cb);
+        [options, cb] = safeArgs(options, cb);
         const result = await execute('set', key, value, options);
         return cb ? cb(result) : result;
     },
-    async del(keys, cb) {
-        const result = await execute('del', keys);
+    async getdel(key, cb) {
+        const result = await execute('getdel', key);
         return cb ? cb(result) : result;
     },
-    async exists(keys, cb) {
-        const result = await execute('exists', keys);
+    async getex(key, options, cb) {
+        [options, cb] = safeArgs(options, cb);
+        const result = await execute('getex', key, options);
         return cb ? cb(result) : result;
     },
-    async expire(key, seconds, cb) {
-        const result = await execute('expire', key, seconds);
+    async getrange(key, start, end, cb) {
+        const result = await execute('getrange', key, start, end);
         return cb ? cb(result) : result;
     },
-    async ttl(key, cb) {
-        const result = await execute('ttl', key);
+    async setrange(key, offset, value, cb) {
+        const result = await execute('setrange', key, offset, value);
+        return cb ? cb(result) : result;
+    },
+    async append(key, value, cb) {
+        const result = await execute('append', key, value);
+        return cb ? cb(result) : result;
+    },
+    async strlen(key, cb) {
+        const result = await execute('strlen', key);
+        return cb ? cb(result) : result;
+    },
+    async setnx(key, value, cb) {
+        const result = await execute('setnx', key, value);
         return cb ? cb(result) : result;
     },
     async incr(key, cb) {
@@ -76,6 +91,10 @@ exports.redisfx = {
         const result = await execute('incrby', key, increment);
         return cb ? cb(result) : result;
     },
+    async incrbyfloat(key, increment, cb) {
+        const result = await execute('incrbyfloat', key, increment);
+        return cb ? cb(result) : result;
+    },
     async decr(key, cb) {
         const result = await execute('decr', key);
         return cb ? cb(result) : result;
@@ -92,6 +111,109 @@ exports.redisfx = {
         const result = await execute('mset', keyValues);
         return cb ? cb(result) : result;
     },
+    async msetnx(keyValues, cb) {
+        const result = await execute('msetnx', keyValues);
+        return cb ? cb(result) : result;
+    },
+    // Key commands
+    async del(keys, cb) {
+        const result = await execute('del', keys);
+        return cb ? cb(result) : result;
+    },
+    async unlink(keys, cb) {
+        const result = await execute('unlink', keys);
+        return cb ? cb(result) : result;
+    },
+    async exists(keys, cb) {
+        const result = await execute('exists', keys);
+        return cb ? cb(result) : result;
+    },
+    async touch(keys, cb) {
+        const result = await execute('touch', keys);
+        return cb ? cb(result) : result;
+    },
+    async expire(key, seconds, cb) {
+        const result = await execute('expire', key, seconds);
+        return cb ? cb(result) : result;
+    },
+    async pexpire(key, milliseconds, cb) {
+        const result = await execute('pexpire', key, milliseconds);
+        return cb ? cb(result) : result;
+    },
+    async expireat(key, timestamp, cb) {
+        const result = await execute('expireat', key, timestamp);
+        return cb ? cb(result) : result;
+    },
+    async pexpireat(key, timestamp, cb) {
+        const result = await execute('pexpireat', key, timestamp);
+        return cb ? cb(result) : result;
+    },
+    async expiretime(key, cb) {
+        const result = await execute('expiretime', key);
+        return cb ? cb(result) : result;
+    },
+    async pexpiretime(key, cb) {
+        const result = await execute('pexpiretime', key);
+        return cb ? cb(result) : result;
+    },
+    async ttl(key, cb) {
+        const result = await execute('ttl', key);
+        return cb ? cb(result) : result;
+    },
+    async pttl(key, cb) {
+        const result = await execute('pttl', key);
+        return cb ? cb(result) : result;
+    },
+    async persist(key, cb) {
+        const result = await execute('persist', key);
+        return cb ? cb(result) : result;
+    },
+    async type(key, cb) {
+        const result = await execute('type', key);
+        return cb ? cb(result) : result;
+    },
+    async rename(key, newKey, cb) {
+        const result = await execute('rename', key, newKey);
+        return cb ? cb(result) : result;
+    },
+    async renamenx(key, newKey, cb) {
+        const result = await execute('renamenx', key, newKey);
+        return cb ? cb(result) : result;
+    },
+    async randomkey(cb) {
+        const result = await execute('randomkey');
+        return cb ? cb(result) : result;
+    },
+    async keys(pattern, cb) {
+        const result = await execute('keys', pattern);
+        return cb ? cb(result) : result;
+    },
+    async copy(source, destination, options, cb) {
+        [options, cb] = safeArgs(options, cb);
+        const result = await execute('copy', source, destination, options);
+        return cb ? cb(result) : result;
+    },
+    async scan(cursor, options, cb) {
+        [options, cb] = safeArgs(options, cb);
+        const result = await execute('scan', cursor, options);
+        return cb ? cb(result) : result;
+    },
+    async objectEncoding(key, cb) {
+        const result = await execute('objectEncoding', key);
+        return cb ? cb(result) : result;
+    },
+    async memoryUsage(key, cb) {
+        const result = await execute('memoryUsage', key);
+        return cb ? cb(result) : result;
+    },
+    async dump(key, cb) {
+        const result = await execute('dump', key);
+        return cb ? cb(result) : result;
+    },
+    async restore(key, ttl, serialized, cb) {
+        const result = await execute('restore', key, ttl, serialized);
+        return cb ? cb(result) : result;
+    },
     // Hash commands
     async hget(key, field, cb) {
         const result = await execute('hget', key, field);
@@ -101,6 +223,10 @@ exports.redisfx = {
         const result = await execute('hset', key, field, value);
         return cb ? cb(result) : result;
     },
+    async hsetnx(key, field, value, cb) {
+        const result = await execute('hsetnx', key, field, value);
+        return cb ? cb(result) : result;
+    },
     async hmset(key, fieldValues, cb) {
         const result = await execute('hmset', key, fieldValues);
         return cb ? cb(result) : result;
@@ -109,6 +235,10 @@ exports.redisfx = {
         const result = await execute('hgetall', key);
         return cb ? cb(result) : result;
     },
+    async hmget(key, fields, cb) {
+        const result = await execute('hmget', key, fields);
+        return cb ? cb(result) : result;
+    },
     async hdel(key, fields, cb) {
         const result = await execute('hdel', key, fields);
         return cb ? cb(result) : result;
@@ -117,6 +247,10 @@ exports.redisfx = {
         const result = await execute('hincrby', key, field, increment);
         return cb ? cb(result) : result;
     },
+    async hincrbyfloat(key, field, increment, cb) {
+        const result = await execute('hincrbyfloat', key, field, increment);
+        return cb ? cb(result) : result;
+    },
     async hexists(key, field, cb) {
         const result = await execute('hexists', key, field);
         return cb ? cb(result) : result;
@@ -133,6 +267,56 @@ exports.redisfx = {
         const result = await execute('hlen', key);
         return cb ? cb(result) : result;
     },
+    async hstrlen(key, field, cb) {
+        const result = await execute('hstrlen', key, field);
+        return cb ? cb(result) : result;
+    },
+    async hrandfield(key, cb) {
+        const result = await execute('hrandfield', key);
+        return cb ? cb(result) : result;
+    },
+    async hscan(key, cursor, options, cb) {
+        [options, cb] = safeArgs(options, cb);
+        const result = await execute('hscan', key, cursor, options);
+        return cb ? cb(result) : result;
+    },
+    async hexpire(key, fields, seconds, cb) {
+        const result = await execute('hexpire', key, fields, seconds);
+        return cb ? cb(result) : result;
+    },
+    async hpexpire(key, fields, milliseconds, cb) {
+        const result = await execute('hpexpire', key, fields, milliseconds);
+        return cb ? cb(result) : result;
+    },
+    async hexpireat(key, fields, timestamp, cb) {
+        const result = await execute('hexpireat', key, fields, timestamp);
+        return cb ? cb(result) : result;
+    },
+    async hpexpireat(key, fields, timestamp, cb) {
+        const result = await execute('hpexpireat', key, fields, timestamp);
+        return cb ? cb(result) : result;
+    },
+    async httl(key, fields, cb) {
+        const result = await execute('httl', key, fields);
+        return cb ? cb(result) : result;
+    },
+    async hpttl(key, fields, cb) {
+        const result = await execute('hpttl', key, fields);
+        return cb ? cb(result) : result;
+    },
+    async hpersist(key, fields, cb) {
+        const result = await execute('hpersist', key, fields);
+        return cb ? cb(result) : result;
+    },
+    async hgetex(key, fields, options, cb) {
+        [options, cb] = safeArgs(options, cb);
+        const result = await execute('hgetex', key, fields, options);
+        return cb ? cb(result) : result;
+    },
+    async hgetdel(key, fields, cb) {
+        const result = await execute('hgetdel', key, fields);
+        return cb ? cb(result) : result;
+    },
     // List commands
     async lpush(key, values, cb) {
         const result = await execute('lpush', key, values);
@@ -142,6 +326,14 @@ exports.redisfx = {
         const result = await execute('rpush', key, values);
         return cb ? cb(result) : result;
     },
+    async lpushx(key, values, cb) {
+        const result = await execute('lpushx', key, values);
+        return cb ? cb(result) : result;
+    },
+    async rpushx(key, values, cb) {
+        const result = await execute('rpushx', key, values);
+        return cb ? cb(result) : result;
+    },
     async lpop(key, cb) {
         const result = await execute('lpop', key);
         return cb ? cb(result) : result;
@@ -170,6 +362,32 @@ exports.redisfx = {
         const result = await execute('lrem', key, count, value);
         return cb ? cb(result) : result;
     },
+    async ltrim(key, start, stop, cb) {
+        const result = await execute('ltrim', key, start, stop);
+        return cb ? cb(result) : result;
+    },
+    async lpos(key, element, options, cb) {
+        [options, cb] = safeArgs(options, cb);
+        const result = await execute('lpos', key, element, options);
+        return cb ? cb(result) : result;
+    },
+    async linsert(key, position, pivot, element, cb) {
+        const result = await execute('linsert', key, position, pivot, element);
+        return cb ? cb(result) : result;
+    },
+    async lmove(source, destination, from, to, cb) {
+        const result = await execute('lmove', source, destination, from, to);
+        return cb ? cb(result) : result;
+    },
+    async rpoplpush(source, destination, cb) {
+        const result = await execute('rpoplpush', source, destination);
+        return cb ? cb(result) : result;
+    },
+    async lmpop(keys, side, options, cb) {
+        [options, cb] = safeArgs(options, cb);
+        const result = await execute('lmpop', keys, side, options);
+        return cb ? cb(result) : result;
+    },
     // Set commands
     async sadd(key, members, cb) {
         const result = await execute('sadd', key, members);
@@ -187,6 +405,10 @@ exports.redisfx = {
         const result = await execute('sismember', key, member);
         return cb ? cb(result) : result;
     },
+    async smismember(key, members, cb) {
+        const result = await execute('smismember', key, members);
+        return cb ? cb(result) : result;
+    },
     async scard(key, cb) {
         const result = await execute('scard', key);
         return cb ? cb(result) : result;
@@ -195,14 +417,52 @@ exports.redisfx = {
         const result = await execute('spop', key);
         return cb ? cb(result) : result;
     },
+    async smove(source, destination, member, cb) {
+        const result = await execute('smove', source, destination, member);
+        return cb ? cb(result) : result;
+    },
     async srandmember(key, count, cb) {
-        [count, , cb] = safeArgs(count, cb);
-        const result = count !== undefined ? await execute('srandmember', key, count) : await execute('srandmember', key);
+        [count, cb] = safeArgs(count, cb);
+        const result = await execute('srandmember', key, count);
+        return cb ? cb(result) : result;
+    },
+    async sinter(keys, cb) {
+        const result = await execute('sinter', keys);
+        return cb ? cb(result) : result;
+    },
+    async sunion(keys, cb) {
+        const result = await execute('sunion', keys);
+        return cb ? cb(result) : result;
+    },
+    async sdiff(keys, cb) {
+        const result = await execute('sdiff', keys);
+        return cb ? cb(result) : result;
+    },
+    async sintercard(keys, options, cb) {
+        [options, cb] = safeArgs(options, cb);
+        const result = await execute('sintercard', keys, options);
+        return cb ? cb(result) : result;
+    },
+    async sinterstore(destination, keys, cb) {
+        const result = await execute('sinterstore', destination, keys);
+        return cb ? cb(result) : result;
+    },
+    async sunionstore(destination, keys, cb) {
+        const result = await execute('sunionstore', destination, keys);
+        return cb ? cb(result) : result;
+    },
+    async sdiffstore(destination, keys, cb) {
+        const result = await execute('sdiffstore', destination, keys);
+        return cb ? cb(result) : result;
+    },
+    async sscan(key, cursor, options, cb) {
+        [options, cb] = safeArgs(options, cb);
+        const result = await execute('sscan', key, cursor, options);
         return cb ? cb(result) : result;
     },
     // Sorted set commands
     async zadd(key, score, member, options, cb) {
-        [options, , cb] = safeArgs(options, cb);
+        [options, cb] = safeArgs(options, cb);
         const result = await execute('zadd', key, score, member, options);
         return cb ? cb(result) : result;
     },
@@ -214,6 +474,14 @@ exports.redisfx = {
         const result = await execute('zrangeWithScores', key, start, stop);
         return cb ? cb(result) : result;
     },
+    async zrangebyscore(key, min, max, cb) {
+        const result = await execute('zrangebyscore', key, min, max);
+        return cb ? cb(result) : result;
+    },
+    async zrangestore(destination, source, min, max, cb) {
+        const result = await execute('zrangestore', destination, source, min, max);
+        return cb ? cb(result) : result;
+    },
     async zrem(key, members, cb) {
         const result = await execute('zrem', key, members);
         return cb ? cb(result) : result;
@@ -222,69 +490,227 @@ exports.redisfx = {
         const result = await execute('zscore', key, member);
         return cb ? cb(result) : result;
     },
+    async zmscore(key, members, cb) {
+        const result = await execute('zmscore', key, members);
+        return cb ? cb(result) : result;
+    },
     async zrank(key, member, cb) {
         const result = await execute('zrank', key, member);
         return cb ? cb(result) : result;
     },
+    async zrevrank(key, member, cb) {
+        const result = await execute('zrevrank', key, member);
+        return cb ? cb(result) : result;
+    },
     async zcard(key, cb) {
         const result = await execute('zcard', key);
         return cb ? cb(result) : result;
     },
+    async zcount(key, min, max, cb) {
+        const result = await execute('zcount', key, min, max);
+        return cb ? cb(result) : result;
+    },
+    async zlexcount(key, min, max, cb) {
+        const result = await execute('zlexcount', key, min, max);
+        return cb ? cb(result) : result;
+    },
     async zincrby(key, increment, member, cb) {
         const result = await execute('zincrby', key, increment, member);
         return cb ? cb(result) : result;
     },
-    // Transaction
-    async multi(commands, cb) {
-        const result = await execute('multi', commands);
+    async zpopmin(key, cb) {
+        const result = await execute('zpopmin', key);
         return cb ? cb(result) : result;
     },
-    // Key commands
-    async keys(pattern, cb) {
-        const result = await execute('keys', pattern);
+    async zpopmax(key, cb) {
+        const result = await execute('zpopmax', key);
         return cb ? cb(result) : result;
     },
-    async scan(cursor, options, cb) {
-        [options, , cb] = safeArgs(options, cb);
-        const result = await execute('scan', cursor, options);
+    async zrandmember(key, cb) {
+        const result = await execute('zrandmember', key);
         return cb ? cb(result) : result;
     },
-    async type(key, cb) {
-        const result = await execute('type', key);
+    async zdiff(keys, cb) {
+        const result = await execute('zdiff', keys);
         return cb ? cb(result) : result;
     },
-    async rename(key, newKey, cb) {
-        const result = await execute('rename', key, newKey);
+    async zinter(keys, cb) {
+        const result = await execute('zinter', keys);
         return cb ? cb(result) : result;
     },
-    async persist(key, cb) {
-        const result = await execute('persist', key);
+    async zunion(keys, cb) {
+        const result = await execute('zunion', keys);
         return cb ? cb(result) : result;
     },
-    async pttl(key, cb) {
-        const result = await execute('pttl', key);
+    async zintercard(keys, options, cb) {
+        [options, cb] = safeArgs(options, cb);
+        const result = await execute('zintercard', keys, options);
         return cb ? cb(result) : result;
     },
-    async expireat(key, timestamp, cb) {
-        const result = await execute('expireat', key, timestamp);
+    async zremrangebyrank(key, start, stop, cb) {
+        const result = await execute('zremrangebyrank', key, start, stop);
+        return cb ? cb(result) : result;
+    },
+    async zremrangebyscore(key, min, max, cb) {
+        const result = await execute('zremrangebyscore', key, min, max);
+        return cb ? cb(result) : result;
+    },
+    async zremrangebylex(key, min, max, cb) {
+        const result = await execute('zremrangebylex', key, min, max);
+        return cb ? cb(result) : result;
+    },
+    async zscan(key, cursor, options, cb) {
+        [options, cb] = safeArgs(options, cb);
+        const result = await execute('zscan', key, cursor, options);
         return cb ? cb(result) : result;
     },
-    // Server commands
+    // Bitmap / HyperLogLog
+    async setbit(key, offset, value, cb) {
+        const result = await execute('setbit', key, offset, value);
+        return cb ? cb(result) : result;
+    },
+    async getbit(key, offset, cb) {
+        const result = await execute('getbit', key, offset);
+        return cb ? cb(result) : result;
+    },
+    async bitcount(key, options, cb) {
+        [options, cb] = safeArgs(options, cb);
+        const result = await execute('bitcount', key, options);
+        return cb ? cb(result) : result;
+    },
+    async bitpos(key, bit, options, cb) {
+        [options, cb] = safeArgs(options, cb);
+        const result = await execute('bitpos', key, bit, options);
+        return cb ? cb(result) : result;
+    },
+    async bitop(operation, destination, keys, cb) {
+        const result = await execute('bitop', operation, destination, keys);
+        return cb ? cb(result) : result;
+    },
+    async pfadd(key, elements, cb) {
+        const result = await execute('pfadd', key, elements);
+        return cb ? cb(result) : result;
+    },
+    async pfcount(keys, cb) {
+        const result = await execute('pfcount', keys);
+        return cb ? cb(result) : result;
+    },
+    async pfmerge(destination, sources, cb) {
+        const result = await execute('pfmerge', destination, sources);
+        return cb ? cb(result) : result;
+    },
+    // Streams
+    async xadd(key, id, message, cb) {
+        const result = await execute('xadd', key, id, message);
+        return cb ? cb(result) : result;
+    },
+    async xlen(key, cb) {
+        const result = await execute('xlen', key);
+        return cb ? cb(result) : result;
+    },
+    async xrange(key, start, end, cb) {
+        const result = await execute('xrange', key, start, end);
+        return cb ? cb(result) : result;
+    },
+    async xrevrange(key, end, start, cb) {
+        const result = await execute('xrevrange', key, end, start);
+        return cb ? cb(result) : result;
+    },
+    async xdel(key, ids, cb) {
+        const result = await execute('xdel', key, ids);
+        return cb ? cb(result) : result;
+    },
+    async xtrim(key, strategy, threshold, cb) {
+        const result = await execute('xtrim', key, strategy, threshold);
+        return cb ? cb(result) : result;
+    },
+    async xack(key, group, ids, cb) {
+        const result = await execute('xack', key, group, ids);
+        return cb ? cb(result) : result;
+    },
+    // Scripting
+    async eval(script, options, cb) {
+        [options, cb] = safeArgs(options, cb);
+        const result = await execute('eval', script, options);
+        return cb ? cb(result) : result;
+    },
+    async evalsha(sha, options, cb) {
+        [options, cb] = safeArgs(options, cb);
+        const result = await execute('evalsha', sha, options);
+        return cb ? cb(result) : result;
+    },
+    async scriptLoad(script, cb) {
+        const result = await execute('scriptLoad', script);
+        return cb ? cb(result) : result;
+    },
+    async fcall(fn, options, cb) {
+        [options, cb] = safeArgs(options, cb);
+        const result = await execute('fcall', fn, options);
+        return cb ? cb(result) : result;
+    },
+    async fcallRo(fn, options, cb) {
+        [options, cb] = safeArgs(options, cb);
+        const result = await execute('fcallRo', fn, options);
+        return cb ? cb(result) : result;
+    },
+    // Pub/Sub
+    async publish(channel, message, cb) {
+        const result = await execute('publish', channel, message);
+        return cb ? cb(result) : result;
+    },
+    async spublish(channel, message, cb) {
+        const result = await execute('spublish', channel, message);
+        return cb ? cb(result) : result;
+    },
+    async subscribe(channels, options, cb) {
+        [options, cb] = safeArgs(options, cb);
+        const result = await execute('subscribe', channels, options);
+        return cb ? cb(result) : result;
+    },
+    async unsubscribe(channels, options, cb) {
+        [options, cb] = safeArgs(options, cb);
+        const result = await execute('unsubscribe', channels, options);
+        return cb ? cb(result) : result;
+    },
+    // Transactions
+    async multi(commands, cb) {
+        const result = await execute('multi', commands);
+        return cb ? cb(result) : result;
+    },
+    // Server
     async ping(cb) {
         const result = await execute('ping');
         return cb ? cb(result) : result;
     },
-    async flushdb(cb) {
-        const result = await execute('flushdb');
+    async time(cb) {
+        const result = await execute('time');
         return cb ? cb(result) : result;
     },
     async dbsize(cb) {
         const result = await execute('dbsize');
         return cb ? cb(result) : result;
     },
+    async flushdb(cb) {
+        const result = await execute('flushdb');
+        return cb ? cb(result) : result;
+    },
+    async flushall(cb) {
+        const result = await execute('flushall');
+        return cb ? cb(result) : result;
+    },
+    async info(section, cb) {
+        [section, cb] = safeArgs(section, cb);
+        const result = await execute('info', section);
+        return cb ? cb(result) : result;
+    },
+    async configGet(parameter, cb) {
+        const result = await execute('configGet', parameter);
+        return cb ? cb(result) : result;
+    },
     // Raw command
     async raw(command, args, cb) {
-        const result = await execute('raw', command, args);
+        [args, cb] = safeArgs(args, cb);
+        const result = await execute('raw', command, args ?? []);
         return cb ? cb(result) : result;
     },
 };