Implemented tests

Author: broadsw0rd

.gitignore

@@ -1,2 +1,5 @@
 node_modules/
+coverage/
+.nyc_output/
 diff
+npm-debug.log

dist/web-rpc.cjs.js

@@ -36,9 +36,6 @@ Emitter.prototype.emit = function emit (event, data) {
   }
 };
 
-var crypto = window.crypto || window.msCrypto;
-var arr = new Uint8Array(1);
-
 function isObject (object) {
   return Object(object) === object
 }
@@ -61,10 +58,8 @@ function peekTransferables (data) {
   return result
 }
 
-// https://github.com/Chalarangelo/30-seconds-of-code#uuidgeneratorbrowser
 function uuid () {
-  return ([1e7] + -1e3 + -4e3 + -8e3 + -1e11).replace(/[018]/g, function (c) { return (c ^ (crypto.getRandomValues(arr)[0] & (15 >> (c / 4)))).toString(16); }
-  )
+  return Math.floor((1 + Math.random()) * 1e10).toString(16)
 }
 
 var RpcClient = (function (EventEmitter$$1) {
@@ -135,12 +130,12 @@ var RpcClient = (function (EventEmitter$$1) {
 
     var uid = uuid();
     var transferables = peekTransferables(data);
-    this.workers[this.idx].postMessage({ method: method, uid: uid, data: data }, transferables);
-    this.idx = ++this.idx % this.workers.length; // round robin
     return new Promise(function (resolve, reject) {
       this$1.timeouts[uid] = setTimeout(function () { return this$1.reject(("RPC timeout exceeded for '" + method + "' call")); }, timeout);
       this$1.calls[uid] = resolve;
       this$1.errors[uid] = reject;
+      this$1.workers[this$1.idx].postMessage({ method: method, uid: uid, data: data }, transferables);
+      this$1.idx = ++this$1.idx % this$1.workers.length; // round robin
     })
   };
 
@@ -165,7 +160,7 @@ RpcServer.prototype.handler = function handler (e) {
     var uid = ref.uid;
     var data = ref.data;
   if (this.methods[method]) {
-    Promise.all([this.methods[method](data)]).then(
+    Promise.resolve(data).then(this.methods[method]).then(
       function (data) { return this$1.reply(uid, method, data); },
       function (error) { return this$1.throw(uid, error); }
     );

dist/web-rpc.js

@@ -34,9 +34,6 @@ Emitter.prototype.emit = function emit (event, data) {
   }
 };
 
-var crypto = window.crypto || window.msCrypto;
-var arr = new Uint8Array(1);
-
 function isObject (object) {
   return Object(object) === object
 }
@@ -59,10 +56,8 @@ function peekTransferables (data) {
   return result
 }
 
-// https://github.com/Chalarangelo/30-seconds-of-code#uuidgeneratorbrowser
 function uuid () {
-  return ([1e7] + -1e3 + -4e3 + -8e3 + -1e11).replace(/[018]/g, function (c) { return (c ^ (crypto.getRandomValues(arr)[0] & (15 >> (c / 4)))).toString(16); }
-  )
+  return Math.floor((1 + Math.random()) * 1e10).toString(16)
 }
 
 var RpcClient = (function (EventEmitter$$1) {
@@ -133,12 +128,12 @@ var RpcClient = (function (EventEmitter$$1) {
 
     var uid = uuid();
     var transferables = peekTransferables(data);
-    this.workers[this.idx].postMessage({ method: method, uid: uid, data: data }, transferables);
-    this.idx = ++this.idx % this.workers.length; // round robin
     return new Promise(function (resolve, reject) {
       this$1.timeouts[uid] = setTimeout(function () { return this$1.reject(("RPC timeout exceeded for '" + method + "' call")); }, timeout);
       this$1.calls[uid] = resolve;
       this$1.errors[uid] = reject;
+      this$1.workers[this$1.idx].postMessage({ method: method, uid: uid, data: data }, transferables);
+      this$1.idx = ++this$1.idx % this$1.workers.length; // round robin
     })
   };
 
@@ -163,7 +158,7 @@ RpcServer.prototype.handler = function handler (e) {
     var uid = ref.uid;
     var data = ref.data;
   if (this.methods[method]) {
-    Promise.all([this.methods[method](data)]).then(
+    Promise.resolve(data).then(this.methods[method]).then(
       function (data) { return this$1.reply(uid, method, data); },
       function (error) { return this$1.throw(uid, error); }
     );

dist/web-rpc.min.js

@@ -40,9 +40,6 @@ Emitter.prototype.emit = function emit (event, data) {
   }
 };
 
-var crypto = window.crypto || window.msCrypto;
-var arr = new Uint8Array(1);
-
 function isObject (object) {
   return Object(object) === object
 }
@@ -65,10 +62,8 @@ function peekTransferables (data) {
   return result
 }
 
-// https://github.com/Chalarangelo/30-seconds-of-code#uuidgeneratorbrowser
 function uuid () {
-  return ([1e7] + -1e3 + -4e3 + -8e3 + -1e11).replace(/[018]/g, function (c) { return (c ^ (crypto.getRandomValues(arr)[0] & (15 >> (c / 4)))).toString(16); }
-  )
+  return Math.floor((1 + Math.random()) * 1e10).toString(16)
 }
 
 var RpcClient = (function (EventEmitter$$1) {
@@ -139,12 +134,12 @@ var RpcClient = (function (EventEmitter$$1) {
 
     var uid = uuid();
     var transferables = peekTransferables(data);
-    this.workers[this.idx].postMessage({ method: method, uid: uid, data: data }, transferables);
-    this.idx = ++this.idx % this.workers.length; // round robin
     return new Promise(function (resolve, reject) {
       this$1.timeouts[uid] = setTimeout(function () { return this$1.reject(("RPC timeout exceeded for '" + method + "' call")); }, timeout);
       this$1.calls[uid] = resolve;
       this$1.errors[uid] = reject;
+      this$1.workers[this$1.idx].postMessage({ method: method, uid: uid, data: data }, transferables);
+      this$1.idx = ++this$1.idx % this$1.workers.length; // round robin
     })
   };
 
@@ -169,7 +164,7 @@ RpcServer.prototype.handler = function handler (e) {
     var uid = ref.uid;
     var data = ref.data;
   if (this.methods[method]) {
-    Promise.all([this.methods[method](data)]).then(
+    Promise.resolve(data).then(this.methods[method]).then(
       function (data) { return this$1.reply(uid, method, data); },
       function (error) { return this$1.throw(uid, error); }
     );

dist/web-rpc.umd.js

@@ -31,17 +31,21 @@
   "main": "dist/web-rpc.cjs.js",
   "module": "dist/web-rpc.js",
   "devDependencies": {
+    "nyc": "^11.4.1",
     "rollup": "0.49.2",
     "rollup-plugin-buble": "0.15.0",
-    "rollup-plugin-commonjs": "^8.2.6",
-    "rollup-plugin-node-resolve": "^3.0.0",
+    "rollup-plugin-commonjs": "8.2.6",
+    "rollup-plugin-node-resolve": "3.0.0",
     "snazzy": "7.0.0",
-    "standard": "^10.0.3",
+    "standard": "10.0.3",
+    "tap-diff": "0.1.1",
+    "tape": "4.8.0",
     "uglify-js": "3.0.28"
   },
   "scripts": {
     "check": "standard src/*.js | snazzy",
     "build": "rollup -c",
+    "test": "nyc --reporter=html --reporter=lcov --reporter=text tape test/index.test.js",
     "min": "uglifyjs dist/web-rpc.umd.js -c -m > dist/web-rpc.min.js"
   },
   "dependencies": {

package.json

@@ -52,12 +52,12 @@ class RpcClient extends EventEmitter {
   call (method, data, { timeout = 2000 } = {}) {
     var uid = uuid()
     var transferables = peekTransferables(data)
-    this.workers[this.idx].postMessage({ method, uid, data }, transferables)
-    this.idx = ++this.idx % this.workers.length // round robin
     return new Promise((resolve, reject) => {
       this.timeouts[uid] = setTimeout(() => this.reject(`RPC timeout exceeded for '${method}' call`), timeout)
       this.calls[uid] = resolve
       this.errors[uid] = reject
+      this.workers[this.idx].postMessage({ method, uid, data }, transferables)
+      this.idx = ++this.idx % this.workers.length // round robin
     })
   }
 }

src/client.js

@@ -14,7 +14,7 @@ class RpcServer {
   handler (e) {
     var { method, uid, data } = e.data
     if (this.methods[method]) {
-      Promise.all([this.methods[method](data)]).then(
+      Promise.resolve(data).then(this.methods[method]).then(
         data => this.reply(uid, method, data),
         error => this.throw(uid, error)
       )

src/server.js

@@ -1,6 +1,3 @@
-var crypto = window.crypto || window.msCrypto
-var arr = new Uint8Array(1)
-
 export function isObject (object) {
   return Object(object) === object
 }
@@ -23,9 +20,6 @@ export function peekTransferables (data) {
   return result
 }
 
-// https://github.com/Chalarangelo/30-seconds-of-code#uuidgeneratorbrowser
 export function uuid () {
-  return ([1e7] + -1e3 + -4e3 + -8e3 + -1e11).replace(/[018]/g, c =>
-    (c ^ (crypto.getRandomValues(arr)[0] & (15 >> (c / 4)))).toString(16)
-  )
+  return Math.floor((1 + Math.random()) * 1e10).toString(16)
 }

src/utils.js

@@ -0,0 +1,76 @@
+var test = require('tape')
+var tapDiff = require('tap-diff')
+var EventEmitter = require('events')
+
+test.createStream()
+  .pipe(tapDiff())
+  .pipe(process.stdout)
+
+var WebRPC = require('../dist/web-rpc.cjs.js')
+
+class EventTarget extends EventEmitter {
+  addEventListener (event, listener) {
+    this.on(event, listener)
+  }
+}
+
+global.self = new EventTarget()
+global.self.postMessage = function (data) {
+  global.worker.emit('message', { data })
+}
+
+global.worker = new EventTarget()
+global.worker.postMessage = function (data) {
+  global.self.emit('message', { data })
+}
+
+function wait (time) {
+  return new Promise(resolve => setTimeout(resolve, time))
+}
+
+var server = new WebRPC.Server({
+  add ({ x, y }) { return x + y },
+  pow ({ x, y }) { return x ** y },
+  task () { return wait(1000) }
+})
+
+var client = new WebRPC.Client({
+  workers: [worker, worker]
+})
+
+test('RpcServer.constructor()', t => {
+  t.ok(server instanceof WebRPC.Server, 'should create new RPC server')
+  t.deepEqual(Object.keys(server.methods), ['add', 'pow', 'task'], 'should have passed methods')
+  t.deepEqual(self.eventNames(), ['message'], 'should listen "message" event')
+  t.end()
+})
+
+test('RpcServer.emit()', t => {
+  t.plan(1)
+  function listener (data) {
+    t.deepEqual(data, { foo: 'bar' }, 'should trigger RPC server event')
+  }
+
+  client.on('event', listener)
+  server.emit('event', { foo: 'bar' })
+  client.off('event', listener)
+  server.emit('event', { foo: 'bar' })  
+})
+
+test('RpcClient.constructor() should create new RPC client', t => {
+  t.ok(client instanceof WebRPC.Client, 'should create new RPC client')
+  t.equal(client.workers.length, 2, 'should have passed workers')
+  t.deepEqual(worker.eventNames(), ['message'], 'should listen "message" event')
+  t.end()
+})
+
+test('RpcClient.call()', t => {
+  t.plan(4)
+  var result = client.call('add', { x: 1, y: 1})
+  t.ok(result.then, 'should return Promise')
+  t.equal(client.idx, 1, 'should round robbin')
+  result.then(res => t.equal(res, 2, 'should call RPC server method'))
+  client.call('length').catch(err => {
+    t.ok(err instanceof Error, 'should throw error for unknown methods')
+  })
+})