jsocket 1.8.2__tar.gz → 1.9.2__tar.gz

jsocket-1.9.2/LICENSE

@@ -0,0 +1,21 @@
+This file is part of the jsocket module.
+Copyright (C) 2011 by 
+Christopher Piekarski <chris@cpiekarski.com>
+
+The jsocket module is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+The jsocket module is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with jsocket module.  If not, see <http://www.gnu.org/licenses/>.
+
+Example:
+
+See the examples_servers.py file for several examples of how to use
+this module.

{jsocket-1.8.2 → jsocket-1.9.2}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 1.2
+Metadata-Version: 2.1
 Name: jsocket
-Version: 1.8.2
+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
@@ -8,12 +8,10 @@ Author-email: chris@cpiekarski.com
 Maintainer: Christopher Piekarski
 Maintainer-email: chris@cpiekarski.com
 License: OSI Approved Apache Software License
-Description: UNKNOWN
 Keywords: json,socket,server,client
-Platform: UNKNOWN
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: Apache Software License
-Classifier: Programming Language :: Python :: 3.5
+Classifier: Programming Language :: Python :: 3.9
 Classifier: Operating System :: OS Independent
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Topic :: System :: Networking
@@ -21,4 +19,5 @@ Classifier: Topic :: Software Development :: Libraries :: Application Frameworks
 Classifier: Topic :: System :: Distributed Computing
 Classifier: Topic :: System :: Hardware :: Symmetric Multi-processing
 Provides: jsocket
-Requires-Python: >=3.5
+Requires-Python: >=3.9
+License-File: LICENSE

{jsocket-1.8.2 → jsocket-1.9.2}/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-1.8.2 → jsocket-1.9.2}/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
@@ -180,13 +185,13 @@ class ServerFactory(ThreadedServer):
 		
 	def stop_all(self):
 		for t in self._threads:
-			if t.isAlive():
+			if t.is_alive():
 				t.force_stop()
 				t.join()
 			
 	def _purge_threads(self):
 		for t in self._threads:
-			if not t.isAlive():
+			if not t.is_alive():
 				self._threads.remove(t)
 			
 	def _wait_to_exit(self):
@@ -194,6 +199,6 @@ class ServerFactory(ThreadedServer):
 			time.sleep(0.2)
 			
 	def _get_num_of_active_threads(self):
-		return len([True for x in self._threads if x.isAlive()])
+		return len([True for x in self._threads if x.is_alive()])
 	
 	active = property(_get_num_of_active_threads, doc="number of active threads")

{jsocket-1.8.2 → jsocket-1.9.2}/jsocket.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 1.2
+Metadata-Version: 2.1
 Name: jsocket
-Version: 1.8.2
+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
@@ -8,12 +8,10 @@ Author-email: chris@cpiekarski.com
 Maintainer: Christopher Piekarski
 Maintainer-email: chris@cpiekarski.com
 License: OSI Approved Apache Software License
-Description: UNKNOWN
 Keywords: json,socket,server,client
-Platform: UNKNOWN
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: Apache Software License
-Classifier: Programming Language :: Python :: 3.5
+Classifier: Programming Language :: Python :: 3.9
 Classifier: Operating System :: OS Independent
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Topic :: System :: Networking
@@ -21,4 +19,5 @@ Classifier: Topic :: Software Development :: Libraries :: Application Frameworks
 Classifier: Topic :: System :: Distributed Computing
 Classifier: Topic :: System :: Hardware :: Symmetric Multi-processing
 Provides: jsocket
-Requires-Python: >=3.5
+Requires-Python: >=3.9
+License-File: LICENSE

{jsocket-1.8.2 → jsocket-1.9.2}/jsocket.egg-info/SOURCES.txt

@@ -1,3 +1,4 @@
+LICENSE
 README.md
 setup.py
 jsocket/__init__.py

{jsocket-1.8.2 → jsocket-1.9.2}/setup.py

@@ -3,7 +3,7 @@
 from setuptools import setup, Extension
 
 setup(name='jsocket',
-      version='1.8.2',
+      version='1.9.2',
       description='Python JSON Server & Client',
       author='Christopher Piekarski',
       author_email='chris@cpiekarski.com',
@@ -13,11 +13,11 @@ setup(name='jsocket',
       keywords=['json','socket','server','client'],
       packages=['jsocket'],
       provides=['jsocket'],
-      python_requires='>=3.5',
+      python_requires='>=3.9',
       classifiers=[
                    'Intended Audience :: Developers',
                    'License :: OSI Approved :: Apache Software License',
-                   'Programming Language :: Python :: 3.5',
+                   'Programming Language :: Python :: 3.9',
                    'Operating System :: OS Independent',
                    'Development Status :: 5 - Production/Stable',
                    'Topic :: System :: Networking',