fcdns 0.2.3 → 0.2.7
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 +13 -0
- package/README.md +7 -0
- package/lib/cli.js +10 -6
- package/lib/cli.js.map +1 -1
- package/lib/hostname-whitelist.js +7 -6
- package/lib/hostname-whitelist.js.map +1 -1
- package/lib/ip-whitelist.js +8 -8
- package/lib/ip-whitelist.js.map +1 -1
- package/lib/logger.js +4 -2
- package/lib/logger.js.map +1 -1
- package/lib/router.js +42 -25
- package/lib/router.js.map +1 -1
- package/lib/server.js.map +1 -1
- package/lib/tester.js +16 -11
- package/lib/tester.js.map +1 -1
- package/package.json +20 -21
package/CHANGELOG.md
CHANGED
|
@@ -2,6 +2,19 @@
|
|
|
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.2.7](https://github.com/BlackGlory/fcdns/compare/v0.2.6...v0.2.7) (2021-12-12)
|
|
6
|
+
|
|
7
|
+
### [0.2.6](https://github.com/BlackGlory/fcdns/compare/v0.2.5...v0.2.6) (2021-10-17)
|
|
8
|
+
|
|
9
|
+
### [0.2.5](https://github.com/BlackGlory/fcdns/compare/v0.2.4...v0.2.5) (2021-10-14)
|
|
10
|
+
|
|
11
|
+
### [0.2.4](https://github.com/BlackGlory/fcdns/compare/v0.2.3...v0.2.4) (2021-10-06)
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
### Features
|
|
15
|
+
|
|
16
|
+
* add loose mode ([561f7f9](https://github.com/BlackGlory/fcdns/commit/561f7f9181a5bd76e5093ed5e7fc65daadd4702d))
|
|
17
|
+
|
|
5
18
|
### [0.2.3](https://github.com/BlackGlory/fcdns/compare/v0.2.2...v0.2.3) (2021-09-18)
|
|
6
19
|
|
|
7
20
|
### [0.2.2](https://github.com/BlackGlory/fcdns/compare/v0.2.1...v0.2.2) (2021-07-12)
|
package/README.md
CHANGED
|
@@ -39,6 +39,7 @@ Options:
|
|
|
39
39
|
--test-cache <filename> (default: "test.txt")
|
|
40
40
|
--test-timeout <ms> (default: "200")
|
|
41
41
|
--log <level> (default: "info")
|
|
42
|
+
--loose-mode
|
|
42
43
|
-h, --help display help for command
|
|
43
44
|
```
|
|
44
45
|
|
|
@@ -147,6 +148,12 @@ wikipedia.org
|
|
|
147
148
|
*.wikipedia.org
|
|
148
149
|
```
|
|
149
150
|
|
|
151
|
+
## 宽松模式
|
|
152
|
+
|
|
153
|
+
在宽松模式下, 当相关主机名不存在路由缓存时(即第一次查询该主机名), 会立即查询不可信服务器并返回记录, 然后在后台执行投毒测试和路由缓存.
|
|
154
|
+
|
|
155
|
+
宽松模式通过降低fcdns的准确性, 提升了在可信信道不稳定情况下的用户体验, 这适用于只有少数主机名被投毒的环境.
|
|
156
|
+
|
|
150
157
|
## 性能
|
|
151
158
|
|
|
152
159
|
fcdns不是作为高性能DNS服务器开发的, 选择Node.js栈完全是出于开发方面的便利性.
|
package/lib/cli.js
CHANGED
|
@@ -26,22 +26,24 @@ commander_1.program
|
|
|
26
26
|
.option('--test-cache <filename>', '', 'test.txt')
|
|
27
27
|
.option('--test-timeout <ms>', '', '200')
|
|
28
28
|
.option('--log <level>', '', 'info')
|
|
29
|
+
.option('--loose-mode')
|
|
29
30
|
.action(async () => {
|
|
30
31
|
const options = getOptions();
|
|
31
|
-
const tester = await
|
|
32
|
+
const tester = await tester_1.Tester.create({
|
|
32
33
|
server: options.testServer,
|
|
33
34
|
timeout: options.testTimeout,
|
|
34
35
|
cacheFilename: options.testCacheFilename
|
|
35
36
|
});
|
|
36
37
|
const untrustedResolver = (0, create_dns_resolver_1.createDNSResolver)(options.untrustedServer);
|
|
37
|
-
const ipWhitelist = await
|
|
38
|
-
const hostnameWhitelist = await
|
|
39
|
-
const router = await
|
|
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({
|
|
40
41
|
tester,
|
|
41
42
|
untrustedResolver,
|
|
42
43
|
ipWhitelist,
|
|
43
44
|
hostnameWhitelist,
|
|
44
|
-
cacheFilename: options.routeCacheFilename
|
|
45
|
+
cacheFilename: options.routeCacheFilename,
|
|
46
|
+
looseMode: options.looseMode
|
|
45
47
|
});
|
|
46
48
|
const logger = (0, logger_1.createCustomLogger)(options.logLevel);
|
|
47
49
|
const untrustedServer = (0, parse_server_info_1.parseServerInfo)(options.untrustedServer);
|
|
@@ -69,6 +71,7 @@ function getOptions() {
|
|
|
69
71
|
(0, errors_1.assert)(/^\d+$/.test(opts.testTimeout), 'The parameter test timeout must be integer');
|
|
70
72
|
const testTimeout = Number.parseInt(opts.testTimeout, 10);
|
|
71
73
|
const logLevel = (0, parse_log_level_1.parseLogLevel)(opts.log);
|
|
74
|
+
const looseMode = opts.looseMode;
|
|
72
75
|
return {
|
|
73
76
|
testServer,
|
|
74
77
|
untrustedServer,
|
|
@@ -79,7 +82,8 @@ function getOptions() {
|
|
|
79
82
|
routeCacheFilename,
|
|
80
83
|
testCacheFilename,
|
|
81
84
|
testTimeout,
|
|
82
|
-
logLevel
|
|
85
|
+
logLevel,
|
|
86
|
+
looseMode
|
|
83
87
|
};
|
|
84
88
|
}
|
|
85
89
|
//# sourceMappingURL=cli.js.map
|
package/lib/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";;;AACA,yCAAmC;AACnC,qCAAsC;AACtC,qCAAiC;AACjC,iDAA4C;AAC5C,6DAAwD;AACxD,qCAAiC;AACjC,oEAA8D;AAC9D,4DAAsD;AACtD,+CAA2C;AAC3C,qCAA6C;AAE7C,gEAA0D;AAE1D,mBAAO;KACJ,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,IAAI,CAAC;KACrC,OAAO,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,OAAO,CAAC;KAC3C,WAAW,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,WAAW,CAAC;KACnD,MAAM,CAAC,wBAAwB,EAAE,EAAE,CAAC;KACpC,MAAM,CAAC,6BAA6B,EAAE,EAAE,CAAC;KACzC,MAAM,CAAC,2BAA2B,EAAE,EAAE,CAAC;KACvC,MAAM,CAAC,eAAe,EAAE,EAAE,EAAE,IAAI,CAAC;KACjC,MAAM,CAAC,2BAA2B,EAAE,EAAE,EAAE,kBAAkB,CAAC;KAC3D,MAAM,CAAC,iCAAiC,EAAE,EAAE,EAAE,wBAAwB,CAAC;KACvE,MAAM,CAAC,0BAA0B,EAAE,EAAE,EAAE,WAAW,CAAC;KACnD,MAAM,CAAC,yBAAyB,EAAE,EAAE,EAAE,UAAU,CAAC;KACjD,MAAM,CAAC,qBAAqB,EAAE,EAAE,EAAE,KAAK,CAAC;KACxC,MAAM,CAAC,eAAe,EAAE,EAAE,EAAE,MAAM,CAAC;KACnC,MAAM,CAAC,KAAK,IAAI,EAAE;IACjB,MAAM,OAAO,GAAG,UAAU,EAAE,CAAA;IAC5B,MAAM,MAAM,GAAG,MAAM,
|
|
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
|
|
7
|
-
constructor(
|
|
8
|
-
|
|
9
|
-
|
|
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,
|
|
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"}
|
package/lib/ip-whitelist.js
CHANGED
|
@@ -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
|
|
9
|
-
constructor(
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
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)) {
|
package/lib/ip-whitelist.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ip-whitelist.js","sourceRoot":"","sources":["../src/ip-whitelist.ts"],"names":[],"mappings":";;;AACA,
|
|
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":";;;;;;AAAA,+CAAkD;AAClD,4DAAsD;AACtD,6CAAiD;AACjD,kDAAyB;AAyBzB,SAAgB,kBAAkB,CAAC,KAAY;IAC7C,OAAO,IAAA,2BAAY,EAAC,KAAK,EAAE;QACzB,GAAa,EAAE,YAAY,IAAc,OAAO,CAAC,GAAG,CAAC;QACrD,GAAa,EAAE,YAAY,IAAc,OAAO,CAAC,GAAG,CAAC;QACrD,GAAY,EAAE,YAAY,IAAa,OAAO,CAAC,IAAI,CAAC;QACpD,GAAY,EAAE,YAAY,IAAa,OAAO,CAAC,IAAI,CAAC;QACpD,GAAa,EAAE,UAAU,IAAc,OAAO,CAAC,KAAK,CAAC;QACrD,GAAa,EAAE,UAAU,IAAc,OAAO,CAAC,KAAK,CAAC;KACtD,CAAC,CAAA;AACJ,CAAC;AATD,gDASC;AAED,SAAS,YAAY,CACnB,KAAY,EACZ,GAAiC;IAEjC,OAAO,CAAC,EAAE,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAe,EAAE,EAAE;QACpE,MAAM,GAAG,GAAG,YAAY,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,CAAC,CAAA;QAC5D,MAAM,IAAI,GAAG,IAAA,qBAAa,EAAC,OAAO,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;QAEvE,IAAI,MAAM,GAAG,GAAG,GAAG,IAAI,OAAO,EAAE,CAAA;QAChC,IAAI,IAAI;
|
|
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,17 +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
|
|
13
|
-
constructor(
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
this.
|
|
19
|
-
this.
|
|
20
|
-
this.
|
|
21
|
-
|
|
22
|
-
|
|
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);
|
|
23
31
|
}
|
|
24
32
|
async getTarget(hostname) {
|
|
25
33
|
if (this.inHostnameWhitelist(hostname))
|
|
@@ -28,26 +36,35 @@ class Router extends async_constructor_1.AsyncConstructor {
|
|
|
28
36
|
return this.cache.get(hostname);
|
|
29
37
|
}
|
|
30
38
|
else {
|
|
31
|
-
if (
|
|
32
|
-
this.
|
|
33
|
-
return Target.
|
|
39
|
+
if (this.looseMode) {
|
|
40
|
+
queueMicrotask(() => this.getTargetWithoutCache(hostname));
|
|
41
|
+
return Target.Untrusted;
|
|
34
42
|
}
|
|
35
43
|
else {
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
44
|
+
return await this.getTargetWithoutCache(hostname);
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
async getTargetWithoutCache(hostname) {
|
|
49
|
+
if (await this.tester.isPoisoned(hostname)) {
|
|
50
|
+
this.setCache(hostname, Target.Trusted);
|
|
51
|
+
return Target.Trusted;
|
|
52
|
+
}
|
|
53
|
+
else {
|
|
54
|
+
const addresses = await (0, resolve_a_1.resolveA)(this.untrustedResolver, hostname);
|
|
55
|
+
if (addresses.length > 0) {
|
|
56
|
+
if (this.inIPWhitelist(addresses)) {
|
|
57
|
+
this.setCache(hostname, Target.Untrusted);
|
|
58
|
+
return Target.Untrusted;
|
|
46
59
|
}
|
|
47
60
|
else {
|
|
61
|
+
this.setCache(hostname, Target.Trusted);
|
|
48
62
|
return Target.Trusted;
|
|
49
63
|
}
|
|
50
64
|
}
|
|
65
|
+
else {
|
|
66
|
+
return Target.Trusted;
|
|
67
|
+
}
|
|
51
68
|
}
|
|
52
69
|
}
|
|
53
70
|
inIPWhitelist(addresses) {
|
package/lib/router.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"router.js","sourceRoot":"","sources":["../src/router.ts"],"names":[],"mappings":";;;AAIA,
|
|
1
|
+
{"version":3,"file":"router.js","sourceRoot":"","sources":["../src/router.ts"],"names":[],"mappings":"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"}
|
package/lib/server.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AACA,qCAAyC;AACzC,gDAAiC;AAEjC,iDAAmC;AACnC,oDAA+C;AAC/C,wDAAmD;AACnD,4CAAwC;AACxC,iEAA2D;AAC3D,+CAAkD;AAClD,4CAAmB;AAUnB,SAAgB,WAAW,CAAC,
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.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
|
|
12
|
-
constructor(
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
this.
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
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,
|
|
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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "fcdns",
|
|
3
|
-
"version": "0.2.
|
|
3
|
+
"version": "0.2.7",
|
|
4
4
|
"description": "DNS relay server with fact-checking.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"dns"
|
|
@@ -33,40 +33,39 @@
|
|
|
33
33
|
"node": ">= 14.5.0"
|
|
34
34
|
},
|
|
35
35
|
"devDependencies": {
|
|
36
|
-
"@commitlint/cli": "^
|
|
37
|
-
"@commitlint/config-conventional": "^
|
|
36
|
+
"@commitlint/cli": "^15.0.0",
|
|
37
|
+
"@commitlint/config-conventional": "^15.0.0",
|
|
38
38
|
"@types/ms": "^0.7.31",
|
|
39
|
-
"@types/node": "^16.
|
|
40
|
-
"@types/ping": "^0.
|
|
41
|
-
"@typescript-eslint/eslint-plugin": "^
|
|
42
|
-
"@typescript-eslint/parser": "^
|
|
43
|
-
"eslint": "^
|
|
39
|
+
"@types/node": "^16.11.12",
|
|
40
|
+
"@types/ping": "^0.4.0",
|
|
41
|
+
"@typescript-eslint/eslint-plugin": "^5.6.0",
|
|
42
|
+
"@typescript-eslint/parser": "^5.6.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.
|
|
48
|
-
"tsconfig-paths": "^3.
|
|
47
|
+
"standard-version": "^9.3.2",
|
|
48
|
+
"tsconfig-paths": "^3.12.0",
|
|
49
49
|
"tscpaths": "^0.0.9",
|
|
50
|
-
"typescript": "^4.
|
|
50
|
+
"typescript": "^4.5.3"
|
|
51
51
|
},
|
|
52
52
|
"dependencies": {
|
|
53
53
|
"@blackglory/errors": "^1.1.2",
|
|
54
|
-
"@blackglory/go": "^0.1.
|
|
55
|
-
"@blackglory/types": "^0.5.
|
|
56
|
-
"address-range": "^0.2.
|
|
57
|
-
"async-constructor": "^0.4.16",
|
|
54
|
+
"@blackglory/go": "^0.1.1",
|
|
55
|
+
"@blackglory/types": "^0.5.2",
|
|
56
|
+
"address-range": "^0.2.9",
|
|
58
57
|
"chalk": "^4.1.2",
|
|
59
|
-
"commander": "^8.
|
|
60
|
-
"extra-filesystem": "^0.3.
|
|
58
|
+
"commander": "^8.3.0",
|
|
59
|
+
"extra-filesystem": "^0.3.14",
|
|
61
60
|
"extra-logger": "^0.5.5",
|
|
62
|
-
"extra-promise": "^0.
|
|
63
|
-
"iterable-operator": "^0.14.
|
|
61
|
+
"extra-promise": "^0.19.4",
|
|
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.
|
|
66
|
+
"return-style": "^0.12.5"
|
|
68
67
|
},
|
|
69
68
|
"optionalDependencies": {
|
|
70
|
-
"internet-number": "^2.2.
|
|
69
|
+
"internet-number": "^2.2.16"
|
|
71
70
|
}
|
|
72
71
|
}
|