@social-mail/social-mail-web-server 1.9.82 → 1.9.84

package/package.json

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

package/src/common/JsonClient.ts

@@ -30,9 +30,9 @@ export default class JsonClient {
             line += text;
         }
         this.socket.write(`${line}\n`, (error) => error && console.error(error));
-        if (log) {
-            console.log(line);
-        }
+        // if (log) {
+        //     console.log(line);
+        // }
         const v: any = await p;
         if(v?.value) {
             this.resolveReferences(v, new Map());
@@ -179,7 +179,7 @@ export default class JsonClient {
         let buffer = null as Buffer;
         s.on("data", (d) => {
             try {
-                console.log(d.toString("utf-8"));
+                // console.log(d.toString("utf-8"));
                 for(;;) {
                     const i = d.indexOf(n);
                     if (i === -1) {

package/src/common/LocalCache.ts

@@ -11,7 +11,10 @@ class LocalCacheClient {
     async get(key: string) {
         const r = await localCacheJsonClient.sendCommand({ cmd: "get", bucket: this.bucket, key });
         const value = r.value;
-        return value?.value ?? void 0;
+        if(!value) {
+            return void 0;
+        }
+        return value.value;
     }
 
     async delete(key: string) {
@@ -28,7 +31,7 @@ class LocalCacheClient {
 
     async getOrCreateAsync<T>(key: string, factory: (k: string) => Promise<T> ): Promise<T> {
         let r = await this.get(key);
-        if (!r) {
+        if (r === void 0) {
             r = await factory(key);
             await this.set(key, r);
         }
@@ -48,7 +51,7 @@ export class ObjectLocalCache<T> implements Disposable {
     for(name: keyof T) {
         let tc = this.cache.get(name);
         if (!tc) {
-            tc = new LocalCacheClient(this.bucketName, this.ttl);
+            tc = new LocalCacheClient(`${this.bucketName}.${name as any}`, this.ttl);
             this.cache.set(name, tc);
         }
         return tc;
@@ -81,7 +84,7 @@ export function localCache<T>() {
     return function(target:ILocalCacheContainer<T>, key) {
         const oldMethod = target[key] as (... a: any[]) => any;
         function value(... a: any[]) {
-            const cache = (this.cache ??= new ObjectLocalCache<T>((target as any).constructor.name + "." + key + "." + globalEnv.serverID)).for(key);
+            const cache = (this.cache ??= new ObjectLocalCache<T>(`${globalEnv.serverID}:${(target as any).constructor.name}`)).for(key);
             const cacheKey = a.join();
             return cache.getOrCreateAsync(cacheKey, (k) => {
                 const nv = oldMethod.apply(this, a);

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

@@ -16,7 +16,7 @@ export default class DomainReputationService
     ms: MessagingService;
 
     @localCache()
-    async checkReputation(domainName: string, from?: string) {
+    async checkReputation(domainName: string) {
         using scope = ServiceProvider.createScope(this);
         const db = scope.resolve(SocialMailContext);
 
@@ -33,7 +33,7 @@ export default class DomainReputationService
 
         if (failed > 3) {
             if (failed > (reputation.received / 10)) {
-                return new SmtpError(`Sender ${domainName} Blocked for 24 Hours from ${from}`, SmtpStatusCodes.SenderBlocked);
+                return new SmtpError(`Sender ${domainName} Blocked for 24 Hours`, SmtpStatusCodes.SenderBlocked);
             }
         }
 

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

@@ -107,8 +107,9 @@ export default class MailReceiverService {
 
         const domain = this.fromDomain = this.from.address.split("@",2).pop();
 
-        const error = await this.domainReputation.checkReputation(domain, this.from.address);
+        const error = await this.domainReputation.checkReputation(domain);
         if (error) {
+            console.error(`Reputation failed for ${this.from.address}`);
             throw error;
         }