@prostgles/prostgles 2.3.6-dev.1787250929 → 2.3.6-dev.1787262189

package/dist/server/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@prostgles/prostgles",
-    "version": "2.3.6-dev.1787250929",
+    "version": "2.3.6-dev.1787262189",
     "description": "Prostgles UI runtime and configurable PostgreSQL dashboard",
     "main": "dist/server/src/schemaConfig.js",
     "bin": {

package/dist/server/src/connectionUtils/getConnectionDetails.d.ts.map

@@ -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,iBA0DrD,CAAC"}
+{"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"}

package/dist/server/src/connectionUtils/getConnectionDetails.js

@@ -20,19 +20,33 @@ const getConnectionDetails = (c) => {
         : undefined;
     const default_application_name = "";
     if (c.type === "Connection URI") {
-        const cs = new connection_string_1.ConnectionString(c.db_conn);
-        const params = cs.params ?? {};
-        const { sslmode, application_name = default_application_name, connect_timeout = 10, } = params;
+        const connectionUri = c.db_conn ?? "";
+        /**
+         * Parse the query separately because `connection-string` treats unescaped
+         * slashes in values as path separators. PostgreSQL commonly uses them in
+         * Unix-socket URLs such as `?host=/var/run/postgresql`.
+         */
+        const queryStart = connectionUri.indexOf("?");
+        const cs = new connection_string_1.ConnectionString(queryStart === -1 ? connectionUri : connectionUri.slice(0, queryStart));
+        const params = queryStart === -1 ?
+            {}
+            : Object.fromEntries(new URLSearchParams(connectionUri.slice(queryStart + 1)).entries());
+        const { sslmode, host, port, application_name = default_application_name, connect_timeout = 10, } = params;
+        const parsedPort = Number(port);
+        const parsedConnectTimeout = Number(connect_timeout);
         const conn = {
             application_name,
-            host: cs.hosts[0].name ?? c.db_host, // fallback to db_host for pg_dump state_db
-            port: cs.hosts[0].port,
+            host: cs.hosts?.[0]?.name ?? host ?? c.db_host,
+            port: cs.hosts?.[0]?.port ??
+                (Number.isFinite(parsedPort) && parsedPort > 0 ?
+                    parsedPort
+                    : c.db_port),
             user: cs.user,
             password: cs.password,
             database: cs.path[0],
             ssl: getSSLOpts(sslmode) ?? false,
-            ...(Number.isFinite(connect_timeout) && {
-                connectionTimeoutMillis: Math.ceil(connect_timeout) * 1000,
+            ...(Number.isFinite(parsedConnectTimeout) && {
+                connectionTimeoutMillis: Math.ceil(parsedConnectTimeout) * 1000,
             }),
         };
         return conn;

package/dist/server/src/connectionUtils/getConnectionDetails.js.map

@@ -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,OAAO,CAAC,CAAC;QAC3C,MAAM,MAAM,GAAG,EAAE,CAAC,MAAM,IAAI,EAAE,CAAC;QAC/B,MAAM,EACJ,OAAO,EACP,gBAAgB,GAAG,wBAAwB,EAC3C,eAAe,GAAG,EAAE,GACrB,GAAG,MAAM,CAAC;QACX,MAAM,IAAI,GAAG;YACX,gBAAgB;YAChB,IAAI,EAAE,EAAE,CAAC,KAAM,CAAC,CAAC,CAAE,CAAC,IAAI,IAAI,CAAC,CAAC,OAAO,EAAE,2CAA2C;YAClF,IAAI,EAAE,EAAE,CAAC,KAAM,CAAC,CAAC,CAAE,CAAC,IAAK;YACzB,IAAI,EAAE,EAAE,CAAC,IAAK;YACd,QAAQ,EAAE,EAAE,CAAC,QAAS;YACtB,QAAQ,EAAE,EAAE,CAAC,IAAK,CAAC,CAAC,CAAE;YACtB,GAAG,EAAE,UAAU,CAAC,OAAO,CAAC,IAAI,KAAK;YACjC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,eAAe,CAAC,IAAI;gBACtC,uBAAuB,EAAE,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,GAAG,IAAI;aAC3D,CAAC;SACH,CAAC;QACF,OAAO,IAAI,CAAC;IACd,CAAC;IACD,MAAM,IAAI,GAAG;QACX,gBAAgB,EAAE,wBAAwB;QAC1C,QAAQ,EAAE,CAAC,CAAC,OAAO;QACnB,IAAI,EAAE,CAAC,CAAC,OAAO;QACf,QAAQ,EAAE,CAAC,CAAC,OAAQ;QACpB,IAAI,EAAE,CAAC,CAAC,OAAO;QACf,IAAI,EAAE,CAAC,CAAC,OAAO;QACf,GAAG,EAAE,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,KAAK;QAClC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,qBAAqB,CAAC,IAAI;YAC9C,uBAAuB,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,qBAAsB,CAAC;SAC7D,CAAC;KACH,CAAC;IACF,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AA1DW,QAAA,oBAAoB,wBA0D/B"}
+{"version":3,"file":"getConnectionDetails.js","sourceRoot":"","sources":["../../../../src/connectionUtils/getConnectionDetails.ts"],"names":[],"mappings":"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"}

package/dist/server/src/connectionUtils/getConnectionDetails.spec.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=getConnectionDetails.spec.d.ts.map

package/dist/server/src/connectionUtils/getConnectionDetails.spec.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"getConnectionDetails.spec.d.ts","sourceRoot":"","sources":["../../../../src/connectionUtils/getConnectionDetails.spec.ts"],"names":[],"mappings":""}

package/dist/server/src/connectionUtils/getConnectionDetails.spec.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const assert_1 = require("assert");
+const node_test_1 = require("node:test");
+const getConnectionDetails_1 = require("./getConnectionDetails");
+const getDetails = (db_conn) => (0, getConnectionDetails_1.getConnectionDetails)({
+    type: "Connection URI",
+    db_conn,
+    db_host: "fallback-host",
+    db_port: 5432,
+});
+void (0, node_test_1.test)("parses a PostgreSQL Unix-socket URI with an unescaped host query parameter", () => {
+    const details = getDetails("postgresql://socket_user:secret@/socket_db?host=/var/run/postgresql&sslmode=disable");
+    assert_1.strict.equal(details.host, "/var/run/postgresql");
+    assert_1.strict.equal(details.port, 5432);
+    assert_1.strict.equal(details.user, "socket_user");
+    assert_1.strict.equal(details.password, "secret");
+    assert_1.strict.equal(details.database, "socket_db");
+});
+void (0, node_test_1.test)("parses a PostgreSQL Unix-socket URI with an encoded host query parameter", () => {
+    const details = getDetails("postgresql://socket_user:secret@/socket_db?host=%2Fvar%2Frun%2Fpostgresql&port=5433&sslmode=disable");
+    assert_1.strict.equal(details.host, "/var/run/postgresql");
+    assert_1.strict.equal(details.port, 5433);
+});
+//# sourceMappingURL=getConnectionDetails.spec.js.map

package/dist/server/src/connectionUtils/getConnectionDetails.spec.js.map

@@ -0,0 +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

@@ -1,6 +1,6 @@
 {
   "name": "@prostgles/prostgles",
-  "version": "2.3.6-dev.1787250929",
+  "version": "2.3.6-dev.1787262189",
   "description": "Prostgles UI runtime and configurable PostgreSQL dashboard",
   "main": "dist/server/src/schemaConfig.js",
   "bin": {