npm - @makano/rew - Versions diffs - 1.2.21 → 1.2.32 - Mend

@makano/rew 1.2.21 → 1.2.32

Files changed (33) hide show

package/README.md +3 -0
package/bin/rew +1 -8
package/lib/rew/cli/cli.js +51 -51
package/lib/rew/cli/run.js +4 -11
package/lib/rew/cli/utils.js +154 -61
package/lib/rew/const/default.js +6 -1
package/lib/rew/const/files.js +3 -9
package/lib/rew/const/pre-exec.js +3 -0
package/lib/rew/functions/import.js +4 -3
package/lib/rew/functions/misc.js +5 -0
package/lib/rew/functions/require.js +0 -2
package/lib/rew/functions/sleep.js +1 -1
package/lib/rew/functions/stdout.js +7 -4
package/lib/rew/functions/wait.js +11 -0
package/lib/rew/modules/compiler.js +9 -7
package/lib/rew/modules/context.js +16 -14
package/lib/rew/modules/runtime.js +21 -2
package/lib/rew/pkgs/rune.js +10 -4
package/main.js +13 -0
package/package.json +5 -6
package/bin/ui +0 -0
package/bin/ui_ws +0 -0
package/bin/webkit_app +0 -0
package/build.sh +0 -8
package/cpp/ui.cpp +0 -217
package/cpp/ui1.cpp +0 -101
package/cpp/ui2.cpp +0 -105
package/lib/rew/css/theme.css +0 -3
package/lib/rew/html/ui.html +0 -18
package/lib/rew/html/ui.js +0 -245
package/lib/rew/pkgs/modules/ui/classes.js +0 -184
package/lib/rew/pkgs/ui.js +0 -157
package/meson.build +0 -13

package/cpp/ui2.cpp DELETED Viewed

@@ -1,105 +0,0 @@
-#include <gtk/gtk.h>
-#include <libwebsockets.h>
-#include <json/json.h>
-#include <iostream>
-#include <string>
-#include <map>
-std::map<std::string, GtkWidget *> widgets;
-static void on_button_clicked(GtkWidget *widget, gpointer data)
-{
-  // Send event back to Node.js server
-  std::string id = static_cast<char *>(data);
-  std::string message = "{\"event\": \"buttonClicked\", \"id\": \"" + id + "\"}";
-  lws_write(static_cast<lws *>(data), (unsigned char *)message.c_str(), message.length(), LWS_WRITE_TEXT);
-}
-static int callback_websocket(struct lws *wsi, enum lws_callback_reasons reason, void *user, void *in, size_t len)
-{
-  switch (reason)
-  {
-  case LWS_CALLBACK_CLIENT_ESTABLISHED:
-    std::cout << "Connected to server" << std::endl;
-    break;
-  case LWS_CALLBACK_CLIENT_RECEIVE:
-  {
-    std::string message(static_cast<char *>(in), len);
-    Json::CharReaderBuilder rbuilder;
-    Json::Value root;
-    std::string errors;
-    std::istringstream s(message);
-    std::string doc;
-    std::getline(s, doc);
-    std::istringstream ss(doc);
-    if (Json::parseFromStream(rbuilder, ss, &root, &errors))
-    {
-      std::string action = root["action"].asString();
-      if (action == "createButton")
-      {
-        GtkWidget *button = gtk_button_new_with_label(root["label"].asString().c_str());
-        g_signal_connect(button, "clicked", G_CALLBACK(on_button_clicked), strdup(root["id"].asString().c_str()));
-        widgets[root["id"].asString()] = button;
-        gtk_container_add(GTK_CONTAINER(gtk_window_new(GTK_WINDOW_TOPLEVEL)), button);
-        gtk_widget_show_all(button);
-      }
-    }
-    break;
-  }
-  case LWS_CALLBACK_CLIENT_CLOSED:
-    std::cout << "Disconnected from server" << std::endl;
-    break;
-  default:
-    break;
-  }
-  return 0;
-}
-static const struct lws_protocols protocols[] = {
-    {
-        "example-protocol",
-        callback_websocket,
-        0,
-        1024,
-    },
-    {NULL, NULL, 0, 0}};
-int main(int argc, char **argv)
-{
-  std::cout << "Starting" << std::endl;
-  if (argc != 2)
-  {
-    std::cerr << "Usage: " << argv[0] << " <WebSocket server URI>" << std::endl;
-    return 1;
-  }
-  gtk_init(&argc, &argv);
-  struct lws_context_creation_info info;
-  memset(&info, 0, sizeof info);
-  info.port = CONTEXT_PORT_NO_LISTEN;
-  info.protocols = protocols;
-  struct lws_context *context = lws_create_context(&info);
-  struct lws_client_connect_info ccinfo = {0};
-  ccinfo.context = context;
-  ccinfo.address = argv[1];
-  ccinfo.port = 8080;
-  ccinfo.path = "/";
-  ccinfo.host = lws_canonical_hostname(context);
-  ccinfo.origin = "origin";
-  ccinfo.protocol = protocols[0].name;
-  struct lws *wsi = lws_client_connect_via_info(&ccinfo);
-  while (lws_service(context, 1000) >= 0)
-  {
-    gtk_main_iteration_do(false);
-  }
-  lws_context_destroy(context);
-  return 0;
-}

