@lossless.org/client 1.20.0 → 1.20.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.
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/nosqldb/classes.db.js +8 -21
- package/dist_ts/nosqldb/connectionstring.d.ts +15 -0
- package/dist_ts/nosqldb/connectionstring.js +194 -0
- package/package.json +1 -1
- package/readme.md +1 -1
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/nosqldb/classes.db.ts +11 -22
- package/ts/nosqldb/connectionstring.ts +243 -0
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@lossless.org/client',
|
|
6
|
-
version: '1.20.
|
|
6
|
+
version: '1.20.1',
|
|
7
7
|
description: 'One typed client for NoSQLDB, MongoDB, SQLDB, MariaDB, ClickHouse and S3 object storage.'
|
|
8
8
|
};
|
|
9
9
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSxzQkFBc0I7SUFDNUIsT0FBTyxFQUFFLFFBQVE7SUFDakIsV0FBVyxFQUFFLDBGQUEwRjtDQUN4RyxDQUFBIn0=
|
|
@@ -9,6 +9,7 @@ import { inspectSmartdataNamespace, } from './classes.namespaceinspection.js';
|
|
|
9
9
|
import { addSmartdataWriteObserver, } from './classes.writeobserver.js';
|
|
10
10
|
export { SmartdataSession } from './classes.session.js';
|
|
11
11
|
import { logger } from './logging.js';
|
|
12
|
+
import { buildSmartdataConnectionUrl, redactSmartdataConnectionError } from './connectionstring.js';
|
|
12
13
|
import { assertDataOptions, SmartdataOperationBudget } from './classes.operationbudget.js';
|
|
13
14
|
import { composeSmartdataCapabilities, probeSmartdataEngineIdentity, smartdataCompositeGrouping, smartdataEngineBackend, unidentifiedSmartdataEngine, } from './engineidentity.js';
|
|
14
15
|
const readinessDefaultTimeoutMs = 2_000;
|
|
@@ -96,26 +97,11 @@ export class SmartdataDb {
|
|
|
96
97
|
}
|
|
97
98
|
this.beginLifecycleOperation('init');
|
|
98
99
|
this.transitionLifecycle('connecting');
|
|
100
|
+
// Read once, so a failure is redacted with the credentials this attempt connected with.
|
|
101
|
+
const descriptor = this.smartdataOptions;
|
|
99
102
|
let candidateClient;
|
|
100
103
|
try {
|
|
101
104
|
try {
|
|
102
|
-
// Safely encode credentials to handle special characters
|
|
103
|
-
const encodedUser = this.smartdataOptions.mongoDbUser
|
|
104
|
-
? encodeURIComponent(this.smartdataOptions.mongoDbUser)
|
|
105
|
-
: '';
|
|
106
|
-
const encodedPass = this.smartdataOptions.mongoDbPass
|
|
107
|
-
? encodeURIComponent(this.smartdataOptions.mongoDbPass)
|
|
108
|
-
: '';
|
|
109
|
-
const finalConnectionUrl = this.smartdataOptions.mongoDbUrl
|
|
110
|
-
.replace('<USERNAME>', encodedUser)
|
|
111
|
-
.replace('<username>', encodedUser)
|
|
112
|
-
.replace('<USER>', encodedUser)
|
|
113
|
-
.replace('<user>', encodedUser)
|
|
114
|
-
.replace('<PASSWORD>', encodedPass)
|
|
115
|
-
.replace('<password>', encodedPass)
|
|
116
|
-
.replace('<DBNAME>', this.smartdataOptions.mongoDbName || '')
|
|
117
|
-
.replace('<dbname>', this.smartdataOptions.mongoDbName || '');
|
|
118
|
-
const descriptor = this.smartdataOptions;
|
|
119
105
|
const clientOptions = {
|
|
120
106
|
maxPoolSize: descriptor.maxPoolSize ?? 100,
|
|
121
107
|
maxIdleTimeMS: descriptor.maxIdleTimeMS ?? 300000,
|
|
@@ -124,7 +110,7 @@ export class SmartdataDb {
|
|
|
124
110
|
socketTimeoutMS: descriptor.socketTimeoutMS ?? 30000,
|
|
125
111
|
retryWrites: true,
|
|
126
112
|
};
|
|
127
|
-
candidateClient = new plugins.mongodb.MongoClient(
|
|
113
|
+
candidateClient = new plugins.mongodb.MongoClient(buildSmartdataConnectionUrl(descriptor), clientOptions);
|
|
128
114
|
this.pendingClient = candidateClient;
|
|
129
115
|
const connectingClient = candidateClient;
|
|
130
116
|
let cancellationCleanup;
|
|
@@ -183,9 +169,10 @@ export class SmartdataDb {
|
|
|
183
169
|
? 'SmartData connection setup and cleanup failed; close must be retried.'
|
|
184
170
|
: 'SmartData connection setup failed or was cancelled.');
|
|
185
171
|
}
|
|
172
|
+
const setupError = new SmartdataPersistenceError('unsupported_operation', 'SmartData connection setup failed.', { cause: redactSmartdataConnectionError(error, descriptor) });
|
|
186
173
|
if (cleanupError)
|
|
187
|
-
throw new AggregateError([
|
|
188
|
-
throw
|
|
174
|
+
throw new AggregateError([setupError, redactSmartdataConnectionError(cleanupError, descriptor)], 'SmartData connection setup and cleanup failed; close must be retried.');
|
|
175
|
+
throw setupError;
|
|
189
176
|
}
|
|
190
177
|
}
|
|
191
178
|
finally {
|
|
@@ -511,4 +498,4 @@ export class SmartdataDb {
|
|
|
511
498
|
};
|
|
512
499
|
}
|
|
513
500
|
}
|
|
514
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.db.js","sourceRoot":"","sources":["../../ts/nosqldb/classes.db.ts"],"names":[],"mappings":"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"}
|
|
501
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.db.js","sourceRoot":"","sources":["../../ts/nosqldb/classes.db.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import type { ISmartdataDbOptions } from './classes.db.js';
|
|
2
|
+
/** The options that locate and authenticate a database: everything a connection string is built from. */
|
|
3
|
+
export type TSmartdataConnectionStringOptions = Pick<ISmartdataDbOptions, 'mongoDbUrl' | 'mongoDbName' | 'mongoDbUser' | 'mongoDbPass'>;
|
|
4
|
+
/**
|
|
5
|
+
* The URL the driver connects with: `mongoDbUrl` with its first `<USERNAME>`/`<USER>`,
|
|
6
|
+
* `<PASSWORD>` and `<DBNAME>` placeholder of each case replaced by the URL-encoded
|
|
7
|
+
* user, password and the database name.
|
|
8
|
+
*/
|
|
9
|
+
export declare const buildSmartdataConnectionUrl: (optionsArg: TSmartdataConnectionStringOptions) => string;
|
|
10
|
+
/**
|
|
11
|
+
* What a connection failure may show: the driver's error, copied with every
|
|
12
|
+
* credential of the options replaced by `<redacted>`. The original is never
|
|
13
|
+
* attached, because printing an error prints its whole cause chain.
|
|
14
|
+
*/
|
|
15
|
+
export declare const redactSmartdataConnectionError: (thrownArg: unknown, optionsArg: TSmartdataConnectionStringOptions) => Error;
|
|
@@ -0,0 +1,194 @@
|
|
|
1
|
+
import * as plugins from './plugins.js';
|
|
2
|
+
const redactionMarker = '<redacted>';
|
|
3
|
+
/**
|
|
4
|
+
* The URL the driver connects with: `mongoDbUrl` with its first `<USERNAME>`/`<USER>`,
|
|
5
|
+
* `<PASSWORD>` and `<DBNAME>` placeholder of each case replaced by the URL-encoded
|
|
6
|
+
* user, password and the database name.
|
|
7
|
+
*/
|
|
8
|
+
export const buildSmartdataConnectionUrl = (optionsArg) => {
|
|
9
|
+
const encodedUser = optionsArg.mongoDbUser ? encodeURIComponent(optionsArg.mongoDbUser) : '';
|
|
10
|
+
const encodedPass = optionsArg.mongoDbPass ? encodeURIComponent(optionsArg.mongoDbPass) : '';
|
|
11
|
+
return optionsArg.mongoDbUrl
|
|
12
|
+
.replace('<USERNAME>', encodedUser)
|
|
13
|
+
.replace('<username>', encodedUser)
|
|
14
|
+
.replace('<USER>', encodedUser)
|
|
15
|
+
.replace('<user>', encodedUser)
|
|
16
|
+
.replace('<PASSWORD>', encodedPass)
|
|
17
|
+
.replace('<password>', encodedPass)
|
|
18
|
+
.replace('<DBNAME>', optionsArg.mongoDbName || '')
|
|
19
|
+
.replace('<dbname>', optionsArg.mongoDbName || '');
|
|
20
|
+
};
|
|
21
|
+
/**
|
|
22
|
+
* The URI options whose value is a secret, by the driver's option table
|
|
23
|
+
* (`mongodb/src/connection_string.ts` `OPTIONS`): the `auth` credentials, the
|
|
24
|
+
* `authMechanismProperties` (for example `AWS_SESSION_TOKEN`), the SOCKS5 proxy
|
|
25
|
+
* login, the key file password, and the TLS key material the driver passes through.
|
|
26
|
+
* Lower-cased, because the driver reads option names case-insensitively.
|
|
27
|
+
*/
|
|
28
|
+
const secretUriOptionNames = new Set([
|
|
29
|
+
'auth',
|
|
30
|
+
'authMechanismProperties',
|
|
31
|
+
'proxyUsername',
|
|
32
|
+
'proxyPassword',
|
|
33
|
+
'tlsCertificateKeyFilePassword',
|
|
34
|
+
'key',
|
|
35
|
+
'passphrase',
|
|
36
|
+
'pfx',
|
|
37
|
+
].map((nameArg) => nameArg.toLowerCase()));
|
|
38
|
+
/** Its value is a `KEY:value,KEY:value` list, and the driver quotes single values of it. */
|
|
39
|
+
const mechanismPropertiesOptionName = 'authmechanismproperties';
|
|
40
|
+
/**
|
|
41
|
+
* The `authMechanismProperties` entries whose value is a secret, by the driver's
|
|
42
|
+
* `AuthMechanismProperties` (`mongodb/src/cmap/auth/mongo_credentials.ts`).
|
|
43
|
+
*/
|
|
44
|
+
const secretMechanismPropertyNames = new Set(['AWS_SESSION_TOKEN']);
|
|
45
|
+
/** A credential as written, URL-encoded, URL-decoded and query-decoded: a driver message may quote any of them. */
|
|
46
|
+
const spellingsOf = (credentialArg) => [
|
|
47
|
+
credentialArg,
|
|
48
|
+
...[
|
|
49
|
+
encodeURIComponent,
|
|
50
|
+
decodeURIComponent,
|
|
51
|
+
(textArg) => decodeURIComponent(textArg.replaceAll('+', ' ')),
|
|
52
|
+
].flatMap((transformArg) => {
|
|
53
|
+
try {
|
|
54
|
+
return [transformArg(credentialArg)];
|
|
55
|
+
}
|
|
56
|
+
catch {
|
|
57
|
+
// A spelling the credential cannot be transformed into cannot be quoted either.
|
|
58
|
+
return [];
|
|
59
|
+
}
|
|
60
|
+
}),
|
|
61
|
+
];
|
|
62
|
+
/**
|
|
63
|
+
* The userinfo of a connection string, as a whole and as its user and password halves.
|
|
64
|
+
* A string the driver refuses is malformed by definition, so it is read generously:
|
|
65
|
+
* everything between `://` and the last `@`.
|
|
66
|
+
*/
|
|
67
|
+
const userinfoCredentialsOf = (urlArg) => {
|
|
68
|
+
const userinfo = /^[^:/?#]*:\/\/(.*)@/s.exec(urlArg)?.[1];
|
|
69
|
+
if (userinfo === undefined)
|
|
70
|
+
return [];
|
|
71
|
+
const separator = userinfo.indexOf(':');
|
|
72
|
+
return separator < 0
|
|
73
|
+
? [userinfo]
|
|
74
|
+
: [userinfo, userinfo.slice(0, separator), userinfo.slice(separator + 1)];
|
|
75
|
+
};
|
|
76
|
+
/**
|
|
77
|
+
* The `name=value` pairs of a connection string's query, read generously: a pair
|
|
78
|
+
* starts after any `?`, `&` or `;`, and its value runs to the next `&`, as the driver
|
|
79
|
+
* splits, and also to the next `;`, the legacy separator, so both readings are covered.
|
|
80
|
+
*/
|
|
81
|
+
const uriOptionsOf = (urlArg) => [...urlArg.matchAll(/(?<=[?&;])([^?&;=]*)=(?=([^&]*))/g)].flatMap(([, name, value]) => [value, value.split(';')[0]].map((valueArg) => ({ name, value: valueArg })));
|
|
82
|
+
/** The secret entry values in every spelling of an `authMechanismProperties` value, split as the driver splits it. */
|
|
83
|
+
const secretMechanismPropertyValuesOf = (valueArg) => spellingsOf(valueArg).flatMap((spellingArg) => spellingArg.split(',').flatMap((entryArg) => {
|
|
84
|
+
const separator = entryArg.indexOf(':');
|
|
85
|
+
return separator >= 0 && secretMechanismPropertyNames.has(entryArg.slice(0, separator).toUpperCase())
|
|
86
|
+
? [entryArg.slice(separator + 1)]
|
|
87
|
+
: [];
|
|
88
|
+
}));
|
|
89
|
+
/** The values of a connection string's secret-bearing URI options, under any spelling of their name. */
|
|
90
|
+
const uriOptionCredentialsOf = (urlArg) => uriOptionsOf(urlArg).flatMap(({ name, value }) => {
|
|
91
|
+
const names = spellingsOf(name).map((spellingArg) => spellingArg.toLowerCase());
|
|
92
|
+
if (!names.some((nameArg) => secretUriOptionNames.has(nameArg)))
|
|
93
|
+
return [];
|
|
94
|
+
return names.includes(mechanismPropertiesOptionName) ? [value, ...secretMechanismPropertyValuesOf(value)] : [value];
|
|
95
|
+
});
|
|
96
|
+
/**
|
|
97
|
+
* Every credential spelling the options carry, in the connection string as given and as
|
|
98
|
+
* built, longest first so the longest credential starting at a position is the one found.
|
|
99
|
+
*/
|
|
100
|
+
const connectionCredentialsOf = (optionsArg) => {
|
|
101
|
+
const credentials = [
|
|
102
|
+
...[optionsArg.mongoDbUrl, buildSmartdataConnectionUrl(optionsArg)].flatMap((urlArg) => [
|
|
103
|
+
...userinfoCredentialsOf(urlArg),
|
|
104
|
+
...uriOptionCredentialsOf(urlArg),
|
|
105
|
+
]),
|
|
106
|
+
optionsArg.mongoDbUser,
|
|
107
|
+
optionsArg.mongoDbPass,
|
|
108
|
+
].filter((credentialArg) => Boolean(credentialArg));
|
|
109
|
+
return [...new Set(credentials.flatMap(spellingsOf))]
|
|
110
|
+
.filter((spellingArg) => spellingArg.length > 0)
|
|
111
|
+
.sort((leftArg, rightArg) => rightArg.length - leftArg.length);
|
|
112
|
+
};
|
|
113
|
+
// `RegExp.escape` is ES2025, beyond the ES2024 target.
|
|
114
|
+
const escapeRegExp = (textArg) => textArg.replace(/[\\^$.*+?()[\]{}|]/g, '\\$&');
|
|
115
|
+
/**
|
|
116
|
+
* Where credentials occur in a text, overlapping occurrences merged into one span.
|
|
117
|
+
* The pattern only looks ahead, so it reports every start, overlapping ones included.
|
|
118
|
+
*/
|
|
119
|
+
const credentialSpansIn = (textArg, occurrenceArg) => {
|
|
120
|
+
const spans = [];
|
|
121
|
+
for (const { index, 1: credential } of textArg.matchAll(occurrenceArg)) {
|
|
122
|
+
const end = index + credential.length;
|
|
123
|
+
const previous = spans.at(-1);
|
|
124
|
+
if (previous !== undefined && index < previous.end)
|
|
125
|
+
previous.end = Math.max(previous.end, end);
|
|
126
|
+
else
|
|
127
|
+
spans.push({ start: index, end });
|
|
128
|
+
}
|
|
129
|
+
return spans;
|
|
130
|
+
};
|
|
131
|
+
const withSpansRedacted = (textArg, spansArg) => {
|
|
132
|
+
let redacted = '';
|
|
133
|
+
let copiedUntil = 0;
|
|
134
|
+
for (const { start, end } of spansArg) {
|
|
135
|
+
redacted += textArg.slice(copiedUntil, start) + redactionMarker;
|
|
136
|
+
copiedUntil = end;
|
|
137
|
+
}
|
|
138
|
+
return redacted + textArg.slice(copiedUntil);
|
|
139
|
+
};
|
|
140
|
+
/**
|
|
141
|
+
* Redacts in one pass over the original text, so no credential is matched inside
|
|
142
|
+
* a marker another credential left and overlapping credentials leave no fragment.
|
|
143
|
+
*/
|
|
144
|
+
const redactorFor = (credentialsArg) => {
|
|
145
|
+
if (credentialsArg.length === 0)
|
|
146
|
+
return (textArg) => textArg;
|
|
147
|
+
const occurrence = new RegExp(`(?=(${credentialsArg.map(escapeRegExp).join('|')}))`, 'g');
|
|
148
|
+
return (textArg) => withSpansRedacted(textArg, credentialSpansIn(textArg, occurrence));
|
|
149
|
+
};
|
|
150
|
+
/** Only these named fields: any other field, such as Node's `ERR_INVALID_URL` `input`, may hold the connection string. */
|
|
151
|
+
const preservedFieldsOf = (errorArg, redactArg) => {
|
|
152
|
+
const fields = {};
|
|
153
|
+
const code = 'code' in errorArg ? errorArg.code : undefined;
|
|
154
|
+
if (typeof code === 'number')
|
|
155
|
+
fields.code = code;
|
|
156
|
+
if (typeof code === 'string')
|
|
157
|
+
fields.code = redactArg(code);
|
|
158
|
+
const codeName = 'codeName' in errorArg ? errorArg.codeName : undefined;
|
|
159
|
+
if (typeof codeName === 'string')
|
|
160
|
+
fields.codeName = redactArg(codeName);
|
|
161
|
+
if (errorArg instanceof plugins.mongodb.MongoError)
|
|
162
|
+
fields.errorLabels = errorArg.errorLabels.map(redactArg);
|
|
163
|
+
return fields;
|
|
164
|
+
};
|
|
165
|
+
/**
|
|
166
|
+
* A copy of a thrown value that keeps its error name, its detail, its stack frames,
|
|
167
|
+
* its preserved fields, its cause chain and its aggregated errors, with every
|
|
168
|
+
* credential replaced. Only an error that is its own ancestor is left out, so a
|
|
169
|
+
* cyclic chain still ends.
|
|
170
|
+
*/
|
|
171
|
+
const copyRedacted = (thrownArg, redactArg, ancestorsArg) => {
|
|
172
|
+
if (!(thrownArg instanceof Error))
|
|
173
|
+
return new Error(redactArg(String(thrownArg)));
|
|
174
|
+
ancestorsArg.add(thrownArg);
|
|
175
|
+
const copyInner = (innerArg) => innerArg instanceof Error && ancestorsArg.has(innerArg) ? [] : [copyRedacted(innerArg, redactArg, ancestorsArg)];
|
|
176
|
+
const [cause] = thrownArg.cause === undefined ? [] : copyInner(thrownArg.cause);
|
|
177
|
+
const options = cause === undefined ? undefined : { cause };
|
|
178
|
+
const message = redactArg(thrownArg.message);
|
|
179
|
+
const copy = thrownArg instanceof AggregateError
|
|
180
|
+
? new AggregateError(thrownArg.errors.flatMap((innerArg) => copyInner(innerArg)), message, options)
|
|
181
|
+
: new Error(message, options);
|
|
182
|
+
ancestorsArg.delete(thrownArg);
|
|
183
|
+
copy.name = redactArg(thrownArg.name);
|
|
184
|
+
if (thrownArg.stack !== undefined)
|
|
185
|
+
copy.stack = redactArg(thrownArg.stack);
|
|
186
|
+
return Object.assign(copy, preservedFieldsOf(thrownArg, redactArg));
|
|
187
|
+
};
|
|
188
|
+
/**
|
|
189
|
+
* What a connection failure may show: the driver's error, copied with every
|
|
190
|
+
* credential of the options replaced by `<redacted>`. The original is never
|
|
191
|
+
* attached, because printing an error prints its whole cause chain.
|
|
192
|
+
*/
|
|
193
|
+
export const redactSmartdataConnectionError = (thrownArg, optionsArg) => copyRedacted(thrownArg, redactorFor(connectionCredentialsOf(optionsArg)), new Set());
|
|
194
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"connectionstring.js","sourceRoot":"","sources":["../../ts/nosqldb/connectionstring.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/readme.md
CHANGED
|
@@ -223,7 +223,7 @@ SmartClickHouse migration changes: replace RxJS `next/complete` insertion with a
|
|
|
223
223
|
|
|
224
224
|
`@lossless.org/client/nosqldb` is a fork of @push.rocks/smartdata 11.14.2 (commit `9868817a63de72caef787bd8e68bac3deb9d6131`), taken on 2026-09-10; this repository continues that package's git history, so every upstream fix up to and including 11.14.2 is present here. `nosqldbLineage`, exported from the family entry point, carries the same baseline for runtime and tooling checks, and `docs/source/smartdata` keeps the upstream readme, hints and changelog.
|
|
225
225
|
|
|
226
|
-
The fork departs from that baseline in
|
|
226
|
+
The fork departs from that baseline in six places: `NoSqlConnection` adds the client backend, capability and readiness contract; the family entry point exports it together with `nosqldbLineage`; `watch()` refuses to open a change stream when the connected backend reports change streams as unsupported; `init()` identifies the engine and states the capabilities that identity implies; a failed `init()` rejects with `SmartdataPersistenceError` (`unsupported_operation`) instead of the driver's own error, and without a deadline carries that error as `cause`, copied with every connection credential redacted, so code that matched the driver's error class (`MongoServerSelectionError`, …) reads `cause.name` (a cleanup that fails as well makes the rejection an `AggregateError` of both); and two-field grouped totals are refused on a backend that does not group composite keys exactly. The package version file was dropped, because versioning belongs to `@lossless.org/client`. Document-model capabilities added after the fork — `$max`/`$min`, identity seeding through `$setOnInsert`, `atomicUpsertMany()` and `identityAsDocumentId` — are this package's own additions and have no upstream counterpart.
|
|
227
227
|
|
|
228
228
|
Fixes land here. @push.rocks/smartdata is no longer a release channel for this implementation, so a later upstream version is not a source to merge from and not an upgrade path for consumers of this package.
|
|
229
229
|
|
package/ts/00_commitinfo_data.ts
CHANGED
package/ts/nosqldb/classes.db.ts
CHANGED
|
@@ -40,6 +40,7 @@ export type {
|
|
|
40
40
|
} from './classes.writeobserver.js';
|
|
41
41
|
|
|
42
42
|
import { logger } from './logging.js';
|
|
43
|
+
import { buildSmartdataConnectionUrl, redactSmartdataConnectionError } from './connectionstring.js';
|
|
43
44
|
import { assertDataOptions, SmartdataOperationBudget } from './classes.operationbudget.js';
|
|
44
45
|
import {
|
|
45
46
|
composeSmartdataCapabilities,
|
|
@@ -258,28 +259,11 @@ export class SmartdataDb {
|
|
|
258
259
|
try { budget?.check(); } catch (errorArg) { budget?.close(); throw errorArg; }
|
|
259
260
|
this.beginLifecycleOperation('init');
|
|
260
261
|
this.transitionLifecycle('connecting');
|
|
262
|
+
// Read once, so a failure is redacted with the credentials this attempt connected with.
|
|
263
|
+
const descriptor = this.smartdataOptions;
|
|
261
264
|
let candidateClient: plugins.mongodb.MongoClient | undefined;
|
|
262
265
|
try {
|
|
263
266
|
try {
|
|
264
|
-
// Safely encode credentials to handle special characters
|
|
265
|
-
const encodedUser = this.smartdataOptions.mongoDbUser
|
|
266
|
-
? encodeURIComponent(this.smartdataOptions.mongoDbUser)
|
|
267
|
-
: '';
|
|
268
|
-
const encodedPass = this.smartdataOptions.mongoDbPass
|
|
269
|
-
? encodeURIComponent(this.smartdataOptions.mongoDbPass)
|
|
270
|
-
: '';
|
|
271
|
-
|
|
272
|
-
const finalConnectionUrl = this.smartdataOptions.mongoDbUrl
|
|
273
|
-
.replace('<USERNAME>', encodedUser)
|
|
274
|
-
.replace('<username>', encodedUser)
|
|
275
|
-
.replace('<USER>', encodedUser)
|
|
276
|
-
.replace('<user>', encodedUser)
|
|
277
|
-
.replace('<PASSWORD>', encodedPass)
|
|
278
|
-
.replace('<password>', encodedPass)
|
|
279
|
-
.replace('<DBNAME>', this.smartdataOptions.mongoDbName || '')
|
|
280
|
-
.replace('<dbname>', this.smartdataOptions.mongoDbName || '');
|
|
281
|
-
|
|
282
|
-
const descriptor = this.smartdataOptions;
|
|
283
267
|
const clientOptions: plugins.mongodb.MongoClientOptions = {
|
|
284
268
|
maxPoolSize: descriptor.maxPoolSize ?? 100,
|
|
285
269
|
maxIdleTimeMS: descriptor.maxIdleTimeMS ?? 300000,
|
|
@@ -290,7 +274,8 @@ export class SmartdataDb {
|
|
|
290
274
|
retryWrites: true,
|
|
291
275
|
};
|
|
292
276
|
|
|
293
|
-
candidateClient = new plugins.mongodb.MongoClient(
|
|
277
|
+
candidateClient = new plugins.mongodb.MongoClient(
|
|
278
|
+
buildSmartdataConnectionUrl(descriptor), clientOptions);
|
|
294
279
|
this.pendingClient = candidateClient;
|
|
295
280
|
const connectingClient = candidateClient;
|
|
296
281
|
let cancellationCleanup: Promise<void> | undefined;
|
|
@@ -347,9 +332,13 @@ export class SmartdataDb {
|
|
|
347
332
|
? 'SmartData connection setup and cleanup failed; close must be retried.'
|
|
348
333
|
: 'SmartData connection setup failed or was cancelled.');
|
|
349
334
|
}
|
|
350
|
-
|
|
335
|
+
const setupError = new SmartdataPersistenceError('unsupported_operation',
|
|
336
|
+
'SmartData connection setup failed.',
|
|
337
|
+
{ cause: redactSmartdataConnectionError(error, descriptor) });
|
|
338
|
+
if (cleanupError) throw new AggregateError(
|
|
339
|
+
[setupError, redactSmartdataConnectionError(cleanupError, descriptor)],
|
|
351
340
|
'SmartData connection setup and cleanup failed; close must be retried.');
|
|
352
|
-
throw
|
|
341
|
+
throw setupError;
|
|
353
342
|
}
|
|
354
343
|
} finally {
|
|
355
344
|
this.endLifecycleOperation('init');
|
|
@@ -0,0 +1,243 @@
|
|
|
1
|
+
import * as plugins from './plugins.js';
|
|
2
|
+
import type { ISmartdataDbOptions } from './classes.db.js';
|
|
3
|
+
|
|
4
|
+
/** The options that locate and authenticate a database: everything a connection string is built from. */
|
|
5
|
+
export type TSmartdataConnectionStringOptions = Pick<
|
|
6
|
+
ISmartdataDbOptions,
|
|
7
|
+
'mongoDbUrl' | 'mongoDbName' | 'mongoDbUser' | 'mongoDbPass'
|
|
8
|
+
>;
|
|
9
|
+
|
|
10
|
+
const redactionMarker = '<redacted>';
|
|
11
|
+
|
|
12
|
+
/**
|
|
13
|
+
* The URL the driver connects with: `mongoDbUrl` with its first `<USERNAME>`/`<USER>`,
|
|
14
|
+
* `<PASSWORD>` and `<DBNAME>` placeholder of each case replaced by the URL-encoded
|
|
15
|
+
* user, password and the database name.
|
|
16
|
+
*/
|
|
17
|
+
export const buildSmartdataConnectionUrl = (optionsArg: TSmartdataConnectionStringOptions): string => {
|
|
18
|
+
const encodedUser = optionsArg.mongoDbUser ? encodeURIComponent(optionsArg.mongoDbUser) : '';
|
|
19
|
+
const encodedPass = optionsArg.mongoDbPass ? encodeURIComponent(optionsArg.mongoDbPass) : '';
|
|
20
|
+
return optionsArg.mongoDbUrl
|
|
21
|
+
.replace('<USERNAME>', encodedUser)
|
|
22
|
+
.replace('<username>', encodedUser)
|
|
23
|
+
.replace('<USER>', encodedUser)
|
|
24
|
+
.replace('<user>', encodedUser)
|
|
25
|
+
.replace('<PASSWORD>', encodedPass)
|
|
26
|
+
.replace('<password>', encodedPass)
|
|
27
|
+
.replace('<DBNAME>', optionsArg.mongoDbName || '')
|
|
28
|
+
.replace('<dbname>', optionsArg.mongoDbName || '');
|
|
29
|
+
};
|
|
30
|
+
|
|
31
|
+
/** Replaces every credential in a text an error carries. */
|
|
32
|
+
type TRedact = (textArg: string) => string;
|
|
33
|
+
|
|
34
|
+
/**
|
|
35
|
+
* The URI options whose value is a secret, by the driver's option table
|
|
36
|
+
* (`mongodb/src/connection_string.ts` `OPTIONS`): the `auth` credentials, the
|
|
37
|
+
* `authMechanismProperties` (for example `AWS_SESSION_TOKEN`), the SOCKS5 proxy
|
|
38
|
+
* login, the key file password, and the TLS key material the driver passes through.
|
|
39
|
+
* Lower-cased, because the driver reads option names case-insensitively.
|
|
40
|
+
*/
|
|
41
|
+
const secretUriOptionNames = new Set(
|
|
42
|
+
[
|
|
43
|
+
'auth',
|
|
44
|
+
'authMechanismProperties',
|
|
45
|
+
'proxyUsername',
|
|
46
|
+
'proxyPassword',
|
|
47
|
+
'tlsCertificateKeyFilePassword',
|
|
48
|
+
'key',
|
|
49
|
+
'passphrase',
|
|
50
|
+
'pfx',
|
|
51
|
+
].map((nameArg) => nameArg.toLowerCase()),
|
|
52
|
+
);
|
|
53
|
+
|
|
54
|
+
/** Its value is a `KEY:value,KEY:value` list, and the driver quotes single values of it. */
|
|
55
|
+
const mechanismPropertiesOptionName = 'authmechanismproperties';
|
|
56
|
+
|
|
57
|
+
/**
|
|
58
|
+
* The `authMechanismProperties` entries whose value is a secret, by the driver's
|
|
59
|
+
* `AuthMechanismProperties` (`mongodb/src/cmap/auth/mongo_credentials.ts`).
|
|
60
|
+
*/
|
|
61
|
+
const secretMechanismPropertyNames = new Set(['AWS_SESSION_TOKEN']);
|
|
62
|
+
|
|
63
|
+
/** A credential as written, URL-encoded, URL-decoded and query-decoded: a driver message may quote any of them. */
|
|
64
|
+
const spellingsOf = (credentialArg: string): string[] => [
|
|
65
|
+
credentialArg,
|
|
66
|
+
...[
|
|
67
|
+
encodeURIComponent,
|
|
68
|
+
decodeURIComponent,
|
|
69
|
+
(textArg: string) => decodeURIComponent(textArg.replaceAll('+', ' ')),
|
|
70
|
+
].flatMap((transformArg) => {
|
|
71
|
+
try {
|
|
72
|
+
return [transformArg(credentialArg)];
|
|
73
|
+
} catch {
|
|
74
|
+
// A spelling the credential cannot be transformed into cannot be quoted either.
|
|
75
|
+
return [];
|
|
76
|
+
}
|
|
77
|
+
}),
|
|
78
|
+
];
|
|
79
|
+
|
|
80
|
+
/**
|
|
81
|
+
* The userinfo of a connection string, as a whole and as its user and password halves.
|
|
82
|
+
* A string the driver refuses is malformed by definition, so it is read generously:
|
|
83
|
+
* everything between `://` and the last `@`.
|
|
84
|
+
*/
|
|
85
|
+
const userinfoCredentialsOf = (urlArg: string): string[] => {
|
|
86
|
+
const userinfo = /^[^:/?#]*:\/\/(.*)@/s.exec(urlArg)?.[1];
|
|
87
|
+
if (userinfo === undefined) return [];
|
|
88
|
+
const separator = userinfo.indexOf(':');
|
|
89
|
+
return separator < 0
|
|
90
|
+
? [userinfo]
|
|
91
|
+
: [userinfo, userinfo.slice(0, separator), userinfo.slice(separator + 1)];
|
|
92
|
+
};
|
|
93
|
+
|
|
94
|
+
interface IUriOption {
|
|
95
|
+
name: string;
|
|
96
|
+
value: string;
|
|
97
|
+
}
|
|
98
|
+
|
|
99
|
+
/**
|
|
100
|
+
* The `name=value` pairs of a connection string's query, read generously: a pair
|
|
101
|
+
* starts after any `?`, `&` or `;`, and its value runs to the next `&`, as the driver
|
|
102
|
+
* splits, and also to the next `;`, the legacy separator, so both readings are covered.
|
|
103
|
+
*/
|
|
104
|
+
const uriOptionsOf = (urlArg: string): IUriOption[] =>
|
|
105
|
+
[...urlArg.matchAll(/(?<=[?&;])([^?&;=]*)=(?=([^&]*))/g)].flatMap(([, name, value]) =>
|
|
106
|
+
[value, value.split(';')[0]].map((valueArg) => ({ name, value: valueArg })),
|
|
107
|
+
);
|
|
108
|
+
|
|
109
|
+
/** The secret entry values in every spelling of an `authMechanismProperties` value, split as the driver splits it. */
|
|
110
|
+
const secretMechanismPropertyValuesOf = (valueArg: string): string[] =>
|
|
111
|
+
spellingsOf(valueArg).flatMap((spellingArg) =>
|
|
112
|
+
spellingArg.split(',').flatMap((entryArg) => {
|
|
113
|
+
const separator = entryArg.indexOf(':');
|
|
114
|
+
return separator >= 0 && secretMechanismPropertyNames.has(entryArg.slice(0, separator).toUpperCase())
|
|
115
|
+
? [entryArg.slice(separator + 1)]
|
|
116
|
+
: [];
|
|
117
|
+
}),
|
|
118
|
+
);
|
|
119
|
+
|
|
120
|
+
/** The values of a connection string's secret-bearing URI options, under any spelling of their name. */
|
|
121
|
+
const uriOptionCredentialsOf = (urlArg: string): string[] =>
|
|
122
|
+
uriOptionsOf(urlArg).flatMap(({ name, value }) => {
|
|
123
|
+
const names = spellingsOf(name).map((spellingArg) => spellingArg.toLowerCase());
|
|
124
|
+
if (!names.some((nameArg) => secretUriOptionNames.has(nameArg))) return [];
|
|
125
|
+
return names.includes(mechanismPropertiesOptionName) ? [value, ...secretMechanismPropertyValuesOf(value)] : [value];
|
|
126
|
+
});
|
|
127
|
+
|
|
128
|
+
/**
|
|
129
|
+
* Every credential spelling the options carry, in the connection string as given and as
|
|
130
|
+
* built, longest first so the longest credential starting at a position is the one found.
|
|
131
|
+
*/
|
|
132
|
+
const connectionCredentialsOf = (optionsArg: TSmartdataConnectionStringOptions): string[] => {
|
|
133
|
+
const credentials = [
|
|
134
|
+
...[optionsArg.mongoDbUrl, buildSmartdataConnectionUrl(optionsArg)].flatMap((urlArg) => [
|
|
135
|
+
...userinfoCredentialsOf(urlArg),
|
|
136
|
+
...uriOptionCredentialsOf(urlArg),
|
|
137
|
+
]),
|
|
138
|
+
optionsArg.mongoDbUser,
|
|
139
|
+
optionsArg.mongoDbPass,
|
|
140
|
+
].filter((credentialArg): credentialArg is string => Boolean(credentialArg));
|
|
141
|
+
return [...new Set(credentials.flatMap(spellingsOf))]
|
|
142
|
+
.filter((spellingArg) => spellingArg.length > 0)
|
|
143
|
+
.sort((leftArg, rightArg) => rightArg.length - leftArg.length);
|
|
144
|
+
};
|
|
145
|
+
|
|
146
|
+
// `RegExp.escape` is ES2025, beyond the ES2024 target.
|
|
147
|
+
const escapeRegExp = (textArg: string): string => textArg.replace(/[\\^$.*+?()[\]{}|]/g, '\\$&');
|
|
148
|
+
|
|
149
|
+
interface ISpan {
|
|
150
|
+
start: number;
|
|
151
|
+
end: number;
|
|
152
|
+
}
|
|
153
|
+
|
|
154
|
+
/**
|
|
155
|
+
* Where credentials occur in a text, overlapping occurrences merged into one span.
|
|
156
|
+
* The pattern only looks ahead, so it reports every start, overlapping ones included.
|
|
157
|
+
*/
|
|
158
|
+
const credentialSpansIn = (textArg: string, occurrenceArg: RegExp): ISpan[] => {
|
|
159
|
+
const spans: ISpan[] = [];
|
|
160
|
+
for (const { index, 1: credential } of textArg.matchAll(occurrenceArg)) {
|
|
161
|
+
const end = index + credential.length;
|
|
162
|
+
const previous = spans.at(-1);
|
|
163
|
+
if (previous !== undefined && index < previous.end) previous.end = Math.max(previous.end, end);
|
|
164
|
+
else spans.push({ start: index, end });
|
|
165
|
+
}
|
|
166
|
+
return spans;
|
|
167
|
+
};
|
|
168
|
+
|
|
169
|
+
const withSpansRedacted = (textArg: string, spansArg: readonly ISpan[]): string => {
|
|
170
|
+
let redacted = '';
|
|
171
|
+
let copiedUntil = 0;
|
|
172
|
+
for (const { start, end } of spansArg) {
|
|
173
|
+
redacted += textArg.slice(copiedUntil, start) + redactionMarker;
|
|
174
|
+
copiedUntil = end;
|
|
175
|
+
}
|
|
176
|
+
return redacted + textArg.slice(copiedUntil);
|
|
177
|
+
};
|
|
178
|
+
|
|
179
|
+
/**
|
|
180
|
+
* Redacts in one pass over the original text, so no credential is matched inside
|
|
181
|
+
* a marker another credential left and overlapping credentials leave no fragment.
|
|
182
|
+
*/
|
|
183
|
+
const redactorFor = (credentialsArg: readonly string[]): TRedact => {
|
|
184
|
+
if (credentialsArg.length === 0) return (textArg) => textArg;
|
|
185
|
+
const occurrence = new RegExp(`(?=(${credentialsArg.map(escapeRegExp).join('|')}))`, 'g');
|
|
186
|
+
return (textArg) => withSpansRedacted(textArg, credentialSpansIn(textArg, occurrence));
|
|
187
|
+
};
|
|
188
|
+
|
|
189
|
+
/** The fields a caller branches on: the driver's or Node's `code`, the server's `codeName`, the driver's error labels. */
|
|
190
|
+
interface IPreservedErrorFields {
|
|
191
|
+
code?: number | string;
|
|
192
|
+
codeName?: string;
|
|
193
|
+
errorLabels?: string[];
|
|
194
|
+
}
|
|
195
|
+
|
|
196
|
+
/** Only these named fields: any other field, such as Node's `ERR_INVALID_URL` `input`, may hold the connection string. */
|
|
197
|
+
const preservedFieldsOf = (errorArg: Error, redactArg: TRedact): IPreservedErrorFields => {
|
|
198
|
+
const fields: IPreservedErrorFields = {};
|
|
199
|
+
const code = 'code' in errorArg ? errorArg.code : undefined;
|
|
200
|
+
if (typeof code === 'number') fields.code = code;
|
|
201
|
+
if (typeof code === 'string') fields.code = redactArg(code);
|
|
202
|
+
const codeName = 'codeName' in errorArg ? errorArg.codeName : undefined;
|
|
203
|
+
if (typeof codeName === 'string') fields.codeName = redactArg(codeName);
|
|
204
|
+
if (errorArg instanceof plugins.mongodb.MongoError) fields.errorLabels = errorArg.errorLabels.map(redactArg);
|
|
205
|
+
return fields;
|
|
206
|
+
};
|
|
207
|
+
|
|
208
|
+
/**
|
|
209
|
+
* A copy of a thrown value that keeps its error name, its detail, its stack frames,
|
|
210
|
+
* its preserved fields, its cause chain and its aggregated errors, with every
|
|
211
|
+
* credential replaced. Only an error that is its own ancestor is left out, so a
|
|
212
|
+
* cyclic chain still ends.
|
|
213
|
+
*/
|
|
214
|
+
const copyRedacted = (
|
|
215
|
+
thrownArg: unknown,
|
|
216
|
+
redactArg: TRedact,
|
|
217
|
+
ancestorsArg: Set<Error>,
|
|
218
|
+
): Error => {
|
|
219
|
+
if (!(thrownArg instanceof Error)) return new Error(redactArg(String(thrownArg)));
|
|
220
|
+
ancestorsArg.add(thrownArg);
|
|
221
|
+
const copyInner = (innerArg: unknown): Error[] =>
|
|
222
|
+
innerArg instanceof Error && ancestorsArg.has(innerArg) ? [] : [copyRedacted(innerArg, redactArg, ancestorsArg)];
|
|
223
|
+
const [cause] = thrownArg.cause === undefined ? [] : copyInner(thrownArg.cause);
|
|
224
|
+
const options = cause === undefined ? undefined : { cause };
|
|
225
|
+
const message = redactArg(thrownArg.message);
|
|
226
|
+
const copy = thrownArg instanceof AggregateError
|
|
227
|
+
? new AggregateError(thrownArg.errors.flatMap((innerArg: unknown) => copyInner(innerArg)), message, options)
|
|
228
|
+
: new Error(message, options);
|
|
229
|
+
ancestorsArg.delete(thrownArg);
|
|
230
|
+
copy.name = redactArg(thrownArg.name);
|
|
231
|
+
if (thrownArg.stack !== undefined) copy.stack = redactArg(thrownArg.stack);
|
|
232
|
+
return Object.assign(copy, preservedFieldsOf(thrownArg, redactArg));
|
|
233
|
+
};
|
|
234
|
+
|
|
235
|
+
/**
|
|
236
|
+
* What a connection failure may show: the driver's error, copied with every
|
|
237
|
+
* credential of the options replaced by `<redacted>`. The original is never
|
|
238
|
+
* attached, because printing an error prints its whole cause chain.
|
|
239
|
+
*/
|
|
240
|
+
export const redactSmartdataConnectionError = (
|
|
241
|
+
thrownArg: unknown,
|
|
242
|
+
optionsArg: TSmartdataConnectionStringOptions,
|
|
243
|
+
): Error => copyRedacted(thrownArg, redactorFor(connectionCredentialsOf(optionsArg)), new Set());
|