From 58d9d133d70d107868791a7d3e93c80dbf808413 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20Fr=C3=B6hle?= <github@josef-froehle.de>
Date: Wed, 11 Dec 2024 17:33:50 +0100
Subject: [PATCH] Replace deprecated request with axios.

remove contributor list
---
 main/index.html | 113 +++++++++++++++++++++++++++---------------------
 package.json    |   5 ++-
 2 files changed, 67 insertions(+), 51 deletions(-)

diff --git a/main/index.html b/main/index.html
index 11acff2cf..4be542a14 100755
--- a/main/index.html
+++ b/main/index.html
@@ -36,7 +36,8 @@
 		const remote = require('@electron/remote');
 		const { dialog } = remote;
 		const fs = require('graceful-fs');
-		const request = require('request');
+		const FormData = require('form-data');
+		const axios = require('axios').default;
 		const http = require('http');
 		const path = require('path');
 		
@@ -627,43 +628,49 @@
 						url = defaultConversionServer;
 					}
 					
-					var req = request.post(url, function (err, resp, body) {
-						if (err) {
-							message('could not contact file conversion server', true);
+					const formData = new FormData();
+					formData.append('fileUpload', require('fs').readFileSync(file), {
+						filename: filename,
+						contentType: 'application/dxf'
+					});
+					formData.append('format', 'svg');
+
+					axios.post(url, formData.getBuffer(), {
+						headers: {
+							...formData.getHeaders(),
+						},
+						responseType: 'text'
+					}).then(resp => {
+						const body = resp.data;
+						if (body.substring(0, 5) == 'error') {
+							message(body, true);
 						} else {
-							if(body.substring(0, 5) == 'error'){
-								message(body, true);
-							}
-							else{
-								// expected input dimensions on server is points
-								// scale based on unit preferences
-								var con = null;
-								var dxfFlag = false;
-								if(ext.toLowerCase() == '.dxf'){
-									//var unit = config.getSync('units');
-									con = Number(config.getSync('dxfImportScale'));
-									dxfFlag = true;
-									console.log('con', con);
-									
-									/*if(unit == 'inch'){
-										con = 72;
-									}
-									else{
-										// mm
-										con = 2.83465;
-									}*/
+							// expected input dimensions on server is points
+							// scale based on unit preferences
+							var con = null;
+							var dxfFlag = false;
+							if (ext.toLowerCase() == '.dxf') {
+								//var unit = config.getSync('units');
+								con = Number(config.getSync('dxfImportScale'));
+								dxfFlag = true;
+								console.log('con', con);
+
+								/*if(unit == 'inch'){
+									con = 72;
 								}
-								
-								// dirpath is used for loading images embedded in svg files
-								// converted svgs will not have images
-								importData(body, filename, null, con, dxfFlag);
+								else{
+									// mm
+									con = 2.83465;
+								}*/
 							}
+
+							// dirpath is used for loading images embedded in svg files
+							// converted svgs will not have images
+							importData(body, filename, null, con, dxfFlag);
 						}
+					}).catch(err => {
+						message('could not contact file conversion server', true);
 					});
-
-					var form = req.form();
-					form.append('format', 'svg');
-					form.append('fileUpload', fs.createReadStream(file));
 				}
 			}
 
@@ -1090,25 +1097,33 @@
 						
 						exportbutton.className = 'button export spinner';
 						
-						var req = request.post(url, function (err, resp, body) {
+					const formData = new FormData();
+					formData.append('fileUpload', exportNest(selected.pop(), true), {
+						filename: 'deepnest.svg',
+						contentType: 'image/svg+xml'
+					});
+						formData.append('format', 'dxf');
+
+					axios.post(url, formData.getBuffer(), {
+						headers: {
+							...formData.getHeaders(),
+						},
+						responseType: 'text'
+					}).then(resp => {
+						const body = resp.data;
+							// function (err, resp, body) {
 							exportbutton.className = 'button export';
-							if (err) {
-								message('could not contact file conversion server', true);
+							//if (err) {
+							//	message('could not contact file conversion server', true);
+							//} else {
+							if (body.substring(0, 5) == 'error') {
+								message(body, true);
 							} else {
-								if(body.substring(0, 5) == 'error'){
-									message(body, true);
-								}
-								else{
-									fs.writeFileSync(fileName, body);
-								}
+								fs.writeFileSync(fileName, body);
 							}
-						});
-
-						var form = req.form();
-						form.append('format', 'dxf');
-						form.append('fileUpload', exportNest(selected.pop(), true), {
-						  filename: 'deepnest.svg',
-						  contentType: 'image/svg+xml'
+							//}
+						}).catch(err => {
+							message('could not contact file conversion server', true);
 						});
 				    };
 			};
diff --git a/package.json b/package.json
index 3506a0d37..a4e02be7f 100644
--- a/package.json
+++ b/package.json
@@ -36,8 +36,9 @@
   },
   "dependencies": {
     "@electron/remote": "^2.1.2",
-    "graceful-fs": "^4.2.11",
-    "request": "^2.88.2"
+    "axios": "^1.7.9",
+    "form-data": "^4.0.1",
+    "graceful-fs": "^4.2.11"
   },
   "build": {
     "appId": "com.deepnest.io",