mongodb-runner 5.4.0 → 5.4.2
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/dist/cli.js +2 -3
- package/dist/cli.js.map +1 -1
- package/dist/mongocluster.js +3 -4
- package/dist/mongocluster.js.map +1 -1
- package/dist/mongologreader.d.ts +5 -0
- package/dist/mongologreader.d.ts.map +1 -1
- package/dist/mongologreader.js +45 -7
- package/dist/mongologreader.js.map +1 -1
- package/dist/mongoserver.d.ts +1 -1
- package/dist/mongoserver.d.ts.map +1 -1
- package/dist/mongoserver.js +27 -21
- package/dist/mongoserver.js.map +1 -1
- package/package.json +6 -6
package/dist/cli.js
CHANGED
|
@@ -13,7 +13,6 @@ const child_process_1 = require("child_process");
|
|
|
13
13
|
const debug_1 = __importDefault(require("debug"));
|
|
14
14
|
const events_1 = require("events");
|
|
15
15
|
(async function () {
|
|
16
|
-
var _a;
|
|
17
16
|
const defaultRunnerDir = path_1.default.join(os_1.default.homedir(), '.mongodb', 'runner2');
|
|
18
17
|
const argv = await yargs_1.default
|
|
19
18
|
.version(false)
|
|
@@ -111,7 +110,7 @@ const events_1 = require("events");
|
|
|
111
110
|
const stored = JSON.parse(await fs_1.promises.readFile(filepath, 'utf8'));
|
|
112
111
|
yield { ...stored, filepath };
|
|
113
112
|
}
|
|
114
|
-
catch
|
|
113
|
+
catch {
|
|
115
114
|
}
|
|
116
115
|
}
|
|
117
116
|
}
|
|
@@ -172,7 +171,7 @@ const events_1 = require("events");
|
|
|
172
171
|
async function unknown() {
|
|
173
172
|
throw new Error(`Unknown command: ${command}. See '${argv.$0} --help' for more information.`);
|
|
174
173
|
}
|
|
175
|
-
await (
|
|
174
|
+
await ({ start, stop, exec, ls }[command] ?? unknown)();
|
|
176
175
|
})().catch((err) => {
|
|
177
176
|
process.nextTick(() => {
|
|
178
177
|
throw err;
|
package/dist/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";;;;;AACA,kDAA0B;AAC1B,iDAA8C;AAC9C,4CAAoB;AACpB,gDAAwB;AACxB,2BAAoC;AACpC,qCAA+B;AAC/B,iDAAsC;AACtC,kDAAgC;AAChC,mCAA8B;AAS9B,CAAC,KAAK
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}
|
package/dist/mongocluster.js
CHANGED
|
@@ -47,7 +47,6 @@ class MongoCluster {
|
|
|
47
47
|
return this.servers[0].serverVariant;
|
|
48
48
|
}
|
|
49
49
|
static async start({ ...options }) {
|
|
50
|
-
var _a, _b, _c;
|
|
51
50
|
const cluster = new MongoCluster();
|
|
52
51
|
cluster.topology = options.topology;
|
|
53
52
|
if (!options.binDir) {
|
|
@@ -61,7 +60,7 @@ class MongoCluster {
|
|
|
61
60
|
}
|
|
62
61
|
else if (options.topology === 'replset') {
|
|
63
62
|
const { secondaries = 2, arbiters = 0 } = options;
|
|
64
|
-
const args = [...(
|
|
63
|
+
const args = [...(options.args ?? [])];
|
|
65
64
|
let replSetName;
|
|
66
65
|
if (!args.includes('--replSet')) {
|
|
67
66
|
replSetName = `replSet-${(0, util_1.uuid)()}`;
|
|
@@ -124,7 +123,7 @@ class MongoCluster {
|
|
|
124
123
|
}
|
|
125
124
|
else if (options.topology === 'sharded') {
|
|
126
125
|
const { shards = 3 } = options;
|
|
127
|
-
const shardArgs = [...(
|
|
126
|
+
const shardArgs = [...(options.args ?? [])];
|
|
128
127
|
if (shardArgs.includes('--port')) {
|
|
129
128
|
shardArgs.splice(shardArgs.indexOf('--port') + 1, 1, '0');
|
|
130
129
|
}
|
|
@@ -140,7 +139,7 @@ class MongoCluster {
|
|
|
140
139
|
...options,
|
|
141
140
|
binary: 'mongos',
|
|
142
141
|
args: [
|
|
143
|
-
...(
|
|
142
|
+
...(options.args ?? []),
|
|
144
143
|
'--configdb',
|
|
145
144
|
`${configsvr.replSetName}/${configsvr.hostport}`,
|
|
146
145
|
],
|
package/dist/mongocluster.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mongocluster.js","sourceRoot":"","sources":["../src/mongocluster.ts"],"names":[],"mappings":";;;AACA,+CAA4C;AAC5C,iFAAiE;AAEjE,uEAAiE;AACjE,qCAAsC;AACtC,iCAAmD;AAenD,MAAa,YAAY;IAMvB;QALQ,aAAQ,GAAoC,YAAY,CAAC;QAEzD,YAAO,GAAkB,EAAE,CAAC;QAC5B,WAAM,GAAmB,EAAE,CAAC;IAIpC,CAAC;IAED,SAAS;QACP,OAAO;YACL,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC;YACnD,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC;SACtD,CAAC;IACJ,CAAC;IAED,QAAQ;QACN,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,CAAC;IAC/D,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,UAAe;QACtC,MAAM,OAAO,GAAG,IAAI,YAAY,EAAE,CAAC;QACnC,OAAO,CAAC,QAAQ,GAAG,UAAU,CAAC,QAAQ,CAAC;QACvC,OAAO,CAAC,WAAW,GAAG,UAAU,CAAC,WAAW,CAAC;QAC7C,OAAO,CAAC,OAAO,GAAG,MAAM,OAAO,CAAC,GAAG,CACjC,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,GAAQ,EAAE,EAAE,CAAC,yBAAW,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CACnE,CAAC;QACF,OAAO,CAAC,MAAM,GAAG,MAAM,OAAO,CAAC,GAAG,CAChC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAU,EAAE,EAAE,CAAC,YAAY,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CACvE,CAAC;QACF,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC3D,CAAC;IAED,IAAI,gBAAgB;QAClB,OAAO,aAAa,IAAI,CAAC,QAAQ,IAC/B,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,eAAe,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EACzD,EAAE,CAAC;IACL,CAAC;IAED,IAAI,mBAAmB;QACrB,OAAO,IAAI,gDAAgB,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;IACrD,CAAC;IAED,IAAI,aAAa;QACf,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC;IACvC,CAAC;IAED,IAAI,aAAa;QACf,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC;IACvC,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,EACjB,GAAG,OAAO,EACU
|
|
1
|
+
{"version":3,"file":"mongocluster.js","sourceRoot":"","sources":["../src/mongocluster.ts"],"names":[],"mappings":"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"}
|
package/dist/mongologreader.d.ts
CHANGED
|
@@ -15,4 +15,9 @@ export declare function isFailureToSetupListener(entry: LogEntry): boolean;
|
|
|
15
15
|
export declare function filterLogStreamForPort(input: Readable): Promise<{
|
|
16
16
|
port: number;
|
|
17
17
|
}>;
|
|
18
|
+
export type BuildInfo = {
|
|
19
|
+
version: string | null;
|
|
20
|
+
modules: string[] | null;
|
|
21
|
+
};
|
|
22
|
+
export declare function filterLogStreamForBuildInfo(input: Readable): Promise<BuildInfo>;
|
|
18
23
|
//# sourceMappingURL=mongologreader.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mongologreader.d.ts","sourceRoot":"","sources":["../src/mongologreader.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAIvC,wBAAuB,sBAAsB,CAC3C,MAAM,EAAE,QAAQ,GACf,aAAa,CAAC,QAAQ,CAAC,CAYzB;AAGD,MAAM,MAAM,QAAQ,GAAG;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,EAAE,EAAE,MAAM,GAAG,SAAS,CAAC;IACvB,IAAI,EAAE,GAAG,CAAC;CACX,CAAC;AAyBF,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,QAAQ,CAevD;AAED,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,QAAQ,GAAG,OAAO,CAKjE;AA0CD,wBAAsB,sBAAsB,CAC1C,KAAK,EAAE,QAAQ,GACd,OAAO,CAAC;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,CAqB3B"}
|
|
1
|
+
{"version":3,"file":"mongologreader.d.ts","sourceRoot":"","sources":["../src/mongologreader.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAIvC,wBAAuB,sBAAsB,CAC3C,MAAM,EAAE,QAAQ,GACf,aAAa,CAAC,QAAQ,CAAC,CAYzB;AAGD,MAAM,MAAM,QAAQ,GAAG;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,EAAE,EAAE,MAAM,GAAG,SAAS,CAAC;IACvB,IAAI,EAAE,GAAG,CAAC;CACX,CAAC;AAyBF,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,QAAQ,CAevD;AAED,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,QAAQ,GAAG,OAAO,CAKjE;AA0CD,wBAAsB,sBAAsB,CAC1C,KAAK,EAAE,QAAQ,GACd,OAAO,CAAC;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,CAqB3B;AAED,MAAM,MAAM,SAAS,GAAG;IAAE,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,CAAA;CAAE,CAAC;AA0C7E,wBAAsB,2BAA2B,CAC/C,KAAK,EAAE,QAAQ,GACd,OAAO,CAAC,SAAS,CAAC,CAqBpB"}
|
package/dist/mongologreader.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.filterLogStreamForPort = exports.isFailureToSetupListener = exports.parseAnyLogEntry = exports.createLogEntryIterator = void 0;
|
|
3
|
+
exports.filterLogStreamForBuildInfo = exports.filterLogStreamForPort = exports.isFailureToSetupListener = exports.parseAnyLogEntry = exports.createLogEntryIterator = void 0;
|
|
4
4
|
const stream_1 = require("stream");
|
|
5
5
|
const readline_1 = require("readline");
|
|
6
6
|
async function* createLogEntryIterator(stdout) {
|
|
@@ -27,12 +27,11 @@ function parseOldLogEntry(line) {
|
|
|
27
27
|
return match.groups;
|
|
28
28
|
}
|
|
29
29
|
function parseAnyLogEntry(line) {
|
|
30
|
-
var _a;
|
|
31
30
|
try {
|
|
32
31
|
const newFormat = JSON.parse(line);
|
|
33
32
|
return {
|
|
34
33
|
id: newFormat.id,
|
|
35
|
-
timestamp:
|
|
34
|
+
timestamp: newFormat.t?.$date,
|
|
36
35
|
severity: newFormat.s,
|
|
37
36
|
component: newFormat.c,
|
|
38
37
|
context: newFormat.ctx,
|
|
@@ -40,7 +39,7 @@ function parseAnyLogEntry(line) {
|
|
|
40
39
|
attr: newFormat.attr,
|
|
41
40
|
};
|
|
42
41
|
}
|
|
43
|
-
catch
|
|
42
|
+
catch {
|
|
44
43
|
return parseOldLogEntry(line);
|
|
45
44
|
}
|
|
46
45
|
}
|
|
@@ -51,14 +50,13 @@ function isFailureToSetupListener(entry) {
|
|
|
51
50
|
}
|
|
52
51
|
exports.isFailureToSetupListener = isFailureToSetupListener;
|
|
53
52
|
function getPortFromLogEntry(logEntry) {
|
|
54
|
-
var _a, _b;
|
|
55
53
|
let match;
|
|
56
54
|
if (logEntry.id === 23016) {
|
|
57
55
|
return logEntry.attr.port;
|
|
58
56
|
}
|
|
59
57
|
if (logEntry.id === undefined &&
|
|
60
|
-
(match = /^waiting for connections on port (?<port>\d+)
|
|
61
|
-
return +(
|
|
58
|
+
(match = /^waiting for connections on port (?<port>\d+)( ssl)?$/i.exec(logEntry.message))) {
|
|
59
|
+
return +(match.groups?.port ?? '0');
|
|
62
60
|
}
|
|
63
61
|
if (isFailureToSetupListener(logEntry)) {
|
|
64
62
|
throw new Error(`Failed to setup listener (${logEntry.message} ${JSON.stringify(logEntry.attr)})`);
|
|
@@ -86,4 +84,44 @@ async function filterLogStreamForPort(input) {
|
|
|
86
84
|
return { port };
|
|
87
85
|
}
|
|
88
86
|
exports.filterLogStreamForPort = filterLogStreamForPort;
|
|
87
|
+
function getBuildInfoFromLogEntry(logEntry) {
|
|
88
|
+
let match;
|
|
89
|
+
if (logEntry.id === 23403) {
|
|
90
|
+
return logEntry.attr.buildInfo;
|
|
91
|
+
}
|
|
92
|
+
if (logEntry.id === undefined &&
|
|
93
|
+
(match = /^db version v(?<version>.+)$/i.exec(logEntry.message))) {
|
|
94
|
+
return { version: match.groups?.version };
|
|
95
|
+
}
|
|
96
|
+
if (logEntry.id === undefined &&
|
|
97
|
+
(match = /^modules: (?<moduleList>.+)$/i.exec(logEntry.message))) {
|
|
98
|
+
return {
|
|
99
|
+
modules: match.groups?.moduleList
|
|
100
|
+
?.split(' ')
|
|
101
|
+
?.filter((module) => module !== 'none'),
|
|
102
|
+
};
|
|
103
|
+
}
|
|
104
|
+
return {};
|
|
105
|
+
}
|
|
106
|
+
async function filterLogStreamForBuildInfo(input) {
|
|
107
|
+
let buildInfo = { version: null, modules: null };
|
|
108
|
+
const inputDuplicate = input.pipe(new stream_1.PassThrough({ objectMode: true }));
|
|
109
|
+
try {
|
|
110
|
+
for await (const logEntry of inputDuplicate) {
|
|
111
|
+
if (logEntry.component !== 'CONTROL' ||
|
|
112
|
+
!['initandlisten', 'listener'].includes(logEntry.context)) {
|
|
113
|
+
continue;
|
|
114
|
+
}
|
|
115
|
+
buildInfo = { ...buildInfo, ...getBuildInfoFromLogEntry(logEntry) };
|
|
116
|
+
if (buildInfo.version) {
|
|
117
|
+
break;
|
|
118
|
+
}
|
|
119
|
+
}
|
|
120
|
+
}
|
|
121
|
+
finally {
|
|
122
|
+
input.unpipe(inputDuplicate);
|
|
123
|
+
}
|
|
124
|
+
return buildInfo;
|
|
125
|
+
}
|
|
126
|
+
exports.filterLogStreamForBuildInfo = filterLogStreamForBuildInfo;
|
|
89
127
|
//# sourceMappingURL=mongologreader.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mongologreader.js","sourceRoot":"","sources":["../src/mongologreader.ts"],"names":[],"mappings":";;;AACA,mCAAqC;AACrC,uCAAsE;AAE/D,KAAK,SAAS,CAAC,CAAC,sBAAsB,CAC3C,MAAgB;IAEhB,IAAI,KAAK,EAAE,MAAM,IAAI,IAAI,IAAA,0BAAuB,EAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,EAAE;QACnE,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE;YAChB,SAAS;SACV;QACD,IAAI;YACF,MAAM,QAAQ,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC;YACxC,MAAM,QAAQ,CAAC;SAChB;QAAC,OAAO,KAAU,EAAE;YACnB,MAAM;SACP;KACF;AACH,CAAC;AAdD,wDAcC;AAoBD,SAAS,gBAAgB,CAAC,IAAY;IACpC,MAAM,EAAE,GACN,mGAAmG,CAAC;IACtG,MAAM,KAAK,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;IACnC,IAAI,CAAC,KAAK,EAAE;QACV,MAAM,IAAI,KAAK,CAAC,wBAAwB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;KACjE;IACD,OAAO,KAAK,CAAC,MAA6B,CAAC;AAC7C,CAAC;AAQD,SAAgB,gBAAgB,CAAC,IAAY
|
|
1
|
+
{"version":3,"file":"mongologreader.js","sourceRoot":"","sources":["../src/mongologreader.ts"],"names":[],"mappings":"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"}
|
package/dist/mongoserver.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mongoserver.d.ts","sourceRoot":"","sources":["../src/mongoserver.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"mongoserver.d.ts","sourceRoot":"","sources":["../src/mongoserver.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAKtC,MAAM,WAAW,kBAAkB;IACjC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;CAC5B;AAED,qBAAa,WAAW;IACtB,OAAO,CAAC,SAAS,CAAC,CAAW;IAC7B,OAAO,CAAC,YAAY,CAAC,CAAe;IACpC,OAAO,CAAC,GAAG,CAAC,CAAS;IACrB,OAAO,CAAC,IAAI,CAAC,CAAS;IACtB,OAAO,CAAC,MAAM,CAAC,CAAS;IACxB,OAAO,CAAC,OAAO,CAAS;IAExB,OAAO;IAIP,SAAS,IAAI,OAAO;WAQP,WAAW,CAAC,UAAU,EAAE,GAAG,GAAG,OAAO,CAAC,WAAW,CAAC;IAU/D,IAAI,QAAQ,IAAI,MAAM,CAKrB;IAGD,IAAI,aAAa,IAAI,MAAM,CAK1B;IACD,IAAI,aAAa,IAAI,YAAY,GAAG,WAAW,CAO9C;WAEY,KAAK,CAAC,EAAE,GAAG,OAAO,EAAE,EAAE,kBAAkB,GAAG,OAAO,CAAC,WAAW,CAAC;WAiC/D,MAAM,CAAC,EAClB,GAAG,OAAO,EACX,EAAE,kBAAkB,GAAG,OAAO,CAAC,WAAW,CAAC;IAmItC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;YA2Bd,kBAAkB;IAY1B,UAAU,CAAC,EAAE,SAAS,CAAC,MAAM,EAAE,WAAW,KAAK,GAAG,EACtD,EAAE,EAAE,EAAE,GACL,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;IAW1B,GAAG,IAAI,IAAI;IAMX,KAAK,IAAI,IAAI;CAKd"}
|
package/dist/mongoserver.js
CHANGED
|
@@ -44,17 +44,15 @@ class MongoServer {
|
|
|
44
44
|
return this.buildInfo.version;
|
|
45
45
|
}
|
|
46
46
|
get serverVariant() {
|
|
47
|
-
var _a, _b;
|
|
48
47
|
if (!this.buildInfo) {
|
|
49
48
|
throw new Error('Cannot get version for closed server');
|
|
50
49
|
}
|
|
51
|
-
return
|
|
50
|
+
return this.buildInfo.modules?.includes?.('enterprise')
|
|
52
51
|
? 'enterprise'
|
|
53
52
|
: 'community';
|
|
54
53
|
}
|
|
55
54
|
static async start({ ...options }) {
|
|
56
|
-
|
|
57
|
-
if (options.binary === 'mongos' && !((_a = options.args) === null || _a === void 0 ? void 0 : _a.includes('--port'))) {
|
|
55
|
+
if (options.binary === 'mongos' && !options.args?.includes('--port')) {
|
|
58
56
|
const minPort = 1025;
|
|
59
57
|
const maxPort = 49151;
|
|
60
58
|
let port = Math.floor(Math.random() * (maxPort - minPort) + minPort);
|
|
@@ -63,7 +61,7 @@ class MongoServer {
|
|
|
63
61
|
(0, util_1.debug)('Trying to spawn mongos on port', port);
|
|
64
62
|
return await this._start({
|
|
65
63
|
...options,
|
|
66
|
-
args: [...(
|
|
64
|
+
args: [...(options.args ?? []), '--port', String(port)],
|
|
67
65
|
});
|
|
68
66
|
}
|
|
69
67
|
catch (err) {
|
|
@@ -81,7 +79,6 @@ class MongoServer {
|
|
|
81
79
|
return await this._start(options);
|
|
82
80
|
}
|
|
83
81
|
static async _start({ ...options }) {
|
|
84
|
-
var _a, _b, _c, _d;
|
|
85
82
|
const srv = new MongoServer();
|
|
86
83
|
if (!options.docker) {
|
|
87
84
|
const dbPath = path_1.default.join(options.tmpDir, `db-${(0, util_1.uuid)()}`);
|
|
@@ -94,7 +91,10 @@ class MongoServer {
|
|
|
94
91
|
if (options.binDir) {
|
|
95
92
|
commandline.push(`--volume=${options.binDir}:/runner-bin:ro`);
|
|
96
93
|
}
|
|
97
|
-
|
|
94
|
+
if (Array.isArray(options.docker))
|
|
95
|
+
commandline.push(...options.docker);
|
|
96
|
+
else
|
|
97
|
+
commandline.push(options.docker);
|
|
98
98
|
if (options.binDir) {
|
|
99
99
|
commandline.push(`/runner-bin/${options.binary}`);
|
|
100
100
|
}
|
|
@@ -108,12 +108,12 @@ class MongoServer {
|
|
|
108
108
|
else {
|
|
109
109
|
commandline.push(options.binary);
|
|
110
110
|
}
|
|
111
|
-
commandline.push(...(
|
|
112
|
-
if (!
|
|
111
|
+
commandline.push(...(options.args ?? []));
|
|
112
|
+
if (!options.args?.includes('--port'))
|
|
113
113
|
commandline.push('--port', '0');
|
|
114
|
-
if (!
|
|
114
|
+
if (!options.args?.includes('--dbpath') && options.binary === 'mongod')
|
|
115
115
|
commandline.push('--dbpath', options.docker ? '/tmp' : srv.dbPath);
|
|
116
|
-
if (!
|
|
116
|
+
if (!options.args?.includes('--unixSocketPrefix') &&
|
|
117
117
|
process.platform !== 'win32')
|
|
118
118
|
commandline.push('--nounixsocket');
|
|
119
119
|
(0, util_1.debug)('starting server', commandline);
|
|
@@ -155,6 +155,11 @@ class MongoServer {
|
|
|
155
155
|
(0, util_1.debug)('mongodb server output', entry);
|
|
156
156
|
}
|
|
157
157
|
});
|
|
158
|
+
(0, mongologreader_1.filterLogStreamForBuildInfo)(logEntryStream).then((buildInfo) => {
|
|
159
|
+
(srv.buildInfo = buildInfo),
|
|
160
|
+
(0, util_1.debug)('got server build info from log', srv.serverVersion, srv.serverVariant);
|
|
161
|
+
}, () => {
|
|
162
|
+
});
|
|
158
163
|
const { port } = await (0, mongologreader_1.filterLogStreamForPort)(logEntryStream);
|
|
159
164
|
(0, util_1.debug)('server listening on port', port);
|
|
160
165
|
if (port === -1) {
|
|
@@ -183,7 +188,8 @@ class MongoServer {
|
|
|
183
188
|
this.closing = true;
|
|
184
189
|
if (this.childProcess) {
|
|
185
190
|
(0, util_1.debug)('closing running process', this.childProcess.pid);
|
|
186
|
-
if (this.childProcess.exitCode === null
|
|
191
|
+
if (this.childProcess.exitCode === null &&
|
|
192
|
+
this.childProcess.signalCode === null) {
|
|
187
193
|
this.childProcess.kill('SIGKILL');
|
|
188
194
|
await (0, events_1.once)(this.childProcess, 'exit');
|
|
189
195
|
}
|
|
@@ -206,8 +212,10 @@ class MongoServer {
|
|
|
206
212
|
this.dbPath = undefined;
|
|
207
213
|
}
|
|
208
214
|
async _populateBuildInfo() {
|
|
215
|
+
if (this.buildInfo?.version)
|
|
216
|
+
return;
|
|
209
217
|
this.buildInfo = await this.withClient(async (client) => await client.db('admin').command({ buildInfo: 1 }));
|
|
210
|
-
(0, util_1.debug)('got server build info', this.serverVersion, this.serverVariant);
|
|
218
|
+
(0, util_1.debug)('got server build info through client', this.serverVersion, this.serverVariant);
|
|
211
219
|
}
|
|
212
220
|
async withClient(fn) {
|
|
213
221
|
const client = await mongodb_1.MongoClient.connect(`mongodb://${this.hostport}/?directConnection=true`);
|
|
@@ -219,16 +227,14 @@ class MongoServer {
|
|
|
219
227
|
}
|
|
220
228
|
}
|
|
221
229
|
ref() {
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
(_e = (_d = this.childProcess) === null || _d === void 0 ? void 0 : _d.stderr) === null || _e === void 0 ? void 0 : _e.ref();
|
|
230
|
+
this.childProcess?.ref();
|
|
231
|
+
this.childProcess?.stdout?.ref();
|
|
232
|
+
this.childProcess?.stderr?.ref();
|
|
226
233
|
}
|
|
227
234
|
unref() {
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
(_e = (_d = this.childProcess) === null || _d === void 0 ? void 0 : _d.stderr) === null || _e === void 0 ? void 0 : _e.unref();
|
|
235
|
+
this.childProcess?.unref();
|
|
236
|
+
this.childProcess?.stdout?.unref();
|
|
237
|
+
this.childProcess?.stderr?.unref();
|
|
232
238
|
}
|
|
233
239
|
}
|
|
234
240
|
exports.MongoServer = MongoServer;
|
package/dist/mongoserver.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mongoserver.js","sourceRoot":"","sources":["../src/mongoserver.ts"],"names":[],"mappings":";;;;;;AACA,iDAAsC;AACtC,2BAAuD;AAEvD,
|
|
1
|
+
{"version":3,"file":"mongoserver.js","sourceRoot":"","sources":["../src/mongoserver.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -13,7 +13,7 @@
|
|
|
13
13
|
"email": "compass@mongodb.com"
|
|
14
14
|
},
|
|
15
15
|
"homepage": "https://github.com/mongodb-js/devtools-shared",
|
|
16
|
-
"version": "5.4.
|
|
16
|
+
"version": "5.4.2",
|
|
17
17
|
"repository": {
|
|
18
18
|
"type": "git",
|
|
19
19
|
"url": "https://github.com/mongodb-js/devtools-shared.git"
|
|
@@ -50,17 +50,17 @@
|
|
|
50
50
|
"reformat": "npm run prettier -- --write ."
|
|
51
51
|
},
|
|
52
52
|
"dependencies": {
|
|
53
|
-
"@mongodb-js/mongodb-downloader": "^0.2.
|
|
53
|
+
"@mongodb-js/mongodb-downloader": "^0.2.7",
|
|
54
54
|
"debug": "^4.3.4",
|
|
55
55
|
"mongodb": "^5.6.0",
|
|
56
56
|
"mongodb-connection-string-url": "^2.6.0",
|
|
57
57
|
"yargs": "^17.7.2"
|
|
58
58
|
},
|
|
59
59
|
"devDependencies": {
|
|
60
|
-
"@mongodb-js/eslint-config-devtools": "0.9.
|
|
61
|
-
"@mongodb-js/mocha-config-
|
|
60
|
+
"@mongodb-js/eslint-config-devtools": "0.9.10",
|
|
61
|
+
"@mongodb-js/mocha-config-devtools": "^1.0.1",
|
|
62
62
|
"@mongodb-js/prettier-config-devtools": "^1.0.1",
|
|
63
|
-
"@mongodb-js/tsconfig-
|
|
63
|
+
"@mongodb-js/tsconfig-devtools": "^1.0.1",
|
|
64
64
|
"@types/chai": "^4.2.21",
|
|
65
65
|
"@types/debug": "^4.1.8",
|
|
66
66
|
"@types/mocha": "^9.0.0",
|
|
@@ -77,5 +77,5 @@
|
|
|
77
77
|
"sinon": "^9.2.3",
|
|
78
78
|
"typescript": "^5.0.4"
|
|
79
79
|
},
|
|
80
|
-
"gitHead": "
|
|
80
|
+
"gitHead": "9c41f233d529e7b5cac1849a0a07ca2076fcdbb0"
|
|
81
81
|
}
|