@drifted/raven 0.0.12 → 0.0.14

package/bin/{cli.js → raven.js}

@@ -1,11 +1,10 @@
 #!/usr/bin/env node
 
-var CarrierPigeon = require('carrier-pigeon');
-var path = require('path');
-var fs = require('fs');
-var crypto = require('crypto');
-const JSONDataFile = require(path.join(__dirname, '..'));
-
+const CarrierPigeon = require('carrier-pigeon');
+const path = require('path');
+const fs = require('fs');
+const crypto = require('crypto');
+const RavenDataFile = require(path.join(__dirname, '..'));
 
 var parser = new CarrierPigeon({strict: true});
 parser.commands('version', 'usage', 'show', 'secret', 'init', 'generate', 'expose', 'conceal', 'encrypt', 'decrypt');
@@ -19,11 +18,11 @@ parser.option('location', {type: 'file', default: process.cwd()});
 parser.option('verbose', {default: false});
 
 var options = parser.parse(process.argv);
-var command = options.command;
-delete options.command;
 
+var command = options.command;
 process.chdir(options.location);
 delete options.location;
+delete options.command;
 
 
 
@@ -36,11 +35,15 @@ if (options.verbose) {
 
 
 if (command == 'encrypt') {
-  var file   = new JSONDataFile(options);
+  var file   = new RavenDataFile(options);
 
   var data = file.encrypt(options.data);
   if (options.json) {
-    console.log(JSON.stringify({action: 'encrypt', options: options, data: data}, null, 2))
+    console.log(JSON.stringify({
+      action: 'encrypt', 
+      options: options, 
+      data: data
+    }, null, 2))
   } else {
     console.log('data:', data);
   }
@@ -53,7 +56,7 @@ if (command == 'decrypt') {
   var secret = options.secret;
 
   delete options.data;
-  var file   = new JSONDataFile(options);
+  var file   = new RavenDataFile(options);
   var json = file.decrypt(data);
 
   try {
@@ -64,7 +67,11 @@ if (command == 'decrypt') {
     }
   }
   if (options.json) {
-    console.log(JSON.stringify({action: 'decrypt', options: options, data: json}, null, 2))
+    console.log(JSON.stringify({
+      action: 'decrypt', 
+      options: options, 
+      data: json
+    }, null, 2))
   } else {
     console.log(json);
   }
@@ -73,7 +80,7 @@ if (command == 'decrypt') {
 
 
 if (command == 'generate') {
-  JSONDataFile.generate().then((generated) => {
+  RavenDataFile.generate().then((generated) => {
     if (options.json) {
        
        console.log(JSON.stringify({
@@ -84,7 +91,7 @@ if (command == 'generate') {
        }, null, 2))
 
     } else {
-      console.log('file created at', JSONDataFile.secretFile().replace(process.cwd()+path.sep, ''));
+      console.log('file created at', RavenDataFile.secretFile().replace(process.cwd()+path.sep, ''));
     }
   })  
 }
@@ -92,14 +99,14 @@ if (command == 'generate') {
 
 
 if (command == 'init') {
-  JSONDataFile.init().then((initialized) => {
+  RavenDataFile.init().then((initialized) => {
     if (options.json) {
       console.log(JSON.stringify({action: 'init', options: options, location: process.cwd(), success: initialized}, null, 2))
     } else {
       if (initialized) {
-        console.log('file created at', JSONDataFile.secretFile().replace(process.cwd()+path.sep, ''));
+        console.log('file created at', RavenDataFile.secretFile().replace(process.cwd()+path.sep, ''));
       } else {
-        console.log(JSONDataFile.secretFile().replace(process.cwd()+path.sep, ''), 'already exists.');
+        console.log(RavenDataFile.secretFile().replace(process.cwd()+path.sep, ''), 'already exists.');
       }
     }
   })  
@@ -109,16 +116,16 @@ if (command == 'init') {
 
 if (command == 'secret') {
   if (options.json) {
-    console.log(JSON.stringify({ secret: JSONDataFile.secret() }, null, 2));
+    console.log(JSON.stringify({ secret: RavenDataFile.secret() }, null, 2));
   } else {
-    console.log('secret:', JSONDataFile.secret());
+    console.log('secret:', RavenDataFile.secret());
   }
 }
 
 
 
 if (command == 'show') {
-  var json = JSON.parse(JSONDataFile.show());
+  var json = JSON.parse(RavenDataFile.show());
   if (options.json) {
     console.log(JSON.stringify(json, null, 2));
   } else {
@@ -129,11 +136,15 @@ if (command == 'show') {
 
 
 if (command == 'expose') {
-  var file = new JSONDataFile(options);
-  //console.log(file);
+  var file = new RavenDataFile(options);
   file.expose().then(() => {   
     if (options.json) {
-      console.log(JSON.stringify({file: file.shortPath, action: 'expose', options: options, secret: file.secret}, null, 2))
+      console.log(JSON.stringify({
+        file: file.shortPath(), 
+        action: 'expose', 
+        options: options, 
+        secret: file.secret
+      }, null, 2))
     } else {
       console.log('');
       console.log(file.shortPath(), 'decrypted'); 
@@ -146,11 +157,15 @@ if (command == 'expose') {
 
 
 if (command == 'conceal') {
-  var file = new JSONDataFile(options);
-  //console.log(file);
+  var file = new RavenDataFile(options);
   file.conceal().then(() => {
     if (options.json) {
-      console.log(JSON.stringify({file: file.shortPath, action: 'conceal', options: options, secret: file.secret}, null, 2))
+      console.log(JSON.stringify({
+        file: file.shortPath(), 
+        action: 'conceal', 
+        options: options, 
+        secret: file.secret
+      }, null, 2))
     } else {
       console.log('');
       console.log(file.shortPath(), 'encrypted');

package/index.js

@@ -1,14 +1,12 @@
 const path = require('path');
 const crypto = require('crypto');
 const fs = require('fs');
-const { fileTypeFromBuffer } = require('file-type');
 const ivLength = 16;
 const { Readable, pipeline, buffer } = require('stream');
 const Bufferable = require(path.join(__dirname, 'bufferable'));
-const { isUtf8, isAscii } = require('node:buffer');
 
-class RavenDataFile {
 
+class RavenDataFile {
 
   constructor(options={}) {
     Object.assign(this, options)
@@ -131,7 +129,10 @@ class RavenDataFile {
       });
     })
   }
- 
+
+  static createIV() {
+    return crypto.randomBytes(ivLength);
+  }
 
   static secret() {
     return crypto.randomBytes(32).toString('base64');
@@ -153,7 +154,6 @@ class RavenDataFile {
   }
 
   cipher(options={}) {
-    //console.log(options);
     return crypto.createCipheriv(options.algorithm, 
       Buffer.from(options.secret, 'base64'), 
       options.iv);
@@ -166,7 +166,7 @@ class RavenDataFile {
   }
 
   encrypt(buffer) {
-    const iv = crypto.randomBytes(ivLength);
+    const iv = RavenDataFile.createIV();
     const cipher = this.cipher({iv: iv, secret: this.secret, algorithm: this.algorithm});  
 
     var encrypted = cipher.update(buffer, 'utf8', 'hex');
@@ -229,31 +229,30 @@ class RavenDataFile {
   conceal() {
     var self = this;
     return new Promise(async(resolve) => {
-      const iv = crypto.randomBytes(ivLength);
+      const iv = RavenDataFile.createIV();
       const cipher = self.cipher({iv: iv, secret: self.secret, algorithm: self.algorithm});
 
-     self.read().then(async (buffer) => {
+      self.read().then(async (buffer) => {
         var readable = Readable.from(buffer)
-        const output = new Bufferable();
-        readable.pipe(cipher).pipe(output);
+        const collector = new Bufferable();
+        readable.pipe(cipher).pipe(collector);
 
-        output.on('finish', async() => {
+        collector.on('finish', async() => {
           const authTag = cipher.getAuthTag().toString('hex');    
-          var encrypted = output.buffer;
-
+          var encrypted = collector.buffer;
 
           fs.truncate(self.file, 0, () => {
-            const stream = fs.createWriteStream(self.file, { flags: 'a' });
-            stream.write(`${iv.toString('hex')}:${authTag}:`);
-            stream.write(encrypted.toString('base64'));
-            stream.end(); 
+            const destination = fs.createWriteStream(self.file, { flags: 'a' });
+            destination.write(`${iv.toString('hex')}:${authTag}:`);
+            destination.write(encrypted.toString('base64'));
+            destination.end(); 
 
-            stream.on('finish', () => {
+            destination.on('finish', () => {
               resolve({success: true});
             });
           })
         });
-     }) 
+      }) 
     })
   }
 
@@ -263,16 +262,17 @@ class RavenDataFile {
     return new Promise(async(resolve) => {
       self.read().then((buffer) => {
         const [ivHex, authTagHex, encryptedText] = buffer.toString().split(':');
-      
+
         var readable = Readable.from(Buffer.from(encryptedText, 'base64'))
-        const output = new Bufferable();
+        const collector = new Bufferable();
+        
         const decipher = self.decipher({iv:ivHex, secret: self.secret, algorithm: self.algorithm});
         decipher.setAuthTag(Buffer.from(authTagHex, 'hex'));
+        
+        readable.pipe(decipher).pipe(collector);
 
-        readable.pipe(decipher).pipe(output);
-
-        output.on('finish', () => {
-          self.data = output.buffer;
+        collector.on('finish', () => {
+          self.data = collector.buffer;
 
           self.save().then(() => {
             resolve({success: true});

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "@drifted/raven",
-  "version": "0.0.12",
+  "version": "0.0.14",
   "description": "",
   "homepage": "https://github.com/driftless-group/raven",
   "bin": {
-    "raven": "./bin/cli.js"
+    "craven": "./bin/console.js",
+    "raven": "./bin/raven.js"
   },
   "repository": {
     "type": "git",

package/test/helpers.js

@@ -8,7 +8,7 @@ const crypto = require('crypto');
 
 
 function run(...specifics) {
-  var parts = [process.execPath, path.join(__dirname, '..', 'bin', 'cli.js')].concat(specifics);
+  var parts = [process.execPath, path.join(__dirname, '..', 'bin', 'raven.js')].concat(specifics);
   return new Promise((resolve, reject) => {
     exec(parts.join(' '), (err, stdout, stdin) => {
       if (err) {