@prostgles/prostgles 2.3.6-dev.1787353201 → 2.3.6-dev.1788628254

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.
Files changed (49) hide show
  1. package/dist/common/DashboardTypes.d.ts +3 -0
  2. package/dist/common/DashboardTypes.d.ts.map +1 -1
  3. package/dist/server/DB.Dockerfile +11 -0
  4. package/dist/server/Dockerfile +33 -0
  5. package/dist/server/package.json +2 -2
  6. package/dist/server/src/ConnectionManager/getHotReloadConfigs.d.ts.map +1 -1
  7. package/dist/server/src/McpHub/DockerSandbox/getDockerRunArgs.d.ts +1 -1
  8. package/dist/server/src/McpHub/DockerSandbox/getDockerRunArgs.d.ts.map +1 -1
  9. package/dist/server/src/McpHub/DockerSandbox/getDockerRunArgs.js +5 -4
  10. package/dist/server/src/McpHub/DockerSandbox/getDockerRunArgs.js.map +1 -1
  11. package/dist/server/src/ServiceManager/buildService.d.ts +0 -1
  12. package/dist/server/src/ServiceManager/buildService.d.ts.map +1 -1
  13. package/dist/server/src/ServiceManager/buildService.js +2 -9
  14. package/dist/server/src/ServiceManager/buildService.js.map +1 -1
  15. package/dist/server/src/ServiceManager/startService.d.ts.map +1 -1
  16. package/dist/server/src/ServiceManager/startService.js +12 -10
  17. package/dist/server/src/ServiceManager/startService.js.map +1 -1
  18. package/dist/server/src/cli/DB.Dockerfile +11 -0
  19. package/dist/server/src/cli/Dockerfile +33 -0
  20. package/dist/server/src/cli/cli.js +32 -7
  21. package/dist/server/src/cli/cli.js.map +1 -1
  22. package/dist/server/src/cli/cliTemplateFiles.d.ts +80 -0
  23. package/dist/server/src/cli/cliTemplateFiles.d.ts.map +1 -1
  24. package/dist/server/src/cli/cliTemplateFiles.js +142 -1
  25. package/dist/server/src/cli/cliTemplateFiles.js.map +1 -1
  26. package/dist/server/src/cli/cliTemplateFiles.spec.d.ts +2 -0
  27. package/dist/server/src/cli/cliTemplateFiles.spec.d.ts.map +1 -0
  28. package/dist/server/src/cli/cliTemplateFiles.spec.js +38 -0
  29. package/dist/server/src/cli/cliTemplateFiles.spec.js.map +1 -0
  30. package/dist/server/src/cli/upgradeCli.d.ts +6 -0
  31. package/dist/server/src/cli/upgradeCli.d.ts.map +1 -0
  32. package/dist/server/src/cli/upgradeCli.js +88 -0
  33. package/dist/server/src/cli/upgradeCli.js.map +1 -0
  34. package/dist/server/src/cli/upgradeCli.spec.d.ts +2 -0
  35. package/dist/server/src/cli/upgradeCli.spec.d.ts.map +1 -0
  36. package/dist/server/src/cli/upgradeCli.spec.js +59 -0
  37. package/dist/server/src/cli/upgradeCli.spec.js.map +1 -0
  38. package/dist/server/src/dockerRuntime.d.ts +21 -0
  39. package/dist/server/src/dockerRuntime.d.ts.map +1 -0
  40. package/dist/server/src/dockerRuntime.js +45 -0
  41. package/dist/server/src/dockerRuntime.js.map +1 -0
  42. package/dist/server/src/dockerRuntime.spec.d.ts +2 -0
  43. package/dist/server/src/dockerRuntime.spec.d.ts.map +1 -0
  44. package/dist/server/src/dockerRuntime.spec.js +51 -0
  45. package/dist/server/src/dockerRuntime.spec.js.map +1 -0
  46. package/dist/server/src/schemaConfig.d.ts +4 -1
  47. package/dist/server/src/schemaConfig.d.ts.map +1 -1
  48. package/dist/server/src/schemaConfig.js.map +1 -1
  49. package/package.json +2 -2
