From 2ee128df17093d9e83b4caa10f54e8c2a0cdd77f Mon Sep 17 00:00:00 2001 From: Anas Khan Date: Wed, 29 Nov 2023 12:09:25 +0530 Subject: [PATCH 01/10] intercepting commands to check if client in ready state, add custom errors, timeout for cluster --- lib/index.d.ts | 2 ++ lib/index.js | 50 +++++++++++++++++++++++++- package.json | 3 +- src/index.ts | 56 +++++++++++++++++++++++++++++ tests/single.js | 95 ++++++++++++++++++++++++------------------------- 5 files changed, 156 insertions(+), 50 deletions(-) diff --git a/lib/index.d.ts b/lib/index.d.ts index 28f176d..1c0b916 100644 --- a/lib/index.d.ts +++ b/lib/index.d.ts @@ -45,6 +45,7 @@ declare class Redis { emitter: EventEmitter; config: RedisConfig; client: Cluster | _Redis; + commandTimeout?: number; /** * @param {string} name - unique name to this service * @param {EventEmitter} emitter @@ -54,6 +55,7 @@ declare class Redis { log(message: string, data: unknown): void; success(message: string, data: unknown): void; error(err: Error, data: unknown): void; + makeError(message: string, data: unknown): Error; /** * Connect to redis server with the config * diff --git a/lib/index.js b/lib/index.js index b2ad13d..77e4992 100644 --- a/lib/index.js +++ b/lib/index.js @@ -23,6 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) { return result; }; const ioredis_1 = __importStar(require("ioredis")); +const commands_1 = require("@ioredis/commands"); function retryStrategy(times) { if (times > 1000) { // eslint-disable-next-line no-console @@ -53,6 +54,7 @@ class Redis { emitter; config; client; + commandTimeout; /** * @param {string} name - unique name to this service * @param {EventEmitter} emitter @@ -61,6 +63,7 @@ class Redis { constructor(name, emitter, config) { this.name = name; this.emitter = emitter; + this.commandTimeout = config.commandTimeout; this.config = Object.assign({ host: "localhost", port: 6379, @@ -99,6 +102,11 @@ class Redis { err, }); } + makeError(message, data) { + const error = new Error(message); + this.error(error, data); + return error; + } /** * Connect to redis server with the config * @@ -198,6 +206,46 @@ class Redis { // single node finish } this.log(`Connecting in ${infoObj.mode} mode`, infoObj); + client = new Proxy(client, { + get: (target, prop) => { + if ((0, commands_1.exists)(String(prop))) { + // check if client in ready state + if (this.client.status !== "ready") { + throw this.makeError("redis.NOT_READY", { + command: prop, + }); + } + // check if cluster and command timeout is set + let promiseTimeout; + if (this.client.isCluster && this.commandTimeout) { + promiseTimeout = (ms) => new Promise((_, reject) => setTimeout(() => { + reject(this.makeError("redis.COMMAND_TIMEOUT", { + command: prop, + timeout: ms, + })); + }, ms)); + } + return async (...args) => { + try { + const promises = []; + promises.push(target[prop](...args)); + if (promiseTimeout) { + promises.push(promiseTimeout(this.commandTimeout)); + } + return await Promise.race(promises); + } + catch (err) { + throw this.makeError("redis.COMMAND_ERROR", { + command: prop, + args, + error: err, + }); + } + }; + } + return target[prop]; + }, + }); // common events client.on("connect", () => { this.success(`Successfully connected in ${infoObj.mode} mode`, null); @@ -249,4 +297,4 @@ class Redis { } } module.exports = Redis; -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"} \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAAA,mDAKiB;AAEjB,gDAAwD;AAExD,SAAS,aAAa,CAAC,KAAa;IAClC,IAAI,KAAK,GAAG,IAAI,EAAE;QAChB,sCAAsC;QACtC,OAAO,CAAC,KAAK,CAAC,mDAAmD,CAAC,CAAC;QACnE,OAAO,IAAI,CAAC;KACb;IACD,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,GAAG,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC,4EAA4E;IACvH,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI;IAClC,IAAI,IAAI,CAAC,GAAG,KAAK,IAAI,EAAE;QACrB,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE;YAClB,cAAc,EAAE,MAAM;SACvB,CAAC,CAAC;QACH,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;KAClC;SAAM;QACL,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE;YAClB,cAAc,EAAE,OAAO;SACxB,CAAC,CAAC;KACJ;AACH,CAAC;AAgCD;;GAEG;AACH,MAAM,KAAK;IACT,IAAI,CAAS;IACb,OAAO,CAAe;IACtB,MAAM,CAAc;IACpB,MAAM,CAAmB;IACzB,cAAc,CAAU;IAExB;;;;OAIG;IACH,YAAY,IAAY,EAAE,OAAqB,EAAE,MAAmB;QAClE,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,cAAc,GAAG,MAAM,CAAC,cAAc,CAAC;QAC5C,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CACzB;YACE,IAAI,EAAE,WAAW;YACjB,IAAI,EAAE,IAAI;YACV,EAAE,EAAE,CAAC;SACN,EACD,MAAM,EACN;YACE,IAAI,EAAE,MAAM,CAAC,MAAM,CACjB;gBACE,GAAG,EAAE,KAAK;aACX,EACD,MAAM,CAAC,IAAI,CACZ;YACD,OAAO,EAAE,MAAM,CAAC,MAAM,CACpB;gBACE,GAAG,EAAE,KAAK;aACX,EACD,MAAM,CAAC,OAAO,CACf;YACD,QAAQ,EAAE,MAAM,CAAC,MAAM,CACrB;gBACE,GAAG,EAAE,KAAK;aACX,EACD,MAAM,CAAC,QAAQ,CAChB;SACF,CACF,CAAC;QACF,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;IACrB,CAAC;IAED,GAAG,CAAC,OAAe,EAAE,IAAa;QAChC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,EAAE;YACvB,OAAO,EAAE,IAAI,CAAC,IAAI;YAClB,OAAO;YACP,IAAI;SACL,CAAC,CAAC;IACL,CAAC;IAED,OAAO,CAAC,OAAe,EAAE,IAAa;QACpC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE;YAC3B,OAAO,EAAE,IAAI,CAAC,IAAI;YAClB,OAAO;YACP,IAAI;SACL,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,GAAU,EAAE,IAAa;QAC7B,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE;YACzB,OAAO,EAAE,IAAI,CAAC,IAAI;YAClB,IAAI;YACJ,GAAG;SACJ,CAAC,CAAC;IACL,CAAC;IAED,SAAS,CAAC,OAAe,EAAE,IAAa;QACtC,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;QACjC,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QACxB,OAAO,KAAK,CAAC;IACf,CAAC;IAED;;;;;OAKG;IACH,IAAI;QACF,IAAI,IAAI,CAAC,MAAM,EAAE;YACf,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;SAC9B;QAED,6BAA6B;QAC7B,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC7B,IAAI,MAAM,GAAG,IAAI,CAAC;YAClB,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;YACxB,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,cAAc,EAAE,GAC/D,MAAM,CAAC;YACT,MAAM,OAAO,GAAG;gBACd,IAAI,EAAE,IAAI;aACX,CAAC;YAEF,IAAI,OAAO,CAAC,GAAG,KAAK,IAAI,EAAE;gBACxB,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE;oBACrB,IAAI,EAAE,SAAS;oBACf,KAAK,EAAE,OAAO,CAAC,KAAK;iBACrB,CAAC,CAAC;gBACH,MAAM,cAAc,GAAmB;oBACrC,oBAAoB,EAAE,OAAO,CAAC,cAAc,IAAI,KAAK;oBACrD,oBAAoB,EAAE,aAAa;iBACpC,CAAC;gBAEF,OAAO,CAAC,IAAI,EAAE,cAAc,EAAE,OAAO,CAAC,CAAC;gBACvC,MAAM,GAAG,IAAI,iBAAO,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC;gBAE3D,0BAA0B;gBAC1B,MAAM,CAAC,EAAE,CAAC,YAAY,EAAE,CAAC,GAAG,EAAE,EAAE;oBAC9B,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE;wBACd,IAAI,EAAE,YAAY;qBACnB,CAAC,CAAC;gBACL,CAAC,CAAC,CAAC;gBACH,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE;oBAC1B,MAAM,OAAO,GAAG,cAAc,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC;oBACjD,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE;wBAChB,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG;qBACtB,CAAC,CAAC;gBACL,CAAC,CAAC,CAAC;gBACH,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE;oBAC1B,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,gBAAgB,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;oBAC5D,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE;wBAChB,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG;qBACtB,CAAC,CAAC;gBACL,CAAC,CAAC,CAAC;gBAEH,iBAAiB;aAClB;iBAAM,IAAI,QAAQ,CAAC,GAAG,KAAK,IAAI,EAAE;gBAChC,gBAAgB;gBAChB,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,QAAQ,CAAC;gBACjC,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE;oBACrB,IAAI,EAAE,UAAU;oBAChB,KAAK;oBACL,IAAI;iBACL,CAAC,CAAC;gBACH,MAAM,OAAO,GAAiB;oBAC5B,SAAS,EAAE,KAAK;oBAChB,IAAI;oBACJ,EAAE;oBACF,aAAa;oBACb,gBAAgB,EAAE,GAAG,EAAE;wBACrB,OAAO,IAAI,CAAC;oBACd,CAAC;oBACD,oBAAoB,EAAE,QAAQ,CAAC,cAAc,IAAI,KAAK;iBACvD,CAAC;gBACF,IAAI,cAAc,EAAE;oBAClB,OAAO,CAAC,cAAc,GAAG,cAAc,CAAC;iBACzC;gBACD,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;gBAChC,MAAM,GAAG,IAAI,iBAAO,CAAC,OAAO,CAAC,CAAC;aAC/B;iBAAM;gBACL,cAAc;gBACd,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE;oBACrB,IAAI,EAAE,QAAQ;oBACd,IAAI;oBACJ,IAAI;oBACJ,EAAE;iBACH,CAAC,CAAC;gBACH,MAAM,OAAO,GAAiB;oBAC5B,IAAI;oBACJ,IAAI;oBACJ,EAAE;oBACF,aAAa;oBACb,gBAAgB,EAAE,GAAG,EAAE;wBACrB,OAAO,IAAI,CAAC;oBACd,CAAC;oBACD,oBAAoB,EAAE,MAAM,CAAC,cAAc,IAAI,KAAK;iBACrD,CAAC;gBACF,IAAI,cAAc,EAAE;oBAClB,OAAO,CAAC,cAAc,GAAG,cAAc,CAAC;iBACzC;gBACD,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;gBAChC,MAAM,GAAG,IAAI,iBAAO,CAAC,OAAO,CAAC,CAAC;gBAC9B,qBAAqB;aACtB;YAED,IAAI,CAAC,GAAG,CAAC,iBAAiB,OAAO,CAAC,IAAI,OAAO,EAAE,OAAO,CAAC,CAAC;YAExD,MAAM,GAAG,IAAI,KAAK,CAAC,MAAM,EAAE;gBACzB,GAAG,EAAE,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE;oBACpB,IAAI,IAAA,iBAAS,EAAC,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE;wBAC3B,iCAAiC;wBACjC,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,KAAK,OAAO,EAAE;4BAClC,MAAM,IAAI,CAAC,SAAS,CAAC,iBAAiB,EAAE;gCACtC,OAAO,EAAE,IAAI;6BACd,CAAC,CAAC;yBACJ;wBAED,8CAA8C;wBAC9C,IAAI,cAAc,CAAC;wBACnB,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,IAAI,IAAI,CAAC,cAAc,EAAE;4BAChD,cAAc,GAAG,CAAC,EAAE,EAAE,EAAE,CACtB,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,CACxB,UAAU,CAAC,GAAG,EAAE;gCACd,MAAM,CACJ,IAAI,CAAC,SAAS,CAAC,uBAAuB,EAAE;oCACtC,OAAO,EAAE,IAAI;oCACb,OAAO,EAAE,EAAE;iCACZ,CAAC,CACH,CAAC;4BACJ,CAAC,EAAE,EAAE,CAAC,CACP,CAAC;yBACL;wBAED,OAAO,KAAK,EAAE,GAAG,IAAI,EAAE,EAAE;4BACvB,IAAI;gCACF,MAAM,QAAQ,GAAG,EAAE,CAAC;gCACpB,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC;gCACrC,IAAI,cAAc,EAAE;oCAClB,QAAQ,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC;iCACpD;gCACD,OAAO,MAAM,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;6BACrC;4BAAC,OAAO,GAAG,EAAE;gCACZ,MAAM,IAAI,CAAC,SAAS,CAAC,qBAAqB,EAAE;oCAC1C,OAAO,EAAE,IAAI;oCACb,IAAI;oCACJ,KAAK,EAAE,GAAG;iCACX,CAAC,CAAC;6BACJ;wBACH,CAAC,CAAC;qBACH;oBACD,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC;gBACtB,CAAC;aACF,CAAC,CAAC;YAEH,gBAAgB;YAChB,MAAM,CAAC,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE;gBACxB,IAAI,CAAC,OAAO,CAAC,6BAA6B,OAAO,CAAC,IAAI,OAAO,EAAE,IAAI,CAAC,CAAC;YACvE,CAAC,CAAC,CAAC;YACH,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;gBACzB,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;YACtB,CAAC,CAAC,CAAC;YACH,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;gBACtB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;gBACrB,OAAO,CAAC,IAAI,CAAC,CAAC;YAChB,CAAC,CAAC,CAAC;YACH,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;gBACtB,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;gBACnD,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;YAC1B,CAAC,CAAC,CAAC;YACH,MAAM,CAAC,EAAE,CAAC,cAAc,EAAE,CAAC,IAAI,EAAE,EAAE;gBACjC,IAAI,CAAC,GAAG,CACN,mBAAmB,OAAO,CAAC,IAAI,eAAe,IAAI,KAAK,EACvD,OAAO,CACR,CAAC;YACJ,CAAC,CAAC,CAAC;YACH,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE;gBACpB,IAAI,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,kBAAkB,CAAC,EAAE,IAAI,CAAC,CAAC;YAClD,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,MAAM;QACV,sBAAsB;QACtB,MAAM,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;YACrB,IAAI,GAAG,CAAC,CAAC,CAAC,EAAE;gBACV,MAAM,IAAI,KAAK,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC;aAC5C;QACH,CAAC,CAAC,CAAC;QACH,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IACrC,CAAC;IAED,GAAG,CAAC,GAAU;QACZ,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;QACrC,GAAG,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;YAClB,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,GAAG,GAAG,CAAC,IAAI,CAAC,CAAC;QAClC,CAAC,CAAC,CAAC;QACH,OAAO,KAAK,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE;YACpC,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;YACpC,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;gBAC/B,MAAM,MAAM,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;gBAC/C,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC;YACrB,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AAED,iBAAS,KAAK,CAAC"} \ No newline at end of file diff --git a/package.json b/package.json index 62c0135..38786d5 100644 --- a/package.json +++ b/package.json @@ -23,6 +23,7 @@ }, "homepage": "https://github.com/akshendra/redis-wrapper#readme", "dependencies": { + "@ioredis/commands": "^1.2.0", "ioredis": "5.3.2" }, "devDependencies": { @@ -36,4 +37,4 @@ "eslint-plugin-import": "^2.23.4", "typescript": "^4.4.4" } -} \ No newline at end of file +} diff --git a/src/index.ts b/src/index.ts index 2900adf..8abe940 100644 --- a/src/index.ts +++ b/src/index.ts @@ -5,6 +5,7 @@ import IoRedis, { RedisOptions, } from "ioredis"; import EventEmitter from "events"; +import { exists as isCommand } from "@ioredis/commands"; function retryStrategy(times: number): number { if (times > 1000) { @@ -67,6 +68,7 @@ class Redis { emitter: EventEmitter; config: RedisConfig; client: Cluster | _Redis; + commandTimeout?: number; /** * @param {string} name - unique name to this service @@ -76,6 +78,7 @@ class Redis { constructor(name: string, emitter: EventEmitter, config: RedisConfig) { this.name = name; this.emitter = emitter; + this.commandTimeout = config.commandTimeout; this.config = Object.assign( { host: "localhost", @@ -131,6 +134,12 @@ class Redis { }); } + makeError(message: string, data: unknown): Error { + const error = new Error(message); + this.error(error, data); + return error; + } + /** * Connect to redis server with the config * @@ -236,6 +245,53 @@ class Redis { this.log(`Connecting in ${infoObj.mode} mode`, infoObj); + client = new Proxy(client, { + get: (target, prop) => { + if (isCommand(String(prop))) { + // check if client in ready state + if (this.client.status !== "ready") { + throw this.makeError("redis.NOT_READY", { + command: prop, + }); + } + + // check if cluster and command timeout is set + let promiseTimeout; + if (this.client.isCluster && this.commandTimeout) { + promiseTimeout = (ms) => + new Promise((_, reject) => + setTimeout(() => { + reject( + this.makeError("redis.COMMAND_TIMEOUT", { + command: prop, + timeout: ms, + }) + ); + }, ms) + ); + } + + return async (...args) => { + try { + const promises = []; + promises.push(target[prop](...args)); + if (promiseTimeout) { + promises.push(promiseTimeout(this.commandTimeout)); + } + return await Promise.race(promises); + } catch (err) { + throw this.makeError("redis.COMMAND_ERROR", { + command: prop, + args, + error: err, + }); + } + }; + } + return target[prop]; + }, + }); + // common events client.on("connect", () => { this.success(`Successfully connected in ${infoObj.mode} mode`, null); diff --git a/tests/single.js b/tests/single.js index aaee6be..cb16408 100644 --- a/tests/single.js +++ b/tests/single.js @@ -1,65 +1,64 @@ - - -const Redis = require('../lib/index'); -const { EventEmitter } = require('events'); +const Redis = require("../lib/index"); +const { EventEmitter } = require("events"); const emitter = new EventEmitter(); -emitter.on('log', console.log.bind(console)); -emitter.on('success', console.log.bind(console)); -emitter.on('error', console.error.bind(console)); +emitter.on("log", console.log.bind(console)); +emitter.on("success", console.log.bind(console)); +emitter.on("error", console.error.bind(console)); async function doSome(client) { for (let i = 0; i < 1000; i += 1) { console.log(i); - await client.set(`Key:${i}`, i); + // add timeout of 1s + await new Promise((resolve) => setTimeout(resolve, 1000)); + try { + await client.set(`Key:${i}`, i); + } catch (err) { + console.log(err); + } } } async function doPPL(redis) { - await redis.ppl([{ - command: 'hset', - args: [ - 'Map', - 'one', - '1', - ], - }, { - command: 'hmset', - args: [ - 'Map', - { 'two': 2, 'three': 3 }, - ], - }, { - command: 'set', - args: [ - 'count', - '3', - ], - }]); - const response = await redis.ppl([{ - command: 'hgetall', - args: [ - 'Map', - ], - }, { - command: 'get', - args: [ - 'count', - ], - action(val) { - return { - count: val, - }; + await redis.ppl([ + { + command: "hset", + args: ["Map", "one", "1"], + }, + { + command: "hmset", + args: ["Map", { two: 2, three: 3 }], + }, + { + command: "set", + args: ["count", "3"], + }, + ]); + const response = await redis.ppl([ + { + command: "hgetall", + args: ["Map"], + }, + { + command: "get", + args: ["count"], + action(val) { + return { + count: val, + }; + }, }, - }]); + ]); console.log(JSON.stringify(response, null, 2)); } -const redis = new Redis('redis', emitter, { - host: '127.0.0.1', +const redis = new Redis("redis", emitter, { + host: "127.0.0.1", port: 6379, + commandTimeout: 100, }); -redis.init() +redis + .init() .then(() => { const client = redis.client; return doSome(client); @@ -68,10 +67,10 @@ redis.init() return doPPL(redis); }) .then(() => { - console.log('Started'); + console.log("Started"); process.exit(0); }) - .catch(err => { + .catch((err) => { console.error(err); process.exit(1); }); From 2c37d66d70270a6e7a36198bd9ec15d5cf5a431b Mon Sep 17 00:00:00 2001 From: Anas Khan Date: Wed, 29 Nov 2023 12:45:19 +0530 Subject: [PATCH 02/10] added prometheus metrics --- lib/index.d.ts | 15 ++++- lib/index.js | 20 +++++- package.json | 3 +- src/index.ts | 176 ++++++++++++++++++++++++++++++++++++------------- 4 files changed, 162 insertions(+), 52 deletions(-) diff --git a/lib/index.d.ts b/lib/index.d.ts index 1c0b916..0099bc2 100644 --- a/lib/index.d.ts +++ b/lib/index.d.ts @@ -1,6 +1,7 @@ /// import { Redis as _Redis, Cluster } from "ioredis"; import EventEmitter from "events"; +import { Registry } from "prom-client"; interface RedisConfig { /** provide host ip/url, default - localhost */ host?: string; @@ -46,12 +47,24 @@ declare class Redis { config: RedisConfig; client: Cluster | _Redis; commandTimeout?: number; + metrics?: { + register: Registry; + labels: { + [key: string]: string; + }; + }; /** * @param {string} name - unique name to this service * @param {EventEmitter} emitter * @param {RedisConfig} config - configuration object of service + * @param {Registry} metrics - prometheus client */ - constructor(name: string, emitter: EventEmitter, config: RedisConfig); + constructor(name: string, emitter: EventEmitter, config: RedisConfig, metrics?: { + register: Registry; + labels: { + [key: string]: string; + }; + }); log(message: string, data: unknown): void; success(message: string, data: unknown): void; error(err: Error, data: unknown): void; diff --git a/lib/index.js b/lib/index.js index 77e4992..fd8d52e 100644 --- a/lib/index.js +++ b/lib/index.js @@ -24,6 +24,7 @@ var __importStar = (this && this.__importStar) || function (mod) { }; const ioredis_1 = __importStar(require("ioredis")); const commands_1 = require("@ioredis/commands"); +const prom_client_1 = require("prom-client"); function retryStrategy(times) { if (times > 1000) { // eslint-disable-next-line no-console @@ -55,15 +56,28 @@ class Redis { config; client; commandTimeout; + metrics; /** * @param {string} name - unique name to this service * @param {EventEmitter} emitter * @param {RedisConfig} config - configuration object of service + * @param {Registry} metrics - prometheus client */ - constructor(name, emitter, config) { + constructor(name, emitter, config, metrics) { this.name = name; this.emitter = emitter; this.commandTimeout = config.commandTimeout; + this.metrics = metrics; + if (this.metrics) { + // register counters + // create counter for tracking the number of times redis commands are called + const redisCommandCounter = new prom_client_1.Counter({ + name: "redis_command_counter", + help: "redis command counter", + labelNames: [...Object.keys(this.metrics.labels), "command"], + registers: [this.metrics.register], + }); + } this.config = Object.assign({ host: "localhost", port: 6379, @@ -217,7 +231,7 @@ class Redis { } // check if cluster and command timeout is set let promiseTimeout; - if (this.client.isCluster && this.commandTimeout) { + if (this.commandTimeout) { promiseTimeout = (ms) => new Promise((_, reject) => setTimeout(() => { reject(this.makeError("redis.COMMAND_TIMEOUT", { command: prop, @@ -297,4 +311,4 @@ class Redis { } } module.exports = Redis; -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"} \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/package.json b/package.json index 38786d5..2fb0fb0 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,8 @@ "homepage": "https://github.com/akshendra/redis-wrapper#readme", "dependencies": { "@ioredis/commands": "^1.2.0", - "ioredis": "5.3.2" + "ioredis": "5.3.2", + "prom-client": "^15.0.0" }, "devDependencies": { "@types/node": "^16.11.7", diff --git a/src/index.ts b/src/index.ts index 8abe940..5577211 100644 --- a/src/index.ts +++ b/src/index.ts @@ -6,6 +6,8 @@ import IoRedis, { } from "ioredis"; import EventEmitter from "events"; import { exists as isCommand } from "@ioredis/commands"; +import { Registry, Counter, Histogram } from "prom-client"; +import { performance } from "perf_hooks"; function retryStrategy(times: number): number { if (times > 1000) { @@ -69,16 +71,60 @@ class Redis { config: RedisConfig; client: Cluster | _Redis; commandTimeout?: number; + metrics?: { + register: Registry; + labels: { [key: string]: string }; + }; + trackers?: { [key: string]: Counter | Histogram }; /** * @param {string} name - unique name to this service * @param {EventEmitter} emitter * @param {RedisConfig} config - configuration object of service + * @param {Registry} metrics - prometheus client */ - constructor(name: string, emitter: EventEmitter, config: RedisConfig) { + constructor( + name: string, + emitter: EventEmitter, + config: RedisConfig, + metrics?: { + register: Registry; + labels: { [key: string]: string }; + } + ) { this.name = name; this.emitter = emitter; this.commandTimeout = config.commandTimeout; + this.metrics = metrics; + this.trackers = {}; + + if (this.metrics) { + // register counters + // create counter for tracking the number of times redis commands are called + this.trackers["commands"] = new Counter({ + name: "redis_command_counter", + help: "keep track of all redis commands", + labelNames: [...Object.keys(this.metrics.labels), "command"], + registers: [this.metrics.register], + }); + + // create counter for tracking the number of times redis commands have failed + this.trackers["errors"] = new Counter({ + name: "redis_command_error_counter", + help: "keep track of all redis command errors", + labelNames: [...Object.keys(this.metrics.labels), "command"], + registers: [this.metrics.register], + }); + + // create histogram for tracking latencies of redis commands + this.trackers["latencies"] = new Histogram({ + name: "redis_command_latency", + help: "keep track of redis command latencies", + labelNames: [...Object.keys(this.metrics.labels), "command"], + registers: [this.metrics.register], + }); + } + this.config = Object.assign( { host: "localhost", @@ -140,6 +186,87 @@ class Redis { return error; } + makeProxy() { + return new Proxy(this.client, { + get: (target, prop) => { + if (isCommand(String(prop))) { + // check if client in ready state + if (this.client.status !== "ready") { + throw this.makeError("redis.NOT_READY", { + command: prop, + }); + } + + // check if cluster and command timeout is set + let promiseTimeout; + if (this.client.isCluster && this.commandTimeout) { + promiseTimeout = (ms) => + new Promise((_, reject) => + setTimeout(() => { + reject( + this.makeError("redis.COMMAND_TIMEOUT", { + command: prop, + timeout: ms, + }) + ); + }, ms) + ); + } + + return async (...args) => { + const startTime = performance.now(); + try { + const promises = []; + promises.push(target[prop](...args)); + (this.trackers["commands"] as Counter).inc( + { + ...this.metrics.labels, + command: String(prop), + }, + 1 + ); + if (promiseTimeout) { + promises.push(promiseTimeout(this.commandTimeout)); + } + const result = await Promise.race(promises); + const endTime = performance.now(); + (this.trackers["latencies"] as Histogram).observe( + { + ...this.metrics.labels, + command: String(prop), + }, + endTime - startTime + ); + return result; + } catch (err) { + const endTime = performance.now(); + (this.trackers["latencies"] as Histogram).observe( + { + ...this.metrics.labels, + command: String(prop), + }, + endTime - startTime + ); + (this.trackers["errors"] as Counter).inc( + { + ...this.metrics.labels, + command: String(prop), + }, + 1 + ); + throw this.makeError("redis.COMMAND_ERROR", { + command: prop, + args, + error: err, + }); + } + }; + } + return target[prop]; + }, + }); + } + /** * Connect to redis server with the config * @@ -245,52 +372,7 @@ class Redis { this.log(`Connecting in ${infoObj.mode} mode`, infoObj); - client = new Proxy(client, { - get: (target, prop) => { - if (isCommand(String(prop))) { - // check if client in ready state - if (this.client.status !== "ready") { - throw this.makeError("redis.NOT_READY", { - command: prop, - }); - } - - // check if cluster and command timeout is set - let promiseTimeout; - if (this.client.isCluster && this.commandTimeout) { - promiseTimeout = (ms) => - new Promise((_, reject) => - setTimeout(() => { - reject( - this.makeError("redis.COMMAND_TIMEOUT", { - command: prop, - timeout: ms, - }) - ); - }, ms) - ); - } - - return async (...args) => { - try { - const promises = []; - promises.push(target[prop](...args)); - if (promiseTimeout) { - promises.push(promiseTimeout(this.commandTimeout)); - } - return await Promise.race(promises); - } catch (err) { - throw this.makeError("redis.COMMAND_ERROR", { - command: prop, - args, - error: err, - }); - } - }; - } - return target[prop]; - }, - }); + client = this.makeProxy(); // common events client.on("connect", () => { From 6d7c3ab71e423f8677360e80992a2f8f9407c562 Mon Sep 17 00:00:00 2001 From: Anas Khan Date: Wed, 29 Nov 2023 12:47:32 +0530 Subject: [PATCH 03/10] fixes --- lib/index.d.ts | 6 ++- lib/index.js | 126 ++++++++++++++++++++++++++++++++----------------- src/index.ts | 14 +++--- 3 files changed, 95 insertions(+), 51 deletions(-) diff --git a/lib/index.d.ts b/lib/index.d.ts index 0099bc2..29b1c6e 100644 --- a/lib/index.d.ts +++ b/lib/index.d.ts @@ -1,7 +1,7 @@ /// import { Redis as _Redis, Cluster } from "ioredis"; import EventEmitter from "events"; -import { Registry } from "prom-client"; +import { Registry, Counter, Histogram } from "prom-client"; interface RedisConfig { /** provide host ip/url, default - localhost */ host?: string; @@ -53,6 +53,9 @@ declare class Redis { [key: string]: string; }; }; + trackers?: { + [key: string]: Counter | Histogram; + }; /** * @param {string} name - unique name to this service * @param {EventEmitter} emitter @@ -69,6 +72,7 @@ declare class Redis { success(message: string, data: unknown): void; error(err: Error, data: unknown): void; makeError(message: string, data: unknown): Error; + makeProxy(client: any): any; /** * Connect to redis server with the config * diff --git a/lib/index.js b/lib/index.js index fd8d52e..19c0999 100644 --- a/lib/index.js +++ b/lib/index.js @@ -25,6 +25,7 @@ var __importStar = (this && this.__importStar) || function (mod) { const ioredis_1 = __importStar(require("ioredis")); const commands_1 = require("@ioredis/commands"); const prom_client_1 = require("prom-client"); +const perf_hooks_1 = require("perf_hooks"); function retryStrategy(times) { if (times > 1000) { // eslint-disable-next-line no-console @@ -57,6 +58,7 @@ class Redis { client; commandTimeout; metrics; + trackers; /** * @param {string} name - unique name to this service * @param {EventEmitter} emitter @@ -68,12 +70,27 @@ class Redis { this.emitter = emitter; this.commandTimeout = config.commandTimeout; this.metrics = metrics; + this.trackers = {}; if (this.metrics) { // register counters // create counter for tracking the number of times redis commands are called - const redisCommandCounter = new prom_client_1.Counter({ + this.trackers["commands"] = new prom_client_1.Counter({ name: "redis_command_counter", - help: "redis command counter", + help: "keep track of all redis commands", + labelNames: [...Object.keys(this.metrics.labels), "command"], + registers: [this.metrics.register], + }); + // create counter for tracking the number of times redis commands have failed + this.trackers["errors"] = new prom_client_1.Counter({ + name: "redis_command_error_counter", + help: "keep track of all redis command errors", + labelNames: [...Object.keys(this.metrics.labels), "command"], + registers: [this.metrics.register], + }); + // create histogram for tracking latencies of redis commands + this.trackers["latencies"] = new prom_client_1.Histogram({ + name: "redis_command_latency", + help: "keep track of redis command latencies", labelNames: [...Object.keys(this.metrics.labels), "command"], registers: [this.metrics.register], }); @@ -121,6 +138,68 @@ class Redis { this.error(error, data); return error; } + makeProxy(client) { + return new Proxy(client, { + get: (target, prop) => { + if ((0, commands_1.exists)(String(prop))) { + // check if client in ready state + if (this.client.status !== "ready") { + throw this.makeError("redis.NOT_READY", { + command: prop, + }); + } + // check if cluster and command timeout is set + let promiseTimeout; + if (this.client.isCluster && this.commandTimeout) { + promiseTimeout = (ms) => new Promise((_, reject) => setTimeout(() => { + reject(this.makeError("redis.COMMAND_TIMEOUT", { + command: prop, + timeout: ms, + })); + }, ms)); + } + return async (...args) => { + const startTime = perf_hooks_1.performance.now(); + try { + const promises = []; + promises.push(target[prop](...args)); + this.trackers["commands"]?.inc({ + ...this.metrics.labels, + command: String(prop), + }, 1); + if (promiseTimeout) { + promises.push(promiseTimeout(this.commandTimeout)); + } + const result = await Promise.race(promises); + const endTime = perf_hooks_1.performance.now(); + this.trackers["latencies"]?.observe({ + ...this.metrics.labels, + command: String(prop), + }, endTime - startTime); + return result; + } + catch (err) { + const endTime = perf_hooks_1.performance.now(); + this.trackers["latencies"]?.observe({ + ...this.metrics.labels, + command: String(prop), + }, endTime - startTime); + this.trackers["errors"]?.inc({ + ...this.metrics.labels, + command: String(prop), + }, 1); + throw this.makeError("redis.COMMAND_ERROR", { + command: prop, + args, + error: err, + }); + } + }; + } + return target[prop]; + }, + }); + } /** * Connect to redis server with the config * @@ -220,46 +299,7 @@ class Redis { // single node finish } this.log(`Connecting in ${infoObj.mode} mode`, infoObj); - client = new Proxy(client, { - get: (target, prop) => { - if ((0, commands_1.exists)(String(prop))) { - // check if client in ready state - if (this.client.status !== "ready") { - throw this.makeError("redis.NOT_READY", { - command: prop, - }); - } - // check if cluster and command timeout is set - let promiseTimeout; - if (this.commandTimeout) { - promiseTimeout = (ms) => new Promise((_, reject) => setTimeout(() => { - reject(this.makeError("redis.COMMAND_TIMEOUT", { - command: prop, - timeout: ms, - })); - }, ms)); - } - return async (...args) => { - try { - const promises = []; - promises.push(target[prop](...args)); - if (promiseTimeout) { - promises.push(promiseTimeout(this.commandTimeout)); - } - return await Promise.race(promises); - } - catch (err) { - throw this.makeError("redis.COMMAND_ERROR", { - command: prop, - args, - error: err, - }); - } - }; - } - return target[prop]; - }, - }); + client = this.makeProxy(client); // common events client.on("connect", () => { this.success(`Successfully connected in ${infoObj.mode} mode`, null); @@ -311,4 +351,4 @@ class Redis { } } module.exports = Redis; -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"} \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/index.ts b/src/index.ts index 5577211..85fc2b0 100644 --- a/src/index.ts +++ b/src/index.ts @@ -186,8 +186,8 @@ class Redis { return error; } - makeProxy() { - return new Proxy(this.client, { + makeProxy(client) { + return new Proxy(client, { get: (target, prop) => { if (isCommand(String(prop))) { // check if client in ready state @@ -218,7 +218,7 @@ class Redis { try { const promises = []; promises.push(target[prop](...args)); - (this.trackers["commands"] as Counter).inc( + (this.trackers["commands"] as Counter)?.inc( { ...this.metrics.labels, command: String(prop), @@ -230,7 +230,7 @@ class Redis { } const result = await Promise.race(promises); const endTime = performance.now(); - (this.trackers["latencies"] as Histogram).observe( + (this.trackers["latencies"] as Histogram)?.observe( { ...this.metrics.labels, command: String(prop), @@ -240,14 +240,14 @@ class Redis { return result; } catch (err) { const endTime = performance.now(); - (this.trackers["latencies"] as Histogram).observe( + (this.trackers["latencies"] as Histogram)?.observe( { ...this.metrics.labels, command: String(prop), }, endTime - startTime ); - (this.trackers["errors"] as Counter).inc( + (this.trackers["errors"] as Counter)?.inc( { ...this.metrics.labels, command: String(prop), @@ -372,7 +372,7 @@ class Redis { this.log(`Connecting in ${infoObj.mode} mode`, infoObj); - client = this.makeProxy(); + client = this.makeProxy(client); // common events client.on("connect", () => { From 4da958a1a1878e6d2a3ffeac57b378332e2da853 Mon Sep 17 00:00:00 2001 From: Anas Khan Date: Wed, 29 Nov 2023 13:54:52 +0530 Subject: [PATCH 04/10] fixes --- lib/index.d.ts | 15 ++++- lib/index.js | 108 +++++++++++++++++++++------------- src/index.ts | 153 ++++++++++++++++++++++++++++++------------------- 3 files changed, 175 insertions(+), 101 deletions(-) diff --git a/lib/index.d.ts b/lib/index.d.ts index 29b1c6e..544da8e 100644 --- a/lib/index.d.ts +++ b/lib/index.d.ts @@ -1,5 +1,5 @@ /// -import { Redis as _Redis, Cluster } from "ioredis"; +import IoRedis, { Redis as _Redis, Cluster } from "ioredis"; import EventEmitter from "events"; import { Registry, Counter, Histogram } from "prom-client"; interface RedisConfig { @@ -54,7 +54,9 @@ declare class Redis { }; }; trackers?: { - [key: string]: Counter | Histogram; + commands: Counter; + errors: Counter; + latencies: Histogram; }; /** * @param {string} name - unique name to this service @@ -72,7 +74,14 @@ declare class Redis { success(message: string, data: unknown): void; error(err: Error, data: unknown): void; makeError(message: string, data: unknown): Error; - makeProxy(client: any): any; + trackCommand(command: string): void; + trackErrors(command: string, errorMessage: string): void; + trackLatencies(command: string, startTime: number): void; + createTimeoutPromise(ms: number, command: string): { + timeoutPromise: Promise; + clear: () => void; + }; + makeProxy(client: Cluster | _Redis): Cluster | IoRedis; /** * Connect to redis server with the config * diff --git a/lib/index.js b/lib/index.js index 19c0999..62cf921 100644 --- a/lib/index.js +++ b/lib/index.js @@ -70,25 +70,28 @@ class Redis { this.emitter = emitter; this.commandTimeout = config.commandTimeout; this.metrics = metrics; - this.trackers = {}; if (this.metrics) { // register counters // create counter for tracking the number of times redis commands are called - this.trackers["commands"] = new prom_client_1.Counter({ + this.trackers.commands = new prom_client_1.Counter({ name: "redis_command_counter", help: "keep track of all redis commands", labelNames: [...Object.keys(this.metrics.labels), "command"], registers: [this.metrics.register], }); // create counter for tracking the number of times redis commands have failed - this.trackers["errors"] = new prom_client_1.Counter({ + this.trackers.errors = new prom_client_1.Counter({ name: "redis_command_error_counter", help: "keep track of all redis command errors", - labelNames: [...Object.keys(this.metrics.labels), "command"], + labelNames: [ + ...Object.keys(this.metrics.labels), + "command", + "errorMessage", + ], registers: [this.metrics.register], }); // create histogram for tracking latencies of redis commands - this.trackers["latencies"] = new prom_client_1.Histogram({ + this.trackers.latencies = new prom_client_1.Histogram({ name: "redis_command_latency", help: "keep track of redis command latencies", labelNames: [...Object.keys(this.metrics.labels), "command"], @@ -138,6 +141,49 @@ class Redis { this.error(error, data); return error; } + trackCommand(command) { + if (this.trackers?.commands) { + this.trackers.commands.inc({ + ...this.metrics.labels, + command, + }, 1); + } + } + trackErrors(command, errorMessage) { + if (this.trackers?.errors) { + this.trackers.errors.inc({ + ...this.metrics.labels, + command, + errorMessage, + }, 1); + } + } + trackLatencies(command, startTime) { + if (this.trackers?.latencies) { + const endTime = perf_hooks_1.performance.now(); + this.trackers.latencies.observe({ + ...this.metrics.labels, + command, + }, endTime - startTime); + } + } + createTimeoutPromise(ms, command) { + let timeoutId; + const timeoutPromise = new Promise((_, reject) => { + timeoutId = setTimeout(() => { + reject(this.makeError("redis.COMMAND_TIMEOUT", { + command, + timeout: ms, + })); + }, ms); + }); + return { + timeoutPromise, + clear: () => { + clearTimeout(timeoutId); + }, + }; + } makeProxy(client) { return new Proxy(client, { get: (target, prop) => { @@ -148,46 +194,30 @@ class Redis { command: prop, }); } - // check if cluster and command timeout is set - let promiseTimeout; - if (this.client.isCluster && this.commandTimeout) { - promiseTimeout = (ms) => new Promise((_, reject) => setTimeout(() => { - reject(this.makeError("redis.COMMAND_TIMEOUT", { - command: prop, - timeout: ms, - })); - }, ms)); - } return async (...args) => { const startTime = perf_hooks_1.performance.now(); try { - const promises = []; - promises.push(target[prop](...args)); - this.trackers["commands"]?.inc({ - ...this.metrics.labels, - command: String(prop), - }, 1); - if (promiseTimeout) { - promises.push(promiseTimeout(this.commandTimeout)); + this.trackCommand(String(prop)); + let result; + // check if cluster and command timeout is set + if (this.client.isCluster && this.commandTimeout) { + const { timeoutPromise, clear } = this.createTimeoutPromise(this.commandTimeout, String(prop)); + result = await Promise.race([ + target[prop](...args), + timeoutPromise, + ]).finally(() => { + clear(); + }); + } + else { + result = await target[prop](...args); } - const result = await Promise.race(promises); - const endTime = perf_hooks_1.performance.now(); - this.trackers["latencies"]?.observe({ - ...this.metrics.labels, - command: String(prop), - }, endTime - startTime); + this.trackLatencies(String(prop), startTime); return result; } catch (err) { - const endTime = perf_hooks_1.performance.now(); - this.trackers["latencies"]?.observe({ - ...this.metrics.labels, - command: String(prop), - }, endTime - startTime); - this.trackers["errors"]?.inc({ - ...this.metrics.labels, - command: String(prop), - }, 1); + this.trackLatencies(String(prop), startTime); + this.trackErrors(String(prop), err.message); throw this.makeError("redis.COMMAND_ERROR", { command: prop, args, @@ -351,4 +381,4 @@ class Redis { } } module.exports = Redis; -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAAA,mDAKiB;AAEjB,gDAAwD;AACxD,6CAA2D;AAC3D,2CAAyC;AAEzC,SAAS,aAAa,CAAC,KAAa;IAClC,IAAI,KAAK,GAAG,IAAI,EAAE;QAChB,sCAAsC;QACtC,OAAO,CAAC,KAAK,CAAC,mDAAmD,CAAC,CAAC;QACnE,OAAO,IAAI,CAAC;KACb;IACD,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,GAAG,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC,4EAA4E;IACvH,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI;IAClC,IAAI,IAAI,CAAC,GAAG,KAAK,IAAI,EAAE;QACrB,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE;YAClB,cAAc,EAAE,MAAM;SACvB,CAAC,CAAC;QACH,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;KAClC;SAAM;QACL,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE;YAClB,cAAc,EAAE,OAAO;SACxB,CAAC,CAAC;KACJ;AACH,CAAC;AAgCD;;GAEG;AACH,MAAM,KAAK;IACT,IAAI,CAAS;IACb,OAAO,CAAe;IACtB,MAAM,CAAc;IACpB,MAAM,CAAmB;IACzB,cAAc,CAAU;IACxB,OAAO,CAGL;IACF,QAAQ,CAA0C;IAElD;;;;;OAKG;IACH,YACE,IAAY,EACZ,OAAqB,EACrB,MAAmB,EACnB,OAGC;QAED,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,cAAc,GAAG,MAAM,CAAC,cAAc,CAAC;QAC5C,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;QAEnB,IAAI,IAAI,CAAC,OAAO,EAAE;YAChB,oBAAoB;YACpB,4EAA4E;YAC5E,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,GAAG,IAAI,qBAAO,CAAC;gBACtC,IAAI,EAAE,uBAAuB;gBAC7B,IAAI,EAAE,kCAAkC;gBACxC,UAAU,EAAE,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,SAAS,CAAC;gBAC5D,SAAS,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC;aACnC,CAAC,CAAC;YAEH,6EAA6E;YAC7E,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,IAAI,qBAAO,CAAC;gBACpC,IAAI,EAAE,6BAA6B;gBACnC,IAAI,EAAE,wCAAwC;gBAC9C,UAAU,EAAE,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,SAAS,CAAC;gBAC5D,SAAS,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC;aACnC,CAAC,CAAC;YAEH,4DAA4D;YAC5D,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,GAAG,IAAI,uBAAS,CAAC;gBACzC,IAAI,EAAE,uBAAuB;gBAC7B,IAAI,EAAE,uCAAuC;gBAC7C,UAAU,EAAE,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,SAAS,CAAC;gBAC5D,SAAS,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC;aACnC,CAAC,CAAC;SACJ;QAED,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CACzB;YACE,IAAI,EAAE,WAAW;YACjB,IAAI,EAAE,IAAI;YACV,EAAE,EAAE,CAAC;SACN,EACD,MAAM,EACN;YACE,IAAI,EAAE,MAAM,CAAC,MAAM,CACjB;gBACE,GAAG,EAAE,KAAK;aACX,EACD,MAAM,CAAC,IAAI,CACZ;YACD,OAAO,EAAE,MAAM,CAAC,MAAM,CACpB;gBACE,GAAG,EAAE,KAAK;aACX,EACD,MAAM,CAAC,OAAO,CACf;YACD,QAAQ,EAAE,MAAM,CAAC,MAAM,CACrB;gBACE,GAAG,EAAE,KAAK;aACX,EACD,MAAM,CAAC,QAAQ,CAChB;SACF,CACF,CAAC;QACF,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;IACrB,CAAC;IAED,GAAG,CAAC,OAAe,EAAE,IAAa;QAChC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,EAAE;YACvB,OAAO,EAAE,IAAI,CAAC,IAAI;YAClB,OAAO;YACP,IAAI;SACL,CAAC,CAAC;IACL,CAAC;IAED,OAAO,CAAC,OAAe,EAAE,IAAa;QACpC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE;YAC3B,OAAO,EAAE,IAAI,CAAC,IAAI;YAClB,OAAO;YACP,IAAI;SACL,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,GAAU,EAAE,IAAa;QAC7B,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE;YACzB,OAAO,EAAE,IAAI,CAAC,IAAI;YAClB,IAAI;YACJ,GAAG;SACJ,CAAC,CAAC;IACL,CAAC;IAED,SAAS,CAAC,OAAe,EAAE,IAAa;QACtC,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;QACjC,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QACxB,OAAO,KAAK,CAAC;IACf,CAAC;IAED,SAAS,CAAC,MAAM;QACd,OAAO,IAAI,KAAK,CAAC,MAAM,EAAE;YACvB,GAAG,EAAE,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE;gBACpB,IAAI,IAAA,iBAAS,EAAC,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE;oBAC3B,iCAAiC;oBACjC,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,KAAK,OAAO,EAAE;wBAClC,MAAM,IAAI,CAAC,SAAS,CAAC,iBAAiB,EAAE;4BACtC,OAAO,EAAE,IAAI;yBACd,CAAC,CAAC;qBACJ;oBAED,8CAA8C;oBAC9C,IAAI,cAAc,CAAC;oBACnB,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,IAAI,IAAI,CAAC,cAAc,EAAE;wBAChD,cAAc,GAAG,CAAC,EAAE,EAAE,EAAE,CACtB,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,CACxB,UAAU,CAAC,GAAG,EAAE;4BACd,MAAM,CACJ,IAAI,CAAC,SAAS,CAAC,uBAAuB,EAAE;gCACtC,OAAO,EAAE,IAAI;gCACb,OAAO,EAAE,EAAE;6BACZ,CAAC,CACH,CAAC;wBACJ,CAAC,EAAE,EAAE,CAAC,CACP,CAAC;qBACL;oBAED,OAAO,KAAK,EAAE,GAAG,IAAI,EAAE,EAAE;wBACvB,MAAM,SAAS,GAAG,wBAAW,CAAC,GAAG,EAAE,CAAC;wBACpC,IAAI;4BACF,MAAM,QAAQ,GAAG,EAAE,CAAC;4BACpB,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC;4BACpC,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAa,EAAE,GAAG,CACzC;gCACE,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM;gCACtB,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC;6BACtB,EACD,CAAC,CACF,CAAC;4BACF,IAAI,cAAc,EAAE;gCAClB,QAAQ,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC;6BACpD;4BACD,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;4BAC5C,MAAM,OAAO,GAAG,wBAAW,CAAC,GAAG,EAAE,CAAC;4BACjC,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAe,EAAE,OAAO,CAChD;gCACE,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM;gCACtB,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC;6BACtB,EACD,OAAO,GAAG,SAAS,CACpB,CAAC;4BACF,OAAO,MAAM,CAAC;yBACf;wBAAC,OAAO,GAAG,EAAE;4BACZ,MAAM,OAAO,GAAG,wBAAW,CAAC,GAAG,EAAE,CAAC;4BACjC,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAe,EAAE,OAAO,CAChD;gCACE,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM;gCACtB,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC;6BACtB,EACD,OAAO,GAAG,SAAS,CACpB,CAAC;4BACD,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAa,EAAE,GAAG,CACvC;gCACE,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM;gCACtB,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC;6BACtB,EACD,CAAC,CACF,CAAC;4BACF,MAAM,IAAI,CAAC,SAAS,CAAC,qBAAqB,EAAE;gCAC1C,OAAO,EAAE,IAAI;gCACb,IAAI;gCACJ,KAAK,EAAE,GAAG;6BACX,CAAC,CAAC;yBACJ;oBACH,CAAC,CAAC;iBACH;gBACD,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC;YACtB,CAAC;SACF,CAAC,CAAC;IACL,CAAC;IAED;;;;;OAKG;IACH,IAAI;QACF,IAAI,IAAI,CAAC,MAAM,EAAE;YACf,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;SAC9B;QAED,6BAA6B;QAC7B,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC7B,IAAI,MAAM,GAAG,IAAI,CAAC;YAClB,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;YACxB,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,cAAc,EAAE,GAC/D,MAAM,CAAC;YACT,MAAM,OAAO,GAAG;gBACd,IAAI,EAAE,IAAI;aACX,CAAC;YAEF,IAAI,OAAO,CAAC,GAAG,KAAK,IAAI,EAAE;gBACxB,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE;oBACrB,IAAI,EAAE,SAAS;oBACf,KAAK,EAAE,OAAO,CAAC,KAAK;iBACrB,CAAC,CAAC;gBACH,MAAM,cAAc,GAAmB;oBACrC,oBAAoB,EAAE,OAAO,CAAC,cAAc,IAAI,KAAK;oBACrD,oBAAoB,EAAE,aAAa;iBACpC,CAAC;gBAEF,OAAO,CAAC,IAAI,EAAE,cAAc,EAAE,OAAO,CAAC,CAAC;gBACvC,MAAM,GAAG,IAAI,iBAAO,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC;gBAE3D,0BAA0B;gBAC1B,MAAM,CAAC,EAAE,CAAC,YAAY,EAAE,CAAC,GAAG,EAAE,EAAE;oBAC9B,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE;wBACd,IAAI,EAAE,YAAY;qBACnB,CAAC,CAAC;gBACL,CAAC,CAAC,CAAC;gBACH,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE;oBAC1B,MAAM,OAAO,GAAG,cAAc,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC;oBACjD,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE;wBAChB,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG;qBACtB,CAAC,CAAC;gBACL,CAAC,CAAC,CAAC;gBACH,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE;oBAC1B,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,gBAAgB,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;oBAC5D,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE;wBAChB,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG;qBACtB,CAAC,CAAC;gBACL,CAAC,CAAC,CAAC;gBAEH,iBAAiB;aAClB;iBAAM,IAAI,QAAQ,CAAC,GAAG,KAAK,IAAI,EAAE;gBAChC,gBAAgB;gBAChB,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,QAAQ,CAAC;gBACjC,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE;oBACrB,IAAI,EAAE,UAAU;oBAChB,KAAK;oBACL,IAAI;iBACL,CAAC,CAAC;gBACH,MAAM,OAAO,GAAiB;oBAC5B,SAAS,EAAE,KAAK;oBAChB,IAAI;oBACJ,EAAE;oBACF,aAAa;oBACb,gBAAgB,EAAE,GAAG,EAAE;wBACrB,OAAO,IAAI,CAAC;oBACd,CAAC;oBACD,oBAAoB,EAAE,QAAQ,CAAC,cAAc,IAAI,KAAK;iBACvD,CAAC;gBACF,IAAI,cAAc,EAAE;oBAClB,OAAO,CAAC,cAAc,GAAG,cAAc,CAAC;iBACzC;gBACD,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;gBAChC,MAAM,GAAG,IAAI,iBAAO,CAAC,OAAO,CAAC,CAAC;aAC/B;iBAAM;gBACL,cAAc;gBACd,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE;oBACrB,IAAI,EAAE,QAAQ;oBACd,IAAI;oBACJ,IAAI;oBACJ,EAAE;iBACH,CAAC,CAAC;gBACH,MAAM,OAAO,GAAiB;oBAC5B,IAAI;oBACJ,IAAI;oBACJ,EAAE;oBACF,aAAa;oBACb,gBAAgB,EAAE,GAAG,EAAE;wBACrB,OAAO,IAAI,CAAC;oBACd,CAAC;oBACD,oBAAoB,EAAE,MAAM,CAAC,cAAc,IAAI,KAAK;iBACrD,CAAC;gBACF,IAAI,cAAc,EAAE;oBAClB,OAAO,CAAC,cAAc,GAAG,cAAc,CAAC;iBACzC;gBACD,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;gBAChC,MAAM,GAAG,IAAI,iBAAO,CAAC,OAAO,CAAC,CAAC;gBAC9B,qBAAqB;aACtB;YAED,IAAI,CAAC,GAAG,CAAC,iBAAiB,OAAO,CAAC,IAAI,OAAO,EAAE,OAAO,CAAC,CAAC;YAExD,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;YAEhC,gBAAgB;YAChB,MAAM,CAAC,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE;gBACxB,IAAI,CAAC,OAAO,CAAC,6BAA6B,OAAO,CAAC,IAAI,OAAO,EAAE,IAAI,CAAC,CAAC;YACvE,CAAC,CAAC,CAAC;YACH,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;gBACzB,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;YACtB,CAAC,CAAC,CAAC;YACH,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;gBACtB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;gBACrB,OAAO,CAAC,IAAI,CAAC,CAAC;YAChB,CAAC,CAAC,CAAC;YACH,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;gBACtB,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;gBACnD,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;YAC1B,CAAC,CAAC,CAAC;YACH,MAAM,CAAC,EAAE,CAAC,cAAc,EAAE,CAAC,IAAI,EAAE,EAAE;gBACjC,IAAI,CAAC,GAAG,CACN,mBAAmB,OAAO,CAAC,IAAI,eAAe,IAAI,KAAK,EACvD,OAAO,CACR,CAAC;YACJ,CAAC,CAAC,CAAC;YACH,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE;gBACpB,IAAI,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,kBAAkB,CAAC,EAAE,IAAI,CAAC,CAAC;YAClD,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,MAAM;QACV,sBAAsB;QACtB,MAAM,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;YACrB,IAAI,GAAG,CAAC,CAAC,CAAC,EAAE;gBACV,MAAM,IAAI,KAAK,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC;aAC5C;QACH,CAAC,CAAC,CAAC;QACH,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IACrC,CAAC;IAED,GAAG,CAAC,GAAU;QACZ,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;QACrC,GAAG,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;YAClB,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,GAAG,GAAG,CAAC,IAAI,CAAC,CAAC;QAClC,CAAC,CAAC,CAAC;QACH,OAAO,KAAK,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE;YACpC,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;YACpC,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;gBAC/B,MAAM,MAAM,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;gBAC/C,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC;YACrB,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AAED,iBAAS,KAAK,CAAC"} \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/index.ts b/src/index.ts index 85fc2b0..5c796c1 100644 --- a/src/index.ts +++ b/src/index.ts @@ -75,7 +75,7 @@ class Redis { register: Registry; labels: { [key: string]: string }; }; - trackers?: { [key: string]: Counter | Histogram }; + trackers?: { commands: Counter; errors: Counter; latencies: Histogram }; /** * @param {string} name - unique name to this service @@ -96,12 +96,11 @@ class Redis { this.emitter = emitter; this.commandTimeout = config.commandTimeout; this.metrics = metrics; - this.trackers = {}; if (this.metrics) { // register counters // create counter for tracking the number of times redis commands are called - this.trackers["commands"] = new Counter({ + this.trackers.commands = new Counter({ name: "redis_command_counter", help: "keep track of all redis commands", labelNames: [...Object.keys(this.metrics.labels), "command"], @@ -109,15 +108,19 @@ class Redis { }); // create counter for tracking the number of times redis commands have failed - this.trackers["errors"] = new Counter({ + this.trackers.errors = new Counter({ name: "redis_command_error_counter", help: "keep track of all redis command errors", - labelNames: [...Object.keys(this.metrics.labels), "command"], + labelNames: [ + ...Object.keys(this.metrics.labels), + "command", + "errorMessage", + ], registers: [this.metrics.register], }); // create histogram for tracking latencies of redis commands - this.trackers["latencies"] = new Histogram({ + this.trackers.latencies = new Histogram({ name: "redis_command_latency", help: "keep track of redis command latencies", labelNames: [...Object.keys(this.metrics.labels), "command"], @@ -186,7 +189,71 @@ class Redis { return error; } - makeProxy(client) { + trackCommand(command: string): void { + if (this.trackers?.commands) { + this.trackers.commands.inc( + { + ...this.metrics.labels, + command, + }, + 1 + ); + } + } + + trackErrors(command: string, errorMessage: string): void { + if (this.trackers?.errors) { + this.trackers.errors.inc( + { + ...this.metrics.labels, + command, + errorMessage, + }, + 1 + ); + } + } + + trackLatencies(command: string, startTime: number): void { + if (this.trackers?.latencies) { + const endTime = performance.now(); + this.trackers.latencies.observe( + { + ...this.metrics.labels, + command, + }, + endTime - startTime + ); + } + } + + createTimeoutPromise( + ms: number, + command: string + ): { + timeoutPromise: Promise; + clear: () => void; + } { + let timeoutId: NodeJS.Timeout; + const timeoutPromise = new Promise((_, reject) => { + timeoutId = setTimeout(() => { + reject( + this.makeError("redis.COMMAND_TIMEOUT", { + command, + timeout: ms, + }) + ); + }, ms); + }); + return { + timeoutPromise, + clear: () => { + clearTimeout(timeoutId); + }, + }; + } + + makeProxy(client: Cluster | _Redis) { return new Proxy(client, { get: (target, prop) => { if (isCommand(String(prop))) { @@ -197,63 +264,31 @@ class Redis { }); } - // check if cluster and command timeout is set - let promiseTimeout; - if (this.client.isCluster && this.commandTimeout) { - promiseTimeout = (ms) => - new Promise((_, reject) => - setTimeout(() => { - reject( - this.makeError("redis.COMMAND_TIMEOUT", { - command: prop, - timeout: ms, - }) - ); - }, ms) - ); - } - - return async (...args) => { + return async (...args: unknown[]): Promise => { const startTime = performance.now(); try { - const promises = []; - promises.push(target[prop](...args)); - (this.trackers["commands"] as Counter)?.inc( - { - ...this.metrics.labels, - command: String(prop), - }, - 1 - ); - if (promiseTimeout) { - promises.push(promiseTimeout(this.commandTimeout)); + this.trackCommand(String(prop)); + let result: unknown; + // check if cluster and command timeout is set + if (this.client.isCluster && this.commandTimeout) { + const { timeoutPromise, clear } = this.createTimeoutPromise( + this.commandTimeout, + String(prop) + ); + result = await Promise.race([ + target[prop](...args), + timeoutPromise, + ]).finally(() => { + clear(); + }); + } else { + result = await target[prop](...args); } - const result = await Promise.race(promises); - const endTime = performance.now(); - (this.trackers["latencies"] as Histogram)?.observe( - { - ...this.metrics.labels, - command: String(prop), - }, - endTime - startTime - ); + this.trackLatencies(String(prop), startTime); return result; } catch (err) { - const endTime = performance.now(); - (this.trackers["latencies"] as Histogram)?.observe( - { - ...this.metrics.labels, - command: String(prop), - }, - endTime - startTime - ); - (this.trackers["errors"] as Counter)?.inc( - { - ...this.metrics.labels, - command: String(prop), - }, - 1 - ); + this.trackLatencies(String(prop), startTime); + this.trackErrors(String(prop), err.message); throw this.makeError("redis.COMMAND_ERROR", { command: prop, args, From f82af2a00f98b5db327b8050b73d14d3b6c50130 Mon Sep 17 00:00:00 2001 From: Anas Khan Date: Wed, 29 Nov 2023 14:30:00 +0530 Subject: [PATCH 05/10] minor fix --- lib/index.d.ts | 6 +++--- lib/index.js | 3 ++- src/index.ts | 4 +++- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/lib/index.d.ts b/lib/index.d.ts index 544da8e..9e48234 100644 --- a/lib/index.d.ts +++ b/lib/index.d.ts @@ -54,9 +54,9 @@ declare class Redis { }; }; trackers?: { - commands: Counter; - errors: Counter; - latencies: Histogram; + commands?: Counter; + errors?: Counter; + latencies?: Histogram; }; /** * @param {string} name - unique name to this service diff --git a/lib/index.js b/lib/index.js index 62cf921..edbfcf0 100644 --- a/lib/index.js +++ b/lib/index.js @@ -72,6 +72,7 @@ class Redis { this.metrics = metrics; if (this.metrics) { // register counters + this.trackers = {}; // create counter for tracking the number of times redis commands are called this.trackers.commands = new prom_client_1.Counter({ name: "redis_command_counter", @@ -381,4 +382,4 @@ class Redis { } } module.exports = Redis; -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"} \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAAA,mDAKiB;AAEjB,gDAAwD;AACxD,6CAA2D;AAC3D,2CAAyC;AAEzC,SAAS,aAAa,CAAC,KAAa;IAClC,IAAI,KAAK,GAAG,IAAI,EAAE;QAChB,sCAAsC;QACtC,OAAO,CAAC,KAAK,CAAC,mDAAmD,CAAC,CAAC;QACnE,OAAO,IAAI,CAAC;KACb;IACD,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,GAAG,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC,4EAA4E;IACvH,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI;IAClC,IAAI,IAAI,CAAC,GAAG,KAAK,IAAI,EAAE;QACrB,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE;YAClB,cAAc,EAAE,MAAM;SACvB,CAAC,CAAC;QACH,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;KAClC;SAAM;QACL,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE;YAClB,cAAc,EAAE,OAAO;SACxB,CAAC,CAAC;KACJ;AACH,CAAC;AAgCD;;GAEG;AACH,MAAM,KAAK;IACT,IAAI,CAAS;IACb,OAAO,CAAe;IACtB,MAAM,CAAc;IACpB,MAAM,CAAmB;IACzB,cAAc,CAAU;IACxB,OAAO,CAGL;IACF,QAAQ,CAAmE;IAE3E;;;;;OAKG;IACH,YACE,IAAY,EACZ,OAAqB,EACrB,MAAmB,EACnB,OAGC;QAED,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,cAAc,GAAG,MAAM,CAAC,cAAc,CAAC;QAC5C,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QAEvB,IAAI,IAAI,CAAC,OAAO,EAAE;YAChB,oBAAoB;YACpB,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;YAEnB,4EAA4E;YAC5E,IAAI,CAAC,QAAQ,CAAC,QAAQ,GAAG,IAAI,qBAAO,CAAC;gBACnC,IAAI,EAAE,uBAAuB;gBAC7B,IAAI,EAAE,kCAAkC;gBACxC,UAAU,EAAE,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,SAAS,CAAC;gBAC5D,SAAS,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC;aACnC,CAAC,CAAC;YAEH,6EAA6E;YAC7E,IAAI,CAAC,QAAQ,CAAC,MAAM,GAAG,IAAI,qBAAO,CAAC;gBACjC,IAAI,EAAE,6BAA6B;gBACnC,IAAI,EAAE,wCAAwC;gBAC9C,UAAU,EAAE;oBACV,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC;oBACnC,SAAS;oBACT,cAAc;iBACf;gBACD,SAAS,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC;aACnC,CAAC,CAAC;YAEH,4DAA4D;YAC5D,IAAI,CAAC,QAAQ,CAAC,SAAS,GAAG,IAAI,uBAAS,CAAC;gBACtC,IAAI,EAAE,uBAAuB;gBAC7B,IAAI,EAAE,uCAAuC;gBAC7C,UAAU,EAAE,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,SAAS,CAAC;gBAC5D,SAAS,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC;aACnC,CAAC,CAAC;SACJ;QAED,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CACzB;YACE,IAAI,EAAE,WAAW;YACjB,IAAI,EAAE,IAAI;YACV,EAAE,EAAE,CAAC;SACN,EACD,MAAM,EACN;YACE,IAAI,EAAE,MAAM,CAAC,MAAM,CACjB;gBACE,GAAG,EAAE,KAAK;aACX,EACD,MAAM,CAAC,IAAI,CACZ;YACD,OAAO,EAAE,MAAM,CAAC,MAAM,CACpB;gBACE,GAAG,EAAE,KAAK;aACX,EACD,MAAM,CAAC,OAAO,CACf;YACD,QAAQ,EAAE,MAAM,CAAC,MAAM,CACrB;gBACE,GAAG,EAAE,KAAK;aACX,EACD,MAAM,CAAC,QAAQ,CAChB;SACF,CACF,CAAC;QACF,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;IACrB,CAAC;IAED,GAAG,CAAC,OAAe,EAAE,IAAa;QAChC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,EAAE;YACvB,OAAO,EAAE,IAAI,CAAC,IAAI;YAClB,OAAO;YACP,IAAI;SACL,CAAC,CAAC;IACL,CAAC;IAED,OAAO,CAAC,OAAe,EAAE,IAAa;QACpC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE;YAC3B,OAAO,EAAE,IAAI,CAAC,IAAI;YAClB,OAAO;YACP,IAAI;SACL,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,GAAU,EAAE,IAAa;QAC7B,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE;YACzB,OAAO,EAAE,IAAI,CAAC,IAAI;YAClB,IAAI;YACJ,GAAG;SACJ,CAAC,CAAC;IACL,CAAC;IAED,SAAS,CAAC,OAAe,EAAE,IAAa;QACtC,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;QACjC,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QACxB,OAAO,KAAK,CAAC;IACf,CAAC;IAED,YAAY,CAAC,OAAe;QAC1B,IAAI,IAAI,CAAC,QAAQ,EAAE,QAAQ,EAAE;YAC3B,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CACxB;gBACE,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM;gBACtB,OAAO;aACR,EACD,CAAC,CACF,CAAC;SACH;IACH,CAAC;IAED,WAAW,CAAC,OAAe,EAAE,YAAoB;QAC/C,IAAI,IAAI,CAAC,QAAQ,EAAE,MAAM,EAAE;YACzB,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,CACtB;gBACE,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM;gBACtB,OAAO;gBACP,YAAY;aACb,EACD,CAAC,CACF,CAAC;SACH;IACH,CAAC;IAED,cAAc,CAAC,OAAe,EAAE,SAAiB;QAC/C,IAAI,IAAI,CAAC,QAAQ,EAAE,SAAS,EAAE;YAC5B,MAAM,OAAO,GAAG,wBAAW,CAAC,GAAG,EAAE,CAAC;YAClC,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,OAAO,CAC7B;gBACE,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM;gBACtB,OAAO;aACR,EACD,OAAO,GAAG,SAAS,CACpB,CAAC;SACH;IACH,CAAC;IAED,oBAAoB,CAClB,EAAU,EACV,OAAe;QAKf,IAAI,SAAyB,CAAC;QAC9B,MAAM,cAAc,GAAG,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE;YAC/C,SAAS,GAAG,UAAU,CAAC,GAAG,EAAE;gBAC1B,MAAM,CACJ,IAAI,CAAC,SAAS,CAAC,uBAAuB,EAAE;oBACtC,OAAO;oBACP,OAAO,EAAE,EAAE;iBACZ,CAAC,CACH,CAAC;YACJ,CAAC,EAAE,EAAE,CAAC,CAAC;QACT,CAAC,CAAC,CAAC;QACH,OAAO;YACL,cAAc;YACd,KAAK,EAAE,GAAG,EAAE;gBACV,YAAY,CAAC,SAAS,CAAC,CAAC;YAC1B,CAAC;SACF,CAAC;IACJ,CAAC;IAED,SAAS,CAAC,MAAwB;QAChC,OAAO,IAAI,KAAK,CAAC,MAAM,EAAE;YACvB,GAAG,EAAE,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE;gBACpB,IAAI,IAAA,iBAAS,EAAC,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE;oBAC3B,iCAAiC;oBACjC,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,KAAK,OAAO,EAAE;wBAClC,MAAM,IAAI,CAAC,SAAS,CAAC,iBAAiB,EAAE;4BACtC,OAAO,EAAE,IAAI;yBACd,CAAC,CAAC;qBACJ;oBAED,OAAO,KAAK,EAAE,GAAG,IAAe,EAAoB,EAAE;wBACpD,MAAM,SAAS,GAAG,wBAAW,CAAC,GAAG,EAAE,CAAC;wBACpC,IAAI;4BACF,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;4BAChC,IAAI,MAAe,CAAC;4BACpB,8CAA8C;4BAC9C,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,IAAI,IAAI,CAAC,cAAc,EAAE;gCAChD,MAAM,EAAE,cAAc,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,oBAAoB,CACzD,IAAI,CAAC,cAAc,EACnB,MAAM,CAAC,IAAI,CAAC,CACb,CAAC;gCACF,MAAM,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC;oCAC1B,MAAM,CAAC,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC;oCACrB,cAAc;iCACf,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE;oCACd,KAAK,EAAE,CAAC;gCACV,CAAC,CAAC,CAAC;6BACJ;iCAAM;gCACL,MAAM,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;6BACtC;4BACD,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,SAAS,CAAC,CAAC;4BAC7C,OAAO,MAAM,CAAC;yBACf;wBAAC,OAAO,GAAG,EAAE;4BACZ,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,SAAS,CAAC,CAAC;4BAC7C,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;4BAC5C,MAAM,IAAI,CAAC,SAAS,CAAC,qBAAqB,EAAE;gCAC1C,OAAO,EAAE,IAAI;gCACb,IAAI;gCACJ,KAAK,EAAE,GAAG;6BACX,CAAC,CAAC;yBACJ;oBACH,CAAC,CAAC;iBACH;gBACD,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC;YACtB,CAAC;SACF,CAAC,CAAC;IACL,CAAC;IAED;;;;;OAKG;IACH,IAAI;QACF,IAAI,IAAI,CAAC,MAAM,EAAE;YACf,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;SAC9B;QAED,6BAA6B;QAC7B,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC7B,IAAI,MAAM,GAAG,IAAI,CAAC;YAClB,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;YACxB,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,cAAc,EAAE,GAC/D,MAAM,CAAC;YACT,MAAM,OAAO,GAAG;gBACd,IAAI,EAAE,IAAI;aACX,CAAC;YAEF,IAAI,OAAO,CAAC,GAAG,KAAK,IAAI,EAAE;gBACxB,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE;oBACrB,IAAI,EAAE,SAAS;oBACf,KAAK,EAAE,OAAO,CAAC,KAAK;iBACrB,CAAC,CAAC;gBACH,MAAM,cAAc,GAAmB;oBACrC,oBAAoB,EAAE,OAAO,CAAC,cAAc,IAAI,KAAK;oBACrD,oBAAoB,EAAE,aAAa;iBACpC,CAAC;gBAEF,OAAO,CAAC,IAAI,EAAE,cAAc,EAAE,OAAO,CAAC,CAAC;gBACvC,MAAM,GAAG,IAAI,iBAAO,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC;gBAE3D,0BAA0B;gBAC1B,MAAM,CAAC,EAAE,CAAC,YAAY,EAAE,CAAC,GAAG,EAAE,EAAE;oBAC9B,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE;wBACd,IAAI,EAAE,YAAY;qBACnB,CAAC,CAAC;gBACL,CAAC,CAAC,CAAC;gBACH,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE;oBAC1B,MAAM,OAAO,GAAG,cAAc,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC;oBACjD,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE;wBAChB,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG;qBACtB,CAAC,CAAC;gBACL,CAAC,CAAC,CAAC;gBACH,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE;oBAC1B,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,gBAAgB,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;oBAC5D,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE;wBAChB,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG;qBACtB,CAAC,CAAC;gBACL,CAAC,CAAC,CAAC;gBAEH,iBAAiB;aAClB;iBAAM,IAAI,QAAQ,CAAC,GAAG,KAAK,IAAI,EAAE;gBAChC,gBAAgB;gBAChB,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,QAAQ,CAAC;gBACjC,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE;oBACrB,IAAI,EAAE,UAAU;oBAChB,KAAK;oBACL,IAAI;iBACL,CAAC,CAAC;gBACH,MAAM,OAAO,GAAiB;oBAC5B,SAAS,EAAE,KAAK;oBAChB,IAAI;oBACJ,EAAE;oBACF,aAAa;oBACb,gBAAgB,EAAE,GAAG,EAAE;wBACrB,OAAO,IAAI,CAAC;oBACd,CAAC;oBACD,oBAAoB,EAAE,QAAQ,CAAC,cAAc,IAAI,KAAK;iBACvD,CAAC;gBACF,IAAI,cAAc,EAAE;oBAClB,OAAO,CAAC,cAAc,GAAG,cAAc,CAAC;iBACzC;gBACD,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;gBAChC,MAAM,GAAG,IAAI,iBAAO,CAAC,OAAO,CAAC,CAAC;aAC/B;iBAAM;gBACL,cAAc;gBACd,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE;oBACrB,IAAI,EAAE,QAAQ;oBACd,IAAI;oBACJ,IAAI;oBACJ,EAAE;iBACH,CAAC,CAAC;gBACH,MAAM,OAAO,GAAiB;oBAC5B,IAAI;oBACJ,IAAI;oBACJ,EAAE;oBACF,aAAa;oBACb,gBAAgB,EAAE,GAAG,EAAE;wBACrB,OAAO,IAAI,CAAC;oBACd,CAAC;oBACD,oBAAoB,EAAE,MAAM,CAAC,cAAc,IAAI,KAAK;iBACrD,CAAC;gBACF,IAAI,cAAc,EAAE;oBAClB,OAAO,CAAC,cAAc,GAAG,cAAc,CAAC;iBACzC;gBACD,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;gBAChC,MAAM,GAAG,IAAI,iBAAO,CAAC,OAAO,CAAC,CAAC;gBAC9B,qBAAqB;aACtB;YAED,IAAI,CAAC,GAAG,CAAC,iBAAiB,OAAO,CAAC,IAAI,OAAO,EAAE,OAAO,CAAC,CAAC;YAExD,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;YAEhC,gBAAgB;YAChB,MAAM,CAAC,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE;gBACxB,IAAI,CAAC,OAAO,CAAC,6BAA6B,OAAO,CAAC,IAAI,OAAO,EAAE,IAAI,CAAC,CAAC;YACvE,CAAC,CAAC,CAAC;YACH,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;gBACzB,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;YACtB,CAAC,CAAC,CAAC;YACH,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;gBACtB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;gBACrB,OAAO,CAAC,IAAI,CAAC,CAAC;YAChB,CAAC,CAAC,CAAC;YACH,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;gBACtB,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;gBACnD,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;YAC1B,CAAC,CAAC,CAAC;YACH,MAAM,CAAC,EAAE,CAAC,cAAc,EAAE,CAAC,IAAI,EAAE,EAAE;gBACjC,IAAI,CAAC,GAAG,CACN,mBAAmB,OAAO,CAAC,IAAI,eAAe,IAAI,KAAK,EACvD,OAAO,CACR,CAAC;YACJ,CAAC,CAAC,CAAC;YACH,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE;gBACpB,IAAI,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,kBAAkB,CAAC,EAAE,IAAI,CAAC,CAAC;YAClD,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,MAAM;QACV,sBAAsB;QACtB,MAAM,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;YACrB,IAAI,GAAG,CAAC,CAAC,CAAC,EAAE;gBACV,MAAM,IAAI,KAAK,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC;aAC5C;QACH,CAAC,CAAC,CAAC;QACH,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IACrC,CAAC;IAED,GAAG,CAAC,GAAU;QACZ,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;QACrC,GAAG,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;YAClB,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,GAAG,GAAG,CAAC,IAAI,CAAC,CAAC;QAClC,CAAC,CAAC,CAAC;QACH,OAAO,KAAK,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE;YACpC,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;YACpC,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;gBAC/B,MAAM,MAAM,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;gBAC/C,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC;YACrB,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AAED,iBAAS,KAAK,CAAC"} \ No newline at end of file diff --git a/src/index.ts b/src/index.ts index 5c796c1..186928e 100644 --- a/src/index.ts +++ b/src/index.ts @@ -75,7 +75,7 @@ class Redis { register: Registry; labels: { [key: string]: string }; }; - trackers?: { commands: Counter; errors: Counter; latencies: Histogram }; + trackers?: { commands?: Counter; errors?: Counter; latencies?: Histogram }; /** * @param {string} name - unique name to this service @@ -99,6 +99,8 @@ class Redis { if (this.metrics) { // register counters + this.trackers = {}; + // create counter for tracking the number of times redis commands are called this.trackers.commands = new Counter({ name: "redis_command_counter", From b9fe5a4c497380484b95d93f2fef746a7eb35f68 Mon Sep 17 00:00:00 2001 From: Anas Khan Date: Wed, 29 Nov 2023 14:35:00 +0530 Subject: [PATCH 06/10] name changes --- src/index.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/index.ts b/src/index.ts index 186928e..65a29e9 100644 --- a/src/index.ts +++ b/src/index.ts @@ -103,7 +103,7 @@ class Redis { // create counter for tracking the number of times redis commands are called this.trackers.commands = new Counter({ - name: "redis_command_counter", + name: `${this.name}_commands`, help: "keep track of all redis commands", labelNames: [...Object.keys(this.metrics.labels), "command"], registers: [this.metrics.register], @@ -111,7 +111,7 @@ class Redis { // create counter for tracking the number of times redis commands have failed this.trackers.errors = new Counter({ - name: "redis_command_error_counter", + name: `${this.name}_errors`, help: "keep track of all redis command errors", labelNames: [ ...Object.keys(this.metrics.labels), @@ -123,7 +123,7 @@ class Redis { // create histogram for tracking latencies of redis commands this.trackers.latencies = new Histogram({ - name: "redis_command_latency", + name: `${this.name}_latencies`, help: "keep track of redis command latencies", labelNames: [...Object.keys(this.metrics.labels), "command"], registers: [this.metrics.register], From 08100bc9a2de213e03027e326437de3a209afa4e Mon Sep 17 00:00:00 2001 From: Anas Khan Date: Wed, 29 Nov 2023 14:35:15 +0530 Subject: [PATCH 07/10] compilation --- lib/index.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/index.js b/lib/index.js index edbfcf0..90036ee 100644 --- a/lib/index.js +++ b/lib/index.js @@ -75,14 +75,14 @@ class Redis { this.trackers = {}; // create counter for tracking the number of times redis commands are called this.trackers.commands = new prom_client_1.Counter({ - name: "redis_command_counter", + name: `${this.name}_commands`, help: "keep track of all redis commands", labelNames: [...Object.keys(this.metrics.labels), "command"], registers: [this.metrics.register], }); // create counter for tracking the number of times redis commands have failed this.trackers.errors = new prom_client_1.Counter({ - name: "redis_command_error_counter", + name: `${this.name}_errors`, help: "keep track of all redis command errors", labelNames: [ ...Object.keys(this.metrics.labels), @@ -93,7 +93,7 @@ class Redis { }); // create histogram for tracking latencies of redis commands this.trackers.latencies = new prom_client_1.Histogram({ - name: "redis_command_latency", + name: `${this.name}_latencies`, help: "keep track of redis command latencies", labelNames: [...Object.keys(this.metrics.labels), "command"], registers: [this.metrics.register], @@ -382,4 +382,4 @@ class Redis { } } module.exports = Redis; -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"} \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"} \ No newline at end of file From 12074fcac12b7e7866968cc369a8fc595f3cda57 Mon Sep 17 00:00:00 2001 From: Anas Khan Date: Wed, 29 Nov 2023 14:36:33 +0530 Subject: [PATCH 08/10] added promclient in test --- tests/single.js | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/tests/single.js b/tests/single.js index cb16408..3215721 100644 --- a/tests/single.js +++ b/tests/single.js @@ -1,5 +1,6 @@ const Redis = require("../lib/index"); const { EventEmitter } = require("events"); +const promClient = require("prom-client"); const emitter = new EventEmitter(); emitter.on("log", console.log.bind(console)); @@ -52,11 +53,21 @@ async function doPPL(redis) { console.log(JSON.stringify(response, null, 2)); } -const redis = new Redis("redis", emitter, { - host: "127.0.0.1", - port: 6379, - commandTimeout: 100, -}); +const redis = new Redis( + "redis", + emitter, + { + host: "127.0.0.1", + port: 6379, + commandTimeout: 100, + }, + { + register: promClient.register, + labels: { + service: "test", + }, + } +); redis .init() .then(() => { From 0034bada1dd970ba1b261cefb8e329381e17188f Mon Sep 17 00:00:00 2001 From: Anas Khan Date: Wed, 29 Nov 2023 14:42:59 +0530 Subject: [PATCH 09/10] name changes --- lib/index.js | 8 ++++---- src/index.ts | 6 +++--- tests/single.js | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/index.js b/lib/index.js index 90036ee..a4bb59d 100644 --- a/lib/index.js +++ b/lib/index.js @@ -75,14 +75,14 @@ class Redis { this.trackers = {}; // create counter for tracking the number of times redis commands are called this.trackers.commands = new prom_client_1.Counter({ - name: `${this.name}_commands`, + name: `${this.name.replaceAll("-", "_")}:commands`, help: "keep track of all redis commands", labelNames: [...Object.keys(this.metrics.labels), "command"], registers: [this.metrics.register], }); // create counter for tracking the number of times redis commands have failed this.trackers.errors = new prom_client_1.Counter({ - name: `${this.name}_errors`, + name: `${this.name.replaceAll("-", "_")}:errors`, help: "keep track of all redis command errors", labelNames: [ ...Object.keys(this.metrics.labels), @@ -93,7 +93,7 @@ class Redis { }); // create histogram for tracking latencies of redis commands this.trackers.latencies = new prom_client_1.Histogram({ - name: `${this.name}_latencies`, + name: `${this.name.replaceAll("-", "_")}:latencies`, help: "keep track of redis command latencies", labelNames: [...Object.keys(this.metrics.labels), "command"], registers: [this.metrics.register], @@ -382,4 +382,4 @@ class Redis { } } module.exports = Redis; -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"} \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/index.ts b/src/index.ts index 65a29e9..cc90112 100644 --- a/src/index.ts +++ b/src/index.ts @@ -103,7 +103,7 @@ class Redis { // create counter for tracking the number of times redis commands are called this.trackers.commands = new Counter({ - name: `${this.name}_commands`, + name: `${this.name.replaceAll("-", "_")}:commands`, help: "keep track of all redis commands", labelNames: [...Object.keys(this.metrics.labels), "command"], registers: [this.metrics.register], @@ -111,7 +111,7 @@ class Redis { // create counter for tracking the number of times redis commands have failed this.trackers.errors = new Counter({ - name: `${this.name}_errors`, + name: `${this.name.replaceAll("-", "_")}:errors`, help: "keep track of all redis command errors", labelNames: [ ...Object.keys(this.metrics.labels), @@ -123,7 +123,7 @@ class Redis { // create histogram for tracking latencies of redis commands this.trackers.latencies = new Histogram({ - name: `${this.name}_latencies`, + name: `${this.name.replaceAll("-", "_")}:latencies`, help: "keep track of redis command latencies", labelNames: [...Object.keys(this.metrics.labels), "command"], registers: [this.metrics.register], diff --git a/tests/single.js b/tests/single.js index 3215721..0a85eef 100644 --- a/tests/single.js +++ b/tests/single.js @@ -64,7 +64,7 @@ const redis = new Redis( { register: promClient.register, labels: { - service: "test", + service: "test-test_test9", }, } ); From a68514ff6dde695f17a8691ce9424eaecb9ddfcb Mon Sep 17 00:00:00 2001 From: Anas Khan Date: Wed, 29 Nov 2023 15:58:27 +0530 Subject: [PATCH 10/10] refactoring --- lib/index.d.ts | 1 + lib/index.js | 81 +++++++++++++++++++++++------------------------ src/index.ts | 83 +++++++++++++++++++++++++------------------------ tests/single.js | 2 ++ 4 files changed, 87 insertions(+), 80 deletions(-) diff --git a/lib/index.d.ts b/lib/index.d.ts index 9e48234..66e3c16 100644 --- a/lib/index.d.ts +++ b/lib/index.d.ts @@ -81,6 +81,7 @@ declare class Redis { timeoutPromise: Promise; clear: () => void; }; + executeCommand(target: any, prop: any, args: any): Promise; makeProxy(client: Cluster | _Redis): Cluster | IoRedis; /** * Connect to redis server with the config diff --git a/lib/index.js b/lib/index.js index a4bb59d..8eb50f7 100644 --- a/lib/index.js +++ b/lib/index.js @@ -185,49 +185,50 @@ class Redis { }, }; } + async executeCommand(target, prop, args) { + const startTime = perf_hooks_1.performance.now(); + try { + this.trackCommand(String(prop)); + const result = await target[prop](...args); + this.trackLatencies(String(prop), startTime); + return result; + } + catch (err) { + this.trackLatencies(String(prop), startTime); + this.trackErrors(String(prop), err.message); + throw this.makeError("redis.COMMAND_ERROR", { + command: prop, + args, + error: err, + }); + } + } makeProxy(client) { return new Proxy(client, { get: (target, prop) => { - if ((0, commands_1.exists)(String(prop))) { - // check if client in ready state - if (this.client.status !== "ready") { - throw this.makeError("redis.NOT_READY", { - command: prop, - }); - } - return async (...args) => { - const startTime = perf_hooks_1.performance.now(); - try { - this.trackCommand(String(prop)); - let result; - // check if cluster and command timeout is set - if (this.client.isCluster && this.commandTimeout) { - const { timeoutPromise, clear } = this.createTimeoutPromise(this.commandTimeout, String(prop)); - result = await Promise.race([ - target[prop](...args), - timeoutPromise, - ]).finally(() => { - clear(); - }); - } - else { - result = await target[prop](...args); - } - this.trackLatencies(String(prop), startTime); - return result; - } - catch (err) { - this.trackLatencies(String(prop), startTime); - this.trackErrors(String(prop), err.message); - throw this.makeError("redis.COMMAND_ERROR", { - command: prop, - args, - error: err, - }); - } - }; + // check if a command or not + if (!(0, commands_1.exists)(String(prop))) { + return target[prop]; } - return target[prop]; + // check if client in ready state + if (this.client.status !== "ready") { + throw this.makeError("redis.NOT_READY", { + command: prop, + }); + } + return (...args) => { + // If timeout is set, apply Promise.race + if (this.client.isCluster && this.commandTimeout) { + const { timeoutPromise, clear } = this.createTimeoutPromise(this.commandTimeout, String(prop)); + return Promise.race([ + this.executeCommand(target, prop, args), + timeoutPromise, + ]).finally(clear); + } + else { + return this.executeCommand(target, prop, args); + } + }; }, }); } @@ -382,4 +383,4 @@ class Redis { } } module.exports = Redis; -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"} \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/index.ts b/src/index.ts index cc90112..1db290e 100644 --- a/src/index.ts +++ b/src/index.ts @@ -255,51 +255,54 @@ class Redis { }; } + async executeCommand(target, prop, args): Promise { + const startTime = performance.now(); + try { + this.trackCommand(String(prop)); + const result = await target[prop](...args); + this.trackLatencies(String(prop), startTime); + return result; + } catch (err) { + this.trackLatencies(String(prop), startTime); + this.trackErrors(String(prop), err.message); + throw this.makeError("redis.COMMAND_ERROR", { + command: prop, + args, + error: err, + }); + } + } + makeProxy(client: Cluster | _Redis) { return new Proxy(client, { get: (target, prop) => { - if (isCommand(String(prop))) { - // check if client in ready state - if (this.client.status !== "ready") { - throw this.makeError("redis.NOT_READY", { - command: prop, - }); - } + // check if a command or not + if (!isCommand(String(prop))) { + return target[prop]; + } - return async (...args: unknown[]): Promise => { - const startTime = performance.now(); - try { - this.trackCommand(String(prop)); - let result: unknown; - // check if cluster and command timeout is set - if (this.client.isCluster && this.commandTimeout) { - const { timeoutPromise, clear } = this.createTimeoutPromise( - this.commandTimeout, - String(prop) - ); - result = await Promise.race([ - target[prop](...args), - timeoutPromise, - ]).finally(() => { - clear(); - }); - } else { - result = await target[prop](...args); - } - this.trackLatencies(String(prop), startTime); - return result; - } catch (err) { - this.trackLatencies(String(prop), startTime); - this.trackErrors(String(prop), err.message); - throw this.makeError("redis.COMMAND_ERROR", { - command: prop, - args, - error: err, - }); - } - }; + // check if client in ready state + if (this.client.status !== "ready") { + throw this.makeError("redis.NOT_READY", { + command: prop, + }); } - return target[prop]; + + return (...args: unknown[]): Promise => { + // If timeout is set, apply Promise.race + if (this.client.isCluster && this.commandTimeout) { + const { timeoutPromise, clear } = this.createTimeoutPromise( + this.commandTimeout, + String(prop) + ); + return Promise.race([ + this.executeCommand(target, prop, args), + timeoutPromise, + ]).finally(clear); + } else { + return this.executeCommand(target, prop, args); + } + }; }, }); } diff --git a/tests/single.js b/tests/single.js index 0a85eef..45ab77a 100644 --- a/tests/single.js +++ b/tests/single.js @@ -14,6 +14,8 @@ async function doSome(client) { await new Promise((resolve) => setTimeout(resolve, 1000)); try { await client.set(`Key:${i}`, i); + const data = await client.get(`Key:${i}`); + console.log(`Fetched: ${data}`); } catch (err) { console.log(err); }