[FA-misc] Update timeout for Novelpia login to give a greater grace time

Documentation/README.md

@@ -95,9 +95,6 @@ NOVELPIA_USERNAME=your-username
 NOVELPIA_PASSWORD=your-password
 DEEPL_API_KEY=your-api-key
 
-# ExpressVPN (used by the `vpn` container that tunnels novel-service into Korea)
-EXPRESSVPN_ACTIVATION_CODE=your-expressvpn-activation-code
-
 # S3 Storage
 S3_ENDPOINT=https://s3.example.com
 S3_BUCKET=fictionarchive

FictionArchive.API/build_gateway.py

@@ -98,7 +98,6 @@ for svc in selected_services:
     # Export schema
     run([
         "dotnet", "run",
-        "-c", "Release",
         "--no-build",
         "--no-launch-profile",
         "--",

FictionArchive.Service.NovelService.Tests/FictionArchive.Service.NovelService.Tests.csproj

@@ -9,7 +9,7 @@
 
   <ItemGroup>
     <PackageReference Include="FluentAssertions" Version="6.12.0" />
-    <PackageReference Include="MassTransit" Version="8.5.9" />
+    <PackageReference Include="MassTransit" Version="8.5.7" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.11" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
     <PackageReference Include="NodaTime.Testing" Version="3.3.0" />

FictionArchive.Service.NovelService/Program.cs

@@ -74,7 +74,10 @@ public class Program
         {
             client.BaseAddress = new Uri("https://novelpia.com");
         })
-        .AddStandardResilienceHandler();
+        .AddStandardResilienceHandler(opt =>
+        {
+            opt.AttemptTimeout.Timeout = new TimeSpan(0, 1, 0);
+        });
         builder.Services.AddHttpClient<ISourceAdapter, NovelpiaAdapter>(client =>
             {
                 client.BaseAddress = new Uri("https://novelpia.com");

FictionArchive.Service.ReportingService.Tests/FictionArchive.Service.ReportingService.Tests.csproj

@@ -9,7 +9,7 @@
 
   <ItemGroup>
     <PackageReference Include="FluentAssertions" Version="6.12.0" />
-    <PackageReference Include="MassTransit" Version="8.5.9" />
+    <PackageReference Include="MassTransit" Version="8.5.7" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.11" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
     <PackageReference Include="NodaTime.Testing" Version="3.3.0" />

docker-compose.yml

@@ -43,7 +43,7 @@ services:
   # VPN Container
   # ===========================================
   vpn:
-    image: misioslav/expressvpn:latest
+    image: dperson/openvpn-client
     networks:
       fictionarchive:
         ipv4_address: 172.20.0.20
@@ -51,25 +51,23 @@ services:
           - novel-service
     cap_add:
       - NET_ADMIN
-      - SYS_PTRACE
     devices:
       - /dev/net/tun
+    volumes:
+      - /srv/docker_volumes/korean_vpn:/vpn
+    dns:
+      - 192.168.3.1
     environment:
-      CODE: ${EXPRESSVPN_ACTIVATION_CODE}
-      SERVER: krsi
-      PROTOCOL: lightwayudp
-      WHITELIST_DNS: 1.1.1.1,8.8.8.8
-      CONNECTION_CHECK_INTERVAL: 30
-      RECONNECT_FAILURE_THRESHOLD: 3
+      - DNS=1.1.1.1,8.8.8.8
     extra_hosts:
       - "postgres:172.20.0.10"
       - "rabbitmq:172.20.0.11"
     healthcheck:
-      test: ["CMD-SHELL", "test ! -f /tmp/expressvpn/reconnect-failure.flag && expressvpnctl status | grep -q Connected"]
+      test: ["CMD", "ping", "-c", "1", "-W", "5", "1.1.1.1"]
       interval: 30s
       timeout: 10s
       retries: 3
-      start_period: 60s
+      start_period: 30s
     restart: unless-stopped
 
   # ===========================================