sticker-convert 2.11.8__py3-none-any.whl → 2.12.0__py3-none-any.whl

sticker_convert/converter.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+import json
 import os
 from fractions import Fraction
 from io import BytesIO
@@ -7,12 +8,14 @@ from pathlib import Path
 from typing import TYPE_CHECKING, Any, Dict, List, Literal, Optional, Tuple, Union, cast
 
 import numpy as np
+from bs4 import BeautifulSoup
 from PIL import Image
 from PIL import __version__ as PillowVersion
 from PIL import features
 
 from sticker_convert.job_option import CompOption
 from sticker_convert.utils.callback import CallbackProtocol, CallbackReturn
+from sticker_convert.utils.chrome_remotedebug import CRD
 from sticker_convert.utils.files.cache_store import CacheStore
 from sticker_convert.utils.media.codec_info import CodecInfo, rounding
 from sticker_convert.utils.media.format_verify import FormatVerify
@@ -423,9 +426,78 @@ class StickerConvert:
             # ffmpeg do not support webp decoding (yet)
             # ffmpeg could fail to decode apng if file is buggy
             self._frames_import_pillow()
+        elif suffix == ".svg":
+            self._frames_import_svg()
         else:
             self._frames_import_pyav()
 
+    def _frames_import_svg(self) -> None:
+        width = self.codec_info_orig.res[0]
+        height = self.codec_info_orig.res[1]
+
+        chrome_path = CRD.get_chrome_path()
+        args = [
+            "--headless",
+            "--disable-extensions",
+            "--disable-infobars",
+            "--disable-gpu",
+            "--disable-gpu-rasterization",
+            "--hide-scrollbars",
+            f"--window-size={width + 100},{height + 100}",
+            "about:blank",
+        ]
+        if chrome_path is None:
+            raise RuntimeError("[F] Chrome/Chromium required for importing svg")
+        self.cb.put("[W] Importing SVG takes long time")
+
+        if isinstance(self.in_f, bytes):
+            svg = self.in_f.decode()
+        else:
+            with open(self.in_f) as f:
+                svg = f.read()
+        soup = BeautifulSoup(svg, "html.parser")
+        svg_tag = soup.find_all("svg")[0]
+
+        if svg_tag.get("width") is None:
+            svg_tag["width"] = width
+        if svg_tag.get("height") is None:
+            svg_tag["height"] = height
+        svg = str(soup)
+
+        crd = None
+        try:
+            crd = CRD(chrome_path, args=args)
+            crd.connect(-1)
+            crd.open_html_str(svg)
+            crd.set_transparent_bg()
+            crd.exec_js('svg = document.getElementsByTagName("svg")[0]')
+            x = json.loads(crd.exec_js("svg.getBoundingClientRect().x"))["result"][
+                "result"
+            ]["value"]
+            y = json.loads(crd.exec_js("svg.getBoundingClientRect().y"))["result"][
+                "result"
+            ]["value"]
+            clip = {"x": x, "y": y, "width": width, "height": height, "scale": 1}
+
+            if self.codec_info_orig.fps > 0:
+                crd.exec_js("svg.pauseAnimations()")
+                for i in range(self.codec_info_orig.frames):
+                    curr_time = (
+                        i
+                        / self.codec_info_orig.frames
+                        * self.codec_info_orig.duration
+                        / 1000
+                    )
+                    crd.exec_js(f"svg.setCurrentTime({curr_time})")
+                    self.frames_raw.append(
+                        np.asarray(crd.screenshot(clip).convert("RGBA"))
+                    )
+            else:
+                self.frames_raw.append(np.asarray(crd.screenshot(clip).convert("RGBA")))
+        finally:
+            if crd is not None:
+                crd.close()
+
     def _frames_import_pillow(self) -> None:
         with Image.open(self.in_f) as im:
             # Note: im.convert("RGBA") would return rgba image of current frame only

sticker_convert/definitions.py

@@ -82,3 +82,10 @@ def get_config_dir() -> Path:
 
 # Directory for saving configs
 CONFIG_DIR = get_config_dir()
+
+# When importing SVG, import at this fps
+SVG_SAMPLE_FPS = 30
+
+# If width and height not set in SVG tag, import at this dimension
+SVG_DEFAULT_WIDTH = 1024
+SVG_DEFAULT_HEIGHT = 1024

sticker_convert/downloaders/download_kakao.py

@@ -4,12 +4,10 @@ from __future__ import annotations
 import itertools
 import json
 from pathlib import Path
-from typing import Any, List, Optional, Tuple, cast
+from typing import Any, List, Optional, Tuple
 from urllib.parse import urlparse
 
 import requests
-from bs4 import BeautifulSoup
-from py_mini_racer import MiniRacer
 
 from sticker_convert.downloaders.download_base import DownloadBase
 from sticker_convert.job_option import CredOption, InputOption
@@ -17,34 +15,32 @@ 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
 
