From 14a9a9119c1bf424e5cd27757e39babf37ec92d7 Mon Sep 17 00:00:00 2001
From: Jason Mulligan <jason.mulligan@avoidwork.com>
Date: Wed, 15 Jun 2016 19:34:17 -0400
Subject: [PATCH] Updating syntax
---
lib/worker.js | 16 +++++-----------
package.json | 2 +-
src/worker.js | 30 ++++++++++++------------------
3 files changed, 18 insertions(+), 30 deletions(-)
diff --git a/lib/worker.js b/lib/worker.js
index b575e2d..61c5024 100644
--- a/lib/worker.js
+++ b/lib/worker.js
@@ -31,28 +31,22 @@ process.once("message", function (obj) {
postMessage: function postMessage(msg) {
process.send(JSON.stringify({ data: msg }));
},
- onmessage: noop,
- onerror: noop,
+ onmessage: void 0,
+ onerror: void 0,
addEventListener: function addEventListener(event, fn) {
- if (event === "message") {
- global.onmessage = global.self.onmessage = fn;
- }
-
- if (event === "error") {
- global.onerror = global.self.onerror = fn;
- }
+ global["on" + event] = global.self["on" + event] = fn;
}
};
global.require = require;
global.importScripts = function () {
- var scripts = undefined;
-
for (var _len = arguments.length, files = Array(_len), _key = 0; _key < _len; _key++) {
files[_key] = arguments[_key];
}
+ var scripts = undefined;
+
if (files.length > 0) {
scripts = files.map(function (file) {
return fs.readFileSync(file, "utf8");
diff --git a/package.json b/package.json
index b746ff0..d2e5114 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "tiny-worker",
- "version": "1.1.2",
+ "version": "1.1.3",
"description": "Tiny WebWorker for Server",
"main": "lib/index.js",
"scripts": {
diff --git a/src/worker.js b/src/worker.js
index a87a39a..f7182d5 100644
--- a/src/worker.js
+++ b/src/worker.js
@@ -19,36 +19,30 @@ function toFunction (arg) {
}
// Bootstraps the Worker
-process.once("message", function (obj) {
+process.once("message", obj => {
let exp = obj.isfn ? toFunction(obj.input) : fs.readFileSync(obj.input, "utf8");
global.self = {
- close: function () {
+ close: () => {
process.exit(0);
},
- postMessage: function (msg) {
+ postMessage: msg => {
process.send(JSON.stringify({data: msg}));
},
- onmessage: noop,
- onerror: noop,
- addEventListener: function (event, fn) {
- if (event === "message") {
- global.onmessage = global.self.onmessage = fn;
- }
-
- if (event === "error") {
- global.onerror = global.self.onerror = fn;
- }
+ onmessage: void 0,
+ onerror: void 0,
+ addEventListener: (event, fn) => {
+ global["on" + event] = global.self["on" + event] = fn;
}
};
global.require = require;
- global.importScripts = function (...files) {
+ global.importScripts = (...files) => {
let scripts;
if (files.length > 0) {
- scripts = files.map(function (file) {
+ scripts = files.map(file => {
return fs.readFileSync(file, "utf8");
}).join("\n");
@@ -56,15 +50,15 @@ process.once("message", function (obj) {
}
};
- Object.keys(global.self).forEach(function (key) {
+ Object.keys(global.self).forEach(key => {
global[key] = global.self[key];
});
- process.on("message", function (msg) {
+ process.on("message", msg => {
(global.onmessage || global.self.onmessage || noop)(JSON.parse(msg));
});
- process.on("error", function (err) {
+ process.on("error", err => {
(global.onerror || global.self.onerror || noop)(err);
});
--
GitLab