3.0.28

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@push.rocks/smartstream",
-  "version": "3.0.19",
+  "version": "3.0.28",
   "private": false,
   "description": "simplifies access to node streams",
   "main": "dist_ts/index.js",
@@ -25,13 +25,12 @@
     "@git.zone/tsbuild": "^2.1.66",
     "@git.zone/tsrun": "^1.2.44",
     "@git.zone/tstest": "^1.0.84",
-    "@push.rocks/smartdelay": "^3.0.5",
     "@push.rocks/smartfile": "^11.0.0",
     "@push.rocks/tapbundle": "^5.0.15",
     "@types/node": "^20.9.0"
   },
   "dependencies": {
-    "@push.rocks/lik": "^6.0.6",
+    "@push.rocks/lik": "^6.0.12",
     "@push.rocks/smartpromise": "^4.0.3",
     "@push.rocks/smartrx": "^3.0.7"
   },

pnpm-lock.yaml

@@ -6,8 +6,8 @@ settings:
 
 dependencies:
   '@push.rocks/lik':
-    specifier: ^6.0.6
+    specifier: ^6.0.12
-    version: 6.0.6
+    version: 6.0.12
   '@push.rocks/smartpromise':
     specifier: ^4.0.3
     version: 4.0.3
@@ -25,9 +25,6 @@ devDependencies:
   '@git.zone/tstest':
     specifier: ^1.0.84
     version: 1.0.84(@types/node@20.9.0)(sinon@17.0.1)
-  '@push.rocks/smartdelay':
-    specifier: ^3.0.5
-    version: 3.0.5
   '@push.rocks/smartfile':
     specifier: ^11.0.0
     version: 11.0.0
@@ -49,7 +46,7 @@ packages:
     dependencies:
       '@api.global/typedrequest-interfaces': 3.0.1
       '@push.rocks/isounique': 1.0.5
-      '@push.rocks/lik': 6.0.6
+      '@push.rocks/lik': 6.0.12
       '@push.rocks/smartdelay': 3.0.5
       '@push.rocks/smartpromise': 4.0.3
       '@push.rocks/webrequest': 3.0.34
@@ -61,7 +58,7 @@ packages:
       '@api.global/typedrequest': 3.0.2
       '@api.global/typedrequest-interfaces': 3.0.1
       '@api.global/typedsocket': 3.0.0
-      '@push.rocks/lik': 6.0.6
+      '@push.rocks/lik': 6.0.12
       '@push.rocks/smartchok': 1.0.23
       '@push.rocks/smartdelay': 3.0.5
       '@push.rocks/smartenv': 5.0.12
@@ -579,8 +576,8 @@ packages:
     resolution: {integrity: sha512-Z0BVqZZOCif1THTbIKWMgg0wxCzt9CyBtBBqQJiZ+jJ0KlQFrQHNHrPt81/LXe/L4x0cxWsn0bpL6W5DNSvNLw==}
     dev: true
 
-  /@push.rocks/lik@6.0.6:
+  /@push.rocks/lik@6.0.12:
-    resolution: {integrity: sha512-5NVFbtR2XsGHxNqUbjFPp91J7mCWFPUc8bVfXIY2YgzhK/I5XI7yT+QBM+Bc2IvGLxjvQPkueRfPKl1IEnegeA==}
+    resolution: {integrity: sha512-/vzlOZ26gCmXZz67LeM2hJ+aNM49Jxvf3FKxLMXHhJwffd3LcV96MYbMfKzKR/za/bh5Itf3a6UjLL5mmN6Pew==}
     dependencies:
       '@push.rocks/smartdelay': 3.0.5
       '@push.rocks/smartmatch': 2.0.0
@@ -628,7 +625,7 @@ packages:
   /@push.rocks/smartcli@4.0.8:
     resolution: {integrity: sha512-B4F3nqq7ko8tev1wxGdFnh/zSDDP8Q9LpEOb3wTf0jayyhYetFQ7n6zi4J9fhXYBKPkJSyQEBoOfRmgJyeLHkA==}
     dependencies:
-      '@push.rocks/lik': 6.0.6
+      '@push.rocks/lik': 6.0.12
       '@push.rocks/smartlog': 3.0.3
       '@push.rocks/smartparam': 1.1.10
       '@push.rocks/smartpromise': 4.0.3
@@ -676,7 +673,7 @@ packages:
   /@push.rocks/smartfile@10.0.41:
     resolution: {integrity: sha512-xOOy0duI34M2qrJZggpk51EHGXmg9+mBL1Q55tNiQKXzfx89P3coY1EAZG8tvmep3qB712QEKe7T+u04t42Kjg==}
     dependencies:
