latchup/rc3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix Exitroom cellar/01

Browse Source
This commit is contained in:
Stephan Messlinger 2021-02-16 04:22:04 +01:00
parent d7a22d84f2
commit cd9ca9500f
16 changed files with 43 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
maps/ir/cellar.json
View File

@ -157,7 +157,7 @@
{ {
"name":"exitUrl", "name":"exitUrl",
"type":"string", "type":"string",
"value":"cellar\/01\/01.json#start" "value":"cellar\/01\/01.php#start"
}], }],
"type":"tilelayer", "type":"tilelayer",
"visible":true, "visible":true,

4
maps/ir/cellar/01/.htaccess
View File

@ -4,7 +4,5 @@
RewriteEngine On RewriteEngine On
# replace name.number.php --> name.php # replace name.number.php --> name.php
#RewriteRule ^(.+)\.\d+\.php$ $1.php RewriteRule ^(.+)\.\d+\.php$ $1.php
# replace name.number.php --> uncache.php?taget=name
RewriteRule ^(.+)\.\d+\.php$ uncache.php?target=$1

2
maps/ir/cellar/01/01.json
View File

@ -229,7 +229,7 @@
{ {
"name":"playAudio", "name":"playAudio",
"type":"string", "type":"string",
"value":"switch.mp3" "value":"switch.php"
}], }],
"type":"tilelayer", "type":"tilelayer",
"visible":true, "visible":true,

6
maps/ir/cellar/01/01.php
View File

@ -28,7 +28,11 @@ file_put_contents("$sub"."/01_closed.json", $data);
$data = file_get_contents("01.json"); $data = file_get_contents("01.json");
$data = str_replace("01.php#", "$sub"."/"."01.php#", $data); $data = str_replace("01.php#", "$sub"."/"."01.php#", $data);
header("Expires: 0"); // Patch php filenames with timestamps to defeat cache
// destination.php --> destination.number.php
$tstamp = round(microtime(true)*100); # 0.01 sec resolution
$data = str_replace(".php", ".".$tstamp.".php", $data);
header('Content-type: application/json'); header('Content-type: application/json');
echo($data); echo($data);
exit; exit;

2
maps/ir/cellar/01/01_closed.json
View File

@ -229,7 +229,7 @@
{ {
"name":"playAudio", "name":"playAudio",
"type":"string", "type":"string",
"value":"switch.mp3" "value":"switch.php"
}], }],
"type":"tilelayer", "type":"tilelayer",
"visible":true, "visible":true,

6
maps/ir/cellar/01/01_sub.php
View File

@ -7,7 +7,11 @@ $switch = $state["switch"];
# Load open/closed level depending on switch # Load open/closed level depending on switch
$data = file_get_contents( $switch ? "01.json" : "01_closed.json"); $data = file_get_contents( $switch ? "01.json" : "01_closed.json");
header("Expires: 0"); // Patch php filenames with timestamps to defeat cache
// destination.php --> destination.number.php
$tstamp = round(microtime(true)*100); # 0.01 sec resolution
$data = str_replace(".php", ".".$tstamp.".php", $data);
header('Content-type: application/json'); header('Content-type: application/json');
echo($data); echo($data);
exit; exit;

5
maps/ir/cellar/01/switch.php
View File

@ -2,5 +2,10 @@
$state = json_decode(file_get_contents("state.json"), true); $state = json_decode(file_get_contents("state.json"), true);
$state["switch"] = 1; $state["switch"] = 1;
file_put_contents("state.json", json_encode($state)); file_put_contents("state.json", json_encode($state));
# Load current level and patch exits to target the copy
$data = file_get_contents("switch.mp3");
header('Content-type: audio/mpeg');
echo($data);
exit; exit;
?> ?>

8
maps/ir/cellar/01/testcookie.php
View File

@ -1,8 +0,0 @@
<?php
if (isset($_COOKIE["TestCookie"]))
echo "TestCookie=".$_COOKIE["TestCookie"];
$cookieval = "cookie_".time();
setcookie("TestCookie", $cookieval, time()+3600*24);
exit;
?>

39
maps/ir/cellar/01/uncache.php
View File

@ -1,39 +0,0 @@
<?php
// Workadventure cache destroyer
// URL rewrite rule calls us with the original filename in URL paramter "target"
if (!isset($_GET['target'])) {
echo("No target");
exit;
}
$target = $_GET["target"];
if (file_exists($target.".php"))
{
// If a PHP file target.php exists:
// Run that file and capture its output
ob_start();
include $target.".php";
ob_end_flush();
}
else
{
// If no PHP file target.php exists:
// Load contents from target.json
if (!file_exists($target.".json"))
{
echo($target.".json"." not found.");
exit;
}
$data = str_replace(".php#", ".".$tstamp.".php#", $data); // Patch php-exits to prevent caching
}
// Replace map exit names with timestamps:
// destination.php#start --> destination.number.php#start
$tstamp = round(microtime(true)*100); # 0.01 sec resolution
$data = str_replace(".php#", ".".$tstamp.".php#", $data); // Patch php-exits to prevent caching
header("Expires: 0");
header('Content-type: application/json');
echo($data);
exit;
?>

