@social-mail/social-mail-web-server 1.7.64 → 1.7.66

package/package.json

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

package/src/server/storage/volume/av/AVService.ts

@@ -38,8 +38,16 @@ const loadScanner = async () => {
         // socket exists... try to connect...
         // console.log(`Waiting for clamd to start... at port ${socket}`);
         try {
-            using s = await SocketClient.connect({ port: socket });
-            break;
+
+            const { default: NodeClam } = await import("clamscan");
+            const nc = new NodeClam();
+            return await nc.init({
+                debugMode,
+                clamdscan: {
+                    socket,
+                    host
+                }
+            });
         } catch (error) {
             console.error(error);
             await sleep(2000);
@@ -48,16 +56,6 @@ const loadScanner = async () => {
             throw new Error(`could not connect to socket at ${socket}.`);
         }
     }
-
-    const { default: NodeClam } = await import("clamscan");
-    const nc = new NodeClam();
-    return await nc.init({
-        debugMode,
-        clamdscan: {
-            socket,
-            host
-        }
-    });
 };
 
 export default class AVService {

package/src/server/workflows/sync/SyncMailboxWorkflow.ts

@@ -223,9 +223,6 @@ export default class SyncMailboxWorkflow extends Workflow<any, any> {
 
                 const { emailID, uid, labels, messageId, from } = iterator;
                 const cUID = BigInt(uid);
-                if (cUID > currentLastUID && cUID < end) {
-                    currentLastUID = cUID;
-                }
 
                 state.lastIndex = iterator.index.toString();
 
@@ -248,6 +245,9 @@ export default class SyncMailboxWorkflow extends Workflow<any, any> {
                         // we will send noop to
                         // prevent disconnection
                         syncState.progress = (BigInt(syncState.progress) + 1n).toString();
+                        if (cUID > currentLastUID && cUID < end) {
+                            currentLastUID = cUID;
+                        }
                         continue;
                     }
                 }
@@ -270,6 +270,9 @@ export default class SyncMailboxWorkflow extends Workflow<any, any> {
                     isDraft,
                     silent: true
                 });
+                if (cUID > currentLastUID && cUID < end) {
+                    currentLastUID = cUID;
+                }
                 // console.log(`Saved ${uid}`);
             }