package/lib/rew/css/theme.css DELETED Viewed

@@ -1,3 +0,0 @@
-body {
-	background-color: #1c2541;
-}

package/lib/rew/html/ui.html DELETED Viewed

@@ -1,18 +0,0 @@
-<!doctype html>
-<html lang="en">
-	<head>
-		<meta charset="UTF-8" />
-		<meta name="viewport" content="width=device-width, initial-scale=1.0" />
-		<title>$OPTIONS(title)</title>
-		<style>
-			/* $OPTIONS(style) */
-		</style>
-		<script>
-			window.onerror = () => alert('ERror');
-		</script>
-	</head>
-	<body></body>
-</html>

package/lib/rew/html/ui.js DELETED Viewed

@@ -1,245 +0,0 @@
-try {
-	window.execContext = $OPTIONS(json.execContext);
-} catch (e) {
-	window.execContext = {};
-}
-try {
-	window.exec = $OPTIONS(exec);
-} catch (e) {
-	window.exec = function () {};
-}
-const DOM = [];
-const findInDom = (id) => DOM.find((el) => el.widgetOptions.uuid == id) || DOM.find((el) => el.id == id);
-const parseStyleValue = (val) => val;
-const addTo = (el, parent) => {
-	if (parent == 'null') {
-		document.body.appendChild(el);
-	} else {
-		findInDom(parent).appendChild(el);
-	}
-};
-const initElement = (el, options, update = false) => {
-	if (el.widgetOptions) {
-		if (el.widgetOptions.style) {
-			for (let i in options.style) {
-				el.style.removeProperty(i, el.widgetOptions.style[i]);
-			}
-		}
-		if (el.widgetOptions.attr) {
-			for (let i in el.widgetOptions.attr) {
-				el.removeAttribute(i);
-			}
-		}
-	}
-	el.widgetOptions = options;
-	el.id = options.id;
-	el.textContent = options.data.text;
-	if (options.style) {
-		for (let i in options.style) {
-			el.style.setProperty(i, options.style[i]);
-		}
-	}
-	if (options.attr) {
-		for (let i in options.attr) {
-			el.setAttribute(i, options.attr[i]);
-		}
-	}
-	if (options.children.length) {
-		options.children.forEach((option) => {
-			option.parent = options.uuid;
-			if (update) updateElement(findInDom(option.uuid), option);
-			else createElement(option);
-		});
-	}
-	if (options.parent) {
-		addTo(el, options.parent);
-	}
-};
-const updateElement = (el, options) => {
-	if (!el) return;
-	initElement(el, options, true);
-	return el;
-};
-const events = [
-	'click',
-	'dblclick',
-	'mousedown',
-	'mouseup',
-	'mouseover',
-	'mouseout',
-	'mousemove',
-	'mouseenter',
-	'mouseleave',
-	'keydown',
-	'keypress',
-	'keyup',
-	'change',
-	'input',
-	'submit',
-	'focus',
-	'blur',
-	'copy',
-	'cut',
-	'paste',
-	'scroll',
-	'wheel',
-	'resize',
-	'contextmenu',
-	'drag',
-	'dragstart',
-	'dragend',
-	'dragenter',
-	'dragleave',
-	'dragover',
-	'drop',
-	'error',
-	'load',
-	'abort',
-];
-const handleListeners = (el) => {
-	events.forEach((event) => {
-		el.addEventListener(event, (e) => {
-			sendData({
-				action: 'hook:eventTrigger',
-				data: {
-					rid: 'event_trigger',
-					object: {
-						uuid: el.widgetOptions.uuid,
-						event,
-						data: {
-							mouse: { x: e.clientX, y: e.clientY },
-							key: { code: e.keyCode, key: e.key },
-						},
-					},
-				},
-			});
-		});
-	});
-};
-function eventHandlerFunction({ uuid, hookID, event }) {
-	return function (e) {
-		sendData({
-			action: 'hook:event_' + event,
-			data: {
-				rid: hookID,
-				object: {
-					uuid,
-					event,
-					data: {
-						mouse: { x: e.clientX, y: e.clientY },
-						key: { code: e.keyCode, key: e.key },
-					},
-				},
-			},
-		});
-	};
-}
-const createElement = (options) => {
-	const el = document.createElement(options.element);
-	DOM.push(el);
-	initElement(el, options);
-	return el;
-};
-const stringifyJSON = (json) => {
-	try {
-		return JSON.stringify(json, null, 4);
-	} catch (e) {
-		return json.toString();
-	}
-};
-const log = (...strings) => {
-	window.webkit.messageHandlers.external.postMessage(
-		JSON.stringify(
-			{
-				action: 'log',
-				data: strings
-					.map((r) => (typeof r == 'object' ? stringifyJSON(r) : `${r.toString()}`))
-					// .map((i) => i.replace(/\"/g, '\\\\"').replace(/\n/g, "\\\\n"))
-					.join('\n'),
-			},
-			null,
-			4,
-		),
-	);
-};
-const sendData = (data) => {
-	log('RESPONSE::' + stringifyJSON(data));
-};
-function process_data(data) {
-	return JSON.parse(data);
-}
-window.recieveMessage = (data) => {
-	const edata = data;
-	if (edata.action == 'eventListen') {
-		const el = findInDom(edata.data.uuid);
-		if (el) {
-			el.addEventListener(edata.data.event, eventHandlerFunction(edata.data));
-		}
-	} else if (edata.action == 'createElement') {
-		const options = edata.data;
-		try {
-			createElement(options);
-		} catch (e) {
-			log(e.toString());
-		}
-	} else if (edata.action == 'addStyleSheet') {
-		const style = document.createElement('style');
-		style.textContent = edata.data;
-		document.head.appendChild(style);
-	} else if (edata.action == 'updateElement') {
-		const options = edata.data;
-		try {
-			updateElement(findInDom(options.uuid), options);
-		} catch (e) {
-			log(e.toString());
-		}
-	} else if (edata.action == 'findElement') {
-		const id = edata.data.id;
-		const rid = edata.data.rid;
-		try {
-			sendData({
-				action: 'hook:findElement',
-				data: { rid, object: findInDom(id)?.widgetOptions },
-			});
-		} catch (e) {
-			log(e.toString());
-		}
-	} else if (edata.action == 'message') {
-		window.dispatchEvent(
-			new CustomEvent('message', {
-				detail: edata.data,
-			}),
-		);
-	}
-};
-window.addEventListener('load', () => {
-	window.exec({
-		...window.execContext,
-		window,
-		log,
-		send: (data) => sendData({ action: 'message', data }),
-		onRecieve: (cb) => window.addEventListener('message', (e) => cb(e.detail || {})),
-	});
-	log('SETUP::READY');
-});

