From cd7201de5ff5a7b04d6ea967a0947532a4bd6864 Mon Sep 17 00:00:00 2001 From: ErikJPM <99674090+ErikJPM@users.noreply.github.com> Date: Fri, 1 Dec 2023 11:44:55 +0100 Subject: [PATCH 1/3] Use Proxy config when available --- packages/sitevision-scripts/scripts/sign.js | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/packages/sitevision-scripts/scripts/sign.js b/packages/sitevision-scripts/scripts/sign.js index 59d098f3..d5e29f53 100644 --- a/packages/sitevision-scripts/scripts/sign.js +++ b/packages/sitevision-scripts/scripts/sign.js @@ -51,17 +51,20 @@ import chalk from 'chalk'; filename: fileName, contentType: 'application/octet-stream', }); - - try { - const response = await fetch(url, { - method: 'POST', - body: formData, - headers: formData.getHeaders({ + var options = { + method: 'POST', + body: formData, + headers: formData.getHeaders({ Authorization: `Basic ${Buffer.from( answers.username + ':' + answers.password ).toString('base64')}`, - }), - }); + } + if (process.env.HTTPS_PROXY) { + console.log(`using ${process.env.HTTPS_PROXY} as HTTPS_PROXY`) + options.agent = proxyAgent + } + try { + const response = await fetch(url, options); if (response.ok) { const signedFileNameAndPath = path.join( From 8cf99f829f5dd7b2b7e21f83a40ae41ce68c3524 Mon Sep 17 00:00:00 2001 From: ErikJPM <99674090+ErikJPM@users.noreply.github.com> Date: Fri, 1 Dec 2023 13:19:40 +0100 Subject: [PATCH 2/3] Require and configure ProxyAgent --- packages/sitevision-scripts/scripts/sign.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/sitevision-scripts/scripts/sign.js b/packages/sitevision-scripts/scripts/sign.js index d5e29f53..f5d7595f 100644 --- a/packages/sitevision-scripts/scripts/sign.js +++ b/packages/sitevision-scripts/scripts/sign.js @@ -28,7 +28,7 @@ import chalk from 'chalk'; const manifest = properties.getManifest(); const fileName = manifest.id + '.zip'; const zipPath = properties.DIST_DIR_PATH + '/' + fileName; - + if (!fs.existsSync(zipPath)) { console.log('You have to run "npm run build" before running this script'); return; @@ -61,6 +61,8 @@ import chalk from 'chalk'; } if (process.env.HTTPS_PROXY) { console.log(`using ${process.env.HTTPS_PROXY} as HTTPS_PROXY`) + const HttpsProxyAgent = require('https-proxy-agent'); + const proxyAgent = new HttpsProxyAgent(process.env.HTTPS_PROXY); options.agent = proxyAgent } try { From 7de13af29d52a375a4f7075b0e7626a657f30608 Mon Sep 17 00:00:00 2001 From: ErikJPM <99674090+ErikJPM@users.noreply.github.com> Date: Mon, 18 Dec 2023 15:10:41 +0100 Subject: [PATCH 3/3] run prettfier --- packages/sitevision-scripts/scripts/sign.js | 38 +++++++++++---------- 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/packages/sitevision-scripts/scripts/sign.js b/packages/sitevision-scripts/scripts/sign.js index f5d7595f..272717a0 100644 --- a/packages/sitevision-scripts/scripts/sign.js +++ b/packages/sitevision-scripts/scripts/sign.js @@ -28,7 +28,7 @@ import chalk from 'chalk'; const manifest = properties.getManifest(); const fileName = manifest.id + '.zip'; const zipPath = properties.DIST_DIR_PATH + '/' + fileName; - + if (!fs.existsSync(zipPath)) { console.log('You have to run "npm run build" before running this script'); return; @@ -52,26 +52,28 @@ import chalk from 'chalk'; contentType: 'application/octet-stream', }); var options = { - method: 'POST', - body: formData, - headers: formData.getHeaders({ - Authorization: `Basic ${Buffer.from( - answers.username + ':' + answers.password - ).toString('base64')}`, - } + method: 'POST', + body: formData, + headers: formData.getHeaders({ + Authorization: `Basic ${Buffer.from( + answers.username + ':' + answers.password, + ).toString('base64')}`, + }), + }; + if (process.env.HTTPS_PROXY) { - console.log(`using ${process.env.HTTPS_PROXY} as HTTPS_PROXY`) - const HttpsProxyAgent = require('https-proxy-agent'); - const proxyAgent = new HttpsProxyAgent(process.env.HTTPS_PROXY); - options.agent = proxyAgent - } + console.log(`using ${process.env.HTTPS_PROXY} as HTTPS_PROXY`); + const HttpsProxyAgent = require('https-proxy-agent'); + const proxyAgent = new HttpsProxyAgent(process.env.HTTPS_PROXY); + options.agent = proxyAgent; + } try { const response = await fetch(url, options); if (response.ok) { const signedFileNameAndPath = path.join( properties.DIST_DIR_PATH, - `${manifest.id}-signed.zip` + `${manifest.id}-signed.zip`, ); const writer = fs.createWriteStream(signedFileNameAndPath, { @@ -81,16 +83,16 @@ import chalk from 'chalk'; return console.log( `${chalk.green( - 'Signing successful, created:' - )} ${signedFileNameAndPath}` + 'Signing successful, created:', + )} ${signedFileNameAndPath}`, ); } if (response.status === 401) { console.log( `${chalk.red( - 'Signing failed:' - )} Unauthorized, check username and password` + 'Signing failed:', + )} Unauthorized, check username and password`, ); } } catch (err) {