fix cargo build warnings and cargo clippy --fix --allow-dirty --allow-no-vcs warnings; update config.toml which will be copied to docker image; Adjusting the release process.

Author: harlanc

.github/workflows/release.yml

@@ -36,6 +36,7 @@ jobs:
   release:
     name: Binary ${{ matrix.target }} (on ${{ matrix.os }})
     runs-on: ${{ matrix.os }}
+    needs: publish
     outputs:
       version: ${{ steps.extract_version.outputs.version }}
     strategy:

application/xiu/src/config/examples/config.toml

@@ -7,8 +7,8 @@ enabled = true
 port = 1935
 gop_num = 0
 [rtmp.auth]
-pull_enabled = true
-push_enabled = true
+pull_enabled = false
+push_enabled = false
 # simple or md5
 algorithm = "simple"
 # pull streams from other server node.
@@ -96,6 +96,6 @@ algorithm = "simple"
 level = "info"
 [log.file]
 # write log to file or not（Writing logs to file or console cannot be satisfied at the same time）.
-enabled = false
+enabled = true
 rotate = "hour" #[day,hour,minute]
-path = "./logs"
+path = "/app/logs"

library/streamhub/src/utils.rs

@@ -34,7 +34,7 @@ fn u8_to_enum(digit: u8) -> RandomDigitCount {
 }
 
 impl Uuid {
-    pub fn from_str2(uuid: &String) -> Option<Uuid> {
+    pub fn from_str2(uuid: &str) -> Option<Uuid> {
         let length = uuid.len();
         if !(10..=16).contains(&length) {
             return None;

protocol/hls/src/flv_data_receiver.rs

@@ -18,7 +18,7 @@ use {
     xflv::define::FlvData,
 };
 
-////https://www.jianshu.com/p/d6311f03b81f
+///https://www.jianshu.com/p/d6311f03b81f
 
 pub struct FlvDataReceiver {
     app_name: String,

protocol/rtmp/src/chunk/unpacketizer.rs

@@ -666,7 +666,7 @@ mod tests {
         queue.push_back(3);
         queue.push_back(4);
 
-        for (_idx, data) in queue.iter().enumerate() {
+        for data in queue.iter() {
             println!("{}", data);
         }
     }

protocol/rtsp/src/rtp/rtp_aac.rs

@@ -64,7 +64,7 @@ impl TPacker for RtpAacPacker {
         packet.payload.put(data);
 
         if let Some(f) = &self.on_packet_for_rtcp_handler {
-            f(packet.clone());
+            f(packet.clone()).await;
         }
 
         if let Some(f) = &self.on_packet_handler {
@@ -114,12 +114,13 @@ impl RtpAacUnPacker {
     }
 }
 
+#[async_trait]
 impl TUnPacker for RtpAacUnPacker {
-    fn unpack(&mut self, reader: &mut BytesReader) -> Result<(), UnPackerError> {
+    async fn unpack(&mut self, reader: &mut BytesReader) -> Result<(), UnPackerError> {
         let rtp_packet = RtpPacket::unmarshal(reader)?;
 
         if let Some(f) = &self.on_packet_for_rtcp_handler {
-            f(rtp_packet.clone());
+            f(rtp_packet.clone()).await;
         }
 
         let mut reader_payload = BytesReader::new(rtp_packet.payload);

protocol/rtsp/src/rtp/rtp_h264.rs

@@ -84,7 +84,7 @@ impl RtpH264Packer {
             packet.header.marker = if fu_header & define::FU_END > 0 { 1 } else { 0 };
 
             if let Some(f) = &self.on_packet_for_rtcp_handler {
-                f(packet.clone());
+                f(packet.clone()).await;
             }
 
             if let Some(f) = &self.on_packet_handler {
@@ -107,7 +107,7 @@ impl RtpH264Packer {
         self.header.seq_number += 1;
 
         if let Some(f) = &self.on_packet_for_rtcp_handler {
-            f(packet.clone());
+            f(packet.clone()).await;
         }
 
         if let Some(f) = &self.on_packet_handler {
@@ -159,12 +159,13 @@ pub struct RtpH264UnPacker {
     on_packet_for_rtcp_handler: Option<OnRtpPacketFn2>,
 }
 
+#[async_trait]
 impl TUnPacker for RtpH264UnPacker {
-    fn unpack(&mut self, reader: &mut BytesReader) -> Result<(), UnPackerError> {
+    async fn unpack(&mut self, reader: &mut BytesReader) -> Result<(), UnPackerError> {
         let rtp_packet = RtpPacket::unmarshal(reader)?;
 
         if let Some(f) = &self.on_packet_for_rtcp_handler {
-            f(rtp_packet.clone());
+            f(rtp_packet.clone()).await;
         }
 
         self.timestamp = rtp_packet.header.timestamp;

protocol/rtsp/src/rtp/rtp_h265.rs

@@ -108,7 +108,7 @@ impl RtpH265Packer {
             }
 
             if let Some(f) = &self.on_packet_for_rtcp_handler {
-                f(packet.clone());
+                f(packet.clone()).await;
             }
 
             if let Some(f) = &self.on_packet_handler {
@@ -128,7 +128,7 @@ impl RtpH265Packer {
         self.header.seq_number += 1;
 
         if let Some(f) = &self.on_packet_for_rtcp_handler {
-            f(packet.clone());
+            f(packet.clone()).await;
         }
 
         if let Some(f) = &self.on_packet_handler {
@@ -178,12 +178,13 @@ pub struct RtpH265UnPacker {
     on_packet_for_rtcp_handler: Option<OnRtpPacketFn2>,
 }
 
+#[async_trait]
 impl TUnPacker for RtpH265UnPacker {
-    fn unpack(&mut self, reader: &mut BytesReader) -> Result<(), UnPackerError> {
+    async fn unpack(&mut self, reader: &mut BytesReader) -> Result<(), UnPackerError> {
         let rtp_packet = RtpPacket::unmarshal(reader)?;
 
         if let Some(f) = &self.on_packet_for_rtcp_handler {
-            f(rtp_packet.clone());
+            f(rtp_packet.clone()).await;
         }
 
         self.timestamp = rtp_packet.header.timestamp;

protocol/rtsp/src/rtp/utils.rs

@@ -58,9 +58,10 @@ pub trait TVideoPacker: TPacker {
     async fn pack_nalu(&mut self, nalu: BytesMut) -> Result<(), PackerError>;
 }
 
+#[async_trait]
 pub trait TUnPacker: TRtpReceiverForRtcp + Send + Sync {
     /*Assemble rtp fragments into complete frame and send to stream hub*/
-    fn unpack(&mut self, reader: &mut BytesReader) -> Result<(), UnPackerError>;
+    async fn unpack(&mut self, reader: &mut BytesReader) -> Result<(), UnPackerError>;
     /*Call back function used for processing a frame.*/
     fn on_frame_handler(&mut self, f: OnFrameFn);
 }

protocol/rtsp/src/rtsp_channel.rs

@@ -69,9 +69,9 @@ impl RtpChannel {
     }
 
     //Receive av frame from network -> pack AV frame to RTP packet -> send to stream hub
-    pub fn on_packet(&mut self, reader: &mut BytesReader) -> Result<(), UnPackerError> {
+    pub async fn on_packet(&mut self, reader: &mut BytesReader) -> Result<(), UnPackerError> {
         if let Some(unpacker) = &mut self.rtp_unpacker {
-            unpacker.unpack(reader)?;
+            unpacker.unpack(reader).await?;
         }
         Ok(())
     }