3.0.6

fix(core): update
3.0.5
2023-11-03 23:25:01 +01:00 · 2023-11-03 23:25:00 +01:00 · 2023-11-03 22:26:16 +01:00 · 2023-11-03 22:26:15 +01:00 · 2023-11-03 21:47:30 +01:00 · 2023-11-03 21:47:29 +01:00
17 changed files with 544 additions and 350 deletions
--- a/.gitea/workflows/default_nottags.yaml
+++ b/.gitea/workflows/default_nottags.yaml
@ -0,0 +1,66 @@
+name: Default (not tags)
+
+on:
+  push:
+    tags-ignore:
+      - '**'
+
+env:
+  IMAGE: registry.gitlab.com/hosttoday/ht-docker-node:npmci
+  NPMCI_COMPUTED_REPOURL: https://${{gitea.repository_owner}}:${{secrets.GITEA_TOKEN}}@gitea.lossless.digital/${{gitea.repository}}.git
+  NPMCI_TOKEN_NPM: ${{secrets.NPMCI_TOKEN_NPM}}
+  NPMCI_TOKEN_NPM2: ${{secrets.NPMCI_TOKEN_NPM2}}
+  NPMCI_GIT_GITHUBTOKEN: ${{secrets.NPMCI_GIT_GITHUBTOKEN}}
+  NPMCI_URL_CLOUDLY: ${{secrets.NPMCI_URL_CLOUDLY}}
+
+jobs:
+  security:
+    runs-on: ubuntu-latest
+    continue-on-error: true
+    container:
+      image: ${{ env.IMAGE }}
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Install pnpm and npmci
+        run: |
+          pnpm install -g pnpm
+          pnpm install -g @shipzone/npmci
+
+      - name: Run npm prepare
+        run: npmci npm prepare
+
+      - name: Audit production dependencies
+        run: |
+          npmci command npm config set registry https://registry.npmjs.org
+          npmci command pnpm audit --audit-level=high --prod
+        continue-on-error: true
+
+      - name: Audit development dependencies
+        run: |
+          npmci command npm config set registry https://registry.npmjs.org
+          npmci command pnpm audit --audit-level=high --dev
+        continue-on-error: true
+
+  test:
+    if: ${{ always() }}
+    needs: security
+    runs-on: ubuntu-latest
+    container:
+      image: ${{ env.IMAGE }}
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Test stable
+        run: |
+          npmci node install stable
+          npmci npm install
+          npmci npm test
+
+      - name: Test build
+        run: |
+          npmci node install stable
+          npmci npm install
+          npmci npm build
--- a/.gitea/workflows/default_tags.yaml
+++ b/.gitea/workflows/default_tags.yaml
@ -0,0 +1,124 @@
+name: Default (tags)
+
+on:
+  push:
+    tags:
+      - '*'
+
+env:
+  IMAGE: registry.gitlab.com/hosttoday/ht-docker-node:npmci
+  NPMCI_COMPUTED_REPOURL: https://${{gitea.repository_owner}}:${{secrets.GITEA_TOKEN}}@gitea.lossless.digital/${{gitea.repository}}.git
+  NPMCI_TOKEN_NPM: ${{secrets.NPMCI_TOKEN_NPM}}
+  NPMCI_TOKEN_NPM2: ${{secrets.NPMCI_TOKEN_NPM2}}
+  NPMCI_GIT_GITHUBTOKEN: ${{secrets.NPMCI_GIT_GITHUBTOKEN}}
+  NPMCI_URL_CLOUDLY: ${{secrets.NPMCI_URL_CLOUDLY}}
+
+jobs:
+  security:
+    runs-on: ubuntu-latest
+    continue-on-error: true
+    container:
+      image: ${{ env.IMAGE }}
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Prepare
+        run: |
+          pnpm install -g pnpm
+          pnpm install -g @shipzone/npmci
+          npmci npm prepare
+
+      - name: Audit production dependencies
+        run: |
+          npmci command npm config set registry https://registry.npmjs.org
+          npmci command pnpm audit --audit-level=high --prod
+        continue-on-error: true
+
+      - name: Audit development dependencies
+        run: |
+          npmci command npm config set registry https://registry.npmjs.org
+          npmci command pnpm audit --audit-level=high --dev
+        continue-on-error: true
+
+  test:
+    if: ${{ always() }}
+    needs: security
+    runs-on: ubuntu-latest
+    container:
+      image: ${{ env.IMAGE }}
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Prepare
+        run: |
+          pnpm install -g pnpm
+          pnpm install -g @shipzone/npmci
+          npmci npm prepare
+
+      - name: Test stable
+        run: |
+          npmci node install stable
+          npmci npm install
+          npmci npm test
+
+      - name: Test build
+        run: |
+          npmci node install stable
+          npmci npm install
+          npmci npm build
+
+  release:
+    needs: test
+    if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
+    runs-on: ubuntu-latest
+    container:
+      image: ${{ env.IMAGE }}
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Prepare
+        run: |
+          pnpm install -g pnpm
+          pnpm install -g @shipzone/npmci
+          npmci npm prepare
+
+      - name: Release
+        run: |
+          npmci node install stable
+          npmci npm publish
+
+  metadata:
+    needs: test
+    if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
+    runs-on: ubuntu-latest
+    container:
+      image: ${{ env.IMAGE }}
+    continue-on-error: true
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Prepare
+        run: |
+          pnpm install -g pnpm
+          pnpm install -g @shipzone/npmci
+          npmci npm prepare
+
+      - name: Code quality
+        run: |
+          npmci command npm install -g typescript
+          npmci npm install
+
+      - name: Trigger
+        run: npmci trigger
+
+      - name: Build docs and upload artifacts
+        run: |
+          npmci node install stable
+          npmci npm install
+          pnpm install -g @git.zone/tsdoc
+          npmci command tsdoc
+        continue-on-error: true
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "@push.rocks/smartstream",
-  "version": "2.0.7",
+  "version": "3.0.6",
  "private": false,
  "description": "simplifies access to node streams",
  "main": "dist_ts/index.js",
