apply patch from @inedia:ahimsa.chat

Tracking issue at https://github.com/iv-org/invidious/issues/5108

.forgejo/workflows/docker-build-push.yaml

@@ -0,0 +1,68 @@
+name: Build and Push Docker Image
+
+# Define when this workflow will run
+on:
+  push:
+    branches:
+      - master  # Trigger on pushes to master branch
+    tags:
+      - '[0-9]+.[0-9]+.[0-9]+'  # Trigger on semantic version tags
+    paths-ignore:
+      - 'Cargo.lock'
+      - 'LICENSE'
+      - 'README.md'
+      - 'docker-compose.yml'
+  workflow_dispatch:  # Allow manual triggering of the workflow
+
+# Define environment variables used throughout the workflow
+env:
+  REGISTRY: git.nadeko.net
+  IMAGE_NAME: fijxu/inv_sig_helper
+
+jobs:
+  build-and-push:
+    runs-on: runner
+
+    steps:
+      # Step 1: Check out the repository code
+      - name: Checkout code
+        uses: https://github.com/actions/checkout@v3
+
+      # Step 3: Set up Docker Buildx for enhanced build capabilities
+      - name: Set up Docker Buildx
+        uses: https://github.com/docker/setup-buildx-action@v3
+
+      # Step 4: Authenticate with Quay.io registry
+      - name: Login to Docker Container Registry
+        uses: https://github.com/docker/login-action@v3.1.0
+        with:
+          registry: git.nadeko.net
+          username: ${{ secrets.USERNAME }}
+          password: ${{ secrets.TOKEN }}
+
+      # Step 5: Extract metadata for Docker image tagging and labeling
+      - name: Extract metadata for Docker
+        id: meta
+        uses: https://github.com/docker/metadata-action@v4
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          # Define tagging strategy
+          tags: |
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=semver,pattern={{major}}
+            type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'master') }}
+            type=sha,prefix={{branch}}-
+          # Define labels
+          labels: |
+            quay.expires-after=12w
+
+      # Step 6: Build and push the Docker image
+      - name: Build and push Docker image
+        uses: https://github.com/docker/build-push-action@v5
+        with:
+          context: .
+          push: true
+          platforms: linux/amd64
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}

Cargo.lock

