sip-lab 1.11.4 → 1.12.2

package/src/addon.cpp

@@ -48,41 +48,22 @@ void poll()
 Napi::Value transport_create(const Napi::CallbackInfo& info) {
   Napi::Env env = info.Env();
 
-  if (info.Length() < 1) {
-    Napi::TypeError::New(env, "Wrong number of arguments").ThrowAsJavaScriptException();
+  if (info.Length() != 1) {
+    Napi::TypeError::New(env, "Wrong number of arguments. Expected params").ThrowAsJavaScriptException();
     return env.Null();
   }
 
   if (!info[0].IsString()) {
-    Napi::TypeError::New(env, "Wrong argument type: sip_ipaddr must be string.").ThrowAsJavaScriptException();
+    Napi::TypeError::New(env, "Wrong argument type: params must be a JSON string.").ThrowAsJavaScriptException();
     return env.Null();
   }
 
-  const string sip_ipaddr = info[0].As<Napi::String>().Utf8Value();
-
-  int port = 0;
-
-  if (info.Length() > 1) {
-    if(!info[1].IsNumber()) {
-      Napi::TypeError::New(env, "Wrong argument type: port must be number").ThrowAsJavaScriptException();
-      return env.Null();
-    }
-    port = info[1].As<Napi::Number>().Int32Value();
-  }
-
-  int type = PJSIP_TRANSPORT_UDP;
-
-  if (info.Length() > 2) {
-    if(!info[2].IsNumber()) {
-      Napi::TypeError::New(env, "Wrong argument type: transport type must be number").ThrowAsJavaScriptException();
-      return env.Null();
-    }
-    type = info[2].As<Napi::Number>().Int32Value();
-  }
+  const string json = info[0].As<Napi::String>().Utf8Value();
 
   int out_t_id;
+  char out_t_address[256];
   int out_t_port;
-  int res = pjw_transport_create(sip_ipaddr.c_str(), port, (pjsip_transport_type_e)type, &out_t_id, &out_t_port);
+  int res = pjw_transport_create(json.c_str(), &out_t_id, out_t_address, &out_t_port);
 
   if(res != 0) {
     Napi::Error::New(env, pjw_get_error()).ThrowAsJavaScriptException();
@@ -91,7 +72,7 @@ Napi::Value transport_create(const Napi::CallbackInfo& info) {
 
   Napi::Object obj = Napi::Object::New(env);
   obj.Set(Napi::String::New(env, "id"), Napi::Number::New(env, out_t_id));
-  obj.Set(Napi::String::New(env, "ip"), info[0].ToString());
+  obj.Set(Napi::String::New(env, "address"), Napi::String::New(env, out_t_address));
   obj.Set(Napi::String::New(env, "port"), Napi::Number::New(env, out_t_port));
 
   return obj;
@@ -101,8 +82,8 @@ Napi::Value transport_create(const Napi::CallbackInfo& info) {
 Napi::Value account_create(const Napi::CallbackInfo& info) {
   Napi::Env env = info.Env();
 
-  if (info.Length() < 5) {
-    Napi::TypeError::New(env, "Wrong number of arguments. Expected: transport_id, domain, server, user, pass [, additional_headers, c_to_url]").ThrowAsJavaScriptException();
+  if (info.Length() != 2) {
+    Napi::TypeError::New(env, "Wrong number of arguments. Expected: transport_id, params.").ThrowAsJavaScriptException();
     return env.Null();
   }
 
@@ -113,61 +94,13 @@ Napi::Value account_create(const Napi::CallbackInfo& info) {
   int transport_id = info[0].As<Napi::Number>().Int32Value();
  
   if (!info[1].IsString()) {
-    Napi::TypeError::New(env, "Wrong argument type: domain must be string.").ThrowAsJavaScriptException();
-    return env.Null();
-  }
-  const string domain = info[1].As<Napi::String>().Utf8Value();
-
-  if (!info[2].IsString()) {
-    Napi::TypeError::New(env, "Wrong argument type: server must be string.").ThrowAsJavaScriptException();
+    Napi::TypeError::New(env, "Wrong argument type: params must be a JSON string.").ThrowAsJavaScriptException();
     return env.Null();
   }
-  const string server = info[2].As<Napi::String>().Utf8Value();
-
-  if (!info[3].IsString()) {
-    Napi::TypeError::New(env, "Wrong argument type: user must be string.").ThrowAsJavaScriptException();
-    return env.Null();
-  }
-  const string user = info[3].As<Napi::String>().Utf8Value();
-
-  if (!info[4].IsString()) {
-    Napi::TypeError::New(env, "Wrong argument type: password must be string.").ThrowAsJavaScriptException();
-    return env.Null();
-  }
-  const string pass = info[4].As<Napi::String>().Utf8Value();
-
-  string additional_headers = string("");
-
-  if (info.Length() > 5) {
-	  if (!info[5].IsString()) {
-	    Napi::TypeError::New(env, "Wrong argument type: additional_headers must be string.").ThrowAsJavaScriptException();
-	    return env.Null();
-	  }
-	  additional_headers = info[5].As<Napi::String>().Utf8Value();
-  }
-
-  string c_to_url = string("");
-
-  if (info.Length() > 6) {
-	  if (!info[6].IsString()) {
-	    Napi::TypeError::New(env, "Wrong argument type: c_to_url must be string.").ThrowAsJavaScriptException();
-	    return env.Null();
-	  }
-	  c_to_url = info[6].As<Napi::String>().Utf8Value().c_str();
-  }
-
-  int expires = 60;
-
-  if (info.Length() > 7) {
-    if (!info[7].IsNumber()) {
-      Napi::TypeError::New(env, "Wrong argument type: expires must be number.").ThrowAsJavaScriptException();
-	  return env.Null();
-    }
-    expires = info[7].As<Napi::Number>().Int32Value();
-  }
+  const string json = info[1].As<Napi::String>().Utf8Value();
 
   int out_a_id;
-  int res = pjw_account_create(transport_id, domain.c_str(), server.c_str(), user.c_str(), pass.c_str(), additional_headers[0] ? additional_headers.c_str() : NULL, c_to_url[0] ? c_to_url.c_str() : NULL, expires, &out_a_id);
+  int res = pjw_account_create(transport_id, json.c_str(), &out_a_id);
 
   if(res != 0) {
     Napi::Error::New(env, pjw_get_error()).ThrowAsJavaScriptException();
@@ -181,8 +114,8 @@ Napi::Value account_create(const Napi::CallbackInfo& info) {
 Napi::Value account_register(const Napi::CallbackInfo& info) {
   Napi::Env env = info.Env();
 
-  if (info.Length() < 1) {
-    Napi::TypeError::New(env, "Wrong number of arguments. Expected: account_id [, auto_register]").ThrowAsJavaScriptException();
+  if (info.Length() != 2) {
+    Napi::TypeError::New(env, "Wrong number of arguments. Expected: account_id, params.").ThrowAsJavaScriptException();
     return env.Null();
   }
 
@@ -192,17 +125,13 @@ Napi::Value account_register(const Napi::CallbackInfo& info) {
   }
   int account_id = info[0].As<Napi::Number>().Int32Value();
 
-  bool auto_register = false;
-
-  if (info.Length() > 1) {
-    if(!info[1].IsBoolean()) {
-      Napi::TypeError::New(env, "Wrong argument type: auto_register must be boolean").ThrowAsJavaScriptException();
-      return env.Null();
-    }
-    auto_register = info[1].As<Napi::Boolean>().Value();
+  if (!info[1].IsString()) {
+    Napi::TypeError::New(env, "params must be a JSON string.").ThrowAsJavaScriptException();
+    return env.Null();
   }
+  const string json = info[1].As<Napi::String>().Utf8Value();
 
-  int res = pjw_account_register(account_id, auto_register);
+  int res = pjw_account_register(account_id, json.c_str());
 
   if(res != 0) {
     Napi::Error::New(env, pjw_get_error()).ThrowAsJavaScriptException();
@@ -240,8 +169,8 @@ Napi::Value account_unregister(const Napi::CallbackInfo& info) {
 Napi::Value call_create(const Napi::CallbackInfo& info) {
   Napi::Env env = info.Env();
 
-  if (info.Length() < 4) {
-    Napi::Error::New(env, "Wrong number of arguments. Expected: transport_id, flags, from_uri, to_uri [, request_uri, proxy_uri, additional_headers, realm, user, pass]").ThrowAsJavaScriptException();
+  if (info.Length() != 2) {
+    Napi::Error::New(env, "Wrong number of arguments. Expected: transport_id, params.").ThrowAsJavaScriptException();
     return env.Null();
   }
 
@@ -251,91 +180,16 @@ Napi::Value call_create(const Napi::CallbackInfo& info) {
   }
   int transport_id = info[0].As<Napi::Number>().Int32Value();
 
-  if (!info[0].IsNumber()) {
-    Napi::TypeError::New(env, "flags must be number.").ThrowAsJavaScriptException();
-    return env.Null();
-  }
-  unsigned flags = info[1].As<Napi::Number>().Uint32Value();
- 
-  if (!info[2].IsString()) {
-    Napi::TypeError::New(env, "from_uri must be string.").ThrowAsJavaScriptException();
-    return env.Null();
-  }
-  const string from_uri = info[2].As<Napi::String>().Utf8Value();
-
-  if (!info[3].IsString()) {
-    Napi::TypeError::New(env, "to_uri must be string.").ThrowAsJavaScriptException();
+  if (!info[1].IsString()) {
+    Napi::TypeError::New(env, "params must be a JSON string.").ThrowAsJavaScriptException();
     return env.Null();
   }
-  const string to_uri = info[3].As<Napi::String>().Utf8Value();
-
-  string request_uri = string("");
-
-  if (info.Length() > 4) {
-    if (!info[3].IsString()) {
-      Napi::TypeError::New(env, "request_uri must be string.").ThrowAsJavaScriptException();
-      return env.Null();
-    }
-    request_uri = info[4].As<Napi::String>().Utf8Value();
-  } else {
-    request_uri = to_uri; // TODO: remove angle brackets if present
-  }
-
-  string proxy_uri = string("");
-
-  if (info.Length() > 5) {
-	  if (!info[5].IsString()) {
-	    Napi::TypeError::New(env, "proxy_uri must be string.").ThrowAsJavaScriptException();
-	    return env.Null();
-	  }
-	  proxy_uri = info[5].As<Napi::String>().Utf8Value();
-  }
-
-  string additional_headers = string("");
-
-  if (info.Length() > 6) {
-    if (!info[5].IsString()) {
-      Napi::TypeError::New(env, "additional_headers must be string.").ThrowAsJavaScriptException();
-      return env.Null();
-    }
-    additional_headers = info[5].As<Napi::String>().Utf8Value();
-  }
-
-  string c_to_url = string("");
-
-  string realm = string("");
-  string user = string("");
-  string pass = string("");
-
-  if (info.Length() > 7) {
-    if(info.Length() < 10) {
-      Napi::Error::New(env, "incomplete credentials arguments: you must provide realm, user and pass").ThrowAsJavaScriptException();
-      return env.Null();
-    }
-
-    if (!info[7].IsString()) {
-      Napi::TypeError::New(env, "realm must be string.").ThrowAsJavaScriptException();
-      return env.Null();
-    }
-    realm = info[7].As<Napi::String>().Utf8Value().c_str();
-
-    if (!info[8].IsString()) {
-      Napi::TypeError::New(env, "user must be string.").ThrowAsJavaScriptException();
-      return env.Null();
-    }
-    user = info[8].As<Napi::String>().Utf8Value().c_str();
-
-    if (!info[9].IsString()) {
-      Napi::TypeError::New(env, "pass must be string.").ThrowAsJavaScriptException();
-      return env.Null();
-    }
-    pass = info[9].As<Napi::String>().Utf8Value().c_str();
-  }
+  const string json = info[1].As<Napi::String>().Utf8Value();
 
   long int out_call_id;
   char out_sip_call_id[256];
 
-  int res = pjw_call_create(transport_id, flags, from_uri.c_str(), to_uri.c_str(), request_uri.c_str(), proxy_uri[0] ? proxy_uri.c_str() : NULL, additional_headers[0] ? additional_headers.c_str() : NULL, realm[0] ? realm.c_str() : NULL, user[0] ? user.c_str() : NULL, pass[0] ? pass.c_str() : NULL, &out_call_id, out_sip_call_id);
+  int res = pjw_call_create(transport_id, json.c_str(), &out_call_id, out_sip_call_id);
 
   if(res != 0) {
     Napi::Error::New(env, pjw_get_error()).ThrowAsJavaScriptException();
@@ -352,8 +206,8 @@ Napi::Value call_create(const Napi::CallbackInfo& info) {
 Napi::Value call_respond(const Napi::CallbackInfo& info) {
   Napi::Env env = info.Env();
 
-  if (info.Length() < 3) {
-    Napi::Error::New(env, "Wrong number of arguments. Expected: call_id, code, reason [, additional_headers]").ThrowAsJavaScriptException();
+  if (info.Length() != 2) {
+    Napi::Error::New(env, "Wrong number of arguments. Expected: call_id, params").ThrowAsJavaScriptException();
     return env.Null();
   }
 
@@ -363,29 +217,13 @@ Napi::Value call_respond(const Napi::CallbackInfo& info) {
   }
   int call_id = info[0].As<Napi::Number>().Int32Value();
  
-  if (!info[1].IsNumber()) {
-    Napi::TypeError::New(env, "code must be number.").ThrowAsJavaScriptException();
-    return env.Null();
-  }
-  int code = info[1].As<Napi::Number>().Int32Value();
-
-  if (!info[2].IsString()) {
-    Napi::TypeError::New(env, "reason must be string.").ThrowAsJavaScriptException();
+  if (!info[1].IsString()) {
+    Napi::TypeError::New(env, "params must be a JSON string.").ThrowAsJavaScriptException();
     return env.Null();
   }
-  const string reason = info[2].As<Napi::String>().Utf8Value();
+  const string json = info[1].As<Napi::String>().Utf8Value();
 
-  string additional_headers = string("");
-
-  if (info.Length() > 3) {
-    if (!info[3].IsString()) {
-      Napi::TypeError::New(env, "additional_headers must be string.").ThrowAsJavaScriptException();
-      return env.Null();
-    }
-    additional_headers = info[3].As<Napi::String>().Utf8Value();
-  }
-
-  int res = pjw_call_respond(call_id, code, reason.c_str(), additional_headers[0] ? additional_headers.c_str() : NULL);
+  int res = pjw_call_respond(call_id, json.c_str());
 
   if(res != 0) {
     Napi::Error::New(env, pjw_get_error()).ThrowAsJavaScriptException();
@@ -398,8 +236,8 @@ Napi::Value call_respond(const Napi::CallbackInfo& info) {
 Napi::Value call_terminate(const Napi::CallbackInfo& info) {
   Napi::Env env = info.Env();
 
-  if (info.Length() < 1) {
-    Napi::Error::New(env, "Wrong number of arguments. Expected: call_id [, code, reason, additional_headers]").ThrowAsJavaScriptException();
+  if (info.Length() != 2) {
+    Napi::Error::New(env, "Wrong number of arguments. Expected: call_id, params").ThrowAsJavaScriptException();
     return env.Null();
   }
 
@@ -408,37 +246,14 @@ Napi::Value call_terminate(const Napi::CallbackInfo& info) {
     return env.Null();
   }
   int call_id = info[0].As<Napi::Number>().Int32Value();
- 
-  int code = 0;
-  if (info.Length() > 1) {
-    if (!info[1].IsNumber()) {
-      Napi::TypeError::New(env, "code must be number.").ThrowAsJavaScriptException();
-      return env.Null();
-    }
-    code = info[1].As<Napi::Number>().Int32Value();
-  }
-
-  string reason = string("");
-
-  if (info.Length() > 2) {
-    if (!info[2].IsString()) {
-      Napi::TypeError::New(env, "reason must be string.").ThrowAsJavaScriptException();
-      return env.Null();
-    }
-    reason = info[2].As<Napi::String>().Utf8Value();
-  }
-
-  string additional_headers = string("");
-
-  if (info.Length() > 3) {
-    if (!info[3].IsString()) {
-      Napi::TypeError::New(env, "additional_headers must be string.").ThrowAsJavaScriptException();
-      return env.Null();
-    }
-    additional_headers = info[3].As<Napi::String>().Utf8Value();
+  
+  if (!info[1].IsString()) {
+    Napi::TypeError::New(env, "params must be a JSON string.").ThrowAsJavaScriptException();
+    return env.Null();
   }
+  const string json = info[1].As<Napi::String>().Utf8Value();
 
-  int res = pjw_call_terminate(call_id, code, reason[0] ? reason.c_str() : NULL, additional_headers[0] ? additional_headers.c_str() : NULL);
+  int res = pjw_call_terminate(call_id, json.c_str());
 
   if(res != 0) {
     Napi::Error::New(env, pjw_get_error()).ThrowAsJavaScriptException();
@@ -451,8 +266,8 @@ Napi::Value call_terminate(const Napi::CallbackInfo& info) {
 Napi::Value call_send_dtmf(const Napi::CallbackInfo& info) {
   Napi::Env env = info.Env();
 
-  if (info.Length() != 3) {
-    Napi::Error::New(env, "Wrong number of arguments. Expected: call_id, digits, mode").ThrowAsJavaScriptException();
+  if (info.Length() != 2) {
+    Napi::Error::New(env, "Wrong number of arguments. Expected: call_id, params.").ThrowAsJavaScriptException();
     return env.Null();
   }
 
@@ -461,32 +276,14 @@ Napi::Value call_send_dtmf(const Napi::CallbackInfo& info) {
     return env.Null();
   }
   int call_id = info[0].As<Napi::Number>().Int32Value();
- 
-  string digits = string("");
+  
   if (!info[1].IsString()) {
-    Napi::TypeError::New(env, "digits must be string.").ThrowAsJavaScriptException();
+    Napi::TypeError::New(env, "params must be a JSON string.").ThrowAsJavaScriptException();
     return env.Null();
   }
-  digits = info[1].As<Napi::String>().Utf8Value();
+  const string json = info[1].As<Napi::String>().Utf8Value();
 
-  if(digits.length() == 0) {
-    Napi::Error::New(env, "digits is empty string").ThrowAsJavaScriptException();
-    return env.Null();
-  }
-
-  int mode = 0;
-  if (!info[2].IsNumber()) {
-    Napi::TypeError::New(env, "mode must be number.").ThrowAsJavaScriptException();
-    return env.Null();
-  }
-  mode = info[2].As<Napi::Number>().Int32Value();
-
-  if(mode != 0 && mode != 1) {
-    Napi::TypeError::New(env, "mode must be 0 (RFC2833) or 1 (in-band)").ThrowAsJavaScriptException();
-    return env.Null();
-  }
-
-  int res = pjw_call_send_dtmf(call_id, digits.c_str(), mode);
+  int res = pjw_call_send_dtmf(call_id, json.c_str());
 
   if(res != 0) {
     Napi::Error::New(env, pjw_get_error()).ThrowAsJavaScriptException();
@@ -499,8 +296,8 @@ Napi::Value call_send_dtmf(const Napi::CallbackInfo& info) {
 Napi::Value call_reinvite(const Napi::CallbackInfo& info) {
   Napi::Env env = info.Env();
 
-  if (info.Length() != 3) {
-    Napi::Error::New(env, "Wrong number of arguments. Expected: call_id, hold, flags").ThrowAsJavaScriptException();
+  if (info.Length() != 2) {
+    Napi::Error::New(env, "Wrong number of arguments. Expected: call_id, params.").ThrowAsJavaScriptException();
     return env.Null();
   }
 
@@ -510,19 +307,13 @@ Napi::Value call_reinvite(const Napi::CallbackInfo& info) {
   }
   int call_id = info[0].As<Napi::Number>().Int32Value();
  
-  if(!info[1].IsBoolean()) {
-    Napi::TypeError::New(env, "Wrong argument type: hold must be boolean").ThrowAsJavaScriptException();
-    return env.Null();
-  }
-  bool hold = info[1].As<Napi::Boolean>().Value();
-
-  if (!info[2].IsNumber()) {
-    Napi::TypeError::New(env, "flags must be number.").ThrowAsJavaScriptException();
+  if (!info[1].IsString()) {
+    Napi::TypeError::New(env, "params must be a JSON string.").ThrowAsJavaScriptException();
     return env.Null();
   }
-  unsigned flags = info[2].As<Napi::Number>().Uint32Value();
+  const string json = info[1].As<Napi::String>().Utf8Value();
 
-  int res = pjw_call_reinvite(call_id, hold, flags);
+  int res = pjw_call_reinvite(call_id, json.c_str());
 
   if(res != 0) {
     Napi::Error::New(env, pjw_get_error()).ThrowAsJavaScriptException();
@@ -535,8 +326,8 @@ Napi::Value call_reinvite(const Napi::CallbackInfo& info) {
 Napi::Value call_send_request(const Napi::CallbackInfo& info) {
   Napi::Env env = info.Env();
 
-  if (info.Length() < 2) {
-    Napi::Error::New(env, "Wrong number of arguments. Expected: call_id, method [, additional_headers, body, ct_type, ct_subtype]").ThrowAsJavaScriptException();
+  if (info.Length() != 2) {
+    Napi::Error::New(env, "Wrong number of arguments. Expected: call_id, params.").ThrowAsJavaScriptException();
     return env.Null();
   }
 
@@ -545,51 +336,14 @@ Napi::Value call_send_request(const Napi::CallbackInfo& info) {
     return env.Null();
   }
   int call_id = info[0].As<Napi::Number>().Int32Value();
-
-  string method = string("");
+ 
   if (!info[1].IsString()) {
-    Napi::TypeError::New(env, "method must be string.").ThrowAsJavaScriptException();
+    Napi::TypeError::New(env, "params must be a JSON string.").ThrowAsJavaScriptException();
     return env.Null();
   }
-  method = info[1].As<Napi::String>().Utf8Value();
-
-  string additional_headers = string("");
-  if (info.Length() > 2) {
-    if (!info[2].IsString()) {
-      Napi::TypeError::New(env, "additional_headers must be string.").ThrowAsJavaScriptException();
-      return env.Null();
-    }
-    additional_headers = info[2].As<Napi::String>().Utf8Value();
-  }
-
-  string body = string("");
-  if (info.Length() > 3) {
-    if (!info[3].IsString()) {
-      Napi::TypeError::New(env, "body must be string.").ThrowAsJavaScriptException();
-      return env.Null();
-    }
-    body = info[3].As<Napi::String>().Utf8Value();
-  }
-
-  string ct_type = string("");
-  if (info.Length() > 4) {
-    if (!info[4].IsString()) {
-      Napi::TypeError::New(env, "ct_type must be string.").ThrowAsJavaScriptException();
-      return env.Null();
-    }
-    ct_type = info[4].As<Napi::String>().Utf8Value();
-  }
-
-  string ct_subtype = string("");
-  if (info.Length() > 5) {
-    if (!info[5].IsString()) {
-      Napi::TypeError::New(env, "ct_subtype must be string.").ThrowAsJavaScriptException();
-      return env.Null();
-    }
-    ct_subtype = info[5].As<Napi::String>().Utf8Value();
-  }
+  const string json = info[1].As<Napi::String>().Utf8Value();
 
-  int res = pjw_call_send_request(call_id, method.c_str(), additional_headers[0] ? additional_headers.c_str() : NULL, body[0] ? body.c_str() : NULL, ct_type[0] ? ct_type.c_str() : NULL, ct_subtype[0] ? ct_subtype.c_str(): NULL);
+  int res = pjw_call_send_request(call_id, json.c_str());
 
   if(res != 0) {
     Napi::Error::New(env, pjw_get_error()).ThrowAsJavaScriptException();
@@ -603,7 +357,7 @@ Napi::Value call_start_record_wav(const Napi::CallbackInfo& info) {
   Napi::Env env = info.Env();
 
   if (info.Length() != 2) {
-    Napi::Error::New(env, "Wrong number of arguments. Expected: call_id, output_file]").ThrowAsJavaScriptException();
+    Napi::Error::New(env, "Wrong number of arguments. Expected: call_id, params.").ThrowAsJavaScriptException();
     return env.Null();
   }
 
@@ -612,19 +366,14 @@ Napi::Value call_start_record_wav(const Napi::CallbackInfo& info) {
     return env.Null();
   }
   int call_id = info[0].As<Napi::Number>().Int32Value();
-
+ 
   if (!info[1].IsString()) {
-    Napi::TypeError::New(env, "output_file must be string.").ThrowAsJavaScriptException();
+    Napi::TypeError::New(env, "params must be a JSON string.").ThrowAsJavaScriptException();
     return env.Null();
   }
-  string output_file = info[1].As<Napi::String>().Utf8Value();
+  const string json = info[1].As<Napi::String>().Utf8Value();
 
-  if (output_file.length() == 0) {
-    Napi::Error::New(env, "output_file is invalid (blank string)").ThrowAsJavaScriptException();
-    return env.Null();
-  }
-
-  int res = pjw_call_start_record_wav(call_id, output_file.c_str());
+  int res = pjw_call_start_record_wav(call_id, json.c_str());
 
   if(res != 0) {
     Napi::Error::New(env, pjw_get_error()).ThrowAsJavaScriptException();
@@ -638,7 +387,7 @@ Napi::Value call_start_play_wav(const Napi::CallbackInfo& info) {
   Napi::Env env = info.Env();
 
   if (info.Length() != 2) {
-    Napi::Error::New(env, "Wrong number of arguments. Expected: call_id, input_file]").ThrowAsJavaScriptException();
+    Napi::Error::New(env, "Wrong number of arguments. Expected: call_id, params.").ThrowAsJavaScriptException();
     return env.Null();
   }
 
@@ -647,19 +396,14 @@ Napi::Value call_start_play_wav(const Napi::CallbackInfo& info) {
     return env.Null();
   }
   int call_id = info[0].As<Napi::Number>().Int32Value();
-
+ 
   if (!info[1].IsString()) {
-    Napi::TypeError::New(env, "input_file must be string.").ThrowAsJavaScriptException();
-    return env.Null();
-  }
-  string input_file = info[1].As<Napi::String>().Utf8Value();
-
-  if (input_file.length() == 0) {
-    Napi::Error::New(env, "input_file is invalid (blank string)").ThrowAsJavaScriptException();
+    Napi::TypeError::New(env, "params must be a JSON string.").ThrowAsJavaScriptException();
     return env.Null();
   }
+  const string json = info[1].As<Napi::String>().Utf8Value();
 
-  int res = pjw_call_start_play_wav(call_id, input_file.c_str());
+  int res = pjw_call_start_play_wav(call_id, json.c_str());
 
   if(res != 0) {
     Napi::Error::New(env, pjw_get_error()).ThrowAsJavaScriptException();
@@ -672,8 +416,8 @@ Napi::Value call_start_play_wav(const Napi::CallbackInfo& info) {
 Napi::Value call_start_fax(const Napi::CallbackInfo& info) {
   Napi::Env env = info.Env();
 
-  if (info.Length() != 3) {
-    Napi::Error::New(env, "Wrong number of arguments. Expected: call_id, is_sender, file]").ThrowAsJavaScriptException();
+  if (info.Length() != 2) {
+    Napi::Error::New(env, "Wrong number of arguments. Expected: call_id, params.").ThrowAsJavaScriptException();
     return env.Null();
   }
 
@@ -682,25 +426,14 @@ Napi::Value call_start_fax(const Napi::CallbackInfo& info) {
     return env.Null();
   }
   int call_id = info[0].As<Napi::Number>().Int32Value();
-
-  if (!info[1].IsBoolean()) {
-    Napi::TypeError::New(env, "is_sender must be boolean.").ThrowAsJavaScriptException();
-    return env.Null();
-  }
-  bool is_sender = info[1].As<Napi::Boolean>().Value();
-
-  if (!info[2].IsString()) {
-    Napi::TypeError::New(env, "file must be string.").ThrowAsJavaScriptException();
-    return env.Null();
-  }
-  string file = info[2].As<Napi::String>().Utf8Value();
-
-  if (file.length() == 0) {
-    Napi::Error::New(env, "input_file is invalid (blank string)").ThrowAsJavaScriptException();
+ 
+  if (!info[1].IsString()) {
+    Napi::TypeError::New(env, "params must be a JSON string.").ThrowAsJavaScriptException();
     return env.Null();
   }
+  const string json = info[1].As<Napi::String>().Utf8Value();
 
-  int res = pjw_call_start_fax(call_id, is_sender, file.c_str());
+  int res = pjw_call_start_fax(call_id, json.c_str());
 
   if(res != 0) {
     Napi::Error::New(env, pjw_get_error()).ThrowAsJavaScriptException();
@@ -810,8 +543,8 @@ Napi::Value call_get_stream_stat(const Napi::CallbackInfo& info) {
 Napi::Value call_refer(const Napi::CallbackInfo& info) {
   Napi::Env env = info.Env();
 
-  if (info.Length() < 2) {
-    Napi::Error::New(env, "Wrong number of arguments. Expected: call_id, dest_uri [, additional_headers]").ThrowAsJavaScriptException();
+  if (info.Length() != 2) {
+    Napi::Error::New(env, "Wrong number of arguments. Expected: call_id, params.").ThrowAsJavaScriptException();
     return env.Null();
   }
 
@@ -820,25 +553,16 @@ Napi::Value call_refer(const Napi::CallbackInfo& info) {
     return env.Null();
   }
   int call_id = info[0].As<Napi::Number>().Int32Value();
- 
+  
   if (!info[1].IsString()) {
-    Napi::TypeError::New(env, "reason must be string.").ThrowAsJavaScriptException();
+    Napi::TypeError::New(env, "params must be a JSON string.").ThrowAsJavaScriptException();
     return env.Null();
   }
-  const string dest_uri = info[1].As<Napi::String>().Utf8Value();
-
-  string additional_headers = string("");
-  if (info.Length() > 2) {
-    if (!info[2].IsString()) {
-      Napi::TypeError::New(env, "additional_headers must be string.").ThrowAsJavaScriptException();
-      return env.Null();
-    }
-    additional_headers = info[2].As<Napi::String>().Utf8Value();
-  }
+  const string json = info[1].As<Napi::String>().Utf8Value();
 
   long out_subscription_id;
 
-  int res = pjw_call_refer(call_id, dest_uri.c_str(), additional_headers[0] ? additional_headers.c_str() : NULL, &out_subscription_id);
+  int res = pjw_call_refer(call_id, json.c_str(), &out_subscription_id);
 
   if(res != 0) {
     Napi::Error::New(env, pjw_get_error()).ThrowAsJavaScriptException();
@@ -1046,8 +770,8 @@ Napi::Value set_codecs(const Napi::CallbackInfo& info) {
 Napi::Value notify(const Napi::CallbackInfo& info) {
   Napi::Env env = info.Env();
 
-  if (info.Length() < 5) {
-    Napi::Error::New(env, "Wrong number of arguments. Expected: subscriber_id, content_type, body, subscription_state, reason [, additional_headers]").ThrowAsJavaScriptException();
+  if (info.Length() != 2) {
+    Napi::Error::New(env, "Wrong number of arguments. Expected: subscriber_id, params.").ThrowAsJavaScriptException();
     return env.Null();
   }
 
@@ -1056,41 +780,14 @@ Napi::Value notify(const Napi::CallbackInfo& info) {
     return env.Null();
   }
   int subscriber_id = info[0].As<Napi::Number>().Int32Value();
-
+ 
   if (!info[1].IsString()) {
-    Napi::TypeError::New(env, "content_type must be string.").ThrowAsJavaScriptException();
-    return env.Null();
-  }
-  string content_type = info[1].As<Napi::String>().Utf8Value();
-
-  if (!info[2].IsString()) {
-    Napi::TypeError::New(env, "body must be string.").ThrowAsJavaScriptException();
-    return env.Null();
-  }
-  string body = info[2].As<Napi::String>().Utf8Value();
-
-  if (!info[3].IsNumber()) {
-    Napi::TypeError::New(env, "subscription_state must be number.").ThrowAsJavaScriptException();
-    return env.Null();
-  }
-  int subscription_state = info[3].As<Napi::Number>().Int32Value();
-
-  if (!info[4].IsString()) {
-    Napi::TypeError::New(env, "reason must be string.").ThrowAsJavaScriptException();
+    Napi::TypeError::New(env, "Wrong argument type: params must be a JSON string.").ThrowAsJavaScriptException();
     return env.Null();
   }
-  string reason = info[4].As<Napi::String>().Utf8Value();
+  const string json = info[1].As<Napi::String>().Utf8Value();
 
-  string additional_headers = string("");
-  if (info.Length() > 5) {
-    if (!info[5].IsString()) {
-      Napi::TypeError::New(env, "additional_headers must be string.").ThrowAsJavaScriptException();
-      return env.Null();
-    }
-    additional_headers = info[5].As<Napi::String>().Utf8Value();
-  }
-
-  int res = pjw_notify(subscriber_id, content_type.c_str(), body.c_str(), subscription_state, reason.c_str(), additional_headers[0] ? additional_headers.c_str() : NULL);
+  int res = pjw_notify(subscriber_id, json.c_str());
 
   if(res != 0) {
     Napi::Error::New(env, pjw_get_error()).ThrowAsJavaScriptException();
@@ -1103,8 +800,8 @@ Napi::Value notify(const Napi::CallbackInfo& info) {
 Napi::Value notify_xfer(const Napi::CallbackInfo& info) {
   Napi::Env env = info.Env();
 
-  if (info.Length() != 4) {
-    Napi::Error::New(env, "Wrong number of arguments. Expected: subscriber_id, subscription_state, xfer_status_code, xfer_status_text").ThrowAsJavaScriptException();
+  if (info.Length() != 2) {
+    Napi::Error::New(env, "Wrong number of arguments. Expected: subscriber_id, params").ThrowAsJavaScriptException();
     return env.Null();
   }
 
@@ -1113,26 +810,14 @@ Napi::Value notify_xfer(const Napi::CallbackInfo& info) {
     return env.Null();
   }
   int subscriber_id = info[0].As<Napi::Number>().Int32Value();
-
-  if (!info[1].IsNumber()) {
-    Napi::TypeError::New(env, "subscription_state must be number.").ThrowAsJavaScriptException();
-    return env.Null();
-  }
-  int subscription_state = info[1].As<Napi::Number>().Int32Value();
-
-  if (!info[2].IsNumber()) {
-    Napi::TypeError::New(env, "xfer_status_code must be number.").ThrowAsJavaScriptException();
-    return env.Null();
-  }
-  int xfer_status_code = info[2].As<Napi::Number>().Int32Value();
-
-  if (!info[3].IsString()) {
-    Napi::TypeError::New(env, "xfer_status_text must be string.").ThrowAsJavaScriptException();
+ 
+  if (!info[1].IsString()) {
+    Napi::TypeError::New(env, "Wrong argument type: params must be a JSON string.").ThrowAsJavaScriptException();
     return env.Null();
   }
-  string xfer_status_text= info[3].As<Napi::String>().Utf8Value();
+  const string json = info[1].As<Napi::String>().Utf8Value();
 
-  int res = pjw_notify_xfer(subscriber_id, subscription_state, xfer_status_code, xfer_status_text.c_str());
+  int res = pjw_notify_xfer(subscriber_id, json.c_str());
 
   if(res != 0) {
     Napi::Error::New(env, pjw_get_error()).ThrowAsJavaScriptException();
@@ -1175,8 +860,8 @@ Napi::Value register_pkg(const Napi::CallbackInfo& info) {
 Napi::Value subscription_create(const Napi::CallbackInfo& info) {
   Napi::Env env = info.Env();
 
-  if (info.Length() < 6) {
-    Napi::Error::New(env, "Wrong number of arguments. Expected: transport_id, event, accept, from_uri, to_uri, request_uri [, proxy_uri, realm, user, pass]").ThrowAsJavaScriptException();
+  if (info.Length() != 2) {
+    Napi::Error::New(env, "Wrong number of arguments. Expected: transport_id, params.").ThrowAsJavaScriptException();
     return env.Null();
   }
 
@@ -1185,83 +870,16 @@ Napi::Value subscription_create(const Napi::CallbackInfo& info) {
     return env.Null();
   }
   int transport_id = info[0].As<Napi::Number>().Int32Value();
-
+ 
   if (!info[1].IsString()) {
-    Napi::TypeError::New(env, "event must be string.").ThrowAsJavaScriptException();
-    return env.Null();
-  }
-  string event = info[1].As<Napi::String>().Utf8Value();
-
-  if (!info[2].IsString()) {
-    Napi::TypeError::New(env, "accept must be string.").ThrowAsJavaScriptException();
-    return env.Null();
-  }
-  string accept = info[2].As<Napi::String>().Utf8Value();
-
-  if (!info[3].IsString()) {
-    Napi::TypeError::New(env, "from_uri must be string.").ThrowAsJavaScriptException();
+    Napi::TypeError::New(env, "Wrong argument type: params must be a JSON string.").ThrowAsJavaScriptException();
     return env.Null();
   }
-  string from_uri = info[3].As<Napi::String>().Utf8Value();
-
-  if (!info[4].IsString()) {
-    Napi::TypeError::New(env, "to_uri must be string.").ThrowAsJavaScriptException();
-    return env.Null();
-  }
-  string to_uri = info[4].As<Napi::String>().Utf8Value();
-
-  if (!info[5].IsString()) {
-    Napi::TypeError::New(env, "request_uri must be string.").ThrowAsJavaScriptException();
-    return env.Null();
-  }
-  string request_uri = info[5].As<Napi::String>().Utf8Value();
-
-  string proxy_uri = string("");
-  if (info.Length() > 6) {
-    if (!info[6].IsString()) {
-      Napi::TypeError::New(env, "proxy_uri must be string.").ThrowAsJavaScriptException();
-      return env.Null();
-    }
-    proxy_uri = info[6].As<Napi::String>().Utf8Value();
-  }
-
-  string realm = string("");
-  string user = string("");
-  string pass = string("");
-
-  if (info.Length() > 7) {
-    if(info.Length() < 10) {
-      Napi::TypeError::New(env, "missing credentials. you must provide realm, user, pass.").ThrowAsJavaScriptException();
-      return env.Null();
-    }
-
-    if (!info[7].IsString()) {
-      Napi::TypeError::New(env, "realm must be string").ThrowAsJavaScriptException();
-      return env.Null();
-    }
-    realm = info[7].As<Napi::String>().Utf8Value();
-
-    if (!info[8].IsString()) {
-      Napi::TypeError::New(env, "user must be string").ThrowAsJavaScriptException();
-      return env.Null();
-    }
-    user = info[8].As<Napi::String>().Utf8Value();
-
-    if (!info[9].IsString()) {
-      Napi::TypeError::New(env, "pass must be string").ThrowAsJavaScriptException();
-      return env.Null();
-    }
-    pass = info[9].As<Napi::String>().Utf8Value();
-  }
+  const string json = info[1].As<Napi::String>().Utf8Value();
 
   long out_subscription_id;
 
-  int res = pjw_subscription_create(transport_id, event.c_str(), accept.c_str(), from_uri.c_str(), to_uri.c_str(), request_uri.c_str(), 
-    proxy_uri[0] ? proxy_uri.c_str() : NULL,
-    realm[0] ? realm.c_str() : NULL,
-    user[0] ? user.c_str() : NULL,
-    pass[0] ? pass.c_str() : NULL,
-    &out_subscription_id);
+  int res = pjw_subscription_create(transport_id, json.c_str(), &out_subscription_id);
 
   if(res != 0) {
     Napi::Error::New(env, pjw_get_error()).ThrowAsJavaScriptException();
@@ -1274,8 +892,8 @@ Napi::Value subscription_create(const Napi::CallbackInfo& info) {
 Napi::Value subscription_subscribe(const Napi::CallbackInfo& info) {
   Napi::Env env = info.Env();
 
-  if (info.Length() < 2) {
-    Napi::Error::New(env, "Wrong number of arguments. Expected: subscription_id, expires [, additional_headers]").ThrowAsJavaScriptException();
+  if (info.Length() != 2) {
+    Napi::Error::New(env, "Wrong number of arguments. Expected: subscription_id, params").ThrowAsJavaScriptException();
     return env.Null();
   }
 
@@ -1284,23 +902,14 @@ Napi::Value subscription_subscribe(const Napi::CallbackInfo& info) {
     return env.Null();
   }
   int subscription_id = info[0].As<Napi::Number>().Int32Value();
-
-  if (!info[1].IsNumber()) {
-    Napi::TypeError::New(env, "expires must be number.").ThrowAsJavaScriptException();
+ 
+  if (!info[1].IsString()) {
+    Napi::TypeError::New(env, "Wrong argument type: params must be a JSON string.").ThrowAsJavaScriptException();
     return env.Null();
   }
-  int expires = info[1].As<Napi::Number>().Int32Value();
-
-  string additional_headers = string("");
-  if (info.Length() > 2) {
-    if (!info[2].IsString()) {
-      Napi::TypeError::New(env, "additional_headers must be string.").ThrowAsJavaScriptException();
-      return env.Null();
-    }
-    additional_headers = info[2].As<Napi::String>().Utf8Value();
-  }
+  const string json = info[1].As<Napi::String>().Utf8Value();
 
-  int res = pjw_subscription_subscribe(subscription_id, expires, additional_headers[0] ? additional_headers.c_str() : NULL);
+  int res = pjw_subscription_subscribe(subscription_id, json.c_str());
 
   if(res != 0) {
     Napi::Error::New(env, pjw_get_error()).ThrowAsJavaScriptException();
@@ -1428,7 +1037,7 @@ Napi::Value shutdown_(const Napi::CallbackInfo& info) {
  
 Napi::Object init(Napi::Env env, Napi::Object exports) {
   int i = __pjw_init();
-  //printf("__pjw_init res=%i\n", i);
+  printf("__pjw_init res=%i\n", i);
 
   exports.Set("start", Napi::Function::New(env, start));