Merge pull request #850 from jianjunz/revert-794-install-quic

Revert "Enable QUIC agent by default."

Author: taste1981

scripts/build.json

@@ -12,8 +12,7 @@
             "webrtc",
             "avstream",
             "gst-pipeline",
-            "sip",
-            "quic"
+            "sip"
         ]
     },
     "mcu-msdk" : {
@@ -27,8 +26,7 @@
             "audio-ranker",
             "webrtc",
             "avstream",
-            "sip",
-            "quic"
+            "sip"
         ]
     },
     "mcu-all" : {
@@ -51,6 +49,12 @@
             "webrtc-frame"
         ]
     },
+    "mcu-quic": {
+        "include":[
+            "mcu",
+            "quic"
+        ]
+    },
     "video-mixer-sw" : {
         "path" : "source/agent/video/videoMixer/videoMixer_sw",
         "gyp" : "binding.sw.gyp"
@@ -116,6 +120,6 @@
     },
     "quic" : {
         "path" : "source/agent/addons/quic",
-        "description": "QUIC agent supports WebTransport over QUIC connections."
+        "description": "QUIC agent supports WebTransport - QuicTransport connections. Experimental feature."
     }
 }

scripts/installCommonDeps.sh

@@ -299,30 +299,13 @@ install_licode(){
 }
 
 install_quic(){
-  # QUIC IO
   rm $ROOT/third_party/quic-lib -rf
   mkdir $ROOT/third_party/quic-lib
 
   pushd ${ROOT}/third_party/quic-lib
   wget https://github.com/open-webrtc-toolkit/owt-deps-quic/releases/download/v0.1/dist.tgz
   tar xzf dist.tgz
   popd
-
-  # QUIC transport
-  local QUIC_SDK_VERSION=`cat $ROOT/source/agent/addons/quic/quic_sdk_version`
-  local QUIC_TRANSPORT_PATH=$ROOT/third_party/quic-transport
-  rm -r $QUIC_TRANSPORT_PATH
-  mkdir $QUIC_TRANSPORT_PATH
-  pushd $QUIC_TRANSPORT_PATH
-  wget $QUIC_TRANSPORT_PACKAGE_URL_PREFIX/linux/$QUIC_SDK_VERSION.zip
-  if [ $? -eq 0 ]; then
-    unzip $QUIC_SDK_VERSION.zip
-    rm $QUIC_SDK_VERSION.zip
-    cp bin/release/libowt_quic_transport.so $ROOT/build/libdeps/build/lib
-  else
-    read -p "Failed to download prebuild QUIC SDK. Please download and compile QUIC SDK version $QUIC_SDK_VERSION from https://github.com/open-webrtc-toolkit/owt-deps-quic."
-  fi
-  popd
 }
 
 install_nicer(){

scripts/pack.js

@@ -40,6 +40,8 @@ const originCwd = cwd();
 const osScript = path.join(rootDir, 'scripts/detectOS.sh');
 const osType = execSync(`bash ${osScript}`).toString().toLowerCase();
 
+const experimentalTargets = ['quic-agent'];
+
 var allTargets = [];
 
 if (options.full) {
@@ -128,7 +130,8 @@ function getPackList(targets) {
   }
 
   var packList = targets.filter((element) => {
-    if (options.target.includes('all')) return true;
+    // Don't include QUIC agent by default until CI is added for QUIC SDK.
+    if (options.target.includes('all') && !experimentalTargets.includes(element.rules.name)) return true;
     return options.target.includes(element.rules.name);
   });
   if (packList.length === 0) {
@@ -415,7 +418,7 @@ function isLibAllowed(libSrc) {
   if (!libSrc)
     return false;
 
-  const allowList = [
+  const whiteList = [
     'rtcadapter',
     'libssl.so.1.1',
     'libcrypto',
@@ -425,19 +428,18 @@ function isLibAllowed(libSrc) {
     'libopenh264',
     'libre',
     'sipLib',
-    'librawquic',
-    'libowt_quic_transport',
+    'librawquic'
   ];
   if (!options['archive'] || options['with-ffmpeg']) {
-    allowList.push('libav');
-    allowList.push('libsw');
+    whiteList.push('libav');
+    whiteList.push('libsw');
   }
 
   const libName = path.basename(libSrc);
 
   var found = false;
-  for (let i in allowList) {
-    if (libName.indexOf(allowList[i]) === 0) {
+  for (let i in whiteList) {
+    if (libName.indexOf(whiteList[i]) === 0) {
       found = true;
       break;
     }
@@ -590,6 +592,9 @@ function packScripts() {
   }
   scriptItems.push('app');
   scriptItems.forEach((m) => {
+    if (experimentalTargets.includes(m)) {
+      return;
+    }
     startCommands += '${bin}/daemon.sh start ' + m + ' $1\n';
     stopCommands += '${bin}/daemon.sh stop ' + m + '\n';
   });

source/agent/addons/quic/binding.gyp

@@ -38,14 +38,16 @@
       '../../../core/common',
       '../../../core/owt_base',
       '../../../../build/libdeps/build/include',
-      '../../../../third_party/quic-transport/include',
+      # TODO: Fix it when CI for QUIC SDK is ready.
+      '/home/jianjunz/code/quic/src/owt/quic_transport/api',
       '<!@(pkg-config glib-2.0 --cflags-only-I | sed s/-I//g)',
     ],
     'ldflags': [
       '-Wl,--no-as-needed',
+      '-Wl,-rpath,/home/jianjunz/code/quic/src/out/debug',
       '-L$(CORE_HOME)/../../build/libdeps/build/lib',
       '-fPIC',
-      '-L<(module_root_dir)/../../../../third_party/quic-transport/bin/release',
+      '-L/home/jianjunz/code/quic/src/out/debug',
     ],
     'cflags_cc!': [
       '-std=gnu++0x',

source/agent/addons/quic/quic_sdk_version

@@ -18,8 +18,6 @@
           "../../common/clusterWorker.js",
           "../../common/loadCollector.js",
           "../../common/logger.js",
-          "../../common/makeRPC.js",
-          "../../common/rpcChannel.js",
           "../../../scripts/release/initcert.js",
           "../../../scripts/release/initauth.js",
           "../../../scripts/detectOS.sh"

source/agent/quic/dist.json

@@ -4,7 +4,7 @@ superserviceID = "_auto_generated_ID_" #default: ""
 ssl = true #if use HTTPS
 port = 3000 #default: 3000, port of server
 numberOfProcess = 4 #default: 1
-enableWebTransport = true #default: true.
+enableWebTransport = false #default: false.
 
 [cluster]
 name = "owt-cluster"