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

package/dist/wwwroot/routes/store/journals/[journalID]/pdf/get.d.ts.map

@@ -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"}
+{"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

@@ -18,10 +18,12 @@ export default class default_1 extends Page {
         const { journalID } = this;
         const journal = await this.db.storeJournals.statements.select({}, { journalID });
         const fileName = `${journal.invoiceID}.pdf`;
+        const domain = this.request.URL.hostname;
         const file = await this.puppeteerService.generate({
-            url: `https://${this.request.URL.hostname}/store/journals/${journalID}`,
+            url: `https://${domain}/store/journals/${journalID}`,
             output: "pdf",
-            test: "window.pageReady"
+            test: "window.pageReady",
+            page: this
         });
         return new TempFileResult(file, {
             contentDisposition: "inline",

package/dist/wwwroot/routes/store/journals/[journalID]/pdf/get.js.map

@@ -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"}
+{"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

@@ -1,6 +1,6 @@
 {
   "name": "@social-mail/social-mail-web-server",
-  "version": "1.8.474",
+  "version": "1.8.477",
   "description": "## Phase 1",
   "main": "index.js",
   "type": "module",

package/src/server/services/puppeteer/PuppeteerService.ts

@@ -5,8 +5,8 @@ import { hash } from "crypto";
 import { globalEnv } from "../../../common/globalEnv.js";
 import LockFile from "../../storage/LockFile.js";
 import SiteDiskContentCache from "../files/SiteDiskContentCache.js";
-import Page from "@entity-access/server-pages/dist/Page.js";
 import AuthorizationService from "@entity-access/server-pages/dist/services/AuthorizationService.js";
+import Page from "@entity-access/server-pages/dist/Page.js";
 
 let port = globalEnv.puppeteer.port as any;
 if (/^\d+$/i.test(port)) {
@@ -19,9 +19,6 @@ export default class PuppeteerService {
     @Inject
     siteCache: SiteDiskContentCache;
 
-    @Inject
-    page: Page;
-
     @Inject
     authService: AuthorizationService;
 
@@ -36,12 +33,15 @@ export default class PuppeteerService {
         test = "true" as ("true" | "window.pageReady"),
         testDelay = 1000,
         timeout = 15000,
-        sendCookies = true,
+        page = void 0 as Page
     }) {
 
-        const u = new URL(url);
-
-        const cookies = sendCookies ? this.getCookies(u.hostname) : "";
+        const pageCookies = page?.request?.cookies;
+        let cookies = void 0;
+        if (pageCookies) {
+            const domain = page.request.URL.hostname;
+            cookies = JSON.stringify(Object.entries(pageCookies).map(([name, value]) => ({ name, value, domain, httpOnly: true, secure: true })));
+        }
 
         const key = `previews/${packageHash}/${mobile? "mobile" : "desktop"}/preview-${hash("sha256", url + "&cookies=" + cookies, "hex")}.${output}`;
 
@@ -96,12 +96,4 @@ export default class PuppeteerService {
 
     }
 
-    getCookies(domain): string {
-        const cookies = this.page?.request.cookies;
-        if (!cookies) {
-            return void 0;
-        }
-        return JSON.stringify(Object.entries(cookies).map(([name, value]) => ({ name, value, domain, httpOnly: true, secure: true })));
-    }
-
 }

package/src/server/services/push-notifications/web-push/WebPushService.ts

@@ -45,7 +45,7 @@ export default class WebPushService extends BasePushService {
 
         const c = this.pushConfig;
 
-        const pushService = JSON.parse(deviceToken);
+        const pushService = typeof deviceToken === "string" ? JSON.parse(deviceToken) : deviceToken;
         await WebPush.sendNotification(
             pushService,
             JSON.stringify(payload), {

package/src/wwwroot/routes/store/journals/[journalID]/pdf/get.tsx

@@ -24,10 +24,13 @@ export default class extends Page {
 
         const fileName = `${journal.invoiceID}.pdf`;
 
+        const domain = this.request.URL.hostname;
+
         const file = await this.puppeteerService.generate({
-            url: `https://${this.request.URL.hostname}/store/journals/${journalID}`,
+            url: `https://${domain}/store/journals/${journalID}`,
             output: "pdf",
-            test: "window.pageReady"
+            test: "window.pageReady",
+            page: this
         });