@empiricalrun/test-gen 0.23.11 → 0.23.13

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @empiricalrun/test-gen
 
+## 0.23.13
+
+### Patch Changes
+
+- Updated dependencies [51b7e11]
+  - @empiricalrun/r2-uploader@0.1.1
+
+## 0.23.12
+
+### Patch Changes
+
+- 6a1288a: feat: create r2 uploader package and support for retry
+- Updated dependencies [bff7e8b]
+- Updated dependencies [6a1288a]
+  - @empiricalrun/reporter@0.17.10
+  - @empiricalrun/r2-uploader@0.1.0
+
 ## 0.23.11
 
 ### Patch Changes

package/dist/reporter/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/reporter/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4B,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAc5E,KAAK,kBAAkB,GAAG;IACxB,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,EAAE,MAAM,CAAC;IACxB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAKF,wBAAgB,WAAW,IAAI,QAAQ,GAAG,SAAS,CAUlD;AAED;;;;;;;;;GASG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,kBAAkB,GAAG,IAAI,CAGlE;AAED,qBAAa,sBAAsB;;IAE3B,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAK1C,eAAe,CAAC,EACpB,eAAe,EACf,QAAQ,GACT,EAAE;QACD,eAAe,EAAE,MAAM,CAAC;QACxB,QAAQ,EAAE,MAAM,CAAC;KAClB;IAkCK,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA2B9C,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAUlD"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/reporter/index.ts"],"names":[],"mappings":"AACA,OAAO,EAA4B,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAa5E,KAAK,kBAAkB,GAAG;IACxB,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,EAAE,MAAM,CAAC;IACxB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAKF,wBAAgB,WAAW,IAAI,QAAQ,GAAG,SAAS,CAUlD;AAED;;;;;;;;;GASG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,kBAAkB,GAAG,IAAI,CAGlE;AAED,qBAAa,sBAAsB;;IAE3B,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAK1C,eAAe,CAAC,EACpB,eAAe,EACf,QAAQ,GACT,EAAE;QACD,eAAe,EAAE,MAAM,CAAC;QACxB,QAAQ,EAAE,MAAM,CAAC;KAClB;IAkCK,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA2B9C,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAUlD"}

package/dist/reporter/index.js

@@ -4,12 +4,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TestGenUpdatesReporter = exports.setReporterConfig = exports.getReporter = void 0;
+const r2_uploader_1 = require("@empiricalrun/r2-uploader");
 const reporter_1 = require("@empiricalrun/reporter");
 const promises_1 = __importDefault(require("fs/promises"));
 const path_1 = __importDefault(require("path"));
 const logger_1 = require("../bin/logger");
 const uploader_1 = require("../uploader");
