From 5d86ba3d2dc3376d11ec57e53b8463cf5368b4f3 Mon Sep 17 00:00:00 2001 From: SukkaW Date: Wed, 28 Jun 2023 15:12:48 +0800 Subject: [PATCH] Minify output rules --- Build/build-anti-bogus-domain.js | 3 ++- Build/build-cdn-conf.js | 3 ++- Build/download-previous-build.js | 5 ++--- Build/lib/minify-rules.js | 13 +++++++++++++ 4 files changed, 19 insertions(+), 5 deletions(-) create mode 100644 Build/lib/minify-rules.js diff --git a/Build/build-anti-bogus-domain.js b/Build/build-anti-bogus-domain.js index ad2ee078..4e34de66 100644 --- a/Build/build-anti-bogus-domain.js +++ b/Build/build-anti-bogus-domain.js @@ -5,6 +5,7 @@ const { isIPv4, isIPv6 } = require('net'); const { compareAndWriteFile } = require('./lib/string-array-compare'); const { withBannerArray } = require('./lib/with-banner'); const { fetchRemoteTextAndCreateReadlineInterface } = require('./lib/fetch-remote-text-by-line'); +const { minifyRules } = require('./lib/minify-rules'); (async () => { console.time('Total Time - build-anti-bogus-domain'); @@ -52,7 +53,7 @@ const { fetchRemoteTextAndCreateReadlineInterface } = require('./lib/fetch-remot ' - https://github.com/felixonmars/dnsmasq-china-list' ], new Date(), - content.split('\n') + minifyRules(content.split('\n')) ), resultPath ) diff --git a/Build/build-cdn-conf.js b/Build/build-cdn-conf.js index 023e7fe0..fa582e25 100644 --- a/Build/build-cdn-conf.js +++ b/Build/build-cdn-conf.js @@ -3,6 +3,7 @@ const fs = require('fs'); const path = require('path'); const { compareAndWriteFile } = require('./lib/string-array-compare'); const { withBannerArray } = require('./lib/with-banner'); +const { minifyRules } = require('./lib/minify-rules'); (async () => { console.time('Total Time - build-cdn-conf'); @@ -44,7 +45,7 @@ const { withBannerArray } = require('./lib/with-banner'); 'This file contains object storage and static assets CDN domains.' ], new Date(), - content.split('\n') + minifyRules(content.split('\n')) ), resultPath ) diff --git a/Build/download-previous-build.js b/Build/download-previous-build.js index e82ab8f2..7793b48a 100644 --- a/Build/download-previous-build.js +++ b/Build/download-previous-build.js @@ -4,9 +4,8 @@ const fs = require('fs'); const fse = require('fs-extra'); const { join, resolve } = require('path'); const { tmpdir } = require('os'); -const { Stream, Readable } = require('stream'); -const { promisify } = require('util'); -const pipeline = promisify(Stream.pipeline); +const { Readable } = require('stream'); +const { pipeline } = require('stream/promises'); const fileExists = (path) => { return fs.promises.access(path, fs.constants.F_OK) diff --git a/Build/lib/minify-rules.js b/Build/lib/minify-rules.js new file mode 100644 index 00000000..fee8235d --- /dev/null +++ b/Build/lib/minify-rules.js @@ -0,0 +1,13 @@ +// @ts-check +/** + * @param {string[]} rules + */ +exports.minifyRules = (rules) => rules.filter(line => { + if (line[0] === '#') { + return false; + } + if (line.trim().length === 0) { + return false; + } + return true; +});