Merge pull request #54 from hlqviet/fix/domain-processing

Fix domain processing

cf_list_create.js

@@ -1,5 +1,5 @@
-import { existsSync } from "fs";
+import { existsSync } from "node:fs";
-import { resolve } from "path";
+import { resolve } from "node:path";
 
 import {
   createZeroTrustListsAtOnce,

download_lists.js

@@ -1,6 +1,6 @@
-import { existsSync } from "fs";
+import { existsSync } from "node:fs";
-import { unlink } from "fs/promises";
+import { unlink } from "node:fs/promises";
-import { resolve } from "path";
+import { resolve } from "node:path";
 
 import {
   LIST_TYPE,

lib/utils.js

@@ -1,7 +1,8 @@
-import { once } from "events";
+import { once } from "node:events";
-import { ReadStream, createReadStream, createWriteStream } from "fs";
+import { createReadStream, createWriteStream } from "node:fs";
-import { basename } from "path";
+import { basename } from "node:path";
-import { createInterface } from "readline";
+import { createInterface } from "node:readline";
+import { pipeline } from "node:stream/promises";
 
 if (!globalThis.fetch) {
   globalThis.fetch = (await import("node-fetch")).default;
@@ -12,7 +13,7 @@ if (!globalThis.fetch) {
  * @param {string} value The value to be checked.
  */
 export const isValidDomain = (value) =>
-  /(?:[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?\.)+[a-z0-9][a-z0-9-]{0,61}[a-z0-9]/.test(
+  /^\b((?=[a-z0-9-]{1,63}\.)(xn--)?[a-z0-9]+(-[a-z0-9]+)*\.)+[a-z]{2,63}\b$/.test(
     value
   );
 
@@ -56,11 +57,8 @@ export const downloadFiles = async (filePath, urls) => {
   for (const response of responses) {
     const writeStream = createWriteStream(filePath, { flags: "a" });
 
-    ReadStream.from(response.body)
+    await pipeline(response.body, writeStream, { end: false });
-      .on("end", () => {
+    writeStream.end("\n");
-        writeStream.write("\n");
-      })
-      .pipe(writeStream);
   }
 };