-const r2_1 = require("../uploader/r2");
 let reporterInstance = undefined;
 let reporterConfig = undefined;
 function getReporter() {
@@ -80,7 +80,7 @@ class TestGenUpdatesReporter {
         await promises_1.default.mkdir((process.cwd(), "gen-assets"));
         await promises_1.default.writeFile(path_1.default.join(process.cwd(), "gen-assets", `current-view-${Date.now()}.png`), buffer);
         const uploadDir = (0, uploader_1.getUploadPathForRun)(reporterConfig?.projectRepoName);
-        const files = await (0, r2_1.uploadDirectory)({
+        const files = await (0, r2_uploader_1.uploadDirectory)({
             sourceDir: path_1.default.join(process.cwd(), "gen-assets"),
             destinationDir: uploadDir,
             uploadBucket: uploader_1.UPLOAD_BUCKET,

package/dist/uploader/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/uploader/index.ts"],"names":[],"mappings":"AAYA,eAAO,MAAM,aAAa,gBAAgB,CAAC;AAC3C,eAAO,MAAM,aAAa,kCAAkC,CAAC;AAG7D,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,UAUpE;AAED;;;;;;;;;GASG;AACH,wBAAsB,6BAA6B,CAAC,EAClD,eAAe,EACf,QAAQ,GACT,EAAE;IACD,eAAe,EAAE,MAAM,CAAC;IACxB,QAAQ,EAAE,MAAM,CAAC;CAClB,GAAG,OAAO,CAAC;IACV,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,EAAE,CAAC;CACtB,CAAC,CAmED;AAED,wBAAgB,mBAAmB,CAAC,eAAe,EAAE,MAAM,UAM1D;AAED,wBAAgB,2BAA2B,uBAQ1C"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/uploader/index.ts"],"names":[],"mappings":"AAWA,eAAO,MAAM,aAAa,gBAAgB,CAAC;AAC3C,eAAO,MAAM,aAAa,kCAAkC,CAAC;AAG7D,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,UAUpE;AAED;;;;;;;;;GASG;AACH,wBAAsB,6BAA6B,CAAC,EAClD,eAAe,EACf,QAAQ,GACT,EAAE;IACD,eAAe,EAAE,MAAM,CAAC;IACxB,QAAQ,EAAE,MAAM,CAAC;CAClB,GAAG,OAAO,CAAC;IACV,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,EAAE,CAAC;CACtB,CAAC,CAmED;AAED,wBAAgB,mBAAmB,CAAC,eAAe,EAAE,MAAM,UAM1D;AAED,wBAAgB,2BAA2B,uBAQ1C"}

package/dist/uploader/index.js

@@ -4,9 +4,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkIfResultsUploadAllowed = exports.getUploadPathForRun = exports.uploadTestResultsUsingPrjRepo = exports.getFullUploadPath = exports.UPLOAD_DOMAIN = exports.UPLOAD_BUCKET = void 0;
+const r2_uploader_1 = require("@empiricalrun/r2-uploader");
 const reporter_1 = require("@empiricalrun/reporter");
 const path_1 = __importDefault(require("path"));
-const r2_1 = require("./r2");
 // json summary of test results
 // originally we used to upload test results directory for this
 // but now we have our test results (per testcase artifacts) inside playwright-report/data
@@ -40,14 +40,14 @@ async function uploadTestResultsUsingPrjRepo({ projectRepoName, testName, }) {
     // test-generation/<project-name>/<random-uuid>
     const uploadDir = getUploadPathForRun(projectRepoName);
     // upload test assets
-    const files = await (0, r2_1.uploadDirectory)({
+    const files = await (0, r2_uploader_1.uploadDirectory)({
         // ~/source-repo/playwright-report -> has index.html, data, trace(they are assets for index.html, not sure why they are called trace), and summary.json
         sourceDir: path_1.default.join(process.cwd(), PLAYWRIGHT_REPORT_DATA), // upload data dir
         destinationDir: uploadDir,
         uploadBucket: exports.UPLOAD_BUCKET,
     });
     // upload summary.json
-    await (0, r2_1.uploadDirectory)({
+    await (0, r2_uploader_1.uploadDirectory)({
         // ~/source-repo/playwright-report -> has index.html, data, trace(they are assets for index.html, not sure why they are called trace), and summary.json
         sourceDir: path_1.default.join(process.cwd(), "playwright-report"), // upload data dir
         fileList: [path_1.default.join(process.cwd(), "playwright-report", "summary.json")],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@empiricalrun/test-gen",
-  "version": "0.23.11",
+  "version": "0.23.13",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
     "access": "public"
@@ -42,7 +42,8 @@
     "tsx": "^4.16.2",
     "typescript": "^5.3.3",
     "@empiricalrun/llm": "^0.8.3",
-    "@empiricalrun/reporter": "^0.17.9"
+    "@empiricalrun/r2-uploader": "^0.1.1",
+    "@empiricalrun/reporter": "^0.17.10"
   },
   "devDependencies": {
     "@types/detect-port": "^1.3.5",

package/dist/uploader/r2.d.ts

@@ -1,11 +0,0 @@
-interface FileMap {
-    [file: string]: string;
-}
-export declare function uploadDirectory({ sourceDir, fileList, destinationDir, uploadBucket, }: {
-    sourceDir: string;
-    fileList?: string[];
-    destinationDir: string;
-    uploadBucket: string;
-}): Promise<FileMap>;
-export {};
-//# sourceMappingURL=r2.d.ts.map

package/dist/uploader/r2.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"r2.d.ts","sourceRoot":"","sources":["../../src/uploader/r2.ts"],"names":[],"mappings":"AAsBA,UAAU,OAAO;IACf,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;CACxB;AA2GD,wBAAsB,eAAe,CAAC,EACpC,SAAS,EACT,QAAQ,EACR,cAAc,EACd,YAAY,GACb,EAAE;IACD,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;CACtB,GAAG,OAAO,CAAC,OAAO,CAAC,CAYnB"}

package/dist/uploader/r2.js

@@ -1,138 +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 });
-exports.uploadDirectory = void 0;
-const client_s3_1 = require("@aws-sdk/client-s3");
-const s3_request_presigner_1 = require("@aws-sdk/s3-request-presigner");
-const fs = __importStar(require("fs"));
-const md5_1 = __importDefault(require("md5"));
-const path_1 = __importDefault(require("path"));
-const getFileList = (dir) => {
-    let files = [];
-    const items = fs.readdirSync(dir, {
-        withFileTypes: true,
-    });
-    for (const item of items) {
-        const isDir = item.isDirectory();
-        const absolutePath = `${dir}/${item.name}`;
-        if (isDir) {
-            files = [...files, ...getFileList(absolutePath)];
-        }
-        else {
-            files.push(absolutePath);
-        }
-    }
-    return files;
-};
-const run = async (config) => {
-    const map = new Map();
-    const urls = {};
-    const S3 = new client_s3_1.S3Client({
-        region: "auto",
-        endpoint: `https://${config.accountId}.r2.cloudflarestorage.com`,
-        credentials: {
-            accessKeyId: config.accessKeyId,
-            secretAccessKey: config.secretAccessKey,
-        },
-    });
-    let files;
-    if (config.fileList) {
-        console.log("uploading single file: ", config.fileList[0]);
-        files = config.fileList;
-    }
-    else {
-        files = getFileList(config.sourceDir);
-    }
-    await Promise.all(files.map(async (file) => {
-        console.log(file);
-        const fileStream = fs.readFileSync(file);
-        console.log(config.sourceDir);
-        console.log(config.destinationDir);
-        //const fileName = file.replace(/^.*[\\\/]/, "");
-        const fileName = file.replace(config.sourceDir, "");
-        const fileKey = path_1.default.join(config.destinationDir !== "" ? config.destinationDir : config.sourceDir, fileName);
-        if (fileKey.includes(".gitkeep"))
-            return;
-        console.log(fileKey);
-        let mimeType = "application/octet-stream";
-        try {
-            const mime = (await import("mime")).default;
-            mimeType = mime.getType(file) || "application/octet-stream";
-        }
-        catch (err) {
-            console.warn("Failed to get mime type for file", file, err);
-        }
-        const uploadParams = {
-            Bucket: config.bucket,
-            Key: fileKey,
-            Body: fileStream,
-            ContentLength: fs.statSync(file).size,
-            ContentType: mimeType ?? "application/octet-stream",
-        };
-        const cmd = new client_s3_1.PutObjectCommand(uploadParams);
-        const digest = (0, md5_1.default)(fileStream);
-        cmd.middlewareStack.add((next) => async (args) => {
-            args.request.headers["if-none-match"] = `"${digest}"`;
-            return await next(args);
-        }, {
-            step: "build",
-            name: "addETag",
-        });
-        try {
-            const data = await S3.send(cmd);
-            console.log(`R2 Success - ${file}`);
-            map.set(file, data);
-            const fileUrl = await (0, s3_request_presigner_1.getSignedUrl)(S3, cmd);
-            urls[file] = fileUrl;
-        }
-        catch (err) {
-            const error = err;
-            if (error["$metadata"]) {
-                if (error.$metadata.httpStatusCode !== 412)
-                    // If-None-Match
-                    throw error;
-            }
-        }
-        return;
-    }));
-    return urls;
-};
-async function uploadDirectory({ sourceDir, fileList, destinationDir, uploadBucket, }) {
-    let config = {
-        accountId: process.env.R2_ACCOUNT_ID,
-        accessKeyId: process.env.R2_ACCESS_KEY_ID,
-        secretAccessKey: process.env.R2_SECRET_ACCESS_KEY,
-        bucket: uploadBucket,
-        sourceDir,
-        destinationDir,
-        fileList,
-    };
-    const uploadedFiles = await run(config);
-    return uploadedFiles;
-}
-exports.uploadDirectory = uploadDirectory;