@@ -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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"}
@@ -0,0 +1,11 @@
1
+ FROM postgis/postgis:17-3.4
2
+
3
+ # Switch to root user to install packages
4
+ USER root
5
+
6
+ # procps needed for stat monitoring
7
+ RUN apt-get update && apt-get install -y procps && \
8
+ rm -rf /var/lib/apt/lists/*
9
+
10
+ # Switch back to the default postgres user
11
+ USER postgres
@@ -0,0 +1,33 @@
1
+ FROM docker:29-cli AS docker-cli
2
+
3
+ FROM node:24-bookworm-slim AS runtime
4
+
5
+ COPY --from=docker-cli /usr/local/bin/docker /usr/local/bin/docker
6
+
7
+ # Backup/restore runs in the app container. Match DB.Dockerfile's PostgreSQL 17.
8
+ RUN apt-get update && \
9
+ apt-get install -y --no-install-recommends curl ca-certificates lsb-release && \
10
+ install -d /usr/share/postgresql-common/pgdg && \
11
+ curl --fail -o /usr/share/postgresql-common/pgdg/apt.postgresql.org.asc https://www.postgresql.org/media/keys/ACCC4CF8.asc && \
12
+ echo "deb [signed-by=/usr/share/postgresql-common/pgdg/apt.postgresql.org.asc] https://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list && \
13
+ apt-get update && \
14
+ apt-get install -y --no-install-recommends postgresql-client-17 && \
15
+ psql --version && pg_dump --version && pg_restore --version && pg_dumpall --version && \
16
+ apt-get purge -y --auto-remove curl lsb-release && \
17
+ rm -rf /var/lib/apt/lists/*
18
+
19
+ ENV IS_DOCKER=yes
20
+
21
+ FROM runtime AS ui
22
+
23
+ WORKDIR /usr/src/app
24
+ COPY . .
25
+
26
+ WORKDIR /usr/src/app/client
27
+
28
+ RUN npm run build && cd ../server && npm run build
29
+
30
+ ENV NODE_ENV=production
31
+ ENV IS_DOCKER=yes
32
+
33
+ CMD ["node", "/usr/src/app/server/dist/server/src/index.js"]
@@ -1,13 +1,13 @@
1
1
  {
2
2
  "name": "@prostgles/prostgles",
3
- "version": "2.3.6-dev.1787353201",
3
+ "version": "2.3.6-dev.1788628254",
4
4
  "description": "Prostgles UI runtime and configurable PostgreSQL dashboard",
5
5
  "main": "dist/server/src/schemaConfig.js",
6
6
  "bin": {
7
7
  "prostgles": "dist/server/src/cli/cli.js"
8
8
  },
9
9
  "scripts": {
10
- "compile": "cross-env NODE_ENV='production' NODE_OPTIONS='--max-old-space-size=2048' tsc && tsc-alias",
10
+ "compile": "cross-env NODE_ENV='production' NODE_OPTIONS='--max-old-space-size=2048' tsc && tsc-alias && node ./scripts/copyCliDockerfiles.mjs",
11
11
  "build": "npm ci && npm run compile && npm prune --omit=dev",
12
12
  "start": "npm run build && cross-env NODE_ENV='production' node dist/server/src/index.js",
13
13
  "test": "npm run build && node test-runner.mjs",
@@ -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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;6BAmKmqR,CAAC;;;;;;;;;;;;;;;;;;;oCAAj/C,CAAC;;;;oCAA4E,CAAC;;;;;;;;;0BAAqI,CAAC;;;;;;;;;;;;kCAAkL,CAAC;uCAA2B,CAAC;;;;;mCAAmG,CAAC;;;;;;;;;;;mCAA+M,CAAC;;;;;;;;iCAAkK,CAAC;iCAAoB,CAAC;iCAAoB,CAAC;mCAAsB,CAAC;;;;iCAA0E,CAAC;iCAAoB,CAAC;iCAAoB,CAAC;mCAAsB,CAAC;;gCAA8B,CAAC;iCAAc,CAAC;iCAAoB,CAAC;iCAAoB,CAAC;mCAAsB,CAAC;;;;;;;;;;;;;;;;;;;;;6BAA7T,CAAC;6BAAoB,CAAC;6BAAoB,CAAC;+BAAsB,CAAC;;;;6BAA0E,CAAC;6BAAoB,CAAC;6BAAoB,CAAC;+BAAsB,CAAC;;;6BAA6C,CAAC;6BAAoB,CAAC;6BAAoB,CAAC;+BAAsB,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;gCAAtrC,CAAC;;;;gCAA4E,CAAC;;;;;;;;;;;;;;;;;;;;;8BAAwT,CAAC;mCAA2B,CAAC;;;;;+BAAmG,CAAC;;;;;;;;;;;+BAA+M,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAD/7P,CAAC"}
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"}
@@ -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"]) => "none" | "bridge" | "host" | "prostgles-bridge-net" | "prostgles-bridge-internal-net";
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;AAGhD,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,0FAO3D,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;;;;;;kBAhCjC,MAAM;uBACD,MAAM;uBACN,OAAO;;;;CAkFrB,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 CUSTOM_BRIDGE_NETWORK_NAME = "prostgles-bridge-net";
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: ${CUSTOM_BRIDGE_NETWORK_NAME}`)) {
16
- throw new Error(`Docker compose file must include a network named ${CUSTOM_BRIDGE_NETWORK_NAME}`);
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" ? CUSTOM_BRIDGE_NETWORK_NAME
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":"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"}
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;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"}
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, exports.camelCaseToSkewerCase)(serviceName);
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":"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"}
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;AAO/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,CAmK1D;AAED,eAAO,MAAM,gBAAgB,GAAI,aAAa,MAAM,WAEnD,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, buildService_1.camelCaseToSkewerCase)(serviceName);
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 = `prostgles-service-${imageName}-${volumeName}`;
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 baseHost = `127.0.0.1:${hostPort}`;
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
- "-p",
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 `prostgles-service-${(0, buildService_1.camelCaseToSkewerCase)(serviceName)}`;
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":"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"}
1
+ {"version":3,"file":"startService.js","sourceRoot":"","sources":["../../../../src/ServiceManager/startService.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,11 @@
1
+ FROM postgis/postgis:17-3.4
2
+
3
+ # Switch to root user to install packages
4
+ USER root
5
+
6
+ # procps needed for stat monitoring
7
+ RUN apt-get update && apt-get install -y procps && \
8
+ rm -rf /var/lib/apt/lists/*
9
+
10
+ # Switch back to the default postgres user
11
+ USER postgres
@@ -0,0 +1,33 @@
1
+ FROM docker:29-cli AS docker-cli
2
+
3
+ FROM node:24-bookworm-slim AS runtime
4
+
5
+ COPY --from=docker-cli /usr/local/bin/docker /usr/local/bin/docker
6
+
7
+ # Backup/restore runs in the app container. Match DB.Dockerfile's PostgreSQL 17.
8
+ RUN apt-get update && \
9
+ apt-get install -y --no-install-recommends curl ca-certificates lsb-release && \
10
+ install -d /usr/share/postgresql-common/pgdg && \
11
+ curl --fail -o /usr/share/postgresql-common/pgdg/apt.postgresql.org.asc https://www.postgresql.org/media/keys/ACCC4CF8.asc && \
12
+ echo "deb [signed-by=/usr/share/postgresql-common/pgdg/apt.postgresql.org.asc] https://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list && \
13
+ apt-get update && \
14
+ apt-get install -y --no-install-recommends postgresql-client-17 && \
15
+ psql --version && pg_dump --version && pg_restore --version && pg_dumpall --version && \
16
+ apt-get purge -y --auto-remove curl lsb-release && \
17
+ rm -rf /var/lib/apt/lists/*
18
+
19
+ ENV IS_DOCKER=yes
20
+
21
+ FROM runtime AS ui
22
+
23
+ WORKDIR /usr/src/app
24
+ COPY . .
25
+
26
+ WORKDIR /usr/src/app/client
27
+
28
+ RUN npm run build && cd ../server && npm run build
29
+
30
+ ENV NODE_ENV=production
31
+ ENV IS_DOCKER=yes
32
+
33
+ CMD ["node", "/usr/src/app/server/dist/server/src/index.js"]
@@ -9,8 +9,11 @@ const path_1 = tslib_1.__importDefault(require("path"));
9
9
  const compileSchemaConfigProject_1 = require("../ConnectionManager/compileSchemaConfigProject");
10
10
  const cliTemplateFiles_1 = require("./cliTemplateFiles");
11
11
  const ensureCliDatabases_1 = require("./ensureCliDatabases");
12
+ const upgradeCli_1 = require("./upgradeCli");
12
13
  const usage = `Usage:
13
14
  prostgles create <directory> [--skip-install]
15
+ prostgles upgrade [--config <directory>]
16
+ prostgles compose init [--config <directory>]
14
17
  prostgles dev [--config <directory>]
15
18
  prostgles start [--config <directory>]`;
16
19
  const getConfigPath = (args) => {
@@ -23,6 +26,7 @@ const getConfigPath = (args) => {
23
26
  return path_1.default.resolve(configPath);
24
27
  };
25
28
  const npmCommand = process.platform === "win32" ? "npm.cmd" : "npm";
29
+ const getConfigId = (value) => value.replace(/[^a-z0-9-]/gi, "-").toLowerCase() || "my-prostgles-app";
26
30
  const installConfigDependencies = (targetPath) => {
27
31
  const result = (0, child_process_1.spawnSync)(npmCommand, ["install"], {
28
32
  cwd: targetPath,
@@ -38,18 +42,29 @@ const createConfig = (targetPath, skipInstall) => {
38
42
  if ((0, fs_1.existsSync)(targetPath) && (0, fs_1.readdirSync)(targetPath).length) {
39
43
  throw new Error(`${targetPath} already exists and is not empty`);
40
44
  }
41
- const packageName = path_1.default
42
- .basename(targetPath)
43
- .replace(/[^a-z0-9-]/gi, "-")
44
- .toLowerCase();
45
- const configId = packageName || "my-prostgles-app";
45
+ const configId = getConfigId(path_1.default.basename(targetPath));
46
46
  (0, cliTemplateFiles_1.saveCliTemplateFiles)({ configId, targetPath });
47
47
  if (skipInstall) {
48
- console.log(`Created config project in ${targetPath}. Run npm install, copy .env.example to .env, configure both database URLs, then run npm run dev.`);
48
+ 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
49
  return;
50
50
  }
51
51
  installConfigDependencies(targetPath);
52
- console.log(`Created config project and installed dependencies in ${targetPath}. Copy .env.example to .env, configure both database URLs, then run npm run dev.`);
52
+ 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.`);
53
+ };
54
+ const getExistingConfigId = (configPath) => {
55
+ const packageFile = path_1.default.join(configPath, "package.json");
56
+ if (!(0, fs_1.existsSync)(packageFile)) {
57
+ throw new Error(`No package.json found in config project ${configPath}`);
58
+ }
59
+ const packageConfig = JSON.parse((0, fs_1.readFileSync)(packageFile, "utf8"));
60
+ return getConfigId(typeof packageConfig.name === "string" ?
61
+ packageConfig.name
62
+ : path_1.default.basename(configPath));
63
+ };
64
+ const initialiseCompose = (configPath) => {
65
+ const configId = getExistingConfigId(configPath);
66
+ (0, cliTemplateFiles_1.saveCliComposeFiles)({ configId, targetPath: configPath });
67
+ 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
68
  };
54
69
  const getConfigEnvironment = (configPath) => {
55
70
  const environmentFile = path_1.default.join(configPath, ".env");
@@ -156,6 +171,16 @@ const main = async () => {
156
171
  createConfig(path_1.default.resolve(target), args.includes("--skip-install"));
157
172
  return;
158
173
  }
174
+ if (command === "compose" && args[0] === "init") {
175
+ initialiseCompose(getConfigPath(args.slice(1)));
176
+ return;
177
+ }
178
+ if (command === "upgrade") {
179
+ const configPath = getConfigPath(args);
180
+ await (0, upgradeCli_1.upgradeCli)(getExistingConfigId(configPath), configPath);
181
+ console.log("Upgrade file processing complete. Run npm install to update dependencies after resolving your changes.");
182
+ return;
183
+ }
159
184
  if (command === "dev" || command === "start") {
160
185
  await run(getConfigPath(args), command === "dev");
161
186
  return;
@@ -1 +1 @@
1
- {"version":3,"file":"cli.js","sourceRoot":"","sources":["../../../../src/cli/cli.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"cli.js","sourceRoot":"","sources":["../../../../src/cli/cli.ts"],"names":[],"mappings":"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"}
@@ -2,7 +2,87 @@ 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 "DB.Dockerfile": string;
16
+ readonly Dockerfile: `${string}
17
+ FROM runtime AS app
18
+
19
+ WORKDIR /app
20
+
21
+ COPY . .
22
+ RUN npm install
23
+ RUN npm run build
24
+
25
+ ENV NODE_ENV=production
26
+
27
+ CMD ["npm", "start"]`;
28
+ readonly "compose.yaml": `
29
+ name: ${string}
30
+
31
+ services:
32
+ app:
33
+ build: .
34
+ init: true
35
+ restart: unless-stopped
36
+ depends_on:
37
+ db:
38
+ condition: service_healthy
39
+ environment:
40
+ IS_DOCKER: "yes"
41
+ NODE_ENV: production
42
+ PRGL_USERNAME: \${PRGL_USERNAME:-admin}
43
+ PRGL_PASSWORD: \${PRGL_PASSWORD:?Set PRGL_PASSWORD in .env}
44
+ PROSTGLES_UI_HOST: "0.0.0.0"
45
+ PROSTGLES_DATA_DIR: /var/lib/prostgles
46
+ PROSTGLES_STATE_DATABASE_URL: postgres://postgres:\${PROSTGLES_DOCKER_DB_PASSWORD:?Set PROSTGLES_DOCKER_DB_PASSWORD in .env}@db:5432/prostgles_state
47
+ PROSTGLES_DATABASE_URL: postgres://postgres:\${PROSTGLES_DOCKER_DB_PASSWORD:?Set PROSTGLES_DOCKER_DB_PASSWORD in .env}@db:5432/${string}
48
+ PROSTGLES_DOCKER_NETWORK: \${PROSTGLES_DOCKER_NETWORK:-${string}-runtime}
49
+ PROSTGLES_INSTANCE_ID: \${PROSTGLES_INSTANCE_ID:-${string}}
50
+ ports:
51
+ - "\${PROSTGLES_DOCKER_IP:-127.0.0.1}:\${PROSTGLES_DOCKER_PORT:-3004}:3004"
52
+ volumes:
53
+ - prostgles-data:/var/lib/prostgles
54
+ - /var/run/docker.sock:/var/run/docker.sock
55
+ networks:
56
+ - runtime
57
+
58
+ db:
59
+ build:
60
+ context: .
61
+ dockerfile: DB.Dockerfile
62
+ command: postgres -c shared_preload_libraries=pg_stat_statements -c max_connections=200
63
+ restart: unless-stopped
64
+ environment:
65
+ POSTGRES_DB: postgres
66
+ POSTGRES_USER: postgres
67
+ POSTGRES_PASSWORD: \${PROSTGLES_DOCKER_DB_PASSWORD:?Set PROSTGLES_DOCKER_DB_PASSWORD in .env}
68
+ healthcheck:
69
+ test: ["CMD-SHELL", "pg_isready -U $$POSTGRES_USER -d $$POSTGRES_DB"]
70
+ interval: 2s
71
+ timeout: 3s
72
+ retries: 30
73
+ volumes:
74
+ - database:/var/lib/postgresql/data
75
+ networks:
76
+ - runtime
77
+
78
+ volumes:
79
+ database:
80
+ prostgles-data:
81
+
82
+ networks:
83
+ runtime:
84
+ name: \${PROSTGLES_DOCKER_NETWORK:-${string}-runtime}
85
+ driver: bridge`;
86
+ readonly ".dockerignore": "\n .env\n .git\n .prostgles\n build\n node_modules\n *.log";
87
+ };
8
88
  //# 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;AAwNX,eAAO,MAAM,kBAAkB,GAAI,cAAc;IAAE,QAAQ,EAAE,MAAM,CAAA;CAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAgFxD,CAAC"}