iobroker.ical 1.16.0 → 1.16.1

package/README.md

@@ -31,6 +31,11 @@ Sentry reporting, starting with js-controller 3.0, means that this adapter can u
 	Placeholder for the next version (at the beginning of the line):
 	### **WORK IN PROGRESS**
 -->
+### 1.16.1 (2024-11-01)
+* (jens-maus) fix issue with handling rrule timezones incorrect with latest node-ical (#708).
+* (jens-maus) update node-ical to latest 0.20.1
+* (jens-maus) save cached files to os tmpdir instead.
+
 ### 1.16.0 (2024-10-29)
 * (cvoelkel76) add checkbox to allow to exactly match a calender event.
 * (jens-maus) update node-ical to latest 0.20.0
@@ -47,10 +52,6 @@ Sentry reporting, starting with js-controller 3.0, means that this adapter can u
 ### 1.14.2 (2024-01-29)
 * (jens-maus) update node-ical to latest 0.17.2
 
-### 1.14.1 (2024-01-29)
-* (klein0r) Create dummy file in files tab
-* (klein0r) Fixed recurring events
-
 ## License
 
 The MIT License (MIT)

package/io-package.json

@@ -1,8 +1,21 @@
 {
   "common": {
     "name": "ical",
-    "version": "1.16.0",
+    "version": "1.16.1",
     "news": {
+      "1.16.1": {
+        "en": "fix issue with handling rrule timezones incorrect with latest node-ical (#708).\nupdate node-ical to latest 0.20.1\nsave cached files to os tmpdir instead.",
+        "de": "problem mit dem umgang mit rrule zeitzonen falsch mit neusten node-ical (#708).\nupdate node-ical bis neueste 0.20.1\nspeichern sie cache-dateien auf os tmpdir statt.",
+        "ru": "исправить проблему с обработкой часовых поясов правила некорректно с последними узлами (#708).\nобновление узла к последним 0.20.1\nвместо этого сохранить кэшированные файлы в os tmpdir.",
+        "pt": "corrigir problema com manipulação rrule fusos horários incorreta com o mais recente node-ical (#708).\natualização node-ical para mais recente 0.20.1\nsalvar arquivos em cache para os tmpdir em vez disso.",
+        "nl": "fix probleem met de behandeling rrule tijdzones incorrect met de laatste node-ical (#708).\nnode-ical updaten naar de laatste 0.20.1\nbewaar gecachede bestanden in plaats daarvan in os tmpdir.",
+        "fr": "corriger le problème avec la manipulation des fuseaux horaires rrule incorrecte avec le dernier nœud (#708).\nmettre à jour node-ical au dernier 0.20.1\nenregistrer les fichiers mis en cache dans os tmpdir à la place.",
+        "it": "risolvere il problema con la gestione di fusi orari non corretto con ultimo nodo-ical (#708).\naggiornamento nodo-ical al più recente 0.20.1\nsalvare i file memorizzati in cache a os tmpdir invece.",
+        "es": "solucionar problema con el manejo rrule timezones incorrecto con el último node-ical (#708).\nactualización node-ical al último 0.20.1\nguardar archivos en caché a os tmpdir en su lugar.",
+        "pl": "problem z obsługą rrule strefy czasu nieprawidłowy z najnowszym nodeical (# 708).\nupdate node- ical do najnowszej wersji 0.20.1\nzapisać pliki cached do os tmpdir zamiast.",
+        "uk": "виправлено проблему з використанням rrule timezones, некоректних з найновішою вершиною (#708).\nоновлення вершини-ical до останньої 0.20.1\nзберегти кешовані файли на os tmpdir замість.",
+        "zh-cn": "将处理rrule时区的问题与最新节点错误(# 708).\n将节点更新为最新的0.20.1\n将缓存的文件保存到 os tmpdir ."
+      },
       "1.16.0": {
         "en": "add checkbox to allow to exactly match a calender event.\nupdate node-ical to latest 0.20.0\nBreaking change: Removed trigger state (subscribe is deprecated in js-controller 6.x)\nResponsive design added",
         "de": "fügen sie checkbox hinzu, um ein kalenderereignis genau zu vereinbaren.\nupdate node-ical bis neueste 0.20.0\nBruchänderung: Entfernter Triggerzustand (Abonnent wird in js-Controller 6.x abgeschrieben)\nResponsive Design hinzugefügt",
@@ -80,19 +93,6 @@
         "pl": "Zezwalaj na ustawianie niestandardowych użytkowników http\nDodano opcję użycia zakładki plików do plików kalendarza",
         "uk": "Дозвольте встановити користувальницький агент\nДодана можливість використовувати вкладку файлів для календарних файлів",
         "zh-cn": "允许设置自定义 http 用户代理\n为日历文件使用文件标签添加了选项"
-      },
-      "1.13.6": {
-        "en": "Incorrect jsonConfig has been fixed [#602]\nDependencies have been updated",
-        "de": "Fehler in jsonConfig wurde behoben [#602]\nAbhängigkeiten wurden aktualisiert",
-        "ru": "Неправильный jsonConfig был исправлен [#602]\nВ зависимости были обновлены",
-        "pt": "JsonConfig incorreto foi corrigido [#602]\nAs dependências foram atualizadas",
-        "nl": "Incorrect JsonConfig is gerepareerd\nAfhankelijkheid",
-        "fr": "Incorrect jsonConfig a été corrigé [#602]\nLes dépendances ont été mises à jour",
-        "it": "JsonConfig non corretto è stato fissato [#602]\nLe dipendenze sono state aggiornate",
-        "es": "JsonConfig incorrecto ha sido fijado [#602]\nSe han actualizado las dependencias",
-        "pl": "Incorrect jsonConfig został ustalony jako #602\nZależności zostały zaktualizowane",
-        "uk": "[#602]\nОновлено залежність",
-        "zh-cn": "错误的 json Config已确定[第602号]\n已更新了属地"
       }
     },
     "titleLang": {

package/main.js

@@ -5,6 +5,7 @@ const crypto      = require('node:crypto');
 const fs          = require('node:fs');
 const path        = require('node:path');
 const https       = require('node:https');
+const os          = require('node:os');
 
 const utils       = require('@iobroker/adapter-core');
 const adapterName = require('./package.json').name.split('.').pop();
@@ -157,7 +158,7 @@ async function getICal(urlOrFile, user, pass, sslignore, calName, cb) {
         }
 
         const calHash = crypto.createHash('md5').update(user + pass + urlOrFile).digest('hex');
-        const cachedFilename = path.join(__dirname, calHash);
+        const cachedFilename = path.join(os.tmpdir(), 'iob-' + calHash + '.ics');
 
         axios(options).then(function (response) {
             if (response.data) {
@@ -283,7 +284,7 @@ async function processData(data, realnow, startpreview, endpreview, now2, calNam
 
         // only events with summary and a start date are interesting
         if ((ev.summary !== undefined) && (ev.type === 'VEVENT') && ev.start && ev.start instanceof Date) {
-            adapter.log.debug(`ev: ${JSON.stringify(ev)}`);
+            adapter.log.debug(`ev[${k}]: ${JSON.stringify(ev)}`);
             if (!ev.end || !(ev.end instanceof Date)) {
                 ev.end = new Date(ev.start.getTime());
                 if (ev.start.getHours() === 0 && ev.start.getMinutes() === 0 && ev.start.getSeconds() === 0) {
@@ -363,11 +364,11 @@ options: ${JSON.stringify(options)}`
                             // this event will be recognized as a date event
                             ev2.start.setHours(0,0,0,0);
                         } else if (ev.datetype === 'date-time') {
-                            // add a time offset which is relative between
-                            // ev2 and ev because rrule seems to return dates in
-                            // local time only. And if not correctly the exdate
-                            // check later will not work correctly.
-                            ev2.start = addOffset(ev2.start, ev2.start.getTimezoneOffset() - ev.start.getTimezoneOffset());
+                            // rrule only knows about local time but stores the
+                            // datetime in zulu (Z) UTC time strings. Thus we need
+                            // to convert it to local time carrying objects, thus
+                            // add the ev2.start tz offset
+                            ev2.start = addOffset(ev2.start, ev2.start.getTimezoneOffset());
                         }
 
                         // Set end date based on length in ms

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.ical",
-  "version": "1.16.0",
+  "version": "1.16.1",
   "description": "Allows read information from google calender and from iCal.",
   "author": {
     "name": "bluefox",
@@ -43,7 +43,7 @@
     "axios": "^1.7.7",
     "cloneextend": "^0.0.3",
     "json-schema": "^0.4.0",
-    "node-ical": "^0.20.0",
+    "node-ical": "^0.20.1",
     "rrule": "2.8.1"
   },
   "devDependencies": {
@@ -56,7 +56,7 @@
     "@types/chai": "^4.3.19",
     "@types/chai-as-promised": "^7.1.8",
     "@types/mocha": "^10.0.8",
-    "@types/node": "^22.7.4",
+    "@types/node": "^22.8.6",
     "@types/proxyquire": "^1.3.31",
     "@types/sinon": "^17.0.3",
     "@types/sinon-chai": "^3.2.12",
@@ -65,7 +65,7 @@
     "chai-string": "^1.5.0",
     "eslint": "^8.56.0",
     "luxon": "^3.5.0",
-    "mocha": "^10.7.3",
+    "mocha": "^10.8.2",
     "proxyquire": "^2.1.3",
     "sinon": "^19.0.2",
     "sinon-chai": "^3.7.0",