dns2 1.5.0 → 2.0.2
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/.eslintrc +16 -0
- package/.github/FUNDING.yml +12 -0
- package/.github/workflows/lint.js.yml +17 -0
- package/.github/workflows/node.js.yml +1 -2
- package/README.md +46 -15
- package/client/doh.js +24 -16
- package/client/google.js +4 -4
- package/client/tcp.js +10 -10
- package/client/udp.js +6 -6
- package/example/client/doh.js +5 -5
- package/example/client/google.js +1 -2
- package/example/client/tcp-custom-dns.js +4 -4
- package/example/client/tcp.js +4 -4
- package/example/client/udp-custom-dns.js +4 -4
- package/example/client/udp-default.js +2 -2
- package/example/client/udp-subnet.js +2 -2
- package/example/client/udp.js +3 -3
- package/example/server/dns.js +46 -0
- package/example/server/doh.js +18 -16
- package/example/server/tcp.js +6 -6
- package/example/server/udp.js +4 -4
- package/index.js +22 -14
- package/lib/reader.js +20 -22
- package/lib/writer.js +11 -11
- package/package.json +11 -3
- package/packet.js +217 -202
- package/server/dns.js +94 -0
- package/server/doh.js +130 -127
- package/server/index.js +10 -3
- package/server/tcp.js +14 -6
- package/server/udp.js +10 -4
- package/test/index.js +255 -104
- package/test/test.js +24 -17
- package/.travis.yml +0 -4
package/lib/reader.js
CHANGED
|
@@ -4,11 +4,11 @@
|
|
|
4
4
|
* @param {[type]} buffer [description]
|
|
5
5
|
* @param {[type]} offset [description]
|
|
6
6
|
*/
|
|
7
|
-
function BufferReader(buffer, offset){
|
|
7
|
+
function BufferReader(buffer, offset) {
|
|
8
8
|
this.buffer = buffer;
|
|
9
9
|
this.offset = offset || 0;
|
|
10
10
|
return this;
|
|
11
|
-
}
|
|
11
|
+
}
|
|
12
12
|
|
|
13
13
|
/**
|
|
14
14
|
* [read description]
|
|
@@ -17,27 +17,26 @@ function BufferReader(buffer, offset){
|
|
|
17
17
|
* @param {[type]} length [description]
|
|
18
18
|
* @return {[type]} [description]
|
|
19
19
|
*/
|
|
20
|
-
BufferReader.read = function(buffer, offset, length){
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
function t(n){
|
|
26
|
-
|
|
27
|
-
for (
|
|
20
|
+
BufferReader.read = function(buffer, offset, length) {
|
|
21
|
+
let a = [];
|
|
22
|
+
let c = Math.ceil(length / 8);
|
|
23
|
+
let l = Math.floor(offset / 8);
|
|
24
|
+
const m = offset % 8;
|
|
25
|
+
function t(n) {
|
|
26
|
+
const r = [ 0, 0, 0, 0, 0, 0, 0, 0 ];
|
|
27
|
+
for (let i = 7; i >= 0; i--) {
|
|
28
28
|
r[7 - i] = n & Math.pow(2, i) ? 1 : 0;
|
|
29
|
-
}
|
|
29
|
+
}
|
|
30
30
|
a = a.concat(r);
|
|
31
31
|
}
|
|
32
|
-
function p(a){
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
for(
|
|
36
|
-
if(a[ f - i ]) n += Math.pow(2, i);
|
|
32
|
+
function p(a) {
|
|
33
|
+
let n = 0;
|
|
34
|
+
const f = a.length - 1;
|
|
35
|
+
for (let i = f; i >= 0; i--) { if (a[f - i]) n += Math.pow(2, i); }
|
|
37
36
|
return n;
|
|
38
37
|
}
|
|
39
|
-
while(c--) t(buffer.readUInt8(l++));
|
|
40
|
-
return p(a.slice(m, m + length))
|
|
38
|
+
while (c--) t(buffer.readUInt8(l++));
|
|
39
|
+
return p(a.slice(m, m + length));
|
|
41
40
|
};
|
|
42
41
|
|
|
43
42
|
/**
|
|
@@ -45,11 +44,10 @@ BufferReader.read = function(buffer, offset, length){
|
|
|
45
44
|
* @param {[type]} size [description]
|
|
46
45
|
* @return {[type]} [description]
|
|
47
46
|
*/
|
|
48
|
-
BufferReader.prototype.read = function(size){
|
|
49
|
-
|
|
47
|
+
BufferReader.prototype.read = function(size) {
|
|
48
|
+
const val = BufferReader.read(this.buffer, this.offset, size);
|
|
50
49
|
this.offset += size;
|
|
51
50
|
return val;
|
|
52
51
|
};
|
|
53
52
|
|
|
54
|
-
|
|
55
|
-
module.exports = BufferReader;
|
|
53
|
+
module.exports = BufferReader;
|
package/lib/writer.js
CHANGED
|
@@ -1,11 +1,10 @@
|
|
|
1
1
|
|
|
2
|
-
|
|
3
2
|
/**
|
|
4
3
|
* [Writer description]
|
|
5
4
|
*/
|
|
6
|
-
function BufferWriter(){
|
|
5
|
+
function BufferWriter() {
|
|
7
6
|
this.buffer = [];
|
|
8
|
-
}
|
|
7
|
+
}
|
|
9
8
|
|
|
10
9
|
/**
|
|
11
10
|
* [write description]
|
|
@@ -13,9 +12,10 @@ function BufferWriter(){
|
|
|
13
12
|
* @param {[type]} size [description]
|
|
14
13
|
* @return {[type]} [description]
|
|
15
14
|
*/
|
|
16
|
-
BufferWriter.prototype.write = function(d, size){
|
|
17
|
-
for(
|
|
18
|
-
this.buffer.push((d & Math.pow(2, size - i - 1
|
|
15
|
+
BufferWriter.prototype.write = function(d, size) {
|
|
16
|
+
for (let i = 0; i < size; i++) {
|
|
17
|
+
this.buffer.push((d & Math.pow(2, size - i - 1)) ? 1 : 0);
|
|
18
|
+
}
|
|
19
19
|
};
|
|
20
20
|
|
|
21
21
|
/**
|
|
@@ -24,16 +24,16 @@ BufferWriter.prototype.write = function(d, size){
|
|
|
24
24
|
*/
|
|
25
25
|
BufferWriter.prototype.writeBuffer = function(b) {
|
|
26
26
|
this.buffer = this.buffer.concat(b.buffer);
|
|
27
|
-
}
|
|
27
|
+
};
|
|
28
28
|
|
|
29
29
|
/**
|
|
30
30
|
* [toBuffer description]
|
|
31
31
|
* @return {[type]} [description]
|
|
32
32
|
*/
|
|
33
|
-
BufferWriter.prototype.toBuffer = function(){
|
|
34
|
-
|
|
35
|
-
for(
|
|
36
|
-
|
|
33
|
+
BufferWriter.prototype.toBuffer = function() {
|
|
34
|
+
const arr = [];
|
|
35
|
+
for (let i = 0; i < this.buffer.length; i += 8) {
|
|
36
|
+
const chunk = this.buffer.slice(i, i + 8);
|
|
37
37
|
arr.push(parseInt(chunk.join(''), 2));
|
|
38
38
|
}
|
|
39
39
|
return Buffer.from(arr);
|
package/package.json
CHANGED
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "dns2",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "2.0.2",
|
|
4
4
|
"description": "A DNS Server and Client Implementation in Pure JavaScript with no dependencies.",
|
|
5
5
|
"main": "index.js",
|
|
6
6
|
"scripts": {
|
|
7
7
|
"test": "node test",
|
|
8
|
+
"lint": "eslint .",
|
|
8
9
|
"example-server-udp": "node example/server/udp.js",
|
|
9
10
|
"example-server-tcp": "node example/server/tcp.js",
|
|
10
11
|
"example-server-doh": "node example/server/doh.js",
|
|
@@ -20,7 +21,8 @@
|
|
|
20
21
|
"author": "Liu Song <hi@lsong.org>",
|
|
21
22
|
"contributors": [
|
|
22
23
|
"Andris Reinman <andris.reinman@gmail.com>",
|
|
23
|
-
"Eviltik <eviltik@gmail.com>"
|
|
24
|
+
"Eviltik <eviltik@gmail.com>",
|
|
25
|
+
"Martin Heidegger <martin.heidegger@gmail.com>"
|
|
24
26
|
],
|
|
25
27
|
"license": "MIT",
|
|
26
28
|
"repository": {
|
|
@@ -30,5 +32,11 @@
|
|
|
30
32
|
"bugs": {
|
|
31
33
|
"url": "https://github.com/song940/node-dns/issues"
|
|
32
34
|
},
|
|
33
|
-
"homepage": "https://github.com/song940/node-dns#readme"
|
|
35
|
+
"homepage": "https://github.com/song940/node-dns#readme",
|
|
36
|
+
"devDependencies": {
|
|
37
|
+
"eslint": "^7.28.0",
|
|
38
|
+
"eslint-config-semistandard": "^15.0.1",
|
|
39
|
+
"eslint-plugin-node": "^11.1.0",
|
|
40
|
+
"eslint-plugin-promise": "^4.2.1"
|
|
41
|
+
}
|
|
34
42
|
}
|