Spaces:
Paused
Paused
Upload main.py
Browse files
main.py
CHANGED
|
@@ -25,7 +25,7 @@ ALLOWED_ORIGINS = [x.strip() for x in os.environ.get("ALLOWED_ORIGINS", "*").spl
|
|
| 25 |
SQLITE_PATH = os.environ.get("SQLITE_PATH", "./soldierlife.db")
|
| 26 |
USE_SUPABASE = bool(SUPABASE_URL and SUPABASE_KEY)
|
| 27 |
|
| 28 |
-
MAX_PER_ROOM =
|
| 29 |
WORLD_W = 4800
|
| 30 |
WORLD_H = 4800
|
| 31 |
VIEW_RANGE = 1700.0
|
|
@@ -101,6 +101,8 @@ PG_UPGRADES = [
|
|
| 101 |
update public.players set is_admin = true where role = 'admin' and is_admin = false;
|
| 102 |
end if;
|
| 103 |
end $$""",
|
|
|
|
|
|
|
| 104 |
]
|
| 105 |
PG_MIGRATIONS = [
|
| 106 |
"""create table if not exists public.players (
|
|
@@ -157,6 +159,12 @@ PG_MIGRATIONS = [
|
|
| 157 |
created_at timestamptz not null default now())""",
|
| 158 |
"create index if not exists chat_created_idx on public.chat_log (created_at desc)",
|
| 159 |
"create index if not exists chat_player_idx on public.chat_log (player_id)",
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 160 |
]
|
| 161 |
|
| 162 |
SQLITE_MIGRATIONS = [
|
|
@@ -208,6 +216,14 @@ SQLITE_MIGRATIONS = [
|
|
| 208 |
created_at text)""",
|
| 209 |
"create index if not exists chat_created_idx on chat_log (created_at)",
|
| 210 |
"create index if not exists chat_player_idx on chat_log (player_id)",
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 211 |
]
|
| 212 |
|
| 213 |
def run_migrations():
|
|
@@ -261,30 +277,126 @@ def sb_headers():
|
|
| 261 |
def _j(obj):
|
| 262 |
return json.dumps(obj, ensure_ascii=False)
|
| 263 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 264 |
def db_create_player(username, norm, pw_hash, ip, device):
|
| 265 |
ts = now_iso()
|
| 266 |
device_id = secrets.token_urlsafe(16)
|
| 267 |
cookies = {"device_id": device_id}
|
|
|
|
| 268 |
if USE_SUPABASE:
|
| 269 |
r = httpx.post(SUPABASE_URL + "/rest/v1/players", headers=sb_headers(), timeout=15, json={
|
| 270 |
"username": username, "username_norm": norm, "password_hash": pw_hash,
|
| 271 |
-
"is_admin": False, "admin_rank": 0,
|
| 272 |
"character_data": _j(DEFAULT_CHAR), "rank_id": 1,
|
| 273 |
"inventory": "[]", "guns": _j(DEFAULT_GUNS),
|
| 274 |
"ip": ip, "device": (device or "")[:120], "cookies": _j(cookies),
|
| 275 |
"created_at": ts, "updated_at": ts})
|
| 276 |
if r.status_code >= 400:
|
| 277 |
raise RuntimeError("db_create_failed:" + str(r.status_code))
|
| 278 |
-
return r.json()[0]["id"], device_id
|
| 279 |
with _lk:
|
| 280 |
cur = _db.execute(
|
| 281 |
-
"INSERT INTO players (username,username_norm,password_hash,is_admin,admin_rank,"
|
| 282 |
"character_data,rank_id,inventory,guns,ip,device,cookies,created_at,updated_at)"
|
| 283 |
-
" VALUES (?,?,?,0,0,?,1,'[]',?,?,?,?,?,?)",
|
| 284 |
-
(username, norm, pw_hash, _j(DEFAULT_CHAR),
|
| 285 |
_j(DEFAULT_GUNS), ip, (device or "")[:120], _j(cookies), ts, ts))
|
| 286 |
_db.commit()
|
| 287 |
-
return cur.lastrowid, device_id
|
| 288 |
|
| 289 |
def db_find_by_norm(norm):
|
| 290 |
if USE_SUPABASE:
|
|
@@ -509,6 +621,8 @@ class Player:
|
|
| 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
|
|
@@ -538,6 +652,7 @@ class Player:
|
|
| 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,
|
|
@@ -745,7 +860,7 @@ def register(body: AuthIn, request: Request, x_device_id: str = Header(default="
|
|
| 745 |
if db_find_by_norm(norm):
|
| 746 |
return err(409, "اسم المستخدم موجود بالفعل", "username_taken")
|
| 747 |
pw_hash = ph.hash(body.password)
|
| 748 |
-
pid, device_id = db_create_player(username, norm, pw_hash, ip, device)
|
| 749 |
except HTTPException:
|
| 750 |
raise
|
| 751 |
except Exception as e:
|
|
@@ -757,7 +872,7 @@ def register(body: AuthIn, request: Request, x_device_id: str = Header(default="
|
|
| 757 |
token = make_session(pid, username, "player", 0)
|
| 758 |
log("INFO", "auth", "register", username + " ip=" + ip, rid=ip)
|
| 759 |
return {"ok": True, "token": token, "device_id": device_id,
|
| 760 |
-
"user": {"id": pid, "username": username, "role": "player"},
|
| 761 |
"profile": {"character_data": dict(DEFAULT_CHAR), "rank_id": 1, "level": 1, "xp": 0,
|
| 762 |
"money": 0, "inventory": [], "guns": dict(DEFAULT_GUNS), "stats": {},
|
| 763 |
"admin_rank": 0}}
|
|
@@ -816,13 +931,16 @@ def login(body: AuthIn, request: Request, x_device_id: str = Header(default=""),
|
|
| 816 |
token = make_session(pid, row["username"], role, (row.get("admin_rank") or 0) if is_admin else 0)
|
| 817 |
log("INFO", "auth", "login", row["username"] + " ip=" + ip, rid=ip)
|
| 818 |
return {"ok": True, "token": token,
|
| 819 |
-
"user": {"id": pid, "username": row["username"], "role": role,
|
| 820 |
"admin_rank": (row.get("admin_rank") or 0) if is_admin else 0},
|
| 821 |
"profile": profile}
|
| 822 |
|
| 823 |
@app.post("/api/logout")
|
| 824 |
def logout(request: Request):
|
| 825 |
token = bearer(request)
|
|
|
|
|
|
|
|
|
|
| 826 |
if token:
|
| 827 |
drop_session(token)
|
| 828 |
return {"ok": True}
|
|
@@ -886,7 +1004,8 @@ def admin_overview(request: Request):
|
|
| 886 |
require_admin(request)
|
| 887 |
return {"ok": True, "uptime_s": int(time.time() - BOOT_TS), "supabase": USE_SUPABASE,
|
| 888 |
"rooms": [{"name": r.name, "players": len(r.players)} for r in ROOMS.values()],
|
| 889 |
-
"players": [{"id": p.pid, "name": p.name, "role": p.role, "
|
|
|
|
| 890 |
"x": round(p.x), "y": round(p.y)}
|
| 891 |
for r in ROOMS.values() for p in r.players.values()],
|
| 892 |
"admin_ranks": ADMIN_RANKS}
|
|
@@ -920,7 +1039,7 @@ def admin_kick(body: KickIn, request: Request, background_tasks: BackgroundTasks
|
|
| 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": "
|
| 924 |
return {"ok": True}
|
| 925 |
return err(404, "اللاعب غير متصل", "not_found")
|
| 926 |
|
|
@@ -941,7 +1060,7 @@ def admin_mute(body: MuteIn, request: Request):
|
|
| 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": "
|
| 945 |
return {"ok": True}
|
| 946 |
return err(404, "اللاعب غير متصل", "not_found")
|
| 947 |
|
|
@@ -968,6 +1087,7 @@ async def poll_hello(body: PollHelloIn):
|
|
| 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)
|
|
@@ -1030,8 +1150,7 @@ async def poll_chat(body: PollChatIn):
|
|
| 1030 |
|
| 1031 |
|
| 1032 |
def _admin_player(s):
|
| 1033 |
-
|
| 1034 |
-
return None, None
|
| 1035 |
return find_player(s["pid"])
|
| 1036 |
|
| 1037 |
class BanIn(BaseModel):
|
|
@@ -1062,6 +1181,17 @@ class SelfFlagIn(BaseModel):
|
|
| 1062 |
flag: str
|
| 1063 |
on: bool = True
|
| 1064 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1065 |
def db_ban(pid, minutes, reason):
|
| 1066 |
ts = now_iso()
|
| 1067 |
try:
|
|
@@ -1140,7 +1270,7 @@ async def admin_ban(body: BanIn, request: Request):
|
|
| 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, "
|
| 1144 |
return {"ok": True}
|
| 1145 |
|
| 1146 |
@app.post("/api/admin/unban")
|
|
@@ -1196,7 +1326,7 @@ async def admin_jail(body: JailIn, request: Request):
|
|
| 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, "
|
| 1200 |
log("WARN", "admin", "jail", "%s jailed %s %dm" % (s["username"], p.name, body.minutes))
|
| 1201 |
return {"ok": True}
|
| 1202 |
|
|
@@ -1226,7 +1356,7 @@ async def admin_setrank(body: SetRankIn, request: Request):
|
|
| 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, "
|
| 1230 |
return {"ok": ok}
|
| 1231 |
|
| 1232 |
@app.post("/api/admin/self")
|
|
@@ -1262,9 +1392,11 @@ async def admin_self(body: SelfFlagIn, request: Request):
|
|
| 1262 |
|
| 1263 |
|
| 1264 |
def db_list_banned():
|
| 1265 |
-
|
|
|
|
| 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)
|
|
@@ -1272,7 +1404,7 @@ def db_list_banned():
|
|
| 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", (
|
| 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:
|
|
@@ -1308,45 +1440,281 @@ def admin_events(request: Request):
|
|
| 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 |
-
"ال
|
| 1335 |
-
"
|
| 1336 |
-
"
|
| 1337 |
-
"
|
| 1338 |
-
"
|
| 1339 |
-
"
|
| 1340 |
-
"ا
|
| 1341 |
-
"ا
|
| 1342 |
-
"
|
| 1343 |
-
"التلقيم التلقائي يعمل عند نفاد الذخيرة — احمِ نفسك أثناءه",
|
| 1344 |
-
"لا تضغط أزرار اللعب بعنف — العصي حساسة للمس",
|
| 1345 |
-
"الرسائل التحذيرية الصفراء رسمية من الخادم — لا تتجاهلها",
|
| 1346 |
-
"أي لاعب ينتحل صفة الإدارة يُحظر — الإدارة معروفة بالألوان",
|
| 1347 |
-
"تقارير الأخطاء تُرسل تلقائيًا — شاركنا التحسينات",
|
| 1348 |
-
"السلاسة تتأثر بالـ ping — أغلق التطبيقات الثقيلة بالخلفية",
|
| 1349 |
-
"استمتع بالخدمة العسكرية وجنّد أصدقاءك للقاعدة",
|
| 1350 |
]
|
| 1351 |
|
| 1352 |
async def server_tips():
|
|
@@ -1401,6 +1769,13 @@ async def ws_on_move(room, me, d):
|
|
| 1401 |
ny = JAIL_Y + jdy / jd * JAIL_R
|
| 1402 |
me.last_seq = seq
|
| 1403 |
me.last_move_at = t
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1404 |
room.rekey(me, nx, ny)
|
| 1405 |
me.x, me.y = nx, ny
|
| 1406 |
try:
|
|
@@ -1457,6 +1832,7 @@ async def ws_on_shot(room, me, d):
|
|
| 1457 |
log("WARN", "ws", "shot_far_muzzle", me.name)
|
| 1458 |
return
|
| 1459 |
me.last_shot_at = t
|
|
|
|
| 1460 |
msg = {"t": "shot", "id": me.pid, "x": round(x), "y": round(y), "rad": round(rad, 3)}
|
| 1461 |
for p in room.visible(me):
|
| 1462 |
deliver(p, msg)
|
|
@@ -1477,6 +1853,7 @@ async def ws_on_chat(room, me, d):
|
|
| 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)
|
|
@@ -1521,6 +1898,7 @@ async def ws_endpoint(ws: WebSocket, token: str = ""):
|
|
| 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,
|
|
@@ -1570,6 +1948,7 @@ async def ws_endpoint(ws: WebSocket, token: str = ""):
|
|
| 1570 |
except Exception as e:
|
| 1571 |
log("ERROR", "ws", "conn_error", str(e)[:200], rid=str(pid))
|
| 1572 |
finally:
|
|
|
|
| 1573 |
removed = room.remove(pid)
|
| 1574 |
if removed:
|
| 1575 |
for p in list(room.players.values()):
|
|
@@ -1603,8 +1982,10 @@ async def janitor():
|
|
| 1603 |
t = time.time()
|
| 1604 |
for room in list(ROOMS.values()):
|
| 1605 |
for p in list(room.players.values()):
|
|
|
|
| 1606 |
if t - p.last_seen > 90:
|
| 1607 |
if p.transport == "poll":
|
|
|
|
| 1608 |
room.remove(p.pid)
|
| 1609 |
for o in list(room.players.values()):
|
| 1610 |
deliver(o, {"t": "pleave", "id": p.pid})
|
|
|
|
| 25 |
SQLITE_PATH = os.environ.get("SQLITE_PATH", "./soldierlife.db")
|
| 26 |
USE_SUPABASE = bool(SUPABASE_URL and SUPABASE_KEY)
|
| 27 |
|
| 28 |
+
MAX_PER_ROOM = 10
|
| 29 |
WORLD_W = 4800
|
| 30 |
WORLD_H = 4800
|
| 31 |
VIEW_RANGE = 1700.0
|
|
|
|
| 101 |
update public.players set is_admin = true where role = 'admin' and is_admin = false;
|
| 102 |
end if;
|
| 103 |
end $$""",
|
| 104 |
+
"alter table public.players add column if not exists public_id bigint",
|
| 105 |
+
"create unique index if not exists players_public_id_uidx on public.players (public_id)",
|
| 106 |
]
|
| 107 |
PG_MIGRATIONS = [
|
| 108 |
"""create table if not exists public.players (
|
|
|
|
| 159 |
created_at timestamptz not null default now())""",
|
| 160 |
"create index if not exists chat_created_idx on public.chat_log (created_at desc)",
|
| 161 |
"create index if not exists chat_player_idx on public.chat_log (player_id)",
|
| 162 |
+
"""create table if not exists public.daily_missions (
|
| 163 |
+
player_id bigint not null,
|
| 164 |
+
day text not null,
|
| 165 |
+
tasks jsonb not null default '{}'::jsonb,
|
| 166 |
+
updated_at timestamptz not null default now(),
|
| 167 |
+
primary key (player_id, day))""",
|
| 168 |
]
|
| 169 |
|
| 170 |
SQLITE_MIGRATIONS = [
|
|
|
|
| 216 |
created_at text)""",
|
| 217 |
"create index if not exists chat_created_idx on chat_log (created_at)",
|
| 218 |
"create index if not exists chat_player_idx on chat_log (player_id)",
|
| 219 |
+
"alter table players add column public_id integer",
|
| 220 |
+
"create unique index if not exists players_public_id_uidx on players (public_id)",
|
| 221 |
+
"""create table if not exists daily_missions (
|
| 222 |
+
player_id integer not null,
|
| 223 |
+
day text not null,
|
| 224 |
+
tasks text not null default '{}',
|
| 225 |
+
updated_at text,
|
| 226 |
+
primary key (player_id, day))""",
|
| 227 |
]
|
| 228 |
|
| 229 |
def run_migrations():
|
|
|
|
| 277 |
def _j(obj):
|
| 278 |
return json.dumps(obj, ensure_ascii=False)
|
| 279 |
|
| 280 |
+
def public_id_ok(v):
|
| 281 |
+
s = str(v)
|
| 282 |
+
if len(s) != 7 or not s.isdigit():
|
| 283 |
+
return False
|
| 284 |
+
if len(set(s)) == 1:
|
| 285 |
+
return False
|
| 286 |
+
if s == s[::-1]:
|
| 287 |
+
return False
|
| 288 |
+
if all(int(s[i+1]) - int(s[i]) == 1 for i in range(6)):
|
| 289 |
+
return False
|
| 290 |
+
if all(int(s[i]) - int(s[i+1]) == 1 for i in range(6)):
|
| 291 |
+
return False
|
| 292 |
+
if all(s[i] == s[i+1] for i in range(0, 6, 2)):
|
| 293 |
+
return False
|
| 294 |
+
return True
|
| 295 |
+
|
| 296 |
+
def db_pub_exists(pub):
|
| 297 |
+
try:
|
| 298 |
+
if USE_SUPABASE:
|
| 299 |
+
r = httpx.get(SUPABASE_URL + "/rest/v1/players?public_id=eq." + str(pub) + "&select=id&limit=1",
|
| 300 |
+
headers=sb_headers(), timeout=15)
|
| 301 |
+
return bool(r.status_code < 400 and r.json())
|
| 302 |
+
with _lk:
|
| 303 |
+
cur = _db.execute("SELECT id FROM players WHERE public_id=?", (pub,))
|
| 304 |
+
return cur.fetchone() is not None
|
| 305 |
+
except Exception:
|
| 306 |
+
return False
|
| 307 |
+
|
| 308 |
+
def gen_public_id():
|
| 309 |
+
for _ in range(300):
|
| 310 |
+
v = random.randint(1000000, 9999999)
|
| 311 |
+
if public_id_ok(v) and not db_pub_exists(v):
|
| 312 |
+
return v
|
| 313 |
+
return random.randint(1000000, 9999999)
|
| 314 |
+
|
| 315 |
+
def db_get_pub(pid):
|
| 316 |
+
try:
|
| 317 |
+
if USE_SUPABASE:
|
| 318 |
+
r = httpx.get(SUPABASE_URL + "/rest/v1/players?id=eq." + str(pid) + "&select=public_id&limit=1",
|
| 319 |
+
headers=sb_headers(), timeout=15)
|
| 320 |
+
return (r.json()[0].get("public_id") or 0) if r.status_code < 400 and r.json() else 0
|
| 321 |
+
with _lk:
|
| 322 |
+
cur = _db.execute("SELECT public_id FROM players WHERE id=?", (pid,))
|
| 323 |
+
row = cur.fetchone()
|
| 324 |
+
return row[0] if row and row[0] else 0
|
| 325 |
+
except Exception:
|
| 326 |
+
return 0
|
| 327 |
+
|
| 328 |
+
def db_set_pub(pid, pub):
|
| 329 |
+
ts = now_iso()
|
| 330 |
+
try:
|
| 331 |
+
if USE_SUPABASE:
|
| 332 |
+
r = httpx.patch(SUPABASE_URL + "/rest/v1/players?id=eq." + str(pid), headers=sb_headers(), timeout=15,
|
| 333 |
+
json={"public_id": pub, "updated_at": ts})
|
| 334 |
+
return r.status_code < 400
|
| 335 |
+
with _lk:
|
| 336 |
+
_db.execute("UPDATE players SET public_id=?, updated_at=? WHERE id=?", (pub, ts, pid))
|
| 337 |
+
_db.commit()
|
| 338 |
+
return True
|
| 339 |
+
except Exception as e:
|
| 340 |
+
log("WARN", "db", "set_pub_failed", str(e)[:140])
|
| 341 |
+
return False
|
| 342 |
+
|
| 343 |
+
def db_set_arank(pid, arank):
|
| 344 |
+
ts = now_iso()
|
| 345 |
+
try:
|
| 346 |
+
if USE_SUPABASE:
|
| 347 |
+
r = httpx.patch(SUPABASE_URL + "/rest/v1/players?id=eq." + str(pid), headers=sb_headers(), timeout=15,
|
| 348 |
+
json={"is_admin": arank > 0, "admin_rank": arank, "updated_at": ts})
|
| 349 |
+
return r.status_code < 400
|
| 350 |
+
with _lk:
|
| 351 |
+
_db.execute("UPDATE players SET is_admin=?, admin_rank=?, updated_at=? WHERE id=?",
|
| 352 |
+
(1 if arank > 0 else 0, arank, ts, pid))
|
| 353 |
+
_db.commit()
|
| 354 |
+
return True
|
| 355 |
+
except Exception as e:
|
| 356 |
+
log("WARN", "db", "set_arank_failed", str(e)[:140])
|
| 357 |
+
return False
|
| 358 |
+
|
| 359 |
+
def db_add_xp(pid, delta):
|
| 360 |
+
try:
|
| 361 |
+
if USE_SUPABASE:
|
| 362 |
+
r = httpx.get(SUPABASE_URL + "/rest/v1/players?id=eq." + str(pid) + "&select=xp", headers=sb_headers(), timeout=15)
|
| 363 |
+
cur = (r.json()[0].get("xp") or 0) if r.status_code < 400 and r.json() else 0
|
| 364 |
+
r2 = httpx.patch(SUPABASE_URL + "/rest/v1/players?id=eq." + str(pid), headers=sb_headers(), timeout=15, json={
|
| 365 |
+
"xp": max(0, cur + delta), "updated_at": now_iso()})
|
| 366 |
+
return r2.status_code < 400
|
| 367 |
+
with _lk:
|
| 368 |
+
_db.execute("UPDATE players SET xp=max(0, xp+?), updated_at=? WHERE id=?", (delta, now_iso(), pid))
|
| 369 |
+
_db.commit()
|
| 370 |
+
return True
|
| 371 |
+
except Exception as e:
|
| 372 |
+
log("WARN", "db", "xp_failed", str(e)[:140])
|
| 373 |
+
return False
|
| 374 |
+
|
| 375 |
def db_create_player(username, norm, pw_hash, ip, device):
|
| 376 |
ts = now_iso()
|
| 377 |
device_id = secrets.token_urlsafe(16)
|
| 378 |
cookies = {"device_id": device_id}
|
| 379 |
+
pub = gen_public_id()
|
| 380 |
if USE_SUPABASE:
|
| 381 |
r = httpx.post(SUPABASE_URL + "/rest/v1/players", headers=sb_headers(), timeout=15, json={
|
| 382 |
"username": username, "username_norm": norm, "password_hash": pw_hash,
|
| 383 |
+
"is_admin": False, "admin_rank": 0, "public_id": pub,
|
| 384 |
"character_data": _j(DEFAULT_CHAR), "rank_id": 1,
|
| 385 |
"inventory": "[]", "guns": _j(DEFAULT_GUNS),
|
| 386 |
"ip": ip, "device": (device or "")[:120], "cookies": _j(cookies),
|
| 387 |
"created_at": ts, "updated_at": ts})
|
| 388 |
if r.status_code >= 400:
|
| 389 |
raise RuntimeError("db_create_failed:" + str(r.status_code))
|
| 390 |
+
return r.json()[0]["id"], device_id, pub
|
| 391 |
with _lk:
|
| 392 |
cur = _db.execute(
|
| 393 |
+
"INSERT INTO players (username,username_norm,password_hash,is_admin,admin_rank,public_id,"
|
| 394 |
"character_data,rank_id,inventory,guns,ip,device,cookies,created_at,updated_at)"
|
| 395 |
+
" VALUES (?,?,?,0,0,?,?,1,'[]',?,?,?,?,?,?)",
|
| 396 |
+
(username, norm, pw_hash, pub, _j(DEFAULT_CHAR),
|
| 397 |
_j(DEFAULT_GUNS), ip, (device or "")[:120], _j(cookies), ts, ts))
|
| 398 |
_db.commit()
|
| 399 |
+
return cur.lastrowid, device_id, pub
|
| 400 |
|
| 401 |
def db_find_by_norm(norm):
|
| 402 |
if USE_SUPABASE:
|
|
|
|
| 621 |
self.profile = profile
|
| 622 |
self.ws = ws
|
| 623 |
self.arank = arank
|
| 624 |
+
self.pub = 0
|
| 625 |
+
self._sal_flag = False
|
| 626 |
h = 0
|
| 627 |
for ch in name:
|
| 628 |
h = (h * 31 + ord(ch)) & 0xffff
|
|
|
|
| 652 |
|
| 653 |
def public_full(self):
|
| 654 |
return {"id": self.pid, "name": self.name, "role": self.role, "arank": self.arank,
|
| 655 |
+
"pub": self.pub, "level": self.rank_id,
|
| 656 |
"x": round(self.x), "y": round(self.y),
|
| 657 |
"dir": self.dir, "mov": self.mov, "wt": round(self.wt, 1), "sal": self.sal,
|
| 658 |
"has": self.has_w, "hol": self.hol_w, "ping": self.ping,
|
|
|
|
| 860 |
if db_find_by_norm(norm):
|
| 861 |
return err(409, "اسم المستخدم موجود بالفعل", "username_taken")
|
| 862 |
pw_hash = ph.hash(body.password)
|
| 863 |
+
pid, device_id, pub = db_create_player(username, norm, pw_hash, ip, device)
|
| 864 |
except HTTPException:
|
| 865 |
raise
|
| 866 |
except Exception as e:
|
|
|
|
| 872 |
token = make_session(pid, username, "player", 0)
|
| 873 |
log("INFO", "auth", "register", username + " ip=" + ip, rid=ip)
|
| 874 |
return {"ok": True, "token": token, "device_id": device_id,
|
| 875 |
+
"user": {"id": pid, "username": username, "role": "player", "pub": pub},
|
| 876 |
"profile": {"character_data": dict(DEFAULT_CHAR), "rank_id": 1, "level": 1, "xp": 0,
|
| 877 |
"money": 0, "inventory": [], "guns": dict(DEFAULT_GUNS), "stats": {},
|
| 878 |
"admin_rank": 0}}
|
|
|
|
| 931 |
token = make_session(pid, row["username"], role, (row.get("admin_rank") or 0) if is_admin else 0)
|
| 932 |
log("INFO", "auth", "login", row["username"] + " ip=" + ip, rid=ip)
|
| 933 |
return {"ok": True, "token": token,
|
| 934 |
+
"user": {"id": pid, "username": row["username"], "role": role, "pub": db_get_pub(pid),
|
| 935 |
"admin_rank": (row.get("admin_rank") or 0) if is_admin else 0},
|
| 936 |
"profile": profile}
|
| 937 |
|
| 938 |
@app.post("/api/logout")
|
| 939 |
def logout(request: Request):
|
| 940 |
token = bearer(request)
|
| 941 |
+
s = get_session(token)
|
| 942 |
+
if s and s["pid"] > 0:
|
| 943 |
+
flush_prog(s["pid"])
|
| 944 |
if token:
|
| 945 |
drop_session(token)
|
| 946 |
return {"ok": True}
|
|
|
|
| 1004 |
require_admin(request)
|
| 1005 |
return {"ok": True, "uptime_s": int(time.time() - BOOT_TS), "supabase": USE_SUPABASE,
|
| 1006 |
"rooms": [{"name": r.name, "players": len(r.players)} for r in ROOMS.values()],
|
| 1007 |
+
"players": [{"id": p.pid, "name": p.name, "role": p.role, "arank": p.arank,
|
| 1008 |
+
"pub": p.pub, "room": r.name,
|
| 1009 |
"x": round(p.x), "y": round(p.y)}
|
| 1010 |
for r in ROOMS.values() for p in r.players.values()],
|
| 1011 |
"admin_ranks": ADMIN_RANKS}
|
|
|
|
| 1039 |
log("WARN", "admin", "kick", "%s kicked %s" % (s["username"], p.name))
|
| 1040 |
event("kick", "طرد %s اللاعب %s" % (s["username"], p.name))
|
| 1041 |
for o in list(r.players.values()):
|
| 1042 |
+
deliver(o, {"t": "chat", "id": 0, "name": "الخادم", "msg": "تم طرد %s — من طرف %s" % (p.name, s["username"]), "color": "yellow", "sys": True})
|
| 1043 |
return {"ok": True}
|
| 1044 |
return err(404, "اللاعب غير متصل", "not_found")
|
| 1045 |
|
|
|
|
| 1060 |
log("WARN", "admin", "mute", "%s muted %s for %dm" % (s["username"], p.name, body.minutes))
|
| 1061 |
event("mute", "كتم %s اللاعب %s لمدة %d دقيقة" % (s["username"], p.name, body.minutes))
|
| 1062 |
for o in list(r.players.values()):
|
| 1063 |
+
deliver(o, {"t": "chat", "id": 0, "name": "الخادم", "msg": "تم كتم %s لمدة %d دقيقة — من طرف %s" % (p.name, body.minutes, s["username"]), "color": "yellow", "sys": True})
|
| 1064 |
return {"ok": True}
|
| 1065 |
return err(404, "اللاعب غير متصل", "not_found")
|
| 1066 |
|
|
|
|
| 1087 |
profile = {"character_data": dict(DEFAULT_CHAR), "rank_id": 41} if pid < 0 else db_get_profile(pid)
|
| 1088 |
rank_id = (profile or {}).get("rank_id") or 1
|
| 1089 |
me = Player(pid, username, role, rank_id, (profile or {}).get("character_data") or dict(DEFAULT_CHAR), None, s.get("arank", 0))
|
| 1090 |
+
me.pub = db_get_pub(pid) if pid > 0 else 0
|
| 1091 |
me.transport = "poll"
|
| 1092 |
me.last_seen = time.time()
|
| 1093 |
room.add(me)
|
|
|
|
| 1150 |
|
| 1151 |
|
| 1152 |
def _admin_player(s):
|
| 1153 |
+
# حساب الإدارة من متغيرات البيئة (pid=-1) يملك Player حقيقيًا في الغرفة — لا حظر
|
|
|
|
| 1154 |
return find_player(s["pid"])
|
| 1155 |
|
| 1156 |
class BanIn(BaseModel):
|
|
|
|
| 1181 |
flag: str
|
| 1182 |
on: bool = True
|
| 1183 |
|
| 1184 |
+
class SetIdIn(BaseModel):
|
| 1185 |
+
player_id: int
|
| 1186 |
+
public_id: int = Field(ge=1000000, le=9999999)
|
| 1187 |
+
|
| 1188 |
+
class SetARankIn(BaseModel):
|
| 1189 |
+
player_id: int
|
| 1190 |
+
arank: int = Field(ge=0, le=5)
|
| 1191 |
+
|
| 1192 |
+
class ClaimIn(BaseModel):
|
| 1193 |
+
tid: str = Field(min_length=1, max_length=24)
|
| 1194 |
+
|
| 1195 |
def db_ban(pid, minutes, reason):
|
| 1196 |
ts = now_iso()
|
| 1197 |
try:
|
|
|
|
| 1270 |
log("WARN", "admin", "ban", "%s banned %s (%s)" % (s["username"], body.player_id, label))
|
| 1271 |
event("ban", "حظر %s اللاعب %s (%s)" % (s["username"], (p.name if p else str(body.player_id)), label))
|
| 1272 |
if room:
|
| 1273 |
+
await room_announce(room, "تم حظر %s — من طرف %s" % ((p.name if p else ("اللاعب #%d" % body.player_id)), s["username"]), "red")
|
| 1274 |
return {"ok": True}
|
| 1275 |
|
| 1276 |
@app.post("/api/admin/unban")
|
|
|
|
| 1326 |
deliver(p, {"t": "sys", "msg": "سُجن لمدة %d دقيقة | السبب: %s" % (body.minutes, body.reason or "بدون")})
|
| 1327 |
db_audit(s["pid"], s["username"], "jail", body.player_id, p.name, "%dm | %s" % (body.minutes, body.reason))
|
| 1328 |
event("jail", "سجن %s اللاعب %s لمدة %d دقيقة" % (s["username"], p.name, body.minutes))
|
| 1329 |
+
await room_announce(room, "تم سجن %s لمدة %d دقيقة — من طرف %s" % (p.name, body.minutes, s["username"]), "yellow")
|
| 1330 |
log("WARN", "admin", "jail", "%s jailed %s %dm" % (s["username"], p.name, body.minutes))
|
| 1331 |
return {"ok": True}
|
| 1332 |
|
|
|
|
| 1356 |
db_audit(s["pid"], s["username"], "setrank", body.player_id, (p.name if p else str(body.player_id)), str(body.rank_id))
|
| 1357 |
event("setrank", "غيّر %s رتبة %s إلى %d" % (s["username"], (p.name if p else str(body.player_id)), body.rank_id))
|
| 1358 |
if room:
|
| 1359 |
+
await room_announce(room, "ترقية: حصل %s على الرتبة (%d)" % ((p.name if p else ("اللاعب #%d" % body.player_id)), body.rank_id), "red")
|
| 1360 |
return {"ok": ok}
|
| 1361 |
|
| 1362 |
@app.post("/api/admin/self")
|
|
|
|
| 1392 |
|
| 1393 |
|
| 1394 |
def db_list_banned():
|
| 1395 |
+
import urllib.parse
|
| 1396 |
+
now_raw = datetime.now(timezone.utc).isoformat(timespec="seconds")
|
| 1397 |
try:
|
| 1398 |
if USE_SUPABASE:
|
| 1399 |
+
now = urllib.parse.quote(now_raw, safe="")
|
| 1400 |
r = httpx.get(SUPABASE_URL + "/rest/v1/players?banned_until=gte." + now +
|
| 1401 |
"&select=id,username,admin_rank,banned_until,ban_reason&order=banned_until.desc&limit=100",
|
| 1402 |
headers=sb_headers(), timeout=20)
|
|
|
|
| 1404 |
with _lk:
|
| 1405 |
cur = _db.execute("SELECT id,username,admin_rank,banned_until,ban_reason FROM players "
|
| 1406 |
"WHERE banned_until IS NOT NULL AND banned_until > ? "
|
| 1407 |
+
"ORDER BY banned_until DESC LIMIT 100", (now_raw,))
|
| 1408 |
cols = [c[0] for c in cur.description]
|
| 1409 |
return [dict(zip(cols, row)) for row in cur.fetchall()]
|
| 1410 |
except Exception as e:
|
|
|
|
| 1440 |
raise HTTPException(status_code=403, detail="غير مصرح")
|
| 1441 |
return {"ok": True, "events": list(EVENTS)[::-1][:200]}
|
| 1442 |
|
| 1443 |
+
|
| 1444 |
+
# ============================ Daily Missions ============================
|
| 1445 |
+
PROGRESS = {}
|
| 1446 |
+
|
| 1447 |
+
def _day_key():
|
| 1448 |
+
return datetime.now(timezone.utc).strftime("%Y-%m-%d")
|
| 1449 |
+
|
| 1450 |
+
def get_prog(pid):
|
| 1451 |
+
d = _day_key()
|
| 1452 |
+
rec = PROGRESS.get(pid)
|
| 1453 |
+
if not rec or rec["day"] != d:
|
| 1454 |
+
rec = {"day": d, "c": defaultdict(float)}
|
| 1455 |
+
PROGRESS[pid] = rec
|
| 1456 |
+
return rec["c"]
|
| 1457 |
+
|
| 1458 |
+
def bump(pid, key, amt):
|
| 1459 |
+
if pid and pid > 0:
|
| 1460 |
+
get_prog(pid)[key] += amt
|
| 1461 |
+
|
| 1462 |
+
def flush_prog(pid):
|
| 1463 |
+
day = _day_key()
|
| 1464 |
+
st = db_missions_load(pid, day)
|
| 1465 |
+
if not st or not st.get("tasks"):
|
| 1466 |
+
return
|
| 1467 |
+
live = get_prog(pid)
|
| 1468 |
+
sp = st.setdefault("saved_prog", {})
|
| 1469 |
+
changed = False
|
| 1470 |
+
for k, v in live.items():
|
| 1471 |
+
if v > sp.get(k, 0):
|
| 1472 |
+
sp[k] = v
|
| 1473 |
+
changed = True
|
| 1474 |
+
if changed:
|
| 1475 |
+
db_missions_save(pid, day, st)
|
| 1476 |
+
|
| 1477 |
+
MISSION_NORMAL = [
|
| 1478 |
+
{"tid": "walk1", "name": "سير ميداني", "desc": "امشِ مسافة %d متر داخل القاعدة", "key": "walk", "n": [400, 600, 800], "r": {"xp": 25, "gold": 15}},
|
| 1479 |
+
{"tid": "shots1", "name": "تدريب رماية", "desc": "أطلق %d طلقة أثناء التدريب", "key": "shots", "n": [40, 60], "r": {"xp": 25, "gold": 20}},
|
| 1480 |
+
{"tid": "sal1", "name": "انضباط عسكري", "desc": "قدّم التحية العسكرية %d مرات", "key": "salutes", "n": [3, 5], "r": {"xp": 15, "gold": 10}},
|
| 1481 |
+
{"tid": "chat1", "name": "تواصل", "desc": "أرسل %d رسائل في الدردشة العامة", "key": "chat", "n": [4, 6], "r": {"xp": 15, "gold": 10}},
|
| 1482 |
+
{"tid": "time1", "name": "مثابرة", "desc": "ابقَ داخل اللعبة %d دقيقة", "key": "playmin", "n": [10, 15], "r": {"xp": 30, "gold": 20}},
|
| 1483 |
+
]
|
| 1484 |
+
MISSION_HARD = [
|
| 1485 |
+
{"tid": "hshots", "name": "رماية مكثفة", "desc": "أطلق %d طلقة خلال اليوم", "key": "shots", "n": [150, 200], "r": {"xp": 90, "gold": 60}},
|
| 1486 |
+
{"tid": "hwalk", "name": "مسيرة طويلة", "desc": "امشِ %d متر خلال اليوم", "key": "walk", "n": [1500, 2000], "r": {"xp": 70, "gold": 50}},
|
| 1487 |
+
{"tid": "htime", "name": "خدمة كاملة", "desc": "العب %d دقيقة اليوم", "key": "playmin", "n": [30, 45], "r": {"xp": 100, "gold": 70}},
|
| 1488 |
+
{"tid": "hsal", "name": "تحيات متقنة", "desc": "قدّم التحية العسكرية %d مرات", "key": "salutes", "n": [10, 12], "r": {"xp": 60, "gold": 45}},
|
| 1489 |
+
{"tid": "hchat", "name": "نشاط مجتمعي", "desc": "شارك بـ %d رسائل محترمة في الدردشة", "key": "chat", "n": [15, 20], "r": {"xp": 60, "gold": 45}},
|
| 1490 |
+
]
|
| 1491 |
+
|
| 1492 |
+
def gen_daily_tasks(day):
|
| 1493 |
+
rng = random.Random(day)
|
| 1494 |
+
normal = rng.sample(MISSION_NORMAL, 5)
|
| 1495 |
+
hard = rng.sample(MISSION_HARD, 2)
|
| 1496 |
+
out = []
|
| 1497 |
+
for t in normal + hard:
|
| 1498 |
+
n = rng.choice(t["n"])
|
| 1499 |
+
out.append({"tid": t["tid"], "name": t["name"], "desc": t["desc"] % n,
|
| 1500 |
+
"key": t["key"], "target": n, "reward": t["r"],
|
| 1501 |
+
"hard": t in MISSION_HARD, "claimed": False})
|
| 1502 |
+
return out
|
| 1503 |
+
|
| 1504 |
+
def db_missions_load(pid, day):
|
| 1505 |
+
try:
|
| 1506 |
+
if USE_SUPABASE:
|
| 1507 |
+
r = httpx.get(SUPABASE_URL + "/rest/v1/daily_missions?player_id=eq." + str(pid) +
|
| 1508 |
+
"&day=eq." + day + "&select=tasks&limit=1", headers=sb_headers(), timeout=15)
|
| 1509 |
+
if r.status_code < 400 and r.json():
|
| 1510 |
+
return json.loads(r.json()[0]["tasks"] or "{}")
|
| 1511 |
+
else:
|
| 1512 |
+
with _lk:
|
| 1513 |
+
cur = _db.execute("SELECT tasks FROM daily_missions WHERE player_id=? AND day=?", (pid, day))
|
| 1514 |
+
row = cur.fetchone()
|
| 1515 |
+
if row:
|
| 1516 |
+
return json.loads(row[0] or "{}")
|
| 1517 |
+
except Exception as e:
|
| 1518 |
+
log("WARN", "db", "missions_load_failed", str(e)[:140])
|
| 1519 |
+
return None
|
| 1520 |
+
|
| 1521 |
+
def db_missions_save(pid, day, payload):
|
| 1522 |
+
try:
|
| 1523 |
+
body = _j(payload)
|
| 1524 |
+
if USE_SUPABASE:
|
| 1525 |
+
r = httpx.post(SUPABASE_URL + "/rest/v1/daily_missions", headers=sb_headers(), timeout=15, json={
|
| 1526 |
+
"player_id": pid, "day": day, "tasks": body, "updated_at": now_iso()},
|
| 1527 |
+
params={"on_conflict": "player_id,day"})
|
| 1528 |
+
if r.status_code >= 400:
|
| 1529 |
+
httpx.patch(SUPABASE_URL + "/rest/v1/daily_missions?player_id=eq." + str(pid) + "&day=eq." + day,
|
| 1530 |
+
headers=sb_headers(), timeout=15, json={"tasks": body, "updated_at": now_iso()})
|
| 1531 |
+
else:
|
| 1532 |
+
with _lk:
|
| 1533 |
+
_db.execute("INSERT OR REPLACE INTO daily_missions (player_id,day,tasks,updated_at) VALUES (?,?,?,?)",
|
| 1534 |
+
(pid, day, body, now_iso()))
|
| 1535 |
+
_db.commit()
|
| 1536 |
+
except Exception as e:
|
| 1537 |
+
log("WARN", "db", "missions_save_failed", str(e)[:140])
|
| 1538 |
+
|
| 1539 |
+
def missions_state(pid):
|
| 1540 |
+
day = _day_key()
|
| 1541 |
+
st = db_missions_load(pid, day)
|
| 1542 |
+
if not st or not st.get("tasks"):
|
| 1543 |
+
st = {"tasks": gen_daily_tasks(day), "saved_prog": {}}
|
| 1544 |
+
db_missions_save(pid, day, st)
|
| 1545 |
+
live = get_prog(pid)
|
| 1546 |
+
out = []
|
| 1547 |
+
for t in st["tasks"]:
|
| 1548 |
+
prog = max(live.get(t["key"], 0), st.get("saved_prog", {}).get(t["key"], 0))
|
| 1549 |
+
out.append({"tid": t["tid"], "name": t["name"], "desc": t["desc"], "hard": t["hard"],
|
| 1550 |
+
"target": t["target"], "reward": t["reward"],
|
| 1551 |
+
"progress": int(round(min(prog, t["target"] * 10))),
|
| 1552 |
+
"done": prog >= t["target"], "claimed": t.get("claimed", False)})
|
| 1553 |
+
return {"ok": True, "day": day, "tasks": out}
|
| 1554 |
+
|
| 1555 |
+
@app.get("/api/missions")
|
| 1556 |
+
def missions_get(request: Request):
|
| 1557 |
+
s = get_session(bearer(request))
|
| 1558 |
+
if not s or s["pid"] < 0:
|
| 1559 |
+
return err(401, "انتهت الجلسة", "session_expired")
|
| 1560 |
+
return missions_state(s["pid"])
|
| 1561 |
+
|
| 1562 |
+
@app.post("/api/missions/claim")
|
| 1563 |
+
def missions_claim(body: ClaimIn, request: Request):
|
| 1564 |
+
s = get_session(bearer(request))
|
| 1565 |
+
if not s or s["pid"] < 0:
|
| 1566 |
+
return err(401, "انتهت الجلسة", "session_expired")
|
| 1567 |
+
pid = s["pid"]
|
| 1568 |
+
day = _day_key()
|
| 1569 |
+
st = db_missions_load(pid, day)
|
| 1570 |
+
if not st or not st.get("tasks"):
|
| 1571 |
+
return err(404, "لا توجد مهام اليوم", "not_found")
|
| 1572 |
+
live = get_prog(pid)
|
| 1573 |
+
t = next((x for x in st["tasks"] if x["tid"] == body.tid), None)
|
| 1574 |
+
if not t:
|
| 1575 |
+
return err(404, "مهمة غير موجودة", "not_found")
|
| 1576 |
+
if t.get("claimed"):
|
| 1577 |
+
return err(409, "استلمت مكافأة هذه المهمة مسبقًا", "already_claimed")
|
| 1578 |
+
prog = max(live.get(t["key"], 0), st.get("saved_prog", {}).get(t["key"], 0))
|
| 1579 |
+
if prog < t["target"]:
|
| 1580 |
+
return err(400, "لم تكتمل المهمة بعد", "not_done")
|
| 1581 |
+
t["claimed"] = True
|
| 1582 |
+
st.setdefault("saved_prog", {})[t["key"]] = prog
|
| 1583 |
+
db_missions_save(pid, day, st)
|
| 1584 |
+
db_add_xp(pid, t["reward"].get("xp", 0))
|
| 1585 |
+
if t["reward"].get("gold"):
|
| 1586 |
+
db_add_money(pid, t["reward"]["gold"])
|
| 1587 |
+
event("mission", "أكمل %s مهمة «%s»" % (s["username"], t["name"]))
|
| 1588 |
+
return {"ok": True, "reward": t["reward"], "state": missions_state(pid)}
|
| 1589 |
+
|
| 1590 |
+
|
| 1591 |
+
# ============================ Staff / Users / ID management ============================
|
| 1592 |
+
@app.post("/api/admin/setid")
|
| 1593 |
+
def admin_setid(body: SetIdIn, request: Request):
|
| 1594 |
+
s = require_admin(request)
|
| 1595 |
+
if s["arank"] < 4:
|
| 1596 |
+
raise HTTPException(status_code=403, detail="تغيير المعرف متاح لـ Owner فقط")
|
| 1597 |
+
if not public_id_ok(body.public_id):
|
| 1598 |
+
return err(400, "معرف غير مقبول — 7 أرقام غير نمطية", "bad_id")
|
| 1599 |
+
if db_pub_exists(body.public_id):
|
| 1600 |
+
return err(409, "هذا المعرف مستخدم من لاعب آخر", "taken")
|
| 1601 |
+
ok = db_set_pub(body.player_id, body.public_id)
|
| 1602 |
+
_r, p = find_player(body.player_id)
|
| 1603 |
+
if p:
|
| 1604 |
+
p.pub = body.public_id
|
| 1605 |
+
deliver(p, {"t": "sys", "msg": "تم تحديث معرفك العام إلى " + str(body.public_id)})
|
| 1606 |
+
db_audit(s["pid"], s["username"], "setid", body.player_id, (p.name if p else str(body.player_id)), str(body.public_id))
|
| 1607 |
+
event("setid", "غيّر %s معرف اللاعب %s إلى %d" % (s["username"], (p.name if p else str(body.player_id)), body.public_id))
|
| 1608 |
+
return {"ok": ok}
|
| 1609 |
+
|
| 1610 |
+
@app.post("/api/admin/setarank")
|
| 1611 |
+
async def admin_setarank(body: SetARankIn, request: Request):
|
| 1612 |
+
s = require_admin(request)
|
| 1613 |
+
if s["arank"] < 4 and not (s["arank"] >= 2 and body.arank <= 1):
|
| 1614 |
+
raise HTTPException(status_code=403, detail="رتبتك لا تسمح بهذا التعيين")
|
| 1615 |
+
ok = db_set_arank(body.player_id, body.arank)
|
| 1616 |
+
room, p = await _target(body.player_id)
|
| 1617 |
+
if p:
|
| 1618 |
+
p.arank = body.arank
|
| 1619 |
+
p.role = "admin" if body.arank > 0 else "player"
|
| 1620 |
+
deliver(p, {"t": "sys", "msg": ("تمت ترقيتك إداريًا (رتبة %d)" % body.arank) if body.arank > 0 else "تم إلغاء رتبتك الإدارية"})
|
| 1621 |
+
name = (p.name if p else str(body.player_id))
|
| 1622 |
+
db_audit(s["pid"], s["username"], "setarank", body.player_id, name, str(body.arank))
|
| 1623 |
+
event("setarank", "%s %s الرتبة الإدارية %d" % (s["username"], ("رقّى " + name if body.arank > 0 else "ألغى إدارة " + name), body.arank))
|
| 1624 |
+
if room:
|
| 1625 |
+
await room_announce(room, "تغيير في طاقم الإدارة: %s (%s)" % (name, ADMIN_RANKS.get(body.arank, "player")), "yellow")
|
| 1626 |
+
return {"ok": ok}
|
| 1627 |
+
|
| 1628 |
+
@app.get("/api/admin/staff")
|
| 1629 |
+
def admin_staff(request: Request):
|
| 1630 |
+
s = require_admin(request)
|
| 1631 |
+
if s["arank"] < 1:
|
| 1632 |
+
raise HTTPException(status_code=403, detail="غير مصرح")
|
| 1633 |
+
online = {}
|
| 1634 |
+
for r in ROOMS.values():
|
| 1635 |
+
for pid in r.players:
|
| 1636 |
+
online[pid] = True
|
| 1637 |
+
try:
|
| 1638 |
+
if USE_SUPABASE:
|
| 1639 |
+
r = httpx.get(SUPABASE_URL + "/rest/v1/players?is_admin=eq.true&select=id,username,admin_rank,last_login_at,public_id"
|
| 1640 |
+
"&order=admin_rank.desc,last_login_at.desc&limit=100", headers=sb_headers(), timeout=20)
|
| 1641 |
+
rows = r.json() if r.status_code < 400 else []
|
| 1642 |
+
else:
|
| 1643 |
+
with _lk:
|
| 1644 |
+
cur = _db.execute("SELECT id,username,admin_rank,last_login_at,public_id FROM players "
|
| 1645 |
+
"WHERE is_admin=1 ORDER BY admin_rank DESC, last_login_at DESC LIMIT 100")
|
| 1646 |
+
cols = [c[0] for c in cur.description]
|
| 1647 |
+
rows = [dict(zip(cols, row)) for row in cur.fetchall()]
|
| 1648 |
+
except Exception as e:
|
| 1649 |
+
log("WARN", "db", "staff_failed", str(e)[:140])
|
| 1650 |
+
rows = []
|
| 1651 |
+
out = []
|
| 1652 |
+
for row in rows:
|
| 1653 |
+
pid = row.get("id")
|
| 1654 |
+
out.append({"id": pid, "name": row.get("username"), "arank": row.get("admin_rank") or 0,
|
| 1655 |
+
"pub": row.get("public_id") or 0,
|
| 1656 |
+
"online": bool(online.get(pid)),
|
| 1657 |
+
"last_login_at": str(row.get("last_login_at") or "")})
|
| 1658 |
+
return {"ok": True, "staff": out}
|
| 1659 |
+
|
| 1660 |
+
@app.get("/api/admin/users")
|
| 1661 |
+
def admin_users(request: Request, page: int = 0):
|
| 1662 |
+
s = require_admin(request)
|
| 1663 |
+
if s["arank"] < 2:
|
| 1664 |
+
raise HTTPException(status_code=403, detail="غير مصرح")
|
| 1665 |
+
page = max(0, int(page))
|
| 1666 |
+
try:
|
| 1667 |
+
if USE_SUPABASE:
|
| 1668 |
+
r = httpx.get(SUPABASE_URL + "/rest/v1/players?select=id,username,admin_rank,rank_id,public_id,last_login_at"
|
| 1669 |
+
"&order=is_admin.desc,admin_rank.desc,rank_id.desc,id.asc&limit=11&offset=" + str(page * 10),
|
| 1670 |
+
headers=sb_headers(), timeout=20)
|
| 1671 |
+
rows = r.json() if r.status_code < 400 else []
|
| 1672 |
+
else:
|
| 1673 |
+
with _lk:
|
| 1674 |
+
cur = _db.execute("SELECT id,username,admin_rank,rank_id,public_id,last_login_at FROM players "
|
| 1675 |
+
"ORDER BY is_admin DESC, admin_rank DESC, rank_id DESC, id ASC LIMIT 11 OFFSET ?",
|
| 1676 |
+
(page * 10,))
|
| 1677 |
+
cols = [c[0] for c in cur.description]
|
| 1678 |
+
rows = [dict(zip(cols, row)) for row in cur.fetchall()]
|
| 1679 |
+
except Exception as e:
|
| 1680 |
+
log("WARN", "db", "users_failed", str(e)[:140])
|
| 1681 |
+
rows = []
|
| 1682 |
+
has_more = len(rows) > 10
|
| 1683 |
+
rows = rows[:10]
|
| 1684 |
+
return {"ok": True, "users": rows, "page": page, "has_more": has_more}
|
| 1685 |
+
|
| 1686 |
async def room_announce(room, msg, color="yellow"):
|
| 1687 |
await broadcast(room, {"t": "chat", "id": 0, "name": "الخادم", "msg": msg, "color": color, "sys": True})
|
| 1688 |
|
| 1689 |
SERVER_TIPS = [
|
| 1690 |
+
"التزم بقواعد الاحترام داخل الدردشة — العقوبات تُطبق تلقائيًا",
|
| 1691 |
+
"استغلال الثغرات يؤدي إلى حظر دائم دون سابق إنذار",
|
| 1692 |
+
"لن تطلب الإدارة كلمة المرور أبدًا — أي طلب من هذا النوع احتيال",
|
| 1693 |
+
"حركات غير طبيعية أو متكررة تُراجع يدويًا — العب بعدل",
|
| 1694 |
+
"الرسائل المتكررة تُقيَّد تلقائيًا لتجنب الإزعاج",
|
| 1695 |
+
"انتحال صفة الإدارة يؤدي إلى حظر فوري",
|
| 1696 |
+
"تجنب مشاركة معلوماتك الشخصية مع أي لاعب",
|
| 1697 |
+
"الروابط الخارجية في الدردشة ليست مسؤولية الإدارة",
|
| 1698 |
+
"الغش يُكتشف — النزاهة تحفظ حسابك",
|
| 1699 |
+
"أبلغ عن المخالفات بدل المواجهة — التقرير أسرع وأدق",
|
| 1700 |
+
"المتاجرة بالحسابات خارج نطاق المسؤولية وتعرضك للحظر",
|
| 1701 |
+
"الحفاظ على اتصال مستقر يحسن تجربة اللعب الجماعي",
|
| 1702 |
+
"لا تضغط الأزرار المتاحة للإدارة إلا إذا كنت مسؤولًا معتمدًا",
|
| 1703 |
+
"الإيموجي ممنوع في الدردشة لتجنب الإزعاج البصري",
|
| 1704 |
+
"أي محاولة للتلاعب بالخادم تُسجل وتُحظر تلقائيًا",
|
| 1705 |
+
"احترم وقت الجميع — اللعبة تجربة مشتركة",
|
| 1706 |
+
"الحسابات مرتبطة بالجهاز — المخالفات تتبعك بين الجلسات",
|
| 1707 |
+
"تغيير المناطق المقيدة يُعتبر اختراقًا للمنطقة العسكرية",
|
| 1708 |
+
"إطلاق النار داخل القاعدة يُقيَّد — استعمل السلاح بمسؤولية",
|
| 1709 |
+
"التحديثات تُطبق على الجميع بالتساوي — لا استثناءات",
|
| 1710 |
+
"احتفظ بمعرفك العام (7 أرقام) — هو هويتك الرسمية",
|
| 1711 |
+
"المهام اليومية تتجدد عند 00:00 بتوقيت UTC",
|
| 1712 |
+
"المكافآت تُستلم مرة واحدة لكل مهمة — لا يمكن تكرارها",
|
| 1713 |
+
"مخالفة قواعد الدردشة تبدأ بالكتم وتصعَّد حسب التكرار",
|
| 1714 |
+
"الحظر المؤقت لا يلغي سجل المخالفات",
|
| 1715 |
+
"استعمل زر التحية العسكرية عند لقاء الرتب العليا",
|
| 1716 |
+
"أداء جهازك يتأثر بالتطبيقات الخلفية — أغلقها أثناء اللعب",
|
| 1717 |
+
"تقارير الأخطاء تُرسل تلقائيًا وتساعدنا على التحسين",
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1718 |
]
|
| 1719 |
|
| 1720 |
async def server_tips():
|
|
|
|
| 1769 |
ny = JAIL_Y + jdy / jd * JAIL_R
|
| 1770 |
me.last_seq = seq
|
| 1771 |
me.last_move_at = t
|
| 1772 |
+
moved = math.hypot(nx - me.x, ny - me.y)
|
| 1773 |
+
if moved > 0.5:
|
| 1774 |
+
bump(me.pid, "walk", moved / 32.0)
|
| 1775 |
+
sal_flag = 1 if d.get("sal") else 0
|
| 1776 |
+
if sal_flag and not me._sal_flag:
|
| 1777 |
+
bump(me.pid, "salutes", 1)
|
| 1778 |
+
me._sal_flag = bool(sal_flag)
|
| 1779 |
room.rekey(me, nx, ny)
|
| 1780 |
me.x, me.y = nx, ny
|
| 1781 |
try:
|
|
|
|
| 1832 |
log("WARN", "ws", "shot_far_muzzle", me.name)
|
| 1833 |
return
|
| 1834 |
me.last_shot_at = t
|
| 1835 |
+
bump(me.pid, "shots", 1)
|
| 1836 |
msg = {"t": "shot", "id": me.pid, "x": round(x), "y": round(y), "rad": round(rad, 3)}
|
| 1837 |
for p in room.visible(me):
|
| 1838 |
deliver(p, msg)
|
|
|
|
| 1853 |
return
|
| 1854 |
me.chat_wait = chat_delay(len(room.players))
|
| 1855 |
me.last_chat_at = t
|
| 1856 |
+
bump(me.pid, "chat", 1)
|
| 1857 |
msg = {"t": "chat", "id": me.pid, "name": me.name, "msg": text, "arank": me.arank, "role": me.role}
|
| 1858 |
for p in list(room.players.values()):
|
| 1859 |
deliver(p, msg)
|
|
|
|
| 1898 |
profile = db_get_profile(pid) if pid > 0 else {"character_data": dict(DEFAULT_CHAR), "rank_id": 41}
|
| 1899 |
rank_id = (profile or {}).get("rank_id") or 1
|
| 1900 |
me = Player(pid, username, role, rank_id, (profile or {}).get("character_data") or dict(DEFAULT_CHAR), ws, s.get("arank", 0))
|
| 1901 |
+
me.pub = db_get_pub(pid) if pid > 0 else 0
|
| 1902 |
room.add(me)
|
| 1903 |
me.view_set = set(p.pid for p in room.visible(me))
|
| 1904 |
welcome = {"t": "welcome", "id": pid, "room": room_name, "count": len(room.players), "max": MAX_PER_ROOM,
|
|
|
|
| 1948 |
except Exception as e:
|
| 1949 |
log("ERROR", "ws", "conn_error", str(e)[:200], rid=str(pid))
|
| 1950 |
finally:
|
| 1951 |
+
flush_prog(pid)
|
| 1952 |
removed = room.remove(pid)
|
| 1953 |
if removed:
|
| 1954 |
for p in list(room.players.values()):
|
|
|
|
| 1982 |
t = time.time()
|
| 1983 |
for room in list(ROOMS.values()):
|
| 1984 |
for p in list(room.players.values()):
|
| 1985 |
+
bump(p.pid, "playmin", 20.0 / 60.0)
|
| 1986 |
if t - p.last_seen > 90:
|
| 1987 |
if p.transport == "poll":
|
| 1988 |
+
flush_prog(p.pid)
|
| 1989 |
room.remove(p.pid)
|
| 1990 |
for o in list(room.players.values()):
|
| 1991 |
deliver(o, {"t": "pleave", "id": p.pid})
|