yukichant 3.0.0 → 3.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yukichant",
-  "version": "3.0.0",
+  "version": "3.0.3",
   "description": "",
   "license": "Apache-2.0",
   "repository": "amanoese/yukichant",

package/src/cli.js

@@ -4,7 +4,8 @@ import chant from './index.js'
 import fs from 'fs'
 const { version } = JSON.parse(fs.readFileSync('package.json', 'utf8'));
 
-import program from 'commander';
+import { Command } from 'commander/esm.mjs';
+const program = new Command();
 
 program
 .name('yukichant')

package/src/index.js

@@ -1,7 +1,9 @@
 import simpleEnigma from './machine-encrypt.js'
 import fs from 'fs'
-const meisi = JSON.parse(fs.readFileSync('./data/meisi.json', 'utf8'));
-const dousi = JSON.parse(fs.readFileSync('./data/dousi.json', 'utf8'));
+import path from 'path'
+const dirname = path.dirname(new URL(import.meta.url).pathname)
+const meisi = JSON.parse(fs.readFileSync(`${dirname}/../data/meisi.json`, 'utf8'));
+const dousi = JSON.parse(fs.readFileSync(`${dirname}/../data/dousi.json`, 'utf8'));
 
 
 let default_encoder = (uint8text,{ meisi, dousi }) => {

package/src/machine-encrypt.js

@@ -5,13 +5,21 @@ let toNumber    = (list,input) => list[input]
 let revToNumber = (list,input) => list.indexOf(input)
 
 let encrypt = (uint8array,roter,refrector) => {
-  let fase_1 = toNumber(roter,uint8array[0])
-  let fase_2 = toNumber(refrector,fase_1)
-  let fase_3 = revToNumber(roter,fase_2)
+  let phase_1, phase_2, phase_3;
+  let nextRotor = roter;
+  const ret = [];
 
-  let nextRotor = [ ...roter.slice(1) , roter[0] ]
+  for (let v of uint8array) {
+    phase_1 = toNumber(nextRotor,v);
+    phase_2 = toNumber(refrector,phase_1);
+    phase_3 = revToNumber(nextRotor,phase_2);
 
-  return [fase_3, ...(uint8array.length <= 1 ? [] : encrypt(uint8array.slice(1),nextRotor,refrector)) ]
+    nextRotor = [ ...nextRotor.slice(1) , nextRotor[0] ];
+    
+    ret.push(phase_3);
+  }
+
+  return ret;
 }
 
 export default  {
@@ -20,6 +28,5 @@ export default  {
   encrypt,
   uint8ArrayEncrypt(uint8array) {
     return this.encrypt(uint8array,this.default_roter,this.refrector);
-  }
+  },
 }
-