PyPI - sticker-convert - Versions diffs - 2.9.0__py3-none-any.whl → 2.9.2__py3-none-any.whl - Mend

sticker-convert 2.9.0py3-none-any.whl → 2.9.2py3-none-any.whl

Files changed (14) hide show

sticker_convert/downloaders/download_base.py CHANGED Viewed

@@ -92,10 +92,10 @@ class DownloadBase:
                 response = requests.get(
                     url, stream=True, allow_redirects=True, **kwargs
                 )
-                total_length = int(response.headers.get("content-length"))  # type: ignore
                 if not response.ok:
                     return b""
+                total_length = int(response.headers.get("content-length"))  # type: ignore
                 self.cb.put(f"Downloading {url}")
                 if show_progress:

sticker_convert/downloaders/download_kakao.py CHANGED Viewed

@@ -3,16 +3,20 @@ from __future__ import annotations
 import itertools
 import json
-import re
-import zipfile
-from io import BytesIO
+import webbrowser
 from pathlib import Path
+from tempfile import TemporaryDirectory
 from typing import Any, List, Optional, Tuple, cast
 from urllib.parse import urlparse
+import chromedriver_autoinstaller  # type: ignore
 import requests
 from bs4 import BeautifulSoup
-from bs4.element import Tag
+from selenium import webdriver
+from selenium.webdriver.chrome.options import Options
+from selenium.webdriver.common.by import By
+from selenium.webdriver.support import expected_conditions as EC
+from selenium.webdriver.support.wait import WebDriverWait
 from sticker_convert.downloaders.download_base import DownloadBase
 from sticker_convert.job_option import CredOption
@@ -20,94 +24,38 @@ from sticker_convert.utils.callback import CallbackProtocol, CallbackReturn
 from sticker_convert.utils.files.metadata_handler import MetadataHandler
 from sticker_convert.utils.media.decrypt_kakao import DecryptKakao
-def search_bracket(text: str, open_bracket: str = "{", close_bracket: str = "}") -> int:
-    depth = 0
-    is_str = False
-    for count, char in enumerate(text):
-        if char == '"':
-            is_str = not is_str
-        if is_str is False:
-            if char == open_bracket:
-                depth += 1
-            elif char == close_bracket:
-                depth -= 1
-        if depth == 0:
-            return count
-    return -1
+JSINJECT = """
+class osclass {
+    android = true;
+}
+class uaclass {
+    os = new osclass();
+}
+class util {
+    static userAgent() {
+        return new uaclass();
+    }
+}
+class daumtools {
+    static web2app(dataDict) {
+        return dataDict['urlScheme'];
+    }
+}
+"""
+HTMLPAGE = """
+<html>
+<body>
+<p id="p1"></p>
+<script>
+{}
+</script>
+</body>
+</html>
+"""
 class MetadataKakao:
-    @staticmethod
-    def get_info_from_share_link(url: str) -> Tuple[Optional[str], Optional[str]]:
-        headers = {"User-Agent": "Android"}
-        response = requests.get(url, headers=headers)
-        soup = BeautifulSoup(response.content.decode("utf-8", "ignore"), "html.parser")
-        pack_title_tag = soup.find("title")  # type: ignore
-        if not pack_title_tag:
-            return None, None
-        pack_title: str = pack_title_tag.string  # type: ignore
-        app_scheme_link_tag = soup.find("a", id="app_scheme_link")  # type: ignore
-        assert isinstance(app_scheme_link_tag, Tag)
-        item_code_fake = cast(str, app_scheme_link_tag["data-i"])
-        js = ""
-        for script_tag in soup.find_all("script"):
-            js = script_tag.string
-            if js and "emoticonDeepLink" in js:
-                break
-        if "emoticonDeepLink" not in js:
-            return None, None
-        func_start_pos = js.find("function emoticonDeepLink(")
-        js = js[func_start_pos:]
-        bracket_start_pos = js.find("{")
-        func_end_pos = search_bracket(js[bracket_start_pos:]) + bracket_start_pos
-        js = js[bracket_start_pos + 1 : func_end_pos]
-        js = js.split(";")[0]
-        minus_num_regex = re.search(r"\-(.*?)\^", js)
-        if not minus_num_regex:
-            return None, None
-        minus_num_str = minus_num_regex.group(1)
-        if not minus_num_str.isnumeric():
-            return None, None
-        minus_num = int(minus_num_str)
-        xor_num_regex = re.search(r"\^(.*?)\)", js)
-        if not xor_num_regex:
-            return None, None
-        xor_num_str = xor_num_regex.group(1)
-        if not xor_num_str.isnumeric():
-            return None, None
-        xor_num = int(xor_num_str)
-        item_code = str(int(item_code_fake) - minus_num ^ xor_num)
-        # https://github.com/Nuitka/Nuitka/issues/385
-        # js2py not working if compiled by nuitka
-        # web2app_start_pos = js.find("daumtools.web2app(")
-        # js = js[:web2app_start_pos] + "return a;}"
-        # get_item_code = js2py.eval_js(js)  # type: ignore
-        # kakao_scheme_link = cast(
-        #     str,
-        #     get_item_code(
-        #         "kakaotalk://store/emoticon/${i}?referer=share_link", item_code_fake
-        #     ),
-        # )
-        # item_code = urlparse(kakao_scheme_link).path.split("/")[-1]
-        return pack_title, item_code
     @staticmethod
     def get_item_code(title_ko: str, auth_token: str) -> Optional[str]:
         headers = {
@@ -177,15 +125,67 @@ class DownloadKakao(DownloadBase):
         self.pack_info_unauthed: Optional[dict[str, Any]] = None
         self.pack_info_authed: Optional[dict[str, Any]] = None
+    def get_info_from_share_link(self, url: str) -> Tuple[Optional[str], Optional[str]]:
+        headers = {"User-Agent": "Android"}
+        response = requests.get(url, headers=headers)
+        soup = BeautifulSoup(response.content.decode("utf-8", "ignore"), "html.parser")
+        pack_title_tag = soup.find("title")  # type: ignore
+        if not pack_title_tag:
+            return None, None
+        pack_title: str = pack_title_tag.string  # type: ignore
+        js = ""
+        for script_tag in soup.find_all("script"):
+            js = script_tag.string
+            if js and "daumtools.web2app" in js:
+                break
+        if "daumtools.web2app" not in js:
+            return None, None
+        js = js.replace(
+            "daumtools.web2app",
+            'document.getElementById("p1").innerHTML = daumtools.web2app',
+        )
+        js = JSINJECT + js
+        with TemporaryDirectory() as tempdir:
+            html_page_path = Path(tempdir, "page.html")
+            html_page = HTMLPAGE.format(js)
+            with open(html_page_path, "w+") as f:
+                f.write(html_page)
+            try:
+                chromedriver_autoinstaller.install()
+                chrome_options = Options()
+                chrome_options.add_argument("--headless")  # type: ignore
+                driver = webdriver.Chrome(options=chrome_options)
+                driver.get(html_page_path.as_posix())
+                wait = WebDriverWait(driver, 10)
+                wait.until(EC.text_to_be_present_in_element((By.ID, "p1"), "kakaotalk"))  # type: ignore
+                kakao_url_elm = driver.find_element(By.ID, "p1")
+                kakao_url = cast(str, kakao_url_elm.text)  # type: ignore
+                driver.close()
+            except ValueError:
+                webbrowser.open(html_page_path.as_posix())
+                prompt = "Chrome not installed, using manual method.\n"
+                prompt += "Please copy and paste the url you see in the browser"
+                self.cb.put(("ask_str", (prompt,), None))
+                kakao_url = cast(str, self.cb_return.get_response())
+        item_code = urlparse(kakao_url).path.split("/")[2]
+        return pack_title, item_code
     def download_stickers_kakao(self) -> bool:
         self.auth_token = None
         if self.opt_cred:
             self.auth_token = self.opt_cred.kakao_auth_token
         if urlparse(self.url).netloc == "emoticon.kakao.com":
-            self.pack_title, item_code = MetadataKakao.get_info_from_share_link(
-                self.url
-            )
+            self.pack_title, item_code = self.get_info_from_share_link(self.url)
             if item_code:
                 return self.download_animated(item_code)
@@ -268,14 +268,6 @@ class DownloadKakao(DownloadBase):
             self.out_dir, title=self.pack_title, author=self.author
         )
