@prostgles/prostgles 2.3.6-dev.1787342906 → 2.3.6-dev.1787353201
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/server/package.json +2 -2
- package/dist/server/src/ConnectionManager/getConnectionHttpServer.d.ts.map +1 -1
- package/dist/server/src/ConnectionManager/getConnectionHttpServer.js +6 -0
- package/dist/server/src/ConnectionManager/getConnectionHttpServer.js.map +1 -1
- package/dist/server/src/ConnectionManager/getHotReloadConfigs.d.ts.map +1 -1
- package/dist/server/src/ConnectionManager/getHotReloadConfigs.js +2 -2
- package/dist/server/src/ConnectionManager/getHotReloadConfigs.js.map +1 -1
- package/dist/server/src/ConnectionManager/initConnectionManager.d.ts.map +1 -1
- package/dist/server/src/ConnectionManager/initConnectionManager.js +11 -1
- package/dist/server/src/ConnectionManager/initConnectionManager.js.map +1 -1
- package/dist/server/src/createHttpAndIOServers/getCorsOptions.d.ts.map +1 -1
- package/dist/server/src/createHttpAndIOServers/getCorsOptions.js +2 -1
- package/dist/server/src/createHttpAndIOServers/getCorsOptions.js.map +1 -1
- package/dist/server/src/createHttpAndIOServers/getCorsOptions.spec.d.ts +2 -0
- package/dist/server/src/createHttpAndIOServers/getCorsOptions.spec.d.ts.map +1 -0
- package/dist/server/src/createHttpAndIOServers/getCorsOptions.spec.js +42 -0
- package/dist/server/src/createHttpAndIOServers/getCorsOptions.spec.js.map +1 -0
- package/dist/server/src/tableHooks/llm_credentials.tableHooks.d.ts +1 -1
- package/dist/server/src/tableHooks/tableHooks.d.ts +1 -1
- package/package.json +2 -2
package/dist/server/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@prostgles/prostgles",
|
|
3
|
-
"version": "2.3.6-dev.
|
|
3
|
+
"version": "2.3.6-dev.1787353201",
|
|
4
4
|
"description": "Prostgles UI runtime and configurable PostgreSQL dashboard",
|
|
5
5
|
"main": "dist/server/src/schemaConfig.js",
|
|
6
6
|
"bin": {
|
|
@@ -56,7 +56,7 @@
|
|
|
56
56
|
"pg": "^8.23.0",
|
|
57
57
|
"pidusage": "^4.0.1",
|
|
58
58
|
"prostgles-client": "^4.0.386",
|
|
59
|
-
"prostgles-server": "^4.2.
|
|
59
|
+
"prostgles-server": "^4.2.602",
|
|
60
60
|
"qrcode": "^1.5.4",
|
|
61
61
|
"simple-git": "^3.36.0",
|
|
62
62
|
"smtp-server": "^3.19.3",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getConnectionHttpServer.d.ts","sourceRoot":"","sources":["../../../../src/ConnectionManager/getConnectionHttpServer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"getConnectionHttpServer.d.ts","sourceRoot":"","sources":["../../../../src/ConnectionManager/getConnectionHttpServer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAKtD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAC7D,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,uBAAuB,CAAC;AAE3E,wBAAgB,uBAAuB,CACrC,IAAI,EAAE,iBAAiB,EACvB,EACE,UAAU,EACV,cAAc,EACd,UAAU,GACX,EAAE;IACD,UAAU,EAAE,6BAA6B,CAAC;IAC1C,cAAc,EAAE,SAAS,CAAC,kBAAkB,CAAC,CAAC;IAC9C,UAAU,EAAE,MAAM,CAAC;CACpB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA4GF"}
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.getConnectionHttpServer = getConnectionHttpServer;
|
|
4
4
|
const createHttpServer_1 = require("../createHttpAndIOServers/createHttpServer");
|
|
5
5
|
const createIOWebsocketServer_1 = require("../createHttpAndIOServers/createIOWebsocketServer");
|
|
6
|
+
const setHttpAppSecurity_1 = require("../createHttpAndIOServers/setHttpAppSecurity");
|
|
6
7
|
const prostgles_types_1 = require("prostgles-types");
|
|
7
8
|
function getConnectionHttpServer({ connection, databaseConfig, socketPath, }) {
|
|
8
9
|
const { id: connectionId, is_state_db, port, web_app_directory, web_app_templated, id, } = connection;
|
|
@@ -41,6 +42,11 @@ function getConnectionHttpServer({ connection, databaseConfig, socketPath, }) {
|
|
|
41
42
|
return existingServer;
|
|
42
43
|
}
|
|
43
44
|
}
|
|
45
|
+
if (!is_state_db &&
|
|
46
|
+
!port &&
|
|
47
|
+
databaseConfig.config_sync?.type === "cli") {
|
|
48
|
+
(0, setHttpAppSecurity_1.setHttpAppSecurity)(app, databaseConfig, connection, this.dbsServer.port, this.connectionPorts);
|
|
49
|
+
}
|
|
44
50
|
const newServer = is_state_db || !port ?
|
|
45
51
|
{
|
|
46
52
|
type: "reusing_main_server",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getConnectionHttpServer.js","sourceRoot":"","sources":["../../../../src/ConnectionManager/getConnectionHttpServer.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"getConnectionHttpServer.js","sourceRoot":"","sources":["../../../../src/ConnectionManager/getConnectionHttpServer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getHotReloadConfigs.d.ts","sourceRoot":"","sources":["../../../../src/ConnectionManager/getHotReloadConfigs.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,iCAAiC,CAAC;AAC1D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AAC5E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,4BAA4B,CAAC;AACxD,OAAO,KAAK,EAAE,WAAW,EAAE,GAAG,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAIlE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAG7D,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,yBAAyB,CAAC;AAE7E,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AAE3D,OAAO,KAAK,EAAE,yBAAyB,EAAe,MAAM,kBAAkB,CAAC;AAI/E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAE1D,MAAM,MAAM,sBAAsB,GAAG,qBAAqB,CACxD,IAAI,CACF,gBAAgB,CAAC,IAAI,EAAE,KAAK,EAAE,gBAAgB,CAAC,EAC7C,WAAW,GACX,SAAS,GACT,cAAc,GACd,MAAM,GACN,IAAI,GACJ,aAAa,GACb,YAAY,GACZ,WAAW,GACX,qBAAqB,GACrB,+BAA+B,GAC/B,oBAAoB,CACvB,CACF,CAAC;AAEF,MAAM,MAAM,6BAA6B,GAAG,IAAI,CAC9C,WAAW,EACX,CAAC,OAAO,6BAA6B,CAAC,CAAC,MAAM,CAAC,CAC/C,CAAC;AAgBF,eAAO,MAAM,mBAAmB,GAAU,oFAOvC;IACD,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,UAAU,EAAE,6BAA6B,CAAC;IAC1C,cAAc,EAAE,eAAe,CAAC;IAChC,mBAAmB,EAAE,eAAe,CAAC;IACrC,GAAG,EAAE,GAAG,CAAC;IACT,IAAI,EAAE,EAAE,CAAC;CACV;;;;;;;;;;;;;;;;qBAhEoD,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"getHotReloadConfigs.d.ts","sourceRoot":"","sources":["../../../../src/ConnectionManager/getHotReloadConfigs.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,iCAAiC,CAAC;AAC1D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AAC5E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,4BAA4B,CAAC;AACxD,OAAO,KAAK,EAAE,WAAW,EAAE,GAAG,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAIlE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAG7D,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,yBAAyB,CAAC;AAE7E,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AAE3D,OAAO,KAAK,EAAE,yBAAyB,EAAe,MAAM,kBAAkB,CAAC;AAI/E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAE1D,MAAM,MAAM,sBAAsB,GAAG,qBAAqB,CACxD,IAAI,CACF,gBAAgB,CAAC,IAAI,EAAE,KAAK,EAAE,gBAAgB,CAAC,EAC7C,WAAW,GACX,SAAS,GACT,cAAc,GACd,MAAM,GACN,IAAI,GACJ,aAAa,GACb,YAAY,GACZ,WAAW,GACX,qBAAqB,GACrB,+BAA+B,GAC/B,oBAAoB,CACvB,CACF,CAAC;AAEF,MAAM,MAAM,6BAA6B,GAAG,IAAI,CAC9C,WAAW,EACX,CAAC,OAAO,6BAA6B,CAAC,CAAC,MAAM,CAAC,CAC/C,CAAC;AAgBF,eAAO,MAAM,mBAAmB,GAAU,oFAOvC;IACD,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,UAAU,EAAE,6BAA6B,CAAC;IAC1C,cAAc,EAAE,eAAe,CAAC;IAChC,mBAAmB,EAAE,eAAe,CAAC;IACrC,GAAG,EAAE,GAAG,CAAC;IACT,IAAI,EAAE,EAAE,CAAC;CACV;;;;;;;;;;;;;;;;qBAhEoD,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;6BAmKmqR,CAAC;;;;;;;;;;;;;;;;;;;oCAAj/C,CAAC;;;;oCAA4E,CAAC;;;;;;;;;0BAAqI,CAAC;;;;;;;;;;;;kCAAkL,CAAC;uCAA2B,CAAC;;;;;mCAAmG,CAAC;;;;;;;;;;;mCAA+M,CAAC;;;;;;;;iCAAkK,CAAC;iCAAoB,CAAC;iCAAoB,CAAC;mCAAsB,CAAC;;;;iCAA0E,CAAC;iCAAoB,CAAC;iCAAoB,CAAC;mCAAsB,CAAC;;gCAA8B,CAAC;iCAAc,CAAC;iCAAoB,CAAC;iCAAoB,CAAC;mCAAsB,CAAC;;;;;;;;;;;;;;;;;;;;;6BAA7T,CAAC;6BAAoB,CAAC;6BAAoB,CAAC;+BAAsB,CAAC;;;;6BAA0E,CAAC;6BAAoB,CAAC;6BAAoB,CAAC;+BAAsB,CAAC;;;6BAA6C,CAAC;6BAAoB,CAAC;6BAAoB,CAAC;+BAAsB,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;gCAAtrC,CAAC;;;;gCAA4E,CAAC;;;;;;;;;;;;;;;;;;;;;8BAAwT,CAAC;mCAA2B,CAAC;;;;;+BAAmG,CAAC;;;;;;;;;;;+BAA+M,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAD/7P,CAAC"}
|
|
@@ -34,8 +34,8 @@ const getHotReloadConfigs = async ({ dbs, _dbs, connection, databaseConfig, conn
|
|
|
34
34
|
};
|
|
35
35
|
const { socketPath, socketUrl } = (0, getConnectionSocketPath_1.getConnectionSocketPath)(connection);
|
|
36
36
|
const connectionServers = connectionManager.getConnectionHttpServer({
|
|
37
|
-
connection,
|
|
38
|
-
databaseConfig,
|
|
37
|
+
connection: configuredConnection,
|
|
38
|
+
databaseConfig: configuredDatabaseConfig,
|
|
39
39
|
socketPath,
|
|
40
40
|
});
|
|
41
41
|
const { app } = connectionServers;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getHotReloadConfigs.js","sourceRoot":"","sources":["../../../../src/ConnectionManager/getHotReloadConfigs.ts"],"names":[],"mappings":";;;AAAA,6FAA+E;AAK/E,qEAA4D;AAC5D,2DAAwD;AACxD,uEAAoE;AAEpE,+BAA4B;AAC5B,iFAA8E;AAE9E,yDAAsD;AAEtD,6DAA0D;AAE1D,uDAAoD;AACpD,2CAA0C;AAC1C,gEAA+E;AAyB/E,MAAM,cAAc,GAAG,CACrB,eAEa,EACb,mBAA6E,EACnB,EAAE;IAC5D,IAAI,CAAC,eAAe;QAAE,OAAO,mBAAmB,CAAC;IACjD,OAAO;QACL,GAAG,eAAe;QAClB,yEAAyE;QACzE,GAAG,mBAAmB;KACqC,CAAC;AAChE,CAAC,CAAC;AAEK,MAAM,mBAAmB,GAAG,KAAK,EAAE,EACxC,GAAG,EACH,IAAI,EACJ,UAAU,EACV,cAAc,EACd,iBAAiB,EACjB,mBAAmB,GAQpB,EAAE,EAAE;IACH,MAAM,kBAAkB,GAAG,IAAA,iCAAe,EAAC,cAAc,CAAC,WAAW,CAAC,CAAC;IACvE,MAAM,YAAY,GAAG,kBAAkB,EAAE,MAAM,CAAC;IAChD,MAAM,oBAAoB,GAAG;QAC3B,GAAG,UAAU;QACb,GAAG,YAAY,EAAE,UAAU;KAC5B,CAAC;IACF,MAAM,wBAAwB,GAAG;QAC/B,GAAG,cAAc;QACjB,GAAG,YAAY,EAAE,cAAc;KAChC,CAAC;IACF,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,GAAG,IAAA,iDAAuB,EAAC,UAAU,CAAC,CAAC;IACtE,MAAM,iBAAiB,GAAG,iBAAiB,CAAC,uBAAuB,CAAC;QAClE,UAAU;
|
|
1
|
+
{"version":3,"file":"getHotReloadConfigs.js","sourceRoot":"","sources":["../../../../src/ConnectionManager/getHotReloadConfigs.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"initConnectionManager.d.ts","sourceRoot":"","sources":["../../../../src/ConnectionManager/initConnectionManager.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,iCAAiC,CAAC;AAE1D,OAAO,EAAE,KAAK,GAAG,EAAE,MAAM,UAAU,CAAC;AACpC,OAAO,EAAE,KAAK,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"initConnectionManager.d.ts","sourceRoot":"","sources":["../../../../src/ConnectionManager/initConnectionManager.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,iCAAiC,CAAC;AAE1D,OAAO,EAAE,KAAK,GAAG,EAAE,MAAM,UAAU,CAAC;AACpC,OAAO,EAAE,KAAK,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAO7D,eAAO,MAAM,6BAA6B,kNAesB,CAAC;AAEjE,wBAAsB,qBAAqB,CACzC,IAAI,EAAE,iBAAiB,EACvB,GAAG,EAAE,GAAG,EACR,EAAE,EAAE,EAAE,iBA8HP"}
|
|
@@ -6,6 +6,7 @@ const utils_1 = require("../../../common/utils");
|
|
|
6
6
|
const setHttpAppSecurity_1 = require("../createHttpAndIOServers/setHttpAppSecurity");
|
|
7
7
|
const prostgles_types_1 = require("prostgles-types");
|
|
8
8
|
const getHotReloadConfigs_1 = require("./getHotReloadConfigs");
|
|
9
|
+
const getSchemaConfig_1 = require("./getSchemaConfig");
|
|
9
10
|
const saveCertificates_1 = require("./saveCertificates");
|
|
10
11
|
const startConnectionOnRequestHandler_1 = require("./startConnectionOnRequestHandler");
|
|
11
12
|
exports.CONNECTION_HOT_RELOAD_COLUMNS = [
|
|
@@ -68,6 +69,15 @@ async function initConnectionManager(dbs, db) {
|
|
|
68
69
|
const stateDatabaseConfig = dbConfigs.find((dc) => dc.connections.some((c) => c.is_state_db));
|
|
69
70
|
for (const databaseConfig of dbConfigs) {
|
|
70
71
|
for (const connectionPartialItem of databaseConfig.connections) {
|
|
72
|
+
const schemaConfig = (0, getSchemaConfig_1.getSchemaConfig)(databaseConfig.config_sync)?.config;
|
|
73
|
+
const configuredDatabaseConfig = {
|
|
74
|
+
...databaseConfig,
|
|
75
|
+
...schemaConfig?.databaseConfig,
|
|
76
|
+
};
|
|
77
|
+
const configuredConnection = {
|
|
78
|
+
...connectionPartialItem,
|
|
79
|
+
...schemaConfig?.connection,
|
|
80
|
+
};
|
|
71
81
|
const prglCon = this.getActiveConnectionSilentFail(connectionPartialItem.id);
|
|
72
82
|
const stateConnectionPort = stateDatabaseConfig?.connections
|
|
73
83
|
.map((c) => c.port || undefined)
|
|
@@ -75,7 +85,7 @@ async function initConnectionManager(dbs, db) {
|
|
|
75
85
|
const { is_state_db } = connectionPartialItem;
|
|
76
86
|
const app = is_state_db ? this.dbsServer.app : prglCon?.app;
|
|
77
87
|
if (app && stateDatabaseConfig && stateConnectionPort) {
|
|
78
|
-
(0, setHttpAppSecurity_1.setHttpAppSecurity)(app,
|
|
88
|
+
(0, setHttpAppSecurity_1.setHttpAppSecurity)(app, configuredDatabaseConfig, configuredConnection, stateConnectionPort, this.connectionPorts);
|
|
79
89
|
}
|
|
80
90
|
if (stateDatabaseConfig &&
|
|
81
91
|
prglCon?.prgl &&
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"initConnectionManager.js","sourceRoot":"","sources":["../../../../src/ConnectionManager/initConnectionManager.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"initConnectionManager.js","sourceRoot":"","sources":["../../../../src/ConnectionManager/initConnectionManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getCorsOptions.d.ts","sourceRoot":"","sources":["../../../../src/createHttpAndIOServers/getCorsOptions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEtD,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAE7B,eAAO,MAAM,cAAc,GACzB,mDAGG,IAAI,CAAC,SAAS,CAAC,kBAAkB,CAAC,EAAE,MAAM,GAAG,0BAA0B,CAAC,EAC3E,uBAAuB,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,EAAE,MAAM,GAAG,aAAa,CAAC,EAC7E,cAAc,MAAM,
|
|
1
|
+
{"version":3,"file":"getCorsOptions.d.ts","sourceRoot":"","sources":["../../../../src/createHttpAndIOServers/getCorsOptions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEtD,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAE7B,eAAO,MAAM,cAAc,GACzB,mDAGG,IAAI,CAAC,SAAS,CAAC,kBAAkB,CAAC,EAAE,MAAM,GAAG,0BAA0B,CAAC,EAC3E,uBAAuB,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,EAAE,MAAM,GAAG,aAAa,CAAC,EAC7E,cAAc,MAAM,qBAsDrB,CAAC"}
|
|
@@ -33,7 +33,8 @@ const getCorsOptions = ({ cors: corsSettings, cors_csp_devmode_enabled, }, { is_
|
|
|
33
33
|
}
|
|
34
34
|
}
|
|
35
35
|
}
|
|
36
|
-
if (allowedOrigins.includes(
|
|
36
|
+
if (allowedOrigins.includes("*") ||
|
|
37
|
+
allowedOrigins.includes(requestedOrigin)) {
|
|
37
38
|
return cb(null, true);
|
|
38
39
|
}
|
|
39
40
|
console.error(`CORS policy: Origin ${requestedOrigin} blocked`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getCorsOptions.js","sourceRoot":"","sources":["../../../../src/createHttpAndIOServers/getCorsOptions.ts"],"names":[],"mappings":";;;AACA,qDAA2C;AAE3C,wDAAwD;AACjD,MAAM,cAAc,GAAG,CAC5B,EACE,IAAI,EAAE,YAAY,EAClB,wBAAwB,GACiD,EAC3E,EAAE,WAAW,EAAE,IAAI,EAA0D,EAC7E,YAAoB,EACpB,EAAE;IACF,MAAM,WAAW,GAAqB;QACpC,GAAG,CAAC,YAAY,IAAI,IAAA,0BAAQ,EAAC,YAAY,EAAE,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC,CAAC;QAC1E;;WAEG;QACH,WAAW,EACT,CAAC,WAAW,IAAI,wBAAwB,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAChD,YAAY,EAAE,kBAAkB,CACjC;QACH,MAAM,EAAE,CAAC,eAAe,EAAE,EAAE,EAAE,EAAE;YAC9B,IAAI,CAAC,eAAe,EAAE,CAAC;gBACrB,oCAAoC;gBACpC,OAAO,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YACxB,CAAC;YAED,MAAM,cAAc,GAAG,CAAC,GAAG,CAAC,YAAY,EAAE,cAAc,IAAI,EAAE,CAAC,CAAC,CAAC;YACjE,MAAM,OAAO,GAAG,IAAA,kCAAiB,GAAE,CAAC;YACpC,IAAI,OAAO,EAAE,UAAU,EAAE,CAAC;gBACxB,cAAc,CAAC,IAAI,CAAC,oBAAoB,OAAO,CAAC,IAAI,IAAI,IAAI,EAAE,CAAC,CAAC;gBAChE,cAAc,CAAC,IAAI,CAAC,oBAAoB,OAAO,CAAC,IAAI,IAAI,IAAI,EAAE,CAAC,CAAC;YAClE,CAAC;YACD,IAAI,wBAAwB,EAAE,CAAC;gBAC7B,cAAc,CAAC,IAAI,CAAC,oBAAoB,YAAY,EAAE,CAAC,CAAC;gBACxD,cAAc,CAAC,IAAI,CAAC,oBAAoB,YAAY,EAAE,CAAC,CAAC;gBACxD,IAAI,CAAC,WAAW,EAAE,CAAC;oBACjB,cAAc,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;oBAC7C,cAAc,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;oBAC7C,IAAI,IAAI,EAAE,CAAC;wBACT,cAAc,CAAC,IAAI,CAAC,oBAAoB,IAAI,EAAE,CAAC,CAAC;wBAChD,cAAc,CAAC,IAAI,CAAC,oBAAoB,IAAI,EAAE,CAAC,CAAC;oBAClD,CAAC;gBACH,CAAC;YACH,CAAC;YACD,
|
|
1
|
+
{"version":3,"file":"getCorsOptions.js","sourceRoot":"","sources":["../../../../src/createHttpAndIOServers/getCorsOptions.ts"],"names":[],"mappings":";;;AACA,qDAA2C;AAE3C,wDAAwD;AACjD,MAAM,cAAc,GAAG,CAC5B,EACE,IAAI,EAAE,YAAY,EAClB,wBAAwB,GACiD,EAC3E,EAAE,WAAW,EAAE,IAAI,EAA0D,EAC7E,YAAoB,EACpB,EAAE;IACF,MAAM,WAAW,GAAqB;QACpC,GAAG,CAAC,YAAY,IAAI,IAAA,0BAAQ,EAAC,YAAY,EAAE,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC,CAAC;QAC1E;;WAEG;QACH,WAAW,EACT,CAAC,WAAW,IAAI,wBAAwB,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAChD,YAAY,EAAE,kBAAkB,CACjC;QACH,MAAM,EAAE,CAAC,eAAe,EAAE,EAAE,EAAE,EAAE;YAC9B,IAAI,CAAC,eAAe,EAAE,CAAC;gBACrB,oCAAoC;gBACpC,OAAO,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YACxB,CAAC;YAED,MAAM,cAAc,GAAG,CAAC,GAAG,CAAC,YAAY,EAAE,cAAc,IAAI,EAAE,CAAC,CAAC,CAAC;YACjE,MAAM,OAAO,GAAG,IAAA,kCAAiB,GAAE,CAAC;YACpC,IAAI,OAAO,EAAE,UAAU,EAAE,CAAC;gBACxB,cAAc,CAAC,IAAI,CAAC,oBAAoB,OAAO,CAAC,IAAI,IAAI,IAAI,EAAE,CAAC,CAAC;gBAChE,cAAc,CAAC,IAAI,CAAC,oBAAoB,OAAO,CAAC,IAAI,IAAI,IAAI,EAAE,CAAC,CAAC;YAClE,CAAC;YACD,IAAI,wBAAwB,EAAE,CAAC;gBAC7B,cAAc,CAAC,IAAI,CAAC,oBAAoB,YAAY,EAAE,CAAC,CAAC;gBACxD,cAAc,CAAC,IAAI,CAAC,oBAAoB,YAAY,EAAE,CAAC,CAAC;gBACxD,IAAI,CAAC,WAAW,EAAE,CAAC;oBACjB,cAAc,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;oBAC7C,cAAc,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;oBAC7C,IAAI,IAAI,EAAE,CAAC;wBACT,cAAc,CAAC,IAAI,CAAC,oBAAoB,IAAI,EAAE,CAAC,CAAC;wBAChD,cAAc,CAAC,IAAI,CAAC,oBAAoB,IAAI,EAAE,CAAC,CAAC;oBAClD,CAAC;gBACH,CAAC;YACH,CAAC;YACD,IACE,cAAc,CAAC,QAAQ,CAAC,GAAG,CAAC;gBAC5B,cAAc,CAAC,QAAQ,CAAC,eAAe,CAAC,EACxC,CAAC;gBACD,OAAO,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YACxB,CAAC;YACD,OAAO,CAAC,KAAK,CAAC,uBAAuB,eAAe,UAAU,CAAC,CAAC;YAChE,OAAO,EAAE,CACP,IAAI,KAAK,CACP,uBAAuB,eAAe,eACpC,cAAc,CAAC,MAAM,CAAC,CAAC;gBACrB,sBAAsB,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;gBACnD,CAAC,CAAC,EACJ,EAAE,CACH,CACF,CAAC;QACJ,CAAC;KACF,CAAC;IACF,OAAO,WAAW,CAAC;AACrB,CAAC,CAAC;AA5DW,QAAA,cAAc,kBA4DzB"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"getCorsOptions.spec.d.ts","sourceRoot":"","sources":["../../../../src/createHttpAndIOServers/getCorsOptions.spec.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,42 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const tslib_1 = require("tslib");
|
|
4
|
+
const strict_1 = tslib_1.__importDefault(require("node:assert/strict"));
|
|
5
|
+
const node_test_1 = require("node:test");
|
|
6
|
+
void (0, node_test_1.test)("getCorsOptions allows any origin when configured with a wildcard", async () => {
|
|
7
|
+
if (!require.main)
|
|
8
|
+
throw new Error("Test entry point not found");
|
|
9
|
+
const testEntryPoint = require.main.filename;
|
|
10
|
+
const getCorsOptionsPath = require.resolve("./getCorsOptions");
|
|
11
|
+
const getCorsOptions = (() => {
|
|
12
|
+
try {
|
|
13
|
+
require.main.filename = require.resolve("../index");
|
|
14
|
+
return (
|
|
15
|
+
// eslint-disable-next-line security/detect-non-literal-require
|
|
16
|
+
require(getCorsOptionsPath)).getCorsOptions;
|
|
17
|
+
}
|
|
18
|
+
finally {
|
|
19
|
+
require.main.filename = testEntryPoint;
|
|
20
|
+
}
|
|
21
|
+
})();
|
|
22
|
+
const options = getCorsOptions({
|
|
23
|
+
cors: { allowedOrigins: ["*"] },
|
|
24
|
+
cors_csp_devmode_enabled: false,
|
|
25
|
+
}, { is_state_db: false, port: 3005 }, 3004);
|
|
26
|
+
strict_1.default.equal(typeof options.origin, "function");
|
|
27
|
+
await new Promise((resolve, reject) => {
|
|
28
|
+
if (typeof options.origin !== "function") {
|
|
29
|
+
reject(new Error("Expected a CORS origin callback"));
|
|
30
|
+
return;
|
|
31
|
+
}
|
|
32
|
+
options.origin("https://example.com", (error, allowed) => {
|
|
33
|
+
if (error) {
|
|
34
|
+
reject(error);
|
|
35
|
+
return;
|
|
36
|
+
}
|
|
37
|
+
strict_1.default.equal(allowed, true);
|
|
38
|
+
resolve();
|
|
39
|
+
});
|
|
40
|
+
});
|
|
41
|
+
});
|
|
42
|
+
//# sourceMappingURL=getCorsOptions.spec.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"getCorsOptions.spec.js","sourceRoot":"","sources":["../../../../src/createHttpAndIOServers/getCorsOptions.spec.ts"],"names":[],"mappings":";;;AAAA,wEAAwC;AACxC,yCAAiC;AAEjC,KAAK,IAAA,gBAAI,EAAC,kEAAkE,EAAE,KAAK,IAAI,EAAE;IACvF,IAAI,CAAC,OAAO,CAAC,IAAI;QAAE,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;IACjE,MAAM,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC;IAC7C,MAAM,kBAAkB,GAAG,OAAO,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC;IAC/D,MAAM,cAAc,GAAG,CAAC,GAAG,EAAE;QAC3B,IAAI,CAAC;YACH,OAAO,CAAC,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;YACpD,OAAO;YACL,+DAA+D;YAC/D,OAAO,CAAC,kBAAkB,CAAsC,CACjE,CAAC,cAAc,CAAC;QACnB,CAAC;gBAAS,CAAC;YACT,OAAO,CAAC,IAAI,CAAC,QAAQ,GAAG,cAAc,CAAC;QACzC,CAAC;IACH,CAAC,CAAC,EAAE,CAAC;IAEL,MAAM,OAAO,GAAG,cAAc,CAC5B;QACE,IAAI,EAAE,EAAE,cAAc,EAAE,CAAC,GAAG,CAAC,EAAE;QAC/B,wBAAwB,EAAE,KAAK;KAChC,EACD,EAAE,WAAW,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,EAClC,IAAI,CACL,CAAC;IAEF,gBAAM,CAAC,KAAK,CAAC,OAAO,OAAO,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAChD,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC1C,IAAI,OAAO,OAAO,CAAC,MAAM,KAAK,UAAU,EAAE,CAAC;YACzC,MAAM,CAAC,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC,CAAC;YACrD,OAAO;QACT,CAAC;QACD,OAAO,CAAC,MAAM,CAAC,qBAAqB,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;YACvD,IAAI,KAAK,EAAE,CAAC;gBACV,MAAM,CAAC,KAAK,CAAC,CAAC;gBACd,OAAO;YACT,CAAC;YACD,gBAAM,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;YAC5B,OAAO,EAAE,CAAC;QACZ,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -33,7 +33,7 @@ export declare const llmCredentialsTableHooks: {
|
|
|
33
33
|
}>, import("prostgles-server").DBOFullyTyped<DBGeneratedSchema>> & {
|
|
34
34
|
localParams: undefined | import("prostgles-server/dist/DboBuilder/DboBuilderTypes").LocalParams;
|
|
35
35
|
context: undefined;
|
|
36
|
-
onCommit: import("prostgles-server/dist/PublishParser/publishTypesAndUtils").OnCommit
|
|
36
|
+
onCommit: import("prostgles-server/dist/PublishParser/publishTypesAndUtils").OnCommit<import("prostgles-server").DBOFullyTyped<DBGeneratedSchema>>;
|
|
37
37
|
}) => Promise<void>;
|
|
38
38
|
}];
|
|
39
39
|
};
|
|
@@ -33,7 +33,7 @@ export declare const tableHooks: {
|
|
|
33
33
|
}>, import("prostgles-server").DBOFullyTyped<DBGeneratedSchema>> & {
|
|
34
34
|
localParams: undefined | import("prostgles-server/dist/DboBuilder/DboBuilderTypes").LocalParams;
|
|
35
35
|
context: undefined;
|
|
36
|
-
onCommit: import("prostgles-server/dist/PublishParser/publishTypesAndUtils").OnCommit
|
|
36
|
+
onCommit: import("prostgles-server/dist/PublishParser/publishTypesAndUtils").OnCommit<import("prostgles-server").DBOFullyTyped<DBGeneratedSchema>>;
|
|
37
37
|
}) => Promise<void>;
|
|
38
38
|
}];
|
|
39
39
|
};
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@prostgles/prostgles",
|
|
3
|
-
"version": "2.3.6-dev.
|
|
3
|
+
"version": "2.3.6-dev.1787353201",
|
|
4
4
|
"description": "Prostgles UI runtime and configurable PostgreSQL dashboard",
|
|
5
5
|
"main": "dist/server/src/schemaConfig.js",
|
|
6
6
|
"bin": {
|
|
@@ -56,7 +56,7 @@
|
|
|
56
56
|
"pg": "^8.23.0",
|
|
57
57
|
"pidusage": "^4.0.1",
|
|
58
58
|
"prostgles-client": "^4.0.386",
|
|
59
|
-
"prostgles-server": "^4.2.
|
|
59
|
+
"prostgles-server": "^4.2.602",
|
|
60
60
|
"qrcode": "^1.5.4",
|
|
61
61
|
"simple-git": "^3.36.0",
|
|
62
62
|
"smtp-server": "^3.19.3",
|