Merge pull request #1 from HowProgrammingWorks/few-improvements

tshemsedinov · web-flow · commit a52da10345ef · 2020-01-27T23:17:55.000+02:00
Update description and improve examples
diff --git a/JavaScript/1-prototype.js b/JavaScript/1-prototype.js
@@ -1,6 +1,7 @@
 'use strict';
 
-// Facade for Map and Map or Timers
+// Facade that wraps Map and Node.js Timers to provide a simple interface for a
+// collection with values that have expiration timeout.
 
 const TimeoutCollection = function(timeout) {
   this.timeout = timeout;
@@ -14,6 +15,7 @@ TimeoutCollection.prototype.set = function(key, value) {
   const timeout = setTimeout(() => {
     this.delete(key);
   }, this.timeout);
+  timeout.unref();
   this.collection.set(key, value);
   this.timers.set(key, timeout);
 };
diff --git a/JavaScript/2-class.js b/JavaScript/2-class.js
@@ -13,6 +13,7 @@ class TimeoutCollection {
     const timeout = setTimeout(() => {
       this.delete(key);
     }, this.timeout);
+    timeout.unref();
     this.collection.set(key, value);
     this.timers.set(key, timeout);
   }
diff --git a/JavaScript/3-function.js b/JavaScript/3-function.js
@@ -1,16 +1,18 @@
 'use strict';
 
-const timeoutCollection = timeout => {
+const timeoutCollection = interval => {
   const collection = new Map();
   const timers = new Map();
+
   const facade = {};
 
   facade.set = (key, value) => {
-    const prevTimer = timers.get(key);
-    if (prevTimer) clearTimeout(prevTimer);
-    const timer = setTimeout(() => {
+    const timer = timers.get(key);
+    if (timer) clearTimeout(timer);
+    const timeout = setTimeout(() => {
       collection.delete(key);
-    }, timeout);
+    }, interval);
+    timeout.unref();
     collection.set(key, value);
     timers.set(key, timer);
   };
diff --git a/JavaScript/4-scheduler.js b/JavaScript/4-scheduler.js
@@ -132,7 +132,7 @@ class Scheduler extends EventEmitter {
 const scheduler = new Scheduler();
 
 scheduler.on('error', (err, task) => {
-  console.log(`Error in ${task.name}: ${err.stack}`);
+  console.log(`Error in ${task.name}:\n ${err.stack}`);
   //process.exit(1);
 });
 

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ class TimeoutCollection {`
`13`	`13`	`const timeout = setTimeout(() => {`
`14`	`14`	`this.delete(key);`
`15`	`15`	`}, this.timeout);`
	`16`	`+ timeout.unref();`
`16`	`17`	`this.collection.set(key, value);`
`17`	`18`	`this.timers.set(key, timeout);`
`18`	`19`	`}`