@social-mail/social-mail-web-server 1.5.455 → 1.7.2

package/src/wwwroot/routes/social-mail/social/buttons-3x/get.tsx

@@ -1,147 +1,147 @@
-import Inject, { ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";
-import Content, { TempFileResult } from "@entity-access/server-pages/dist/Content.js";
-import Page from "@entity-access/server-pages/dist/Page.js";
-import CacheService from "../../../../../server/services/cache/CacheService.js";
-import TimeSpan from "@entity-access/entity-access/dist/types/TimeSpan.js";
-import SocialMailContext from "../../../../../server/model/SocialMailContext.js";
-import CachedEmailService from "../../../../../server/smtp/services/CachedEmailService.js";
-import { Base36 } from "../../../../../common/Base36.js";
-import { toKMBString } from "../../../../../common/NumberFormats.js";
-import { PuppeteerService } from "../../../../../server/services/puppeteer/PuppeteerService.js";
-import TempFileService from "../../../../../server/storage/TempFileService.js";
-
-/**
- * Social Buttons URL Pattern
- *
- * /social-mail/social/buttons-3x/{method}/{selector}/{emailID}/{activityID}
- *
- * method: can be track or any unicode emoji that will be considered as an engagement.
- *
- * selector: unique selector button that will be converted to PNG
- *
- * emailID: email id of the email, Base36 encoded.
- *
- * activityID: activity id of subscription activity to track activity/engagement of specific subscriber.
- *      We are not going to use subscriberID as each activityID will be unique and it will be new for
- *      new email.
- */
-export default class SocialButtonPage extends Page {
-
-    @Inject
-    private cacheService: CacheService;
-
-    @Inject
-    private cachedEmailService: CachedEmailService;
-
-    @Inject
-    private db: SocialMailContext;
-
-    async run() {
-
-        const [method, selector, emailIDEncoded, activityID] = this.childPath;
-
-        let emailID = emailIDEncoded;
-
-        if (!/^\$/.test(emailID)) {
-            emailID = Base36.decode(emailID, false);
-        }
-
-        const key = `buttons/${method}/${emailID}`;
-
-        /**
-         * why do we need to cache this?
-         *
-         * It is to avoid putting load on puppeteer service.
-         * As rendering html to png will require significant cpu and network
-         * resources, as styles can reference any external images.
-         */
-
-        // const file = await this.cacheService.get({
-        //     key, factory: () => this.createImage(method, selector, emailID, activityID),
-        //     ttl: TimeSpan.fromSeconds(8600)
-        // });
-
-        const file = await this.createImage(method, selector, emailID, activityID);
-
-        this.cacheControl = "public, max-age=8600";
-
-        return new TempFileResult(file, {});
-    }
-
-    async createImage(method: string, selector, emailID, activityID) {
-        const db = ServiceProvider.resolve(this, SocialMailContext);
-        const puppeteerService = ServiceProvider.resolve(this, PuppeteerService);
-        const tempFileService = ServiceProvider.resolve(this, TempFileService);
-
-        let count: string;
-
-        if (method === "track") {
-            count = await this.track(emailID, activityID);
-        } else {
-            const engagement = decodeURIComponent(method);
-            // console.log(`Search for engagement ${engagement} in ${emailID}`);
-            const ec = await this.db.emailEngagements
-                .where({ emailID, engagement }, (p) => (x) => x.emailID === p.emailID && x.engagement === p.engagement)
-                .first();
-
-            if (ec?.count) {
-                count = toKMBString(ec.count);
-            }
-        }
-
-        count ??= "";
-
-        const html = await this.getHtmlBody(emailID);
-
-        const png = await tempFileService.createTempFile(".png", "button.png", "image/png");
-        await puppeteerService.htmlToPng(html, { deviceScaleFactor: 3, selector, outputFile: png.path, count });
-        return png;
-    }
-
-    async getHtmlBody(emailID: any) {
-
-        const email = await this.db.emails
-            .where({ emailID }, (p) => (x) => x.emailID === p.emailID)
-            .first();
-
-        if (email.htmlBody) {
-            return email.htmlBody;
-        }
-
-        const file = await this.cachedEmailService.getHtml(emailID);
-        return await file.readAsText();
-    }
-
-    async track(emailID: any, activityID: any) {
-
-        const ep = { emailID };
-        const isValidActivityID = !/^\$/.test(activityID);
-        if (isValidActivityID) {
-            const activity = await this.db.subscriberActivities
-            .where({
-                activityID: Base36.decode(activityID, false) ?? 0,
-                emailID
-            }, (p) => (x) => x.activityID === p.activityID && x.emailID === p.emailID)
-            .first();
+// import Inject, { ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";
+// import Content, { TempFileResult } from "@entity-access/server-pages/dist/Content.js";
+// import Page from "@entity-access/server-pages/dist/Page.js";
+// import CacheService from "../../../../../server/services/cache/CacheService.js";
+// import TimeSpan from "@entity-access/entity-access/dist/types/TimeSpan.js";
+// import SocialMailContext from "../../../../../server/model/SocialMailContext.js";
+// import CachedEmailService from "../../../../../server/smtp/services/CachedEmailService.js";
+// import { Base36 } from "../../../../../common/Base36.js";
+// import { toKMBString } from "../../../../../common/NumberFormats.js";
+// // import { PuppeteerService } from "../../../../../server/services/puppeteer/PuppeteerService.js";
+// import TempFileService from "../../../../../server/storage/TempFileService.js";
+
+// /**
+//  * Social Buttons URL Pattern
+//  *
+//  * /social-mail/social/buttons-3x/{method}/{selector}/{emailID}/{activityID}
+//  *
+//  * method: can be track or any unicode emoji that will be considered as an engagement.
+//  *
+//  * selector: unique selector button that will be converted to PNG
+//  *
+//  * emailID: email id of the email, Base36 encoded.
+//  *
+//  * activityID: activity id of subscription activity to track activity/engagement of specific subscriber.
+//  *      We are not going to use subscriberID as each activityID will be unique and it will be new for
+//  *      new email.
+//  */
+// export default class SocialButtonPage extends Page {
+
+//     @Inject
+//     private cacheService: CacheService;
+
+//     @Inject
+//     private cachedEmailService: CachedEmailService;
+
+//     @Inject
+//     private db: SocialMailContext;
+
+//     async run() {
+
+//         const [method, selector, emailIDEncoded, activityID] = this.childPath;
+
+//         let emailID = emailIDEncoded;
+
+//         if (!/^\$/.test(emailID)) {
+//             emailID = Base36.decode(emailID, false);
+//         }
+
+//         const key = `buttons/${method}/${emailID}`;
+
+//         /**
+//          * why do we need to cache this?
+//          *
+//          * It is to avoid putting load on puppeteer service.
+//          * As rendering html to png will require significant cpu and network
+//          * resources, as styles can reference any external images.
+//          */
+
+//         // const file = await this.cacheService.get({
+//         //     key, factory: () => this.createImage(method, selector, emailID, activityID),
+//         //     ttl: TimeSpan.fromSeconds(8600)
+//         // });
+
+//         const file = await this.createImage(method, selector, emailID, activityID);
+
+//         this.cacheControl = "public, max-age=8600";
+
+//         return new TempFileResult(file, {});
+//     }
+
+//     async createImage(method: string, selector, emailID, activityID) {
+//         const db = ServiceProvider.resolve(this, SocialMailContext);
+//         const puppeteerService = ServiceProvider.resolve(this, PuppeteerService);
+//         const tempFileService = ServiceProvider.resolve(this, TempFileService);
+
+//         let count: string;
+
+//         if (method === "track") {
+//             count = await this.track(emailID, activityID);
+//         } else {
+//             const engagement = decodeURIComponent(method);
+//             // console.log(`Search for engagement ${engagement} in ${emailID}`);
+//             const ec = await this.db.emailEngagements
+//                 .where({ emailID, engagement }, (p) => (x) => x.emailID === p.emailID && x.engagement === p.engagement)
+//                 .first();
+
+//             if (ec?.count) {
+//                 count = toKMBString(ec.count);
+//             }
+//         }
+
+//         count ??= "";
+
+//         const html = await this.getHtmlBody(emailID);
+
+//         const png = await tempFileService.createTempFile(".png", "button.png", "image/png");
+//         await puppeteerService.htmlToPng(html, { deviceScaleFactor: 3, selector, outputFile: png.path, count });
+//         return png;
+//     }
+
+//     async getHtmlBody(emailID: any) {
+
+//         const email = await this.db.emails
+//             .where({ emailID }, (p) => (x) => x.emailID === p.emailID)
+//             .first();
+
+//         if (email.htmlBody) {
+//             return email.htmlBody;
+//         }
+
+//         const file = await this.cachedEmailService.getHtml(emailID);
+//         return await file.readAsText();
+//     }
+
+//     async track(emailID: any, activityID: any) {
+
+//         const ep = { emailID };
+//         const isValidActivityID = !/^\$/.test(activityID);
+//         if (isValidActivityID) {
+//             const activity = await this.db.subscriberActivities
+//             .where({
+//                 activityID: Base36.decode(activityID, false) ?? 0,
+//                 emailID
+//             }, (p) => (x) => x.activityID === p.activityID && x.emailID === p.emailID)
+//             .first();
 
-            if (activity) {
-                delete activity.activityID;
-                activity.activity = "view";
-                activity.ipAddress = this.request?.remoteIPAddress;
-                await this.db.subscriberActivities.statements.insert(activity);
+//             if (activity) {
+//                 delete activity.activityID;
+//                 activity.activity = "view";
+//                 activity.ipAddress = this.request?.remoteIPAddress;
+//                 await this.db.subscriberActivities.statements.insert(activity);
 
-                await this.db.emails.where(ep, (p) => (x) => x.emailID === p.emailID as any)
-                    .update(ep, (p) => (x) => ({ viewCount: x.viewCount + 1}));
-            }
-        }
+//                 await this.db.emails.where(ep, (p) => (x) => x.emailID === p.emailID as any)
+//                     .update(ep, (p) => (x) => ({ viewCount: x.viewCount + 1}));
+//             }
+//         }
 
-        const ec = await this.db.emails
-            .where(ep, (p) => (x) => x.emailID === p.emailID as any)
-            .first();
+//         const ec = await this.db.emails
+//             .where(ep, (p) => (x) => x.emailID === p.emailID as any)
+//             .first();
 
-        if (ec?.viewCount) {
-            return toKMBString(ec.viewCount);
-        }
-    }
-
-}
+//         if (ec?.viewCount) {
+//             return toKMBString(ec.viewCount);
+//         }
+//     }
+
+// }

package/dist/server/model/entities/MailboxEmail.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"MailboxEmail.d.ts","sourceRoot":"","sources":["../../../../src/server/model/entities/MailboxEmail.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,OAAO,OAAO,MAAM,cAAc,CAAC;AACnC,OAAO,QAAQ,MAAM,qDAAqD,CAAC;AA2B3E,MAAM,CAAC,OAAO,OAAO,YAAY;IAU7B,SAAS,EAAE,MAAM,CAAC;IAUlB,OAAO,EAAE,MAAM,CAAC;IAEhB,KAAK,EAAE,KAAK,CAAC;IAEb;;OAEG;IAEH,eAAe,EAAE,MAAM,CAAC;IAExB;;OAEG;IAEH,WAAW,EAAE,QAAQ,CAAC;IAEtB;;OAEG;IAEH,aAAa,EAAE,QAAQ,CAAC;IAGxB,QAAQ,EAAE,OAAO,CAAC;IAElB,OAAO,EAAE,OAAO,CAAC;IAGjB,MAAM,EAAE,MAAM,CAAC;CAElB"}

package/dist/server/model/entities/MailboxEmail.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"MailboxEmail.js","sourceRoot":"","sources":["../../../../src/server/model/entities/MailboxEmail.ts"],"names":[],"mappings":"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"}