11 Commits

Author SHA1 Message Date
SantaSpeen d5a0e4d633 Merge pull request #4 from SantaSpeen/dev
Dev
2025-03-15 02:50:55 +03:00
SantaSpeen b2ba454d07 ???? 2025-03-15 02:50:30 +03:00
SantaSpeen bb6a11e5fa Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	requirements.txt
2025-03-15 02:46:13 +03:00
SantaSpeen c5a79777e6 Merge pull request #3 from SantaSpeen/dev
Dev
2025-03-15 02:28:12 +03:00
SantaSpeen bad58d4521 fastfix 2025-03-14 16:03:18 +03:00
SantaSpeen 94bf268bab [>] json > orjson 2025-03-14 16:01:22 +03:00
SantaSpeen 53776f9278 .idea 2025-03-14 15:56:27 +03:00
SantaSpeen d124548527 [~] Optimize imports 2025-03-14 15:56:18 +03:00
SantaSpeen caa14e0fe5 update req 2025-03-14 15:55:05 +03:00
SantaSpeen 2b0c038e9c Merge pull request #2 from SantaSpeen/dev
Update 0.9.3; New protocol version: 3
2025-03-13 19:56:34 +03:00
SantaSpeen 7ca5b9b775 Merge pull request #1 from SantaSpeen/dev
Update 0.9.2; New protocol version: 2
2025-03-13 14:09:21 +03:00
5 changed files with 7 additions and 8 deletions
+1 -1
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>
+1
View File
@@ -2,4 +2,5 @@
# 12.03.2025
pywin32==309
ormsgpack==1.8.0
orjson==3.10.15
pycryptodome==3.21.0
+4 -4
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()
-1
View File
@@ -1,7 +1,6 @@
import win32pipe
from .WinConnectBase import WinConnectBase
from .crypto import WinConnectCrypto
class WinConnectDaemon(WinConnectBase):
+1 -2
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: