@paroicms/server 1.71.0 → 1.72.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (95) hide show
  1. package/dist/common/api-error-handler.d.ts +2 -1
  2. package/dist/common/api-error-handler.js +19 -0
  3. package/dist/common/api-error-handler.js.map +1 -1
  4. package/dist/express/create-redirect-url.d.ts +3 -0
  5. package/dist/express/create-redirect-url.js +19 -0
  6. package/dist/express/create-redirect-url.js.map +1 -0
  7. package/dist/express/http-helpers.d.ts +7 -0
  8. package/dist/express/http-helpers.js +7 -0
  9. package/dist/express/http-helpers.js.map +1 -1
  10. package/dist/express/public-api-middlewares.js +1 -9
  11. package/dist/express/public-api-middlewares.js.map +1 -1
  12. package/dist/express/route-handler-wrapper.js +10 -7
  13. package/dist/express/route-handler-wrapper.js.map +1 -1
  14. package/dist/express/small-middlewares.d.ts +4 -0
  15. package/dist/express/small-middlewares.js +34 -0
  16. package/dist/express/small-middlewares.js.map +1 -0
  17. package/dist/express/{static-middlewares.js → static-files-middlewares.js} +4 -37
  18. package/dist/express/static-files-middlewares.js.map +1 -0
  19. package/dist/graphql/error-converter-plugin.js +2 -0
  20. package/dist/graphql/error-converter-plugin.js.map +1 -1
  21. package/dist/index.js +29 -23
  22. package/dist/index.js.map +1 -1
  23. package/dist/maintenance/maintenance-task.js +1 -0
  24. package/dist/maintenance/maintenance-task.js.map +1 -1
  25. package/dist/maintenance/shutdown.d.ts +3 -3
  26. package/dist/maintenance/shutdown.js +40 -25
  27. package/dist/maintenance/shutdown.js.map +1 -1
  28. package/dist/modules/app.controller.js +1 -2
  29. package/dist/modules/app.controller.js.map +1 -1
  30. package/dist/modules/core/account/account.resolver.js +16 -17
  31. package/dist/modules/core/account/account.resolver.js.map +1 -1
  32. package/dist/modules/core/auth/auth.helper.d.ts +5 -8
  33. package/dist/modules/core/auth/auth.helper.js +6 -1
  34. package/dist/modules/core/auth/auth.helper.js.map +1 -1
  35. package/dist/modules/core/auth/auth.service.js +6 -1
  36. package/dist/modules/core/auth/auth.service.js.map +1 -1
  37. package/dist/modules/core/backup/backup.controller.js +1 -2
  38. package/dist/modules/core/backup/backup.controller.js.map +1 -1
  39. package/dist/modules/core/backup/backup.resolver.js +2 -4
  40. package/dist/modules/core/backup/backup.resolver.js.map +1 -1
  41. package/dist/modules/core/document/document.resolver.extend.js +4 -5
  42. package/dist/modules/core/document/document.resolver.extend.js.map +1 -1
  43. package/dist/modules/core/document/document.resolver.js +8 -17
  44. package/dist/modules/core/document/document.resolver.js.map +1 -1
  45. package/dist/modules/core/fields/fields.resolver.js +7 -15
  46. package/dist/modules/core/fields/fields.resolver.js.map +1 -1
  47. package/dist/modules/core/labeling/labeling.resolver.js +2 -3
  48. package/dist/modules/core/labeling/labeling.resolver.js.map +1 -1
  49. package/dist/modules/core/login/login.controller.d.ts +1 -1
  50. package/dist/modules/core/login/login.controller.js +3 -3
  51. package/dist/modules/core/login/login.controller.js.map +1 -1
  52. package/dist/modules/core/media/media-upload.controller.js +2 -2
  53. package/dist/modules/core/media/media-upload.controller.js.map +1 -1
  54. package/dist/modules/core/media/media.resolver.extend.js +1 -3
  55. package/dist/modules/core/media/media.resolver.extend.js.map +1 -1
  56. package/dist/modules/core/media/media.resolver.js +10 -21
  57. package/dist/modules/core/media/media.resolver.js.map +1 -1
  58. package/dist/modules/core/node/node.resolver.extend.js +2 -3
  59. package/dist/modules/core/node/node.resolver.extend.js.map +1 -1
  60. package/dist/modules/core/node/node.resolver.js +6 -11
  61. package/dist/modules/core/node/node.resolver.js.map +1 -1
  62. package/dist/modules/core/nodel/nodel-wrap.resolver.js +9 -17
  63. package/dist/modules/core/nodel/nodel-wrap.resolver.js.map +1 -1
  64. package/dist/modules/core/part/part.resolver.extend.js +2 -5
  65. package/dist/modules/core/part/part.resolver.extend.js.map +1 -1
  66. package/dist/modules/core/part/part.resolver.js +5 -11
  67. package/dist/modules/core/part/part.resolver.js.map +1 -1
  68. package/dist/modules/core/site-constants/site-constants.resolver.js +5 -11
  69. package/dist/modules/core/site-constants/site-constants.resolver.js.map +1 -1
  70. package/dist/modules/core/unprotected/unprotected.resolver.js +3 -7
  71. package/dist/modules/core/unprotected/unprotected.resolver.js.map +1 -1
  72. package/dist/modules/graphql.types.d.ts +2 -1
  73. package/dist/modules/public-api/password-reset/password-reset.controller.d.ts +3 -3
  74. package/dist/modules/public-api/password-reset/password-reset.controller.js +7 -8
  75. package/dist/modules/public-api/password-reset/password-reset.controller.js.map +1 -1
  76. package/dist/modules/public-site/feed/feed.middleware.js +2 -2
  77. package/dist/modules/public-site/feed/feed.middleware.js.map +1 -1
  78. package/dist/modules/public-site/media-serve/media-serve.controller.js +3 -4
  79. package/dist/modules/public-site/media-serve/media-serve.controller.js.map +1 -1
  80. package/dist/modules/public-site/public-site.controller.d.ts +0 -3
  81. package/dist/modules/public-site/public-site.controller.js +2 -3
  82. package/dist/modules/public-site/public-site.controller.js.map +1 -1
  83. package/dist/modules/public-site/public-site.middleware.js +1 -17
  84. package/dist/modules/public-site/public-site.middleware.js.map +1 -1
  85. package/dist/oauth/oauth-middleware.d.ts +2 -0
  86. package/dist/oauth/oauth-middleware.js +23 -0
  87. package/dist/oauth/oauth-middleware.js.map +1 -0
  88. package/dist/{modules/public-site → oauth}/oauth2-client.controller.js +4 -4
  89. package/dist/oauth/oauth2-client.controller.js.map +1 -0
  90. package/dist/tsconfig.tsbuildinfo +1 -1
  91. package/package.json +3 -3
  92. package/dist/express/static-middlewares.js.map +0 -1
  93. package/dist/modules/public-site/oauth2-client.controller.js.map +0 -1
  94. /package/dist/express/{static-middlewares.d.ts → static-files-middlewares.d.ts} +0 -0
  95. /package/dist/{modules/public-site → oauth}/oauth2-client.controller.d.ts +0 -0
