@artblocks/abx-storage 0.1.0-alpha.9 → 0.1.1

package/CHANGELOG.md

@@ -0,0 +1,161 @@
+# @artblocks/abx-storage
+
+## 0.1.1
+
+### Patch Changes
+
+- Updated dependencies [7947ba9]
+  - @artblocks/abx-sdk@0.2.0
+
+## 0.1.0
+
+### Patch Changes
+
+- 8f35dae: Prepare package metadata, release notes, and public-facing source comments for the initial public
+  source release.
+- Updated dependencies [21e3d6c]
+- Updated dependencies [22abce8]
+- Updated dependencies [4d5e2b1]
+- Updated dependencies [56973c4]
+- Updated dependencies [2290b0a]
+- Updated dependencies [b9197bc]
+- Updated dependencies [8ccbede]
+- Updated dependencies [d925eb1]
+- Updated dependencies [ea57f7a]
+- Updated dependencies [3ddba71]
+- Updated dependencies [8f35dae]
+- Updated dependencies [719b9fe]
+- Updated dependencies [9065128]
+- Updated dependencies [c2400a7]
+- Updated dependencies [3d7fe3c]
+- Updated dependencies [7b462e2]
+- Updated dependencies [ddb2e0b]
+- Updated dependencies [4512962]
+- Updated dependencies [76cfc6a]
+- Updated dependencies [5522192]
+  - @artblocks/abx-sdk@0.1.0
+
+## 0.1.0-alpha.49
+
+### Patch Changes
+
+- Updated dependencies [719b9fe]
+  - @artblocks/abx-sdk@0.1.0-alpha.49
+
+## 0.1.0-alpha.48
+
+### Patch Changes
+
+- Updated dependencies [4d5e2b1]
+  - @artblocks/abx-sdk@0.1.0-alpha.48
+
+## 0.1.0-alpha.47
+
+### Patch Changes
+
+- Updated dependencies [56973c4]
+  - @artblocks/abx-sdk@0.1.0-alpha.47
+
+## 0.1.0-alpha.46
+
+### Patch Changes
+
+- Updated dependencies [ddb2e0b]
+- Updated dependencies [76cfc6a]
+  - @artblocks/abx-sdk@0.1.0-alpha.46
+
+## 0.1.0-alpha.45
+
+### Patch Changes
+
+- Updated dependencies [d925eb1]
+  - @artblocks/abx-sdk@0.1.0-alpha.45
+
+## 0.1.0-alpha.44
+
+### Patch Changes
+
+- Updated dependencies [22abce8]
+  - @artblocks/abx-sdk@0.1.0-alpha.44
+
+## 0.1.0-alpha.43
+
+### Patch Changes
+
+- Updated dependencies [2290b0a]
+  - @artblocks/abx-sdk@0.1.0-alpha.43
+
+## 0.1.0-alpha.42
+
+### Patch Changes
+
+- Updated dependencies [ea57f7a]
+  - @artblocks/abx-sdk@0.1.0-alpha.42
+
+## 0.1.0-alpha.41
+
+### Patch Changes
+
+- Updated dependencies [8ccbede]
+  - @artblocks/abx-sdk@0.1.0-alpha.41
+
+## 0.1.0-alpha.40
+
+### Patch Changes
+
+- Updated dependencies [b9197bc]
+  - @artblocks/abx-sdk@0.1.0-alpha.40
+
+## 0.1.0-alpha.39
+
+### Patch Changes
+
+- Updated dependencies [3d7fe3c]
+- Updated dependencies [7b462e2]
+  - @artblocks/abx-sdk@0.1.0-alpha.39
+
+## 0.1.0-alpha.38
+
+### Patch Changes
+
+- Updated dependencies [c2400a7]
+  - @artblocks/abx-sdk@0.1.0-alpha.38
+
+## 0.1.0-alpha.37
+
+### Patch Changes
+
+- Updated dependencies [4512962]
+  - @artblocks/abx-sdk@0.1.0-alpha.37
+
+## 0.1.0-alpha.36
+
+### Patch Changes
+
+- Updated dependencies [5522192]
+  - @artblocks/abx-sdk@0.1.0-alpha.36
+
+## 0.1.0-alpha.35
+
+### Patch Changes
+
+- Updated dependencies [21e3d6c]
+- Updated dependencies [a73922c]
+  - @artblocks/abx-sdk@0.1.0-alpha.35
+
+## 0.1.0-alpha.34
+
+### Patch Changes
+
+- Updated dependencies [3ddba71]
+- Updated dependencies [9065128]
+  - @artblocks/abx-sdk@0.1.0-alpha.34
+
+## 0.1.0-alpha.33
+
+### Patch Changes
+
+- 9242a05: Prepare package metadata, release notes, and public-facing source comments for the initial public
+  source release.
+- Updated dependencies [9242a05]
+  - @artblocks/abx-sdk@0.1.0-alpha.33

