grain-tools 0.10.11 → 0.10.12
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/mcp-app.html +0 -14
- package/dist/web-app.html +1 -18
- package/out/server/standalone.js +805 -795
- package/package.json +1 -1
- package/server.json +2 -2
package/out/server/standalone.js
CHANGED
|
@@ -464,10 +464,10 @@ function mergeDefs(...defs) {
|
|
|
464
464
|
function cloneDef(schema) {
|
|
465
465
|
return mergeDefs(schema._zod.def);
|
|
466
466
|
}
|
|
467
|
-
function getElementAtPath(obj,
|
|
468
|
-
if (!
|
|
467
|
+
function getElementAtPath(obj, path46) {
|
|
468
|
+
if (!path46)
|
|
469
469
|
return obj;
|
|
470
|
-
return
|
|
470
|
+
return path46.reduce((acc, key) => acc?.[key], obj);
|
|
471
471
|
}
|
|
472
472
|
function promiseAllObject(promisesObj) {
|
|
473
473
|
const keys2 = Object.keys(promisesObj);
|
|
@@ -795,11 +795,11 @@ function explicitlyAborted(x, startIndex = 0) {
|
|
|
795
795
|
}
|
|
796
796
|
return false;
|
|
797
797
|
}
|
|
798
|
-
function prefixIssues(
|
|
798
|
+
function prefixIssues(path46, issues) {
|
|
799
799
|
return issues.map((iss) => {
|
|
800
800
|
var _a4;
|
|
801
801
|
(_a4 = iss).path ?? (_a4.path = []);
|
|
802
|
-
iss.path.unshift(
|
|
802
|
+
iss.path.unshift(path46);
|
|
803
803
|
return iss;
|
|
804
804
|
});
|
|
805
805
|
}
|
|
@@ -1016,16 +1016,16 @@ function flattenError(error52, mapper = (issue2) => issue2.message) {
|
|
|
1016
1016
|
}
|
|
1017
1017
|
function formatError(error52, mapper = (issue2) => issue2.message) {
|
|
1018
1018
|
const fieldErrors = { _errors: [] };
|
|
1019
|
-
const processError = (error53,
|
|
1019
|
+
const processError = (error53, path46 = []) => {
|
|
1020
1020
|
for (const issue2 of error53.issues) {
|
|
1021
1021
|
if (issue2.code === "invalid_union" && issue2.errors.length) {
|
|
1022
|
-
issue2.errors.map((issues) => processError({ issues }, [...
|
|
1022
|
+
issue2.errors.map((issues) => processError({ issues }, [...path46, ...issue2.path]));
|
|
1023
1023
|
} else if (issue2.code === "invalid_key") {
|
|
1024
|
-
processError({ issues: issue2.issues }, [...
|
|
1024
|
+
processError({ issues: issue2.issues }, [...path46, ...issue2.path]);
|
|
1025
1025
|
} else if (issue2.code === "invalid_element") {
|
|
1026
|
-
processError({ issues: issue2.issues }, [...
|
|
1026
|
+
processError({ issues: issue2.issues }, [...path46, ...issue2.path]);
|
|
1027
1027
|
} else {
|
|
1028
|
-
const fullpath = [...
|
|
1028
|
+
const fullpath = [...path46, ...issue2.path];
|
|
1029
1029
|
if (fullpath.length === 0) {
|
|
1030
1030
|
fieldErrors._errors.push(mapper(issue2));
|
|
1031
1031
|
} else {
|
|
@@ -1052,17 +1052,17 @@ function formatError(error52, mapper = (issue2) => issue2.message) {
|
|
|
1052
1052
|
}
|
|
1053
1053
|
function treeifyError(error52, mapper = (issue2) => issue2.message) {
|
|
1054
1054
|
const result = { errors: [] };
|
|
1055
|
-
const processError = (error53,
|
|
1055
|
+
const processError = (error53, path46 = []) => {
|
|
1056
1056
|
var _a4, _b2;
|
|
1057
1057
|
for (const issue2 of error53.issues) {
|
|
1058
1058
|
if (issue2.code === "invalid_union" && issue2.errors.length) {
|
|
1059
|
-
issue2.errors.map((issues) => processError({ issues }, [...
|
|
1059
|
+
issue2.errors.map((issues) => processError({ issues }, [...path46, ...issue2.path]));
|
|
1060
1060
|
} else if (issue2.code === "invalid_key") {
|
|
1061
|
-
processError({ issues: issue2.issues }, [...
|
|
1061
|
+
processError({ issues: issue2.issues }, [...path46, ...issue2.path]);
|
|
1062
1062
|
} else if (issue2.code === "invalid_element") {
|
|
1063
|
-
processError({ issues: issue2.issues }, [...
|
|
1063
|
+
processError({ issues: issue2.issues }, [...path46, ...issue2.path]);
|
|
1064
1064
|
} else {
|
|
1065
|
-
const fullpath = [...
|
|
1065
|
+
const fullpath = [...path46, ...issue2.path];
|
|
1066
1066
|
if (fullpath.length === 0) {
|
|
1067
1067
|
result.errors.push(mapper(issue2));
|
|
1068
1068
|
continue;
|
|
@@ -1094,8 +1094,8 @@ function treeifyError(error52, mapper = (issue2) => issue2.message) {
|
|
|
1094
1094
|
}
|
|
1095
1095
|
function toDotPath(_path) {
|
|
1096
1096
|
const segs = [];
|
|
1097
|
-
const
|
|
1098
|
-
for (const seg of
|
|
1097
|
+
const path46 = _path.map((seg) => typeof seg === "object" ? seg.key : seg);
|
|
1098
|
+
for (const seg of path46) {
|
|
1099
1099
|
if (typeof seg === "number")
|
|
1100
1100
|
segs.push(`[${seg}]`);
|
|
1101
1101
|
else if (typeof seg === "symbol")
|
|
@@ -14411,13 +14411,13 @@ function resolveRef(ref, ctx) {
|
|
|
14411
14411
|
if (!ref.startsWith("#")) {
|
|
14412
14412
|
throw new Error("External $ref is not supported, only local refs (#/...) are allowed");
|
|
14413
14413
|
}
|
|
14414
|
-
const
|
|
14415
|
-
if (
|
|
14414
|
+
const path46 = ref.slice(1).split("/").filter(Boolean);
|
|
14415
|
+
if (path46.length === 0) {
|
|
14416
14416
|
return ctx.rootSchema;
|
|
14417
14417
|
}
|
|
14418
14418
|
const defsKey = ctx.version === "draft-2020-12" ? "$defs" : "definitions";
|
|
14419
|
-
if (
|
|
14420
|
-
const key =
|
|
14419
|
+
if (path46[0] === defsKey) {
|
|
14420
|
+
const key = path46[1];
|
|
14421
14421
|
if (!key || !ctx.defs[key]) {
|
|
14422
14422
|
throw new Error(`Reference not found: ${ref}`);
|
|
14423
14423
|
}
|
|
@@ -16821,12 +16821,12 @@ var init_stdio2 = __esm({
|
|
|
16821
16821
|
this.onclose?.();
|
|
16822
16822
|
}
|
|
16823
16823
|
send(message) {
|
|
16824
|
-
return new Promise((
|
|
16824
|
+
return new Promise((resolve11) => {
|
|
16825
16825
|
const json2 = serializeMessage(message);
|
|
16826
16826
|
if (this._stdout.write(json2)) {
|
|
16827
|
-
|
|
16827
|
+
resolve11();
|
|
16828
16828
|
} else {
|
|
16829
|
-
this._stdout.once("drain",
|
|
16829
|
+
this._stdout.once("drain", resolve11);
|
|
16830
16830
|
}
|
|
16831
16831
|
});
|
|
16832
16832
|
}
|
|
@@ -18589,25 +18589,25 @@ var init_DaemonConfig = __esm({
|
|
|
18589
18589
|
});
|
|
18590
18590
|
|
|
18591
18591
|
// src/server/config/ConfigValidator.ts
|
|
18592
|
-
function assertInteger(value,
|
|
18592
|
+
function assertInteger(value, path46, options = {}) {
|
|
18593
18593
|
if (!Number.isInteger(value)) {
|
|
18594
|
-
throw new ConfigValidationError(`${
|
|
18594
|
+
throw new ConfigValidationError(`${path46} must be an integer`);
|
|
18595
18595
|
}
|
|
18596
18596
|
if (options.min !== void 0 && value < options.min) {
|
|
18597
|
-
throw new ConfigValidationError(`${
|
|
18597
|
+
throw new ConfigValidationError(`${path46} must be >= ${options.min}`);
|
|
18598
18598
|
}
|
|
18599
18599
|
if (options.max !== void 0 && value > options.max) {
|
|
18600
|
-
throw new ConfigValidationError(`${
|
|
18600
|
+
throw new ConfigValidationError(`${path46} must be <= ${options.max}`);
|
|
18601
18601
|
}
|
|
18602
18602
|
}
|
|
18603
|
-
function assertBoolean(value,
|
|
18603
|
+
function assertBoolean(value, path46) {
|
|
18604
18604
|
if (typeof value !== "boolean") {
|
|
18605
|
-
throw new ConfigValidationError(`${
|
|
18605
|
+
throw new ConfigValidationError(`${path46} must be a boolean`);
|
|
18606
18606
|
}
|
|
18607
18607
|
}
|
|
18608
|
-
function assertNonEmptyString(value,
|
|
18608
|
+
function assertNonEmptyString(value, path46) {
|
|
18609
18609
|
if (typeof value !== "string" || value.trim().length === 0) {
|
|
18610
|
-
throw new ConfigValidationError(`${
|
|
18610
|
+
throw new ConfigValidationError(`${path46} must be a non-empty string`);
|
|
18611
18611
|
}
|
|
18612
18612
|
}
|
|
18613
18613
|
function validateDaemonConfig(config2) {
|
|
@@ -19347,7 +19347,7 @@ var init_StdioBridge = __esm({
|
|
|
19347
19347
|
}
|
|
19348
19348
|
}
|
|
19349
19349
|
async delay(milliseconds) {
|
|
19350
|
-
await new Promise((
|
|
19350
|
+
await new Promise((resolve11) => setTimeout(resolve11, milliseconds));
|
|
19351
19351
|
}
|
|
19352
19352
|
};
|
|
19353
19353
|
}
|
|
@@ -19496,7 +19496,7 @@ async function readGrainServiceStatus(configDir = resolveGrainHome()) {
|
|
|
19496
19496
|
const host = record2.host === "0.0.0.0" ? "127.0.0.1" : record2.host;
|
|
19497
19497
|
const url3 = `http://${host}:${record2.port}/status`;
|
|
19498
19498
|
try {
|
|
19499
|
-
const data = await new Promise((
|
|
19499
|
+
const data = await new Promise((resolve11, reject) => {
|
|
19500
19500
|
const req = http2.get(url3, (res) => {
|
|
19501
19501
|
if (res.statusCode !== 200) {
|
|
19502
19502
|
reject(new Error(`HTTP ${res.statusCode ?? "unknown"}`));
|
|
@@ -19506,7 +19506,7 @@ async function readGrainServiceStatus(configDir = resolveGrainHome()) {
|
|
|
19506
19506
|
res.on("data", (chunk) => {
|
|
19507
19507
|
body += chunk;
|
|
19508
19508
|
});
|
|
19509
|
-
res.on("end", () =>
|
|
19509
|
+
res.on("end", () => resolve11(body));
|
|
19510
19510
|
});
|
|
19511
19511
|
req.on("error", reject);
|
|
19512
19512
|
req.setTimeout(500, () => {
|
|
@@ -20644,7 +20644,7 @@ function buildBatchUrl(host) {
|
|
|
20644
20644
|
}
|
|
20645
20645
|
}
|
|
20646
20646
|
function settleWithin(promise2, ms) {
|
|
20647
|
-
return new Promise((
|
|
20647
|
+
return new Promise((resolve11) => {
|
|
20648
20648
|
let timer;
|
|
20649
20649
|
let settled = false;
|
|
20650
20650
|
const cleanupAndResolve = () => {
|
|
@@ -20656,7 +20656,7 @@ function settleWithin(promise2, ms) {
|
|
|
20656
20656
|
clearTimeout(timer);
|
|
20657
20657
|
timer = void 0;
|
|
20658
20658
|
}
|
|
20659
|
-
|
|
20659
|
+
resolve11();
|
|
20660
20660
|
};
|
|
20661
20661
|
if (ms <= 0) {
|
|
20662
20662
|
cleanupAndResolve();
|
|
@@ -20677,7 +20677,7 @@ function isPermanentError(err) {
|
|
|
20677
20677
|
return false;
|
|
20678
20678
|
}
|
|
20679
20679
|
function postJson(url3, payload, timeoutMs) {
|
|
20680
|
-
return new Promise((
|
|
20680
|
+
return new Promise((resolve11, reject) => {
|
|
20681
20681
|
const parsed = new import_url.URL(url3);
|
|
20682
20682
|
const body = JSON.stringify(payload);
|
|
20683
20683
|
const client = parsed.protocol === "http:" ? http3 : https;
|
|
@@ -20699,7 +20699,7 @@ function postJson(url3, payload, timeoutMs) {
|
|
|
20699
20699
|
response.on("end", () => {
|
|
20700
20700
|
const statusCode = response.statusCode ?? 0;
|
|
20701
20701
|
if (statusCode >= 200 && statusCode < 300) {
|
|
20702
|
-
|
|
20702
|
+
resolve11();
|
|
20703
20703
|
} else {
|
|
20704
20704
|
reject(
|
|
20705
20705
|
new TelemetrySendError(
|
|
@@ -21192,7 +21192,7 @@ function clientFor(url3) {
|
|
|
21192
21192
|
function downloadToFile(url3, destPath, options) {
|
|
21193
21193
|
const responseTimeoutMs = options?.responseTimeoutMs ?? 1e4;
|
|
21194
21194
|
const idleTimeoutMs = options?.idleTimeoutMs ?? 3e4;
|
|
21195
|
-
return new Promise((
|
|
21195
|
+
return new Promise((resolve11, reject) => {
|
|
21196
21196
|
fs10.mkdirSync(path12.dirname(destPath), { recursive: true });
|
|
21197
21197
|
let settled = false;
|
|
21198
21198
|
let file4;
|
|
@@ -21246,7 +21246,7 @@ function downloadToFile(url3, destPath, options) {
|
|
|
21246
21246
|
settled = true;
|
|
21247
21247
|
clearTimers();
|
|
21248
21248
|
if (file4) {
|
|
21249
|
-
file4.close(() =>
|
|
21249
|
+
file4.close(() => resolve11());
|
|
21250
21250
|
}
|
|
21251
21251
|
});
|
|
21252
21252
|
file4.on("error", failOnce);
|
|
@@ -21259,20 +21259,20 @@ function downloadToFile(url3, destPath, options) {
|
|
|
21259
21259
|
});
|
|
21260
21260
|
}
|
|
21261
21261
|
function sha512File(filePath) {
|
|
21262
|
-
return new Promise((
|
|
21262
|
+
return new Promise((resolve11, reject) => {
|
|
21263
21263
|
const hash2 = crypto6.createHash("sha512");
|
|
21264
21264
|
const stream4 = fs10.createReadStream(filePath);
|
|
21265
21265
|
stream4.on("data", (chunk) => hash2.update(chunk));
|
|
21266
|
-
stream4.on("end", () =>
|
|
21266
|
+
stream4.on("end", () => resolve11(hash2.digest("base64")));
|
|
21267
21267
|
stream4.on("error", reject);
|
|
21268
21268
|
});
|
|
21269
21269
|
}
|
|
21270
21270
|
function sha256File(filePath) {
|
|
21271
|
-
return new Promise((
|
|
21271
|
+
return new Promise((resolve11, reject) => {
|
|
21272
21272
|
const hash2 = crypto6.createHash("sha256");
|
|
21273
21273
|
const stream4 = fs10.createReadStream(filePath);
|
|
21274
21274
|
stream4.on("data", (chunk) => hash2.update(chunk));
|
|
21275
|
-
stream4.on("end", () =>
|
|
21275
|
+
stream4.on("end", () => resolve11(hash2.digest("hex")));
|
|
21276
21276
|
stream4.on("error", reject);
|
|
21277
21277
|
});
|
|
21278
21278
|
}
|
|
@@ -21689,7 +21689,7 @@ var init_applicationPayload = __esm({
|
|
|
21689
21689
|
function createCommandRunner() {
|
|
21690
21690
|
return {
|
|
21691
21691
|
run(command, args) {
|
|
21692
|
-
return new Promise((
|
|
21692
|
+
return new Promise((resolve11, reject) => {
|
|
21693
21693
|
const child = (0, import_child_process3.spawn)(command, [...args], { stdio: ["ignore", "pipe", "pipe"] });
|
|
21694
21694
|
let output = "";
|
|
21695
21695
|
child.stdout.on("data", (chunk) => {
|
|
@@ -21699,7 +21699,7 @@ function createCommandRunner() {
|
|
|
21699
21699
|
output += String(chunk);
|
|
21700
21700
|
});
|
|
21701
21701
|
child.on("error", reject);
|
|
21702
|
-
child.on("exit", (exitCode) =>
|
|
21702
|
+
child.on("exit", (exitCode) => resolve11({ exitCode: exitCode ?? 1, output }));
|
|
21703
21703
|
});
|
|
21704
21704
|
}
|
|
21705
21705
|
};
|
|
@@ -21816,7 +21816,7 @@ var require_package = __commonJS({
|
|
|
21816
21816
|
name: "grain",
|
|
21817
21817
|
displayName: "Grain SQL",
|
|
21818
21818
|
description: "Run SQL in VS Code and expose safe, visible MCP database tools for Claude, Cursor, and other AI agents.",
|
|
21819
|
-
version: "0.10.
|
|
21819
|
+
version: "0.10.12",
|
|
21820
21820
|
license: "UNLICENSED",
|
|
21821
21821
|
mcpName: "io.github.pattrnlabs/grain",
|
|
21822
21822
|
publisher: "pattrnlabs",
|
|
@@ -22462,7 +22462,7 @@ var require_package = __commonJS({
|
|
|
22462
22462
|
"test:telemetry-seam": 'node scripts/emit-seam-receipt.js "npm run test:telemetry-seam" -- jest src/test/integration/exceptionTelemetrySeam.test.ts',
|
|
22463
22463
|
"test:chart-flag-seam": 'node scripts/emit-seam-receipt.js "npm run test:chart-flag-seam" -- jest src/test/unit/extensionChartEditorRegistration.test.ts src/test/unit/telemetry/ProductTelemetryService.test.ts src/test/unit/DaemonClient.test.ts',
|
|
22464
22464
|
"check:contributed-commands": "node scripts/check-contributed-commands.js",
|
|
22465
|
-
"quality-check": "npm run type-check
|
|
22465
|
+
"quality-check": "node scripts/run-checks.js npm run type-check npm run lint npm run format:check npm run check:seams npm run check:ui-contract npm run check:telemetry-coverage npm run check:telemetry-failure-identity npm run check:daemon-spawn-sites npm run check:test-skips npm run check:never-written-primitives npm run check:boundaries npm run check:size-ratchet npm run check:workflows npm run check:config-defaults npm run check:release-contract npm run check:doc-inventory npm run check:briefs npm run check:decision-notes npm run rfc:check npm run check:brand-tokens npm run check:identity npm run check:issue-refs npm run check:token-theme-parity npm run check:release-notes npm run check:contributed-commands npm run check:gate-wiring npm run check:dependency-licenses npm run check:lockfile-pinnable npm run check:gates npm run check:no-system-npm npm run check:no-execpath-units",
|
|
22466
22466
|
"check:telemetry-coverage": "node scripts/check-telemetry-coverage.js",
|
|
22467
22467
|
"check:telemetry-failure-identity": "node scripts/check-telemetry-failure-identity.js",
|
|
22468
22468
|
"check:daemon-spawn-sites": "node scripts/check-daemon-spawn-sites.js",
|
|
@@ -22982,7 +22982,7 @@ __export(startCommand_exports, {
|
|
|
22982
22982
|
startCommand: () => startCommand
|
|
22983
22983
|
});
|
|
22984
22984
|
async function checkAuthenticatedReadiness(host, port, token) {
|
|
22985
|
-
return new Promise((
|
|
22985
|
+
return new Promise((resolve11) => {
|
|
22986
22986
|
const req = http5.get(
|
|
22987
22987
|
`http://${host}:${port}${OWNERSHIP_PROBE_PATH}`,
|
|
22988
22988
|
{
|
|
@@ -22992,17 +22992,17 @@ async function checkAuthenticatedReadiness(host, port, token) {
|
|
|
22992
22992
|
},
|
|
22993
22993
|
(res) => {
|
|
22994
22994
|
if (res.statusCode === 200) {
|
|
22995
|
-
|
|
22995
|
+
resolve11(true);
|
|
22996
22996
|
} else {
|
|
22997
|
-
|
|
22997
|
+
resolve11(false);
|
|
22998
22998
|
}
|
|
22999
22999
|
res.resume();
|
|
23000
23000
|
}
|
|
23001
23001
|
);
|
|
23002
|
-
req.on("error", () =>
|
|
23002
|
+
req.on("error", () => resolve11(false));
|
|
23003
23003
|
req.setTimeout(500, () => {
|
|
23004
23004
|
req.destroy();
|
|
23005
|
-
|
|
23005
|
+
resolve11(false);
|
|
23006
23006
|
});
|
|
23007
23007
|
});
|
|
23008
23008
|
}
|
|
@@ -23080,7 +23080,7 @@ ${clock.now()}`);
|
|
|
23080
23080
|
}
|
|
23081
23081
|
}
|
|
23082
23082
|
}
|
|
23083
|
-
await new Promise((
|
|
23083
|
+
await new Promise((resolve11) => setTimeout(resolve11, 250));
|
|
23084
23084
|
}
|
|
23085
23085
|
console.error(`Grain did not start within 20 seconds. Check ${logPath} for errors.`);
|
|
23086
23086
|
return 1;
|
|
@@ -23220,7 +23220,7 @@ async function stopCommand(configDir = resolveGrainHome(), clock = Date, process
|
|
|
23220
23220
|
console.log("Grain stopped.");
|
|
23221
23221
|
return 0;
|
|
23222
23222
|
}
|
|
23223
|
-
await new Promise((
|
|
23223
|
+
await new Promise((resolve11) => setTimeout(resolve11, 250));
|
|
23224
23224
|
}
|
|
23225
23225
|
console.error("Grain did not stop within 10 seconds.");
|
|
23226
23226
|
return 1;
|
|
@@ -28706,11 +28706,11 @@ var require_raw_body = __commonJS({
|
|
|
28706
28706
|
if (done) {
|
|
28707
28707
|
return readStream2(stream4, encoding, length, limit, wrap(done));
|
|
28708
28708
|
}
|
|
28709
|
-
return new Promise(function executor(
|
|
28709
|
+
return new Promise(function executor(resolve11, reject) {
|
|
28710
28710
|
readStream2(stream4, encoding, length, limit, function onRead(err, buf) {
|
|
28711
28711
|
if (err)
|
|
28712
28712
|
return reject(err);
|
|
28713
|
-
|
|
28713
|
+
resolve11(buf);
|
|
28714
28714
|
});
|
|
28715
28715
|
});
|
|
28716
28716
|
}
|
|
@@ -42204,11 +42204,11 @@ var require_mime_types = __commonJS({
|
|
|
42204
42204
|
}
|
|
42205
42205
|
return exts[0];
|
|
42206
42206
|
}
|
|
42207
|
-
function lookup(
|
|
42208
|
-
if (!
|
|
42207
|
+
function lookup(path46) {
|
|
42208
|
+
if (!path46 || typeof path46 !== "string") {
|
|
42209
42209
|
return false;
|
|
42210
42210
|
}
|
|
42211
|
-
var extension2 = extname("x." +
|
|
42211
|
+
var extension2 = extname("x." + path46).toLowerCase().slice(1);
|
|
42212
42212
|
if (!extension2) {
|
|
42213
42213
|
return false;
|
|
42214
42214
|
}
|
|
@@ -45700,13 +45700,13 @@ var require_view = __commonJS({
|
|
|
45700
45700
|
"node_modules/express/lib/view.js"(exports, module2) {
|
|
45701
45701
|
"use strict";
|
|
45702
45702
|
var debug = require_src()("express:view");
|
|
45703
|
-
var
|
|
45703
|
+
var path46 = require("node:path");
|
|
45704
45704
|
var fs44 = require("node:fs");
|
|
45705
|
-
var dirname16 =
|
|
45706
|
-
var basename5 =
|
|
45707
|
-
var extname =
|
|
45708
|
-
var join37 =
|
|
45709
|
-
var
|
|
45705
|
+
var dirname16 = path46.dirname;
|
|
45706
|
+
var basename5 = path46.basename;
|
|
45707
|
+
var extname = path46.extname;
|
|
45708
|
+
var join37 = path46.join;
|
|
45709
|
+
var resolve11 = path46.resolve;
|
|
45710
45710
|
module2.exports = View2;
|
|
45711
45711
|
function View2(name, options) {
|
|
45712
45712
|
var opts = options || {};
|
|
@@ -45735,17 +45735,17 @@ var require_view = __commonJS({
|
|
|
45735
45735
|
this.path = this.lookup(fileName);
|
|
45736
45736
|
}
|
|
45737
45737
|
View2.prototype.lookup = function lookup(name) {
|
|
45738
|
-
var
|
|
45738
|
+
var path47;
|
|
45739
45739
|
var roots2 = [].concat(this.root);
|
|
45740
45740
|
debug('lookup "%s"', name);
|
|
45741
|
-
for (var i = 0; i < roots2.length && !
|
|
45741
|
+
for (var i = 0; i < roots2.length && !path47; i++) {
|
|
45742
45742
|
var root = roots2[i];
|
|
45743
|
-
var loc =
|
|
45743
|
+
var loc = resolve11(root, name);
|
|
45744
45744
|
var dir3 = dirname16(loc);
|
|
45745
45745
|
var file4 = basename5(loc);
|
|
45746
|
-
|
|
45746
|
+
path47 = this.resolve(dir3, file4);
|
|
45747
45747
|
}
|
|
45748
|
-
return
|
|
45748
|
+
return path47;
|
|
45749
45749
|
};
|
|
45750
45750
|
View2.prototype.render = function render2(options, callback) {
|
|
45751
45751
|
var sync = true;
|
|
@@ -45765,23 +45765,23 @@ var require_view = __commonJS({
|
|
|
45765
45765
|
});
|
|
45766
45766
|
sync = false;
|
|
45767
45767
|
};
|
|
45768
|
-
View2.prototype.resolve = function
|
|
45768
|
+
View2.prototype.resolve = function resolve12(dir3, file4) {
|
|
45769
45769
|
var ext = this.ext;
|
|
45770
|
-
var
|
|
45771
|
-
var stat = tryStat(
|
|
45770
|
+
var path47 = join37(dir3, file4);
|
|
45771
|
+
var stat = tryStat(path47);
|
|
45772
45772
|
if (stat && stat.isFile()) {
|
|
45773
|
-
return
|
|
45773
|
+
return path47;
|
|
45774
45774
|
}
|
|
45775
|
-
|
|
45776
|
-
stat = tryStat(
|
|
45775
|
+
path47 = join37(dir3, basename5(file4, ext), "index" + ext);
|
|
45776
|
+
stat = tryStat(path47);
|
|
45777
45777
|
if (stat && stat.isFile()) {
|
|
45778
|
-
return
|
|
45778
|
+
return path47;
|
|
45779
45779
|
}
|
|
45780
45780
|
};
|
|
45781
|
-
function tryStat(
|
|
45782
|
-
debug('stat "%s"',
|
|
45781
|
+
function tryStat(path47) {
|
|
45782
|
+
debug('stat "%s"', path47);
|
|
45783
45783
|
try {
|
|
45784
|
-
return fs44.statSync(
|
|
45784
|
+
return fs44.statSync(path47);
|
|
45785
45785
|
} catch (e2) {
|
|
45786
45786
|
return void 0;
|
|
45787
45787
|
}
|
|
@@ -55288,11 +55288,11 @@ var require_mime_types2 = __commonJS({
|
|
|
55288
55288
|
}
|
|
55289
55289
|
return exts[0];
|
|
55290
55290
|
}
|
|
55291
|
-
function lookup(
|
|
55292
|
-
if (!
|
|
55291
|
+
function lookup(path46) {
|
|
55292
|
+
if (!path46 || typeof path46 !== "string") {
|
|
55293
55293
|
return false;
|
|
55294
55294
|
}
|
|
55295
|
-
var extension2 = extname("x." +
|
|
55295
|
+
var extension2 = extname("x." + path46).toLowerCase().slice(1);
|
|
55296
55296
|
if (!extension2) {
|
|
55297
55297
|
return false;
|
|
55298
55298
|
}
|
|
@@ -56430,15 +56430,15 @@ var require_dist = __commonJS({
|
|
|
56430
56430
|
let index = 0;
|
|
56431
56431
|
function consumeUntil(end2) {
|
|
56432
56432
|
const output = [];
|
|
56433
|
-
let
|
|
56433
|
+
let path46 = "";
|
|
56434
56434
|
function writePath() {
|
|
56435
|
-
if (!
|
|
56435
|
+
if (!path46)
|
|
56436
56436
|
return;
|
|
56437
56437
|
output.push({
|
|
56438
56438
|
type: "text",
|
|
56439
|
-
value: encodePath(
|
|
56439
|
+
value: encodePath(path46)
|
|
56440
56440
|
});
|
|
56441
|
-
|
|
56441
|
+
path46 = "";
|
|
56442
56442
|
}
|
|
56443
56443
|
while (index < chars.length) {
|
|
56444
56444
|
const value = chars[index++];
|
|
@@ -56450,7 +56450,7 @@ var require_dist = __commonJS({
|
|
|
56450
56450
|
if (index === chars.length) {
|
|
56451
56451
|
throw new PathError(`Unexpected end after \\ at index ${index}`, str);
|
|
56452
56452
|
}
|
|
56453
|
-
|
|
56453
|
+
path46 += chars[index++];
|
|
56454
56454
|
continue;
|
|
56455
56455
|
}
|
|
56456
56456
|
if (value === ":" || value === "*") {
|
|
@@ -56494,7 +56494,7 @@ var require_dist = __commonJS({
|
|
|
56494
56494
|
if (value === "}" || value === "(" || value === ")" || value === "[" || value === "]" || value === "+" || value === "?" || value === "!") {
|
|
56495
56495
|
throw new PathError(`Unexpected ${value} at index ${index - 1}`, str);
|
|
56496
56496
|
}
|
|
56497
|
-
|
|
56497
|
+
path46 += value;
|
|
56498
56498
|
}
|
|
56499
56499
|
if (end2) {
|
|
56500
56500
|
throw new PathError(`Unexpected end at index ${index}, expected ${end2}`, str);
|
|
@@ -56504,17 +56504,17 @@ var require_dist = __commonJS({
|
|
|
56504
56504
|
}
|
|
56505
56505
|
return new TokenData(consumeUntil(""), str);
|
|
56506
56506
|
}
|
|
56507
|
-
function compile(
|
|
56507
|
+
function compile(path46, options = {}) {
|
|
56508
56508
|
const { encode: encode5 = encodeURIComponent, delimiter: delimiter2 = DEFAULT_DELIMITER } = options;
|
|
56509
|
-
const data = typeof
|
|
56509
|
+
const data = typeof path46 === "object" ? path46 : parse4(path46, options);
|
|
56510
56510
|
const fn = tokensToFunction(data.tokens, delimiter2, encode5);
|
|
56511
|
-
return function
|
|
56511
|
+
return function path47(params = {}) {
|
|
56512
56512
|
const missing = [];
|
|
56513
|
-
const
|
|
56513
|
+
const path48 = fn(params, missing);
|
|
56514
56514
|
if (missing.length) {
|
|
56515
56515
|
throw new TypeError(`Missing parameters: ${missing.join(", ")}`);
|
|
56516
56516
|
}
|
|
56517
|
-
return
|
|
56517
|
+
return path48;
|
|
56518
56518
|
};
|
|
56519
56519
|
}
|
|
56520
56520
|
function tokensToFunction(tokens, delimiter2, encode5) {
|
|
@@ -56576,9 +56576,9 @@ var require_dist = __commonJS({
|
|
|
56576
56576
|
return encodeValue(value);
|
|
56577
56577
|
};
|
|
56578
56578
|
}
|
|
56579
|
-
function match(
|
|
56579
|
+
function match(path46, options = {}) {
|
|
56580
56580
|
const { decode: decode4 = decodeURIComponent, delimiter: delimiter2 = DEFAULT_DELIMITER } = options;
|
|
56581
|
-
const { regexp: regexp2, keys: keys2 } = pathToRegexp(
|
|
56581
|
+
const { regexp: regexp2, keys: keys2 } = pathToRegexp(path46, options);
|
|
56582
56582
|
const decoders = keys2.map((key) => {
|
|
56583
56583
|
if (decode4 === false)
|
|
56584
56584
|
return NOOP_VALUE;
|
|
@@ -56590,7 +56590,7 @@ var require_dist = __commonJS({
|
|
|
56590
56590
|
const m2 = regexp2.exec(input);
|
|
56591
56591
|
if (!m2)
|
|
56592
56592
|
return false;
|
|
56593
|
-
const
|
|
56593
|
+
const path47 = m2[0];
|
|
56594
56594
|
const params = /* @__PURE__ */ Object.create(null);
|
|
56595
56595
|
for (let i = 1; i < m2.length; i++) {
|
|
56596
56596
|
if (m2[i] === void 0)
|
|
@@ -56599,21 +56599,21 @@ var require_dist = __commonJS({
|
|
|
56599
56599
|
const decoder = decoders[i - 1];
|
|
56600
56600
|
params[key.name] = decoder(m2[i]);
|
|
56601
56601
|
}
|
|
56602
|
-
return { path:
|
|
56602
|
+
return { path: path47, params };
|
|
56603
56603
|
};
|
|
56604
56604
|
}
|
|
56605
|
-
function pathToRegexp(
|
|
56605
|
+
function pathToRegexp(path46, options = {}) {
|
|
56606
56606
|
const { delimiter: delimiter2 = DEFAULT_DELIMITER, end: end2 = true, sensitive = false, trailing = true } = options;
|
|
56607
56607
|
const keys2 = [];
|
|
56608
56608
|
let source = "";
|
|
56609
56609
|
let combinations = 0;
|
|
56610
|
-
function process4(
|
|
56611
|
-
if (Array.isArray(
|
|
56612
|
-
for (const p of
|
|
56610
|
+
function process4(path47) {
|
|
56611
|
+
if (Array.isArray(path47)) {
|
|
56612
|
+
for (const p of path47)
|
|
56613
56613
|
process4(p);
|
|
56614
56614
|
return;
|
|
56615
56615
|
}
|
|
56616
|
-
const data = typeof
|
|
56616
|
+
const data = typeof path47 === "object" ? path47 : parse4(path47, options);
|
|
56617
56617
|
flatten(data.tokens, 0, [], (tokens) => {
|
|
56618
56618
|
if (combinations >= 256) {
|
|
56619
56619
|
throw new PathError("Too many path combinations", data.originalPath);
|
|
@@ -56624,7 +56624,7 @@ var require_dist = __commonJS({
|
|
|
56624
56624
|
combinations++;
|
|
56625
56625
|
});
|
|
56626
56626
|
}
|
|
56627
|
-
process4(
|
|
56627
|
+
process4(path46);
|
|
56628
56628
|
let pattern = `^(?:${source})`;
|
|
56629
56629
|
if (trailing)
|
|
56630
56630
|
pattern += "(?:" + escape2(delimiter2) + "$)?";
|
|
@@ -56764,18 +56764,18 @@ var require_layer = __commonJS({
|
|
|
56764
56764
|
var TRAILING_SLASH_REGEXP = /\/+$/;
|
|
56765
56765
|
var MATCHING_GROUP_REGEXP = /\((?:\?<(.*?)>)?(?!\?)/g;
|
|
56766
56766
|
module2.exports = Layer2;
|
|
56767
|
-
function Layer2(
|
|
56767
|
+
function Layer2(path46, options, fn) {
|
|
56768
56768
|
if (!(this instanceof Layer2)) {
|
|
56769
|
-
return new Layer2(
|
|
56769
|
+
return new Layer2(path46, options, fn);
|
|
56770
56770
|
}
|
|
56771
|
-
debug("new %o",
|
|
56771
|
+
debug("new %o", path46);
|
|
56772
56772
|
const opts = options || {};
|
|
56773
56773
|
this.handle = fn;
|
|
56774
56774
|
this.keys = [];
|
|
56775
56775
|
this.name = fn.name || "<anonymous>";
|
|
56776
56776
|
this.params = void 0;
|
|
56777
56777
|
this.path = void 0;
|
|
56778
|
-
this.slash =
|
|
56778
|
+
this.slash = path46 === "/" && opts.end === false;
|
|
56779
56779
|
function matcher(_path) {
|
|
56780
56780
|
if (_path instanceof RegExp) {
|
|
56781
56781
|
const keys2 = [];
|
|
@@ -56814,7 +56814,7 @@ var require_layer = __commonJS({
|
|
|
56814
56814
|
decode: decodeParam
|
|
56815
56815
|
});
|
|
56816
56816
|
}
|
|
56817
|
-
this.matchers = Array.isArray(
|
|
56817
|
+
this.matchers = Array.isArray(path46) ? path46.map(matcher) : [matcher(path46)];
|
|
56818
56818
|
}
|
|
56819
56819
|
Layer2.prototype.handleError = function handleError(error52, req, res, next) {
|
|
56820
56820
|
const fn = this.handle;
|
|
@@ -56854,9 +56854,9 @@ var require_layer = __commonJS({
|
|
|
56854
56854
|
next(err);
|
|
56855
56855
|
}
|
|
56856
56856
|
};
|
|
56857
|
-
Layer2.prototype.match = function match(
|
|
56857
|
+
Layer2.prototype.match = function match(path46) {
|
|
56858
56858
|
let match2;
|
|
56859
|
-
if (
|
|
56859
|
+
if (path46 != null) {
|
|
56860
56860
|
if (this.slash) {
|
|
56861
56861
|
this.params = {};
|
|
56862
56862
|
this.path = "";
|
|
@@ -56864,7 +56864,7 @@ var require_layer = __commonJS({
|
|
|
56864
56864
|
}
|
|
56865
56865
|
let i = 0;
|
|
56866
56866
|
while (!match2 && i < this.matchers.length) {
|
|
56867
|
-
match2 = this.matchers[i](
|
|
56867
|
+
match2 = this.matchers[i](path46);
|
|
56868
56868
|
i++;
|
|
56869
56869
|
}
|
|
56870
56870
|
}
|
|
@@ -56892,13 +56892,13 @@ var require_layer = __commonJS({
|
|
|
56892
56892
|
throw err;
|
|
56893
56893
|
}
|
|
56894
56894
|
}
|
|
56895
|
-
function loosen(
|
|
56896
|
-
if (
|
|
56897
|
-
return
|
|
56895
|
+
function loosen(path46) {
|
|
56896
|
+
if (path46 instanceof RegExp || path46 === "/") {
|
|
56897
|
+
return path46;
|
|
56898
56898
|
}
|
|
56899
|
-
return Array.isArray(
|
|
56899
|
+
return Array.isArray(path46) ? path46.map(function(p) {
|
|
56900
56900
|
return loosen(p);
|
|
56901
|
-
}) : String(
|
|
56901
|
+
}) : String(path46).replace(TRAILING_SLASH_REGEXP, "");
|
|
56902
56902
|
}
|
|
56903
56903
|
}
|
|
56904
56904
|
});
|
|
@@ -56914,9 +56914,9 @@ var require_route = __commonJS({
|
|
|
56914
56914
|
var flatten = Array.prototype.flat;
|
|
56915
56915
|
var methods = METHODS.map((method) => method.toLowerCase());
|
|
56916
56916
|
module2.exports = Route;
|
|
56917
|
-
function Route(
|
|
56918
|
-
debug("new %o",
|
|
56919
|
-
this.path =
|
|
56917
|
+
function Route(path46) {
|
|
56918
|
+
debug("new %o", path46);
|
|
56919
|
+
this.path = path46;
|
|
56920
56920
|
this.stack = [];
|
|
56921
56921
|
this.methods = /* @__PURE__ */ Object.create(null);
|
|
56922
56922
|
}
|
|
@@ -57124,8 +57124,8 @@ var require_router = __commonJS({
|
|
|
57124
57124
|
if (++sync > 100) {
|
|
57125
57125
|
return setImmediate(next, err);
|
|
57126
57126
|
}
|
|
57127
|
-
const
|
|
57128
|
-
if (
|
|
57127
|
+
const path46 = getPathname(req);
|
|
57128
|
+
if (path46 == null) {
|
|
57129
57129
|
return done(layerError);
|
|
57130
57130
|
}
|
|
57131
57131
|
let layer;
|
|
@@ -57133,7 +57133,7 @@ var require_router = __commonJS({
|
|
|
57133
57133
|
let route;
|
|
57134
57134
|
while (match !== true && idx < stack.length) {
|
|
57135
57135
|
layer = stack[idx++];
|
|
57136
|
-
match = matchLayer(layer,
|
|
57136
|
+
match = matchLayer(layer, path46);
|
|
57137
57137
|
route = layer.route;
|
|
57138
57138
|
if (typeof match !== "boolean") {
|
|
57139
57139
|
layerError = layerError || match;
|
|
@@ -57171,18 +57171,18 @@ var require_router = __commonJS({
|
|
|
57171
57171
|
} else if (route) {
|
|
57172
57172
|
layer.handleRequest(req, res, next);
|
|
57173
57173
|
} else {
|
|
57174
|
-
trimPrefix(layer, layerError, layerPath,
|
|
57174
|
+
trimPrefix(layer, layerError, layerPath, path46);
|
|
57175
57175
|
}
|
|
57176
57176
|
sync = 0;
|
|
57177
57177
|
});
|
|
57178
57178
|
}
|
|
57179
|
-
function trimPrefix(layer, layerError, layerPath,
|
|
57179
|
+
function trimPrefix(layer, layerError, layerPath, path46) {
|
|
57180
57180
|
if (layerPath.length !== 0) {
|
|
57181
|
-
if (layerPath !==
|
|
57181
|
+
if (layerPath !== path46.substring(0, layerPath.length)) {
|
|
57182
57182
|
next(layerError);
|
|
57183
57183
|
return;
|
|
57184
57184
|
}
|
|
57185
|
-
const c =
|
|
57185
|
+
const c = path46[layerPath.length];
|
|
57186
57186
|
if (c && c !== "/") {
|
|
57187
57187
|
next(layerError);
|
|
57188
57188
|
return;
|
|
@@ -57206,7 +57206,7 @@ var require_router = __commonJS({
|
|
|
57206
57206
|
};
|
|
57207
57207
|
Router.prototype.use = function use2(handler) {
|
|
57208
57208
|
let offset = 0;
|
|
57209
|
-
let
|
|
57209
|
+
let path46 = "/";
|
|
57210
57210
|
if (typeof handler !== "function") {
|
|
57211
57211
|
let arg = handler;
|
|
57212
57212
|
while (Array.isArray(arg) && arg.length !== 0) {
|
|
@@ -57214,7 +57214,7 @@ var require_router = __commonJS({
|
|
|
57214
57214
|
}
|
|
57215
57215
|
if (typeof arg !== "function") {
|
|
57216
57216
|
offset = 1;
|
|
57217
|
-
|
|
57217
|
+
path46 = handler;
|
|
57218
57218
|
}
|
|
57219
57219
|
}
|
|
57220
57220
|
const callbacks = flatten.call(slice2.call(arguments, offset), Infinity);
|
|
@@ -57226,8 +57226,8 @@ var require_router = __commonJS({
|
|
|
57226
57226
|
if (typeof fn !== "function") {
|
|
57227
57227
|
throw new TypeError("argument handler must be a function");
|
|
57228
57228
|
}
|
|
57229
|
-
debug("use %o %s",
|
|
57230
|
-
const layer = new Layer2(
|
|
57229
|
+
debug("use %o %s", path46, fn.name || "<anonymous>");
|
|
57230
|
+
const layer = new Layer2(path46, {
|
|
57231
57231
|
sensitive: this.caseSensitive,
|
|
57232
57232
|
strict: false,
|
|
57233
57233
|
end: false
|
|
@@ -57237,9 +57237,9 @@ var require_router = __commonJS({
|
|
|
57237
57237
|
}
|
|
57238
57238
|
return this;
|
|
57239
57239
|
};
|
|
57240
|
-
Router.prototype.route = function route(
|
|
57241
|
-
const route2 = new Route(
|
|
57242
|
-
const layer = new Layer2(
|
|
57240
|
+
Router.prototype.route = function route(path46) {
|
|
57241
|
+
const route2 = new Route(path46);
|
|
57242
|
+
const layer = new Layer2(path46, {
|
|
57243
57243
|
sensitive: this.caseSensitive,
|
|
57244
57244
|
strict: this.strict,
|
|
57245
57245
|
end: true
|
|
@@ -57252,8 +57252,8 @@ var require_router = __commonJS({
|
|
|
57252
57252
|
return route2;
|
|
57253
57253
|
};
|
|
57254
57254
|
methods.concat("all").forEach(function(method) {
|
|
57255
|
-
Router.prototype[method] = function(
|
|
57256
|
-
const route = this.route(
|
|
57255
|
+
Router.prototype[method] = function(path46) {
|
|
57256
|
+
const route = this.route(path46);
|
|
57257
57257
|
route[method].apply(route, slice2.call(arguments, 1));
|
|
57258
57258
|
return this;
|
|
57259
57259
|
};
|
|
@@ -57282,9 +57282,9 @@ var require_router = __commonJS({
|
|
|
57282
57282
|
const fqdnIndex = url3.substring(0, pathLength).indexOf("://");
|
|
57283
57283
|
return fqdnIndex !== -1 ? url3.substring(0, url3.indexOf("/", 3 + fqdnIndex)) : void 0;
|
|
57284
57284
|
}
|
|
57285
|
-
function matchLayer(layer,
|
|
57285
|
+
function matchLayer(layer, path46) {
|
|
57286
57286
|
try {
|
|
57287
|
-
return layer.match(
|
|
57287
|
+
return layer.match(path46);
|
|
57288
57288
|
} catch (err) {
|
|
57289
57289
|
return err;
|
|
57290
57290
|
}
|
|
@@ -57434,7 +57434,7 @@ var require_application = __commonJS({
|
|
|
57434
57434
|
var compileETag = require_utils3().compileETag;
|
|
57435
57435
|
var compileQueryParser = require_utils3().compileQueryParser;
|
|
57436
57436
|
var compileTrust = require_utils3().compileTrust;
|
|
57437
|
-
var
|
|
57437
|
+
var resolve11 = require("node:path").resolve;
|
|
57438
57438
|
var once = require_once();
|
|
57439
57439
|
var Router = require_router();
|
|
57440
57440
|
var slice2 = Array.prototype.slice;
|
|
@@ -57488,7 +57488,7 @@ var require_application = __commonJS({
|
|
|
57488
57488
|
this.mountpath = "/";
|
|
57489
57489
|
this.locals.settings = this.settings;
|
|
57490
57490
|
this.set("view", View2);
|
|
57491
|
-
this.set("views",
|
|
57491
|
+
this.set("views", resolve11("views"));
|
|
57492
57492
|
this.set("jsonp callback name", "callback");
|
|
57493
57493
|
if (env2 === "production") {
|
|
57494
57494
|
this.enable("view cache");
|
|
@@ -57513,7 +57513,7 @@ var require_application = __commonJS({
|
|
|
57513
57513
|
};
|
|
57514
57514
|
app.use = function use2(fn) {
|
|
57515
57515
|
var offset = 0;
|
|
57516
|
-
var
|
|
57516
|
+
var path46 = "/";
|
|
57517
57517
|
if (typeof fn !== "function") {
|
|
57518
57518
|
var arg = fn;
|
|
57519
57519
|
while (Array.isArray(arg) && arg.length !== 0) {
|
|
@@ -57521,7 +57521,7 @@ var require_application = __commonJS({
|
|
|
57521
57521
|
}
|
|
57522
57522
|
if (typeof arg !== "function") {
|
|
57523
57523
|
offset = 1;
|
|
57524
|
-
|
|
57524
|
+
path46 = fn;
|
|
57525
57525
|
}
|
|
57526
57526
|
}
|
|
57527
57527
|
var fns = flatten.call(slice2.call(arguments, offset), Infinity);
|
|
@@ -57531,12 +57531,12 @@ var require_application = __commonJS({
|
|
|
57531
57531
|
var router = this.router;
|
|
57532
57532
|
fns.forEach(function(fn2) {
|
|
57533
57533
|
if (!fn2 || !fn2.handle || !fn2.set) {
|
|
57534
|
-
return router.use(
|
|
57534
|
+
return router.use(path46, fn2);
|
|
57535
57535
|
}
|
|
57536
|
-
debug(".use app under %s",
|
|
57537
|
-
fn2.mountpath =
|
|
57536
|
+
debug(".use app under %s", path46);
|
|
57537
|
+
fn2.mountpath = path46;
|
|
57538
57538
|
fn2.parent = this;
|
|
57539
|
-
router.use(
|
|
57539
|
+
router.use(path46, function mounted_app(req, res, next) {
|
|
57540
57540
|
var orig = req.app;
|
|
57541
57541
|
fn2.handle(req, res, function(err) {
|
|
57542
57542
|
Object.setPrototypeOf(req, orig.request);
|
|
@@ -57548,8 +57548,8 @@ var require_application = __commonJS({
|
|
|
57548
57548
|
}, this);
|
|
57549
57549
|
return this;
|
|
57550
57550
|
};
|
|
57551
|
-
app.route = function route(
|
|
57552
|
-
return this.router.route(
|
|
57551
|
+
app.route = function route(path46) {
|
|
57552
|
+
return this.router.route(path46);
|
|
57553
57553
|
};
|
|
57554
57554
|
app.engine = function engine(ext, fn) {
|
|
57555
57555
|
if (typeof fn !== "function") {
|
|
@@ -57592,7 +57592,7 @@ var require_application = __commonJS({
|
|
|
57592
57592
|
}
|
|
57593
57593
|
return this;
|
|
57594
57594
|
};
|
|
57595
|
-
app.path = function
|
|
57595
|
+
app.path = function path46() {
|
|
57596
57596
|
return this.parent ? this.parent.path() + this.mountpath : "";
|
|
57597
57597
|
};
|
|
57598
57598
|
app.enabled = function enabled(setting) {
|
|
@@ -57608,17 +57608,17 @@ var require_application = __commonJS({
|
|
|
57608
57608
|
return this.set(setting, false);
|
|
57609
57609
|
};
|
|
57610
57610
|
methods.forEach(function(method) {
|
|
57611
|
-
app[method] = function(
|
|
57611
|
+
app[method] = function(path46) {
|
|
57612
57612
|
if (method === "get" && arguments.length === 1) {
|
|
57613
|
-
return this.set(
|
|
57613
|
+
return this.set(path46);
|
|
57614
57614
|
}
|
|
57615
|
-
var route = this.route(
|
|
57615
|
+
var route = this.route(path46);
|
|
57616
57616
|
route[method].apply(route, slice2.call(arguments, 1));
|
|
57617
57617
|
return this;
|
|
57618
57618
|
};
|
|
57619
57619
|
});
|
|
57620
|
-
app.all = function all3(
|
|
57621
|
-
var route = this.route(
|
|
57620
|
+
app.all = function all3(path46) {
|
|
57621
|
+
var route = this.route(path46);
|
|
57622
57622
|
var args = slice2.call(arguments, 1);
|
|
57623
57623
|
for (var i = 0; i < methods.length; i++) {
|
|
57624
57624
|
route[methods[i]].apply(route, args);
|
|
@@ -67661,11 +67661,11 @@ var require_mime_types3 = __commonJS({
|
|
|
67661
67661
|
}
|
|
67662
67662
|
return exts[0];
|
|
67663
67663
|
}
|
|
67664
|
-
function lookup(
|
|
67665
|
-
if (!
|
|
67664
|
+
function lookup(path46) {
|
|
67665
|
+
if (!path46 || typeof path46 !== "string") {
|
|
67666
67666
|
return false;
|
|
67667
67667
|
}
|
|
67668
|
-
var extension2 = extname("x." +
|
|
67668
|
+
var extension2 = extname("x." + path46).toLowerCase().slice(1);
|
|
67669
67669
|
if (!extension2) {
|
|
67670
67670
|
return false;
|
|
67671
67671
|
}
|
|
@@ -68044,7 +68044,7 @@ var require_request = __commonJS({
|
|
|
68044
68044
|
var subdomains2 = !isIP(hostname3) ? hostname3.split(".").reverse() : [hostname3];
|
|
68045
68045
|
return subdomains2.slice(offset);
|
|
68046
68046
|
});
|
|
68047
|
-
defineGetter(req, "path", function
|
|
68047
|
+
defineGetter(req, "path", function path46() {
|
|
68048
68048
|
return parse4(this).pathname;
|
|
68049
68049
|
});
|
|
68050
68050
|
defineGetter(req, "host", function host() {
|
|
@@ -77909,11 +77909,11 @@ var require_mime_types4 = __commonJS({
|
|
|
77909
77909
|
}
|
|
77910
77910
|
return exts[0];
|
|
77911
77911
|
}
|
|
77912
|
-
function lookup(
|
|
77913
|
-
if (!
|
|
77912
|
+
function lookup(path46) {
|
|
77913
|
+
if (!path46 || typeof path46 !== "string") {
|
|
77914
77914
|
return false;
|
|
77915
77915
|
}
|
|
77916
|
-
var extension2 = extname("x." +
|
|
77916
|
+
var extension2 = extname("x." + path46).toLowerCase().slice(1);
|
|
77917
77917
|
if (!extension2) {
|
|
77918
77918
|
return false;
|
|
77919
77919
|
}
|
|
@@ -77973,27 +77973,27 @@ var require_send = __commonJS({
|
|
|
77973
77973
|
var ms = require_ms();
|
|
77974
77974
|
var onFinished = require_on_finished();
|
|
77975
77975
|
var parseRange = require_range_parser();
|
|
77976
|
-
var
|
|
77976
|
+
var path46 = require("path");
|
|
77977
77977
|
var statuses = require_statuses();
|
|
77978
77978
|
var Stream = require("stream");
|
|
77979
77979
|
var util3 = require("util");
|
|
77980
|
-
var extname =
|
|
77981
|
-
var join37 =
|
|
77982
|
-
var normalize5 =
|
|
77983
|
-
var
|
|
77984
|
-
var sep7 =
|
|
77980
|
+
var extname = path46.extname;
|
|
77981
|
+
var join37 = path46.join;
|
|
77982
|
+
var normalize5 = path46.normalize;
|
|
77983
|
+
var resolve11 = path46.resolve;
|
|
77984
|
+
var sep7 = path46.sep;
|
|
77985
77985
|
var BYTES_RANGE_REGEXP = /^ *bytes=/;
|
|
77986
77986
|
var MAX_MAXAGE = 60 * 60 * 24 * 365 * 1e3;
|
|
77987
77987
|
var UP_PATH_REGEXP = /(?:^|[\\/])\.\.(?:[\\/]|$)/;
|
|
77988
77988
|
module2.exports = send;
|
|
77989
|
-
function send(req,
|
|
77990
|
-
return new SendStream(req,
|
|
77989
|
+
function send(req, path47, options) {
|
|
77990
|
+
return new SendStream(req, path47, options);
|
|
77991
77991
|
}
|
|
77992
|
-
function SendStream(req,
|
|
77992
|
+
function SendStream(req, path47, options) {
|
|
77993
77993
|
Stream.call(this);
|
|
77994
77994
|
var opts = options || {};
|
|
77995
77995
|
this.options = opts;
|
|
77996
|
-
this.path =
|
|
77996
|
+
this.path = path47;
|
|
77997
77997
|
this.req = req;
|
|
77998
77998
|
this._acceptRanges = opts.acceptRanges !== void 0 ? Boolean(opts.acceptRanges) : true;
|
|
77999
77999
|
this._cacheControl = opts.cacheControl !== void 0 ? Boolean(opts.cacheControl) : true;
|
|
@@ -78009,7 +78009,7 @@ var require_send = __commonJS({
|
|
|
78009
78009
|
this._maxage = opts.maxAge || opts.maxage;
|
|
78010
78010
|
this._maxage = typeof this._maxage === "string" ? ms(this._maxage) : Number(this._maxage);
|
|
78011
78011
|
this._maxage = !isNaN(this._maxage) ? Math.min(Math.max(0, this._maxage), MAX_MAXAGE) : 0;
|
|
78012
|
-
this._root = opts.root ?
|
|
78012
|
+
this._root = opts.root ? resolve11(opts.root) : null;
|
|
78013
78013
|
}
|
|
78014
78014
|
util3.inherits(SendStream, Stream);
|
|
78015
78015
|
SendStream.prototype.error = function error52(status, err) {
|
|
@@ -78107,10 +78107,10 @@ var require_send = __commonJS({
|
|
|
78107
78107
|
var lastModified = this.res.getHeader("Last-Modified");
|
|
78108
78108
|
return parseHttpDate(lastModified) <= parseHttpDate(ifRange);
|
|
78109
78109
|
};
|
|
78110
|
-
SendStream.prototype.redirect = function redirect(
|
|
78110
|
+
SendStream.prototype.redirect = function redirect(path47) {
|
|
78111
78111
|
var res = this.res;
|
|
78112
78112
|
if (hasListeners(this, "directory")) {
|
|
78113
|
-
this.emit("directory", res,
|
|
78113
|
+
this.emit("directory", res, path47);
|
|
78114
78114
|
return;
|
|
78115
78115
|
}
|
|
78116
78116
|
if (this.hasTrailingSlash()) {
|
|
@@ -78130,38 +78130,38 @@ var require_send = __commonJS({
|
|
|
78130
78130
|
SendStream.prototype.pipe = function pipe2(res) {
|
|
78131
78131
|
var root = this._root;
|
|
78132
78132
|
this.res = res;
|
|
78133
|
-
var
|
|
78134
|
-
if (
|
|
78133
|
+
var path47 = decode4(this.path);
|
|
78134
|
+
if (path47 === -1) {
|
|
78135
78135
|
this.error(400);
|
|
78136
78136
|
return res;
|
|
78137
78137
|
}
|
|
78138
|
-
if (~
|
|
78138
|
+
if (~path47.indexOf("\0")) {
|
|
78139
78139
|
this.error(400);
|
|
78140
78140
|
return res;
|
|
78141
78141
|
}
|
|
78142
78142
|
var parts;
|
|
78143
78143
|
if (root !== null) {
|
|
78144
|
-
if (
|
|
78145
|
-
|
|
78144
|
+
if (path47) {
|
|
78145
|
+
path47 = normalize5("." + sep7 + path47);
|
|
78146
78146
|
}
|
|
78147
|
-
if (UP_PATH_REGEXP.test(
|
|
78148
|
-
debug('malicious path "%s"',
|
|
78147
|
+
if (UP_PATH_REGEXP.test(path47)) {
|
|
78148
|
+
debug('malicious path "%s"', path47);
|
|
78149
78149
|
this.error(403);
|
|
78150
78150
|
return res;
|
|
78151
78151
|
}
|
|
78152
|
-
parts =
|
|
78153
|
-
|
|
78152
|
+
parts = path47.split(sep7);
|
|
78153
|
+
path47 = normalize5(join37(root, path47));
|
|
78154
78154
|
} else {
|
|
78155
|
-
if (UP_PATH_REGEXP.test(
|
|
78156
|
-
debug('malicious path "%s"',
|
|
78155
|
+
if (UP_PATH_REGEXP.test(path47)) {
|
|
78156
|
+
debug('malicious path "%s"', path47);
|
|
78157
78157
|
this.error(403);
|
|
78158
78158
|
return res;
|
|
78159
78159
|
}
|
|
78160
|
-
parts = normalize5(
|
|
78161
|
-
|
|
78160
|
+
parts = normalize5(path47).split(sep7);
|
|
78161
|
+
path47 = resolve11(path47);
|
|
78162
78162
|
}
|
|
78163
78163
|
if (containsDotFile(parts)) {
|
|
78164
|
-
debug('%s dotfile "%s"', this._dotfiles,
|
|
78164
|
+
debug('%s dotfile "%s"', this._dotfiles, path47);
|
|
78165
78165
|
switch (this._dotfiles) {
|
|
78166
78166
|
case "allow":
|
|
78167
78167
|
break;
|
|
@@ -78175,13 +78175,13 @@ var require_send = __commonJS({
|
|
|
78175
78175
|
}
|
|
78176
78176
|
}
|
|
78177
78177
|
if (this._index.length && this.hasTrailingSlash()) {
|
|
78178
|
-
this.sendIndex(
|
|
78178
|
+
this.sendIndex(path47);
|
|
78179
78179
|
return res;
|
|
78180
78180
|
}
|
|
78181
|
-
this.sendFile(
|
|
78181
|
+
this.sendFile(path47);
|
|
78182
78182
|
return res;
|
|
78183
78183
|
};
|
|
78184
|
-
SendStream.prototype.send = function send2(
|
|
78184
|
+
SendStream.prototype.send = function send2(path47, stat) {
|
|
78185
78185
|
var len2 = stat.size;
|
|
78186
78186
|
var options = this.options;
|
|
78187
78187
|
var opts = {};
|
|
@@ -78193,9 +78193,9 @@ var require_send = __commonJS({
|
|
|
78193
78193
|
this.headersAlreadySent();
|
|
78194
78194
|
return;
|
|
78195
78195
|
}
|
|
78196
|
-
debug('pipe "%s"',
|
|
78197
|
-
this.setHeader(
|
|
78198
|
-
this.type(
|
|
78196
|
+
debug('pipe "%s"', path47);
|
|
78197
|
+
this.setHeader(path47, stat);
|
|
78198
|
+
this.type(path47);
|
|
78199
78199
|
if (this.isConditionalGET()) {
|
|
78200
78200
|
if (this.isPreconditionFailure()) {
|
|
78201
78201
|
this.error(412);
|
|
@@ -78245,31 +78245,31 @@ var require_send = __commonJS({
|
|
|
78245
78245
|
res.end();
|
|
78246
78246
|
return;
|
|
78247
78247
|
}
|
|
78248
|
-
this.stream(
|
|
78248
|
+
this.stream(path47, opts);
|
|
78249
78249
|
};
|
|
78250
|
-
SendStream.prototype.sendFile = function sendFile(
|
|
78250
|
+
SendStream.prototype.sendFile = function sendFile(path47) {
|
|
78251
78251
|
var i = 0;
|
|
78252
78252
|
var self2 = this;
|
|
78253
|
-
debug('stat "%s"',
|
|
78254
|
-
fs44.stat(
|
|
78255
|
-
var pathEndsWithSep =
|
|
78256
|
-
if (err && err.code === "ENOENT" && !extname(
|
|
78253
|
+
debug('stat "%s"', path47);
|
|
78254
|
+
fs44.stat(path47, function onstat(err, stat) {
|
|
78255
|
+
var pathEndsWithSep = path47[path47.length - 1] === sep7;
|
|
78256
|
+
if (err && err.code === "ENOENT" && !extname(path47) && !pathEndsWithSep) {
|
|
78257
78257
|
return next(err);
|
|
78258
78258
|
}
|
|
78259
78259
|
if (err)
|
|
78260
78260
|
return self2.onStatError(err);
|
|
78261
78261
|
if (stat.isDirectory())
|
|
78262
|
-
return self2.redirect(
|
|
78262
|
+
return self2.redirect(path47);
|
|
78263
78263
|
if (pathEndsWithSep)
|
|
78264
78264
|
return self2.error(404);
|
|
78265
|
-
self2.emit("file",
|
|
78266
|
-
self2.send(
|
|
78265
|
+
self2.emit("file", path47, stat);
|
|
78266
|
+
self2.send(path47, stat);
|
|
78267
78267
|
});
|
|
78268
78268
|
function next(err) {
|
|
78269
78269
|
if (self2._extensions.length <= i) {
|
|
78270
78270
|
return err ? self2.onStatError(err) : self2.error(404);
|
|
78271
78271
|
}
|
|
78272
|
-
var p =
|
|
78272
|
+
var p = path47 + "." + self2._extensions[i++];
|
|
78273
78273
|
debug('stat "%s"', p);
|
|
78274
78274
|
fs44.stat(p, function(err2, stat) {
|
|
78275
78275
|
if (err2)
|
|
@@ -78281,7 +78281,7 @@ var require_send = __commonJS({
|
|
|
78281
78281
|
});
|
|
78282
78282
|
}
|
|
78283
78283
|
};
|
|
78284
|
-
SendStream.prototype.sendIndex = function sendIndex(
|
|
78284
|
+
SendStream.prototype.sendIndex = function sendIndex(path47) {
|
|
78285
78285
|
var i = -1;
|
|
78286
78286
|
var self2 = this;
|
|
78287
78287
|
function next(err) {
|
|
@@ -78290,7 +78290,7 @@ var require_send = __commonJS({
|
|
|
78290
78290
|
return self2.onStatError(err);
|
|
78291
78291
|
return self2.error(404);
|
|
78292
78292
|
}
|
|
78293
|
-
var p = join37(
|
|
78293
|
+
var p = join37(path47, self2._index[i]);
|
|
78294
78294
|
debug('stat "%s"', p);
|
|
78295
78295
|
fs44.stat(p, function(err2, stat) {
|
|
78296
78296
|
if (err2)
|
|
@@ -78303,10 +78303,10 @@ var require_send = __commonJS({
|
|
|
78303
78303
|
}
|
|
78304
78304
|
next();
|
|
78305
78305
|
};
|
|
78306
|
-
SendStream.prototype.stream = function stream4(
|
|
78306
|
+
SendStream.prototype.stream = function stream4(path47, options) {
|
|
78307
78307
|
var self2 = this;
|
|
78308
78308
|
var res = this.res;
|
|
78309
|
-
var stream5 = fs44.createReadStream(
|
|
78309
|
+
var stream5 = fs44.createReadStream(path47, options);
|
|
78310
78310
|
this.emit("stream", stream5);
|
|
78311
78311
|
stream5.pipe(res);
|
|
78312
78312
|
function cleanup() {
|
|
@@ -78321,18 +78321,18 @@ var require_send = __commonJS({
|
|
|
78321
78321
|
self2.emit("end");
|
|
78322
78322
|
});
|
|
78323
78323
|
};
|
|
78324
|
-
SendStream.prototype.type = function type(
|
|
78324
|
+
SendStream.prototype.type = function type(path47) {
|
|
78325
78325
|
var res = this.res;
|
|
78326
78326
|
if (res.getHeader("Content-Type"))
|
|
78327
78327
|
return;
|
|
78328
|
-
var ext = extname(
|
|
78328
|
+
var ext = extname(path47);
|
|
78329
78329
|
var type2 = mime.contentType(ext) || "application/octet-stream";
|
|
78330
78330
|
debug("content-type %s", type2);
|
|
78331
78331
|
res.setHeader("Content-Type", type2);
|
|
78332
78332
|
};
|
|
78333
|
-
SendStream.prototype.setHeader = function setHeader(
|
|
78333
|
+
SendStream.prototype.setHeader = function setHeader(path47, stat) {
|
|
78334
78334
|
var res = this.res;
|
|
78335
|
-
this.emit("headers", res,
|
|
78335
|
+
this.emit("headers", res, path47, stat);
|
|
78336
78336
|
if (this._acceptRanges && !res.getHeader("Accept-Ranges")) {
|
|
78337
78337
|
debug("accept ranges");
|
|
78338
78338
|
res.setHeader("Accept-Ranges", "bytes");
|
|
@@ -78390,9 +78390,9 @@ var require_send = __commonJS({
|
|
|
78390
78390
|
}
|
|
78391
78391
|
return err instanceof Error ? createError(status, err, { expose: false }) : createError(status, err);
|
|
78392
78392
|
}
|
|
78393
|
-
function decode4(
|
|
78393
|
+
function decode4(path47) {
|
|
78394
78394
|
try {
|
|
78395
|
-
return decodeURIComponent(
|
|
78395
|
+
return decodeURIComponent(path47);
|
|
78396
78396
|
} catch (err) {
|
|
78397
78397
|
return -1;
|
|
78398
78398
|
}
|
|
@@ -78536,7 +78536,7 @@ var require_response = __commonJS({
|
|
|
78536
78536
|
var http9 = require("node:http");
|
|
78537
78537
|
var onFinished = require_on_finished();
|
|
78538
78538
|
var mime = require_mime_types2();
|
|
78539
|
-
var
|
|
78539
|
+
var path46 = require("node:path");
|
|
78540
78540
|
var pathIsAbsolute = require("node:path").isAbsolute;
|
|
78541
78541
|
var statuses = require_statuses();
|
|
78542
78542
|
var sign = require_cookie_signature().sign;
|
|
@@ -78545,8 +78545,8 @@ var require_response = __commonJS({
|
|
|
78545
78545
|
var setCharset = require_utils3().setCharset;
|
|
78546
78546
|
var cookie = require_cookie();
|
|
78547
78547
|
var send = require_send();
|
|
78548
|
-
var extname =
|
|
78549
|
-
var
|
|
78548
|
+
var extname = path46.extname;
|
|
78549
|
+
var resolve11 = path46.resolve;
|
|
78550
78550
|
var vary = require_vary();
|
|
78551
78551
|
var { Buffer: Buffer2 } = require("node:buffer");
|
|
78552
78552
|
var res = Object.create(http9.ServerResponse.prototype);
|
|
@@ -78693,26 +78693,26 @@ var require_response = __commonJS({
|
|
|
78693
78693
|
this.type("txt");
|
|
78694
78694
|
return this.send(body);
|
|
78695
78695
|
};
|
|
78696
|
-
res.sendFile = function sendFile(
|
|
78696
|
+
res.sendFile = function sendFile(path47, options, callback) {
|
|
78697
78697
|
var done = callback;
|
|
78698
78698
|
var req = this.req;
|
|
78699
78699
|
var res2 = this;
|
|
78700
78700
|
var next = req.next;
|
|
78701
78701
|
var opts = options || {};
|
|
78702
|
-
if (!
|
|
78702
|
+
if (!path47) {
|
|
78703
78703
|
throw new TypeError("path argument is required to res.sendFile");
|
|
78704
78704
|
}
|
|
78705
|
-
if (typeof
|
|
78705
|
+
if (typeof path47 !== "string") {
|
|
78706
78706
|
throw new TypeError("path must be a string to res.sendFile");
|
|
78707
78707
|
}
|
|
78708
78708
|
if (typeof options === "function") {
|
|
78709
78709
|
done = options;
|
|
78710
78710
|
opts = {};
|
|
78711
78711
|
}
|
|
78712
|
-
if (!opts.root && !pathIsAbsolute(
|
|
78712
|
+
if (!opts.root && !pathIsAbsolute(path47)) {
|
|
78713
78713
|
throw new TypeError("path must be absolute or specify root to res.sendFile");
|
|
78714
78714
|
}
|
|
78715
|
-
var pathname = encodeURI(
|
|
78715
|
+
var pathname = encodeURI(path47);
|
|
78716
78716
|
opts.etag = this.app.enabled("etag");
|
|
78717
78717
|
var file4 = send(req, pathname, opts);
|
|
78718
78718
|
sendfile(res2, file4, opts, function(err) {
|
|
@@ -78725,7 +78725,7 @@ var require_response = __commonJS({
|
|
|
78725
78725
|
}
|
|
78726
78726
|
});
|
|
78727
78727
|
};
|
|
78728
|
-
res.download = function download(
|
|
78728
|
+
res.download = function download(path47, filename, options, callback) {
|
|
78729
78729
|
var done = callback;
|
|
78730
78730
|
var name = filename;
|
|
78731
78731
|
var opts = options || null;
|
|
@@ -78742,7 +78742,7 @@ var require_response = __commonJS({
|
|
|
78742
78742
|
opts = filename;
|
|
78743
78743
|
}
|
|
78744
78744
|
var headers = {
|
|
78745
|
-
"Content-Disposition": contentDisposition(name ||
|
|
78745
|
+
"Content-Disposition": contentDisposition(name || path47)
|
|
78746
78746
|
};
|
|
78747
78747
|
if (opts && opts.headers) {
|
|
78748
78748
|
var keys2 = Object.keys(opts.headers);
|
|
@@ -78755,7 +78755,7 @@ var require_response = __commonJS({
|
|
|
78755
78755
|
}
|
|
78756
78756
|
opts = Object.create(opts);
|
|
78757
78757
|
opts.headers = headers;
|
|
78758
|
-
var fullPath = !opts.root ?
|
|
78758
|
+
var fullPath = !opts.root ? resolve11(path47) : path47;
|
|
78759
78759
|
return this.sendFile(fullPath, opts, done);
|
|
78760
78760
|
};
|
|
78761
78761
|
res.contentType = res.type = function contentType2(type) {
|
|
@@ -79012,7 +79012,7 @@ var require_serve_static = __commonJS({
|
|
|
79012
79012
|
var encodeUrl = require_encodeurl();
|
|
79013
79013
|
var escapeHtml2 = require_escape_html();
|
|
79014
79014
|
var parseUrl2 = require_parseurl();
|
|
79015
|
-
var
|
|
79015
|
+
var resolve11 = require("path").resolve;
|
|
79016
79016
|
var send = require_send();
|
|
79017
79017
|
var url3 = require("url");
|
|
79018
79018
|
module2.exports = serveStatic;
|
|
@@ -79031,7 +79031,7 @@ var require_serve_static = __commonJS({
|
|
|
79031
79031
|
throw new TypeError("option setHeaders must be function");
|
|
79032
79032
|
}
|
|
79033
79033
|
opts.maxage = opts.maxage || opts.maxAge || 0;
|
|
79034
|
-
opts.root =
|
|
79034
|
+
opts.root = resolve11(root);
|
|
79035
79035
|
var onDirectory = redirect ? createRedirectDirectoryListener() : createNotFoundDirectoryListener();
|
|
79036
79036
|
return function serveStatic2(req, res, next) {
|
|
79037
79037
|
if (req.method !== "GET" && req.method !== "HEAD") {
|
|
@@ -79046,11 +79046,11 @@ var require_serve_static = __commonJS({
|
|
|
79046
79046
|
}
|
|
79047
79047
|
var forwardError = !fallthrough;
|
|
79048
79048
|
var originalUrl = parseUrl2.original(req);
|
|
79049
|
-
var
|
|
79050
|
-
if (
|
|
79051
|
-
|
|
79049
|
+
var path46 = parseUrl2(req).pathname;
|
|
79050
|
+
if (path46 === "/" && originalUrl.pathname.substr(-1) !== "/") {
|
|
79051
|
+
path46 = "";
|
|
79052
79052
|
}
|
|
79053
|
-
var stream4 = send(req,
|
|
79053
|
+
var stream4 = send(req, path46, opts);
|
|
79054
79054
|
stream4.on("directory", onDirectory);
|
|
79055
79055
|
if (setHeaders) {
|
|
79056
79056
|
stream4.on("headers", setHeaders);
|
|
@@ -79216,11 +79216,11 @@ var init_ipcEndpoint = __esm({
|
|
|
79216
79216
|
|
|
79217
79217
|
// src/common/tcpPortAvailability.ts
|
|
79218
79218
|
function isTcpPortAvailable(port, host = "127.0.0.1") {
|
|
79219
|
-
return new Promise((
|
|
79219
|
+
return new Promise((resolve11) => {
|
|
79220
79220
|
const server = net.createServer();
|
|
79221
79221
|
const finish = (available) => {
|
|
79222
79222
|
server.removeAllListeners();
|
|
79223
|
-
|
|
79223
|
+
resolve11(available);
|
|
79224
79224
|
};
|
|
79225
79225
|
server.once("error", () => finish(false));
|
|
79226
79226
|
server.listen({ port, host, exclusive: true }, () => {
|
|
@@ -79883,6 +79883,11 @@ var init_src = __esm({
|
|
|
79883
79883
|
);
|
|
79884
79884
|
}
|
|
79885
79885
|
try {
|
|
79886
|
+
if (config2.fileSearchPath) {
|
|
79887
|
+
await connection.run(
|
|
79888
|
+
`SET file_search_path = '${config2.fileSearchPath.replace(/'/g, "''")}'`
|
|
79889
|
+
);
|
|
79890
|
+
}
|
|
79886
79891
|
if (config2.mounts) {
|
|
79887
79892
|
for (const filePath of Object.values(config2.mounts)) {
|
|
79888
79893
|
if (!fs24.existsSync(filePath)) {
|
|
@@ -89881,11 +89886,11 @@ var require_mime_types5 = __commonJS({
|
|
|
89881
89886
|
}
|
|
89882
89887
|
return exts[0];
|
|
89883
89888
|
}
|
|
89884
|
-
function lookup(
|
|
89885
|
-
if (!
|
|
89889
|
+
function lookup(path46) {
|
|
89890
|
+
if (!path46 || typeof path46 !== "string") {
|
|
89886
89891
|
return false;
|
|
89887
89892
|
}
|
|
89888
|
-
var extension2 = extname("x." +
|
|
89893
|
+
var extension2 = extname("x." + path46).toLowerCase().substr(1);
|
|
89889
89894
|
if (!extension2) {
|
|
89890
89895
|
return false;
|
|
89891
89896
|
}
|
|
@@ -90187,7 +90192,7 @@ var require_form_data = __commonJS({
|
|
|
90187
90192
|
"use strict";
|
|
90188
90193
|
var CombinedStream = require_combined_stream();
|
|
90189
90194
|
var util3 = require("util");
|
|
90190
|
-
var
|
|
90195
|
+
var path46 = require("path");
|
|
90191
90196
|
var http9 = require("http");
|
|
90192
90197
|
var https6 = require("https");
|
|
90193
90198
|
var parseUrl2 = require("url").parse;
|
|
@@ -90315,11 +90320,11 @@ var require_form_data = __commonJS({
|
|
|
90315
90320
|
FormData3.prototype._getContentDisposition = function(value, options) {
|
|
90316
90321
|
var filename;
|
|
90317
90322
|
if (typeof options.filepath === "string") {
|
|
90318
|
-
filename =
|
|
90323
|
+
filename = path46.normalize(options.filepath).replace(/\\/g, "/");
|
|
90319
90324
|
} else if (options.filename || value && (value.name || value.path)) {
|
|
90320
|
-
filename =
|
|
90325
|
+
filename = path46.basename(options.filename || value && (value.name || value.path));
|
|
90321
90326
|
} else if (value && value.readable && hasOwn2(value, "httpVersion")) {
|
|
90322
|
-
filename =
|
|
90327
|
+
filename = path46.basename(value.client._httpMessage.path || "");
|
|
90323
90328
|
}
|
|
90324
90329
|
if (filename) {
|
|
90325
90330
|
return 'filename="' + filename + '"';
|
|
@@ -90516,10 +90521,10 @@ function isVisitable(thing) {
|
|
|
90516
90521
|
function removeBrackets(key) {
|
|
90517
90522
|
return utils_default.endsWith(key, "[]") ? key.slice(0, -2) : key;
|
|
90518
90523
|
}
|
|
90519
|
-
function renderKey(
|
|
90520
|
-
if (!
|
|
90524
|
+
function renderKey(path46, key, dots) {
|
|
90525
|
+
if (!path46)
|
|
90521
90526
|
return key;
|
|
90522
|
-
return
|
|
90527
|
+
return path46.concat(key).map(function each17(token, i) {
|
|
90523
90528
|
token = removeBrackets(token);
|
|
90524
90529
|
return !dots && i ? "[" + token + "]" : token;
|
|
90525
90530
|
}).join(dots ? "." : "");
|
|
@@ -90571,13 +90576,13 @@ function toFormData(obj, formData, options) {
|
|
|
90571
90576
|
}
|
|
90572
90577
|
return value;
|
|
90573
90578
|
}
|
|
90574
|
-
function defaultVisitor(value, key,
|
|
90579
|
+
function defaultVisitor(value, key, path46) {
|
|
90575
90580
|
let arr = value;
|
|
90576
90581
|
if (utils_default.isReactNative(formData) && utils_default.isReactNativeBlob(value)) {
|
|
90577
|
-
formData.append(renderKey(
|
|
90582
|
+
formData.append(renderKey(path46, key, dots), convertValue(value));
|
|
90578
90583
|
return false;
|
|
90579
90584
|
}
|
|
90580
|
-
if (value && !
|
|
90585
|
+
if (value && !path46 && typeof value === "object") {
|
|
90581
90586
|
if (utils_default.endsWith(key, "{}")) {
|
|
90582
90587
|
key = metaTokens ? key : key.slice(0, -2);
|
|
90583
90588
|
value = JSON.stringify(value);
|
|
@@ -90596,7 +90601,7 @@ function toFormData(obj, formData, options) {
|
|
|
90596
90601
|
if (isVisitable(value)) {
|
|
90597
90602
|
return true;
|
|
90598
90603
|
}
|
|
90599
|
-
formData.append(renderKey(
|
|
90604
|
+
formData.append(renderKey(path46, key, dots), convertValue(value));
|
|
90600
90605
|
return false;
|
|
90601
90606
|
}
|
|
90602
90607
|
const stack = [];
|
|
@@ -90605,7 +90610,7 @@ function toFormData(obj, formData, options) {
|
|
|
90605
90610
|
convertValue,
|
|
90606
90611
|
isVisitable
|
|
90607
90612
|
});
|
|
90608
|
-
function build(value,
|
|
90613
|
+
function build(value, path46, depth = 0) {
|
|
90609
90614
|
if (utils_default.isUndefined(value))
|
|
90610
90615
|
return;
|
|
90611
90616
|
if (depth > maxDepth) {
|
|
@@ -90615,13 +90620,13 @@ function toFormData(obj, formData, options) {
|
|
|
90615
90620
|
);
|
|
90616
90621
|
}
|
|
90617
90622
|
if (stack.indexOf(value) !== -1) {
|
|
90618
|
-
throw Error("Circular reference detected in " +
|
|
90623
|
+
throw Error("Circular reference detected in " + path46.join("."));
|
|
90619
90624
|
}
|
|
90620
90625
|
stack.push(value);
|
|
90621
90626
|
utils_default.forEach(value, function each17(el, key) {
|
|
90622
|
-
const result = !(utils_default.isUndefined(el) || el === null) && visitor.call(formData, el, utils_default.isString(key) ? key.trim() : key,
|
|
90627
|
+
const result = !(utils_default.isUndefined(el) || el === null) && visitor.call(formData, el, utils_default.isString(key) ? key.trim() : key, path46, exposedHelpers);
|
|
90623
90628
|
if (result === true) {
|
|
90624
|
-
build(el,
|
|
90629
|
+
build(el, path46 ? path46.concat(key) : [key], depth + 1);
|
|
90625
90630
|
}
|
|
90626
90631
|
});
|
|
90627
90632
|
stack.pop();
|
|
@@ -90894,7 +90899,7 @@ var init_platform = __esm({
|
|
|
90894
90899
|
// node_modules/axios/lib/helpers/toURLEncodedForm.js
|
|
90895
90900
|
function toURLEncodedForm(data, options) {
|
|
90896
90901
|
return toFormData_default(data, new platform_default.classes.URLSearchParams(), {
|
|
90897
|
-
visitor: function(value, key,
|
|
90902
|
+
visitor: function(value, key, path46, helpers) {
|
|
90898
90903
|
if (platform_default.isNode && utils_default.isBuffer(value)) {
|
|
90899
90904
|
this.append(key, value.toString("base64"));
|
|
90900
90905
|
return false;
|
|
@@ -90932,12 +90937,12 @@ function arrayToObject(arr) {
|
|
|
90932
90937
|
return obj;
|
|
90933
90938
|
}
|
|
90934
90939
|
function formDataToJSON(formData) {
|
|
90935
|
-
function buildPath4(
|
|
90936
|
-
let name =
|
|
90940
|
+
function buildPath4(path46, value, target, index) {
|
|
90941
|
+
let name = path46[index++];
|
|
90937
90942
|
if (name === "__proto__")
|
|
90938
90943
|
return true;
|
|
90939
90944
|
const isNumericKey = Number.isFinite(+name);
|
|
90940
|
-
const isLast = index >=
|
|
90945
|
+
const isLast = index >= path46.length;
|
|
90941
90946
|
name = !name && utils_default.isArray(target) ? target.length : name;
|
|
90942
90947
|
if (isLast) {
|
|
90943
90948
|
if (utils_default.hasOwnProp(target, name)) {
|
|
@@ -90950,7 +90955,7 @@ function formDataToJSON(formData) {
|
|
|
90950
90955
|
if (!target[name] || !utils_default.isObject(target[name])) {
|
|
90951
90956
|
target[name] = [];
|
|
90952
90957
|
}
|
|
90953
|
-
const result = buildPath4(
|
|
90958
|
+
const result = buildPath4(path46, value, target[name], index);
|
|
90954
90959
|
if (result && utils_default.isArray(target[name])) {
|
|
90955
90960
|
target[name] = arrayToObject(target[name]);
|
|
90956
90961
|
}
|
|
@@ -91162,10 +91167,10 @@ var init_CanceledError = __esm({
|
|
|
91162
91167
|
});
|
|
91163
91168
|
|
|
91164
91169
|
// node_modules/axios/lib/core/settle.js
|
|
91165
|
-
function settle(
|
|
91170
|
+
function settle(resolve11, reject, response) {
|
|
91166
91171
|
const validateStatus2 = response.config.validateStatus;
|
|
91167
91172
|
if (!response.status || !validateStatus2 || validateStatus2(response.status)) {
|
|
91168
|
-
|
|
91173
|
+
resolve11(response);
|
|
91169
91174
|
} else {
|
|
91170
91175
|
reject(new AxiosError_default(
|
|
91171
91176
|
"Request failed with status code " + response.status,
|
|
@@ -92743,7 +92748,7 @@ var init_http = __esm({
|
|
|
92743
92748
|
http2Sessions = new Http2Sessions();
|
|
92744
92749
|
isHttpAdapterSupported = typeof process !== "undefined" && utils_default.kindOf(process) === "process";
|
|
92745
92750
|
wrapAsync = (asyncExecutor) => {
|
|
92746
|
-
return new Promise((
|
|
92751
|
+
return new Promise((resolve11, reject) => {
|
|
92747
92752
|
let onDone;
|
|
92748
92753
|
let isDone;
|
|
92749
92754
|
const done = (value, isRejected) => {
|
|
@@ -92754,7 +92759,7 @@ var init_http = __esm({
|
|
|
92754
92759
|
};
|
|
92755
92760
|
const _resolve = (value) => {
|
|
92756
92761
|
done(value);
|
|
92757
|
-
|
|
92762
|
+
resolve11(value);
|
|
92758
92763
|
};
|
|
92759
92764
|
const _reject = (reason) => {
|
|
92760
92765
|
done(reason, true);
|
|
@@ -92801,7 +92806,7 @@ var init_http = __esm({
|
|
|
92801
92806
|
}
|
|
92802
92807
|
};
|
|
92803
92808
|
http_default = isHttpAdapterSupported && function httpAdapter(config2) {
|
|
92804
|
-
return wrapAsync(async function dispatchHttpRequest(
|
|
92809
|
+
return wrapAsync(async function dispatchHttpRequest(resolve11, reject, onDone) {
|
|
92805
92810
|
const own2 = (key) => utils_default.hasOwnProp(config2, key) ? config2[key] : void 0;
|
|
92806
92811
|
let data = own2("data");
|
|
92807
92812
|
let lookup = own2("lookup");
|
|
@@ -92921,7 +92926,7 @@ var init_http = __esm({
|
|
|
92921
92926
|
}
|
|
92922
92927
|
let convertedData;
|
|
92923
92928
|
if (method !== "GET") {
|
|
92924
|
-
return settle(
|
|
92929
|
+
return settle(resolve11, reject, {
|
|
92925
92930
|
status: 405,
|
|
92926
92931
|
statusText: "method not allowed",
|
|
92927
92932
|
headers: {},
|
|
@@ -92943,7 +92948,7 @@ var init_http = __esm({
|
|
|
92943
92948
|
} else if (responseType === "stream") {
|
|
92944
92949
|
convertedData = import_stream5.default.Readable.from(convertedData);
|
|
92945
92950
|
}
|
|
92946
|
-
return settle(
|
|
92951
|
+
return settle(resolve11, reject, {
|
|
92947
92952
|
data: convertedData,
|
|
92948
92953
|
status: 200,
|
|
92949
92954
|
statusText: "OK",
|
|
@@ -93057,9 +93062,9 @@ var init_http = __esm({
|
|
|
93057
93062
|
auth2 = urlUsername + ":" + urlPassword;
|
|
93058
93063
|
}
|
|
93059
93064
|
auth2 && headers.delete("authorization");
|
|
93060
|
-
let
|
|
93065
|
+
let path46;
|
|
93061
93066
|
try {
|
|
93062
|
-
|
|
93067
|
+
path46 = buildURL(
|
|
93063
93068
|
parsed.pathname + parsed.search,
|
|
93064
93069
|
config2.params,
|
|
93065
93070
|
config2.paramsSerializer
|
|
@@ -93077,7 +93082,7 @@ var init_http = __esm({
|
|
|
93077
93082
|
false
|
|
93078
93083
|
);
|
|
93079
93084
|
const options = Object.assign(/* @__PURE__ */ Object.create(null), {
|
|
93080
|
-
path:
|
|
93085
|
+
path: path46,
|
|
93081
93086
|
method,
|
|
93082
93087
|
headers: headers.toJSON(),
|
|
93083
93088
|
agents: { http: config2.httpAgent, https: config2.httpsAgent },
|
|
@@ -93231,7 +93236,7 @@ var init_http = __esm({
|
|
|
93231
93236
|
});
|
|
93232
93237
|
}
|
|
93233
93238
|
response.data = responseStream;
|
|
93234
|
-
settle(
|
|
93239
|
+
settle(resolve11, reject, response);
|
|
93235
93240
|
} else {
|
|
93236
93241
|
const responseBuffer = [];
|
|
93237
93242
|
let totalResponseBytes = 0;
|
|
@@ -93283,7 +93288,7 @@ var init_http = __esm({
|
|
|
93283
93288
|
} catch (err) {
|
|
93284
93289
|
return reject(AxiosError_default.from(err, null, config2, response.request, response));
|
|
93285
93290
|
}
|
|
93286
|
-
settle(
|
|
93291
|
+
settle(resolve11, reject, response);
|
|
93287
93292
|
});
|
|
93288
93293
|
}
|
|
93289
93294
|
abortEmitter.once("abort", (err) => {
|
|
@@ -93432,15 +93437,15 @@ var init_cookies = __esm({
|
|
|
93432
93437
|
cookies_default = platform_default.hasStandardBrowserEnv ? (
|
|
93433
93438
|
// Standard browser envs support document.cookie
|
|
93434
93439
|
{
|
|
93435
|
-
write(name, value, expires,
|
|
93440
|
+
write(name, value, expires, path46, domain2, secure, sameSite) {
|
|
93436
93441
|
if (typeof document === "undefined")
|
|
93437
93442
|
return;
|
|
93438
93443
|
const cookie = [`${name}=${encodeURIComponent(value)}`];
|
|
93439
93444
|
if (utils_default.isNumber(expires)) {
|
|
93440
93445
|
cookie.push(`expires=${new Date(expires).toUTCString()}`);
|
|
93441
93446
|
}
|
|
93442
|
-
if (utils_default.isString(
|
|
93443
|
-
cookie.push(`path=${
|
|
93447
|
+
if (utils_default.isString(path46)) {
|
|
93448
|
+
cookie.push(`path=${path46}`);
|
|
93444
93449
|
}
|
|
93445
93450
|
if (utils_default.isString(domain2)) {
|
|
93446
93451
|
cookie.push(`domain=${domain2}`);
|
|
@@ -93679,7 +93684,7 @@ var init_xhr = __esm({
|
|
|
93679
93684
|
init_resolveConfig();
|
|
93680
93685
|
isXHRAdapterSupported = typeof XMLHttpRequest !== "undefined";
|
|
93681
93686
|
xhr_default = isXHRAdapterSupported && function(config2) {
|
|
93682
|
-
return new Promise(function dispatchXhrRequest(
|
|
93687
|
+
return new Promise(function dispatchXhrRequest(resolve11, reject) {
|
|
93683
93688
|
const _config = resolveConfig_default(config2);
|
|
93684
93689
|
let requestData = _config.data;
|
|
93685
93690
|
const requestHeaders = AxiosHeaders_default.from(_config.headers).normalize();
|
|
@@ -93714,7 +93719,7 @@ var init_xhr = __esm({
|
|
|
93714
93719
|
};
|
|
93715
93720
|
settle(
|
|
93716
93721
|
function _resolve(value) {
|
|
93717
|
-
|
|
93722
|
+
resolve11(value);
|
|
93718
93723
|
done();
|
|
93719
93724
|
},
|
|
93720
93725
|
function _reject(err) {
|
|
@@ -94228,8 +94233,8 @@ var init_fetch = __esm({
|
|
|
94228
94233
|
}
|
|
94229
94234
|
}
|
|
94230
94235
|
!isStreamResponse && unsubscribe && unsubscribe();
|
|
94231
|
-
return await new Promise((
|
|
94232
|
-
settle(
|
|
94236
|
+
return await new Promise((resolve11, reject) => {
|
|
94237
|
+
settle(resolve11, reject, {
|
|
94233
94238
|
data: responseData,
|
|
94234
94239
|
headers: AxiosHeaders_default.from(response.headers),
|
|
94235
94240
|
status: response.status,
|
|
@@ -94724,8 +94729,8 @@ var init_CancelToken = __esm({
|
|
|
94724
94729
|
throw new TypeError("executor must be a function.");
|
|
94725
94730
|
}
|
|
94726
94731
|
let resolvePromise;
|
|
94727
|
-
this.promise = new Promise(function promiseExecutor(
|
|
94728
|
-
resolvePromise =
|
|
94732
|
+
this.promise = new Promise(function promiseExecutor(resolve11) {
|
|
94733
|
+
resolvePromise = resolve11;
|
|
94729
94734
|
});
|
|
94730
94735
|
const token = this;
|
|
94731
94736
|
this.promise.then((cancel) => {
|
|
@@ -94739,9 +94744,9 @@ var init_CancelToken = __esm({
|
|
|
94739
94744
|
});
|
|
94740
94745
|
this.promise.then = (onfulfilled) => {
|
|
94741
94746
|
let _resolve;
|
|
94742
|
-
const promise2 = new Promise((
|
|
94743
|
-
token.subscribe(
|
|
94744
|
-
_resolve =
|
|
94747
|
+
const promise2 = new Promise((resolve11) => {
|
|
94748
|
+
token.subscribe(resolve11);
|
|
94749
|
+
_resolve = resolve11;
|
|
94745
94750
|
}).then(onfulfilled);
|
|
94746
94751
|
promise2.cancel = function reject() {
|
|
94747
94752
|
token.unsubscribe(_resolve);
|
|
@@ -98643,18 +98648,18 @@ function connectAsync(connection) {
|
|
|
98643
98648
|
if (typeof connection.connectAsync === "function") {
|
|
98644
98649
|
return connection.connectAsync();
|
|
98645
98650
|
}
|
|
98646
|
-
return new Promise((
|
|
98651
|
+
return new Promise((resolve11, reject) => {
|
|
98647
98652
|
connection.connect((err) => {
|
|
98648
98653
|
if (err) {
|
|
98649
98654
|
reject(err);
|
|
98650
98655
|
} else {
|
|
98651
|
-
|
|
98656
|
+
resolve11();
|
|
98652
98657
|
}
|
|
98653
98658
|
});
|
|
98654
98659
|
});
|
|
98655
98660
|
}
|
|
98656
98661
|
function executeAsync(connection, sqlText) {
|
|
98657
|
-
return new Promise((
|
|
98662
|
+
return new Promise((resolve11, reject) => {
|
|
98658
98663
|
connection.execute({
|
|
98659
98664
|
sqlText,
|
|
98660
98665
|
fetchAsString: ["Date", "JSON"],
|
|
@@ -98663,14 +98668,14 @@ function executeAsync(connection, sqlText) {
|
|
|
98663
98668
|
reject(err);
|
|
98664
98669
|
return;
|
|
98665
98670
|
}
|
|
98666
|
-
|
|
98671
|
+
resolve11({ rows: rows ?? [], columns: [] });
|
|
98667
98672
|
}
|
|
98668
98673
|
});
|
|
98669
98674
|
});
|
|
98670
98675
|
}
|
|
98671
98676
|
function destroyAsync(connection) {
|
|
98672
|
-
return new Promise((
|
|
98673
|
-
connection.destroy((_destroyErr) =>
|
|
98677
|
+
return new Promise((resolve11) => {
|
|
98678
|
+
connection.destroy((_destroyErr) => resolve11());
|
|
98674
98679
|
});
|
|
98675
98680
|
}
|
|
98676
98681
|
function inferTypeFromValue(value) {
|
|
@@ -99437,8 +99442,8 @@ var init_ElasticsearchConnector = __esm({
|
|
|
99437
99442
|
const withoutProtocol = raw.replace(/^https?:\/\//i, "");
|
|
99438
99443
|
const pathStart = withoutProtocol.indexOf("/");
|
|
99439
99444
|
const hostPart = (pathStart === -1 ? withoutProtocol : withoutProtocol.slice(0, pathStart)).replace(/:\d+$/, "");
|
|
99440
|
-
const
|
|
99441
|
-
return `${config2.ssl === false ? "http" : "https"}://${hostPart}:${config2.port}${
|
|
99445
|
+
const path46 = pathStart === -1 ? "" : withoutProtocol.slice(pathStart);
|
|
99446
|
+
return `${config2.ssl === false ? "http" : "https"}://${hostPart}:${config2.port}${path46}`;
|
|
99442
99447
|
}
|
|
99443
99448
|
requestConfig(config2, authHeader, signal) {
|
|
99444
99449
|
const authorization = authHeader ?? this.authorization(config2);
|
|
@@ -100158,7 +100163,7 @@ var init_ExtensionCredentialStore = __esm({
|
|
|
100158
100163
|
|
|
100159
100164
|
// src/server/connection/keychainWorker.ts
|
|
100160
100165
|
function invokeWorker(modulePath, operation, args, timeoutMs) {
|
|
100161
|
-
return new Promise((
|
|
100166
|
+
return new Promise((resolve11, reject) => {
|
|
100162
100167
|
let settled = false;
|
|
100163
100168
|
const worker = new import_worker_threads.Worker(WORKER_CODE, {
|
|
100164
100169
|
eval: true,
|
|
@@ -100180,7 +100185,7 @@ function invokeWorker(modulePath, operation, args, timeoutMs) {
|
|
|
100180
100185
|
clearTimeout(timeout);
|
|
100181
100186
|
worker.terminate();
|
|
100182
100187
|
if (message.success) {
|
|
100183
|
-
|
|
100188
|
+
resolve11(message.result);
|
|
100184
100189
|
} else {
|
|
100185
100190
|
const err = new Error(message.error.message);
|
|
100186
100191
|
err.name = message.error.name;
|
|
@@ -100429,7 +100434,7 @@ var init_PlatformCredentialHelperStore = __esm({
|
|
|
100429
100434
|
}
|
|
100430
100435
|
}
|
|
100431
100436
|
async invoke(operation, payload) {
|
|
100432
|
-
return new Promise((
|
|
100437
|
+
return new Promise((resolve11, reject) => {
|
|
100433
100438
|
let settled = false;
|
|
100434
100439
|
const timeoutMs = operation === "erase" ? this.options.eraseTimeoutMs ?? ERASE_TIMEOUT_MS : this.options.interactiveTimeoutMs ?? INTERACTIVE_TIMEOUT_MS;
|
|
100435
100440
|
const maxStdoutBytes = this.options.maxStdoutBytes ?? MAX_STDOUT_BYTES;
|
|
@@ -100455,7 +100460,7 @@ var init_PlatformCredentialHelperStore = __esm({
|
|
|
100455
100460
|
reject(error52);
|
|
100456
100461
|
return;
|
|
100457
100462
|
}
|
|
100458
|
-
|
|
100463
|
+
resolve11(response);
|
|
100459
100464
|
};
|
|
100460
100465
|
child.once("error", (error52) => {
|
|
100461
100466
|
const platform2 = this.options.platform ?? process.platform;
|
|
@@ -101349,7 +101354,8 @@ var init_QueryOperationRunner = __esm({
|
|
|
101349
101354
|
request2.origin,
|
|
101350
101355
|
request2.loadAllRows,
|
|
101351
101356
|
request2.enforceReadOnly,
|
|
101352
|
-
request2.clientConsent
|
|
101357
|
+
request2.clientConsent,
|
|
101358
|
+
request2.workspaceRoot
|
|
101353
101359
|
).finally(() => {
|
|
101354
101360
|
this.sessionManager.unregisterOperation(controller);
|
|
101355
101361
|
detachAbortForwarder();
|
|
@@ -101575,7 +101581,7 @@ var init_QueryOperationRunner = __esm({
|
|
|
101575
101581
|
tabTitle: providedTitle || `Result ${session.tabs.size + 1}`
|
|
101576
101582
|
};
|
|
101577
101583
|
}
|
|
101578
|
-
async executeAndStore(sessionId, tabId, sql, connectionId, connectionProfile, authHeader, controller, origin2, loadAllRows, enforceReadOnly, clientConsent) {
|
|
101584
|
+
async executeAndStore(sessionId, tabId, sql, connectionId, connectionProfile, authHeader, controller, origin2, loadAllRows, enforceReadOnly, clientConsent, workspaceRoot) {
|
|
101579
101585
|
const session = this.sessionManager.getSession(sessionId);
|
|
101580
101586
|
if (!session) {
|
|
101581
101587
|
return;
|
|
@@ -101644,7 +101650,8 @@ var init_QueryOperationRunner = __esm({
|
|
|
101644
101650
|
authHeader,
|
|
101645
101651
|
maxRows,
|
|
101646
101652
|
hooks,
|
|
101647
|
-
clientConsent
|
|
101653
|
+
clientConsent,
|
|
101654
|
+
workspaceRoot
|
|
101648
101655
|
);
|
|
101649
101656
|
for await (const page of generator) {
|
|
101650
101657
|
if (controller.signal.aborted) {
|
|
@@ -113027,21 +113034,21 @@ var init_PathProxy = __esm({
|
|
|
113027
113034
|
}
|
|
113028
113035
|
this._len = len2;
|
|
113029
113036
|
};
|
|
113030
|
-
PathProxy2.prototype.appendPath = function(
|
|
113031
|
-
if (!(
|
|
113032
|
-
|
|
113037
|
+
PathProxy2.prototype.appendPath = function(path46) {
|
|
113038
|
+
if (!(path46 instanceof Array)) {
|
|
113039
|
+
path46 = [path46];
|
|
113033
113040
|
}
|
|
113034
|
-
var len2 =
|
|
113041
|
+
var len2 = path46.length;
|
|
113035
113042
|
var appendSize = 0;
|
|
113036
113043
|
var offset = this._len;
|
|
113037
113044
|
for (var i = 0; i < len2; i++) {
|
|
113038
|
-
appendSize +=
|
|
113045
|
+
appendSize += path46[i].len();
|
|
113039
113046
|
}
|
|
113040
113047
|
if (hasTypedArray && this.data instanceof Float32Array) {
|
|
113041
113048
|
this.data = new Float32Array(offset + appendSize);
|
|
113042
113049
|
}
|
|
113043
113050
|
for (var i = 0; i < len2; i++) {
|
|
113044
|
-
var appendPathData =
|
|
113051
|
+
var appendPathData = path46[i].data;
|
|
113045
113052
|
for (var k = 0; k < appendPathData.length; k++) {
|
|
113046
113053
|
this.data[offset++] = appendPathData[k];
|
|
113047
113054
|
}
|
|
@@ -113783,9 +113790,9 @@ function windingArc(cx, cy, r, startAngle, endAngle, anticlockwise, x, y) {
|
|
|
113783
113790
|
}
|
|
113784
113791
|
return w;
|
|
113785
113792
|
}
|
|
113786
|
-
function containPath(
|
|
113787
|
-
var data =
|
|
113788
|
-
var len2 =
|
|
113793
|
+
function containPath(path46, lineWidth, isStroke, x, y) {
|
|
113794
|
+
var data = path46.data;
|
|
113795
|
+
var len2 = path46.len();
|
|
113789
113796
|
var w = 0;
|
|
113790
113797
|
var xi = 0;
|
|
113791
113798
|
var yi = 0;
|
|
@@ -114114,13 +114121,13 @@ var init_Path = __esm({
|
|
|
114114
114121
|
firstInvoke = true;
|
|
114115
114122
|
this.createPathProxy();
|
|
114116
114123
|
}
|
|
114117
|
-
var
|
|
114124
|
+
var path46 = this.path;
|
|
114118
114125
|
if (firstInvoke || this.__dirty & SHAPE_CHANGED_BIT) {
|
|
114119
|
-
|
|
114120
|
-
this.buildPath(
|
|
114126
|
+
path46.beginPath();
|
|
114127
|
+
this.buildPath(path46, this.shape, false);
|
|
114121
114128
|
this.pathUpdated();
|
|
114122
114129
|
}
|
|
114123
|
-
rect =
|
|
114130
|
+
rect = path46.getBoundingRect();
|
|
114124
114131
|
}
|
|
114125
114132
|
this._rect = rect;
|
|
114126
114133
|
if (this.hasStroke() && this.path && this.path.len() > 0) {
|
|
@@ -115746,12 +115753,12 @@ var init_states = __esm({
|
|
|
115746
115753
|
});
|
|
115747
115754
|
|
|
115748
115755
|
// node_modules/zrender/lib/tool/transformPath.js
|
|
115749
|
-
function transformPath(
|
|
115756
|
+
function transformPath(path46, m2) {
|
|
115750
115757
|
if (!m2) {
|
|
115751
115758
|
return;
|
|
115752
115759
|
}
|
|
115753
|
-
var data =
|
|
115754
|
-
var len2 =
|
|
115760
|
+
var data = path46.data;
|
|
115761
|
+
var len2 = path46.len();
|
|
115755
115762
|
var cmd;
|
|
115756
115763
|
var nPoint;
|
|
115757
115764
|
var i;
|
|
@@ -115819,7 +115826,7 @@ function transformPath(path45, m2) {
|
|
|
115819
115826
|
data[j++] = p_1[1];
|
|
115820
115827
|
}
|
|
115821
115828
|
}
|
|
115822
|
-
|
|
115829
|
+
path46.increaseVersion();
|
|
115823
115830
|
}
|
|
115824
115831
|
var CMD3, points, mathSqrt2, mathAtan2;
|
|
115825
115832
|
var init_transformPath = __esm({
|
|
@@ -115843,7 +115850,7 @@ function vRatio(u, v) {
|
|
|
115843
115850
|
function vAngle(u, v) {
|
|
115844
115851
|
return (u[0] * v[1] < u[1] * v[0] ? -1 : 1) * Math.acos(vRatio(u, v));
|
|
115845
115852
|
}
|
|
115846
|
-
function processArc(x1, y1, x2, y2, fa, fs44, rx, ry, psiDeg, cmd,
|
|
115853
|
+
function processArc(x1, y1, x2, y2, fa, fs44, rx, ry, psiDeg, cmd, path46) {
|
|
115847
115854
|
var psi = psiDeg * (PI3 / 180);
|
|
115848
115855
|
var xp = mathCos3(psi) * (x1 - x2) / 2 + mathSin3(psi) * (y1 - y2) / 2;
|
|
115849
115856
|
var yp = -1 * mathSin3(psi) * (x1 - x2) / 2 + mathCos3(psi) * (y1 - y2) / 2;
|
|
@@ -115871,12 +115878,12 @@ function processArc(x1, y1, x2, y2, fa, fs44, rx, ry, psiDeg, cmd, path45) {
|
|
|
115871
115878
|
var n = Math.round(dTheta / PI3 * 1e6) / 1e6;
|
|
115872
115879
|
dTheta = PI3 * 2 + n % 2 * PI3;
|
|
115873
115880
|
}
|
|
115874
|
-
|
|
115881
|
+
path46.addData(cmd, cx, cy, rx, ry, theta, dTheta, psi, fs44);
|
|
115875
115882
|
}
|
|
115876
115883
|
function createPathProxyFromString(data) {
|
|
115877
|
-
var
|
|
115884
|
+
var path46 = new PathProxy_default();
|
|
115878
115885
|
if (!data) {
|
|
115879
|
-
return
|
|
115886
|
+
return path46;
|
|
115880
115887
|
}
|
|
115881
115888
|
var cpx = 0;
|
|
115882
115889
|
var cpy = 0;
|
|
@@ -115886,7 +115893,7 @@ function createPathProxyFromString(data) {
|
|
|
115886
115893
|
var CMD6 = PathProxy_default.CMD;
|
|
115887
115894
|
var cmdList = data.match(commandReg);
|
|
115888
115895
|
if (!cmdList) {
|
|
115889
|
-
return
|
|
115896
|
+
return path46;
|
|
115890
115897
|
}
|
|
115891
115898
|
for (var l = 0; l < cmdList.length; l++) {
|
|
115892
115899
|
var cmdText = cmdList[l];
|
|
@@ -115915,19 +115922,19 @@ function createPathProxyFromString(data) {
|
|
|
115915
115922
|
cpx += p[off++];
|
|
115916
115923
|
cpy += p[off++];
|
|
115917
115924
|
cmd = CMD6.L;
|
|
115918
|
-
|
|
115925
|
+
path46.addData(cmd, cpx, cpy);
|
|
115919
115926
|
break;
|
|
115920
115927
|
case "L":
|
|
115921
115928
|
cpx = p[off++];
|
|
115922
115929
|
cpy = p[off++];
|
|
115923
115930
|
cmd = CMD6.L;
|
|
115924
|
-
|
|
115931
|
+
path46.addData(cmd, cpx, cpy);
|
|
115925
115932
|
break;
|
|
115926
115933
|
case "m":
|
|
115927
115934
|
cpx += p[off++];
|
|
115928
115935
|
cpy += p[off++];
|
|
115929
115936
|
cmd = CMD6.M;
|
|
115930
|
-
|
|
115937
|
+
path46.addData(cmd, cpx, cpy);
|
|
115931
115938
|
subpathX = cpx;
|
|
115932
115939
|
subpathY = cpy;
|
|
115933
115940
|
cmdStr = "l";
|
|
@@ -115936,7 +115943,7 @@ function createPathProxyFromString(data) {
|
|
|
115936
115943
|
cpx = p[off++];
|
|
115937
115944
|
cpy = p[off++];
|
|
115938
115945
|
cmd = CMD6.M;
|
|
115939
|
-
|
|
115946
|
+
path46.addData(cmd, cpx, cpy);
|
|
115940
115947
|
subpathX = cpx;
|
|
115941
115948
|
subpathY = cpy;
|
|
115942
115949
|
cmdStr = "L";
|
|
@@ -115944,40 +115951,40 @@ function createPathProxyFromString(data) {
|
|
|
115944
115951
|
case "h":
|
|
115945
115952
|
cpx += p[off++];
|
|
115946
115953
|
cmd = CMD6.L;
|
|
115947
|
-
|
|
115954
|
+
path46.addData(cmd, cpx, cpy);
|
|
115948
115955
|
break;
|
|
115949
115956
|
case "H":
|
|
115950
115957
|
cpx = p[off++];
|
|
115951
115958
|
cmd = CMD6.L;
|
|
115952
|
-
|
|
115959
|
+
path46.addData(cmd, cpx, cpy);
|
|
115953
115960
|
break;
|
|
115954
115961
|
case "v":
|
|
115955
115962
|
cpy += p[off++];
|
|
115956
115963
|
cmd = CMD6.L;
|
|
115957
|
-
|
|
115964
|
+
path46.addData(cmd, cpx, cpy);
|
|
115958
115965
|
break;
|
|
115959
115966
|
case "V":
|
|
115960
115967
|
cpy = p[off++];
|
|
115961
115968
|
cmd = CMD6.L;
|
|
115962
|
-
|
|
115969
|
+
path46.addData(cmd, cpx, cpy);
|
|
115963
115970
|
break;
|
|
115964
115971
|
case "C":
|
|
115965
115972
|
cmd = CMD6.C;
|
|
115966
|
-
|
|
115973
|
+
path46.addData(cmd, p[off++], p[off++], p[off++], p[off++], p[off++], p[off++]);
|
|
115967
115974
|
cpx = p[off - 2];
|
|
115968
115975
|
cpy = p[off - 1];
|
|
115969
115976
|
break;
|
|
115970
115977
|
case "c":
|
|
115971
115978
|
cmd = CMD6.C;
|
|
115972
|
-
|
|
115979
|
+
path46.addData(cmd, p[off++] + cpx, p[off++] + cpy, p[off++] + cpx, p[off++] + cpy, p[off++] + cpx, p[off++] + cpy);
|
|
115973
115980
|
cpx += p[off - 2];
|
|
115974
115981
|
cpy += p[off - 1];
|
|
115975
115982
|
break;
|
|
115976
115983
|
case "S":
|
|
115977
115984
|
ctlPtx = cpx;
|
|
115978
115985
|
ctlPty = cpy;
|
|
115979
|
-
len2 =
|
|
115980
|
-
pathData =
|
|
115986
|
+
len2 = path46.len();
|
|
115987
|
+
pathData = path46.data;
|
|
115981
115988
|
if (prevCmd === CMD6.C) {
|
|
115982
115989
|
ctlPtx += cpx - pathData[len2 - 4];
|
|
115983
115990
|
ctlPty += cpy - pathData[len2 - 3];
|
|
@@ -115987,13 +115994,13 @@ function createPathProxyFromString(data) {
|
|
|
115987
115994
|
y1 = p[off++];
|
|
115988
115995
|
cpx = p[off++];
|
|
115989
115996
|
cpy = p[off++];
|
|
115990
|
-
|
|
115997
|
+
path46.addData(cmd, ctlPtx, ctlPty, x1, y1, cpx, cpy);
|
|
115991
115998
|
break;
|
|
115992
115999
|
case "s":
|
|
115993
116000
|
ctlPtx = cpx;
|
|
115994
116001
|
ctlPty = cpy;
|
|
115995
|
-
len2 =
|
|
115996
|
-
pathData =
|
|
116002
|
+
len2 = path46.len();
|
|
116003
|
+
pathData = path46.data;
|
|
115997
116004
|
if (prevCmd === CMD6.C) {
|
|
115998
116005
|
ctlPtx += cpx - pathData[len2 - 4];
|
|
115999
116006
|
ctlPty += cpy - pathData[len2 - 3];
|
|
@@ -116003,7 +116010,7 @@ function createPathProxyFromString(data) {
|
|
|
116003
116010
|
y1 = cpy + p[off++];
|
|
116004
116011
|
cpx += p[off++];
|
|
116005
116012
|
cpy += p[off++];
|
|
116006
|
-
|
|
116013
|
+
path46.addData(cmd, ctlPtx, ctlPty, x1, y1, cpx, cpy);
|
|
116007
116014
|
break;
|
|
116008
116015
|
case "Q":
|
|
116009
116016
|
x1 = p[off++];
|
|
@@ -116011,7 +116018,7 @@ function createPathProxyFromString(data) {
|
|
|
116011
116018
|
cpx = p[off++];
|
|
116012
116019
|
cpy = p[off++];
|
|
116013
116020
|
cmd = CMD6.Q;
|
|
116014
|
-
|
|
116021
|
+
path46.addData(cmd, x1, y1, cpx, cpy);
|
|
116015
116022
|
break;
|
|
116016
116023
|
case "q":
|
|
116017
116024
|
x1 = p[off++] + cpx;
|
|
@@ -116019,13 +116026,13 @@ function createPathProxyFromString(data) {
|
|
|
116019
116026
|
cpx += p[off++];
|
|
116020
116027
|
cpy += p[off++];
|
|
116021
116028
|
cmd = CMD6.Q;
|
|
116022
|
-
|
|
116029
|
+
path46.addData(cmd, x1, y1, cpx, cpy);
|
|
116023
116030
|
break;
|
|
116024
116031
|
case "T":
|
|
116025
116032
|
ctlPtx = cpx;
|
|
116026
116033
|
ctlPty = cpy;
|
|
116027
|
-
len2 =
|
|
116028
|
-
pathData =
|
|
116034
|
+
len2 = path46.len();
|
|
116035
|
+
pathData = path46.data;
|
|
116029
116036
|
if (prevCmd === CMD6.Q) {
|
|
116030
116037
|
ctlPtx += cpx - pathData[len2 - 4];
|
|
116031
116038
|
ctlPty += cpy - pathData[len2 - 3];
|
|
@@ -116033,13 +116040,13 @@ function createPathProxyFromString(data) {
|
|
|
116033
116040
|
cpx = p[off++];
|
|
116034
116041
|
cpy = p[off++];
|
|
116035
116042
|
cmd = CMD6.Q;
|
|
116036
|
-
|
|
116043
|
+
path46.addData(cmd, ctlPtx, ctlPty, cpx, cpy);
|
|
116037
116044
|
break;
|
|
116038
116045
|
case "t":
|
|
116039
116046
|
ctlPtx = cpx;
|
|
116040
116047
|
ctlPty = cpy;
|
|
116041
|
-
len2 =
|
|
116042
|
-
pathData =
|
|
116048
|
+
len2 = path46.len();
|
|
116049
|
+
pathData = path46.data;
|
|
116043
116050
|
if (prevCmd === CMD6.Q) {
|
|
116044
116051
|
ctlPtx += cpx - pathData[len2 - 4];
|
|
116045
116052
|
ctlPty += cpy - pathData[len2 - 3];
|
|
@@ -116047,7 +116054,7 @@ function createPathProxyFromString(data) {
|
|
|
116047
116054
|
cpx += p[off++];
|
|
116048
116055
|
cpy += p[off++];
|
|
116049
116056
|
cmd = CMD6.Q;
|
|
116050
|
-
|
|
116057
|
+
path46.addData(cmd, ctlPtx, ctlPty, cpx, cpy);
|
|
116051
116058
|
break;
|
|
116052
116059
|
case "A":
|
|
116053
116060
|
rx = p[off++];
|
|
@@ -116059,7 +116066,7 @@ function createPathProxyFromString(data) {
|
|
|
116059
116066
|
cpx = p[off++];
|
|
116060
116067
|
cpy = p[off++];
|
|
116061
116068
|
cmd = CMD6.A;
|
|
116062
|
-
processArc(x1, y1, cpx, cpy, fa, fs44, rx, ry, psi, cmd,
|
|
116069
|
+
processArc(x1, y1, cpx, cpy, fa, fs44, rx, ry, psi, cmd, path46);
|
|
116063
116070
|
break;
|
|
116064
116071
|
case "a":
|
|
116065
116072
|
rx = p[off++];
|
|
@@ -116071,36 +116078,36 @@ function createPathProxyFromString(data) {
|
|
|
116071
116078
|
cpx += p[off++];
|
|
116072
116079
|
cpy += p[off++];
|
|
116073
116080
|
cmd = CMD6.A;
|
|
116074
|
-
processArc(x1, y1, cpx, cpy, fa, fs44, rx, ry, psi, cmd,
|
|
116081
|
+
processArc(x1, y1, cpx, cpy, fa, fs44, rx, ry, psi, cmd, path46);
|
|
116075
116082
|
break;
|
|
116076
116083
|
}
|
|
116077
116084
|
}
|
|
116078
116085
|
if (cmdStr === "z" || cmdStr === "Z") {
|
|
116079
116086
|
cmd = CMD6.Z;
|
|
116080
|
-
|
|
116087
|
+
path46.addData(cmd);
|
|
116081
116088
|
cpx = subpathX;
|
|
116082
116089
|
cpy = subpathY;
|
|
116083
116090
|
}
|
|
116084
116091
|
prevCmd = cmd;
|
|
116085
116092
|
}
|
|
116086
|
-
|
|
116087
|
-
return
|
|
116093
|
+
path46.toStatic();
|
|
116094
|
+
return path46;
|
|
116088
116095
|
}
|
|
116089
|
-
function isPathProxy(
|
|
116090
|
-
return
|
|
116096
|
+
function isPathProxy(path46) {
|
|
116097
|
+
return path46.setData != null;
|
|
116091
116098
|
}
|
|
116092
116099
|
function createPathOptions(str, opts) {
|
|
116093
116100
|
var pathProxy = createPathProxyFromString(str);
|
|
116094
116101
|
var innerOpts = extend3({}, opts);
|
|
116095
|
-
innerOpts.buildPath = function(
|
|
116096
|
-
if (isPathProxy(
|
|
116097
|
-
|
|
116098
|
-
var ctx =
|
|
116102
|
+
innerOpts.buildPath = function(path46) {
|
|
116103
|
+
if (isPathProxy(path46)) {
|
|
116104
|
+
path46.setData(pathProxy.data);
|
|
116105
|
+
var ctx = path46.getContext();
|
|
116099
116106
|
if (ctx) {
|
|
116100
|
-
|
|
116107
|
+
path46.rebuildPath(ctx, 1);
|
|
116101
116108
|
}
|
|
116102
116109
|
} else {
|
|
116103
|
-
var ctx =
|
|
116110
|
+
var ctx = path46;
|
|
116104
116111
|
pathProxy.rebuildPath(ctx, 1);
|
|
116105
116112
|
}
|
|
116106
116113
|
};
|
|
@@ -116136,12 +116143,12 @@ function mergePath(pathEls, opts) {
|
|
|
116136
116143
|
}
|
|
116137
116144
|
var pathBundle = new Path_default(opts);
|
|
116138
116145
|
pathBundle.createPathProxy();
|
|
116139
|
-
pathBundle.buildPath = function(
|
|
116140
|
-
if (isPathProxy(
|
|
116141
|
-
|
|
116142
|
-
var ctx =
|
|
116146
|
+
pathBundle.buildPath = function(path46) {
|
|
116147
|
+
if (isPathProxy(path46)) {
|
|
116148
|
+
path46.appendPath(pathList);
|
|
116149
|
+
var ctx = path46.getContext();
|
|
116143
116150
|
if (ctx) {
|
|
116144
|
-
|
|
116151
|
+
path46.rebuildPath(ctx, 1);
|
|
116145
116152
|
}
|
|
116146
116153
|
}
|
|
116147
116154
|
};
|
|
@@ -116149,26 +116156,26 @@ function mergePath(pathEls, opts) {
|
|
|
116149
116156
|
}
|
|
116150
116157
|
function clonePath(sourcePath, opts) {
|
|
116151
116158
|
opts = opts || {};
|
|
116152
|
-
var
|
|
116159
|
+
var path46 = new Path_default();
|
|
116153
116160
|
if (sourcePath.shape) {
|
|
116154
|
-
|
|
116161
|
+
path46.setShape(sourcePath.shape);
|
|
116155
116162
|
}
|
|
116156
|
-
|
|
116163
|
+
path46.setStyle(sourcePath.style);
|
|
116157
116164
|
if (opts.bakeTransform) {
|
|
116158
|
-
transformPath(
|
|
116165
|
+
transformPath(path46.path, sourcePath.getComputedTransform());
|
|
116159
116166
|
} else {
|
|
116160
116167
|
if (opts.toLocal) {
|
|
116161
|
-
|
|
116168
|
+
path46.setLocalTransform(sourcePath.getComputedTransform());
|
|
116162
116169
|
} else {
|
|
116163
|
-
|
|
116170
|
+
path46.copyTransform(sourcePath);
|
|
116164
116171
|
}
|
|
116165
116172
|
}
|
|
116166
|
-
|
|
116167
|
-
|
|
116168
|
-
|
|
116169
|
-
|
|
116170
|
-
|
|
116171
|
-
return
|
|
116173
|
+
path46.buildPath = sourcePath.buildPath;
|
|
116174
|
+
path46.applyTransform = path46.applyTransform;
|
|
116175
|
+
path46.z = sourcePath.z;
|
|
116176
|
+
path46.z2 = sourcePath.z2;
|
|
116177
|
+
path46.zlevel = sourcePath.zlevel;
|
|
116178
|
+
return path46;
|
|
116172
116179
|
}
|
|
116173
116180
|
var mathSqrt3, mathSin3, mathCos3, PI3, commandReg, numberReg, SVGPath;
|
|
116174
116181
|
var init_path2 = __esm({
|
|
@@ -117552,14 +117559,14 @@ function getShapeClass(name) {
|
|
|
117552
117559
|
}
|
|
117553
117560
|
}
|
|
117554
117561
|
function makePath(pathData, opts, rect, layout5) {
|
|
117555
|
-
var
|
|
117562
|
+
var path46 = createFromString(pathData, opts);
|
|
117556
117563
|
if (rect) {
|
|
117557
117564
|
if (layout5 === "center") {
|
|
117558
|
-
rect = centerGraphic(rect,
|
|
117565
|
+
rect = centerGraphic(rect, path46.getBoundingRect());
|
|
117559
117566
|
}
|
|
117560
|
-
resizePath(
|
|
117567
|
+
resizePath(path46, rect);
|
|
117561
117568
|
}
|
|
117562
|
-
return
|
|
117569
|
+
return path46;
|
|
117563
117570
|
}
|
|
117564
117571
|
function makeImage(imageUrl, rect, layout5) {
|
|
117565
117572
|
var zrImg = new Image_default({
|
|
@@ -117601,13 +117608,13 @@ function centerGraphic(rect, boundingRect) {
|
|
|
117601
117608
|
height
|
|
117602
117609
|
};
|
|
117603
117610
|
}
|
|
117604
|
-
function resizePath(
|
|
117605
|
-
if (!
|
|
117611
|
+
function resizePath(path46, rect) {
|
|
117612
|
+
if (!path46.applyTransform) {
|
|
117606
117613
|
return;
|
|
117607
117614
|
}
|
|
117608
|
-
var pathRect =
|
|
117615
|
+
var pathRect = path46.getBoundingRect();
|
|
117609
117616
|
var m2 = pathRect.calculateTransform(rect);
|
|
117610
|
-
|
|
117617
|
+
path46.applyTransform(m2);
|
|
117611
117618
|
}
|
|
117612
117619
|
function subPixelOptimizeLine2(shape, lineWidth) {
|
|
117613
117620
|
subPixelOptimizeLine(shape, shape, {
|
|
@@ -118382,11 +118389,11 @@ var init_Model = __esm({
|
|
|
118382
118389
|
Model2.prototype.mergeOption = function(option, ecModel) {
|
|
118383
118390
|
merge3(this.option, option, true);
|
|
118384
118391
|
};
|
|
118385
|
-
Model2.prototype.get = function(
|
|
118386
|
-
if (
|
|
118392
|
+
Model2.prototype.get = function(path46, ignoreParent) {
|
|
118393
|
+
if (path46 == null) {
|
|
118387
118394
|
return this.option;
|
|
118388
118395
|
}
|
|
118389
|
-
return this._doGet(this.parsePath(
|
|
118396
|
+
return this._doGet(this.parsePath(path46), !ignoreParent && this.parentModel);
|
|
118390
118397
|
};
|
|
118391
118398
|
Model2.prototype.getShallow = function(key, ignoreParent) {
|
|
118392
118399
|
var option = this.option;
|
|
@@ -118399,9 +118406,9 @@ var init_Model = __esm({
|
|
|
118399
118406
|
}
|
|
118400
118407
|
return val;
|
|
118401
118408
|
};
|
|
118402
|
-
Model2.prototype.getModel = function(
|
|
118403
|
-
var hasPath =
|
|
118404
|
-
var pathFinal = hasPath ? this.parsePath(
|
|
118409
|
+
Model2.prototype.getModel = function(path46, parentModel) {
|
|
118410
|
+
var hasPath = path46 != null;
|
|
118411
|
+
var pathFinal = hasPath ? this.parsePath(path46) : null;
|
|
118405
118412
|
var obj = hasPath ? this._doGet(pathFinal) : this.option;
|
|
118406
118413
|
parentModel = parentModel || this.parentModel && this.parentModel.getModel(this.resolveParentPath(pathFinal));
|
|
118407
118414
|
return new Model2(obj, parentModel, this.ecModel);
|
|
@@ -118415,14 +118422,14 @@ var init_Model = __esm({
|
|
|
118415
118422
|
var Ctor = this.constructor;
|
|
118416
118423
|
return new Ctor(clone2(this.option));
|
|
118417
118424
|
};
|
|
118418
|
-
Model2.prototype.parsePath = function(
|
|
118419
|
-
if (typeof
|
|
118420
|
-
return
|
|
118425
|
+
Model2.prototype.parsePath = function(path46) {
|
|
118426
|
+
if (typeof path46 === "string") {
|
|
118427
|
+
return path46.split(".");
|
|
118421
118428
|
}
|
|
118422
|
-
return
|
|
118429
|
+
return path46;
|
|
118423
118430
|
};
|
|
118424
|
-
Model2.prototype.resolveParentPath = function(
|
|
118425
|
-
return
|
|
118431
|
+
Model2.prototype.resolveParentPath = function(path46) {
|
|
118432
|
+
return path46;
|
|
118426
118433
|
};
|
|
118427
118434
|
Model2.prototype.isAnimationEnabled = function() {
|
|
118428
118435
|
if (!env_default.node && this.option) {
|
|
@@ -121161,8 +121168,8 @@ var init_compatStyle = __esm({
|
|
|
121161
121168
|
});
|
|
121162
121169
|
|
|
121163
121170
|
// node_modules/echarts/lib/preprocessor/backwardCompat.js
|
|
121164
|
-
function get4(opt,
|
|
121165
|
-
var pathArr =
|
|
121171
|
+
function get4(opt, path46) {
|
|
121172
|
+
var pathArr = path46.split(",");
|
|
121166
121173
|
var obj = opt;
|
|
121167
121174
|
for (var i = 0; i < pathArr.length; i++) {
|
|
121168
121175
|
obj = obj && obj[pathArr[i]];
|
|
@@ -121172,8 +121179,8 @@ function get4(opt, path45) {
|
|
|
121172
121179
|
}
|
|
121173
121180
|
return obj;
|
|
121174
121181
|
}
|
|
121175
|
-
function set3(opt,
|
|
121176
|
-
var pathArr =
|
|
121182
|
+
function set3(opt, path46, val, overwrite) {
|
|
121183
|
+
var pathArr = path46.split(",");
|
|
121177
121184
|
var obj = opt;
|
|
121178
121185
|
var key;
|
|
121179
121186
|
var i = 0;
|
|
@@ -125995,15 +126002,15 @@ var init_symbol2 = __esm({
|
|
|
125995
126002
|
width: 0,
|
|
125996
126003
|
height: 0
|
|
125997
126004
|
},
|
|
125998
|
-
buildPath: function(
|
|
126005
|
+
buildPath: function(path46, shape) {
|
|
125999
126006
|
var cx = shape.cx;
|
|
126000
126007
|
var cy = shape.cy;
|
|
126001
126008
|
var width = shape.width / 2;
|
|
126002
126009
|
var height = shape.height / 2;
|
|
126003
|
-
|
|
126004
|
-
|
|
126005
|
-
|
|
126006
|
-
|
|
126010
|
+
path46.moveTo(cx, cy - height);
|
|
126011
|
+
path46.lineTo(cx + width, cy + height);
|
|
126012
|
+
path46.lineTo(cx - width, cy + height);
|
|
126013
|
+
path46.closePath();
|
|
126007
126014
|
}
|
|
126008
126015
|
});
|
|
126009
126016
|
Diamond = Path_default.extend({
|
|
@@ -126014,16 +126021,16 @@ var init_symbol2 = __esm({
|
|
|
126014
126021
|
width: 0,
|
|
126015
126022
|
height: 0
|
|
126016
126023
|
},
|
|
126017
|
-
buildPath: function(
|
|
126024
|
+
buildPath: function(path46, shape) {
|
|
126018
126025
|
var cx = shape.cx;
|
|
126019
126026
|
var cy = shape.cy;
|
|
126020
126027
|
var width = shape.width / 2;
|
|
126021
126028
|
var height = shape.height / 2;
|
|
126022
|
-
|
|
126023
|
-
|
|
126024
|
-
|
|
126025
|
-
|
|
126026
|
-
|
|
126029
|
+
path46.moveTo(cx, cy - height);
|
|
126030
|
+
path46.lineTo(cx + width, cy);
|
|
126031
|
+
path46.lineTo(cx, cy + height);
|
|
126032
|
+
path46.lineTo(cx - width, cy);
|
|
126033
|
+
path46.closePath();
|
|
126027
126034
|
}
|
|
126028
126035
|
});
|
|
126029
126036
|
Pin = Path_default.extend({
|
|
@@ -126035,7 +126042,7 @@ var init_symbol2 = __esm({
|
|
|
126035
126042
|
width: 0,
|
|
126036
126043
|
height: 0
|
|
126037
126044
|
},
|
|
126038
|
-
buildPath: function(
|
|
126045
|
+
buildPath: function(path46, shape) {
|
|
126039
126046
|
var x = shape.x;
|
|
126040
126047
|
var y = shape.y;
|
|
126041
126048
|
var w = shape.width / 5 * 3;
|
|
@@ -126049,11 +126056,11 @@ var init_symbol2 = __esm({
|
|
|
126049
126056
|
var tanY = Math.cos(angle);
|
|
126050
126057
|
var cpLen = r * 0.6;
|
|
126051
126058
|
var cpLen2 = r * 0.7;
|
|
126052
|
-
|
|
126053
|
-
|
|
126054
|
-
|
|
126055
|
-
|
|
126056
|
-
|
|
126059
|
+
path46.moveTo(x - dx, cy + dy);
|
|
126060
|
+
path46.arc(x, cy, r, Math.PI - angle, Math.PI * 2 + angle);
|
|
126061
|
+
path46.bezierCurveTo(x + dx - tanX * cpLen, cy + dy + tanY * cpLen, x, y - cpLen2, x, y);
|
|
126062
|
+
path46.bezierCurveTo(x, y - cpLen2, x - dx + tanX * cpLen, cy + dy + tanY * cpLen, x - dx, cy + dy);
|
|
126063
|
+
path46.closePath();
|
|
126057
126064
|
}
|
|
126058
126065
|
});
|
|
126059
126066
|
Arrow = Path_default.extend({
|
|
@@ -126348,7 +126355,7 @@ function brushPath(ctx, el, style, inBatch) {
|
|
|
126348
126355
|
if ((!el.silent || strokePart) && firstDraw) {
|
|
126349
126356
|
el.createPathProxy();
|
|
126350
126357
|
}
|
|
126351
|
-
var
|
|
126358
|
+
var path46 = el.path || pathProxyForDraw;
|
|
126352
126359
|
var dirtyFlag = el.__dirty;
|
|
126353
126360
|
if (!inBatch) {
|
|
126354
126361
|
var fill = style.fill;
|
|
@@ -126401,7 +126408,7 @@ function brushPath(ctx, el, style, inBatch) {
|
|
|
126401
126408
|
}
|
|
126402
126409
|
}
|
|
126403
126410
|
var scale4 = el.getGlobalScale();
|
|
126404
|
-
|
|
126411
|
+
path46.setScale(scale4[0], scale4[1], el.segmentIgnoreThreshold);
|
|
126405
126412
|
var lineDash;
|
|
126406
126413
|
var lineDashOffset;
|
|
126407
126414
|
if (ctx.setLineDash && style.lineDash) {
|
|
@@ -126409,20 +126416,20 @@ function brushPath(ctx, el, style, inBatch) {
|
|
|
126409
126416
|
}
|
|
126410
126417
|
var needsRebuild = true;
|
|
126411
126418
|
if (firstDraw || dirtyFlag & SHAPE_CHANGED_BIT) {
|
|
126412
|
-
|
|
126419
|
+
path46.setDPR(ctx.dpr);
|
|
126413
126420
|
if (strokePart) {
|
|
126414
|
-
|
|
126421
|
+
path46.setContext(null);
|
|
126415
126422
|
} else {
|
|
126416
|
-
|
|
126423
|
+
path46.setContext(ctx);
|
|
126417
126424
|
needsRebuild = false;
|
|
126418
126425
|
}
|
|
126419
|
-
|
|
126420
|
-
el.buildPath(
|
|
126421
|
-
|
|
126426
|
+
path46.reset();
|
|
126427
|
+
el.buildPath(path46, el.shape, inBatch);
|
|
126428
|
+
path46.toStatic();
|
|
126422
126429
|
el.pathUpdated();
|
|
126423
126430
|
}
|
|
126424
126431
|
if (needsRebuild) {
|
|
126425
|
-
|
|
126432
|
+
path46.rebuildPath(ctx, strokePart ? strokePercent : 1);
|
|
126426
126433
|
}
|
|
126427
126434
|
if (lineDash) {
|
|
126428
126435
|
ctx.setLineDash(lineDash);
|
|
@@ -133402,7 +133409,7 @@ function nearestPointOnRect(pt, rect, out2) {
|
|
|
133402
133409
|
out2.set(tmpPt[0], tmpPt[1]);
|
|
133403
133410
|
return dist3;
|
|
133404
133411
|
}
|
|
133405
|
-
function nearestPointOnPath(pt,
|
|
133412
|
+
function nearestPointOnPath(pt, path46, out2) {
|
|
133406
133413
|
var xi = 0;
|
|
133407
133414
|
var yi = 0;
|
|
133408
133415
|
var x0 = 0;
|
|
@@ -133410,7 +133417,7 @@ function nearestPointOnPath(pt, path45, out2) {
|
|
|
133410
133417
|
var x1;
|
|
133411
133418
|
var y1;
|
|
133412
133419
|
var minDist = Infinity;
|
|
133413
|
-
var data =
|
|
133420
|
+
var data = path46.data;
|
|
133414
133421
|
var x = pt.x;
|
|
133415
133422
|
var y = pt.y;
|
|
133416
133423
|
for (var i = 0; i < data.length; ) {
|
|
@@ -133619,30 +133626,30 @@ function setLabelLineState(labelLine, ignore, stateName, stateModel) {
|
|
|
133619
133626
|
var styleObj = stateModel.getModel("lineStyle").getLineStyle();
|
|
133620
133627
|
isNormal ? labelLine.useStyle(styleObj) : stateObj.style = styleObj;
|
|
133621
133628
|
}
|
|
133622
|
-
function buildLabelLinePath(
|
|
133629
|
+
function buildLabelLinePath(path46, shape) {
|
|
133623
133630
|
var smooth = shape.smooth;
|
|
133624
133631
|
var points4 = shape.points;
|
|
133625
133632
|
if (!points4) {
|
|
133626
133633
|
return;
|
|
133627
133634
|
}
|
|
133628
|
-
|
|
133635
|
+
path46.moveTo(points4[0][0], points4[0][1]);
|
|
133629
133636
|
if (smooth > 0 && points4.length >= 3) {
|
|
133630
133637
|
var len1 = dist(points4[0], points4[1]);
|
|
133631
133638
|
var len2 = dist(points4[1], points4[2]);
|
|
133632
133639
|
if (!len1 || !len2) {
|
|
133633
|
-
|
|
133634
|
-
|
|
133640
|
+
path46.lineTo(points4[1][0], points4[1][1]);
|
|
133641
|
+
path46.lineTo(points4[2][0], points4[2][1]);
|
|
133635
133642
|
return;
|
|
133636
133643
|
}
|
|
133637
133644
|
var moveLen = Math.min(len1, len2) * smooth;
|
|
133638
133645
|
var midPoint0 = lerp([], points4[1], points4[0], moveLen / len1);
|
|
133639
133646
|
var midPoint2 = lerp([], points4[1], points4[2], moveLen / len2);
|
|
133640
133647
|
var midPoint1 = lerp([], midPoint0, midPoint2, 0.5);
|
|
133641
|
-
|
|
133642
|
-
|
|
133648
|
+
path46.bezierCurveTo(midPoint0[0], midPoint0[1], midPoint0[0], midPoint0[1], midPoint1[0], midPoint1[1]);
|
|
133649
|
+
path46.bezierCurveTo(midPoint2[0], midPoint2[1], midPoint2[0], midPoint2[1], points4[2][0], points4[2][1]);
|
|
133643
133650
|
} else {
|
|
133644
133651
|
for (var i = 1; i < points4.length; i++) {
|
|
133645
|
-
|
|
133652
|
+
path46.lineTo(points4[i][0], points4[i][1]);
|
|
133646
133653
|
}
|
|
133647
133654
|
}
|
|
133648
133655
|
}
|
|
@@ -134675,13 +134682,13 @@ var init_cssClassId = __esm({
|
|
|
134675
134682
|
});
|
|
134676
134683
|
|
|
134677
134684
|
// node_modules/zrender/lib/svg/cssAnimation.js
|
|
134678
|
-
function buildPathString(el, kfShape,
|
|
134685
|
+
function buildPathString(el, kfShape, path46) {
|
|
134679
134686
|
var shape = extend3({}, el.shape);
|
|
134680
134687
|
extend3(shape, kfShape);
|
|
134681
|
-
el.buildPath(
|
|
134688
|
+
el.buildPath(path46, shape);
|
|
134682
134689
|
var svgPathBuilder = new SVGPathRebuilder_default();
|
|
134683
134690
|
svgPathBuilder.reset(getPathPrecision(el));
|
|
134684
|
-
|
|
134691
|
+
path46.rebuildPath(svgPathBuilder, 1);
|
|
134685
134692
|
svgPathBuilder.generateStr();
|
|
134686
134693
|
return svgPathBuilder.getStr();
|
|
134687
134694
|
}
|
|
@@ -134701,10 +134708,10 @@ function createCompoundPathCSSAnimation(el, attrs, scope) {
|
|
|
134701
134708
|
var composedAnim = {};
|
|
134702
134709
|
var cssAnimationCfg;
|
|
134703
134710
|
var cssAnimationName;
|
|
134704
|
-
each(paths, function(
|
|
134711
|
+
each(paths, function(path46) {
|
|
134705
134712
|
var subScope = createBrushScope(scope.zrId);
|
|
134706
134713
|
subScope.animation = true;
|
|
134707
|
-
createCSSAnimation(
|
|
134714
|
+
createCSSAnimation(path46, {}, subScope, true);
|
|
134708
134715
|
var cssAnims = subScope.cssAnims;
|
|
134709
134716
|
var cssNodes = subScope.cssNodes;
|
|
134710
134717
|
var animNames = keys(cssAnims);
|
|
@@ -134829,19 +134836,19 @@ function createCSSAnimation(el, attrs, scope, onlyShape) {
|
|
|
134829
134836
|
}
|
|
134830
134837
|
}
|
|
134831
134838
|
;
|
|
134832
|
-
var
|
|
134839
|
+
var path46;
|
|
134833
134840
|
var canAnimateShape = true;
|
|
134834
134841
|
for (var percent in shapeKfs) {
|
|
134835
134842
|
finalKfs[percent] = finalKfs[percent] || {};
|
|
134836
|
-
var isFirst = !
|
|
134843
|
+
var isFirst = !path46;
|
|
134837
134844
|
var timingFunction = shapeKfs[percent][animationTimingFunctionAttrName];
|
|
134838
134845
|
if (isFirst) {
|
|
134839
|
-
|
|
134846
|
+
path46 = new PathProxy_default();
|
|
134840
134847
|
}
|
|
134841
|
-
var len_1 =
|
|
134842
|
-
|
|
134843
|
-
finalKfs[percent].d = buildPathString(el, shapeKfs[percent],
|
|
134844
|
-
var newLen =
|
|
134848
|
+
var len_1 = path46.len();
|
|
134849
|
+
path46.reset();
|
|
134850
|
+
finalKfs[percent].d = buildPathString(el, shapeKfs[percent], path46);
|
|
134851
|
+
var newLen = path46.len();
|
|
134845
134852
|
if (!isFirst && len_1 !== newLen) {
|
|
134846
134853
|
canAnimateShape = false;
|
|
134847
134854
|
break;
|
|
@@ -135109,13 +135116,13 @@ function brushSVGPath(el, scope) {
|
|
|
135109
135116
|
if (!el.path) {
|
|
135110
135117
|
el.createPathProxy();
|
|
135111
135118
|
}
|
|
135112
|
-
var
|
|
135119
|
+
var path46 = el.path;
|
|
135113
135120
|
if (needBuildPath) {
|
|
135114
|
-
|
|
135115
|
-
el.buildPath(
|
|
135121
|
+
path46.beginPath();
|
|
135122
|
+
el.buildPath(path46, el.shape);
|
|
135116
135123
|
el.pathUpdated();
|
|
135117
135124
|
}
|
|
135118
|
-
var pathVersion =
|
|
135125
|
+
var pathVersion = path46.getVersion();
|
|
135119
135126
|
var elExt = el;
|
|
135120
135127
|
var svgPathBuilder = elExt.__svgPathBuilder;
|
|
135121
135128
|
if (elExt.__svgPathVersion !== pathVersion || !svgPathBuilder || strokePercent !== elExt.__svgPathStrokePercent) {
|
|
@@ -135123,7 +135130,7 @@ function brushSVGPath(el, scope) {
|
|
|
135123
135130
|
svgPathBuilder = elExt.__svgPathBuilder = new SVGPathRebuilder_default();
|
|
135124
135131
|
}
|
|
135125
135132
|
svgPathBuilder.reset(precision);
|
|
135126
|
-
|
|
135133
|
+
path46.rebuildPath(svgPathBuilder, strokePercent);
|
|
135127
135134
|
svgPathBuilder.generateStr();
|
|
135128
135135
|
elExt.__svgPathVersion = pathVersion;
|
|
135129
135136
|
elExt.__svgPathStrokePercent = strokePercent;
|
|
@@ -137876,8 +137883,8 @@ var init_poly2 = __esm({
|
|
|
137876
137883
|
this.createPathProxy();
|
|
137877
137884
|
this.buildPath(this.path, this.shape);
|
|
137878
137885
|
}
|
|
137879
|
-
var
|
|
137880
|
-
var data =
|
|
137886
|
+
var path46 = this.path;
|
|
137887
|
+
var data = path46.data;
|
|
137881
137888
|
var CMD6 = PathProxy_default.CMD;
|
|
137882
137889
|
var x0;
|
|
137883
137890
|
var y0;
|
|
@@ -141706,12 +141713,12 @@ var init_LargeSymbolDraw = __esm({
|
|
|
141706
141713
|
this.notClear = false;
|
|
141707
141714
|
this._off = 0;
|
|
141708
141715
|
};
|
|
141709
|
-
LargeSymbolPath2.prototype.buildPath = function(
|
|
141716
|
+
LargeSymbolPath2.prototype.buildPath = function(path46, shape) {
|
|
141710
141717
|
var points4 = shape.points;
|
|
141711
141718
|
var size = shape.size;
|
|
141712
141719
|
var symbolProxy = this.symbolProxy;
|
|
141713
141720
|
var symbolProxyShape = symbolProxy.shape;
|
|
141714
|
-
var ctx =
|
|
141721
|
+
var ctx = path46.getContext ? path46.getContext() : path46;
|
|
141715
141722
|
var canBoost = ctx && size[0] < BOOST_SIZE_THRESHOLD;
|
|
141716
141723
|
var softClipShape = this.softClipShape;
|
|
141717
141724
|
var i;
|
|
@@ -141733,7 +141740,7 @@ var init_LargeSymbolDraw = __esm({
|
|
|
141733
141740
|
symbolProxyShape.y = y - size[1] / 2;
|
|
141734
141741
|
symbolProxyShape.width = size[0];
|
|
141735
141742
|
symbolProxyShape.height = size[1];
|
|
141736
|
-
symbolProxy.buildPath(
|
|
141743
|
+
symbolProxy.buildPath(path46, symbolProxyShape, true);
|
|
141737
141744
|
}
|
|
141738
141745
|
if (this.incremental) {
|
|
141739
141746
|
this._off = i;
|
|
@@ -145927,11 +145934,11 @@ var init_parseSVG = __esm({
|
|
|
145927
145934
|
},
|
|
145928
145935
|
"path": function(xmlNode, parentGroup) {
|
|
145929
145936
|
var d = xmlNode.getAttribute("d") || "";
|
|
145930
|
-
var
|
|
145931
|
-
inheritStyle(parentGroup,
|
|
145932
|
-
parseAttributes(xmlNode,
|
|
145933
|
-
|
|
145934
|
-
return
|
|
145937
|
+
var path46 = createFromString(d);
|
|
145938
|
+
inheritStyle(parentGroup, path46);
|
|
145939
|
+
parseAttributes(xmlNode, path46, this._defsUsePending, false, false);
|
|
145940
|
+
path46.silent = true;
|
|
145941
|
+
return path46;
|
|
145935
145942
|
}
|
|
145936
145943
|
};
|
|
145937
145944
|
}();
|
|
@@ -149158,13 +149165,13 @@ var init_Tree = __esm({
|
|
|
149158
149165
|
TreeNode2.prototype.getLayout = function() {
|
|
149159
149166
|
return this.hostTree.data.getItemLayout(this.dataIndex);
|
|
149160
149167
|
};
|
|
149161
|
-
TreeNode2.prototype.getModel = function(
|
|
149168
|
+
TreeNode2.prototype.getModel = function(path46) {
|
|
149162
149169
|
if (this.dataIndex < 0) {
|
|
149163
149170
|
return;
|
|
149164
149171
|
}
|
|
149165
149172
|
var hostTree = this.hostTree;
|
|
149166
149173
|
var itemModel = hostTree.data.getItemModel(this.dataIndex);
|
|
149167
|
-
return itemModel.getModel(
|
|
149174
|
+
return itemModel.getModel(path46);
|
|
149168
149175
|
};
|
|
149169
149176
|
TreeNode2.prototype.getLevelModel = function() {
|
|
149170
149177
|
return (this.hostTree.levelModels || [])[this.depth];
|
|
@@ -149301,12 +149308,12 @@ function retrieveTargetInfo(payload, validPayloadTypes, seriesModel) {
|
|
|
149301
149308
|
}
|
|
149302
149309
|
}
|
|
149303
149310
|
function getPathToRoot(node) {
|
|
149304
|
-
var
|
|
149311
|
+
var path46 = [];
|
|
149305
149312
|
while (node) {
|
|
149306
149313
|
node = node.parentNode;
|
|
149307
|
-
node &&
|
|
149314
|
+
node && path46.push(node);
|
|
149308
149315
|
}
|
|
149309
|
-
return
|
|
149316
|
+
return path46.reverse();
|
|
149310
149317
|
}
|
|
149311
149318
|
function aboveViewRoot(viewRoot, node) {
|
|
149312
149319
|
var viewPath = getPathToRoot(viewRoot);
|
|
@@ -153791,13 +153798,13 @@ var init_Graph = __esm({
|
|
|
153791
153798
|
GraphNode2.prototype.outDegree = function() {
|
|
153792
153799
|
return this.outEdges.length;
|
|
153793
153800
|
};
|
|
153794
|
-
GraphNode2.prototype.getModel = function(
|
|
153801
|
+
GraphNode2.prototype.getModel = function(path46) {
|
|
153795
153802
|
if (this.dataIndex < 0) {
|
|
153796
153803
|
return;
|
|
153797
153804
|
}
|
|
153798
153805
|
var graph = this.hostGraph;
|
|
153799
153806
|
var itemModel = graph.data.getItemModel(this.dataIndex);
|
|
153800
|
-
return itemModel.getModel(
|
|
153807
|
+
return itemModel.getModel(path46);
|
|
153801
153808
|
};
|
|
153802
153809
|
GraphNode2.prototype.getAdjacentDataIndices = function() {
|
|
153803
153810
|
var dataIndices = {
|
|
@@ -153861,13 +153868,13 @@ var init_Graph = __esm({
|
|
|
153861
153868
|
this.node2 = n2;
|
|
153862
153869
|
this.dataIndex = dataIndex == null ? -1 : dataIndex;
|
|
153863
153870
|
}
|
|
153864
|
-
GraphEdge2.prototype.getModel = function(
|
|
153871
|
+
GraphEdge2.prototype.getModel = function(path46) {
|
|
153865
153872
|
if (this.dataIndex < 0) {
|
|
153866
153873
|
return;
|
|
153867
153874
|
}
|
|
153868
153875
|
var graph = this.hostGraph;
|
|
153869
153876
|
var itemModel = graph.edgeData.getItemModel(this.dataIndex);
|
|
153870
|
-
return itemModel.getModel(
|
|
153877
|
+
return itemModel.getModel(path46);
|
|
153871
153878
|
};
|
|
153872
153879
|
GraphEdge2.prototype.getAdjacentDataIndices = function() {
|
|
153873
153880
|
return {
|
|
@@ -154054,8 +154061,8 @@ var init_GraphSeries = __esm({
|
|
|
154054
154061
|
return model;
|
|
154055
154062
|
});
|
|
154056
154063
|
var oldGetModel = Model_default.prototype.getModel;
|
|
154057
|
-
function newGetModel(
|
|
154058
|
-
var model = oldGetModel.call(this,
|
|
154064
|
+
function newGetModel(path46, parentModel) {
|
|
154065
|
+
var model = oldGetModel.call(this, path46, parentModel);
|
|
154059
154066
|
model.resolveParentPath = resolveParentPath;
|
|
154060
154067
|
return model;
|
|
154061
154068
|
}
|
|
@@ -161475,7 +161482,7 @@ function prepareLayoutInfo(itemModel, symbolSize, layout5, symbolRepeat, symbolC
|
|
|
161475
161482
|
}
|
|
161476
161483
|
function createPath(symbolMeta) {
|
|
161477
161484
|
var symbolPatternSize = symbolMeta.symbolPatternSize;
|
|
161478
|
-
var
|
|
161485
|
+
var path46 = createSymbol(
|
|
161479
161486
|
// Consider texture img, make a big size.
|
|
161480
161487
|
symbolMeta.symbolType,
|
|
161481
161488
|
-symbolPatternSize / 2,
|
|
@@ -161483,13 +161490,13 @@ function createPath(symbolMeta) {
|
|
|
161483
161490
|
symbolPatternSize,
|
|
161484
161491
|
symbolPatternSize
|
|
161485
161492
|
);
|
|
161486
|
-
|
|
161493
|
+
path46.attr({
|
|
161487
161494
|
culling: true
|
|
161488
161495
|
});
|
|
161489
|
-
|
|
161496
|
+
path46.type !== "image" && path46.setStyle({
|
|
161490
161497
|
strokeNoScale: true
|
|
161491
161498
|
});
|
|
161492
|
-
return
|
|
161499
|
+
return path46;
|
|
161493
161500
|
}
|
|
161494
161501
|
function createOrUpdateRepeatSymbols(bar, opt, symbolMeta, isUpdate) {
|
|
161495
161502
|
var bundle = bar.__pictorialBundle;
|
|
@@ -161500,28 +161507,28 @@ function createOrUpdateRepeatSymbols(bar, opt, symbolMeta, isUpdate) {
|
|
|
161500
161507
|
var repeatTimes = symbolMeta.repeatTimes || 0;
|
|
161501
161508
|
var index = 0;
|
|
161502
161509
|
var unit = symbolSize[opt.valueDim.index] + valueLineWidth + symbolMeta.symbolMargin * 2;
|
|
161503
|
-
eachPath(bar, function(
|
|
161504
|
-
|
|
161505
|
-
|
|
161510
|
+
eachPath(bar, function(path47) {
|
|
161511
|
+
path47.__pictorialAnimationIndex = index;
|
|
161512
|
+
path47.__pictorialRepeatTimes = repeatTimes;
|
|
161506
161513
|
if (index < repeatTimes) {
|
|
161507
|
-
updateAttr(
|
|
161514
|
+
updateAttr(path47, null, makeTarget(index), symbolMeta, isUpdate);
|
|
161508
161515
|
} else {
|
|
161509
|
-
updateAttr(
|
|
161516
|
+
updateAttr(path47, null, {
|
|
161510
161517
|
scaleX: 0,
|
|
161511
161518
|
scaleY: 0
|
|
161512
161519
|
}, symbolMeta, isUpdate, function() {
|
|
161513
|
-
bundle.remove(
|
|
161520
|
+
bundle.remove(path47);
|
|
161514
161521
|
});
|
|
161515
161522
|
}
|
|
161516
161523
|
index++;
|
|
161517
161524
|
});
|
|
161518
161525
|
for (; index < repeatTimes; index++) {
|
|
161519
|
-
var
|
|
161520
|
-
|
|
161521
|
-
|
|
161522
|
-
bundle.add(
|
|
161526
|
+
var path46 = createPath(symbolMeta);
|
|
161527
|
+
path46.__pictorialAnimationIndex = index;
|
|
161528
|
+
path46.__pictorialRepeatTimes = repeatTimes;
|
|
161529
|
+
bundle.add(path46);
|
|
161523
161530
|
var target = makeTarget(index);
|
|
161524
|
-
updateAttr(
|
|
161531
|
+
updateAttr(path46, {
|
|
161525
161532
|
x: target.x,
|
|
161526
161533
|
y: target.y,
|
|
161527
161534
|
scaleX: 0,
|
|
@@ -161629,10 +161636,10 @@ function getItemModel(data, dataIndex) {
|
|
|
161629
161636
|
itemModel.isAnimationEnabled = isAnimationEnabled;
|
|
161630
161637
|
return itemModel;
|
|
161631
161638
|
}
|
|
161632
|
-
function getAnimationDelayParams(
|
|
161639
|
+
function getAnimationDelayParams(path46) {
|
|
161633
161640
|
return {
|
|
161634
|
-
index:
|
|
161635
|
-
count:
|
|
161641
|
+
index: path46.__pictorialAnimationIndex,
|
|
161642
|
+
count: path46.__pictorialRepeatTimes
|
|
161636
161643
|
};
|
|
161637
161644
|
}
|
|
161638
161645
|
function isAnimationEnabled() {
|
|
@@ -161676,13 +161683,13 @@ function removeBar(data, dataIndex, animationModel, bar) {
|
|
|
161676
161683
|
var labelRect = bar.__pictorialBarRect;
|
|
161677
161684
|
labelRect && labelRect.removeTextContent();
|
|
161678
161685
|
var paths = [];
|
|
161679
|
-
eachPath(bar, function(
|
|
161680
|
-
paths.push(
|
|
161686
|
+
eachPath(bar, function(path46) {
|
|
161687
|
+
paths.push(path46);
|
|
161681
161688
|
});
|
|
161682
161689
|
bar.__pictorialMainPath && paths.push(bar.__pictorialMainPath);
|
|
161683
161690
|
bar.__pictorialClipPath && (animationModel = null);
|
|
161684
|
-
each(paths, function(
|
|
161685
|
-
removeElement(
|
|
161691
|
+
each(paths, function(path46) {
|
|
161692
|
+
removeElement(path46, {
|
|
161686
161693
|
scaleX: 0,
|
|
161687
161694
|
scaleY: 0
|
|
161688
161695
|
}, animationModel, dataIndex, function() {
|
|
@@ -161718,10 +161725,10 @@ function updateCommon2(bar, opt, symbolMeta) {
|
|
|
161718
161725
|
var focus = emphasisModel.get("focus");
|
|
161719
161726
|
var blurScope = emphasisModel.get("blurScope");
|
|
161720
161727
|
var hoverScale = emphasisModel.get("scale");
|
|
161721
|
-
eachPath(bar, function(
|
|
161722
|
-
if (
|
|
161723
|
-
var pathStyle =
|
|
161724
|
-
|
|
161728
|
+
eachPath(bar, function(path46) {
|
|
161729
|
+
if (path46 instanceof Image_default) {
|
|
161730
|
+
var pathStyle = path46.style;
|
|
161731
|
+
path46.useStyle(extend3({
|
|
161725
161732
|
// TODO other properties like dx, dy ?
|
|
161726
161733
|
image: pathStyle.image,
|
|
161727
161734
|
x: pathStyle.x,
|
|
@@ -161730,18 +161737,18 @@ function updateCommon2(bar, opt, symbolMeta) {
|
|
|
161730
161737
|
height: pathStyle.height
|
|
161731
161738
|
}, symbolMeta.style));
|
|
161732
161739
|
} else {
|
|
161733
|
-
|
|
161740
|
+
path46.useStyle(symbolMeta.style);
|
|
161734
161741
|
}
|
|
161735
|
-
var emphasisState =
|
|
161742
|
+
var emphasisState = path46.ensureState("emphasis");
|
|
161736
161743
|
emphasisState.style = emphasisStyle;
|
|
161737
161744
|
if (hoverScale) {
|
|
161738
|
-
emphasisState.scaleX =
|
|
161739
|
-
emphasisState.scaleY =
|
|
161745
|
+
emphasisState.scaleX = path46.scaleX * 1.1;
|
|
161746
|
+
emphasisState.scaleY = path46.scaleY * 1.1;
|
|
161740
161747
|
}
|
|
161741
|
-
|
|
161742
|
-
|
|
161743
|
-
cursorStyle && (
|
|
161744
|
-
|
|
161748
|
+
path46.ensureState("blur").style = blurStyle;
|
|
161749
|
+
path46.ensureState("select").style = selectStyle;
|
|
161750
|
+
cursorStyle && (path46.cursor = cursorStyle);
|
|
161751
|
+
path46.z2 = symbolMeta.z2;
|
|
161745
161752
|
});
|
|
161746
161753
|
var barPositionOutside = opt.valueDim.posDesc[+(symbolMeta.boundingLength > 0)];
|
|
161747
161754
|
var barRect = bar.__pictorialBarRect;
|
|
@@ -170031,14 +170038,14 @@ var init_ToolboxView = __esm({
|
|
|
170031
170038
|
}
|
|
170032
170039
|
var iconPaths = featureModel.iconPaths = {};
|
|
170033
170040
|
each(iconsMap, function(iconStr, iconName) {
|
|
170034
|
-
var
|
|
170041
|
+
var path46 = createIcon(iconStr, {}, {
|
|
170035
170042
|
x: -itemSize / 2,
|
|
170036
170043
|
y: -itemSize / 2,
|
|
170037
170044
|
width: itemSize,
|
|
170038
170045
|
height: itemSize
|
|
170039
170046
|
});
|
|
170040
|
-
|
|
170041
|
-
var pathEmphasisState =
|
|
170047
|
+
path46.setStyle(iconStyleModel.getItemStyle());
|
|
170048
|
+
var pathEmphasisState = path46.ensureState("emphasis");
|
|
170042
170049
|
pathEmphasisState.style = iconStyleEmphasisModel.getItemStyle();
|
|
170043
170050
|
var textContent = new Text_default({
|
|
170044
170051
|
style: {
|
|
@@ -170056,24 +170063,24 @@ var init_ToolboxView = __esm({
|
|
|
170056
170063
|
},
|
|
170057
170064
|
ignore: true
|
|
170058
170065
|
});
|
|
170059
|
-
|
|
170066
|
+
path46.setTextContent(textContent);
|
|
170060
170067
|
setTooltipConfig({
|
|
170061
|
-
el:
|
|
170068
|
+
el: path46,
|
|
170062
170069
|
componentModel: toolboxModel,
|
|
170063
170070
|
itemName: iconName,
|
|
170064
170071
|
formatterParamsExtra: {
|
|
170065
170072
|
title: titlesMap[iconName]
|
|
170066
170073
|
}
|
|
170067
170074
|
});
|
|
170068
|
-
|
|
170069
|
-
|
|
170075
|
+
path46.__title = titlesMap[iconName];
|
|
170076
|
+
path46.on("mouseover", function() {
|
|
170070
170077
|
var hoverStyle = iconStyleEmphasisModel.getItemStyle();
|
|
170071
170078
|
var defaultTextPosition = isVertical ? toolboxModel.get("right") == null && toolboxModel.get("left") !== "right" ? "right" : "left" : toolboxModel.get("bottom") == null && toolboxModel.get("top") !== "bottom" ? "bottom" : "top";
|
|
170072
170079
|
textContent.setStyle({
|
|
170073
170080
|
fill: iconStyleEmphasisModel.get("textFill") || hoverStyle.fill || hoverStyle.stroke || "#000",
|
|
170074
170081
|
backgroundColor: iconStyleEmphasisModel.get("textBackgroundColor")
|
|
170075
170082
|
});
|
|
170076
|
-
|
|
170083
|
+
path46.setTextConfig({
|
|
170077
170084
|
position: iconStyleEmphasisModel.get("textPosition") || defaultTextPosition
|
|
170078
170085
|
});
|
|
170079
170086
|
textContent.ignore = !toolboxModel.get("showTitle");
|
|
@@ -170084,10 +170091,10 @@ var init_ToolboxView = __esm({
|
|
|
170084
170091
|
}
|
|
170085
170092
|
textContent.hide();
|
|
170086
170093
|
});
|
|
170087
|
-
(featureModel.get(["iconStatus", iconName]) === "emphasis" ? enterEmphasis : leaveEmphasis)(
|
|
170088
|
-
group.add(
|
|
170089
|
-
|
|
170090
|
-
iconPaths[iconName] =
|
|
170094
|
+
(featureModel.get(["iconStatus", iconName]) === "emphasis" ? enterEmphasis : leaveEmphasis)(path46);
|
|
170095
|
+
group.add(path46);
|
|
170096
|
+
path46.on("click", bind2(feature.onclick, feature, ecModel, api, iconName));
|
|
170097
|
+
iconPaths[iconName] = path46;
|
|
170091
170098
|
});
|
|
170092
170099
|
}
|
|
170093
170100
|
layout4(group, toolboxModel, api);
|
|
@@ -177911,8 +177918,8 @@ var init_SliderZoomView = __esm({
|
|
|
177911
177918
|
deprecateLog("handleIcon now needs 'path://' prefix when using a path string");
|
|
177912
177919
|
}
|
|
177913
177920
|
}
|
|
177914
|
-
var
|
|
177915
|
-
|
|
177921
|
+
var path46 = createSymbol(iconStr, -1, 0, 2, 2, null, true);
|
|
177922
|
+
path46.attr({
|
|
177916
177923
|
cursor: getCursor(this._orient),
|
|
177917
177924
|
draggable: true,
|
|
177918
177925
|
drift: bind2(this._onDragMove, this, handleIndex),
|
|
@@ -177921,20 +177928,20 @@ var init_SliderZoomView = __esm({
|
|
|
177921
177928
|
onmouseout: bind2(this._showDataInfo, this, false),
|
|
177922
177929
|
z2: 5
|
|
177923
177930
|
});
|
|
177924
|
-
var bRect =
|
|
177931
|
+
var bRect = path46.getBoundingRect();
|
|
177925
177932
|
var handleSize = dataZoomModel.get("handleSize");
|
|
177926
177933
|
this._handleHeight = parsePercent2(handleSize, this._size[1]);
|
|
177927
177934
|
this._handleWidth = bRect.width / bRect.height * this._handleHeight;
|
|
177928
|
-
|
|
177929
|
-
|
|
177930
|
-
|
|
177931
|
-
|
|
177932
|
-
enableHoverEmphasis(
|
|
177935
|
+
path46.setStyle(dataZoomModel.getModel("handleStyle").getItemStyle());
|
|
177936
|
+
path46.style.strokeNoScale = true;
|
|
177937
|
+
path46.rectHover = true;
|
|
177938
|
+
path46.ensureState("emphasis").style = dataZoomModel.getModel(["emphasis", "handleStyle"]).getItemStyle();
|
|
177939
|
+
enableHoverEmphasis(path46);
|
|
177933
177940
|
var handleColor = dataZoomModel.get("handleColor");
|
|
177934
177941
|
if (handleColor != null) {
|
|
177935
|
-
|
|
177942
|
+
path46.style.fill = handleColor;
|
|
177936
177943
|
}
|
|
177937
|
-
sliderGroup.add(handles[handleIndex] =
|
|
177944
|
+
sliderGroup.add(handles[handleIndex] = path46);
|
|
177938
177945
|
var textStyleModel = dataZoomModel.getModel("textStyle");
|
|
177939
177946
|
var handleLabel = dataZoomModel.get("handleLabel") || {};
|
|
177940
177947
|
var handleLabelShow = handleLabel.show || false;
|
|
@@ -180954,9 +180961,9 @@ var init_components = __esm({
|
|
|
180954
180961
|
function aroundEqual(a, b) {
|
|
180955
180962
|
return Math.abs(a - b) < 1e-5;
|
|
180956
180963
|
}
|
|
180957
|
-
function pathToBezierCurves(
|
|
180958
|
-
var data =
|
|
180959
|
-
var len2 =
|
|
180964
|
+
function pathToBezierCurves(path46) {
|
|
180965
|
+
var data = path46.data;
|
|
180966
|
+
var len2 = path46.len();
|
|
180960
180967
|
var bezierArrayGroups = [];
|
|
180961
180968
|
var currentSubpath;
|
|
180962
180969
|
var xi = 0;
|
|
@@ -181117,8 +181124,8 @@ function adpativeBezier(x0, y0, x1, y1, x2, y2, x3, y3, out2, scale4) {
|
|
|
181117
181124
|
adpativeBezier(tmpSegX[0], tmpSegY[0], tmpSegX[1], tmpSegY[1], tmpSegX[2], tmpSegY[2], tmpSegX[3], tmpSegY[3], out2, scale4);
|
|
181118
181125
|
adpativeBezier(tmpSegX[4], tmpSegY[4], tmpSegX[5], tmpSegY[5], tmpSegX[6], tmpSegY[6], tmpSegX[7], tmpSegY[7], out2, scale4);
|
|
181119
181126
|
}
|
|
181120
|
-
function pathToPolygons(
|
|
181121
|
-
var bezierArrayGroups = pathToBezierCurves(
|
|
181127
|
+
function pathToPolygons(path46, scale4) {
|
|
181128
|
+
var bezierArrayGroups = pathToBezierCurves(path46);
|
|
181122
181129
|
var polygons = [];
|
|
181123
181130
|
scale4 = scale4 || 1;
|
|
181124
181131
|
for (var i = 0; i < bezierArrayGroups.length; i++) {
|
|
@@ -181350,10 +181357,10 @@ function binaryDivideRecursive(divider, shape, count2, out2) {
|
|
|
181350
181357
|
}
|
|
181351
181358
|
return out2;
|
|
181352
181359
|
}
|
|
181353
|
-
function clone6(
|
|
181360
|
+
function clone6(path46, count2) {
|
|
181354
181361
|
var paths = [];
|
|
181355
181362
|
for (var i = 0; i < count2; i++) {
|
|
181356
|
-
paths.push(clonePath(
|
|
181363
|
+
paths.push(clonePath(path46));
|
|
181357
181364
|
}
|
|
181358
181365
|
return paths;
|
|
181359
181366
|
}
|
|
@@ -181370,11 +181377,11 @@ function polygonConvert(points4) {
|
|
|
181370
181377
|
}
|
|
181371
181378
|
return out2;
|
|
181372
181379
|
}
|
|
181373
|
-
function split(
|
|
181380
|
+
function split(path46, count2) {
|
|
181374
181381
|
var outShapes = [];
|
|
181375
|
-
var shape =
|
|
181382
|
+
var shape = path46.shape;
|
|
181376
181383
|
var OutShapeCtor;
|
|
181377
|
-
switch (
|
|
181384
|
+
switch (path46.type) {
|
|
181378
181385
|
case "rect":
|
|
181379
181386
|
divideRect(shape, count2, outShapes);
|
|
181380
181387
|
OutShapeCtor = Rect_default;
|
|
@@ -181395,9 +181402,9 @@ function split(path45, count2) {
|
|
|
181395
181402
|
OutShapeCtor = Sector_default;
|
|
181396
181403
|
break;
|
|
181397
181404
|
default:
|
|
181398
|
-
var m2 =
|
|
181405
|
+
var m2 = path46.getComputedTransform();
|
|
181399
181406
|
var scale4 = m2 ? Math.sqrt(Math.max(m2[0] * m2[0] + m2[1] * m2[1], m2[2] * m2[2] + m2[3] * m2[3])) : 1;
|
|
181400
|
-
var polygons = map2(pathToPolygons(
|
|
181407
|
+
var polygons = map2(pathToPolygons(path46.getUpdatedPathProxy(), scale4), function(poly) {
|
|
181401
181408
|
return polygonConvert(poly);
|
|
181402
181409
|
});
|
|
181403
181410
|
var polygonCount = polygons.length;
|
|
@@ -181445,13 +181452,13 @@ function split(path45, count2) {
|
|
|
181445
181452
|
break;
|
|
181446
181453
|
}
|
|
181447
181454
|
if (!OutShapeCtor) {
|
|
181448
|
-
return clone6(
|
|
181455
|
+
return clone6(path46, count2);
|
|
181449
181456
|
}
|
|
181450
181457
|
var out2 = [];
|
|
181451
181458
|
for (var i = 0; i < outShapes.length; i++) {
|
|
181452
181459
|
var subPath = new OutShapeCtor();
|
|
181453
181460
|
subPath.setShape(outShapes[i]);
|
|
181454
|
-
copyPathProps(
|
|
181461
|
+
copyPathProps(path46, subPath);
|
|
181455
181462
|
out2.push(subPath);
|
|
181456
181463
|
}
|
|
181457
181464
|
return out2;
|
|
@@ -181681,8 +181688,8 @@ function findBestMorphingRotation(fromArr, toArr2, searchAngleIteration, searchA
|
|
|
181681
181688
|
}
|
|
181682
181689
|
return result;
|
|
181683
181690
|
}
|
|
181684
|
-
function isCombineMorphing(
|
|
181685
|
-
return
|
|
181691
|
+
function isCombineMorphing(path46) {
|
|
181692
|
+
return path46.__isCombineMorphing;
|
|
181686
181693
|
}
|
|
181687
181694
|
function saveAndModifyMethod(obj, methodName, modifiers) {
|
|
181688
181695
|
var savedMethodName = SAVED_METHOD_PREFIX + methodName;
|
|
@@ -181739,7 +181746,7 @@ function prepareMorphPath(fromPath, toPath) {
|
|
|
181739
181746
|
toPath.transform = null;
|
|
181740
181747
|
var morphingData = findBestMorphingRotation(fromBezierCurves, toBezierCurves, 10, Math.PI);
|
|
181741
181748
|
var tmpArr2 = [];
|
|
181742
|
-
saveAndModifyMethod(toPath, "buildPath", { replace: function(
|
|
181749
|
+
saveAndModifyMethod(toPath, "buildPath", { replace: function(path46) {
|
|
181743
181750
|
var t = toPath.__morphT;
|
|
181744
181751
|
var onet = 1 - t;
|
|
181745
181752
|
var newCp = [];
|
|
@@ -181765,7 +181772,7 @@ function prepareMorphPath(fromPath, toPath) {
|
|
|
181765
181772
|
}
|
|
181766
181773
|
var x0 = tmpArr2[0];
|
|
181767
181774
|
var y0 = tmpArr2[1];
|
|
181768
|
-
|
|
181775
|
+
path46.moveTo(x0, y0);
|
|
181769
181776
|
for (var m2 = 2; m2 < from.length; ) {
|
|
181770
181777
|
var x1 = tmpArr2[m2++];
|
|
181771
181778
|
var y1 = tmpArr2[m2++];
|
|
@@ -181774,9 +181781,9 @@ function prepareMorphPath(fromPath, toPath) {
|
|
|
181774
181781
|
var x3 = tmpArr2[m2++];
|
|
181775
181782
|
var y3 = tmpArr2[m2++];
|
|
181776
181783
|
if (x0 === x1 && y0 === y1 && x2 === x3 && y2 === y3) {
|
|
181777
|
-
|
|
181784
|
+
path46.lineTo(x3, y3);
|
|
181778
181785
|
} else {
|
|
181779
|
-
|
|
181786
|
+
path46.bezierCurveTo(x1, y1, x2, y2, x3, y3);
|
|
181780
181787
|
}
|
|
181781
181788
|
x0 = x3;
|
|
181782
181789
|
y0 = y3;
|
|
@@ -181846,9 +181853,9 @@ function sortPaths(pathList) {
|
|
|
181846
181853
|
var yMin = Infinity;
|
|
181847
181854
|
var xMax = -Infinity;
|
|
181848
181855
|
var yMax = -Infinity;
|
|
181849
|
-
var cps = map2(pathList, function(
|
|
181850
|
-
var rect =
|
|
181851
|
-
var m2 =
|
|
181856
|
+
var cps = map2(pathList, function(path46) {
|
|
181857
|
+
var rect = path46.getBoundingRect();
|
|
181858
|
+
var m2 = path46.getComputedTransform();
|
|
181852
181859
|
var x = rect.x + rect.width / 2 + (m2 ? m2[4] : 0);
|
|
181853
181860
|
var y = rect.y + rect.height / 2 + (m2 ? m2[5] : 0);
|
|
181854
181861
|
xMin = Math.min(x, xMin);
|
|
@@ -183870,6 +183877,7 @@ This link expires at ${new Date(
|
|
|
183870
183877
|
...authHeader !== void 0 ? { authHeader } : {},
|
|
183871
183878
|
...typedArgs?.tabId !== void 0 ? { tabId: typedArgs.tabId } : {},
|
|
183872
183879
|
...typedArgs?.loadAllRows !== void 0 ? { loadAllRows: typedArgs.loadAllRows } : {},
|
|
183880
|
+
...isHumanOrigin(origin2) && typeof typedArgs?.workspaceRoot === "string" ? { workspaceRoot: typedArgs.workspaceRoot } : {},
|
|
183873
183881
|
...!isHumanOrigin(origin2) && safeModeActive ? { enforceReadOnly: true } : {},
|
|
183874
183882
|
waitForResult,
|
|
183875
183883
|
clientConsent
|
|
@@ -184213,7 +184221,7 @@ var init_SubProcessConnectorClient = __esm({
|
|
|
184213
184221
|
let abortKillTimeout;
|
|
184214
184222
|
let errorOutput = "";
|
|
184215
184223
|
let stderrTruncated = false;
|
|
184216
|
-
const closePromise = new Promise((
|
|
184224
|
+
const closePromise = new Promise((resolve11, reject) => {
|
|
184217
184225
|
child.once("close", (code) => {
|
|
184218
184226
|
childClosed = true;
|
|
184219
184227
|
if (abortKillTimeout) {
|
|
@@ -184227,7 +184235,7 @@ var init_SubProcessConnectorClient = __esm({
|
|
|
184227
184235
|
)
|
|
184228
184236
|
);
|
|
184229
184237
|
} else {
|
|
184230
|
-
|
|
184238
|
+
resolve11();
|
|
184231
184239
|
}
|
|
184232
184240
|
});
|
|
184233
184241
|
child.once("error", (err) => {
|
|
@@ -184373,13 +184381,13 @@ var init_LongLivedConnectorClient = __esm({
|
|
|
184373
184381
|
}
|
|
184374
184382
|
});
|
|
184375
184383
|
const initPromise = this.sendRequest("initialize", { config: config2, auth: auth2 });
|
|
184376
|
-
return new Promise((
|
|
184384
|
+
return new Promise((resolve11, reject) => {
|
|
184377
184385
|
const onError = (err) => reject(new import_connector_api11.ConnectionError(`Failed to initialize: ${err.message}`));
|
|
184378
184386
|
this.child.once("error", onError);
|
|
184379
184387
|
this.child.once("close", () => reject(new import_connector_api11.ConnectionError("Process closed before init")));
|
|
184380
184388
|
initPromise.then(() => {
|
|
184381
184389
|
this.child.removeListener("error", onError);
|
|
184382
|
-
|
|
184390
|
+
resolve11();
|
|
184383
184391
|
}).catch(reject);
|
|
184384
184392
|
});
|
|
184385
184393
|
}
|
|
@@ -184429,8 +184437,8 @@ var init_LongLivedConnectorClient = __esm({
|
|
|
184429
184437
|
method,
|
|
184430
184438
|
params
|
|
184431
184439
|
};
|
|
184432
|
-
const promise2 = new Promise((
|
|
184433
|
-
this.pendingRequests.set(id, { resolve:
|
|
184440
|
+
const promise2 = new Promise((resolve11, reject) => {
|
|
184441
|
+
this.pendingRequests.set(id, { resolve: resolve11, reject });
|
|
184434
184442
|
});
|
|
184435
184443
|
this.child.stdin.write(JSON.stringify(req) + "\n");
|
|
184436
184444
|
return promise2;
|
|
@@ -184486,8 +184494,8 @@ var init_LongLivedConnectorClient = __esm({
|
|
|
184486
184494
|
} else if (state.done) {
|
|
184487
184495
|
break;
|
|
184488
184496
|
} else {
|
|
184489
|
-
await new Promise((
|
|
184490
|
-
state.resolve =
|
|
184497
|
+
await new Promise((resolve11) => {
|
|
184498
|
+
state.resolve = resolve11;
|
|
184491
184499
|
});
|
|
184492
184500
|
state.resolve = void 0;
|
|
184493
184501
|
}
|
|
@@ -184664,10 +184672,11 @@ var init_ConnectorProcessPool = __esm({
|
|
|
184664
184672
|
});
|
|
184665
184673
|
|
|
184666
184674
|
// src/server/DaemonQueryExecutor.ts
|
|
184667
|
-
var DaemonQueryExecutor;
|
|
184675
|
+
var path32, DaemonQueryExecutor;
|
|
184668
184676
|
var init_DaemonQueryExecutor = __esm({
|
|
184669
184677
|
"src/server/DaemonQueryExecutor.ts"() {
|
|
184670
184678
|
"use strict";
|
|
184679
|
+
path32 = __toESM(require("path"));
|
|
184671
184680
|
init_routing();
|
|
184672
184681
|
init_authHeaders();
|
|
184673
184682
|
init_errors4();
|
|
@@ -184796,7 +184805,7 @@ var init_DaemonQueryExecutor = __esm({
|
|
|
184796
184805
|
* Resolves the exact profile the executor will use. The policy gate calls this
|
|
184797
184806
|
* before classification so dialect selection and execution cannot diverge.
|
|
184798
184807
|
*/
|
|
184799
|
-
async resolveProfile(query, connectionId, connectionOverride, clientConsent) {
|
|
184808
|
+
async resolveProfile(query, connectionId, connectionOverride, clientConsent, workspaceRoot) {
|
|
184800
184809
|
let profile;
|
|
184801
184810
|
if (connectionOverride) {
|
|
184802
184811
|
profile = connectionOverride;
|
|
@@ -184824,7 +184833,7 @@ var init_DaemonQueryExecutor = __esm({
|
|
|
184824
184833
|
id: "adhoc-sqlite",
|
|
184825
184834
|
name: "Adhoc SQLite",
|
|
184826
184835
|
type: "sqlite",
|
|
184827
|
-
databasePath
|
|
184836
|
+
databasePath: workspaceRoot && databasePath && !path32.isAbsolute(databasePath) ? path32.resolve(workspaceRoot, databasePath) : databasePath
|
|
184828
184837
|
};
|
|
184829
184838
|
} catch (e2) {
|
|
184830
184839
|
this.logger.error("SQLite connector failed during auto-routing", e2);
|
|
@@ -184852,7 +184861,7 @@ var init_DaemonQueryExecutor = __esm({
|
|
|
184852
184861
|
name: "Adhoc DuckDB",
|
|
184853
184862
|
type: "duckdb",
|
|
184854
184863
|
databasePath: ":memory:",
|
|
184855
|
-
|
|
184864
|
+
...workspaceRoot ? { fileSearchPath: workspaceRoot } : {},
|
|
184856
184865
|
sslVerify: true
|
|
184857
184866
|
};
|
|
184858
184867
|
} catch (e2) {
|
|
@@ -184879,13 +184888,14 @@ var init_DaemonQueryExecutor = __esm({
|
|
|
184879
184888
|
return profile;
|
|
184880
184889
|
}
|
|
184881
184890
|
/** Orchestrates query execution after resolving its connector profile. */
|
|
184882
|
-
async *execute(query, sessionId, connectionId, abortSignal, connectionOverride, authHeaderOverride, maxRowsOverride, hooks, clientConsent) {
|
|
184891
|
+
async *execute(query, sessionId, connectionId, abortSignal, connectionOverride, authHeaderOverride, maxRowsOverride, hooks, clientConsent, workspaceRoot) {
|
|
184883
184892
|
this.logger.info(`Starting query execution for session ${sessionId}`, { query });
|
|
184884
184893
|
const profile = await this.resolveProfile(
|
|
184885
184894
|
query,
|
|
184886
184895
|
connectionId,
|
|
184887
184896
|
connectionOverride,
|
|
184888
|
-
clientConsent
|
|
184897
|
+
clientConsent,
|
|
184898
|
+
workspaceRoot
|
|
184889
184899
|
);
|
|
184890
184900
|
if (!profile) {
|
|
184891
184901
|
this.logger.error("No valid connection profile found.");
|
|
@@ -185063,8 +185073,8 @@ function createGetModuleFromFilename(basePath = process.argv[1] ? (0, import_pat
|
|
|
185063
185073
|
return decodedFile;
|
|
185064
185074
|
};
|
|
185065
185075
|
}
|
|
185066
|
-
function normalizeWindowsPath(
|
|
185067
|
-
return
|
|
185076
|
+
function normalizeWindowsPath(path46) {
|
|
185077
|
+
return path46.replace(/^[A-Z]:/, "").replace(/\\/g, "/");
|
|
185068
185078
|
}
|
|
185069
185079
|
var import_path9;
|
|
185070
185080
|
var init_module_node = __esm({
|
|
@@ -188810,15 +188820,15 @@ async function addSourceContext(frames) {
|
|
|
188810
188820
|
LRU_FILE_CONTENTS_CACHE.reduce();
|
|
188811
188821
|
return frames;
|
|
188812
188822
|
}
|
|
188813
|
-
function getContextLinesFromFile(
|
|
188814
|
-
return new Promise((
|
|
188815
|
-
const stream4 = (0, import_node_fs.createReadStream)(
|
|
188823
|
+
function getContextLinesFromFile(path46, ranges, output) {
|
|
188824
|
+
return new Promise((resolve11) => {
|
|
188825
|
+
const stream4 = (0, import_node_fs.createReadStream)(path46);
|
|
188816
188826
|
const lineReaded = (0, import_node_readline.createInterface)({
|
|
188817
188827
|
input: stream4
|
|
188818
188828
|
});
|
|
188819
188829
|
function destroyStreamAndResolve() {
|
|
188820
188830
|
stream4.destroy();
|
|
188821
|
-
|
|
188831
|
+
resolve11();
|
|
188822
188832
|
}
|
|
188823
188833
|
let lineNumber = 0;
|
|
188824
188834
|
let currentRangeIndex = 0;
|
|
@@ -188828,7 +188838,7 @@ function getContextLinesFromFile(path45, ranges, output) {
|
|
|
188828
188838
|
let rangeStart = range[0];
|
|
188829
188839
|
let rangeEnd = range[1];
|
|
188830
188840
|
function onStreamError() {
|
|
188831
|
-
LRU_FILE_CONTENTS_FS_READ_FAILED.set(
|
|
188841
|
+
LRU_FILE_CONTENTS_FS_READ_FAILED.set(path46, 1);
|
|
188832
188842
|
lineReaded.close();
|
|
188833
188843
|
lineReaded.removeAllListeners();
|
|
188834
188844
|
destroyStreamAndResolve();
|
|
@@ -188896,8 +188906,8 @@ function clearLineContext(frame) {
|
|
|
188896
188906
|
delete frame.context_line;
|
|
188897
188907
|
delete frame.post_context;
|
|
188898
188908
|
}
|
|
188899
|
-
function shouldSkipContextLinesForFile(
|
|
188900
|
-
return
|
|
188909
|
+
function shouldSkipContextLinesForFile(path46) {
|
|
188910
|
+
return path46.startsWith("node:") || path46.endsWith(".min.js") || path46.endsWith(".min.cjs") || path46.endsWith(".min.mjs") || path46.startsWith("data:");
|
|
188901
188911
|
}
|
|
188902
188912
|
function shouldSkipContextLinesForFrame(frame) {
|
|
188903
188913
|
if (void 0 !== frame.lineno && frame.lineno > MAX_CONTEXTLINES_LINENO)
|
|
@@ -190430,7 +190440,7 @@ var init_sender = __esm({
|
|
|
190430
190440
|
this.fetchFn = hooks.fetch;
|
|
190431
190441
|
this.onError = hooks.onError;
|
|
190432
190442
|
this.now = hooks.now ?? Date.now;
|
|
190433
|
-
this.sleep = hooks.sleep ?? ((ms) => new Promise((
|
|
190443
|
+
this.sleep = hooks.sleep ?? ((ms) => new Promise((resolve11) => safeSetTimeout(resolve11, ms)));
|
|
190434
190444
|
this.generateRequestId = hooks.generateRequestId ?? uuidv72;
|
|
190435
190445
|
this.compress = hooks.compress ?? gzipCompress;
|
|
190436
190446
|
}
|
|
@@ -190742,9 +190752,9 @@ var init_client = __esm({
|
|
|
190742
190752
|
if (this.disabled || this.optedOut)
|
|
190743
190753
|
return;
|
|
190744
190754
|
if (!this._waitUntilCycle) {
|
|
190745
|
-
let
|
|
190755
|
+
let resolve11;
|
|
190746
190756
|
const promise2 = new Promise((r) => {
|
|
190747
|
-
|
|
190757
|
+
resolve11 = r;
|
|
190748
190758
|
});
|
|
190749
190759
|
try {
|
|
190750
190760
|
waitUntil(promise2);
|
|
@@ -190752,7 +190762,7 @@ var init_client = __esm({
|
|
|
190752
190762
|
return;
|
|
190753
190763
|
}
|
|
190754
190764
|
this._waitUntilCycle = {
|
|
190755
|
-
resolve:
|
|
190765
|
+
resolve: resolve11,
|
|
190756
190766
|
startedAt: Date.now(),
|
|
190757
190767
|
timer: void 0
|
|
190758
190768
|
};
|
|
@@ -190778,12 +190788,12 @@ var init_client = __esm({
|
|
|
190778
190788
|
return cycle?.resolve;
|
|
190779
190789
|
}
|
|
190780
190790
|
async resolveWaitUntilFlush() {
|
|
190781
|
-
const
|
|
190791
|
+
const resolve11 = this._consumeWaitUntilCycle();
|
|
190782
190792
|
try {
|
|
190783
190793
|
await this.flushWithPendingPromises();
|
|
190784
190794
|
} catch {
|
|
190785
190795
|
} finally {
|
|
190786
|
-
|
|
190796
|
+
resolve11?.();
|
|
190787
190797
|
}
|
|
190788
190798
|
}
|
|
190789
190799
|
getPersistedProperty(key) {
|
|
@@ -190996,15 +191006,15 @@ var init_client = __esm({
|
|
|
190996
191006
|
return true;
|
|
190997
191007
|
if (void 0 === this.featureFlagsPoller)
|
|
190998
191008
|
return false;
|
|
190999
|
-
return new Promise((
|
|
191009
|
+
return new Promise((resolve11) => {
|
|
191000
191010
|
const timeout = setTimeout(() => {
|
|
191001
191011
|
cleanup();
|
|
191002
|
-
|
|
191012
|
+
resolve11(false);
|
|
191003
191013
|
}, timeoutMs);
|
|
191004
191014
|
const cleanup = this._events.on("localEvaluationFlagsLoaded", (count2) => {
|
|
191005
191015
|
clearTimeout(timeout);
|
|
191006
191016
|
cleanup();
|
|
191007
|
-
|
|
191017
|
+
resolve11(count2 > 0);
|
|
191008
191018
|
});
|
|
191009
191019
|
});
|
|
191010
191020
|
}
|
|
@@ -191548,14 +191558,14 @@ var init_client = __esm({
|
|
|
191548
191558
|
}
|
|
191549
191559
|
async _shutdown(shutdownTimeoutMs) {
|
|
191550
191560
|
const shutdownDeadlineMs = Date.now() + (shutdownTimeoutMs ?? 3e4);
|
|
191551
|
-
const
|
|
191561
|
+
const resolve11 = this._consumeWaitUntilCycle();
|
|
191552
191562
|
await this.featureFlagsPoller?.stopPoller(shutdownTimeoutMs);
|
|
191553
191563
|
this.errorTracking.shutdown();
|
|
191554
191564
|
if (this._metrics) {
|
|
191555
191565
|
await Promise.race([
|
|
191556
191566
|
this._metrics.flush().catch(() => {
|
|
191557
191567
|
}),
|
|
191558
|
-
new Promise((
|
|
191568
|
+
new Promise((resolve12) => safeSetTimeout(resolve12, Math.max(0, shutdownDeadlineMs - Date.now())))
|
|
191559
191569
|
]);
|
|
191560
191570
|
this._metrics.reset();
|
|
191561
191571
|
}
|
|
@@ -191563,7 +191573,7 @@ var init_client = __esm({
|
|
|
191563
191573
|
return await super._shutdown(Math.max(0, shutdownDeadlineMs - Date.now()));
|
|
191564
191574
|
} finally {
|
|
191565
191575
|
this.distinctIdHasSentFlagCalls = {};
|
|
191566
|
-
|
|
191576
|
+
resolve11?.();
|
|
191567
191577
|
}
|
|
191568
191578
|
}
|
|
191569
191579
|
async _requestRemoteConfigPayload(flagKey) {
|
|
@@ -192147,8 +192157,8 @@ var init_DiagnosticsReporter = __esm({
|
|
|
192147
192157
|
try {
|
|
192148
192158
|
await Promise.race([
|
|
192149
192159
|
this.client.shutdown(),
|
|
192150
|
-
new Promise((
|
|
192151
|
-
timer = setTimeout(
|
|
192160
|
+
new Promise((resolve11) => {
|
|
192161
|
+
timer = setTimeout(resolve11, timeoutMs);
|
|
192152
192162
|
timer.unref?.();
|
|
192153
192163
|
})
|
|
192154
192164
|
]);
|
|
@@ -192733,21 +192743,21 @@ var init_logRedaction = __esm({
|
|
|
192733
192743
|
// src/server/surfaces/distFiles.ts
|
|
192734
192744
|
function distFileCandidates(fileName, baseDir = __dirname) {
|
|
192735
192745
|
return [
|
|
192736
|
-
|
|
192737
|
-
|
|
192738
|
-
|
|
192746
|
+
path33.join(baseDir, "dist", fileName),
|
|
192747
|
+
path33.join(baseDir, "../../dist", fileName),
|
|
192748
|
+
path33.join(baseDir, "../../../dist", fileName)
|
|
192739
192749
|
];
|
|
192740
192750
|
}
|
|
192741
192751
|
function findDistFile(fileName, baseDir = __dirname) {
|
|
192742
192752
|
const candidates = distFileCandidates(fileName, baseDir);
|
|
192743
192753
|
return candidates.find((candidate) => fs30.existsSync(candidate)) ?? candidates[1] ?? fileName;
|
|
192744
192754
|
}
|
|
192745
|
-
var fs30,
|
|
192755
|
+
var fs30, path33;
|
|
192746
192756
|
var init_distFiles = __esm({
|
|
192747
192757
|
"src/server/surfaces/distFiles.ts"() {
|
|
192748
192758
|
"use strict";
|
|
192749
192759
|
fs30 = __toESM(require("fs"));
|
|
192750
|
-
|
|
192760
|
+
path33 = __toESM(require("path"));
|
|
192751
192761
|
}
|
|
192752
192762
|
});
|
|
192753
192763
|
|
|
@@ -193999,7 +194009,7 @@ var init_dist3 = __esm({
|
|
|
193999
194009
|
});
|
|
194000
194010
|
if (!chunk) {
|
|
194001
194011
|
if (i === 1) {
|
|
194002
|
-
await new Promise((
|
|
194012
|
+
await new Promise((resolve11) => setTimeout(resolve11));
|
|
194003
194013
|
maxReadCount = 3;
|
|
194004
194014
|
continue;
|
|
194005
194015
|
}
|
|
@@ -194596,9 +194606,9 @@ data:
|
|
|
194596
194606
|
const initRequest = messages.find((m2) => isInitializeRequest(m2));
|
|
194597
194607
|
const clientProtocolVersion = initRequest ? initRequest.params.protocolVersion : req.headers.get("mcp-protocol-version") ?? DEFAULT_NEGOTIATED_PROTOCOL_VERSION;
|
|
194598
194608
|
if (this._enableJsonResponse) {
|
|
194599
|
-
return new Promise((
|
|
194609
|
+
return new Promise((resolve11) => {
|
|
194600
194610
|
this._streamMapping.set(streamId, {
|
|
194601
|
-
resolveJson:
|
|
194611
|
+
resolveJson: resolve11,
|
|
194602
194612
|
cleanup: () => {
|
|
194603
194613
|
this._streamMapping.delete(streamId);
|
|
194604
194614
|
}
|
|
@@ -196026,7 +196036,7 @@ var init_protocol = __esm({
|
|
|
196026
196036
|
return;
|
|
196027
196037
|
}
|
|
196028
196038
|
const pollInterval = task2.pollInterval ?? this._options?.defaultTaskPollInterval ?? 1e3;
|
|
196029
|
-
await new Promise((
|
|
196039
|
+
await new Promise((resolve11) => setTimeout(resolve11, pollInterval));
|
|
196030
196040
|
options?.signal?.throwIfAborted();
|
|
196031
196041
|
}
|
|
196032
196042
|
} catch (error52) {
|
|
@@ -196043,7 +196053,7 @@ var init_protocol = __esm({
|
|
|
196043
196053
|
*/
|
|
196044
196054
|
request(request2, resultSchema, options) {
|
|
196045
196055
|
const { relatedRequestId, resumptionToken, onresumptiontoken, task, relatedTask } = options ?? {};
|
|
196046
|
-
return new Promise((
|
|
196056
|
+
return new Promise((resolve11, reject) => {
|
|
196047
196057
|
const earlyReject = (error52) => {
|
|
196048
196058
|
reject(error52);
|
|
196049
196059
|
};
|
|
@@ -196121,7 +196131,7 @@ var init_protocol = __esm({
|
|
|
196121
196131
|
if (!parseResult.success) {
|
|
196122
196132
|
reject(parseResult.error);
|
|
196123
196133
|
} else {
|
|
196124
|
-
|
|
196134
|
+
resolve11(parseResult.data);
|
|
196125
196135
|
}
|
|
196126
196136
|
} catch (error52) {
|
|
196127
196137
|
reject(error52);
|
|
@@ -196382,12 +196392,12 @@ var init_protocol = __esm({
|
|
|
196382
196392
|
}
|
|
196383
196393
|
} catch {
|
|
196384
196394
|
}
|
|
196385
|
-
return new Promise((
|
|
196395
|
+
return new Promise((resolve11, reject) => {
|
|
196386
196396
|
if (signal.aborted) {
|
|
196387
196397
|
reject(new McpError(ErrorCode.InvalidRequest, "Request cancelled"));
|
|
196388
196398
|
return;
|
|
196389
196399
|
}
|
|
196390
|
-
const timeoutId = setTimeout(
|
|
196400
|
+
const timeoutId = setTimeout(resolve11, interval);
|
|
196391
196401
|
signal.addEventListener("abort", () => {
|
|
196392
196402
|
clearTimeout(timeoutId);
|
|
196393
196403
|
reject(new McpError(ErrorCode.InvalidRequest, "Request cancelled"));
|
|
@@ -199424,7 +199434,7 @@ var require_compile = __commonJS({
|
|
|
199424
199434
|
const schOrFunc = root.refs[ref];
|
|
199425
199435
|
if (schOrFunc)
|
|
199426
199436
|
return schOrFunc;
|
|
199427
|
-
let _sch =
|
|
199437
|
+
let _sch = resolve11.call(this, root, ref);
|
|
199428
199438
|
if (_sch === void 0) {
|
|
199429
199439
|
const schema = (_a4 = root.localRefs) === null || _a4 === void 0 ? void 0 : _a4[ref];
|
|
199430
199440
|
const { schemaId } = this.opts;
|
|
@@ -199451,7 +199461,7 @@ var require_compile = __commonJS({
|
|
|
199451
199461
|
function sameSchemaEnv(s1, s2) {
|
|
199452
199462
|
return s1.schema === s2.schema && s1.root === s2.root && s1.baseId === s2.baseId;
|
|
199453
199463
|
}
|
|
199454
|
-
function
|
|
199464
|
+
function resolve11(root, ref) {
|
|
199455
199465
|
let sch;
|
|
199456
199466
|
while (typeof (sch = this.refs[ref]) == "string")
|
|
199457
199467
|
ref = sch;
|
|
@@ -199670,8 +199680,8 @@ var require_utils4 = __commonJS({
|
|
|
199670
199680
|
}
|
|
199671
199681
|
return ind;
|
|
199672
199682
|
}
|
|
199673
|
-
function removeDotSegments(
|
|
199674
|
-
let input =
|
|
199683
|
+
function removeDotSegments(path46) {
|
|
199684
|
+
let input = path46;
|
|
199675
199685
|
const output = [];
|
|
199676
199686
|
let nextSlash = -1;
|
|
199677
199687
|
let len2 = 0;
|
|
@@ -199923,8 +199933,8 @@ var require_schemes = __commonJS({
|
|
|
199923
199933
|
wsComponent.secure = void 0;
|
|
199924
199934
|
}
|
|
199925
199935
|
if (wsComponent.resourceName) {
|
|
199926
|
-
const [
|
|
199927
|
-
wsComponent.path =
|
|
199936
|
+
const [path46, query] = wsComponent.resourceName.split("?");
|
|
199937
|
+
wsComponent.path = path46 && path46 !== "/" ? path46 : void 0;
|
|
199928
199938
|
wsComponent.query = query;
|
|
199929
199939
|
wsComponent.resourceName = void 0;
|
|
199930
199940
|
}
|
|
@@ -200083,7 +200093,7 @@ var require_fast_uri = __commonJS({
|
|
|
200083
200093
|
}
|
|
200084
200094
|
return uri;
|
|
200085
200095
|
}
|
|
200086
|
-
function
|
|
200096
|
+
function resolve11(baseURI, relativeURI, options) {
|
|
200087
200097
|
const schemelessOptions = options ? Object.assign({ scheme: "null" }, options) : { scheme: "null" };
|
|
200088
200098
|
const resolved = resolveComponent(parse4(baseURI, schemelessOptions), parse4(relativeURI, schemelessOptions), schemelessOptions, true);
|
|
200089
200099
|
schemelessOptions.skipEscape = true;
|
|
@@ -200342,7 +200352,7 @@ var require_fast_uri = __commonJS({
|
|
|
200342
200352
|
var fastUri = {
|
|
200343
200353
|
SCHEMES,
|
|
200344
200354
|
normalize: normalize5,
|
|
200345
|
-
resolve:
|
|
200355
|
+
resolve: resolve11,
|
|
200346
200356
|
resolveComponent,
|
|
200347
200357
|
equal,
|
|
200348
200358
|
serialize,
|
|
@@ -208847,8 +208857,8 @@ var require_promise = __commonJS({
|
|
|
208847
208857
|
_resolve;
|
|
208848
208858
|
_reject;
|
|
208849
208859
|
constructor() {
|
|
208850
|
-
this._promise = new Promise((
|
|
208851
|
-
this._resolve =
|
|
208860
|
+
this._promise = new Promise((resolve11, reject) => {
|
|
208861
|
+
this._resolve = resolve11;
|
|
208852
208862
|
this._reject = reject;
|
|
208853
208863
|
});
|
|
208854
208864
|
}
|
|
@@ -208944,9 +208954,9 @@ var require_exporter = __commonJS({
|
|
|
208944
208954
|
var api_1 = (init_esm2(), __toCommonJS(esm_exports));
|
|
208945
208955
|
var suppress_tracing_1 = require_suppress_tracing();
|
|
208946
208956
|
function _export(exporter, arg) {
|
|
208947
|
-
return new Promise((
|
|
208957
|
+
return new Promise((resolve11) => {
|
|
208948
208958
|
api_1.context.with((0, suppress_tracing_1.suppressTracing)(api_1.context.active()), () => {
|
|
208949
|
-
exporter.export(arg,
|
|
208959
|
+
exporter.export(arg, resolve11);
|
|
208950
208960
|
});
|
|
208951
208961
|
});
|
|
208952
208962
|
}
|
|
@@ -209781,9 +209791,9 @@ var require_getMachineId_linux = __commonJS({
|
|
|
209781
209791
|
var api_1 = (init_esm2(), __toCommonJS(esm_exports));
|
|
209782
209792
|
async function getMachineId() {
|
|
209783
209793
|
const paths = ["/etc/machine-id", "/var/lib/dbus/machine-id"];
|
|
209784
|
-
for (const
|
|
209794
|
+
for (const path46 of paths) {
|
|
209785
209795
|
try {
|
|
209786
|
-
const result = await fs_1.promises.readFile(
|
|
209796
|
+
const result = await fs_1.promises.readFile(path46, { encoding: "utf8" });
|
|
209787
209797
|
return result.trim();
|
|
209788
209798
|
} catch (e2) {
|
|
209789
209799
|
api_1.diag.debug(`error reading machine id: ${e2}`);
|
|
@@ -210971,8 +210981,8 @@ var require_BatchLogRecordProcessorBase = __commonJS({
|
|
|
210971
210981
|
_exportScheduledPromise;
|
|
210972
210982
|
_exportScheduledResolve;
|
|
210973
210983
|
constructor(exporter, logRecords, exportTimeoutMillis) {
|
|
210974
|
-
this._exportScheduledPromise = new Promise((
|
|
210975
|
-
this._exportScheduledResolve =
|
|
210984
|
+
this._exportScheduledPromise = new Promise((resolve11) => {
|
|
210985
|
+
this._exportScheduledResolve = resolve11;
|
|
210976
210986
|
});
|
|
210977
210987
|
this._exportCompleted = this._executeExport(exporter, logRecords, exportTimeoutMillis);
|
|
210978
210988
|
}
|
|
@@ -210996,14 +211006,14 @@ var require_BatchLogRecordProcessorBase = __commonJS({
|
|
|
210996
211006
|
}
|
|
210997
211007
|
}
|
|
210998
211008
|
async _exportWithTimeout(exporter, logRecords, exportTimeoutMillis) {
|
|
210999
|
-
return new Promise((
|
|
211009
|
+
return new Promise((resolve11, reject) => {
|
|
211000
211010
|
const timer = setTimeout(() => {
|
|
211001
211011
|
reject(new Error("Timeout"));
|
|
211002
211012
|
}, exportTimeoutMillis);
|
|
211003
211013
|
exporter.export(logRecords, (result) => {
|
|
211004
211014
|
clearTimeout(timer);
|
|
211005
211015
|
if (result.code === core_1.ExportResultCode.SUCCESS) {
|
|
211006
|
-
|
|
211016
|
+
resolve11();
|
|
211007
211017
|
} else {
|
|
211008
211018
|
reject(result.error ?? new Error("BatchLogRecordProcessor: log record export failed"));
|
|
211009
211019
|
}
|
|
@@ -215982,14 +215992,14 @@ var require_BatchSpanProcessorBase = __commonJS({
|
|
|
215982
215992
|
* for all other cases _flush should be used
|
|
215983
215993
|
* */
|
|
215984
215994
|
_flushAll() {
|
|
215985
|
-
return new Promise((
|
|
215995
|
+
return new Promise((resolve11, reject) => {
|
|
215986
215996
|
const promises3 = [];
|
|
215987
215997
|
const count2 = Math.ceil(this._finishedSpans.length / this._maxExportBatchSize);
|
|
215988
215998
|
for (let i = 0, j = count2; i < j; i++) {
|
|
215989
215999
|
promises3.push(this._flushOneBatch());
|
|
215990
216000
|
}
|
|
215991
216001
|
Promise.all(promises3).then(() => {
|
|
215992
|
-
|
|
216002
|
+
resolve11();
|
|
215993
216003
|
}).catch(reject);
|
|
215994
216004
|
});
|
|
215995
216005
|
}
|
|
@@ -215998,7 +216008,7 @@ var require_BatchSpanProcessorBase = __commonJS({
|
|
|
215998
216008
|
if (this._finishedSpans.length === 0) {
|
|
215999
216009
|
return Promise.resolve();
|
|
216000
216010
|
}
|
|
216001
|
-
return new Promise((
|
|
216011
|
+
return new Promise((resolve11, reject) => {
|
|
216002
216012
|
const timer = setTimeout(() => {
|
|
216003
216013
|
reject(new Error("Timeout"));
|
|
216004
216014
|
}, this._exportTimeoutMillis);
|
|
@@ -216013,7 +216023,7 @@ var require_BatchSpanProcessorBase = __commonJS({
|
|
|
216013
216023
|
const doExport = () => this._exporter.export(spans, (result) => {
|
|
216014
216024
|
clearTimeout(timer);
|
|
216015
216025
|
if (result.code === core_1.ExportResultCode.SUCCESS) {
|
|
216016
|
-
|
|
216026
|
+
resolve11();
|
|
216017
216027
|
} else {
|
|
216018
216028
|
reject(result.error ?? new Error("BatchSpanProcessor: span export failed"));
|
|
216019
216029
|
}
|
|
@@ -216398,12 +216408,12 @@ var require_MultiSpanProcessor = __commonJS({
|
|
|
216398
216408
|
for (const spanProcessor of this._spanProcessors) {
|
|
216399
216409
|
promises3.push(spanProcessor.forceFlush());
|
|
216400
216410
|
}
|
|
216401
|
-
return new Promise((
|
|
216411
|
+
return new Promise((resolve11) => {
|
|
216402
216412
|
Promise.all(promises3).then(() => {
|
|
216403
|
-
|
|
216413
|
+
resolve11();
|
|
216404
216414
|
}).catch((error52) => {
|
|
216405
216415
|
(0, core_1.globalErrorHandler)(error52 || new Error("MultiSpanProcessor: forceFlush failed"));
|
|
216406
|
-
|
|
216416
|
+
resolve11();
|
|
216407
216417
|
});
|
|
216408
216418
|
});
|
|
216409
216419
|
}
|
|
@@ -216429,9 +216439,9 @@ var require_MultiSpanProcessor = __commonJS({
|
|
|
216429
216439
|
for (const spanProcessor of this._spanProcessors) {
|
|
216430
216440
|
promises3.push(spanProcessor.shutdown());
|
|
216431
216441
|
}
|
|
216432
|
-
return new Promise((
|
|
216442
|
+
return new Promise((resolve11, reject) => {
|
|
216433
216443
|
Promise.all(promises3).then(() => {
|
|
216434
|
-
|
|
216444
|
+
resolve11();
|
|
216435
216445
|
}, reject);
|
|
216436
216446
|
});
|
|
216437
216447
|
}
|
|
@@ -216486,32 +216496,32 @@ var require_BasicTracerProvider = __commonJS({
|
|
|
216486
216496
|
forceFlush() {
|
|
216487
216497
|
const timeout = this._config.forceFlushTimeoutMillis;
|
|
216488
216498
|
const promises3 = this._activeSpanProcessor["_spanProcessors"].map((spanProcessor) => {
|
|
216489
|
-
return new Promise((
|
|
216499
|
+
return new Promise((resolve11) => {
|
|
216490
216500
|
let state;
|
|
216491
216501
|
const timeoutInterval = setTimeout(() => {
|
|
216492
|
-
|
|
216502
|
+
resolve11(new Error(`Span processor did not completed within timeout period of ${timeout} ms`));
|
|
216493
216503
|
state = ForceFlushState.timeout;
|
|
216494
216504
|
}, timeout);
|
|
216495
216505
|
spanProcessor.forceFlush().then(() => {
|
|
216496
216506
|
clearTimeout(timeoutInterval);
|
|
216497
216507
|
if (state !== ForceFlushState.timeout) {
|
|
216498
216508
|
state = ForceFlushState.resolved;
|
|
216499
|
-
|
|
216509
|
+
resolve11(state);
|
|
216500
216510
|
}
|
|
216501
216511
|
}).catch((error52) => {
|
|
216502
216512
|
clearTimeout(timeoutInterval);
|
|
216503
216513
|
state = ForceFlushState.error;
|
|
216504
|
-
|
|
216514
|
+
resolve11(error52);
|
|
216505
216515
|
});
|
|
216506
216516
|
});
|
|
216507
216517
|
});
|
|
216508
|
-
return new Promise((
|
|
216518
|
+
return new Promise((resolve11, reject) => {
|
|
216509
216519
|
Promise.all(promises3).then((results) => {
|
|
216510
216520
|
const errors = results.filter((result) => result !== ForceFlushState.resolved);
|
|
216511
216521
|
if (errors.length > 0) {
|
|
216512
216522
|
reject(errors);
|
|
216513
216523
|
} else {
|
|
216514
|
-
|
|
216524
|
+
resolve11();
|
|
216515
216525
|
}
|
|
216516
216526
|
}).catch((error52) => reject([error52]));
|
|
216517
216527
|
});
|
|
@@ -217572,19 +217582,19 @@ var require_module_details_from_path = __commonJS({
|
|
|
217572
217582
|
basedir += segments[i] + sep7;
|
|
217573
217583
|
}
|
|
217574
217584
|
}
|
|
217575
|
-
var
|
|
217585
|
+
var path46 = "";
|
|
217576
217586
|
var lastSegmentIndex = segments.length - 1;
|
|
217577
217587
|
for (var i2 = index + offset; i2 <= lastSegmentIndex; i2++) {
|
|
217578
217588
|
if (i2 === lastSegmentIndex) {
|
|
217579
|
-
|
|
217589
|
+
path46 += segments[i2];
|
|
217580
217590
|
} else {
|
|
217581
|
-
|
|
217591
|
+
path46 += segments[i2] + sep7;
|
|
217582
217592
|
}
|
|
217583
217593
|
}
|
|
217584
217594
|
return {
|
|
217585
217595
|
name,
|
|
217586
217596
|
basedir,
|
|
217587
|
-
path:
|
|
217597
|
+
path: path46
|
|
217588
217598
|
};
|
|
217589
217599
|
};
|
|
217590
217600
|
}
|
|
@@ -217594,7 +217604,7 @@ var require_module_details_from_path = __commonJS({
|
|
|
217594
217604
|
var require_require_in_the_middle = __commonJS({
|
|
217595
217605
|
"node_modules/require-in-the-middle/index.js"(exports, module2) {
|
|
217596
217606
|
"use strict";
|
|
217597
|
-
var
|
|
217607
|
+
var path46 = require("path");
|
|
217598
217608
|
var Module = require("module");
|
|
217599
217609
|
var debug = require_src()("require-in-the-middle");
|
|
217600
217610
|
var moduleDetailsFromPath = require_module_details_from_path();
|
|
@@ -217740,7 +217750,7 @@ var require_require_in_the_middle = __commonJS({
|
|
|
217740
217750
|
}
|
|
217741
217751
|
moduleName = filename;
|
|
217742
217752
|
} else if (hasWhitelist === true && modules.includes(filename)) {
|
|
217743
|
-
const parsedPath =
|
|
217753
|
+
const parsedPath = path46.parse(filename);
|
|
217744
217754
|
moduleName = parsedPath.name;
|
|
217745
217755
|
basedir = parsedPath.dir;
|
|
217746
217756
|
} else {
|
|
@@ -217778,7 +217788,7 @@ var require_require_in_the_middle = __commonJS({
|
|
|
217778
217788
|
}
|
|
217779
217789
|
if (res !== filename) {
|
|
217780
217790
|
if (internals === true) {
|
|
217781
|
-
moduleName = moduleName +
|
|
217791
|
+
moduleName = moduleName + path46.sep + path46.relative(basedir, filename);
|
|
217782
217792
|
debug("preparing to process require of internal file: %s", moduleName);
|
|
217783
217793
|
} else {
|
|
217784
217794
|
debug("ignoring require of non-main module file: %s", res);
|
|
@@ -217814,8 +217824,8 @@ var require_require_in_the_middle = __commonJS({
|
|
|
217814
217824
|
}
|
|
217815
217825
|
};
|
|
217816
217826
|
function resolveModuleName(stat) {
|
|
217817
|
-
const normalizedPath =
|
|
217818
|
-
return
|
|
217827
|
+
const normalizedPath = path46.sep !== "/" ? stat.path.split(path46.sep).join("/") : stat.path;
|
|
217828
|
+
return path46.posix.join(stat.name, normalizedPath).replace(normalize5, "");
|
|
217819
217829
|
}
|
|
217820
217830
|
}
|
|
217821
217831
|
});
|
|
@@ -217900,7 +217910,7 @@ var require_RequireInTheMiddleSingleton = __commonJS({
|
|
|
217900
217910
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
217901
217911
|
exports.RequireInTheMiddleSingleton = void 0;
|
|
217902
217912
|
var require_in_the_middle_1 = require_require_in_the_middle();
|
|
217903
|
-
var
|
|
217913
|
+
var path46 = require("path");
|
|
217904
217914
|
var ModuleNameTrie_1 = require_ModuleNameTrie();
|
|
217905
217915
|
var isMocha = [
|
|
217906
217916
|
"afterEach",
|
|
@@ -217965,7 +217975,7 @@ var require_RequireInTheMiddleSingleton = __commonJS({
|
|
|
217965
217975
|
__publicField(RequireInTheMiddleSingleton, "_instance");
|
|
217966
217976
|
exports.RequireInTheMiddleSingleton = RequireInTheMiddleSingleton;
|
|
217967
217977
|
function normalizePathSeparators(moduleNameOrPath) {
|
|
217968
|
-
return
|
|
217978
|
+
return path46.sep !== ModuleNameTrie_1.ModuleNameSeparator ? moduleNameOrPath.split(path46.sep).join(ModuleNameTrie_1.ModuleNameSeparator) : moduleNameOrPath;
|
|
217969
217979
|
}
|
|
217970
217980
|
}
|
|
217971
217981
|
});
|
|
@@ -218026,7 +218036,7 @@ var require_register = __commonJS({
|
|
|
218026
218036
|
// node_modules/import-in-the-middle/index.js
|
|
218027
218037
|
var require_import_in_the_middle = __commonJS({
|
|
218028
218038
|
"node_modules/import-in-the-middle/index.js"(exports, module2) {
|
|
218029
|
-
var
|
|
218039
|
+
var path46 = require("path");
|
|
218030
218040
|
var moduleDetailsFromPath = require_module_details_from_path();
|
|
218031
218041
|
var { fileURLToPath: fileURLToPath2 } = require("url");
|
|
218032
218042
|
var { MessageChannel } = require("worker_threads");
|
|
@@ -218082,8 +218092,8 @@ var require_import_in_the_middle = __commonJS({
|
|
|
218082
218092
|
function waitForAllMessagesAcknowledged() {
|
|
218083
218093
|
const timer = setInterval(() => {
|
|
218084
218094
|
}, 1e3);
|
|
218085
|
-
const promise2 = new Promise((
|
|
218086
|
-
resolveFn =
|
|
218095
|
+
const promise2 = new Promise((resolve11) => {
|
|
218096
|
+
resolveFn = resolve11;
|
|
218087
218097
|
}).then(() => {
|
|
218088
218098
|
clearInterval(timer);
|
|
218089
218099
|
});
|
|
@@ -218147,7 +218157,7 @@ var require_import_in_the_middle = __commonJS({
|
|
|
218147
218157
|
} else if (baseDir.endsWith(specifiers.get(loadUrl)) || isTurbopackSpecifier(specifiers.get(loadUrl), baseDir)) {
|
|
218148
218158
|
callHookFn(hookFn, namespace, name, baseDir);
|
|
218149
218159
|
} else if (internals) {
|
|
218150
|
-
const internalPath = name +
|
|
218160
|
+
const internalPath = name + path46.sep + path46.relative(baseDir, filePath);
|
|
218151
218161
|
callHookFn(hookFn, namespace, internalPath, baseDir);
|
|
218152
218162
|
}
|
|
218153
218163
|
} else if (matchArg === specifier) {
|
|
@@ -218222,7 +218232,7 @@ var require_instrumentation2 = __commonJS({
|
|
|
218222
218232
|
"use strict";
|
|
218223
218233
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
218224
218234
|
exports.InstrumentationBase = void 0;
|
|
218225
|
-
var
|
|
218235
|
+
var path46 = require("path");
|
|
218226
218236
|
var util_1 = require("util");
|
|
218227
218237
|
var semver_1 = require_semver();
|
|
218228
218238
|
var shimmer_1 = require_shimmer();
|
|
@@ -218323,7 +218333,7 @@ var require_instrumentation2 = __commonJS({
|
|
|
218323
218333
|
}
|
|
218324
218334
|
_extractPackageVersion(baseDir) {
|
|
218325
218335
|
try {
|
|
218326
|
-
const json2 = (0, fs_1.readFileSync)(
|
|
218336
|
+
const json2 = (0, fs_1.readFileSync)(path46.join(baseDir, "package.json"), {
|
|
218327
218337
|
encoding: "utf8"
|
|
218328
218338
|
});
|
|
218329
218339
|
const version3 = JSON.parse(json2).version;
|
|
@@ -218365,7 +218375,7 @@ var require_instrumentation2 = __commonJS({
|
|
|
218365
218375
|
return exports2;
|
|
218366
218376
|
}
|
|
218367
218377
|
const files = module3.files ?? [];
|
|
218368
|
-
const normalizedName =
|
|
218378
|
+
const normalizedName = path46.normalize(name);
|
|
218369
218379
|
const supportedFileInstrumentations = files.filter((f) => f.name === normalizedName && isSupported(f.supportedVersions, version3, module3.includePrerelease));
|
|
218370
218380
|
return supportedFileInstrumentations.reduce((patchedExports, file4) => {
|
|
218371
218381
|
file4.moduleExports = patchedExports;
|
|
@@ -218411,8 +218421,8 @@ var require_instrumentation2 = __commonJS({
|
|
|
218411
218421
|
this._warnOnPreloadedModules();
|
|
218412
218422
|
for (const module3 of this._modules) {
|
|
218413
218423
|
const hookFn = (exports2, name, baseDir) => {
|
|
218414
|
-
if (!baseDir &&
|
|
218415
|
-
const parsedPath =
|
|
218424
|
+
if (!baseDir && path46.isAbsolute(name)) {
|
|
218425
|
+
const parsedPath = path46.parse(name);
|
|
218416
218426
|
name = parsedPath.name;
|
|
218417
218427
|
baseDir = parsedPath.dir;
|
|
218418
218428
|
}
|
|
@@ -218421,7 +218431,7 @@ var require_instrumentation2 = __commonJS({
|
|
|
218421
218431
|
const onRequire = (exports2, name, baseDir) => {
|
|
218422
218432
|
return this._onRequire(module3, exports2, name, baseDir);
|
|
218423
218433
|
};
|
|
218424
|
-
const hook =
|
|
218434
|
+
const hook = path46.isAbsolute(module3.name) ? new require_in_the_middle_1.Hook([module3.name], { internals: true }, onRequire) : this._requireInTheMiddleSingleton.register(module3.name, onRequire);
|
|
218425
218435
|
this._hooks.push(hook);
|
|
218426
218436
|
const esmHook = new import_in_the_middle_1.Hook([module3.name], { internals: true }, hookFn);
|
|
218427
218437
|
this._hooks.push(esmHook);
|
|
@@ -219675,7 +219685,7 @@ var require_aspromise = __commonJS({
|
|
|
219675
219685
|
var params = new Array(arguments.length - 1), offset = 0, index = 2, pending = true;
|
|
219676
219686
|
while (index < arguments.length)
|
|
219677
219687
|
params[offset++] = arguments[index++];
|
|
219678
|
-
return new Promise(function executor(
|
|
219688
|
+
return new Promise(function executor(resolve11, reject) {
|
|
219679
219689
|
params[offset] = function callback(err) {
|
|
219680
219690
|
if (pending) {
|
|
219681
219691
|
pending = false;
|
|
@@ -219685,7 +219695,7 @@ var require_aspromise = __commonJS({
|
|
|
219685
219695
|
var params2 = new Array(arguments.length - 1), offset2 = 0;
|
|
219686
219696
|
while (offset2 < params2.length)
|
|
219687
219697
|
params2[offset2++] = arguments[offset2];
|
|
219688
|
-
|
|
219698
|
+
resolve11.apply(null, params2);
|
|
219689
219699
|
}
|
|
219690
219700
|
}
|
|
219691
219701
|
};
|
|
@@ -228312,7 +228322,7 @@ var init_version3 = __esm({
|
|
|
228312
228322
|
|
|
228313
228323
|
// node_modules/@opentelemetry/otlp-exporter-base/build/esm/transport/http-transport-utils.js
|
|
228314
228324
|
function sendWithHttp(request2, url3, headers, compression, userAgent, agent, data, timeoutMillis) {
|
|
228315
|
-
return new Promise((
|
|
228325
|
+
return new Promise((resolve11) => {
|
|
228316
228326
|
const parsedUrl = new URL(url3);
|
|
228317
228327
|
if (userAgent) {
|
|
228318
228328
|
headers["User-Agent"] = `${userAgent} ${DEFAULT_USER_AGENT}`;
|
|
@@ -228334,7 +228344,7 @@ function sendWithHttp(request2, url3, headers, compression, userAgent, agent, da
|
|
|
228334
228344
|
responseSize += chunk.length;
|
|
228335
228345
|
if (responseSize > MAX_RESPONSE_BODY_SIZE) {
|
|
228336
228346
|
const sizeError = new Error(`OTLP export response body exceeded size limit of ${MAX_RESPONSE_BODY_SIZE} bytes`);
|
|
228337
|
-
|
|
228347
|
+
resolve11({ status: "failure", error: sizeError });
|
|
228338
228348
|
res.destroy();
|
|
228339
228349
|
return;
|
|
228340
228350
|
}
|
|
@@ -228342,18 +228352,18 @@ function sendWithHttp(request2, url3, headers, compression, userAgent, agent, da
|
|
|
228342
228352
|
});
|
|
228343
228353
|
res.on("end", () => {
|
|
228344
228354
|
if (res.statusCode && res.statusCode <= 299) {
|
|
228345
|
-
|
|
228355
|
+
resolve11({
|
|
228346
228356
|
status: "success",
|
|
228347
228357
|
data: Buffer.concat(responseData)
|
|
228348
228358
|
});
|
|
228349
228359
|
} else if (res.statusCode && isExportHTTPErrorRetryable(res.statusCode)) {
|
|
228350
|
-
|
|
228360
|
+
resolve11({
|
|
228351
228361
|
status: "retryable",
|
|
228352
228362
|
retryInMillis: parseRetryAfterToMills(res.headers["retry-after"])
|
|
228353
228363
|
});
|
|
228354
228364
|
} else {
|
|
228355
228365
|
const error52 = new OTLPExporterError(res.statusMessage, res.statusCode, Buffer.concat(responseData).toString());
|
|
228356
|
-
|
|
228366
|
+
resolve11({
|
|
228357
228367
|
status: "failure",
|
|
228358
228368
|
error: error52
|
|
228359
228369
|
});
|
|
@@ -228361,17 +228371,17 @@ function sendWithHttp(request2, url3, headers, compression, userAgent, agent, da
|
|
|
228361
228371
|
});
|
|
228362
228372
|
res.on("error", (error52) => {
|
|
228363
228373
|
if (res.statusCode && res.statusCode <= 299) {
|
|
228364
|
-
|
|
228374
|
+
resolve11({
|
|
228365
228375
|
status: "success"
|
|
228366
228376
|
});
|
|
228367
228377
|
} else if (res.statusCode && isExportHTTPErrorRetryable(res.statusCode)) {
|
|
228368
|
-
|
|
228378
|
+
resolve11({
|
|
228369
228379
|
status: "retryable",
|
|
228370
228380
|
error: error52,
|
|
228371
228381
|
retryInMillis: parseRetryAfterToMills(res.headers["retry-after"])
|
|
228372
228382
|
});
|
|
228373
228383
|
} else {
|
|
228374
|
-
|
|
228384
|
+
resolve11({
|
|
228375
228385
|
status: "failure",
|
|
228376
228386
|
error: error52
|
|
228377
228387
|
});
|
|
@@ -228380,26 +228390,26 @@ function sendWithHttp(request2, url3, headers, compression, userAgent, agent, da
|
|
|
228380
228390
|
});
|
|
228381
228391
|
req.setTimeout(timeoutMillis, () => {
|
|
228382
228392
|
req.destroy();
|
|
228383
|
-
|
|
228393
|
+
resolve11({
|
|
228384
228394
|
status: "retryable",
|
|
228385
228395
|
error: new Error("Request timed out")
|
|
228386
228396
|
});
|
|
228387
228397
|
});
|
|
228388
228398
|
req.on("error", (error52) => {
|
|
228389
228399
|
if (isHttpTransportNetworkErrorRetryable(error52)) {
|
|
228390
|
-
|
|
228400
|
+
resolve11({
|
|
228391
228401
|
status: "retryable",
|
|
228392
228402
|
error: error52
|
|
228393
228403
|
});
|
|
228394
228404
|
} else {
|
|
228395
|
-
|
|
228405
|
+
resolve11({
|
|
228396
228406
|
status: "failure",
|
|
228397
228407
|
error: error52
|
|
228398
228408
|
});
|
|
228399
228409
|
}
|
|
228400
228410
|
});
|
|
228401
228411
|
compressAndSend(req, compression, data, (error52) => {
|
|
228402
|
-
|
|
228412
|
+
resolve11({
|
|
228403
228413
|
status: "failure",
|
|
228404
228414
|
error: error52
|
|
228405
228415
|
});
|
|
@@ -228513,9 +228523,9 @@ var init_retrying_transport = __esm({
|
|
|
228513
228523
|
this._transport = transport;
|
|
228514
228524
|
}
|
|
228515
228525
|
retry(data, timeoutMillis, inMillis) {
|
|
228516
|
-
return new Promise((
|
|
228526
|
+
return new Promise((resolve11, reject) => {
|
|
228517
228527
|
setTimeout(() => {
|
|
228518
|
-
this._transport.send(data, timeoutMillis).then(
|
|
228528
|
+
this._transport.send(data, timeoutMillis).then(resolve11, reject);
|
|
228519
228529
|
}, inMillis);
|
|
228520
228530
|
});
|
|
228521
228531
|
}
|
|
@@ -228635,7 +228645,7 @@ function appendRootPathToUrlIfNeeded(url3) {
|
|
|
228635
228645
|
return void 0;
|
|
228636
228646
|
}
|
|
228637
228647
|
}
|
|
228638
|
-
function appendResourcePathToUrl(url3,
|
|
228648
|
+
function appendResourcePathToUrl(url3, path46) {
|
|
228639
228649
|
try {
|
|
228640
228650
|
new URL(url3);
|
|
228641
228651
|
} catch {
|
|
@@ -228645,11 +228655,11 @@ function appendResourcePathToUrl(url3, path45) {
|
|
|
228645
228655
|
if (!url3.endsWith("/")) {
|
|
228646
228656
|
url3 = url3 + "/";
|
|
228647
228657
|
}
|
|
228648
|
-
url3 +=
|
|
228658
|
+
url3 += path46;
|
|
228649
228659
|
try {
|
|
228650
228660
|
new URL(url3);
|
|
228651
228661
|
} catch {
|
|
228652
|
-
diag2.warn(`Configuration: Provided URL appended with '${
|
|
228662
|
+
diag2.warn(`Configuration: Provided URL appended with '${path46}' is not a valid URL, using 'undefined' instead of '${url3}'`);
|
|
228653
228663
|
return void 0;
|
|
228654
228664
|
}
|
|
228655
228665
|
return url3;
|
|
@@ -228674,7 +228684,7 @@ function readFileFromEnv(signalSpecificEnvVar, nonSignalSpecificEnvVar, warningM
|
|
|
228674
228684
|
const filePath = signalSpecificPath ?? nonSignalSpecificPath;
|
|
228675
228685
|
if (filePath != null) {
|
|
228676
228686
|
try {
|
|
228677
|
-
return fs32.readFileSync(
|
|
228687
|
+
return fs32.readFileSync(path34.resolve(process.cwd(), filePath));
|
|
228678
228688
|
} catch {
|
|
228679
228689
|
diag2.warn(warningMessage);
|
|
228680
228690
|
return void 0;
|
|
@@ -228705,11 +228715,11 @@ function getNodeHttpConfigurationFromEnvironment(signalIdentifier, signalResourc
|
|
|
228705
228715
|
})
|
|
228706
228716
|
};
|
|
228707
228717
|
}
|
|
228708
|
-
var fs32,
|
|
228718
|
+
var fs32, path34, import_core24;
|
|
228709
228719
|
var init_otlp_node_http_env_configuration = __esm({
|
|
228710
228720
|
"node_modules/@opentelemetry/otlp-exporter-base/build/esm/configuration/otlp-node-http-env-configuration.js"() {
|
|
228711
228721
|
fs32 = __toESM(require("fs"));
|
|
228712
|
-
|
|
228722
|
+
path34 = __toESM(require("path"));
|
|
228713
228723
|
import_core24 = __toESM(require_src2());
|
|
228714
228724
|
init_esm2();
|
|
228715
228725
|
init_shared_env_configuration();
|
|
@@ -229213,7 +229223,7 @@ var require_PrometheusExporter = __commonJS({
|
|
|
229213
229223
|
api_1.diag.debug("Prometheus stopServer() was called but server was never started.");
|
|
229214
229224
|
return Promise.resolve();
|
|
229215
229225
|
} else {
|
|
229216
|
-
return new Promise((
|
|
229226
|
+
return new Promise((resolve11) => {
|
|
229217
229227
|
this._server.close((err) => {
|
|
229218
229228
|
if (!err) {
|
|
229219
229229
|
api_1.diag.debug("Prometheus exporter was stopped");
|
|
@@ -229222,7 +229232,7 @@ var require_PrometheusExporter = __commonJS({
|
|
|
229222
229232
|
(0, core_1.globalErrorHandler)(err);
|
|
229223
229233
|
}
|
|
229224
229234
|
}
|
|
229225
|
-
|
|
229235
|
+
resolve11();
|
|
229226
229236
|
});
|
|
229227
229237
|
});
|
|
229228
229238
|
}
|
|
@@ -229231,14 +229241,14 @@ var require_PrometheusExporter = __commonJS({
|
|
|
229231
229241
|
* Starts the Prometheus export server
|
|
229232
229242
|
*/
|
|
229233
229243
|
startServer() {
|
|
229234
|
-
this._startServerPromise ??= new Promise((
|
|
229244
|
+
this._startServerPromise ??= new Promise((resolve11, reject) => {
|
|
229235
229245
|
this._server.once("error", reject);
|
|
229236
229246
|
this._server.listen({
|
|
229237
229247
|
port: this._port,
|
|
229238
229248
|
host: this._host
|
|
229239
229249
|
}, () => {
|
|
229240
229250
|
api_1.diag.debug(`Prometheus exporter server started: ${this._host}:${this._port}/${this._endpoint}`);
|
|
229241
|
-
|
|
229251
|
+
resolve11();
|
|
229242
229252
|
});
|
|
229243
229253
|
});
|
|
229244
229254
|
return this._startServerPromise;
|
|
@@ -229683,9 +229693,9 @@ var require_zipkin = __commonJS({
|
|
|
229683
229693
|
}));
|
|
229684
229694
|
return;
|
|
229685
229695
|
}
|
|
229686
|
-
const promise2 = new Promise((
|
|
229696
|
+
const promise2 = new Promise((resolve11) => {
|
|
229687
229697
|
this._sendSpans(spans, serviceName, (result) => {
|
|
229688
|
-
|
|
229698
|
+
resolve11();
|
|
229689
229699
|
resultCallback(result);
|
|
229690
229700
|
});
|
|
229691
229701
|
});
|
|
@@ -229708,9 +229718,9 @@ var require_zipkin = __commonJS({
|
|
|
229708
229718
|
* Exports any pending spans in exporter
|
|
229709
229719
|
*/
|
|
229710
229720
|
forceFlush() {
|
|
229711
|
-
return new Promise((
|
|
229721
|
+
return new Promise((resolve11, reject) => {
|
|
229712
229722
|
Promise.all(this._sendingPromises).then(() => {
|
|
229713
|
-
|
|
229723
|
+
resolve11();
|
|
229714
229724
|
}, reject);
|
|
229715
229725
|
});
|
|
229716
229726
|
}
|
|
@@ -232419,7 +232429,7 @@ var init_SocketTransport = __esm({
|
|
|
232419
232429
|
return Promise.resolve();
|
|
232420
232430
|
}
|
|
232421
232431
|
async send(message) {
|
|
232422
|
-
return new Promise((
|
|
232432
|
+
return new Promise((resolve11, reject) => {
|
|
232423
232433
|
const json2 = JSON.stringify(
|
|
232424
232434
|
message,
|
|
232425
232435
|
(_key, value) => typeof value === "bigint" ? value.toString() : value
|
|
@@ -232428,7 +232438,7 @@ var init_SocketTransport = __esm({
|
|
|
232428
232438
|
if (err) {
|
|
232429
232439
|
reject(err);
|
|
232430
232440
|
} else {
|
|
232431
|
-
|
|
232441
|
+
resolve11();
|
|
232432
232442
|
}
|
|
232433
232443
|
});
|
|
232434
232444
|
});
|
|
@@ -232471,13 +232481,13 @@ var init_ExtensionConnectionTracker = __esm({
|
|
|
232471
232481
|
});
|
|
232472
232482
|
|
|
232473
232483
|
// src/server/surfaces/DaemonSocketSurface.ts
|
|
232474
|
-
var fs34, net2,
|
|
232484
|
+
var fs34, net2, path35, bindSequence, DaemonSocketSurface;
|
|
232475
232485
|
var init_DaemonSocketSurface = __esm({
|
|
232476
232486
|
"src/server/surfaces/DaemonSocketSurface.ts"() {
|
|
232477
232487
|
"use strict";
|
|
232478
232488
|
fs34 = __toESM(require("fs"));
|
|
232479
232489
|
net2 = __toESM(require("net"));
|
|
232480
|
-
|
|
232490
|
+
path35 = __toESM(require("path"));
|
|
232481
232491
|
init_ipcEndpoint();
|
|
232482
232492
|
init_ConsoleLogger();
|
|
232483
232493
|
init_SocketTransport();
|
|
@@ -232511,14 +232521,14 @@ var init_DaemonSocketSurface = __esm({
|
|
|
232511
232521
|
return;
|
|
232512
232522
|
}
|
|
232513
232523
|
if (isRelocatedDaemonIpcEndpoint(this.options.configDir, this.options.socketPath)) {
|
|
232514
|
-
fs34.mkdirSync(
|
|
232515
|
-
fs34.chmodSync(
|
|
232524
|
+
fs34.mkdirSync(path35.dirname(this.options.socketPath), { recursive: true, mode: 448 });
|
|
232525
|
+
fs34.chmodSync(path35.dirname(this.options.socketPath), 448);
|
|
232516
232526
|
logger.warn(
|
|
232517
|
-
`[Daemon] Relocated IPC endpoint from ${
|
|
232527
|
+
`[Daemon] Relocated IPC endpoint from ${path35.join(this.options.configDir, "srv.sock")} to ${this.options.socketPath}.`
|
|
232518
232528
|
);
|
|
232519
232529
|
}
|
|
232520
232530
|
const usesFilesystemPath = !isWindowsNamedPipe(this.options.socketPath);
|
|
232521
|
-
const privatePath = usesFilesystemPath ?
|
|
232531
|
+
const privatePath = usesFilesystemPath ? path35.join(path35.dirname(this.options.socketPath), `.${process.pid}-${++bindSequence}`) : this.options.socketPath;
|
|
232522
232532
|
const canPublishByRename = usesFilesystemPath && Buffer.byteLength(privatePath) <= UNIX_SOCKET_PATH_MAX_BYTES;
|
|
232523
232533
|
if (usesFilesystemPath && !canPublishByRename) {
|
|
232524
232534
|
logger.warn(
|
|
@@ -232580,7 +232590,7 @@ var init_DaemonSocketSurface = __esm({
|
|
|
232580
232590
|
logger.error("[Daemon] Failed to connect MCP server to transport", error52);
|
|
232581
232591
|
}
|
|
232582
232592
|
});
|
|
232583
|
-
await new Promise((
|
|
232593
|
+
await new Promise((resolve11, reject) => {
|
|
232584
232594
|
const onListen = () => {
|
|
232585
232595
|
if (canPublishByRename) {
|
|
232586
232596
|
try {
|
|
@@ -232597,7 +232607,7 @@ var init_DaemonSocketSurface = __esm({
|
|
|
232597
232607
|
this.server?.on("error", (err) => {
|
|
232598
232608
|
logger.error("[Daemon] IPC server error after bind", err);
|
|
232599
232609
|
});
|
|
232600
|
-
|
|
232610
|
+
resolve11();
|
|
232601
232611
|
};
|
|
232602
232612
|
const onError = (err) => {
|
|
232603
232613
|
cleanup();
|
|
@@ -232635,7 +232645,7 @@ var init_DaemonSocketSurface = __esm({
|
|
|
232635
232645
|
}
|
|
232636
232646
|
const server = this.server;
|
|
232637
232647
|
this.server = null;
|
|
232638
|
-
this.closePromise = new Promise((
|
|
232648
|
+
this.closePromise = new Promise((resolve11) => {
|
|
232639
232649
|
try {
|
|
232640
232650
|
server.close((err) => {
|
|
232641
232651
|
if (err) {
|
|
@@ -232644,12 +232654,12 @@ var init_DaemonSocketSurface = __esm({
|
|
|
232644
232654
|
logger.info("[Daemon] Socket server closed.");
|
|
232645
232655
|
}
|
|
232646
232656
|
this.releaseOwnedEndpoint();
|
|
232647
|
-
|
|
232657
|
+
resolve11();
|
|
232648
232658
|
});
|
|
232649
232659
|
} catch (error52) {
|
|
232650
232660
|
logger.error("[Daemon] Error initiating Socket server close:", error52);
|
|
232651
232661
|
this.releaseOwnedEndpoint();
|
|
232652
|
-
|
|
232662
|
+
resolve11();
|
|
232653
232663
|
}
|
|
232654
232664
|
});
|
|
232655
232665
|
return this.closePromise;
|
|
@@ -232681,13 +232691,13 @@ var init_DaemonSocketSurface = __esm({
|
|
|
232681
232691
|
|
|
232682
232692
|
// src/server/surfaces/DaemonControlSurface.ts
|
|
232683
232693
|
function requestDaemonControlStop(endpoint, token) {
|
|
232684
|
-
return new Promise((
|
|
232694
|
+
return new Promise((resolve11) => {
|
|
232685
232695
|
const socket = net3.createConnection(endpoint);
|
|
232686
232696
|
const timeout = setTimeout(() => settle2(false), 2e3);
|
|
232687
232697
|
const settle2 = (accepted) => {
|
|
232688
232698
|
clearTimeout(timeout);
|
|
232689
232699
|
socket.destroy();
|
|
232690
|
-
|
|
232700
|
+
resolve11(accepted);
|
|
232691
232701
|
};
|
|
232692
232702
|
socket.once("error", () => settle2(false));
|
|
232693
232703
|
socket.once(
|
|
@@ -232756,13 +232766,13 @@ var init_DaemonControlSurface = __esm({
|
|
|
232756
232766
|
});
|
|
232757
232767
|
});
|
|
232758
232768
|
});
|
|
232759
|
-
await new Promise((
|
|
232769
|
+
await new Promise((resolve11, reject) => {
|
|
232760
232770
|
const server = this.server;
|
|
232761
232771
|
server.once("error", reject);
|
|
232762
232772
|
server.listen(this.options.endpoint, () => {
|
|
232763
232773
|
server.removeListener("error", reject);
|
|
232764
232774
|
server.on("error", () => void 0);
|
|
232765
|
-
|
|
232775
|
+
resolve11();
|
|
232766
232776
|
});
|
|
232767
232777
|
});
|
|
232768
232778
|
}
|
|
@@ -232773,7 +232783,7 @@ var init_DaemonControlSurface = __esm({
|
|
|
232773
232783
|
if (!server)
|
|
232774
232784
|
return;
|
|
232775
232785
|
await new Promise(
|
|
232776
|
-
(
|
|
232786
|
+
(resolve11, reject) => server.close((error52) => error52 ? reject(error52) : resolve11())
|
|
232777
232787
|
);
|
|
232778
232788
|
this.server = void 0;
|
|
232779
232789
|
}
|
|
@@ -247383,7 +247393,7 @@ var init_artifactPins_generated = __esm({
|
|
|
247383
247393
|
});
|
|
247384
247394
|
|
|
247385
247395
|
// src/server/runtime/ManagedArtifactRuntime.ts
|
|
247386
|
-
var crypto18, fs35, import_module, os7,
|
|
247396
|
+
var crypto18, fs35, import_module, os7, path36, ORPHAN_DOWNLOAD_MIN_AGE_MS, WAIT_LOG_INTERVAL_MS, requireFromRuntime, ManagedArtifactRuntime;
|
|
247387
247397
|
var init_ManagedArtifactRuntime = __esm({
|
|
247388
247398
|
"src/server/runtime/ManagedArtifactRuntime.ts"() {
|
|
247389
247399
|
"use strict";
|
|
@@ -247391,7 +247401,7 @@ var init_ManagedArtifactRuntime = __esm({
|
|
|
247391
247401
|
fs35 = __toESM(require("fs"));
|
|
247392
247402
|
import_module = require("module");
|
|
247393
247403
|
os7 = __toESM(require("os"));
|
|
247394
|
-
|
|
247404
|
+
path36 = __toESM(require("path"));
|
|
247395
247405
|
init_ManagedArtifactTypes();
|
|
247396
247406
|
init_artifactPins_generated();
|
|
247397
247407
|
init_ArtifactDownloader();
|
|
@@ -247524,7 +247534,7 @@ var init_ManagedArtifactRuntime = __esm({
|
|
|
247524
247534
|
async provisionAndLoad(forceProvision) {
|
|
247525
247535
|
if (this.options.runtimePath) {
|
|
247526
247536
|
try {
|
|
247527
|
-
return requireFromRuntime(
|
|
247537
|
+
return requireFromRuntime(path36.resolve(this.options.runtimePath));
|
|
247528
247538
|
} catch (error52) {
|
|
247529
247539
|
return this.fail(
|
|
247530
247540
|
"disk_failed",
|
|
@@ -247572,7 +247582,7 @@ var init_ManagedArtifactRuntime = __esm({
|
|
|
247572
247582
|
}
|
|
247573
247583
|
}
|
|
247574
247584
|
const lockDir = `${versionDir}.provision-lock`;
|
|
247575
|
-
fs35.mkdirSync(
|
|
247585
|
+
fs35.mkdirSync(path36.dirname(lockDir), { recursive: true });
|
|
247576
247586
|
const lockWaitStartMs = Date.now();
|
|
247577
247587
|
const staleMs = this.options.provisionLockStaleMs ?? 5 * 60 * 1e3;
|
|
247578
247588
|
const maxWaitMs = this.options.provisionLockMaxWaitMs ?? 10 * 60 * 1e3;
|
|
@@ -247623,7 +247633,7 @@ var init_ManagedArtifactRuntime = __esm({
|
|
|
247623
247633
|
}
|
|
247624
247634
|
} catch (error52) {
|
|
247625
247635
|
}
|
|
247626
|
-
await new Promise((
|
|
247636
|
+
await new Promise((resolve11) => setTimeout(resolve11, 50));
|
|
247627
247637
|
}
|
|
247628
247638
|
let heartbeatTimer = null;
|
|
247629
247639
|
const heartbeatIntervalMs = Math.max(10, Math.floor(staleMs / 3));
|
|
@@ -247644,7 +247654,7 @@ var init_ManagedArtifactRuntime = __esm({
|
|
|
247644
247654
|
}
|
|
247645
247655
|
if (provisionToken) {
|
|
247646
247656
|
try {
|
|
247647
|
-
const currentToken = fs35.readFileSync(
|
|
247657
|
+
const currentToken = fs35.readFileSync(path36.join(lockDir, "owner"), "utf-8");
|
|
247648
247658
|
if (currentToken === provisionToken) {
|
|
247649
247659
|
fs35.rmSync(lockDir, { recursive: true, force: true });
|
|
247650
247660
|
}
|
|
@@ -247665,9 +247675,9 @@ var init_ManagedArtifactRuntime = __esm({
|
|
|
247665
247675
|
const downloadPrefix = `sql-preview-${this.options.artifactId}-`;
|
|
247666
247676
|
try {
|
|
247667
247677
|
for (const tarball of pins.tarballs) {
|
|
247668
|
-
const downloadPath =
|
|
247678
|
+
const downloadPath = path36.join(
|
|
247669
247679
|
this.downloadDir(),
|
|
247670
|
-
`${downloadPrefix}${
|
|
247680
|
+
`${downloadPrefix}${path36.basename(tarball.name)}-${Date.now()}.tgz`
|
|
247671
247681
|
);
|
|
247672
247682
|
downloadPaths.push(downloadPath);
|
|
247673
247683
|
try {
|
|
@@ -247685,7 +247695,7 @@ var init_ManagedArtifactRuntime = __esm({
|
|
|
247685
247695
|
fs35.rmSync(downloadPath, { force: true });
|
|
247686
247696
|
return this.fail("checksum_failed", `Integrity check failed for ${tarball.name}.`);
|
|
247687
247697
|
}
|
|
247688
|
-
const packageDestDir =
|
|
247698
|
+
const packageDestDir = path36.join(
|
|
247689
247699
|
tempDir,
|
|
247690
247700
|
...tarball.installPath ? tarball.installPath.split("/") : ["node_modules", ...tarball.name.split("/")]
|
|
247691
247701
|
);
|
|
@@ -247739,7 +247749,7 @@ var init_ManagedArtifactRuntime = __esm({
|
|
|
247739
247749
|
}
|
|
247740
247750
|
if (provisionToken) {
|
|
247741
247751
|
try {
|
|
247742
|
-
const currentToken = fs35.readFileSync(
|
|
247752
|
+
const currentToken = fs35.readFileSync(path36.join(lockDir, "owner"), "utf-8");
|
|
247743
247753
|
if (currentToken === provisionToken) {
|
|
247744
247754
|
fs35.rmSync(lockDir, { recursive: true, force: true });
|
|
247745
247755
|
}
|
|
@@ -247752,14 +247762,14 @@ var init_ManagedArtifactRuntime = __esm({
|
|
|
247752
247762
|
return this.options.downloadDir ?? os7.tmpdir();
|
|
247753
247763
|
}
|
|
247754
247764
|
reapOrphans(versionDir) {
|
|
247755
|
-
const parentDir =
|
|
247756
|
-
const versionBase =
|
|
247765
|
+
const parentDir = path36.dirname(versionDir);
|
|
247766
|
+
const versionBase = path36.basename(versionDir);
|
|
247757
247767
|
const prefix = `${versionBase}-tmp-`;
|
|
247758
247768
|
try {
|
|
247759
247769
|
const siblings = fs35.readdirSync(parentDir);
|
|
247760
247770
|
for (const sibling of siblings) {
|
|
247761
247771
|
if (sibling.startsWith(prefix)) {
|
|
247762
|
-
const siblingPath =
|
|
247772
|
+
const siblingPath = path36.join(parentDir, sibling);
|
|
247763
247773
|
try {
|
|
247764
247774
|
fs35.rmSync(siblingPath, { recursive: true, force: true });
|
|
247765
247775
|
} catch (error52) {
|
|
@@ -247775,7 +247785,7 @@ var init_ManagedArtifactRuntime = __esm({
|
|
|
247775
247785
|
const downloadPrefix = `sql-preview-${this.options.artifactId}-`;
|
|
247776
247786
|
for (const file4 of files) {
|
|
247777
247787
|
if (file4.startsWith(downloadPrefix) && file4.endsWith(".tgz")) {
|
|
247778
|
-
const filePath =
|
|
247788
|
+
const filePath = path36.join(downloadDir, file4);
|
|
247779
247789
|
try {
|
|
247780
247790
|
const stats = fs35.statSync(filePath);
|
|
247781
247791
|
if (now - stats.mtimeMs > ORPHAN_DOWNLOAD_MIN_AGE_MS) {
|
|
@@ -247792,7 +247802,7 @@ var init_ManagedArtifactRuntime = __esm({
|
|
|
247792
247802
|
try {
|
|
247793
247803
|
fs35.mkdirSync(lockDir, { recursive: false });
|
|
247794
247804
|
const token = `${process.pid}-${crypto18.randomUUID()}`;
|
|
247795
|
-
fs35.writeFileSync(
|
|
247805
|
+
fs35.writeFileSync(path36.join(lockDir, "owner"), token, "utf-8");
|
|
247796
247806
|
return { acquired: true, token };
|
|
247797
247807
|
} catch (error52) {
|
|
247798
247808
|
if (error52.code === "EEXIST") {
|
|
@@ -247821,7 +247831,7 @@ var init_ManagedArtifactRuntime = __esm({
|
|
|
247821
247831
|
if (this.options.platformKey && this.options.platformKey !== currentPlatformKey()) {
|
|
247822
247832
|
return null;
|
|
247823
247833
|
}
|
|
247824
|
-
const entryPath =
|
|
247834
|
+
const entryPath = path36.join(
|
|
247825
247835
|
versionDir,
|
|
247826
247836
|
"node_modules",
|
|
247827
247837
|
...(this.options.entryModule ?? this.options.artifactId).split("/")
|
|
@@ -247829,13 +247839,13 @@ var init_ManagedArtifactRuntime = __esm({
|
|
|
247829
247839
|
return requireFromRuntime(entryPath);
|
|
247830
247840
|
}
|
|
247831
247841
|
flattenNpmPackage(packageDestDir) {
|
|
247832
|
-
let archiveRoot =
|
|
247842
|
+
let archiveRoot = path36.join(packageDestDir, "package");
|
|
247833
247843
|
if (!fs35.statSync(archiveRoot, { throwIfNoEntry: false })?.isDirectory()) {
|
|
247834
247844
|
const entries = fs35.readdirSync(packageDestDir);
|
|
247835
247845
|
if (entries.length === 1 && entries[0]) {
|
|
247836
247846
|
const singleEntry = entries[0];
|
|
247837
|
-
if (fs35.statSync(
|
|
247838
|
-
archiveRoot =
|
|
247847
|
+
if (fs35.statSync(path36.join(packageDestDir, singleEntry)).isDirectory()) {
|
|
247848
|
+
archiveRoot = path36.join(packageDestDir, singleEntry);
|
|
247839
247849
|
} else {
|
|
247840
247850
|
throw new Error(
|
|
247841
247851
|
`Archive must contain exactly one top-level directory. Found ${entries.length} entries: ${entries.join(", ")} in ${packageDestDir}`
|
|
@@ -247848,7 +247858,7 @@ var init_ManagedArtifactRuntime = __esm({
|
|
|
247848
247858
|
}
|
|
247849
247859
|
}
|
|
247850
247860
|
for (const entry of fs35.readdirSync(archiveRoot)) {
|
|
247851
|
-
fs35.renameSync(
|
|
247861
|
+
fs35.renameSync(path36.join(archiveRoot, entry), path36.join(packageDestDir, entry));
|
|
247852
247862
|
}
|
|
247853
247863
|
fs35.rmdirSync(archiveRoot);
|
|
247854
247864
|
}
|
|
@@ -248046,12 +248056,12 @@ var init_DuckDbRuntime = __esm({
|
|
|
248046
248056
|
});
|
|
248047
248057
|
|
|
248048
248058
|
// src/server/runtime/DriverArtifactProvisioner.ts
|
|
248049
|
-
var fs36,
|
|
248059
|
+
var fs36, path37, DRIVER_ARTIFACTS, DriverArtifactProvisioner;
|
|
248050
248060
|
var init_DriverArtifactProvisioner = __esm({
|
|
248051
248061
|
"src/server/runtime/DriverArtifactProvisioner.ts"() {
|
|
248052
248062
|
"use strict";
|
|
248053
248063
|
fs36 = __toESM(require("fs"));
|
|
248054
|
-
|
|
248064
|
+
path37 = __toESM(require("path"));
|
|
248055
248065
|
init_optionalDrivers();
|
|
248056
248066
|
init_ManagedArtifactTypes();
|
|
248057
248067
|
init_artifactPins_generated();
|
|
@@ -248085,7 +248095,7 @@ var init_DriverArtifactProvisioner = __esm({
|
|
|
248085
248095
|
artifactId,
|
|
248086
248096
|
pins.artifactVersion
|
|
248087
248097
|
);
|
|
248088
|
-
const depPath =
|
|
248098
|
+
const depPath = path37.join(versionDir, "node_modules", ...dependency.split("/"));
|
|
248089
248099
|
if (fs36.existsSync(depPath)) {
|
|
248090
248100
|
return depPath;
|
|
248091
248101
|
}
|
|
@@ -248216,12 +248226,12 @@ function rowToLedgerEntry(row) {
|
|
|
248216
248226
|
function describeError3(error52) {
|
|
248217
248227
|
return error52 instanceof Error ? error52.message : String(error52);
|
|
248218
248228
|
}
|
|
248219
|
-
var fs37,
|
|
248229
|
+
var fs37, path38, LEDGER_DB_FILENAME, JOURNAL_SCHEMA_VERSION, META_KEY_SCHEMA_VERSION, META_KEY_HEAD_HASH, JournalStoreOpenError, openJournalPaths, JournalStore;
|
|
248220
248230
|
var init_JournalStore = __esm({
|
|
248221
248231
|
"src/server/ledger/JournalStore.ts"() {
|
|
248222
248232
|
"use strict";
|
|
248223
248233
|
fs37 = __toESM(require("fs"));
|
|
248224
|
-
|
|
248234
|
+
path38 = __toESM(require("path"));
|
|
248225
248235
|
init_canonicalSerialize();
|
|
248226
248236
|
init_LedgerTypes();
|
|
248227
248237
|
LEDGER_DB_FILENAME = "execution-ledger.duckdb";
|
|
@@ -248259,14 +248269,14 @@ var init_JournalStore = __esm({
|
|
|
248259
248269
|
`DuckDB runtime acquisition failed: ${describeError3(error52)}`
|
|
248260
248270
|
);
|
|
248261
248271
|
}
|
|
248262
|
-
const dbPath =
|
|
248272
|
+
const dbPath = path38.join(options.storageDir, LEDGER_DB_FILENAME);
|
|
248263
248273
|
if (openJournalPaths.has(dbPath)) {
|
|
248264
248274
|
throw new JournalStoreOpenError(
|
|
248265
248275
|
"locked",
|
|
248266
248276
|
`Journal ${dbPath} is already open in this process.`
|
|
248267
248277
|
);
|
|
248268
248278
|
}
|
|
248269
|
-
const lockPath =
|
|
248279
|
+
const lockPath = path38.join(options.storageDir, "execution-ledger.lock");
|
|
248270
248280
|
let ownsLockfile = false;
|
|
248271
248281
|
try {
|
|
248272
248282
|
fs37.mkdirSync(options.storageDir, { recursive: true });
|
|
@@ -248921,12 +248931,12 @@ var init_LedgerService = __esm({
|
|
|
248921
248931
|
function redactFatalText(text) {
|
|
248922
248932
|
return text.replace(AUTHORIZATION_VALUE2, "$1 [redacted]").replace(SENSITIVE_ASSIGNMENT2, "$1[redacted]").replace(QUERY_ASSIGNMENT2, "$1[redacted]").replace(URL_SECRET2, "$1[redacted]");
|
|
248923
248933
|
}
|
|
248924
|
-
var fs38,
|
|
248934
|
+
var fs38, path39, MAX_BYTES, RETAINED_FILES, SENSITIVE_ASSIGNMENT2, QUERY_ASSIGNMENT2, AUTHORIZATION_VALUE2, URL_SECRET2, FatalJournal;
|
|
248925
248935
|
var init_FatalJournal = __esm({
|
|
248926
248936
|
"src/server/FatalJournal.ts"() {
|
|
248927
248937
|
"use strict";
|
|
248928
248938
|
fs38 = __toESM(require("fs"));
|
|
248929
|
-
|
|
248939
|
+
path39 = __toESM(require("path"));
|
|
248930
248940
|
MAX_BYTES = 5 * 1024 * 1024;
|
|
248931
248941
|
RETAINED_FILES = 5;
|
|
248932
248942
|
SENSITIVE_ASSIGNMENT2 = /(\b(?:password|passwd|pwd|credential(?:s)?|authorization|authHeader|customAuthHeader|token|api[-_]?key|secret|privateKeyPassphrase)\b\s*[:=]\s*)(?:"[^"]*"|'[^']*'|[^\s,;}]+)/gi;
|
|
@@ -248937,8 +248947,8 @@ var init_FatalJournal = __esm({
|
|
|
248937
248947
|
constructor(configDir) {
|
|
248938
248948
|
this.disabled = false;
|
|
248939
248949
|
this.reportedFailure = false;
|
|
248940
|
-
this.logDir =
|
|
248941
|
-
this.logPath =
|
|
248950
|
+
this.logDir = path39.join(configDir, "logs");
|
|
248951
|
+
this.logPath = path39.join(this.logDir, "daemon.log");
|
|
248942
248952
|
}
|
|
248943
248953
|
writeFirst(kind, reason) {
|
|
248944
248954
|
const error52 = reason instanceof Error ? reason : new Error(String(reason));
|
|
@@ -249068,21 +249078,21 @@ var init_webUiHint = __esm({
|
|
|
249068
249078
|
|
|
249069
249079
|
// src/server/registerDriverModulePath.ts
|
|
249070
249080
|
function registerDriverModulePath(configDir) {
|
|
249071
|
-
const driversNodeModules =
|
|
249081
|
+
const driversNodeModules = path40.join(configDir, "drivers", "node_modules");
|
|
249072
249082
|
const existing = process.env["NODE_PATH"];
|
|
249073
|
-
const entries = existing ? existing.split(
|
|
249083
|
+
const entries = existing ? existing.split(path40.delimiter).filter(Boolean) : [];
|
|
249074
249084
|
if (!entries.includes(driversNodeModules)) {
|
|
249075
|
-
process.env["NODE_PATH"] = [driversNodeModules, ...entries].join(
|
|
249085
|
+
process.env["NODE_PATH"] = [driversNodeModules, ...entries].join(path40.delimiter);
|
|
249076
249086
|
}
|
|
249077
249087
|
const nodeModule = require("module");
|
|
249078
249088
|
nodeModule._initPaths?.();
|
|
249079
249089
|
return driversNodeModules;
|
|
249080
249090
|
}
|
|
249081
|
-
var
|
|
249091
|
+
var path40;
|
|
249082
249092
|
var init_registerDriverModulePath = __esm({
|
|
249083
249093
|
"src/server/registerDriverModulePath.ts"() {
|
|
249084
249094
|
"use strict";
|
|
249085
|
-
|
|
249095
|
+
path40 = __toESM(require("path"));
|
|
249086
249096
|
}
|
|
249087
249097
|
});
|
|
249088
249098
|
|
|
@@ -249090,12 +249100,12 @@ var init_registerDriverModulePath = __esm({
|
|
|
249090
249100
|
function faultIdentity(daemonVersion, kind, errorName) {
|
|
249091
249101
|
return `${daemonVersion}:${kind}:${errorName}`;
|
|
249092
249102
|
}
|
|
249093
|
-
var fs39,
|
|
249103
|
+
var fs39, path41, DIAGNOSTICS_REPORT_BUDGET, DIAGNOSTICS_BUDGET_WINDOW_MS, MAX_RETAINED_REPORTS, BUDGET_VERSION, DiagnosticsBudget;
|
|
249094
249104
|
var init_DiagnosticsBudget = __esm({
|
|
249095
249105
|
"src/server/DiagnosticsBudget.ts"() {
|
|
249096
249106
|
"use strict";
|
|
249097
249107
|
fs39 = __toESM(require("fs"));
|
|
249098
|
-
|
|
249108
|
+
path41 = __toESM(require("path"));
|
|
249099
249109
|
DIAGNOSTICS_REPORT_BUDGET = 3;
|
|
249100
249110
|
DIAGNOSTICS_BUDGET_WINDOW_MS = 60 * 6e4;
|
|
249101
249111
|
MAX_RETAINED_REPORTS = 20;
|
|
@@ -249103,7 +249113,7 @@ var init_DiagnosticsBudget = __esm({
|
|
|
249103
249113
|
DiagnosticsBudget = class {
|
|
249104
249114
|
constructor(configDir, options) {
|
|
249105
249115
|
this.hasLoggedWriteError = false;
|
|
249106
|
-
this.filePath =
|
|
249116
|
+
this.filePath = path41.join(configDir, "diagnostics-budget.json");
|
|
249107
249117
|
this.now = options?.now ?? (() => Date.now());
|
|
249108
249118
|
}
|
|
249109
249119
|
read() {
|
|
@@ -249123,7 +249133,7 @@ var init_DiagnosticsBudget = __esm({
|
|
|
249123
249133
|
}
|
|
249124
249134
|
write(file4) {
|
|
249125
249135
|
try {
|
|
249126
|
-
const dir3 =
|
|
249136
|
+
const dir3 = path41.dirname(this.filePath);
|
|
249127
249137
|
if (!fs39.existsSync(dir3)) {
|
|
249128
249138
|
fs39.mkdirSync(dir3, { recursive: true });
|
|
249129
249139
|
}
|
|
@@ -249523,7 +249533,7 @@ function isVersion(value) {
|
|
|
249523
249533
|
return SEMVER_PATTERN2.test(value);
|
|
249524
249534
|
}
|
|
249525
249535
|
function pointerPath(configHome, version3) {
|
|
249526
|
-
return
|
|
249536
|
+
return path42.join(configHome, "versions", `${version3}.json`);
|
|
249527
249537
|
}
|
|
249528
249538
|
function removeVersion(configHome, version3) {
|
|
249529
249539
|
const appPath = applicationDir(configHome, version3);
|
|
@@ -249546,12 +249556,12 @@ function pruneOldVersions(configHome, keep) {
|
|
|
249546
249556
|
}
|
|
249547
249557
|
return removed;
|
|
249548
249558
|
}
|
|
249549
|
-
var fs40,
|
|
249559
|
+
var fs40, path42, SEMVER_PATTERN2;
|
|
249550
249560
|
var init_VersionRetention = __esm({
|
|
249551
249561
|
"src/server/update/VersionRetention.ts"() {
|
|
249552
249562
|
"use strict";
|
|
249553
249563
|
fs40 = __toESM(require("fs"));
|
|
249554
|
-
|
|
249564
|
+
path42 = __toESM(require("path"));
|
|
249555
249565
|
init_applicationPayload();
|
|
249556
249566
|
SEMVER_PATTERN2 = /^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-(?:0|[1-9]\d*|[0-9A-Za-z-]*[A-Za-z-][0-9A-Za-z-]*)(?:\.(?:0|[1-9]\d*|[0-9A-Za-z-]*[A-Za-z-][0-9A-Za-z-]*))*)?(?:\+[0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*)?$/;
|
|
249557
249567
|
}
|
|
@@ -249559,8 +249569,8 @@ var init_VersionRetention = __esm({
|
|
|
249559
249569
|
|
|
249560
249570
|
// src/server/update/UpdateStager.ts
|
|
249561
249571
|
function isWithin2(parent, child) {
|
|
249562
|
-
const relative5 =
|
|
249563
|
-
return relative5 === "" || !relative5.startsWith(`..${
|
|
249572
|
+
const relative5 = path43.relative(path43.resolve(parent), path43.resolve(child));
|
|
249573
|
+
return relative5 === "" || !relative5.startsWith(`..${path43.sep}`) && relative5 !== "..";
|
|
249564
249574
|
}
|
|
249565
249575
|
function isVersion2(value) {
|
|
249566
249576
|
return typeof value === "string" && SEMVER_PATTERN3.test(value);
|
|
@@ -249583,7 +249593,7 @@ function findPayloadEntry(root) {
|
|
|
249583
249593
|
const entries = [];
|
|
249584
249594
|
const visit = (directory) => {
|
|
249585
249595
|
for (const entry2 of fs41.readdirSync(directory, { withFileTypes: true })) {
|
|
249586
|
-
const entryPath =
|
|
249596
|
+
const entryPath = path43.join(directory, entry2.name);
|
|
249587
249597
|
if (entry2.isDirectory()) {
|
|
249588
249598
|
visit(entryPath);
|
|
249589
249599
|
} else if (entry2.isFile() && entry2.name === "standalone.js") {
|
|
@@ -249629,13 +249639,13 @@ function atomicWritePointer(fileSystem, pointerPath2, pointer) {
|
|
|
249629
249639
|
}
|
|
249630
249640
|
removeBestEffort(fileSystem, backupPath);
|
|
249631
249641
|
}
|
|
249632
|
-
var fs41, os8,
|
|
249642
|
+
var fs41, os8, path43, SEMVER_PATTERN3, UpdateStager;
|
|
249633
249643
|
var init_UpdateStager = __esm({
|
|
249634
249644
|
"src/server/update/UpdateStager.ts"() {
|
|
249635
249645
|
"use strict";
|
|
249636
249646
|
fs41 = __toESM(require("fs"));
|
|
249637
249647
|
os8 = __toESM(require("os"));
|
|
249638
|
-
|
|
249648
|
+
path43 = __toESM(require("path"));
|
|
249639
249649
|
init_protocolVersion();
|
|
249640
249650
|
init_applicationPayload();
|
|
249641
249651
|
init_MinimalTarExtractor();
|
|
@@ -249652,7 +249662,7 @@ var init_UpdateStager = __esm({
|
|
|
249652
249662
|
this.fileSystem = options.fileSystem ?? fs41;
|
|
249653
249663
|
}
|
|
249654
249664
|
stagedVersion() {
|
|
249655
|
-
const versionsDir =
|
|
249665
|
+
const versionsDir = path43.join(this.configHome, "versions");
|
|
249656
249666
|
let entries;
|
|
249657
249667
|
try {
|
|
249658
249668
|
entries = this.fileSystem.readdirSync(versionsDir, { withFileTypes: true });
|
|
@@ -249667,7 +249677,7 @@ var init_UpdateStager = __esm({
|
|
|
249667
249677
|
try {
|
|
249668
249678
|
const version3 = entry.name.slice(0, -".json".length);
|
|
249669
249679
|
const pointer = JSON.parse(
|
|
249670
|
-
this.fileSystem.readFileSync(
|
|
249680
|
+
this.fileSystem.readFileSync(path43.join(versionsDir, entry.name), "utf8")
|
|
249671
249681
|
);
|
|
249672
249682
|
if (!isVersionPointer(pointer) || pointer.version !== version3 || compareSemver(pointer.version, this.currentVersion) <= 0 || !isWithin2(applicationDir(this.configHome, pointer.version), pointer.path) || !this.fileSystem.statSync(pointer.path).isFile()) {
|
|
249673
249683
|
continue;
|
|
@@ -249693,9 +249703,9 @@ var init_UpdateStager = __esm({
|
|
|
249693
249703
|
);
|
|
249694
249704
|
}
|
|
249695
249705
|
this.fileSystem.mkdirSync(this.downloadDir, { recursive: true });
|
|
249696
|
-
const temporaryRoot = this.fileSystem.mkdtempSync(
|
|
249697
|
-
const archivePath =
|
|
249698
|
-
const extractedPath =
|
|
249706
|
+
const temporaryRoot = this.fileSystem.mkdtempSync(path43.join(this.downloadDir, "grain-update-"));
|
|
249707
|
+
const archivePath = path43.join(temporaryRoot, "artifact.tar.gz");
|
|
249708
|
+
const extractedPath = path43.join(temporaryRoot, "extracted");
|
|
249699
249709
|
try {
|
|
249700
249710
|
await downloadToFile(artifact.url, archivePath);
|
|
249701
249711
|
const actualSha256 = await sha256File(archivePath);
|
|
@@ -249724,19 +249734,19 @@ var init_UpdateStager = __esm({
|
|
|
249724
249734
|
throw new Error(`Invalid staged version ${version3}`);
|
|
249725
249735
|
}
|
|
249726
249736
|
removeBestEffort(this.fileSystem, applicationDir(this.configHome, version3));
|
|
249727
|
-
removeBestEffort(this.fileSystem,
|
|
249737
|
+
removeBestEffort(this.fileSystem, path43.join(this.configHome, "versions", `${version3}.json`));
|
|
249728
249738
|
}
|
|
249729
249739
|
install(version3, sourceEntry) {
|
|
249730
249740
|
const appPath = applicationDir(this.configHome, version3);
|
|
249731
|
-
const versionsDir =
|
|
249732
|
-
const pointerPath2 =
|
|
249741
|
+
const versionsDir = path43.join(this.configHome, "versions");
|
|
249742
|
+
const pointerPath2 = path43.join(versionsDir, `${version3}.json`);
|
|
249733
249743
|
const operationId = `${process.pid}-${Date.now()}`;
|
|
249734
249744
|
const appBackupPath = `${appPath}.update-backup-${operationId}`;
|
|
249735
249745
|
const hadApp = this.fileSystem.existsSync(appPath);
|
|
249736
249746
|
const hadPointer = this.fileSystem.existsSync(pointerPath2);
|
|
249737
249747
|
const previousPointer = hadPointer ? this.fileSystem.readFileSync(pointerPath2, "utf8") : null;
|
|
249738
249748
|
let movedExistingApp = false;
|
|
249739
|
-
this.fileSystem.mkdirSync(
|
|
249749
|
+
this.fileSystem.mkdirSync(path43.dirname(appPath), { recursive: true });
|
|
249740
249750
|
this.fileSystem.mkdirSync(versionsDir, { recursive: true });
|
|
249741
249751
|
try {
|
|
249742
249752
|
if (hadApp) {
|
|
@@ -249803,7 +249813,7 @@ function pruneDeadPidFiles(configDir, ownPidPath) {
|
|
|
249803
249813
|
if (!PID_FILE_PATTERN.test(entry)) {
|
|
249804
249814
|
continue;
|
|
249805
249815
|
}
|
|
249806
|
-
const candidate =
|
|
249816
|
+
const candidate = path44.join(configDir, entry);
|
|
249807
249817
|
if (candidate === ownPidPath) {
|
|
249808
249818
|
continue;
|
|
249809
249819
|
}
|
|
@@ -249819,12 +249829,12 @@ function pruneDeadPidFiles(configDir, ownPidPath) {
|
|
|
249819
249829
|
}
|
|
249820
249830
|
return pruned;
|
|
249821
249831
|
}
|
|
249822
|
-
var fs42,
|
|
249832
|
+
var fs42, path44, PID_FILE_PATTERN;
|
|
249823
249833
|
var init_pidFilePruning = __esm({
|
|
249824
249834
|
"src/server/pidFilePruning.ts"() {
|
|
249825
249835
|
"use strict";
|
|
249826
249836
|
fs42 = __toESM(require("fs"));
|
|
249827
|
-
|
|
249837
|
+
path44 = __toESM(require("path"));
|
|
249828
249838
|
PID_FILE_PATTERN = /^server-\d+\.pid$/;
|
|
249829
249839
|
}
|
|
249830
249840
|
});
|
|
@@ -249876,7 +249886,7 @@ function readInstalledApplicationVersion(configHome, entryPath, fileSystem = fs4
|
|
|
249876
249886
|
if (!entryPath) {
|
|
249877
249887
|
return null;
|
|
249878
249888
|
}
|
|
249879
|
-
const versionsDir =
|
|
249889
|
+
const versionsDir = path45.join(configHome, "versions");
|
|
249880
249890
|
let entries;
|
|
249881
249891
|
try {
|
|
249882
249892
|
entries = fileSystem.readdirSync(versionsDir);
|
|
@@ -249889,9 +249899,9 @@ function readInstalledApplicationVersion(configHome, entryPath, fileSystem = fs4
|
|
|
249889
249899
|
}
|
|
249890
249900
|
try {
|
|
249891
249901
|
const pointer = JSON.parse(
|
|
249892
|
-
fileSystem.readFileSync(
|
|
249902
|
+
fileSystem.readFileSync(path45.join(versionsDir, entry), "utf8")
|
|
249893
249903
|
);
|
|
249894
|
-
if (typeof pointer.version === "string" && typeof pointer.path === "string" &&
|
|
249904
|
+
if (typeof pointer.version === "string" && typeof pointer.path === "string" && path45.resolve(pointer.path) === path45.resolve(entryPath)) {
|
|
249895
249905
|
return pointer.version;
|
|
249896
249906
|
}
|
|
249897
249907
|
} catch {
|
|
@@ -249948,14 +249958,14 @@ function writePidFileAtomically(pidPath, pid) {
|
|
|
249948
249958
|
}
|
|
249949
249959
|
return directWriteSuccess;
|
|
249950
249960
|
}
|
|
249951
|
-
var import_express4, fs43, http8,
|
|
249961
|
+
var import_express4, fs43, http8, path45, FATAL_EXIT_WATCHDOG_MS, LEDGER_CLOSE_TIMEOUT_MS, ServeInconsistencyError, TakeoverRefusalError, INGRESS_CONNECTION_ESCALATION_MS, STOP_STAGE_TIMEOUT_MS, STOP_TOTAL_TIMEOUT_MS, SERVE_INCONSISTENCY_REBIND_TIMEOUT_MS, OCCUPANT_ENDPOINT_GRACE_MS, Daemon;
|
|
249952
249962
|
var init_Daemon = __esm({
|
|
249953
249963
|
"src/server/Daemon.ts"() {
|
|
249954
249964
|
"use strict";
|
|
249955
249965
|
import_express4 = __toESM(require_express2());
|
|
249956
249966
|
fs43 = __toESM(require("fs"));
|
|
249957
249967
|
http8 = __toESM(require("http"));
|
|
249958
|
-
|
|
249968
|
+
path45 = __toESM(require("path"));
|
|
249959
249969
|
init_ipcEndpoint();
|
|
249960
249970
|
init_protocolVersion();
|
|
249961
249971
|
init_tcpPortAvailability();
|
|
@@ -250236,7 +250246,7 @@ var init_Daemon = __esm({
|
|
|
250236
250246
|
* test, so the invariant that write and unlink agree could not be asserted.
|
|
250237
250247
|
*/
|
|
250238
250248
|
pidFilePath() {
|
|
250239
|
-
return
|
|
250249
|
+
return path45.join(this.CONFIG_DIR, `server-${this.boundHttpPort ?? this.HTTP_PORT}.pid`);
|
|
250240
250250
|
}
|
|
250241
250251
|
getHttpBaseUrl() {
|
|
250242
250252
|
const host = ["0.0.0.0", "::", ""].includes(this.config.server.host) ? "127.0.0.1" : this.config.server.host;
|
|
@@ -250515,7 +250525,7 @@ var init_Daemon = __esm({
|
|
|
250515
250525
|
const server = this.httpServer;
|
|
250516
250526
|
this.httpServer = null;
|
|
250517
250527
|
this.closingHttpServer = server;
|
|
250518
|
-
const httpClose = new Promise((
|
|
250528
|
+
const httpClose = new Promise((resolve11) => {
|
|
250519
250529
|
let settled = false;
|
|
250520
250530
|
let escalation;
|
|
250521
250531
|
const finish = () => {
|
|
@@ -250530,7 +250540,7 @@ var init_Daemon = __esm({
|
|
|
250530
250540
|
if (this.closingHttpServer === server) {
|
|
250531
250541
|
this.closingHttpServer = null;
|
|
250532
250542
|
}
|
|
250533
|
-
|
|
250543
|
+
resolve11();
|
|
250534
250544
|
};
|
|
250535
250545
|
if (!force) {
|
|
250536
250546
|
try {
|
|
@@ -250659,7 +250669,7 @@ var init_Daemon = __esm({
|
|
|
250659
250669
|
return true;
|
|
250660
250670
|
}
|
|
250661
250671
|
}
|
|
250662
|
-
await new Promise((
|
|
250672
|
+
await new Promise((resolve11) => setTimeout(resolve11, 100));
|
|
250663
250673
|
}
|
|
250664
250674
|
return false;
|
|
250665
250675
|
}
|
|
@@ -250669,12 +250679,12 @@ var init_Daemon = __esm({
|
|
|
250669
250679
|
}
|
|
250670
250680
|
for (let attempt = 0; attempt < 20; attempt++) {
|
|
250671
250681
|
if (!fs43.existsSync(this.SOCKET_PATH)) {
|
|
250672
|
-
await new Promise((
|
|
250682
|
+
await new Promise((resolve11) => setTimeout(resolve11, 100));
|
|
250673
250683
|
if (!fs43.existsSync(this.SOCKET_PATH)) {
|
|
250674
250684
|
return;
|
|
250675
250685
|
}
|
|
250676
250686
|
}
|
|
250677
|
-
await new Promise((
|
|
250687
|
+
await new Promise((resolve11) => setTimeout(resolve11, 50));
|
|
250678
250688
|
}
|
|
250679
250689
|
}
|
|
250680
250690
|
async isSqlPreviewDaemonProcess(pid) {
|
|
@@ -250682,14 +250692,14 @@ var init_Daemon = __esm({
|
|
|
250682
250692
|
return status?.service === DAEMON_SERVICE_IDENTITY && status.pid === pid;
|
|
250683
250693
|
}
|
|
250684
250694
|
async readExistingDaemonStatus(host = this.config.server.host, port = this.HTTP_PORT) {
|
|
250685
|
-
return new Promise((
|
|
250695
|
+
return new Promise((resolve11) => {
|
|
250686
250696
|
let settled = false;
|
|
250687
250697
|
const settle2 = (status) => {
|
|
250688
250698
|
if (settled) {
|
|
250689
250699
|
return;
|
|
250690
250700
|
}
|
|
250691
250701
|
settled = true;
|
|
250692
|
-
|
|
250702
|
+
resolve11(status);
|
|
250693
250703
|
};
|
|
250694
250704
|
const req = http8.get(
|
|
250695
250705
|
{
|
|
@@ -250743,7 +250753,7 @@ var init_Daemon = __esm({
|
|
|
250743
250753
|
if (Date.now() >= deadline) {
|
|
250744
250754
|
return false;
|
|
250745
250755
|
}
|
|
250746
|
-
await new Promise((
|
|
250756
|
+
await new Promise((resolve11) => setTimeout(resolve11, 50));
|
|
250747
250757
|
}
|
|
250748
250758
|
}
|
|
250749
250759
|
async resolveEndpointOccupant() {
|
|
@@ -250790,7 +250800,7 @@ var init_Daemon = __esm({
|
|
|
250790
250800
|
}
|
|
250791
250801
|
}
|
|
250792
250802
|
async start() {
|
|
250793
|
-
const pidPath =
|
|
250803
|
+
const pidPath = path45.join(this.CONFIG_DIR, `server-${this.HTTP_PORT}.pid`);
|
|
250794
250804
|
const shouldFallbackToEphemeral = this.resolvedConfig?.sources["server.port"] === "default";
|
|
250795
250805
|
let deferPidClaimUntilAfterBind = this.HTTP_PORT === 0 || shouldFallbackToEphemeral;
|
|
250796
250806
|
try {
|
|
@@ -250899,7 +250909,7 @@ var init_Daemon = __esm({
|
|
|
250899
250909
|
}
|
|
250900
250910
|
try {
|
|
250901
250911
|
await this.initializeLedger();
|
|
250902
|
-
const bindHttp = (port) => new Promise((
|
|
250912
|
+
const bindHttp = (port) => new Promise((resolve11, reject) => {
|
|
250903
250913
|
let bindError;
|
|
250904
250914
|
const server = this.app.listen(port, this.config.server.host, () => {
|
|
250905
250915
|
const addr = server.address();
|
|
@@ -250958,7 +250968,7 @@ var init_Daemon = __esm({
|
|
|
250958
250968
|
process.exit(1);
|
|
250959
250969
|
});
|
|
250960
250970
|
this.state = "running";
|
|
250961
|
-
|
|
250971
|
+
resolve11();
|
|
250962
250972
|
});
|
|
250963
250973
|
this.httpServer = server;
|
|
250964
250974
|
server.on("error", (err) => {
|
|
@@ -250998,7 +251008,7 @@ var init_Daemon = __esm({
|
|
|
250998
251008
|
this.isStdioMode = true;
|
|
250999
251009
|
ConsoleLogger.getInstance().setUseStdErr(true);
|
|
251000
251010
|
await this.initializeLedger();
|
|
251001
|
-
await new Promise((
|
|
251011
|
+
await new Promise((resolve11, reject) => {
|
|
251002
251012
|
const server = this.app.listen(0, "127.0.0.1", () => {
|
|
251003
251013
|
const addr = server.address();
|
|
251004
251014
|
const listening = server.listening === true;
|
|
@@ -251020,7 +251030,7 @@ var init_Daemon = __esm({
|
|
|
251020
251030
|
logger.error("[Daemon] Background HTTP server error:", err);
|
|
251021
251031
|
});
|
|
251022
251032
|
this.state = "running";
|
|
251023
|
-
|
|
251033
|
+
resolve11();
|
|
251024
251034
|
});
|
|
251025
251035
|
this.httpServer = server;
|
|
251026
251036
|
server.on("error", reject);
|
|
@@ -251093,10 +251103,10 @@ var init_Daemon = __esm({
|
|
|
251093
251103
|
*/
|
|
251094
251104
|
async withStopBudget(label, work, budgetMs) {
|
|
251095
251105
|
let timer;
|
|
251096
|
-
const deadline = new Promise((
|
|
251106
|
+
const deadline = new Promise((resolve11) => {
|
|
251097
251107
|
timer = setTimeout(() => {
|
|
251098
251108
|
logger.warn(`[Daemon] Shutdown stage "${label}" exceeded its ${budgetMs}ms budget.`);
|
|
251099
|
-
|
|
251109
|
+
resolve11();
|
|
251100
251110
|
}, budgetMs);
|
|
251101
251111
|
});
|
|
251102
251112
|
await Promise.race([
|
|
@@ -251135,12 +251145,12 @@ var init_Daemon = __esm({
|
|
|
251135
251145
|
const service = this.ledgerService;
|
|
251136
251146
|
this.ledgerService = null;
|
|
251137
251147
|
let timer;
|
|
251138
|
-
const closeDeadline = new Promise((
|
|
251148
|
+
const closeDeadline = new Promise((resolve11) => {
|
|
251139
251149
|
timer = setTimeout(() => {
|
|
251140
251150
|
logger.warn(
|
|
251141
251151
|
"[Daemon] Ledger close exceeded its budget; pending entries may be unwritten."
|
|
251142
251152
|
);
|
|
251143
|
-
|
|
251153
|
+
resolve11();
|
|
251144
251154
|
}, LEDGER_CLOSE_TIMEOUT_MS);
|
|
251145
251155
|
});
|
|
251146
251156
|
await Promise.race([
|
|
@@ -251269,7 +251279,7 @@ async function probeSharedDaemon(port, timeoutMs = 500, expected) {
|
|
|
251269
251279
|
}
|
|
251270
251280
|
}
|
|
251271
251281
|
if (attempt < MAX_ATTEMPTS) {
|
|
251272
|
-
await new Promise((
|
|
251282
|
+
await new Promise((resolve11) => setTimeout(resolve11, retryDelaysMs[attempt - 1]));
|
|
251273
251283
|
}
|
|
251274
251284
|
}
|
|
251275
251285
|
return { attempts: MAX_ATTEMPTS, failureReason: lastFailureReason };
|
|
@@ -251301,14 +251311,14 @@ function confirmsExpectedInstance(expected, identity2) {
|
|
|
251301
251311
|
return classifyRecordInstance(expected, identity2, Date.now()) !== "mismatch";
|
|
251302
251312
|
}
|
|
251303
251313
|
function probeSharedDaemonOnce(port, timeoutMs, expected) {
|
|
251304
|
-
return new Promise((
|
|
251314
|
+
return new Promise((resolve11) => {
|
|
251305
251315
|
let settled = false;
|
|
251306
251316
|
const settle2 = (outcome) => {
|
|
251307
251317
|
if (settled) {
|
|
251308
251318
|
return;
|
|
251309
251319
|
}
|
|
251310
251320
|
settled = true;
|
|
251311
|
-
|
|
251321
|
+
resolve11(outcome);
|
|
251312
251322
|
};
|
|
251313
251323
|
const request2 = http.get(
|
|
251314
251324
|
{
|
|
@@ -251790,7 +251800,7 @@ var _NodeRuntimeProvisioner = class {
|
|
|
251790
251800
|
if (Date.now() - startedAt > maxWaitMs) {
|
|
251791
251801
|
throw new Error(`Timed out waiting for Node runtime provisioning lock: ${lockDir}`);
|
|
251792
251802
|
}
|
|
251793
|
-
await new Promise((
|
|
251803
|
+
await new Promise((resolve11) => setTimeout(resolve11, PROVISION_LOCK_POLL_MS));
|
|
251794
251804
|
}
|
|
251795
251805
|
}
|
|
251796
251806
|
isStaleLock(lockDir, staleMs) {
|
|
@@ -252359,7 +252369,7 @@ async function installCommand(deps = {}) {
|
|
|
252359
252369
|
const runner = deps.commandRunner ?? createCommandRunner();
|
|
252360
252370
|
const adapter2 = deps.adapter ?? createSupervisorAdapter(platform2, runner, uid);
|
|
252361
252371
|
const readStatus = deps.readStatus ?? readGrainServiceStatus;
|
|
252362
|
-
const wait = deps.wait ?? ((milliseconds) => new Promise((
|
|
252372
|
+
const wait = deps.wait ?? ((milliseconds) => new Promise((resolve11) => setTimeout(resolve11, milliseconds)));
|
|
252363
252373
|
const writeOutput = deps.writeOutput ?? ((message) => console.log(message));
|
|
252364
252374
|
const telemetryConsentFlag = deps.telemetryConsent;
|
|
252365
252375
|
const standalonePath = deps.standalonePath ?? require.main?.filename;
|
|
@@ -252716,7 +252726,7 @@ init_startCommand();
|
|
|
252716
252726
|
init_supervisorAdapter();
|
|
252717
252727
|
init_localBrowserPaths();
|
|
252718
252728
|
function fetchJson(url3, token, method = "GET", body) {
|
|
252719
|
-
return new Promise((
|
|
252729
|
+
return new Promise((resolve11, reject) => {
|
|
252720
252730
|
const payload = body === void 0 ? void 0 : JSON.stringify(body);
|
|
252721
252731
|
const parsed = new URL(url3);
|
|
252722
252732
|
const req = http6.request(
|
|
@@ -252745,7 +252755,7 @@ function fetchJson(url3, token, method = "GET", body) {
|
|
|
252745
252755
|
} catch {
|
|
252746
252756
|
data = void 0;
|
|
252747
252757
|
}
|
|
252748
|
-
|
|
252758
|
+
resolve11({ status: res.statusCode ?? 0, data });
|
|
252749
252759
|
});
|
|
252750
252760
|
}
|
|
252751
252761
|
);
|
|
@@ -252951,8 +252961,8 @@ function resolveNotSetUpMessage(hasConnectionsEnv) {
|
|
|
252951
252961
|
var SERVICE_START_FLUSH_BUDGET_MS = 2e3;
|
|
252952
252962
|
async function flushWithinBudget(telemetry, budgetMs) {
|
|
252953
252963
|
let timer;
|
|
252954
|
-
const budget = new Promise((
|
|
252955
|
-
timer = setTimeout(
|
|
252964
|
+
const budget = new Promise((resolve11) => {
|
|
252965
|
+
timer = setTimeout(resolve11, budgetMs);
|
|
252956
252966
|
});
|
|
252957
252967
|
await Promise.race([telemetry.flush().catch(() => void 0), budget]);
|
|
252958
252968
|
if (timer) {
|
|
@@ -253002,8 +253012,8 @@ async function handleLaunchFailureMarker(configDir, telemetry) {
|
|
|
253002
253012
|
});
|
|
253003
253013
|
if (isLocalTelemetry) {
|
|
253004
253014
|
let timer;
|
|
253005
|
-
const budget = new Promise((
|
|
253006
|
-
timer = setTimeout(
|
|
253015
|
+
const budget = new Promise((resolve11) => {
|
|
253016
|
+
timer = setTimeout(resolve11, SERVICE_START_FLUSH_BUDGET_MS);
|
|
253007
253017
|
});
|
|
253008
253018
|
await Promise.race([activeTelemetry.dispose().catch(() => void 0), budget]);
|
|
253009
253019
|
if (timer) {
|