fcdns 0.3.1 → 0.3.2

package/lib/utils/ip-list-file.js

@@ -1,44 +1,44 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.readIPListFile = exports.writeIPListFile = void 0;
-const fs_1 = require("fs");
-const address_range_1 = require("address-range");
-const is_ipv4_address_1 = require("./is-ipv4-address");
-const is_ipv6_address_1 = require("./is-ipv6-address");
-async function writeIPListFile(filename, ranges) {
-    await fs_1.promises.writeFile(filename, ranges.join('\n'));
-}
-exports.writeIPListFile = writeIPListFile;
-async function readIPListFile(filename) {
-    const ipv4AddressRanges = [];
-    const ipv6AddressRanges = [];
-    const text = await fs_1.promises.readFile(filename, 'utf-8');
-    text.split('\n')
-        .filter(x => x.trim())
-        .filter(x => x !== '')
-        .forEach(x => {
-        if ((0, is_ipv4_address_1.isIPv4Address)(x)) {
-            ipv4AddressRanges.push(address_range_1.IPv4AddressRange.from(x, x));
-        }
-        if ((0, is_ipv6_address_1.isIPv6Address)(x)) {
-            ipv6AddressRanges.push(address_range_1.IPv6AddressRange.from(x, x));
-        }
-        if (isIPv4AddressRange(x)) {
-            const [startAddress, endAddress] = x.split('-');
-            ipv4AddressRanges.push(address_range_1.IPv4AddressRange.from(startAddress, endAddress));
-        }
-        if (isIPv6AddressRange(x)) {
-            const [startAddress, endAddress] = x.split('-');
-            ipv6AddressRanges.push(address_range_1.IPv6AddressRange.from(startAddress, endAddress));
-        }
-    });
-    return { ipv4: ipv4AddressRanges, ipv6: ipv6AddressRanges };
-}
-exports.readIPListFile = readIPListFile;
-function isIPv4AddressRange(text) {
-    return /^[\d\.]+-[\d\.]+$/.test(text);
-}
-function isIPv6AddressRange(text) {
-    return /^[\da-f:]+-[\da-f:]+$/.test(text);
-}
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.readIPListFile = exports.writeIPListFile = void 0;
+const fs_1 = require("fs");
+const address_range_1 = require("address-range");
+const is_ipv4_address_1 = require("./is-ipv4-address");
+const is_ipv6_address_1 = require("./is-ipv6-address");
+async function writeIPListFile(filename, ranges) {
+    await fs_1.promises.writeFile(filename, ranges.join('\n'));
+}
+exports.writeIPListFile = writeIPListFile;
+async function readIPListFile(filename) {
+    const ipv4AddressRanges = [];
+    const ipv6AddressRanges = [];
+    const text = await fs_1.promises.readFile(filename, 'utf-8');
+    text.split('\n')
+        .filter(x => x.trim())
+        .filter(x => x !== '')
+        .forEach(x => {
+        if ((0, is_ipv4_address_1.isIPv4Address)(x)) {
+            ipv4AddressRanges.push(address_range_1.IPv4AddressRange.from(x, x));
+        }
+        if ((0, is_ipv6_address_1.isIPv6Address)(x)) {
+            ipv6AddressRanges.push(address_range_1.IPv6AddressRange.from(x, x));
+        }
+        if (isIPv4AddressRange(x)) {
+            const [startAddress, endAddress] = x.split('-');
+            ipv4AddressRanges.push(address_range_1.IPv4AddressRange.from(startAddress, endAddress));
+        }
+        if (isIPv6AddressRange(x)) {
+            const [startAddress, endAddress] = x.split('-');
+            ipv6AddressRanges.push(address_range_1.IPv6AddressRange.from(startAddress, endAddress));
+        }
+    });
+    return { ipv4: ipv4AddressRanges, ipv6: ipv6AddressRanges };
+}
+exports.readIPListFile = readIPListFile;
+function isIPv4AddressRange(text) {
+    return /^[\d\.]+-[\d\.]+$/.test(text);
+}
+function isIPv6AddressRange(text) {
+    return /^[\da-f:]+-[\da-f:]+$/.test(text);
+}
 //# sourceMappingURL=ip-list-file.js.map

package/lib/utils/is-alive.js

