Do not use timers-obj

Author: dex4er

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## v2.1.1 2018-09-17
+
+* Do not use `timers-obj` as far as pure NodeJS timers have better support for
+  debugging.
+
 ## v2.1.0 2018-09-17
 
 * Close file if its file name is already changed even if there is no new data

package.json

@@ -1,6 +1,6 @@
 {
   "name": "file-timestamp-stream",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "Writing stream with file rotating based on timestamp",
   "main": "lib/file-timestamp-stream.js",
   "typings": "lib/file-timestamp-stream.d.ts",
@@ -24,18 +24,17 @@
   },
   "dependencies": {
     "stream.finished": "^1.0.1",
-    "timers-obj": "^0.2.1",
     "tslib": "^1.9.3",
     "ultra-strftime": "^1.0.2"
   },
   "devDependencies": {
     "@types/chai": "^4.1.4",
     "@types/mocha": "^5.2.5",
-    "@types/node": "^10.9.4",
+    "@types/node": "^10.10.0",
     "@types/ultra-strftime": "^1.0.0",
     "chai": "^4.1.2",
     "coveralls": "^3.0.2",
-    "eslint": "^5.5.0",
+    "eslint": "^5.6.0",
     "eslint-config-standard": "^12.0.0",
     "eslint-plugin-import": "^2.14.0",
     "eslint-plugin-node": "^7.0.1",

src/file-timestamp-stream.ts

@@ -2,7 +2,6 @@
 
 import fs, { WriteStream } from 'fs'
 import { Writable, WritableOptions } from 'stream'
-import { interval, Interval } from 'timers-obj'
 import strftime from 'ultra-strftime'
 
 // tslint:disable-next-line:no-var-requires
@@ -33,8 +32,8 @@ export class FileTimestampStream extends Writable {
   private streams: Map<string, WriteStream> = new Map()
   private streamCancelFinishers: Map<string, () => void> = new Map()
   private streamErrorHandlers: Map<string, (err: Error) => void> = new Map()
-  private closer?: Interval
-  private closers: Map<string, Interval> = new Map()
+  private closer?: NodeJS.Timer
+  private closers: Map<string, NodeJS.Timer> = new Map()
 
   constructor (options: FileTimestampStreamOptions = {}) {
     super(options)
@@ -115,8 +114,8 @@ export class FileTimestampStream extends Writable {
       this.streams.clear()
     }
     if (this.closers.size > 0) {
-      for (const timer of this.closers.values()) {
-        timer.remove()
+      for (const closer of this.closers.values()) {
+        clearInterval(closer)
       }
       this.streams.clear()
     }
@@ -144,7 +143,7 @@ export class FileTimestampStream extends Writable {
 
     if (newFilename !== currentFilename) {
       if (currentFilename && stream && closer) {
-        closer.remove()
+        clearInterval(closer)
         stream.end()
 
         const streamErrorHandler = this.streamErrorHandlers.get(currentFilename)
@@ -167,19 +166,19 @@ export class FileTimestampStream extends Writable {
       newStream.on('error', newStreamErrorHandler)
       this.streamErrorHandlers.set(newFilename, newStreamErrorHandler)
 
-      const newTimer = interval(FileTimestampStream.CLOSE_UNUSED_FILE_AFTER, () => {
+      const newCloser = setInterval(() => {
         if (newFilename !== this.newFilename()) {
-          newTimer.remove()
+          clearInterval(newCloser)
           this.closers.delete(newFilename)
 
           newStream.end()
         }
-      })
+      }, FileTimestampStream.CLOSE_UNUSED_FILE_AFTER)
       this.closer = closer
-      this.closers.set(newFilename, newTimer)
+      this.closers.set(newFilename, newCloser)
 
       const newStreamCancelFinisher = finished(newStream, () => {
-        newTimer.remove()
+        clearInterval(newCloser)
         this.closers.delete(newFilename)
 
         // tslint:disable-next-line:strict-type-predicates