albibong 1.0.1__tar.gz → 1.0.2__tar.gz

{albibong-1.0.1 → albibong-1.0.2}/.gitignore

@@ -1,6 +1,13 @@
 # Created by https://www.toptal.com/developers/gitignore/api/python,macos
 # Edit at https://www.toptal.com/developers/gitignore?templates=python,macos
 
+
+## Additional
+dump/
+log/
+pcap/
+.vscode
+
 ### macOS ###
 # General
 .DS_Store

{albibong-1.0.1 → albibong-1.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: albibong
-Version: 1.0.1
+Version: 1.0.2
 Summary: A cross-platform Albion Online damage, fame, and dungeon tracker
 Project-URL: Homepage, https://github.com/imjangkar/albibong
 Project-URL: Issues, https://github.com/imjangkar/albibong/issues

{albibong-1.0.1 → albibong-1.0.2}/pyproject.toml

@@ -19,7 +19,7 @@ albibong = "albibong:main"
 
 [project]
 name = "albibong"
-version = "1.0.1"
+version = "1.0.2"
 authors = [
   { name="imjangkar", email="imjangkar@gmail.com" },
 ]

{albibong-1.0.1 → albibong-1.0.2}/src/albibong/__init__.py

@@ -1,4 +1,5 @@
 import queue
+import random
 import sys
 from time import sleep
 
@@ -13,7 +14,7 @@ from albibong.threads.sniffer_thread import SnifferThread
 from albibong.threads.websocket_server import get_ws_server
 
 logger = Logger(__name__, stdout=True, log_to_file=False)
-
+PORT = random.randrange(8500,8999)
 
 def read_pcap(path):
     packet_handler = PacketHandler()
@@ -22,7 +23,7 @@ def read_pcap(path):
         packet_handler.handle(packet)
 
 
-def sniff():
+def sniff(useWebview):
     _sentinel = object()
     packet_queue = queue.Queue()
 
@@ -40,39 +41,43 @@ def sniff():
     ws_server = get_ws_server()
     ws_server.start()
 
-    http_server = HttpServerThread(name="http_server")
-    http_server.start()
-
-    # sleep(0.25)
-    # with open("../gui/dist/index.html", "r") as html:
-    window = webview.create_window(
-        "Albibong",
-        # "../../gui/dist/index.html",
-        url="http://localhost:8000/",
-        width=1280,
-        height=720,
-        zoomable=True,
-    )
+    if useWebview:
+        print("addr",PORT)
+
+        http_server = HttpServerThread(name="http_server", port=PORT)
+        http_server.start()
 
-    def on_closing():
-        c.stop()
-        p.stop()
-        ws_server.stop()
-        http_server.stop()
+        window = webview.create_window(
+            "Albibong",
+            url=f"http://localhost:{PORT}/",
+            width=1280,
+            height=720,
+            zoomable=True,
+        )
 
-    window.events.closing += on_closing
+        def on_closing():
+            c.stop()
+            p.stop()
+            ws_server.stop()
+            http_server.stop()
 
-    webview.start()
+        window.events.closing += on_closing
+
+        webview.start()
+    else:
+        try:
+            while True:
+                sleep(100)
+        except KeyboardInterrupt as e:
+            p.stop()
+            ws_server.stop()
 
 
-def main():
+def main(useWebview=True):
     if len(sys.argv) > 1:
         ws_server = get_ws_server()
         ws_server.start()
 
-        http_server = HttpServerThread(name="http_server")
-        http_server.start()
-
         read_pcap(sys.argv[1])
     else:
-        sniff()
+        sniff(useWebview)

albibong-1.0.2/src/albibong/__main__.py

@@ -0,0 +1,6 @@
+from albibong import main
+from albibong.classes.logger import use_logger
+
+if __name__ == "__main__":
+    use_logger(True)
+    main(useWebview=False)

{albibong-1.0.1 → albibong-1.0.2}/src/albibong/classes/character.py

@@ -1,4 +1,5 @@
 import json
+from uuid import UUID
 
 from albibong.classes.coords import Coords
 from albibong.classes.item import Item
@@ -12,6 +13,7 @@ class Character:
     def __init__(
         self,
         id: int,
+        uuid: UUID,
         username: str,
         guild: str,
         alliance: str,
@@ -19,6 +21,7 @@ class Character:
         equipment: list[Item] = [Item.get_item_from_code("0")] * 10,
     ):
         self.id = id
+        self.uuid = uuid
         self.username = username
         self.guild = guild
         self.alliance = alliance

{albibong-1.0.1 → albibong-1.0.2}/src/albibong/classes/logger.py

@@ -7,6 +7,13 @@ from scapy.all import wrpcap
 
 from albibong.photon_packet_parser import EventData, OperationRequest, OperationResponse
 
+isUsingLogger = False
+
+
+def use_logger(value):
+    global isUsingLogger
+    isUsingLogger = value
+
 
 class Logger(logging.Logger):
     def __init__(
@@ -25,7 +32,7 @@ class Logger(logging.Logger):
 
         self.file_timestamp = datetime.now(timezone.utc).strftime("%Y-%m-%dT%H%M%S")
         log_filepath = os.path.join(
-            os.path.expanduser("~"), f"Albibong/log/log_{self.file_timestamp}.txt"
+            os.path.dirname(__file__), f"../../../log/log_{self.file_timestamp}.txt"
         )
         os.makedirs(os.path.dirname(log_filepath), exist_ok=True)
 
@@ -63,6 +70,9 @@ class Logger(logging.Logger):
         return datetime.now(timezone.utc).strftime("%H:%M:%S")
 
     def log_payload(self, payload):
+        if not isUsingLogger:
+            return
+
         if type(payload) == EventData:
             self.log_event(payload)
         elif type(payload) == OperationRequest:
@@ -72,8 +82,9 @@ class Logger(logging.Logger):
 
     def log_dps_meter_state(self, state: bool):
         text = f"{self.get_timestamp()} DPS METER IS {'RUNNING. The damages below this point will be recorded.' if state else 'PAUSED. The damages below this point will NOT be recorded.'}"
-        self.info(text)
         print(text)
+        if isUsingLogger:
+            self.info(text)
 
     def log_event(self, payload: EventData):
         if self.ignore_event:

albibong-1.0.2/src/albibong/classes/utils.py

@@ -0,0 +1,9 @@
+from uuid import UUID
+
+
+class Utils:
+
+    @staticmethod
+    def convert_int_arr_to_uuid(arr):
+        b = bytes(arr)
+        return UUID(bytes=b)

{albibong-1.0.1 → albibong-1.0.2}/src/albibong/classes/world_data.py

@@ -1,12 +1,14 @@
 import json
 import os
 from collections import deque
+from uuid import UUID
 
 from albibong.classes.character import Character
 from albibong.classes.coords import Coords
 from albibong.classes.dungeon import Dungeon
 from albibong.classes.item import Item
 from albibong.classes.location import Location
+from albibong.classes.utils import Utils
 from albibong.resources.EventCode import EventCode
 from albibong.resources.OperationCode import OperationCode
 from albibong.threads.websocket_server import send_event
@@ -20,6 +22,7 @@ class WorldData:
     def __init__(self) -> None:
         self.me: Character = Character(
             id=None,
+            uuid=None,
             username="not initialized",
             guild="not initialized",
             alliance="not initialized",
@@ -29,6 +32,7 @@ class WorldData:
         self.current_dungeon: Dungeon = None
         self.characters: dict[str, Character] = {}
         self.char_id_to_username: dict[int, str] = {self.me.id: self.me.username}
+        self.char_uuid_to_username: dict[UUID, str] = {self.me.uuid: self.me.username}
         self.change_equipment_log: dict[int, list] = {}
         self.party_members: set[str] = set()
         self.is_dps_meter_running: bool = True
@@ -39,6 +43,8 @@ class WorldData:
                 self.handle_join_response(parameters)
             elif parameters[253] == OperationCode.CHANGE_CLUSTER.value:
                 self.set_location(parameters)
+            # elif parameters[253] == OperationCode.PARTY_LEAVE.value:
+            #     self.party_members = set(self.me.username)
 
     def handle_event(self, parameters):
         if 252 in parameters:
@@ -73,6 +79,7 @@ class WorldData:
             elif parameters[252] == EventCode.NEW_CHARACTER.value:
                 self.create_character(
                     id=parameters[0],
+                    uuid=parameters[7],
                     username=parameters[1],
                     guild=parameters[8] if 8 in parameters else "",
                     alliance=parameters[49] if 49 in parameters else "",
@@ -159,19 +166,20 @@ class WorldData:
         send_event(event)
 
     def update_party_member(self, parameters):
-        if self.me != None:
-            self.party_members.add(self.me.username)
         if parameters[252] == EventCode.PARTY_JOINED.value:
-            for member in parameters[5]:
-                self.party_members.add(member)
+            self.party_members = set(parameters[5])
         elif parameters[252] == EventCode.PARTY_DISBANDED.value:
             self.party_members = set()
         elif parameters[252] == EventCode.PARTY_PLAYER_JOINED.value:
             self.party_members.add(parameters[2])
         elif parameters[252] == EventCode.PARTY_PLAYER_LEFT.value:
-            if parameters[0] in self.char_id_to_username:
-                name = self.char_id_to_username[parameters[0]]
-                self.party_members.remove(name)
+            uuid = UUID(bytes=bytes(parameters[1]))
+            if uuid in self.char_uuid_to_username:
+                name = self.char_uuid_to_username[uuid]
+                if name == self.me.username:
+                    self.party_members = set()
+        if self.me.id != None:
+            self.party_members.add(self.me.username)
         event = {
             "type": "update_dps",
             "payload": {"party_members": self.serialize_party_members()},
@@ -193,14 +201,17 @@ class WorldData:
     def change_character_equipment(self, parameters):
         if 2 in parameters:
             if parameters[0] in self.char_id_to_username:
-                char = self.characters[self.char_id_to_username[parameters[0]]]
-                if char.username in self.party_members:
-                    char.update_equipment(parameters[2])
-                    event = {
-                        "type": "update_dps",
-                        "payload": {"party_members": self.serialize_party_members()},
-                    }
-                    send_event(event)
+                if self.char_id_to_username[parameters[0]] != "not initialized":
+                    char = self.characters[self.char_id_to_username[parameters[0]]]
+                    if char.username in self.party_members:
+                        char.update_equipment(parameters[2])
+                        event = {
+                            "type": "update_dps",
+                            "payload": {
+                                "party_members": self.serialize_party_members()
+                            },
+                        }
+                        send_event(event)
             else:
                 self.change_equipment_log[parameters[0]] = parameters[2]
 
@@ -209,15 +220,15 @@ class WorldData:
 
         self.convert_id_to_name(old_id=self.me.id, new_id=parameters[0], char=self.me)
 
+        self.me.uuid = Utils.convert_int_arr_to_uuid(parameters[1])
         self.me.username = parameters[2]
         self.me.guild = parameters[57] if 57 in parameters else ""
         self.me.alliance = parameters[77] if 77 in parameters else ""
         self.characters[self.me.username] = self.me
+        self.char_uuid_to_username[self.me.uuid] = self.me.username
         if self.me.id in self.change_equipment_log:
             self.me.update_equipment(self.change_equipment_log[self.me.id])
 
-        self.party_members.add(self.me.username)
-
         # set map my character is currently in
         if parameters[8][0] == "@":
             area = parameters[8].split("@")
@@ -258,6 +269,7 @@ class WorldData:
     def create_character(
         self,
         id: int,
+        uuid: list[int],
         username: str,
         guild: str,
         alliance: str,
@@ -269,6 +281,7 @@ class WorldData:
         if username not in self.characters:
             char: Character = Character(
                 id=id,
+                uuid=Utils.convert_int_arr_to_uuid(uuid),
                 username=username,
                 guild=guild,
                 alliance=alliance,
@@ -277,6 +290,7 @@ class WorldData:
             char.update_equipment(equipments)
             self.characters[char.username] = char
             self.char_id_to_username[char.id] = char.username
+            self.char_uuid_to_username[char.uuid] = char.username
 
         # change map
         else: