From 2597f6a7386da784063df9dde85262aa98ced787 Mon Sep 17 00:00:00 2001
From: kw123 <karlwachs@me.com>
Date: Sat, 13 Jan 2024 10:59:21 +0100
Subject: [PATCH] error logging improved

in case of http error, the plugin does not print a large dump anymore, but it will
     = check if timeout, retry 2 more times, if sucessful, a warning will occur .. fixed after xx tries
     = if not sucessfult it will try 30 more times (after some minutes) and if not sucesfull the plugin will reload eg when the unifi device is down, or you load a new software
---
 uniFiAP.indigoPlugin/.idea/.gitignore         |   8 -
 uniFiAP.indigoPlugin/.idea/misc.xml           |   4 -
 uniFiAP.indigoPlugin/.idea/modules.xml        |   8 -
 uniFiAP.indigoPlugin/.idea/other.xml          |   6 -
 .../.idea/uniFiAP.indigoPlugin.iml            |  15 --
 uniFiAP.indigoPlugin/.idea/workspace.xml      | 239 ------------------
 uniFiAP.indigoPlugin/Contents/Info.plist      |   2 +-
 .../Contents/Server Plugin/plugin.py          | 237 ++++++++++-------
 uniFiAP.indigoPlugin/Contents/changeLog.txt   |  14 +
 9 files changed, 165 insertions(+), 368 deletions(-)
 delete mode 100644 uniFiAP.indigoPlugin/.idea/.gitignore
 delete mode 100644 uniFiAP.indigoPlugin/.idea/misc.xml
 delete mode 100644 uniFiAP.indigoPlugin/.idea/modules.xml
 delete mode 100644 uniFiAP.indigoPlugin/.idea/other.xml
 delete mode 100644 uniFiAP.indigoPlugin/.idea/uniFiAP.indigoPlugin.iml
 delete mode 100644 uniFiAP.indigoPlugin/.idea/workspace.xml

