jsocket 1.9.0__py3-none-any.whl → 1.9.2__py3-none-any.whl

jsocket/jsocket_base.py

@@ -31,10 +31,10 @@ import time
 logger = logging.getLogger("jsocket")
 
 class JsonSocket(object):
-	def __init__(self, address='127.0.0.1', port=5489):
+	def __init__(self, address='127.0.0.1', port=5489, timeout=2.0):
 		self.socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
 		self.conn = self.socket
-		self._timeout = None
+		self._timeout = timeout
 		self._address = address
 		self._port = port
 	
@@ -74,17 +74,21 @@ class JsonSocket(object):
 		return json.loads(str(msg[0],'ascii'))
 	
 	def close(self):
+		logger.debug("closing all connections")
+		self._close_connection()
 		self._close_socket()
-		if self.socket is not self.conn:
-			self._close_connection()
-			
+
 	def _close_socket(self):
 		logger.debug("closing main socket")
-		self.socket.close()
+		if self.socket.fileno() != -1:
+			self.socket.shutdown(socket.SHUT_RDWR)
+			self.socket.close()
 		
 	def _close_connection(self):
 		logger.debug("closing the connection socket")
-		self.conn.close()
+		if self.conn.fileno() != -1:
+			self.conn.shutdown(socket.SHUT_RDWR)
+			self.conn.close()
 	
 	def _get_timeout(self):
 		return self._timeout
@@ -152,7 +156,7 @@ class JsonClient(JsonSocket):
 			return True
 		return False
 
-	
+
 if __name__ == "__main__":
 	""" basic json echo server """
 	import threading

jsocket/tserver.py

@@ -20,7 +20,7 @@ __copyright__= """
 	GNU General Public License for more details.
 
 	You should have received a copy of the GNU General Public License
-	along with tserver module.  If not, see <http://www.gnu.org/licenses/>."""
+	along with tserver module.	If not, see <http://www.gnu.org/licenses/>."""
 __version__	 = "1.0.2"
 
 import jsocket.jsocket_base as jsocket_base
@@ -42,8 +42,8 @@ class ThreadedServer(threading.Thread, jsocket_base.JsonServer):
 		
 			This method is called every time a JSON object is received from a client
 			
-			@param	obj	JSON "key: value" object received from client
-			@retval	None
+			@param	obj JSON "key: value" object received from client
+			@retval None or a response object
 		"""
 		pass
 	
@@ -61,7 +61,10 @@ class ThreadedServer(threading.Thread, jsocket_base.JsonServer):
 			while self._isAlive:
 				try:
 					obj = self.read_obj()
-					self._process_message(obj)
+					resp_obj = self._process_message(obj)
+					if resp_obj is not None:
+						logger.debug("message has a response")
+						self.send_obj(resp_obj)
 				except socket.timeout as e:
 					logger.debug("socket.timeout: %s" % e)
 					continue
@@ -69,7 +72,7 @@ class ThreadedServer(threading.Thread, jsocket_base.JsonServer):
 					logger.exception(e)
 					self._close_connection()
 					break
-			self.close()
+			self._close_socket()
 	
 	def start(self):
 		""" Starts the threaded server. 
@@ -100,7 +103,7 @@ class ServerFactoryThread(threading.Thread, jsocket_base.JsonSocket):
 		""" Swaps the existing socket with a new one. Useful for setting socket after a new connection.
 		
 			@param	new_sock	socket to replace the existing default jsocket.JsonSocket object	
-			@retval	None
+			@retval None
 		"""
 		del self.socket
 		self.socket = new_sock
@@ -108,21 +111,23 @@ class ServerFactoryThread(threading.Thread, jsocket_base.JsonSocket):
 	
 	def run(self):
 		""" Should exit when client closes socket conn.
-		    Can force an exit with force_stop.
+			Can force an exit with force_stop.
 		"""
 		while self._isAlive:
 			try:
 				obj = self.read_obj()
-				self._process_message(obj)
+				resp_obj = self._process_message(obj)
+				if resp_obj is not None:
+					logger.debug("message has a response")
+					self.send_obj(resp_obj)
 			except socket.timeout as e:
 				logger.debug("socket.timeout: %s" % e)
 				continue
 			except Exception as e:
