@aztec/stdlib 2.1.2-rc.2 → 2.1.2-rc.5

package/dest/file-store/http.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"http.d.ts","sourceRoot":"","sources":["../../src/file-store/http.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAUlE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAExD,qBAAa,aAAc,YAAW,iBAAiB;IAKnD,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,GAAG;IALtB,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAgB;IAC9C,OAAO,CAAC,QAAQ,CAAC,KAAK,CAA+D;gBAGlE,OAAO,EAAE,MAAM,EACf,GAAG,GAAE,MAA+C;IAc1D,IAAI,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAUxC,QAAQ,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAW5D,MAAM,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAUxD,OAAO,CAAC,MAAM;CAGf"}
+{"version":3,"file":"http.d.ts","sourceRoot":"","sources":["../../src/file-store/http.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAUlE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAExD,qBAAa,aAAc,YAAW,iBAAiB;IAKnD,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,GAAG;IALtB,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAgB;IAC9C,OAAO,CAAC,QAAQ,CAAC,KAAK,CAA+D;gBAGlE,OAAO,EAAE,MAAM,EACf,GAAG,GAAE,MAA+C;IAc1D,IAAI,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAUxC,QAAQ,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAc5D,MAAM,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAUxD,OAAO,CAAC,MAAM;CAGf"}

package/dest/file-store/http.js

@@ -4,7 +4,7 @@ import axios from 'axios';
 import { createWriteStream } from 'fs';
 import { mkdir } from 'fs/promises';
 import { dirname } from 'path';
-import { finished } from 'stream/promises';
+import { pipeline } from 'stream/promises';
 export class HttpFileStore {
     baseUrl;
     log;
@@ -38,17 +38,22 @@ export class HttpFileStore {
     async download(pathOrUrl, destPath) {
         const url = this.getUrl(pathOrUrl);
         try {
+            this.log.debug(`Downloading file from ${url} to ${destPath}`);
             const response = await this.fetch({
                 url,
                 method: 'GET',
                 responseType: 'stream'
             });
+            this.log.debug(`Response ${response.status} (${response.statusText}) from ${url}, writing to ${destPath}`);
             await mkdir(dirname(destPath), {
                 recursive: true
             });
-            await finished(response.data.pipe(createWriteStream(destPath)));
+            await pipeline(response.data, createWriteStream(destPath));
+            this.log.debug(`Download of ${url} to ${destPath} complete`);
         } catch (error) {
-            throw new Error(`Error fetching file from ${url}: ${error instanceof Error ? error.message : String(error)}`);
+            throw new Error(`Error fetching file from ${url}`, {
+                cause: error
+            });
         }
     }
     async exists(pathOrUrl) {

package/dest/file-store/s3.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"s3.d.ts","sourceRoot":"","sources":["../../src/file-store/s3.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAiBlE,OAAO,KAAK,EAAE,SAAS,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAMtE,qBAAa,WAAY,YAAW,SAAS;IAOzC,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAEzB,OAAO,CAAC,QAAQ,CAAC,GAAG;IATtB,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAW;IAC9B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAChC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAS;IACnC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAS;gBAGrB,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,EACjC,IAAI,EAAE;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;QAAC,aAAa,CAAC,EAAE,MAAM,CAAA;KAAE,EAClC,GAAG,GAAE,MAA6C;IAiBxD,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,GAAE,oBAAyB,GAAG,OAAO,CAAC,MAAM,CAAC;IAoBlF,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,GAAE,oBAAyB,GAAG,OAAO,CAAC,MAAM,CAAC;IA6D3F,IAAI,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAW3C,QAAQ,CAAC,YAAY,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAQ/D,MAAM,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAe3D,OAAO,CAAC,mBAAmB;IAQ3B,OAAO,CAAC,iBAAiB;IAsBzB,OAAO,CAAC,gBAAgB;IA0BxB,OAAO,CAAC,eAAe;IA2BvB,OAAO,CAAC,WAAW;CAKpB"}
+{"version":3,"file":"s3.d.ts","sourceRoot":"","sources":["../../src/file-store/s3.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAiBlE,OAAO,KAAK,EAAE,SAAS,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAMtE,qBAAa,WAAY,YAAW,SAAS;IAOzC,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAEzB,OAAO,CAAC,QAAQ,CAAC,GAAG;IATtB,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAW;IAC9B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAChC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAS;IACnC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAS;gBAGrB,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,EACjC,IAAI,EAAE;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;QAAC,aAAa,CAAC,EAAE,MAAM,CAAA;KAAE,EAClC,GAAG,GAAE,MAA6C;IAiBxD,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,GAAE,oBAAyB,GAAG,OAAO,CAAC,MAAM,CAAC;IAoBlF,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,GAAE,oBAAyB,GAAG,OAAO,CAAC,MAAM,CAAC;IA0D3F,IAAI,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAW3C,QAAQ,CAAC,YAAY,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAO/D,MAAM,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAe3D,OAAO,CAAC,mBAAmB;IAQ3B,OAAO,CAAC,iBAAiB;IAsBzB,OAAO,CAAC,gBAAgB;IA0BxB,OAAO,CAAC,eAAe;IA2BvB,OAAO,CAAC,WAAW;CAKpB"}

package/dest/file-store/s3.js

@@ -4,7 +4,7 @@ import { createReadStream, createWriteStream } from 'fs';
 import { mkdir, mkdtemp, stat, unlink } from 'fs/promises';
 import { tmpdir } from 'os';
 import { basename, dirname, join } from 'path';
-import { finished } from 'stream/promises';
+import { pipeline } from 'stream/promises';
 import { createGzip } from 'zlib';
 function normalizeBasePath(path) {
     return path?.replace(/^\/+|\/+$/g, '') ?? '';
@@ -72,11 +72,8 @@ export class S3FileStore {
             // Pre-gzip to a temp file so we know the exact length for R2/S3 headers
             const tmpDir = await mkdtemp(join(tmpdir(), 's3-upload-'));
             const gzPath = join(tmpDir, `${basename(srcPath)}.gz`);
-            const source = createReadStream(srcPath);
-            const gz = createGzip();
-            const out = createWriteStream(gzPath);
             try {
-                await finished(source.pipe(gz).pipe(out));
+                await pipeline(createReadStream(srcPath), createGzip(), createWriteStream(gzPath));
                 const st = await stat(gzPath);
                 contentLength = st.size;
                 bodyPath = gzPath;
@@ -133,8 +130,7 @@ export class S3FileStore {
         await mkdir(dirname(destPath), {
             recursive: true
         });
-        const write = createWriteStream(destPath);
-        await finished(out.Body.pipe(write));
+        await pipeline(out.Body, createWriteStream(destPath));
     }
     async exists(pathOrUrlStr) {
         try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/stdlib",
-  "version": "2.1.2-rc.2",
+  "version": "2.1.2-rc.5",
   "type": "module",
   "inherits": [
     "../package.common.json",
@@ -70,13 +70,13 @@
   },
   "dependencies": {
     "@aws-sdk/client-s3": "^3.892.0",
-    "@aztec/bb.js": "2.1.2-rc.2",
-    "@aztec/blob-lib": "2.1.2-rc.2",
-    "@aztec/constants": "2.1.2-rc.2",
-    "@aztec/ethereum": "2.1.2-rc.2",
-    "@aztec/foundation": "2.1.2-rc.2",
-    "@aztec/l1-artifacts": "2.1.2-rc.2",
-    "@aztec/noir-noirc_abi": "2.1.2-rc.2",
+    "@aztec/bb.js": "2.1.2-rc.5",
+    "@aztec/blob-lib": "2.1.2-rc.5",
+    "@aztec/constants": "2.1.2-rc.5",
+    "@aztec/ethereum": "2.1.2-rc.5",
+    "@aztec/foundation": "2.1.2-rc.5",
+    "@aztec/l1-artifacts": "2.1.2-rc.5",
+    "@aztec/noir-noirc_abi": "2.1.2-rc.5",
     "@google-cloud/storage": "^7.15.0",
     "axios": "^1.12.0",
     "json-stringify-deterministic": "1.0.12",

package/src/file-store/http.ts

@@ -6,7 +6,7 @@ import { createWriteStream } from 'fs';
 import { mkdir } from 'fs/promises';
 import { dirname } from 'path';
 import { Readable } from 'stream';
-import { finished } from 'stream/promises';
+import { pipeline } from 'stream/promises';
 
 import type { ReadOnlyFileStore } from './interface.js';
 
@@ -43,11 +43,14 @@ export class HttpFileStore implements ReadOnlyFileStore {
   public async download(pathOrUrl: string, destPath: string): Promise<void> {
     const url = this.getUrl(pathOrUrl);
     try {
+      this.log.debug(`Downloading file from ${url} to ${destPath}`);
       const response = await this.fetch<Readable>({ url, method: 'GET', responseType: 'stream' });
+      this.log.debug(`Response ${response.status} (${response.statusText}) from ${url}, writing to ${destPath}`);
       await mkdir(dirname(destPath), { recursive: true });
-      await finished(response.data.pipe(createWriteStream(destPath)));
+      await pipeline(response.data, createWriteStream(destPath));
+      this.log.debug(`Download of ${url} to ${destPath} complete`);
     } catch (error) {
-      throw new Error(`Error fetching file from ${url}: ${error instanceof Error ? error.message : String(error)}`);
+      throw new Error(`Error fetching file from ${url}`, { cause: error });
     }
   }
 

package/src/file-store/s3.ts

@@ -12,7 +12,7 @@ import { mkdir, mkdtemp, stat, unlink } from 'fs/promises';
 import { tmpdir } from 'os';
 import { basename, dirname, join } from 'path';
 import { Readable } from 'stream';
-import { finished } from 'stream/promises';
+import { pipeline } from 'stream/promises';
 import { createGzip } from 'zlib';
 
 import type { FileStore, FileStoreSaveOptions } from './interface.js';
@@ -88,11 +88,8 @@ export class S3FileStore implements FileStore {
       // Pre-gzip to a temp file so we know the exact length for R2/S3 headers
       const tmpDir = await mkdtemp(join(tmpdir(), 's3-upload-'));
       const gzPath = join(tmpDir, `${basename(srcPath)}.gz`);
-      const source = createReadStream(srcPath);
-      const gz = createGzip();
-      const out = createWriteStream(gzPath);
       try {
-        await finished(source.pipe(gz).pipe(out));
+        await pipeline(createReadStream(srcPath), createGzip(), createWriteStream(gzPath));
         const st = await stat(gzPath);
         contentLength = st.size;
         bodyPath = gzPath;
@@ -144,8 +141,7 @@ export class S3FileStore implements FileStore {
     const { bucket, key } = this.getBucketAndKey(pathOrUrlStr);
     const out: GetObjectCommandOutput = await this.s3.send(new GetObjectCommand({ Bucket: bucket, Key: key }));
     await mkdir(dirname(destPath), { recursive: true });
-    const write = createWriteStream(destPath);
-    await finished((out.Body as Readable).pipe(write));
+    await pipeline(out.Body as Readable, createWriteStream(destPath));
   }
 
   public async exists(pathOrUrlStr: string): Promise<boolean> {