pushilka 1.0.14 → 2.0.2

package/dist/app.js

@@ -1 +1 @@
-function Pushilka(e){var n,t,o=u(),i={endpoint:"https://swarmpush.com/push_subscription.php",eventEndpoint:"https://swarmpush.com/event",serviceWorker:"/serviceWorker.js",serviceWorkerOptions:{scope:"/"},applicationServerKey:"BCmIwkLHxJNPccoVf2UXDjd7kDuiyJpKsSOqSHCtGBMfBkjfHLCq4-d8eNtabNlCNKFF8CZIzeDwOo3OvNCQAns",source:"",var1:"",var2:"",var3:"",var4:"",var5:"",var6:"",var7:"",var8:"",var9:"",var10:"",useDialog:!1,visitorCookie:"pushilka_vid",dialog:{ttl:30,message:"We'd like to send you notifications for the latest news and updates.",allowText:"Allow",cancelText:"No thanks",icon:"https://swarmpush.com/s/pushilka/bell.webp",style:"https://swarmpush.com/s/pushilka/app.css",template:'<div id="pushilka-dialog" class="pushilka-dialog"><div class="pushilka-icon"><img width="80" src="{ICON_URL}" alt=""></div><div class="pushilka-message">{MESSAGE}</div><div class="pushilka-buttons"><a href="" id="pushilka-agree-button" class="pushilka-agree-button">{ALLOW_TEXT}</a><a href="" id="pushilka-cancel-button" class="pushilka-cancel-button">{CANCEL_TEXT}</a></div></div>'},done:function(){},success:function(){},decline:function(){}};for(t in e)if(e.hasOwnProperty(t)&&"dialog"===t)for(var r in e[t])e[t].hasOwnProperty(r)&&i[t].hasOwnProperty(r)&&(i[t][r]=e[t][r]);else e.hasOwnProperty(t)&&i.hasOwnProperty(t)&&(i[t]=e[t]);function a(e){fetch(i.eventEndpoint,{method:"POST",body:JSON.stringify({event:e,source:i.source,visitorId:l(),sessionId:o,var1:i.var1,var2:i.var2,var3:i.var3,var4:i.var4,var5:i.var5,var6:i.var6,var7:i.var7,var8:i.var8,var9:i.var9,var10:i.var10})}).catch()}function s(e,n,t){var o=new Date;o.setTime(o.getTime()+60*t*1e3),t="; expires="+o.toUTCString(),document.cookie=e+"="+(n||"")+t+"; path=/"}function c(e){var n,t=document.cookie.split(";"),o=e+"=";for(n in t){var r=t[n].trimLeft();if(0===r.indexOf(o))return r.substring(o.length)}return null}function d(){navigator.serviceWorker.ready.then(function(e){return a("sys_push_invoked"),e.pushManager.subscribe({userVisibleOnly:!0,applicationServerKey:function(e){for(var e=(e+"=".repeat((4-e.length%4)%4)).replace(/-/g,"+").replace(/_/g,"/"),n=window.atob(e),t=new Uint8Array(n.length),o=0;o<n.length;++o)t[o]=n.charCodeAt(o);return t}(i.applicationServerKey)})}).then(function(e){return v(e,"POST")}).catch(function(){a("sys_push_blocked"),i.decline(),i.done()})}function u(){for(var e=[],n=0;n<2;n++)e.push(Math.floor(4294967295*Math.random()).toString(36));return e.join("-")}function l(){var e=window.localStorage;return n=n||e.getItem("visitorId")||c(i.visitorCookie)||u(),e.setItem("visitorId",n),s(i.visitorCookie,n,365),n}function p(e){return e+"?vid="+encodeURIComponent(l())+"&sid="+encodeURIComponent(o)+"&s="+encodeURIComponent(i.source.toString())+"&var1="+encodeURIComponent(i.var1.toString())+"&var2="+encodeURIComponent(i.var2.toString())+"&var3="+encodeURIComponent(i.var3.toString())+"&var4="+encodeURIComponent(i.var4.toString())+"&var5="+encodeURIComponent(i.var5.toString())+"&var6="+encodeURIComponent(i.var6.toString())+"&var7="+encodeURIComponent(i.var7.toString())+"&var8="+encodeURIComponent(i.var8.toString())+"&var9="+encodeURIComponent(i.var9.toString())+"&var10="+encodeURIComponent(i.var10.toString())+"&timezone="+encodeURIComponent(function(){let e="";try{e=Intl.DateTimeFormat().resolvedOptions().timeZone}catch(e){console.error(e)}return e}())}function v(e,n){var t=e.getKey("p256dh"),o=e.getKey("auth"),r=(PushManager.supportedContentEncodings||["aesgcm"])[0];return fetch(p(i.endpoint),{method:n,body:JSON.stringify({endpoint:e.endpoint,publicKey:t?btoa(String.fromCharCode.apply(null,new Uint8Array(t))):null,authToken:o?btoa(String.fromCharCode.apply(null,new Uint8Array(o))):null,contentEncoding:r})}).then(function(){return i.success(),i.done(),e}).catch(function(){i.success(),i.done()})}this.ready=function(e){"interactive"===document.readyState||"complete"===document.readyState?e():document.addEventListener("DOMContentLoaded",e)},this.run=function(){this.ready(function(){"showNotification"in ServiceWorkerRegistration.prototype==!1?(console.debug("Push messaging is not supported."),a("push_not_supported"),i.decline(),i.done()):"denied"===Notification.permission?(console.debug("User has blocked notifications."),a("sys_push_blocked"),i.decline(),i.done()):navigator.serviceWorker.register(i.serviceWorker,i.serviceWorkerOptions).then(function(){navigator.serviceWorker.ready.then(function(e){return e.pushManager.getSubscription()}).then(function(e){return e?v(e,"PUT"):i.useDialog?void(null!==c("pushilka-dialog")?a("push_blocked"):(a("push_invoked"),e=i.dialog,(n=document.createElement("link")).rel="stylesheet",n.href=e.style,document.body.appendChild(n),(n=document.createElement("div")).innerHTML=e.template.replace("{ICON_URL}",e.icon).replace("{MESSAGE}",e.message).replace("{ALLOW_TEXT}",e.allowText).replace("{CANCEL_TEXT}",e.cancelText),document.body.appendChild(n),(t={agreeButton:document.getElementById("pushilka-agree-button"),cancelButton:document.getElementById("pushilka-cancel-button"),dialog:document.getElementById("pushilka-dialog")}).agreeButton.addEventListener("click",function(e){e.preventDefault(),t.dialog.remove(),d()}),t.cancelButton.addEventListener("click",function(e){e.preventDefault(),a("push_blocked"),s("pushilka-dialog","1",i.dialog.ttl),t.dialog.remove()}))):d();var n,t})}).catch(function(){a("sys_push_subscribe_error"),i.decline(),i.done()})})}}
+export default class Pushilka{sessionId=null;visitorId=null;params=null;constructor(e){for(var t in this.sessionId=this.genRandomString(),this.params={endpoint:"https://swarmpush.com/push_subscription.php",eventEndpoint:"https://swarmpush.com/event",serviceWorker:"/serviceWorker.js",serviceWorkerOptions:{scope:"/"},applicationServerKey:"BCmIwkLHxJNPccoVf2UXDjd7kDuiyJpKsSOqSHCtGBMfBkjfHLCq4-d8eNtabNlCNKFF8CZIzeDwOo3OvNCQAns",source:"",var1:"",var2:"",var3:"",var4:"",var5:"",var6:"",var7:"",var8:"",var9:"",var10:"",externalId:"",useDialog:!1,visitorCookie:"pushilka_vid",dialog:{ttl:30,message:"We'd like to send you notifications for the latest news and updates.",allowText:"Allow",cancelText:"No thanks",icon:"https://swarmpush.com/s/pushilka/bell.webp",style:"https://swarmpush.com/s/pushilka/app.css",template:'<div id="pushilka-dialog" class="pushilka-dialog"><div class="pushilka-icon"><img width="80" src="{ICON_URL}" alt=""></div><div class="pushilka-message">{MESSAGE}</div><div class="pushilka-buttons"><a href="" id="pushilka-agree-button" class="pushilka-agree-button">{ALLOW_TEXT}</a><a href="" id="pushilka-cancel-button" class="pushilka-cancel-button">{CANCEL_TEXT}</a></div></div>'},done:function(){},success:function(){},decline:function(){}},e)if(e.hasOwnProperty(t)&&"dialog"===t)for(var r in e[t])e[t].hasOwnProperty(r)&&this.params[t].hasOwnProperty(r)&&(this.params[t][r]=e[t][r]);else e.hasOwnProperty(t)&&this.params.hasOwnProperty(t)&&(this.params[t]=e[t])}urlBase64ToUint8Array(e){var e=(e+"=".repeat((4-e.length%4)%4)).replace(/-/g,"+").replace(/_/g,"/"),t=window.atob(e),r=new Uint8Array(t.length);for(let e=0;e<t.length;++e)r[e]=t.charCodeAt(e);return r}sendEvent(e){fetch(this.params.eventEndpoint,{method:"POST",body:JSON.stringify({event:e,source:this.params.source,visitorId:this.getVisitorId(),sessionId:this.sessionId,var1:this.params.var1,var2:this.params.var2,var3:this.params.var3,var4:this.params.var4,var5:this.params.var5,var6:this.params.var6,var7:this.params.var7,var8:this.params.var8,var9:this.params.var9,var10:this.params.var10,externalId:this.params.externalId})}).catch()}setCookie(e,t,r){var a=new Date;a.setTime(a.getTime()+60*r*1e3),r="; expires="+a.toUTCString(),document.cookie=e+"="+(t||"")+r+"; path=/"}getCookie(e){var t,r=document.cookie.split(";"),a=e+"=";for(t in r){var s=r[t].trimStart();if(0===s.indexOf(a))return s.substring(a.length)}return null}showDialog(){let r=this;if(null!==this.getCookie("pushilka-dialog"))this.sendEvent("push_blocked");else{this.sendEvent("push_invoked");var e=this.params.dialog,a=document.createElement("link"),a=(a.rel="stylesheet",a.href=e.style,document.body.appendChild(a),document.createElement("div"));a.innerHTML=e.template.replace("{ICON_URL}",e.icon).replace("{MESSAGE}",e.message).replace("{ALLOW_TEXT}",e.allowText).replace("{CANCEL_TEXT}",e.cancelText),document.body.appendChild(a);let t={agreeButton:document.getElementById("pushilka-agree-button"),cancelButton:document.getElementById("pushilka-cancel-button"),dialog:document.getElementById("pushilka-dialog")};t.agreeButton.addEventListener("click",function(e){e.preventDefault(),t.dialog.remove(),r.subscribe()}),t.cancelButton.addEventListener("click",function(e){e.preventDefault(),r.sendEvent("push_blocked"),r.setCookie("pushilka-dialog","1",r.params.dialog.ttl),t.dialog.remove()})}}subscribe(){let t=this;navigator.serviceWorker.ready.then(function(e){return t.sendEvent("sys_push_invoked"),e.pushManager.subscribe({userVisibleOnly:!0,applicationServerKey:t.urlBase64ToUint8Array(t.params.applicationServerKey)})}).then(function(e){return t.sendSubscriptionToServer(e,"POST")}).catch(function(){t.sendEvent("sys_push_blocked"),t.params.decline(),t.params.done()})}genRandomString(){var t=[];for(let e=0;e<2;e++)t.push(Math.floor(4294967295*Math.random()).toString(36));return t.join("-")}getVisitorId(){var e=window.localStorage;return this.visitorId=this.visitorId||e.getItem("visitorId")||this.getCookie(this.params.visitorCookie)||this.genRandomString(),e.setItem("visitorId",this.visitorId),this.setCookie(this.params.visitorCookie,this.visitorId,365),this.visitorId}getTimezone(){let e="";try{e=Intl.DateTimeFormat().resolvedOptions().timeZone}catch(e){console.error(e)}return e}getEndpoint(e){return e+"?vid="+encodeURIComponent(this.getVisitorId())+"&sid="+encodeURIComponent(this.sessionId)+"&s="+encodeURIComponent(this.params.source.toString())+"&var1="+encodeURIComponent(this.params.var1.toString())+"&var2="+encodeURIComponent(this.params.var2.toString())+"&var3="+encodeURIComponent(this.params.var3.toString())+"&var4="+encodeURIComponent(this.params.var4.toString())+"&var5="+encodeURIComponent(this.params.var5.toString())+"&var6="+encodeURIComponent(this.params.var6.toString())+"&var7="+encodeURIComponent(this.params.var7.toString())+"&var8="+encodeURIComponent(this.params.var8.toString())+"&var9="+encodeURIComponent(this.params.var9.toString())+"&var10="+encodeURIComponent(this.params.var10.toString())+"&externalId="+encodeURIComponent(this.params.externalId.toString())+"&timezone="+encodeURIComponent(this.getTimezone())}sendSubscriptionToServer(e,t){let r=this;var a=e.getKey("p256dh"),s=e.getKey("auth"),n=(PushManager.supportedContentEncodings||["aesgcm"])[0];return fetch(r.getEndpoint(r.params.endpoint),{method:t,body:JSON.stringify({endpoint:e.endpoint,publicKey:a?btoa(String.fromCharCode.apply(null,new Uint8Array(a))):null,authToken:s?btoa(String.fromCharCode.apply(null,new Uint8Array(s))):null,contentEncoding:n})}).then(function(){return r.params.success(),r.params.done(),e}).catch(function(){r.params.success(),r.params.done()})}ready(e){"interactive"===document.readyState||"complete"===document.readyState?e():document.addEventListener("DOMContentLoaded",e)}run(){let t=this;t.ready(function(){"showNotification"in ServiceWorkerRegistration.prototype?"denied"===Notification.permission?(console.debug("User has blocked notifications."),t.sendEvent("sys_push_blocked"),t.params.decline(),t.params.done()):navigator.serviceWorker.register(t.params.serviceWorker,t.params.serviceWorkerOptions).then(function(){navigator.serviceWorker.ready.then(function(e){return e.pushManager.getSubscription()}).then(function(e){return e?t.sendSubscriptionToServer(e,"PUT"):t.params.useDialog?t.showDialog():t.subscribe()})}).catch(function(){t.sendEvent("sys_push_subscribe_error"),t.params.decline(),t.params.done()}):(console.debug("Push messaging is not supported."),t.sendEvent("push_not_supported"),t.params.decline(),t.params.done())})}}

