@paroicms/server 1.76.3 → 1.78.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/common/child-ordering-query.js +6 -6
- package/dist/common/child-ordering-query.js.map +1 -1
- package/dist/common/media-handles.helpers.js +1 -3
- package/dist/common/media-handles.helpers.js.map +1 -1
- package/dist/context.d.ts +4 -3
- package/dist/context.js +7 -1
- package/dist/context.js.map +1 -1
- package/dist/helpers/cors-middleware.d.ts +2 -0
- package/dist/helpers/cors-middleware.js +26 -0
- package/dist/helpers/cors-middleware.js.map +1 -0
- package/dist/helpers/make-backend-plugin-service.js +12 -2
- package/dist/helpers/make-backend-plugin-service.js.map +1 -1
- package/dist/helpers/running-instance-connector.d.ts +2 -0
- package/dist/helpers/running-instance-connector.js +306 -0
- package/dist/helpers/running-instance-connector.js.map +1 -0
- package/dist/index.js +4 -4
- package/dist/index.js.map +1 -1
- package/dist/modules/core/account/account.formatters.d.ts +1 -1
- package/dist/modules/core/account/account.formatters.js +1 -1
- package/dist/modules/core/account/account.formatters.js.map +1 -1
- package/dist/modules/core/account/account.queries.d.ts +1 -1
- package/dist/modules/core/account/account.queries.js +3 -2
- package/dist/modules/core/account/account.queries.js.map +1 -1
- package/dist/modules/core/document/save-documents.queries.d.ts +4 -2
- package/dist/modules/core/document/save-documents.queries.js +4 -4
- package/dist/modules/core/document/save-documents.queries.js.map +1 -1
- package/dist/modules/core/fields/_fields.helpers.d.ts +1 -1
- package/dist/modules/core/fields/_fields.helpers.js +3 -3
- package/dist/modules/core/fields/_fields.helpers.js.map +1 -1
- package/dist/modules/core/fields/load-fields.queries.js +7 -7
- package/dist/modules/core/fields/load-fields.queries.js.map +1 -1
- package/dist/modules/core/fields/save-fields.queries.d.ts +2 -1
- package/dist/modules/core/fields/save-fields.queries.js +49 -24
- package/dist/modules/core/fields/save-fields.queries.js.map +1 -1
- package/dist/modules/core/media/add-media-to-node.d.ts +14 -0
- package/dist/modules/core/media/add-media-to-node.js +116 -0
- package/dist/modules/core/media/add-media-to-node.js.map +1 -0
- package/dist/modules/core/media/media-upload.controller.d.ts +1 -11
- package/dist/modules/core/media/media-upload.controller.js +5 -111
- package/dist/modules/core/media/media-upload.controller.js.map +1 -1
- package/dist/modules/core/nodel/nodel.queries.js +3 -19
- package/dist/modules/core/nodel/nodel.queries.js.map +1 -1
- package/dist/modules/core/site-constants/site-constants.resolver.js +1 -0
- package/dist/modules/core/site-constants/site-constants.resolver.js.map +1 -1
- package/dist/modules/public-api/public-api-rendering.js +4 -1
- package/dist/modules/public-api/public-api-rendering.js.map +1 -1
- package/dist/modules/public-api/search-text/search-text.queries.d.ts +0 -5
- package/dist/modules/public-api/search-text/search-text.queries.js +1 -15
- package/dist/modules/public-api/search-text/search-text.queries.js.map +1 -1
- package/dist/modules/public-site/helpers/medias.helpers.js +1 -1
- package/dist/modules/public-site/helpers/medias.helpers.js.map +1 -1
- package/dist/modules/public-site/liquidjs-tags/get-doc-tag.d.ts +2 -2
- package/dist/modules/public-site/liquidjs-tags/get-docs-tag.d.ts +2 -2
- package/dist/modules/public-site/liquidjs-tags/get-docs-tag.js +1 -0
- package/dist/modules/public-site/liquidjs-tags/get-docs-tag.js.map +1 -1
- package/dist/modules/public-site/liquidjs-tags/get-paginated-docs-tag.d.ts +2 -2
- package/dist/modules/public-site/liquidjs-tags/get-paginated-docs-tag.js +1 -0
- package/dist/modules/public-site/liquidjs-tags/get-paginated-docs-tag.js.map +1 -1
- package/dist/modules/public-site/liquidjs-tags/use-image-tag.d.ts +2 -2
- package/dist/public-payload/create-doc-drop.js +1 -1
- package/dist/public-payload/create-doc-drop.js.map +1 -1
- package/dist/public-payload/doc-values.queries.d.ts +3 -1
- package/dist/public-payload/doc-values.queries.js +7 -1
- package/dist/public-payload/doc-values.queries.js.map +1 -1
- package/dist/public-payload/excerpt.queries.js +1 -1
- package/dist/public-payload/excerpt.queries.js.map +1 -1
- package/dist/public-payload/public-payload.types.d.ts +1 -1
- package/dist/site-context/create-site-context.d.ts +1 -1
- package/dist/site-context/create-site-context.js +8 -3
- package/dist/site-context/create-site-context.js.map +1 -1
- package/dist/site-context/site-context.js +1 -1
- package/dist/site-context/site-context.js.map +1 -1
- package/dist/site-context/site-context.types.d.ts +1 -0
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +15 -14
- package/schema.graphql +1 -0
|
@@ -28,7 +28,7 @@ export function applyRegularChildrenSortingOnQuery(siteContext, options) {
|
|
|
28
28
|
const orderProperties = orderPropertiesMap.get(fieldName);
|
|
29
29
|
if (!orderProperties)
|
|
30
30
|
throw new Error(`unknown field '${fieldName}'`);
|
|
31
|
-
const { dataType,
|
|
31
|
+
const { dataType, localized } = orderProperties;
|
|
32
32
|
let orderByField;
|
|
33
33
|
if (dataType === "string" || dataType === "boolean") {
|
|
34
34
|
orderByField = `f${index}.val`;
|
|
@@ -39,10 +39,10 @@ export function applyRegularChildrenSortingOnQuery(siteContext, options) {
|
|
|
39
39
|
else {
|
|
40
40
|
throw new Error(`invalid data type '${dataType}'`);
|
|
41
41
|
}
|
|
42
|
-
const languageJoinCrit =
|
|
42
|
+
const languageJoinCrit = localized
|
|
43
43
|
? `f${index}.language = s.language`
|
|
44
44
|
: `f${index}.language = :dbAnyLanguage`;
|
|
45
|
-
const critParams =
|
|
45
|
+
const critParams = localized ? { fieldName } : { fieldName, dbAnyLanguage };
|
|
46
46
|
query.leftJoin("PaFieldVarchar", `f${index}`, `f${index}.field = :fieldName and f${index}.nodeId = s.nodeId and ${languageJoinCrit}`, critParams);
|
|
47
47
|
orderByQb.addOrderBy(orderByField, formatTypeOrmDirection(direction));
|
|
48
48
|
}
|
|
@@ -66,12 +66,12 @@ function makeMapOfOrderProperties(siteContext, children) {
|
|
|
66
66
|
if (prev.dataType !== field.dataType) {
|
|
67
67
|
throw new Error(`Cannot order on '${field.name}': inconsistent data types '${prev.dataType}' and '${field.dataType}'`);
|
|
68
68
|
}
|
|
69
|
-
if (prev.
|
|
70
|
-
throw new Error(`Cannot order on '${field.name}': inconsistent
|
|
69
|
+
if (prev.localized !== field.localized) {
|
|
70
|
+
throw new Error(`Cannot order on '${field.name}': inconsistent localized`);
|
|
71
71
|
}
|
|
72
72
|
}
|
|
73
73
|
else {
|
|
74
|
-
orderProperties.set(field.name, { dataType: field.dataType,
|
|
74
|
+
orderProperties.set(field.name, { dataType: field.dataType, localized: field.localized });
|
|
75
75
|
}
|
|
76
76
|
}
|
|
77
77
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"child-ordering-query.js","sourceRoot":"","sources":["../../src/common/child-ordering-query.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,4BAA4B,EAAE,MAAM,iCAAiC,CAAC;
|
|
1
|
+
{"version":3,"file":"child-ordering-query.js","sourceRoot":"","sources":["../../src/common/child-ordering-query.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,9 +9,7 @@ export function getHandleOfSiteFavicon() {
|
|
|
9
9
|
}
|
|
10
10
|
export function getHandleOfField(siteContext, options) {
|
|
11
11
|
const { fieldType, nodeId, language } = options;
|
|
12
|
-
if (fieldType.
|
|
13
|
-
fieldType.dataType !== "quillDelta" &&
|
|
14
|
-
fieldType.dataType !== "html") {
|
|
12
|
+
if (fieldType.localized && fieldType.dataType !== "quillDelta" && fieldType.dataType !== "html") {
|
|
15
13
|
if (language === undefined)
|
|
16
14
|
throw new Error("Missing language for nodel field");
|
|
17
15
|
if (nodeId === siteContext.siteIds.siteNodeId)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"media-handles.helpers.js","sourceRoot":"","sources":["../../src/common/media-handles.helpers.ts"],"names":[],"mappings":"AAMA,MAAM,UAAU,wBAAwB,CAAC,MAAc;IACrD,OAAO,QAAQ,MAAM,gBAAgB,CAAC;AACxC,CAAC;AAED,MAAM,UAAU,wBAAwB;IACtC,OAAO,gBAAgB,CAAC;AAC1B,CAAC;AAED,MAAM,UAAU,sBAAsB;IACpC,OAAO,cAAc,CAAC;AACxB,CAAC;AAED,MAAM,UAAU,gBAAgB,CAC9B,WAAyC,EACzC,OAIC;IAED,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;IAChD,
|
|
1
|
+
{"version":3,"file":"media-handles.helpers.js","sourceRoot":"","sources":["../../src/common/media-handles.helpers.ts"],"names":[],"mappings":"AAMA,MAAM,UAAU,wBAAwB,CAAC,MAAc;IACrD,OAAO,QAAQ,MAAM,gBAAgB,CAAC;AACxC,CAAC;AAED,MAAM,UAAU,wBAAwB;IACtC,OAAO,gBAAgB,CAAC;AAC1B,CAAC;AAED,MAAM,UAAU,sBAAsB;IACpC,OAAO,cAAc,CAAC;AACxB,CAAC;AAED,MAAM,UAAU,gBAAgB,CAC9B,WAAyC,EACzC,OAIC;IAED,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;IAChD,IAAI,SAAS,CAAC,SAAS,IAAI,SAAS,CAAC,QAAQ,KAAK,YAAY,IAAI,SAAS,CAAC,QAAQ,KAAK,MAAM,EAAE,CAAC;QAChG,IAAI,QAAQ,KAAK,SAAS;YAAE,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;QAChF,IAAI,MAAM,KAAK,WAAW,CAAC,OAAO,CAAC,UAAU;YAAE,OAAO,QAAQ,SAAS,CAAC,IAAI,IAAI,QAAQ,EAAE,CAAC;QAC3F,OAAO,QAAQ,MAAM,IAAI,SAAS,CAAC,IAAI,IAAI,QAAQ,EAAE,CAAC;IACxD,CAAC;IACD,OAAO,sBAAsB,CAAC,WAAW,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC,CAAC;AACpE,CAAC;AAED,MAAM,UAAU,sBAAsB,CACpC,WAAyC,EACzC,OAGC;IAED,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IACtC,IAAI,MAAM,KAAK,WAAW,CAAC,OAAO,CAAC,UAAU;QAAE,OAAO,QAAQ,SAAS,CAAC,IAAI,EAAE,CAAC;IAC/E,OAAO,QAAQ,MAAM,IAAI,SAAS,CAAC,IAAI,EAAE,CAAC;AAC5C,CAAC;AAED,MAAM,UAAU,oBAAoB,CAClC,WAAwD,EACxD,OAGC;IAED,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;IACxC,MAAM,SAAS,GAAG,WAAW,CAAC,UAAU,CAAC,SAAS,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC;IAClG,IAAI,CAAC,SAAS;QAAE,MAAM,IAAI,KAAK,CAAC,uBAAuB,SAAS,GAAG,CAAC,CAAC;IACrE,OAAO,gBAAgB,CAAC,WAAW,EAAE;QACnC,SAAS;QACT,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,UAAU;QACtC,QAAQ;KACT,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,uBAAuB,CAAC,MAAc;IACpD,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;IAC3C,OAAO,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC;AACpB,CAAC"}
|
package/dist/context.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { type CommonSchemaLibrary
|
|
1
|
+
import { type CommonSchemaLibrary } from "@paroicms/connector";
|
|
2
2
|
import type { ImageSize } from "@paroicms/public-anywhere-lib";
|
|
3
|
-
import { type SimpleTranslator } from "@paroicms/public-server-lib";
|
|
3
|
+
import { type SimpleTranslator, type SiteConf } from "@paroicms/public-server-lib";
|
|
4
4
|
export declare const dbAnyLanguage = ".";
|
|
5
5
|
export declare const packageDir: string;
|
|
6
6
|
export declare const appVersion: any, appName: any;
|
|
@@ -8,7 +8,7 @@ export declare const appConf: import("@paroicms/connector").AppConf;
|
|
|
8
8
|
export declare const platformLogger: import("@paroicms/internal-server-lib").PlatformLog;
|
|
9
9
|
export declare const thumbRealSize: ImageSize;
|
|
10
10
|
export declare let siteConfs: Map<string, SiteConf>;
|
|
11
|
-
export declare const httpRedirections: Map<string, import("@paroicms/connector
|
|
11
|
+
export declare const httpRedirections: Map<string, import("@paroicms/connector").JtHttpRedirection>;
|
|
12
12
|
export declare function initCommonSchemaLib(val: CommonSchemaLibrary): void;
|
|
13
13
|
export declare function getCommonSchemaLib(): CommonSchemaLibrary;
|
|
14
14
|
export declare const jwtSecret: string;
|
|
@@ -17,3 +17,4 @@ export declare const platformJwtSecret: string | undefined;
|
|
|
17
17
|
export declare const platformAuthUrl: string | undefined;
|
|
18
18
|
export declare let simpleI18n: SimpleTranslator;
|
|
19
19
|
export declare function initializeContext(siteConfsVal: Map<string, SiteConf>): Promise<void>;
|
|
20
|
+
export declare function addSiteConf(siteConf: SiteConf): void;
|
package/dist/context.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { readAppConfSync, supportedLanguages
|
|
1
|
+
import { readAppConfSync, supportedLanguages } from "@paroicms/connector";
|
|
2
2
|
import { createPlatformLog, getJwtSecretSync } from "@paroicms/internal-server-lib";
|
|
3
3
|
import { loadSimpleTranslatorFromDirectory, makeUrl, resolveModuleDirectory, } from "@paroicms/public-server-lib";
|
|
4
4
|
import { existsSync, readFileSync, renameSync, unlinkSync } from "node:fs";
|
|
@@ -83,4 +83,10 @@ export async function initializeContext(siteConfsVal) {
|
|
|
83
83
|
.join("\n - ")}`);
|
|
84
84
|
}
|
|
85
85
|
}
|
|
86
|
+
export function addSiteConf(siteConf) {
|
|
87
|
+
const { fqdn } = siteConf;
|
|
88
|
+
if (siteConfs.has(fqdn))
|
|
89
|
+
throw new Error(`siteConf for "${fqdn}" already exists.`);
|
|
90
|
+
siteConfs.set(fqdn, siteConf);
|
|
91
|
+
}
|
|
86
92
|
//# sourceMappingURL=context.js.map
|
package/dist/context.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context.js","sourceRoot":"","sources":["../src/context.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"context.js","sourceRoot":"","sources":["../src/context.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
import cors from "cors";
|
|
2
|
+
import { siteConfs } from "../context.js";
|
|
3
|
+
export function createCorsMiddleware() {
|
|
4
|
+
return cors({
|
|
5
|
+
credentials: true,
|
|
6
|
+
origin: (origin, callback) => {
|
|
7
|
+
if (!origin)
|
|
8
|
+
return callback(null, true);
|
|
9
|
+
if (process.env.NODE_ENV === "development") {
|
|
10
|
+
return callback(null, true);
|
|
11
|
+
}
|
|
12
|
+
try {
|
|
13
|
+
const originDomain = new URL(origin).hostname;
|
|
14
|
+
const allowedDomains = Array.from(siteConfs.values()).map((conf) => conf.fqdn);
|
|
15
|
+
if (allowedDomains.some((domain) => originDomain === domain || originDomain.endsWith(`.${domain}`))) {
|
|
16
|
+
return callback(null, true);
|
|
17
|
+
}
|
|
18
|
+
callback(new Error(`Origin ${origin} not allowed by CORS`), false);
|
|
19
|
+
}
|
|
20
|
+
catch (e) {
|
|
21
|
+
callback(new Error("CORS validation error"), false);
|
|
22
|
+
}
|
|
23
|
+
},
|
|
24
|
+
});
|
|
25
|
+
}
|
|
26
|
+
//# sourceMappingURL=cors-middleware.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"cors-middleware.js","sourceRoot":"","sources":["../../src/helpers/cors-middleware.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAE1C,MAAM,UAAU,oBAAoB;IAClC,OAAO,IAAI,CAAmB;QAC5B,WAAW,EAAE,IAAI;QACjB,MAAM,EAAE,CAAC,MAAM,EAAE,QAAQ,EAAE,EAAE;YAE3B,IAAI,CAAC,MAAM;gBAAE,OAAO,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YAGzC,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,aAAa,EAAE,CAAC;gBAC3C,OAAO,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YAC9B,CAAC;YAID,IAAI,CAAC;gBACH,MAAM,YAAY,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC;gBAE9C,MAAM,cAAc,GAAG,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAE/E,IACE,cAAc,CAAC,IAAI,CACjB,CAAC,MAAM,EAAE,EAAE,CAAC,YAAY,KAAK,MAAM,IAAI,YAAY,CAAC,QAAQ,CAAC,IAAI,MAAM,EAAE,CAAC,CAC3E,EACD,CAAC;oBACD,OAAO,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;gBAC9B,CAAC;gBAED,QAAQ,CAAC,IAAI,KAAK,CAAC,UAAU,MAAM,sBAAsB,CAAC,EAAE,KAAK,CAAC,CAAC;YACrE,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,QAAQ,CAAC,IAAI,KAAK,CAAC,uBAAuB,CAAC,EAAE,KAAK,CAAC,CAAC;YACtD,CAAC;QACH,CAAC;KACF,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -1,15 +1,16 @@
|
|
|
1
|
-
import { getPluginAssetsUrl } from "@paroicms/connector";
|
|
1
|
+
import { createNewSiteConf, getPluginAssetsUrl } from "@paroicms/connector";
|
|
2
2
|
import { parseNodelId } from "@paroicms/public-anywhere-lib";
|
|
3
3
|
import { toAbsoluteUrl, } from "@paroicms/public-server-lib";
|
|
4
4
|
import { sendMail } from "../common/mail/sendMail.helpers.js";
|
|
5
5
|
import { makeCacheDependencyKey } from "../common/text-cache.js";
|
|
6
|
-
import { appConf } from "../context.js";
|
|
6
|
+
import { addSiteConf, appConf } from "../context.js";
|
|
7
7
|
import { getSiteFieldValue } from "../modules/core/fields/load-fields.queries.js";
|
|
8
8
|
import { validateRecaptchaResponse } from "../modules/public-api/mail/validate-recaptcha-response.js";
|
|
9
9
|
import { renderChildPartials, renderSearchPartials, } from "../modules/public-api/public-api-rendering.js";
|
|
10
10
|
import { getUrlOfDocument } from "../modules/public-site/public-route/make-url.js";
|
|
11
11
|
import { getDocItem } from "../public-payload/doc-values.queries.js";
|
|
12
12
|
import { makeImageAvailable } from "../public-payload/make-image-available.js";
|
|
13
|
+
import { createRunningInstanceConnector } from "./running-instance-connector.js";
|
|
13
14
|
export function makeBackendPluginService(siteContext, plugin) {
|
|
14
15
|
return {
|
|
15
16
|
fqdn: siteContext.fqdn,
|
|
@@ -29,6 +30,15 @@ export function makeBackendPluginService(siteContext, plugin) {
|
|
|
29
30
|
},
|
|
30
31
|
pluginConf: plugin.pluginConf,
|
|
31
32
|
pluginAssetsUrl: getPluginAssetsUrl(plugin),
|
|
33
|
+
registerNewSite: async (options) => {
|
|
34
|
+
if (appConf.kind !== "multisite") {
|
|
35
|
+
throw new Error("registerNewSite is only available in multisite mode");
|
|
36
|
+
}
|
|
37
|
+
const siteConf = await createNewSiteConf(options, appConf);
|
|
38
|
+
addSiteConf(siteConf);
|
|
39
|
+
return Object.freeze({ ...siteConf });
|
|
40
|
+
},
|
|
41
|
+
connector: createRunningInstanceConnector(),
|
|
32
42
|
};
|
|
33
43
|
}
|
|
34
44
|
export function makeBackendPluginRenderService(siteContext, renderingContext, plugin) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"make-backend-plugin-service.js","sourceRoot":"","sources":["../../src/helpers/make-backend-plugin-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"make-backend-plugin-service.js","sourceRoot":"","sources":["../../src/helpers/make-backend-plugin-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,306 @@
|
|
|
1
|
+
import { getNodeTypeByName, getRegularDocumentTypeByName, getRoutingDocumentTypeByName, } from "@paroicms/internal-anywhere-lib";
|
|
2
|
+
import { generateSlug } from "@paroicms/public-anywhere-lib";
|
|
3
|
+
import mime from "mime";
|
|
4
|
+
import { readFile } from "node:fs/promises";
|
|
5
|
+
import { basename } from "node:path";
|
|
6
|
+
import { getHandleOfFeaturedImage, getHandleOfField } from "../common/media-handles.helpers.js";
|
|
7
|
+
import { appConf } from "../context.js";
|
|
8
|
+
import { createDocumentOnNode, createNodeWithDocument, updateDocument, } from "../modules/core/document/save-documents.queries.js";
|
|
9
|
+
import { saveFieldValues } from "../modules/core/fields/save-fields.queries.js";
|
|
10
|
+
import { addMediaToNode } from "../modules/core/media/add-media-to-node.js";
|
|
11
|
+
import { getTypeNameOf } from "../modules/core/node/node.queries.js";
|
|
12
|
+
import { createNodeWithPart, createPartOnNode } from "../modules/core/part/part.queries.js";
|
|
13
|
+
import { getSiteContext } from "../site-context/site-context.js";
|
|
14
|
+
import { hashPassword } from "./passwordEncrypt-helper.js";
|
|
15
|
+
export function createRunningInstanceConnector() {
|
|
16
|
+
return {
|
|
17
|
+
getSitePackConf: (packName) => {
|
|
18
|
+
if (appConf.kind !== "multisite") {
|
|
19
|
+
throw new Error("getSitePackDirectories is only available in multisite mode");
|
|
20
|
+
}
|
|
21
|
+
const pack = appConf.sitePacks.find((p) => p.packName === packName);
|
|
22
|
+
if (!pack)
|
|
23
|
+
throw new Error(`pack "${packName}" not found`);
|
|
24
|
+
return {
|
|
25
|
+
...pack,
|
|
26
|
+
trusted: pack.trusted !== false,
|
|
27
|
+
};
|
|
28
|
+
},
|
|
29
|
+
loadSiteSchemaAndIds: async (fqdn) => {
|
|
30
|
+
const { siteSchema, siteIds } = await getSiteContext(fqdn);
|
|
31
|
+
return { siteSchema, siteIds };
|
|
32
|
+
},
|
|
33
|
+
createAccount,
|
|
34
|
+
updateSiteFields,
|
|
35
|
+
updateDocumentContent,
|
|
36
|
+
addMultipleDocumentContents,
|
|
37
|
+
addMultiplePartContents,
|
|
38
|
+
};
|
|
39
|
+
}
|
|
40
|
+
async function createAccount(fqdn, account, options) {
|
|
41
|
+
const siteContext = await getSiteContext(fqdn);
|
|
42
|
+
const { siteNodeId } = siteContext.siteIds;
|
|
43
|
+
const siteType = siteContext.siteSchema.nodeTypes._site;
|
|
44
|
+
const { kind, email, name } = account;
|
|
45
|
+
await siteContext.cn
|
|
46
|
+
.createQueryBuilder()
|
|
47
|
+
.insert()
|
|
48
|
+
.into("PaAccount")
|
|
49
|
+
.values({
|
|
50
|
+
email,
|
|
51
|
+
name,
|
|
52
|
+
passwordHash: kind === "local" ? await hashPassword(account.password) : undefined,
|
|
53
|
+
})
|
|
54
|
+
.execute();
|
|
55
|
+
if (options?.asContactEmail) {
|
|
56
|
+
await saveFieldValues(siteContext, {
|
|
57
|
+
typeName: siteType.typeName,
|
|
58
|
+
nodeId: siteNodeId,
|
|
59
|
+
values: {
|
|
60
|
+
contactEmail: email,
|
|
61
|
+
},
|
|
62
|
+
force: true,
|
|
63
|
+
});
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
async function updateSiteFields(fqdn, fields) {
|
|
67
|
+
const siteContext = await getSiteContext(fqdn);
|
|
68
|
+
const { siteNodeId } = siteContext.siteIds;
|
|
69
|
+
const siteType = siteContext.siteSchema.nodeTypes._site;
|
|
70
|
+
const { multilingualFieldValues, fieldMedias } = createFieldValuesToAdd(fields, siteType.fields);
|
|
71
|
+
for (const [language, values] of Object.entries(multilingualFieldValues)) {
|
|
72
|
+
await saveFieldValues(siteContext, {
|
|
73
|
+
typeName: siteType.typeName,
|
|
74
|
+
nodeId: siteNodeId,
|
|
75
|
+
language,
|
|
76
|
+
values,
|
|
77
|
+
force: true,
|
|
78
|
+
});
|
|
79
|
+
}
|
|
80
|
+
for (const fieldMedia of fieldMedias) {
|
|
81
|
+
await addFieldMedia(siteContext, fieldMedia, siteNodeId, siteType);
|
|
82
|
+
}
|
|
83
|
+
}
|
|
84
|
+
async function updateDocumentContent(fqdn, options) {
|
|
85
|
+
const { nodeId, content } = options;
|
|
86
|
+
const siteContext = await getSiteContext(fqdn);
|
|
87
|
+
const typeName = await getTypeNameOf(siteContext, nodeId);
|
|
88
|
+
const nodeType = getRoutingDocumentTypeByName(siteContext.siteSchema, typeName);
|
|
89
|
+
const { multilingualFieldValues, fieldMedias } = createFieldValuesToAdd(content.fields, nodeType.fields ?? []);
|
|
90
|
+
if (content.title) {
|
|
91
|
+
for (const [language, title] of Object.entries(content.title)) {
|
|
92
|
+
const slug = generateSlug(title);
|
|
93
|
+
await updateDocument(siteContext, { nodeId, language }, { title, slug });
|
|
94
|
+
}
|
|
95
|
+
}
|
|
96
|
+
for (const [language, values] of Object.entries(multilingualFieldValues)) {
|
|
97
|
+
await saveFieldValues(siteContext, {
|
|
98
|
+
typeName,
|
|
99
|
+
nodeId,
|
|
100
|
+
language,
|
|
101
|
+
values,
|
|
102
|
+
});
|
|
103
|
+
}
|
|
104
|
+
if (content.featuredImage && nodeType.withFeaturedImage) {
|
|
105
|
+
await addMediaFile(siteContext, {
|
|
106
|
+
nodeId,
|
|
107
|
+
nodeType,
|
|
108
|
+
handle: getHandleOfFeaturedImage(nodeId),
|
|
109
|
+
path: content.featuredImage.file,
|
|
110
|
+
});
|
|
111
|
+
}
|
|
112
|
+
for (const fieldMedia of fieldMedias) {
|
|
113
|
+
await addFieldMedia(siteContext, fieldMedia, nodeId, nodeType);
|
|
114
|
+
}
|
|
115
|
+
}
|
|
116
|
+
async function addMultipleDocumentContents(fqdn, options) {
|
|
117
|
+
const { parentNodeId, contents } = options;
|
|
118
|
+
const siteContext = await getSiteContext(fqdn);
|
|
119
|
+
const parentType = getNodeTypeByName(siteContext.siteSchema, await getTypeNameOf(siteContext, parentNodeId));
|
|
120
|
+
if (parentType.kind !== "document") {
|
|
121
|
+
throw new Error(`Cannot add documents as children of "${parentType.typeName}"`);
|
|
122
|
+
}
|
|
123
|
+
for (const content of contents) {
|
|
124
|
+
const typeName = content.typeName;
|
|
125
|
+
if (!parentType.regularChildren?.includes(typeName)) {
|
|
126
|
+
throw new Error(`Type "${typeName}" is not a regular child of "${parentType.typeName}"`);
|
|
127
|
+
}
|
|
128
|
+
const childType = getRegularDocumentTypeByName(siteContext.siteSchema, typeName);
|
|
129
|
+
const { multilingualFieldValues, fieldMedias } = createFieldValuesToAdd(content.fields, childType.fields ?? []);
|
|
130
|
+
let nodeId;
|
|
131
|
+
for (const [language, values] of Object.entries(multilingualFieldValues)) {
|
|
132
|
+
const title = content.title?.[language];
|
|
133
|
+
const slug = title ? generateSlug(title) : undefined;
|
|
134
|
+
if (nodeId === undefined) {
|
|
135
|
+
const created = await createNodeWithDocument(siteContext, {
|
|
136
|
+
parentId: {
|
|
137
|
+
nodeId: parentNodeId,
|
|
138
|
+
language,
|
|
139
|
+
},
|
|
140
|
+
values: { typeName, title, slug },
|
|
141
|
+
forceReady: true,
|
|
142
|
+
});
|
|
143
|
+
nodeId = created.nodeId;
|
|
144
|
+
}
|
|
145
|
+
else {
|
|
146
|
+
await createDocumentOnNode(siteContext, {
|
|
147
|
+
language,
|
|
148
|
+
nodeId,
|
|
149
|
+
values: { title, slug },
|
|
150
|
+
forceReady: true,
|
|
151
|
+
});
|
|
152
|
+
}
|
|
153
|
+
await saveFieldValues(siteContext, { typeName, nodeId, language, values });
|
|
154
|
+
}
|
|
155
|
+
if (nodeId !== undefined) {
|
|
156
|
+
if (content.featuredImage && childType.withFeaturedImage) {
|
|
157
|
+
await addMediaFile(siteContext, {
|
|
158
|
+
nodeId,
|
|
159
|
+
nodeType: childType,
|
|
160
|
+
handle: getHandleOfFeaturedImage(nodeId),
|
|
161
|
+
path: content.featuredImage.file,
|
|
162
|
+
});
|
|
163
|
+
}
|
|
164
|
+
for (const fieldMedia of fieldMedias) {
|
|
165
|
+
await addFieldMedia(siteContext, fieldMedia, nodeId, childType);
|
|
166
|
+
}
|
|
167
|
+
}
|
|
168
|
+
}
|
|
169
|
+
}
|
|
170
|
+
async function addMultiplePartContents(fqdn, options) {
|
|
171
|
+
const { parentNodeId, contents } = options;
|
|
172
|
+
const siteContext = await getSiteContext(fqdn);
|
|
173
|
+
const parentType = getNodeTypeByName(siteContext.siteSchema, await getTypeNameOf(siteContext, parentNodeId));
|
|
174
|
+
if (parentType.kind !== "document" && parentType.kind !== "part") {
|
|
175
|
+
throw new Error(`Cannot add parts as children of "${parentType.typeName}"`);
|
|
176
|
+
}
|
|
177
|
+
for (const content of contents) {
|
|
178
|
+
const typeName = content.typeName;
|
|
179
|
+
const listType = parentType.kind === "document"
|
|
180
|
+
? parentType.lists?.find((l) => l.parts.includes(typeName))
|
|
181
|
+
: parentType.kind === "part"
|
|
182
|
+
? parentType.list
|
|
183
|
+
: undefined;
|
|
184
|
+
if (!listType || !listType.parts.includes(typeName)) {
|
|
185
|
+
throw new Error(`Type "${typeName}" is not a part of "${parentType.typeName}"`);
|
|
186
|
+
}
|
|
187
|
+
const nodeType = getNodeTypeByName(siteContext.siteSchema, typeName);
|
|
188
|
+
const { multilingualFieldValues, fieldMedias } = createFieldValuesToAdd(content.fields, nodeType.fields ?? []);
|
|
189
|
+
let nodeId;
|
|
190
|
+
for (const [language, values] of Object.entries(multilingualFieldValues)) {
|
|
191
|
+
if (nodeId === undefined) {
|
|
192
|
+
const created = await createNodeWithPart(siteContext, {
|
|
193
|
+
parentNodelId: {
|
|
194
|
+
nodeId: parentNodeId,
|
|
195
|
+
language,
|
|
196
|
+
},
|
|
197
|
+
listName: listType.listName,
|
|
198
|
+
typeName,
|
|
199
|
+
});
|
|
200
|
+
nodeId = created.nodeId;
|
|
201
|
+
}
|
|
202
|
+
else {
|
|
203
|
+
await createPartOnNode(siteContext, { language, nodeId });
|
|
204
|
+
}
|
|
205
|
+
await saveFieldValues(siteContext, { typeName, nodeId, language, values });
|
|
206
|
+
}
|
|
207
|
+
if (nodeId !== undefined) {
|
|
208
|
+
for (const fieldMedia of fieldMedias) {
|
|
209
|
+
await addFieldMedia(siteContext, fieldMedia, nodeId, nodeType);
|
|
210
|
+
}
|
|
211
|
+
}
|
|
212
|
+
}
|
|
213
|
+
}
|
|
214
|
+
async function addFieldMedia(siteContext, fieldMedia, nodeId, nodeType) {
|
|
215
|
+
const { fieldType, language, files } = fieldMedia;
|
|
216
|
+
const handle = getHandleOfField(siteContext, {
|
|
217
|
+
fieldType,
|
|
218
|
+
nodeId,
|
|
219
|
+
language,
|
|
220
|
+
});
|
|
221
|
+
for (const path of files) {
|
|
222
|
+
await addMediaFile(siteContext, { nodeId, nodeType, path, handle });
|
|
223
|
+
}
|
|
224
|
+
}
|
|
225
|
+
async function addMediaFile(siteContext, options) {
|
|
226
|
+
const { nodeId, nodeType, path, handle } = options;
|
|
227
|
+
const fileName = basename(path);
|
|
228
|
+
const binaryFile = await readFile(path);
|
|
229
|
+
const mediaType = mime.getType(path);
|
|
230
|
+
if (!mediaType) {
|
|
231
|
+
throw new Error(`Cannot determine media type of "${path}"`);
|
|
232
|
+
}
|
|
233
|
+
await addMediaToNode(siteContext, {
|
|
234
|
+
binaryFile,
|
|
235
|
+
originalName: fileName,
|
|
236
|
+
weightB: binaryFile.byteLength,
|
|
237
|
+
mediaType,
|
|
238
|
+
}, {
|
|
239
|
+
nodeId,
|
|
240
|
+
nodeType,
|
|
241
|
+
handle,
|
|
242
|
+
});
|
|
243
|
+
}
|
|
244
|
+
function createFieldValuesToAdd(fields, fieldTypes) {
|
|
245
|
+
const multilingualFieldValues = {};
|
|
246
|
+
const medias = [];
|
|
247
|
+
for (const fieldType of fieldTypes) {
|
|
248
|
+
const content = fields[fieldType.name];
|
|
249
|
+
if (!content)
|
|
250
|
+
continue;
|
|
251
|
+
const { dataType, localized, value } = content;
|
|
252
|
+
if (dataType !== fieldType.dataType) {
|
|
253
|
+
throw new Error(`Field "${fieldType.name}" has a data type of "${fieldType.dataType}" but got "${dataType}"`);
|
|
254
|
+
}
|
|
255
|
+
if (localized !== fieldType.localized) {
|
|
256
|
+
throw new Error(`Field "${fieldType.name}" should be ${fieldType.localized ? "localized" : "not localized"}"`);
|
|
257
|
+
}
|
|
258
|
+
if (dataType === "media") {
|
|
259
|
+
if (!value)
|
|
260
|
+
continue;
|
|
261
|
+
if (localized) {
|
|
262
|
+
for (const [language, v] of Object.entries(value)) {
|
|
263
|
+
if (!v)
|
|
264
|
+
continue;
|
|
265
|
+
medias.push({ fieldType, files: [v.file], language });
|
|
266
|
+
}
|
|
267
|
+
}
|
|
268
|
+
else {
|
|
269
|
+
medias.push({ fieldType, files: [value.file] });
|
|
270
|
+
}
|
|
271
|
+
}
|
|
272
|
+
else if (dataType === "gallery") {
|
|
273
|
+
if (!value)
|
|
274
|
+
continue;
|
|
275
|
+
if (localized) {
|
|
276
|
+
for (const [language, v] of Object.entries(value)) {
|
|
277
|
+
if (!v)
|
|
278
|
+
continue;
|
|
279
|
+
medias.push({ fieldType, files: v.files, language });
|
|
280
|
+
}
|
|
281
|
+
}
|
|
282
|
+
else {
|
|
283
|
+
medias.push({ fieldType, files: value.files });
|
|
284
|
+
}
|
|
285
|
+
}
|
|
286
|
+
else if (localized) {
|
|
287
|
+
for (const [language, v] of Object.entries(value)) {
|
|
288
|
+
multilingualFieldValues[language] ??= {};
|
|
289
|
+
multilingualFieldValues[language][fieldType.name] = toFieldValue(fieldType, v);
|
|
290
|
+
}
|
|
291
|
+
}
|
|
292
|
+
else {
|
|
293
|
+
multilingualFieldValues["."] ??= {};
|
|
294
|
+
multilingualFieldValues["."][fieldType.name] = toFieldValue(fieldType, value);
|
|
295
|
+
}
|
|
296
|
+
}
|
|
297
|
+
return { multilingualFieldValues, fieldMedias: medias };
|
|
298
|
+
}
|
|
299
|
+
function toFieldValue(fieldType, value) {
|
|
300
|
+
if (fieldType.dataType === "quillDelta")
|
|
301
|
+
return {
|
|
302
|
+
delta: value,
|
|
303
|
+
};
|
|
304
|
+
return value;
|
|
305
|
+
}
|
|
306
|
+
//# sourceMappingURL=running-instance-connector.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"running-instance-connector.js","sourceRoot":"","sources":["../../src/helpers/running-instance-connector.ts"],"names":[],"mappings":"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"}
|
package/dist/index.js
CHANGED
|
@@ -5,7 +5,6 @@ import { eachDay, startCronLike } from "@paroicms/internal-server-lib";
|
|
|
5
5
|
import { makeUrl } from "@paroicms/public-server-lib";
|
|
6
6
|
import { setupImageProcessor } from "@paroicms/server-image-cache-engine";
|
|
7
7
|
import compression from "compression";
|
|
8
|
-
import cors from "cors";
|
|
9
8
|
import express from "express";
|
|
10
9
|
import rateLimit from "express-rate-limit";
|
|
11
10
|
import { GraphQLError } from "graphql";
|
|
@@ -21,6 +20,7 @@ import { federateResolvers, typeDefs } from "./graphql/apollo-server-init.js";
|
|
|
21
20
|
import { createComplexityPlugin } from "./graphql/complexity-plugin.js";
|
|
22
21
|
import { disableApolloStudioPlugin } from "./graphql/disable-apollo-studio-plugin.js";
|
|
23
22
|
import { createErrorConverterPlugin } from "./graphql/error-converter-plugin.js";
|
|
23
|
+
import { createCorsMiddleware } from "./helpers/cors-middleware.js";
|
|
24
24
|
import { maintenanceTask, unloadAllActiveSites } from "./maintenance/maintenance-task.js";
|
|
25
25
|
import { handleShutdownEvents } from "./maintenance/shutdown.js";
|
|
26
26
|
import { faviconController, robotsTxtController } from "./modules/app.controller.js";
|
|
@@ -44,8 +44,8 @@ export async function start(options = {}) {
|
|
|
44
44
|
watchForIdleSiteContexts();
|
|
45
45
|
setupImageProcessor({ ...appConf.imageProcessor, logger: platformLogger });
|
|
46
46
|
const siteConfs = appConf.kind === "multisite"
|
|
47
|
-
? await loadSitePackConfs(appConf
|
|
48
|
-
: await createSiteConfsFromSingle(appConf
|
|
47
|
+
? await loadSitePackConfs(appConf, options.sitePackPlaces)
|
|
48
|
+
: await createSiteConfsFromSingle(appConf);
|
|
49
49
|
await initializeContext(siteConfs);
|
|
50
50
|
initCommonSchemaLib(await readCommonSchemaLibrary());
|
|
51
51
|
const stopCron = startCronLike(maintenanceTask, {
|
|
@@ -82,7 +82,7 @@ export async function start(options = {}) {
|
|
|
82
82
|
standardHeaders: true,
|
|
83
83
|
legacyHeaders: false,
|
|
84
84
|
}));
|
|
85
|
-
expressApp.use(
|
|
85
|
+
expressApp.use(createCorsMiddleware());
|
|
86
86
|
expressApp.use(httpRedirectionMiddleware);
|
|
87
87
|
if (platformAuthUrl) {
|
|
88
88
|
const passport = (await import("./modules/core/account-auth/account-auth.strategy.js"))
|