fcdns 0.2.4 → 0.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md CHANGED
@@ -2,6 +2,21 @@
2
2
 
3
3
  All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
4
4
 
5
+ ## [0.3.0](https://github.com/BlackGlory/fcdns/compare/v0.2.7...v0.3.0) (2021-12-17)
6
+
7
+
8
+ ### ⚠ BREAKING CHANGES
9
+
10
+ * - The minimum version is Node.js v16
11
+
12
+ * upgrade dependencies ([c9072dc](https://github.com/BlackGlory/fcdns/commit/c9072dc80e8f6867aca7f0a9d05abec154195f21))
13
+
14
+ ### [0.2.7](https://github.com/BlackGlory/fcdns/compare/v0.2.6...v0.2.7) (2021-12-12)
15
+
16
+ ### [0.2.6](https://github.com/BlackGlory/fcdns/compare/v0.2.5...v0.2.6) (2021-10-17)
17
+
18
+ ### [0.2.5](https://github.com/BlackGlory/fcdns/compare/v0.2.4...v0.2.5) (2021-10-14)
19
+
5
20
  ### [0.2.4](https://github.com/BlackGlory/fcdns/compare/v0.2.3...v0.2.4) (2021-10-06)
6
21
 
7
22
 
package/lib/cli.js CHANGED
@@ -29,15 +29,15 @@ commander_1.program
29
29
  .option('--loose-mode')
30
30
  .action(async () => {
31
31
  const options = getOptions();
32
- const tester = await new tester_1.Tester({
32
+ const tester = await tester_1.Tester.create({
33
33
  server: options.testServer,
34
34
  timeout: options.testTimeout,
35
35
  cacheFilename: options.testCacheFilename
36
36
  });
37
37
  const untrustedResolver = (0, create_dns_resolver_1.createDNSResolver)(options.untrustedServer);
38
- const ipWhitelist = await new ip_whitelist_1.IPWhitelist(options.ipWhitelistFilename);
39
- const hostnameWhitelist = await new hostname_whitelist_1.HostnameWhitelist(options.hostnameWhitelistFilename);
40
- const router = await new router_1.Router({
38
+ const ipWhitelist = await ip_whitelist_1.IPWhitelist.create(options.ipWhitelistFilename);
39
+ const hostnameWhitelist = await hostname_whitelist_1.HostnameWhitelist.create(options.hostnameWhitelistFilename);
40
+ const router = await router_1.Router.create({
41
41
  tester,
42
42
  untrustedResolver,
43
43
  ipWhitelist,
package/lib/cli.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}
@@ -1,13 +1,14 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.HostnameWhitelist = void 0;
4
- const async_constructor_1 = require("async-constructor");
5
4
  const hostname_list_file_1 = require("./utils/hostname-list-file");
6
- class HostnameWhitelist extends async_constructor_1.AsyncConstructor {
7
- constructor(filename) {
8
- super(async () => {
9
- this.patterns = await (0, hostname_list_file_1.readHostnameListFile)(filename);
10
- });
5
+ class HostnameWhitelist {
6
+ constructor(patterns) {
7
+ this.patterns = patterns;
8
+ }
9
+ static async create(filename) {
10
+ const patterns = await (0, hostname_list_file_1.readHostnameListFile)(filename);
11
+ return new HostnameWhitelist(patterns);
11
12
  }
12
13
  includes(hostname) {
13
14
  return this.patterns.some(x => x.match(hostname));
@@ -1 +1 @@
1
- {"version":3,"file":"hostname-whitelist.js","sourceRoot":"","sources":["../src/hostname-whitelist.ts"],"names":[],"mappings":";;;AAAA,yDAAoD;AACpD,kEAAgE;AAGhE,MAAa,iBAAkB,SAAQ,oCAAgB;IAGrD,YAAY,QAAgB;QAC1B,KAAK,CAAC,KAAK,IAAI,EAAE;YACf,IAAI,CAAC,QAAQ,GAAG,MAAM,IAAA,yCAAoB,EAAC,QAAQ,CAAC,CAAA;QACtD,CAAC,CAAC,CAAA;IACJ,CAAC;IAED,QAAQ,CAAC,QAAgB;QACvB,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAA;IACnD,CAAC;CACF;AAZD,8CAYC"}
1
+ {"version":3,"file":"hostname-whitelist.js","sourceRoot":"","sources":["../src/hostname-whitelist.ts"],"names":[],"mappings":";;;AAAA,kEAAgE;AAGhE,MAAa,iBAAiB;IAC5B,YAA4B,QAA2B;QAA3B,aAAQ,GAAR,QAAQ,CAAmB;IAAG,CAAC;IAE3D,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,QAAgB;QAClC,MAAM,QAAQ,GAAG,MAAM,IAAA,yCAAoB,EAAC,QAAQ,CAAC,CAAA;QAErD,OAAO,IAAI,iBAAiB,CAAC,QAAQ,CAAC,CAAA;IACxC,CAAC;IAED,QAAQ,CAAC,QAAgB;QACvB,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAA;IACnD,CAAC;CACF;AAZD,8CAYC"}
@@ -1,17 +1,17 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.IPWhitelist = void 0;
4
- const async_constructor_1 = require("async-constructor");
5
4
  const ip_list_file_1 = require("./utils/ip-list-file");
6
5
  const is_ipv4_address_1 = require("./utils/is-ipv4-address");
7
6
  const is_ipv6_address_1 = require("./utils/is-ipv6-address");
8
- class IPWhitelist extends async_constructor_1.AsyncConstructor {
9
- constructor(filename) {
10
- super(async () => {
11
- const { ipv4, ipv6 } = await (0, ip_list_file_1.readIPListFile)(filename);
12
- this.ipv4 = ipv4;
13
- this.ipv6 = ipv6;
14
- });
7
+ class IPWhitelist {
8
+ constructor(ipv4, ipv6) {
9
+ this.ipv4 = ipv4;
10
+ this.ipv6 = ipv6;
11
+ }
12
+ static async create(filename) {
13
+ const { ipv4, ipv6 } = await (0, ip_list_file_1.readIPListFile)(filename);
14
+ return new IPWhitelist(ipv4, ipv6);
15
15
  }
16
16
  includes(address) {
17
17
  if ((0, is_ipv4_address_1.isIPv4Address)(address)) {
@@ -1 +1 @@
1
- {"version":3,"file":"ip-whitelist.js","sourceRoot":"","sources":["../src/ip-whitelist.ts"],"names":[],"mappings":";;;AACA,yDAAoD;AACpD,sDAAoD;AACpD,4DAAsD;AACtD,4DAAsD;AAEtD,MAAa,WAAY,SAAQ,oCAAgB;IAI/C,YAAY,QAAgB;QAC1B,KAAK,CAAC,KAAK,IAAI,EAAE;YACf,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,MAAM,IAAA,6BAAc,EAAC,QAAQ,CAAC,CAAA;YACrD,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;YAChB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;QAClB,CAAC,CAAC,CAAA;IACJ,CAAC;IAED,QAAQ,CAAC,OAAe;QACtB,IAAI,IAAA,+BAAa,EAAC,OAAO,CAAC,EAAE;YAC1B,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAA;SAChD;QAED,IAAI,IAAA,+BAAa,EAAC,OAAO,CAAC,EAAE;YAC1B,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAA;SAChD;QAED,OAAO,KAAK,CAAA;IACd,CAAC;CACF;AAvBD,kCAuBC"}
1
+ {"version":3,"file":"ip-whitelist.js","sourceRoot":"","sources":["../src/ip-whitelist.ts"],"names":[],"mappings":";;;AACA,sDAAoD;AACpD,4DAAsD;AACtD,4DAAsD;AAEtD,MAAa,WAAW;IACtB,YACU,IAAwB,EACxB,IAAwB;QADxB,SAAI,GAAJ,IAAI,CAAoB;QACxB,SAAI,GAAJ,IAAI,CAAoB;IAC/B,CAAC;IAEJ,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,QAAgB;QAClC,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,MAAM,IAAA,6BAAc,EAAC,QAAQ,CAAC,CAAA;QAErD,OAAO,IAAI,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;IACpC,CAAC;IAED,QAAQ,CAAC,OAAe;QACtB,IAAI,IAAA,+BAAa,EAAC,OAAO,CAAC,EAAE;YAC1B,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAA;SAChD;QAED,IAAI,IAAA,+BAAa,EAAC,OAAO,CAAC,EAAE;YAC1B,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAA;SAChD;QAED,OAAO,KAAK,CAAA;IACd,CAAC;CACF;AAvBD,kCAuBC"}
package/lib/logger.js CHANGED
@@ -24,8 +24,9 @@ function printMessage(level, log) {
24
24
  const pre = createPrefix({ level, id, timestamp, hostname });
25
25
  const post = (0, types_1.isntUndefined)(elapsed) ? createPostfix({ elapsed }) : null;
26
26
  let result = `${pre} ${message}`;
27
- if (post)
27
+ if (post) {
28
28
  result += ' ' + post;
29
+ }
29
30
  log(result);
30
31
  };
31
32
  }
@@ -34,8 +35,9 @@ function printError(level, log) {
34
35
  const pre = createPrefix({ level, id, timestamp, hostname });
35
36
  const post = (0, types_1.isntUndefined)(elapsed) ? createPostfix({ elapsed }) : null;
36
37
  let result = `${pre} ${reason}`;
37
- if (post)
38
+ if (post) {
38
39
  result += ' ' + post;
40
+ }
39
41
  log(result);
40
42
  };
41
43
  }
package/lib/logger.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"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"}
package/lib/router.js CHANGED
@@ -1,7 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.Router = exports.Target = void 0;
4
- const async_constructor_1 = require("async-constructor");
5
4
  const map_file_1 = require("./utils/map-file");
6
5
  const resolve_a_1 = require("./utils/resolve-a");
7
6
  var Target;
@@ -9,18 +8,26 @@ var Target;
9
8
  Target[Target["Untrusted"] = 0] = "Untrusted";
10
9
  Target[Target["Trusted"] = 1] = "Trusted";
11
10
  })(Target = exports.Target || (exports.Target = {}));
12
- class Router extends async_constructor_1.AsyncConstructor {
13
- constructor(options) {
14
- super(async () => {
15
- this.cache = await (0, map_file_1.readMapFile)(this.cacheFilename);
16
- await (0, map_file_1.writeMapFile)(this.cacheFilename, this.cache);
17
- });
18
- this.tester = options.tester;
19
- this.untrustedResolver = options.untrustedResolver;
20
- this.ipWhitelist = options.ipWhitelist;
21
- this.hostnameWhitelist = options.hostnameWhitelist;
22
- this.cacheFilename = options.cacheFilename;
23
- this.looseMode = options.looseMode;
11
+ class Router {
12
+ constructor(cacheFilename, cache, looseMode, tester, untrustedResolver, ipWhitelist, hostnameWhitelist) {
13
+ this.cacheFilename = cacheFilename;
14
+ this.cache = cache;
15
+ this.looseMode = looseMode;
16
+ this.tester = tester;
17
+ this.untrustedResolver = untrustedResolver;
18
+ this.ipWhitelist = ipWhitelist;
19
+ this.hostnameWhitelist = hostnameWhitelist;
20
+ }
21
+ static async create(options) {
22
+ const tester = options.tester;
23
+ const untrustedResolver = options.untrustedResolver;
24
+ const ipWhitelist = options.ipWhitelist;
25
+ const hostnameWhitelist = options.hostnameWhitelist;
26
+ const cacheFilename = options.cacheFilename;
27
+ const looseMode = options.looseMode;
28
+ const cache = await (0, map_file_1.readMapFile)(cacheFilename);
29
+ await (0, map_file_1.writeMapFile)(cacheFilename, cache);
30
+ return new Router(cacheFilename, cache, looseMode, tester, untrustedResolver, ipWhitelist, hostnameWhitelist);
24
31
  }
25
32
  async getTarget(hostname) {
26
33
  if (this.inHostnameWhitelist(hostname))
package/lib/router.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"router.js","sourceRoot":"","sources":["../src/router.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"router.js","sourceRoot":"","sources":["../src/router.ts"],"names":[],"mappings":"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"}
package/lib/tester.js CHANGED
@@ -2,22 +2,27 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.ServerNotAlive = exports.Tester = void 0;
4
4
  const map_file_1 = require("./utils/map-file");
5
- const async_constructor_1 = require("async-constructor");
6
5
  const is_alive_1 = require("./utils/is-alive");
7
6
  const create_dns_resolver_1 = require("./utils/create-dns-resolver");
8
7
  const resolve_a_1 = require("./utils/resolve-a");
9
8
  const errors_1 = require("@blackglory/errors");
10
9
  const return_style_1 = require("return-style");
11
- class Tester extends async_constructor_1.AsyncConstructor {
12
- constructor(options) {
13
- super(async () => {
14
- this.cache = await (0, map_file_1.readMapFile)(this.cacheFilename);
15
- await (0, map_file_1.writeMapFile)(this.cacheFilename, this.cache);
16
- });
17
- this.server = options.server;
18
- this.timeout = options.timeout;
19
- this.cacheFilename = options.cacheFilename;
20
- this.testResolver = (0, create_dns_resolver_1.createDNSResolver)(this.server);
10
+ class Tester {
11
+ constructor(server, timeout, cacheFilename, testResolver, cache) {
12
+ this.server = server;
13
+ this.timeout = timeout;
14
+ this.cacheFilename = cacheFilename;
15
+ this.testResolver = testResolver;
16
+ this.cache = cache;
17
+ }
18
+ static async create(options) {
19
+ const server = options.server;
20
+ const timeout = options.timeout;
21
+ const cacheFilename = options.cacheFilename;
22
+ const testResolver = (0, create_dns_resolver_1.createDNSResolver)(server);
23
+ const cache = await (0, map_file_1.readMapFile)(cacheFilename);
24
+ await (0, map_file_1.writeMapFile)(cacheFilename, cache);
25
+ return new Tester(server, timeout, cacheFilename, testResolver, cache);
21
26
  }
22
27
  async isPoisoned(hostname) {
23
28
  if (this.cache.has(hostname)) {
package/lib/tester.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"tester.js","sourceRoot":"","sources":["../src/tester.ts"],"names":[],"mappings":";;;AAAA,8CAA0E;AAC1E,yDAAoD;AACpD,8CAAyC;AAEzC,oEAA8D;AAC9D,gDAA2C;AAC3C,+CAAgD;AAChD,+CAA+C;AAE/C,MAAa,MAAO,SAAQ,oCAAgB;IAO1C,YAAY,OAIX;QACC,KAAK,CAAC,KAAK,IAAI,EAAE;YACf,IAAI,CAAC,KAAK,GAAG,MAAM,IAAA,sBAAW,EAAC,IAAI,CAAC,aAAa,CAAC,CAAA;YAGlD,MAAM,IAAA,uBAAY,EAAC,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,KAAK,CAAC,CAAA;QACpD,CAAC,CAAC,CAAA;QAEF,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAA;QAC5B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAA;QAC9B,IAAI,CAAC,aAAa,GAAG,OAAO,CAAC,aAAa,CAAA;QAC1C,IAAI,CAAC,YAAY,GAAG,IAAA,uCAAiB,EAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IACpD,CAAC;IAKD,KAAK,CAAC,UAAU,CAAC,QAAgB;QAC/B,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE;YAC5B,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAE,CAAA;SACjC;aAAM;YACL,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;gBAC1C,IAAA,kBAAO,EAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC;gBAClC,IAAA,+BAAgB,EAAC,IAAA,oBAAQ,EAAC,IAAI,CAAC,YAAY,EAAE,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;aACtE,CAAC,CAAA;YACF,IAAI,KAAK,EAAE;gBACT,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAA;gBACjC,OAAO,QAAQ,CAAA;aAChB;iBAAM;gBACL,MAAM,IAAI,cAAc,EAAE,CAAA;aAC3B;SACF;IACH,CAAC;IAEO,QAAQ,CAAC,QAAgB,EAAE,MAAe;QAChD,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAA;QAChC,IAAA,wBAAa,EAAC,IAAI,CAAC,aAAa,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAA;IACrD,CAAC;CACF;AAjDD,wBAiDC;AAED,MAAa,cAAe,SAAQ,oBAAW;IAC7C;QACE,KAAK,CAAC,kEAAkE,CAAC,CAAA;IAC3E,CAAC;CACF;AAJD,wCAIC"}
1
+ {"version":3,"file":"tester.js","sourceRoot":"","sources":["../src/tester.ts"],"names":[],"mappings":";;;AAAA,8CAA0E;AAC1E,8CAAyC;AAEzC,oEAA8D;AAC9D,gDAA2C;AAC3C,+CAAgD;AAChD,+CAA+C;AAE/C,MAAa,MAAM;IACjB,YACU,MAAc,EACd,OAAe,EACf,aAAqB,EACrB,YAA0B,EAC1B,KAA2B;QAJ3B,WAAM,GAAN,MAAM,CAAQ;QACd,YAAO,GAAP,OAAO,CAAQ;QACf,kBAAa,GAAb,aAAa,CAAQ;QACrB,iBAAY,GAAZ,YAAY,CAAc;QAC1B,UAAK,GAAL,KAAK,CAAsB;IAClC,CAAC;IAEJ,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,OAInB;QACC,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAA;QAC7B,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAA;QAC/B,MAAM,aAAa,GAAG,OAAO,CAAC,aAAa,CAAA;QAC3C,MAAM,YAAY,GAAG,IAAA,uCAAiB,EAAC,MAAM,CAAC,CAAA;QAC9C,MAAM,KAAK,GAAG,MAAM,IAAA,sBAAW,EAAkB,aAAa,CAAC,CAAA;QAG/D,MAAM,IAAA,uBAAY,EAAC,aAAa,EAAE,KAAK,CAAC,CAAA;QAExC,OAAO,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,KAAK,CAAC,CAAA;IACxE,CAAC;IAKD,KAAK,CAAC,UAAU,CAAC,QAAgB;QAC/B,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE;YAC5B,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAE,CAAA;SACjC;aAAM;YACL,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;gBAC1C,IAAA,kBAAO,EAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC;gBAClC,IAAA,+BAAgB,EAAC,IAAA,oBAAQ,EAAC,IAAI,CAAC,YAAY,EAAE,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;aACtE,CAAC,CAAA;YACF,IAAI,KAAK,EAAE;gBACT,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAA;gBACjC,OAAO,QAAQ,CAAA;aAChB;iBAAM;gBACL,MAAM,IAAI,cAAc,EAAE,CAAA;aAC3B;SACF;IACH,CAAC;IAEO,QAAQ,CAAC,QAAgB,EAAE,MAAe;QAChD,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAA;QAChC,IAAA,wBAAa,EAAC,IAAI,CAAC,aAAa,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAA;IACrD,CAAC;CACF;AAlDD,wBAkDC;AAED,MAAa,cAAe,SAAQ,oBAAW;IAC7C;QACE,KAAK,CAAC,kEAAkE,CAAC,CAAA;IAC3E,CAAC;CACF;AAJD,wCAIC"}
@@ -1,10 +1,14 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.readIPListFile = void 0;
3
+ exports.readIPListFile = exports.writeIPListFile = void 0;
4
4
  const fs_1 = require("fs");
5
5
  const address_range_1 = require("address-range");
6
6
  const is_ipv4_address_1 = require("./is-ipv4-address");
7
7
  const is_ipv6_address_1 = require("./is-ipv6-address");
8
+ async function writeIPListFile(filename, ranges) {
9
+ await fs_1.promises.writeFile(filename, ranges.join('\n'));
10
+ }
11
+ exports.writeIPListFile = writeIPListFile;
8
12
  async function readIPListFile(filename) {
9
13
  const ipv4AddressRanges = [];
10
14
  const ipv6AddressRanges = [];
@@ -1 +1 @@
1
- {"version":3,"file":"ip-list-file.js","sourceRoot":"","sources":["../../src/utils/ip-list-file.ts"],"names":[],"mappings":";;;AAAA,2BAAmC;AACnC,iDAAkE;AAClE,4DAAsD;AACtD,4DAAsD;AAE/C,KAAK,UAAU,cAAc,CAClC,QAAgB;IAEhB,MAAM,iBAAiB,GAAuB,EAAE,CAAA;IAChD,MAAM,iBAAiB,GAAuB,EAAE,CAAA;IAEhD,MAAM,IAAI,GAAG,MAAM,aAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;IACjD,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;SACb,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;SACrB,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC;SACrB,OAAO,CAAC,CAAC,CAAC,EAAE;QACX,IAAI,IAAA,+BAAa,EAAC,CAAC,CAAC,EAAE;YACpB,iBAAiB,CAAC,IAAI,CAAC,gCAAgB,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;SACpD;QAED,IAAI,IAAA,+BAAa,EAAC,CAAC,CAAC,EAAE;YACpB,iBAAiB,CAAC,IAAI,CAAC,gCAAgB,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;SACpD;QAED,IAAI,kBAAkB,CAAC,CAAC,CAAC,EAAE;YACzB,MAAM,CAAC,YAAY,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YAC/C,iBAAiB,CAAC,IAAI,CAAC,gCAAgB,CAAC,IAAI,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC,CAAA;SACxE;QAED,IAAI,kBAAkB,CAAC,CAAC,CAAC,EAAE;YACzB,MAAM,CAAC,YAAY,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YAC/C,iBAAiB,CAAC,IAAI,CAAC,gCAAgB,CAAC,IAAI,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC,CAAA;SACxE;IACH,CAAC,CAAC,CAAA;IAEJ,OAAO,EAAE,IAAI,EAAE,iBAAiB,EAAE,IAAI,EAAE,iBAAiB,EAAE,CAAA;AAC7D,CAAC;AA/BD,wCA+BC;AAED,SAAS,kBAAkB,CAAC,IAAY;IACtC,OAAO,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AACvC,CAAC;AAED,SAAS,kBAAkB,CAAC,IAAY;IACtC,OAAO,uBAAuB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AAC3C,CAAC"}
1
+ {"version":3,"file":"ip-list-file.js","sourceRoot":"","sources":["../../src/utils/ip-list-file.ts"],"names":[],"mappings":";;;AAAA,2BAAmC;AACnC,iDAAgF;AAChF,4DAAsD;AACtD,4DAAsD;AAE/C,KAAK,UAAU,eAAe,CACnC,QAAgB,EAChB,MAAsB;IAEtB,MAAM,aAAE,CAAC,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;AACjD,CAAC;AALD,0CAKC;AAEM,KAAK,UAAU,cAAc,CAClC,QAAgB;IAEhB,MAAM,iBAAiB,GAAuB,EAAE,CAAA;IAChD,MAAM,iBAAiB,GAAuB,EAAE,CAAA;IAEhD,MAAM,IAAI,GAAG,MAAM,aAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;IACjD,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;SACb,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;SACrB,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC;SACrB,OAAO,CAAC,CAAC,CAAC,EAAE;QACX,IAAI,IAAA,+BAAa,EAAC,CAAC,CAAC,EAAE;YACpB,iBAAiB,CAAC,IAAI,CAAC,gCAAgB,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;SACpD;QAED,IAAI,IAAA,+BAAa,EAAC,CAAC,CAAC,EAAE;YACpB,iBAAiB,CAAC,IAAI,CAAC,gCAAgB,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;SACpD;QAED,IAAI,kBAAkB,CAAC,CAAC,CAAC,EAAE;YACzB,MAAM,CAAC,YAAY,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YAC/C,iBAAiB,CAAC,IAAI,CAAC,gCAAgB,CAAC,IAAI,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC,CAAA;SACxE;QAED,IAAI,kBAAkB,CAAC,CAAC,CAAC,EAAE;YACzB,MAAM,CAAC,YAAY,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YAC/C,iBAAiB,CAAC,IAAI,CAAC,gCAAgB,CAAC,IAAI,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC,CAAA;SACxE;IACH,CAAC,CAAC,CAAA;IAEJ,OAAO,EAAE,IAAI,EAAE,iBAAiB,EAAE,IAAI,EAAE,iBAAiB,EAAE,CAAA;AAC7D,CAAC;AA/BD,wCA+BC;AAED,SAAS,kBAAkB,CAAC,IAAY;IACtC,OAAO,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AACvC,CAAC;AAED,SAAS,kBAAkB,CAAC,IAAY;IACtC,OAAO,uBAAuB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AAC3C,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "fcdns",
3
- "version": "0.2.4",
3
+ "version": "0.3.0",
4
4
  "description": "DNS relay server with fact-checking.",
5
5
  "keywords": [
6
6
  "dns"
@@ -12,6 +12,9 @@
12
12
  "repository": "git@github.com:BlackGlory/fcdns.git",
13
13
  "author": "BlackGlory <woshenmedoubuzhidao@blackglory.me>",
14
14
  "license": "MIT",
15
+ "engines": {
16
+ "node": ">=16"
17
+ },
15
18
  "scripts": {
16
19
  "lint": "eslint --ext .js,.jsx,.ts,.tsx --quiet src",
17
20
  "test": "jest --config jest.config.js",
@@ -29,44 +32,40 @@
29
32
  "commit-msg": "commitlint --env HUSKY_GIT_PARAMS"
30
33
  }
31
34
  },
32
- "engines": {
33
- "node": ">= 14.5.0"
34
- },
35
35
  "devDependencies": {
36
- "@commitlint/cli": "^13.2.0",
37
- "@commitlint/config-conventional": "^13.2.0",
36
+ "@commitlint/cli": "^15.0.0",
37
+ "@commitlint/config-conventional": "^15.0.0",
38
38
  "@types/ms": "^0.7.31",
39
- "@types/node": "^16.10.3",
40
- "@types/ping": "^0.2.1",
41
- "@typescript-eslint/eslint-plugin": "^4.33.0",
42
- "@typescript-eslint/parser": "^4.33.0",
43
- "eslint": "^7.32.0",
39
+ "@types/node": "16",
40
+ "@types/ping": "^0.4.1",
41
+ "@typescript-eslint/eslint-plugin": "^5.7.0",
42
+ "@typescript-eslint/parser": "^5.7.0",
43
+ "eslint": "^8.4.1",
44
44
  "husky": "4",
45
45
  "npm-run-all": "^4.1.5",
46
46
  "rimraf": "^3.0.2",
47
- "standard-version": "^9.3.1",
48
- "tsconfig-paths": "^3.11.0",
47
+ "standard-version": "^9.3.2",
48
+ "tsconfig-paths": "^3.12.0",
49
49
  "tscpaths": "^0.0.9",
50
- "typescript": "^4.4.3"
50
+ "typescript": "^4.5.4"
51
51
  },
52
52
  "dependencies": {
53
53
  "@blackglory/errors": "^1.1.2",
54
- "@blackglory/go": "^0.1.0",
55
- "@blackglory/types": "^0.5.1",
56
- "address-range": "^0.2.7",
57
- "async-constructor": "^0.4.16",
54
+ "@blackglory/go": "^0.1.1",
55
+ "@blackglory/types": "^0.6.4",
56
+ "address-range": "^0.2.9",
58
57
  "chalk": "^4.1.2",
59
- "commander": "^8.2.0",
60
- "extra-filesystem": "^0.3.9",
58
+ "commander": "^8.3.0",
59
+ "extra-filesystem": "^0.4.0",
61
60
  "extra-logger": "^0.5.5",
62
- "extra-promise": "^0.18.7",
63
- "iterable-operator": "^0.14.3",
61
+ "extra-promise": "^0.20.0",
62
+ "iterable-operator": "^0.14.4",
64
63
  "ms": "^2.1.3",
65
64
  "native-dns": "^0.7.0",
66
65
  "ping": "^0.4.1",
67
- "return-style": "^0.12.3"
66
+ "return-style": "^0.12.5"
68
67
  },
69
68
  "optionalDependencies": {
70
- "internet-number": "^2.2.14"
69
+ "internet-number": "^3.0.0"
71
70
  }
72
71
  }