-        success = self.download_animated_zip(item_code)
-        if not success:
-            self.cb.put("Trying to download one by one")
-            success = self.download_animated_files(item_code)
-        return success
-    def download_animated_files(self, item_code: str) -> bool:
         play_exts = [".webp", ".gif", ".png", ""]
         play_types = ["emot", "emoji", ""]  # emot = normal; emoji = mini
         play_path_format = None
@@ -376,46 +368,6 @@ class DownloadKakao(DownloadBase):
         return True
-    def download_animated_zip(self, item_code: str) -> bool:
-        pack_url = f"http://item.kakaocdn.net/dw/{item_code}.file_pack.zip"
-        zip_file = self.download_file(pack_url)
-        if zip_file:
-            self.cb.put(f"Downloaded {pack_url}")
-        else:
-            self.cb.put(f"Cannot download {pack_url}")
-            return False
-        with zipfile.ZipFile(BytesIO(zip_file)) as zf:
-            self.cb.put("Unzipping...")
-            self.cb.put(
-                (
-                    "bar",
-                    None,
-                    {"set_progress_mode": "determinate", "steps": len(zf.namelist())},
-                )
-            )
-            for num, f_path in enumerate(sorted(zf.namelist())):
-                ext = Path(f_path).suffix
-                if ext in (".gif", ".webp"):
-                    data = DecryptKakao.xor_data(zf.read(f_path))
-                    self.cb.put(f"Decrypted {f_path}")
-                else:
-                    data = zf.read(f_path)
-                    self.cb.put(f"Read {f_path}")
-                out_path = Path(self.out_dir, str(num).zfill(3) + ext)
-                with open(out_path, "wb") as f:
-                    f.write(data)
-                self.cb.put("update_bar")
-        self.cb.put(f"Finished getting {pack_url}")
-        return True
     @staticmethod
     def start(
         url: str,

sticker_convert/gui_components/frames/cred_frame.py CHANGED Viewed

@@ -181,3 +181,5 @@ class CredFrame(LabelFrame):
         self.kakao_get_auth_btn.config(state=state)
         self.line_cookies_entry.config(state=state)
         self.line_get_auth_btn.config(state=state)
+        self.viber_auth_lbl.config(state=state)
+        self.viber_auth_entry.config(state=state)

sticker_convert/gui_components/windows/viber_get_auth_window.py CHANGED Viewed

@@ -51,11 +51,17 @@ class ViberGetAuthWindow(BaseWindow):
                 justify="left",
                 anchor="w",
             )
+        else:
+            self.explanation_lbl2 = Label(
+                self.frame_info,
+                text="You may be asked for admin password.",
+                justify="left",
+                anchor="w",
+            )
         self.explanation_lbl0.grid(column=0, row=0, sticky="w", padx=3, pady=3)
         self.explanation_lbl1.grid(column=0, row=1, sticky="w", padx=3, pady=3)
-        if self.explanation_lbl2 is not None:
-            self.explanation_lbl2.grid(column=0, row=2, sticky="w", padx=3, pady=3)
+        self.explanation_lbl2.grid(column=0, row=2, sticky="w", padx=3, pady=3)
         # Start button frame
         self.launch_btn = Button(

sticker_convert/resources/memdump_windows.ps1 ADDED Viewed

@@ -0,0 +1,8 @@
+param($processId)
+$dumpFilePath = "$Env:TEMP\memdump.bin.$processId"
+Powershell -c rundll32.exe C:\Windows\System32\comsvcs.dll, MiniDump $processId $dumpFilePath full
+icacls $dumpFilePath /remove "Everyone"
+icacls $dumpFilePath /grant "Everyone:(r)"
+icacls $dumpFilePath /grant "Everyone:(w)"

sticker_convert/utils/auth/get_viber_auth.py CHANGED Viewed

@@ -1,137 +1,183 @@
 #!/usr/bin/env python3
+import importlib.util
 import os
 import platform
 import shutil
+import signal
 import subprocess
 import time
 from getpass import getpass
 from pathlib import Path
-from typing import Callable, Optional, Tuple, cast
+from typing import Callable, List, Optional, Tuple, cast
 from sticker_convert.definitions import ROOT_DIR
-# psutil is missing on arm64 linux appimage
-# Note: There is no Viber Desktop on arm64 linux anyway
-try:
-    import psutil
-    PSUTIL_LOADED = True
-except ModuleNotFoundError:
-    PSUTIL_LOADED = False  # type: ignore
 MSG_NO_BIN = """Viber Desktop not detected.
 Download and install Viber Desktop,
 then login to Viber Desktop and try again."""
 MSG_NO_AUTH = """Viber Desktop installed,
 but viber_auth not found.
 Please login to Viber Desktop and try again."""
 MSG_SIP_ENABLED = """You need to disable SIP:
 1. Restart computer in Recovery mode
 2. Launch Terminal from the Utilities menu
 3. Run the command `csrutil disable`
 4. Restart your computer"""
+MSG_NO_PGREP = "pgrep command or psutil python package is necessary"
+MSG_LAUNCH_FAIL = "Failed to launch Viber"
+MSG_PERMISSION_ERROR = "Failed to read Viber process memory"
-MSG_NO_PSUTIL = "Python package psutil is necessary"
-def killall(name: str) -> bool:
-    if not PSUTIL_LOADED:
+def check_admin_windows() -> bool:
+    username = os.getenv("username")
+    if username is None:
         return False
+    s = subprocess.run(
+        ["net", "user", username],
+        capture_output=True,
+        text=True,
+    ).stdout
+    return True if "*Administrators" in s else False
+def check_admin_linux() -> bool:
+    s = subprocess.run(
+        ["sudo", "-l"],
+        capture_output=True,
+        text=True,
+    ).stdout
+    return True if "may run the following commands" in s else False
+def killall(name: str) -> bool:
     result = False
-    for proc in psutil.process_iter():  # type: ignore
-        if name in proc.name().lower():
-            proc.kill()
+    while True:
+        pid = find_pid_by_name(name)
+        if pid is not None:
+            os.kill(pid, signal.SIGTERM)
             result = True
+        else:
+            break
     return result
 def find_pid_by_name(name: str) -> Optional[int]:
-    if not PSUTIL_LOADED:
+    if platform.system() == "Windows":
+        s = subprocess.run(
+            ["powershell", "-c", "Get-Process", f"*{name}*"],
+            capture_output=True,
+            text=True,
+        ).stdout
+        for line in s.split("\n"):
+            if name in line.lower():
+                info = name.split()
+                pid = info[5]
+                if pid.isnumeric():
+                    return int(pid)
         return None
+    else:
+        if platform.system() == "Darwin":
+            pattern = "Viber"
+        else:
+            pattern = ".*[Vv]iber.*"
+        pid = (
+            subprocess.run(["pgrep", pattern], capture_output=True, text=True)
+            .stdout.split("\n")[0]
+            .strip()
+        )
+        if pid == "" or pid.isnumeric() is False:
+            return None
+        else:
+            return int(pid)
+if importlib.util.find_spec("psutil"):
+    import psutil
+    def killall(name: str) -> bool:
+        result = False
-    for proc in psutil.process_iter():  # type: ignore
-        if name in proc.name().lower():
-            return proc.pid
+        for proc in psutil.process_iter():  # type: ignore
+            if name in proc.name().lower():
+                proc.kill()
+                result = True
-    return None
+        return result
+    def find_pid_by_name(name: str) -> Optional[int]:
+        for proc in psutil.process_iter():  # type: ignore
+            if name in proc.name().lower():
+                return proc.pid
+        return None
 class GetViberAuth:
     def __init__(self, cb_ask_str: Callable[..., str] = input):
         self.cb_ask_str = cb_ask_str
-    def get_auth_windows(self, viber_bin_path: str) -> Tuple[Optional[str], str]:
-        if not PSUTIL_LOADED:
-            return None, MSG_NO_PSUTIL
-        member_id = None
-        m_token = None
-        m_ts = None
+    def relaunch_viber(self, viber_bin_path: str) -> Optional[int]:
         killed = killall("viber")
         if killed:
             time.sleep(5)
-        subprocess.Popen([viber_bin_path])
+        if platform.system() == "Darwin":
+            cmd = ["open", "-n", viber_bin_path]
+        else:
+            cmd = [viber_bin_path]
+        subprocess.Popen(cmd)
         time.sleep(10)
-        from PyMemoryEditor import OpenProcess  # type: ignore
+        return find_pid_by_name("viber")
-        viber_pid = find_pid_by_name("viber")
-        with OpenProcess(pid=viber_pid) as process:
-            for address in process.search_by_value(str, 18, "X-Viber-Auth-Mid: "):  # type: ignore
-                member_id_addr = cast(int, address) + 18
-                member_id_bytes = process.read_process_memory(member_id_addr, bytes, 20)
-                member_id_term = member_id_bytes.find(b"\x0d\x0a")
-                if member_id_term == -1:
-                    continue
-                member_id = member_id_bytes[:member_id_term].decode(encoding="ascii")
-                break
-            if member_id is None:
-                return None, MSG_NO_AUTH
+    def get_mem_windows(self, viber_pid: int) -> Tuple[Optional[bytes], str]:
+        from pathlib import WindowsPath
-            for address in process.search_by_value(str, 20, "X-Viber-Auth-Token: "):  # type: ignore
-                m_token_addr = cast(int, address) + 20
-                m_token = process.read_process_memory(m_token_addr, str, 64)
-                break
-            if m_token is None:
-                return None, MSG_NO_AUTH
-            for address in process.search_by_value(str, 24, "X-Viber-Auth-Timestamp: "):  # type: ignore
-                m_ts_addr = cast(int, address) + 24
-                m_ts = process.read_process_memory(m_ts_addr, str, 13)
+        memdump_ps_path = str(WindowsPath(ROOT_DIR / "resources/memdump_windows.ps1"))
+        arglist = (
+            f'-NoProfile -ExecutionPolicy Bypass -File "{memdump_ps_path}" {viber_pid}'
+        )
+        dump_fpath = os.path.expandvars(f"%temp%/memdump.bin.{viber_pid}")
+        cmd = [
+            "powershell",
+            "-NoProfile",
+            "-ExecutionPolicy",
+            "Bypass",
+            "-Command",
+            f"Start-Process -Verb RunAs powershell -ArgumentList '{arglist}'",
+        ]
+        subprocess.run(cmd, capture_output=True, text=True)
+        while True:
+            try:
+                with open(dump_fpath, "rb") as f:
+                    s = f.read()
+                if len(s) != 0:
+                    break
+                time.sleep(1)
+            except (FileNotFoundError, PermissionError):
+                pass
+        while True:
+            try:
+                os.remove(dump_fpath)
                 break
-            if m_ts is None:
-                return None, MSG_NO_AUTH
-        killall("viber")
-        viber_auth = f"member_id:{member_id};m_token:{m_token};m_ts:{m_ts}"
-        msg = "Got viber_auth successfully:\n"
-        msg += f"{viber_auth=}\n"
-        return viber_auth, msg
-    def get_auth_linux(self, viber_bin_path: str) -> Tuple[Optional[str], str]:
-        if not PSUTIL_LOADED:
-            return None, MSG_NO_PSUTIL
-        member_id = None
-        m_token = None
-        m_ts = None
+            except PermissionError:
+                pass
-        killed = killall("viber")
-        if killed:
-            time.sleep(5)
-        subprocess.Popen([viber_bin_path])
-        time.sleep(10)
+        return s, ""
-        viber_pid = find_pid_by_name("viber")
-        memdump_sh_path = (ROOT_DIR / "resources/memdump.sh").as_posix()
+    def get_mem_linux(self, viber_pid: int) -> Tuple[Optional[bytes], str]:
+        memdump_sh_path = (ROOT_DIR / "resources/memdump_linux.sh").as_posix()
         s = subprocess.run(
             [
@@ -141,7 +187,7 @@ class GetViberAuth:
             capture_output=True,
         ).stdout
-        if s.find(b"X-Viber-Auth-Mid: ") != -1:
+        if len(s) > 1000:
             pass
         elif shutil.which("pkexec") and os.getenv("DISPLAY"):
             s = subprocess.run(
@@ -174,27 +220,80 @@ class GetViberAuth:
                 stdin=sudo_password_pipe.stdout,
             ).stdout
-        member_id_addr = s.find(b"X-Viber-Auth-Mid: ")
-        m_token_addr = s.find(b"X-Viber-Auth-Token: ")
-        m_ts_addr = s.find(b"X-Viber-Auth-Timestamp: ")
+        return s, ""
-        if member_id_addr == -1 or m_token_addr == -1 or m_ts_addr == -1:
-            return None, MSG_NO_AUTH
+    def get_mem_darwin(self, viber_pid: int) -> Tuple[Optional[bytes], str]:
+        subprocess.run(
+            [
+                "lldb",
+                "--attach-pid",
+                str(viber_pid),
+                "-o",
+                "process save-core /tmp/viber.dmp",
+                "-o",
+                "quit",
+            ],
+            stdout=subprocess.DEVNULL,
+            stderr=subprocess.DEVNULL,
+        )
-        member_id_addr += 18
-        m_token_addr += 20
-        m_ts_addr += 24
+        with open("/tmp/viber.dmp", "rb") as f:
+            s = f.read()
-        member_id_bytes = s[member_id_addr : member_id_addr + 20]
-        member_id_term = member_id_bytes.find(b"\x0d\x0a")
-        if member_id_term == -1:
-            return None, MSG_NO_AUTH
-        member_id = member_id_bytes[:member_id_term].decode(encoding="ascii")
+        os.remove("/tmp/viber.dmp")
-        m_token = s[m_token_addr : m_token_addr + 64].decode(encoding="ascii")
-        m_ts = s[m_ts_addr : m_ts_addr + 13].decode(encoding="ascii")
+        return s, ""
-        killall("viber")
+    def get_auth_by_pme(
+        self, viber_bin_path: str, relaunch: bool = True
+    ) -> Tuple[Optional[str], str]:
+        from PyMemoryEditor import OpenProcess  # type: ignore
+        member_id = None
+        m_token = None
+        m_ts = None
+        if relaunch:
+            viber_pid = self.relaunch_viber(viber_bin_path)
+        else:
+            viber_pid = find_pid_by_name("viber")
+        if viber_pid is None:
+            return None, MSG_LAUNCH_FAIL
+        try:
+            with OpenProcess(pid=int(viber_pid)) as process:
+                for address in process.search_by_value(str, 18, "X-Viber-Auth-Mid: "):  # type: ignore
+                    member_id_addr = cast(int, address) + 18
+                    member_id_bytes = process.read_process_memory(
+                        member_id_addr, bytes, 20
+                    )
+                    member_id_term = member_id_bytes.find(b"\x0d\x0a")
+                    if member_id_term == -1:
+                        continue
+                    member_id = member_id_bytes[:member_id_term].decode(
+                        encoding="ascii"
+                    )
+                    break
+                if member_id is None:
+                    return None, MSG_NO_AUTH
+                for address in process.search_by_value(str, 20, "X-Viber-Auth-Token: "):  # type: ignore
+                    m_token_addr = cast(int, address) + 20
+                    m_token = process.read_process_memory(m_token_addr, str, 64)
+                    break
+                if m_token is None:
+                    return None, MSG_NO_AUTH
+                for address in process.search_by_value(  # type: ignore
+                    str, 24, "X-Viber-Auth-Timestamp: "
+                ):
+                    m_ts_addr = cast(int, address) + 24
+                    m_ts = process.read_process_memory(m_ts_addr, str, 13)
+                    break
+                if m_ts is None:
+                    return None, MSG_NO_AUTH
+        except PermissionError:
+            return None, MSG_PERMISSION_ERROR
         viber_auth = f"member_id:{member_id};m_token:{m_token};m_ts:{m_ts}"
         msg = "Got viber_auth successfully:\n"
@@ -202,50 +301,43 @@ class GetViberAuth:
         return viber_auth, msg
-    def get_auth_darwin(self, viber_bin_path: str) -> Tuple[Optional[str], str]:
+    def get_auth_by_dump(
+        self, viber_bin_path: str, relaunch: bool = True
+    ) -> Tuple[Optional[str], str]:
         member_id = None
         m_token = None
         m_ts = None
-        csrutil_status = subprocess.run(
-            ["csrutil", "status"], capture_output=True, text=True
-        ).stdout
-        if "enabled" in csrutil_status:
-            return None, MSG_SIP_ENABLED
-        killed = killall("viber")
-        if killed:
-            time.sleep(5)
-        subprocess.run(
-            ["open", "-n", viber_bin_path],
-            stdout=subprocess.DEVNULL,
-            stderr=subprocess.DEVNULL,
-        )
-        time.sleep(10)
+        if platform.system() == "Darwin":
+            csrutil_status = subprocess.run(
+                ["csrutil", "status"], capture_output=True, text=True
+            ).stdout
-        viber_pid = subprocess.run(
-            ["pgrep", "Viber"], capture_output=True, text=True
-        ).stdout.strip()
-        subprocess.run(
-            [
-                "lldb",
-                "--attach-pid",
-                viber_pid,
-                "-o",
-                "process save-core /tmp/viber.dmp",
-                "-o",
-                "quit",
-            ],
-            stdout=subprocess.DEVNULL,
-            stderr=subprocess.DEVNULL,
-        )
+            if "enabled" in csrutil_status:
+                return None, MSG_SIP_ENABLED
+        elif (
+            platform.system() != "Windows"
+            and shutil.which("pgrep") is None
+            and importlib.find_loader("psutil") is None
+        ):
+            return None, MSG_NO_PGREP
+        if relaunch:
+            viber_pid = self.relaunch_viber(viber_bin_path)
+        else:
+            viber_pid = find_pid_by_name("viber")
+        if viber_pid is None:
+            return None, MSG_LAUNCH_FAIL
-        with open("/tmp/viber.dmp", "rb") as f:
-            s = f.read()
+        if platform.system() == "Windows":
+            s, msg = self.get_mem_windows(viber_pid)
+        elif platform.system() == "Darwin":
+            s, msg = self.get_mem_darwin(viber_pid)
+        else:
+            s, msg = self.get_mem_linux(viber_pid)
-        os.remove("/tmp/viber.dmp")
-        killall("viber")
+        if s is None:
+            return None, msg
         member_id_addr = s.find(b"X-Viber-Auth-Mid: ")
         m_token_addr = s.find(b"X-Viber-Auth-Token: ")
@@ -307,9 +399,43 @@ class GetViberAuth:
         if not viber_bin_path:
             return None, MSG_NO_BIN
-        if platform.system() == "Windows":
-            return self.get_auth_windows(viber_bin_path)
-        elif platform.system() == "Darwin":
-            return self.get_auth_darwin(viber_bin_path)
+        # get_auth_by_dump()
+        # + Fast
+        # - Requires admin
+        # get_auth_by_pme()
+        # + No admin (If have permission to read process)
+        # - Slow
+        # - Cannot run on macOS
+        # If admin, prefer get_auth_by_dump() over get_auth_by_pme(), vice versa
+        methods: List[Callable[[str, bool], Tuple[Optional[str], str]]] = []
+        relaunch = True
+        viber_auth = None
+        msg = ""
+        pme_present = importlib.util.find_spec("PyMemoryEditor") is not None
+        if platform.system() == "Darwin":
+            methods.append(self.get_auth_by_dump)
+        elif platform.system() == "Windows":
+            methods.append(self.get_auth_by_dump)
+            if pme_present:
+                methods.append(self.get_auth_by_pme)
+            if check_admin_windows() is False:
+                methods.reverse()
         else:
-            return self.get_auth_linux(viber_bin_path)
+            if not os.path.isfile("/.dockerenv"):
+                methods.append(self.get_auth_by_dump)
+            if pme_present:
+                methods.append(self.get_auth_by_pme)
+            if check_admin_linux() is False:
+                methods.reverse()
+        for method in methods:
+            viber_auth, msg = method(viber_bin_path, relaunch)
+            relaunch = False
+            if viber_auth is not None:
+                break
+        killall("viber")
+        return viber_auth, msg

sticker_convert/version.py CHANGED Viewed

@@ -1,3 +1,3 @@
 #!/usr/bin/env python3
-__version__ = "2.9.0"
+__version__ = "2.9.2"

{sticker_convert-2.9.0.dist-info → sticker_convert-2.9.2.dist-info}/METADATA RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sticker-convert
-Version: 2.9.0
+Version: 2.9.2
 Summary: Convert (animated) stickers to/from WhatsApp, Telegram, Signal, Line, Kakao, Viber, iMessage. Written in Python.
 Author-email: laggykiller <chaudominic2@gmail.com>
 Maintainer-email: laggykiller <chaudominic2@gmail.com>
@@ -367,20 +367,22 @@ License-File: LICENSE
 Requires-Dist: aiolimiter ~=1.1.0
 Requires-Dist: anyio ~=4.4.0
 Requires-Dist: apngasm-python ~=1.3.1
-Requires-Dist: av ~=12.1.0
+Requires-Dist: av ~=12.2.0
 Requires-Dist: beautifulsoup4 ~=4.12.3
-Requires-Dist: rookiepy ~=0.5.1
+Requires-Dist: chromedriver-autoinstaller ~=0.6.4
+Requires-Dist: rookiepy ~=0.5.2
 Requires-Dist: imagequant ~=1.1.1
 Requires-Dist: memory-tempfile ~=2.2.3
 Requires-Dist: mergedeep ~=1.3.4
 Requires-Dist: numpy >=1.22.4
-Requires-Dist: Pillow ~=10.3.0
+Requires-Dist: Pillow ~=10.4.0
 Requires-Dist: pyoxipng ~=9.0.0
-Requires-Dist: python-telegram-bot ~=21.2
-Requires-Dist: psutil ~=5.9.8
+Requires-Dist: python-telegram-bot ~=21.3
+Requires-Dist: psutil ~=6.0.0
 Requires-Dist: PyMemoryEditor ~=1.5.22
 Requires-Dist: requests ~=2.32.3
-Requires-Dist: rlottie-python ~=1.3.5
+Requires-Dist: rlottie-python ~=1.3.6
+Requires-Dist: selenium ~=4.22.0
 Requires-Dist: signalstickers-client-fork-laggykiller ~=3.3.0.post2
 Requires-Dist: sqlcipher3-wheels ~=0.5.2.post1
 Requires-Dist: tqdm ~=4.66.4
@@ -392,7 +394,7 @@ Requires-Dist: ttkbootstrap-fork-laggykiller ~=1.5.1
 - A python script for creating, downloading, converting+compressing and uploading stickers from multiple instant messaging applications.
 - With GUI and CLI that runs on Windows, MacOS and Linux
-- Currently supports Signal, Telegram, WhatsApp (Create .wastickers), Line (Download only), Kakao (Download only), Viber (Download only), iMessage (Create Xcode sticker pack project)
+- Currently supports Signal, Telegram, WhatsApp (Create .wastickers), Line (Download only), Kakao (Download only), Viber, iMessage (Create Xcode sticker pack project)
 - Supports static and animated stickers, with transparency support
 ## Downloads
@@ -430,7 +432,7 @@ Requires-Dist: ttkbootstrap-fork-laggykiller ~=1.5.1
 | [WhatsApp](docs/guide_whatsapp.md)    | ⭕ (By Android or WhatsApp Web)     | ⭕ (Create `.wastickers`, import by Sticker Maker) |
 | [Line](docs/guide_line.md)            | ✅                                  | 🚫 (Need to submit for manual approval)            |
 | [Kakao](docs/guide_kakao.md)          | ✅ (Need 'share link' for animated) | 🚫 (Need to submit for manual approval)            |
-| [Viber](docs/guide_viber.md)          | ✅                                  | 🚫 (Manually upload through Viber app)             |
+| [Viber](docs/guide_viber.md)          | ✅                                  | ✅ (Require `viber_auth`)                          |
 | [iMessage](docs/guide_imessage.md)    | 🚫                                  | ⭕ (Create Xcode stickerpack project for sideload) |
 ✅ = Supported ⭕ = Partially supported 🚫 = Not supported
@@ -459,7 +461,7 @@ Requires-Dist: ttkbootstrap-fork-laggykiller ~=1.5.1
     - Upload: Not supported. You need to manually submit sticker pack for approval before you can use in app.
 - Viber
     - Download: Supported (e.g. `https://stickers.viber.com/pages/example` OR `https://stickers.viber.com/pages/custom-sticker-packs/example`)
-    - Upload: The program can convert images to png with 490x490 for uploading to viber manually. It should be noted that Viber is able to resize images for you, so it may not be necessary to use sticker-convert for creating Viber sticker pack.
+    - Upload: Supported. Viber authentication data required for uploading Viber stickers, which could be fetched from Viber Desktop application automatically.
 - iMessage
     - Download: Not supported.
     - Upload: The program can create Xcode project for iMessage sticker pack, which could then be compiled and sideloaded using Xcode.

{sticker_convert-2.9.0.dist-info → sticker_convert-2.9.2.dist-info}/RECORD RENAMED Viewed

@@ -6,10 +6,10 @@ sticker_convert/definitions.py,sha256=ZhP2ALCEud-w9ZZD4c3TDG9eHGPZyaAL7zPUsJAbjt
 sticker_convert/gui.py,sha256=hZOp2SyEYKbCRm9SRTItBqEk724SHtSqK_Txo0wpL8Q,31194
 sticker_convert/job.py,sha256=4C2WwB3PFldacqI8UPnM10thM087VLEl9wn6P9_LtS0,26128
 sticker_convert/job_option.py,sha256=yFwHEhW8Gzp9dfiXakkCREfejAIJhiOxwD4Wlg9jcPk,7805
-sticker_convert/version.py,sha256=UUJ5qrYrmZsock_EC-nYp5wKxs3ZAkgVkQPLxSv6l1E,46
+sticker_convert/version.py,sha256=KtHdsdkHNKLnGLbDOZKFG0OukVKP9IeWcQlHYhF_lg0,46
 sticker_convert/downloaders/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-sticker_convert/downloaders/download_base.py,sha256=x18bI2mPpbXRnSmStBHEb1IvN-VPCilOHLQUs6YPUEU,4041
-sticker_convert/downloaders/download_kakao.py,sha256=TCygK-LiSkk3yEYZymZsHVwtW5JmQX6JeIneh25XxFA,14984
+sticker_convert/downloaders/download_base.py,sha256=WGEtri16p6GCG7hhQ603pKS8efoB72oCBHTuJ_RVmG0,4041
+sticker_convert/downloaders/download_kakao.py,sha256=msUUUR-2JdeAO_pQPJBFuA9xVfh1Gwl19WYN_6WLA-Y,13324
 sticker_convert/downloaders/download_line.py,sha256=9WzOWujTbZdAqBi52k21OUEfRmcV1loCaJiDmg6dklw,17853
 sticker_convert/downloaders/download_signal.py,sha256=PfwscdbcEd_5C3Ecs0F8Qc8si1sLzLodAdnsHVwXgac,3063
 sticker_convert/downloaders/download_telegram.py,sha256=jufMqc78aXOPDr7fQf9ykkNyhQ7KVCp4gRBxs09NgMo,4614
@@ -20,7 +20,7 @@ sticker_convert/gui_components/frames/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCe
 sticker_convert/gui_components/frames/comp_frame.py,sha256=9k_UntKKi2G_g0byzoj1rdTqOq7q9mcnXiy799bYnr0,7257
 sticker_convert/gui_components/frames/config_frame.py,sha256=b3X4QAnGpde0OhthXHmjSyU_Yb5tYRUFXmy04Yi8Zmo,4316
 sticker_convert/gui_components/frames/control_frame.py,sha256=_XiOJ9JPUfiysDghGG04sEVLrXG9TMVlDZ60W0LhYVI,835
-sticker_convert/gui_components/frames/cred_frame.py,sha256=QCAmDfSgL-ykGxPsL_9kWFssbtVdrh17IWW28oxzdDg,7429
+sticker_convert/gui_components/frames/cred_frame.py,sha256=AJHxxBdEa-xOteevVBsSfAHtcJklU3pu2TqvZny9o4w,7527
 sticker_convert/gui_components/frames/input_frame.py,sha256=5Vz1d6J1jkofvvzm43DxeIW_CjWfxa2QPYFnkAAiAfM,5040
 sticker_convert/gui_components/frames/output_frame.py,sha256=n2WLk22h61DoZli8WbFhd-h2CqWAebDXnBa051JBuOc,4260
 sticker_convert/gui_components/frames/progress_frame.py,sha256=LWUZg_iL7iiNTfu7N5Ct_pklZdghxihENi7DP9YozOE,4915
@@ -31,7 +31,7 @@ sticker_convert/gui_components/windows/base_window.py,sha256=xBE1peGMPvWsdrFej0C
 sticker_convert/gui_components/windows/kakao_get_auth_window.py,sha256=AvXB2Q8pAPkKILHTvlLGV9jfBcvskCA4arko4nvBTdo,7115
 sticker_convert/gui_components/windows/line_get_auth_window.py,sha256=S4ES_lk2-GDvPokZtYALnUc5zW1VbS4WulNqO9K1aSs,3375
 sticker_convert/gui_components/windows/signal_get_auth_window.py,sha256=kbJPe558lLP4PbPT2mCw4Xgh06FX5mBEZXoW-Q1LvWY,4584
-sticker_convert/gui_components/windows/viber_get_auth_window.py,sha256=_LOAhyNEp4OL24i_PsVtXYE01EArH-9gOOdEaFG4H30,4876
+sticker_convert/gui_components/windows/viber_get_auth_window.py,sha256=Ne0DG4wog7Pzw-fPsbr7HX40okFFo1INusVCSwSAQdQ,5051
 sticker_convert/ios-message-stickers-template/.gitignore,sha256=4uuTph_9eHfqXHUavLOmGOji6aIHOif2bUEU_hCBn4Y,9
 sticker_convert/ios-message-stickers-template/README.md,sha256=oN0FvJkCWWjSZ3PMrCvY3T1zCsdkZYFgGHAoFh0Kmt8,467
 sticker_convert/ios-message-stickers-template/.github/FUNDING.yml,sha256=3LlmdSAGDsBA2o_C1iBYTNLwkABnyZuN0zxgPPyd-f8,70
@@ -72,7 +72,8 @@ sticker_convert/resources/compression.json,sha256=tNBGCmFqZ4Bsik1-xtvkOSlRu1uF6K
 sticker_convert/resources/emoji.json,sha256=sXSuKusyG1L2Stuf9BL5ZqfzOIOdeAeE3RXcrXAsLdY,413367
 sticker_convert/resources/help.json,sha256=VgRYw5iNQGn_CDA4pTnk5QUO21lsx0JIvWgUV2kHPvY,6906
 sticker_convert/resources/input.json,sha256=S3CkInBMLrk5OS9aJfuTCDsf_64NOjNT3IKQr7d1hM0,2665
-sticker_convert/resources/memdump.sh,sha256=YbdX5C5RyCnoeDUE6JgTo8nQXKhrUw5-kFDx5bQp9tY,651
+sticker_convert/resources/memdump_linux.sh,sha256=YbdX5C5RyCnoeDUE6JgTo8nQXKhrUw5-kFDx5bQp9tY,651
+sticker_convert/resources/memdump_windows.ps1,sha256=CfyNSSEW3HJOkTu-mKrP3qh5aprN-1VCBfj-R1fELA0,302
 sticker_convert/resources/output.json,sha256=V4OseXEm3O16cAjHDVZRq8-SY-0_7cFFR_cyF-0Y_eQ,1570
 sticker_convert/uploaders/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sticker_convert/uploaders/compress_wastickers.py,sha256=SMPf1_ir30ZKO2ChHspDFuyaufx0XeVBVLOlHmawEdY,6021
@@ -86,7 +87,7 @@ sticker_convert/utils/url_detect.py,sha256=L2QwE2jwN85MoyYsW_4GvBHuoedrlhoIdAmzw
 sticker_convert/utils/auth/get_kakao_auth.py,sha256=ipAZ1DUd5CMTpUoxRXHVOFC3DKIpxwxpTYAfrOJ6UZ8,9829
 sticker_convert/utils/auth/get_line_auth.py,sha256=8l8ha2vQmk3rHGvDE7PkcxQXbH3oe62LKbI3qVUtvqc,2196
 sticker_convert/utils/auth/get_signal_auth.py,sha256=6Sx-lMuyBHeX1RpjAWI8u03qnRu9fmO4p89pd7fowOE,4925
-sticker_convert/utils/auth/get_viber_auth.py,sha256=U3_8qxVifiZ7T47PMW6Cdo7CcLJnUW-_rf8QIYL9bYY,9984
+sticker_convert/utils/auth/get_viber_auth.py,sha256=UUdnESATVGj-mrDuM_5wq75ouQFqPvFtdyqjGDqxi5Y,13734
 sticker_convert/utils/files/cache_store.py,sha256=etfe614OAhAyrnM5fGeESKq6R88YLNqkqkxSzEmZ0V0,1047
 sticker_convert/utils/files/json_manager.py,sha256=Vr6pZJdLMkrJJWN99210aduVHb0ILyf0SSTaw4TZqgc,541
 sticker_convert/utils/files/json_resources_loader.py,sha256=flZFixUXRTrOAhvRQpuSQgmJ69yXL94sxukcowLT1JQ,1049
@@ -97,9 +98,9 @@ sticker_convert/utils/media/apple_png_normalize.py,sha256=LbrQhc7LlYX4I9ek4XJsZE
 sticker_convert/utils/media/codec_info.py,sha256=1QfW3wgZ5vOk7T4XtLHYvJK1x8RbASRPSvhKEPkcu9A,15747
 sticker_convert/utils/media/decrypt_kakao.py,sha256=4wq9ZDRnFkx1WmFZnyEogBofiLGsWQM_X69HlA36578,1947
 sticker_convert/utils/media/format_verify.py,sha256=MH68GLJfXeL8WFT8emtj355K5BLAtUX64tQ59nugx2c,5673
-sticker_convert-2.9.0.dist-info/LICENSE,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
-sticker_convert-2.9.0.dist-info/METADATA,sha256=aGTUdCCINVKxrj8kM3b5pMpMDKbVu51_uuvVR8ee_2A,51091
-sticker_convert-2.9.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-sticker_convert-2.9.0.dist-info/entry_points.txt,sha256=MNJ7XyC--ugxi5jS1nzjDLGnxCyLuaGdsVLnJhDHCqs,66
-sticker_convert-2.9.0.dist-info/top_level.txt,sha256=r9vfnB0l1ZnH5pTH5RvkobnK3Ow9m0RsncaOMAtiAtk,16
-sticker_convert-2.9.0.dist-info/RECORD,,
+sticker_convert-2.9.2.dist-info/LICENSE,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
+sticker_convert-2.9.2.dist-info/METADATA,sha256=09ZbSV3QNFOUGbBUrWrWHZ6Qac7awAGPB5RAFpQiCTk,51071
+sticker_convert-2.9.2.dist-info/WHEEL,sha256=Z4pYXqR_rTB7OWNDYFOm1qRk0RX6GFP2o8LgvP453Hk,91
+sticker_convert-2.9.2.dist-info/entry_points.txt,sha256=MNJ7XyC--ugxi5jS1nzjDLGnxCyLuaGdsVLnJhDHCqs,66
+sticker_convert-2.9.2.dist-info/top_level.txt,sha256=r9vfnB0l1ZnH5pTH5RvkobnK3Ow9m0RsncaOMAtiAtk,16
+sticker_convert-2.9.2.dist-info/RECORD,,

{sticker_convert-2.9.0.dist-info → sticker_convert-2.9.2.dist-info}/WHEEL RENAMED Viewed

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.43.0)
+Generator: setuptools (70.3.0)
 Root-Is-Purelib: true
 Tag: py3-none-any

/sticker_convert/resources/{memdump.sh → memdump_linux.sh} RENAMED Viewed

File without changes

{sticker_convert-2.9.0.dist-info → sticker_convert-2.9.2.dist-info}/LICENSE RENAMED Viewed

File without changes

{sticker_convert-2.9.0.dist-info → sticker_convert-2.9.2.dist-info}/entry_points.txt RENAMED Viewed

File without changes

{sticker_convert-2.9.0.dist-info → sticker_convert-2.9.2.dist-info}/top_level.txt RENAMED Viewed

File without changes

sticker-convert 2.9.0__py3-none-any.whl → 2.9.2__py3-none-any.whl

sticker-convert 2.9.0py3-none-any.whl → 2.9.2py3-none-any.whl