fixed build debian package script

Author: mini

build_debian_package.sh

@@ -17,7 +17,11 @@ function create_debian_folder() {
    if [ -d ${DEB_PKG_ROOT} ]; then
       rm -rf ${DEB_PKG_ROOT}
    fi
-   mkdir -pv ${DEB_PKG_ROOT}/{DEBIAN,etc/{gwc,default,systemd/user},usr/sbin}
+   mkdir -pv ${DEB_PKG_ROOT}/DEBIAN
+   mkdir -pv ${DEB_PKG_ROOT}/etc/gwc,
+   mkdir -pv ${DEB_PKG_ROOT}/etc/default,systemd/user
+   mkdir -pv ${DEB_PKG_ROOT}/etc/systemd/user
+   mkdir -pv ${DEB_PKG_ROOT}/usr/sbin
 
    cat > ${DEB_PKG_ROOT}/DEBIAN/control<< EOF
 Package: gst-webrtc-camera
@@ -58,9 +62,8 @@ EOF
 GWC_USER_PATH=/home/\${SUDO_USER}/.config/gwc/webroot
 USER_SYSTEMD=/home/\${SUDO_USER}/.config/systemd/user/default.target.wants
 
-if [ ! -d \${USER_SYSTEMD} ]; then
-   mkdir -pv \${USER_SYSTEMD}
-fi
+mkdir -pv \${USER_SYSTEMD}
+mkdir -pv \${GWC_USER_PATH}
 
 chown \${SUDO_USER}:\${SUDO_USER} -R /home/\${SUDO_USER}/.config
 
@@ -137,13 +140,19 @@ EOF
 Description=Gstreamer webrtc camera
 Documentation=https://github.com/yjdwbj/gst-webrtc-camera
 After=multi-user.target
+StartLimitIntervalSec=20
+StartLimitBurst=2
+
 
 [Service]
 ExecStart=/usr/sbin/gwc
-Restart=no
+
+
+Restart=on-failure
+RestartSec=5s
 Type=simple
-StandardOutput=append:/tmp/gwc.log
-StandardError=append:/tmp/gwc.log
+StandardOutput=append:/var/log/gwc.log
+StandardError=append:/var/log/gwc.log
 
 
 [Install]

webroot/index.html

@@ -42,8 +42,10 @@
     }
   </style>
   <div class="d-flex">
-    <a class="btn btn-primary align-self-start m-2" href="webrtc.html" id="switch-pc" role="button" style="display: none">Show WebRTC</a>
-    <a class="btn btn-sm btn-primary align-self-start m-2" href="webrtc.html" id="switch-mobile" role="button" style="display: none">Show WebRTC</a>
+    <a class="btn btn-primary align-self-start m-2" href="webrtc.html" id="switch-pc" role="button"
+      style="display: none">Show WebRTC</a>
+    <a class="btn btn-sm btn-primary align-self-start m-2" href="webrtc.html" id="switch-mobile" role="button"
+      style="display: none">Show WebRTC</a>
     <h2 class="text-center align-self-center flex-fill" id="title-pc" style="display: none">Gsteramer HLS 直播流服务</h2>
     <h5 class="text-center align-self-center flex-fill" id="title-mobile" style="display: none">Gsteramer HLS 直播流服务</h5>
   </div>
@@ -95,11 +97,11 @@ <h5 class="text-center align-self-center flex-fill" id="title-mobile" style="dis
       });
     }
 
-    window.mobileAndTabletCheck = function() {
-    let check = false;
-    (function(a){if(/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino|android|ipad|playbook|silk/i.test(a)||/1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.test(a.substr(0,4))) check = true;})(navigator.userAgent||navigator.vendor||window.opera);
-    return check;
-};
+    window.mobileAndTabletCheck = function () {
+      let check = false;
+      (function (a) { if (/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino|android|ipad|playbook|silk/i.test(a) || /1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.test(a.substr(0, 4))) check = true; })(navigator.userAgent || navigator.vendor || window.opera);
+      return check;
+    };
 
     window.addEventListener('load', (event) => {
       console.log("page is fully loaded!");
@@ -128,19 +130,28 @@ <h5 class="text-center align-self-center flex-fill" id="title-mobile" style="dis
       function onServerMessage(event) {
         var msg;
 
-        $.getJSON('https://api.ipify.org?format=json', function (data) {
-          let info = {
-            client: {
-              ip: data.ip,
-              username: document.querySelector('meta[name="user"]').content,
-              useragent: navigator.userAgent,
-              path: document.location.pathname,
-              origin: document.location.origin
-            }
-          };
-          websocketConnection.send(JSON.stringify(info));
+        $.ajax({
+          url: 'https://ipinfo.io/ip',
+          method: 'GET',
+          dataType: 'text', // or 'html', 'xml', 'text' based on expected response
+          success: function (data) {
+            let info = {
+              client: {
+                ip: data,
+                username: document.querySelector('meta[name="user"]').content,
+                useragent: navigator.userAgent,
+                path: document.location.pathname,
+                origin: document.location.origin
+              }
+            };
+            websocketConnection.send(JSON.stringify(info));
+          },
+          error: function (xhr, status, error) {
+            console.error("AJAX Error:", error);
+          }
         });
 
+
         try {
           msg = JSON.parse(event.data);
         } catch (e) {

webroot/webrtc.js

@@ -554,17 +554,26 @@ window.onload = function () {
       if (reconnectTimerId)
         clearTimeout(reconnectTimerId);
 
-      $.getJSON('https://api.ipify.org?format=json', function (data) {
-        let info = {
-          client: {
-            ip: data.ip,
-            username: document.querySelector('meta[name="user"]').content,
-            useragent: navigator.userAgent,
-            path: document.location.pathname,
-            origin: document.location.origin
-          }
-        };
-        websocketConnection.send(JSON.stringify(info));
+      
+      $.ajax({
+        url: 'https://ipinfo.io/ip',
+        method: 'GET',
+        dataType: 'text', // or 'html', 'xml', 'text' based on expected response
+        success: function (data) {
+          let info = {
+            client: {
+              ip: data,
+              username: document.querySelector('meta[name="user"]').content,
+              useragent: navigator.userAgent,
+              path: document.location.pathname,
+              origin: document.location.origin
+            }
+          };
+          websocketConnection.send(JSON.stringify(info));
+        },
+        error: function (xhr, status, error) {
+          console.error("AJAX Error:", error);
+        }
       });
     })
       .catch((err) => {