Skip to content

update libs (fixes ARM Mac support) #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
apkreader wants to merge 2 commits into
base: master
Choose a base branch
from
Open

update libs (fixes ARM Mac support) #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a6c5b41
update libs (fixes ARM Mac support)
apkreader Apr 4, 2024
2001265
ditch slf4j
apkreader Sep 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 5 additions & 9 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,29 +3,24 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.jagrosh</groupId>
<artifactId>DiscordIPC</artifactId>
<version>0.4</version>
<version>0.6</version>
<packaging>jar</packaging>

<dependencies>
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>20230227</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>2.0.7</version>
<version>20240303</version>
</dependency>
<dependency>
<groupId>com.kohlschutter.junixsocket</groupId>
<artifactId>junixsocket-common</artifactId>
<version>2.6.2</version>
<version>${junixsocket.version}</version>
</dependency>
<dependency>
<groupId>com.kohlschutter.junixsocket</groupId>
<artifactId>junixsocket-native-common</artifactId>
<version>2.6.2</version>
<version>${junixsocket.version}</version>
</dependency>
</dependencies>

Expand Down Expand Up @@ -62,6 +57,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<junixsocket.version>2.9.0</junixsocket.version>
</properties>
<name>DiscordIPC</name>
</project>
28 changes: 13 additions & 15 deletions src/main/java/com/jagrosh/discordipc/IPCClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,9 @@
import com.jagrosh.discordipc.entities.pipe.Pipe;
import com.jagrosh.discordipc.entities.pipe.PipeStatus;
import com.jagrosh.discordipc.exceptions.NoDiscordClientException;
import com.jagrosh.discordipc.utils.Logger;
import org.json.JSONException;
import org.json.JSONObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.io.Closeable;
import java.io.IOException;
Expand Down Expand Up @@ -55,7 +54,6 @@
*/
public final class IPCClient implements Closeable
{
private static final Logger LOGGER = LoggerFactory.getLogger(IPCClient.class);
private final long clientId;
private final HashMap<String,Callback> callbacks = new HashMap<>();
private volatile Pipe pipe;
Expand Down Expand Up @@ -115,7 +113,7 @@ public void connect(DiscordBuild... preferredOrder) throws NoDiscordClientExcept

pipe = Pipe.openPipe(this, clientId, callbacks, preferredOrder);

LOGGER.debug("Client is now connected and ready!");
Logger.debug("Client is now connected and ready!");
if(listener != null)
listener.onReady(this);
startReading();
Expand Down Expand Up @@ -164,7 +162,7 @@ public void sendRichPresence(RichPresence presence)
public void sendRichPresence(RichPresence presence, Callback callback)
{
checkConnected(true);
LOGGER.debug("Sending RichPresence to discord: "+(presence == null ? null : presence.toJson().toString()));
Logger.debug("Sending RichPresence to discord: "+(presence == null ? null : presence.toJson().toString()));
pipe.send(OpCode.FRAME, new JSONObject()
.put("cmd","SET_ACTIVITY")
.put("args", new JSONObject()
Expand Down Expand Up @@ -211,7 +209,7 @@ public void subscribe(Event sub, Callback callback)
checkConnected(true);
if(!sub.isSubscribable())
throw new IllegalStateException("Cannot subscribe to "+sub+" event!");
LOGGER.debug(String.format("Subscribing to Event: %s", sub.name()));
Logger.debug(String.format("Subscribing to Event: %s", sub.name()));
pipe.send(OpCode.FRAME, new JSONObject()
.put("cmd", "SUBSCRIBE")
.put("evt", sub.name()), callback);
Expand Down Expand Up @@ -245,7 +243,7 @@ public void close()
try {
pipe.close();
} catch (IOException e) {
LOGGER.debug("Failed to close pipe", e);
Logger.debug("Failed to close pipe");
}
}

Expand Down Expand Up @@ -365,19 +363,19 @@ private void startReading()
break;

case ACTIVITY_JOIN:
LOGGER.debug("Reading thread received a 'join' event.");
Logger.debug("Reading thread received a 'join' event.");
break;

case ACTIVITY_SPECTATE:
LOGGER.debug("Reading thread received a 'spectate' event.");
Logger.debug("Reading thread received a 'spectate' event.");
break;

case ACTIVITY_JOIN_REQUEST:
LOGGER.debug("Reading thread received a 'join request' event.");
Logger.debug("Reading thread received a 'join request' event.");
break;

case UNKNOWN:
LOGGER.debug("Reading thread encountered an event with an unknown type: " +
Logger.debug("Reading thread encountered an event with an unknown type: " +
json.getString("evt"));
break;
}
Expand Down Expand Up @@ -410,7 +408,7 @@ private void startReading()
}
catch(Exception e)
{
LOGGER.error("Exception when handling event: ", e);
Logger.error("Exception when handling event: ");
}
}
}
Expand All @@ -421,17 +419,17 @@ private void startReading()
catch(IOException | JSONException ex)
{
if(ex instanceof IOException)
LOGGER.error("Reading thread encountered an IOException", ex);
Logger.error("Reading thread encountered an IOException");
else
LOGGER.error("Reading thread encountered an JSONException", ex);
Logger.error("Reading thread encountered an JSONException");

pipe.setStatus(PipeStatus.DISCONNECTED);
if(listener != null)
listener.onDisconnect(this, ex);
}
});