4
maps/ir/gmaze/.htaccess
View File

@ -4,7 +4,5 @@
RewriteEngine On RewriteEngine On
# replace name.number.php --> name.php # replace name.number.php --> name.php
#RewriteRule ^(.+)\.\d+\.php$ $1.php RewriteRule ^(.+)\.\d+\.php$ $1.php
# replace name.number.php --> uncache.php?taget=name
RewriteRule ^(.+)\.\d+\.php$ uncache.php?target=$1

1
maps/ir/gmaze/gmaze.php
View File

@ -8,7 +8,6 @@ exec("python genmaze.py ".$name);
$data = file_get_contents($name); $data = file_get_contents($name);
$data = str_replace(".php#", ".".$tstamp.".php#", $data); // Patch php-exits to prevent caching $data = str_replace(".php#", ".".$tstamp.".php#", $data); // Patch php-exits to prevent caching
header("Expires: 0");
header('Content-type: application/json'); header('Content-type: application/json');
echo($data); echo($data);
exit; exit;

1
maps/ir/gmaze/left_old.php → maps/ir/gmaze/left.php
View File

@ -3,7 +3,6 @@ $tstamp = round(microtime(true)*100); // 0.01 sec resolution
$data = file_get_contents('left.json'); $data = file_get_contents('left.json');
$data = str_replace(".php#", ".".$tstamp.".php#", $data); // Patch php-exits to prevent caching $data = str_replace(".php#", ".".$tstamp.".php#", $data); // Patch php-exits to prevent caching
header("Expires: 0");
header('Content-type: application/json'); header('Content-type: application/json');
echo($data); echo($data);
exit; exit;

1
maps/ir/gmaze/right_old.php → maps/ir/gmaze/right.php
View File

@ -2,7 +2,6 @@
$data = file_get_contents('right.json'); $data = file_get_contents('right.json');
$tstamp = round(microtime(true)*100); # 0.01 sec resolution $tstamp = round(microtime(true)*100); # 0.01 sec resolution
$data = str_replace(".php#", ".".$tstamp.".php#", $data); // Patch php-exits to prevent caching $data = str_replace(".php#", ".".$tstamp.".php#", $data); // Patch php-exits to prevent caching
header("Expires: 0");
header('Content-type: application/json'); header('Content-type: application/json');
echo($data); echo($data);
exit; exit;

16
maps/ir/gmaze/uncache.php
View File

@ -2,36 +2,36 @@
// Workadventure cache destroyer // Workadventure cache destroyer
// URL rewrite rule calls us with the original filename in URL paramter "target" // URL rewrite rule calls us with the original filename in URL paramter "target"
if (!isset($_GET['target'])) { if (!isset($_GET['target'])) {
echo("No target"); echo("No target");
exit; exit;
} }
$target = $_GET["target"]; $target = $_GET["target"];
if (file_exists($target.".php")) if (file_exists($target.".php")) {
{
// If a PHP file target.php exists: // If a PHP file target.php exists:
// Run that file and capture its output // Run that file and capture its output
ob_start(); ob_start();
include $target.".php"; include $target.".php";
ob_end_flush(); ob_end_flush();
} }
else else {
{
// If no PHP file target.php exists: // If no PHP file target.php exists:
// Load contents from target.json // Load contents from target.json
if (!file_exists($target.".json")) if (file_exists($target.".json"))
{ $data = file_get_contents($target.".json");
else {
echo($target.".json"." not found."); echo($target.".json"." not found.");
exit; exit;
} }
} }
// Replace map exit names with timestamps: // Replace map exit names with timestamps:
// destination.php#start --> destination.number.php#start // destination.php#start --> destination.number.php#start
$tstamp = round(microtime(true)*100); # 0.01 sec resolution $tstamp = round(microtime(true)*100); # 0.01 sec resolution
$data = str_replace(".php#", ".".$tstamp.".php#", $data); // Patch php-exits to prevent caching $data = str_replace(".php#", ".".$tstamp.".php#", $data); // Patch php-exits to prevent caching
header("Expires: 0");
header('Content-type: application/json'); header('Content-type: application/json');
echo($data); echo($data);
exit; exit;

