diff --git a/.github/workflows/ds.yml b/.github/workflows/ds.yml
new file mode 100644
index 0000000..9e89028
--- /dev/null
+++ b/.github/workflows/ds.yml
@@ -0,0 +1,45 @@
+name: Update DS
+
+on:
+ workflow_dispatch: ~
+
+jobs:
+ build:
+ runs-on: ubuntu-latest
+ steps:
+ - name: Checkout
+ uses: actions/checkout@v3
+ with:
+ submodules: 'recursive'
+ fetch-depth: 0
+ - name: Write key
+ run: |
+ echo '${{ secrets.MAIN }}' > compiler/ds/src/main/java/org/example/Main.java
+ - name: Setup Python
+ uses: actions/setup-python@v3
+ with:
+ python-version: 3.9
+ - name: Setup Java
+ uses: actions/setup-java@v3
+ with:
+ distribution: 'temurin'
+ java-version: '17'
+ cache: 'gradle'
+ - name: Download apk
+ run: |
+ pip install httpx
+ cd compiler/ds
+ python download.py ${{ secrets.DOWNLOAD }}
+ - name: Parse apk
+ run: |
+ cd compiler/ds
+ ./gradlew build
+ ./gradlew run
+ - name: Commit changes
+ uses: EndBug/add-and-commit@v9
+ with:
+ author_name: github-actions[bot]
+ author_email: github-actions[bot]@users.noreply.github.com
+ message: ':bento: Update ds salt'
+ add: |
+ 'simnet/utils/ds.py'
diff --git a/.gitignore b/.gitignore
index 2dc53ca..5fc8fb9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -158,3 +158,7 @@ cython_debug/
# and can be added to the global gitignore or merged into this file. For a more nuclear
# option (not recommended) you can uncomment the following to ignore the entire idea folder.
.idea/
+
+.gradle/
+*.apk
+compiler/ds/src/main/java/org/example/Main.java
diff --git a/compiler/ds/build.gradle b/compiler/ds/build.gradle
new file mode 100644
index 0000000..c1bc42f
--- /dev/null
+++ b/compiler/ds/build.gradle
@@ -0,0 +1,35 @@
+plugins {
+ id 'java'
+}
+
+group = 'org.example'
+version = '1.0-SNAPSHOT'
+
+repositories {
+ mavenCentral()
+ google()
+}
+
+dependencies {
+ testImplementation platform('org.junit:junit-bom:5.9.1')
+ testImplementation 'org.junit.jupiter:junit-jupiter'
+ // https://mvnrepository.com/artifact/io.github.skylot/jadx-core
+ implementation 'io.github.skylot:jadx-core:1.4.7'
+ // https://mvnrepository.com/artifact/io.github.skylot/jadx-dex-input
+ runtimeOnly 'io.github.skylot:jadx-dex-input:1.4.7'
+ // https://mvnrepository.com/artifact/io.github.skylot/jadx-java-convert
+ implementation 'io.github.skylot:jadx-java-convert:1.4.7'
+ // https://mvnrepository.com/artifact/io.github.skylot/jadx-smali-input
+ implementation 'io.github.skylot:jadx-smali-input:1.4.7'
+ // https://mvnrepository.com/artifact/io.github.skylot/jadx-plugins-api
+ implementation 'io.github.skylot:jadx-plugins-api:1.4.7'
+}
+
+test {
+ useJUnitPlatform()
+}
+
+tasks.register("run", JavaExec) {
+ classpath = sourceSets.main.runtimeClasspath
+ mainClass = "org.example.Main"
+}
diff --git a/compiler/ds/download.py b/compiler/ds/download.py
new file mode 100644
index 0000000..f3625c0
--- /dev/null
+++ b/compiler/ds/download.py
@@ -0,0 +1,47 @@
+from time import sleep
+
+from httpx import get
+import subprocess
+import sys
+
+url = sys.argv[1] if len(sys.argv) > 1 else "https://download-bbs.miyoushe.com"
+
+
+def retry(func):
+ """retry 10 times"""
+
+ def wrapper(*args, **kwargs) -> str:
+ """retry 10 times"""
+ for _ in range(10):
+ try:
+ return func(*args, **kwargs)
+ except Exception: # skipcq: PYL-W0703
+ print("retrying...")
+ sleep(1)
+ continue
+ return None
+
+ return wrapper
+
+
+@retry
+def get_version():
+ """get version"""
+ return get(
+ "https://bbs-api.miyoushe.com/misc/wapi/getLatestPkgVer?channel=miyousheluodi",
+ verify=False,
+ ).json()[
+ "data"
+ ]["version"]
+
+
+version = get_version()
+apk_url = f"{url}/app/mihoyobbs_{version}_miyousheluodi.apk"
+print(f"download version {version} from {apk_url}")
+
+command = f"wget -O mihoyobbs.apk {apk_url}"
+process = subprocess.Popen(command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) # skipcq: BAN-B602
+output, error = process.communicate()
+
+print("命令输出:\n", output.decode())
+print("错误信息:\n", error.decode())
diff --git a/compiler/ds/ds.iml b/compiler/ds/ds.iml
new file mode 100644
index 0000000..bf85e2c
--- /dev/null
+++ b/compiler/ds/ds.iml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/compiler/ds/gradle/wrapper/gradle-wrapper.jar b/compiler/ds/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000..249e583
Binary files /dev/null and b/compiler/ds/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/compiler/ds/gradle/wrapper/gradle-wrapper.properties b/compiler/ds/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..33b03ad
--- /dev/null
+++ b/compiler/ds/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Wed Sep 20 23:44:46 CST 2023
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/compiler/ds/gradlew b/compiler/ds/gradlew
new file mode 100755
index 0000000..1b6c787
--- /dev/null
+++ b/compiler/ds/gradlew
@@ -0,0 +1,234 @@
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+#
+# Gradle start up script for POSIX generated by Gradle.
+#
+# Important for running:
+#
+# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+# noncompliant, but you have some other compliant shell such as ksh or
+# bash, then to run this script, type that shell name before the whole
+# command line, like:
+#
+# ksh Gradle
+#
+# Busybox and similar reduced shells will NOT work, because this script
+# requires all of these POSIX shell features:
+# * functions;
+# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+# * compound commands having a testable exit status, especially «case»;
+# * various built-in commands including «command», «set», and «ulimit».
+#
+# Important for patching:
+#
+# (2) This script targets any POSIX shell, so it avoids extensions provided
+# by Bash, Ksh, etc; in particular arrays are avoided.
+#
+# The "traditional" practice of packing multiple parameters into a
+# space-separated string is a well documented source of bugs and security
+# problems, so this is (mostly) avoided, by progressively accumulating
+# options in "$@", and eventually passing that to Java.
+#
+# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+# see the in-line comments for details.
+#
+# There are tweaks for specific operating systems such as AIX, CygWin,
+# Darwin, MinGW, and NonStop.
+#
+# (3) This script is generated from the Groovy template
+# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+# within the Gradle project.
+#
+# You can find Gradle at https://github.com/gradle/gradle/.
+#
+##############################################################################
+
+# Attempt to set APP_HOME
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+ APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
+ [ -h "$app_path" ]
+do
+ ls=$( ls -ld "$app_path" )
+ link=${ls#*' -> '}
+ case $link in #(
+ /*) app_path=$link ;; #(
+ *) app_path=$APP_HOME$link ;;
+ esac
+done
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+
+APP_NAME="Gradle"
+APP_BASE_NAME=${0##*/}
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD=maximum
+
+warn () {
+ echo "$*"
+} >&2
+
+die () {
+ echo
+ echo "$*"
+ echo
+ exit 1
+} >&2
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "$( uname )" in #(
+ CYGWIN* ) cygwin=true ;; #(
+ Darwin* ) darwin=true ;; #(
+ MSYS* | MINGW* ) msys=true ;; #(
+ NONSTOP* ) nonstop=true ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD=$JAVA_HOME/jre/sh/java
+ else
+ JAVACMD=$JAVA_HOME/bin/java
+ fi
+ if [ ! -x "$JAVACMD" ] ; then
+ die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+ fi
+else
+ JAVACMD=java
+ which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+ case $MAX_FD in #(
+ max*)
+ MAX_FD=$( ulimit -H -n ) ||
+ warn "Could not query maximum file descriptor limit"
+ esac
+ case $MAX_FD in #(
+ '' | soft) :;; #(
+ *)
+ ulimit -n "$MAX_FD" ||
+ warn "Could not set maximum file descriptor limit to $MAX_FD"
+ esac
+fi
+
+# Collect all arguments for the java command, stacking in reverse order:
+# * args from the command line
+# * the main class name
+# * -classpath
+# * -D...appname settings
+# * --module-path (only if needed)
+# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+ APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+ CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+ JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+ # Now convert the arguments - kludge to limit ourselves to /bin/sh
+ for arg do
+ if
+ case $arg in #(
+ -*) false ;; # don't mess with options #(
+ /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
+ [ -e "$t" ] ;; #(
+ *) false ;;
+ esac
+ then
+ arg=$( cygpath --path --ignore --mixed "$arg" )
+ fi
+ # Roll the args list around exactly as many times as the number of
+ # args, so each arg winds up back in the position where it started, but
+ # possibly modified.
+ #
+ # NB: a `for` loop captures its iteration list before it begins, so
+ # changing the positional parameters here affects neither the number of
+ # iterations, nor the values presented in `arg`.
+ shift # remove old arg
+ set -- "$@" "$arg" # push replacement arg
+ done
+fi
+
+# Collect all arguments for the java command;
+# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+# shell script including quotes and variable substitutions, so put them in
+# double quotes to make sure that they get re-expanded; and
+# * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+ "-Dorg.gradle.appname=$APP_BASE_NAME" \
+ -classpath "$CLASSPATH" \
+ org.gradle.wrapper.GradleWrapperMain \
+ "$@"
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+# set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+ printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+ xargs -n1 |
+ sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+ tr '\n' ' '
+ )" '"$@"'
+
+exec "$JAVACMD" "$@"
diff --git a/compiler/ds/gradlew.bat b/compiler/ds/gradlew.bat
new file mode 100644
index 0000000..107acd3
--- /dev/null
+++ b/compiler/ds/gradlew.bat
@@ -0,0 +1,89 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/compiler/ds/settings.gradle b/compiler/ds/settings.gradle
new file mode 100644
index 0000000..f6d4647
--- /dev/null
+++ b/compiler/ds/settings.gradle
@@ -0,0 +1,2 @@
+rootProject.name = 'ds'
+
diff --git a/compiler/ds/src/main/java/org/example/Replace.java b/compiler/ds/src/main/java/org/example/Replace.java
new file mode 100644
index 0000000..9491457
--- /dev/null
+++ b/compiler/ds/src/main/java/org/example/Replace.java
@@ -0,0 +1,46 @@
+package org.example;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.List;
+
+public class Replace {
+ public static String dsPy = "../../simnet/utils/ds.py";
+ public static String versionRe = "MIYOUSHE_VERSION = \"(.*?)\"";
+ public static String appDsRe = "MIYOUSHE_APP_DS = \"(.*?)\"";
+ public static String webDsRe = "MIYOUSHE_WEB_DS = \"(.*?)\"";
+
+ public static String replaceVersion(String line, String version) {
+ return line.replaceAll(versionRe, "MIYOUSHE_VERSION = \"" + version + "\"");
+ }
+
+ public static String replaceAppDs(String line, String appDs) {
+ return line.replaceAll(appDsRe, "MIYOUSHE_APP_DS = \"" + appDs + "\"");
+ }
+
+ public static String replaceWebDs(String line, String webDs) {
+ return line.replaceAll(webDsRe, "MIYOUSHE_WEB_DS = \"" + webDs + "\"");
+ }
+
+ public static void replace(String version, String appDs, String webDs) throws IOException {
+ if (version == null || appDs == null || webDs == null) {
+ return;
+ }
+ if (version.isEmpty() || appDs.isEmpty() || webDs.isEmpty()) {
+ return;
+ }
+ Path filePath = Paths.get(dsPy);
+ List lines = Files.readAllLines(filePath, StandardCharsets.UTF_8);
+ for (int i = 0; i < lines.size(); i++) {
+ String line = lines.get(i);
+ line = replaceVersion(line, version);
+ line = replaceAppDs(line, appDs);
+ line = replaceWebDs(line, webDs);
+ lines.set(i, line);
+ }
+ Files.write(filePath, lines, StandardCharsets.UTF_8);
+ }
+}
diff --git a/simnet/utils/ds.py b/simnet/utils/ds.py
index d08acc7..0ee4856 100644
--- a/simnet/utils/ds.py
+++ b/simnet/utils/ds.py
@@ -9,6 +9,10 @@ from typing import Any, Optional
from simnet.utils.enum_ import Region
from simnet.utils.types import QueryParamTypes
+MIYOUSHE_VERSION = "2.58.2"
+MIYOUSHE_APP_DS = "kzTvKGDHumYf6h1Ia5txMjxAJuTtD0ol"
+MIYOUSHE_WEB_DS = "KTJQGN2a2Trqk0tcQZS6JV3rU7CnV8Q6"
+
class DSType(Enum):
"""
@@ -79,7 +83,7 @@ def generate_dynamic_secret(
c = hex_digest(f"salt={salt}&t={t}&r={r}")
return f"{t},{r},{c}"
- app_version = "2.59.1"
+ app_version = MIYOUSHE_VERSION
client_type = "5"
if region == Region.OVERSEAS:
salt = "6s25p5ox5y14umn1p61aqyyvbvvl3lrt"
@@ -90,12 +94,12 @@ def generate_dynamic_secret(
salt = "xV8v4Qu54lUKrEYFZkJhB8cuOh9Asafs"
elif ds_type == DSType.ANDROID:
client_type = "2"
- salt = "awFeNNTsLYcK20LSO60Es8CRVZOjCB1b"
+ salt = MIYOUSHE_APP_DS
else:
raise ValueError(f"Unknown ds_type: {ds_type}")
else:
if ds_type is None:
- salt = "6pNd5NnDnbwKxewrPwEoWlSYwhualS2H"
+ salt = MIYOUSHE_WEB_DS
elif ds_type == DSType.ANDROID:
salt = "t0qEgfub6cvueAPgR5m9aQWWVciEer7v"
client_type = "2"