From 8ec28f62601d17c5dc7a61e555a2a011bb2954d9 Mon Sep 17 00:00:00 2001
From: SukkaW <isukkaw@gmail.com>
Date: Mon, 18 Aug 2025 00:34:28 +0800
Subject: [PATCH] Fix: pound sign handling

---
 Build/build-cdn-download-conf.ts |  2 --
 Build/lib/process-line.ts        |  6 ------
 Build/lib/rules/base.ts          | 16 ++++++++++++++--
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/Build/build-cdn-download-conf.ts b/Build/build-cdn-download-conf.ts
index e8b8f9e0..eb792ce0 100644
--- a/Build/build-cdn-download-conf.ts
+++ b/Build/build-cdn-download-conf.ts
@@ -88,8 +88,6 @@ export const buildCdnDownloadConf = task(require.main === module, __filename)(as
     steamDomainSetPromise
   ]);
 
-  console.log(JSON.stringify(cdnDomainsList, null, 2));
-
   // Move S3 domains to download domain set, since S3 files may be large
   appendArrayInPlace(downloadDomainSet, S3OSSDomains);
   appendArrayInPlace(downloadDomainSet, steamDomainSet);
diff --git a/Build/lib/process-line.ts b/Build/lib/process-line.ts
index 952d2bcb..92d72920 100644
--- a/Build/lib/process-line.ts
+++ b/Build/lib/process-line.ts
@@ -37,12 +37,6 @@ export function processLine(line: string): string | null {
      */
   }
 
-  const otherPoundSign = trimmed.indexOf('#');
-
-  if (otherPoundSign > 0) {
-    return trimmed.slice(0, otherPoundSign).trimEnd();
-  }
-
   return trimmed;
 }
 
diff --git a/Build/lib/rules/base.ts b/Build/lib/rules/base.ts
index 8b2d51f4..14eba660 100644
--- a/Build/lib/rules/base.ts
+++ b/Build/lib/rules/base.ts
@@ -168,7 +168,13 @@ export class FileOutput {
   }
 
   private async addFromDomainsetPromise(source: MaybePromise<AsyncIterable<string> | Iterable<string> | string[]>) {
-    for await (const line of await source) {
+    for await (let line of await source) {
+      const otherPoundSign = line.lastIndexOf('#');
+
+      if (otherPoundSign > 0) {
+        line = line.slice(0, otherPoundSign).trimEnd();
+      }
+
       if (line[0] === '.') {
         this.addDomainSuffix(line, true);
       } else {
@@ -187,7 +193,13 @@ export class FileOutput {
   }
 
   private async addFromRulesetPromise(source: MaybePromise<AsyncIterable<string> | Iterable<string> | string[]>) {
-    for await (const line of await source) {
+    for await (let line of await source) {
+      const otherPoundSign = line.lastIndexOf('#');
+
+      if (otherPoundSign > 0) {
+        line = line.slice(0, otherPoundSign).trimEnd();
+      }
+
       const splitted = line.split(',');
       const type = splitted[0];
       const value = splitted[1];