@prostgles/prostgles 2.3.6-dev.1787077577 → 2.3.6-dev.1787224693
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/client/build/js/main.bundle.js +1 -1
- package/dist/server/package.json +5 -1
- package/dist/server/src/ConnectionManager/applyStartupSchemaConfig.d.ts +7 -1
- package/dist/server/src/ConnectionManager/applyStartupSchemaConfig.d.ts.map +1 -1
- package/dist/server/src/ConnectionManager/applyStartupSchemaConfig.js +17 -7
- package/dist/server/src/ConnectionManager/applyStartupSchemaConfig.js.map +1 -1
- package/dist/server/src/ConnectionManager/getHotReloadConfigs.d.ts.map +1 -1
- package/dist/server/src/ConnectionManager/getHotReloadConfigs.js +3 -3
- package/dist/server/src/ConnectionManager/getHotReloadConfigs.js.map +1 -1
- package/dist/server/src/McpHub/ProstglesMcpHub/ProstglesMCPServers/Web/getDocumentText.d.ts +2 -1
- package/dist/server/src/McpHub/ProstglesMcpHub/ProstglesMCPServers/Web/getDocumentText.d.ts.map +1 -1
- package/dist/server/src/McpHub/ProstglesMcpHub/ProstglesMCPServers/Web/getDocumentText.js.map +1 -1
- package/dist/server/src/McpHub/ProstglesMcpHub/ProstglesMCPServers/WebDev/tools/searchWebDevFiles.spec.js +1 -0
- package/dist/server/src/McpHub/ProstglesMcpHub/ProstglesMCPServers/WebDev/tools/searchWebDevFiles.spec.js.map +1 -1
- package/dist/server/src/ServiceManager/ServiceManager.d.ts +22 -11
- package/dist/server/src/ServiceManager/ServiceManager.d.ts.map +1 -1
- package/dist/server/src/ServiceManager/ServiceManager.js +39 -4
- package/dist/server/src/ServiceManager/ServiceManager.js.map +1 -1
- package/dist/server/src/ServiceManager/ServiceManager.spec.d.ts.map +1 -1
- package/dist/server/src/ServiceManager/ServiceManager.spec.js +37 -1
- package/dist/server/src/ServiceManager/ServiceManager.spec.js.map +1 -1
- package/dist/server/src/ServiceManager/ServiceManagerTypes.d.ts +7 -0
- package/dist/server/src/ServiceManager/ServiceManagerTypes.d.ts.map +1 -1
- package/dist/server/src/ServiceManager/ServiceManagerTypes.js.map +1 -1
- package/dist/server/src/ServiceManager/buildService.d.ts +3 -3
- package/dist/server/src/ServiceManager/buildService.d.ts.map +1 -1
- package/dist/server/src/ServiceManager/buildService.js +10 -6
- package/dist/server/src/ServiceManager/buildService.js.map +1 -1
- package/dist/server/src/ServiceManager/enableService.d.ts +3 -3
- package/dist/server/src/ServiceManager/enableService.d.ts.map +1 -1
- package/dist/server/src/ServiceManager/enableService.js.map +1 -1
- package/dist/server/src/ServiceManager/getSelectedConfigEnvs.d.ts +2 -3
- package/dist/server/src/ServiceManager/getSelectedConfigEnvs.d.ts.map +1 -1
- package/dist/server/src/ServiceManager/getSelectedConfigEnvs.js +3 -3
- package/dist/server/src/ServiceManager/getSelectedConfigEnvs.js.map +1 -1
- package/dist/server/src/ServiceManager/getServiceEndpoints.d.ts.map +1 -1
- package/dist/server/src/ServiceManager/getServiceEndpoints.js +9 -1
- package/dist/server/src/ServiceManager/getServiceEndpoints.js.map +1 -1
- package/dist/server/src/ServiceManager/initialiseServices.d.ts.map +1 -1
- package/dist/server/src/ServiceManager/initialiseServices.js +3 -2
- package/dist/server/src/ServiceManager/initialiseServices.js.map +1 -1
- package/dist/server/src/ServiceManager/startService.d.ts +3 -3
- package/dist/server/src/ServiceManager/startService.d.ts.map +1 -1
- package/dist/server/src/ServiceManager/startService.js +9 -7
- package/dist/server/src/ServiceManager/startService.js.map +1 -1
- package/dist/server/src/ServiceManager/stopService.d.ts +1 -2
- package/dist/server/src/ServiceManager/stopService.d.ts.map +1 -1
- package/dist/server/src/ServiceManager/stopService.js +1 -1
- package/dist/server/src/ServiceManager/stopService.js.map +1 -1
- package/dist/server/src/cli/cli.js +4 -34
- package/dist/server/src/cli/cli.js.map +1 -1
- package/dist/server/src/cli/cliTemplateFiles.d.ts +8 -0
- package/dist/server/src/cli/cliTemplateFiles.d.ts.map +1 -0
- package/dist/server/src/cli/cliTemplateFiles.js +409 -0
- package/dist/server/src/cli/cliTemplateFiles.js.map +1 -0
- package/dist/server/src/cli/getCliAgentsFile.d.ts.map +1 -1
- package/dist/server/src/cli/getCliAgentsFile.js +8 -0
- package/dist/server/src/cli/getCliAgentsFile.js.map +1 -1
- package/dist/server/src/init/prostglesOnReady.d.ts +2 -1
- package/dist/server/src/init/prostglesOnReady.d.ts.map +1 -1
- package/dist/server/src/init/prostglesOnReady.js +18 -3
- package/dist/server/src/init/prostglesOnReady.js.map +1 -1
- package/dist/server/src/schemaConfig.d.ts +4 -0
- package/dist/server/src/schemaConfig.d.ts.map +1 -1
- package/dist/server/src/schemaConfig.js.map +1 -1
- package/dist/server/src/serverFunctions/adminServerFunctions/stateServerAdminFunctions.d.ts.map +1 -1
- package/dist/server/src/serverFunctions/adminServerFunctions/stateServerAdminFunctions.js +1 -2
- package/dist/server/src/serverFunctions/adminServerFunctions/stateServerAdminFunctions.js.map +1 -1
- package/dist/server/src/services.d.ts +4 -0
- package/dist/server/src/services.d.ts.map +1 -0
- package/dist/server/src/services.js +8 -0
- package/dist/server/src/services.js.map +1 -0
- package/package.json +5 -1
- package/dist/server/src/cli/cliUtils.d.ts +0 -64
- package/dist/server/src/cli/cliUtils.d.ts.map +0 -1
- package/dist/server/src/cli/cliUtils.js +0 -201
- package/dist/server/src/cli/cliUtils.js.map +0 -1
- package/dist/server/src/testing/createTestDeployment.d.ts +0 -37
- package/dist/server/src/testing/createTestDeployment.d.ts.map +0 -1
- package/dist/server/src/testing/createTestDeployment.js +0 -393
- package/dist/server/src/testing/createTestDeployment.js.map +0 -1
- package/dist/server/src/testing/index.d.ts +0 -2
- package/dist/server/src/testing/index.d.ts.map +0 -1
- package/dist/server/src/testing/index.js +0 -6
- package/dist/server/src/testing/index.js.map +0 -1
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.1787224693",
|
|
4
4
|
"description": "Prostgles UI runtime and configurable PostgreSQL dashboard",
|
|
5
5
|
"main": "dist/server/src/schemaConfig.js",
|
|
6
6
|
"bin": {
|
|
@@ -87,6 +87,10 @@
|
|
|
87
87
|
"./testing": {
|
|
88
88
|
"types": "./dist/server/src/cli/testing/index.d.ts",
|
|
89
89
|
"default": "./dist/server/src/cli/testing/index.js"
|
|
90
|
+
},
|
|
91
|
+
"./services": {
|
|
92
|
+
"types": "./dist/server/src/services.d.ts",
|
|
93
|
+
"default": "./dist/server/src/services.js"
|
|
90
94
|
}
|
|
91
95
|
}
|
|
92
96
|
}
|
|
@@ -1,8 +1,14 @@
|
|
|
1
1
|
import type { DBS } from "..";
|
|
2
2
|
import type { DB } from "prostgles-server/dist/Prostgles";
|
|
3
|
+
export declare const getStartupSchemaConfig: () => {
|
|
4
|
+
configPath: string;
|
|
5
|
+
databaseUrl: string;
|
|
6
|
+
schemaConfig: import("../schemaConfig").SchemaConfig;
|
|
7
|
+
} | undefined;
|
|
3
8
|
/** Apply the config selected by the CLI after the state database is ready. */
|
|
4
|
-
export declare const applyStartupSchemaConfig: ({ dbs, db, }: {
|
|
9
|
+
export declare const applyStartupSchemaConfig: ({ dbs, db, startupSchemaConfig, }: {
|
|
5
10
|
dbs: DBS;
|
|
6
11
|
db: DB;
|
|
12
|
+
startupSchemaConfig: ReturnType<typeof getStartupSchemaConfig>;
|
|
7
13
|
}) => Promise<void>;
|
|
8
14
|
//# sourceMappingURL=applyStartupSchemaConfig.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"applyStartupSchemaConfig.d.ts","sourceRoot":"","sources":["../../../../src/ConnectionManager/applyStartupSchemaConfig.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,IAAI,CAAC;AAM9B,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,iCAAiC,CAAC;AAE1D,8EAA8E;AAC9E,eAAO,MAAM,wBAAwB,GAAU,
|
|
1
|
+
{"version":3,"file":"applyStartupSchemaConfig.d.ts","sourceRoot":"","sources":["../../../../src/ConnectionManager/applyStartupSchemaConfig.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,IAAI,CAAC;AAM9B,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,iCAAiC,CAAC;AAE1D,eAAO,MAAM,sBAAsB;;;;aA2BlC,CAAC;AAEF,8EAA8E;AAC9E,eAAO,MAAM,wBAAwB,GAAU,mCAI5C;IACD,GAAG,EAAE,GAAG,CAAC;IACT,EAAE,EAAE,EAAE,CAAC;IACP,mBAAmB,EAAE,UAAU,CAAC,OAAO,sBAAsB,CAAC,CAAC;CAChE,kBA8BA,CAAC"}
|
|
@@ -1,21 +1,19 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.applyStartupSchemaConfig = void 0;
|
|
3
|
+
exports.applyStartupSchemaConfig = exports.getStartupSchemaConfig = void 0;
|
|
4
4
|
const __1 = require("..");
|
|
5
5
|
const upsertConnection_1 = require("../upsertConnection");
|
|
6
6
|
const getSchemaConfig_1 = require("./getSchemaConfig");
|
|
7
7
|
const syncSchemaConfig_1 = require("./syncSchemaConfig");
|
|
8
|
-
|
|
9
|
-
const applyStartupSchemaConfig = async ({ dbs, db, }) => {
|
|
8
|
+
const getStartupSchemaConfig = () => {
|
|
10
9
|
const configPath = process.env.PROSTGLES_UI_CONFIG;
|
|
11
10
|
if (!configPath)
|
|
12
11
|
return;
|
|
13
|
-
const
|
|
12
|
+
const loadedSchemaConfig = (0, getSchemaConfig_1.getSchemaConfig)({
|
|
14
13
|
configPath,
|
|
15
14
|
type: "cli",
|
|
16
15
|
lastSynced: new Date().toISOString(),
|
|
17
|
-
};
|
|
18
|
-
const loadedSchemaConfig = (0, getSchemaConfig_1.getSchemaConfig)(config_sync);
|
|
16
|
+
});
|
|
19
17
|
const schemaConfig = loadedSchemaConfig.config;
|
|
20
18
|
if (!schemaConfig.id) {
|
|
21
19
|
throw new Error("The config must export an `id` when started through the CLI.");
|
|
@@ -24,6 +22,18 @@ const applyStartupSchemaConfig = async ({ dbs, db, }) => {
|
|
|
24
22
|
if (!databaseUrl) {
|
|
25
23
|
throw new Error("PROSTGLES_DATABASE_URL is required when started through the CLI.");
|
|
26
24
|
}
|
|
25
|
+
return {
|
|
26
|
+
configPath: loadedSchemaConfig.configPath,
|
|
27
|
+
databaseUrl,
|
|
28
|
+
schemaConfig,
|
|
29
|
+
};
|
|
30
|
+
};
|
|
31
|
+
exports.getStartupSchemaConfig = getStartupSchemaConfig;
|
|
32
|
+
/** Apply the config selected by the CLI after the state database is ready. */
|
|
33
|
+
const applyStartupSchemaConfig = async ({ dbs, db, startupSchemaConfig, }) => {
|
|
34
|
+
if (!startupSchemaConfig)
|
|
35
|
+
return;
|
|
36
|
+
const { configPath, databaseUrl, schemaConfig } = startupSchemaConfig;
|
|
27
37
|
const configuredConnection = {
|
|
28
38
|
...schemaConfig.connection,
|
|
29
39
|
type: "Connection URI",
|
|
@@ -40,7 +50,7 @@ const applyStartupSchemaConfig = async ({ dbs, db, }) => {
|
|
|
40
50
|
await (0, syncSchemaConfig_1.syncSchemaConfig)({
|
|
41
51
|
dbs,
|
|
42
52
|
connectionId: connection.id,
|
|
43
|
-
configPath
|
|
53
|
+
configPath,
|
|
44
54
|
type: "cli",
|
|
45
55
|
});
|
|
46
56
|
await __1.connectionManager.startConnection(connection.id, dbs, db);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"applyStartupSchemaConfig.js","sourceRoot":"","sources":["../../../../src/ConnectionManager/applyStartupSchemaConfig.ts"],"names":[],"mappings":";;;AACA,0BAAuC;AAEvC,0DAAuD;AACvD,uDAAoD;AACpD,yDAAsD;
|
|
1
|
+
{"version":3,"file":"applyStartupSchemaConfig.js","sourceRoot":"","sources":["../../../../src/ConnectionManager/applyStartupSchemaConfig.ts"],"names":[],"mappings":";;;AACA,0BAAuC;AAEvC,0DAAuD;AACvD,uDAAoD;AACpD,yDAAsD;AAG/C,MAAM,sBAAsB,GAAG,GAAG,EAAE;IACzC,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC;IACnD,IAAI,CAAC,UAAU;QAAE,OAAO;IAExB,MAAM,kBAAkB,GAAG,IAAA,iCAAe,EAAC;QACzC,UAAU;QACV,IAAI,EAAE,KAAK;QACX,UAAU,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;KACrC,CAAC,CAAC;IACH,MAAM,YAAY,GAAG,kBAAkB,CAAC,MAAM,CAAC;IAC/C,IAAI,CAAC,YAAY,CAAC,EAAE,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CACb,8DAA8D,CAC/D,CAAC;IACJ,CAAC;IACD,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC;IACvD,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,MAAM,IAAI,KAAK,CACb,kEAAkE,CACnE,CAAC;IACJ,CAAC;IAED,OAAO;QACL,UAAU,EAAE,kBAAkB,CAAC,UAAU;QACzC,WAAW;QACX,YAAY;KACb,CAAC;AACJ,CAAC,CAAC;AA3BW,QAAA,sBAAsB,0BA2BjC;AAEF,8EAA8E;AACvE,MAAM,wBAAwB,GAAG,KAAK,EAAE,EAC7C,GAAG,EACH,EAAE,EACF,mBAAmB,GAKpB,EAAE,EAAE;IACH,IAAI,CAAC,mBAAmB;QAAE,OAAO;IACjC,MAAM,EAAE,UAAU,EAAE,WAAW,EAAE,YAAY,EAAE,GAAG,mBAAmB,CAAC;IACtE,MAAM,oBAAoB,GAAG;QAC3B,GAAG,YAAY,CAAC,UAAU;QAC1B,IAAI,EAAE,gBAAyB;QAC/B,OAAO,EAAE,WAAW;KACrB,CAAC;IAEF,MAAM,kBAAkB,GAAG,MAAM,GAAG,CAAC,WAAW,CAAC,OAAO,CAAC;QACvD,IAAI,EAAE,YAAY,CAAC,EAAE;KACtB,CAAC,CAAC;IACH,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,IAAA,mCAAgB,EAC3C;QACE,GAAG,oBAAoB;QACvB,EAAE,EAAE,kBAAkB,EAAE,EAAE;QAC1B,IAAI,EAAE,YAAY,CAAC,EAAE;KACF,EACrB,IAAI,EACJ,GAAG,EACH,CAAC,GAAG,CAAC,CACN,CAAC;IAEF,MAAM,IAAA,mCAAgB,EAAC;QACrB,GAAG;QACH,YAAY,EAAE,UAAU,CAAC,EAAE;QAC3B,UAAU;QACV,IAAI,EAAE,KAAK;KACZ,CAAC,CAAC;IACH,MAAM,qBAAiB,CAAC,eAAe,CAAC,UAAU,CAAC,EAAE,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;AAClE,CAAC,CAAC;AAtCW,QAAA,wBAAwB,4BAsCnC"}
|
|
@@ -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;AAKlE,MAAM,MAAM,sBAAsB,GAAG,qBAAqB,CACxD,IAAI,CACF,gBAAgB,CAAC,IAAI,EAAE,KAAK,CAAC,EAC3B,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;AAeF,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;;;;;;;;;;;;;;;;qBA9DoD,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;AAKlE,MAAM,MAAM,sBAAsB,GAAG,qBAAqB,CACxD,IAAI,CACF,gBAAgB,CAAC,IAAI,EAAE,KAAK,CAAC,EAC3B,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;AAeF,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;;;;;;;;;;;;;;;;qBA9DoD,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;6BAiK21R,CAAC;;;;;;;;;;;;;;;;;;;oCAA39C,CAAC;;;;oCAA4E,CAAC;;;;;;;;;0BAAqI,CAAC;;;;;;;;;;kCAA4J,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;;;;;;;;;;;;;;;;;;;;;;;;;;;gCAAhqC,CAAC;;;;gCAA4E,CAAC;;;;;;;;;;;;;;;;;;;8BAAkS,CAAC;mCAA2B,CAAC;;;;;+BAAmG,CAAC;;;;;;;;;;;+BAA+M,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EADvnQ,CAAC"}
|
|
@@ -11,7 +11,7 @@ const parseTableConfig_1 = require("./parseTableConfig");
|
|
|
11
11
|
const modifyClientSchema_1 = require("./modifyClientSchema");
|
|
12
12
|
const getSchemaConfig_1 = require("./getSchemaConfig");
|
|
13
13
|
const utils_1 = require("../init/utils");
|
|
14
|
-
const
|
|
14
|
+
const cliTemplateFiles_1 = require("../cli/cliTemplateFiles");
|
|
15
15
|
const mergeFunctions = (schemaFunctions, connectionFunctions) => {
|
|
16
16
|
if (!schemaFunctions)
|
|
17
17
|
return connectionFunctions;
|
|
@@ -83,10 +83,10 @@ const getHotReloadConfigs = async ({ dbs, _dbs, connection, databaseConfig, conn
|
|
|
83
83
|
: web_app_templated && web_app_directory ?
|
|
84
84
|
(0, path_1.join)(web_app_directory, "client", "src", "api")
|
|
85
85
|
: db_watch_schema && config_sync?.type === "cli" ?
|
|
86
|
-
(0, path_1.join)(config_sync.configPath,
|
|
86
|
+
(0, path_1.join)(config_sync.configPath, cliTemplateFiles_1.generatedFolderName)
|
|
87
87
|
: undefined,
|
|
88
88
|
tsGeneratedTypesFunctionsPath: !utils_1.IS_PROD && db_watch_schema && config_sync?.type === "cli" ?
|
|
89
|
-
(0, path_1.join)(config_sync.configPath,
|
|
89
|
+
(0, path_1.join)(config_sync.configPath, cliTemplateFiles_1.srcFolderName, "index.ts")
|
|
90
90
|
: undefined,
|
|
91
91
|
functions: mergeFunctions(schemaConfig?.functions, connectionFunctions),
|
|
92
92
|
modifyClientSchema: (table, tableConfig, userData) => (0, modifyClientSchema_1.modifyClientSchema)({
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"getHotReloadConfigs.js","sourceRoot":"","sources":["../../../../src/ConnectionManager/getHotReloadConfigs.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import type { documentsServiceInputSchema } from "../../../../../../common/mcp/documentsServiceInputSchema";
|
|
2
2
|
import type { ServiceManager } from "../../../../ServiceManager/ServiceManager";
|
|
3
|
+
import type { prostglesServices } from "../../../../ServiceManager/ServiceManagerTypes";
|
|
3
4
|
import type { JSONB } from "prostgles-types";
|
|
4
|
-
export declare const getDocumentText: (serviceManager: ServiceManager
|
|
5
|
+
export declare const getDocumentText: (serviceManager: ServiceManager<typeof prostglesServices>, url: string, otherOpts: Partial<JSONB.GetType<typeof documentsServiceInputSchema>>) => Promise<string>;
|
|
5
6
|
//# sourceMappingURL=getDocumentText.d.ts.map
|
package/dist/server/src/McpHub/ProstglesMcpHub/ProstglesMCPServers/Web/getDocumentText.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getDocumentText.d.ts","sourceRoot":"","sources":["../../../../../../../src/McpHub/ProstglesMcpHub/ProstglesMCPServers/Web/getDocumentText.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,yCAAyC,CAAC;AAC3F,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;
|
|
1
|
+
{"version":3,"file":"getDocumentText.d.ts","sourceRoot":"","sources":["../../../../../../../src/McpHub/ProstglesMcpHub/ProstglesMCPServers/Web/getDocumentText.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,yCAAyC,CAAC;AAC3F,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACzE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAEjF,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAE7C,eAAO,MAAM,eAAe,GAC1B,gBAAgB,cAAc,CAAC,OAAO,iBAAiB,CAAC,EACxD,KAAK,MAAM,EACX,WAAW,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,2BAA2B,CAAC,CAAC,oBAyBtE,CAAC"}
|
package/dist/server/src/McpHub/ProstglesMcpHub/ProstglesMCPServers/Web/getDocumentText.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getDocumentText.js","sourceRoot":"","sources":["../../../../../../../src/McpHub/ProstglesMcpHub/ProstglesMCPServers/Web/getDocumentText.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"getDocumentText.js","sourceRoot":"","sources":["../../../../../../../src/McpHub/ProstglesMcpHub/ProstglesMCPServers/Web/getDocumentText.ts"],"names":[],"mappings":";;;AAGA,gGAA4G;AAGrG,MAAM,eAAe,GAAG,KAAK,EAClC,cAAwD,EACxD,GAAW,EACX,SAAqE,EACrE,EAAE;IACF,MAAM,WAAW,GAAG,MAAM,cAAc,CAAC,qBAAqB,CAAC,WAAW,CAAC,CAAC;IAC5E,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,SAAS,CAAC,oBAAoB,CAAC,CAAC;QAC/D,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC;QAChC,OAAO,EAAE;YACP,GAAG,oDAAgC;YACnC,GAAG,SAAS;SACb;KACF,CAAC,CAAC;IACH,MAAM,EACJ,YAAY,EACZ,eAAe,EACf,YAAY,EACZ,YAAY,EACZ,UAAU,GACX,GAAG,MAAM,CAAC,QAAQ,CAAC;IACpB,OAAO,MAAM,CACX,YAAY;QACV,UAAU;QACV,YAAY;QACZ,eAAe;QACf,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC;QAC5B,EAAE,CACL,CAAC;AACJ,CAAC,CAAC;AA5BW,QAAA,eAAe,mBA4B1B"}
|
|
@@ -15,6 +15,7 @@ void (0, node_test_1.test)("searchWebDevFiles: basic search", async () => {
|
|
|
15
15
|
});
|
|
16
16
|
assert_1.strict.ok(result.length > 0, "Should find at least one result");
|
|
17
17
|
const firstResult = result[0];
|
|
18
|
+
console.log("First result:", firstResult);
|
|
18
19
|
assert_1.strict.equal(firstResult.filePath, "src/useAppState/PrglCoreContextProvider.tsx");
|
|
19
20
|
assert_1.strict.ok(firstResult.matchedContent.includes("const usePrglCore = () => {"), "Matched content should include 'Test Component'");
|
|
20
21
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"searchWebDevFiles.spec.js","sourceRoot":"","sources":["../../../../../../../../src/McpHub/ProstglesMcpHub/ProstglesMCPServers/WebDev/tools/searchWebDevFiles.spec.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"searchWebDevFiles.spec.js","sourceRoot":"","sources":["../../../../../../../../src/McpHub/ProstglesMcpHub/ProstglesMCPServers/WebDev/tools/searchWebDevFiles.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,23 +1,34 @@
|
|
|
1
1
|
import { type ProcessLog } from "../McpHub/DockerSandbox/executeDockerCommand";
|
|
2
2
|
import type { DBS } from "..";
|
|
3
|
-
import {
|
|
3
|
+
import { ServiceInstance, type ProstglesService, type RunningServiceInstance, type ServiceRegistry } from "./ServiceManagerTypes";
|
|
4
4
|
import type { ExtractBy } from "../../../common/utils";
|
|
5
|
-
export
|
|
5
|
+
export type StringKeyof<T> = Extract<keyof T, string>;
|
|
6
|
+
export type ServiceManagerConfig<Services extends ServiceRegistry> = {
|
|
7
|
+
services: Services;
|
|
8
|
+
serviceRoot: string;
|
|
9
|
+
};
|
|
10
|
+
export declare class ServiceManager<Services extends ServiceRegistry = Record<string, ProstglesService>> {
|
|
11
|
+
readonly services: Services;
|
|
12
|
+
private readonly serviceRoots;
|
|
6
13
|
dbs: DBS | undefined;
|
|
7
|
-
constructor(
|
|
14
|
+
private constructor();
|
|
15
|
+
static create<Services extends ServiceRegistry>(config: ServiceManagerConfig<Services>, dbs: DBS | undefined): Promise<ServiceManager<Services>>;
|
|
16
|
+
private registerServices;
|
|
17
|
+
addServices: <AdditionalServices extends ServiceRegistry>({ services, serviceRoot, }: ServiceManagerConfig<AdditionalServices>) => Promise<ServiceManager<Services & AdditionalServices>>;
|
|
18
|
+
getServiceRoot: (serviceName: string) => string;
|
|
8
19
|
serviceLogUpdateQueue: Map<string, Promise<void>>;
|
|
9
|
-
onServiceLog: (serviceName:
|
|
20
|
+
onServiceLog: (serviceName: StringKeyof<Services>, logItems: ProcessLog[]) => void;
|
|
10
21
|
activeServices: Map<string, ServiceInstance>;
|
|
11
22
|
enablingServices: Map<string, Promise<RunningServiceInstance>>;
|
|
12
|
-
getActiveService<Status extends ServiceInstance["status"]>(serviceName:
|
|
23
|
+
getActiveService<Status extends ServiceInstance["status"]>(serviceName: StringKeyof<Services>, expectedStatus: Status): Extract<ServiceInstance, {
|
|
13
24
|
status: Status;
|
|
14
25
|
}>;
|
|
15
|
-
getService<ServiceName extends
|
|
16
|
-
getServiceWithRetries<ServiceName extends
|
|
17
|
-
buildService: (serviceName:
|
|
18
|
-
startService: (serviceName:
|
|
19
|
-
enableService: (serviceName:
|
|
20
|
-
stopService: (serviceName:
|
|
26
|
+
getService<ServiceName extends StringKeyof<Services>, ExistingServices extends Services>(serviceName: ServiceName): ServiceInstance<ExistingServices[ServiceName]> | undefined;
|
|
27
|
+
getServiceWithRetries<ServiceName extends StringKeyof<Services>, ExistingServices extends Services>(serviceName: ServiceName, onLogs?: (logs: ProcessLog[]) => void): Promise<ExtractBy<ServiceInstance<ExistingServices[ServiceName]>, "status", "running">>;
|
|
28
|
+
buildService: (serviceName: string, onLogs: import("./ServiceManagerTypes").OnServiceLogs) => Promise<"error" | "timed-out" | "close" | "aborted">;
|
|
29
|
+
startService: (serviceName: string, onLogs: import("./ServiceManagerTypes").OnServiceLogs) => Promise<RunningServiceInstance<ProstglesService>>;
|
|
30
|
+
enableService: (serviceName: string, onLogs: (logs: ProcessLog[]) => void) => Promise<RunningServiceInstance<ProstglesService>>;
|
|
31
|
+
stopService: (serviceName: string) => void;
|
|
21
32
|
destroy: () => void;
|
|
22
33
|
}
|
|
23
34
|
//# sourceMappingURL=ServiceManager.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ServiceManager.d.ts","sourceRoot":"","sources":["../../../../src/ServiceManager/ServiceManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,gDAAgD,CAAC;AACjF,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,IAAI,CAAC;AAI9B,OAAO,
|
|
1
|
+
{"version":3,"file":"ServiceManager.d.ts","sourceRoot":"","sources":["../../../../src/ServiceManager/ServiceManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,gDAAgD,CAAC;AACjF,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,IAAI,CAAC;AAI9B,OAAO,EAEL,eAAe,EACf,KAAK,gBAAgB,EACrB,KAAK,sBAAsB,EAC3B,KAAK,eAAe,EACrB,MAAM,uBAAuB,CAAC;AAK/B,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAE/C,MAAM,MAAM,WAAW,CAAC,CAAC,IAAI,OAAO,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,CAAC;AAEtD,MAAM,MAAM,oBAAoB,CAAC,QAAQ,SAAS,eAAe,IAAI;IACnE,QAAQ,EAAE,QAAQ,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,qBAAa,cAAc,CACzB,QAAQ,SAAS,eAAe,GAAG,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC;IAEnE,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC;IAC5B,OAAO,CAAC,QAAQ,CAAC,YAAY,CAA6B;IAC1D,GAAG,EAAE,GAAG,GAAG,SAAS,CAAC;IAErB,OAAO;WAQM,MAAM,CAAC,QAAQ,SAAS,eAAe,EAClD,MAAM,EAAE,oBAAoB,CAAC,QAAQ,CAAC,EACtC,GAAG,EAAE,GAAG,GAAG,SAAS;YAOR,gBAAgB;IA2B9B,WAAW,GAAU,kBAAkB,SAAS,eAAe,EAAE,4BAG9D,oBAAoB,CAAC,kBAAkB,CAAC,4DAMzC;IAEF,cAAc,GAAI,aAAa,MAAM,YAMnC;IAEF,qBAAqB,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAa;IAC9D,YAAY,GACV,aAAa,WAAW,CAAC,QAAQ,CAAC,EAClC,UAAU,UAAU,EAAE,UAiDtB;IACF,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,eAAe,CAAC,CAAa;IACzD,gBAAgB,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,sBAAsB,CAAC,CAAC,CAAa;IAE3E,gBAAgB,CAAC,MAAM,SAAS,eAAe,CAAC,QAAQ,CAAC,EACvD,WAAW,EAAE,WAAW,CAAC,QAAQ,CAAC,EAClC,cAAc,EAAE,MAAM,GAQG,OAAO,CAAC,eAAe,EAAE;QAAE,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;IAGvE,UAAU,CACR,WAAW,SAAS,WAAW,CAAC,QAAQ,CAAC,EACzC,gBAAgB,SAAS,QAAQ,EAEjC,WAAW,EAAE,WAAW,GACvB,eAAe,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC,GAAG,SAAS;IAOvD,qBAAqB,CACzB,WAAW,SAAS,WAAW,CAAC,QAAQ,CAAC,EACzC,gBAAgB,SAAS,QAAQ,EAEjC,WAAW,EAAE,WAAW,EACxB,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,UAAU,EAAE,KAAK,IAAI,GACpC,OAAO,CACR,SAAS,CACP,eAAe,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC,EAC9C,QAAQ,EACR,SAAS,CACV,CACF;IAqBD,YAAY,uIAA2B;IAEvC,YAAY,oIAA2B;IAEvC,aAAa,mHAA4B;IAEzC,WAAW,gCAA0B;IAErC,OAAO,aAOL;CACH"}
|
|
@@ -4,18 +4,53 @@ exports.ServiceManager = void 0;
|
|
|
4
4
|
const buildService_1 = require("./buildService");
|
|
5
5
|
const enableService_1 = require("./enableService");
|
|
6
6
|
const initialiseServices_1 = require("./initialiseServices");
|
|
7
|
+
const ServiceManagerTypes_1 = require("./ServiceManagerTypes");
|
|
7
8
|
const startService_1 = require("./startService");
|
|
8
9
|
const stopService_1 = require("./stopService");
|
|
9
10
|
const utils_1 = require("../init/utils");
|
|
10
11
|
const withRetries_1 = require("./withRetries");
|
|
11
12
|
class ServiceManager {
|
|
13
|
+
services;
|
|
14
|
+
serviceRoots = new Map();
|
|
12
15
|
dbs;
|
|
13
|
-
constructor(dbs) {
|
|
16
|
+
constructor(_config, dbs) {
|
|
17
|
+
this.services = {};
|
|
14
18
|
this.dbs = dbs;
|
|
15
|
-
|
|
16
|
-
|
|
19
|
+
}
|
|
20
|
+
static async create(config, dbs) {
|
|
21
|
+
const instance = new ServiceManager(config, dbs);
|
|
22
|
+
await instance.registerServices(config, true);
|
|
23
|
+
return instance;
|
|
24
|
+
}
|
|
25
|
+
async registerServices({ services, serviceRoot }, allowBuiltInServices = false) {
|
|
26
|
+
const clashingServices = Object.keys(services).filter((serviceName) => Object.hasOwn(this.services, serviceName) ||
|
|
27
|
+
(!allowBuiltInServices &&
|
|
28
|
+
Object.hasOwn(ServiceManagerTypes_1.prostglesServices, serviceName)));
|
|
29
|
+
if (clashingServices.length) {
|
|
30
|
+
throw new Error(`ServiceManager: Clashing service names detected: ${clashingServices.join(", ")}. Please rename your services to avoid conflicts with registered or built-in services.`);
|
|
31
|
+
}
|
|
32
|
+
Object.assign(this.services, services);
|
|
33
|
+
Object.keys(services).forEach((serviceName) => {
|
|
34
|
+
this.serviceRoots.set(serviceName, serviceRoot);
|
|
35
|
+
});
|
|
36
|
+
if (this.dbs) {
|
|
37
|
+
await (0, initialiseServices_1.initialiseServices)(this, this.dbs);
|
|
17
38
|
}
|
|
18
39
|
}
|
|
40
|
+
addServices = async ({ services, serviceRoot, }) => {
|
|
41
|
+
await this.registerServices({
|
|
42
|
+
services,
|
|
43
|
+
serviceRoot,
|
|
44
|
+
});
|
|
45
|
+
return this;
|
|
46
|
+
};
|
|
47
|
+
getServiceRoot = (serviceName) => {
|
|
48
|
+
const serviceRoot = this.serviceRoots.get(serviceName);
|
|
49
|
+
if (serviceRoot === undefined) {
|
|
50
|
+
throw new Error(`Service ${serviceName} has no registered root`);
|
|
51
|
+
}
|
|
52
|
+
return serviceRoot;
|
|
53
|
+
};
|
|
19
54
|
serviceLogUpdateQueue = new Map();
|
|
20
55
|
onServiceLog = (serviceName, logItems) => {
|
|
21
56
|
const prevQueue = this.serviceLogUpdateQueue.get(serviceName) ?? Promise.resolve();
|
|
@@ -30,7 +65,7 @@ class ServiceManager {
|
|
|
30
65
|
.map((l) => l.text)
|
|
31
66
|
.join("");
|
|
32
67
|
if (!this.dbs) {
|
|
33
|
-
console.warn("No dbs
|
|
68
|
+
console.warn("No dbs provided. Will not store service logs", {
|
|
34
69
|
serviceName,
|
|
35
70
|
serviceStatus,
|
|
36
71
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ServiceManager.js","sourceRoot":"","sources":["../../../../src/ServiceManager/ServiceManager.ts"],"names":[],"mappings":";;;AAEA,iDAA8C;AAC9C,mDAAgD;AAChD,6DAA0D;
|
|
1
|
+
{"version":3,"file":"ServiceManager.js","sourceRoot":"","sources":["../../../../src/ServiceManager/ServiceManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ServiceManager.spec.d.ts","sourceRoot":"","sources":["../../../../src/ServiceManager/ServiceManager.spec.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ServiceManager.spec.d.ts","sourceRoot":"","sources":["../../../../src/ServiceManager/ServiceManager.spec.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,gBAAgB,SAA4B,CAAC"}
|
|
@@ -4,14 +4,50 @@ exports.IS_GITHUB_WORKER = void 0;
|
|
|
4
4
|
const assert_1 = require("assert");
|
|
5
5
|
const node_test_1 = require("node:test");
|
|
6
6
|
const ServiceManager_1 = require("./ServiceManager");
|
|
7
|
+
const ServiceManagerTypes_1 = require("./ServiceManagerTypes");
|
|
7
8
|
exports.IS_GITHUB_WORKER = process.env.CI === "true";
|
|
8
9
|
void (0, node_test_1.describe)("Service manager tests", async () => {
|
|
10
|
+
await (0, node_test_1.test)("Initialises built-in and additional services without name clashes", async () => {
|
|
11
|
+
let insertedServiceNames = [];
|
|
12
|
+
const serviceManager = await ServiceManager_1.ServiceManager.create({
|
|
13
|
+
services: ServiceManagerTypes_1.prostglesServices,
|
|
14
|
+
serviceRoot: "built-in-services",
|
|
15
|
+
}, {
|
|
16
|
+
services: {
|
|
17
|
+
insertMany: (services) => {
|
|
18
|
+
insertedServiceNames = services.map(({ name }) => name);
|
|
19
|
+
return Promise.resolve();
|
|
20
|
+
},
|
|
21
|
+
find: () => Promise.resolve([]),
|
|
22
|
+
},
|
|
23
|
+
});
|
|
24
|
+
const extendedServiceManager = await serviceManager.addServices({
|
|
25
|
+
services: { appService: ServiceManagerTypes_1.prostglesServices.documents },
|
|
26
|
+
serviceRoot: "app-services",
|
|
27
|
+
});
|
|
28
|
+
assert_1.strict.equal(extendedServiceManager.services.appService, ServiceManagerTypes_1.prostglesServices.documents);
|
|
29
|
+
assert_1.strict.equal(extendedServiceManager.getServiceRoot("documents"), "built-in-services");
|
|
30
|
+
assert_1.strict.equal(extendedServiceManager.getServiceRoot("appService"), "app-services");
|
|
31
|
+
await assert_1.strict.rejects(() => extendedServiceManager.addServices({
|
|
32
|
+
services: { documents: ServiceManagerTypes_1.prostglesServices.documents },
|
|
33
|
+
serviceRoot: "app-services",
|
|
34
|
+
}));
|
|
35
|
+
assert_1.strict.deepEqual(insertedServiceNames.sort(), [
|
|
36
|
+
"appService",
|
|
37
|
+
"documents",
|
|
38
|
+
"speechToText",
|
|
39
|
+
"webSearchSearxng",
|
|
40
|
+
]);
|
|
41
|
+
});
|
|
9
42
|
await (0, node_test_1.test)("Enable speechToText", async () => {
|
|
10
43
|
if (exports.IS_GITHUB_WORKER) {
|
|
11
44
|
return;
|
|
12
45
|
}
|
|
13
46
|
let logText = "";
|
|
14
|
-
const serviceManager =
|
|
47
|
+
const serviceManager = await ServiceManager_1.ServiceManager.create({
|
|
48
|
+
services: ServiceManagerTypes_1.prostglesServices,
|
|
49
|
+
serviceRoot: "src/ServiceManager/services",
|
|
50
|
+
}, undefined);
|
|
15
51
|
const res = await serviceManager.enableService("speechToText", (logs) => {
|
|
16
52
|
const lastLog = logs.at(-1)?.text;
|
|
17
53
|
console.warn(lastLog);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ServiceManager.spec.js","sourceRoot":"","sources":["../../../../src/ServiceManager/ServiceManager.spec.ts"],"names":[],"mappings":";;;AAAA,mCAAgC;AAChC,yCAA2C;AAC3C,qDAAkD;
|
|
1
|
+
{"version":3,"file":"ServiceManager.spec.js","sourceRoot":"","sources":["../../../../src/ServiceManager/ServiceManager.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,6 +13,12 @@ export type ProstglesService = {
|
|
|
13
13
|
*/
|
|
14
14
|
hostPort?: number;
|
|
15
15
|
env?: Record<string, string>;
|
|
16
|
+
/**
|
|
17
|
+
* Directory containing the Docker build context.
|
|
18
|
+
* Relative paths resolve from the root used to register this service.
|
|
19
|
+
* Defaults to `<serviceName>/src`.
|
|
20
|
+
*/
|
|
21
|
+
buildContext?: string;
|
|
16
22
|
configs?: Record<string, {
|
|
17
23
|
label: string;
|
|
18
24
|
description: string;
|
|
@@ -58,6 +64,7 @@ export type ProstglesService = {
|
|
|
58
64
|
outputSchema: JSONB.FieldType | undefined;
|
|
59
65
|
}>;
|
|
60
66
|
};
|
|
67
|
+
export type ServiceRegistry = Record<string, ProstglesService>;
|
|
61
68
|
export declare const prostglesServices: {
|
|
62
69
|
speechToText: {
|
|
63
70
|
readonly icon: "MicrophoneMessage";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ServiceManagerTypes.d.ts","sourceRoot":"","sources":["../../../../src/ServiceManager/ServiceManagerTypes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,eAAe,EACf,UAAU,EACX,MAAM,gDAAgD,CAAC;AACxD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qDAAqD,CAAC;AAC9F,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAK7C,MAAM,MAAM,UAAU,GAAG,MAAM,GAAG,KAAK,GAAG,MAAM,GAAG,MAAM,EAAE,CAAC;AAE5D,MAAM,MAAM,gBAAgB,GAAG;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7B,OAAO,CAAC,EAAE,MAAM,CACd,MAAM,EACN;QACE,KAAK,EAAE,MAAM,CAAC;QACd,WAAW,EAAE,MAAM,CAAC;QACpB,aAAa,EAAE,MAAM,CAAC;QACtB,OAAO,EAAE,MAAM,CACb,MAAM,EACN;YACE,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;YAC5B,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;YACnC,IAAI,CAAC,EAAE,UAAU,CAAC;SACnB,CACF,CAAC;KACH,CACF,CAAC;IACF,IAAI,CAAC,EAAE,UAAU,CAAC;IAClB,WAAW,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,KAAK,GAAG,MAAM,CAAA;KAAE,CAAC;IAC3D,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,IAAI,CAAC,EAAE,MAAM;IACX;;;OAGG;IACH,MAAM,EACN;QACE;;;WAGG;QACH,aAAa,EAAE,MAAM,CAAC;QACtB;;;WAGG;QACH,QAAQ,CAAC,EAAE,OAAO,CAAC;KACpB,CACF,CAAC;IACF,SAAS,EAAE,MAAM,CACf,MAAM,EACN;QACE,MAAM,EAAE,KAAK,GAAG,MAAM,CAAC;QACvB,WAAW,EAAE,MAAM,CAAC;QAEpB,SAAS,CAAC,EACR,MAAM;QACN;;WAEG;WACD,UAAU,GACV,OAAO,CAAC;QAEZ,WAAW,EAAE,KAAK,CAAC,SAAS,GAAG,SAAS,CAAC;QACzC,YAAY,EAAE,KAAK,CAAC,SAAS,GAAG,SAAS,CAAC;KAC3C,CACF,CAAC;CACH,CAAC;
|
|
1
|
+
{"version":3,"file":"ServiceManagerTypes.d.ts","sourceRoot":"","sources":["../../../../src/ServiceManager/ServiceManagerTypes.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ServiceManagerTypes.js","sourceRoot":"","sources":["../../../../src/ServiceManager/ServiceManagerTypes.ts"],"names":[],"mappings":";;;AAMA,8EAA0E;AAC1E,uFAAmF;AACnF,mGAA+F;
|
|
1
|
+
{"version":3,"file":"ServiceManagerTypes.js","sourceRoot":"","sources":["../../../../src/ServiceManager/ServiceManagerTypes.ts"],"names":[],"mappings":";;;AAMA,8EAA0E;AAC1E,uFAAmF;AACnF,mGAA+F;AAgFlF,QAAA,iBAAiB,GAAG;IAC/B,YAAY,EAAE,0CAAmB;IACjC,gBAAgB,EAAE,kDAAuB;IACzC,SAAS,EAAE,oCAAgB;CAC5B,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import type { ServiceManager } from "./ServiceManager";
|
|
2
|
-
import { OnServiceLogs, prostglesServices } from "./ServiceManagerTypes";
|
|
3
1
|
import { type ExecutionResult } from "../McpHub/DockerSandbox/executeDockerCommand";
|
|
4
|
-
|
|
2
|
+
import type { ServiceManager } from "./ServiceManager";
|
|
3
|
+
import { OnServiceLogs } from "./ServiceManagerTypes";
|
|
4
|
+
export declare function buildService(this: ServiceManager, serviceName: string, onLogs: OnServiceLogs): Promise<ExecutionResult["state"]>;
|
|
5
5
|
export declare const camelCaseToSkewerCase: (str: string) => string;
|
|
6
6
|
//# sourceMappingURL=buildService.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildService.d.ts","sourceRoot":"","sources":["../../../../src/ServiceManager/buildService.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,
|
|
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;AAEvE,wBAAsB,YAAY,CAChC,IAAI,EAAE,cAAc,EACpB,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,aAAa,GACpB,OAAO,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,CA8GnC;AAED,eAAO,MAAM,qBAAqB,GAAI,KAAK,MAAM,WAKhD,CAAC"}
|
|
@@ -2,14 +2,14 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.camelCaseToSkewerCase = void 0;
|
|
4
4
|
exports.buildService = buildService;
|
|
5
|
+
const llmUtils_1 = require("../../../common/llmUtils");
|
|
6
|
+
const utils_1 = require("../../../common/utils");
|
|
7
|
+
const executeDockerCommand_1 = require("../McpHub/DockerSandbox/executeDockerCommand");
|
|
5
8
|
const path_1 = require("path");
|
|
6
|
-
const getDockerBuildHash_1 = require("./getDockerBuildHash");
|
|
7
9
|
const prostgles_types_1 = require("prostgles-types");
|
|
8
|
-
const utils_1 = require("../../../common/utils");
|
|
9
10
|
const dockerInspect_1 = require("./dockerInspect");
|
|
11
|
+
const getDockerBuildHash_1 = require("./getDockerBuildHash");
|
|
10
12
|
const getSelectedConfigEnvs_1 = require("./getSelectedConfigEnvs");
|
|
11
|
-
const executeDockerCommand_1 = require("../McpHub/DockerSandbox/executeDockerCommand");
|
|
12
|
-
const llmUtils_1 = require("../../../common/llmUtils");
|
|
13
13
|
async function buildService(serviceName, onLogs) {
|
|
14
14
|
const onLogsCombined = (logs) => {
|
|
15
15
|
onLogs(logs);
|
|
@@ -30,9 +30,13 @@ async function buildService(serviceName, onLogs) {
|
|
|
30
30
|
const stop = () => {
|
|
31
31
|
abortController.abort();
|
|
32
32
|
};
|
|
33
|
-
const
|
|
33
|
+
const service = this.services[serviceName];
|
|
34
|
+
if (!service) {
|
|
35
|
+
throw new Error(`Service ${serviceName} not found in service registry`);
|
|
36
|
+
}
|
|
37
|
+
const serviceCwd = (0, path_1.resolve)(this.getServiceRoot(serviceName), service.buildContext ?? (0, path_1.join)(serviceName, "src"));
|
|
34
38
|
const imageName = (0, exports.camelCaseToSkewerCase)(serviceName);
|
|
35
|
-
const { buildArgs } = await (0, getSelectedConfigEnvs_1.getSelectedConfigEnvs)(this
|
|
39
|
+
const { buildArgs } = await (0, getSelectedConfigEnvs_1.getSelectedConfigEnvs)(this, serviceName);
|
|
36
40
|
/** Only rebuild if hash differs */
|
|
37
41
|
const buildHash = await (0, getDockerBuildHash_1.getDockerBuildHash)(serviceCwd, buildArgs);
|
|
38
42
|
const buildLabels = {
|
|
@@ -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,5 +1,5 @@
|
|
|
1
1
|
import type { ProcessLog } from "../McpHub/DockerSandbox/executeDockerCommand";
|
|
2
|
-
import type {
|
|
3
|
-
import type {
|
|
4
|
-
export declare function enableService(this: ServiceManager
|
|
2
|
+
import type { ServiceManager, StringKeyof } from "./ServiceManager";
|
|
3
|
+
import type { RunningServiceInstance, ServiceRegistry } from "./ServiceManagerTypes";
|
|
4
|
+
export declare function enableService<Services extends ServiceRegistry, ServiceName extends StringKeyof<Services>>(this: ServiceManager<Services>, serviceName: ServiceName, onLogs: (logs: ProcessLog[]) => void): Promise<RunningServiceInstance<Services[ServiceName]>>;
|
|
5
5
|
//# sourceMappingURL=enableService.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"enableService.d.ts","sourceRoot":"","sources":["../../../../src/ServiceManager/enableService.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gDAAgD,CAAC;AACjF,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"enableService.d.ts","sourceRoot":"","sources":["../../../../src/ServiceManager/enableService.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gDAAgD,CAAC;AACjF,OAAO,KAAK,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACpE,OAAO,KAAK,EACV,sBAAsB,EACtB,eAAe,EAChB,MAAM,uBAAuB,CAAC;AAE/B,wBAAsB,aAAa,CACjC,QAAQ,SAAS,eAAe,EAChC,WAAW,SAAS,WAAW,CAAC,QAAQ,CAAC,EAEzC,IAAI,EAAE,cAAc,CAAC,QAAQ,CAAC,EAC9B,WAAW,EAAE,WAAW,EACxB,MAAM,EAAE,CAAC,IAAI,EAAE,UAAU,EAAE,KAAK,IAAI,GACnC,OAAO,CAAC,sBAAsB,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC,CAgCxD"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"enableService.js","sourceRoot":"","sources":["../../../../src/ServiceManager/enableService.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"enableService.js","sourceRoot":"","sources":["../../../../src/ServiceManager/enableService.ts"],"names":[],"mappings":";;AAOA,sCAuCC;AAvCM,KAAK,UAAU,aAAa,CAKjC,WAAwB,EACxB,MAAoC;IAEpC,MAAM,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IAC7C,MAAM,aAAa,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IAC3D,IAAI,aAAa,EAAE,MAAM,KAAK,SAAS,EAAE,CAAC;QACxC,OAAO,aAA8D,CAAC;IACxE,CAAC;SAAM,CAAC;QACN,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;IAChC,CAAC;IACD,MAAM,QAAQ,GAAG,KAAK,IAAI,EAAE;QAC1B,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;QACjE,IAAI,WAAW,KAAK,OAAO,EAAE,CAAC;YAC5B,MAAM,IAAI,KAAK,CACb,WAAW,WAAW,6BAA6B,WAAW,EAAE,CACjE,CAAC;QACJ,CAAC;QAED,MAAM,oBAAoB,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QAClE,IAAI,oBAAoB,EAAE,MAAM,KAAK,eAAe,EAAE,CAAC;YACrD,MAAM,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC,MAAM,CAC7B,EAAE,IAAI,EAAE,WAAW,EAAE,EACrB,EAAE,UAAU,EAAE,oBAAoB,CAAC,SAAS,EAAE,CAC/C,CAAC;QACJ,CAAC;QAED,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;QACnE,OAAO,aAAa,CAAC;IACvB,CAAC,CAAC;IACF,MAAM,MAAM,GAAG,QAAQ,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE;QACrC,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IAC5C,CAAC,CAAC,CAAC;IACH,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;IAC/C,OAAO,MAAgE,CAAC;AAC1E,CAAC"}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
|
-
import type {
|
|
2
|
-
|
|
3
|
-
export declare const getSelectedConfigEnvs: (dbs: DBS | undefined, serviceName: keyof typeof prostglesServices) => Promise<{
|
|
1
|
+
import type { ServiceManager } from "./ServiceManager";
|
|
2
|
+
export declare const getSelectedConfigEnvs: (serviceManager: ServiceManager, serviceName: string) => Promise<{
|
|
4
3
|
gpus: import("./ServiceManagerTypes").DockerGPUS | undefined;
|
|
5
4
|
env: Record<string, string>;
|
|
6
5
|
buildArgs: string[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getSelectedConfigEnvs.d.ts","sourceRoot":"","sources":["../../../../src/ServiceManager/getSelectedConfigEnvs.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"getSelectedConfigEnvs.d.ts","sourceRoot":"","sources":["../../../../src/ServiceManager/getSelectedConfigEnvs.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAGvD,eAAO,MAAM,qBAAqB,GAChC,gBAAgB,cAAc,EAC9B,aAAa,MAAM;;;;EAyCpB,CAAC"}
|