redis-memory-server 0.12.0 → 0.12.1
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.
|
@@ -32,6 +32,12 @@ export default class RedisMemoryServer {
|
|
|
32
32
|
runningInstance: Promise<RedisInstanceDataT> | null;
|
|
33
33
|
instanceInfoSync: RedisInstanceDataT | null;
|
|
34
34
|
opts: RedisMemoryServerOptsT;
|
|
35
|
+
/**
|
|
36
|
+
* @private
|
|
37
|
+
*/
|
|
38
|
+
_previousInstanceConfig?: {
|
|
39
|
+
port: number;
|
|
40
|
+
};
|
|
35
41
|
/**
|
|
36
42
|
* Create an Redis-Memory-Sever Instance
|
|
37
43
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RedisMemoryServer.d.ts","sourceRoot":"","sources":["../src/RedisMemoryServer.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,KAAK,GAAG,MAAM,KAAK,CAAC;AAG3B,OAAO,aAAa,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,wBAAwB,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAOjE;;GAEG;AACH,MAAM,WAAW,sBAAsB;IACrC,QAAQ,CAAC,EAAE,wBAAwB,CAAC;IACpC,MAAM,CAAC,EAAE,eAAe,CAAC;IACzB,KAAK,CAAC,EAAE,YAAY,CAAC;IACrB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,CAAC,EAAE,GAAG,CAAC,SAAS,CAAC;CACxB;AAED;;GAEG;AACH,MAAM,WAAW,kBAAmB,SAAQ,mBAAmB;IAC7D,QAAQ,EAAE,aAAa,CAAC;IACxB,YAAY,CAAC,EAAE,YAAY,CAAC;CAC7B;AAED,MAAM,CAAC,OAAO,OAAO,iBAAiB;IACpC,eAAe,EAAE,OAAO,CAAC,kBAAkB,CAAC,GAAG,IAAI,CAAQ;IAC3D,gBAAgB,EAAE,kBAAkB,GAAG,IAAI,CAAQ;IACnD,IAAI,EAAE,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"RedisMemoryServer.d.ts","sourceRoot":"","sources":["../src/RedisMemoryServer.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,KAAK,GAAG,MAAM,KAAK,CAAC;AAG3B,OAAO,aAAa,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,wBAAwB,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAOjE;;GAEG;AACH,MAAM,WAAW,sBAAsB;IACrC,QAAQ,CAAC,EAAE,wBAAwB,CAAC;IACpC,MAAM,CAAC,EAAE,eAAe,CAAC;IACzB,KAAK,CAAC,EAAE,YAAY,CAAC;IACrB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,CAAC,EAAE,GAAG,CAAC,SAAS,CAAC;CACxB;AAED;;GAEG;AACH,MAAM,WAAW,kBAAmB,SAAQ,mBAAmB;IAC7D,QAAQ,EAAE,aAAa,CAAC;IACxB,YAAY,CAAC,EAAE,YAAY,CAAC;CAC7B;AAED,MAAM,CAAC,OAAO,OAAO,iBAAiB;IACpC,eAAe,EAAE,OAAO,CAAC,kBAAkB,CAAC,GAAG,IAAI,CAAQ;IAC3D,gBAAgB,EAAE,kBAAkB,GAAG,IAAI,CAAQ;IACnD,IAAI,EAAE,sBAAsB,CAAC;IAC7B;;OAEG;IACH,uBAAuB,CAAC,EAAE;QACxB,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;IAEF;;;;;OAKG;gBACS,IAAI,CAAC,EAAE,sBAAsB;IASzC;;;OAGG;WACU,MAAM,CAAC,IAAI,CAAC,EAAE,sBAAsB,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAa9E;;;OAGG;IACG,KAAK,IAAI,OAAO,CAAC,OAAO,CAAC;IAgC/B;;;OAGG;IACG,gBAAgB,IAAI,OAAO,CAAC,kBAAkB,CAAC;IAmCrD;;OAEG;IACG,IAAI,IAAI,OAAO,CAAC,OAAO,CAAC;IA0B9B;;OAEG;IACH,eAAe,IAAI,kBAAkB,GAAG,KAAK;IAI7C;;;OAGG;IACG,cAAc,IAAI,OAAO,CAAC,kBAAkB,CAAC;IAiBnD;;OAEG;IACG,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC;IAIhC;;OAEG;IACG,KAAK,IAAI,OAAO,CAAC,MAAM,CAAC;IAK9B;;;OAGG;IACG,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC;CAIjC"}
|
package/lib/RedisMemoryServer.js
CHANGED
|
@@ -36,7 +36,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
36
36
|
};
|
|
37
37
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
38
38
|
const tmp = __importStar(require("tmp"));
|
|
39
|
-
const
|
|
39
|
+
const get_port_1 = __importDefault(require("get-port"));
|
|
40
40
|
const db_util_1 = require("./util/db_util");
|
|
41
41
|
const RedisInstance_1 = __importDefault(require("./util/RedisInstance"));
|
|
42
42
|
const debug_1 = __importDefault(require("debug"));
|
|
@@ -111,13 +111,13 @@ class RedisMemoryServer {
|
|
|
111
111
|
* @private
|
|
112
112
|
*/
|
|
113
113
|
_startUpInstance() {
|
|
114
|
-
var _a, _b, _c, _d;
|
|
114
|
+
var _a, _b, _c, _d, _e, _f;
|
|
115
115
|
return __awaiter(this, void 0, void 0, function* () {
|
|
116
116
|
/** Shortcut to this.opts.instance */
|
|
117
117
|
const instOpts = (_a = this.opts.instance) !== null && _a !== void 0 ? _a : {};
|
|
118
118
|
const data = {
|
|
119
|
-
port: yield (0,
|
|
120
|
-
ip: (
|
|
119
|
+
port: (_c = (_b = this._previousInstanceConfig) === null || _b === void 0 ? void 0 : _b.port) !== null && _c !== void 0 ? _c : (yield (0, get_port_1.default)({ port: (_d = instOpts.port) !== null && _d !== void 0 ? _d : undefined })),
|
|
120
|
+
ip: (_e = instOpts.ip) !== null && _e !== void 0 ? _e : '127.0.0.1',
|
|
121
121
|
tmpDir: undefined,
|
|
122
122
|
};
|
|
123
123
|
if (instOpts.port != data.port) {
|
|
@@ -135,7 +135,7 @@ class RedisMemoryServer {
|
|
|
135
135
|
binary: this.opts.binary,
|
|
136
136
|
spawn: this.opts.spawn,
|
|
137
137
|
});
|
|
138
|
-
return Object.assign(Object.assign({}, data), { instance: instance, childProcess: (
|
|
138
|
+
return Object.assign(Object.assign({}, data), { instance: instance, childProcess: (_f = instance.childProcess) !== null && _f !== void 0 ? _f : undefined });
|
|
139
139
|
});
|
|
140
140
|
}
|
|
141
141
|
/**
|
|
@@ -154,6 +154,7 @@ class RedisMemoryServer {
|
|
|
154
154
|
yield instance.kill();
|
|
155
155
|
this.runningInstance = null;
|
|
156
156
|
this.instanceInfoSync = null;
|
|
157
|
+
this._previousInstanceConfig = { port };
|
|
157
158
|
if (tmpDir) {
|
|
158
159
|
log(`Removing tmpDir ${tmpDir.name}`);
|
|
159
160
|
tmpDir.removeCallback();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RedisMemoryServer.js","sourceRoot":"","sources":["../src/RedisMemoryServer.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,yCAA2B;AAC3B,
|
|
1
|
+
{"version":3,"file":"RedisMemoryServer.js","sourceRoot":"","sources":["../src/RedisMemoryServer.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "redis-memory-server",
|
|
3
|
-
"version": "0.12.
|
|
3
|
+
"version": "0.12.1",
|
|
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
|
"bin": "bin/index.js",
|
|
6
6
|
"main": "lib/index.js",
|
|
@@ -72,10 +72,10 @@
|
|
|
72
72
|
"extract-zip": "^2.0.1",
|
|
73
73
|
"find-cache-dir": "^3.3.2",
|
|
74
74
|
"find-package-json": "^1.2.0",
|
|
75
|
+
"get-port": "^5.1.1",
|
|
75
76
|
"https-proxy-agent": "^7.0.0",
|
|
76
77
|
"lockfile": "^1.0.4",
|
|
77
78
|
"lodash.defaultsdeep": "^4.6.1",
|
|
78
|
-
"portfinder": "^1.0.32",
|
|
79
79
|
"rimraf": "^5.0.1",
|
|
80
80
|
"semver": "^7.5.3",
|
|
81
81
|
"tar": "^6.1.15",
|