func_e 0.0.4 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4822d7ecd0a7ced321d7c390b2b8a0a3562fc9c59ab6e7576dba6a90226c4734
-  data.tar.gz: c06b82eb855c0f13930f506f85fe83c879ec715cb2e1fb83061dfb1e15a96143
+  metadata.gz: 62bc0271fcdc97627a6886e2b4512f2a29f333c7530d710ef95d3de2a5e3a901
+  data.tar.gz: dd090d2dc79cfc3f4434177ad1053888f96f80319e978abf415e98ac6b6ff95c
 SHA512:
-  metadata.gz: d4ae967440ee1fda5283b350434ed3487b2f1907bc5da0fad84c1e29dd90b66f19b480192e2266904b080e5bfe8539661548277990bc238b3a5c68a2a78e5ee4
-  data.tar.gz: 135887a3d446190fba94da8095e51af8415f729b63b4e4063ade7979f208290bb01bfb751a2e64c5da19c0fb197bf4409d791a9d18108d8cf807d45699d92dee
+  metadata.gz: b41b60fc486326b7c30c0fc4971b85a47fe0d197edd66274d4cccf21fd170b5605314996f375f808c23d560dbc5a9715b3a993b88d4c4273b5e380d1e9a772d3
+  data.tar.gz: 1449586c6ce48a0764ff6729f9cd5b9e4d31f76dc715b20421eef5bb887ec9fc152817a22b296039e7c4f24cc866e05077981e368b3dd261cb2f16c02f6bd324

data/lib/func_e/config.rb

@@ -8,29 +8,34 @@ module FuncE
   class Config
     include Singleton
 
+    DEFAULT_PORT = 3030
     DEFAULT_INSTALL_DIR = 'funcs'
 
-    attr_accessor :fn_dir_path
+    attr_accessor :fn_dir_path, :local_server, :local_server_port
 
     def self.configure
       yield instance
+      
+      # Set default values if they are not set.
+      instance.local_server ||= false
+      instance.local_server_port ||= DEFAULT_PORT
+      instance.fn_dir_path ||= DEFAULT_INSTALL_DIR
+
+      # Start the server if the local_server option is set to true.
+      FuncE::Http.start_server if instance.local_server
     end
 
     def self.config
       instance
     end
 
-    def self.get(key)
-      instance.send(key)
-    end
-
     def self.install_path
       if defined?(Rails)
-        Rails.root.join(@fn_dir_path || DEFAULT_INSTALL_DIR)
+        Rails.root.join(config.fn_dir_path)
       elsif defined?(Bundler)
-        Bundler.root.join(@fn_dir_path || DEFAULT_INSTALL_DIR)
+        Bundler.root.join(config.fn_dir_path)
       else
-        Pathname.new(Dir.pwd).join(@fn_dir_path || DEFAULT_INSTALL_DIR)
+        Pathname.new(Dir.pwd).join(config.fn_dir_path)
       end
     end
   end

data/lib/func_e/func.rb

@@ -24,6 +24,10 @@ module FuncE
       @result
     end
 
+    def set_payload(payload)
+      @payload = payload
+    end
+
     def serialize_payload
       @payload.to_json
     end

data/lib/func_e/http.rb

@@ -0,0 +1,33 @@
+require 'net/http'
+
+module FuncE
+  module Http
+    def self.uri
+      URI("http://localhost:#{FuncE::Config.config.local_server_port}")
+    end
+
+    def self.headers
+      { 'Content-Type': 'application/json' }
+    end
+
+    def self.active_pid
+      `lsof -i:#{Config.config.local_server_port} -t`.to_i
+    end
+
+    def self.post(func)
+      Net::HTTP.post(uri, { name: func.name, payload: func.payload }.to_json, headers)
+    end
+
+    def self.start_server
+      kill_server
+      
+      Thread.new {
+        system("node #{FuncE::SERVER_PATH} --port=#{Config.config.local_server_port} --functions_path=#{Config.install_path}")
+      }
+    end
+
+    def self.kill_server
+      active_pid.tap { |pid| system("kill -9 #{pid}") unless pid.zero? }
+    end
+  end
+end

data/lib/func_e.rb

@@ -1,6 +1,9 @@
 # frozen_string_literal: true
 
+require 'json'
 require 'terrapin'
+
+require 'func_e/http'
 require 'func_e/func'
 require 'func_e/config'
 
@@ -8,15 +11,30 @@ require 'func_e/config'
 module FuncE
   require 'railtie' if defined?(Rails)
 
-  RUNNER_PATH = "#{File.expand_path(__dir__)}/func_e.js"
+  RUNNER_PATH = "#{File.expand_path(__dir__)}/func_e_runner.js"
+  SERVER_PATH = "#{File.expand_path(__dir__)}/func_e_server.js"
 
   def self.exec(func)
