Spaces:
Paused
Paused
Upload main.py
Browse files
main.py
CHANGED
|
@@ -42,6 +42,7 @@ ph = PasswordHasher()
|
|
| 42 |
|
| 43 |
# ============================ Logging (ring buffer) ============================
|
| 44 |
LOGS = deque(maxlen=5000)
|
|
|
|
| 45 |
|
| 46 |
def now_iso():
|
| 47 |
return datetime.now(timezone.utc).isoformat(timespec="seconds")
|
|
@@ -55,6 +56,14 @@ def log(level, source, event, detail="", rid=None):
|
|
| 55 |
except Exception:
|
| 56 |
pass
|
| 57 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 58 |
# ============================ Database layer ============================
|
| 59 |
# Production: Supabase (PostgREST via service-role key, never sent to clients).
|
| 60 |
# Fallback (local dev/testing only): SQLite when Supabase env vars are absent.
|
|
@@ -65,6 +74,7 @@ SCHEMA_VERSION = "2"
|
|
| 65 |
# أسماء مستويات الإدارة
|
| 66 |
ADMIN_RANKS = {0: "player", 1: "helper", 2: "moderator", 3: "admin", 4: "senior_admin", 5: "owner"}
|
| 67 |
ADMIN_RANK = int(os.environ.get("ADMIN_RANK", "5"))
|
|
|
|
| 68 |
|
| 69 |
# ------------------------------------------------------------------
|
| 70 |
# Schema: هجرات idempotent - الخادم ينشئ/يحدّث كل شيء عند كل إقلاع
|
|
@@ -459,6 +469,14 @@ def rate_ok(key, limit, per_sec):
|
|
| 459 |
# ============================ Sessions ============================
|
| 460 |
SESSIONS = {}
|
| 461 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 462 |
def make_session(pid, username, role, arank=0):
|
| 463 |
token = secrets.token_urlsafe(32)
|
| 464 |
SESSIONS[token] = {"pid": pid, "username": username, "role": role, "arank": arank,
|
|
@@ -483,13 +501,14 @@ def grid_key(x, y):
|
|
| 483 |
return (int(x // GRID_CELL), int(y // GRID_CELL))
|
| 484 |
|
| 485 |
class Player:
|
| 486 |
-
def __init__(self, pid, name, role, rank_id, profile, ws):
|
| 487 |
self.pid = pid
|
| 488 |
self.name = name
|
| 489 |
self.role = role
|
| 490 |
self.rank_id = rank_id
|
| 491 |
self.profile = profile
|
| 492 |
self.ws = ws
|
|
|
|
| 493 |
h = 0
|
| 494 |
for ch in name:
|
| 495 |
h = (h * 31 + ord(ch)) & 0xffff
|
|
@@ -518,7 +537,7 @@ class Player:
|
|
| 518 |
self.jail_until = 0.0
|
| 519 |
|
| 520 |
def public_full(self):
|
| 521 |
-
return {"id": self.pid, "name": self.name, "role": self.role,
|
| 522 |
"x": round(self.x), "y": round(self.y),
|
| 523 |
"dir": self.dir, "mov": self.mov, "wt": round(self.wt, 1), "sal": self.sal,
|
| 524 |
"has": self.has_w, "hol": self.hol_w, "ping": self.ping,
|
|
@@ -561,12 +580,13 @@ class Room:
|
|
| 561 |
if pid == me.pid:
|
| 562 |
continue
|
| 563 |
p = self.players.get(pid)
|
| 564 |
-
if p and math.hypot(p.x - me.x, p.y - me.y) <= VIEW_RANGE:
|
| 565 |
out.append(p)
|
| 566 |
return out
|
| 567 |
|
| 568 |
ROOMS = {}
|
| 569 |
DB_READY = False
|
|
|
|
| 570 |
JAIL_X = 2400.0
|
| 571 |
JAIL_Y = 2320.0
|
| 572 |
JAIL_R = 130.0
|
|
@@ -584,14 +604,16 @@ def find_player(pid):
|
|
| 584 |
return None, None
|
| 585 |
|
| 586 |
def deliver(p, obj):
|
| 587 |
-
"""توصيل رسال
|
| 588 |
-
if p.transport == "ws" and p.ws is not None:
|
| 589 |
try:
|
| 590 |
-
|
|
|
|
|
|
|
|
|
|
| 591 |
except Exception:
|
| 592 |
-
|
| 593 |
-
|
| 594 |
-
p.events.append(obj)
|
| 595 |
|
| 596 |
async def safe_send(ws, obj):
|
| 597 |
try:
|
|
@@ -608,6 +630,14 @@ app.add_middleware(
|
|
| 608 |
allow_headers=["*"],
|
| 609 |
)
|
| 610 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 611 |
class AuthIn(BaseModel):
|
| 612 |
username: str = Field(min_length=1, max_length=24)
|
| 613 |
password: str = Field(min_length=1, max_length=128)
|
|
@@ -864,17 +894,13 @@ def admin_overview(request: Request):
|
|
| 864 |
@app.post("/api/admin/kick")
|
| 865 |
def admin_kick(body: KickIn, request: Request, background_tasks: BackgroundTasks):
|
| 866 |
s = require_admin(request)
|
|
|
|
|
|
|
| 867 |
for r in ROOMS.values():
|
| 868 |
p = r.players.get(body.player_id)
|
| 869 |
if p:
|
| 870 |
r.remove(body.player_id)
|
| 871 |
deliver(p, {"t": "kicked", "by": s["username"], "reason": body.reason})
|
| 872 |
-
if p.transport == "ws" and p.ws is not None:
|
| 873 |
-
try:
|
| 874 |
-
import asyncio as _a
|
| 875 |
-
_a.get_event_loop()
|
| 876 |
-
except Exception:
|
| 877 |
-
pass
|
| 878 |
async def _notify(ws_p, pid_p, n_p):
|
| 879 |
await safe_send(ws_p, {"t": "pleave", "id": pid_p})
|
| 880 |
await safe_send(ws_p, {"t": "count", "n": n_p, "max": MAX_PER_ROOM})
|
|
@@ -892,18 +918,30 @@ def admin_kick(body: KickIn, request: Request, background_tasks: BackgroundTasks
|
|
| 892 |
background_tasks.add_task(asyncio.run, _close_ws(p.ws))
|
| 893 |
db_audit(s["pid"], s["username"], "kick", body.player_id, p.name, "room=" + r.name)
|
| 894 |
log("WARN", "admin", "kick", "%s kicked %s" % (s["username"], p.name))
|
|
|
|
|
|
|
|
|
|
| 895 |
return {"ok": True}
|
| 896 |
return err(404, "اللاعب غير متصل", "not_found")
|
| 897 |
|
| 898 |
@app.post("/api/admin/mute")
|
| 899 |
def admin_mute(body: MuteIn, request: Request):
|
| 900 |
s = require_admin(request)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 901 |
for r in ROOMS.values():
|
| 902 |
p = r.players.get(body.player_id)
|
| 903 |
if p:
|
| 904 |
p.muted_until = time.time() + body.minutes * 60
|
| 905 |
db_audit(s["pid"], s["username"], "mute", body.player_id, p.name, "%dm" % body.minutes)
|
| 906 |
log("WARN", "admin", "mute", "%s muted %s for %dm" % (s["username"], p.name, body.minutes))
|
|
|
|
|
|
|
|
|
|
| 907 |
return {"ok": True}
|
| 908 |
return err(404, "اللاعب غير متصل", "not_found")
|
| 909 |
|
|
@@ -929,20 +967,21 @@ async def poll_hello(body: PollHelloIn):
|
|
| 929 |
return err(429, "الغرفة ممتلئة", "room_full")
|
| 930 |
profile = {"character_data": dict(DEFAULT_CHAR), "rank_id": 41} if pid < 0 else db_get_profile(pid)
|
| 931 |
rank_id = (profile or {}).get("rank_id") or 1
|
| 932 |
-
me = Player(pid, username, role, rank_id, (profile or {}).get("character_data") or dict(DEFAULT_CHAR), None)
|
| 933 |
me.transport = "poll"
|
| 934 |
me.last_seen = time.time()
|
| 935 |
room.add(me)
|
| 936 |
me.view_set = set(p.pid for p in room.visible(me))
|
| 937 |
welcome = {"t": "welcome", "id": pid, "room": "global", "count": len(room.players), "max": MAX_PER_ROOM,
|
| 938 |
-
"players": [p.public_full() for p in room.players.values() if p.pid != pid and p.pid in me.view_set]}
|
| 939 |
welcome["spawn"] = {"x": round(me.x), "y": round(me.y)}
|
| 940 |
me.events.clear()
|
| 941 |
for p in room.players.values():
|
| 942 |
-
if p.pid != pid and p.pid in me.view_set:
|
| 943 |
deliver(p, {"t": "penter", "p": me.public_full(), "count": len(room.players), "max": MAX_PER_ROOM})
|
| 944 |
await broadcast(room, {"t": "count", "n": len(room.players), "max": MAX_PER_ROOM}, exclude_pid=pid)
|
| 945 |
log("INFO", "ws", "poll_join", "%s (%d/%d)" % (username, len(room.players), MAX_PER_ROOM), rid=str(pid))
|
|
|
|
| 946 |
return {"ok": True, "welcome": welcome}
|
| 947 |
|
| 948 |
@app.post("/api/poll/sync")
|
|
@@ -1099,6 +1138,9 @@ async def admin_ban(body: BanIn, request: Request):
|
|
| 1099 |
room.remove(p.pid)
|
| 1100 |
db_audit(s["pid"], s["username"], "ban", body.player_id, (p.name if p else str(body.player_id)), "%s | %s" % (label, body.reason))
|
| 1101 |
log("WARN", "admin", "ban", "%s banned %s (%s)" % (s["username"], body.player_id, label))
|
|
|
|
|
|
|
|
|
|
| 1102 |
return {"ok": True}
|
| 1103 |
|
| 1104 |
@app.post("/api/admin/unban")
|
|
@@ -1114,8 +1156,12 @@ def admin_unban(body: UnbanIn, request: Request):
|
|
| 1114 |
@app.post("/api/admin/tpto")
|
| 1115 |
async def admin_tpto(body: TPIn, request: Request):
|
| 1116 |
s = require_admin(request)
|
| 1117 |
-
if s["arank"] <
|
| 1118 |
-
raise HTTPException(status_code=403, detail="ر
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1119 |
_r, mep = _admin_player(s)
|
| 1120 |
room, p = await _target(body.player_id)
|
| 1121 |
if not mep or not p:
|
|
@@ -1149,25 +1195,28 @@ async def admin_jail(body: JailIn, request: Request):
|
|
| 1149 |
deliver(p, {"t": "tp", "x": round(JAIL_X), "y": round(JAIL_Y)})
|
| 1150 |
deliver(p, {"t": "sys", "msg": "سُجن لمدة %d دقيقة | السبب: %s" % (body.minutes, body.reason or "بدون")})
|
| 1151 |
db_audit(s["pid"], s["username"], "jail", body.player_id, p.name, "%dm | %s" % (body.minutes, body.reason))
|
|
|
|
|
|
|
| 1152 |
log("WARN", "admin", "jail", "%s jailed %s %dm" % (s["username"], p.name, body.minutes))
|
| 1153 |
return {"ok": True}
|
| 1154 |
|
| 1155 |
@app.post("/api/admin/money")
|
| 1156 |
def admin_money(body: MoneyIn, request: Request):
|
| 1157 |
s = require_admin(request)
|
| 1158 |
-
if s["arank"] <
|
| 1159 |
raise HTTPException(status_code=403, detail="غير مصرح")
|
| 1160 |
ok = db_add_money(body.player_id, body.amount)
|
| 1161 |
room, p = find_player(body.player_id)
|
| 1162 |
if p:
|
| 1163 |
deliver(p, {"t": "money", "amount": body.amount})
|
| 1164 |
db_audit(s["pid"], s["username"], "money", body.player_id, (p.name if p else str(body.player_id)), str(body.amount))
|
|
|
|
| 1165 |
return {"ok": ok}
|
| 1166 |
|
| 1167 |
@app.post("/api/admin/setrank")
|
| 1168 |
async def admin_setrank(body: SetRankIn, request: Request):
|
| 1169 |
s = require_admin(request)
|
| 1170 |
-
if s["arank"] <
|
| 1171 |
raise HTTPException(status_code=403, detail="غير مصرح")
|
| 1172 |
ok = db_set_rank(body.player_id, body.rank_id)
|
| 1173 |
room, p = await _target(body.player_id)
|
|
@@ -1175,6 +1224,9 @@ async def admin_setrank(body: SetRankIn, request: Request):
|
|
| 1175 |
p.rank_id = body.rank_id
|
| 1176 |
deliver(p, {"t": "rank", "rankId": body.rank_id})
|
| 1177 |
db_audit(s["pid"], s["username"], "setrank", body.player_id, (p.name if p else str(body.player_id)), str(body.rank_id))
|
|
|
|
|
|
|
|
|
|
| 1178 |
return {"ok": ok}
|
| 1179 |
|
| 1180 |
@app.post("/api/admin/self")
|
|
@@ -1208,6 +1260,106 @@ async def admin_self(body: SelfFlagIn, request: Request):
|
|
| 1208 |
return {"ok": True}
|
| 1209 |
return err(400, "أداة غير معروفة", "bad_flag")
|
| 1210 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1211 |
# ============================ WebSocket ============================
|
| 1212 |
async def ws_on_move(room, me, d):
|
| 1213 |
seq = int(d.get("seq", 0) or 0)
|
|
@@ -1274,7 +1426,8 @@ async def ws_on_move(room, me, d):
|
|
| 1274 |
p = room.players.get(pid)
|
| 1275 |
if p:
|
| 1276 |
deliver(me, {"t": "penter", "p": p.public_full(), "count": len(room.players), "max": MAX_PER_ROOM})
|
| 1277 |
-
|
|
|
|
| 1278 |
for pid in (me.view_set - new_set):
|
| 1279 |
p = room.players.get(pid)
|
| 1280 |
if p:
|
|
@@ -1324,7 +1477,7 @@ async def ws_on_chat(room, me, d):
|
|
| 1324 |
return
|
| 1325 |
me.chat_wait = chat_delay(len(room.players))
|
| 1326 |
me.last_chat_at = t
|
| 1327 |
-
msg = {"t": "chat", "id": me.pid, "name": me.name, "msg": text}
|
| 1328 |
for p in list(room.players.values()):
|
| 1329 |
deliver(p, msg)
|
| 1330 |
try:
|
|
@@ -1367,18 +1520,19 @@ async def ws_endpoint(ws: WebSocket, token: str = ""):
|
|
| 1367 |
return
|
| 1368 |
profile = db_get_profile(pid) if pid > 0 else {"character_data": dict(DEFAULT_CHAR), "rank_id": 41}
|
| 1369 |
rank_id = (profile or {}).get("rank_id") or 1
|
| 1370 |
-
me = Player(pid, username, role, rank_id, (profile or {}).get("character_data") or dict(DEFAULT_CHAR), ws)
|
| 1371 |
room.add(me)
|
| 1372 |
me.view_set = set(p.pid for p in room.visible(me))
|
| 1373 |
welcome = {"t": "welcome", "id": pid, "room": room_name, "count": len(room.players), "max": MAX_PER_ROOM,
|
| 1374 |
-
"players": [p.public_full() for p in room.players.values() if p.pid != pid and p.pid in me.view_set]}
|
| 1375 |
welcome["spawn"] = {"x": round(me.x), "y": round(me.y)}
|
| 1376 |
await safe_send(ws, welcome)
|
| 1377 |
for p in room.players.values():
|
| 1378 |
-
if p.pid != pid and p.pid in me.view_set:
|
| 1379 |
deliver(p, {"t": "penter", "p": me.public_full(), "count": len(room.players), "max": MAX_PER_ROOM})
|
| 1380 |
await broadcast(room, {"t": "count", "n": len(room.players), "max": MAX_PER_ROOM}, exclude_pid=pid)
|
| 1381 |
log("INFO", "ws", "join", "%s -> %s (%d/%d)" % (username, room_name, len(room.players), MAX_PER_ROOM), rid=str(pid))
|
|
|
|
| 1382 |
try:
|
| 1383 |
while True:
|
| 1384 |
raw = await ws.receive_text()
|
|
@@ -1422,19 +1576,24 @@ async def ws_endpoint(ws: WebSocket, token: str = ""):
|
|
| 1422 |
deliver(p, {"t": "pleave", "id": pid})
|
| 1423 |
await broadcast(room, {"t": "count", "n": len(room.players), "max": MAX_PER_ROOM})
|
| 1424 |
log("INFO", "ws", "leave", "%s (%d/%d)" % (username, len(room.players), MAX_PER_ROOM), rid=str(pid))
|
|
|
|
| 1425 |
|
| 1426 |
# ============================ Janitor ============================
|
| 1427 |
from contextlib import asynccontextmanager
|
| 1428 |
|
| 1429 |
@asynccontextmanager
|
| 1430 |
async def lifespan(app):
|
|
|
|
|
|
|
| 1431 |
ok = await asyncio.to_thread(run_migrations)
|
| 1432 |
if not ok:
|
| 1433 |
log("CRITICAL", "db", "schema_not_ready", DB_NOT_READY_MSG)
|
| 1434 |
jan = asyncio.create_task(janitor())
|
|
|
|
| 1435 |
log("INFO", "server", "startup", "port=%d supabase=%s schema=%s" % (PORT, USE_SUPABASE, "ok" if ok else "FAILED (سأعيد المحاولة عند أول طلب)"))
|
| 1436 |
yield
|
| 1437 |
jan.cancel()
|
|
|
|
| 1438 |
|
| 1439 |
app.router.lifespan_context = lifespan
|
| 1440 |
|
|
|
|
| 42 |
|
| 43 |
# ============================ Logging (ring buffer) ============================
|
| 44 |
LOGS = deque(maxlen=5000)
|
| 45 |
+
EVENTS = deque(maxlen=800)
|
| 46 |
|
| 47 |
def now_iso():
|
| 48 |
return datetime.now(timezone.utc).isoformat(timespec="seconds")
|
|
|
|
| 56 |
except Exception:
|
| 57 |
pass
|
| 58 |
|
| 59 |
+
def event(kind, text):
|
| 60 |
+
e = {"ts": now_iso(), "kind": kind, "text": str(text)[:220]}
|
| 61 |
+
EVENTS.append(e)
|
| 62 |
+
try:
|
| 63 |
+
print(json.dumps({"ts": e["ts"], "level": "INFO", "source": "events", "event": kind, "detail": e["text"]}, ensure_ascii=False), flush=True)
|
| 64 |
+
except Exception:
|
| 65 |
+
pass
|
| 66 |
+
|
| 67 |
# ============================ Database layer ============================
|
| 68 |
# Production: Supabase (PostgREST via service-role key, never sent to clients).
|
| 69 |
# Fallback (local dev/testing only): SQLite when Supabase env vars are absent.
|
|
|
|
| 74 |
# أسماء مستويات الإدارة
|
| 75 |
ADMIN_RANKS = {0: "player", 1: "helper", 2: "moderator", 3: "admin", 4: "senior_admin", 5: "owner"}
|
| 76 |
ADMIN_RANK = int(os.environ.get("ADMIN_RANK", "5"))
|
| 77 |
+
ADMIN_COLORS = {1: "#7ec8ff", 2: "#2563eb", 3: "#3b82f6", 4: "#ff5555", 5: "#ff2222"}
|
| 78 |
|
| 79 |
# ------------------------------------------------------------------
|
| 80 |
# Schema: هجرات idempotent - الخادم ينشئ/يحدّث كل شيء عند كل إقلاع
|
|
|
|
| 469 |
# ============================ Sessions ============================
|
| 470 |
SESSIONS = {}
|
| 471 |
|
| 472 |
+
HELPER_CD = {}
|
| 473 |
+
def cd_ok(key, sec):
|
| 474 |
+
t = time.time()
|
| 475 |
+
if HELPER_CD.get(key, 0) > t:
|
| 476 |
+
return False, int(HELPER_CD[key] - t) + 1
|
| 477 |
+
HELPER_CD[key] = t + sec
|
| 478 |
+
return True, 0
|
| 479 |
+
|
| 480 |
def make_session(pid, username, role, arank=0):
|
| 481 |
token = secrets.token_urlsafe(32)
|
| 482 |
SESSIONS[token] = {"pid": pid, "username": username, "role": role, "arank": arank,
|
|
|
|
| 501 |
return (int(x // GRID_CELL), int(y // GRID_CELL))
|
| 502 |
|
| 503 |
class Player:
|
| 504 |
+
def __init__(self, pid, name, role, rank_id, profile, ws, arank=0):
|
| 505 |
self.pid = pid
|
| 506 |
self.name = name
|
| 507 |
self.role = role
|
| 508 |
self.rank_id = rank_id
|
| 509 |
self.profile = profile
|
| 510 |
self.ws = ws
|
| 511 |
+
self.arank = arank
|
| 512 |
h = 0
|
| 513 |
for ch in name:
|
| 514 |
h = (h * 31 + ord(ch)) & 0xffff
|
|
|
|
| 537 |
self.jail_until = 0.0
|
| 538 |
|
| 539 |
def public_full(self):
|
| 540 |
+
return {"id": self.pid, "name": self.name, "role": self.role, "arank": self.arank,
|
| 541 |
"x": round(self.x), "y": round(self.y),
|
| 542 |
"dir": self.dir, "mov": self.mov, "wt": round(self.wt, 1), "sal": self.sal,
|
| 543 |
"has": self.has_w, "hol": self.hol_w, "ping": self.ping,
|
|
|
|
| 580 |
if pid == me.pid:
|
| 581 |
continue
|
| 582 |
p = self.players.get(pid)
|
| 583 |
+
if p and not p.invisible and math.hypot(p.x - me.x, p.y - me.y) <= VIEW_RANGE:
|
| 584 |
out.append(p)
|
| 585 |
return out
|
| 586 |
|
| 587 |
ROOMS = {}
|
| 588 |
DB_READY = False
|
| 589 |
+
MAIN_LOOP = None
|
| 590 |
JAIL_X = 2400.0
|
| 591 |
JAIL_Y = 2320.0
|
| 592 |
JAIL_R = 130.0
|
|
|
|
| 604 |
return None, None
|
| 605 |
|
| 606 |
def deliver(p, obj):
|
| 607 |
+
"""توصيل آمن للرسائل يعمل من أي سياق (async أو sync) عبر الحلقة الرئيسية."""
|
| 608 |
+
if p.transport == "ws" and p.ws is not None and MAIN_LOOP is not None:
|
| 609 |
try:
|
| 610 |
+
ws_, o_ = p.ws, obj
|
| 611 |
+
MAIN_LOOP.call_soon_threadsafe(
|
| 612 |
+
lambda: MAIN_LOOP.create_task(safe_send(ws_, o_)))
|
| 613 |
+
return
|
| 614 |
except Exception:
|
| 615 |
+
pass
|
| 616 |
+
p.events.append(obj)
|
|
|
|
| 617 |
|
| 618 |
async def safe_send(ws, obj):
|
| 619 |
try:
|
|
|
|
| 630 |
allow_headers=["*"],
|
| 631 |
)
|
| 632 |
|
| 633 |
+
@app.middleware("http")
|
| 634 |
+
async def sec_headers(request, call_next):
|
| 635 |
+
resp = await call_next(request)
|
| 636 |
+
resp.headers["X-Content-Type-Options"] = "nosniff"
|
| 637 |
+
resp.headers["X-Frame-Options"] = "DENY"
|
| 638 |
+
resp.headers["Referrer-Policy"] = "no-referrer"
|
| 639 |
+
return resp
|
| 640 |
+
|
| 641 |
class AuthIn(BaseModel):
|
| 642 |
username: str = Field(min_length=1, max_length=24)
|
| 643 |
password: str = Field(min_length=1, max_length=128)
|
|
|
|
| 894 |
@app.post("/api/admin/kick")
|
| 895 |
def admin_kick(body: KickIn, request: Request, background_tasks: BackgroundTasks):
|
| 896 |
s = require_admin(request)
|
| 897 |
+
if s["arank"] < 2:
|
| 898 |
+
raise HTTPException(status_code=403, detail="رت��تك لا تسمح بالطرد")
|
| 899 |
for r in ROOMS.values():
|
| 900 |
p = r.players.get(body.player_id)
|
| 901 |
if p:
|
| 902 |
r.remove(body.player_id)
|
| 903 |
deliver(p, {"t": "kicked", "by": s["username"], "reason": body.reason})
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 904 |
async def _notify(ws_p, pid_p, n_p):
|
| 905 |
await safe_send(ws_p, {"t": "pleave", "id": pid_p})
|
| 906 |
await safe_send(ws_p, {"t": "count", "n": n_p, "max": MAX_PER_ROOM})
|
|
|
|
| 918 |
background_tasks.add_task(asyncio.run, _close_ws(p.ws))
|
| 919 |
db_audit(s["pid"], s["username"], "kick", body.player_id, p.name, "room=" + r.name)
|
| 920 |
log("WARN", "admin", "kick", "%s kicked %s" % (s["username"], p.name))
|
| 921 |
+
event("kick", "طرد %s اللاعب %s" % (s["username"], p.name))
|
| 922 |
+
for o in list(r.players.values()):
|
| 923 |
+
deliver(o, {"t": "chat", "id": 0, "name": "الخادم", "msg": "🚪 تم طرد %s من طرف %s" % (p.name, s["username"]), "color": "yellow", "sys": True})
|
| 924 |
return {"ok": True}
|
| 925 |
return err(404, "اللاعب غير متصل", "not_found")
|
| 926 |
|
| 927 |
@app.post("/api/admin/mute")
|
| 928 |
def admin_mute(body: MuteIn, request: Request):
|
| 929 |
s = require_admin(request)
|
| 930 |
+
if s["arank"] < 1:
|
| 931 |
+
raise HTTPException(status_code=403, detail="غير مصرح")
|
| 932 |
+
if s["arank"] == 1:
|
| 933 |
+
ok_cd, left = cd_ok("mute:" + str(s["pid"]), 60)
|
| 934 |
+
if not ok_cd:
|
| 935 |
+
raise HTTPException(status_code=429, detail="انتظر %d ثانية بين عمليات الكتم" % left)
|
| 936 |
for r in ROOMS.values():
|
| 937 |
p = r.players.get(body.player_id)
|
| 938 |
if p:
|
| 939 |
p.muted_until = time.time() + body.minutes * 60
|
| 940 |
db_audit(s["pid"], s["username"], "mute", body.player_id, p.name, "%dm" % body.minutes)
|
| 941 |
log("WARN", "admin", "mute", "%s muted %s for %dm" % (s["username"], p.name, body.minutes))
|
| 942 |
+
event("mute", "كتم %s اللاعب %s لمدة %d دقيقة" % (s["username"], p.name, body.minutes))
|
| 943 |
+
for o in list(r.players.values()):
|
| 944 |
+
deliver(o, {"t": "chat", "id": 0, "name": "الخادم", "msg": "🔇 تم كتم %s من طرف %s لمدة %d دقيقة" % (p.name, s["username"], body.minutes), "color": "yellow", "sys": True})
|
| 945 |
return {"ok": True}
|
| 946 |
return err(404, "اللاعب غير متصل", "not_found")
|
| 947 |
|
|
|
|
| 967 |
return err(429, "الغرفة ممتلئة", "room_full")
|
| 968 |
profile = {"character_data": dict(DEFAULT_CHAR), "rank_id": 41} if pid < 0 else db_get_profile(pid)
|
| 969 |
rank_id = (profile or {}).get("rank_id") or 1
|
| 970 |
+
me = Player(pid, username, role, rank_id, (profile or {}).get("character_data") or dict(DEFAULT_CHAR), None, s.get("arank", 0))
|
| 971 |
me.transport = "poll"
|
| 972 |
me.last_seen = time.time()
|
| 973 |
room.add(me)
|
| 974 |
me.view_set = set(p.pid for p in room.visible(me))
|
| 975 |
welcome = {"t": "welcome", "id": pid, "room": "global", "count": len(room.players), "max": MAX_PER_ROOM,
|
| 976 |
+
"players": [p.public_full() for p in room.players.values() if p.pid != pid and p.pid in me.view_set and not p.invisible]}
|
| 977 |
welcome["spawn"] = {"x": round(me.x), "y": round(me.y)}
|
| 978 |
me.events.clear()
|
| 979 |
for p in room.players.values():
|
| 980 |
+
if p.pid != pid and p.pid in me.view_set and not me.invisible:
|
| 981 |
deliver(p, {"t": "penter", "p": me.public_full(), "count": len(room.players), "max": MAX_PER_ROOM})
|
| 982 |
await broadcast(room, {"t": "count", "n": len(room.players), "max": MAX_PER_ROOM}, exclude_pid=pid)
|
| 983 |
log("INFO", "ws", "poll_join", "%s (%d/%d)" % (username, len(room.players), MAX_PER_ROOM), rid=str(pid))
|
| 984 |
+
event("join", "انضم %s إلى الغرفة" % username)
|
| 985 |
return {"ok": True, "welcome": welcome}
|
| 986 |
|
| 987 |
@app.post("/api/poll/sync")
|
|
|
|
| 1138 |
room.remove(p.pid)
|
| 1139 |
db_audit(s["pid"], s["username"], "ban", body.player_id, (p.name if p else str(body.player_id)), "%s | %s" % (label, body.reason))
|
| 1140 |
log("WARN", "admin", "ban", "%s banned %s (%s)" % (s["username"], body.player_id, label))
|
| 1141 |
+
event("ban", "حظر %s اللاعب %s (%s)" % (s["username"], (p.name if p else str(body.player_id)), label))
|
| 1142 |
+
if room:
|
| 1143 |
+
await room_announce(room, "⛔ تم حظر %s من طرف %s" % ((p.name if p else ("اللاعب #%d" % body.player_id)), s["username"]), "red")
|
| 1144 |
return {"ok": True}
|
| 1145 |
|
| 1146 |
@app.post("/api/admin/unban")
|
|
|
|
| 1156 |
@app.post("/api/admin/tpto")
|
| 1157 |
async def admin_tpto(body: TPIn, request: Request):
|
| 1158 |
s = require_admin(request)
|
| 1159 |
+
if s["arank"] < 1:
|
| 1160 |
+
raise HTTPException(status_code=403, detail="غير مصرح")
|
| 1161 |
+
if s["arank"] == 1:
|
| 1162 |
+
ok_cd, left = cd_ok("tp:" + str(s["pid"]), 120)
|
| 1163 |
+
if not ok_cd:
|
| 1164 |
+
raise HTTPException(status_code=429, detail="انتظر %d ثانية قبل التنقل التالي" % left)
|
| 1165 |
_r, mep = _admin_player(s)
|
| 1166 |
room, p = await _target(body.player_id)
|
| 1167 |
if not mep or not p:
|
|
|
|
| 1195 |
deliver(p, {"t": "tp", "x": round(JAIL_X), "y": round(JAIL_Y)})
|
| 1196 |
deliver(p, {"t": "sys", "msg": "سُجن لمدة %d دقيقة | السبب: %s" % (body.minutes, body.reason or "بدون")})
|
| 1197 |
db_audit(s["pid"], s["username"], "jail", body.player_id, p.name, "%dm | %s" % (body.minutes, body.reason))
|
| 1198 |
+
event("jail", "سجن %s اللاعب %s لمدة %d دقيقة" % (s["username"], p.name, body.minutes))
|
| 1199 |
+
await room_announce(room, "🔒 تم سجن %s من طرف %s لمدة %d دقيقة" % (p.name, s["username"], body.minutes), "yellow")
|
| 1200 |
log("WARN", "admin", "jail", "%s jailed %s %dm" % (s["username"], p.name, body.minutes))
|
| 1201 |
return {"ok": True}
|
| 1202 |
|
| 1203 |
@app.post("/api/admin/money")
|
| 1204 |
def admin_money(body: MoneyIn, request: Request):
|
| 1205 |
s = require_admin(request)
|
| 1206 |
+
if s["arank"] < 3:
|
| 1207 |
raise HTTPException(status_code=403, detail="غير مصرح")
|
| 1208 |
ok = db_add_money(body.player_id, body.amount)
|
| 1209 |
room, p = find_player(body.player_id)
|
| 1210 |
if p:
|
| 1211 |
deliver(p, {"t": "money", "amount": body.amount})
|
| 1212 |
db_audit(s["pid"], s["username"], "money", body.player_id, (p.name if p else str(body.player_id)), str(body.amount))
|
| 1213 |
+
event("money", "أعطى %s مبلغ %d للاعب %s" % (s["username"], body.amount, (p.name if p else str(body.player_id))))
|
| 1214 |
return {"ok": ok}
|
| 1215 |
|
| 1216 |
@app.post("/api/admin/setrank")
|
| 1217 |
async def admin_setrank(body: SetRankIn, request: Request):
|
| 1218 |
s = require_admin(request)
|
| 1219 |
+
if s["arank"] < 3:
|
| 1220 |
raise HTTPException(status_code=403, detail="غير مصرح")
|
| 1221 |
ok = db_set_rank(body.player_id, body.rank_id)
|
| 1222 |
room, p = await _target(body.player_id)
|
|
|
|
| 1224 |
p.rank_id = body.rank_id
|
| 1225 |
deliver(p, {"t": "rank", "rankId": body.rank_id})
|
| 1226 |
db_audit(s["pid"], s["username"], "setrank", body.player_id, (p.name if p else str(body.player_id)), str(body.rank_id))
|
| 1227 |
+
event("setrank", "غيّر %s رتبة %s إلى %d" % (s["username"], (p.name if p else str(body.player_id)), body.rank_id))
|
| 1228 |
+
if room:
|
| 1229 |
+
await room_announce(room, "🎖 حصل %s على رتبة جديدة (%d) — مبروك!" % ((p.name if p else ("اللاعب #%d" % body.player_id)), body.rank_id), "red")
|
| 1230 |
return {"ok": ok}
|
| 1231 |
|
| 1232 |
@app.post("/api/admin/self")
|
|
|
|
| 1260 |
return {"ok": True}
|
| 1261 |
return err(400, "أداة غير معروفة", "bad_flag")
|
| 1262 |
|
| 1263 |
+
|
| 1264 |
+
def db_list_banned():
|
| 1265 |
+
now = datetime.now(timezone.utc).isoformat(timespec="seconds")
|
| 1266 |
+
try:
|
| 1267 |
+
if USE_SUPABASE:
|
| 1268 |
+
r = httpx.get(SUPABASE_URL + "/rest/v1/players?banned_until=gte." + now +
|
| 1269 |
+
"&select=id,username,admin_rank,banned_until,ban_reason&order=banned_until.desc&limit=100",
|
| 1270 |
+
headers=sb_headers(), timeout=20)
|
| 1271 |
+
return r.json() if r.status_code < 400 else []
|
| 1272 |
+
with _lk:
|
| 1273 |
+
cur = _db.execute("SELECT id,username,admin_rank,banned_until,ban_reason FROM players "
|
| 1274 |
+
"WHERE banned_until IS NOT NULL AND banned_until > ? "
|
| 1275 |
+
"ORDER BY banned_until DESC LIMIT 100", (now,))
|
| 1276 |
+
cols = [c[0] for c in cur.description]
|
| 1277 |
+
return [dict(zip(cols, row)) for row in cur.fetchall()]
|
| 1278 |
+
except Exception as e:
|
| 1279 |
+
log("WARN", "db", "banned_list_failed", str(e)[:140])
|
| 1280 |
+
return []
|
| 1281 |
+
|
| 1282 |
+
@app.post("/api/admin/unmute")
|
| 1283 |
+
def admin_unmute(body: UnbanIn, request: Request):
|
| 1284 |
+
s = require_admin(request)
|
| 1285 |
+
if s["arank"] < 2:
|
| 1286 |
+
raise HTTPException(status_code=403, detail="رتبتك لا تسمح بإلغاء الكتم")
|
| 1287 |
+
for r in ROOMS.values():
|
| 1288 |
+
p = r.players.get(body.player_id)
|
| 1289 |
+
if p:
|
| 1290 |
+
p.muted_until = 0
|
| 1291 |
+
deliver(p, {"t": "sys", "msg": "تم إلغاء كتمك — التزم بقواعد الدردشة"})
|
| 1292 |
+
db_audit(s["pid"], s["username"], "unmute", body.player_id, p.name)
|
| 1293 |
+
event("unmute", "ألغى %s كتم اللاعب %s" % (s["username"], p.name))
|
| 1294 |
+
return {"ok": True}
|
| 1295 |
+
return err(404, "اللاعب غير متصل", "not_found")
|
| 1296 |
+
|
| 1297 |
+
@app.get("/api/admin/banned")
|
| 1298 |
+
def admin_banned(request: Request):
|
| 1299 |
+
s = require_admin(request)
|
| 1300 |
+
if s["arank"] < 2:
|
| 1301 |
+
raise HTTPException(status_code=403, detail="غير مصرح")
|
| 1302 |
+
return {"ok": True, "banned": db_list_banned()}
|
| 1303 |
+
|
| 1304 |
+
@app.get("/api/admin/events")
|
| 1305 |
+
def admin_events(request: Request):
|
| 1306 |
+
s = require_admin(request)
|
| 1307 |
+
if s["arank"] < 2:
|
| 1308 |
+
raise HTTPException(status_code=403, detail="غير مصرح")
|
| 1309 |
+
return {"ok": True, "events": list(EVENTS)[::-1][:200]}
|
| 1310 |
+
|
| 1311 |
+
async def room_announce(room, msg, color="yellow"):
|
| 1312 |
+
await broadcast(room, {"t": "chat", "id": 0, "name": "الخادم", "msg": msg, "color": color, "sys": True})
|
| 1313 |
+
|
| 1314 |
+
SERVER_TIPS = [
|
| 1315 |
+
"احترم باقي الجنود في الدردشة — الأسلوب الخارج يعرّضك للعقوبة",
|
| 1316 |
+
"استغلال الثغرات أو الغليتشات يعرّضك للحظر الدائم",
|
| 1317 |
+
"الاحتيال أو النصب على اللاعبين مخالفة تستوجب الحظر الدائم",
|
| 1318 |
+
"لا تشارك معلومات حسابك مع أي شخص — الإدارة لا تطلب كلمة المرور أبدًا",
|
| 1319 |
+
"استعمل التحية العسكرية عند مقابلة الرتب العليا",
|
| 1320 |
+
"السرعة الزائدة في الغرفة تُعتبر اختراقًا وتُسجَّل تلقائيًا",
|
| 1321 |
+
"إرسال رسائل مكررة بكثافة يفعّل نظام الحماية ضد الإزعاج",
|
| 1322 |
+
"الإيموجي ممنوع في الدردشة — احترس من الرسائل المرفوضة",
|
| 1323 |
+
"إذا لاحظت متلاعبًا أبلغ الإدارة بدل المواجهة",
|
| 1324 |
+
"الحسابات متعددة الأجهزة مسجلة بالجهاز — المخالفات تُربط بك",
|
| 1325 |
+
"تجاوز حدود القاعدة العسكرية يعرّضك للسجن",
|
| 1326 |
+
"إطلاق النار العشوائي داخل القاعدة ممنوع تمامًا",
|
| 1327 |
+
"لا تلاحق اللاعبين أو تمنع حركتهم عمدًا — هذا تحرش",
|
| 1328 |
+
"المحاولات المتكررة للدخول بحسابات غيرك تُسجَّل وتُحظر",
|
| 1329 |
+
"الإدارة لا تبيع رتبًا أو أسلحة — أي عرض من هذا النوع احتيال",
|
| 1330 |
+
"احترم خصوصية اللاعبين — لا تنشر معلوماتهم",
|
| 1331 |
+
"التنمر أو الإهانات المتكررة تُعرّضك للكتم ثم الحظر",
|
| 1332 |
+
"إن انقطع اتصالك كثيرًا جرّب وضع التوافق من الإعدادات",
|
| 1333 |
+
"اللعب الجماعي يتطلب اتصالًا مستقرًا — تجنب الشبكات الضعيفة",
|
| 1334 |
+
"الغرفة تتسع لـ 50 لاعبًا — عند الامتلاء انتظر دورك",
|
| 1335 |
+
"لا تستعمل أسماء مسيئة أو مخلة — تُغيَّر أو تُحظر",
|
| 1336 |
+
"أي محاولة اختراق للخادم تؤدي إلى حظر دائم فوري",
|
| 1337 |
+
"حافظ على روح الفريق — اللعبة للمتعة الجماعية",
|
| 1338 |
+
"إذا فقدت حسابك تواصل مع الإدارة بدل إنشاء حسابات جديدة",
|
| 1339 |
+
"مشاركة روابط مشبوهة في الدردشة تُعرّضك للحظر",
|
| 1340 |
+
"السلاح للاستعمال المسؤول — إطلاق النار على الحراس ممنوع",
|
| 1341 |
+
"اقرأ التعليمات قبل استعمال أدوات الإدارة إن كنت مسؤولًا",
|
| 1342 |
+
"الثبات أثناء التصويب يزيد دقتك — لا تتحرك أثناء الإطلاق",
|
| 1343 |
+
"التلقيم التلقائي يعمل عند نفاد الذخيرة — احمِ نفسك أثناءه",
|
| 1344 |
+
"لا تضغط أزرار اللعب بعنف — العصي حساسة للمس",
|
| 1345 |
+
"الرسائل التحذيرية الصفراء رسمية من الخادم — لا تتجاهلها",
|
| 1346 |
+
"أي لاعب ينتحل صفة الإدارة يُحظر — الإدارة معروفة بالألوان",
|
| 1347 |
+
"تقارير الأخطاء تُرسل تلقائيًا — شاركنا التحسينات",
|
| 1348 |
+
"السلاسة تتأثر بالـ ping — أغلق التطبيقات الثقيلة بالخلفية",
|
| 1349 |
+
"استمتع بالخدمة العسكرية وجنّد أصدقاءك للقاعدة",
|
| 1350 |
+
]
|
| 1351 |
+
|
| 1352 |
+
async def server_tips():
|
| 1353 |
+
await asyncio.sleep(240)
|
| 1354 |
+
while True:
|
| 1355 |
+
try:
|
| 1356 |
+
room = ROOMS.get("global")
|
| 1357 |
+
if room and room.players:
|
| 1358 |
+
await room_announce(room, random.choice(SERVER_TIPS), "green")
|
| 1359 |
+
except Exception as e:
|
| 1360 |
+
log("WARN", "server", "tips_error", str(e)[:120])
|
| 1361 |
+
await asyncio.sleep(random.randint(300, 600))
|
| 1362 |
+
|
| 1363 |
# ============================ WebSocket ============================
|
| 1364 |
async def ws_on_move(room, me, d):
|
| 1365 |
seq = int(d.get("seq", 0) or 0)
|
|
|
|
| 1426 |
p = room.players.get(pid)
|
| 1427 |
if p:
|
| 1428 |
deliver(me, {"t": "penter", "p": p.public_full(), "count": len(room.players), "max": MAX_PER_ROOM})
|
| 1429 |
+
if not me.invisible:
|
| 1430 |
+
deliver(p, {"t": "penter", "p": me.public_full(), "count": len(room.players), "max": MAX_PER_ROOM})
|
| 1431 |
for pid in (me.view_set - new_set):
|
| 1432 |
p = room.players.get(pid)
|
| 1433 |
if p:
|
|
|
|
| 1477 |
return
|
| 1478 |
me.chat_wait = chat_delay(len(room.players))
|
| 1479 |
me.last_chat_at = t
|
| 1480 |
+
msg = {"t": "chat", "id": me.pid, "name": me.name, "msg": text, "arank": me.arank, "role": me.role}
|
| 1481 |
for p in list(room.players.values()):
|
| 1482 |
deliver(p, msg)
|
| 1483 |
try:
|
|
|
|
| 1520 |
return
|
| 1521 |
profile = db_get_profile(pid) if pid > 0 else {"character_data": dict(DEFAULT_CHAR), "rank_id": 41}
|
| 1522 |
rank_id = (profile or {}).get("rank_id") or 1
|
| 1523 |
+
me = Player(pid, username, role, rank_id, (profile or {}).get("character_data") or dict(DEFAULT_CHAR), ws, s.get("arank", 0))
|
| 1524 |
room.add(me)
|
| 1525 |
me.view_set = set(p.pid for p in room.visible(me))
|
| 1526 |
welcome = {"t": "welcome", "id": pid, "room": room_name, "count": len(room.players), "max": MAX_PER_ROOM,
|
| 1527 |
+
"players": [p.public_full() for p in room.players.values() if p.pid != pid and p.pid in me.view_set and not p.invisible]}
|
| 1528 |
welcome["spawn"] = {"x": round(me.x), "y": round(me.y)}
|
| 1529 |
await safe_send(ws, welcome)
|
| 1530 |
for p in room.players.values():
|
| 1531 |
+
if p.pid != pid and p.pid in me.view_set and not me.invisible:
|
| 1532 |
deliver(p, {"t": "penter", "p": me.public_full(), "count": len(room.players), "max": MAX_PER_ROOM})
|
| 1533 |
await broadcast(room, {"t": "count", "n": len(room.players), "max": MAX_PER_ROOM}, exclude_pid=pid)
|
| 1534 |
log("INFO", "ws", "join", "%s -> %s (%d/%d)" % (username, room_name, len(room.players), MAX_PER_ROOM), rid=str(pid))
|
| 1535 |
+
event("join", "انضم %s إلى الغرفة" % username)
|
| 1536 |
try:
|
| 1537 |
while True:
|
| 1538 |
raw = await ws.receive_text()
|
|
|
|
| 1576 |
deliver(p, {"t": "pleave", "id": pid})
|
| 1577 |
await broadcast(room, {"t": "count", "n": len(room.players), "max": MAX_PER_ROOM})
|
| 1578 |
log("INFO", "ws", "leave", "%s (%d/%d)" % (username, len(room.players), MAX_PER_ROOM), rid=str(pid))
|
| 1579 |
+
event("leave", "غادر %s الغرفة" % username)
|
| 1580 |
|
| 1581 |
# ============================ Janitor ============================
|
| 1582 |
from contextlib import asynccontextmanager
|
| 1583 |
|
| 1584 |
@asynccontextmanager
|
| 1585 |
async def lifespan(app):
|
| 1586 |
+
global MAIN_LOOP
|
| 1587 |
+
MAIN_LOOP = asyncio.get_running_loop()
|
| 1588 |
ok = await asyncio.to_thread(run_migrations)
|
| 1589 |
if not ok:
|
| 1590 |
log("CRITICAL", "db", "schema_not_ready", DB_NOT_READY_MSG)
|
| 1591 |
jan = asyncio.create_task(janitor())
|
| 1592 |
+
tips = asyncio.create_task(server_tips())
|
| 1593 |
log("INFO", "server", "startup", "port=%d supabase=%s schema=%s" % (PORT, USE_SUPABASE, "ok" if ok else "FAILED (سأعيد المحاولة عند أول طلب)"))
|
| 1594 |
yield
|
| 1595 |
jan.cancel()
|
| 1596 |
+
tips.cancel()
|
| 1597 |
|
| 1598 |
app.router.lifespan_context = lifespan
|
| 1599 |
|