@@ -1,25 +1,25 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isAlive = void 0;
-const extra_promise_1 = require("extra-promise");
-const ping_1 = require("ping");
-const go_1 = require("@blackglory/go");
-async function isAlive(address, timeoutMsecs) {
-    try {
-        const result = await Promise.race([
-            (0, go_1.go)(async () => {
-                const res = await ping_1.promise.probe(address);
-                return res.alive;
-            }),
-            (0, extra_promise_1.timeout)(timeoutMsecs)
-        ]);
-        return result;
-    }
-    catch (e) {
-        if (e instanceof extra_promise_1.TimeoutError)
-            return false;
-        throw e;
-    }
-}
-exports.isAlive = isAlive;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isAlive = void 0;
+const extra_promise_1 = require("extra-promise");
+const ping_1 = require("ping");
+const go_1 = require("@blackglory/go");
+async function isAlive(address, timeoutMsecs) {
+    try {
+        const result = await Promise.race([
+            (0, go_1.go)(async () => {
+                const res = await ping_1.promise.probe(address);
+                return res.alive;
+            }),
+            (0, extra_promise_1.timeout)(timeoutMsecs)
+        ]);
+        return result;
+    }
+    catch (e) {
+        if (e instanceof extra_promise_1.TimeoutError)
+            return false;
+        throw e;
+    }
+}
+exports.isAlive = isAlive;
 //# sourceMappingURL=is-alive.js.map

package/lib/utils/is-ipv4-address.js

@@ -1,8 +1,8 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isIPv4Address = void 0;
-function isIPv4Address(text) {
-    return /^[\d\.]+$/.test(text);
-}
-exports.isIPv4Address = isIPv4Address;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isIPv4Address = void 0;
+function isIPv4Address(text) {
+    return /^[\d\.]+$/.test(text);
+}
+exports.isIPv4Address = isIPv4Address;
 //# sourceMappingURL=is-ipv4-address.js.map

package/lib/utils/is-ipv6-address.js

@@ -1,8 +1,8 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isIPv6Address = void 0;
-function isIPv6Address(text) {
-    return /^[\da-f:]+$/.test(text);
-}
-exports.isIPv6Address = isIPv6Address;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isIPv6Address = void 0;
+function isIPv6Address(text) {
+    return /^[\da-f:]+$/.test(text);
+}
+exports.isIPv6Address = isIPv6Address;
 //# sourceMappingURL=is-ipv6-address.js.map

package/lib/utils/level-to-string.js

@@ -1,16 +1,16 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.levelToString = void 0;
-function levelToString(level) {
-    switch (level) {
-        case 3: return 'Info';
-        case 2: return 'Debug';
-        case 4: return 'Warn';
-        case 1: return 'Trace';
-        case 5: return 'Error';
-        case 6: return 'Fatal';
-        default: return 'None';
-    }
-}
-exports.levelToString = levelToString;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.levelToString = void 0;
+function levelToString(level) {
+    switch (level) {
+        case 3: return 'Info';
+        case 2: return 'Debug';
+        case 4: return 'Warn';
+        case 1: return 'Trace';
+        case 5: return 'Error';
+        case 6: return 'Fatal';
+        default: return 'None';
+    }
+}
+exports.levelToString = levelToString;
 //# sourceMappingURL=level-to-string.js.map

package/lib/utils/map-file.js

@@ -1,28 +1,28 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.appendMapFile = exports.writeMapFile = exports.readMapFile = void 0;
-const chaining_1 = require("iterable-operator/lib/es2018/style/chaining");
-const fs_1 = require("fs");
-const extra_filesystem_1 = require("extra-filesystem");
-async function readMapFile(filename) {
-    await (0, extra_filesystem_1.ensureFile)(filename);
-    const text = await fs_1.promises.readFile(filename, 'utf-8');
-    const entries = text.split('\n')
-        .filter(x => !!x)
-        .map(x => JSON.parse(x));
-    return new Map(entries);
-}
-exports.readMapFile = readMapFile;
-async function writeMapFile(filename, map) {
-    const text = new chaining_1.IterableOperator(map.entries())
-        .map(x => JSON.stringify(x))
-        .toArray()
-        .join('\n');
-    await fs_1.promises.writeFile(filename, text + '\n');
-}
-exports.writeMapFile = writeMapFile;
-async function appendMapFile(filename, key, value) {
-    await fs_1.promises.appendFile(filename, JSON.stringify([key, value]) + '\n');
-}
-exports.appendMapFile = appendMapFile;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.appendMapFile = exports.writeMapFile = exports.readMapFile = void 0;
+const chaining_1 = require("iterable-operator/lib/es2018/style/chaining");
+const fs_1 = require("fs");
+const extra_filesystem_1 = require("extra-filesystem");
+async function readMapFile(filename) {
+    await (0, extra_filesystem_1.ensureFile)(filename);
+    const text = await fs_1.promises.readFile(filename, 'utf-8');
+    const entries = text.split('\n')
+        .filter(x => !!x)
+        .map(x => JSON.parse(x));
+    return new Map(entries);
+}
+exports.readMapFile = readMapFile;
+async function writeMapFile(filename, map) {
+    const text = new chaining_1.IterableOperator(map.entries())
+        .map(x => JSON.stringify(x))
+        .toArray()
+        .join('\n');
+    await fs_1.promises.writeFile(filename, text + '\n');
+}
+exports.writeMapFile = writeMapFile;
+async function appendMapFile(filename, key, value) {
+    await fs_1.promises.appendFile(filename, JSON.stringify([key, value]) + '\n');
+}
+exports.appendMapFile = appendMapFile;
 //# sourceMappingURL=map-file.js.map

