pushilka 1.0.12 → 1.0.14

package/dist/app.js

@@ -1 +1 @@
-function Pushilka(e){var n,a=d(),s={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:"",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(var t in e)if(e.hasOwnProperty(t)&&"dialog"===t)for(var o in e[t])e[t].hasOwnProperty(o)&&s[t].hasOwnProperty(o)&&(s[t][o]=e[t][o]);else e.hasOwnProperty(t)&&s.hasOwnProperty(t)&&(s[t]=e[t]);function i(e){fetch(s.eventEndpoint,{method:"POST",body:JSON.stringify({event:e,source:s.source,visitorId:l(),sessionId:a,var1:s.var1,var2:s.var2,var3:s.var3,var4:s.var4})}).catch()}function r(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=document.cookie.split(";"),t=e+"=";for(var o in n){var i=n[o].trimLeft();if(0===i.indexOf(t))return i.substring(t.length)}return null}function u(){navigator.serviceWorker.ready.then(function(e){return i("sys_push_invoked"),e.pushManager.subscribe({userVisibleOnly:!0,applicationServerKey:function(e){for(var n=(e+"=".repeat((4-e.length%4)%4)).replace(/-/g,"+").replace(/_/g,"/"),t=window.atob(n),o=new Uint8Array(t.length),i=0;i<t.length;++i)o[i]=t.charCodeAt(i);return o}(s.applicationServerKey)})}).then(function(e){return p(e,"POST")}).catch(function(){i("sys_push_blocked"),s.decline(),s.done()})}function d(){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(s.visitorCookie)||d(),e.setItem("visitorId",n),r(s.visitorCookie,n,365),n}function p(e,n){var t,o=e.getKey("p256dh"),i=e.getKey("auth"),r=(PushManager.supportedContentEncodings||["aesgcm"])[0];return fetch((t=s.endpoint,t+"?vid="+encodeURIComponent(l())+"&sid="+encodeURIComponent(a)+"&s="+encodeURIComponent(s.source.toString())+"&var1="+encodeURIComponent(s.var1.toString())+"&var2="+encodeURIComponent(s.var2.toString())+"&var3="+encodeURIComponent(s.var3.toString())+"&var4="+encodeURIComponent(s.var4.toString())),{method:n,body:JSON.stringify({endpoint:e.endpoint,publicKey:o?btoa(String.fromCharCode.apply(null,new Uint8Array(o))):null,authToken:i?btoa(String.fromCharCode.apply(null,new Uint8Array(i))):null,contentEncoding:r})}).then(function(){return s.success(),s.done(),e}).catch(function(){s.success(),s.done()})}this.ready=function(e){"interactive"===document.readyState||"complete"===document.readyState?e():document.addEventListener("DOMContentLoaded",e)},this.run=function(){this.ready(function(){return"showNotification"in ServiceWorkerRegistration.prototype==!1?(console.debug("Push messaging is not supported."),i("push_not_supported"),s.decline(),void s.done()):"denied"===Notification.permission?(console.debug("User has blocked notifications."),i("sys_push_blocked"),s.decline(),void s.done()):void navigator.serviceWorker.register(s.serviceWorker,s.serviceWorkerOptions).then(function(){navigator.serviceWorker.ready.then(function(e){return e.pushManager.getSubscription()}).then(function(e){return e?p(e,"PUT"):s.useDialog?function(){if(null===c("pushilka-dialog")){i("push_invoked");var e=s.dialog,n=document.createElement("link");n.rel="stylesheet",n.href=e.style,document.body.appendChild(n);var t=document.createElement("div");t.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(t);var o={agreeButton:document.getElementById("pushilka-agree-button"),cancelButton:document.getElementById("pushilka-cancel-button"),dialog:document.getElementById("pushilka-dialog")};o.agreeButton.addEventListener("click",function(e){e.preventDefault(),o.dialog.remove(),u()}),o.cancelButton.addEventListener("click",function(e){e.preventDefault(),i("push_blocked"),r("pushilka-dialog","1",s.dialog.ttl),o.dialog.remove()})}else i("push_blocked")}():u()})}).catch(function(){i("sys_push_subscribe_error"),s.decline(),s.done()})})}}
+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()})})}}