@@ -1,9 +1,10 @@
1
1
  export interface ApiErrorOptions {
2
2
  status: ApiErrorStatus;
3
3
  }
4
- export type ApiErrorStatus = 400 | 401 | 404 | 409 | 500;
4
+ export type ApiErrorStatus = 400 | 401 | 403 | 404 | 409 | 500;
5
5
  export declare class ApiError extends Error {
6
6
  readonly status: ApiErrorStatus;
7
7
  constructor(options: ApiErrorOptions);
8
8
  constructor(message: string, options: ApiErrorOptions);
9
9
  }
10
+ export declare function getErrorLabel(status: number): "Bad Request" | "Unauthorized" | "Forbidden" | "Not Found" | "Conflict" | "Internal Server Error" | "Unknown Error";
@@ -1,6 +1,7 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.ApiError = void 0;
4
+ exports.getErrorLabel = getErrorLabel;
4
5
  class ApiError extends Error {
5
6
  status;
6
7
  constructor(arg1, arg2) {
@@ -11,4 +12,22 @@ class ApiError extends Error {
11
12
  }
12
13
  }
13
14
  exports.ApiError = ApiError;
15
+ function getErrorLabel(status) {
16
+ switch (status) {
17
+ case 400:
18
+ return "Bad Request";
19
+ case 401:
20
+ return "Unauthorized";
21
+ case 403:
22
+ return "Forbidden";
23
+ case 404:
24
+ return "Not Found";
25
+ case 409:
26
+ return "Conflict";
27
+ case 500:
28
+ return "Internal Server Error";
29
+ default:
30
+ return "Unknown Error";
31
+ }
32
+ }
14
33
  //# sourceMappingURL=api-error-handler.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"api-error-handler.js","sourceRoot":"","sources":["../../src/common/api-error-handler.ts"],"names":[],"mappings":";;;AAMA,MAAa,QAAS,SAAQ,KAAK;IACxB,MAAM,CAAiB;IAIhC,YAAY,IAA8B,EAAE,IAAsB;QAChE,MAAM,OAAO,GAAG,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,WAAW,IAAI,CAAC,MAAM,QAAQ,CAAC;QACjF,MAAM,OAAO,GAAG,CAAC,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC;QAC5E,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAC/B,CAAC;CACF;AAXD,4BAWC"}
1
+ {"version":3,"file":"api-error-handler.js","sourceRoot":"","sources":["../../src/common/api-error-handler.ts"],"names":[],"mappings":";;;AAmBA,sCAiBC;AA9BD,MAAa,QAAS,SAAQ,KAAK;IACxB,MAAM,CAAiB;IAIhC,YAAY,IAA8B,EAAE,IAAsB;QAChE,MAAM,OAAO,GAAG,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,WAAW,IAAI,CAAC,MAAM,QAAQ,CAAC;QACjF,MAAM,OAAO,GAAG,CAAC,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC;QAC5E,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAC/B,CAAC;CACF;AAXD,4BAWC;AAED,SAAgB,aAAa,CAAC,MAAc;IAC1C,QAAQ,MAAM,EAAE,CAAC;QACf,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,WAAW,CAAC;QACrB,KAAK,GAAG;YACN,OAAO,UAAU,CAAC;QACpB,KAAK,GAAG;YACN,OAAO,uBAAuB,CAAC;QACjC;YACE,OAAO,eAAe,CAAC;IAC3B,CAAC;AACH,CAAC"}
@@ -0,0 +1,3 @@
1
+ import type { JsonOfHttpRedirection } from "@paroicms/connector/typeonly/configuration-types";
2
+ import type { Request } from "express";
3
+ export declare function createRedirectUrl(req: Request, entry: JsonOfHttpRedirection): string;
@@ -0,0 +1,19 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.createRedirectUrl = createRedirectUrl;
4
+ function createRedirectUrl(req, entry) {
5
+ const { originalUrl } = req;
6
+ let mappedPath;
7
+ if (entry.mapPaths) {
8
+ for (const [fromRegex, toPath] of Object.entries(entry.mapPaths)) {
9
+ const regex = new RegExp(fromRegex);
10
+ if (regex.test(originalUrl)) {
11
+ mappedPath = originalUrl.replace(regex, toPath);
12
+ break;
13
+ }
14
+ }
15
+ }
16
+ const path = mappedPath ?? (entry.preservePath ? originalUrl : "");
17
+ return `${entry.to}${path}`;
18
+ }
19
+ //# sourceMappingURL=create-redirect-url.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"create-redirect-url.js","sourceRoot":"","sources":["../../src/express/create-redirect-url.ts"],"names":[],"mappings":";;AAGA,8CAiBC;AAjBD,SAAgB,iBAAiB,CAAC,GAAY,EAAE,KAA4B;IAC1E,MAAM,EAAE,WAAW,EAAE,GAAG,GAAG,CAAC;IAE5B,IAAI,UAA8B,CAAC;IACnC,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;QACnB,KAAK,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC;YACjE,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,SAAS,CAAC,CAAC;YACpC,IAAI,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC;gBAC5B,UAAU,GAAG,WAAW,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;gBAChD,MAAM;YACR,CAAC;QACH,CAAC;IACH,CAAC;IAED,MAAM,IAAI,GAAG,UAAU,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IAEnE,OAAO,GAAG,KAAK,CAAC,EAAE,GAAG,IAAI,EAAE,CAAC;AAC9B,CAAC"}
@@ -1,4 +1,5 @@
1
1
  import type { Request, Response } from "express";
2
+ import type { SiteContext } from "../site-context/site-context.types";
2
3
  export declare function serveTextContent({ res, status, contentType, text, or304, }: {
3
4
  res: Response;
4
5
  status?: number;
@@ -20,3 +21,9 @@ export declare function getHttpRequestParameter(req: Request, parameterName: str
20
21
  export declare function getHttpRequestParameter(req: Request, parameterName: string, options: {
21
22
  optional: true;
22
23
  }): string | undefined;
24
+ declare module "express-serve-static-core" {
25
+ interface Request {
26
+ paSiteContext?: SiteContext;
27
+ }
28
+ }
29
+ export declare function getReqSiteContext(req: Request): SiteContext;
@@ -6,6 +6,7 @@ exports.serve404SimpleHtml = serve404SimpleHtml;
6
6
  exports.serve304NotModified = serve304NotModified;
7
7
  exports.serve301Redirect = serve301Redirect;
8
8
  exports.getHttpRequestParameter = getHttpRequestParameter;
9
+ exports.getReqSiteContext = getReqSiteContext;
9
10
  const api_error_handler_1 = require("../common/api-error-handler");
10
11
  function serveTextContent({ res, status, contentType, text, or304, }) {
11
12
  const cacheControl = "max-age=0";
@@ -65,4 +66,10 @@ function getHttpRequestParameter(req, parameterName, options = {}) {
65
66
  return;
66
67
  throw new api_error_handler_1.ApiError(`missing parameter "${parameterName}"`, { status: 400 });
67
68
  }
69
+ function getReqSiteContext(req) {
70
+ if (!req.paSiteContext) {
71
+ throw new Error("site context missing in request");
72
+ }
73
+ return req.paSiteContext;
74
+ }
68
75
  //# sourceMappingURL=http-helpers.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"http-helpers.js","sourceRoot":"","sources":["../../src/express/http-helpers.ts"],"names":[],"mappings":";;AAGA,4CAsCC;AAED,oCAQC;AAED,gDAQC;AAED,kDAQC;AAED,4CAIC;AAQD,0DASC;AA7FD,mEAAuD;AAEvD,SAAgB,gBAAgB,CAAC,EAC/B,GAAG,EACH,MAAM,EACN,WAAW,EACX,IAAI,EACJ,KAAK,GAaN;IACC,MAAM,YAAY,GAAG,WAAW,CAAC;IACjC,IAAI,KAAK,EAAE,CAAC;QACV,IAAI,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,eAAe,CAAC,KAAK,KAAK,CAAC,IAAI,EAAE,CAAC;YACtD,OAAO,mBAAmB,CAAC,GAAG,EAAE;gBAC9B,YAAY;gBACZ,IAAI,EAAE,KAAK,CAAC,IAAI;aACjB,CAAC,CAAC;QACL,CAAC;QACD,GAAG,CAAC,MAAM,CAAC,eAAe,EAAE,YAAY,CAAC,CAAC;QAC1C,GAAG,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;IACjC,CAAC;SAAM,CAAC;QACN,GAAG,CAAC,MAAM,CAAC,eAAe,EAAE,YAAY,CAAC,CAAC;IAC5C,CAAC;IAED,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACvC,GAAG,CAAC,MAAM,CAAC,cAAc,EAAE,WAAW,IAAI,0BAA0B,CAAC,CAAC;IACtE,GAAG,CAAC,MAAM,CAAC,gBAAgB,EAAE,GAAG,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC;IACxD,GAAG,CAAC,MAAM,CAAC,MAAM,IAAI,GAAG,CAAC,CAAC;IAC1B,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAChB,CAAC;AAED,SAAgB,YAAY,CAAC,GAAa;IACxC,MAAM,IAAI,GAAG;sBACO,CAAC;IACrB,gBAAgB,CAAC;QACf,GAAG;QACH,MAAM,EAAE,GAAG;QACX,IAAI,EAAE,IAAI;KACX,CAAC,CAAC;AACL,CAAC;AAED,SAAgB,kBAAkB,CAAC,GAAa;IAC9C,MAAM,IAAI,GAAG;qBACM,CAAC;IACpB,gBAAgB,CAAC;QACf,GAAG;QACH,MAAM,EAAE,GAAG;QACX,IAAI,EAAE,IAAI;KACX,CAAC,CAAC;AACL,CAAC;AAED,SAAgB,mBAAmB,CACjC,GAAa,EACb,OAA+C;IAE/C,GAAG,CAAC,MAAM,CAAC,eAAe,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC;IAClD,GAAG,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IACjC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAChB,GAAG,CAAC,IAAI,EAAE,CAAC;AACb,CAAC;AAED,SAAgB,gBAAgB,CAAC,GAAa,EAAE,UAAkB;IAChE,GAAG,CAAC,MAAM,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;IACnC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAChB,GAAG,CAAC,IAAI,EAAE,CAAC;AACb,CAAC;AAQD,SAAgB,uBAAuB,CACrC,GAAY,EACZ,aAAqB,EACrB,UAAkC,EAAE;IAEpC,MAAM,KAAK,GAAG,GAAG,CAAC,MAAM,CAAC,aAAa,CAAuB,CAAC;IAC9D,IAAI,KAAK;QAAE,OAAO,KAAK,CAAC;IACxB,IAAI,OAAO,CAAC,QAAQ;QAAE,OAAO;IAC7B,MAAM,IAAI,4BAAQ,CAAC,sBAAsB,aAAa,GAAG,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;AAC9E,CAAC"}
1
+ {"version":3,"file":"http-helpers.js","sourceRoot":"","sources":["../../src/express/http-helpers.ts"],"names":[],"mappings":"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"}
@@ -3,23 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.pluginPublicApiMiddleware = pluginPublicApiMiddleware;
4
4
  const make_backend_plugin_service_1 = require("../helpers/make-backend-plugin-service");
5
5
  const rendering_context_1 = require("../liquidjs-tools/liquidjs-rendering/rendering-context");
6
- const site_context_1 = require("../site-context/site-context");
7
6
  const http_helpers_1 = require("./http-helpers");
8
7
  async function pluginPublicApiMiddleware(req, res, next) {
8
+ const siteContext = (0, http_helpers_1.getReqSiteContext)(req);
9
9
  const path = req.path;
10
10
  const prefix = "/api/plugin/";
11
11
  if (!path.startsWith(prefix)) {
12
12
  next();
13
13
  return;
14
14
  }
15
- let siteContext;
16
- try {
17
- siteContext = await (0, site_context_1.getSiteContext)(req.hostname);
18
- }
19
- catch (error) {
20
- (0, http_helpers_1.serve404SimpleHtml)(res);
21
- return;
22
- }
23
15
  const sepIndex = path.indexOf("/", prefix.length);
24
16
  const pluginPublicDirName = sepIndex === -1 ? path.substring(prefix.length) : path.substring(prefix.length, sepIndex);
25
17
  const relativePath = sepIndex === -1 ? "" : path.substring(sepIndex);
@@ -1 +1 @@
1
- {"version":3,"file":"public-api-middlewares.js","sourceRoot":"","sources":["../../src/express/public-api-middlewares.ts"],"names":[],"mappings":";;AAOA,8DAqCC;AA3CD,wFAAwF;AACxF,8FAAkG;AAClG,+DAA8D;AAE9D,iDAAkE;AAE3D,KAAK,UAAU,yBAAyB,CAAC,GAAY,EAAE,GAAa,EAAE,IAAgB;IAC3F,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC;IACtB,MAAM,MAAM,GAAG,cAAc,CAAC;IAC9B,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;QAC7B,IAAI,EAAE,CAAC;QACP,OAAO;IACT,CAAC;IAED,IAAI,WAAwB,CAAC;IAC7B,IAAI,CAAC;QACH,WAAW,GAAG,MAAM,IAAA,6BAAc,EAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IACnD,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAA,iCAAkB,EAAC,GAAG,CAAC,CAAC;QACxB,OAAO;IACT,CAAC;IAED,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;IAClD,MAAM,mBAAmB,GACvB,QAAQ,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IAC5F,MAAM,YAAY,GAAG,QAAQ,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;IACrE,MAAM,MAAM,GAAG,WAAW,CAAC,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;IAC5D,IAAI,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,gBAAgB,EAAE,CAAC;QACxC,IAAA,iCAAkB,EAAC,GAAG,CAAC,CAAC;QACxB,OAAO;IACT,CAAC;IAED,IAAI,CAAC;QACH,MAAM,MAAM,CAAC,gBAAgB,CAC3B,IAAA,4DAA8B,EAAC,WAAW,EAAE,IAAA,4CAAwB,GAAE,EAAE,MAAM,CAAC,EAC/E,GAAG,EACH,GAAG,EACH,YAAY,CACb,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,WAAW,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACjC,IAAA,2BAAY,EAAC,GAAG,CAAC,CAAC;IACpB,CAAC;AACH,CAAC"}
1
+ {"version":3,"file":"public-api-middlewares.js","sourceRoot":"","sources":["../../src/express/public-api-middlewares.ts"],"names":[],"mappings":";;AAKA,8DA8BC;AAlCD,wFAAwF;AACxF,8FAAkG;AAClG,iDAAqF;AAE9E,KAAK,UAAU,yBAAyB,CAAC,GAAY,EAAE,GAAa,EAAE,IAAgB;IAC3F,MAAM,WAAW,GAAG,IAAA,gCAAiB,EAAC,GAAG,CAAC,CAAC;IAC3C,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC;IACtB,MAAM,MAAM,GAAG,cAAc,CAAC;IAC9B,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;QAC7B,IAAI,EAAE,CAAC;QACP,OAAO;IACT,CAAC;IAED,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;IAClD,MAAM,mBAAmB,GACvB,QAAQ,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IAC5F,MAAM,YAAY,GAAG,QAAQ,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;IACrE,MAAM,MAAM,GAAG,WAAW,CAAC,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;IAC5D,IAAI,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,gBAAgB,EAAE,CAAC;QACxC,IAAA,iCAAkB,EAAC,GAAG,CAAC,CAAC;QACxB,OAAO;IACT,CAAC;IAED,IAAI,CAAC;QACH,MAAM,MAAM,CAAC,gBAAgB,CAC3B,IAAA,4DAA8B,EAAC,WAAW,EAAE,IAAA,4CAAwB,GAAE,EAAE,MAAM,CAAC,EAC/E,GAAG,EACH,GAAG,EACH,YAAY,CACb,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,WAAW,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACjC,IAAA,2BAAY,EAAC,GAAG,CAAC,CAAC;IACpB,CAAC;AACH,CAAC"}
@@ -5,6 +5,7 @@ exports.wrapMiddlewareHandler = wrapMiddlewareHandler;
5
5
  const node_stream_1 = require("node:stream");
6
6
  const api_error_handler_1 = require("../common/api-error-handler");
7
7
  const context_1 = require("../context");
8
+ const http_helpers_1 = require("./http-helpers");
8
9
  function wrapRouteHandler(handler) {
9
10
  return async (req, res) => {
10
11
  try {
@@ -21,17 +22,18 @@ function wrapRouteHandler(handler) {
21
22
  }
22
23
  }
23
24
  else if (response) {
24
- context_1.platformLog.warn("cannot send a http response:", response);
25
+ (req.paSiteContext?.siteLog ?? context_1.platformLog).error(`[${req.url}]`, "Cannot send a http response:", response);
25
26
  }
26
27
  }
27
28
  catch (error) {
28
- context_1.platformLog.error(error);
29
+ (req.paSiteContext?.siteLog ?? context_1.platformLog).error(`[${req.url}]`, error);
29
30
  if (!res.headersSent) {
30
31
  if (error instanceof api_error_handler_1.ApiError) {
31
- res.status(error.status).json({ message: error.message });
32
+ const message = error.status === 500 ? "Internal Server Error" : error.message;
33
+ res.status(error.status).json({ message });
32
34
  }
33
35
  else {
34
- res.status(500).json({ message: error.message });
36
+ (0, http_helpers_1.serve500Html)(res);
35
37
  }
36
38
  }
37
39
  }
@@ -43,13 +45,14 @@ function wrapMiddlewareHandler(handler) {
43
45
  await handler(req, res, next);
44
46
  }
45
47
  catch (error) {
46
- context_1.platformLog.error(error);
48
+ (req.paSiteContext?.siteLog ?? context_1.platformLog).error(`[${req.url}]`, error);
47
49
  if (!res.headersSent) {
48
50
  if (error instanceof api_error_handler_1.ApiError) {
49
- res.status(error.status).json({ message: error.message });
51
+ const message = error.status === 500 ? "Internal Server Error" : error.message;
52
+ res.status(error.status).json({ message });
50
53
  }
51
54
  else {
52
- res.status(500).json({ message: error.message });
55
+ (0, http_helpers_1.serve500Html)(res);
53
56
  }
54
57
  }
55
58
  }
@@ -1 +1 @@
1
- {"version":3,"file":"route-handler-wrapper.js","sourceRoot":"","sources":["../../src/express/route-handler-wrapper.ts"],"names":[],"mappings":";;AAKA,4CA4BC;AAED,sDAiBC;AAnDD,6CAAqC;AACrC,mEAAuD;AACvD,wCAAyC;AAEzC,SAAgB,gBAAgB,CAAC,OAA0D;IACzF,OAAO,KAAK,EAAE,GAAY,EAAE,GAAa,EAAE,EAAE;QAC3C,IAAI,CAAC;YACH,IAAI,QAAQ,GAAG,MAAM,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;YAEvC,IAAI,QAAQ,YAAY,oBAAM;gBAAE,OAAO,QAAQ,CAAC;YAEhD,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC;gBACrB,QAAQ,KAAK,EAAE,CAAC;gBAChB,IAAI,OAAO,QAAQ,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;oBAC5D,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gBACjC,CAAC;qBAAM,CAAC;oBACN,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;gBACzC,CAAC;YACH,CAAC;iBAAM,IAAI,QAAQ,EAAE,CAAC;gBACpB,qBAAW,CAAC,IAAI,CAAC,8BAA8B,EAAE,QAAQ,CAAC,CAAC;YAC7D,CAAC;QACH,CAAC;QAAC,OAAO,KAAU,EAAE,CAAC;YACpB,qBAAW,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACzB,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC;gBACrB,IAAI,KAAK,YAAY,4BAAQ,EAAE,CAAC;oBAC9B,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;gBAC5D,CAAC;qBAAM,CAAC;oBACN,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;gBACnD,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC,CAAC;AACJ,CAAC;AAED,SAAgB,qBAAqB,CACnC,OAA8E;IAE9E,OAAO,KAAK,EAAE,GAAY,EAAE,GAAa,EAAE,IAAkB,EAAE,EAAE;QAC/D,IAAI,CAAC;YACH,MAAM,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;QAChC,CAAC;QAAC,OAAO,KAAU,EAAE,CAAC;YACpB,qBAAW,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACzB,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC;gBACrB,IAAI,KAAK,YAAY,4BAAQ,EAAE,CAAC;oBAC9B,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;gBAC5D,CAAC;qBAAM,CAAC;oBACN,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;gBACnD,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"route-handler-wrapper.js","sourceRoot":"","sources":["../../src/express/route-handler-wrapper.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,4 @@
1
+ import type { NextFunction, Request, Response } from "express";
2
+ export declare function httpRedirectionMiddleware(req: Request, res: Response, next: NextFunction): void;
3
+ export declare function loadSiteContextMiddleware(req: Request, res: Response, next: NextFunction): Promise<void>;
4
+ export declare function tailMiddleware(req: Request, res: Response): Promise<void>;
@@ -0,0 +1,34 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.httpRedirectionMiddleware = httpRedirectionMiddleware;
4
+ exports.loadSiteContextMiddleware = loadSiteContextMiddleware;
5
+ exports.tailMiddleware = tailMiddleware;
6
+ const serve_text_or_1 = require("../common/serve-text-or");
7
+ const context_1 = require("../context");
8
+ const site_context_1 = require("../site-context/site-context");
9
+ const create_redirect_url_1 = require("./create-redirect-url");
10
+ const http_helpers_1 = require("./http-helpers");
11
+ function httpRedirectionMiddleware(req, res, next) {
12
+ const entry = context_1.httpRedirections.get(req.hostname);
13
+ if (!entry) {
14
+ next();
15
+ return;
16
+ }
17
+ res.redirect(301, (0, create_redirect_url_1.createRedirectUrl)(req, entry));
18
+ }
19
+ async function loadSiteContextMiddleware(req, res, next) {
20
+ const siteContext = await (0, site_context_1.getSiteContext)(req.hostname, { returnsUndef: true });
21
+ if (!siteContext) {
22
+ context_1.platformLog.debug(`[404] Site not found: ${req.protocol}://${req.hostname}${req.originalUrl}`);
23
+ (0, http_helpers_1.serve404SimpleHtml)(res);
24
+ return;
25
+ }
26
+ req.paSiteContext = siteContext;
27
+ next();
28
+ }
29
+ async function tailMiddleware(req, res) {
30
+ const siteContext = (0, http_helpers_1.getReqSiteContext)(req);
31
+ siteContext.siteLog.debug(`[404] Tail middleware reached for: ${req.url}`);
32
+ (0, serve_text_or_1.render404Html)(siteContext, res);
33
+ }
34
+ //# sourceMappingURL=small-middlewares.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"small-middlewares.js","sourceRoot":"","sources":["../../src/express/small-middlewares.ts"],"names":[],"mappings":";;AAOA,8DAQC;AAED,8DASC;AAED,wCAIC;AA/BD,2DAAwD;AACxD,wCAA2D;AAC3D,+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,qBAAW,CAAC,KAAK,CAAC,yBAAyB,GAAG,CAAC,QAAQ,MAAM,GAAG,CAAC,QAAQ,GAAG,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC;QAC/F,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"}
@@ -7,27 +7,18 @@ const bo_1 = require("@paroicms/bo");
7
7
  const connector_1 = require("@paroicms/connector");
8
8
  const internal_server_lib_1 = require("@paroicms/internal-server-lib");
9
9
  const node_path_1 = require("node:path");
10
- const api_error_handler_1 = require("../common/api-error-handler");
11
10
  const data_format_1 = require("../common/data-format");
12
11
  const serve_text_or_1 = require("../common/serve-text-or");
13
12
  const context_1 = require("../context");
14
- const site_context_1 = require("../site-context/site-context");
15
13
  const http_constants_1 = require("./http-constants");
16
14
  const http_helpers_1 = require("./http-helpers");
17
15
  async function publicAssetsMiddleware(req, res, next) {
16
+ const siteContext = (0, http_helpers_1.getReqSiteContext)(req);
18
17
  let path = req.path;
19
18
  if (!path.startsWith("/assets/") || !["GET", "HEAD"].includes(req.method)) {
20
19
  next();
21
20
  return;
22
21
  }
23
- let siteContext;
24
- try {
25
- siteContext = await (0, site_context_1.getSiteContext)(req.hostname);
26
- }
27
- catch (error) {
28
- (0, http_helpers_1.serve404SimpleHtml)(res);
29
- return;
30
- }
31
22
  let pathPrefix;
32
23
  let baseDir;
33
24
  const pluginAssetsPrefix = "/assets/plugin/";
@@ -72,6 +63,7 @@ async function publicAssetsMiddleware(req, res, next) {
72
63
  }
73
64
  }
74
65
  async function boMiddleware(req, res, next) {
66
+ const siteContext = (0, http_helpers_1.getReqSiteContext)(req);
75
67
  let path = req.path;
76
68
  if (!["GET", "HEAD"].includes(req.method) ||
77
69
  path.startsWith("/adm/api/v1") ||
@@ -79,19 +71,6 @@ async function boMiddleware(req, res, next) {
79
71
  next();
80
72
  return;
81
73
  }
82
- let siteContext;
83
- try {
84
- siteContext = await (0, site_context_1.getSiteContext)(req.hostname);
85
- }
86
- catch (error) {
87
- if (error instanceof api_error_handler_1.ApiError && error.status === 404) {
88
- (0, http_helpers_1.serve404SimpleHtml)(res);
89
- return;
90
- }
91
- context_1.platformLog.error(error);
92
- (0, http_helpers_1.serve500Html)(res);
93
- return;
94
- }
95
74
  try {
96
75
  path = path.substring("/adm/".length);
97
76
  if (path === "")
@@ -111,16 +90,12 @@ async function boMiddleware(req, res, next) {
111
90
  }
112
91
  }
113
92
  async function boPluginsMiddleware(req, res, next) {
93
+ const siteContext = (0, http_helpers_1.getReqSiteContext)(req);
114
94
  const prefix = "/adm/plugins/";
115
95
  if (!["GET", "HEAD"].includes(req.method) || !req.path.startsWith(prefix)) {
116
96
  next();
117
97
  return;
118
98
  }
119
- const currentSiteConf = context_1.siteConfs.get(req.hostname);
120
- if (!currentSiteConf) {
121
- (0, http_helpers_1.serve404SimpleHtml)(res);
122
- return;
123
- }
124
99
  const relPathIndex = req.path.indexOf("/", prefix.length);
125
100
  if (relPathIndex === -1) {
126
101
  (0, http_helpers_1.serve404SimpleHtml)(res);
@@ -128,14 +103,6 @@ async function boPluginsMiddleware(req, res, next) {
128
103
  }
129
104
  const urlPath = req.path.substring(prefix.length, relPathIndex);
130
105
  const relPath = req.path.substring(relPathIndex + 1);
131
- let siteContext;
132
- try {
133
- siteContext = await (0, site_context_1.getSiteContext)(req.hostname);
134
- }
135
- catch (error) {
136
- (0, http_helpers_1.serve404SimpleHtml)(res);
137
- return;
138
- }
139
106
  try {
140
107
  const plugin = siteContext.plugins.get(urlPath);
141
108
  const boAssetsDir = plugin?.boAssetsDir;
@@ -178,4 +145,4 @@ async function render404Asset(siteContext, res) {
178
145
  (0, http_helpers_1.serve500Html)(res);
179
146
  }
180
147
  }
181
- //# sourceMappingURL=static-middlewares.js.map
148
+ //# sourceMappingURL=static-files-middlewares.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"static-files-middlewares.js","sourceRoot":"","sources":["../../src/express/static-files-middlewares.ts"],"names":[],"mappings":";;AAYA,wDAqDC;AAED,oCA2BC;AAED,kDAgCC;AAhID,qCAAoD;AACpD,mDAAyD;AACzD,uEAA2D;AAE3D,yCAAiC;AACjC,uDAAyD;AACzD,2DAAwD;AACxD,wCAAqC;AAErC,qDAAgD;AAChD,iDAAqF;AAE9E,KAAK,UAAU,sBAAsB,CAAC,GAAY,EAAE,GAAa,EAAE,IAAgB;IACxF,MAAM,WAAW,GAAG,IAAA,gCAAiB,EAAC,GAAG,CAAC,CAAC;IAC3C,IAAI,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC;IACpB,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;QAC1E,IAAI,EAAE,CAAC;QACP,OAAO;IACT,CAAC;IAED,IAAI,UAAkB,CAAC;IACvB,IAAI,OAAe,CAAC;IACpB,MAAM,kBAAkB,GAAG,iBAAiB,CAAC;IAC7C,IAAI,IAAI,CAAC,UAAU,CAAC,kBAAkB,CAAC,EAAE,CAAC;QACxC,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,kBAAkB,CAAC,MAAM,CAAC,CAAC;QAC9D,IAAI,QAAQ,KAAK,CAAC,CAAC,EAAE,CAAC;YACpB,KAAK,cAAc,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC;YACtC,OAAO;QACT,CAAC;QACD,MAAM,mBAAmB,GAAG,IAAI,CAAC,SAAS,CAAC,kBAAkB,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QAChF,MAAM,MAAM,GAAG,WAAW,CAAC,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;QAC5D,IAAI,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,eAAe,EAAE,CAAC;YACvC,KAAK,cAAc,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC;YACtC,OAAO;QACT,CAAC;QACD,OAAO,GAAG,MAAM,CAAC,eAAe,CAAC;QACjC,UAAU,GAAG,GAAG,IAAA,8BAAkB,EAAC,MAAM,CAAC,GAAG,CAAC;IAChD,CAAC;SAAM,CAAC;QACN,UAAU,GAAG,GAAG,IAAA,8BAAgB,EAAC,WAAW,CAAC,GAAG,CAAC;QACjD,OAAO,GAAG,IAAA,gBAAI,EAAC,WAAW,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IACjD,CAAC;IAED,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;QACjC,KAAK,cAAc,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC;QACtC,OAAO;IACT,CAAC;IACD,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;IAEzC,IAAI,CAAC;QACH,GAAG,CAAC,QAAQ,CACV,IAAI,EACJ;YACE,IAAI,EAAE,OAAO;YACb,SAAS,EAAE,iBAAO,CAAC,eAAe;YAClC,MAAM,EAAE,iBAAO,CAAC,eAAe,CAAC,CAAC,CAAC,6BAAY,CAAC,CAAC,CAAC,CAAC;SACnD,EACD,CAAC,KAAK,EAAE,EAAE;YACR,IAAI,CAAC,KAAK;gBAAE,OAAO;YACnB,oBAAoB,CAAC,KAAK,EAAE,WAAW,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;QACtD,CAAC,CACF,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,WAAW,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACjC,IAAA,2BAAY,EAAC,GAAG,CAAC,CAAC;IACpB,CAAC;AACH,CAAC;AAEM,KAAK,UAAU,YAAY,CAAC,GAAY,EAAE,GAAa,EAAE,IAAgB;IAC9E,MAAM,WAAW,GAAG,IAAA,gCAAiB,EAAC,GAAG,CAAC,CAAC;IAE3C,IAAI,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC;IACpB,IACE,CAAC,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC;QACrC,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC;QAC9B,CAAC,IAAI,KAAK,MAAM,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,EAC9C,CAAC;QACD,IAAI,EAAE,CAAC;QACP,OAAO;IACT,CAAC;IAED,IAAI,CAAC;QACH,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACtC,IAAI,IAAI,KAAK,EAAE;YAAE,IAAI,GAAG,YAAY,CAAC;QACrC,IAAI,CAAC,CAAC,MAAM,IAAA,gCAAU,EAAC,IAAA,gBAAI,EAAC,YAAS,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;YAC/C,IAAI,GAAG,YAAY,CAAC;QACtB,CAAC;QACD,GAAG,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,YAAS,EAAE,EAAE,CAAC,KAAK,EAAE,EAAE;YAChD,IAAI,CAAC,KAAK;gBAAE,OAAO;YACnB,oBAAoB,CAAC,KAAK,EAAE,WAAW,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;QACtD,CAAC,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,WAAW,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACjC,IAAA,2BAAY,EAAC,GAAG,CAAC,CAAC;IACpB,CAAC;AACH,CAAC;AAEM,KAAK,UAAU,mBAAmB,CAAC,GAAY,EAAE,GAAa,EAAE,IAAgB;IACrF,MAAM,WAAW,GAAG,IAAA,gCAAiB,EAAC,GAAG,CAAC,CAAC;IAE3C,MAAM,MAAM,GAAG,eAAe,CAAC;IAC/B,IAAI,CAAC,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;QAC1E,IAAI,EAAE,CAAC;QACP,OAAO;IACT,CAAC;IAED,MAAM,YAAY,GAAG,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;IAC1D,IAAI,YAAY,KAAK,CAAC,CAAC,EAAE,CAAC;QACxB,IAAA,iCAAkB,EAAC,GAAG,CAAC,CAAC;QACxB,OAAO;IACT,CAAC;IACD,MAAM,OAAO,GAAG,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;IAChE,MAAM,OAAO,GAAG,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,GAAG,CAAC,CAAC,CAAC;IAErD,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,WAAW,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAChD,MAAM,WAAW,GAAG,MAAM,EAAE,WAAW,CAAC;QACxC,IAAI,CAAC,WAAW,IAAI,CAAC,CAAC,MAAM,IAAA,gCAAU,EAAC,IAAA,gBAAI,EAAC,WAAW,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;YACpE,IAAA,iCAAkB,EAAC,GAAG,CAAC,CAAC;YACxB,OAAO;QACT,CAAC;QACD,GAAG,CAAC,QAAQ,CAAC,OAAO,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,EAAE,CAAC,KAAK,EAAE,EAAE;YACrD,IAAI,CAAC,KAAK;gBAAE,OAAO;YACnB,oBAAoB,CAAC,KAAK,EAAE,WAAW,EAAE,GAAG,EAAE,IAAA,gBAAI,EAAC,WAAW,EAAE,OAAO,CAAC,CAAC,CAAC;QAC5E,CAAC,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,WAAW,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACjC,IAAA,2BAAY,EAAC,GAAG,CAAC,CAAC;IACpB,CAAC;AACH,CAAC;AAED,SAAS,oBAAoB,CAAC,KAAY,EAAE,WAAwB,EAAE,GAAa,EAAE,IAAY;IAC/F,IAAI,YAAY,IAAI,KAAK,IAAI,KAAK,CAAC,UAAU,KAAK,GAAG,EAAE,CAAC;QACtD,KAAK,cAAc,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC;IACxC,CAAC;SAAM,CAAC;QACN,IAAI,MAAM,IAAI,KAAK,EAAE,CAAC;YACpB,IAAI,KAAK,CAAC,IAAI,KAAK,cAAc,EAAE,CAAC;gBAClC,GAAG,CAAC,IAAI,EAAE,CAAC;gBACX,OAAO;YACT,CAAC;YACD,WAAW,CAAC,OAAO,CAAC,KAAK,CAAC,yBAAyB,IAAI,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAClF,CAAC;QACD,IAAA,2BAAY,EAAC,GAAG,CAAC,CAAC;IACpB,CAAC;AACH,CAAC;AAED,KAAK,UAAU,cAAc,CAAC,WAAwB,EAAE,GAAa;IACnE,IAAI,CAAC;QACH,MAAM,IAAA,6BAAa,EAAC,WAAW,EAAE,GAAG,CAAC,CAAC;IACxC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,WAAW,CAAC,OAAO,CAAC,KAAK,CAAC,sBAAsB,EAAE,KAAK,CAAC,CAAC;QACzD,IAAA,2BAAY,EAAC,GAAG,CAAC,CAAC;IACpB,CAAC;AACH,CAAC"}
@@ -32,6 +32,8 @@ function statusToGraphqlErrorCode(status) {
32
32
  return "BAD_REQUEST";
33
33
  case 401:
34
34
  return "UNAUTHORIZED";
35
+ case 403:
36
+ return "FORBIDDEN";
35
37
  case 409:
36
38
  return "CONFLICT";
37
39
  default:
@@ -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,wCAAyC;AAEzC,+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,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,qBAAW,CAAC;AACzD,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"}
1
+ {"version":3,"file":"error-converter-plugin.js","sourceRoot":"","sources":["../../src/graphql/error-converter-plugin.ts"],"names":[],"mappings":";;AAOA,gEAgBC;AArBD,mEAA4E;AAC5E,wCAAyC;AAEzC,+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,qBAAW,CAAC;AACzD,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"}
package/dist/index.js CHANGED
@@ -51,9 +51,11 @@ const graphql_1 = require("graphql");
51
51
  const multer_1 = __importDefault(require("multer"));
52
52
  const api_error_handler_1 = require("./common/api-error-handler");
53
53
  const context_1 = require("./context");
54
+ const http_helpers_1 = require("./express/http-helpers");
54
55
  const public_api_middlewares_1 = require("./express/public-api-middlewares");
55
56
  const route_handler_wrapper_1 = require("./express/route-handler-wrapper");
56
- const static_middlewares_1 = require("./express/static-middlewares");
57
+ const small_middlewares_1 = require("./express/small-middlewares");
58
+ const static_files_middlewares_1 = require("./express/static-files-middlewares");
57
59
  const apollo_server_init_1 = require("./graphql/apollo-server-init");
58
60
  const complexity_plugin_1 = require("./graphql/complexity-plugin");
59
61
  const disable_apollo_studio_plugin_1 = require("./graphql/disable-apollo-studio-plugin");
@@ -68,9 +70,9 @@ const password_reset_controller_1 = require("./modules/public-api/password-reset
68
70
  const public_api_controller_1 = require("./modules/public-api/public-api-controller");
69
71
  const feed_middleware_1 = require("./modules/public-site/feed/feed.middleware");
70
72
  const media_serve_controller_1 = require("./modules/public-site/media-serve/media-serve.controller");
71
- const oauth2_client_controller_1 = require("./modules/public-site/oauth2-client.controller");
72
73
  const public_site_controller_1 = require("./modules/public-site/public-site.controller");
73
74
  const public_site_middleware_1 = require("./modules/public-site/public-site.middleware");
75
+ const oauth_middleware_1 = require("./oauth/oauth-middleware");
74
76
  const site_context_1 = require("./site-context/site-context");
75
77
  if (process.env.NODE_ENV === "development") {
76
78
  require("source-map-support").install();
@@ -110,6 +112,7 @@ async function start(options = {}) {
110
112
  };
111
113
  },
112
114
  });
115
+ await graphqlServer.start();
113
116
  const expressApp = (0, express_1.default)();
114
117
  expressApp.use(express_1.default.json({ limit: "50mb" }));
115
118
  expressApp.use((0, express_rate_limit_1.default)({
@@ -119,38 +122,43 @@ async function start(options = {}) {
119
122
  legacyHeaders: false,
120
123
  }));
121
124
  expressApp.use((0, cors_1.default)({ credentials: true, origin: "*" }));
125
+ expressApp.use(small_middlewares_1.httpRedirectionMiddleware);
122
126
  if (context_1.platformAuthUrl) {
123
127
  const { default: passport } = await Promise.resolve().then(() => __importStar(require("./modules/core/account-auth/account-auth.strategy")));
124
128
  expressApp.use(passport.initialize());
129
+ expressApp.use(oauth_middleware_1.oauth2ClientMiddleware);
125
130
  }
126
- await graphqlServer.start();
127
- expressApp.use("/adm/api/v1/graphql", (0, express4_1.expressMiddleware)(graphqlServer, {
128
- context: async ({ req, res }) => ({ req, res, fqdn: req.hostname }),
131
+ expressApp.use((0, route_handler_wrapper_1.wrapMiddlewareHandler)(small_middlewares_1.loadSiteContextMiddleware));
132
+ expressApp.use("/adm/backend/graphql", (0, express4_1.expressMiddleware)(graphqlServer, {
133
+ context: async ({ req, res }) => {
134
+ return {
135
+ req,
136
+ res,
137
+ siteContext: (0, http_helpers_1.getReqSiteContext)(req),
138
+ };
139
+ },
129
140
  }));
141
+ const upload = (0, multer_1.default)();
142
+ expressApp.post("/adm/backend/upload", upload.single("file"), (0, route_handler_wrapper_1.wrapRouteHandler)(media_upload_controller_1.uploadMediaController));
143
+ expressApp.get("/adm/backend/backup/:backupName", (0, route_handler_wrapper_1.wrapRouteHandler)(backup_controller_1.downloadBackupController));
144
+ expressApp.use((0, route_handler_wrapper_1.wrapMiddlewareHandler)(static_files_middlewares_1.boPluginsMiddleware));
145
+ expressApp.use((0, route_handler_wrapper_1.wrapMiddlewareHandler)(static_files_middlewares_1.boMiddleware));
130
146
  expressApp.use((0, compression_1.default)());
131
- expressApp.use(static_middlewares_1.boPluginsMiddleware);
132
- expressApp.use(static_middlewares_1.boMiddleware);
147
+ expressApp.get("/api/v1/healthcheck", (0, route_handler_wrapper_1.wrapRouteHandler)(public_api_controller_1.healthCheckController));
148
+ expressApp.post("/api/v1/login", (0, route_handler_wrapper_1.wrapRouteHandler)(login_controller_1.loginController));
149
+ expressApp.post("/api/v1/set-account-password", (0, route_handler_wrapper_1.wrapRouteHandler)(password_reset_controller_1.setAccountPasswordController));
150
+ expressApp.post("/api/v1/check-password-reset", (0, route_handler_wrapper_1.wrapRouteHandler)(password_reset_controller_1.checkPasswordResetController));
133
151
  expressApp.use(public_api_middlewares_1.pluginPublicApiMiddleware);
134
- expressApp.use(static_middlewares_1.publicAssetsMiddleware);
152
+ expressApp.use((0, route_handler_wrapper_1.wrapMiddlewareHandler)(static_files_middlewares_1.publicAssetsMiddleware));
135
153
  expressApp.use((0, route_handler_wrapper_1.wrapMiddlewareHandler)(feed_middleware_1.feedMiddleware));
136
154
  expressApp.use((0, route_handler_wrapper_1.wrapMiddlewareHandler)(public_site_middleware_1.publicSiteMiddleware));
137
- const upload = (0, multer_1.default)();
138
155
  expressApp.get("/robots.txt", (0, route_handler_wrapper_1.wrapRouteHandler)(app_controller_1.robotsTxtController));
139
156
  expressApp.get("/favicon.ico", (0, route_handler_wrapper_1.wrapRouteHandler)(app_controller_1.faviconController));
140
- expressApp.post("/api/v1/login", (0, route_handler_wrapper_1.wrapRouteHandler)(login_controller_1.loginController));
141
- expressApp.get("/api/v1/healthcheck", (0, route_handler_wrapper_1.wrapRouteHandler)(public_api_controller_1.healthCheckController));
142
- expressApp.post("/api/v1/set-account-password", (0, route_handler_wrapper_1.wrapRouteHandler)(password_reset_controller_1.setAccountPasswordController));
143
- expressApp.post("/api/v1/check-password-reset", (0, route_handler_wrapper_1.wrapRouteHandler)(password_reset_controller_1.checkPasswordResetController));
144
- expressApp.get("/adm/api/v1/backup/:backupName", (0, route_handler_wrapper_1.wrapRouteHandler)(backup_controller_1.downloadBackupController));
145
- expressApp.post("/adm/api/v1/upload", upload.single("file"), (0, route_handler_wrapper_1.wrapRouteHandler)(media_upload_controller_1.uploadMediaController));
146
157
  expressApp.get("/medias/:mediaUid/file/:nameAndExt", (0, route_handler_wrapper_1.wrapRouteHandler)(media_serve_controller_1.serveFilecontroller));
147
158
  expressApp.get("/medias/:mediaUid/image/:resourceVersion/:nameAndExt", (0, route_handler_wrapper_1.wrapRouteHandler)(media_serve_controller_1.serveVersionedImageController));
148
159
  expressApp.get("/medias/:mediaUid/image/:nameAndExt", (0, route_handler_wrapper_1.wrapRouteHandler)(media_serve_controller_1.serveUnversionedImageController));
149
160
  expressApp.get("/", (0, route_handler_wrapper_1.wrapRouteHandler)(public_site_controller_1.indexController));
150
- expressApp.get("/auth", (0, route_handler_wrapper_1.wrapRouteHandler)(oauth2_client_controller_1.authController));
151
- expressApp.get("/auth/google", (0, route_handler_wrapper_1.wrapRouteHandler)(oauth2_client_controller_1.googleLogin));
152
- expressApp.get("/auth/google/callback", (0, route_handler_wrapper_1.wrapRouteHandler)(oauth2_client_controller_1.googleLoginCallbackController));
153
- expressApp.get("/auth/site-url/:redirectTo", (0, route_handler_wrapper_1.wrapRouteHandler)(oauth2_client_controller_1.siteUrlController));
161
+ expressApp.use((0, route_handler_wrapper_1.wrapMiddlewareHandler)(small_middlewares_1.tailMiddleware));
154
162
  let httpServer;
155
163
  if (context_1.appConf.hostname) {
156
164
  httpServer = expressApp.listen(context_1.appConf.port, context_1.appConf.hostname);
@@ -159,10 +167,8 @@ async function start(options = {}) {
159
167
  httpServer = expressApp.listen(context_1.appConf.port);
160
168
  }
161
169
  (0, shutdown_1.handleShutdownEvents)({
162
- appLog: context_1.platformLog,
163
- onCloseCb: async () => {
164
- await Promise.all([stopCron(), (0, maintenance_task_1.unloadAllActiveSites)(), shutdownServer(httpServer)]);
165
- },
170
+ logger: context_1.platformLog,
171
+ closingTasks: [stopCron, maintenance_task_1.unloadAllActiveSites, () => shutdownServer(httpServer)],
166
172
  });
167
173
  context_1.platformLog.info(`ParoiCMS is up and running on port '${context_1.appConf.port}', it serves:${getListOfSiteUrls()
168
174
  .map(({ siteUrl, boUrl }) => `\n- ${siteUrl}${boUrl ? ` - back-office: ${boUrl}` : ""}`)
package/dist/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
@@ -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.platformLog.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,oDAGC;AAxBD,wCAAyC;AACzC,+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,qBAAW,CAAC,IAAI,CAAC,IAAI,WAAW,CAAC,QAAQ,oBAAoB,CAAC,CAAC;IACjE,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;AACvF,CAAC"}
1
+ {"version":3,"file":"maintenance-task.js","sourceRoot":"","sources":["../../src/maintenance/maintenance-task.ts"],"names":[],"mappings":";;AAKA,0CAOC;AAED,kDAKC;AAED,oDAIC;AAzBD,wCAAyC;AACzC,+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,qBAAW,CAAC,IAAI,CAAC,IAAI,WAAW,CAAC,QAAQ,oBAAoB,CAAC,CAAC;IACjE,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,qBAAW,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC;AAC1C,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
- appLog: PlatformLog;
5
- onCloseCb?: (error?: unknown) => Promise<void> | void;
4
+ logger: PlatformLog;
5
+ closingTasks?: (() => Promise<void> | void)[];
6
6
  }
7
- export declare function handleShutdownEvents({ appLog, onCloseCb }: HandleShutdownEventsOptions): void;
7
+ export declare function handleShutdownEvents({ logger, closingTasks }: HandleShutdownEventsOptions): void;