package/gulpfile.js

@@ -1,22 +1,22 @@
-const {series, src, dest} = require('gulp');
-const uglify = require('gulp-uglify');
-const uglifycss = require('gulp-uglifycss');
+let gulp = require('gulp');
+let uglify = require('gulp-uglify');
+let uglifycss = require('gulp-uglifycss');
 
 function scripts() {
-    return src('src/*.js')
+    return gulp.src('src/*.js')
         .pipe(uglify())
-        .pipe(dest('dist/'));
+        .pipe(gulp.dest('dist/'));
 }
 
 function css() {
-    return src('src/*.css')
+    return gulp.src('src/*.css')
         .pipe(uglifycss())
-        .pipe(dest('dist/'))
+        .pipe(gulp.dest('dist/'))
 }
 
 function images() {
-    return src('src/*.{webp,jpg,png,gif}')
-        .pipe(dest('dist/'));
+    return gulp.src('src/*.{webp,jpg,png,gif}')
+        .pipe(gulp.dest('dist/'));
 }
 
-exports.default = series(scripts, css, images)
+exports.default = gulp.series(scripts, css, images)

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "pushilka",
-  "version": "1.0.14",
+  "version": "2.0.2",
   "description": "Web push client",
   "main": "./dist/app.js",
   "devDependencies": {
-    "gulp": "^4.0.2",
+    "gulp": "^5.0.0",
     "gulp-uglify": "^3.0.2",
     "gulp-uglifycss": "^1.1.0"
   },
