v4.4.1

v4.4.0
feat(watcher): add polling-based BucketWatcher to detect add/modify/delete events and expose RxJS Observable and EventEmitter APIs
2026-01-25 18:10:51 +00:00 · 2026-01-25 18:09:38 +00:00 · 2026-01-25 18:09:38 +00:00 · 2026-01-24 09:55:44 +00:00 · 2026-01-24 09:55:44 +00:00 · 2025-11-20 15:14:11 +00:00
32 changed files with 18869 additions and 3872 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,140 +0,0 @@
-# gitzone ci_default
-image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
-
-cache:
-  paths:
-    - .npmci_cache/
-  key: '$CI_BUILD_STAGE'
-
-stages:
-  - security
-  - test
-  - release
-  - metadata
-
-before_script:
-  - npm install -g @shipzone/npmci
-
-# ====================
-# security stage
-# ====================
-mirror:
-  stage: security
-  script:
-    - npmci git mirror
-  only:
-    - tags
-  tags:
-    - lossless
-    - docker
-    - notpriv
-
-auditProductionDependencies:
-  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
-  stage: security
-  script:
-    - npmci npm prepare
-    - npmci command npm install --production --ignore-scripts
-    - npmci command npm config set registry https://registry.npmjs.org
-    - npmci command npm audit --audit-level=high --only=prod --production
-  tags:
-    - docker
-  allow_failure: true
-
-auditDevDependencies:
-  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
-  stage: security
-  script:
-    - npmci npm prepare
-    - npmci command npm install --ignore-scripts
-    - npmci command npm config set registry https://registry.npmjs.org
-    - npmci command npm audit --audit-level=high --only=dev
-  tags:
-    - docker
-  allow_failure: true
-
-# ====================
-# test stage
-# ====================
-
-testStable:
-  stage: test
-  script:
-    - npmci npm prepare
-    - npmci node install stable
-    - npmci npm install
-    - npmci npm test
-  coverage: /\d+.?\d+?\%\s*coverage/
-  tags:
-    - docker
-
-testBuild:
-  stage: test
-  script:
-    - npmci npm prepare
-    - npmci node install stable
-    - npmci npm install
-    - npmci command npm run build
-  coverage: /\d+.?\d+?\%\s*coverage/
-  tags:
-    - docker
-
-release:
-  stage: release
-  script:
-    - npmci node install stable
-    - npmci npm publish
-  only:
-    - tags
-  tags:
-    - lossless
-    - docker
-    - notpriv
-
-# ====================
-# metadata stage
-# ====================
-codequality:
-  stage: metadata
-  allow_failure: true
-  only:
-    - tags
-  script:
-    - npmci command npm install -g typescript
-    - npmci npm prepare
-    - npmci npm install
-  tags:
-    - lossless
-    - docker
-    - priv
-
-trigger:
-  stage: metadata
-  script:
-    - npmci trigger
-  only:
-    - tags
-  tags:
-    - lossless
-    - docker
-    - notpriv
-
-pages:
-  stage: metadata
-  script:
-    - npmci node install lts
-    - npmci command npm install -g @git.zone/tsdoc
-    - npmci npm prepare
-    - npmci npm install
-    - npmci command tsdoc
-  tags:
-    - lossless
-    - docker
-    - notpriv
-  only:
-    - tags
-  artifacts:
-    expire_in: 1 week
-    paths:
-      - public
-  allow_failure: true
--- a/changelog.md
+++ b/changelog.md
@@ -0,0 +1,378 @@
+# Changelog
+
+## 2026-01-25 - 4.4.1 - fix(tests)
+add explicit 'as string' type assertions to environment variable retrievals in tests
+
+- Add 'as string' assertions for S3_ACCESSKEY, S3_SECRETKEY, S3_ENDPOINT, and S3_BUCKET to satisfy TypeScript typings in tests
+- Cast S3_PORT to string before parseInt to ensure correct input type and avoid compiler errors
+- Changes are localized to test/test.listing.node+deno.ts
+
+## 2026-01-25 - 4.4.0 - feat(watcher)
+add polling-based BucketWatcher to detect add/modify/delete events and expose RxJS Observable and EventEmitter APIs
+
+- Add new BucketWatcher implementation (ts/classes.watcher.ts) with polling, buffering and change detection by ETag/Size/LastModified
+- Expose createWatcher(...) on Bucket (ts/classes.bucket.ts) and export watcher and interfaces from index (ts/index.ts)
+- Add watcher-related interfaces (IS3ChangeEvent, IS3ObjectState, IBucketWatcherOptions) to ts/interfaces.ts
+- Comprehensive README/docs additions and examples for BucketWatcher, buffering, options and use cases (readme.md, readme.hints.md)
+- Add unit/integration tests for watcher behavior (test/test.watcher.node.ts)
+- Non-breaking API additions only — ready for a minor version bump from 4.3.1 to 4.4.0
+
+## 2026-01-24 - 4.3.1 - fix(bucket)
+propagate S3 client errors instead of silently logging them; update build script, bump dev/dependencies, and refresh npmextra configuration
+
+- Remove .catch(...) wrappers around s3Client.send so errors are no longer swallowed and will propagate to callers
+- Update build script to use 'tsbuild tsfolders --allowimplicitany'
+- Bump devDependencies: @git.zone/tsbuild to ^4.1.2, @git.zone/tsrun to ^2.0.1, @git.zone/tstest to ^3.1.6
+- Bump dependency @aws-sdk/client-s3 to ^3.975.0
+- Adjust npmextra.json structure (@git.zone/cli, @git.zone/tsdoc), add release registries and @ship.zone/szci entry
+- Remove pnpm-workspace.yaml onlyBuiltDependencies configuration
+
+## 2025-11-20 - 4.3.0 - feat(listing)
+Add memory-efficient listing APIs: async generator, RxJS observable, and cursor pagination; export ListCursor and Minimatch; add minimatch dependency; bump to 4.2.0
+
+- Added memory-efficient listing methods on Bucket: listAllObjects (async generator), listAllObjectsObservable (RxJS Observable), createCursor (returns ListCursor) and listAllObjectsArray (convenience array collector).
+- New ListCursor class (ts/classes.listcursor.ts) providing page-based iteration: next(), hasMore(), reset(), getToken()/setToken().
+- Added glob matching helper findByGlob(pattern) using minimatch (exported via plugins.Minimatch).
+- Exported ListCursor from ts/index.ts and exported Minimatch via ts/plugins.ts.
+- Added minimatch dependency in package.json and bumped package version to 4.2.0; increased test timeout to 120s.
+- Updated tests to read S3_SECRETKEY, S3_PORT and to assert bucket name from env (test/test.node+deno.ts, test/test.trash.node+deno.ts).
+- No breaking changes: new APIs are additive and existing behavior preserved.
+
+## 2025-11-20 - 4.2.0 - feat(listing)
+Add memory-efficient listing with async generators, RxJS observables, and cursor pagination for huge buckets
+
+**New Memory-Efficient Listing Methods:**
+
+**Async Generator (Recommended for most use cases):**
+- `Bucket.listAllObjects(prefix?)` - Stream object keys one at a time using `for await...of`
+- `Bucket.findByGlob(pattern)` - Find objects matching glob patterns (e.g., `**/*.json`, `npm/packages/*/index.json`)
+- Memory efficient, supports early termination, composable
+
+**RxJS Observable (For complex reactive pipelines):**
+- `Bucket.listAllObjectsObservable(prefix?)` - Emit keys as Observable for use with RxJS operators (filter, map, take, etc.)
+- Perfect for complex data transformations and reactive architectures
+
+**Cursor Pattern (For manual pagination control):**
+- `Bucket.createCursor(prefix?, options?)` - Create cursor for explicit page-by-page iteration
+- `ListCursor.next()` - Fetch next page of results
+- `ListCursor.hasMore()` - Check if more results available
+- `ListCursor.reset()` - Reset to beginning
+- `ListCursor.getToken()` / `ListCursor.setToken()` - Save/restore pagination state
+- Ideal for UI pagination and resumable operations
+
+**Convenience Methods:**
+- `Bucket.listAllObjectsArray(prefix?)` - Collect all keys into array (WARNING: loads all into memory)
+
+**Benefits:**
+- ✅ Memory-efficient streaming for buckets with millions of objects
+- ✅ Three patterns for different use cases (generators, observables, cursors)
+- ✅ Support for early termination and incremental processing
+- ✅ Glob pattern matching with minimatch
+- ✅ Full TypeScript support with proper types
+- ✅ Zero breaking changes - all new methods
+
+**Dependencies:**
+- Added `minimatch` for glob pattern support
+
+**Files Changed:**
+- `ts/classes.bucket.ts` - Added all listing methods
+- `ts/classes.listcursor.ts` - NEW: Cursor implementation
+- `ts/plugins.ts` - Export Minimatch
+- `ts/index.ts` - Export ListCursor
+- `test/test.listing.node+deno.ts` - NEW: Comprehensive listing tests
+- `package.json` - Added minimatch dependency
+
+## 2025-11-20 - 4.1.0 - feat(core)
+Add S3 endpoint normalization, directory pagination, improved metadata checks, trash support, and related tests
+
+- Add normalizeS3Descriptor helper to sanitize and normalize various S3 endpoint formats and emit warnings for mismatches (helpers.ts).
+- Use normalized endpoint and credentials when constructing S3 client in SmartBucket (classes.smartbucket.ts).
+- Implement paginated listing helper listObjectsV2AllPages in Directory and use it for listFiles and listDirectories to aggregate Contents and CommonPrefixes across pages (classes.directory.ts).
+- Improve MetaData.hasMetaData to catch NotFound errors and return false instead of throwing (classes.metadata.ts).
+- Export metadata and trash modules from index (ts/index.ts) and add a Trash class with utilities for trashed files and key encoding (classes.trash.ts).
+- Enhance Bucket operations: fastCopy now preserves or replaces native metadata correctly, cleanAllContents supports paginated deletion, and improved fastExists error handling (classes.bucket.ts).
+- Fix Directory.getSubDirectoryByName to construct new Directory instances with the correct parent directory reference.
+- Add tests covering metadata absence and pagination behavior (test/test.local.node+deno.ts).
+
+## 2025-11-20 - 4.0.1 - fix(plugins)
+Use explicit node: imports for native path and stream modules in ts/plugins.ts
+
+- Replaced imports of 'path' and 'stream' with 'node:path' and 'node:stream' in ts/plugins.ts.
+- Ensures correct ESM resolution of Node built-ins when package.json type is 'module' and avoids accidental conflicts with userland packages.
+
+## 2025-11-20 - 4.0.0 - BREAKING CHANGE(core)
+Make API strict-by-default: remove *Strict variants, throw on not-found/exists conflicts, add explicit exists() methods, update docs/tests and bump deps
+
+- Breaking: Core API methods are strict by default and now throw errors instead of returning null when targets are missing or already exist (e.g. getBucketByName, getFile, getSubDirectoryByName, fastPut, fastPutStream).
+- Removed *Strict variants: fastPutStrict, getBucketByNameStrict, getFileStrict, getSubDirectoryByNameStrict — use the base methods which are now strict.
+- Added explicit existence checks: bucketExists (SmartBucket), fileExists (Directory/fileExists), directoryExists (Directory.directoryExists), and fastExists (Bucket.fastExists) to allow non-throwing checks before operations.
+- Return type updates: fastPut now returns Promise<File> (no null), getBucketByName/getFile/getSubDirectoryByName now return the respective objects or throw.
+- Improved error messages to guide callers (e.g. suggest setting overwrite:true on fastPut when object exists).
+- Updated README, changelog and tests to reflect the new strict semantics and usage patterns.
+- Developer/runtime dependency bumps: @git.zone/tsbuild, @git.zone/tsrun, @git.zone/tstest, @aws-sdk/client-s3, @push.rocks/smartstring, @tsclass/tsclass (version bumps recorded in package.json).
+- Major version bump to 4.0.0 to reflect breaking API changes.
+
+## 2025-11-20 - 4.0.0 - BREAKING: Strict by default + exists methods
+Complete API overhaul: all methods throw by default, removed all *Strict variants, added dedicated exists methods
+
+**Breaking Changes:**
+
+**Putters (Write Operations):**
+- `fastPut`: Return type `Promise<File | null>` → `Promise<File>`, throws when file exists and overwrite is false
+- `fastPutStream`: Now throws when file exists and overwrite is false (previously returned silently)
+- `fastPutStrict`: **Removed** - use `fastPut` directly
+
+**Getters (Read Operations):**
+- `getBucketByName`: Return type `Promise<Bucket | null>` → `Promise<Bucket>`, throws when bucket not found
+- `getBucketByNameStrict`: **Removed** - use `getBucketByName` directly
+- `getFile`: Return type `Promise<File | null>` → `Promise<File>`, throws when file not found
+- `getFileStrict`: **Removed** - use `getFile` directly
+- `getSubDirectoryByName`: Return type `Promise<Directory | null>` → `Promise<Directory>`, throws when directory not found
+- `getSubDirectoryByNameStrict`: **Removed** - use `getSubDirectoryByName` directly
+
+**New Methods (Existence Checks):**
+- `bucket.fastExists({ path })` - ✅ Already existed
+- `directory.fileExists({ path })` - **NEW** - Check if file exists
+- `directory.directoryExists(name)` - **NEW** - Check if subdirectory exists
+- `smartBucket.bucketExists(name)` - **NEW** - Check if bucket exists
+
+**Benefits:**
+- ✅ **Simpler API**: Removed 4 redundant *Strict methods
+- ✅ **Type-safe**: No nullable returns - `Promise<T>` not `Promise<T | null>`
+- ✅ **Fail-fast**: Errors throw immediately with precise stack traces
+- ✅ **Consistent**: All methods behave the same way
+- ✅ **Explicit**: Use exists() to check, then get() to retrieve
+- ✅ **Better debugging**: Error location is always precise
+
+**Migration Guide:**
+
+```typescript
+// ============================================
+// Pattern 1: Check then Get (Recommended)
+// ============================================
+
+// Before (v3.x):
+const bucket = await smartBucket.getBucketByName('my-bucket');
+if (bucket) {
+  // use bucket
+}
+
+// After (v4.0):
+if (await smartBucket.bucketExists('my-bucket')) {
+  const bucket = await smartBucket.getBucketByName('my-bucket'); // guaranteed to exist
+  // use bucket
+}
+
+// ============================================
+// Pattern 2: Try/Catch
+// ============================================
+
+// Before (v3.x):
+const file = await directory.getFile({ path: 'file.txt' });
+if (!file) {
+  // Handle not found
+}
+
+// After (v4.0):
+try {
+  const file = await directory.getFile({ path: 'file.txt' });
+  // use file
+} catch (error) {
+  // Handle not found
+}
+
+// ============================================
+// Pattern 3: Remove *Strict calls
+// ============================================
+
+// Before (v3.x):
+const file = await directory.getFileStrict({ path: 'file.txt' });
+
+// After (v4.0):
+const file = await directory.getFile({ path: 'file.txt' }); // already strict
+
+// ============================================
+// Pattern 4: Write Operations
+// ============================================
+
+// Before (v3.x):
+const file = await bucket.fastPutStrict({ path: 'file.txt', contents: 'data' });
+
+// After (v4.0):
+const file = await bucket.fastPut({ path: 'file.txt', contents: 'data' }); // already strict
+```
+
+## 2025-08-18 - 3.3.10 - fix(helpers)
+Normalize and robustly parse S3 endpoint configuration; use normalized descriptor in SmartBucket and update dev tooling
+
+- Add normalizeS3Descriptor to ts/helpers.ts: robust endpoint parsing, coercion of useSsl/port, sanitization, warnings for dropped URL parts, and canonical endpoint URL output.
+- Update SmartBucket (ts/classes.smartbucket.ts) to use the normalized endpoint, region, credentials and forcePathStyle from normalizeS3Descriptor.
+- Adjust dev tooling: bump @git.zone/tsbuild -> ^2.6.7, @git.zone/tstest -> ^2.3.4, @push.rocks/qenv -> ^6.1.3 and update test script to run tstest with --verbose --logfile --timeout 60.
+- Add .claude/settings.local.json containing local assistant/CI permission settings (local config only).
+
+## 2025-08-15 - 3.3.9 - fix(docs)
+Revise README with detailed usage examples and add local Claude settings
+
+- Revamped README: reorganized content, added emojis and clearer headings for install, getting started, bucket/file/directory operations, streaming, metadata, trash/recovery, locking, and advanced configuration.
+- Added many concrete code examples for SmartBucket, Bucket, Directory, File, streaming (node/web), RxJS replay subjects, metadata handling, trash workflow, file locking, magic-bytes detection, JSON operations, and cleaning bucket contents.
+- Included testing instructions (pnpm test) and a Best Practices section with recommendations for strict mode, streaming, metadata, trash usage, and locking.
+- Added .claude/settings.local.json to include local Claude configuration and tool permissions.
+- No source code or public API changes; documentation and local tooling config only.
+
+## 2025-08-15 - 3.3.8 - fix(tests)
+Update tests to use @git.zone/tstest, upgrade dependencies, remove GitLab CI and add local CI/workspace config
+
+- Tests: replace imports from @push.rocks/tapbundle with @git.zone/tstest/tapbundle and switch tap.start() to export default tap.start()
+- Dependencies: bump @aws-sdk/client-s3 and several @push.rocks packages; upgrade @tsclass/tsclass to a newer major
+- DevDependencies: upgrade @git.zone/tsbuild, @git.zone/tstest, @push.rocks/qenv, and @push.rocks/tapbundle
+- CI/config: remove .gitlab-ci.yml, add .claude/settings.local.json
+- Workspace: add pnpm-workspace.yaml and packageManager field in package.json
+
+## 2024-12-02 - 3.3.7 - fix(package)
+Update author field in package.json
+
+- Corrected the author field from 'Lossless GmbH' to 'Task Venture Capital GmbH' in the package.json file.
+
+## 2024-12-02 - 3.3.6 - fix(package)
+Fix license field in package.json to reflect MIT licensing
+
+
+## 2024-11-25 - 3.3.5 - fix(test)
+Refactor trash test to improve metadata validation
+
+- Added new checks in trash tests to ensure metadata files are correctly moved to trash.
+- Validated the presence and integrity of metadata within trashed files.
+
+## 2024-11-25 - 3.3.4 - fix(core)
+Minor refactoring and cleanup of TypeScript source files for improved readability and maintainability.
+
+
+## 2024-11-24 - 3.3.3 - fix(documentation)
+Improved documentation accuracy and consistency
+
+- Updated the project description to reflect the cloud-agnostic nature and advanced capabilities
+- Enhanced the README with detailed explanations and code examples for advanced features like trash management
+- Clarified the handling and importance of metadata using the MetaData utility
+
+## 2024-11-24 - 3.3.2 - fix(documentation)
+Updated keywords and description for clarity and consistency.
+
+- Modified keywords and description in package.json and npmextra.json.
+- Enhanced readme.md file structure and examples
+
+## 2024-11-24 - 3.3.1 - fix(File)
+Fixed issue with file restore metadata operations.
+
+- Corrected the order of operations in the file restore function to ensure custom metadata is appropriately deleted after moving the file.
+
+## 2024-11-24 - 3.3.0 - feat(core)
+Enhanced directory handling and file restoration from trash
+
+- Refined getSubDirectoryByName to handle file paths treated as directories.
+- Introduced file restoration function from trash to original or specified paths.
+
+## 2024-11-24 - 3.2.2 - fix(core)
+Refactor Bucket class for improved error handling
+
+- Ensured safe access using non-null assertions when finding a bucket.
+- Enhanced fastPut method by adding fastPutStrict for safer operations.
+- Added explicit error handling and type checking in fastExists method.
+
+## 2024-11-24 - 3.2.1 - fix(metadata)
+Fix metadata handling for deleted files
+
+- Ensured metadata is correctly stored and managed when files are deleted into the trash.
+
+## 2024-11-24 - 3.2.0 - feat(bucket)
+Enhanced SmartBucket with trash management and metadata handling
+
+- Added functionality to move files to a trash directory.
+- Introduced methods to handle file metadata more robustly.
+- Implemented a method to clean all contents from a bucket.
+- Enhanced directory retrieval to handle non-existent directories with options.
+- Improved handling of file paths and metadata within the storage system.
+
+## 2024-11-18 - 3.1.0 - feat(file)
+Added functionality to retrieve magic bytes from files and detect file types using magic bytes.
+
+- Introduced method `getMagicBytes` in `File` and `Bucket` classes to retrieve a specific number of bytes from a file.
+- Enhanced file type detection by utilizing magic bytes in `MetaData` class.
+- Updated dependencies for better performance and compatibility.
+
+## 2024-11-18 - 3.0.24 - fix(metadata)
+Fix metadata handling to address type assertion and data retrieval.
+
+- Fixed type assertion issues in `MetaData` class properties with type non-null assertions.
+- Corrected the handling of JSON data retrieval in `MetaData.storeCustomMetaData` function.
+
+## 2024-10-16 - 3.0.23 - fix(dependencies)
+Update package dependencies for improved functionality and security.
+
+- Updated @aws-sdk/client-s3 to version ^3.670.0 for enhanced S3 client capabilities.
+- Updated @push.rocks/smartstream to version ^3.2.4.
+- Updated the dev dependency @push.rocks/tapbundle to version ^5.3.0.
+
+## 2024-07-28 - 3.0.22 - fix(dependencies)
+Update dependencies and improve bucket retrieval logging
+
+- Updated @aws-sdk/client-s3 to ^3.620.0
+- Updated @git.zone/tsbuild to ^2.1.84
+- Updated @git.zone/tsrun to ^1.2.49
+- Updated @push.rocks/smartpromise to ^4.0.4
+- Updated @tsclass/tsclass to ^4.1.2
+- Added a log for when a bucket is not found by name in getBucketByName method
+
+## 2024-07-04 - 3.0.21 - fix(test)
+Update endpoint configuration in tests to use environment variable
+
+- Modified `qenv.yml` to include `S3_ENDPOINT` as a required environment variable.
+- Updated test files to fetch `S3_ENDPOINT` from environment instead of hardcoding.
+
+## 2024-06-19 - 3.0.20 - Fix and Stability Updates
+Improved overall stability and consistency.
+
+## 2024-06-18 - 3.0.18 - Delete Functions Consistency
+Ensured more consistency between delete methods and trash behavior.
+
+## 2024-06-17 - 3.0.17 to 3.0.16 - Fix and Update
+Routine updates and fixes performed.
+
+## 2024-06-11 - 3.0.15 to 3.0.14 - Fix and Update
+Routine updates and fixes performed.
+
+## 2024-06-10 - 3.0.13 - Trash Feature Completion
+Finished work on trash feature.
+
+## 2024-06-09 - 3.0.12 - Fix and Update
+Routine updates and fixes performed.
+
+## 2024-06-08 - 3.0.11 to 3.0.10 - Fix and Update
+Routine updates and fixes performed.
+
+## 2024-06-03 - 3.0.10 - Fix and Update
+Routine updates and fixes performed.
+
+## 2024-05-29 - 3.0.9 - Update Description
+Updated project description.
+
+## 2024-05-27 - 3.0.8 to 3.0.6 - Pathing and Core Updates
+Routine updates and fixes performed.
+  - S3 paths' pathing differences now correctly handled with a reducePath method.
+
+## 2024-05-21 - 3.0.5 to 3.0.4 - Fix and Update
+Routine updates and fixes performed.
+
+## 2024-05-17 - 3.0.3 to 3.0.2 - Fix and Update
+Routine updates and fixes performed.
+
+## 2024-05-17 - 3.0.0 - Major Release
+Introduced breaking changes in core and significant improvements.
+
+## 2024-05-05 - 2.0.5 - Breaking Changes
+Introduced breaking changes in core functionality.
+
+## 2024-04-14 - 2.0.4 - TSConfig Update
+Updated TypeScript configuration.
+
+## 2024-01-01 - 2.0.2 - Organization Scheme Update
+Switched to the new organizational scheme.
--- a/deno.lock
+++ b/deno.lock
--- a/19
+++ b/19
@@ -0,0 +1,19 @@
+Copyright (c) 2014 Task Venture Capital GmbH (hello@task.vc)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
--- a/npmextra.json
+++ b/npmextra.json
@@ -1,39 +1,48 @@
 {
-  "npmci": {
-    "npmGlobalTools": []
-  },
-  "gitzone": {
+  "@git.zone/cli": {
    "projectType": "npm",
    "module": {
      "githost": "code.foss.global",
      "gitscope": "push.rocks",
      "gitrepo": "smartbucket",
-      "description": "A TypeScript library offering simple and cloud-agnostic object storage with advanced features like bucket creation, file and directory management, and data streaming.",
+      "description": "A TypeScript library providing a cloud-agnostic interface for managing object storage with functionalities like bucket management, file and directory operations, and advanced features such as metadata handling and file locking.",
      "npmPackagename": "@push.rocks/smartbucket",
      "license": "MIT",
      "keywords": [
        "TypeScript",
-        "cloud storage",
+        "cloud agnostic",
        "object storage",
-        "bucket creation",
-        "file management",
+        "bucket management",
+        "file operations",
        "directory management",
        "data streaming",
-        "multi-cloud",
-        "API",
-        "unified storage",
        "S3",
-        "minio",
+        "multi-cloud",
        "file locking",
-        "metadata",
+        "metadata management",
        "buffer handling",
-        "access key",
-        "secret key",
-        "cloud agnostic"
+        "access control",
+        "environment configuration",
+        "unified storage",
+        "bucket policies",
+        "trash management",
+        "file transfer",
+        "data management",
+        "streaming"
      ]
+    },
+    "release": {
+      "registries": [
+        "https://verdaccio.lossless.digital",
+        "https://registry.npmjs.org"
+      ],
+      "accessLevel": "public"
    }
  },
-  "tsdoc": {
+  "@git.zone/tsdoc": {
    "legal": "\n## License and Legal Information\n\nThis repository contains open-source code that is licensed under the MIT License. A copy of the MIT License can be found in the [license](license) file within this repository. \n\n**Please note:** The MIT License does not grant permission to use the trade names, trademarks, service marks, or product names of the project, except as required for reasonable and customary use in describing the origin of the work and reproducing the content of the NOTICE file.\n\n### Trademarks\n\nThis project is owned and maintained by Task Venture Capital GmbH. The names and logos associated with Task Venture Capital GmbH and any related products or services are trademarks of Task Venture Capital GmbH and are not included within the scope of the MIT license granted herein. Use of these trademarks must comply with Task Venture Capital GmbH's Trademark Guidelines, and any usage must be approved in writing by Task Venture Capital GmbH.\n\n### Company Information\n\nTask Venture Capital GmbH  \nRegistered at District court Bremen HRB 35230 HB, Germany\n\nFor any legal inquiries or if you require further information, please contact us via email at hello@task.vc.\n\nBy using this repository, you acknowledge that you have read this section, agree to comply with its terms, and understand that the licensing of the code does not imply endorsement by Task Venture Capital GmbH of any derivative works.\n"
+  },
+  "@ship.zone/szci": {
+    "npmGlobalTools": []
  }
 }
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
  "name": "@push.rocks/smartbucket",
-  "version": "3.0.18",
+  "version": "3.3.10",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "@push.rocks/smartbucket",
-      "version": "3.0.18",
+      "version": "3.3.10",
      "license": "UNLICENSED",
      "dependencies": {
        "@push.rocks/smartpath": "^5.0.18",
--- a/package.json
+++ b/package.json
@@ -1,33 +1,34 @@
 {
  "name": "@push.rocks/smartbucket",
-  "version": "3.0.18",
-  "description": "A TypeScript library offering simple and cloud-agnostic object storage with advanced features like bucket creation, file and directory management, and data streaming.",
+  "version": "4.4.1",
+  "description": "A TypeScript library providing a cloud-agnostic interface for managing object storage with functionalities like bucket management, file and directory operations, and advanced features such as metadata handling and file locking.",
  "main": "dist_ts/index.js",
  "typings": "dist_ts/index.d.ts",
  "type": "module",
-  "author": "Lossless GmbH",
-  "license": "UNLICENSED",
+  "author": "Task Venture Capital GmbH",
+  "license": "MIT",
  "scripts": {
-    "test": "(tstest test/)",
-    "build": "(tsbuild --web --allowimplicitany)"
+    "test": "(tstest test/ --verbose --logfile --timeout 120)",
+    "build": "(tsbuild tsfolders --allowimplicitany)"
  },
  "devDependencies": {
-    "@git.zone/tsbuild": "^2.1.80",
-    "@git.zone/tsrun": "^1.2.46",
-    "@git.zone/tstest": "^1.0.90",
-    "@push.rocks/qenv": "^6.0.5",
-    "@push.rocks/tapbundle": "^5.0.23"
+    "@git.zone/tsbuild": "^4.1.2",
+    "@git.zone/tsrun": "^2.0.1",
+    "@git.zone/tstest": "^3.1.6",
+    "@push.rocks/qenv": "^6.1.3",
+    "@push.rocks/tapbundle": "^6.0.3"
  },
  "dependencies": {
-    "@aws-sdk/client-s3": "^3.598.0",
-    "@push.rocks/smartmime": "^2.0.2",
-    "@push.rocks/smartpath": "^5.0.18",
-    "@push.rocks/smartpromise": "^4.0.3",
-    "@push.rocks/smartrx": "^3.0.7",
-    "@push.rocks/smartstream": "^3.0.44",
-    "@push.rocks/smartstring": "^4.0.15",
+    "@aws-sdk/client-s3": "^3.975.0",
+    "@push.rocks/smartmime": "^2.0.4",
+    "@push.rocks/smartpath": "^6.0.0",
+    "@push.rocks/smartpromise": "^4.2.3",
+    "@push.rocks/smartrx": "^3.0.10",
+    "@push.rocks/smartstream": "^3.2.5",
+    "@push.rocks/smartstring": "^4.1.0",
    "@push.rocks/smartunique": "^3.0.9",
-    "@tsclass/tsclass": "^4.0.59"
+    "@tsclass/tsclass": "^9.3.0",
+    "minimatch": "^10.1.1"
  },
  "private": false,
  "files": [
@@ -47,27 +48,30 @@
  ],
  "keywords": [
    "TypeScript",
-    "cloud storage",
+    "cloud agnostic",
    "object storage",
-    "bucket creation",
-    "file management",
+    "bucket management",
+    "file operations",
    "directory management",
    "data streaming",
-    "multi-cloud",
-    "API",
-    "unified storage",
    "S3",
-    "minio",
+    "multi-cloud",
    "file locking",
-    "metadata",
+    "metadata management",
    "buffer handling",
-    "access key",
-    "secret key",
-    "cloud agnostic"
+    "access control",
+    "environment configuration",
+    "unified storage",
+    "bucket policies",
+    "trash management",
+    "file transfer",
+    "data management",
+    "streaming"
  ],
  "homepage": "https://code.foss.global/push.rocks/smartbucket",
  "repository": {
    "type": "git",
    "url": "https://code.foss.global/push.rocks/smartbucket.git"
-  }
+  },
+  "packageManager": "pnpm@10.14.0+sha512.ad27a79641b49c3e481a16a805baa71817a04bbe06a38d17e60e2eaee83f6a146c6a688125f5792e48dd5ba30e7da52a5cda4c3992b9ccf333f9ce223af84748"
 }
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
--- a/qenv.yml
+++ b/qenv.yml
@@ -1,3 +1,4 @@
 required:
  - S3_KEY
-  - S3_SECRET
+  - S3_SECRET
+  - S3_ENDPOINT
--- a/readme.hints.md
+++ b/readme.hints.md
@@ -1 +1,6 @@
- 
+* The project uses the official s3 client, not the minio client.
+* **All methods throw by default** (strict mode):  - Put operations: `fastPut`, `fastPutStream` throw when file exists and overwrite is false  - Get operations: `getBucketByName`, `getFile`, `getSubDirectoryByName` throw when not found
+* **Use exists() methods to check before getting**: `bucketExists`, `fileExists`, `directoryExists`, `fastExists`
+* **No *Strict methods**: All removed (fastPutStrict, getBucketByNameStrict, getFileStrict, getSubDirectoryByNameStrict)
+* metadata is handled though the MetaData class. Important!
+* **BucketWatcher** - Polling-based S3 change watcher (`bucket.createWatcher()`). Detects add/modify/delete via ETag/Size/LastModified comparison. Supports RxJS Observable pattern (`changeSubject`) and EventEmitter pattern (`on('change')`). Options: `prefix`, `pollIntervalMs`, `bufferTimeMs`, `includeInitial`, `pageSize`.
--- a/readme.md
+++ b/readme.md
--- a/test/helpers/prepare.ts
+++ b/test/helpers/prepare.ts
--- a/test/test.listing.node+deno.ts
+++ b/test/test.listing.node+deno.ts
@@ -0,0 +1,298 @@
+// test.listing.node+deno.ts - Tests for memory-efficient listing methods
+
+import { tap, expect } from '@git.zone/tstest/tapbundle';
+import * as smartbucket from '../ts/index.js';
+
+// Get test configuration
+import * as qenv from '@push.rocks/qenv';
+const testQenv = new qenv.Qenv('./', './.nogit/');
+
+// Test bucket reference
+let testBucket: smartbucket.Bucket;
+let testSmartbucket: smartbucket.SmartBucket;
+
+// Setup: Create test bucket and populate with test data
+tap.test('should create valid smartbucket and bucket', async () => {
+  testSmartbucket = new smartbucket.SmartBucket({
+    accessKey: await testQenv.getEnvVarOnDemand('S3_ACCESSKEY') as string,
+    accessSecret: await testQenv.getEnvVarOnDemand('S3_SECRETKEY') as string,
+    endpoint: await testQenv.getEnvVarOnDemand('S3_ENDPOINT') as string,
+    port: parseInt(await testQenv.getEnvVarOnDemand('S3_PORT') as string),
+    useSsl: false,
+  });
+
+  testBucket = await smartbucket.Bucket.getBucketByName(
+    testSmartbucket,
+    await testQenv.getEnvVarOnDemand('S3_BUCKET')  as string
+  );
+  expect(testBucket).toBeInstanceOf(smartbucket.Bucket);
+});
+
+tap.test('should clean bucket and create test data for listing tests', async () => {
+  // Clean bucket first
+  await testBucket.cleanAllContents();
+
+  // Create test structure:
+  // npm/packages/foo/index.json
+  // npm/packages/foo/1.0.0.tgz
+  // npm/packages/bar/index.json
+  // npm/packages/bar/2.0.0.tgz
+  // oci/blobs/sha256-abc.tar
+  // oci/blobs/sha256-def.tar
+  // oci/manifests/latest.json
+  // docs/readme.md
+  // docs/api.md
+
+  const testFiles = [
+    'npm/packages/foo/index.json',
+    'npm/packages/foo/1.0.0.tgz',
+    'npm/packages/bar/index.json',
+    'npm/packages/bar/2.0.0.tgz',
+    'oci/blobs/sha256-abc.tar',
+    'oci/blobs/sha256-def.tar',
+    'oci/manifests/latest.json',
+    'docs/readme.md',
+    'docs/api.md',
+  ];
+
+  for (const filePath of testFiles) {
+    await testBucket.fastPut({
+      path: filePath,
+      contents: `test content for ${filePath}`,
+    });
+  }
+});
+
+// ==========================
+// Async Generator Tests
+// ==========================
+
+tap.test('listAllObjects should iterate all objects with prefix', async () => {
+  const keys: string[] = [];
+  for await (const key of testBucket.listAllObjects('npm/')) {
+    keys.push(key);
+  }
+
+  expect(keys.length).toEqual(4);
+  expect(keys).toContain('npm/packages/foo/index.json');
+  expect(keys).toContain('npm/packages/bar/2.0.0.tgz');
+});
+
+tap.test('listAllObjects should support early termination', async () => {
+  let count = 0;
+  for await (const key of testBucket.listAllObjects('')) {
+    count++;
+    if (count >= 3) break; // Early exit
+  }
+
+  expect(count).toEqual(3);
+});
+
+tap.test('listAllObjects without prefix should list all objects', async () => {
+  const keys: string[] = [];
+  for await (const key of testBucket.listAllObjects()) {
+    keys.push(key);
+  }
+
+  expect(keys.length).toBeGreaterThanOrEqual(9);
+});
+
+// ==========================
+// Observable Tests
+// ==========================
+
+tap.test('listAllObjectsObservable should emit all objects', async () => {
+  const keys: string[] = [];
+
+  await new Promise<void>((resolve, reject) => {
+    testBucket.listAllObjectsObservable('oci/')
+      .subscribe({
+        next: (key) => keys.push(key),
+        error: (err) => reject(err),
+        complete: () => resolve(),
+      });
+  });
+
+  expect(keys.length).toEqual(3);
+  expect(keys).toContain('oci/blobs/sha256-abc.tar');
+  expect(keys).toContain('oci/manifests/latest.json');
+});
+
+tap.test('listAllObjectsObservable should support RxJS operators', async () => {
+  const jsonFiles: string[] = [];
+
+  await new Promise<void>((resolve, reject) => {
+    testBucket.listAllObjectsObservable('npm/')
+      .subscribe({
+        next: (key: string) => {
+          if (key.endsWith('.json')) {
+            jsonFiles.push(key);
+          }
+        },
+        error: (err: any) => reject(err),
+        complete: () => resolve(),
+      });
+  });
+
+  expect(jsonFiles.length).toEqual(2);
+  expect(jsonFiles.every((k) => k.endsWith('.json'))).toBeTrue();
+});
+
+// ==========================
+// Cursor Tests
+// ==========================
+
+tap.test('createCursor should allow manual pagination', async () => {
+  const cursor = testBucket.createCursor('npm/', { pageSize: 2 });
+
+  // First page
+  const page1 = await cursor.next();
+  expect(page1.keys.length).toEqual(2);
+  expect(page1.done).toBeFalse();
+
+  // Second page
+  const page2 = await cursor.next();
+  expect(page2.keys.length).toEqual(2);
+  expect(page2.done).toBeTrue();
+});
+
+tap.test('cursor.hasMore() should accurately track state', async () => {
+  const cursor = testBucket.createCursor('docs/', { pageSize: 10 });
+
+  expect(cursor.hasMore()).toBeTrue();
+
+  await cursor.next(); // Should get all docs files
+
+  expect(cursor.hasMore()).toBeFalse();
+});
+
+tap.test('cursor.reset() should allow re-iteration', async () => {
+  const cursor = testBucket.createCursor('docs/');
+
+  const firstRun = await cursor.next();
+  expect(firstRun.keys.length).toBeGreaterThan(0);
+
+  cursor.reset();
+  expect(cursor.hasMore()).toBeTrue();
+
+  const secondRun = await cursor.next();
+  expect(secondRun.keys).toEqual(firstRun.keys);
+});
+
+tap.test('cursor should support save/restore with token', async () => {
+  const cursor1 = testBucket.createCursor('npm/', { pageSize: 2 });
+
+  await cursor1.next(); // Advance cursor
+  const token = cursor1.getToken();
+  expect(token).toBeDefined();
+
+  // Create new cursor and restore state
+  const cursor2 = testBucket.createCursor('npm/', { pageSize: 2 });
+  cursor2.setToken(token);
+
+  const page = await cursor2.next();
+  expect(page.keys.length).toBeGreaterThan(0);
+});
+
+// ==========================
+// findByGlob Tests
+// ==========================
+
+tap.test('findByGlob should match simple patterns', async () => {
+  const matches: string[] = [];
+  for await (const key of testBucket.findByGlob('**/*.json')) {
+    matches.push(key);
+  }
+
+  expect(matches.length).toEqual(3); // foo/index.json, bar/index.json, latest.json
+  expect(matches.every((k) => k.endsWith('.json'))).toBeTrue();
+});
+
+tap.test('findByGlob should match specific path patterns', async () => {
+  const matches: string[] = [];
+  for await (const key of testBucket.findByGlob('npm/packages/*/index.json')) {
+    matches.push(key);
+  }
+
+  expect(matches.length).toEqual(2);
+  expect(matches).toContain('npm/packages/foo/index.json');
+  expect(matches).toContain('npm/packages/bar/index.json');
+});
+
+tap.test('findByGlob should match wildcard patterns', async () => {
+  const matches: string[] = [];
+  for await (const key of testBucket.findByGlob('oci/blobs/*')) {
+    matches.push(key);
+  }
+
+  expect(matches.length).toEqual(2);
+  expect(matches.every((k) => k.startsWith('oci/blobs/'))).toBeTrue();
+});
+
+// ==========================
+// listAllObjectsArray Tests
+// ==========================
+
+tap.test('listAllObjectsArray should collect all keys into array', async () => {
+  const keys = await testBucket.listAllObjectsArray('docs/');
+
+  expect(Array.isArray(keys)).toBeTrue();
+  expect(keys.length).toEqual(2);
+  expect(keys).toContain('docs/readme.md');
+  expect(keys).toContain('docs/api.md');
+});
+
+tap.test('listAllObjectsArray without prefix should return all objects', async () => {
+  const keys = await testBucket.listAllObjectsArray();
+
+  expect(keys.length).toBeGreaterThanOrEqual(9);
+});
+
+// ==========================
+// Performance/Edge Case Tests
+// ==========================
+
+tap.test('should handle empty prefix results gracefully', async () => {
+  const keys: string[] = [];
+  for await (const key of testBucket.listAllObjects('nonexistent/')) {
+    keys.push(key);
+  }
+
+  expect(keys.length).toEqual(0);
+});
+
+tap.test('cursor should handle empty results', async () => {
+  const cursor = testBucket.createCursor('nonexistent/');
+  const result = await cursor.next();
+
+  expect(result.keys.length).toEqual(0);
+  expect(result.done).toBeTrue();
+  expect(cursor.hasMore()).toBeFalse();
+});
+
+tap.test('observable should complete immediately on empty results', async () => {
+  let completed = false;
+  let count = 0;
+
+  await new Promise<void>((resolve, reject) => {
+    testBucket.listAllObjectsObservable('nonexistent/')
+      .subscribe({
+        next: () => count++,
+        error: (err) => reject(err),
+        complete: () => {
+          completed = true;
+          resolve();
+        },
+      });
+  });
+
+  expect(count).toEqual(0);
+  expect(completed).toBeTrue();
+});
+
+// Cleanup
+tap.test('should clean up test data', async () => {
+  await testBucket.cleanAllContents();
+});
+
+export default tap.start();
--- a/test/test.local.node+deno.ts
+++ b/test/test.local.node+deno.ts
@@ -0,0 +1,76 @@
+import { expect, tap } from '@git.zone/tstest/tapbundle';
+
+import * as plugins from '../ts/plugins.js';
+import * as smartbucket from '../ts/index.js';
+
+class FakeS3Client {
+  private callIndex = 0;
+
+  constructor(private readonly pages: Array<Partial<plugins.s3.ListObjectsV2Output>>) {}
+
+  public async send(_command: any) {
+    const page = this.pages[this.callIndex] || { Contents: [], CommonPrefixes: [], IsTruncated: false };
+    this.callIndex += 1;
+    return page;
+  }
+}
+
+tap.test('MetaData.hasMetaData should return false when metadata file does not exist', async () => {
+  const fakeFile = {
+    name: 'file.txt',
+    parentDirectoryRef: {
+      async getFile() {
+        throw new Error(`File not found at path 'file.txt.metadata'`);
+      },
+    },
+  } as unknown as smartbucket.File;
+
+  const hasMetaData = await smartbucket.MetaData.hasMetaData({ file: fakeFile });
+  expect(hasMetaData).toBeFalse();
+});
+
+tap.test('getSubDirectoryByName should create correct parent chain for new nested directories', async () => {
+  const fakeSmartbucket = { s3Client: new FakeS3Client([{ Contents: [], CommonPrefixes: [] }]) } as unknown as smartbucket.SmartBucket;
+  const bucket = new smartbucket.Bucket(fakeSmartbucket, 'test-bucket');
+  const baseDirectory = new smartbucket.Directory(bucket, null as any, '');
+
+  const nestedDirectory = await baseDirectory.getSubDirectoryByName('level1/level2', { getEmptyDirectory: true });
+
+  expect(nestedDirectory.name).toEqual('level2');
+  expect(nestedDirectory.parentDirectoryRef.name).toEqual('level1');
+  expect(nestedDirectory.getBasePath()).toEqual('level1/level2/');
+});
+
+tap.test('listFiles should aggregate results across paginated ListObjectsV2 responses', async () => {
+  const firstPage = {
+    Contents: Array.from({ length: 1000 }, (_, index) => ({ Key: `file-${index}` })),
+    IsTruncated: true,
+    NextContinuationToken: 'token-1',
+  };
+  const secondPage = {
+    Contents: Array.from({ length: 200 }, (_, index) => ({ Key: `file-${1000 + index}` })),
+    IsTruncated: false,
+  };
+  const fakeSmartbucket = { s3Client: new FakeS3Client([firstPage, secondPage]) } as unknown as smartbucket.SmartBucket;
+  const bucket = new smartbucket.Bucket(fakeSmartbucket, 'test-bucket');
+  const baseDirectory = new smartbucket.Directory(bucket, null as any, '');
+
+  const files = await baseDirectory.listFiles();
+  expect(files.length).toEqual(1200);
+});
+
+tap.test('listDirectories should aggregate CommonPrefixes across pagination', async () => {
+  const fakeSmartbucket = {
+    s3Client: new FakeS3Client([
+      { CommonPrefixes: [{ Prefix: 'dirA/' }], IsTruncated: true, NextContinuationToken: 'token-1' },
+      { CommonPrefixes: [{ Prefix: 'dirB/' }], IsTruncated: false },
+    ]),
+  } as unknown as smartbucket.SmartBucket;
+  const bucket = new smartbucket.Bucket(fakeSmartbucket, 'test-bucket');
+  const baseDirectory = new smartbucket.Directory(bucket, null as any, '');
+
+  const directories = await baseDirectory.listDirectories();
+  expect(directories.map((d) => d.name)).toEqual(['dirA', 'dirB']);
+});
+
+export default tap.start();
--- a/test/test.metadata.node+deno.ts
+++ b/test/test.metadata.node+deno.ts
@@ -0,0 +1,7 @@
+import { tap, expect } from '@git.zone/tstest/tapbundle';
+
+tap.test('test metadata functionality', async () => {
+
+})
+
+export default tap.start();
--- a/test/test.node+deno.ts
+++ b/test/test.node+deno.ts
@@ -1,4 +1,4 @@
-import { expect, expectAsync, tap } from '@push.rocks/tapbundle';
+import { expect, tap } from '@git.zone/tstest/tapbundle';
 import { Qenv } from '@push.rocks/qenv';

 import * as smartbucket from '../ts/index.js';
@@ -11,24 +11,31 @@ let baseDirectory: smartbucket.Directory;

 tap.test('should create a valid smartbucket', async () => {
  testSmartbucket = new smartbucket.SmartBucket({
-    accessKey: await testQenv.getEnvVarOnDemand('S3_KEY'),
-    accessSecret: await testQenv.getEnvVarOnDemand('S3_SECRET'),
-    endpoint: 's3.eu-central-1.wasabisys.com',
+    accessKey: await testQenv.getEnvVarOnDemandStrict('S3_ACCESSKEY'),
+    accessSecret: await testQenv.getEnvVarOnDemandStrict('S3_SECRETKEY'),
+    endpoint: await testQenv.getEnvVarOnDemandStrict('S3_ENDPOINT'),
+    port: parseInt(await testQenv.getEnvVarOnDemandStrict('S3_PORT')),
+    useSsl: false,
  });
+  expect(testSmartbucket).toBeInstanceOf(smartbucket.SmartBucket);
+  const bucketName = await testQenv.getEnvVarOnDemandStrict('S3_BUCKET');
+  myBucket = await testSmartbucket.getBucketByName(bucketName);
+  expect(myBucket).toBeInstanceOf(smartbucket.Bucket);
+  expect(myBucket.name).toEqual(bucketName);
+});
+
+tap.test('should clean all contents', async () => {
+  await myBucket.cleanAllContents();
+  expect(await myBucket.fastExists({ path: 'hithere/socool.txt' })).toBeFalse();
+  expect(await myBucket.fastExists({ path: 'trashtest/trashme.txt' })).toBeFalse();
 });

 tap.skip.test('should create testbucket', async () => {
-  // await testSmartbucket.createBucket('testzone');
+  // await testSmartbucket.createBucket('testzone2');
 });

 tap.skip.test('should remove testbucket', async () => {
-  // await testSmartbucket.removeBucket('testzone');
-});
-
-tap.test('should get a bucket', async () => {
-  myBucket = await testSmartbucket.getBucketByName('testzone');
-  expect(myBucket).toBeInstanceOf(smartbucket.Bucket);
-  expect(myBucket.name).toEqual('testzone');
+  // await testSmartbucket.removeBucket('testzone2');
 });

 // Fast operations
@@ -43,9 +50,12 @@ tap.test('should get data in bucket', async () => {
  const fileString = await myBucket.fastGet({
    path: 'hithere/socool.txt',
  });
-  const fileStringStream = await myBucket.fastGetStream({
-    path: 'hithere/socool.txt',
-  }, 'nodestream');
+  const fileStringStream = await myBucket.fastGetStream(
+    {
+      path: 'hithere/socool.txt',
+    },
+    'nodestream'
+  );
  console.log(fileString);
 });

@@ -99,8 +109,9 @@ tap.test('should get base directory', async () => {
 tap.test('should correctly build paths for sub directories', async () => {
  const dir4 = await baseDirectory.getSubDirectoryByName('dir3/dir4');
  expect(dir4).toBeInstanceOf(smartbucket.Directory);
-  const dir4BasePath = dir4.getBasePath();
+  const dir4BasePath = dir4?.getBasePath();
  console.log(dir4BasePath);
+  expect(dir4BasePath).toEqual('dir3/dir4/');
 });

 tap.test('clean up directory style tests', async () => {
@@ -118,4 +129,4 @@ tap.test('clean up directory style tests', async () => {
  await myBucket.fastRemove({ path: 'file1.txt' });
 });

-tap.start();
+export default tap.start();
--- a/test/test.trash.node+deno.ts
+++ b/test/test.trash.node+deno.ts
@@ -0,0 +1,94 @@
+import { expect, tap } from '@git.zone/tstest/tapbundle';
+import { jestExpect } from '@push.rocks/tapbundle/node';
+import { Qenv } from '@push.rocks/qenv';
+
+import * as smartbucket from '../ts/index.js';
+
+const testQenv = new Qenv('./', './.nogit/');
+
+let testSmartbucket: smartbucket.SmartBucket;
+let myBucket: smartbucket.Bucket;
+let baseDirectory: smartbucket.Directory;
+
+tap.test('should create a valid smartbucket', async () => {
+  testSmartbucket = new smartbucket.SmartBucket({
+    accessKey: await testQenv.getEnvVarOnDemandStrict('S3_ACCESSKEY'),
+    accessSecret: await testQenv.getEnvVarOnDemandStrict('S3_SECRETKEY'),
+    endpoint: await testQenv.getEnvVarOnDemandStrict('S3_ENDPOINT'),
+    port: parseInt(await testQenv.getEnvVarOnDemandStrict('S3_PORT')),
+    useSsl: false,
+  });
+  expect(testSmartbucket).toBeInstanceOf(smartbucket.SmartBucket);
+  const bucketName = await testQenv.getEnvVarOnDemandStrict('S3_BUCKET');
+  myBucket = await testSmartbucket.getBucketByName(bucketName);
+  expect(myBucket).toBeInstanceOf(smartbucket.Bucket);
+});
+
+tap.test('should clean all contents', async () => {
+  await myBucket.cleanAllContents();
+  expect(await myBucket.fastExists({ path: 'hithere/socool.txt' })).toBeFalse();
+  expect(await myBucket.fastExists({ path: 'trashtest/trashme.txt' })).toBeFalse();
+});
+
+tap.test('should delete a file into the normally', async () => {
+  const path = 'trashtest/trashme.txt';
+  const file = await myBucket.fastPut({
+    path,
+    contents: 'I\'m in the trash test content!',
+  });
+  const fileMetadata = await (await file.getMetaData()).metadataFile.getContents();
+  console.log(fileMetadata.toString());
+  expect(await file.getMetaData().then((meta) => meta.metadataFile.getJsonData())).toEqual({});
+  await file.delete({ mode: 'permanent' });
+  expect((await (await myBucket.getBaseDirectory()).listFiles()).length).toEqual(0);  
+  expect((await (await myBucket.getBaseDirectory()).listDirectories()).length).toEqual(0);  
+});
+
+tap.test('should put a file into the trash', async () => {
+  const path = 'trashtest/trashme.txt';
+  const file = await myBucket.fastPut({
+    path,
+    contents: 'I\'m in the trash test content!',
+  });
+  const fileMetadata = await (await file.getMetaData()).metadataFile.getContents();
+  console.log(fileMetadata.toString());
+  expect(await file.getMetaData().then((meta) => meta.metadataFile.getJsonData())).toEqual({});
+  await file.delete({ mode: 'trash' });
+
+  const getTrashContents = async () => {
+    const trash = await myBucket.getTrash();
+    const trashDir = await trash.getTrashDir();
+    return await trashDir.listFiles();
+  }
+
+  const trashedFiles = await getTrashContents();
+  expect(trashedFiles.length).toEqual(2);
+
+  const trashedMetaFile = trashedFiles.find(file => file.name.endsWith('.metadata'));
+  expect(trashedMetaFile).toBeDefined();
+  expect(trashedMetaFile).toBeInstanceOf(smartbucket.File);
+
+  jestExpect(await trashedMetaFile!.getJsonData()).toEqual({
+    custom_recycle: {
+      deletedAt: jestExpect.any(Number),
+      originalPath: "trashtest/trashme.txt",
+    },
+  });
+});
+
+tap.test('should restore a file from trash', async () => {
+  const baseDirectory = await myBucket.getBaseDirectory();
+  const file = await baseDirectory.getFile({
+    path: 'trashtest/trashme.txt',
+    getFromTrash: true
+  });
+  const trashFileMeta = await file.getMetaData();
+  const data = await trashFileMeta.getCustomMetaData({
+    key: 'recycle'
+  });
+  expect(file).toBeInstanceOf(smartbucket.File);
+  await file.restore();
+});
+
+
+export default tap.start();
--- a/test/test.watcher.node.ts
+++ b/test/test.watcher.node.ts
@@ -0,0 +1,410 @@
+// test.watcher.node.ts - Tests for BucketWatcher
+
+import { tap, expect } from '@git.zone/tstest/tapbundle';
+import * as smartbucket from '../ts/index.js';
+import type { IS3ChangeEvent } from '../ts/interfaces.js';
+
+// Get test configuration
+import * as qenv from '@push.rocks/qenv';
+const testQenv = new qenv.Qenv('./', './.nogit/');
+
+// Test bucket reference
+let testBucket: smartbucket.Bucket;
+let testSmartbucket: smartbucket.SmartBucket;
+
+// Setup: Create test bucket
+tap.test('should create valid smartbucket and bucket', async () => {
+  testSmartbucket = new smartbucket.SmartBucket({
+    accessKey: await testQenv.getEnvVarOnDemand('S3_ACCESSKEY'),
+    accessSecret: await testQenv.getEnvVarOnDemand('S3_SECRETKEY'),
+    endpoint: await testQenv.getEnvVarOnDemand('S3_ENDPOINT'),
+    port: parseInt(await testQenv.getEnvVarOnDemand('S3_PORT')),
+    useSsl: false,
+  });
+
+  testBucket = await smartbucket.Bucket.getBucketByName(
+    testSmartbucket,
+    await testQenv.getEnvVarOnDemand('S3_BUCKET')
+  );
+  expect(testBucket).toBeInstanceOf(smartbucket.Bucket);
+});
+
+tap.test('should clean bucket for watcher tests', async () => {
+  await testBucket.cleanAllContents();
+});
+
+// ==========================
+// Basic Watcher Tests
+// ==========================
+
+tap.test('should create watcher with default options', async () => {
+  const watcher = testBucket.createWatcher();
+  expect(watcher).toBeInstanceOf(smartbucket.BucketWatcher);
+  expect(watcher.changeSubject).toBeDefined();
+});
+
+tap.test('should create watcher with custom options', async () => {
+  const watcher = testBucket.createWatcher({
+    prefix: 'test/',
+    pollIntervalMs: 2000,
+    includeInitial: true,
+  });
+  expect(watcher).toBeInstanceOf(smartbucket.BucketWatcher);
+});
+
+// ==========================
+// Add Event Detection Tests
+// ==========================
+
+tap.test('should detect add events for new files', async () => {
+  const events: IS3ChangeEvent[] = [];
+  const watcher = testBucket.createWatcher({
+    prefix: 'watcher-test/',
+    pollIntervalMs: 500,
+  });
+
+  watcher.changeSubject.subscribe((event) => {
+    if (!Array.isArray(event)) {
+      events.push(event);
+    }
+  });
+
+  await watcher.start();
+  await watcher.readyDeferred.promise;
+
+  // Create a new file
+  await testBucket.fastPut({
+    path: 'watcher-test/new-file.txt',
+    contents: 'test content',
+  });
+
+  // Wait for poll to detect the change
+  await new Promise((resolve) => setTimeout(resolve, 1200));
+
+  await watcher.stop();
+
+  expect(events.length).toBeGreaterThanOrEqual(1);
+  const addEvent = events.find((e) => e.type === 'add' && e.key === 'watcher-test/new-file.txt');
+  expect(addEvent).toBeDefined();
+  expect(addEvent!.bucket).toEqual(testBucket.name);
+});
+
+// ==========================
+// Modify Event Detection Tests
+// ==========================
+
+tap.test('should detect modify events for changed files', async () => {
+  const events: IS3ChangeEvent[] = [];
+  const watcher = testBucket.createWatcher({
+    prefix: 'watcher-test/',
+    pollIntervalMs: 500,
+  });
+
+  watcher.changeSubject.subscribe((event) => {
+    if (!Array.isArray(event)) {
+      events.push(event);
+    }
+  });
+
+  await watcher.start();
+  await watcher.readyDeferred.promise;
+
+  // Modify the file
+  await testBucket.fastPut({
+    path: 'watcher-test/new-file.txt',
+    contents: 'modified content with different size',
+    overwrite: true,
+  });
+
+  // Wait for poll to detect the change
+  await new Promise((resolve) => setTimeout(resolve, 1200));
+
+  await watcher.stop();
+
+  expect(events.length).toBeGreaterThanOrEqual(1);
+  const modifyEvent = events.find((e) => e.type === 'modify' && e.key === 'watcher-test/new-file.txt');
+  expect(modifyEvent).toBeDefined();
+});
+
+// ==========================
+// Delete Event Detection Tests
+// ==========================
+
+tap.test('should detect delete events for removed files', async () => {
+  const events: IS3ChangeEvent[] = [];
+  const watcher = testBucket.createWatcher({
+    prefix: 'watcher-test/',
+    pollIntervalMs: 500,
+  });
+
+  watcher.changeSubject.subscribe((event) => {
+    if (!Array.isArray(event)) {
+      events.push(event);
+    }
+  });
+
+  await watcher.start();
+  await watcher.readyDeferred.promise;
+
+  // Delete the file
+  await testBucket.fastRemove({ path: 'watcher-test/new-file.txt' });
+
+  // Wait for poll to detect the change
+  await new Promise((resolve) => setTimeout(resolve, 1200));
+
+  await watcher.stop();
+
+  expect(events.length).toBeGreaterThanOrEqual(1);
+  const deleteEvent = events.find((e) => e.type === 'delete' && e.key === 'watcher-test/new-file.txt');
+  expect(deleteEvent).toBeDefined();
+});
+
+// ==========================
+// Initial State Tests
+// ==========================
+
+tap.test('should emit initial state as add events when includeInitial is true', async () => {
+  // First, create some test files
+  await testBucket.fastPut({
+    path: 'watcher-initial/file1.txt',
+    contents: 'content 1',
+  });
+  await testBucket.fastPut({
+    path: 'watcher-initial/file2.txt',
+    contents: 'content 2',
+  });
+
+  const events: IS3ChangeEvent[] = [];
+  const watcher = testBucket.createWatcher({
+    prefix: 'watcher-initial/',
+    pollIntervalMs: 10000, // Long interval - we only care about initial events
+    includeInitial: true,
+  });
+
+  watcher.changeSubject.subscribe((event) => {
+    if (!Array.isArray(event)) {
+      events.push(event);
+    }
+  });
+
+  await watcher.start();
+  await watcher.readyDeferred.promise;
+
+  // Give a moment for events to propagate
+  await new Promise((resolve) => setTimeout(resolve, 100));
+
+  await watcher.stop();
+
+  expect(events.length).toEqual(2);
+  expect(events.every((e) => e.type === 'add')).toBeTrue();
+  expect(events.some((e) => e.key === 'watcher-initial/file1.txt')).toBeTrue();
+  expect(events.some((e) => e.key === 'watcher-initial/file2.txt')).toBeTrue();
+});
+
+// ==========================
+// EventEmitter Pattern Tests
+// ==========================
+
+tap.test('should emit events via EventEmitter pattern', async () => {
+  const events: IS3ChangeEvent[] = [];
+  const watcher = testBucket.createWatcher({
+    prefix: 'watcher-emitter/',
+    pollIntervalMs: 500,
+  });
+
+  watcher.on('change', (event: IS3ChangeEvent) => {
+    events.push(event);
+  });
+
+  await watcher.start();
+  await watcher.readyDeferred.promise;
+
+  // Create a new file
+  await testBucket.fastPut({
+    path: 'watcher-emitter/emitter-test.txt',
+    contents: 'test content',
+  });
+
+  // Wait for poll to detect the change
+  await new Promise((resolve) => setTimeout(resolve, 1200));
+
+  await watcher.stop();
+
+  expect(events.length).toBeGreaterThanOrEqual(1);
+  expect(events[0].type).toEqual('add');
+});
+
+// ==========================
+// Buffered Events Tests
+// ==========================
+
+tap.test('should buffer events when bufferTimeMs is set', async () => {
+  const bufferedEvents: (IS3ChangeEvent | IS3ChangeEvent[])[] = [];
+  const watcher = testBucket.createWatcher({
+    prefix: 'watcher-buffer/',
+    pollIntervalMs: 200,
+    bufferTimeMs: 1000,
+  });
+
+  watcher.changeSubject.subscribe((event) => {
+    bufferedEvents.push(event);
+  });
+
+  await watcher.start();
+  await watcher.readyDeferred.promise;
+
+  // Create multiple files quickly
+  await testBucket.fastPut({
+    path: 'watcher-buffer/file1.txt',
+    contents: 'content 1',
+  });
+  await testBucket.fastPut({
+    path: 'watcher-buffer/file2.txt',
+    contents: 'content 2',
+  });
+  await testBucket.fastPut({
+    path: 'watcher-buffer/file3.txt',
+    contents: 'content 3',
+  });
+
+  // Wait for buffer to emit
+  await new Promise((resolve) => setTimeout(resolve, 1500));
+
+  await watcher.stop();
+
+  // With buffering, events should come as arrays
+  expect(bufferedEvents.length).toBeGreaterThanOrEqual(1);
+  // At least one buffered emission should contain multiple events
+  const hasBufferedArray = bufferedEvents.some(
+    (e) => Array.isArray(e) && e.length >= 1
+  );
+  expect(hasBufferedArray).toBeTrue();
+});
+
+// ==========================
+// Error Handling Tests
+// ==========================
+
+tap.test('should emit error events on error', async () => {
+  const errors: Error[] = [];
+  const watcher = testBucket.createWatcher({
+    prefix: 'watcher-error/',
+    pollIntervalMs: 500,
+  });
+
+  watcher.on('error', (err: Error) => {
+    errors.push(err);
+  });
+
+  await watcher.start();
+  await watcher.readyDeferred.promise;
+
+  // Note: Triggering actual S3 errors is tricky in tests.
+  // We just verify the error handler is properly attached.
+  await watcher.stop();
+
+  // No errors expected in normal operation
+  expect(errors.length).toEqual(0);
+});
+
+// ==========================
+// Graceful Stop Tests
+// ==========================
+
+tap.test('should stop gracefully with stop()', async () => {
+  const watcher = testBucket.createWatcher({
+    prefix: 'watcher-stop/',
+    pollIntervalMs: 100,
+  });
+
+  await watcher.start();
+  await watcher.readyDeferred.promise;
+
+  // Let it poll a few times
+  await new Promise((resolve) => setTimeout(resolve, 300));
+
+  // Stop should complete without errors
+  await watcher.stop();
+
+  // Watcher should not poll after stop
+  const eventsCaptured: IS3ChangeEvent[] = [];
+  watcher.on('change', (event: IS3ChangeEvent) => {
+    eventsCaptured.push(event);
+  });
+
+  // Create a file after stop
+  await testBucket.fastPut({
+    path: 'watcher-stop/after-stop.txt',
+    contents: 'should not be detected',
+  });
+
+  await new Promise((resolve) => setTimeout(resolve, 200));
+
+  // No events should be captured after stop
+  expect(eventsCaptured.length).toEqual(0);
+});
+
+tap.test('should stop gracefully with close() alias', async () => {
+  const watcher = testBucket.createWatcher({
+    prefix: 'watcher-close/',
+    pollIntervalMs: 100,
+  });
+
+  await watcher.start();
+  await watcher.readyDeferred.promise;
+
+  // close() should work as alias for stop()
+  await watcher.close();
+});
+
+// ==========================
+// Prefix Filtering Tests
+// ==========================
+
+tap.test('should only detect changes within specified prefix', async () => {
+  const events: IS3ChangeEvent[] = [];
+  const watcher = testBucket.createWatcher({
+    prefix: 'watcher-prefix-a/',
+    pollIntervalMs: 500,
+  });
+
+  watcher.changeSubject.subscribe((event) => {
+    if (!Array.isArray(event)) {
+      events.push(event);
+    }
+  });
+
+  await watcher.start();
+  await watcher.readyDeferred.promise;
+
+  // Create file in watched prefix
+  await testBucket.fastPut({
+    path: 'watcher-prefix-a/watched.txt',
+    contents: 'watched content',
+  });
+
+  // Create file outside watched prefix
+  await testBucket.fastPut({
+    path: 'watcher-prefix-b/unwatched.txt',
+    contents: 'unwatched content',
+  });
+
+  // Wait for poll
+  await new Promise((resolve) => setTimeout(resolve, 1200));
+
+  await watcher.stop();
+
+  // Should only see the file in watcher-prefix-a/
+  expect(events.length).toEqual(1);
+  expect(events[0].key).toEqual('watcher-prefix-a/watched.txt');
+});
+
+// ==========================
+// Cleanup
+// ==========================
+
+tap.test('should clean up test data', async () => {
+  await testBucket.cleanAllContents();
+});
+
+export default tap.start();
--- a/ts/00_commitinfo_data.ts
+++ b/ts/00_commitinfo_data.ts
@@ -1,8 +1,8 @@
 /**
- * autocreated commitinfo by @pushrocks/commitinfo
+ * autocreated commitinfo by @push.rocks/commitinfo
 */
 export const commitinfo = {
  name: '@push.rocks/smartbucket',
-  version: '3.0.18',
-  description: 'A TypeScript library offering simple and cloud-agnostic object storage with advanced features like bucket creation, file and directory management, and data streaming.'
+  version: '4.4.1',
+  description: 'A TypeScript library providing a cloud-agnostic interface for managing object storage with functionalities like bucket management, file and directory operations, and advanced features such as metadata handling and file locking.'
 }
--- a/ts/classes.bucket.ts
+++ b/ts/classes.bucket.ts
@@ -7,6 +7,8 @@ import { SmartBucket } from './classes.smartbucket.js';
 import { Directory } from './classes.directory.js';
 import { File } from './classes.file.js';
 import { Trash } from './classes.trash.js';
+import { ListCursor, type IListCursorOptions } from './classes.listcursor.js';
+import { BucketWatcher } from './classes.watcher.js';

 /**
 * The bucket class exposes the basic functionality of a bucket.
@@ -14,29 +16,29 @@ import { Trash } from './classes.trash.js';
 * operate in S3 basic fashion on blobs of data.
 */
 export class Bucket {
-  public static async getBucketByName(smartbucketRef: SmartBucket, bucketNameArg: string) {
+  public static async getBucketByName(smartbucketRef: SmartBucket, bucketNameArg: string): Promise<Bucket> {
    const command = new plugins.s3.ListBucketsCommand({});
    const buckets = await smartbucketRef.s3Client.send(command);
-    const foundBucket = buckets.Buckets.find((bucket) => bucket.Name === bucketNameArg);
+    const foundBucket = buckets.Buckets!.find((bucket) => bucket.Name === bucketNameArg);

    if (foundBucket) {
      console.log(`bucket with name ${bucketNameArg} exists.`);
      console.log(`Taking this as base for new Bucket instance`);
      return new this(smartbucketRef, bucketNameArg);
    } else {
-      return null;
+      throw new Error(`Bucket '${bucketNameArg}' not found.`);
    }
  }

  public static async createBucketByName(smartbucketRef: SmartBucket, bucketName: string) {
    const command = new plugins.s3.CreateBucketCommand({ Bucket: bucketName });
-    await smartbucketRef.s3Client.send(command).catch((e) => console.log(e));
+    await smartbucketRef.s3Client.send(command);
    return new Bucket(smartbucketRef, bucketName);
  }

  public static async removeBucketByName(smartbucketRef: SmartBucket, bucketName: string) {
    const command = new plugins.s3.DeleteBucketCommand({ Bucket: bucketName });
-    await smartbucketRef.s3Client.send(command).catch((e) => console.log(e));
+    await smartbucketRef.s3Client.send(command);
  }

  public smartbucketRef: SmartBucket;
@@ -51,7 +53,7 @@ export class Bucket {
   * gets the base directory of the bucket
   */
  public async getBaseDirectory(): Promise<Directory> {
-    return new Directory(this, null, '');
+    return new Directory(this, null!, '');
  }

  /**
@@ -70,7 +72,9 @@ export class Bucket {
    }
    const checkPath = await helpers.reducePathDescriptorToPath(pathDescriptorArg);
    const baseDirectory = await this.getBaseDirectory();
-    return await baseDirectory.getSubDirectoryByName(checkPath);
+    return await baseDirectory.getSubDirectoryByName(checkPath, {
+      getEmptyDirectory: true,
+    });
  }

  // ===============
@@ -91,8 +95,10 @@ export class Bucket {
      const exists = await this.fastExists({ path: reducedPath });

      if (exists && !optionsArg.overwrite) {
-        console.error(`Object already exists at path '${reducedPath}' in bucket '${this.name}'.`);
-        return;
+        throw new Error(
+          `Object already exists at path '${reducedPath}' in bucket '${this.name}'. ` +
+          `Set overwrite:true to replace it.`
+        );
      } else if (exists && optionsArg.overwrite) {
        console.log(
          `Overwriting existing object at path '${reducedPath}' in bucket '${this.name}'.`
@@ -125,6 +131,7 @@ export class Bucket {
    }
  }

+
  /**
   * get file
   */
@@ -149,7 +156,7 @@ export class Bucket {
      },
    });
    await done.promise;
-    return completeFile;
+    return completeFile!;
  }

  /**
@@ -217,7 +224,7 @@ export class Bucket {
        return chunk;
      },
      finalFunction: async (cb) => {
-        return null;
+        return null!;
      },
    });

@@ -231,6 +238,7 @@ export class Bucket {
    if (typeArg === 'webstream') {
      return (await duplexStream.getWebStreams()).readable;
    }
+    throw new Error('unknown typeArg');
  }

  /**
@@ -246,10 +254,10 @@ export class Bucket {
      const exists = await this.fastExists({ path: optionsArg.path });

      if (exists && !optionsArg.overwrite) {
-        console.error(
-          `Object already exists at path '${optionsArg.path}' in bucket '${this.name}'.`
+        throw new Error(
+          `Object already exists at path '${optionsArg.path}' in bucket '${this.name}'. ` +
+          `Set overwrite:true to replace it.`
        );
-        return;
      } else if (exists && optionsArg.overwrite) {
        console.log(
          `Overwriting existing object at path '${optionsArg.path}' in bucket '${this.name}'.`
@@ -329,7 +337,9 @@ export class Bucket {
  }): Promise<void> {
    try {
      const destinationBucket = optionsArg.targetBucket || this;
-      const exists = await destinationBucket.fastExists({ path: optionsArg.destinationPath });
+      const exists = await destinationBucket.fastExists({
+        path: optionsArg.destinationPath,
+      });

      if (exists && !optionsArg.overwrite) {
        console.error(
@@ -386,8 +396,8 @@ export class Bucket {
      await this.smartbucketRef.s3Client.send(command);
      console.log(`Object '${optionsArg.path}' exists in bucket '${this.name}'.`);
      return true;
-    } catch (error) {
-      if (error.name === 'NotFound') {
+    } catch (error: any) {
+      if (error?.name === 'NotFound') {
        console.log(`Object '${optionsArg.path}' does not exist in bucket '${this.name}'.`);
        return false;
      } else {
@@ -422,8 +432,8 @@ export class Bucket {
      Prefix: checkPath,
      Delimiter: '/',
    });
-    const response = await this.smartbucketRef.s3Client.send(command);
-    return response.CommonPrefixes.length > 0;
+    const { CommonPrefixes } = await this.smartbucketRef.s3Client.send(command);
+    return !!CommonPrefixes && CommonPrefixes.length > 0;
  }

  public async isFile(pathDescriptor: interfaces.IPathDecriptor): Promise<boolean> {
@@ -433,7 +443,235 @@ export class Bucket {
      Prefix: checkPath,
      Delimiter: '/',
    });
-    const response = await this.smartbucketRef.s3Client.send(command);
-    return response.Contents.length > 0;
+    const { Contents } = await this.smartbucketRef.s3Client.send(command);
+    return !!Contents && Contents.length > 0;
+  }
+
+  public async getMagicBytes(optionsArg: { path: string; length: number }): Promise<Buffer> {
+    try {
+      const command = new plugins.s3.GetObjectCommand({
+        Bucket: this.name,
+        Key: optionsArg.path,
+        Range: `bytes=0-${optionsArg.length - 1}`,
+      });
+      const response = await this.smartbucketRef.s3Client.send(command);
+      const chunks: Buffer[] = [];
+      const stream = response.Body as any; // SdkStreamMixin includes readable stream
+
+      for await (const chunk of stream) {
+        chunks.push(chunk);
+      }
+      return Buffer.concat(chunks);
+    } catch (error) {
+      console.error(
+        `Error retrieving magic bytes from object at path '${optionsArg.path}' in bucket '${this.name}':`,
+        error
+      );
+      throw error;
+    }
+  }
+
+  // ==========================================
+  // Memory-Efficient Listing Methods (Phase 1)
+  // ==========================================
+
+  /**
+   * List all objects with a given prefix using async generator (memory-efficient streaming)
+   * @param prefix - Optional prefix to filter objects (default: '' for all objects)
+   * @yields Object keys one at a time
+   * @example
+   * ```ts
+   * for await (const key of bucket.listAllObjects('npm/')) {
+   *   console.log(key);
+   *   if (shouldStop) break; // Early exit supported
+   * }
+   * ```
+   */
+  public async *listAllObjects(prefix: string = ''): AsyncIterableIterator<string> {
+    let continuationToken: string | undefined;
+
+    do {
+      const command = new plugins.s3.ListObjectsV2Command({
+        Bucket: this.name,
+        Prefix: prefix,
+        ContinuationToken: continuationToken,
+      });
+
+      const response = await this.smartbucketRef.s3Client.send(command);
+
+      for (const obj of response.Contents || []) {
+        if (obj.Key) yield obj.Key;
+      }
+
+      continuationToken = response.NextContinuationToken;
+    } while (continuationToken);
+  }
+
+  /**
+   * List all objects as an RxJS Observable (for complex reactive pipelines)
+   * @param prefix - Optional prefix to filter objects (default: '' for all objects)
+   * @returns Observable that emits object keys
+   * @example
+   * ```ts
+   * bucket.listAllObjectsObservable('npm/')
+   *   .pipe(
+   *     filter(key => key.endsWith('.json')),
+   *     take(100)
+   *   )
+   *   .subscribe(key => console.log(key));
+   * ```
+   */
+  public listAllObjectsObservable(prefix: string = ''): plugins.smartrx.rxjs.Observable<string> {
+    return new plugins.smartrx.rxjs.Observable<string>((subscriber) => {
+      const fetchPage = async (token?: string) => {
+        try {
+          const command = new plugins.s3.ListObjectsV2Command({
+            Bucket: this.name,
+            Prefix: prefix,
+            ContinuationToken: token,
+          });
+
+          const response = await this.smartbucketRef.s3Client.send(command);
+
+          for (const obj of response.Contents || []) {
+            if (obj.Key) subscriber.next(obj.Key);
+          }
+
+          if (response.NextContinuationToken) {
+            await fetchPage(response.NextContinuationToken);
+          } else {
+            subscriber.complete();
+          }
+        } catch (error) {
+          subscriber.error(error);
+        }
+      };
+
+      fetchPage();
+    });
+  }
+
+  /**
+   * Create a cursor for manual pagination control
+   * @param prefix - Optional prefix to filter objects (default: '' for all objects)
+   * @param options - Cursor options (pageSize, etc.)
+   * @returns ListCursor instance
+   * @example
+   * ```ts
+   * const cursor = bucket.createCursor('npm/', { pageSize: 500 });
+   * while (cursor.hasMore()) {
+   *   const { keys, done } = await cursor.next();
+   *   console.log(`Processing ${keys.length} keys...`);
+   * }
+   * ```
+   */
+  public createCursor(prefix: string = '', options?: IListCursorOptions): ListCursor {
+    return new ListCursor(this, prefix, options);
+  }
+
+  /**
+   * Create a watcher for monitoring bucket changes (add/modify/delete)
+   * @param options - Watcher options (prefix, pollIntervalMs, etc.)
+   * @returns BucketWatcher instance
+   * @example
+   * ```ts
+   * const watcher = bucket.createWatcher({ prefix: 'uploads/', pollIntervalMs: 3000 });
+   * watcher.changeSubject.subscribe((change) => console.log('Change:', change));
+   * await watcher.start();
+   * // ... later
+   * await watcher.stop();
+   * ```
+   */
+  public createWatcher(options?: interfaces.IBucketWatcherOptions): BucketWatcher {
+    return new BucketWatcher(this, options);
+  }
+
+  // ==========================================
+  // High-Level Listing Helpers (Phase 2)
+  // ==========================================
+
+  /**
+   * Find objects matching a glob pattern (memory-efficient)
+   * @param pattern - Glob pattern (e.g., "**\/*.json", "npm/packages/*\/index.json")
+   * @yields Matching object keys
+   * @example
+   * ```ts
+   * for await (const key of bucket.findByGlob('npm/packages/*\/index.json')) {
+   *   console.log('Found package index:', key);
+   * }
+   * ```
+   */
+  public async *findByGlob(pattern: string): AsyncIterableIterator<string> {
+    const matcher = new plugins.Minimatch(pattern);
+    for await (const key of this.listAllObjects('')) {
+      if (matcher.match(key)) yield key;
+    }
+  }
+
+  /**
+   * List all objects and collect into an array (convenience method)
+   * WARNING: Loads entire result set into memory. Use listAllObjects() generator for large buckets.
+   * @param prefix - Optional prefix to filter objects (default: '' for all objects)
+   * @returns Array of all object keys
+   * @example
+   * ```ts
+   * const allKeys = await bucket.listAllObjectsArray('npm/');
+   * console.log(`Found ${allKeys.length} objects`);
+   * ```
+   */
+  public async listAllObjectsArray(prefix: string = ''): Promise<string[]> {
+    const keys: string[] = [];
+    for await (const key of this.listAllObjects(prefix)) {
+      keys.push(key);
+    }
+    return keys;
+  }
+
+  public async cleanAllContents(): Promise<void> {
+    try {
+      // Define the command type explicitly
+      const listCommandInput: plugins.s3.ListObjectsV2CommandInput = {
+        Bucket: this.name,
+      };
+  
+      let isTruncated = true;
+      let continuationToken: string | undefined = undefined;
+  
+      while (isTruncated) {
+        // Add the continuation token to the input if present
+        const listCommand = new plugins.s3.ListObjectsV2Command({
+          ...listCommandInput,
+          ContinuationToken: continuationToken,
+        });
+  
+        // Explicitly type the response
+        const response: plugins.s3.ListObjectsV2Output =
+          await this.smartbucketRef.s3Client.send(listCommand);
+        
+        console.log(`Cleaning contents of bucket '${this.name}': Now deleting ${response.Contents?.length} items...`);
+
+        if (response.Contents && response.Contents.length > 0) {
+          // Delete objects in batches, mapping each item to { Key: string }
+          const deleteCommand = new plugins.s3.DeleteObjectsCommand({
+            Bucket: this.name,
+            Delete: {
+              Objects: response.Contents.map((item) => ({ Key: item.Key! })),
+              Quiet: true,
+            },
+          });
+  
+          await this.smartbucketRef.s3Client.send(deleteCommand);
+        }
+  
+        // Update continuation token and truncation status
+        isTruncated = response.IsTruncated || false;
+        continuationToken = response.NextContinuationToken;
+      }
+  
+      console.log(`All contents in bucket '${this.name}' have been deleted.`);
+    } catch (error) {
+      console.error(`Error cleaning contents of bucket '${this.name}':`, error);
+      throw error;
+    }
  }
 }
--- a/ts/classes.directory.ts
+++ b/ts/classes.directory.ts
@@ -10,9 +10,9 @@ export class Directory {
  public parentDirectoryRef: Directory;
  public name: string;

-  public tree: string[];
-  public files: string[];
-  public folders: string[];
+  public tree!: string[];
+  public files!: string[];
+  public folders!: string[];

  constructor(bucketRefArg: Bucket, parentDirectory: Directory, name: string) {
    this.bucketRef = bucketRefArg;
@@ -66,13 +66,13 @@ export class Directory {
   * gets a file by name
   */
  public async getFile(optionsArg: {
-    name: string;
+    path: string;
    createWithContents?: string | Buffer;
    getFromTrash?: boolean;
  }): Promise<File> {
    const pathDescriptor = {
      directory: this,
-      path: optionsArg.name,
+      path: optionsArg.path,
    };
    const exists = await this.bucketRef.fastExists({
      path: await helpers.reducePathDescriptorToPath(pathDescriptor),
@@ -83,34 +83,81 @@ export class Directory {
      return trashedFile;
    }
    if (!exists && !optionsArg.createWithContents) {
-      return null;
+      throw new Error(`File not found at path '${optionsArg.path}'`);
    }
    if (!exists && optionsArg.createWithContents) {
      await File.create({
        directory: this,
-        name: optionsArg.name,
+        name: optionsArg.path,
        contents: optionsArg.createWithContents,
      });
    }
    return new File({
      directoryRefArg: this,
-      fileName: optionsArg.name,
+      fileName: optionsArg.path,
    });
  }

+
+  /**
+   * Check if a file exists in this directory
+   */
+  public async fileExists(optionsArg: { path: string }): Promise<boolean> {
+    const pathDescriptor = {
+      directory: this,
+      path: optionsArg.path,
+    };
+    return this.bucketRef.fastExists({
+      path: await helpers.reducePathDescriptorToPath(pathDescriptor),
+    });
+  }
+
+  /**
+   * Check if a subdirectory exists
+   */
+  public async directoryExists(dirNameArg: string): Promise<boolean> {
+    const directories = await this.listDirectories();
+    return directories.some(dir => dir.name === dirNameArg);
+  }
+
+  /**
+   * Collects all ListObjectsV2 pages for a prefix.
+   */
+  private async listObjectsV2AllPages(prefix: string, delimiter?: string) {
+    const allContents: plugins.s3._Object[] = [];
+    const allCommonPrefixes: plugins.s3.CommonPrefix[] = [];
+    let continuationToken: string | undefined;
+
+    do {
+      const command = new plugins.s3.ListObjectsV2Command({
+        Bucket: this.bucketRef.name,
+        Prefix: prefix,
+        Delimiter: delimiter,
+        ContinuationToken: continuationToken,
+      });
+      const response = await this.bucketRef.smartbucketRef.s3Client.send(command);
+
+      if (response.Contents) {
+        allContents.push(...response.Contents);
+      }
+      if (response.CommonPrefixes) {
+        allCommonPrefixes.push(...response.CommonPrefixes);
+      }
+
+      continuationToken = response.IsTruncated ? response.NextContinuationToken : undefined;
+    } while (continuationToken);
+
+    return { contents: allContents, commonPrefixes: allCommonPrefixes };
+  }
+
  /**
   * lists all files
   */
  public async listFiles(): Promise<File[]> {
-    const command = new plugins.s3.ListObjectsV2Command({
-      Bucket: this.bucketRef.name,
-      Prefix: this.getBasePath(),
-      Delimiter: '/',
-    });
-    const response = await this.bucketRef.smartbucketRef.s3Client.send(command);
+    const { contents } = await this.listObjectsV2AllPages(this.getBasePath(), '/');
    const fileArray: File[] = [];

-    response.Contents.forEach((item) => {
+    contents.forEach((item) => {
      if (item.Key && !item.Key.endsWith('/')) {
        const subtractedPath = item.Key.replace(this.getBasePath(), '');
        if (!subtractedPath.includes('/')) {
@@ -132,16 +179,11 @@ export class Directory {
   */
  public async listDirectories(): Promise<Directory[]> {
    try {
-      const command = new plugins.s3.ListObjectsV2Command({
-        Bucket: this.bucketRef.name,
-        Prefix: this.getBasePath(),
-        Delimiter: '/',
-      });
-      const response = await this.bucketRef.smartbucketRef.s3Client.send(command);
+      const { commonPrefixes } = await this.listObjectsV2AllPages(this.getBasePath(), '/');
      const directoryArray: Directory[] = [];
  
-      if (response.CommonPrefixes) {
-        response.CommonPrefixes.forEach((item) => {
+      if (commonPrefixes) {
+        commonPrefixes.forEach((item) => {
          if (item.Prefix) {
            const subtractedPath = item.Prefix.replace(this.getBasePath(), '');
            if (subtractedPath.endsWith('/')) {
@@ -178,25 +220,75 @@ export class Directory {
  /**
   * gets a sub directory by name
   */
-  public async getSubDirectoryByName(dirNameArg: string): Promise<Directory> {
-    const dirNameArray = dirNameArg.split('/');
+  public async getSubDirectoryByName(dirNameArg: string, optionsArg: {
+    /**
+     * in s3 a directory does not exist if it is empty
+     * this option returns a directory even if it is empty
+     */
+    getEmptyDirectory?: boolean;
+    /**
+     * in s3 a directory does not exist if it is empty
+     * this option creates a directory even if it is empty using a initializer file
+     */
+    createWithInitializerFile?: boolean;
+    /**
+     * if the path is a file path, it will be treated as a file and the parent directory will be returned
+     */
+    couldBeFilePath?: boolean;
+  } = {}): Promise<Directory> {

-    const getDirectory = async (directoryArg: Directory, dirNameToSearch: string) => {
-      const directories = await directoryArg.listDirectories();
-      return directories.find((directory) => {
-        return directory.name === dirNameToSearch;
-      });
-    };
+    const dirNameArray = dirNameArg.split('/').filter(str => str.trim() !== "");

-    let wantedDirectory: Directory;
-    for (const dirNameToSearch of dirNameArray) {
-      const directoryToSearchIn = wantedDirectory ? wantedDirectory : this;
-      wantedDirectory = await getDirectory(directoryToSearchIn, dirNameToSearch);
+    optionsArg = {
+      getEmptyDirectory: false,
+      createWithInitializerFile: false,
+      ...optionsArg,
    }

+
+    const getDirectory = async (directoryArg: Directory, dirNameToSearch: string, isFinalDirectory: boolean) => {
+      const directories = await directoryArg.listDirectories();
+      let returnDirectory = directories.find((directory) => {
+        return directory.name === dirNameToSearch;
+      });
+      if (returnDirectory) {
+        return returnDirectory;
+      }
+      if (optionsArg.getEmptyDirectory || optionsArg.createWithInitializerFile) {
+        returnDirectory = new Directory(this.bucketRef, directoryArg, dirNameToSearch);
+      }
+      if (isFinalDirectory && optionsArg.createWithInitializerFile) {
+        returnDirectory?.createEmptyFile('00init.txt');
+      }
+      return returnDirectory || null;
+    };
+
+    if (optionsArg.couldBeFilePath) {
+      const baseDirectory = await this.bucketRef.getBaseDirectory();
+      const existingFile = await baseDirectory.getFile({
+        path: dirNameArg,
+      });
+      if (existingFile) {
+        const adjustedPath = dirNameArg.substring(0, dirNameArg.lastIndexOf('/'));
+        return this.getSubDirectoryByName(adjustedPath);
+      }
+    }
+
+    let wantedDirectory: Directory | null = null;
+    let counter = 0;
+    for (const dirNameToSearch of dirNameArray) {
+      counter++;
+      const directoryToSearchIn = wantedDirectory ? wantedDirectory : this;
+      wantedDirectory = await getDirectory(directoryToSearchIn, dirNameToSearch, counter === dirNameArray.length);
+    }
+
+    if (!wantedDirectory) {
+      throw new Error(`Directory not found at path '${dirNameArg}'`);
+    }
    return wantedDirectory;
  }

+
  /**
   * moves the directory
   */
@@ -283,19 +375,30 @@ export class Directory {

  /**
   * removes a file within the directory
+   * uses file class to make sure effects for metadata etc. are handled correctly
   * @param optionsArg
   */
-  public async fastRemove(optionsArg: { path: string }) {
-    const path = plugins.path.join(this.getBasePath(), optionsArg.path);
-    await this.bucketRef.fastRemove({
-      path,
+  public async fastRemove(optionsArg: {
+    path: string
+    /**
+     * wether the file should be placed into trash. Default is false.
+     */
+    mode?: 'permanent' | 'trash';
+  }) {
+    const file = await this.getFile({
+      path: optionsArg.path,
+    });
+    await file.delete({
+      mode: optionsArg.mode ? optionsArg.mode : 'permanent',
    });
  }

  /**
   * deletes the directory with all its contents
   */
-  public async delete() {
+  public async delete(optionsArg: {
+    mode?: 'permanent' | 'trash';
+  }) {
    const deleteDirectory = async (directoryArg: Directory) => {
      const childDirectories = await directoryArg.listDirectories();
      if (childDirectories.length === 0) {
@@ -307,9 +410,9 @@ export class Directory {
      }
      const files = await directoryArg.listFiles();
      for (const file of files) {
-        await directoryArg.fastRemove({
-          path: file.name,
-        });
+        await file.delete({
+          mode: optionsArg.mode ? optionsArg.mode : 'permanent',
+        })
      }
    };
    await deleteDirectory(this);
--- a/ts/classes.file.ts
+++ b/ts/classes.file.ts
@@ -50,6 +50,10 @@ export class File {
  public parentDirectoryRef: Directory;
  public name: string;

+  /**
+   * get the full path to the file
+   * @returns the full path to the file
+   */
  public getBasePath(): string {
    return plugins.path.join(this.parentDirectoryRef.getBasePath(), this.name);
  }
@@ -88,24 +92,23 @@ export class File {
  /**
   * deletes this file
   */
-  public async delete(optionsArg?: {
-    mode: 'trash' | 'permanent';
-  }) {
-
+  public async delete(optionsArg?: { mode: 'trash' | 'permanent' }) {
    optionsArg = {
-      ... {
+      ...{
        mode: 'permanent',
      },
      ...optionsArg,
-    }
+    };

    if (optionsArg.mode === 'permanent') {
      await this.parentDirectoryRef.bucketRef.fastRemove({
        path: this.getBasePath(),
      });
      if (!this.name.endsWith('.metadata')) {
-        const metadata = await this.getMetaData();
-        await metadata.metadataFile.delete(optionsArg);
+        if (await this.hasMetaData()) {
+          const metadata = await this.getMetaData();
+          await metadata.metadataFile.delete(optionsArg);
+        }
      }
    } else if (optionsArg.mode === 'trash') {
      const metadata = await this.getMetaData();
@@ -117,15 +120,43 @@ export class File {
        },
      });
      const trash = await this.parentDirectoryRef.bucketRef.getTrash();
+      const trashDir = await trash.getTrashDir();
      await this.move({
-        directory: await trash.getTrashDir(),
+        directory: trashDir,
        path: await trash.getTrashKeyByOriginalBasePath(this.getBasePath()),
      });
    }
-    
+
    await this.parentDirectoryRef.listFiles();
  }

+  /**
+   * restores
+   */
+  public async restore(optionsArg: {
+    useOriginalPath?: boolean;
+    toPath?: string;
+    overwrite?: boolean;
+  } = {}) {
+    optionsArg = {
+      useOriginalPath: (() => {
+        return optionsArg.toPath ? false : true;
+      })(),
+      overwrite: false,
+      ...optionsArg,
+    };
+    const metadata = await this.getMetaData();
+    const moveToPath = optionsArg.toPath || (await metadata.getCustomMetaData({
+      key: 'recycle'
+    })).originalPath;
+    await metadata.deleteCustomMetaData({
+      key: 'recycle'
+    })
+    await this.move({
+      path: moveToPath,
+    });
+  }
+
  /**
   * allows locking the file
   * @param optionsArg
@@ -150,7 +181,7 @@ export class File {
  }) {
    const metadata = await this.getMetaData();
    await metadata.removeLock({
-      force: optionsArg?.force,
+      force: optionsArg?.force || false,
    });
  }

@@ -165,16 +196,19 @@ export class File {
      await this.parentDirectoryRef.bucketRef.fastPutStream({
        path: this.getBasePath(),
        readableStream: optionsArg.contents,
+        overwrite: true,
      });
    } else if (Buffer.isBuffer(optionsArg.contents)) {
      await this.parentDirectoryRef.bucketRef.fastPut({
        path: this.getBasePath(),
        contents: optionsArg.contents,
+        overwrite: true,
      });
    } else if (typeof optionsArg.contents === 'string') {
      await this.parentDirectoryRef.bucketRef.fastPut({
        path: this.getBasePath(),
        contents: Buffer.from(optionsArg.contents, optionsArg.encoding),
+        overwrite: true,
      });
    }
  }
@@ -183,23 +217,52 @@ export class File {
   * moves the file to another directory
   */
  public async move(pathDescriptorArg: interfaces.IPathDecriptor) {
-    let moveToPath = '';
+    let moveToPath: string = '';
    const isDirectory = await this.parentDirectoryRef.bucketRef.isDirectory(pathDescriptorArg);
    if (isDirectory) {
      moveToPath = await helpers.reducePathDescriptorToPath({
        ...pathDescriptorArg,
-        path: plugins.path.join(pathDescriptorArg.path, this.name),
+        path: plugins.path.join(pathDescriptorArg.path!, this.name),
      });
+    } else {
+      moveToPath = await helpers.reducePathDescriptorToPath(pathDescriptorArg);
    }
    // lets move the file
    await this.parentDirectoryRef.bucketRef.fastMove({
      sourcePath: this.getBasePath(),
      destinationPath: moveToPath,
+      overwrite: true,
    });
-
    // lets move the metadatafile
-    const metadata = await this.getMetaData();
-    await metadata.metadataFile.move(pathDescriptorArg);
+    if (!this.name.endsWith('.metadata')) {
+      const metadata = await this.getMetaData();
+      await this.parentDirectoryRef.bucketRef.fastMove({
+        sourcePath: metadata.metadataFile.getBasePath(),
+        destinationPath: moveToPath + '.metadata',
+        overwrite: true,
+      });
+    }
+
+    // lets update references of this
+    const baseDirectory = await this.parentDirectoryRef.bucketRef.getBaseDirectory();
+    this.parentDirectoryRef = await baseDirectory.getSubDirectoryByName(
+      await helpers.reducePathDescriptorToPath(pathDescriptorArg),
+      {
+        couldBeFilePath: true,
+      }
+    );
+    this.name = pathDescriptorArg.path!;
+  }
+
+  public async hasMetaData(): Promise<boolean> {
+    if (!this.name.endsWith('.metadata')) {
+      const hasMetadataBool = MetaData.hasMetaData({
+        file: this,
+      });
+      return hasMetadataBool;
+    } else {
+      return false;
+    }
  }

  /**
@@ -230,4 +293,11 @@ export class File {
      contents: JSON.stringify(dataArg),
    });
  }
+
+  public async getMagicBytes(optionsArg: { length: number }): Promise<Buffer> {
+    return this.parentDirectoryRef.bucketRef.getMagicBytes({
+      path: this.getBasePath(),
+      length: optionsArg.length,
+    });
+  }
 }
--- a/ts/classes.listcursor.ts
+++ b/ts/classes.listcursor.ts
@@ -0,0 +1,89 @@
+// classes.listcursor.ts
+
+import * as plugins from './plugins.js';
+import type { Bucket } from './classes.bucket.js';
+
+export interface IListCursorOptions {
+  pageSize?: number;
+}
+
+export interface IListCursorResult {
+  keys: string[];
+  done: boolean;
+}
+
+/**
+ * ListCursor provides explicit pagination control for listing objects in a bucket.
+ * Useful for UI pagination, resumable operations, and manual batch processing.
+ */
+export class ListCursor {
+  private continuationToken?: string;
+  private exhausted = false;
+  private pageSize: number;
+
+  constructor(
+    private bucket: Bucket,
+    private prefix: string,
+    options: IListCursorOptions = {}
+  ) {
+    this.pageSize = options.pageSize || 1000;
+  }
+
+  /**
+   * Fetch the next page of object keys
+   * @returns Object with keys array and done flag
+   */
+  public async next(): Promise<IListCursorResult> {
+    if (this.exhausted) {
+      return { keys: [], done: true };
+    }
+
+    const command = new plugins.s3.ListObjectsV2Command({
+      Bucket: this.bucket.name,
+      Prefix: this.prefix,
+      MaxKeys: this.pageSize,
+      ContinuationToken: this.continuationToken,
+    });
+
+    const response = await this.bucket.smartbucketRef.s3Client.send(command);
+
+    const keys = (response.Contents || [])
+      .map((obj) => obj.Key)
+      .filter((key): key is string => !!key);
+
+    this.continuationToken = response.NextContinuationToken;
+    this.exhausted = !this.continuationToken;
+
+    return { keys, done: this.exhausted };
+  }
+
+  /**
+   * Check if there are more pages to fetch
+   */
+  public hasMore(): boolean {
+    return !this.exhausted;
+  }
+
+  /**
+   * Reset the cursor to start from the beginning
+   */
+  public reset(): void {
+    this.continuationToken = undefined;
+    this.exhausted = false;
+  }
+
+  /**
+   * Get the current continuation token (for saving/restoring state)
+   */
+  public getToken(): string | undefined {
+    return this.continuationToken;
+  }
+
+  /**
+   * Set the continuation token (for resuming from a saved state)
+   */
+  public setToken(token: string | undefined): void {
+    this.continuationToken = token;
+    this.exhausted = !token;
+  }
+}
--- a/ts/classes.metadata.ts
+++ b/ts/classes.metadata.ts
@@ -3,6 +3,26 @@ import * as plugins from './plugins.js';
 import { File } from './classes.file.js';

 export class MetaData {
+  public static async hasMetaData(optionsArg: { file: File }) {
+    // try finding the existing metadata file; return false if it doesn't exist
+    try {
+      const existingFile = await optionsArg.file.parentDirectoryRef.getFile({
+        path: optionsArg.file.name + '.metadata',
+      });
+      return !!existingFile;
+    } catch (error: any) {
+      const message = error?.message || '';
+      const isNotFound =
+        message.includes('File not found') ||
+        error?.name === 'NotFound' ||
+        error?.$metadata?.httpStatusCode === 404;
+      if (isNotFound) {
+        return false;
+      }
+      throw error;
+    }
+  }
+
  // static
  public static async createForFile(optionsArg: { file: File }) {
    const metaData = new MetaData();
@@ -10,7 +30,7 @@ export class MetaData {

    // lets find the existing metadata file
    metaData.metadataFile = await metaData.fileRef.parentDirectoryRef.getFile({
-      name: metaData.fileRef.name + '.metadata',
+      path: metaData.fileRef.name + '.metadata',
      createWithContents: '{}',
    });

@@ -21,20 +41,34 @@ export class MetaData {
  /**
   * the file that contains the metadata
   */
-  metadataFile: File;
+  metadataFile!: File;

  /**
   * the file that the metadata is for
   */
-  fileRef: File;
+  fileRef!: File;

  public async getFileType(optionsArg?: {
    useFileExtension?: boolean;
    useMagicBytes?: boolean;
-  }): Promise<string> {
-    if ((optionsArg && optionsArg.useFileExtension) || optionsArg.useFileExtension === undefined) {
-      return plugins.path.extname(this.fileRef.name);
+  }): Promise<plugins.smartmime.IFileTypeResult | undefined> {
+    if ((optionsArg && optionsArg.useFileExtension) || !optionsArg) {
+      const fileType = await plugins.smartmime.detectMimeType({
+        path: this.fileRef.name,
+      });
+
+      return fileType;
    }
+    if (optionsArg && optionsArg.useMagicBytes) {
+      const fileType = await plugins.smartmime.detectMimeType({
+        buffer: await this.fileRef.getMagicBytes({
+          length: 100,
+        })
+      });
+
+      return fileType;
+    }
+    throw new Error('optionsArg.useFileExtension and optionsArg.useMagicBytes cannot both be false');
  }

  /**
@@ -44,13 +78,13 @@ export class MetaData {
    const stat = await this.fileRef.parentDirectoryRef.bucketRef.fastStat({
      path: this.fileRef.getBasePath(),
    });
-    return stat.ContentLength;
+    return stat.ContentLength!;
  }

  private prefixCustomMetaData = 'custom_';

  public async storeCustomMetaData<T = any>(optionsArg: { key: string; value: T }) {
-    const data = await this.metadataFile.getContentsAsString();
+    const data = await this.metadataFile.getJsonData();
    data[this.prefixCustomMetaData + optionsArg.key] = optionsArg.value;
    await this.metadataFile.writeJsonData(data);
  }
--- a/ts/classes.smartbucket.ts
+++ b/ts/classes.smartbucket.ts
@@ -2,6 +2,7 @@

 import * as plugins from './plugins.js';
 import { Bucket } from './classes.bucket.js';
+import { normalizeS3Descriptor } from './helpers.js';

 export class SmartBucket {
  public config: plugins.tsclass.storage.IS3Descriptor;
@@ -17,18 +18,14 @@ export class SmartBucket {
  constructor(configArg: plugins.tsclass.storage.IS3Descriptor) {
    this.config = configArg;

-    const protocol = configArg.useSsl === false ? 'http' : 'https';
-    const port = configArg.port ? `:${configArg.port}` : '';
-    const endpoint = `${protocol}://${configArg.endpoint}${port}`;
+    // Use the normalizer to handle various endpoint formats
+    const { normalized } = normalizeS3Descriptor(configArg);

    this.s3Client = new plugins.s3.S3Client({
-      endpoint,
-      region: configArg.region || 'us-east-1',
-      credentials: {
-        accessKeyId: configArg.accessKey,
-        secretAccessKey: configArg.accessSecret,
-      },
-      forcePathStyle: true, // Necessary for S3-compatible storage like MinIO or Wasabi
+      endpoint: normalized.endpointUrl,
+      region: normalized.region,
+      credentials: normalized.credentials,
+      forcePathStyle: normalized.forcePathStyle, // Necessary for S3-compatible storage like MinIO or Wasabi
    });
  }

@@ -41,7 +38,16 @@ export class SmartBucket {
    await Bucket.removeBucketByName(this, bucketName);
  }

-  public async getBucketByName(bucketName: string) {
-    return Bucket.getBucketByName(this, bucketName);
+  public async getBucketByName(bucketNameArg: string) {
+    return Bucket.getBucketByName(this, bucketNameArg);
+  }
+
+  /**
+   * Check if a bucket exists
+   */
+  public async bucketExists(bucketNameArg: string): Promise<boolean> {
+    const command = new plugins.s3.ListBucketsCommand({});
+    const buckets = await this.s3Client.send(command);
+    return buckets.Buckets?.some(bucket => bucket.Name === bucketNameArg) ?? false;
  }
 }
--- a/ts/classes.trash.ts
+++ b/ts/classes.trash.ts
@@ -21,7 +21,7 @@ export class Trash {
    const trashDir = await this.getTrashDir();
    const originalPath = await helpers.reducePathDescriptorToPath(pathDescriptor);
    const trashKey = await this.getTrashKeyByOriginalBasePath(originalPath);
-    return trashDir.getFile({ name: trashKey });
+    return trashDir.getFile({ path: trashKey });
  }

  public async getTrashKeyByOriginalBasePath (originalPath: string): Promise<string> {
--- a/ts/classes.watcher.ts
+++ b/ts/classes.watcher.ts
@@ -0,0 +1,289 @@
+// classes.watcher.ts
+
+import * as plugins from './plugins.js';
+import * as interfaces from './interfaces.js';
+import type { Bucket } from './classes.bucket.js';
+import { EventEmitter } from 'node:events';
+
+/**
+ * BucketWatcher monitors an S3 bucket for changes (add/modify/delete)
+ * using a polling-based approach. Designed to follow the SmartdataDbWatcher pattern.
+ *
+ * @example
+ * ```typescript
+ * const watcher = bucket.createWatcher({ prefix: 'uploads/', pollIntervalMs: 3000 });
+ *
+ * // RxJS Observable pattern
+ * watcher.changeSubject.subscribe((change) => {
+ *   console.log('Change:', change);
+ * });
+ *
+ * // EventEmitter pattern
+ * watcher.on('change', (change) => console.log(change));
+ * watcher.on('error', (err) => console.error(err));
+ *
+ * await watcher.start();
+ * await watcher.readyDeferred.promise; // Wait for initial state
+ *
+ * // Later...
+ * await watcher.stop();
+ * ```
+ */
+export class BucketWatcher extends EventEmitter {
+  /** Deferred that resolves when initial state is built and watcher is ready */
+  public readyDeferred = plugins.smartpromise.defer();
+
+  /** Observable for receiving change events (supports RxJS operators) */
+  public changeSubject: plugins.smartrx.rxjs.Observable<interfaces.IS3ChangeEvent | interfaces.IS3ChangeEvent[]>;
+
+  // Internal subjects and state
+  private rawSubject: plugins.smartrx.rxjs.Subject<interfaces.IS3ChangeEvent>;
+  private previousState: Map<string, interfaces.IS3ObjectState>;
+  private pollIntervalId: ReturnType<typeof setInterval> | null = null;
+  private isPolling = false;
+  private isStopped = false;
+
+  // Configuration
+  private readonly bucketRef: Bucket;
+  private readonly prefix: string;
+  private readonly pollIntervalMs: number;
+  private readonly bufferTimeMs?: number;
+  private readonly includeInitial: boolean;
+  private readonly pageSize: number;
+
+  constructor(bucketRef: Bucket, options: interfaces.IBucketWatcherOptions = {}) {
+    super();
+
+    this.bucketRef = bucketRef;
+    this.prefix = options.prefix ?? '';
+    this.pollIntervalMs = options.pollIntervalMs ?? 5000;
+    this.bufferTimeMs = options.bufferTimeMs;
+    this.includeInitial = options.includeInitial ?? false;
+    this.pageSize = options.pageSize ?? 1000;
+
+    // Initialize state tracking
+    this.previousState = new Map();
+
+    // Initialize raw subject for emitting changes
+    this.rawSubject = new plugins.smartrx.rxjs.Subject<interfaces.IS3ChangeEvent>();
+
+    // Configure the public observable with optional buffering
+    if (this.bufferTimeMs && this.bufferTimeMs > 0) {
+      this.changeSubject = this.rawSubject.pipe(
+        plugins.smartrx.rxjs.ops.bufferTime(this.bufferTimeMs),
+        plugins.smartrx.rxjs.ops.filter((events: interfaces.IS3ChangeEvent[]) => events.length > 0)
+      );
+    } else {
+      this.changeSubject = this.rawSubject.asObservable();
+    }
+  }
+
+  /**
+   * Start watching the bucket for changes
+   */
+  public async start(): Promise<void> {
+    if (this.pollIntervalId !== null) {
+      console.log('BucketWatcher is already running');
+      return;
+    }
+
+    this.isStopped = false;
+
+    // Build initial state
+    await this.buildInitialState();
+
+    // Emit initial state as 'add' events if configured
+    if (this.includeInitial) {
+      for (const state of this.previousState.values()) {
+        this.emitChange({
+          type: 'add',
+          key: state.key,
+          size: state.size,
+          etag: state.etag,
+          lastModified: state.lastModified,
+          bucket: this.bucketRef.name,
+        });
+      }
+    }
+
+    // Mark as ready
+    this.readyDeferred.resolve();
+
+    // Start polling loop
+    this.pollIntervalId = setInterval(() => {
+      this.poll().catch((err) => {
+        this.emit('error', err);
+      });
+    }, this.pollIntervalMs);
+  }
+
+  /**
+   * Stop watching the bucket
+   */
+  public async stop(): Promise<void> {
+    this.isStopped = true;
+
+    if (this.pollIntervalId !== null) {
+      clearInterval(this.pollIntervalId);
+      this.pollIntervalId = null;
+    }
+
+    // Wait for any in-progress poll to complete
+    while (this.isPolling) {
+      await new Promise<void>((resolve) => setTimeout(resolve, 50));
+    }
+
+    this.rawSubject.complete();
+  }
+
+  /**
+   * Alias for stop() - for consistency with other APIs
+   */
+  public async close(): Promise<void> {
+    return this.stop();
+  }
+
+  /**
+   * Build the initial state by listing all objects with metadata
+   */
+  private async buildInitialState(): Promise<void> {
+    this.previousState.clear();
+
+    for await (const obj of this.listObjectsWithMetadata()) {
+      if (obj.Key) {
+        this.previousState.set(obj.Key, {
+          key: obj.Key,
+          etag: obj.ETag ?? '',
+          size: obj.Size ?? 0,
+          lastModified: obj.LastModified ?? new Date(0),
+        });
+      }
+    }
+  }
+
+  /**
+   * Poll for changes by comparing current state against previous state
+   */
+  private async poll(): Promise<void> {
+    // Guard against overlapping polls
+    if (this.isPolling || this.isStopped) {
+      return;
+    }
+
+    this.isPolling = true;
+
+    try {
+      // Build current state
+      const currentState = new Map<string, interfaces.IS3ObjectState>();
+
+      for await (const obj of this.listObjectsWithMetadata()) {
+        if (this.isStopped) {
+          break;
+        }
+
+        if (obj.Key) {
+          currentState.set(obj.Key, {
+            key: obj.Key,
+            etag: obj.ETag ?? '',
+            size: obj.Size ?? 0,
+            lastModified: obj.LastModified ?? new Date(0),
+          });
+        }
+      }
+
+      if (!this.isStopped) {
+        this.detectChanges(currentState);
+        this.previousState = currentState;
+      }
+    } catch (err) {
+      this.emit('error', err);
+    } finally {
+      this.isPolling = false;
+    }
+  }
+
+  /**
+   * Detect changes between current and previous state
+   */
+  private detectChanges(currentState: Map<string, interfaces.IS3ObjectState>): void {
+    // Detect added and modified objects
+    for (const [key, current] of currentState) {
+      const previous = this.previousState.get(key);
+
+      if (!previous) {
+        // New object - emit 'add' event
+        this.emitChange({
+          type: 'add',
+          key: current.key,
+          size: current.size,
+          etag: current.etag,
+          lastModified: current.lastModified,
+          bucket: this.bucketRef.name,
+        });
+      } else if (
+        previous.etag !== current.etag ||
+        previous.size !== current.size ||
+        previous.lastModified.getTime() !== current.lastModified.getTime()
+      ) {
+        // Object modified - emit 'modify' event
+        this.emitChange({
+          type: 'modify',
+          key: current.key,
+          size: current.size,
+          etag: current.etag,
+          lastModified: current.lastModified,
+          bucket: this.bucketRef.name,
+        });
+      }
+    }
+
+    // Detect deleted objects
+    for (const [key, previous] of this.previousState) {
+      if (!currentState.has(key)) {
+        // Object deleted - emit 'delete' event
+        this.emitChange({
+          type: 'delete',
+          key: previous.key,
+          bucket: this.bucketRef.name,
+        });
+      }
+    }
+  }
+
+  /**
+   * Emit a change event via both RxJS Subject and EventEmitter
+   */
+  private emitChange(event: interfaces.IS3ChangeEvent): void {
+    this.rawSubject.next(event);
+    this.emit('change', event);
+  }
+
+  /**
+   * List objects with full metadata (ETag, Size, LastModified)
+   * This is a private method that yields full _Object data, not just keys
+   */
+  private async *listObjectsWithMetadata(): AsyncIterableIterator<plugins.s3._Object> {
+    let continuationToken: string | undefined;
+
+    do {
+      if (this.isStopped) {
+        return;
+      }
+
+      const command = new plugins.s3.ListObjectsV2Command({
+        Bucket: this.bucketRef.name,
+        Prefix: this.prefix,
+        MaxKeys: this.pageSize,
+        ContinuationToken: continuationToken,
+      });
+
+      const response = await this.bucketRef.smartbucketRef.s3Client.send(command);
+
+      for (const obj of response.Contents || []) {
+        yield obj;
+      }
+
+      continuationToken = response.NextContinuationToken;
+    } while (continuationToken);
+  }
+}
--- a/ts/helpers.ts
+++ b/ts/helpers.ts
@@ -19,4 +19,236 @@ export const reducePathDescriptorToPath = async (pathDescriptorArg: interfaces.I
    returnPath = returnPath.substring(1);
  }
  return returnPath;
+}
+
+// S3 Descriptor Normalization
+export interface IS3Warning {
+  code: string;
+  message: string;
+}
+
+export interface INormalizedS3Config {
+  endpointUrl: string;
+  host: string;
+  protocol: 'http' | 'https';
+  port?: number;
+  region: string;
+  credentials: {
+    accessKeyId: string;
+    secretAccessKey: string;
+  };
+  forcePathStyle: boolean;
+}
+
+function coerceBooleanMaybe(value: unknown): { value: boolean | undefined; warning?: IS3Warning } {
+  if (typeof value === 'boolean') return { value };
+  if (typeof value === 'string') {
+    const v = value.trim().toLowerCase();
+    if (v === 'true' || v === '1') {
+      return { 
+        value: true, 
+        warning: { 
+          code: 'SBK_S3_COERCED_USESSL', 
+          message: `Coerced useSsl='${value}' (string) to boolean true.` 
+        } 
+      };
+    }
+    if (v === 'false' || v === '0') {
+      return { 
+        value: false, 
+        warning: { 
+          code: 'SBK_S3_COERCED_USESSL', 
+          message: `Coerced useSsl='${value}' (string) to boolean false.` 
+        } 
+      };
+    }
+  }
+  return { value: undefined };
+}
+
+function coercePortMaybe(port: unknown): { value: number | undefined; warning?: IS3Warning } {
+  if (port === undefined || port === null || port === '') return { value: undefined };
+  const n = typeof port === 'number' ? port : Number(String(port).trim());
+  if (!Number.isFinite(n) || !Number.isInteger(n) || n <= 0 || n > 65535) {
+    return { 
+      value: undefined, 
+      warning: { 
+        code: 'SBK_S3_INVALID_PORT', 
+        message: `Invalid port '${String(port)}' - expected integer in [1..65535].` 
+      } 
+    };
+  }
+  return { value: n };
+}
+
+function sanitizeEndpointString(raw: unknown): { value: string; warnings: IS3Warning[] } {
+  const warnings: IS3Warning[] = [];
+  let s = String(raw ?? '').trim();
+  if (s !== String(raw ?? '')) {
+    warnings.push({ 
+      code: 'SBK_S3_TRIMMED_ENDPOINT', 
+      message: 'Trimmed surrounding whitespace from endpoint.' 
+    });
+  }
+  return { value: s, warnings };
+}
+
+function parseEndpointHostPort(
+  endpoint: string, 
+  provisionalProtocol: 'http' | 'https'
+): { 
+  hadScheme: boolean; 
+  host: string; 
+  port?: number; 
+  extras: { 
+    droppedPath?: boolean; 
+    droppedQuery?: boolean; 
+    droppedCreds?: boolean 
+  } 
+} {
+  let url: URL | undefined;
+  const extras: { droppedPath?: boolean; droppedQuery?: boolean; droppedCreds?: boolean } = {};
+  
+  // Check if endpoint already has a scheme
+  const hasScheme = /^https?:\/\//i.test(endpoint);
+  
+  // Try parsing as full URL first
+  try {
+    if (hasScheme) {
+      url = new URL(endpoint);
+    } else {
+      // Not a full URL; try host[:port] by attaching provisional scheme
+      // Remove anything after first '/' for safety
+      const cleanEndpoint = endpoint.replace(/\/.*/, '');
+      url = new URL(`${provisionalProtocol}://${cleanEndpoint}`);
+    }
+  } catch (e) {
+    throw new Error(`Unable to parse endpoint '${endpoint}'.`);
+  }
+  
+  // Check for dropped components
+  if (url.username || url.password) extras.droppedCreds = true;
+  if (url.pathname && url.pathname !== '/') extras.droppedPath = true;
+  if (url.search) extras.droppedQuery = true;
+
+  const hadScheme = hasScheme;
+  const host = url.hostname; // hostnames lowercased by URL; IPs preserved
+  const port = url.port ? Number(url.port) : undefined;
+
+  return { hadScheme, host, port, extras };
+}
+
+export function normalizeS3Descriptor(
+  input: plugins.tsclass.storage.IS3Descriptor,
+  logger?: { warn: (msg: string) => void }
+): { normalized: INormalizedS3Config; warnings: IS3Warning[] } {
+  const warnings: IS3Warning[] = [];
+  const logWarn = (w: IS3Warning) => { 
+    warnings.push(w); 
+    if (logger) {
+      logger.warn(`[SmartBucket S3] ${w.code}: ${w.message}`);
+    } else {
+      console.warn(`[SmartBucket S3] ${w.code}: ${w.message}`);
+    }
+  };
+
+  // Coerce and sanitize inputs
+  const { value: coercedUseSsl, warning: useSslWarn } = coerceBooleanMaybe((input as any).useSsl);
+  if (useSslWarn) logWarn(useSslWarn);
+  
+  const { value: coercedPort, warning: portWarn } = coercePortMaybe((input as any).port);
+  if (portWarn) logWarn(portWarn);
+
+  const { value: endpointStr, warnings: endpointSanWarnings } = sanitizeEndpointString((input as any).endpoint);
+  endpointSanWarnings.forEach(logWarn);
+
+  if (!endpointStr) {
+    throw new Error('S3 endpoint is required (got empty string). Provide hostname or URL.');
+  }
+
+  // Provisional protocol selection for parsing host:port forms
+  const provisionalProtocol: 'http' | 'https' = coercedUseSsl === false ? 'http' : 'https';
+
+  const { hadScheme, host, port: epPort, extras } = parseEndpointHostPort(endpointStr, provisionalProtocol);
+
+  if (extras.droppedCreds) {
+    logWarn({ 
+      code: 'SBK_S3_DROPPED_CREDENTIALS', 
+      message: 'Ignored credentials in endpoint URL.' 
+    });
+  }
+  if (extras.droppedPath) {
+    logWarn({ 
+      code: 'SBK_S3_DROPPED_PATH', 
+      message: 'Removed path segment from endpoint URL; S3 endpoint should be host[:port] only.' 
+    });
+  }
+  if (extras.droppedQuery) {
+    logWarn({ 
+      code: 'SBK_S3_DROPPED_QUERY', 
+      message: 'Removed query string from endpoint URL; S3 endpoint should be host[:port] only.' 
+    });
+  }
+
+  // Final protocol decision
+  let finalProtocol: 'http' | 'https';
+  if (hadScheme) {
+    // Scheme from endpoint wins
+    const schemeFromEndpoint = endpointStr.trim().toLowerCase().startsWith('http://') ? 'http' : 'https';
+    finalProtocol = schemeFromEndpoint;
+    if (typeof coercedUseSsl === 'boolean') {
+      const expected = coercedUseSsl ? 'https' : 'http';
+      if (expected !== finalProtocol) {
+        logWarn({ 
+          code: 'SBK_S3_SCHEME_CONFLICT', 
+          message: `useSsl=${String(coercedUseSsl)} conflicts with endpoint scheme '${finalProtocol}'; using endpoint scheme.` 
+        });
+      }
+    }
+  } else {
+    if (typeof coercedUseSsl === 'boolean') {
+      finalProtocol = coercedUseSsl ? 'https' : 'http';
+    } else {
+      finalProtocol = 'https';
+      logWarn({ 
+        code: 'SBK_S3_GUESSED_PROTOCOL', 
+        message: "No scheme in endpoint and useSsl not provided; defaulting to 'https'." 
+      });
+    }
+  }
+
+  // Final port decision
+  let finalPort: number | undefined = undefined;
+  if (coercedPort !== undefined && epPort !== undefined && coercedPort !== epPort) {
+    logWarn({ 
+      code: 'SBK_S3_PORT_CONFLICT', 
+      message: `Port in config (${coercedPort}) conflicts with endpoint port (${epPort}); using config port.` 
+    });
+    finalPort = coercedPort;
+  } else {
+    finalPort = (coercedPort !== undefined) ? coercedPort : epPort;
+  }
+
+  // Build canonical endpoint URL (origin only, no trailing slash)
+  const url = new URL(`${finalProtocol}://${host}`);
+  if (finalPort !== undefined) url.port = String(finalPort);
+  const endpointUrl = url.origin;
+
+  const region = input.region || 'us-east-1';
+
+  return {
+    normalized: {
+      endpointUrl,
+      host,
+      protocol: finalProtocol,
+      port: finalPort,
+      region,
+      credentials: {
+        accessKeyId: input.accessKey,
+        secretAccessKey: input.accessSecret,
+      },
+      forcePathStyle: true,
+    },
+    warnings,
+  };
 }
--- a/ts/index.ts
+++ b/ts/index.ts
@@ -2,3 +2,8 @@ export * from './classes.smartbucket.js';
 export * from './classes.bucket.js';
 export * from './classes.directory.js';
 export * from './classes.file.js';
+export * from './classes.listcursor.js';
+export * from './classes.metadata.js';
+export * from './classes.trash.js';
+export * from './classes.watcher.js';
+export * from './interfaces.js';
--- a/ts/interfaces.ts
+++ b/ts/interfaces.ts
@@ -3,4 +3,55 @@ import type { Directory } from "./classes.directory.js";
 export interface IPathDecriptor {
  path?: string;
  directory?: Directory;
+}
+
+// ================================
+// Bucket Watcher Interfaces
+// ================================
+
+/**
+ * Internal state tracking for an S3 object
+ */
+export interface IS3ObjectState {
+  key: string;
+  etag: string;
+  size: number;
+  lastModified: Date;
+}
+
+/**
+ * Change event emitted by BucketWatcher
+ */
+export interface IS3ChangeEvent {
+  type: 'add' | 'modify' | 'delete';
+  key: string;
+  size?: number;
+  etag?: string;
+  lastModified?: Date;
+  bucket: string;
+}
+
+/**
+ * Watcher mode - 'poll' is the default, 'websocket' reserved for future implementation
+ */
+export type TBucketWatcherMode = 'poll' | 'websocket';
+
+/**
+ * Options for creating a BucketWatcher
+ */
+export interface IBucketWatcherOptions {
+  /** Watcher mode: 'poll' (default) or 'websocket' (future) */
+  mode?: TBucketWatcherMode;
+  /** Prefix to filter objects (default: '' for all objects) */
+  prefix?: string;
+  /** Polling interval in milliseconds (default: 5000, poll mode only) */
+  pollIntervalMs?: number;
+  /** Optional RxJS buffering time in milliseconds */
+  bufferTimeMs?: number;
+  /** Emit initial state as 'add' events (default: false) */
+  includeInitial?: boolean;
+  /** Page size for listing operations (default: 1000) */
+  pageSize?: number;
+  // Future websocket options will be added here
+  // websocketUrl?: string;
 }
--- a/ts/plugins.ts
+++ b/ts/plugins.ts
@@ -1,8 +1,8 @@
 // plugins.ts

 // node native
-import * as path from 'path';
-import * as stream from 'stream';
+import * as path from 'node:path';
+import * as stream from 'node:stream';

 export { path, stream };

@@ -26,7 +26,9 @@ export {

 // third party scope
 import * as s3 from '@aws-sdk/client-s3';
+import { Minimatch } from 'minimatch';

 export {
  s3,
+  Minimatch,
 }
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -6,7 +6,8 @@
    "module": "NodeNext",
    "moduleResolution": "NodeNext",
    "esModuleInterop": true,
-    "verbatimModuleSyntax": true
+    "verbatimModuleSyntax": true,
+    "strict": true
  },
  "exclude": [
    "dist_*/**/*.d.ts"
Author	SHA1	Message	Date
Juergen Kunz	7959fa6296	v4.4.1	2026-01-25 18:10:51 +00:00
Juergen Kunz	2640fa07c4	v4.4.0	2026-01-25 18:09:38 +00:00
Juergen Kunz	7bb994e1cb	feat(watcher): add polling-based BucketWatcher to detect add/modify/delete events and expose RxJS Observable and EventEmitter APIs	2026-01-25 18:09:38 +00:00
Juergen Kunz	575cff4d09	v4.3.1	2026-01-24 09:55:44 +00:00
Juergen Kunz	6760fd480d	fix(bucket): propagate S3 client errors instead of silently logging them; update build script, bump dev/dependencies, and refresh npmextra configuration	2026-01-24 09:55:44 +00:00
Juergen Kunz	bd73004bd6	v4.3.0	2025-11-20 15:14:11 +00:00
Juergen Kunz	65c7bcf12c	feat(listing): Add memory-efficient listing APIs: async generator, RxJS observable, and cursor pagination; export ListCursor and Minimatch; add minimatch dependency; bump to 4.2.0	2025-11-20 15:14:11 +00:00
Juergen Kunz	dd6efa4908	v4.1.0	2025-11-20 13:58:02 +00:00
Juergen Kunz	1f4b7319d3	feat(core): Add S3 endpoint normalization, directory pagination, improved metadata checks, trash support, and related tests	2025-11-20 13:58:02 +00:00
Juergen Kunz	b8e5d9a222	v4.0.1	2025-11-20 13:38:53 +00:00
Juergen Kunz	429375a643	fix(plugins): Use explicit node: imports for native path and stream modules in ts/plugins.ts	2025-11-20 13:38:53 +00:00
Juergen Kunz	e147a077f3	v4.0.0	2025-11-20 13:20:19 +00:00
Juergen Kunz	5889396134	BREAKING CHANGE(core): Make API strict-by-default: remove *Strict variants, throw on not-found/exists conflicts, add explicit exists() methods, update docs/tests and bump deps	2025-11-20 13:20:19 +00:00
Juergen Kunz	0c631383e1	3.3.10	2025-08-18 02:43:29 +00:00
Juergen Kunz	d852d8c85b	fix(helpers): Normalize and robustly parse S3 endpoint configuration; use normalized descriptor in SmartBucket and update dev tooling	2025-08-18 02:43:29 +00:00
Juergen Kunz	fa4c44ae04	3.3.9	2025-08-15 18:31:42 +00:00
Juergen Kunz	708b0b63b1	fix(docs): Revise README with detailed usage examples and add local Claude settings	2025-08-15 18:31:42 +00:00
Juergen Kunz	8554554642	3.3.8	2025-08-15 18:28:27 +00:00
Juergen Kunz	a04aabf78b	fix(tests): Update tests to use @git.zone/tstest, upgrade dependencies, remove GitLab CI and add local CI/workspace config	2025-08-15 18:28:27 +00:00
Philipp Kunz	47cf2cc2cb	3.3.7	2024-12-02 17:00:42 +01:00
Philipp Kunz	ef20e15d20	fix(package): Update author field in package.json	2024-12-02 17:00:42 +01:00
Philipp Kunz	39a4bd6ab7	3.3.6	2024-12-02 17:00:17 +01:00
Philipp Kunz	c2a30654c5	fix(package): Fix license field in package.json to reflect MIT licensing	2024-12-02 17:00:17 +01:00
Philipp Kunz	8085033de4	3.3.5	2024-11-25 17:43:01 +01:00
Philipp Kunz	75dd1d43a9	fix(test): Refactor trash test to improve metadata and deletion validation	2024-11-25 17:43:00 +01:00
Philipp Kunz	8ba7cdc873	3.3.4	2024-11-25 17:36:14 +01:00
Philipp Kunz	ed8db4536b	fix(core): Minor refactoring and cleanup of TypeScript source files for improved readability and maintainability.	2024-11-25 17:36:14 +01:00
Philipp Kunz	96e3eadb31	3.3.3	2024-11-24 20:12:21 +01:00
Philipp Kunz	e9426b9cc9	fix(documentation): Improved documentation accuracy and consistency	2024-11-24 20:12:20 +01:00
Philipp Kunz	9801e15c32	3.3.2	2024-11-24 20:02:41 +01:00
Philipp Kunz	cbfdd8e123	fix(documentation): Updated keywords and description for clarity and consistency.	2024-11-24 20:02:40 +01:00
Philipp Kunz	138c38ee30	3.3.1	2024-11-24 19:59:37 +01:00
Philipp Kunz	a1e449cf94	fix(File): Fixed issue with file restore metadata operations.	2024-11-24 19:59:37 +01:00
Philipp Kunz	aa9a2e9220	3.3.0	2024-11-24 19:56:13 +01:00
Philipp Kunz	154854dc21	feat(core): Enhanced directory handling and file restoration from trash	2024-11-24 19:56:12 +01:00
Philipp Kunz	8e9041fbbf	3.2.2	2024-11-24 03:05:10 +01:00
Philipp Kunz	16a82ac50a	fix(core): Refactor Bucket class for improved error handling	2024-11-24 03:05:10 +01:00
Philipp Kunz	0b396f19cf	3.2.1	2024-11-24 02:28:48 +01:00
Philipp Kunz	6ab77ece6e	fix(metadata): Fix metadata handling for deleted files	2024-11-24 02:28:48 +01:00
Philipp Kunz	b7a1f2087c	Merge pull request 'fix: use overwrite to make metadata files work' (#2 ) from fix/smartbucket-trash into master Reviewed-on: #2	2024-11-24 01:27:58 +00:00
Philipp Kunz	b0d41fa9a0	3.2.0	2024-11-24 02:25:08 +01:00
Philipp Kunz	34082c38a7	feat(bucket): Enhanced SmartBucket with trash management and metadata handling	2024-11-24 02:25:08 +01:00
Dominik Schwank	8d160cefb0	fix: use overwrite to make metadata files work During a delete the metadata file is updated. As the overwrite property was not set, the metadata couldn't be updated and caused issues.	2024-11-18 21:08:39 +00:00
Philipp Kunz	cec9c07b7c	3.1.0	2024-11-18 15:07:47 +01:00
Philipp Kunz	383a5204f4	feat(file): Added functionality to retrieve magic bytes from files and detect file types using magic bytes.	2024-11-18 15:07:46 +01:00
Philipp Kunz	c7f0c97341	3.0.24	2024-11-18 11:24:11 +01:00
Philipp Kunz	e7f60465ff	fix(metadata): Fix metadata handling to address type assertion and data retrieval.	2024-11-18 11:24:11 +01:00
Philipp Kunz	7db4d24817	3.0.23	2024-10-16 10:27:27 +02:00
Philipp Kunz	dc599585b8	fix(dependencies): Update package dependencies for improved functionality and security.	2024-10-16 10:27:27 +02:00
Philipp Kunz	a22e32cd32	3.0.22	2024-07-28 12:46:39 +02:00
Philipp Kunz	4647181807	fix(dependencies): Update dependencies and improve bucket retrieval logging	2024-07-28 12:46:39 +02:00
Philipp Kunz	99c3935d0c	3.0.21	2024-07-04 18:39:28 +02:00
Philipp Kunz	05523dc7a1	fix(test): Update endpoint configuration in tests to use environment variable	2024-07-04 18:39:27 +02:00
Philipp Kunz	dc99cfa229	3.0.20	2024-06-19 18:28:53 +02:00
Philipp Kunz	23f8dc55d0	fix(core): update	2024-06-19 18:28:52 +02:00
Philipp Kunz	ffaf0fc97a	3.0.19	2024-06-18 18:44:59 +02:00
Philipp Kunz	2a0425ff54	fix(delete functions): ensure more consistency between methods and trash behaviour	2024-06-18 18:44:58 +02:00