improve address search, update README, version 1.0.3

Author: LabyStudio

README.md

@@ -14,15 +14,15 @@ repositories {
 }
 
 dependencies {
-    implementation 'com.github.LabyStudio:java-spotify-api:1.0.2:all'
+    implementation 'com.github.LabyStudio:java-spotify-api:1.0.3:all'
 }
 ```
 
 ## Example
 Create the API and get the current playing song and position:
 ```java
 // Create a new SpotifyAPI for your operating system
-SpotifyAPI api = SpotifyAPIFactory.create();
+SpotifyAPI api = SpotifyAPIFactory.createInitialized();
 
 // It has no track until the song started playing once
 if (api.hasTrack()) {

build.gradle

@@ -4,7 +4,7 @@ plugins {
 }
 
 group 'de.labystudio'
-version '1.0.2'
+version '1.0.3'
 
 compileJava {
     sourceCompatibility = '1.8'

src/main/java/de/labystudio/spotifyapi/platform/windows/WinSpotifyAPI.java

@@ -72,7 +72,7 @@ private void onTick() {
             String trackId = this.process.getTrackId();
 
             // Update playback status and check if it is valid
-            if (!playback.update() || !this.isTrackIdValid(trackId)) {
+            if (!playback.update() || !this.process.isTrackIdValid(trackId)) {
                 throw new IllegalStateException("Could not update playback");
             }
 
@@ -173,20 +173,4 @@ public void stop() {
         }
     }
 
-    /**
-     * Checks if the given track ID is valid.
-     * A track ID is valid if there are no characters with a value of zero.
-     *
-     * @param trackId The track ID to check.
-     * @return True if the track ID is valid, false otherwise.
-     */
-    private boolean isTrackIdValid(String trackId) {
-        for (char c : trackId.toCharArray()) {
-            if (c == 0) {
-                return false;
-            }
-        }
-        return true;
-    }
-
 }

src/main/java/de/labystudio/spotifyapi/platform/windows/api/WinApi.java

@@ -11,7 +11,9 @@
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.atomic.AtomicReference;
 
 /**
@@ -96,6 +98,25 @@ default String getWindowTitle(WinDef.HWND window) {
         return Native.toString(Arrays.copyOf(buffer, length));
     }
 
+    default Map<Long, Long> getModules(int pid) {
+        Map<Long, Long> map = new HashMap<>();
+
+        WinNT.HANDLE snapshot = Kernel32.INSTANCE.CreateToolhelp32Snapshot(
+                Tlhelp32.TH32CS_SNAPMODULE,
+                new WinDef.DWORD(pid)
+        );
+        if (snapshot == null) {
+            return map;
+        }
+
+        Tlhelp32.MODULEENTRY32W moduleEntry = new Tlhelp32.MODULEENTRY32W.ByReference();
+        while (Kernel32.INSTANCE.Module32NextW(snapshot, moduleEntry)) {
+            map.put(Pointer.nativeValue(moduleEntry.modBaseAddr), moduleEntry.modBaseSize.longValue());
+        }
+        Kernel32.INSTANCE.CloseHandle(snapshot);
+        return map;
+    }
+
     default long getModuleAddress(int pid, String moduleName) {
         WinNT.HANDLE snapshot = Kernel32.INSTANCE.CreateToolhelp32Snapshot(
                 Tlhelp32.TH32CS_SNAPMODULE,

src/main/java/de/labystudio/spotifyapi/platform/windows/api/WinProcess.java

@@ -7,6 +7,8 @@
 import com.sun.jna.platform.win32.WinNT;
 import com.sun.jna.ptr.IntByReference;
 
+import java.util.Map;
+
 /**
  * Windows Process API
  * Used to connect to a Windows process and read its memory.
@@ -156,6 +158,20 @@ public long findInMemory(long address, long size, byte[] searchBytes, SearchCond
         return -1;
     }
 
+    /**
+     * Find the highest process address.
+     * The highest process address is determined by the highest module address + module size.
+     *
+     * @return The highest process address.
+     */
+    public long getMaxProcessAddress() {
+        long maxAddress = 0;
+        for (Map.Entry<Long, Long> module : this.getModules(this.processId).entrySet()) {
+            maxAddress = Math.max(maxAddress, module.getKey() + module.getValue());
+        }
+        return maxAddress;
+    }
+
     /**
      * Get the title of the window as a string.
      *

src/main/java/de/labystudio/spotifyapi/platform/windows/api/spotify/SpotifyProcess.java

@@ -11,12 +11,7 @@
 public class SpotifyProcess extends WinProcess {
 
     private static final byte[] PREFIX_TRACK_ID = "spotify:track:".getBytes();
-    private static final long CHROME_ELF_ADDRESS = 0x5f710000L;
-    private static final long CHROME_ELF_SIZE = 0x5f710000L;
-
-    private static final byte[] PREFIX_CONTEXT = new byte[]{0x63, 0x6F, 0x6E, 0x74, 0x65, 0x78, 0x74, 0x00};
-    private static final long CONTEXT_ADDRESS = 0x0794E42C;
-    private static final long CONTEXT_SIZE = CHROME_ELF_ADDRESS;
+    private static final byte[] PREFIX_CONTEXT = new byte[]{0x63, 0x6F, 0x6E, 0x74, 0x65, 0x78, 0x74};
 
     private final long addressTrackId;
     private final long addressPlayBack;
@@ -34,25 +29,33 @@ public class SpotifyProcess extends WinProcess {
     public SpotifyProcess() {
         super("Spotify.exe");
 
+        long highestAddress = this.getMaxProcessAddress();
+
+        // Find addresses of playback states (Located in the chrome_elf.dll module)
+        this.addressTrackId = this.findInMemory(
+                0,
+                highestAddress,
+                PREFIX_TRACK_ID,
+                address -> this.isTrackIdValid(this.readTrackId(address))
+        );
+        // Check if we have found the addresses
+        if (this.addressTrackId == -1) {
+            throw new IllegalStateException("Could not find track id in memory");
+        }
+
         // Check if the song is currently playing using the title bar
         boolean isPlaying = this.isPlayingUsingTitle();
 
-        // Find addresses of track id and playback states
-        this.addressTrackId = this.findInMemory(CHROME_ELF_ADDRESS, CHROME_ELF_SIZE, PREFIX_TRACK_ID);
+        // Find addresses of track id
         this.addressPlayBack = this.findInMemory(
-                CONTEXT_ADDRESS,
-                CONTEXT_SIZE,
+                0,
+                highestAddress,
                 PREFIX_CONTEXT,
                 address -> {
                     PlaybackAccessor accessor = new PlaybackAccessor(this, address);
                     return accessor.isValid() && accessor.isPlaying() == isPlaying; // Check if address is valid
                 }
         );
-
-        // Check if we have found the addresses
-        if (this.addressTrackId == -1) {
-            throw new IllegalStateException("Could not find track id in memory");
-        }
         if (this.addressPlayBack == -1) {
             throw new IllegalStateException("Could not find playback in memory");
         }
@@ -61,13 +64,23 @@ public SpotifyProcess() {
         this.playbackAccessor = new PlaybackAccessor(this, this.addressPlayBack);
     }
 
+    /**
+     * Read the track id from the memory.
+     *
+     * @param address The address where the prefix "spotify:track:" starts
+     * @return the track id without the prefix "spotify:track:"
+     */
+    private String readTrackId(long address) {
+        return this.readString(address + 14, 22);
+    }
+
     /**
      * Read the track id from the memory.
      *
      * @return the track id without the prefix "spotify:track:"
      */
     public String getTrackId() {
-        return new String(this.readBytes(this.addressTrackId + 14, 22));
+        return this.readTrackId(this.addressTrackId);
     }
 
     /**
@@ -106,4 +119,20 @@ public long getAddressTrackId() {
     public long getAddressPlayBack() {
         return this.addressPlayBack;
     }
+
+    /**
+     * Checks if the given track ID is valid.
+     * A track ID is valid if there are no characters with a value of zero.
+     *
+     * @param trackId The track ID to check.
+     * @return True if the track ID is valid, false otherwise.
+     */
+    public boolean isTrackIdValid(String trackId) {
+        for (char c : trackId.toCharArray()) {
+            if (c == 0) {
+                return false;
+            }
+        }
+        return true;
+    }
 }

src/test/java/SpotifyTest.java

@@ -9,7 +9,7 @@
 public class SpotifyTest {
 
     public static void main(String[] args) throws Exception {
-        SpotifyAPI api = SpotifyAPIFactory.create();
+        SpotifyAPI api = SpotifyAPIFactory.createInitialized();
 
         // It has no track until the song started playing once
         if (api.hasTrack()) {