-      '@push.rocks/lik': 6.0.6
+      '@push.rocks/lik': 6.0.12
       '@push.rocks/smartdelay': 3.0.5
       '@push.rocks/smartfile-interfaces': 1.0.7
       '@push.rocks/smarthash': 3.0.4
@@ -697,7 +694,7 @@ packages:
   /@push.rocks/smartfile@11.0.0:
     resolution: {integrity: sha512-S2JyuRiBu6tocKGTbdLgz0NcGuJ2fP7mD+NHryqdnvXzIwapE1jZ1XAF8/xiLuB9rmIs7agKFm+2Jj3/PtfIWw==}
     dependencies:
-      '@push.rocks/lik': 6.0.6
+      '@push.rocks/lik': 6.0.12
       '@push.rocks/smartdelay': 3.0.5
       '@push.rocks/smartfile-interfaces': 1.0.7
       '@push.rocks/smarthash': 3.0.4
@@ -899,7 +896,7 @@ packages:
       '@api.global/typedserver': 3.0.9
       '@push.rocks/isohash': 2.0.1
       '@push.rocks/isounique': 1.0.5
-      '@push.rocks/lik': 6.0.6
+      '@push.rocks/lik': 6.0.12
       '@push.rocks/smartdelay': 3.0.5
       '@push.rocks/smartenv': 5.0.12
       '@push.rocks/smartjson': 5.0.10
@@ -963,7 +960,7 @@ packages:
   /@push.rocks/smarttime@4.0.6:
     resolution: {integrity: sha512-1whOow0YJw/TbN758TedRRxApoZbsvyxCVpoGjXh7DE/fEEgs7RCr4vVF5jYpyXNQuNMLpKJcTsSfyQ6RvH4Aw==}
     dependencies:
-      '@push.rocks/lik': 6.0.6
+      '@push.rocks/lik': 6.0.12
       '@push.rocks/smartdelay': 3.0.5
       '@push.rocks/smartpromise': 4.0.3
       croner: 7.0.4
@@ -1026,7 +1023,7 @@ packages:
     resolution: {integrity: sha512-w5Q3g1TT5SDIXukAAoYVuWud+Y5ysS8qiBqPU00/re895VVZhUOSNJMNU6jyneZigmbWtwSLsxDkZHlsHWpfuA==}
     dependencies:
       '@apiglobal/typedrequest-interfaces': 2.0.1
-      '@push.rocks/lik': 6.0.6
+      '@push.rocks/lik': 6.0.12
       '@push.rocks/smartenv': 5.0.12
       '@push.rocks/smartjson': 5.0.10
       '@push.rocks/smartpromise': 4.0.3

test/backpressure.ts

@@ -1,57 +0,0 @@
-import { SmartDuplex, type ISmartDuplexOptions, StreamWrapper } from '../ts/index.js';
-
-import * as smartdelay from '@push.rocks/smartdelay';
-
-async function testBackpressure() {
-  const stream1 = new SmartDuplex({
-    objectMode: true,
-    handleBackpressure: true,
-    writeFunction: async (chunk, tools) => {
-      console.log(`processed chunk ${chunk} in stream 1`);
-      return chunk; // Fast processing
-    }
-  });
-  const stream2 = new SmartDuplex({
-    objectMode: true,
-    handleBackpressure: true,
-    writeFunction: async (chunk, tools) => {
-      await new Promise(resolve => setTimeout(resolve, 100)); // Slow processing
-      console.log(`processed chunk ${chunk} in stream 2`);
-      return chunk;
-    }
-  }); // This stream processes data more slowly
-  const stream3 = new SmartDuplex({
-    handleBackpressure: false,
-    writeFunction: async (chunk, tools) => {
-      console.log(`finished chunk ${chunk} in stream 3`);
-    }
-  });
-
-  stream1.pipe(stream2).pipe(stream3);
-
-  let backpressured = false;
-  for (let i = 1; i < 100; i++) {
-    const canContinue = stream1.write(`Chunk ${i}`, 'utf8');
-    if (!canContinue) {
-      backpressured = true;
-      console.log(`Backpressure at chunk ${i}`);
-    }
-  }
-
-  stream1.end();
-
-  stream1.on('finish', () => {
-    console.log('Stream 1 finished processing.');
-  });
-  stream2.on('finish', () => {
-    console.log('Stream 2 finished processing.');
-  });
-  stream3.on('finish', () => {
-    console.log('Stream 3 finished processing.');
-    if (!backpressured) {
-      console.log('No backpressure was observed.');
-    }
-  });
-}
-
-testBackpressure();

test/test.backpressure.ts

