sing-song-player-3vx0f39v

Running

App Files Files Community

soiz1 commited on Jul 24

Commit

37b203b

1 Parent(s): 678e1df

Update web-socket.html

Browse files

Files changed (1) hide show

web-socket.html +129 -148

web-socket.html CHANGED Viewed

@@ -2,63 +2,67 @@
 <html lang="ja">
 <head>
     <script src="https://soiz1-eruda3.hf.space/eruda.js"></script>
-  <script>eruda.init();</script>
-  <meta charset="UTF-8" />
-  <title>管理ページ（IP・接続時間表示 + 地図表示）</title>
-  <script src="https://cdn.socket.io/4.0.1/socket.io.min.js"></script>
-  <link
-    rel="stylesheet"
-    href="https://unpkg.com/[email protected]/dist/leaflet.css"
-    crossorigin=""
-  />
-  <script
-    src="https://unpkg.com/[email protected]/dist/leaflet.js"
-    crossorigin=""
-  ></script>
-  <style>
-    #map {
-      height: 400px;
-      width: 100%;
-      border: 1px solid #ccc;
-      margin-bottom: 20px;
-    }
-    table {
-      border-collapse: collapse;
-      width: 100%;
-      margin-bottom: 20px;
-    }
-    th, td {
-      border: 1px solid #ccc;
-      padding: 8px;
-      text-align: left;
-    }
-    th {
-      background-color: #eee;
-    }
-    .highlight {
-      background-color: #f99;
-      transition: background-color 1s ease;
-    }
-  </style>
 </head>
 <body>
-  <div id="map"></div>
-  <h1>現在の接続ユーザー数: <span id="userCount">0</span></h1>
-  <div>更新はページ再読み込みで行います。</div>
-  <table>
     <thead>
-      <tr>
         <th>Socket ID</th>
         <th>IPアドレス</th>
         <th>接続時間</th>
         <th>切断時間</th>
-      </tr>
     </thead>
     <tbody id="userTableBody"></tbody>
-  </table>
-  <script>
     const socket = io("https://web-socket-server-14ap.onrender.com/");
     const STORAGE_KEY = "userSessions";
@@ -70,123 +74,100 @@
     const map = L.map('map').setView([35.681236, 139.767125], 5);
     L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
-      maxZoom: 18,
-      attribution: '© OpenStreetMap contributors'
     }).addTo(map);
     let markers = {};
-    async function fetchGeo(ip) {
-      try {
-        const response = await fetch("https://soiz1-ip-address-api.hf.space/ip", {
-          method: "POST",
-          headers: { "Content-Type": "application/json" },
-          body: JSON.stringify({ ip: ip })
-        });
-        if (!response.ok) {
-          console.error("APIエラー:", response.status);
-          return null;
-        }
-        const data = await response.json();
-        if (data && data.location && typeof data.location.latitude === "number" && typeof data.location.longitude === "number") {
-          return { lat: data.location.latitude, lon: data.location.longitude };
-        }
-        return null;
-      } catch (error) {
-        console.error("fetchGeo失敗:", error);
-        return null;
-      }
-    }
     function createCircleMarker(lat, lon, color, popupText) {
-      return L.circleMarker([lat, lon], {
-        radius: 10,
-        fillColor: color,
-        color: '#000',
-        weight: 1,
-        opacity: 1,
-        fillOpacity: 0.9
-      }).bindPopup(popupText);
     }
     socket.on("updateUserCount", (count) => {
-      userCountElem.textContent = count;
     });
-    socket.on("userSessionsUpdate", async (userSessions) => {
-      console.log("userSessionsUpdate受信", userSessions);
-      tbody.innerHTML = "";
-      for (let key in markers) {
-        map.removeLayer(markers[key]);
-      }
-      markers = {};
-      const positions = {};
-      await Promise.all(Object.entries(userSessions).map(async ([socketId, info]) => {
-        positions[socketId] = await fetchGeo(info.ip);
-      }));
-      for (const [socketId, info] of Object.entries(userSessions)) {
-        const tr = document.createElement("tr");
-        function createTd(text, elementKey) {
-          const td = document.createElement("td");
-          td.textContent = text;
-          const prevValue = previousSessions[socketId] ? previousSessions[socketId][elementKey] : undefined;
-          const currValue = info[elementKey];
-          const changed = prevValue !== currValue;
-          if (changed) {
-            td.classList.add("highlight");
-            setTimeout(() => td.classList.remove("highlight"), 1000);
-          }
-          return td;
         }
-        tr.appendChild(createTd(socketId, "socketId"));
-        tr.appendChild(createTd(info.ip || "-", "ip"));
-        tr.appendChild(createTd(info.connectTime ? new Date(info.connectTime).toLocaleString() : "-", "connectTime"));
-        tr.appendChild(createTd(info.disconnectTime ? new Date(info.disconnectTime).toLocaleString() : "-", "disconnectTime"));
-        tbody.appendChild(tr);
-        const pos = positions[socketId];
-        if (pos) {
-          const prevPos = previousSessions[socketId]?.geoPosition;
-          let changedPos = true;
-          if (prevPos && Math.abs(prevPos.lat - pos.lat) < 0.0001 && Math.abs(prevPos.lon - pos.lon) < 0.0001) {
-            changedPos = false;
-          }
-          const color = changedPos ? 'red' : 'black';
-          const marker = createCircleMarker(pos.lat, pos.lon, color, `SocketID: ${socketId}<br>IP: ${info.ip || "-"}`);
-          marker.addTo(map);
-          markers[socketId] = marker;
         }
-      }
-      const markerPositions = Object.values(markers).map(m => m.getLatLng());
-      if (markerPositions.length > 0) {
-        const group = L.featureGroup(Object.values(markers));
-        map.fitBounds(group.getBounds().pad(0.5));
-      }
-      const sessionsToStore = {};
-      for (const [socketId, info] of Object.entries(userSessions)) {
-        sessionsToStore[socketId] = {
-          ...info,
-          geoPosition: positions[socketId] || null
-        };
-      }
-      localStorage.setItem(STORAGE_KEY, JSON.stringify(sessionsToStore));
-      previousSessions = sessionsToStore;
     });