-				logger.info("client connection broken, closing socket")
-				self._close_connection()
+				logger.info("client connection broken, exit and close connection socket")
 				self._isAlive = False
 				break
-		self.close()
+		self._close_connection()
 
 	def start(self):
 		""" Starts the factory thread. 
@@ -136,7 +141,7 @@ class ServerFactoryThread(threading.Thread, jsocket_base.JsonSocket):
 
 	def force_stop(self):
 		""" Force stops the factory thread.
-		    Should exit when client socket is closed under normal conditions.
+			Should exit when client socket is closed under normal conditions.
 			The life of the dead is in the memory of the living.
 
 			@retval None

{jsocket-1.9.0.dist-info → jsocket-1.9.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: jsocket
-Version: 1.9.0
+Version: 1.9.2
 Summary: Python JSON Server & Client
 Home-page: https://cpiekarski.com/2012/01/25/python-json-client-server-redux/
 Author: Christopher Piekarski
@@ -9,7 +9,6 @@ Maintainer: Christopher Piekarski
 Maintainer-email: chris@cpiekarski.com
 License: OSI Approved Apache Software License
 Keywords: json,socket,server,client
-Platform: UNKNOWN
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Programming Language :: Python :: 3.9
@@ -23,5 +22,3 @@ Provides: jsocket
 Requires-Python: >=3.9
 License-File: LICENSE
 
-UNKNOWN
-

jsocket-1.9.2.dist-info/RECORD

@@ -0,0 +1,8 @@
+jsocket/__init__.py,sha256=wDphi2h6wD6vC-DYa4mOu9qqefhOuLAdMp47YTcm0mM,2555
+jsocket/jsocket_base.py,sha256=yUF0OYT8PcrxCqABEB9SaIR7aqYHd9_m1GgaoqlIEn4,5470
+jsocket/tserver.py,sha256=pr9xNWdc3UU_9F1AQKBObCoubCEexZOceHobvZmaXa4,5770
+jsocket-1.9.2.dist-info/LICENSE,sha256=r9OGvUawVBQpodY7BwMPTYja9PZebyIOvfw9_xhtMYc,828
+jsocket-1.9.2.dist-info/METADATA,sha256=oIohjMr9i5-g5tH6UfMtb-loH5PqtEtKWRx-9-2zz5Q,956
+jsocket-1.9.2.dist-info/WHEEL,sha256=AtBG6SXL3KF_v0NxLf0ehyVOh0cold-JbJYXNGorC6Q,92
+jsocket-1.9.2.dist-info/top_level.txt,sha256=QqfmeUi7avy9cdcsVVvG68CP-4mfg_P6E7OuBuNEcN4,8
+jsocket-1.9.2.dist-info/RECORD,,

{jsocket-1.9.0.dist-info → jsocket-1.9.2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.37.1)
+Generator: bdist_wheel (0.41.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

jsocket-1.9.0.dist-info/RECORD

@@ -1,8 +0,0 @@
-jsocket/__init__.py,sha256=wDphi2h6wD6vC-DYa4mOu9qqefhOuLAdMp47YTcm0mM,2555
-jsocket/jsocket_base.py,sha256=SCbgwOfMFEd5kyTQ8QV7u-0Pu9VEi3i0e_2A0-K7pG4,5304
-jsocket/tserver.py,sha256=lD5vJdNLyQUBNjqXaYFkG-XA46Vma0Fdjopb9JumCAk,5518
-jsocket-1.9.0.dist-info/LICENSE,sha256=r9OGvUawVBQpodY7BwMPTYja9PZebyIOvfw9_xhtMYc,828
-jsocket-1.9.0.dist-info/METADATA,sha256=6cFHPDyy7A-FylMNm2kxy5OHcDwv2wgrox0owGm7wCk,983
-jsocket-1.9.0.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-jsocket-1.9.0.dist-info/top_level.txt,sha256=QqfmeUi7avy9cdcsVVvG68CP-4mfg_P6E7OuBuNEcN4,8
-jsocket-1.9.0.dist-info/RECORD,,