mongodb-runner 5.4.1 → 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/mongologreader.d.ts +5 -0
- package/dist/mongologreader.d.ts.map +1 -1
- package/dist/mongologreader.js +42 -2
- 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 +12 -2
- package/dist/mongoserver.js.map +1 -1
- package/package.json +6 -6
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) {
|
|
@@ -55,7 +55,7 @@ function getPortFromLogEntry(logEntry) {
|
|
|
55
55
|
return logEntry.attr.port;
|
|
56
56
|
}
|
|
57
57
|
if (logEntry.id === undefined &&
|
|
58
|
-
(match = /^waiting for connections on port (?<port>\d+)
|
|
58
|
+
(match = /^waiting for connections on port (?<port>\d+)( ssl)?$/i.exec(logEntry.message))) {
|
|
59
59
|
return +(match.groups?.port ?? '0');
|
|
60
60
|
}
|
|
61
61
|
if (isFailureToSetupListener(logEntry)) {
|
|
@@ -84,4 +84,44 @@ async function filterLogStreamForPort(input) {
|
|
|
84
84
|
return { port };
|
|
85
85
|
}
|
|
86
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;
|
|
87
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;IAC3C,IAAI;QACF,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACnC,OAAO;YACL,EAAE,EAAE,SAAS,CAAC,EAAE;YAChB,SAAS,EAAE,SAAS,CAAC,CAAC,EAAE,KAAK;YAC7B,QAAQ,EAAE,SAAS,CAAC,CAAC;YACrB,SAAS,EAAE,SAAS,CAAC,CAAC;YACtB,OAAO,EAAE,SAAS,CAAC,GAAG;YACtB,OAAO,EAAE,SAAS,CAAC,GAAG;YACtB,IAAI,EAAE,SAAS,CAAC,IAAI;SACrB,CAAC;KACH;IAAC,MAAM;QACN,OAAO,gBAAgB,CAAC,IAAI,CAAC,CAAC;KAC/B;AACH,CAAC;AAfD,4CAeC;AAED,SAAgB,wBAAwB,CAAC,KAAe;IACtD,OAAO,CACL,KAAK,CAAC,EAAE,KAAK,KAAK;QAClB,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,2BAA2B,CAAC,CACpD,CAAC;AACJ,CAAC;AALD,4DAKC;AASD,SAAS,mBAAmB,CAAC,QAAkB;IAC7C,IAAI,KAAK,CAAC;IAGV,IAAI,QAAQ,CAAC,EAAE,KAAK,KAAK,EAAE;QACzB,OAAO,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC;KAC3B;IAED,IACE,QAAQ,CAAC,EAAE,KAAK,SAAS;QACzB,CAAC,KAAK,GAAG,
|
|
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
|
@@ -91,7 +91,10 @@ class MongoServer {
|
|
|
91
91
|
if (options.binDir) {
|
|
92
92
|
commandline.push(`--volume=${options.binDir}:/runner-bin:ro`);
|
|
93
93
|
}
|
|
94
|
-
|
|
94
|
+
if (Array.isArray(options.docker))
|
|
95
|
+
commandline.push(...options.docker);
|
|
96
|
+
else
|
|
97
|
+
commandline.push(options.docker);
|
|
95
98
|
if (options.binDir) {
|
|
96
99
|
commandline.push(`/runner-bin/${options.binary}`);
|
|
97
100
|
}
|
|
@@ -152,6 +155,11 @@ class MongoServer {
|
|
|
152
155
|
(0, util_1.debug)('mongodb server output', entry);
|
|
153
156
|
}
|
|
154
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
|
+
});
|
|
155
163
|
const { port } = await (0, mongologreader_1.filterLogStreamForPort)(logEntryStream);
|
|
156
164
|
(0, util_1.debug)('server listening on port', port);
|
|
157
165
|
if (port === -1) {
|
|
@@ -204,8 +212,10 @@ class MongoServer {
|
|
|
204
212
|
this.dbPath = undefined;
|
|
205
213
|
}
|
|
206
214
|
async _populateBuildInfo() {
|
|
215
|
+
if (this.buildInfo?.version)
|
|
216
|
+
return;
|
|
207
217
|
this.buildInfo = await this.withClient(async (client) => await client.db('admin').command({ buildInfo: 1 }));
|
|
208
|
-
(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);
|
|
209
219
|
}
|
|
210
220
|
async withClient(fn) {
|
|
211
221
|
const client = await mongodb_1.MongoClient.connect(`mongodb://${this.hostport}/?directConnection=true`);
|
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-devtools": "^1.0.
|
|
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-devtools": "^1.0.
|
|
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
|
}
|