PyPy

resolved #63

Author: Commandcracker

Diff for: Makefile

@@ -7,7 +7,7 @@ run-client:
 	craftos --id 2828 --exec "shell.run('clear') shell.run('youcube')" --mount-ro /=./client
 
 docker-build:
-	docker build -t youcube:1.0.0 -t youcube:latest server/.
+	docker build -t youcube:latest server/.
 
 illuaminate-lint:
 	illuaminate lint

Diff for: server/Dockerfile

@@ -1,58 +1,58 @@
 # TODO: change from ffmpeg 5.1+ to yt-dlp/FFmpeg
-FROM jrottenberg/ffmpeg:5.1-alpine as ffmpeg
+FROM jrottenberg/ffmpeg:5.1-alpine AS ffmpeg
 
-FROM alpine:latest as sanjuuni
+FROM alpine:3.17.0 as sanjuuni
 
 # TODO: use the same ffmpeg for sanjuuni
-RUN set -x \
-    && apk add --no-cache --update git g++ zlib-dev poco-dev make ffmpeg-dev \
-    && git clone https://github.com/MCJack123/sanjuuni.git
+RUN set -eux; \
+    apk add --no-cache --update g++ zlib-dev poco-dev make ffmpeg-dev; \
+    wget -O sanjuuni.tar.gz https://github.com/MCJack123/sanjuuni/archive/30dcabb4b56f1eb32c88e1bce384b0898367ebda.tar.gz; \
+    echo "029eb0e8853eccc74ea328bb5933678e60e2c56f03f321bf5f982643768b2877 *sanjuuni.tar.gz" | sha256sum -c -; \
+    mkdir -p sanjuuni; \
+    tar -xC sanjuuni --strip-components=1 -f sanjuuni.tar.gz; \
+    rm sanjuuni.tar.gz;
 
 WORKDIR /sanjuuni
 
-RUN set -x \
-    && ./configure \
-    && make
+RUN set -eux; \
+    ./configure; \
+    make
 
-FROM alpine:latest AS builder
+FROM ghcr.io/commandcracker/alpine-pypy3.9-pip:3.17.0-pypy-7.3.10-pip-22.3.1 AS builder
 
 COPY requirements.txt .
 COPY youcube ./youcube
 COPY compile.py .
 
-ENV \
-    # Make sure we use the virtualenv:
-    PATH="/opt/venv/bin:$PATH"
-
-RUN set -x \
-    && apk add --no-cache --update python3 py3-pip gcc libc-dev \
-    # Create virtualenv
-    && python3 -m venv /opt/venv \
-    && pip install --no-cache-dir --upgrade pip \
-    && pip install --no-cache-dir --use-pep517 -r requirements.txt \
-    && python3 compile.py
+RUN set -eux; \
+    apk add --no-cache --update gcc libc-dev libstdc++-dev; \
+    pip install --no-cache-dir --use-pep517 -r requirements.txt; \
+    python3 compile.py; \
+    pip uninstall pip -y
 
-FROM alpine:latest
+FROM alpine:3.17.0 
 
 WORKDIR /opt/server
 
-RUN set -x \
-    && apk add --no-cache --update python3 \
+RUN set -eux; \
+    apk add --no-cache --update \
+    # pypy requirements
+    libffi libbz2 \
     # ffmpeg requirements
     libgcc libstdc++ ca-certificates libcrypto1.1 libssl1.1 libgomp expat \
     # sanjuuni requirements
-    poco \
-    && chown 1000 /opt/server/
+    poco; \
+    chown 1000 /opt/server/
 
-COPY --from=builder /opt/venv /opt/venv
+COPY --from=builder /opt/pypy /opt/pypy
 # add ffmpeg
 COPY --from=ffmpeg /usr/local /usr/local
 # add sanjuuni
 COPY --from=sanjuuni /sanjuuni/sanjuuni /usr/local/bin
 
 ENV \
     # Make sure we use the virtualenv:
-    PATH="/opt/venv/bin:$PATH" \
+    PATH="/opt/pypy/bin:$PATH" \
     # Use ffmpeg libs
     LD_LIBRARY_PATH=/usr/local/lib:/usr/local/lib64 \
     # yt-dlp cache dir

Diff for: server/youcube/youcube.py

@@ -12,7 +12,14 @@
 from json.decoder import JSONDecodeError
 from logging import Logger
 from asyncio import get_event_loop
-from typing import Callable, Union
+from typing import (
+    Callable,
+    Union,
+    Tuple,
+    Type,
+    List,
+    Any
+)
 from base64 import b64encode
 from shutil import which
 
@@ -67,7 +74,7 @@
 # pylint: disable=multiple-statements
 
 
-def get_vid(vid_file: str, tracker: int) -> list[str]:
+def get_vid(vid_file: str, tracker: int) -> List[str]:
     """
     Returns given line of 32vid file
     """
@@ -137,14 +144,14 @@ def get_client_ip(request: Request, trusted_proxies: list) -> str:
 
 def assert_resp(
     __obj_name: str,
-    __obj: object,
+    __obj: Any,
     __class_or_tuple: Union[
-        type, UnionType,
-        tuple[
+        Type, UnionType,
+        Tuple[
             Union[
-                type,
+                Type,
                 UnionType,
-                tuple[object, ...]
+                Tuple[Any, ...]
             ],
             ...
         ]