1.0.0

sefinek · Mar 8, 2024 · 6ae3a4e · 6ae3a4e
1 parent 4117329
commit 6ae3a4e
Show file tree

Hide file tree

Showing 14 changed files with 50 additions and 79 deletions.
diff --git a/index.js b/index.js
@@ -3,7 +3,7 @@ require('dotenv').config();
 const cluster = require('node:cluster');
 const { availableParallelism } = require('node:os');
 const path = require('node:path');
-const createDir = require('./scripts/functions/createDir.js');
+const createDir = require('./scripts/utils/createDir.js');
 
 if (!process.env.NODE_ENV || !process.env.DOMAIN || !process.env.PORT) {
 	throw new Error('Environment variables are null or undefined');

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sefinek-blocklist-collection",
-  "version": "0.14.0",
+  "version": "1.0.0",
   "description": "The best lists for your DNS server or ad blocker (Pi-hole, AdGuard, etc.). Your first and last reliable source, with no false positives and its own whitelist.",
   "main": "index.js",
   "scripts": {

diff --git a/scripts/create-everything-list.js b/scripts/create-everything-list.js
@@ -7,7 +7,7 @@
 
 const fs = require('fs').promises;
 const path = require('path');
-const date = require('./functions/date.js');
+const date = require('./utils/date.js');
 
 const defaultFolder = path.join(__dirname, '..', 'blocklist', 'template');
 const generatedFolder = path.join(__dirname, '..', 'blocklist', 'generated');

diff --git a/scripts/functions/process.js b/scripts/functions/process.js
@@ -1,8 +1,6 @@
-const path = require('node:path');
-
-module.exports = async (convert, files, relativePath, folderPath) => {
+module.exports = async (convert, allFiles, path, relativePath, folderPath) => {
 	try {
-		const subdirectories = files.filter(file => file.isDirectory());
+		const subdirectories = allFiles.filter(file => file.isDirectory());
 		await Promise.all(subdirectories.map(async subdirectory => {
 			const nextRelativePath = path.join(relativePath, subdirectory.name);
 			await convert(path.join(folderPath, subdirectory.name), nextRelativePath);

diff --git a/scripts/functions/txtFilter.js b/scripts/functions/txtFilter.js
@@ -0,0 +1,18 @@
+module.exports = async (format, path, fs, relativePath, folderPath) => {
+	const generatedPath = path.join(__dirname, `../../blocklist/generated/${format}`, relativePath);
+	try {
+		await fs.access(generatedPath);
+	} catch (err) {
+		await fs.mkdir(generatedPath, { recursive: true });
+	}
+
+	const allFiles = await fs.readdir(folderPath, { withFileTypes: true });
+	const txtFiles = allFiles.filter(file => file.isFile() && file.name.endsWith('.txt'));
+
+	return {
+		format,
+		allFiles,
+		txtFiles,
+		generatedPath,
+	};
+};
diff --git a/scripts/generate/0.0.0.0.js b/scripts/generate/0.0.0.0.js
@@ -1,21 +1,12 @@
 const { promises: fs } = require('node:fs');
 const path = require('node:path');
-const date = require('../functions/date.js');
-const sha256 = require('../functions/sha512.js');
+const date = require('../utils/date.js');
+const sha256 = require('../utils/sha512.js');
+const txtFilter = require('../functions/txtFilter.js');
 const process = require('../functions/process.js');
 
-const format = '0.0.0.0';
-
 const convert = async (folderPath = path.join(__dirname, '../../blocklist/template'), relativePath = '') => {
-	const generatedPath = path.join(__dirname, `../../blocklist/generated/${format}`, relativePath);
-	try {
-		await fs.access(generatedPath);
-	} catch (err) {
-		await fs.mkdir(generatedPath, { recursive: true });
-	}
-
-	const files = await fs.readdir(folderPath, { withFileTypes: true });
-	const txtFiles = files.filter(file => file.isFile() && file.name.endsWith('.txt'));
+	const { format, allFiles, txtFiles, generatedPath } = await txtFilter('0.0.0.0', path, fs, relativePath, folderPath);
 
 	await Promise.all(txtFiles.map(async file => {
 		const thisFileName = path.join(folderPath, file.name);
@@ -39,7 +30,7 @@ const convert = async (folderPath = path.join(__dirname, '../../blocklist/templa
 		console.log(`✔️ ${cacheHash || file.name} ++ ${fullNewFile}`);
 	}));
 
-	await process(convert, files, relativePath, folderPath);
+	await process(convert, allFiles, path, relativePath, folderPath);
 };
 
 const run = async () => {

diff --git a/scripts/generate/127.0.0.1.js b/scripts/generate/127.0.0.1.js
@@ -1,21 +1,12 @@
 const { promises: fs } = require('node:fs');
 const path = require('node:path');
-const date = require('../functions/date.js');
-const sha256 = require('../functions/sha512.js');
+const date = require('../utils/date.js');
+const sha256 = require('../utils/sha512.js');
+const txtFilter = require('../functions/txtFilter.js');
 const process = require('../functions/process.js');
 
-const format = '127.0.0.1';
-
 const convert = async (folderPath = path.join(__dirname, '../../blocklist/template'), relativePath = '') => {
-	const generatedPath = path.join(__dirname, `../../blocklist/generated/${format}`, relativePath);
-	try {
-		await fs.access(generatedPath);
-	} catch (err) {
-		await fs.mkdir(generatedPath, { recursive: true });
-	}
-
-	const files = await fs.readdir(folderPath, { withFileTypes: true });
-	const txtFiles = files.filter(file => file.isFile() && file.name.endsWith('.txt'));
+	const { format, allFiles, txtFiles, generatedPath } = await txtFilter('127.0.0.1', path, fs, relativePath, folderPath);
 
 	await Promise.all(txtFiles.map(async file => {
 		const thisFileName = path.join(folderPath, file.name);
@@ -39,7 +30,7 @@ const convert = async (folderPath = path.join(__dirname, '../../blocklist/templa
 		console.log(`✔️ ${cacheHash || file.name} ++ ${fullNewFile}`);
 	}));
 
-	await process(convert, files, relativePath, folderPath);
+	await process(convert, allFiles, path, relativePath, folderPath);
 };
 
 const run = async () => {

diff --git a/scripts/generate/adguard.js b/scripts/generate/adguard.js
@@ -1,21 +1,12 @@
 const { promises: fs } = require('node:fs');
 const path = require('node:path');
-const date = require('../functions/date.js');
-const sha256 = require('../functions/sha512.js');
+const date = require('../utils/date.js');
+const sha256 = require('../utils/sha512.js');
+const txtFilter = require('../functions/txtFilter.js');
 const process = require('../functions/process.js');
 
-const format = 'adguard';
-
 const convert = async (folderPath = path.join(__dirname, '../../blocklist/template'), relativePath = '') => {
-	const generatedPath = path.join(__dirname, `../../blocklist/generated/${format}`, relativePath);
-	try {
-		await fs.access(generatedPath);
-	} catch (err) {
-		await fs.mkdir(generatedPath, { recursive: true });
-	}
-
-	const files = await fs.readdir(folderPath, { withFileTypes: true });
-	const txtFiles = files.filter(file => file.isFile() && file.name.endsWith('.txt'));
+	const { format, allFiles, txtFiles, generatedPath } = await txtFilter('adguard', path, fs, relativePath, folderPath);
 
 	await Promise.all(txtFiles.map(async file => {
 		const thisFileName = path.join(folderPath, file.name);
@@ -45,7 +36,7 @@ const convert = async (folderPath = path.join(__dirname, '../../blocklist/templa
 		console.log(`✔️ ${cacheHash || file.name} ++ ${fullNewFile}`);
 	}));
 
-	await process(convert, files, relativePath, folderPath);
+	await process(convert, allFiles, path, relativePath, folderPath);
 };
 
 const run = async () => {

diff --git a/scripts/generate/dnsmasq.js b/scripts/generate/dnsmasq.js
@@ -1,21 +1,12 @@
 const { promises: fs } = require('node:fs');
 const path = require('node:path');
-const date = require('../functions/date.js');
-const sha256 = require('../functions/sha512.js');
+const date = require('../utils/date.js');
+const sha256 = require('../utils/sha512.js');
+const txtFilter = require('../functions/txtFilter.js');
 const process = require('../functions/process.js');
 
-const format = 'dnsmasq';
-
 const convert = async (folderPath = path.join(__dirname, '../../blocklist/template'), relativePath = '') => {
-	const generatedPath = path.join(__dirname, `../../blocklist/generated/${format}`, relativePath);
-	try {
-		await fs.access(generatedPath);
-	} catch (err) {
-		await fs.mkdir(generatedPath, { recursive: true });
-	}
-
-	const files = await fs.readdir(folderPath, { withFileTypes: true });
-	const txtFiles = files.filter(file => file.isFile() && file.name.endsWith('.txt'));
+	const { format, allFiles, txtFiles, generatedPath } = await txtFilter('dnsmasq', path, fs, relativePath, folderPath);
 
 	await Promise.all(txtFiles.map(async file => {
 		const thisFileName = path.join(folderPath, file.name);
@@ -46,7 +37,7 @@ const convert = async (folderPath = path.join(__dirname, '../../blocklist/templa
 		console.log(`✔️ ${cacheHash || file.name} ++ ${fullNewFile}`);
 	}));
 
-	await process(convert, files, relativePath, folderPath);
+	await process(convert, allFiles, path, relativePath, folderPath);
 };
 
 const run = async () => {

diff --git a/scripts/generate/noip.js b/scripts/generate/noip.js
@@ -1,21 +1,12 @@
 const { promises: fs } = require('node:fs');
 const path = require('node:path');
-const date = require('../functions/date.js');
-const sha256 = require('../functions/sha512.js');
+const date = require('../utils/date.js');
+const sha256 = require('../utils/sha512.js');
+const txtFilter = require('../functions/txtFilter.js');
 const process = require('../functions/process.js');
 
-const format = 'noip';
-
 const convert = async (folderPath = path.join(__dirname, '../../blocklist/template'), relativePath = '') => {
-	const generatedPath = path.join(__dirname, `../../blocklist/generated/${format}`, relativePath);
-	try {
-		await fs.access(generatedPath);
-	} catch (err) {
-		await fs.mkdir(generatedPath, { recursive: true });
-	}
-
-	const files = await fs.readdir(folderPath, { withFileTypes: true });
-	const txtFiles = files.filter(file => file.isFile() && file.name.endsWith('.txt'));
+	const { format, allFiles, txtFiles, generatedPath } = await txtFilter('noip', path, fs, relativePath, folderPath);
 
 	await Promise.all(txtFiles.map(async file => {
 		const thisFileName = path.join(folderPath, file.name);
@@ -46,7 +37,7 @@ const convert = async (folderPath = path.join(__dirname, '../../blocklist/templa
 		console.log(`✔️ ${cacheHash || file.name} ++ ${fullNewFile}`);
 	}));
 
-	await process(convert, files, relativePath, folderPath);
+	await process(convert, allFiles, path, fs, relativePath, folderPath);
 };
 
 const run = async () => {

diff --git a/scripts/functions/createDir.js → scripts/utils/createDir.js b/scripts/functions/createDir.js → scripts/utils/createDir.js
diff --git a/scripts/functions/date.js → scripts/utils/date.js b/scripts/functions/date.js → scripts/utils/date.js
diff --git a/scripts/functions/sha512.js → scripts/utils/sha512.js b/scripts/functions/sha512.js → scripts/utils/sha512.js