From b35d8a2299251cd53f3715eac11e2f5848740f50 Mon Sep 17 00:00:00 2001
From: shogo4405 <shogo4405@gmail.com>
Date: Sat, 26 Oct 2024 02:00:26 +0900
Subject: [PATCH] implementaion for moqt draft7

---
 Examples/macOS/Base.lproj/Main.storyboard     |  26 +-
 .../macOS/FLVAnalyzerViewController.swift     |   2 +
 Examples/macOS/MoxygenChatClient.swift        |  32 +++
 HaishinKit.xcodeproj/project.pbxproj          |  42 ++++
 MoQTHaishinKit/MoQTHaishinKit.h               |   3 +
 MoQTHaishinKit/README.md                      |  30 +++
 MoQTHaishinKit/Sources/Constants.swift        |   3 +
 .../Sources/Extension/Data+Extension.swift    |  13 +
 ...xpressibleByIntegerLiteral+Extension.swift |  24 ++
 .../NWProtocolQUIC.Options+Extension.swift    |  12 +
 MoQTHaishinKit/Sources/MoQTConnection.swift   | 226 ++++++++++++++++++
 .../MoQTDataStream/MoQTDataStream.swift       |   9 +
 .../Sources/MoQTDataStream/MoQTObject.swift   |  33 +++
 .../MoQTStreamHeaderSubgroup.swift            |  35 +++
 .../Sources/MoQTMessage/MoQTAnnounce.swift    |  77 ++++++
 .../Sources/MoQTMessage/MoQTClientSetup.swift |  33 +++
 .../Sources/MoQTMessage/MoQTMessage.swift     |  75 ++++++
 .../Sources/MoQTMessage/MoQTServerSetup.swift |  27 +++
 .../Sources/MoQTMessage/MoQTSubscribe.swift   | 137 +++++++++++
 .../MoQTMessage/MoQTSubscribeAnnounces.swift  |  69 ++++++
 MoQTHaishinKit/Sources/MoQTPayload.swift      | 133 +++++++++++
 .../Sources/MoQTSetupParameter.swift          |  68 ++++++
 MoQTHaishinKit/Sources/MoQTSocket.swift       | 212 ++++++++++++++++
 MoQTHaishinKit/Sources/MoQTVersion.swift      |  12 +
 .../MoQTVersionSpecificParameter.swift        |  60 +++++
 MoQTHaishinKit/Tests/MoQTPayLoadTests.swift   |  14 ++
 .../Tests/MoQTStreamHeaderSubgroupTests.swift |  19 ++
 Package.swift                                 |   9 +-
 README.md                                     |   5 +-
 29 files changed, 1423 insertions(+), 17 deletions(-)
 create mode 100644 Examples/macOS/MoxygenChatClient.swift
 create mode 100644 MoQTHaishinKit/MoQTHaishinKit.h
 create mode 100644 MoQTHaishinKit/README.md
 create mode 100644 MoQTHaishinKit/Sources/Constants.swift
 create mode 100644 MoQTHaishinKit/Sources/Extension/Data+Extension.swift
 create mode 100644 MoQTHaishinKit/Sources/Extension/ExpressibleByIntegerLiteral+Extension.swift
 create mode 100644 MoQTHaishinKit/Sources/Extension/NWProtocolQUIC.Options+Extension.swift
 create mode 100644 MoQTHaishinKit/Sources/MoQTConnection.swift
 create mode 100644 MoQTHaishinKit/Sources/MoQTDataStream/MoQTDataStream.swift
 create mode 100644 MoQTHaishinKit/Sources/MoQTDataStream/MoQTObject.swift
 create mode 100644 MoQTHaishinKit/Sources/MoQTDataStream/MoQTStreamHeaderSubgroup.swift
 create mode 100644 MoQTHaishinKit/Sources/MoQTMessage/MoQTAnnounce.swift
 create mode 100644 MoQTHaishinKit/Sources/MoQTMessage/MoQTClientSetup.swift
 create mode 100644 MoQTHaishinKit/Sources/MoQTMessage/MoQTMessage.swift
 create mode 100644 MoQTHaishinKit/Sources/MoQTMessage/MoQTServerSetup.swift
 create mode 100644 MoQTHaishinKit/Sources/MoQTMessage/MoQTSubscribe.swift
 create mode 100644 MoQTHaishinKit/Sources/MoQTMessage/MoQTSubscribeAnnounces.swift
 create mode 100644 MoQTHaishinKit/Sources/MoQTPayload.swift
 create mode 100644 MoQTHaishinKit/Sources/MoQTSetupParameter.swift
 create mode 100644 MoQTHaishinKit/Sources/MoQTSocket.swift
 create mode 100644 MoQTHaishinKit/Sources/MoQTVersion.swift
 create mode 100644 MoQTHaishinKit/Sources/MoQTVersionSpecificParameter.swift
 create mode 100644 MoQTHaishinKit/Tests/MoQTPayLoadTests.swift
 create mode 100644 MoQTHaishinKit/Tests/MoQTStreamHeaderSubgroupTests.swift

diff --git a/Examples/macOS/Base.lproj/Main.storyboard b/Examples/macOS/Base.lproj/Main.storyboard
index 65bf3d53f..641dafe72 100644
--- a/Examples/macOS/Base.lproj/Main.storyboard
+++ b/Examples/macOS/Base.lproj/Main.storyboard
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="4Lp-xV-zxC">
+<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="23504" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="4Lp-xV-zxC">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22690"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="23504"/>
         <capability name="NSView safe area layout guides" minToolsVersion="12.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -79,7 +79,7 @@
                                     <action selector="selectAudio:" target="XfG-lQ-9wD" id="OFN-CV-EIr"/>
                                 </connections>
                             </popUpButton>
-                            <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="lB9-7R-daQ">
+                            <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="lB9-7R-daQ">
                                 <rect key="frame" x="20" y="20" width="300" height="21"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="300" id="beN-tf-ecK"/>
@@ -204,13 +204,13 @@
                         <autoresizingMask key="autoresizingMask"/>
                         <subviews>
                             <scrollView autohidesScrollers="YES" horizontalLineScroll="24" horizontalPageScroll="10" verticalLineScroll="24" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="U7X-zB-Ct9">
-                                <rect key="frame" x="0.0" y="0.0" width="154" height="3520"/>
+                                <rect key="frame" x="0.0" y="0.0" width="154" height="3622"/>
                                 <clipView key="contentView" id="TC0-20-xwt">
-                                    <rect key="frame" x="1" y="1" width="152" height="3518"/>
+                                    <rect key="frame" x="1" y="1" width="152" height="3620"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <subviews>
                                         <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" multipleSelection="NO" autosaveColumns="NO" rowHeight="24" rowSizeStyle="automatic" viewBased="YES" id="Zf5-MB-jdh">
-                                            <rect key="frame" x="0.0" y="0.0" width="152" height="3518"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="152" height="3620"/>
                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                             <size key="intercellSpacing" width="17" height="0.0"/>
                                             <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -232,7 +232,7 @@
                                                             <rect key="frame" x="8" y="0.0" width="135" height="24"/>
                                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                             <subviews>
-                                                                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="nKL-O8-0aU">
+                                                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="nKL-O8-0aU">
                                                                     <rect key="frame" x="0.0" y="4" width="135" height="16"/>
                                                                     <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="Lf1-hH-841">
                                                                         <font key="font" usesAppearanceFont="YES"/>
@@ -261,7 +261,7 @@
                                     </subviews>
                                 </clipView>
                                 <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="5e8-aJ-U5N">
-                                    <rect key="frame" x="1" y="3401" width="152" height="16"/>
+                                    <rect key="frame" x="1" y="3503" width="152" height="16"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                 </scroller>
                                 <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="eRz-M7-DJS">
@@ -378,7 +378,7 @@
                                     <action selector="selectCamera:" target="dhX-nT-Doa" id="F16-Nj-MQi"/>
                                 </connections>
                             </popUpButton>
-                            <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="EUe-gL-Kfw">
+                            <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="EUe-gL-Kfw">
                                 <rect key="frame" x="20" y="20" width="300" height="21"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="300" id="zUM-Oo-BRX"/>
@@ -422,7 +422,7 @@
                         <rect key="frame" x="0.0" y="0.0" width="480" height="480"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <subviews>
-                            <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="muK-Fu-lNp">
+                            <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="muK-Fu-lNp">
                                 <rect key="frame" x="16" y="419" width="300" height="21"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="300" id="onn-Pa-e0H"/>
@@ -436,7 +436,7 @@
                                     <outlet property="delegate" destination="9vk-iW-BZX" id="TTT-Ka-3O4"/>
                                 </connections>
                             </textField>
-                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="y43-vh-quB">
+                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="y43-vh-quB">
                                 <rect key="frame" x="14" y="448" width="73" height="16"/>
                                 <textFieldCell key="cell" lineBreakMode="clipping" title="RTMP URL:" id="a0O-iB-hpy">
                                     <font key="font" metaFont="system"/>
@@ -444,7 +444,7 @@
                                     <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                 </textFieldCell>
                             </textField>
-                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="WSq-ak-6dS">
+                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="WSq-ak-6dS">
                                 <rect key="frame" x="14" y="395" width="87" height="16"/>
                                 <textFieldCell key="cell" lineBreakMode="clipping" title="StreamName:" id="2cu-1b-UVj">
                                     <font key="font" metaFont="system"/>
@@ -452,7 +452,7 @@
                                     <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                 </textFieldCell>
                             </textField>
