Update CDN & Reject Hosts, Merge Stream Hosts Item

Source/domainset/cdn.conf

@@ -3211,6 +3211,16 @@ res-etl-ssl.mypikpak.com
 sg-thumbnail-drive.mypikpak.com
 static.mypikpak.com
 
+# >> OFIII & LITV
+p-cdnstatic.svc.litv.tv
+s-cdnstatic.svc.litv.tv
+jsmodule.svc.litv.tv
+bulletin.svc.litv.tv
+static.svc.litv.tv
+# Amazon S3
+fino.svc.litv.tv
+player.svc.litv.tv
+
 # >> General CDN
 .rspcdn.net
 .ziffstatic.com
@@ -4463,8 +4473,6 @@ img.thingiverse.com
 marketing.thingiverse.com
 status.canarymail.io
 static.zuora.com
-p-cdnstatic.svc.litv.tv
-s-cdnstatic.svc.litv.tv
 pim-media.intel.com
 attach2.mobile01.com
 attach.mobile01.com

Source/domainset/reject.conf

@@ -1161,6 +1161,7 @@ log-upload.mihoyo.com
 log-upload-os.hoyoverse.com
 .log-report.com
 tracks.hackmd.io
+e2elog.fetnet.net
 
 # CNAME: dualstack.beaconserver-ce-vpc0-1537565064.eu-west-1.elb.amazonaws.com
 # note "beaconserver"

Source/stream.ts

@@ -446,7 +446,9 @@ const LITV: StreamService = {
   name: 'LiTV',
   rules: [
     'DOMAIN,litvfreemobile-hichannel.cdn.hinet.net',
-    'DOMAIN-SUFFIX,litv.tv'
+    'DOMAIN,ntdfreepc-tgc.cdn.hinet.net',
+    'DOMAIN,www.litv.tv',
+    'DOMAIN,cdi.ofiii.com' // Ofiii Free Movie
   ]
 };
 
@@ -801,13 +803,6 @@ const FRIDAY_TW: StreamService = {
   ]
 };
 
-const OFIII: StreamService = {
-  name: 'ofiii Free Movie',
-  rules: [
-    'DOMAIN,cdi.ofiii.com'
-  ]
-};
-
 export const ALL: StreamService[] = [
   $4GTV,
   ABEMA_TV, AMAZON_PRIME_VIDEO, ALL4, APPLE_TV, APPLE_MUSIC_TV,
@@ -822,10 +817,10 @@ export const ALL: StreamService[] = [
   JOOX,
   KKBOX,
   KKTV,
-  LINE_TV, LITV,
+  LINE_TV,
   MY5, MYTV_SUPER,
   NETFLIX, NAVER_TV, NICONICO, NHK_PLUS, NOW_E,
-  OFIII, OVERCAST_FM,
+  OVERCAST_FM,
   PARAMOUNT, PBS, PEACOCK, PANDORA, PORNHUB,
   SOUNDCLOUD, SHOWTIME, SPOTIFY,
   TAIWAN_GOOD, TIDAL, TIKTOK, TVB_ANYWHERE, TWITCH,
@@ -923,8 +918,7 @@ export const TW: StreamService[] = [
   HBO_ASIA,
   BAHAMUT,
   // elevensportstw,
-  FRIDAY_TW,
-  OFIII
+  FRIDAY_TW
 ];
 
 export const JP: StreamService[] = [