fix: s/docker-compose/docker compose/

Reviewed-on: https://git.batsense.net/mCaptcha/mCaptcha/pulls/107

.env.docker-compose

@@ -13,7 +13,7 @@ MCAPTCHA_redis_URL=redis://mcaptcha_redis
 MCAPTCHA_redis_POOL=4
 
 # server
-PORT=7001
+PORT=7000
 MCAPTCHA_server_DOMAIN=localhost
 MCAPTCHA__server_COOKIE_SECRET=pleasereplacethiswithrandomstring # PLEASE SET RANDOM STRING. MIN LENGTH=32
 MCAPTCHA__server_IP= 0.0.0.0
@@ -26,8 +26,8 @@ MCAPTCHA_captcha_RUNNERS=4
 MCAPTCHA_captcha_QUEUE_LENGTH=2000
 MCAPTCHA_captcha_ENABLE_STATS=true
 MCAPTCHA_captcha_DEFAULT_DIFFICULTY_STRATEGY_avg_traffic_difficulty=50000 # almost instant solution
-MCAPTCHA_captcha_DEFAULT_DIFFICULTY_STRATEGY_broke_my_site_traffic_difficulty=3000000 # roughly 1.5s
-MCAPTCHA_captcha_DEFAULT_DIFFICULTY_STRATEGY_peak_sustainable_traffic_difficulty=5000000  # greater than 3.5s
+MCAPTCHA_captcha_DEFAULT_DIFFICULTY_STRATEGY_peak_sustainable_traffic_difficulty=3000000  # greater than 3.5s
+MCAPTCHA_captcha_DEFAULT_DIFFICULTY_STRATEGY_broke_my_site_traffic_difficulty=5000000 # roughly 1.5s
 MCAPTCHA_captcha_DEFAULT_DIFFICULTY_STRATEGY_duration=30 # cooldown period in seconds
 MCAPTCHA_captcha_DEFAULT_DIFFICULTY_STRATEGY_avg_traffic_time=1 # almost instant solution
 MCAPTCHA_captcha_DEFAULT_DIFFICULTY_STRATEGY_peak_sustainable_traffic_time=3

.github/workflows/linux.yml

@@ -84,7 +84,7 @@ jobs:
 
       - uses: actions/setup-node@v2
         with:
-          node-version: "20.0.0"
+          node-version: "22"
 
       - uses: actions-rust-lang/setup-rust-toolchain@v1
 

.nvmrc

@@ -1 +1 @@
-20
+22

.woodpecker.yaml

@@ -0,0 +1,29 @@
+steps:
+  frontend:
+    image: node:22
+    commands:
+      - make frontend
+    when:
+      - event: [pull_request, push]
+      - branch:
+          include: [woodpecker-pipeline]
+          exclude:
+            - renovate/\*
+    volumes:
+      - /var/lib/woodpercker-cache/mcaptcha/yarn:/root/.cache/yarn
+
+  backend:
+    image: rust:latest
+    when:
+      - event: [pull_request, push]
+      - branch:
+          include: [woodpecker-pipeline]
+          exclude:
+            - renovate/\*
+    commands:
+      - cargo --version
+      - make cache-bust
+      - cargo build --release
+    volumes:
+      - /var/lib/woodpercker-cache/mcaptcha/cargo:/root/.cargo
+      - /var/lib/woodpercker-cache/mcaptcha/target:/woodpecker/src/git.batsense.net/mCaptcha/mCaptcha/target

Cargo.toml

@@ -28,23 +28,23 @@ actix = "0.13"
 actix-identity = "0.4.0"
 actix-http = "3.0.4"
 actix-rt = "2"
-actix-cors = "0.6.1"
+actix-cors = "0.7.0"
 actix-service = "2.0.0"
 async-trait = "0.1.51"
 mime_guess = "2.0.3"
-rust-embed = "6.4.0"
+rust-embed = "8.0.0"
 libcachebust = "0.3.0"
 
 futures = "0.3.15"
 tokio = { version = "1.14", features = ["sync"]}
 