-  </script>
 </body>
-</html>

 <html lang="ja">
 <head>
     <script src="https://soiz1-eruda3.hf.space/eruda.js"></script>
+    <script>eruda.init();</script>
+    <meta charset="UTF-8" />
+    <title>管理ページ（IP・接続時間表示 + 地図表示）</title>
+    <script src="https://cdn.socket.io/4.0.1/socket.io.min.js"></script>
+    <link
+        rel="stylesheet"
+        href="https://unpkg.com/[email protected]/dist/leaflet.css"
+        crossorigin=""
+    />
+    <script
+        src="https://unpkg.com/[email protected]/dist/leaflet.js"
+        crossorigin=""
+    ></script>
+    <style>
+        #map {
+            height: 400px;
+            width: 100%;
+            border: 1px solid #ccc;
+            margin-bottom: 20px;
+        }
+        table {
+            border-collapse: collapse;
+            width: 100%;
+            margin-bottom: 20px;
+        }
+        th, td {
+            border: 1px solid #ccc;
+            padding: 8px;
+            text-align: left;
+        }
+        th {
+            background-color: #eee;
+        }
+        .highlight {
+            background-color: #f99;
+            transition: background-color 1s ease;
+        }
+    </style>
 </head>
 <body>
+<div id="map"></div>
+<h1>現在の接続ユーザー数: <span id="userCount">0</span></h1>
+<div>更新はページ再読み込みで行います。</div>
+<table>
     <thead>
+    <tr>
         <th>Socket ID</th>
         <th>IPアドレス</th>
         <th>接続時間</th>
         <th>切断時間</th>
+        <th>位置情報</th>
+        <th>都市</th>
+        <th>地域</th>
+        <th>国</th>
+    </tr>
     </thead>
     <tbody id="userTableBody"></tbody>
+</table>
+<script>
     const socket = io("https://web-socket-server-14ap.onrender.com/");
     const STORAGE_KEY = "userSessions";
     const map = L.map('map').setView([35.681236, 139.767125], 5);
     L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
+        maxZoom: 18,
+        attribution: '© OpenStreetMap contributors'
     }).addTo(map);
     let markers = {};
     function createCircleMarker(lat, lon, color, popupText) {
+        return L.circleMarker([lat, lon], {
+            radius: 10,
+            fillColor: color,
+            color: '#000',
+            weight: 1,
+            opacity: 1,
+            fillOpacity: 0.9
+        }).bindPopup(popupText);
     }
     socket.on("updateUserCount", (count) => {
+        userCountElem.textContent = count;
     });
+    socket.on("userSessionsUpdate", (userSessions) => {
+        console.log("userSessionsUpdate受信", userSessions);
+        tbody.innerHTML = "";
+        for (let key in markers) {
+            map.removeLayer(markers[key]);
+        }
+        markers = {};
+        for (const [socketId, info] of Object.entries(userSessions)) {
+            const tr = document.createElement("tr");
+            function createTd(text, elementKey) {
+                const td = document.createElement("td");
+                td.textContent = text;
+                const prevValue = previousSessions[socketId] ? previousSessions[socketId][elementKey] : undefined;
+                const currValue = info[elementKey];
+                const changed = prevValue !== currValue;
+                if (changed) {
+                    td.classList.add("highlight");
+                    setTimeout(() => td.classList.remove("highlight"), 1000);
+                }
+                return td;
+            }
+            tr.appendChild(createTd(socketId, "socketId"));
+            tr.appendChild(createTd(info.ip || "-", "ip"));
+            tr.appendChild(createTd(info.connectTime ? new Date(info.connectTime).toLocaleString() : "-", "connectTime"));
+            tr.appendChild(createTd(info.disconnectTime ? new Date(info.disconnectTime).toLocaleString() : "-", "disconnectTime"));
+            tr.appendChild(createTd(info.loc || "-", "loc"));
+            tr.appendChild(createTd(info.city || "-", "city"));
+            tr.appendChild(createTd(info.region || "-", "region"));
+            tr.appendChild(createTd(info.country || "-", "country"));
+            tbody.appendChild(tr);
+            // 位置情報がある場合、地図にマーカーを追加
+            if (info.loc) {
+                const [lat, lon] = info.loc.split(',').map(Number);
+                const prevLoc = previousSessions[socketId]?.loc;
+                const changedPos = prevLoc !== info.loc;
+                const color = changedPos ? 'red' : 'blue';
+                const locationText = [
+                    `SocketID: ${socketId}`,
+                    `IP: ${info.ip || "-"}`,
+                    `都市: ${info.city || "-"}`,
+                    `地域: ${info.region || "-"}`,
+                    `国: ${info.country || "-"}`
+                ].join('<br>');
+                const marker = createCircleMarker(lat, lon, color, locationText);
+                marker.addTo(map);
+                markers[socketId] = marker;
+            }
         }
+        // マーカーがある場合、地図を適切な範囲に調整
+        if (Object.keys(markers).length > 0) {
+            const group = L.featureGroup(Object.values(markers));
+            map.fitBounds(group.getBounds().pad(0.5));
         }
+        // セッション情報をローカルストレージに保存
+        localStorage.setItem(STORAGE_KEY, JSON.stringify(userSessions));
+        previousSessions = userSessions;
     });
+</script>
 </body>
+</html>