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

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 (9) hide show
  1. package/dist/.tsbuildinfo +1 -1
  2. package/dist/server/seed/ui/seed-ui.js +1 -1
  3. package/dist/wwwroot/routes/social-mail/site/preview/[host]/[type]/[cacheKey]/get.d.ts +2 -0
  4. package/dist/wwwroot/routes/social-mail/site/preview/[host]/[type]/[cacheKey]/get.d.ts.map +1 -1
  5. package/dist/wwwroot/routes/social-mail/site/preview/[host]/[type]/[cacheKey]/get.js +17 -5
  6. package/dist/wwwroot/routes/social-mail/site/preview/[host]/[type]/[cacheKey]/get.js.map +1 -1
  7. package/package.json +1 -1
  8. package/src/server/seed/ui/seed-ui.ts +1 -1
  9. package/src/wwwroot/routes/social-mail/site/preview/[host]/[type]/[cacheKey]/get.tsx +17 -5
package/dist/server/seed/ui/seed-ui.js CHANGED
@@ -14,7 +14,7 @@ export default async function seedUI(config) {
14
14
  await config.saveVersion(UIPackageConfig, {
15
15
  package: "@social-mail/social-mail-client",
16
16
  view: "dist/web/AppIndex",
17
- version: "1.11.102"
17
+ version: "1.11.104"
18
18
  });
19
19
  await config.saveVersion(WebComponentsPackageConfig, {
20
20
  package: "@social-mail/web-components",
package/dist/wwwroot/routes/social-mail/site/preview/[host]/[type]/[cacheKey]/get.d.ts CHANGED
@@ -3,9 +3,11 @@ import WebSiteContentService from "../../../../../../../../server/services/files
3
3
  import CacheService from "../../../../../../../../server/services/cache/CacheService.js";
4
4
  import TempFileService from "../../../../../../../../server/storage/TempFileService.js";
5
5
  import PuppeteerService from "../../../../../../../../server/services/puppeteer/PuppeteerService.js";
6
+ import DBConfig from "../../../../../../../../server/services/DBConfig.js";
6
7
  export default class extends Page {
7
8
  wcs: WebSiteContentService;
8
9
  cacheService: CacheService;
10
+ config: DBConfig;
9
11
  tfs: TempFileService;
10
12
  puppeteerService: PuppeteerService;
11
13
  type: any;
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;AAOrG,MAAM,CAAC,OAAO,MAAO,SAAQ,IAAI;IAG7B,GAAG,EAAE,qBAAqB,CAAC;IAG3B,YAAY,EAAE,YAAY,CAAC;IAG3B,GAAG,EAAE,eAAe,CAAC;IAGrB,gBAAgB,EAAE,gBAAgB,CAAC;IAGnC,IAAI,MAAC;IAGL,QAAQ,MAAC;IAGT,IAAI,MAAC;IAGL,KAAK,MAAC;IAEA,GAAG,2EAwFR;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,2EAgGR;CACJ"}
package/dist/wwwroot/routes/social-mail/site/preview/[host]/[type]/[cacheKey]/get.js CHANGED
@@ -18,6 +18,7 @@ import CacheService from "../../../../../../../../server/services/cache/CacheSer
18
18
  import TimeSpan from "@entity-access/entity-access/dist/types/TimeSpan.js";
19
19
  import TempFileService from "../../../../../../../../server/storage/TempFileService.js";
20
20
  import PuppeteerService from "../../../../../../../../server/services/puppeteer/PuppeteerService.js";
21
+ import DBConfig, { UIPackageConfig } from "../../../../../../../../server/services/DBConfig.js";
21
22
  let port = globalEnv.puppeteer.port;
22
23
  if (/^\d+$/i.test(port)) {
23
24
  port = Number(port);
@@ -34,6 +35,16 @@ export default class default_1 extends Page {
34
35
  return await HttpProxyService.fetch(this, `${snapshot.remoteUrl}${url.pathname}${url.search}`);
35
36
  }
36
37
  const packageHash = await this.wcs.getPackagesHash();
38
+ let pageReadyScript = "";
39
+ // check if we have page-ready.js page...
40
+ const hasReadyScript = await this.wcs.getSnapshotFile(snapshot, ["page-ready.js"]);
41
+ if (hasReadyScript) {
42
+ pageReadyScript = "./page-ready.js";
43
+ }
44
+ else {
45
+ const uiPackage = await this.config.getValue(UIPackageConfig);
46
+ pageReadyScript = `https://cdn.jsdelivr.net/npm/${uiPackage.package}@${uiPackage.version}/content/preview-generator/page-ready.js`;
47
+ }
37
48
  let width = 1200;
38
49
  let height = 1536;
39
50
  let deviceScaleFactor = 1;
@@ -46,8 +57,8 @@ export default class default_1 extends Page {
46
57
  deviceScaleFactor = 1;
47
58
  }
48
59
  const [fileName = "preview.webp"] = this.childPath;
49
- const { cacheKey } = this;
50
- const key = `site-preview/${packageHash}/${cacheKey || ("c" + snapshot.snapshotFolderID)}-${width}-${height}-${fileName}`;
60
+ const cacheKey = this.cacheKey + "-p" + packageHash;
61
+ const key = `site-preview/${cacheKey}-${width}-${height}-${fileName}`;
51
62
  let output = "webp";
52
63
  let contentType = "image/webp";
53
64
  if (/\.png$/i.test(fileName)) {
@@ -62,9 +73,6 @@ export default class default_1 extends Page {
62
73
  if (snapshot.pageReadyDelayMS) {
63
74
  testDelay = snapshot.pageReadyDelayMS;
64
75
  }
65
- // check if we have page-ready.js page...
66
- const hasReadyScript = await this.wcs.getSnapshotFile(snapshot, ["page-ready.js"]);
67
- const pageReadyScript = hasReadyScript ? "./page-ready.js" : void 0;
68
76
  const cf = await this.cacheService.get({
69
77
  key,
70
78
  ttl: TimeSpan.fromDays(30),
@@ -100,6 +108,10 @@ __decorate([
100
108
  Inject,
101
109
  __metadata("design:type", CacheService)
102
110
  ], default_1.prototype, "cacheService", void 0);
111
+ __decorate([
112
+ Inject,
113
+ __metadata("design:type", DBConfig)
114
+ ], default_1.prototype, "config", void 0);
103
115
  __decorate([
104
116
  Inject,
105
117
  __metadata("design:type", TempFileService)
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.413",
3
+ "version": "1.16.415",
4
4
  "description": "## Phase 1",
5
5
  "main": "index.js",
6
6
  "type": "module",
package/src/server/seed/ui/seed-ui.ts CHANGED
@@ -17,7 +17,7 @@ export default async function seedUI(config: DBConfig) {
17
17
  await config.saveVersion(UIPackageConfig, {
18
18
  package: "@social-mail/social-mail-client",
19
19
  view: "dist/web/AppIndex",
20
- version: "1.11.102"
20
+ version: "1.11.104"
21
21
  });
22
22
 
23
23
  await config.saveVersion(WebComponentsPackageConfig, {
package/src/wwwroot/routes/social-mail/site/preview/[host]/[type]/[cacheKey]/get.tsx CHANGED
@@ -9,6 +9,7 @@ import CacheService from "../../../../../../../../server/services/cache/CacheSer
9
9
  import TimeSpan from "@entity-access/entity-access/dist/types/TimeSpan.js";
10
10
  import TempFileService from "../../../../../../../../server/storage/TempFileService.js";
11
11
  import PuppeteerService from "../../../../../../../../server/services/puppeteer/PuppeteerService.js";
12
+ import DBConfig, { UIPackageConfig } from "../../../../../../../../server/services/DBConfig.js";
12
13
 
13
14
  let port = globalEnv.puppeteer.port as any;
14
15
  if (/^\d+$/i.test(port)) {
@@ -23,6 +24,9 @@ export default class extends Page {
23
24
  @Inject
24
25
  cacheService: CacheService;
25
26
 
27
+ @Inject
28
+ config: DBConfig;
29
+
26
30
  @Inject
27
31
  tfs: TempFileService;
28
32
 
@@ -57,6 +61,17 @@ export default class extends Page {
57
61
 
58
62
  const packageHash = await this.wcs.getPackagesHash();
59
63
 
64
+ let pageReadyScript = "";
65
+
66
+ // check if we have page-ready.js page...
67
+ const hasReadyScript = await this.wcs.getSnapshotFile(snapshot, ["page-ready.js"]);
68
+ if(hasReadyScript) {
69
+ pageReadyScript = "./page-ready.js";
70
+ } else {
71
+ const uiPackage = await this.config.getValue(UIPackageConfig);
72
+ pageReadyScript = `https://cdn.jsdelivr.net/npm/${uiPackage.package}@${uiPackage.version}/content/preview-generator/page-ready.js`;
73
+ }
74
+
60
75
 
61
76
  let width = 1200 as any;
62
77
  let height = 1536 as any;
@@ -75,9 +90,9 @@ export default class extends Page {
75
90
 
76
91
  const [ fileName = "preview.webp" ] = this.childPath as any[];
77
92
 
78
- const { cacheKey } = this;
93
+ const cacheKey = this.cacheKey + "-p" + packageHash;
79
94
 
80
- const key = `site-preview/${packageHash}/${cacheKey || ("c" + snapshot.snapshotFolderID)}-${width}-${height}-${fileName}`;
95
+ const key = `site-preview/${cacheKey}-${width}-${height}-${fileName}`;
81
96
 
82
97
  let output = "webp";
83
98
  let contentType = "image/webp";
@@ -95,9 +110,6 @@ export default class extends Page {
95
110
  testDelay = snapshot.pageReadyDelayMS;
96
111
  }
97
112
 
98
- // check if we have page-ready.js page...
99
- const hasReadyScript = await this.wcs.getSnapshotFile(snapshot, ["page-ready.js"]);
100
- const pageReadyScript = hasReadyScript ? "./page-ready.js" : void 0;
101
113
 
102
114
  const cf = await this.cacheService.get({
103
115
  key,