modulitiz-micro 2.27.1__py311-none-any.whl → 2.27.2__py311-none-any.whl

modulitiz_micro/rete/ntp/AbstractModuloNtp.py

@@ -1,73 +1,73 @@
-import socket
-import struct
-from abc import ABC
-
-from modulitiz_micro.ModuloDate import ModuloDate
-from modulitiz_micro.eccezioni.http.EccezioneHttpGeneric import EccezioneHttpGeneric
-from modulitiz_micro.files.ModuloLogging import ModuloLogging
-from modulitiz_micro.rete.http.ModuloHttpConnectionSafe import ModuloHttpConnectionSafe
-from modulitiz_micro.rete.http.decorators.catchAndRaiseHttpExceptions import catchAndRaiseHttpExceptions
-
-
-class AbstractModuloNtp(ABC):
-	REFRESH_CACHE_EVERY_SECS=4*3600*1000		# frequenza richiesta NTP, l'rpi sballa di 45 minuti ogni 24 ore
-	OFFSET_MILLIS=1		# offset correzione errore
-	TIMEOUT=10
-	
-	__PORTA=123						# numero della porta (UDP)
-	__BUF=1024
-	__TIME1970=2208988800			# reference time, secondi da 1900-01-01 00:00:00 a 1970-01-01 00:00:00 = 70 anni
-	__MSG=('\x1b' + 47 * '\0').encode()
-	
-	
-	def __init__(self,host:str,logger:ModuloLogging):
-		self.logger=logger
-		self.connectionSafe = ModuloHttpConnectionSafe(logger)
-		self.host=host
-		self.lastNtpResponse=0
-		self.lastNtpTimestampUtc=0
-	
-	def getTimestampUtcFromNtp(self,useCache:bool=True,retryIfError:bool=True)->int:
-		if useCache is True and self.lastNtpResponse!=0:
-			# controllo se e' passato poco tempo dall'ultima chiamata ntp
-			diffMillisLastResponse=(ModuloDate.getMillis()-self.lastNtpResponse)
-			if diffMillisLastResponse<self.REFRESH_CACHE_EVERY_SECS:
-				# calcolo l'ora attuale usando il cronometro interno
-				return self.lastNtpTimestampUtc+diffMillisLastResponse+self.OFFSET_MILLIS
-		# invio la richiesta e in caso di errore...
-		if not retryIfError:
-			#... uso il cronometro interno
-			try:
-				timestampUtc=self.__ntpSendPacket()
-			except EccezioneHttpGeneric:
-				timestampUtc=None
-		else:
-			#... riprovo
-			timestampUtc=self.connectionSafe.run(1,3,self.__ntpSendPacket)
-		if timestampUtc is None:
-			diffMillisLastResponse=(ModuloDate.getMillis()-self.lastNtpResponse)
-			return self.lastNtpTimestampUtc+diffMillisLastResponse+self.OFFSET_MILLIS
-		timestampUtc=timestampUtc*1000
-		# successo
-		self.lastNtpResponse=ModuloDate.getMillis()
-		self.lastNtpTimestampUtc=timestampUtc
-		return self.lastNtpTimestampUtc
-	
-	def getDatetimeFromNtp(self,useCache:bool=True,retryIfError:bool=True):
-		tsSec=self.getTimestampUtcFromNtp(useCache,retryIfError)//1000
-		return ModuloDate.timestampUtcToDate(tsSec)
-	
-	@catchAndRaiseHttpExceptions
-	def __ntpSendPacket(self)->int:
-		# connect to server
-		client=socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
-		client.settimeout(self.TIMEOUT)
-		client.sendto(self.__MSG,(self.host,self.__PORTA))
-		# ricevo i dati
-		response=client.recvfrom(self.__BUF)[0]
-		# chiudo la socket
-		client.close()
-		# estraggo il timestamp
-		tsSec=struct.unpack("!12I",response)[10]
-		tsSec-=self.__TIME1970
-		return tsSec
+import socket
+import struct
+from abc import ABC
+
+from modulitiz_micro.ModuloDate import ModuloDate
+from modulitiz_micro.eccezioni.http.EccezioneHttpGeneric import EccezioneHttpGeneric
+from modulitiz_micro.files.ModuloLogging import ModuloLogging
+from modulitiz_micro.rete.http.ModuloHttpConnectionSafe import ModuloHttpConnectionSafe
+from modulitiz_micro.rete.http.decorators.catchAndRaiseHttpExceptions import catchAndRaiseHttpExceptions
+
+
+class AbstractModuloNtp(ABC):
+	REFRESH_CACHE_EVERY_SECS=4*3600*1000		# frequenza richiesta NTP, l'rpi sballa di 45 minuti ogni 24 ore
+	OFFSET_MILLIS=1		# offset correzione errore
+	TIMEOUT=10
+	
+	__PORTA=123						# numero della porta (UDP)
+	__BUF=1024
+	__TIME1970=2208988800			# reference time, secondi da 1900-01-01 00:00:00 a 1970-01-01 00:00:00 = 70 anni
+	__MSG=('\x1b' + 47 * '\0').encode()
+	
+	
+	def __init__(self,host:str,logger:ModuloLogging):
+		self.logger=logger
+		self.connectionSafe = ModuloHttpConnectionSafe(logger)
+		self.host=host
+		self.lastNtpResponse=0
+		self.lastNtpTimestampUtc=0
+	
+	def getTimestampUtcFromNtp(self,useCache:bool=True,retryIfError:bool=True)->int:
+		if useCache is True and self.lastNtpResponse!=0:
+			# controllo se e' passato poco tempo dall'ultima chiamata ntp
+			diffMillisLastResponse=(ModuloDate.getMillis()-self.lastNtpResponse)
+			if diffMillisLastResponse<self.REFRESH_CACHE_EVERY_SECS:
+				# calcolo l'ora attuale usando il cronometro interno
+				return self.lastNtpTimestampUtc+diffMillisLastResponse+self.OFFSET_MILLIS
+		# invio la richiesta e in caso di errore...
+		if not retryIfError:
+			#... uso il cronometro interno
+			try:
+				timestampUtc=self.__ntpSendPacket()
+			except EccezioneHttpGeneric:
+				timestampUtc=None
+		else:
+			#... riprovo
+			timestampUtc=self.connectionSafe.run(1,3,self.__ntpSendPacket)
+		if timestampUtc is None:
+			diffMillisLastResponse=(ModuloDate.getMillis()-self.lastNtpResponse)
+			return self.lastNtpTimestampUtc+diffMillisLastResponse+self.OFFSET_MILLIS
+		timestampUtc=timestampUtc*1000
+		# successo
+		self.lastNtpResponse=ModuloDate.getMillis()
+		self.lastNtpTimestampUtc=timestampUtc
+		return self.lastNtpTimestampUtc
+	
+	def getDatetimeFromNtp(self,useCache:bool=True,retryIfError:bool=True):
+		tsSec=self.getTimestampUtcFromNtp(useCache,retryIfError)//1000
+		return ModuloDate.timestampUtcToDate(tsSec)
+	
+	@catchAndRaiseHttpExceptions
+	def __ntpSendPacket(self)->int:
+		# connect to server
+		client=socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+		client.settimeout(self.TIMEOUT)
+		client.sendto(self.__MSG,(self.host,self.__PORTA))
+		# ricevo i dati
+		response=client.recvfrom(self.__BUF)[0]
+		# chiudo la socket
+		client.close()
+		# estraggo il timestamp
+		tsSec=struct.unpack("!12I",response)[10]
+		tsSec-=self.__TIME1970
+		return tsSec

