albibong 1.1.0__py3-none-any.whl → 1.1.2__py3-none-any.whl

albibong/__init__.py

@@ -10,13 +10,13 @@ from pathlib import Path
 from time import sleep
 
 import webview
+from peewee_migrate import Router
 from scapy.all import rdpcap
 
-from albibong.classes.dungeon import Dungeon
-from albibong.classes.location import Island
 from albibong.classes.logger import Logger
 from albibong.classes.packet_handler import PacketHandler
-from albibong.models.models import db
+from albibong.classes.utils import Utils
+from albibong.models.models import SQLITE_DB, db
 from albibong.threads.http_server import HttpServerThread
 from albibong.threads.packet_handler_thread import PacketHandlerThread
 from albibong.threads.sniffer_thread import SnifferThread
@@ -26,8 +26,10 @@ logger = Logger(__name__, stdout=True, log_to_file=False)
 PORT = random.randrange(8500, 8999)
 
 home_dir = os.path.expanduser("~")
-DUNGEON_DB = f"{home_dir}/Albibong/list_dungeon.json"
-SQLITE_DB = f"{home_dir}/Albibong/Albibong.db"
+DUNGEON_JSON = f"{home_dir}/Albibong/list_dungeon.json"
+
+current_path = os.path.dirname(__file__)
+MIGRATION_FOLDER = os.path.join(current_path, f"migrations")
 
 
 def read_pcap(path):
@@ -37,35 +39,22 @@ def read_pcap(path):
         packet_handler.handle(packet)
 
 
-def sniff(useWebview):
-    _sentinel = object()
-    packet_queue = queue.Queue()
+def get_dungeon_end_time(str, start_time):
+    timer = str.split(":")
+    seconds = int(timer[0]) * 3600 + int(timer[1]) * 60 + int(timer[2])
+    return timedelta(seconds=seconds) + start_time
 
-    p = SnifferThread(name="sniffer", out_queue=packet_queue, sentinel=_sentinel)
-
-    c = PacketHandlerThread(
-        name="packet_handler",
-        in_queue=packet_queue,
-        sentinel=_sentinel,
-    )
 
-    p.start()
-    c.start()
+def check_db_validity():
+    migrate = Router(db, migrate_dir=MIGRATION_FOLDER)
 
-    ws_server = get_ws_server()
-    ws_server.start()
+    if Path(SQLITE_DB).is_file() == False:
+        if Path(DUNGEON_JSON).is_file() == True:
 
-    def get_end_time(str, start_time):
-        timer = str.split(":")
-        seconds = int(timer[0]) * 3600 + int(timer[1]) * 60 + int(timer[2])
-        return timedelta(seconds=seconds) + start_time
+            migrate.run("001_init")
 
-    if Path(SQLITE_DB).is_file() == False:
-        db.connect()
-        db.create_tables([Dungeon, Island])
-        if Path(DUNGEON_DB).is_file() == True:
             # convert json db to sqlite db
