From de4d9dd0376c2c4ba4034397556a1b3084fcdfb1 Mon Sep 17 00:00:00 2001
From: SukkaBot <githubbot@skk.moe>
Date: Thu, 22 Sep 2022 15:37:52 +0000
Subject: [PATCH] deploy: 1586fe73c1f6ae8ef683d772580403d5066aee6e

---
 Build/build-anti-bogus-domain.js | 4 ++++
 Build/build-apple-cdn.js         | 4 ++++
 Build/build-cdn-conf.js          | 4 ++++
 Build/build-cidr.js              | 6 +++++-
 Build/build-reject-domainset.js  | 8 ++++----
 Build/build-telegram-cidr.js     | 4 ++++
 index.html                       | 2 +-
 7 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/Build/build-anti-bogus-domain.js b/Build/build-anti-bogus-domain.js
index 642d4a752..804bdd82c 100644
--- a/Build/build-anti-bogus-domain.js
+++ b/Build/build-anti-bogus-domain.js
@@ -4,6 +4,8 @@ const path = require('path');
 const { isIP } = require('net');
 
 (async () => {
+  console.time('build-anti-bogus-domain Total Time');
+  console.time('* Download bogus-nxdomain-list')
   const res = (await (await fetchWithRetry('https://raw.githubusercontent.com/felixonmars/dnsmasq-china-list/master/bogus-nxdomain.china.conf')).text())
     .split('\n')
     .map(line => {
@@ -14,6 +16,7 @@ const { isIP } = require('net');
       return null
     })
     .filter(ip => typeof ip === 'string' && isIP(ip) !== 0);
+  console.timeEnd('* Download bogus-nxdomain-list')
 
   const filePath = path.resolve(__dirname, '../List/ip/reject.conf');
   const content = (await fs.promises.readFile(filePath, 'utf-8'))
@@ -23,4 +26,5 @@ const { isIP } = require('net');
     );
 
   await fs.promises.writeFile(filePath, content, 'utf-8');
+  console.timeEnd('build-anti-bogus-domain Total Time');
 })();
diff --git a/Build/build-apple-cdn.js b/Build/build-apple-cdn.js
index e558d9c59..0e472a23a 100644
--- a/Build/build-apple-cdn.js
+++ b/Build/build-apple-cdn.js
@@ -5,6 +5,8 @@ const path = require('path');
 const rDomain = /^(((?!\-))(xn\-\-)?[a-z0-9\-_]{0,61}[a-z0-9]{1,1}\.)*(xn\-\-)?([a-z0-9\-]{1,61}|[a-z0-9\-]{1,30})\.[a-z]{2,}$/m;
 
 (async () => {
+  console.time('Total Time - build-apple-cdn-conf');
+
   const res = (await (await fetchWithRetry('https://raw.githubusercontent.com/felixonmars/dnsmasq-china-list/master/apple.china.conf')).text())
     .split('\n')
     .map(line => {
@@ -28,4 +30,6 @@ const rDomain = /^(((?!\-))(xn\-\-)?[a-z0-9\-_]{0,61}[a-z0-9]{1,1}\.)*(xn\-\-)?(
       'utf-8'
     )
   ])
+
+  console.timeEnd('Total Time - build-apple-cdn-conf');
 })();
