From b36442d5aaea264595f8e093a92e59f4dd52a9e0 Mon Sep 17 00:00:00 2001
From: ebelcrom <ebelcrom@gmail.com>
Date: Sun, 19 Jan 2020 22:45:11 +0100
Subject: [PATCH] chaching disabled, notification with icon and message now

---
 public/images/icon.png         | Bin 0 -> 2833 bytes
 routes/v1/test/control.js      |  10 +++++++++-
 routes/v1/test/events.js       |   1 -
 routes/v1/test/notification.js |  10 +++++++++-
 routes/v1/test/settings.js     |  33 +++++++++++----------------------
 routes/v1/test/status.js       |  10 +++++++++-
 6 files changed, 38 insertions(+), 26 deletions(-)
 create mode 100644 public/images/icon.png

diff --git a/public/images/icon.png b/public/images/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..53b8e9177c51352c6ccc8c18fd89d1b612553106
GIT binary patch
literal 2833
zcmV+s3-0uZP)<h;3K|Lk000e1NJLTq002w?002w~1^@s6$Cptn00009a7bBm000fw
z000fw0YWI7cmMzj!%0LzRCwC$oO@7HcNWJJv+cJ3?d)`CcDt^2Rt0<|1hlPM>vpHU
zi*FD?e4wDX)uQWb*R8u%ceg6t)#9rH6+2zE)>=o@I&F7$D~|vQNP+}VaHJ5DAnzpL
zUd-9^`z1HrdlNzeGz7iBneY65_vSv%`Q)5)fA{8sL?Sk^iA`)`6Pwt?_GC4ULgDB&
za`_OoLP12=vAqb1z_G(9k;`qMP>#>#a;Xs9Qwfg?N<%=|pm0IGip#&{EDw2V!MO#c
zP$*GnQJ@VD2K?*_YU)!7j#s0cL4~lO?kkl9lojDTuEMb$+*Q=;?!Y}6kZe)ZRij*k
zI>&+{J&M8otOT0cHm2apJOno=;c-DZB8p$kmE4G8LD?e<?6A0F#zn+E8L8@2qr3&B
zRN{C%XvU8RGVTG~;H_~z)+o9BTu-17E@(#n8q}eopnmxkI`$CU;HYsL+uX@kqg<z6
zsH+;~64a;>^z*{_L{MGI1J$)+DA=?M;Z5)e9H+)j^Sg-aaUR8)9(W8Y4ncj916k@;
z$SP`r?7~LK(wIPXrO+#Ieplmq07X*otk)66g1X%dSt=c5=Ga8W*+qQ<cV)n?svgXv
zyiC2#JW$!WI=Dd~<>^6P+6X1uM##xG*wzWbz0<3R`{BWHQ}2#zP)e^ODlX9p6p5y6
zgj0N{0Up$}fuY_4M%4GUCeRRYH@V=NY~V6T#Qm{15!e5z%9}^^SB;AI3=~nF!AxZ^
zc7ZE#3vK{w9DCL4ztr;{6p`L&;f*Oc9fB(pg6s3ep?9h3c4pq&8g)_CCr~cIJ+wfL
zTX03at#QKXh|DE8we5i&3q}a4Z_@)WK<PY?D{yxZoT~q7oXb>Y?}d5MMjqC2#v#6_
zQEc?oKWvA_h7M?OqldVSyNJ6}-UO;!F2MCqstT@zc33!;<M^|_P7geZD6Z3`_nV-g
ztR4z09ztQcK)9};ydE@_jZUyU1J|eN$TietmJ^LIH3t}uRR(e&r%-fyl6tu=LFqlN
zQ98XDni?NL#0THPvr(z=vo)W<Ph(H>^a8GXE;<dSzI&N&t8)R|30$2CO1q0VN2-R}
zeCZxsXRVFJUDPv<dr|?g%nBP>#$D>=_93F`3>Jrz1Xy#^Bbc@CE0D}R0+NW6AX)Me
zU*Whe>?n-ea)EA3_F>`l6mhi#Tm=DV?9FtfQ;Ys$uR;B|TVVG{D$3=IIyji_h@h;!
z1;uyD;#d{}oBOxxAeny*o>`U(LzbrS^dnp+S#TVJw|(Ifm}lV36kM(=a94O22P*{^
zOdc`GJMF<!;ucsr-6+_q9UVv_%1UZfZXf1RLdUuVHt#5fBSlDD$s!4`W1!gT9+;=#
zv;<s%(cN^!S{fKYv#Hb;VQztC87EEz&6v^VqUCY*`CsM|P*wzGb*fR{_YRaRU~jPz
zhIMR6WC~9t>Ld$$j<CLiqY-D#yH-ptWDT0JV_NhRCJ<m+)U(|I`>#4A<a&ifGAvu$
zkycy@B%&AuW%ag3c>`?vo~t04^&v<WpP+DfBJ1WPLr~&*uYh?34v(e1+uQ{%N7q?Y
z!9bR_BSZU>=Z9gYeTqy9P|x##IcBqR`7n06k*%stFI1aI>M;n)>TQkk)DdHSJ6z4L
zhL5gm;nX+f@bTAWeBrv2_}PW5D!Q%k-2DNLd<kU;F0a7I+`5gWC#Uur%K<M0LwQ$8
z;UnBzCqAbi;_NxS@&Q94ia|)$-lm=>j<jIpSXvn{yHRWN|N8BGZoo0sx=y%RRDYGu
z?qk=>9N>ho>=7odDXpd(;f-!;`y(I`#o$4$?(X;cs#?8?&YgNvf1Z>3g>%+1mJT4}
z%Y;FLwo+QUI6~_7w*lOV0y7vbDdu*%GY=Sh0t2RpagfR&NNrBfv{`_RDKNY^NOA1`
z@eb}Jv-cDjp>6|a;T^oXwgsxH8{z&S)PtI4UW#&h#$@S=usWkfsyCS317jmhPa=$j
zCmsaHR`vusOrPeK$MC_&=OJeM9$2^g0K~t$e^7|nx@zY>*mLwWeK_e<hcUuToCxa|
zV5Hu(v|3^J;WU^Ly9pM(y%QE}*ghz<5N(|uw;8tlJ(;GZPl3I6Bpv3i`#mg8{1Ys}
zTZ_S<2()!x!Zz4;;F#|sjHF~!b0-`*a~Tr${sR*CAB8_0N`bv6K7sd+pN2htCSnt@
zZP(#cYU}Uz9fE^cPV_zn*2KWc&%c7r2am(fL#goBlrxZg<`NwK^dcPo*O&e!wCO{%
z?ftZK)Yh#@Cve>*-vdj%_%&?%XA0~}PKWnTorh!RufUOWmr)shrps^?Z991S0_?&v
zvg1%1B%jUj9kANEHfU`F*s(VWri6vV%*a(RCn^@^uZV+rG5#rH+uZ0_n7MQnOj{5M
z2|NDc!=jJC%y`h4xQ+0_OQT?fVgkH0Rtdw$2K%*$jU(it@bi(QAuJ-sx4=whfYlqe
zz>9(7Vf4f)5EwdXP$&p(9gg4@MX&KOFg)n0gw61afN>BsVKM}SygDdEp#5r0Ff7Cp
zA_5bEiNHi)A}|q{2uuVf0vqJOgpa6&&-80_wwZo+z(y%w@f$!wTZF(|{5Zn2nY$iQ
z>kMXTT~EM_^|lDZKBeOkkXI!cl+|c|QMb-u0!ur&HF5^V8c6z)iira%t}RZ$@J778
zp@aIvzJP2O{nZG23JgD!;@CZ~imDb0>~2*{n!X+Yml>25MaEEew-I!P$FMv;5$`3t
zfC&u@o;CxNZ_EPaZw5vI2uElW0X7VQ&5K+O_wKh+e<~`Qf%T2}N_<1#GYEt7%4R8!
z-2=<a)l*<udHVFC5)0rmgR-K?7{1G?g#vXOgs<EPLxXI<c##$SGEADY2xcx{2Q#AM
z?27l1Z0DO9vks=ri=g&!Z6m<QlZ)AlS3*{v0a%|nVhYqI^0xx?m+$NUsgdT~G`I(r
zoo}GPaKlr@rS0@p0Tg|=f+#ar2Sp_&h*-4|ei_7%uu&A&VhZccWorghGndCBw51Th
zfyM=vbJGYmpY*``Mtmi{<>VVEuy1eZq`9|@o&m!?{k98WH&h5r!w2SXu(;4(<3I}x
zo$LgR{N)K3SYZi$pM(PY=DS*{>XyMfV0gf8fej5B4?$?eNEfiCN3C`Az7+SILTG^)
zWy8lQ2MX9G8exGUll%sj5SlPOY0)36fZ0oa7+`6nxZ?ra?P*Dcz(}4m;Va)}UJMw+
zOnEDuL0AkLMumnt`hgVJ1~Nuy%+&dj3<6_jEn2}KFopz!Js?<h+$?S(z%qIR?0i)X
z&;nnq?Qp25#0>Wy04!g(9YSY>LD<?vn7uLqwZX473vCQr`wmPBi+}~u>p@-i$mSDf
z5zn`3Ai!>T159e~BT+~28#sVUVwIU&msC*PniQM(=cLz{#3bQmJPE(SB>X06?~h__
zBmEnZtCN<k-$s2w|B|@A;WF_x8T++%V3Hnz*<n5P|K{f3nL5ulWMPp=Bk766W!W6z
zJWN)oZk0vFZ<S4+A1TAyAj5A@Hr>xfY{YDkO<NKpTNtxJmX%v4bMlW}&NmG4IKnu<
zsPF)`-Y!f@NkMUoBw^=%$!m+EC1`{Mjgh<=wbt)7BPvcZEqsM!W#Vq0f2?m@f4xdc
jv58G=ViTL##D?wv_^dMP7Rx!600000NkvXXu0mjf9=%mQ

literal 0
HcmV?d00001

diff --git a/routes/v1/test/control.js b/routes/v1/test/control.js
index d546a38..ec700d7 100644
--- a/routes/v1/test/control.js
+++ b/routes/v1/test/control.js
@@ -8,8 +8,16 @@ const ev = require('./events');
 const events = ev.events;
 var timer = null;
 
+/* Disables caching in client */
+function nocache(req, res, next) {
+  res.header('Cache-Control', 'private, no-cache, no-store, must-revalidate');
+  res.header('Expires', '-1');
+  res.header('Pragma', 'no-cache');
+  next();
+}
+
 /* POST /vN/test/control */
-router.post('/', function(req, res, next) {
+router.post('/', nocache, function(req, res, next) {
   // check header
   if (typeof req.header('X-API-Key-Test') === 'undefined') {
     log.info('API key not set in request header');
diff --git a/routes/v1/test/events.js b/routes/v1/test/events.js
index 95830e9..bd31a75 100644
--- a/routes/v1/test/events.js
+++ b/routes/v1/test/events.js
@@ -115,7 +115,6 @@ function processTimeout() {
   log.debug('Timeout, no events');
   clearTimeout(timer);
   timer = null;
-//console.log('response:', response);
   response.status(304).end('');
   response = null;
 }
diff --git a/routes/v1/test/notification.js b/routes/v1/test/notification.js
index dc866db..c2db2e0 100644
--- a/routes/v1/test/notification.js
+++ b/routes/v1/test/notification.js
@@ -4,8 +4,16 @@ const qStr = require('query-string');
 const router = express.Router();
 const dblib = require('./../../../lib/dblib');
 
+/* Disables caching in client */ 
+function nocache(req, res, next) {
+  res.header('Cache-Control', 'private, no-cache, no-store, must-revalidate');
+  res.header('Expires', '-1');
+  res.header('Pragma', 'no-cache');
+  next();
+}
+
 /* POST /vN/test/notification */
-router.post('/', function(req, res, next) {
+router.post('/', nocache, function(req, res, next) {
   // check header
   if (typeof req.header('X-API-Key-Test') === 'undefined') {
     log.info('API key not set in request header');
diff --git a/routes/v1/test/settings.js b/routes/v1/test/settings.js
index 871fee7..423c1f6 100644
--- a/routes/v1/test/settings.js
+++ b/routes/v1/test/settings.js
@@ -3,6 +3,7 @@ const log = require('./../../../lib/logger')(__filename.slice(__dirname.length +
 const qStr = require('query-string');
 const router = express.Router();
 const dblib = require('./../../../lib/dblib');
+const fs = require('fs');
 const webpush = require('web-push');
 
 const delayMin = -1;
@@ -201,22 +202,13 @@ function scheduleNotification(delay, notification) {
   log.debug('Notification set to execute in ' + delay + ' seconds');
 }
 
-/*
-{
-  "endpoint":"https://fcm.googleapis.com/fcm/send/eGS6ZOFQcUk:APA91bGZliEmCLdFcuytpz2KFdLZVNm4YwAdbjaRxyF8tl6vhmuNd7L0NZagys77AjA3GWc3RNhad3i3Bc3rwBQEPKfAX4LZ0jOPzo_heG-WL7MNZx5w9lI2qycrdNk8UiQS0IlhL-j5",
-  "expirationTime":null,
-  "keys":{
-    "p256dh":"BAMu7XxsCuoB0j1zdaNGXoRterzytIpyG7yxzfEnAaA0SF4xTWJOztnbUoKX4IBdKpteJA9UhhyLI286mZKUlTQ",
-    "auth":"iPebCb94XG_zeVdfAmKN8Q"
-  }
-}
-*/
 function executeNotification(notification) {
   clearTimeout(timer);
   timer = null;
 
   // web push
-  webpush.setGCMAPIKey('AAAAUtHuYco:APA91bEBTxCRGaez9_glljXAlit3PY5HMwhLSqWYMC1j-jFSp6nvnNqjI42jAVFApQbM0oyAOQjCUilIovB76cwTFxyZTP96wm9n09XwiMRXJjhwiJX1hO32mBB2zwK6X-w7epE1V67K');
+  webpush.setGCMAPIKey('AAAAUtHuYco:APA91bEBTxCRGaez9_glljXAlit3PY5HMwhLSqWYMC1j-jFSp6nvnNqj' +
+    'I42jAVFApQbM0oyAOQjCUilIovB76cwTFxyZTP96wm9n09XwiMRXJjhwiJX1hO32mBB2zwK6X-w7epE1V67K');
   webpush.setVapidDetails(
     'mailto:ebelcrom@gmail.com',
     'BLDSdGasI5sLks30brbIWvlLMFqzoxxkOs7aW_E9PDBzIO_mDs6-tvtb2U0-BVFDafNd58DJgoXxdK5711FF29c',
@@ -231,19 +223,16 @@ function executeNotification(notification) {
       p256dh: notification.keys.p256dh
     }
   };
-  const options = {
-    actions: [
-      {
-        action: 'Open Garage Node',
-        title: 'Garage Node'
-      }
-    ],
-    body: 'The garage door is open!',
-    badge: './img/icons/android-chrome-192x192.png',
-    icon: './img/icons/android-chrome-192x192.png'
+
+  const icon = 'data:image/png;base64,' +
+    fs.readFileSync(__dirname + '/../../../public/images/icon.png', 'base64');
+  const payload = {
+    message: 'The garage door is open!',
+    icon: icon
   };
+  log.debug('Paylod length:', JSON.stringify(payload).length);
 
-  webpush.sendNotification(pushSubscription, 'The garage door is open!')
+  webpush.sendNotification(pushSubscription, JSON.stringify(payload))
   .then(data => {
     if (data) {
       log.info('sent, data:', JSON.stringify(data));
diff --git a/routes/v1/test/status.js b/routes/v1/test/status.js
index 75b025d..3edfb91 100644
--- a/routes/v1/test/status.js
+++ b/routes/v1/test/status.js
@@ -5,8 +5,16 @@ const router = express.Router();
 const dblib = require('./../../../lib/dblib');
 const fs = require('fs');
 
+/* Disables caching in client */ 
+function nocache(req, res, next) {
+  res.header('Cache-Control', 'private, no-cache, no-store, must-revalidate');
+  res.header('Expires', '-1');
+  res.header('Pragma', 'no-cache');
+  next();
+}
+
 /* GET /vN/status */
-router.get('/', function(req, res, next) {
+router.get('/', nocache, function(req, res, next) {
   // check header
   if (typeof req.header('X-API-Key-Test') === 'undefined') {
     log.info('API key not set in request header');
-- 
2.30.2