@leofcoin/workers 1.1.0 → 1.2.0

package/src/block-worker.js

@@ -1,12 +1,9 @@
-import { BlockMessage } from '../../messages/src/messages'
-import { formatBytes, BigNumber } from '../../utils/src/utils'
-import bytecodes  from '../../lib/src/bytecodes.json'
-import { fork } from 'child_process'
+import { BlockMessage } from './../../messages/src/messages'
+import { formatBytes, BigNumber } from './../../utils/src/utils'
 
-const contractFactoryMessage = bytecodes.contractFactory
-const nativeTokenMessage = bytecodes.nativeToken
-const nameServiceMessage = bytecodes.nameService
-const validatorsMessage = bytecodes.validators
+import EasyWorker from '@vandeurenglenn/easy-worker'
+
+const worker = new EasyWorker()
 
 globalThis.BigNumber = BigNumber
 
@@ -18,42 +15,16 @@ const run = async (blocks) => {
   blocks = blocks.sort((a, b) => a.decoded.timestamp - b.decoded.timestamp)
 
   blocks = await Promise.all(blocks.map(block => new Promise(async (resolve, reject) => {
-    if (globalThis.process) {
-      const worker = fork('./workers/transaction-worker.js', {serialization: 'advanced'})
-    
-      worker.once('message', async transactions => {
-        block.decoded.transactions = transactions
-        const size = block.encoded.length || block.encoded.byteLength
-        console.log(`loaded block: ${await block.hash} @${block.decoded.index} ${formatBytes(size)}`);
-        resolve(block)
-      })
-      
-      worker.send(block.decoded.transactions)
-    } else {
-      const worker = new Worker('./workers/transaction-worker.js')
-      worker.onmessage = async message => {
-        const transactions = message.data
-        block.decoded.transactions = transactions
-        const size = block.encoded.length || block.encoded.byteLength
-        console.log(`loaded block: ${await block.hash} @${block.decoded.index} ${formatBytes(size)}`);
-        resolve(block)
-      }
-      worker.postMessage(block.decoded.transactions)
-    }    
+    // todo: tx worker or nah?
+    const size = block.encoded.length || block.encoded.byteLength
+    console.log(`loaded block: ${await block.hash} @${block.decoded.index} ${formatBytes(size)}`);
+    resolve(block)
   })))
   return blocks
 }
 
 const tasks = async blocks => {
   globalThis.peernet.codecs =  {
-    'contract-message': {
-      codec: parseInt('63636d', 16),
-      hashAlg: 'keccak-256'
-    },
-    'transaction-message': {
-      codec: parseInt('746d', 16),
-      hashAlg: 'keccak-256'
-    },
     'block-message': {
       codec: parseInt('626d', 16),
       hashAlg: 'keccak-256'
@@ -61,11 +32,9 @@ const tasks = async blocks => {
   }  
   
   blocks = await run(blocks)
-  globalThis.process ? process.send(blocks) : postMessage(blocks)
+  worker.postMessage(blocks)
 }
  
-if (globalThis.process) {
-  process.on('message', tasks)
-} else {
-  onmessage = message => tasks(message.data)
-}
+
+worker.onmessage(data => tasks(data))
+

package/src/machine-worker.js

@@ -1,7 +1,11 @@
 import { BlockMessage, ContractMessage, TransactionMessage } from './../../messages/src/messages'
 import { formatBytes, BigNumber } from './../../utils/src/utils'
 import bytecodes  from './../../lib/src/bytecodes.json'
-import { fork } from 'child_process'
+import { join } from 'path'
+
+import EasyWorker from '@vandeurenglenn/easy-worker'
+const worker = new EasyWorker()
+
 const contractFactoryMessage = bytecodes.contractFactory
 const nativeTokenMessage = bytecodes.nativeToken
 const nameServiceMessage = bytecodes.nameService
@@ -12,6 +16,7 @@ globalThis.BigNumber = BigNumber
 globalThis.peernet = globalThis.peernet || {}
 globalThis.contracts = {}
 
+
 const get = (contract, method, params) => {
   let result
   if (params?.length > 0) {
@@ -57,7 +62,6 @@ const execute = async (contract, method, params) => {
     } else {
       result = await contracts[contract][method](...params)
     }
-
     // state.put(result)
     return result
   } catch (e) {
@@ -75,6 +79,22 @@ const createMessage = (sender = globalThis.peerid) => {
 }
 
 const _init = async ({ contracts, blocks, peerid })=> {
+  
+  globalThis.peernet.codecs =  {
+    'contract-message': {
+      codec: parseInt('63636d', 16),
+      hashAlg: 'keccak-256'
+    },
+    'transaction-message': {
+      codec: parseInt('746d', 16),
+      hashAlg: 'keccak-256'
+    },
+    'block-message': {
+      codec: parseInt('626d', 16),
+      hashAlg: 'keccak-256'
+    }
+  }
+
   globalThis.peerid = peerid
   contracts = [
     contractFactoryMessage,
@@ -89,19 +109,29 @@ const _init = async ({ contracts, blocks, peerid })=> {
     return contract
   }))
 
-  const worker = fork('./workers/block-worker.js', {serialization: 'advanced'})
+  const _worker = new EasyWorker(join(__dirname, './block-worker.js'), {serialization: 'advanced'})
   // worker.on('message')
-    worker.once('message', async (blocks) => {
+    _worker.once('message', async (blocks) => {
       for (const block of blocks) {
         await Promise.all(block.decoded.transactions.map(async message => {
-          const {from, to, method, params} = message.decoded
+          const {from, to, method, params} = message
           globalThis.msg = createMessage(from)
         
           await execute(to, method, params)
         }))
       }
-      process.send({type: 'machine-ready'})
-      worker.kill() 
+      let lastBlock
+      if (blocks.length > 0) {
+        lastBlock = blocks[blocks.length - 1].decoded
+     
+        lastBlock = await new BlockMessage(lastBlock)
+        lastBlock = {
+          ...lastBlock.decoded,
+          hash: await lastBlock.hash
+        }
+      }
+      worker.postMessage({type: 'machine-ready', lastBlock })
+      _worker.terminate() 
         
 
       
@@ -110,51 +140,33 @@ const _init = async ({ contracts, blocks, peerid })=> {
 }
 
 const tasks = async (e) => {
-  globalThis.peernet.codecs =  {
-    'contract-message': {
-      codec: parseInt('63636d', 16),
-      hashAlg: 'keccak-256'
-    },
-    'transaction-message': {
-      codec: parseInt('746d', 16),
-      hashAlg: 'keccak-256'
-    },
-    'block-message': {
-      codec: parseInt('626d', 16),
-      hashAlg: 'keccak-256'
-    }
-  }
+  const id = e.id
     if (e.type === 'init') await _init(e.input)
     if (e.type === 'get') {
       const value = await get(e.input.contract, e.input.method, e.input.params)
-      process.send({
+      worker.postMessage({
         type: 'response',
-        id: e.id,
+        id,
         value
       })
     }
     if (e.type === 'execute') {
       try {
         const value = await execute(e.input.contract, e.input.method, e.input.params)
-        process.send({
+        worker.postMessage({
           type: 'response',
-          id: e.id,
+          id,
           value
         })
       } catch(e) {
-        process.send({
+        worker.postMessage({
           type: 'executionError',
-          message: e,
-          id: e.id
+          message: e.message,
+          id
           
         })
       }
     }
   }
 
-
-if (globalThis.process) {
-  process.on('message', tasks)
-} else {
-  onmessage = message => tasks(message.data)
-}
+worker.onmessage(data => tasks(data))

package/src/pool-worker.js

@@ -1,22 +1,18 @@
-import { TransactionMessage } from '../../messages/src/messages'
+import { TransactionMessage } from './../../messages/src/messages'
+
+import EasyWorker from '@vandeurenglenn/easy-worker'
 
 globalThis.peernet = globalThis.peernet || {}
 globalThis.contracts = {}
 
+const worker = new EasyWorker()
+
 const tasks = async transactions => {
   
   globalThis.peernet.codecs =  {
-    'contract-message': {
-      codec: parseInt('63636d', 16),
-      hashAlg: 'keccak-256'
-    },
     'transaction-message': {
       codec: parseInt('746d', 16),
       hashAlg: 'keccak-256'
-    },
-    'block-message': {
-      codec: parseInt('626d', 16),
-      hashAlg: 'keccak-256'
     }
   }
   
@@ -26,12 +22,7 @@ const tasks = async transactions => {
     return {...message.decoded, hash: await message.hash, size: message.encoded.length}
   }))
 
-  globalThis.process ? process.send(transactions) : postMessage(transactions)
+  worker.postMessage(transactions)
   
 }
-
-if (globalThis.process) {
-  process.on('message', tasks)
-} else {
-  onmessage = message => tasks(message.data)
-}
+ worker.onmessage(data => tasks(data))

package/src/transaction-worker.js

@@ -1,26 +1,20 @@
-import { TransactionMessage } from '../../messages/src/messages'
+import { TransactionMessage } from './../../messages/src/messages.js'
 
 globalThis.peernet = globalThis.peernet || {}
 globalThis.contracts = {}
- 
 
-process.on('message', async (transactions) => {
-  
-globalThis.peernet.codecs =  {
-  'contract-message': {
-    codec: parseInt('63636d', 16),
-    hashAlg: 'keccak-256'
-  },
-  'transaction-message': {
-    codec: parseInt('746d', 16),
-    hashAlg: 'keccak-256'
-  },
-  'block-message': {
-    codec: parseInt('626d', 16),
-    hashAlg: 'keccak-256'
+import EasyWorker from '@vandeurenglenn/easy-worker'
+
+const worker = new EasyWorker()
+
+worker.onmessage(async (transactions) => {  
+  globalThis.peernet.codecs =  {
+    'transaction-message': {
+      codec: parseInt('746d', 16),
+      hashAlg: 'keccak-256'
+    }
   }
-}
   transactions = await Promise.all(transactions.map(async message => new TransactionMessage(message)))
 
-  process.send(transactions)
-});
+  worker.postMessage(transactions)
+})

package/dist/bundle/commonjs/block-worker-42d9ae8e.js

@@ -1,115 +0,0 @@
-'use strict';
-
-var index = require('./index-f77ba3de.js');
-var utils = require('./utils-6a02b156.js');
-var child_process = require('child_process');
-
-var proto = `
-message ValidatorMessage {
-  required string address = 1;
-  required string reward = 2;
-}
-
-message Transaction {
-  required string hash = 1;
-  required uint64 timestamp = 2;
-  required string from = 3;
-  required string to = 4;
-  required uint64 nonce = 5;
-  required string method = 6;
-  repeated string params = 7;
-}
-
-message BlockMessage {
-  required uint64 index = 1;
-  required string previousHash = 3;
-  required uint64 timestamp = 4;
-  required uint64 reward = 5;
-  required string fees = 6;
-  repeated Transaction transactions = 7;
-  repeated ValidatorMessage validators = 8;
-}
-`;
-
-class BlockMessage extends index.FormatInterface_1 {
-  get keys() {
-    return ['index', 'previousHash', 'timestamp', 'reward', 'fees', 'transactions', 'validators']
-  }
-
-  get messageName() {
-    return 'BlockMessage'
-  }
-
-  constructor(buffer) {
-    const name = 'block-message';
-    super(buffer, proto, {name});
-  }
-}
-
-globalThis.BigNumber = utils.BigNumber;
-
-globalThis.peernet = globalThis.peernet || {};
-globalThis.contracts = {};
-
-const run = async (blocks) => {  
-  blocks = await Promise.all(blocks.map(block => new BlockMessage(block)));
-  blocks = blocks.sort((a, b) => a.decoded.timestamp - b.decoded.timestamp);
-
-  blocks = await Promise.all(blocks.map(block => new Promise(async (resolve, reject) => {
-    if (globalThis.process) {
-      const worker = child_process.fork('./workers/transaction-worker.js', {serialization: 'advanced'});
-    
-      worker.once('message', async transactions => {
-        block.decoded.transactions = transactions;
-        const size = block.encoded.length || block.encoded.byteLength;
-        console.log(`loaded block: ${await block.hash} @${block.decoded.index} ${utils.formatBytes(size)}`);
-        resolve(block);
-      });
-      
-      worker.send(block.decoded.transactions);
-    } else {
-      const worker = new Worker('./workers/transaction-worker.js');
-      worker.onmessage = async message => {
-        const transactions = message.data;
-        block.decoded.transactions = transactions;
-        const size = block.encoded.length || block.encoded.byteLength;
-        console.log(`loaded block: ${await block.hash} @${block.decoded.index} ${utils.formatBytes(size)}`);
-        resolve(block);
-      };
-      worker.postMessage(block.decoded.transactions);
-    }    
-  })));
-  return blocks
-};
-
-const tasks = async blocks => {
-  globalThis.peernet.codecs =  {
-    'contract-message': {
-      codec: parseInt('63636d', 16),
-      hashAlg: 'keccak-256'
-    },
-    'transaction-message': {
-      codec: parseInt('746d', 16),
-      hashAlg: 'keccak-256'
-    },
-    'block-message': {
-      codec: parseInt('626d', 16),
-      hashAlg: 'keccak-256'
-    }
-  };  
-  
-  blocks = await run(blocks);
-  globalThis.process ? process.send(blocks) : postMessage(blocks);
-};
- 
-if (globalThis.process) {
-  process.on('message', tasks);
-} else {
-  onmessage = message => tasks(message.data);
-}
-
-var blockWorker = /*#__PURE__*/Object.freeze({
-  __proto__: null
-});
-
-exports.blockWorker = blockWorker;

package/dist/bundle/commonjs/transaction-worker-90623101.js

@@ -1,35 +0,0 @@
-'use strict';
-
-require('./index-f77ba3de.js');
-var transaction = require('./transaction-6a24c91e.js');
-
-globalThis.peernet = globalThis.peernet || {};
-globalThis.contracts = {};
- 
-
-process.on('message', async (transactions) => {
-  
-globalThis.peernet.codecs =  {
-  'contract-message': {
-    codec: parseInt('63636d', 16),
-    hashAlg: 'keccak-256'
-  },
-  'transaction-message': {
-    codec: parseInt('746d', 16),
-    hashAlg: 'keccak-256'
-  },
-  'block-message': {
-    codec: parseInt('626d', 16),
-    hashAlg: 'keccak-256'
-  }
-};
-  transactions = await Promise.all(transactions.map(async message => new transaction.TransactionMessage(message)));
-
-  process.send(transactions);
-});
-
-var transactionWorker = /*#__PURE__*/Object.freeze({
-  __proto__: null
-});
-
-exports.transactionWorker = transactionWorker;

package/dist/bundle/module/block-worker-efe837c4.js

@@ -1,113 +0,0 @@
-import { F as FormatInterface_1 } from './index-6715242b.js';
-import { B as BigNumber, f as formatBytes } from './utils-d240ed61.js';
-import { fork } from 'child_process';
-
-var proto = `
-message ValidatorMessage {
-  required string address = 1;
-  required string reward = 2;
-}
-
-message Transaction {
-  required string hash = 1;
-  required uint64 timestamp = 2;
-  required string from = 3;
-  required string to = 4;
-  required uint64 nonce = 5;
-  required string method = 6;
-  repeated string params = 7;
-}
-
-message BlockMessage {
-  required uint64 index = 1;
-  required string previousHash = 3;
-  required uint64 timestamp = 4;
-  required uint64 reward = 5;
-  required string fees = 6;
-  repeated Transaction transactions = 7;
-  repeated ValidatorMessage validators = 8;
-}
-`;
-
-class BlockMessage extends FormatInterface_1 {
-  get keys() {
-    return ['index', 'previousHash', 'timestamp', 'reward', 'fees', 'transactions', 'validators']
-  }
-
-  get messageName() {
-    return 'BlockMessage'
-  }
-
-  constructor(buffer) {
-    const name = 'block-message';
-    super(buffer, proto, {name});
-  }
-}
-
-globalThis.BigNumber = BigNumber;
-
-globalThis.peernet = globalThis.peernet || {};
-globalThis.contracts = {};
-
-const run = async (blocks) => {  
-  blocks = await Promise.all(blocks.map(block => new BlockMessage(block)));
-  blocks = blocks.sort((a, b) => a.decoded.timestamp - b.decoded.timestamp);
-
-  blocks = await Promise.all(blocks.map(block => new Promise(async (resolve, reject) => {
-    if (globalThis.process) {
-      const worker = fork('./workers/transaction-worker.js', {serialization: 'advanced'});
-    
-      worker.once('message', async transactions => {
-        block.decoded.transactions = transactions;
-        const size = block.encoded.length || block.encoded.byteLength;
-        console.log(`loaded block: ${await block.hash} @${block.decoded.index} ${formatBytes(size)}`);
-        resolve(block);
-      });
-      
-      worker.send(block.decoded.transactions);
-    } else {
-      const worker = new Worker('./workers/transaction-worker.js');
-      worker.onmessage = async message => {
-        const transactions = message.data;
-        block.decoded.transactions = transactions;
-        const size = block.encoded.length || block.encoded.byteLength;
-        console.log(`loaded block: ${await block.hash} @${block.decoded.index} ${formatBytes(size)}`);
-        resolve(block);
-      };
-      worker.postMessage(block.decoded.transactions);
-    }    
-  })));
-  return blocks
-};
-
-const tasks = async blocks => {
-  globalThis.peernet.codecs =  {
-    'contract-message': {
-      codec: parseInt('63636d', 16),
-      hashAlg: 'keccak-256'
-    },
-    'transaction-message': {
-      codec: parseInt('746d', 16),
-      hashAlg: 'keccak-256'
-    },
-    'block-message': {
-      codec: parseInt('626d', 16),
-      hashAlg: 'keccak-256'
-    }
-  };  
-  
-  blocks = await run(blocks);
-  globalThis.process ? process.send(blocks) : postMessage(blocks);
-};
- 
-if (globalThis.process) {
-  process.on('message', tasks);
-} else {
-  onmessage = message => tasks(message.data);
-}
-
-var blockWorker = /*#__PURE__*/Object.freeze({
-  __proto__: null
-});
-
-export { blockWorker as b };

package/dist/bundle/module/transaction-worker-8afddd7e.js

@@ -1,33 +0,0 @@
-import './index-6715242b.js';
-import { T as TransactionMessage } from './transaction-e9126d7b.js';
-
-globalThis.peernet = globalThis.peernet || {};
-globalThis.contracts = {};
- 
-
-process.on('message', async (transactions) => {
-  
-globalThis.peernet.codecs =  {
-  'contract-message': {
-    codec: parseInt('63636d', 16),
-    hashAlg: 'keccak-256'
-  },
-  'transaction-message': {
-    codec: parseInt('746d', 16),
-    hashAlg: 'keccak-256'
-  },
-  'block-message': {
-    codec: parseInt('626d', 16),
-    hashAlg: 'keccak-256'
-  }
-};
-  transactions = await Promise.all(transactions.map(async message => new TransactionMessage(message)));
-
-  process.send(transactions);
-});
-
-var transactionWorker = /*#__PURE__*/Object.freeze({
-  __proto__: null
-});
-
-export { transactionWorker as t };