@lossless.org/client 1.9.0 → 1.10.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/dist_ts/00_commitinfo_data.js +2 -2
- package/dist_ts/nosqldb/classes.testdatabase.d.ts +14 -1
- package/dist_ts/nosqldb/classes.testdatabase.js +38 -16
- package/dist_ts/nosqldb/testsupport.d.ts +1 -1
- package/package.json +1 -1
- package/readme.md +1 -0
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/nosqldb/classes.testdatabase.ts +56 -16
- package/ts/nosqldb/testsupport.ts +2 -0
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@lossless.org/client',
|
|
6
|
-
version: '1.
|
|
6
|
+
version: '1.10.0',
|
|
7
7
|
description: 'One typed client for NoSQLDB, MongoDB, SQLDB, MariaDB, ClickHouse and S3 object storage.'
|
|
8
8
|
};
|
|
9
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
9
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSxzQkFBc0I7SUFDNUIsT0FBTyxFQUFFLFFBQVE7SUFDakIsV0FBVyxFQUFFLDBGQUEwRjtDQUN4RyxDQUFBIn0=
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { SmartdataDb } from './classes.db.js';
|
|
2
2
|
import { SmartDataDbDoc } from './classes.doc.js';
|
|
3
3
|
import { SmartdataPersistenceError } from './classes.persistence.js';
|
|
4
|
+
/** A loopback TCP engine endpoint. */
|
|
4
5
|
export interface ISmartdataTestConnection {
|
|
5
6
|
/** Literal loopback IPv4, ::1, or localhost (normalized to 127.0.0.1). */
|
|
6
7
|
host: string;
|
|
@@ -9,8 +10,20 @@ export interface ISmartdataTestConnection {
|
|
|
9
10
|
username?: string;
|
|
10
11
|
password?: string;
|
|
11
12
|
}
|
|
13
|
+
/** A unix-domain socket engine endpoint. */
|
|
14
|
+
export interface ISmartdataTestSocketConnection {
|
|
15
|
+
/**
|
|
16
|
+
* Absolute canonical path ending in `.sock` (the MongoDB connection-string rule for
|
|
17
|
+
* socket hosts), at most 107 UTF-8 bytes, without control characters, lone surrogates or `%`.
|
|
18
|
+
*/
|
|
19
|
+
socketPath: string;
|
|
20
|
+
/** Supply both credentials or neither. Authentication uses admin. */
|
|
21
|
+
username?: string;
|
|
22
|
+
password?: string;
|
|
23
|
+
}
|
|
24
|
+
export type TSmartdataTestConnection = ISmartdataTestConnection | ISmartdataTestSocketConnection;
|
|
12
25
|
export interface ISmartdataTestDatabaseOptions {
|
|
13
|
-
connection:
|
|
26
|
+
connection: TSmartdataTestConnection;
|
|
14
27
|
/** Default 5000; maximum 120000 ms, shared by connection and ownership checks. */
|
|
15
28
|
timeoutMs?: number;
|
|
16
29
|
signal?: AbortSignal;
|
|
@@ -16,6 +16,32 @@ export class SmartdataTestDatabaseCreationError extends SmartdataPersistenceErro
|
|
|
16
16
|
}
|
|
17
17
|
const faultError = () => new SmartdataPersistenceError('invalid_argument', 'Fault data must be bounded, inert, canonical BSON with an explicit scalar _id.');
|
|
18
18
|
const canonicalFaultDocument = (valueArg, maxBytesArg) => snapshotBoundedBsonDocument(valueArg, maxBytesArg, faultError);
|
|
19
|
+
/** Linux `sun_path` holds 108 bytes including the terminating NUL. */
|
|
20
|
+
const socketPathMaxBytes = 107;
|
|
21
|
+
/**
|
|
22
|
+
* mongodb 7.6.0 percent-decodes a socket host once when parsing it and again when it rebuilds
|
|
23
|
+
* the server address, so a path containing `%` cannot be reached as written and is refused.
|
|
24
|
+
*/
|
|
25
|
+
const isSocketPath = (valueArg) => typeof valueArg === 'string' &&
|
|
26
|
+
valueArg.startsWith('/') && valueArg.endsWith('.sock') && Buffer.byteLength(valueArg) <= socketPathMaxBytes &&
|
|
27
|
+
!/[\p{Cc}\p{Cs}%]/u.test(valueArg) &&
|
|
28
|
+
valueArg.split('/').slice(1).every((partArg) => partArg !== '' && partArg !== '.' && partArg !== '..');
|
|
29
|
+
/**
|
|
30
|
+
* The connection-string host of an accepted endpoint, or undefined. The driver reads a
|
|
31
|
+
* percent-encoded host ending in `.sock` as a unix-domain socket path.
|
|
32
|
+
*/
|
|
33
|
+
const connectionHost = (connectionArg) => {
|
|
34
|
+
if (Object.hasOwn(connectionArg, 'socketPath')) {
|
|
35
|
+
return Object.hasOwn(connectionArg, 'host') || Object.hasOwn(connectionArg, 'port') ||
|
|
36
|
+
!isSocketPath(connectionArg.socketPath) ? undefined : encodeURIComponent(connectionArg.socketPath);
|
|
37
|
+
}
|
|
38
|
+
const { host, port } = connectionArg;
|
|
39
|
+
if (typeof host !== 'string' ||
|
|
40
|
+
!(host === 'localhost' || host === '::1' || (plugins.nodeNet.isIP(host) === 4 && host.startsWith('127.'))) ||
|
|
41
|
+
!Number.isSafeInteger(port) || port < 1 || port > 65535)
|
|
42
|
+
return undefined;
|
|
43
|
+
return `${host === 'localhost' ? '127.0.0.1' : host === '::1' ? '[::1]' : host}:${port}`;
|
|
44
|
+
};
|
|
19
45
|
/** Disposable fault injection is available only through the testsupport package subpath. */
|
|
20
46
|
export class SmartdataTestDatabase {
|
|
21
47
|
db;
|
|
@@ -27,34 +53,30 @@ export class SmartdataTestDatabase {
|
|
|
27
53
|
#reconnectForRemoval = false;
|
|
28
54
|
#active;
|
|
29
55
|
#closing;
|
|
30
|
-
constructor(
|
|
31
|
-
const
|
|
32
|
-
|
|
33
|
-
const credentials = connectionArg.username === undefined ? ''
|
|
34
|
-
: `${encodeURIComponent(connectionArg.username)}:${encodeURIComponent(connectionArg.password)}@`;
|
|
56
|
+
constructor(hostArg, usernameArg, passwordArg) {
|
|
57
|
+
const credentials = usernameArg === undefined ? ''
|
|
58
|
+
: `${encodeURIComponent(usernameArg)}:${encodeURIComponent(passwordArg)}@`;
|
|
35
59
|
this.#descriptor = Object.freeze({
|
|
36
60
|
mongoDbName: this.#name,
|
|
37
|
-
mongoDbUrl: `mongodb://${credentials}${
|
|
61
|
+
mongoDbUrl: `mongodb://${credentials}${hostArg}/?directConnection=true&authSource=admin`,
|
|
38
62
|
});
|
|
39
63
|
this.db = new SmartdataDb(this.#descriptor);
|
|
40
64
|
}
|
|
41
65
|
static async create(optionsArg) {
|
|
42
66
|
const options = assertDataOptions(optionsArg, ['connection', 'timeoutMs', 'signal']);
|
|
43
|
-
const connection = assertDataOptions(options.connection, ['host', 'port', 'username', 'password']);
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
((connection.username === undefined) !== (connection.password === undefined)) ||
|
|
49
|
-
[connection.username, connection.password].some((valueArg) => valueArg !== undefined &&
|
|
67
|
+
const connection = assertDataOptions(options.connection, ['host', 'port', 'socketPath', 'username', 'password']);
|
|
68
|
+
const { username, password } = connection;
|
|
69
|
+
const host = connectionHost(connection);
|
|
70
|
+
if (host === undefined || ((username === undefined) !== (password === undefined)) ||
|
|
71
|
+
[username, password].some((valueArg) => valueArg !== undefined &&
|
|
50
72
|
(typeof valueArg !== 'string' || valueArg.length < 1 || valueArg.length > 1024))) {
|
|
51
|
-
throw new SmartdataPersistenceError('invalid_argument', 'An explicit loopback host
|
|
73
|
+
throw new SmartdataPersistenceError('invalid_argument', 'An explicit loopback host and port or unix socket path, and an optional credential pair, are required.');
|
|
52
74
|
}
|
|
53
75
|
const budget = new SmartdataOperationBudget(options.timeoutMs ?? 5000, options.signal);
|
|
54
76
|
let fixture;
|
|
55
77
|
try {
|
|
56
78
|
budget.check();
|
|
57
|
-
fixture = new SmartdataTestDatabase(
|
|
79
|
+
fixture = new SmartdataTestDatabase(host, username, password);
|
|
58
80
|
await fixture.db.init({ timeoutMs: budget.remainingMs(), signal: budget.signal });
|
|
59
81
|
const databases = await fixture.db.mongoDb.admin().listDatabases({
|
|
60
82
|
filter: { name: fixture.#name }, nameOnly: true, authorizedDatabases: false,
|
|
@@ -247,4 +269,4 @@ export class SmartdataTestDatabase {
|
|
|
247
269
|
this.#owned = false;
|
|
248
270
|
}
|
|
249
271
|
}
|
|
250
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.testdatabase.js","sourceRoot":"","sources":["../../ts/nosqldb/classes.testdatabase.ts"],"names":[],"mappings":"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"}
|
|
272
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.testdatabase.js","sourceRoot":"","sources":["../../ts/nosqldb/classes.testdatabase.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,cAAc,CAAC;AACxC,OAAO,EAAE,2BAA2B,EAAE,MAAM,2BAA2B,CAAC;AACxE,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,yBAAyB,EAAE,MAAM,0BAA0B,CAAC;AACrE,OAAO,EAAE,iBAAiB,EAAE,wBAAwB,EAAE,MAAM,8BAA8B,CAAC;AAmD3F,8FAA8F;AAC9F,MAAM,OAAO,kCAAmC,SAAQ,yBAAyB;IACtE,QAAQ,CAAsB;IACvC,YAAY,UAA+B;QACzC,KAAK,CAAC,uBAAuB,EAAE,4EAA4E,CAAC,CAAC;QAC7G,IAAI,CAAC,IAAI,GAAG,oCAAoC,CAAC;QACjD,IAAI,CAAC,QAAQ,GAAG,UAAU,CAAC;IAC7B,CAAC;IACM,KAAK,KAAoB,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;CAC1D;AAED,MAAM,UAAU,GAAG,GAA8B,EAAE,CAAC,IAAI,yBAAyB,CAC/E,kBAAkB,EAAE,gFAAgF,CACrG,CAAC;AAEF,MAAM,sBAAsB,GAAG,CAAC,QAAiB,EAAE,WAAmB,EAA4B,EAAE,CAClG,2BAA2B,CAAC,QAAQ,EAAE,WAAW,EAAE,UAAU,CAAC,CAAC;AAEjE,sEAAsE;AACtE,MAAM,kBAAkB,GAAG,GAAG,CAAC;AAE/B;;;GAGG;AACH,MAAM,YAAY,GAAG,CAAC,QAAiB,EAAsB,EAAE,CAAC,OAAO,QAAQ,KAAK,QAAQ;IAC1F,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,kBAAkB;IAC3G,CAAC,kBAAkB,CAAC,IAAI,CAAC,QAAQ,CAAC;IAClC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,KAAK,EAAE,IAAI,OAAO,KAAK,GAAG,IAAI,OAAO,KAAK,IAAI,CAAC,CAAC;AAEzG;;;GAGG;AACH,MAAM,cAAc,GAAG,CAAC,aAAsC,EAAsB,EAAE;IACpF,IAAI,MAAM,CAAC,MAAM,CAAC,aAAa,EAAE,YAAY,CAAC,EAAE,CAAC;QAC/C,OAAO,MAAM,CAAC,MAAM,CAAC,aAAa,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,aAAa,EAAE,MAAM,CAAC;YACjF,CAAC,YAAY,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,kBAAkB,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;IACvG,CAAC;IACD,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,aAAa,CAAC;IACrC,IAAI,OAAO,IAAI,KAAK,QAAQ;QAC1B,CAAC,CAAC,IAAI,KAAK,WAAW,IAAI,IAAI,KAAK,KAAK,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC;QAC1G,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,IAAK,IAAe,GAAG,CAAC,IAAK,IAAe,GAAG,KAAK;QAAE,OAAO,SAAS,CAAC;IACpG,OAAO,GAAG,IAAI,KAAK,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,KAAK,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,IAAI,IAAI,EAAE,CAAC;AAC3F,CAAC,CAAC;AAEF,4FAA4F;AAC5F,MAAM,OAAO,qBAAqB;IAChB,EAAE,CAAc;IACvB,KAAK,GAAG,kBAAkB,OAAO,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;IAC/E,WAAW,CAAkC;IACtD,MAAM,GAAG,KAAK,CAAC;IACf,OAAO,GAAG,KAAK,CAAC;IAChB,SAAS,GAAG,KAAK,CAAC;IAClB,oBAAoB,GAAG,KAAK,CAAC;IAC7B,OAAO,CAAiB;IACxB,QAAQ,CAAiB;IAEzB,YAAoB,OAAe,EAAE,WAA+B,EAAE,WAA+B;QACnG,MAAM,WAAW,GAAG,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE;YAChD,CAAC,CAAC,GAAG,kBAAkB,CAAC,WAAW,CAAC,IAAI,kBAAkB,CAAC,WAAY,CAAC,GAAG,CAAC;QAC9E,IAAI,CAAC,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC;YAC/B,WAAW,EAAE,IAAI,CAAC,KAAK;YACvB,UAAU,EAAE,aAAa,WAAW,GAAG,OAAO,0CAA0C;SACzF,CAAC,CAAC;QACH,IAAI,CAAC,EAAE,GAAG,IAAI,WAAW,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAC9C,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,UAAyC;QAClE,MAAM,OAAO,GAAG,iBAAiB,CAAC,UAAU,EAAE,CAAC,YAAY,EAAE,WAAW,EAAE,QAAQ,CAAC,CAAC,CAAC;QACrF,MAAM,UAAU,GAAG,iBAAiB,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC,CAAC;QACjH,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,UAAU,CAAC;QAC1C,MAAM,IAAI,GAAG,cAAc,CAAC,UAAU,CAAC,CAAC;QACxC,IAAI,IAAI,KAAK,SAAS,IAAI,CAAC,CAAC,QAAQ,KAAK,SAAS,CAAC,KAAK,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC;YAC/E,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,KAAK,SAAS;gBAC5D,CAAC,OAAO,QAAQ,KAAK,QAAQ,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,IAAI,QAAQ,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC,EAAE,CAAC;YACrF,MAAM,IAAI,yBAAyB,CAAC,kBAAkB,EACpD,wGAAwG,CAAC,CAAC;QAC9G,CAAC;QACD,MAAM,MAAM,GAAG,IAAI,wBAAwB,CAAC,OAAO,CAAC,SAAS,IAAI,IAAI,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;QACvF,IAAI,OAA0C,CAAC;QAC/C,IAAI,CAAC;YACH,MAAM,CAAC,KAAK,EAAE,CAAC;YACf,OAAO,GAAG,IAAI,qBAAqB,CAAC,IAAI,EAAE,QAA8B,EAAE,QAA8B,CAAC,CAAC;YAC1G,MAAM,OAAO,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,MAAM,CAAC,WAAW,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;YAClF,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,aAAa,CAAC;gBAC/D,MAAM,EAAE,EAAE,IAAI,EAAE,OAAO,CAAC,KAAK,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,mBAAmB,EAAE,KAAK;gBAC3E,GAAG,MAAM,CAAC,gBAAgB,EAAE;aAC7B,CAAC,CAAC;YACH,IAAI,SAAS,CAAC,EAAE,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,SAAS,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAClG,MAAM,IAAI,yBAAyB,CAAC,uBAAuB,EAAE,gEAAgE,CAAC,CAAC;YACjI,CAAC;YACD,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,EAAE,CAAC,gBAAgB,CAAC,EAAE,cAAc,EAAE,CAAC;gBACrE,SAAS,EAAE,MAAM,CAAC,WAAW,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;YAC5D,IAAI,SAAS,CAAC,WAAW,CAAC,MAAM;gBAAE,MAAM,IAAI,yBAAyB,CAAC,uBAAuB,EAC3F,wCAAwC,CAAC,CAAC;YAC5C,MAAM,CAAC,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;YACtB,OAAO,OAAO,CAAC;QACjB,CAAC;QAAC,OAAO,QAAQ,EAAE,CAAC;YAClB,IAAI,OAAO,EAAE,CAAC;gBACZ,IAAI,CAAC;oBAAC,MAAM,OAAO,CAAC,KAAK,EAAE,CAAC;gBAAC,CAAC;gBAAC,MAAM,CAAC;oBACpC,MAAM,QAAQ,GAAG,OAAO,CAAC;oBACzB,MAAM,IAAI,kCAAkC,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;gBACvE,CAAC;YACH,CAAC;YACD,MAAM,IAAI,yBAAyB,CAAC,QAAQ,YAAY,yBAAyB,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,uBAAuB,EACzH,oDAAoD,CAAC,CAAC;QAC1D,CAAC;gBAAS,CAAC;YAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QAAC,CAAC;IAC/B,CAAC;IAEM,yBAAyB,CAAC,QAA6B,EAAE,WAAoB,EAClF,aAAmD,EAAE;QACrD,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,WAAW,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC;IACnE,CAAC;IAEM,0BAA0B,CAAC,QAA6B,EAAE,aAAsB,EACrF,WAAoB,EAAE,aAAmD,EAAE;QAC3E,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,WAAW,EAAE,EAAE,UAAU,EAAE,aAAa,EAAE,EAAE,UAAU,CAAC,CAAC;IACvF,CAAC;IAED,gFAAgF;IACzE,KAAK,CAAC,sBAAsB,CAAC,QAA6B,EAAE,YAAoB,EACrF,aAA0C,EAAE;QAC5C,MAAM,OAAO,GAAG,iBAAiB,CAAC,UAAU,EAAE,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC,CAAC;QACvE,MAAM,MAAM,GAAG,IAAI,wBAAwB,CAAC,OAAO,CAAC,SAAS,IAAI,IAAI,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;QACvF,IAAI,CAAC;YACH,MAAM,CAAC,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,oBAAoB,EAAE,CAAC;YAC5B,MAAM,QAAQ,GAAG,IAAI,CAAC,qBAAqB,CAAC,QAAQ,CAAC,CAAC;YACtD,IAAI,OAAO,YAAY,KAAK,QAAQ,IAAI,YAAY,KAAK,MAAM,IAAI,YAAY,KAAK,GAAG;gBACrF,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,KAAK,YAAY,CAAC,EAAE,CAAC;gBACvE,MAAM,IAAI,yBAAyB,CAAC,kBAAkB,EACpD,mEAAmE,CAAC,CAAC;YACzE,CAAC;YACD,MAAM,SAAS,GAAG,CAAC,KAAK,IAAI,EAAE;gBAC5B,IAAI,CAAC,kBAAkB,EAAE,CAAC;gBAC1B,MAAM,QAAQ,GAAG,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC;gBACjC,MAAM,QAAQ,CAAC,iBAAiB,CAAC,EAAE,IAAI,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,CAAC,WAAW,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;gBACnH,IAAI,CAAC,kBAAkB,EAAE,CAAC;gBAC1B,IAAI,IAAI,CAAC,EAAE,CAAC,OAAO,KAAK,QAAQ;oBAAE,MAAM,IAAI,yBAAyB,CACnE,uBAAuB,EAAE,6CAA6C,CAAC,CAAC;gBAC1E,MAAM,QAAQ,CAAC,UAAU,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC,SAAS,CAAC,YAAY,EAAE,MAAM,CAAC,gBAAgB,EAAE,CAAC,CAAC;gBACtG,MAAM,CAAC,KAAK,EAAE,CAAC;gBACf,IAAI,CAAC,kBAAkB,EAAE,CAAC;gBAC1B,IAAI,IAAI,CAAC,EAAE,CAAC,OAAO,KAAK,QAAQ;oBAAE,MAAM,IAAI,yBAAyB,CACnE,uBAAuB,EAAE,6CAA6C,CAAC,CAAC;YAC5E,CAAC,CAAC,EAAE,CAAC;YACL,IAAI,CAAC,OAAO,GAAG,SAAS,CAAC;YACzB,IAAI,CAAC;gBAAC,MAAM,SAAS,CAAC;YAAC,CAAC;oBAAS,CAAC;gBAAC,IAAI,CAAC,OAAO,GAAG,SAAS,CAAC;YAAC,CAAC;QAChE,CAAC;QAAC,OAAO,QAAQ,EAAE,CAAC;YAClB,MAAM,IAAI,yBAAyB,CAAC,QAAQ,YAAY,yBAAyB,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,uBAAuB,EACzH,yDAAyD,CAAC,CAAC;QAC/D,CAAC;gBAAS,CAAC;YAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QAAC,CAAC;IAC/B,CAAC;IAEO,oBAAoB;QAC1B,IAAI,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,OAAO;YAAE,MAAM,IAAI,yBAAyB,CACrG,uBAAuB,EAAE,2EAA2E,CAAC,CAAC;IAC1G,CAAC;IAEO,qBAAqB,CAAC,QAA6B;QACzD,IAAI,OAAO,QAAQ,KAAK,UAAU,IAAI,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC;YAC5E,CAAC,CAAC,QAAQ,CAAC,SAAS,YAAY,cAAc,CAAC;YAAE,MAAM,IAAI,yBAAyB,CAClF,kBAAkB,EAAE,oEAAoE,CAAC,CAAC;QAC9F,MAAM,UAAU,GAAG,QAAQ,CAAC,UAAU,CAAC;QACvC,MAAM,QAAQ,GAAG,QAAQ,CAAC,6BAA6B,EAAE,CAAC;QAC1D,IAAI,UAAU,CAAC,WAAW,KAAK,IAAI,CAAC,EAAE,IAAI,UAAU,CAAC,cAAc,KAAK,QAAQ,CAAC,cAAc,EAAE,CAAC;YAChG,MAAM,IAAI,yBAAyB,CAAC,uBAAuB,EAAE,0DAA0D,CAAC,CAAC;QAC3H,CAAC;QACD,OAAO,QAAQ,CAAC;IAClB,CAAC;IAEO,kBAAkB;QACxB,IAAI,IAAI,CAAC,EAAE,CAAC,gBAAgB,KAAK,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,YAAY,KAAK,IAAI,CAAC,KAAK;YAC9F,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,MAAM,KAAK,IAAI,CAAC,EAAE,CAAC,aAAa,IAAI,IAAI,CAAC,EAAE,CAAC,MAAM,KAAK,WAAW,EAAE,CAAC;YACrF,MAAM,IAAI,yBAAyB,CAAC,uBAAuB,EAAE,8CAA8C,CAAC,CAAC;QAC/G,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,MAAM,CAAC,QAA6B,EAAE,WAAoB,EACtE,cAAmD,EAAE,UAAgD;QACrG,MAAM,OAAO,GAAG,iBAAiB,CAAC,UAAU,EAAE,CAAC,UAAU,EAAE,WAAW,EAAE,QAAQ,CAAC,CAAC,CAAC;QACnF,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,IAAI,KAAK,CAAC;QAC3C,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,QAAQ,CAAC,IAAK,QAAmB,GAAG,CAAC,IAAK,QAAmB,GAAG,IAAI,GAAG,IAAI;YAAE,MAAM,UAAU,EAAE,CAAC;QAC1H,MAAM,MAAM,GAAG,IAAI,wBAAwB,CAAC,OAAO,CAAC,SAAS,IAAI,IAAI,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;QACvF,IAAI,CAAC;YACH,MAAM,CAAC,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,oBAAoB,EAAE,CAAC;YAC5B,MAAM,QAAQ,GAAG,sBAAsB,CAAC,WAAW,EAAE,QAAkB,CAAC,CAAC;YACzE,IAAI,cAAc,EAAE,CAAC;gBACnB,MAAM,QAAQ,GAAG,sBAAsB,CAAC,EAAE,GAAG,EAAE,cAAc,CAAC,UAAU,EAAE,EAAE,QAAkB,CAAC,CAAC;gBAChG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAC/D,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,GAAG,EAAE,QAAQ,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;oBAAE,MAAM,UAAU,EAAE,CAAC;YAC5F,CAAC;YACD,MAAM,QAAQ,GAAG,IAAI,CAAC,qBAAqB,CAAC,QAAQ,CAAC,CAAC;YACtD,MAAM,SAAS,GAAG,CAAC,KAAK,IAAI,EAAE;gBAC5B,IAAI,CAAC,kBAAkB,EAAE,CAAC;gBAC1B,MAAM,QAAQ,CAAC,iBAAiB,CAAC,EAAE,IAAI,EAAE,kBAAkB,EAAE,SAAS,EAAE,MAAM,CAAC,WAAW,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;gBACvH,IAAI,CAAC,kBAAkB,EAAE,CAAC;gBAC1B,MAAM,GAAG,GAAG,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;gBAChE,IAAI,cAAc,EAAE,CAAC;oBACnB,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,UAAU,CAAC,EAAE,GAAG,EAAE,QAAQ,CAAC,GAAG,EAAE,EAAE,QAAQ,EACjE,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,CAAC,gBAAgB,EAAE,EAAE,CAAC,CAAC;oBACnD,IAAI,CAAC,MAAM,CAAC,YAAY,IAAI,MAAM,CAAC,YAAY,KAAK,CAAC;wBAAE,MAAM,IAAI,yBAAyB,CACxF,uBAAuB,EAAE,yDAAyD,CAAC,CAAC;gBACxF,CAAC;qBAAM,CAAC;oBACN,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC,gBAAgB,EAAE,CAAC,CAAC;oBACxE,IAAI,CAAC,MAAM,CAAC,YAAY;wBAAE,MAAM,IAAI,yBAAyB,CAAC,uBAAuB,EAAE,uCAAuC,CAAC,CAAC;gBAClI,CAAC;gBACD,MAAM,CAAC,KAAK,EAAE,CAAC;YACjB,CAAC,CAAC,EAAE,CAAC;YACL,IAAI,CAAC,OAAO,GAAG,SAAS,CAAC;YACzB,IAAI,CAAC;gBAAC,MAAM,SAAS,CAAC;YAAC,CAAC;oBAAS,CAAC;gBAAC,IAAI,CAAC,OAAO,GAAG,SAAS,CAAC;YAAC,CAAC;QAChE,CAAC;QAAC,OAAO,QAAQ,EAAE,CAAC;YAClB,MAAM,IAAI,yBAAyB,CAAC,QAAQ,YAAY,yBAAyB,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,uBAAuB,EACzH,0DAA0D,CAAC,CAAC;QAChE,CAAC;gBAAS,CAAC;YAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QAAC,CAAC;IAC/B,CAAC;IAED,wFAAwF;IACjF,KAAK,CAAC,KAAK,CAAC,aAAqC,EAAE;QACxD,MAAM,OAAO,GAAG,iBAAiB,CAAC,UAAU,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC;QAC7D,MAAM,MAAM,GAAG,IAAI,wBAAwB,CAAC,OAAO,CAAC,SAAS,IAAI,IAAI,CAAC,CAAC;QACvE,IAAI,CAAC;YACH,IAAI,IAAI,CAAC,OAAO;gBAAE,OAAO;YACzB,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;YACtB,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;gBAClB,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC;gBAC9B,MAAM,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;gBAC9B,MAAM,OAAO,CAAC;gBACd,OAAO;YACT,CAAC;YACD,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YACrC,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;YACxB,IAAI,CAAC;gBAAC,MAAM,OAAO,CAAC;YAAC,CAAC;oBAAS,CAAC;gBAAC,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC;YAAC,CAAC;QAC/D,CAAC;QAAC,MAAM,CAAC;YACP,MAAM,IAAI,yBAAyB,CAAC,uBAAuB,EACzD,4DAA4D,CAAC,CAAC;QAClE,CAAC;gBAAS,CAAC;YAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QAAC,CAAC;IAC/B,CAAC;IAEO,KAAK,CAAC,OAAO,CAAC,SAAmC;QACvD,IAAI,IAAI,CAAC,OAAO;YAAE,MAAM,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACxD,IAAI,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,oBAAoB,EAAE,CAAC;YAC7C,MAAM,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,SAAS,EAAE,SAAS,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;YAC5D,IAAI,CAAC,EAAE,CAAC,gBAAgB,GAAG,IAAI,CAAC,WAAW,CAAC;YAC5C,MAAM,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,SAAS,CAAC,WAAW,EAAE,EAAE,MAAM,EAAE,SAAS,CAAC,MAAM,EAAE,CAAC,CAAC;QACvF,CAAC;QACD,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAC,MAAM,CAAC;QACxC,MAAM,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,SAAS,EAAE,SAAS,CAAC,WAAW,EAAE;YACtD,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,EAAE,oBAAoB,EAAE,IAAI,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;QACpF,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QACpB,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;IACtB,CAAC;CACF"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import './shim.js';
|
|
2
2
|
export { SmartdataTestDatabase, SmartdataTestDatabaseCreationError, } from './classes.testdatabase.js';
|
|
3
|
-
export type { ISmartdataTestConnection, ISmartdataTestDatabaseOptions, ISmartdataStoredDocumentFaultOptions, ISmartdataIndexFaultOptions, TSmartdataTestModel, } from './classes.testdatabase.js';
|
|
3
|
+
export type { ISmartdataTestConnection, ISmartdataTestSocketConnection, TSmartdataTestConnection, ISmartdataTestDatabaseOptions, ISmartdataStoredDocumentFaultOptions, ISmartdataIndexFaultOptions, TSmartdataTestModel, } from './classes.testdatabase.js';
|
package/package.json
CHANGED
package/readme.md
CHANGED
|
@@ -104,6 +104,7 @@ Family imports preserve the established SmartData and SmartBucket names and cons
|
|
|
104
104
|
| Key-value store readiness | `EasyStore.ensureInitialized()` — installs the store's declared index at startup, outside any transaction window, so a first `readKey()`/`writeKey()` needs no index DDL |
|
|
105
105
|
| Client deadlines | `timeoutMS` (1..120000) on every ordinary model read and write, instance `save()`/`saveIf()`/`delete()` included, on every exact call, and `session.withTransaction(callback, { timeoutMS })` for a whole transaction, retries and commit included; expiry rejects with `SmartdataPersistenceError` code `timeout`, and an exact write interrupted in flight with `ambiguous_write` |
|
|
106
106
|
| Cancellation | `signal` on every exact call, `atomicDeleteMany()` and `session.withTransaction(callback, { signal })`, which interrupts the session's operation in flight, rolls the attempt back and never commits after an abort |
|
|
107
|
+
| Disposable test databases on a unix socket | `SmartdataTestDatabase.create({ connection: { socketPath } })` from `@lossless.org/client/testsupport` reaches an engine that listens only on a unix-domain socket, fault helpers included; the loopback `host`/`port` form is unchanged |
|
|
107
108
|
|
|
108
109
|
`docs/source/smartdata/readme.md` documents each one with its refusals.
|
|
109
110
|
|
package/ts/00_commitinfo_data.ts
CHANGED
|
@@ -5,6 +5,7 @@ import { SmartDataDbDoc } from './classes.doc.js';
|
|
|
5
5
|
import { SmartdataPersistenceError } from './classes.persistence.js';
|
|
6
6
|
import { assertDataOptions, SmartdataOperationBudget } from './classes.operationbudget.js';
|
|
7
7
|
|
|
8
|
+
/** A loopback TCP engine endpoint. */
|
|
8
9
|
export interface ISmartdataTestConnection {
|
|
9
10
|
/** Literal loopback IPv4, ::1, or localhost (normalized to 127.0.0.1). */
|
|
10
11
|
host: string;
|
|
@@ -14,8 +15,22 @@ export interface ISmartdataTestConnection {
|
|
|
14
15
|
password?: string;
|
|
15
16
|
}
|
|
16
17
|
|
|
18
|
+
/** A unix-domain socket engine endpoint. */
|
|
19
|
+
export interface ISmartdataTestSocketConnection {
|
|
20
|
+
/**
|
|
21
|
+
* Absolute canonical path ending in `.sock` (the MongoDB connection-string rule for
|
|
22
|
+
* socket hosts), at most 107 UTF-8 bytes, without control characters, lone surrogates or `%`.
|
|
23
|
+
*/
|
|
24
|
+
socketPath: string;
|
|
25
|
+
/** Supply both credentials or neither. Authentication uses admin. */
|
|
26
|
+
username?: string;
|
|
27
|
+
password?: string;
|
|
28
|
+
}
|
|
29
|
+
|
|
30
|
+
export type TSmartdataTestConnection = ISmartdataTestConnection | ISmartdataTestSocketConnection;
|
|
31
|
+
|
|
17
32
|
export interface ISmartdataTestDatabaseOptions {
|
|
18
|
-
connection:
|
|
33
|
+
connection: TSmartdataTestConnection;
|
|
19
34
|
/** Default 5000; maximum 120000 ms, shared by connection and ownership checks. */
|
|
20
35
|
timeoutMs?: number;
|
|
21
36
|
signal?: AbortSignal;
|
|
@@ -57,6 +72,34 @@ const faultError = (): SmartdataPersistenceError => new SmartdataPersistenceErro
|
|
|
57
72
|
const canonicalFaultDocument = (valueArg: unknown, maxBytesArg: number): plugins.mongodb.Document =>
|
|
58
73
|
snapshotBoundedBsonDocument(valueArg, maxBytesArg, faultError);
|
|
59
74
|
|
|
75
|
+
/** Linux `sun_path` holds 108 bytes including the terminating NUL. */
|
|
76
|
+
const socketPathMaxBytes = 107;
|
|
77
|
+
|
|
78
|
+
/**
|
|
79
|
+
* mongodb 7.6.0 percent-decodes a socket host once when parsing it and again when it rebuilds
|
|
80
|
+
* the server address, so a path containing `%` cannot be reached as written and is refused.
|
|
81
|
+
*/
|
|
82
|
+
const isSocketPath = (valueArg: unknown): valueArg is string => typeof valueArg === 'string' &&
|
|
83
|
+
valueArg.startsWith('/') && valueArg.endsWith('.sock') && Buffer.byteLength(valueArg) <= socketPathMaxBytes &&
|
|
84
|
+
!/[\p{Cc}\p{Cs}%]/u.test(valueArg) &&
|
|
85
|
+
valueArg.split('/').slice(1).every((partArg) => partArg !== '' && partArg !== '.' && partArg !== '..');
|
|
86
|
+
|
|
87
|
+
/**
|
|
88
|
+
* The connection-string host of an accepted endpoint, or undefined. The driver reads a
|
|
89
|
+
* percent-encoded host ending in `.sock` as a unix-domain socket path.
|
|
90
|
+
*/
|
|
91
|
+
const connectionHost = (connectionArg: Record<string, unknown>): string | undefined => {
|
|
92
|
+
if (Object.hasOwn(connectionArg, 'socketPath')) {
|
|
93
|
+
return Object.hasOwn(connectionArg, 'host') || Object.hasOwn(connectionArg, 'port') ||
|
|
94
|
+
!isSocketPath(connectionArg.socketPath) ? undefined : encodeURIComponent(connectionArg.socketPath);
|
|
95
|
+
}
|
|
96
|
+
const { host, port } = connectionArg;
|
|
97
|
+
if (typeof host !== 'string' ||
|
|
98
|
+
!(host === 'localhost' || host === '::1' || (plugins.nodeNet.isIP(host) === 4 && host.startsWith('127.'))) ||
|
|
99
|
+
!Number.isSafeInteger(port) || (port as number) < 1 || (port as number) > 65535) return undefined;
|
|
100
|
+
return `${host === 'localhost' ? '127.0.0.1' : host === '::1' ? '[::1]' : host}:${port}`;
|
|
101
|
+
};
|
|
102
|
+
|
|
60
103
|
/** Disposable fault injection is available only through the testsupport package subpath. */
|
|
61
104
|
export class SmartdataTestDatabase {
|
|
62
105
|
public readonly db: SmartdataDb;
|
|
@@ -69,35 +112,32 @@ export class SmartdataTestDatabase {
|
|
|
69
112
|
#active?: Promise<void>;
|
|
70
113
|
#closing?: Promise<void>;
|
|
71
114
|
|
|
72
|
-
private constructor(
|
|
73
|
-
const
|
|
74
|
-
|
|
75
|
-
const credentials = connectionArg.username === undefined ? ''
|
|
76
|
-
: `${encodeURIComponent(connectionArg.username)}:${encodeURIComponent(connectionArg.password!)}@`;
|
|
115
|
+
private constructor(hostArg: string, usernameArg: string | undefined, passwordArg: string | undefined) {
|
|
116
|
+
const credentials = usernameArg === undefined ? ''
|
|
117
|
+
: `${encodeURIComponent(usernameArg)}:${encodeURIComponent(passwordArg!)}@`;
|
|
77
118
|
this.#descriptor = Object.freeze({
|
|
78
119
|
mongoDbName: this.#name,
|
|
79
|
-
mongoDbUrl: `mongodb://${credentials}${
|
|
120
|
+
mongoDbUrl: `mongodb://${credentials}${hostArg}/?directConnection=true&authSource=admin`,
|
|
80
121
|
});
|
|
81
122
|
this.db = new SmartdataDb(this.#descriptor);
|
|
82
123
|
}
|
|
83
124
|
|
|
84
125
|
public static async create(optionsArg: ISmartdataTestDatabaseOptions): Promise<SmartdataTestDatabase> {
|
|
85
126
|
const options = assertDataOptions(optionsArg, ['connection', 'timeoutMs', 'signal']);
|
|
86
|
-
const connection = assertDataOptions(options.connection, ['host', 'port', 'username', 'password']);
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
((connection.username === undefined) !== (connection.password === undefined)) ||
|
|
92
|
-
[connection.username, connection.password].some((valueArg) => valueArg !== undefined &&
|
|
127
|
+
const connection = assertDataOptions(options.connection, ['host', 'port', 'socketPath', 'username', 'password']);
|
|
128
|
+
const { username, password } = connection;
|
|
129
|
+
const host = connectionHost(connection);
|
|
130
|
+
if (host === undefined || ((username === undefined) !== (password === undefined)) ||
|
|
131
|
+
[username, password].some((valueArg) => valueArg !== undefined &&
|
|
93
132
|
(typeof valueArg !== 'string' || valueArg.length < 1 || valueArg.length > 1024))) {
|
|
94
|
-
throw new SmartdataPersistenceError('invalid_argument',
|
|
133
|
+
throw new SmartdataPersistenceError('invalid_argument',
|
|
134
|
+
'An explicit loopback host and port or unix socket path, and an optional credential pair, are required.');
|
|
95
135
|
}
|
|
96
136
|
const budget = new SmartdataOperationBudget(options.timeoutMs ?? 5000, options.signal);
|
|
97
137
|
let fixture: SmartdataTestDatabase | undefined;
|
|
98
138
|
try {
|
|
99
139
|
budget.check();
|
|
100
|
-
fixture = new SmartdataTestDatabase(
|
|
140
|
+
fixture = new SmartdataTestDatabase(host, username as string | undefined, password as string | undefined);
|
|
101
141
|
await fixture.db.init({ timeoutMs: budget.remainingMs(), signal: budget.signal });
|
|
102
142
|
const databases = await fixture.db.mongoDb.admin().listDatabases({
|
|
103
143
|
filter: { name: fixture.#name }, nameOnly: true, authorizedDatabases: false,
|