bdy 1.12.12-dev-pipeline-run → 1.13.0-dev

package/distTs/src/unitTest/ci.js

@@ -1,9 +1,13 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getCiInfo = getCiInfo;
-const ciInfo_1 = require("../types/ciInfo");
-const ci_1 = require("../visualTest/ci");
+const ci_info_1 = require("@buddy-works/ci-info");
+const ci_info_2 = require("@buddy-works/ci-info");
 const uuid_1 = require("uuid");
+const output_1 = __importDefault(require("../output"));
 function getGithubRefType() {
     const ref = process.env.GITHUB_REF || '';
     if (ref.startsWith('refs/heads/')) {
@@ -52,7 +56,7 @@ async function getCiInfo() {
     const isGithubAction = process.env.GITHUB_ACTIONS === 'true';
     const isCircleCI = process.env.CIRCLECI === 'true';
     if (isBuddy) {
-        const ciProvider = ciInfo_1.CI.BUDDY;
+        const ciProvider = ci_info_1.CI.BUDDY;
         const refType = process.env.BUDDY_RUN_REF_TYPE || '';
         const refName = process.env.BUDDY_RUN_REF || '';
         const buildId = process.env.BUDDY_RUN_HASH || '';
@@ -66,7 +70,7 @@ async function getCiInfo() {
         };
     }
     if (isGithubAction) {
-        const ciProvider = ciInfo_1.CI.GITHUB_ACTION;
+        const ciProvider = ci_info_1.CI.GITHUB_ACTION;
         const refType = getGithubRefType();
         const refName = process.env.GITHUB_REF_NAME || '';
         const buildId = process.env.GITHUB_RUN_ID || '';
@@ -80,7 +84,7 @@ async function getCiInfo() {
         };
     }
     if (isCircleCI) {
-        const ciProvider = ciInfo_1.CI.CIRCLE_CI;
+        const ciProvider = ci_info_1.CI.CIRCLE_CI;
         const refType = getCircleRefType();
         const refName = getCircleRefName();
         const buildId = process.env.CIRCLE_BUILD_NUM || '';
@@ -93,11 +97,11 @@ async function getCiInfo() {
             toRevision,
         };
     }
-    const ciProvider = ciInfo_1.CI.NONE;
+    const ciProvider = ci_info_1.CI.NONE;
     const refType = 'BRANCH';
-    const refName = (await (0, ci_1.getBranchName)()) || '';
+    const refName = (await (0, ci_info_2.getBranchName)({ logger: output_1.default.warning })) || '';
     const buildId = (0, uuid_1.v4)();
-    const toRevision = (await (0, ci_1.getCommitHash)()) || '';
+    const toRevision = (await (0, ci_info_2.getCommitHash)({ logger: output_1.default.warning })) || '';
     return {
         ciProvider,
         refType,

package/distTs/src/utils.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : 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 __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };

package/distTs/src/visualTest/context.js

@@ -5,8 +5,8 @@ exports.setExecOptions = setExecOptions;
 exports.setBrowserPath = setBrowserPath;
 exports.setCiAndCommitInfo = setCiAndCommitInfo;
 const uuid_1 = require("uuid");
-const ciInfo_1 = require("../types/ciInfo");
 const utils_1 = require("../utils");
+const ci_info_1 = require("@buddy-works/ci-info");
 exports.cliVersion = (0, utils_1.getVersion)();
 exports.oneByOne = false;
 exports.skipDiscovery = false;
@@ -15,7 +15,7 @@ exports.token = process.env.BUDDY_VT_TOKEN || '';
 exports.buildId = process.env.SNAPSHOTS_BUILD_ID || (0, uuid_1.v4)();
 exports.cliId = (0, uuid_1.v4)();
 exports.defaultTimeout = Number(process.env.SNAPSHOTS_DEFAULT_TIMEOUT) || 60_000;
-exports.ci = ciInfo_1.CI.NONE;
+exports.ci = ci_info_1.CI.NONE;
 exports.debug = process.env.DEBUG === '1';
 function setExecOptions(options) {
     if (options.oneByOne) {
@@ -39,14 +39,14 @@ function setCiAndCommitInfo(ciInfo) {
     exports.commit = ciInfo.commit;
     exports.baseCommit = ciInfo.baseCommit;
     exports.commitDetails = ciInfo.commitDetails;
-    if (ciInfo.ci === ciInfo_1.CI.BUDDY) {
+    if (ciInfo.ci === ci_info_1.CI.BUDDY) {
         exports.pipelineId = ciInfo.pipelineId;
         exports.actionId = ciInfo.actionId;
         exports.executionId = ciInfo.executionId;
         exports.invokerId = ciInfo.invokerId;
         exports.pipelineName = ciInfo.pipelineName;
     }
-    if (ciInfo.ci === ciInfo_1.CI.GITHUB_ACTION || ciInfo.ci === ciInfo_1.CI.CIRCLE_CI) {
+    if (ciInfo.ci === ci_info_1.CI.GITHUB_ACTION || ciInfo.ci === ci_info_1.CI.CIRCLE_CI) {
         exports.executionUrl = ciInfo.executionUrl;
     }
 }

package/distTs/src/visualTest/exec.js

@@ -4,7 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.testExec = testExec;
-exports.gitExec = gitExec;
 const cross_spawn_1 = require("cross-spawn");
 const output_1 = __importDefault(require("../output"));
 const texts_1 = require("../texts");
@@ -26,26 +25,3 @@ function testExec(command, arguments_) {
         });
     });
 }
-function gitExec(arguments_) {
-    return new Promise((resolve, reject) => {
-        const process = (0, cross_spawn_1.spawn)('git', arguments_, {
-            stdio: ['ignore', 'pipe', 'pipe'],
-        });
-        let errorOutput = '';
-        let output = '';
-        process.stdout.on('data', (message) => {
-            output += message;
-        });
-        process.stderr.on('data', (message) => {
-            errorOutput += message;
-        });
-        process.on('close', (code) => {
-            if (code === 0) {
-                resolve(output);
-            }
-            else {
-                reject(errorOutput);
-            }
-        });
-    });
-}

package/distTs/src/visualTest/resources.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : 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 __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -176,7 +186,7 @@ async function scrapeResources({ url, devices, resourceDiscoveryTimeout, cookies
             try {
                 if ((status < 300 || status > 399) &&
                     !contentType.startsWith('text/html')) {
-                    body = new Blob([await response.buffer()]);
+                    body = new Blob([new Uint8Array(await response.buffer())]);
                 }
             }
             catch (error) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bdy",
   "preferGlobal": false,
-  "version": "1.12.12-dev-pipeline-run",
+  "version": "1.13.0-dev",
   "type": "commonjs",
   "license": "MIT",
   "scripts": {
@@ -17,15 +17,16 @@
     "bdy": "distTs/bin/cli.js"
   },
   "dependencies": {
+    "@buddy-works/ci-info": "1.0.5",
     "@fastify/accept-negotiator": "1.1.0",
     "@fastify/cors": "9.0.1",
     "@puppeteer/browsers": "2.4.0",
     "@xhmikosr/decompress": "10.0.1",
     "basic-auth": "2.0.1",
     "chalk": "4.1.2",
-    "cookie": "1.0.2",
     "commander": "12.1.0",
     "content-disposition": "0.5.4",
+    "cookie": "1.0.2",
     "cross-spawn": "7.0.6",
     "eventsource": "4.0.0",
     "fastify": "4.28.1",
@@ -60,32 +61,32 @@
     "@rollup/plugin-node-resolve": "15.3.0",
     "@rollup/plugin-replace": "6.0.1",
     "@stylistic/eslint-plugin-js": "2.9.0",
+    "@types/basic-auth": "1.1.8",
+    "@types/content-disposition": "0.5.4",
     "@types/cross-spawn": "6.0.6",
     "@types/eslint__js": "8.42.3",
+    "@types/jsonwebtoken": "9.0.2",
+    "@types/mime-db": "1.43.6",
+    "@types/mime-types": "2.1.4",
+    "@types/netmask": "2.0.5",
+    "@types/node-forge": "1.3.1",
+    "@types/path-is-inside": "1.0.2",
     "@types/picomatch": "4.0.2",
     "@types/punycode": "2.1.4",
-    "@types/netmask": "2.0.5",
+    "@types/range-parser": "1.2.1",
     "@types/ssh2": "1.15.5",
     "@types/tar-stream": "3.1.3",
     "@types/terminal-kit": "2.5.6",
     "@types/uuid": "10.0.0",
     "@types/which": "3.0.4",
     "@types/ws": "8.18.0",
-    "@types/jsonwebtoken": "9.0.2",
-    "@types/mime-db": "1.43.6",
-    "@types/basic-auth": "1.1.8",
-    "@types/path-is-inside": "1.0.2",
-    "@types/range-parser": "1.2.1",
-    "@types/content-disposition": "0.5.4",
-    "@types/mime-types": "2.1.4",
-    "@types/node-forge": "1.3.1",
     "eslint": "9.13.0",
     "eslint-config-prettier": "9.1.0",
     "globals": "15.11.0",
     "prettier": "3.3.3",
     "rollup": "4.24.2",
     "rollup-plugin-natives": "0.7.8",
-    "typescript": "5.6.3",
+    "typescript": "5.9.3",
     "typescript-eslint": "8.11.0"
   }
 }