@sitecore-jss/sitecore-jss-dev-tools 22.4.0-canary.14 → 22.4.0-canary.16

package/dist/cjs/package-deploy.js

@@ -17,17 +17,17 @@ exports.normalizeFingerprint = normalizeFingerprint;
 exports.doFingerprintsMatch = doFingerprintsMatch;
 exports.finishWatchJobStatusTask = finishWatchJobStatusTask;
 exports.logJobStatus = logJobStatus;
+exports.watchJobStatus = watchJobStatus;
 exports.packageDeploy = packageDeploy;
-exports.extractProxy = extractProxy;
-exports.getHttpsTransport = getHttpsTransport;
+exports.setProxy = setProxy;
+exports.attachFormDataHandlers = attachFormDataHandlers;
 const chalk_1 = __importDefault(require("chalk"));
 const fs_1 = __importDefault(require("fs"));
 const https_1 = __importDefault(require("https"));
+const http_1 = __importDefault(require("http"));
 const path_1 = __importDefault(require("path"));
 const form_data_1 = __importDefault(require("form-data"));
 const digest_1 = require("./digest");
-const sitecore_jss_1 = require("@sitecore-jss/sitecore-jss");
-const undici_1 = require("undici");
 // Node does not use system level trusted CAs. This causes issues because SIF likes to install
 // using a Windows trusted CA - so SSL connections to Sitecore will fail from Node.
 // If the options.acceptCertificate is passed, we disable normal SSL validation and use this function
