@prostgles/prostgles 2.3.6-dev.1787249991 → 2.3.6-dev.1787262189
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/client/build/js/main.bundle.js +1 -1
- package/dist/server/package.json +1 -1
- package/dist/server/src/ConnectionManager/getSchemaConfig.js +1 -1
- package/dist/server/src/ConnectionManager/getSchemaConfig.js.map +1 -1
- package/dist/server/src/cli/cli.js +1 -2
- package/dist/server/src/cli/cli.js.map +1 -1
- package/dist/server/src/connectionUtils/getConnectionDetails.d.ts.map +1 -1
- package/dist/server/src/connectionUtils/getConnectionDetails.js +21 -7
- package/dist/server/src/connectionUtils/getConnectionDetails.js.map +1 -1
- package/dist/server/src/connectionUtils/getConnectionDetails.spec.d.ts +2 -0
- package/dist/server/src/connectionUtils/getConnectionDetails.spec.d.ts.map +1 -0
- package/dist/server/src/connectionUtils/getConnectionDetails.spec.js +25 -0
- package/dist/server/src/connectionUtils/getConnectionDetails.spec.js.map +1 -0
- package/package.json +1 -1
package/dist/server/package.json
CHANGED
|
@@ -11,7 +11,7 @@ const validateConfigPath = (config) => {
|
|
|
11
11
|
if (configPath !== path_1.default.resolve(configPath)) {
|
|
12
12
|
throw new Error(`config_sync.configPath must be an absolute path. "${configPath}" is not absolute.`);
|
|
13
13
|
}
|
|
14
|
-
const projectPath = path_1.default.resolve(
|
|
14
|
+
const projectPath = path_1.default.resolve(electronConfig_1.actualRootDir);
|
|
15
15
|
const bundledSamplesPath = path_1.default.resolve(electronConfig_1.actualRootDir, "sample_schemas");
|
|
16
16
|
const isBundledSample = configPath.startsWith(bundledSamplesPath + path_1.default.sep);
|
|
17
17
|
if (type === "cli" && isBundledSample) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getSchemaConfig.js","sourceRoot":"","sources":["../../../../src/ConnectionManager/getSchemaConfig.ts"],"names":[],"mappings":";;;;AAAA,2BAA0C;AAC1C,wDAAwB;AAExB,sDAAkD;AAGlD,MAAM,iBAAiB,GAAG,IAAI,GAAG,EAG9B,CAAC;AAQJ,MAAM,kBAAkB,GAAG,CAAC,MAA+B,EAAE,EAAE;IAC7D,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,GAAG,MAAM,CAAC;IACpC,IAAI,UAAU,KAAK,cAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;QAC5C,MAAM,IAAI,KAAK,CACb,qDAAqD,UAAU,oBAAoB,CACpF,CAAC;IACJ,CAAC;IACD,MAAM,WAAW,GAAG,cAAI,CAAC,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"getSchemaConfig.js","sourceRoot":"","sources":["../../../../src/ConnectionManager/getSchemaConfig.ts"],"names":[],"mappings":"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"}
|
|
@@ -73,9 +73,8 @@ const validateEnvironmentSetup = (configPath) => {
|
|
|
73
73
|
return environment;
|
|
74
74
|
};
|
|
75
75
|
const serverEntryPath = path_1.default.join(__dirname, "..", "cliServer.js");
|
|
76
|
-
const serverDirectory = path_1.default.resolve(path_1.default.dirname(serverEntryPath), "../../..");
|
|
77
76
|
const runServer = (configPath, mode) => (0, child_process_1.spawn)(process.execPath, [serverEntryPath], {
|
|
78
|
-
cwd:
|
|
77
|
+
cwd: configPath,
|
|
79
78
|
stdio: "inherit",
|
|
80
79
|
env: {
|
|
81
80
|
...getConfigEnvironment(configPath),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../../../src/cli/cli.ts"],"names":[],"mappings":";;;;AAEA,iDAAoE;AACpE,mCAA+B;AAC/B,2BAA6E;AAC7E,wDAAwB;AACxB,gGAA6F;AAC7F,yDAI4B;AAC5B,6DAA0D;AAE1D,MAAM,KAAK,GAAG;;;yCAG2B,CAAC;AAE1C,MAAM,aAAa,GAAG,CAAC,IAAc,EAAE,EAAE;IACvC,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IAC7C,IAAI,WAAW,KAAK,CAAC,CAAC;QAAE,OAAO,OAAO,CAAC,GAAG,EAAE,CAAC;IAC7C,MAAM,UAAU,GAAG,IAAI,CAAC,WAAW,GAAG,CAAC,CAAC,CAAC;IACzC,IAAI,CAAC,UAAU;QAAE,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;IAClE,OAAO,cAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;AAClC,CAAC,CAAC;AAEF,MAAM,UAAU,GAAG,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC;AAEpE,MAAM,yBAAyB,GAAG,CAAC,UAAkB,EAAE,EAAE;IACvD,MAAM,MAAM,GAAG,IAAA,yBAAS,EAAC,UAAU,EAAE,CAAC,SAAS,CAAC,EAAE;QAChD,GAAG,EAAE,UAAU;QACf,KAAK,EAAE,SAAS;KACjB,CAAC,CAAC;IACH,IAAI,MAAM,CAAC,KAAK;QAAE,MAAM,MAAM,CAAC,KAAK,CAAC;IACrC,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACxB,MAAM,IAAI,KAAK,CAAC,kCAAkC,MAAM,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC,CAAC;IAC1E,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,YAAY,GAAG,CAAC,UAAkB,EAAE,WAAoB,EAAE,EAAE;IAChE,IAAI,IAAA,eAAU,EAAC,UAAU,CAAC,IAAI,IAAA,gBAAW,EAAC,UAAU,CAAC,CAAC,MAAM,EAAE,CAAC;QAC7D,MAAM,IAAI,KAAK,CAAC,GAAG,UAAU,kCAAkC,CAAC,CAAC;IACnE,CAAC;IAED,MAAM,WAAW,GAAG,cAAI;SACrB,QAAQ,CAAC,UAAU,CAAC;SACpB,OAAO,CAAC,cAAc,EAAE,GAAG,CAAC;SAC5B,WAAW,EAAE,CAAC;IACjB,MAAM,QAAQ,GAAG,WAAW,IAAI,kBAAkB,CAAC;IACnD,IAAA,uCAAoB,EAAC,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC,CAAC;IAE/C,IAAI,WAAW,EAAE,CAAC;QAChB,OAAO,CAAC,GAAG,CACT,6BAA6B,UAAU,mGAAmG,CAC3I,CAAC;QACF,OAAO;IACT,CAAC;IAED,yBAAyB,CAAC,UAAU,CAAC,CAAC;IACtC,OAAO,CAAC,GAAG,CACT,wDAAwD,UAAU,kFAAkF,CACrJ,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,oBAAoB,GAAG,CAAC,UAAkB,EAAE,EAAE;IAClD,MAAM,eAAe,GAAG,cAAI,CAAC,IAAI,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;IACtD,OAAO,IAAA,eAAU,EAAC,eAAe,CAAC,CAAC,CAAC;QAChC,IAAA,cAAK,EAAC,IAAA,iBAAY,EAAC,eAAe,CAAC,CAAC;QACtC,CAAC,CAAC,EAAE,CAAC;AACT,CAAC,CAAC;AAEF,MAAM,wBAAwB,GAAG,CAAC,UAAkB,EAAE,EAAE;IACtD,MAAM,eAAe,GAAG,cAAI,CAAC,IAAI,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;IACtD,IAAI,CAAC,IAAA,eAAU,EAAC,eAAe,CAAC,EAAE,CAAC;QACjC,OAAO,CAAC,IAAI,CACV,kCAAkC,eAAe,+DAA+D,CACjH,CAAC;IACJ,CAAC;IAED,MAAM,WAAW,GAAG,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,GAAG,oBAAoB,CAAC,UAAU,CAAC,EAAE,CAAC;IAC5E,MAAM,QAAQ,GAAG,CAAC,KAAyB,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IACvE,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,4BAA4B,CAAC,EAAE,CAAC;QACxD,MAAM,IAAI,KAAK,CACb,wFAAwF,CACzF,CAAC;IACJ,CAAC;IACD,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,sBAAsB,CAAC,EAAE,CAAC;QAClD,MAAM,IAAI,KAAK,CACb,0EAA0E,CAC3E,CAAC;IACJ,CAAC;IACD,OAAO,WAGN,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,eAAe,GAAG,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../../../src/cli/cli.ts"],"names":[],"mappings":";;;;AAEA,iDAAoE;AACpE,mCAA+B;AAC/B,2BAA6E;AAC7E,wDAAwB;AACxB,gGAA6F;AAC7F,yDAI4B;AAC5B,6DAA0D;AAE1D,MAAM,KAAK,GAAG;;;yCAG2B,CAAC;AAE1C,MAAM,aAAa,GAAG,CAAC,IAAc,EAAE,EAAE;IACvC,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IAC7C,IAAI,WAAW,KAAK,CAAC,CAAC;QAAE,OAAO,OAAO,CAAC,GAAG,EAAE,CAAC;IAC7C,MAAM,UAAU,GAAG,IAAI,CAAC,WAAW,GAAG,CAAC,CAAC,CAAC;IACzC,IAAI,CAAC,UAAU;QAAE,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;IAClE,OAAO,cAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;AAClC,CAAC,CAAC;AAEF,MAAM,UAAU,GAAG,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC;AAEpE,MAAM,yBAAyB,GAAG,CAAC,UAAkB,EAAE,EAAE;IACvD,MAAM,MAAM,GAAG,IAAA,yBAAS,EAAC,UAAU,EAAE,CAAC,SAAS,CAAC,EAAE;QAChD,GAAG,EAAE,UAAU;QACf,KAAK,EAAE,SAAS;KACjB,CAAC,CAAC;IACH,IAAI,MAAM,CAAC,KAAK;QAAE,MAAM,MAAM,CAAC,KAAK,CAAC;IACrC,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACxB,MAAM,IAAI,KAAK,CAAC,kCAAkC,MAAM,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC,CAAC;IAC1E,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,YAAY,GAAG,CAAC,UAAkB,EAAE,WAAoB,EAAE,EAAE;IAChE,IAAI,IAAA,eAAU,EAAC,UAAU,CAAC,IAAI,IAAA,gBAAW,EAAC,UAAU,CAAC,CAAC,MAAM,EAAE,CAAC;QAC7D,MAAM,IAAI,KAAK,CAAC,GAAG,UAAU,kCAAkC,CAAC,CAAC;IACnE,CAAC;IAED,MAAM,WAAW,GAAG,cAAI;SACrB,QAAQ,CAAC,UAAU,CAAC;SACpB,OAAO,CAAC,cAAc,EAAE,GAAG,CAAC;SAC5B,WAAW,EAAE,CAAC;IACjB,MAAM,QAAQ,GAAG,WAAW,IAAI,kBAAkB,CAAC;IACnD,IAAA,uCAAoB,EAAC,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC,CAAC;IAE/C,IAAI,WAAW,EAAE,CAAC;QAChB,OAAO,CAAC,GAAG,CACT,6BAA6B,UAAU,mGAAmG,CAC3I,CAAC;QACF,OAAO;IACT,CAAC;IAED,yBAAyB,CAAC,UAAU,CAAC,CAAC;IACtC,OAAO,CAAC,GAAG,CACT,wDAAwD,UAAU,kFAAkF,CACrJ,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,oBAAoB,GAAG,CAAC,UAAkB,EAAE,EAAE;IAClD,MAAM,eAAe,GAAG,cAAI,CAAC,IAAI,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;IACtD,OAAO,IAAA,eAAU,EAAC,eAAe,CAAC,CAAC,CAAC;QAChC,IAAA,cAAK,EAAC,IAAA,iBAAY,EAAC,eAAe,CAAC,CAAC;QACtC,CAAC,CAAC,EAAE,CAAC;AACT,CAAC,CAAC;AAEF,MAAM,wBAAwB,GAAG,CAAC,UAAkB,EAAE,EAAE;IACtD,MAAM,eAAe,GAAG,cAAI,CAAC,IAAI,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;IACtD,IAAI,CAAC,IAAA,eAAU,EAAC,eAAe,CAAC,EAAE,CAAC;QACjC,OAAO,CAAC,IAAI,CACV,kCAAkC,eAAe,+DAA+D,CACjH,CAAC;IACJ,CAAC;IAED,MAAM,WAAW,GAAG,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,GAAG,oBAAoB,CAAC,UAAU,CAAC,EAAE,CAAC;IAC5E,MAAM,QAAQ,GAAG,CAAC,KAAyB,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IACvE,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,4BAA4B,CAAC,EAAE,CAAC;QACxD,MAAM,IAAI,KAAK,CACb,wFAAwF,CACzF,CAAC;IACJ,CAAC;IACD,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,sBAAsB,CAAC,EAAE,CAAC;QAClD,MAAM,IAAI,KAAK,CACb,0EAA0E,CAC3E,CAAC;IACJ,CAAC;IACD,OAAO,WAGN,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,eAAe,GAAG,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC;AAEnE,MAAM,SAAS,GAAG,CAAC,UAAkB,EAAE,IAAkC,EAAE,EAAE,CAC3E,IAAA,qBAAK,EAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,eAAe,CAAC,EAAE;IACzC,GAAG,EAAE,UAAU;IACf,KAAK,EAAE,SAAS;IAChB,GAAG,EAAE;QACH,GAAG,oBAAoB,CAAC,UAAU,CAAC;QACnC,GAAG,OAAO,CAAC,GAAG;QACd,QAAQ,EAAE,IAAI;QACd,mBAAmB,EAAE,UAAU;KAChC;CACF,CAAC,CAAC;AAEL,MAAM,WAAW,GAAG,CAAC,UAAkB,EAAE,QAAoB,EAAE,EAAE;IAC/D,MAAM,QAAQ,GAA+B,EAAE,CAAC;IAChD,MAAM,KAAK,GAAG,CAAC,SAAiB,EAAE,EAAE;QAClC,QAAQ,CAAC,IAAI,CAAC,IAAA,UAAK,EAAC,SAAS,EAAE,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;QAClD,IAAA,gBAAW,EAAC,SAAS,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC;aAC5C,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,WAAW,EAAE,IAAI,KAAK,CAAC,IAAI,KAAK,cAAc,CAAC;aACvE,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACjE,CAAC,CAAC;IACF,KAAK,CAAC,cAAI,CAAC,IAAI,CAAC,UAAU,EAAE,gCAAa,CAAC,CAAC,CAAC;IAC5C,OAAO,GAAG,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC;AAC9D,CAAC,CAAC;AAEF,MAAM,GAAG,GAAG,KAAK,EAAE,UAAkB,EAAE,KAAc,EAAE,EAAE;IACvD,MAAM,WAAW,GAAG,wBAAwB,CAAC,UAAU,CAAC,CAAC;IACzD,IAAA,cAAS,EAAC,cAAI,CAAC,IAAI,CAAC,UAAU,EAAE,sCAAmB,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAC3E,MAAM,IAAA,uDAA0B,EAAC,UAAU,CAAC,CAAC;IAC7C,MAAM,IAAA,uCAAkB,EAAC,WAAW,CAAC,CAAC;IACtC,IAAI,MAAgC,CAAC;IACrC,IAAI,UAAU,GAAG,KAAK,CAAC;IACvB,MAAM,KAAK,GAAG,GAAG,EAAE;QACjB,MAAM,GAAG,SAAS,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC;QACrE,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE;YACnC,IAAI,CAAC,UAAU,IAAI,CAAC,IAAI,IAAI,MAAM,CAAC;gBAAE,OAAO,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC;QAC/D,CAAC,CAAC,CAAC;IACL,CAAC,CAAC;IACF,MAAM,IAAI,GAAG,KAAK,IAAI,EAAE;QACtB,MAAM,aAAa,GAAG,MAAM,CAAC;QAC7B,MAAM,GAAG,SAAS,CAAC;QACnB,IAAI,CAAC,aAAa,IAAI,aAAa,CAAC,MAAM;YAAE,OAAO;QACnD,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC9B,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IAC5E,CAAC,CAAC;IACF,KAAK,EAAE,CAAC;IAER,IAAI,aAAa,GAAG,SAAqC,CAAC;IAC1D,MAAM,OAAO,GAAG,GAAG,EAAE;QACnB,aAAa,EAAE,EAAE,CAAC;QAClB,KAAK,IAAI,EAAE,CAAC;IACd,CAAC,CAAC;IACF,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAChC,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAEjC,IAAI,CAAC,KAAK;QAAE,OAAO;IACnB,IAAI,KAAiC,CAAC;IACtC,MAAM,OAAO,GAAG,GAAG,EAAE;QACnB,IAAI,KAAK;YAAE,YAAY,CAAC,KAAK,CAAC,CAAC;QAC/B,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE;YACtB,KAAK,CAAC,KAAK,IAAI,EAAE;gBACf,IAAI,CAAC;oBACH,MAAM,IAAA,uDAA0B,EAAC,UAAU,CAAC,CAAC;oBAC7C,UAAU,GAAG,IAAI,CAAC;oBAClB,MAAM,IAAI,EAAE,CAAC;oBACb,UAAU,GAAG,KAAK,CAAC;oBACnB,KAAK,EAAE,CAAC;gBACV,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;gBACvB,CAAC;YACH,CAAC,CAAC,EAAE,CAAC;QACP,CAAC,EAAE,GAAG,CAAC,CAAC;IACV,CAAC,CAAC;IAEF,aAAa,GAAG,WAAW,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;AACnD,CAAC,CAAC;AAEF,MAAM,IAAI,GAAG,KAAK,IAAI,EAAE;IACtB,MAAM,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACjD,IAAI,OAAO,KAAK,QAAQ,EAAE,CAAC;QACzB,MAAM,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;QACvB,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC;YAAE,MAAM,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC;QAC9D,YAAY,CAAC,cAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC,CAAC;QACpE,OAAO;IACT,CAAC;IACD,IAAI,OAAO,KAAK,KAAK,IAAI,OAAO,KAAK,OAAO,EAAE,CAAC;QAC7C,MAAM,GAAG,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE,OAAO,KAAK,KAAK,CAAC,CAAC;QAClD,OAAO;IACT,CAAC;IACD,MAAM,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC;AACzB,CAAC,CAAC;AAEF,KAAK,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,KAAc,EAAE,EAAE;IACnC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IACrB,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;AACvB,CAAC,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getConnectionDetails.d.ts","sourceRoot":"","sources":["../../../../src/connectionUtils/getConnectionDetails.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AACnE,MAAM,MAAM,WAAW,GAAG,QAAQ,CAAC,iBAAiB,CAAC,aAAa,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;AAEhF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAGlE,MAAM,MAAM,iBAAiB,GAAG;IAC9B,GAAG,EAAE,OAAO,GAAG,IAAI,CAAC,UAAU,EAAE,qBAAqB,CAAC,CAAC;IACvD,gBAAgB,EAAE,MAAM,CAAC;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,uBAAuB,CAAC,EAAE,MAAM,CAAC;CAClC,CAAC;AAEF,eAAO,MAAM,oBAAoB,GAAI,GAAG,WAAW,KAAG,
|
|
1
|
+
{"version":3,"file":"getConnectionDetails.d.ts","sourceRoot":"","sources":["../../../../src/connectionUtils/getConnectionDetails.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AACnE,MAAM,MAAM,WAAW,GAAG,QAAQ,CAAC,iBAAiB,CAAC,aAAa,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;AAEhF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAGlE,MAAM,MAAM,iBAAiB,GAAG;IAC9B,GAAG,EAAE,OAAO,GAAG,IAAI,CAAC,UAAU,EAAE,qBAAqB,CAAC,CAAC;IACvD,gBAAgB,EAAE,MAAM,CAAC;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,uBAAuB,CAAC,EAAE,MAAM,CAAC;CAClC,CAAC;AAEF,eAAO,MAAM,oBAAoB,GAAI,GAAG,WAAW,KAAG,iBAgFrD,CAAC"}
|
|
@@ -20,19 +20,33 @@ const getConnectionDetails = (c) => {
|
|
|
20
20
|
: undefined;
|
|
21
21
|
const default_application_name = "";
|
|
22
22
|
if (c.type === "Connection URI") {
|
|
23
|
-
const
|
|
24
|
-
|
|
25
|
-
|
|
23
|
+
const connectionUri = c.db_conn ?? "";
|
|
24
|
+
/**
|
|
25
|
+
* Parse the query separately because `connection-string` treats unescaped
|
|
26
|
+
* slashes in values as path separators. PostgreSQL commonly uses them in
|
|
27
|
+
* Unix-socket URLs such as `?host=/var/run/postgresql`.
|
|
28
|
+
*/
|
|
29
|
+
const queryStart = connectionUri.indexOf("?");
|
|
30
|
+
const cs = new connection_string_1.ConnectionString(queryStart === -1 ? connectionUri : connectionUri.slice(0, queryStart));
|
|
31
|
+
const params = queryStart === -1 ?
|
|
32
|
+
{}
|
|
33
|
+
: Object.fromEntries(new URLSearchParams(connectionUri.slice(queryStart + 1)).entries());
|
|
34
|
+
const { sslmode, host, port, application_name = default_application_name, connect_timeout = 10, } = params;
|
|
35
|
+
const parsedPort = Number(port);
|
|
36
|
+
const parsedConnectTimeout = Number(connect_timeout);
|
|
26
37
|
const conn = {
|
|
27
38
|
application_name,
|
|
28
|
-
host: cs.hosts[0]
|
|
29
|
-
port: cs.hosts[0]
|
|
39
|
+
host: cs.hosts?.[0]?.name ?? host ?? c.db_host,
|
|
40
|
+
port: cs.hosts?.[0]?.port ??
|
|
41
|
+
(Number.isFinite(parsedPort) && parsedPort > 0 ?
|
|
42
|
+
parsedPort
|
|
43
|
+
: c.db_port),
|
|
30
44
|
user: cs.user,
|
|
31
45
|
password: cs.password,
|
|
32
46
|
database: cs.path[0],
|
|
33
47
|
ssl: getSSLOpts(sslmode) ?? false,
|
|
34
|
-
...(Number.isFinite(
|
|
35
|
-
connectionTimeoutMillis: Math.ceil(
|
|
48
|
+
...(Number.isFinite(parsedConnectTimeout) && {
|
|
49
|
+
connectionTimeoutMillis: Math.ceil(parsedConnectTimeout) * 1000,
|
|
36
50
|
}),
|
|
37
51
|
};
|
|
38
52
|
return conn;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getConnectionDetails.js","sourceRoot":"","sources":["../../../../src/connectionUtils/getConnectionDetails.ts"],"names":[],"mappings":";;;AAEA,yDAAqD;AAe9C,MAAM,oBAAoB,GAAG,CAAC,CAAc,EAAqB,EAAE;IACxE;;;OAGG;IACH,MAAM,UAAU,GAAG,CACjB,OAA8B,EACe,EAAE,CAC/C,OAAO,KAAK,SAAS,CAAC,CAAC;QACrB;YACE,EAAE,EAAE,CAAC,CAAC,eAAe,IAAI,SAAS;YAClC,IAAI,EAAE,CAAC,CAAC,sBAAsB,IAAI,SAAS;YAC3C,GAAG,EAAE,CAAC,CAAC,0BAA0B,IAAI,SAAS;YAC9C,kBAAkB,EAChB,CAAC,CAAC,uBAAuB;gBACzB,CAAC,CAAC,OAAO,KAAK,SAAS,IAAI,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC;oBAC7C,OAAO,KAAK,WAAW;oBACvB,OAAO,KAAK,aAAa,CAAC;SAC/B;QACH,CAAC,CAAC,SAAS,CAAC;IAEd,MAAM,wBAAwB,GAAG,EAAE,CAAC;IAEpC,IAAI,CAAC,CAAC,IAAI,KAAK,gBAAgB,EAAE,CAAC;QAChC,MAAM,EAAE,GAAG,IAAI,oCAAgB,CAAC,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"getConnectionDetails.js","sourceRoot":"","sources":["../../../../src/connectionUtils/getConnectionDetails.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"getConnectionDetails.spec.d.ts","sourceRoot":"","sources":["../../../../src/connectionUtils/getConnectionDetails.spec.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const assert_1 = require("assert");
|
|
4
|
+
const node_test_1 = require("node:test");
|
|
5
|
+
const getConnectionDetails_1 = require("./getConnectionDetails");
|
|
6
|
+
const getDetails = (db_conn) => (0, getConnectionDetails_1.getConnectionDetails)({
|
|
7
|
+
type: "Connection URI",
|
|
8
|
+
db_conn,
|
|
9
|
+
db_host: "fallback-host",
|
|
10
|
+
db_port: 5432,
|
|
11
|
+
});
|
|
12
|
+
void (0, node_test_1.test)("parses a PostgreSQL Unix-socket URI with an unescaped host query parameter", () => {
|
|
13
|
+
const details = getDetails("postgresql://socket_user:secret@/socket_db?host=/var/run/postgresql&sslmode=disable");
|
|
14
|
+
assert_1.strict.equal(details.host, "/var/run/postgresql");
|
|
15
|
+
assert_1.strict.equal(details.port, 5432);
|
|
16
|
+
assert_1.strict.equal(details.user, "socket_user");
|
|
17
|
+
assert_1.strict.equal(details.password, "secret");
|
|
18
|
+
assert_1.strict.equal(details.database, "socket_db");
|
|
19
|
+
});
|
|
20
|
+
void (0, node_test_1.test)("parses a PostgreSQL Unix-socket URI with an encoded host query parameter", () => {
|
|
21
|
+
const details = getDetails("postgresql://socket_user:secret@/socket_db?host=%2Fvar%2Frun%2Fpostgresql&port=5433&sslmode=disable");
|
|
22
|
+
assert_1.strict.equal(details.host, "/var/run/postgresql");
|
|
23
|
+
assert_1.strict.equal(details.port, 5433);
|
|
24
|
+
});
|
|
25
|
+
//# sourceMappingURL=getConnectionDetails.spec.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"getConnectionDetails.spec.js","sourceRoot":"","sources":["../../../../src/connectionUtils/getConnectionDetails.spec.ts"],"names":[],"mappings":";;AAAA,mCAAgC;AAChC,yCAAiC;AACjC,iEAAgF;AAEhF,MAAM,UAAU,GAAG,CAAC,OAAe,EAAE,EAAE,CACrC,IAAA,2CAAoB,EAAC;IACnB,IAAI,EAAE,gBAAgB;IACtB,OAAO;IACP,OAAO,EAAE,eAAe;IACxB,OAAO,EAAE,IAAI;CACC,CAAC,CAAC;AAEpB,KAAK,IAAA,gBAAI,EAAC,4EAA4E,EAAE,GAAG,EAAE;IAC3F,MAAM,OAAO,GAAG,UAAU,CACxB,qFAAqF,CACtF,CAAC;IAEF,eAAM,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,qBAAqB,CAAC,CAAC;IAClD,eAAM,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IACjC,eAAM,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;IAC1C,eAAM,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IACzC,eAAM,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;AAC9C,CAAC,CAAC,CAAC;AAEH,KAAK,IAAA,gBAAI,EAAC,0EAA0E,EAAE,GAAG,EAAE;IACzF,MAAM,OAAO,GAAG,UAAU,CACxB,qGAAqG,CACtG,CAAC;IAEF,eAAM,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,qBAAqB,CAAC,CAAC;IAClD,eAAM,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;AACnC,CAAC,CAAC,CAAC"}
|
package/package.json
CHANGED