package/dist/arweave.d.ts

@@ -10,10 +10,16 @@ import { type ArweaveJwk } from './arweave-identity.js';
  * Upload must go through a bundler that signs an ANS-104 data item, so the uploader is a
  * **swappable provider** behind {@link ArweaveUploader}:
  *
- *  - **`turbo`** (default, recommended) — {@link TurboUploader}, backed by ArDrive Turbo. Uploads
- *    under 100 KiB are **free with no setup**; larger uploads draw on prepaid credits you top up
- *    with a card (or crypto). Lazy-loads the optional `@ardrive/turbo-sdk` only when an upload or
- *    top-up actually runs, so the retrieve-only resolver path stays dependency-free.
+ *  - **`turbo`** (default, recommended) — backed by ArDrive Turbo. Uploads under 100 KiB are
+ *    **free with no setup**; larger uploads draw on prepaid credits you top up with a card (or
+ *    crypto). The actual Turbo/arbundles implementation lives in the SEPARATE, OPTIONAL
+ *    `@artblocks/abx-storage-arweave` package — `@ardrive/turbo-sdk` depends on
+ *    `x402-fetch` -> `x402` -> `wagmi`, which drags in the entire browser wallet-connector
+ *    ecosystem, so a default CLI/SDK install must never pull it in. `buildUploader` below
+ *    `await import()`s it only when an upload/balance/top-up actually runs — never for retrieval
+ *    (get/locator/health) and never merely because `arweave` is the configured backend — and
+ *    throws a clear "install this package" error if it isn't present. `npm install
+ *    @artblocks/abx-storage-arweave` to use it.
  *  - **`http-bundler`** — {@link HttpBundlerUploader}, a dep-free token-authenticated POST to a
  *    managed endpoint you run/point at (the escape hatch / bring-your-own-bundler).
  *
@@ -161,15 +167,6 @@ export declare function isEthIdentity(id: TurboIdentity): id is Extract<TurboIde
 /** The credit-holding / signing address for an identity — Arweave `base64url(sha256(n))` or an
  *  EVM `0x…`. Pure derivation, no network. Its balance is what `abx storage balance` reports. */
 export declare function turboIdentityAddress(id: TurboIdentity): string;
-/**
- * The Arweave data-item id from a Turbo `uploadFile` response. Normally `res.id`; but Turbo
- * **deduplicates identical bytes** — a re-upload of the same data item (same signer + tags + bytes →
- * same deterministic id) returns a plain-text `"Data item with ID <id> has already been uploaded to
- * this service!"` instead of the usual JSON. Both are success: the bytes ARE on Turbo. We extract
- * the 43-char base64url txid so idempotent re-uploads (retries, redeploys, duplicate images in a
- * series) resolve to the real locator instead of throwing. Returns null if no id is present.
- */
-export declare function turboUploadId(res: unknown): string | null;
 /** Dep-free uploader for token-authenticated managed Arweave upload endpoints. */
 export declare class HttpBundlerUploader implements ArweaveUploader {
     private readonly cfg;
@@ -181,31 +178,6 @@ export declare class HttpBundlerUploader implements ArweaveUploader {
         id: string;
     }>;
 }
-/**
- * ArDrive Turbo uploader — the recommended Arweave path. Lazy-loads the optional
- * `@ardrive/turbo-sdk` only when an upload / balance / top-up actually runs (the retrieve-only
- * resolver never touches it). The signing {@link TurboIdentity} is multi-chain: the CLI-managed
- * Arweave JWK (default), an `.env` EVM key, or a remote browser wallet — each both signs uploads
- * and holds the prepaid credits at its own address.
- */
-export declare class TurboUploader implements ArweaveUploader {
-    private readonly identity;
-    constructor(identity: TurboIdentity);
-    private sdk;
-    /** arbundles (the signing lib Turbo uses) — for `InjectedEthereumSigner`, which turbo-sdk does NOT
-     *  re-export. Optional dep, loaded only on the remote-wallet upload path. */
-    private arbundles;
-    private clientPromise?;
-    private client;
-    /** Authenticate a Turbo client for the selected identity. Arweave uses the JWK directly; an EVM
-     *  identity uses an arbundles `EthereumSigner` (local key) or `InjectedEthereumSigner` (remote
-     *  wallet) — the SDK re-exports both, so no direct arbundles dependency. */
-    private buildClient;
-    upload(bytes: Uint8Array, contentType: string): Promise<{
-        id: string;
-    }>;
-    readonly funding: ArweaveFunding;
-}
 /** The upload route for a config: explicit `provider`, else `http-bundler` when an `uploadUrl`
  *  is set, else the recommended `turbo`. */
 export declare function arweaveProvider(cfg: ArweaveConfig): ArweaveProvider;
