nodo 1.6.5 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85e8ece889660e457a3473919da402124d9688011c3dbe5f69015e9f5e258465
-  data.tar.gz: 32ed8d2c1905c22cc68cf2734272f0d743890be066add8ce8de1a72132c6c3f4
+  metadata.gz: 403cadfdfd344847d097f662540d78fd2db53099407de9391f7e453575a2dd21
+  data.tar.gz: 14cf5ec07e0dcf47556d1c606a632763614e17a6054ac818952eecd5112bbc7f
 SHA512:
-  metadata.gz: 1c6a6af11b36730dae8bc00d31a17a96f0fbe0fe3a5ddc3da5df636efcdc648a6890e37aee63c7f0b67fc000ce354247eaa61cde12557eb9a3126b6cd0d9a291
-  data.tar.gz: b12074e9a1312694fcb46246eb2d66d418054b3f518be6dc5b2469a908b8b7e35d55d4a30b77144005b2b898c193ed062473ee4916239022c9d32361a5e324c4
+  metadata.gz: f14df956cfa21a1732b9a80df51826c32519b9cec0da7679f99846d08348b1d9985e774b6dd83f19eec1cebbb4c0ebf0d70f731f80c896d782b84ed4ec53b0a2
+  data.tar.gz: 03f7b885f5dca161dde7c9add5a46733b74d23d90c26180df30c4f75c4c3d2ec2fb6ccc000a651f0c1515a5e5d9b46e03fa73ed2aa4bf2f18ddfa257394ddaef

data/lib/nodo/core.rb

@@ -9,48 +9,48 @@ module Nodo
     ARRAY_CLASS_ATTRIBUTES = %i[dependencies constants scripts].freeze
     HASH_CLASS_ATTRIBUTES = %i[functions].freeze
     CLASS_ATTRIBUTES = (ARRAY_CLASS_ATTRIBUTES + HASH_CLASS_ATTRIBUTES).freeze
-    
+
     @@node_pid = nil
     @@tmpdir = nil
     @@mutex = Mutex.new
     @@exiting = nil
-    
+
     class << self
       extend Forwardable
-      
+
       attr_accessor :class_defined
-      
+
       def inherited(subclass)
         CLASS_ATTRIBUTES.each do |attr|
           subclass.send "#{attr}=", send(attr).dup
         end
       end
-      
+
       def instance
         @instance ||= new
       end
-      
+
       def class_defined?
         !!class_defined
       end
-      
+
       def clsid
         name || "Class:0x#{object_id.to_s(0x10)}"
       end
-      
+
       CLASS_ATTRIBUTES.each do |attr|
         define_method "#{attr}=" do |value|
           instance_variable_set :"@#{attr}", value
         end
         protected "#{attr}="
       end
-      
+
       ARRAY_CLASS_ATTRIBUTES.each do |attr|
         define_method "#{attr}" do
           instance_variable_get(:"@#{attr}") || instance_variable_set(:"@#{attr}", [])
         end
       end
-      
+
       HASH_CLASS_ATTRIBUTES.each do |attr|
         define_method "#{attr}" do
           instance_variable_get(:"@#{attr}") || instance_variable_set(:"@#{attr}", {})
@@ -60,15 +60,15 @@ module Nodo
       def generate_core_code
         <<~JS
           global.nodo = require(#{nodo_js});
-          
+
           const socket = process.argv[1];
           if (!socket) {
             process.stderr.write('Socket path is required\\n');
             process.exit(1);
           }
-          
+
           process.title = `nodo-core ${socket}`;
-          
+
           const shutdown = () => {
             nodo.core.close(() => { process.exit(0) });
           };
@@ -92,9 +92,9 @@ module Nodo
           })()
         JS
       end
-      
+
       protected
-      
+
       def finalize_context(context_id)
         proc do
           if not @@exiting and core = Nodo::Core.instance
@@ -102,9 +102,9 @@ module Nodo
           end
         end
       end
-      
+
       private
-      
+
       def require(*mods)
         deps = mods.last.is_a?(Hash) ? mods.pop : {}
         mods = mods.map { |m| [m, m] }.to_h
@@ -118,7 +118,7 @@ module Nodo
         self.functions = functions.merge(name => Function.new(name, _code || code, source_location, timeout, &block))
         define_method(name) { |*args| call_js_method(name, args) }
       end
-      
+
       def class_function(*methods)
         singleton_class.def_delegators(:instance, *methods)
       end
