@bsv/sdk 2.0.0-beta.0 → 2.0.1

package/src/transaction/broadcasters/ARC.ts

@@ -25,7 +25,7 @@ export interface ArcConfig {
   headers?: Record<string, string>
 }
 
-function defaultDeploymentId(): string {
+function defaultDeploymentId (): string {
   return `ts-sdk-${toHex(Random(16))}`
 }
 
@@ -47,16 +47,16 @@ export default class ARC implements Broadcaster {
    * @param {string} URL - The URL endpoint for the ARC API.
    * @param {ArcConfig} config - Configuration options for the ARC broadcaster.
    */
-  constructor(URL: string, config?: ArcConfig)
+  constructor (URL: string, config?: ArcConfig)
   /**
    * Constructs an instance of the ARC broadcaster.
    *
    * @param {string} URL - The URL endpoint for the ARC API.
    * @param {string} apiKey - The API key used for authorization with the ARC API.
    */
-  constructor(URL: string, apiKey?: string)
+  constructor (URL: string, apiKey?: string)
 
-  constructor(URL: string, config?: string | ArcConfig) {
+  constructor (URL: string, config?: string | ArcConfig) {
     this.URL = URL
     if (typeof config === 'string') {
       this.apiKey = config
@@ -86,7 +86,7 @@ export default class ARC implements Broadcaster {
   /**
    * Constructs a dictionary of the default & supplied request headers.
    */
-  private requestHeaders(): Record<string, string> {
+  private requestHeaders (): Record<string, string> {
     const headers: Record<string, string> = {
       'Content-Type': 'application/json',
       'XDeployment-ID': this.deploymentId
@@ -119,7 +119,7 @@ export default class ARC implements Broadcaster {
    * @param {Transaction} tx - The transaction to be broadcasted.
    * @returns {Promise<BroadcastResponse | BroadcastFailure>} A promise that resolves to either a success or failure response.
    */
-  async broadcast(
+  async broadcast (
     tx: Transaction
   ): Promise<BroadcastResponse | BroadcastFailure> {
     let rawTx
@@ -149,6 +149,33 @@ export default class ARC implements Broadcaster {
       )
       if (response.ok) {
         const { txid, extraInfo, txStatus, competingTxs } = response.data
+
+        // Check for error txStatus values that ARC returns with HTTP 200
+        // These should be treated as broadcast failures
+        const errorStatuses = [
+          'DOUBLE_SPEND_ATTEMPTED',
+          'REJECTED',
+          'INVALID',
+          'MALFORMED',
+          'MINED_IN_STALE_BLOCK'
+        ]
+
+        const isOrphan = extraInfo?.toUpperCase().includes('ORPHAN') ||
+          txStatus?.toUpperCase().includes('ORPHAN')
+
+        if (errorStatuses.includes(txStatus?.toUpperCase()) || isOrphan) {
+          const failure: BroadcastFailure = {
+            status: 'error',
+            code: txStatus ?? 'UNKNOWN',
+            txid,
+            description: `${txStatus ?? ''} ${extraInfo ?? ''}`.trim()
+          }
+          if (competingTxs != null) {
+            failure.more = { competingTxs }
+          }
+          return failure
+        }
+
         const broadcastRes: BroadcastResponse = {
           status: 'success',
           txid,
@@ -208,7 +235,7 @@ export default class ARC implements Broadcaster {
    * @param {Transaction[]} txs - Array of transactions to be broadcasted.
    * @returns {Promise<Array<object>>} A promise that resolves to an array of objects.
    */
-  async broadcastMany(txs: Transaction[]): Promise<object[]> {
+  async broadcastMany (txs: Transaction[]): Promise<object[]> {
     const rawTxs = txs.map((tx) => {
       try {
         return { rawTx: tx.toHexEF() }

package/src/transaction/broadcasters/__tests/ARC.test.ts

@@ -250,6 +250,104 @@ describe('ARC Broadcaster', () => {
     }
   })
 
+  it('should return error for DOUBLE_SPEND_ATTEMPTED even with HTTP 200', async () => {
+    const mockFetch = mockedFetch({
+      status: 200,
+      data: {
+        txid: '89100426fc13a55260fa65e621e7591f8b01007af62480e818d0da518723bfd3',
+        txStatus: 'DOUBLE_SPEND_ATTEMPTED',
+        extraInfo: '',
+        competingTxs: ['5e58f06a83343011f77d9109aab08dcc38d89e8cc7bd55da16affa948281d7ed']
+      }
+    })
+
+    const broadcaster = new ARC(URL, {
+      httpClient: new FetchHttpClient(mockFetch)
+    })
+    const response = await broadcaster.broadcast(transaction)
+
+    expect(mockFetch).toHaveBeenCalled()
+    expect(response.status).toBe('error')
+    if (response.status === 'error') {
+      expect(response.code).toBe('DOUBLE_SPEND_ATTEMPTED')
+      expect(response.txid).toBe('89100426fc13a55260fa65e621e7591f8b01007af62480e818d0da518723bfd3')
+      expect(response.more).toEqual({
+        competingTxs: ['5e58f06a83343011f77d9109aab08dcc38d89e8cc7bd55da16affa948281d7ed']
+      })
+    }
+  })
+
+  it('should return error for SEEN_IN_ORPHAN_MEMPOOL even with HTTP 200', async () => {
+    const mockFetch = mockedFetch({
+      status: 200,
+      data: {
+        txid: 'b06cb1059c2bf3debee1e65dc90d0815653325c7cf2584763b90c761c09919db',
+        txStatus: 'success',
+        extraInfo: 'SEEN_IN_ORPHAN_MEMPOOL'
+      }
+    })
+
+    const broadcaster = new ARC(URL, {
+      httpClient: new FetchHttpClient(mockFetch)
+    })
+    const response = await broadcaster.broadcast(transaction)
+
+    expect(mockFetch).toHaveBeenCalled()
+    expect(response.status).toBe('error')
+    if (response.status === 'error') {
+      expect(response.code).toBe('success')
+      expect(response.txid).toBe('b06cb1059c2bf3debee1e65dc90d0815653325c7cf2584763b90c761c09919db')
+      expect(response.description).toContain('ORPHAN')
+    }
+  })
+
+  it('should return error for REJECTED status even with HTTP 200', async () => {
+    const mockFetch = mockedFetch({
+      status: 200,
+      data: {
+        txid: 'abc123',
+        txStatus: 'REJECTED',
+        extraInfo: 'Transaction rejected by network'
+      }
+    })
+
+    const broadcaster = new ARC(URL, {
+      httpClient: new FetchHttpClient(mockFetch)
+    })
+    const response = await broadcaster.broadcast(transaction)
+
+    expect(mockFetch).toHaveBeenCalled()
+    expect(response.status).toBe('error')
+    if (response.status === 'error') {
+      expect(response.code).toBe('REJECTED')
+      expect(response.description).toContain('REJECTED')
+      expect(response.description).toContain('Transaction rejected by network')
+    }
+  })
+
+  it('should still return success for valid txStatus values', async () => {
+    const mockFetch = mockedFetch({
+      status: 200,
+      data: {
+        txid: 'valid_txid',
+        txStatus: 'SEEN_ON_NETWORK',
+        extraInfo: 'Transaction accepted'
+      }
+    })
+
+    const broadcaster = new ARC(URL, {
+      httpClient: new FetchHttpClient(mockFetch)
+    })
+    const response = await broadcaster.broadcast(transaction)
+
+    expect(mockFetch).toHaveBeenCalled()
+    expect(response.status).toBe('success')
+    if (response.status === 'success') {
+      expect(response.txid).toBe('valid_txid')
+      expect(response.message).toBe('SEEN_ON_NETWORK Transaction accepted')
+    }
+  })
+
   function mockedFetch (response: { status: number, data: any }): jest.Mock {
     return jest.fn().mockResolvedValue({
       ok: response.status === 200,

package/src/wallet/Wallet.interfaces.ts

@@ -128,16 +128,16 @@ export type OutputTagStringUnder300Bytes = string
 export type LabelStringUnder300Bytes = string
 
 /**
- * @typedef {Byte[]} BEEF
+ * @typedef {Byte[] | Uint8Array} BEEF
  * An array of integers, each ranging from 0 to 255, indicating transaction data in BEEF (BRC-62) format.
  */
-export type BEEF = Byte[]
+export type BEEF = Byte[] | Uint8Array
 
 /**
- * @typedef {Byte[]} AtomicBEEF
+ * @typedef {Byte[] | Uint8Array} AtomicBEEF
  * An array of integers, each ranging from 0 to 255, indicating transaction data in Atomic BEEF (BRC-95) format.
  */
-export type AtomicBEEF = Byte[]
+export type AtomicBEEF = Byte[] | Uint8Array
 
 /**
  * @typedef {string & { minLength: 5, maxLength: 400 }} ProtocolString5To400Bytes
@@ -324,7 +324,7 @@ export interface ReviewActionResult {
   /**
    * Merged beef of competingTxs, valid when status is 'doubleSpend'.
    */
-  competingBeef?: number[]
+  competingBeef?: BEEF
 }
 
 export interface SignableTransaction {

package/dist/cjs/src/storage/__test/StorageDownloader.test.js

@@ -1,171 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const StorageDownloader_js_1 = require("../StorageDownloader.js");
-const index_js_1 = require("../index.js");
-const index_js_2 = require("../../overlay-tools/index.js");
-const Transaction_js_1 = __importDefault(require("../../transaction/Transaction.js"));
-const PushDrop_js_1 = __importDefault(require("../../script/templates/PushDrop.js"));
-const index_js_3 = require("../../primitives/index.js");
-beforeEach(() => {
-    jest.restoreAllMocks();
-});
-describe('StorageDownloader', () => {
-    let downloader;
-    beforeEach(() => {
-        // Create a fresh instance
-        downloader = new StorageDownloader_js_1.StorageDownloader();
-    });
-    describe('resolve()', () => {
-        it('throws if the lookup response is not "output-list"', async () => {
-            // Mock the LookupResolver to return something invalid
-            jest.spyOn(index_js_2.LookupResolver.prototype, 'query').mockResolvedValue({
-                type: 'something-else',
-                outputs: []
-            });
-            await expect(downloader.resolve('fakeUhrpUrl'))
-                .rejects
-                .toThrow('Lookup answer must be an output list');
-        });
-        it('decodes each output with Transaction.fromBEEF and PushDrop.decode', async () => {
-            // 1) Mock lookup response
-            jest.spyOn(index_js_2.LookupResolver.prototype, 'query').mockResolvedValue({
-                type: 'output-list',
-                outputs: [
-                    { beef: 'fake-beef-a', outputIndex: 0 },
-                    { beef: 'fake-beef-b', outputIndex: 1 }
-                ]
-            });
-            // 2) Mock Transaction.fromBEEF -> returns a dummy transaction
-            jest.spyOn(Transaction_js_1.default, 'fromBEEF').mockImplementation(() => {
-                // Each transaction might have multiple outputs; we only care about `outputIndex`
-                return {
-                    outputs: [
-                        { lockingScript: {} },
-                        { lockingScript: {} } // index 1
-                    ]
-                };
-            });
-            // 3) Mock PushDrop.decode -> returns { fields: number[][] }
-            jest.spyOn(PushDrop_js_1.default, 'decode').mockImplementation(() => {
-                // The decode function returns an object with `fields`,
-                return {
-                    lockingPublicKey: {},
-                    fields: [
-                        [11],
-                        [22],
-                        [104, 116, 116, 112, 58, 47, 47, 97, 46, 99, 111, 109]
-                    ]
-                };
-            });
-            // 4) Mock Utils.toUTF8 to convert that number[] to a string
-            jest.spyOn(index_js_3.Utils, 'toUTF8').mockReturnValue('http://a.com');
-            const resolved = await downloader.resolve('fakeUhrpUrl');
-            expect(resolved).toEqual(['http://a.com', 'http://a.com']);
-        });
-    });
-    describe('download()', () => {
-        it('throws if UHRP URL is invalid', async () => {
-            jest.spyOn(index_js_1.StorageUtils, 'isValidURL').mockReturnValue(false);
-            await expect(downloader.download('invalidUrl'))
-                .rejects
-                .toThrow('Invalid parameter UHRP url');
-        });
-        it('throws if no hosts are found', async () => {
-            // Valid UHRP URL
-            jest.spyOn(index_js_1.StorageUtils, 'isValidURL').mockReturnValue(true);
-            // Return some random 32-byte hash so we can pass the check
-            jest.spyOn(index_js_1.StorageUtils, 'getHashFromURL').mockReturnValue(new Array(32).fill(0));
-            // Force resolve() to return an empty array
-            jest.spyOn(downloader, 'resolve').mockResolvedValue([]);
-            await expect(downloader.download('validButUnhostedUrl'))
-                .rejects
-                .toThrow('No one currently hosts this file!');
-        });
-        it('downloads successfully from the first working host', async () => {
-            jest.spyOn(index_js_1.StorageUtils, 'isValidURL').mockReturnValue(true);
-            const knownHash = [
-                102, 104, 122, 173, 248, 98, 189, 119, 108, 143,
-                193, 139, 142, 159, 142, 32, 8, 151, 20, 133,
-                110, 226, 51, 179, 144, 42, 89, 29, 13, 95,
-                41, 37
-            ];
-            jest.spyOn(index_js_1.StorageUtils, 'getHashFromURL').mockReturnValue(knownHash);
-            // Suppose two possible download URLs
-            jest.spyOn(downloader, 'resolve').mockResolvedValue([
-                'http://host1/404',
-                'http://host2/ok'
-            ]);
-            // The first fetch -> 404, second fetch -> success
-            const fetchSpy = jest.spyOn(global, 'fetch')
-                .mockResolvedValueOnce(new Response(null, { status: 404 }))
-                .mockResolvedValueOnce(new Response(new Uint8Array(32).fill(0), {
-                status: 200,
-                headers: { 'Content-Type': 'application/test' }
-            }));
-            const result = await downloader.download('validUrl');
-            expect(fetchSpy).toHaveBeenCalledTimes(2);
-            expect(result).toEqual({
-                data: new Array(32).fill(0),
-                mimeType: 'application/test'
-            });
-        });
-        it('throws if content hash mismatches the UHRP hash', async () => {
-            jest.spyOn(index_js_1.StorageUtils, 'isValidURL').mockReturnValue(true);
-            // The expected hash is all zeros
-            jest.spyOn(index_js_1.StorageUtils, 'getHashFromURL').mockReturnValue(new Array(32).fill(0));
-            // One potential host
-            jest.spyOn(downloader, 'resolve').mockResolvedValue([
-                'http://bad-content.test'
-            ]);
-            // The fetch returns 32 bytes of all 1's => hash mismatch
-            jest.spyOn(global, 'fetch').mockResolvedValue(new Response(new Uint8Array(32).fill(1), { status: 200 }));
-            await expect(downloader.download('validButBadHashUrl'))
-                .rejects
-                .toThrow();
-        });
-        it('throws if all hosts fail or mismatch', async () => {
-            jest.spyOn(index_js_1.StorageUtils, 'isValidURL').mockReturnValue(true);
-            jest.spyOn(index_js_1.StorageUtils, 'getHashFromURL').mockReturnValue(new Array(32).fill(0));
-            jest.spyOn(downloader, 'resolve').mockResolvedValue([
-                'http://host1.test',
-                'http://host2.test'
-            ]);
-            // Both fetches fail with 500 or something >=400
-            jest.spyOn(global, 'fetch').mockResolvedValue(new Response(null, { status: 500 }));
-            await expect(downloader.download('validButNoGoodHostUrl'))
-                .rejects
-                .toThrow('Unable to download content from validButNoGoodHostUrl');
-        });
-        it('throws if all entries are expired', async () => {
-            const currentTime = Math.floor(Date.now());
-            jest.spyOn(index_js_2.LookupResolver.prototype, 'query').mockResolvedValue({
-                type: 'output-list',
-                outputs: [
-                    { beef: 'fake-beef-a', outputIndex: 0 },
-                    { beef: 'fake-beef-b', outputIndex: 1 }
-                ]
-            });
-            jest.spyOn(Transaction_js_1.default, 'fromBEEF').mockImplementation(() => {
-                return {
-                    outputs: [
-                        { lockingScript: {} },
-                        { lockingScript: {} }
-                    ]
-                };
-            });
-            jest.spyOn(PushDrop_js_1.default, 'decode').mockImplementation(() => {
-                return {
-                    lockingPublicKey: {},
-                    fields: [[], [], [], [currentTime - 100]]
-                };
-            });
-            await expect(downloader.resolve('expiredUhrpUrl'))
-                .resolves
-                .toEqual(["", ""]);
-        });
-    });
-});
-//# sourceMappingURL=StorageDownloader.test.js.map

package/dist/cjs/src/storage/__test/StorageDownloader.test.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"StorageDownloader.test.js","sourceRoot":"","sources":["../../../../../src/storage/__test/StorageDownloader.test.ts"],"names":[],"mappings":"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"}

package/dist/cjs/src/storage/__test/StorageUploader.test.js

@@ -1,163 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const StorageUploader_js_1 = require("../StorageUploader.js");
-const StorageUtils = __importStar(require("../StorageUtils.js"));
-const WalletClient_js_1 = __importDefault(require("../../wallet/WalletClient.js"));
-/**
- * A helper for converting a string to a number[] of UTF-8 bytes
- */
-function stringToUtf8Array(str) {
-    return Array.from(new TextEncoder().encode(str));
-}
-describe('StorageUploader Tests', () => {
-    let uploader;
-    let walletClient;
-    // We'll have TWO spies:
-    let authFetchSpy;
-    let globalFetchSpy;
-    beforeEach(() => {
-        walletClient = new WalletClient_js_1.default('json-api', 'non-admin.com');
-        uploader = new StorageUploader_js_1.StorageUploader({
-            storageURL: 'https://example.test.system',
-            wallet: walletClient
-        });
-        // 1) Spy on the "authFetch.fetch" calls for /find, /list, /renew
-        authFetchSpy = jest
-            .spyOn(uploader['authFetch'], 'fetch')
-            .mockResolvedValue(new Response(null, { status: 200 }));
-        // 2) Spy on the global "fetch" calls for file upload (uploadFile)
-        globalFetchSpy = jest
-            .spyOn(global, 'fetch')
-            .mockResolvedValue(new Response(null, { status: 200 }));
-    });
-    afterEach(() => {
-        jest.restoreAllMocks();
-    });
-    it('should upload a file, produce a valid UHRP URL, and decode it to the known SHA-256', async () => {
-        const data = stringToUtf8Array('Hello, world!');
-        // Mock out getUploadInfo so we can control the returned upload/public URLs
-        jest.spyOn(uploader, 'getUploadInfo').mockResolvedValue({
-            uploadURL: 'https://example-upload.com/put'
-        });
-        const result = await uploader.publishFile({
-            file: { data, type: 'text/plain' },
-            retentionPeriod: 7
-        });
-        // This direct upload uses global.fetch, not authFetch
-        expect(globalFetchSpy).toHaveBeenCalledTimes(1);
-        // Check the result
-        expect(StorageUtils.isValidURL(result.uhrpURL)).toBe(true);
-        expect(result.published).toBe(true);
-        const url = StorageUtils.getHashFromURL(result.uhrpURL);
-        const firstFour = url.slice(0, 4)
-            .map(b => b.toString(16).padStart(2, '0'))
-            .join('');
-        expect(firstFour).toHaveLength(8);
-    });
-    it('should throw if the upload fails with HTTP 500', async () => {
-        // Force the direct upload (global fetch) to fail
-        globalFetchSpy.mockResolvedValueOnce(new Response(null, { status: 500 }));
-        // Also mock getUploadInfo
-        jest.spyOn(uploader, 'getUploadInfo').mockResolvedValue({
-            uploadURL: 'https://example-upload.com/put'
-        });
-        const failingData = stringToUtf8Array('failing data');
-        await expect(uploader.publishFile({
-            file: { data: failingData, type: 'text/plain' },
-            retentionPeriod: 30
-        })).rejects.toThrow('File upload failed: HTTP 500');
-    });
-    it('should find a file and return metadata', async () => {
-        // This route goes through authFetch, not global fetch
-        authFetchSpy.mockResolvedValueOnce(new Response(JSON.stringify({
-            status: 'success',
-            data: {
-                name: 'cdn/abc123',
-                size: '1024',
-                mimeType: 'text/plain',
-                expiryTime: 123456
-            }
-        }), { status: 200 }));
-        const fileData = await uploader.findFile('uhrp://some-hash');
-        expect(authFetchSpy).toHaveBeenCalledTimes(1);
-        expect(fileData.name).toBe('cdn/abc123');
-        expect(fileData.size).toBe('1024');
-        expect(fileData.mimeType).toBe('text/plain');
-        expect(fileData.expiryTime).toBe(123456);
-    });
-    it('should throw an error if findFile returns an error status', async () => {
-        authFetchSpy.mockResolvedValueOnce(new Response(JSON.stringify({ status: 'error', code: 'ERR_NOT_FOUND', description: 'File not found' }), { status: 200 }));
-        await expect(uploader.findFile('uhrp://unknown-hash'))
-            .rejects
-            .toThrow('findFile returned an error: ERR_NOT_FOUND - File not found');
-    });
-    it('should list user uploads successfully', async () => {
-        // /list uses authFetch
-        const mockUploads = [
-            { uhrpUrl: 'uhrp://hash1', expiryTime: 111111 },
-            { uhrpUrl: 'uhrp://hash2', expiryTime: 222222 }
-        ];
-        authFetchSpy.mockResolvedValueOnce(new Response(JSON.stringify({ status: 'success', uploads: mockUploads }), { status: 200 }));
-        const result = await uploader.listUploads();
-        expect(authFetchSpy).toHaveBeenCalledTimes(1);
-        expect(result).toEqual(mockUploads);
-    });
-    it('should throw an error if listUploads returns an error', async () => {
-        authFetchSpy.mockResolvedValueOnce(new Response(JSON.stringify({ status: 'error', code: 'ERR_INTERNAL', description: 'Something broke' }), { status: 200 }));
-        await expect(uploader.listUploads()).rejects.toThrow('listUploads returned an error: ERR_INTERNAL - Something broke');
-    });
-    it('should renew a file and return the new expiry info', async () => {
-        // /renew uses authFetch
-        authFetchSpy.mockResolvedValueOnce(new Response(JSON.stringify({
-            status: 'success',
-            prevExpiryTime: 123,
-            newExpiryTime: 456,
-            amount: 99
-        }), { status: 200 }));
-        const renewal = await uploader.renewFile('uhrp://some-hash', 30);
-        expect(authFetchSpy).toHaveBeenCalledTimes(1);
-        expect(renewal.status).toBe('success');
-        expect(renewal.prevExpiryTime).toBe(123);
-        expect(renewal.newExpiryTime).toBe(456);
-        expect(renewal.amount).toBe(99);
-    });
-    it('should throw an error if renewFile returns error status JSON', async () => {
-        authFetchSpy.mockResolvedValueOnce(new Response(JSON.stringify({ status: 'error', code: 'ERR_CANT_RENEW', description: 'Failed to renew' }), { status: 200 }));
-        await expect(uploader.renewFile('uhrp://some-other-hash', 15))
-            .rejects
-            .toThrow('renewFile returned an error: ERR_CANT_RENEW - Failed to renew');
-    });
-    it('should throw if renewFile request fails with non-200 status', async () => {
-        authFetchSpy.mockResolvedValueOnce(new Response(null, { status: 404 }));
-        await expect(uploader.renewFile('uhrp://ghost', 10))
-            .rejects
-            .toThrow('renewFile request failed: HTTP 404');
-    });
-});
-//# sourceMappingURL=StorageUploader.test.js.map

package/dist/cjs/src/storage/__test/StorageUploader.test.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"StorageUploader.test.js","sourceRoot":"","sources":["../../../../../src/storage/__test/StorageUploader.test.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8DAAuD;AACvD,iEAAkD;AAClD,mFAAuD;AAEvD;;GAEG;AACH,SAAS,iBAAiB,CAAC,GAAW;IACpC,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAA;AAClD,CAAC;AAED,QAAQ,CAAC,uBAAuB,EAAE,GAAG,EAAE;IACrC,IAAI,QAAyB,CAAA;IAC7B,IAAI,YAA0B,CAAA;IAE9B,wBAAwB;IACxB,IAAI,YAAqD,CAAA;IACzD,IAAI,cAAuD,CAAA;IAE3D,UAAU,CAAC,GAAG,EAAE;QACd,YAAY,GAAG,IAAI,yBAAY,CAAC,UAAU,EAAE,eAAe,CAAC,CAAA;QAC5D,QAAQ,GAAG,IAAI,oCAAe,CAAC;YAC7B,UAAU,EAAE,6BAA6B;YACzC,MAAM,EAAE,YAAY;SACrB,CAAC,CAAA;QAEF,iEAAiE;QACjE,YAAY,GAAG,IAAI;aAChB,KAAK,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,OAAO,CAAC;aACrC,iBAAiB,CAAC,IAAI,QAAQ,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC,CAAA;QAEzD,kEAAkE;QAClE,cAAc,GAAG,IAAI;aAClB,KAAK,CAAC,MAAM,EAAE,OAAO,CAAC;aACtB,iBAAiB,CAAC,IAAI,QAAQ,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC,CAAA;IAC3D,CAAC,CAAC,CAAA;IAEF,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,CAAC,eAAe,EAAE,CAAA;IACxB,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,oFAAoF,EAAE,KAAK,IAAI,EAAE;QAClG,MAAM,IAAI,GAAG,iBAAiB,CAAC,eAAe,CAAC,CAAA;QAE/C,2EAA2E;QAC3E,IAAI,CAAC,KAAK,CAAC,QAAe,EAAE,eAAe,CAAC,CAAC,iBAAiB,CAAC;YAC7D,SAAS,EAAE,gCAAgC;SAC5C,CAAC,CAAA;QAEF,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,WAAW,CAAC;YACxC,IAAI,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,YAAY,EAAE;YAClC,eAAe,EAAE,CAAC;SACnB,CAAC,CAAA;QAEF,sDAAsD;QACtD,MAAM,CAAC,cAAc,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAA;QAE/C,mBAAmB;QACnB,MAAM,CAAC,YAAY,CAAC,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAC1D,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAEnC,MAAM,GAAG,GAAG,YAAY,CAAC,cAAc,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;QACvD,MAAM,SAAS,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC;aAC9B,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;aACzC,IAAI,CAAC,EAAE,CAAC,CAAA;QACX,MAAM,CAAC,SAAS,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAA;IACnC,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,gDAAgD,EAAE,KAAK,IAAI,EAAE;QAC9D,iDAAiD;QACjD,cAAc,CAAC,qBAAqB,CAAC,IAAI,QAAQ,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC,CAAA;QAEzE,0BAA0B;QAC1B,IAAI,CAAC,KAAK,CAAC,QAAe,EAAE,eAAe,CAAC,CAAC,iBAAiB,CAAC;YAC7D,SAAS,EAAE,gCAAgC;SAC5C,CAAC,CAAA;QAEF,MAAM,WAAW,GAAG,iBAAiB,CAAC,cAAc,CAAC,CAAA;QAErD,MAAM,MAAM,CACV,QAAQ,CAAC,WAAW,CAAC;YACnB,IAAI,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,YAAY,EAAE;YAC/C,eAAe,EAAE,EAAE;SACpB,CAAC,CACH,CAAC,OAAO,CAAC,OAAO,CAAC,8BAA8B,CAAC,CAAA;IACnD,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,wCAAwC,EAAE,KAAK,IAAI,EAAE;QACtD,sDAAsD;QACtD,YAAY,CAAC,qBAAqB,CAChC,IAAI,QAAQ,CACV,IAAI,CAAC,SAAS,CAAC;YACb,MAAM,EAAE,SAAS;YACjB,IAAI,EAAE;gBACJ,IAAI,EAAE,YAAY;gBAClB,IAAI,EAAE,MAAM;gBACZ,QAAQ,EAAE,YAAY;gBACtB,UAAU,EAAE,MAAM;aACnB;SACF,CAAC,EACF,EAAE,MAAM,EAAE,GAAG,EAAE,CAChB,CACF,CAAA;QAED,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAA;QAC5D,MAAM,CAAC,YAAY,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAA;QAC7C,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;QACxC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QAClC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;QAC5C,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IAC1C,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,2DAA2D,EAAE,KAAK,IAAI,EAAE;QACzE,YAAY,CAAC,qBAAqB,CAChC,IAAI,QAAQ,CACV,IAAI,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,eAAe,EAAE,WAAW,EAAE,gBAAgB,EAAE,CAAC,EACzF,EAAE,MAAM,EAAE,GAAG,EAAE,CAChB,CACF,CAAA;QAED,MAAM,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,qBAAqB,CAAC,CAAC;aACnD,OAAO;aACP,OAAO,CAAC,4DAA4D,CAAC,CAAA;IAC1E,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,uCAAuC,EAAE,KAAK,IAAI,EAAE;QACrD,uBAAuB;QACvB,MAAM,WAAW,GAAG;YAClB,EAAE,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,EAAE;YAC/C,EAAE,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,EAAE;SAChD,CAAA;QACD,YAAY,CAAC,qBAAqB,CAChC,IAAI,QAAQ,CACV,IAAI,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC,EAC3D,EAAE,MAAM,EAAE,GAAG,EAAE,CAChB,CACF,CAAA;QAED,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,WAAW,EAAE,CAAA;QAC3C,MAAM,CAAC,YAAY,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAA;QAC7C,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,CAAA;IACrC,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,uDAAuD,EAAE,KAAK,IAAI,EAAE;QACrE,YAAY,CAAC,qBAAqB,CAChC,IAAI,QAAQ,CACV,IAAI,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,cAAc,EAAE,WAAW,EAAE,iBAAiB,EAAE,CAAC,EACzF,EAAE,MAAM,EAAE,GAAG,EAAE,CAChB,CACF,CAAA;QAED,MAAM,MAAM,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC,CAAC,OAAO,CAAC,OAAO,CAClD,+DAA+D,CAChE,CAAA;IACH,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,oDAAoD,EAAE,KAAK,IAAI,EAAE;QAClE,wBAAwB;QACxB,YAAY,CAAC,qBAAqB,CAChC,IAAI,QAAQ,CACV,IAAI,CAAC,SAAS,CAAC;YACb,MAAM,EAAE,SAAS;YACjB,cAAc,EAAE,GAAG;YACnB,aAAa,EAAE,GAAG;YAClB,MAAM,EAAE,EAAE;SACX,CAAC,EACF,EAAE,MAAM,EAAE,GAAG,EAAE,CAChB,CACF,CAAA;QAED,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,SAAS,CAAC,kBAAkB,EAAE,EAAE,CAAC,CAAA;QAChE,MAAM,CAAC,YAAY,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAA;QAC7C,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;QACtC,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QACxC,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QACvC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;IACjC,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,8DAA8D,EAAE,KAAK,IAAI,EAAE;QAC5E,YAAY,CAAC,qBAAqB,CAChC,IAAI,QAAQ,CACV,IAAI,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,gBAAgB,EAAE,WAAW,EAAE,iBAAiB,EAAE,CAAC,EAC3F,EAAE,MAAM,EAAE,GAAG,EAAE,CAChB,CACF,CAAA;QAED,MAAM,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,wBAAwB,EAAE,EAAE,CAAC,CAAC;aAC3D,OAAO;aACP,OAAO,CAAC,+DAA+D,CAAC,CAAA;IAC7E,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,6DAA6D,EAAE,KAAK,IAAI,EAAE;QAC3E,YAAY,CAAC,qBAAqB,CAAC,IAAI,QAAQ,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC,CAAA;QAEvE,MAAM,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,cAAc,EAAE,EAAE,CAAC,CAAC;aACjD,OAAO;aACP,OAAO,CAAC,oCAAoC,CAAC,CAAA;IAClD,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}