engage-engine 1.256.90960034 → 1.257.90970036

package/engage.cpp

@@ -11,6 +11,7 @@
 #include <map>
 #include <mutex>
 #include <atomic>
+#include <cstring>
 
 #include "EngageInterface.h"
 #include "EngagePlatformNotifications.h"
@@ -107,7 +108,7 @@ public:
     class Parameter
     {
     public:
-        typedef enum {ptString, ptInt, ptStringVector} Type_t;
+        typedef enum {ptString, ptInt, ptStringVector, ptBuffer} Type_t;
 
         Type_t _type;
     };
@@ -161,6 +162,37 @@ public:
         std::vector<std::string> _val;
     };
 
+    class BufferParameter : public Parameter
+    {
+    public:
+        BufferParameter(const uint8_t *data, size_t size)
+        {
+            _type = ptBuffer;
+            if(data != nullptr && size > 0)
+            {
+                _val = new uint8_t[size];
+                _size = size;
+                memcpy(_val, data, size);
+            }
+            else
+            {
+                _val = nullptr;
+                _size = 0;
+            }
+        }
+
+        ~BufferParameter()
+        {
+            if(_val != nullptr)
+            {
+                delete[] _val;
+            }
+        }
+
+        uint8_t *_val;
+        size_t _size;
+    };
+
     explicit CrossThreadCallbackWorker(v8::Local<v8::Function> fn)
     {
         Nan::HandleScope scope;
@@ -339,6 +371,19 @@ private:
                 {
                     argv[index] = Nan::New<v8::Integer>(((IntParameter*)(*itr))->_val);
                 }
+                else if((*itr)->_type == Parameter::ptBuffer)
+                {
+                    BufferParameter *bp = (BufferParameter*)(*itr);
+                    if(bp->_val != nullptr && bp->_size > 0)
+                    {
+                        argv[index] = Nan::CopyBuffer((char*)bp->_val, bp->_size).ToLocalChecked();
+                    }
+                    else
+                    {
+                        // Create empty buffer for zero-size case
+                        argv[index] = Nan::CopyBuffer("", 0).ToLocalChecked();
+                    }
+                }
 
                 index++;
             }
@@ -526,6 +571,46 @@ void on_groupRxVolumeChanged(const char *id, int16_t leftLevelPerc, int16_t righ
 
 ENGAGE_CB_ID_PLUS_ONE_STRING_PARAM(groupRxDtmf)
 
+ENGAGE_CB_ID_PARAM(groupBlobSent)
+ENGAGE_CB_ID_PARAM(groupBlobSendFailed)
+
+ENGAGE_CB_ID_PARAM(groupRawSent)
+ENGAGE_CB_ID_PARAM(groupRawSendFailed)
+
+void on_groupBlobReceived(const char *id, const char *blobInfoJson, const uint8_t *blob, size_t blobSize, const char *eventExtraJson)
+{
+    CrossThreadCallbackWorker *cbw = getCallback("groupBlobReceived");
+    if(!cbw)
+    {
+        return;
+    }
+
+    std::vector<CrossThreadCallbackWorker::Parameter*> *params = new std::vector<CrossThreadCallbackWorker::Parameter*>();
+    params->push_back(new CrossThreadCallbackWorker::StringParameter(id));
+    params->push_back(new CrossThreadCallbackWorker::StringParameter(blobInfoJson));
+    params->push_back(new CrossThreadCallbackWorker::BufferParameter(blob, blobSize));
+    params->push_back(new CrossThreadCallbackWorker::StringParameter(eventExtraJson));
+    cbw->enqueue(params);
+
+    cbw->RELEASE_OBJECT_REFERENCE();
+}
+
+void on_groupRawReceived(const char *id, const uint8_t *raw, size_t rawSize, const char *eventExtraJson)
+{
+    CrossThreadCallbackWorker *cbw = getCallback("groupRawReceived");
+    if(!cbw)
+    {
+        return;
+    }
+
+    std::vector<CrossThreadCallbackWorker::Parameter*> *params = new std::vector<CrossThreadCallbackWorker::Parameter*>();
+    params->push_back(new CrossThreadCallbackWorker::StringParameter(id));
+    params->push_back(new CrossThreadCallbackWorker::BufferParameter(raw, rawSize));
+    params->push_back(new CrossThreadCallbackWorker::StringParameter(eventExtraJson));
+    cbw->enqueue(params);
+
+    cbw->RELEASE_OBJECT_REFERENCE();
+}
 
 //--------------------------------------------------------
 // Registers an event name and the JS callback function
@@ -636,17 +721,17 @@ NAN_METHOD(initialize)
     ENGAGE_CB_TABLE_ENTRY(PFN_ENGAGE_LICENSE_EXPIRED, licenseExpired);
     ENGAGE_CB_TABLE_ENTRY(PFN_ENGAGE_LICENSE_EXPIRING, licenseExpiring);
 
-    // TODO PFN_ENGAGE_GROUP_BLOB_SENT
-    // TODO PFN_ENGAGE_GROUP_BLOB_SEND_FAILED
-    // TODO PFN_ENGAGE_GROUP_BLOB_RECEIVED
-
     // TODO PFN_ENGAGE_GROUP_RTP_SENT
     // TODO PFN_ENGAGE_GROUP_RTP_SEND_FAILED
     // TODO PFN_ENGAGE_GROUP_RTP_RECEIVED
 
-    // TODO PFN_ENGAGE_GROUP_RAW_SENT
-    // TODO PFN_ENGAGE_GROUP_RAW_SEND_FAILED
-    // TODO PFN_ENGAGE_GROUP_RAW_RECEIVED
+    ENGAGE_CB_TABLE_ENTRY(PFN_ENGAGE_GROUP_BLOB_SENT, groupBlobSent);
+    ENGAGE_CB_TABLE_ENTRY(PFN_ENGAGE_GROUP_BLOB_SEND_FAILED, groupBlobSendFailed);
+    ENGAGE_CB_TABLE_ENTRY(PFN_ENGAGE_GROUP_BLOB_RECEIVED, groupBlobReceived);
+
+    ENGAGE_CB_TABLE_ENTRY(PFN_ENGAGE_GROUP_RAW_SENT, groupRawSent);
+    ENGAGE_CB_TABLE_ENTRY(PFN_ENGAGE_GROUP_RAW_SEND_FAILED, groupRawSendFailed);
+    ENGAGE_CB_TABLE_ENTRY(PFN_ENGAGE_GROUP_RAW_RECEIVED, groupRawReceived);
 
     ENGAGE_CB_TABLE_ENTRY(PFN_ENGAGE_GROUP_TIMELINE_EVENT_STARTED, groupTimelineEventStarted);
     ENGAGE_CB_TABLE_ENTRY(PFN_ENGAGE_GROUP_TIMELINE_EVENT_UPDATED, groupTimelineEventUpdated);
@@ -701,13 +786,13 @@ NAN_METHOD(setLogTagExtension)
 }
 
 //--------------------------------------------------------
