@toa.io/extensions.realtime 1.0.0-alpha.201 → 1.0.0-alpha.202

package/components/streams/source/create.ts

@@ -22,26 +22,32 @@ export class Effect implements Operation {
   public async execute (input: Input): Promise<Readable> {
     const key = input.key
 
-    if (!this.streams.has(key))
-      this.createStream(key)
+    let stream: Stream | undefined
 
-    const stream = this.streams.get(key)!
+    if (!this.streams.has(key)) {
+      stream = this.createStream(key)
+
+      this.logs.debug('Stream created', { key })
+    } else
+      stream = this.streams.get(key)!
+
+    // welcome
+    setTimeout(() => stream?.heartbeat(), 1000)
 
-    // return stream.fork()
     return stream
   }
 
-  private createStream (key: string): void {
-    const stream = new Stream(this.logs.fork({ key }))
+  private createStream (key: string): Stream {
+    const stream = new Stream()
 
     this.streams.set(key, stream)
 
-    stream.once('close', () => {
-      this.logs.debug('Stream closed', { key })
+    stream.events.once('destroy', () => {
+      this.logs.debug('Stream destroyed', { key })
       this.streams.delete(key)
     })
 
-    this.logs.debug('Stream created', { key })
+    return stream
   }
 }
 

package/components/streams/source/lib/Stream.ts

@@ -1,26 +1,12 @@
-import { PassThrough, Readable } from 'node:stream'
+import { EventEmitter, Readable } from 'node:stream'
 
 export class Stream extends Readable {
-  private forks: number = 0
+  public events = new EventEmitter()
+
   private interval: NodeJS.Timeout | null = null
-  private readonly logs: any
 
-  public constructor (logs: any) {
+  public constructor () {
     super(objectMode)
-
-    this.logs = logs
-  }
-
-  public fork (): PassThrough {
-    const through = new PassThrough(objectMode)
-
-    through.once('close', this.decrement.bind(this))
-
-    this.increment()
-    // this.heartbeat(through)
-    this.pipe(through)
-
-    return through
   }
 
   // has to be here
@@ -33,12 +19,12 @@ export class Stream extends Readable {
     if (this.interval !== null)
       clearInterval(this.interval)
 
-    this.logs.debug('Stream destroyed', { forks: this.forks })
+    this.events.emit('destroy')
 
     super._destroy(error, callback)
   }
 
-  private heartbeat (stream: Readable = this): boolean {
+  public heartbeat (stream: Readable = this): boolean {
     const resume = stream.push('heartbeat ' + Date.now())
 
     if (!resume && this.interval !== null) {
@@ -48,21 +34,6 @@ export class Stream extends Readable {
 
     return resume
   }
-
-  private increment (): void {
-    this.forks++
-
-    this.logs.debug('Stream forked', { forks: this.forks })
-  }
-
-  private decrement (): void {
-    this.forks--
-
-    this.logs.debug('Stream fork closed', { forks: this.forks })
-
-    if (this.forks === 0)
-      this.destroy()
-  }
 }
 
 const HEARTBEAT_INTERVAL = 16_000 // why?

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toa.io/extensions.realtime",
-  "version": "1.0.0-alpha.201",
+  "version": "1.0.0-alpha.202",
   "description": "Toa Realtime",
   "author": "temich <tema.gurtovoy@gmail.com>",
   "homepage": "https://github.com/toa-io/toa#readme",
@@ -28,5 +28,5 @@
     "transpile": "npx tsc && npx tsc -p ./components/streams",
     "features": "npx cucumber-js"
   },
-  "gitHead": "e4955f36b0f2519516bc4be7c71e55a0e7cfdd44"
+  "gitHead": "4d230bb899fee0cd49b099db09749a01d01cda7e"
 }