diff --git a/bilibili-evolved.offline.user.js b/bilibili-evolved.offline.user.js index 71d224410..1efccea18 100644 --- a/bilibili-evolved.offline.user.js +++ b/bilibili-evolved.offline.user.js @@ -1,6 +1,6 @@ // ==UserScript== // @name Bilibili Evolved (Offline) -// @version 616.26 +// @version 616.33 // @description Bilibili Evolved 的离线版, 所有功能都已内置于脚本中. // @author Grant Howard, Coulomb-G // @copyright 2020, Grant Howard (https://github.com/the1812) & Coulomb-G (https://github.com/Coulomb-G) @@ -2758,7 +2758,13 @@ class ResourceManager { url, responseType: 'blob', })) - const latestVersion = await Ajax.monkey({ url: Resource.root + 'version.txt' }) + let latestVersion + const zipVersion = zip.file('version.txt') + if (zipVersion) { + latestVersion = await zipVersion.async('text') + } else { + latestVersion = await Ajax.monkey({ url: (Resource.cdnRoot || Resource.root) + 'version.txt' }) + } isTimeout = false if (settings.currentVersion !== latestVersion) { console.log(`bundle version not match. current=${settings.currentVersion}, latest=${latestVersion}`) diff --git a/bilibili-evolved.preview-offline.user.js b/bilibili-evolved.preview-offline.user.js index f5ba60509..dba09e647 100644 --- a/bilibili-evolved.preview-offline.user.js +++ b/bilibili-evolved.preview-offline.user.js @@ -1,6 +1,6 @@ // ==UserScript== // @name Bilibili Evolved (Preview Offline) -// @version 616.26 +// @version 616.33 // @description Bilibili Evolved 的预览离线版, 可以抢先体验新功能, 并且所有功能都已内置于脚本中. // @author Grant Howard, Coulomb-G // @copyright 2020, Grant Howard (https://github.com/the1812) & Coulomb-G (https://github.com/Coulomb-G) @@ -2758,7 +2758,13 @@ class ResourceManager { url, responseType: 'blob', })) - const latestVersion = await Ajax.monkey({ url: Resource.root + 'version.txt' }) + let latestVersion + const zipVersion = zip.file('version.txt') + if (zipVersion) { + latestVersion = await zipVersion.async('text') + } else { + latestVersion = await Ajax.monkey({ url: (Resource.cdnRoot || Resource.root) + 'version.txt' }) + } isTimeout = false if (settings.currentVersion !== latestVersion) { console.log(`bundle version not match. current=${settings.currentVersion}, latest=${latestVersion}`) diff --git a/bilibili-evolved.preview.user.js b/bilibili-evolved.preview.user.js index 5cfd271fa..e298e8c17 100644 --- a/bilibili-evolved.preview.user.js +++ b/bilibili-evolved.preview.user.js @@ -2817,7 +2817,13 @@ class ResourceManager { url, responseType: 'blob', })) - const latestVersion = await Ajax.monkey({ url: Resource.root + 'version.txt' }) + let latestVersion + const zipVersion = zip.file('version.txt') + if (zipVersion) { + latestVersion = await zipVersion.async('text') + } else { + latestVersion = await Ajax.monkey({ url: (Resource.cdnRoot || Resource.root) + 'version.txt' }) + } isTimeout = false if (settings.currentVersion !== latestVersion) { console.log(`bundle version not match. current=${settings.currentVersion}, latest=${latestVersion}`) diff --git a/bilibili-evolved.user.js b/bilibili-evolved.user.js index fa53a2c99..f4c19b6ca 100644 --- a/bilibili-evolved.user.js +++ b/bilibili-evolved.user.js @@ -2817,7 +2817,13 @@ class ResourceManager { url, responseType: 'blob', })) - const latestVersion = await Ajax.monkey({ url: Resource.root + 'version.txt' }) + let latestVersion + const zipVersion = zip.file('version.txt') + if (zipVersion) { + latestVersion = await zipVersion.async('text') + } else { + latestVersion = await Ajax.monkey({ url: (Resource.cdnRoot || Resource.root) + 'version.txt' }) + } isTimeout = false if (settings.currentVersion !== latestVersion) { console.log(`bundle version not match. current=${settings.currentVersion}, latest=${latestVersion}`) diff --git a/builder/dotnet/BundleBuilder.cs b/builder/dotnet/BundleBuilder.cs index d98945575..aae3687d6 100644 --- a/builder/dotnet/BundleBuilder.cs +++ b/builder/dotnet/BundleBuilder.cs @@ -53,6 +53,7 @@ namespace BilibiliEvolved.Build zip.CreateEntryFromFile(url, filename, CompressionLevel.NoCompression); hashDict.Add(filename, hash); } + zip.CreateEntryFromFile("version.txt", "version.txt", CompressionLevel.NoCompression); } File.WriteAllText("min/bundle.json", JsonConvert.SerializeObject(hashDict, Formatting.Indented)); WriteSuccess("Bundle build complete."); diff --git a/builder/dotnet/publish/build.dll b/builder/dotnet/publish/build.dll index 548155c98..7aa086d47 100644 Binary files a/builder/dotnet/publish/build.dll and b/builder/dotnet/publish/build.dll differ diff --git a/min/bundle.zip b/min/bundle.zip index c36a6371c..d05d27fe8 100644 Binary files a/min/bundle.zip and b/min/bundle.zip differ diff --git a/src/client/resource-manager.js b/src/client/resource-manager.js index cc4f76ef3..bc08ef65e 100644 --- a/src/client/resource-manager.js +++ b/src/client/resource-manager.js @@ -266,7 +266,13 @@ export class ResourceManager { url, responseType: 'blob', })) - const latestVersion = await Ajax.monkey({ url: Resource.root + 'version.txt' }) + let latestVersion + const zipVersion = zip.file('version.txt') + if (zipVersion) { + latestVersion = await zipVersion.async('text') + } else { + latestVersion = await Ajax.monkey({ url: (Resource.cdnRoot || Resource.root) + 'version.txt' }) + } isTimeout = false if (settings.currentVersion !== latestVersion) { console.log(`bundle version not match. current=${settings.currentVersion}, latest=${latestVersion}`)