package/lib/rew/pkgs/modules/ui/classes.js DELETED Viewed

@@ -1,184 +0,0 @@
-const emitter = require('../../../functions/emitter');
-const { struct } = require('../../../models/struct');
-const { generateRandomID } = require('../../../functions/id');
-module.exports.uiClasses = (context, options, send, recieve, hook, rmHook) => {
-	const _sanitizeOptions = (options) => {
-		return {
-			...options,
-			children: options.children.map((i) => i.options),
-		};
-	};
-	const RemWidgetOptions = struct({
-		element: 'div',
-		class: '',
-		attr: {},
-		id: '',
-		data: {
-			text: '',
-		},
-		children: [],
-		uuid: '',
-		parent: '!any',
-		style: {},
-	});
-	const CreatedElements = [];
-	class RewWidget {
-		_emitter = emitter();
-		on(event, callback) {
-			const hookID = this.uuid + '_' + generateRandomID(4);
-			this._emitter.on(event, callback, { hookID });
-			hook(
-				hookID,
-				'event_' + event,
-				(data) => {
-					this.emit(event, data);
-				},
-				false,
-			);
-			send({ action: 'eventListen', data: { uuid: this.uuid, event, hookID } });
-			return this;
-		}
-		off(event, callback) {
-			this._emitter.off(event, callback, (e) => rmHook(e.hookID));
-			return this;
-		}
-		emit(event, callback) {
-			this._emitter.emit(event, callback);
-			return this;
-		}
-		options = RemWidgetOptions();
-		constructor(options = RemWidgetOptions()) {
-			const config = RemWidgetOptions(options);
-			config.uuid = generateRandomID();
-			this.options = config;
-			this.options.children.forEach((child) => (child.parent = this));
-			this.init();
-			CreatedElements.push(this);
-		}
-		init() {
-			send({ action: 'createElement', data: _sanitizeOptions(this.options) });
-		}
-		parent = null;
-		get uuid() {
-			return this.options.uuid;
-		}
-		get id() {
-			return this.options.id;
-		}
-		get children() {
-			return this.options.children;
-		}
-		find(id, recursive = true) {
-			let childFound = this.children.find((e) => e.id == id) || this.children.find((e) => e.uuid == id);
-			if (childFound) return childFound;
-			else if (!recursive) return null;
-			for (let child of this.children) {
-				let subchild = child.find(id);
-				if (subchild) {
-					return subchild;
-				}
-			}
-		}
-		update() {
-			send({ action: 'updateElement', data: _sanitizeOptions(this.options) });
-			return this;
-		}
-		text(text) {
-			this.options.data.text = text;
-			return this.update();
-		}
-		data(key, value) {
-			if (!value) return this.options.data[key];
-			this.options.data[key] = value;
-			return this.update();
-		}
-		attr(attr, reset = false) {
-			if (reset) this.options.attr = attr;
-			else this.options.attr = { ...this.options.attr, ...attr };
-			return this.update();
-		}
-		style(style, reset = false) {
-			if (reset) this.options.style = style;
-			else this.options.style = { ...this.options.style, ...style };
-			return this.update();
-		}
-		add(child) {
-			this.options.children.push(child);
-			return this.update();
-		}
-		remove(childId, recursive = true) {
-			const child = typeof childId == 'string' ? this.find(childId, recursive) : childId;
-			if (!child) return this;
-			if (recursive && child.parent !== this) {
-				child.parent.remove(child);
-			} else {
-				this.options.children.splice(this.options.children.indexOf(child), 1);
-				this.update();
-			}
-			return this;
-		}
-	}
-	class RewTextWidget extends RewWidget {
-		constructor(text = '', options = RemWidgetOptions({})) {
-			super({
-				...options,
-				data: { ...options.data, text },
-			});
-		}
-	}
-	class StyleSheet {
-		constructor(css = '') {
-			send({ action: 'addStyleSheet', data: css });
-		}
-	}
-	function findElement(id) {
-		return new Promise((r) => {
-			const rid = generateRandomID();
-			hook(rid, 'findElement', (data) => {
-				r(CreatedElements.find((e) => e.uuid == data.uuid) || data);
-			});
-			send({ action: 'findElement', data: { id, rid } });
-		});
-	}
-	// hook('event_trigger', 'eventTrigger', (data) => {
-	//   const el = CreatedElements.find(e => e.uuid = data.uuid);
-	//   if(el){
-	//     el.emit(data.event, data.data);
-	//   }
-	// }, false);
-	const Transmitter = {
-		send: (data) => send({ action: 'message', data }),
-		recieve: (cb) => recieve((data) => cb(data.data)),
-	};
-	return {
-		Widget: RewWidget,
-		Text: RewTextWidget,
-		WidgetOptions: RemWidgetOptions,
-		findElement,
-		StyleSheet: StyleSheet,
-		Transmitter,
-	};
-};

