albibong 1.0.2__tar.gz → 1.0.4__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: albibong
-Version: 1.0.2
+Version: 1.0.4
 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
@@ -10,6 +10,7 @@ Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.8
+Requires-Dist: playsound==1.3.0
 Requires-Dist: pywebview==5.1
 Requires-Dist: scapy==2.5.0
 Requires-Dist: websockets==12.0

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

@@ -19,7 +19,7 @@ albibong = "albibong:main"
 
 [project]
 name = "albibong"
-version = "1.0.2"
+version = "1.0.4"
 authors = [
   { name="imjangkar", email="imjangkar@gmail.com" },
 ]
@@ -33,7 +33,8 @@ classifiers = [
 dependencies = [
   "scapy==2.5.0",
   "websockets==12.0",
-  "pywebview==5.1"
+  "pywebview==5.1",
+  "playsound==1.3.0"
 ]
 
 [project.urls]

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

@@ -1,5 +1,6 @@
 import queue
 import random
+import socket
 import sys
 from time import sleep
 
@@ -14,7 +15,8 @@ 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)
+PORT = random.randrange(8500, 8999)
+
 
 def read_pcap(path):
     packet_handler = PacketHandler()
@@ -42,14 +44,18 @@ def sniff(useWebview):
     ws_server.start()
 
     if useWebview:
-        print("addr",PORT)
 
-        http_server = HttpServerThread(name="http_server", port=PORT)
+        sock = socket.socket()
+        sock.bind(("", 0))
+        port = sock.getsockname()[1]
+        sock.close()
+
+        http_server = HttpServerThread(name="http_server", port=port)
         http_server.start()
 
         window = webview.create_window(
             "Albibong",
-            url=f"http://localhost:{PORT}/",
+            url=f"http://localhost:{port}/",
             width=1280,
             height=720,
             zoomable=True,

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

@@ -34,13 +34,11 @@ class Character:
         self.loot: list[str] = []
         self.equipment = equipment
 
-    def handle_health_update(self, parameters):
-        if 2 in parameters:
-            if parameters[2] < 0:
-                if parameters[0] != self.id:
-                    self.damage_dealt += abs(parameters[2])
-            else:
-                self.healing_dealt += abs(parameters[2])
+    def update_damage_dealt(self, nominal):
+        self.damage_dealt += nominal
+
+    def update_heal_dealt(self, nominal):
+        self.healing_dealt += nominal
 
     def update_coords(self, parameters):
         if 3 in parameters:

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

@@ -40,7 +40,7 @@ class Logger(logging.Logger):
         log_formatter = logging.Formatter("%(message)s")
 
         if log_to_file:
-            file_handler = logging.FileHandler(log_filepath)
+            file_handler = logging.FileHandler(log_filepath, encoding="utf-8")
             file_handler.setFormatter(log_formatter)
             file_handler.setLevel(logging.INFO)
             self.addHandler(file_handler)

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

@@ -1,7 +1,9 @@
 import json
 import os
 from collections import deque
+import threading
 from uuid import UUID
+from playsound import playsound
 
 from albibong.classes.character import Character
 from albibong.classes.coords import Coords
@@ -43,8 +45,6 @@ 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:
@@ -68,7 +68,12 @@ class WorldData:
                 parameters[252] == EventCode.HEALTH_UPDATE.value
                 and self.is_dps_meter_running
             ):
-                self.update_dps_meter(parameters)
+                self.handle_health_update(parameters)
+            elif (
+                parameters[252] == EventCode.HEALTH_UPDATES.value
+                and self.is_dps_meter_running
+            ):
+                self.handle_health_updates(parameters)
             elif (
                 parameters[252] == EventCode.PARTY_JOINED.value
                 or parameters[252] == EventCode.PARTY_PLAYER_JOINED.value
@@ -169,7 +174,7 @@ class WorldData:
         if parameters[252] == EventCode.PARTY_JOINED.value:
             self.party_members = set(parameters[5])
         elif parameters[252] == EventCode.PARTY_DISBANDED.value:
-            self.party_members = set()
+            self.party_members = {self.me.username}
         elif parameters[252] == EventCode.PARTY_PLAYER_JOINED.value:
             self.party_members.add(parameters[2])
         elif parameters[252] == EventCode.PARTY_PLAYER_LEFT.value:
@@ -177,26 +182,57 @@ class WorldData:
             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)
+                    self.party_members = {self.me.username}
         event = {
             "type": "update_dps",
             "payload": {"party_members": self.serialize_party_members()},
         }
         send_event(event)
 
