ztechno_core 0.0.96 → 0.0.98

package/lib/mail_service.d.ts

@@ -4,6 +4,7 @@ import {
   MailOptionsText,
   MailResponse,
   MailServiceOptions,
+  ZMailBlacklist,
   ZMailSendOptTemplate,
 } from './typings';
 import { ZMailBlacklistOrm } from './orm/mail_blacklist_orm';
@@ -11,12 +12,13 @@ export declare class ZMailService {
   private opt;
   protected get sql(): import('./sql_service').ZSQLService;
   protected blacklistOrm: ZMailBlacklistOrm;
-  private blacklist;
+  protected blacklist: ZMailBlacklist[];
   /**
    * Creates a new ZMailService instance
    * @param opt - Configuration options for the mail service including authentication, sender email, and SQL service
    */
   constructor(opt: MailServiceOptions);
+  updateBlacklist(opt: Pick<ZMailBlacklist, 'email' | 'is_blacklisted' | 'hash'>): Promise<void>;
   /**
    * Refreshes the email blacklist from the database
    * @returns Promise that resolves when the blacklist has been refreshed

package/lib/mail_service.js

@@ -27,6 +27,16 @@ class ZMailService {
       ? this.opt.dirTemplate
       : path_1.default.join(process.cwd(), this.opt.dirTemplate || '');
   }
+  async updateBlacklist(opt) {
+    const newItem = await this.blacklistOrm.upsert(opt);
+    const found = this.blacklist.find((item) => item.email === opt.email);
+    if (found) {
+      found.is_blacklisted = opt.is_blacklisted;
+      return;
+    }
+    this.blacklist.push(newItem);
+    return;
+  }
   /**
    * Refreshes the email blacklist from the database
    * @returns Promise that resolves when the blacklist has been refreshed
@@ -114,7 +124,7 @@ class ZMailService {
     }
     if (opts.inject !== undefined) {
       const key = opts.html !== undefined ? 'html' : 'body';
-      const baseInject = { email: mailOpts.recipient, hashToUnsubscribe };
+      const baseInject = Object.assign({ email: mailOpts.recipient, hashToUnsubscribe }, this.opt.baseInject ?? {});
       opts[key] = await this.inject(opts[key], Object.assign(baseInject, opts.inject));
     }
     return await this.send(opts);

package/lib/orm/mail_blacklist_orm.d.ts

@@ -17,5 +17,6 @@ export declare class ZMailBlacklistOrm extends ZOrm {
     },
   ): Promise<ZMailBlacklist[]>;
   update({ email, is_blacklisted }: Pick<ZMailBlacklist, 'email' | 'is_blacklisted'>): Promise<boolean>;
+  upsert(item: Omit<ZMailBlacklist, 'updated_at' | 'created_at'>): Promise<ZMailBlacklist>;
   createTable(): Promise<void>;
 }

package/lib/orm/mail_blacklist_orm.js

@@ -51,6 +51,17 @@ class ZMailBlacklistOrm extends orm_1.ZOrm {
     );
     return res.affectedRows !== 0;
   }
+  async upsert(item) {
+    await this.sqlService.query(
+      `
+      INSERT INTO \`${this.alias}\` (email, hash, is_blacklisted, updated_at, created_at)
+      VALUES (:email, :hash, :is_blacklisted, NOW(), NOW())
+      ON DUPLICATE KEY UPDATE hash=:hash, is_blacklisted=:is_blacklisted, updated_at=NOW()
+    `,
+      item,
+    );
+    return item;
+  }
   async createTable() {
     await this.sqlService.query(/*SQL*/ `
       CREATE TABLE \`${this.alias}\` (

package/lib/typings/mail_types.d.ts

@@ -39,6 +39,12 @@ export type MailServiceOptions = {
   sqlService: ZSQLService;
   hashSalt?: string;
   dirTemplate?: string;
+  baseInject?: {
+    logoSrc?: string;
+    baseUrl?: string;
+    title: string;
+    content: string;
+  };
 };
 export type MailOptionsBase = {
   recipient: string;
@@ -81,7 +87,7 @@ export type ZMailSendOptAll = MailOptionsBase & {
 export type ZMailBlacklist = {
   email: string;
   hash?: string;
-  is_blacklisted: 0 | 1;
+  is_blacklisted: 0 | 1 | boolean;
   updated_at: string;
   created_at: string;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ztechno_core",
-  "version": "0.0.96",
+  "version": "0.0.98",
   "description": "Core files for ztechno framework",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",