rewrite

binding.gyp

@@ -6,12 +6,12 @@
               "rdp.cc",
               "bridge.cc",
               "generator.cc",
-              "channel.cc",
-              "rail.cc",
-              "clipboard.cc",
               "context.cc",
-              "pointer.cc",
-              "node-freerdp2.cc"
+              "node-freerdp2.cc",
+              "channels/channel.cc",
+              "channels/rail.cc",
+              "channels/clipboard.cc",
+              "channels/pointer.cc",
             ],
             "libraries": [
               "-lfreerdp-client2",
@@ -24,7 +24,7 @@
             "conditions":[
                 ["OS=='win'", {
                   "library_dirs":[
-                      "libs/win64/libs"
+                    "libs/win64/libs"
                   ],
                   "include_dirs" : [
                     "<!(node -e \"require('nan')\")",
@@ -39,6 +39,7 @@
                             "libs/win64/dll/winpr2.dll",
                             "libs/win64/dll/libcrypto-1_1-x64.dll",
                             "libs/win64/dll/libssl-1_1-x64.dll",
+                            "libs/win64/dll/libusb-1.0.dll",
                           ]
                       }
                   ]}]

bridge.cc

@@ -2,7 +2,6 @@
 
 #include "bridge.h"
 #include "rdp.h"
-#include "clipboard.h"
 
 using v8::Function;
 using v8::Local;

channel.cc → channels/channel.cc

@@ -1,4 +1,4 @@
-#include "context.h"
+#include "../context.h"
 #include "rail.h"
 #include "clipboard.h"
 

clipboard.cc → channels/clipboard.cc

@@ -66,12 +66,12 @@ BOOL node_cliprdr_init(nodeContext* swfc, CliprdrClientContext* cliprdr) {
 	clipboard->length = (wcslen(defaultClip)+1)*2;
 	clipboard->buffer = (byte *)defaultClip;
 	swfc->clipboard = clipboard;
-	swfc->clipboard_context = cliprdr;
+	swfc->clipboardContext = cliprdr;
 	cliprdr->custom = swfc;
 
-	cliprdr->MonitorReady = node_cliprdr_monitor_ready;
-	cliprdr->ServerFormatDataRequest = node_cliprdr_server_format_data_request;
-	cliprdr->ServerFormatDataResponse = node_cliprdr_server_format_data_response;
+	cliprdr->MonitorReady = reinterpret_cast<pcCliprdrMonitorReady>(node_cliprdr_monitor_ready);
+	cliprdr->ServerFormatDataRequest = reinterpret_cast<pcCliprdrServerFormatDataRequest>(node_cliprdr_server_format_data_request);
+	cliprdr->ServerFormatDataResponse = reinterpret_cast<pcCliprdrServerFormatDataResponse>(node_cliprdr_server_format_data_response);
 
 	return TRUE;
 }

clipboard.h → channels/clipboard.h

@@ -1,4 +1,4 @@
-#include "context.h"
+#include "../context.h"
 
 BOOL node_cliprdr_init(nodeContext* swfc, CliprdrClientContext* cliprdr);
 void node_cliprdr_uninit(nodeContext* swfc, CliprdrClientContext* cliprdr);

pointer.h → channels/pointer.h

@@ -1,5 +1,2 @@
-
-#include "context.h"
-
-
+#include "../context.h"
 BOOL node_register_pointer(rdpGraphics* graphics);

rail.cc → channels/rail.cc

@@ -1,4 +1,4 @@
-#include "context.h"
+#include "rail.h"
 
 static UINT node_rail_server_handshake(RailClientContext* context,
 	RAIL_HANDSHAKE_ORDER* handshake)

rail.h → channels/rail.h

@@ -1,4 +1,4 @@
-#include "context.h"
+#include "../context.h"
 
 void node_rail_init(nodeContext* nctx, RailClientContext* rail);
 void node_rail_uninit(nodeContext* nctx, RailClientContext* rail);

context.h

@@ -1,6 +1,7 @@
 #ifndef NODE_FREERDP_CONTEXT_H
 #define NODE_FREERDP_CONTEXT_H
 
+#pragma comment(lib, "DbgHelp.lib")
 
 #include <winsock2.h>
 #include <Windows.h>
@@ -37,6 +38,11 @@ using Nan::New;
 using Nan::Null;
 
 