@@ -214,7 +186,7 @@ export declare function arweaveProvider(cfg: ArweaveConfig): ArweaveProvider;
  * none — capability negotiation, so `abx storage topup`/`balance` dispatch through one verb and
  * a crypto-only provider says "fund the wallet directly" rather than pretending.
  */
-export declare function arweaveFunding(cfg: ArweaveConfig): ArweaveFunding;
+export declare function arweaveFunding(cfg: ArweaveConfig): Promise<ArweaveFunding>;
 export declare class ArweaveBackend implements StorageBackend {
     private readonly cfg;
     readonly id = "arweave";
@@ -223,13 +195,17 @@ export declare class ArweaveBackend implements StorageBackend {
     private readonly injectedUploader?;
     constructor(cfg: ArweaveConfig, dataDir?: string, uploader?: ArweaveUploader);
     /** Built lazily on first use — retrieval (get/locator/health, the resolver path) needs only the
-     *  gateway, never an upload identity or the Turbo SDK. `mint` (passed by the write ops) lets a
-     *  managed default create its key here; reads/probes pass false so they never mint. */
+     *  gateway, never an upload identity or the optional Turbo package. `mint` (passed by the write
+     *  ops) lets a managed default create its key here; reads/probes pass false so they never mint.
+     *  `??=` short-circuits on an already-built or explicitly injected uploader, so the `turbo` path
+     *  never awaits (and so never triggers) `buildUploader`'s `@artblocks/abx-storage-arweave` import
+     *  unless one is actually needed. */
     private uploader;
     /** Funding capability of the active provider, or null if it has none (e.g. http-bundler) or
-     *  can't yet be built (e.g. Turbo without an identity key). The CLI uses {@link arweaveFunding}
-     *  directly for an actionable error; this accessor is the safe boolean-ish capability probe. */
-    funding(): ArweaveFunding | null;
+     *  can't yet be built (e.g. Turbo without an identity key, or the optional package not installed).
+     *  The CLI uses {@link arweaveFunding} directly for an actionable error; this accessor is the safe
+     *  boolean-ish capability probe. */
+    funding(): Promise<ArweaveFunding | null>;
     put(hash: Hex, content: StoredContent): Promise<void>;
     get(hash: Hex): Promise<StoredContent | null>;
     has(hash: Hex): Promise<boolean>;
@@ -256,8 +232,17 @@ export declare class ArweaveBackend implements StorageBackend {
  *  secrets). `ABX_ARWEAVE_ETH_SIGNER_KEY` selects an EVM Turbo identity (the CLI usually sets this
  *  from the resolved signing key instead). */
 export declare function arweaveConfigFromEnv(): ArweaveConfig;
-/** Where the CLI keeps the Turbo identity it creates and manages on first upload. */
-export declare function arweaveKeyFilePath(): string;
+/**
+ * Where the CLI keeps the Turbo identity it creates and manages on first upload.
+ *
+ * `dataDir`, when given, is the CALLER'S already-resolved data directory (the CLI passes its own
+ * `dataDir()` — see `config.ts`) — pass it whenever one is available so this can't disagree with
+ * wherever the caller's SQLite projection / content index live (the data-directory coherence
+ * criterion). Omit it only for a caller with no data-dir context of its own (e.g. an SDK
+ * integrator reading `arweaveConfigFromEnv()` directly), which falls back to the same centralized
+ * `resolveDataDir()` every other unparameterized call site uses.
+ */
+export declare function arweaveKeyFilePath(dataDir?: string): string;
 /**
  * The ONE place either layer resolves an Arweave identity: `ARWEAVE_JWK` (an explicit, inline
  * secret) if set, else the CLI-managed key file.
@@ -268,6 +253,8 @@ export declare function arweaveKeyFilePath(): string;
  * with "Arweave via Turbo needs an identity". The message said storage was never configured; the
  * truth was that two layers disagreed about where the identity lives, and it named neither the file
  * nor the mismatch. They reimplemented this lookup themselves to get moving.
+ *
+ * `dataDir` forwards straight to {@link arweaveKeyFilePath} — see its doc comment.
  */
-export declare function resolveArweaveJwk(): ArweaveJwk | undefined;
+export declare function resolveArweaveJwk(dataDir?: string): ArweaveJwk | undefined;
 //# sourceMappingURL=arweave.d.ts.map

package/dist/arweave.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"arweave.d.ts","sourceRoot":"","sources":["../src/arweave.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"arweave.d.ts","sourceRoot":"","sources":["../src/arweave.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,MAAM,CAAC;AAG9B,OAAO,KAAK,EAAC,QAAQ,EAAE,cAAc,EAAE,aAAa,EAAC,MAAM,cAAc,CAAC;AAE1E,OAAO,EAAiB,KAAK,UAAU,EAAC,MAAM,uBAAuB,CAAC;AAEtE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,MAAM,WAAW,eAAe;IAC9B,MAAM,CAAC,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC;QAAC,EAAE,EAAE,MAAM,CAAA;KAAC,CAAC,CAAC;IACtE,+FAA+F;IAC/F,QAAQ,CAAC,OAAO,CAAC,EAAE,cAAc,CAAC;CACnC;AAED,gEAAgE;AAChE,MAAM,WAAW,cAAc;IAC7B,oFAAoF;IACpF,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAC3B,iGAAiG;IACjG,OAAO,IAAI,OAAO,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAC,CAAC,CAAC;IACpD;;;;OAIG;IACH,KAAK,CAAC,IAAI,EAAE;QAAC,GAAG,EAAE,MAAM,CAAA;KAAC,GAAG,OAAO,CAAC;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAC,CAAC,CAAC;CAClE;AAED,MAAM,MAAM,eAAe,GAAG,OAAO,GAAG,cAAc,CAAC;AAEvD;;;;GAIG;AACH,wBAAsB,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAuB9E;AAED;;;;GAIG;AACH,wBAAsB,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAc3E;AAED;;;;;;GAMG;AACH,wBAAsB,sBAAsB,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,GAAE,UAAU,GAAG,SAAS,GAAG,QAAqB,GAAG,OAAO,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAC,GAAG,IAAI,CAAC,CAepK;AAED;iEACiE;AACjE,eAAO,MAAM,yBAAyB,QAAa,CAAC;AAEpD,MAAM,WAAW,aAAa;IAC5B,iEAAiE;IACjE,OAAO,EAAE,MAAM,CAAC;IAChB,oFAAoF;IACpF,QAAQ,CAAC,EAAE,eAAe,CAAC;IAC3B,0EAA0E;IAC1E,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,+EAA+E;IAC/E,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;;OAIG;IACH,GAAG,CAAC,EAAE,UAAU,CAAC;IACjB;;;;;OAKG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;;;;;OAMG;IACH,SAAS,CAAC,EAAE;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,CAAC,OAAO,EAAE,UAAU,KAAK,OAAO,CAAC,MAAM,CAAC,CAAA;KAAC,CAAC;IACrF;;;;;;;OAOG;IACH,SAAS,CAAC,EAAE,MAAM,UAAU,CAAC;CAC9B;AAED;;;;;;;GAOG;AACH,MAAM,MAAM,aAAa,GACrB;IAAC,IAAI,EAAE,SAAS,CAAC;IAAC,GAAG,EAAE,UAAU,CAAA;CAAC,GAClC;IAAC,IAAI,EAAE,UAAU,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAC,GACtC;IAAC,IAAI,EAAE,iBAAiB,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,CAAC,OAAO,EAAE,UAAU,KAAK,OAAO,CAAC,MAAM,CAAC,CAAA;CAAC,CAAC;AAEtG;4EAC4E;AAC5E,wBAAgB,aAAa,CAAC,GAAG,EAAE,aAAa,GAAG,aAAa,GAAG,IAAI,CAKtE;AAED;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,aAAa,EAAE,IAAI,GAAE;IAAC,IAAI,CAAC,EAAE,OAAO,CAAA;CAAM,GAAG,aAAa,GAAG,IAAI,CAK1G;AAED,kGAAkG;AAClG,wBAAgB,aAAa,CAAC,EAAE,EAAE,aAAa,GAAG,EAAE,IAAI,OAAO,CAAC,aAAa,EAAE;IAAC,IAAI,EAAE,WAAW,MAAM,EAAE,CAAA;CAAC,CAAC,CAE1G;AAID;iGACiG;AACjG,wBAAgB,oBAAoB,CAAC,EAAE,EAAE,aAAa,GAAG,MAAM,CAS9D;AAeD,kFAAkF;AAClF,qBAAa,mBAAoB,YAAW,eAAe;IAC7C,OAAO,CAAC,QAAQ,CAAC,GAAG;gBAAH,GAAG,EAAE;QAAC,SAAS,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAC;IAEhE,MAAM,CAAC,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC;QAAC,EAAE,EAAE,MAAM,CAAA;KAAC,CAAC;CAa5E;AAED;4CAC4C;AAC5C,wBAAgB,eAAe,CAAC,GAAG,EAAE,aAAa,GAAG,eAAe,CAEnE;AAsCD;;;;GAIG;AACH,wBAAsB,cAAc,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,cAAc,CAAC,CAIhF;AAED,qBAAa,cAAe,YAAW,cAAc;IAMvC,OAAO,CAAC,QAAQ,CAAC,GAAG;IALhC,QAAQ,CAAC,EAAE,aAAa;IACxB,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAe;IACrC,OAAO,CAAC,gBAAgB,CAAC,CAAkB;IAC3C,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAkB;gBAEvB,GAAG,EAAE,aAAa,EAAE,OAAO,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,eAAe;IAK7F;;;;;yCAKqC;YACvB,QAAQ;IAItB;;;wCAGoC;IAC9B,OAAO,IAAI,OAAO,CAAC,cAAc,GAAG,IAAI,CAAC;IAQzC,GAAG,CAAC,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAMrD,GAAG,CAAC,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC;IAS7C,GAAG,CAAC,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC;IAItC;;;gFAG4E;IACtE,OAAO,CAAC,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAKhD;;;;;OAKG;IACG,YAAY,CAAC,OAAO,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAC,CAAC;IAiB1D,MAAM,IAAI,OAAO,CAAC;QAAC,EAAE,EAAE,OAAO,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAC,CAAC;CAsBxD;AAED;;8CAE8C;AAC9C,wBAAgB,oBAAoB,IAAI,aAAa,CASpD;AAED;;;;;;;;;GASG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,CAG3D;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,UAAU,GAAG,SAAS,CAiB1E"}

package/dist/arweave.js

@@ -1,5 +1,6 @@
 import { existsSync, readFileSync } from 'node:fs';
 import { resolve as resolvePath } from 'node:path';
+import { resolveDataDir } from '@artblocks/abx-sdk/node';
 import { privateKeyToAccount } from 'viem/accounts';
 import { ContentIndex } from './content-index.js';
 import { arweaveAddress } from './arweave-identity.js';
@@ -122,7 +123,6 @@ export function isEthIdentity(id) {
     return id.kind === 'ethereum' || id.kind === 'ethereum-remote';
 }
 const withHexPrefix = (k) => (k.startsWith('0x') ? k : `0x${k}`);
-const stripHexPrefix = (k) => (k.startsWith('0x') ? k.slice(2) : k);
 /** The credit-holding / signing address for an identity — Arweave `base64url(sha256(n))` or an
  *  EVM `0x…`. Pure derivation, no network. Its balance is what `abx storage balance` reports. */
 export function turboIdentityAddress(id) {
@@ -136,42 +136,11 @@ export function turboIdentityAddress(id) {
     }
 }
 const trim = (u) => u.replace(/\/+$/, '');
-/** Coerce a Turbo `uploadFile` response to text. It's normally an object, but the idempotent
- *  "already uploaded" path returns a plain string (which JSON/stream layers may surface as a
- *  char-indexed object) — Object.values(...).join('') recovers it either way. */
-function turboResponseText(res) {
-    if (typeof res === 'string')
-        return res;
-    if (res && typeof res === 'object') {
-        if ('id' in res && res.id)
-            return String(res.id);
-        try {
-            return Object.values(res).join('');
-        }
-        catch {
-            return '';
-        }
-    }
-    return '';
-}
-/**
- * The Arweave data-item id from a Turbo `uploadFile` response. Normally `res.id`; but Turbo
- * **deduplicates identical bytes** — a re-upload of the same data item (same signer + tags + bytes →
- * same deterministic id) returns a plain-text `"Data item with ID <id> has already been uploaded to
- * this service!"` instead of the usual JSON. Both are success: the bytes ARE on Turbo. We extract
- * the 43-char base64url txid so idempotent re-uploads (retries, redeploys, duplicate images in a
- * series) resolve to the real locator instead of throwing. Returns null if no id is present.
- */
-export function turboUploadId(res) {
-    if (res && typeof res === 'object' && 'id' in res && res.id) {
-        return String(res.id);
-    }
-    const m = turboResponseText(res).match(/\bID\s+([A-Za-z0-9_-]{43})\b/);
-    return m ? m[1] : null;
-}
-/** Optional deps, loaded lazily via indirect specifiers so they're not required to install/build. */
-const TURBO_SDK_PACKAGE = '@ardrive/turbo-sdk';
-const ARBUNDLES_PACKAGE = '@dha-team/arbundles';
+/** The optional package carrying the Turbo/arbundles implementation — loaded lazily
+ *  via an INDIRECT specifier (a variable, not a string literal) so TypeScript resolves the
+ *  `import()` below as `any` instead of trying to resolve real types for a package this file
+ *  deliberately has no build-time dependency on (see the module doc and {@link buildUploader}). */
+const TURBO_ARWEAVE_PACKAGE = '@artblocks/abx-storage-arweave';
 const WINC_PER_CREDIT = 1e12;
 const wincToCredits = (winc) => {
     const n = Number(winc) / WINC_PER_CREDIT;
@@ -200,115 +169,34 @@ export class HttpBundlerUploader {
         return { id: String(id) };
     }
 }
-/**
- * ArDrive Turbo uploader — the recommended Arweave path. Lazy-loads the optional
- * `@ardrive/turbo-sdk` only when an upload / balance / top-up actually runs (the retrieve-only
- * resolver never touches it). The signing {@link TurboIdentity} is multi-chain: the CLI-managed
- * Arweave JWK (default), an `.env` EVM key, or a remote browser wallet — each both signs uploads
- * and holds the prepaid credits at its own address.
- */
-export class TurboUploader {
-    identity;
-    constructor(identity) {
-        this.identity = identity;
-        if (identity.kind === 'arweave' && !identity.jwk?.n) {
-            throw new Error('Turbo needs an Arweave identity key (JWK). The CLI manages one at `.abx-self-host/arweave-key.json` — or set ARWEAVE_JWK, or use `--provider http-bundler`.');
-        }
-        if (identity.kind === 'ethereum' && !identity.privateKey) {
-            throw new Error('Turbo Ethereum identity needs a private key.');
-        }
-    }
-    async sdk() {
-        try {
-            // Indirect specifier: keeps the OPTIONAL dep out of the type graph so the package
-            // type-checks and runs without it installed (the retrieve-only resolver path never calls this).
-            return await import(/* @vite-ignore */ TURBO_SDK_PACKAGE);
-        }
-        catch {
-            throw new Error("The Turbo provider needs the optional '@ardrive/turbo-sdk' package — install it (`pnpm add @ardrive/turbo-sdk`), or switch with `--backend arweave --provider http-bundler --upload-url <bundler>`.");
-        }
-    }
-    /** arbundles (the signing lib Turbo uses) — for `InjectedEthereumSigner`, which turbo-sdk does NOT
-     *  re-export. Optional dep, loaded only on the remote-wallet upload path. */
-    async arbundles() {
-        try {
-            return await import(/* @vite-ignore */ ARBUNDLES_PACKAGE);
-        }
-        catch {
-            throw new Error("The browser-wallet Arweave upload lane needs the optional '@dha-team/arbundles' package — install it (`pnpm add @dha-team/arbundles`), or use `--storage-signer eth` with a key in .env, or the managed Arweave key.");
-        }
-    }
-    clientPromise;
-    client() {
-        return (this.clientPromise ??= this.buildClient());
-    }
-    /** Authenticate a Turbo client for the selected identity. Arweave uses the JWK directly; an EVM
-     *  identity uses an arbundles `EthereumSigner` (local key) or `InjectedEthereumSigner` (remote
-     *  wallet) — the SDK re-exports both, so no direct arbundles dependency. */
-    async buildClient() {
-        const m = await this.sdk();
-        const id = this.identity;
-        if (id.kind === 'arweave') {
-            return m.TurboFactory.authenticated({ privateKey: id.jwk, token: 'arweave' });
-        }
-        if (id.kind === 'ethereum') {
-            const signer = new m.EthereumSigner(stripHexPrefix(id.privateKey));
-            return m.TurboFactory.authenticated({ signer, token: 'ethereum' });
-        }
-        // ethereum-remote: drive arbundles' own InjectedEthereumSigner via a provider shim that
-        // round-trips each signMessage to the browser wallet. arbundles calls `signer.signMessage(msg)`
-        // with a STRING challenge (setPublicKey → pubkey recovery, one prompt) and a Uint8Array per data
-        // item, and expects back a `0x…` hex signature (it does `sig.slice(2)`). ethers'
-        // signMessage(string) ≡ signMessage(utf8Bytes(string)), so normalizing to bytes is faithful.
-        // NOTE: turbo-sdk re-exports EthereumSigner but NOT InjectedEthereumSigner — import it from
-        // arbundles (the same package turbo signs with) directly.
-        const { InjectedEthereumSigner } = await this.arbundles();
-        const signMessage = id.signMessage;
-        const provider = {
-            getSigner: () => ({
-                signMessage: (message) => signMessage(typeof message === 'string' ? new TextEncoder().encode(message) : Uint8Array.from(message)),
-            }),
-        };
-        const signer = new InjectedEthereumSigner(provider);
-        await signer.setPublicKey();
-        return m.TurboFactory.authenticated({ signer, token: 'ethereum' });
-    }
-    async upload(bytes, contentType) {
-        const turbo = await this.client();
-        const { Readable } = await import('node:stream');
-        const buf = Buffer.from(bytes);
-        const res = await turbo.uploadFile({
-            fileStreamFactory: () => Readable.from(buf),
-            fileSizeFactory: () => buf.byteLength,
-            dataItemOpts: { tags: [{ name: 'Content-Type', value: contentType }] },
-        });
-        const id = turboUploadId(res);
-        if (!id)
-            throw new Error(`Turbo upload returned no transaction id (response: ${turboResponseText(res).slice(0, 200)})`);
-        return { id };
-    }
-    funding = {
-        address: async () => turboIdentityAddress(this.identity),
-        balance: async () => {
-            const turbo = await this.client();
-            const { winc } = (await turbo.getBalance());
-            return { winc: String(winc), credits: wincToCredits(winc) };
-        },
-        topup: async ({ usd }) => {
-            const [turbo, m] = await Promise.all([this.client(), this.sdk()]);
-            const session = (await turbo.createCheckoutSession({ amount: m.USD(usd), owner: turboIdentityAddress(this.identity) }));
-            if (!session?.url)
-                throw new Error('Turbo top-up returned no checkout URL');
-            return { url: String(session.url), winc: String(session.winc ?? '') };
-        },
-    };
-}
 /** The upload route for a config: explicit `provider`, else `http-bundler` when an `uploadUrl`
  *  is set, else the recommended `turbo`. */
 export function arweaveProvider(cfg) {
     return cfg.provider ?? (cfg.uploadUrl ? 'http-bundler' : 'turbo');
 }
-function buildUploader(cfg, opts = {}) {
+/**
+ * Loads the optional `@artblocks/abx-storage-arweave` package and constructs its `TurboUploader`
+ * for `id` — the ONLY place this file reaches for that package, and only on this call path (never
+ * for retrieval/health). A clean install of `@artblocks/abx-cli` / `@artblocks/abx-storage` never
+ * installs it; this throws the actionable "install it, or switch provider" error the
+ * unavailable-adapter case needs.
+ *
+ * `TURBO_ARWEAVE_PACKAGE` is a variable, not a string literal, specifically so TypeScript types the
+ * `import()` result as `any` instead of trying (and failing) to resolve real declarations for a
+ * package this file has no build-time dependency on — this package's build/typecheck/test never
+ * needs `@artblocks/abx-storage-arweave` to be installed at all.
+ */
+async function loadTurboUploader(id) {
+    let mod;
+    try {
+        mod = await import(/* @vite-ignore */ TURBO_ARWEAVE_PACKAGE);
+    }
+    catch {
+        throw new Error("The Turbo provider needs the optional '@artblocks/abx-storage-arweave' package — install it (`npm install @artblocks/abx-storage-arweave`), or switch with `--backend arweave --provider http-bundler --upload-url <bundler>`.");
+    }
+    return new mod.TurboUploader(id);
+}
+async function buildUploader(cfg, opts = {}) {
     if (arweaveProvider(cfg) === 'http-bundler') {
         return new HttpBundlerUploader({ uploadUrl: cfg.uploadUrl, token: cfg.token });
     }
@@ -319,15 +207,15 @@ function buildUploader(cfg, opts = {}) {
     if (!id) {
         throw new Error('Arweave via Turbo needs an identity. Run an upload through the CLI (it creates a managed key at `.abx-self-host/arweave-key.json`), set ARWEAVE_JWK, sign with an EVM key/wallet (`--storage-signer eth`), or use `--provider http-bundler --upload-url <bundler>`.');
     }
-    return new TurboUploader(id);
+    return loadTurboUploader(id);
 }
 /**
  * The funding capability for a config's provider, or throw a clear reason if that provider has
  * none — capability negotiation, so `abx storage topup`/`balance` dispatch through one verb and
  * a crypto-only provider says "fund the wallet directly" rather than pretending.
  */
-export function arweaveFunding(cfg) {
-    const f = buildUploader(cfg).funding;
+export async function arweaveFunding(cfg) {
+    const f = (await buildUploader(cfg)).funding;
     if (!f)
         throw new Error(`The '${arweaveProvider(cfg)}' Arweave provider has no prepaid balance — fund its wallet directly.`);
     return f;
@@ -344,24 +232,29 @@ export class ArweaveBackend {
         this.injectedUploader = uploader;
     }
     /** Built lazily on first use — retrieval (get/locator/health, the resolver path) needs only the
-     *  gateway, never an upload identity or the Turbo SDK. `mint` (passed by the write ops) lets a
-     *  managed default create its key here; reads/probes pass false so they never mint. */
-    uploader(mint = false) {
-        return (this.uploaderInstance ??= this.injectedUploader ?? buildUploader(this.cfg, { mint }));
+     *  gateway, never an upload identity or the optional Turbo package. `mint` (passed by the write
+     *  ops) lets a managed default create its key here; reads/probes pass false so they never mint.
+     *  `??=` short-circuits on an already-built or explicitly injected uploader, so the `turbo` path
+     *  never awaits (and so never triggers) `buildUploader`'s `@artblocks/abx-storage-arweave` import
+     *  unless one is actually needed. */
+    async uploader(mint = false) {
+        return (this.uploaderInstance ??= this.injectedUploader ?? (await buildUploader(this.cfg, { mint })));
     }
     /** Funding capability of the active provider, or null if it has none (e.g. http-bundler) or
-     *  can't yet be built (e.g. Turbo without an identity key). The CLI uses {@link arweaveFunding}
-     *  directly for an actionable error; this accessor is the safe boolean-ish capability probe. */
-    funding() {
+     *  can't yet be built (e.g. Turbo without an identity key, or the optional package not installed).
+     *  The CLI uses {@link arweaveFunding} directly for an actionable error; this accessor is the safe
+     *  boolean-ish capability probe. */
+    async funding() {
         try {
-            return this.uploader(false).funding ?? null;
+            return (await this.uploader(false)).funding ?? null;
         }
         catch {
             return null;
         }
     }
     async put(hash, content) {
-        const { id } = await this.uploader(true).upload(content.bytes, content.contentType);
+        const uploader = await this.uploader(true);
+        const { id } = await uploader.upload(content.bytes, content.contentType);
         this.index.set(hash, { pointer: id, contentType: content.contentType });
     }
     async get(hash) {
@@ -393,7 +286,7 @@ export class ArweaveBackend {
      * permanent, content-addressed root → integrity for the whole set, no per-file keccak needed.
      */
     async putDirectory(entries) {
-        const up = this.uploader(true);
+        const up = await this.uploader(true);
         const paths = {};
         for (const e of entries) {
             const { id } = await up.upload(e.bytes, e.contentType);
@@ -446,10 +339,19 @@ export function arweaveConfigFromEnv() {
         ethSignerKey: process.env.ABX_ARWEAVE_ETH_SIGNER_KEY,
     };
 }
-/** Where the CLI keeps the Turbo identity it creates and manages on first upload. */
-export function arweaveKeyFilePath() {
-    const dataDir = process.env.ABX_DATA_DIR ?? resolvePath(process.cwd(), '.abx-self-host');
-    return process.env.ABX_ARWEAVE_KEY_FILE ?? resolvePath(dataDir, 'arweave-key.json');
+/**
+ * Where the CLI keeps the Turbo identity it creates and manages on first upload.
+ *
+ * `dataDir`, when given, is the CALLER'S already-resolved data directory (the CLI passes its own
+ * `dataDir()` — see `config.ts`) — pass it whenever one is available so this can't disagree with
+ * wherever the caller's SQLite projection / content index live (the data-directory coherence
+ * criterion). Omit it only for a caller with no data-dir context of its own (e.g. an SDK
+ * integrator reading `arweaveConfigFromEnv()` directly), which falls back to the same centralized
+ * `resolveDataDir()` every other unparameterized call site uses.
+ */
+export function arweaveKeyFilePath(dataDir) {
+    const dir = dataDir ?? resolveDataDir().dir;
+    return process.env.ABX_ARWEAVE_KEY_FILE ?? resolvePath(dir, 'arweave-key.json');
 }
 /**
  * The ONE place either layer resolves an Arweave identity: `ARWEAVE_JWK` (an explicit, inline
@@ -461,12 +363,14 @@ export function arweaveKeyFilePath() {
  * with "Arweave via Turbo needs an identity". The message said storage was never configured; the
  * truth was that two layers disagreed about where the identity lives, and it named neither the file
  * nor the mismatch. They reimplemented this lookup themselves to get moving.
+ *
+ * `dataDir` forwards straight to {@link arweaveKeyFilePath} — see its doc comment.
  */
-export function resolveArweaveJwk() {
+export function resolveArweaveJwk(dataDir) {
     const fromEnv = parseJwkEnv(process.env.ARWEAVE_JWK);
     if (fromEnv)
         return fromEnv;
-    const file = arweaveKeyFilePath();
+    const file = arweaveKeyFilePath(dataDir);
     if (!existsSync(file))
         return undefined;
     const raw = readFileSync(file, 'utf8');