@suprsend/node-sdk 1.2.0 → 1.4.0

package/src/{subscribers_list.js → subscriber_list.js}

@@ -13,7 +13,7 @@ import {
   SINGLE_EVENT_MAX_APPARENT_SIZE_IN_BYTES_READABLE,
 } from "./constants";
 
-class SubscribersListBroadcast {
+class SubscriberListBroadcast {
   constructor(body, kwargs = {}) {
     if (!(body instanceof Object)) {
       throw new SuprsendError("broadcast body must be a json/dictionary");
@@ -43,7 +43,7 @@ class SubscribersListBroadcast {
   }
 }
 
-class SubscribersListApi {
+class SubscriberListsApi {
   constructor(config) {
     this.config = config;
     this.subscriber_list_url = `${this.config.base_url}v1/subscriber_list/`;
@@ -241,56 +241,56 @@ class SubscribersListApi {
     }
   }
 
-  // async broadcast(broadcast_instance) {
-  //   if (!(broadcast_instance instanceof SubscribersListBroadcast)) {
-  //     throw new SuprsendError(
-  //       "argument must be an instance of suprsend.SubscriberListBroadcast"
-  //     );
-  //   }
-  //   const [broadcast_body, body_size] = broadcast_instance.get_final_json(
-  //     this.config
-  //   );
-  //   const headers = { ...this.__headers, ...this.__dynamic_headers() };
-  //   const content_text = JSON.stringify(broadcast_body);
-
-  //   const signature = get_request_signature(
-  //     this.broadcast_url,
-  //     "POST",
-  //     content_text,
-  //     headers,
-  //     this.config.workspace_secret
-  //   );
-  //   headers["Authorization"] = `${this.config.workspace_key}:${signature}`;
-
-  //   try {
-  //     const response = await axios.post(this.broadcast_url, content_text, {
-  //       headers,
-  //     });
-  //     const ok_response = Math.floor(response.status / 100) == 2;
-  //     if (ok_response) {
-  //       return {
-  //         success: true,
-  //         status: "success",
-  //         status_code: response.status,
-  //         message: response.statusText,
-  //       };
-  //     } else {
-  //       return {
-  //         success: false,
-  //         status: "fail",
-  //         status_code: response.status,
-  //         message: response.statusText,
-  //       };
-  //     }
-  //   } catch (err) {
-  //     return {
-  //       success: false,
-  //       status: "fail",
-  //       status_code: err.status || 500,
-  //       message: err.message,
-  //     };
-  //   }
-  // }
+  async broadcast(broadcast_instance) {
+    if (!(broadcast_instance instanceof SubscriberListBroadcast)) {
+      throw new SuprsendError(
+        "argument must be an instance of suprsend.SubscriberListBroadcast"
+      );
+    }
+    const [broadcast_body, body_size] = broadcast_instance.get_final_json(
+      this.config
+    );
+    const headers = { ...this.__headers, ...this.__dynamic_headers() };
+    const content_text = JSON.stringify(broadcast_body);
+
+    const signature = get_request_signature(
+      this.broadcast_url,
+      "POST",
+      content_text,
+      headers,
+      this.config.workspace_secret
+    );
+    headers["Authorization"] = `${this.config.workspace_key}:${signature}`;
+
+    try {
+      const response = await axios.post(this.broadcast_url, content_text, {
+        headers,
+      });
+      const ok_response = Math.floor(response.status / 100) == 2;
+      if (ok_response) {
+        return {
+          success: true,
+          status: "success",
+          status_code: response.status,
+          message: response.statusText,
+        };
+      } else {
+        return {
+          success: false,
+          status: "fail",
+          status_code: response.status,
+          message: response.statusText,
+        };
+      }
+    } catch (err) {
+      return {
+        success: false,
+        status: "fail",
+        status_code: err.status || 500,
+        message: err.message,
+      };
+    }
+  }
 }
 
-export { SubscribersListApi, SubscribersListBroadcast };
+export { SubscriberListsApi, SubscriberListBroadcast };

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;