🔺GraphQL v0.1 + Devices table rebuild + removal of backend compatible scripts

server/initialise.py

@@ -12,7 +12,7 @@ import re
 
 import conf 
 from const import fullConfPath, applicationPath, fullConfFolder
-from helper import collect_lang_strings, updateSubnets, initOrSetParam, isJsonObject, updateState, setting_value_to_python_type, timeNowTZ, get_setting_value
+from helper import collect_lang_strings, updateSubnets, initOrSetParam, isJsonObject, updateState, setting_value_to_python_type, timeNowTZ, get_setting_value, generate_random_string
 from logger import mylog
 from api import update_api
 from scheduler import schedule_class
@@ -148,9 +148,11 @@ def importConfigs (db, all_plugins):
     conf.HRS_TO_KEEP_NEWDEV = ccd('HRS_TO_KEEP_NEWDEV', 0 , c_d, 'Keep new devices for', '{"dataType":"integer", "elements": [{"elementType" : "input", "elementOptions" : [{"type": "number"}] ,"transformers": []}]}', "[]", 'General')        
     conf.HRS_TO_KEEP_OFFDEV = ccd('HRS_TO_KEEP_OFFDEV', 0 , c_d, 'Keep offline devices for', '{"dataType":"integer", "elements": [{"elementType" : "input", "elementOptions" : [{"type": "number"}] ,"transformers": []}]}', "[]", 'General')        
     conf.CLEAR_NEW_FLAG = ccd('CLEAR_NEW_FLAG', 0 , c_d, 'Clear new flag', '{"dataType":"integer", "elements": [{"elementType" : "input", "elementOptions" : [{"type": "number"}] ,"transformers": []}]}', "[]", 'General')        
-    conf.API_CUSTOM_SQL = ccd('API_CUSTOM_SQL', 'SELECT * FROM Devices WHERE dev_PresentLastScan = 0' , c_d, 'Custom endpoint', '{"dataType":"string", "elements": [{"elementType" : "input", "elementOptions" : [] ,"transformers": []}]}', '[]', 'General')
+    conf.API_CUSTOM_SQL = ccd('API_CUSTOM_SQL', 'SELECT * FROM Devices WHERE devPresentLastScan = 0' , c_d, 'Custom endpoint', '{"dataType":"string", "elements": [{"elementType" : "input", "elementOptions" : [] ,"transformers": []}]}', '[]', 'General')
     conf.VERSION = ccd('VERSION', '' , c_d, 'Version', '{"dataType":"string", "elements": [{"elementType" : "input", "elementOptions" : [{ "readonly": "true" }] ,"transformers": []}]}', '', 'General')
     conf.NETWORK_DEVICE_TYPES = ccd('NETWORK_DEVICE_TYPES', ['AP', 'Gateway', 'Firewall', 'Hypervisor', 'Powerline', 'Switch', 'WLAN', 'PLC', 'Router','USB LAN Adapter', 'USB WIFI Adapter', 'Internet'] , c_d, 'Network device types', '{"dataType":"array","elements":[{"elementType":"input","elementOptions":[{"placeholder":"Enter value"},{"suffix":"_in"},{"cssClasses":"col-sm-10"},{"prefillValue":"null"}],"transformers":[]},{"elementType":"button","elementOptions":[{"sourceSuffixes":["_in"]},{"separator":""},{"cssClasses":"col-xs-12"},{"onClick":"addList(this,false)"},{"getStringKey":"Gen_Add"}],"transformers":[]},{"elementType":"select",	"elementHasInputValue":1,"elementOptions":[{"multiple":"true"},{"readonly":"true"},{"editable":"true"}],"transformers":[]},{"elementType":"button","elementOptions":[{"sourceSuffixes":[]},{"separator":""},{"cssClasses":"col-xs-6"},{"onClick":"removeAllOptions(this)"},{"getStringKey":"Gen_Remove_All"}],"transformers":[]},{"elementType":"button","elementOptions":[{"sourceSuffixes":[]},{"separator":""},{"cssClasses":"col-xs-6"},{"onClick":"removeFromList(this)"},{"getStringKey":"Gen_Remove_Last"}],"transformers":[]}]}', '[]', 'General')
