@naturalcycles/cloud-storage-lib 2.5.0 → 2.6.0

package/dist/cloudStorage.d.ts

@@ -1,7 +1,7 @@
 import type { Storage, StorageOptions } from '@google-cloud/storage';
 import type { LocalTimeInput } from '@naturalcycles/js-lib/datetime';
 import type { CommonLogger } from '@naturalcycles/js-lib/log';
-import type { ReadableBinary, ReadableTyped, WritableBinary } from '@naturalcycles/nodejs-lib/stream';
+import { Pipeline, type WritableTyped } from '@naturalcycles/nodejs-lib/stream';
 import type { CommonStorage, CommonStorageGetOptions, FileEntry } from './commonStorage.js';
 import type { GCPServiceAccount } from './model.js';
 export type { Storage, StorageOptions, };
@@ -47,16 +47,16 @@ export declare class CloudStorage implements CommonStorage {
     deletePaths(bucketName: string, prefixes: string[]): Promise<void>;
     fileExists(bucketName: string, filePath: string): Promise<boolean>;
     getFileNames(bucketName: string, opt?: CommonStorageGetOptions): Promise<string[]>;
-    getFileNamesStream(bucketName: string, opt?: CommonStorageGetOptions): ReadableTyped<string>;
-    getFilesStream(bucketName: string, opt?: CommonStorageGetOptions): ReadableTyped<FileEntry>;
+    getFileNamesStream(bucketName: string, opt?: CommonStorageGetOptions): Pipeline<string>;
+    getFilesStream(bucketName: string, opt?: CommonStorageGetOptions): Pipeline<FileEntry>;
     getFile(bucketName: string, filePath: string): Promise<Buffer | null>;
     /**
      * Returns a Readable that is NOT object mode,
      * so you can e.g pipe it to fs.createWriteStream()
      */
-    getFileReadStream(bucketName: string, filePath: string): ReadableBinary;
+    getFileReadStream(bucketName: string, filePath: string): Pipeline<Uint8Array>;
     saveFile(bucketName: string, filePath: string, content: Buffer): Promise<void>;
-    getFileWriteStream(bucketName: string, filePath: string): WritableBinary;
+    getFileWriteStream(bucketName: string, filePath: string): WritableTyped<Uint8Array>;
     uploadFile(localFilePath: string, bucketName: string, bucketFilePath: string): Promise<void>;
     setFileVisibility(bucketName: string, filePath: string, isPublic: boolean): Promise<void>;
     getFileVisibility(bucketName: string, filePath: string): Promise<boolean>;

package/dist/cloudStorage.js

@@ -4,6 +4,7 @@ import { _assert } from '@naturalcycles/js-lib/error/assert.js';
 import { pMap } from '@naturalcycles/js-lib/promise/pMap.js';
 import { _substringAfterLast } from '@naturalcycles/js-lib/string';
 import { SKIP } from '@naturalcycles/js-lib/types';
+import { Pipeline } from '@naturalcycles/nodejs-lib/stream';
 const MAX_RECURSION_DEPTH = 10;
 const BATCH_SIZE = 32;
 /**
@@ -80,30 +81,23 @@ export class CloudStorage {
     }
     getFileNamesStream(bucketName, opt = {}) {
         const { prefix, fullPaths = true } = opt;
-        return this.storage.bucket(bucketName).getFilesStream({
+        return Pipeline.from(this.storage.bucket(bucketName).getFilesStream({
             prefix,
             maxResults: opt.limit || undefined,
-        }).flatMap(f => {
-            const r = this.normalizeFilename(f.name, fullPaths);
-            if (r === SKIP)
-                return [];
-            return [r];
-        });
+        })).mapSync(f => this.normalizeFilename(f.name, fullPaths));
     }
     getFilesStream(bucketName, opt = {}) {
         const { prefix, fullPaths = true } = opt;
-        return this.storage.bucket(bucketName).getFilesStream({
+        return Pipeline.from(this.storage.bucket(bucketName).getFilesStream({
             prefix,
             maxResults: opt.limit || undefined,
-        }).flatMap(async (f) => {
+        })).map(async (f) => {
             const filePath = this.normalizeFilename(f.name, fullPaths);
             if (filePath === SKIP)
-                return [];
+                return SKIP;
             const [content] = await f.download();
-            return [{ filePath, content }];
-        }, {
-            concurrency: 16,
-        });
+            return { filePath, content };
+        }, { concurrency: 16 });
     }
     async getFile(bucketName, filePath) {
         const [buf] = await this.storage
@@ -122,7 +116,7 @@ export class CloudStorage {
      * so you can e.g pipe it to fs.createWriteStream()
      */
     getFileReadStream(bucketName, filePath) {
-        return this.storage.bucket(bucketName).file(filePath).createReadStream();
+        return Pipeline.from(this.storage.bucket(bucketName).file(filePath).createReadStream());
     }
     async saveFile(bucketName, filePath, content) {
         await this.storage.bucket(bucketName).file(filePath).save(content);

package/dist/commonStorage.d.ts

@@ -1,5 +1,5 @@
 import type { LocalTimeInput } from '@naturalcycles/js-lib/datetime';
-import type { ReadableBinary, ReadableTyped, WritableBinary } from '@naturalcycles/nodejs-lib/stream';
+import type { Pipeline, WritableTyped } from '@naturalcycles/nodejs-lib/stream';
 export interface FileEntry {
     filePath: string;
     content: Buffer;
@@ -69,10 +69,13 @@ export interface CommonStorage {
      * return all files from sub-directories too!
      */
     getFileNames: (bucketName: string, opt?: CommonStorageGetOptions) => Promise<string[]>;
-    getFileNamesStream: (bucketName: string, opt?: CommonStorageGetOptions) => ReadableTyped<string>;
-    getFilesStream: (bucketName: string, opt?: CommonStorageGetOptions) => ReadableTyped<FileEntry>;
-    getFileReadStream: (bucketName: string, filePath: string) => ReadableBinary;
-    getFileWriteStream: (bucketName: string, filePath: string) => WritableBinary;
+    getFileNamesStream: (bucketName: string, opt?: CommonStorageGetOptions) => Pipeline<string>;
+    getFilesStream: (bucketName: string, opt?: CommonStorageGetOptions) => Pipeline<FileEntry>;
+    /**
+     * Returns a Pipeline with binary output, objectMode=false.
+     */
+    getFileReadStream: (bucketName: string, filePath: string) => Pipeline<Uint8Array>;
+    getFileWriteStream: (bucketName: string, filePath: string) => WritableTyped<Uint8Array>;
     /**
      * Upload local file to the bucket (by streaming it).
      */

package/dist/commonStorageBucket.d.ts

@@ -1,5 +1,5 @@
-import type { Readable, Writable } from 'node:stream';
-import type { ReadableTyped } from '@naturalcycles/nodejs-lib/stream';
+import type { Writable } from 'node:stream';
+import type { Pipeline } from '@naturalcycles/nodejs-lib/stream';
 import type { CommonStorage, CommonStorageGetOptions, FileEntry } from './commonStorage.js';
 export interface CommonStorageBucketCfg {
     storage: CommonStorage;
@@ -56,9 +56,9 @@ export declare class CommonStorageBucket {
      * return all files from sub-directories too!
      */
     getFileNames(opt?: CommonStorageGetOptions): Promise<string[]>;
-    getFileNamesStream(opt?: CommonStorageGetOptions): ReadableTyped<string>;
-    getFilesStream(opt?: CommonStorageGetOptions): ReadableTyped<FileEntry>;
-    getFileReadStream(filePath: string): Readable;
+    getFileNamesStream(opt?: CommonStorageGetOptions): Pipeline<string>;
+    getFilesStream(opt?: CommonStorageGetOptions): Pipeline<FileEntry>;
+    getFileReadStream(filePath: string): Pipeline<Uint8Array>;
     getFileWriteStream(filePath: string): Writable;
     setFileVisibility(filePath: string, isPublic: boolean): Promise<void>;
     getFileVisibility(filePath: string): Promise<boolean>;

package/dist/commonStorageKeyValueDB.d.ts

@@ -1,6 +1,6 @@
 import type { CommonDBCreateOptions } from '@naturalcycles/db-lib';
 import type { CommonKeyValueDB, IncrementTuple, KeyValueDBTuple } from '@naturalcycles/db-lib/kv';
-import type { ReadableTyped } from '@naturalcycles/nodejs-lib/stream';
+import type { Pipeline } from '@naturalcycles/nodejs-lib/stream';
 import type { CommonStorage } from './commonStorage.js';
 export interface CommonStorageKeyValueDBCfg {
     storage: CommonStorage;
@@ -27,9 +27,9 @@ export declare class CommonStorageKeyValueDB implements CommonKeyValueDB {
     deleteByIds(table: string, ids: string[]): Promise<void>;
     getByIds(table: string, ids: string[]): Promise<KeyValueDBTuple[]>;
     saveBatch(table: string, entries: KeyValueDBTuple[]): Promise<void>;
-    streamIds(table: string, limit?: number): ReadableTyped<string>;
-    streamValues(table: string, limit?: number): ReadableTyped<Buffer>;
-    streamEntries(table: string, limit?: number): ReadableTyped<KeyValueDBTuple>;
+    streamIds(table: string, limit?: number): Pipeline<string>;
+    streamValues(table: string, limit?: number): Pipeline<Buffer>;
+    streamEntries(table: string, limit?: number): Pipeline<KeyValueDBTuple>;
     count(table: string): Promise<number>;
     incrementBatch(_table: string, _entries: IncrementTuple[]): Promise<IncrementTuple[]>;
 }

package/dist/commonStorageKeyValueDB.js

@@ -69,13 +69,13 @@ export class CommonStorageKeyValueDB {
     }
     streamValues(table, limit) {
         const { bucketName, prefix } = this.getBucketAndPrefix(table);
-        return this.cfg.storage.getFilesStream(bucketName, { prefix, limit }).map(f => f.content);
+        return this.cfg.storage.getFilesStream(bucketName, { prefix, limit }).mapSync(f => f.content);
     }
     streamEntries(table, limit) {
         const { bucketName, prefix } = this.getBucketAndPrefix(table);
         return this.cfg.storage
             .getFilesStream(bucketName, { prefix, limit, fullPaths: false })
-            .map(f => [f.filePath, f.content]);
+            .mapSync(f => [f.filePath, f.content]);
     }
     async count(table) {
         const { bucketName, prefix } = this.getBucketAndPrefix(table);

package/dist/inMemoryCommonStorage.d.ts

@@ -1,6 +1,6 @@
 import type { LocalTimeInput } from '@naturalcycles/js-lib/datetime';
 import type { StringMap } from '@naturalcycles/js-lib/types';
-import type { ReadableBinary, ReadableTyped, WritableBinary } from '@naturalcycles/nodejs-lib/stream';
+import { Pipeline, type WritableTyped } from '@naturalcycles/nodejs-lib/stream';
 import type { CommonStorage, CommonStorageGetOptions, FileEntry } from './commonStorage.js';
 export declare class InMemoryCommonStorage implements CommonStorage {
     /**
@@ -10,7 +10,7 @@ export declare class InMemoryCommonStorage implements CommonStorage {
     publicMap: StringMap<StringMap<boolean>>;
     ping(): Promise<void>;
     getBucketNames(): Promise<string[]>;
-    getBucketNamesStream(): ReadableTyped<string>;
+    getBucketNamesStream(): Pipeline<string>;
     fileExists(bucketName: string, filePath: string): Promise<boolean>;
     getFile(bucketName: string, filePath: string): Promise<Buffer | null>;
     saveFile(bucketName: string, filePath: string, content: Buffer): Promise<void>;
@@ -18,10 +18,10 @@ export declare class InMemoryCommonStorage implements CommonStorage {
     deletePaths(bucketName: string, prefixes: string[]): Promise<void>;
     deleteFiles(bucketName: string, filePaths: string[]): Promise<void>;
     getFileNames(bucketName: string, opt?: CommonStorageGetOptions): Promise<string[]>;
-    getFileNamesStream(bucketName: string, opt?: CommonStorageGetOptions): ReadableTyped<string>;
-    getFilesStream(bucketName: string, opt?: CommonStorageGetOptions): ReadableTyped<FileEntry>;
-    getFileReadStream(bucketName: string, filePath: string): ReadableBinary;
-    getFileWriteStream(_bucketName: string, _filePath: string): WritableBinary;
+    getFileNamesStream(bucketName: string, opt?: CommonStorageGetOptions): Pipeline<string>;
+    getFilesStream(bucketName: string, opt?: CommonStorageGetOptions): Pipeline<FileEntry>;
+    getFileReadStream(bucketName: string, filePath: string): Pipeline<Uint8Array>;
+    getFileWriteStream(_bucketName: string, _filePath: string): WritableTyped<Uint8Array>;
     uploadFile(localFilePath: string, bucketName: string, bucketFilePath: string): Promise<void>;
     setFileVisibility(bucketName: string, filePath: string, isPublic: boolean): Promise<void>;
     getFileVisibility(bucketName: string, filePath: string): Promise<boolean>;

package/dist/inMemoryCommonStorage.js

@@ -6,6 +6,7 @@ import { _substringAfterLast } from '@naturalcycles/js-lib/string';
 import { _stringMapEntries } from '@naturalcycles/js-lib/types';
 import { md5 } from '@naturalcycles/nodejs-lib';
 import { fs2 } from '@naturalcycles/nodejs-lib/fs2';
+import { Pipeline } from '@naturalcycles/nodejs-lib/stream';
 export class InMemoryCommonStorage {
     /**
      * data[bucketName][filePath] = Buffer
@@ -17,7 +18,7 @@ export class InMemoryCommonStorage {
         return Object.keys(this.data);
     }
     getBucketNamesStream() {
-        return Readable.from(Object.keys(this.data));
+        return Pipeline.fromArray(Object.keys(this.data));
     }
     async fileExists(bucketName, filePath) {
         return !!this.data[bucketName]?.[filePath];
@@ -52,14 +53,14 @@ export class InMemoryCommonStorage {
     }
     getFileNamesStream(bucketName, opt = {}) {
         const { prefix = '', fullPaths = true } = opt;
-        return Readable.from(Object.keys(this.data[bucketName] || {})
+        return Pipeline.fromArray(Object.keys(this.data[bucketName] || {})
             .filter(filePath => filePath.startsWith(prefix))
             .slice(0, opt.limit)
             .map(n => (fullPaths ? n : _substringAfterLast(n, '/'))));
     }
     getFilesStream(bucketName, opt = {}) {
         const { prefix = '', fullPaths = true } = opt;
-        return Readable.from(_stringMapEntries(this.data[bucketName] || {})
+        return Pipeline.fromArray(_stringMapEntries(this.data[bucketName] || {})
             .map(([filePath, content]) => ({
             filePath,
             content,
@@ -69,7 +70,7 @@ export class InMemoryCommonStorage {
             .map(f => (fullPaths ? f : { ...f, filePath: _substringAfterLast(f.filePath, '/') })));
     }
     getFileReadStream(bucketName, filePath) {
-        return Readable.from(this.data[bucketName][filePath]);
+        return Pipeline.from(Readable.from(this.data[bucketName][filePath]));
     }
     getFileWriteStream(_bucketName, _filePath) {
         throw new Error('Method not implemented.');

package/package.json

@@ -11,7 +11,7 @@
   "devDependencies": {
     "@types/node": "^24",
     "firebase-admin": "^13",
-    "@naturalcycles/dev-lib": "18.4.2"
+    "@naturalcycles/dev-lib": "19.37.0"
   },
   "exports": {
     ".": "./dist/index.js"
@@ -37,7 +37,7 @@
   "engines": {
     "node": ">=22.12.0"
   },
-  "version": "2.5.0",
+  "version": "2.6.0",
   "description": "CommonStorage implementation based on Google Cloud Storage",
   "author": "Natural Cycles Team",
   "license": "MIT",

package/src/cloudStorage.ts

@@ -8,11 +8,7 @@ import { pMap } from '@naturalcycles/js-lib/promise/pMap.js'
 import { _substringAfterLast } from '@naturalcycles/js-lib/string'
 import type { UnixTimestampMillis } from '@naturalcycles/js-lib/types'
 import { SKIP } from '@naturalcycles/js-lib/types'
-import type {
-  ReadableBinary,
-  ReadableTyped,
-  WritableBinary,
-} from '@naturalcycles/nodejs-lib/stream'
+import { Pipeline, type WritableTyped } from '@naturalcycles/nodejs-lib/stream'
 import type { CommonStorage, CommonStorageGetOptions, FileEntry } from './commonStorage.js'
 import type { GCPServiceAccount } from './model.js'
 
@@ -40,6 +36,7 @@ export interface CloudStorageCfg {
    */
   logger?: CommonLogger
 
+  // todo: refactor to logLevel
   /**
    * Pass true for extra debugging
    */
@@ -142,40 +139,34 @@ export class CloudStorage implements CommonStorage {
     return files.map(f => _substringAfterLast(f.name, '/')).filter(Boolean)
   }
 
-  getFileNamesStream(bucketName: string, opt: CommonStorageGetOptions = {}): ReadableTyped<string> {
+  getFileNamesStream(bucketName: string, opt: CommonStorageGetOptions = {}): Pipeline<string> {
     const { prefix, fullPaths = true } = opt
 
-    return (
+    return Pipeline.from<File>(
       this.storage.bucket(bucketName).getFilesStream({
         prefix,
         maxResults: opt.limit || undefined,
-      }) as ReadableTyped<File>
-    ).flatMap(f => {
-      const r = this.normalizeFilename(f.name, fullPaths)
-      if (r === SKIP) return []
-      return [r]
-    })
+      }),
+    ).mapSync(f => this.normalizeFilename(f.name, fullPaths))
   }
 
-  getFilesStream(bucketName: string, opt: CommonStorageGetOptions = {}): ReadableTyped<FileEntry> {
+  getFilesStream(bucketName: string, opt: CommonStorageGetOptions = {}): Pipeline<FileEntry> {
     const { prefix, fullPaths = true } = opt
 
-    return (
+    return Pipeline.from<File>(
       this.storage.bucket(bucketName).getFilesStream({
         prefix,
         maxResults: opt.limit || undefined,
-      }) as ReadableTyped<File>
-    ).flatMap(
+      }),
+    ).map(
       async f => {
         const filePath = this.normalizeFilename(f.name, fullPaths)
-        if (filePath === SKIP) return []
+        if (filePath === SKIP) return SKIP
 
         const [content] = await f.download()
-        return [{ filePath, content }] as FileEntry[]
-      },
-      {
-        concurrency: 16,
+        return { filePath, content } satisfies FileEntry
       },
+      { concurrency: 16 },
     )
   }
 
@@ -196,15 +187,15 @@ export class CloudStorage implements CommonStorage {
    * Returns a Readable that is NOT object mode,
    * so you can e.g pipe it to fs.createWriteStream()
    */
-  getFileReadStream(bucketName: string, filePath: string): ReadableBinary {
-    return this.storage.bucket(bucketName).file(filePath).createReadStream()
+  getFileReadStream(bucketName: string, filePath: string): Pipeline<Uint8Array> {
+    return Pipeline.from(this.storage.bucket(bucketName).file(filePath).createReadStream())
   }
 
   async saveFile(bucketName: string, filePath: string, content: Buffer): Promise<void> {
     await this.storage.bucket(bucketName).file(filePath).save(content)
   }
 
-  getFileWriteStream(bucketName: string, filePath: string): WritableBinary {
+  getFileWriteStream(bucketName: string, filePath: string): WritableTyped<Uint8Array> {
     return this.storage.bucket(bucketName).file(filePath).createWriteStream()
   }
 

package/src/commonStorage.ts

@@ -1,9 +1,5 @@
 import type { LocalTimeInput } from '@naturalcycles/js-lib/datetime'
-import type {
-  ReadableBinary,
-  ReadableTyped,
-  WritableBinary,
-} from '@naturalcycles/nodejs-lib/stream'
+import type { Pipeline, WritableTyped } from '@naturalcycles/nodejs-lib/stream'
 
 export interface FileEntry {
   filePath: string
@@ -90,13 +86,16 @@ export interface CommonStorage {
    */
   getFileNames: (bucketName: string, opt?: CommonStorageGetOptions) => Promise<string[]>
 
-  getFileNamesStream: (bucketName: string, opt?: CommonStorageGetOptions) => ReadableTyped<string>
+  getFileNamesStream: (bucketName: string, opt?: CommonStorageGetOptions) => Pipeline<string>
 
-  getFilesStream: (bucketName: string, opt?: CommonStorageGetOptions) => ReadableTyped<FileEntry>
+  getFilesStream: (bucketName: string, opt?: CommonStorageGetOptions) => Pipeline<FileEntry>
 
-  getFileReadStream: (bucketName: string, filePath: string) => ReadableBinary
+  /**
+   * Returns a Pipeline with binary output, objectMode=false.
+   */
+  getFileReadStream: (bucketName: string, filePath: string) => Pipeline<Uint8Array>
 
-  getFileWriteStream: (bucketName: string, filePath: string) => WritableBinary
+  getFileWriteStream: (bucketName: string, filePath: string) => WritableTyped<Uint8Array>
 
   /**
    * Upload local file to the bucket (by streaming it).

package/src/commonStorageBucket.ts

@@ -1,7 +1,7 @@
-import type { Readable, Writable } from 'node:stream'
+import type { Writable } from 'node:stream'
 import { AppError } from '@naturalcycles/js-lib/error/error.util.js'
 import { pMap } from '@naturalcycles/js-lib/promise/pMap.js'
-import type { ReadableTyped } from '@naturalcycles/nodejs-lib/stream'
+import type { Pipeline } from '@naturalcycles/nodejs-lib/stream'
 import type { CommonStorage, CommonStorageGetOptions, FileEntry } from './commonStorage.js'
 
 export interface CommonStorageBucketCfg {
@@ -160,15 +160,15 @@ export class CommonStorageBucket {
     return await this.cfg.storage.getFileNames(this.cfg.bucketName, opt)
   }
 
-  getFileNamesStream(opt?: CommonStorageGetOptions): ReadableTyped<string> {
+  getFileNamesStream(opt?: CommonStorageGetOptions): Pipeline<string> {
     return this.cfg.storage.getFileNamesStream(this.cfg.bucketName, opt)
   }
 
-  getFilesStream(opt?: CommonStorageGetOptions): ReadableTyped<FileEntry> {
+  getFilesStream(opt?: CommonStorageGetOptions): Pipeline<FileEntry> {
     return this.cfg.storage.getFilesStream(this.cfg.bucketName, opt)
   }
 
-  getFileReadStream(filePath: string): Readable {
+  getFileReadStream(filePath: string): Pipeline<Uint8Array> {
     return this.cfg.storage.getFileReadStream(this.cfg.bucketName, filePath)
   }
 

package/src/commonStorageKeyValueDB.ts

@@ -4,7 +4,7 @@ import { commonKeyValueDBFullSupport } from '@naturalcycles/db-lib/kv'
 import { AppError } from '@naturalcycles/js-lib/error/error.util.js'
 import { pMap } from '@naturalcycles/js-lib/promise/pMap.js'
 import type { StringMap } from '@naturalcycles/js-lib/types'
-import type { ReadableTyped } from '@naturalcycles/nodejs-lib/stream'
+import type { Pipeline } from '@naturalcycles/nodejs-lib/stream'
 import type { CommonStorage } from './commonStorage.js'
 
 export interface CommonStorageKeyValueDBCfg {
@@ -84,24 +84,24 @@ export class CommonStorageKeyValueDB implements CommonKeyValueDB {
     })
   }
 
-  streamIds(table: string, limit?: number): ReadableTyped<string> {
+  streamIds(table: string, limit?: number): Pipeline<string> {
     const { bucketName, prefix } = this.getBucketAndPrefix(table)
 
     return this.cfg.storage.getFileNamesStream(bucketName, { prefix, limit, fullPaths: false })
   }
 
-  streamValues(table: string, limit?: number): ReadableTyped<Buffer> {
+  streamValues(table: string, limit?: number): Pipeline<Buffer> {
     const { bucketName, prefix } = this.getBucketAndPrefix(table)
 
-    return this.cfg.storage.getFilesStream(bucketName, { prefix, limit }).map(f => f.content)
+    return this.cfg.storage.getFilesStream(bucketName, { prefix, limit }).mapSync(f => f.content)
   }
 
-  streamEntries(table: string, limit?: number): ReadableTyped<KeyValueDBTuple> {
+  streamEntries(table: string, limit?: number): Pipeline<KeyValueDBTuple> {
     const { bucketName, prefix } = this.getBucketAndPrefix(table)
 
     return this.cfg.storage
       .getFilesStream(bucketName, { prefix, limit, fullPaths: false })
-      .map(f => [f.filePath, f.content])
+      .mapSync(f => [f.filePath, f.content])
   }
 
   async count(table: string): Promise<number> {

package/src/inMemoryCommonStorage.ts

@@ -8,11 +8,7 @@ import type { StringMap } from '@naturalcycles/js-lib/types'
 import { _stringMapEntries } from '@naturalcycles/js-lib/types'
 import { md5 } from '@naturalcycles/nodejs-lib'
 import { fs2 } from '@naturalcycles/nodejs-lib/fs2'
-import type {
-  ReadableBinary,
-  ReadableTyped,
-  WritableBinary,
-} from '@naturalcycles/nodejs-lib/stream'
+import { Pipeline, type WritableTyped } from '@naturalcycles/nodejs-lib/stream'
 import type { CommonStorage, CommonStorageGetOptions, FileEntry } from './commonStorage.js'
 
 export class InMemoryCommonStorage implements CommonStorage {
@@ -29,8 +25,8 @@ export class InMemoryCommonStorage implements CommonStorage {
     return Object.keys(this.data)
   }
 
-  getBucketNamesStream(): ReadableTyped<string> {
-    return Readable.from(Object.keys(this.data))
+  getBucketNamesStream(): Pipeline<string> {
+    return Pipeline.fromArray(Object.keys(this.data))
   }
 
   async fileExists(bucketName: string, filePath: string): Promise<boolean> {
@@ -70,10 +66,10 @@ export class InMemoryCommonStorage implements CommonStorage {
       .map(f => (fullPaths ? f : _substringAfterLast(f, '/')))
   }
 
-  getFileNamesStream(bucketName: string, opt: CommonStorageGetOptions = {}): ReadableTyped<string> {
+  getFileNamesStream(bucketName: string, opt: CommonStorageGetOptions = {}): Pipeline<string> {
     const { prefix = '', fullPaths = true } = opt
 
-    return Readable.from(
+    return Pipeline.fromArray(
       Object.keys(this.data[bucketName] || {})
         .filter(filePath => filePath.startsWith(prefix))
         .slice(0, opt.limit)
@@ -81,10 +77,10 @@ export class InMemoryCommonStorage implements CommonStorage {
     )
   }
 
-  getFilesStream(bucketName: string, opt: CommonStorageGetOptions = {}): ReadableTyped<FileEntry> {
+  getFilesStream(bucketName: string, opt: CommonStorageGetOptions = {}): Pipeline<FileEntry> {
     const { prefix = '', fullPaths = true } = opt
 
-    return Readable.from(
+    return Pipeline.fromArray(
       _stringMapEntries(this.data[bucketName] || {})
         .map(([filePath, content]) => ({
           filePath,
@@ -96,11 +92,11 @@ export class InMemoryCommonStorage implements CommonStorage {
     )
   }
 
-  getFileReadStream(bucketName: string, filePath: string): ReadableBinary {
-    return Readable.from(this.data[bucketName]![filePath]!)
+  getFileReadStream(bucketName: string, filePath: string): Pipeline<Uint8Array> {
+    return Pipeline.from(Readable.from(this.data[bucketName]![filePath]!))
   }
 
-  getFileWriteStream(_bucketName: string, _filePath: string): WritableBinary {
+  getFileWriteStream(_bucketName: string, _filePath: string): WritableTyped<Uint8Array> {
     throw new Error('Method not implemented.')
   }