Updated Branches: refs/heads/master a16737a87 -> 216374ec4
THRIFT-2313 nodejs server crash after processing the first request when using MultiplexedProcessor/FramedBuffer/BinaryProtocol patch: Pierre Lamot Project: http://git-wip-us.apache.org/repos/asf/thrift/repo Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/216374ec Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/216374ec Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/216374ec Branch: refs/heads/master Commit: 216374ec4a72cbabf7c76dd9284362aba4d30f1c Parents: a16737a Author: henrique <[email protected]> Authored: Tue Jan 14 15:17:04 2014 +0100 Committer: henrique <[email protected]> Committed: Tue Jan 14 15:17:04 2014 +0100 ---------------------------------------------------------------------- lib/nodejs/lib/thrift/multiplexed_processor.js | 8 +- lib/nodejs/lib/thrift/transport.js | 12 + test/nodejs/Makefile.am | 4 +- test/nodejs/multiplex_client.js | 26 +- test/nodejs/thrift_test_driver.js | 512 +++++++++++--------- 5 files changed, 314 insertions(+), 248 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/thrift/blob/216374ec/lib/nodejs/lib/thrift/multiplexed_processor.js ---------------------------------------------------------------------- diff --git a/lib/nodejs/lib/thrift/multiplexed_processor.js b/lib/nodejs/lib/thrift/multiplexed_processor.js index 351733e..2931c4f 100644 --- a/lib/nodejs/lib/thrift/multiplexed_processor.js +++ b/lib/nodejs/lib/thrift/multiplexed_processor.js @@ -19,11 +19,11 @@ var Thrift = require('./thrift'); var MultiplexedProcessor = exports.MultiplexedProcessor = function(stream, options) { - this.services = new Map(); + this.services = {}; }; MultiplexedProcessor.prototype.registerProcessor = function(name, handler) { - this.services.set(name, handler); + this.services[name] = handler; }; MultiplexedProcessor.prototype.process = function(inp, out) { @@ -38,7 +38,7 @@ MultiplexedProcessor.prototype.process = function(inp, out) { var sname = p[0]; var fname = p[1]; - if (!this.services.has(sname)) { + if (! sname in this.services) { throw new Thrift.TException("TMultiplexedProcessor: Unknown service: " + sname); } @@ -56,6 +56,6 @@ MultiplexedProcessor.prototype.process = function(inp, out) { }; }; - this.services.get(sname).process(inpProxy, out); + this.services[sname].process(inpProxy, out); }; http://git-wip-us.apache.org/repos/asf/thrift/blob/216374ec/lib/nodejs/lib/thrift/transport.js ---------------------------------------------------------------------- diff --git a/lib/nodejs/lib/thrift/transport.js b/lib/nodejs/lib/thrift/transport.js index 3adeaf8..2926d00 100644 --- a/lib/nodejs/lib/thrift/transport.js +++ b/lib/nodejs/lib/thrift/transport.js @@ -90,7 +90,14 @@ TFramedTransport.prototype = { open: function() {}, close: function() {}, + ensureAvailable: function(len) { + if (this.readPos + len > this.inBuf.length) { + throw new InputBufferUnderrunError(); + } + }, + read: function(len) { // this function will be used for each frames. + this.ensureAvailable(len); var end = this.readPos + len; if (this.inBuf.length < end) { @@ -103,28 +110,33 @@ TFramedTransport.prototype = { }, readByte: function() { + this.ensureAvailable(1); return binary.readByte(this.inBuf[this.readPos++]); }, readI16: function() { + this.ensureAvailable(2); var i16 = binary.readI16(this.inBuf, this.readPos); this.readPos += 2; return i16; }, readI32: function() { + this.ensureAvailable(4); var i32 = binary.readI32(this.inBuf, this.readPos); this.readPos += 4; return i32; }, readDouble: function() { + this.ensureAvailable(8); var d = binary.readDouble(this.inBuf, this.readPos); this.readPos += 8; return d; }, readString: function(len) { + this.ensureAvailable(len); var str = this.inBuf.toString('utf8', this.readPos, this.readPos + len); this.readPos += len; return str; http://git-wip-us.apache.org/repos/asf/thrift/blob/216374ec/test/nodejs/Makefile.am ---------------------------------------------------------------------- diff --git a/test/nodejs/Makefile.am b/test/nodejs/Makefile.am index a8c10aa..39a7237 100755 --- a/test/nodejs/Makefile.am +++ b/test/nodejs/Makefile.am @@ -50,7 +50,7 @@ client: NODE_PATH=../../lib/nodejs/lib:../../lib/nodejs/lib/thrift:$(NODE_PATH) node client.js mserver: - NODE_PATH=../../lib/nodejs/lib:../../lib/nodejs/lib/thrift:$(NODE_PATH) node --harmony multiplex_server.js + NODE_PATH=../../lib/nodejs/lib:../../lib/nodejs/lib/thrift:$(NODE_PATH) node multiplex_server.js mclient: - NODE_PATH=../../lib/nodejs/lib:../../lib/nodejs/lib/thrift:$(NODE_PATH) node --harmony multiplex_client.js + NODE_PATH=../../lib/nodejs/lib:../../lib/nodejs/lib/thrift:$(NODE_PATH) node multiplex_client.js http://git-wip-us.apache.org/repos/asf/thrift/blob/216374ec/test/nodejs/multiplex_client.js ---------------------------------------------------------------------- diff --git a/test/nodejs/multiplex_client.js b/test/nodejs/multiplex_client.js index 3b79b6c..ba0d47b 100644 --- a/test/nodejs/multiplex_client.js +++ b/test/nodejs/multiplex_client.js @@ -78,7 +78,31 @@ client.testString("", function(err, response) { }); // all Languages in UTF-8 -var stringTest = "Afrikaans, Alemannisch, Aragonés, اÙعربÙØ©, ٠صرÙ, Asturianu, Aymar aru, AzÉrbaycan, ÐаÑҡоÑÑ, Boarisch, ŽemaitÄÅ¡ka, ÐелаÑÑÑкаÑ, ÐелаÑÑÑÐºÐ°Ñ (ÑаÑаÑкевÑÑа), ÐÑлгаÑÑки, Bamanankan, বাà¦à¦²à¦¾, Brezhoneg, Bosanski, Català , Mìng-dÄ̤ng-ngá¹³Ì, ÐÐ¾Ñ Ñийн, Cebuano, á£á³á©, Äesky, СловѣÌнÑÑÐºÑ / â°â°â°â°â°¡â°â° â°â°â°, ЧÓваÑла, Cymraeg, Dansk, Zazaki, ÞÞ¨ÞÞ¬ÞÞ¨ÞÞ¦ÞÞ°, Îλληνικά, Emilià n e rumagnòl, English, Esperanto, Español, Eesti, Euskara, ÙارسÛ, Suomi, Võro, Føroyskt, Français, Arpetan, Furlan, Frysk, Gaeilge, è´èª, Gà idhlig, Galego, Avañe'ẽ, àªà«àªàª°àª¾àª¤à«, Gaelg, ×¢×ר×ת, हिनà¥à¤¦à¥, Fiji Hindi, Hrvatski, Kreyòl ayisyen, Magyar, ÕÕ¡ÕµÕ¥ÖÕ¥Õ¶, Interlingua, Bahasa Indonesia, Ilokano, Ido, Ãslenska, Italiano, æ¥æ¬èª, Lojban, Basa Jawa, á¥áá áá£áá, Kongo, Kalaallisut, à²à²¨à³à²¨à²¡, íêµì´, ÐÑаÑа Ñай-ÐалкÑаÑ, Ripoarisch, Kurdî, Ðоми, Kernewek, ÐÑÑгÑзÑа, Latina, Ladino, Lëtzebuergesch, Limburgs, Lingála, ລາວ, Lietuvių, LatvieÅ¡u, Basa Banyumasan, Malagasy, ÐакедонÑки, മലയാളà´, मराठà¥, Bahasa Melayu, ٠ازÙرÙÙÛ, Nnapulitano, Nedersaksisch, नà¥à¤ªà¤¾à¤² à¤à¤¾à¤·à¤¾, Nederlands, âªNorsk (nynorsk)â¬, âªNorsk (bokmÃ¥l)â¬, Nouormand, Diné bizaad, Occitan, ÐÑонаÑ, Papiamentu, Deitsch, Norfuk / Pitkern, Polski, Ù¾ÙجابÛ, Ù¾ÚتÙ, Português, Runa Simi, Rumantsch, Romani, RomânÄ, Ð ÑÑÑкий, Ð¡Ð°Ñ Ð° ÑÑла, Sardu, Sicilianu, Scots, Sámegiella, Simple English, SlovenÄina, SlovenÅ¡Äina, СÑпÑки / Srpski, Seeltersk, Svenska, Kiswahili, தமிழà¯, à°¤à±à°²à±à°à±, Тоҷикӣ, à¹à¸à¸¢, Türkmençe, Tagalog, Türkçe, ТаÑаÑÑа/Tatarça, УкÑаÑнÑÑка, اردÙ, Tiếng Viá»t, Volapük, Walon, Winaray, å´è¯, isiXhosa, ××Ö´××ש, Yorùbá, Zeêuws, ä¸æ, B ân-lâm-gú, ç²µèª"; +var stringTest = "Afrikaans, Alemannisch, Aragonés, اÙعربÙØ©, ٠صرÙ, " + + "Asturianu, Aymar aru, AzÉrbaycan, ÐаÑҡоÑÑ, Boarisch, ŽemaitÄÅ¡ka, " + + "ÐелаÑÑÑкаÑ, ÐелаÑÑÑÐºÐ°Ñ (ÑаÑаÑкевÑÑа), ÐÑлгаÑÑки, Bamanankan, বাà¦à¦²à¦¾, " + + "Brezhoneg, Bosanski, Català , Mìng-dÄ̤ng-ngá¹³Ì, ÐÐ¾Ñ Ñийн, Cebuano, á£á³á©, " + + "Äesky, СловѣÌнÑÑÐºÑ / â°â°â°â°â°¡â°â° â°â°â°, ЧÓваÑла, Cymraeg, Dansk, Zazaki, " + + "ÞÞ¨ÞÞ¬ÞÞ¨ÞÞ¦ÞÞ°, Îλληνικά, Emilià n e rumagnòl, English, Esperanto, " + + "Español, Eesti, Euskara, ÙارسÛ, Suomi, Võro, Føroyskt, Français, " + + "Arpetan, Furlan, Frysk, Gaeilge, è´èª, Gà idhlig, Galego, Avañe'ẽ, " + + "àªà«àªàª°àª¾àª¤à«, Gaelg, ×¢×ר×ת, हिनà¥à¤¦à¥, Fiji Hindi, Hrvatski, Kreyòl ayisyen, " + + "Magyar, ÕÕ¡ÕµÕ¥ÖÕ¥Õ¶, Interlingua, Bahasa Indonesia, Ilokano, Ido, " + + "Ãslenska, Italiano, æ¥æ¬èª, Lojban, Basa Jawa, á¥áá áá£áá, Kongo, " + + "Kalaallisut, à²à²¨à³à²¨à²¡, íêµì´, ÐÑаÑаÑай-ÐалкÑаÑ, Ripoarisch, Kurdî, Ðоми, " + + "Kernewek, ÐÑÑгÑзÑа, Latina, Ladino, Lëtzebuergesch, Limburgs, " + + "Lingála, ລາວ, Lietuvių, LatvieÅ¡u, Basa Banyumasan, Malagasy, " + + "ÐакедонÑки, മലയാളà´, मराठà¥, Bahasa Melayu, ٠ازÙرÙÙÛ, Nnapulitano, " + + "Nedersaksisch, नà¥à¤ªà¤¾à¤² à¤à¤¾à¤·à¤¾, Nederlands, âªNorsk (nynorsk)â¬, âªNorsk (" + + "bokmÃ¥l)â¬, Nouormand, Diné bizaad, Occitan, ÐÑонаÑ, Papiamentu, " + + "Deitsch, Norfuk / Pitkern, Polski, Ù¾ÙجابÛ, Ù¾ÚتÙ, Português, Runa " + + "Simi, Rumantsch, Romani, RomânÄ, Ð ÑÑÑкий, Ð¡Ð°Ñ Ð° ÑÑла, Sardu, " + + "Sicilianu, Scots, Sámegiella, Simple English, SlovenÄina, " + + "SlovenÅ¡Äina, СÑпÑки / Srpski, Seeltersk, Svenska, Kiswahili, தமிழà¯, " + + "à°¤à±à°²à±à°à±, Тоҷикӣ, à¹à¸à¸¢, Türkmençe, Tagalog, Türkçe, ТаÑаÑÑа/Tatarça, " + + "УкÑаÑнÑÑка, اردÙ, Tiếng Viá»t, Volapük, Walon, Winaray, å´è¯, isiXhosa, " + + "××Ö´××ש, Yorùbá, Zeêuws, ä¸æ, Bân-lâm-gú, ç²µèª"; + client.testString(stringTest, function(err, response) { assert(!err); assert.equal(stringTest, response); http://git-wip-us.apache.org/repos/asf/thrift/blob/216374ec/test/nodejs/thrift_test_driver.js ---------------------------------------------------------------------- diff --git a/test/nodejs/thrift_test_driver.js b/test/nodejs/thrift_test_driver.js index 451573d..c61e99d 100644 --- a/test/nodejs/thrift_test_driver.js +++ b/test/nodejs/thrift_test_driver.js @@ -31,244 +31,274 @@ var ttypes = require('./gen-nodejs/ThriftTest_types'); var ThriftTestDriver = exports.ThriftTestDriver = function(client, callback) { - // deepEqual doesn't work with fields using node-int64 - function checkRecursively(map1, map2) { - if (typeof map1 !== 'function' && typeof map2 !== 'function') { - if (!map1 || typeof map1 !== 'object') { - assert.equal(map1, map2); - } else { - for (var key in map1) { - checkRecursively(map1[key], map2[key]); - } - } - } - } - - client.testVoid(function(err, response) { - assert( ! err); - assert.equal(undefined, response); //void - }); - - client.testString("Test", function(err, response) { - assert( ! err); - assert.equal("Test", response); - }); - - client.testString("", function(err, response) { - assert( ! err); - assert.equal("", response); - }); - - //all Languages in UTF-8 - var stringTest = "Afrikaans, Alemannisch, Aragonés, اÙعربÙØ©, ٠صرÙ, Asturianu, Aymar aru, AzÉrbaycan, ÐаÑҡоÑÑ, Boarisch, ŽemaitÄÅ¡ka, ÐелаÑÑÑкаÑ, ÐелаÑÑÑÐºÐ°Ñ (ÑаÑаÑкевÑÑа), ÐÑлгаÑÑки, Bamanankan, বাà¦à¦²à¦¾, Brezhoneg, Bosanski, Català , Mìng-dÄ̤ng-ngá¹³Ì, ÐÐ¾Ñ Ñийн, Cebuano, á£á³á©, Äesky, СловѣÌнÑÑÐºÑ / â°â°â°â°â°¡â°â° â°â°â°, ЧÓваÑла, Cymraeg, Dansk, Zazaki, ÞÞ¨ÞÞ¬ÞÞ¨ÞÞ¦ÞÞ°, Îλληνικά, Emilià n e rumagnòl, English, Esperanto, Español, Eesti, Euskara, ÙارسÛ, Suomi, Võro, Føroyskt, Français, Arpetan, Furlan, Frysk, Gaeilge, è´èª, Gà idhlig, Galego, Avañe'ẽ, àªà«àªàª°àª¾àª¤à«, Gaelg, ×¢×ר×ת, हिनà¥à¤¦à¥, Fiji Hindi, Hrvatski, Kreyòl ayisyen, Magyar, ÕÕ¡ÕµÕ¥ÖÕ¥Õ¶, Interlingua, Bahasa Indonesia, Ilokano, Ido, Ãslenska, Italiano, æ¥æ¬èª, Lojban, Basa Jawa, á¥áá áá£áá, Kongo, Kalaallisut, à²à²¨à³à²¨à²¡, íêµì´, ÐÑаÑÐ °Ñай-ÐалкÑаÑ, Ripoarisch, Kurdî, Ðоми, Kernewek, ÐÑÑгÑзÑа, Latina, Ladino, Lëtzebuergesch, Limburgs, Lingála, ລາວ, Lietuvių, LatvieÅ¡u, Basa Banyumasan, Malagasy, ÐакедонÑки, മലയാളà´, मराठà¥, Bahasa Melayu, ٠ازÙرÙÙÛ, Nnapulitano, Nedersaksisch, नà¥à¤ªà¤¾à¤² à¤à¤¾à¤·à¤¾, Nederlands, âªNorsk (nynorsk)â¬, âªNorsk (bokmÃ¥l)â¬, Nouormand, Diné bizaad, Occitan, ÐÑонаÑ, Papiamentu, Deitsch, Norfuk / Pitkern, Polski, Ù¾ÙجابÛ, Ù¾ÚتÙ, Português, Runa Simi, Rumantsch, Romani, RomânÄ, Ð ÑÑÑкий, Ð¡Ð°Ñ Ð° ÑÑла, Sardu, Sicilianu, Scots, Sámegiella, Simple English, SlovenÄina, SlovenÅ¡Äina, СÑпÑки / Srpski, Seeltersk, Svenska, Kiswahili, தமிழà¯, à°¤à±à°²à±à°à±, Тоҷикӣ, à¹à¸à¸¢, Türkmençe, Tagalog, Türkçe, ТаÑаÑÑа/Tatarça, УкÑаÑнÑÑка, اردÙ, Tiếng Viá»t, Volapük, Walon, Winaray, å´è¯, isiXhosa, ××Ö´××ש, Yorùbá, Zeêuws, ä¸æ, Bân-lâm-gú, ç²µèª"; - client.testString(stringTest, function(err, response) { - assert( ! err); - assert.equal(stringTest, response); - }); - - var specialCharacters = 'quote: \" backslash:' + - ' forwardslash-escaped: \/ ' + - ' backspace: \b formfeed: \f newline: \n return: \r tab: ' + - ' now-all-of-them-together: "\\\/\b\n\r\t' + - ' now-a-bunch-of-junk: !@#$%&()(&%$#{}{}<><><' + - ' char-to-test-json-parsing: ]] \"]] \\" }}}{ [[[ '; - client.testString(specialCharacters, function(err, response) { - assert( ! err); - assert.equal(specialCharacters, response); - }); - - - client.testByte(1, function(err, response) { - assert( ! err); - assert.equal(1, response); - }); - client.testByte(0, function(err, response) { - assert( ! err); - assert.equal(0, response); - }); - client.testByte(-1, function(err, response) { - assert( ! err); - assert.equal(-1, response); - }); - client.testByte(-127, function(err, response) { - assert( ! err); - assert.equal(-127, response); - }); - - client.testI32(-1, function(err, response) { - assert( ! err); - assert.equal(-1, response); - }); - - client.testI64(5, function(err, response) { - assert( ! err); - assert.equal(5, response); - }); - client.testI64(-5, function(err, response) { - assert( ! err); - assert.equal(-5, response); - }); - client.testI64(-34359738368, function(err, response) { - assert( ! err); - assert.equal(-34359738368, response); - }); - - client.testDouble(-5.2098523, function(err, response) { - assert( ! err); - assert.equal(-5.2098523, response); - }); - client.testDouble(7.012052175215044, function(err, response) { - assert( ! err); - assert.equal(7.012052175215044, response); - }); - - var out = new ttypes.Xtruct({ - string_thing: 'Zero', - byte_thing: 1, - i32_thing: -3, - i64_thing: 1000000 - }); - client.testStruct(out, function(err, response) { - assert( ! err); - checkRecursively(out, response); - }); - - var out2 = new ttypes.Xtruct2(); - out2.byte_thing = 1; - out2.struct_thing = out; - out2.i32_thing = 5; - client.testNest(out2, function(err, response) { - assert( ! err); - checkRecursively(out2, response); - }); - - var mapout = {}; - for (var i = 0; i < 5; ++i) { - mapout[i] = i-10; - } - client.testMap(mapout, function(err, response) { - assert( ! err); - assert.deepEqual(mapout, response); - }); - - var mapTestInput = { - "a":"123", "a b":"with spaces ", "same":"same", "0":"numeric key", - "longValue":stringTest, stringTest:"long key" - }; - client.testStringMap(mapTestInput, function(err, response) { - assert( ! err); - assert.deepEqual(mapTestInput, response); - }); - - var setTestInput = [1,2,3]; - client.testSet(setTestInput, function(err, response) { - assert( ! err); - assert.deepEqual(setTestInput, response); - }); - client.testList(setTestInput, function(err, response) { - assert( ! err); - assert.deepEqual(setTestInput, response); - }); - - client.testEnum(ttypes.Numberz.ONE, function(err, response) { - assert( ! err); - assert.equal(ttypes.Numberz.ONE, response); - }); - - client.testTypedef(69, function(err, response) { - assert( ! err); - assert.equal(69, response); - }); - - var mapMapTest = { - "4": {"1":1, "2":2, "3":3, "4":4}, - "-4": {"-4":-4, "-3":-3, "-2":-2, "-1":-1} - }; - client.testMapMap(mapMapTest, function(err, response) { - assert( ! err); - assert.deepEqual(mapMapTest, response); - }); - - var crazy = new ttypes.Insanity({ - "userMap":{ "5":5, "8":8 }, - "xtructs":[new ttypes.Xtruct({ - "string_thing":"Goodbye4", - "byte_thing":4, - "i32_thing":4, - "i64_thing":4 - }), new ttypes.Xtruct({ - "string_thing":"Hello2", - "byte_thing":2, - "i32_thing":2, - "i64_thing":2 - })] - }); - var insanity = { - "1":{ "2": crazy, "3": crazy }, - "2":{ "6":{ "userMap":null, "xtructs":null } } - }; - client.testInsanity(crazy, function(err, response) { - assert( ! err); - checkRecursively(insanity, response); - }); - - client.testException('TException', function(err, response) { - assert( ! response); - }); - - client.testException('Xception', function(err, response) { - assert( ! response); - assert.equal(err.errorCode, 1001); - assert.equal('Xception', err.message); - }); - - client.testException('no Exception', function(err, response) { - assert( ! err); - assert.equal(undefined, response); //void - }); - - client.testOneway(0, function(err, response) { - assert(false); //should not answer - }); - - (function() { - var test_complete = false; - var retrys = 0; - var retry_limit = 30; - var retry_interval = 100; - /** - * redo a simple test after the oneway to make sure we aren't "off by one" -- - * if the server treated oneway void like normal void, this next test will - * fail since it will get the void confirmation rather than the correct - * result. In this circumstance, the client will throw the exception: - * - * Because this is the last test against the server, when it completes - * the entire suite is complete by definition (the tests run serially). - */ - client.testI32(-1, function(err, response) { - assert( ! err); - assert.equal(-1, response); - test_complete = true; - }); - - //We wait up to retry_limit * retry_interval for the test suite to complete - function TestForCompletion() { - if(test_complete) { - if (callback) { - callback("Server successfully tested!"); - } - } else { - if (++retrys < retry_limit) { - setTimeout(TestForCompletion, retry_interval); - } else { - if (callback) { - callback("Server test failed to complete after " + - (retry_limit*retry_interval/1000) + " seconds"); - } - } - } - } - - setTimeout(TestForCompletion, retry_interval); - })(); -} \ No newline at end of file +// deepEqual doesn't work with fields using node-int64 +function checkRecursively(map1, map2) { + if (typeof map1 !== 'function' && typeof map2 !== 'function') { + if (!map1 || typeof map1 !== 'object') { + assert.equal(map1, map2); + } else { + for (var key in map1) { + checkRecursively(map1[key], map2[key]); + } + } + } +} + +client.testVoid(function(err, response) { + assert( ! err); + assert.equal(undefined, response); //void +}); + +client.testString("Test", function(err, response) { + assert( ! err); + assert.equal("Test", response); +}); + +client.testString("", function(err, response) { + assert( ! err); + assert.equal("", response); +}); + +//all Languages in UTF-8 +var stringTest = "Afrikaans, Alemannisch, Aragonés, اÙعربÙØ©, ٠صرÙ, " + + "Asturianu, Aymar aru, AzÉrbaycan, ÐаÑҡоÑÑ, Boarisch, ŽemaitÄÅ¡ka, " + + "ÐелаÑÑÑкаÑ, ÐелаÑÑÑÐºÐ°Ñ (ÑаÑаÑкевÑÑа), ÐÑлгаÑÑки, Bamanankan, " + + "বাà¦à¦²à¦¾, Brezhoneg, Bosanski, Català , Mìng-dÄ̤ng-ngá¹³Ì, ÐÐ¾Ñ Ñийн, " + + "Cebuano, á£á³á©, Äesky, СловѣÌнÑÑÐºÑ / â°â°â°â°â°¡â°â° â°â°â°, ЧÓваÑла, Cymraeg, " + + "Dansk, Zazaki, ÞÞ¨ÞÞ¬ÞÞ¨ÞÞ¦ÞÞ°, Îλληνικά, Emilià n e rumagnòl, English, " + + "Esperanto, Español, Eesti, Euskara, ÙارسÛ, Suomi, Võro, Føroyskt, " + + "Français, Arpetan, Furlan, Frysk, Gaeilge, è´èª, Gà idhlig, Galego, " + + "Avañe'ẽ, àªà«àªàª°àª¾àª¤à«, Gaelg, ×¢×ר×ת, हिनà¥à¤¦à¥, Fiji Hindi, Hrvatski, " + + "Kreyòl ayisyen, Magyar, ÕÕ¡ÕµÕ¥ÖÕ¥Õ¶, Interlingua, Bahasa Indonesia, " + + "Ilokano, Ido, Ãslenska, Italiano, æ¥æ¬èª, Lojban, Basa Jawa, " + + "á¥áá áá£áá, Kongo, Kalaallisut, à²à²¨à³à²¨à²¡, íêµì´, ÐÑаÑаÑай-ÐалкÑаÑ, " + + "Ripoarisch, Kurdî, Ðоми, Kernewek, ÐÑÑгÑзÑа, Latina, Ladino, " + + "Lëtzebuergesch, Limburgs, Lingála, ລາວ, Lietuvių, LatvieÅ¡u, Basa " + + "Banyumasan, Malagasy, ÐакедонÑки, മലയാളà´, मराठà¥, ٠ازÙرÙÙÛ, Bahasa " + + "Melayu, Nnapulitano, Nedersaksisch, नà¥à¤ªà¤¾à¤² à¤à¤¾à¤·à¤¾, Nederlands, âª" + + "Norsk (nynorsk)â¬, âªNorsk (bokmÃ¥l)â¬, Nouormand, Diné bizaad, " + + "Occitan, ÐÑонаÑ, Papiamentu, Deitsch, Polski, Ù¾ÙجابÛ, Ù¾ÚتÙ, " + + "Norfuk / Pitkern, Português, Runa Simi, Rumantsch, Romani, RomânÄ, " + + "Ð ÑÑÑкий, Ð¡Ð°Ñ Ð° ÑÑла, Sardu, Sicilianu, Scots, Sámegiella, Simple " + + "English, SlovenÄina, SlovenÅ¡Äina, СÑпÑки / Srpski, Seeltersk, " + + "Svenska, Kiswahili, தமிழà¯, à°¤à±à°²à±à°à±, Тоҷикӣ, à¹à¸à¸¢, Türkmençe, Tagalog, " + + "Türkçe, ТаÑаÑÑа/Tatarça, УкÑаÑнÑÑка, اردÙ, Tiếng Viá»t, Volapük, " + + "Walon, Winaray, å´è¯, isiXhosa, ××Ö´××ש, Yorùbá, Zeêuws, ä¸æ, " + + "Bân-lâm-gú, ç²µèª"; + +client.testString(stringTest, function(err, response) { + assert( ! err); + assert.equal(stringTest, response); +}); + +var specialCharacters = 'quote: \" backslash:' + + ' forwardslash-escaped: \/ ' + + ' backspace: \b formfeed: \f newline: \n return: \r tab: ' + + ' now-all-of-them-together: "\\\/\b\n\r\t' + + ' now-a-bunch-of-junk: !@#$%&()(&%$#{}{}<><><' + + ' char-to-test-json-parsing: ]] \"]] \\" }}}{ [[[ '; +client.testString(specialCharacters, function(err, response) { + assert( ! err); + assert.equal(specialCharacters, response); +}); + +client.testByte(1, function(err, response) { + assert( ! err); + assert.equal(1, response); +}); + +client.testByte(0, function(err, response) { + assert( ! err); + assert.equal(0, response); +}); + +client.testByte(-1, function(err, response) { + assert( ! err); + assert.equal(-1, response); +}); + +client.testByte(-127, function(err, response) { + assert( ! err); + assert.equal(-127, response); +}); + +client.testI32(-1, function(err, response) { + assert( ! err); + assert.equal(-1, response); +}); + +client.testI64(5, function(err, response) { + assert( ! err); + assert.equal(5, response); +}); + +client.testI64(-5, function(err, response) { + assert( ! err); + assert.equal(-5, response); +}); + +client.testI64(-34359738368, function(err, response) { + assert( ! err); + assert.equal(-34359738368, response); +}); + +client.testDouble(-5.2098523, function(err, response) { + assert( ! err); + assert.equal(-5.2098523, response); +}); + +client.testDouble(7.012052175215044, function(err, response) { + assert( ! err); + assert.equal(7.012052175215044, response); +}); + +var out = new ttypes.Xtruct({ + string_thing: 'Zero', + byte_thing: 1, + i32_thing: -3, + i64_thing: 1000000 +}); +client.testStruct(out, function(err, response) { + assert( ! err); + checkRecursively(out, response); +}); + +var out2 = new ttypes.Xtruct2(); +out2.byte_thing = 1; +out2.struct_thing = out; +out2.i32_thing = 5; +client.testNest(out2, function(err, response) { + assert( ! err); + checkRecursively(out2, response); +}); + +var mapout = {}; +for (var i = 0; i < 5; ++i) { + mapout[i] = i-10; +} +client.testMap(mapout, function(err, response) { + assert( ! err); + assert.deepEqual(mapout, response); +}); + +var mapTestInput = { + "a":"123", "a b":"with spaces ", "same":"same", "0":"numeric key", + "longValue":stringTest, stringTest:"long key" +}; +client.testStringMap(mapTestInput, function(err, response) { + assert( ! err); + assert.deepEqual(mapTestInput, response); +}); + +var setTestInput = [1,2,3]; +client.testSet(setTestInput, function(err, response) { + assert( ! err); + assert.deepEqual(setTestInput, response); +}); +client.testList(setTestInput, function(err, response) { + assert( ! err); + assert.deepEqual(setTestInput, response); +}); + +client.testEnum(ttypes.Numberz.ONE, function(err, response) { + assert( ! err); + assert.equal(ttypes.Numberz.ONE, response); +}); + +client.testTypedef(69, function(err, response) { + assert( ! err); + assert.equal(69, response); +}); + +var mapMapTest = { + "4": {"1":1, "2":2, "3":3, "4":4}, + "-4": {"-4":-4, "-3":-3, "-2":-2, "-1":-1} +}; +client.testMapMap(mapMapTest, function(err, response) { + assert( ! err); + assert.deepEqual(mapMapTest, response); +}); + +var crazy = new ttypes.Insanity({ + "userMap":{ "5":5, "8":8 }, + "xtructs":[new ttypes.Xtruct({ + "string_thing":"Goodbye4", + "byte_thing":4, + "i32_thing":4, + "i64_thing":4 + }), new ttypes.Xtruct({ + "string_thing":"Hello2", + "byte_thing":2, + "i32_thing":2, + "i64_thing":2 + })] +}); +var insanity = { + "1":{ "2": crazy, "3": crazy }, + "2":{ "6":{ "userMap":null, "xtructs":null } } +}; +client.testInsanity(crazy, function(err, response) { + assert( ! err); + checkRecursively(insanity, response); +}); + +client.testException('TException', function(err, response) { + assert( ! response); +}); + +client.testException('Xception', function(err, response) { + assert( ! response); + assert.equal(err.errorCode, 1001); + assert.equal('Xception', err.message); +}); + +client.testException('no Exception', function(err, response) { + assert( ! err); + assert.equal(undefined, response); //void +}); + +client.testOneway(0, function(err, response) { + assert(false); //should not answer +}); + +(function() { + var test_complete = false; + var retrys = 0; + var retry_limit = 30; + var retry_interval = 100; + /** + * redo a simple test after the oneway to make sure we aren't "off by one" -- + * if the server treated oneway void like normal void, this next test will + * fail since it will get the void confirmation rather than the correct + * result. In this circumstance, the client will throw the exception: + * + * Because this is the last test against the server, when it completes + * the entire suite is complete by definition (the tests run serially). + */ + client.testI32(-1, function(err, response) { + assert( ! err); + assert.equal(-1, response); + test_complete = true; + }); + +//We wait up to retry_limit * retry_interval for the test suite to complete + function TestForCompletion() { + if(test_complete) { + if (callback) { + callback("Server successfully tested!"); + } + } else { + if (++retrys < retry_limit) { + setTimeout(TestForCompletion, retry_interval); + } else { + if (callback) { + callback("Server test failed to complete after " + + (retry_limit*retry_interval/1000) + " seconds"); + } + } + } + } + + setTimeout(TestForCompletion, retry_interval); +})(); +}
