@adalo/metrics 0.1.92 → 0.1.93
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/redisUtils.d.ts +7 -0
- package/lib/redisUtils.d.ts.map +1 -1
- package/lib/redisUtils.js +17 -10
- package/lib/redisUtils.js.map +1 -1
- package/package.json +1 -1
- package/src/redisUtils.js +18 -12
package/lib/redisUtils.d.ts
CHANGED
|
@@ -36,4 +36,11 @@ export function getRedisClientType(client: any): string;
|
|
|
36
36
|
export const REDIS_V4: "REDIS_V4";
|
|
37
37
|
export const REDIS_V3: "REDIS_V3";
|
|
38
38
|
export const IOREDIS: "IOREDIS";
|
|
39
|
+
/**
|
|
40
|
+
* Get default redis client name
|
|
41
|
+
*
|
|
42
|
+
* @param {string} [name='undefined-app'] - Fallback app name if BUILD_APP_NAME is not set.
|
|
43
|
+
* @returns {string}
|
|
44
|
+
*/
|
|
45
|
+
export function getCorrectNameForRedis(name?: string | undefined): string;
|
|
39
46
|
//# sourceMappingURL=redisUtils.d.ts.map
|
package/lib/redisUtils.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"redisUtils.d.ts","sourceRoot":"","sources":["../src/redisUtils.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"redisUtils.d.ts","sourceRoot":"","sources":["../src/redisUtils.js"],"names":[],"mappings":"AAkBA;;;;;GAKG;AACH,6FAFsB,GAAG,QAAQ,MAAM,KAAK,IAAI,CAoB/C;AAyBD;;;;;GAKG;AACH,6FAFsB,GAAG,QAAQ,MAAM,KAAK,IAAI,CAmB/C;AA9CD;;;;;GAKG;AACH,6FAFsB,GAAG,QAAQ,MAAM,KAAK,IAAI,CAiB/C;AA2BD;;;;;GAKG;AACH,kCAHW,GAAG,GACD,OAAO,CASnB;AAED;;;;;GAKG;AACH,2CAHW,GAAG,GACD,MAAM,CAiBlB;AAhID,kCAA2B;AAC3B,kCAA2B;AAC3B,gCAAyB;AAKzB;;;;;GAKG;AACH,mEAFa,MAAM,CAMlB"}
|
package/lib/redisUtils.js
CHANGED
|
@@ -3,7 +3,19 @@
|
|
|
3
3
|
const REDIS_V4 = 'REDIS_V4';
|
|
4
4
|
const REDIS_V3 = 'REDIS_V3';
|
|
5
5
|
const IOREDIS = 'IOREDIS';
|
|
6
|
+
const dyno = process.env.BUILD_DYNO_PROCESS_TYPE || 'undefined-dyno';
|
|
7
|
+
const defaultAppName = process.env.BUILD_DYNO_APP_NAME || 'undefined-app';
|
|
6
8
|
|
|
9
|
+
/**
|
|
10
|
+
* Get default redis client name
|
|
11
|
+
*
|
|
12
|
+
* @param {string} [name='undefined-app'] - Fallback app name if BUILD_APP_NAME is not set.
|
|
13
|
+
* @returns {string}
|
|
14
|
+
*/
|
|
15
|
+
const getCorrectNameForRedis = (name = 'undefined-app') => {
|
|
16
|
+
const appName = defaultAppName || name;
|
|
17
|
+
return `${appName}:${dyno}:${name}`;
|
|
18
|
+
};
|
|
7
19
|
/**
|
|
8
20
|
* Creates a configured setClientName function for node-redis v3.
|
|
9
21
|
*
|
|
@@ -12,11 +24,9 @@ const IOREDIS = 'IOREDIS';
|
|
|
12
24
|
*/
|
|
13
25
|
const createSetClientNameForRedisV3 = (defaultAppName = 'undefined-app') => {
|
|
14
26
|
return (client, name) => {
|
|
15
|
-
const appName = process.env.BUILD_APP_NAME || defaultAppName;
|
|
16
|
-
const dyno = process.env.BUILD_DYNO_PROCESS_TYPE || 'undefined-dyno';
|
|
17
27
|
if (process.env.NODE_ENV !== 'test') {
|
|
18
28
|
client.on('connect', () => {
|
|
19
|
-
client.send_command('CLIENT', ['SETNAME',
|
|
29
|
+
client.send_command('CLIENT', ['SETNAME', getCorrectNameForRedis(name)], err => {
|
|
20
30
|
if (err) {
|
|
21
31
|
console.error(`Failed to set client name for ${name}:`, err);
|
|
22
32
|
} else {
|
|
@@ -36,11 +46,9 @@ const createSetClientNameForRedisV3 = (defaultAppName = 'undefined-app') => {
|
|
|
36
46
|
*/
|
|
37
47
|
const createSetClientNameForIoredis = (defaultAppName = 'undefined-app') => {
|
|
38
48
|
return (client, name) => {
|
|
39
|
-
const appName = process.env.BUILD_APP_NAME || defaultAppName;
|
|
40
|
-
const dyno = process.env.BUILD_DYNO_PROCESS_TYPE || 'undefined-dyno';
|
|
41
49
|
if (process.env.NODE_ENV !== 'test') {
|
|
42
50
|
client.once('connect', () => {
|
|
43
|
-
client.call('CLIENT', ['SETNAME',
|
|
51
|
+
client.call('CLIENT', ['SETNAME', getCorrectNameForRedis(name)]).then(() => {
|
|
44
52
|
console.log(`Connected to Redis for pid:${process.pid} (${name})`);
|
|
45
53
|
}).catch(err => {
|
|
46
54
|
console.error(`Failed to set client name for ${name}:`, err);
|
|
@@ -58,12 +66,10 @@ const createSetClientNameForIoredis = (defaultAppName = 'undefined-app') => {
|
|
|
58
66
|
*/
|
|
59
67
|
const createSetClientNameForRedisV4 = (defaultAppName = 'undefined-app') => {
|
|
60
68
|
return (client, name) => {
|
|
61
|
-
const appName = process.env.BUILD_APP_NAME || defaultAppName;
|
|
62
|
-
const dyno = process.env.BUILD_DYNO_PROCESS_TYPE || 'undefined-dyno';
|
|
63
69
|
if (process.env.NODE_ENV !== 'test') {
|
|
64
70
|
client.on('ready', async () => {
|
|
65
71
|
try {
|
|
66
|
-
await client.sendCommand(['CLIENT', 'SETNAME',
|
|
72
|
+
await client.sendCommand(['CLIENT', 'SETNAME', getCorrectNameForRedis(name)]);
|
|
67
73
|
console.log(`Connected to Redis for pid:${process.pid} (${name})`);
|
|
68
74
|
} catch (err) {
|
|
69
75
|
console.error(`Failed to set client name for ${name}:`, err);
|
|
@@ -112,6 +118,7 @@ module.exports = {
|
|
|
112
118
|
getRedisClientType,
|
|
113
119
|
REDIS_V4,
|
|
114
120
|
REDIS_V3,
|
|
115
|
-
IOREDIS
|
|
121
|
+
IOREDIS,
|
|
122
|
+
getCorrectNameForRedis
|
|
116
123
|
};
|
|
117
124
|
//# sourceMappingURL=redisUtils.js.map
|
package/lib/redisUtils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"redisUtils.js","names":["REDIS_V4","REDIS_V3","IOREDIS","
|
|
1
|
+
{"version":3,"file":"redisUtils.js","names":["REDIS_V4","REDIS_V3","IOREDIS","dyno","process","env","BUILD_DYNO_PROCESS_TYPE","defaultAppName","BUILD_DYNO_APP_NAME","getCorrectNameForRedis","name","appName","createSetClientNameForRedisV3","client","NODE_ENV","on","send_command","err","console","error","log","pid","createSetClientNameForIoredis","once","call","then","catch","createSetClientNameForRedisV4","sendCommand","isIORedis","disconnect","options","undefined","getRedisClientType","info","Error","module","exports"],"sources":["../src/redisUtils.js"],"sourcesContent":["const REDIS_V4 = 'REDIS_V4'\nconst REDIS_V3 = 'REDIS_V3'\nconst IOREDIS = 'IOREDIS'\n\nconst dyno = process.env.BUILD_DYNO_PROCESS_TYPE || 'undefined-dyno'\nconst defaultAppName = process.env.BUILD_DYNO_APP_NAME || 'undefined-app'\n\n/**\n * Get default redis client name\n *\n * @param {string} [name='undefined-app'] - Fallback app name if BUILD_APP_NAME is not set.\n * @returns {string}\n */\nconst getCorrectNameForRedis = (name = 'undefined-app') => {\n const appName = defaultAppName || name\n\n return `${appName}:${dyno}:${name}`\n}\n/**\n * Creates a configured setClientName function for node-redis v3.\n *\n * @param {string} [defaultAppName='undefined-app'] - Fallback app name if BUILD_APP_NAME is not set.\n * @returns {(client: any, name: string) => void}\n */\nconst createSetClientNameForRedisV3 = (defaultAppName = 'undefined-app') => {\n return (client, name) => {\n if (process.env.NODE_ENV !== 'test') {\n client.on('connect', () => {\n client.send_command(\n 'CLIENT',\n ['SETNAME', getCorrectNameForRedis(name)],\n err => {\n if (err) {\n console.error(`Failed to set client name for ${name}:`, err)\n } else {\n console.log(`Connected to Redis for pid:${process.pid} (${name})`)\n }\n }\n )\n })\n }\n }\n}\n\n/**\n * Creates a function to set Redis client name for ioredis.\n *\n * @param {string} [defaultAppName='undefined-app']\n * @returns {(client: any, name: string) => void}\n */\nconst createSetClientNameForIoredis = (defaultAppName = 'undefined-app') => {\n return (client, name) => {\n if (process.env.NODE_ENV !== 'test') {\n client.once('connect', () => {\n client\n .call('CLIENT', ['SETNAME', getCorrectNameForRedis(name)])\n .then(() => {\n console.log(`Connected to Redis for pid:${process.pid} (${name})`)\n })\n .catch(err => {\n console.error(`Failed to set client name for ${name}:`, err)\n })\n })\n }\n }\n}\n\n/**\n * Creates a function to set Redis client name for node-redis v4.\n *\n * @param {string} [defaultAppName='undefined-app']\n * @returns {(client: any, name: string) => void}\n */\nconst createSetClientNameForRedisV4 = (defaultAppName = 'undefined-app') => {\n return (client, name) => {\n if (process.env.NODE_ENV !== 'test') {\n client.on('ready', async () => {\n try {\n await client.sendCommand([\n 'CLIENT',\n 'SETNAME',\n getCorrectNameForRedis(name),\n ])\n console.log(`Connected to Redis for pid:${process.pid} (${name})`)\n } catch (err) {\n console.error(`Failed to set client name for ${name}:`, err)\n }\n })\n }\n }\n}\n\n/**\n * Check if a Redis client is an ioredis instance\n *\n * @param {any} client - Redis client instance\n * @returns {boolean} True if the client is ioredis\n */\nconst isIORedis = client => {\n return (\n client &&\n typeof client.sendCommand === 'function' &&\n typeof client.disconnect === 'function' &&\n client.options !== undefined\n )\n}\n\n/**\n * Get Redis client type\n *\n * @param {any} client - Redis client instance\n * @returns {string} One of IOREDIS, REDIS_V3, REDIS_V4\n */\nconst getRedisClientType = client => {\n if (isIORedis(client)) {\n console.log('Detected node-redis ioredis')\n return IOREDIS\n }\n if (typeof client?.send_command === 'function') {\n console.log('Detected node-redis redis_v3')\n return REDIS_V3\n }\n if (typeof client.info === 'function') {\n console.log('Detected node-redis redis_v4')\n return REDIS_V4\n }\n\n throw new Error(`Failed to get Redis client type`)\n}\n\nmodule.exports = {\n createSetClientNameForRedisV3,\n createSetClientNameForRedisV4,\n createSetClientNameForIoredis,\n isIORedis,\n getRedisClientType,\n REDIS_V4,\n REDIS_V3,\n IOREDIS,\n getCorrectNameForRedis\n}\n"],"mappings":"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","ignoreList":[]}
|
package/package.json
CHANGED
package/src/redisUtils.js
CHANGED
|
@@ -2,6 +2,20 @@ const REDIS_V4 = 'REDIS_V4'
|
|
|
2
2
|
const REDIS_V3 = 'REDIS_V3'
|
|
3
3
|
const IOREDIS = 'IOREDIS'
|
|
4
4
|
|
|
5
|
+
const dyno = process.env.BUILD_DYNO_PROCESS_TYPE || 'undefined-dyno'
|
|
6
|
+
const defaultAppName = process.env.BUILD_DYNO_APP_NAME || 'undefined-app'
|
|
7
|
+
|
|
8
|
+
/**
|
|
9
|
+
* Get default redis client name
|
|
10
|
+
*
|
|
11
|
+
* @param {string} [name='undefined-app'] - Fallback app name if BUILD_APP_NAME is not set.
|
|
12
|
+
* @returns {string}
|
|
13
|
+
*/
|
|
14
|
+
const getCorrectNameForRedis = (name = 'undefined-app') => {
|
|
15
|
+
const appName = defaultAppName || name
|
|
16
|
+
|
|
17
|
+
return `${appName}:${dyno}:${name}`
|
|
18
|
+
}
|
|
5
19
|
/**
|
|
6
20
|
* Creates a configured setClientName function for node-redis v3.
|
|
7
21
|
*
|
|
@@ -10,14 +24,11 @@ const IOREDIS = 'IOREDIS'
|
|
|
10
24
|
*/
|
|
11
25
|
const createSetClientNameForRedisV3 = (defaultAppName = 'undefined-app') => {
|
|
12
26
|
return (client, name) => {
|
|
13
|
-
const appName = process.env.BUILD_APP_NAME || defaultAppName
|
|
14
|
-
const dyno = process.env.BUILD_DYNO_PROCESS_TYPE || 'undefined-dyno'
|
|
15
|
-
|
|
16
27
|
if (process.env.NODE_ENV !== 'test') {
|
|
17
28
|
client.on('connect', () => {
|
|
18
29
|
client.send_command(
|
|
19
30
|
'CLIENT',
|
|
20
|
-
['SETNAME',
|
|
31
|
+
['SETNAME', getCorrectNameForRedis(name)],
|
|
21
32
|
err => {
|
|
22
33
|
if (err) {
|
|
23
34
|
console.error(`Failed to set client name for ${name}:`, err)
|
|
@@ -39,13 +50,10 @@ const createSetClientNameForRedisV3 = (defaultAppName = 'undefined-app') => {
|
|
|
39
50
|
*/
|
|
40
51
|
const createSetClientNameForIoredis = (defaultAppName = 'undefined-app') => {
|
|
41
52
|
return (client, name) => {
|
|
42
|
-
const appName = process.env.BUILD_APP_NAME || defaultAppName
|
|
43
|
-
const dyno = process.env.BUILD_DYNO_PROCESS_TYPE || 'undefined-dyno'
|
|
44
|
-
|
|
45
53
|
if (process.env.NODE_ENV !== 'test') {
|
|
46
54
|
client.once('connect', () => {
|
|
47
55
|
client
|
|
48
|
-
.call('CLIENT', ['SETNAME',
|
|
56
|
+
.call('CLIENT', ['SETNAME', getCorrectNameForRedis(name)])
|
|
49
57
|
.then(() => {
|
|
50
58
|
console.log(`Connected to Redis for pid:${process.pid} (${name})`)
|
|
51
59
|
})
|
|
@@ -65,16 +73,13 @@ const createSetClientNameForIoredis = (defaultAppName = 'undefined-app') => {
|
|
|
65
73
|
*/
|
|
66
74
|
const createSetClientNameForRedisV4 = (defaultAppName = 'undefined-app') => {
|
|
67
75
|
return (client, name) => {
|
|
68
|
-
const appName = process.env.BUILD_APP_NAME || defaultAppName
|
|
69
|
-
const dyno = process.env.BUILD_DYNO_PROCESS_TYPE || 'undefined-dyno'
|
|
70
|
-
|
|
71
76
|
if (process.env.NODE_ENV !== 'test') {
|
|
72
77
|
client.on('ready', async () => {
|
|
73
78
|
try {
|
|
74
79
|
await client.sendCommand([
|
|
75
80
|
'CLIENT',
|
|
76
81
|
'SETNAME',
|
|
77
|
-
|
|
82
|
+
getCorrectNameForRedis(name),
|
|
78
83
|
])
|
|
79
84
|
console.log(`Connected to Redis for pid:${process.pid} (${name})`)
|
|
80
85
|
} catch (err) {
|
|
@@ -132,4 +137,5 @@ module.exports = {
|
|
|
132
137
|
REDIS_V4,
|
|
133
138
|
REDIS_V3,
|
|
134
139
|
IOREDIS,
|
|
140
|
+
getCorrectNameForRedis
|
|
135
141
|
}
|