@percy/client 1.29.1-alpha.0 → 1.29.1-beta.0

package/dist/client.js

@@ -315,7 +315,7 @@ export class PercyClient {
   // Uploads a single resource to the active build. If `filepath` is provided,
   // `content` is read from the filesystem. The sha is optional and will be
   // created from `content` if one is not provided.
-  async uploadResource(buildId, snapshotId, {
+  async uploadResource(buildId, {
     url,
     sha,
     filepath,
@@ -329,7 +329,7 @@ export class PercyClient {
       }
     }
     let encodedContent = base64encode(content);
-    this.log.debug(`Uploading ${formatBytes(encodedContent.length)} resource for snapshotId ${snapshotId}: ${url}...`);
+    this.log.debug(`Uploading ${formatBytes(encodedContent.length)} resource: ${url}...`);
     this.mayBeLogUploadSize(encodedContent.length);
     return this.post(`builds/${buildId}/resources`, {
       data: {
@@ -343,12 +343,12 @@ export class PercyClient {
   }
 
   // Uploads resources to the active build concurrently, two at a time.
-  async uploadResources(buildId, snapshotId, resources) {
+  async uploadResources(buildId, resources) {
     validateId('build', buildId);
-    this.log.debug(`Uploading resources for BuildId: ${buildId} and SnapshotId: ${snapshotId}...`);
+    this.log.debug(`Uploading resources for ${buildId}...`);
     return pool(function* () {
       for (let resource of resources) {
-        yield this.uploadResource(buildId, snapshotId, resource);
+        yield this.uploadResource(buildId, resource);
       }
     }, this, 2);
   }
@@ -428,15 +428,12 @@ export class PercyClient {
   async sendSnapshot(buildId, options) {
     var _snapshot$data$relati, _snapshot$data$relati2;
     let snapshot = await this.createSnapshot(buildId, options);
-    let snapshotId = snapshot.data.id;
-    this.log.debug(`Created snapshot with Id: ${snapshotId}...`);
     let missing = (_snapshot$data$relati = snapshot.data.relationships) === null || _snapshot$data$relati === void 0 ? void 0 : (_snapshot$data$relati2 = _snapshot$data$relati['missing-resources']) === null || _snapshot$data$relati2 === void 0 ? void 0 : _snapshot$data$relati2.data;
-    this.log.debug(`Found ${missing === null || missing === void 0 ? void 0 : missing.length} missing resources for snapshotId: ${snapshotId}...`);
     if (missing !== null && missing !== void 0 && missing.length) {
       let resources = options.resources.reduce((acc, r) => Object.assign(acc, {
         [r.sha]: r
       }), {});
-      await this.uploadResources(buildId, snapshotId, missing.map(({
+      await this.uploadResources(buildId, missing.map(({
         id
       }) => resources[id]));
     }
@@ -538,7 +535,7 @@ export class PercyClient {
 
   // Convenience method for verifying if tile is present
   async verify(comparisonId, sha) {
-    let retries = 10;
+    let retries = 20;
     let success = null;
     do {
       await waitForTimeout(500);

package/dist/detect-proxy.js

@@ -0,0 +1,110 @@
+import { exec } from 'node:child_process';
+import { promisify } from 'node:util';
+import logger from '@percy/logger';
+export default class DetectProxy {
+  constructor() {
+    this.execPromise = promisify(exec);
+    this.platform = process.platform;
+    // There are sock proxies as well which we don't need
+    this.filter = ['HTTP', 'HTTPS'];
+  }
+  async getSystemProxy() {
+    if (this.platform === 'darwin') {
+      return await this.getProxyFromMac();
+    } else if (this.platform === 'win32') {
+      return await this.getProxyFromWindows();
+    } else if (this.platform !== 'linux') {
+      logger('client:detect-proxy').debug(`Not able to auto detect system proxy for ${this.platform} platform`);
+    }
+    return [];
+  }
+  async getProxyFromMac() {
+    // Sample output
+    /*
+        HTTPEnable : 1
+        HTTPProxy : proxy.example.com
+        HTTPPort : 8080
+        HTTPSEnable : 1
+        HTTPSProxy : secureproxy.example.com
+        HTTPSPort : 8443
+    */
+    const {
+      stdout
+    } = await this.execPromise('scutil --proxy');
+    const dictionary = {};
+    const lines = stdout.split('\n');
+    lines.forEach(line => {
+      let [key, value] = line.split(' : ');
+      if (key && value) {
+        key = key.trim();
+        value = value.trim();
+        if (key.endsWith('Enable')) {
+          dictionary[key] = value === '1';
+        } else if (key.endsWith('Port')) {
+          dictionary[key] = parseInt(value);
+        } else {
+          dictionary[key] = value;
+        }
+      }
+    });
+    const proxies = [];
+    for (const type of this.filter) {
+      if (dictionary[`${type}Enable`] && dictionary[`${type}Proxy`] && dictionary[`${type}Port`]) {
+        proxies.push({
+          type: type,
+          host: dictionary[`${type}Proxy`],
+          port: dictionary[`${type}Port`]
+        });
+      }
+    }
+    return proxies;
+  }
+  async getProxyFromWindows() {
+    // Sample output
+    /*
+        HKEY_CURRENT_USER\\Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings
+        User Agent    REG_SZ    Mozilla/4.0 (compatible; MSIE 8.0; Win32)
+        IE5_UA_Backup_Flag    REG_SZ    5.0
+        ZonesSecurityUpgrade    REG_BINARY    ABCD
+        EmailName    REG_SZ    User@
+        AutoConfigProxy    REG_SZ    wininet.dll
+        MimeExclusionListForCache    REG_SZ    multipart/mixed multipart/x-mixed-replace multipart/x-byteranges
+        WarnOnPost    REG_BINARY    01000000
+        UseSchannelDirectly    REG_BINARY    01000000
+        EnableHttp1_1    REG_DWORD    0x1
+        UrlEncoding    REG_DWORD    0x0
+        SecureProtocols    REG_DWORD    0xa0
+        PrivacyAdvanced    REG_DWORD    0x0
+        DisableCachingOfSSLPages    REG_DWORD    0x1
+        WarnonZoneCrossing    REG_DWORD    0x1
+        CertificateRevocation    REG_DWORD    0x1
+        EnableNegotiate    REG_DWORD    0x1
+        MigrateProxy    REG_DWORD    0x1
+        ProxyEnable    REG_DWORD    0x0
+    */
+    const {
+      stdout
+    } = await this.execPromise('reg query "HKCU\\Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings"');
+    const lines = stdout.split('\n');
+    const dictionary = {};
+    lines.forEach(line => {
+      const [key, type, value] = line.trim().split(/\s+/);
+      if (key && type && value) {
+        if (type === 'REG_DWORD') {
+          dictionary[key] = value === '0x1';
+        } else if (type === 'REG_SZ') {
+          dictionary[key] = value;
+        }
+      }
+    });
+    if (this.filter.includes('HTTP') && dictionary.ProxyEnable && dictionary.ProxyServer) {
+      const [host, port] = dictionary.ProxyServer.split(':');
+      return [{
+        type: 'HTTP',
+        host,
+        port: parseInt(port)
+      }];
+    }
+    return [];
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@percy/client",
-  "version": "1.29.1-alpha.0",
+  "version": "1.29.1-beta.0",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -9,7 +9,7 @@
   },
   "publishConfig": {
     "access": "public",
-    "tag": "alpha"
+    "tag": "beta"
   },
   "engines": {
     "node": ">=14"
@@ -23,6 +23,7 @@
   "exports": {
     ".": "./dist/index.js",
     "./utils": "./dist/utils.js",
+    "./detect-proxy": "./dist/detect-proxy.js",
     "./test/helpers": "./test/helpers.js"
   },
   "scripts": {
@@ -32,9 +33,9 @@
     "test:coverage": "yarn test --coverage"
   },
   "dependencies": {
-    "@percy/env": "1.29.1-alpha.0",
-    "@percy/logger": "1.29.1-alpha.0",
+    "@percy/env": "1.29.1-beta.0",
+    "@percy/logger": "1.29.1-beta.0",
     "pako": "^2.1.0"
   },
-  "gitHead": "5044adb5caa7507fdec629eda8f33d6ddde07997"
+  "gitHead": "d325b7bbe56764dbde494477d1f4f3bfdc562d6e"
 }