diff --git a/admin/index_m.js b/admin/index_m.js
index 8cf50fdd..e0d3050d 100644
--- a/admin/index_m.js
+++ b/admin/index_m.js
@@ -1135,6 +1135,10 @@ function load(settings, onChange) {
fillInstances('whatsappInstance', instances, settings['whatsappInstance'], 'whatsapp-cmb');
});
+ getAdapterInstances('gotify', function (instances) {
+ fillInstances('gotifyInstance', instances, settings['gotifyInstance'], 'gotify');
+ });
+
getAdapterInstances('signal-cmb', function (instances) {
fillInstances('signalInstance', instances, settings['signalInstance'], 'signal-cmb');
});
@@ -1583,6 +1587,7 @@ function showHideSettings(settings) {
$('.email').hide();
$('.pushover').hide();
$('.whatsapp').hide();
+ $('.gotify').hide();
$('.signal').hide();
$('.matrix').hide();
$('.discord').hide();
@@ -1591,6 +1596,7 @@ function showHideSettings(settings) {
$('.telegram').hide();
$('.pushover').hide();
$('.whatsapp').hide();
+ $('.gotify').hide();
$('.signal').hide();
$('.matrix').hide();
$('.discord').hide();
@@ -1599,6 +1605,7 @@ function showHideSettings(settings) {
$('.telegram').hide();
$('.email').hide();
$('.whatsapp').hide();
+ $('.gotify').hide();
$('.signal').hide();
$('.matrix').hide();
$('.discord').hide();
@@ -1606,6 +1613,7 @@ function showHideSettings(settings) {
} else if ($(this).val() === 'WhatsApp') {
$('.telegram').hide();
$('.email').hide();
+ $('.gotify').hide();
$('.pushover').hide();
$('.signal').hide();
$('.matrix').hide();
@@ -1614,6 +1622,7 @@ function showHideSettings(settings) {
} else if ($(this).val() === 'Signal') {
$('.telegram').hide();
$('.email').hide();
+ $('.gotify').hide();
$('.pushover').hide();
$('.whatsapp').hide();
$('.matrix').hide();
@@ -1622,6 +1631,7 @@ function showHideSettings(settings) {
} else if ($(this).val() === 'Matrix') {
$('.telegram').hide();
$('.email').hide();
+ $('.gotify').hide();
$('.pushover').hide();
$('.whatsapp').hide();
$('.signal').hide();
@@ -1630,11 +1640,21 @@ function showHideSettings(settings) {
} else if ($(this).val() === 'Discord') {
$('.telegram').hide();
$('.email').hide();
+ $('.gotify').hide();
$('.pushover').hide();
$('.whatsapp').hide();
$('.signal').hide();
$('.matrix').hide();
$('.discord').show();
+ } else if ($(this).val() === 'Gotify') {
+ $('.telegram').hide();
+ $('.email').hide();
+ $('.discord').hide();
+ $('.pushover').hide();
+ $('.whatsapp').hide();
+ $('.signal').hide();
+ $('.matrix').hide();
+ $('.gotify').show();
}
}).trigger('change');
diff --git a/admin/words.js b/admin/words.js
index ef43ebbd..b5ccb1a0 100644
--- a/admin/words.js
+++ b/admin/words.js
@@ -104,6 +104,8 @@ var _systemDictionary = {
"Google Drive Path for iobroker backup": { "en": "Google Drive path for ioBroker backup", "de": "Google Drive Pfad für ioBroker Sicherung", "ru": "Путь для резервного копирования ioBroker", "pt": "Caminho do Google Drive para backup do iobroker", "nl": "Google Drive Path voor iobroker-back-up", "fr": "Google Drive Path pour la sauvegarde iobroker", "it": "Percorso di Google Drive per il backup di iobroker", "es": "Ruta de Google Drive para copia de seguridad de iobroker", "pl": "Ścieżka do Dysku Google do tworzenia kopii zapasowych iobroker", "uk": "Шлях Google Drive для резервного копіювання ioBroker", "zh-cn": "ioBroker 备份的 Google Drive 路径"},
"Google Drive path": { "en": "Google Drive path", "de": "Google Drive Pfad", "ru": "Путь", "pt": "Caminho do Google Drive", "nl": "Google Drive-pad", "fr": "Chemin Google Drive", "it": "Percorso di Google Drive", "es": "Ruta de acceso de Google Drive", "pl": "Ścieżka Dysku Google", "uk": "Шлях Google Drive", "zh-cn": "谷歌云端硬盘路径"},
"Google Drive: Yes": { "en": "Google Drive: Yes", "de": "Google Drive: Ja", "ru": "Google Диск: Да", "pt": "Google Drive: sim", "nl": "Google Drive: ja", "fr": "Google Drive: oui", "it": "Google Drive: sì", "es": "Google Drive: si", "pl": "Dysk Google: Tak", "uk": "Диск Google: так", "zh-cn": "谷歌驱动器：是的"},
+ "Gotify": { "en": "Gotify", "de": "Gotify", "ru": "Gotify", "pt": "Gotify", "nl": "Gotify", "fr": "Gotify", "it": "Gotify", "es": "Gotify", "pl": "Gotify", "uk": "Gotify", "zh-cn": "Gotify"},
+ "Gotify instance": { "en": "Gotify instance", "de": "Gotify Instanz", "ru": "Gotify пример", "pt": "Exemplo de identificação", "nl": "Vertaling:", "fr": "Gotify instance", "it": "Esempio di guadagno", "es": "Caso Gotify", "pl": "Gotyfikować", "uk": "Зареєструватися", "zh-cn": "评 注"},
"Grafana API-Key or Service Token": { "en": "Grafana API-Key or Service Token", "de": "Grafana API-Key oder Service Token", "ru": "Grafana API-Key или сервисный токен", "pt": "Gráfico API-Key ou Token de Serviço", "nl": "Grafana API-Key of Service Token", "fr": "Grafana API-Key ou jeton de service", "it": "Token API-Key o servizio Grafana", "es": "Grafana API-Key o Token de servicio", "pl": "Grafana API-Key or Service Token (ang.)", "uk": "API-ключ або маркер служби Grafana", "zh-cn": "Grafana API 密钥或服务令牌"},
"Grafana Backup": { "en": "Grafana", "de": "Grafana", "ru": "Grafana", "pt": "Grafana", "nl": "Grafana", "fr": "Grafana", "it": "Grafana", "es": "Grafana", "pl": "Grafana", "uk": "Графана", "zh-cn": "格拉法纳"},
"Grafana Hostname": { "en": "Grafana host name / IP", "de": "Grafana Hostname / IP", "ru": "Имя хоста / IP", "pt": "Nome / IP do host Grafana", "nl": "Grafana hostnaam / IP", "fr": "Nom d'hôte / IP Grafana", "it": "Nome host / IP Grafana", "es": "Nombre de host / IP de Grafana", "pl": "Nazwa / adres IP hosta Grafana", "uk": "Ім'я хосту Grafana / IP", "zh-cn": "Grafana 主机名/IP"},
diff --git a/io-package.json b/io-package.json
index e025a076..407f916a 100644
--- a/io-package.json
+++ b/io-package.json
@@ -1,8 +1,34 @@
{
"common": {
"name": "backitup",
- "version": "2.9.5",
+ "version": "2.9.7",
"news": {
+ "2.9.7": {
+ "en": "URL Update\nFix redis Password",
+ "de": "URL aktualisieren\nRedis Passwort vergessen",
+ "ru": "URL Обновление\nFix редис Пароль",
+ "pt": "Atualização de URL\nCorrigir vermelho Senha",
+ "nl": "URL Update\nVertaling: Wachtwoord",
+ "fr": "URL Update\nCorrection redis Mot de passe",
+ "it": "Aggiornamento\nRipartizione Password",
+ "es": "Actualización de URL\nArreglar redis Contraseña",
+ "pl": "URL\nFix redis Password",
+ "uk": "Оновлення URL\nФіксований червоний Логін",
+ "zh-cn": "URL最新情况\nFix 重新定性 护照"
+ },
+ "2.9.6": {
+ "en": "Gotify Notication added\ndependencies updated\nCopypath check added",
+ "de": "Gotify Notication hinzugefügt\naktualisierte abhängigkeiten\nCopypath Check hinzugefügt",
+ "ru": "Получить Notication добавлено\nзависимости обновлены\nПроверка Copypath добавлена",
+ "pt": "Gotify Notication adicionado\ndependências atualizadas\nVerificação de copypath adicionado",
+ "nl": "Vertaling:\nafhankelijkheid geüpdateerd\nBegrepen",
+ "fr": "Gotify Notication added\ndépendances mises à jour\nCopypath check added",
+ "it": "Gotify Notication aggiunto\ndipendenze aggiornate\nControllo Copypath aggiunto",
+ "es": "Gotify Notication added\ndependencias actualizadas\nChequeo de cómputo añadido",
+ "pl": "Gotify Notication (ang.)\naktualizacja\nKontrola Copypatha",
+ "uk": "Додана нотифікація\nоновлені залежності\nКопіювати чек додано",
+ "zh-cn": "提名\nb. 更新的依赖\n虫害检查"
+ },
"2.9.5": {
"en": "dependencies updated\nFix redis Password",
"de": "aktualisierte abhängigkeiten\nRedis Passwort vergessen",
@@ -67,32 +93,6 @@
"pl": "ignorowanie Directory Build dla ESPHome dodały",
"uk": "про нас Створіть каталог для ESPHome",
"zh-cn": "忽视 ESPHome的布兰德名主任补充说"
- },
- "2.9.0": {
- "en": "mount option \"Cache Loose\" added\nESPHome Backup added\ndependencies updated",
- "de": "mount Option \"Cache Loose\" hinzugefügt\nESPHome Backup hinzugefügt\naktualisierte abhängigkeiten",
- "ru": "mount option \"Cache Loose\" добавлен\nESPHome Backup добавлен\nзависимости обновлены",
- "pt": "opção de montagem \"Cache Loose\" adicionado\nESPHome Backup adicionado\ndependências atualizadas",
- "nl": "mount optie \"Cache Loose\" toegevoegd\nVersterking toegevoegd\nafhankelijkheid geüpdateerd",
- "fr": "option de montage \"Cache Loose\" ajouté\nESPHome Backup ajouté\ndépendances mises à jour",
- "it": "opzione di montaggio \"Cache Loose\" aggiunto\nESPHome Backup aggiunto\ndipendenze aggiornate",
- "es": "opción de montaje \"Cache Loose\" añadido\nESPHome Backup añadido\ndependencias actualizadas",
- "pl": "\"Cache Loose\" dodał opcję \"Cache Loose\"\nESPHome Backup\naktualizacja",
- "uk": "додано варіант кріплення \"Cache Loose\"\nESPHome Backup додано\nоновлені залежності",
- "zh-cn": "增加的“每一”选择\nESPHome Back增加\nb. 更新的依赖"
- },
- "2.8.7": {
- "en": "fix restore in docker v9",
- "de": "wiederherstellen in docker v9",
- "ru": "исправить восстановление в docker v9",
- "pt": "corrigir restauração no docker v9",
- "nl": "herstellen in docker v9",
- "fr": "restaurer dans docker v9",
- "it": "fix ripristino in docker v9",
- "es": "reparación de reparación en docker v9",
- "pl": "odzyskanie odszkodowania v9",
- "uk": "виправити відновлення в docker v9",
- "zh-cn": "fix 复印机 v 9"
}
},
"title": "BackItUp",
@@ -394,6 +394,10 @@
"whatsappNoticeType": "longWhatsappNotice",
"whatsappOnlyError": false,
"whatsappWaitToSend": 0,
+ "gotifyInstance": "gotify.0",
+ "gotifyNoticeType": "longGotifyNotice",
+ "gotifyOnlyError": false,
+ "gotifyWaitToSend": 0,
"signalInstance": "signal-cmb.0",
"signalNoticeType": "longSignalNotice",
"signalOnlyError": false,
diff --git a/lib/dropboxLib.js b/lib/dropboxLib.js
index 16be7398..00ac6e1e 100644
--- a/lib/dropboxLib.js
+++ b/lib/dropboxLib.js
@@ -2,7 +2,7 @@
const axios = require('axios');
-const OAUTH_URL = 'http://dropboxauth.simateccloud.de/';
+const OAUTH_URL = 'https://dropboxauth.simateccloud.de/';
class dropbox {
getAuthorizeUrl(log) {
@@ -12,7 +12,7 @@ class dropbox {
method: 'get',
url: OAUTH_URL,
headers: {
- 'User-Agent': 'axios/0.21.1'
+ 'User-Agent': 'axios/1.6.2'
},
responseType: 'json'
}).catch(err => log.warn('getAuthorizeUrl Dropbox: ' + err));
@@ -89,7 +89,7 @@ class dropbox {
method: 'get',
url: OAUTH_URL,
headers: {
- 'User-Agent': 'axios/0.21.1'
+ 'User-Agent': 'axios/1.6.2'
},
responseType: 'json'
}).catch(err => log.warn('getClientID Dropbox: ' + err));
diff --git a/lib/execute.js b/lib/execute.js
index 02a3c8e9..ee7b858c 100644
--- a/lib/execute.js
+++ b/lib/execute.js
@@ -238,6 +238,18 @@ function executeScripts(adapter, config, callback, scripts, code) {
}
break;
+ case 'gotify':
+ if (config[name] && config[name].enabled && config[name].notificationsType === 'Gotify') {
+ func = scripts[name];
+ try {
+ options = JSON.parse(JSON.stringify(config));
+ options[name].time = tools.getTimeString(options[name].systemLang); // provide date
+ } catch (e) {
+ callback('cannot parse config for gotify!!');
+ }
+ }
+ break;
+
case 'signal':
if (config[name] && config[name].enabled && config[name].notificationsType === 'Signal') {
func = scripts[name];
@@ -311,6 +323,7 @@ function executeScripts(adapter, config, callback, scripts, code) {
if (_options.pushover && !_options.pushover.enabled) delete _options.pushover;
if (_options.email && !_options.email.enabled) delete _options.email;
if (_options.whatsapp && !_options.whatsapp.enabled) delete _options.whatsapp;
+ if (_options.gotify && !_options.gotify.enabled) delete _options.gotify;
if (_options.discord && !_options.discord.enabled) delete _options.discord;
if (_options.dropbox && !_options.dropbox.enabled) delete _options.dropbox;
if (_options.onedrive && !_options.onedrive.enabled) delete _options.onedrive;
diff --git a/lib/oneDriveLib.js b/lib/oneDriveLib.js
index 9ddb254d..df4e79b9 100644
--- a/lib/oneDriveLib.js
+++ b/lib/oneDriveLib.js
@@ -2,8 +2,7 @@
const axios = require('axios');
-const OAUTH_URL = 'http://onedriveauth.simateccloud.de/';
-//const redirect_uri = 'https://login.live.com/oauth20_desktop.srf';
+const OAUTH_URL = 'https://onedriveauth.simateccloud.de/';
const url = 'https://login.live.com/oauth20_token.srf';
const redirect_uri = 'https://login.microsoftonline.com/common/oauth2/nativeclient';
@@ -15,7 +14,7 @@ class onedrive {
method: 'get',
url: OAUTH_URL,
headers: {
- 'User-Agent': 'axios/1.2.6'
+ 'User-Agent': 'axios/1.6.2'
},
responseType: 'json'
});
@@ -40,7 +39,7 @@ class onedrive {
method: 'get',
url: OAUTH_URL,
headers: {
- 'User-Agent': 'axios/1.2.6'
+ 'User-Agent': 'axios/1.6.2'
},
responseType: 'json'
});
diff --git a/lib/scripts/32-redis.js b/lib/scripts/32-redis.js
index e926f350..0625cecb 100644
--- a/lib/scripts/32-redis.js
+++ b/lib/scripts/32-redis.js
@@ -77,7 +77,6 @@ async function command(options, log, callback) {
data = fs.readdirSync(pth);
} catch (err) {
callback && callback(err);
- //callback = null;
}
}
}
@@ -97,7 +96,6 @@ async function command(options, log, callback) {
err && log.error(err);
if (callback) {
callback(err);
- //callback = null;
}
} else {
compress({
@@ -113,7 +111,6 @@ async function command(options, log, callback) {
stderr && log.error(stderr);
if (callback) {
callback(err, stderr);
- //callback = null;
}
} else {
log.debug(`Backup created: ${fileName}`);
@@ -128,7 +125,6 @@ async function command(options, log, callback) {
} catch (err) {
log.debug(`redis tmp directory "${tmpDir}" cannot deleted ... ${err}`);
callback && callback(err);
- //callback = null;
}
if (callback) {
callback(null, stdout);
@@ -147,16 +143,9 @@ async function command(options, log, callback) {
});
} else if (options.redisType == 'remote') {
- if ((options.pass.startsWith(`"`) && options.pass.endsWith(`"`)) || (options.pass.startsWith(`'`) && options.pass.endsWith(`'`))) {
- options.pass = options.pass;
- } else if (options.pass != '') {
- options.pass = `"${options.pass}"`;
- }
-
const child_process = require('child_process');
try {
- //child_process.exec(`redis-cli -u 'redis://${options.user}:${options.pass}@${options.host}:${options.port}' --rdb ${path.join(tmpDir, 'dump.rdb').replace(/\\/g, '/')}`, (error) => {
child_process.exec(`redis-cli -u 'redis://${options.user != '' && options.pass != '' ? `${options.user}:${options.pass}@` : ''}${options.host}:${options.port}' --rdb ${path.join(tmpDir, 'dump.rdb').replace(/\\/g, '/')}`, (error) => {
if (error) {
clearInterval(timer);
diff --git a/lib/scripts/60-cifs.js b/lib/scripts/60-cifs.js
index da430807..26edd6e4 100644
--- a/lib/scripts/60-cifs.js
+++ b/lib/scripts/60-cifs.js
@@ -95,28 +95,29 @@ function command(options, log, callback) {
}
log.debug(`used copy path: ${dir}`);
- //if (fs.existsSync(options.dir)) {
- //copyFiles(options.dir, fileNames, log, options.context.errors, err => {
if (fs.existsSync(dir)) {
- copyFiles(dir, fileNames, log, options.context.errors, err => {
- if (err) {
- log.error(err);
- options.context.errors.cifs = options.context.errors.cifs || err;
- }
- if (options.deleteOldBackup === true) {
- if (cleanFiles(dir, options, options.context.types, options.deleteBackupAfter, log, options.context.errors)) {
+ if (dir == options.backupDir) {
+ callback && callback(`The storage path "${dir}" for copying is not configured correctly`);
+ } else {
+ copyFiles(dir, fileNames, log, options.context.errors, err => {
+ if (err) {
+ log.error(err);
+ options.context.errors.cifs = options.context.errors.cifs || err;
+ }
+ if (options.deleteOldBackup === true) {
+ if (cleanFiles(dir, options, options.context.types, options.deleteBackupAfter, log, options.context.errors)) {
+ !options.context.errors.cifs && options.context.done.push('cifs');
+ }
+ } else {
!options.context.errors.cifs && options.context.done.push('cifs');
}
- } else {
- !options.context.errors.cifs && options.context.done.push('cifs');
- }
- if (callback) {
- callback(err);
- callback = null;
- }
- });
+ if (callback) {
+ callback(err);
+ callback = null;
+ }
+ });
+ }
} else if (options.mountType === 'Copy') {
- //callback(`Path "${options.dir}" not found`);
callback && callback(`Path "${dir}" not found`);
} else {
callback && callback();
diff --git a/lib/scripts/90-gotify.js b/lib/scripts/90-gotify.js
new file mode 100644
index 00000000..412caf16
--- /dev/null
+++ b/lib/scripts/90-gotify.js
@@ -0,0 +1,213 @@
+'use strict';
+const _ = require('../tools')._;
+
+function command(options, log, callback) {
+
+ setTimeout(function () {
+ if (options.gotify.enabled &&
+ options.adapter &&
+ options.gotify.instance !== '' &&
+ options.gotify.instance !== null &&
+ options.gotify.instance !== undefined) {
+
+ // Send Gotify Message
+ if (options.debugging) {
+ log.debug(`[${options.name}] used Gotify-Instance: ${options.gotify.instance}`);
+ }
+
+ // analyse here the info from options.context.error and options.context.done
+ const errors = Object.keys(options.context.errors);
+
+ if (!errors.length) {
+ let messageText = _('New %e Backup created on %t', options.gotify.systemLang);
+ messageText = messageText.replace('%t', options.gotify.time).replace('%e', `${options.name} ${options.name === 'iobroker' && options.gotify.hostName ? `(${options.gotify.hostName})` : ''}`);
+ if (options.ftp && options.ftp.enabled && options.gotify.NoticeType === 'longGotifyNotice') {
+ const m = _(', and copied / moved via FTP to %h%d', options.gotify.systemLang);
+ messageText += m.replace('%h', options.ftp.host).replace('%d', options.ftp.dir);
+ }
+
+ if (options.cifs && options.cifs.enabled && options.gotify.NoticeType === 'longGotifyNotice') {
+ const m = _(', and stored under %h%d', options.gotify.systemLang);
+ messageText += m.replace('%h', options.cifs.mount).replace('%d', options.cifs.dir);
+ }
+
+ if (options.dropbox && options.dropbox.enabled && options.gotify.NoticeType === 'longGotifyNotice') {
+ messageText += _(', and stored in dropbox', options.gotify.systemLang);
+ }
+
+ if (options.onedrive && options.onedrive.enabled && options.gotify.NoticeType === 'longGotifyNotice') {
+ messageText += _(', and stored in onedrive', options.gotify.systemLang);
+ }
+
+ if (options.googledrive && options.googledrive.enabled && options.gotify.NoticeType === 'longGotifyNotice') {
+ messageText += _(', and stored in google drive', options.gotify.systemLang);
+ }
+
+ if (options.webdav && options.webdav.enabled && options.gotify.NoticeType === 'longGotifyNotice') {
+ messageText += _(', and stored in webdav', options.gotify.systemLang);
+ }
+
+ messageText += '.';
+
+ if (options.gotify.onlyError === false || options.gotify.onlyError === 'false') {
+ options.adapter.sendTo(options.gotify.instance, 'send', {
+ priority: 4,
+ title: 'Backitup:',
+ contentType: 'text/plain',
+ message: messageText
+ });
+ }
+ } else {
+ let errorMessage = _('Your backup was not completely created. Please check the errors!!', options.gotify.systemLang);
+
+ errorMessage += '\n';
+
+ if (options.context.errors.iobroker) errorMessage += '\niobroker: ' + options.context.errors.iobroker;
+ if (options.context.errors.redis) errorMessage += '\nredis: ' + options.context.errors.redis;
+ if (options.context.errors.historyDB) errorMessage += '\nhistoryDB: ' + options.context.errors.historyDB;
+ if (options.context.errors.influxDB) errorMessage += '\ninfluxDB: ' + options.context.errors.influxDB;
+ if (options.context.errors.sqlite) errorMessage += '\nsqlite: ' + options.context.errors.sqlite;
+ if (options.context.errors.nodered) errorMessage += '\nnodered: ' + options.context.errors.nodered;
+ if (options.context.errors.yahka) errorMessage += '\nyahka: ' + options.context.errors.yahka;
+ if (options.context.errors.zigbee) errorMessage += '\nzigbee: ' + options.context.errors.zigbee;
+ if (options.context.errors.zigbee2mqtt) errorMessage += '\nzigbee2mqtt: ' + options.context.errors.zigbee2mqtt;
+ if (options.context.errors.javascripts) errorMessage += '\njavascripts: ' + options.context.errors.javascripts;
+ if (options.context.errors.jarvis) errorMessage += '\njarvis: ' + options.context.errors.jarvis;
+ if (options.context.errors.clean) errorMessage += '\nclean: ' + options.context.errors.clean;
+
+ if (options.context.errors.mount) {
+ errorMessage += '\nmount: ' + options.context.errors.mount;
+ try {
+ const formatPass = options.cifs.pass.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&');
+ errorMessage = (options.cifs && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage);
+ } catch (e) {
+ // ignore
+ }
+ }
+ if (options.context.errors.mysql) {
+ errorMessage += '\nmysql: ' + options.context.errors.mysql;
+ try {
+ const formatPass = options.mysql.pass.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&');
+ errorMessage = (options.mysql && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage);
+ } catch (e) {
+ // ignore
+ }
+ }
+ if (options.context.errors.grafana) {
+ errorMessage += '\ngrafana: ' + options.context.errors.grafana;
+ try {
+ const formatPass = options.grafana.pass.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&');
+ errorMessage = (options.grafana && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage);
+
+ const formatApiKey = options.grafana.apiKey.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&');
+ errorMessage = (options.grafana && formatApiKey ? errorMessage.replace(new RegExp(formatApiKey, 'g'), "****") : errorMessage);
+ } catch (e) {
+ // ignore
+ }
+ }
+
+ if (options.context.errors.webdav) {
+ errorMessage += '\nwebdav: ' + options.context.errors.webdav;
+ try {
+ const formatPass = options.webdav.pass.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&');
+ errorMessage = (options.webdav && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage);
+ } catch (e) {
+ // ignore
+ }
+ }
+ if (options.context.errors.pgsql) {
+ errorMessage += '\npgsql: ' + options.context.errors.pgsql;
+ try {
+ const formatPass = options.pgsql.pass.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&');
+ errorMessage = (options.pgsql && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage);
+ } catch (e) {
+ // ignore
+ }
+ }
+ if (options.context.errors.ccu) {
+ errorMessage += '\nccu: ' + options.context.errors.ccu;
+ try {
+ const formatPass = options.ccu.pass.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&');
+ errorMessage = (options.ccu && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage);
+ } catch (e) {
+ // ignore
+ }
+ }
+ if (options.context.errors.ftp) {
+ errorMessage += '\nftp: ' + options.context.errors.ftp;
+ try {
+ const formatPass = options.ftp.pass.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&');
+ errorMessage = (options.ftp && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage);
+ } catch (e) {
+ // ignore
+ }
+ }
+ if (options.context.errors.dropbox) {
+ errorMessage += '\ndropbox: ' + options.context.errors.dropbox;
+ try {
+ const formatPass = options.dropbox.accessToken.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&');
+ errorMessage = (options.dropbox && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage);
+ } catch (e) {
+ // ignore
+ }
+ }
+ if (options.context.errors.onedrive) {
+ errorMessage += '\nonedrive: ' + options.context.errors.onedrive;
+ try {
+ const formatPass = options.onedrive.onedriveAccessJson.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&');
+ errorMessage = (options.onedrive && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage);
+ } catch (e) {
+ // ignore
+ }
+ }
+ if (options.context.errors.googledrive) {
+ errorMessage += '\ngoogledrive: ' + options.context.errors.googledrive;
+ try {
+ const formatPass = options.googledrive.accessJson.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&');
+ errorMessage = (options.googledrive && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage);
+ } catch (e) {
+ // ignore
+ }
+
+ }
+ if (options.context.errors.cifs) {
+ errorMessage += '\ncifs: ' + options.context.errors.cifs;
+ try {
+ const formatPass = options.cifs.pass.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&');
+ errorMessage = (options.cifs && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage);
+ } catch (e) {
+ // ignore
+ }
+ }
+ if (options.context.errors.umount) {
+ errorMessage += '\numount: ' + options.context.errors.umount;
+ try {
+ const formatPass = options.cifs.pass.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&');
+ errorMessage = (options.cifs && formatPass ? errorMessage.replace(new RegExp(formatPass, 'g'), "****") : errorMessage);
+ } catch (e) {
+ // ignore
+ }
+ }
+ try {
+ errorMessage = errorMessage.replaceAll('undefined', '');
+ } catch (e) {
+ // ignore
+ }
+
+ options.adapter.sendTo(options.gotify.instance, 'send', {
+ priority: 4,
+ title: 'Backitup:',
+ contentType: 'text/plain',
+ message: errorMessage
+ });
+ }
+ }
+ callback && callback();
+ }, options.gotify.gotifyWaiting);
+}
+
+module.exports = {
+ command,
+ ignoreErrors: true,
+ afterBackup: true
+};
\ No newline at end of file
diff --git a/main.js b/main.js
index 493af5ea..066d666b 100644
--- a/main.js
+++ b/main.js
@@ -666,6 +666,19 @@ function initConfig(secret) {
systemLang
};
+ const gotify = {
+ enabled: adapter.config.notificationEnabled,
+ notificationsType: adapter.config.notificationsType,
+ type: 'message',
+ instance: adapter.config.gotifyInstance,
+ NoticeType: adapter.config.gotifyNoticeType,
+ onlyError: adapter.config.gotifyOnlyError,
+ gotifyWaiting: adapter.config.gotifyWaitToSend * 1000,
+ hostName: adapter.config.minimalNameSuffix ? adapter.config.minimalNameSuffix.replace(/[.;, ]/g, '_') : '',
+ ignoreErrors: adapter.config.ignoreErrors,
+ systemLang
+ };
+
const signal = {
enabled: adapter.config.notificationEnabled,
notificationsType: adapter.config.notificationsType,
@@ -1139,6 +1152,7 @@ function initConfig(secret) {
email,
pushover,
whatsapp,
+ gotify,
signal,
matrix,
discord,
@@ -1169,6 +1183,7 @@ function initConfig(secret) {
email,
pushover,
whatsapp,
+ gotify,
signal,
matrix,
discord,
diff --git a/package-lock.json b/package-lock.json
index 9aee368e..0df21360 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "iobroker.backitup",
- "version": "2.9.5",
+ "version": "2.9.7",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "iobroker.backitup",
- "version": "2.9.5",
+ "version": "2.9.7",
"license": "MIT",
"dependencies": {
"@googleapis/drive": "^8.4.0",
diff --git a/package.json b/package.json
index 46db9d53..8ff4bcfe 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "iobroker.backitup",
- "version": "2.9.5",
+ "version": "2.9.7",
"engines": {
"node": ">=16.0.0"
},