@suprsend/node-sdk 1.2.0 → 1.3.0

package/src/subscriber_helper.js

@@ -80,16 +80,12 @@ export default class _SubscriberInternalHelper {
     this.workspace_key = workspace_key;
 
     this.__dict_set = {};
-    this.__set_count = 0;
 
     this.__dict_append = {};
-    this.__append_count = 0;
 
     this.__dict_remove = {};
-    this.__remove_count = 0;
 
     this.__list_unset = [];
-    this.__unset_count = 0;
 
     this.__errors = [];
     this.__info = [];
@@ -97,17 +93,9 @@ export default class _SubscriberInternalHelper {
 
   reset() {
     this.__dict_set = {};
-    this.__set_count = 0;
-
     this.__dict_append = {};
-    this.__append_count = 0;
-
     this.__dict_remove = {};
-    this.__remove_count = 0;
-
     this.__list_unset = [];
-    this.__unset_count = 0;
-
     this.__errors = [];
     this.__info = [];
   }
@@ -118,48 +106,26 @@ export default class _SubscriberInternalHelper {
       errors: this.__errors,
       info: this.__info,
       event: evt,
-      set: this.__set_count,
-      append: this.__append_count,
-      remove: this.__remove_count,
-      unset: this.__unset_count,
     };
     this.reset();
     return ret_val;
   }
 
   __form_event() {
-    if (
-      !is_empty(this.__dict_set) ||
-      !is_empty(this.__dict_append) ||
-      !is_empty(this.__dict_remove) ||
-      !is_empty(this.__list_unset)
-    ) {
-      let event = {
-        $insert_id: uuid(),
-        $time: epoch_milliseconds(),
-        env: this.workspace_key,
-        distinct_id: this.distinct_id,
-      };
-      if (!is_empty(this.__dict_set)) {
-        event["$set"] = this.__dict_set;
-        this.__set_count += 1;
-      }
-      if (!is_empty(this.__dict_append)) {
-        event["$append"] = this.__dict_append;
-        this.__append_count += 1;
-      }
-      if (!is_empty(this.__dict_remove)) {
-        event["$remove"] = this.__dict_remove;
-        this.__remove_count += 1;
-      }
-      if (!is_empty(this.__list_unset)) {
-        event["$unset"] = this.__list_unset;
-        this.__unset_count += 1;
-      }
-      return event;
-    } else {
-      return;
+    const event = {};
+    if (!is_empty(this.__dict_set)) {
+      event["$set"] = this.__dict_set;
+    }
+    if (!is_empty(this.__dict_append)) {
+      event["$append"] = this.__dict_append;
+    }
+    if (!is_empty(this.__dict_remove)) {
+      event["$remove"] = this.__dict_remove;
     }
+    if (!is_empty(this.__list_unset)) {
+      event["$unset"] = this.__list_unset;
+    }
+    return event;
   }
 
   __validate_key_basic(key, caller) {
@@ -240,33 +206,25 @@ export default class _SubscriberInternalHelper {
   }
 
   __add_identity(key, value, args, caller) {
+    const new_caller = `${caller}:${key}`;
     switch (key) {
       case IDENT_KEY_EMAIL:
-        this._add_email(value, caller);
+        this._add_email(value, new_caller);
         break;
       case IDENT_KEY_SMS:
-        this._add_sms(value, caller);
+        this._add_sms(value, new_caller);
         break;
       case IDENT_KEY_WHATSAPP:
-        this._add_whatsapp(value, caller);
+        this._add_whatsapp(value, new_caller);
         break;
       case IDENT_KEY_ANDROIDPUSH:
-        this._add_androidpush(value, args[KEY_PUSHVENDOR], caller);
-        if (this.__dict_append[KEY_PUSHVENDOR]) {
-          args[KEY_PUSHVENDOR] = this.__dict_append[KEY_PUSHVENDOR];
-        }
+        this._add_androidpush(value, args[KEY_PUSHVENDOR], new_caller);
         break;
       case IDENT_KEY_IOSPUSH:
-        this._add_iospush(value, args[KEY_PUSHVENDOR], caller);
-        if (this.__dict_append[KEY_PUSHVENDOR]) {
-          args[KEY_PUSHVENDOR] = this.__dict_append[KEY_PUSHVENDOR];
-        }
+        this._add_iospush(value, args[KEY_PUSHVENDOR], new_caller);
         break;
       case IDENT_KEY_WEBPUSH:
-        this._add_webpush(value, args[KEY_PUSHVENDOR], caller);
-        if (this.__dict_append[KEY_PUSHVENDOR]) {
-          args[KEY_PUSHVENDOR] = this.__dict_append[KEY_PUSHVENDOR];
-        }
+        this._add_webpush(value, args[KEY_PUSHVENDOR], new_caller);
         break;
       case IDENT_KEY_SLACK:
         this._add_slack(value, caller);
@@ -277,33 +235,25 @@ export default class _SubscriberInternalHelper {
   }
 
   __remove_identity(key, value, args, caller) {
+    const new_caller = `${caller}:${key}`;
     switch (key) {
       case IDENT_KEY_EMAIL:
-        this._remove_email(value, caller);
+        this._remove_email(value, new_caller);
         break;
       case IDENT_KEY_SMS:
-        this._remove_sms(value, caller);
+        this._remove_sms(value, new_caller);
         break;
       case IDENT_KEY_WHATSAPP:
-        this._remove_whatsapp(value, caller);
+        this._remove_whatsapp(value, new_caller);
         break;
       case IDENT_KEY_ANDROIDPUSH:
-        this._remove_androidpush(value, args[KEY_PUSHVENDOR], caller);
-        if (this.__dict_remove[KEY_PUSHVENDOR]) {
-          args[KEY_PUSHVENDOR] = this.__dict_remove[KEY_PUSHVENDOR];
-        }
+        this._remove_androidpush(value, args[KEY_PUSHVENDOR], new_caller);
         break;
       case IDENT_KEY_IOSPUSH:
-        this._remove_iospush(value, args[KEY_PUSHVENDOR], caller);
-        if (this.__dict_remove[KEY_PUSHVENDOR]) {
-          args[KEY_PUSHVENDOR] = this.__dict_remove[KEY_PUSHVENDOR];
-        }
+        this._remove_iospush(value, args[KEY_PUSHVENDOR], new_caller);
         break;
       case IDENT_KEY_WEBPUSH:
-        this._remove_webpush(value, args[KEY_PUSHVENDOR], caller);
-        if (this.__dict_remove[KEY_PUSHVENDOR]) {
-          args[KEY_PUSHVENDOR] = this.__dict_remove[KEY_PUSHVENDOR];
-        }
+        this._remove_webpush(value, args[KEY_PUSHVENDOR], new_caller);
         break;
       case IDENT_KEY_SLACK:
         this._remove_slack(val, caller);
@@ -430,6 +380,9 @@ export default class _SubscriberInternalHelper {
     if (!provider) {
       provider = "fcm";
     }
+    if (typeof provider === "string") {
+      provider = provider.toLocaleLowerCase();
+    }
     if (!["fcm", "xiaomi", "oppo"].includes(provider)) {
       this.__errors.push(
         `[${caller}] unsupported androidpush provider ${provider}`
@@ -475,6 +428,9 @@ export default class _SubscriberInternalHelper {
     if (!provider) {
       provider = "apns";
     }
+    if (typeof provider === "string") {
+      provider = provider.toLocaleLowerCase();
+    }
     if (!["apns"].includes(provider)) {
       this.__errors.push(
         `[${caller}] unsupported iospush provider ${provider}`
@@ -521,6 +477,9 @@ export default class _SubscriberInternalHelper {
     if (!provider) {
       provider = "vapid";
     }
+    if (typeof provider === "string") {
+      provider = provider.toLocaleLowerCase();
+    }
     if (!["vapid"].includes(provider)) {
       this.__errors.push(
         `[${caller}] unsupported webpush provider ${provider}`

package/src/subscribers_bulk.js

@@ -2,7 +2,6 @@ import {
   IDENTITY_SINGLE_EVENT_MAX_APPARENT_SIZE_IN_BYTES,
   IDENTITY_SINGLE_EVENT_MAX_APPARENT_SIZE_IN_BYTES_READABLE,
   BODY_MAX_APPARENT_SIZE_IN_BYTES,
-  BODY_MAX_APPARENT_SIZE_IN_BYTES_READABLE,
   MAX_IDENTITY_EVENTS_IN_BULK_API,
 } from "./constants";
 import get_request_signature from "./signature";
@@ -34,16 +33,7 @@ class _BulkSubscribersChunk {
   }
 
   __get_url() {
-    let url_template = "event/";
-    if (this.config.include_signature_param) {
-      if (this.config.auth_enabled) {
-        url_template = url_template + "?verify=true";
-      } else {
-        url_template = url_template + "?verify=false";
-      }
-    }
-    const url_formatted = `${this.config.base_url}${url_template}`;
-    return url_formatted;
+    return `${this.config.base_url}event/`;
   }
 
   __common_headers() {
@@ -100,17 +90,16 @@ class _BulkSubscribersChunk {
   async trigger() {
     const headers = { ...this.__headers, ...this.__dynamic_headers() };
     const content_text = JSON.stringify(this.__chunk);
-    // Based on whether signature is required or not, add Authorization header
-    if (this.config.auth_enabled) {
-      const signature = get_request_signature(
-        this.__url,
-        "POST",
-        content_text,
-        headers,
-        this.config.workspace_secret
-      );
-      headers["Authorization"] = `${this.config.workspace_key}:${signature}`;
-    }
+
+    const signature = get_request_signature(
+      this.__url,
+      "POST",
+      content_text,
+      headers,
+      this.config.workspace_secret
+    );
+    headers["Authorization"] = `${this.config.workspace_key}:${signature}`;
+
     try {
       const response = await axios.post(this.__url, content_text, { headers });
       const ok_response = Math.floor(response.status / 100) == 2;
@@ -175,11 +164,9 @@ class BulkSubscribers {
       if (warnings_list) {
         this.response.warnings = [...this.response.warnings, ...warnings_list];
       }
-      const ev_arr = sub.events();
-      for (let ev of ev_arr) {
-        const [ev_json, body_size] = sub.validate_event_size(ev);
-        this.__pending_records.push([ev_json, body_size]);
-      }
+      const ev = sub.get_events();
+      const [ev_json, body_size] = sub.validate_event_size(ev);
+      this.__pending_records.push([ev_json, body_size]);
     }
   }
 
@@ -204,7 +191,7 @@ class BulkSubscribers {
     }
     for (let sub of subscribers) {
       if (!sub) {
-        throw new SuprsendError("null/empty element found in bulk instance");
+        continue;
       }
       if (!(sub instanceof Subscriber)) {
         throw new SuprsendError(

package/src/workflow.js

@@ -71,16 +71,7 @@ export class _WorkflowTrigger {
   }
 
   _get_url() {
-    let url_template = "/trigger/";
-    if (this.config.include_signature_param) {
-      if (this.config.auth_enabled) {
-        url_template = url_template + "?verify=true";
-      } else {
-        url_template = url_template + "?verify=false";
-      }
-    }
-    const url_formatted = `${this.config.base_url}${this.config.workspace_key}${url_template}`;
-    return url_formatted;
+    return `${this.config.base_url}${this.config.workspace_key}/trigger/`;
   }
 
   _get_headers() {
@@ -103,16 +94,15 @@ export class _WorkflowTrigger {
   async send(workflow_body) {
     const headers = this._get_headers();
     const content_text = JSON.stringify(workflow_body);
-    if (this.config.auth_enabled) {
-      const signature = get_request_signature(
-        this.url,
-        "POST",
-        content_text,
-        headers,
-        this.config.workspace_secret
-      );
-      headers["Authorization"] = `${this.config.workspace_key}:${signature}`;
-    }
+
+    const signature = get_request_signature(
+      this.url,
+      "POST",
+      content_text,
+      headers,
+      this.config.workspace_secret
+    );
+    headers["Authorization"] = `${this.config.workspace_key}:${signature}`;
 
     try {
       const response = await axios.post(this.url, content_text, { headers });

package/src/workflows_bulk.js

@@ -36,16 +36,7 @@ class _BulkWorkflowsChunk {
   }
 
   __get_url() {
-    let url_template = "/trigger/";
-    if (this.config.include_signature_param) {
-      if (this.config.auth_enabled) {
-        url_template = url_template + "?verify=true";
-      } else {
-        url_template = url_template + "?verify=false";
-      }
-    }
-    const url_formatted = `${this.config.base_url}${this.config.workspace_key}${url_template}`;
-    return url_formatted;
+    return `${this.config.base_url}${this.config.workspace_key}/trigger/`;
   }
 
   __common_headers() {
@@ -105,17 +96,16 @@ class _BulkWorkflowsChunk {
   async trigger() {
     const headers = { ...this.__headers, ...this.__dynamic_headers() };
     const content_text = JSON.stringify(this.__chunk);
-    // Based on whether signature is required or not, add Authorization header
-    if (this.config.auth_enabled) {
-      const signature = get_request_signature(
-        this.__url,
-        "POST",
-        content_text,
-        headers,
-        this.config.workspace_secret
-      );
-      headers["Authorization"] = `${this.config.workspace_key}:${signature}`;
-    }
+
+    const signature = get_request_signature(
+      this.__url,
+      "POST",
+      content_text,
+      headers,
+      this.config.workspace_secret
+    );
+    headers["Authorization"] = `${this.config.workspace_key}:${signature}`;
+
     try {
       const response = await axios.post(this.__url, content_text, { headers });
       const ok_response = Math.floor(response.status / 100) == 2;