@@ -26,6 +26,55 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "anstream"
+version = "0.6.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526"
+dependencies = [
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-query",
+ "anstyle-wincon",
+ "colorchoice",
+ "is_terminal_polyfill",
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle"
+version = "1.0.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
+
+[[package]]
+name = "anstyle-parse"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb"
+dependencies = [
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle-query"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a"
+dependencies = [
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "anstyle-wincon"
+version = "3.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8"
+dependencies = [
+ "anstyle",
+ "windows-sys 0.52.0",
+]
+
 [[package]]
 name = "async-lock"
 version = "2.8.0"
@@ -98,6 +147,12 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
+[[package]]
+name = "colorchoice"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0"
+
 [[package]]
 name = "core-foundation"
 version = "0.9.4"
@@ -138,6 +193,29 @@ dependencies = [
  "cfg-if",
 ]
 
+[[package]]
+name = "env_filter"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab"
+dependencies = [
+ "log",
+ "regex",
+]
+
+[[package]]
+name = "env_logger"
+version = "0.11.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "env_filter",
+ "humantime",
+ "log",
+]
+
 [[package]]
 name = "equivalent"
 version = "1.0.1"
@@ -362,6 +440,12 @@ version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"
 
+[[package]]
+name = "humantime"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
+
 [[package]]
 name = "hyper"
 version = "1.3.1"
@@ -442,8 +526,10 @@ dependencies = [
 name = "inv_sig_helper_rust"
 version = "0.1.0"
 dependencies = [
+ "env_logger",
  "futures",
  "lazy-regex",
+ "log",
  "regex",
  "reqwest",
  "rquickjs",
@@ -458,6 +544,12 @@ version = "2.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
 
+[[package]]
+name = "is_terminal_polyfill"
+version = "1.70.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
+
 [[package]]
 name = "itoa"
 version = "1.0.11"
@@ -526,9 +618,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.21"
+version = "0.4.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
+checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
 
 [[package]]
 name = "memchr"
@@ -1215,6 +1307,12 @@ dependencies = [
  "percent-encoding",
 ]
 
+[[package]]
+name = "utf8parse"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
+
 [[package]]
 name = "vcpkg"
 version = "0.2.15"

Cargo.toml

@@ -14,6 +14,8 @@ lazy-regex = "3.1.0"
 tub = "0.3.7"
 tokio-util = { version = "0.7.10", features=["futures-io", "futures-util", "codec"]}
 futures = "0.3.30"
+log = "0.4.22"
+env_logger = "0.11.5"
 
 # Compilation optimizations for release builds
 # Increases compile time but typically produces a faster and smaller binary. Suitable for final releases but not for debug builds.

README.md

@@ -69,12 +69,10 @@ Or you can run it manually but not recommended since you won't lock down the con
 
 #### Warning
 
-We recommend running sig_helper inside a locked down environment like an LXC container or a systemd service where only the strict necessary is allowed.
-
-No example outside of Docker have been written for this but feel free to send your contribution.
-
 This service runs untrusted code directly from Google.
 
+We recommend running sig_helper inside a locked down environment like an LXC container or a systemd service where only the strict necessary is allowed. An examplary systemd service file is provided in `inv_sig_helper.service` which creates a socket in `/home/invidious/tmp/inv_sig_helper.sock`.
+
 #### Instructions
 
 The service can run in Unix socket mode (default) or TCP mode:
@@ -95,6 +93,18 @@ The service can run in Unix socket mode (default) or TCP mode:
 
    If no IP:PORT is given, it defaults to `127.0.0.1:12999`.
 
+#### Troubleshooting
+
+The log level can be configured using the `RUST_LOG` environment variable. Valid values are:
+
+- error
+- warn
+- info
+- debug
+- trace
+
+The `info` log level is the default setting. Changing this to `debug` will provide detailed logs on each request for additional troubleshooting.
+
 
 ## Protocol Format
 

X7dZ.patch

@@ -0,0 +1,75 @@
+diff --git a/src/player.rs b/src/player.rs
+index 23333b3..a3d79af 100644
+--- a/src/player.rs
++++ b/src/player.rs
+@@ -18,8 +18,10 @@ pub enum FetchUpdateStatus {
+     CannotFetchPlayerJS,
+     NsigRegexCompileFailed,
+     PlayerAlreadyUpdated,
++    SignatureExtractionFailed,
+ }
+ 
++
+ pub async fn fetch_update(state: Arc<GlobalState>) -> Result<(), FetchUpdateStatus> {
+     let global_state = state.clone();
+     let response = match reqwest::get(TEST_YOUTUBE_VIDEO).await {
+@@ -145,33 +147,39 @@ pub async fn fetch_update(state: Arc<GlobalState>) -> Result<(), FetchUpdateStat
+     }
+ 
+     // Extract signature function name
+-    let sig_function_name = REGEX_SIGNATURE_FUNCTION
+-        .captures(&player_javascript)
+-        .unwrap()
+-        .get(1)
+-        .unwrap()
+-        .as_str();
++    let sig_function_name = match REGEX_SIGNATURE_FUNCTION.captures(&player_javascript) {
++	Some(captures) => match captures.get(1) {
++	    Some(m) => m.as_str(),
++	    None => return Err(FetchUpdateStatus::NsigRegexCompileFailed),
++	},
++	None => return Err(FetchUpdateStatus::NsigRegexCompileFailed),
++    };
+ 
+     let mut sig_function_body_regex_str: String = String::new();
+     sig_function_body_regex_str += &sig_function_name.replace("$", "\\$");
+     sig_function_body_regex_str += "=function\\([a-zA-Z0-9_]+\\)\\{.+?\\}";
+ 
+-    let sig_function_body_regex = Regex::new(&sig_function_body_regex_str).unwrap();
++    let sig_function_body_regex = match Regex::new(&sig_function_body_regex_str) {
++	Ok(r) => r,
++	Err(_) => return Err(FetchUpdateStatus::NsigRegexCompileFailed),
++    };
+ 
+-    let sig_function_body = sig_function_body_regex
+-        .captures(&player_javascript)
+-        .unwrap()
+-        .get(0)
+-        .unwrap()
+-        .as_str();
++    let sig_function_body = match sig_function_body_regex.captures(&player_javascript) {
++	Some(captures) => match captures.get(0) {
++	    Some(m) => m.as_str(),
++	    None => return Err(FetchUpdateStatus::NsigRegexCompileFailed),
++	},
++	None => return Err(FetchUpdateStatus::NsigRegexCompileFailed),
++    };
+ 
+-    // Get the helper object
+-    let helper_object_name = REGEX_HELPER_OBJ_NAME
+-        .captures(sig_function_body)
+-        .unwrap()
+-        .get(1)
+-        .unwrap()
+-        .as_str();
++    // Get the helper object 
++    let helper_object_name = match REGEX_HELPER_OBJ_NAME.captures(sig_function_body) {
++	Some(captures) => match captures.get(1) {
++	    Some(m) => m.as_str(),
++	    None => return Err(FetchUpdateStatus::NsigRegexCompileFailed),
++	},
++	None => return Err(FetchUpdateStatus::NsigRegexCompileFailed),
++    };
+ 
+     let mut helper_object_body_regex_str = String::new();
+     helper_object_body_regex_str += "(var ";

docker-compose.yaml

@@ -5,6 +5,7 @@ services:
       context: .
       dockerfile: Dockerfile
     # image: quay.io/invidious/inv-sig-helper:latest
+    init: true
     command: ["--tcp", "127.0.0.1:12999"]
     ports:
       - 127.0.0.1:12999:12999

inv_sig_helper.service

@@ -0,0 +1,80 @@
+[Unit]
+Description=inv_sig_helper (decrypt YouTube signatures and manage player information)
+After=syslog.target
+After=network.target
+
+[Service]
+RestartSec=2s
+Type=simple
+
+User=invidious
+Group=invidious
+
+# allow only the strict necessary since this service runs untrusted code directly from Google
+CapabilityBoundingSet=~CAP_SETUID CAP_SETGID CAP_SETPCAP
+CapabilityBoundingSet=~CAP_SYS_ADMIN
+CapabilityBoundingSet=~CAP_SYS_PTRACE
+CapabilityBoundingSet=~CAP_CHOWN CAP_FSETID CAP_SETFCAP
+CapabilityBoundingSet=~CAP_DAC_OVERRIDE CAP_DAC_READ_SEARCH CAP_FOWNER CAP_IPC_OWNER
+CapabilityBoundingSet=~CAP_NET_ADMIN
+CapabilityBoundingSet=~CAP_SYS_MODULE
+CapabilityBoundingSet=~CAP_SYS_RAWIO
+CapabilityBoundingSet=~CAP_SYS_TIME
+CapabilityBoundingSet=~CAP_AUDIT_CONTROL CAP_AUDIT_READ CAP_AUDIT_WRITE
+CapabilityBoundingSet=~CAP_KILL
+CapabilityBoundingSet=~CAP_NET_BIND_SERVICE CAP_NET_BROADCAST CAP_NET_RAW
+CapabilityBoundingSet=~CAP_SYSLOG
+CapabilityBoundingSet=~CAP_SYS_NICE CAP_SYS_RESOURCE
+CapabilityBoundingSet=~CAP_MAC_ADMIN CAP_MAC_OVERRIDE
+CapabilityBoundingSet=~CAP_SYS_BOOT
+CapabilityBoundingSet=~CAP_LINUX_IMMUTABLE
+CapabilityBoundingSet=~CAP_IPC_LOCK
+CapabilityBoundingSet=~CAP_SYS_CHROOT
+CapabilityBoundingSet=~CAP_BLOCK_SUSPEND
+CapabilityBoundingSet=~CAP_LEASE
+CapabilityBoundingSet=~CAP_SYS_PACCT
+CapabilityBoundingSet=~CAP_SYS_TTY_CONFIG
+CapabilityBoundingSet=~CAP_WAKE_ALARM
+LockPersonality=true
+MemoryDenyWriteExecute=true
+NoNewPrivileges=true
+PrivateDevices=true
+PrivateTmp=true
+PrivateUsers=true
+ProcSubset=pid
+ProtectControlGroups=true
+ProtectHome=tmpfs
+ProtectHostname=true
+ProtectKernelLogs=true
+ProtectKernelModules=true
+ProtectKernelTunables=true
+ProtectProc=invisible
+ProtectSystem=strict
+RemoveIPC=true
+RestrictAddressFamilies=AF_INET AF_INET6 AF_UNIX
+RestrictNamespaces=true
+RestrictSUIDSGID=true
+RestrictRealtime=true
+SystemCallArchitectures=native
+SystemCallFilter=~@clock
+SystemCallFilter=~@debug
+SystemCallFilter=~@module
+SystemCallFilter=~@mount
+SystemCallFilter=~@raw-io
+SystemCallFilter=~@reboot
+SystemCallFilter=~@swap
+SystemCallFilter=~@privileged
+SystemCallFilter=~@resources
+SystemCallFilter=~@cpu-emulation
+SystemCallFilter=~@obsolete
+
+BindReadOnlyPaths=/home/invidious/inv_sig_helper
+BindPaths=/home/invidious/tmp
+
+WorkingDirectory=/home/invidious/inv_sig_helper
+ExecStart=/home/invidious/inv_sig_helper/target/release/inv_sig_helper_rust /home/invidious/tmp/inv_sig_helper.sock
+
+Restart=always
+
+[Install]
+WantedBy=multi-user.target

src/jobs.rs

@@ -1,6 +1,7 @@
 use futures::SinkExt;
 use rquickjs::{async_with, AsyncContext, AsyncRuntime};
 use std::{num::NonZeroUsize, sync::Arc, thread::available_parallelism, time::SystemTime};
+use log::{debug, error};
 use tokio::{runtime::Handle, sync::Mutex, task::block_in_place};
 use tub::Pool;
 
@@ -164,11 +165,11 @@ pub async fn process_decrypt_n_signature<W>(
                 Ok(x) => x,
                 Err(n) => {
                     if n.is_exception() {
-                        println!("JavaScript interpreter error (nsig code): {:?}", ctx.catch().as_exception());
+                        error!("JavaScript interpreter error (nsig code): {:?}", ctx.catch().as_exception());
                     } else {
-                        println!("JavaScript interpreter error (nsig code): {}", n);
+                        error!("JavaScript interpreter error (nsig code): {}", n);
                     }
-                    println!("Code: {}", player_info.nsig_function_code.clone());
+                    debug!("Code: {}", player_info.nsig_function_code.clone());
                     writer = cloned_writer.lock().await;
                     let _ = writer.send(OpcodeResponse {
                         opcode: JobOpcode::DecryptNSignature,
@@ -192,11 +193,11 @@ pub async fn process_decrypt_n_signature<W>(
             Ok(x) => x,
             Err(n) => {
                 if n.is_exception() {
-                    println!("JavaScript interpreter error (nsig code): {:?}", ctx.catch().as_exception());
+                    error!("JavaScript interpreter error (nsig code): {:?}", ctx.catch().as_exception());
                 } else {
-                    println!("JavaScript interpreter error (nsig code): {}", n);
+                    error!("JavaScript interpreter error (nsig code): {}", n);
                 }
-                println!("Code: {}", call_string.clone());
+                debug!("Code: {}", call_string.clone());
                 writer = cloned_writer.lock().await;
                 let _ = writer.send(OpcodeResponse {
                     opcode: JobOpcode::DecryptNSignature,
@@ -243,11 +244,11 @@ pub async fn process_decrypt_signature<W>(
                 Ok(x) => x,
                 Err(n) => {
                     if n.is_exception() {
-                        println!("JavaScript interpreter error (sig code): {:?}", ctx.catch().as_exception());
+                        error!("JavaScript interpreter error (sig code): {:?}", ctx.catch().as_exception());
                     } else {
-                        println!("JavaScript interpreter error (sig code): {}", n);
+                        error!("JavaScript interpreter error (sig code): {}", n);
                     }
-                    println!("Code: {}", player_info.sig_function_code.clone());
+                    debug!("Code: {}", player_info.sig_function_code.clone());
                     writer = cloned_writer.lock().await;
                     let _ = writer.send(OpcodeResponse {
                         opcode: JobOpcode::DecryptSignature,
@@ -274,11 +275,11 @@ pub async fn process_decrypt_signature<W>(
             Ok(x) => x,
             Err(n) => {
                 if n.is_exception() {
-                    println!("JavaScript interpreter error (sig code): {:?}", ctx.catch().as_exception());
+                    error!("JavaScript interpreter error (sig code): {:?}", ctx.catch().as_exception());
                 } else {
-                    println!("JavaScript interpreter error (sig code): {}", n);
+                    error!("JavaScript interpreter error (sig code): {}", n);
                 }
-                println!("Code: {}", call_string.clone());
+                debug!("Code: {}", call_string.clone());
                 writer = cloned_writer.lock().await;
                 let _ = writer.send(OpcodeResponse {
                     opcode: JobOpcode::DecryptSignature,

src/main.rs

@@ -9,6 +9,7 @@ use jobs::{process_decrypt_n_signature, process_fetch_update, GlobalState, JobOp
 use opcode::OpcodeDecoder;
 use player::fetch_update;
 use std::{env::args, sync::Arc};
+use env_logger::Env;
 use tokio::{
     fs::remove_file,
     io::{AsyncReadExt, AsyncWrite},
@@ -16,6 +17,7 @@ use tokio::{
     sync::Mutex,
 };
 use tokio_util::codec::Framed;
+use log::{info, error, debug};
 
 use crate::jobs::{
     process_decrypt_signature, process_get_signature_timestamp, process_player_status,
@@ -24,11 +26,11 @@ use crate::jobs::{
 
 macro_rules! loop_main {
     ($i:ident, $s:ident) => {
-        println!("Fetching player");
+        info!("Fetching player");
         match fetch_update($s.clone()).await {
-            Ok(()) => println!("Successfully fetched player"),
+            Ok(()) => info!("Successfully fetched player"),
             Err(x) => {
-                println!("Error occured while trying to fetch the player: {:?}", x);
+                error!("Error occured while trying to fetch the player: {:?}", x);
             }
         }
         loop {
@@ -43,6 +45,8 @@ macro_rules! loop_main {
 }
 #[tokio::main]
 async fn main() {
+    env_logger::Builder::from_env(Env::default().default_filter_or("info")).init();
+
     let args: Vec<String> = args().collect();
     let socket_url: &str = match args.get(1) {
         Some(stringref) => stringref,
@@ -60,14 +64,14 @@ async fn main() {
         let tcp_socket = match TcpListener::bind(socket_tcp_url).await {
             Ok(x) => x,
             Err(x) => {
-                println!("Error occurred while trying to bind: {}", x);
+                error!("Error occurred while trying to bind: {}", x);
                 return;
             }
         };
         loop_main!(tcp_socket, state);
     } else if socket_url == "--test" {
         // TODO: test the API aswell, this only tests the player script extractor
-        println!("Fetching player");
+        info!("Fetching player");
         match fetch_update(state.clone()).await {
             Ok(()) => std::process::exit(0),
             Err(_x) => std::process::exit(-1),
@@ -80,7 +84,7 @@ async fn main() {
                     remove_file(socket_url).await;
                     UnixListener::bind(socket_url).unwrap()
                 } else {
-                    println!("Error occurred while trying to bind: {}", x);
+                    error!("Error occurred while trying to bind: {}", x);
                     return;
                 }
             }
@@ -102,7 +106,7 @@ where
     while let Some(opcode_res) = stream.next().await {
         match opcode_res {
             Ok(opcode) => {
-                //println!("Received job: {}", opcode.opcode);
+                debug!("Received job: {}", opcode.opcode);
 
                 match opcode.opcode {
                     JobOpcode::ForceUpdate => {
@@ -177,7 +181,7 @@ where
                 }
             }
             Err(x) => {
-                println!("I/O error: {:?}", x);
+                error!("I/O error: {:?}", x);
                 break;
             }
         }

src/opcode.rs

@@ -1,5 +1,5 @@
 use std::io::ErrorKind;
-
+use log::debug;
 use tokio_util::{
     bytes::{Buf, BufMut},
     codec::{Decoder, Encoder},
@@ -52,7 +52,7 @@ impl Decoder for OpcodeDecoder {
         &mut self,
         src: &mut tokio_util::bytes::BytesMut,
     ) -> Result<Option<Self::Item>, Self::Error> {
-        //println!("Decoder length: {}", src.len());
+        debug!("Decoder length: {}", src.len());
         if 5 > src.len() {
             return Ok(None);
         }

src/player.rs

@@ -1,5 +1,5 @@
 use std::{sync::Arc, time::SystemTime};
-
+use log::{debug, error, info, warn};
 use regex::Regex;
 
 use crate::{
@@ -18,14 +18,16 @@ pub enum FetchUpdateStatus {
     CannotFetchPlayerJS,
     NsigRegexCompileFailed,
     PlayerAlreadyUpdated,
+    SignatureExtractionFailed,
 }
 
+
 pub async fn fetch_update(state: Arc<GlobalState>) -> Result<(), FetchUpdateStatus> {
     let global_state = state.clone();
     let response = match reqwest::get(TEST_YOUTUBE_VIDEO).await {
         Ok(req) => req.text().await.unwrap(),
         Err(x) => {
-            println!("Could not fetch the test video: {}", x);
+            error!("Could not fetch the test video: {}", x);
             return Err(FetchUpdateStatus::CannotFetchTestVideo);
         }
     };
@@ -52,11 +54,11 @@ pub async fn fetch_update(state: Arc<GlobalState>) -> Result<(), FetchUpdateStat
         "https://www.youtube.com/s/player/{:08x}/player_ias.vflset/en_US/base.js",
         player_id
     );
-    println!("Fetching player JS URL: {}", player_js_url);
+    info!("Fetching player JS URL: {}", player_js_url);
     let player_javascript = match reqwest::get(player_js_url).await {
         Ok(req) => req.text().await.unwrap(),
         Err(x) => {
-            println!("Could not fetch the player JS: {}", x);
+            error!("Could not fetch the player JS: {}", x);
             return Err(FetchUpdateStatus::CannotFetchPlayerJS);
         }
     };
@@ -67,9 +69,9 @@ pub async fn fetch_update(state: Arc<GlobalState>) -> Result<(), FetchUpdateStat
         let nsig_function_array_regex = Regex::new(&nsig_function_array_str).unwrap();
         nsig_function_array_opt = match nsig_function_array_regex.captures(&player_javascript) {
             None => {
-                println!("nsig function array did not work: {}", nsig_function_array_str);
+                warn!("nsig function array did not work: {}", nsig_function_array_str);
                 if index == NSIG_FUNCTION_ARRAYS.len() {
-                    println!("!!ERROR!! nsig function array unable to be extracted");
+                    error!("!!ERROR!! nsig function array unable to be extracted");
                     return Err(FetchUpdateStatus::NsigRegexCompileFailed);
                 }
                 continue;
@@ -98,7 +100,7 @@ pub async fn fetch_update(state: Arc<GlobalState>) -> Result<(), FetchUpdateStat
     let nsig_array_context = match Regex::new(&nsig_array_context_regex) {
         Ok(x) => x,
         Err(x) => {
-            println!("Error: nsig regex compilation failed: {}", x);
+            error!("Error: nsig regex compilation failed: {}", x);
             return Err(FetchUpdateStatus::NsigRegexCompileFailed);
         }
     };
@@ -128,9 +130,9 @@ pub async fn fetch_update(state: Arc<GlobalState>) -> Result<(), FetchUpdateStat
         let nsig_function_code_regex = Regex::new(&nsig_function_code_regex_str).unwrap();
         nsig_function_code += match nsig_function_code_regex.captures(&player_javascript) {
             None => {
-                println!("nsig function ending did not work: {}", ending);
+                warn!("nsig function ending did not work: {}", ending);
                 if index == NSIG_FUNCTION_ENDINGS.len() {
-                    println!("!!ERROR!! nsig function unable to be extracted");
+                    error!("!!ERROR!! nsig function unable to be extracted");
                     return Err(FetchUpdateStatus::NsigRegexCompileFailed);
                 }
 
@@ -140,38 +142,44 @@ pub async fn fetch_update(state: Arc<GlobalState>) -> Result<(), FetchUpdateStat
                 i.get(1).unwrap().as_str()
             }
         };
-        //println!("got nsig fn code: {}", nsig_function_code);
+        debug!("got nsig fn code: {}", nsig_function_code);
         break;
     }
 
     // Extract signature function name
-    let sig_function_name = REGEX_SIGNATURE_FUNCTION
+    let sig_function_name = match REGEX_SIGNATURE_FUNCTION.captures(&player_javascript) {
-        .captures(&player_javascript)
+	Some(captures) => match captures.get(1) {
-        .unwrap()
+	    Some(m) => m.as_str(),
-        .get(1)
+	    None => return Err(FetchUpdateStatus::NsigRegexCompileFailed),
-        .unwrap()
+	},
-        .as_str();
+	None => return Err(FetchUpdateStatus::NsigRegexCompileFailed),
+    };
 
     let mut sig_function_body_regex_str: String = String::new();
     sig_function_body_regex_str += &sig_function_name.replace("$", "\\$");
     sig_function_body_regex_str += "=function\\([a-zA-Z0-9_]+\\)\\{.+?\\}";
 
-    let sig_function_body_regex = Regex::new(&sig_function_body_regex_str).unwrap();
+    let sig_function_body_regex = match Regex::new(&sig_function_body_regex_str) {
+	Ok(r) => r,
+	Err(_) => return Err(FetchUpdateStatus::NsigRegexCompileFailed),
+    };
 
-    let sig_function_body = sig_function_body_regex
+    let sig_function_body = match sig_function_body_regex.captures(&player_javascript) {
-        .captures(&player_javascript)
+	Some(captures) => match captures.get(0) {
-        .unwrap()
+	    Some(m) => m.as_str(),
-        .get(0)
+	    None => return Err(FetchUpdateStatus::NsigRegexCompileFailed),
-        .unwrap()
+	},
-        .as_str();
+	None => return Err(FetchUpdateStatus::NsigRegexCompileFailed),
+    };
 
     // Get the helper object 
-    let helper_object_name = REGEX_HELPER_OBJ_NAME
+    let helper_object_name = match REGEX_HELPER_OBJ_NAME.captures(sig_function_body) {
-        .captures(sig_function_body)
+	Some(captures) => match captures.get(1) {
-        .unwrap()
+	    Some(m) => m.as_str(),
-        .get(1)
+	    None => return Err(FetchUpdateStatus::NsigRegexCompileFailed),
-        .unwrap()
+	},
-        .as_str();
+	None => return Err(FetchUpdateStatus::NsigRegexCompileFailed),
+    };
 
     let mut helper_object_body_regex_str = String::new();
     helper_object_body_regex_str += "(var ";
@@ -194,7 +202,7 @@ pub async fn fetch_update(state: Arc<GlobalState>) -> Result<(), FetchUpdateStat
     sig_code += helper_object_body;
     sig_code += sig_function_body;
 
-    println!("sig code: {}", sig_code);
+    info!("sig code: {}", sig_code);
 
     // Get signature timestamp
     let signature_timestamp: u64 = REGEX_SIGNATURE_TIMESTAMP