LOGGER.debug("Starting IPCClient reading thread!");
Logger.debug("Starting IPCClient reading thread!");
readThread.start();
}

Expand Down
20 changes: 9 additions & 11 deletions src/main/java/com/jagrosh/discordipc/entities/pipe/Pipe.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,16 @@
import com.jagrosh.discordipc.entities.DiscordBuild;
import com.jagrosh.discordipc.entities.Packet;
import com.jagrosh.discordipc.exceptions.NoDiscordClientException;
import com.jagrosh.discordipc.utils.Logger;
import org.json.JSONException;
import org.json.JSONObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.io.IOException;
import java.util.HashMap;
import java.util.UUID;

public abstract class Pipe {

private static final Logger LOGGER = LoggerFactory.getLogger(Pipe.class);
private static final int VERSION = 1;
PipeStatus status = PipeStatus.CONNECTING;
IPCListener listener;
Expand Down Expand Up @@ -63,7 +61,7 @@ public static Pipe openPipe(IPCClient ipcClient, long clientId, HashMap<String,C
try
{
String location = getPipeLocation(i);
LOGGER.debug(String.format("Searching for IPC: %s", location));
Logger.debug(String.format("Searching for IPC: %s", location));
pipe = createPipe(ipcClient, callbacks, location);

pipe.send(Packet.OpCode.HANDSHAKE, new JSONObject().put("v", VERSION).put("client_id", Long.toString(clientId)), null);
Expand All @@ -74,11 +72,11 @@ public static Pipe openPipe(IPCClient ipcClient, long clientId, HashMap<String,C
.getJSONObject("config")
.getString("api_endpoint"));

LOGGER.debug(String.format("Found a valid client (%s) with packet: %s", pipe.build.name(), p.toString()));
Logger.debug(String.format("Found a valid client (%s) with packet: %s", pipe.build.name(), p.toString()));
// we're done if we found our first choice
if(pipe.build == preferredOrder[0] || DiscordBuild.ANY == preferredOrder[0])
{
LOGGER.info(String.format("Found preferred client: %s", pipe.build.name()));
Logger.info(String.format("Found preferred client: %s", pipe.build.name()));
break;
}

Expand All @@ -101,7 +99,7 @@ public static Pipe openPipe(IPCClient ipcClient, long clientId, HashMap<String,C
for(int i = 1; i < preferredOrder.length; i++)
{
DiscordBuild cb = preferredOrder[i];
LOGGER.debug(String.format("Looking for client build: %s", cb.name()));
Logger.debug(String.format("Looking for client build: %s", cb.name()));
if(open[cb.ordinal()] != null)
{
pipe = open[cb.ordinal()];
Expand All @@ -119,7 +117,7 @@ public static Pipe openPipe(IPCClient ipcClient, long clientId, HashMap<String,C
}
else pipe.build = cb;

LOGGER.info(String.format("Found preferred client: %s", pipe.build.name()));
Logger.info(String.format("Found preferred client: %s", pipe.build.name()));
break;
}
}
Expand All @@ -140,7 +138,7 @@ public static Pipe openPipe(IPCClient ipcClient, long clientId, HashMap<String,C
} catch(IOException ex) {
// This isn't really important to applications and better
// as debug info
LOGGER.debug("Failed to close an open IPC pipe!", ex);
Logger.debug("Failed to close an open IPC pipe!");
}
}
}
Expand Down Expand Up @@ -189,13 +187,13 @@ public void send(Packet.OpCode op, JSONObject data, Callback callback)
if(callback!=null && !callback.isEmpty())
callbacks.put(nonce, callback);
write(p.toBytes());
LOGGER.debug(String.format("Sent packet: %s", p.toString()));
Logger.debug(String.format("Sent packet: %s", p.toString()));
if(listener != null)
listener.onPacketSent(ipcClient, p);
}
catch(IOException ex)
{
LOGGER.error("Encountered an IOException while sending a packet and disconnected!");
Logger.error("Encountered an IOException while sending a packet and disconnected!");
status = PipeStatus.DISCONNECTED;
}
}
Expand Down
8 changes: 3 additions & 5 deletions src/main/java/com/jagrosh/discordipc/entities/pipe/UnixPipe.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,11 @@
import com.jagrosh.discordipc.IPCClient;
import com.jagrosh.discordipc.entities.Callback;
import com.jagrosh.discordipc.entities.Packet;
import com.jagrosh.discordipc.utils.Logger;
import org.json.JSONException;
import org.json.JSONObject;
import org.newsclub.net.unix.AFUNIXSocket;
import org.newsclub.net.unix.AFUNIXSocketAddress;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.io.IOException;
import java.io.InputStream;
Expand All @@ -35,7 +34,6 @@
public class UnixPipe extends Pipe
{

private static final Logger LOGGER = LoggerFactory.getLogger(UnixPipe.class);
private final AFUNIXSocket socket;

UnixPipe(IPCClient ipcClient, HashMap<String, Callback> callbacks, String location) throws IOException
Expand Down Expand Up @@ -81,7 +79,7 @@ public Packet read() throws IOException, JSONException

is.read(d);
Packet p = new Packet(op, new JSONObject(new String(d)));
LOGGER.debug(String.format("Received packet: %s", p.toString()));
Logger.debug(String.format("Received packet: %s", p.toString()));
if(listener != null)
listener.onPacketReceived(ipcClient, p);
return p;
Expand All @@ -96,7 +94,7 @@ public void write(byte[] b) throws IOException
@Override
public void close() throws IOException
{
LOGGER.debug("Closing IPC pipe...");
Logger.debug("Closing IPC pipe...");
send(Packet.OpCode.CLOSE, new JSONObject(), null);
status = PipeStatus.CLOSED;
socket.close();
Expand Down
9 changes: 3 additions & 6 deletions src/main/java/com/jagrosh/discordipc/entities/pipe/WindowsPipe.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,9 @@
import com.jagrosh.discordipc.IPCClient;
import com.jagrosh.discordipc.entities.Callback;
import com.jagrosh.discordipc.entities.Packet;
import com.jagrosh.discordipc.utils.Logger;
import org.json.JSONException;
import org.json.JSONObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.io.FileNotFoundException;
import java.io.IOException;
Expand All @@ -32,8 +31,6 @@
public class WindowsPipe extends Pipe
{

private static final Logger LOGGER = LoggerFactory.getLogger(WindowsPipe.class);

private final RandomAccessFile file;

WindowsPipe(IPCClient ipcClient, HashMap<String, Callback> callbacks, String location)
Expand Down Expand Up @@ -72,15 +69,15 @@ public Packet read() throws IOException, JSONException {

file.readFully(d);
Packet p = new Packet(op, new JSONObject(new String(d)));
LOGGER.debug(String.format("Received packet: %s", p.toString()));
Logger.debug(String.format("Received packet: %s", p.toString()));
if(listener != null)
listener.onPacketReceived(ipcClient, p);
return p;
}

@Override
public void close() throws IOException {
LOGGER.debug("Closing IPC pipe...");
Logger.debug("Closing IPC pipe...");
send(Packet.OpCode.CLOSE, new JSONObject(), null);
status = PipeStatus.CLOSED;
file.close();
Expand Down
16 changes: 16 additions & 0 deletions src/main/java/com/jagrosh/discordipc/utils/Logger.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
package com.jagrosh.discordipc.utils;

public class Logger {
public static void debug(Object s) {
System.out.println("[Debug] " + s);
}
public static void info(Object s) {
System.out.println("[Info] " + s);
}
public static void warn(Object s) {
System.out.println("[Warn] " + s);
}
public static void error(Object s) {
System.out.println("[Error] " + s);
}
}