package/dist/serviceWorker.js

@@ -1 +1 @@
-self.addEventListener("push",function(i){if(self.Notification&&"granted"===self.Notification.permission){var t;if(i.data){var n=i.data.json();i.waitUntil((t=n,self.registration.showNotification(t.title,{body:t.body,icon:t.icon,badge:t.badge,image:t.image,vibrate:t.vibrate,sound:t.sound,sticky:!0,noscreen:!1,requireInteraction:!1,timestamp:t.timestamp,data:{url:t.url,msg_id:t.hasOwnProperty("msg_id")?t.msg_id:""}})))}}}),self.addEventListener("notificationclick",function(i){i.notification.close(),i.waitUntil(clients.openWindow(i.notification.data.url))});
+self.addEventListener("push",function(i){var t;self.Notification&&"granted"===self.Notification.permission&&i.data&&(t=i.data.json(),i.waitUntil((i=t,self.registration.showNotification(i.title,{body:i.body,icon:i.icon,badge:i.badge,image:i.image,vibrate:i.vibrate,sound:i.sound,sticky:!0,noscreen:!1,requireInteraction:!1,timestamp:i.timestamp,data:{url:i.url,msg_id:i.hasOwnProperty("msg_id")?i.msg_id:""}}))))}),self.addEventListener("notificationclick",function(i){i.notification.close(),i.waitUntil(clients.openWindow(i.notification.data.url))});

package/gulpfile.js

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

package/package.json

@@ -1,14 +1,12 @@
 {
   "name": "pushilka",
-  "version": "1.0.12",
+  "version": "1.0.14",
   "description": "Web push client",
   "main": "./dist/app.js",
-  "dependencies": {},
   "devDependencies": {
     "gulp": "^4.0.2",
-    "gulp-uglify": "^3.0.0",
-    "gulp-uglifycss": "^1.1.0",
-    "pump": "^3.0.0"
+    "gulp-uglify": "^3.0.2",
+    "gulp-uglifycss": "^1.1.0"
   },
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
@@ -22,5 +20,9 @@
   "bugs": {
     "url": "https://github.com/pushilka/pushilka/issues"
   },
+  "engines": {
+    "npm": ">=9.0.0 <10.0.0",
+    "node": ">=18.0.0 <19.0.0"
+  },
   "homepage": "https://github.com/pushilka/pushilka#readme"
 }

package/src/app.js

@@ -13,6 +13,12 @@ function Pushilka(options) {
         var2: "",
         var3: "",
         var4: "",
+        var5: "",
+        var6: "",
+        var7: "",
+        var8: "",
+        var9: "",
+        var10: "",
         useDialog: false,
         visitorCookie: 'pushilka_vid',
         dialog: {
@@ -73,7 +79,13 @@ function Pushilka(options) {
                 var1: params.var1,
                 var2: params.var2,
                 var3: params.var3,
-                var4: params.var4
+                var4: params.var4,
+                var5: params.var5,
+                var6: params.var6,
+                var7: params.var7,
+                var8: params.var8,
+                var9: params.var9,
+                var10: params.var10,
             })
         }).catch();
     }
@@ -179,6 +191,17 @@ function Pushilka(options) {
         return visitorId;
     }
 
+    function getTimezone() {
+        let timezone = "";
+        try {
+            timezone = Intl.DateTimeFormat().resolvedOptions().timeZone;
+        } catch (error) {
+            console.error(error);
+        }
+
+        return timezone;
+    }
+
     function getEndpoint(endpoint) {
         return endpoint + '?'
             + 'vid=' + encodeURIComponent(getVisitorId())
@@ -187,7 +210,14 @@ function Pushilka(options) {
             + '&var1=' + encodeURIComponent(params.var1.toString())
             + '&var2=' + encodeURIComponent(params.var2.toString())
             + '&var3=' + encodeURIComponent(params.var3.toString())
-            + '&var4=' + encodeURIComponent(params.var4.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());
     }
 
     function sendSubscriptionToServer(subscription, method) {