-            json_data = json.load(open(DUNGEON_DB))
+            json_data = json.load(open(DUNGEON_JSON))
 
             for dungeon in json_data:
                 start_time = datetime.strptime(
@@ -87,21 +76,55 @@ def sniff(useWebview):
                     converted_type = "STATIC DUNGEON"
                 elif "RANDOMDUNGEON" in type_splitted:
                     converted_type = "SPAWN DUNGEON"
-                Dungeon.create(
-                    type=converted_type,
-                    name=dungeon["name"],
-                    tier=dungeon["tier"],
-                    fame=dungeon["fame"],
-                    silver=dungeon["silver"],
-                    re_spec=dungeon["re_spec"],
-                    start_time=start_time,
-                    end_time=get_end_time(dungeon["time_elapsed"], start_time),
-                )
 
-    db.connect(reuse_if_open=True)
+                asd = [
+                    ("id", str(uuid.uuid4())),
+                    ("type", f"{converted_type}"),
+                    ("name", f'{dungeon["name"]}'),
+                    ("tier", f'{dungeon["tier"]}'),
+                    ("fame", f'{dungeon["fame"]}'),
+                    ("silver", f'{dungeon["silver"]}'),
+                    ("re_spec", f'{dungeon["re_spec"]}'),
+                    ("start_time", f"{start_time}"),
+                    (
+                        "end_time",
+                        f'{get_dungeon_end_time(dungeon["time_elapsed"], start_time)}',
+                    ),
+                    ("meter", ""),
+                ]
+
+                columns = ", ".join([x[0] for x in asd])
+                values = ", ".join([f'"{x[1]}"' for x in asd])
+                sql_query = f"INSERT INTO dungeon ({columns}) VALUES ({values})"
+
+                db.execute_sql(sql_query)
+
+    migrate.run()
 
-    if useWebview:
 
+def sniff(useWebview, is_debug=False):
+
+    check_db_validity()
+
+    _sentinel = object()
+    packet_queue = queue.Queue()
+
+    p = SnifferThread(
+        name="sniffer", out_queue=packet_queue, sentinel=_sentinel, is_debug=is_debug
+    )
+    c = PacketHandlerThread(
+        name="packet_handler",
+        in_queue=packet_queue,
+        sentinel=_sentinel,
+    )
+
+    p.start()
+    c.start()
+
+    ws_server = get_ws_server()
+    ws_server.start()
+
+    if useWebview:
         sock = socket.socket()
         sock.bind(("", 0))
         port = sock.getsockname()[1]
@@ -139,9 +162,12 @@ def sniff(useWebview):
 
 def main(useWebview=True):
     if len(sys.argv) > 1:
-        ws_server = get_ws_server()
-        ws_server.start()
-
-        read_pcap(sys.argv[1])
+        if sys.argv[-1] == "--debug":
+            Utils.get_user_specifications("pip")
+            sniff(useWebview, is_debug=True)
+        else:
+            ws_server = get_ws_server()
+            ws_server.start()
+            read_pcap(sys.argv[1])
     else:
         sniff(useWebview)

albibong/__main__.py

@@ -1,6 +1,12 @@
+import sys
+
 from albibong import main
 from albibong.classes.logger import use_logger
+from albibong.classes.utils import Utils
 
 if __name__ == "__main__":
     use_logger(True)
+
+    if sys.argv[-1] == "--debug":
+        Utils.get_user_specifications("source code")
     main(useWebview=False)

albibong/classes/character.py

@@ -1,10 +1,9 @@
-from datetime import datetime, timedelta
 import json
+from datetime import datetime, timedelta
 from uuid import UUID
 
 from albibong.classes.coords import Coords
 from albibong.classes.item import Item
-from albibong.threads.websocket_server import send_event
 
 DIVISOR = 10000
 
@@ -35,6 +34,8 @@ class Character:
         self.re_spec_gained: int = 0
         self.silver_gained: int = 0
         self.loot: list[str] = []
+        self.might_gained: int = 0
+        self.favor_gained: int = 0
 
         # Combat
         self.damage_dealt: int = 0
@@ -69,37 +70,16 @@ class Character:
     def update_fame(self, parameters):
         fame = parameters[2] / DIVISOR
         self.fame_gained += fame
-        event = {
-            "type": "update_fame",
-            "payload": {"username": self.username, "fame_gained": self.fame_gained},
-        }
-        send_event(event)
 
     def update_re_spec(self, parameters):
         re_spec = parameters[2] / DIVISOR
         self.re_spec_gained += re_spec
-        event = {
-            "type": "update_re_spec",
-            "payload": {
-                "username": self.username,
-                "re_spec_gained": self.re_spec_gained,
-            },
-        }
-        send_event(event)
 
     def update_loot(self, parameters):
         if 3 in parameters and parameters[3] == True:
             if 5 in parameters:
                 silver = parameters[5] / DIVISOR
                 self.silver_gained += silver
-                event = {
-                    "type": "update_silver",
-                    "payload": {
-                        "username": self.username,
-                        "silver_gained": self.silver_gained,
-                    },
-                }
-                send_event(event)
         else:
             self.loot.append(parameters[4])
 
@@ -110,3 +90,7 @@ class Character:
                 obj = Item.get_item_from_code(str(eq))
                 new_eq.append(obj)
         self.equipment = new_eq
+
+    def update_might_and_favor(self, parameters):
+        self.favor_gained += parameters[4] / DIVISOR
+        self.might_gained += parameters[1] / DIVISOR

albibong/classes/dungeon.py

@@ -14,29 +14,39 @@ class Dungeon(BaseModel):
     id = UUIDField(unique=True, default=uuid.uuid4)
     type = CharField()
     name = CharField()
-    tier = IntegerField(default=0)
+    tier = FloatField(default=0)
     fame = FloatField(default=0)
     silver = FloatField(default=0)
     re_spec = FloatField(default=0)
+    might = FloatField(default=0)
+    favor = FloatField(default=0)
     start_time = DateTimeField(default=datetime.now)
     end_time = DateTimeField(null=True, default=None)
     meter = JSONField(default=dict)
 
     @staticmethod
     def serialize(dungeon):
+        time_elapsed = dungeon.end_time - dungeon.start_time
+        total_hours = time_elapsed.total_seconds() / 3600
+
         return {
             "id": str(dungeon.id),
             "type": dungeon.type,
             "name": dungeon.name,
             "tier": dungeon.tier,
             "fame": dungeon.fame,
+            "fame_per_hour": dungeon.fame / total_hours,
             "silver": dungeon.silver,
+            "silver_per_hour": dungeon.silver / total_hours,
             "re_spec": dungeon.re_spec,
+            "re_spec_per_hour": dungeon.re_spec / total_hours,
+            "might": dungeon.might,
+            "might_per_hour": dungeon.might / total_hours,
+            "favor": dungeon.favor,
+            "favor_per_hour": dungeon.favor / total_hours,
             "date_time": dungeon.start_time.strftime("%a %d %b %Y, %I:%M%p"),
             "time_elapsed": (
-                str(dungeon.end_time - dungeon.start_time).split(".")[0]
-                if dungeon.end_time
-                else ""
+                str(time_elapsed).split(".")[0] if dungeon.end_time else ""
             ),
             "meter": dungeon.meter,
         }
@@ -52,6 +62,10 @@ class Dungeon(BaseModel):
         re_spec = parameters[2] / DIVISOR
         self.re_spec += re_spec
 
+    def update_might_and_favor(self, parameters):
+        self.favor += parameters[4] / DIVISOR
+        self.might += parameters[1] / DIVISOR
+
     def update_loot(self, parameters):
         if 3 in parameters and parameters[3] == True:
             silver = parameters[5] / DIVISOR

albibong/classes/event_handler/__init__.py

@@ -8,6 +8,9 @@ from albibong.classes.event_handler.handle_event_health import (
 from albibong.classes.event_handler.handle_event_in_combat_state_update import (
     handle_event_in_combat_state_update,
 )
+from albibong.classes.event_handler.handle_event_might_and_favor_received_event import (
+    handle_event_might_and_favor_received_event,
+)
 from albibong.classes.event_handler.handle_event_new_character import (
     handle_event_new_character,
 )
@@ -29,17 +32,16 @@ from albibong.classes.event_handler.handle_event_update_re_spec_points import (
 from albibong.classes.event_handler.handle_operation_change_cluster import (
     handle_operation_change_cluster,
 )
-from albibong.classes.event_handler.handle_operation_join import handle_operation_join
 from albibong.classes.event_handler.handle_operation_farmable_harvest import (
+    handle_operation_farmable_get_product,
     handle_operation_farmable_harvest,
-    handle_operation_farmable_finish_grown_item,
 )
+from albibong.classes.event_handler.handle_operation_join import handle_operation_join
 from albibong.classes.event_handler.handle_operation_move import handle_operation_move
 from albibong.classes.world_data import WorldData
 from albibong.resources.EventCode import EventCode
 from albibong.resources.OperationCode import OperationCode
 
-
 EVENT_TYPE_PARAMETER = 252
 REQUEST_TYPE_PARAMETER = 253
 RESPONSE_TYPE_PARAMETER = 253
@@ -63,6 +65,10 @@ class EventHandler:
         self.event_handler[EventCode.UPDATE_RE_SPEC_POINTS.value] = (
             handle_event_update_re_spec_points
         )
+        self.event_handler[EventCode.MIGHT_AND_FAVOR_RECEIVED_EVENT.value] = (
+            handle_event_might_and_favor_received_event
+        )
+
         self.event_handler[EventCode.OTHER_GRABBED_LOOT.value] = (
             handle_event_other_grabbed_loot
         )
@@ -88,8 +94,8 @@ class EventHandler:
         self.response_handler[OperationCode.CHANGE_CLUSTER.value] = (
             handle_operation_change_cluster
         )
-        self.response_handler[OperationCode.FARMABLE_FINISH_GROWN_ITEM.value] = (
-            handle_operation_farmable_finish_grown_item
+        self.response_handler[OperationCode.FARMABLE_GET_PRODUCT.value] = (
+            handle_operation_farmable_get_product
         )
         self.response_handler[OperationCode.FARMABLE_HARVEST.value] = (
             handle_operation_farmable_harvest

albibong/classes/event_handler/handle_event_might_and_favor_received_event.py

@@ -0,0 +1,18 @@
+from albibong.classes.world_data import WorldData
+from albibong.threads.websocket_server import send_event
+
+
+def handle_event_might_and_favor_received_event(world_data: WorldData, parameters):
+    world_data.me.update_might_and_favor(parameters)
+    event = {
+        "type": "update_might_and_favor",
+        "payload": {
+            "username": world_data.me.username,
+            "favor_gained": world_data.me.favor_gained,
+            "might_gained": world_data.me.might_gained,
+        },
+    }
+    send_event(event)
+
+    if world_data.current_dungeon:
+        world_data.current_dungeon.update_might_and_favor(parameters)

albibong/classes/event_handler/handle_event_new_character.py

@@ -6,18 +6,17 @@ from albibong.classes.world_data import WorldData
 
 
 def handle_event_new_character(world_data: WorldData, parameters):
-
     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 ""
+    alliance = parameters[51] if 51 in parameters else ""
     coords = (
         Coords(parameters[15][0], parameters[15][1])
         if 15 in parameters
         else Coords(0, 0)
     )
-    equipments = parameters[38] if 38 in parameters else []
+    equipments = parameters[40] if 40 in parameters else []
 
     # initiate character
     if username not in world_data.characters:

albibong/classes/event_handler/handle_event_other_grabbed_loot.py

@@ -1,5 +1,6 @@
 from albibong.classes.character import Character
 from albibong.classes.world_data import WorldData
+from albibong.threads.websocket_server import send_event
 
 
 def handle_event_other_grabbed_loot(world_data: WorldData, parameters):
@@ -8,6 +9,14 @@ def handle_event_other_grabbed_loot(world_data: WorldData, parameters):
     if 2 in parameters and parameters[2] in world_data.characters:
         char: Character = world_data.characters[parameters[2]]
         char.update_loot(parameters)
+        event = {
+            "type": "update_silver",
+            "payload": {
+                "username": char.username,
+                "silver_gained": char.silver_gained,
+            },
+        }
+        send_event(event)
 
     # update dungeon data
     if world_data.current_dungeon and parameters[2] == world_data.me.username:

albibong/classes/event_handler/handle_event_update_fame.py

@@ -1,7 +1,16 @@
 from albibong.classes.world_data import WorldData
+from albibong.threads.websocket_server import send_event
 
 
 def handle_event_update_fame(world_data: WorldData, parameters):
     world_data.me.update_fame(parameters)
+    event = {
+        "type": "update_fame",
+        "payload": {
+            "username": world_data.me.username,
+            "fame_gained": world_data.me.fame_gained,
+        },
+    }
+    send_event(event)
     if world_data.current_dungeon:
         world_data.current_dungeon.update_fame(parameters)

albibong/classes/event_handler/handle_event_update_re_spec_points.py

@@ -1,10 +1,19 @@
 from albibong.classes.world_data import WorldData
+from albibong.threads.websocket_server import send_event
 
 
 def handle_event_update_re_spec_points(world_data: WorldData, parameters):
 
     # update char data
     world_data.me.update_re_spec(parameters)
+    event = {
+        "type": "update_re_spec",
+        "payload": {
+            "username": world_data.me.username,
+            "re_spec_gained": world_data.me.re_spec_gained,
+        },
+    }
+    send_event(event)
 
     # update dungeon data
     if world_data.current_dungeon:

albibong/classes/event_handler/handle_operation_farmable_harvest.py

@@ -9,7 +9,7 @@ def handle_operation_farmable_harvest(world_data: WorldData, parameters):
             )
 
 
-def handle_operation_farmable_finish_grown_item(world_data: WorldData, parameters):
+def handle_operation_farmable_get_product(world_data: WorldData, parameters):
     if type(world_data.current_map).__name__ == "Island":
         for i in range(len(parameters[0])):
             world_data.current_map.add_animal(

albibong/classes/event_handler/handle_operation_join.py

@@ -1,4 +1,3 @@
-from albibong.classes.dungeon import Dungeon
 from albibong.classes.event_handler.world_data_utils import WorldDataUtils
 from albibong.classes.location import Location
 from albibong.classes.utils import Utils
@@ -7,20 +6,20 @@ from albibong.threads.websocket_server import send_event
 
 
 def handle_operation_join(world_data: WorldData, parameters):
-    # update relative id if character has initialized before
-    if world_data.me.username != "not initialized":
-        WorldDataUtils.convert_id_to_name(
-            world_data,
-            old_id=world_data.me.id,
-            new_id=parameters[0],
-            char=world_data.me,
-        )
-
     # set my character
-    world_data.me.uuid = Utils.convert_int_arr_to_uuid(parameters[1])
     world_data.me.username = parameters[2]
+    world_data.me.uuid = Utils.convert_int_arr_to_uuid(parameters[1])
     world_data.me.guild = parameters[57] if 57 in parameters else ""
     world_data.me.alliance = parameters[77] if 77 in parameters else ""
+
+    # update relative id if character has initialized before
+    WorldDataUtils.convert_id_to_name(
+        world_data,
+        old_id=world_data.me.id,
+        new_id=parameters[0],
+        char=world_data.me,
+    )
+
     if world_data.me.id in world_data.change_equipment_log:
         world_data.me.update_equipment(
             world_data.change_equipment_log[world_data.me.id]
@@ -55,6 +54,8 @@ def ws_init_character(world_data: WorldData):
             "fame": world_data.me.fame_gained,
             "re_spec": world_data.me.re_spec_gained,
             "silver": world_data.me.silver_gained,
+            "might": world_data.me.might_gained,
+            "favor": world_data.me.favor_gained,
             "weapon": world_data.me.equipment[0].image,
         },
     }

albibong/classes/event_handler/world_data_utils.py

@@ -1,20 +1,9 @@
-import json
-import os
-from collections import deque
-from datetime import datetime
-
 from albibong.classes.character import Character
 from albibong.classes.dungeon import Dungeon
 from albibong.classes.location import Island, Location
-from albibong.classes.utils import Utils
 from albibong.classes.world_data import WorldData
 from albibong.threads.websocket_server import send_event
 
-LIST_DUNGEON = os.path.join(os.path.expanduser("~"), "Albibong/list_dungeon.json")
-os.makedirs(os.path.dirname(LIST_DUNGEON), exist_ok=True)
-LIST_ISLAND = os.path.join(os.path.expanduser("~"), "Albibong/list_island.json")
-os.makedirs(os.path.dirname(LIST_ISLAND), exist_ok=True)
-
 
 class WorldDataUtils:
 

albibong/classes/utils.py

@@ -1,5 +1,13 @@
+import os
+import platform
+from importlib.metadata import version
 from uuid import UUID
 
+from scapy.all import conf, get_if_addr
+
+FILENAME = os.path.join(os.path.expanduser("~"), "Albibong/Debug/user_spec.txt")
+os.makedirs(os.path.dirname(FILENAME), exist_ok=True)
+
 
 class Utils:
 
@@ -7,3 +15,15 @@ class Utils:
     def convert_int_arr_to_uuid(arr):
         b = bytes(arr)
         return UUID(bytes=b)
+
+    @staticmethod
+    def get_user_specifications(install_source: str):
+        os_ver = f"{platform.system()} {platform.release()}"
+        python_ver = platform.python_version()
+        albibong_ver = version("albibong")
+        interfaces = f"{conf.iface} ({get_if_addr(conf.iface)})"
+
+        text = f"\n===\n\nAlbibong Ver        : {albibong_ver}\nPython Ver          : {python_ver}\nOS Ver              : {os_ver}\nInstallation Source : {install_source}\nInterfaces          : {interfaces}\n\n===\n"
+        print(text)
+        with open(FILENAME, "w+") as file:
+            file.write(text)

albibong/gui_dist/assets/index-B31tZ4Ku.css

@@ -0,0 +1 @@
+*{box-sizing:border-box}:root{font-family:Inter,system-ui,Avenir,Helvetica,Arial,sans-serif;line-height:1.5;font-weight:400;color-scheme:light dark;color:#ffffffde;font-synthesis:none;text-rendering:optimizeLegibility;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}p{margin:0}a{font-weight:500;color:#646cff;text-decoration:inherit}a:hover{color:#535bf2}#root,body{margin:auto;display:flex;flex-direction:column;justify-content:start;align-items:center;min-width:320px;min-height:100vh;color:#fff;width:100%}h1{font-size:2em;line-height:1}button{border-radius:8px;border:1px solid transparent;padding:.6em 1.2em;font-size:1em;font-weight:500;font-family:inherit;background-color:#1a1a1a;cursor:pointer;transition:border-color .25s}button:hover{border-color:#646cff}button:focus,button:focus-visible{outline:4px auto -webkit-focus-ring-color}@media (prefers-color-scheme: light){:root{color:#213547;background-color:#fff}a:hover{color:#747bff}button{background-color:#f9f9f9}}input::-webkit-outer-spin-button,input::-webkit-inner-spin-button{-webkit-appearance:none;margin:0}._passed_ifjrf_1{background-color:green}._failed_ifjrf_4{background-color:red}._healthCheckDiv_ifjrf_7{width:1rem;height:1rem;border-radius:1rem}._toolbar_ifjrf_14{display:flex;justify-content:space-between}._data_ifjrf_19{display:flex;gap:1rem;align-items:center}._dmgBar_uvx94_1{background:linear-gradient(135deg,#ff6486,#6486ff);height:6px;border-radius:8px;margin-bottom:2px}._healBar_uvx94_8{background:linear-gradient(135deg,#64ffde,#64ff90);height:2px;border-radius:4px}._dpsContainer_uvx94_14{display:flex;flex-direction:column;justify-content:flex-start;width:100%;gap:4px;box-sizing:content-box;padding:16px}._dpsRow_uvx94_24{display:flex;flex-direction:row;justify-content:space-between;align-items:center}._dpsNumber_uvx94_31{width:128px;text-align:right}._dpsButton_uvx94_36{display:flex;flex-grow:1;gap:1rem}._hidden_uvx94_42{display:none}._player_uvx94_46{flex-grow:1}._checkboxColor_uvx94_50{accent-color:#64d3ff}._dungeonContainer_1kru6_1{border-radius:1rem;width:100%;padding:2rem;display:flex;flex-direction:column;gap:1rem}._tag_1kru6_12{background-color:#64d3ff;padding:0 1rem;border-radius:1rem;color:#0f3c4e;font-weight:700}._stats_1kru6_20{display:flex;flex-direction:row;align-items:start;gap:.5rem}._statRow_1kru6_27{display:flex;flex-direction:row;align-items:start;gap:3rem}._stickToTop_1kru6_34{z-index:10;position:sticky;top:64px;left:0;width:100%;padding:24px 0}@media screen and (max-width: 1000px){._statRow_1kru6_27{width:100%;justify-content:space-between;gap:0}}._container_1ha35_1{display:flex;flex-direction:column;align-items:center;gap:8px;width:100%;gap:1.5rem}._snackbar_1ha35_10{position:fixed;right:64px}._stats_1ha35_15{display:flex;flex-direction:row;align-items:center;gap:.5rem}._options_1ha35_22{display:flex;flex-direction:row;align-items:center;gap:2rem}._row_1ha35_29{display:flex;width:100%;justify-content:space-between;align-items:center}._hidden_1ha35_36{display:none}._column_owxpy_1{width:50%;display:flex;flex-direction:column;gap:16px}._row_owxpy_8{display:flex;gap:40px}._harvest_owxpy_13{display:flex;gap:8px;align-items:center}._statsContainer_owxpy_19{width:100%;display:flex;flex-direction:column;gap:0}