-    JSON.parse line.run(path: func.path, payload: func.serialize_payload), symbolize_names: true
+    Config.config.local_server ? server(func) : runner(func)
+  end
+
+  def self.server(func)
+    json_parse FuncE::Http.post(func).body
+  rescue Errno::ECONNREFUSED
+    { error: 'The server is not running. Please start the server before executing functions.' }
+  end
+
+  def self.runner(func)
+    json_parse line.run(path: func.path, payload: func.serialize_payload)
   rescue Terrapin::CommandLineError => e
     { error: 'An error occurred while executing the node function.', message: e.message }
   end
 
   def self.line
-    Terrapin::CommandLine.new("node #{RUNNER_PATH}", '--path=:path --payload=:payload', logger: Logger.new($stdout))
+    Terrapin::CommandLine.new("node #{RUNNER_PATH}", '--path=:path --payload=:payload')
+  end
+
+  def self.json_parse(json)
+    JSON.parse(json, symbolize_names: true)
   end
 end

data/lib/{func_e.js → func_e_runner.js}

@@ -9,18 +9,7 @@
  * always return an Promise that resolves to the result of the function. Thus
  * all functions must be asynchronous.
  */
-
-/**
- * Extract the arguments from the command line.
- */
-let args = {};
-
-process.argv.slice(2).forEach(arg => {
-  if (arg.startsWith('--')) {
-    const split = arg.indexOf('=');
-    args[arg.substring(2, split)] = arg.substring(split + 1);
-  }
-})
+const args = require('./support/args')();
 
 // If any of the required arguments are missing, throw an error.
 if (!args.path) throw new Error('Missing function name (--fn=<FUNCTION_NAME>');

data/lib/func_e_server.js

@@ -0,0 +1,70 @@
+const fs = require("fs");
+const http = require("http");
+
+// Get the port number from the cli arguments or use the default port number
+const args = require("./support/args")();
+
+const PORT = args.port || 3030;
+
+/**
+ * Load all the functions from the provided directory.
+ */
+let functions = fs.readdirSync(args.functions_path).reduce((obj, file) => {
+  const isFunction = file.endsWith(".js");
+
+  if (isFunction) {
+    const functionName = file.split(".")[0];
+    const functionPath = args.functions_path + "/" + file;
+    obj[functionName] = require(functionPath);
+  }
+
+  return obj;
+}, {});
+
+const invalidRequestMethodError = JSON.stringify({
+  message: "This server only accepts POST requests"
+})
+
+const functionExecutionError = (err) => JSON.stringify({
+  error: err.message
+});
+
+const functionNotFoundError = (name) => JSON.stringify({
+  error: `Function "${name}" not loaded. Check the function name or restart the server.`
+})
+
+function setDefaultHeaders(res) {
+  res.setHeader("Content-Type", "application/json");
+}
+
+function handler(req, res) {
+  if (req.method != "POST") res.end(invalidRequestMethodError);
+
+  setDefaultHeaders(res)
+
+  let post_data = "";
+
+  req.on("data", chunk => post_data += chunk);
+  req.on("end", () => {
+    const data = JSON.parse(post_data);
+    const fn = functions[data.name];
+
+    if (!fn) {
+      res.statusCode = 404;
+      res.end(functionNotFoundError(data.name));
+    } else {
+      fn(data.payload)
+        .then((result) => {
+          res.statusCode = 200;
+          res.end(JSON.stringify(result));
+        }).catch((err) => {
+          res.statusCode = 500;
+          res.end(functionExecutionError(err));
+        });
+    }
+  });
+}
+
+const server = http.createServer(handler);
+
+server.listen(PORT, () => console.log(`\nRunning FuncE server on http://localhost:${PORT}/\n`));

data/lib/support/args.js

@@ -0,0 +1,16 @@
+/**
+ * Extract the arguments from the command line and return them as an object
+ * of key value pairs. Args are expected to be in the format --key=value.
+ */
+module.exports = () => {
+  let args = {};
+
+  process.argv.slice(2).forEach(arg => {
+    if (arg.startsWith('--')) {
+      const split = arg.indexOf('=');
+      args[arg.substring(2, split)] = arg.substring(split + 1);
+    }
+  })
+
+  return args;
+};

data/lib/tasks/install/template/helloFn.js

@@ -1,4 +1,4 @@
-module.exports = function helloFn({ planet }) {
+module.exports = async function helloFn({ planet }) {
   return {
     result: `Hello, ${planet}!`
   }

metadata

@@ -1,41 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: func_e
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.6
 platform: ruby
 authors:
 - Sebastian Scholl
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-08-31 00:00:00.000000000 Z
+date: 2024-09-12 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: terrapin
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.6'
 description: FuncE is a lightweight Ruby gem that allows developers to call JavaScript
@@ -50,11 +36,14 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/func_e.js
 - lib/func_e.rb
 - lib/func_e/config.rb
 - lib/func_e/func.rb
+- lib/func_e/http.rb
+- lib/func_e_runner.js
+- lib/func_e_server.js
 - lib/railtie.rb
+- lib/support/args.js
 - lib/tasks/install/install.rake
 - lib/tasks/install/template/helloFn.js
 - lib/tasks/install/template/package.json
@@ -78,7 +67,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.5
+rubygems_version: 3.5.18
 signing_key: 
 specification_version: 4
 summary: FuncE provides an interface between Node.js functions and Ruby applications,