package/lib/utils/parse-log-level.js

@@ -1,16 +1,16 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseLogLevel = void 0;
-function parseLogLevel(level) {
-    switch (level.toLowerCase()) {
-        case 'trace': return 1;
-        case 'debug': return 2;
-        case 'info': return 3;
-        case 'warn': return 4;
-        case 'error': return 5;
-        case 'fatal': return 6;
-        default: return 7;
-    }
-}
-exports.parseLogLevel = parseLogLevel;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseLogLevel = void 0;
+function parseLogLevel(level) {
+    switch (level.toLowerCase()) {
+        case 'trace': return 1;
+        case 'debug': return 2;
+        case 'info': return 3;
+        case 'warn': return 4;
+        case 'error': return 5;
+        case 'fatal': return 6;
+        default: return 7;
+    }
+}
+exports.parseLogLevel = parseLogLevel;
 //# sourceMappingURL=parse-log-level.js.map

package/lib/utils/parse-server-info.js

@@ -1,12 +1,12 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseServerInfo = void 0;
-function parseServerInfo(server) {
-    const [host, port] = server.split(':');
-    return {
-        host,
-        port: port ? Number.parseInt(port, 10) : undefined
-    };
-}
-exports.parseServerInfo = parseServerInfo;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseServerInfo = void 0;
+function parseServerInfo(server) {
+    const [host, port] = server.split(':');
+    return {
+        host,
+        port: port ? Number.parseInt(port, 10) : undefined
+    };
+}
+exports.parseServerInfo = parseServerInfo;
 //# sourceMappingURL=parse-server-info.js.map

package/lib/utils/resolve-a.js

