Merge branch 'pr/2' into main

README.md

@@ -4,8 +4,8 @@ Growtopia Discord Rich Presence by GrowStocks.
 
 
 # Instructions
-- Download the .exe from the "Releases" tab
-- Open the .exe file (the presence will only show if Growtopia and Discord are open at the same time) 
+- Download the correct file for your operating system from the "Releases" tab
+- Open the downloaded file (the presence will only show if Growtopia and Discord are open at the same time) 
 - If the Rich Presence doesn't show on Discord, try completely closing then re-opening Discord
 
 # Instructions (if you're a skeptic)

index.js

@@ -22,6 +22,7 @@ data = null;
 			data = await Growtopia.generateRPCData();
 			if(Growtopia.clientIsOpen) client.setActivity(data).catch(e=>e);
 		}catch(e){
+			console.log(e);
 			process.exit(0);
 		}
 	}

modules/Application.js

@@ -1,10 +1,14 @@
 const path = require('path');
 const fetch = require('node-fetch');
+var os = require('os');
 
 class Application {
     constructor() {
         this.clientID = "841694148758208542";
-        this.version = "v1.2.1";
+        this.version = "v1.3.1";
+        this.device = {
+            isMacOS: os.platform() === 'darwin'
+        };
     }
 
     checkForUpdates(){

modules/DiscordHelper.js

@@ -1,5 +1,7 @@
 const exec = require('child_process').exec;
+const findProcess = require('find-process');
 const EventEmitter = require('events');
+const Application = require('../modules/Application.js');
 
 class DiscordHelper extends EventEmitter {
 	constructor(){
@@ -8,6 +10,11 @@ class DiscordHelper extends EventEmitter {
 	}
 
 	async isOpen(){
+		if(Application.device.isMacOS) return await this.isOpenMacOS();
+		else return await this.isOpenWindows();
+	}
+
+	async isOpenWindows(){
 		return new Promise((resolve, reject) => {
 			exec('tasklist', (err, stdout, stderr) => {
 				if(!stdout) resolve(false);
@@ -16,6 +23,22 @@ class DiscordHelper extends EventEmitter {
 		});
 	}
 
+	async isOpenMacOs(){
+		return new Promise((resolve, reject) => {
+			let isFound = findProcess('name', 'Discord').then(list => {
+				for (let ver of ['', ' PTB', ' Canary']) {
+					for (let process of list) {
+						if (process.name === 'Discord' + ver) {
+							return true;
+						}
+					}
+				}
+				return false;
+			})
+			resolve(isFound);
+		});
+	}
+
 	checkAppStatus(){
 		let self = this;
 		(async function check(){

modules/GrowtopiaHelper.js

@@ -1,20 +1,28 @@
 const exec = require('child_process').exec;
+const findProcess = require('find-process');
 const EventEmitter = require('events');
 const fs = require('fs');
+const Application = require('../modules/Application.js');
 
 class GrowtopiaHelper extends EventEmitter {
 	constructor(){
 		super();
 		this.clientIsOpen = false;
 		this.startedPlaying = new Date();
-		this.appData = `${process.env.APPDATA}\\..\\Local\\Growtopia`;
+		this.appData = Application.device.isMacOS ? `${process.env.HOME}/Library/Application Support/growtopia` : `${process.env.APPDATA}\\..\\Local\\Growtopia`;
+		this.splitter = Application.device.isMacOS ? '/' : `\\`
 
-		fs.watchFile(`${this.appData}\\save.dat`, (curr, prev) => {
+		fs.watchFile(`${this.appData}${this.splitter}save.dat`, (curr, prev) => {
 			this.emit("saveDatUpdate");
 		});
 	}
 
 	async isOpen(){
+		if(Application.device.isMacOS) return await this.isOpenMacOS();
+		else return await this.isOpenWindows();
+	}
+
+	async isOpenWindows(){
 		return new Promise((resolve, reject) => {
 			exec('tasklist', (err, stdout, stderr) => {
 				if(!stdout) resolve(false);
@@ -23,6 +31,19 @@ class GrowtopiaHelper extends EventEmitter {
 		});
 	}
 
+	async isOpenMacOS(){
+		return new Promise((resolve, reject) => {
+			let isFound = findProcess('name', 'Growtopia').then(list => {
+				for (let process of list) {
+					if (process.name === 'Growtopia') {
+						resolve(true);
+					}
+				}
+				resolve(false);
+			})
+		});
+	}
+
 	checkAppStatus(){
 		let self = this;
 		(async function check(){
@@ -43,7 +64,7 @@ class GrowtopiaHelper extends EventEmitter {
 
 	async readSaveDat(){
 		return new Promise((resolve, reject) => {
-			fs.readFile(`${this.appData}\\save.dat`, 'utf8' , (err, data) => {
+			fs.readFile(`${this.appData}${this.splitter}save.dat`, 'utf8' , (err, data) => {
 				if(err){
 					return reject(err);
 				}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "growtopia-discord-presence",
-  "version": "1.1.1",
+  "version": "1.3.1",
   "description": "Growtopia Discord Rich Presence by GrowStocks",
   "main": "index.js",
   "scripts": {
@@ -17,7 +17,9 @@
   "license": "GPL-3.0",
   "dependencies": {
     "discord-rpc": "^3.2.0",
-    "node-fetch": "^2.6.1"
+    "find-process": "^1.4.4",
+    "node-fetch": "^2.6.1",
+    "os": "^0.1.1"
   },
   "repository": {
     "type": "git",