replace middleware util with cjs-sync-hooks

Akamaozu · Dec 28, 2017 · 1e17be5 · 1e17be5
1 parent 3b5d75e
commit 1e17be5
Show file tree

Hide file tree

Showing 15 changed files with 33 additions and 89 deletions.
diff --git a/lib/modules/supervisor/hook/index.js b/lib/modules/supervisor/hook/index.js
@@ -0,0 +1,6 @@
+var hooks = require('cjs-sync-hooks');
+
+module.exports = function( supervisor, config ){
+
+  supervisor.hook = hooks();
+}
diff --git a/lib/modules/supervisor/mail/create-mail-deps-on-citizen-registration.js b/lib/modules/supervisor/mail/create-mail-deps-on-citizen-registration.js
@@ -2,7 +2,7 @@ var merge = require('merge-objects');
 
 module.exports = function( supervisor, config ){
 
-  supervisor.middleware.add( 'citizen-registration', function( citizen ){
+  supervisor.hook.add( 'citizen-registration', 'setup-mail-module', function( citizen ){
 
     citizen.mail = {};
     citizen.mail.inbox = [];
@@ -11,7 +11,6 @@ module.exports = function( supervisor, config ){
     function send_mail( settings, msg ){
 
       if( !msg ){
-
         msg = settings;
         settings = {};
       }

diff --git a/lib/modules/supervisor/mail/receive-mail-from-citizen.js b/lib/modules/supervisor/mail/receive-mail-from-citizen.js
@@ -1,9 +1,8 @@
 module.exports = function( supervisor, config ){
 
-  supervisor.middleware.add( 'citizen-starting', function( citizen ){
+  supervisor.hook.add( 'citizen-starting', 'notify-when-citizen-mail-is-received', function( citizen ){
 
     citizen.ref.on( 'message', function( envelope ){
-
       if( Object.prototype.toString.call( envelope ) !== '[object Object]' ) return;
       if( !envelope.hasOwnProperty( 'type' ) ) return;
       if( envelope.type !== 'mail' ) return;

diff --git a/lib/modules/supervisor/middleware.js b/lib/modules/supervisor/middleware.js
diff --git a/lib/modules/supervisor/noticeboard.js → lib/modules/supervisor/noticeboard/index.js b/lib/modules/supervisor/noticeboard.js → lib/modules/supervisor/noticeboard/index.js
diff --git a/lib/modules/supervisor/signal/create-signal-deps-on-citizen-registration.js b/lib/modules/supervisor/signal/create-signal-deps-on-citizen-registration.js
@@ -1,6 +1,6 @@
 module.exports = function( supervisor, config ){
 
-  supervisor.middleware.add( 'citizen-starting', function( citizen ){
+  supervisor.hook.add( 'citizen-starting', 'setup-signal-module', function( citizen ){
 
     citizen.signal = {};
     citizen.signal.send = send_signal;

diff --git a/lib/modules/supervisor/signal/receive-signal-from-citizen.js b/lib/modules/supervisor/signal/receive-signal-from-citizen.js
@@ -1,9 +1,8 @@
 module.exports = function( supervisor, config ){
 
-  supervisor.middleware.add( 'citizen-starting', function( citizen ){
+  supervisor.hook.add( 'citizen-starting', 'notify-when-signal-is-received', function( citizen ){
 
     citizen.ref.on( 'message', function( envelope ){
-
       if( Object.prototype.toString.call( envelope ) !== '[object Object]' ) return;
       if( !envelope.hasOwnProperty( 'type' ) ) return;
       if( envelope.type !== 'signal' ) return;

diff --git a/lib/modules/supervisor/supervision/notify-on-crash-or-shutdown.js b/lib/modules/supervisor/supervision/notify-on-crash-or-shutdown.js
@@ -1,19 +1,17 @@
 module.exports = function( supervisor ){
 
-  supervisor.middleware.add( 'citizen-starting', function( citizen ){
+  supervisor.hook.add( 'citizen-starting', 'notify-on-exit', function( citizen ){
 
     citizen.ref.on( 'close', function( code ){
 
       delete citizen.ref;
 
-      if( code === 0 ){
-
+      if( code === 0 ){                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           
         supervisor.noticeboard.notify( 'citizen-shutdown', { name: citizen.name });
         supervisor.noticeboard.notify( citizen.name + '-shutdown' );
       }
 
       else{
-
         supervisor.noticeboard.notify( 'citizen-crashed', { name: citizen.name });
         supervisor.noticeboard.notify( citizen.name + '-crashed' );
       } 

diff --git a/lib/modules/supervisor/supervision/notify-on-output.js b/lib/modules/supervisor/supervision/notify-on-output.js
@@ -1,23 +1,22 @@
 module.exports = function( supervisor ){
 
-  supervisor.middleware.add( 'citizen-starting', function( citizen ){
+  supervisor.hook.add( 'citizen-starting', 'notify-on-stdout', function( citizen ){
 
-    // mount stdout
-      citizen.ref.stdout.on( 'data', function( data ){
+    citizen.ref.stdout.on( 'data', function( data ){
+      var output = data.toString();
 
-        var output = data.toString();
-
-        supervisor.noticeboard.notify( 'citizen-output', { name: citizen.name, output: output });
-        supervisor.noticeboard.notify( citizen.name + '-output', { output: output });
-      });
-
-    // mount stderr
-      citizen.ref.stderr.on( 'data', function( data ){
+      supervisor.noticeboard.notify( 'citizen-output', { name: citizen.name, output: output });
+      supervisor.noticeboard.notify( citizen.name + '-output', { output: output });
+    });
+  });
+
+  supervisor.hook.add( 'citizen-starting', 'notify-on-stderr', function( citizen ){
 
-        var error = data.toString();
+    citizen.ref.stderr.on( 'data', function( data ){
+      var error = data.toString();
 
-        supervisor.noticeboard.notify( 'citizen-error', { name: citizen.name, error: error });
-        supervisor.noticeboard.notify( citizen.name + '-error', { error: error });
-      });
+      supervisor.noticeboard.notify( 'citizen-error', { name: citizen.name, error: error });
+      supervisor.noticeboard.notify( citizen.name + '-error', { error: error });
+    });
   });
 }
diff --git a/lib/modules/supervisor/supervision/register-citizen.js b/lib/modules/supervisor/supervision/register-citizen.js
@@ -31,7 +31,7 @@ module.exports = function( supervisor, citizens, config ){
       };
 
     // customize citizen instance
-      citizens[ name ] = supervisor.middleware.run( 'citizen-registration', citizens[ name ] );
+      citizens[ name ] = supervisor.hook.run( 'citizen-registration', citizens[ name ] );
 
     // registration complete
       supervisor.noticeboard.notify( 'citizen-registered', { name: name });

diff --git a/lib/modules/supervisor/supervision/start-citizen.js b/lib/modules/supervisor/supervision/start-citizen.js
@@ -27,7 +27,7 @@ module.exports = function( supervisor, citizens, config ){
         }
       });
 
-    citizen = supervisor.middleware.run( 'citizen-starting', citizen );
+    citizen = supervisor.hook.run( 'citizen-starting', citizen );
 
     supervisor.noticeboard.notify( name + '-started' );
     supervisor.noticeboard.notify( 'citizen-started', { name: name });

diff --git a/lib/supervisor.js b/lib/supervisor.js
@@ -8,8 +8,8 @@ function supe( config ){
   supervisor.use = load_module;
 
   // load core modules
+    supervisor.use( require( './modules/supervisor/hook' ) );
     supervisor.use( require( './modules/supervisor/noticeboard' ) );
-    supervisor.use( require( './modules/supervisor/middleware' ) );
     supervisor.use( require( './modules/supervisor/supervision' ) );
     supervisor.use( require( './modules/supervisor/signal' ) );
     supervisor.use( require( './modules/supervisor/mail' ) );

diff --git a/package.json b/package.json
@@ -5,6 +5,7 @@
   "main": "index.js",
   "dependencies": {
     "cjs-noticeboard": "0.0.7",
+    "cjs-sync-hooks": "^0.1.1",
     "merge-objects": "^1.0.5",
     "require-directory": "^2.1.1"
   },

diff --git a/test/test.js b/test/test.js
@@ -14,7 +14,7 @@ describe('Supe Test Suite', function(){
   describe('Supervisor (Instantiated Supe) Properties', function(){
 
     var supervisor = supe(),
-        expected_properties = [ 'is_registered', 'register', 'start', 'get', 'use', 'noticeboard', 'middleware' ];
+        expected_properties = [ 'is_registered', 'register', 'start', 'get', 'use', 'noticeboard', 'hook' ];
 
     it('has its own "is_registered" function', function(){
       assert.equal( supervisor.hasOwnProperty('is_registered') && typeof supervisor.is_registered === 'function', true, 'didn\'t instantiate with its own "is_registered" function');
@@ -40,8 +40,8 @@ describe('Supe Test Suite', function(){
       assert.equal( supervisor.hasOwnProperty('noticeboard') && Object.prototype.toString.call( supervisor.noticeboard ) === '[object Object]', true, 'didn\'t instantiate with its own "noticeboard" object');
     });
 
-    it('has its own "middleware" object', function(){
-      assert.equal( supervisor.hasOwnProperty('middleware') && Object.prototype.toString.call( supervisor.middleware ) === '[object Object]', true, 'didn\'t instantiate with its own "noticeboard" object');
+    it('has its own "hook" object', function(){
+      assert.equal( supervisor.hasOwnProperty('hook') && Object.prototype.toString.call( supervisor.hook ) === '[object Object]', true, 'didn\'t instantiate with its own "noticeboard" object');
     });
 
     it('has no unexpected properties', function(){

diff --git a/utils/middleware.js b/utils/middleware.js