From 503e25ff9838364a292d60662f9f0ad4d907b02f Mon Sep 17 00:00:00 2001 From: Juergen Kunz Date: Sat, 14 Mar 2026 23:46:12 +0000 Subject: [PATCH] fix(rust-bridge): update smartrust and limit RustBridge binary lookup to dist_rust --- changelog.md | 6 +++ package.json | 4 +- pnpm-lock.yaml | 96 +++++++++++++++++++++++++++++++++++++--- ts/00_commitinfo_data.ts | 2 +- ts/index.ts | 2 - 5 files changed, 99 insertions(+), 11 deletions(-) diff --git a/changelog.md b/changelog.md index 3e014b3..ad03e42 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,11 @@ # Changelog +## 2026-03-14 - 6.0.1 - fix(rust-bridge) +update smartrust and limit RustBridge binary lookup to dist_rust + +- Bumps @push.rocks/smartrust from ^1.0.0 to ^1.3.2. +- Removes rust target debug and release fallback paths from RustBridge local binary resolution, relying on dist_rust/ruststorage. + ## 2026-03-14 - 6.0.0 - BREAKING CHANGE(core) Rebrand from smarts3 to smartstorage diff --git a/package.json b/package.json index 539ce6a..1274ede 100644 --- a/package.json +++ b/package.json @@ -18,9 +18,9 @@ "@git.zone/tsbuild": "^3.1.0", "@git.zone/tsbundle": "^2.5.2", "@git.zone/tsrun": "^2.0.0", + "@git.zone/tsrust": "^1.3.0", "@git.zone/tstest": "^3.1.0", "@push.rocks/smartbucket": "^4.3.0", - "@git.zone/tsrust": "^1.3.0", "@types/node": "^22.9.0" }, "browserslist": [ @@ -41,7 +41,7 @@ ], "dependencies": { "@push.rocks/smartpath": "^6.0.0", - "@push.rocks/smartrust": "^1.0.0", + "@push.rocks/smartrust": "^1.3.2", "@tsclass/tsclass": "^9.3.0" }, "keywords": [ diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 3f69a2e..9bd7cb4 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -8,15 +8,12 @@ importers: .: dependencies: - '@push.rocks/smartfs': - specifier: ^1.1.0 - version: 1.1.0 '@push.rocks/smartpath': specifier: ^6.0.0 version: 6.0.0 - '@push.rocks/smartxml': - specifier: ^2.0.0 - version: 2.0.0 + '@push.rocks/smartrust': + specifier: ^1.3.2 + version: 1.3.2 '@tsclass/tsclass': specifier: ^9.3.0 version: 9.3.0 @@ -33,6 +30,9 @@ importers: '@git.zone/tsrun': specifier: ^2.0.0 version: 2.0.0 + '@git.zone/tsrust': + specifier: ^1.3.0 + version: 1.3.0 '@git.zone/tstest': specifier: ^3.1.0 version: 3.1.0(socks@2.8.7)(typescript@5.9.3) @@ -437,6 +437,10 @@ packages: resolution: {integrity: sha512-yA6zCjL+kn7xfZe6sL/m4K+zYqgkznG/pF6++i/E17iwzpG6dHmW+VZmYldHe86sW4DcLMvqM6CxM+KlgaEpKw==} hasBin: true + '@git.zone/tsrust@1.3.0': + resolution: {integrity: sha512-dvmTAiM04Pkd7J1Gail3fu7aasmILQhC5vKL71/g6HYhpvl16/c+Dj3We5G4HsFr0jvAr+Xu570ZGEuZrtRcCg==} + hasBin: true + '@git.zone/tstest@3.1.0': resolution: {integrity: sha512-nshpkFvyIUUDvYcA/IOyqWBVEoxGm674ytIkA+XJ6DPO/hz2l3mMIjplc43d2U2eHkAZk8/ycr9GIo0xNhiLFg==} hasBin: true @@ -578,6 +582,9 @@ packages: '@push.rocks/mongodump@1.1.0': resolution: {integrity: sha512-kW0ZUGyf1e4nwloVwBQjNId+MzgTcNS834C+RxH21i1NqyOubbpWZtJtPP+K+s35nSJRyCTy3ICfBMdDBTAm2w==} + '@push.rocks/npmextra@5.3.3': + resolution: {integrity: sha512-snLpSHwaQ5OXlZzF1KX/FY71W5LwajjBzor82Vue0smjEPnSeUPY5/JcVdMwtdprdJe13pc/EQQuIiL/zw4/yg==} + '@push.rocks/qenv@6.1.3': resolution: {integrity: sha512-+z2hsAU/7CIgpYLFqvda8cn9rUBMHqLdQLjsFfRn5jPoD7dJ5rFlpkbhfM4Ws8mHMniwWaxGKo+q/YBhtzRBLg==} @@ -605,6 +612,9 @@ packages: '@push.rocks/smartcli@4.0.19': resolution: {integrity: sha512-s1jZSgDZWi/az26AY4TJ2HPuG1qZzGC5R9fKWaECLmwnSpk6y9JXL5dnJAUohcdu50kdXCWEcRmLfYxOt81vEA==} + '@push.rocks/smartcli@4.0.20': + resolution: {integrity: sha512-gCo4ItvsPj8WoVAJw/6vkuoGA5FtIoACux2ktcCeH0nrFe7/xGR6waJ1aZcYAi7QN4gi52TlsgwuKz7BzXqhmQ==} + '@push.rocks/smartclickhouse@2.0.17': resolution: {integrity: sha512-IYO8Obor/Ruam2KQ2B/+5uQ+rL0exU5KZoSgOc3jkkrfjn+zZenN2xoV8lVqavAtxZVfG7MfxFrcv6I7I9ZMmA==} @@ -644,6 +654,9 @@ packages: '@push.rocks/smartfile@11.2.7': resolution: {integrity: sha512-8Yp7/sAgPpWJBHohV92ogHWKzRomI5MEbSG6b5W2n18tqwfAmjMed0rQvsvGrSBlnEWCKgoOrYIIZbLO61+J0Q==} + '@push.rocks/smartfile@13.1.2': + resolution: {integrity: sha512-DaEhwmnGEpX4coeeToaw4cZe3pNBhH7CY1iGr+d3pIXihozREvzzAR9/0i2r7bUXXL5+Lgy8YYIk5ZS+fwxMKA==} + '@push.rocks/smartfs@1.1.0': resolution: {integrity: sha512-fg8JIjFUPPX5laRoBpTaGwhMfZ3Y8mFT4fUaW54Y4J/BfOBa/y0+rIFgvgvqcOZgkQlyZU+FIfL8Z6zezqxyTg==} @@ -728,6 +741,9 @@ packages: '@push.rocks/smartrouter@1.3.3': resolution: {integrity: sha512-1+xZEnWlhzqLWAaJ1zFNhQ0zgbfCWQl1DBT72LygLxTs+P0K8AwJKgqo/IX6CT55kGCFnPAZIYSbVJlGsgrB0w==} + '@push.rocks/smartrust@1.3.2': + resolution: {integrity: sha512-HPzSJgDnKUdE5fkn2+BC9JvFXk7wl6aURAiHAXjHSCBLtzfgB7jEXjlg+K6CEfMjwQV7sy+hYABlq5DLXcFseQ==} + '@push.rocks/smartrx@3.0.10': resolution: {integrity: sha512-USjIYcsSfzn14cwOsxgq/bBmWDTTzy3ouWAnW5NdMyRRzEbmeNrvmy6TRqNeDlJ2PsYNTt1rr/zGUqvIy72ITg==} @@ -3190,6 +3206,10 @@ packages: resolution: {integrity: sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==} engines: {node: '>= 6.0.0', npm: '>= 3.0.0'} + smol-toml@1.6.0: + resolution: {integrity: sha512-4zemZi0HvTnYwLfrpk/CF9LOd9Lt87kAt50GnqhMpyF9U3poDAP2+iukq2bZsO/ufegbYehBkqINbsWxj4l4cw==} + engines: {node: '>= 18'} + socket.io-adapter@2.5.5: resolution: {integrity: sha512-eLDQas5dzPgOWCk9GuuJC2lBqItuhKI4uxGgo9aIV7MYbk2h9Q6uULEh8WBzThoI7l+qU9Ast9fVUmkqPP9wYg==} @@ -4389,6 +4409,21 @@ snapshots: '@push.rocks/smartshell': 3.3.0 tsx: 4.20.6 + '@git.zone/tsrust@1.3.0': + dependencies: + '@push.rocks/early': 4.0.4 + '@push.rocks/npmextra': 5.3.3 + '@push.rocks/smartcli': 4.0.20 + '@push.rocks/smartfile': 13.1.2 + '@push.rocks/smartpath': 6.0.0 + '@push.rocks/smartshell': 3.3.0 + smol-toml: 1.6.0 + transitivePeerDependencies: + - '@nuxt/kit' + - react + - supports-color + - vue + '@git.zone/tstest@3.1.0(socks@2.8.7)(typescript@5.9.3)': dependencies: '@api.global/typedserver': 3.0.80 @@ -4706,6 +4741,23 @@ snapshots: - snappy - socks + '@push.rocks/npmextra@5.3.3': + dependencies: + '@push.rocks/qenv': 6.1.3 + '@push.rocks/smartfile': 11.2.7 + '@push.rocks/smartjson': 5.2.0 + '@push.rocks/smartlog': 3.1.10 + '@push.rocks/smartpath': 6.0.0 + '@push.rocks/smartpromise': 4.2.3 + '@push.rocks/smartrx': 3.0.10 + '@push.rocks/taskbuffer': 3.4.0 + '@tsclass/tsclass': 9.3.0 + transitivePeerDependencies: + - '@nuxt/kit' + - react + - supports-color + - vue + '@push.rocks/qenv@6.1.3': dependencies: '@api.global/typedrequest': 3.1.10 @@ -4808,6 +4860,15 @@ snapshots: '@push.rocks/smartrx': 3.0.10 yargs-parser: 22.0.0 + '@push.rocks/smartcli@4.0.20': + dependencies: + '@push.rocks/lik': 6.2.2 + '@push.rocks/smartlog': 3.1.10 + '@push.rocks/smartobject': 1.0.12 + '@push.rocks/smartpromise': 4.2.3 + '@push.rocks/smartrx': 3.0.10 + yargs-parser: 22.0.0 + '@push.rocks/smartclickhouse@2.0.17': dependencies: '@push.rocks/smartdelay': 3.0.5 @@ -4923,6 +4984,23 @@ snapshots: glob: 11.1.0 js-yaml: 4.1.1 + '@push.rocks/smartfile@13.1.2': + dependencies: + '@push.rocks/lik': 6.2.2 + '@push.rocks/smartdelay': 3.0.5 + '@push.rocks/smartfile-interfaces': 1.0.7 + '@push.rocks/smartfs': 1.1.0 + '@push.rocks/smarthash': 3.2.6 + '@push.rocks/smartjson': 5.2.0 + '@push.rocks/smartmime': 2.0.4 + '@push.rocks/smartpath': 6.0.0 + '@push.rocks/smartpromise': 4.2.3 + '@push.rocks/smartrequest': 4.4.2 + '@push.rocks/smartstream': 3.2.5 + '@types/js-yaml': 4.0.9 + glob: 11.1.0 + js-yaml: 4.1.1 + '@push.rocks/smartfs@1.1.0': dependencies: '@push.rocks/smartpath': 6.0.0 @@ -5158,6 +5236,10 @@ snapshots: '@push.rocks/smartrx': 3.0.10 path-to-regexp: 8.3.0 + '@push.rocks/smartrust@1.3.2': + dependencies: + '@push.rocks/smartpath': 6.0.0 + '@push.rocks/smartrx@3.0.10': dependencies: '@push.rocks/smartpromise': 4.2.3 @@ -8184,6 +8266,8 @@ snapshots: smart-buffer@4.2.0: {} + smol-toml@1.6.0: {} + socket.io-adapter@2.5.5: dependencies: debug: 4.3.7 diff --git a/ts/00_commitinfo_data.ts b/ts/00_commitinfo_data.ts index 4b833ee..c8e8d9c 100644 --- a/ts/00_commitinfo_data.ts +++ b/ts/00_commitinfo_data.ts @@ -3,6 +3,6 @@ */ export const commitinfo = { name: '@push.rocks/smartstorage', - version: '6.0.0', + version: '6.0.1', description: 'A Node.js TypeScript package to create a local S3-compatible storage server using mapped local directories for development and testing purposes.' } diff --git a/ts/index.ts b/ts/index.ts index 80f448a..e96af25 100644 --- a/ts/index.ts +++ b/ts/index.ts @@ -196,8 +196,6 @@ export class SmartStorage { binaryName: 'ruststorage', localPaths: [ plugins.path.join(paths.packageDir, 'dist_rust', 'ruststorage'), - plugins.path.join(paths.packageDir, 'rust', 'target', 'release', 'ruststorage'), - plugins.path.join(paths.packageDir, 'rust', 'target', 'debug', 'ruststorage'), ], readyTimeoutMs: 30000, requestTimeoutMs: 300000,