@@ -21,8 +21,8 @@
     "url": "https://github.com/pushilka/pushilka/issues"
   },
   "engines": {
-    "npm": ">=9.0.0 <10.0.0",
-    "node": ">=18.0.0 <19.0.0"
+    "npm": ">=10.0.0 <11.0.0",
+    "node": ">=22.0.0 <23.0.0"
   },
   "homepage": "https://github.com/pushilka/pushilka#readme"
 }

package/src/app.js

@@ -1,107 +1,113 @@
-function Pushilka(options) {
-    var sessionId = genRandomString(),
-        visitorId;
-
-    var params = {
-        endpoint: "https://swarmpush.com/push_subscription.php",
-        eventEndpoint: "https://swarmpush.com/event",
-        serviceWorker: "/serviceWorker.js",
-        serviceWorkerOptions: {scope: "/"},
-        applicationServerKey: "BCmIwkLHxJNPccoVf2UXDjd7kDuiyJpKsSOqSHCtGBMfBkjfHLCq4-d8eNtabNlCNKFF8CZIzeDwOo3OvNCQAns",
-        source: "",
-        var1: "",
-        var2: "",
-        var3: "",
-        var4: "",
-        var5: "",
-        var6: "",
-        var7: "",
-        var8: "",
-        var9: "",
-        var10: "",
-        useDialog: false,
-        visitorCookie: 'pushilka_vid',
-        dialog: {
-            ttl: 30,
-            message: "We'd like to send you notifications for the latest news and updates.",
-            allowText: "Allow",
-            cancelText: "No thanks",
-            icon: 'https://swarmpush.com/s/pushilka/bell.webp',
-            style: 'https://swarmpush.com/s/pushilka/app.css',
-            template: '<div id="pushilka-dialog" class="pushilka-dialog"><div class="pushilka-icon">'
-                + '<img width="80" src="{ICON_URL}" alt=""></div><div class="pushilka-message">{MESSAGE}</div>'
-                + '<div class="pushilka-buttons"><a href="" id="pushilka-agree-button" class="pushilka-agree-button">{ALLOW_TEXT}</a>'
-                + '<a href="" id="pushilka-cancel-button" class="pushilka-cancel-button">{CANCEL_TEXT}</a></div></div>'
-        },
-        done: function () {
-        },
-        success: function () {
-        },
-        decline: function () {
-        }
-    };
+export default class Pushilka {
+    sessionId = null;
+    visitorId = null;
+    params = null;
+
+    constructor(options) {
+        this.sessionId = this.genRandomString();
+        this.params = {
+            endpoint: "https://swarmpush.com/push_subscription.php",
+            eventEndpoint: "https://swarmpush.com/event",
+            serviceWorker: "/serviceWorker.js",
+            serviceWorkerOptions: {scope: "/"},
+            applicationServerKey: "BCmIwkLHxJNPccoVf2UXDjd7kDuiyJpKsSOqSHCtGBMfBkjfHLCq4-d8eNtabNlCNKFF8CZIzeDwOo3OvNCQAns",
+            source: "",
+            var1: "",
+            var2: "",
+            var3: "",
+            var4: "",
+            var5: "",
+            var6: "",
+            var7: "",
+            var8: "",
+            var9: "",
+            var10: "",
+            externalId: "",
+            useDialog: false,
+            visitorCookie: 'pushilka_vid',
+            dialog: {
+                ttl: 30,
+                message: "We'd like to send you notifications for the latest news and updates.",
+                allowText: "Allow",
+                cancelText: "No thanks",
+                icon: 'https://swarmpush.com/s/pushilka/bell.webp',
+                style: 'https://swarmpush.com/s/pushilka/app.css',
+                template: '<div id="pushilka-dialog" class="pushilka-dialog"><div class="pushilka-icon">'
+                    + '<img width="80" src="{ICON_URL}" alt=""></div><div class="pushilka-message">{MESSAGE}</div>'
+                    + '<div class="pushilka-buttons"><a href="" id="pushilka-agree-button" class="pushilka-agree-button">{ALLOW_TEXT}</a>'
+                    + '<a href="" id="pushilka-cancel-button" class="pushilka-cancel-button">{CANCEL_TEXT}</a></div></div>'
+            },
+            done: function () {
+            },
+            success: function () {
+            },
+            decline: function () {
+            }
+        };
 
-    for (var i in options) {
-        if (options.hasOwnProperty(i) && i === 'dialog') {
-            for (var j in options[i]) {
-                if (options[i].hasOwnProperty(j) && params[i].hasOwnProperty(j)) {
-                    params[i][j] = options[i][j];
+        for (let i in options) {
+            if (options.hasOwnProperty(i) && i === 'dialog') {
+                for (let j in options[i]) {
+                    if (options[i].hasOwnProperty(j) && this.params[i].hasOwnProperty(j)) {
+                        this.params[i][j] = options[i][j];
+                    }
                 }
+            } else if (options.hasOwnProperty(i) && this.params.hasOwnProperty(i)) {
+                this.params[i] = options[i];
             }
-        } else if (options.hasOwnProperty(i) && params.hasOwnProperty(i)) {
-            params[i] = options[i];
         }
     }
 
-    function urlBase64ToUint8Array(base64String) {
-        var padding = '='.repeat((4 - base64String.length % 4) % 4);
-        var base64 = (base64String + padding)
+    urlBase64ToUint8Array(base64String) {
+        let padding = '='.repeat((4 - base64String.length % 4) % 4);
+        let base64 = (base64String + padding)
             .replace(/-/g, '+')
             .replace(/_/g, '/');
 
-        var rawData = window.atob(base64);
-        var outputArray = new Uint8Array(rawData.length);
+        let rawData = window.atob(base64);
+        let outputArray = new Uint8Array(rawData.length);
 
-        for (var i = 0; i < rawData.length; ++i) {
+        for (let i = 0; i < rawData.length; ++i) {
             outputArray[i] = rawData.charCodeAt(i);
         }
         return outputArray;
     }
 
-    function sendEvent(event) {
-        fetch(params.eventEndpoint, {
+    sendEvent(event) {
+        fetch(this.params.eventEndpoint, {
             method: 'POST',
             body: JSON.stringify({
                 event: event,
-                source: params.source,
-                visitorId: getVisitorId(),
-                sessionId: sessionId,
-                var1: params.var1,
-                var2: params.var2,
-                var3: params.var3,
-                var4: params.var4,
-                var5: params.var5,
-                var6: params.var6,
-                var7: params.var7,
-                var8: params.var8,
-                var9: params.var9,
-                var10: params.var10,
+                source: this.params.source,
+                visitorId: this.getVisitorId(),
+                sessionId: this.sessionId,
+                var1: this.params.var1,
+                var2: this.params.var2,
+                var3: this.params.var3,
+                var4: this.params.var4,
+                var5: this.params.var5,
+                var6: this.params.var6,
+                var7: this.params.var7,
+                var8: this.params.var8,
+                var9: this.params.var9,
+                var10: this.params.var10,
+                externalId: this.params.externalId,
             })
         }).catch();
     }
 
-    function setCookie(name, value, expires) {
-        var date = new Date;
+    setCookie(name, value, expires) {
+        let date = new Date;
         date.setTime(date.getTime() + 60 * expires * 1000);
         expires = "; expires=" + date.toUTCString();
         document.cookie = name + "=" + (value || "") + expires + "; path=/";
     }
 
-    function getCookie(name) {
-        var parts = document.cookie.split(";"),
+    getCookie(name) {
+        let parts = document.cookie.split(";"),
             prefix = name + "=";
-        for (var i in parts) {
-            var part = parts[i].trimLeft();
+        for (let i in parts) {
+            let part = parts[i].trimStart();
             if (part.indexOf(prefix) === 0) {
                 return part.substring(prefix.length);
             }
@@ -110,22 +116,24 @@ function Pushilka(options) {
         return null;
     }
 
-    function showDialog() {
-        if (getCookie("pushilka-dialog") !== null) {
-            sendEvent("push_blocked");
+    showDialog() {
+        let self = this;
+
+        if (this.getCookie("pushilka-dialog") !== null) {
+            this.sendEvent("push_blocked");
             return;
         }
 
-        sendEvent("push_invoked");
+        this.sendEvent("push_invoked");
 
-        var dialog = params.dialog;
+        let dialog = this.params.dialog;
 
-        var s = document.createElement('link');
+        let s = document.createElement('link');
         s.rel = "stylesheet";
         s.href = dialog.style;
         document.body.appendChild(s);
 
-        var d = document.createElement('div');
+        let d = document.createElement('div');
         d.innerHTML = dialog.template
             .replace('{ICON_URL}', dialog.icon)
             .replace('{MESSAGE}', dialog.message)
@@ -133,7 +141,7 @@ function Pushilka(options) {
             .replace('{CANCEL_TEXT}', dialog.cancelText);
         document.body.appendChild(d);
 
-        var els = {
+        let els = {
             agreeButton: document.getElementById("pushilka-agree-button"),
             cancelButton: document.getElementById("pushilka-cancel-button"),
             dialog: document.getElementById("pushilka-dialog")
@@ -143,55 +151,56 @@ function Pushilka(options) {
             e.preventDefault();
 
             els.dialog.remove();
-            subscribe();
+            self.subscribe();
         });
         els.cancelButton.addEventListener("click", function (e) {
             e.preventDefault();
 
-            sendEvent("push_blocked");
-            setCookie("pushilka-dialog", "1", params.dialog.ttl);
+            self.sendEvent("push_blocked");
+            self.setCookie("pushilka-dialog", "1", self.params.dialog.ttl);
             els.dialog.remove();
         });
     }
 
-    function subscribe() {
+    subscribe() {
+        let self = this;
         navigator.serviceWorker.ready
             .then(function (serviceWorkerRegistration) {
-                sendEvent("sys_push_invoked");
+                self.sendEvent("sys_push_invoked");
                 return serviceWorkerRegistration.pushManager
                     .subscribe({
                         userVisibleOnly: true,
-                        applicationServerKey: urlBase64ToUint8Array(params.applicationServerKey)
+                        applicationServerKey: self.urlBase64ToUint8Array(self.params.applicationServerKey)
                     });
             })
             .then(function (subscription) {
-                return sendSubscriptionToServer(subscription, 'POST');
+                return self.sendSubscriptionToServer(subscription, 'POST');
             })
             .catch(function () {
-                sendEvent("sys_push_blocked");
-                params.decline();
-                params.done();
+                self.sendEvent("sys_push_blocked");
+                self.params.decline();
+                self.params.done();
             });
     }
 
-    function genRandomString() {
-        var s = [];
-        for (var i = 0; i < 2; i++) {
+    genRandomString() {
+        let s = [];
+        for (let i = 0; i < 2; i++) {
             s.push(Math.floor(Math.random() * 0xFFFFFFFF).toString(36));
         }
         return s.join("-");
     }
 
-    function getVisitorId() {
-        var st = window.localStorage;
-        visitorId = visitorId || st.getItem("visitorId") || getCookie(params.visitorCookie) || genRandomString();
-        st.setItem("visitorId", visitorId);
-        setCookie(params.visitorCookie, visitorId, 365);
+    getVisitorId() {
+        let st = window.localStorage;
+        this.visitorId = this.visitorId || st.getItem("visitorId") || this.getCookie(this.params.visitorCookie) || this.genRandomString();
+        st.setItem("visitorId", this.visitorId);
+        this.setCookie(this.params.visitorCookie, this.visitorId, 365);
 
-        return visitorId;
+        return this.visitorId;
     }
 
-    function getTimezone() {
+    getTimezone() {
         let timezone = "";
         try {
             timezone = Intl.DateTimeFormat().resolvedOptions().timeZone;
@@ -202,30 +211,32 @@ function Pushilka(options) {
         return timezone;
     }
 
-    function getEndpoint(endpoint) {
+    getEndpoint(endpoint) {
         return endpoint + '?'
-            + 'vid=' + encodeURIComponent(getVisitorId())
-            + '&sid=' + encodeURIComponent(sessionId)
-            + '&s=' + encodeURIComponent(params.source.toString())
-            + '&var1=' + encodeURIComponent(params.var1.toString())
-            + '&var2=' + encodeURIComponent(params.var2.toString())
-            + '&var3=' + encodeURIComponent(params.var3.toString())
-            + '&var4=' + encodeURIComponent(params.var4.toString())
-            + '&var5=' + encodeURIComponent(params.var5.toString())
-            + '&var6=' + encodeURIComponent(params.var6.toString())
-            + '&var7=' + encodeURIComponent(params.var7.toString())
-            + '&var8=' + encodeURIComponent(params.var8.toString())
-            + '&var9=' + encodeURIComponent(params.var9.toString())
-            + '&var10=' + encodeURIComponent(params.var10.toString())
-            + '&timezone=' + encodeURIComponent(getTimezone());
+            + 'vid=' + encodeURIComponent(this.getVisitorId())
+            + '&sid=' + encodeURIComponent(this.sessionId)
+            + '&s=' + encodeURIComponent(this.params.source.toString())
+            + '&var1=' + encodeURIComponent(this.params.var1.toString())
+            + '&var2=' + encodeURIComponent(this.params.var2.toString())
+            + '&var3=' + encodeURIComponent(this.params.var3.toString())
+            + '&var4=' + encodeURIComponent(this.params.var4.toString())
+            + '&var5=' + encodeURIComponent(this.params.var5.toString())
+            + '&var6=' + encodeURIComponent(this.params.var6.toString())
+            + '&var7=' + encodeURIComponent(this.params.var7.toString())
+            + '&var8=' + encodeURIComponent(this.params.var8.toString())
+            + '&var9=' + encodeURIComponent(this.params.var9.toString())
+            + '&var10=' + encodeURIComponent(this.params.var10.toString())
+            + '&externalId=' + encodeURIComponent(this.params.externalId.toString())
+            + '&timezone=' + encodeURIComponent(this.getTimezone());
     }
 
-    function sendSubscriptionToServer(subscription, method) {
-        var key = subscription.getKey('p256dh');
-        var token = subscription.getKey('auth');
-        var contentEncoding = (PushManager.supportedContentEncodings || ['aesgcm'])[0];
+    sendSubscriptionToServer(subscription, method) {
+        let self = this;
+        let key = subscription.getKey('p256dh');
+        let token = subscription.getKey('auth');
+        let contentEncoding = (PushManager.supportedContentEncodings || ['aesgcm'])[0];
 
-        return fetch(getEndpoint(params.endpoint), {
+        return fetch(self.getEndpoint(self.params.endpoint), {
             method: method,
             body: JSON.stringify({
                 endpoint: subscription.endpoint,
@@ -235,43 +246,44 @@ function Pushilka(options) {
             })
         })
             .then(function () {
-                params.success();
-                params.done();
+                self.params.success();
+                self.params.done();
                 return subscription;
             })
             .catch(function () {
-                params.success();
-                params.done();
+                self.params.success();
+                self.params.done();
             });
     }
 
-    this.ready = function (callback) {
+    ready(callback) {
         if (document.readyState === 'interactive' || document.readyState === 'complete') {
             callback();
         } else {
             document.addEventListener("DOMContentLoaded", callback);
         }
-    };
+    }
 
-    this.run = function () {
-        this.ready(function () {
-            if ("showNotification" in ServiceWorkerRegistration.prototype === false) {
+    run() {
+        let self = this;
+        self.ready(function () {
+            if (!("showNotification" in ServiceWorkerRegistration.prototype)) {
                 console.debug("Push messaging is not supported.");
-                sendEvent("push_not_supported");
-                params.decline();
-                params.done();
+                self.sendEvent("push_not_supported");
+                self.params.decline();
+                self.params.done();
                 return;
             }
 
             if (Notification.permission === "denied") {
                 console.debug("User has blocked notifications.");
-                sendEvent("sys_push_blocked");
-                params.decline();
-                params.done();
+                self.sendEvent("sys_push_blocked");
+                self.params.decline();
+                self.params.done();
                 return;
             }
 
-            navigator.serviceWorker.register(params.serviceWorker, params.serviceWorkerOptions)
+            navigator.serviceWorker.register(self.params.serviceWorker, self.params.serviceWorkerOptions)
                 .then(function () {
                     navigator.serviceWorker.ready
                         .then(function (serviceWorkerRegistration) {
@@ -279,17 +291,17 @@ function Pushilka(options) {
                         })
                         .then(function (subscription) {
                             if (!subscription) {
-                                return params.useDialog ? showDialog() : subscribe();
+                                return self.params.useDialog ? self.showDialog() : self.subscribe();
                             } else {
-                                return sendSubscriptionToServer(subscription, 'PUT');
+                                return self.sendSubscriptionToServer(subscription, 'PUT');
                             }
                         });
                 })
                 .catch(function () {
-                    sendEvent("sys_push_subscribe_error");
-                    params.decline();
-                    params.done();
+                    self.sendEvent("sys_push_subscribe_error");
+                    self.params.decline();
+                    self.params.done();
                 });
         });
     }
-}
+}