omnipin 2.2.0 → 2.2.2

package/dist/index.js

@@ -2139,10 +2139,8 @@ function toZeroPaddedSize(payloadSize) {
     let size = Math.max(payloadSize, MIN_PAYLOAD_SIZE), highestBit = Math.floor(Math.log2(size)), bound = Math.ceil(calculatePieceCID_FR_RATIO * 2 ** (highestBit + 1));
     return size <= bound ? bound : Math.ceil(calculatePieceCID_FR_RATIO * 2 ** (highestBit + 2));
 }
-function trunc254InPlace(node) {
-    let last = node[31];
-    if (void 0 === last) throw Error('invalid node size');
-    node[31] = 63 & last;
+function trunc254AtOffset(buf, offset) {
+    buf[offset + 31] = 63 & buf[offset + 31];
 }
 function readLength(cursor, prefix, offset) {
     if (0x80 === offset && prefix < 0x80) return 1;
@@ -8419,10 +8417,12 @@ let createPresignedUrl = async ({ bucketName, apiUrl, file, token })=>{
             'x-amz-meta-import': 'car'
         }
     });
-}, uploadOnS3 = async ({ name, car, token, bucketName, apiUrl, providerName, verbose })=>{
+}, uploadOnS3 = async ({ name, bytes, token, bucketName, apiUrl, providerName, verbose })=>{
     let file = new File([
-        car
-    ], name), res = await uploadCar({
+        bytes.buffer
+    ], name, {
+        type: 'application/vnd.ipld.car'
+    }), res = await uploadCar({
         apiUrl,
         file,
         token,
@@ -8430,7 +8430,7 @@ let createPresignedUrl = async ({ bucketName, apiUrl, file, token })=>{
     }), text = await res.text();
     if (!res.ok) throw new DeployError(providerName, text);
     return verbose && logger.request('PUT', res.url, res.status), res;
-}, filebase_providerName = 'Filebase', filebase_baseURL = 'https://rpc.filebase.io/api/v0', uploadOnFilebase = async ({ first, car, name, token, bucketName, verbose, cid })=>{
+}, filebase_providerName = 'Filebase', filebase_baseURL = 'https://rpc.filebase.io/api/v0', uploadOnFilebase = async ({ first, bytes, name, token, bucketName, verbose, cid, size })=>{
     if (first) {
         if (!bucketName) throw new MissingKeyError("FILEBASE_BUCKET_NAME");
         return {
@@ -8440,8 +8440,8 @@ let createPresignedUrl = async ({ bucketName, apiUrl, file, token })=>{
                 providerName: filebase_providerName,
                 verbose,
                 name,
-                car,
-                size: car.size,
+                bytes,
+                size,
                 token
             })).headers.get('x-amz-meta-cid'),
             status: 'queued'
@@ -11960,7 +11960,7 @@ let serializedType = '0x02', TxEnvelopeEip1559_type = 'eip1559', SIMULATION_GAS_
         await promises_setTimeout(delay);
     }
     throw Error(`Transaction ${hash} not mined within timeout period`);
-}, filecoin_providerName = 'Filecoin', uploadToFilecoin = async ({ providerAddress, providerURL, cid, car, token: privateKey, verbose, filecoinChain = 'mainnet', filecoinForceNewDataset, size })=>{
+}, filecoin_providerName = 'Filecoin', uploadToFilecoin = async ({ providerAddress, providerURL, cid, bytes, token: privateKey, verbose, filecoinChain = 'mainnet', filecoinForceNewDataset, size })=>{
     if (!providerAddress && providerURL) throw new MissingKeyError('FILECOIN_SP_ADDRESS');
     let address = fromPublicKey(Secp256k1_getPublicKey({
         privateKey
@@ -11994,7 +11994,7 @@ let serializedType = '0x02', TxEnvelopeEip1559_type = 'eip1559', SIMULATION_GAS_
         chain
     });
     logger.info(`Price for storage: ${Value_format(perMonth, 18)} USDfc/month`);
-    let carBytes = new Uint8Array(await car.arrayBuffer()), pieceCid = link_create(raw_code, digest_create(0x1011, function(data) {
+    let pieceCid = link_create(raw_code, digest_create(0x1011, function(data) {
         let fr32 = function(source) {
             let output = new Uint8Array(Math.floor(toZeroPaddedSize(source.length) / calculatePieceCID_FR_RATIO)), quadCount = toZeroPaddedSize(source.length) / 127;
             for(let n = 0; n < quadCount; n++){
@@ -12031,33 +12031,26 @@ let serializedType = '0x02', TxEnvelopeEip1559_type = 'eip1559', SIMULATION_GAS_
             return output;
         }(data), root = function(fr32) {
             if (0 === fr32.length || fr32.length % 32 != 0) throw Error(`invalid fr32 payload size: ${fr32.length}`);
-            let targetLeaves = 1 << Math.ceil(Math.log2(fr32.length / 32)), level = Array(targetLeaves);
-            for(let i = 0; i < targetLeaves; i++){
-                let leaf = new Uint8Array(32), start = 32 * i;
-                start < fr32.length && leaf.set(fr32.subarray(start, start + 32)), trunc254InPlace(leaf), level[i] = leaf;
-            }
-            for(; level.length > 1;){
-                let next = Array(level.length / 2);
-                for(let i = 0; i < level.length; i += 2){
-                    let left = level[i], right = level[i + 1];
-                    if (!left || !right) throw Error('invalid tree state');
-                    next[i / 2] = function(left, right) {
-                        let input = new Uint8Array(64);
-                        input.set(left, 0), input.set(right, 32);
-                        let out = new Uint8Array(hashes_sha2_sha256(input));
-                        return trunc254InPlace(out), out;
-                    }(left, right);
+            let targetLeaves = 1 << Math.ceil(Math.log2(fr32.length / 32)), buf = new Uint8Array(32 * targetLeaves);
+            buf.set(fr32, 0);
+            for(let i = 0; i < targetLeaves; i++)trunc254AtOffset(buf, 32 * i);
+            let hashInput = new Uint8Array(64), count = targetLeaves;
+            for(; count > 1;){
+                let half = count / 2;
+                for(let i = 0; i < half; i++){
+                    let leftOff = 2 * i * 32, rightOff = leftOff + 32;
+                    hashInput.set(buf.subarray(leftOff, leftOff + 32), 0), hashInput.set(buf.subarray(rightOff, rightOff + 32), 32);
+                    let hash = hashes_sha2_sha256(hashInput), destOff = 32 * i;
+                    buf.set(hash, destOff), trunc254AtOffset(buf, destOff);
                 }
-                level = next;
+                count = half;
             }
-            let root = level[0];
-            if (!root) throw Error('failed to build piece root');
-            return root;
+            return buf.slice(0, 32);
         }(fr32), pieceSize = fr32.length, height = Math.log2(pieceSize / 32);
         if (!Number.isInteger(height) || height < 0 || height > 255) throw Error(`invalid piece height for piece size ${pieceSize}`);
         let payloadPadding = toZeroPaddedSize(data.length) - data.length, paddingVarint = Uint8Array.from(varint_0.encode(payloadPadding)), out = new Uint8Array(paddingVarint.length + 1 + 32);
         return out.set(paddingVarint, 0), out[paddingVarint.length] = height, out.set(root, paddingVarint.length + 1), out;
-    }(carBytes))), providerActiveDataSets = (await getClientDataSets({
+    }(bytes))), providerActiveDataSets = (await getClientDataSets({
         chain,
         address
     })).filter((ds)=>ds.providerId === providerId && 0n === ds.pdpEndEpoch), isNewDataSet = 0 === providerActiveDataSets.length || filecoinForceNewDataset, sybilFee = isNewDataSet ? 100000000000000000n : 0n, totalRequired = perMonth + sybilFee;
@@ -12091,7 +12084,7 @@ let serializedType = '0x02', TxEnvelopeEip1559_type = 'eip1559', SIMULATION_GAS_
         logger.info('Creating new data set'), verbose && logger.info('Uploading piece to provider'), await uploadPiece({
             providerURL,
             pieceCid: pieceCid.toString(),
-            bytes: carBytes
+            bytes: bytes
         }), verbose && logger.info('Waiting for piece to be stored at provider'), await findPiece(providerURL, pieceCid.toString(), {
             verbose
         });
@@ -12186,7 +12179,7 @@ let serializedType = '0x02', TxEnvelopeEip1559_type = 'eip1559', SIMULATION_GAS_
         verbose && logger.info(`Data set ID: ${dataset.dataSetId}`), verbose && logger.info('Uploading piece to provider'), await uploadPiece({
             providerURL,
             pieceCid: pieceCid.toString(),
-            bytes: carBytes
+            bytes: bytes
         }), logger.info('Waiting for piece to be stored at provider'), await findPiece(providerURL, pieceCid.toString(), {
             verbose
         });
@@ -12211,10 +12204,14 @@ let serializedType = '0x02', TxEnvelopeEip1559_type = 'eip1559', SIMULATION_GAS_
     }), logger.success('Piece found'), {
         cid
     };
-}, lighthouse_providerName = 'Lighthouse', uploadOnLighthouse = async ({ car, name, first, token, verbose, cid })=>{
+}, lighthouse_providerName = 'Lighthouse', uploadOnLighthouse = async ({ bytes, name, first, token, verbose, cid })=>{
     if (first) {
         let fd = new FormData();
-        fd.append('file', car, `${name}.car`);
+        fd.append('file', new Blob([
+            Uint8Array.from(bytes).buffer
+        ], {
+            type: 'application/vnd.ipld.car'
+        }), `${name}.car`);
         let res = await fetch('https://upload.lighthouse.storage/api/v0/dag/import', {
             method: 'POST',
             headers: {
@@ -12246,10 +12243,14 @@ let serializedType = '0x02', TxEnvelopeEip1559_type = 'eip1559', SIMULATION_GAS_
         cid,
         status: 'queued'
     };
-}, pinata_providerName = 'Pinata', uploadOnPinata = async ({ car, name, token, verbose, first, cid })=>{
+}, pinata_providerName = 'Pinata', uploadOnPinata = async ({ bytes, name, token, verbose, first, cid })=>{
     if (first) {
         let fd = new FormData();
-        fd.append('file', car), fd.append('network', 'public'), fd.append('name', `${name}.car`), fd.append('car', 'true');
+        fd.append('file', new Blob([
+            bytes.buffer
+        ], {
+            type: 'application/vnd.ipld.car'
+        })), fd.append('network', 'public'), fd.append('name', `${name}.car`), fd.append('car', 'true');
         let res = await fetch('https://uploads.pinata.cloud/v3/files', {
             method: 'POST',
             headers: {
@@ -12291,10 +12292,10 @@ let serializedType = '0x02', TxEnvelopeEip1559_type = 'eip1559', SIMULATION_GAS_
         status: json.status,
         cid: json.pin.cid
     };
-}, uploadToSimplePage = async ({ token, car, name })=>{
+}, uploadToSimplePage = async ({ token, bytes, name })=>{
     let fd = new FormData();
     fd.append('file', new File([
-        car
+        bytes.buffer
     ], `${name}.car`, {
         type: 'application/vnd.ipld.car'
     }));
@@ -17710,13 +17711,18 @@ let uploadCAR = async (conf, car)=>{
 }, swarmy_providerName = 'Swarmy', PROVIDERS = {
     STORACHA_TOKEN: {
         name: 'Storacha',
-        upload: async ({ token, car, proof })=>{
+        upload: async ({ token, bytes, proof })=>{
             if (!proof) throw new MissingKeyError("STORACHA_PROOF");
             let { agent, space } = await setup({
                 pk: token,
                 proof
             });
             if (!space) throw Error('No space found');
+            let blob = new Blob([
+                bytes.buffer
+            ], {
+                type: 'application/vnd.ipld.car'
+            });
             try {
                 return {
                     cid: (await uploadCAR({
@@ -17726,7 +17732,7 @@ let uploadCAR = async (conf, car)=>{
                                 with: space.did()
                             }))),
                         with: space.did()
-                    }, car)).toString()
+                    }, blob)).toString()
                 };
             } catch (e) {
                 throw new DeployError('Storacha', e.message, {
@@ -17789,10 +17795,12 @@ let uploadCAR = async (conf, car)=>{
     },
     SWARMY_TOKEN: {
         name: 'Swarmy',
-        upload: async ({ token, car, verbose, first })=>{
+        upload: async ({ token, bytes, verbose, first })=>{
             if (!first) throw new PinningNotSupportedError(swarmy_providerName);
             let body = new FormData();
-            body.append('file', car);
+            body.append('file', new Blob([
+                bytes.buffer
+            ]));
             let res = await fetch('https://api.swarmy.cloud/api/files?website=true', {
                 body,
                 headers: {
@@ -17811,10 +17819,12 @@ let uploadCAR = async (conf, car)=>{
     },
     BEE_TOKEN: {
         name: 'Bee',
-        upload: async ({ token, car, verbose, beeURL, first })=>{
+        upload: async ({ token, bytes, verbose, beeURL, first })=>{
             if (!first) throw new PinningNotSupportedError('Bee');
             let res = await fetch(`${beeURL}/bzz`, {
-                body: car,
+                body: new Blob([
+                    bytes.buffer
+                ]),
                 headers: {
                     'Swarm-Postage-Batch-Id': token,
                     'Content-Type': 'application/x-tar',
@@ -20379,6 +20389,9 @@ class MemoryBlockstore {
     async delete(key, options) {
         options?.signal?.throwIfAborted(), this.data.delete(base32.encode(key.multihash.bytes));
     }
+    clear() {
+        this.data.clear();
+    }
     *getAll(options) {
         for (let [key, value] of (options?.signal?.throwIfAborted(), this.data.entries()))yield {
             cid: cid_CID.createV1(raw_code, digest_decode(base32.decode(key))),
@@ -20415,12 +20428,10 @@ let ipfs_tmp = tmpdir(), ipfs_concatBytes = (chunks)=>{
     } catch (error) {
         console.warn(`Failed to add block ${cid.toString()} to CAR:`, error);
     }
-    return await writer.close(), await writePromise, writeStream.end(), await new Promise((resolve)=>writeStream.on('close', resolve)), {
-        blob: new Blob([
-            await readFile(output)
-        ], {
-            type: 'application/vnd.ipld.car'
-        }),
+    await writer.close(), await writePromise, writeStream.end(), await new Promise((resolve)=>writeStream.on('close', resolve));
+    let file = await readFile(output);
+    return blockstore.clear(), {
+        bytes: file,
         rootCID
     };
 }, assertCID = (cid)=>{
@@ -21232,17 +21243,15 @@ let ENS_DEPLOYER_ROLE = keccak256(Bytes_fromString('ENS_DEPLOYER')), execTransac
         'dist'
     ].includes(dir) ? name : dir;
     if (onlyHash || logger.start(`Packing ${isTTY ? styleText('cyan', distName) : distName} (${fileSize(size, 2)})`), tar) return {
-        blob: new Blob([
-            await packTAR(files)
-        ]),
+        bytes: await packTAR(files),
         size
     };
     {
-        let { rootCID, blob } = await packCAR(files, name, dist), cid = rootCID.toString();
+        let { rootCID, bytes } = await packCAR(files, name, dist), cid = rootCID.toString();
         return onlyHash ? console.log(cid) : logger.info(`Root CID: ${isTTY ? styleText('white', cid) : cid}`), {
             name,
             cid,
-            blob,
+            bytes,
             files,
             size
         };
@@ -21251,7 +21260,7 @@ let ENS_DEPLOYER_ROLE = keccak256(Bytes_fromString('ENS_DEPLOYER')), execTransac
     let cid, { strict, ens, chain = 'mainnet', name: customName, dist, verbose = !1, providers: providersList, dnslink, 'progress-bar': progressBar, 'filecoin-chain': filecoinChain, 'filecoin-force-new-dataset': filecoinForceNewDataset, ...opts } = options, apiTokens = parseTokensFromEnv(), allProviders = (providersList ? providersList.split(',') : tokensToProviderNames(apiTokens.keys())).map((providerName)=>PROVIDERS[findEnvVarProviderName(providerName)]), ipfsProviders = allProviders.filter((p)=>'ipfs' === p.protocol), swarmProviders = allProviders.filter((p)=>'swarm' === p.protocol);
     if (ipfsProviders.sort((a)=>'both' === a.supported || 'upload' === a.supported ? -1 : 1), !allProviders.length) throw new NoProvidersError();
     logger.info(`Deploying with providers: ${(swarmProviders.length ? swarmProviders : ipfsProviders).map((p)=>p.name).join(', ')}`);
-    let { name, cid: ipfsCid, blob, size } = await packAction({
+    let { name, cid: ipfsCid, bytes, size } = await packAction({
         dir,
         options: {
             name: customName,
@@ -21272,7 +21281,7 @@ let ENS_DEPLOYER_ROLE = keccak256(Bytes_fromString('ENS_DEPLOYER')), execTransac
         let envVar = findEnvVarProviderName(provider.name);
         try {
             let result = await provider.upload({
-                car: blob,
+                bytes,
                 token: apiTokens.get(envVar),
                 verbose,
                 name: '',
@@ -21294,7 +21303,7 @@ let ENS_DEPLOYER_ROLE = keccak256(Bytes_fromString('ENS_DEPLOYER')), execTransac
             try {
                 await provider.upload({
                     name,
-                    car: blob,
+                    bytes,
                     token,
                     bucketName,
                     proof: apiTokens.get('STORACHA_PROOF'),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "omnipin",
-  "version": "2.2.0",
+  "version": "2.2.2",
   "author": "v1rtl <hi@v1rtl.site>",
   "repository": {
     "type": "git",
@@ -10,7 +10,7 @@
     "@biomejs/biome": "^2.4.7",
     "@ipld/car": "^5.4.2",
     "@ipld/dag-ucan": "^3.4.5",
-    "@omnipin/foc": "npm:@jsr/omnipin__foc@0.0.10",
+    "@omnipin/foc": "npm:@jsr/omnipin__foc@0.0.11",
     "@rslib/core": "^0.20.0",
     "@size-limit/file": "^12.0.1",
     "@stauro/filebase-upload": "npm:@jsr/stauro__filebase-upload",