diff --git a/uniFiAP.indigoPlugin/.idea/.gitignore b/uniFiAP.indigoPlugin/.idea/.gitignore
deleted file mode 100644
index 13566b8..0000000
--- a/uniFiAP.indigoPlugin/.idea/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
-# Editor-based HTTP Client requests
-/httpRequests/
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml
diff --git a/uniFiAP.indigoPlugin/.idea/misc.xml b/uniFiAP.indigoPlugin/.idea/misc.xml
deleted file mode 100644
index 7ba73c2..0000000
--- a/uniFiAP.indigoPlugin/.idea/misc.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectRootManager" version="2" project-jdk-name="Python 2.7" project-jdk-type="Python SDK" />
-</project>
\ No newline at end of file
diff --git a/uniFiAP.indigoPlugin/.idea/modules.xml b/uniFiAP.indigoPlugin/.idea/modules.xml
deleted file mode 100644
index 95b939e..0000000
--- a/uniFiAP.indigoPlugin/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/uniFiAP.indigoPlugin.iml" filepath="$PROJECT_DIR$/.idea/uniFiAP.indigoPlugin.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
diff --git a/uniFiAP.indigoPlugin/.idea/other.xml b/uniFiAP.indigoPlugin/.idea/other.xml
deleted file mode 100644
index 68993fb..0000000
--- a/uniFiAP.indigoPlugin/.idea/other.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="PySciProjectComponent">
-    <option name="PY_SCI_VIEW" value="true" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/uniFiAP.indigoPlugin/.idea/uniFiAP.indigoPlugin.iml b/uniFiAP.indigoPlugin/.idea/uniFiAP.indigoPlugin.iml
deleted file mode 100644
index a6bfc15..0000000
--- a/uniFiAP.indigoPlugin/.idea/uniFiAP.indigoPlugin.iml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="PYTHON_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-  <component name="PyDocumentationSettings">
-    <option name="renderExternalDocumentation" value="true" />
-  </component>
-  <component name="TestRunnerService">
-    <option name="projectConfiguration" value="Nosetests" />
-    <option name="PROJECT_TEST_RUNNER" value="Nosetests" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/uniFiAP.indigoPlugin/.idea/workspace.xml b/uniFiAP.indigoPlugin/.idea/workspace.xml
deleted file mode 100644
index d171b4c..0000000
--- a/uniFiAP.indigoPlugin/.idea/workspace.xml
+++ /dev/null
@@ -1,239 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="AutoImportSettings">
-    <option name="autoReloadType" value="SELECTIVE" />
-  </component>
-  <component name="ChangeListManager">
-    <list default="true" id="250e6b11-cb6e-4d5c-b480-6d126661c568" name="Default" comment="" />
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="CoverageDataManager">
-    <SUITE FILE_PATH="coverage/uniFiAP_indigoPlugin$plugin.coverage" NAME="plugin Coverage Results" MODIFIED="1541191343277" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/Contents/Server Plugin" />
-  </component>
-  <component name="FindInProjectRecents">
-    <findStrings>
-      <find>writeJson</find>
-      <find>list</find>
-      <find>self.ML</find>
-    </findStrings>
-  </component>
-  <component name="IdeDocumentHistory">
-    <option name="CHANGED_PATHS">
-      <list>
-        <option value="$PROJECT_DIR$/Contents/Server Plugin/plugin.py" />
-      </list>
-    </option>
-  </component>
-  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsGulpfileManager">
-    <detection-done>true</detection-done>
-    <sorting>DEFINITION_ORDER</sorting>
-  </component>
-  <component name="MarkdownSettingsMigration">
-    <option name="stateVersion" value="1" />
-  </component>
-  <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="235" />
-    <option name="y" value="42" />
-    <option name="width" value="1827" />
-    <option name="height" value="1000" />
-  </component>
-  <component name="ProjectId" id="26je1jiJNra0Q2RKRmbJNaAt01I" />
-  <component name="ProjectView">
-    <navigator proportions="" version="1">
-      <foldersAlwaysOnTop value="true" />
-    </navigator>
-    <panes>
-      <pane id="Scope" />
-      <pane id="ProjectPane">
-        <subPane>
-          <expand>
-            <path>
-              <item name="uniFiAP.indigoPlugin" type="b2602c69:ProjectViewProjectNode" />
-              <item name="uniFiAP.indigoPlugin" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="uniFiAP.indigoPlugin" type="b2602c69:ProjectViewProjectNode" />
-              <item name="uniFiAP.indigoPlugin" type="462c0819:PsiDirectoryNode" />
-              <item name="Contents" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="uniFiAP.indigoPlugin" type="b2602c69:ProjectViewProjectNode" />
-              <item name="uniFiAP.indigoPlugin" type="462c0819:PsiDirectoryNode" />
-              <item name="Contents" type="462c0819:PsiDirectoryNode" />
-              <item name="Server Plugin" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="uniFiAP.indigoPlugin" type="b2602c69:ProjectViewProjectNode" />
-              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
-            </path>
-            <path>
-              <item name="uniFiAP.indigoPlugin" type="b2602c69:ProjectViewProjectNode" />
-              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
-              <item name="&lt; Python 2.7 &gt;" type="70bed36:NamedLibraryElementNode" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
-    </panes>
-  </component>
-  <component name="ProjectViewState">
-    <option name="hideEmptyMiddlePackages" value="true" />
-    <option name="showLibraryContents" value="true" />
-  </component>
-  <component name="PropertiesComponent">
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
-    <property name="node.js.detected.package.eslint" value="true" />
-    <property name="node.js.detected.package.tslint" value="true" />
-    <property name="node.js.selected.package.eslint" value="(autodetect)" />
-    <property name="node.js.selected.package.tslint" value="(autodetect)" />
-    <property name="run.code.analysis.last.selected.profile" value="pProject Default" />
-  </component>
-  <component name="RunManager">
-    <configuration default="true" type="PythonConfigurationType" factoryName="Python">
-      <module name="uniFiAP.indigoPlugin" />
-      <option name="INTERPRETER_OPTIONS" value="" />
-      <option name="PARENT_ENVS" value="true" />
-      <envs>
-        <env name="PYTHONUNBUFFERED" value="1" />
-      </envs>
-      <option name="SDK_HOME" value="" />
-      <option name="WORKING_DIRECTORY" value="" />
-      <option name="IS_MODULE_SDK" value="false" />
-      <option name="ADD_CONTENT_ROOTS" value="true" />
-      <option name="ADD_SOURCE_ROOTS" value="true" />
-      <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
-      <option name="SCRIPT_NAME" value="" />
-      <option name="PARAMETERS" value="" />
-      <option name="SHOW_COMMAND_LINE" value="true" />
-      <option name="EMULATE_TERMINAL" value="false" />
-      <option name="MODULE_MODE" value="false" />
-      <option name="REDIRECT_INPUT" value="false" />
-      <option name="INPUT_FILE" value="" />
-      <method v="2" />
-    </configuration>
-    <configuration name="plugin" type="PythonConfigurationType" factoryName="Python" temporary="true">
-      <module name="uniFiAP.indigoPlugin" />
-      <option name="INTERPRETER_OPTIONS" value="" />
-      <option name="PARENT_ENVS" value="true" />
-      <envs>
-        <env name="PYTHONUNBUFFERED" value="1" />
-      </envs>
-      <option name="SDK_HOME" value="" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/Contents/Server Plugin" />
-      <option name="IS_MODULE_SDK" value="true" />
-      <option name="ADD_CONTENT_ROOTS" value="true" />
-      <option name="ADD_SOURCE_ROOTS" value="true" />
-      <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
-      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/Contents/Server Plugin/plugin.py" />
-      <option name="PARAMETERS" value="" />
-      <option name="SHOW_COMMAND_LINE" value="false" />
-      <option name="EMULATE_TERMINAL" value="false" />
-      <option name="MODULE_MODE" value="false" />
-      <option name="REDIRECT_INPUT" value="false" />
-      <option name="INPUT_FILE" value="" />
-      <method v="2" />
-    </configuration>
-    <recent_temporary>
-      <list>
-        <item itemvalue="Python.plugin" />
-      </list>
-    </recent_temporary>
-  </component>
-  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
-  <component name="SvnConfiguration">
-    <configuration />
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="250e6b11-cb6e-4d5c-b480-6d126661c568" name="Default" comment="" />
-      <created>1541189079503</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1541189079503</updated>
-      <workItem from="1647941211394" duration="79000" />
-      <workItem from="1656603899209" duration="3186000" />
-      <workItem from="1682876111173" duration="716000" />
-      <workItem from="1682884190380" duration="503000" />
-    </task>
-    <servers />
-  </component>
-  <component name="ToolWindowManager">
-    <frame x="68" y="23" width="1852" height="1177" extended-state="6" />
-    <editor active="true" />
-    <layout>
-      <window_info content_ui="combo" x="2037" y="252" width="394" height="593" id="Project" order="0" weight="0.2207283" />
-      <window_info id="Structure" order="1" weight="0.25" />
-      <window_info id="Favorites" order="2" side_tool="true" />
-      <window_info anchor="bottom" id="Docker" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Database Changes" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Concurrent Activities Diagram" weight="0.32956687" />
-      <window_info anchor="bottom" id="Message" order="0" />
-      <window_info anchor="bottom" id="Find" order="1" weight="0.3299435" />
-      <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.3992467" />
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="bottom" id="Version Control" order="7" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Inspection Results" order="8" visible="true" weight="0.3015873" />
-      <window_info anchor="bottom" id="Python Console" order="9" weight="0.32956687" />
-      <window_info anchor="bottom" id="Terminal" order="10" />
-      <window_info anchor="bottom" id="Event Log" order="11" side_tool="true" />
-      <window_info anchor="right" x="0" y="0" width="413" height="977" id="Documentation" side_tool="true" weight="0.32983425" />
-      <window_info anchor="right" id="Database" />
-      <window_info anchor="right" id="SciView" />
-      <window_info anchor="right" id="Commander" order="0" weight="0.4" />
-      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-    </layout>
-  </component>
-  <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="3" />
-  </component>
-  <component name="VcsContentAnnotationSettings">
-    <option name="myLimit" value="2678400000" />
-  </component>
-  <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/Contents/Server Plugin/vboxAction.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1905">
-          <caret line="132" column="10" selection-start-line="132" selection-start-column="10" selection-end-line="132" selection-end-column="10" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Contents/Server Plugin/myLogPgms/myLogPgms.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1680">
-          <caret line="116" column="24" selection-start-line="116" selection-start-column="24" selection-end-line="116" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Contents/Server Plugin/offPort.exp">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$APPLICATION_HOME_DIR$/helpers/pydev/pydevd.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="483">
-          <caret line="1663" selection-start-line="1663" selection-end-line="1663" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Contents/Server Plugin/plugin.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="45">
-          <caret line="3" column="14" lean-forward="true" selection-start-line="3" selection-start-column="14" selection-end-line="3" selection-end-column="14" />
-          <folding>
-            <element signature="e#129#144#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-  </component>
-</project>
\ No newline at end of file
diff --git a/uniFiAP.indigoPlugin/Contents/Info.plist b/uniFiAP.indigoPlugin/Contents/Info.plist
index 1f45380..e4c5927 100755
--- a/uniFiAP.indigoPlugin/Contents/Info.plist
+++ b/uniFiAP.indigoPlugin/Contents/Info.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>PluginVersion</key>
-	<string>2022.42.396</string>
+	<string>2022.43.397</string>
 	<key>ServerApiVersion</key>
 	<string>3.0</string>
 	<key>IwsApiVersion</key>
