misukisu commited on
Commit
14bed26
·
verified ·
1 Parent(s): d1e50d3

bedrock: allow-list off, safe save hold backups, skip binary

Browse files
Files changed (1) hide show
  1. app.py +12 -4
app.py CHANGED
@@ -21,7 +21,7 @@ SPACE_URL = "https://" + os.environ.get("SPACE_HOST", "misukisu-minecraft.hf.spa
21
  INTERVAL = int(os.environ.get("BACKUP_INTERVAL", "3600"))
22
  KEEP = int(os.environ.get("BACKUP_KEEP", "48"))
23
  UPSTREAM = "https://127.0.0.1:8443"
24
- SKIP = {"logs", "playitd.sock"}
25
 
26
  state = {"last_backup": None, "err": None, "restored": None, "tunnels": []}
27
  backup_lock = asyncio.Lock()
@@ -62,7 +62,7 @@ def restore():
62
 
63
  BDS_CMD = "./bedrock_server"
64
  PROPS = {"server-name": "Kreatix Minecraft", "server-port": "19132", "server-portv6": "19133",
65
- "level-name": "world", "online-mode": "true"}
66
 
67
 
68
  def set_props(srv: Path):
@@ -209,7 +209,14 @@ async def backup(reason="hourly"):
209
  TMP.mkdir(parents=True, exist_ok=True)
210
  try:
211
  await crafty.cmd("save hold")
212
- await asyncio.sleep(8)
 
 
 
 
 
 
 
213
  await asyncio.to_thread(make_archive, path)
214
  finally:
215
  await crafty.cmd("save resume")
@@ -366,7 +373,8 @@ async def main():
366
  subprocess.run(f"cp -r {CRAFTY}/app/config_original/* {CRAFTY}/app/config/", shell=True)
367
  shutil.copy(CRAFTY / "app" / "config_original" / "version.json", CRAFTY / "app" / "config" / "version.json")
368
  for d in (CRAFTY / "servers").iterdir():
369
- if (d / "bedrock_server").exists():
 
370
  (d / "bedrock_server").chmod(0o755)
371
  set_props(d)
372
  cp = await asyncio.create_subprocess_exec(str(CRAFTY / ".venv/bin/python"), "main.py", "-d", "-i", cwd=str(CRAFTY))
 
21
  INTERVAL = int(os.environ.get("BACKUP_INTERVAL", "3600"))
22
  KEEP = int(os.environ.get("BACKUP_KEEP", "48"))
23
  UPSTREAM = "https://127.0.0.1:8443"
24
+ SKIP = {"logs", "playitd.sock", "bedrock_server"}
25
 
26
  state = {"last_backup": None, "err": None, "restored": None, "tunnels": []}
27
  backup_lock = asyncio.Lock()
 
62
 
63
  BDS_CMD = "./bedrock_server"
64
  PROPS = {"server-name": "Kreatix Minecraft", "server-port": "19132", "server-portv6": "19133",
65
+ "level-name": "world", "online-mode": "true", "allow-list": "false"}
66
 
67
 
68
  def set_props(srv: Path):
 
209
  TMP.mkdir(parents=True, exist_ok=True)
210
  try:
211
  await crafty.cmd("save hold")
212
+ sid = await crafty.server_id()
213
+ for _ in range(30):
214
+ await asyncio.sleep(2)
215
+ await crafty.cmd("save query")
216
+ await asyncio.sleep(1)
217
+ logs = (await crafty.req("GET", f"/api/v2/servers/{sid}/logs?raw=true")).get("data") or []
218
+ if any("ready to be copied" in l for l in logs[-5:]):
219
+ break
220
  await asyncio.to_thread(make_archive, path)
221
  finally:
222
  await crafty.cmd("save resume")
 
373
  subprocess.run(f"cp -r {CRAFTY}/app/config_original/* {CRAFTY}/app/config/", shell=True)
374
  shutil.copy(CRAFTY / "app" / "config_original" / "version.json", CRAFTY / "app" / "config" / "version.json")
375
  for d in (CRAFTY / "servers").iterdir():
376
+ if (d / "server.properties").exists():
377
+ shutil.copy2(APP / "template" / "bedrock" / "bedrock_server", d / "bedrock_server")
378
  (d / "bedrock_server").chmod(0o755)
379
  set_props(d)
380
  cp = await asyncio.create_subprocess_exec(str(CRAFTY / ".venv/bin/python"), "main.py", "-d", "-i", cwd=str(CRAFTY))