Merge branch 'develop'

Author: xjbeta

IINA+.xcodeproj/project.pbxproj

@@ -1100,7 +1100,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 11.5;
-				MARKETING_VERSION = 0.8.8;
+				MARKETING_VERSION = 0.8.9;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.xjbeta.iina-plus";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1127,7 +1127,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 11.5;
-				MARKETING_VERSION = 0.8.8;
+				MARKETING_VERSION = 0.8.9;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.xjbeta.iina-plus";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

IINA+/Utils/Danmaku/DanmakuBiliLive.swift

@@ -106,7 +106,10 @@ extension Danmaku {
 	}
 
 	func bililiveToken(_ rid: String) async throws -> String {
-		let url = "https://api.live.bilibili.com/xlive/web-room/v1/index/getDanmuInfo?id=\(rid)&type=0"
+        
+        let param = try await Processes.shared.videoDecoder.bilibili.wbiSign("id=\(rid)&type=0&web_location=444.8")
+		let url = "https://api.live.bilibili.com/xlive/web-room/v1/index/getDanmuInfo?\(param)"
+        
 		let data = try await AF.request(url).serializingData().value
 		let json = try JSONParser.JSONObjectWithData(data)
 

IINA+/Utils/VideoDecoder/BilbiliShare.swift

@@ -9,6 +9,8 @@
 import Foundation
 import Alamofire
 import Marshal
+import CommonCrypto
+import CryptoSwift
 
 actor BilibiliShare {
 
@@ -84,6 +86,62 @@ actor BilibiliShare {
 
         return yougetJson
     }
+    
+    
+    // https://github.com/SocialSisterYi/bilibili-API-collect/blob/f1001353f83e12e018ae6bc42fa73654986eb544/docs/misc/sign/wbi.md#swift
+    
+    func biliWbiSign(param: String, wbiImg: String, wbiSub: String) -> String {
+        func getMixinKey(orig: String) -> String {
+            String(mixinKeyEncTab.map { orig[orig.index(orig.startIndex, offsetBy: $0)] }.prefix(32))
+        }
+        
+        func encWbi(params: [String: Any], imgKey: String, subKey: String) -> [String: Any] {
+            var params = params
+            let mixinKey = getMixinKey(orig: imgKey + subKey)
+            let currTime = Int(Date().timeIntervalSince1970)
+            params["wts"] = currTime
+            
+            let query = params.sorted {
+                $0.key < $1.key
+            }.map { (key, value) -> String in
+                let stringValue: String
+                
+                if let doubleValue = value as? Double, doubleValue.truncatingRemainder(dividingBy: 1) == 0 {
+                    stringValue = String(Int(doubleValue))
+                } else {
+                    stringValue = String(describing: value)
+                }
+                
+                let filteredValue = stringValue.filter { !"!'()*".contains($0) }
+                
+                return "\(key)=\(filteredValue)"
+            }.joined(separator: "&")
+            
+            let wbiSign = (query + mixinKey).md5()
+            params["w_rid"] = wbiSign
+            
+            return params
+        }
+        
+        let mixinKeyEncTab = [
+            46, 47, 18, 2, 53, 8, 23, 32, 15, 50, 10, 31, 58, 3, 45, 35, 27, 43, 5, 49,
+            33, 9, 42, 19, 29, 28, 14, 39, 12, 38, 41, 13, 37, 48, 7, 16, 24, 55, 40,
+            61, 26, 17, 0, 1, 60, 51, 30, 4, 22, 25, 54, 21, 56, 59, 6, 63, 57, 62, 11,
+            36, 20, 34, 44, 52
+        ]
+        
+        let spdParam = param.components(separatedBy: "&")
+        var spdDicParam = [String: String]()
+        for pair in spdParam {
+            let components = pair.components(separatedBy: "=")
+            if components.count == 2 {
+                spdDicParam[components[0]] = components[1]
+            }
+        }
+        
+        let signedParams = encWbi(params: spdDicParam, imgKey: wbiImg, subKey: wbiSub)
+        return signedParams.map { "\($0.key)=\($0.value)" }.joined(separator: "&")
+    }
 }
 
 struct BilibiliPlayInfo: Unmarshaling {

IINA+/Utils/VideoDecoder/Bilibili.swift

@@ -15,6 +15,9 @@ actor Bilibili: SupportSiteProtocol {
     let biliShare = BilibiliShare()
     let bangumi = Bangumi()
 
+    private var wbiKeys: (img: String, sub: String)?
+    private var wbiRefreshDate: Date?
+    
 	func liveInfo(_ url: String) async throws -> any LiveInfo {
 		let isBangumi = SupportSites(url: url) == .bangumi
 
@@ -191,12 +194,25 @@ actor Bilibili: SupportSiteProtocol {
 		let data = try await AF.request("https://api.bilibili.com/x/web-interface/nav").serializingData().value
 		let json: JSONObject = try JSONParser.JSONObjectWithData(data)
 		let isLogin: Bool = try json.value(for: "data.isLogin")
+        
 		NotificationCenter.default.post(name: .biliStatusChanged, object: nil, userInfo: ["isLogin": isLogin])
 		var name = ""
-		if isLogin {
-			name = try json.value(for: "data.uname")
-		}
-		
+        
+        guard isLogin else {
+            return (isLogin, name)
+        }
+        
+        name = try json.value(for: "data.uname")
+        guard let s1: String = try? json.value(for: "data.wbi_img.img_url"),
+              let s2: String = try? json.value(for: "data.wbi_img.sub_url"),
+              let img = URL(string: s1)?.deletingPathExtension().lastPathComponent,
+              let sub = URL(string: s2)?.deletingPathExtension().lastPathComponent else {
+            Log("Bilibili wbi keys not found")
+            return (false, name)
+        }
+        
+        wbiKeys = (img, sub)
+        
 		return (isLogin, name)
     }
 
@@ -215,6 +231,30 @@ actor Bilibili: SupportSiteProtocol {
 		return try json.value(for: "data.mid")
     }
 
+    func wbiSign(_ param: String) async throws -> String {
+        let now = Date()
+        var needsRefresh = true
+        
+        if let lastRefresh = wbiRefreshDate {
+            var calendar = Calendar.current
+            calendar.timeZone = TimeZone(identifier: "Asia/Shanghai")!
+            if calendar.isDate(lastRefresh, inSameDayAs: now) {
+                needsRefresh = false
+            }
+        }
+        
+        if needsRefresh || wbiKeys == nil {
+            let _ = try await isLogin()
+            self.wbiRefreshDate = now
+        }
+        
+        guard let wbiKeys else {
+            return ""
+        }
+        
+        return await biliShare.biliWbiSign(param: param, wbiImg: wbiKeys.img, wbiSub: wbiKeys.sub)
+    }
+    
     func dynamicList(_ uid: Int,
                      _ action: BilibiliDynamicAction = .init😅,
                      _ dynamicID: Int = -1) async throws -> [BilibiliCard] {