diff --git a/uniFiAP.indigoPlugin/Contents/Server Plugin/plugin.py b/uniFiAP.indigoPlugin/Contents/Server Plugin/plugin.py
index c42d20f..8ff18b6 100755
--- a/uniFiAP.indigoPlugin/Contents/Server Plugin/plugin.py	
+++ b/uniFiAP.indigoPlugin/Contents/Server Plugin/plugin.py	
@@ -5090,7 +5090,7 @@ def getunifiOSAndPort(self):
 
 
 	####-----------------	 ---------
-	def executeCMDOnControllerReset(self, wait=False, calledFrom=""):
+	def executeCMDOnControllerReset(self, wait=1, calledFrom=""):
 		try:
 			if calledFrom != "":
 				if self.decideMyLog("Protect"): self.indiLOG.log(10,"executeCMDOnControllerReset called from:{}".format(calledFrom) )
@@ -5102,7 +5102,7 @@ def executeCMDOnControllerReset(self, wait=False, calledFrom=""):
 			self.lastUnifiCookieRequests = 0.
 			self.lastUnifiCookieCurl = 0	
 			self.unifiCloudKeySiteNameGetNew = True
-			if wait: self.sleep(2.0)	
+			if wait > 0: self.sleep(wait)	
 		except	Exception as e:
 			if "{}".format(e).find("None") == -1: self.indiLOG.log(40,"", exc_info=True)
 
@@ -5136,7 +5136,7 @@ def setunifiCloudKeySiteName(self, method="response", cookies="", headers="" ):
 				dictRET = json.loads(ret)
 			except :
 				self.indiLOG.log(30,"setunifiCloudKeySiteName for {} has error, getting site ID, no json object returned: >>{}<<".format(self.unifiCloudKeyIP, "{}".format(ret)))
-				self.executeCMDOnControllerReset(wait=True, calledFrom="setunifiCloudKeySiteName1")
+				self.executeCMDOnControllerReset(wait=5, calledFrom="setunifiCloudKeySiteName1")
 				return False
 		
 				
@@ -5166,14 +5166,14 @@ def setunifiCloudKeySiteName(self, method="response", cookies="", headers="" ):
 						return False
 
 
-			self.indiLOG.log(20,"setunifiCloudKeySiteName  id  not found ret:>>{}<<".format(ret))
-			self.executeCMDOnControllerReset(wait=True,  calledFrom="setunifiCloudKeySiteName2")
+			self.indiLOG.log(20,"setunifiCloudKeySiteName  id  not found ret:>>{}<<, resetting connection".format(ret))
+			self.executeCMDOnControllerReset(wait=5,  calledFrom="setunifiCloudKeySiteName2")
 			return False
 
 		except	Exception as e:
 			self.indiLOG.log(40,"setunifiCloudKeySiteName: " )
 			if "{}".format(e).find("None") == -1: self.indiLOG.log(40,"", exc_info=True)
-		self.executeCMDOnControllerReset(wait=True,  calledFrom="setunifiCloudKeySiteName3")
+		self.executeCMDOnControllerReset(wait=5,  calledFrom="setunifiCloudKeySiteName3")
 		return False
 
 
