@social-mail/social-mail-web-server 1.7.263 → 1.7.264

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@social-mail/social-mail-web-server",
-  "version": "1.7.263",
+  "version": "1.7.264",
   "description": "## Phase 1",
   "main": "index.js",
   "type": "module",

package/src/server/services/message-events/PgEvents.ts

@@ -18,6 +18,8 @@ export default class PgEvents {
     private added: string[] = [];
     private removed: string[] = [];
 
+    private ac: AbortController;
+
     private get client() {
         return this._client ??= (async () => {
             try {
@@ -119,12 +121,14 @@ export default class PgEvents {
     }
 
     private update() {
+        this.ac?.abort();
         return this._running ??= (async () => {
             while(this.handlers.size) {
                try {
                     const c = await this.client;
                     if (!c) {
-                        await sleep(3000);
+                        const a = this.ac = new AbortController();
+                        await sleep(3000, a.signal);
                         continue;
                     }
                     if (this.added.length) {
@@ -145,7 +149,8 @@ export default class PgEvents {
                 } catch (error) {
                     console.error(error);
                 }
-                await sleep(30000);
+                const a1 = this.ac = new AbortController();
+                await sleep(30000, a1.signal);
             }
             this._running = null;
         })();

package/src/server/services/root-certs/RootCertificates.ts

@@ -10,6 +10,7 @@ import { spawnPromise } from "../../../common/spawnPromise.js";
 import { join } from "node:path";
 import { mkdir, rm } from "node:fs/promises";
 import { globalEnv } from "../../../common/globalEnv.js";
+import { isTestMode } from "../../../globalServices.js";
 
 const rootCertDir = "/cache/root-certs";
 const rootCertPath = rootCertDir + "/all.pem";
@@ -28,6 +29,9 @@ export default class RootCertificates {
         if (!globalEnv.ssl.downloadCerts) {
             return;
         }
+        if (isTestMode) {
+            return;
+        }
         this.store.install().catch(console.error);
     }
 

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

@@ -31,6 +31,8 @@ export default class DomainReputationService
 
         const { failed } = reputation;
 
+        // console.log({ failed });
+
         if (failed > 3) {
             if (failed > (reputation.received / 10)) {
                 throw new SmtpError("Sender Blocked for 24 Hours", SmtpStatusCodes.SenderBlocked);
@@ -39,6 +41,8 @@ export default class DomainReputationService
     }
 
     postInit() {
-        this.ms.reputationCleared.on(() => this.cache?.clear("checkReputation"));
+        this.ms.reputationCleared.on(() => {
+            this.cache?.clear("checkReputation");
+        });
     }
 }

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

@@ -227,9 +227,9 @@ export default class MailReceiverService {
             }));
 
         if (activity === "rcpt-not-found") {
-            if (d?.failed > 3) {
-                if (d.failed > (d.received / 10)) {
-                    // clear on reputation change
+            const { failed, received } = d ?? {};
+            if (failed > 3) {
+                if (failed > (received / 10)) {
                     this.ms.reputationCleared.notify("");
                 }
             }

package/dist/server/model/entities/DomainReputation.d.ts

@@ -1,6 +0,0 @@
-export default class DomainReputation {
-    name: string;
-    received: number;
-    failed: number;
-}
-//# sourceMappingURL=DomainReputation.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"DomainReputation.d.ts","sourceRoot":"","sources":["../../../../src/server/model/entities/DomainReputation.ts"],"names":[],"mappings":"AAIA,MAAM,CAAC,OAAO,OAAO,gBAAgB;IAG1B,IAAI,EAAE,MAAM,CAAC;IAGb,QAAQ,EAAE,MAAM,CAAC;IAGjB,MAAM,EAAE,MAAM,CAAC;CACzB"}

package/dist/server/model/entities/DomainReputation.js

@@ -1,30 +0,0 @@
-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 Column from "@entity-access/entity-access/dist/decorators/Column.js";
-import Table from "@entity-access/entity-access/dist/decorators/Table.js";
-let DomainReputation = class DomainReputation {
-};
-__decorate([
-    Column({ dataType: "Char", length: 400, key: true }),
-    __metadata("design:type", String)
-], DomainReputation.prototype, "name", void 0);
-__decorate([
-    Column({ dataType: "Int", default: () => 0 }),
-    __metadata("design:type", Number)
-], DomainReputation.prototype, "received", void 0);
-__decorate([
-    Column({ dataType: "Int", default: () => 0 }),
-    __metadata("design:type", Number)
-], DomainReputation.prototype, "failed", void 0);
-DomainReputation = __decorate([
-    Table("DomainReputations")
-], DomainReputation);
-export default DomainReputation;
-//# sourceMappingURL=DomainReputation.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"DomainReputation.js","sourceRoot":"","sources":["../../../../src/server/model/entities/DomainReputation.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,MAAM,MAAM,wDAAwD,CAAC;AAC5E,OAAO,KAAK,MAAM,uDAAuD,CAAC;AAG3D,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;CAUpC,CAAA;AAPU;IADN,MAAM,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC;;8CACjC;AAGb;IADN,MAAM,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC,EAAC,CAAC;;kDACrB;AAGjB;IADN,MAAM,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC,EAAC,CAAC;;gDACvB;AATL,gBAAgB;IADpC,KAAK,CAAC,mBAAmB,CAAC;GACN,gBAAgB,CAUpC;eAVoB,gBAAgB"}

package/src/server/model/entities/DomainReputation.ts

@@ -1,15 +0,0 @@
-import Column from "@entity-access/entity-access/dist/decorators/Column.js";
-import Table from "@entity-access/entity-access/dist/decorators/Table.js";
-
-@Table("DomainReputations")
-export default class DomainReputation {
-
-    @Column({ dataType: "Char", length: 400, key: true })
-    public name: string;
-
-    @Column({ dataType: "Int", default: () => 0})
-    public received: number;
-
-    @Column({ dataType: "Int", default: () => 0})
-    public failed: number;
-}