@@ -139,79 +139,102 @@ function watchJobStatus(options, taskName) {
         const warnings = [];
         const factors = [options.appName, taskName, `${options.importServiceUrl}/status`];
         const mac = (0, digest_1.hmac)(factors, options.secret);
-        const requestBaseOptions = {
+        const url = new URL(`${options.importServiceUrl}/status?appName=${options.appName}&jobName=${taskName}&after=${logOffset}`);
+        const isHttps = options.importServiceUrl.startsWith('https');
+        const client = isHttps ? https_1.default : http_1.default;
+        const reqOptions = {
             headers: {
                 'User-Agent': 'Sitecore/JSS-Import',
                 'Cache-Control': 'no-cache',
                 'X-JSS-Auth': mac,
             },
-            dispatcher: new undici_1.ProxyAgent({
-                uri: options.proxy || '',
-                maxRedirections: 0,
-                connect: {
+            method: 'GET',
+            hostname: url.hostname,
+            protocol: url.protocol,
+            path: url.pathname + url.search,
+            agent: isHttps
+                ? new https_1.default.Agent({
+                    // we turn off normal CA cert validation when we are whitelisting a single cert thumbprint
                     rejectUnauthorized: options.acceptCertificate ? false : true,
+                    // needed to allow whitelisting a cert thumbprint if a connection is reused
                     maxCachedSessions: options.acceptCertificate ? 0 : undefined,
-                },
-            }),
+                })
+                : undefined,
         };
         if (options.debugSecurity) {
             console.log(`Deployment status security factors: ${factors}`);
             console.log(`Deployment status HMAC: ${mac}`);
         }
-        return new Promise((resolve, reject) => {
-            /**
-             * Send job status request
-             */
-            function sendJobStatusRequest() {
-                new sitecore_jss_1.NativeDataFetcher()
-                    .get(`${options.importServiceUrl}/status?appName=${options.appName}&jobName=${taskName}&after=${logOffset}`, requestBaseOptions)
-                    .then((response) => {
-                    const body = response.data;
-                    try {
-                        const { state, messages } = body.data;
-                        messages.forEach((entry) => {
-                            logOffset++;
-                            const entryBits = /^(\[([A-Z]+)\] )?(.+)/.exec(entry);
-                            let entryLevel = 'INFO';
-                            let message = entry;
-                            if (entryBits && entryBits[2]) {
-                                entryLevel = entryBits[2];
-                                // 3 = '[] ' in say [INFO] My log message
-                                // we're not using the capture group as the message might be multi-line
-                                message = entry.substring(entryLevel.length + 3);
-                            }
-                            if (message.startsWith('[JSS] - ')) {
-                                message = message.substring(8);
-                            }
-                            logJobStatus({ message, entryLevel, warnings, errors });
-                        });
-                        if (state === 'Finished') {
-                            finishWatchJobStatusTask({ warnings, errors, resolve, reject });
-                            return;
-                        }
-                        setTimeout(sendJobStatusRequest, 1000);
-                    }
-                    catch (error) {
-                        console.error(chalk_1.default.red(`Unexpected error processing reply from import status service: ${error}`));
-                        console.error(chalk_1.default.red(`Response: ${body}`));
-                        console.error(chalk_1.default.red('Consult the Sitecore logs for details.'));
-                        reject(error);
-                    }
-                })
-                    .catch((error) => {
+        if (options.proxy) {
+            setProxy(reqOptions, options.proxy, options.importServiceUrl);
+        }
+        const req = client.request(reqOptions);
+        if (isHttps) {
+            applyCertPinning(req, options);
+        }
+        let responseData = '';
+        req.on('response', (res) => {
+            if (res.statusCode !== 200) {
+                let errorData = '';
+                res.on('data', (chunk) => {
+                    errorData += chunk;
+                });
+                res.on('end', () => {
                     console.error(chalk_1.default.red('Unexpected response from import status service. The import task is probably still running; check the Sitecore logs for details.'));
-                    if (error.response) {
-                        console.error(chalk_1.default.red(`Status message: ${error.response.statusText}`));
-                        console.error(chalk_1.default.red(`Status: ${error.response.status}`));
-                    }
-                    else {
-                        console.error(chalk_1.default.red(error.message));
-                    }
-                    reject();
+                    console.error(chalk_1.default.red(`Status message: ${res.statusMessage}`));
+                    console.error(chalk_1.default.red(`Status: ${res.statusCode}`));
+                    process.exit(1);
                 });
+                return;
             }
-            setTimeout(sendJobStatusRequest, 1000);
+            res.on('error', (err) => {
+                console.error(chalk_1.default.red('Unexpected response from import status service. The import task is probably still running; check the Sitecore logs for details.'));
+                console.error(chalk_1.default.red(`Status message: ${err.message}`));
+                console.error(chalk_1.default.red(`Status: ${res.statusCode}`));
+                process.exit(1);
+            });
+            res.on('data', (chunk) => {
+                responseData += chunk;
+            });
+            res.on('end', () => {
+                try {
+                    const body = JSON.parse(responseData);
+                    const { state, messages } = body;
+                    messages.forEach((entry) => {
+                        logOffset++;
+                        const entryBits = /^(\[([A-Z]+)\] )?(.+)/.exec(entry);
+                        let entryLevel = 'INFO';
+                        let message = entry;
+                        if (entryBits && entryBits[2]) {
+                            entryLevel = entryBits[2];
+                            // 3 = '[] ' in say [INFO] My log message
+                            // we're not using the capture group as the message might be multi-line
+                            message = entry.substring(entryLevel.length + 3);
+                        }
+                        if (message.startsWith('[JSS] - ')) {
+                            message = message.substring(8);
+                        }
+                        logJobStatus({ message, entryLevel, warnings, errors });
+                    });
+                    if (state === 'Finished') {
+                        finishWatchJobStatusTask({ warnings, errors, resolve: () => { }, reject: () => { } });
+                        return;
+                    }
+                    setTimeout(() => watchJobStatus(options, taskName), 1000);
+                }
+                catch (error) {
+                    console.error(chalk_1.default.red(`Unexpected error processing reply from import status service: ${error}`));
+                    console.error(chalk_1.default.red(`Response: ${responseData}`));
+                    console.error(chalk_1.default.red('Consult the Sitecore logs for details.'));
+                    process.exit(1);
+                }
+            });
         });
+        req.on('error', (err) => {
+            console.error(chalk_1.default.red(`Request error: ${err.message}`));
+            process.exit(1);
+        });
+        req.end();
     });
 }
 /**
@@ -225,7 +248,7 @@ function packageDeploy(options) {
         if (options.secret.length < 32) {
             throw new Error('Deployment secret was too short. Use a RANDOM (not words or phrases) secret at least 32 characters long.');
         }
-        let packageFile = null;
+        let packageFile = '';
         fs_1.default.readdirSync(options.packagePath).forEach((file) => {
             if (file.startsWith(options.appName) && file.endsWith('.manifest.zip')) {
                 packageFile = path_1.default.join(options.packagePath, file);
@@ -242,58 +265,83 @@ function packageDeploy(options) {
             console.log(`Deployment HMAC: ${(0, digest_1.hmac)(factors, options.secret)}`);
         }
         const formData = new form_data_1.default();
-        formData.append('path', fs_1.default.createReadStream(packageFile));
+        const fileStream = fs_1.default.createReadStream(packageFile);
+        const url = new URL(options.importServiceUrl);
         formData.append('appName', options.appName);
-        const requestBaseOptions = {
+        formData.append('path', fileStream);
+        const isHttps = options.importServiceUrl.startsWith('https');
+        const client = isHttps ? https_1.default : http_1.default;
+        const reqOptions = {
             headers: Object.assign({ 'User-Agent': 'Sitecore/JSS-Import', 'Cache-Control': 'no-cache', 'X-JSS-Auth': (0, digest_1.hmac)(factors, options.secret) }, formData.getHeaders()),
-            dispatcher: new undici_1.ProxyAgent({
-                uri: options.proxy ? options.proxy : '',
-                maxRedirections: 0,
-                connect: {
+            method: 'POST',
+            hostname: url.hostname,
+            protocol: url.protocol,
+            path: url.pathname,
+            agent: isHttps
+                ? new https_1.default.Agent({
                     // we turn off normal CA cert validation when we are whitelisting a single cert thumbprint
                     rejectUnauthorized: options.acceptCertificate ? false : true,
                     // needed to allow whitelisting a cert thumbprint if a connection is reused
                     maxCachedSessions: options.acceptCertificate ? 0 : undefined,
-                },
-            }),
+                })
+                : undefined,
         };
-        console.log(`Sending package ${packageFile} to ${options.importServiceUrl}...`);
-        return new Promise((resolve, reject) => {
-            new sitecore_jss_1.NativeDataFetcher()
-                .post(options.importServiceUrl, formData, requestBaseOptions)
-                .then((response) => {
-                const body = response.data;
-                console.log(chalk_1.default.green(`Sitecore has accepted import task ${body}`));
-                resolve(body);
-            })
-                .catch((error) => {
-                console.error(chalk_1.default.red('Unexpected response from import service:'));
-                if (error.response) {
-                    console.error(chalk_1.default.red(`Status message: ${error.response.statusText}`));
-                    console.error(chalk_1.default.red(`Status: ${error.response.status}`));
-                }
-                else {
-                    console.error(chalk_1.default.red(error.message));
-                }
-                reject();
+        if (options.proxy) {
+            setProxy(reqOptions, options.proxy, options.importServiceUrl);
+        }
+        const req = client.request(reqOptions);
+        if (https_1.default) {
+            applyCertPinning(req, options);
+        }
+        attachFormDataHandlers(req, formData);
+        formData.pipe(req);
+        req.on('response', (res) => {
+            if (res.statusCode !== 200) {
+                let errorData = '';
+                res.on('data', (chunk) => {
+                    errorData += chunk;
+                });
+                res.on('end', () => {
+                    console.error(chalk_1.default.red(`Error while uploading package: ${res.statusCode} ${res.statusMessage}`));
+                    console.error(chalk_1.default.red(errorData));
+                    process.exit(1);
+                });
+                return;
+            }
+            let responseData = '';
+            res.on('error', (err) => {
+                console.error(chalk_1.default.red(`Response error when uploading package: ${err.message}`));
+                process.exit(1);
+            });
+            res.on('data', (chunk) => {
+                responseData += chunk;
             });
-        }).then((taskName) => watchJobStatus(options, taskName));
+            res.on('end', () => {
+                const taskName = responseData;
+                console.log('we are in packageDeploy', responseData);
+                console.log(chalk_1.default.green(`Package uploaded. Import task name: ${taskName}`));
+                watchJobStatus(options, taskName);
+            });
+        });
+        req.on('error', (err) => {
+            console.error(chalk_1.default.red(`Error while uploading package: ${err.message}`));
+            process.exit(1);
+        });
     });
 }
 /**
  * Creates valid proxy object
- * @param {string} [proxy] proxy url
+ * @param {RequestOptions} reqOptions
+ * @param {string} proxy proxy url
+ * @param {string} targetUrl target url
  */
-function extractProxy(proxy) {
-    if (!proxy)
-        return undefined;
+function setProxy(reqOptions, proxy, targetUrl) {
     try {
         const proxyUrl = new URL(proxy);
-        return {
-            protocol: proxyUrl.protocol.slice(0, -1),
-            host: proxyUrl.hostname,
-            port: +proxyUrl.port,
-        };
+        reqOptions.hostname = proxyUrl.hostname;
+        reqOptions.port = proxyUrl.port || (proxyUrl.protocol === 'https:' ? '443' : '80');
+        reqOptions.protocol = proxyUrl.protocol;
+        reqOptions.path = targetUrl;
     }
     catch (error) {
         console.error(chalk_1.default.red(`Invalid proxy url provided ${proxy}`));
@@ -301,13 +349,24 @@ function extractProxy(proxy) {
     }
 }
 /**
- * Provides way to customize request adapter
- * @param {PackageDeployOptions} options
+ * Attach form data handlers to handle errors and close events
+ * @param {ClientRequest} req request object
+ * @param {FormData} formData FormData object
  */
-function getHttpsTransport(options) {
-    return Object.assign(Object.assign({}, https_1.default), { request: (reqOptions, callback) => {
-            const req = https_1.default.request(Object.assign({}, reqOptions), callback);
-            applyCertPinning(req, options);
-            return req;
-        } });
+function attachFormDataHandlers(req, formData) {
+    let ended = false;
+    let errored = false;
+    formData.on('end', () => {
+        ended = true;
+    });
+    formData.once('error', (err) => {
+        errored = true;
+        console.log('Error when uploading package:', err);
+        req.destroy(err);
+    });
+    formData.on('close', () => {
+        if (!ended && !errored) {
+            new Error('Request stream has been aborted');
+        }
+    });
 }

package/dist/esm/package-deploy.js

@@ -10,11 +10,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import chalk from 'chalk';
 import fs from 'fs';
 import https from 'https';
+import http from 'http';
 import path from 'path';
 import FormData from 'form-data';
 import { digest, hmac } from './digest';
-import { NativeDataFetcher } from '@sitecore-jss/sitecore-jss';
-import { ProxyAgent } from 'undici';
 // Node does not use system level trusted CAs. This causes issues because SIF likes to install
 // using a Windows trusted CA - so SSL connections to Sitecore will fail from Node.
 // If the options.acceptCertificate is passed, we disable normal SSL validation and use this function
@@ -119,86 +118,109 @@ export function logJobStatus({ message, entryLevel, warnings, errors, }) {
  * @param {PackageDeployOptions} options
  * @param {string} taskName
  */
-function watchJobStatus(options, taskName) {
+export function watchJobStatus(options, taskName) {
     return __awaiter(this, void 0, void 0, function* () {
         let logOffset = 0;
         const errors = [];
         const warnings = [];
         const factors = [options.appName, taskName, `${options.importServiceUrl}/status`];
         const mac = hmac(factors, options.secret);
-        const requestBaseOptions = {
+        const url = new URL(`${options.importServiceUrl}/status?appName=${options.appName}&jobName=${taskName}&after=${logOffset}`);
+        const isHttps = options.importServiceUrl.startsWith('https');
+        const client = isHttps ? https : http;
+        const reqOptions = {
             headers: {
                 'User-Agent': 'Sitecore/JSS-Import',
                 'Cache-Control': 'no-cache',
                 'X-JSS-Auth': mac,
             },
-            dispatcher: new ProxyAgent({
-                uri: options.proxy || '',
-                maxRedirections: 0,
-                connect: {
+            method: 'GET',
+            hostname: url.hostname,
+            protocol: url.protocol,
+            path: url.pathname + url.search,
+            agent: isHttps
+                ? new https.Agent({
+                    // we turn off normal CA cert validation when we are whitelisting a single cert thumbprint
                     rejectUnauthorized: options.acceptCertificate ? false : true,
+                    // needed to allow whitelisting a cert thumbprint if a connection is reused
                     maxCachedSessions: options.acceptCertificate ? 0 : undefined,
-                },
-            }),
+                })
+                : undefined,
         };
         if (options.debugSecurity) {
             console.log(`Deployment status security factors: ${factors}`);
             console.log(`Deployment status HMAC: ${mac}`);
         }
-        return new Promise((resolve, reject) => {
-            /**
-             * Send job status request
-             */
-            function sendJobStatusRequest() {
-                new NativeDataFetcher()
-                    .get(`${options.importServiceUrl}/status?appName=${options.appName}&jobName=${taskName}&after=${logOffset}`, requestBaseOptions)
-                    .then((response) => {
-                    const body = response.data;
-                    try {
-                        const { state, messages } = body.data;
-                        messages.forEach((entry) => {
-                            logOffset++;
-                            const entryBits = /^(\[([A-Z]+)\] )?(.+)/.exec(entry);
-                            let entryLevel = 'INFO';
-                            let message = entry;
-                            if (entryBits && entryBits[2]) {
-                                entryLevel = entryBits[2];
-                                // 3 = '[] ' in say [INFO] My log message
-                                // we're not using the capture group as the message might be multi-line
-                                message = entry.substring(entryLevel.length + 3);
-                            }
-                            if (message.startsWith('[JSS] - ')) {
-                                message = message.substring(8);
-                            }
-                            logJobStatus({ message, entryLevel, warnings, errors });
-                        });
-                        if (state === 'Finished') {
-                            finishWatchJobStatusTask({ warnings, errors, resolve, reject });
-                            return;
-                        }
-                        setTimeout(sendJobStatusRequest, 1000);
-                    }
-                    catch (error) {
-                        console.error(chalk.red(`Unexpected error processing reply from import status service: ${error}`));
-                        console.error(chalk.red(`Response: ${body}`));
-                        console.error(chalk.red('Consult the Sitecore logs for details.'));
-                        reject(error);
-                    }
-                })
-                    .catch((error) => {
+        if (options.proxy) {
+            setProxy(reqOptions, options.proxy, options.importServiceUrl);
+        }
+        const req = client.request(reqOptions);
+        if (isHttps) {
+            applyCertPinning(req, options);
+        }
+        let responseData = '';
+        req.on('response', (res) => {
+            if (res.statusCode !== 200) {
+                let errorData = '';
+                res.on('data', (chunk) => {
+                    errorData += chunk;
+                });
+                res.on('end', () => {
                     console.error(chalk.red('Unexpected response from import status service. The import task is probably still running; check the Sitecore logs for details.'));
-                    if (error.response) {
-                        console.error(chalk.red(`Status message: ${error.response.statusText}`));
-                        console.error(chalk.red(`Status: ${error.response.status}`));
-                    }
-                    else {
-                        console.error(chalk.red(error.message));
-                    }
-                    reject();
+                    console.error(chalk.red(`Status message: ${res.statusMessage}`));
+                    console.error(chalk.red(`Status: ${res.statusCode}`));
+                    process.exit(1);
                 });
+                return;
             }
-            setTimeout(sendJobStatusRequest, 1000);
+            res.on('error', (err) => {
+                console.error(chalk.red('Unexpected response from import status service. The import task is probably still running; check the Sitecore logs for details.'));
+                console.error(chalk.red(`Status message: ${err.message}`));
+                console.error(chalk.red(`Status: ${res.statusCode}`));
+                process.exit(1);
+            });
+            res.on('data', (chunk) => {
+                responseData += chunk;
+            });
+            res.on('end', () => {
+                try {
+                    const body = JSON.parse(responseData);
+                    const { state, messages } = body;
+                    messages.forEach((entry) => {
+                        logOffset++;
+                        const entryBits = /^(\[([A-Z]+)\] )?(.+)/.exec(entry);
+                        let entryLevel = 'INFO';
+                        let message = entry;
+                        if (entryBits && entryBits[2]) {
+                            entryLevel = entryBits[2];
+                            // 3 = '[] ' in say [INFO] My log message
+                            // we're not using the capture group as the message might be multi-line
+                            message = entry.substring(entryLevel.length + 3);
+                        }
+                        if (message.startsWith('[JSS] - ')) {
+                            message = message.substring(8);
+                        }
+                        logJobStatus({ message, entryLevel, warnings, errors });
+                    });
+                    if (state === 'Finished') {
+                        finishWatchJobStatusTask({ warnings, errors, resolve: () => { }, reject: () => { } });
+                        return;
+                    }
+                    setTimeout(() => watchJobStatus(options, taskName), 1000);
+                }
+                catch (error) {
+                    console.error(chalk.red(`Unexpected error processing reply from import status service: ${error}`));
+                    console.error(chalk.red(`Response: ${responseData}`));
+                    console.error(chalk.red('Consult the Sitecore logs for details.'));
+                    process.exit(1);
+                }
+            });
         });
+        req.on('error', (err) => {
+            console.error(chalk.red(`Request error: ${err.message}`));
+            process.exit(1);
+        });
+        req.end();
     });
 }
 /**
@@ -212,7 +234,7 @@ export function packageDeploy(options) {
         if (options.secret.length < 32) {
             throw new Error('Deployment secret was too short. Use a RANDOM (not words or phrases) secret at least 32 characters long.');
         }
-        let packageFile = null;
+        let packageFile = '';
         fs.readdirSync(options.packagePath).forEach((file) => {
             if (file.startsWith(options.appName) && file.endsWith('.manifest.zip')) {
                 packageFile = path.join(options.packagePath, file);
@@ -229,58 +251,83 @@ export function packageDeploy(options) {
             console.log(`Deployment HMAC: ${hmac(factors, options.secret)}`);
         }
         const formData = new FormData();
-        formData.append('path', fs.createReadStream(packageFile));
+        const fileStream = fs.createReadStream(packageFile);
+        const url = new URL(options.importServiceUrl);
         formData.append('appName', options.appName);
-        const requestBaseOptions = {
+        formData.append('path', fileStream);
+        const isHttps = options.importServiceUrl.startsWith('https');
+        const client = isHttps ? https : http;
+        const reqOptions = {
             headers: Object.assign({ 'User-Agent': 'Sitecore/JSS-Import', 'Cache-Control': 'no-cache', 'X-JSS-Auth': hmac(factors, options.secret) }, formData.getHeaders()),
-            dispatcher: new ProxyAgent({
-                uri: options.proxy ? options.proxy : '',
-                maxRedirections: 0,
-                connect: {
+            method: 'POST',
+            hostname: url.hostname,
+            protocol: url.protocol,
+            path: url.pathname,
+            agent: isHttps
+                ? new https.Agent({
                     // we turn off normal CA cert validation when we are whitelisting a single cert thumbprint
                     rejectUnauthorized: options.acceptCertificate ? false : true,
                     // needed to allow whitelisting a cert thumbprint if a connection is reused
                     maxCachedSessions: options.acceptCertificate ? 0 : undefined,
-                },
-            }),
+                })
+                : undefined,
         };
-        console.log(`Sending package ${packageFile} to ${options.importServiceUrl}...`);
-        return new Promise((resolve, reject) => {
-            new NativeDataFetcher()
-                .post(options.importServiceUrl, formData, requestBaseOptions)
-                .then((response) => {
-                const body = response.data;
-                console.log(chalk.green(`Sitecore has accepted import task ${body}`));
-                resolve(body);
-            })
-                .catch((error) => {
-                console.error(chalk.red('Unexpected response from import service:'));
-                if (error.response) {
-                    console.error(chalk.red(`Status message: ${error.response.statusText}`));
-                    console.error(chalk.red(`Status: ${error.response.status}`));
-                }
-                else {
-                    console.error(chalk.red(error.message));
-                }
-                reject();
+        if (options.proxy) {
+            setProxy(reqOptions, options.proxy, options.importServiceUrl);
+        }
+        const req = client.request(reqOptions);
+        if (https) {
+            applyCertPinning(req, options);
+        }
+        attachFormDataHandlers(req, formData);
+        formData.pipe(req);
+        req.on('response', (res) => {
+            if (res.statusCode !== 200) {
+                let errorData = '';
+                res.on('data', (chunk) => {
+                    errorData += chunk;
+                });
+                res.on('end', () => {
+                    console.error(chalk.red(`Error while uploading package: ${res.statusCode} ${res.statusMessage}`));
+                    console.error(chalk.red(errorData));
+                    process.exit(1);
+                });
+                return;
+            }
+            let responseData = '';
+            res.on('error', (err) => {
+                console.error(chalk.red(`Response error when uploading package: ${err.message}`));
+                process.exit(1);
+            });
+            res.on('data', (chunk) => {
+                responseData += chunk;
             });
-        }).then((taskName) => watchJobStatus(options, taskName));
+            res.on('end', () => {
+                const taskName = responseData;
+                console.log('we are in packageDeploy', responseData);
+                console.log(chalk.green(`Package uploaded. Import task name: ${taskName}`));
+                watchJobStatus(options, taskName);
+            });
+        });
+        req.on('error', (err) => {
+            console.error(chalk.red(`Error while uploading package: ${err.message}`));
+            process.exit(1);
+        });
     });
 }
 /**
  * Creates valid proxy object
- * @param {string} [proxy] proxy url
+ * @param {RequestOptions} reqOptions
+ * @param {string} proxy proxy url
+ * @param {string} targetUrl target url
  */
-export function extractProxy(proxy) {
-    if (!proxy)
-        return undefined;
+export function setProxy(reqOptions, proxy, targetUrl) {
     try {
         const proxyUrl = new URL(proxy);
-        return {
-            protocol: proxyUrl.protocol.slice(0, -1),
-            host: proxyUrl.hostname,
-            port: +proxyUrl.port,
-        };
+        reqOptions.hostname = proxyUrl.hostname;
+        reqOptions.port = proxyUrl.port || (proxyUrl.protocol === 'https:' ? '443' : '80');
+        reqOptions.protocol = proxyUrl.protocol;
+        reqOptions.path = targetUrl;
     }
     catch (error) {
         console.error(chalk.red(`Invalid proxy url provided ${proxy}`));
@@ -288,13 +335,24 @@ export function extractProxy(proxy) {
     }
 }
 /**
- * Provides way to customize request adapter
- * @param {PackageDeployOptions} options
+ * Attach form data handlers to handle errors and close events
+ * @param {ClientRequest} req request object
+ * @param {FormData} formData FormData object
  */
-export function getHttpsTransport(options) {
-    return Object.assign(Object.assign({}, https), { request: (reqOptions, callback) => {
-            const req = https.request(Object.assign({}, reqOptions), callback);
-            applyCertPinning(req, options);
-            return req;
-        } });
+export function attachFormDataHandlers(req, formData) {
+    let ended = false;
+    let errored = false;
+    formData.on('end', () => {
+        ended = true;
+    });
+    formData.once('error', (err) => {
+        errored = true;
+        console.log('Error when uploading package:', err);
+        req.destroy(err);
+    });
+    formData.on('close', () => {
+        if (!ended && !errored) {
+            new Error('Request stream has been aborted');
+        }
+    });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sitecore-jss/sitecore-jss-dev-tools",
-  "version": "22.4.0-canary.14",
+  "version": "22.4.0-canary.16",
   "description": "Utilities to assist in the development and deployment of Sitecore JSS apps.",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
@@ -33,7 +33,7 @@
   },
   "dependencies": {
     "@babel/parser": "^7.24.0",
-    "@sitecore-jss/sitecore-jss": "^22.4.0-canary.14",
+    "@sitecore-jss/sitecore-jss": "^22.4.0-canary.16",
     "chalk": "^4.1.2",
     "chokidar": "^3.6.0",
     "del": "^6.0.0",
@@ -50,7 +50,6 @@
     "recast": "^0.23.5",
     "resolve": "^1.22.1",
     "ts-node": "^10.9.1",
-    "undici": "^7.2.1",
     "url-join": "^4.0.1",
     "uuid": "^9.0.0",
     "yargs": "^17.6.2"
@@ -86,7 +85,7 @@
     "typescript": "~5.6.3"
   },
   "types": "types/index.d.ts",
-  "gitHead": "d07212049058fdd49b82f92715f88699eee350e8",
+  "gitHead": "61be81c2be989d2735a841f1792e32a4467ffe24",
   "files": [
     "dist",
     "types",

package/types/package-deploy.d.ts

@@ -1,5 +1,6 @@
-import https from 'https';
-import { ClientRequest, IncomingMessage } from 'http';
+import { RequestOptions } from 'https';
+import FormData from 'form-data';
+import { ClientRequest } from 'http';
 export interface PackageDeployOptions {
     packagePath: string;
     appName: string;
@@ -51,28 +52,23 @@ export declare function logJobStatus({ message, entryLevel, warnings, errors, }:
 }): void;
 /**
  * @param {PackageDeployOptions} options
+ * @param {string} taskName
  */
-export declare function packageDeploy(options: PackageDeployOptions): Promise<unknown>;
+export declare function watchJobStatus(options: PackageDeployOptions, taskName: string): Promise<void>;
+/**
+ * @param {PackageDeployOptions} options
+ */
+export declare function packageDeploy(options: PackageDeployOptions): Promise<void>;
 /**
  * Creates valid proxy object
- * @param {string} [proxy] proxy url
+ * @param {RequestOptions} reqOptions
+ * @param {string} proxy proxy url
+ * @param {string} targetUrl target url
  */
-export declare function extractProxy(proxy?: string): {
-    protocol: string;
-    host: string;
-    port: number;
-} | undefined;
+export declare function setProxy(reqOptions: RequestOptions, proxy: string, targetUrl: string): void;
 /**
- * Provides way to customize request adapter
- * @param {PackageDeployOptions} options
+ * Attach form data handlers to handle errors and close events
+ * @param {ClientRequest} req request object
+ * @param {FormData} formData FormData object
  */
-export declare function getHttpsTransport(options: PackageDeployOptions): {
-    request: (reqOptions: https.RequestOptions, callback: (res: IncomingMessage) => void) => ClientRequest;
-    createServer<Request extends typeof IncomingMessage = typeof IncomingMessage, Response extends typeof import("http").ServerResponse = typeof import("http").ServerResponse>(requestListener?: import("http").RequestListener<Request, Response>): https.Server<Request, Response>;
-    createServer<Request extends typeof IncomingMessage = typeof IncomingMessage, Response extends typeof import("http").ServerResponse = typeof import("http").ServerResponse>(options: https.ServerOptions<Request, Response>, requestListener?: import("http").RequestListener<Request, Response>): https.Server<Request, Response>;
-    get(options: https.RequestOptions | string | import("url").URL, callback?: (res: IncomingMessage) => void): ClientRequest;
-    get(url: string | import("url").URL, options: https.RequestOptions, callback?: (res: IncomingMessage) => void): ClientRequest;
-    Agent: typeof https.Agent;
-    Server: typeof https.Server;
-    globalAgent: https.Agent;
-};
+export declare function attachFormDataHandlers(req: ClientRequest, formData: FormData): void;