package/lib/rew/pkgs/ui.js DELETED Viewed

@@ -1,157 +0,0 @@
-const path = require('path');
-const { spawn, exec } = require('child_process');
-const fs = require('fs');
-const { uiClasses } = require('./modules/ui/classes');
-const { generateRandomID } = require('../functions/id');
-const { THEME_PATH } = require('../const/files');
-const readline = require('readline');
-const emitter = require('../functions/emitter');
-const BIN_PATH = path.resolve(__dirname, '../../../bin/ui');
-const HTML_STRING = fs.readFileSync(path.resolve(__dirname, '../html/ui.html'), { encoding: 'utf-8' });
-const JS_STRING = fs.readFileSync(path.resolve(__dirname, '../html/ui.js'), {
-	encoding: 'utf-8',
-});
-const replaceString = (string, options) =>
-	string.replace(/\$OPTIONS\(([^)]+)\)/g, (_, n) =>
-		n.startsWith('json.') ? JSON.stringify(options[n.split('json.')[1]] || '{}') : options[n] || _,
-	);
-const defaultOptions = {
-	title: 'Title',
-	onExit: () => process.exit(),
-	style: '',
-	stylePath: THEME_PATH,
-	exec: () => {},
-	execContext: {},
-};
-module.exports = (context) => ({
-	start: (o = {}) => {
-		const options = {
-			...defaultOptions,
-			...o,
-		};
-		const hookedSocketListeners = {};
-		const runId = generateRandomID();
-		const tmpFile = '/tmp/' + runId + '.ruw.ui.socket';
-		options.runId = runId;
-		if (fs.existsSync(options.stylePath)) options.style = fs.readFileSync(options.stylePath, { encoding: 'utf-8' }) + '\n' + options.style;
-		options.style = ' */\n' + options.style + '\n/* ';
-		const HTML = replaceString(HTML_STRING, options);
-		const JS = replaceString(JS_STRING, options);
-		/**
-		 * Queue for future writes
-		 * @type {string[]}
-		 * */
-		const queue = [];
-		const send = (data) => {
-			const content = fs.readFileSync(tmpFile, { encoding: 'utf-8' });
-			if (content) {
-				queue.push(data);
-			} else {
-				fs.writeFileSync(tmpFile, typeof data !== 'string' ? JSON.stringify(data) : data);
-			}
-		};
-		const sendEvent = (data) => {
-			send({
-				action: 'JS',
-				data: `window.recieveMessage(${JSON.stringify(data)})`,
-			});
-		};
-		const g_emitter = emitter();
-		const recieve = (data) => {
-			g_emitter.emit('recieve', data);
-		};
-		const rl = readline.createInterface({
-			input: process.stdin,
-			output: process.stdout,
-		});
-		rl.question('', () => {});
-		fs.writeFileSync(tmpFile, '');
-		fs.watch(tmpFile, { encoding: 'utf-8' }).on('change', () => {
-			if (queue.length) {
-				send(queue.pop());
-			}
-		});
-		const p = spawn(options.bin || BIN_PATH, [runId]);
-		p.on('close', (code) => {
-			rl.close();
-			options.onExit(code);
-		});
-		process.on('beforeExit', () => {
-			p.kill();
-			fs.unlinkSync(tmpFile);
-		});
-		g_emitter.on('recieve', (edata) => {
-			if (edata.action.startsWith('hook:')) {
-				const hook = hookedSocketListeners[edata.data.rid];
-				const type = edata.action.split('hook:')[1];
-				if (hook && hook.type == type) {
-					hookedSocketListeners[edata.data.rid].cb(edata.data.object);
-					if (hook.once) delete hookedSocketListeners[edata.data.rid];
-				}
-			}
-		});
-		return new Promise((r) => {
-			p.stdout.on('data', (data) => {
-				if (data.toString().startsWith('RESPONSE::')) {
-					const d = data.toString().split('RESPONSE::')[1];
-					const jd = JSON.parse(d);
-					recieve(jd);
-				} else if (data.toString().trim().endsWith('SETUP::READY')) {
-					console.log('READY');
-					r(
-						uiClasses(
-							context,
-							options,
-							sendEvent,
-							(cb) => {
-								g_emitter.on('recieve', cb);
-							},
-							(rid, type, cb, once = true) => {
-								// Add hook
-								hookedSocketListeners[rid] = { type, cb, once };
-							},
-							(rid) => {
-								// Remove hook
-								delete hookedSocketListeners[rid];
-							},
-						),
-					);
-				} else if (data.toString().endsWith('SETUP::HTML')) {
-					send({ action: 'JS2', data: JS, isSetup: true });
-				} else if (data.toString() == 'INIT::READY') {
-					send({ action: 'HTML', data: HTML });
-				} else {
-					console.log(data.toString());
-				}
-			});
-			p.stderr.on('data', (data) => {
-				console.error(data.toString());
-			});
-		});
-	},
-});