fix: analytics

skidfuscatordev · Dec 29, 2024 · ff796d5 · ff796d5
1 parent fcad96a
commit ff796d5
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 3 deletions.
diff --git a/dev.skidfuscator.obfuscator/build.gradle b/dev.skidfuscator.obfuscator/build.gradle
@@ -22,7 +22,8 @@ dependencies {
 
     implementation project(':sdk')
     implementation 'com.github.lukfor:magic-progress:0.3.2'
-    implementation 'com.github.matomo-org:matomo-java-tracker:3.0.6'
+    implementation("org.piwik.java.tracking:matomo-java-tracker:3.4.0")
+
     api 'com.github.Col-E:jphantom:1.4.3'
     implementation 'dev.dirs:directories:26'
     implementation 'de.femtopedia.dex2jar:dex2jar:2.4.24'

diff --git a/dev.skidfuscator.obfuscator/src/main/java/dev/skidfuscator/obfuscator/Skidfuscator.java b/dev.skidfuscator.obfuscator/src/main/java/dev/skidfuscator/obfuscator/Skidfuscator.java
@@ -92,6 +92,7 @@
 import org.topdank.byteengineer.commons.data.JarContents;
 
 import java.io.File;
+import java.io.IOException;
 import java.net.URI;
 
 import java.net.URL;
@@ -383,7 +384,10 @@ public void run() {
 
     private void _runAnalytics() {
         final MatomoTracker tracker = new MatomoTracker(
-                TrackerConfiguration.builder().apiEndpoint(URI.create("https://analytics.skidfuscator.dev/matomo.php")).build()
+                TrackerConfiguration
+                        .builder()
+                        .apiEndpoint(URI.create("https://analytics.ghast.dev/matomo.php"))
+                        .build()
         );
         final MatomoRequest request = MatomoRequest.request()
                 .siteId(1)
@@ -392,6 +396,17 @@ private void _runAnalytics() {
                 .campaignName("community")
                 .campaignKeyword("launch")
                 .pluginJava(true)
+                .userId(MiscUtil.getHwid())
+                .additionalParameters(Map.of(
+                        "version", VERSION,
+                        "java_version", String.valueOf(MiscUtil.getJavaVersion()),
+                        "os", System.getProperty("os.name"),
+                        "os_version", System.getProperty("os.version"),
+                        "os_arch", System.getProperty("os.arch")
+                ))
+                .serverTime(System.currentTimeMillis())
+                .customAction(true)
+                .apiVersion(VERSION)
                 .eventAction("launch")
                 .eventCategory("skidfuscator/community")
                 .eventName("Java")

diff --git a/dev.skidfuscator.obfuscator/src/main/java/dev/skidfuscator/obfuscator/util/MiscUtil.java b/dev.skidfuscator.obfuscator/src/main/java/dev/skidfuscator/obfuscator/util/MiscUtil.java
@@ -4,6 +4,7 @@
 import lombok.experimental.UtilityClass;
 
 import java.lang.reflect.Array;
+import java.util.Base64;
 import java.util.List;
 import java.util.Locale;
 
@@ -62,4 +63,13 @@ public String toCamelCase(final String s) {
                 s.toUpperCase(Locale.ROOT).replace(' ', '_')
         );
     }
+
+    public static String getHwid(){
+        return "%s (%s [%s] C: %d)".formatted(
+                System.getProperty("user.name"),
+                System.getProperty("os.name"),
+                System.getProperty("os.arch"),
+                Runtime.getRuntime().availableProcessors()
+        );
+    }
 }
diff --git a/dev.skidfuscator.obfuscator/src/test/java/dev/skidfuscator/test/SampleJarTest.java b/dev.skidfuscator.obfuscator/src/test/java/dev/skidfuscator/test/SampleJarTest.java
@@ -43,7 +43,7 @@ public void test2() throws Exception {
                 .config(new File(TestSkidfuscator.class.getResource("/config/runtime_new.hocon").getFile()))
                 .jmod(MiscUtil.getJavaVersion() > 8)
                 .phantom(true)
-                .analytics(false)
+                .analytics(true)
                 .debug(true)
                 .build();