-                            <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="YII-qB-iiW">
+                            <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="YII-qB-iiW">
                                 <rect key="frame" x="16" y="366" width="300" height="21"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="300" id="03D-Ul-Uui"/>
diff --git a/Examples/macOS/FLVAnalyzerViewController.swift b/Examples/macOS/FLVAnalyzerViewController.swift
index 69473ff95..765551588 100644
--- a/Examples/macOS/FLVAnalyzerViewController.swift
+++ b/Examples/macOS/FLVAnalyzerViewController.swift
@@ -1,6 +1,7 @@
 import AppKit
 import Foundation
 @testable import HaishinKit
+import MoQTHaishinKit
 
 final class FLVAnalyzerViewController: NSViewController {
     @IBOutlet private weak var textView: NSTextView!
@@ -10,6 +11,7 @@ final class FLVAnalyzerViewController: NSViewController {
 
     private var tags: [any FLVTag] = []
     private var reader: FLVReader?
+    private var client: MoxygenChatClient = .init("moqt://localhost:4433/moq-chat")
 
     override func viewDidLoad() {
         super.viewDidLoad()
diff --git a/Examples/macOS/MoxygenChatClient.swift b/Examples/macOS/MoxygenChatClient.swift
new file mode 100644
index 000000000..3c91c0583
--- /dev/null
+++ b/Examples/macOS/MoxygenChatClient.swift
@@ -0,0 +1,32 @@
+import HaishinKit
+import MoQTHaishinKit
+
+public actor MoxygenChatClient {
+    public private(set) var isRunning: Bool = false
+    private let uri: String
+    private lazy var connection = MoQTConnection(.pubSub)
+
+    public init(_ uri: String) {
+        self.uri = uri
+    }
+}
+
+extension MoxygenChatClient: AsyncRunner {
+    public func startRunning() {
+        Task {
+            do {
+                let setUp = try await connection.connect(uri)
+                print(try await connection.annouce(["shogo4405/1000/0"], authInfo: "test"))
+                print(try await connection.subscribeAnnouces(["shogo4405/1000/0"], authInfo: "test"))
+            } catch {
+                print(error)
+            }
+        }
+    }
+
+    public func stopRunning() {
+        Task {
+            await connection.close()
+        }
+    }
+}
diff --git a/HaishinKit.xcodeproj/project.pbxproj b/HaishinKit.xcodeproj/project.pbxproj
index fd0f9a65f..1035b1149 100644
--- a/HaishinKit.xcodeproj/project.pbxproj
+++ b/HaishinKit.xcodeproj/project.pbxproj
@@ -8,6 +8,9 @@
 
 /* Begin PBXBuildFile section */
 		2915EC541D85BDF100621092 /* ReplayKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2915EC531D85BDF100621092 /* ReplayKit.framework */; };
+		BC0C81EF2CE8868E00DEA9E6 /* HaishinKit in Frameworks */ = {isa = PBXBuildFile; productRef = BC0C81EE2CE8868E00DEA9E6 /* HaishinKit */; };
+		BC0C81F12CE8868E00DEA9E6 /* MoQTHaishinKit in Frameworks */ = {isa = PBXBuildFile; productRef = BC0C81F02CE8868E00DEA9E6 /* MoQTHaishinKit */; };
+		BC0C81F32CE8868E00DEA9E6 /* SRTHaishinKit in Frameworks */ = {isa = PBXBuildFile; productRef = BC0C81F22CE8868E00DEA9E6 /* SRTHaishinKit */; };
 		BC2902352AA0E66A004821D2 /* Screencast.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = 2915EC521D85BDF100621092 /* Screencast.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
 		BC33A1192CDF523E0016EEA0 /* HaishinKit in Frameworks */ = {isa = PBXBuildFile; productRef = BC33A1182CDF523E0016EEA0 /* HaishinKit */; };
 		BC33A11B2CDF523E0016EEA0 /* SRTHaishinKit in Frameworks */ = {isa = PBXBuildFile; productRef = BC33A11A2CDF523E0016EEA0 /* SRTHaishinKit */; };
@@ -19,6 +22,7 @@
 		BC33A1272CDF52630016EEA0 /* SRTHaishinKit in Frameworks */ = {isa = PBXBuildFile; productRef = BC33A1262CDF52630016EEA0 /* SRTHaishinKit */; };
 		BC33A1292CDF526C0016EEA0 /* HaishinKit in Frameworks */ = {isa = PBXBuildFile; productRef = BC33A1282CDF526C0016EEA0 /* HaishinKit */; };
 		BC33A12B2CDF526C0016EEA0 /* SRTHaishinKit in Frameworks */ = {isa = PBXBuildFile; productRef = BC33A12A2CDF526C0016EEA0 /* SRTHaishinKit */; };
+		BC47FA352CE61FCF002900AE /* MoQTHaishinKit in Frameworks */ = {isa = PBXBuildFile; productRef = BC47FA342CE61FCF002900AE /* MoQTHaishinKit */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -130,6 +134,14 @@
 /* End PBXFileReference section */
 
 /* Begin PBXFileSystemSynchronizedBuildFileExceptionSet section */
+		BC0C81EC2CE8856000DEA9E6 /* PBXFileSystemSynchronizedBuildFileExceptionSet */ = {
+			isa = PBXFileSystemSynchronizedBuildFileExceptionSet;
+			membershipExceptions = (
+				Tests/MoQTPayLoadTests.swift,
+				Tests/MoQTStreamHeaderSubgroupTests.swift,
+			);
+			target = BCB798882CE06AEC0059DFE9 /* Tests */;
+		};
 		BC82CA7F2CD763F4003F99C9 /* PBXFileSystemSynchronizedBuildFileExceptionSet */ = {
 			isa = PBXFileSystemSynchronizedBuildFileExceptionSet;
 			membershipExceptions = (
@@ -170,6 +182,7 @@
 				macOS/MainSplitViewController.swift,
 				macOS/MainWindowController.swift,
 				macOS/MenuViewController.swift,
+				macOS/MoxygenChatClient.swift,
 				macOS/PlaybackViewController.swift,
 				macOS/PreferenceViewController.swift,
 				macOS/SCStreamPublishViewController.swift,
@@ -263,6 +276,7 @@
 		BC82C98F2CD76325003F99C9 /* SRTHaishinKit */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = SRTHaishinKit; sourceTree = "<group>"; };
 		BC82CA0E2CD76338003F99C9 /* DebugDescription */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = DebugDescription; sourceTree = "<group>"; };
 		BC82CA4B2CD763F4003F99C9 /* Examples */ = {isa = PBXFileSystemSynchronizedRootGroup; exceptions = (BC82CA7F2CD763F4003F99C9 /* PBXFileSystemSynchronizedBuildFileExceptionSet */, BC82CA802CD763F4003F99C9 /* PBXFileSystemSynchronizedBuildFileExceptionSet */, BC82CA812CD763F4003F99C9 /* PBXFileSystemSynchronizedBuildFileExceptionSet */, BC82CA822CD763F4003F99C9 /* PBXFileSystemSynchronizedBuildFileExceptionSet */, BC82CA832CD763F4003F99C9 /* PBXFileSystemSynchronizedBuildFileExceptionSet */, ); explicitFileTypes = {}; explicitFolders = (); path = Examples; sourceTree = "<group>"; };
+		BCB79DBF2CE070C90059DFE9 /* MoQTHaishinKit */ = {isa = PBXFileSystemSynchronizedRootGroup; exceptions = (BC0C81EC2CE8856000DEA9E6 /* PBXFileSystemSynchronizedBuildFileExceptionSet */, ); explicitFileTypes = {}; explicitFolders = (); path = MoQTHaishinKit; sourceTree = "<group>"; };
 /* End PBXFileSystemSynchronizedRootGroup section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -289,6 +303,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				BC47FA352CE61FCF002900AE /* MoQTHaishinKit in Frameworks */,
 				BC33A11F2CDF52550016EEA0 /* SRTHaishinKit in Frameworks */,
 				BC33A11D2CDF52550016EEA0 /* HaishinKit in Frameworks */,
 			);
@@ -316,6 +331,9 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				BC0C81EF2CE8868E00DEA9E6 /* HaishinKit in Frameworks */,
+				BC0C81F12CE8868E00DEA9E6 /* MoQTHaishinKit in Frameworks */,
+				BC0C81F32CE8868E00DEA9E6 /* SRTHaishinKit in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -342,6 +360,7 @@
 				BC33A1452CDF55040016EEA0 /* HaishinKit */,
 				29F04FF21F3388B000172706 /* HaishinKit.podspec */,
 				2927A2991E7ED2D70044AF91 /* LICENSE.md */,
+				BCB79DBF2CE070C90059DFE9 /* MoQTHaishinKit */,
 				29F39BE72335F8010055F9BB /* Package.swift */,
 				2945CBBE1B4BE66000104112 /* Products */,
 				2997BDD31D50D31B000AF900 /* README.md */,
@@ -482,6 +501,9 @@
 			);
 			name = Tests;
 			packageProductDependencies = (
+				BC0C81EE2CE8868E00DEA9E6 /* HaishinKit */,
+				BC0C81F02CE8868E00DEA9E6 /* MoQTHaishinKit */,
+				BC0C81F22CE8868E00DEA9E6 /* SRTHaishinKit */,
 			);
 			productName = Tests;
 			productReference = BCB798892CE06AEC0059DFE9 /* Tests.xctest */;
@@ -1348,6 +1370,21 @@
 /* End XCLocalSwiftPackageReference section */
 
 /* Begin XCSwiftPackageProductDependency section */
+		BC0C81EE2CE8868E00DEA9E6 /* HaishinKit */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = BC33A1172CDF51620016EEA0 /* XCLocalSwiftPackageReference "../HaishinKit.swift" */;
+			productName = HaishinKit;
+		};
+		BC0C81F02CE8868E00DEA9E6 /* MoQTHaishinKit */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = BC33A1172CDF51620016EEA0 /* XCLocalSwiftPackageReference "../HaishinKit.swift" */;
+			productName = MoQTHaishinKit;
+		};
+		BC0C81F22CE8868E00DEA9E6 /* SRTHaishinKit */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = BC33A1172CDF51620016EEA0 /* XCLocalSwiftPackageReference "../HaishinKit.swift" */;
+			productName = SRTHaishinKit;
+		};
 		BC33A1182CDF523E0016EEA0 /* HaishinKit */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = BC33A1172CDF51620016EEA0 /* XCLocalSwiftPackageReference "../HaishinKit.swift" */;