+    conf.GRAPHQL_PORT = ccd('GRAPHQL_PORT', 20212 , c_d, 'GraphQL port', '{"dataType":"integer", "elements": [{"elementType" : "input", "elementOptions" : [{"type": "number"}] ,"transformers": []}]}', '[]', 'General')
+    conf.API_TOKEN = ccd('API_TOKEN', 't_' + generate_random_string(20) , c_d, 'API token', '{"dataType": "string","elements": [{"elementType": "input","elementHasInputValue": 1,"elementOptions": [{ "cssClasses": "col-xs-12" }],"transformers": []},{"elementType": "button","elementOptions": [{ "getStringKey": "Gen_Generate" },{ "customParams": "API_TOKEN" },{ "onClick": "generateApiToken(this, 20)" },{ "cssClasses": "col-xs-12" }],"transformers": []}]}', '[]', 'General')
           
     # UI
     conf.UI_LANG = ccd('UI_LANG', 'English' , c_d, 'Language Interface', '{"dataType":"string", "elements": [{"elementType" : "select", "elementOptions" : [] ,"transformers": []}]}', "['English', 'German', 'Spanish', 'French', 'Norwegian', 'Russian', 'Italian (it_it)', 'Portuguese (pt_br)', 'Polish (pl_pl)', 'Chinese (zh_cn)', 'Turkish (tr_tr)', 'Czech (cs_cz)', 'Arabic (ar_ar)',  'Catalan (ca_ca)' ]", 'UI') 
@@ -399,21 +401,50 @@ def read_config_file(filename):
 # 🤔Idea/TODO: Check and compare versions/timestamps amd only perform a replacement if config/version older than...
 replacements = {
     r'\bREPORT_TO\b': 'SMTP_REPORT_TO',
+    r'\bSYNC_api_token\b': 'API_TOKEN',
     r'\bREPORT_FROM\b': 'SMTP_REPORT_FROM',
     r'\bPIALERT_WEB_PROTECTION\b': 'SETPWD_enable_password',
     r'\bPIALERT_WEB_PASSWORD\b': 'SETPWD_password',
-    r'REPORT_MAIL=True': 'SMTP_RUN=\'on_notification\'',
-    r'REPORT_APPRISE=True': 'APPRISE_RUN=\'on_notification\'',
-    r'REPORT_NTFY=True': 'NTFY_RUN=\'on_notification\'',
-    r'REPORT_WEBHOOK=True': 'WEBHOOK_RUN=\'on_notification\'',
-    r'REPORT_PUSHSAFER=True': 'PUSHSAFER_RUN=\'on_notification\'',
-    r'REPORT_MQTT=True': 'MQTT_RUN=\'on_notification\'',
+    r'REPORT_MAIL=True': "SMTP_RUN='on_notification'",
+    r'REPORT_APPRISE=True': "APPRISE_RUN='on_notification'",
+    r'REPORT_NTFY=True': "NTFY_RUN='on_notification'",
+    r'REPORT_WEBHOOK=True': "WEBHOOK_RUN='on_notification'",
+    r'REPORT_PUSHSAFER=True': "PUSHSAFER_RUN='on_notification'",
+    r'REPORT_MQTT=True': "MQTT_RUN='on_notification'",
     r'PIHOLE_CMD=': 'PIHOLE_CMD_OLD=',
     r'\bINCLUDED_SECTIONS\b': 'NTFPRCS_INCLUDED_SECTIONS',
     r'\bDIG_GET_IP_ARG\b': 'INTRNT_DIG_GET_IP_ARG',
-    r'\/home/pi/pialert\b': '/app'
+    r'dev_MAC': 'devMac',
+    r'dev_Name': 'devName',
+    r'dev_Favorite': 'devFavorite',
+    r'dev_Group': 'devGroup',
+    r'dev_Comments': 'devComments',
+    r'dev_FirstConnection': 'devFirstConnection',
+    r'dev_LastConnection': 'devLastConnection',
+    r'dev_LastIP': 'devLastIP',
+    r'dev_StaticIP': 'devStaticIP',
+    r'dev_ScanCycle': 'devScan',
+    r'dev_LogEvents': 'devLogEvents',
+    r'dev_AlertEvents': 'devAlertEvents',
+    r'dev_AlertDeviceDown': 'devAlertDown',
+    r'dev_SkipRepeated': 'devSkipRepeated',
+    r'dev_LastNotification': 'devLastNotification',
+    r'dev_PresentLastScan': 'devPresentLastScan',
+    r'dev_NewDevice': 'devIsNew',
+    r'dev_Location': 'devLocation',
+    r'dev_Archived': 'devIsArchived',
+    r'dev_Network_Node_MAC_ADDR': 'devParentMAC',
+    r'dev_Network_Node_port': 'devParentPort',
+    r'dev_Icon': 'devIcon',
+    r'dev_GUID': 'devGUID',
+    r'dev_NetworkSite': 'devSite',
+    r'dev_SSID': 'devSSID',
+    r'dev_SyncHubNodeName': 'devSyncHubNode',
+    r'dev_SourcePlugin': 'devSourcePlugin',
+    r'/home/pi/pialert\b': '/app'
 }
 
+
 def renameSettings(config_file):
     # Check if the file contains any of the old setting code names
     contains_old_settings = False