support Buffer for rtHttpRequest::write (pxscene#1627)

npoltorapavlo · Michael Fiess · commit 30d1657244df · 2019-01-02T13:16:31.000-05:00
diff --git a/src/rtFileDownloader.cpp b/src/rtFileDownloader.cpp
@@ -138,12 +138,12 @@ static size_t ReadMemoryCallback(void *contents, size_t size, size_t nmemb, void
   size_t bufferSize = size * nmemb;
   struct MemoryStruct *mem = (struct MemoryStruct *)userp;
 
-  size_t sizeLeft = mem->downloadRequest->readData().byteLength() - mem->readSize;
+  size_t sizeLeft = mem->downloadRequest->readDataSize() - mem->readSize;
   if (sizeLeft > 0) {
     size_t copyThisMuch = sizeLeft;
     if (copyThisMuch > bufferSize)
       copyThisMuch = bufferSize;
-    memcpy(contents, mem->downloadRequest->readData().cString() + mem->readSize, copyThisMuch);
+    memcpy(contents, mem->downloadRequest->readData() + mem->readSize, copyThisMuch);
     mem->readSize += copyThisMuch;
     return copyThisMuch;
   }
@@ -188,6 +188,8 @@ rtFileDownloadRequest::rtFileDownloadRequest(const char* imageUrl, void* callbac
     , mIsProgressMeterSwitchOff(false), mHTTPFailOnError(false), mDefaultTimeout(false)
     , mCORS(), mCanceled(false), mUseCallbackDataSize(false), mCanceledMutex()
     , mMethod()
+    , mReadData(NULL)
+    , mReadDataSize(0)
 {
   mAdditionalHttpHeaders.clear();
 #ifdef ENABLE_HTTP_CACHE
@@ -522,16 +524,22 @@ rtString rtFileDownloadRequest::method() const
   return mMethod;
 }
 
-void rtFileDownloadRequest::setReadData(const rtString& val)
+void rtFileDownloadRequest::setReadData(const uint8_t* data, size_t size)
 {
-  mReadData = val;
+  mReadData = data;
+  mReadDataSize = size;
 }
 
-rtString rtFileDownloadRequest::readData() const
+const uint8_t* rtFileDownloadRequest::readData() const
 {
   return mReadData;
 }
 
+size_t rtFileDownloadRequest::readDataSize() const
+{
+  return mReadDataSize;
+}
+
 rtFileDownloader::rtFileDownloader()
     : mNumberOfCurrentDownloads(0), mDefaultCallbackFunction(NULL), mDownloadHandles(), mReuseDownloadHandles(false),
       mCaCertFile(CA_CERTIFICATE), mFileCacheMutex()
@@ -798,7 +806,7 @@ bool rtFileDownloader::downloadFromNetwork(rtFileDownloadRequest* downloadReques
     MemoryStruct chunk;
 
     rtString method = downloadRequest->method();
-    size_t readDataSize = downloadRequest->readData().byteLength();
+    size_t readDataSize = downloadRequest->readDataSize();
 
     curl_handle = rtFileDownloader::instance()->retrieveDownloadHandle();
     curl_easy_reset(curl_handle);
diff --git a/src/rtFileDownloader.h b/src/rtFileDownloader.h
@@ -106,8 +106,9 @@ class rtFileDownloadRequest
   bool isCanceled();
   void setMethod(const char* method);
   rtString method() const;
-  void setReadData(const rtString& val);
-  rtString readData() const;
+  void setReadData(const uint8_t* data, size_t size);
+  const uint8_t* readData() const;
+  size_t readDataSize() const;
 
 private:
   rtString mFileUrl;
@@ -142,7 +143,8 @@ class rtFileDownloadRequest
   bool mUseCallbackDataSize;
   rtMutex mCanceledMutex;
   rtString mMethod;
-  rtString mReadData;
+  const uint8_t* mReadData;
+  size_t mReadDataSize;
 };
 
 struct rtFileDownloadHandle
diff --git a/src/rtHttpRequest.cpp b/src/rtHttpRequest.cpp
@@ -37,12 +37,16 @@ rtDefineMethod(rtHttpRequest, removeHeader);
 rtHttpRequest::rtHttpRequest(const rtString& url)
   : mEmit(new rtEmit())
   , mUrl(url)
+  , mWriteData(NULL)
+  , mWriteDataSize(0)
   , mInQueue(false)
 {
 }
 
 rtHttpRequest::rtHttpRequest(const rtObjectRef& options)
   : mEmit(new rtEmit())
+  , mWriteData(NULL)
+  , mWriteDataSize(0)
   , mInQueue(false)
 {
   rtString url;
@@ -92,6 +96,8 @@ rtHttpRequest::rtHttpRequest(const rtObjectRef& options)
 
 rtHttpRequest::~rtHttpRequest()
 {
+  if (mWriteData)
+    free(mWriteData);
 }
 
 rtError rtHttpRequest::addListener(const rtString& eventName, const rtFunctionRef& f)
@@ -130,7 +136,7 @@ rtError rtHttpRequest::end()
   rtFileDownloadRequest* req = new rtFileDownloadRequest(mUrl.cString(), this, rtHttpRequest::onDownloadComplete);
   req->setAdditionalHttpHeaders(mHeaders);
   req->setMethod(mMethod);
-  req->setReadData(mWriteData);
+  req->setReadData(mWriteData, mWriteDataSize);
   if (rtFileDownloader::instance()->addToDownloadQueue(req)) {
     mInQueue = true;
     return RT_OK;
@@ -140,14 +146,47 @@ rtError rtHttpRequest::end()
   return RT_FAIL;
 }
 
-rtError rtHttpRequest::write(const rtString& chunk)
+rtError rtHttpRequest::write(const rtValue& chunk)
 {
   if (mInQueue) {
     rtLogError("%s: already in queue", __FUNCTION__);
     return RT_FAIL;
   }
 
-  mWriteData = chunk;
+  if (mWriteData)
+    free(mWriteData);
+
+  mWriteData = NULL;
+  mWriteDataSize = 0;
+
+  if (!chunk.isEmpty()) {
+    if (chunk.getType() == RT_objectType) {
+      rtObjectRef obj = chunk.toObject();
+
+      uint32_t len = obj.get<uint32_t>("length");
+      if (len > 0) {
+        rtLogInfo("write %u bytes (Buffer)", len);
+        mWriteData = (uint8_t*)malloc(len);
+        mWriteDataSize = len;
+      }
+      for (uint32_t i = 0; i < len; i++) {
+        mWriteData[i] = obj.get<uint8_t>(i);
+      }
+    } else if (chunk.getType() == RT_stringType) {
+      rtString str = chunk.toString();
+
+      uint32_t len = static_cast<uint32_t>(str.byteLength());
+      if (len > 0) {
+        rtLogInfo("write %u bytes (string)", len);
+        mWriteData = (uint8_t*)malloc(len);
+        mWriteDataSize = len;
+        memcpy(mWriteData, str.cString(), len);
+      }
+    } else {
+      rtLogInfo("unknown write data type");
+    }
+  }
+
   return RT_OK;
 }
 
@@ -254,11 +293,16 @@ rtString rtHttpRequest::method() const
   return mMethod;
 }
 
-rtString rtHttpRequest::writeData() const
+const uint8_t* rtHttpRequest::writeData() const
 {
   return mWriteData;
 }
 
+size_t rtHttpRequest::writeDataSize() const
+{
+  return mWriteDataSize;
+}
+
 bool rtHttpRequest::inQueue() const
 {
   return mInQueue;
diff --git a/src/rtHttpRequest.h b/src/rtHttpRequest.h
@@ -34,7 +34,7 @@ class rtHttpRequest : public rtObject
   rtMethod1ArgAndNoReturn("removeAllListeners", removeAllListenersByName, rtString);
   rtMethodNoArgAndNoReturn("abort", abort);
   rtMethodNoArgAndNoReturn("end", end);
-  rtMethod1ArgAndNoReturn("write", write, rtString);
+  rtMethod1ArgAndNoReturn("write", write, rtValue);
   rtMethod2ArgAndNoReturn("setTimeout", setTimeout, int32_t, rtFunctionRef);
   rtMethod2ArgAndNoReturn("setHeader", setHeader, rtString, rtString);
   rtMethod1ArgAndReturn("getHeader", getHeader, rtString, rtString);
@@ -50,7 +50,7 @@ class rtHttpRequest : public rtObject
   rtError removeAllListenersByName(const rtString& eventName);
   rtError abort() const;
   rtError end();
-  rtError write(const rtString& chunk);
+  rtError write(const rtValue& chunk);
   rtError setTimeout(int32_t msecs, const rtFunctionRef& f);
   rtError setHeader(const rtString& name, const rtString& value);
   rtError getHeader(const rtString& name, rtString& s);
@@ -61,15 +61,17 @@ class rtHttpRequest : public rtObject
   rtString url() const;
   std::vector<rtString> headers() const;
   rtString method() const;
-  rtString writeData() const;
+  const uint8_t* writeData() const;
+  size_t writeDataSize() const;
   bool inQueue() const;
 
 private:
   rtEmitRef mEmit;
   rtString mUrl;
   std::vector<rtString> mHeaders;
   rtString mMethod;
-  rtString mWriteData;
+  uint8_t* mWriteData;
+  size_t mWriteDataSize;
   bool mInQueue;
 };
 
diff --git a/src/rtScriptV8/rtWrapperUtils.cpp b/src/rtScriptV8/rtWrapperUtils.cpp
@@ -498,7 +498,7 @@ rtValue js2rt(v8::Local<v8::Context>& ctx, const Handle<Value>& val, rtWrapperEr
     // from some other native addon. Maybe that would actuall work and fail
     // at a lower level?
     Local<Object> obj = val->ToObject();
-    if (obj->InternalFieldCount() > 0)
+    if (obj->InternalFieldCount() > 0 && !val->IsArrayBufferView() /*Buffer*/)
     {
       return rtObjectWrapper::unwrapObject(obj);
     }
diff --git a/tests/pxScene2d/test_rtHttpRequest.cpp b/tests/pxScene2d/test_rtHttpRequest.cpp
@@ -51,7 +51,7 @@ class rtHttpRequestTest : public testing::Test
     EXPECT_EQ (std::string(req->url().cString()), "https://example.com");
     EXPECT_EQ ((int)0, (int)req->headers().size());
     EXPECT_TRUE (req->method().isEmpty());
-    EXPECT_TRUE (req->writeData().isEmpty());
+    EXPECT_EQ ((int)0, (int)req->writeDataSize());
     EXPECT_FALSE (req->inQueue());
   }
 
@@ -78,7 +78,7 @@ class rtHttpRequestTest : public testing::Test
     EXPECT_EQ (std::string(req->headers()[0].cString()), "Content-Type: application/json");
     EXPECT_EQ (std::string(req->headers()[1].cString()), "Authorization: token");
     EXPECT_EQ (std::string(req->method().cString()), "POST");
-    EXPECT_EQ (std::string(req->writeData().cString()), "{\"postKey1\":\"postValue1\"}");
+    EXPECT_EQ (std::string((const char*)req->writeData(), req->writeDataSize()), "{\"postKey1\":\"postValue1\"}");
     EXPECT_FALSE (req->inQueue());
   }
 
@@ -94,7 +94,7 @@ class rtHttpRequestTest : public testing::Test
     EXPECT_EQ ((int)1, (int)req->headers().size());
     EXPECT_EQ (std::string(req->headers()[0].cString()), "Authorization: token");
     EXPECT_TRUE (req->method().isEmpty());
-    EXPECT_TRUE (req->writeData().isEmpty());
+    EXPECT_EQ ((int)0, (int)req->writeDataSize());
     EXPECT_FALSE (req->inQueue());
   }
 
@@ -157,7 +157,7 @@ class rtHttpRequestTest : public testing::Test
     EXPECT_EQ (std::string(req->headers()[0].cString()), "Content-Type: application/json");
     EXPECT_EQ (std::string(req->headers()[1].cString()), "Authorization: token");
     EXPECT_EQ (std::string(req->method().cString()), "POST");
-    EXPECT_EQ (std::string(req->writeData().cString()), "{\"postKey1\":\"postValue1\"}");
+    EXPECT_EQ (std::string((const char*)req->writeData(), req->writeDataSize()), "{\"postKey1\":\"postValue1\"}");
     EXPECT_TRUE (req->inQueue());
 
     // already in queue

Original file line number	Diff line number	Diff line change
`@@ -498,7 +498,7 @@ rtValue js2rt(v8::Local<v8::Context>& ctx, const Handle<Value>& val, rtWrapperEr`
`498`	`498`	`// from some other native addon. Maybe that would actuall work and fail`
`499`	`499`	`// at a lower level?`
`500`	`500`	`Local<Object> obj = val->ToObject();`
`501`		`- if (obj->InternalFieldCount() > 0)`
	`501`	`+ if (obj->InternalFieldCount() > 0 && !val->IsArrayBufferView() /Buffer/)`
`502`	`502`	`{`
`503`	`503`	`return rtObjectWrapper::unwrapObject(obj);`
`504`	`504`	`}`