@@ -1398,6 +1435,11 @@
 			package = BC33A1172CDF51620016EEA0 /* XCLocalSwiftPackageReference "../HaishinKit.swift" */;
 			productName = SRTHaishinKit;
 		};
+		BC47FA342CE61FCF002900AE /* MoQTHaishinKit */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = BC33A1172CDF51620016EEA0 /* XCLocalSwiftPackageReference "../HaishinKit.swift" */;
+			productName = MoQTHaishinKit;
+		};
 /* End XCSwiftPackageProductDependency section */
 	};
 	rootObject = 2945CBB41B4BE66000104112 /* Project object */;
diff --git a/MoQTHaishinKit/MoQTHaishinKit.h b/MoQTHaishinKit/MoQTHaishinKit.h
new file mode 100644
index 000000000..10e9d38c1
--- /dev/null
+++ b/MoQTHaishinKit/MoQTHaishinKit.h
@@ -0,0 +1,3 @@
+#import <Foundation/Foundation.h>
+FOUNDATION_EXPORT double MoQTHaishinKitVersionNumber;
+FOUNDATION_EXPORT const unsigned char MoQTHaishinKitVersionString[];
diff --git a/MoQTHaishinKit/README.md b/MoQTHaishinKit/README.md
new file mode 100644
index 000000000..ebab6c68e
--- /dev/null
+++ b/MoQTHaishinKit/README.md
@@ -0,0 +1,30 @@
+# MoQTHaishinKit
+- This is a Swift implementation of MoQT, based on draft7. It is being developed for research and testing purposes.
+- The features for live streaming and viewing have not been implemented yet, so testing is not possible at this time.
+
+## Control Messages
+- [x] 6.2. CLIENT_SETUP
+- [x] 6.2. SERVER_SETUP
+- [ ] 6.3. GOAWAY
+- [x] 6.4. SUBSCRIBE
+- [x] 6.5. SUBSCRIBE_UPDATE
+- [ ] 6.6. UNSUBSCRIBE
+- [ ] 6.7. FETCH
+- [ ] 6.8. FETCH_CANCEL
+- [x] 6.9. ANNOUNCE_OK
+- [x] 6.10. ANNOUNCE_ERROR
+- [ ] 6.11. ANNOUNCE_CANCEL
+- [ ] 6.12. TRACK_STATUS_REQUEST 
+- [ ] 6.13. SUBSCRIBE_ANNOUNCES 
+- [ ] 6.14. UNSUBSCRIBE_ANNOUNCES
+- [x] 6.15. SUBSCRIBE_OK
+- [x] 6.16. SUBSCRIBE_ERROR
+- [ ] 6.17. FETCH_OK
+- [ ] 6.18. FETCH_ERROR
+- [ ] 6.19. SUBSCRIBE_DONE
+- [ ] 6.20. MAX_SUBSCRIBE_ID
+- [x] 6.21. ANNOUNCE
+- [ ] 6.22. UNANNOUNCE
+- [ ] 6.23. TRACK_STATUS
+- [x] 6.24. SUBSCRIBE_ANNOUNCES_OK
+- [x] 6.25. SUBSCRIBE_ANNOUNCES_ERROR
diff --git a/MoQTHaishinKit/Sources/Constants.swift b/MoQTHaishinKit/Sources/Constants.swift
new file mode 100644
index 000000000..c1ce97a91
--- /dev/null
+++ b/MoQTHaishinKit/Sources/Constants.swift
@@ -0,0 +1,3 @@
+import Logboard
+
+nonisolated(unsafe) let logger = LBLogger.with("com.haishinkit.SRTHaishinKit")
diff --git a/MoQTHaishinKit/Sources/Extension/Data+Extension.swift b/MoQTHaishinKit/Sources/Extension/Data+Extension.swift
new file mode 100644
index 000000000..b2b02feba
--- /dev/null
+++ b/MoQTHaishinKit/Sources/Extension/Data+Extension.swift
@@ -0,0 +1,13 @@
+import CoreMedia
+import Foundation
+
+extension Data {
+    var bytes: [UInt8] {
+        withUnsafeBytes {
+            guard let pointer = $0.baseAddress?.assumingMemoryBound(to: UInt8.self) else {
+                return []
+            }
+            return [UInt8](UnsafeBufferPointer(start: pointer, count: count))
+        }
+    }
+}
diff --git a/MoQTHaishinKit/Sources/Extension/ExpressibleByIntegerLiteral+Extension.swift b/MoQTHaishinKit/Sources/Extension/ExpressibleByIntegerLiteral+Extension.swift
new file mode 100644
index 000000000..18e73618b
--- /dev/null
+++ b/MoQTHaishinKit/Sources/Extension/ExpressibleByIntegerLiteral+Extension.swift
@@ -0,0 +1,24 @@
+import Foundation
+
+extension ExpressibleByIntegerLiteral {
+    var data: Data {
+        return withUnsafePointer(to: self) { value in
+            return Data(bytes: UnsafeRawPointer(value), count: MemoryLayout<Self>.size)
+        }
+    }
+
+    init(data: Data) {
+        let diff: Int = MemoryLayout<Self>.size - data.count
+        if 0 < diff {
+            var buffer = Data(repeating: 0, count: diff)
+            buffer.append(data)
+            self = buffer.withUnsafeBytes { $0.baseAddress!.assumingMemoryBound(to: Self.self).pointee }
+            return
+        }
+        self = data.withUnsafeBytes { $0.baseAddress!.assumingMemoryBound(to: Self.self).pointee }
+    }
+
+    init(data: Slice<Data>) {
+        self.init(data: Data(data))
+    }
+}
diff --git a/MoQTHaishinKit/Sources/Extension/NWProtocolQUIC.Options+Extension.swift b/MoQTHaishinKit/Sources/Extension/NWProtocolQUIC.Options+Extension.swift
new file mode 100644
index 000000000..a296e3c42
--- /dev/null
+++ b/MoQTHaishinKit/Sources/Extension/NWProtocolQUIC.Options+Extension.swift
@@ -0,0 +1,12 @@
+import Network
+
+@available(iOS 16.0, macOS 13.0, *)
+extension NWProtocolQUIC.Options {
+    func verifySelfCert() -> NWProtocolQUIC.Options {
+        let securityProtocolOptions: sec_protocol_options_t = self.securityProtocolOptions
+        sec_protocol_options_set_verify_block(securityProtocolOptions, { (_: sec_protocol_metadata_t, _: sec_trust_t, complete: @escaping sec_protocol_verify_complete_t) in
+            complete(true)
+        }, .main)
+        return self
+    }
+}
diff --git a/MoQTHaishinKit/Sources/MoQTConnection.swift b/MoQTHaishinKit/Sources/MoQTConnection.swift
new file mode 100644
index 000000000..930701722
--- /dev/null
+++ b/MoQTHaishinKit/Sources/MoQTConnection.swift
@@ -0,0 +1,226 @@
+import Foundation
+
+@available(iOS 16.0, macOS 13.0, *)
+public actor MoQTConnection {
+    public static let defaultPort = 4433
+    /// The supported protocols are moqt.
+    public static let supportedProtocols = ["moqt"]
+    /// The supported protocol versions.
+    public static let supportedVersions: [MoQTVersion] = [.draft07Exp2]
+    /// The default a control request time out value (ms).
+    public static let defaultRequestTimeout: UInt64 = 3000
+
+    /// The error domain code.
+    public enum Error: Swift.Error {
+        /// An invalid internal stare.
+        case invalidState
+        /// The command isn’t supported.
+        case unsupportedCommand(_ command: String)
+        /// The connected operation timed out.
+        case connectionTimedOut
+        /// The general socket error.
+        case socketErrorOccurred(_ error: any Swift.Error)
+        /// The requested operation timed out.
+        case requestTimedOut
+        case unknownResponse
+    }
+
+    public let role: MoQTSetupRole
+    /// The control message  request timeout value. Defaul value is 500 msec.
+    public let requestTimeout: UInt64
+
+    public var objectStream: AsyncStream<MoQTObject> {
+        AsyncStream<MoQTObject> { continuation in
+            self.objectStreamContinuation = continuation
+        }
+    }
+
+    private var socket: MoQTSocket?
+    private var inputBuffer = MoQTPayload()
+    private var outputBuffer = MoQTPayload()
+    private var datagramBuffer = MoQTPayload()
+    private var continuation: CheckedContinuation<any MoQTMessage, any Swift.Error>?
+    private var currentTrackAlias = 0
+    private var currentSubscribeId = 0
+    private var objectStreamContinuation: AsyncStream<MoQTObject>.Continuation?
+
+    /// Creates a new connection.
+    public init(_ role: MoQTSetupRole, requestTimeOut: UInt64 = MoQTConnection.defaultRequestTimeout) {
+        self.role = .subscriber
+        self.requestTimeout = requestTimeOut
+    }
+
+    /// Creates a two-way connection to an application on MoQT Server.
+    public func connect(_ uri: String) async throws -> MoQTServerSetup {
+        guard let uri = URL(string: uri), let scheme = uri.scheme, let host = uri.host, Self.supportedProtocols.contains(scheme) else {
+            throw Error.unsupportedCommand(uri)
+        }
+        socket = .init()
+        guard let socket else {
+            throw Error.invalidState
+        }
+        do {
+            try await socket.connect(host, port: uri.port ?? Self.defaultPort)
+            Task {
+                for await data in await socket.incoming {
+                    try? await didReceiveMessage(data)
+                }
+            }
+            Task {
+                for await data in await socket.datagram {
+                    await didReceiveDataStream(data)
+                }
+            }
+            guard let serverSetup = try await send(MoQTClientSetup(supportedVersions: Self.supportedVersions, role: role, path: uri.path())) as? MoQTServerSetup else {
+                throw Error.unknownResponse
+            }
+            return serverSetup
+        } catch {
+            logger.error(error)
+            throw error
+        }
+    }
+
+    public func annouce(_ namespace: [String], authInfo: String?) async throws -> Result<MoQTAnnounce.Ok, MoQTAnnounce.Error> {
+        var subscribeParameters: [MoQTVersionSpecificParameter] = .init()
+        if let authInfo {
+            subscribeParameters.append(.init(key: .authorizationInfo, value: authInfo))
+        }
+        let message = MoQTAnnounce(trackNamespace: namespace, subscribeParameters: subscribeParameters)
+        switch try await send(message) {
+        case let result as MoQTAnnounce.Ok:
+            return .success(result)
+        case let result as MoQTAnnounce.Error:
+            return .failure(result)
+        default:
+            throw Error.unknownResponse
+        }
+    }
+
+    public func subscribe(_ namespace: [String], name: String, authInfo: String? = nil) async throws -> Result<MoQTSubscribe.Ok, MoQTSubscribe.Error> {
+        defer {
+            currentTrackAlias += 1
+            currentSubscribeId += 1
+        }
+        var subscribeParameters: [MoQTVersionSpecificParameter] = .init()
+        if let authInfo {
+            subscribeParameters.append(.init(key: .authorizationInfo, value: authInfo))
+        }
+        let message = MoQTSubscribe(
+            subscribeId: currentSubscribeId,
+            trackAlias: currentTrackAlias,
+            trackNamespace: namespace,
+            trackName: name,
+            subscribePriority: 0,
+            groupOrder: .descending,
+            filterType: .latestGroup,
+            startGroup: nil,
+            startObject: nil,
+            endGroup: nil,
+            endObject: nil,
+            subscribeParameters: subscribeParameters
+        )
+        switch try await send(message) {
+        case let result as MoQTSubscribe.Ok:
+            return .success(result)
+        case let result as MoQTSubscribe.Error:
+            return .failure(result)
+        default:
+            throw Error.unknownResponse
+        }
+    }
+
+    public func subscribeAnnouces(_ namespace: [String], authInfo: String? = nil) async throws -> Result<MoQTSubscribeAnnounces.Ok, MoQTSubscribeAnnounces.Error> {
+        var subscribeParameters: [MoQTVersionSpecificParameter] = .init()
+        if let authInfo {
+            subscribeParameters.append(.init(key: .authorizationInfo, value: authInfo))
+        }
+        let message = MoQTSubscribeAnnounces(
+            trackNamespacePrefix: namespace,
+            parameters: subscribeParameters
+        )
+        switch try await send(message) {
+        case let result as MoQTSubscribeAnnounces.Ok:
+            return .success(result)
+        case let result as MoQTSubscribeAnnounces.Error:
+            return .failure(result)
+        default:
+            throw Error.unknownResponse
+        }
+    }
+
+    /// Closes the connection from the server.
+    public func close() async {
+        await socket?.close()
+    }
+
+    public func send(_ objects: [MoQTObject], header: MoQTStreamHeaderSubgroup) async throws {
+        var buffer = MoQTPayload()
+        buffer.putData(try header.payload)
+        for object in objects {
+            buffer.putData(try object.payload)
+        }
+        buffer.position = 0
+        await socket?.sendDatagram(buffer.data)
+    }
+
+    private func send(_ message: some MoQTMessage) async throws -> any MoQTMessage {
+        let content = try message.payload
+        outputBuffer.position = 0
+        outputBuffer.putInt(message.type.rawValue)
+        outputBuffer.putInt(content.count)
+        outputBuffer.putData(content)
+        return try await withCheckedThrowingContinuation { continutation in
+            self.continuation = continutation
+            Task {
+                try? await Task.sleep(nanoseconds: requestTimeout * 1_000_000)
+                self.continuation.map {
+                    $0.resume(throwing: Error.requestTimedOut)
+                }
+                self.continuation = nil
+            }
+            Task {
+                await socket?.send(outputBuffer.data)
+            }
+        }
+    }
+
+    private func didReceiveMessage(_ data: Data) async throws {
+        print(data.bytes)
+        logger.trace(data)
+        inputBuffer.position = 0
+        inputBuffer.putData(data)
+        inputBuffer.position = 0
+        let type = try inputBuffer.getInt()
+        let length = try inputBuffer.getInt()
+        let message = try MoQTMessageType(rawValue: type)?.makeMessage(&inputBuffer)
+        if let message {
+            logger.info(message)
+            continuation?.resume(returning: message)
+        } else {
+            try inputBuffer.getData(length)
+            continuation?.resume(throwing: MoQTMessageError.notImplemented)
+        }
+        continuation = nil
+    }
+
+    private func didReceiveDataStream(_ data: Data) async {
+        do {
+            datagramBuffer.position = 0
+            datagramBuffer.putData(data)
+            datagramBuffer.position = 0
+            let type = try datagramBuffer.getInt()
+            switch MoQTDataStreamType(rawValue: type) {
+            case .streamHeaderSubgroup:
+                let message = try MoQTStreamHeaderSubgroup(&datagramBuffer)
+                while 0 < datagramBuffer.bytesAvailable {
+                    objectStreamContinuation?.yield(try .init(&datagramBuffer))
+                }
+            default:
+                break
+            }
+        } catch {
+            logger.warn(error)
+        }
+    }
+}
diff --git a/MoQTHaishinKit/Sources/MoQTDataStream/MoQTDataStream.swift b/MoQTHaishinKit/Sources/MoQTDataStream/MoQTDataStream.swift
new file mode 100644
index 000000000..ea3556d2b
--- /dev/null
+++ b/MoQTHaishinKit/Sources/MoQTDataStream/MoQTDataStream.swift
@@ -0,0 +1,9 @@
+public enum MoQTDataStreamType: Int, Sendable {
+    case objectDatagram = 0x1
+    case streamHeaderSubgroup = 0x4
+    case fetchHeader = 0x5
+}
+
+protocol MoQTDataStream {
+    var type: MoQTDataStreamType { get }
+}
diff --git a/MoQTHaishinKit/Sources/MoQTDataStream/MoQTObject.swift b/MoQTHaishinKit/Sources/MoQTDataStream/MoQTObject.swift
new file mode 100644
index 000000000..35852cbde
--- /dev/null
+++ b/MoQTHaishinKit/Sources/MoQTDataStream/MoQTObject.swift
@@ -0,0 +1,33 @@
+import Foundation
+
+public struct MoQTObject {
+    public let id: Int
+    public let status: Int?
+    public let data: Data
+
+    var payload: Data {
+        get throws {
+            var payload = MoQTPayload()
+            payload.putInt(id)
+            payload.putInt(data.count)
+            if let status {
+                payload.putInt(status)
+            }
+            payload.putData(data)
+            return payload.data
+        }
+    }
+
+    public init(id: Int, status: Int?, data: Data) {
+        self.id = id
+        self.status = status
+        self.data = data
+    }
+
+    init(_ payload: inout MoQTPayload) throws {
+        id = try payload.getInt()
+        let length = try payload.getInt()
+        status = length == 0 ? try payload.getInt() : nil
+        self.data = try payload.getData(length)
+    }
+}
diff --git a/MoQTHaishinKit/Sources/MoQTDataStream/MoQTStreamHeaderSubgroup.swift b/MoQTHaishinKit/Sources/MoQTDataStream/MoQTStreamHeaderSubgroup.swift
new file mode 100644
index 000000000..dc4fcb273
--- /dev/null
+++ b/MoQTHaishinKit/Sources/MoQTDataStream/MoQTStreamHeaderSubgroup.swift
@@ -0,0 +1,35 @@
+import Foundation
+
+public struct MoQTStreamHeaderSubgroup: MoQTDataStream {
+    public let type: MoQTDataStreamType = .streamHeaderSubgroup
+    public let trackAlias: Int
+    public let groupId: Int
+    public let subgroupId: Int
+    public let publisherPriority: Int
+
+    public var payload: Data {
+        get throws {
+            var payload = MoQTPayload()
+            payload.putInt(type.rawValue)
+            payload.putInt(trackAlias)
+            payload.putInt(groupId)
+            payload.putInt(subgroupId)
+            payload.putInt(publisherPriority)
+            return payload.data
+        }
+    }
+
+    public init(trackAlias: Int, groupId: Int, subgroupId: Int, publisherPriority: Int) {
+        self.trackAlias = trackAlias
+        self.groupId = groupId
+        self.subgroupId = subgroupId
+        self.publisherPriority = publisherPriority
+    }
+
+    init(_ payload: inout MoQTPayload) throws {
+        trackAlias = try payload.getInt()
+        groupId = try payload.getInt()
+        subgroupId = try payload.getInt()
+        publisherPriority = try payload.getInt()
+    }
+}
diff --git a/MoQTHaishinKit/Sources/MoQTMessage/MoQTAnnounce.swift b/MoQTHaishinKit/Sources/MoQTMessage/MoQTAnnounce.swift
new file mode 100644
index 000000000..4986fe567
--- /dev/null
+++ b/MoQTHaishinKit/Sources/MoQTMessage/MoQTAnnounce.swift
@@ -0,0 +1,77 @@
+import Foundation
+import Logboard
+
+/// 6.21. ANNOUNCE
+public struct MoQTAnnounce: MoQTMessage {
+    public let type = MoQTMessageType.announce
+    public let trackNamespace: [String]
+    public let subscribeParameters: [MoQTVersionSpecificParameter]
+
+    public var payload: Data {
+        get throws {
+            var payload = MoQTPayload()
+            payload.putInt(trackNamespace.count)
+            for namespace in trackNamespace {
+                payload.putString(namespace)
+            }
+            payload.putInt(subscribeParameters.count)
+            for parameter in subscribeParameters {
+                do {
+                    payload.putData(try parameter.payload)
+                } catch {
+                    logger.info(error)
+                }
+            }
+            return payload.data
+        }
+    }
+
+    public init(trackNamespace: [String], subscribeParameters: [MoQTVersionSpecificParameter]) {
+        self.trackNamespace = trackNamespace
+        self.subscribeParameters = subscribeParameters
+    }
+
+    public struct Ok: MoQTMessage {
+        public let type = MoQTMessageType.announceOk
+        public let trackNamespace: [String]
+
+        public var payload: Data {
+            get throws {
+                throw MoQTMessageError.notImplemented
+            }
+        }
+
+        init(_ payload: inout MoQTPayload) throws {
+            let trackNamespaceCounts = try payload.getInt()
+            var trackNamespace: [String] = .init()
+            for _ in 0..<trackNamespaceCounts {
+                trackNamespace.append(try payload.getString())
+            }
+            self.trackNamespace = trackNamespace
+        }
+    }
+
+    public struct Error: MoQTMessage, Swift.Error {
+        public let type = MoQTMessageType.announceError
+        public let trackNamespace: [String]
+        public let code: Int
+        public let reasonPhrase: String
+
+        public var payload: Data {
+            get throws {
+                throw MoQTMessageError.notImplemented
+            }
+        }
+
+        init(_ payload: inout MoQTPayload) throws {
+            let trackNamespaceCounts = try payload.getInt()
+            var trackNamespace: [String] = .init()
+            for _ in 0..<trackNamespaceCounts {
+                trackNamespace.append(try payload.getString())
+            }
+            self.trackNamespace = trackNamespace
+            code = try payload.getInt()
+            reasonPhrase = try payload.getString()
+        }
+    }
+}
diff --git a/MoQTHaishinKit/Sources/MoQTMessage/MoQTClientSetup.swift b/MoQTHaishinKit/Sources/MoQTMessage/MoQTClientSetup.swift
new file mode 100644
index 000000000..6e8fb4f3b
--- /dev/null
+++ b/MoQTHaishinKit/Sources/MoQTMessage/MoQTClientSetup.swift
@@ -0,0 +1,33 @@
+import Foundation
+
+/// 6.2.  CLIENT_SETUP and SERVER_SETUP
+struct MoQTClientSetup: MoQTMessage {
+    let type: MoQTMessageType = .clientSetup
+    let supprtedVersions: [MoQTVersion]
+    let setupParameters: [MoQTSetupParameter]
+
+    var payload: Data {
+        get throws {
+            var payload = MoQTPayload()
+            payload.putInt(supprtedVersions.count)
+            for version in supprtedVersions {
+                payload.putInt(version.rawValue)
+            }
+            payload.putInt(setupParameters.count)
+            for parameter in setupParameters {
+                payload.putData(try parameter.payload)
+            }
+            return payload.data
+        }
+    }
+
+    init(supportedVersions: [MoQTVersion], role: MoQTSetupRole, path: String?) {
+        self.supprtedVersions = supportedVersions
+        var setupParameters: [MoQTSetupParameter] = .init()
+        setupParameters.append(.init(key: .role, value: role))
+        if let path {
+            setupParameters.append(.init(key: .path, value: path))
+        }
+        self.setupParameters = setupParameters
+    }
+}
diff --git a/MoQTHaishinKit/Sources/MoQTMessage/MoQTMessage.swift b/MoQTHaishinKit/Sources/MoQTMessage/MoQTMessage.swift
new file mode 100644
index 000000000..42865d2c5
--- /dev/null
+++ b/MoQTHaishinKit/Sources/MoQTMessage/MoQTMessage.swift
@@ -0,0 +1,75 @@
+import Foundation
+
+public enum MoQTMessageType: Int, Sendable {
+    case subscribeUpdate = 0x02
+    case subscribe = 0x03
+    case subscribeOk = 0x04
+    case subscribeError = 0x05
+    case announce = 0x06
+    case announceOk = 0x07
+    case announceError = 0x08
+    case unannounce = 0x09
+    case unsubscribe = 0x0A
+    case subscribeDone = 0x0B
+    case announceCancel = 0x0C
+    case trackStatusRequest = 0x0D
+    case trackStatus = 0x0E
+    case goaway = 0x10
+    case subscribeAnnounuces = 0x11
+    case subscribeAnnounucesOk = 0x12
+    case subscribeAnnounucesError = 0x13
+    case clientSetup = 0x40
+    case serverSetup = 0x41
+
+    func makeMessage(_ payload: inout MoQTPayload) throws -> (any MoQTMessage)? {
+        switch self {
+        case .subscribeUpdate:
+            return nil
+        case .subscribe:
+            return nil
+        case .subscribeOk:
+            return try MoQTSubscribe.Ok(&payload)
+        case .subscribeError:
+            return try MoQTSubscribe.Error(&payload)
+        case .announce:
+            return nil
+        case .announceOk:
+            return try MoQTAnnounce.Ok(&payload)
+        case .announceError:
+            return try MoQTAnnounce.Error(&payload)
+        case .unannounce:
+            return nil
+        case .unsubscribe:
+            return nil
+        case .subscribeDone:
+            return nil
+        case .announceCancel:
+            return nil
+        case .trackStatusRequest:
+            return nil
+        case .trackStatus:
+            return nil
+        case .goaway:
+            return nil
+        case .subscribeAnnounuces:
+            return nil
+        case .subscribeAnnounucesOk:
+            return try MoQTSubscribeAnnounces.Ok(&payload)
+        case .subscribeAnnounucesError:
+            return try MoQTSubscribeAnnounces.Error(&payload)
+        case .clientSetup:
+            return nil
+        case .serverSetup:
+            return try MoQTServerSetup(&payload)
+        }
+    }
+}
+
+enum MoQTMessageError: Swift.Error {
+    case notImplemented
+}
+
+public protocol MoQTMessage: Sendable {
+    var type: MoQTMessageType { get }
+    var payload: Data { get throws }
+}
diff --git a/MoQTHaishinKit/Sources/MoQTMessage/MoQTServerSetup.swift b/MoQTHaishinKit/Sources/MoQTMessage/MoQTServerSetup.swift
new file mode 100644
index 000000000..fdbe74cf9
--- /dev/null
+++ b/MoQTHaishinKit/Sources/MoQTMessage/MoQTServerSetup.swift
@@ -0,0 +1,27 @@
+import Foundation
+
+public struct MoQTServerSetup: MoQTMessage {
+    public let type: MoQTMessageType = .serverSetup
+    public let selectedVersion: Int
+    public let setupParameters: [MoQTSetupParameter]
+
+    public var payload: Data {
+        get throws {
+            throw MoQTMessageError.notImplemented
+        }
+    }
+
+    init(_ payload: inout MoQTPayload) throws {
+        selectedVersion = try payload.getInt()
+        let setupParametersCounts = try payload.getInt()
+        var setupParameters: [MoQTSetupParameter] = .init()
+        for _ in 0..<setupParametersCounts {
+            do {
+                setupParameters.append(try .init(&payload))
+            } catch {
+                logger.warn(error)
+            }
+        }
+        self.setupParameters = setupParameters
+    }
+}
diff --git a/MoQTHaishinKit/Sources/MoQTMessage/MoQTSubscribe.swift b/MoQTHaishinKit/Sources/MoQTMessage/MoQTSubscribe.swift
new file mode 100644
index 000000000..d03bcc313
--- /dev/null
+++ b/MoQTHaishinKit/Sources/MoQTMessage/MoQTSubscribe.swift
@@ -0,0 +1,137 @@
+import Foundation
+import Logboard
+
+public struct MoQTSubscribe: MoQTMessage {
+    public enum GroupOrder: Int, Sendable {
+        case original = 0x0
+        case ascending = 0x1
+        case descending = 0x2
+    }
+
+    public enum FilterType: Int, Sendable {
+        case latestGroup = 0x1
+        case latestObject = 0x2
+        case absoluteStart = 0x3
+        case absoluteRange = 0x4
+    }
+
+    public let type: MoQTMessageType = .subscribe
+    public let subscribeId: Int
+    public let trackAlias: Int
+    public let trackNamespace: [String]
+    public let trackName: String
+    public let subscribePriority: Int
+    public let groupOrder: GroupOrder
+    public let filterType: FilterType
+    public let startGroup: Int?
+    public let startObject: Int?
+    public let endGroup: Int?
+    public let endObject: Int?
+    public let subscribeParameters: [MoQTVersionSpecificParameter]
+
+    public var payload: Data {
+        get throws {
+            var payload = MoQTPayload()
+            payload.putInt(subscribeId)
+            payload.putInt(trackAlias)
+            payload.putInt(trackNamespace.count)
+            for namespace in trackNamespace {
+                payload.putString(namespace)
+            }
+            payload.putString(trackName)
+            payload.putInt(subscribePriority)
+            payload.putInt(groupOrder.rawValue)
+            payload.putInt(filterType.rawValue)
+            switch filterType {
+            case .absoluteStart:
+                if let startGroup {
+                    payload.putInt(startGroup)
+                }
+                if let startObject {
+                    payload.putInt(startObject)
+                }
+            case .absoluteRange:
+                if let startGroup {
+                    payload.putInt(startGroup)
+                }
+                if let startObject {
+                    payload.putInt(startObject)
+                }
+                if let endGroup {
+                    payload.putInt(endGroup)
+                }
+                if let endObject {
+                    payload.putInt(endObject)
+                }
+            default:
+                break
+            }
+            payload.putInt(subscribeParameters.count)
+            for parameter in subscribeParameters {
+                do {
+                    payload.putData(try parameter.payload)
+                } catch {
+                    logger.info(error)
+                }
+            }
+            return payload.data
+        }
+    }
+
+    public struct Ok: MoQTMessage {
+        public let type = MoQTMessageType.subscribeOk
+        public let subscribeId: Int
+        public let expires: Int
+        public let groupOrder: GroupOrder
+        public let contentExists: Bool
+        public let largestGroupId: Int?
+        public let largestObjectId: Int?
+        public let subscribeParameters: [MoQTVersionSpecificParameter]
+
+        public var payload: Data {
+            get throws {
+                throw MoQTMessageError.notImplemented
+            }
+        }
+
+        init(_ payload: inout MoQTPayload) throws {
+            subscribeId = try payload.getInt()
+            expires = try payload.getInt()
+            if let groupOrder = GroupOrder(rawValue: try payload.getInt()) {
+                self.groupOrder = groupOrder
+            } else {
+                throw MoQTMessageError.notImplemented
+            }
+            contentExists = try payload.getBool()
+            largestGroupId = contentExists ? try payload.getInt() : nil
+            largestObjectId = contentExists ? try payload.getInt() : nil
+            var subscribeParameters: [MoQTVersionSpecificParameter] = []
+            var numberOfParameters = try payload.getInt()
+            for i in 0..<numberOfParameters {
+                subscribeParameters.append(try .init(&payload))
+            }
+            self.subscribeParameters = subscribeParameters
+        }
+    }
+
+    public struct Error: MoQTMessage, Swift.Error {
+        public let type = MoQTMessageType.subscribeError
+        public let subscribeId: Int
+        public let code: Int
+        public let reasonPhrase: String
+        public let trackAlias: Int
+
+        public var payload: Data {
+            get throws {
+                throw MoQTMessageError.notImplemented
+            }
+        }
+
+        init(_ payload: inout MoQTPayload) throws {
+            subscribeId = try payload.getInt()
+            code = try payload.getInt()
+            reasonPhrase = try payload.getString()
+            trackAlias = try payload.getInt()
+        }
+    }
+}
diff --git a/MoQTHaishinKit/Sources/MoQTMessage/MoQTSubscribeAnnounces.swift b/MoQTHaishinKit/Sources/MoQTMessage/MoQTSubscribeAnnounces.swift
new file mode 100644
index 000000000..8da344480
--- /dev/null
+++ b/MoQTHaishinKit/Sources/MoQTMessage/MoQTSubscribeAnnounces.swift
@@ -0,0 +1,69 @@
+import Foundation
+
+/// 6.13. SUBSCRIBE_ANNOUNCES
+public struct MoQTSubscribeAnnounces: MoQTMessage {
+    public let type: MoQTMessageType = .subscribeAnnounuces
+    public let trackNamespacePrefix: [String]
+    public let parameters: [MoQTVersionSpecificParameter]
+
+    public var payload: Data {
+        get throws {
+            var payload = MoQTPayload()
+            payload.putInt(trackNamespacePrefix.count)
+            for prefix in trackNamespacePrefix {
+                payload.putString(prefix)
+            }
+            payload.putInt(parameters.count)
+            for parameter in parameters {
+                payload.putData(try parameter.payload)
+            }
+            return payload.data
+        }
+    }
+
+    /// 6.24. SUBSCRIBE_ANNOUNCES_OK
+    public struct Ok: MoQTMessage {
+        public let type: MoQTMessageType = .subscribeAnnounucesOk
+        public let trackNamespacePrefix: [String]
+
+        public var payload: Data {
+            get throws {
+                throw MoQTMessageError.notImplemented
+            }
+        }
+
+        init(_ payload: inout MoQTPayload) throws {
+            let length = try payload.getInt()
+            var trackNamespacePrefix: [String] = .init()
+            for i in 0..<length {
+                trackNamespacePrefix.append(try payload.getString())
+            }
+            self.trackNamespacePrefix = trackNamespacePrefix
+        }
+    }
+
+    /// 6.25. SUBSCRIBE_ANNOUNCES_ERROR
+    public struct Error: MoQTMessage, Swift.Error {
+        public let type: MoQTMessageType = .subscribeAnnounucesError
+        public let trackNamespacePrefix: [String]
+        public let errorCode: Int
+        public let reasonPhrase: String
+
+        public var payload: Data {
+            get throws {
+                throw MoQTMessageError.notImplemented
+            }
+        }
+
+        init(_ payload: inout MoQTPayload) throws {
+            let length = try payload.getInt()
+            var trackNamespacePrefix: [String] = .init()
+            for i in 0..<length {
+                trackNamespacePrefix.append(try payload.getString())
+            }
+            self.trackNamespacePrefix = trackNamespacePrefix
+            errorCode = try payload.getInt()
+            reasonPhrase = try payload.getString()
+        }
+    }
+}
diff --git a/MoQTHaishinKit/Sources/MoQTPayload.swift b/MoQTHaishinKit/Sources/MoQTPayload.swift
new file mode 100644
index 000000000..5e0f817d5
--- /dev/null
+++ b/MoQTHaishinKit/Sources/MoQTPayload.swift
@@ -0,0 +1,133 @@
+import Foundation
+
+struct MoQTPayload {
+    private(set) var data = Data()
+
+    enum Error: Swift.Error {
+        case eof
+        case outOfRange
+    }
+
+    /// Specifies the length of buffer.
+    var length: Int {
+        get {
+            data.count
+        }
+        set {
+            switch true {
+            case (data.count < newValue):
+                data.append(Data(count: newValue - data.count))
+            case (newValue < data.count):
+                data = data.subdata(in: 0..<newValue)
+            default:
+                break
+            }
+        }
+    }
+
+    /// Specifies the position of buffer.
+    var position: Int = 0
+
+    /// The bytesAvalibale or not.
+    var bytesAvailable: Int {
+        data.count - position
+    }
+
+    init() {
+    }
+
+    init(_ data: Data) {
+        self.data = data
+    }
+
+    @discardableResult
+    mutating func putInt(_ value: Int) -> Self {
+        if value <= 63 {
+            return putData(UInt8(value).bigEndian.data)
+        }
+        if value <= 16383 {
+            return putData((UInt16(value) | 0x4000).bigEndian.data)
+        }
+        if value <= 1073741823 {
+            return putData((UInt32(value) | 0x80000000).bigEndian.data)
+        }
+        return putData((UInt64(value) | 0xc000000000000000).bigEndian.data)
+    }
+
+    mutating func getInt() throws -> Int {
+        guard 1 <= bytesAvailable else {
+            throw Error.eof
+        }
+        switch Int(data[position] >> 6) {
+        case 0:
+            defer {
+                position += 1
+            }
+            return Int(data: data[position..<position + 1]).bigEndian
+        case 1:
+            defer {
+                position += 2
+            }
+            return Int(data: data[position..<position + 2]).bigEndian & 0x3FFF
+        case 2:
+            defer {
+                position += 4
+            }
+            return Int(data: data[position..<position + 4]).bigEndian
+        case 3:
+            defer {
+                position += 8
+            }
+            return Int(data: data[position..<position + 8]).bigEndian & 0x1FFFFFFFFFFFFFFF
+        default:
+            throw Error.outOfRange
+        }
+    }
+
+    @discardableResult
+    mutating func putString(_ value: String) -> Self {
+        putInt(value.utf8.count)
+        putData(Data(value.utf8))
+        return self
+    }
+
+    mutating func getString() throws -> String {
+        let length = try getInt()
+        let data = try getData(length)
+        return String(data: data, encoding: .utf8) ?? ""
+    }
+
+    mutating func putBool(_ value: Bool) -> Self {
+        putData(Data([value ? 1 : 0]))
+        return self
+    }
+
+    mutating func getBool() throws -> Bool {
+        guard 1 <= bytesAvailable else {
+            throw Error.eof
+        }
+        let value = try getData(1)
+        return value[0] == 1
+    }
+
+    @discardableResult
+    mutating func putData(_ value: Data) -> Self {
+        if position == data.count {
+            data.append(value)
+            position = data.count
+            return self
+        }
+        let length = min(data.count - position, value.count)
+        data.replaceSubrange(position..<position + length, with: value)
+        position += value.count
+        return self
+    }
+
+    mutating func getData(_ length: Int) throws -> Data {
+        guard length <= bytesAvailable else {
+            throw Error.eof
+        }
+        position += length
+        return data.subdata(in: position - length..<position)
+    }
+}
diff --git a/MoQTHaishinKit/Sources/MoQTSetupParameter.swift b/MoQTHaishinKit/Sources/MoQTSetupParameter.swift
new file mode 100644
index 000000000..84dfe3a4a
--- /dev/null
+++ b/MoQTHaishinKit/Sources/MoQTSetupParameter.swift
@@ -0,0 +1,68 @@
+import Foundation
+
+public enum MoQTSetupParameterType: Int, Sendable {
+    case role = 0x00
+    case path = 0x01
+    case maxSubscribeId = 0x02
+}
+
+public enum MoQTSetupRole: Int, Sendable {
+    case publisher = 0x01
+    case subscriber = 0x02
+    case pubSub = 0x03
+}
+
+public struct MoQTSetupParameter: Sendable {
+    enum Error: Swift.Error {
+        case missionSetupParameterType
+    }
+
+    public let key: MoQTSetupParameterType
+    public let value: (any Sendable)
+
+    var payload: Data {
+        get throws {
+            switch value {
+            case let value as String:
+                let length = value.count
+                var payload = MoQTPayload()
+                payload.putInt(key.rawValue)
+                payload.putString(value)
+                return payload.data
+            case let value as MoQTSetupRole:
+                var payload = MoQTPayload()
+                payload.putInt(key.rawValue)
+                payload.putInt(1)
+                payload.putInt(value.rawValue)
+                return payload.data
+            default:
+                throw MoQTMessageError.notImplemented
+            }
+        }
+    }
+
+    init(key: MoQTSetupParameterType, value: (any Sendable)) {
+        self.key = key
+        self.value = value
+    }
+
+    init(_ payload: inout MoQTPayload) throws {
+        let type = try payload.getInt()
+        let length = try payload.getInt()
+
+        switch MoQTSetupParameterType(rawValue: type) {
+        case .path:
+            key = .path
+            let data = try payload.getData(length)
+            value = String(data: data, encoding: .utf8)
+        case .role:
+            key = .role
+            value = try payload.getInt()
+        case .maxSubscribeId:
+            key = .maxSubscribeId
+            value = try payload.getInt()
+        default:
+            throw Error.missionSetupParameterType
+        }
+    }
+}
diff --git a/MoQTHaishinKit/Sources/MoQTSocket.swift b/MoQTHaishinKit/Sources/MoQTSocket.swift
new file mode 100644
index 000000000..6e3cecd44
--- /dev/null
+++ b/MoQTHaishinKit/Sources/MoQTSocket.swift
@@ -0,0 +1,212 @@
+import Foundation
+import HaishinKit
+import Network
+
+@available(iOS 16.0, macOS 13.0, *)
+final actor MoQTSocket {
+    static let alpn = ["moq-00"]
+    static let defaultWindowSizeC = Int(UInt8.max)
+
+    enum Error: Swift.Error {
+        case invalidState
+        case endOfStream
+        case connectionTimedOut
+        case connectionNotEstablished(_ error: NWError?)
+    }
+
+    var incoming: AsyncStream<Data> {
+        AsyncStream<Data> { continuation in
+            self.incomingContinuation = continuation
+        }
+    }
+
+    var datagram: AsyncStream<Data> {
+        AsyncStream<Data> { continuation in
+            self.datagramContinuation = continuation
+        }
+    }
+
+    private var timeout: UInt64 = 15
+    private var connected = false
+    private var windowSizeC = MoQTSocket.defaultWindowSizeC
+    private var totalBytesIn = 0
+    private var queueBytesOut = 0
+    private var totalBytesOut = 0
+    private var connection: NWConnection? {
+        didSet {
+            connection?.stateUpdateHandler = { state in
+                Task { await self.stateDidChange(to: state) }
+            }
+            connection?.viabilityUpdateHandler = { viability in
+                Task { await self.viabilityDidChange(to: viability) }
+            }
+        }
+    }
+    private var options: NWProtocolQUIC.Options = .init()
+    private var outputs: AsyncStream<Data>.Continuation?
+    private var connectionGroup: NWConnectionGroup? {
+        didSet {
+            connectionGroup?.newConnectionHandler = { connection in
+                Task { await self.newConnection(connection) }
+            }
+            oldValue?.newConnectionHandler = nil
+            oldValue?.stateUpdateHandler = nil
+        }
+    }
+    private var continuation: CheckedContinuation<Void, any Swift.Error>?
+    private var qualityOfService: DispatchQoS = .userInitiated
+    private var incomingContinuation: AsyncStream<Data>.Continuation? {
+        didSet {
+            if let connection, let incomingContinuation {
+                receive(on: connection, continuation: incomingContinuation)
+            }
+        }
+    }
+    private var datagramContinuation: AsyncStream<Data>.Continuation?
+    private lazy var networkQueue = DispatchQueue(label: "com.haishinkit.HaishinKit.MoQSocket.network", qos: qualityOfService)
+
+    func connect(_ name: String, port: Int) async throws {
+        guard !connected else {
+            throw Error.invalidState
+        }
+        totalBytesIn = 0
+        totalBytesOut = 0
+        queueBytesOut = 0
+        do {
+            let options = NWProtocolQUIC.Options(alpn: Self.alpn).verifySelfCert()
+            let endpoint = NWEndpoint.hostPort(host: .init(name), port: .init(integerLiteral: NWEndpoint.Port.IntegerLiteralType(port)))
+            connection = NWConnection(to: endpoint, using: NWParameters(quic: options))
+            options.isDatagram = true
+            connectionGroup = NWConnectionGroup(with: NWMultiplexGroup(to: endpoint), using: NWParameters(quic: options))
+            try await withCheckedThrowingContinuation { (checkedContinuation: CheckedContinuation<Void, Swift.Error>) in
+                self.continuation = checkedContinuation
+                Task {
+                    try? await Task.sleep(nanoseconds: timeout * 1_000_000_000)
+                    guard let continuation else {
+                        return
+                    }
+                    continuation.resume(throwing: Error.connectionTimedOut)
+                    self.continuation = nil
+                    close()
+                }
+                connection?.start(queue: networkQueue)
+            }
+        } catch {
+            throw error
+        }
+    }
+
+    func send(_ data: Data) {
+        guard connected else {
+            return
+        }
+        queueBytesOut += data.count
+        outputs?.yield(data)
+    }
+
+    func sendDatagram(_ data: Data) {
+        connectionGroup?.send(content: data) { error in
+            print(error, "->", data)
+        }
+    }
+
+    func close(_ error: NWError? = nil) {
+        guard connection != nil else {
+            return
+        }
+        if let continuation {
+            continuation.resume(throwing: Error.connectionNotEstablished(error))
+            self.continuation = nil
+        }
+        connected = false
+        outputs = nil
+        connection = nil
+        continuation = nil
+    }
+
+    private func newConnection(_ connection: NWConnection) {
+        receive(on: connection, continuation: datagramContinuation)
+        connection.start(queue: networkQueue)
+    }
+
+    private nonisolated func receive(on connection: NWConnection, continuation: AsyncStream<Data>.Continuation?) {
+        connection.receive(minimumIncompleteLength: 0, maximumLength: 65558) { content, a, b, c in
+            if let content {
+                continuation?.yield(content)
+                self.receive(on: connection, continuation: continuation)
+            } else {
+                logger.warn(a, "->", b, "->", c)
+            }
+        }
+    }
+
+    private func stateDidChange(to state: NWConnection.State) {
+        switch state {
+        case .ready:
+            logger.info("Connection is ready.")
+            connected = true
+            let (stream, continuation) = AsyncStream<Data>.makeStream()
+            Task {
+                for await data in stream where connected {
+                    try await send(data)
+                    totalBytesOut += data.count
+                    queueBytesOut -= data.count
+                }
+            }
+            self.outputs = continuation
+            self.connectionGroup?.start(queue: networkQueue)
+            self.continuation?.resume()
+            self.continuation = nil
+        case .waiting(let error):
+            logger.warn("Connection waiting:", error)
+            close(error)
+        case .setup:
+            logger.debug("Connection is setting up.")
+        case .preparing:
+            logger.debug("Connection is preparing.")
+        case .failed(let error):
+            logger.warn("Connection failed:", error)
+            close(error)
+        case .cancelled:
+            logger.info("Connection cancelled.")
+            close()
+        @unknown default:
+            logger.error("Unknown connection state.")
+        }
+    }
+
+    private func viabilityDidChange(to viability: Bool) {
+        logger.info("Connection viability changed to ", viability)
+        if viability == false {
+            close()
+        }
+    }
+
+    private func send(_ data: Data) async throws {
+        return try await withCheckedThrowingContinuation { continuation in
+            guard let connection else {
+                continuation.resume(throwing: Error.invalidState)
+                return
+            }
+            connection.send(content: data, completion: .contentProcessed { error in
+                if let error {
+                    continuation.resume(throwing: error)
+                    return
+                }
+                continuation.resume()
+            })
+        }
+    }
+}
+
+@available(iOS 16.0, macOS 13.0, *)
+extension MoQTSocket: NetworkTransportReporter {
+    // MARK: NetworkTransportReporter
+    func makeNetworkMonitor() async -> NetworkMonitor {
+        return .init(self)
+    }
+
+    func makeNetworkTransportReport() -> NetworkTransportReport {
+        return .init(queueBytesOut: queueBytesOut, totalBytesIn: totalBytesIn, totalBytesOut: totalBytesOut)
+    }
+}
diff --git a/MoQTHaishinKit/Sources/MoQTVersion.swift b/MoQTHaishinKit/Sources/MoQTVersion.swift
new file mode 100644
index 000000000..6deb2bad1
--- /dev/null
+++ b/MoQTHaishinKit/Sources/MoQTVersion.swift
@@ -0,0 +1,12 @@
+public enum MoQTVersion: Int, Sendable {
+    case draft01 = 0xff000001
+    case draft02 = 0xff000002
+    case draft03 = 0xff000003
+    case draft04 = 0xff000004
+    case draft05 = 0xff000005
+    case draft06 = 0xff000006
+    case draft07 = 0xff000007
+
+    case draft07Exp = 0xff070001
+    case draft07Exp2 = 0xff070002
+}
diff --git a/MoQTHaishinKit/Sources/MoQTVersionSpecificParameter.swift b/MoQTHaishinKit/Sources/MoQTVersionSpecificParameter.swift
new file mode 100644
index 000000000..d8a97f39e
--- /dev/null
+++ b/MoQTHaishinKit/Sources/MoQTVersionSpecificParameter.swift
@@ -0,0 +1,60 @@
+import Foundation
+
+public enum MoQTVersionSpecificType: Int, Sendable {
+    case authorizationInfo = 0x02
+    case deliveryTimeout = 0x03
+    case maxCacheDuration = 0x04
+}
+
+/// 6.1.1.  Version Specific Parameters
+public struct MoQTVersionSpecificParameter {
+    enum Error: Swift.Error {
+        case missionSetupParameterType
+    }
+
+    public let key: MoQTVersionSpecificType
+    public let value: (any Sendable)
+
+    var payload: Data {
+        get throws {
+            var payload = MoQTPayload()
+            switch value {
+            case let value as String:
+                payload.putInt(key.rawValue)
+                payload.putString(value)
+                return payload.data
+            case let value as MoQTSetupRole:
+                payload.putInt(key.rawValue)
+                payload.putInt(1)
+                payload.putInt(value.rawValue)
+                return payload.data
+            default:
+                throw MoQTMessageError.notImplemented
+            }
+        }
+    }
+
+    public init(key: MoQTVersionSpecificType, value: (any Sendable)) {
+        self.key = key
+        self.value = value
+    }
+
+    init(_ payload: inout MoQTPayload) throws {
+        let type = try payload.getInt()
+        let length = try payload.getInt()
+        let data = try payload.getData(length)
+        switch MoQTVersionSpecificType(rawValue: type) {
+        case .authorizationInfo:
+            key = .authorizationInfo
+            value = String(data: data, encoding: .utf8)
+        case .deliveryTimeout:
+            key = .deliveryTimeout
+            value = data
+        case .maxCacheDuration:
+            key = .maxCacheDuration
+            value = data
+        default:
+            throw Error.missionSetupParameterType
+        }
+    }
+}
diff --git a/MoQTHaishinKit/Tests/MoQTPayLoadTests.swift b/MoQTHaishinKit/Tests/MoQTPayLoadTests.swift
new file mode 100644
index 000000000..6b97cac7c
--- /dev/null
+++ b/MoQTHaishinKit/Tests/MoQTPayLoadTests.swift
@@ -0,0 +1,14 @@
+import Foundation
+@testable import MoQTHaishinKit
+import Testing
+
+@Suite struct MoQTPayLoadTests {
+    @Test func putInt() throws {
+        var payload = MoQTPayload()
+        payload.putInt(MoQTVersion.draft04.rawValue)
+        #expect(payload.data == Data([192, 0, 0, 0, 255, 0, 0, 4]))
+        payload.position = 0
+        #expect(try payload.getInt() == MoQTVersion.draft04.rawValue)
+        #expect(payload.position == 8)
+    }
+}
diff --git a/MoQTHaishinKit/Tests/MoQTStreamHeaderSubgroupTests.swift b/MoQTHaishinKit/Tests/MoQTStreamHeaderSubgroupTests.swift
new file mode 100644
index 000000000..2718184bd
--- /dev/null
+++ b/MoQTHaishinKit/Tests/MoQTStreamHeaderSubgroupTests.swift
@@ -0,0 +1,19 @@
+import Foundation
+@testable import MoQTHaishinKit
+import Testing
+
+@Suite struct MoQTStreamHeaderSubgroupTests {
+    @Test func parse() throws {
+        var payload = MoQTPayload()
+        payload.putData(Data([4, 64, 99, 0, 129, 184, 103, 39, 0, 0, 0, 17, 50, 48, 50, 52, 45, 49, 49, 45, 49, 54, 32, 49, 52, 58, 50, 55, 58, 1, 1, 48, 2, 1, 49, 3, 1, 50, 4, 1, 51, 5, 1, 52, 6, 1, 53, 7, 1, 54, 8, 1, 55, 9, 1, 56, 10, 1, 57, 11, 2, 49, 48, 12, 2, 49, 49, 13, 2, 49, 50, 14, 2, 49, 51, 15, 2, 49, 52, 16, 2, 49, 53, 17, 2, 49, 54, 18, 2, 49, 55, 19, 2, 49, 56, 20, 2, 49, 57, 21, 2, 50, 48, 22, 2, 50, 49, 23, 2, 50, 50, 24, 2, 50, 51, 25, 2, 50, 52, 26, 2, 50, 53, 27, 2, 50, 54, 28, 2, 50, 55, 29, 2, 50, 56, 30, 2, 50, 57, 31, 2, 51, 48, 32, 2, 51, 49, 33, 2, 51, 50, 34, 2, 51, 51, 35, 2, 51, 52, 36, 2, 51, 53, 37, 2, 51, 54, 38, 2, 51, 55, 39, 2, 51, 56, 40, 2, 51, 57, 41, 2, 52, 48, 42, 2, 52, 49, 43, 2, 52, 50, 44, 2, 52, 51, 45, 2, 52, 52, 46, 2, 52, 53, 47, 2, 52, 54, 48, 2, 52, 55, 49, 2, 52, 56, 50, 2, 52, 57, 51, 2, 53, 48]))
+        payload.position = 1
+        let message = try MoQTStreamHeaderSubgroup(&payload)
+        #expect(message.trackAlias == 99)
+        #expect(message.groupId == 0)
+        var objects: [MoQTObject] = .init()
+        while 0 < payload.bytesAvailable {
+            objects.append(try MoQTObject(&payload))
+        }
+        #expect(objects.last?.id == 51)
+    }
+}
diff --git a/Package.swift b/Package.swift
index 021ab055e..8f51df4a9 100644
--- a/Package.swift
+++ b/Package.swift
@@ -23,7 +23,8 @@ let package = Package(
     ],
     products: [
         .library(name: "HaishinKit", targets: ["HaishinKit"]),
-        .library(name: "SRTHaishinKit", targets: ["SRTHaishinKit"])
+        .library(name: "SRTHaishinKit", targets: ["SRTHaishinKit"]),
+        .library(name: "MoQTHaishinKit", targets: ["MoQTHaishinKit"])
     ],
     dependencies: [
         .package(url: "https://github.com/shogo4405/Logboard.git", "2.5.0"..<"2.6.0")
@@ -45,6 +46,12 @@ let package = Package(
             path: "SRTHaishinKit/Sources",
             swiftSettings: swiftSettings
         ),
+        .target(
+            name: "MoQTHaishinKit",
+            dependencies: ["HaishinKit"],
+            path: "MoQTHaishinKit/Sources",
+            swiftSettings: swiftSettings
+        ),
         .testTarget(
             name: "HaishinKitTests",
             dependencies: ["HaishinKit"],
diff --git a/README.md b/README.md
index e11950992..b6f2c341b 100644
--- a/README.md
+++ b/README.md
@@ -39,7 +39,7 @@ Project name    |Notes       |License
 [HaishinKit for Flutter.](https://github.com/shogo4405/HaishinKit.dart)|Camera and Microphone streaming library via RTMP for Flutter.|[BSD 3-Clause "New" or "Revised" License](https://github.com/shogo4405/HaishinKit.dart/blob/master/LICENSE.md)
 
 ## 🎨 Features
-### RTMP
+### ✏️ RTMP
 - [x] Authentication
 - [x] Publish and Recording
 - [x] _Playback (Beta)_
@@ -55,7 +55,7 @@ Project name    |Notes       |License
 - [x] ReplayKit Live as a Broadcast Upload Extension
 - [x] [Enhanced RTMP](https://github.com/veovera/enhanced-rtmp)
 
-### SRT(beta)
+### ✏️ SRT(beta)
 - [x] Publish and Recording (H264/HEVC/AAC)
 - [x] Playback(beta)
 - [ ] mode
@@ -63,7 +63,6 @@ Project name    |Notes       |License
   - [x] listener
   - [ ] rendezvous
 
-
 ### 📹 Multi Streaming.
 Starting from version 2.0.0, multiple streams are supported, allowing live streaming to separate services. Views also support this, enabling the verification of raw video data
 ```swift