@@ -5190,10 +5190,13 @@ def executeCMDOnController(self, dataSEND={}, pageString="",jsonAction="returnDa
 			if self.unifiCloudKeyMode.find("ON") == -1 and self.unifiCloudKeyMode != "UDM": return []
 
 
+			maxretry = 3
 			#if self.decideMyLog("ConnectionCMD"): self.indiLOG.log(10,"into executeCMDOnController 2 " )
-			for iii in range(2):
+			for iii in range(maxretry):
 				if not repeatIfFailed and iii > 0: return []
-				if iii == 1: self.sleep(0.2)
+				if iii > 0: 
+					self.sleep(iii+1)
+					if protect: self.sleep(iii+3)
 
 				# get port and which unifi os:
 				if not self.getunifiOSAndPort(): 
@@ -5263,19 +5266,19 @@ def executeCMDOnController(self, dataSEND={}, pageString="",jsonAction="returnDa
 							errText  = ret[1]#.decode("utf8")
 							try:
 								dictRET = json.loads(respText)
-							except:
+							except	Exception as e:
 								if iii > 0:
 									if "{}".format(e).find("None") == -1: 
 										self.indiLOG.log(30,"", exc_info=True)
 										self.indiLOG.log(30,"UNIFI executeCMDOnController to {} curl errortext:{}".format(self.unifiCloudKeyIP, errText))
 										self.printHttpError("{}".format(e), respText, ind=iii)
-									self.executeCMDOnControllerReset(wait=True, calledFrom="executeCMDOnController-curl json")
+									self.executeCMDOnControllerReset(wait=5, calledFrom="executeCMDOnController-curl json")
 								continue
 
 							if dictRET["meta"]["rc"] != "ok":
 								if iii == 0:
 									self.indiLOG.log(40," Connection error: >>{}<<\n{}".format(self.unifiCloudKeyIP, respText, errText))
-								self.executeCMDOnControllerReset(wait=True, calledFrom="executeCMDOnController-curl dict not ok")
+								self.executeCMDOnControllerReset(wait=5, calledFrom="executeCMDOnController-curl dict not ok")
 								continue
 
 							if self.decideMyLog("ConnectionRET"):
@@ -5303,56 +5306,70 @@ def executeCMDOnController(self, dataSEND={}, pageString="",jsonAction="returnDa
 				############# does not work on OSX	el capitan ssl lib too old	##########
 				if not useCurl:
 
+					## login?
 					if self.unifiControllerSession == "" or (time.time() - self.lastUnifiCookieRequests) > 99: # every 99 secs token cert
-						if self.unifiControllerSession != "":
-							try: 	self.unifiControllerSession.close()
-							except: pass
-							self.unifiControllerSession = ""
-
-						if self.unifiControllerSession == "":
-							self.unifiControllerSession	 = requests.Session()
+								if self.unifiControllerSession != "":
+									try: 	self.unifiControllerSession.close()
+									except: pass
+									self.unifiControllerSession = ""
+
+								if self.unifiControllerSession == "":
+									self.unifiControllerSession	 = requests.Session()
+
+								url = "https://"+self.unifiCloudKeyIP+":"+self.unifiCloudKeyPort+self.unifiApiLoginPath
+								loginHeaders = {"Accept": "application/json", "Content-Type": "application/json", "referer": "/login"}
+								dataLogin = json.dumps({"username":self.connectParams["UserID"]["webCTRL"],"password":self.connectParams["PassWd"]["webCTRL"]}) #  , "strict":self.useStrictToLogin})
+								if self.decideMyLog("ConnectionCMD"): self.indiLOG.log(10,"Connection: requests login url:{};\ndataLogin:{};\nloginHeaders:{};".format(url, dataLogin, loginHeaders) )
+								resp = ""
+								try:
+									resp  = self.unifiControllerSession.post(url,  headers=loginHeaders, data = dataLogin, timeout=self.requestTimeout, verify=False)
+									if isinstance(resp, str):
+										self.failedControllerLoginCount += 1 
+										if self.failedControllerLoginCount > 1:
+											self.indiLOG.log(30,"UNIFI executeCMDOnController  LOGIN failed ({} times), will try again; url:{},".format(self.failedControllerLoginCount , url) )
+										continue
 
-						url = "https://"+self.unifiCloudKeyIP+":"+self.unifiCloudKeyPort+self.unifiApiLoginPath
-						loginHeaders = {"Accept": "application/json", "Content-Type": "application/json", "referer": "/login"}
-						dataLogin = json.dumps({"username":self.connectParams["UserID"]["webCTRL"],"password":self.connectParams["PassWd"]["webCTRL"]}) #  , "strict":self.useStrictToLogin})
-						if self.decideMyLog("ConnectionCMD"): self.indiLOG.log(10,"Connection: requests login url:{};\ndataLogin:{};\nloginHeaders:{};".format(url, dataLogin, loginHeaders) )
+									if self.decideMyLog("ConnectionRET"): self.indiLOG.log(10,"Connection: requests login code:{}; ret-Text:\n {} ...".format(resp.status_code, resp.text) )
+									loginDict = json.loads(resp.text)
 
-						resp  = self.unifiControllerSession.post(url,  headers=loginHeaders, data = dataLogin, timeout=self.requestTimeout, verify=False)
-						if self.decideMyLog("ConnectionRET"): self.indiLOG.log(10,"Connection: requests login code:{}; ret-Text:\n {} ...".format(resp.status_code, resp.text) )
+								except	Exception as e:
+									if self.failedControllerLoginCount > self.failedControllerLoginCountMax: 		
+										self.quitNOW = "restart due to failed Controller Login count  > {}".format(self.failedControllerLoginCount )
+										return []
+
+									self.failedControllerLoginCount += 1 
+									if self.failedControllerLoginCount > 1:
+										self.indiLOG.log(30,"UNIFI executeCMDOnController  error: >>{}<<".format(e) )
+										self.indiLOG.log(30,"UNIFI executeCMDOnController  LOGIN failed ({} times), will try again; url:{}, >>ok<< not found,  response: >>{}<<".format(self.failedControllerLoginCount , url, str(resp) ) )
+										if "{}".format(e).find("timed out") == -1:
+											if "{}".format(e).find("None") == -1: self.indiLOG.log(30,"", exc_info=True)
+
+									self.executeCMDOnControllerReset(wait=5, calledFrom="executeCMDOnController-login ret code not ok")
+									continue
 
-						try: loginDict = json.loads(resp.text)
-						except	Exception as e:
-							if "{}".format(e).find("timed out") > -1:
-									self.indiLOG.log(40," read timed out to {}".format(url))
+								if  resp == "" or resp.status_code != requests.codes.ok:
+									self.failedControllerLoginCount += 1 
+									if self.failedControllerLoginCount > 2:
+										self.indiLOG.log(30,"UNIFI executeCMDOnController  LOGIN failed ({} times), will try again; url:{}, >>ok<< not found, response: >>{}<<\n".format(self.failedControllerLoginCount , url, str(resp) ) )
+									self.executeCMDOnControllerReset(wait=5, calledFrom="executeCMDOnController-login ret code not ok")
+									if self.failedControllerLoginCount > self.failedControllerLoginCountMax: 		
+										self.quitNOW = "restart due to failed Controller Login count  = {}".format(self.failedControllerLoginCount )
+										return []
+									self.sleep(10)
 									continue
-							else:
-								if "{}".format(e).find("None") == -1: self.indiLOG.log(40,"", exc_info=True)
 
-							self.indiLOG.log(30,"UNIFI executeCMDOnController error no json object: (wrong UID/passwd, ip number?{}) ...>>{}<<".format(self.unifiCloudKeyIP, resp.text))
-							self.executeCMDOnControllerReset(wait=True, calledFrom="executeCMDOnController-login json")
-							continue
+								if 'X-CSRF-Token' in resp.headers:
+									self.csrfToken = resp.headers['X-CSRF-Token']
 
-						if  resp.status_code != requests.codes.ok:
-							self.failedControllerLoginCount += 1 
-							self.indiLOG.log(30,"UNIFI executeCMDOnController  LOGIN failed ({} times), will try again; url:{}, >>ok<< not found,  or status_code:{} not in >>{}<<\n  error: >>{}<<\n".format(self.failedControllerLoginCount , url,resp.status_code, requests.codes.ok, resp.text[0:300]) )
-							self.executeCMDOnControllerReset(wait=True, calledFrom="executeCMDOnController-login ret code not ok")
-							self.sleep(5)
-							if self.failedControllerLoginCount > self.failedControllerLoginCountMax: 		
-								self.quitNOW = "restart due to failed Controller Login count  > {}".format(self.failedControllerLoginCount )
-								return []
-								
-							continue
-						if 'X-CSRF-Token' in resp.headers:
-							self.csrfToken = resp.headers['X-CSRF-Token']
-				
+								self.lastUnifiCookieRequests = time.time()
 
-						self.lastUnifiCookieRequests = time.time()
-		
+					## login failed ?		
 					if self.unifiControllerSession == "": 
-						self.executeCMDOnControllerReset(wait=False, calledFrom="executeCMDOnController-unifiControllerSession = blank")
+						self.executeCMDOnControllerReset( calledFrom="executeCMDOnController-unifiControllerSession = blank")
 						if self.decideMyLog("Protect"): self.indiLOG.log(10,"Connection: session =blank, continue ")
 						continue
 
+					## prep and then get data
 					headers = {"Accept": "application/json", "Content-Type": "application/json"}
 					if self.csrfToken != "":
 						headers['X-CSRF-Token'] = self.csrfToken
@@ -5372,8 +5389,8 @@ def executeCMDOnController(self, dataSEND={}, pageString="",jsonAction="returnDa
 					if self.unifiCloudKeySiteName == "": continue
 					self.unifiCloudKeySiteNameGetNew = False
 
-					if self.failedControllerLoginCount  > 0:
-						self.indiLOG.log(30,"UNIFI executeCMDOnController  LOGIN fixed after #{} tries ".format(self.failedControllerLoginCount ) )
+					if self.failedControllerLoginCount  > 1:
+						self.indiLOG.log(30,"UNIFI executeCMDOnController  LOGIN fixed after {} tries".format(self.failedControllerLoginCount ) )
 					self.failedControllerLoginCount = 0
 				
 					if protect:
@@ -5383,18 +5400,21 @@ def executeCMDOnController(self, dataSEND={}, pageString="",jsonAction="returnDa
 
 					if self.decideMyLog("ConnectionCMD"):	self.indiLOG.log(10,"Connection: requests:{};\nheader:{};\ndataSEND:{};\ncookies:{};\ncmdType:{}".format(url, headers, dataSEND, cookies,cmdType) )
 					if startText !="":						self.indiLOG.log(10,"Connection: requests: startText{},".format(startText) )
-					try:
-							retCode			= ""
-							respText 		= ""
-							dictRET			= ""
-							rawData			= ""
-							if raw:	
-								setStream	= True
-							else:
-								setStream	= False
-							timeused		= 0
 
-							try:
+					## get data 
+					retCode			= ""
+					respText 		= ""
+					dictRET			= ""
+					rawData			= ""
+					if raw:	
+						setStream	= True
+					else:
+						setStream	= False
+					timeused		= 0
+
+					try: # for any unknown error check around the whole thing
+
+							try: # here we actuaally get the data 
 								if	 cmdType == "put":	resp = self.unifiControllerSession.put(url,  	json=dataSEND,		cookies=cookies, headers=headers, allow_redirects=False, verify=False, timeout=self.requestTimeout, stream=setStream)
 								elif cmdType == "post":	resp = self.unifiControllerSession.post(url, 	json=dataSEND,		cookies=cookies, headers=headers, allow_redirects=False, verify=False, timeout=self.requestTimeout, stream=setStream)
 								elif cmdType == "get":	
@@ -5402,25 +5422,37 @@ def executeCMDOnController(self, dataSEND={}, pageString="",jsonAction="returnDa
 														resp =	self.unifiControllerSession.get(url,						cookies=cookies, headers=headers, allow_redirects=False, verify=False, timeout=self.requestTimeout, stream=setStream)
 									else:
 										if protect: # get protect needs params= not json=
+											try:
 														resp =	self.unifiControllerSession.get(url, 	params=dataSEND,	cookies=cookies, headers=headers, verify=False, timeout=self.requestTimeout, stream=setStream)
-														if setStream: 
-															rawData = resp.raw.read()
-															#self.indiLOG.log(10,"executeCMDOnController protect  url:{} params:{}; stream:{}, len(resp.raw.read):{}".format(url, dataSEND, setStream, len(rawData) ))
+											except	Exception as e:
+												if iii > 0:
+													if "{}".format(e).find("object has no attribute") > -1:
+														if maxretry-iii-1 >0:	self.indiLOG.log(30,"bad read / connect to {:55s}  will try again {} more times".format(url, maxretry-iii-1))
+														else:					self.indiLOG.log(30,"bad read / connect to {:55s}  giving up after {} tries".format(url, maxretry))
+												if iii > 1: self.executeCMDOnControllerReset( calledFrom="executeCMDOnController-iii > 1")
+												continue
+											if setStream: 
+												rawData = resp.raw.read()
+												#self.indiLOG.log(10,"executeCMDOnController protect  url:{} params:{}; stream:{}, len(resp.raw.read):{}".format(url, dataSEND, setStream, len(rawData) ))
 										else:
-														resp =	self.unifiControllerSession.get(url, 	json=dataSEND,		cookies=cookies, headers=headers, allow_redirects=False, verify=False, timeout=self.requestTimeout, stream=setStream)
+											resp =	self.unifiControllerSession.get(url, 	json=dataSEND,		cookies=cookies, headers=headers, allow_redirects=False, verify=False, timeout=self.requestTimeout, stream=setStream)
 
 								elif cmdType == "patch":resp = self.unifiControllerSession.patch(url,	json=dataSEND,		cookies=cookies, headers=headers, allow_redirects=False, verify=False, timeout=self.requestTimeout, stream=setStream)
 								else:					resp = self.unifiControllerSession.put(url,   	json=dataSEND,		cookies=cookies, headers=headers, allow_redirects=False, verify=False, timeout=self.requestTimeout, stream=setStream)
+								## got something
 								
 							except	Exception as e:
-								if "{}".format(e).find("timed out") > -1:
-									self.indiLOG.log(40," read timed out to {}".format(url))
+								if f"{e}".find("timed out") > -1 or f"{e}".find("Connection refused") > -1:
+									if iii > 1:
+										if maxretry-iii-1 > 0:	self.indiLOG.log(30,"read timed out to {:55s}  will try again {} more times".format(url, maxretry-iii-1))
+										else:					self.indiLOG.log(30,"read timed out to {:55s}  giving up after {} tries".format(url, maxretry))
+									if iii > 1: self.executeCMDOnControllerReset( calledFrom="executeCMDOnController-iii > 1")
 									continue
 				
-								if "{}".format(e).find("None") == -1: self.indiLOG.log(40,"", exc_info=True)
+								if "{}".format(e).find("None") == -1: self.indiLOG.log(30,f"error at get/put..: {e}, for url:{url}, dataSEND:{dataSEND}")
 								continue
 
-							try:
+							try:  ## now lets see what we got
 								retCode		= copy.copy(resp.status_code )
 								respText 	= copy.copy(resp.text)
 								retStatus	= resp.status_code
@@ -5429,7 +5461,6 @@ def executeCMDOnController(self, dataSEND={}, pageString="",jsonAction="returnDa
 								if self.decideMyLog("ConnectionRET"):	
 									self.indiLOG.log(10,"executeCMDOnController retCode:{}, time used:{}; cont length:{} os:{}; cmdType:{}, url:{}\n>>>{}<<<".format(retCode, timeused, len(respText), self.unifiControllerOS, cmdType, url, respText))
 								headers 	= copy.copy(resp.headers)
-
 								if not raw:
 									dictRET	= json.loads(respText)
 
@@ -5442,7 +5473,7 @@ def executeCMDOnController(self, dataSEND={}, pageString="",jsonAction="returnDa
 										self.indiLOG.log(30,"", exc_info=True)
 										self.indiLOG.log(20,"executeCMDOnController has error, retCode:{}, time used:{}; cont length:{} os:{}; cmdType:{}, url:{}".format(retCode, timeused, len(respText), self.unifiControllerOS, cmdType, url))
 										self.printHttpError(errText, respText)
-								self.executeCMDOnControllerReset(wait=True, calledFrom="executeCMDOnController-exception after json/decode ..")
+								self.executeCMDOnControllerReset(wait=5, calledFrom="executeCMDOnController-exception after json/decode ..")
 								try: resp.close()
 								except: pass
 								continue
@@ -5451,17 +5482,26 @@ def executeCMDOnController(self, dataSEND={}, pageString="",jsonAction="returnDa
 								if retCode != requests.codes.ok:
 									if iii == 1 and (not ignore40x or "{}".format(retCode).find("40") !=0):
 										self.indiLOG.log(40,"error:>> url:{}, resp code:{}".format(url, retCode))
-									if (not ignore40x or "{}".format(retCode).find("40") !=0): self.executeCMDOnControllerReset(wait=True, calledFrom="executeCMDOnController-retcode not ok")
+									if (not ignore40x or "{}".format(retCode).find("40") !=0): self.executeCMDOnControllerReset(wait=5, calledFrom="executeCMDOnController-retcode not ok")
 									continue
 							else:
+								if "meta" not in dictRET:
+									if maxretry-iii-1 >0:	self.indiLOG.log(30,"bad connect to {:55s}  will try again {} more times".format(url, maxretry-iii-1))
+									else:					self.indiLOG.log(30,"bad connect to {:55s}  giving up after {} tries".format(url, maxretry))
+									if iii > 1: self.executeCMDOnControllerReset( calledFrom="executeCMDOnController-iii > 1")
+									continue
+
 								if dictRET["meta"]["rc"] != "ok":
 									if iii == 1 and (not ignore40x or "{}".format(retCode).find("40") !=0):
 										self.indiLOG.log(40,"error:>> url:{}, resp:{}".format(url, respText[0:100]))
-									if  (not ignore40x or "{}".format(retCode).find("40") !=0): self.executeCMDOnControllerReset(wait=True, calledFrom="executeCMDOnController-dict ret not ok")
+									if  (not ignore40x or "{}".format(retCode).find("40") !=0): self.executeCMDOnControllerReset(wait=5, calledFrom="executeCMDOnController-dict ret not ok")
 									continue
 
 							self.lastUnifiCookieRequests = time.time()
 
+							if iii > 1:
+								self.indiLOG.log(30,"error conenct to {:55s}  fixed after {}. try".format(url, iii+1))
+
 							if 'X-CSRF-Token' in headers:
 								self.csrfToken = headers['X-CSRF-Token']
 
@@ -5478,14 +5518,14 @@ def executeCMDOnController(self, dataSEND={}, pageString="",jsonAction="returnDa
 						if "{}".format(e).find("None") == -1: self.indiLOG.log(40,"", exc_info=True)
 
 				## we get here when not successful
-				self.executeCMDOnControllerReset(wait=True, calledFrom="executeCMDOnController-end-error")
+				self.executeCMDOnControllerReset(wait=5, calledFrom="executeCMDOnController-end-error")
 
 			return []
 
 		except	Exception as e:
 			if "{}".format(e).find("None") == -1: self.indiLOG.log(40,"", exc_info=True)
 
-		self.executeCMDOnControllerReset(wait=False, calledFrom="executeCMDOnController-exception")
+		self.executeCMDOnControllerReset( calledFrom="executeCMDOnController-exception")
 		return []
 
 
@@ -6251,7 +6291,7 @@ def fixBeforeRunConcurrentThread(self):
 						if self.unifiControllerType.find("UDM") > -1 and ll == self.numberForUDM["SW"]: continue
 						ipn = self.ipNumbersOf["SW"][ll]
 						if self.decideMyLog("Logic"): self.indiLOG.log(10,"START SW Thread tr # {}  uDM#:{}  {}".format(ll, self.numberForUDM["SW"], ipn, self.unifiControllerType))
-	 					#					 self.trSWLog["{}".format(ll)] = threading.Thread(name='self.getMessages', target=self.getMessages, args=(ipn, ll, "SWtail",float(self.readDictEverySeconds["SW"]*2,))
+						#					 self.trSWLog["{}".format(ll)] = threading.Thread(name='self.getMessages', target=self.getMessages, args=(ipn, ll, "SWtail",float(self.readDictEverySeconds["SW"]*2,))
 	 					#					 self.trSWLog["{}".format(ll)].start()
 						waitBeforeStart += addtoWait
 						self.trSWDict["{}".format(ll)] = threading.Thread(name='getMessages-SW-Dict', target=self.getMessages, args=(ipn, ll, "SWdict",waitBeforeStart,))
@@ -8416,6 +8456,7 @@ def checkIfRestartNeeded(self, restartCode, goodDataReceivedTime, aliveReceivedT
 	####-----------------	 ---------
 	def readFromUnifiDevice(self, goodDataReceivedTime, aliveReceivedTime, ListenProcessFileHandle, uType, ipNumber, msgSleep, lastLine, newDataStartTime):
 		try:
+			lfs = ""
 			try:
 				if ListenProcessFileHandle == "": 
 					self.indiLOG.log(20,"readFromUnifiDevice: read handle not defined for {}-{}, sleeping 15 secs ".format(uType, ipNumber))
@@ -8426,7 +8467,6 @@ def readFromUnifiDevice(self, goodDataReceivedTime, aliveReceivedTime, ListenPro
 					return goodDataReceivedTime, aliveReceivedTime, newlinesFromServer, msgSleep, newDataStartTime
 
 				newlinesFromServer = ""
-				lfs = ""
 				lfs = os.read(ListenProcessFileHandle.stdout.fileno(),self.readBuffer).decode("utf8") 
 				newlinesFromServer = "{}".format(lfs) 
 				if newlinesFromServer != "":
@@ -9386,7 +9426,12 @@ def goThroughNewEventDataGetThumbNailsAndUpdateIndigoDevicesAndVariables(self, c
 			if self.decideMyLog("Protect"): self.indiLOG.log(10,"getProtectEvents: check :{}".format(checkIds))
 			for evID in checkIds:
 				cameraId 	= checkIds[evID]
-				protectEV 	= self.PROTECT[cameraId]["events"][evID]
+				if evID 				not in self.PROTECT[cameraId]["events"]: 		continue
+				if "eventType" 			not in self.PROTECT[cameraId]["events"][evID]: 	continue
+				if "rawEvent" 			not in self.PROTECT[cameraId]["events"][evID]: 	continue
+				if "thumbnailCopied" 	not in self.PROTECT[cameraId]["events"][evID]: 	continue
+
+				protectEV 	= self.PROTECT[cameraId]["events"].get(evID,{})
 				smartDetect	= ""
 				dev 		= ""
 				eventJpeg	= ""
@@ -12478,33 +12523,51 @@ def doSWdictSELF(self, theDict, apNumb, ipNDevice, MAC, hostname, ipNumber):
 
 					for port in portTable:
 
+						rxRate = "0"
+						txRate = "0"
+
 						if "port_idx" not in port: continue
 						ID = port["port_idx"]
 						idS = "{:02d}".format(ID) # state name
 
-						if "{}".format(ID) not in self.MAC2INDIGO[xType][MAC]["ports"]:
+						if f"{ID}" not in self.MAC2INDIGO[xType][MAC]["ports"]:
 							self.MAC2INDIGO[xType][MAC]["ports"]["{}".format(ID)] = {"rxLast": 0, "txLast": 0, "timeLast": 0,"poe":"","fullDuplex":"","link":"","nClients":0}
-						portsMAC = self.MAC2INDIGO[xType][MAC]["ports"]["{}".format(ID)]
-						if portsMAC["timeLast"] != 0. and "tx_bytes" in port:
+						portsMAC = self.MAC2INDIGO[xType][MAC]["ports"][f"{ID}"]
+						if portsMAC["timeLast"] != 0. and "tx_bytes" in port and "rx_bytes" in port:
 							try:
 								dt = max(5, time.time() - portsMAC["timeLast"]) * 1000
-								rxRate = "{:.1f}".format( (port["tx_bytes"] - portsMAC["txLast"]) / dt + 0.5)
-								txRate = "{:.1f}".format( (port["rx_bytes"] - portsMAC["rxLast"]) / dt + 0.5)
+								txLast = portsMAC.get("txLast", 0)
+								if txLast == "": txLast = 0
+								rxLast = portsMAC.get("rxLast", 0)
+								if rxLast == "": rxLast = 0
+
+								tx_bytes = portsMAC.get("tx_bytes", 0)
+								if tx_bytes == "": tx_bytes = 0
+								rx_bytes = portsMAC.get("rx_bytes", 0)
+								if rx_bytes == "": rx_bytes = 0
+
+								txRate = "{:.1f}".format( (tx_bytes - txLast) / dt + 0.5)
+								rxRate = "{:.1f}".format( (rx_bytes - rxLast) / dt + 0.5)
+
 							except	Exception as e:
-								if "{}".format(e).find("None") == -1: self.indiLOG.log(40,"", exc_info=True)
+								if "{}".format(e).find("None") == -1: 
+									self.indiLOG.log(40,"", exc_info=True)
+									self.indiLOG.log(30,f" switch ip:{ipNDevice},  port:{port}, portsMAC:{portsMAC}")
+								continue
 							try:
-								errors = "{}".format(port["tx_dropped"] + port["tx_errors"] + port["rx_errors"] + port["rx_dropped"])
+								errors = "{}".format(port.get("tx_dropped",0) + port.get("tx_errors",0) + port.get("rx_errors",0) + port.get("rx_dropped",0) )
 							except:
 								errors = "?"
 							if port["full_duplex"]:
 								fullDuplex = "FD"
 							else:
 								fullDuplex = "HD"
-							portsMAC["fullDuplex"] = fullDuplex+"-" + ("{}".format(port["speed"]))
+							portsMAC["fullDuplex"] = "{}-{}".format( fullDuplex, port.get("speed") )
 
 							nDevices = 0
 							if "mac_table" in port:
 								nDevices = len(port["mac_table"])
+
 							portsMAC["nClients"] = nDevices
 							ppp = "#C: {:02d}" .format(nDevices) # of clients
 
diff --git a/uniFiAP.indigoPlugin/Contents/changeLog.txt b/uniFiAP.indigoPlugin/Contents/changeLog.txt
index 31e9fe8..9667dd4 100755
--- a/uniFiAP.indigoPlugin/Contents/changeLog.txt
+++ b/uniFiAP.indigoPlugin/Contents/changeLog.txt
@@ -1,3 +1,17 @@
+changes in V2022.43.397@ 2024-01-13
+==================  
+-	in case of http error, the plugin does not print a large dump anymore, but it will
+     = check if timeout, retry 2 more times, if sucessful, a warning will occur .. fixed after xx tries
+     = if not sucessfult it will try 30 more times (after some minutes) and if not sucesfull the plugin will reload eg when the unifi device is down, or you load a new software
+
+
+
+
+changes in V2022.42.397@ 2023-12-25
+==================  
+-	added check and logging when connection to controller does not work properly
+
+
 changes in V2022.42.396@ 2023-12-15
 ==================  
 -	added option to select a differetnt way to set POE on/off switches. Some newer switch devices only support a unix command swctrl