From 62b76f766353aea0d5f974fe4088a6be72f739ef Mon Sep 17 00:00:00 2001 From: Joxos Date: Fri, 16 Feb 2024 11:43:46 +0800 Subject: [PATCH] update file structure --- pyasync_server/benchmark.py => benchmark.py | 0 {pyasync_server/client => client}/client.py | 41 +++++++++++-------- {pyasync_server/client => client}/config.py | 0 {pyasync_server/client => client}/package.py | 0 {pyasync_server/client => client}/server.crt | 0 {pyasync_server/common => common}/config.py | 0 {pyasync_server/common => common}/package.py | 0 {pyasync_server/common => common}/protocol.py | 0 {pyasync_server/common => common}/utils.py | 0 ...er_benchmark.py => compresser_benchmark.py | 0 {pyasync_server/server => server}/actions.py | 0 {pyasync_server/server => server}/config.py | 0 {pyasync_server/server => server}/package.py | 0 {pyasync_server/server => server}/server.crt | 0 {pyasync_server/server => server}/server.key | 0 {pyasync_server/server => server}/server.py | 0 16 files changed, 23 insertions(+), 18 deletions(-) rename pyasync_server/benchmark.py => benchmark.py (100%) rename {pyasync_server/client => client}/client.py (70%) rename {pyasync_server/client => client}/config.py (100%) rename {pyasync_server/client => client}/package.py (100%) rename {pyasync_server/client => client}/server.crt (100%) rename {pyasync_server/common => common}/config.py (100%) rename {pyasync_server/common => common}/package.py (100%) rename {pyasync_server/common => common}/protocol.py (100%) rename {pyasync_server/common => common}/utils.py (100%) rename pyasync_server/compresser_benchmark.py => compresser_benchmark.py (100%) rename {pyasync_server/server => server}/actions.py (100%) rename {pyasync_server/server => server}/config.py (100%) rename {pyasync_server/server => server}/package.py (100%) rename {pyasync_server/server => server}/server.crt (100%) rename {pyasync_server/server => server}/server.key (100%) rename {pyasync_server/server => server}/server.py (100%) diff --git a/pyasync_server/benchmark.py b/benchmark.py similarity index 100% rename from pyasync_server/benchmark.py rename to benchmark.py diff --git a/pyasync_server/client/client.py b/client/client.py similarity index 70% rename from pyasync_server/client/client.py rename to client/client.py index b800200..bdd75a3 100644 --- a/pyasync_server/client/client.py +++ b/client/client.py @@ -1,39 +1,43 @@ -''' +""" client.py: High-performance async client codes. -''' +""" import asyncio import ssl import sys -sys.path.append('..') +sys.path.append("..") from common.protocol import on_init, is_framed -from common.utils import show_status, compress, decompress, STATUS, handle_run_main, logger +from common.utils import ( + show_status, + compress, + decompress, + STATUS, + handle_run_main, + logger, +) from package import * from config import * class ClientProtocol(asyncio.Protocol): - def __init__(self, package_to_send, on_con_lost): self.package_to_send = package_to_send self.on_con_lost = on_con_lost - self.recieved_data = '' + self.recieved_data = "" on_init(self) def connection_made(self, transport): self.transport = transport - self.address = transport.get_extra_info('peername') + self.address = transport.get_extra_info("peername") show_status(STATUS.CONNECTED, self.address) - transport.write( - compress(bytes(self.package_to_send, encoding=default_coding))) + transport.write(compress(bytes(self.package_to_send, encoding=default_coding))) show_status(STATUS.SEND, self.address, self.package_to_send) def data_received(self, more_data): try: - self.recieved_data += decompress(more_data).decode('utf-8') + self.recieved_data += decompress(more_data).decode("utf-8") except: - show_status(STATUS.ERROR, self.address, - 'Failed to decompress or decode.') + show_status(STATUS.ERROR, self.address, "Failed to decompress or decode.") self.transport.close() return if is_framed(self): @@ -56,22 +60,23 @@ async def main(): try: context.load_verify_locations(crt_path) except FileNotFoundError: - logger.error(f'File missing when using TLS.') + logger.error(f"File missing when using TLS.") return else: - logger.info('TLS enabled.') + logger.info("TLS enabled.") else: - logger.warning('TLS not enabled.') + logger.warning("TLS not enabled.") loop = asyncio.get_running_loop() on_con_lost = loop.create_future() - mypackage = pack_request_mariadb_test('show databases') + mypackage = pack_request_mariadb_test("show databases") transport, protocol = await loop.create_connection( lambda: ClientProtocol(mypackage, on_con_lost), server_address[0], server_address[1], - ssl=context) + ssl=context, + ) try: await on_con_lost @@ -79,5 +84,5 @@ async def main(): transport.close() -if __name__ == '__main__': +if __name__ == "__main__": handle_run_main(main, server_address) diff --git a/pyasync_server/client/config.py b/client/config.py similarity index 100% rename from pyasync_server/client/config.py rename to client/config.py diff --git a/pyasync_server/client/package.py b/client/package.py similarity index 100% rename from pyasync_server/client/package.py rename to client/package.py diff --git a/pyasync_server/client/server.crt b/client/server.crt similarity index 100% rename from pyasync_server/client/server.crt rename to client/server.crt diff --git a/pyasync_server/common/config.py b/common/config.py similarity index 100% rename from pyasync_server/common/config.py rename to common/config.py diff --git a/pyasync_server/common/package.py b/common/package.py similarity index 100% rename from pyasync_server/common/package.py rename to common/package.py diff --git a/pyasync_server/common/protocol.py b/common/protocol.py similarity index 100% rename from pyasync_server/common/protocol.py rename to common/protocol.py diff --git a/pyasync_server/common/utils.py b/common/utils.py similarity index 100% rename from pyasync_server/common/utils.py rename to common/utils.py diff --git a/pyasync_server/compresser_benchmark.py b/compresser_benchmark.py similarity index 100% rename from pyasync_server/compresser_benchmark.py rename to compresser_benchmark.py diff --git a/pyasync_server/server/actions.py b/server/actions.py similarity index 100% rename from pyasync_server/server/actions.py rename to server/actions.py diff --git a/pyasync_server/server/config.py b/server/config.py similarity index 100% rename from pyasync_server/server/config.py rename to server/config.py diff --git a/pyasync_server/server/package.py b/server/package.py similarity index 100% rename from pyasync_server/server/package.py rename to server/package.py diff --git a/pyasync_server/server/server.crt b/server/server.crt similarity index 100% rename from pyasync_server/server/server.crt rename to server/server.crt diff --git a/pyasync_server/server/server.key b/server/server.key similarity index 100% rename from pyasync_server/server/server.key rename to server/server.key diff --git a/pyasync_server/server/server.py b/server/server.py similarity index 100% rename from pyasync_server/server/server.py rename to server/server.py