@social-mail/social-mail-web-server 1.16.415 → 1.16.418

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 (41) hide show
  1. package/dist/.tsbuildinfo +1 -1
  2. package/dist/server/services/files/web-content/WebUrl.d.ts +0 -5
  3. package/dist/server/services/files/web-content/WebUrl.d.ts.map +1 -1
  4. package/dist/server/services/files/web-content/WebUrl.js +0 -12
  5. package/dist/server/services/files/web-content/WebUrl.js.map +1 -1
  6. package/dist/server/services/puppeteer/PuppeteerService.d.ts +2 -1
  7. package/dist/server/services/puppeteer/PuppeteerService.d.ts.map +1 -1
  8. package/dist/server/services/puppeteer/PuppeteerService.js +3 -2
  9. package/dist/server/services/puppeteer/PuppeteerService.js.map +1 -1
  10. package/dist/server/services/site/SitePreviewGenerator.d.ts +10 -0
  11. package/dist/server/services/site/SitePreviewGenerator.d.ts.map +1 -0
  12. package/dist/server/services/site/SitePreviewGenerator.js +30 -0
  13. package/dist/server/services/site/SitePreviewGenerator.js.map +1 -0
  14. package/dist/server/workflows/site/generate-previews/GenerateTemplatePreviewWorkflow.d.ts +2 -1
  15. package/dist/server/workflows/site/generate-previews/GenerateTemplatePreviewWorkflow.d.ts.map +1 -1
  16. package/dist/server/workflows/site/generate-previews/GenerateTemplatePreviewWorkflow.js +6 -4
  17. package/dist/server/workflows/site/generate-previews/GenerateTemplatePreviewWorkflow.js.map +1 -1
  18. package/dist/wwwroot/routes/social-mail/site/list/templates/get.d.ts +2 -0
  19. package/dist/wwwroot/routes/social-mail/site/list/templates/get.d.ts.map +1 -1
  20. package/dist/wwwroot/routes/social-mail/site/list/templates/get.js +11 -6
  21. package/dist/wwwroot/routes/social-mail/site/list/templates/get.js.map +1 -1
  22. package/dist/wwwroot/routes/social-mail/site/preview/[host]/[type]/[cacheKey]/get.d.ts.map +1 -1
  23. package/dist/wwwroot/routes/social-mail/site/preview/[host]/[type]/[cacheKey]/get.js +2 -2
  24. package/dist/wwwroot/routes/social-mail/site/preview/[host]/[type]/[cacheKey]/get.js.map +1 -1
  25. package/package.json +1 -1
  26. package/src/server/services/files/web-content/WebUrl.ts +0 -17
  27. package/src/server/services/puppeteer/PuppeteerService.ts +3 -1
  28. package/src/server/services/site/SitePreviewGenerator.ts +23 -0
  29. package/src/server/workflows/site/generate-previews/GenerateTemplatePreviewWorkflow.ts +4 -3
  30. package/src/wwwroot/routes/social-mail/site/list/templates/get.tsx +18 -13
  31. package/src/wwwroot/routes/social-mail/site/preview/[host]/[type]/[cacheKey]/get.tsx +2 -3
  32. package/dist/wwwroot/routes/social-mail/site/list/[type]/get.d.ts +0 -18
  33. package/dist/wwwroot/routes/social-mail/site/list/[type]/get.d.ts.map +0 -1
  34. package/dist/wwwroot/routes/social-mail/site/list/[type]/get.js +0 -184
  35. package/dist/wwwroot/routes/social-mail/site/list/[type]/get.js.map +0 -1
  36. package/dist/wwwroot/routes/social-mail/site/list/[type]/options.d.ts +0 -3
  37. package/dist/wwwroot/routes/social-mail/site/list/[type]/options.d.ts.map +0 -1
  38. package/dist/wwwroot/routes/social-mail/site/list/[type]/options.js +0 -3
  39. package/dist/wwwroot/routes/social-mail/site/list/[type]/options.js.map +0 -1
  40. package/src/wwwroot/routes/social-mail/site/list/[type]/get.tsx +0 -184
  41. package/src/wwwroot/routes/social-mail/site/list/[type]/options.tsx +0 -2
package/dist/server/services/files/web-content/WebUrl.d.ts CHANGED
@@ -1,9 +1,4 @@
1
- import WebSite from "../../../model/entities/WebSite.js";
2
1
  export default class WebUrl {
3
- static templatePreviewUrls(site: WebSite, hostName?: any): {
4
- preview: string;
5
- previewMobile: string;
6
- };
7
2
  static sizeTransform(url: string, transform: string, fileName: string, size?: any): string;
8
3
  static transform(url: string, transform: string, outputFileName: any): string;
9
4
  }
