@makano/rew 1.1.72 → 1.1.81

package/lib/rew/pkgs/threads.js

@@ -1,8 +1,8 @@
-const { Worker } = require('worker_threads');
-const emitter = require('../functions/emitter');
-const future = require('../functions/future');
-const { struct } = require('../models/struct');
-const path = require('path');
+const { Worker } = require("worker_threads");
+const emitter = require("../functions/emitter");
+const future = require("../functions/future");
+const { struct } = require("../models/struct");
+const path = require("path");
 
 module.exports = (context) => ({
   thread: (cb) => {
@@ -10,7 +10,7 @@ module.exports = (context) => ({
 
     const stopWorker = (worker) => {
       workers.splice(workers.indexOf(worker), 1);
-      worker.terminate()
+      worker.terminate();
     };
 
     const athread = {
@@ -19,53 +19,61 @@ module.exports = (context) => ({
         workers.forEach(stopWorker);
       },
       start: (context) => {
-        let dataResult = future(() => {}), listener = emitter();
-        const worker = new Worker(path.resolve(__dirname, './modules/threads/worker.js'), {
-          workerData: { context, cb: cb.toString() }
-        });
+        let dataResult = future(() => {}),
+          listener = emitter();
+        const worker = new Worker(
+          path.resolve(__dirname, "./modules/threads/worker.js"),
+          {
+            workerData: { context, cb: cb.toString() },
+          },
+        );
         workers.push(worker);
 
         const stop = () => stopWorker(worker);
 
-        worker.on('message', (data) => {
-          if (data.type === 'result') {
+        worker.on("message", (data) => {
+          if (data.type === "result") {
             dataResult.resolve(data.result);
             stop();
-          } else if (data.type === 'error') {
+          } else if (data.type === "error") {
             reject(new Error(data.error));
             stop();
-          } else if (data.type === 'event') {
+          } else if (data.type === "event") {
             listener.emit(data.event, data.data);
           }
         });
 
-        worker.on('error', (error) => {
+        worker.on("error", (error) => {
           console.log(error);
           stop();
         });
 
         let exiting = false;
 
-        worker.on('exit', (code) => {
-          if(exiting) return;
+        worker.on("exit", (code) => {
+          if (exiting) return;
           stop();
           if (code !== 0) {
             throw new Error(`Worker stopped with exit code ${code}`);
           }
         });
 
-        worker.postMessage({ type: 'start' });
+        worker.postMessage({ type: "start" });
 
         return {
           on: (e, cb) => listener.on(e, cb),
           off: (e, cb) => listener.off(e, cb),
-          emit: (e, data) => worker?.postMessage({ type: 'event', event: e, data }),
+          emit: (e, data) =>
+            worker?.postMessage({ type: "event", event: e, data }),
           get: () => dataResult.wait(),
-          stop: () => { exiting = true; stop(); }
+          stop: () => {
+            exiting = true;
+            stop();
+          },
         };
-      }
+      },
     };
 
     return athread;
-  }
+  },
 });

package/lib/rew/pkgs/ui.js

@@ -4,7 +4,7 @@ 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 readline = require("readline");
 const emitter = require("../functions/emitter");
 
 const BIN_PATH = path.resolve(__dirname, "../../../bin/ui");
@@ -12,27 +12,31 @@ 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 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 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: '',
+  style: "",
   stylePath: THEME_PATH,
-  exec: () => { },
-  execContext: {}
+  exec: () => {},
+  execContext: {},
 };
 
 module.exports = (context) => ({
   start: (o = {}) => {
     const options = {
       ...defaultOptions,
-      ...o
+      ...o,
     };
 
     const hookedSocketListeners = {};
@@ -42,9 +46,13 @@ module.exports = (context) => ({
 
     options.runId = runId;
 
-    if (fs.existsSync(options.stylePath)) options.style = fs.readFileSync(options.stylePath, { encoding: 'utf-8' }) + '\n' + options.style;
+    if (fs.existsSync(options.stylePath))
+      options.style =
+        fs.readFileSync(options.stylePath, { encoding: "utf-8" }) +
+        "\n" +
+        options.style;
 
-    options.style = ' */\n' + options.style + '\n/* ';
+    options.style = " */\n" + options.style + "\n/* ";
 
     const HTML = replaceString(HTML_STRING, options);
     const JS = replaceString(JS_STRING, options);
@@ -56,39 +64,44 @@ module.exports = (context) => ({
     const queue = [];
 
     const send = (data) => {
-      const content = fs.readFileSync(tmpFile, { encoding: 'utf-8' });
+      const content = fs.readFileSync(tmpFile, { encoding: "utf-8" });
       if (content) {
         queue.push(data);
       } else {
-        fs.writeFileSync(tmpFile, typeof data !== "string" ? JSON.stringify(data) : data);
+        fs.writeFileSync(
+          tmpFile,
+          typeof data !== "string" ? JSON.stringify(data) : data,
+        );
       }
-    }
+    };
 
     const sendEvent = (data) => {
-      send({ action: 'JS', data: `window.recieveMessage(${JSON.stringify(data)})` })
-    }
+      send({
+        action: "JS",
+        data: `window.recieveMessage(${JSON.stringify(data)})`,
+      });
+    };
 
     const g_emitter = emitter();
 
     const recieve = (data) => {
-      g_emitter.emit('recieve', data);
-    }
+      g_emitter.emit("recieve", data);
+    };
 
     const rl = readline.createInterface({
       input: process.stdin,
-      output: process.stdout
+      output: process.stdout,
     });
 
-    rl.question('', () => { });
+    rl.question("", () => {});
 
-    fs.writeFileSync(tmpFile, '');
+    fs.writeFileSync(tmpFile, "");
 
-    fs.watch(tmpFile, { encoding: 'utf-8' })
-      .on('change', () => {
-        if (queue.length) {
-          send(queue.pop());
-        }
-      });
+    fs.watch(tmpFile, { encoding: "utf-8" }).on("change", () => {
+      if (queue.length) {
+        send(queue.pop());
+      }
+    });
 
     const p = spawn(options.bin || BIN_PATH, [runId]);
 
@@ -102,10 +115,10 @@ module.exports = (context) => ({
       fs.unlinkSync(tmpFile);
     });
 
-    g_emitter.on('recieve', (edata) => {
-      if (edata.action.startsWith('hook:')) {
+    g_emitter.on("recieve", (edata) => {
+      if (edata.action.startsWith("hook:")) {
         const hook = hookedSocketListeners[edata.data.rid];
-        const type = edata.action.split('hook:')[1];
+        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];
@@ -119,19 +132,30 @@ module.exports = (context) => ({
           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 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());
         }

package/meson.build

@@ -7,7 +7,7 @@ webkit2gtk = dependency('webkit2gtk-4.0', method : 'pkg-config')
 libwebsockets = dependency('libwebsockets', method : 'pkg-config')
 jsoncpp = dependency('jsoncpp', method : 'pkg-config')
 
-executable('rew',
+executable('ui',
            'cpp/ui.cpp',
            install : true,
            dependencies : [gtk3, webkit2gtk, libwebsockets, jsoncpp])

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@makano/rew",
-  "version": "1.1.72",
+  "version": "1.1.81",
   "description": "A simple coffescript runtime",
   "main": "lib/rew/main.js",
   "directories": {
@@ -24,7 +24,11 @@
     "type": "git",
     "url": "git+https://github.com/kevinj045/rew.git"
   },
-  "keywords": [],
+  "keywords": [
+    "coffescript",
+    "rew",
+    "runtime"
+  ],
   "author": "makano",
   "license": "ISC",
   "dependencies": {
@@ -34,6 +38,8 @@
     "chalk": "^5.3.0",
     "chokidar": "^3.6.0",
     "js-yaml": "^4.1.0",
+    "tiny-msgpack": "^2.2.0",
+    "uuid": "^9.0.1",
     "vm": "^0.1.0",
     "yargs": "^17.7.2"
   },