@makano/rew 1.2.2 → 1.2.4

package/lib/rew/modules/compiler.js

@@ -22,7 +22,8 @@ function tokenizeCoffeeScript(code) {
 				type: 'COMMENT',
 				value: char + code.substring(i + 1).split('\n')[0] + '\n',
 			});
-			i = code.indexOf('\n', i);
+			const ind = code.indexOf('\n', i);
+			i = ind < 0 ? code.length-1 : ind;
 		} else if (char === '"' || char === "'") {
 			// String
 			let string = char;
@@ -56,11 +57,11 @@ function tokenizeCoffeeScript(code) {
 			} else {
 				tokens.push({ type: 'WHITESPACE', value: char });
 			}
-		} else if (/[a-zA-Z_$]/.test(char)) {
+		} else if (/[a-zA-Z\._$]/.test(char)) {
 			// Identifier
 			let identifier = char;
 			i++;
-			while (i < code.length && /[a-zA-Z0-9_$]/.test(code[i])) {
+			while (i < code.length && /[a-zA-Z0-9\._$]/.test(code[i])) {
 				identifier += code[i];
 				i++;
 			}
@@ -176,7 +177,7 @@ function compileRewStuff(content, options) {
 			} else if (nextToken) {
 				const nameToken = fnextToken(ind, tokens, 'STRING');
 				defaultName = nextToken.value;
-				let { nextToken: nextNextToken, n: n2 } = gnextToken(i + 2, 1, tokens) || {};
+				let { token: nextNextToken, n: n2 } = gnextToken(i + 2, 1, tokens) || {};
 				if (nextNextToken?.type == 'OTHER' && nextNextToken?.value == ',') {
 					const closingBraceToken = fnextToken(ind, tokens, 'OTHER', '}');
 					if (closingBraceToken) {
@@ -235,12 +236,13 @@ function compileRewStuff(content, options) {
 }
 
 const cpl = (module.exports.compile = function (file, options = {}) {
-	let c = compile(compileRewStuff(file.content, options), {
+	let c = options.type == 'js' || options.compile == false ? file.content : compile(compileRewStuff(file.content, options), {
 		...options,
 		filename: file.path,
 		bare: false,
 		inlineMap: false,
 	});
+	// console.log(c);
 	if (execOptions.jsx || options.jsx) {
 		c = babel.transformSync(c, {
 			presets: [[babelReact, { pragma: execOptions.jsxPragma }]],
@@ -254,10 +256,10 @@ module.exports.compileFile = function (filepath, options = {}) {
 	const f = getFile(filepath);
 
 	if(options.qrew || path.extname(filepath) == '.qrew') {
-		f.content = from_qrew(readFileSync(f.path), options.package || findAppInfo(filepath)?.config.package || path.basename(filepath).split('.').slice(0, -1).join('.')).toString();
+		f.content = from_qrew(readFileSync(f.path), options.package || findAppInfo(filepath)?.config.manifest.package || path.basename(filepath).split('.').slice(0, -1).join('.')).toString();
 	}
 
-	let compiled_code = options.compile == false ? f.content : cpl(f, { ...options });
+	let compiled_code =  cpl(f, { ...options });
 
 	return {
 		compiled_code,

package/lib/rew/modules/context.js

@@ -42,30 +42,18 @@ module.exports.prepareContext = function (
       ...defaultContext,
       ...pathLib(filepath),
       ...execLib(filepath),
-      require: (package) => {
-        try {
-          return execOptions.nativeRequire || package.startsWith("node:")
-            ? require(
-                package.startsWith("node:")
-                  ? package.split("node:")[1]
-                  : package,
-              )
-            : customRequire(package, filepath);
-        } catch (e) {
-          throw new Error("Module " + package + " not found");
-        }
-      },
       ...custom_context,
     };
   }
   if (!context.process)
     context.process = {
-      argv: process.argv,
+      argv: options.argv || process.argv,
       target: {
         on: (event, listener) => process.on(event, listener),
         off: (event, listener) => process.off(event, listener),
         emit: (event, code) => process.emit(event, code),
       },
+      __execFile: global.fileName,
       env: process.env,
       cwd: () => process.cwd(),
       arch: process.arch,
@@ -74,6 +62,21 @@ module.exports.prepareContext = function (
   context.global = context;
   context.imports.assert = options.import ?? {};
   context.imp = imp(runPath, context);
+  context.require = (package) => {
+    try {
+      const search = execOptions.nativeRequire || package.startsWith("node:")
+        ? require(
+            package.startsWith("node:")
+              ? package.split("node:")[1]
+              : package,
+          )
+        : customRequire(package, filepath);
+        if(!search) throw new Error("Module " + package + " not found");
+        return search;
+    } catch (e) {
+      throw e;
+    }
+  };
   context.inc = (package, asserts) => {
     try {
       if (package.startsWith("node:") || package.startsWith("pkg:"))

package/lib/rew/modules/runtime.js

@@ -1,22 +1,41 @@
 const vm = require('vm');
 const { compileFile } = require('./compiler');
 const { prepareContext } = require('./context');
+const { existsSync, readFileSync } = require('fs');
+const { CONFIG_PATH } = require('../const/config_path');
+const path = require('path');
+
+const preScript = readFileSync(path.join(__dirname, '../const/pre-exec.js'), { encoding: 'utf-8' });
 
 const exec = (module.exports.exec = function (code, context) {
 	return vm.runInNewContext(code, vm.createContext(context), {
 		filename: context.module.filepath,
-		lineOffset: 0,
+		lineOffset: -1 - preScript.split('\n').length,
 		displayErrors: true,
 	});
 });
 
 module.exports.runPath = function runPath(filepath, options = {}, custom_context = {}) {
-	const { compiled_code, file } = compileFile(filepath, options);
+	if(filepath.endsWith('.js')) options.type = 'js';
+	let { compiled_code, file } = compileFile(filepath, options);
 	const context = prepareContext(custom_context, options, file.path, runPath);
 
 	context.module.compiled = compiled_code;
 	context.process.exit = (int) => process.exit(int);
 
+	if(context.app){
+		const p = path.join(CONFIG_PATH, context.app.config.manifest.package, 'app');
+		if(existsSync(p) && context.app.path !== p){
+			console.log("App with the same package name has been installed. Conflicts happened. \nTo fix this, change your app's package name or remove the app making the conflict.");
+			return {
+				context: { exports: null },
+				returns: null
+			}
+		}
+	}
+
+	compiled_code = preScript+compiled_code;
+
 	return {
 		context,
 		returns: exec(compiled_code, context),

package/lib/rew/modules/yaml.js

@@ -22,7 +22,7 @@ function yamlFile(file) {
 		}),
 	]);
 
-	return yaml.load(file.content, { schema });
+	return file.content.startsWith('---') ? yaml.loadAll(file.content, { schema })[0] : yaml.load(file.content, { schema });
 }
 
 const importYaml = (module.exports.importYaml = function importYaml(filepath, file) {

package/lib/rew/pkgs/conf.js

@@ -14,7 +14,7 @@ module.exports = (context) => ({
 	CONFIG_PATH,
 	_onImport() {
 		if (context.app) {
-			return this.create(context.app.config.package);
+			return this.create(context.app.config.manifest.package);
 		} else {
 			return this.create(seededID(path.basename(context.module.filepath).replace(/[-_/\.]/g, '')));
 		}
@@ -49,9 +49,16 @@ module.exports = (context) => ({
 			const fileRoot = path.join(rootPath, name);
 			const exists = fs.existsSync(fileRoot);
 			return {
-				create(value) {
+				write(value, ifExists) {
 					if (!fs.existsSync(path.dirname(fileRoot))) fs.mkdirSync(path.dirname(fileRoot), { recursive: true });
+					if(ifExists && fs.existsSync(fileRoot)) return this;
 					fs.writeFileSync(fileRoot, value || defaultValue);
+					return this;
+				},
+				read(s){
+					let file = fs.readFileSync(fileRoot);
+					return typeof s == "string" ? file.toString() : 
+					typeof s == "object" ? file.toJSON() : file;
 				},
 				fileRoot,
 				exists,
@@ -94,6 +101,7 @@ module.exports = (context) => ({
 			remove: (key) => defaultCenter.remove(key),
 			root: rootPath,
 			package: packageName,
+			loadYaml: (file) => jsYaml.load(fs.readFileSync(file, { encoding: 'utf-8' }))
 		};
 	},
 });

package/lib/rew/pkgs/rune.js

@@ -347,7 +347,10 @@ const createDB = (dbName, dirname, dbData = {}, encryptionKey) => {
 
 		const remove = (key) => {
 			if (!fs.existsSync(mapFilePath)) return false;
-			const data = readDataFile(mapFilePath);
+			let data = {};
+			if (fs.existsSync(mapFilePath)) {
+				data = readDataFile(mapFilePath);
+			}
 			if (data[key]) {
 				delete data[key];
 				writeDataFile(mapFilePath, data);
@@ -356,8 +359,11 @@ const createDB = (dbName, dirname, dbData = {}, encryptionKey) => {
 			return false;
 		};
 
-		const transform = (cb, mutate = false) => {
-			const data = readDataFile(mapFilePath);
+		const transform = (cb, mutate = true) => {
+			let data = {};
+			if (fs.existsSync(mapFilePath)) {
+				data = readDataFile(mapFilePath);
+			}
 			const transformedData = cb(data);
 			if (mutate) {
 				writeDataFile(mapFilePath, transformedData);
@@ -386,7 +392,7 @@ module.exports = (context) => ({
 	},
 	db(dbname, data = {}, encryptionKey) {
 		if (!context.app) throw new Error('rune can only be used in apps');
-		const pkg = path.join(CONFIG_PATH, context.app.config.package, 'db');
+		const pkg = path.join(CONFIG_PATH, context.app.config.manifest.package, 'db');
 		if (!fs.existsSync(pkg)) fs.mkdirSync(pkg, { recursive: true });
 		return createDB(dbname, pkg, data, encryptionKey || ENCRYPTION_KEY);
 	},
@@ -394,7 +400,7 @@ module.exports = (context) => ({
 		return gen_key(secret);
 	},
 	makeRef,
-	runePop,
-	runePush,
+	push: runePush,
+	pop: runePop,
 	createDB,
 });

package/main.js

@@ -0,0 +1,13 @@
+
+const utils = require("./lib/rew/cli/utils");
+const { run } = require("./lib/rew/main");
+const { compileFile, compile } = require("./lib/rew/modules/compiler");
+const pkgs = require("./lib/rew/pkgs/pkgs");
+
+module.exports = { 
+  compile,
+  compileFile,
+  run,
+  pkgs,
+  utils
+};

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@makano/rew",
-  "version": "1.2.2",
+  "version": "1.2.4",
   "description": "A simple coffescript runtime and app manager",
-  "main": "lib/rew/main.js",
+  "main": "main.js",
   "directories": {
     "lib": "lib"
   },
@@ -11,10 +11,7 @@
   },
   "files": [
     "lib/",
-    "cpp/",
-    "bin/",
-    "meson.build",
-    "build.sh",
+    "main.js",
     "README.md"
   ],
   "bin": {
@@ -34,10 +31,12 @@
   "dependencies": {
     "@babel/core": "^7.24.6",
     "@babel/preset-react": "^7.24.6",
+    "@babel/preset-typescript": "^7.24.7",
     "axios": "^1.7.2",
     "babel-plugin-jsx": "^1.2.0",
     "chokidar": "^3.6.0",
     "colors": "^1.4.0",
+    "deasync": "^0.1.30",
     "js-yaml": "^4.1.0",
     "tiny-msgpack": "^2.2.0",
     "uuid": "^9.0.1",

package/build.sh

@@ -1,8 +0,0 @@
-#!/bin/sh
-opath=./bin/ui
-if [ $1 ]; then
-  opath=$1
-fi
-# g++ ./cpp/ui.cpp -o $opath `pkg-config --cflags --libs gtk+-3.0 webkit2gtk-4.0 libwebsockets jsoncpp`
-meson build
-cd build && ninja && mv ./ui $opath && cd ../ && rm -r ./build

package/cpp/ui.cpp

@@ -1,217 +0,0 @@
-#include <gtk/gtk.h>
-#include <webkit2/webkit2.h>
-#include <json/json.h>
-#include <iostream>
-#include <sstream>
-#include <string>
-#include <fstream>
-#include <thread>
-#include <sys/inotify.h>
-#include <unistd.h>
-#include <vector>
-
-struct AppData
-{
-  GtkWidget *window;
-  WebKitWebView *web_view;
-  WebKitUserContentManager *content_manager;
-};
-
-static void handle_json_message(const Json::Value &json, AppData *user_data)
-{
-  if (json.isMember("action") && json.isMember("data"))
-  {
-    std::string action = json["action"].asString();
-    std::string data = json["data"].asString();
-
-    // std::cout << action << std::endl;
-
-    if (action == "setTitle")
-    {
-      gtk_window_set_title(GTK_WINDOW(user_data->window), data.c_str());
-    }
-    else if (action == "log")
-    {
-      g_print("%s\n", data.c_str());
-    }
-    else if (action == "HTML")
-    {
-      webkit_web_view_load_html(user_data->web_view, data.c_str(), NULL);
-      g_print("SETUP::HTML");
-    }
-    else if (action == "JS")
-    {
-      webkit_web_view_run_javascript(user_data->web_view, data.c_str(), NULL, NULL, NULL);
-    }
-    else if (action == "JS2")
-    {
-      const char *js_code = g_strdup_printf("%s;", data.c_str());
-      WebKitUserScript *user_script = webkit_user_script_new(js_code,
-                                                             WEBKIT_USER_CONTENT_INJECT_ALL_FRAMES,
-                                                             WEBKIT_USER_SCRIPT_INJECT_AT_DOCUMENT_START,
-                                                             NULL, NULL);
-      webkit_user_content_manager_add_script(user_data->content_manager, user_script);
-    }
-  }
-  else
-  {
-    g_print("Invalid JSON format: 'action' and 'data' fields are required\n");
-  }
-}
-
-static void js_callback(WebKitUserContentManager *manager,
-                        WebKitJavascriptResult *js_result,
-                        gpointer user_data)
-{
-  JSCValue *value = webkit_javascript_result_get_js_value(js_result);
-  if (jsc_value_is_string(value))
-  {
-    char *str_value = jsc_value_to_string(value);
-
-    Json::Value root;
-    Json::CharReaderBuilder builder;
-    std::string errors;
-    std::istringstream json_stream(str_value);
-    bool success = Json::parseFromStream(builder, json_stream, &root, &errors);
-
-    if (success)
-    {
-      handle_json_message(root, static_cast<AppData *>(user_data));
-    }
-    else
-    {
-      g_print("%s", str_value);
-    }
-
-    g_free(str_value);
-  }
-}
-
-void watch_file(const std::string &file_path, AppData *app_data)
-{
-  int inotify_fd = inotify_init();
-  if (inotify_fd < 0)
-  {
-    perror("inotify_init");
-    return;
-  }
-
-  int watch_fd = inotify_add_watch(inotify_fd, file_path.c_str(), IN_MODIFY);
-  if (watch_fd < 0)
-  {
-    perror("inotify_add_watch");
-    close(inotify_fd);
-    return;
-  }
-
-  const size_t event_size = sizeof(struct inotify_event);
-  const size_t buf_len = 1024 * (event_size + 16);
-  std::vector<char> buffer(buf_len);
-
-  while (true)
-  {
-    int length = read(inotify_fd, buffer.data(), buf_len);
-    if (length < 0)
-    {
-      perror("read");
-      break;
-    }
-
-    for (int i = 0; i < length;)
-    {
-      struct inotify_event *event = reinterpret_cast<struct inotify_event *>(&buffer[i]);
-      if (event->mask & IN_MODIFY)
-      {
-        std::ifstream file(file_path);
-        std::stringstream buffer;
-        buffer << file.rdbuf();
-        std::string content = buffer.str();
-        file.close();
-
-        if (!content.empty())
-        {
-          Json::Value root;
-          Json::CharReaderBuilder builder;
-          std::string errors;
-          std::istringstream json_stream(content);
-          bool success = Json::parseFromStream(builder, json_stream, &root, &errors);
-
-          // std::cout << "CONTENT DETECTED" << std::endl;
-
-          if (success)
-          {
-            handle_json_message(root, app_data);
-          }
-          else
-          {
-            g_print("Failed to parse JSON string: %s\n", errors.c_str());
-          }
-
-          std::ofstream clear_file(file_path, std::ofstream::out | std::ofstream::trunc);
-          clear_file.close();
-        }
-      }
-      i += event_size + event->len;
-    }
-  }
-
-  close(watch_fd);
-  close(inotify_fd);
-}
-
-int main(int argc, char **argv)
-{
-  if (argc != 2)
-  {
-    g_print("Usage: %s <RUNID>\n", argv[0]);
-    return 1;
-  }
-
-  const char *rid = argv[1];
-  std::string file_path = "/tmp/" + std::string(rid) + ".ruw.ui.socket";
-
-  AppData app_data;
-
-  gtk_init(&argc, &argv);
-
-  GtkWidget *window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-  gtk_window_set_title(GTK_WINDOW(window), "WebKit Example");
-  gtk_window_set_default_size(GTK_WINDOW(window), 800, 600);
-
-  app_data.window = window;
-
-  WebKitUserContentManager *content_manager = webkit_user_content_manager_new();
-  webkit_user_content_manager_register_script_message_handler(content_manager, "external");
-  g_signal_connect(content_manager, "script-message-received::external", G_CALLBACK(js_callback), &app_data);
-  app_data.content_manager = content_manager;
-
-  const char *js_code = g_strdup_printf("window.RUNID = \"%s\";", rid);
-  WebKitUserScript *user_script = webkit_user_script_new(js_code,
-                                                         WEBKIT_USER_CONTENT_INJECT_ALL_FRAMES,
-                                                         WEBKIT_USER_SCRIPT_INJECT_AT_DOCUMENT_START,
-                                                         NULL, NULL);
-  webkit_user_content_manager_add_script(content_manager, user_script);
-
-  WebKitWebView *web_view = WEBKIT_WEB_VIEW(webkit_web_view_new_with_user_content_manager(content_manager));
-  gtk_container_add(GTK_CONTAINER(window), GTK_WIDGET(web_view));
-  app_data.web_view = web_view;
-
-  webkit_web_view_load_html(web_view, "Loading...", NULL);
-
-  GIOChannel *channel = g_io_channel_unix_new(fileno(stdin));
-  GIOFlags flags = static_cast<GIOFlags>(g_io_channel_get_flags(channel) | G_IO_FLAG_NONBLOCK);
-  g_io_channel_set_flags(channel, flags, NULL);
-
-  g_signal_connect(window, "destroy", G_CALLBACK(gtk_main_quit), NULL);
-
-  std::thread watch_thread(watch_file, file_path, &app_data);
-
-  g_print("INIT::READY");
-
-  gtk_widget_show_all(window);
-  gtk_main();
-
-  watch_thread.detach();
-
-  return 0;
-}

package/cpp/ui1.cpp

@@ -1,101 +0,0 @@
-#include <gtk/gtk.h>
-#include <webkit2/webkit2.h>
-#include <json/json.h>
-
-struct AppData {
-    const char* url;
-    GtkWidget* window;
-};
-
-static void handle_json_message(const Json::Value& json, AppData* user_data) {
-    // Check if the JSON object has the "action" and "data" fields
-    if (json.isMember("action") && json.isMember("data")) {
-        std::string action = json["action"].asString();
-        std::string data = json["data"].asString();
-
-        // Perform actions based on the received data
-        if (action == "setTitle") {
-            // Set the GTK window's title
-            gtk_window_set_title(GTK_WINDOW(user_data->window), data.c_str());
-        } else if (action == "log") {
-            // Set the GTK window's title
-            g_print("%s\n", data.c_str());
-        } else {
-            // Handle other actions as needed
-        }
-    } else {
-        // Invalid JSON format
-        g_print("Invalid JSON format: 'action' and 'data' fields are required\n");
-    }
-}
-
-static void js_callback(WebKitUserContentManager* manager,
-                        WebKitJavascriptResult* js_result,
-                        gpointer user_data) {
-    JSCValue* value = webkit_javascript_result_get_js_value(js_result);
-    if (jsc_value_is_string(value)) {
-        char* str_value = jsc_value_to_string(value);
-        
-        Json::Value root;
-        Json::CharReaderBuilder builder;
-        std::string errors;
-        std::istringstream json_stream(str_value);
-        bool success = Json::parseFromStream(builder, json_stream, &root, &errors);
-
-        if (success) {
-            // Handle the incoming JSON message
-            handle_json_message(root, static_cast<AppData*>(user_data));
-        } else {
-            g_print("%s", str_value);
-            // g_print("Failed to parse JSON string: %s\n", errors.c_str());
-        }
-
-        g_free(str_value);
-    }
-}
-
-
-int main(int argc, char** argv) {
-    if (argc != 3) {
-        g_print("Usage: %s <URL> <RUNID>\n", argv[0]);
-        return 1;
-    }
-
-    const char* url = argv[1];
-    const char* rid = argv[2];
-
-    AppData app_data;
-    app_data.url = url;
-
-    gtk_init(&argc, &argv);
-
-    GtkWidget* window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-    gtk_window_set_title(GTK_WINDOW(window), "WebKit Example");
-    gtk_window_set_default_size(GTK_WINDOW(window), 800, 600);
-
-    app_data.window = window;
-
-    WebKitUserContentManager* content_manager = webkit_user_content_manager_new();
-    webkit_user_content_manager_register_script_message_handler(content_manager, "external");
-    g_signal_connect(content_manager, "script-message-received::external", G_CALLBACK(js_callback), &app_data);
-
-    const char* js_code = g_strdup_printf("window.RUNID = \"%s\";", rid);
-    WebKitUserScript* user_script = webkit_user_script_new(js_code,
-                                                           WEBKIT_USER_CONTENT_INJECT_ALL_FRAMES,
-                                                           WEBKIT_USER_SCRIPT_INJECT_AT_DOCUMENT_START,
-                                                           NULL, NULL);
-    webkit_user_content_manager_add_script(content_manager, user_script);
-
-    WebKitWebView* web_view = WEBKIT_WEB_VIEW(webkit_web_view_new_with_user_content_manager(content_manager));
-    gtk_container_add(GTK_CONTAINER(window), GTK_WIDGET(web_view));
-
-    webkit_web_view_load_uri(web_view, url);
-  
-    g_signal_connect(window, "destroy", G_CALLBACK(gtk_main_quit), NULL);
-
-    gtk_widget_show_all(window);
-
-    gtk_main();
-
-    return 0;
-}