package/dist/server/services/files/web-content/WebUrl.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"WebUrl.d.ts","sourceRoot":"","sources":["../../../../../src/server/services/files/web-content/WebUrl.ts"],"names":[],"mappings":"AACA,OAAO,OAAO,MAAM,oCAAoC,CAAC;AAEzD,MAAM,CAAC,OAAO,OAAO,MAAM;IAGvB,MAAM,CAAC,mBAAmB,CAAC,IAAI,EAAE,OAAO,EAAE,QAAQ,CAAC,KAAA;QAQ3C,OAAO;QACP,aAAa;MAEpB;IAGD,MAAM,CAAC,aAAa,CAChB,GAAG,EAAE,MAAM,EACX,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,IAAI,MAAS,UAiBhB;IAED,MAAM,CAAC,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,cAAc,KAAA,UAY9D;CAEJ"}
1
+ {"version":3,"file":"WebUrl.d.ts","sourceRoot":"","sources":["../../../../../src/server/services/files/web-content/WebUrl.ts"],"names":[],"mappings":"AACA,MAAM,CAAC,OAAO,OAAO,MAAM;IAEvB,MAAM,CAAC,aAAa,CAChB,GAAG,EAAE,MAAM,EACX,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,IAAI,MAAS,UAiBhB;IAED,MAAM,CAAC,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,cAAc,KAAA,UAY9D;CAEJ"}
package/dist/server/services/files/web-content/WebUrl.js CHANGED
@@ -1,16 +1,4 @@
1
- import { globalEnv } from "../../../../common/globalEnv.js";
2
1
  export default class WebUrl {
3
- static templatePreviewUrls(site, hostName) {
4
- const cdn = hostName || globalEnv.cdn;
5
- const { host } = site.hosts[0];
6
- const { currentVersionID } = site;
7
- const v = 10;
8
- const cv = `c${v.toString(36)}-${currentVersionID.toString(36)}`;
9
- return {
10
- preview: `https://${cdn}/social-mail/site/preview/${host}/desktop/${cv}/desktop-preview.webp`,
11
- previewMobile: `https://${cdn}/social-mail/site/preview/${host}/mobile/${cv}/mobile-preview.webp`,
12
- };
13
- }
14
2
  static sizeTransform(url, transform, fileName, size = void 0) {
15
3
  if (size) {
16
4
  fileName = `${fileName}.${size}.${transform}`;
package/dist/server/services/files/web-content/WebUrl.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"WebUrl.js","sourceRoot":"","sources":["../../../../../src/server/services/files/web-content/WebUrl.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAG5D,MAAM,CAAC,OAAO,OAAO,MAAM;IAGvB,MAAM,CAAC,mBAAmB,CAAC,IAAa,EAAE,QAAS;QAE/C,MAAM,GAAG,GAAG,QAAQ,IAAI,SAAS,CAAC,GAAG,CAAC;QACtC,MAAM,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAC/B,MAAM,EAAE,gBAAgB,EAAE,GAAG,IAAI,CAAC;QAClC,MAAM,CAAC,GAAG,EAAE,CAAC;QACb,MAAM,EAAE,GAAG,IAAI,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,gBAAgB,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,CAAC;QACjE,OAAO;YACH,OAAO,EAAE,WAAW,GAAG,6BAA6B,IAAI,YAAY,EAAE,uBAAuB;YAC7F,aAAa,EAAE,WAAW,GAAG,6BAA6B,IAAI,WAAW,EAAE,sBAAsB;SACpG,CAAC;IACN,CAAC;IAGD,MAAM,CAAC,aAAa,CAChB,GAAW,EACX,SAAiB,EACjB,QAAgB,EAChB,IAAI,GAAG,KAAK,CAAC;QACb,IAAI,IAAI,EAAE,CAAC;YACP,QAAQ,GAAG,GAAG,QAAQ,IAAI,IAAI,IAAI,SAAS,EAAE,CAAC;YAC9C,SAAS,GAAG,GAAG,SAAS,IAAI,IAAI,GAAG,CAAC;QACxC,CAAC;aAAM,CAAC;YACJ,QAAQ,GAAG,GAAG,QAAQ,IAAI,SAAS,EAAE,CAAC;QAC1C,CAAC;QACD,IAAI,GAAG,CAAC,QAAQ,CAAC,gCAAgC,CAAC,EAAE,CAAC;YACjD,OAAO,GAAG;iBACL,OAAO,CACJ,gCAAgC,EAChC,4BAA4B,SAAS,GAAG,CAAC,GAAG,IAAI,QAAQ,EAAE,CAAC;QACvE,CAAC;QACD,OAAO,GAAG;aACL,OAAO,CACJ,kCAAkC,EAClC,8BAA8B,SAAS,GAAG,CAAC,GAAG,IAAI,QAAQ,EAAE,CAAC;IACzE,CAAC;IAED,MAAM,CAAC,SAAS,CAAC,GAAW,EAAE,SAAiB,EAAE,cAAc;QAC3D,IAAI,GAAG,CAAC,QAAQ,CAAC,gCAAgC,CAAC,EAAE,CAAC;YACjD,OAAO,GAAG;iBACL,OAAO,CACJ,gCAAgC,EAChC,4BAA4B,SAAS,GAAG,CAAC,GAAG,IAAI,cAAc,EAAE,CAAC;QAC7E,CAAC;QACD,OAAO,GAAG;aACL,OAAO,CACJ,kCAAkC,EAClC,8BAA8B,SAAS,GAAG,CAAC,GAAG,IAAI,cAAc,EAAE,CAAC;IAE/E,CAAC;CAEJ"}
1
+ {"version":3,"file":"WebUrl.js","sourceRoot":"","sources":["../../../../../src/server/services/files/web-content/WebUrl.ts"],"names":[],"mappings":"AACA,MAAM,CAAC,OAAO,OAAO,MAAM;IAEvB,MAAM,CAAC,aAAa,CAChB,GAAW,EACX,SAAiB,EACjB,QAAgB,EAChB,IAAI,GAAG,KAAK,CAAC;QACb,IAAI,IAAI,EAAE,CAAC;YACP,QAAQ,GAAG,GAAG,QAAQ,IAAI,IAAI,IAAI,SAAS,EAAE,CAAC;YAC9C,SAAS,GAAG,GAAG,SAAS,IAAI,IAAI,GAAG,CAAC;QACxC,CAAC;aAAM,CAAC;YACJ,QAAQ,GAAG,GAAG,QAAQ,IAAI,SAAS,EAAE,CAAC;QAC1C,CAAC;QACD,IAAI,GAAG,CAAC,QAAQ,CAAC,gCAAgC,CAAC,EAAE,CAAC;YACjD,OAAO,GAAG;iBACL,OAAO,CACJ,gCAAgC,EAChC,4BAA4B,SAAS,GAAG,CAAC,GAAG,IAAI,QAAQ,EAAE,CAAC;QACvE,CAAC;QACD,OAAO,GAAG;aACL,OAAO,CACJ,kCAAkC,EAClC,8BAA8B,SAAS,GAAG,CAAC,GAAG,IAAI,QAAQ,EAAE,CAAC;IACzE,CAAC;IAED,MAAM,CAAC,SAAS,CAAC,GAAW,EAAE,SAAiB,EAAE,cAAc;QAC3D,IAAI,GAAG,CAAC,QAAQ,CAAC,gCAAgC,CAAC,EAAE,CAAC;YACjD,OAAO,GAAG;iBACL,OAAO,CACJ,gCAAgC,EAChC,4BAA4B,SAAS,GAAG,CAAC,GAAG,IAAI,cAAc,EAAE,CAAC;QAC7E,CAAC;QACD,OAAO,GAAG;aACL,OAAO,CACJ,kCAAkC,EAClC,8BAA8B,SAAS,GAAG,CAAC,GAAG,IAAI,cAAc,EAAE,CAAC;IAE/E,CAAC;CAEJ"}
package/dist/server/services/puppeteer/PuppeteerService.d.ts CHANGED
@@ -4,9 +4,10 @@ import Page from "@entity-access/server-pages/dist/Page.js";
4
4
  export default class PuppeteerService {
5
5
  siteCache: SiteDiskContentCache;
6
6
  authService: AuthorizationService;
7
- generate({ url, mobile, width, height, deviceScaleFactor, pageReadyScript, output, cacheKey, test, testDelay, fullPage, timeout, pageEvalScript, page }: {
7
+ generate({ url, mobile, width, height, deviceScaleFactor, pageReadyScript, output, fileName, cacheKey, test, testDelay, fullPage, timeout, pageEvalScript, page }: {
8
8
  cacheKey?: string;
9
9
  deviceScaleFactor?: number;
10
+ fileName?: string;
10
11
  fullPage?: boolean;
11
12
  height?: number;
12
13
  mobile?: boolean;
package/dist/server/services/puppeteer/PuppeteerService.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"PuppeteerService.d.ts","sourceRoot":"","sources":["../../../../src/server/services/puppeteer/PuppeteerService.ts"],"names":[],"mappings":"AAMA,OAAO,oBAAoB,MAAM,kCAAkC,CAAC;AACpE,OAAO,oBAAoB,MAAM,mEAAmE,CAAC;AACrG,OAAO,IAAI,MAAM,0CAA0C,CAAC;AAQ5D,MAAM,CAAC,OAAO,OAAO,gBAAgB;IAGjC,SAAS,EAAE,oBAAoB,CAAC;IAGhC,WAAW,EAAE,oBAAoB,CAAC;IAE5B,QAAQ,CAAC,EACX,GAAG,EACH,MAAc,EACd,KAA2B,EAC3B,MAA6B,EAC7B,iBAAkC,EAClC,eAAwB,EACxB,MAAe,EACf,QAA6B,EAC7B,IAA8C,EAC9C,SAAgB,EAChB,QAAgB,EAChB,OAAe,EACf,cAA+B,EAC/B,IAAqB,EACxB;;;;;;;;;;;;;;;KAAA,mFA0EA;CAEJ"}
1
+ {"version":3,"file":"PuppeteerService.d.ts","sourceRoot":"","sources":["../../../../src/server/services/puppeteer/PuppeteerService.ts"],"names":[],"mappings":"AAMA,OAAO,oBAAoB,MAAM,kCAAkC,CAAC;AACpE,OAAO,oBAAoB,MAAM,mEAAmE,CAAC;AACrG,OAAO,IAAI,MAAM,0CAA0C,CAAC;AAQ5D,MAAM,CAAC,OAAO,OAAO,gBAAgB;IAGjC,SAAS,EAAE,oBAAoB,CAAC;IAGhC,WAAW,EAAE,oBAAoB,CAAC;IAE5B,QAAQ,CAAC,EACX,GAAG,EACH,MAAc,EACd,KAA2B,EAC3B,MAA6B,EAC7B,iBAAkC,EAClC,eAAwB,EACxB,MAAe,EACf,QAAmB,EACnB,QAA6B,EAC7B,IAA8C,EAC9C,SAAgB,EAChB,QAAgB,EAChB,OAAe,EACf,cAA+B,EAC/B,IAAqB,EACxB;;;;;;;;;;;;;;;;KAAA,mFA2EA;CAEJ"}
package/dist/server/services/puppeteer/PuppeteerService.js CHANGED
@@ -72,7 +72,7 @@ if (/^\d+$/i.test(port)) {
72
72
  port = Number(port);
73
73
  }
74
74
  let PuppeteerService = class PuppeteerService {
75
- async generate({ url, mobile = false, width = mobile ? 650 : 1200, height = mobile ? 1000 : 1536, deviceScaleFactor = mobile ? 2 : 1, pageReadyScript = void 0, output = "webp", cacheKey = globalEnv.serverID, test = "true", testDelay = 1000, fullPage = false, timeout = 15000, pageEvalScript = "() => void 0", page = void 0 }) {
75
+ async generate({ url, mobile = false, width = mobile ? 650 : 1200, height = mobile ? 1000 : 1536, deviceScaleFactor = mobile ? 2 : 1, pageReadyScript = void 0, output = "webp", fileName = "w.webp", cacheKey = globalEnv.serverID, test = "true", testDelay = 1000, fullPage = false, timeout = 15000, pageEvalScript = "() => void 0", page = void 0 }) {
76
76
  const pageCookies = page?.request?.cookies;
77
77
  let cookies = "undefined";
78
78
  if (pageCookies) {
@@ -89,7 +89,8 @@ let PuppeteerService = class PuppeteerService {
89
89
  testDelay: testDelay,
90
90
  timeout: timeout,
91
91
  pageEvalScript,
92
- output
92
+ output,
93
+ v: fileName
93
94
  });
94
95
  if (mobile) {
95
96
  qs.append("mobile", "true");
package/dist/server/services/puppeteer/PuppeteerService.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"PuppeteerService.js","sourceRoot":"","sources":["../../../../src/server/services/puppeteer/PuppeteerService.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"PuppeteerService.js","sourceRoot":"","sources":["../../../../src/server/services/puppeteer/PuppeteerService.ts"],"names":[],"mappings":"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"}
package/dist/server/services/site/SitePreviewGenerator.d.ts ADDED
@@ -0,0 +1,10 @@
1
+ import WebSiteContentService from "../files/WebSiteContentService.js";
2
+ import WebSite from "../../model/entities/WebSite.js";
3
+ export default class SitePreviewGenerator {
4
+ wcs: WebSiteContentService;
5
+ getPreviewUrls(site: WebSite, hostName?: any): Promise<{
6
+ preview: string;
7
+ previewMobile: string;
8
+ }>;
9
+ }
10
+ //# sourceMappingURL=SitePreviewGenerator.d.ts.map
package/dist/server/services/site/SitePreviewGenerator.d.ts.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"SitePreviewGenerator.d.ts","sourceRoot":"","sources":["../../../../src/server/services/site/SitePreviewGenerator.ts"],"names":[],"mappings":"AACA,OAAO,qBAAqB,MAAM,mCAAmC,CAAC;AAEtE,OAAO,OAAO,MAAM,iCAAiC,CAAC;AAEtD,MAAM,CAAC,OAAO,OAAO,oBAAoB;IAGrC,GAAG,EAAE,qBAAqB,CAAC;IAErB,cAAc,CAAC,IAAI,EAAC,OAAO,EAAE,QAAQ,CAAC,KAAA;;;OAW3C;CACJ"}
package/dist/server/services/site/SitePreviewGenerator.js ADDED
@@ -0,0 +1,30 @@
1
+ var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
2
+ var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
3
+ if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
4
+ else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
5
+ return c > 3 && r && Object.defineProperty(target, key, r), r;
6
+ };
7
+ var __metadata = (this && this.__metadata) || function (k, v) {
8
+ if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
9
+ };
10
+ import Inject from "@entity-access/entity-access/dist/di/di.js";
11
+ import WebSiteContentService from "../files/WebSiteContentService.js";
12
+ import { globalEnv } from "../../../common/globalEnv.js";
13
+ export default class SitePreviewGenerator {
14
+ async getPreviewUrls(site, hostName) {
15
+ const cdn = hostName || globalEnv.cdn;
16
+ const { host } = site.hosts[0];
17
+ const { currentVersionID } = site;
18
+ const v = await this.wcs.getPackagesHash();
19
+ const cv = `c${v}-${currentVersionID.toString(36)}`;
20
+ return {
21
+ preview: `https://${cdn}/social-mail/site/preview/${host}/desktop/${cv}/desktop-preview.webp`,
22
+ previewMobile: `https://${cdn}/social-mail/site/preview/${host}/mobile/${cv}/mobile-preview.webp`,
23
+ };
24
+ }
25
+ }
26
+ __decorate([
27
+ Inject,
28
+ __metadata("design:type", WebSiteContentService)
29
+ ], SitePreviewGenerator.prototype, "wcs", void 0);
30
+ //# sourceMappingURL=SitePreviewGenerator.js.map
package/dist/server/services/site/SitePreviewGenerator.js.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"SitePreviewGenerator.js","sourceRoot":"","sources":["../../../../src/server/services/site/SitePreviewGenerator.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,MAAM,MAAM,4CAA4C,CAAC;AAChE,OAAO,qBAAqB,MAAM,mCAAmC,CAAC;AACtE,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAGzD,MAAM,CAAC,OAAO,OAAO,oBAAoB;IAKrC,KAAK,CAAC,cAAc,CAAC,IAAY,EAAE,QAAS;QAExC,MAAM,GAAG,GAAG,QAAQ,IAAI,SAAS,CAAC,GAAG,CAAC;QACtC,MAAM,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAC/B,MAAM,EAAE,gBAAgB,EAAE,GAAG,IAAI,CAAC;QAClC,MAAM,CAAC,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,eAAe,EAAE,CAAC;QAC3C,MAAM,EAAE,GAAG,IAAI,CAAC,IAAI,gBAAgB,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,CAAC;QACpD,OAAO;YACH,OAAO,EAAE,WAAW,GAAG,6BAA6B,IAAI,YAAY,EAAE,uBAAuB;YAC7F,aAAa,EAAE,WAAW,GAAG,6BAA6B,IAAI,WAAW,EAAE,sBAAsB;SACpG,CAAC;IACN,CAAC;CACJ;AAdG;IADC,MAAM;8BACF,qBAAqB;iDAAC"}
package/dist/server/workflows/site/generate-previews/GenerateTemplatePreviewWorkflow.d.ts CHANGED
@@ -1,8 +1,9 @@
1
1
  import Workflow from "@entity-access/entity-access/dist/workflows/Workflow.js";
2
2
  import SocialMailContext from "../../../model/SocialMailContext.js";
3
+ import SitePreviewGenerator from "../../../services/site/SitePreviewGenerator.js";
3
4
  export default class GenerateTemplatePreviewWorkflow extends Workflow {
4
5
  run(): Promise<void>;
5
- generate(start: any, db?: SocialMailContext): Promise<any>;
6
+ generate(start: any, db?: SocialMailContext, spg?: SitePreviewGenerator): Promise<any>;
6
7
  generatePreview(url: string): Promise<void>;
7
8
  }
8
9
  //# sourceMappingURL=GenerateTemplatePreviewWorkflow.d.ts.map
package/dist/server/workflows/site/generate-previews/GenerateTemplatePreviewWorkflow.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"GenerateTemplatePreviewWorkflow.d.ts","sourceRoot":"","sources":["../../../../../src/server/workflows/site/generate-previews/GenerateTemplatePreviewWorkflow.ts"],"names":[],"mappings":"AACA,OAAO,QAA4B,MAAM,yDAAyD,CAAC;AACnG,OAAO,iBAAiB,MAAM,qCAAqC,CAAC;AAOpE,MAAM,CAAC,OAAO,OAAO,+BAAgC,SAAQ,QAAQ;IAE3D,GAAG,kBAQR;IAGK,QAAQ,CACV,KAAK,KAAA,EACG,EAAE,CAAC,EAAE,iBAAiB,gBA0BjC;IAEK,eAAe,CAAC,GAAG,EAAE,MAAM,iBA0BhC;CAIJ"}
1
+ {"version":3,"file":"GenerateTemplatePreviewWorkflow.d.ts","sourceRoot":"","sources":["../../../../../src/server/workflows/site/generate-previews/GenerateTemplatePreviewWorkflow.ts"],"names":[],"mappings":"AACA,OAAO,QAA4B,MAAM,yDAAyD,CAAC;AACnG,OAAO,iBAAiB,MAAM,qCAAqC,CAAC;AAKpE,OAAO,oBAAoB,MAAM,gDAAgD,CAAC;AAElF,MAAM,CAAC,OAAO,OAAO,+BAAgC,SAAQ,QAAQ;IAE3D,GAAG,kBAQR;IAGK,QAAQ,CACV,KAAK,KAAA,EACG,EAAE,CAAC,EAAE,iBAAiB,EACtB,GAAG,CAAC,EAAE,oBAAoB,gBA0BrC;IAEK,eAAe,CAAC,GAAG,EAAE,MAAM,iBA0BhC;CAIJ"}
package/dist/server/workflows/site/generate-previews/GenerateTemplatePreviewWorkflow.js CHANGED
@@ -13,11 +13,11 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
13
13
  import Inject from "@entity-access/entity-access/dist/di/di.js";
14
14
  import Workflow, { UniqueActivity } from "@entity-access/entity-access/dist/workflows/Workflow.js";
15
15
  import SocialMailContext from "../../../model/SocialMailContext.js";
16
- import WebUrl from "../../../services/files/web-content/WebUrl.js";
17
16
  import FetchBuilder from "@web-atoms/fetch-builder";
18
17
  import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
19
18
  import { globalEnv } from "../../../../common/globalEnv.js";
20
19
  import sleep from "../../../../common/sleep.js";
20
+ import SitePreviewGenerator from "../../../services/site/SitePreviewGenerator.js";
21
21
  export default class GenerateTemplatePreviewWorkflow extends Workflow {
22
22
  async run() {
23
23
  let start = "0";
@@ -28,7 +28,7 @@ export default class GenerateTemplatePreviewWorkflow extends Workflow {
28
28
  }
29
29
  }
30
30
  }
31
- async generate(start, db) {
31
+ async generate(start, db, spg) {
32
32
  const templates = await db.websiteFolders
33
33
  .where({ start }, (x, p) => x.folderID > p.start
34
34
  && x.isTemplate === true
@@ -44,7 +44,7 @@ export default class GenerateTemplatePreviewWorkflow extends Workflow {
44
44
  if (!t.hosts?.length) {
45
45
  continue;
46
46
  }
47
- const { preview, previewMobile } = WebUrl.templatePreviewUrls(t);
47
+ const { preview, previewMobile } = await spg.getPreviewUrls(t);
48
48
  start = t.folderID;
49
49
  await this.generatePreview(preview);
50
50
  await this.generatePreview(previewMobile);
@@ -81,8 +81,10 @@ export default class GenerateTemplatePreviewWorkflow extends Workflow {
81
81
  __decorate([
82
82
  UniqueActivity,
83
83
  __param(1, Inject),
84
+ __param(2, Inject),
84
85
  __metadata("design:type", Function),
85
- __metadata("design:paramtypes", [Object, SocialMailContext]),
86
+ __metadata("design:paramtypes", [Object, SocialMailContext,
87
+ SitePreviewGenerator]),
86
88
  __metadata("design:returntype", Promise)
87
89
  ], GenerateTemplatePreviewWorkflow.prototype, "generate", null);
88
90
  //# sourceMappingURL=GenerateTemplatePreviewWorkflow.js.map
package/dist/server/workflows/site/generate-previews/GenerateTemplatePreviewWorkflow.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"GenerateTemplatePreviewWorkflow.js","sourceRoot":"","sources":["../../../../../src/server/workflows/site/generate-previews/GenerateTemplatePreviewWorkflow.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"GenerateTemplatePreviewWorkflow.js","sourceRoot":"","sources":["../../../../../src/server/workflows/site/generate-previews/GenerateTemplatePreviewWorkflow.ts"],"names":[],"mappings":"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"}
package/dist/wwwroot/routes/social-mail/site/list/templates/get.d.ts CHANGED
@@ -2,6 +2,7 @@ import Page from "@entity-access/server-pages/dist/Page.js";
2
2
  import SocialMailContext from "../../../../../../server/model/SocialMailContext.js";
3
3
  import SessionSecurity from "@entity-access/server-pages/dist/services/SessionSecurity.js";
4
4
  import EncryptionService from "../../../../../../server/services/encryption/EncryptionService.js";
5
+ import SitePreviewGenerator from "../../../../../../server/services/site/SitePreviewGenerator.js";
5
6
  export default class extends Page {
6
7
  db: SocialMailContext;
7
8
  tags: string;
@@ -13,6 +14,7 @@ export default class extends Page {
13
14
  withoutCdn: string;
14
15
  sessionSecurity: SessionSecurity;
15
16
  es: EncryptionService;
17
+ spg: SitePreviewGenerator;
16
18
  run(): Promise<import("@entity-access/server-pages/dist/Content.js").default>;
17
19
  }
18
20
  //# sourceMappingURL=get.d.ts.map
package/dist/wwwroot/routes/social-mail/site/list/templates/get.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"get.d.ts","sourceRoot":"","sources":["../../../../../../../src/wwwroot/routes/social-mail/site/list/templates/get.tsx"],"names":[],"mappings":"AACA,OAAO,IAAI,MAAM,0CAA0C,CAAC;AAC5D,OAAO,iBAAiB,MAAM,qDAAqD,CAAC;AAIpF,OAAO,eAAe,MAAM,8DAA8D,CAAC;AAC3F,OAAO,iBAAiB,MAAM,mEAAmE,CAAC;AAIlG,MAAM,CAAC,OAAO,MAAO,SAAQ,IAAI;IAG7B,EAAE,EAAE,iBAAiB,CAAC;IAGtB,IAAI,EAAE,MAAM,CAAC;IAGb,KAAK,EAAE,MAAM,CAAK;IAGlB,IAAI,EAAE,MAAM,CAAM;IAGlB,MAAM,EAAE,MAAM,CAAC;IAGf,IAAI,EAAE,MAAM,CAAC;IAGb,YAAY,EAAE,MAAM,CAAC;IAGrB,UAAU,EAAE,MAAM,CAAC;IAGnB,eAAe,EAAE,eAAe,CAAC;IAGjC,EAAE,EAAE,iBAAiB,CAAC;IAEhB,GAAG,2EA8DR;CACJ"}
1
+ {"version":3,"file":"get.d.ts","sourceRoot":"","sources":["../../../../../../../src/wwwroot/routes/social-mail/site/list/templates/get.tsx"],"names":[],"mappings":"AACA,OAAO,IAAI,MAAM,0CAA0C,CAAC;AAC5D,OAAO,iBAAiB,MAAM,qDAAqD,CAAC;AAIpF,OAAO,eAAe,MAAM,8DAA8D,CAAC;AAC3F,OAAO,iBAAiB,MAAM,mEAAmE,CAAC;AAElG,OAAO,oBAAoB,MAAM,gEAAgE,CAAC;AAElG,MAAM,CAAC,OAAO,MAAO,SAAQ,IAAI;IAG7B,EAAE,EAAE,iBAAiB,CAAC;IAGtB,IAAI,EAAE,MAAM,CAAC;IAGb,KAAK,EAAE,MAAM,CAAK;IAGlB,IAAI,EAAE,MAAM,CAAM;IAGlB,MAAM,EAAE,MAAM,CAAC;IAGf,IAAI,EAAE,MAAM,CAAC;IAGb,YAAY,EAAE,MAAM,CAAC;IAGrB,UAAU,EAAE,MAAM,CAAC;IAGnB,eAAe,EAAE,eAAe,CAAC;IAGjC,EAAE,EAAE,iBAAiB,CAAC;IAGtB,GAAG,EAAE,oBAAoB,CAAC;IAEpB,GAAG,2EAgER;CACJ"}
package/dist/wwwroot/routes/social-mail/site/list/templates/get.js CHANGED
@@ -15,7 +15,7 @@ import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
15
15
  import { CORS } from "../../../../../../common/CORS.js";
16
16
  import SessionSecurity from "@entity-access/server-pages/dist/services/SessionSecurity.js";
17
17
  import EncryptionService from "../../../../../../server/services/encryption/EncryptionService.js";
18
- import WebUrl from "../../../../../../server/services/files/web-content/WebUrl.js";
18
+ import SitePreviewGenerator from "../../../../../../server/services/site/SitePreviewGenerator.js";
19
19
  export default class default_1 extends Page {
20
20
  constructor() {
21
21
  super(...arguments);
@@ -55,18 +55,19 @@ export default class default_1 extends Page {
55
55
  .orderByDescending(sort)
56
56
  .include((x) => [x.folder, x.currentVersion, x.hosts, x.webSiteTags.forEach((t) => t.tag)])
57
57
  .toPage(start, size);
58
- const items = list.items.map((x) => {
58
+ const items = [];
59
+ for (const x of list.items) {
59
60
  const { host } = x.hosts[0];
60
- return {
61
+ items.push({
61
62
  id: x.folderID,
62
63
  tags: x.webSiteTags?.map((t) => t.tag.name) ?? [],
63
64
  name: x.folder.name,
64
65
  title: x.title,
65
66
  host,
66
- ...WebUrl.templatePreviewUrls(x, this.withoutCdn ? this.request.hostName : void 0),
67
+ ...await this.spg.getPreviewUrls(x),
67
68
  url: `https://${host}`
68
- };
69
- });
69
+ });
70
+ }
70
71
  const cacheSeconds = this.cacheSeconds || 900;
71
72
  this.cacheControl = `public, max-age=${cacheSeconds}`;
72
73
  return this.json({
@@ -115,4 +116,8 @@ __decorate([
115
116
  Inject,
116
117
  __metadata("design:type", EncryptionService)
117
118
  ], default_1.prototype, "es", void 0);
119
+ __decorate([
120
+ Inject,
121
+ __metadata("design:type", SitePreviewGenerator)
122
+ ], default_1.prototype, "spg", void 0);
118
123
  //# sourceMappingURL=get.js.map
package/dist/wwwroot/routes/social-mail/site/list/templates/get.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"get.js","sourceRoot":"","sources":["../../../../../../../src/wwwroot/routes/social-mail/site/list/templates/get.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"get.js","sourceRoot":"","sources":["../../../../../../../src/wwwroot/routes/social-mail/site/list/templates/get.tsx"],"names":[],"mappings":"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"}
package/dist/wwwroot/routes/social-mail/site/preview/[host]/[type]/[cacheKey]/get.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"get.d.ts","sourceRoot":"","sources":["../../../../../../../../../src/wwwroot/routes/social-mail/site/preview/[host]/[type]/[cacheKey]/get.tsx"],"names":[],"mappings":"AACA,OAAO,IAAI,MAAM,0CAA0C,CAAC;AAG5D,OAAO,qBAAqB,MAAM,wEAAwE,CAAC;AAG3G,OAAO,YAAY,MAAM,+DAA+D,CAAC;AAEzF,OAAO,eAAe,MAAM,2DAA2D,CAAC;AACxF,OAAO,gBAAgB,MAAM,uEAAuE,CAAC;AACrG,OAAO,QAA6B,MAAM,qDAAqD,CAAC;AAOhG,MAAM,CAAC,OAAO,MAAO,SAAQ,IAAI;IAG7B,GAAG,EAAE,qBAAqB,CAAC;IAG3B,YAAY,EAAE,YAAY,CAAC;IAG3B,MAAM,EAAE,QAAQ,CAAC;IAGjB,GAAG,EAAE,eAAe,CAAC;IAGrB,gBAAgB,EAAE,gBAAgB,CAAC;IAGnC,IAAI,MAAC;IAGL,QAAQ,MAAC;IAGT,IAAI,MAAC;IAGL,KAAK,MAAC;IAEA,GAAG,2EAgGR;CACJ"}
1
+ {"version":3,"file":"get.d.ts","sourceRoot":"","sources":["../../../../../../../../../src/wwwroot/routes/social-mail/site/preview/[host]/[type]/[cacheKey]/get.tsx"],"names":[],"mappings":"AACA,OAAO,IAAI,MAAM,0CAA0C,CAAC;AAG5D,OAAO,qBAAqB,MAAM,wEAAwE,CAAC;AAG3G,OAAO,YAAY,MAAM,+DAA+D,CAAC;AAEzF,OAAO,eAAe,MAAM,2DAA2D,CAAC;AACxF,OAAO,gBAAgB,MAAM,uEAAuE,CAAC;AACrG,OAAO,QAA6B,MAAM,qDAAqD,CAAC;AAOhG,MAAM,CAAC,OAAO,MAAO,SAAQ,IAAI;IAG7B,GAAG,EAAE,qBAAqB,CAAC;IAG3B,YAAY,EAAE,YAAY,CAAC;IAG3B,MAAM,EAAE,QAAQ,CAAC;IAGjB,GAAG,EAAE,eAAe,CAAC;IAGrB,gBAAgB,EAAE,gBAAgB,CAAC;IAGnC,IAAI,MAAC;IAGL,QAAQ,MAAC;IAGT,IAAI,MAAC;IAGL,KAAK,MAAC;IAEA,GAAG,2EA+FR;CACJ"}
package/dist/wwwroot/routes/social-mail/site/preview/[host]/[type]/[cacheKey]/get.js CHANGED
@@ -34,7 +34,6 @@ export default class default_1 extends Page {
34
34
  const url = this.request.URL;
35
35
  return await HttpProxyService.fetch(this, `${snapshot.remoteUrl}${url.pathname}${url.search}`);
36
36
  }
37
- const packageHash = await this.wcs.getPackagesHash();
38
37
  let pageReadyScript = "";
39
38
  // check if we have page-ready.js page...
40
39
  const hasReadyScript = await this.wcs.getSnapshotFile(snapshot, ["page-ready.js"]);
@@ -57,7 +56,7 @@ export default class default_1 extends Page {
57
56
  deviceScaleFactor = 1;
58
57
  }
59
58
  const [fileName = "preview.webp"] = this.childPath;
60
- const cacheKey = this.cacheKey + "-p" + packageHash;
59
+ const cacheKey = this.cacheKey;
61
60
  const key = `site-preview/${cacheKey}-${width}-${height}-${fileName}`;
62
61
  let output = "webp";
63
62
  let contentType = "image/webp";
@@ -83,6 +82,7 @@ export default class default_1 extends Page {
83
82
  height,
84
83
  mobile,
85
84
  deviceScaleFactor,
85
+ fileName,
86
86
  cacheKey,
87
87
  pageReadyScript,
88
88
  fullPage: true,
package/dist/wwwroot/routes/social-mail/site/preview/[host]/[type]/[cacheKey]/get.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"get.js","sourceRoot":"","sources":["../../../../../../../../../src/wwwroot/routes/social-mail/site/preview/[host]/[type]/[cacheKey]/get.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"get.js","sourceRoot":"","sources":["../../../../../../../../../src/wwwroot/routes/social-mail/site/preview/[host]/[type]/[cacheKey]/get.tsx"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@social-mail/social-mail-web-server",
3
- "version": "1.16.415",
3
+ "version": "1.16.418",
4
4
  "description": "## Phase 1",
5
5
  "main": "index.js",
6
6
  "type": "module",
package/src/server/services/files/web-content/WebUrl.ts CHANGED
@@ -1,23 +1,6 @@
1
- import { globalEnv } from "../../../../common/globalEnv.js";
2
- import WebSite from "../../../model/entities/WebSite.js";
3
1
 
4
2
  export default class WebUrl {
5
3
 
6
-
7
- static templatePreviewUrls(site: WebSite, hostName?) {
8
-
9
- const cdn = hostName || globalEnv.cdn;
10
- const { host } = site.hosts[0];
11
- const { currentVersionID } = site;
12
- const v = 10;
13
- const cv = `c${v.toString(36)}-${currentVersionID.toString(36)}`;
14
- return {
15
- preview: `https://${cdn}/social-mail/site/preview/${host}/desktop/${cv}/desktop-preview.webp`,
16
- previewMobile: `https://${cdn}/social-mail/site/preview/${host}/mobile/${cv}/mobile-preview.webp`,
17
- };
18
- }
19
-
20
-
21
4
  static sizeTransform(
22
5
  url: string,
23
6
  transform: string,
package/src/server/services/puppeteer/PuppeteerService.ts CHANGED
@@ -30,6 +30,7 @@ export default class PuppeteerService {
30
30
  deviceScaleFactor = mobile ? 2 : 1,
31
31
  pageReadyScript = void 0,
32
32
  output = "webp",
33
+ fileName = "w.webp",
33
34
  cacheKey = globalEnv.serverID,
34
35
  test = "true" as ("true" | "window.pageReady"),
35
36
  testDelay = 1000,
@@ -56,7 +57,8 @@ export default class PuppeteerService {
56
57
  testDelay: testDelay as any,
57
58
  timeout: timeout as any,
58
59
  pageEvalScript,
59
- output
60
+ output,
61
+ v: fileName
60
62
  });
61
63
 
62
64
  if(mobile) {
package/src/server/services/site/SitePreviewGenerator.ts ADDED
@@ -0,0 +1,23 @@
1
+ import Inject from "@entity-access/entity-access/dist/di/di.js";
2
+ import WebSiteContentService from "../files/WebSiteContentService.js";
3
+ import { globalEnv } from "../../../common/globalEnv.js";
4
+ import WebSite from "../../model/entities/WebSite.js";
5
+
6
+ export default class SitePreviewGenerator {
7
+
8
+ @Inject
9
+ wcs: WebSiteContentService;
10
+
11
+ async getPreviewUrls(site:WebSite, hostName?) {
12
+
13
+ const cdn = hostName || globalEnv.cdn;
14
+ const { host } = site.hosts[0];
15
+ const { currentVersionID } = site;
16
+ const v = await this.wcs.getPackagesHash();
17
+ const cv = `c${v}-${currentVersionID.toString(36)}`;
18
+ return {
19
+ preview: `https://${cdn}/social-mail/site/preview/${host}/desktop/${cv}/desktop-preview.webp`,
20
+ previewMobile: `https://${cdn}/social-mail/site/preview/${host}/mobile/${cv}/mobile-preview.webp`,
21
+ };
22
+ }
23
+ }
package/src/server/workflows/site/generate-previews/GenerateTemplatePreviewWorkflow.ts CHANGED
@@ -1,11 +1,11 @@
1
1
  import Inject from "@entity-access/entity-access/dist/di/di.js";
2
2
  import Workflow, { UniqueActivity } from "@entity-access/entity-access/dist/workflows/Workflow.js";
3
3
  import SocialMailContext from "../../../model/SocialMailContext.js";
4
- import WebUrl from "../../../services/files/web-content/WebUrl.js";
5
4
  import FetchBuilder from "@web-atoms/fetch-builder";
6
5
  import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
7
6
  import { globalEnv } from "../../../../common/globalEnv.js";
8
7
  import sleep from "../../../../common/sleep.js";
8
+ import SitePreviewGenerator from "../../../services/site/SitePreviewGenerator.js";
9
9
 
10
10
  export default class GenerateTemplatePreviewWorkflow extends Workflow {
11
11
 
@@ -22,7 +22,8 @@ export default class GenerateTemplatePreviewWorkflow extends Workflow {
22
22
  @UniqueActivity
23
23
  async generate(
24
24
  start,
25
- @Inject db?: SocialMailContext
25
+ @Inject db?: SocialMailContext,
26
+ @Inject spg?: SitePreviewGenerator
26
27
  ) {
27
28
  const templates = await db.websiteFolders
28
29
  .where({ start }, (x, p) => x.folderID > p.start
@@ -42,7 +43,7 @@ export default class GenerateTemplatePreviewWorkflow extends Workflow {
42
43
  if(!t.hosts?.length) {
43
44
  continue;
44
45
  }
45
- const { preview, previewMobile } = WebUrl.templatePreviewUrls(t);
46
+ const { preview, previewMobile } = await spg.getPreviewUrls(t);
46
47
  start = t.folderID;
47
48
  await this.generatePreview(preview);
48
49
  await this.generatePreview(previewMobile);
package/src/wwwroot/routes/social-mail/site/list/templates/get.tsx CHANGED
@@ -6,8 +6,8 @@ import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
6
6
  import { CORS } from "../../../../../../common/CORS.js";
7
7
  import SessionSecurity from "@entity-access/server-pages/dist/services/SessionSecurity.js";
8
8
  import EncryptionService from "../../../../../../server/services/encryption/EncryptionService.js";
9
- import WebUrl from "../../../../../../server/services/files/web-content/WebUrl.js";
10
9
  import type WebSite from "../../../../../../server/model/entities/WebSite.js";
10
+ import SitePreviewGenerator from "../../../../../../server/services/site/SitePreviewGenerator.js";
11
11
 
12
12
  export default class extends Page {
13
13
 
@@ -41,6 +41,9 @@ export default class extends Page {
41
41
  @Inject
42
42
  es: EncryptionService;
43
43
 
44
+ @Inject
45
+ spg: SitePreviewGenerator;
46
+
44
47
  async run() {
45
48
 
46
49
  let q = this.db.websiteFolders.where((x) => x.isTemplate === true);
@@ -83,18 +86,20 @@ export default class extends Page {
83
86
  .include((x) => [x.folder, x.currentVersion, x.hosts, x.webSiteTags.forEach((t) => t.tag)])
84
87
  .toPage(start, size);
85
88
 
86
- const items = list.items.map((x) => {
87
- const { host } = x.hosts[0];
88
- return {
89
- id: x.folderID,
90
- tags: x.webSiteTags?.map((t) => t.tag.name) ?? [],
91
- name: x.folder.name,
92
- title: x.title,
93
- host,
94
- ... WebUrl.templatePreviewUrls(x, this.withoutCdn ? this.request.hostName : void 0),
95
- url: `https://${host}`
96
- };
97
- });
89
+ const items = [] as { id, tags: string[], name: string, title: string, host: string, preview: string, previewMobile: string, url: string }[];
90
+
91
+ for(const x of list.items) {
92
+ const { host } = x.hosts[0];
93
+ items.push({
94
+ id: x.folderID,
95
+ tags: x.webSiteTags?.map((t) => t.tag.name) ?? [],
96
+ name: x.folder.name,
97
+ title: x.title,
98
+ host,
99
+ ... await this.spg.getPreviewUrls(x),
100
+ url: `https://${host}`
101
+ })
102
+ }
98
103
 
99
104
  const cacheSeconds = this.cacheSeconds || 900;
100
105
  this.cacheControl = `public, max-age=${cacheSeconds}`;
package/src/wwwroot/routes/social-mail/site/preview/[host]/[type]/[cacheKey]/get.tsx CHANGED
@@ -59,8 +59,6 @@ export default class extends Page {
59
59
  return await HttpProxyService.fetch(this, `${snapshot.remoteUrl}${url.pathname}${url.search}`);
60
60
  }
61
61
 
62
- const packageHash = await this.wcs.getPackagesHash();
63
-
64
62
  let pageReadyScript = "";
65
63
 
66
64
  // check if we have page-ready.js page...
@@ -90,7 +88,7 @@ export default class extends Page {
90
88
 
91
89
  const [ fileName = "preview.webp" ] = this.childPath as any[];
92
90
 
93
- const cacheKey = this.cacheKey + "-p" + packageHash;
91
+ const cacheKey = this.cacheKey;
94
92
 
95
93
  const key = `site-preview/${cacheKey}-${width}-${height}-${fileName}`;
96
94
 
@@ -123,6 +121,7 @@ export default class extends Page {
123
121
  height,
124
122
  mobile,
125
123
  deviceScaleFactor,
124
+ fileName,
126
125
  cacheKey,
127
126
  pageReadyScript,
128
127
  fullPage: true,
package/dist/wwwroot/routes/social-mail/site/list/[type]/get.d.ts DELETED
@@ -1,18 +0,0 @@
1
- import Page from "@entity-access/server-pages/dist/Page.js";
2
- import SocialMailContext from "../../../../../../server/model/SocialMailContext.js";
3
- import SessionSecurity from "@entity-access/server-pages/dist/services/SessionSecurity.js";
4
- import EncryptionService from "../../../../../../server/services/encryption/EncryptionService.js";
5
- export default class extends Page {
6
- db: SocialMailContext;
7
- tags: string;
8
- start: number;
9
- size: number;
10
- search: string;
11
- type: string;
12
- cacheSeconds: number;
13
- withoutCdn: string;
14
- sessionSecurity: SessionSecurity;
15
- es: EncryptionService;
16
- run(): Promise<import("@entity-access/server-pages/dist/Content.js").default>;
17
- }
18
- //# sourceMappingURL=get.d.ts.map
package/dist/wwwroot/routes/social-mail/site/list/[type]/get.d.ts.map DELETED
@@ -1 +0,0 @@
1
- {"version":3,"file":"get.d.ts","sourceRoot":"","sources":["../../../../../../../src/wwwroot/routes/social-mail/site/list/[type]/get.tsx"],"names":[],"mappings":"AACA,OAAO,IAAI,MAAM,0CAA0C,CAAC;AAC5D,OAAO,iBAAiB,MAAM,qDAAqD,CAAC;AAMpF,OAAO,eAAe,MAAM,8DAA8D,CAAC;AAE3F,OAAO,iBAAiB,MAAM,mEAAmE,CAAC;AAGlG,MAAM,CAAC,OAAO,MAAO,SAAQ,IAAI;IAG7B,EAAE,EAAE,iBAAiB,CAAC;IAGtB,IAAI,EAAE,MAAM,CAAC;IAGb,KAAK,EAAE,MAAM,CAAK;IAGlB,IAAI,EAAE,MAAM,CAAM;IAGlB,MAAM,EAAE,MAAM,CAAC;IAGf,IAAI,EAAE,MAAM,CAAC;IAGb,YAAY,EAAE,MAAM,CAAC;IAGrB,UAAU,EAAE,MAAM,CAAC;IAGnB,eAAe,EAAE,eAAe,CAAC;IAGjC,EAAE,EAAE,iBAAiB,CAAC;IAEhB,GAAG,2EAyIR;CACJ"}