callman-core 1.40.0 → 1.42.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/host/db/dbPool.d.ts +94 -0
- package/dist/host/db/dbPool.d.ts.map +1 -0
- package/dist/host/db/dbPool.js +258 -0
- package/dist/host/db/dbPool.js.map +1 -0
- package/dist/host/db/dbTimings.d.ts +13 -0
- package/dist/host/db/dbTimings.d.ts.map +1 -0
- package/dist/host/db/dbTimings.js +9 -0
- package/dist/host/db/dbTimings.js.map +1 -0
- package/dist/host/db/mongoAdapter.d.ts +2 -0
- package/dist/host/db/mongoAdapter.d.ts.map +1 -1
- package/dist/host/db/mongoAdapter.js +44 -3
- package/dist/host/db/mongoAdapter.js.map +1 -1
- package/dist/host/db/mssqlAdapter.d.ts +2 -0
- package/dist/host/db/mssqlAdapter.d.ts.map +1 -1
- package/dist/host/db/mssqlAdapter.js +75 -4
- package/dist/host/db/mssqlAdapter.js.map +1 -1
- package/dist/host/db/mysqlAdapter.d.ts +2 -0
- package/dist/host/db/mysqlAdapter.d.ts.map +1 -1
- package/dist/host/db/mysqlAdapter.js +83 -2
- package/dist/host/db/mysqlAdapter.js.map +1 -1
- package/dist/host/db/oracleAdapter.d.ts +2 -0
- package/dist/host/db/oracleAdapter.d.ts.map +1 -1
- package/dist/host/db/oracleAdapter.js +90 -0
- package/dist/host/db/oracleAdapter.js.map +1 -1
- package/dist/host/db/postgresAdapter.d.ts +2 -0
- package/dist/host/db/postgresAdapter.d.ts.map +1 -1
- package/dist/host/db/postgresAdapter.js +58 -1
- package/dist/host/db/postgresAdapter.js.map +1 -1
- package/dist/host/db/queryExecutor.d.ts +2 -0
- package/dist/host/db/queryExecutor.d.ts.map +1 -1
- package/dist/host/db/queryExecutor.js.map +1 -1
- package/dist/host/index.d.ts +2 -0
- package/dist/host/index.d.ts.map +1 -1
- package/dist/host/index.js +1 -0
- package/dist/host/index.js.map +1 -1
- package/dist/index.d.ts +1 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -0
- package/dist/index.js.map +1 -1
- package/dist/loadtest/from-collection.d.ts +8 -0
- package/dist/loadtest/from-collection.d.ts.map +1 -1
- package/dist/loadtest/from-collection.js +12 -2
- package/dist/loadtest/from-collection.js.map +1 -1
- package/dist/loadtest/index.d.ts +1 -1
- package/dist/loadtest/index.d.ts.map +1 -1
- package/dist/loadtest/index.js +1 -1
- package/dist/loadtest/index.js.map +1 -1
- package/dist/request/executeRequest.d.ts.map +1 -1
- package/dist/request/executeRequest.js +3 -1
- package/dist/request/executeRequest.js.map +1 -1
- package/dist/request/httpTimings.d.ts +10 -0
- package/dist/request/httpTimings.d.ts.map +1 -0
- package/dist/request/httpTimings.js +131 -0
- package/dist/request/httpTimings.js.map +1 -0
- package/dist/runner/applyRequestAuth.d.ts.map +1 -1
- package/dist/runner/applyRequestAuth.js +2 -1
- package/dist/runner/applyRequestAuth.js.map +1 -1
- package/dist/runner/requestRunner.d.ts.map +1 -1
- package/dist/runner/requestRunner.js +3 -2
- package/dist/runner/requestRunner.js.map +1 -1
- package/dist/runner/resolveInheritedAuth.d.ts +3 -0
- package/dist/runner/resolveInheritedAuth.d.ts.map +1 -0
- package/dist/runner/resolveInheritedAuth.js +16 -0
- package/dist/runner/resolveInheritedAuth.js.map +1 -0
- package/dist/runner/runCollection.d.ts.map +1 -1
- package/dist/runner/runCollection.js +1 -0
- package/dist/runner/runCollection.js.map +1 -1
- package/dist/script/executor.d.ts.map +1 -1
- package/dist/script/executor.js +28 -1
- package/dist/script/executor.js.map +1 -1
- package/dist/script/features/timers.d.ts +2 -0
- package/dist/script/features/timers.d.ts.map +1 -1
- package/dist/script/features/timers.js +23 -0
- package/dist/script/features/timers.js.map +1 -1
- package/dist/script/pm-api-declarations.js +1 -1
- package/dist/types/index.d.ts +25 -1
- package/dist/types/index.d.ts.map +1 -1
- package/dist-cjs/host/db/dbPool.js +272 -0
- package/dist-cjs/host/db/dbPool.js.map +1 -0
- package/dist-cjs/host/db/dbTimings.js +14 -0
- package/dist-cjs/host/db/dbTimings.js.map +1 -0
- package/dist-cjs/host/db/mongoAdapter.js +44 -3
- package/dist-cjs/host/db/mongoAdapter.js.map +1 -1
- package/dist-cjs/host/db/mssqlAdapter.js +75 -4
- package/dist-cjs/host/db/mssqlAdapter.js.map +1 -1
- package/dist-cjs/host/db/mysqlAdapter.js +83 -2
- package/dist-cjs/host/db/mysqlAdapter.js.map +1 -1
- package/dist-cjs/host/db/oracleAdapter.js +90 -0
- package/dist-cjs/host/db/oracleAdapter.js.map +1 -1
- package/dist-cjs/host/db/postgresAdapter.js +58 -1
- package/dist-cjs/host/db/postgresAdapter.js.map +1 -1
- package/dist-cjs/host/db/queryExecutor.js.map +1 -1
- package/dist-cjs/host/index.js +10 -2
- package/dist-cjs/host/index.js.map +1 -1
- package/dist-cjs/index.js +4 -2
- package/dist-cjs/index.js.map +1 -1
- package/dist-cjs/loadtest/from-collection.js +14 -3
- package/dist-cjs/loadtest/from-collection.js.map +1 -1
- package/dist-cjs/loadtest/index.js +2 -1
- package/dist-cjs/loadtest/index.js.map +1 -1
- package/dist-cjs/request/executeRequest.js +3 -1
- package/dist-cjs/request/executeRequest.js.map +1 -1
- package/dist-cjs/request/httpTimings.js +168 -0
- package/dist-cjs/request/httpTimings.js.map +1 -0
- package/dist-cjs/runner/applyRequestAuth.js +2 -1
- package/dist-cjs/runner/applyRequestAuth.js.map +1 -1
- package/dist-cjs/runner/requestRunner.js +3 -2
- package/dist-cjs/runner/requestRunner.js.map +1 -1
- package/dist-cjs/runner/resolveInheritedAuth.js +20 -0
- package/dist-cjs/runner/resolveInheritedAuth.js.map +1 -0
- package/dist-cjs/runner/runCollection.js +1 -0
- package/dist-cjs/runner/runCollection.js.map +1 -1
- package/dist-cjs/script/executor.js +28 -1
- package/dist-cjs/script/executor.js.map +1 -1
- package/dist-cjs/script/features/timers.js +23 -0
- package/dist-cjs/script/features/timers.js.map +1 -1
- package/dist-cjs/script/pm-api-declarations.js +1 -1
- package/package.json +1 -1
|
@@ -7,6 +7,8 @@
|
|
|
7
7
|
// the SQL text would risk corrupting string literals.
|
|
8
8
|
import { loadOptionalModule } from "../lazy.js";
|
|
9
9
|
import { stripTrailingSqlTerminator } from "./sqlNormalize.js";
|
|
10
|
+
import { emptyDbTimings, startDbTimer } from "./dbTimings.js";
|
|
11
|
+
import { acquirePooled, getDbPoolSettings, getOrCreateDbPool, isDbPoolingEnabled, isSessionMutatingStatement, markReleased, } from "./dbPool.js";
|
|
10
12
|
const unwrap = (mod) => mod && mod.default && typeof mod.ConnectionPool !== "function" ? mod.default : mod;
|
|
11
13
|
// Test-only seam (see mongoAdapter).
|
|
12
14
|
let mssqlDriverOverride = null;
|
|
@@ -95,26 +97,95 @@ export const testMssqlConnection = async (connection) => {
|
|
|
95
97
|
await pool.request().query("SELECT 1 AS ok");
|
|
96
98
|
});
|
|
97
99
|
};
|
|
100
|
+
const runMssqlStatement = async (pool, query, params) => {
|
|
101
|
+
const request = pool.request();
|
|
102
|
+
params.forEach((value, index) => {
|
|
103
|
+
request.input(`p${index + 1}`, value);
|
|
104
|
+
});
|
|
105
|
+
const result = await request.query(stripTrailingSqlTerminator(query, "mssql"));
|
|
106
|
+
const recordset = Array.isArray(result?.recordset) ? result.recordset : [];
|
|
107
|
+
if (recordset.length > 0 || result?.recordset) {
|
|
108
|
+
const rows = recordset.map(normalizeMssqlValue);
|
|
109
|
+
return { rows, rowCount: rows.length };
|
|
110
|
+
}
|
|
111
|
+
const affected = Array.isArray(result?.rowsAffected)
|
|
112
|
+
? result.rowsAffected.reduce((sum, count) => sum + count, 0)
|
|
113
|
+
: 0;
|
|
114
|
+
return { rows: [], rowCount: affected };
|
|
115
|
+
};
|
|
116
|
+
// Pooled path (configureDbPooling): one long-lived mssql ConnectionPool per
|
|
117
|
+
// connection identity (tarn hands out / heals the connections underneath).
|
|
118
|
+
// Session-changing statements keep using a private one-shot pool.
|
|
119
|
+
const executeMssqlQueryPooled = async (connection, query, params) => {
|
|
120
|
+
const settings = getDbPoolSettings();
|
|
121
|
+
const entry = await getOrCreateDbPool(connection, async () => {
|
|
122
|
+
const sql = await loadMssqlDriver();
|
|
123
|
+
const base = buildPoolConfig(connection);
|
|
124
|
+
const config = typeof base === "string"
|
|
125
|
+
? base
|
|
126
|
+
: {
|
|
127
|
+
...base,
|
|
128
|
+
pool: { max: settings.maxPerConnection, min: 0, idleTimeoutMillis: settings.idleTimeoutMs },
|
|
129
|
+
};
|
|
130
|
+
const pool = new sql.ConnectionPool(config);
|
|
131
|
+
pool.on("error", () => undefined);
|
|
132
|
+
await pool.connect();
|
|
133
|
+
return {
|
|
134
|
+
pool,
|
|
135
|
+
stats: () => ({ open: pool.size, idle: pool.available, waiting: pool.pending }),
|
|
136
|
+
close: () => pool.close(),
|
|
137
|
+
holdsProcess: true,
|
|
138
|
+
};
|
|
139
|
+
});
|
|
140
|
+
const timings = { ...emptyDbTimings(), pooled: true };
|
|
141
|
+
const { acquireMs } = await acquirePooled(entry, async () => entry.handle.pool, () => undefined);
|
|
142
|
+
timings.connectMs = acquireMs;
|
|
143
|
+
const queryTimer = startDbTimer();
|
|
144
|
+
try {
|
|
145
|
+
const result = await runMssqlStatement(entry.handle.pool, query, params);
|
|
146
|
+
timings.queryMs = queryTimer();
|
|
147
|
+
return { ...result, timings };
|
|
148
|
+
}
|
|
149
|
+
finally {
|
|
150
|
+
markReleased(entry, false);
|
|
151
|
+
}
|
|
152
|
+
};
|
|
98
153
|
export const executeMssqlQuery = async (connection, query, params = []) => {
|
|
99
154
|
if (GO_SEPARATOR.test(query)) {
|
|
100
155
|
throw new Error('T-SQL "GO" batch separators are not supported — send one statement per query.');
|
|
101
156
|
}
|
|
102
|
-
|
|
157
|
+
if (isDbPoolingEnabled() && !isSessionMutatingStatement(query)) {
|
|
158
|
+
return executeMssqlQueryPooled(connection, query, params);
|
|
159
|
+
}
|
|
160
|
+
const sql = await loadMssqlDriver();
|
|
161
|
+
const timings = emptyDbTimings();
|
|
162
|
+
const connectTimer = startDbTimer();
|
|
163
|
+
const pool = new sql.ConnectionPool(buildPoolConfig(connection));
|
|
164
|
+
try {
|
|
165
|
+
await pool.connect();
|
|
166
|
+
timings.connectMs = connectTimer();
|
|
167
|
+
const queryTimer = startDbTimer();
|
|
103
168
|
const request = pool.request();
|
|
104
169
|
params.forEach((value, index) => {
|
|
105
170
|
request.input(`p${index + 1}`, value);
|
|
106
171
|
});
|
|
107
172
|
const finalQuery = stripTrailingSqlTerminator(query, "mssql");
|
|
108
173
|
const result = await request.query(finalQuery);
|
|
174
|
+
timings.queryMs = queryTimer();
|
|
109
175
|
const recordset = Array.isArray(result?.recordset) ? result.recordset : [];
|
|
110
176
|
if (recordset.length > 0 || result?.recordset) {
|
|
111
177
|
const rows = recordset.map(normalizeMssqlValue);
|
|
112
|
-
return { rows, rowCount: rows.length };
|
|
178
|
+
return { rows, rowCount: rows.length, timings };
|
|
113
179
|
}
|
|
114
180
|
const affected = Array.isArray(result?.rowsAffected)
|
|
115
181
|
? result.rowsAffected.reduce((sum, count) => sum + count, 0)
|
|
116
182
|
: 0;
|
|
117
|
-
return { rows: [], rowCount: affected };
|
|
118
|
-
}
|
|
183
|
+
return { rows: [], rowCount: affected, timings };
|
|
184
|
+
}
|
|
185
|
+
finally {
|
|
186
|
+
const closeTimer = startDbTimer();
|
|
187
|
+
await pool.close();
|
|
188
|
+
timings.closeMs = closeTimer();
|
|
189
|
+
}
|
|
119
190
|
};
|
|
120
191
|
//# sourceMappingURL=mssqlAdapter.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mssqlAdapter.js","sourceRoot":"","sources":["../../../src/host/db/mssqlAdapter.ts"],"names":[],"mappings":"AAAA,2EAA2E;AAC3E,8EAA8E;AAC9E,qBAAqB;AACrB,EAAE;AACF,2EAA2E;AAC3E,4EAA4E;AAC5E,sDAAsD;AAEtD,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAEhD,OAAO,EAAE,0BAA0B,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"mssqlAdapter.js","sourceRoot":"","sources":["../../../src/host/db/mssqlAdapter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,11 @@
|
|
|
1
1
|
import type { DbConnection } from "./types.js";
|
|
2
|
+
import { type DbQueryTimings } from "./dbTimings.js";
|
|
2
3
|
export declare const __setMysqlDriverForTests: (driver: any | null) => void;
|
|
3
4
|
export declare const withMysqlConnection: <T>(connection: DbConnection, fn: (conn: any) => Promise<T>) => Promise<T>;
|
|
4
5
|
export declare const testMysqlConnection: (connection: DbConnection) => Promise<void>;
|
|
5
6
|
export declare const executeMysqlQuery: (connection: DbConnection, query: string, params?: unknown[]) => Promise<{
|
|
6
7
|
rows: unknown[];
|
|
7
8
|
rowCount: number;
|
|
9
|
+
timings?: DbQueryTimings;
|
|
8
10
|
}>;
|
|
9
11
|
//# sourceMappingURL=mysqlAdapter.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mysqlAdapter.d.ts","sourceRoot":"","sources":["../../../src/host/db/mysqlAdapter.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"mysqlAdapter.d.ts","sourceRoot":"","sources":["../../../src/host/db/mysqlAdapter.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE/C,OAAO,EAAgC,KAAK,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAenF,eAAO,MAAM,wBAAwB,GAAI,QAAQ,GAAG,GAAG,IAAI,KAAG,IAE7D,CAAC;AAsEF,eAAO,MAAM,mBAAmB,GAAU,CAAC,EAAG,YAAY,YAAY,EAAE,IAAI,CAAC,IAAI,EAAE,GAAG,KAAK,OAAO,CAAC,CAAC,CAAC,KAAG,OAAO,CAAC,CAAC,CAQhH,CAAC;AAEF,eAAO,MAAM,mBAAmB,GAAU,YAAY,YAAY,KAAG,OAAO,CAAC,IAAI,CAQhF,CAAC;AA+EF,eAAO,MAAM,iBAAiB,GAC5B,YAAY,YAAY,EACxB,OAAO,MAAM,EACb,SAAQ,OAAO,EAAO,KACrB,OAAO,CAAC;IAAE,IAAI,EAAE,OAAO,EAAE,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,cAAc,CAAA;CAAE,CA4BzE,CAAC"}
|
|
@@ -2,6 +2,8 @@
|
|
|
2
2
|
// lazy `mysql2/promise` loading via `loadOptionalModule`.
|
|
3
3
|
import { loadOptionalModule } from "../lazy.js";
|
|
4
4
|
import { stripTrailingSqlTerminator } from "./sqlNormalize.js";
|
|
5
|
+
import { emptyDbTimings, startDbTimer } from "./dbTimings.js";
|
|
6
|
+
import { acquirePooled, getDbPoolSettings, getOrCreateDbPool, isDbPoolingEnabled, isSessionMutatingStatement, markReleased, } from "./dbPool.js";
|
|
5
7
|
const unwrap = (mod) => mod && mod.default && typeof mod.createConnection !== "function" ? mod.default : mod;
|
|
6
8
|
// Test-only seam (see mongoAdapter).
|
|
7
9
|
let mysqlDriverOverride = null;
|
|
@@ -96,23 +98,102 @@ export const testMysqlConnection = async (connection) => {
|
|
|
96
98
|
await conn.end();
|
|
97
99
|
}
|
|
98
100
|
};
|
|
101
|
+
const toMysqlResult = (result) => {
|
|
102
|
+
if (Array.isArray(result)) {
|
|
103
|
+
const rows = result.map(normalizeMysqlValue);
|
|
104
|
+
return { rows, rowCount: rows.length };
|
|
105
|
+
}
|
|
106
|
+
const affected = result && typeof result.affectedRows === "number"
|
|
107
|
+
? result.affectedRows
|
|
108
|
+
: 0;
|
|
109
|
+
return { rows: [], rowCount: affected };
|
|
110
|
+
};
|
|
111
|
+
// Pooled path (configureDbPooling): one mysql2 pool per connection identity.
|
|
112
|
+
const executeMysqlQueryPooled = async (connection, query, params) => {
|
|
113
|
+
const settings = getDbPoolSettings();
|
|
114
|
+
const entry = await getOrCreateDbPool(connection, async () => {
|
|
115
|
+
const mysql = await loadMysqlDriver();
|
|
116
|
+
const pool = mysql.createPool({
|
|
117
|
+
...buildConnectionConfig(connection),
|
|
118
|
+
connectionLimit: settings.maxPerConnection,
|
|
119
|
+
maxIdle: settings.maxPerConnection,
|
|
120
|
+
idleTimeout: settings.idleTimeoutMs,
|
|
121
|
+
waitForConnections: true,
|
|
122
|
+
queueLimit: 0,
|
|
123
|
+
enableKeepAlive: true,
|
|
124
|
+
});
|
|
125
|
+
// mysql2 keeps its counters on the callback-API pool underneath.
|
|
126
|
+
const inner = pool.pool ?? {};
|
|
127
|
+
return {
|
|
128
|
+
pool,
|
|
129
|
+
stats: () => ({
|
|
130
|
+
open: inner._allConnections?.length,
|
|
131
|
+
idle: inner._freeConnections?.length,
|
|
132
|
+
waiting: inner._connectionQueue?.length,
|
|
133
|
+
}),
|
|
134
|
+
close: () => pool.end(),
|
|
135
|
+
};
|
|
136
|
+
});
|
|
137
|
+
const timings = { ...emptyDbTimings(), pooled: true };
|
|
138
|
+
const { connection: conn, acquireMs } = await acquirePooled(entry, () => entry.handle.pool.getConnection(), (late) => late.release());
|
|
139
|
+
timings.connectMs = acquireMs;
|
|
140
|
+
// An idle pooled socket is unref'd (it must not keep a short-lived host
|
|
141
|
+
// alive); a socket running a statement holds the process again.
|
|
142
|
+
const socket = conn.connection?.stream;
|
|
143
|
+
socket?.ref?.();
|
|
144
|
+
const destroyAfter = isSessionMutatingStatement(query);
|
|
145
|
+
let failed = false;
|
|
146
|
+
const queryTimer = startDbTimer();
|
|
147
|
+
try {
|
|
148
|
+
const finalQuery = stripTrailingSqlTerminator(query, "mysql");
|
|
149
|
+
const [result] = await conn.query(finalQuery, params);
|
|
150
|
+
timings.queryMs = queryTimer();
|
|
151
|
+
return { ...toMysqlResult(result), timings };
|
|
152
|
+
}
|
|
153
|
+
catch (error) {
|
|
154
|
+
failed = true;
|
|
155
|
+
throw error;
|
|
156
|
+
}
|
|
157
|
+
finally {
|
|
158
|
+
const closeTimer = startDbTimer();
|
|
159
|
+
if (failed || destroyAfter) {
|
|
160
|
+
conn.destroy();
|
|
161
|
+
}
|
|
162
|
+
else {
|
|
163
|
+
socket?.unref?.();
|
|
164
|
+
conn.release();
|
|
165
|
+
}
|
|
166
|
+
markReleased(entry, failed || destroyAfter);
|
|
167
|
+
timings.closeMs = closeTimer();
|
|
168
|
+
}
|
|
169
|
+
};
|
|
99
170
|
export const executeMysqlQuery = async (connection, query, params = []) => {
|
|
171
|
+
if (isDbPoolingEnabled()) {
|
|
172
|
+
return executeMysqlQueryPooled(connection, query, params);
|
|
173
|
+
}
|
|
100
174
|
const mysql = await loadMysqlDriver();
|
|
175
|
+
const timings = emptyDbTimings();
|
|
176
|
+
const connectTimer = startDbTimer();
|
|
101
177
|
const conn = await mysql.createConnection(buildConnectionConfig(connection));
|
|
178
|
+
timings.connectMs = connectTimer();
|
|
179
|
+
const queryTimer = startDbTimer();
|
|
102
180
|
try {
|
|
103
181
|
const finalQuery = stripTrailingSqlTerminator(query, "mysql");
|
|
104
182
|
const [result] = await conn.query(finalQuery, params);
|
|
183
|
+
timings.queryMs = queryTimer();
|
|
105
184
|
if (Array.isArray(result)) {
|
|
106
185
|
const rows = result.map(normalizeMysqlValue);
|
|
107
|
-
return { rows, rowCount: rows.length };
|
|
186
|
+
return { rows, rowCount: rows.length, timings };
|
|
108
187
|
}
|
|
109
188
|
const affected = result && typeof result.affectedRows === "number"
|
|
110
189
|
? result.affectedRows
|
|
111
190
|
: 0;
|
|
112
|
-
return { rows: [], rowCount: affected };
|
|
191
|
+
return { rows: [], rowCount: affected, timings };
|
|
113
192
|
}
|
|
114
193
|
finally {
|
|
194
|
+
const closeTimer = startDbTimer();
|
|
115
195
|
await conn.end();
|
|
196
|
+
timings.closeMs = closeTimer();
|
|
116
197
|
}
|
|
117
198
|
};
|
|
118
199
|
//# sourceMappingURL=mysqlAdapter.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mysqlAdapter.js","sourceRoot":"","sources":["../../../src/host/db/mysqlAdapter.ts"],"names":[],"mappings":"AAAA,6EAA6E;AAC7E,0DAA0D;AAE1D,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAEhD,OAAO,EAAE,0BAA0B,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"mysqlAdapter.js","sourceRoot":"","sources":["../../../src/host/db/mysqlAdapter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type { DbConnection } from "./types.js";
|
|
2
|
+
import { type DbQueryTimings } from "./dbTimings.js";
|
|
2
3
|
export declare const __setOracleDriverForTests: (driver: any | null) => void;
|
|
3
4
|
/** Thin mode met a server older than 12.1 — the Instant Client is needed. */
|
|
4
5
|
export declare const ORACLE_CLIENT_REQUIRED = "ORACLE_CLIENT_REQUIRED";
|
|
@@ -31,5 +32,6 @@ export declare const testOracleConnection: (connection: DbConnection) => Promise
|
|
|
31
32
|
export declare const executeOracleQuery: (connection: DbConnection, query: string) => Promise<{
|
|
32
33
|
rows: unknown[];
|
|
33
34
|
rowCount: number;
|
|
35
|
+
timings?: DbQueryTimings;
|
|
34
36
|
}>;
|
|
35
37
|
//# sourceMappingURL=oracleAdapter.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oracleAdapter.d.ts","sourceRoot":"","sources":["../../../src/host/db/oracleAdapter.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"oracleAdapter.d.ts","sourceRoot":"","sources":["../../../src/host/db/oracleAdapter.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAM/C,OAAO,EAAgC,KAAK,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAenF,eAAO,MAAM,yBAAyB,GAAI,QAAQ,GAAG,GAAG,IAAI,KAAG,IAE9D,CAAC;AAiBF,6EAA6E;AAC7E,eAAO,MAAM,sBAAsB,2BAA2B,CAAC;AAC/D,iFAAiF;AACjF,eAAO,MAAM,uBAAuB,4BAA4B,CAAC;AAEjE,MAAM,MAAM,qBAAqB,GAC7B,OAAO,sBAAsB,GAC7B,OAAO,uBAAuB,CAAC;AAEnC,gFAAgF;AAChF,qBAAa,iBAAkB,SAAQ,KAAK;IAC1C,QAAQ,CAAC,IAAI,EAAE,qBAAqB,CAAC;gBACzB,IAAI,EAAE,qBAAqB,EAAE,OAAO,EAAE,MAAM;CAKzD;AAED,eAAO,MAAM,wBAAwB,GACnC,OAAO,OAAO,KACb,qBAAqB,GAAG,SAK1B,CAAC;AAEF,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC;IACvB,gEAAgE;IAChE,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;CAC9B;AAED,eAAO,MAAM,mBAAmB,QAAa,OAAO,CAAC,gBAAgB,CAOpE,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,qBAAqB,GAChC,UAAS;IAAE,MAAM,CAAC,EAAE,MAAM,CAAA;CAAO,KAChC,OAAO,CAAC,gBAAgB,CAkB1B,CAAC;AA0HF,eAAO,MAAM,oBAAoB,GAAU,CAAC,EAC1C,YAAY,YAAY,EACxB,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,GAAG,KAAK,OAAO,CAAC,CAAC,CAAC,KAC7C,OAAO,CAAC,CAAC,CAiBX,CAAC;AAEF,eAAO,MAAM,oBAAoB,GAC/B,YAAY,YAAY,KACvB,OAAO,CAAC,IAAI,CAcd,CAAC;AAwFF,eAAO,MAAM,kBAAkB,GAC7B,YAAY,YAAY,EACxB,OAAO,MAAM,KACZ,OAAO,CAAC;IAAE,IAAI,EAAE,OAAO,EAAE,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,cAAc,CAAA;CAAE,CA2CzE,CAAC"}
|
|
@@ -9,6 +9,8 @@
|
|
|
9
9
|
import { loadOptionalModule } from "../lazy.js";
|
|
10
10
|
import { OracleConnectStringError, normalizeOracleConnectString, } from "./oracleConnectString.js";
|
|
11
11
|
import { stripTrailingSqlTerminator } from "./sqlNormalize.js";
|
|
12
|
+
import { emptyDbTimings, startDbTimer } from "./dbTimings.js";
|
|
13
|
+
import { acquirePooled, getDbPoolSettings, getOrCreateDbPool, isDbPoolingEnabled, isSessionMutatingStatement, markReleased, } from "./dbPool.js";
|
|
12
14
|
const unwrap = (mod) => (mod && mod.default ? mod.default : mod);
|
|
13
15
|
// Test-only seam (see mongoAdapter). Lets unit tests inject a fake oracledb
|
|
14
16
|
// driver across the package boundary, where module mocking can't reach.
|
|
@@ -206,8 +208,90 @@ export const testOracleConnection = async (connection) => {
|
|
|
206
208
|
}
|
|
207
209
|
await client.close();
|
|
208
210
|
};
|
|
211
|
+
const runOracleStatement = async (oracledb, client, query) => {
|
|
212
|
+
const finalQuery = stripTrailingSqlTerminator(query, "oracle");
|
|
213
|
+
const result = await client.execute(finalQuery, [], {
|
|
214
|
+
outFormat: oracledb.OUT_FORMAT_OBJECT,
|
|
215
|
+
// One statement per step, and a pooled connection must never carry an
|
|
216
|
+
// open transaction to the next run: commit every statement.
|
|
217
|
+
autoCommit: true,
|
|
218
|
+
});
|
|
219
|
+
const rows = Array.isArray(result.rows) ? result.rows.map(normalizeOracleValue) : [];
|
|
220
|
+
return {
|
|
221
|
+
rows,
|
|
222
|
+
rowCount: typeof result.rowsAffected === "number" ? result.rowsAffected : rows.length,
|
|
223
|
+
};
|
|
224
|
+
};
|
|
225
|
+
// Pooled path (configureDbPooling): one oracledb pool per connection identity.
|
|
226
|
+
// In Thick mode every pooled connection still runs its calls on the libuv
|
|
227
|
+
// thread pool, so poolMax beyond UV_THREADPOOL_SIZE only queues there.
|
|
228
|
+
const executeOracleQueryPooled = async (connection, query) => {
|
|
229
|
+
const settings = getDbPoolSettings();
|
|
230
|
+
const oracledb = await loadOracleDriver();
|
|
231
|
+
const entry = await getOrCreateDbPool(connection, async () => {
|
|
232
|
+
let pool;
|
|
233
|
+
try {
|
|
234
|
+
pool = await oracledb.createPool({
|
|
235
|
+
user: connection.username,
|
|
236
|
+
password: connection.password,
|
|
237
|
+
connectString: buildConnectString(connection),
|
|
238
|
+
poolMin: 0,
|
|
239
|
+
poolMax: settings.maxPerConnection,
|
|
240
|
+
poolIncrement: 1,
|
|
241
|
+
poolTimeout: Math.max(1, Math.ceil(settings.idleTimeoutMs / 1000)),
|
|
242
|
+
queueTimeout: settings.acquireTimeoutMs,
|
|
243
|
+
queueMax: -1,
|
|
244
|
+
});
|
|
245
|
+
}
|
|
246
|
+
catch (error) {
|
|
247
|
+
throw describeOracleError(error);
|
|
248
|
+
}
|
|
249
|
+
return {
|
|
250
|
+
pool,
|
|
251
|
+
stats: () => ({
|
|
252
|
+
open: pool.connectionsOpen,
|
|
253
|
+
idle: Math.max(0, pool.connectionsOpen - pool.connectionsInUse),
|
|
254
|
+
}),
|
|
255
|
+
close: () => pool.close(10),
|
|
256
|
+
holdsProcess: true,
|
|
257
|
+
};
|
|
258
|
+
});
|
|
259
|
+
const timings = { ...emptyDbTimings(), pooled: true };
|
|
260
|
+
let acquired;
|
|
261
|
+
try {
|
|
262
|
+
acquired = await acquirePooled(entry, () => entry.handle.pool.getConnection(), (late) => void late.close().catch(() => undefined));
|
|
263
|
+
}
|
|
264
|
+
catch (error) {
|
|
265
|
+
throw describeOracleError(error);
|
|
266
|
+
}
|
|
267
|
+
const client = acquired.connection;
|
|
268
|
+
timings.connectMs = acquired.acquireMs;
|
|
269
|
+
const destroyAfter = isSessionMutatingStatement(query);
|
|
270
|
+
let failed = false;
|
|
271
|
+
const queryTimer = startDbTimer();
|
|
272
|
+
try {
|
|
273
|
+
const result = await runOracleStatement(oracledb, client, query);
|
|
274
|
+
timings.queryMs = queryTimer();
|
|
275
|
+
return { ...result, timings };
|
|
276
|
+
}
|
|
277
|
+
catch (error) {
|
|
278
|
+
failed = true;
|
|
279
|
+
throw error;
|
|
280
|
+
}
|
|
281
|
+
finally {
|
|
282
|
+
const closeTimer = startDbTimer();
|
|
283
|
+
await client.close({ drop: failed || destroyAfter }).catch(() => undefined);
|
|
284
|
+
markReleased(entry, failed || destroyAfter);
|
|
285
|
+
timings.closeMs = closeTimer();
|
|
286
|
+
}
|
|
287
|
+
};
|
|
209
288
|
export const executeOracleQuery = async (connection, query) => {
|
|
289
|
+
if (isDbPoolingEnabled()) {
|
|
290
|
+
return executeOracleQueryPooled(connection, query);
|
|
291
|
+
}
|
|
210
292
|
const oracledb = await loadOracleDriver();
|
|
293
|
+
const timings = emptyDbTimings();
|
|
294
|
+
const connectTimer = startDbTimer();
|
|
211
295
|
let client;
|
|
212
296
|
try {
|
|
213
297
|
client = await oracledb.getConnection({
|
|
@@ -219,6 +303,8 @@ export const executeOracleQuery = async (connection, query) => {
|
|
|
219
303
|
catch (error) {
|
|
220
304
|
throw describeOracleError(error);
|
|
221
305
|
}
|
|
306
|
+
timings.connectMs = connectTimer();
|
|
307
|
+
const queryTimer = startDbTimer();
|
|
222
308
|
try {
|
|
223
309
|
const finalQuery = stripTrailingSqlTerminator(query, "oracle");
|
|
224
310
|
const result = await client.execute(finalQuery, [], {
|
|
@@ -230,13 +316,17 @@ export const executeOracleQuery = async (connection, query) => {
|
|
|
230
316
|
const rows = Array.isArray(result.rows)
|
|
231
317
|
? result.rows.map(normalizeOracleValue)
|
|
232
318
|
: [];
|
|
319
|
+
timings.queryMs = queryTimer();
|
|
233
320
|
return {
|
|
234
321
|
rows,
|
|
235
322
|
rowCount: typeof result.rowsAffected === "number" ? result.rowsAffected : rows.length,
|
|
323
|
+
timings,
|
|
236
324
|
};
|
|
237
325
|
}
|
|
238
326
|
finally {
|
|
327
|
+
const closeTimer = startDbTimer();
|
|
239
328
|
await client.close();
|
|
329
|
+
timings.closeMs = closeTimer();
|
|
240
330
|
}
|
|
241
331
|
};
|
|
242
332
|
//# sourceMappingURL=oracleAdapter.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oracleAdapter.js","sourceRoot":"","sources":["../../../src/host/db/oracleAdapter.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"oracleAdapter.js","sourceRoot":"","sources":["../../../src/host/db/oracleAdapter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,11 @@
|
|
|
1
1
|
import type { DbConnection } from "./types.js";
|
|
2
|
+
import { type DbQueryTimings } from "./dbTimings.js";
|
|
2
3
|
export declare const __setPostgresDriverForTests: (driver: any | null) => void;
|
|
3
4
|
export declare const withPostgresClient: <T>(connection: DbConnection, fn: (client: any) => Promise<T>) => Promise<T>;
|
|
4
5
|
export declare const testPostgresConnection: (connection: DbConnection) => Promise<void>;
|
|
5
6
|
export declare const executePostgresQuery: (connection: DbConnection, query: string, params?: unknown[]) => Promise<{
|
|
6
7
|
rows: unknown[];
|
|
7
8
|
rowCount: number;
|
|
9
|
+
timings?: DbQueryTimings;
|
|
8
10
|
}>;
|
|
9
11
|
//# sourceMappingURL=postgresAdapter.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"postgresAdapter.d.ts","sourceRoot":"","sources":["../../../src/host/db/postgresAdapter.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"postgresAdapter.d.ts","sourceRoot":"","sources":["../../../src/host/db/postgresAdapter.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE/C,OAAO,EAAgC,KAAK,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAcnF,eAAO,MAAM,2BAA2B,GAAI,QAAQ,GAAG,GAAG,IAAI,KAAG,IAEhE,CAAC;AAiBF,eAAO,MAAM,kBAAkB,GAAU,CAAC,EAAG,YAAY,YAAY,EAAE,IAAI,CAAC,MAAM,EAAE,GAAG,KAAK,OAAO,CAAC,CAAC,CAAC,KAAG,OAAO,CAAC,CAAC,CASjH,CAAC;AAEF,eAAO,MAAM,sBAAsB,GAAU,YAAY,YAAY,KAAG,OAAO,CAAC,IAAI,CASnF,CAAC;AAqDF,eAAO,MAAM,oBAAoB,GAC/B,YAAY,YAAY,EACxB,OAAO,MAAM,EACb,SAAQ,OAAO,EAAO,KACrB,OAAO,CAAC;IAAE,IAAI,EAAE,OAAO,EAAE,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,cAAc,CAAA;CAAE,CAoBzE,CAAC"}
|
|
@@ -4,6 +4,8 @@
|
|
|
4
4
|
// pgClientConfig.ts.
|
|
5
5
|
import { loadOptionalModule } from "../lazy.js";
|
|
6
6
|
import { buildPgClientConfig, runPgQuery } from "./pgClientConfig.js";
|
|
7
|
+
import { emptyDbTimings, startDbTimer } from "./dbTimings.js";
|
|
8
|
+
import { acquirePooled, getDbPoolSettings, getOrCreateDbPool, isDbPoolingEnabled, isSessionMutatingStatement, markReleased, } from "./dbPool.js";
|
|
7
9
|
const unwrap = (mod) => (mod && mod.default && !mod.Client ? mod.default : mod);
|
|
8
10
|
// Test-only seam (see mongoAdapter).
|
|
9
11
|
let pgDriverOverride = null;
|
|
@@ -45,15 +47,70 @@ export const testPostgresConnection = async (connection) => {
|
|
|
45
47
|
await client.end();
|
|
46
48
|
}
|
|
47
49
|
};
|
|
50
|
+
// Pooled path (configureDbPooling): one pg.Pool per connection identity.
|
|
51
|
+
const executePostgresQueryPooled = async (connection, query, params) => {
|
|
52
|
+
const settings = getDbPoolSettings();
|
|
53
|
+
const entry = await getOrCreateDbPool(connection, async () => {
|
|
54
|
+
const { Pool } = await loadPgDriver();
|
|
55
|
+
const pool = new Pool({
|
|
56
|
+
...buildPgClientConfig(connection),
|
|
57
|
+
max: settings.maxPerConnection,
|
|
58
|
+
idleTimeoutMillis: settings.idleTimeoutMs,
|
|
59
|
+
connectionTimeoutMillis: settings.acquireTimeoutMs,
|
|
60
|
+
// Idle pooled clients must not keep a short-lived host (CLI) running.
|
|
61
|
+
allowExitOnIdle: true,
|
|
62
|
+
});
|
|
63
|
+
// An idle client dropped by the server (restart, idle kill) emits here;
|
|
64
|
+
// unhandled it would crash the host process.
|
|
65
|
+
pool.on("error", () => undefined);
|
|
66
|
+
return {
|
|
67
|
+
pool,
|
|
68
|
+
stats: () => ({ open: pool.totalCount, idle: pool.idleCount, waiting: pool.waitingCount }),
|
|
69
|
+
close: () => pool.end(),
|
|
70
|
+
};
|
|
71
|
+
});
|
|
72
|
+
const timings = { ...emptyDbTimings(), pooled: true };
|
|
73
|
+
const { connection: client, acquireMs } = await acquirePooled(entry, () => entry.handle.pool.connect(), (late) => late.release(true));
|
|
74
|
+
timings.connectMs = acquireMs;
|
|
75
|
+
const destroyAfter = isSessionMutatingStatement(query);
|
|
76
|
+
let failed = false;
|
|
77
|
+
const queryTimer = startDbTimer();
|
|
78
|
+
try {
|
|
79
|
+
const result = await runPgQuery(client, query, params);
|
|
80
|
+
timings.queryMs = queryTimer();
|
|
81
|
+
return { ...result, timings };
|
|
82
|
+
}
|
|
83
|
+
catch (error) {
|
|
84
|
+
failed = true;
|
|
85
|
+
throw error;
|
|
86
|
+
}
|
|
87
|
+
finally {
|
|
88
|
+
const closeTimer = startDbTimer();
|
|
89
|
+
client.release(failed || destroyAfter ? true : undefined);
|
|
90
|
+
markReleased(entry, failed || destroyAfter);
|
|
91
|
+
timings.closeMs = closeTimer();
|
|
92
|
+
}
|
|
93
|
+
};
|
|
48
94
|
export const executePostgresQuery = async (connection, query, params = []) => {
|
|
95
|
+
if (isDbPoolingEnabled()) {
|
|
96
|
+
return executePostgresQueryPooled(connection, query, params);
|
|
97
|
+
}
|
|
49
98
|
const { Client } = await loadPgDriver();
|
|
99
|
+
const timings = emptyDbTimings();
|
|
100
|
+
const connectTimer = startDbTimer();
|
|
50
101
|
const client = new Client(buildPgClientConfig(connection));
|
|
51
102
|
await client.connect();
|
|
103
|
+
timings.connectMs = connectTimer();
|
|
104
|
+
const queryTimer = startDbTimer();
|
|
52
105
|
try {
|
|
53
|
-
|
|
106
|
+
const result = await runPgQuery(client, query, params);
|
|
107
|
+
timings.queryMs = queryTimer();
|
|
108
|
+
return { ...result, timings };
|
|
54
109
|
}
|
|
55
110
|
finally {
|
|
111
|
+
const closeTimer = startDbTimer();
|
|
56
112
|
await client.end();
|
|
113
|
+
timings.closeMs = closeTimer();
|
|
57
114
|
}
|
|
58
115
|
};
|
|
59
116
|
//# sourceMappingURL=postgresAdapter.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"postgresAdapter.js","sourceRoot":"","sources":["../../../src/host/db/postgresAdapter.ts"],"names":[],"mappings":"AAAA,gFAAgF;AAChF,4EAA4E;AAC5E,yEAAyE;AACzE,qBAAqB;AAErB,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAEhD,OAAO,EAAE,mBAAmB,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"postgresAdapter.js","sourceRoot":"","sources":["../../../src/host/db/postgresAdapter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { DbQueryTimings } from "./dbTimings.js";
|
|
1
2
|
import type { DbConnection, DbConnectionInput, DbConnectionTestResult, DbQueryExecutionResult, ExecuteDbQueryPayload } from "./types.js";
|
|
2
3
|
export declare const executeResolvedDbQuery: (input: {
|
|
3
4
|
connection: DbConnectionInput;
|
|
@@ -10,6 +11,7 @@ export declare const executeResolvedDbQuery: (input: {
|
|
|
10
11
|
}) => Promise<{
|
|
11
12
|
rows: unknown[];
|
|
12
13
|
rowCount: number;
|
|
14
|
+
timings?: DbQueryTimings;
|
|
13
15
|
}>;
|
|
14
16
|
export declare const normalizeConnectionInput: (connectionInput: DbConnectionInput) => DbConnection;
|
|
15
17
|
export declare const testDbConnection: (connectionInput: DbConnectionInput) => Promise<DbConnectionTestResult>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queryExecutor.d.ts","sourceRoot":"","sources":["../../../src/host/db/queryExecutor.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"queryExecutor.d.ts","sourceRoot":"","sources":["../../../src/host/db/queryExecutor.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAerD,OAAO,KAAK,EACV,YAAY,EACZ,iBAAiB,EACjB,sBAAsB,EACtB,sBAAsB,EACtB,qBAAqB,EACtB,MAAM,YAAY,CAAC;AA8BpB,eAAO,MAAM,sBAAsB,GAAI,OAAO;IAC5C,UAAU,EAAE,iBAAiB,CAAC;IAC9B,aAAa,EAAE,MAAM,CAAC;IACtB,MAAM,CAAC,EAAE,OAAO,EAAE,CAAC;IACnB,OAAO,CAAC,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,eAAe,EAAE,MAAM,GAAG,UAAU,GAAG,QAAQ,CAAA;KAAE,CAAC;CAC9E,KAAG,OAAO,CAAC;IAAE,IAAI,EAAE,OAAO,EAAE,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,cAAc,CAAA;CAAE,CAmB1E,CAAC;AAEF,eAAO,MAAM,wBAAwB,GAAI,iBAAiB,iBAAiB,KAAG,YA0B5E,CAAC;AAIH,eAAO,MAAM,gBAAgB,GAC3B,iBAAiB,iBAAiB,KACjC,OAAO,CAAC,sBAAsB,CA8BhC,CAAC;AAEF,eAAO,MAAM,YAAY,GACvB,SAAS,qBAAqB,KAC7B,OAAO,CAAC,sBAAsB,CA2EhC,CAAC"}
|