New wrapper using the node_modules approach

Author: poing

gems/wrapperV12.js

@@ -0,0 +1,51 @@
+// wrapperV11.js
+
+/* 
+This is the third working version of the wrapper.  Better error handling and accepting multiple JavaScript commands for the secrets.js package.
+*/
+
+// Hex to ASCII
+function hex2a(hex) 
+{
+    var str = '';
+    for (var i = 0; i < hex.length; i += 2)
+        str += String.fromCharCode(parseInt(hex.substr(i, 2), 16));
+    return str;
+}     
+
+// Require the secrets package and assign it to a variable
+const secrets = require('../node_modules/secrets.js-grempe/secrets.js');
+
+// If the script is executed directly, call the appropriate function based on arguments
+if (require.main === module) {
+  const commands = hex2a(process.argv[2]);
+   
+  if (!commands.length) {
+    console.error("No commands provided.");
+    process.exit(1);
+  }
+
+  try {
+
+	  
+	//return commands;
+	const inputData = JSON.parse(commands);
+
+	// Debugging statements
+	//console.log("Commands received from Python:", commands);
+	//console.log("inputData[0][0]: ", inputData[0][0]); // returns: init(33)
+
+	// Loop through commands	
+	for (const command of inputData) {
+		// Evaluate each command
+		lastResult = eval('secrets.' + command[0]);
+	}	
+
+	// Return the result of the last command
+	console.log(JSON.stringify(lastResult));
+
+  } catch (error) {
+    console.error("Error executing command:", error.message);
+    process.exit(1);
+  }
+}

gems/wrapperV12_test.py

@@ -0,0 +1,152 @@
+#! /usr/bin/env python3
+# -*- coding: utf-8 -*-
+# vim: set et sw=4 fenc=utf-8:
+#
+# wrapperV11_test.py
+
+import json
+import subprocess
+
+# Path to the Node.js wrapper script
+JS_FILE_PATH = "wrapperV12.js"
+
+def wrapper(input_data):
+    """
+    Run a JavaScript function using the Node.js wrapper.
+
+    Args:
+        input_data (list): List containing the function calls as strings.
+
+    Returns:
+        The result of the JavaScript function or None if there is an error.
+    """
+    
+    # Enclose input_json in single quotes
+    js_command = ["node", JS_FILE_PATH, input_data]
+    
+    try:
+        # Run the command and capture the output and stderr
+        result = subprocess.run(js_command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True, check=True)
+        
+        # Debugging statement to print stdout and stderr
+        # print("Input data sent to JavaScript:", input_data)
+        # print("stdout:", result.stdout)
+        # print("stderr:", result.stderr)
+
+        try:
+            # Attempt to load the entire stdout as JSON
+            js_result = json.loads(result.stdout)
+            #print('json.loads')
+            
+            # Print stderr if it exists
+            if result.stderr:
+                print("JavaScript stderr:", result.stderr)
+                
+            return js_result
+
+        except json.JSONDecodeError as e:
+            print("Python error decoding JSON:", e)
+            print("Raw stdout content:", result.stdout)
+
+    except subprocess.CalledProcessError as e:
+        # Print the error from the JavaScript script
+        js_error = e.stderr.strip()  # Use e.stderr instead of result.stderr
+        print("JavaScript error:", js_error)
+        return None
+
+'''
+Used to pass a "clean" string as an arg to the CLI
+'''
+def encode_to_base36(data):
+    base36_string = ""
+    for key, value in data.items():
+        base36_string += key + str(value)
+    return base36_string
+
+class JsFunction:
+    def __init__(self, func, test=False):
+        self.func = func
+        self.test = test
+
+    def __call__(self, *args, test=False, **kwargs):
+        def wrapped_func(*args, **kwargs):
+            args_str = ', '.join(repr(arg) for arg in args)
+            #kwargs_str = ', '.join(f'{key}={repr(value)}' 
+            #	for key, value in kwargs.items())
+            #all_args = ', '.join(filter(None, [args_str, kwargs_str]))
+
+            return f"{self.func.__name__}({args_str})"
+            
+        data = []
+        
+        # DO NOT REMOVE THIS
+        if test or self.test:
+        	data.append("setRNG('testRandom')")
+
+        data.append(wrapped_func(*args, **kwargs) if args else self.func(*args, **kwargs))
+        return data
+
+    def __get__(self, instance, owner):
+        return self if instance is None else types.MethodType(self, instance)
+
+@JsFunction
+def init(*args, **kwargs):
+    pass 
+    
+@JsFunction
+def setRNG(*args, **kwargs):
+    pass 
+
+@JsFunction
+def share(*args, **kwargs):
+    pass 
+
+@JsFunction
+def combine(*args, **kwargs):
+    pass 
+
+alpha = init(18)
+bravo = setRNG("testRandom")
+delta = share('1234abc', 6, 3)
+
+
+# Combine
+tasks = [
+	bravo,
+	delta
+]
+
+#tasks = {alpha, bravo}
+
+#print("Tasks: ", tasks)
+
+
+
+json_data = json.dumps(tasks, indent=None).replace("'", "`")
+#print(json_data)
+#print(json_data.encode().hex())
+data = json_data.encode().hex()
+#print(data) 
+# Call the wrapper function
+shares = wrapper(data)
+
+print(shares[1])
+print(shares[3])
+print(shares[5])
+
+foobar = combine([shares[1], shares[3], shares[5]])
+tasks = [ foobar ]
+json_data = json.dumps(tasks, indent=None).replace("'", "`")
+data = json_data.encode().hex()
+print(wrapper(data))
+# print(shares)
+# #print(js_result)
+# 
+# todo = combine([shares[2], shares[3], shares[4]])
+# json_data = json.dumps(todo, indent=None).replace("'", "`")
+# data = json_data.encode().hex()
+# 
+# answer = wrapper(data)
+
+
+#print(answer)

package.json

@@ -8,4 +8,4 @@
   "dependencies": {
     "secrets.js-grempe": "^2.0.0"
   }
-}
+}