Merge pull request #1541 from andot/develop

Patch XMLHttpRequest.send for ArrayBuffer & ArrayBufferView.

Author: pandamicro

.gitignore

@@ -104,3 +104,5 @@ frameworks/js-bindings/bindings/proj.ios_mac/build/
 
 # Ignore files copied in compilation
 samples/*/project/proj.android/src
+
+*.jsc

frameworks/js-bindings/bindings/manual/network/XMLHTTPRequest.cpp

@@ -172,7 +172,15 @@ void MinXmlHttpRequest::_setHttpRequestHeader()
 
 }
 
-
+void MinXmlHttpRequest::_setHttpRequestData(const char *data, size_t len)
+{
+    if (len > 0 &&
+        (_meth.compare("post") == 0 || _meth.compare("POST") == 0 ||
+         _meth.compare("put") == 0 || _meth.compare("PUT") == 0))
+    {
+        _httpRequest->setRequestData(data, len);
+    }
+}
 
 /**
  *  @brief Callback for HTTPRequest. Handles the response and invokes Callback.
@@ -720,20 +728,32 @@ JS_BINDED_FUNC_IMPL(MinXmlHttpRequest, send)
     if (argc == 1)
     {
         JS::CallArgs args = JS::CallArgsFromVp(argc, vp);
-        if (!args.get(0).isString())
+        if (args.get(0).isString())
+        {
+            JSStringWrapper strWrap(args.get(0).toString());
+            data = strWrap.get();
+            _setHttpRequestData(data.c_str(), static_cast<size_t>(data.length()));
+        }
+        else if (args.get(0).isObject())
+        {
+            JSObject *obj = args.get(0).toObjectOrNull();
+            if (JS_IsArrayBufferObject(obj))
+            {
+                _setHttpRequestData((const char *)JS_GetArrayBufferData(obj), JS_GetArrayBufferByteLength(obj));
+            }
+            else if (JS_IsArrayBufferViewObject(obj))
+            {
+                _setHttpRequestData((const char *)JS_GetArrayBufferViewData(obj), JS_GetArrayBufferViewByteLength(obj));
+            }
+            else
+            {
+                return false;
+            }
+        }
+        else
         {
             return false;
         }
-        JSStringWrapper strWrap(args.get(0).toString());
-        data = strWrap.get();
-    }
-
-
-    if (data.length() > 0 &&
-        (_meth.compare("post") == 0 || _meth.compare("POST") == 0 ||
-         _meth.compare("put") == 0 || _meth.compare("PUT") == 0))
-    {
-        _httpRequest->setRequestData(data.c_str(), static_cast<unsigned int>(data.length()));
     }
 
     _setHttpRequestHeader();

frameworks/js-bindings/bindings/manual/network/XMLHTTPRequest.h

@@ -92,6 +92,7 @@ class MinXmlHttpRequest : public cocos2d::Ref
     void _gotHeader(std::string header);
     void _setRequestHeader(const char* field, const char* value);
     void _setHttpRequestHeader();
+    void _setHttpRequestData(const char *data, size_t len);
     void _sendRequest(JSContext *cx);
     void _notify(JSObject * callback);
 

samples/js-tests/project.json

@@ -176,6 +176,7 @@
         "src/CocoStudioTest/SceneTest/SceneEditorTest.js",
         "src/CocoStudioTest/CocoStudioTest.js",
         "src/XHRTest/XHRTest.js",
+        "src/XHRTest/XHRArrayBufferTest.js",
 
         "src/Box2dTest/Box2dTest.js",
         "src/ChipmunkTest/ChipmunkTest.js",

samples/js-tests/src/XHRTest/XHRArrayBufferTest.js

@@ -0,0 +1,121 @@
+/****************************************************************************
+ Copyright (c) 2008-2010 Ricardo Quesada
+ Copyright (c) 2011-2012 cocos2d-x.org
+ Copyright (c) 2013-2014 Chukong Technologies Inc.
+
+ http://www.cocos2d-x.org
+
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+ ****************************************************************************/
+
+//some utils functions
+function ensureLeftAligned (label) {
+    label.anchorX = 0;
+    label.anchorY = 1;
+    label.textAlign = cc.TEXT_ALIGNMENT_LEFT;
+}
+
+function streamXHREventsToLabel ( xhr, label, textbox, method ) {
+    // Simple events
+    ['loadstart', 'abort', 'error', 'load', 'loadend', 'timeout'].forEach(function (eventname) {
+        xhr["on" + eventname] = function () {
+            label.string += "\nEvent : " + eventname
+        }
+    });
+
+    // Special event
+    xhr.onreadystatechange = function () {
+        if (xhr.readyState == 4 && (xhr.status >= 200 && xhr.status <= 207)) {
+            var httpStatus = xhr.statusText;
+            var response = xhr.responseText.substring(0, 100) + "...";
+            textbox.string = method + " Response (100 chars):\n"
+            textbox.string += response
+            label.string += "\nStatus: Got " + method + " response! " + httpStatus
+        }
+    }
+}
+
+
+var XHRArrayBufferTestScene = TestScene.extend({
+    ctor:function () {
+        this._super(true);
+        var xhrLayer = new XHRArrayBufferTestLayer();
+        this.addChild(xhrLayer);
+    },
+    runThisTest:function () {
+        cc.director.runScene(this);
+    },
+    MainMenuCallback:function (sender) {
+        this._super(sender);
+    }
+});
+
+var XHRArrayBufferTestLayer = cc.Layer.extend({
+    ctor:function () {
+        this._super();
+    },
+
+    onEnter: function() {
+        this._super();
+        var l = new cc.LabelTTF("Get infos via XHR", "Thonburi", 16);
+        this.addChild(l, 1);
+        l.x = winSize.width / 2;
+        l.y = winSize.height - 60;
+
+        this.sendPostArrayBuffer();
+    },
+
+    sendPostArrayBuffer: function() {
+        var statusPostLabel = new cc.LabelTTF("Status:", "Thonburi", 12);
+        this.addChild(statusPostLabel, 1);
+
+        statusPostLabel.x = 10;
+        statusPostLabel.y = winSize.height - 100;
+        ensureLeftAligned(statusPostLabel);
+        statusPostLabel.setString("Status: Send Post Request to httpbin.org with ArrayBuffer");
+
+
+        var responseLabel = new cc.LabelTTF("", "Thonburi", 16);
+        this.addChild(responseLabel, 1);
+        ensureLeftAligned(responseLabel);
+        responseLabel.x = 10;
+        responseLabel.y = winSize.height / 2;
+        
+        var xhr = cc.loader.getXMLHttpRequest();
+        streamXHREventsToLabel(xhr, statusPostLabel, responseLabel, "POST");
+
+        xhr.open("POST", "http://httpbin.org/post");
+        //set Content-type "text/plain" to post ArrayBuffer or ArrayBufferView
+        xhr.setRequestHeader("Content-Type","text/plain");
+        // Uint8Array is an ArrayBufferView
+        xhr.send(new Uint8Array([1,2,3,4,5]));
+    },
+
+    scrollViewDidScroll:function (view) {
+    },
+    scrollViewDidZoom:function (view) {
+    }
+});
+
+var runXHRArrayBufferTest = function () {
+    var pScene = new cc.Scene();
+    var pLayer = new XHRArrayBufferTestLayer();
+    pScene.addChild(pLayer);
+    cc.director.runScene(pScene);
+};

samples/js-tests/src/XHRTest/XHRTest.js

@@ -178,4 +178,4 @@ var runXHRTest = function () {
     var pLayer = new XHRTestLayer();
     pScene.addChild(pLayer);
     cc.director.runScene(pScene);
-};
+};

samples/js-tests/src/tests-main.js

@@ -673,6 +673,14 @@ var testNames = [
         testScene:function () {
             return new XHRTestScene();
         }
+    },
+    {
+        title:"XMLHttpRequest send ArrayBuffer",
+        platforms: PLATFORM_ALL,
+        linksrc:"src/XHRTest/XHRArrayBufferTest.js",
+        testScene:function () {
+            return new XHRArrayBufferTestScene();
+        }
     }
 
     //"UserDefaultTest",