diff --git a/fibjs/include/ifs/BufferedStream.h b/fibjs/include/ifs/BufferedStream.h index 3bbcd1b5cf..e661075ac3 100644 --- a/fibjs/include/ifs/BufferedStream.h +++ b/fibjs/include/ifs/BufferedStream.h @@ -246,6 +246,8 @@ namespace fibjs inline void BufferedStream_base::s_readPacket(const v8::FunctionCallbackInfo& args) { + DEPRECATED_SOON(); + obj_ptr vr; METHOD_INSTANCE(BufferedStream_base); @@ -284,6 +286,8 @@ namespace fibjs inline void BufferedStream_base::s_writePacket(const v8::FunctionCallbackInfo& args) { + DEPRECATED_SOON(); + METHOD_INSTANCE(BufferedStream_base); METHOD_ENTER(1, 1); diff --git a/fibjs/include/ifs/BufferedStream.idl b/fibjs/include/ifs/BufferedStream.idl index f8ae2344db..42b12e2929 100644 --- a/fibjs/include/ifs/BufferedStream.idl +++ b/fibjs/include/ifs/BufferedStream.idl @@ -42,7 +42,7 @@ interface BufferedStream : Stream @param limit 指定此次读取的最大字节数,超出则抛出错误 @return 返回读取的二进制数据块,若无数据可读,或者连接中断,则返回 null */ - Buffer readPacket(Integer limit = -1) async; + deprecated Buffer readPacket(Integer limit = -1) async; /*! @brief 写入一个字符串 @param txt 指定写入的字符串 @@ -57,7 +57,7 @@ interface BufferedStream : Stream /*! @brief 写入一个二进制数据包 @param data 指定写入的二进制数据 */ - writePacket(Buffer data) async; + deprecated writePacket(Buffer data) async; /*! @brief 查询创建缓存对象时的流对象 */ readonly Stream stream; diff --git a/test/buffered_test.js b/test/buffered_test.js index 4b40649344..6ef8080816 100644 --- a/test/buffered_test.js +++ b/test/buffered_test.js @@ -99,82 +99,6 @@ describe("buffered stream", function() { f.close(); }); - it('packet read&write', function() { - f = fs.open("test0000", 'w+'); - var r = new io.BufferedStream(f); - - for (var i = 0; i < 1000; i++) - r.writePacket(s.substring(0, i)); - - f.rewind(); - for (var i = 0; i < 1000; i++) - assert.equal(r.readPacket().toString(), s.substring(0, i)); - }); - - it("PacketMessage sendTo", function() { - f.rewind(); - f.truncate(0); - - var m = new mq.PacketMessage(); - - for (var i = 0; i < 1000; i++) { - m.body.write(s.substring(0, i)); - m.sendTo(f); - m.clear(); - } - - f.rewind(); - var r = new io.BufferedStream(f); - - for (var i = 0; i < 1000; i++) { - assert.equal(r.readPacket().toString(), s.substring(0, i)); - } - }); - - it("PacketMessage readFrom", function() { - f.rewind(); - f.truncate(0); - - var r = new io.BufferedStream(f); - - for (var i = 1; i < 1000; i++) - r.writePacket(s.substring(0, i)); - - var m = new mq.PacketMessage(); - - f.rewind(); - for (var i = 1; i < 1000; i++) { - m.readFrom(r); - assert.equal(m.body.readAll().toString(), s.substring(0, i)); - m.clear(); - } - }); - - it('readPacket return null at the end of file', function() { - f.rewind(); - f.truncate(0); - - var r = new io.BufferedStream(f); - assert.isNull(r.readPacket()); - }); - - it('readPacket limit', function() { - var r = new io.BufferedStream(f); - f.rewind(); - r.writePacket(s.substring(0, 65567)); - - f.rewind(); - assert.equal(r.readPacket(65567).toString(), s.substring(0, 65567)); - - f.rewind(); - r = new io.BufferedStream(f); - assert.throws(function() { - r.readPacket(65566); - }); - - f.close(); - }); - it("charset", function() { fs.unlink("test0000"); diff --git a/test/mq_test.js b/test/mq_test.js index fc90337bf2..4deeeb84e8 100644 --- a/test/mq_test.js +++ b/test/mq_test.js @@ -356,29 +356,6 @@ describe("mq", function() { }), m); assert.equal(n, 400); }); - - it("PacketHandler", function() { - var s = new net.TcpServer(9876, new mq.PacketHandler(function(r) { - var d = r.body.readAll(); - r.clear(); - r.response.body.write(d.toString().toUpperCase()); - })); - ss.push(s.socket) - - s.asyncRun(); - - var c = new net.Socket(); - c.connect('127.0.0.1', 9876); - var r = new io.BufferedStream(c); - - r.writePacket(new Buffer('abcdefg')); - var b = r.readPacket(); - assert.equal(b.toString(), 'ABCDEFG'); - - r.writePacket(new Buffer('abcdefg')); - var b = r.readPacket(); - assert.equal(b.toString(), 'ABCDEFG'); - }); }); //test.run(console.DEBUG); \ No newline at end of file