Version 1.4 - Websockets and bug fixes

modules/corelib/http.lua

@@ -1,5 +1,6 @@
 HTTP = {
   timeout=5,
+  websocketTimeout=15,
   imageId=1000,
   images={},
   operations={}
@@ -55,6 +56,30 @@ function HTTP.downloadImage(url, callback)
   return operation
 end
 
+function HTTP.webSocket(url, callbacks, jsonWebsocket)
+  local operation = g_http.ws(url, HTTP.websocketTimeout)
+  HTTP.operations[operation] = {type="ws", json=jsonWebsocket, url=url, callbacks=callbacks}  
+  return {
+    id = operation,
+    url = url,
+    close = function() 
+      g_http.wsClose(operation)
+    end,
+    send = function(message)
+      if type(message) == "table" then
+        message = json.encode(message)
+      end
+      g_http.wsSend(operation, message)
+    end
+  }
+end
+HTTP.WebSocket = HTTP.webSocket
+
+function HTTP.webSocketJSON(url, callbacks)
+  return HTTP.webSocket(url, callbacks, true)
+end
+HTTP.WebSocketJSON = HTTP.webSocketJSON
+
 function HTTP.cancel(operationId)
   return g_http.cancel(operationId)
 end
@@ -71,6 +96,9 @@ function HTTP.onGet(operationId, url, err, data)
     local status, result = pcall(function() return json.decode(data) end)
     if not status then
       err = "JSON ERROR: " .. result
+      if data and data:len() > 0 then
+        err = err .. " (" .. data:sub(1, 100) .. ")"
+      end
     end  
     data = result
   end
@@ -99,6 +127,9 @@ function HTTP.onPost(operationId, url, err, data)
     local status, result = pcall(function() return json.decode(data) end)
     if not status then
       err = "JSON ERROR: " .. result
+      if data and data:len() > 0 then
+        err = err .. " (" .. data:sub(1, 100) .. ")"
+      end
     end  
     data = result
   end
@@ -142,6 +173,64 @@ function HTTP.onDownloadProgress(operationId, url, progress, speed)
   end
 end
 
+function HTTP.onWsOpen(operationId, message)
+  local operation = HTTP.operations[operationId]
+  if operation == nil then
+    return
+  end
+  if operation.callbacks.onOpen then
+    operation.callbacks.onOpen(message, operationId)
+  end
+end
+
+function HTTP.onWsMessage(operationId, message)
+  local operation = HTTP.operations[operationId]
+  if operation == nil then
+    return
+  end
+  if operation.callbacks.onMessage then
+    if operation.json then
+      local status, result = pcall(function() return json.decode(message) end)
+      local err = nil
+      if not status then
+        err = "JSON ERROR: " .. result
+        if message and message:len() > 0 then
+          err = err .. " (" .. message:sub(1, 100) .. ")"
+        end
+      end
+      if err then
+        if operation.callbacks.onError then
+          operation.callbacks.onError(err, operationId)
+        end        
+      else
+        operation.callbacks.onMessage(result, operationId)    
+      end
+    else
+      operation.callbacks.onMessage(message, operationId)
+    end
+  end
+end
+
+function HTTP.onWsClose(operationId, message)
+  local operation = HTTP.operations[operationId]
+  if operation == nil then
+    return
+  end
+  if operation.callbacks.onClose then
+    operation.callbacks.onClose(message, operationId)
+  end
+end
+
+function HTTP.onWsError(operationId, message)
+  local operation = HTTP.operations[operationId]
+  if operation == nil then
+    return
+  end
+  if operation.callbacks.onError then
+    operation.callbacks.onError(message, operationId)
+  end
+end
+
 connect(g_http, 
   {
     onGet = HTTP.onGet,
@@ -149,6 +238,10 @@ connect(g_http,
     onPost = HTTP.onPost,
     onPostProgress = HTTP.onPostProgress,
     onDownload = HTTP.onDownload,
-    onDownloadProgress = HTTP.onDownloadProgress
+    onDownloadProgress = HTTP.onDownloadProgress,
+    onWsOpen = HTTP.onWsOpen,
+    onWsMessage = HTTP.onWsMessage,
+    onWsClose = HTTP.onWsClose,
+    onWsError = HTTP.onWsError,
   })