@ -8,32 +8,30 @@
  "type": "module",
  "scripts": {
    "test": "(tstest test/)",
-    "build": "(tsbuild)"
+    "build": "(tsbuild)",
+    "buildDocs": "tsdoc"
  },
  "repository": {
    "type": "git",
-    "url": "git+ssh://git@gitlab.com/pushrocks/smartstream.git"
+    "url": "git+https://gitlab.com/push.rocks/smartstream.git"
  },
  "author": "Lossless GmbH",
  "license": "MIT",
  "bugs": {
-    "url": "https://gitlab.com/pushrocks/smartstream/issues"
+    "url": "https://gitlab.com/push.rocks/smartstream/issues"
  },
-  "homepage": "https://gitlab.com/pushrocks/smartstream#README",
+  "homepage": "https://gitlab.com/push.rocks/smartstream#readme",
  "devDependencies": {
    "@git.zone/tsbuild": "^2.1.66",
    "@git.zone/tsrun": "^1.2.44",
    "@git.zone/tstest": "^1.0.77",
-    "@push.rocks/smartfile": "^10.0.33",
-    "@push.rocks/tapbundle": "^5.0.15"
+    "@push.rocks/smartfile": "^10.0.37",
+    "@push.rocks/tapbundle": "^5.0.15",
+    "@types/node": "^20.8.10"
  },
  "dependencies": {
    "@push.rocks/smartpromise": "^4.0.3",
-    "@push.rocks/smartrx": "^3.0.7",
-    "@types/from2": "^2.3.4",
-    "@types/through2": "^2.0.40",
-    "from2": "^2.3.0",
-    "through2": "^4.0.2"
+    "@push.rocks/smartrx": "^3.0.7"
  },
  "browserslist": [
    "last 1 chrome versions"
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@ -11,18 +11,6 @@ dependencies:
  '@push.rocks/smartrx':
    specifier: ^3.0.7
    version: 3.0.7
-  '@types/from2':
-    specifier: ^2.3.4
-    version: 2.3.4
-  '@types/through2':
-    specifier: ^2.0.40
-    version: 2.0.40
-  from2:
-    specifier: ^2.3.0
-    version: 2.3.0
-  through2:
-    specifier: ^4.0.2
-    version: 4.0.2

 devDependencies:
  '@git.zone/tsbuild':
@ -35,11 +23,14 @@ devDependencies:
    specifier: ^1.0.77
    version: 1.0.81(@types/node@20.8.10)(sinon@17.0.1)
  '@push.rocks/smartfile':
-    specifier: ^10.0.33
-    version: 10.0.33
+    specifier: ^10.0.37
+    version: 10.0.37
  '@push.rocks/tapbundle':
    specifier: ^5.0.15
    version: 5.0.15(sinon@17.0.1)
+  '@types/node':
+    specifier: ^20.8.10
+    version: 20.8.10

 packages:

@ -69,7 +60,7 @@ packages:
      '@push.rocks/smartdelay': 3.0.5
      '@push.rocks/smartenv': 5.0.10
      '@push.rocks/smartfeed': 1.0.11
-      '@push.rocks/smartfile': 10.0.33
+      '@push.rocks/smartfile': 10.0.37
      '@push.rocks/smartlog': 3.0.3
      '@push.rocks/smartlog-destination-devtools': 1.0.10
      '@push.rocks/smartmanifest': 2.0.2
@ -77,7 +68,7 @@ packages:
      '@push.rocks/smartopen': 2.0.0
      '@push.rocks/smartpath': 5.0.11
      '@push.rocks/smartpromise': 4.0.3
-      '@push.rocks/smartrequest': 2.0.18
+      '@push.rocks/smartrequest': 2.0.20
      '@push.rocks/smartrx': 3.0.7
      '@push.rocks/smartsitemap': 2.0.3
      '@push.rocks/smarttime': 4.0.6
@ -88,7 +79,7 @@ packages:
      cors: 2.8.5
      express: 4.18.2
      express-force-ssl: 0.3.2
-      lit: 3.0.1
+      lit: 3.0.2
    transitivePeerDependencies:
      - bufferutil
      - supports-color
@ -354,7 +345,7 @@ packages:
      '@push.rocks/early': 4.0.4
      '@push.rocks/smartcli': 4.0.8
      '@push.rocks/smartdelay': 3.0.5
-      '@push.rocks/smartfile': 10.0.33
+      '@push.rocks/smartfile': 10.0.37
      '@push.rocks/smartlog': 3.0.3
      '@push.rocks/smartpath': 5.0.11
      '@push.rocks/smartpromise': 4.0.3
@ -368,7 +359,7 @@ packages:
      '@push.rocks/early': 4.0.4
      '@push.rocks/smartcli': 4.0.8
      '@push.rocks/smartdelay': 3.0.5
-      '@push.rocks/smartfile': 10.0.33
+      '@push.rocks/smartfile': 10.0.37
      '@push.rocks/smartlog': 3.0.3
      '@push.rocks/smartlog-destination-local': 9.0.1
      '@push.rocks/smartpath': 5.0.11
@ -386,7 +377,7 @@ packages:
    resolution: {integrity: sha512-8miFVBle9Mnjx+uPGI/P+EuWcIOXWjBAkdjN5IYbdp5Ytt4xQODCLh4JSnC9h56UeU1nUxCAxZeJs2e9TXrivA==}
    hasBin: true
    dependencies:
-      '@push.rocks/smartfile': 10.0.33
+      '@push.rocks/smartfile': 10.0.37
      '@push.rocks/smartshell': 3.0.3
      ts-node: 10.9.1(@types/node@20.8.10)(typescript@5.1.6)
      typescript: 5.1.6
@ -406,7 +397,7 @@ packages:
      '@push.rocks/consolecolor': 2.0.1
      '@push.rocks/smartbrowser': 2.0.6
      '@push.rocks/smartdelay': 3.0.5
-      '@push.rocks/smartfile': 10.0.33
+      '@push.rocks/smartfile': 10.0.37
      '@push.rocks/smartlog': 3.0.3
      '@push.rocks/smartpromise': 4.0.3
      '@push.rocks/smartshell': 3.0.3
@ -670,8 +661,8 @@ packages:
    resolution: {integrity: sha512-MeOl/200UOvSO4Pgq/DVFiBVZpL9gjOBQM+4XYNjSxda8c6VBvchHAntaFLQUlO8U1ckNaP9i+nMO4O4/0ymyw==}
    dev: true

-  /@push.rocks/smartfile@10.0.33:
-    resolution: {integrity: sha512-mCvTWP32MCFtFcZVuGzvazyxQSrPhlaLkWTydz8IZ32/V41vvxieXDiPwoF64lcIYO37EZEXElYdBBjqCJ8MuA==}
+  /@push.rocks/smartfile@10.0.37:
+    resolution: {integrity: sha512-RlWq5Q4ObvFh7Jv00Mkjx3gQDFedR6qo1ZT8OutjmQ3d+wLeLxi+LbcMHzWWO2NjPQP59T65TWpxF9iqZcS5wQ==}
    dependencies:
      '@push.rocks/lik': 6.0.5
      '@push.rocks/smartdelay': 3.0.5
@ -681,8 +672,8 @@ packages:
      '@push.rocks/smartmime': 1.0.6
      '@push.rocks/smartpath': 5.0.11
      '@push.rocks/smartpromise': 4.0.3
-      '@push.rocks/smartrequest': 2.0.18
-      '@push.rocks/smartstream': 2.0.4
+      '@push.rocks/smartrequest': 2.0.20
+      '@push.rocks/smartstream': 2.0.8
      '@types/fs-extra': 11.0.3
      '@types/glob': 8.1.0
      '@types/js-yaml': 4.0.8
@ -788,7 +779,7 @@ packages:
    resolution: {integrity: sha512-W5tR1rlgrs7MoXEEGgnuJOAGLFxXTHDCgHpdhrtlt5M3t/ELZvaJoyMNRwrt3BbWEAb86dr4QwWSt380Q3MhfQ==}
    dependencies:
      '@push.rocks/smartdelay': 3.0.5
-      '@push.rocks/smartfile': 10.0.33
+      '@push.rocks/smartfile': 10.0.37
      '@push.rocks/smartnetwork': 3.0.2
      '@push.rocks/smartpath': 5.0.11
      '@push.rocks/smartpromise': 4.0.3
@ -823,8 +814,8 @@ packages:
      - utf-8-validate
    dev: true

-  /@push.rocks/smartrequest@2.0.18:
-    resolution: {integrity: sha512-MsTou9rRHhlhBC83dUGoi6quYKrWD9urI23Bcgk2GjvkiOpaddpSib6x1cQfidoOVpwP7LaVDMD+tFnW4CpWRA==}
+  /@push.rocks/smartrequest@2.0.20:
+    resolution: {integrity: sha512-7Y22kOS9CGJLjayjpRbkoDxd5kqmnG9WDY1WWR3/kqo63WFhdgHueatmJjT/v1QqvKSG88gL36kG4f7YG/0xTA==}
    dependencies:
      '@push.rocks/smartpromise': 4.0.3
      '@push.rocks/smarturl': 3.0.7
@ -895,8 +886,8 @@ packages:
      - supports-color
    dev: true

-  /@push.rocks/smartstream@2.0.4:
-    resolution: {integrity: sha512-rbQf4+sLle9ga6RidRv0WXb/TuLFcMordRQBbqPq01n/mpBHoEiqIThWzVuImPVRVuSK/LKbM/QX4Ey26FFerg==}
+  /@push.rocks/smartstream@2.0.8:
+    resolution: {integrity: sha512-GlF/9cCkvBHwKa3DK4DO5wjfSgqkj6gAS4TrY9uD5NMHu9RQv4WiNrElTYj7iCEpnZgUnLO3tzw1JA3NRIMnnA==}
    dependencies:
      '@push.rocks/smartpromise': 4.0.3
      '@push.rocks/smartrx': 3.0.7
@ -1448,6 +1439,7 @@ packages:
    resolution: {integrity: sha512-Ofj/U9ytMjG5FIfFlTokSyGQdLgX8js+hbw9/qxZQbsGRjcjQPzoLGZhe6OEzrg7Sd98Il57iyxDtU1ArvCSTw==}
    dependencies:
      '@types/node': 20.8.10
+    dev: true

  /@types/fs-extra@11.0.3:
    resolution: {integrity: sha512-sF59BlXtUdzEAL1u0MSvuzWd7PdZvZEtnaVkzX5mjpdWTJ8brG0jUqve3jPCzSzvAKKMHTG8F8o/WMQLtleZdQ==}
@ -1460,7 +1452,7 @@ packages:
    resolution: {integrity: sha512-IO+MJPVhoqz+28h1qLAcBEH2+xHMK6MTyHJc7MTnnYb6wsoLR29POVGJ7LycmVXIqyy/4/2ShP5sUwTXuOwb/w==}
    dependencies:
      '@types/minimatch': 5.1.2
-      '@types/node': 20.4.1
+      '@types/node': 20.8.10
    dev: true

  /@types/html-minifier@4.0.4:
@ -1560,14 +1552,11 @@ packages:
    resolution: {integrity: sha512-NYrtPht0wGzhwe9+/idPaBB+TqkY9AhTvOLMkThm0IoEfLaiVQZwBwyJ5puCkO3AUCWrmcoePjp2mbFocKy4SQ==}
    dev: true

-  /@types/node@20.4.1:
-    resolution: {integrity: sha512-JIzsAvJeA/5iY6Y/OxZbv1lUcc8dNSE77lb2gnBH+/PJ3lFR1Ccvgwl5JWnHAkNHcRsT0TbpVOsiMKZ1F/yyJg==}
-    dev: true
-
  /@types/node@20.8.10:
    resolution: {integrity: sha512-TlgT8JntpcbmKUFzjhsyhGfP2fsiz1Mv56im6enJ905xG1DAYesxJaeSbGqQmAw8OWPdhyJGhGSQGKRNJ45u9w==}
    dependencies:
      undici-types: 5.26.5
+    dev: true

  /@types/parse5@6.0.3:
    resolution: {integrity: sha512-SuT16Q1K51EAVPz1K29DJ/sXjhSQ0zjvsypYJ6tlwVsRV9jwW5Adq2ch8Dq8kDBCkYnELS7N7VNCSB5nC56t/g==}
@ -1637,6 +1626,7 @@ packages:
    resolution: {integrity: sha512-QeEwyeGxvtKjP0I/SR8pHtKMgmqotWTI8V/rNMTjbF3arWZJV/kYtbZXtwQKxUuV/oPSGkUilSspFKkTgCPTpA==}
    dependencies:
      '@types/node': 20.8.10
+    dev: true

  /@types/trusted-types@2.0.5:
    resolution: {integrity: sha512-I3pkr8j/6tmQtKV/ZzHtuaqYSQvyjGRKH4go60Rr0IDLlFxuRT5V32uvB1mecM5G1EVAUyF/4r4QZ1GHgz+mxA==}
@ -1769,8 +1759,8 @@ packages:
      - utf-8-validate
    dev: true

-  /@xmldom/xmldom@0.8.8:
-    resolution: {integrity: sha512-0LNz4EY8B/8xXY86wMrQ4tz6zEHZv9ehFMJPm8u2gq5lQ71cfRKdaKyxfJAx5aUoyzx0qzgURblTisPGgz3d+Q==}
+  /@xmldom/xmldom@0.8.10:
+    resolution: {integrity: sha512-2WALfTl4xo2SkGCYRt6rDTFfk9R1czmBvUQy12gK2KuRKIpWEhcbbzy8EZXtz/jkRqHX8bFEc6FC1HjX4TUWYw==}
    engines: {node: '>=10.0.0'}
    dev: true

@ -2106,13 +2096,6 @@ packages:
      responselike: 3.0.0
    dev: true

-  /call-bind@1.0.2:
-    resolution: {integrity: sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==}
-    dependencies:
-      function-bind: 1.1.1
-      get-intrinsic: 1.2.1
-    dev: true
-
  /call-bind@1.0.5:
    resolution: {integrity: sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ==}
    dependencies:
@ -2331,6 +2314,7 @@ packages:

  /core-util-is@1.0.3:
    resolution: {integrity: sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==}
+    dev: true

  /cors@2.8.5:
    resolution: {integrity: sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==}
@ -2479,14 +2463,6 @@ packages:
    engines: {node: '>=8'}
    dev: true

-  /define-properties@1.2.0:
-    resolution: {integrity: sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      has-property-descriptors: 1.0.0
-      object-keys: 1.1.1
-    dev: true
-
  /define-properties@1.2.1:
    resolution: {integrity: sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==}
    engines: {node: '>= 0.4'}
@ -2967,7 +2943,7 @@ packages:
    engines: {node: '>=14'}
    dependencies:
      cross-spawn: 7.0.3
-      signal-exit: 4.0.2
+      signal-exit: 4.1.0
    dev: true

  /form-data-encoder@2.1.4:
@ -2999,6 +2975,7 @@ packages:
    dependencies:
      inherits: 2.0.4
      readable-stream: 2.3.8
+    dev: true

  /fs-constants@1.0.0:
    resolution: {integrity: sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==}
@ -3010,7 +2987,7 @@ packages:
    dependencies:
      graceful-fs: 4.2.11
      jsonfile: 6.1.0
-      universalify: 2.0.0
+      universalify: 2.0.1
    dev: true

  /fs.realpath@1.0.0:
@ -3025,10 +3002,6 @@ packages:
    dev: true
    optional: true

-  /function-bind@1.1.1:
-    resolution: {integrity: sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==}
-    dev: true
-
  /function-bind@1.1.2:
    resolution: {integrity: sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==}
    dev: true
@ -3056,15 +3029,6 @@ packages:
    resolution: {integrity: sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==}
    dev: true

-  /get-intrinsic@1.2.1:
-    resolution: {integrity: sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==}
-    dependencies:
-      function-bind: 1.1.1
-      has: 1.0.3
-      has-proto: 1.0.1
-      has-symbols: 1.0.3
-    dev: true
-
  /get-intrinsic@1.2.2:
    resolution: {integrity: sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA==}
    dependencies:
@ -3200,12 +3164,6 @@ packages:
    engines: {node: '>=8'}
    dev: true

-  /has-property-descriptors@1.0.0:
-    resolution: {integrity: sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==}
-    dependencies:
-      get-intrinsic: 1.2.1
-    dev: true
-
  /has-property-descriptors@1.0.1:
    resolution: {integrity: sha512-VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg==}
    dependencies:
@ -3229,13 +3187,6 @@ packages:
      has-symbols: 1.0.3
    dev: true

-  /has@1.0.3:
-    resolution: {integrity: sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==}
-    engines: {node: '>= 0.4.0'}
-    dependencies:
-      function-bind: 1.1.1
-    dev: true
-
  /hasown@2.0.0:
    resolution: {integrity: sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==}
    engines: {node: '>= 0.4'}
@ -3377,6 +3328,7 @@ packages:

  /inherits@2.0.4:
    resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==}
+    dev: true

  /internal-slot@1.0.6:
    resolution: {integrity: sha512-Xj6dv+PsbtwyPpEflsejS+oIZxmMlV44zAhG479uYu89MsjcYOhCFnNyKrkJrihbsiasQyY0afoCl/9BLR65bg==}
@ -3493,8 +3445,8 @@ packages:
    resolution: {integrity: sha512-E+zBKpQ2t6MEo1VsonYmluk9NxGrbzpeeLC2xIViuO2EjU2xsXsBPwTr3Ykv9l08UYEVEdWeRZNouaZqF6RN0w==}
    engines: {node: '>= 0.4'}
    dependencies:
-      call-bind: 1.0.2
-      define-properties: 1.2.0
+      call-bind: 1.0.5
+      define-properties: 1.2.1
    dev: true

  /is-negative-zero@2.0.2:
@ -3593,6 +3545,7 @@ packages:

  /isarray@1.0.0:
    resolution: {integrity: sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=}
+    dev: true

  /isarray@2.0.5:
    resolution: {integrity: sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==}
@ -3680,7 +3633,7 @@ packages:
  /jsonfile@6.1.0:
    resolution: {integrity: sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==}
    dependencies:
-      universalify: 2.0.0
+      universalify: 2.0.1
    optionalDependencies:
      graceful-fs: 4.2.11
    dev: true
@ -3788,25 +3741,25 @@ packages:
    dependencies:
      '@lit-labs/ssr-dom-shim': 1.1.2
      '@lit/reactive-element': 2.0.1
-      lit-html: 3.0.1
+      lit-html: 3.0.2
    dev: true

  /lit-html@1.4.1:
    resolution: {integrity: sha512-B9btcSgPYb1q4oSOb/PrOT6Z/H+r6xuNzfH4lFli/AWhYwdtrgQkQWBbIc6mdnf6E2IL3gDXdkkqNktpU0OZQA==}
    dev: true

-  /lit-html@3.0.1:
-    resolution: {integrity: sha512-1nmGaNNQg9rBvE1yJ6oS3ZNbLs3FXtlG4+jgGkix8O740qVEwwiFVTgDGIIH8N5TcQ8V9tBk5T+sxqBgffcjJg==}
+  /lit-html@3.0.2:
+    resolution: {integrity: sha512-Q1A5lHza3bnmxoWJn6yS6vQZQdExl4fghk8W1G+jnAEdoFNYo5oeBBb/Ol7zSEdKd3TR7+r0zsJQyuWEVguiyQ==}
    dependencies:
      '@types/trusted-types': 2.0.5
    dev: true

-  /lit@3.0.1:
-    resolution: {integrity: sha512-CYFv7/gwrs6bfPm299O9LD/HB4dgHvsEf/yqUOI//fi469i2OrT4xaptUcmhr05DNQEgsBFecFH8EJnN5So8oQ==}
+  /lit@3.0.2:
+    resolution: {integrity: sha512-ZoVUPGgXOQocP4OvxehEOBmC4rWB4cRYDPaz7aFmH8DFytsCi/NeACbr4C6vNPGDEC07BrhUos7uVNayDKLQ2Q==}
    dependencies:
      '@lit/reactive-element': 2.0.1
      lit-element: 4.0.1
-      lit-html: 3.0.1
+      lit-html: 3.0.2
    dev: true

  /locate-path@3.0.0:
@ -3927,8 +3880,8 @@ packages:
    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
    dev: true

-  /lru-cache@10.0.0:
-    resolution: {integrity: sha512-svTf/fzsKHffP42sujkO/Rjs37BCIsQVRCeNYIm9WN8rgT7ffoUnRtZCqU+6BqcSBdv8gwJeTz8knJpgACeQMw==}
+  /lru-cache@10.0.1:
+    resolution: {integrity: sha512-IJ4uwUTi2qCccrioU6g9g/5rvvVl13bsdczUUcqbciD9iLr095yj8DQKdObriEvuNSx325N1rV1O0sJFszx75g==}
    engines: {node: 14 || >=16.14}
    dev: true

@ -4069,11 +4022,6 @@ packages:
    resolution: {integrity: sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==}
    dev: true

-  /minipass@7.0.2:
-    resolution: {integrity: sha512-eL79dXrE1q9dBbDCLg7xfn/vl7MS4F1gvJAgjJrQli/jbQWdUttuVawphqpffoIYfRdq78LHx6GP4bU/EQ2ATA==}
-    engines: {node: '>=16 || 14 >=14.17'}
-    dev: true
-
  /minipass@7.0.4:
    resolution: {integrity: sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==}
    engines: {node: '>=16 || 14 >=14.17'}
@ -4225,10 +4173,6 @@ packages:
    engines: {node: '>=0.10.0'}
    dev: true

-  /object-inspect@1.12.3:
-    resolution: {integrity: sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==}
-    dev: true
-
  /object-inspect@1.13.1:
    resolution: {integrity: sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==}
    dev: true
@ -4403,8 +4347,8 @@ packages:
    resolution: {integrity: sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ==}
    engines: {node: '>=16 || 14 >=14.17'}
    dependencies:
-      lru-cache: 10.0.0
-      minipass: 7.0.2
+      lru-cache: 10.0.1
+      minipass: 7.0.4
    dev: true

  /path-to-regexp@0.1.7:
@ -4437,7 +4381,7 @@ packages:
    engines: {node: '>=14.18.0', npm: '>=6.14.15'}
    hasBin: true
    dependencies:
-      '@xmldom/xmldom': 0.8.8
+      '@xmldom/xmldom': 0.8.10
    dev: true
    bundledDependencies:
      - '@xmldom/xmldom'
@ -4491,6 +4435,7 @@ packages:

  /process-nextick-args@2.0.1:
    resolution: {integrity: sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==}
+    dev: true

  /progress@2.0.3:
    resolution: {integrity: sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==}
@ -4626,6 +4571,7 @@ packages:
      safe-buffer: 5.1.2
      string_decoder: 1.1.1
      util-deprecate: 1.0.2
+    dev: true

  /readable-stream@3.6.2:
    resolution: {integrity: sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==}
@ -4634,6 +4580,7 @@ packages:
      inherits: 2.0.4
      string_decoder: 1.3.0
      util-deprecate: 1.0.2
+    dev: true

  /readdirp@3.6.0:
    resolution: {integrity: sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==}
@ -4747,9 +4694,11 @@ packages:

  /safe-buffer@5.1.2:
    resolution: {integrity: sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==}
+    dev: true

  /safe-buffer@5.2.1:
    resolution: {integrity: sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==}
+    dev: true

  /safe-regex-test@1.0.0:
    resolution: {integrity: sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==}
@ -4870,17 +4819,17 @@ packages:
  /side-channel@1.0.4:
    resolution: {integrity: sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==}
    dependencies:
-      call-bind: 1.0.2
-      get-intrinsic: 1.2.1
-      object-inspect: 1.12.3
+      call-bind: 1.0.5
+      get-intrinsic: 1.2.2
+      object-inspect: 1.13.1
    dev: true

  /signal-exit@3.0.7:
    resolution: {integrity: sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==}
    dev: true

-  /signal-exit@4.0.2:
-    resolution: {integrity: sha512-MY2/qGx4enyjprQnFaZsHib3Yadh3IXyV2C321GY0pjGfVBu4un0uDJkwgdxqO+Rdx8JMT8IfJIRwbYVz3Ob3Q==}
+  /signal-exit@4.1.0:
+    resolution: {integrity: sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==}
    engines: {node: '>=14'}
    dev: true

@ -5073,11 +5022,13 @@ packages:
    resolution: {integrity: sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==}
    dependencies:
      safe-buffer: 5.1.2
+    dev: true

  /string_decoder@1.3.0:
    resolution: {integrity: sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==}
    dependencies:
      safe-buffer: 5.2.1
+    dev: true

  /strip-ansi@4.0.0:
    resolution: {integrity: sha1-qEeQIusaw2iocTibY1JixQXuNo8=}
@ -5192,6 +5143,7 @@ packages:
    resolution: {integrity: sha512-iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw==}
    dependencies:
      readable-stream: 3.6.2
+    dev: true

  /through@2.3.8:
    resolution: {integrity: sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=}
@ -5390,6 +5342,7 @@ packages:

  /undici-types@5.26.5:
    resolution: {integrity: sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==}
+    dev: true

  /unicode-trie@0.3.1:
    resolution: {integrity: sha1-1nHd3YkQGgi6w3tqUWEBBgIFIIU=}
@ -5398,8 +5351,8 @@ packages:
      tiny-inflate: 1.0.3
    dev: true

-  /universalify@2.0.0:
-    resolution: {integrity: sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==}
+  /universalify@2.0.1:
+    resolution: {integrity: sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==}
    engines: {node: '>= 10.0.0'}
    dev: true

@ -5426,6 +5379,7 @@ packages:

  /util-deprecate@1.0.2:
    resolution: {integrity: sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=}
+    dev: true

  /utils-merge@1.0.1:
    resolution: {integrity: sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=}
--- a/test/assets/writabletext.txt
+++ b/test/assets/writabletext.txt
@ -48,4 +48,3 @@ hi+wow
 hi+wow
 hi+wow
 hi+wow
-noice
--- a/test/test.smartstream.ts
+++ b/test/test.smartstream.ts
@ -1,11 +1,11 @@
 import { expect, tap } from '@push.rocks/tapbundle';
-import { SmartStream } from '../ts/smartstream.classes.smartstream.js'; // Adjust the import to your file structure
+import { SmartDuplex } from '../ts/smartstream.classes.smartduplex.js'; // Adjust the import to your file structure
 import * as smartrx from '@push.rocks/smartrx';
 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 = SmartStream.fromBuffer(bufferData);
+  const smartStream = SmartDuplex.fromBuffer(bufferData);
  
  let receivedData = Buffer.alloc(0);
  
@ -25,7 +25,7 @@ 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 = SmartStream.fromObservable(testObservable);
+  const smartStream = SmartDuplex.fromObservable(testObservable);
  
  let receivedData = Buffer.alloc(0);

--- a/test/test.streamfunction.ts
+++ b/test/test.streamfunction.ts
@ -7,45 +7,42 @@ let testIntake: smartstream.StreamIntake<string>;

 tap.test('should handle a read stream', async (tools) => {
  const counter = 0;
-  const testSmartstream = new smartstream.StreamWrapper([
+  const streamWrapper = new smartstream.StreamWrapper([
    smartfile.fsStream.createReadStream('./test/assets/readabletext.txt'),
-    smartstream.createDuplexStream<Buffer, Buffer>(
-      async (chunkStringArg: Buffer, streamTools) => {
+    new smartstream.SmartDuplex({
+      writeAndTransformFunction: async (chunkStringArg: Buffer, streamTools) => {
        // do something with the stream here
        const result = chunkStringArg.toString().substr(0, 100);
-        streamTools.pipeMore('wow =========== \n');
+        streamTools.push('wow =========== \n');
        return Buffer.from(result);
      },
-      async (tools) => {
-        // tools.pipeMore('hey, this is the end')
+      finalFunction: async (tools) => {
        return Buffer.from('this is the end');
      },
-      { objectMode: false }
-    ),
-    smartstream.createDuplexStream<Buffer, string>(async (chunkStringArg) => {
-      console.log(chunkStringArg.toString());
-      return null;
    }),
-    smartstream.cleanPipe(),
+    new smartstream.SmartDuplex({
+      writeAndTransformFunction: async (chunkStringArg) => {
+        console.log(chunkStringArg.toString());
+      },
+      finalFunction: async (tools) => {
+        tools.push(null);
+      },
+    })
  ]);
-  await testSmartstream.run();
+  // await streamWrapper.run();
 });

 tap.test('should create a valid Intake', async (tools) => {
  testIntake = new smartstream.StreamIntake<string>();
-  testIntake
-    .getReadable()
-    .pipe(
-      smartstream.createDuplexStream<string, string>(
-        async (chunkString) => {
+  testIntake.pipe(
+      new smartstream.SmartDuplex({
+        objectMode: true,
+        writeAndTransformFunction: async (chunkStringArg: string, streamTools) => {
          await tools.delayFor(100);
-          console.log(chunkString);
-          return chunkString;
-        },
-        async () => {
-          return 'noice';
+          console.log(chunkStringArg);
+          return chunkStringArg;
        }
-      )
+      })
    )
    .pipe(smartfile.fsStream.createWriteStream('./test/assets/writabletext.txt'));
  const testFinished = tools.defer();
--- a/ts/00_commitinfo_data.ts
+++ b/ts/00_commitinfo_data.ts
@ -3,6 +3,6 @@
 */
 export const commitinfo = {
  name: '@push.rocks/smartstream',
-  version: '2.0.7',
+  version: '3.0.6',
  description: 'simplifies access to node streams'
 }
--- a/ts/index.ts
+++ b/ts/index.ts
@ -1,4 +1,6 @@
-export * from './smartstream.classes.smartstream.js';
+export * from './smartstream.classes.passthrough.js';
+export * from './smartstream.classes.smartduplex.js';
 export * from './smartstream.classes.streamwrapper.js';
 export * from './smartstream.classes.streamintake.js';
-export * from './smartstream.duplex.js';
+
+export * from './smartstream.functions.js'
--- a/ts/smartstream.classes.passthrough.ts
+++ b/ts/smartstream.classes.passthrough.ts
@ -0,0 +1,19 @@
+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);
+    }
+  }
+}
--- a/ts/smartstream.classes.smartduplex.ts
+++ b/ts/smartstream.classes.smartduplex.ts
@ -0,0 +1,177 @@
+import * as plugins from './smartstream.plugins.js';
+import { Duplex, type DuplexOptions } from 'stream';
+
+export interface IStreamTools {
+  truncate: () => void;
+  push: (pipeObject: any) => void;
+}
+
+export interface IWriteAndTransformFunction<T, rT> {
+  (chunkArg: T, toolsArg: IStreamTools): Promise<rT>;
+}
+
+export interface IStreamEndFunction<rT> {
+  (toolsArg: IStreamTools): Promise<rT>;
+}
+
+export interface SmartStreamOptions<TInput, TOutput> extends DuplexOptions {
+  readFunction?: () => Promise<void>;
+  writeAndTransformFunction?: IWriteAndTransformFunction<TInput, TOutput>;
+  finalFunction?: IStreamEndFunction<TOutput>;
+  // Add other custom options if necessary
+}
+
+export class SmartDuplex<TInput = any, TOutput = any> extends Duplex {
+  // STATIC
+  static fromBuffer(buffer: Buffer, options?: DuplexOptions): SmartDuplex {
+    const smartStream = new SmartDuplex(options);
+    process.nextTick(() => {
+      smartStream.push(buffer);
+      smartStream.push(null); // Signal the end of the data
+    });
+    return smartStream;
+  }
+
+  static fromObservable(
+    observable: plugins.smartrx.rxjs.Observable<any>,
+    options?: DuplexOptions
+  ): SmartDuplex {
+    const smartStream = new SmartDuplex(options);
+    smartStream.observableSubscription = observable.subscribe({
+      next: (data) => {
+        if (!smartStream.push(data)) {
+          // 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 writeAndTransformFunction?: IWriteAndTransformFunction<TInput, TOutput>;
+  private streamEndFunction?: IStreamEndFunction<TOutput>;
+  private observableSubscription?: plugins.smartrx.rxjs.Subscription;
+
+  constructor(optionsArg?: SmartStreamOptions<TInput, TOutput>) {
+    super(optionsArg);
+    this.readFunction = optionsArg?.readFunction;
+    this.writeAndTransformFunction = optionsArg?.writeAndTransformFunction;
+    this.streamEndFunction = optionsArg?.finalFunction;
+  }
+
+  public async _read(size: number): Promise<void> {
+    if (this.readFunction) {
+      await this.readFunction();
+    }
+  }
+
+  // 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.writeAndTransformFunction) {
+      return callback(new Error('No stream function provided'));
+    }
+
+    const tools: IStreamTools = {
+      truncate: () => {
+        this.push(null);
+        callback();
+      },
+      push: (pushArg: TOutput) => this.push(pushArg),
+    };
+
+    try {
+      const modifiedChunk = await this.writeAndTransformFunction(chunk, tools);
+      if (modifiedChunk) {
+        if (!this.push(modifiedChunk)) {
+          // Handle backpressure if necessary
+        }
+      }
+      callback();
+    } catch (err) {
+      callback(err);
+    }
+  }
+
+  public async _final(callback: (error?: Error | null) => void) {
+    if (this.streamEndFunction) {
+      const tools: IStreamTools = {
+        truncate: () => callback(),
+        push: (pipeObject) => this.push(pipeObject),
+      };
+
+      try {
+        const finalChunk = await this.streamEndFunction(tools);
+        if (finalChunk) {
+          this.push(finalChunk);
+        }
+        callback();
+      } catch (err) {
+        callback(err);
+      }
+    } else {
+      this.push(null),
+      callback();
+    }
+  }
+}
--- a/ts/smartstream.classes.smartstream.ts
+++ b/ts/smartstream.classes.smartstream.ts
@ -1,55 +0,0 @@
-import * as plugins from './smartstream.plugins.js';
-import { Duplex, type DuplexOptions } from 'stream';
-
-export class SmartStream extends Duplex {
-  private observableSubscription?: plugins.smartrx.rxjs.Subscription;
-
-  constructor(options?: DuplexOptions) {
-    super(options);
-  }
-
-  _read(size: number) {
-    // Implement if you need custom behavior, otherwise leave it empty
-  }
-
-  _write(chunk: any, encoding: string, callback: (error?: Error | null) => void) {
-    // Implement if you need custom behavior
-    callback();
-  }
-
-  static fromBuffer(buffer: Buffer, options?: DuplexOptions): SmartStream {
-    const smartStream = new SmartStream(options);
-    process.nextTick(() => {
-      smartStream.push(buffer);
-      smartStream.push(null); // Signal the end of the data
-    });
-    return smartStream;
-  }
-
-  static fromObservable(observable: plugins.smartrx.rxjs.Observable<any>, options?: DuplexOptions): SmartStream {
-    const smartStream = new SmartStream(options);
-    smartStream.observableSubscription = observable.subscribe({
-      next: (data) => {
-        if (!smartStream.push(data)) {
-          // 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;
-  }
-}
--- a/ts/smartstream.classes.streamintake.ts
+++ b/ts/smartstream.classes.streamintake.ts
@ -1,56 +1,42 @@
 import * as plugins from './smartstream.plugins.js';

-export class StreamIntake<T> {
+export class StreamIntake<T> extends plugins.stream.Readable {
  private signalEndBoolean = false;
  private chunkStore: T[] = [];
-
  public pushNextObservable = new plugins.smartrx.ObservableIntake<any>();
-
  private pushedNextDeferred = plugins.smartpromise.defer();

-  private readableStream = plugins.from2.obj(async (size, next) => {
+  constructor(options?: plugins.stream.ReadableOptions) {
+    super({ ...options, objectMode: true }); // Ensure that we are in object mode.
+    this.pushNextObservable.push('please push next');
+  }
+
+  _read(size: number): void {
    // console.log('get next');
-    // execute without backpressure
-    while (this.chunkStore.length > 0) {
-      next(null, this.chunkStore.shift());
-    }
-    if (this.signalEndBoolean) {
-      next(null, null);
-    }
+    const pushChunk = (): void => {
+      if (this.chunkStore.length > 0) {
+        // If push returns false, then we should stop reading
+        if (!this.push(this.chunkStore.shift())) {
+          return;
+        }
+      }

-    // lets trigger backpressure handling
-    this.pushNextObservable.push('please push next');
-    await this.pushedNextDeferred.promise;
-    this.pushedNextDeferred = plugins.smartpromise.defer();
+      if (this.chunkStore.length === 0) {
+        if (this.signalEndBoolean) {
+          // If we're done, push null to signal the end of the stream
+          this.push(null);
+        } else {
+          // Ask for more data and wait
+          this.pushNextObservable.push('please push next');
+          this.pushedNextDeferred.promise.then(() => {
+            this.pushedNextDeferred = plugins.smartpromise.defer(); // Reset the deferred
+            pushChunk(); // Try pushing the next chunk
+          });
+        }
+      }
+    };

-    // execute with backpressure
-    while (this.chunkStore.length > 0) {
-      next(null, this.chunkStore.shift());
-    }
-    if (this.signalEndBoolean) {
-      next(null, null);
-    }
-  });
-
-  constructor() {
-    this.pushNextObservable.push('please push next');
-  }
-
-  /**
-   * returns a new style readble stream
-   */
-  public getReadable() {
-    const readable = new plugins.stream.Readable({
-      objectMode: true,
-    });
-    return readable.wrap(this.readableStream);
-  }
-
-  /**
-   * returns an oldstyle readble stream
-   */
-  public getReadableStream() {
-    return this.readableStream;
+    pushChunk();
  }

  public pushData(chunkData: T) {
--- a/ts/smartstream.classes.streamwrapper.ts
+++ b/ts/smartstream.classes.streamwrapper.ts
@ -94,14 +94,3 @@ export class StreamWrapper {
    return done.promise;
  }
 }
-
-export let cleanPipe = () => {
-  return plugins.through2.obj(
-    (file, enc, cb) => {
-      cb();
-    },
-    (cb) => {
-      cb();
-    }
-  );
-};
--- a/ts/smartstream.duplex.ts
+++ b/ts/smartstream.duplex.ts
@ -1,83 +0,0 @@
-import * as plugins from './smartstream.plugins.js';
-
-export interface ITruncateFunc {
-  (): void;
-}
-
-export interface IPipeMoreFunc {
-  (pipeObject: any): void;
-}
-
-export interface IStreamTools {
-  truncate: ITruncateFunc;
-  pipeMore: IPipeMoreFunc;
-}
-
-export interface IStreamFunction<T, rT> {
-  (chunkArg: T, toolsArg: IStreamTools): Promise<rT>;
-}
-
-export interface IStreamEndFunction<rT> {
-  (toolsArg: IStreamTools): Promise<rT>;
-}
-
-export interface IStreamOptions {
-  objectMode?: boolean;
-  readableObjectMode?: boolean;
-  writableObjectMode?: boolean;
-}
-
-export let createDuplexStream = <T, rT>(
-  funcArg: IStreamFunction<T, rT>,
-  endFuncArg?: IStreamEndFunction<rT>,
-  optionsArg: IStreamOptions = {
-    objectMode: false,
-    readableObjectMode: true,
-    writableObjectMode: true,
-  }
-) => {
-  return plugins.through2(
-    optionsArg,
-    function (chunk, enc, cb) {
-      let truncated = false;
-      const tools: IStreamTools = {
-        truncate: () => {
-          truncated = true;
-          cb(null, null);
-        },
-        pipeMore: (pipeObject) => {
-          this.push(pipeObject);
-        },
-      };
-      const asyncWrapper = async () => {
-        const resultChunk: rT = await funcArg(chunk, tools);
-        if (!truncated) {
-          cb(null, resultChunk);
-        }
-      };
-      asyncWrapper().catch((err) => {
-        console.log(err);
-      });
-    },
-    function (cb) {
-      const tools: IStreamTools = {
-        truncate: () => {
-          cb();
-        },
-        pipeMore: (pushArg) => {
-          this.push(pushArg);
-        },
-      };
-      const asyncWrapper = async () => {
-        if (endFuncArg) {
-          const result = await endFuncArg(tools);
-          this.push(result);
-        }
-        cb();
-      };
-      asyncWrapper().catch((err) => {
-        console.log(err);
-      });
-    }
-  );
-};
--- a/ts/smartstream.functions.ts
+++ b/ts/smartstream.functions.ts
@ -0,0 +1,26 @@
+import { Transform, type TransformCallback, type TransformOptions } from 'stream';
+
+export interface AsyncTransformFunction<TInput, TOutput> {
+  (chunkArg: TInput): Promise<TOutput>;
+}
+
+export function createTransformFunction<TInput, TOutput>(
+  asyncFunction: AsyncTransformFunction<TInput, TOutput>,
+  options?: TransformOptions
+): Transform {
+  const transformStream = new Transform({
+    ...options,
+    objectMode: true, // Ensure we operate in object mode
+    async transform(chunk: TInput, encoding: string, callback: TransformCallback) {
+      try {
+        const transformed = await asyncFunction(chunk);
+        this.push(transformed);
+        callback();
+      } catch (error) {
+        callback(error instanceof Error ? error : new Error(String(error)));
+      }
+    }
+  });
+
+  return transformStream;
+}
--- a/ts/smartstream.plugins.ts
+++ b/ts/smartstream.plugins.ts
@ -9,8 +9,3 @@ import * as smartrx from '@push.rocks/smartrx';

 export { smartpromise, smartrx };

-// thirdparty
-import from2 from 'from2';
-import through2 from 'through2';
-
-export { from2, through2 };
Author	SHA1	Message	Date
Philipp Kunz	1b6e38c040	3.0.6	2023-11-03 23:25:01 +01:00
Philipp Kunz	b135e6023a	fix(core): update	2023-11-03 23:25:00 +01:00
Philipp Kunz	91d01f3689	3.0.5	2023-11-03 22:26:16 +01:00
Philipp Kunz	e8e067ea77	fix(core): update	2023-11-03 22:26:15 +01:00
Philipp Kunz	2cb490cd2a	3.0.4	2023-11-03 21:47:30 +01:00
Philipp Kunz	98397bb85e	fix(core): update	2023-11-03 21:47:29 +01:00
Philipp Kunz	f52b0de21f	3.0.3	2023-11-03 21:36:10 +01:00
Philipp Kunz	1c0e5f264d	fix(core): update	2023-11-03 21:36:10 +01:00
Philipp Kunz	8a3c653213	3.0.2	2023-11-03 21:33:11 +01:00
Philipp Kunz	456ce78917	fix(core): update	2023-11-03 21:33:10 +01:00
Philipp Kunz	5277083097	3.0.1	2023-11-03 21:32:25 +01:00
Philipp Kunz	8618ac55ef	fix(core): update	2023-11-03 21:32:24 +01:00
Philipp Kunz	ea66d1b2fb	3.0.0	2023-11-03 13:55:56 +01:00
Philipp Kunz	c37f62abec	BREAKING CHANGE(core): update	2023-11-03 13:55:56 +01:00
Philipp Kunz	2c904cc1ec	2.0.8	2023-11-02 00:30:16 +01:00
Philipp Kunz	d1561ad1b7	fix(core): update	2023-11-02 00:30:15 +01:00