Multiple minor optimizations in examples

tshemsedinov · tshemsedinov · commit 353ed2ffc3f6 · 2018-07-09T23:58:39.000+03:00
diff --git a/JavaScript/1-readable.js b/JavaScript/1-readable.js
@@ -2,12 +2,18 @@
 
 const fs = require('fs');
 
-const rs = fs.createReadStream('1-readable.js');
+const rs = fs.createReadStream('1-readable.js', 'utf8');
 
 rs.on('readable', () => {
+  console.log('readable');
   const buffer = rs.read();
   if (buffer) {
     console.log(buffer);
     console.log(buffer.toString());
   }
 });
+
+rs.on('data', (chunk) => {
+  console.log('data');
+  console.log(chunk);
+});
diff --git a/JavaScript/2-writable.js b/JavaScript/2-writable.js
@@ -2,15 +2,12 @@
 
 const fs = require('fs');
 
-const rs = fs.createReadStream('1-readable.js');
-const ws = fs.createWriteStream('copy.js');
+const rs = fs.createReadStream('1-readable.js', 'utf8');
+const ws = fs.createWriteStream('copy.js', 'utf8');
 
-rs.on('readable', () => {
-  const buffer = rs.read();
-  if (buffer) {
-    console.log('Copy ' + buffer.length + ' bytes');
-    ws.write(buffer);
-  }
+rs.on('data', (buffer) => {
+  console.log('Copy ' + buffer.length + ' chars');
+  ws.write(buffer);
 });
 
 rs.on('end', () => {
diff --git a/JavaScript/3-pipe.js b/JavaScript/3-pipe.js
@@ -2,8 +2,8 @@
 
 const fs = require('fs');
 
-const rs = fs.createReadStream('1-readable.js');
-const ws = fs.createWriteStream('copy.js');
+const rs = fs.createReadStream('1-readable.js', 'utf8');
+const ws = fs.createWriteStream('copy.js', 'utf8');
 
 rs.pipe(ws);
 
diff --git a/JavaScript/6-http-safeStart.js b/JavaScript/6-http-safeStart.js
@@ -4,7 +4,7 @@ const fs = require('fs');
 const zlib = require('zlib');
 const http = require('http');
 
-function prepareCash(callback) {
+function prepareCache(callback) {
   let buffer = null;
 
   const rs = fs.createReadStream('index.html');
@@ -16,15 +16,27 @@ function prepareCash(callback) {
     buffers.push(buffer);
   });
 
-  gs.on('end', () => {
+  gs.once('end', () => {
     buffer = Buffer.concat(buffers);
     callback(null, buffer);
   });
 
+  rs.on('error', (error) => {
+    callback(error);
+  });
+
+  gs.on('error', (error) => {
+    callback(error);
+  });
+
   rs.pipe(gs);
 }
 
 function startServer(err, buffer) {
+  if (err) {
+    throw err;
+  }
+
   const server = http.createServer((request, response) => {
     console.log(request.url);
     response.writeHead(200, { 'Content-Encoding': 'gzip' });
@@ -34,4 +46,4 @@ function startServer(err, buffer) {
   server.listen(8000);
 }
 
-prepareCash(startServer);
+prepareCache(startServer);
