fix: link Открыть (#8)

* fix: show more one camer in intercom * fix: link Открыть * add: support url from URL js * fix: host in url link
moleus · May 20, 2024 · 118b075 · 118b075
1 parent 80daa19
commit 118b075
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 5 deletions.
diff --git a/handlers/auth.go b/handlers/auth.go
@@ -213,10 +213,23 @@ func (h *Handler) HomeHandler(w http.ResponseWriter, r *http.Request) {
 
 	finances, _ := h.GetFinances()
 
+	// fix: https://github.com/ad/domru/issues/11
+	host := r.Host
+	if host == "" {
+		host = fmt.Sprintf("%s:%s", hostIP, strconv.Itoa(h.Config.Port))
+	}
+	var scheme string
+	scheme = r.URL.Scheme;
+	if scheme == "" {
+		scheme = "http"
+	}
+
 	data := HomePageData{
 		HassioIngress: ingressPath,
 		HostIP:        hostIP,
 		Port:          strconv.Itoa(h.Config.Port),
+		Host:          host,
+		Scheme:        scheme,
 		LoginError:    loginError,
 		Phone:         strconv.Itoa(h.Config.Login),
 		Token:         h.Config.Token,

diff --git a/handlers/const.go b/handlers/const.go
@@ -102,6 +102,8 @@ type HomePageData struct {
 	HassioIngress string
 	HostIP        string
 	Port          string
+	Host          string
+	Scheme        string
 	LoginError    string
 	Phone         string
 	Token         string

diff --git a/templates/home.html b/templates/home.html
@@ -95,12 +95,12 @@
                     <div class="table-body-cell">Адрес:</div>
                     <div class="table-body-cell">
                         {{ $ac.Name }}
-                        <button onclick="fetch('http://{{ $.HostIP }}:{{ $.Port }}/door?placeID={{ $element.Place.ID }}&accessControlID={{ $ac.ID }}'); return false;">Открыть</button>
+                        <button onclick="fetch('{{ $.HassioIngress }}/door?placeID={{ $element.Place.ID }}&accessControlID={{ $ac.ID }}'); return false;">Открыть</button>
                     </div>
                 </div>
                 <div class="resp-table-row">
                     <div class="table-body-cell">Видеопоток:</div>
-                    <div class="table-body-cell">http://{{ $.HostIP }}:{{ $.Port }}/stream?cameraID={{ (index $.Cameras.Data $index).ID }}</div>
+                    <div class="table-body-cell">{{ $.Scheme }}://{{ $.Host }}/stream?cameraID={{ (index $.Cameras.Data $index).ID }}</div>
                 </div>
                 <div class="resp-table-row">
                     <div class="table-body-cell"></div>
@@ -114,13 +114,13 @@
                         <pre>
 rest_command:
     domru_open_door:
-        url: http://{{ $.HostIP }}:{{ $.Port }}/door?placeID={{ $element.Place.ID }}&accessControlID={{ $ac.ID }}
+        url: {{ $.Scheme }}://{{ $.Host }}/door?placeID={{ $element.Place.ID }}&accessControlID={{ $ac.ID }}
 
 camera:
     - platform: generic
         name: domofon
-        still_image_url: http://{{ $.HostIP }}:{{ $.Port }}/snapshot?placeID={{ $element.Place.ID }}&accessControlID={{ $ac.ID }}
-        stream_source: http://{{ $.HostIP }}:{{ $.Port }}/stream?cameraID={{ (index $.Cameras.Data $index).ID }}
+        still_image_url: {{ $.Scheme }}://{{ $.Host }}/snapshot?placeID={{ $element.Place.ID }}&accessControlID={{ $ac.ID }}
+        stream_source: {{ $.Scheme }}://{{ $.Host }}/stream?cameraID={{ (index $.Cameras.Data $index).ID }}
                         </pre>
                     </div>
                 </div>