fix bug

Author: lsongdev

.gitignore

@@ -1,5 +1,6 @@
 
 *.log
 yarn.lock
+node-tftp-test-data
 
 node_modules/

connection.js

@@ -1,19 +1,19 @@
 const udp = require('dgram');
 const { debuglog } = require('util');
-const EventEmitter = require('events');
 const Packet = require('./packet');
 
 const debug = debuglog('tftp2:server');
 
-class Connection extends EventEmitter {
+class Connection extends udp.Socket {
   constructor(rinfo) {
     super('udp4');
+    this.socket = this;
     this.setRemoteDescription(rinfo);
   }
   setRemoteDescription(rinfo) {
     return Object.assign(this, this.rinfo = rinfo);
   }
-  send(data) {
+  sendPacket(data) {
     const { rinfo } = this;
     if (data instanceof Packet)
       data = data.toBuffer();
@@ -26,19 +26,19 @@ class Connection extends EventEmitter {
   }
   sendRequest(opcode, filename) {
     const packet = Packet.createRequest(opcode, filename);
-    return this.send(packet);
+    return this.sendPacket(packet);
   };
   sendAck(block) {
     const { rinfo } = this;
     const packet = Packet.createAck(block);
     debug('send ack block %s to %s:%s', block, rinfo.address, rinfo.port);
-    return this.send(packet);
+    return this.sendPacket(packet);
   }
   sendBlock(block, data) {
     const { rinfo } = this;
     const packet = Packet.createData(block, data);
     debug('send block %s size %s, to %s:%s', block, data.length, rinfo.address, rinfo.port);
-    return this.send(packet);
+    return this.sendPacket(packet);
   }
   wait(fn) {
     return new Promise((resolve, reject) => {

example/index.js

@@ -13,11 +13,13 @@ const readChunk = filename =>
 (async () => {
 
   const filename = `node-tftp-test-data`;
-  await write(filename, Buffer.allocUnsafe(0xffffff));
+  const a = Buffer.allocUnsafe(0xffffff);
+  await write(filename, a);
 
   console.log('write done');
   const b = await readChunk(filename);
 
+  console.log('read done');
   assert.equal(a.length, 0xffffff);
   assert.equal(b.length, 0xffffff);
   assert.deepEqual(a, b);

index.js

@@ -11,16 +11,25 @@ const debug = debuglog('tftp2');
 const TFTP = (host, port, { BLOCK_SIZE = 512 } = {}) => {
   const rinfo = { address: host, port };
   const client = new Connection(rinfo);
-  const init = () => client.setRemoteDescription(rinfo);
+  const reset = () => client.setRemoteDescription(rinfo);
   return {
+    close() {
+      return client.close();
+    },
+    /**
+     * read
+     * @param {*} filename 
+     * @param {*} push 
+     * @param {*} done 
+     */
     async read(filename, push, done) {
       let block = 0, rinfo, data;
-      await init();
+      await reset();
       await client.sendRequest(Packet.OPCODE.RRQ, filename);
       while (true) {
         ({ rinfo, block, data } = await client.waitBlock(block + 1));
         debug('received block(%s) size(%s), from %s:%s', block, data.length, rinfo.address, rinfo.port);
-        push(data);
+        await push(data);
         await client.setRemoteDescription(rinfo);
         await client.sendAck(block);
         if (data.length < BLOCK_SIZE) {
@@ -29,9 +38,14 @@ const TFTP = (host, port, { BLOCK_SIZE = 512 } = {}) => {
         }
       }
     },
+    /**
+     * write
+     * @param {*} filename 
+     * @param {*} data 
+     */
     async write(filename, data) {
       let block, rinfo;
-      await init();
+      await reset();
       await client.sendRequest(Packet.OPCODE.WRQ, filename);
       const blocks = Math.floor(data.length / BLOCK_SIZE | 0) + 1;
       for (var i = 0; i < blocks; i++) {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "tftp2",
-  "version": "0.0.0",
+  "version": "0.0.1",
   "description": "simple tftp server and client in node.js",
   "main": "index.js",
   "scripts": {

test/index.js

@@ -37,4 +37,28 @@ test('Packet#decode', () => {
   assert.equal(a.opcode, b.opcode);
   assert.equal(a.filename, b.filename);
   assert.equal(b.mode, 'octet');
-});
+});
+
+const { read, write, close } = tftp('127.0.0.1', '6969');
+
+const readChunk = filename =>
+  new Promise(async (resolve, reject) => {
+    const buffer = [];
+    await read(filename, chunk => buffer.push(chunk), () =>
+      resolve(Buffer.concat(buffer)));
+  });
+
+const filename = `node-tftp-test-data`;
+const a = Buffer.allocUnsafe(0xffffff);
+
+test('tftp#write', async () => {
+  await write(filename, a);
+});
+
+test('tftp#read', async () => {
+  const b = await readChunk(filename);
+  assert.equal(a.length, 0xffffff);
+  assert.equal(b.length, 0xffffff);
+  assert.deepEqual(a, b);
+  close();
+});