wrap workers in a function scope and add a validateMessage method to HK's Env

lib/check-signature.js

@@ -5,9 +5,7 @@ const Nacl = require('tweetnacl/nacl-fast');
 // XXX npm "os" and "child_process"
 
 // TODO if this process is using too much CPU, we can use "cluster" to add load balancing to this code
-
+//console.log('New child process', process.pid);
-console.log('New child process', process.pid);
-
 process.on('message', function (data) {
     //console.log('In process', process.pid);
     //console.log(+new Date(), "Message received by subprocess");

lib/historyKeeper.js

@@ -76,6 +76,8 @@ module.exports.create = function (config, cb) {
         domain: config.domain
     };
 
+    HK.initializeValidationWorkers(Env);
+
     (function () {
         var pes = config.premiumUploadSize;
         if (!isNaN(pes) && pes >= Env.maxUploadSize) {

lib/hk-util.js

@@ -924,17 +924,20 @@ HK.onDirectMessage = function (Env, Server, seq, userId, json) {
     * writes messages to the store
 */
 
+HK.initializeValidationWorkers = function (Env) {
+    if (typeof(Env.validateMessage) !== 'undefined') {
+        return void console.error("validation workers are already initialized");
+    }
 
-// Create our workers
+    // Create our workers
-const workers = [];
+    const workers = [];
-for (let i = 0; i < numCPUs; i++) {
+    for (let i = 0; i < numCPUs; i++) {
         workers.push(fork('lib/check-signature.js'));
-}
+    }
-var nextWorker = 0;
 
-const response = Util.response();
+    const response = Util.response();
 
-var initWorker = function (worker) {
+    var initWorker = function (worker) {
         worker.on('message', function (res) {
             if (!res || !res.txid) { return; }
             //console.log(+new Date(), "Received verification response");
@@ -952,11 +955,11 @@ var initWorker = function (worker) {
             workers.push(w);
             initWorker(w);
         });
-};
+    };
-workers.forEach(initWorker);
+    workers.forEach(initWorker);
-
 
-const validateMessage = function (signedMsg, key, _cb) {
+    var nextWorker = 0;
+    Env.validateMessage = function (signedMsg, key, _cb) {
         // let's be paranoid about asynchrony and only calling back once..
         var cb = Util.once(Util.mkAsync(_cb));
 
@@ -977,6 +980,7 @@ const validateMessage = function (signedMsg, key, _cb) {
             msg: signedMsg,
             key: key,
         });
+    };
 };
 
 HK.onChannelMessage = function (Env, Server, channel, msgStruct) {
@@ -1025,7 +1029,7 @@ HK.onChannelMessage = function (Env, Server, channel, msgStruct) {
 
         // Listen for messages
         //console.log(+new Date(), "Send verification request");
-        validateMessage(signedMsg, metadata.validateKey, w(function (err) {
+        Env.validateMessage(signedMsg, metadata.validateKey, w(function (err) {
             if (err) {
                 // validation can fail in multiple ways
                 if (err === 'FAILED') {