@@ -126,20 +126,20 @@ module Nodo
       def const(name, value)
         self.constants = constants + [Constant.new(name, value)]
       end
-      
+
       def script(code = nil, &block)
         self.scripts = scripts + [Script.new(code, &block)]
       end
-      
+
       def nodo_js
-        Pathname.new(__FILE__).dirname.join('nodo.js').to_s.to_json
+        Pathname.new(__FILE__).dirname.join('nodo.cjs').to_s.to_json
       end
-      
+
       def reserved_method_name?(name)
         Nodo::Core.method_defined?(name, false) || Nodo::Core.private_method_defined?(name, false) || name.to_s == DEFINE_METHOD
       end
     end
-    
+
     def initialize
       raise ClassError, :new if self.class == Nodo::Core
       @@mutex.synchronize do
@@ -148,18 +148,18 @@ module Nodo
         ensure_class_is_defined
       end
     end
-    
+
     def evaluate(code)
       ensure_context_is_defined
       call_js_method(EVALUATE_METHOD, code)
     end
-    
+
     private
-    
+
     def node_pid
       @@node_pid
     end
-    
+
     def tmpdir
       @@tmpdir
     end
@@ -167,33 +167,33 @@ module Nodo
     def socket_path
       tmpdir && tmpdir.join(SOCKET_NAME)
     end
-    
+
     def clsid
       self.class.clsid
     end
-    
+
     def context_defined?
       @context_defined
     end
-    
+
     def log_exception(e)
       return unless logger = Nodo.logger
       message = "\n#{e.class} (#{e.message})"
       message << ":\n\n#{e.backtrace.join("\n")}" if e.backtrace
       logger.error message
     end
-    
+
     def ensure_process_is_spawned
       return if node_pid
       spawn_process
     end
-    
+
     def ensure_class_is_defined
       return if self.class.class_defined?
       call_js_method(DEFINE_METHOD, self.class.generate_class_code)
       self.class.class_defined = true
     end
-    
+
     def ensure_context_is_defined
       return if context_defined?
       @@mutex.synchronize do
@@ -202,7 +202,7 @@ module Nodo
         @context_defined = true
       end
     end
-    
+
     def spawn_process
       @@tmpdir = Pathname.new(Dir.mktmpdir('nodo'))
       env = Nodo.env.merge('NODE_PATH' => Nodo.modules_root.to_s)
@@ -215,7 +215,7 @@ module Nodo
         FileUtils.remove_entry(tmpdir) if File.directory?(tmpdir)
       end
     end
-    
+
     def wait_for_socket
       start = Time.now
       socket = nil
@@ -257,7 +257,7 @@ module Nodo
       # TODO: restart or something? If this happens the process is completely broken
       raise Error, 'Node process failed'
     end
-    
+
     def handle_error(response, function)
       if response.body
         result = parse_response(response)
@@ -270,12 +270,12 @@ module Nodo
       log_exception(error)
       raise error
     end
-    
+
     def parse_response(response)
       data = response.body.force_encoding('UTF-8')
       JSON.parse(data) unless data == ''
     end
-    
+
     def with_tempfile(name)
       ext = File.extname(name)
       result = nil
@@ -284,6 +284,6 @@ module Nodo
       end
       result
     end
-    
+
   end
 end

data/lib/nodo/version.rb

@@ -1,3 +1,3 @@
 module Nodo
-  VERSION = '1.6.5'
+  VERSION = '1.7.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nodo
 version: !ruby/object:Gem::Version
-  version: 1.6.5
+  version: 1.7.0
 platform: ruby
 authors:
 - Matthias Grosser
@@ -11,56 +11,56 @@ cert_chain: []
 date: 2021-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: bundler
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: rake
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: byebug
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: minitest
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -82,7 +82,6 @@ files:
 - lib/nodo/dependency.rb
 - lib/nodo/errors.rb
 - lib/nodo/function.rb
-- lib/nodo/nodo.js
 - lib/nodo/railtie.rb
 - lib/nodo/script.rb
 - lib/nodo/version.rb
@@ -105,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.25
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: Call Node.js from Ruby

data/lib/nodo/nodo.js