-    def update_dps_meter(self, parameters):
-        if 6 in parameters and parameters[6] in self.char_id_to_username:
-            username = self.char_id_to_username[parameters[6]]
-            if username in self.party_members:
-                char: Character = self.characters[username]
-                char.handle_health_update(parameters)
-                event = {
-                    "type": "update_dps",
-                    "payload": {"party_members": self.serialize_party_members()},
-                }
-                send_event(event)
+    def handle_health_update(self, parameters):
+
+        nominal = parameters[2] if 2 in parameters else 0
+        target = parameters[0]
+        inflictor = parameters[6]
+
+        self.update_damage_or_heal(target, inflictor, nominal)
+
+    def update_damage_or_heal(self, target, inflictor, nominal):
+
+        if inflictor not in self.char_id_to_username:
+            # character not initialized yet
+            return
+
+        username = self.char_id_to_username[inflictor]
+
+        if username == "not initialized":
+            # self not initialized
+            return
+
+        char: Character = self.characters[username]
+
+        if nominal < 0:
+            if target == inflictor:
+                # suicide
+                return
+            char.update_damage_dealt(abs(nominal))
+        else:
+            char.update_heal_dealt(nominal)
+
+        event = {
+            "type": "update_dps",
+            "payload": {"party_members": self.serialize_party_members()},
+        }
+        send_event(event)
+
+    def handle_health_updates(self, parameters):
+
+        for i in range(len(parameters[2])):
+            nominal = parameters[2][i]
+            target = parameters[0]
+            inflictor = parameters[6][i]
+
+            self.update_damage_or_heal(target, inflictor, nominal)
 
     def change_character_equipment(self, parameters):
         if 2 in parameters:
@@ -217,18 +253,21 @@ class WorldData:
 
     def handle_join_response(self, parameters):
         # set my character
-
         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])
 
+        # put self in characters list
+        self.characters[self.me.username] = self.me
+        self.char_uuid_to_username[self.me.uuid] = self.me.username
+
+        # put self in party
+        self.party_members.add(self.me.username)
+
         # set map my character is currently in
         if parameters[8][0] == "@":
             area = parameters[8].split("@")
@@ -257,8 +296,13 @@ class WorldData:
                 ),
             },
         }
+        event_party = {
+            "type": "update_dps",
+            "payload": {"party_members": self.serialize_party_members()},
+        }
         send_event(event_map)
         send_event(event_char)
+        send_event(event_party)
 
     def convert_id_to_name(self, old_id, new_id, char: Character):
         if old_id in self.char_id_to_username:
@@ -304,32 +348,54 @@ class WorldData:
 
         total_damage = 0
         total_heal = 0
+
+        # get total damage and heal for percentage
         for key, value in self.characters.items():
             if key in self.party_members:
                 total_damage += value.damage_dealt
                 total_heal += value.healing_dealt
 
-        for key, value in self.characters.items():
-            if key in self.party_members:
-                if value.equipment != []:
-                    weapon = Item.serialize(value.equipment[0])["image"]
-                    data = {
-                        "username": value.username,
-                        "damage_dealt": value.damage_dealt,
-                        "damage_percent": (
-                            round(value.damage_dealt / total_damage * 100, 2)
-                            if total_damage > 0
-                            else 0
-                        ),
-                        "healing_dealt": value.healing_dealt,
-                        "heal_percent": (
-                            round(value.healing_dealt / total_heal * 100, 2)
-                            if total_heal > 0
-                            else 0
-                        ),
-                        "weapon": weapon,
-                    }
-                    serialized.append(data)
+        for member in self.party_members:
+            # member character initialized
+            if member in self.characters:
+                char = self.characters[member]
+                username = char.username
+                damage_dealt = char.damage_dealt
+                damage_percent = (
+                    round(char.damage_dealt / total_damage * 100, 2)
+                    if total_damage > 0
+                    else 0
+                )
+                healing_dealt = char.healing_dealt
+                heal_percent = (
+                    round(char.healing_dealt / total_heal * 100, 2)
+                    if total_heal > 0
+                    else 0
+                )
+                weapon = (
+                    Item.serialize(char.equipment[0])["image"]
+                    if char.equipment != []
+                    else "../public/No Equipment.png"
+                )
+
+            # member character not initialized
+            else:
+                username = member
+                damage_dealt = 0
+                damage_percent = 0
+                healing_dealt = 0
+                heal_percent = 0
+                weapon = "../public/No Equipment.png"
+
+            data = {
+                "username": username,
+                "damage_dealt": damage_dealt,
+                "damage_percent": damage_percent,
+                "healing_dealt": healing_dealt,
+                "heal_percent": heal_percent,
+                "weapon": weapon,
+            }
+            serialized.append(data)
         serialized.sort(key=lambda x: x["damage_dealt"], reverse=True)
         return serialized
 

{albibong-1.0.2 → albibong-1.0.4}/src/albibong/gui_dist/index.html

@@ -1,10 +1,10 @@
-<!doctype html>
+<!DOCTYPE html>
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
+    <link rel="icon" type="image/png" href="/Albibong.png" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Vite + React + TS</title>
+    <title>Albibong - Albion Data Tracker</title>
     <script type="module" crossorigin src="/assets/index-DAndaN_4.js"></script>
     <link rel="stylesheet" crossorigin href="/assets/index-BFSx0nua.css">
   </head>

albibong-1.0.4/src/albibong/requirements.txt

@@ -0,0 +1,4 @@
+scapy==2.5.0
+websockets==12.0
+pywebview==5.1
+playsound==1.3.0