From 6d5f86bacaf31754e5426ad09dc0cb7975d70881 Mon Sep 17 00:00:00 2001
From: Alexander Lopatin <alopatindev@codonaft.com>
Date: Wed, 27 Nov 2024 22:44:58 +0800
Subject: [PATCH] Debug

---
 _config.yml                                     |  2 +-
 _hosts/media.codonaft/etc/init.d/aquatic_ws     | 17 +++++++++++------
 .../media.codonaft/etc/nginx/http.d/media.conf  |  2 +-
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/_config.yml b/_config.yml
index db865b7..7180a39 100644
--- a/_config.yml
+++ b/_config.yml
@@ -147,8 +147,8 @@ theme_settings:
   p2p_player:
     media_url: https://media.codonaft.com
     trackers:
-    - wss://media.codonaft.com/announce
     - wss://tracker.webtorrent.dev
+    - wss://media.codonaft.com/announce
     #- wss://tracker.openwebtorrent.com
     ice_servers:
     - stun:stun.framasoft.org
diff --git a/_hosts/media.codonaft/etc/init.d/aquatic_ws b/_hosts/media.codonaft/etc/init.d/aquatic_ws
index d3c50e5..4dfa3bf 100755
--- a/_hosts/media.codonaft/etc/init.d/aquatic_ws
+++ b/_hosts/media.codonaft/etc/init.d/aquatic_ws
@@ -37,23 +37,28 @@ update_access_list() {
 	# https://github.com/Novage/p2p-media-loader/blob/fe59c09e8226687f0478836becdaf2bbb39c10ba/packages/p2p-media-loader-core/src/utils/peer.ts#L12
 	python -c "
 from glob import glob
+from syslog import syslog
 import base64, hashlib, os, tempfile, tomllib
 
 location = '/var/www/'
 config = tomllib.load(open('${CONFIG_FILE}', 'rb'))
 output = config['access_list']['path']
+
+syslog('aquatic_ws: generating info hashes')
 with tempfile.NamedTemporaryFile(delete=False, dir=os.path.dirname(output), mode='wt') as temp:
 	for i in glob('%s/*/*/main.m3u8' % location):
 		def write_hashes(n, stream_type):
 			for index in range(n):
 				stream_swarm_id = b'v2-https://%s-%s-%d' % (i.replace(location, '').encode('utf-8'), stream_type, index)
-				item = base64.b64encode(hashlib.md5(stream_swarm_id).digest()[1:]).hex()
+				raw_item = base64.b64encode(hashlib.md5(stream_swarm_id).digest()[1:])
+				item = raw_item.hex()
+				syslog('aquatic_ws: %s %s %s' % (stream_swarm_id, raw_item, item))
 				temp.write(item + '\\n')
-		parent_dir = os.path.dirname(i)
-		main_streams = glob('%s/*/video.m3u8' % parent_dir)
-		secondary_streams = glob('%s/*/audio.m3u8' % parent_dir)
-		write_hashes(len(main_streams), b'main')
-		write_hashes(len(secondary_streams), b'secondary')
+		playlist = open(i).readlines()
+		main_streams = sum(1 for i in playlist if i.startswith('#EXT-X-STREAM-INF'))
+		secondary_streams = sum(1 for i in playlist if i.startswith('#EXT-X-MEDIA:TYPE=AUDIO'))
+		write_hashes(main_streams, b'main')
+		write_hashes(secondary_streams, b'secondary')
 	temp.close()
 	os.chmod(temp.name, 0o644)
 	os.replace(temp.name, output)"
diff --git a/_hosts/media.codonaft/etc/nginx/http.d/media.conf b/_hosts/media.codonaft/etc/nginx/http.d/media.conf
index b8d3b81..53116cb 100644
--- a/_hosts/media.codonaft/etc/nginx/http.d/media.conf
+++ b/_hosts/media.codonaft/etc/nginx/http.d/media.conf
@@ -74,7 +74,7 @@ server {
     add_header "Access-Control-Allow-Origin" $origin always;
 
     # 4 hours, for testing
-    add_header Cache-Control "public, max-age=14400, immutable";
+    add_header Cache-Control "public, max-age=14400, must-revalidate";
     expires 4h;
 
     # TODO: 1 year