@@ -0,0 +1,68 @@
+import { tap, expect } from '@push.rocks/tapbundle';
+import { SmartDuplex, type ISmartDuplexOptions, StreamWrapper } from '../ts/index.js';
+
+tap.test('should run backpressure test', async (toolsArg) => {
+  const done = toolsArg.defer();
+  async function testBackpressure() {
+    const stream1 = new SmartDuplex({
+      name: 'stream1',
+      objectMode: true,
+      writeFunction: async (chunk, tools) => {
+        await new Promise((resolve) => setTimeout(resolve, 10)); // Slow processing
+        console.log(`processed chunk ${chunk} in stream 1`);
+        return chunk; // Fast processing
+      },
+    });
+    const stream2 = new SmartDuplex({
+      name: 'stream2',
+      objectMode: true,
+      writeFunction: async (chunk, tools) => {
+        await new Promise((resolve) => setTimeout(resolve, 20)); // Slow processing
+        console.log(`processed chunk ${chunk} in stream 2`);
+        await tools.push(chunk);
+        // return chunk;
+      },
+    }); // This stream processes data more slowly
+    const stream3 = new SmartDuplex({
+      objectMode: true,
+      name: 'stream3',
+      writeFunction: async (chunk, tools) => {
+        await new Promise((resolve) => setTimeout(resolve, 200)); // Slow processing
+        console.log(`processed chunk ${chunk} in stream 3`);
+      },
+    });
+
+    stream1.pipe(stream2).pipe(stream3);
+
+    let backpressured = false;
+    for (let i = 0; i < 200; i++) {
+      const canContinue = stream1.write(`Chunk ${i}`, 'utf8');
+      if (!canContinue) {
+        backpressured = true;
+        console.log(`Backpressure at chunk ${i}`);
+      }
+    }
+
+    stream1.end();
+
+    stream1.on('finish', () => {
+      console.log('Stream 1 finished processing.');
+    });
+    stream2.on('finish', () => {
+      console.log('Stream 2 finished processing.');
+    });
+    stream3.on('finish', () => {
+      console.log('Stream 3 finished processing.');
+      if (!backpressured) {
+        throw new Error('No backpressure was observed.');
+      } else {
+        done.resolve();
+      }
+    });
+  }
+
+  testBackpressure();
+  await done.promise;
+});
+
+await tap.start();

test/test.smartstream.ts

@@ -5,9 +5,7 @@ import * as fs from 'fs';
 
 tap.test('should create a SmartStream from a Buffer', async () => {
   const bufferData = Buffer.from('This is a test buffer');
-  const smartStream = SmartDuplex.fromBuffer(bufferData, {
+  const smartStream = SmartDuplex.fromBuffer(bufferData, {});
-    handleBackpressure: false,
-  });
   
   let receivedData = Buffer.alloc(0);
   
@@ -23,26 +21,4 @@ tap.test('should create a SmartStream from a Buffer', async () => {
   });
 });
 
-tap.test('should create a SmartStream from an Observable', async () => {
-  const observableData = 'Observable test data';
-  const testObservable = smartrx.rxjs.of(Buffer.from(observableData));
-  
-  const smartStream = SmartDuplex.fromObservable(testObservable, {
-    handleBackpressure: false,
-  });
-  
-  let receivedData = Buffer.alloc(0);
-
-  return new Promise<void>((resolve) => {
-    smartStream.on('data', (chunk: Buffer) => {
-      receivedData = Buffer.concat([receivedData, chunk]);
-    });
-
-    smartStream.on('end', () => {
-      expect(receivedData.toString()).toEqual(observableData);
-      resolve();
-    });
-  });
-});
-
 tap.start();

ts/00_commitinfo_data.ts

@@ -3,6 +3,6 @@
  */
 export const commitinfo = {
   name: '@push.rocks/smartstream',
-  version: '3.0.19',
+  version: '3.0.28',
   description: 'simplifies access to node streams'
 }

ts/index.ts

@@ -1,4 +1,3 @@
-export * from './smartstream.classes.passthrough.js';
 export * from './smartstream.classes.smartduplex.js';
 export * from './smartstream.classes.streamwrapper.js';
 export * from './smartstream.classes.streamintake.js';

ts/smartstream.classes.passthrough.ts

@@ -1,21 +0,0 @@
-import * as plugins from './smartstream.plugins.js';
-
-export class PassThrough extends plugins.stream.Duplex {
-  constructor(options?: plugins.stream.DuplexOptions) {
-    super(options);
-  }
-
-  _read(size: number): void {
-    // No-op: Data written will be automatically available for reading.
-  }
-
-  _write(chunk: any, encoding: BufferEncoding, callback: (error?: Error | null) => void): void {
-    if (this.push(chunk, encoding)) {
-      callback();
-    } else {
-      this.once('drain', () => {
-        callback();
-      });
-    }
-  }
-}

