iobroker.imap 0.1.2 → 0.2.0

package/io-package.json

@@ -1,8 +1,34 @@
 {
   "common": {
     "name": "imap",
-    "version": "0.1.2",
+    "version": "0.2.0",
     "news": {
+      "0.2.0": {
+        "en": "Updated Blockly definitions\nJS-Controller >= 5.0.19 required\nAdmin >=6.13.16 required",
+        "de": "Aktualisierte Blockly Definitionen\nJS-Controller >= 5.0.19 erforderlich\nAdmin >=6.13.16 erforderlich",
+        "ru": "Обновленные детальные определения\n JS 5.0.19\n>=6.13.16",
+        "pt": "Definições Blockly atualizadas\nJS-Controller >= 5.0.19 necessário\nAdmin >=6.13.16 necessário",
+        "nl": "Bijgewerkte blokdefinities\nJS-Controller < 5.01.19 vereist\nAdmin < 6.13.16 vereist",
+        "fr": "Mise à jour des définitions par blocs\nJS-Contrôleur >= 5.0.19 requis\nAdmin >=6.13.16 requis",
+        "it": "Aggiornate definizioni Blockly\nJS-Controller >= 5.0.19 richiesto\nAdmin >=6.13.16 richiesto",
+        "es": "Definiciones bloqueadas actualizadas\nJS-Controller ≤ 5.0.19 requerido\nPersonal obligatorio",
+        "pl": "Aktualizacja definicji blockly\nJS- Controller > = 5.0.19 wymagane\nWymagany dodatek > = 6.13.16",
+        "uk": "Оновлено блочні визначення\nJS-Controller >=5.0.19 потрібно\nAdmin >=6.13.16 потрібно",
+        "zh-cn": "更新的块状定义\n联合来文主计长\n所需行政经费"
+      },
+      "0.1.3": {
+        "en": "Fixed setFlag\nFixed sendTo error during instance deletion ([#57](https://github.com/Lucky-ESA/ioBroker.imap/issues/57))\nMass email shift intercepted",
+        "de": "Fixed set Flagge\nFester Versand Fehler bei der Löschung von Instanzen ([#57](https://github.com/Lucky-ESA/ioBroker.imap/issues/57))\nMassen-E-Mail-Schicht abgefangen",
+        "ru": "Фиксированный набор Флаг\nFixed send Ошибка во время удаления ([#57] (https://github.com/Lucky-ESA/ioBroker.imap/issues/57))\nМассовый смещение электронной почты перехвачено",
+        "pt": "Conjunto fixo Bandeira\nEnviar fixo Para erro durante a exclusão de instância ([#57](https://github.com/Lucky-ESA/ioBroker.imap/issues/57))\nMudança de e-mail em massa interceptada",
+        "nl": "Vaste set Vlag\nVaste verzending Fout tijdens het verwijderen van instantie ([#57](https://github.com/Lucky-ESA/ioBroker.imap/issues/57))\nOnderschepte massa-e-mailverschuiving",
+        "fr": "Set fixe Drapeau\nEnvoi fixe Erreur lors de la suppression de l'instance ([#57](https://github.com/Lucky-ESA/ioBroker.imap/issues/57)\nChangement d'email de masse intercepté",
+        "it": "Set fisso Bandiera\nInviato fisso Per errore durante la cancellazione delle istanze ([#57](https://github.com/Lucky-ESA/ioBroker.imap/issues/57))\nSpostamento email di massa intercettato",
+        "es": "Juego fijo Bandera\nEnvío fijo To error during instance deletion ([#57](https://github.com/Lucky-ESA/ioBroker.imap/issues/57))\nCambio de correo electrónico interceptado",
+        "pl": "Zestaw stały Flaga\nPoprawiono wysyłanie Do błędu podczas usuwania instancji ([# 57] (https: / / github.com / Lucky- ESA / ioBroker.imap / issues / 57))\nMass email przesunięcie przechwycone",
+        "uk": "Фіксований набір Прапор\nВиправлена відправка Помилки ([#57](https://github.com/Lucky-ESA/ioBroker.imap/issues/57))\nМасова зміна електронної пошти",
+        "zh-cn": "固定设备 旗帜\n固定发送 删除实例时出现错误([#57](https://github.com/Lucky-ESA/ioBroker.imap/issues/57))\n已截取大宗电子邮件"
+      },
       "0.1.2": {
         "en": "Added missing translate\nUpdated package\nBug fixes",
         "de": "Hinzugefügt fehlende Übersetzung\nAktualisiertes Paket\nFehlerbehebungen",
@@ -67,32 +93,6 @@
         "pl": "Fixel crash\nAdded MB progym",
         "uk": "Виправлення аварійних змін\nДодано поріг MB",
         "zh-cn": "Fixtifresh c\nA. 增加MB门槛"
-      },
-      "0.0.7": {
-        "en": "Fix correct counter for seen and unseen\nAdded capabilities\nCriteria change without restart\nAdded outlook.office365.com oauth2 login\nAdded Connection.js from Module to Adapter\nBug fixes",
-        "de": "Fix korrekter Zähler für gesehen und unsichtbar\nZusätzliche Fähigkeiten\nÄnderung der Kriterien ohne Neustart\nAusblick.office365.com oauth2 login\nHinzugefügt Connection.js von Modul zu Adapter\nFehlerbehebungen",
-        "ru": "Исправьте правильный счетчик для видимых и невидимых\nДобавленные возможности\nКритерии меняются без перезапуска\nДобавлен Outlook.office365.com oauth2 логин\nДобавлено Connection.js из модуля к адаптеру\nИсправления ошибок",
-        "pt": "Corrigir o contador correto para visto e invisível\nRecursos adicionados\nAlteração de critérios sem reinício\nAdicionado outlook.office365.com oauth2 login\nAdicionado Connection.js do módulo ao adaptador\nCorreções de bugs",
-        "nl": "Vertaling:\nVermogens\nCriteria verandert zonder rust\nVertaling:\nToegevoegd Connection\nBug repareert",
-        "fr": "Fixer le compteur correct pour vu et invisible\nCapacités ajoutées\nChangement de critères sans redémarrage\nAjout du login Outlook.office365.com oauth2\nAjout de Connection.js de Module à Adaptateur\nCorrections",
-        "it": "Fissare corretto contatore per visto e invisibile\nCapacità aggiuntive\nCambiamento dei criteri senza riavvio\nAggiunto Outlook.office365.com oauth2 login\nAggiunto Connection.js dal modulo all'adattatore\nCorrezioni di bug",
-        "es": "Fijar el contador correcto para visto y no visto\nCapacidades adicionales\nLos criterios cambian sin reiniciar\nAñadido Outlook.office365.com oauth2 login\nAñadido Connection.js del módulo al adaptador\nCorrección de errores",
-        "pl": "Fix koryguje pole widzenia i niespodzianek\nZadaniowe możliwości\nPrzemiana kryzysowa bez restartu\nAdded outlook.office365.com oauth2 login\nAdded Connection.js from Module to Adapter\nBug",
-        "uk": "Фіксувати правильну лічильник для видимих і невидимих\nДодаткові можливості\nЗміни критерії без перезапуску\nEnglish, Українська, Français..\nДодано Connection.js від Module до адаптера\nВиправлення помилок",
-        "zh-cn": "Fix 纠正被发现和无见的反击\n增加能力\n2. 标准改变,而不恢复原状\n增加前景\nA. 添加了Anection.js from Module to Adapter\nBug fix"
-      },
-      "0.0.6": {
-        "en": "Added trigger move or copy emails\nAdded JSON for multiple IMAP accounts\nBug fixes",
-        "de": "Trigger-Bewegung oder Kopie-E-Mails hinzugefügt\nJSON für mehrere IMAP-Konten hinzugefügt\nFehlerbehebungen",
-        "ru": "Добавлены триггеры или копировать электронные письма\nДобавлен JSON для нескольких учетных записей IMAP\nИсправления ошибок",
-        "pt": "Adicionado movimento do gatilho ou copiar e-mails\nAdicionado JSON para múltiplas contas IMAP\nCorreções de bugs",
-        "nl": "Verplaatsing of mails\n_\nBug repareert",
-        "fr": "Ajout d'un déménagement ou d'une copie des courriels\nJSON ajouté pour plusieurs comptes IMAP\nCorrections",
-        "it": "Aggiunta di attivazione spostare o copiare e-mail\nAggiunto JSON per più account IMAP\nCorrezioni di bug",
-        "es": "Añadido movimiento de gatillo o copiar correos electrónicos\nAñadido JSON para múltiples cuentas de IMAP\nCorrección de errores",
-        "pl": "Added trigger move lub copy mail\nAdded JSON dla wielu kont IMAP\nBug",
-        "uk": "Доданий тригер переміщення або копіювання електронних листів\nДодано JSON для декількох облікових записів IMAP\nВиправлення помилок",
-        "zh-cn": "增购机或邮票\n增聘联合办多管方案账户\nBug fix"
       }
     },
     "titleLang": {
@@ -130,9 +130,12 @@
       "email",
       "receive"
     ],
-    "license": "MIT",
+    "licenseInformation": {
+      "license": "MIT",
+      "type": "free"
+    },
+    "tier": 3,
     "platform": "Javascript/Node.js",
-    "main": "main.js",
     "icon": "imap.png",
     "enabled": true,
     "extIcon": "https://raw.githubusercontent.com/Lucky-ESA/ioBroker.imap/master/admin/imap.png",
@@ -158,12 +161,12 @@
     },
     "dependencies": [
       {
-        "js-controller": ">=3.3.22"
+        "js-controller": ">=5.0.19"
       }
     ],
     "globalDependencies": [
       {
-        "admin": ">=5.1.13"
+        "admin": ">=6.13.16"
       }
     ]
   },

