"
+ },
+ {
+ "equals": "watched-changed",
+ "replacement": "
"
+ },
+ {
+ "equals": "new",
+ "replacement": "
"
+ },
+ {
+ "equals": "missing-in-last-scan",
+ "replacement": "
"
+ }
+ ],
+ "localized": ["name"],
+ "name":[{
+ "language_code": "en_us",
+ "string" : "Status"
+ },
+ {
+ "language_code": "es_es",
+ "string" : "Estado"
+ }]
+ },
+ {
+ "column": "Extra",
+ "css_classes": "col-sm-3",
+ "show": false,
+ "type": "label",
+ "default_value":"",
+ "options": [],
+ "localized": ["name"],
+ "name":[{
+ "language_code": "en_us",
+ "string" : "Extra"
+ },
+ {
+ "language_code": "es_es",
+ "string" : "Extra"
+ }]
+ }
+ ],
+ "settings":[
+ {
+ "function": "RUN",
+ "events": ["test"],
+ "type": "text.select",
+ "default_value":"disabled",
+ "options": ["disabled", "on_notification" ],
+ "localized": ["name", "description"],
+ "name" :[{
+ "language_code": "en_us",
+ "string" : "When to run"
+ },
+ {
+ "language_code": "es_es",
+ "string" : "Cuando ejecuta"
+ }],
+ "description": [
+ {
+ "language_code": "en_us",
+ "string" : "Enable sending notifications via
Pushsafer."
+ },
+ {
+ "language_code": "es_es",
+ "string" : "Habilitar el envío de notificaciones a través de
Pushsafer."
+ }
+ ]
+ },
+ {
+ "function": "CMD",
+ "type": "readonly",
+ "default_value":"python3 /home/pi/pialert/front/plugins/_publisher_pushsafer/pushsafer.py",
+ "options": [],
+ "localized": ["name", "description"],
+ "name" : [{
+ "language_code": "en_us",
+ "string" : "Command"
+ },
+ {
+ "language_code": "es_es",
+ "string" : "Comando"
+ }],
+ "description": [{
+ "language_code": "en_us",
+ "string" : "Command to run"
+ },
+ {
+ "language_code": "es_es",
+ "string" : "Comando a ejecutar"
+ }]
+ },
+ {
+ "function": "RUN_TIMEOUT",
+ "type": "integer",
+ "default_value": 10,
+ "options": [],
+ "localized": ["name", "description"],
+ "name" : [{
+ "language_code": "en_us",
+ "string" : "Run timeout"
+ },
+ {
+ "language_code": "es_es",
+ "string" : "Tiempo de espera de ejecución"
+ },
+ {
+ "language_code": "de_de",
+ "string" : "Wartezeit"
+ }],
+ "description": [{
+ "language_code": "en_us",
+ "string" : "Maximum time in seconds to wait for the script to finish. If this time is exceeded the script is aborted."
+ },
+ {
+ "language_code": "es_es",
+ "string" : "Tiempo máximo en segundos para esperar a que finalice el script. Si se supera este tiempo, el script se cancela."
+ }]
+ },
+ {
+ "function": "TOKEN",
+ "type": "text",
+ "default_value": "ApiKey",
+ "options": [],
+ "localized": ["name", "description"],
+ "name" : [{
+ "language_code": "en_us",
+ "string" : "Pushsafer token"
+ },
+ {
+ "language_code": "es_es",
+ "string" : "Token de Pushsafer"
+ }],
+ "description": [{
+ "language_code": "en_us",
+ "string" : "Your secret Pushsafer API key (token)."
+ },
+ {
+ "language_code": "es_es",
+ "string" : "Su clave secreta de la API de Pushsafer (token)."
+ }]
+ }
+ ]
+}
diff --git a/front/plugins/_publisher_pushsafer/ignore_plugin b/front/plugins/_publisher_pushsafer/ignore_plugin
deleted file mode 100755
index 77ffa1c1..00000000
--- a/front/plugins/_publisher_pushsafer/ignore_plugin
+++ /dev/null
@@ -1 +0,0 @@
-This plugin will not be loaded
\ No newline at end of file
diff --git a/front/plugins/_publisher_pushsafer/pushsafer.py b/front/plugins/_publisher_pushsafer/pushsafer.py
new file mode 100755
index 00000000..8a847963
--- /dev/null
+++ b/front/plugins/_publisher_pushsafer/pushsafer.py
@@ -0,0 +1,128 @@
+
+#!/usr/bin/env python
+
+import json
+import subprocess
+import argparse
+import os
+import pathlib
+import sys
+import requests
+from datetime import datetime
+from base64 import b64encode
+
+# Replace these paths with the actual paths to your Pi.Alert directories
+sys.path.extend(["/home/pi/pialert/front/plugins", "/home/pi/pialert/pialert"])
+
+import conf
+from plugin_helper import Plugin_Objects, handleEmpty
+from logger import mylog, append_line_to_file
+from helper import timeNowTZ, get_setting_value
+from notification import Notification_obj
+from database import DB
+
+CUR_PATH = str(pathlib.Path(__file__).parent.resolve())
+RESULT_FILE = os.path.join(CUR_PATH, 'last_result.log')
+
+pluginName = 'PUSHSAFER'
+
+def main():
+
+ mylog('verbose', [f'[{pluginName}](publisher) In script'])
+
+ # Check if basic config settings supplied
+ if check_config() == False:
+ mylog('none', [f'[{pluginName}] Error: Publisher notification gateway not set up correctly. Check your pialert.conf {pluginName}_* variables.'])
+ return
+
+ # Create a database connection
+ db = DB() # instance of class DB
+ db.open()
+
+ # Initialize the Plugin obj output file
+ plugin_objects = Plugin_Objects(RESULT_FILE)
+
+ # Create a Notification_obj instance
+ notifications = Notification_obj(db)
+
+ # Retrieve new notifications
+ new_notifications = notifications.getNew()
+
+ # Process the new notifications
+ for notification in new_notifications:
+
+ # Send notification
+ response_text, response_status_code = send(notification["HTML"], notification["Text"])
+
+ # Log result
+ plugin_objects.add_object(
+ primaryId = pluginName,
+ secondaryId = timeNowTZ(),
+ watched1 = notification["GUID"],
+ watched2 = handleEmpty(response_text),
+ watched3 = response_status_code,
+ watched4 = 'null',
+ extra = 'null',
+ foreignKey = notification["GUID"]
+ )
+
+ plugin_objects.write_result_file()
+
+
+
+#-------------------------------------------------------------------------------
+def send(text):
+
+ response_text = ''
+ response_status_code = ''
+
+ try:
+ url = 'https://www.pushsafer.com/api'
+ post_fields = {
+ "t" : 'Pi.Alert Message',
+ "m" : text,
+ "s" : 11,
+ "v" : 3,
+ "i" : 148,
+ "c" : '#ef7f7f',
+ "d" : 'a',
+ "u" : get_setting_value('REPORT_DASHBOARD_URL'),
+ "ut" : 'Open Pi.Alert',
+ "k" : get_setting_value('PUSHSAFER_TOKEN'),
+ }
+ response = requests.post(url, data=post_fields)
+
+ response_status_code = response.status_code
+
+
+ # Check if the request was successful (status code 200)
+ if response_status_code == 200:
+ response_text = response.text # This captures the response body/message
+ else:
+ response_text = json.dumps(response.text)
+
+ except requests.exceptions.RequestException as e:
+ mylog('none', [f'[{pluginName}] Error: ', e])
+
+ response_text = e
+
+ return response_text, response_status_code
+
+
+ return response_text, response_status_code
+
+
+
+
+
+#-------------------------------------------------------------------------------
+def check_config():
+ if get_setting_value('PUSHSAFER_TOKEN') == 'ApiKey':
+ return False
+ else:
+ return True
+
+# -------------------------------------------------------
+if __name__ == '__main__':
+ sys.exit(main())
+
diff --git a/pialert/__main__.py b/pialert/__main__.py
index f801cc31..0843fd0d 100755
--- a/pialert/__main__.py
+++ b/pialert/__main__.py
@@ -24,7 +24,7 @@ import multiprocessing
import conf
from const import *
from logger import mylog
-from helper import filePermissions, timeNowTZ, updateState, get_setting_value, noti_obj
+from helper import filePermissions, timeNowTZ, updateState, get_setting_value
from api import update_api
from networkscan import process_scan
from initialise import importConfigs
diff --git a/pialert/initialise.py b/pialert/initialise.py
index 4ec77c3c..1369bfde 100755
--- a/pialert/initialise.py
+++ b/pialert/initialise.py
@@ -128,10 +128,6 @@ def importConfigs (db):
conf.WEBHOOK_SIZE = ccd('WEBHOOK_SIZE', 1024 , c_d, 'Payload size', 'integer', '', 'Webhooks')
conf.WEBHOOK_SECRET = ccd('WEBHOOK_SECRET', '' , c_d, 'Secret', 'text', '', 'Webhooks')
- # PUSHSAFER
- conf.REPORT_PUSHSAFER = ccd('REPORT_PUSHSAFER', False , c_d, 'Enable PUSHSAFER', 'boolean', '', 'PUSHSAFER', ['test'])
- conf.PUSHSAFER_TOKEN = ccd('PUSHSAFER_TOKEN', 'ApiKey' , c_d, 'PUSHSAFER token', 'text', '', 'PUSHSAFER')
-
# Init timezone in case it changed
conf.tz = timezone(conf.TIMEZONE)
diff --git a/pialert/publishers/pushsafer.py b/pialert/publishers/pushsafer.py
deleted file mode 100755
index eaf97c57..00000000
--- a/pialert/publishers/pushsafer.py
+++ /dev/null
@@ -1,33 +0,0 @@
-
-import requests
-
-
-import conf
-from helper import noti_obj
-from logger import mylog
-
-#-------------------------------------------------------------------------------
-def check_config():
- if conf.PUSHSAFER_TOKEN == 'ApiKey':
- mylog('none', ['[Check Config] Error: Pushsafer service not set up correctly. Check your pialert.conf PUSHSAFER_TOKEN variable.'])
- return False
- else:
- return True
-
-#-------------------------------------------------------------------------------
-def send ( msg:noti_obj ):
- _Text = msg.text
- url = 'https://www.pushsafer.com/api'
- post_fields = {
- "t" : 'Pi.Alert Message',
- "m" : _Text,
- "s" : 11,
- "v" : 3,
- "i" : 148,
- "c" : '#ef7f7f',
- "d" : 'a',
- "u" : conf.REPORT_DASHBOARD_URL,
- "ut" : 'Open Pi.Alert',
- "k" : conf.PUSHSAFER_TOKEN,
- }
- requests.post(url, data=post_fields)
\ No newline at end of file
diff --git a/pialert/reporting.py b/pialert/reporting.py
index 6e689f64..1d2091ba 100755
--- a/pialert/reporting.py
+++ b/pialert/reporting.py
@@ -258,15 +258,6 @@ def get_notifications (db):
return noti_obj(final_json, final_text, final_html)
-
-
- # if conf.REPORT_MAIL and check_config('email'):
- # updateState("Send: Email")
- # mylog('minimal', ['[Notification] Sending report by Email'])
- # send_email (msg )
- # else :
- # mylog('verbose', ['[Notification] Skip email'])
- #
# if conf.REPORT_WEBHOOK and check_config('webhook'):
# updateState("Send: Webhook")
@@ -274,27 +265,13 @@ def get_notifications (db):
# send_webhook (msg)
# else :
# mylog('verbose', ['[Notification] Skip webhook'])
- # if conf.REPORT_NTFY and check_config('ntfy'):
- # updateState("Send: NTFY")
- # mylog('minimal', ['[Notification] Sending report by NTFY'])
- # send_ntfy (msg)
- # else :
- # mylog('verbose', ['[Notification] Skip NTFY'])
+
# if conf.REPORT_PUSHSAFER and check_config('pushsafer'):
# updateState("Send: PUSHSAFER")
# mylog('minimal', ['[Notification] Sending report by PUSHSAFER'])
# send_pushsafer (msg)
# else :
# mylog('verbose', ['[Notification] Skip PUSHSAFER'])
- # # Update MQTT entities
- # if conf.REPORT_MQTT and check_config('mqtt'):
- # updateState("Send: MQTT")
- # mylog('minimal', ['[Notification] Establishing MQTT thread'])
- # mqtt_start(db)
- # else :
- # mylog('verbose', ['[Notification] Skip MQTT'])
- # else :
- # mylog('verbose', ['[Notification] No changes to report'])
#-------------------------------------------------------------------------------