-sqlx = { version = "0.7", features = [ "runtime-tokio-rustls", "postgres", "time", "mysql"] }
+sqlx = { version = "0.8", features = [ "runtime-tokio-rustls", "postgres", "time", "mysql"] }
 argon2-creds = { branch = "master", git = "https://github.com/realaravinth/argon2-creds"}
 #argon2-creds = { version="*", path = "../../argon2-creds/" }
-config = "0.13"
-validator = { version = "0.15", features = ["derive"]}
+config = "0.15"
+validator = { version = "0.20", features = ["derive"]}
 
-derive_builder = "0.11"
+derive_builder = "0.20"
 derive_more = "0.99"
 
 serde = "1"
@@ -53,7 +53,7 @@ serde_json = "1"
 url = "2.2"
 urlencoding =  "2.1.0"
 
-pretty_env_logger = "0.4"
+pretty_env_logger = "0.5"
 log = "0.4"
 
 lazy_static = "1.4"
@@ -69,7 +69,7 @@ mime = "0.3.16"
 
 num_cpus = "1.13.1"
 
-lettre = { version = "0.10.0-rc.3", features = [
+lettre = { version = "0.11.0", features = [
 "builder", 
 "tokio1", 
 "tokio1-native-tls",
@@ -78,7 +78,7 @@ lettre = { version = "0.10.0-rc.3", features = [
 
 openssl = { version = "0.10.48", features = ["vendored"] }
 uuid = { version = "1.4.0", features = ["v4", "serde"] }
-reqwest = { version = "0.11.18", features = ["json", "gzip"] }
+reqwest = { version = "0.12.0", features = ["json", "gzip"] }
 
 
 [dependencies.db-core]
@@ -101,10 +101,10 @@ features = ["actix_identity_backend"]
 
 [build-dependencies]
 serde_json = "1"
-sqlx = { version = "0.7", features = [ "runtime-tokio-rustls", "postgres", "time", "mysql" ] }
+sqlx = { version = "0.8", features = [ "runtime-tokio-rustls", "postgres", "time", "mysql" ] }
 
 [dev-dependencies]
-mcaptcha_pow_sha256 = "0.4"
+mcaptcha_pow_sha256 = "0.5"
 awc = "3.0.0"
 
 

Dockerfile

@@ -1,7 +1,7 @@
 # SPDX-FileCopyrightText: 2023 Aravinth Manivannan <realaravinth@batsense.net>
 #
 # SPDX-License-Identifier: AGPL-3.0-or-later
-FROM node:20 as frontend
+FROM node:22 as frontend
 RUN set -ex; \
     apt-get update; \
     DEBIAN_FRONTEND=noninteractive \
@@ -29,8 +29,12 @@ RUN cargo --version
 RUN make cache-bust
 RUN cargo build --release
 
-FROM debian:bookworm as mCaptcha
+FROM debian:trixie as mCaptcha
 LABEL org.opencontainers.image.source https://github.com/mCaptcha/mCaptcha
+RUN set -ex; \
+    apt-get update; \
+    DEBIAN_FRONTEND=noninteractive \
+    apt-get install -y --no-install-recommends curl
 RUN useradd -ms /bin/bash -u 1001 mcaptcha
 WORKDIR /home/mcaptcha
 COPY --from=rust /src/target/release/mcaptcha /usr/local/bin/

config/default.toml

@@ -34,11 +34,11 @@ enable_stats = true
 
 [captcha.default_difficulty_strategy]
 avg_traffic_difficulty =  50000 # almost instant solution
-#avg_traffic_time =  1 # almost instant solution
+avg_traffic_time =  1 # almost instant solution
 peak_sustainable_traffic_difficulty = 3000000 # roughly 1.5s
-#peak_sustainable_traffic_time = 3
+peak_sustainable_traffic_time = 3
 broke_my_site_traffic_difficulty = 5000000  # greater than 3.5s
-#broke_my_site_traffic_time = 5
+broke_my_site_traffic_time = 5
 duration = 30 # cooldown period in seconds
 
 [database]

db/db-core/Cargo.toml

@@ -10,7 +10,7 @@ authors = ["realaravinth <realaravinth@batsense.net>"]
 
 [dependencies] 
 async-trait = "0.1.51"
-thiserror = "1.0.30"
+thiserror = "2.0.0"
 serde = { version = "1", features = ["derive"]}
 url = { version  = "2.2.2", features = ["serde"] }
 libmcaptcha = "0.2.4"

db/db-migrations/Cargo.toml

@@ -10,4 +10,4 @@ authors = ["realaravinth <realaravinth@batsense.net>"]
 
 [dependencies]
 actix-rt = "2"
-sqlx = { version = "0.7", features = [ "runtime-tokio-rustls", "postgres", "time", "mysql" ] }
+sqlx = { version = "0.8", features = [ "runtime-tokio-rustls", "postgres", "time", "mysql" ] }

db/db-migrations/src/main.rs

@@ -8,7 +8,6 @@ use std::env;
 use sqlx::postgres::PgPoolOptions;
 use sqlx::mysql::MySqlPoolOptions;
 
-#[cfg(not(tarpaulin_include))]
 #[actix_rt::main]
 async fn main() {
     //TODO featuregate sqlite and postgres

db/db-sqlx-maria/Cargo.toml

@@ -12,11 +12,11 @@ authors = ["realaravinth <realaravinth@batsense.net>"]
 async-trait = "0.1.51"
 db-core = {path = "../db-core"}
 futures = "0.3.15"
-sqlx = { version = "0.7", features = [ "runtime-tokio-rustls", "mysql", "time"] }
+sqlx = { version = "0.8", features = [ "runtime-tokio-rustls", "mysql", "time"] }
 uuid = { version = "1.4.0", features = ["v4", "serde"] }
 
 [dev-dependencies]
 actix-rt = "2"
-sqlx = { version = "0.7", features = [ "runtime-tokio-rustls", "mysql", "time" ] }
+sqlx = { version = "0.8", features = [ "runtime-tokio-rustls", "mysql", "time" ] }
 db-core = {path = "../db-core", features = ["test"]}
 url = { version  = "2.2.2", features = ["serde"] }

db/db-sqlx-postgres/Cargo.toml

@@ -12,11 +12,11 @@ authors = ["realaravinth <realaravinth@batsense.net>"]
 async-trait = "0.1.51"
 db-core = {path = "../db-core"}
 futures = "0.3.15"
-sqlx = { version = "0.7", features = [ "runtime-tokio-rustls", "postgres", "time" ] }
+sqlx = { version = "0.8", features = [ "runtime-tokio-rustls", "postgres", "time" ] }
 uuid = { version = "1.4.0", features = ["v4", "serde"] }
 
 [dev-dependencies]
 actix-rt = "2"
-sqlx = { version = "0.7", features = [ "runtime-tokio-rustls", "postgres", "time"] }
+sqlx = { version = "0.8", features = [ "runtime-tokio-rustls", "postgres", "time"] }
 db-core = {path = "../db-core", features = ["test"]}
 url = { version  = "2.2.2", features = ["serde"] }

docker-compose.yml

@@ -16,7 +16,7 @@ services:
       - mcaptcha_redis
 
   mcaptcha_postgres:
-    image: postgres:13.2
+    image: postgres:18.0
     volumes:
       - mcaptcha-data:/var/lib/postgresql/
     environment:

docs/openapi/package.json

@@ -17,6 +17,6 @@
   },
   "homepage": "https://github.com/mCaptcha/mCaptcha#readme",
   "devDependencies": {
-    "@redocly/cli": "^1.4.0"
+    "@redocly/cli": "^2.0.0"
   }
 }

eslint.config.js

@@ -0,0 +1,46 @@
+const {
+  defineConfig,
+} = require("eslint/config");
+
+const globals = require("globals");
+const tsParser = require("@typescript-eslint/parser");
+const typescriptEslint = require("@typescript-eslint/eslint-plugin");
+const js = require("@eslint/js");
+
+const {
+  FlatCompat,
+} = require("@eslint/eslintrc");
+
+const compat = new FlatCompat({
+  baseDirectory: __dirname,
+  recommendedConfig: js.configs.recommended,
+  allConfig: js.configs.all
+});
+
+module.exports = defineConfig([{
+  languageOptions: {
+    globals: {
+      ...globals.browser,
+    },
+
+    parser: tsParser,
+    ecmaVersion: 12,
+    sourceType: "module",
+    parserOptions: {},
+  },
+
+  extends: compat.extends("eslint:recommended", "plugin:@typescript-eslint/recommended"),
+
+  plugins: {
+    "@typescript-eslint": typescriptEslint,
+  },
+
+  rules: {
+    "@typescript-eslint/no-explicit-any": "off",
+    "@typescript-eslint/ban-types": "off",
+    indent: ["error", 2],
+    "linebreak-style": ["error", "unix"],
+    quotes: ["error", "double"],
+    semi: ["error", "always"],
+  },
+}]);

package.json

@@ -2,7 +2,7 @@
   "name": "vanilla",
   "main": "index.js",
   "version": "1.0.0",
-  "license": "AGPL-3.0",
+  "license": "AGPL-3.0-or-later",
   "scripts": {
     "build": "webpack --mode production",
     "lint": "yarn run eslint templates",
@@ -10,35 +10,38 @@
     "test": "jest"
   },
   "devDependencies": {
-    "@types/jest": "^29.5.6",
-    "@types/jsdom": "^21.1.4",
-    "@types/node": "^20.8.9",
-    "@types/sinon": "^10.0.20",
-    "@typescript-eslint/eslint-plugin": "^6.9.0",
-    "@typescript-eslint/parser": "^6.9.0",
+    "@eslint/eslintrc": "^3.3.1",
+    "@eslint/js": "^9.36.0",
+    "@types/jest": "^30.0.0",
+    "@types/jsdom": "^27.0.0",
+    "@types/node": "^22.0.0",
+    "@types/sinon": "^17.0.0",
+    "@typescript-eslint/eslint-plugin": "^8.0.0",
+    "@typescript-eslint/parser": "^8.0.0",
     "@wasm-tool/wasm-pack-plugin": "^1.7.0",
-    "css-loader": "^6.8.1",
-    "css-minimizer-webpack-plugin": "^5.0.1",
-    "eslint": "^8.52.0",
-    "jest": "^29.7.0",
-    "jest-environment-jsdom": "^29.7.0",
+    "css-loader": "^7.0.0",
+    "css-minimizer-webpack-plugin": "^7.0.0",
+    "eslint": "^9.0.0",
+    "globals": "^16.4.0",
+    "jest": "^30.0.0",
+    "jest-environment-jsdom": "^30.0.0",
     "jest-fetch-mock": "^3.0.3",
-    "jsdom": "^22.1.0",
+    "jsdom": "^27.0.0",
     "mini-css-extract-plugin": "^2.7.6",
     "sass": "^1.69.5",
-    "sass-loader": "^13.3.2",
-    "sinon": "^17.0.0",
+    "sass-loader": "^16.0.0",
+    "sinon": "^21.0.0",
     "ts-jest": "^29.1.1",
     "ts-loader": "^9.5.0",
     "ts-node": "^10.9.1",
     "typescript": "^5.2.2",
     "webpack": "^5.89.0",
-    "webpack-cli": "^5.1.4",
-    "webpack-dev-server": "^4.15.1"
+    "webpack-cli": "^6.0.0",
+    "webpack-dev-server": "^5.0.0"
   },
   "dependencies": {
     "@mcaptcha/pow_sha256-polyfill": "^0.1.0-rc2",
-    "@mcaptcha/vanilla-glue": "^0.1.0-rc1",
-    "@mcaptcha/pow-wasm": "^0.1.0-rc2"
+    "@mcaptcha/pow-wasm": "^0.1.0-rc2",
+    "@mcaptcha/vanilla-glue": "^0.1.0-rc1"
   }
 }

renovate.json

@@ -0,0 +1,21 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:recommended",
+    ":dependencyDashboard"
+  ],
+  "labels": [
+    "renovate-bot"
+  ],
+  "prHourlyLimit": 0,
+  "timezone": "Asia/kolkata",
+  "prCreation": "immediate",
+  "vulnerabilityAlerts": {
+    "enabled": true,
+    "labels": [
+      "renovate-bot",
+      "renovate-security",
+      "security"
+    ]
+  }
+}

scripts/integration.sh

@@ -22,8 +22,8 @@ is_ci(){
 
 
 
-docker-compose down -v --remove-orphans || true
-docker-compose up -d
+docker compose down -v --remove-orphans || true
+docker compose up -d
 cd $(mktemp -d)
 pwd
 find 
@@ -40,4 +40,4 @@ else
 fi
 
 cd $PROJECT_ROOT
-docker-compose down -v --remove-orphans || true
+docker compose down -v --remove-orphans || true

src/data.rs

@@ -188,7 +188,6 @@ impl Data {
             .build()
             .unwrap()
     }
-    #[cfg(not(tarpaulin_include))]
     /// create new instance of app data
     pub async fn new(s: &Settings, survey_secrets: SecretsStore) -> Arc<Self> {
         let creds = Self::get_creds();

src/easy.rs

@@ -55,6 +55,9 @@ impl UpdateEasyCaptcha {
             }
 
             let mut patterns = data.db.get_all_easy_captchas(limit, offset).await?;
+            if patterns.is_empty() {
+                break;
+            }
             for pattern in patterns.drain(0..) {
                 if !Self::can_run(rx) {
                     return Ok(());
@@ -85,6 +88,7 @@ impl UpdateEasyCaptcha {
             }
             page += 1;
         }
+        Ok(())
     }
 
     fn can_run(rx: &mut Receiver<()>) -> bool {

src/errors.rs

@@ -40,7 +40,6 @@ impl std::cmp::PartialEq for SmtpErrorWrapper {
 }
 
 #[derive(Debug, Display, PartialEq, Error)]
-#[cfg(not(tarpaulin_include))]
 pub enum ServiceError {
     #[display(fmt = "internal server error")]
     InternalServerError,
@@ -114,14 +113,11 @@ pub enum ServiceError {
 }
 
 #[derive(Serialize, Deserialize)]
-#[cfg(not(tarpaulin_include))]
 pub struct ErrorToResponse {
     pub error: String,
 }
 
-#[cfg(not(tarpaulin_include))]
 impl ResponseError for ServiceError {
-    #[cfg(not(tarpaulin_include))]
     fn error_response(&self) -> HttpResponse {
         HttpResponseBuilder::new(self.status_code())
             .append_header((header::CONTENT_TYPE, "application/json; charset=UTF-8"))
@@ -133,7 +129,6 @@ impl ResponseError for ServiceError {
             )
     }
 
-    #[cfg(not(tarpaulin_include))]
     fn status_code(&self) -> StatusCode {
         match self {
             ServiceError::ClosedForRegistration => StatusCode::FORBIDDEN,
@@ -177,7 +172,6 @@ impl ResponseError for ServiceError {
 }
 
 impl From<CredsError> for ServiceError {
-    #[cfg(not(tarpaulin_include))]
     fn from(e: CredsError) -> ServiceError {
         match e {
             CredsError::UsernameCaseMappedError => ServiceError::UsernameCaseMappedError,
@@ -192,7 +186,6 @@ impl From<CredsError> for ServiceError {
 }
 
 impl From<DBError> for ServiceError {
-    #[cfg(not(tarpaulin_include))]
     fn from(e: DBError) -> ServiceError {
         println!("from conversin: {}", e);
         match e {
@@ -208,57 +201,46 @@ impl From<DBError> for ServiceError {
 }
 
 impl From<ValidationErrors> for ServiceError {
-    #[cfg(not(tarpaulin_include))]
     fn from(_: ValidationErrors) -> ServiceError {
         ServiceError::NotAnEmail
     }
 }
 
 impl From<ParseError> for ServiceError {
-    #[cfg(not(tarpaulin_include))]
     fn from(_: ParseError) -> ServiceError {
         ServiceError::NotAUrl
     }
 }
 
-#[cfg(not(tarpaulin_include))]
 impl From<CaptchaError> for ServiceError {
     fn from(e: CaptchaError) -> ServiceError {
         ServiceError::CaptchaError(e)
     }
 }
 
-#[cfg(not(tarpaulin_include))]
 impl From<SmtpError> for ServiceError {
-    #[cfg(not(tarpaulin_include))]
     fn from(e: SmtpError) -> Self {
         ServiceError::UnableToSendEmail(SmtpErrorWrapper(e))
     }
 }
 
-#[cfg(not(tarpaulin_include))]
 impl From<RecvError> for ServiceError {
-    #[cfg(not(tarpaulin_include))]
     fn from(e: RecvError) -> Self {
         log::error!("{:?}", e);
         ServiceError::InternalServerError
     }
 }
 
-#[cfg(not(tarpaulin_include))]
 impl From<MailboxError> for ServiceError {
-    #[cfg(not(tarpaulin_include))]
     fn from(e: MailboxError) -> Self {
         log::error!("{:?}", e);
         ServiceError::InternalServerError
     }
 }
 
-#[cfg(not(tarpaulin_include))]
 pub type ServiceResult<V> = std::result::Result<V, ServiceError>;
 
 #[derive(Debug, Display, PartialEq, Error)]
-#[cfg(not(tarpaulin_include))]
 pub enum PageError {
     #[display(fmt = "Something weng wrong: Internal server error")]
     InternalServerError,
@@ -267,17 +249,13 @@ pub enum PageError {
     ServiceError(ServiceError),
 }
 
-#[cfg(not(tarpaulin_include))]
 impl From<ServiceError> for PageError {
-    #[cfg(not(tarpaulin_include))]
     fn from(e: ServiceError) -> Self {
         PageError::ServiceError(e)
     }
 }
 
-#[cfg(not(tarpaulin_include))]
 impl From<DBError> for PageError {
-    #[cfg(not(tarpaulin_include))]
     fn from(e: DBError) -> Self {
         let se: ServiceError = e.into();
         se.into()
@@ -297,7 +275,6 @@ impl ResponseError for PageError {
         }
     }
 
-    #[cfg(not(tarpaulin_include))]
     fn status_code(&self) -> StatusCode {
         match self {
             PageError::InternalServerError => StatusCode::INTERNAL_SERVER_ERROR,
@@ -306,7 +283,6 @@ impl ResponseError for PageError {
     }
 }
 
-#[cfg(not(tarpaulin_include))]
 pub type PageResult<V> = std::result::Result<V, PageError>;
 
 #[cfg(test)]

src/main.rs

@@ -92,7 +92,6 @@ pub const CACHE_AGE: u32 = 604800;
 pub type ArcData = Arc<crate::data::Data>;
 pub type AppData = actix_web::web::Data<ArcData>;
 
-#[cfg(not(tarpaulin_include))]
 #[actix_web::main]
 async fn main() -> std::io::Result<()> {
     use std::time::Duration;
@@ -185,7 +184,6 @@ async fn main() -> std::io::Result<()> {
     Ok(())
 }
 
-#[cfg(not(tarpaulin_include))]
 pub fn get_json_err() -> JsonConfig {
     JsonConfig::default().error_handler(|err, _| {
         //debug!("JSON deserialization error: {:?}", &err);
@@ -193,7 +191,6 @@ pub fn get_json_err() -> JsonConfig {
     })
 }
 
-#[cfg(not(tarpaulin_include))]
 pub fn get_identity_service(
     settings: &Settings,
 ) -> IdentityService<CookieIdentityPolicy> {

src/pages/mod.rs

@@ -25,7 +25,6 @@ pub fn get_middleware() -> Authentication<routes::Routes> {
     Authentication::with_identity(routes::ROUTES)
 }
 
-#[cfg(not(tarpaulin_include))]
 #[cfg(test)]
 mod tests {
     use actix_web::http::StatusCode;

src/settings.rs

@@ -56,7 +56,6 @@ pub struct Smtp {
 }
 
 impl Server {
-    #[cfg(not(tarpaulin_include))]
     pub fn get_ip(&self) -> String {
         format!("{}:{}", self.ip, self.port)
     }
@@ -205,7 +204,6 @@ const DEPRECATED_ENV_VARS: [(&str, &str); 23] = [
     ("smtp.port", "MCAPTCHA_SMTP_PORT"),
 ];
 
-#[cfg(not(tarpaulin_include))]
 impl Settings {
     pub fn new() -> Result<Self, ConfigError> {
         let mut s = Config::builder();

templates/components/error/error.test.ts

@@ -2,13 +2,13 @@
 // SPDX-FileCopyrightText: 2023 Aravinth Manivannan <realaravinth@batsense.net>
 //
 // SPDX-License-Identifier: AGPL-3.0-or-later
+"use strict";
 
 import createError from "./index";
 import * as e from "./index";
 
 import setup from "./setUpTests";
 
-"use strict";
 
 jest.useFakeTimers();
 

templates/router.test.ts

@@ -2,10 +2,10 @@
 // SPDX-FileCopyrightText: 2023 Aravinth Manivannan <realaravinth@batsense.net>
 //
 // SPDX-License-Identifier: AGPL-3.0-or-later
+"use strict";
 
 import {Router} from "./router";
 
-"use strict";
 
 const result = {
   result: "",

templates/utils/genJsonPayload.test.ts

@@ -2,10 +2,10 @@
 // SPDX-FileCopyrightText: 2023 Aravinth Manivannan <realaravinth@batsense.net>
 //
 // SPDX-License-Identifier: AGPL-3.0-or-later
+"use strict";
 
 import genJsonPayload from "./genJsonPayload";
 
-"use strict";
 
 const payload = {
   username: "Jhon",

templates/utils/getFormUrl.test.ts

@@ -2,12 +2,11 @@
 // SPDX-FileCopyrightText: 2023 Aravinth Manivannan <realaravinth@batsense.net>
 //
 // SPDX-License-Identifier: AGPL-3.0-or-later
+"use strict";
 
 import getFormUrl from "./getFormUrl";
 import {getLoginFormHtml} from "../setUpTests";
 
-"use strict";
-
 const formClassName = "form__box";
 const formURL = "/api/v1/signin";
 

templates/utils/isBlankString.test.ts

@@ -2,6 +2,7 @@
 // SPDX-FileCopyrightText: 2023 Aravinth Manivannan <realaravinth@batsense.net>
 //
 // SPDX-License-Identifier: AGPL-3.0-or-later
+"use strict";
 
 import isBlankString from "./isBlankString";
 import {mockAlert} from "../setUpTests";
@@ -9,7 +10,6 @@ import {mockAlert} from "../setUpTests";
 
 import setup from "../components/error/setUpTests";
 
-"use strict";
 
 mockAlert();
 

templates/utils/isNumber.test.ts

@@ -2,11 +2,10 @@
 // SPDX-FileCopyrightText: 2023 Aravinth Manivannan <realaravinth@batsense.net>
 //
 // SPDX-License-Identifier: AGPL-3.0-or-later
+"use strict";
 
 import isNumber from "./isNumber";
 
-"use strict";
-
 it("getFromUrl workds", () => {
   expect(isNumber("test")).toBe(false);
   expect(isNumber("1test213")).toBe(false);

templates/widget/index.html

@@ -21,7 +21,7 @@ SPDX-License-Identifier: MIT OR Apache-2.0
         <label class="widget__verification-container" for="widget__verification-checkbox">
           <span id="widget__verification-text"
             >I'm not a robot</span>
-          <input 
+          <input disabled
               id="widget__verification-checkbox"
               aria-valuenow="I'm not a robot"
                 aria-checked="false"

templates/widget/index.ts

@@ -3,7 +3,7 @@
 //
 // SPDX-License-Identifier: MIT OR Apache-2.0
 
-import { Work, ServiceWorkerMessage } from "./types";
+import {Work, ServiceWorkerMessage} from "./types";
 import fetchPoWConfig from "./fetchPoWConfig";
 import sendWork from "./sendWork";
 import sendToParent from "./sendToParent";
@@ -12,7 +12,17 @@ import * as CONST from "./const";
 import "./main.scss";
 
 let LOCK = false;
-const worker = new Worker("/bench.js");
+
+const workerPromise = new Promise<Worker>((res) => {
+  const worker = new Worker("/bench.js");
+  worker.onmessage = (event: MessageEvent) => {
+    const message: ServiceWorkerMessage = event.data;
+    if(message.type === "ready") {
+      console.log("worker ready");
+      res(worker);
+    }
+  };
+});
 
 /** add  mcaptcha widget element to DOM */
 export const registerVerificationEventHandler = (): void => {
@@ -20,10 +30,14 @@ export const registerVerificationEventHandler = (): void => {
     document.querySelector(".widget__verification-container")
   );
   verificationContainer.style.display = "flex";
-  CONST.btn().addEventListener("click", (e) => solveCaptchaRunner(e));
+  workerPromise.then((worker: Worker) => {
+    const btn = CONST.btn();
+    btn.disabled = false;
+    btn.addEventListener("click", (e) => solveCaptchaRunner(worker, e));
+  });
 };
 
-export const solveCaptchaRunner = async (e: Event): Promise<void> => {
+export const solveCaptchaRunner = async (worker: Worker, e: Event): Promise<void> => {
   const PROGRESS_FILL = <HTMLElement>document.querySelector(".progress__fill");
 
   const setWidth = (width: number) => {
@@ -94,7 +108,7 @@ export const solveCaptchaRunner = async (e: Event): Promise<void> => {
       }
       if (resp.type === "progress") {
         if (width < 80) {
-          width = Number(resp.nonce / max_recorded_nonce) * 100;
+          width = resp.nonce / max_recorded_nonce * 100;
           setWidth(width);
         }
         console.log(`received nonce ${resp.nonce}`);

templates/widget/prove.ts

@@ -30,7 +30,7 @@ const prove = async (
       config.string,
       config.difficulty_factor,
       STEPS,
-      progress
+      (nonce: bigint | number) => progress(Number(nonce))
     );
     const t1 = performance.now();
     time = t1 - t0;

templates/widget/service-worker.ts

@@ -9,6 +9,12 @@ import prove from "./prove";
 import { PoWConfig, ServiceWorkerMessage, ServiceWorkerWork } from "./types";
 
 log.log("worker registered");
+
+const ready: ServiceWorkerMessage = {
+  type: "ready",
+};
+postMessage(ready);
+
 onmessage = async (e) => {
   console.debug("message received at worker");
   const config: PoWConfig = e.data;

templates/widget/types.ts

@@ -40,5 +40,6 @@ export type Token = {
 };
 
 export type ServiceWorkerMessage =
+  | { type: "ready" }
   | { type: "work"; value: ServiceWorkerWork }
   | { type: "progress"; nonce: number };

utils/cache-bust/Cargo.lock

@@ -1,6 +1,6 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "block-buffer"
@@ -177,6 +177,12 @@ dependencies = [
  "walkdir",
 ]
 
+[[package]]
+name = "memchr"
+version = "2.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+
 [[package]]
 name = "mime"
 version = "0.3.17"
@@ -195,18 +201,18 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc"
 dependencies = [
  "proc-macro2",
 ]
@@ -228,33 +234,45 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.189"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e422a44e74ad4001bdc8eede9a4570ab52f71190e9c076d14369f38b9200537"
+checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
+dependencies = [
+ "serde_core",
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_core"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.189"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e48d1f918009ce3145511378cf68d613e3b3d9137d67272562080d68a2b32d5"
+checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.93",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.107"
+version = "1.0.145"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65"
+checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c"
 dependencies = [
  "itoa",
+ "memchr",
  "ryu",
  "serde",
+ "serde_core",
 ]
 
 [[package]]
@@ -287,9 +305,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.38"
+version = "2.0.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+checksum = "9c786062daee0d6db1132800e623df74274a0a87322d8e183338e01b3d98d058"
 dependencies = [
  "proc-macro2",
  "quote",