@social-mail/social-mail-web-server 1.7.697 → 1.7.699

package/src/wwwroot/routes/social-mail/site/preview/get.tsx

@@ -11,43 +11,27 @@ import HttpProxyService from "../../../../../server/services/http/HttpProxyServi
 import SiteDiskContentCache from "../../../../../server/services/files/SiteDiskContentCache.js";
 import LockFile from "../../../../../server/storage/LockFile.js";
 import { Route } from "@entity-access/server-pages/dist/core/Route.js";
+import PuppeteerService from "../../../../../server/services/puppeteer/PuppeteerService.js";
 
 let port = globalEnv.puppeteer.port as any;
 if (/^\d+$/i.test(port)) {
     port = Number(port);
 }
 
-const dispatcher = new Agent({
-    connect: (options, callback) => {
-        try {
-            const s= connect({
-                port,
-                host: globalEnv.puppeteer.host
-            }, () => callback(null, s));
-            s.on("error", (e) => {
-                console.error(e);
-                callback(e, null);
-            });
-        } catch (error) {
-            callback(error, null);
-        }
-    }
-});
-
 export default class extends Page {
 
     @Inject
     wcs: WebSiteContentService;
 
-    @Inject
-    siteCache: SiteDiskContentCache;
-
     @Query("mobile")
     mobile;
 
     @Query("cache-key")
     cacheKey;
 
+    @Inject
+    puppeteerService: PuppeteerService;
+
     async run() {
 
         const snapshot = await this.wcs.getCurrentSnapshotFolder(this.request.hostName);
@@ -73,31 +57,15 @@ export default class extends Page {
             deviceScaleFactor = 2;
         }
 
-        const key = `${snapshot.snapshotFolderID}/${this.cacheKey || "default"}-${width}-${height}-preview-1.png`;
-
-        const file = await this.siteCache.htmlCache.getOrCreateAsync(key, async (lf) => {
-
-            using _ = await LockFile.lock("puppeteer-preview-generator");
-
-            const query = new URLSearchParams({
-                url: `https://${this.request.hostName}`,
-                width,
-                height,
-                deviceScaleFactor,
-                output: "webp"
-            });
-
-            const r = await fetch(`http://localhost/screen-shot?${query.toString()}`, {
-                dispatcher
-            });
-
-            if(r.status !== 200) {
-                throw new Error(await r.text());
-            }
-
-            const buffer = Buffer.from( await r.arrayBuffer());
+        const packageHash = await this.wcs.getPackagesHash();
 
-            await lf.writeAll(buffer);
+        const file = await this.puppeteerService.generate({
+            width,
+            height,
+            deviceScaleFactor,
+            packageHash,
+            url: `https://${this.request.hostName}`,
+            output: "webp"
         });
 
         const [ fileName = "preview.webp" ] = this.childPath as any[];

package/src/wwwroot/routes/social-mail/site/templates/list/get.tsx

@@ -23,6 +23,9 @@ export default class extends Page {
     @Query("search")
     search: string;
 
+    @Query.caseInsensitiveAsBoolean
+    withoutCdn: string;
+
     async run() {
 
         if (!/^(www\.)?esocialmail.com$/i.test(this.request.hostName)) {
@@ -68,17 +71,20 @@ export default class extends Page {
             .include((x) => [x.folder, x.hosts, x.webSiteTags.forEach((t) => t.tag)])
             .toArray();
 
+        const cdn = this.withoutCdn
+            ? this.request.hostName
+            : globalEnv.cdn ?? this.request.hostName;
+
         const items = list.map((x) => {
             const { host } = x.hosts[0];
-            const cdn = globalEnv.cdn ?? this.request.hostName;
             const { currentVersionID } = x;
             return {
                 id: x.folderID,
                 tags: x.webSiteTags?.map((t) => t.tag.name) ?? [],
                 name: x.folder.name,
                 host,
-                preview: `https://${cdn}/social-mail/site/templates/preview/${host}/desktop/c2-${currentVersionID}/desktop-preview-1.webp`,
-                previewMobile: `https://${cdn}/social-mail/site/templates/preview/${host}/mobile/c2-${currentVersionID}/desktop-preview-1.webp`,
+                preview: `https://${cdn}/social-mail/site/templates/preview/${host}/desktop/c4-${currentVersionID}/desktop-preview-1.webp`,
+                previewMobile: `https://${cdn}/social-mail/site/templates/preview/${host}/mobile/c4-${currentVersionID}/desktop-preview-1.webp`,
                 url: `https://${host}`
             };
         });

package/src/wwwroot/routes/social-mail/site/templates/preview/[host]/[type]/[cacheKey]/get.tsx

@@ -14,43 +14,27 @@ import CacheService from "../../../../../../../../../server/services/cache/Cache
 import TimeSpan from "@entity-access/entity-access/dist/types/TimeSpan.js";
 import TempFileService from "../../../../../../../../../server/storage/TempFileService.js";
 import { Retry } from "../../../../../../../../../common/Retry.js";
+import PuppeteerService from "../../../../../../../../../server/services/puppeteer/PuppeteerService.js";
 
 let port = globalEnv.puppeteer.port as any;
 if (/^\d+$/i.test(port)) {
     port = Number(port);
 }
 
-const dispatcher = new Agent({
-    connect: (options, callback) => {
-        try {
-            const s= connect({
-                port,
-                host: globalEnv.puppeteer.host
-            }, () => callback(null, s));
-            s.on("error", (e) => {
-                console.error(e);
-                callback(e, null);
-            });
-        } catch (error) {
-            callback(error, null);
-        }
-    }
-});
-
 export default class extends Page {
 
     @Inject
     wcs: WebSiteContentService;
 
-    @Inject
-    siteCache: SiteDiskContentCache;
-
     @Inject
     cacheService: CacheService;
 
     @Inject
     tfs: TempFileService;
 
+    @Inject
+    puppeteerService: PuppeteerService;
+
     @Route("type")
     type;
 
@@ -97,31 +81,17 @@ export default class extends Page {
             ttl: TimeSpan.fromDays(30),
             factory: (c) => Retry.retry(async () => {
 
-                using _ = await LockFile.lock("puppeteer-preview-generator");
+                const url = `https://${this.host}`;
 
-                const query = new URLSearchParams({
-                    url: `https://${this.host}`,
+                return await this.puppeteerService.generate({
                     width,
                     height,
                     deviceScaleFactor,
+                    packageHash,
+                    url,
                     output: "webp"
                 });
 
-                const r = await fetch(`http://localhost/screen-shot?${query.toString()}`, {
-                    dispatcher
-                });
-
-                if (r.status >= 399) {
-                    throw new Error(await r.text());
-                }
-
-                const buffer = Buffer.from( await r.arrayBuffer());
-
-                const lf = await this.tfs.createTempFile(".webp", "preview.webp", "image/webp");
-
-                await lf.writeAll(buffer);
-
-                return lf;
             })
         });