@@ -1,19 +1,19 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveA = exports.TimeoutError = void 0;
-const extra_promise_1 = require("extra-promise");
-var extra_promise_2 = require("extra-promise");
-Object.defineProperty(exports, "TimeoutError", { enumerable: true, get: function () { return extra_promise_2.TimeoutError; } });
-async function resolveA(resolver, hostname, timeoutMsecs) {
-    if (timeoutMsecs) {
-        return await Promise.race([
-            resolver.resolve4(hostname),
-            (0, extra_promise_1.timeout)(timeoutMsecs)
-        ]);
-    }
-    else {
-        return await resolver.resolve4(hostname);
-    }
-}
-exports.resolveA = resolveA;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveA = exports.TimeoutError = void 0;
+const extra_promise_1 = require("extra-promise");
+var extra_promise_2 = require("extra-promise");
+Object.defineProperty(exports, "TimeoutError", { enumerable: true, get: function () { return extra_promise_2.TimeoutError; } });
+async function resolveA(resolver, hostname, timeoutMsecs) {
+    if (timeoutMsecs) {
+        return await Promise.race([
+            resolver.resolve4(hostname),
+            (0, extra_promise_1.timeout)(timeoutMsecs)
+        ]);
+    }
+    else {
+        return await resolver.resolve4(hostname);
+    }
+}
+exports.resolveA = resolveA;
 //# sourceMappingURL=resolve-a.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fcdns",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "description": "DNS relay server with fact-checking.",
   "keywords": [
     "dns"

package/lib/utils/address-ranges-file.js

@@ -1,48 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.readAddressRangesFile = exports.writeAddressRangesFile = void 0;
-const fs_1 = require("fs");
-const address_range_1 = require("address-range");
-async function writeAddressRangesFile(filename, ranges) {
-    await fs_1.promises.writeFile(filename, ranges.join('\n'));
-}
-exports.writeAddressRangesFile = writeAddressRangesFile;
-async function readAddressRangesFile(filename) {
-    const ipv4AddressRanges = [];
-    const ipv6AddressRanges = [];
-    const text = await fs_1.promises.readFile(filename, 'utf-8');
-    text.split('\n')
-        .filter(x => x.trim())
-        .filter(x => x !== '')
-        .forEach(x => {
-        if (isIPv4Address(x)) {
-            ipv4AddressRanges.push(address_range_1.IPv4AddressRange.from(x, x));
-        }
-        if (isIPv6Address(x)) {
-            ipv6AddressRanges.push(address_range_1.IPv6AddressRange.from(x, x));
-        }
-        if (isIPv4AddressRange(x)) {
-            const [startAddress, endAddress] = x.split('-');
-            ipv4AddressRanges.push(address_range_1.IPv4AddressRange.from(startAddress, endAddress));
-        }
-        if (isIPv6AddressRange(x)) {
-            const [startAddress, endAddress] = x.split('-');
-            ipv6AddressRanges.push(address_range_1.IPv6AddressRange.from(startAddress, endAddress));
-        }
-    });
-    return { ipv4: ipv4AddressRanges, ipv6: ipv6AddressRanges };
-}
-exports.readAddressRangesFile = readAddressRangesFile;
-function isIPv4Address(text) {
-    return /^[\d\.]+$/.test(text);
-}
-function isIPv4AddressRange(text) {
-    return /^[\d\.]+-[\d\.]+$/.test(text);
-}
-function isIPv6Address(text) {
-    return /^[\da-f:]$/.test(text);
-}
-function isIPv6AddressRange(text) {
-    return /^[\da-f:]+-[\da-f:]+$/.test(text);
-}
-//# sourceMappingURL=address-ranges-file.js.map

package/lib/utils/address-ranges-file.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"address-ranges-file.js","sourceRoot":"","sources":["../../src/utils/address-ranges-file.ts"],"names":[],"mappings":";;;AAAA,2BAAmC;AACnC,iDAAgF;AAEzE,KAAK,UAAU,sBAAsB,CAC1C,QAAgB,EAChB,MAAsB;IAEtB,MAAM,aAAE,CAAC,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;AACjD,CAAC;AALD,wDAKC;AAEM,KAAK,UAAU,qBAAqB,CACzC,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,aAAa,CAAC,CAAC,CAAC,EAAE;YACpB,iBAAiB,CAAC,IAAI,CAAC,gCAAgB,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;SACpD;QAED,IAAI,aAAa,CAAC,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,sDA+BC;AAED,SAAS,aAAa,CAAC,IAAY;IACjC,OAAO,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AAC/B,CAAC;AAED,SAAS,kBAAkB,CAAC,IAAY;IACtC,OAAO,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AACvC,CAAC;AAED,SAAS,aAAa,CAAC,IAAY;IACjC,OAAO,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AAChC,CAAC;AAED,SAAS,kBAAkB,CAAC,IAAY;IACtC,OAAO,uBAAuB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AAC3C,CAAC"}

package/lib/whitelist.js

@@ -1,31 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Whitelist = void 0;
-const async_constructor_1 = require("async-constructor");
-const address_ranges_file_1 = require("./utils/address-ranges-file");
-class Whitelist extends async_constructor_1.AsyncConstructor {
-    constructor(filename) {
-        super(async () => {
-            const { ipv4, ipv6 } = await address_ranges_file_1.readAddressRangesFile(filename);
-            this.ipv4 = ipv4;
-            this.ipv6 = ipv6;
-        });
-    }
-    includes(address) {
-        if (isIPv4Address(address)) {
-            return this.ipv4.some(x => x.includes(address));
-        }
-        if (isIPv6Address(address)) {
-            return this.ipv6.some(x => x.includes(address));
-        }
-        return false;
-    }
-}
-exports.Whitelist = Whitelist;
-function isIPv4Address(address) {
-    return /^[\d\.]+$/.test(address);
-}
-function isIPv6Address(address) {
-    return /^[\da-f:]+$/.test(address);
-}
-//# sourceMappingURL=whitelist.js.map

package/lib/whitelist.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"whitelist.js","sourceRoot":"","sources":["../src/whitelist.ts"],"names":[],"mappings":";;;AACA,yDAAoD;AACpD,oEAAkE;AAElE,MAAa,SAAU,SAAQ,oCAAgB;IAI7C,YAAY,QAAgB;QAC1B,KAAK,CAAC,KAAK,IAAI,EAAE;YACf,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,MAAM,2CAAqB,CAAC,QAAQ,CAAC,CAAA;YAC5D,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,aAAa,CAAC,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,aAAa,CAAC,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,8BAuBC;AAED,SAAS,aAAa,CAAC,OAAe;IACpC,OAAO,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;AAClC,CAAC;AAED,SAAS,aAAa,CAAC,OAAe;IACpC,OAAO,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;AACpC,CAAC"}