amend issues

Author: edencoder

bundles/serviceworker/public/js/bootstrap.js

@@ -35,9 +35,6 @@ class EdenServiceworkerBuilder extends Events {
     this.registration = await navigator.serviceWorker.register('/sw.js');
     this.ready = await navigator.serviceWorker.ready;
 
-    // Await subscription
-    this.subscription = await this.ready.pushManager.getSubscription();
-
     // Create message channel
     this.channel = new MessageChannel();
 

bundles/serviceworker/public/js/serviceworker.js

@@ -44,12 +44,66 @@ class EdenServiceworker extends Events {
       // require offline
       this.offline = new EdenOffline(this);
     }
+
+    // send event
+    self.addEventListener('push', (event) => {
+      // body
+      let body = {};
+
+      // try/catch
+      try {
+        // get body
+        body = JSON.parse(event.data.text());
+      } catch (e) {}
+
+      // emit to this
+      this.emit(`push.${body.type}`, body.data, event);
+    });
+
+    // on push notification
+    this.on('push.notification', (data, event) => {
+      // wait for push to send
+      event.waitUntil(self.registration.showNotification(data.title, data.opts));
+    });
+
+    // on notification click
+    self.onnotificationclick = (event) => {
+      // close notification
+      event.notification.close();
+    
+      // This looks to see if the current is already open and
+      // focuses if it is
+      event.waitUntil(clients.matchAll({
+        type : 'window',
+      }).then((clientList) => {
+        // data
+        const data = event.notification.data || {};
+
+        // find client
+        const client = clientList.find((c) => {
+          // client
+          return 'focus' in c && (!data.url || c.url === data.url);
+        });
+
+        // focus
+        if (client) {
+          // focus
+          return client.focus();
+        }
+
+        // open window
+        if (clients.openWindow) {
+          // open url
+          clients.openWindow(data.url || '/');
+        }
+      }));
+    };
   }
 
   /**
    * return config
    *
-   * @param {*} noCache 
+   * @param {*} noCache
    */
   async config(noCache = false) {
     // return config

bundles/serviceworker/tasks/serviceworker.js renamed to bundles/serviceworker/tasks/serviceworker.ts

@@ -1,21 +1,17 @@
-
-// Require dependencies
-const config = require('config');
-
 /**
  * Build serviceworker task class
  *
  * @task serviceworker
  */
-class ServiceworkerTask {
+export default class ServiceworkerTask {
   /**
    * Construct serviceworker task class
    *
-   * @param {edenGulp} runner
+   * @param {edenGulp} cli
    */
-  constructor(runner) {
+  constructor(cli) {
     // Set private variables
-    this._runner = runner;
+    this.cli = cli;
     this._b = null;
 
     // Bind methods
@@ -35,20 +31,20 @@ class ServiceworkerTask {
 
       dest       : `${global.appRoot}/www`,
       cache      : `${global.appRoot}/.edenjs/.cache/serviceworker.json`,
-      config     : config.get('serviceworker.config') || {},
-      domain     : config.get('domain'),
+      config     : this.cli.get('config.serviceworker.config') || {},
+      domain     : this.cli.get('config.domain'),
       imports    : global.importLocations,
-      version    : config.get('version'),
-      browsers   : config.get('browserlist'),
+      version    : this.cli.get('config.version'),
+      browsers   : this.cli.get('config.browserlist'),
       polyfill   : require.resolve('@babel/polyfill'),
-      sourceMaps : config.get('environment') === 'dev' && !config.get('noSourcemaps'),
+      sourceMaps : this.cli.get('config.environment') === 'dev',
 
       appRoot  : global.appRoot,
       edenRoot : global.edenRoot,
     };
 
     // run in thread
-    return this._runner.thread(this.thread, opts);
+    return this.cli.thread(this.thread, opts);
   }
 
   /**
@@ -149,16 +145,6 @@ class ServiceworkerTask {
    */
   watch() {
     // Return files
-    return [
-      'public/js/serviceworker.js',
-      'public/js/serviceworker/**/*',
-    ];
+    return 'public/js/serviceworker/**/*';
   }
-}
-
-/**
- * Export serviceworker task
- *
- * @type {ServiceworkerTask}
- */
-module.exports = ServiceworkerTask;
+}