diff --git a/Build/build-cdn-conf.js b/Build/build-cdn-conf.js
index 50e9d4959..94268718e 100644
--- a/Build/build-cdn-conf.js
+++ b/Build/build-cdn-conf.js
@@ -3,6 +3,8 @@ const fs = require('fs');
 const path = require('path');
 
 (async () => {
+  console.time('Total Time - build-cdn-conf');
+
   const domains = (await (await fetchWithRetry('https://publicsuffix.org/list/public_suffix_list.dat')).text()).split('\n');
 
   const S3OSSDomains = domains.filter(line => {
@@ -29,4 +31,6 @@ const path = require('path');
     );
 
   await fs.promises.writeFile(filePath, content, 'utf-8');
+
+  console.timeEnd('Total Time - build-cdn-conf');
 })();
diff --git a/Build/build-cidr.js b/Build/build-cidr.js
index 78947ad2f..777e6d802 100644
--- a/Build/build-cidr.js
+++ b/Build/build-cidr.js
@@ -3,6 +3,8 @@ const { promises: fsPromises } = require('fs');
 const { resolve: pathResolve } = require('path');
 
 (async () => {
+  console.time('Total Time - build-chnroutes-cidr');
+
   const cidr = (await (await fetchWithRetry('https://raw.githubusercontent.com/misakaio/chnroutes2/master/chnroutes.txt')).text()).split('\n');
 
   const filteredCidr = cidr.filter(line => {
@@ -13,7 +15,9 @@ const { resolve: pathResolve } = require('path');
     return false;
   })
 
-  return fsPromises.writeFile(pathResolve(__dirname, '../List/ip/china_ip.conf'), makeCidrList(filteredCidr), { encoding: 'utf-8' });
+  await fsPromises.writeFile(pathResolve(__dirname, '../List/ip/china_ip.conf'), makeCidrList(filteredCidr), { encoding: 'utf-8' });
+
+  console.timeEnd('Total Time - build-chnroutes-cidr');
 })();
 
 function makeCidrList(cidr) {
diff --git a/Build/build-reject-domainset.js b/Build/build-reject-domainset.js
index f99da6e19..36c3201ef 100644
--- a/Build/build-reject-domainset.js
+++ b/Build/build-reject-domainset.js
@@ -7,7 +7,7 @@ const { isCI } = require('ci-info');
 const threads = isCI ? cpuCount : cpuCount / 2;
 
 (async () => {
-  console.time('Total time');
+  console.time('Total Time - build-reject-domain-set');
 
   /** @type Set<string> */
   const domainSets = new Set();
@@ -267,10 +267,10 @@ const threads = isCI ? cpuCount : cpuCount / 2;
   console.timeEnd(`* Dedupe from covered subdomain`);
   console.log(`Deduped ${previousSize - domainSets.size} rules!`);
 
-  console.timeEnd('Total time');
-
-  return fsPromises.writeFile(
+  await fsPromises.writeFile(
     pathResolve(__dirname, '../List/domainset/reject.conf'),
     `${[...domainSets].join('\n')}\n`,
     { encoding: 'utf-8' });
+
+  console.time('Total Time - build-reject-domain-set');
 })();
diff --git a/Build/build-telegram-cidr.js b/Build/build-telegram-cidr.js
index c6900e2f1..12b4422f7 100644
--- a/Build/build-telegram-cidr.js
+++ b/Build/build-telegram-cidr.js
@@ -4,6 +4,8 @@ const path = require('path');
 const { isIPv4, isIPv6 } = require('net');
 
 (async () => {
+  console.time('Total Time - build-telegram-cidr');
+
   const resp = await fetchWithRetry('https://core.telegram.org/resources/cidr.txt');
   const lastModified = new Date(resp.headers.get('last-modified'));
 
@@ -27,4 +29,6 @@ const { isIPv4, isIPv6 } = require('net');
     }).join('\n') + '\n',
     'utf-8'
   );
+
+  console.timeEnd('Total Time - build-telegram-cidr');
 })();
diff --git a/index.html b/index.html
index 752eea980..7971b95eb 100644
--- a/index.html
+++ b/index.html
@@ -24,7 +24,7 @@
     <main class="container">
       <h1>Sukka Surge Ruleset Server</h1>
       <p>Made by <a href="https://skk.moe">Sukka</a> | <a href="https://github.com/SukkaW/Surge/">Source @ GitHub</a> | Licensed under <a href="https://github.com/SukkaW/Surge/blob/master/LICENSE" target="_blank">AGPL-3.0</a></p>
-      <p>Last Updated: 2022-09-22T15:20:17.180Z</p>
+      <p>Last Updated: 2022-09-22T15:37:50.605Z</p>
       <hr>
       <br>
       <ul>