@@ -1,143 +0,0 @@
-module.exports = (function() {
-  const DEFINE_METHOD = '__nodo_define_class__';
-  const EVALUATE_METHOD = '__nodo_evaluate__';
-  const GC_METHOD = '__nodo_gc__';
-  const DEBUG = process.env.NODO_DEBUG;
-
-  const vm = require('vm');
-  const http = require('http');
-  const path = require('path');
-  const fs = require('fs');
-  const performance = require('perf_hooks').performance;
-
-  let server, closing;
-  const classes = {};
-  const contexts = {};
-  
-  function render_error(e) {
-    let errInfo = {};
-    if (e instanceof Error) {
-      errInfo.name = e.name;
-      Object.getOwnPropertyNames(e).reduce((obj, prop) => { obj[prop] = e[prop]; return obj }, errInfo);
-    } else {
-      errInfo.name = e.toString();
-    }
-    return JSON.stringify({ error: errInfo });
-  }
-
-  function respond_with_error(res, code, name) {
-    res.statusCode = code;
-    const rendered = render_error(name);
-    debug(`Error ${code} ${rendered}`);
-    res.end(rendered, 'utf8');
-  }
-  
-  function respond_with_data(res, data, start) {
-    let timing;
-    res.statusCode = 200;
-    res.end(JSON.stringify(data), 'utf8');
-    if (start) {
-      timing = ` in ${(performance.now() - start).toFixed(2)}ms`;
-    }
-    debug(`Completed 200 OK${timing}\n`);
-  }
-
-  function debug(message) {
-    if (DEBUG) {
-      // fs.appendFileSync('log/nodo.log', `${message}\n`);
-      console.log(`[Nodo] ${message}`);
-    }
-  }
-
-  async function import_module(specifier) {
-    return await import(specifier);
-  }
-
-  const core = {
-    run: (socket) => {
-      debug('Starting up...');
-      server = http.createServer((req, res) => {
-        const start = performance.now();
-        
-        res.setHeader('Content-Type', 'application/json');
-        debug(`${req.method} ${req.url}`);
-
-        if (req.method !== 'POST' || !req.url.startsWith('/')) {
-          return respond_with_error(res, 405, 'Method Not Allowed');
-        }
-        
-        const url = req.url.substring(1);
-        const [class_name, object_id, method] = url.split('/');
-        let klass, context;
-        
-        if (classes.hasOwnProperty(class_name)) {
-          klass = classes[class_name];
-          if (EVALUATE_METHOD == method) {
-            if (!contexts.hasOwnProperty(object_id)) {
-              contexts[object_id] = vm.createContext({ require: require, ...klass });
-            }
-            context = contexts[object_id];
-          } else if (!klass.hasOwnProperty(method) && !GC_METHOD == method) {
-            return respond_with_error(res, 404, `Method ${class_name}#${method} not found`);
-          }
-        } else if (DEFINE_METHOD != method) {
-          return respond_with_error(res, 404, `Class ${class_name} not defined`);
-        }
-        
-        let body = '';
-        
-        req.on('data', (data) => { body += data; });
-
-        req.on('end', () => {
-          let input, result;
-
-          try {
-            input = JSON.parse(body);
-          } catch (e) {
-            return respond_with_error(res, 400, 'Bad Request');
-          }
-
-          try {
-            if (DEFINE_METHOD == method) {
-              classes[class_name] = vm.runInThisContext(input, class_name);
-              respond_with_data(res, class_name, start);
-            } else if (EVALUATE_METHOD == method) {
-              Promise.resolve(vm.runInNewContext(input, context)).then((result) => {
-                respond_with_data(res, result, start);
-              }).catch((error) => {
-                respond_with_error(res, 500, error);
-              });
-            } else if (GC_METHOD == method) {
-              delete contexts[object_id];
-              respond_with_data(res, true, start);
-            } else {
-              Promise.resolve(klass[method].apply(null, input)).then((result) => {
-                respond_with_data(res, result, start);
-              }).catch((error) => {
-                respond_with_error(res, 500, error);
-              });
-            }
-          } catch(error) {
-            return respond_with_error(res, 500, error);
-          }
-    
-        });
-      });
-
-      //server.maxConnections = 64;
-      server.listen(socket, () => {
-        debug(`server ready, listening on ${socket} (max connections: ${server.maxConnections})`);
-      });
-    },
-    
-    close: (finalizer) => {
-      debug("Shutting down");
-      if (!closing) {
-        closing = true;
-        server.close(finalizer);
-      }
-    }
-  };
-  
-  return { core: core, debug: debug, import: import_module };
-})();