fix(douyin)

Author: liuchuancong

assets/js/crypto-js.min.js

@@ -1,7 +1,7 @@
 {
-  "version": "1.9.8",
+  "version": "1.9.9",
   "version_num": 10198,
-  "version_desc": "-Fix: 修复Exo全屏播放. \n-Add:播放页面添加切换直播间以及倒计时退出 . \n-Fix: 优化弹幕设置. \n-Fix: 优化暗黑模式启动图. \n-Fix: 修复视频显示模式调整.",
+  "version_desc": "-Fix: 修复douyin.",
   "prerelease":false,
   "download_url": "https://github.com/liuchuancong/pure_live/releases"
 }

assets/js/douyin.js

@@ -270,7 +270,7 @@ class SettingsService extends GetxController {
   final videoFitIndex = (PrefUtil.getInt('videoFitIndex') ?? 0).obs;
   final hideDanmaku = (PrefUtil.getBool('hideDanmaku') ?? false).obs;
   final danmakuTopArea = (PrefUtil.getDouble('danmakuTopArea') ?? 0.0).obs;
-  final danmakuBottomArea = (PrefUtil.getDouble('danmakuBottomArea') ?? 0.0).obs;
+  final danmakuBottomArea = (PrefUtil.getDouble('danmakuBottomArea') ?? 0.5).obs;
   final danmakuSpeed = (PrefUtil.getDouble('danmakuSpeed') ?? 8.0).obs;
   final danmakuFontSize = (PrefUtil.getDouble('danmakuFontSize') ?? 16.0).obs;
   final danmakuFontBorder = (PrefUtil.getDouble('danmakuFontBorder') ?? 4.0).obs;
@@ -657,11 +657,7 @@ class SettingsService extends GetxController {
               ? 0.4
               : double.parse(json['danmakuTopArea'].toString())
         : 0.0;
-    danmakuBottomArea.value = json['danmakuBottomArea'] != null
-        ? double.parse(json['danmakuBottomArea'].toString()) > 0.4
-              ? 0.4
-              : double.parse(json['danmakuBottomArea'].toString())
-        : 0.0;
+    danmakuBottomArea.value = double.parse(json['danmakuBottomArea'].toString());
     danmakuSpeed.value = json['danmakuSpeed'] != null ? double.parse(json['danmakuSpeed'].toString()) : 8.0;
     danmakuFontSize.value = json['danmakuFontSize'] != null ? double.parse(json['danmakuFontSize'].toString()) : 16.0;
     danmakuFontBorder.value = json['danmakuFontBorder'] != null

assets/js/webmssdk.js

@@ -15,11 +15,6 @@ class JsEngine {
     jsRuntime.evaluate(webmssdkjs);
   }
 
-  static Future<void> loadDouyinExEcutorSdk() async {
-    final douyinsdkjs = await rootBundle.loadString('assets/js/douyin.js');
-    jsRuntime.evaluate(douyinsdkjs);
-  }
-
   static JsEvalResult evaluate(String code) {
     return jsRuntime.evaluate(code);
   }

assets/version.json

@@ -2,7 +2,7 @@ import 'dart:convert';
 import 'package:http/http.dart' as http;
 
 class VersionUtil {
-  static const String version = '1.9.8';
+  static const String version = '1.9.9';
   static const String projectUrl = 'https://github.com/liuchuancong/pure_live';
   static const String releaseUrl = 'https://api.github.com/repos/liuchuancong/pure_live/releases';
   static const String issuesUrl = 'https://github.com/liuchuancong/pure_live/issues';

lib/common/services/settings_service.dart

@@ -2,14 +2,10 @@ import 'dart:io';
 import 'dart:async';
 import 'dart:convert';
 import 'proto/douyin.pb.dart';
-import 'package:crypto/crypto.dart';
-import 'package:flutter_js/flutter_js.dart';
 import 'package:pure_live/core/site/douyin_site.dart';
-import 'package:pure_live/common/utils/js_engine.dart';
 import 'package:pure_live/common/models/live_message.dart';
 import 'package:pure_live/core/common/web_socket_util.dart';
 import 'package:pure_live/core/interface/live_danmaku.dart';
-import 'package:pure_live/core/common/http_client.dart' as http;
 
 class DouyinDanmakuArgs {
   final String webRid;
@@ -41,17 +37,13 @@ class DouyinDanmaku implements LiveDanmaku {
   Future start(dynamic args) async {
     danmakuArgs = args as DouyinDanmakuArgs;
     var ts = DateTime.now().millisecondsSinceEpoch;
-    JsEngine.init();
-    await JsEngine.loadDouyinSdk();
-    var xMsStub = getMsStub(danmakuArgs.roomId, danmakuArgs.userId);
-    JsEvalResult jsEvalResult = await JsEngine.evaluateAsync("get_sign('$xMsStub')");
     var uri = Uri.parse(serverUrl).replace(
       scheme: "wss",
       queryParameters: {
         "app_name": "douyin_web",
         "version_code": "180800",
-        "webcast_sdk_version": "1.0.14-beta.0",
-        "update_version_code": "1.0.14-beta.0",
+        "webcast_sdk_version": "1.3.0",
+        "update_version_code": "1.3.0",
         "compress": "gzip",
         // "internal_ext":
         //     "internal_src:dim|wss_push_room_id:${danmakuArgs.roomId}|wss_push_did:${danmakuArgs.userId}|dim_log_id:20230626152702E8F63662383A350588E1|fetch_time:1687764422114|seq:1|wss_info:0-1687764422114-0-0|wrds_kvs:WebcastRoomRankMessage-1687764036509597990_InputPanelComponentSyncData-1687736682345173033_WebcastRoomStatsMessage-1687764414427812578",
@@ -79,18 +71,22 @@ class DouyinDanmaku implements LiveDanmaku {
         "identity": "audience",
         "room_id": danmakuArgs.roomId,
         "heartbeatDuration": "0",
-        "signature": jsEvalResult.stringResult,
+        //"signature": "00000000"
       },
     );
 
-    // var sign = await getSignature(danmakuArgs.roomId, danmakuArgs.userId);
+    var sign = await getSignature(danmakuArgs.roomId, danmakuArgs.userId);
 
-    var url = "$uri";
+    var url = "$uri&signature=$sign";
     var backupUrl = url.replaceAll("webcast3-ws-web-lq", "webcast5-ws-web-lf");
     webScoketUtils = WebScoketUtils(
       url: url,
       backupUrl: backupUrl,
-      headers: {"User-Agnet": DouyinSite.kDefaultUserAgent, "Cookie": danmakuArgs.cookie},
+      headers: {
+        "User-Agnet": DouyinSite.kDefaultUserAgent,
+        "Cookie": danmakuArgs.cookie,
+        "Origin": "https://live.douyin.com",
+      },
       heartBeatTime: heartbeatTime,
       onMessage: (e) {
         decodeMessage(e);
@@ -119,9 +115,7 @@ class DouyinDanmaku implements LiveDanmaku {
     webScoketUtils?.sendMessage(obj.writeToBuffer());
   }
 
-  void decodeMessage(List<int> args) {
-    // CoreLog.i(args.toString());
-
+  void decodeMessage(dynamic args) {
     var wssPackage = PushFrame.fromBuffer(args);
 
     var logId = wssPackage.logId;
@@ -156,25 +150,6 @@ class DouyinDanmaku implements LiveDanmaku {
     );
   }
 
-  /// 获取Websocket签名
-  /// - [roomId] 房间ID, 例如：7382735338101328680
-  /// - [uniqueId] 用户唯一ID, 例如：7273033021933946427
-  ///
-  /// 服务端代码：https://github.com/lovelyyoshino/douyin_python，请自行部署后使用
-  Future<String> getSignature(String roomId, String uniqueId) async {
-    try {
-      var signResult = await http.HttpClient.instance.postJson(
-        "https://dy.nsapps.cn/signature",
-        queryParameters: {},
-        header: {"Content-Type": "application/json"},
-        data: {"roomId": roomId, "uniqueId": uniqueId},
-      );
-      return signResult["data"]["signature"];
-    } catch (e) {
-      return "";
-    }
-  }
-
   void unPackWebcastRoomUserSeqMessage(List<int> payload) {
     var roomUserSeqMessage = RoomUserSeqMessage.fromBuffer(payload);
 
@@ -210,27 +185,11 @@ class DouyinDanmaku implements LiveDanmaku {
     webScoketUtils?.close();
   }
 
-  String getMsStub(String liveRoomRealId, String userUniqueId) {
-    Map<String, dynamic> params = {
-      "live_id": "1",
-      "aid": "6383",
-      "version_code": 180800,
-      "webcast_sdk_version": '1.0.14-beta.0',
-      "room_id": liveRoomRealId,
-      "sub_room_id": "",
-      "sub_channel_id": "",
-      "did_rule": "3",
-      "user_unique_id": userUniqueId,
-      "device_platform": "web",
-      "device_type": "",
-      "ac": "",
-      "identity": "audience",
-    };
-
-    String sigParams = params.entries.map((e) => '${e.key}=${e.value}').join(',');
-
-    var bytes = utf8.encode(sigParams);
-    var digest = md5.convert(bytes);
-    return digest.toString();
+  Future<String> Function(String, String) getSignature = (roomId, uniqueId) async {
+    return "";
+  };
+
+  void setSignatureFunction(Future<String> Function(String, String) func) {
+    getSignature = func;
   }
 }

lib/common/utils/js_engine.dart

@@ -46,7 +46,7 @@ class DouyuDanmaku implements LiveDanmaku {
     webScoketUtils?.connect();
   }
 
-  void joinRoom(String roomId) {
+  void joinRoom(dynamic roomId) {
     webScoketUtils?.sendMessage(serializeDouyu("type@=loginreq/roomid@=$roomId/"));
     webScoketUtils?.sendMessage(serializeDouyu("type@=joingroup/rid@=$roomId/gid@=-9999/"));
   }
@@ -74,8 +74,11 @@ class DouyuDanmaku implements LiveDanmaku {
 
       var type = jsonData["type"]?.toString();
       //斗鱼好像不会返回人气值
-      //有些直播间存在阴间弹幕，不知道什么情况
       if (type == "chatmsg") {
+        // 屏蔽阴间弹幕
+        if (jsonData["dms"] == null) {
+          return;
+        }
         var col = int.tryParse(jsonData["col"].toString()) ?? 0;
         var liveMsg = LiveMessage(
           type: LiveMessageType.chat,

lib/common/utils/version_util.dart

@@ -0,0 +1,65 @@
+import 'dart:math';
+import 'package:crypto/crypto.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter_js/flutter_js.dart';
+import 'package:pure_live/core/site/douyin_site.dart';
+
+class DouyinSign {
+  static const String defaultUserAgent = DouyinSite.kDefaultUserAgent;
+  static Future<String> getAbogusUrl(String url, String userAgent) async {
+    JavascriptRuntime flutterJs = getJavascriptRuntime();
+    final msToken = generateMsToken(107);
+    var params = ('$url&msToken=$msToken').split('?')[1];
+    var query = params.contains("?") ? params.split("?")[1] : params;
+    var jsCode = await rootBundle.loadString('assets/js/douyin.js');
+    await flutterJs.evaluateAsync(jsCode);
+    // 执行getABogus函数
+    var aBogus = (await flutterJs.evaluateAsync("getABogus('$query', '$userAgent')")).stringResult;
+    flutterJs.dispose();
+    var newUrl = '$url&msToken=${Uri.encodeComponent(msToken)}&a_bogus=${Uri.encodeComponent(aBogus)}';
+    return newUrl;
+  }
+
+  static Future<String> getSignature(String roomId, String uniqueId) async {
+    JavascriptRuntime flutterJs = getJavascriptRuntime();
+    var jsCode = await rootBundle.loadString('assets/js/webmssdk.js');
+    await flutterJs.evaluateAsync(jsCode);
+    var msStub = getMsStub(roomId, uniqueId);
+    var signature = (await flutterJs.evaluateAsync("getMSSDKSignature('$msStub','$defaultUserAgent')")).stringResult;
+    // 如果signature中包含-或=，重新生成
+    while (signature.contains('-') || signature.contains('=')) {
+      signature = (await flutterJs.evaluateAsync("getMSSDKSignature('$msStub','$defaultUserAgent')")).stringResult;
+    }
+    flutterJs.dispose();
+    return signature;
+  }
+
+  static String getMsStub(String roomId, String uniqueId) {
+    final params = {
+      "live_id": "1",
+      "aid": "6383",
+      "version_code": 180800,
+      "webcast_sdk_version": "1.3.0",
+      "room_id": roomId,
+      "sub_room_id": "",
+      "sub_channel_id": "",
+      "did_rule": "3",
+      "user_unique_id": uniqueId,
+      "device_platform": "web",
+      "device_type": "",
+      "ac": "",
+      "identity": "audience",
+    };
+    final sigParams = params.entries.map((e) => "${e.key}=${e.value}").join(',');
+    // 需要导入crypto库: import 'package:crypto/crypto.dart';
+    final bytes = sigParams.codeUnits;
+    final digest = md5.convert(bytes);
+    return digest.toString();
+  }
+
+  static String generateMsToken(int length) {
+    const characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+    final random = Random.secure();
+    return List.generate(length, (_) => characters[random.nextInt(characters.length)]).join('');
+  }
+}