24
maps/ir/ir.tiled-session
View File

@ -86,10 +86,10 @@
}, },
"cellar.json": { "cellar.json": {
"scale": 1.5, "scale": 1.5,
"selectedLayer": 3, "selectedLayer": 9,
"viewCenter": { "viewCenter": {
"x": 2047.6666666666665, "x": 3826.333333333333,
"y": 127.66666666666666 "y": 127.66666666666669
} }
}, },
"cellar.json#cija": { "cellar.json#cija": {
@ -100,7 +100,7 @@
}, },
"cellar/01/01.json": { "cellar/01/01.json": {
"scale": 1, "scale": 1,
"selectedLayer": 0, "selectedLayer": 10,
"viewCenter": { "viewCenter": {
"x": 553.5, "x": 553.5,
"y": 550.5 "y": 550.5
@ -111,7 +111,7 @@
}, },
"cellar/01/01_closed.json": { "cellar/01/01_closed.json": {
"scale": 0.8465435606060606, "scale": 0.8465435606060606,
"selectedLayer": 0, "selectedLayer": 12,
"viewCenter": { "viewCenter": {
"x": 527.4388947927736, "x": 527.4388947927736,
"y": 401.0425639017842 "y": 401.0425639017842
@ -190,7 +190,7 @@
"selectedLayer": 6, "selectedLayer": 6,
"viewCenter": { "viewCenter": {
"x": 511.0390289839908, "x": 511.0390289839908,
"y": 527.0607931359214 "y": 527.61326776185
} }
}, },
"gmaze/gmaze.json#cija": { "gmaze/gmaze.json#cija": {
@ -245,8 +245,8 @@
"scale": 1.5, "scale": 1.5,
"selectedLayer": 6, "selectedLayer": 6,
"viewCenter": { "viewCenter": {
"x": 207.66666666666663, "x": 207.66666666666666,
"y": 208 "y": 208.3333333333333
} }
}, },
"gmaze/right.json#cija": { "gmaze/right.json#cija": {
@ -435,8 +435,8 @@
"scale": 0.33, "scale": 0.33,
"selectedLayer": 10, "selectedLayer": 10,
"viewCenter": { "viewCenter": {
"x": 883.3333333333335, "x": 1022.7272727272727,
"y": 883.3333333333333 "y": 512.121212121212
} }
}, },
"lobby.json#mapUtilities": { "lobby.json#mapUtilities": {
@ -780,8 +780,8 @@
"scale": 1, "scale": 1,
"selectedLayer": 8, "selectedLayer": 8,
"viewCenter": { "viewCenter": {
"x": 288.5, "x": 287.5,
"y": 288.5 "y": 288
} }
}, },
"warp.json#ir_logo_set": { "warp.json#ir_logo_set": {

9
rc3_notes.md
View File

@ -162,20 +162,13 @@
* Workaround: Dynamische einamalige Dateinamen für Maps * Workaround: Dynamische einamalige Dateinamen für Maps
* Nachteil: Jeder Spieler bekommt eine andere Map, kein Multiplayer mehr * Nachteil: Jeder Spieler bekommt eine andere Map, kein Multiplayer mehr
* Funktioniert nur für Maps, nicht für Audio-Events * Funktioniert nur für Maps, nicht für Audio-Events
* Implementierung A: * Implementierung:
(1) Wenn eine Karte map.php aufgerufen wird: (1) Wenn eine Karte map.php aufgerufen wird:
* Lade map.json * Lade map.json
* Ersetze alle Exit-URLs der Form dest.php#start --> dest.timestamp.php#start * Ersetze alle Exit-URLs der Form dest.php#start --> dest.timestamp.php#start
(dest.json wird so gelassen, damit man wieder in Multiplayer-Maps zurück kann). (dest.json wird so gelassen, damit man wieder in Multiplayer-Maps zurück kann).
(2) URL-Rewrite rule via .htaccess: Entferne timestamp (2) URL-Rewrite rule via .htaccess: Entferne timestamp
RewriteRule ^(.+)\.\d+\.php$ $1.php RewriteRule ^(.+)\.\d+\.php$ $1.php
* Implementierung B (timestamp-patching ausgelagert in eigenes file):
(1) URL-Rewrite: Entferne timestamp und übergebe Mapnamen an uncache.php via URL-Parameter
RewriteRule ^(.+)\.\d+\.php$ uncache.php?target=$1
(2) In uncache.php:
* Wenn es target.php gibt, dann rufe diese auf und fange ihren output ab.
* sonst lade target.json
* Patch Exit-URLS mit timestamp.
* Cache deaktivieren Engineseitig: * Cache deaktivieren Engineseitig: