update shadow rs (#473)
This commit is contained in:
parent
2d806df712
commit
a513b62b0b
5 changed files with 17 additions and 14 deletions
4
Cargo.lock
generated
4
Cargo.lock
generated
|
|
@ -5465,9 +5465,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "shadow-rs"
|
||||
version = "1.4.0"
|
||||
version = "1.5.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "72d18183cef626bce22836103349c7050d73db799be0171386b80947d157ae32"
|
||||
checksum = "ff351910f271e7065781b6b4f0f43cb515d474d812f31176a0246d9058e47d5d"
|
||||
dependencies = [
|
||||
"const_format",
|
||||
"git2",
|
||||
|
|
|
|||
|
|
@ -175,7 +175,7 @@ sysinfo = { version = "=0.34.2", features = [ "serde" ] }
|
|||
thiserror = { version = "2" }
|
||||
whoami = { version = "=1.6.0" }
|
||||
opener = { version = "=0.8.2" }
|
||||
shadow-rs = { version = "1.4.0", default-features = false }
|
||||
shadow-rs = { version = "1.5.0", default-features = false }
|
||||
|
||||
# macro
|
||||
paste = { version = "1" }
|
||||
|
|
|
|||
|
|
@ -303,7 +303,7 @@ export type VersionType =
|
|||
*/
|
||||
"old_beta"
|
||||
|
||||
const ARGS_MAP = { 'debug':'{"openDevTools":[],"getLocale":[],"getGitCommitHash":[],"getArch":[],"getBuildTimestamp":[],"getOsVersion":[],"getFamily":[],"getType":[],"isInDev":[],"getPlatform":[],"getPackageVersion":[]}', 'core':'{"getLoadersForVersion":["mc_version"],"killProcess":["pid"],"removeCape":["access_token"],"uploadSkinBytes":["access_token","skin_data","image_format","skin_variant"],"readSettings":[],"fetchLoggedInProfile":["access_token"],"refreshAccounts":[],"searchPackages":["provider","query"],"launchCluster":["id","uuid","search_for_java"],"setDefaultUser":["uuid"],"getClusterById":["id"],"updateClusterById":["id","request"],"getWorlds":["id"],"getScreenshots":["id"],"updateClusterProfile":["name","profile"],"getLogByName":["id","name"],"writeSettings":["setting"],"downloadPackage":["provider","package_id","version_id","cluster_id","skip_compatibility"],"getUsersFromAuthor":["provider","author"],"getPackageVersions":["provider","slug","mc_version","loader","offset","limit"],"getLinkedPackages":["cluster_id"],"getProfileOrDefault":["name"],"getPackageBody":["provider","body"],"removePackage":["cluster_id","package_hash"],"getGlobalProfile":[],"getClusters":[],"fetchMinecraftProfile":["uuid"],"changeCape":["access_token","cape_uuid"],"removeUser":["uuid"],"changeSkin":["access_token","skin_url","skin_variant"],"downloadExternalPackage":["package","cluster_id","force","skip_compatibility"],"refreshAccount":["uuid"],"getMultiplePackages":["provider","slugs"],"getRunningProcesses":[],"installModpack":["modpack","cluster_id"],"setDiscordRPCMessage":["message"],"removeCluster":["id"],"open":["input"],"getDefaultUser":["fallback"],"openMsaLogin":[],"createCluster":["options"],"getRunningProcessesByClusterId":["cluster_id"],"isClusterRunning":["cluster_id"],"getUsers":[],"createSettingsProfile":["name"],"convertUsernameUUID":["username_uuid"],"getGameVersions":[],"setClusterStage":["id","stage"],"getPackage":["provider","slug"],"getLogs":["id"],"getUser":["uuid"]}', 'oneclient':'{"getBundlesFor":["cluster_id"],"getClustersGroupedByMajor":[],"installUpdate":[],"getVersions":[],"checkForUpdate":[]}', 'events':'{"ingress":["event"],"process":["event"],"message":["event"]}', 'folders':'{"openCluster":["folder_name"],"fromCluster":["folder_name"]}' }
|
||||
const ARGS_MAP = { 'debug':'{"openDevTools":[],"getArch":[],"getFamily":[],"getOsVersion":[],"getBuildTimestamp":[],"getPackageVersion":[],"isInDev":[],"getLocale":[],"getType":[],"getGitCommitHash":[],"getPlatform":[]}', 'core':'{"getLinkedPackages":["cluster_id"],"installModpack":["modpack","cluster_id"],"removeCape":["access_token"],"changeSkin":["access_token","skin_url","skin_variant"],"getDefaultUser":["fallback"],"getUser":["uuid"],"removeUser":["uuid"],"getLogByName":["id","name"],"downloadExternalPackage":["package","cluster_id","force","skip_compatibility"],"getUsersFromAuthor":["provider","author"],"open":["input"],"fetchLoggedInProfile":["access_token"],"searchPackages":["provider","query"],"getClusters":[],"getProfileOrDefault":["name"],"setDefaultUser":["uuid"],"getRunningProcesses":[],"getUsers":[],"getLoadersForVersion":["mc_version"],"getScreenshots":["id"],"getWorlds":["id"],"killProcess":["pid"],"writeSettings":["setting"],"updateClusterProfile":["name","profile"],"convertUsernameUUID":["username_uuid"],"changeCape":["access_token","cape_uuid"],"setDiscordRPCMessage":["message"],"createSettingsProfile":["name"],"removePackage":["cluster_id","package_hash"],"downloadPackage":["provider","package_id","version_id","cluster_id","skip_compatibility"],"getRunningProcessesByClusterId":["cluster_id"],"uploadSkinBytes":["access_token","skin_data","image_format","skin_variant"],"updateClusterById":["id","request"],"fetchMinecraftProfile":["uuid"],"getClusterById":["id"],"createCluster":["options"],"getLogs":["id"],"isClusterRunning":["cluster_id"],"openMsaLogin":[],"getGameVersions":[],"refreshAccount":["uuid"],"refreshAccounts":[],"removeCluster":["id"],"launchCluster":["id","uuid","search_for_java"],"readSettings":[],"getPackage":["provider","slug"],"setClusterStage":["id","stage"],"getPackageBody":["provider","body"],"getGlobalProfile":[],"getMultiplePackages":["provider","slugs"],"getPackageVersions":["provider","slug","mc_version","loader","offset","limit"]}', 'oneclient':'{"getVersions":[],"getClustersGroupedByMajor":[],"checkForUpdate":[],"getBundlesFor":["cluster_id"],"installUpdate":[]}', 'events':'{"message":["event"],"ingress":["event"],"process":["event"]}', 'folders':'{"fromCluster":["folder_name"],"openCluster":["folder_name"]}' }
|
||||
export type Router = { 'core': { getClusters: () => Promise<ClusterModel[]>,
|
||||
getClusterById: (id: number) => Promise<ClusterModel | null>,
|
||||
removeCluster: (id: number) => Promise<null>,
|
||||
|
|
@ -360,11 +360,11 @@ getBundlesFor: (clusterId: number) => Promise<ModpackArchive[]>,
|
|||
getVersions: () => Promise<OnlineClusterManifest>,
|
||||
checkForUpdate: () => Promise<Update | null>,
|
||||
installUpdate: () => Promise<null> },
|
||||
'folders': { fromCluster: (folderName: string) => Promise<string>,
|
||||
openCluster: (folderName: string) => Promise<null> },
|
||||
'events': { ingress: (event: IngressPayload) => Promise<void>,
|
||||
message: (event: MessagePayload) => Promise<void>,
|
||||
process: (event: ProcessPayload) => Promise<void> },
|
||||
'folders': { fromCluster: (folderName: string) => Promise<string>,
|
||||
openCluster: (folderName: string) => Promise<null> },
|
||||
'debug': { openDevTools: () => Promise<void>,
|
||||
isInDev: () => Promise<boolean>,
|
||||
getArch: () => Promise<string>,
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@ export function useDebugInfo(): DebugInfoArray {
|
|||
type,
|
||||
osVersion,
|
||||
commitHash,
|
||||
buildTimestamp: new Date(buildTimestamp).getTime().toString(),
|
||||
buildTimestamp,
|
||||
buildVersion,
|
||||
});
|
||||
};
|
||||
|
|
@ -91,11 +91,14 @@ export function useDebugInfo(): DebugInfoArray {
|
|||
|
||||
export function copyDebugInfo(debugInfo: DebugInfoArray) {
|
||||
const timestamp = Math.floor(new Date().getTime() / 1000);
|
||||
const lines = [`**Data exported at:** <t:${timestamp}> (\`${timestamp}\`)`, ...debugInfo.map((lineData) => {
|
||||
if (lineData.title === 'Build Timestamp')
|
||||
return `**${lineData.title}:** <t:${Math.floor(Number(lineData.value) / 1000)}> (\`${Math.floor(Number(lineData.value) / 1000)}\`)`;
|
||||
return `**${lineData.title}:** \`${lineData.value}\``;
|
||||
})];
|
||||
const lines = [
|
||||
`**Data exported at:** <t:${timestamp}> (\`${timestamp}\`)`,
|
||||
...debugInfo.map((lineData) => {
|
||||
if (lineData.title === 'Build Timestamp')
|
||||
return `**${lineData.title}:** <t:${lineData.value}> (\`${lineData.value}\`)`;
|
||||
return `**${lineData.title}:** \`${lineData.value}\``;
|
||||
}),
|
||||
];
|
||||
writeText(lines.join('\n'));
|
||||
}
|
||||
|
||||
|
|
@ -117,7 +120,7 @@ export function RawDebugInfo({ debugInfo }: { debugInfo: DebugInfoArray }) {
|
|||
{debugInfo.map((lineData) => {
|
||||
let line = '';
|
||||
if (lineData.title === 'Build Timestamp')
|
||||
line = `${lineData.title}: ${new Date(Number(lineData.value))}`;
|
||||
line = `${lineData.title}: ${new Date(Number(lineData.value) * 1000).toString()}`;
|
||||
else line = `${lineData.title}: ${lineData.value}`;
|
||||
|
||||
return <p key={lineData.title}>{line}</p>;
|
||||
|
|
|
|||
|
|
@ -79,7 +79,7 @@ impl TauriLauncherDebugApi for TauriLauncherDebugApiImpl {
|
|||
}
|
||||
|
||||
async fn get_build_timestamp(self) -> String {
|
||||
crate::build::BUILD_TIME.to_string()
|
||||
crate::build::BUILD_TIMESTAMP.to_string()
|
||||
}
|
||||
|
||||
async fn get_package_version(self) -> String {
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue