diff --git a/Makefile b/Makefile index 104920d..398958a 100755 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ VALID_TOOLCHAINS := pnacl newlib glibc clang-newlib mac -NACL_SDK_ROOT ?= $(abspath $(CURDIR)) +NACL_SDK_ROOT ?= /home/alex/Downloads/nacl_sdk/pepper_44 TARGET = SuperNET_API @@ -22,6 +22,8 @@ CHROME_ARGS += --allow-nacl-socket-api=localhost DEPS = nacl_io LIBS = jl777 pangea nanomsg crypto777 ccoin curl ssl crypto z pthread ppapi nacl_io PLIBS = nanoagent curl pthread ppapi nacl_io +PNACL_LDFLAGS := -L./lib/pnacl/Release + CFLAGS = -Wall -D__PNACL -fno-strict-aliasing -Ipicocoin/include diff --git a/Release/SuperNET_API.nmf b/Release/SuperNET_API.nmf deleted file mode 100644 index c18b29c..0000000 --- a/Release/SuperNET_API.nmf +++ /dev/null @@ -1,12 +0,0 @@ -{ - "program": { - "portable": { - "pnacl-translate": { - "url": "SuperNET_API.pexe" - }, - "pnacl-debug": { - "url": "SuperNET_API_unstripped.bc" - } - } - } -} diff --git a/background.js b/background.js index 5c3b1b7..bfe0015 100755 --- a/background.js +++ b/background.js @@ -11,7 +11,7 @@ function createWindow(url) { chrome.app.window.create(url, { width: 1024, height: 800, - frame: 'none' + frame: 'window' }); } diff --git a/common.js b/common.js index c569a61..83b74e1 100755 --- a/common.js +++ b/common.js @@ -328,51 +328,59 @@ var common = (function() { return true; } - function retmsg(msg) + function retmsg(msg, cb) { - common.naclModule.postMessage(msg); - console.log("sent: "+msg); + console.log(cb); + postCall("js", msg, cb, function() { + // nothing + }); + console.log("sent: "+msg+" "+cb); } function handleMessage(message_event) { if(isJson(message_event.data)) { - console.log("AAAA"); var request = JSON.parse(message_event.data); + var cb = request.pointer; console.log(request); if(request.method == "NxtAPI") { console.log(request.requestType); + if(request.params == undefined) request.params = "{}"; Jay.request(request.requestType, JSON.parse(request.params), function(ans) { - retmsg(ans); + retmsg(ans, cb); }) } else if(request.method == "status") { - retmsg("{'status':'doing alright'}"); + retmsg("{'status':'doing alright'}", cb); } else if(request.method == "signBytes") { var out = converters.byteArrayToHexString(signBytes(converters.hexStringToByteArray(request.bytes), request.secretPhrase)); var ret = {}; ret.signature = out; - retmsg(JSON.stringify(ret)); + retmsg(JSON.stringify(ret), cb); } else if(request.method == "createToken") { var out = createToken(request.data, request.secretPhrase); var ret = {}; ret.token = out; - retmsg(JSON.stringify(ret)); + retmsg(JSON.stringify(ret), cb); } else if(request.method == "parseToken") { var out = parseToken(request.token, request.data); - retmsg(JSON.stringify(out)); + retmsg(JSON.stringify(out), cb); } - console.log(request); + else + { + retmsg('{"error":"method not found"}', cb); } + } + if (typeof message_event.data === 'string') { for (var type in defaultMessageTypes) { @@ -464,6 +472,8 @@ var common = (function() { hideModule: hideModule, removeModule: removeModule, logMessage: logMessage, + postMessage: postMessage, + handleMessage: handleMessage, updateStatus: updateStatus }; diff --git a/example.js b/example.js index 81d21ae..2ff71b5 100755 --- a/example.js +++ b/example.js @@ -294,6 +294,7 @@ function close(e) { var funcToCallback = {}; function postCall(func) { + var callback = arguments[arguments.length - 1]; funcToCallback[func] = callback; diff --git a/handlers.c b/handlers.c index b8973ac..c1c4d53 100755 --- a/handlers.c +++ b/handlers.c @@ -1214,3 +1214,20 @@ int HandleSuperNET(struct PP_Var params,struct PP_Var *output,const char **out_e RESPONSE_STRING(retstr); return 0; } + +int HandleJS(struct PP_Var params, struct PP_Var* output, const char** out_error) { + PostMessage("JS?"); + CHECK_PARAM_COUNT(js, 2); + PARAM_STRING(0, jsonstr); + PARAM_STRING(1, ptr); + + int64_t nptr = strtoll(ptr, NULL, 10); + + char * addr = (char *)nptr; + + strcpy(addr, jsonstr); + + CREATE_RESPONSE(js); + RESPONSE_STRING(ptr); + return 0; +} diff --git a/handlers.h b/handlers.h index ecf3c1c..1b21a4a 100755 --- a/handlers.h +++ b/handlers.h @@ -37,5 +37,6 @@ int HandleConnect(struct PP_Var params, struct PP_Var* out, const char** error); int HandleSend(struct PP_Var params, struct PP_Var* out, const char** error); int HandleRecv(struct PP_Var params, struct PP_Var* out, const char** error); int HandleClose(struct PP_Var params, struct PP_Var* out, const char** error); +int HandleJS(struct PP_Var params, struct PP_Var* out, const char** error); #endif /* HANDLERS_H_ */ diff --git a/index.html b/index.html index 19fc739..ec8ff50 100755 --- a/index.html +++ b/index.html @@ -693,7 +693,8 @@