@social-mail/social-mail-web-server 1.8.474 → 1.8.476

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 (11) hide show
  1. package/dist/server/services/puppeteer/PuppeteerService.d.ts +3 -5
  2. package/dist/server/services/puppeteer/PuppeteerService.d.ts.map +1 -1
  3. package/dist/server/services/puppeteer/PuppeteerService.js +7 -15
  4. package/dist/server/services/puppeteer/PuppeteerService.js.map +1 -1
  5. package/dist/tsconfig.tsbuildinfo +1 -1
  6. package/dist/wwwroot/routes/store/journals/[journalID]/pdf/get.d.ts.map +1 -1
  7. package/dist/wwwroot/routes/store/journals/[journalID]/pdf/get.js +4 -2
  8. package/dist/wwwroot/routes/store/journals/[journalID]/pdf/get.js.map +1 -1
  9. package/package.json +1 -1
  10. package/src/server/services/puppeteer/PuppeteerService.ts +8 -16
  11. package/src/wwwroot/routes/store/journals/[journalID]/pdf/get.tsx +5 -2
package/dist/wwwroot/routes/store/journals/[journalID]/pdf/get.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"get.d.ts","sourceRoot":"","sources":["../../../../../../../src/wwwroot/routes/store/journals/[journalID]/pdf/get.tsx"],"names":[],"mappings":"AAEA,OAAO,IAAI,MAAM,0CAA0C,CAAC;AAC5D,OAAO,iBAAiB,MAAM,qDAAqD,CAAC;AACpF,OAAO,gBAAgB,MAAM,iEAAiE,CAAC;AAC/F,OAAO,EAAE,cAAc,EAAE,MAAM,6CAA6C,CAAC;AAE7E,MAAM,CAAC,OAAO,MAAO,SAAQ,IAAI;IAG7B,EAAE,EAAE,iBAAiB,CAAC;IAGtB,gBAAgB,EAAE,gBAAgB,CAAC;IAGnC,SAAS,EAAE,GAAG,CAAC;IAET,GAAG;CAqBZ"}
1
+ {"version":3,"file":"get.d.ts","sourceRoot":"","sources":["../../../../../../../src/wwwroot/routes/store/journals/[journalID]/pdf/get.tsx"],"names":[],"mappings":"AAEA,OAAO,IAAI,MAAM,0CAA0C,CAAC;AAC5D,OAAO,iBAAiB,MAAM,qDAAqD,CAAC;AACpF,OAAO,gBAAgB,MAAM,iEAAiE,CAAC;AAC/F,OAAO,EAAE,cAAc,EAAE,MAAM,6CAA6C,CAAC;AAE7E,MAAM,CAAC,OAAO,MAAO,SAAQ,IAAI;IAG7B,EAAE,EAAE,iBAAiB,CAAC;IAGtB,gBAAgB,EAAE,gBAAgB,CAAC;IAGnC,SAAS,EAAE,GAAG,CAAC;IAET,GAAG;CAwBZ"}
package/dist/wwwroot/routes/store/journals/[journalID]/pdf/get.js CHANGED
@@ -18,10 +18,12 @@ export default class default_1 extends Page {
18
18
  const { journalID } = this;
19
19
  const journal = await this.db.storeJournals.statements.select({}, { journalID });
20
20
  const fileName = `${journal.invoiceID}.pdf`;
21
+ const domain = this.request.URL.hostname;
21
22
  const file = await this.puppeteerService.generate({
22
- url: `https://${this.request.URL.hostname}/store/journals/${journalID}`,
23
+ url: `https://${domain}/store/journals/${journalID}`,
23
24
  output: "pdf",
24
- test: "window.pageReady"
25
+ test: "window.pageReady",
26
+ page: this
25
27
  });
26
28
  return new TempFileResult(file, {
27
29
  contentDisposition: "inline",
package/dist/wwwroot/routes/store/journals/[journalID]/pdf/get.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"get.js","sourceRoot":"","sources":["../../../../../../../src/wwwroot/routes/store/journals/[journalID]/pdf/get.tsx"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,MAAM,MAAM,4CAA4C,CAAC;AAChE,OAAO,EAAE,KAAK,EAAE,MAAM,gDAAgD,CAAC;AACvE,OAAO,IAAI,MAAM,0CAA0C,CAAC;AAC5D,OAAO,iBAAiB,MAAM,qDAAqD,CAAC;AACpF,OAAO,gBAAgB,MAAM,iEAAiE,CAAC;AAC/F,OAAO,EAAE,cAAc,EAAE,MAAM,6CAA6C,CAAC;AAE7E,MAAM,CAAC,OAAO,gBAAO,SAAQ,IAAI;IAW7B,KAAK,CAAC,GAAG;QAEL,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC;QAE3B,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,aAAa,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,EAAG,EAAE,SAAS,EAAE,CAAC,CAAC;QAElF,MAAM,QAAQ,GAAG,GAAG,OAAO,CAAC,SAAS,MAAM,CAAC;QAE5C,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC;YAC9C,GAAG,EAAE,WAAW,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,mBAAmB,SAAS,EAAE;YACvE,MAAM,EAAE,KAAK;YACb,IAAI,EAAE,kBAAkB;SAC3B,CAAC,CAAC;QAGH,OAAO,IAAI,cAAc,CAAC,IAAI,EAAE;YAC5B,kBAAkB,EAAE,QAAQ;YAC5B,QAAQ;YACR,WAAW,EAAE,iBAAiB;SACjC,CAAC,CAAC;IACP,CAAC;CACJ;AA7BG;IADC,MAAM;8BACH,iBAAiB;qCAAC;AAGtB;IADC,MAAM;8BACW,gBAAgB;mDAAC;AAGnC;IADC,KAAK,CAAC,WAAW,CAAC;;4CACJ"}
1
+ {"version":3,"file":"get.js","sourceRoot":"","sources":["../../../../../../../src/wwwroot/routes/store/journals/[journalID]/pdf/get.tsx"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,MAAM,MAAM,4CAA4C,CAAC;AAChE,OAAO,EAAE,KAAK,EAAE,MAAM,gDAAgD,CAAC;AACvE,OAAO,IAAI,MAAM,0CAA0C,CAAC;AAC5D,OAAO,iBAAiB,MAAM,qDAAqD,CAAC;AACpF,OAAO,gBAAgB,MAAM,iEAAiE,CAAC;AAC/F,OAAO,EAAE,cAAc,EAAE,MAAM,6CAA6C,CAAC;AAE7E,MAAM,CAAC,OAAO,gBAAO,SAAQ,IAAI;IAW7B,KAAK,CAAC,GAAG;QAEL,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC;QAE3B,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,aAAa,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,EAAG,EAAE,SAAS,EAAE,CAAC,CAAC;QAElF,MAAM,QAAQ,GAAG,GAAG,OAAO,CAAC,SAAS,MAAM,CAAC;QAE5C,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC;QAEzC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC;YAC9C,GAAG,EAAE,WAAW,MAAM,mBAAmB,SAAS,EAAE;YACpD,MAAM,EAAE,KAAK;YACb,IAAI,EAAE,kBAAkB;YACxB,IAAI,EAAE,IAAI;SACb,CAAC,CAAC;QAGH,OAAO,IAAI,cAAc,CAAC,IAAI,EAAE;YAC5B,kBAAkB,EAAE,QAAQ;YAC5B,QAAQ;YACR,WAAW,EAAE,iBAAiB;SACjC,CAAC,CAAC;IACP,CAAC;CACJ;AAhCG;IADC,MAAM;8BACH,iBAAiB;qCAAC;AAGtB;IADC,MAAM;8BACW,gBAAgB;mDAAC;AAGnC;IADC,KAAK,CAAC,WAAW,CAAC;;4CACJ"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@social-mail/social-mail-web-server",
3
- "version": "1.8.474",
3
+ "version": "1.8.476",
4
4
  "description": "## Phase 1",
5
5
  "main": "index.js",
6
6
  "type": "module",
package/src/server/services/puppeteer/PuppeteerService.ts CHANGED
@@ -5,8 +5,8 @@ import { hash } from "crypto";
5
5
  import { globalEnv } from "../../../common/globalEnv.js";
6
6
  import LockFile from "../../storage/LockFile.js";
7
7
  import SiteDiskContentCache from "../files/SiteDiskContentCache.js";
8
- import Page from "@entity-access/server-pages/dist/Page.js";
9
8
  import AuthorizationService from "@entity-access/server-pages/dist/services/AuthorizationService.js";
9
+ import Page from "@entity-access/server-pages/dist/Page.js";
10
10
 
11
11
  let port = globalEnv.puppeteer.port as any;
12
12
  if (/^\d+$/i.test(port)) {
@@ -19,9 +19,6 @@ export default class PuppeteerService {
19
19
  @Inject
20
20
  siteCache: SiteDiskContentCache;
21
21
 
22
- @Inject
23
- page: Page;
24
-
25
22
  @Inject
26
23
  authService: AuthorizationService;
27
24
 
@@ -36,12 +33,15 @@ export default class PuppeteerService {
36
33
  test = "true" as ("true" | "window.pageReady"),
37
34
  testDelay = 1000,
38
35
  timeout = 15000,
39
- sendCookies = true,
36
+ page = void 0 as Page
40
37
  }) {
41
38
 
42
- const u = new URL(url);
43
-
44
- const cookies = sendCookies ? this.getCookies(u.hostname) : "";
39
+ const pageCookies = page?.request?.cookies;
40
+ let cookies = void 0;
41
+ if (pageCookies) {
42
+ const domain = page.request.URL.hostname;
43
+ cookies = JSON.stringify(Object.entries(pageCookies).map(([name, value]) => ({ name, value, domain, httpOnly: true, secure: true })));
44
+ }
45
45
 
46
46
  const key = `previews/${packageHash}/${mobile? "mobile" : "desktop"}/preview-${hash("sha256", url + "&cookies=" + cookies, "hex")}.${output}`;
47
47
 
@@ -96,12 +96,4 @@ export default class PuppeteerService {
96
96
 
97
97
  }
98
98
 
99
- getCookies(domain): string {
100
- const cookies = this.page?.request.cookies;
101
- if (!cookies) {
102
- return void 0;
103
- }
104
- return JSON.stringify(Object.entries(cookies).map(([name, value]) => ({ name, value, domain, httpOnly: true, secure: true })));
105
- }
106
-
107
99
  }
package/src/wwwroot/routes/store/journals/[journalID]/pdf/get.tsx CHANGED
@@ -24,10 +24,13 @@ export default class extends Page {
24
24
 
25
25
  const fileName = `${journal.invoiceID}.pdf`;
26
26
 
27
+ const domain = this.request.URL.hostname;
28
+
27
29
  const file = await this.puppeteerService.generate({
28
- url: `https://${this.request.URL.hostname}/store/journals/${journalID}`,
30
+ url: `https://${domain}/store/journals/${journalID}`,
29
31
  output: "pdf",
30
- test: "window.pageReady"
32
+ test: "window.pageReady",
33
+ page: this
31
34
  });
32
35
 
33
36