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

package/package.json

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

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

@@ -1,22 +1,30 @@
 /* eslint-disable no-console */
-import Inject, { RegisterSingleton } from "@entity-access/entity-access/dist/di/di.js";
+import Inject, { RegisterScoped } from "@entity-access/entity-access/dist/di/di.js";
 import { fetch } from "undici";
 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";
 
 let port = globalEnv.puppeteer.port as any;
 if (/^\d+$/i.test(port)) {
     port = Number(port);
 }
 
-@RegisterSingleton
+@RegisterScoped
 export default class PuppeteerService {
 
     @Inject
     siteCache: SiteDiskContentCache;
 
+    @Inject
+    page: Page;
+
+    @Inject
+    authService: AuthorizationService;
+
     async generate({
         url,
         mobile = false,
@@ -27,10 +35,15 @@ export default class PuppeteerService {
         packageHash = globalEnv.serverID,
         test = "true" as ("true" | "window.pageReady"),
         testDelay = 1000,
-        timeout = 15000
+        timeout = 15000,
+        sendCookies = true,
     }) {
 
-        const key = `previews/${packageHash}/${mobile? "mobile" : "desktop"}/preview-${hash("sha256", url, "hex")}.${output}`;
+        const u = new URL(url);
+
+        const cookies = sendCookies ? this.getCookies(u.hostname) : "";
+
+        const key = `previews/${packageHash}/${mobile? "mobile" : "desktop"}/preview-${hash("sha256", url + "&cookies=" + cookies, "hex")}.${output}`;
 
         const file = await this.siteCache.htmlCache.getOrCreateAsync(key, async (lf) => {
 
@@ -45,6 +58,7 @@ export default class PuppeteerService {
                 test,
                 testDelay: testDelay as any,
                 timeout: timeout as any,
+                cookies,
                 output
             });
 
@@ -82,4 +96,12 @@ 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 })));
+    }
+
 }