modulitiz_micro/rete/ntp/ModuloNtpIt.py

@@ -1,8 +1,8 @@
-from modulitiz_micro.rete.ntp.AbstractModuloNtp import AbstractModuloNtp
-
-
-class ModuloNtpIt(AbstractModuloNtp):
-	HOST_IT="ntp1.inrim.it"
-	
-	def __init__(self,*args,**kwargs):
-		super().__init__(self.HOST_IT,*args,**kwargs)
+from modulitiz_micro.rete.ntp.AbstractModuloNtp import AbstractModuloNtp
+
+
+class ModuloNtpIt(AbstractModuloNtp):
+	HOST_IT="ntp1.inrim.it"
+	
+	def __init__(self,*args,**kwargs):
+		super().__init__(self.HOST_IT,*args,**kwargs)

modulitiz_micro/rete/socketserver/AbstractBasicGetSocketServer.py

@@ -1,35 +1,35 @@
-from abc import abstractmethod
-
-from modulitiz_micro.ModuloStringhe import ModuloStringhe
-from modulitiz_micro.eccezioni.http.EccezioneHttp import EccezioneHttp
-from modulitiz_micro.rete.http.ModuloHttp import ModuloHttp
-from modulitiz_micro.rete.socketserver.AbstractSocketServer import AbstractSocketServer
-
-
-class AbstractBasicGetSocketServer(AbstractSocketServer):
-	
-	def __init__(self,*args,**kwargs):
-		super().__init__(*args,**kwargs)
-	
-	@abstractmethod
-	def processResponse(self,clientIp:str,path:str,params:dict)->str|None:
-		"""
-		Cosa fare se la richiesta e' formalmente corretta.
-		Deve ritornare un output per chi ha fatto la richiesta
-		"""
-	
-	def handleRequest(self,method:str,url:str,path:str,params:dict,httpType:str,clientIp:str,clientPort:int)->tuple:
-		if method!='GET' or not ModuloStringhe.contains(httpType,'HTTP') or ModuloStringhe.isEmpty(url):
-			return 500,None,None
-		# controllo parametri
-		httpCode=ModuloHttp.STATUS_OK
-		responseBody=""
-		try:
-			responseBody=self.processResponse(clientIp,path,params)
-		except Exception as ex:
-			if not isinstance(ex, EccezioneHttp):
-				self.callbackError(ex)
-				httpCode=500
-			else:
-				httpCode=ex.httpCode
-		return httpCode,None,responseBody
+from abc import abstractmethod
+
+from modulitiz_micro.ModuloStringhe import ModuloStringhe
+from modulitiz_micro.eccezioni.http.EccezioneHttp import EccezioneHttp
+from modulitiz_micro.rete.http.ModuloHttp import ModuloHttp
+from modulitiz_micro.rete.socketserver.AbstractSocketServer import AbstractSocketServer
+
+
+class AbstractBasicGetSocketServer(AbstractSocketServer):
+	
+	def __init__(self,*args,**kwargs):
+		super().__init__(*args,**kwargs)
+	
+	@abstractmethod
+	def processResponse(self,clientIp:str,path:str,params:dict)->str|None:
+		"""
+		Cosa fare se la richiesta e' formalmente corretta.
+		Deve ritornare un output per chi ha fatto la richiesta
+		"""
+	
+	def handleRequest(self,method:str,url:str,path:str,params:dict,httpType:str,clientIp:str,clientPort:int)->tuple:
+		if method!='GET' or not ModuloStringhe.contains(httpType,'HTTP') or ModuloStringhe.isEmpty(url):
+			return 500,None,None
+		# controllo parametri
+		httpCode=ModuloHttp.STATUS_OK
+		responseBody=""
+		try:
+			responseBody=self.processResponse(clientIp,path,params)
+		except Exception as ex:
+			if not isinstance(ex, EccezioneHttp):
+				self.callbackError(ex)
+				httpCode=500
+			else:
+				httpCode=ex.httpCode
+		return httpCode,None,responseBody