@makano/rew 1.1.72 → 1.1.81

package/README.md

@@ -12,7 +12,7 @@ Rew
 <a href="https://www.npmjs.com/package/rayous">  <img src="https://img.shields.io/npm/v/@makano/rew?style=for-the-badge&logo=npm&color=b4befe&logoColor=9399b2&labelColor=181825" alt="npm version" /></a>
 </p>
 
-Rayous is a simple lightweight coffeescript runtime, made to simply using coffescript and revive it
+Rew is a simple lightweight coffeescript runtime, made to simply using coffescript and revive it
 in the process.
 
 ## Getting Started

package/build.sh

@@ -3,4 +3,6 @@ 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`
+# 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/lib/rew/cli/cli.js

@@ -1,205 +1,250 @@
 #!/usr/bin/env node
 
-const yargs = require('yargs/yargs');
-const path = require('path');
-const { hideBin } = require('yargs/helpers');
-const { fork, exec, execSync } = require('child_process');
-const { watch } = require('chokidar');
-const utils = require('./utils');
-const { existsSync, readFileSync, writeFileSync, mkdirSync } = require('fs');
-const { log } = require('./log');
-const { compileFile, compile } = require('../modules/compiler');
+const yargs = require("yargs/yargs");
+const path = require("path");
+const { hideBin } = require("yargs/helpers");
+const { fork, exec, execSync } = require("child_process");
+const { watch } = require("chokidar");
+const utils = require("./utils");
+const { existsSync, readFileSync, writeFileSync, mkdirSync } = require("fs");
+const { log } = require("./log");
+const { compile } = require("../modules/compiler");
+const crypto = require("crypto");
 
 yargs(hideBin(process.argv))
   .command(
-    '$0 <file>', 
-    'Run the specified file', 
+    "$0 <file>",
+    "Run the specified file",
     (yargs) => {
       yargs
-        .positional('file', {
-          describe: 'File to run',
-          type: 'string',
+        .positional("file", {
+          describe: "File to run",
+          type: "string",
         })
-        .option('watch', {
-          alias: 'w',
-          describe: 'Watch the file for changes',
-          type: 'boolean',
+        .option("watch", {
+          alias: "w",
+          describe: "Watch the file for changes",
+          type: "boolean",
         });
     },
     (argv) => {
       const filePath = path.resolve(process.cwd(), argv.file);
-      if(!existsSync(filePath)){
-        log('File not found:', argv.file, ':end');
+      if (!existsSync(filePath)) {
+        log("File not found:", argv.file, ":end");
         return;
       }
       const watching = [];
       const watchIt = (file) => {
-        if(watching.includes(file)) return;
-        watch(file).on('change', () => runIt());
+        if (watching.includes(file)) return;
+        watch(file).on("change", () => runIt());
         watching.push(file);
-      }
+      };
       let prevFork;
       const runIt = () => {
-        if(argv.watch) console.clear();
-        if(prevFork && !prevFork.killed) prevFork.kill?.();
-        prevFork = fork(path.resolve(__dirname, './run.js'))
-        .on('message', (data) => {
-          if(argv.watch){
-            data.forEach(file => {
-              watchIt(file);
-            });
-          }
-        }).send({ filePath, watch: argv.watch });
-        if(argv.watch) watchIt(filePath);
-      }
+        if (argv.watch) console.clear();
+        if (prevFork && !prevFork.killed) prevFork.kill?.();
+        prevFork = fork(path.resolve(__dirname, "./run.js"))
+          .on("message", (data) => {
+            if (argv.watch) {
+              data.forEach((file) => {
+                watchIt(file);
+              });
+            }
+          })
+          .send({ filePath, watch: argv.watch });
+        if (argv.watch) watchIt(filePath);
+      };
       runIt();
-    }
+    },
   )
   .command(
-    'conf <command> [path] [key] [value]', 
-    'Configuration management', 
+    "conf <command> [path] [key] [value]",
+    "Configuration management",
     (yargs) => {
       yargs
-        .positional('command', {
-          describe: 'Configuration command (get, set, remove)',
-          type: 'string',
-          choices: ['get', 'set', 'remove'],
+        .positional("command", {
+          describe: "Configuration command (get, set, remove)",
+          type: "string",
+          choices: ["get", "set", "remove"],
         })
-        .positional('path', {
-          describe: 'Configuration path',
-          type: 'string',
-          default: '',
+        .positional("path", {
+          describe: "Configuration path",
+          type: "string",
+          default: "",
         })
-        .positional('key', {
-          describe: 'Key to get/set/remove',
-          type: 'string',
-          default: '',
+        .positional("key", {
+          describe: "Key to get/set/remove",
+          type: "string",
+          default: "",
         })
-        .positional('value', {
+        .positional("value", {
           describe: 'Value to set (only used with "set" command)',
-          type: 'string',
-          default: '',
+          type: "string",
+          default: "",
         });
     },
     (argv) => {
       const { command, path, key, value } = argv;
       const result = utils.conf(command, path, key, value);
-      if(result) console.log(result);
-    }
+      if (result) console.log(result);
+    },
   )
-  .command('create <path>',  'Create a new project', (yargs) => {
-    yargs
-      .positional('path', {
-        describe: 'Path of the project to create',
-        type: 'string',
+  .command(
+    "create <path>",
+    "Create a new project",
+    (yargs) => {
+      yargs.positional("path", {
+        describe: "Path of the project to create",
+        type: "string",
       });
     },
     (argv) => {
       utils.createProject(argv.path);
-    }
+    },
   )
-  .command('ui-bin <path>',  'Build the UI bin for your own app', (yargs) => {
-    yargs
-      .positional('path', {
-        describe: 'Path of the output bin',
-        type: 'string',
+  .command(
+    "rune-keygen <secret>",
+    "Generate a rune encryption key",
+    (yargs) => {
+      yargs.option("secret", {
+        describe: "Secret used to generate encryption key",
+        type: "string",
       });
     },
     (argv) => {
-      execSync('sh '+path.resolve(__dirname, '../../../build.sh')+' '+argv.path);
-    }
+      const generateEncryptionKey = (secret) => {
+        if (secret) {
+          return crypto.createHash("sha256").update(secret).digest("hex");
+        } else {
+          return crypto.randomBytes(32).toString("hex");
+        }
+      };
+
+      const encryptionKey = generateEncryptionKey(argv.secret);
+      console.log("Encryption Key:", encryptionKey);
+    },
   )
-  .command('run <path | package>',  'Run an app', (yargs) => {
-    yargs
-      .positional('path', {
-        describe: 'Path of the app to run',
-        type: 'string',
+  .command(
+    "ui-bin <path>",
+    "Build the UI bin for your own app",
+    (yargs) => {
+      yargs.positional("path", {
+        describe: "Path of the output bin",
+        type: "string",
+      });
+    },
+    (argv) => {
+      execSync(
+        "sh " + path.resolve(__dirname, "../../../build.sh") + " " + argv.path,
+      );
+    },
+  )
+  .command(
+    "run <path | package>",
+    "Run an app",
+    (yargs) => {
+      yargs.positional("path", {
+        describe: "Path of the app to run",
+        type: "string",
       });
     },
     (argv) => {
       utils.runApp(argv.path);
-    }
+    },
   )
-  .command('install <path>',  'Install an app', (yargs) => {
-    yargs
-      .positional('path', {
-        describe: 'Path of the app to install',
-        type: 'string',
+  .command(
+    "install <path>",
+    "Install an app",
+    (yargs) => {
+      yargs.positional("path", {
+        describe: "Path of the app to install",
+        type: "string",
       });
     },
     async (argv) => {
-      if(argv.path.startsWith('github:')) utils.installApp(await utils.cloneGit(argv.path), true, true);
+      if (argv.path.startsWith("github:"))
+        utils.installApp(await utils.cloneGit(argv.path), true, true);
       else utils.installApp(argv.path);
-    }
+    },
   )
-  .command('build <file>', 'Build the specified file', (yargs) => {
-    yargs
-      .positional('file', {
-        describe: 'File to build',
-        type: 'string',
-      })
-      .option('output', {
-        alias: 'o',
-        describe: 'Output directory',
-        type: 'string',
-      });
-  }, (argv) => {
+  .command(
+    "build <file>",
+    "Build the specified file",
+    (yargs) => {
+      yargs
+        .positional("file", {
+          describe: "File to build",
+          type: "string",
+        })
+        .option("output", {
+          alias: "o",
+          describe: "Output directory",
+          type: "string",
+        });
+    },
+    (argv) => {
+      function readFile(filePath) {
+        return readFileSync(filePath, { encoding: "utf-8" });
+      }
 
-    function readFile(filePath) {
-      return readFileSync(filePath, { encoding: 'utf-8' });
-    }
+      function extractImports(content) {
+        const importRegex = /(\w+)\s*=\s*imp\s*['"](.+?)['"]/g;
+        const imports = [];
+        let match;
+        while ((match = importRegex.exec(content)) !== null) {
+          imports.push({ variable: match[1], url: match[2] });
+        }
+        return imports;
+      }
 
-    function extractImports(content) {
-      const importRegex = /(\w+)\s*=\s*imp\s*['"](.+?)['"]/g;
-      const imports = [];
-      let match;
-      while ((match = importRegex.exec(content)) !== null) {
-        imports.push({ variable: match[1], url: match[2] });
+      function writeCompiledFile(filePath, compiledCode) {
+        const dirName = outputDir ? outputDir : path.dirname(filePath);
+        if (!existsSync(dirName)) mkdirSync(dirName, { recursive: true });
+        const baseName = path.basename(filePath, path.extname(filePath));
+        const newFilePath = path.join(dirName, `${baseName}.js`);
+        writeFileSync(newFilePath, compiledCode, { encoding: "utf-8" });
+        log(`Compiled: ${newFilePath}`);
       }
-      return imports;
-    }
 
-    function writeCompiledFile(filePath, compiledCode) {
-      const dirName = outputDir ? outputDir : path.dirname(filePath);
-      if(!existsSync(dirName)) mkdirSync(dirName, { recursive: true });
-      const baseName = path.basename(filePath, path.extname(filePath));
-      const newFilePath = path.join(dirName, `${baseName}.js`);
-      writeFileSync(newFilePath, compiledCode, { encoding: 'utf-8' });
-      log(`Compiled: ${newFilePath}`);
-    }
+      function processFile(filePath, importsArray) {
+        const content = readFile(filePath);
+        const imports = extractImports(content);
 
-    function processFile(filePath, importsArray) {
-      const content = readFile(filePath);
-      const imports = extractImports(content);
-  
-      imports.forEach(importStatement => {
-        const importedFilePath = path.resolve(path.dirname(filePath), importStatement.url);
-        if (!importsArray.some(importObj => importObj.url === importStatement.url)) {
-          
-          if(existsSync(importedFilePath)){
-            importsArray.push(importStatement);
-            processFile(importedFilePath, importsArray);
-          } else if(existsSync(importedFilePath+'.coffee')){
-            importsArray.push(importStatement);
-            processFile(importedFilePath+'.coffee', importsArray);
-          } else if(existsSync(importedFilePath+'.js')){
-            importsArray.push(importStatement);
-            processFile(importedFilePath+'.js', importsArray);
+        imports.forEach((importStatement) => {
+          const importedFilePath = path.resolve(
+            path.dirname(filePath),
+            importStatement.url,
+          );
+          if (
+            !importsArray.some(
+              (importObj) => importObj.url === importStatement.url,
+            )
+          ) {
+            if (existsSync(importedFilePath)) {
+              importsArray.push(importStatement);
+              processFile(importedFilePath, importsArray);
+            } else if (existsSync(importedFilePath + ".coffee")) {
+              importsArray.push(importStatement);
+              processFile(importedFilePath + ".coffee", importsArray);
+            } else if (existsSync(importedFilePath + ".js")) {
+              importsArray.push(importStatement);
+              processFile(importedFilePath + ".js", importsArray);
+            }
           }
+        });
 
-        }
-      });
-
-      const compiled = compile({ content }, {});
-      writeCompiledFile(filePath, compiled);
-    }
+        const compiled = compile({ content }, {});
+        writeCompiledFile(filePath, compiled);
+      }
 
-    const filePath = path.resolve(process.cwd(), argv.file);
-    const importsArray = [];
-    const outputDir = argv.output ? path.resolve(process.cwd(), argv.output) : null;
-    log('Start compile at', outputDir || 'default path');
-    processFile(filePath, importsArray);
-    log('Compiled', importsArray.length + 1, 'files.', ':end');
-  })
-  .help()
-  .argv;
+      const filePath = path.resolve(process.cwd(), argv.file);
+      const importsArray = [];
+      const outputDir = argv.output
+        ? path.resolve(process.cwd(), argv.output)
+        : null;
+      log("Start compile at", outputDir || "default path");
+      processFile(filePath, importsArray);
+      log("Compiled", importsArray.length + 1, "files.", ":end");
+    },
+  )
+  .help().argv;

package/lib/rew/cli/log.js

@@ -1,40 +1,39 @@
-
 let start = true;
-const startPrefix =  '╭';
-const middlePrefix = '├';
-const separator =    '│';
-const endPrefix =    '╰';
+const startPrefix = "╭";
+const middlePrefix = "├";
+const separator = "│";
+const endPrefix = "╰";
 
-const log = module.exports.log = function(...toPrint){
+const log = (module.exports.log = function (...toPrint) {
   let prefix = start ? startPrefix : middlePrefix;
   let returns = false;
-  if(toPrint[toPrint.length-1] == ':end') {
+  if (toPrint[toPrint.length - 1] == ":end") {
     prefix = endPrefix;
     toPrint.pop();
   }
-  if(toPrint[toPrint.length-1] == ':returns') {
+  if (toPrint[toPrint.length - 1] == ":returns") {
     returns = true;
     toPrint.pop();
   }
-  if(prefix == endPrefix && start) prefix = separator;
-  if(!start) console.log(separator);
-  if(start) start = false;
-  if(returns) return [prefix, ...toPrint].join(' ');
+  if (prefix == endPrefix && start) prefix = separator;
+  if (!start) console.log(separator);
+  if (start) start = false;
+  if (returns) return [prefix, ...toPrint].join(" ");
   else console.log(prefix, ...toPrint);
-}
+});
 
-module.exports.logget = function(...toPrint){
+module.exports.logget = function (...toPrint) {
   let args = [...toPrint];
-  if(toPrint[toPrint.length-1] == ':end') {
+  if (toPrint[toPrint.length - 1] == ":end") {
     let l = args.pop();
-    args.push(':returns', l);
+    args.push(":returns", l);
   } else {
-    args.push(':returns');
+    args.push(":returns");
   }
   return log(...args);
-}
+};
 
 log.startPrefix = startPrefix;
 log.middlePrefix = middlePrefix;
 log.separator = separator;
-log.endPrefix = endPrefix;
+log.endPrefix = endPrefix;

package/lib/rew/cli/run.js

@@ -1,17 +1,15 @@
-const { run } = require('../main');
+const { run } = require("../main");
 
-
-function exec(filePath){
-  return run(filePath)
-    .context.module.imports;
+function exec(filePath) {
+  return run(filePath).context.module.imports;
 }
 
 const onmsg = ({ filePath, watch }) => {
   const imports = exec(filePath);
-  if(watch){
+  if (watch) {
     process.send(imports);
   }
-  process.off('message', onmsg);
-}
+  process.off("message", onmsg);
+};
 
-process.on('message', onmsg);
+process.on("message", onmsg);