+typedef struct _SessionData
+{
+	freerdp* instance;
+	bool stopping;
+}SessionData;
 typedef struct _NodePointer
 {
 	rdpPointer pointer;
@@ -50,28 +56,15 @@ typedef struct _NodeClipboard {
 	int length;
 } NodeClipboard;
 
-
-struct node_info
-{
-  void* data;
-};
-typedef struct node_info nodeInfo;
-
 struct node_context
 {
   rdpContext context;
-	DEFINE_RDP_CLIENT_COMMON();
-
-  nodeInfo* nodei;
+  DEFINE_RDP_CLIENT_COMMON();
+  SessionData * session;
   GeneratorContext *generatorContext;
-
-  //ANDROID_EVENT_QUEUE* event_queue;
-  //pthread_t thread;
-  //BOOL is_connected;
-
 	RailClientContext* rail;
   NodeClipboard * clipboard;
-  CliprdrClientContext* clipboard_context;
+  CliprdrClientContext* clipboardContext;
   bool keyframe;
 };
 typedef struct node_context nodeContext;

generator.cc

@@ -5,10 +5,13 @@
 using Nan::Callback;
 using Nan::HandleScope;
 using Nan::New;
+using Nan::Null;
 using v8::Array;
 using v8::Local;
 using v8::String;
 using v8::Value;
+using v8::Number;
+using v8::Object;
 
 struct GeneratorBaton {
   uv_work_t request;     // libuv
@@ -50,3 +53,37 @@ void generator_emit(GeneratorContext *generator, const GeneratorType *type, void
 
   uv_queue_work(uv_default_loop(), &baton->request, DelayAsync, DelayAsyncAfter);
 }
+
+Local<Array> connect_args_parser(void *generic) {
+  connect_args *args = static_cast<connect_args *>(generic);
+  Local<Array> argv = New<Array>();
+  free(args);
+  return argv;
+}
+Local<Array> close_args_parser(void *generic) {
+  close_args *args = static_cast<close_args *>(generic);
+  Local<Array> argv = New<Array>();
+  Local<Object> obj = New<Object>();
+  obj->Set(New<String>("msg").ToLocalChecked(), New<String>(args->msg).ToLocalChecked());
+  argv->Set(0, obj);
+  free(args);
+  return argv;
+}
+
+Local<Array> draw_args_parser(void *generic) {
+  draw_args *args = static_cast<draw_args *>(generic);
+  Local<Object> obj = New<Object>();
+  obj->Set(New<String>("x").ToLocalChecked(), New<Number>(args->x));
+  obj->Set(New<String>("y").ToLocalChecked(), New<Number>(args->y));
+  obj->Set(New<String>("w").ToLocalChecked(), New<Number>(args->w));
+  obj->Set(New<String>("h").ToLocalChecked(), New<Number>(args->h));
+  obj->Set(New<String>("bpp").ToLocalChecked(), New<Number>(args->bpp));
+  int size = args->w * args->h * args->bpp;
+  Nan::MaybeLocal<v8::Object> buffer = Nan::CopyBuffer((const char *)args->buffer, size);
+  obj->Set(New<String>("buffer").ToLocalChecked(), buffer.ToLocalChecked());
+  Local<Array> argv = New<Array>();
+  argv->Set(0, obj);
+  delete[] args->buffer;
+  delete args;
+  return argv;
+}

generator.h

@@ -19,4 +19,26 @@ struct GeneratorType {
 
 void generator_emit(GeneratorContext *generator, const GeneratorType *type, void *data);
 
+struct connect_args {};
+Local<Array> connect_args_parser(void *generic);
+const struct GeneratorType CONNECT_GENERATOR_TYPE = {"connect",connect_args_parser};
+
+struct close_args {
+	char * msg;
+};
+Local<Array> close_args_parser(void *generic);
+const struct GeneratorType CLOSE_GENERATOR_TYPE = {"close",close_args_parser };
+
+struct draw_args {
+  int x;
+  int y;
+  int w;
+  int h;
+  int bpp;
+  BYTE* buffer;
+};
+Local<Array> draw_args_parser(void *generic) ;
+const struct GeneratorType DRAW_GENERATOR_TYPE = {"bitmap",draw_args_parser};
+
+
 #endif // NODE_ASYNC_LEARN_GENERATOR_H