@moddable/pebbleproxy 0.1.0 → 0.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@moddable/pebbleproxy",
-	"version": "0.1.0",
+	"version": "0.1.2",
 	"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")
+	Pebble.sendAppMessage({
+		[READY_MESSAGE]: PROXY_VERSION
+	});
+}
+
 function httpMessage(id, e) {
 	if (state.log)
 		console.log("   connection: " + id);
@@ -250,7 +260,7 @@ 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";
@@ -261,7 +271,7 @@ function wsMessage(id, e) {
 					[WS_BASE + 2]: 0						// connected. success.
 				});
 			};
-			request.ws.onerror = event => {
+			request.ws.onerror = () => {
 				if (state.log)
 					console.log("websocket connection failed");
 				request.state = "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
@@ -472,7 +484,8 @@ function stringToArray(str) {
 }
 
 const state = {
-	eventReceived,
+	appMessageReceived,
+	readyReceived,
 	log: false
 };