giteaadmin/justice
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

join room

Browse Source
This commit is contained in:
giteaadmin
2026-06-23 04:25:19 +00:00
parent 4aed5bdafe
commit 60fa983830
8 changed files with 57 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
www/html/Admin/private/store.json
+12
View File
@@ -733,6 +733,18 @@
"achievements": {
"d1_minigame_solver": 2
}
},
{
"id": "4647f699cdb5676b884008f8",
"email": "",
"displayName": "Guest",
"loginType": "guest",
"providerUserId": "p_1782187303882_g81ebi60min",
"notes": "auto: player-coins",
"blocked": false,
"coins": 0,
"createdAt": "2026-06-23T04:01:44+00:00",
"updatedAt": "2026-06-23T04:01:44+00:00"
}
]
}
www/html/Create Room/create-room.js
+2
View File
@@ -199,6 +199,7 @@
name: name,
isPrivate: isPrivate,
maxPlayers: maxPlayersForSlot(selectedSlot),
password: isPrivate ? getPrivatePinDigits() : '',
};
fetch(SERVER + '/api/spaces', {
method: 'POST',
@@ -229,6 +230,7 @@
} catch (e) {}
var lobbyUrl = BASE + '/room-lobby.html?space=' + encodeURIComponent(sid) + '&nick=' + encodeURIComponent(getNick());
lobbyUrl += '&displayRoom=' + encodeURIComponent(name);
if (isPrivate) lobbyUrl += '&pass=' + encodeURIComponent(getPrivatePinDigits()); /* host เข้าห้องตัวเองผ่านด่านรหัส */
try {
var caseId = localStorage.getItem('caseId');
var prevSpaceName = localStorage.getItem('prevSpaceName');
www/html/Create Room/index.html
+1 -1
View File
@@ -87,7 +87,7 @@
</div>
<script src="../app-base.js"></script>
<script src="create-room.js?v=20260527"></script>
<script src="create-room.js?v=20260623"></script>
<script>
(function(){
var content = document.querySelector('.create-content');
www/html/Game/public/js/room-lobby.js
+7 -1
View File
@@ -14,11 +14,16 @@
if (!spaceId) { location.href = DESIGN_MENU; return; }
const roomIdValueEl = document.getElementById('room-id-value');
const displayRoomParam = (params.get('displayRoom') || '').trim();
/** ตัด suffix timestamp ที่ต่อท้าย spaceId ตอนสร้างห้อง (เช่น "asdasd-1782187315578" → "asdasd")
→ client ที่ join (ไม่มี ?displayRoom) จะโชว์ชื่อห้องเหมือน host */
function cleanRoomIdForDisplay(sid) {
return String(sid || '').replace(/-\d{10,}$/, '');
}
if (displayRoomParam) {
try { localStorage.setItem('lastCreatedSpaceName', displayRoomParam); } catch (e) { /* ignore */ }
if (roomIdValueEl) roomIdValueEl.textContent = displayRoomParam;
} else if (roomIdValueEl) {
roomIdValueEl.textContent = String(spaceId);
roomIdValueEl.textContent = cleanRoomIdForDisplay(spaceId);
}
const CREATE_ROOM_URL = typeof appPath === 'function' ? appPath('/Create%20Room/') : '/Create%20Room/';
@@ -3102,6 +3107,7 @@
playerKey: ensurePlayerKey(),
desiredLobbyColorThemeIndex: savedThemeIdx,
desiredLobbySkinToneIndex: savedSkinIdx,
roomPassword: (params.get('pass') || '').trim(), /* ห้องส่วนตัว: รหัสผ่านจาก ?pass (host/joiner) */
}, (res) => {
if (!res || !res.ok) {
var joinErr = (res && res.error) || 'เข้าไม่ได้';
www/html/Game/public/room-lobby.html
+1 -1
View File
@@ -1617,7 +1617,7 @@
<script src="js/version.js?v=0.0122"></script>
<script src="js/customize-popup.js?v=40" data-customize-triggers="" data-customize-asset-base="img/03-5-Customize"></script>
<script src="js/achievements.js?v=0.002" data-asset-base="img/03-6-Profile"></script>
<script src="js/room-lobby.js?v=0.0299"></script>
<script src="js/room-lobby.js?v=0.0301"></script>
<div class="version-tag">v —</div>
</body>
</html>
www/html/Game/server.js
+23 -9
View File
@@ -5922,15 +5922,15 @@ const server = http.createServer((req, res) => {
if (!mapData) return res.writeHead(400), res.end(JSON.stringify({ ok: false, error: 'ไม่พบฉาก' }));
const isPrivate = !!d.isPrivate;
let sid;
let roomPassword = '';
if (isPrivate) {
const chars = 'ABCDEFGHJKLMNPQRSTUVWXYZ23456789';
let code;
for (let i = 0; i < 20; i++) {
code = '';
for (let j = 0; j < 6; j++) code += chars[Math.floor(Math.random() * chars.length)];
if (!spaces.has(code)) { sid = code; break; }
}
if (!sid) sid = 'priv-' + Date.now();
/* ห้องส่วนตัว: ใช้ "ชื่อห้อง" เป็น spaceId (canonical = trim+lowercase) → join ด้วยชื่อ+รหัสได้
(เดิมเป็นรหัสสุ่ม 6 ตัว ทำให้ join ด้วยชื่อไม่เจอ) */
const canon = String(d.name || '').trim().toLowerCase();
if (!canon) return res.writeHead(400), res.end(JSON.stringify({ ok: false, error: 'กรุณาใส่ชื่อห้อง' }));
if (spaces.has(canon)) return res.writeHead(409), res.end(JSON.stringify({ ok: false, error: 'ชื่อห้องนี้ถูกใช้แล้ว ลองชื่ออื่น' }));
sid = canon;
roomPassword = String(d.password == null ? '' : d.password).replace(/\D/g, '').slice(0, 4);
} else {
const base = (d.name || '').trim() || 'space';
sid = base + '-' + Date.now();
@@ -5949,6 +5949,7 @@ const server = http.createServer((req, res) => {
botSlotCount = effectiveBotSlotCount({ botSlotCount, maxPlayers });
spaces.set(sid, {
mapData, mapId, peers: new Map(), spaceName, hostId: null, isPrivate, maxPlayers, createdAt: Date.now(),
roomPassword,
previewEditorTest,
botSlotCount,
suspectCardMinigames: null,
@@ -7475,9 +7476,22 @@ io.on('connection', (socket) => {
if (qbAllAnswered(room)) qbReveal(room);
});
socket.on('join-space', ({ spaceId, nickname, characterId, playMapId, playerKey, desiredLobbyColorThemeIndex, desiredLobbySkinToneIndex, bannedSpectator }, cb) => {
socket.on('join-space', ({ spaceId, nickname, characterId, playMapId, playerKey, desiredLobbyColorThemeIndex, desiredLobbySkinToneIndex, bannedSpectator, roomPassword }, cb) => {
const space = spaces.get(spaceId);
if (!space || !space.mapData) return cb && cb({ ok: false, error: 'ไม่พบห้อง' });
/* ห้องส่วนตัวที่ตั้งรหัส → ต้องกรอกรหัสให้ตรง ครั้งแรก แล้วจำด้วย playerKey
(กันด่านรหัสพังตอนเปลี่ยนหน้า LobbyA→play→LobbyB ที่ socket.id เปลี่ยน — ไม่ต้องแนบ pass ทุกลิงก์) */
if (space.isPrivate && space.roomPassword) {
space.privateVerifiedKeys = space.privateVerifiedKeys || new Set();
const pk = String(playerKey == null ? '' : playerKey);
const provided = String(roomPassword == null ? '' : roomPassword).replace(/\D/g, '').slice(0, 4);
const passOk = provided === space.roomPassword;
const alreadyOk = (pk && space.privateVerifiedKeys.has(pk)) || space.peers.has(socket.id);
if (!passOk && !alreadyOk) {
return cb && cb({ ok: false, error: 'รหัสผ่านห้องไม่ถูกต้อง' });
}
if (passOk && pk) space.privateVerifiedKeys.add(pk);
}
const maxPlayers = space.maxPlayers || 10;
const mdJoinPre = (space.mapId && maps.get(space.mapId)) || space.mapData;
if (mdJoinPre && mdJoinPre.gameType === 'gauntlet' && space.peers.size >= GAUNTLET_MAX_PLAYERS) {
www/html/Join Room/index.html
+1 -1
View File
@@ -82,6 +82,6 @@
<script src="../app-base.js?v=2"></script>
<script src="../Game/js/display-name.js?v=2"></script>
<script src="join.js?v=0.006131121"></script>
<script src="join.js?v=0.006131122"></script>
</body>
</html>
www/html/Join Room/join.js
+10 -4
View File
@@ -191,11 +191,13 @@
});
btnPrivateJoin?.addEventListener('click', function () {
/* รหัสห้องเป็นตัวพิมพ์ใหญ่เสมอ (ABCDEFGHJKLMNPQRSTUVWXYZ23456789) — บังคับ uppercase กันพิมพ์เล็กแล้วหาห้องไม่เจอ (404) */
var code = (idPrivate?.value || '').trim().toUpperCase();
/* ห้องส่วนตัว join ด้วย "ชื่อห้อง" + รหัสผ่าน — spaceId ฝั่ง server = ชื่อแบบ canonical (trim+lowercase)
(เดิม uppercase เป็นรหัสสุ่ม → พิมพ์ชื่อห้องแล้วหาไม่เจอ) */
var raw = (idPrivate?.value || '').trim();
var code = raw.toLowerCase();
var pass = (passPrivate?.value || '').trim();
if (!code) {
alert('กรุณากรอกรหัสห้อง');
alert('กรุณากรอกชื่อห้อง');
idPrivate?.focus();
return;
}
@@ -204,7 +206,11 @@
passPrivate?.focus();
return;
}
goToRoom(code);
var url = BASE + '/room-lobby.html?space=' + encodeURIComponent(code)
+ '&nick=' + encodeURIComponent(getNick())
+ '&displayRoom=' + encodeURIComponent(raw);
if (pass) url += '&pass=' + encodeURIComponent(pass);
window.location.href = url;
});
if (USE_PUBLIC_ROOM_MOCK) {