@suprsend/web-sdk 0.1.21 → 0.1.25

package/package.json

@@ -1,12 +1,11 @@
 {
   "name": "@suprsend/web-sdk",
-  "version": "0.1.21",
+  "version": "0.1.25",
   "description": "This is sdk used to integrate suprsend functionality in javascript applications",
   "main": "dist/cjs_bundle.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "build": "rm -rf dist && webpack --env module_type=commonjs --env filename=cjs_bundle.js  && webpack --env module_type=window --env filename=cdn_bundle.js",
-    "minify-sw": "touch ./serviceworker/serviceworker.min.js && rm ./serviceworker/serviceworker.min.js && minify ./serviceworker/serviceworker.js > ./serviceworker/serviceworker.min.js",
     "publish-sdk": "npm run build && npm publish"
   },
   "keywords": [
@@ -15,7 +14,7 @@
     "suprsend-browser-sdk"
   ],
   "author": "Sivaram Katta",
-  "license": "ISC",
+  "license": "MIT",
   "repository": {
     "type": "git",
     "url": "https://github.com/suprsend/suprsend-browser.git"
@@ -27,7 +26,6 @@
     "@babel/core": "^7.15.0",
     "@babel/preset-env": "^7.15.0",
     "babel-loader": "^8.2.2",
-    "minify": "^8.0.3",
     "webpack": "^5.51.1",
     "webpack-cli": "^4.8.0"
   },

package/serviceworker/serviceworker.js

