@social-mail/social-mail-client 1.2.310 → 1.2.312

package/src/services/mime-service/MimeNode.ts

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-redundant-type-constituents */
 import QueryIterator from "../../common/QueryIterator";
 import { AttachmentFile } from "./AttachmentFile";
 import { HeaderContentType } from "./HeaderContentType";
@@ -26,7 +27,32 @@ export type IContentDisposition = string | IContentDispositionObject;
 
 
 
+export class CIMap extends Map {
 
+    ci = new Map();
+
+    set(key: any, value: any): this {
+        if (typeof key === "string") {
+            let ck = this.ci.get(key);
+            if (ck === void 0) {
+                ck = key.toLocaleLowerCase();
+                this.ci.set(ck, key);
+            } else {
+                key = ck;
+            }
+        }
+        return super.set(key, value);
+    }
+
+    get(key) {
+        if (typeof key === "string") {
+            const ck = key.toLocaleLowerCase();
+            key = this.ci.get(ck);
+        }
+        return super.get(key);
+    }
+
+}
 
 
 export class MimeNode {
@@ -132,7 +158,7 @@ export class MimeNode {
         return this.contentType.boundary;
     }
 
-    get descendents() {
+    get descendent() {
         return this.enumerate();
     }
 
@@ -142,14 +168,14 @@ export class MimeNode {
     private headers: Map<string, string | any>;
 
     constructor(type?: string) {
-        this.headers = new Map();
+        this.headers = new CIMap();
         this.contentType = new HeaderContentType(type);
         this.headers.set("Content-Type", this.contentType);
     }
 
     getFirstChild(contentType: string, create = false) {
         contentType = contentType.toLocaleLowerCase();
-        let child = QueryIterator.first(this.descendents, (x) => x.contentType.type === contentType);
+        let child = QueryIterator.first(this.descendent, (x) => x.contentType.type === contentType);
         if (!child && create) {
             child = new MimeNode(contentType);
             (this.children ??= []).push(child);
@@ -158,33 +184,30 @@ export class MimeNode {
     }
 
     header(name: string) {
-        for (const [key, value] of this.headers.entries()) {
-            if (key.toLocaleLowerCase() === name.toLocaleLowerCase()) {
-                return value;
-            }
-        }
+        return this.headers.get(name);
     }
 
     setHeader(name: string, value: string) {
-        for (const [key] of this.headers.keys()) {
-            if (key.toLocaleLowerCase() === name.toLocaleLowerCase()) {
-                this.headers.set(key, value);
-                return;
-            }
-        }
-
-        // change name...
-        switch(name.toLocaleLowerCase()) {
-            case "content-type":
-                name = "Content-Type";
-                break;
-            case "content-transfer-encoding":
-                name = "Content-Transfer-Encoding";
-                break;
-            case "content-disposition":
-                name = "Content-Disposition";
-                break;
-        }
+        // name = name.toLocaleLowerCase();
+        // for (const [key] of this.headers.keys()) {
+        //     if (key.toLocaleLowerCase() === name) {
+        //         this.headers.set(key, value);
+        //         return;
+        //     }
+        // }
+
+        // // change name...
+        // switch(name.toLocaleLowerCase()) {
+        //     case "content-type":
+        //         name = "Content-Type";
+        //         break;
+        //     case "content-transfer-encoding":
+        //         name = "Content-Transfer-Encoding";
+        //         break;
+        //     case "content-disposition":
+        //         name = "Content-Disposition";
+        //         break;
+        // }
 
         this.headers.set(name, value);
     }
@@ -287,9 +310,9 @@ export class MimeNode {
             if (headerValue) {
                 this.setHeader(headerName, headerValue);
             }
-            const [k, v] = value.split(":", 2);
-            headerName = k;
-            headerValue = wordEncoding.decode(v.trim());
+            const index = value.indexOf(":");
+            headerName = value.substring(0, index);
+            headerValue = wordEncoding.decode(value.substring(index+1).trim());
         }
 
         if (headerValue) {

package/src/site-editor/editor/WebSitePageEditor.tsx

@@ -184,7 +184,7 @@ export default class WebSitePageEditor extends HtmlPageEditor {
             this.htmlDocument.head.appendChild(this.htmlDocument.createTextNode("\n"));
             this.htmlDocument.head.appendChild(script);
         }
-        script.setAttribute("src", "//cdn.jsdelivr.net/npm/@social-mail/web-components@1.0.65/dist/components.webpack.js");
+        script.setAttribute("src", "//cdn.jsdelivr.net/npm/@social-mail/web-components@1.0.66/dist/components.webpack.js");
     }
 
 

package/src/style/GlobalStyle.ts

@@ -49,6 +49,7 @@ addLinkTag("https://cdn.jsdelivr.net/npm/file-icon-vectors@1.0.0/dist/file-icon-
     --font-size-small: 0.8125em;
 
     --hover-color: #b8b88b20;
+    --command-bg-color: #50505025;
     --hover-text-color: CanvasText;
     --selection-color: #b8b88b60;
     --selection-text-color: CanvasText;

package/src/tests/services/mime/parse-headers.ts

@@ -0,0 +1,111 @@
+import { CIMap, MimeNode } from "../../../services/mime-service/MimeNode";
+import { StringLineStream } from "../../../services/mime-service/stream/LineStream";
+import { Assert } from "../../Assert";
+
+
+export default async function() {
+
+    const ci = new CIMap();
+
+    ci.set("A1", "a1");
+    Assert.equal(ci.get("a1"), "a1");
+    ci.set("a1", "a2");
+    Assert.equal(ci.get("A1"), "a2");
+
+    const root = new MimeNode();
+    await root.parse(new StringLineStream(data));
+
+    const line = root.header("list-unsubscribe");
+    console.log(line);
+}
+
+const data = `Delivered-To: ackava@gmail.com
+Received: by 2002:ab3:fb12:0:b0:55d:606f:316e with SMTP id n18csp92417qnc;
+        Mon, 15 Jul 2024 23:31:52 -0700 (PDT)
+X-Google-Smtp-Source: AGHT+IH6CExL3W27oPGLMruurtcQA5CkW5wqoDtPj4M6JjXMJc0nbBOuUbMU5Q8akO/F+0WOnqce
+X-Received: by 2002:a05:6102:14a1:b0:48f:ea45:4887 with SMTP id ada2fe7eead31-4914c4edf1amr1746703137.11.1721111511897;
+        Mon, 15 Jul 2024 23:31:51 -0700 (PDT)
+ARC-Seal: i=1; a=rsa-sha256; t=1721111511; cv=none;
+        d=google.com; s=arc-20160816;
+        b=N0GPNVoa8Da4t9jg6uBYFBvzxKd5i1zYqcy55LVZhzJMJRvsMmCieWIYH/4wBPY2C7
+         oLF0lDPZQ6wp3M5hCQpYA6/yBizdWPlympG8cmuA1D7MDUSMcDZ/FKc7vwKKHMa2LEsN
+         tPSS1qwY836b9wKmOpYZ8IVG0eI7Qi/9NqICCBmW8Uyur/ZEK+eZyAMDLK3zpDjg8BOw
+         fOxqfPjmrDV+xyYMFl+QSdhGAFCSjG+Lh00BsO8uoGmBmxTAvHqGtQ8+i86jX+fn55dW
+         Bj7+hGNHE/w9JC60wbGY7A/BZBxr5NJuUbS6lf50AWx8r+KS0+piIbsCiZD1x0cL8aZ+
+         lnBg==
+ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816;
+        h=mime-version:list-unsubscribe:list-owner:list-subscribe
+         :list-unsubscribe-post:list-help:precedence:message-id:from:date
+         :subject:to:dkim-signature;
+        bh=f6Rq15fNlqiCZ7WKqPaNobIXI+0TpZUM+Nj4isITnpI=;
+        fh=hmlPyZWPDmkzfTC20X6uYeCWPkl43Yxy6ifyYfZzmrU=;
+        b=hYVMCCcZ2ypLkmeRqGFl5tSMhfIGs9r5Gq/SztqXKJ+BqzaguMzcVpvRKTK8CJBpgq
+         KkL0620XPMiBUsUFivvuJHS5nHrsBDOye0fTisTCa+S/QJZVVVTbKCNrV1IbRzfbDoZd
+         2BsmLm0mjVQZQhO0W9eZXjlulmw8a9TvFEz/2z9/8/kMAGC22ugTkTQZSwmoSFHjT+EU
+         bs8uV8qLLtp1PiKDj4Br4kwJQtc6D8IsZHkIxbnmRts1wylrxr88u1CHZ9/RHScBa6Ga
+         ua56Ajf8wuPjnS6RaZD0apIDPyF28DWBNVqcSGH3x4K0W8Rndf0NgXWjGVT1bcB9oVm7
+         cr5w==;
+        dara=google.com
+ARC-Authentication-Results: i=1; mx.google.com;
+       dkim=pass header.i=@bypeople.com header.s=default header.b=QU8Ngf8L;
+       spf=pass (google.com: domain of listbounces@bypeople.com designates 64.64.7.193 as permitted sender) smtp.mailfrom=listbounces@bypeople.com
+Return-Path: <listbounces@bypeople.com>
+Received: from bypeople.com (mail.bypeople.com. [64.64.7.193])
+        by mx.google.com with ESMTPS id 6a1803df08f44-6b761a03be8si67454336d6.214.2024.07.15.23.31.51
+        for <ackava@gmail.com>
+        (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
+        Mon, 15 Jul 2024 23:31:51 -0700 (PDT)
+Received-SPF: pass (google.com: domain of listbounces@bypeople.com designates 64.64.7.193 as permitted sender) client-ip=64.64.7.193;
+Authentication-Results: mx.google.com;
+       dkim=pass header.i=@bypeople.com header.s=default header.b=QU8Ngf8L;
+       spf=pass (google.com: domain of listbounces@bypeople.com designates 64.64.7.193 as permitted sender) smtp.mailfrom=listbounces@bypeople.com
+DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
+	d=bypeople.com; s=default; h=Content-Type:MIME-Version:List-Unsubscribe:
+	List-Owner:List-Subscribe:List-Help:Message-ID:From:Date:Subject:To:Sender:
+	Reply-To:Cc:Content-Transfer-Encoding:Content-ID:Content-Description:
+	Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:
+	In-Reply-To:References:List-Id:List-Post:List-Archive;
+	bh=f6Rq15fNlqiCZ7WKqPaNobIXI+0TpZUM+Nj4isITnpI=; b=QU8Ngf8LVkZ5Txf/iicBVbrz02
+	hltmvhYW8uniAlLZCOaFAM6pI4rA9D3X5GwJQF1VCmu+a/Tt8uijaXJxQGu+cEX/ePY2s/ZuIoZuO
+	tFvD7t4yW2E2//EHG2igbD++G+f7xWg3CX5j2TN1lGC0sVU071Ivo2j9RdH81IDEsuTTKP7nmTpgd
+	MWtodz14xW/F6IRG+eUEqZkFnuxJtIkh3GFfcWq0yDFpsYn+FwfdcyCJdB+UaMvbKhO1XbrjEYEHc
+	gNM3Ad74pg4zZBWsUKMkM0UjhI8v77nOe6KEauvRflHH8Q+pAPdJ/ijS3K+jFl3+fkK77IX9tix55
+	jyVGzMyg==;
+Received: from peopleby by new.designshock.com with local (Exim 4.97.1)
+	(envelope-from <listbounces@bypeople.com>)
+	id 1sTbj5-0000000Blo5-2iZm
+	for ackava@gmail.com;
+	Tue, 16 Jul 2024 01:31:51 -0500
+To: ackava@gmail.com
+Subject: =?us-ascii?Q?Meet_TshirtDesigns.com_|_3000+_Designs_POD_Read?=  =?us-ascii?Q?y,__Lifetime_License!?=
+X-PHP-Originating-Script: 1009:PHPMailer.php
+Date: Tue, 16 Jul 2024 01:31:51 -0500
+From: ByPeople New Project <bp@bypeople.com>
+Message-ID: <wciuWaefXt7RVB1dAEpGxJGiLnRjMH5qpwluY3d6RTE@bypeople.com>
+X-phpList-version: 3.6.7
+X-MessageID: 2601
+X-ListMember: ackava@gmail.com
+Precedence: bulk
+List-Help: =?us-ascii?Q?<http://www.bypeople.com/lists/=3Fp=3Dpreferenc?=
+ =?us-ascii?Q?es&uid=3Ddc741e7eb965aacaece6aa3b8e538383>?=
+List-Unsubscribe-Post: List-Unsubscribe=One-Click
+List-Subscribe: <http://www.bypeople.com/lists/?p=subscribe>
+List-Owner: <mailto:listreports@bypeople.com>
+List-Unsubscribe: =?us-ascii?Q?<mailto:abuse@bypeople.com=3Fsubject=3Ddc741e7e?=
+ =?us-ascii?Q?b965aacaece6aa3b8e538383>,<http://www.bypeople.?=
+ =?us-ascii?Q?com/lists/=3Fp=3Dunsubscribe&uid=3Ddc741e7eb965?=
+ =?us-ascii?Q?aacaece6aa3b8e538383>?=
+MIME-Version: 1.0
+Content-Type: multipart/alternative;
+ boundary="b1_wciuWaefXt7RVB1dAEpGxJGiLnRjMH5qpwluY3d6RTE"
+X-AntiAbuse: This header was added to track abuse, please include it with any abuse report
+X-AntiAbuse: Primary Hostname - new.designshock.com
+X-AntiAbuse: Original Domain - gmail.com
+X-AntiAbuse: Originator/Caller UID/GID - [1009 978] / [47 12]
+X-AntiAbuse: Sender Address Domain - bypeople.com
+X-Get-Message-Sender-Via: new.designshock.com: authenticated_id: peopleby/from_h
+X-Authenticated-Sender: new.designshock.com: bp@bypeople.com
+X-Source: 
+X-Source-Args: phpList:PHPlistPB:core-processqueue                                                                                                                          
+X-Source-Dir: bypeople.com:/public_html/lists/admin
+`;

package/src/web/page/mails/ConversationPage.tsx

@@ -33,6 +33,7 @@ import EngagementDetails from "./engagements/EngagementDetails";
 import { apiPath } from "../../../common/apiPath";
 import { AddIconTextButton, DeleteIconTextButton, EditIconTextButton } from "../../../common/controls/buttons/IconButton";
 import sleep from "@web-atoms/core/dist/core/sleep";
+import UnsubscribeWindow from "./unsubscribe/UnsubscribeWindow";
 
 const itemCss = styled.css `
     border: solid 1px lightgray;
@@ -290,6 +291,11 @@ export default class ConversationPage extends ContentPage {
                                 class="fa-solid fa-share-all"
                                 title="Forward"
                                 />
+                            { item.hasUnsubscribe && <button
+                                data-layout="link"
+                                data-margin-left="auto"
+                                data-click-event="unsubscribe-email"
+                                >Unsubscribe</button>}
                         </div> }
                         {isSending && <div data-layout="command-row" style-padding-left="20px">
                             <span text={`Sending in (${ Math.ceil(remaining.totalSeconds)} sec) `}/>
@@ -677,4 +683,16 @@ export default class ConversationPage extends ContentPage {
         this.mails.remove(mce);
     }
 
+    @Action({
+        onEvent: "unsubscribe-email"
+    })
+    async unsubscribeEmail(mce: IMailboxContactEmail) {
+        const result = await PageNavigator.pushPageForResult(UnsubscribeWindow, mce);
+        switch(result) {
+            case "blocked":
+                this.parameters.blocked = true;
+                break;
+        }
+    }
+
 }

package/src/web/page/mails/MailboxContacts.tsx

@@ -312,7 +312,12 @@ export default class MailsPage extends MasterDetailPage {
 
     @Action({ onEvent: MailAppEvents.mailboxContactUpdated})
     updateMailboxContact(mc: IMailboxContact) {
-        this.threadsRepeater.refreshItem(mc);
+        const { mailboxID , emailAddressID } = mc;
+        const item = this.threadsRepeater.items.find((x: IMailboxContact) =>
+            x.mailboxID === mailboxID
+            && x.emailAddressID === emailAddressID
+        );
+        this.threadsRepeater.refreshItem(item);
     }
 
     @Action({ onEvent: "compose-template"})

package/src/web/page/mails/unsubscribe/UnsubscribeWindow.tsx

@@ -0,0 +1,108 @@
+import PopupWindow from "@web-atoms/core/dist/web/services/PopupWindow";
+import BottomPopup from "@web-atoms/web-controls/dist/mobile-app/BottomPopup";
+import { PopupWindowPage } from "@web-atoms/web-controls/dist/mobile-app/MobileApp";
+import { IMailboxContactEmail, MailboxContact } from "../../../../model/model";
+import XNode from "@web-atoms/core/dist/core/XNode";
+import InjectProperty from "@web-atoms/core/dist/core/InjectProperty";
+import EntityService from "../../../../services/EntityService";
+import Action from "@web-atoms/core/dist/view-model/Action";
+import FetchBuilder from "@web-atoms/core/dist/services/FetchBuilder";
+import MimeMessage from "../../../../services/mime-service/MimeMessage";
+import { MimeNode } from "../../../../services/mime-service/MimeNode";
+import { StringLineStream } from "../../../../services/mime-service/stream/LineStream";
+import sleep from "@web-atoms/core/dist/core/sleep";
+import { MailAppEvents } from "../../../commands/MailAppEvents";
+
+export default class UnsubscribeWindow extends PopupWindowPage<IMailboxContactEmail> {
+
+    @InjectProperty
+    entityService: EntityService;
+
+    async init() {
+
+        this.title = "Are you sure?";
+
+        this.renderer = <div>
+            <div>
+                <div text={`From: ${this.parameters.email.senderName}`}/>
+                <div text={this.parameters.email.senderEmail.emailAddress}/>
+            </div>
+            <div data-layout="command-row">
+                <button
+                    data-click-event="unsubscribe-post"
+                    >Unsubscribe</button>
+                <button
+                    data-click-event="block-sender"
+                    data-margin-left="auto"
+                    >Block</button>
+            </div>
+        </div>;
+    }
+
+    @Action({ onEvent: "unsubscribe-post"})
+    async unsubscribePost() {
+        await this.doUnsubscribe();
+
+        await sleep(2000);
+        this.close("unsubscribed");
+        const { mailboxID, emailAddressID } = this.parameters;
+        const entity = MailboxContact.create({
+            mailboxID,
+            emailAddressID,
+            closeAllConversations: true
+        });
+        await this.entityService.save(entity, (e) => e);
+        MailAppEvents.mailboxContactUpdated.dispatchEvent(entity);
+    }
+
+    @Action({ onEvent: "block-sender"})
+    async blockSender() {
+        await this.unsubscribePost();
+        const { mailboxID, emailAddressID } = this.parameters;
+        const entity = MailboxContact.create({
+            mailboxID,
+            emailAddressID,
+            blocked: true
+        });
+        await this.entityService.save(entity, (e) => e);
+        MailAppEvents.mailboxContactUpdated.dispatchEvent(entity);
+        this.close("blocked");
+    }
+
+    private async doUnsubscribe() {
+        this.renderer = <div>
+            <div>
+                Unsubscribing....
+            </div>
+        </div>;
+        const mce = this.parameters;
+        // download headers...
+        const headers = await FetchBuilder.get(`/api/emails/headers/${mce.emailID}/1`)
+            .responseAsText();
+
+        const root = new MimeNode();
+        await root.parse(new StringLineStream(headers));
+        let unsubscribe = (root.header("List-Unsubscribe") as string)
+            .split(",")
+            .find((x) => /\<http/i.test(x));
+        if (unsubscribe.startsWith("<")) {
+            unsubscribe = unsubscribe.substring(1);
+        }
+        if (unsubscribe.endsWith(">")) {
+            unsubscribe = unsubscribe.substring(0, unsubscribe.length - 1);
+        }
+
+        const unsubscribePost = root.header("List-Unsubscribe-Post");
+        if (unsubscribePost) {
+            await FetchBuilder.post(unsubscribe).responseAsText();
+        } else {
+            await FetchBuilder.get(unsubscribe).responseAsText();
+        }
+        this.renderer = <div>
+            <div>
+                Unsubscribed Successfully.
+            </div>
+        </div>;
+    }
+
+}