Introduce AbstractMain, AbstractWorker, Helper, part of #32

Author: kyoshino

scripts/app.core.js

@@ -51,14 +51,12 @@ FlareTail.app.Events = class Events {
    * @return {undefined}
    */
   on (topic, callback, global = false) {
-    let bc = new BroadcastChannel(topic);
-
-    topic = topic.replace(/^([MVCS]):/, (match, prefix) => {
-      return this.constructor.name.match(/(.*)(Model|View|Controller|Service)$/)[1]
-              + { M: 'Model', V: 'View', C: 'Controller', S: 'Service' }[prefix] + ':';
+    topic = topic.replace(/^([MVCH]):/, (match, prefix) => {
+      return this.constructor.name.match(/(.*)(Model|View|Controller|Handler)$/)[1]
+              + { M: 'Model', V: 'View', C: 'Controller', H: 'Handler' }[prefix] + ':';
     });
 
-    bc.addEventListener('message', event => {
+    (new BroadcastChannel(topic)).addEventListener('message', event => {
       if (!global && event.data && event.data.id && this.id && event.data.id !== this.id) {
         return false;
       }

scripts/app.main.js

@@ -16,7 +16,7 @@ FlareTail.app = FlareTail.app || {};
 /**
  * Provide an app bare-bones object.
  */
-FlareTail.app.Main = class Main {
+FlareTail.app.AbstractMain = class AbstractMain {
   /**
    * Get a Main instance.
    * @constructor
@@ -32,7 +32,9 @@ FlareTail.app.Main = class Main {
       // Those components are actually in the service worker; use WorkerProxy to get access
       datasources: {},
       collections: {},
-      services: {},
+      handlers: {},
+      // Shared workers
+      workers: {},
     });
   }
 }
@@ -153,9 +155,10 @@ FlareTail.app.WorkerProxy = class WorkerProxy {
    * Get a WorkerProxy instance.
    * @constructor
    * @argument {String} class_name - Name of the target class on the worker.
+   * @argument {SharedWorker} [worker=undefined] If specified, use the shared worker instead of the service worker.
    * @return {Proxy} proxy - The catch-all magic mechanism. Functions on this proxy will return a Promise.
    */
-  constructor (class_name) {
+  constructor (class_name, worker = undefined) {
     return new Proxy({}, {
       get: (obj, func_name) => new Proxy(() => {}, {
         apply: (_obj, _this, args) => new Promise(resolve => {
@@ -167,7 +170,12 @@ FlareTail.app.WorkerProxy = class WorkerProxy {
                 console.info('[WorkerProxy] received message:', class_name, func_name, detail);
               }
 
-              navigator.serviceWorker.removeEventListener('message', listener);
+              if (worker) {
+                worker.port.removeEventListener('message', listener);
+              } else {
+                navigator.serviceWorker.removeEventListener('message', listener);
+              }
+
               resolve(detail);
             }
           };
@@ -176,8 +184,13 @@ FlareTail.app.WorkerProxy = class WorkerProxy {
             console.info('[WorkerProxy] sent message:', class_name, func_name, args);
           }
 
-          navigator.serviceWorker.addEventListener('message', listener);
-          navigator.serviceWorker.ready.then(reg => reg.active.postMessage([class_name, func_name, args]));
+          if (worker) {
+            worker.port.addEventListener('message', listener);
+            worker.port.postMessage([class_name, func_name, args]);
+          } else {
+            navigator.serviceWorker.addEventListener('message', listener);
+            navigator.serviceWorker.ready.then(reg => reg.active.postMessage([class_name, func_name, args]));
+          }
         }),
       }),
     });

scripts/app.worker.js

@@ -16,23 +16,21 @@ FlareTail.app = FlareTail.app || {};
 /**
  * Provide an app bare-bones object.
  */
-FlareTail.app.Worker = class Worker {
+FlareTail.app.AbstractWorker = class AbstractWorker {
   /**
    * Get a Worker instance.
    * @constructor
    * @argument {String} name - App name.
-   * @argument {(Number|String)} [version=1] - App version mainly used for the offline cache.
    * @return {Object} app
    */
-  constructor (name, version = 1) {
+  constructor (name) {
     this.name = name;
-    this.version = version;
 
     return ({
       datasources: {},
       collections: {},
       models: {},
-      services: {},
+      handlers: {},
     });
   }
 }
@@ -41,7 +39,7 @@ FlareTail.app.Worker = class Worker {
  * Provide app base functionalities. 
  * @extends FlareTail.app.Events
  */
-FlareTail.app.Base = class View extends FlareTail.app.Events {}
+FlareTail.app.Base = class Base extends FlareTail.app.Events {}
 
 FlareTail.app.Base.prototype.helpers = FlareTail.helpers;
 
@@ -293,6 +291,7 @@ FlareTail.app.Collection = class Collection extends FlareTail.app.Base {
 }
 
 /**
- * Provide app service functionalities. 
+ * Provide app handler functionalities. 
+ * @extends FlareTail.app.Base
  */
-FlareTail.app.Service = class Service {}
+FlareTail.app.Handler = class Handler extends FlareTail.app.Base {}