@@ -1,7 +1,35 @@
+function uuid() {
+  var dt = new Date().getTime();
+  var uuid = "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(
+    /[xy]/g,
+    function (c) {
+      var r = (dt + Math.random() * 16) % 16 | 0;
+      dt = Math.floor(dt / 16);
+      return (c == "x" ? r : (r & 0x3) | 0x8).toString(16);
+    }
+  );
+  return uuid;
+}
+
+function epoch_milliseconds() {
+  return Math.round(Date.now());
+}
+
+function safe_get(cb, default_value) {
+  var resp;
+  try {
+    resp = cb();
+  } catch (err) {
+    resp = default_value;
+  }
+  return resp;
+}
+
 var suprsend_config = {
   api_url: "https://hub.suprsend.com",
   imgkit_root: "https://ik.imagekit.io/l0quatz6utm/",
   api_events_route: "event/",
+  workspace_key: "",
 };
 
 var valid_notification_params = [
@@ -22,20 +50,17 @@ var valid_notification_params = [
   "actions",
 ];
 
-const url_fields = ["image", "icon", "badge"];
+var url_fields = ["image", "icon", "badge"];
 
-function safe_get(cb, default_value) {
-  let resp;
-  try {
-    resp = cb();
-  } catch (err) {
-    resp = default_value;
+function init_workspace(key, url) {
+  suprsend_config.workspace_key = key;
+  if (url) {
+    suprsend_config.api_url = url;
   }
-  return resp;
 }
 
 function validate_notification(notification_obj) {
-  let validated_notification_obj = {};
+  var validated_notification_obj = {};
   for (var item in notification_obj) {
     if (valid_notification_params.includes(item)) {
       if (url_fields.includes(item)) {
@@ -53,26 +78,38 @@ function validate_notification(notification_obj) {
   return validated_notification_obj;
 }
 
-function track_data(body, method = "post") {
+function call_ss_api(body, method = "post") {
+  var requested_date = new Date().toGMTString();
+  var authorization = suprsend_config.workspace_key + ":";
   return fetch(
     `${suprsend_config.api_url}/${suprsend_config.api_events_route}`,
     {
       method: method,
       body: JSON.stringify(body),
-      headers: { "Content-Type": "application/json" },
+      headers: {
+        "Content-Type": "application/json",
+        Authorization: authorization,
+        "x-amz-date": requested_date,
+      },
     }
   );
 }
 
+function send_notification_event(event_name, event_properties) {
+  call_ss_api({
+    event: event_name,
+    env: suprsend_config.workspace_key,
+    $insert_id: uuid(),
+    $time: epoch_milliseconds(),
+    properties: event_properties,
+  });
+}
+
 self.addEventListener("push", function (e) {
   var notification = e.data.json();
-  const validated_notification = validate_notification(notification);
-  console.log("Received notification", validated_notification);
-  track_data({
-    event: "$notification_delivered",
-    properties: {
-      id: safe_get(() => validated_notification.data.notification_id),
-    },
+  var validated_notification = validate_notification(notification);
+  send_notification_event("$notification_delivered", {
+    id: safe_get(() => validated_notification.data.notification_id),
   });
   e.waitUntil(
     self.registration.showNotification(
@@ -84,25 +121,17 @@ self.addEventListener("push", function (e) {
 
 self.addEventListener("notificationclose", function (e) {
   var notification = e.notification;
-  console.log("Closed notification", notification);
-  track_data({
-    event: "$notification_dismiss",
-    properties: {
-      id: safe_get(() => notification.data.notification_id),
-    },
+  send_notification_event("$notification_dismiss", {
+    id: safe_get(() => notification.data.notification_id),
   });
 });
 
 self.addEventListener("notificationclick", function (e) {
   e.notification.close();
   var notification = e.notification;
-  console.log("Clicked notification", notification);
-  track_data({
-    event: "$notification_clicked",
-    properties: {
-      id: safe_get(() => notification.data.notification_id),
-      label_id: e.action,
-    },
+  send_notification_event("$notification_clicked", {
+    id: safe_get(() => notification.data.notification_id),
+    label_id: e.action,
   });
   var launch_url_obj = safe_get(() => notification.data.launch_urls);
   var redirect_url = "/";

package/src/index.js

@@ -1,7 +1,7 @@
 import utils from "./utils";
 import config from "./config";
 import User from "./user";
-import ServiceWorker from "./service_worker";
+import WebPush from "./web_push";
 import { constants } from "./constants";
 import { SSConfigurationError } from "./errors";
 
@@ -24,8 +24,8 @@ class SuprSend {
     }
     suprSendInstance.distinct_id = distinct_id;
     this.user = new User(suprSendInstance);
-    this.sw = new ServiceWorker(suprSendInstance);
-    this.sw.update_subscription();
+    this.web_push = new WebPush(suprSendInstance);
+    this.web_push.update_subscription();
     SuprSend.setEnvProperties();
     utils.bulk_call_api();
   }
@@ -101,6 +101,7 @@ class SuprSend {
       utils.set_cookie(constants.distinct_id, unique_id);
       suprSendInstance.distinct_id = unique_id;
       suprSendInstance._user_identified = true;
+      this.web_push.update_subscription();
     }
   }
 
@@ -137,7 +138,7 @@ class SuprSend {
     };
     utils.remove_local_storage_item(constants.super_properties_key);
     this.user = new User(suprSendInstance);
-    this.sw = new ServiceWorker(suprSendInstance);
+    this.web_push = new WebPush(suprSendInstance);
     SuprSend.setEnvProperties();
   }
 }

package/src/user.js

@@ -11,6 +11,8 @@ class User {
     utils.batch_or_call({
       env: config.env_key,
       distinct_id: this.instance.distinct_id,
+      $insert_id: utils.uuid(),
+      $time: utils.epoch_milliseconds(),
       ...properties,
     });
   }
@@ -138,6 +140,7 @@ class User {
     this.append({
       $webpush: push,
       $device_id: this.instance?.env_properties?.$device_id,
+      $pushvendor: "vapid",
     });
   }
 }

package/src/{service_worker.js → web_push.js}

@@ -4,7 +4,7 @@ import User from "./user";
 import { init_at } from "./index";
 
 var notification_timer;
-class ServiceWorker {
+class WebPush {
   constructor(instance) {
     this.instance = instance;
     this.user = new User(instance);
@@ -120,4 +120,4 @@ class ServiceWorker {
   // };
 }
 
-export default ServiceWorker;
+export default WebPush;

package/serviceworker/serviceworker.min.js

@@ -1 +0,0 @@
-var suprsend_config={api_url:"https://hub.suprsend.com",imgkit_root:"https://ik.imagekit.io/l0quatz6utm/",api_events_route:"event/"},valid_notification_params=["title","body","icon","image","badge","vibrate","sound","dir","tag","data","requireInteraction","renotify","silent","timestamp","actions"];const url_fields=["image","icon","badge"];function safe_get(i,t){let n;try{n=i()}catch(i){n=t}return n}function validate_notification(i){let t={};for(var n in i)valid_notification_params.includes(n)&&(url_fields.includes(n)?t[n]=`${suprsend_config.imgkit_root}${i[n]}`:t[n]=i[n]);return t.actions instanceof Array||delete t.actions,t}function track_data(i,t="post"){return fetch(`${suprsend_config.api_url}/${suprsend_config.api_events_route}`,{method:t,body:JSON.stringify(i),headers:{"Content-Type":"application/json"}})}self.addEventListener("push",(function(i){const t=validate_notification(i.data.json());console.log("Received notification",t),track_data({event:"$notification_delivered",properties:{id:safe_get((()=>t.data.notification_id))}}),i.waitUntil(self.registration.showNotification(t.title||"",t))})),self.addEventListener("notificationclose",(function(i){var t=i.notification;console.log("Closed notification",t),track_data({event:"$notification_dismiss",properties:{id:safe_get((()=>t.data.notification_id))}})})),self.addEventListener("notificationclick",(function(i){i.notification.close();var t=i.notification;console.log("Clicked notification",t),track_data({event:"$notification_clicked",properties:{id:safe_get((()=>t.data.notification_id)),label_id:i.action}});var n=safe_get((()=>t.data.launch_urls)),e="/";n?i.action&&n[i.action]?e=n[i.action]:n.default&&(e=n.default):e="/",clients.openWindow(e)}));