ts/smartstream.classes.smartduplex.ts

@@ -3,7 +3,7 @@ import { Duplex, type DuplexOptions } from 'stream';
 
 export interface IStreamTools {
   truncate: () => void;
-  push: (pipeObject: any) => void;
+  push: (pipeObject: any) => Promise<void>;
 }
 
 export interface IStreamWriteFunction<T, rT> {
@@ -15,7 +15,8 @@ export interface IStreamFinalFunction<rT> {
 }
 
 export interface ISmartDuplexOptions<TInput, TOutput> extends DuplexOptions {
-  handleBackpressure?: boolean;
+  debug?: boolean;
+  name?: string;
   readFunction?: () => Promise<void>;
   writeFunction?: IStreamWriteFunction<TInput, TOutput>;
   finalFunction?: IStreamFinalFunction<TOutput>;
@@ -33,141 +34,77 @@ export class SmartDuplex<TInput = any, TOutput = any> extends Duplex {
     return smartDuplex;
   }
 
-  static fromObservable(
-    observable: plugins.smartrx.rxjs.Observable<any>,
-    options?: ISmartDuplexOptions<any, any>
-  ): SmartDuplex {
-    const smartStream = new SmartDuplex(options);
-    smartStream.observableSubscription = observable.subscribe({
-      next: (data) => {
-        if (!smartStream.push(data) && smartStream.handleBackpressure) {
-          // Pause the observable if the stream buffer is full
-          smartStream.observableSubscription?.unsubscribe();
-          smartStream.once('drain', () => {
-            // Resume the observable when the stream buffer is drained
-            smartStream.observableSubscription?.unsubscribe();
-            smartStream.observableSubscription = observable.subscribe((data) => {
-              smartStream.push(data);
-            });
-          });
-        }
-      },
-      error: (err) => {
-        smartStream.emit('error', err);
-      },
-      complete: () => {
-        smartStream.push(null); // Signal the end of the data
-      },
-    });
-
-    return smartStream;
-  }
-
-  static fromReplaySubject(
-    replaySubject: plugins.smartrx.rxjs.ReplaySubject<any>,
-    options?: DuplexOptions
-  ): SmartDuplex {
-    const smartStream = new SmartDuplex(options);
-    let isBackpressured = false;
-
-    // Subscribe to the ReplaySubject
-    const subscription = replaySubject.subscribe({
-      next: (data) => {
-        const canPush = smartStream.push(data);
-        if (!canPush) {
-          // If push returns false, pause the subscription because of backpressure
-          isBackpressured = true;
-          subscription.unsubscribe();
-        }
-      },
-      error: (err) => {
-        smartStream.emit('error', err);
-      },
-      complete: () => {
-        smartStream.push(null); // End the stream when the ReplaySubject completes
-      },
-    });
-
-    // Listen for 'drain' event to resume the subscription if it was paused
-    smartStream.on('drain', () => {
-      if (isBackpressured) {
-        isBackpressured = false;
-        // Resubscribe to the ReplaySubject since we previously paused
-        smartStream.observableSubscription = replaySubject.subscribe({
-          next: (data) => {
-            if (!smartStream.push(data)) {
-              smartStream.observableSubscription?.unsubscribe();
-              isBackpressured = true;
-            }
-          },
-          // No need to repeat error and complete handling here because it's already set up above
-        });
-      }
-    });
-
-    return smartStream;
-  }
-
   // INSTANCE
-  private readFunction?: () => Promise<void>;
+  private backpressuredArray: plugins.lik.BackpressuredArray<TOutput>;
-  private handleBackpressure: boolean;
+  public options: ISmartDuplexOptions<TInput, TOutput>;
-  private writeFunction?: IStreamWriteFunction<TInput, TOutput>;
-  private finalFunction?: IStreamFinalFunction<TOutput>;
   private observableSubscription?: plugins.smartrx.rxjs.Subscription;
+  private debugLog(messageArg: string) {
+    if (this.options.debug) {
+      console.log(messageArg);
+    }
+  }
 
   constructor(optionsArg?: ISmartDuplexOptions<TInput, TOutput>) {
-    super(optionsArg);
+    super(Object.assign({
-    this.readFunction = optionsArg?.readFunction;
+      highWaterMark: 1,
-    this.writeFunction = optionsArg?.writeFunction;
+    }, optionsArg));
-    this.finalFunction = optionsArg?.finalFunction;
+    this.options = optionsArg;
-    this.handleBackpressure = optionsArg?.handleBackpressure ?? true;
+    this.backpressuredArray = new plugins.lik.BackpressuredArray<TOutput>(this.options.highWaterMark || 1)
   }
 
   public async _read(size: number): Promise<void> {
-    if (this.readFunction) {
+    this.debugLog(`${this.options.name}: read was called`);
-      await this.readFunction();
+    await this.backpressuredArray.waitForItems();
+    this.debugLog(`${this.options.name}: successfully waited for items.`);
+    if (this.options.readFunction) {
+      await this.options.readFunction();
+    }
+    let canPushMore = true; 
+    while(this.backpressuredArray.data.length > 0 && canPushMore) {
+      const nextChunk = this.backpressuredArray.shift();
+      canPushMore = this.push(nextChunk);
     }
   }
 
-  private asyncWritePromiseObjectmap = new plugins.lik.ObjectMap<Promise<any>>();
+  public async backpressuredPush (pushArg: TOutput) {
+    const canPushMore = this.backpressuredArray.push(pushArg);
+    if (!canPushMore) {
+      this.debugLog(`${this.options.name}: cannot push more`);
+      await this.backpressuredArray.waitForSpace();
+      this.debugLog(`${this.options.name}: can push more again`);
+    }
+  };
 
+  private asyncWritePromiseObjectmap = new plugins.lik.ObjectMap<Promise<any>>();
   // Ensure the _write method types the chunk as TInput and encodes TOutput
   public async _write(chunk: TInput, encoding: string, callback: (error?: Error | null) => void) {
-    if (!this.writeFunction) {
+    if (!this.options.writeFunction) {
       return callback(new Error('No stream function provided'));
     }
 
+    let isTruncated = false;
     const tools: IStreamTools = {
       truncate: () => {
         this.push(null);
+        isTruncated = true;
         callback();
       },
-      push: (pushArg: TOutput) => this.push(pushArg),
+      push: async (pushArg: TOutput) => {
+        await this.backpressuredPush(pushArg);
+      }
     };
 
     try {
       const writeDeferred = plugins.smartpromise.defer();
       this.asyncWritePromiseObjectmap.add(writeDeferred.promise);
-      const modifiedChunk = await this.writeFunction(chunk, tools);
+      const modifiedChunk = await this.options.writeFunction(chunk, tools);
-      if (modifiedChunk) {
+      if (isTruncated) {
-        const drainDeferred = plugins.smartpromise.defer();
+        return;
-        this.once('drain', () => {
-          drainDeferred.resolve();
-        });
-        const canPushMore = this.push(modifiedChunk);
-        if (!canPushMore) {
-          await drainDeferred.promise;
-          console.log('jojojo');
-          callback();
-          writeDeferred.resolve();
-        } else {
-          callback();
-          writeDeferred.resolve();
-        }
-      } else {
-        callback();
-        writeDeferred.resolve();
       }
+      if (modifiedChunk) {
+        await tools.push(modifiedChunk);
+      }
+      callback();
       writeDeferred.resolve();
       writeDeferred.promise.then(() => {
         this.asyncWritePromiseObjectmap.remove(writeDeferred.promise);
@@ -179,24 +116,26 @@ export class SmartDuplex<TInput = any, TOutput = any> extends Duplex {
 
   public async _final(callback: (error?: Error | null) => void) {
     await Promise.all(this.asyncWritePromiseObjectmap.getArray());
-    if (this.finalFunction) {
+    if (this.options.finalFunction) {
       const tools: IStreamTools = {
         truncate: () => callback(),
-        push: (pipeObject) => this.push(pipeObject),
+        push: async (pipeObject) => {
+          this.backpressuredArray.push(pipeObject);
+        },
       };
 
       try {
-        const finalChunk = await this.finalFunction(tools);
+        const finalChunk = await this.options.finalFunction(tools);
         if (finalChunk) {
-          this.push(finalChunk);
+          this.backpressuredArray.push(finalChunk);
         }
       } catch (err) {
-        this.push(null);
+        this.backpressuredArray.push(null);
         callback(err);
         return;
       }
     }
-    this.push(null);
+    this.backpressuredArray.push(null);
     callback();
   }
 }

ts/smartstream.functions.ts

@@ -19,3 +19,12 @@ export function createTransformFunction<TInput, TOutput>(
 
   return smartDuplexStream;
 }
+
+export const createPassThrough = () => {
+  return new SmartDuplex({
+    objectMode: true,
+    writeFunction: async (chunkArg, toolsArg) => {
+      return chunkArg;
+    }
+  })
+}