fix: unified hosts (#56)

Author: Ealenn

.github/workflows/cli-tests.yml

@@ -9,20 +9,20 @@ jobs:
     runs-on: ubuntu-latest
     defaults:
       run:
-        working-directory: ./modules/guard-cli
+        working-directory: ./modules/cli
 
     steps:
     - uses: actions/checkout@v4
       with:
-        path: 'modules/guard-cli'
+        path: 'modules/cli'
 
     - uses: actions/setup-node@v4
       with:
         node-version: 22
 
     - name: Install, build, and test
       run: |
-        cd ./modules/guard-cli
+        cd ./modules/cli
         npm ci
         npm run build
       env:

.github/workflows/publish.yml

@@ -21,15 +21,15 @@ jobs:
     - name: Install & Build
       run: |
         mkdir public
-        cd ./modules/guard-cli
+        cd ./modules/cli
         npm ci
         npm run build
       env:
         CI: true
 
     - name: Generate AllowList
       run: |
-        node ./modules/guard-cli/dist/main.js generate \
+        node ./modules/cli/dist/main.js generate \
         --name AdGuard-Home-List.Allow.txt \
         --badge badge-allow.json \
         --external ./allowlist/external \
@@ -40,7 +40,7 @@ jobs:
 
     - name: Generate BlockList
       run: |
-        node ./modules/guard-cli/dist/main.js generate \
+        node ./modules/cli/dist/main.js generate \
         --name AdGuard-Home-List.Block.txt \
         --badge badge-block.json \
         --external ./blocklist/external \

.gitignore

@@ -1,3 +1,7 @@
+# Local
+.env
+.npmrc
+
 ### JetBrains+all ###
 # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
 # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839

README.md

@@ -75,7 +75,6 @@ These lists are downloaded, cleaned and combined during a release.
 - [firebog.net](https://firebog.net)
 - [disconnect.me](https://disconnect.me)
 - [phishing.army](https://phishing.army)
-- [oisd](https://oisd.nl)
 
 #### Community
 
@@ -132,22 +131,20 @@ tls://1.1.1.1
 ## Local
 
 ```sh
-node ./modules/guard-cli/dist/main.js generate \
+node ./modules/cli/dist/main.js generate \
 --name AdGuard-Home-List.Allow.txt \
 --badge badge-allow.json \
 --external ./allowlist/external \
 --custom ./allowlist/custom \
 --concatExternal ./allowlist/concat \
 --convertToAllow \
---debug \
 --output ./dist
 
-node ./modules/guard-cli/dist/main.js generate \
+node ./modules/cli/dist/main.js generate \
 --name AdGuard-Home-List.Block.txt \
 --badge badge-block.json \
 --external ./blocklist/external \
 --custom ./blocklist/custom \
 --concatExternal ./blocklist/concat \
---debug \
 --output ./dist
 ```

allowlist/external/allowlist.external.hosts.list

@@ -1,3 +1,4 @@
 https://raw.githubusercontent.com/anudeepND/whitelist/master/domains/whitelist.txt
 https://raw.githubusercontent.com/kaythomas0/CryptoScamDB-Lists/master/cryptoscamdb-allowlist.txt
 https://raw.githubusercontent.com/Dogino/Discord-Phishing-URLs/main/official-domains.txt
+https://raw.githubusercontent.com/AdguardTeam/AdGuardSDNSFilter/refs/heads/master/Filters/exceptions.txt

blocklist/concat/blocklist.external.adguard.list

@@ -1,4 +1,6 @@
-https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt
+https://adguardteam.github.io/AdguardFilters/BaseFilter/sections/adservers.txt
+https://adguardteam.github.io/AdguardFilters/MobileFilter/sections/adservers.txt
+https://raw.githubusercontent.com/easylist/easylist/master/easylist/easylist_adservers.txt
 https://raw.githubusercontent.com/curbengh/urlhaus-filter/master/urlhaus-filter-agh.txt
 https://raw.githubusercontent.com/Perflyst/PiHoleBlocklist/master/SmartTV-AGH.txt
 https://raw.githubusercontent.com/AdguardTeam/cname-trackers/master/data/combined_disguised_trackers.txt

blocklist/external/blocklist.external.hosts.list

@@ -5,7 +5,7 @@ https://raw.githubusercontent.com/FadeMind/hosts.extras/master/GoodbyeAds-YouTub
 https://raw.githubusercontent.com/FadeMind/hosts.extras/master/add.Dead/hosts
 https://raw.githubusercontent.com/FadeMind/hosts.extras/master/add.Spam/hosts
 https://raw.githubusercontent.com/FadeMind/hosts.extras/master/add.Risk/hosts
-https://raw.githubusercontent.com/StevenBlack/hosts/master/alternates/fakenews-gambling/hosts
+https://raw.githubusercontent.com/StevenBlack/hosts/master/hosts
 https://raw.githubusercontent.com/anudeepND/blacklist/master/adservers.txt
 https://raw.githubusercontent.com/anudeepND/blacklist/master/CoinMiner.txt
 https://winhelp2002.mvps.org/hosts.txt

blocklist/external/blocklist.external.pihole.list

@@ -6,7 +6,6 @@ https://s3.amazonaws.com/lists.disconnect.me/simple_malware.txt
 https://s3.amazonaws.com/lists.disconnect.me/simple_tracking.txt
 https://phishing.army/download/phishing_army_blocklist.txt
 https://raw.githubusercontent.com/Spam404/lists/master/main-blacklist.txt
-https://dbl.oisd.nl/basic
 https://raw.githubusercontent.com/kaythomas0/CryptoScamDB-Lists/master/cryptoscamdb-blocklist.txt
 https://raw.githubusercontent.com/elliotwutingfeng/GlobalAntiScamOrg-blocklist/main/global-anti-scam-org-scam-urls-pihole.txt
 https://raw.githubusercontent.com/Dogino/Discord-Phishing-URLs/main/scam-urls.txt

modules/guard-cli/.prettierrc modules/cli/.prettierrcmodules/guard-cli/.prettierrc renamed to modules/cli/.prettierrc

@@ -1,4 +1,4 @@
 {
   "singleQuote": true,
   "trailingComma": "all"
-}
+}

modules/cli/eslint.config.mjs

@@ -0,0 +1,34 @@
+// @ts-check
+import eslint from '@eslint/js';
+import eslintPluginPrettierRecommended from 'eslint-plugin-prettier/recommended';
+import globals from 'globals';
+import tseslint from 'typescript-eslint';
+
+export default tseslint.config(
+  {
+    ignores: ['eslint.config.mjs'],
+  },
+  eslint.configs.recommended,
+  ...tseslint.configs.recommendedTypeChecked,
+  eslintPluginPrettierRecommended,
+  {
+    languageOptions: {
+      globals: {
+        ...globals.node,
+        ...globals.jest,
+      },
+      sourceType: 'commonjs',
+      parserOptions: {
+        projectService: true,
+        tsconfigRootDir: import.meta.dirname,
+      },
+    },
+  },
+  {
+    rules: {
+      '@typescript-eslint/no-explicit-any': 'off',
+      '@typescript-eslint/no-floating-promises': 'warn',
+      '@typescript-eslint/no-unsafe-argument': 'warn'
+    },
+  },
+);