@prostgles/prostgles 2.3.6-dev.1787347614 → 2.3.6-dev.1788616781
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/common/DashboardTypes.d.ts +3 -0
- package/dist/common/DashboardTypes.d.ts.map +1 -1
- package/dist/server/package.json +1 -1
- 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/McpHub/DockerSandbox/getDockerRunArgs.d.ts +1 -1
- package/dist/server/src/McpHub/DockerSandbox/getDockerRunArgs.d.ts.map +1 -1
- package/dist/server/src/McpHub/DockerSandbox/getDockerRunArgs.js +5 -4
- package/dist/server/src/McpHub/DockerSandbox/getDockerRunArgs.js.map +1 -1
- package/dist/server/src/ServiceManager/buildService.d.ts +0 -1
- package/dist/server/src/ServiceManager/buildService.d.ts.map +1 -1
- package/dist/server/src/ServiceManager/buildService.js +2 -9
- package/dist/server/src/ServiceManager/buildService.js.map +1 -1
- package/dist/server/src/ServiceManager/startService.d.ts.map +1 -1
- package/dist/server/src/ServiceManager/startService.js +12 -10
- package/dist/server/src/ServiceManager/startService.js.map +1 -1
- package/dist/server/src/cli/cli.js +21 -7
- package/dist/server/src/cli/cli.js.map +1 -1
- package/dist/server/src/cli/cliTemplateFiles.d.ts +65 -0
- package/dist/server/src/cli/cliTemplateFiles.d.ts.map +1 -1
- package/dist/server/src/cli/cliTemplateFiles.js +124 -1
- package/dist/server/src/cli/cliTemplateFiles.js.map +1 -1
- package/dist/server/src/cli/cliTemplateFiles.spec.d.ts +2 -0
- package/dist/server/src/cli/cliTemplateFiles.spec.d.ts.map +1 -0
- package/dist/server/src/cli/cliTemplateFiles.spec.js +33 -0
- package/dist/server/src/cli/cliTemplateFiles.spec.js.map +1 -0
- 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/dockerRuntime.d.ts +21 -0
- package/dist/server/src/dockerRuntime.d.ts.map +1 -0
- package/dist/server/src/dockerRuntime.js +45 -0
- package/dist/server/src/dockerRuntime.js.map +1 -0
- package/dist/server/src/dockerRuntime.spec.d.ts +2 -0
- package/dist/server/src/dockerRuntime.spec.d.ts.map +1 -0
- package/dist/server/src/dockerRuntime.spec.js +51 -0
- package/dist/server/src/dockerRuntime.spec.js.map +1 -0
- package/dist/server/src/schemaConfig.d.ts +4 -1
- package/dist/server/src/schemaConfig.d.ts.map +1 -1
- package/dist/server/src/schemaConfig.js.map +1 -1
- package/package.json +1 -1
|
@@ -321,6 +321,9 @@ export type TableColumn = {
|
|
|
321
321
|
} | {
|
|
322
322
|
/** Displays the media from URL. Accepted formats: image, audio or video. Media/Mime type will be used from headers */
|
|
323
323
|
type: "Media";
|
|
324
|
+
} | {
|
|
325
|
+
/** Display process logs */
|
|
326
|
+
type: "Logs";
|
|
324
327
|
} | {
|
|
325
328
|
/** Used internally. Ignore */
|
|
326
329
|
type: "DoclingDocument";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DashboardTypes.d.ts","sourceRoot":"","sources":["../../../common/DashboardTypes.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"DashboardTypes.d.ts","sourceRoot":"","sources":["../../../common/DashboardTypes.ts"],"names":[],"mappings":"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"}
|
package/dist/server/package.json
CHANGED
|
@@ -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":";;AAQA,0DAsHC;AA7HD,mFAAgF;AAChF,iGAA8F;AAC9F,uFAAoF;AACpF,qDAA0C;AAI1C,SAAgB,uBAAuB,CAErC,EACE,UAAU,EACV,cAAc,EACd,UAAU,GAKX;IAED,MAAM,EACJ,EAAE,EAAE,YAAY,EAChB,WAAW,EACX,IAAI,EACJ,iBAAiB,EACjB,iBAAiB,EACjB,EAAE,GACH,GAAG,UAAU,CAAC;IACf,MAAM,EACJ,IAAI,EACJ,GAAG,EACH,wBAAwB,EACxB,WAAW,EACX,wBAAwB,GACzB,GAAG,cAAc,CAAC;IACnB,MAAM,MAAM,GAAG;QACb,EAAE;QACF,IAAI;QACJ,IAAI;QACJ,GAAG;QACH,wBAAwB;QACxB,wBAAwB;QACxB,UAAU;QACV,iBAAiB;QACjB,iBAAiB;QACjB,WAAW;KACZ,CAAC;IACF,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC;IACrC,MAAM,cAAc,GAAG,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;IACpE,IAAI,cAAc,EAAE,CAAC;QACnB,MAAM,cAAc,GAAG,cAAc,CAAC,IAAI,KAAK,qBAAqB,CAAC;QAErE,IAAI,CAAC,IAAA,yBAAO,EAAC,cAAc,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC;YAC5C,IACE,cAAc;gBACd,cAAc,CAAC,MAAM,CAAC,IAAI,KAAK,IAAI;gBACnC,cAAc,CAAC,MAAM,CAAC,UAAU,KAAK,UAAU,EAC/C,CAAC;gBACD,MAAM,IAAI,KAAK,CACb,oEAAoE,CACrE,CAAC;YACJ,CAAC;YACD,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;YAChD,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;YACjD,IAAI,CAAC,cAAc,EAAE,CAAC;gBACpB,cAAc,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;YAC9B,CAAC;YACD,OAAO,CAAC,GAAG,CACT,GAAG,cAAc,CAAC,OAAO,gBAAgB,YAAY,kCAAkC,CACxF,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,GAAG,CACT,GAAG,cAAc,CAAC,OAAO,4CAA4C,YAAY,EAAE,CACpF,CAAC;YACF,OAAO,cAAc,CAAC;QACxB,CAAC;IACH,CAAC;IAED,IACE,CAAC,WAAW;QACZ,CAAC,IAAI;QACL,cAAc,CAAC,WAAW,EAAE,IAAI,KAAK,KAAK,EAC1C,CAAC;QACD,IAAA,uCAAkB,EAChB,GAAG,EACH,cAAc,EACd,UAAU,EACV,IAAI,CAAC,SAAS,CAAC,IAAI,EACnB,IAAI,CAAC,eAAe,CACrB,CAAC;IACJ,CAAC;IAED,MAAM,SAAS,GACb,WAAW,IAAI,CAAC,IAAI,CAAC,CAAC;QACpB;YACE,IAAI,EAAE,qBAA8B;YACpC,GAAG;YACH,IAAI;YACJ,GAAG,IAAA,iDAAuB,EACxB;gBACE,IAAI;gBACJ,UAAU;gBACV,IAAI;gBACJ,wBAAwB;aACzB,EACD,EAAE,WAAW,EAAE,IAAI,EAAE,EACrB,IAAI,CAAC,SAAS,CAAC,IAAI,CACpB;SACF;QACH,CAAC,CAAC,IAAA,mCAAgB,EACd;YACE,GAAG,MAAM;YACT,IAAI;YACJ,YAAY,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI;YACjC,WAAW;YACX,eAAe,EAAE,IAAI,CAAC,eAAe;SACtC,EACD,IAAI,CAAC,SAAS,CAAC,GAAG,CACnB,CAAC;IACN,MAAM,gBAAgB,GAAG;QACvB,GAAG,SAAS;QACZ,YAAY;QACZ,MAAM;KACP,CAAC;IACF,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,YAAY,EAAE,gBAAgB,CAAC,CAAC;IAC/D,OAAO,gBAAgB,CAAC;AAC1B,CAAC"}
|
|
@@ -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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;6BAmKupR,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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EADn7P,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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"}
|
|
@@ -12,7 +12,7 @@ export type LocalDockerParams = {
|
|
|
12
12
|
localDir: string;
|
|
13
13
|
name: string;
|
|
14
14
|
};
|
|
15
|
-
export declare const getNetworkName: (networkMode?: CreateContainerParams["networkMode"]) =>
|
|
15
|
+
export declare const getNetworkName: (networkMode?: CreateContainerParams["networkMode"]) => string;
|
|
16
16
|
export declare const getDockerRunArgs: ({ cpus, memory, networkMode, user, workingDir, environment, volumes, name, readOnly, }: Pick<CreateContainerParams, "cpus" | "memory" | "networkMode" | "environment" | "readOnly"> & StrictOmit<LocalDockerParams, "localDir">) => {
|
|
17
17
|
runArgs: string[];
|
|
18
18
|
config: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getDockerRunArgs.d.ts","sourceRoot":"","sources":["../../../../../src/McpHub/DockerSandbox/getDockerRunArgs.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,kFAAkF,CAAC;AAC9H,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"getDockerRunArgs.d.ts","sourceRoot":"","sources":["../../../../../src/McpHub/DockerSandbox/getDockerRunArgs.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,kFAAkF,CAAC;AAC9H,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAMhD,eAAO,MAAM,4BAA4B,kCAAkC,CAAC;AA4B5E,MAAM,MAAM,iBAAiB,GAAG;IAC9B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,KAAK,CAAC;QACd,IAAI,EAAE,MAAM,CAAC;QACb,SAAS,EAAE,MAAM,CAAC;QAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;KACpB,CAAC,CAAC;IACH,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,eAAO,MAAM,cAAc,GACzB,cAAa,qBAAqB,CAAC,aAAa,CAAU,WAQ3D,CAAC;AAEF,eAAO,MAAM,gBAAgB,GAAI,wFAU9B,IAAI,CACL,qBAAqB,EACrB,MAAM,GAAG,QAAQ,GAAG,aAAa,GAAG,aAAa,GAAG,UAAU,CAC/D,GACC,UAAU,CAAC,iBAAiB,EAAE,UAAU,CAAC;;;;;;kBAjCjC,MAAM;uBACD,MAAM;uBACN,OAAO;;;;CAmFrB,CAAC"}
|
|
@@ -4,7 +4,7 @@ exports.getDockerRunArgs = exports.getNetworkName = exports.INTERNAL_BRIDGE_NETW
|
|
|
4
4
|
const utils_1 = require("../../McpHub/utils");
|
|
5
5
|
const fs_1 = require("fs");
|
|
6
6
|
const path_1 = require("path");
|
|
7
|
-
const
|
|
7
|
+
const dockerRuntime_1 = require("../../dockerRuntime");
|
|
8
8
|
exports.INTERNAL_BRIDGE_NETWORK_NAME = "prostgles-bridge-internal-net";
|
|
9
9
|
/** Test compose network names */
|
|
10
10
|
const repositoryDockerComposeFile = (0, path_1.join)(__dirname, "..", "..", "..", "..", "..", "..", "docker-compose.yml");
|
|
@@ -12,14 +12,15 @@ if (process.env.NODE_ENV === "development" &&
|
|
|
12
12
|
(0, fs_1.existsSync)(repositoryDockerComposeFile)) {
|
|
13
13
|
const dockerComposeFile = (0, fs_1.readFileSync)(repositoryDockerComposeFile, "utf8");
|
|
14
14
|
const networksSection = dockerComposeFile.split("networks:")[1];
|
|
15
|
-
if (!networksSection?.includes(`name: ${
|
|
16
|
-
throw new Error(`Docker compose file must include a network named ${
|
|
15
|
+
if (!networksSection?.includes(`name: ${dockerRuntime_1.DEFAULT_DOCKER_NETWORK_NAME}`)) {
|
|
16
|
+
throw new Error(`Docker compose file must include a network named ${dockerRuntime_1.DEFAULT_DOCKER_NETWORK_NAME}`);
|
|
17
17
|
}
|
|
18
18
|
}
|
|
19
19
|
const LABEL = "prostgles-docker-sandbox";
|
|
20
20
|
const getNetworkName = (networkMode = "none") => {
|
|
21
21
|
return (networkMode === "bridge-internal" ? exports.INTERNAL_BRIDGE_NETWORK_NAME
|
|
22
|
-
: utils_1.isDocker && networkMode === "bridge" ?
|
|
22
|
+
: utils_1.isDocker && networkMode === "bridge" ?
|
|
23
|
+
((0, dockerRuntime_1.getDockerRuntime)().networkName ?? dockerRuntime_1.DEFAULT_DOCKER_NETWORK_NAME)
|
|
23
24
|
: networkMode);
|
|
24
25
|
};
|
|
25
26
|
exports.getNetworkName = getNetworkName;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getDockerRunArgs.js","sourceRoot":"","sources":["../../../../../src/McpHub/DockerSandbox/getDockerRunArgs.ts"],"names":[],"mappings":";;;AAAA,6CAA6C;AAC7C,2BAA8C;AAC9C,+BAA4B;
|
|
1
|
+
{"version":3,"file":"getDockerRunArgs.js","sourceRoot":"","sources":["../../../../../src/McpHub/DockerSandbox/getDockerRunArgs.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,5 +2,4 @@ import { type ExecutionResult } from "../McpHub/DockerSandbox/executeDockerComma
|
|
|
2
2
|
import type { ServiceManager } from "./ServiceManager";
|
|
3
3
|
import { OnServiceLogs } from "./ServiceManagerTypes";
|
|
4
4
|
export declare function buildService(this: ServiceManager, serviceName: string, onLogs: OnServiceLogs): Promise<ExecutionResult["state"]>;
|
|
5
|
-
export declare const camelCaseToSkewerCase: (str: string) => string;
|
|
6
5
|
//# sourceMappingURL=buildService.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildService.d.ts","sourceRoot":"","sources":["../../../../src/ServiceManager/buildService.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,KAAK,eAAe,EACrB,MAAM,gDAAgD,CAAC;AAMxD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,aAAa,EAAmB,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"buildService.d.ts","sourceRoot":"","sources":["../../../../src/ServiceManager/buildService.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,KAAK,eAAe,EACrB,MAAM,gDAAgD,CAAC;AAMxD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,aAAa,EAAmB,MAAM,uBAAuB,CAAC;AAGvE,wBAAsB,YAAY,CAChC,IAAI,EAAE,cAAc,EACpB,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,aAAa,GACpB,OAAO,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,CA8GnC"}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.camelCaseToSkewerCase = void 0;
|
|
4
3
|
exports.buildService = buildService;
|
|
5
4
|
const llmUtils_1 = require("../../../common/llmUtils");
|
|
6
5
|
const utils_1 = require("../../../common/utils");
|
|
@@ -10,6 +9,7 @@ const prostgles_types_1 = require("prostgles-types");
|
|
|
10
9
|
const dockerInspect_1 = require("./dockerInspect");
|
|
11
10
|
const getDockerBuildHash_1 = require("./getDockerBuildHash");
|
|
12
11
|
const getSelectedConfigEnvs_1 = require("./getSelectedConfigEnvs");
|
|
12
|
+
const dockerRuntime_1 = require("../dockerRuntime");
|
|
13
13
|
async function buildService(serviceName, onLogs) {
|
|
14
14
|
const onLogsCombined = (logs) => {
|
|
15
15
|
onLogs(logs);
|
|
@@ -35,7 +35,7 @@ async function buildService(serviceName, onLogs) {
|
|
|
35
35
|
throw new Error(`Service ${serviceName} not found in service registry`);
|
|
36
36
|
}
|
|
37
37
|
const serviceCwd = (0, path_1.resolve)(this.getServiceRoot(serviceName), service.buildContext ?? (0, path_1.join)(serviceName, "src"));
|
|
38
|
-
const imageName = (0,
|
|
38
|
+
const { imageName } = (0, dockerRuntime_1.getServiceDockerResources)(serviceName);
|
|
39
39
|
const { buildArgs } = await (0, getSelectedConfigEnvs_1.getSelectedConfigEnvs)(this, serviceName);
|
|
40
40
|
/** Only rebuild if hash differs */
|
|
41
41
|
const buildHash = await (0, getDockerBuildHash_1.getDockerBuildHash)(serviceCwd, buildArgs);
|
|
@@ -105,11 +105,4 @@ async function buildService(serviceName, onLogs) {
|
|
|
105
105
|
onLogsCombined(log);
|
|
106
106
|
return state;
|
|
107
107
|
}
|
|
108
|
-
const camelCaseToSkewerCase = (str) => {
|
|
109
|
-
return str
|
|
110
|
-
.replace(/([a-z])([A-Z])/g, "$1-$2")
|
|
111
|
-
.replace(/[\s_]+/g, "-")
|
|
112
|
-
.toLowerCase();
|
|
113
|
-
};
|
|
114
|
-
exports.camelCaseToSkewerCase = camelCaseToSkewerCase;
|
|
115
108
|
//# sourceMappingURL=buildService.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildService.js","sourceRoot":"","sources":["../../../../src/ServiceManager/buildService.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"buildService.js","sourceRoot":"","sources":["../../../../src/ServiceManager/buildService.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"startService.d.ts","sourceRoot":"","sources":["../../../../src/ServiceManager/startService.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EACL,KAAK,aAAa,EAElB,KAAK,eAAe,EACrB,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"startService.d.ts","sourceRoot":"","sources":["../../../../src/ServiceManager/startService.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EACL,KAAK,aAAa,EAElB,KAAK,eAAe,EACrB,MAAM,uBAAuB,CAAC;AAU/B,wBAAsB,YAAY,CAChC,IAAI,EAAE,cAAc,EACpB,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,aAAa,GACpB,OAAO,CAAC,OAAO,CAAC,eAAe,EAAE;IAAE,MAAM,EAAE,SAAS,CAAA;CAAE,CAAC,CAAC,CAuK1D;AAED,eAAO,MAAM,gBAAgB,GAAI,aAAa,MAAM,WAEnD,CAAC"}
|
|
@@ -6,10 +6,10 @@ const executeDockerCommand_1 = require("../McpHub/DockerSandbox/executeDockerCom
|
|
|
6
6
|
const isPortFree_1 = require("../utils/isPortFree");
|
|
7
7
|
const tout_1 = require("../utils/tout");
|
|
8
8
|
const child_process_1 = require("child_process");
|
|
9
|
-
const buildService_1 = require("./buildService");
|
|
10
9
|
const getSelectedConfigEnvs_1 = require("./getSelectedConfigEnvs");
|
|
11
10
|
const getServiceEndpoints_1 = require("./getServiceEndpoints");
|
|
12
11
|
const resolveBinary_1 = require("./resolveBinary");
|
|
12
|
+
const dockerRuntime_1 = require("../dockerRuntime");
|
|
13
13
|
const STOPPED_REASON = "stopped";
|
|
14
14
|
async function startService(serviceName, onLogs) {
|
|
15
15
|
const onLogsCombined = (logs) => {
|
|
@@ -29,8 +29,7 @@ async function startService(serviceName, onLogs) {
|
|
|
29
29
|
};
|
|
30
30
|
const stop = () => abortController.abort(STOPPED_REASON);
|
|
31
31
|
this.activeServices.set(serviceName, { getLogs, stop, status: "starting" });
|
|
32
|
-
const imageName = (0,
|
|
33
|
-
const containerName = `prostgles-service-${imageName}`;
|
|
32
|
+
const { containerName, imageName, networkName, volumePrefix } = (0, dockerRuntime_1.getServiceDockerResources)(serviceName);
|
|
34
33
|
const cleanup = () => {
|
|
35
34
|
(0, child_process_1.spawn)((0, resolveBinary_1.resolveBinary)("docker"), ["stop", "-t", "0", containerName], {
|
|
36
35
|
stdio: "ignore",
|
|
@@ -41,17 +40,22 @@ async function startService(serviceName, onLogs) {
|
|
|
41
40
|
process.once("SIGTERM", cleanup);
|
|
42
41
|
process.once("uncaughtException", cleanup);
|
|
43
42
|
const { port, hostPort: preferredHostPort = port, volumes = {}, healthCheck, endpoints, } = serviceConfig;
|
|
44
|
-
const hostPort = await (0, isPortFree_1.getFreePort)(preferredHostPort);
|
|
43
|
+
const hostPort = networkName ? undefined : await (0, isPortFree_1.getFreePort)(preferredHostPort);
|
|
45
44
|
const volumeArgs = [];
|
|
46
45
|
for (const [volumeName, containerPath] of Object.entries(volumes)) {
|
|
47
|
-
const hostPath =
|
|
46
|
+
const hostPath = `${volumePrefix}-${volumeName}`;
|
|
48
47
|
await (0, executeDockerCommand_1.executeDockerCommand)(["volume", "create", hostPath], {
|
|
49
48
|
timeout: 10_000,
|
|
50
49
|
});
|
|
51
50
|
volumeArgs.push("-v", `${hostPath}:${containerPath}`);
|
|
52
51
|
}
|
|
53
52
|
const { env, gpus = "none" } = await (0, getSelectedConfigEnvs_1.getSelectedConfigEnvs)(this, serviceName);
|
|
54
|
-
const
|
|
53
|
+
const { baseUrl, runArgs: connectivityArgs } = (0, dockerRuntime_1.getServiceDockerConnectivity)({
|
|
54
|
+
containerName,
|
|
55
|
+
containerPort: port,
|
|
56
|
+
hostPort: hostPort ?? preferredHostPort,
|
|
57
|
+
networkName,
|
|
58
|
+
});
|
|
55
59
|
const onStopped = (res) => {
|
|
56
60
|
const stopReason = "type" in res ? res.type : res.state;
|
|
57
61
|
const instance = abortController.signal.reason === STOPPED_REASON ?
|
|
@@ -79,8 +83,7 @@ async function startService(serviceName, onLogs) {
|
|
|
79
83
|
Array.isArray(gpus) ? `"device=${gpus.join(",")}"` : gpus.toString(),
|
|
80
84
|
]
|
|
81
85
|
: []),
|
|
82
|
-
|
|
83
|
-
`${baseHost}:${port}`,
|
|
86
|
+
...connectivityArgs,
|
|
84
87
|
...volumeArgs,
|
|
85
88
|
...Object.entries(env).flatMap(([key, value]) => [
|
|
86
89
|
"-e",
|
|
@@ -99,7 +102,6 @@ async function startService(serviceName, onLogs) {
|
|
|
99
102
|
.catch((error) => {
|
|
100
103
|
onStopped({ type: "error", error });
|
|
101
104
|
});
|
|
102
|
-
const baseUrl = `http://${baseHost}`;
|
|
103
105
|
const startingServiceLabel = `Starting service ${JSON.stringify(serviceName)}. `;
|
|
104
106
|
while (this.activeServices.get(serviceName)?.status === "starting") {
|
|
105
107
|
await (0, tout_1.tout)(1000);
|
|
@@ -142,7 +144,7 @@ async function startService(serviceName, onLogs) {
|
|
|
142
144
|
return runningService;
|
|
143
145
|
}
|
|
144
146
|
const getContainerName = (serviceName) => {
|
|
145
|
-
return
|
|
147
|
+
return (0, dockerRuntime_1.getServiceDockerResources)(serviceName).containerName;
|
|
146
148
|
};
|
|
147
149
|
exports.getContainerName = getContainerName;
|
|
148
150
|
//# sourceMappingURL=startService.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"startService.js","sourceRoot":"","sources":["../../../../src/ServiceManager/startService.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"startService.js","sourceRoot":"","sources":["../../../../src/ServiceManager/startService.ts"],"names":[],"mappings":";;;AAuBA,oCA2KC;AAlMD,yFAIwD;AACxD,sDAAoD;AACpD,0CAAuC;AACvC,iDAAsC;AAOtC,mEAAgE;AAChE,+DAA4D;AAC5D,mDAAgD;AAChD,sDAG4B;AAE5B,MAAM,cAAc,GAAG,SAAS,CAAC;AAC1B,KAAK,UAAU,YAAY,CAEhC,WAAmB,EACnB,MAAqB;IAErB,MAAM,cAAc,GAAkB,CAAC,IAAI,EAAE,EAAE;QAC7C,MAAM,CAAC,IAAI,CAAC,CAAC;QACb,IAAI,CAAC,YAAY,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;IACvC,CAAC,CAAC;IACF,OAAO,CAAC,GAAG,CAAC,mBAAmB,GAAG,WAAW,CAAC,CAAC;IAC/C,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,gBAAgB,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC;IAE1E,MAAM,aAAa,GAAG,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;IACjD,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,MAAM,IAAI,KAAK,CAAC,WAAW,WAAW,gCAAgC,CAAC,CAAC;IAC1E,CAAC;IACD,MAAM,eAAe,GAAG,IAAI,eAAe,EAAE,CAAC;IAC9C,IAAI,IAAI,GAAiB,EAAE,CAAC;IAC5B,MAAM,OAAO,GAAG,GAAG,EAAE;QACnB,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;IACF,MAAM,IAAI,GAAG,GAAG,EAAE,CAAC,eAAe,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;IACzD,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,WAAW,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,CAAC;IAC5E,MAAM,EAAE,aAAa,EAAE,SAAS,EAAE,WAAW,EAAE,YAAY,EAAE,GAC3D,IAAA,yCAAyB,EAAC,WAAW,CAAC,CAAC;IAEzC,MAAM,OAAO,GAAG,GAAG,EAAE;QACnB,IAAA,qBAAK,EAAC,IAAA,6BAAa,EAAC,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,aAAa,CAAC,EAAE;YACjE,KAAK,EAAE,QAAQ;SAChB,CAAC,CAAC;IACL,CAAC,CAAC;IACF,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC9B,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAChC,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IACjC,OAAO,CAAC,IAAI,CAAC,mBAAmB,EAAE,OAAO,CAAC,CAAC;IAE3C,MAAM,EACJ,IAAI,EACJ,QAAQ,EAAE,iBAAiB,GAAG,IAAI,EAClC,OAAO,GAAG,EAAE,EACZ,WAAW,EACX,SAAS,GACV,GAAG,aAAa,CAAC;IAClB,MAAM,QAAQ,GACZ,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,IAAA,wBAAW,EAAC,iBAAiB,CAAC,CAAC;IACjE,MAAM,UAAU,GAAa,EAAE,CAAC;IAChC,KAAK,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;QAClE,MAAM,QAAQ,GAAG,GAAG,YAAY,IAAI,UAAU,EAAE,CAAC;QACjD,MAAM,IAAA,2CAAoB,EAAC,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC,EAAE;YACzD,OAAO,EAAE,MAAM;SAChB,CAAC,CAAC;QACH,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,QAAQ,IAAI,aAAa,EAAE,CAAC,CAAC;IACxD,CAAC;IAED,MAAM,EAAE,GAAG,EAAE,IAAI,GAAG,MAAM,EAAE,GAAG,MAAM,IAAA,6CAAqB,EAAC,IAAI,EAAE,WAAW,CAAC,CAAC;IAE9E,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,gBAAgB,EAAE,GAAG,IAAA,4CAA4B,EAAC;QAC1E,aAAa;QACb,aAAa,EAAE,IAAI;QACnB,QAAQ,EAAE,QAAQ,IAAI,iBAAiB;QACvC,WAAW;KACZ,CAAC,CAAC;IAEH,MAAM,SAAS,GAAG,CAChB,GAAwD,EACxD,EAAE;QACF,MAAM,UAAU,GAAG,MAAM,IAAI,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC;QACxD,MAAM,QAAQ,GACZ,eAAe,CAAC,MAAM,CAAC,MAAM,KAAK,cAAc,CAAC,CAAC;YAChD;gBACE,MAAM,EAAE,SAAS;aAClB;YACH,CAAC,CAAC;gBACE,MAAM,EAAE,OAAO;gBACf,KAAK,EAAE,IAAI,KAAK,CACd,WAAW,WAAW,qCAAqC,UAAU,EAAE,CACxE;aACF,CAAC;QACN,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;QAC/C,IAAI,CAAC,YAAY,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;IACvC,CAAC,CAAC;IAEF,IAAA,2CAAoB,EAClB;QACE,KAAK;QACL,IAAI;QACJ,MAAM;QACN,QAAQ;QACR,GAAG,SAAS;QACZ,QAAQ;QACR,aAAa;QACb,GAAG,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC;YACnB;gBACE,QAAQ;gBACR,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,WAAW,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE;aACrE;YACH,CAAC,CAAC,EAAE,CAAC;QACL,GAAG,gBAAgB;QACnB,GAAG,UAAU;QACb,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC;YAC/C,IAAI;YACJ,GAAG,GAAG,IAAI,KAAK,EAAE;SAClB,CAAC;QACF,SAAS;KACV,EACD;QACE,MAAM,EAAE,eAAe,CAAC,MAAM;KAC/B,EACD,CAAC,OAAO,EAAE,EAAE;QACV,IAAI,GAAG,OAAO,CAAC;QACf,cAAc,CAAC,IAAI,CAAC,CAAC;IACvB,CAAC,CACF;SACE,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE;QACZ,SAAS,CAAC,GAAG,CAAC,CAAC;IACjB,CAAC,CAAC;SACD,KAAK,CAAC,CAAC,KAAc,EAAE,EAAE;QACxB,SAAS,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;IACtC,CAAC,CAAC,CAAC;IAEL,MAAM,oBAAoB,GAAG,oBAAoB,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,IAAI,CAAC;IACjF,OAAO,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,MAAM,KAAK,UAAU,EAAE,CAAC;QACnE,MAAM,IAAA,WAAI,EAAC,IAAI,CAAC,CAAC;QACjB,MAAM,QAAQ,GAAG,WAAW,CAAC;QAC7B,MAAM,mBAAmB,GAAG,MAAM,KAAK,CACrC,GAAG,OAAO,GAAG,WAAW,CAAC,QAAQ,EAAE,EACnC;YACE,MAAM,EAAE,WAAW,CAAC,MAAM,IAAI,KAAK;YACnC,OAAO,EAAE;gBACP,iBAAiB,EAAE,QAAQ;gBAC3B,WAAW,EAAE,QAAQ;aACtB;YACD,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,KAAK,CAAC;SACnC,CACF,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;QACpB,OAAO,CAAC,GAAG,CACT,oBAAoB;YAClB,aAAa;YACb,CAAC,mBAAmB,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAChD,CAAC;QACF,IAAI,mBAAmB,EAAE,EAAE,EAAE,CAAC;YAC5B,MAAM;QACR,CAAC;IACH,CAAC;IAED,MAAM,eAAe,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IAC7D,IAAI,eAAe,EAAE,MAAM,KAAK,UAAU,EAAE,CAAC;QAC3C,MAAM,KAAK,GAAG,IAAI,KAAK,CACrB,oBAAoB;YAClB,oEAAoE;YACpE,eAAe,EAAE,MAAM,CAC1B,CAAC;QACF,SAAS,CAAC;YACR,IAAI,EAAE,OAAO;YACb,KAAK;SACN,CAAC,CAAC;QACH,OAAO,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAC/B,CAAC;IAED,MAAM,cAAc,GAA2B;QAC7C,MAAM,EAAE,SAAS;QACjB,OAAO;QACP,IAAI;QACJ,SAAS,EAAE,IAAA,yCAAmB,EAAC,EAAE,WAAW,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC;KACpE,CAAC;IAEF,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;IACrD,IAAI,CAAC,YAAY,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;IAErC,OAAO,CAAC,GAAG,CAAC,kBAAkB,GAAG,WAAW,CAAC,CAAC;IAC9C,OAAO,cAAc,CAAC;AACxB,CAAC;AAEM,MAAM,gBAAgB,GAAG,CAAC,WAAmB,EAAE,EAAE;IACtD,OAAO,IAAA,yCAAyB,EAAC,WAAW,CAAC,CAAC,aAAa,CAAC;AAC9D,CAAC,CAAC;AAFW,QAAA,gBAAgB,oBAE3B"}
|
|
@@ -11,6 +11,7 @@ const cliTemplateFiles_1 = require("./cliTemplateFiles");
|
|
|
11
11
|
const ensureCliDatabases_1 = require("./ensureCliDatabases");
|
|
12
12
|
const usage = `Usage:
|
|
13
13
|
prostgles create <directory> [--skip-install]
|
|
14
|
+
prostgles compose init [--config <directory>]
|
|
14
15
|
prostgles dev [--config <directory>]
|
|
15
16
|
prostgles start [--config <directory>]`;
|
|
16
17
|
const getConfigPath = (args) => {
|
|
@@ -23,6 +24,7 @@ const getConfigPath = (args) => {
|
|
|
23
24
|
return path_1.default.resolve(configPath);
|
|
24
25
|
};
|
|
25
26
|
const npmCommand = process.platform === "win32" ? "npm.cmd" : "npm";
|
|
27
|
+
const getConfigId = (value) => value.replace(/[^a-z0-9-]/gi, "-").toLowerCase() || "my-prostgles-app";
|
|
26
28
|
const installConfigDependencies = (targetPath) => {
|
|
27
29
|
const result = (0, child_process_1.spawnSync)(npmCommand, ["install"], {
|
|
28
30
|
cwd: targetPath,
|
|
@@ -38,18 +40,26 @@ const createConfig = (targetPath, skipInstall) => {
|
|
|
38
40
|
if ((0, fs_1.existsSync)(targetPath) && (0, fs_1.readdirSync)(targetPath).length) {
|
|
39
41
|
throw new Error(`${targetPath} already exists and is not empty`);
|
|
40
42
|
}
|
|
41
|
-
const
|
|
42
|
-
.basename(targetPath)
|
|
43
|
-
.replace(/[^a-z0-9-]/gi, "-")
|
|
44
|
-
.toLowerCase();
|
|
45
|
-
const configId = packageName || "my-prostgles-app";
|
|
43
|
+
const configId = getConfigId(path_1.default.basename(targetPath));
|
|
46
44
|
(0, cliTemplateFiles_1.saveCliTemplateFiles)({ configId, targetPath });
|
|
47
45
|
if (skipInstall) {
|
|
48
|
-
console.log(`Created config project in ${targetPath}. Run npm install, copy .env.example to .env,
|
|
46
|
+
console.log(`Created config project in ${targetPath}. Run npm install, copy .env.example to .env, then see README.md for development and Docker deployment commands.`);
|
|
49
47
|
return;
|
|
50
48
|
}
|
|
51
49
|
installConfigDependencies(targetPath);
|
|
52
|
-
console.log(`Created config project and installed dependencies in ${targetPath}. Copy .env.example to .env,
|
|
50
|
+
console.log(`Created config project and installed dependencies in ${targetPath}. Copy .env.example to .env, then see README.md for development and Docker deployment commands.`);
|
|
51
|
+
};
|
|
52
|
+
const initialiseCompose = (configPath) => {
|
|
53
|
+
const packageFile = path_1.default.join(configPath, "package.json");
|
|
54
|
+
if (!(0, fs_1.existsSync)(packageFile)) {
|
|
55
|
+
throw new Error(`No package.json found in config project ${configPath}`);
|
|
56
|
+
}
|
|
57
|
+
const packageConfig = JSON.parse((0, fs_1.readFileSync)(packageFile, "utf8"));
|
|
58
|
+
const configId = getConfigId(typeof packageConfig.name === "string" ?
|
|
59
|
+
packageConfig.name
|
|
60
|
+
: path_1.default.basename(configPath));
|
|
61
|
+
(0, cliTemplateFiles_1.saveCliComposeFiles)({ configId, targetPath: configPath });
|
|
62
|
+
console.log(`Added Dockerfile, compose.yaml and .dockerignore to ${configPath}. Set PROSTGLES_DOCKER_DB_PASSWORD in .env, then run docker compose up -d --build.`);
|
|
53
63
|
};
|
|
54
64
|
const getConfigEnvironment = (configPath) => {
|
|
55
65
|
const environmentFile = path_1.default.join(configPath, ".env");
|
|
@@ -156,6 +166,10 @@ const main = async () => {
|
|
|
156
166
|
createConfig(path_1.default.resolve(target), args.includes("--skip-install"));
|
|
157
167
|
return;
|
|
158
168
|
}
|
|
169
|
+
if (command === "compose" && args[0] === "init") {
|
|
170
|
+
initialiseCompose(getConfigPath(args.slice(1)));
|
|
171
|
+
return;
|
|
172
|
+
}
|
|
159
173
|
if (command === "dev" || command === "start") {
|
|
160
174
|
await run(getConfigPath(args), command === "dev");
|
|
161
175
|
return;
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../../../src/cli/cli.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,72 @@ export declare const saveCliTemplateFiles: ({ configId, targetPath, }: {
|
|
|
2
2
|
configId: string;
|
|
3
3
|
targetPath: string;
|
|
4
4
|
}) => void;
|
|
5
|
+
export declare const saveCliComposeFiles: ({ configId, targetPath, }: {
|
|
6
|
+
configId: string;
|
|
7
|
+
targetPath: string;
|
|
8
|
+
}) => void;
|
|
5
9
|
export declare const srcFolderName = "src";
|
|
6
10
|
export declare const generatedFolderName = "generated";
|
|
7
11
|
export declare const srcSubfolderNames: readonly ["functions", "tableConfigs", "tableOptions", "tableHooks", "services"];
|
|
12
|
+
export declare const getCliComposeFiles: ({ configId }: {
|
|
13
|
+
configId: string;
|
|
14
|
+
}) => {
|
|
15
|
+
readonly Dockerfile: "\n FROM docker:29-cli AS docker-cli\n\n FROM node:24-bookworm-slim\n\n WORKDIR /app\n\n COPY --from=docker-cli /usr/local/bin/docker /usr/local/bin/docker\n\n COPY . .\n RUN npm install\n RUN npm run build\n\n ENV NODE_ENV=production\n\n CMD [\"npm\", \"start\"]";
|
|
16
|
+
readonly "compose.yaml": `
|
|
17
|
+
name: ${string}
|
|
18
|
+
|
|
19
|
+
services:
|
|
20
|
+
app:
|
|
21
|
+
build: .
|
|
22
|
+
init: true
|
|
23
|
+
restart: unless-stopped
|
|
24
|
+
depends_on:
|
|
25
|
+
db:
|
|
26
|
+
condition: service_healthy
|
|
27
|
+
environment:
|
|
28
|
+
IS_DOCKER: "yes"
|
|
29
|
+
NODE_ENV: production
|
|
30
|
+
PRGL_USERNAME: \${PRGL_USERNAME:-admin}
|
|
31
|
+
PRGL_PASSWORD: \${PRGL_PASSWORD:?Set PRGL_PASSWORD in .env}
|
|
32
|
+
PROSTGLES_UI_HOST: "0.0.0.0"
|
|
33
|
+
PROSTGLES_DATA_DIR: /var/lib/prostgles
|
|
34
|
+
PROSTGLES_STATE_DATABASE_URL: postgres://postgres:\${PROSTGLES_DOCKER_DB_PASSWORD:?Set PROSTGLES_DOCKER_DB_PASSWORD in .env}@db:5432/prostgles_state
|
|
35
|
+
PROSTGLES_DATABASE_URL: postgres://postgres:\${PROSTGLES_DOCKER_DB_PASSWORD:?Set PROSTGLES_DOCKER_DB_PASSWORD in .env}@db:5432/${string}
|
|
36
|
+
PROSTGLES_DOCKER_NETWORK: \${PROSTGLES_DOCKER_NETWORK:-${string}-runtime}
|
|
37
|
+
PROSTGLES_INSTANCE_ID: \${PROSTGLES_INSTANCE_ID:-${string}}
|
|
38
|
+
ports:
|
|
39
|
+
- "\${PROSTGLES_DOCKER_IP:-127.0.0.1}:\${PROSTGLES_DOCKER_PORT:-3004}:3004"
|
|
40
|
+
volumes:
|
|
41
|
+
- prostgles-data:/var/lib/prostgles
|
|
42
|
+
- /var/run/docker.sock:/var/run/docker.sock
|
|
43
|
+
networks:
|
|
44
|
+
- runtime
|
|
45
|
+
|
|
46
|
+
db:
|
|
47
|
+
image: postgis/postgis:17-3.4
|
|
48
|
+
restart: unless-stopped
|
|
49
|
+
environment:
|
|
50
|
+
POSTGRES_DB: postgres
|
|
51
|
+
POSTGRES_USER: postgres
|
|
52
|
+
POSTGRES_PASSWORD: \${PROSTGLES_DOCKER_DB_PASSWORD:?Set PROSTGLES_DOCKER_DB_PASSWORD in .env}
|
|
53
|
+
healthcheck:
|
|
54
|
+
test: ["CMD-SHELL", "pg_isready -U $$POSTGRES_USER -d $$POSTGRES_DB"]
|
|
55
|
+
interval: 2s
|
|
56
|
+
timeout: 3s
|
|
57
|
+
retries: 30
|
|
58
|
+
volumes:
|
|
59
|
+
- database:/var/lib/postgresql/data
|
|
60
|
+
networks:
|
|
61
|
+
- runtime
|
|
62
|
+
|
|
63
|
+
volumes:
|
|
64
|
+
database:
|
|
65
|
+
prostgles-data:
|
|
66
|
+
|
|
67
|
+
networks:
|
|
68
|
+
runtime:
|
|
69
|
+
name: \${PROSTGLES_DOCKER_NETWORK:-${string}-runtime}
|
|
70
|
+
driver: bridge`;
|
|
71
|
+
readonly ".dockerignore": "\n .env\n .git\n .prostgles\n build\n node_modules\n *.log";
|
|
72
|
+
};
|
|
8
73
|
//# sourceMappingURL=cliTemplateFiles.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cliTemplateFiles.d.ts","sourceRoot":"","sources":["../../../../src/cli/cliTemplateFiles.ts"],"names":[],"mappings":"AAQA,eAAO,MAAM,oBAAoB,GAAI,2BAGlC;IACD,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;CACpB,SAEA,CAAC;AAEF,eAAO,MAAM,aAAa,QAAQ,CAAC;AACnC,eAAO,MAAM,mBAAmB,cAAc,CAAC;AAI/C,eAAO,MAAM,iBAAiB,kFAMpB,CAAC"}
|
|
1
|
+
{"version":3,"file":"cliTemplateFiles.d.ts","sourceRoot":"","sources":["../../../../src/cli/cliTemplateFiles.ts"],"names":[],"mappings":"AAQA,eAAO,MAAM,oBAAoB,GAAI,2BAGlC;IACD,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;CACpB,SAEA,CAAC;AAEF,eAAO,MAAM,mBAAmB,GAAI,2BAGjC;IACD,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;CACpB,SAWA,CAAC;AAEF,eAAO,MAAM,aAAa,QAAQ,CAAC;AACnC,eAAO,MAAM,mBAAmB,cAAc,CAAC;AAI/C,eAAO,MAAM,iBAAiB,kFAMpB,CAAC;AAsMX,eAAO,MAAM,kBAAkB,GAAI,cAAc;IAAE,QAAQ,EAAE,MAAM,CAAA;CAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAgFxD,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.srcSubfolderNames = exports.generatedFolderName = exports.srcFolderName = exports.saveCliTemplateFiles = void 0;
|
|
3
|
+
exports.getCliComposeFiles = exports.srcSubfolderNames = exports.generatedFolderName = exports.srcFolderName = exports.saveCliComposeFiles = exports.saveCliTemplateFiles = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const utils_1 = require("../../../common/utils");
|
|
6
6
|
const crypto_1 = require("crypto");
|
|
@@ -12,6 +12,15 @@ const saveCliTemplateFiles = ({ configId, targetPath, }) => {
|
|
|
12
12
|
saveFolderFiles(targetPath, getCliTemplateFiles({ configId }));
|
|
13
13
|
};
|
|
14
14
|
exports.saveCliTemplateFiles = saveCliTemplateFiles;
|
|
15
|
+
const saveCliComposeFiles = ({ configId, targetPath, }) => {
|
|
16
|
+
const files = (0, exports.getCliComposeFiles)({ configId });
|
|
17
|
+
const existingFiles = Object.keys(files).filter((fileName) => (0, fs_1.existsSync)((0, path_1.join)(targetPath, fileName)));
|
|
18
|
+
if (existingFiles.length) {
|
|
19
|
+
throw new Error(`Refusing to overwrite existing deployment files: ${existingFiles.join(", ")}`);
|
|
20
|
+
}
|
|
21
|
+
saveFolderFiles(targetPath, files);
|
|
22
|
+
};
|
|
23
|
+
exports.saveCliComposeFiles = saveCliComposeFiles;
|
|
15
24
|
exports.srcFolderName = "src";
|
|
16
25
|
exports.generatedFolderName = "generated";
|
|
17
26
|
const testsFolderName = "tests";
|
|
@@ -38,6 +47,30 @@ const saveFolderFiles = (targetPath, folderFiles) => {
|
|
|
38
47
|
}
|
|
39
48
|
};
|
|
40
49
|
const getCliTemplateFiles = ({ configId }) => ({
|
|
50
|
+
...(0, exports.getCliComposeFiles)({ configId }),
|
|
51
|
+
"README.md": `
|
|
52
|
+
# ${configId}
|
|
53
|
+
|
|
54
|
+
## Development
|
|
55
|
+
|
|
56
|
+
Copy \`.env.example\` to \`.env\`, configure both database URLs, then run:
|
|
57
|
+
|
|
58
|
+
\`\`\`sh
|
|
59
|
+
npm install
|
|
60
|
+
npm run dev
|
|
61
|
+
\`\`\`
|
|
62
|
+
|
|
63
|
+
## Deployment
|
|
64
|
+
|
|
65
|
+
Set strong \`PRGL_PASSWORD\` and \`PROSTGLES_DOCKER_DB_PASSWORD\` values in \`.env\`, then use Docker Compose directly:
|
|
66
|
+
|
|
67
|
+
\`\`\`sh
|
|
68
|
+
docker compose up -d --build
|
|
69
|
+
docker compose logs -f app
|
|
70
|
+
docker compose down
|
|
71
|
+
\`\`\`
|
|
72
|
+
|
|
73
|
+
The database and Prostgles data directory use named volumes. Managed app services share the private runtime network and are not published on host ports.`,
|
|
41
74
|
"package.json": JSON.stringify(getPackageJson(configId), null, 2) + "\n",
|
|
42
75
|
"tsconfig.json": JSON.stringify({
|
|
43
76
|
compilerOptions: {
|
|
@@ -176,10 +209,94 @@ const getCliTemplateFiles = ({ configId }) => ({
|
|
|
176
209
|
# Database exposed by this config. Must use the same server as the state database.
|
|
177
210
|
PROSTGLES_DATABASE_URL=postgres://user:password@localhost:5432/${configId}
|
|
178
211
|
|
|
212
|
+
# Used by compose.yaml for its private PostgreSQL instance.
|
|
213
|
+
PROSTGLES_DOCKER_DB_PASSWORD=${(0, crypto_1.randomBytes)(24).toString("base64url")}
|
|
214
|
+
|
|
179
215
|
# npm test starts an ephemeral PostgreSQL Docker container bound to 127.0.0.1 only.
|
|
180
216
|
# Override only when the app needs a different PostgreSQL/PostGIS version.
|
|
181
217
|
# PROSTGLES_TEST_POSTGRES_IMAGE=postgis/postgis:17-3.4`,
|
|
182
218
|
});
|
|
219
|
+
const getCliComposeFiles = ({ configId }) => ({
|
|
220
|
+
Dockerfile: `
|
|
221
|
+
FROM docker:29-cli AS docker-cli
|
|
222
|
+
|
|
223
|
+
FROM node:24-bookworm-slim
|
|
224
|
+
|
|
225
|
+
WORKDIR /app
|
|
226
|
+
|
|
227
|
+
COPY --from=docker-cli /usr/local/bin/docker /usr/local/bin/docker
|
|
228
|
+
|
|
229
|
+
COPY . .
|
|
230
|
+
RUN npm install
|
|
231
|
+
RUN npm run build
|
|
232
|
+
|
|
233
|
+
ENV NODE_ENV=production
|
|
234
|
+
|
|
235
|
+
CMD ["npm", "start"]`,
|
|
236
|
+
"compose.yaml": `
|
|
237
|
+
name: ${configId}
|
|
238
|
+
|
|
239
|
+
services:
|
|
240
|
+
app:
|
|
241
|
+
build: .
|
|
242
|
+
init: true
|
|
243
|
+
restart: unless-stopped
|
|
244
|
+
depends_on:
|
|
245
|
+
db:
|
|
246
|
+
condition: service_healthy
|
|
247
|
+
environment:
|
|
248
|
+
IS_DOCKER: "yes"
|
|
249
|
+
NODE_ENV: production
|
|
250
|
+
PRGL_USERNAME: \${PRGL_USERNAME:-admin}
|
|
251
|
+
PRGL_PASSWORD: \${PRGL_PASSWORD:?Set PRGL_PASSWORD in .env}
|
|
252
|
+
PROSTGLES_UI_HOST: "0.0.0.0"
|
|
253
|
+
PROSTGLES_DATA_DIR: /var/lib/prostgles
|
|
254
|
+
PROSTGLES_STATE_DATABASE_URL: postgres://postgres:\${PROSTGLES_DOCKER_DB_PASSWORD:?Set PROSTGLES_DOCKER_DB_PASSWORD in .env}@db:5432/prostgles_state
|
|
255
|
+
PROSTGLES_DATABASE_URL: postgres://postgres:\${PROSTGLES_DOCKER_DB_PASSWORD:?Set PROSTGLES_DOCKER_DB_PASSWORD in .env}@db:5432/${configId}
|
|
256
|
+
PROSTGLES_DOCKER_NETWORK: \${PROSTGLES_DOCKER_NETWORK:-${configId}-runtime}
|
|
257
|
+
PROSTGLES_INSTANCE_ID: \${PROSTGLES_INSTANCE_ID:-${configId}}
|
|
258
|
+
ports:
|
|
259
|
+
- "\${PROSTGLES_DOCKER_IP:-127.0.0.1}:\${PROSTGLES_DOCKER_PORT:-3004}:3004"
|
|
260
|
+
volumes:
|
|
261
|
+
- prostgles-data:/var/lib/prostgles
|
|
262
|
+
- /var/run/docker.sock:/var/run/docker.sock
|
|
263
|
+
networks:
|
|
264
|
+
- runtime
|
|
265
|
+
|
|
266
|
+
db:
|
|
267
|
+
image: postgis/postgis:17-3.4
|
|
268
|
+
restart: unless-stopped
|
|
269
|
+
environment:
|
|
270
|
+
POSTGRES_DB: postgres
|
|
271
|
+
POSTGRES_USER: postgres
|
|
272
|
+
POSTGRES_PASSWORD: \${PROSTGLES_DOCKER_DB_PASSWORD:?Set PROSTGLES_DOCKER_DB_PASSWORD in .env}
|
|
273
|
+
healthcheck:
|
|
274
|
+
test: ["CMD-SHELL", "pg_isready -U $$POSTGRES_USER -d $$POSTGRES_DB"]
|
|
275
|
+
interval: 2s
|
|
276
|
+
timeout: 3s
|
|
277
|
+
retries: 30
|
|
278
|
+
volumes:
|
|
279
|
+
- database:/var/lib/postgresql/data
|
|
280
|
+
networks:
|
|
281
|
+
- runtime
|
|
282
|
+
|
|
283
|
+
volumes:
|
|
284
|
+
database:
|
|
285
|
+
prostgles-data:
|
|
286
|
+
|
|
287
|
+
networks:
|
|
288
|
+
runtime:
|
|
289
|
+
name: \${PROSTGLES_DOCKER_NETWORK:-${configId}-runtime}
|
|
290
|
+
driver: bridge`,
|
|
291
|
+
".dockerignore": `
|
|
292
|
+
.env
|
|
293
|
+
.git
|
|
294
|
+
.prostgles
|
|
295
|
+
build
|
|
296
|
+
node_modules
|
|
297
|
+
*.log`,
|
|
298
|
+
});
|
|
299
|
+
exports.getCliComposeFiles = getCliComposeFiles;
|
|
183
300
|
const getPackageJson = (configId) => ({
|
|
184
301
|
name: configId,
|
|
185
302
|
private: true,
|
|
@@ -376,6 +493,12 @@ const getCliAgentsFile = () => `
|
|
|
376
493
|
- Add test users through the fixture's \`users\` option and connect with \`connectProjectAs(userKey)\`. Sessions are seeded directly, so deployment tests do not need to exercise the login UI.
|
|
377
494
|
- Add deterministic database state with the fixture's \`seed\` callback. Never use development or production database URLs for test setup.
|
|
378
495
|
|
|
496
|
+
## Deployment
|
|
497
|
+
|
|
498
|
+
- Use \`docker compose up -d --build\` for production deployment. Keep Compose as the operational interface for logs, restarts, upgrades, and shutdown.
|
|
499
|
+
- The generated stack persists PostgreSQL and \`/var/lib/prostgles\`. Back up both named volumes.
|
|
500
|
+
- Managed services use the configured private Docker runtime network. Do not publish their ports unless an external client explicitly requires access.
|
|
501
|
+
|
|
379
502
|
## Tables, display options, and hooks
|
|
380
503
|
|
|
381
504
|
- ${schemaConfigGuidance.tableConfig} ${schemaConfigGuidance.tableConfigMigrations}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cliTemplateFiles.js","sourceRoot":"","sources":["../../../../src/cli/cliTemplateFiles.ts"],"names":[],"mappings":";;;;AAAA,yCAA0C;AAC1C,mCAAqC;AAErC,8EAA6C;AAC7C,qDAAwD;AACxD,+BAAqC;AACrC,
|
|
1
|
+
{"version":3,"file":"cliTemplateFiles.js","sourceRoot":"","sources":["../../../../src/cli/cliTemplateFiles.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"cliTemplateFiles.spec.d.ts","sourceRoot":"","sources":["../../../../src/cli/cliTemplateFiles.spec.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,33 @@
|
|
|
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_fs_1 = require("node:fs");
|
|
6
|
+
const node_os_1 = require("node:os");
|
|
7
|
+
const node_path_1 = require("node:path");
|
|
8
|
+
const node_test_1 = tslib_1.__importDefault(require("node:test"));
|
|
9
|
+
const cliTemplateFiles_1 = require("./cliTemplateFiles");
|
|
10
|
+
void (0, node_test_1.default)("new CLI apps include a native Compose deployment", (context) => {
|
|
11
|
+
const targetPath = (0, node_fs_1.mkdtempSync)((0, node_path_1.join)((0, node_os_1.tmpdir)(), "prostgles-cli-template-"));
|
|
12
|
+
context.after(() => (0, node_fs_1.rmSync)(targetPath, { force: true, recursive: true }));
|
|
13
|
+
(0, cliTemplateFiles_1.saveCliTemplateFiles)({ configId: "my-app", targetPath });
|
|
14
|
+
const compose = (0, node_fs_1.readFileSync)((0, node_path_1.join)(targetPath, "compose.yaml"), "utf8");
|
|
15
|
+
const dockerfile = (0, node_fs_1.readFileSync)((0, node_path_1.join)(targetPath, "Dockerfile"), "utf8");
|
|
16
|
+
strict_1.default.match(compose, /^name: my-app$/m);
|
|
17
|
+
strict_1.default.match(compose, /^ {2}app:$/m);
|
|
18
|
+
strict_1.default.match(compose, /^ {2}db:$/m);
|
|
19
|
+
strict_1.default.match(compose, /PROSTGLES_DOCKER_NETWORK: \$\{PROSTGLES_DOCKER_NETWORK:-my-app-runtime\}/);
|
|
20
|
+
strict_1.default.match(compose, /PROSTGLES_INSTANCE_ID: \$\{PROSTGLES_INSTANCE_ID:-my-app\}/);
|
|
21
|
+
strict_1.default.match(compose, /\/var\/run\/docker\.sock:\/var\/run\/docker\.sock/);
|
|
22
|
+
strict_1.default.match(compose, /^ {4}name: \$\{PROSTGLES_DOCKER_NETWORK:-my-app-runtime\}$/m);
|
|
23
|
+
strict_1.default.match(dockerfile, /FROM docker:29-cli AS docker-cli/);
|
|
24
|
+
strict_1.default.match(dockerfile, /COPY --from=docker-cli \/usr\/local\/bin\/docker \/usr\/local\/bin\/docker/);
|
|
25
|
+
});
|
|
26
|
+
void (0, node_test_1.default)("compose init does not overwrite deployment files", (context) => {
|
|
27
|
+
const targetPath = (0, node_fs_1.mkdtempSync)((0, node_path_1.join)((0, node_os_1.tmpdir)(), "prostgles-compose-init-"));
|
|
28
|
+
context.after(() => (0, node_fs_1.rmSync)(targetPath, { force: true, recursive: true }));
|
|
29
|
+
(0, node_fs_1.writeFileSync)((0, node_path_1.join)(targetPath, "Dockerfile"), "custom\n");
|
|
30
|
+
strict_1.default.throws(() => (0, cliTemplateFiles_1.saveCliComposeFiles)({ configId: "my-app", targetPath }), /Refusing to overwrite existing deployment files: Dockerfile/);
|
|
31
|
+
strict_1.default.equal((0, node_fs_1.readFileSync)((0, node_path_1.join)(targetPath, "Dockerfile"), "utf8"), "custom\n");
|
|
32
|
+
});
|
|
33
|
+
//# sourceMappingURL=cliTemplateFiles.spec.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"cliTemplateFiles.spec.js","sourceRoot":"","sources":["../../../../src/cli/cliTemplateFiles.spec.ts"],"names":[],"mappings":";;;AAAA,wEAAwC;AACxC,qCAA2E;AAC3E,qCAAiC;AACjC,yCAAiC;AACjC,kEAA6B;AAC7B,yDAA+E;AAE/E,KAAK,IAAA,mBAAI,EAAC,kDAAkD,EAAE,CAAC,OAAO,EAAE,EAAE;IACxE,MAAM,UAAU,GAAG,IAAA,qBAAW,EAAC,IAAA,gBAAI,EAAC,IAAA,gBAAM,GAAE,EAAE,yBAAyB,CAAC,CAAC,CAAC;IAC1E,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,IAAA,gBAAM,EAAC,UAAU,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;IAE1E,IAAA,uCAAoB,EAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC,CAAC;IAEzD,MAAM,OAAO,GAAG,IAAA,sBAAY,EAAC,IAAA,gBAAI,EAAC,UAAU,EAAE,cAAc,CAAC,EAAE,MAAM,CAAC,CAAC;IACvE,MAAM,UAAU,GAAG,IAAA,sBAAY,EAAC,IAAA,gBAAI,EAAC,UAAU,EAAE,YAAY,CAAC,EAAE,MAAM,CAAC,CAAC;IACxE,gBAAM,CAAC,KAAK,CAAC,OAAO,EAAE,iBAAiB,CAAC,CAAC;IACzC,gBAAM,CAAC,KAAK,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;IACrC,gBAAM,CAAC,KAAK,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;IACpC,gBAAM,CAAC,KAAK,CACV,OAAO,EACP,0EAA0E,CAC3E,CAAC;IACF,gBAAM,CAAC,KAAK,CACV,OAAO,EACP,4DAA4D,CAC7D,CAAC;IACF,gBAAM,CAAC,KAAK,CAAC,OAAO,EAAE,mDAAmD,CAAC,CAAC;IAC3E,gBAAM,CAAC,KAAK,CACV,OAAO,EACP,6DAA6D,CAC9D,CAAC;IACF,gBAAM,CAAC,KAAK,CAAC,UAAU,EAAE,kCAAkC,CAAC,CAAC;IAC7D,gBAAM,CAAC,KAAK,CACV,UAAU,EACV,4EAA4E,CAC7E,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,KAAK,IAAA,mBAAI,EAAC,kDAAkD,EAAE,CAAC,OAAO,EAAE,EAAE;IACxE,MAAM,UAAU,GAAG,IAAA,qBAAW,EAAC,IAAA,gBAAI,EAAC,IAAA,gBAAM,GAAE,EAAE,yBAAyB,CAAC,CAAC,CAAC;IAC1E,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,IAAA,gBAAM,EAAC,UAAU,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;IAC1E,IAAA,uBAAa,EAAC,IAAA,gBAAI,EAAC,UAAU,EAAE,YAAY,CAAC,EAAE,UAAU,CAAC,CAAC;IAE1D,gBAAM,CAAC,MAAM,CACX,GAAG,EAAE,CAAC,IAAA,sCAAmB,EAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC,EAC7D,6DAA6D,CAC9D,CAAC;IACF,gBAAM,CAAC,KAAK,CACV,IAAA,sBAAY,EAAC,IAAA,gBAAI,EAAC,UAAU,EAAE,YAAY,CAAC,EAAE,MAAM,CAAC,EACpD,UAAU,CACX,CAAC;AACJ,CAAC,CAAC,CAAC"}
|
|
@@ -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"}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
export declare const DEFAULT_DOCKER_NETWORK_NAME = "prostgles-bridge-net";
|
|
2
|
+
export declare const getDockerRuntime: (environment?: NodeJS.ProcessEnv) => {
|
|
3
|
+
instanceId: string | undefined;
|
|
4
|
+
networkName: string | undefined;
|
|
5
|
+
};
|
|
6
|
+
export declare const getServiceDockerResources: (serviceName: string, environment?: NodeJS.ProcessEnv) => {
|
|
7
|
+
containerName: string;
|
|
8
|
+
imageName: string;
|
|
9
|
+
networkName: string | undefined;
|
|
10
|
+
volumePrefix: string;
|
|
11
|
+
};
|
|
12
|
+
export declare const getServiceDockerConnectivity: ({ containerName, containerPort, hostPort, networkName, }: {
|
|
13
|
+
containerName: string;
|
|
14
|
+
containerPort: number;
|
|
15
|
+
hostPort: number;
|
|
16
|
+
networkName?: string;
|
|
17
|
+
}) => {
|
|
18
|
+
baseUrl: string;
|
|
19
|
+
runArgs: string[];
|
|
20
|
+
};
|
|
21
|
+
//# sourceMappingURL=dockerRuntime.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"dockerRuntime.d.ts","sourceRoot":"","sources":["../../../src/dockerRuntime.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,2BAA2B,yBAAyB,CAAC;AASlE,eAAO,MAAM,gBAAgB,GAC3B,cAAa,MAAM,CAAC,UAAwB;;;CAY7C,CAAC;AAEF,eAAO,MAAM,yBAAyB,GACpC,aAAa,MAAM,EACnB,cAAa,MAAM,CAAC,UAAwB;;;;;CAe7C,CAAC;AAEF,eAAO,MAAM,4BAA4B,GAAI,0DAK1C;IACD,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;;;CAUA,CAAC"}
|
|
@@ -0,0 +1,45 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getServiceDockerConnectivity = exports.getServiceDockerResources = exports.getDockerRuntime = exports.DEFAULT_DOCKER_NETWORK_NAME = void 0;
|
|
4
|
+
const DEFAULT_INSTANCE_ID = "prostgles";
|
|
5
|
+
exports.DEFAULT_DOCKER_NETWORK_NAME = "prostgles-bridge-net";
|
|
6
|
+
const toDockerName = (value) => value
|
|
7
|
+
.replace(/([a-z])([A-Z])/g, "$1-$2")
|
|
8
|
+
.replace(/[^a-zA-Z0-9_.-]+/g, "-")
|
|
9
|
+
.replace(/^[^a-zA-Z0-9]+|[^a-zA-Z0-9]+$/g, "")
|
|
10
|
+
.toLowerCase();
|
|
11
|
+
const getDockerRuntime = (environment = process.env) => {
|
|
12
|
+
const networkName = environment.PROSTGLES_DOCKER_NETWORK?.trim() || undefined;
|
|
13
|
+
const configuredInstanceId = environment.PROSTGLES_INSTANCE_ID?.trim();
|
|
14
|
+
const instanceId = configuredInstanceId ? toDockerName(configuredInstanceId) : undefined;
|
|
15
|
+
if (configuredInstanceId && !instanceId) {
|
|
16
|
+
throw new Error("PROSTGLES_INSTANCE_ID must contain a letter or number.");
|
|
17
|
+
}
|
|
18
|
+
return { instanceId, networkName };
|
|
19
|
+
};
|
|
20
|
+
exports.getDockerRuntime = getDockerRuntime;
|
|
21
|
+
const getServiceDockerResources = (serviceName, environment = process.env) => {
|
|
22
|
+
const serviceId = toDockerName(serviceName);
|
|
23
|
+
if (!serviceId)
|
|
24
|
+
throw new Error("Service name must contain a letter or number.");
|
|
25
|
+
const { instanceId, networkName } = (0, exports.getDockerRuntime)(environment);
|
|
26
|
+
const containerName = `${instanceId ?? DEFAULT_INSTANCE_ID}-service-${serviceId}`;
|
|
27
|
+
return {
|
|
28
|
+
containerName,
|
|
29
|
+
imageName: instanceId ? containerName : serviceId,
|
|
30
|
+
networkName,
|
|
31
|
+
volumePrefix: containerName,
|
|
32
|
+
};
|
|
33
|
+
};
|
|
34
|
+
exports.getServiceDockerResources = getServiceDockerResources;
|
|
35
|
+
const getServiceDockerConnectivity = ({ containerName, containerPort, hostPort, networkName, }) => {
|
|
36
|
+
const baseHost = networkName ? `${containerName}:${containerPort}` : `127.0.0.1:${hostPort}`;
|
|
37
|
+
return {
|
|
38
|
+
baseUrl: `http://${baseHost}`,
|
|
39
|
+
runArgs: networkName ?
|
|
40
|
+
["--network", networkName]
|
|
41
|
+
: ["-p", `${baseHost}:${containerPort}`],
|
|
42
|
+
};
|
|
43
|
+
};
|
|
44
|
+
exports.getServiceDockerConnectivity = getServiceDockerConnectivity;
|
|
45
|
+
//# sourceMappingURL=dockerRuntime.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"dockerRuntime.js","sourceRoot":"","sources":["../../../src/dockerRuntime.ts"],"names":[],"mappings":";;;AAAA,MAAM,mBAAmB,GAAG,WAAW,CAAC;AAE3B,QAAA,2BAA2B,GAAG,sBAAsB,CAAC;AAElE,MAAM,YAAY,GAAG,CAAC,KAAa,EAAE,EAAE,CACrC,KAAK;KACF,OAAO,CAAC,iBAAiB,EAAE,OAAO,CAAC;KACnC,OAAO,CAAC,mBAAmB,EAAE,GAAG,CAAC;KACjC,OAAO,CAAC,gCAAgC,EAAE,EAAE,CAAC;KAC7C,WAAW,EAAE,CAAC;AAEZ,MAAM,gBAAgB,GAAG,CAC9B,cAAiC,OAAO,CAAC,GAAG,EAC5C,EAAE;IACF,MAAM,WAAW,GAAG,WAAW,CAAC,wBAAwB,EAAE,IAAI,EAAE,IAAI,SAAS,CAAC;IAC9E,MAAM,oBAAoB,GAAG,WAAW,CAAC,qBAAqB,EAAE,IAAI,EAAE,CAAC;IACvE,MAAM,UAAU,GACd,oBAAoB,CAAC,CAAC,CAAC,YAAY,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAExE,IAAI,oBAAoB,IAAI,CAAC,UAAU,EAAE,CAAC;QACxC,MAAM,IAAI,KAAK,CAAC,wDAAwD,CAAC,CAAC;IAC5E,CAAC;IAED,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,CAAC;AACrC,CAAC,CAAC;AAbW,QAAA,gBAAgB,oBAa3B;AAEK,MAAM,yBAAyB,GAAG,CACvC,WAAmB,EACnB,cAAiC,OAAO,CAAC,GAAG,EAC5C,EAAE;IACF,MAAM,SAAS,GAAG,YAAY,CAAC,WAAW,CAAC,CAAC;IAC5C,IAAI,CAAC,SAAS;QACZ,MAAM,IAAI,KAAK,CAAC,+CAA+C,CAAC,CAAC;IAEnE,MAAM,EAAE,UAAU,EAAE,WAAW,EAAE,GAAG,IAAA,wBAAgB,EAAC,WAAW,CAAC,CAAC;IAClE,MAAM,aAAa,GAAG,GAAG,UAAU,IAAI,mBAAmB,YAAY,SAAS,EAAE,CAAC;IAElF,OAAO;QACL,aAAa;QACb,SAAS,EAAE,UAAU,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,SAAS;QACjD,WAAW;QACX,YAAY,EAAE,aAAa;KAC5B,CAAC;AACJ,CAAC,CAAC;AAjBW,QAAA,yBAAyB,6BAiBpC;AAEK,MAAM,4BAA4B,GAAG,CAAC,EAC3C,aAAa,EACb,aAAa,EACb,QAAQ,EACR,WAAW,GAMZ,EAAE,EAAE;IACH,MAAM,QAAQ,GACZ,WAAW,CAAC,CAAC,CAAC,GAAG,aAAa,IAAI,aAAa,EAAE,CAAC,CAAC,CAAC,aAAa,QAAQ,EAAE,CAAC;IAC9E,OAAO;QACL,OAAO,EAAE,UAAU,QAAQ,EAAE;QAC7B,OAAO,EACL,WAAW,CAAC,CAAC;YACX,CAAC,WAAW,EAAE,WAAW,CAAC;YAC5B,CAAC,CAAC,CAAC,IAAI,EAAE,GAAG,QAAQ,IAAI,aAAa,EAAE,CAAC;KAC3C,CAAC;AACJ,CAAC,CAAC;AApBW,QAAA,4BAA4B,gCAoBvC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"dockerRuntime.spec.d.ts","sourceRoot":"","sources":["../../../src/dockerRuntime.spec.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,51 @@
|
|
|
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 = tslib_1.__importDefault(require("node:test"));
|
|
6
|
+
const dockerRuntime_1 = require("./dockerRuntime");
|
|
7
|
+
void (0, node_test_1.default)("preserves existing service Docker names without deployment variables", () => {
|
|
8
|
+
strict_1.default.deepEqual((0, dockerRuntime_1.getServiceDockerResources)("myService", {}), {
|
|
9
|
+
containerName: "prostgles-service-my-service",
|
|
10
|
+
imageName: "my-service",
|
|
11
|
+
networkName: undefined,
|
|
12
|
+
volumePrefix: "prostgles-service-my-service",
|
|
13
|
+
});
|
|
14
|
+
});
|
|
15
|
+
void (0, node_test_1.default)("uses container DNS without publishing managed service ports", () => {
|
|
16
|
+
strict_1.default.deepEqual((0, dockerRuntime_1.getServiceDockerConnectivity)({
|
|
17
|
+
containerName: "my-app-service-my-service",
|
|
18
|
+
containerPort: 8080,
|
|
19
|
+
hostPort: 8080,
|
|
20
|
+
networkName: "my-app-runtime",
|
|
21
|
+
}), {
|
|
22
|
+
baseUrl: "http://my-app-service-my-service:8080",
|
|
23
|
+
runArgs: ["--network", "my-app-runtime"],
|
|
24
|
+
});
|
|
25
|
+
});
|
|
26
|
+
void (0, node_test_1.default)("preserves loopback publishing outside a Docker runtime", () => {
|
|
27
|
+
strict_1.default.deepEqual((0, dockerRuntime_1.getServiceDockerConnectivity)({
|
|
28
|
+
containerName: "prostgles-service-my-service",
|
|
29
|
+
containerPort: 8080,
|
|
30
|
+
hostPort: 49123,
|
|
31
|
+
}), {
|
|
32
|
+
baseUrl: "http://127.0.0.1:49123",
|
|
33
|
+
runArgs: ["-p", "127.0.0.1:49123:8080"],
|
|
34
|
+
});
|
|
35
|
+
});
|
|
36
|
+
void (0, node_test_1.default)("namespaces service Docker resources in a configured runtime", () => {
|
|
37
|
+
strict_1.default.deepEqual((0, dockerRuntime_1.getServiceDockerResources)("myService", {
|
|
38
|
+
PROSTGLES_DOCKER_NETWORK: "my-app-runtime",
|
|
39
|
+
PROSTGLES_INSTANCE_ID: "My App",
|
|
40
|
+
}), {
|
|
41
|
+
containerName: "my-app-service-my-service",
|
|
42
|
+
imageName: "my-app-service-my-service",
|
|
43
|
+
networkName: "my-app-runtime",
|
|
44
|
+
volumePrefix: "my-app-service-my-service",
|
|
45
|
+
});
|
|
46
|
+
});
|
|
47
|
+
void (0, node_test_1.default)("rejects an unusable configured instance id", () => {
|
|
48
|
+
strict_1.default.throws(() => (0, dockerRuntime_1.getDockerRuntime)({ PROSTGLES_INSTANCE_ID: "---" }), /must contain a letter or number/);
|
|
49
|
+
strict_1.default.equal(dockerRuntime_1.DEFAULT_DOCKER_NETWORK_NAME, "prostgles-bridge-net");
|
|
50
|
+
});
|
|
51
|
+
//# sourceMappingURL=dockerRuntime.spec.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"dockerRuntime.spec.js","sourceRoot":"","sources":["../../../src/dockerRuntime.spec.ts"],"names":[],"mappings":";;;AAAA,wEAAwC;AACxC,kEAA6B;AAC7B,mDAKyB;AAEzB,KAAK,IAAA,mBAAI,EAAC,sEAAsE,EAAE,GAAG,EAAE;IACrF,gBAAM,CAAC,SAAS,CAAC,IAAA,yCAAyB,EAAC,WAAW,EAAE,EAAE,CAAC,EAAE;QAC3D,aAAa,EAAE,8BAA8B;QAC7C,SAAS,EAAE,YAAY;QACvB,WAAW,EAAE,SAAS;QACtB,YAAY,EAAE,8BAA8B;KAC7C,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,KAAK,IAAA,mBAAI,EAAC,6DAA6D,EAAE,GAAG,EAAE;IAC5E,gBAAM,CAAC,SAAS,CACd,IAAA,4CAA4B,EAAC;QAC3B,aAAa,EAAE,2BAA2B;QAC1C,aAAa,EAAE,IAAI;QACnB,QAAQ,EAAE,IAAI;QACd,WAAW,EAAE,gBAAgB;KAC9B,CAAC,EACF;QACE,OAAO,EAAE,uCAAuC;QAChD,OAAO,EAAE,CAAC,WAAW,EAAE,gBAAgB,CAAC;KACzC,CACF,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,KAAK,IAAA,mBAAI,EAAC,wDAAwD,EAAE,GAAG,EAAE;IACvE,gBAAM,CAAC,SAAS,CACd,IAAA,4CAA4B,EAAC;QAC3B,aAAa,EAAE,8BAA8B;QAC7C,aAAa,EAAE,IAAI;QACnB,QAAQ,EAAE,KAAK;KAChB,CAAC,EACF;QACE,OAAO,EAAE,wBAAwB;QACjC,OAAO,EAAE,CAAC,IAAI,EAAE,sBAAsB,CAAC;KACxC,CACF,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,KAAK,IAAA,mBAAI,EAAC,6DAA6D,EAAE,GAAG,EAAE;IAC5E,gBAAM,CAAC,SAAS,CACd,IAAA,yCAAyB,EAAC,WAAW,EAAE;QACrC,wBAAwB,EAAE,gBAAgB;QAC1C,qBAAqB,EAAE,QAAQ;KAChC,CAAC,EACF;QACE,aAAa,EAAE,2BAA2B;QAC1C,SAAS,EAAE,2BAA2B;QACtC,WAAW,EAAE,gBAAgB;QAC7B,YAAY,EAAE,2BAA2B;KAC1C,CACF,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,KAAK,IAAA,mBAAI,EAAC,4CAA4C,EAAE,GAAG,EAAE;IAC3D,gBAAM,CAAC,MAAM,CACX,GAAG,EAAE,CAAC,IAAA,gCAAgB,EAAC,EAAE,qBAAqB,EAAE,KAAK,EAAE,CAAC,EACxD,iCAAiC,CAClC,CAAC;IACF,gBAAM,CAAC,KAAK,CAAC,2CAA2B,EAAE,sBAAsB,CAAC,CAAC;AACpE,CAAC,CAAC,CAAC"}
|
|
@@ -5,6 +5,7 @@ export { defineFunction, createFunctionGroupDefiner, createFunctionGroupDefinerW
|
|
|
5
5
|
import type { ProstglesInitOptions } from "prostgles-server/dist/ProstglesTypes";
|
|
6
6
|
import type { OnReadyParams } from "prostgles-server/dist/initProstgles";
|
|
7
7
|
import type { ServiceManager, ServiceManagerConfig } from "./ServiceManager/ServiceManager";
|
|
8
|
+
import type { ServerFunctionDefinitions } from "prostgles-server";
|
|
8
9
|
import { prostglesServices, type ServiceRegistry } from "./ServiceManager/ServiceManagerTypes";
|
|
9
10
|
export type { DBGeneratedSchema } from "../../common/DBGeneratedSchema";
|
|
10
11
|
export type * from "../../common/DashboardTypes";
|
|
@@ -26,7 +27,9 @@ export type SchemaConfigAccessControl = DBSSchema["access_control"]["dbPermissio
|
|
|
26
27
|
* instance. Transport, authentication, storage wiring, and connection
|
|
27
28
|
* lifecycle remain owned by the host application.
|
|
28
29
|
*/
|
|
29
|
-
export type SchemaConfigProstglesOptions<S = void, SUser extends SessionUser = SessionUser, Services extends ServiceRegistry = Record<never, never>> = Pick<ProstglesInitOptions<S, SUser, ProstglesContext<Services>>, "functions" | "joins" | "tableHooks" | "tableConfig" | "tableConfigMigrations" | "watchSchemaType"
|
|
30
|
+
export type SchemaConfigProstglesOptions<S = void, SUser extends SessionUser = SessionUser, Services extends ServiceRegistry = Record<never, never>> = Omit<Pick<ProstglesInitOptions<S, SUser, ProstglesContext<Services>>, "functions" | "joins" | "tableHooks" | "tableConfig" | "tableConfigMigrations" | "watchSchemaType">, "functions"> & {
|
|
31
|
+
functions?: ServerFunctionDefinitions<S, SUser, ProstglesContext<Services> | undefined>;
|
|
32
|
+
};
|
|
30
33
|
export type SchemaConfig<S = void, SUser extends SessionUser = SessionUser, Services extends ServiceRegistry = Record<never, never>> = SchemaConfigProstglesOptions<S, SUser, Services> & {
|
|
31
34
|
/** Stable deployment identifier. Required when starting through the CLI. */
|
|
32
35
|
id?: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schemaConfig.d.ts","sourceRoot":"","sources":["../../../src/schemaConfig.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"schemaConfig.d.ts","sourceRoot":"","sources":["../../../src/schemaConfig.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AACnE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EACL,cAAc,EACd,0BAA0B,EAC1B,qCAAqC,EACrC,sBAAsB,EACtB,iCAAiC,GAClC,MAAM,kBAAkB,CAAC;AAC1B,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,sCAAsC,CAAC;AACjF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qCAAqC,CAAC;AACzE,OAAO,KAAK,EACV,cAAc,EACd,oBAAoB,EACrB,MAAM,iCAAiC,CAAC;AACzC,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,kBAAkB,CAAC;AAClE,OAAO,EACL,iBAAiB,EACjB,KAAK,eAAe,EACrB,MAAM,sCAAsC,CAAC;AAE9C,YAAY,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AACnE,mBAAmB,wBAAwB,CAAC;AAC5C,YAAY,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACtD,YAAY,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC/D,YAAY,EAAE,aAAa,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE/E,MAAM,MAAM,uBAAuB,GAAG,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AAEjE,MAAM,MAAM,gBAAgB,CAC1B,QAAQ,SAAS,eAAe,GAAG,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,IACrD;IACF,cAAc,EAAE,cAAc,CAAC,OAAO,iBAAiB,GAAG,QAAQ,CAAC,CAAC;CACrE,CAAC;AAEF,MAAM,MAAM,gBAAgB,CAC1B,CAAC,GAAG,IAAI,EACR,QAAQ,SAAS,eAAe,GAAG,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,IACrD,CACF,IAAI,EAAE,aAAa,CAAC,CAAC,EAAE,gBAAgB,CAAC,QAAQ,CAAC,CAAC,KAC/C,IAAI,GAAG,uBAAuB,GAAG,OAAO,CAAC,IAAI,GAAG,uBAAuB,CAAC,CAAC;AAE9E,MAAM,MAAM,YAAY,GAAG,WAAW,CACpC,SAAS,CAAC,aAAa,CAAC,CAAC,eAAe,CAAC,CAC1C,CAAC,MAAM,CAAC,CAAC;AAEV,MAAM,MAAM,kBAAkB,GAAG,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;AAE9D,MAAM,MAAM,sBAAsB,GAAG,OAAO,CAC1C,IAAI,CACF,SAAS,CAAC,aAAa,CAAC,EACxB,kBAAkB,GAAG,iBAAiB,GAAG,eAAe,CACzD,CACF,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG,OAAO,CACxC,IAAI,CACF,SAAS,CAAC,kBAAkB,CAAC,EAC3B,mBAAmB,GACnB,kBAAkB,GAClB,YAAY,GACZ,MAAM,GACN,KAAK,GACL,aAAa,GACb,kBAAkB,GAClB,0BAA0B,GAC1B,gBAAgB,GAChB,wBAAwB,GACxB,wBAAwB,CAC3B,CACF,CAAC;AAEF,MAAM,MAAM,yBAAyB,GACnC,SAAS,CAAC,gBAAgB,CAAC,CAAC,eAAe,CAAC,CAAC;AAE/C;;;;GAIG;AACH,MAAM,MAAM,4BAA4B,CACtC,CAAC,GAAG,IAAI,EACR,KAAK,SAAS,WAAW,GAAG,WAAW,EACvC,QAAQ,SAAS,eAAe,GAAG,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,IACrD,IAAI,CACN,IAAI,CACF,oBAAoB,CAAC,CAAC,EAAE,KAAK,EAAE,gBAAgB,CAAC,QAAQ,CAAC,CAAC,EACxD,WAAW,GACX,OAAO,GACP,YAAY,GACZ,aAAa,GACb,uBAAuB,GACvB,iBAAiB,CACpB,EACD,WAAW,CACZ,GAAG;IACF,SAAS,CAAC,EAAE,yBAAyB,CACnC,CAAC,EACD,KAAK,EACL,gBAAgB,CAAC,QAAQ,CAAC,GAAG,SAAS,CACvC,CAAC;CACH,CAAC;AAEF,MAAM,MAAM,YAAY,CACtB,CAAC,GAAG,IAAI,EACR,KAAK,SAAS,WAAW,GAAG,WAAW,EACvC,QAAQ,SAAS,eAAe,GAAG,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,IACrD,4BAA4B,CAAC,CAAC,EAAE,KAAK,EAAE,QAAQ,CAAC,GAAG;IACrD,4EAA4E;IAC5E,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,+EAA+E;IAC/E,UAAU,CAAC,EAAE,sBAAsB,CAAC;IACpC,cAAc,CAAC,EAAE,oBAAoB,CAAC;IACtC,8EAA8E;IAC9E,cAAc,CAAC,EAAE,yBAAyB,CAAC;IAC3C,gFAAgF;IAChF,OAAO,CAAC,EAAE,KAAK,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,gBAAgB,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC;IACxC,qEAAqE;IACrE,QAAQ,CAAC,EAAE,oBAAoB,CAAC,QAAQ,CAAC,CAAC;IAC1C,UAAU,CAAC,EAAE,oBAAoB,EAAE,CAAC;CACrC,CAAC;AAEF,+EAA+E;AAC/E,eAAO,MAAM,YAAY,GACvB,CAAC,GAAG,IAAI,EACR,KAAK,SAAS,WAAW,GAAG,WAAW;KAGrC,QAAQ,SAAS,eAAe,EAChC,CAAC,SAAS,YAAY,CAAC,CAAC,EAAE,KAAK,EAAE,QAAQ,CAAC,UAElC,CAAC,GAAG;QACV,QAAQ,EAAE,oBAAoB,CAAC,QAAQ,CAAC,CAAC;QACzC,OAAO,CAAC,EAAE,gBAAgB,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC;KACzC,GACA,CAAC;iBACyB,YAAY,CAAC,CAAC,EAAE,KAAK,CAAC,UACzC,GAAC,GAAG;QACV,QAAQ,CAAC,EAAE,SAAS,CAAC;QACrB,OAAO,CAAC,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAC;KAC/B,GACA,GAAC;CAKL,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schemaConfig.js","sourceRoot":"","sources":["../../../src/schemaConfig.ts"],"names":[],"mappings":";;;AAGA,qDAM0B;AALxB,kHAAA,cAAc,OAAA;AACd,8HAAA,0BAA0B,OAAA;AAC1B,yIAAA,qCAAqC,OAAA;AACrC,0HAAA,sBAAsB,OAAA;AACtB,qIAAA,iCAAiC,OAAA;
|
|
1
|
+
{"version":3,"file":"schemaConfig.js","sourceRoot":"","sources":["../../../src/schemaConfig.ts"],"names":[],"mappings":";;;AAGA,qDAM0B;AALxB,kHAAA,cAAc,OAAA;AACd,8HAAA,0BAA0B,OAAA;AAC1B,yIAAA,qCAAqC,OAAA;AACrC,0HAAA,sBAAsB,OAAA;AACtB,qIAAA,iCAAiC,OAAA;AAqHnC,+EAA+E;AACxE,MAAM,YAAY,GAAG,GAGxB,EAAE;IAgBJ,SAAS,SAAS,CAAC,MAAe;QAChC,OAAO,MAAM,CAAC;IAChB,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC;AAvBW,QAAA,YAAY,gBAuBvB"}
|
package/package.json
CHANGED