eyevinn-channel-engine 4.3.3 → 4.3.4
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.
|
@@ -36,7 +36,13 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
36
36
|
};
|
|
37
37
|
var Redis = require("ioredis");
|
|
38
38
|
var debug = require("debug")("redis-state-store");
|
|
39
|
+
var cloudWatchLog = require("./util.js").cloudWatchLog;
|
|
39
40
|
var DEFAULT_VOLATILE_KEY_TTL = 5; // Timeout so it should not expire within one normal increment iteration (in seconds)
|
|
41
|
+
function isTrue(s) {
|
|
42
|
+
var regex = /^\s*(true|1)\s*$/i;
|
|
43
|
+
return regex.test(s);
|
|
44
|
+
}
|
|
45
|
+
var REDIS_VERBOSE_LOG = process.env.REDIS_VERBOSE_LOG ? isTrue(process.env.REDIS_VERBOSE_LOG) : false;
|
|
40
46
|
var RedisStateStore = /** @class */ (function () {
|
|
41
47
|
function RedisStateStore(keyPrefix, opts) {
|
|
42
48
|
this.keyPrefix = keyPrefix;
|
|
@@ -135,12 +141,13 @@ var RedisStateStore = /** @class */ (function () {
|
|
|
135
141
|
};
|
|
136
142
|
RedisStateStore.prototype.getValues = function (id, keys) {
|
|
137
143
|
return __awaiter(this, void 0, void 0, function () {
|
|
138
|
-
var pipeline, data, _loop_1, this_1, _i, keys_1, key;
|
|
144
|
+
var pipeline, data, startMs, _loop_1, this_1, _i, keys_1, key, ops, ioTimeMs;
|
|
139
145
|
return __generator(this, function (_a) {
|
|
140
146
|
switch (_a.label) {
|
|
141
147
|
case 0:
|
|
142
148
|
pipeline = this.client.pipeline();
|
|
143
149
|
data = {};
|
|
150
|
+
startMs = Date.now();
|
|
144
151
|
_loop_1 = function (key) {
|
|
145
152
|
var storeKey = "" + this_1.keyPrefix + id + key;
|
|
146
153
|
pipeline.get(storeKey, function (err, reply) {
|
|
@@ -160,9 +167,12 @@ var RedisStateStore = /** @class */ (function () {
|
|
|
160
167
|
key = keys_1[_i];
|
|
161
168
|
_loop_1(key);
|
|
162
169
|
}
|
|
170
|
+
ops = pipeline.length;
|
|
163
171
|
return [4 /*yield*/, pipeline.exec()];
|
|
164
172
|
case 1:
|
|
165
173
|
_a.sent();
|
|
174
|
+
ioTimeMs = Date.now() - startMs;
|
|
175
|
+
cloudWatchLog(!REDIS_VERBOSE_LOG, 'redis', { event: 'getValues', operations: ops, ioTimeMs: ioTimeMs });
|
|
166
176
|
return [2 /*return*/, data];
|
|
167
177
|
}
|
|
168
178
|
});
|
|
@@ -189,6 +199,7 @@ var RedisStateStore = /** @class */ (function () {
|
|
|
189
199
|
catch (err) {
|
|
190
200
|
console.error("REDIS get: Failed to parse ".concat(storeKey, " data: '").concat(reply, "'"));
|
|
191
201
|
}
|
|
202
|
+
cloudWatchLog(!REDIS_VERBOSE_LOG, 'redis', { event: 'get', operations: 1, ioTimeMs: ioTimeMs });
|
|
192
203
|
resolve(data_1);
|
|
193
204
|
}
|
|
194
205
|
else {
|
|
@@ -206,11 +217,12 @@ var RedisStateStore = /** @class */ (function () {
|
|
|
206
217
|
};
|
|
207
218
|
RedisStateStore.prototype.setValues = function (id, data) {
|
|
208
219
|
return __awaiter(this, void 0, void 0, function () {
|
|
209
|
-
var returnData, pipeline, _loop_2, this_2, _i, _a, key;
|
|
220
|
+
var returnData, startMs, pipeline, _loop_2, this_2, _i, _a, key, ops, ioTimeMs;
|
|
210
221
|
return __generator(this, function (_b) {
|
|
211
222
|
switch (_b.label) {
|
|
212
223
|
case 0:
|
|
213
224
|
returnData = {};
|
|
225
|
+
startMs = Date.now();
|
|
214
226
|
pipeline = this.client.pipeline();
|
|
215
227
|
_loop_2 = function (key) {
|
|
216
228
|
var storeKey = "" + this_2.keyPrefix + id + key;
|
|
@@ -227,9 +239,12 @@ var RedisStateStore = /** @class */ (function () {
|
|
|
227
239
|
key = _a[_i];
|
|
228
240
|
_loop_2(key);
|
|
229
241
|
}
|
|
242
|
+
ops = pipeline.length;
|
|
230
243
|
return [4 /*yield*/, pipeline.exec()];
|
|
231
244
|
case 1:
|
|
232
245
|
_b.sent();
|
|
246
|
+
ioTimeMs = Date.now() - startMs;
|
|
247
|
+
cloudWatchLog(!REDIS_VERBOSE_LOG, 'redis', { event: 'setValues', operations: ops, ioTimeMs: ioTimeMs });
|
|
233
248
|
return [2 /*return*/, returnData];
|
|
234
249
|
}
|
|
235
250
|
});
|
|
@@ -249,6 +264,7 @@ var RedisStateStore = /** @class */ (function () {
|
|
|
249
264
|
var ioTimeMs = Date.now() - startMs;
|
|
250
265
|
debug("REDIS set ".concat(storeKey, ": ").concat(res, " (").concat(ioTimeMs, "ms) ").concat(ioTimeMs > 1000 ? "REDISSLOW!" : ""));
|
|
251
266
|
if (!err) {
|
|
267
|
+
cloudWatchLog(!REDIS_VERBOSE_LOG, 'redis', { event: 'set', operations: 1, ioTimeMs: ioTimeMs });
|
|
252
268
|
resolve(value);
|
|
253
269
|
}
|
|
254
270
|
else {
|
|
@@ -305,6 +321,7 @@ var RedisStateStore = /** @class */ (function () {
|
|
|
305
321
|
var ioTimeMs = Date.now() - startMs;
|
|
306
322
|
debug("REDIS remove ".concat(storeKey, ": (").concat(ioTimeMs, "ms) ").concat(ioTimeMs > 1000 ? "REDISSLOW!" : ""));
|
|
307
323
|
if (!err) {
|
|
324
|
+
cloudWatchLog(!REDIS_VERBOSE_LOG, 'redis', { event: 'remove', operations: 1, ioTimeMs: ioTimeMs });
|
|
308
325
|
resolve();
|
|
309
326
|
}
|
|
310
327
|
else {
|
package/dist/package.json
CHANGED
|
@@ -1,8 +1,16 @@
|
|
|
1
1
|
const Redis = require("ioredis");
|
|
2
2
|
const debug = require("debug")("redis-state-store");
|
|
3
|
+
const { cloudWatchLog } = require("./util.js");
|
|
3
4
|
|
|
4
5
|
const DEFAULT_VOLATILE_KEY_TTL = 5; // Timeout so it should not expire within one normal increment iteration (in seconds)
|
|
5
6
|
|
|
7
|
+
function isTrue(s) {
|
|
8
|
+
const regex = /^\s*(true|1)\s*$/i;
|
|
9
|
+
return regex.test(s);
|
|
10
|
+
}
|
|
11
|
+
|
|
12
|
+
const REDIS_VERBOSE_LOG = process.env.REDIS_VERBOSE_LOG ? isTrue(process.env.REDIS_VERBOSE_LOG) : false;
|
|
13
|
+
|
|
6
14
|
class RedisStateStore {
|
|
7
15
|
constructor(keyPrefix, opts) {
|
|
8
16
|
this.keyPrefix = keyPrefix;
|
|
@@ -59,6 +67,7 @@ class RedisStateStore {
|
|
|
59
67
|
async getValues(id, keys) {
|
|
60
68
|
const pipeline = this.client.pipeline();
|
|
61
69
|
let data = {};
|
|
70
|
+
const startMs = Date.now();
|
|
62
71
|
for (const key of keys) {
|
|
63
72
|
const storeKey = "" + this.keyPrefix + id + key;
|
|
64
73
|
pipeline.get(storeKey, (err, reply) => {
|
|
@@ -72,7 +81,11 @@ class RedisStateStore {
|
|
|
72
81
|
}
|
|
73
82
|
});
|
|
74
83
|
}
|
|
84
|
+
const ops = pipeline.length;
|
|
75
85
|
await pipeline.exec();
|
|
86
|
+
const ioTimeMs = Date.now() - startMs;
|
|
87
|
+
cloudWatchLog(!REDIS_VERBOSE_LOG, 'redis',
|
|
88
|
+
{ event: 'getValues', operations: ops, ioTimeMs: ioTimeMs });
|
|
76
89
|
return data;
|
|
77
90
|
}
|
|
78
91
|
|
|
@@ -90,6 +103,8 @@ class RedisStateStore {
|
|
|
90
103
|
} catch (err) {
|
|
91
104
|
console.error(`REDIS get: Failed to parse ${storeKey} data: '${reply}'`);
|
|
92
105
|
}
|
|
106
|
+
cloudWatchLog(!REDIS_VERBOSE_LOG, 'redis',
|
|
107
|
+
{ event: 'get', operations: 1, ioTimeMs: ioTimeMs });
|
|
93
108
|
resolve(data);
|
|
94
109
|
} else {
|
|
95
110
|
reject(err);
|
|
@@ -102,6 +117,7 @@ class RedisStateStore {
|
|
|
102
117
|
|
|
103
118
|
async setValues(id, data) {
|
|
104
119
|
const returnData = {};
|
|
120
|
+
const startMs = Date.now();
|
|
105
121
|
const pipeline = this.client.pipeline();
|
|
106
122
|
for (const key of Object.keys(data)) {
|
|
107
123
|
const storeKey = "" + this.keyPrefix + id + key;
|
|
@@ -113,7 +129,11 @@ class RedisStateStore {
|
|
|
113
129
|
}
|
|
114
130
|
});
|
|
115
131
|
}
|
|
132
|
+
const ops = pipeline.length;
|
|
116
133
|
await pipeline.exec();
|
|
134
|
+
const ioTimeMs = Date.now() - startMs;
|
|
135
|
+
cloudWatchLog(!REDIS_VERBOSE_LOG, 'redis',
|
|
136
|
+
{ event: 'setValues', operations: ops, ioTimeMs: ioTimeMs });
|
|
117
137
|
return returnData;
|
|
118
138
|
}
|
|
119
139
|
|
|
@@ -125,6 +145,8 @@ class RedisStateStore {
|
|
|
125
145
|
const ioTimeMs = Date.now() - startMs;
|
|
126
146
|
debug(`REDIS set ${storeKey}: ${res} (${ioTimeMs}ms) ${ioTimeMs > 1000 ? "REDISSLOW!" : ""}`);
|
|
127
147
|
if (!err) {
|
|
148
|
+
cloudWatchLog(!REDIS_VERBOSE_LOG, 'redis',
|
|
149
|
+
{ event: 'set', operations: 1, ioTimeMs: ioTimeMs });
|
|
128
150
|
resolve(value);
|
|
129
151
|
} else {
|
|
130
152
|
reject(err);
|
|
@@ -159,6 +181,8 @@ class RedisStateStore {
|
|
|
159
181
|
const ioTimeMs = Date.now() - startMs;
|
|
160
182
|
debug(`REDIS remove ${storeKey}: (${ioTimeMs}ms) ${ioTimeMs > 1000 ? "REDISSLOW!" : ""}`);
|
|
161
183
|
if (!err) {
|
|
184
|
+
cloudWatchLog(!REDIS_VERBOSE_LOG, 'redis',
|
|
185
|
+
{ event: 'remove', operations: 1, ioTimeMs: ioTimeMs });
|
|
162
186
|
resolve();
|
|
163
187
|
} else {
|
|
164
188
|
reject(err);
|