Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion client/tcp.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ const makeQuery = ({ name, type = 'A', cls = Packet.CLASS.IN, clientIp, recursiv
const sendQuery = (client, message) => {
const len = Buffer.alloc(2);
len.writeUInt16BE(message.length);
client.end(Buffer.concat([ len, message ]));
client.write(Buffer.concat([ len, message ]));
};

const protocols = {
Expand All @@ -39,6 +39,7 @@ const TCPClient = ({ dns, protocol = 'tcp:', port = protocol === 'tls:' ? 853 :

sendQuery(client, message);
const data = await Packet.readStream(client);
client.end();

if (!data.length) throw new Error('Empty response');
return Packet.parse(data);
Expand Down
34 changes: 32 additions & 2 deletions test/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const assert = require('assert');
const test = require('./test');
const { Packet, createDOHServer, createServer } = require('..');
// const { Packet, createDOHServer, createServer, TCPClient, DOHClient, UDPClient } = require('..');
// const { Packet, createDOHServer, createServer } = require('..');
const { Packet, createDOHServer, createServer, TCPClient, DOHClient, UDPClient } = require('..');

Check failure on line 4 in test/index.js

View workflow job for this annotation

GitHub Actions / build

'DOHClient' is assigned a value but never used
const http = require('http');
const tcp = require('net');
const udp = require('dgram');
Expand Down Expand Up @@ -371,6 +371,36 @@
// await server.close();
// });

test('server/udp-tcp#simple-request-async-response', async() => {
const server = createServer({
tcp : true,
udp : true,
handle(request, send, _info) {
const [ question ] = request.questions;
assert.deepEqual(request.questions, [ { name: 'test.com', type: 1, class: 1 } ]);
const response = Packet.createResponseFromRequest(request);
response.answers.push({
name : question.name,
type : Packet.TYPE.TXT,
class : Packet.CLASS.IN,
ttl : 300,
data : [ 'Hello World' ],
});

(new Promise((resolve) => setTimeout(() => resolve(), 1))).then(() => send(response));
},
});
const servers = await server.listen();
assert.ok(servers.udp.port > 1000);
assert.ok(servers.tcp.port > 1000);
const tcp = TCPClient({ dns: '127.0.0.1', port: servers.tcp.port });
const udp = UDPClient({ dns: '127.0.0.1', port: servers.udp.port });
const expected = [ { name: 'test.com', ttl: 300, type: 16, class: 1, data: 'Hello World' } ];
assert.deepEqual((await tcp('test.com')).answers, expected);
assert.deepEqual((await udp('test.com')).answers, expected);
await server.close();
});

test('server/all#invalid-request', async() => {
const server = createServer({
doh : true,
Expand Down
Loading