diff --git a/app/index.html b/app/index.html index 4198c88..6826610 100644 --- a/app/index.html +++ b/app/index.html @@ -677,14 +677,24 @@ return choices; }; - // servers reachable by strangers ignore these choices unless told otherwise. + // servers reachable by strangers ignore these choices unless told + // otherwise; member or not is the player's choice on a server that says + // so (membershipChoice), the other account types stay locked there. + const MEMBERSHIP_TYPES = ["", "0", "2"]; const showWhetherChoicesApply = flashVars => { const honoured = flashVars.loginChoices !== false; + const membership = honoured || flashVars.membershipChoice === true; for (const field of document.querySelectorAll("[data-choice]")) { - field.disabled = !honoured; + field.disabled = field.id === "account-type" ? !membership : !honoured; + } + for (const option of $("account-type").options) { + option.disabled = !honoured && !MEMBERSHIP_TYPES.includes(option.value); + } + if ($("account-type").selectedOptions[0] && $("account-type").selectedOptions[0].disabled) { + $("account-type").value = ""; } $("choices-hint").hidden = honoured; - $("choices-hint").textContent = honoured ? "" : "Locked by this server."; + $("choices-hint").textContent = honoured ? "" : membership ? "Developer and Guide are locked by this server." : "Locked by this server."; }; const getJson = async (url, options) => { @@ -946,6 +956,7 @@ const gamePort = flashVars.smartfoxPort; delete flashVars.loginChoices; + delete flashVars.membershipChoice; Object.assign(flashVars, { smartfoxServer: player.body.game_server || flashVars.smartfoxServer, blueboxServer: player.body.game_server || flashVars.blueboxServer, @@ -1401,7 +1412,6 @@ if (latest) { $("username").value = latest.username; $("remember").checked = true; - $("password").placeholder = "Remembered: leave empty"; } checkServer(); // the first answer includes making the connection; the second is the ping. diff --git a/app/package.json b/app/package.json index d4a0065..e620502 100644 --- a/app/package.json +++ b/app/package.json @@ -1,7 +1,7 @@ { "name": "aj-private-client", "productName": "Burrow", - "version": "1.1.0", + "version": "1.1.1", "description": "The client for the Burrow private server", "main": "boot.js", "license": "UNLICENSED" diff --git a/flash/libpepflashplayer.so b/flash/libpepflashplayer.so new file mode 100644 index 0000000..a01920a Binary files /dev/null and b/flash/libpepflashplayer.so differ diff --git a/flash/manifest.json b/flash/manifest.json new file mode 100644 index 0000000..4073d9d --- /dev/null +++ b/flash/manifest.json @@ -0,0 +1,50 @@ +{ + "description": "Pepper Flash Player", + "name": "Flapper", + "version": "32.0.0.330", + "x-flapper-revision": "100864", + "x-ppapi-arch": "x64", + "x-ppapi-os": "linux", + "x-ppapi-required-interfaces": [ + "PPB_AudioConfig;1.1|PPB_AudioConfig;1.0", + "PPB_AudioInput(Dev);0.4|PPB_AudioInput(Dev);0.3", + "PPB_Audio;1.1|PPB_Audio;1.0", + "PPB_BrowserFont_Trusted;1.0", + "PPB_Buffer(Dev);0.4", + "PPB_CharSet(Dev);0.4", + "PPB_Core;1.0", + "PPB_Crypto(Dev);0.1", + "PPB_CursorControl(Dev);0.4", + "PPB_FileChooser(Dev);0.6|PPB_FileChooser(Dev);0.5", + "PPB_FileChooserTrusted;0.6|PPB_FileChooserTrusted;0.5", + "PPB_FileRef;1.2|PPB_FileRef;1.1|PPB_FileRef;1.0", + "PPB_Flash_Clipboard;5.1|PPB_Flash_Clipboard;5.0|PPB_Flash_Clipboard;4.0", + "PPB_Flash_File_FileRef;2", + "PPB_Flash_File_ModuleLocal;3", + "PPB_Flash_FontFile;0.2|PPB_Flash_FontFile;0.1|PPB_PDF;1", + "PPB_FlashFullscreen;1.0|PPB_FlashFullscreen;0.1", + "PPB_Flash;13.0|PPB_Flash;12.6|PPB_Flash;12.5|PPB_Flash;12.4", + "PPB_Flash_Menu;0.2", + "PPB_Graphics2D;1.1|PPB_Graphics2D;1.0", + "PPB_Graphics3D;1.0", + "PPB_ImageData;1.0", + "PPB_IMEInputEvent(Dev);0.2|PPB_IMEInputEvent(Dev);0.1", + "PPB_InputEvent;1.0", + "PPB_Instance;1.0", + "PPB_Memory(Dev);0.1", + "PPB_NetAddress_Private;1.1|PPB_NetAddress_Private;1.0|PPB_NetAddress_Private;0.1", + "PPB_OpenGLES2ChromiumMapSub;1.0|PPB_OpenGLES2ChromiumMapSub(Dev);1.0|PPB_GLESChromiumTextureMapping(Dev);0.1", + "PPB_OpenGLES2;1.0", + "PPB_TCPSocket_Private;0.5|PPB_TCPSocket_Private;0.4|PPB_TCPSocket_Private;0.3", + "PPB_TextInput(Dev);0.2|PPB_TextInput(Dev);0.1", + "PPB_UDPSocket_Private;0.4|PPB_UDPSocket_Private;0.3", + "PPB_URLLoader;1.0", + "PPB_URLLoaderTrusted;0.3", + "PPB_URLRequestInfo;1.0", + "PPB_URLResponseInfo;1.0", + "PPB_URLUtil(Dev);0.7|PPB_URLUtil(Dev);0.6", + "PPB_Var;1.2|PPB_Var;1.1|PPB_Var;1.0", + "PPB_VideoCapture(Dev);0.3", + "PPB_View;1.2|PPB_View;1.1|PPB_View;1.0" + ] +} diff --git a/flash/pepflashplayer.dll b/flash/pepflashplayer.dll new file mode 100644 index 0000000..7d43b9b Binary files /dev/null and b/flash/pepflashplayer.dll differ diff --git a/tools/build-mac.sh b/tools/build-mac.sh index dcc800c..d498618 100644 --- a/tools/build-mac.sh +++ b/tools/build-mac.sh @@ -21,6 +21,14 @@ done [ -d "$flash" ] || { echo "no flash plugin at $flash (BUILDING.md says where to get it)" >&2; exit 1; } dist=$here/dist + +# what the download page says each installer is: a line each in dist/RELEASES +# ("Burrow-Setup.exe 1.1.1 2026-10-15"), sent up with the installers +note_release() { + local list=$dist/RELEASES + { awk -v file="$1" '$1 != file' "$list" 2>/dev/null || true; echo "$1 $2 $(date -u +%F)"; } > "$list.new" + mv "$list.new" "$list" +} work=$(mktemp -d) mkdir -p "$dist" cd "$work" @@ -62,3 +70,4 @@ ln -s /Applications image/Applications rm -f "$dist/Burrow-macos.dmg" hdiutil create -volname Burrow -srcfolder image -ov -format UDZO "$dist/Burrow-macos.dmg" shasum -a 256 "$dist/Burrow-macos.dmg" +note_release Burrow-macos.dmg "$(sed -n 's/.*"version": *"\([^"]*\)".*/\1/p' "$here/app/package.json")" diff --git a/tools/build.sh b/tools/build.sh index 7b26872..0406ab2 100644 --- a/tools/build.sh +++ b/tools/build.sh @@ -37,6 +37,14 @@ work=$(mktemp -d) trap 'rm -rf "$work"' EXIT mkdir -p "$dist" +# what the download page says each installer is: a line each in dist/RELEASES +# ("Burrow-Setup.exe 1.1.1 2026-10-15"), sent up with the installers +note_release() { + local list=$dist/RELEASES + { awk -v file="$1" '$1 != file' "$list" 2>/dev/null || true; echo "$1 $2 $(date -u +%F)"; } > "$list.new" + mv "$list.new" "$list" +} + # the app as players get it, with the server's address cp -r "$here/app" "$work/app" if [ -n "$server" ]; then @@ -91,6 +99,7 @@ for target in "${targets[@]}"; do nsis=$(cd "$here/installer" && node -e 'require("app-builder-lib/out/toolsets/windows.js").getMakeNsisPath().then(r => console.log(r.path))') NSISDIR=$(dirname "$(dirname "$nsis")") "$nsis" -V2 -DVERSION="$version" -DSOURCE="$win" -DOUTFILE="$dist/Burrow-Setup.exe" \ -DICON="$here/tools/icon.ico" -DFILES="$work/files.nsh" "$here/installer/burrow.nsi" + note_release Burrow-Setup.exe "$version" ;; linux) need "$here/electron/electron" @@ -100,6 +109,9 @@ for target in "${targets[@]}"; do chmod 755 "$work/electron/electron" "$work/electron/chrome-sandbox" builder "$work/electron" --linux --x64 cp "$work/out/Burrow-x86_64.AppImage" "$work/out/burrow_amd64.deb" "$work/out/burrow.x86_64.rpm" "$dist/" + for file in Burrow-x86_64.AppImage burrow_amd64.deb burrow.x86_64.rpm; do + note_release "$file" "$version" + done ;; esac rm -rf "$work/out" diff --git a/tools/publish-public.sh b/tools/publish-public.sh index dcb1440..3aaa4b0 100644 --- a/tools/publish-public.sh +++ b/tools/publish-public.sh @@ -7,8 +7,8 @@ # no markdown file of any kind goes public. the public repository has a # history of its own: nothing of this one's # history goes there, so a file that was ever committed here and is private -# never shows up in an old public commit. its .gitignore names the private -# paths too, so they are not added there by hand either. +# never shows up in an old public commit. the public repository's own files +# (its README, .gitignore and licence, written there) are left as they are. set -euo pipefail name=burrow-client @@ -17,6 +17,9 @@ remote=git@github.com:burrow-dev/$name.git # (Electron, the Flash plugin, the builds) private=() +# the public repository's own: never replaced or removed from here +public_own=(README.md .gitignore LICENSE) + here=$(cd "$(dirname "$0")/.." && pwd) public=${BURROW_PUBLIC_DIR:-$HOME/burrow-public/$name} push=1 @@ -56,21 +59,30 @@ if [ -n "$leaked" ]; then exit 1 fi -{ - cat "$work/.gitignore" - printf '\n# kept in the private repository, never here\n' - printf '*.md\n' - for path in "${private[@]+"${private[@]}"}"; do - printf '/%s\n' "$path" - done -} > "$work/.gitignore.public" -mv "$work/.gitignore.public" "$work/.gitignore" +rm -f "$work/.gitignore" -# the public tree becomes exactly this -find "$public" -mindepth 1 -maxdepth 1 ! -name .git -exec rm -rf {} + +# start from what is on github: changes made there are kept +if git -C "$public" fetch -q origin main 2>/dev/null; then + git -C "$public" reset -q --hard origin/main +fi + +# the public tree becomes exactly this, beside the public repository's own +keep=(! -name .git) +for name in "${public_own[@]}"; do + keep+=(! -name "$name") + rm -rf "${work:?}/$name" +done +find "$public" -mindepth 1 -maxdepth 1 "${keep[@]}" -exec rm -rf {} + cp -a "$work/." "$public/" cd "$public" git add -A +# its .gitignore must not hold back a file meant to go public +missing=$(cd "$work" && find . -type f | sed 's|^\./||' | sort | comm -23 - <(git -C "$public" ls-files --cached | sort)) +if [ -n "$missing" ]; then + echo "refused: the public .gitignore holds these back ($(echo "$missing" | wc -l) files), e.g.:" >&2 + echo "$missing" | head -5 >&2 + exit 1 +fi if git diff --cached --quiet; then echo "the public copy is already up to date" exit 0