@paroicms/server 1.72.0 → 1.73.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/mail/sendMail.helpers.d.ts +3 -3
- package/dist/common/mail/sendMail.helpers.js +2 -2
- package/dist/common/mail/sendMail.helpers.js.map +1 -1
- package/dist/common/text-cache.d.ts +6 -6
- package/dist/common/text-cache.js.map +1 -1
- package/dist/common/url-helpers.d.ts +2 -2
- package/dist/common/url-helpers.js.map +1 -1
- package/dist/context.d.ts +1 -1
- package/dist/context.js +4 -4
- package/dist/context.js.map +1 -1
- package/dist/express/route-handler-wrapper.js +3 -3
- package/dist/express/route-handler-wrapper.js.map +1 -1
- package/dist/express/small-middlewares.js +1 -1
- package/dist/express/small-middlewares.js.map +1 -1
- package/dist/graphql/error-converter-plugin.js +1 -1
- package/dist/graphql/error-converter-plugin.js.map +1 -1
- package/dist/helpers/make-backend-plugin-service.js +1 -1
- package/dist/index.js +8 -10
- package/dist/index.js.map +1 -1
- package/dist/maintenance/maintenance-task.js +2 -1
- package/dist/maintenance/maintenance-task.js.map +1 -1
- package/dist/maintenance/shutdown.d.ts +3 -3
- package/dist/maintenance/shutdown.js +40 -25
- package/dist/maintenance/shutdown.js.map +1 -1
- package/dist/modules/core/account/account.queries.js +2 -2
- package/dist/modules/core/account-auth/account-auth.service.js +2 -2
- package/dist/modules/core/account-auth/account-auth.service.js.map +1 -1
- package/dist/modules/core/account-auth/account-auth.strategy.js +1 -1
- package/dist/modules/core/account-auth/account-auth.strategy.js.map +1 -1
- package/dist/site-context/create-site-context.js +4 -4
- package/dist/site-context/create-site-context.js.map +1 -1
- package/dist/site-context/site-context.types.d.ts +2 -2
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +16 -16
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { BasicAppLogger } from "@paroicms/internal-server-lib";
|
|
2
2
|
import { type MailData } from "@paroicms/public-server-lib";
|
|
3
|
-
export declare function sendMail({ subject, html, replyTo, to }: MailData, {
|
|
4
|
-
|
|
3
|
+
export declare function sendMail({ subject, html, replyTo, to }: MailData, { logger }: {
|
|
4
|
+
logger: BasicAppLogger;
|
|
5
5
|
}): Promise<void>;
|
|
@@ -13,12 +13,12 @@ const sesClient = !context_1.appConf.awsSesMail || context_1.appConf.awsSesMail?
|
|
|
13
13
|
secretAccessKey: context_1.appConf.awsSesMail.secretAccessKey,
|
|
14
14
|
},
|
|
15
15
|
});
|
|
16
|
-
async function sendMail({ subject, html, replyTo, to }, {
|
|
16
|
+
async function sendMail({ subject, html, replyTo, to }, { logger }) {
|
|
17
17
|
const text = (0, public_server_lib_1.htmlToText)(html);
|
|
18
18
|
const replyToAddr = replyTo
|
|
19
19
|
? `"${(0, public_server_lib_1.escapeHtml)(replyTo.name)}" <${(0, public_server_lib_1.escapeHtml)(replyTo.email)}>`
|
|
20
20
|
: undefined;
|
|
21
|
-
|
|
21
|
+
logger.debug(`[sendMail] ${JSON.stringify({
|
|
22
22
|
from: context_1.appConf.awsSesMail?.from,
|
|
23
23
|
to,
|
|
24
24
|
replyToAddr,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sendMail.helpers.js","sourceRoot":"","sources":["../../../src/common/mail/sendMail.helpers.ts"],"names":[],"mappings":";;AAgBA,4BA+CC;AA/DD,oDAAkE;AAElE,mEAAoF;AACpF,2CAAwC;AAExC,MAAM,SAAS,GACb,CAAC,iBAAO,CAAC,UAAU,IAAI,iBAAO,CAAC,UAAU,EAAE,QAAQ;IACjD,CAAC,CAAC,SAAS;IACX,CAAC,CAAC,IAAI,sBAAS,CAAC;QACZ,MAAM,EAAE,iBAAO,CAAC,UAAU,CAAC,MAAM;QACjC,WAAW,EAAE;YACX,WAAW,EAAE,iBAAO,CAAC,UAAU,CAAC,WAAW;YAC3C,eAAe,EAAE,iBAAO,CAAC,UAAU,CAAC,eAAe;SACpD;KACF,CAAC,CAAC;AAEF,KAAK,UAAU,QAAQ,CAC5B,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,EAAY,EACxC,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"sendMail.helpers.js","sourceRoot":"","sources":["../../../src/common/mail/sendMail.helpers.ts"],"names":[],"mappings":";;AAgBA,4BA+CC;AA/DD,oDAAkE;AAElE,mEAAoF;AACpF,2CAAwC;AAExC,MAAM,SAAS,GACb,CAAC,iBAAO,CAAC,UAAU,IAAI,iBAAO,CAAC,UAAU,EAAE,QAAQ;IACjD,CAAC,CAAC,SAAS;IACX,CAAC,CAAC,IAAI,sBAAS,CAAC;QACZ,MAAM,EAAE,iBAAO,CAAC,UAAU,CAAC,MAAM;QACjC,WAAW,EAAE;YACX,WAAW,EAAE,iBAAO,CAAC,UAAU,CAAC,WAAW;YAC3C,eAAe,EAAE,iBAAO,CAAC,UAAU,CAAC,eAAe;SACpD;KACF,CAAC,CAAC;AAEF,KAAK,UAAU,QAAQ,CAC5B,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,EAAY,EACxC,EAAE,MAAM,EAA8B;IAEtC,MAAM,IAAI,GAAG,IAAA,8BAAU,EAAC,IAAI,CAAC,CAAC;IAC9B,MAAM,WAAW,GAAG,OAAO;QACzB,CAAC,CAAC,IAAI,IAAA,8BAAU,EAAC,OAAO,CAAC,IAAI,CAAC,MAAM,IAAA,8BAAU,EAAC,OAAO,CAAC,KAAK,CAAC,GAAG;QAChE,CAAC,CAAC,SAAS,CAAC;IAEd,MAAM,CAAC,KAAK,CACV,cAAc,IAAI,CAAC,SAAS,CAAC;QAC3B,IAAI,EAAE,iBAAO,CAAC,UAAU,EAAE,IAAI;QAC9B,EAAE;QACF,WAAW;QACX,OAAO;QACP,IAAI;QACJ,IAAI;KACL,CAAC,EAAE,CACL,CAAC;IAEF,IAAI,CAAC,SAAS,IAAI,CAAC,iBAAO,CAAC,UAAU;QAAE,OAAO;IAE9C,MAAM,OAAO,GAAG,IAAI,6BAAgB,CAAC;QACnC,MAAM,EAAE,iBAAO,CAAC,UAAU,CAAC,IAAI;QAC/B,WAAW,EAAE;YACX,WAAW,EAAE,CAAC,EAAE,CAAC;SAClB;QACD,gBAAgB,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS;QACzD,OAAO,EAAE;YACP,OAAO,EAAE;gBACP,OAAO,EAAE,OAAO;gBAChB,IAAI,EAAE,OAAO;aACd;YACD,IAAI,EAAE;gBACJ,IAAI,EAAE;oBACJ,OAAO,EAAE,OAAO;oBAChB,IAAI,EAAE,IAAI;iBACX;gBACD,IAAI,EAAE;oBACJ,OAAO,EAAE,OAAO;oBAChB,IAAI,EAAE,IAAI;iBACX;aACF;SACF;KACF,CAAC,CAAC;IAEH,MAAM,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;AAChC,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { type ParsedNodelId } from "@paroicms/public-anywhere-lib";
|
|
2
|
-
import type {
|
|
2
|
+
import type { AppLogger } from "@paroicms/public-server-lib";
|
|
3
3
|
import type { SiteContext } from "../site-context/site-context.types";
|
|
4
4
|
export declare function makeCacheDependencyKey(options: {
|
|
5
5
|
documentId: ParsedNodelId;
|
|
@@ -19,23 +19,23 @@ export declare function makeCacheDependencyKey(options: {
|
|
|
19
19
|
} | {
|
|
20
20
|
global: "all";
|
|
21
21
|
}): string;
|
|
22
|
-
export declare function makeCacheKey(logger:
|
|
22
|
+
export declare function makeCacheKey(logger: AppLogger, options: {
|
|
23
23
|
kind: "redirect";
|
|
24
24
|
urlKey: string;
|
|
25
25
|
}): string;
|
|
26
|
-
export declare function makeCacheKey(logger:
|
|
26
|
+
export declare function makeCacheKey(logger: AppLogger, options: {
|
|
27
27
|
kind: "url";
|
|
28
28
|
documentId: ParsedNodelId;
|
|
29
29
|
}): string;
|
|
30
|
-
export declare function makeCacheKey(logger:
|
|
30
|
+
export declare function makeCacheKey(logger: AppLogger, options: {
|
|
31
31
|
kind: "html";
|
|
32
32
|
url: string;
|
|
33
33
|
}): string;
|
|
34
|
-
export declare function makeCacheKey(logger:
|
|
34
|
+
export declare function makeCacheKey(logger: AppLogger, options: {
|
|
35
35
|
kind: "feed";
|
|
36
36
|
url: string;
|
|
37
37
|
}): string;
|
|
38
|
-
export declare function makeCacheKey(logger:
|
|
38
|
+
export declare function makeCacheKey(logger: AppLogger, options: {
|
|
39
39
|
kind: "api";
|
|
40
40
|
url: string;
|
|
41
41
|
}): string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"text-cache.js","sourceRoot":"","sources":["../../src/common/text-cache.ts"],"names":[],"mappings":";;AAWA,wDA0BC;
|
|
1
|
+
{"version":3,"file":"text-cache.js","sourceRoot":"","sources":["../../src/common/text-cache.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
import type {
|
|
2
|
-
export declare function normalizeUrlForCache(logger:
|
|
1
|
+
import type { AppLogger } from "@paroicms/public-server-lib";
|
|
2
|
+
export declare function normalizeUrlForCache(logger: AppLogger, url: string): string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"url-helpers.js","sourceRoot":"","sources":["../../src/common/url-helpers.ts"],"names":[],"mappings":";;AAEA,oDA+BC;AA/BD,SAAgB,oBAAoB,CAAC,
|
|
1
|
+
{"version":3,"file":"url-helpers.js","sourceRoot":"","sources":["../../src/common/url-helpers.ts"],"names":[],"mappings":";;AAEA,oDA+BC;AA/BD,SAAgB,oBAAoB,CAAC,MAAiB,EAAE,GAAW;IACjE,IAAI,CAAC;QACH,MAAM,UAAU,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QACtC,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;QAE1E,MAAM,MAAM,GAAG,IAAI,eAAe,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QAGrD,MAAM,YAAY,GAAuB,EAAE,CAAC;QAC5C,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;YAC5B,YAAY,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC;QAClC,CAAC,CAAC,CAAC;QAGH,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC;QAGhE,MAAM,YAAY,GAAG,IAAI,eAAe,EAAE,CAAC;QAC3C,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;YACpC,YAAY,CAAC,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QAClC,CAAC,CAAC,CAAC;QAGH,SAAS,CAAC,MAAM,GAAG,YAAY,CAAC,QAAQ,EAAE,CAAC;QAG3C,OAAO,UAAU,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,QAAQ,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC;IACxF,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,CAAC,IAAI,CAAC,4BAA4B,GAAG,aAAa,EAAE,KAAK,CAAC,CAAC;QACjE,OAAO,GAAG,CAAC;IACb,CAAC;AACH,CAAC"}
|
package/dist/context.d.ts
CHANGED
|
@@ -5,7 +5,7 @@ export declare const dbAnyLanguage = ".";
|
|
|
5
5
|
export declare const packageDir: string;
|
|
6
6
|
export declare const appVersion: any, appName: any;
|
|
7
7
|
export declare const appConf: import("@paroicms/connector").AppConf;
|
|
8
|
-
export declare const
|
|
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
11
|
export declare const httpRedirections: Map<string, import("@paroicms/connector/typeonly/configuration-types").JsonOfHttpRedirection>;
|
package/dist/context.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var _a;
|
|
3
3
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
|
-
exports.simpleI18n = exports.platformAuthUrl = exports.platformJwtSecret = exports.jwtExpiresIn = exports.jwtSecret = exports.httpRedirections = exports.siteConfs = exports.thumbRealSize = exports.
|
|
4
|
+
exports.simpleI18n = exports.platformAuthUrl = exports.platformJwtSecret = exports.jwtExpiresIn = exports.jwtSecret = exports.httpRedirections = exports.siteConfs = exports.thumbRealSize = exports.platformLogger = exports.appConf = exports.appName = exports.appVersion = exports.packageDir = exports.dbAnyLanguage = void 0;
|
|
5
5
|
exports.initCommonSchemaLib = initCommonSchemaLib;
|
|
6
6
|
exports.getCommonSchemaLib = getCommonSchemaLib;
|
|
7
7
|
exports.initializeContext = initializeContext;
|
|
@@ -14,7 +14,7 @@ exports.dbAnyLanguage = ".";
|
|
|
14
14
|
exports.packageDir = (0, node_path_1.dirname)(__dirname);
|
|
15
15
|
_a = JSON.parse((0, node_fs_1.readFileSync)((0, node_path_1.join)(exports.packageDir, "package.json"), "utf-8")), exports.appVersion = _a.version, exports.appName = _a.name;
|
|
16
16
|
exports.appConf = (0, connector_1.readAppConfSync)();
|
|
17
|
-
exports.
|
|
17
|
+
exports.platformLogger = (0, internal_server_lib_1.createPlatformLog)({
|
|
18
18
|
level: exports.appConf.logLevel,
|
|
19
19
|
file: exports.appConf.logFile,
|
|
20
20
|
reportMessage: true,
|
|
@@ -57,7 +57,7 @@ async function initializeContext(siteConfsVal) {
|
|
|
57
57
|
exports.simpleI18n = await (0, public_server_lib_1.loadSimpleTranslatorFromDirectory)({
|
|
58
58
|
l10nDir: (0, node_path_1.join)(exports.packageDir, "locales"),
|
|
59
59
|
languages: connector_1.supportedLanguages,
|
|
60
|
-
|
|
60
|
+
logger: exports.platformLogger,
|
|
61
61
|
});
|
|
62
62
|
for (const siteConf of exports.siteConfs.values()) {
|
|
63
63
|
if (!siteConf.redirectWww)
|
|
@@ -82,7 +82,7 @@ async function initializeContext(siteConfsVal) {
|
|
|
82
82
|
});
|
|
83
83
|
}
|
|
84
84
|
if (exports.httpRedirections.size > 0) {
|
|
85
|
-
exports.
|
|
85
|
+
exports.platformLogger.info(`HTTP 301 redirections:\n - ${Array.from(exports.httpRedirections.values())
|
|
86
86
|
.sort((a, b) => a.fromFqdn.localeCompare(b.fromFqdn))
|
|
87
87
|
.map((entry) => `${entry.fromFqdn} → ${entry.to}`)
|
|
88
88
|
.join("\n - ")}`);
|
package/dist/context.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context.js","sourceRoot":"","sources":["../src/context.ts"],"names":[],"mappings":";;;;AAwCA,kDAEC;AAED,gDAKC;AAgCD,8CAsCC;AAvHD,mDAK6B;AAC7B,uEAAoF;AAEpF,mEAIqC;AACrC,qCAA2E;AAC3E,yCAA0C;AAE7B,QAAA,aAAa,GAAG,GAAG,CAAC;AAEpB,QAAA,UAAU,GAAG,IAAA,mBAAO,EAAC,SAAS,CAAC,CAAC;AAChC,KAAyC,IAAI,CAAC,KAAK,CAC9D,IAAA,sBAAY,EAAC,IAAA,gBAAI,EAAC,kBAAU,EAAE,cAAc,CAAC,EAAE,OAAO,CAAC,CACxD,EAFuB,kBAAU,eAAQ,eAAO,WAE/C;AAEW,QAAA,OAAO,GAAG,IAAA,2BAAe,GAAE,CAAC;AAC5B,QAAA,
|
|
1
|
+
{"version":3,"file":"context.js","sourceRoot":"","sources":["../src/context.ts"],"names":[],"mappings":";;;;AAwCA,kDAEC;AAED,gDAKC;AAgCD,8CAsCC;AAvHD,mDAK6B;AAC7B,uEAAoF;AAEpF,mEAIqC;AACrC,qCAA2E;AAC3E,yCAA0C;AAE7B,QAAA,aAAa,GAAG,GAAG,CAAC;AAEpB,QAAA,UAAU,GAAG,IAAA,mBAAO,EAAC,SAAS,CAAC,CAAC;AAChC,KAAyC,IAAI,CAAC,KAAK,CAC9D,IAAA,sBAAY,EAAC,IAAA,gBAAI,EAAC,kBAAU,EAAE,cAAc,CAAC,EAAE,OAAO,CAAC,CACxD,EAFuB,kBAAU,eAAQ,eAAO,WAE/C;AAEW,QAAA,OAAO,GAAG,IAAA,2BAAe,GAAE,CAAC;AAC5B,QAAA,cAAc,GAAG,IAAA,uCAAiB,EAAC;IAC9C,KAAK,EAAE,eAAO,CAAC,QAAQ;IACvB,IAAI,EAAE,eAAO,CAAC,OAAO;IACrB,aAAa,EAAE,IAAI;CACpB,CAAC,CAAC;AAEU,QAAA,aAAa,GAAc,OAAO,CAAC;AAInC,QAAA,gBAAgB,GAAG,IAAI,GAAG,CACrC,CAAC,eAAO,CAAC,gBAAgB,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,CACtE,CAAC;AAEF,IAAI,eAAgD,CAAC;AAErD,SAAgB,mBAAmB,CAAC,GAAwB;IAC1D,eAAe,GAAG,GAAG,CAAC;AACxB,CAAC;AAED,SAAgB,kBAAkB;IAChC,IAAI,CAAC,eAAe,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;IACjD,CAAC;IACD,OAAO,eAAe,CAAC;AACzB,CAAC;AAED,MAAM,eAAe,GACnB,eAAO,CAAC,IAAI,KAAK,WAAW,CAAC,CAAC,CAAC,eAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,eAAO,CAAC,UAAU,CAAC,OAAO,CAAC;AAE1E,QAAA,SAAS,GAAG,IAAA,sCAAgB,EAAC,IAAA,gBAAI,EAAC,eAAe,EAAE,gBAAgB,CAAC,CAAC,CAAC;AACtE,QAAA,YAAY,GAAG,MAAM,CAAC;AAGnC,MAAM,OAAO,GAAG,IAAA,gBAAI,EAAC,eAAe,EAAE,yBAAyB,CAAC,CAAC;AACjE,IAAI,IAAA,oBAAU,EAAC,OAAO,CAAC,EAAE,CAAC;IACxB,IAAI,eAAO,CAAC,UAAU;QAAE,IAAA,oBAAU,EAAC,OAAO,EAAE,IAAA,gBAAI,EAAC,eAAe,EAAE,mBAAmB,CAAC,CAAC,CAAC;;QACnF,IAAA,oBAAU,EAAC,OAAO,CAAC,CAAC;AAC3B,CAAC;AAGY,QAAA,iBAAiB,GAAG,eAAO,CAAC,UAAU;IACjD,CAAC,CAAC,IAAA,sCAAgB,EAAC,IAAA,gBAAI,EAAC,eAAe,EAAE,mBAAmB,CAAC,CAAC;IAC9D,CAAC,CAAC,SAAS,CAAC;AAED,QAAA,eAAe,GAC1B,eAAO,CAAC,UAAU,IAAI,CAAC,eAAO,CAAC,UAAU,CAAC,QAAQ;IAChD,CAAC,CAAC,IAAA,2BAAO,EAAC;QACN,QAAQ,EAAE,eAAO,CAAC,cAAc;QAChC,IAAI,EAAE,eAAO,CAAC,UAAU,CAAC,IAAI;QAC7B,IAAI,EAAE,eAAO,CAAC,UAAU;QACxB,IAAI,EAAE,OAAO;KACd,CAAC;IACJ,CAAC,CAAC,SAAS,CAAC;AAIT,KAAK,UAAU,iBAAiB,CAAC,YAAmC;IACzE,iBAAS,GAAG,YAAY,CAAC;IACzB,kBAAU,GAAG,MAAM,IAAA,qDAAiC,EAAC;QACnD,OAAO,EAAE,IAAA,gBAAI,EAAC,kBAAU,EAAE,SAAS,CAAC;QACpC,SAAS,EAAE,8BAAkB;QAC7B,MAAM,EAAE,sBAAc;KACvB,CAAC,CAAC;IACH,KAAK,MAAM,QAAQ,IAAI,iBAAS,CAAC,MAAM,EAAE,EAAE,CAAC;QAC1C,IAAI,CAAC,QAAQ,CAAC,WAAW;YAAE,SAAS;QACpC,MAAM,MAAM,GAAG,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACxC,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,WAAW;YAAE,SAAS;QAE7E,MAAM,QAAQ,GACZ,MAAM,CAAC,MAAM,KAAK,CAAC;YACjB,CAAC,CAAC,OAAO,QAAQ,CAAC,IAAI,EAAE;YACxB,CAAC,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,IAAI,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC;gBACvD,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;gBAC5B,CAAC,CAAC,SAAS,CAAC;QAClB,IAAI,CAAC,QAAQ,IAAI,wBAAgB,CAAC,GAAG,CAAC,QAAQ,CAAC;YAAE,SAAS;QAE1D,wBAAgB,CAAC,GAAG,CAAC,QAAQ,EAAE;YAC7B,QAAQ;YACR,EAAE,EAAE,IAAA,2BAAO,EAAC;gBACV,QAAQ,EAAE,eAAO,CAAC,cAAc;gBAChC,IAAI,EAAE,QAAQ,CAAC,IAAI;gBACnB,IAAI,EAAE,eAAO,CAAC,UAAU;aACzB,CAAC;SACH,CAAC,CAAC;IACL,CAAC;IAED,IAAI,wBAAgB,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC;QAC9B,sBAAc,CAAC,IAAI,CACjB,+BAA+B,KAAK,CAAC,IAAI,CAAC,wBAAgB,CAAC,MAAM,EAAE,CAAC;aACjE,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;aACpD,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,GAAG,KAAK,CAAC,QAAQ,MAAM,KAAK,CAAC,EAAE,EAAE,CAAC;aACjD,IAAI,CAAC,QAAQ,CAAC,EAAE,CACpB,CAAC;IACJ,CAAC;AACH,CAAC"}
|
|
@@ -22,11 +22,11 @@ function wrapRouteHandler(handler) {
|
|
|
22
22
|
}
|
|
23
23
|
}
|
|
24
24
|
else if (response) {
|
|
25
|
-
(req.paSiteContext?.siteLog ?? context_1.
|
|
25
|
+
(req.paSiteContext?.siteLog ?? context_1.platformLogger).error(`[${req.url}]`, "Cannot send a http response:", response);
|
|
26
26
|
}
|
|
27
27
|
}
|
|
28
28
|
catch (error) {
|
|
29
|
-
(req.paSiteContext?.siteLog ?? context_1.
|
|
29
|
+
(req.paSiteContext?.siteLog ?? context_1.platformLogger).error(`[${req.url}]`, error);
|
|
30
30
|
if (!res.headersSent) {
|
|
31
31
|
if (error instanceof api_error_handler_1.ApiError) {
|
|
32
32
|
const message = error.status === 500 ? "Internal Server Error" : error.message;
|
|
@@ -45,7 +45,7 @@ function wrapMiddlewareHandler(handler) {
|
|
|
45
45
|
await handler(req, res, next);
|
|
46
46
|
}
|
|
47
47
|
catch (error) {
|
|
48
|
-
(req.paSiteContext?.siteLog ?? context_1.
|
|
48
|
+
(req.paSiteContext?.siteLog ?? context_1.platformLogger).error(`[${req.url}]`, error);
|
|
49
49
|
if (!res.headersSent) {
|
|
50
50
|
if (error instanceof api_error_handler_1.ApiError) {
|
|
51
51
|
const message = error.status === 500 ? "Internal Server Error" : error.message;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"route-handler-wrapper.js","sourceRoot":"","sources":["../../src/express/route-handler-wrapper.ts"],"names":[],"mappings":";;AAMA,4CAiCC;AAED,sDAkBC;AA1DD,6CAAqC;AACrC,mEAAuD;AACvD,
|
|
1
|
+
{"version":3,"file":"route-handler-wrapper.js","sourceRoot":"","sources":["../../src/express/route-handler-wrapper.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,7 +19,7 @@ function httpRedirectionMiddleware(req, res, next) {
|
|
|
19
19
|
async function loadSiteContextMiddleware(req, res, next) {
|
|
20
20
|
const siteContext = await (0, site_context_1.getSiteContext)(req.hostname, { returnsUndef: true });
|
|
21
21
|
if (!siteContext) {
|
|
22
|
-
context_1.
|
|
22
|
+
context_1.platformLogger.debug(`[404] Site not found: ${req.protocol}://${req.hostname}${req.originalUrl}`);
|
|
23
23
|
(0, http_helpers_1.serve404SimpleHtml)(res);
|
|
24
24
|
return;
|
|
25
25
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"small-middlewares.js","sourceRoot":"","sources":["../../src/express/small-middlewares.ts"],"names":[],"mappings":";;AAOA,8DAQC;AAED,
|
|
1
|
+
{"version":3,"file":"small-middlewares.js","sourceRoot":"","sources":["../../src/express/small-middlewares.ts"],"names":[],"mappings":";;AAOA,8DAQC;AAED,8DAWC;AAED,wCAIC;AAjCD,2DAAwD;AACxD,wCAA8D;AAC9D,+DAA8D;AAC9D,+DAA0D;AAC1D,iDAAuE;AAEvE,SAAgB,yBAAyB,CAAC,GAAY,EAAE,GAAa,EAAE,IAAkB;IACvF,MAAM,KAAK,GAAG,0BAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IACjD,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,IAAI,EAAE,CAAC;QACP,OAAO;IACT,CAAC;IAED,GAAG,CAAC,QAAQ,CAAC,GAAG,EAAE,IAAA,uCAAiB,EAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC;AACnD,CAAC;AAEM,KAAK,UAAU,yBAAyB,CAAC,GAAY,EAAE,GAAa,EAAE,IAAkB;IAC7F,MAAM,WAAW,GAAG,MAAM,IAAA,6BAAc,EAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,CAAC;IAC/E,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,wBAAc,CAAC,KAAK,CAClB,yBAAyB,GAAG,CAAC,QAAQ,MAAM,GAAG,CAAC,QAAQ,GAAG,GAAG,CAAC,WAAW,EAAE,CAC5E,CAAC;QACF,IAAA,iCAAkB,EAAC,GAAG,CAAC,CAAC;QACxB,OAAO;IACT,CAAC;IACD,GAAG,CAAC,aAAa,GAAG,WAAW,CAAC;IAChC,IAAI,EAAE,CAAC;AACT,CAAC;AAEM,KAAK,UAAU,cAAc,CAAC,GAAY,EAAE,GAAa;IAC9D,MAAM,WAAW,GAAG,IAAA,gCAAiB,EAAC,GAAG,CAAC,CAAC;IAC3C,WAAW,CAAC,OAAO,CAAC,KAAK,CAAC,sCAAsC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC;IAC3E,IAAA,6BAAa,EAAC,WAAW,EAAE,GAAG,CAAC,CAAC;AAClC,CAAC"}
|
|
@@ -42,7 +42,7 @@ function statusToGraphqlErrorCode(status) {
|
|
|
42
42
|
}
|
|
43
43
|
function getLogger(fqdn) {
|
|
44
44
|
const siteContext = fqdn ? (0, site_context_1.getActiveSiteContext)(fqdn, { returnsUndef: true }) : undefined;
|
|
45
|
-
return siteContext ? siteContext.siteLog : context_1.
|
|
45
|
+
return siteContext ? siteContext.siteLog : context_1.platformLogger;
|
|
46
46
|
}
|
|
47
47
|
function getFqdnFromGraphqlPluginContext(ctx) {
|
|
48
48
|
const hostname = ctx.request.http?.headers.get("host");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"error-converter-plugin.js","sourceRoot":"","sources":["../../src/graphql/error-converter-plugin.ts"],"names":[],"mappings":";;AAOA,gEAgBC;AArBD,mEAA4E;AAC5E,
|
|
1
|
+
{"version":3,"file":"error-converter-plugin.js","sourceRoot":"","sources":["../../src/graphql/error-converter-plugin.ts"],"names":[],"mappings":";;AAOA,gEAgBC;AArBD,mEAA4E;AAC5E,wCAA4C;AAE5C,+DAAoE;AAEpE,SAAgB,0BAA0B;IACxC,OAAO;QACL,KAAK,CAAC,eAAe,CAAC,GAAG;YACvB,OAAO,OAAO,CAAC,OAAO,CAAC;gBACrB,KAAK,CAAC,kBAAkB,CAAC,EAAE,MAAM,EAAE;oBACjC,MAAM,MAAM,GAAG,SAAS,CAAC,+BAA+B,CAAC,GAAG,CAAC,CAAC,CAAC;oBAC/D,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;wBAC3B,MAAM,CAAC,KAAK,CAAC,gBAAgB,EAAE,KAAK,CAAC,CAAC;wBACtC,MAAM,EAAE,aAAa,EAAE,GAAG,KAAK,CAAC;wBAChC,IAAI,CAAC,CAAC,aAAa,YAAY,4BAAQ,CAAC;4BAAE,OAAO;wBACjD,KAAK,CAAC,UAAU,CAAC,IAAI,GAAG,wBAAwB,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;oBACzE,CAAC;gBACH,CAAC;aACF,CAAC,CAAC;QACL,CAAC;KACF,CAAC;AACJ,CAAC;AAED,SAAS,wBAAwB,CAAC,MAAsB;IACtD,QAAQ,MAAM,EAAE,CAAC;QACf,KAAK,GAAG;YACN,OAAO,WAAW,CAAC;QACrB,KAAK,GAAG;YACN,OAAO,uBAAuB,CAAC;QACjC,KAAK,GAAG;YACN,OAAO,aAAa,CAAC;QACvB,KAAK,GAAG;YACN,OAAO,cAAc,CAAC;QACxB,KAAK,GAAG;YACN,OAAO,WAAW,CAAC;QACrB,KAAK,GAAG;YACN,OAAO,UAAU,CAAC;QACpB;YACE,MAAM,IAAI,KAAK,CAAC,iCAAiC,MAAM,GAAG,CAAC,CAAC;IAChE,CAAC;AACH,CAAC;AAED,SAAS,SAAS,CAAC,IAAwB;IACzC,MAAM,WAAW,GAAG,IAAI,CAAC,CAAC,CAAC,IAAA,mCAAoB,EAAC,IAAI,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAC1F,OAAO,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,wBAAc,CAAC;AAC5D,CAAC;AAED,SAAS,+BAA+B,CACtC,GAA0C;IAE1C,MAAM,QAAQ,GAAG,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IACvD,IAAI,CAAC,QAAQ;QAAE,OAAO;IACtB,OAAO,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;AAChC,CAAC"}
|
|
@@ -22,7 +22,7 @@ function makeBackendPluginService(siteContext, plugin) {
|
|
|
22
22
|
siteUrl: siteContext.siteUrl,
|
|
23
23
|
themeConf: siteContext.themeConf,
|
|
24
24
|
validateRecaptchaResponse: createValidateRecaptchaResponseForPlugin(siteContext),
|
|
25
|
-
sendMail: (mailData) => (0, sendMail_helpers_1.sendMail)(mailData, {
|
|
25
|
+
sendMail: (mailData) => (0, sendMail_helpers_1.sendMail)(mailData, { logger: siteContext.siteLog }),
|
|
26
26
|
executeHook: (hookName, params) => {
|
|
27
27
|
const hook = siteContext.hooks.get(hookName);
|
|
28
28
|
if (!hook)
|
package/dist/index.js
CHANGED
|
@@ -79,9 +79,9 @@ if (process.env.NODE_ENV === "development") {
|
|
|
79
79
|
}
|
|
80
80
|
async function start(options = {}) {
|
|
81
81
|
try {
|
|
82
|
-
await context_1.
|
|
82
|
+
await context_1.platformLogger.untilReady;
|
|
83
83
|
(0, site_context_1.watchForIdleSiteContexts)();
|
|
84
|
-
(0, server_image_cache_engine_1.setupImageProcessor)({ ...context_1.appConf.imageProcessor,
|
|
84
|
+
(0, server_image_cache_engine_1.setupImageProcessor)({ ...context_1.appConf.imageProcessor, logger: context_1.platformLogger });
|
|
85
85
|
const siteConfs = context_1.appConf.kind === "multisite"
|
|
86
86
|
? await (0, connector_1.loadSitePackConfs)(context_1.appConf.sitePacks, context_1.appConf, options.sitePackPlaces)
|
|
87
87
|
: await (0, connector_1.createSiteConfsFromSingle)(context_1.appConf.singleSite, context_1.appConf);
|
|
@@ -89,7 +89,7 @@ async function start(options = {}) {
|
|
|
89
89
|
(0, context_1.initCommonSchemaLib)(await (0, connector_1.readCommonSchemaLibrary)());
|
|
90
90
|
const stopCron = (0, internal_server_lib_1.startCronLike)(maintenance_task_1.maintenanceTask, {
|
|
91
91
|
shouldExecute: (0, internal_server_lib_1.eachDay)({ hours: 2 }),
|
|
92
|
-
|
|
92
|
+
logger: context_1.platformLogger,
|
|
93
93
|
});
|
|
94
94
|
const developmentMode = process.env.NODE_ENV === "development";
|
|
95
95
|
const graphqlServer = new server_1.ApolloServer({
|
|
@@ -105,7 +105,7 @@ async function start(options = {}) {
|
|
|
105
105
|
if (error instanceof graphql_1.GraphQLError && (!error.cause || error.cause instanceof api_error_handler_1.ApiError)) {
|
|
106
106
|
return formattedError;
|
|
107
107
|
}
|
|
108
|
-
context_1.
|
|
108
|
+
context_1.platformLogger.error("Unexpected graphql error", formattedError, error);
|
|
109
109
|
return {
|
|
110
110
|
message: "Internal Server Error",
|
|
111
111
|
code: "INTERNAL_SERVER_ERROR",
|
|
@@ -167,17 +167,15 @@ async function start(options = {}) {
|
|
|
167
167
|
httpServer = expressApp.listen(context_1.appConf.port);
|
|
168
168
|
}
|
|
169
169
|
(0, shutdown_1.handleShutdownEvents)({
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
await Promise.all([stopCron(), (0, maintenance_task_1.unloadAllActiveSites)(), shutdownServer(httpServer)]);
|
|
173
|
-
},
|
|
170
|
+
logger: context_1.platformLogger,
|
|
171
|
+
closingTasks: [stopCron, maintenance_task_1.unloadAllActiveSites, () => shutdownServer(httpServer)],
|
|
174
172
|
});
|
|
175
|
-
context_1.
|
|
173
|
+
context_1.platformLogger.info(`ParoiCMS is up and running on port '${context_1.appConf.port}', it serves:${getListOfSiteUrls()
|
|
176
174
|
.map(({ siteUrl, boUrl }) => `\n- ${siteUrl}${boUrl ? ` - back-office: ${boUrl}` : ""}`)
|
|
177
175
|
.join("")}`);
|
|
178
176
|
}
|
|
179
177
|
catch (error) {
|
|
180
|
-
context_1.
|
|
178
|
+
context_1.platformLogger.error(error);
|
|
181
179
|
}
|
|
182
180
|
}
|
|
183
181
|
function getListOfSiteUrls() {
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA6EA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,7 +12,7 @@ async function maintenanceTask() {
|
|
|
12
12
|
if ((0, shutdown_1.isShuttingDown)())
|
|
13
13
|
return;
|
|
14
14
|
await siteMaintenanceTask(siteContext);
|
|
15
|
-
context_1.
|
|
15
|
+
context_1.platformLogger.info(`[${siteContext.siteName}] Maintenance done`);
|
|
16
16
|
}
|
|
17
17
|
}
|
|
18
18
|
async function siteMaintenanceTask(siteContext) {
|
|
@@ -22,5 +22,6 @@ async function siteMaintenanceTask(siteContext) {
|
|
|
22
22
|
async function unloadAllActiveSites() {
|
|
23
23
|
const siteContexts = Array.from((0, site_context_1.getActiveSiteContexts)());
|
|
24
24
|
await Promise.all(siteContexts.map((siteContext) => (0, site_context_1.unloadSiteContext)(siteContext)));
|
|
25
|
+
context_1.platformLogger.debug("All sites unloaded");
|
|
25
26
|
}
|
|
26
27
|
//# sourceMappingURL=maintenance-task.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"maintenance-task.js","sourceRoot":"","sources":["../../src/maintenance/maintenance-task.ts"],"names":[],"mappings":";;AAKA,0CAOC;AAED,kDAKC;AAED,
|
|
1
|
+
{"version":3,"file":"maintenance-task.js","sourceRoot":"","sources":["../../src/maintenance/maintenance-task.ts"],"names":[],"mappings":";;AAKA,0CAOC;AAED,kDAKC;AAED,oDAIC;AAzBD,wCAA4C;AAC5C,+DAAwF;AAExF,yCAA4C;AAErC,KAAK,UAAU,eAAe;IACnC,MAAM,YAAY,GAAG,IAAA,oCAAqB,GAAE,CAAC;IAC7C,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE,CAAC;QACvC,IAAI,IAAA,yBAAc,GAAE;YAAE,OAAO;QAC7B,MAAM,mBAAmB,CAAC,WAAW,CAAC,CAAC;QACvC,wBAAc,CAAC,IAAI,CAAC,IAAI,WAAW,CAAC,QAAQ,oBAAoB,CAAC,CAAC;IACpE,CAAC;AACH,CAAC;AAEM,KAAK,UAAU,mBAAmB,CACvC,WAA0D;IAE1D,MAAM,WAAW,CAAC,UAAU,CAAC,iBAAiB,EAAE,CAAC;IACjD,MAAM,WAAW,CAAC,SAAS,CAAC,iBAAiB,EAAE,CAAC;AAClD,CAAC;AAEM,KAAK,UAAU,oBAAoB;IACxC,MAAM,YAAY,GAAG,KAAK,CAAC,IAAI,CAAC,IAAA,oCAAqB,GAAE,CAAC,CAAC;IACzD,MAAM,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,IAAA,gCAAiB,EAAC,WAAW,CAAC,CAAC,CAAC,CAAC;IACrF,wBAAc,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC;AAC7C,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { PlatformLog } from "@paroicms/internal-server-lib";
|
|
2
2
|
export declare function isShuttingDown(): boolean;
|
|
3
3
|
export interface HandleShutdownEventsOptions {
|
|
4
|
-
|
|
5
|
-
|
|
4
|
+
logger: PlatformLog;
|
|
5
|
+
closingTasks?: (() => Promise<void> | void)[];
|
|
6
6
|
}
|
|
7
|
-
export declare function handleShutdownEvents({
|
|
7
|
+
export declare function handleShutdownEvents({ logger, closingTasks }: HandleShutdownEventsOptions): void;
|
|
@@ -6,45 +6,60 @@ let shuttingDown = false;
|
|
|
6
6
|
function isShuttingDown() {
|
|
7
7
|
return shuttingDown;
|
|
8
8
|
}
|
|
9
|
-
function handleShutdownEvents({
|
|
9
|
+
function handleShutdownEvents({ logger, closingTasks }) {
|
|
10
|
+
let shuttingDownTimeMs;
|
|
11
|
+
async function stopAllAndExit(error) {
|
|
12
|
+
if (shuttingDownTimeMs !== undefined) {
|
|
13
|
+
if (Date.now() - shuttingDownTimeMs > 1000) {
|
|
14
|
+
console.warn("Already shutting down. Exit anyway.");
|
|
15
|
+
process.exit(1);
|
|
16
|
+
}
|
|
17
|
+
logger.debug("Already shutting down. Skip.");
|
|
18
|
+
return;
|
|
19
|
+
}
|
|
20
|
+
shuttingDownTimeMs = Date.now();
|
|
21
|
+
shuttingDown = true;
|
|
22
|
+
setTimeout(() => {
|
|
23
|
+
console.warn("Backend doesn't answer. Exit anyway.");
|
|
24
|
+
logger.warn("Backend doesn't answer. Exit anyway.");
|
|
25
|
+
logger.flushSync();
|
|
26
|
+
process.exit(1);
|
|
27
|
+
}, error === undefined ? 30_000 : 5000).unref();
|
|
28
|
+
await Promise.all((closingTasks ?? []).map(async (task) => {
|
|
29
|
+
try {
|
|
30
|
+
await task();
|
|
31
|
+
}
|
|
32
|
+
catch (err) {
|
|
33
|
+
logger.error("Error during shutdown:", err);
|
|
34
|
+
}
|
|
35
|
+
}));
|
|
36
|
+
if (error) {
|
|
37
|
+
logger.info("… server ended with error.");
|
|
38
|
+
logger.flushSync();
|
|
39
|
+
process.exit(1);
|
|
40
|
+
}
|
|
41
|
+
logger.info("… server ended.");
|
|
42
|
+
logger.flushSync();
|
|
43
|
+
}
|
|
10
44
|
process.on("uncaughtException", (error) => {
|
|
11
|
-
|
|
45
|
+
logger.error("Uncaught exception", error);
|
|
12
46
|
void stopAllAndExit(error);
|
|
13
47
|
});
|
|
14
48
|
process.on("unhandledRejection", (error) => {
|
|
15
|
-
|
|
49
|
+
logger.error("Unhandled rejection", error);
|
|
16
50
|
void stopAllAndExit(error);
|
|
17
51
|
});
|
|
18
52
|
process.on("SIGINT", () => {
|
|
19
|
-
|
|
53
|
+
logger.info("Caught SIGINT signal.");
|
|
20
54
|
void stopAllAndExit();
|
|
21
55
|
});
|
|
22
56
|
process.on("SIGTERM", () => {
|
|
23
|
-
|
|
57
|
+
logger.info("Caught SIGTERM signal.");
|
|
24
58
|
void stopAllAndExit();
|
|
25
59
|
});
|
|
26
60
|
process.on("SIGSEGV", () => {
|
|
27
|
-
|
|
28
|
-
appLog.flushSync();
|
|
61
|
+
console.error("Caught SIGSEGV signal. Exit immediately.");
|
|
29
62
|
process.exit(1);
|
|
30
63
|
});
|
|
31
|
-
async function stopAllAndExit(error) {
|
|
32
|
-
shuttingDown = true;
|
|
33
|
-
try {
|
|
34
|
-
setTimeout(() => {
|
|
35
|
-
appLog.warn("Backend doesn't answer. Exit anyway.");
|
|
36
|
-
appLog.flushSync();
|
|
37
|
-
process.exit(1);
|
|
38
|
-
}, error === undefined ? 30000 : 1000).unref();
|
|
39
|
-
if (onCloseCb)
|
|
40
|
-
await onCloseCb(error);
|
|
41
|
-
appLog.info("… server ended.");
|
|
42
|
-
}
|
|
43
|
-
catch (error) {
|
|
44
|
-
appLog.error("Error during shutdown:", error);
|
|
45
|
-
}
|
|
46
|
-
appLog.flushSync();
|
|
47
|
-
process.exit(error ? 1 : 0);
|
|
48
|
-
}
|
|
49
64
|
}
|
|
50
65
|
//# sourceMappingURL=shutdown.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shutdown.js","sourceRoot":"","sources":["../../src/maintenance/shutdown.ts"],"names":[],"mappings":";;AAIA,wCAEC;AAOD,
|
|
1
|
+
{"version":3,"file":"shutdown.js","sourceRoot":"","sources":["../../src/maintenance/shutdown.ts"],"names":[],"mappings":";;AAIA,wCAEC;AAOD,oDAsEC;AAjFD,IAAI,YAAY,GAAG,KAAK,CAAC;AAEzB,SAAgB,cAAc;IAC5B,OAAO,YAAY,CAAC;AACtB,CAAC;AAOD,SAAgB,oBAAoB,CAAC,EAAE,MAAM,EAAE,YAAY,EAA+B;IACxF,IAAI,kBAAsC,CAAC;IAE3C,KAAK,UAAU,cAAc,CAAC,KAAe;QAC3C,IAAI,kBAAkB,KAAK,SAAS,EAAE,CAAC;YACrC,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,kBAAkB,GAAG,IAAI,EAAE,CAAC;gBAC3C,OAAO,CAAC,IAAI,CAAC,qCAAqC,CAAC,CAAC;gBAEpD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAClB,CAAC;YACD,MAAM,CAAC,KAAK,CAAC,8BAA8B,CAAC,CAAC;YAC7C,OAAO;QACT,CAAC;QAED,kBAAkB,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAChC,YAAY,GAAG,IAAI,CAAC;QAEpB,UAAU,CACR,GAAG,EAAE;YACH,OAAO,CAAC,IAAI,CAAC,sCAAsC,CAAC,CAAC;YACrD,MAAM,CAAC,IAAI,CAAC,sCAAsC,CAAC,CAAC;YACpD,MAAM,CAAC,SAAS,EAAE,CAAC;YACnB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC,EACD,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CACpC,CAAC,KAAK,EAAE,CAAC;QAEV,MAAM,OAAO,CAAC,GAAG,CACf,CAAC,YAAY,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;YACtC,IAAI,CAAC;gBACH,MAAM,IAAI,EAAE,CAAC;YACf,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,MAAM,CAAC,KAAK,CAAC,wBAAwB,EAAE,GAAG,CAAC,CAAC;YAC9C,CAAC;QACH,CAAC,CAAC,CACH,CAAC;QAEF,IAAI,KAAK,EAAE,CAAC;YACV,MAAM,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAC;YAC1C,MAAM,CAAC,SAAS,EAAE,CAAC;YACnB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;QACD,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;QAC/B,MAAM,CAAC,SAAS,EAAE,CAAC;IACrB,CAAC;IAED,OAAO,CAAC,EAAE,CAAC,mBAAmB,EAAE,CAAC,KAAK,EAAE,EAAE;QACxC,MAAM,CAAC,KAAK,CAAC,oBAAoB,EAAE,KAAK,CAAC,CAAC;QAC1C,KAAK,cAAc,CAAC,KAAK,CAAC,CAAC;IAC7B,CAAC,CAAC,CAAC;IAEH,OAAO,CAAC,EAAE,CAAC,oBAAoB,EAAE,CAAC,KAAK,EAAE,EAAE;QACzC,MAAM,CAAC,KAAK,CAAC,qBAAqB,EAAE,KAAK,CAAC,CAAC;QAC3C,KAAK,cAAc,CAAC,KAAK,CAAC,CAAC;IAC7B,CAAC,CAAC,CAAC;IAEH,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE;QACxB,MAAM,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;QACrC,KAAK,cAAc,EAAE,CAAC;IACxB,CAAC,CAAC,CAAC;IAEH,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE;QACzB,MAAM,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;QACtC,KAAK,cAAc,EAAE,CAAC;IACxB,CAAC,CAAC,CAAC;IAEH,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE;QACzB,OAAO,CAAC,KAAK,CAAC,0CAA0C,CAAC,CAAC;QAC1D,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -188,7 +188,7 @@ async function createGoogleAccount(siteContext, { payload, newAccount, }) {
|
|
|
188
188
|
subject: `${subject} - ${siteContext.fqdn}`,
|
|
189
189
|
html: message,
|
|
190
190
|
to: newAccount.email,
|
|
191
|
-
}, {
|
|
191
|
+
}, { logger: siteContext.siteLog });
|
|
192
192
|
return (0, data_format_1.formatToAccountObjectType)(newAccount);
|
|
193
193
|
}
|
|
194
194
|
async function updateAccount(siteContext, accountId, payload) {
|
|
@@ -270,7 +270,7 @@ async function resetAccountToken(siteContext, account) {
|
|
|
270
270
|
subject: `${subject} - ${siteContext.fqdn}`,
|
|
271
271
|
html: message,
|
|
272
272
|
to: account.email,
|
|
273
|
-
}, {
|
|
273
|
+
}, { logger: siteContext.siteLog });
|
|
274
274
|
}
|
|
275
275
|
function getAccountLanguage(siteContext, account) {
|
|
276
276
|
const preferences = account.preferences ? JSON.parse(account.preferences) : undefined;
|
|
@@ -7,7 +7,7 @@ async function validateOAuthLogin(googleAccount) {
|
|
|
7
7
|
const email = googleAccount._json.email;
|
|
8
8
|
const emailVerified = googleAccount._json.email_verified;
|
|
9
9
|
if (!email || emailVerified !== true) {
|
|
10
|
-
context_1.
|
|
10
|
+
context_1.platformLogger.error("Missing user email use scope:['email'] to retrieve email from google auth api");
|
|
11
11
|
return {
|
|
12
12
|
message: "Unauthorized",
|
|
13
13
|
statusCode: 401,
|
|
@@ -18,7 +18,7 @@ async function validateOAuthLogin(googleAccount) {
|
|
|
18
18
|
};
|
|
19
19
|
}
|
|
20
20
|
catch (error) {
|
|
21
|
-
context_1.
|
|
21
|
+
context_1.platformLogger.error(error);
|
|
22
22
|
return {
|
|
23
23
|
message: "Unauthorized",
|
|
24
24
|
statusCode: 401,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"account-auth.service.js","sourceRoot":"","sources":["../../../../src/modules/core/account-auth/account-auth.service.ts"],"names":[],"mappings":";;AAIA,gDA0BC;AA7BD,
|
|
1
|
+
{"version":3,"file":"account-auth.service.js","sourceRoot":"","sources":["../../../../src/modules/core/account-auth/account-auth.service.ts"],"names":[],"mappings":";;AAIA,gDA0BC;AA7BD,8CAAkD;AAG3C,KAAK,UAAU,kBAAkB,CACtC,aAAsB;IAEtB,IAAI,CAAC;QACH,MAAM,KAAK,GAAG,aAAa,CAAC,KAAK,CAAC,KAAK,CAAC;QACxC,MAAM,aAAa,GAAG,aAAa,CAAC,KAAK,CAAC,cAAqC,CAAC;QAChF,IAAI,CAAC,KAAK,IAAI,aAAa,KAAK,IAAI,EAAE,CAAC;YACrC,wBAAc,CAAC,KAAK,CAClB,+EAA+E,CAChF,CAAC;YACF,OAAO;gBACL,OAAO,EAAE,cAAc;gBACvB,UAAU,EAAE,GAAG;aAChB,CAAC;QACJ,CAAC;QAED,OAAO;YACL,KAAK;SACN,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,wBAAc,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAC5B,OAAO;YACL,OAAO,EAAE,cAAc;YACvB,UAAU,EAAE,GAAG;SAChB,CAAC;IACJ,CAAC;AACH,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"account-auth.strategy.js","sourceRoot":"","sources":["../../../../src/modules/core/account-auth/account-auth.strategy.ts"],"names":[],"mappings":";;;;;AAAA,wDAAgC;AAChC,qEAAmF;AACnF,
|
|
1
|
+
{"version":3,"file":"account-auth.strategy.js","sourceRoot":"","sources":["../../../../src/modules/core/account-auth/account-auth.strategy.ts"],"names":[],"mappings":";;;;;AAAA,wDAAgC;AAChC,qEAAmF;AACnF,8CAA4E;AAC5E,iEAA4D;AAE5D,IAAI,CAAC,iBAAO,CAAC,UAAU,IAAI,iBAAO,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC;IACvD,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;AAC7C,CAAC;AAED,kBAAe,kBAAQ,CAAC,GAAG,CACzB,IAAI,kCAAc,CAChB;IACE,QAAQ,EAAE,iBAAO,CAAC,UAAU,CAAC,QAAQ;IACrC,YAAY,EAAE,iBAAO,CAAC,UAAU,CAAC,YAAY;IAC7C,WAAW,EAAE,GAAG,yBAAe,kBAAkB;IACjD,iBAAiB,EAAE,IAAI;IACvB,KAAK,EAAE,CAAC,OAAO,CAAC;CACjB,EACD,KAAK,EAAE,GAAG,EAAE,WAAW,EAAE,YAAY,EAAE,OAAuB,EAAE,IAAI,EAAE,EAAE;IACtE,IAAI,CAAC;QACH,IAAI,CAAC,OAAO;YAAE,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;QACzD,MAAM,IAAI,GAAG,MAAM,IAAA,yCAAkB,EAAC,OAAO,CAAC,CAAC;QAC/C,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IACnB,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,wBAAc,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC1B,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;IACnB,CAAC;AACH,CAAC,CACF,CACF,CAAC"}
|
|
@@ -38,7 +38,7 @@ const use_image_tag_1 = require("../modules/public-site/liquidjs-tags/use-image-
|
|
|
38
38
|
async function createSiteContext(siteConf) {
|
|
39
39
|
const { siteName, siteDir, dataDir, cacheDir, backupDir, fqdn } = siteConf;
|
|
40
40
|
const themeDir = (0, node_path_1.join)(siteDir, "theme");
|
|
41
|
-
const siteLog = context_1.
|
|
41
|
+
const siteLog = context_1.platformLogger.createChildLog({ fqdn });
|
|
42
42
|
await (0, internal_server_lib_1.ensureDirectory)(dataDir);
|
|
43
43
|
await (0, internal_server_lib_1.ensureDirectory)(cacheDir);
|
|
44
44
|
await (0, internal_server_lib_1.ensureDirectory)(backupDir);
|
|
@@ -78,7 +78,7 @@ async function createSiteContext(siteConf) {
|
|
|
78
78
|
const themeTranslator = await (0, public_server_lib_1.loadSimpleTranslatorFromDirectory)({
|
|
79
79
|
l10nDir: (0, node_path_1.join)(themeDir, "locales"),
|
|
80
80
|
languages: siteSchema.languages,
|
|
81
|
-
|
|
81
|
+
logger: siteLog,
|
|
82
82
|
});
|
|
83
83
|
const themeConf = await (0, connector_1.readThemeConfFile)(themeDir);
|
|
84
84
|
const siteContext = {
|
|
@@ -211,7 +211,7 @@ async function createCaches(options) {
|
|
|
211
211
|
type: "sqlite",
|
|
212
212
|
file: (0, node_path_1.join)(cacheDir, "image-cache.sqlite"),
|
|
213
213
|
},
|
|
214
|
-
|
|
214
|
+
logger: siteLog,
|
|
215
215
|
getOriginalImage: async (uid) => {
|
|
216
216
|
const image = await mediaStorage.getMediaWithBinary(uid);
|
|
217
217
|
if (!image)
|
|
@@ -233,7 +233,7 @@ async function createCaches(options) {
|
|
|
233
233
|
type: "sqlite",
|
|
234
234
|
file: (0, node_path_1.join)(cacheDir, "text-cache.sqlite"),
|
|
235
235
|
},
|
|
236
|
-
|
|
236
|
+
logger: siteLog,
|
|
237
237
|
timeToIdle: appConf.cacheTimeToIdle === "infinite" ? undefined : appConf.cacheTimeToIdle,
|
|
238
238
|
});
|
|
239
239
|
if (isClearedImageCache && !isClearedTextCache) {
|