-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'];
-    }
-}
-class document {
-    static querySelectorAll(selectors) {
-        return [];
-    }
-}
-"""
-
 
 class MetadataKakao:
     @staticmethod
-    def get_item_code(title_ko: str, auth_token: str) -> Optional[str]:
+    def get_item_code_from_hash(hash: str, auth_token: str) -> Optional[str]:
+        headers = {
+            "Authorization": auth_token,
+        }
+
+        data = {"hashedItemCode": hash}
+
+        response = requests.post(
+            "https://talk-pilsner.kakao.com/emoticon/api/store/v3/item-code-by-hash",
+            headers=headers,
+            data=data,
+        )
+
+        if response.status_code != 200:
+            return None
+
+        response_json = json.loads(response.text)
+        item_code = response_json["itemCode"]
+
+        return item_code
+
+    @staticmethod
+    def get_item_code_from_title(title_ko: str, auth_token: str) -> Optional[str]:
         headers = {
             "Authorization": auth_token,
         }
@@ -112,66 +108,53 @@ 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 = JSINJECT + js
-
-        ctx = MiniRacer()
-        kakao_url = cast(str, ctx.eval(js))
-        item_code = urlparse(kakao_url).path.split("/")[2]
-
-        # Share link redirect to preview link if use desktop headers
-        # This allows us to find pack author
-        headers_desktop = {"User-Agent": "Chrome"}
-
-        response = requests.get(url, headers=headers_desktop, allow_redirects=True)
-        response.url
-
-        pack_title_url = urlparse(response.url).path.split("/")[-1]
-        pack_info_unauthed = MetadataKakao.get_pack_info_unauthed(pack_title_url)
-        if pack_info_unauthed:
-            self.author = pack_info_unauthed["result"]["artist"]
-
-        return pack_title, item_code
-
     def download_stickers_kakao(self) -> Tuple[int, int]:
         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 = self.get_info_from_share_link(self.url)
+            item_code = None
+            if self.auth_token is not None:
+                hash = urlparse(self.url).path.split("/")[-1]
+                item_code = MetadataKakao.get_item_code_from_hash(hash, self.auth_token)
 
-            if item_code:
-                return self.download_animated(item_code)
-            self.cb.put("Download failed: Cannot download metadata for sticker pack")
-            return 0, 0
+            # Share link redirect to preview link if use desktop headers
+            # This allows us to find pack author
+            headers_desktop = {"User-Agent": "Chrome"}
+
+            r = requests.get(self.url, headers=headers_desktop, allow_redirects=True)
+
+            self.pack_title = urlparse(r.url).path.split("/")[-1]
+            pack_info_unauthed = MetadataKakao.get_pack_info_unauthed(self.pack_title)
+            if pack_info_unauthed is None:
+                self.cb.put(
+                    "Download failed: Cannot download metadata for sticker pack"
+                )
+                return 0, 0
+
+            self.author = pack_info_unauthed["result"]["artist"]
+            thumbnail_urls = pack_info_unauthed["result"]["thumbnailUrls"]
 
-        if self.url.isnumeric() or self.url.startswith("kakaotalk://store/emoticon/"):
-            item_code = self.url.replace("kakaotalk://store/emoticon/", "")
+            if item_code is None:
+                if self.auth_token is None:
+                    self.cb.put(
+                        "Warning: Downloading animated sticker requires auth_token"
+                    )
+                else:
+                    self.cb.put(
+                        "Warning: auth_token invalid, cannot download animated sticker"
+                    )
+                self.cb.put("Downloading static stickers...")
+                self.download_static(thumbnail_urls)
+            else:
+                return self.download_animated(item_code)
 
+        if self.url.isnumeric():
             self.pack_title = None
             if self.auth_token:
                 self.pack_info_authed = MetadataKakao.get_pack_info_authed(
-                    item_code, self.auth_token
+                    self.url, self.auth_token
                 )
                 if self.pack_info_authed:
                     self.pack_title = self.pack_info_authed["itemUnitInfo"][0]["title"]
@@ -182,7 +165,7 @@ class DownloadKakao(DownloadBase):
                     )
                     self.cb.put("Continuing without getting pack_title")
 
-            return self.download_animated(item_code)
+            return self.download_animated(self.url)
 
         if urlparse(self.url).netloc == "e.kakao.com":
             self.pack_title = urlparse(self.url).path.split("/")[-1]
@@ -201,7 +184,9 @@ class DownloadKakao(DownloadBase):
             thumbnail_urls = self.pack_info_unauthed["result"]["thumbnailUrls"]
 
             if self.auth_token:
-                item_code = MetadataKakao.get_item_code(title_ko, self.auth_token)
+                item_code = MetadataKakao.get_item_code_from_title(
+                    title_ko, self.auth_token
+                )
                 if item_code:
                     return self.download_animated(item_code)
                 msg = "Warning: Cannot get item code.\n"

sticker_convert/downloaders/download_viber.py

@@ -19,7 +19,7 @@ class DownloadViber(DownloadBase):
     # def __init__(self, *args: Any, **kwargs: Any) -> None:
     #     super().__init__(*args, **kwargs)
 
-    def get_pack_info(self, url: str) -> Optional[Tuple[str, str]]:
+    def get_pack_info(self, url: str) -> Optional[Tuple[str, str, str]]:
         r = requests.get(url, allow_redirects=True)
         soup = BeautifulSoup(r.text, "html.parser")
 
@@ -41,10 +41,13 @@ class DownloadViber(DownloadBase):
         title = pack_dict["title"]
         first_sticker_url = cast(str, pack_dict["stickerFirstItemUrl"])
         zip_url = "/".join(first_sticker_url.split("/")[:-1]) + ".zip"
+        pack_id = pack_dict["id"].split(".")[-1]
 
-        return title, zip_url
+        return title, zip_url, pack_id
 
-    def decompress(self, zip_file: bytes) -> int:
+    def decompress(
+        self, zip_file: bytes, exts: Optional[Tuple[str, ...]] = None
+    ) -> int:
         with zipfile.ZipFile(BytesIO(zip_file)) as zf:
             self.cb.put("Unzipping...")
 
@@ -58,9 +61,14 @@ class DownloadViber(DownloadBase):
             )
 
             for sticker in zf_files:
+                ext = Path(sticker).suffix
+                if "frame" in sticker or ".db" in sticker or sticker.endswith("/"):
+                    continue
+                if exts is not None and ext not in exts:
+                    continue
                 num = sticker.split(".")[0][-2:].zfill(3)
                 data = zf.read(sticker)
-                ext = Path(sticker).suffix
+
                 self.cb.put(f"Read {sticker}")
 
                 out_path = Path(self.out_dir, num + ext)
@@ -76,10 +84,16 @@ class DownloadViber(DownloadBase):
         if pack_info is None:
             self.cb.put("Download failed: Cannot get pack info")
             return 0, 0
-        title, zip_url = pack_info
+        title, zip_url, pack_id = pack_info
 
+        anim_url = f"https://content.cdn.viber.com/stickers/ASVG/{pack_id}.zip"
+        anim_file = self.download_file(anim_url)
         zip_file = self.download_file(zip_url)
-        count = self.decompress(zip_file)
+        if anim_file:
+            count = self.decompress(anim_file, (".svg",))
+            count += self.decompress(zip_file, (".mp3",))
+        else:
+            count = self.decompress(zip_file, (".mp3", ".png"))
 
         MetadataHandler.set_metadata(self.out_dir, title=title)
 

sticker_convert/resources/input.json

@@ -52,7 +52,7 @@
     "kakao": {
         "full_name": "Download from Kakao",
         "help": "Download kakao stickers from a URL / ID as input",
-        "example": "Example: https://e.kakao.com/t/xxxxx OR kakaotalk://store/emoticon/4404400\nOR https://emoticon.kakao.com/items/xxxxx OR 4404400",
+        "example": "Example: https://e.kakao.com/t/xxxxx \nOR https://emoticon.kakao.com/items/xxxxx OR 4404400",
         "address_lbls": "URL address / ID",
         "metadata_provides": {
             "title": true,

sticker_convert/uploaders/upload_viber.py

@@ -72,23 +72,22 @@ class UploadViber(UploadBase):
             separate_image_anim=False,
         )
 
-        cover_path_old = MetadataHandler.get_cover(self.opt_output.dir)
-        if cover_path_old:
-            cover_path = cover_path_old
+        cover_path = MetadataHandler.get_cover(self.opt_output.dir)
+        if cover_path is None:
+            cover_path = MetadataHandler.get_stickers_present(self.opt_output.dir)[0]
+
+        if FormatVerify.check_file(cover_path, spec=self.png_cover_spec):
+            with open(cover_path, "rb") as f:
+                cover_bytes = f.read()
         else:
-            cover_path_old = MetadataHandler.get_stickers_present(self.opt_output.dir)[
-                0
-            ]
-            cover_path = self.opt_output.dir / "cover.png"
-
-        if not FormatVerify.check_file(cover_path_old, spec=self.png_cover_spec):
-            StickerConvert.convert(
-                cover_path_old,
+            _, _, cover_bytes, _ = StickerConvert.convert(  # type: ignore
                 cover_path,
+                Path("bytes.png"),
                 self.opt_comp_merged,
                 self.cb,
                 self.cb_return,
             )
+            assert isinstance(cover_bytes, bytes)
 
         stickers_total = 0
         stickers_ok = 0
@@ -126,12 +125,12 @@ class UploadViber(UploadBase):
             upload_data["description"] = author
             upload_data["shareable"] = "1"
 
-            with open(out_f, "rb") as f, open(cover_path, "rb") as g:
+            with open(out_f, "rb") as f:
                 r = requests.post(
                     "https://market.api.viber.com/2/users/custom-sticker-packs/create",
                     files={
-                        "file": ("upload.zip", f),
-                        "file_icon": ("color_icon.png", g),
+                        "file": ("upload.zip", f.read()),
+                        "file_icon": ("color_icon.png", cover_bytes),
                     },
                     data=upload_data,
                 )

sticker_convert/utils/auth/get_kakao_auth.py

@@ -6,6 +6,7 @@ from typing import Any, Callable, Dict, Optional
 from urllib.parse import parse_qs, urlparse
 
 import requests
+from bs4 import BeautifulSoup
 
 from sticker_convert.job_option import CredOption
 
@@ -32,10 +33,10 @@ class GetKakaoAuth:
         self.uuid_c = str(uuid.uuid4())
         self.device_info = (
             f"android/30; uuid={self.device_uuid}; ssaid={self.device_ssaid}; "
-            + 'model=ANDROID-SDK-BUILT-FOR-X86; screen_resolution=1080x1920; sim=310260/1/us; onestore=false; uvc2={"volume":5,"network_operator":"310260","is_roaming":"false","va":[],"brightness":102,"totalMemory":30866040,"batteryPct":1,"webviewVersion":"83.0.4103.106"}'
+            + "model=SDK_GPHONE_X86_64; screen_resolution=1080x1920; sim=310260/1/us; onestore=false; uvc3=null"
         )
         self.app_platform = "android"
-        self.app_version_number = "10.0.3"
+        self.app_version_number = self.get_version()
         self.app_language = "en"
         self.app_version = (
             f"{self.app_platform}/{self.app_version_number}/{self.app_language}"
@@ -44,7 +45,7 @@ class GetKakaoAuth:
         self.headers = {
             "Host": "katalk.kakao.com",
             "Accept-Language": "en",
-            "User-Agent": "KT/10.0.3 An/11 en",
+            "User-Agent": f"KT/{self.app_version_number} An/11 en",
             "Device-Info": self.device_info,
             "A": self.app_version,
             "C": self.uuid_c,
@@ -52,6 +53,20 @@ class GetKakaoAuth:
             "Connection": "close",
         }
 
+    def get_version(self) -> str:
+        # It is difficult to get app version number from Google Play
+        r = requests.get(
+            "https://apkpure.net/kakaotalk-messenger/com.kakao.talk/versions"
+        )
+        soup = BeautifulSoup(r.text, "html.parser")
+        for li in soup.find_all("li"):
+            a = li.find("a", class_="dt-version-icon")
+            if a is None:
+                continue
+            if "/kakaotalk-messenger/com.kakao.talk/download/" in a.get("href", ""):
+                return a.get("href").split("/")[-1]
+        return "25.2.1"
+
     def login(self) -> bool:
         self.cb_msg("Logging in")
 
@@ -96,7 +111,6 @@ class GetKakaoAuth:
             "countryCode": self.country_code,
             "countryIso": self.country_iso,
             "phoneNumber": self.phone_number,
-            "method": "sms",
             "termCodes": [],
             "simPhoneNumber": f"+{self.country_code}{self.phone_number}",
         }
@@ -244,6 +258,21 @@ class GetKakaoAuth:
             self.cb_msg_block(f"Failed at passcode callback: {response.text}")
             return False
 
+        return True
+
+    def skip_restoration(self) -> bool:
+        self.cb_msg("Skip restoration")
+
+        response = requests.post(
+            "https://katalk.kakao.com/android/account2/skip-restoration",
+            headers=self.headers,
+        )
+        response_json = json.loads(response.text)
+
+        if response_json["status"] != 0:
+            self.cb_msg_block(f"Failed at skip restoration: {response.text}")
+            return False
+
         self.nickname = response_json.get("viewData", {}).get("nickname")
 
         if self.nickname is None:
@@ -288,6 +317,7 @@ class GetKakaoAuth:
             self.enter_phone,
             self.confirm_device_change,
             self.passcode_callback,
+            self.skip_restoration,
             self.get_profile,
         )
 

sticker_convert/utils/auth/get_kakao_desktop_auth.py

@@ -105,7 +105,7 @@ class GetKakaoDesktopAuth:
             return None, msg
 
         auth_token = None
-        for i in re.finditer(b"\x00authorization\x00", s):
+        for i in re.finditer(b"authorization: ", s):
             auth_token_addr = i.start() + 15
 
             auth_token_bytes = s[auth_token_addr : auth_token_addr + 200]

sticker_convert/utils/chrome_remotedebug.py

@@ -1,4 +1,6 @@
 #!/usr/bin/env python3
+import base64
+import io
 import json
 import os
 import platform
@@ -6,10 +8,11 @@ import shutil
 import socket
 import subprocess
 import time
-from typing import Any, Dict, Optional, Union, cast
+from typing import Any, Dict, List, Optional, Union, cast
 
 import requests
 import websocket
+from PIL import Image
 
 # References
 # https://github.com/yeongbin-jo/python-chromedriver-autoinstaller/blob/master/chromedriver_autoinstaller/utils.py
@@ -24,15 +27,32 @@ def get_free_port() -> int:
 
 
 class CRD:
-    def __init__(self, chrome_bin: str, port: Optional[int] = None):
+    def __init__(
+        self,
+        chrome_bin: str,
+        port: Optional[int] = None,
+        args: Optional[List[str]] = None,
+    ):
         if port is None:
             port = get_free_port()
         self.port = port
-        launch_cmd = [
+
+        launch_cmd: List[str] = []
+        self.display = None
+        if (
+            platform.system() == "Linux"
+            and os.environ.get("DISPLAY", False) is False
+            and shutil.which("xvfb-run")
+        ):
+            launch_cmd += ["xvfb-run", "--server-args='-screen 0, 1024x768x24'"]
+
+        launch_cmd += [
             chrome_bin,
             f"--remote-debugging-port={port}",
-            f"--remote-allow-origins=http://localhost:{port}",
+            f"--remote-allow-origins=http://127.0.0.1:{port}",
         ]
+        if args:
+            launch_cmd += args
 
         # Adding --no-sandbox in Windows may cause Signal fail to launch
         # https://github.com/laggykiller/sticker-convert/issues/274
@@ -40,7 +60,7 @@ class CRD:
             platform.system() != "Windows"
             and "geteuid" in dir(os)
             and os.geteuid() == 0
-        ):
+        ) or os.path.isfile("/.dockerenv"):
             launch_cmd.append("--no-sandbox")
 
         self.chrome_proc = subprocess.Popen(launch_cmd)
@@ -89,12 +109,17 @@ class CRD:
                     return chrome_bin
             return None
 
-    def connect(self):
+    def connect(self, target_id: int = 0):
         self.cmd_id = 1
         r = None
+        targets: List[Any] = []
         for _ in range(30):
             try:
-                r = requests.get(f"http://localhost:{self.port}/json")
+                r = requests.get(f"http://127.0.0.1:{self.port}/json")
+                targets = json.loads(r.text)
+                if len(targets) == 0:
+                    time.sleep(1)
+                    continue
                 break
             except requests.exceptions.ConnectionError:
                 time.sleep(1)
@@ -102,17 +127,12 @@ class CRD:
         if r is None:
             raise RuntimeError("Cannot connect to chrome debugging port")
 
-        targets = json.loads(r.text)
-        for _ in range(30):
-            if len(targets) == 0:
-                time.sleep(1)
-            else:
-                break
-
         if len(targets) == 0:
             raise RuntimeError("Cannot create websocket connection with debugger")
 
-        self.ws = websocket.create_connection(targets[0]["webSocketDebuggerUrl"])  # type: ignore
+        self.ws = websocket.create_connection(  # type: ignore
+            targets[target_id]["webSocketDebuggerUrl"]
+        )
 
     def send_cmd(self, command: Dict[Any, Any]) -> Union[str, bytes]:
         if command.get("id") is None:
@@ -138,6 +158,27 @@ class CRD:
             command["params"]["contextId"] = context_id
         return self.send_cmd(command)
 
+    def set_transparent_bg(self) -> Union[str, bytes]:
+        command: Dict[str, Any] = {
+            "id": self.cmd_id,
+            "method": "Emulation.setDefaultBackgroundColorOverride",
+            "params": {"color": {"r": 0, "g": 0, "b": 0, "a": 0}},
+        }
+        return self.send_cmd(command)
+
+    def screenshot(self, clip: Optional[Dict[str, int]] = None):
+        command: Dict[str, Any] = {
+            "id": self.cmd_id,
+            "method": "Page.captureScreenshot",
+            "params": {},
+        }
+        if clip:
+            command["params"]["clip"] = clip
+        result = self.send_cmd(command)
+        return Image.open(
+            io.BytesIO(base64.b64decode(json.loads(result)["result"]["data"]))
+        )
+
     def get_curr_url(self) -> str:
         r = self.exec_js("window.location.href")
         return cast(
@@ -148,6 +189,26 @@ class CRD:
         command = {"id": self.cmd_id, "method": "Page.navigate", "params": {"url": url}}
         self.send_cmd(command)
 
+    def open_html_str(self, html: str):
+        command: Dict[str, Any] = {
+            "id": self.cmd_id,
+            "method": "Page.navigate",
+            "params": {"url": "about:blank"},
+        }
+        result = cast(str, self.send_cmd(command))
+        frame_id = json.loads(result).get("result", {}).get("frameId", None)
+        if frame_id is None:
+            raise RuntimeError(f"Cannot navigate to about:blank ({result})")
+
+        self.exec_js('document.getElementsByTagName("html")[0].remove()')
+
+        command = {
+            "id": self.cmd_id,
+            "method": "Page.setDocumentContent",
+            "params": {"frameId": frame_id, "html": html},
+        }
+        self.send_cmd(command)
+
     def runtime_enable(self):
         command = {
             "method": "Runtime.enable",
@@ -169,3 +230,5 @@ class CRD:
     def close(self):
         self.ws.close()
         self.chrome_proc.kill()
+        if self.display:
+            self.display.stop()

sticker_convert/utils/files/metadata_handler.py

@@ -17,6 +17,7 @@ RELATED_EXTENSIONS = (
     ".tgs",
     ".lottie",
     ".json",
+    ".svg",
     ".mp4",
     ".mkv",
     ".mov",

sticker_convert/utils/media/codec_info.py

@@ -3,16 +3,22 @@ from __future__ import annotations
 
 import json
 import mmap
+import warnings
 from decimal import ROUND_HALF_UP, Decimal
 from fractions import Fraction
 from io import BytesIO
-from math import gcd
+from math import ceil, gcd
 from pathlib import Path
 from typing import BinaryIO, List, Optional, Tuple, Union, cast
 
+from bs4 import BeautifulSoup, XMLParsedAsHTMLWarning
 from PIL import Image, UnidentifiedImageError
 from rlottie_python.rlottie_wrapper import LottieAnimation
 
+from sticker_convert.definitions import SVG_DEFAULT_HEIGHT, SVG_DEFAULT_WIDTH, SVG_SAMPLE_FPS
+
+warnings.filterwarnings("ignore", category=XMLParsedAsHTMLWarning)
+
 
 def lcm(a: int, b: int):
     return abs(a * b) // gcd(a, b)
@@ -90,11 +96,17 @@ class CodecInfo:
             self.file_ext = CodecInfo.get_file_ext(file)
         else:
             self.file_ext = file_ext
-        self.fps, self.frames, self.duration = CodecInfo.get_file_fps_frames_duration(
-            file
-        )
-        self.codec = CodecInfo.get_file_codec(file)
-        self.res = CodecInfo.get_file_res(file)
+        if self.file_ext == ".svg":
+            self.fps, self.frames, self.duration, self.res = CodecInfo.get_svg_info(
+                file
+            )
+            self.codec = "svg"
+        else:
+            self.fps, self.frames, self.duration = (
+                CodecInfo.get_file_fps_frames_duration(file)
+            )
+            self.codec = CodecInfo.get_file_codec(file)
+            self.res = CodecInfo.get_file_res(file)
         self.is_animated = self.fps > 1
 
     @staticmethod
@@ -435,3 +447,38 @@ class CodecInfo:
         if CodecInfo.get_file_frames(file, check_anim=True) > 1:
             return True
         return False
+
+    @staticmethod
+    def get_svg_info(
+        file: Union[Path, bytes],
+    ) -> Tuple[float, int, int, Tuple[int, int]]:
+        if isinstance(file, Path):
+            with open(file) as f:
+                svg = f.read()
+        else:
+            svg = file.decode()
+
+        soup = BeautifulSoup(svg, "html.parser")
+        svg_tag = soup.find_all("svg")[0]
+        width = int(svg_tag.get("width", SVG_DEFAULT_WIDTH))
+        height = int(svg_tag.get("height", SVG_DEFAULT_HEIGHT))
+
+        animate_elements = [*soup.find_all("animate")] + [
+            *soup.find_all("animateTransform")
+        ]
+        duration = 0
+        for element in animate_elements:
+            dur = cast(str, element.get("dur"))
+            if dur.endswith("s"):
+                duration = int(max(duration, float(dur[:-1]) * 1000))
+            elif dur.endswith("ms"):
+                duration = int(max(duration, float(dur[:-2])))
+
+        if duration != 0:
+            fps = SVG_SAMPLE_FPS
+            frames = ceil(fps * duration / 1000)
+        else:
+            fps = 0
+            frames = 1
+
+        return fps, frames, duration, (width, height)

sticker_convert/utils/url_detect.py

@@ -22,9 +22,7 @@ class UrlDetect:
         ):
             return "line"
 
-        if domain in ("e.kakao.com", "emoticon.kakao.com") or url.startswith(
-            "kakaotalk://store/emoticon/"
-        ):
+        if domain in ("e.kakao.com", "emoticon.kakao.com"):
             return "kakao"
 
         if domain == "stickers.viber.com":

sticker_convert/version.py

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

{sticker_convert-2.11.8.dist-info → sticker_convert-2.12.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sticker-convert
-Version: 2.11.8
+Version: 2.12.0
 Summary: Convert (animated) stickers to/from WhatsApp, Telegram, Signal, Line, Kakao, Viber, Discord, iMessage. Written in Python.
 Author-email: laggykiller <chaudominic2@gmail.com>
 Maintainer-email: laggykiller <chaudominic2@gmail.com>
@@ -374,7 +374,6 @@ Requires-Dist: httpx~=0.28.1
 Requires-Dist: imagequant~=1.1.4
 Requires-Dist: memory-tempfile~=2.2.3
 Requires-Dist: mergedeep~=1.3.4
-Requires-Dist: mini-racer~=0.12.4
 Requires-Dist: numpy>=1.22.4
 Requires-Dist: Pillow~=11.1.0
 Requires-Dist: pyoxipng~=9.0.0
@@ -437,7 +436,7 @@ Dynamic: license-file
 | [Telegram](docs/guide_telegram.md)    | ✅ (Require `token` or telethon)    | ✅ (Require `token` & `user_id` or telethon or manually) |
 | [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)                  |
+| [Kakao](docs/guide_kakao.md)          | ✅ (Need 'auth_token' for animated) | 🚫 (Need to submit for manual approval)                  |
 | [Viber](docs/guide_viber.md)          | ✅                                  | ✅ (Require `viber_auth`)                                |
 | [Discord](docs/guide_discord.md)      | ✅ (Require `token`)                | 🚫                                                       |
 | [iMessage](docs/guide_imessage.md)    | 🚫                                  | ⭕ (Create Xcode stickerpack project for sideload)       |
@@ -462,7 +461,7 @@ Dynamic: license-file
         - For more information: https://github.com/doubleplusc/Line-sticker-downloader
     - Upload: Not supported. You need to manually submit sticker pack for approval before you can use in app.
 - Kakao
-    - Download: Supported (e.g. `https://e.kakao.com/t/xxxxx` OR `kakaotalk://store/emoticon/4404400` OR `https://emoticon.kakao.com/items/xxxxx` OR `4404400`). It is rather complicated, learn more from [docs/guide_kakao.md](docs/guide_kakao.md)
+    - Download: Supported (e.g. `https://e.kakao.com/t/xxxxx`  OR `https://emoticon.kakao.com/items/xxxxx` OR `4404400`). It is rather complicated, learn more from [docs/guide_kakao.md](docs/guide_kakao.md)
     - 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`)
@@ -550,7 +549,7 @@ Input options:
                          OR https://line.me/S/sticker/1234/?lang=en OR line://shop/detail/1234 OR 1234)
   --download-kakao DOWNLOAD_KAKAO
                         Download kakao stickers from a URL / ID as input
-                        (Example: https://e.kakao.com/t/xxxxx OR kakaotalk://store/emoticon/4404400
+                        (Example: https://e.kakao.com/t/xxxxx 
                         OR https://emoticon.kakao.com/items/xxxxx OR 4404400)
   --download-viber DOWNLOAD_VIBER
                         Download viber stickers from a URL as input

{sticker_convert-2.11.8.dist-info → sticker_convert-2.12.0.dist-info}/RECORD

@@ -1,20 +1,20 @@
 sticker_convert/__init__.py,sha256=iQnv6UOOA69c3soAn7ZOnAIubTIQSUxtq1Uhh8xRWvU,102
 sticker_convert/__main__.py,sha256=elDCMvU27letiYs8jPUpxaCq5puURnvcDuqGsAAb6_w,592
 sticker_convert/cli.py,sha256=MWzq9QJJ7HYBD73DmSgRIPo-u58mTGEIoUUpJKNjI0Q,22358
-sticker_convert/converter.py,sha256=aK06RPz5DQb5p-8IvsXqZQrvL6miKt4otX9vcdXBfqc,36784
-sticker_convert/definitions.py,sha256=ZhP2ALCEud-w9ZZD4c3TDG9eHGPZyaAL7zPUsJAbjtE,2073
+sticker_convert/converter.py,sha256=Dnl5nkvSgIvfbcKp0n4ytoW6ZeHim5dNnrhAs3MZXx8,39423
+sticker_convert/definitions.py,sha256=BqROmOvqIqw8ANaqZXIxJAXGD0HgjAvCfFouQ4SaWHc,2254
 sticker_convert/gui.py,sha256=D9L-lFif4P4MANglis_wpjkzlUuGPuq8AybWGyPVP8E,33824
 sticker_convert/job.py,sha256=gEd6yF8WPUR1_7q9SVhnwdD5usrDxwowNnR5q9uS8Yc,28011
 sticker_convert/job_option.py,sha256=NysZtKVVG7EzRkLnVaeYJY0uNlYKFmjoststB1cvVrY,8020
-sticker_convert/version.py,sha256=IGFf6wyoIrB4Ac0ZyUG26XAIcysi37r6vA4pKRslFp0,47
+sticker_convert/version.py,sha256=5PwAcytiNCTA-jXWUYxsOwxsKuNWAlGiQx6_QL36xdI,47
 sticker_convert/downloaders/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sticker_convert/downloaders/download_base.py,sha256=MI5pCT_tkfoaFlrD1oNynDj1Rv1CK0APuNVElTEAEis,5110
 sticker_convert/downloaders/download_discord.py,sha256=6AFpLAYL2hRvVcsqUtzDUC31U66U02ZcnKXDnZRi2jk,3496
-sticker_convert/downloaders/download_kakao.py,sha256=qc2Ldv_zrM6H_o0dVI8Qp8xuakTNuEYPwqFfC7l_ehc,12530
+sticker_convert/downloaders/download_kakao.py,sha256=kcWwyid76Db7QR8MqhHJuYONnIY9zOHRUBcNcae1VYI,12465
 sticker_convert/downloaders/download_line.py,sha256=c-hTzEarGQP0b-pnPl29NuSKcaZWUeRo_94YpJzz72M,17911
 sticker_convert/downloaders/download_signal.py,sha256=3wv-BLd4qggly4AdtwV8f3vUpCVZ-8GnoPLoWngY3Pk,3728
 sticker_convert/downloaders/download_telegram.py,sha256=iGmOcVjU2Ai19t1lyDY2JhQIc--O5XMyNCGXZAA4DVY,2028
-sticker_convert/downloaders/download_viber.py,sha256=SKWyrd2E2QH3aOvMJT2YEVLiCU-jqC-S4hKIrdFvG34,3161
+sticker_convert/downloaders/download_viber.py,sha256=ApHy4sDUOmVwplHfLbso_gyOKn9zccqvRnHENzR_UUM,3790
 sticker_convert/gui_components/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sticker_convert/gui_components/gui_utils.py,sha256=okho2cA1Scem_m6rPiYifreFzpFrM21-yUkiAv64EUI,3431
 sticker_convert/gui_components/frames/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -73,7 +73,7 @@ sticker_convert/resources/appicon.png,sha256=6XBEQz7PnerqS43aRkwpWolFG4WvKMuQ-st
 sticker_convert/resources/compression.json,sha256=hZY906wUmdAuflVhUowm9EW6h40BzuD4LBNe-Mpd9V8,14184
 sticker_convert/resources/emoji.json,sha256=q9DRFdVJfm7feZW7ZM6Xa5P1QsMvrn0PbBVU9jKcJKI,422720
 sticker_convert/resources/help.json,sha256=oI8OIB0aFKgDw4bTKT69zDNshOjf0-bM5el3nbJTzMs,7225
-sticker_convert/resources/input.json,sha256=NUyIpOGPtP_goDi8FwmbJPuCyLYtDDy83vTpzz5lnb0,3895
+sticker_convert/resources/input.json,sha256=BYHYDqMLZuQnA3MF0ViudGpkSuAG8OMS7L-7hxC3K3o,3858
 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=SC_3vtEBJ79R7q0vy_p33eLsGFEyBsSOai0Hy7mLqG8,2208
@@ -82,16 +82,16 @@ sticker_convert/uploaders/compress_wastickers.py,sha256=Rgl3WzIDJn7oa00nNqeBFDqI
 sticker_convert/uploaders/upload_base.py,sha256=uQupPn6r4zrlAzpKzzX7CgvZb69ATyrwPKahWOQj0ds,1203
 sticker_convert/uploaders/upload_signal.py,sha256=k9XS6oU0gYCXEph-LzWvUP3IDINAVaQzzzNgDRp_YNM,7443
 sticker_convert/uploaders/upload_telegram.py,sha256=WlUyLJlW83XZz6RhA76jHMXA6TNUIEVbPwhi14RTnds,12482
-sticker_convert/uploaders/upload_viber.py,sha256=kRvZZCv5WcalOJvz9Mdl2yqi3L5n4joovA39WMWn4qs,6420
+sticker_convert/uploaders/upload_viber.py,sha256=E5gXxPF22TyfSyOEe1uxnbonCMgH8ma3WTm0ecJ3yxE,6444
 sticker_convert/uploaders/xcode_imessage.py,sha256=iTTT8gDYOTNkKqXeSWUBuWfxu7xeE418t2Z1YQFR5L0,11365
 sticker_convert/utils/callback.py,sha256=spYUGlklOs1yPZAxoqwOWgR1sdimpfM8a27if3TaVYk,6155
-sticker_convert/utils/chrome_remotedebug.py,sha256=AuAb-wMHiu7RDZ0YWD-WvIUc2CoR_TLsPVj4cdI2Kuw,5056
+sticker_convert/utils/chrome_remotedebug.py,sha256=jxqH2LktA9UVJW055QeHecVRkc8Hl7KlUcxi_srhDXk,7143
 sticker_convert/utils/emoji.py,sha256=AqB26JY-PkYzNwPLReSnqLiQKe-bR9UXnLclAbgubJ8,367
 sticker_convert/utils/process.py,sha256=EAQZ9WpiKmkvToIv8G1HNY4V7m0jXyyePTmeP2XOZzE,4688
-sticker_convert/utils/url_detect.py,sha256=bgW7tM3_j8zv4uKPPhyyOkYoNdljUdqDkbyBMqAZoEI,947
+sticker_convert/utils/url_detect.py,sha256=vCbhQbcW1X_UtdfQlICGY8pMX34KQ6sCtDJZbp0NrSg,876
 sticker_convert/utils/auth/get_discord_auth.py,sha256=i5SaXU9Ly6Ci_iBYCYIPcQB5FaAehi9DidB4jbKJMVg,4215
-sticker_convert/utils/auth/get_kakao_auth.py,sha256=ipAZ1DUd5CMTpUoxRXHVOFC3DKIpxwxpTYAfrOJ6UZ8,9829
-sticker_convert/utils/auth/get_kakao_desktop_auth.py,sha256=VbEec-yujlLJOBeM55Rm5deu4YE9G9Oi_AKTwOsmUMg,5815
+sticker_convert/utils/auth/get_kakao_auth.py,sha256=Wok5sp0GGBgTwwlfYB7lVq82ndBAOGTcqsWEaWAXFNE,10760
+sticker_convert/utils/auth/get_kakao_desktop_auth.py,sha256=BBfFI08cVOmi6akenQwMI0Uiatmn76wI8QYHnbvopxg,5809
 sticker_convert/utils/auth/get_line_auth.py,sha256=8l8ha2vQmk3rHGvDE7PkcxQXbH3oe62LKbI3qVUtvqc,2196
 sticker_convert/utils/auth/get_signal_auth.py,sha256=oDTcIUcRM8_zfmR6UoBvzBhIscwLRe7n2zw4aw0j8_Q,4564
 sticker_convert/utils/auth/get_viber_auth.py,sha256=mUTrcxq5bTrzSXEVaeTPqVQIdZdwvIhrbMgBUb7dU30,8173
@@ -100,16 +100,16 @@ sticker_convert/utils/auth/telethon_setup.py,sha256=3hH0KglsotFBxT3gwFjHiDuREyah
 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
-sticker_convert/utils/files/metadata_handler.py,sha256=UNCfsbAmN-s4LhMUGlAj-CVCsoDCv4BaP5yQG7R81Jk,10108
+sticker_convert/utils/files/metadata_handler.py,sha256=TUseSpKsFLoqqFf7YFENzkwDYSDKPiMCoEp04ebnVr8,10120
 sticker_convert/utils/files/run_bin.py,sha256=C_KKGtMUTajJnKo4Ia9e6WuWCXSQRdGsVPG-r5GXT_I,1784
 sticker_convert/utils/files/sanitize_filename.py,sha256=HBklPGsHRJjFQUIC5rYTQsUrsuTtezZXIEA8CPhLP8A,2156
 sticker_convert/utils/media/apple_png_normalize.py,sha256=LbrQhc7LlYX4I9ek4XJsZE4l0MygBA1jB-PFiYLEkzk,3657
-sticker_convert/utils/media/codec_info.py,sha256=XoEWBfPWTzr4zSVQIU1XF1yh5viHxH5FytNEpdZR38c,14874
+sticker_convert/utils/media/codec_info.py,sha256=_F_iV3k2GYtb8vYZUSKrWl9E7XEW6LDywbnJ-DM6kbk,16476
 sticker_convert/utils/media/decrypt_kakao.py,sha256=4wq9ZDRnFkx1WmFZnyEogBofiLGsWQM_X69HlA36578,1947
 sticker_convert/utils/media/format_verify.py,sha256=oM32P186tWe9YxvBQRPr8D3FEmBN3b2rEe_2S_MwxyQ,6236
-sticker_convert-2.11.8.dist-info/licenses/LICENSE,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
-sticker_convert-2.11.8.dist-info/METADATA,sha256=D1g7_dZwU7hJRhNyX7MPA4Elw4l0FfkkYxhyH1w2lTU,53594
-sticker_convert-2.11.8.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-sticker_convert-2.11.8.dist-info/entry_points.txt,sha256=MNJ7XyC--ugxi5jS1nzjDLGnxCyLuaGdsVLnJhDHCqs,66
-sticker_convert-2.11.8.dist-info/top_level.txt,sha256=r9vfnB0l1ZnH5pTH5RvkobnK3Ow9m0RsncaOMAtiAtk,16
-sticker_convert-2.11.8.dist-info/RECORD,,
+sticker_convert-2.12.0.dist-info/licenses/LICENSE,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
+sticker_convert-2.12.0.dist-info/METADATA,sha256=KBvqYSm9HFUCkPrFOqZ3RDVKCI6916VpywSKT1JvwsE,53484
+sticker_convert-2.12.0.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+sticker_convert-2.12.0.dist-info/entry_points.txt,sha256=MNJ7XyC--ugxi5jS1nzjDLGnxCyLuaGdsVLnJhDHCqs,66
+sticker_convert-2.12.0.dist-info/top_level.txt,sha256=r9vfnB0l1ZnH5pTH5RvkobnK3Ow9m0RsncaOMAtiAtk,16
+sticker_convert-2.12.0.dist-info/RECORD,,