redis-memory-server 0.3.1 → 0.6.0
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/README.md +10 -1
- package/lib/util/RedisBinary.js +1 -1
- package/lib/util/RedisBinary.js.map +1 -1
- package/lib/util/RedisBinaryDownload.d.ts +13 -0
- package/lib/util/RedisBinaryDownload.d.ts.map +1 -1
- package/lib/util/RedisBinaryDownload.js +70 -12
- package/lib/util/RedisBinaryDownload.js.map +1 -1
- package/lib/util/RedisBinaryDownloadUrl.d.ts.map +1 -1
- package/lib/util/RedisBinaryDownloadUrl.js +16 -6
- package/lib/util/RedisBinaryDownloadUrl.js.map +1 -1
- package/lib/util/RedisInstance.d.ts.map +1 -1
- package/lib/util/RedisInstance.js +9 -5
- package/lib/util/RedisInstance.js.map +1 -1
- package/lib/util/db_util.d.ts +5 -0
- package/lib/util/db_util.d.ts.map +1 -1
- package/lib/util/db_util.js +19 -1
- package/lib/util/db_util.js.map +1 -1
- package/package.json +5 -4
- package/CHANGELOG.md +0 -41
package/README.md
CHANGED
|
@@ -50,7 +50,16 @@ On install, this package auto-downloads and compiles version `stable` of the `re
|
|
|
50
50
|
- Typescript: 3.8+ (if used)
|
|
51
51
|
- `make`
|
|
52
52
|
|
|
53
|
-
|
|
53
|
+
### Windows:
|
|
54
|
+
|
|
55
|
+
|
|
56
|
+
Although Windows is not officially supported by Redis, but there is a downloadable version of [redis: 3.0.503 (June 28, 2016) for win64 by microsoft](https://github.com/ServiceStack/redis-windows#option-3-running-microsofts-native-port-of-redis). This is an older version. It will work for most of the simple tasks like basic storage and pubsub. Probably what is missing or old is lua scripting.
|
|
57
|
+
|
|
58
|
+
Please note it will download the redis binary from github from URL: `https://raw.githubusercontent.com/ServiceStack/redis-windows/master/downloads/redis-latest.zip`.
|
|
59
|
+
|
|
60
|
+
Optionally, you could provide your own URL before running `npm install`:
|
|
61
|
+
`npx cross-env REDISMS_DOWNLOAD_URL='https://raw.githubusercontent.com/ServiceStack/redis-windows/master/downloads/redis-latest.zip' npm install`
|
|
62
|
+
|
|
54
63
|
|
|
55
64
|
### Configuring which `redis-server` binary to use
|
|
56
65
|
|
package/lib/util/RedisBinary.js
CHANGED
|
@@ -90,7 +90,7 @@ var RedisBinary = /** @class */ (function () {
|
|
|
90
90
|
return [3 /*break*/, 4];
|
|
91
91
|
case 3:
|
|
92
92
|
err_1 = _a.sent();
|
|
93
|
-
log("RedisBinary: can't find system binary at \"" + systemBinary + "\".\n" + err_1.message);
|
|
93
|
+
log("RedisBinary: can't find system binary at \"" + systemBinary + "\".\n" + (err_1 === null || err_1 === void 0 ? void 0 : err_1.message));
|
|
94
94
|
return [3 /*break*/, 4];
|
|
95
95
|
case 4: return [2 /*return*/, binaryPath];
|
|
96
96
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RedisBinary.js","sourceRoot":"","sources":["../../src/util/RedisBinary.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAAoB;AACpB,0CAAoB;AACpB,8CAAwB;AACxB,sDAAgC;AAChC,kDAA4B;AAC5B,kEAA0C;AAC1C,+CAAyC;AACzC,6BAAiC;AACjC,8EAAwD;AACxD,oEAA6C;AAC7C,gDAA0B;AAE1B,IAAM,GAAG,GAAG,eAAK,CAAC,qBAAqB,CAAC,CAAC;AAE5B,QAAA,cAAc,GAAW,QAAQ,CAAC;AAY/C;IAAA;IAqKA,CAAC;IAlKC;;;;OAIG;IACU,yBAAa,GAA1B,UAA2B,YAAoB;;;;;;wBACzC,UAAU,GAAG,EAAE,CAAC;;;;wBAGlB,qBAAM,gBAAS,CAAC,YAAE,CAAC,MAAM,CAAC,CAAC,YAAY,CAAC,EAAA;;wBAAxC,SAAwC,CAAC;wBAEzC,GAAG,CAAC,gDAA6C,YAAY,OAAG,CAAC,CAAC;wBAClE,UAAU,GAAG,YAAY,CAAC;;;;wBAE1B,GAAG,CAAC,gDAA6C,YAAY,
|
|
1
|
+
{"version":3,"file":"RedisBinary.js","sourceRoot":"","sources":["../../src/util/RedisBinary.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,6 +9,7 @@ interface HttpDownloadOptions {
|
|
|
9
9
|
hostname: string;
|
|
10
10
|
port: string;
|
|
11
11
|
path: string;
|
|
12
|
+
protocol: string;
|
|
12
13
|
method: 'GET' | 'POST';
|
|
13
14
|
rejectUnauthorized?: boolean;
|
|
14
15
|
agent: HttpsProxyAgent | undefined;
|
|
@@ -49,6 +50,12 @@ export default class RedisBinaryDownload {
|
|
|
49
50
|
* @param extractDir Directory to extract to
|
|
50
51
|
*/
|
|
51
52
|
extractTarGz(redisArchive: string, extractDir: string): Promise<void>;
|
|
53
|
+
/**
|
|
54
|
+
* Extract a .zip archive
|
|
55
|
+
* @param redisArchive Archive location
|
|
56
|
+
* @param extractDir Directory to extract to
|
|
57
|
+
*/
|
|
58
|
+
extractZip(redisArchive: string, extractDir: string): Promise<void>;
|
|
52
59
|
/**
|
|
53
60
|
* Downlaod given httpOptions to tempDownloadLocation, then move it to downloadLocation
|
|
54
61
|
* @param httpOptions The httpOptions directly passed to https.get
|
|
@@ -69,6 +76,12 @@ export default class RedisBinaryDownload {
|
|
|
69
76
|
* @returns void
|
|
70
77
|
*/
|
|
71
78
|
makeInstall(extractDir: string): Promise<void>;
|
|
79
|
+
/**
|
|
80
|
+
* copy binary to parent folder and delete given extracted directory
|
|
81
|
+
* @param extractDir Extracted directory location
|
|
82
|
+
* @returns void
|
|
83
|
+
*/
|
|
84
|
+
makeInstallWin32(extractDir: string): Promise<void>;
|
|
72
85
|
/**
|
|
73
86
|
* Test if the location given is already used
|
|
74
87
|
* Does *not* dereference links
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RedisBinaryDownload.d.ts","sourceRoot":"","sources":["../../src/util/RedisBinaryDownload.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"RedisBinaryDownload.d.ts","sourceRoot":"","sources":["../../src/util/RedisBinaryDownload.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAE7C,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAGpD,OAAO,kBAAkB,CAAC;AAK1B,MAAM,WAAW,uBAAuB;IACtC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,UAAU,mBAAmB;IAC3B,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,KAAK,GAAG,MAAM,CAAC;IACvB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,KAAK,EAAE,eAAe,GAAG,SAAS,CAAC;CACpC;AAED;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,mBAAmB;IACtC,UAAU,EAAE,iBAAiB,CAAC;IAC9B,eAAe,CAAC,EAAE,MAAM,CAAC;IAEzB,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;gBAEJ,EAAE,WAAW,EAAE,OAAO,EAAE,EAAE,uBAAuB;IAW7D;;;OAGG;IACG,kBAAkB,IAAI,OAAO,CAAC,MAAM,CAAC;IAwB3C;;;OAGG;IACG,aAAa,IAAI,OAAO,CAAC,MAAM,CAAC;IActC;;;OAGG;IACG,QAAQ,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAqDpD;;;;OAIG;IACG,OAAO,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAuBpD;;;;OAIG;IACG,YAAY,CAAC,YAAY,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAQ3E;;;;OAIG;IACG,UAAU,CAAC,YAAY,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIzE;;;;;OAKG;IACG,YAAY,CAChB,WAAW,EAAE,mBAAmB,EAChC,gBAAgB,EAAE,MAAM,EACxB,oBAAoB,EAAE,MAAM,GAC3B,OAAO,CAAC,MAAM,CAAC;IAiElB;;;OAGG;IACH,qBAAqB,CAAC,KAAK,EAAE;QAAE,MAAM,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI;IAuBtD;;;;OAIG;IACG,WAAW,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAapD;;;;OAIG;IACG,gBAAgB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAUzD;;;;OAIG;IACG,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;CAWzD"}
|
|
@@ -43,8 +43,10 @@ var url_1 = __importDefault(require("url"));
|
|
|
43
43
|
var path_1 = __importDefault(require("path"));
|
|
44
44
|
var fs_1 = __importDefault(require("fs"));
|
|
45
45
|
var rimraf_1 = __importDefault(require("rimraf"));
|
|
46
|
+
var http_1 = __importDefault(require("http"));
|
|
46
47
|
var https_1 = __importDefault(require("https"));
|
|
47
48
|
var tar_1 = __importDefault(require("tar"));
|
|
49
|
+
var extract_zip_1 = __importDefault(require("extract-zip"));
|
|
48
50
|
var RedisBinaryDownloadUrl_1 = __importDefault(require("./RedisBinaryDownloadUrl"));
|
|
49
51
|
var RedisBinary_1 = require("./RedisBinary");
|
|
50
52
|
var https_proxy_agent_1 = require("https-proxy-agent");
|
|
@@ -78,7 +80,7 @@ var RedisBinaryDownload = /** @class */ (function () {
|
|
|
78
80
|
return __generator(this, function (_a) {
|
|
79
81
|
switch (_a.label) {
|
|
80
82
|
case 0:
|
|
81
|
-
binaryName = 'redis-server';
|
|
83
|
+
binaryName = process.platform === 'win32' ? 'redis-server.exe' : 'redis-server';
|
|
82
84
|
redisServerPath = path_1.default.resolve(this.downloadDir, this.version, binaryName);
|
|
83
85
|
return [4 /*yield*/, this.locationExists(redisServerPath)];
|
|
84
86
|
case 1:
|
|
@@ -91,12 +93,19 @@ var RedisBinaryDownload = /** @class */ (function () {
|
|
|
91
93
|
return [4 /*yield*/, this.extract(redisArchive)];
|
|
92
94
|
case 3:
|
|
93
95
|
extractDir = _a.sent();
|
|
94
|
-
return [
|
|
96
|
+
if (!(process.platform === 'win32')) return [3 /*break*/, 5];
|
|
97
|
+
return [4 /*yield*/, this.makeInstallWin32(extractDir)];
|
|
95
98
|
case 4:
|
|
96
99
|
_a.sent();
|
|
100
|
+
return [3 /*break*/, 7];
|
|
101
|
+
case 5: return [4 /*yield*/, this.makeInstall(extractDir)];
|
|
102
|
+
case 6:
|
|
103
|
+
_a.sent();
|
|
104
|
+
_a.label = 7;
|
|
105
|
+
case 7:
|
|
97
106
|
fs_1.default.unlinkSync(redisArchive);
|
|
98
107
|
return [4 /*yield*/, this.locationExists(redisServerPath)];
|
|
99
|
-
case
|
|
108
|
+
case 8:
|
|
100
109
|
if (_a.sent()) {
|
|
101
110
|
return [2 /*return*/, redisServerPath];
|
|
102
111
|
}
|
|
@@ -156,6 +165,7 @@ var RedisBinaryDownload = /** @class */ (function () {
|
|
|
156
165
|
hostname: urlObject.hostname,
|
|
157
166
|
port: urlObject.port || '443',
|
|
158
167
|
path: urlObject.path,
|
|
168
|
+
protocol: urlObject.protocol || 'https:',
|
|
159
169
|
method: 'GET',
|
|
160
170
|
rejectUnauthorized: strictSsl,
|
|
161
171
|
agent: proxy ? new https_proxy_agent_1.HttpsProxyAgent(proxy) : undefined,
|
|
@@ -199,13 +209,19 @@ var RedisBinaryDownload = /** @class */ (function () {
|
|
|
199
209
|
if (!fs_1.default.existsSync(extractDir)) {
|
|
200
210
|
fs_1.default.mkdirSync(extractDir, { recursive: true });
|
|
201
211
|
}
|
|
202
|
-
if (!redisArchive.endsWith('.
|
|
203
|
-
return [4 /*yield*/, this.
|
|
212
|
+
if (!redisArchive.endsWith('.zip')) return [3 /*break*/, 2];
|
|
213
|
+
return [4 /*yield*/, this.extractZip(redisArchive, extractDir)];
|
|
204
214
|
case 1:
|
|
205
215
|
_b.sent();
|
|
206
|
-
return [3 /*break*/,
|
|
207
|
-
case 2:
|
|
208
|
-
|
|
216
|
+
return [3 /*break*/, 5];
|
|
217
|
+
case 2:
|
|
218
|
+
if (!redisArchive.endsWith('.tar.gz')) return [3 /*break*/, 4];
|
|
219
|
+
return [4 /*yield*/, this.extractTarGz(redisArchive, extractDir)];
|
|
220
|
+
case 3:
|
|
221
|
+
_b.sent();
|
|
222
|
+
return [3 /*break*/, 5];
|
|
223
|
+
case 4: throw new Error("RedisBinaryDownload: unsupported archive " + redisArchive + " (downloaded from " + ((_a = this._downloadingUrl) !== null && _a !== void 0 ? _a : 'unkown') + "). Broken archive from Redis Provider?");
|
|
224
|
+
case 5: return [2 /*return*/, extractDir];
|
|
209
225
|
}
|
|
210
226
|
});
|
|
211
227
|
});
|
|
@@ -231,6 +247,23 @@ var RedisBinaryDownload = /** @class */ (function () {
|
|
|
231
247
|
});
|
|
232
248
|
});
|
|
233
249
|
};
|
|
250
|
+
/**
|
|
251
|
+
* Extract a .zip archive
|
|
252
|
+
* @param redisArchive Archive location
|
|
253
|
+
* @param extractDir Directory to extract to
|
|
254
|
+
*/
|
|
255
|
+
RedisBinaryDownload.prototype.extractZip = function (redisArchive, extractDir) {
|
|
256
|
+
return __awaiter(this, void 0, void 0, function () {
|
|
257
|
+
return __generator(this, function (_a) {
|
|
258
|
+
switch (_a.label) {
|
|
259
|
+
case 0: return [4 /*yield*/, extract_zip_1.default(redisArchive, { dir: extractDir })];
|
|
260
|
+
case 1:
|
|
261
|
+
_a.sent();
|
|
262
|
+
return [2 /*return*/];
|
|
263
|
+
}
|
|
264
|
+
});
|
|
265
|
+
});
|
|
266
|
+
};
|
|
234
267
|
/**
|
|
235
268
|
* Downlaod given httpOptions to tempDownloadLocation, then move it to downloadLocation
|
|
236
269
|
* @param httpOptions The httpOptions directly passed to https.get
|
|
@@ -243,15 +276,15 @@ var RedisBinaryDownload = /** @class */ (function () {
|
|
|
243
276
|
return __generator(this, function (_a) {
|
|
244
277
|
return [2 /*return*/, new Promise(function (resolve, reject) {
|
|
245
278
|
var fileStream = fs_1.default.createWriteStream(tempDownloadLocation);
|
|
246
|
-
log("trying to download
|
|
247
|
-
https_1.default
|
|
279
|
+
log("trying to download " + httpOptions.protocol + "//" + httpOptions.hostname + httpOptions.path);
|
|
280
|
+
(httpOptions.protocol === 'https:' ? https_1.default : http_1.default)
|
|
248
281
|
.get(httpOptions, function (response) {
|
|
249
282
|
// "as any" because otherwise the "agent" wouldnt match
|
|
250
283
|
if (response.statusCode != 200) {
|
|
251
284
|
if (response.statusCode === 404) {
|
|
252
285
|
reject(new Error('Status Code is 404\n' +
|
|
253
286
|
"This means that the requested version doesn't exist\n" +
|
|
254
|
-
(" Used Url: \"
|
|
287
|
+
(" Used Url: \"" + httpOptions.protocol + "//" + httpOptions.hostname + httpOptions.path + "\"\n") +
|
|
255
288
|
"Try to use different version 'new RedisMemoryServer({ binary: { version: 'X.Y.Z' } })'\n"));
|
|
256
289
|
return;
|
|
257
290
|
}
|
|
@@ -272,7 +305,8 @@ var RedisBinaryDownload = /** @class */ (function () {
|
|
|
272
305
|
switch (_a.label) {
|
|
273
306
|
case 0:
|
|
274
307
|
if (this.dlProgress.current < this.dlProgress.length) {
|
|
275
|
-
downloadUrl = this._downloadingUrl ||
|
|
308
|
+
downloadUrl = this._downloadingUrl ||
|
|
309
|
+
httpOptions.protocol + "//" + httpOptions.hostname + "/" + httpOptions.path;
|
|
276
310
|
reject(new Error("Too small (" + this.dlProgress.current + " bytes) redis-server binary downloaded from " + downloadUrl));
|
|
277
311
|
return [2 /*return*/];
|
|
278
312
|
}
|
|
@@ -351,6 +385,30 @@ var RedisBinaryDownload = /** @class */ (function () {
|
|
|
351
385
|
});
|
|
352
386
|
});
|
|
353
387
|
};
|
|
388
|
+
/**
|
|
389
|
+
* copy binary to parent folder and delete given extracted directory
|
|
390
|
+
* @param extractDir Extracted directory location
|
|
391
|
+
* @returns void
|
|
392
|
+
*/
|
|
393
|
+
RedisBinaryDownload.prototype.makeInstallWin32 = function (extractDir) {
|
|
394
|
+
return __awaiter(this, void 0, void 0, function () {
|
|
395
|
+
var binaryName;
|
|
396
|
+
return __generator(this, function (_a) {
|
|
397
|
+
switch (_a.label) {
|
|
398
|
+
case 0:
|
|
399
|
+
binaryName = 'redis-server.exe';
|
|
400
|
+
log("makeInstallWin32(): " + extractDir);
|
|
401
|
+
return [4 /*yield*/, util_1.promisify(fs_1.default.copyFile)(path_1.default.resolve(extractDir, '.', binaryName), path_1.default.resolve(extractDir, '..', binaryName))];
|
|
402
|
+
case 1:
|
|
403
|
+
_a.sent();
|
|
404
|
+
return [4 /*yield*/, util_1.promisify(rimraf_1.default)(extractDir)];
|
|
405
|
+
case 2:
|
|
406
|
+
_a.sent();
|
|
407
|
+
return [2 /*return*/];
|
|
408
|
+
}
|
|
409
|
+
});
|
|
410
|
+
});
|
|
411
|
+
};
|
|
354
412
|
/**
|
|
355
413
|
* Test if the location given is already used
|
|
356
414
|
* Does *not* dereference links
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RedisBinaryDownload.js","sourceRoot":"","sources":["../../src/util/RedisBinaryDownload.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4CAAsB;AACtB,8CAAwB;AACxB,0CAAoB;AACpB,kDAA4B;AAC5B,gDAA0B;AAC1B,4CAAsB;AACtB,oFAA8D;AAE9D,6CAA+C;AAC/C,uDAAoD;AACpD,+CAAqC;AACrC,6BAAiC;AACjC,4BAA0B;AAC1B,gDAA0B;AAE1B,IAAM,GAAG,GAAG,eAAK,CAAC,6BAA6B,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"RedisBinaryDownload.js","sourceRoot":"","sources":["../../src/util/RedisBinaryDownload.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RedisBinaryDownloadUrl.d.ts","sourceRoot":"","sources":["../../src/util/RedisBinaryDownloadUrl.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"RedisBinaryDownloadUrl.d.ts","sourceRoot":"","sources":["../../src/util/RedisBinaryDownloadUrl.ts"],"names":[],"mappings":"AAMA,MAAM,WAAW,0BAA0B;IACzC,OAAO,EAAE,MAAM,CAAC;CACjB;AAED;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,sBAAsB;IACzC,OAAO,EAAE,MAAM,CAAC;gBAEJ,EAAE,OAAO,EAAE,EAAE,0BAA0B;IAInD;;;OAGG;IACG,cAAc,IAAI,OAAO,CAAC,MAAM,CAAC;IAsBvC;;;OAGG;IACG,cAAc,IAAI,OAAO,CAAC,MAAM,CAAC;CAMxC"}
|
|
@@ -41,6 +41,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
41
41
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
42
42
|
var resolve_config_1 = __importDefault(require("./resolve-config"));
|
|
43
43
|
var debug_1 = __importDefault(require("debug"));
|
|
44
|
+
var RedisBinary_1 = require("./RedisBinary");
|
|
44
45
|
var log = debug_1.default('RedisMS:RedisBinaryDownloadUrl');
|
|
45
46
|
/**
|
|
46
47
|
* Download URL generator
|
|
@@ -57,21 +58,27 @@ var RedisBinaryDownloadUrl = /** @class */ (function () {
|
|
|
57
58
|
RedisBinaryDownloadUrl.prototype.getDownloadUrl = function () {
|
|
58
59
|
var _a;
|
|
59
60
|
return __awaiter(this, void 0, void 0, function () {
|
|
60
|
-
var
|
|
61
|
+
var downloadUrl, archive, mirror;
|
|
61
62
|
return __generator(this, function (_b) {
|
|
62
63
|
switch (_b.label) {
|
|
63
|
-
case 0:
|
|
64
|
-
case 1:
|
|
65
|
-
archive = _b.sent();
|
|
66
|
-
log("Using \"" + archive + "\" as the Archive String");
|
|
64
|
+
case 0:
|
|
67
65
|
downloadUrl = resolve_config_1.default('DOWNLOAD_URL');
|
|
68
66
|
if (downloadUrl) {
|
|
69
67
|
log("Using \"" + downloadUrl + "\" as the Download-URL");
|
|
70
68
|
return [2 /*return*/, downloadUrl];
|
|
71
69
|
}
|
|
70
|
+
if (process.platform === 'win32') {
|
|
71
|
+
return [2 /*return*/, 'https://raw.githubusercontent.com/ServiceStack/redis-windows/master/downloads/redis-latest.zip'];
|
|
72
|
+
}
|
|
73
|
+
return [4 /*yield*/, this.getArchiveName()];
|
|
74
|
+
case 1:
|
|
75
|
+
archive = _b.sent();
|
|
76
|
+
log("Using \"" + archive + "\" as the Archive String");
|
|
72
77
|
mirror = (_a = resolve_config_1.default('DOWNLOAD_MIRROR')) !== null && _a !== void 0 ? _a : 'https://download.redis.io';
|
|
73
78
|
log("Using \"" + mirror + "\" as the mirror");
|
|
74
|
-
return [2 /*return*/,
|
|
79
|
+
return [2 /*return*/, this.version === RedisBinary_1.LATEST_VERSION
|
|
80
|
+
? mirror + "/" + archive
|
|
81
|
+
: mirror + "/releases/" + archive];
|
|
75
82
|
}
|
|
76
83
|
});
|
|
77
84
|
});
|
|
@@ -83,6 +90,9 @@ var RedisBinaryDownloadUrl = /** @class */ (function () {
|
|
|
83
90
|
RedisBinaryDownloadUrl.prototype.getArchiveName = function () {
|
|
84
91
|
return __awaiter(this, void 0, void 0, function () {
|
|
85
92
|
return __generator(this, function (_a) {
|
|
93
|
+
if (process.platform === 'win32') {
|
|
94
|
+
return [2 /*return*/, 'redis-latest.zip'];
|
|
95
|
+
}
|
|
86
96
|
return [2 /*return*/, "redis-" + this.version + ".tar.gz"];
|
|
87
97
|
});
|
|
88
98
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RedisBinaryDownloadUrl.js","sourceRoot":"","sources":["../../src/util/RedisBinaryDownloadUrl.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oEAA6C;AAC7C,gDAA0B;
|
|
1
|
+
{"version":3,"file":"RedisBinaryDownloadUrl.js","sourceRoot":"","sources":["../../src/util/RedisBinaryDownloadUrl.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oEAA6C;AAC7C,gDAA0B;AAC1B,6CAA+C;AAE/C,IAAM,GAAG,GAAG,eAAK,CAAC,gCAAgC,CAAC,CAAC;AAMpD;;GAEG;AACH;IAGE,gCAAY,EAAuC;YAArC,OAAO,aAAA;QACnB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;IAED;;;OAGG;IACG,+CAAc,GAApB;;;;;;;wBACQ,WAAW,GAAG,wBAAa,CAAC,cAAc,CAAC,CAAC;wBAClD,IAAI,WAAW,EAAE;4BACf,GAAG,CAAC,aAAU,WAAW,2BAAuB,CAAC,CAAC;4BAClD,sBAAO,WAAW,EAAC;yBACpB;wBAED,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE;4BAChC,sBAAO,gGAAgG,EAAC;yBACzG;wBAEe,qBAAM,IAAI,CAAC,cAAc,EAAE,EAAA;;wBAArC,OAAO,GAAG,SAA2B;wBAC3C,GAAG,CAAC,aAAU,OAAO,6BAAyB,CAAC,CAAC;wBAE1C,MAAM,SAAG,wBAAa,CAAC,iBAAiB,CAAC,mCAAI,2BAA2B,CAAC;wBAC/E,GAAG,CAAC,aAAU,MAAM,qBAAiB,CAAC,CAAC;wBAEvC,sBAAO,IAAI,CAAC,OAAO,KAAK,4BAAc;gCACpC,CAAC,CAAI,MAAM,SAAI,OAAS;gCACxB,CAAC,CAAI,MAAM,kBAAa,OAAS,EAAC;;;;KACrC;IAED;;;OAGG;IACG,+CAAc,GAApB;;;gBACE,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE;oBAChC,sBAAO,kBAAkB,EAAC;iBAC3B;gBACD,sBAAO,WAAS,IAAI,CAAC,OAAO,YAAS,EAAC;;;KACvC;IACH,6BAAC;AAAD,CAAC,AA3CD,IA2CC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RedisInstance.d.ts","sourceRoot":"","sources":["../../src/util/RedisInstance.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAI7C,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAWvF,MAAM,WAAW,cAAc;IAE7B,QAAQ,EAAE;QACR,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,EAAE,CAAC,EAAE,MAAM,CAAC;QACZ,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;KACjB,CAAC;IAGF,MAAM,CAAC,EAAE,eAAe,CAAC;IAGzB,KAAK,CAAC,EAAE,YAAY,CAAC;CACtB;AAED;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,aAAa;IAChC,MAAM,CAAC,gBAAgB,EAAE,YAAY,EAAE,CAAM;IAC7C,IAAI,EAAE,cAAc,CAAC;IACrB,KAAK,EAAE,OAAO,CAAC;IAEf,YAAY,EAAE,YAAY,GAAG,IAAI,CAAC;IAClC,aAAa,EAAE,YAAY,GAAG,IAAI,CAAC;IACnC,eAAe,EAAE,OAAO,CAAS;IACjC,aAAa,EAAE,iBAAiB,CAAY;IAC5C,cAAc,EAAE,iBAAiB,CAAY;gBAEjC,IAAI,EAAE,cAAc;IAuBhC;;;OAGG;WACU,GAAG,CAAC,IAAI,EAAE,cAAc,GAAG,OAAO,CAAC,aAAa,CAAC;IAK9D;;OAEG;IACH,kBAAkB,IAAI,MAAM,EAAE;IAc9B;;OAEG;IACG,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;IAwBpB,IAAI,IAAI,OAAO,CAAC,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"RedisInstance.d.ts","sourceRoot":"","sources":["../../src/util/RedisInstance.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAI7C,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAWvF,MAAM,WAAW,cAAc;IAE7B,QAAQ,EAAE;QACR,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,EAAE,CAAC,EAAE,MAAM,CAAC;QACZ,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;KACjB,CAAC;IAGF,MAAM,CAAC,EAAE,eAAe,CAAC;IAGzB,KAAK,CAAC,EAAE,YAAY,CAAC;CACtB;AAED;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,aAAa;IAChC,MAAM,CAAC,gBAAgB,EAAE,YAAY,EAAE,CAAM;IAC7C,IAAI,EAAE,cAAc,CAAC;IACrB,KAAK,EAAE,OAAO,CAAC;IAEf,YAAY,EAAE,YAAY,GAAG,IAAI,CAAC;IAClC,aAAa,EAAE,YAAY,GAAG,IAAI,CAAC;IACnC,eAAe,EAAE,OAAO,CAAS;IACjC,aAAa,EAAE,iBAAiB,CAAY;IAC5C,cAAc,EAAE,iBAAiB,CAAY;gBAEjC,IAAI,EAAE,cAAc;IAuBhC;;;OAGG;WACU,GAAG,CAAC,IAAI,EAAE,cAAc,GAAG,OAAO,CAAC,aAAa,CAAC;IAK9D;;OAEG;IACH,kBAAkB,IAAI,MAAM,EAAE;IAc9B;;OAEG;IACG,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;IAwBpB,IAAI,IAAI,OAAO,CAAC,aAAa,CAAC;IAyDpC;;OAEG;IACH,MAAM,IAAI,MAAM,GAAG,SAAS;IAI5B;;;OAGG;IACH,kBAAkB,CAAC,QAAQ,EAAE,MAAM,GAAG,YAAY;IAmBlD;;;;OAIG;IACH,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,YAAY;IA8BhE,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAI/B;;;OAGG;IACH,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAQhC;;;OAGG;IACH,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAI7C;;;OAGG;IACH,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;CAqB9C"}
|
|
@@ -157,16 +157,20 @@ var RedisInstance = /** @class */ (function () {
|
|
|
157
157
|
return __awaiter(this, void 0, void 0, function () {
|
|
158
158
|
/**
|
|
159
159
|
* Function to De-Duplicate Code
|
|
160
|
-
* @param
|
|
160
|
+
* @param _process The Process to kill
|
|
161
161
|
* @param name the name used in the logs
|
|
162
162
|
* @param debugfn the debug function
|
|
163
163
|
*/
|
|
164
|
-
function kill_internal(
|
|
164
|
+
function kill_internal(_process, name, debugfn) {
|
|
165
165
|
return __awaiter(this, void 0, void 0, function () {
|
|
166
166
|
var timeoutTime;
|
|
167
167
|
return __generator(this, function (_a) {
|
|
168
168
|
switch (_a.label) {
|
|
169
169
|
case 0:
|
|
170
|
+
if (!db_util_1.isAlive(_process.pid)) {
|
|
171
|
+
debugfn('kill_internal given process PID is not alive anymore');
|
|
172
|
+
return [2 /*return*/];
|
|
173
|
+
}
|
|
170
174
|
timeoutTime = 1000 * 10;
|
|
171
175
|
return [4 /*yield*/, new Promise(function (resolve, reject) {
|
|
172
176
|
var timeout = setTimeout(function () {
|
|
@@ -175,19 +179,19 @@ var RedisInstance = /** @class */ (function () {
|
|
|
175
179
|
console.warn('An Process didnt exit with signal "SIGINT" within 10 seconds, using "SIGKILL"!\n' +
|
|
176
180
|
'Enable debug logs for more information');
|
|
177
181
|
}
|
|
178
|
-
|
|
182
|
+
_process.kill('SIGKILL');
|
|
179
183
|
timeout = setTimeout(function () {
|
|
180
184
|
debugfn('kill_internal timeout triggered again, rejecting');
|
|
181
185
|
reject(new Error('Process didnt exit, enable debug for more information.'));
|
|
182
186
|
}, timeoutTime);
|
|
183
187
|
}, timeoutTime);
|
|
184
|
-
|
|
188
|
+
_process.once("exit", function (code, signal) {
|
|
185
189
|
debugfn("- " + name + ": got exit signal, Code: " + code + ", Signal: " + signal);
|
|
186
190
|
clearTimeout(timeout);
|
|
187
191
|
resolve(null);
|
|
188
192
|
});
|
|
189
193
|
debugfn("- " + name + ": send \"SIGINT\"");
|
|
190
|
-
|
|
194
|
+
_process.kill('SIGINT');
|
|
191
195
|
})];
|
|
192
196
|
case 1:
|
|
193
197
|
_a.sent();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RedisInstance.js","sourceRoot":"","sources":["../../src/util/RedisInstance.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,4DAAoD;AACpD,8CAAwB;AACxB,8DAAwC;AAGxC,gDAA0B;AAC1B,
|
|
1
|
+
{"version":3,"file":"RedisInstance.js","sourceRoot":"","sources":["../../src/util/RedisInstance.ts"],"names":[],"mappings":"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"}
|
package/lib/util/db_util.d.ts
CHANGED
|
@@ -3,4 +3,9 @@
|
|
|
3
3
|
* @param val Any value to test if null or undefined
|
|
4
4
|
*/
|
|
5
5
|
export declare function isNullOrUndefined(val: unknown): val is null | undefined;
|
|
6
|
+
/**
|
|
7
|
+
* Check whether a PID is alive
|
|
8
|
+
* @param pid PID
|
|
9
|
+
*/
|
|
10
|
+
export declare function isAlive(pid?: number): boolean;
|
|
6
11
|
//# sourceMappingURL=db_util.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"db_util.d.ts","sourceRoot":"","sources":["../../src/util/db_util.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,OAAO,GAAG,GAAG,IAAI,IAAI,GAAG,SAAS,CAEvE"}
|
|
1
|
+
{"version":3,"file":"db_util.d.ts","sourceRoot":"","sources":["../../src/util/db_util.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,OAAO,GAAG,GAAG,IAAI,IAAI,GAAG,SAAS,CAEvE;AAED;;;GAGG;AACH,wBAAgB,OAAO,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,OAAO,CAY7C"}
|
package/lib/util/db_util.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.isNullOrUndefined = void 0;
|
|
3
|
+
exports.isAlive = exports.isNullOrUndefined = void 0;
|
|
4
4
|
/**
|
|
5
5
|
* Because since node 4.0.0 the internal util.is* functions got deprecated
|
|
6
6
|
* @param val Any value to test if null or undefined
|
|
@@ -9,4 +9,22 @@ function isNullOrUndefined(val) {
|
|
|
9
9
|
return val === null || val === undefined;
|
|
10
10
|
}
|
|
11
11
|
exports.isNullOrUndefined = isNullOrUndefined;
|
|
12
|
+
/**
|
|
13
|
+
* Check whether a PID is alive
|
|
14
|
+
* @param pid PID
|
|
15
|
+
*/
|
|
16
|
+
function isAlive(pid) {
|
|
17
|
+
if (isNullOrUndefined(pid)) {
|
|
18
|
+
return false;
|
|
19
|
+
}
|
|
20
|
+
try {
|
|
21
|
+
// code 0 doesn't actually kill anything (on all supported systems)
|
|
22
|
+
process.kill(pid, 0);
|
|
23
|
+
return true;
|
|
24
|
+
}
|
|
25
|
+
catch (err) {
|
|
26
|
+
return false;
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
exports.isAlive = isAlive;
|
|
12
30
|
//# sourceMappingURL=db_util.js.map
|
package/lib/util/db_util.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"db_util.js","sourceRoot":"","sources":["../../src/util/db_util.ts"],"names":[],"mappings":";;;AAAA;;;GAGG;AACH,SAAgB,iBAAiB,CAAC,GAAY;IAC5C,OAAO,GAAG,KAAK,IAAI,IAAI,GAAG,KAAK,SAAS,CAAC;AAC3C,CAAC;AAFD,8CAEC"}
|
|
1
|
+
{"version":3,"file":"db_util.js","sourceRoot":"","sources":["../../src/util/db_util.ts"],"names":[],"mappings":";;;AAAA;;;GAGG;AACH,SAAgB,iBAAiB,CAAC,GAAY;IAC5C,OAAO,GAAG,KAAK,IAAI,IAAI,GAAG,KAAK,SAAS,CAAC;AAC3C,CAAC;AAFD,8CAEC;AAED;;;GAGG;AACH,SAAgB,OAAO,CAAC,GAAY;IAClC,IAAI,iBAAiB,CAAC,GAAG,CAAC,EAAE;QAC1B,OAAO,KAAK,CAAC;KACd;IAED,IAAI;QACF,mEAAmE;QACnE,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;QACrB,OAAO,IAAI,CAAC;KACb;IAAC,OAAO,GAAG,EAAE;QACZ,OAAO,KAAK,CAAC;KACd;AACH,CAAC;AAZD,0BAYC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "redis-memory-server",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.6.0",
|
|
4
4
|
"description": "Redis Server for testing. The server will allow you to connect your favorite client library to the Redis Server and run parallel integration tests isolated from each other.",
|
|
5
5
|
"main": "lib/index",
|
|
6
6
|
"types": "lib/index.d.ts",
|
|
@@ -38,7 +38,7 @@
|
|
|
38
38
|
"@types/lockfile": "^1.0.1",
|
|
39
39
|
"@types/lodash.defaultsdeep": "^4.6.6",
|
|
40
40
|
"@types/mkdirp": "^1.0.1",
|
|
41
|
-
"@types/node": "14.11.2",
|
|
41
|
+
"@types/node": "^14.11.2",
|
|
42
42
|
"@types/rimraf": "^3.0.0",
|
|
43
43
|
"@types/semver": "7.3.4",
|
|
44
44
|
"@types/tar": "^4.0.4",
|
|
@@ -56,7 +56,7 @@
|
|
|
56
56
|
"jest": "^26.6.3",
|
|
57
57
|
"lint-staged": "10.4.0",
|
|
58
58
|
"prettier": "2.1.2",
|
|
59
|
-
"standard-version": "^9.
|
|
59
|
+
"standard-version": "^9.3.2",
|
|
60
60
|
"ts-jest": "26.4.1",
|
|
61
61
|
"typescript": "^4.1.4"
|
|
62
62
|
},
|
|
@@ -75,6 +75,7 @@
|
|
|
75
75
|
"camelcase": "^6.0.0",
|
|
76
76
|
"cross-spawn": "^7.0.3",
|
|
77
77
|
"debug": "^4.2.0",
|
|
78
|
+
"extract-zip": "^2.0.1",
|
|
78
79
|
"find-cache-dir": "^3.3.1",
|
|
79
80
|
"find-package-json": "^1.2.0",
|
|
80
81
|
"get-port": "^5.1.1",
|
|
@@ -93,7 +94,7 @@
|
|
|
93
94
|
"clean": "rimraf tmp lib coverage node_modules/.cache",
|
|
94
95
|
"build": "rimraf ./lib && tsc -p ./tsconfig.build.json",
|
|
95
96
|
"watch": "cross-env REDISMS_DOWNLOAD_DIR=./tmp jest --watchAll",
|
|
96
|
-
"coverage": "cross-env REDISMS_DOWNLOAD_DIR=./tmp jest --coverage",
|
|
97
|
+
"coverage": "cross-env REDISMS_DOWNLOAD_DIR=./tmp jest --coverage --runInBand",
|
|
97
98
|
"lint": "yarn eslint && yarn tscheck",
|
|
98
99
|
"release": "standard-version",
|
|
99
100
|
"prepublishOnly": "yarn build",
|
package/CHANGELOG.md
DELETED
|
@@ -1,41 +0,0 @@
|
|
|
1
|
-
# Changelog
|
|
2
|
-
|
|
3
|
-
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
|
|
4
|
-
|
|
5
|
-
### [0.3.1](https://github.com/mhassan1/redis-memory-server/compare/v0.3.0...v0.3.1) (2021-02-11)
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
### Bug Fixes
|
|
9
|
-
|
|
10
|
-
* add missing `systemBinary` to `RedisBinaryOpts` ([44de1ff](https://github.com/mhassan1/redis-memory-server/commit/44de1ff65420300c682c6b0f20c94d8d35c8d811))
|
|
11
|
-
|
|
12
|
-
## [0.3.0](https://github.com/mhassan1/redis-memory-server/compare/v0.2.0...v0.3.0) (2021-02-11)
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
### ⚠ BREAKING CHANGES
|
|
16
|
-
|
|
17
|
-
* move package.json configurations out of config block
|
|
18
|
-
|
|
19
|
-
### Features
|
|
20
|
-
|
|
21
|
-
* move package.json configurations out of config block ([412c3d7](https://github.com/mhassan1/redis-memory-server/commit/412c3d7c08afa26e22395926ac866566f7926073))
|
|
22
|
-
|
|
23
|
-
## [0.2.0](https://github.com/mhassan1/redis-memory-server/compare/v0.1.0...v0.2.0) (2021-02-11)
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
### Features
|
|
27
|
-
|
|
28
|
-
* combine configs from all package.json files in hierarchy ([2243950](https://github.com/mhassan1/redis-memory-server/commit/2243950aaa897f5cbb31fcd70f3741135bc7d772))
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
### Bug Fixes
|
|
32
|
-
|
|
33
|
-
* exit postinstall script with error on failed install ([95f7ebd](https://github.com/mhassan1/redis-memory-server/commit/95f7ebdab66fd4000cce79f88b5755abb23d3acf))
|
|
34
|
-
* readme typos ([0488c41](https://github.com/mhassan1/redis-memory-server/commit/0488c41c81ba79dd0049adc195304767fe07226d))
|
|
35
|
-
|
|
36
|
-
## 0.1.0 (2021-02-11)
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
### Features
|
|
40
|
-
|
|
41
|
-
* first release ([e65b920](https://github.com/mhassan1/redis-memory-server/commit/e65b92045020abdb3c9cdf6368c3f0e0972e2102))
|