@moddable/pebbleproxy 0.1.0 → 0.1.3

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@moddable/pebbleproxy",
-	"version": "0.1.0",
+	"version": "0.1.3",
 	"description": "Proxy network protocols for PebbleOS",
 	"license": "LGPLv3",
 	"main": "proxy.js",

package/proxy.js

@@ -20,13 +20,15 @@
 
 console.log("moddable proxies launched");
 
+const PROXY_VERSION = 1;
 const HTTP_BASE = 15000;
+const READY_MESSAGE = 15025;
 const WS_BASE = 15050;
 
 const gHTTPRequests = new Map;
 const gWSRequests = new Map;
 
-function eventReceived(e) {
+function appMessageReceived(e) {
 	if (state.log) {
 		console.log("moddable appmessage received");
 
@@ -49,7 +51,7 @@ function eventReceived(e) {
 			httpMessage(id, e);
 		}
 		catch (error) {
-			console.log("moddable pxoxy http exception" + error);
+			console.log("moddable proxy http exception" + error);
 		}
 		return true;
 	}
@@ -60,7 +62,7 @@ function eventReceived(e) {
 			wsMessage(id, e);
 		}
 		catch (error) {
-			console.log("moddable pxoxy ws exception" + error);
+			console.log("moddable proxy ws exception" + error);
 		}
 		return true;
 	}
@@ -68,6 +70,14 @@ function eventReceived(e) {
 	return false;
 };
 
+function readyReceived(e) {
+	if (state.log)
+		console.log("readyReceived")
+	sendAppMessage({
+		[READY_MESSAGE]: PROXY_VERSION
+	});
+}
+
 function httpMessage(id, e) {
 	if (state.log)
 		console.log("   connection: " + id);
@@ -189,7 +199,7 @@ function httpMessage(id, e) {
 			}
 			request.xhr.onerror = function () {
 				console.log("ON error!!!!")
-				Pebble.sendAppMessage({
+				sendAppMessage({
 					[HTTP_BASE + 1]: request.id,
 					[HTTP_BASE + 9]: -1						// done. failure.
 				});
@@ -250,22 +260,22 @@ function wsMessage(id, e) {
 			request.ws = new WebSocket(url);
 			request.ws.binaryType = "arraybuffer";
 
-			request.ws.onopen = event => {
+			request.ws.onopen = ( )=> {
 				if (state.log)
 					console.log("websocket connected to host");
 				request.state = "connected";
 				request.messages = [];
 				request.messages.sending = false;
-				Pebble.sendAppMessage({
+				sendAppMessage({
 					[WS_BASE + 1]: request.id,
 					[WS_BASE + 2]: 0						// connected. success.
 				});
 			};
-			request.ws.onerror = event => {
+			request.ws.onerror = () => {
 				if (state.log)
 					console.log("websocket connection failed");
 				request.state = "error";
-				Pebble.sendAppMessage({
+				sendAppMessage({
 					[WS_BASE + 1]: request.id,
 					[WS_BASE + 3]: -1						// disconnected error.
 				});
@@ -283,11 +293,13 @@ function wsMessage(id, e) {
 					console.log(`close code ${code} reason ${arrayToString(reason)}`);
 				if (reason.byteLength)
 					bytes.set(arrayToUint8Array(reason.slice(2)), 2);
-				Pebble.sendAppMessage({
+				request.messages.push({
 					[WS_BASE + 1]: request.id,
 					[WS_BASE + 3]: 0,						// disconnected clean.
 					[WS_BASE + 10]: Array.from(bytes)		// sendAppMessage wants an Array
 				});
+				if (!request.messages.sending)
+					sendRequestMessage(request);
 			};
 			request.ws.onmessage = event => {
 				let data = event.data;		// either ArrayBuffer or String
@@ -379,6 +391,47 @@ function wsMessage(id, e) {
 	}
 }
 
+const sendQueue = [];
+let sending = false;
+
+function sendAppMessageSuccess() {
+	// console.log("sendAppMessageSuccess");
+	sending = false;
+	const sent = sendQueue.shift();
+	if (sent.success)
+		sent.success();
+	if (!sending && sendQueue.length) {
+	// console.log("Send from success");
+		sending = true;
+		Pebble.sendAppMessage(sendQueue[0].message, sendAppMessageSuccess, sendAppMessageFailure);
+	}
+}
+
+function sendAppMessageFailure() {
+	// console.log("sendAppMessageFailure");
+	sending = false;
+	const sent = sendQueue.shift();
+	if (sent.failure)
+		sent.failure();
+	if (!sending && sendQueue.length) {
+	// console.log("Send from failure");
+		sending = true;
+		Pebble.sendAppMessage(sendQueue[0].message, sendAppMessageSuccess, sendAppMessageFailure);
+	}
+}
+
+function sendAppMessage(message, success, failure) {
+	// console.log("sendAppMessage");
+	sendQueue.push({message, success, failure});
+	if (sending)
+		return;
+
+	// console.log("Send initial");
+	sending = true;
+	Pebble.sendAppMessage(sendQueue[0].message, sendAppMessageSuccess, sendAppMessageFailure);
+}
+
+
 function sendRequestMessage(request) {
 	if ("http" === request.kind)
 		sendRequestMessageHTTP(request);
@@ -390,7 +443,7 @@ function sendRequestMessage(request) {
 
 function sendRequestMessageHTTP(request)
 {
-	Pebble.sendAppMessage(
+	sendAppMessage(
 		request.messages.shift(),
 		function () {
 			if (request.messages.length)
@@ -399,9 +452,9 @@ function sendRequestMessageHTTP(request)
 				request.state = "done";
 		},
 		function () {
-			console.log("message send FAILED");
+			console.log("http message send FAILED");
 
-			Pebble.sendAppMessage({
+			sendAppMessage({
 				[HTTP_BASE + 1]: request.id,
 				[HTTP_BASE + 9]: -1						// done. failure.
 			});
@@ -410,7 +463,7 @@ function sendRequestMessageHTTP(request)
 }
 
 function sendRequestMessageWS(request) {
-	Pebble.sendAppMessage(
+	sendAppMessage(
 		request.messages.shift(),
 		function () {
 			if (request.messages.length)
@@ -419,9 +472,9 @@ function sendRequestMessageWS(request) {
 				request.messages.sending = false;
 		},
 		function (e) {
-			console.log("message send FAILED " + JSON.stringify(e));
+			console.log("ws message send FAILED " + JSON.stringify(e));
 
-			Pebble.sendAppMessage({
+			sendAppMessage({
 				[WS_BASE + 1]: request.id,
 				[WS_BASE + 3]: -1						// done. failure.
 			});
@@ -472,7 +525,9 @@ function stringToArray(str) {
 }
 
 const state = {
-	eventReceived,
+	appMessageReceived,
+	readyReceived,
+	sendAppMessage,
 	log: false
 };