-NAN_METHOD(engageEnableSyslog)
+NAN_METHOD(enableSyslog)
 {
     NANRETI(engageEnableSyslog(INTVAL(0) == 1 ? ENGAGE_SYSLOG_ENABLE : ENGAGE_SYSLOG_DISABLE));
 }
 
 //--------------------------------------------------------
-NAN_METHOD(engageEnableWatchdog)
+NAN_METHOD(enableWatchdog)
 {
     NANRETI(engageEnableWatchdog(INTVAL(0) == 1 ? ENGAGE_WATCHDOG_ENABLE : ENGAGE_WATCHDOG_DISABLE));
 }
@@ -929,8 +1014,49 @@ NAN_METHOD(updateLicense)
 // TODO: engageSendGroupRtp
 // TODO: engageRegisterGroupRtpHandler
 // TODO: engageUnregisterGroupRtpHandler
-// TODO: engageSendGroupBlob
-// TODO: engageSendGroupRaw
+
+//--------------------------------------------------------
+NAN_METHOD(sendGroupBlob)
+{
+    // Get the buffer data
+    uint8_t* blobBytes = (uint8_t*) node::Buffer::Data(info[1]);
+    
+    // Get size - can use buffer length or provided size parameter
+    size_t blobSize;
+    if(info.Length() >= 3 && info[2]->IsNumber())
+    {
+        blobSize = INTVAL(2);
+    }
+    else
+    {
+        // Fallback to buffer length if size not provided
+        blobSize = node::Buffer::Length(info[1]);
+    }
+    
+    NANRETI(engageSendGroupBlob(STRVAL(0), blobBytes, blobSize, STRVAL(3)));
+}
+
+//--------------------------------------------------------
+NAN_METHOD(sendGroupRaw)
+{
+    // Get the buffer data
+    uint8_t* rawBytes = (uint8_t*) node::Buffer::Data(info[1]);
+    
+    // Get size - can use buffer length or provided size parameter
+    size_t rawSize;
+    if(info.Length() >= 3 && info[2]->IsNumber())
+    {
+        rawSize = INTVAL(2);
+    }
+    else
+    {
+        // Fallback to buffer length if size not provided
+        rawSize = node::Buffer::Length(info[1]);
+    }
+    
+    NANRETI(engageSendGroupRaw(STRVAL(0), rawBytes, rawSize, STRVAL(3)));
+}
+
 // TODO: engagePlatformServiceDiscovered
 // TODO: engagePlatformServiceRediscovered
 // TODO: engagePlatformServiceUndiscovered
@@ -1275,6 +1401,8 @@ NAN_MODULE_INIT(Init)
 
     ENGAGE_BINDING(encrypt);
     ENGAGE_BINDING(decrypt);
+    ENGAGE_BINDING(sendGroupBlob);
+    ENGAGE_BINDING(sendGroupRaw);
 
     ENGAGE_BINDING(updateLicense);
     ENGAGE_BINDING(getVersion);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "engage-engine",
-  "version": "1.256.90960034",
+  "version": "1.257.90970036",
   "description": "Use Engage to communicate with everyone, everywhere, from any device",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
@@ -22,6 +22,7 @@
   "homepage": "https://github.com/rallytac/pub#readme",
   "dependencies": {
     "bindings": "^1.5.0",
+    "chalk": "^4.1.2",
     "nan": "^2.14.0",
     "node-gyp": "^9.0.3"
   }