AUTH-98 | Reduce requestValidityPeriod from 10s to 1s

Author: anujcontentstack

js/config.js

@@ -1,6 +1,6 @@
 {
   "name": "@contentstack/epicurus-node",
-  "version": "0.3.2",
+  "version": "0.3.4",
   "description": "Redis request/response and PubSub sugar",
   "main": "js/index.js",
   "types": "js/index.d.ts",

js/config.js.map

@@ -1,3 +1,3 @@
 export const config = {
-  requestValidityPeriod: 10000 // milliseconds
+  requestValidityPeriod: 1 * 1000 // milliseconds
 }

package-lock.json

@@ -1,21 +1,44 @@
-import { subscribe, publish, setupSubscriptionListener, removeCallbacks, shutdownSubscribers } from './lib/pub_sub'
-import { request, server, closeAllClients, enableServers, disableServers } from './lib/request_response'
-import { EpicurusRedisConfig, serverCallback, subscribeCallback } from './interface'
-import * as redis from 'redis'
 import * as bluebird from 'bluebird'
+import * as redis from 'redis'
 import { RedisClient } from 'redis'
+
+import { config } from './config'
+import {
+  EpicurusRedisConfig,
+  serverCallback,
+  subscribeCallback,
+} from './interface'
+import {
+  publish,
+  removeCallbacks,
+  setupSubscriptionListener,
+  shutdownSubscribers,
+  subscribe,
+} from './lib/pub_sub'
+import {
+  closeAllClients,
+  disableServers,
+  enableServers,
+  request,
+  server,
+} from './lib/request_response'
+
 bluebird.promisifyAll(redis.RedisClient.prototype)
 bluebird.promisifyAll(redis.Multi.prototype)
 
-export default function Epicurus (redisConfig: EpicurusRedisConfig = {
-  host: 'localhost',
-  port: 6379
-}): EpicurusPublicInterface {
+export default function Epicurus (
+  redisConfig: EpicurusRedisConfig = {
+    host: 'localhost',
+    port: 6379
+  },
+  requestTimeout?: number
+): EpicurusPublicInterface {
   // A separate subscription Redis client is required as once a client has
   // called SUBSCRIBE, it is put into a slave mode the does not allow any other
   // kind of action
   const redisClient = redis.createClient(redisConfig)
   const redisSub = redis.createClient(redisConfig)
+  const requestValidityPeriod = requestTimeout || config.requestValidityPeriod
 
   setupSubscriptionListener(redisSub)
   enableServers()
@@ -25,8 +48,8 @@ export default function Epicurus (redisConfig: EpicurusRedisConfig = {
     getRedisSubClient: () => redisSub,
     subscribe: <T = any>(channel: string, callback: subscribeCallback<T>) => subscribe(redisSub, channel, callback),
     publish: (channel: string, body: any) => publish(redisClient, channel, body),
-    server: <T = any, S = any>(channel: string, callback: serverCallback<T, S>) => server(redisClient, channel, callback),
-    request: <T = any>(channel: string, body: any) => request<T>(redisClient, channel, body),
+    server: <T = any, S = any>(channel: string, callback: serverCallback<T, S>) => server(redisClient, channel, callback, requestValidityPeriod),
+    request: <T = any>(channel: string, body: any) => request<T>(redisClient, channel, body, requestValidityPeriod),
     shutdown: () => {
       shutdownSubscribers()
       disableServers()

package.json

@@ -1,11 +1,16 @@
 import * as v4 from 'uuid/v4'
-import { config } from '../../config'
+
+import {
+  EpicurusRequest,
+  EpicurusResponse,
+  serverCallback,
+} from '../../interface'
 import { EpicurusError } from '../error'
-import { EpicurusRequest, EpicurusResponse, serverCallback } from '../../interface'
+
 let clients = []
 let serversEnabled
 
-export function request<T>(redisClient, channel: string, body: any): Promise<T> {
+export function request<T>(redisClient, channel: string, body: any, requestValidityPeriod: number): Promise<T> {
   return new Promise(async (res, rej) => {
     let responseValid = true
     const reqId = v4()
@@ -28,7 +33,7 @@ export function request<T>(redisClient, channel: string, body: any): Promise<T>
 
           responseValid = false
           clientClone.quit()
-        }, config.requestValidityPeriod)
+        }, requestValidityPeriod)
       } else {
         rej(new EpicurusError('Server not found', {
           context: { originalRequest: body, channel: channel },
@@ -38,7 +43,7 @@ export function request<T>(redisClient, channel: string, body: any): Promise<T>
         responseValid = false
         clientClone.quit()
       }
-    }, config.requestValidityPeriod + 100)
+    }, requestValidityPeriod + 100)
 
     clientClone.brpop(reqId, 0, function (_null, popInfo) {
       clearTimeout(timeout)
@@ -72,7 +77,7 @@ export function request<T>(redisClient, channel: string, body: any): Promise<T>
   })
 }
 
-export async function server<T, S>(redisClient, channel: string, callback: serverCallback<T, S>): Promise<void> {
+export async function server<T, S>(redisClient, channel: string, callback: serverCallback<T, S>, serverValidityPeriod: number): Promise<void> {
   const clientClone = redisClient.duplicate()
   clients.push(clientClone)
 
@@ -95,7 +100,7 @@ export async function server<T, S>(redisClient, channel: string, callback: serve
       const req: EpicurusRequest = JSON.parse(rawRequest)
       req.body.channel = channel
 
-      if (req.ttl > Date.now() - config.requestValidityPeriod) {
+      if (req.ttl > Date.now() - serverValidityPeriod) {
         callback(req.body, async function (error, result) {
           const errorRef = error
             ? { name: error.name, message: error.message, stack: error.stack, severity: error.severity || 1, status: error.status }