isomorfeus-speednode 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bdd2542ef4c9781efd0fcf05335ddba35005290a0e0ae56e496966422d66c604
-  data.tar.gz: dd3745924f0713663d23af5ace489a3e36ac7193de2dc2719d76036d1dc5b6c5
+  metadata.gz: 31ef61f35fb553a911c8a0438028e1f30a42a39f67f6eac785009b9bca24ca16
+  data.tar.gz: 184188cc475fe8cc293857f5090a36f6df100f9592385f3b84ee5af52308991b
 SHA512:
-  metadata.gz: 718ac1be86fce89b46ba2a957af7d1c7c8fefdbcdce86a04e715a60045c3d44913569e433114c22a4de7d827d9a789fe2c91a40f8ac402690d8cf7654300ecfc
-  data.tar.gz: 47cf6b06bf4d37dbb24c1184f25f8a008db3bd6b646282a4f43079bef4eb55cfe52fa537c923986569bc0fdb2bd8fa442112d22a6f5f4b205f8edcddf8f76251
+  metadata.gz: a40508924ae7c642f72bfe8db638c3b57d36ac15e9d7c35f1db8976cd57f1a5d4b415e69c93a3e316425a993095610355cb7bd8d907ccce9d0f11f93c32c7c43
+  data.tar.gz: 66d5c937dc96c5bc69f1ad59ea1e67b65e77a22c308635da78d4ea7ff9e1577077820466152d079dc3cbdce9baad561ad23c304317a9b7d08af3b83487e6c285

data/lib/isomorfeus/speednode/runner.js

@@ -1,7 +1,9 @@
+'use strict';
+
 const vm = require('vm');
 const net = require('net');
-var contexts = {};
-var process_exit = false;
+let contexts = {};
+let process_exit = false;
 
 /*** circular-json, originally taken from https://raw.githubusercontent.com/WebReflection/circular-json/
  Copyright (C) 2013-2017 by Andrea Giammarchi - @WebReflection
@@ -37,12 +39,12 @@ CircularJSON.safeSpecialChar =  '\\x' + ('0' + CircularJSON.specialChar.charCode
 CircularJSON.escapedSafeSpecialChar = '\\' + CircularJSON.safeSpecialChar;
 CircularJSON.specialCharRG = new RegExp(CircularJSON.safeSpecialChar, 'g');
 CircularJSON.indexOf = [].indexOf || function(v){
-    for(var i=this.length;i--&&this[i]!==v;);
+    for(let i=this.length;i--&&this[i]!==v;);
     return i;
   };
 
 CircularJSON.generateReplacer = function (value, replacer, resolve) {
-    var
+    let
         doNotIgnore = false,
         inspect = !!replacer,
         path = [],
@@ -142,7 +144,7 @@ function massageStackTrace(stack) {
 }
 
 function createCompatibleContext() {
-    var c = vm.createContext();
+    let c = vm.createContext();
     vm.runInContext('delete this.console', c, "(execjs)");
     return c;
 }
@@ -154,11 +156,12 @@ function createPermissiveContext() {
 function getCompatibleContext(uuid) {
     return contexts[uuid] || (contexts[uuid] = createCompatibleContext());
 }
+
 function getPermissiveContext(uuid) {
     return contexts[uuid] || (contexts[uuid] = createPermissiveContext());
 }
 
-var commands = {
+let commands = {
     deleteContext: function(uuid) {
         delete contexts[uuid];
         return [1];
@@ -168,10 +171,10 @@ var commands = {
         return ['ok'];
     },
     execp: function execJS(input) {
-        var context = getPermissiveContext(input.context);
+        let context = getPermissiveContext(input.context);
         try {
-            var program = function(){ return vm.runInContext(input.source, context, "(execjs)"); };
-            var result = program();
+            let program = function(){ return vm.runInContext(input.source, context, "(execjs)"); };
+            let result = program();
             if (typeof result == 'undefined' && result !== null) { return ['ok']; }
             else {
                 try { return ['ok', result]; }
@@ -180,10 +183,10 @@ var commands = {
         } catch (err) { return ['err', '' + err, massageStackTrace(err.stack)]; }
     },
     exec: function execJS(input) {
-        var context = getCompatibleContext(input.context);
+        let context = getCompatibleContext(input.context);
         try {
-            var program = function(){ return vm.runInContext(input.source, context, "(execjs)"); };
-            var result = program();
+            let program = function(){ return vm.runInContext(input.source, context, "(execjs)"); };
+            let result = program();
             if (typeof result == 'undefined' && result !== null) { return ['ok']; }
             else {
                 try { return ['ok', result]; }
@@ -193,19 +196,18 @@ var commands = {
     }
 };
 
-var server = net.createServer(function(s) {
-    var received_data = '';
+let server = net.createServer(function(s) {
+    let received_data = Buffer.alloc(0);
 
     s.on('data', function (data) {
-        received_data += data;
-
-        if (!received_data.endsWith("\x04")) { return; }
-        var request = received_data.substring(0, received_data.length - 1);
-        received_data = '';
+        received_data = Buffer.concat([received_data, data]);
+        if (received_data[received_data.length - 1] !== 4) { return; }
+        let request = received_data.slice(0, received_data.length - 1).toString('utf8');
+        received_data = Buffer.alloc(0);
 
-        var input = JSON.parse(request);
-        var result = commands[input.cmd].apply(null, input.args);
-        var outputJSON = '';
+        let input = JSON.parse(request);
+        let result = commands[input.cmd].apply(null, input.args);
+        let outputJSON = '';
 
         try { outputJSON = JSON.stringify(result); }
         catch(err) {
@@ -218,6 +220,6 @@ var server = net.createServer(function(s) {
   });
 });
 
-var socket_path = process.env.SOCKET_PATH;
+let socket_path = process.env.SOCKET_PATH;
 if (!socket_path) { throw 'No SOCKET_PATH given!'; };
 server.listen(socket_path);

data/lib/isomorfeus/speednode/runtime.rb

@@ -97,7 +97,11 @@ module Isomorfeus
 
           ObjectSpace.define_finalizer(self, self.class.finalize(@runtime, @uuid))
 
-          source = encode(source)
+          begin
+            source = encode(source)
+          rescue
+            source = source.force_encoding('UTF-8')
+          end
 
           @permissive ? raw_execp(source) : raw_exec(source)
         end

data/lib/isomorfeus/speednode/version.rb

@@ -1,5 +1,5 @@
 module Isomorfeus
   module Speednode
-    VERSION = '0.2.3'
+    VERSION = '0.2.4'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-speednode
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-30 00:00:00.000000000 Z
+date: 2019-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execjs