Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	requirements.txt
This commit is contained in:
Maxim Khomutov 2025-03-15 02:46:13 +03:00
commit bb6a11e5fa
5 changed files with 9 additions and 11 deletions

2
.idea/misc.xml generated
View File

@ -3,5 +3,5 @@
<component name="Black">
<option name="sdkName" value="Python 3.13 (winConnect)" />
</component>
<component name="ProjectRootManager" version="2" project-jdk-name="Python 3.13 (winConnect)" project-jdk-type="Python SDK" />
<component name="ProjectRootManager" version="2" project-jdk-name="Python 3.12 (winConnect)" project-jdk-type="Python SDK" />
</project>

View File

@ -1,5 +1,5 @@
# python 3.13
# 12.03.2025
pywin32==309
ormsgpack==1.8.0
pycryptodome==3.21.0
pywin32~=309
ormsgpack~=1.8.0
pycryptodome~=3.21.0

View File

@ -1,5 +1,5 @@
import hashlib
import json
import orjson
import logging
import struct
import threading
@ -274,7 +274,7 @@ class WinConnectBase:
_blank_settings['header_format'] = self._header_format
_blank_settings['max_buffer'] = self.read_max_buffer
_blank_settings['crypto'] = self.__crypto.crypt_name
session_settings = f"set_session_settings:{len(self.__crypto.crypt_salt)}:{json.dumps(_blank_settings)}".encode(self.encoding) + self.__crypto.crypt_salt
session_settings = f"set_session_settings:{len(self.__crypto.crypt_salt)}:".encode(self.encoding) + orjson.dumps(_blank_settings) + self.__crypto.crypt_salt
self._send_message("cmd", session_settings)
return True
case b'set_session_settings':
@ -291,8 +291,8 @@ class WinConnectBase:
self.__crypto.set_salt(salt)
try:
settings = json.loads(data.decode(self.init_encoding))
except json.JSONDecodeError as e:
settings = orjson.loads(data.decode(self.init_encoding))
except orjson.JSONDecodeError as e:
self._send_error(WinConnectErrors.BAD_DATA, f"JSONDecodeError: {e}")
return self.close()

View File

@ -1,7 +1,6 @@
import win32pipe
from .WinConnectBase import WinConnectBase
from .crypto import WinConnectCrypto
class WinConnectDaemon(WinConnectBase):

View File

@ -1,9 +1,8 @@
import os
import random
from pathlib import Path
from .crypto_class_base import WinConnectCryptoBase
from winConnect.exceptions import WinConnectCryptoSimpleBadHeaderException
from .crypto_class_base import WinConnectCryptoBase
_pip_crypto = True
try: