From be73eaa4cd34ec892050b0134d11af9d8ffc45a6 Mon Sep 17 00:00:00 2001
From: Jane Petrovna <jane@j4.pm>
Date: Fri, 4 Jun 2021 16:14:40 -0400
Subject: [PATCH] migrate parsing to backend

---
 bot.js                 |  10 +-
 cmd/lights.js          |  25 ++--
 lights/light_parser.js | 316 ++++++++++++++++++++---------------------
 lights/request.js      |  35 +++--
 4 files changed, 192 insertions(+), 194 deletions(-)

diff --git a/bot.js b/bot.js
index 89c8de4..cd2ff06 100644
--- a/bot.js
+++ b/bot.js
@@ -1,6 +1,6 @@
 import { createRequire } from 'module';
-import { discover } from './lights/light_parser.js';
-import { contactServer } from './lights/request.js';
+//import { discover } from './lights/light_parser.js';
+//import { contactServer } from './lights/request.js';
 const require = createRequire(import.meta.url);
 
 import Eris from 'eris';
@@ -105,6 +105,6 @@ let cmd_dir = path.join(dir, 'cmd');
 log.debug(dir);
 let files = fs.readdirSync(cmd_dir);
 load_commands();
-contactServer(discover, (err) => {
-  log.error(err);
-})
+// contactServer(discover, (err) => {
+//   log.error(err);
+// });
diff --git a/cmd/lights.js b/cmd/lights.js
index 6c3ba6c..b2297ab 100644
--- a/cmd/lights.js
+++ b/cmd/lights.js
@@ -1,5 +1,5 @@
 import { CommandInitializer, Command } from '../parser.js';
-import parse, { discover, initialize, instructions } from '../lights/light_parser.js';
+//import parse, { discover, initialize, instructions } from '../lights/light_parser.js';
 import req from '../lights/request.js';
 
 const initializer = new CommandInitializer();
@@ -7,7 +7,7 @@ const initializer = new CommandInitializer();
 class LightsParser extends Command {
   init(ctx, log) {
     this.log = log;
-    initialize(ctx);
+    //initialize(ctx);
   }
   name = 'lights';
   whitelist = true;
@@ -20,21 +20,20 @@ class LightsParser extends Command {
       msg.channel.createMessage('no args found.');
       return;
     }
-    let instructions = parse(args[0]);
+    // let instructions = parse(args[0]);
 
-    this.log.debug(instructions);
-    let res = '```\n';
-    instructions.forEach((instruction) => {
-      res += JSON.stringify(instruction) + '\n';
-    });
-    res += '```';
-    msg.channel.createMessage(`parsed instructions:\n${res}`);
+    // this.log.debug(instructions);
+    // let res = '```\n';
+    // instructions.forEach((instruction) => {
+    //   res += JSON.stringify(instruction) + '\n';
+    // });
+    // res += '```';
+    // msg.channel.createMessage(`parsed instructions:\n${res}`);
     req(
-      instructions.filter((i) => i.valid),
+      args.join(' '),
       (response) => {
-        msg.channel.createMessage(`${response}`);
+        msg.channel.createMessage(`\`\`\`\n${response}\`\`\``);
       },
-      discover,
       (error) => {
         msg.channel.createMessage(`error: ${error.message}`);
       }
diff --git a/lights/light_parser.js b/lights/light_parser.js
index 7851201..1f99ccd 100644
--- a/lights/light_parser.js
+++ b/lights/light_parser.js
@@ -1,169 +1,169 @@
-import Logger, { levels } from '../logger.js';
-import { filename } from '../utils.js';
+// import Logger, { levels } from '../logger.js';
+// import { filename } from '../utils.js';
 
-const log = new Logger(filename(import.meta.url), "DEBUG");
+// const log = new Logger(filename(import.meta.url), "DEBUG");
 
-class Target {
-  constructor(channel) {
-    this.channel = channel;
-  }
-  channel;
-  value;
-}
+// class Target {
+//   constructor(channel) {
+//     this.channel = channel;
+//   }
+//   channel;
+//   value;
+// }
 
-const available_targets = {
-  r: new Target('r'),
-  g: new Target('g'),
-  b: new Target('b'),
-  stack: new Target('stack'),
-  stack2: new Target('stack2'),
-  stack3: new Target('stack3'),
-  stack4: new Target('stack4'),
-  stack5: new Target('stack5'),
-  stack6: new Target('stack6'),
-  stack6: new Target('stackr'),
-  stack6: new Target('stackg'),
-  stack6: new Target('stackb'),
-  tick: new Target('tick'),
-  index: new Target('index'),
-};
+// const available_targets = {
+//   r: new Target('r'),
+//   g: new Target('g'),
+//   b: new Target('b'),
+//   stack: new Target('stack'),
+//   stack2: new Target('stack2'),
+//   stack3: new Target('stack3'),
+//   stack4: new Target('stack4'),
+//   stack5: new Target('stack5'),
+//   stack6: new Target('stack6'),
+//   stack6: new Target('stackr'),
+//   stack6: new Target('stackg'),
+//   stack6: new Target('stackb'),
+//   tick: new Target('tick'),
+//   index: new Target('index'),
+// };
 
-class Instruction {
-  constructor(name, targets, args) {
-    let valid_targets = [];
-    let matched_args = [];
-    targets.forEach((t, i) => {
-      if (t instanceof Target) {
-        let match = Object.keys(available_targets).find((key) => available_targets[key].channel === t.channel);
-        if (match) {
-          if (args[i]) {
-            matched_args.push({
-              ...t,
-              arg: args[i]
-            })
-          }
-          else {
-            matched_args.push(t);
-          }
-        }
-      }
-    });
-    this.name = name;
-    this.targets = valid_targets;
-    this.args = matched_args;
-  }
-  name;
-  targets;
-  args;
-}
+// class Instruction {
+//   constructor(name, targets, args) {
+//     let valid_targets = [];
+//     let matched_args = [];
+//     targets.forEach((t, i) => {
+//       if (t instanceof Target) {
+//         let match = Object.keys(available_targets).find((key) => available_targets[key].channel === t.channel);
+//         if (match) {
+//           if (args[i]) {
+//             matched_args.push({
+//               ...t,
+//               arg: args[i]
+//             })
+//           }
+//           else {
+//             matched_args.push(t);
+//           }
+//         }
+//       }
+//     });
+//     this.name = name;
+//     this.targets = valid_targets;
+//     this.args = matched_args;
+//   }
+//   name;
+//   targets;
+//   args;
+// }
 
-export const instructions = [
-];
+// export const instructions = [
+// ];
 
-export function initialize(ctx) {
-  log.s(ctx.log_level);
-}
+// export function initialize(ctx) {
+//   log.s(ctx.log_level);
+// }
 
-function parseSingleInstruction(str = '') {
-  let item = {
-    valid: false,
-    instruction: undefined,
-    errors: undefined,
-  };
-  let split = str.split(' ');
-  let cmd = split[0];
-  log.debug(cmd);
-  let match = instructions.filter((i) => i.n == cmd.toUpperCase());
-  log.debug(match);
-  split = split.slice(1);
-  if (match.length) {
-    let inst_targets = [];
-    let inst_args = [];
-    let parsed_args = [];
-    let join_index = -1;
-    let add = true;
-    for (let index in split) {
-      if (split[index].startsWith('[')) {
-        join_index = index;
-        add = false;
-      }
-      if (add) {
-        parsed_args.push(split[index]);
-      }
-      if (split[index].endsWith(']') && join_index != -1) {
-        let joined = split
-          .slice(join_index, index + 1)
-          .join(' ')
-          .replace(/[\[\]]/g, '');
-        parsed_args.push(joined);
-        add = true;
-        join_index = -1;
-      }
-    }
-    inst_targets = parsed_args[0]
-      .split(',')
-      .map((s) => s.trim())
-      .map((t) => new Target(t));
+// function parseSingleInstruction(str = '') {
+//   let item = {
+//     valid: false,
+//     instruction: undefined,
+//     errors: undefined,
+//   };
+//   let split = str.split(' ');
+//   let cmd = split[0];
+//   log.debug(cmd);
+//   let match = instructions.filter((i) => i.n == cmd.toUpperCase());
+//   log.debug(match);
+//   split = split.slice(1);
+//   if (match.length) {
+//     let inst_targets = [];
+//     let inst_args = [];
+//     let parsed_args = [];
+//     let join_index = -1;
+//     let add = true;
+//     for (let index in split) {
+//       if (split[index].startsWith('[')) {
+//         join_index = index;
+//         add = false;
+//       }
+//       if (add) {
+//         parsed_args.push(split[index]);
+//       }
+//       if (split[index].endsWith(']') && join_index != -1) {
+//         let joined = split
+//           .slice(join_index, index + 1)
+//           .join(' ')
+//           .replace(/[\[\]]/g, '');
+//         parsed_args.push(joined);
+//         add = true;
+//         join_index = -1;
+//       }
+//     }
+//     inst_targets = parsed_args[0]
+//       .split(',')
+//       .map((s) => s.trim())
+//       .map((t) => new Target(t));
 
-    if (!inst_targets.length) {
-      item.errors = 'No valid targets.';
-    }
-    inst_targets.forEach((t) => {
-      let match = Object.keys(available_targets).find((key) => available_targets[key].channel === t.channel);
-      if (!match) {
-        item.errors = `Invalid target: ${t.channel}`;
-      }
-    });
-    if (match[0].a) {
-      if (parsed_args.length < 2) {
-        item.errors = 'Not enough arguments.';
-        return item;
-      }
-      inst_args = parsed_args[1]
-        .split(',')
-        .map((s) => s.trim())
-        .map((s) => (available_targets[s] ? s : parseInt(s)));
-      if (!inst_args.length) {
-        item.errors = 'No valid args.';
-      }
-      inst_args.forEach((arg) => {
-        if (arg === NaN) {
-          item.errors = 'An argument is null or undefined.';
-        }
-      });
-    }
-    if (item.errors) {
-      return item;
-    }
+//     if (!inst_targets.length) {
+//       item.errors = 'No valid targets.';
+//     }
+//     inst_targets.forEach((t) => {
+//       let match = Object.keys(available_targets).find((key) => available_targets[key].channel === t.channel);
+//       if (!match) {
+//         item.errors = `Invalid target: ${t.channel}`;
+//       }
+//     });
+//     if (match[0].a) {
+//       if (parsed_args.length < 2) {
+//         item.errors = 'Not enough arguments.';
+//         return item;
+//       }
+//       inst_args = parsed_args[1]
+//         .split(',')
+//         .map((s) => s.trim())
+//         .map((s) => (available_targets[s] ? s : parseInt(s)));
+//       if (!inst_args.length) {
+//         item.errors = 'No valid args.';
+//       }
+//       inst_args.forEach((arg) => {
+//         if (arg === NaN) {
+//           item.errors = 'An argument is null or undefined.';
+//         }
+//       });
+//     }
+//     if (item.errors) {
+//       return item;
+//     }
 
-    item.instruction = new Instruction(match[0].n, inst_targets, inst_args || []);
-  } else {
-    item.errors = 'No command matched.';
-    return item;
-  }
-  item.valid = true;
-  return item;
-}
+//     item.instruction = new Instruction(match[0].n, inst_targets, inst_args || []);
+//   } else {
+//     item.errors = 'No command matched.';
+//     return item;
+//   }
+//   item.valid = true;
+//   return item;
+// }
 
-export function discover(data) {
-  for (let value of data) {
-    if (value.n != undefined) {
-      let found = instructions.filter((val) => { return val.n == value.n });
-      if (!found.length) {
-        log.debug(`discovered new keyword ${value.n}`);
-        instructions.push(value);
-      }
-    }
-  }
-}
+// export function discover(data) {
+//   for (let value of data) {
+//     if (value.n != undefined) {
+//       let found = instructions.filter((val) => { return val.n == value.n });
+//       if (!found.length) {
+//         log.debug(`discovered new keyword ${value.n}`);
+//         instructions.push(value);
+//       }
+//     }
+//   }
+// }
 
-export default function parse(str) {
-  let parsed = [];
-  let split = str.split('\n').filter((s) => s.length > 0);
-  split.forEach((item) => {
-    let parsedItem = parseSingleInstruction(item);
-    parsed.push(parsedItem);
-    log.debug(item);
-  });
-  return parsed;
-}
+// export default function parse(str) {
+//   let parsed = [];
+//   let split = str.split('\n').filter((s) => s.length > 0);
+//   split.forEach((item) => {
+//     let parsedItem = parseSingleInstruction(item);
+//     parsed.push(parsedItem);
+//     log.debug(item);
+//   });
+//   return parsed;
+// }
diff --git a/lights/request.js b/lights/request.js
index d5e07d4..840eeee 100644
--- a/lights/request.js
+++ b/lights/request.js
@@ -7,22 +7,22 @@ function getBinarySize(string) {
   return Buffer.byteLength(string, 'utf8');
 }
 
-export function contactServer(callback, errorCallback) {
-  let client = new net.Socket();
+// export function contactServer(callback, errorCallback) {
+//   let client = new net.Socket();
 
-  let c_port = global.ctx.lights.port || port;
-  let c_addr = global.ctx.lights.addr || hostname;
-  client.connect(c_port, c_addr, () => {
-  });
+//   let c_port = global.ctx.lights.port || port;
+//   let c_addr = global.ctx.lights.addr || hostname;
+//   client.connect(c_port, c_addr, () => {
+//   });
 
-  client.on('data', (dat) => {
-    let arr = JSON.parse(dat);
-    callback(arr);
-    client.destroy();
-  })
-}
+//   client.on('data', (dat) => {
+//     let arr = JSON.parse(dat);
+//     callback(arr);
+//     client.destroy();
+//   })
+// }
 
-export default function req(data, callback, newFuncCallback, errorCallback) {
+export default function req(data, callback, errorCallback) {
   let string_data = JSON.stringify(data);
   let size = getBinarySize(string_data);
   if (size > 9999) {
@@ -35,13 +35,12 @@ export default function req(data, callback, newFuncCallback, errorCallback) {
   let c_port = global.ctx.lights.port || port;
   let c_addr = global.ctx.lights.addr || hostname;
   client.connect(c_port, c_addr, () => { });
-
-  client.on('data', (dat) => {
-    let arr = JSON.parse(dat);
-    newFuncCallback(arr);
+  client.on('connect', () => {
     client.write(string_data);
+  })
+  client.on('data', (dat) => {
+    callback(dat);
     client.destroy();
-    callback('success.');
   })
 
   client.on('error', (e) => {