@paroicms/server 4.5.0 → 4.6.0

package/README.md

@@ -32,4 +32,4 @@ Themes for ParoiCMS are written in [LiquidJS](https://liquidjs.com/) (the templa
 
 ## License
 
-Released under the [MIT license](https://gitlab.com/paroi/opensource/paroicms/-/blob/main/LICENSE.md).
+Released under the [MIT license](https://gitlab.com/paroi/paroicms/-/blob/main/LICENSE.md).

package/dist/connector/app-conf/app-conf-formatter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"app-conf-formatter.d.ts","sourceRoot":"","sources":["../../../src/connector/app-conf/app-conf-formatter.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAA8B,MAAM,6BAA6B,CAAC;AAC/F,OAAO,KAAK,EAAE,OAAO,EAA8B,MAAM,uBAAuB,CAAC;AAEjF,wBAAgB,SAAS,CAAC,IAAI,EAAE,eAAe,GAAG,OAAO,CA+DxD"}
+{"version":3,"file":"app-conf-formatter.d.ts","sourceRoot":"","sources":["../../../src/connector/app-conf/app-conf-formatter.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAA8B,MAAM,6BAA6B,CAAC;AAC/F,OAAO,KAAK,EAAE,OAAO,EAAiD,MAAM,uBAAuB,CAAC;AAEpG,wBAAgB,SAAS,CAAC,IAAI,EAAE,eAAe,GAAG,OAAO,CAiExD"}

package/dist/connector/app-conf/app-conf-formatter.js

@@ -6,6 +6,7 @@ export function toAppConf(conf) {
     const publicPort = conf.publicPort;
     const adminUiPort = conf.adminUiPort;
     const hostName = conf.hostname;
+    const flatSubDomain = parseFlatSubDomainConf(conf);
     if (conf.clearImageCacheAfterStart && !conf.clearCacheAfterStart) {
         throw new Error('"clearImageCacheAfterStart" can\'t be set when "clearCacheAfterStart" is not set');
     }
@@ -21,6 +22,7 @@ export function toAppConf(conf) {
         port,
         publicPort: publicPort ?? port,
         adminUiPort: adminUiPort ?? publicPort ?? port,
+        flatSubDomain,
         hostname: hostName ?? undefined,
         trustProxy: conf.trustProxy ?? false,
         publicProtocol: conf.publicProtocol ?? "http",
@@ -55,6 +57,24 @@ export function toAppConf(conf) {
         sitePacks,
     };
 }
+function parseFlatSubDomainConf(conf) {
+    const usesFlatSubDomain = "sitePacks" in conf && conf.sitePacks.some((pack) => pack.serveOn === "flatSubDomain");
+    if (!conf.flatSubDomain) {
+        if (usesFlatSubDomain) {
+            throw new Error('Missing "flatSubDomain.portTemplate" for a site pack served on "flatSubDomain"');
+        }
+        return;
+    }
+    validatePortTemplate(conf.flatSubDomain.portTemplate);
+    return conf.flatSubDomain;
+}
+function validatePortTemplate(portTemplate) {
+    const placeholderCount = portTemplate.split("{port}").length - 1;
+    const renderedPortSegment = portTemplate.replace("{port}", "28000");
+    if (placeholderCount !== 1 || !/^[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$/.test(renderedPortSegment)) {
+        throw new Error('Invalid "flatSubDomain.portTemplate": expected one "{port}" placeholder in a lowercase DNS-safe segment');
+    }
+}
 function isCacheDuration(value) {
     if (value === "disabled" || value === "infinite")
         return true;

package/dist/connector/app-conf/app-conf-formatter.js.map

@@ -1 +1 @@
-{"version":3,"file":"app-conf-formatter.js","sourceRoot":"","sources":["../../../src/connector/app-conf/app-conf-formatter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,+BAA+B,CAAC;AAItD,MAAM,UAAU,SAAS,CAAC,IAAqB;IAC7C,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;IACvB,IAAI,CAAC,IAAI;QAAE,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;IAChE,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;IACnC,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;IACrC,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;IAE/B,IAAI,IAAI,CAAC,yBAAyB,IAAI,CAAC,IAAI,CAAC,oBAAoB,EAAE,CAAC;QACjE,MAAM,IAAI,KAAK,CACb,kFAAkF,CACnF,CAAC;IACJ,CAAC;IAED,IAAI,IAAI,CAAC,WAAW,KAAK,KAAK,IAAI,IAAI,CAAC,eAAe,KAAK,SAAS,EAAE,CAAC;QACrE,OAAO,CAAC,IAAI,CAAC,oEAAoE,CAAC,CAAC;IACrF,CAAC;IACD,MAAM,kBAAkB,GACtB,IAAI,CAAC,WAAW,KAAK,KAAK,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,eAAe,IAAI,KAAK,CAAC,CAAC;IAC5E,IAAI,CAAC,eAAe,CAAC,kBAAkB,CAAC,EAAE,CAAC;QACzC,MAAM,IAAI,KAAK,CAAC,4BAA4B,kBAAkB,EAAE,CAAC,CAAC;IACpE,CAAC;IACD,MAAM,eAAe,GAAkB,kBAAkB,CAAC;IAE1D,MAAM,IAAI,GAAgB;QACxB,IAAI;QACJ,UAAU,EAAE,UAAU,IAAI,IAAI;QAC9B,WAAW,EAAE,WAAW,IAAI,UAAU,IAAI,IAAI;QAC9C,QAAQ,EAAE,QAAQ,IAAI,SAAS;QAC/B,UAAU,EAAE,IAAI,CAAC,UAAU,IAAI,KAAK;QACpC,cAAc,EAAE,IAAI,CAAC,cAAc,IAAI,MAAM;QAC7C,QAAQ,EAAE,IAAI,CAAC,QAAQ,IAAI,MAAM;QACjC,OAAO,EAAE,IAAI,CAAC,OAAO;QACrB,WAAW,EAAE,IAAI,CAAC,WAAW;QAC7B,eAAe,EAAE,IAAI,CAAC,eAAe,IAAI,CAAC,CAAC,IAAI,CAAC,WAAW;QAC3D,eAAe;QACf,oBAAoB,EAAE,IAAI,CAAC,oBAAoB;QAC/C,yBAAyB,EAAE,IAAI,CAAC,yBAAyB;QACzD,eAAe,EAAE,IAAI,CAAC,eAAe;QACrC,wBAAwB,EAAE,IAAI,CAAC,wBAAwB;QACvD,UAAU,EAAE,IAAI,CAAC,UAAU;QAC3B,cAAc,EAAE,IAAI,CAAC,cAAc,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE;QAClE,eAAe,EAAE,IAAI,CAAC,eAAe;QACrC,qBAAqB,EAAE,IAAI,CAAC,qBAAqB;QACjD,OAAO,EAAE,gCAAgC,CAAC,IAAI,CAAC;QAC/C,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;KACxC,CAAC;IAEF,IAAI,YAAY,IAAI,IAAI,EAAE,CAAC;QACzB,OAAO;YACL,IAAI,EAAE,YAAY;YAClB,GAAG,IAAI;YACP,UAAU,EAAE,IAAI,CAAC,UAAU;SAC5B,CAAC;IACJ,CAAC;IAED,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;IAEjC,OAAO;QACL,IAAI,EAAE,WAAW;QACjB,GAAG,IAAI;QACP,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,SAAS;KACV,CAAC;AACJ,CAAC;AAED,SAAS,eAAe,CAAC,KAAa;IACpC,IAAI,KAAK,KAAK,UAAU,IAAI,KAAK,KAAK,UAAU;QAAE,OAAO,IAAI,CAAC;IAC9D,OAAO,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;AACjC,CAAC;AAED,SAAS,gCAAgC,CAAC,IAAqB;IAC7D,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC;IACnC,MAAM,MAAM,GAA+B,EAAE,CAAC;IAE9C,KAAK,MAAM,UAAU,IAAI,OAAO,EAAE,CAAC;QACjC,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,aAAa,EAAE,GAAG,UAAU,CAAC;QAC/D,IAAI,MAAM,CAAC,IAAI,CAAC;YAAE,MAAM,IAAI,KAAK,CAAC,WAAW,IAAI,+BAA+B,CAAC,CAAC;QAClF,IAAI,QAAQ;YAAE,SAAS;QACvB,IAAI,aAAa,IAAI,SAAS,IAAI,aAAa,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC;YACjF,MAAM,IAAI,KAAK,CACb,4CAA4C,IAAI,kCAAkC,CACnF,CAAC;QACJ,CAAC;QACD,MAAM,CAAC,IAAI,CAAC,GAAG;YACb,QAAQ,EAAE,QAAQ,IAAI,KAAK;YAC3B,aAAa,EAAE,aAAa,IAAI,EAAE;SACnC,CAAC;IACJ,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC"}
+{"version":3,"file":"app-conf-formatter.js","sourceRoot":"","sources":["../../../src/connector/app-conf/app-conf-formatter.ts"],"names":[],"mappings":"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"}

package/dist/connector/app-conf/app-conf.types.d.ts

@@ -1,5 +1,5 @@
 import type { AppLoggerLevel } from "@paroicms/internal-server-lib";
-import type { JtFqdnSitePackConf, JtGoogleAuthConf, JtHttpRedirection, JtImageProcessorConf, JtLocalDevAccountConf, JtPlatformAdminAccountConf, JtSingleSiteConf, JtSubDomainSitePackConf, PluginStaticConfigurations } from "@paroicms/public-server-lib";
+import type { JtFqdnSitePackConf, JtFlatSubDomainSitePackConf, JtGoogleAuthConf, JtHttpRedirection, JtImageProcessorConf, JtLocalDevAccountConf, JtPlatformAdminAccountConf, JtSingleSiteConf, JtSubDomainSitePackConf, PluginStaticConfigurations } from "@paroicms/public-server-lib";
 export type AppConf = SingleSiteAppConf | MultisiteAppConf;
 export interface AppConfBase {
     port: number;
@@ -8,6 +8,7 @@ export interface AppConfBase {
     publicProtocol: "http" | "https";
     publicPort: number;
     adminUiPort: number;
+    flatSubDomain?: FlatSubDomainConf;
     logLevel: "silent" | AppLoggerLevel;
     logFile?: string;
     allowRobots: boolean;
@@ -34,11 +35,15 @@ export interface MultisiteAppConf extends AppConfBase {
     platform: {
         dataDir: string;
     };
-    sitePacks: (FqdnSitePackConf | SubDomainSitePackConf)[];
+    sitePacks: (FqdnSitePackConf | SubDomainSitePackConf | FlatSubDomainSitePackConf)[];
+}
+export interface FlatSubDomainConf {
+    portTemplate: string;
 }
 export type SingleSiteConf = JtSingleSiteConf;
 export type FqdnSitePackConf = JtFqdnSitePackConf;
 export type SubDomainSitePackConf = JtSubDomainSitePackConf;
+export type FlatSubDomainSitePackConf = JtFlatSubDomainSitePackConf;
 export type GoogleAuthConf = JtGoogleAuthConf;
 export type ImageProcessorConf = JtImageProcessorConf;
 export type LocalDevAccountConf = JtLocalDevAccountConf;

package/dist/connector/app-conf/app-conf.types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"app-conf.types.d.ts","sourceRoot":"","sources":["../../../src/connector/app-conf/app-conf.types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AACpE,OAAO,KAAK,EACV,kBAAkB,EAClB,gBAAgB,EAChB,iBAAiB,EACjB,oBAAoB,EACpB,qBAAqB,EACrB,0BAA0B,EAC1B,gBAAgB,EAChB,uBAAuB,EACvB,0BAA0B,EAC3B,MAAM,6BAA6B,CAAC;AAErC,MAAM,MAAM,OAAO,GAAG,iBAAiB,GAAG,gBAAgB,CAAC;AAE3D,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,GAAG,OAAO,GAAG,MAAM,CAAC;IACtC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC;IACjC,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,QAAQ,GAAG,cAAc,CAAC;IAIpC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,OAAO,CAAC;IACrB,eAAe,EAAE,OAAO,CAAC;IACzB,eAAe,EAAE,aAAa,CAAC;IAC/B,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,yBAAyB,CAAC,EAAE,OAAO,CAAC;IACpC,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,wBAAwB,CAAC,EAAE,OAAO,CAAC;IACnC,UAAU,CAAC,EAAE,cAAc,CAAC;IAC5B,cAAc,EAAE,kBAAkB,CAAC;IACnC,eAAe,CAAC,EAAE,mBAAmB,CAAC;IACtC,qBAAqB,CAAC,EAAE,wBAAwB,EAAE,CAAC;IACnD,OAAO,EAAE,0BAA0B,CAAC;IACpC,gBAAgB,CAAC,EAAE,mBAAmB,EAAE,CAAC;CAC1C;AAED,MAAM,MAAM,aAAa,GAAG,GAAG,MAAM,GAAG,GAAG,UAAU,GAAG,UAAU,CAAC;AAEnE,MAAM,WAAW,iBAAkB,SAAQ,WAAW;IACpD,IAAI,EAAE,YAAY,CAAC;IACnB,UAAU,EAAE,cAAc,CAAC;CAC5B;AAED,MAAM,WAAW,gBAAiB,SAAQ,WAAW;IACnD,IAAI,EAAE,WAAW,CAAC;IAClB,QAAQ,EAAE;QACR,OAAO,EAAE,MAAM,CAAC;KACjB,CAAC;IACF,SAAS,EAAE,CAAC,gBAAgB,GAAG,qBAAqB,CAAC,EAAE,CAAC;CACzD;AAED,MAAM,MAAM,cAAc,GAAG,gBAAgB,CAAC;AAC9C,MAAM,MAAM,gBAAgB,GAAG,kBAAkB,CAAC;AAClD,MAAM,MAAM,qBAAqB,GAAG,uBAAuB,CAAC;AAC5D,MAAM,MAAM,cAAc,GAAG,gBAAgB,CAAC;AAC9C,MAAM,MAAM,kBAAkB,GAAG,oBAAoB,CAAC;AACtD,MAAM,MAAM,mBAAmB,GAAG,qBAAqB,CAAC;AACxD,MAAM,MAAM,wBAAwB,GAAG,0BAA0B,CAAC;AAClE,MAAM,MAAM,mBAAmB,GAAG,iBAAiB,CAAC"}
+{"version":3,"file":"app-conf.types.d.ts","sourceRoot":"","sources":["../../../src/connector/app-conf/app-conf.types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AACpE,OAAO,KAAK,EACV,kBAAkB,EAClB,2BAA2B,EAC3B,gBAAgB,EAChB,iBAAiB,EACjB,oBAAoB,EACpB,qBAAqB,EACrB,0BAA0B,EAC1B,gBAAgB,EAChB,uBAAuB,EACvB,0BAA0B,EAC3B,MAAM,6BAA6B,CAAC;AAErC,MAAM,MAAM,OAAO,GAAG,iBAAiB,GAAG,gBAAgB,CAAC;AAE3D,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,GAAG,OAAO,GAAG,MAAM,CAAC;IACtC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC;IACjC,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,CAAC,EAAE,iBAAiB,CAAC;IAClC,QAAQ,EAAE,QAAQ,GAAG,cAAc,CAAC;IAIpC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,OAAO,CAAC;IACrB,eAAe,EAAE,OAAO,CAAC;IACzB,eAAe,EAAE,aAAa,CAAC;IAC/B,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,yBAAyB,CAAC,EAAE,OAAO,CAAC;IACpC,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,wBAAwB,CAAC,EAAE,OAAO,CAAC;IACnC,UAAU,CAAC,EAAE,cAAc,CAAC;IAC5B,cAAc,EAAE,kBAAkB,CAAC;IACnC,eAAe,CAAC,EAAE,mBAAmB,CAAC;IACtC,qBAAqB,CAAC,EAAE,wBAAwB,EAAE,CAAC;IACnD,OAAO,EAAE,0BAA0B,CAAC;IACpC,gBAAgB,CAAC,EAAE,mBAAmB,EAAE,CAAC;CAC1C;AAED,MAAM,MAAM,aAAa,GAAG,GAAG,MAAM,GAAG,GAAG,UAAU,GAAG,UAAU,CAAC;AAEnE,MAAM,WAAW,iBAAkB,SAAQ,WAAW;IACpD,IAAI,EAAE,YAAY,CAAC;IACnB,UAAU,EAAE,cAAc,CAAC;CAC5B;AAED,MAAM,WAAW,gBAAiB,SAAQ,WAAW;IACnD,IAAI,EAAE,WAAW,CAAC;IAClB,QAAQ,EAAE;QACR,OAAO,EAAE,MAAM,CAAC;KACjB,CAAC;IACF,SAAS,EAAE,CAAC,gBAAgB,GAAG,qBAAqB,GAAG,yBAAyB,CAAC,EAAE,CAAC;CACrF;AAED,MAAM,WAAW,iBAAiB;IAChC,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,MAAM,cAAc,GAAG,gBAAgB,CAAC;AAC9C,MAAM,MAAM,gBAAgB,GAAG,kBAAkB,CAAC;AAClD,MAAM,MAAM,qBAAqB,GAAG,uBAAuB,CAAC;AAC5D,MAAM,MAAM,yBAAyB,GAAG,2BAA2B,CAAC;AACpE,MAAM,MAAM,cAAc,GAAG,gBAAgB,CAAC;AAC9C,MAAM,MAAM,kBAAkB,GAAG,oBAAoB,CAAC;AACtD,MAAM,MAAM,mBAAmB,GAAG,qBAAqB,CAAC;AACxD,MAAM,MAAM,wBAAwB,GAAG,0BAA0B,CAAC;AAClE,MAAM,MAAM,mBAAmB,GAAG,iBAAiB,CAAC"}

package/dist/connector/site-conf/site-conf.d.ts

@@ -1,9 +1,10 @@
-import type { NewSiteOptions, RegisteredSite } from "@paroicms/public-server-lib";
+import type { NewSiteOptions, RegisteredSite, SiteUrls, SiteUrlsOptions } from "@paroicms/public-server-lib";
 import type { MultisiteAppConf, SingleSiteAppConf } from "../app-conf/app-conf.types.js";
 import type { SitePlace } from "./site-place-types.js";
-export declare function createRegisteredSitesFromSingle(appConf: Pick<SingleSiteAppConf, "publicProtocol" | "publicPort" | "singleSite">): Promise<Map<string, RegisteredSite>>;
+export declare function createRegisteredSitesFromSingle(appConf: Pick<SingleSiteAppConf, "adminUiPort" | "publicProtocol" | "publicPort" | "singleSite">): Promise<Map<string, RegisteredSite>>;
 export declare function loadRegisteredSitesFromPacks(appConf: MultisiteAppConf, sitePackPlaces?: {
     [packName: string]: SitePlace[];
 }): Promise<Map<string, RegisteredSite>>;
 export declare function createNewRegisteredSite(options: NewSiteOptions, appConf: MultisiteAppConf): Promise<RegisteredSite>;
+export declare function resolveSiteUrls({ domain, packName }: SiteUrlsOptions, appConf: MultisiteAppConf): SiteUrls;
 //# sourceMappingURL=site-conf.d.ts.map

package/dist/connector/site-conf/site-conf.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"site-conf.d.ts","sourceRoot":"","sources":["../../../src/connector/site-conf/site-conf.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAkB,cAAc,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAIlG,OAAO,KAAK,EAAW,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClG,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAIvD,wBAAsB,+BAA+B,CACnD,OAAO,EAAE,IAAI,CAAC,iBAAiB,EAAE,gBAAgB,GAAG,YAAY,GAAG,YAAY,CAAC,GAC/E,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC,CA4BtC;AAED,wBAAsB,4BAA4B,CAChD,OAAO,EAAE,gBAAgB,EACzB,cAAc,CAAC,EAAE;IACf,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,EAAE,CAAC;CACjC,GACA,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC,CAYtC;AAED,wBAAsB,uBAAuB,CAC3C,OAAO,EAAE,cAAc,EACvB,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC,cAAc,CAAC,CAKzB"}
+{"version":3,"file":"site-conf.d.ts","sourceRoot":"","sources":["../../../src/connector/site-conf/site-conf.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAEV,cAAc,EACd,cAAc,EACd,QAAQ,EACR,eAAe,EAChB,MAAM,6BAA6B,CAAC;AAIrC,OAAO,KAAK,EAAW,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClG,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAIvD,wBAAsB,+BAA+B,CACnD,OAAO,EAAE,IAAI,CAAC,iBAAiB,EAAE,aAAa,GAAG,gBAAgB,GAAG,YAAY,GAAG,YAAY,CAAC,GAC/F,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC,CAmCtC;AAED,wBAAsB,4BAA4B,CAChD,OAAO,EAAE,gBAAgB,EACzB,cAAc,CAAC,EAAE;IACf,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,EAAE,CAAC;CACjC,GACA,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC,CAYtC;AAED,wBAAsB,uBAAuB,CAC3C,OAAO,EAAE,cAAc,EACvB,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC,cAAc,CAAC,CAIzB;AAQD,wBAAgB,eAAe,CAC7B,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,eAAe,EACrC,OAAO,EAAE,gBAAgB,GACxB,QAAQ,CAGV"}

package/dist/connector/site-conf/site-conf.js

@@ -1,17 +1,22 @@
-import { makeUrl } from "@paroicms/internal-server-lib";
-import { generateSlug } from "@paroicms/public-anywhere-lib";
+import { makeSitePackHostname, makeUrl } from "@paroicms/internal-server-lib";
 import { type } from "arktype";
 import { readdir, readFile, stat } from "node:fs/promises";
 import { join, resolve } from "node:path";
 const StringOrUndefinedAT = type("string|undefined");
 export async function createRegisteredSitesFromSingle(appConf) {
-    const { publicProtocol, publicPort } = appConf;
+    const { adminUiPort, publicProtocol, publicPort } = appConf;
     const { siteDir, dataDir, cacheDir, backupDir, fqdn, redirectWww, trusted, allowUnsafeLogin } = appConf.singleSite;
     const siteUrl = makeUrl({
         protocol: publicProtocol,
         fqdn,
         port: publicPort,
     });
+    const adminUiUrl = makeUrl({
+        protocol: publicProtocol,
+        fqdn,
+        port: adminUiPort,
+        path: "/adm",
+    });
     const version = await getPackageVersionIfExists(siteDir);
     const regSite = Object.freeze({
         fqdn,
@@ -22,6 +27,7 @@ export async function createRegisteredSitesFromSingle(appConf) {
         cacheDir,
         backupDir,
         siteUrl,
+        adminUiUrl,
         redirectWww,
         trusted: trusted !== false,
         allowUnsafeLogin: allowUnsafeLogin === true,
@@ -46,10 +52,18 @@ export async function loadRegisteredSitesFromPacks(appConf, sitePackPlaces) {
 }
 export async function createNewRegisteredSite(options, appConf) {
     const { siteDir, domain, version, packName } = options;
-    const pack = appConf.sitePacks.find((p) => p.packName === packName);
+    const pack = findSitePack(packName, appConf);
+    return makeRegisteredSite({ domain, siteDir, version }, pack, appConf);
+}
+function findSitePack(packName, appConf) {
+    const pack = appConf.sitePacks.find((candidate) => candidate.packName === packName);
     if (!pack)
         throw new Error(`pack "${packName}" not found`);
-    return makeRegisteredSite({ domain, siteDir, version }, pack, appConf);
+    return pack;
+}
+export function resolveSiteUrls({ domain, packName }, appConf) {
+    const { siteUrl, adminUiUrl } = makeSiteUrls(domain, findSitePack(packName, appConf), appConf);
+    return { siteUrl, adminUiUrl };
 }
 async function readRegisteredSitesFromDirectory(sitesDir, pack, appConf) {
     const entries = await readdir(sitesDir);
@@ -80,14 +94,8 @@ function createRegisteredSitesFromDependency(pack, appConf, sitePlaces) {
     return sitePlaces.map((place) => makeRegisteredSite(place, pack, appConf));
 }
 function makeRegisteredSite(place, pack, appConf) {
-    const { publicProtocol, publicPort } = appConf;
     const { domain, siteDir, version } = place;
-    const fqdn = pack.serveOn === "fqdn" ? domain : `${toSubDomain(domain)}.${pack.parentDomain}`;
-    const siteUrl = makeUrl({
-        protocol: publicProtocol,
-        fqdn,
-        port: publicPort,
-    });
+    const { fqdn, siteUrl, adminUiUrl } = makeSiteUrls(domain, pack, appConf);
     const dataDir = resolve(pack.dataDir, domain);
     const cacheDir = resolve(pack.cacheDir, domain);
     const backupDir = resolve(pack.backupDir, domain);
@@ -100,20 +108,37 @@ function makeRegisteredSite(place, pack, appConf) {
         cacheDir,
         backupDir,
         siteUrl,
+        adminUiUrl,
         redirectWww: pack.redirectWww,
         trusted: pack.trusted !== false,
         allowUnsafeLogin: pack.allowUnsafeLogin === true,
     });
 }
-function toSubDomain(dirName) {
-    let result = dirName;
-    if (result.startsWith("www.")) {
-        result = result.substring(4);
-    }
-    const extIndex = result.lastIndexOf(".");
-    if (extIndex !== -1) {
-        result = result.substring(0, extIndex);
-    }
-    return generateSlug(result).replaceAll(".", "-");
+function makeSiteUrls(domain, pack, appConf) {
+    const { adminUiPort, flatSubDomain, publicProtocol, publicPort } = appConf;
+    const fqdn = makeSitePackHostname({
+        domain,
+        pack,
+        port: publicPort,
+        portTemplate: flatSubDomain?.portTemplate,
+    });
+    const siteUrl = makeUrl({
+        protocol: publicProtocol,
+        fqdn,
+        port: pack.serveOn === "flatSubDomain" ? undefined : publicPort,
+    });
+    const adminUiFqdn = makeSitePackHostname({
+        domain,
+        pack,
+        port: adminUiPort,
+        portTemplate: flatSubDomain?.portTemplate,
+    });
+    const adminUiUrl = makeUrl({
+        protocol: publicProtocol,
+        fqdn: adminUiFqdn,
+        port: pack.serveOn === "flatSubDomain" ? undefined : adminUiPort,
+        path: "/adm",
+    });
+    return { fqdn, siteUrl, adminUiUrl };
 }
 //# sourceMappingURL=site-conf.js.map

package/dist/connector/site-conf/site-conf.js.map

@@ -1 +1 @@
-{"version":3,"file":"site-conf.js","sourceRoot":"","sources":["../../../src/connector/site-conf/site-conf.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"site-conf.js","sourceRoot":"","sources":["../../../src/connector/site-conf/site-conf.ts"],"names":[],"mappings":"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"}

package/dist/index.js

@@ -1,4 +1,4 @@
-import { eachDay, makeUrl, startCronLike } from "@paroicms/internal-server-lib";
+import { eachDay, startCronLike } from "@paroicms/internal-server-lib";
 import { setupImageProcessor } from "@paroicms/server-image-cache-engine";
 import compression from "compression";
 import cookieParser from "cookie-parser";
@@ -90,12 +90,7 @@ export async function start(options = {}) {
 function getListOfSiteUrls() {
     return Array.from(registeredSites.values())
         .map((regSite) => {
-        const adminUiUrl = makeUrl({
-            protocol: appConf.publicProtocol,
-            port: appConf.adminUiPort,
-            fqdn: regSite.fqdn,
-            path: "/adm",
-        });
+        const { adminUiUrl } = regSite;
         const unsafeLoginUrl = appConf.localDevAccount && regSite.allowUnsafeLogin
             ? `${adminUiUrl}?email=${encodeURIComponent(appConf.localDevAccount.email)}&unsafe-password=${encodeURIComponent(appConf.localDevAccount.password)}`
             : undefined;

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/dist/oauth/oauth2-client.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"oauth2-client.controller.d.ts","sourceRoot":"","sources":["../../src/oauth/oauth2-client.controller.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAKjD,wBAAsB,cAAc,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,iBAQ/D;AAED,wBAAsB,qBAAqB,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,iBAEtE;AAED,wBAAsB,6BAA6B,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,iBAO9E;AAED,wBAAsB,iBAAiB,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,mBAanE"}
+{"version":3,"file":"oauth2-client.controller.d.ts","sourceRoot":"","sources":["../../src/oauth/oauth2-client.controller.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAKjD,wBAAsB,cAAc,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,iBAQ/D;AAED,wBAAsB,qBAAqB,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,iBAEtE;AAED,wBAAsB,6BAA6B,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,iBAO9E;AAED,wBAAsB,iBAAiB,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,mBASnE"}

package/dist/oauth/oauth2-client.controller.js

@@ -1,4 +1,3 @@
-import { makeUrl } from "@paroicms/internal-server-lib";
 import { ApiError, escapeHtml } from "@paroicms/public-server-lib";
 import { generatePlatformToken, googleAuthGuard } from "../admin-backend/auth/auth.helper.js";
 import { appConf, platformAuthUrl, registeredSites } from "../context.js";
@@ -33,11 +32,7 @@ export async function siteUrlController(req, _res) {
     const regSite = registeredSites.get(redirectTo);
     if (!regSite)
         throw new ApiError("Site not found", 404);
-    return makeUrl({
-        protocol: appConf.publicProtocol,
-        port: appConf.adminUiPort,
-        fqdn: regSite.fqdn,
-    });
+    return new URL(regSite.adminUiUrl).origin;
 }
 function generateGoogleRedirectPageHtml({ platformToken, platformAuthUrl, }) {
     return `<!DOCTYPE html>

package/dist/oauth/oauth2-client.controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"oauth2-client.controller.js","sourceRoot":"","sources":["../../src/oauth/oauth2-client.controller.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"oauth2-client.controller.js","sourceRoot":"","sources":["../../src/oauth/oauth2-client.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AAEnE,OAAO,EAAE,qBAAqB,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AAC9F,OAAO,EAAE,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAC1E,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAE/D,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,GAAY,EAAE,GAAa;IAC9D,IAAI,CAAC,OAAO,CAAC,UAAU,IAAI,OAAO,CAAC,UAAU,CAAC,QAAQ,IAAI,CAAC,eAAe,EAAE,CAAC;QAC3E,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,CAAC;IACD,IAAI,GAAG,CAAC,QAAQ,KAAK,OAAO,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;QAC7C,MAAM,IAAI,QAAQ,CAAC,qBAAqB,GAAG,CAAC,QAAQ,EAAE,EAAE,GAAG,CAAC,CAAC;IAC/D,CAAC;IACD,GAAG,CAAC,IAAI,CAAC,oBAAoB,CAAC,eAAe,CAAC,CAAC,CAAC;AAClD,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,qBAAqB,CAAC,GAAY,EAAE,GAAa;IACrE,MAAM,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;AAClC,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,6BAA6B,CAAC,GAAY,EAAE,GAAa;IAC7E,MAAM,IAAI,GAAG,MAAM,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IAC7C,IAAI,CAAC,OAAO,CAAC,UAAU,IAAI,OAAO,CAAC,UAAU,CAAC,QAAQ,IAAI,CAAC,eAAe,EAAE,CAAC;QAC3E,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,CAAC;IACD,MAAM,aAAa,GAAG,qBAAqB,CAAC,IAAI,CAAC,CAAC;IAClD,GAAG,CAAC,IAAI,CAAC,8BAA8B,CAAC,EAAE,aAAa,EAAE,eAAe,EAAE,CAAC,CAAC,CAAC;AAC/E,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,GAAY,EAAE,IAAc;IAClE,MAAM,UAAU,GAAG,iBAAiB,CAAC,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;IAC/D,IAAI,CAAC,UAAU;QAAE,MAAM,IAAI,QAAQ,CAAC,oBAAoB,EAAE,GAAG,CAAC,CAAC;IAC/D,IAAI,CAAC,OAAO,CAAC,UAAU,IAAI,OAAO,CAAC,UAAU,CAAC,QAAQ,IAAI,CAAC,eAAe,EAAE,CAAC;QAC3E,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,CAAC;IACD,MAAM,OAAO,GAAG,eAAe,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IAChD,IAAI,CAAC,OAAO;QAAE,MAAM,IAAI,QAAQ,CAAC,gBAAgB,EAAE,GAAG,CAAC,CAAC;IACxD,OAAO,IAAI,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC;AAC5C,CAAC;AAED,SAAS,8BAA8B,CAAC,EACtC,aAAa,EACb,eAAe,GAIhB;IACC,OAAO;;;;;;;;;;;;;;iEAcwD,UAAU,CAAC,aAAa,CAAC;;;;iCAIzD,UAAU,CAAC,eAAe,CAAC;;;;;;;;;;;;;;;;QAgBpD,CAAC;AACT,CAAC;AAED,SAAS,oBAAoB,CAAC,eAAuB;IACnD,OAAO;;;;;;;;;;;;;;+BAcsB,UAAU,CAAC,eAAe,CAAC;;;QAGlD,CAAC;AACT,CAAC"}

package/dist/running-server/running-server-connector.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"running-server-connector.d.ts","sourceRoot":"","sources":["../../src/running-server/running-server-connector.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,sBAAsB,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAiChG,wBAAgB,4BAA4B,IAAI,sBAAsB,CAkBrE;AAED,wBAAgB,0BAA0B,CACxC,KAAK,EAAE;IAAE,UAAU,EAAE,KAAK,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAC7F,oBAAoB,CA2MtB"}
+{"version":3,"file":"running-server-connector.d.ts","sourceRoot":"","sources":["../../src/running-server/running-server-connector.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,sBAAsB,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAkChG,wBAAgB,4BAA4B,IAAI,sBAAsB,CAoCrE;AAED,wBAAgB,0BAA0B,CACxC,KAAK,EAAE;IAAE,UAAU,EAAE,KAAK,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAC7F,oBAAoB,CA2MtB"}

package/dist/running-server/running-server-connector.js

@@ -10,6 +10,7 @@ import { siteReadyGuard } from "../graphql/graphql.types.js";
 import { getSiteContext } from "../site-context/site-context.js";
 import { migrateSiteSchemas } from "../site-schema-migration/site-schema-migration.js";
 import { loadRoutingClusterFromNode } from "../connector/db-init/load-routing-cluster.queries.js";
+import { resolveSiteUrls } from "../connector/site-conf/site-conf.js";
 import { getFullDocumentProgrammaticApi } from "./get-document-api.js";
 import { deleteMediaProgrammaticApi, setMediaProgrammaticApi } from "./media-api.js";
 import { searchDocumentsProgrammaticApi } from "./search-documents-api.js";
@@ -27,11 +28,29 @@ export function createRunningServerConnector() {
             const pack = appConf.sitePacks.find((p) => p.packName === packName);
             if (!pack)
                 throw new Error(`pack "${packName}" not found`);
+            if (pack.serveOn === "flatSubDomain") {
+                if (!appConf.flatSubDomain) {
+                    throw new Error('Missing "flatSubDomain.portTemplate" in the configuration');
+                }
+                return {
+                    ...pack,
+                    portTemplate: appConf.flatSubDomain.portTemplate,
+                    publicPort: appConf.publicPort,
+                    adminUiPort: appConf.adminUiPort,
+                    trusted: pack.trusted !== false,
+                };
+            }
             return {
                 ...pack,
                 trusted: pack.trusted !== false,
             };
         },
+        getSiteUrls: (options) => {
+            if (appConf.kind !== "multisite") {
+                throw new Error("getSiteUrls is only available in multisite mode");
+            }
+            return resolveSiteUrls(options, appConf);
+        },
         registerNewSite,
         migrateSiteSchemas,
         createBlankSiteFromExisting,

package/dist/running-server/running-server-connector.js.map

@@ -1 +1 @@
-{"version":3,"file":"running-server-connector.js","sourceRoot":"","sources":["../../src/running-server/running-server-connector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAE7D,OAAO,EAAE,kBAAkB,EAAE,MAAM,+CAA+C,CAAC;AACnF,OAAO,EAAE,YAAY,IAAI,iBAAiB,EAAE,MAAM,sDAAsD,CAAC;AACzG,OAAO,EACL,cAAc,IAAI,mBAAmB,EACrC,cAAc,IAAI,mBAAmB,GACtC,MAAM,qDAAqD,CAAC;AAC7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,gDAAgD,CAAC;AACnF,OAAO,EAAE,aAAa,EAAE,MAAM,yCAAyC,CAAC;AACxE,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AAC1F,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACjE,OAAO,EAAE,kBAAkB,EAAE,MAAM,mDAAmD,CAAC;AACvF,OAAO,EAAE,0BAA0B,EAAE,MAAM,sDAAsD,CAAC;AAClG,OAAO,EAAE,8BAA8B,EAAE,MAAM,uBAAuB,CAAC;AACvE,OAAO,EAAE,0BAA0B,EAAE,uBAAuB,EAAE,MAAM,gBAAgB,CAAC;AACrF,OAAO,EAAE,8BAA8B,EAAE,MAAM,2BAA2B,CAAC;AAC3E,OAAO,EAAE,2BAA2B,EAAE,MAAM,4BAA4B,CAAC;AACzE,OAAO,EACL,4BAA4B,EAC5B,+BAA+B,GAChC,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAC1D,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACtE,OAAO,EACL,6BAA6B,EAC7B,wCAAwC,EACxC,yBAAyB,EACzB,oCAAoC,EACpC,2BAA2B,GAC5B,MAAM,yBAAyB,CAAC;AAEjC,MAAM,UAAU,4BAA4B;IAC1C,OAAO;QACL,eAAe,EAAE,CAAC,QAAQ,EAAE,EAAE;YAC5B,IAAI,OAAO,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;gBACjC,MAAM,IAAI,KAAK,CAAC,4DAA4D,CAAC,CAAC;YAChF,CAAC;YAED,MAAM,IAAI,GAAG,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC;YACpE,IAAI,CAAC,IAAI;gBAAE,MAAM,IAAI,KAAK,CAAC,SAAS,QAAQ,aAAa,CAAC,CAAC;YAC3D,OAAO;gBACL,GAAG,IAAI;gBACP,OAAO,EAAE,IAAI,CAAC,OAAO,KAAK,KAAK;aAChC,CAAC;QACJ,CAAC;QACD,eAAe;QACf,kBAAkB;QAClB,2BAA2B;KAC5B,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,0BAA0B,CACxC,KAA8F;IAE9F,MAAM,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC;IACvB,OAAO;QACL,oBAAoB,EAAE,KAAK,IAAI,EAAE;YAC/B,MAAM,WAAW,GAAG,MAAM,cAAc,CAAC,IAAI,CAAC,CAAC;YAC/C,cAAc,CAAC,WAAW,CAAC,CAAC;YAC5B,IAAI,KAAK,CAAC,UAAU,KAAK,KAAK,EAAE,CAAC;gBAC/B,MAAM,kBAAkB,CAAC,WAAW,EAAE,KAAK,CAAC,GAAG,EAAE,eAAe,CAAC,CAAC;YACpE,CAAC;YACD,MAAM,EAAE,UAAU,EAAE,kBAAkB,EAAE,GAAG,WAAW,CAAC;YACvD,OAAO,EAAE,UAAU,EAAE,kBAAkB,EAAE,CAAC;QAC5C,CAAC;QAED,WAAW,EAAE,KAAK,IAAI,EAAE;YACtB,MAAM,WAAW,GAAG,MAAM,cAAc,CAAC,IAAI,CAAC,CAAC;YAC/C,cAAc,CAAC,WAAW,CAAC,CAAC;YAC5B,IAAI,KAAK,CAAC,UAAU,KAAK,KAAK,EAAE,CAAC;gBAC/B,MAAM,kBAAkB,CAAC,WAAW,EAAE,KAAK,CAAC,GAAG,EAAE,eAAe,CAAC,CAAC;YACpE,CAAC;YACD,MAAM,EAAE,UAAU,EAAE,kBAAkB,EAAE,UAAU,EAAE,GAAG,WAAW,CAAC;YACnE,MAAM,KAAK,GAA+C,EAAE,CAAC;YAC7D,KAAK,MAAM,QAAQ,IAAI,UAAU,CAAC,SAAS,EAAE,CAAC;gBAC5C,MAAM,UAAU,GAAG,MAAM,iBAAiB,CAAC,WAAW,EAAE;oBACtD,SAAS,EAAE,OAAO;oBAClB,QAAQ;oBACR,aAAa,EAAE,KAAK;iBACrB,CAAC,CAAC;gBACH,KAAK,CAAC,QAAQ,CAAC,GAAG,OAAO,UAAU,KAAK,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC;YAC5E,CAAC;YACD,MAAM,WAAW,GAAG,MAAM,oBAAoB,CAAC,WAAW,EAAE,kBAAkB,CAAC,CAAC;YAChF,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,CAAC;QACxD,CAAC;QAED,0BAA0B,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,EAAE;YACzD,MAAM,WAAW,GAAG,MAAM,cAAc,CAAC,IAAI,CAAC,CAAC;YAC/C,cAAc,CAAC,WAAW,CAAC,CAAC;YAC5B,IAAI,KAAK,CAAC,UAAU,KAAK,KAAK,EAAE,CAAC;gBAC/B,MAAM,kBAAkB,CAAC,WAAW,EAAE,KAAK,CAAC,GAAG,EAAE,eAAe,CAAC,CAAC;YACpE,CAAC;YACD,OAAO,MAAM,0BAA0B,CAAC,WAAW,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;QAC7E,CAAC;QAED,aAAa,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE;YACxC,MAAM,WAAW,GAAG,MAAM,cAAc,CAAC,IAAI,CAAC,CAAC;YAC/C,cAAc,CAAC,WAAW,CAAC,CAAC;YAC5B,IAAI,KAAK,CAAC,UAAU,KAAK,KAAK,EAAE,CAAC;gBAC/B,MAAM,kBAAkB,CAAC,WAAW,EAAE,KAAK,CAAC,GAAG,EAAE,kBAAkB,CAAC,CAAC;YACvE,CAAC;YACD,OAAO,MAAM,4BAA4B,CAAC,WAAW,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;QAC3E,CAAC;QAED,gBAAgB,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE;YAC3C,MAAM,WAAW,GAAG,MAAM,cAAc,CAAC,IAAI,CAAC,CAAC;YAC/C,cAAc,CAAC,WAAW,CAAC,CAAC;YAC5B,IAAI,KAAK,CAAC,UAAU,KAAK,KAAK,EAAE,CAAC;gBAC/B,MAAM,kBAAkB,CAAC,WAAW,EAAE,KAAK,CAAC,GAAG,EAAE,qBAAqB,CAAC,CAAC;YAC1E,CAAC;YACD,MAAM,+BAA+B,CAAC,WAAW,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;QACvE,CAAC;QAED,UAAU,EAAE,KAAK,IAAI,EAAE;YACrB,MAAM,WAAW,GAAG,MAAM,cAAc,CAAC,IAAI,CAAC,CAAC;YAC/C,cAAc,CAAC,WAAW,CAAC,CAAC;YAC5B,IAAI,KAAK,CAAC,UAAU,KAAK,KAAK,EAAE,CAAC;gBAC/B,MAAM,kBAAkB,CAAC,WAAW,EAAE,KAAK,CAAC,GAAG,EAAE,iBAAiB,CAAC,CAAC;YACtE,CAAC;YACD,OAAO,MAAM,UAAU,CAAC,WAAW,CAAC,CAAC;QACvC,CAAC;QAED,eAAe,EAAE,KAAK,EAAE,WAAW,EAAE,EAAE;YACrC,MAAM,WAAW,GAAG,MAAM,cAAc,CAAC,IAAI,CAAC,CAAC;YAC/C,cAAc,CAAC,WAAW,CAAC,CAAC;YAC5B,IAAI,KAAK,CAAC,UAAU,KAAK,KAAK,EAAE,CAAC;gBAC/B,MAAM,kBAAkB,CAAC,WAAW,EAAE,KAAK,CAAC,GAAG,EAAE,eAAe,CAAC,CAAC;YACpE,CAAC;YACD,OAAO,MAAM,8BAA8B,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;QACxE,CAAC;QAED,cAAc,EAAE,KAAK,EAAE,UAAU,EAAE,EAAE;YACnC,MAAM,WAAW,GAAG,MAAM,cAAc,CAAC,IAAI,CAAC,CAAC;YAC/C,cAAc,CAAC,WAAW,CAAC,CAAC;YAC5B,IAAI,KAAK,CAAC,UAAU,KAAK,KAAK,EAAE,CAAC;gBAC/B,MAAM,kBAAkB,CAAC,WAAW,EAAE,KAAK,CAAC,GAAG,EAAE,eAAe,CAAC,CAAC;YACpE,CAAC;YACD,MAAM,mBAAmB,CAAC,WAAW,EAAE,YAAY,CAAC,UAAU,CAAC,CAAC,CAAC;QACnE,CAAC;QAED,YAAY,EAAE,KAAK,EAAE,cAAc,EAAE,eAAe,EAAE,EAAE;YACtD,MAAM,WAAW,GAAG,MAAM,cAAc,CAAC,IAAI,CAAC,CAAC;YAC/C,cAAc,CAAC,WAAW,CAAC,CAAC;YAC5B,IAAI,KAAK,CAAC,UAAU,KAAK,KAAK,EAAE,CAAC;gBAC/B,MAAM,kBAAkB,CAAC,WAAW,EAAE,KAAK,CAAC,GAAG,EAAE,eAAe,CAAC,CAAC;YACpE,CAAC;YACD,MAAM,iBAAiB,CAAC,WAAW,EAAE,EAAE,cAAc,EAAE,eAAe,EAAE,CAAC,CAAC;QAC5E,CAAC;QAED,eAAe,EAAE,KAAK,EAAE,UAAU,EAAE,cAAc,EAAE,EAAE;YACpD,MAAM,WAAW,GAAG,MAAM,cAAc,CAAC,IAAI,CAAC,CAAC;YAC/C,cAAc,CAAC,WAAW,CAAC,CAAC;YAC5B,IAAI,KAAK,CAAC,UAAU,KAAK,KAAK,EAAE,CAAC;gBAC/B,MAAM,kBAAkB,CAAC,WAAW,EAAE,KAAK,CAAC,GAAG,EAAE,eAAe,CAAC,CAAC;YACpE,CAAC;YACD,MAAM,QAAQ,GAAG,YAAY,CAAC,UAAU,CAAC,CAAC;YAC1C,MAAM,WAAW,GAAG,cAAc,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC;YAC3E,MAAM,kBAAkB,CAAC,WAAW,EAAE,EAAE,MAAM,EAAE,QAAQ,CAAC,MAAM,EAAE,WAAW,EAAE,CAAC,CAAC;YAChF,MAAM,aAAa,CAAC,WAAW,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QACvE,CAAC;QAED,iBAAiB,EAAE,KAAK,EAAE,UAAU,EAAE,EAAE;YACtC,MAAM,WAAW,GAAG,MAAM,cAAc,CAAC,IAAI,CAAC,CAAC;YAC/C,cAAc,CAAC,WAAW,CAAC,CAAC;YAC5B,IAAI,KAAK,CAAC,UAAU,KAAK,KAAK,EAAE,CAAC;gBAC/B,MAAM,kBAAkB,CAAC,WAAW,EAAE,KAAK,CAAC,GAAG,EAAE,eAAe,CAAC,CAAC;YACpE,CAAC;YACD,MAAM,aAAa,CAAC,WAAW,EAAE,EAAE,OAAO,EAAE,YAAY,CAAC,UAAU,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;QACxF,CAAC;QAED,WAAW,EAAE,KAAK,EAAE,UAAU,EAAE,EAAE;YAChC,MAAM,WAAW,GAAG,MAAM,cAAc,CAAC,IAAI,CAAC,CAAC;YAC/C,cAAc,CAAC,WAAW,CAAC,CAAC;YAC5B,IAAI,KAAK,CAAC,UAAU,KAAK,KAAK,EAAE,CAAC;gBAC/B,MAAM,kBAAkB,CAAC,WAAW,EAAE,KAAK,CAAC,GAAG,EAAE,eAAe,CAAC,CAAC;YACpE,CAAC;YACD,OAAO,MAAM,8BAA8B,CAAC,WAAW,EAAE,YAAY,CAAC,UAAU,CAAC,CAAC,CAAC;QACrF,CAAC;QAED,cAAc,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,EAAE;YAC3C,MAAM,WAAW,GAAG,MAAM,cAAc,CAAC,IAAI,CAAC,CAAC;YAC/C,cAAc,CAAC,WAAW,CAAC,CAAC;YAC5B,IAAI,KAAK,CAAC,UAAU,KAAK,KAAK,EAAE,CAAC;gBAC/B,MAAM,kBAAkB,CAAC,WAAW,EAAE,KAAK,CAAC,GAAG,EAAE,eAAe,CAAC,CAAC;YACpE,CAAC;YACD,MAAM,mBAAmB,CAAC,WAAW,EAAE,YAAY,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC,CAAC;QAC3E,CAAC;QAED,YAAY,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;YACtC,MAAM,WAAW,GAAG,MAAM,cAAc,CAAC,IAAI,CAAC,CAAC;YAC/C,cAAc,CAAC,WAAW,CAAC,CAAC;YAC5B,MAAM,QAAQ,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC;YAEvC,IAAI,KAAK,CAAC,UAAU,KAAK,KAAK,EAAE,CAAC;gBAC/B,MAAM,QAAQ,GAAG,MAAM,aAAa,CAAC,WAAW,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;gBACnE,MAAM,UAAU,GAAG,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,eAAe,CAAC;gBAClF,MAAM,kBAAkB,CAAC,WAAW,EAAE,KAAK,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;YAC/D,CAAC;YAED,MAAM,2BAA2B,CAAC,WAAW,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;QACnE,CAAC;QAED,cAAc,EAAE,KAAK,EAAE,WAAW,EAAE,EAAE;YACpC,MAAM,WAAW,GAAG,MAAM,cAAc,CAAC,IAAI,CAAC,CAAC;YAC/C,cAAc,CAAC,WAAW,CAAC,CAAC;YAC5B,IAAI,KAAK,CAAC,UAAU,KAAK,KAAK,EAAE,CAAC;gBAC/B,MAAM,kBAAkB,CAAC,WAAW,EAAE,KAAK,CAAC,GAAG,EAAE,eAAe,CAAC,CAAC;YACpE,CAAC;YACD,OAAO,MAAM,6BAA6B,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;QACvE,CAAC;QAED,yBAAyB,EAAE,KAAK,EAAE,WAAW,EAAE,EAAE;YAC/C,MAAM,WAAW,GAAG,MAAM,cAAc,CAAC,IAAI,CAAC,CAAC;YAC/C,cAAc,CAAC,WAAW,CAAC,CAAC;YAC5B,IAAI,KAAK,CAAC,UAAU,KAAK,KAAK,EAAE,CAAC;gBAC/B,MAAM,kBAAkB,CAAC,WAAW,EAAE,KAAK,CAAC,GAAG,EAAE,eAAe,CAAC,CAAC;YACpE,CAAC;YACD,OAAO,MAAM,wCAAwC,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;QAClF,CAAC;QAED,UAAU,EAAE,KAAK,EAAE,WAAW,EAAE,EAAE;YAChC,MAAM,WAAW,GAAG,MAAM,cAAc,CAAC,IAAI,CAAC,CAAC;YAC/C,cAAc,CAAC,WAAW,CAAC,CAAC;YAC5B,IAAI,KAAK,CAAC,UAAU,KAAK,KAAK,EAAE,CAAC;gBAC/B,MAAM,kBAAkB,CAAC,WAAW,EAAE,KAAK,CAAC,GAAG,EAAE,eAAe,CAAC,CAAC;YACpE,CAAC;YACD,OAAO,MAAM,yBAAyB,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;QACnE,CAAC;QAED,qBAAqB,EAAE,KAAK,EAAE,WAAW,EAAE,EAAE;YAC3C,MAAM,WAAW,GAAG,MAAM,cAAc,CAAC,IAAI,CAAC,CAAC;YAC/C,cAAc,CAAC,WAAW,CAAC,CAAC;YAC5B,IAAI,KAAK,CAAC,UAAU,KAAK,KAAK,EAAE,CAAC;gBAC/B,MAAM,kBAAkB,CAAC,WAAW,EAAE,KAAK,CAAC,GAAG,EAAE,eAAe,CAAC,CAAC;YACpE,CAAC;YACD,OAAO,MAAM,oCAAoC,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;QAC9E,CAAC;QAED,QAAQ,EAAE,KAAK,EAAE,UAAU,EAAE,EAAE;YAC7B,MAAM,WAAW,GAAG,MAAM,cAAc,CAAC,IAAI,CAAC,CAAC;YAC/C,cAAc,CAAC,WAAW,CAAC,CAAC;YAC5B,IAAI,KAAK,CAAC,UAAU,KAAK,KAAK,EAAE,CAAC;gBAC/B,MAAM,kBAAkB,CAAC,WAAW,EAAE,KAAK,CAAC,GAAG,EAAE,eAAe,CAAC,CAAC;YACpE,CAAC;YACD,OAAO,MAAM,uBAAuB,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;QAChE,CAAC;QAED,WAAW,EAAE,KAAK,EAAE,UAAU,EAAE,EAAE;YAChC,MAAM,WAAW,GAAG,MAAM,cAAc,CAAC,IAAI,CAAC,CAAC;YAC/C,cAAc,CAAC,WAAW,CAAC,CAAC;YAC5B,IAAI,KAAK,CAAC,UAAU,KAAK,KAAK,EAAE,CAAC;gBAC/B,MAAM,kBAAkB,CAAC,WAAW,EAAE,KAAK,CAAC,GAAG,EAAE,eAAe,CAAC,CAAC;YACpE,CAAC;YACD,OAAO,MAAM,0BAA0B,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;QACnE,CAAC;KACF,CAAC;AACJ,CAAC"}
+{"version":3,"file":"running-server-connector.js","sourceRoot":"","sources":["../../src/running-server/running-server-connector.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@paroicms/server",
-  "version": "4.5.0",
+  "version": "4.6.0",
   "description": "The ParoiCMS server",
   "keywords": [
     "cms",
@@ -13,7 +13,7 @@
   ],
   "repository": {
     "type": "git",
-    "url": "https://gitlab.com/paroi/opensource/paroicms.git",
+    "url": "https://gitlab.com/paroi/paroicms.git",
     "directory": "app/server"
   },
   "author": "Paroi Team",
@@ -40,16 +40,16 @@
   "dependencies": {
     "@apollo/server": "~5.5.1",
     "@as-integrations/express5": "~1.1.2",
-    "@paroicms/admin-ui": "1.101.0",
-    "@paroicms/internal-anywhere-lib": "1.41.0",
-    "@paroicms/internal-server-lib": "1.24.25",
-    "@paroicms/playground_demo1": "0.68.19",
-    "@paroicms/public-anywhere-lib": "1.2.0",
-    "@paroicms/public-server-lib": "1.7.1",
-    "@paroicms/script-lib": "1.0.6",
-    "@paroicms/server-database-media-storage": "1.26.32",
-    "@paroicms/server-image-cache-engine": "1.29.47",
-    "@paroicms/server-text-cache-system": "1.21.47",
+    "@paroicms/admin-ui": "1.102.0",
+    "@paroicms/internal-anywhere-lib": "1.41.1",
+    "@paroicms/internal-server-lib": "1.25.0",
+    "@paroicms/playground_demo1": "0.68.20",
+    "@paroicms/public-anywhere-lib": "1.2.1",
+    "@paroicms/public-server-lib": "1.8.0",
+    "@paroicms/script-lib": "1.0.7",
+    "@paroicms/server-database-media-storage": "1.26.34",
+    "@paroicms/server-image-cache-engine": "1.29.49",
+    "@paroicms/server-text-cache-system": "1.21.49",
     "archiver": "~8.0.0",
     "arktype": "~2.2.3",
     "bcrypt": "~6.0.0",