@social-mail/social-mail-web-server 1.16.82 → 1.16.83

package/dist/server/smtp/services/EmailParserService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EmailParserService.d.ts","sourceRoot":"","sources":["../../../../src/server/smtp/services/EmailParserService.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAgB,MAAM,YAAY,CAAC;AAEtD,OAAO,EAAE,SAAS,EAAE,MAAM,oDAAoD,CAAC;AAG/E,MAAM,CAAC,OAAO,OAAO,kBAAkB;IAEtB,KAAK,CAAC,IAAI,EAAE,SAAS,EAAE,QAAQ,UAAQ;CAwBvD"}
+{"version":3,"file":"EmailParserService.d.ts","sourceRoot":"","sources":["../../../../src/server/smtp/services/EmailParserService.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAgB,MAAM,YAAY,CAAC;AAEtD,OAAO,EAAE,SAAS,EAAE,MAAM,oDAAoD,CAAC;AAM/E,MAAM,CAAC,OAAO,OAAO,kBAAkB;IAsBtB,KAAK,CAAC,IAAI,EAAE,SAAS,EAAE,QAAQ,UAAQ;CAwBvD"}

package/dist/server/smtp/services/EmailParserService.js

@@ -7,7 +7,24 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 import { RegisterSingleton, ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";
 import { simpleParser } from "mailparser";
 import HtmlSanitizer from "../../services/dom/HtmlSanitizer.js";
+// import MimeMessage from "@social-mail/shared/dist/mime-parser/MimeMessage.js"
+// import { Readable } from "node:stream";
 let EmailParserService = class EmailParserService {
+    // public async parseNew(file: LocalFile, sanitize = true) {
+    //     const msg = await MimeMessage.load( Readable.toWeb(file.openReadStream()) as any , null, false);
+    //     const parsed = {
+    //         text: msg.text,
+    //         html: msg.html,
+    //         subject: msg.subject,
+    //     };
+    //     if (sanitize) {
+    //         const sanitizer = ServiceProvider.resolve(this, HtmlSanitizer);
+    //         const { html, text } = sanitizer.sanitize(msg.html || `<pre>${msg.text}</pre>`, msg.text);
+    //         parsed.html = html;
+    //         parsed.text = text;
+    //     }
+    //     return parsed;
+    // }
     async parse(file, sanitize = false) {
         const parsed = await new Promise((resolve, reject) => {
             simpleParser(file.openRead(), {

package/dist/server/smtp/services/EmailParserService.js.map

@@ -1 +1 @@
-{"version":3,"file":"EmailParserService.js","sourceRoot":"","sources":["../../../../src/server/smtp/services/EmailParserService.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAC;AAChG,OAAO,EAAc,YAAY,EAAE,MAAM,YAAY,CAAC;AACtD,OAAO,aAAa,MAAM,qCAAqC,CAAC;AAIjD,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAE5B,KAAK,CAAC,KAAK,CAAC,IAAe,EAAE,QAAQ,GAAG,KAAK;QAChD,MAAM,MAAM,GAAG,MAAM,IAAI,OAAO,CAAa,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC7D,YAAY,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE;gBAC1B,YAAY,EAAE,IAAI;gBAClB,aAAa,EAAE,IAAI;aACtB,EAAG,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;gBAClB,IAAI,KAAK,EAAE,CAAC;oBACR,MAAM,CAAC,KAAK,CAAC,CAAC;oBACd,OAAO;gBACX,CAAC;gBACD,OAAO,CAAC,MAAM,CAAC,CAAC;YACpB,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QAEH,IAAI,QAAQ,EAAE,CAAC;YACX,MAAM,SAAS,GAAG,eAAe,CAAC,OAAO,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;YAC/D,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,IAAI,MAAM,CAAC,UAAU,IAAI,aAAa,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;YAC1G,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC;YACnB,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC;QACvB,CAAC;QAED,OAAO,MAAM,CAAC;IAClB,CAAC;CAEJ,CAAA;AA1BoB,kBAAkB;IADtC,iBAAiB;GACG,kBAAkB,CA0BtC;eA1BoB,kBAAkB"}
+{"version":3,"file":"EmailParserService.js","sourceRoot":"","sources":["../../../../src/server/smtp/services/EmailParserService.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAC;AAChG,OAAO,EAAc,YAAY,EAAE,MAAM,YAAY,CAAC;AACtD,OAAO,aAAa,MAAM,qCAAqC,CAAC;AAGhE,gFAAgF;AAChF,0CAA0C;AAG3B,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAEnC,4DAA4D;IAE5D,uGAAuG;IAEvG,uBAAuB;IACvB,0BAA0B;IAC1B,0BAA0B;IAC1B,gCAAgC;IAChC,SAAS;IAET,sBAAsB;IACtB,0EAA0E;IAC1E,qGAAqG;IACrG,8BAA8B;IAC9B,8BAA8B;IAC9B,QAAQ;IAER,qBAAqB;IACrB,IAAI;IAEG,KAAK,CAAC,KAAK,CAAC,IAAe,EAAE,QAAQ,GAAG,KAAK;QAChD,MAAM,MAAM,GAAG,MAAM,IAAI,OAAO,CAAa,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC7D,YAAY,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE;gBAC1B,YAAY,EAAE,IAAI;gBAClB,aAAa,EAAE,IAAI;aACtB,EAAG,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;gBAClB,IAAI,KAAK,EAAE,CAAC;oBACR,MAAM,CAAC,KAAK,CAAC,CAAC;oBACd,OAAO;gBACX,CAAC;gBACD,OAAO,CAAC,MAAM,CAAC,CAAC;YACpB,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QAEH,IAAI,QAAQ,EAAE,CAAC;YACX,MAAM,SAAS,GAAG,eAAe,CAAC,OAAO,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;YAC/D,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,IAAI,MAAM,CAAC,UAAU,IAAI,aAAa,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;YAC1G,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC;YACnB,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC;QACvB,CAAC;QAED,OAAO,MAAM,CAAC;IAClB,CAAC;CAEJ,CAAA;AA9CoB,kBAAkB;IADtC,iBAAiB;GACG,kBAAkB,CA8CtC;eA9CoB,kBAAkB"}

package/dist/wwwroot/routes/social-mail/api/v1/queue-mail/post.d.ts

@@ -0,0 +1,13 @@
+import Page from "@entity-access/server-pages/dist/Page.js";
+import SocialMailContext from "../../../../../../server/model/SocialMailContext.js";
+import EmailAddressService from "../../../../../../server/services/EmailAddressService.js";
+import EmailLogService from "../../../../../../server/services/email-logs/EmailLogService.js";
+import EmailParserService from "../../../../../../server/smtp/services/EmailParserService.js";
+export default class extends Page {
+    db: SocialMailContext;
+    eas: EmailAddressService;
+    els: EmailLogService;
+    eps: EmailParserService;
+    run(): Promise<import("@entity-access/server-pages/dist/Content.js").default>;
+}
+//# sourceMappingURL=post.d.ts.map

package/dist/wwwroot/routes/social-mail/api/v1/queue-mail/post.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"post.d.ts","sourceRoot":"","sources":["../../../../../../../src/wwwroot/routes/social-mail/api/v1/queue-mail/post.tsx"],"names":[],"mappings":"AAEA,OAAO,IAAI,MAAM,0CAA0C,CAAC;AAC5D,OAAO,iBAAiB,MAAM,qDAAqD,CAAC;AACpF,OAAO,mBAAmB,MAAM,0DAA0D,CAAC;AAC3F,OAAO,eAAe,MAAM,iEAAiE,CAAC;AAC9F,OAAO,kBAAkB,MAAM,8DAA8D,CAAC;AAI9F,MAAM,CAAC,OAAO,MAAO,SAAQ,IAAI;IAG7B,EAAE,EAAE,iBAAiB,CAAC;IAGtB,GAAG,EAAE,mBAAmB,CAAC;IAGzB,GAAG,EAAE,eAAe,CAAC;IAGrB,GAAG,EAAE,kBAAkB,CAAC;IAGlB,GAAG;CA2DZ"}

package/dist/wwwroot/routes/social-mail/api/v1/queue-mail/post.js

@@ -0,0 +1,86 @@
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+import Inject from "@entity-access/entity-access/dist/di/di.js";
+import { Prepare } from "@entity-access/server-pages/dist/decorators/Prepare.js";
+import Page from "@entity-access/server-pages/dist/Page.js";
+import SocialMailContext from "../../../../../../server/model/SocialMailContext.js";
+import EmailAddressService from "../../../../../../server/services/EmailAddressService.js";
+import EmailLogService from "../../../../../../server/services/email-logs/EmailLogService.js";
+import EmailParserService from "../../../../../../server/smtp/services/EmailParserService.js";
+import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
+let default_1 = class extends Page {
+    async run() {
+        this.sessionUser.ensureLoggedIn();
+        const from = this.form.fields.from;
+        const recipients = this.form.fields.recipients.split(",");
+        // const priority = this.form.fields.priority;
+        // create mailbox if doesn't exist only if this is the admin
+        // or user has ability to create mailbox
+        const file = this.form.files[0];
+        const sender = await this.eas.getHostedMailboxByAddress(from);
+        const l = await this.els.save(0, file);
+        const parsed = await this.eps.parse(file, true);
+        const headers = {};
+        const copyHeaders = [
+            "List-Unsubscribe",
+            "List-Unsubscribe-Post",
+            "Return-Path",
+            "In-Reply-To",
+            "Reply-To",
+            "Auto-Unsubscribe-On-Fail"
+        ];
+        for (const h of copyHeaders) {
+            const v = parsed.headers.get(h);
+            if (v) {
+                headers[h] = v.toString();
+            }
+        }
+        const now = DateTime.now;
+        const email = this.db.emails.add({
+            senderID: sender.mailboxID,
+            mimeFileID: l.logID,
+            recipients: recipients.map((r) => this.db.emailRecipients.add({
+                emailAddressText: r
+            })),
+            subject: parsed.subject,
+            dateCreated: now,
+            headers: JSON.stringify(headers),
+            textBody: parsed.text,
+            htmlBody: parsed.html || parsed.textAsHtml,
+            status: "scheduled",
+            dateSent: now
+        });
+        await this.db.saveChanges();
+        return this.json({
+            id: email.emailID
+        });
+    }
+};
+__decorate([
+    Inject,
+    __metadata("design:type", SocialMailContext)
+], default_1.prototype, "db", void 0);
+__decorate([
+    Inject,
+    __metadata("design:type", EmailAddressService)
+], default_1.prototype, "eas", void 0);
+__decorate([
+    Inject,
+    __metadata("design:type", EmailLogService)
+], default_1.prototype, "els", void 0);
+__decorate([
+    Inject,
+    __metadata("design:type", EmailParserService)
+], default_1.prototype, "eps", void 0);
+default_1 = __decorate([
+    Prepare.authorize
+], default_1);
+export default default_1;
+//# sourceMappingURL=post.js.map

package/dist/wwwroot/routes/social-mail/api/v1/queue-mail/post.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"post.js","sourceRoot":"","sources":["../../../../../../../src/wwwroot/routes/social-mail/api/v1/queue-mail/post.tsx"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@social-mail/social-mail-web-server",
-  "version": "1.16.82",
+  "version": "1.16.83",
   "description": "## Phase 1",
   "main": "index.js",
   "type": "module",
@@ -27,7 +27,7 @@
     "@parse/node-apn": "^6.5.0",
     "@paypal/paypal-server-sdk": "^2.2.0",
     "@peculiar/asn1-schema": "^2.3.15",
-    "@social-mail/shared": "^1.0.29",
+    "@social-mail/shared": "^1.1.3",
     "@socket.io/cluster-adapter": "^0.2.2",
     "@socket.io/postgres-adapter": "^0.4.0",
     "@socket.io/sticky": "^1.0.4",

package/src/server/smtp/services/EmailParserService.ts

@@ -3,9 +3,32 @@ import { ParsedMail, simpleParser } from "mailparser";
 import HtmlSanitizer from "../../services/dom/HtmlSanitizer.js";
 import { LocalFile } from "@entity-access/server-pages/dist/core/LocalFile.js";
 
+// import MimeMessage from "@social-mail/shared/dist/mime-parser/MimeMessage.js"
+// import { Readable } from "node:stream";
+
 @RegisterSingleton
 export default class EmailParserService {
 
+    // public async parseNew(file: LocalFile, sanitize = true) {
+
+    //     const msg = await MimeMessage.load( Readable.toWeb(file.openReadStream()) as any , null, false);
+
+    //     const parsed = {
+    //         text: msg.text,
+    //         html: msg.html,
+    //         subject: msg.subject,
+    //     };
+
+    //     if (sanitize) {
+    //         const sanitizer = ServiceProvider.resolve(this, HtmlSanitizer);
+    //         const { html, text } = sanitizer.sanitize(msg.html || `<pre>${msg.text}</pre>`, msg.text);
+    //         parsed.html = html;
+    //         parsed.text = text;
+    //     }
+
+    //     return parsed;
+    // }
+
     public async parse(file: LocalFile, sanitize = false) {
         const parsed = await new Promise<ParsedMail>((resolve, reject) => {
             simpleParser(file.openRead(), {

package/src/wwwroot/routes/social-mail/api/v1/queue-mail/post.tsx

@@ -0,0 +1,85 @@
+import Inject from "@entity-access/entity-access/dist/di/di.js";
+import { Prepare } from "@entity-access/server-pages/dist/decorators/Prepare.js";
+import Page from "@entity-access/server-pages/dist/Page.js";
+import SocialMailContext from "../../../../../../server/model/SocialMailContext.js";
+import EmailAddressService from "../../../../../../server/services/EmailAddressService.js";
+import EmailLogService from "../../../../../../server/services/email-logs/EmailLogService.js";
+import EmailParserService from "../../../../../../server/smtp/services/EmailParserService.js";
+import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
+
+@Prepare.authorize
+export default class extends Page {
+
+    @Inject
+    db: SocialMailContext;
+
+    @Inject
+    eas: EmailAddressService;
+
+    @Inject
+    els: EmailLogService;
+
+    @Inject
+    eps: EmailParserService;
+
+
+    async run() {
+
+        this.sessionUser.ensureLoggedIn();
+
+        const from = this.form.fields.from;
+        const recipients = (this.form.fields.recipients as string).split(",");
+        // const priority = this.form.fields.priority;
+
+        // create mailbox if doesn't exist only if this is the admin
+        // or user has ability to create mailbox
+        const file = this.form.files[0];
+
+        const sender = await this.eas.getHostedMailboxByAddress(from);
+
+        const l = await this.els.save(0, file);
+
+        const parsed = await this.eps.parse(file, true);
+
+        const headers = {};
+
+        const copyHeaders = [
+            "List-Unsubscribe",
+            "List-Unsubscribe-Post",
+            "Return-Path",
+            "In-Reply-To",
+            "Reply-To",
+            "Auto-Unsubscribe-On-Fail"
+        ];
+
+        for(const h of copyHeaders) {
+            const v = parsed.headers.get(h) as any;
+            if (v) {
+                headers[h] = v.toString();
+            }
+        }
+
+        const now = DateTime.now;
+
+        const email = this.db.emails.add({
+            senderID: sender.mailboxID,
+            mimeFileID: l.logID,
+            recipients: recipients.map((r) => this.db.emailRecipients.add({
+                emailAddressText: r
+            })),
+            subject: parsed.subject,
+            dateCreated: now,
+            headers: JSON.stringify(headers),
+            textBody: parsed.text,
+            htmlBody: parsed.html || parsed.textAsHtml,
+            status: "scheduled",
+            dateSent: now
+        });
+
+        await this.db.saveChanges();
+
+        return this.json({
+            id: email.emailID
+        });
+    }
+}