diff --git a/Dockerfile b/Dockerfile index 2b3b239..0f59097 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,11 +6,12 @@ COPY ./src/ ./src/ RUN crystal build ./src/instances.cr --release FROM alpine:latest -RUN apk add --no-cache gc pcre libgcc +RUN apk add --no-cache gc pcre libgcc yaml WORKDIR /app RUN addgroup -g 1000 -S invidious && \ adduser -u 1000 -S invidious -G invidious COPY ./assets/ ./assets/ +COPY ./config.yml ./config.yml COPY --from=builder /app/instances . EXPOSE 3000 diff --git a/config.yml b/config.yml new file mode 100644 index 0000000..08f2a5e --- /dev/null +++ b/config.yml @@ -0,0 +1,9 @@ +# Uses the system's CURL binary to do so. +fetch_onion_instance_stats: true + +# TOR's Sock proxy address that CURL uses to connect to hidden services +tor_sock_proxy_address: "127.0.0.1" +tor_sock_proxy_port: 9050 + +# Minutes before refreshing the instance stats +minutes_between_refresh: 30 \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 83e664a..57fc7a1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,13 @@ version: '3' services: + tor-socks-proxy: + container_name: tor-socks-proxy + image: peterdavehello/tor-socks-proxy:latest + ports: + - "127.0.0.1:8853:53/udp" + - "127.0.0.1:9150:9150/tcp" + restart: unless-stopped + instances: build: . restart: unless-stopped diff --git a/src/helpers/helpers.cr b/src/helpers/helpers.cr new file mode 100644 index 0000000..f599087 --- /dev/null +++ b/src/helpers/helpers.cr @@ -0,0 +1,6 @@ +require "yaml" + +def load_config + config = YAML.parse(File.read("config.yml")) + return config +end diff --git a/src/instances.cr b/src/instances.cr index c1a85b4..451b910 100644 --- a/src/instances.cr +++ b/src/instances.cr @@ -18,6 +18,10 @@ require "http/client" require "kemal" require "uri" +require "./helpers/*" + +CONFIG = load_config() + Kemal::CLI.new ARGV macro rendered(filename) @@ -68,6 +72,22 @@ spawn do case type = host.split(".")[-1] when "onion" + type = "onion" + + if CONFIG["fetch_onion_instance_stats"]? + begin + args = Process.parse_arguments("--socks5-hostname '#{CONFIG["tor_sock_proxy_address"]}:#{CONFIG["tor_sock_proxy_port"]}' 'http://#{uri.host}/api/v1/stats'") + response = nil + Process.run("curl", args: args) do |result| + data = result.output.read_line + response = JSON.parse(data) + end + + stats = response + rescue ex + stats = nil + end + end when "i2p" else type = uri.scheme.not_nil! @@ -105,7 +125,7 @@ spawn do INSTANCES.clear INSTANCES.merge! instances - sleep 5.minutes + sleep CONFIG["minutes_between_refresh"].as_i.minutes end end