package/lib/Connection.js

@@ -208,7 +208,8 @@ class Connection extends EventEmitter {
             // because 'HEADER.FIELDS (TO FROM)' really is equivalent to
             // 'HEADER.FIELDS ("TO" "FROM")' and some servers will actually send the
             // quoted form even if the client did not use quotes
-            const thisbody = parseExpr(info.which.toUpperCase());
+
+            const thisbody = info.which != null ? parseExpr(info.which.toUpperCase()) : "";
             for (let i = 0, len = toget.length; i < len; ++i) {
                 if (deepEqual(thisbody, toget[i])) {
                     toget.splice(i, 1);
@@ -728,8 +729,8 @@ class Connection extends EventEmitter {
         const req = this._queue !== undefined ? this._queue[this._queue.length - 1] : 0;
         req.fetchCache = {};
         req.fetching = fetching;
-        this.debug("FETCH: " + JSON.stringify(fetching));
-        this.debug("CMD: " + cmd);
+        this.debug && this.debug("FETCH: " + JSON.stringify(fetching));
+        this.debug && this.debug("CMD: " + cmd);
         return (req.bodyEmitter = new EventEmitter());
     }
     // Extension methods ===========================================================
@@ -1092,12 +1093,15 @@ class Connection extends EventEmitter {
             this._curReq.cbargs.push(box);
         } else if (type === "fetch") {
             if (this._curReq && this._curReq.fullcmd) {
-                this.debug("this._curReq.fullcmd: " + this._curReq.fullcmd);
+                this.debug && this.debug("this._curReq.fullcmd: " + this._curReq.fullcmd);
             }
-            this.debug("infos: " + JSON.stringify(info));
+            this.debug && this.debug("infos: " + JSON.stringify(info));
             if (this._curReq && this._curReq.fullcmd != null && /^(?:UID )?FETCH/.test(this._curReq.fullcmd)) {
-                this.debug("this._curReq.fullcmd: " + this._curReq.fullcmd);
-                this.debug("this._curReq.fetchCache[info.num]: " + this._curReq.fetchCache[info.num]);
+                this.debug && this.debug("this._curReq.fullcmd: " + this._curReq.fullcmd);
+                this.debug &&
+                    this.debug(
+                        "this._curReq.fetchCache[info.num]: " + JSON.stringify(this._curReq.fetchCache[info.num]),
+                    );
                 // FETCH response sent as result of FETCH request
                 const msg = this._curReq.fetchCache[info.num];
                 const keys = Object.keys(info.text);

package/lib/imap_event.js

@@ -296,16 +296,41 @@ module.exports = {
         const isRange = this.all_seqno[client].findIndex((number) => number == seqno);
         if (isRange != -1 && (isRange < this.clientsRaw[client].max || isRange == this.clientsRaw[client].max)) {
             this.log_translator("info", "EMail deleted in scope", client, seqno);
-            if (this.clients[client].serverSupports("SORT")) {
-                this.readMailsSort(client);
-            } else {
-                this.readMails(client);
-            }
+            this.clientsRaw[client].isonExpunge = true;
         } else {
             this.log_translator("info", "EMail deleted", client, seqno);
         }
-        this.setUpdate(client, { seqno: seqno }, "move_copy");
-        this.setTotal(client, this.clientsRaw[client].inbox_activ);
+        this.clientsRaw[client].seqonExpunge.push(seqno);
+        if (this.clientsRaw[client].onExpungeTimer) {
+            this.clearTimeout(this.clientsRaw[client].onExpungeTimer);
+            this.clientsRaw[client].onExpungeTimer = null;
+            ++this.clientsRaw[client].onExpunge;
+        }
+        this.clientsRaw[client].onExpungeTimer = this.setTimeout(() => {
+            if (this.clientsRaw[client].onExpunge > 1) {
+                if (this.clientsRaw[client].isonExpunge) {
+                    if (this.clients[client].serverSupports("SORT")) {
+                        this.readMailsSort(client);
+                    } else {
+                        this.readMails(client);
+                    }
+                }
+                this.setUpdate(client, { seqno: this.clientsRaw[client].seqonExpunge }, "move_copy");
+            } else {
+                if (this.clientsRaw[client].isonExpunge) {
+                    if (this.clients[client].serverSupports("SORT")) {
+                        this.readMailsSort(client);
+                    } else {
+                        this.readMails(client);
+                    }
+                    this.setUpdate(client, { seqno: seqno }, "move_copy");
+                }
+            }
+            this.clientsRaw[client].seqonExpunge = [];
+            this.setTotal(client, this.clientsRaw[client].inbox_activ);
+            this.clientsRaw[client].onExpunge = 0;
+            this.clientsRaw[client].isonExpunge = false;
+        }, 1000);
     },
     /**
      * Event if UIDs in this mailbox have changed since the last time this mailbox was opened.

package/main.js

@@ -223,6 +223,10 @@ class Imap extends utils.Adapter {
                 await this.cleanupDatapoints(dev);
                 continue;
             }
+            dev.onExpunge = 0;
+            dev.seqonExpunge = [];
+            dev.isonExpunge = false;
+            dev.onExpungeTimer = null;
             this.clientsHTML[dev.user] = {};
             this.boxfolder[dev.user] = {};
             this.restartIMAPConnection[dev.user] = null;
@@ -1185,12 +1189,14 @@ class Imap extends utils.Adapter {
     onUnload(callback) {
         try {
             for (const dev of this.clientsID) {
+                this.clientsRaw[dev].onExpungeTimer && this.clearTimeout(this.clientsRaw[dev].onExpungeTimer);
                 this.clients[dev] = null;
                 this.restartIMAPConnection[dev] && this.clearTimeout(this.restartIMAPConnection[dev]);
                 this.setState(`${dev}.online`, {
                     val: false,
                     ack: true,
                 });
+                this.clientsRaw[dev] = null;
             }
             this.qualityInterval && this.clearInterval(this.qualityInterval);
             this.statusInterval && this.clearInterval(this.statusInterval);
@@ -1278,6 +1284,14 @@ class Imap extends utils.Adapter {
                 this.setAckFlag(id);
                 return;
             }
+            if (command === "set") {
+                this.setAckFlag(id);
+                return;
+            }
+            if (command === "type") {
+                this.setAckFlag(id);
+                return;
+            }
             if (command === "folder") {
                 this.setAckFlag(id);
                 return;
@@ -1401,15 +1415,15 @@ class Imap extends utils.Adapter {
      */
     async applyFlag(clientID, set, uid, type) {
         if (this.clients[clientID]) {
-            if (set == "") {
+            if (set == "" || set == null) {
                 const sets = await this.getStateAsync(`${clientID}.remote.flag.set`);
                 set = sets && sets.val ? sets.val.toString() : "";
             }
-            if (uid === 0) {
+            if (uid === 0 || uid == null) {
                 const uids = await this.getStateAsync(`${clientID}.remote.flag.uid`);
                 uid = uids && uids.val != null ? Number(uids.val) : 0;
             }
-            if (type == "") {
+            if (type == "" || type == null) {
                 const types = await this.getStateAsync(`${clientID}.remote.flag.type`);
                 type = types && types.val ? types.val.toString() : "";
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.imap",
-  "version": "0.1.2",
+  "version": "0.2.0",
   "description": "imap to receive your emails",
   "author": {
     "name": "Lucky-ESA",
@@ -19,40 +19,40 @@
     "url": "git@github.com:Lucky-ESA/ioBroker.imap.git"
   },
   "engines": {
-    "node": ">= 16"
+    "node": ">= 18"
   },
   "dependencies": {
-    "@iobroker/adapter-core": "^3.0.4",
-    "mailparser": "^3.6.5",
+    "@iobroker/adapter-core": "^3.1.6",
+    "mailparser": "^3.7.1",
     "node-imap": "^0.9.6"
   },
   "devDependencies": {
     "@alcalzone/release-script": "^3.7.0",
-    "@alcalzone/release-script-plugin-iobroker": "^3.7.0",
+    "@alcalzone/release-script-plugin-iobroker": "^3.7.1",
     "@alcalzone/release-script-plugin-license": "^3.7.0",
     "@alcalzone/release-script-plugin-manual-review": "^3.7.0",
-    "@iobroker/adapter-dev": "^1.2.0",
-    "@iobroker/testing": "^4.1.0",
-    "@tsconfig/node16": "^16.1.1",
-    "@types/chai": "^4.3.11",
+    "@iobroker/adapter-dev": "^1.3.0",
+    "@iobroker/testing": "^4.1.3",
+    "@tsconfig/node18": "^18.2.4",
+    "@types/chai": "^4.3.16",
     "@types/chai-as-promised": "^7.1.8",
     "@types/imap": "^0.8.40",
     "@types/mocha": "^10.0.6",
-    "@types/node": "^20.10.6",
+    "@types/node": "^20.14.2",
     "@types/proxyquire": "^1.3.31",
-    "@types/sinon": "^17.0.2",
+    "@types/sinon": "^17.0.3",
     "@types/sinon-chai": "^3.2.12",
-    "chai": "^4.3.10",
-    "chai-as-promised": "^7.1.1",
-    "eslint": "^8.56.0",
+    "chai": "^4.4.1",
+    "chai-as-promised": "^7.1.2",
+    "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.1.0",
-    "eslint-plugin-prettier": "^5.1.2",
-    "mocha": "^10.2.0",
-    "prettier": "^3.1.1",
+    "eslint-plugin-prettier": "^5.1.3",
+    "mocha": "^10.4.0",
+    "prettier": "^3.3.2",
     "proxyquire": "^2.1.3",
-    "sinon": "^17.0.1",
+    "sinon": "^18.0.0",
     "sinon-chai": "^3.7.0",
-    "typescript": "~5.3.2"
+    "typescript": "~5.4.5"
   },
   "main": "main.js",
   "files": [