| TITLE | &1 | ForEach-Object {
- $str = "$_"
- if ($_.GetType() -eq [System.Management.Automation.ErrorRecord]) {
- $str = $str.TrimEnd("`r`n")
- }
- $str | Out-File -Encoding utf8 -Append $Log
- $str | Out-Host
-}
+
+& $PythonExe -u $args
+
exit $LastExitCode
diff --git a/tools/ci/ci_config.txt b/tools/ci/ci_config.txt
index e7e05a8fe21..b7a9a95df65 100644
--- a/tools/ci/ci_config.txt
+++ b/tools/ci/ci_config.txt
@@ -2,7 +2,7 @@ SQL_ENABLED
SQL_ADDRESS 127.0.0.1
SQL_USER root
SQL_PORT 3306
-SQL_PASSWORD
+SQL_PASSWORD root
SQL_DATABASE ss13_ci
SQL_SERVER_PREFIX rp_
diff --git a/tools/ci/config.toml b/tools/ci/config.toml
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tools/ci/install/install_flyway.sh b/tools/ci/install/install_flyway.sh
new file mode 100644
index 00000000000..7c0d1973038
--- /dev/null
+++ b/tools/ci/install/install_flyway.sh
@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+source dependencies.sh
+
+if [ -d "~/flyway/flyway-$FLYWAY_VERSION" ]; then
+ echo "Using cached flyway $FLYWAY_VERSION."
+else
+ echo "Pulling flyway $FLYWAY_VERSION."
+ rm -rf ~/flyway/flyway-$FLYWAY_VERSION
+ mkdir -p ~/flyway
+ cd ~/flyway
+ curl "https://download.red-gate.com/maven/release/com/redgate/flyway/flyway-commandline/$FLYWAY_VERSION/flyway-commandline-$FLYWAY_VERSION-linux-x64.tar.gz" | tar -xvz
+ cd ~
+fi
diff --git a/tools/ci/run_server.sh b/tools/ci/run_server.sh
index da75f5597f7..1ff65243830 100755
--- a/tools/ci/run_server.sh
+++ b/tools/ci/run_server.sh
@@ -7,6 +7,7 @@ mkdir ci_test/data
#test config
cp tools/ci/ci_config.txt ci_test/config/config.txt
+cp tools/ci/config.toml ci_test/config/config.toml
cd ci_test
DreamDaemon citadel.dmb -close -trusted -verbose -params "log-directory=ci"
diff --git a/tools/deploy.sh b/tools/deploy.sh
index ac0a4892adc..baa4de5b529 100755
--- a/tools/deploy.sh
+++ b/tools/deploy.sh
@@ -11,6 +11,7 @@ fi
mkdir -p \
$1/_mapload \
+ $1/config.default \
$1/maps \
$1/icons \
$1/sound \
@@ -26,6 +27,8 @@ fi
cp citadel.dmb citadel.rsc $1/
# mapload: has basemap.dmm, runtime loaded
cp -r _mapload/* $1/_mapload/
+# default configs. self-explanatory.
+cp -r config.default/* $1/config.default/
# maps: map .dmms and potential assets, runtime loaded
cp -r maps/* $1/maps/
# icons: .dmi assets, runtime loaded
diff --git a/tools/requirements.txt b/tools/requirements.txt
index 032ffe66e72..adaf3cf43d9 100644
--- a/tools/requirements.txt
+++ b/tools/requirements.txt
@@ -1,6 +1,6 @@
-pygit2==1.7.2
-bidict==0.22.0
-Pillow==10.0.1
+pygit2==1.15
+bidict==0.23.1
+Pillow==11.0.0
# changelogs
PyYaml==6.0.1
diff --git a/tools/setup_dev_db/README.md b/tools/setup_dev_db/README.md
new file mode 100644
index 00000000000..486b901966c
--- /dev/null
+++ b/tools/setup_dev_db/README.md
@@ -0,0 +1,30 @@
+# Dev Database Setup Tool
+
+Requires Python 3.12+
+
+Sets up a database for use in development, automatically downloading a portable version of MariaDB and Flyway as needed.
+
+Only works on windows right now, if you're on linux you should know how to set up a database.
+
+## What this is not for.
+
+This is **not** for developing the database.
+
+This sounds counterintuitive, but this script pretty much just blindly runs migrations. If a migration fails, there's nothing it can do about it unless there's an undo migration (which is usually not the case).
+
+## WARNING
+
+**Do not, under any circumstances, use or attempt to modify this tool to run in production.**
+
+If you do, and you get breached / bad things happen, I will not provide any help or condolences. This is purely a dev tool. **It is the responsibility of the server owner to set up a proper production database and to maintain it.**
+
+## Defaults
+
+* The default root password is set to `password`.
+* The default database is not secured at all.
+
+## License
+
+This entire folder is under the MIT license.
+
+The bootstrap system used to run Python, however, is under AGPL, as it's from /tg/.
diff --git a/tools/setup_dev_db/invoke.py b/tools/setup_dev_db/invoke.py
new file mode 100644
index 00000000000..6737f5ac2e8
--- /dev/null
+++ b/tools/setup_dev_db/invoke.py
@@ -0,0 +1,160 @@
+import argparse;
+import codecs;
+import encodings;
+import io;
+import os;
+import subprocess;
+import signal;
+import sys;
+import time;
+import threading;
+
+keep_running: bool = True
+
+def on_interrupt(signo, frame):
+ global keep_running
+ keep_running = False
+ print("ctrl+C caught!")
+
+signal.signal(signal.SIGINT, on_interrupt)
+
+def log_message(source: str, string: str, end: str = "\n"):
+ print('%s: %s' % (source, string), end=end)
+ sys.stdout.flush()
+
+def thread_pipe_dump(source: str, pipe: io.TextIOWrapper):
+ while True:
+ for line in pipe.readlines():
+ log_message(source, line, end="")
+ time.sleep(0.001)
+
+if __name__ == "__main__":
+ argparser = argparse.ArgumentParser(
+ prog="setup.ps1",
+ usage="setup.ps1 --port [port] --dbname [dbname]",
+ )
+ argparser.add_argument("--mysqld", type=str)
+ argparser.add_argument("--mysql_admin", type=str)
+ argparser.add_argument("--flyway", type=str)
+ argparser.add_argument("--migrations", type=str)
+ argparser.add_argument("--dataDir", type=str)
+ argparser.add_argument("--port", required=False, default=3306, type=int)
+ argparser.add_argument("--dbname", required=False, default="ss13", type=str)
+ argparser.add_argument("--no_migrations", required=False, action="store_true", default=False)
+
+ # we slice it, as being invoked from bootstrap consumes this script's file path as the first arg
+ effective_args: list[str] = sys.argv[1:]
+
+ if len(effective_args) == 0:
+ argparser.print_help()
+ exit(1)
+
+ parsed_args = argparser.parse_args(effective_args)
+
+ PATH_TO_MYSQLD: str = parsed_args.mysqld
+ PATH_TO_MYSQL_ADMIN: str = parsed_args.mysql_admin
+ PATH_TO_FLYWAY: str = parsed_args.flyway
+ PATH_TO_MIGRATIONS: str = parsed_args.migrations
+ USE_DATADIR: str = parsed_args.dataDir
+ USE_PORT: int = parsed_args.port
+ USE_DATABASE: str = parsed_args.dbname
+
+ log_message("setup_dev_db", "WARNING: This is a very, very lazy Python app! Logs are not necessarily in order of occurence; the script is just a very, very dumb while(True) loop that is just jank enough to work. Do not use this for production")
+ log_message("setup_dev_db", 'Using port %d and setting up on database %s. Use --port and --dbname to override!' % (USE_PORT, USE_DATABASE))
+ log_message("setup_dev_db", 'Using data directory %s.' % (USE_DATADIR))
+ log_message("setup_dev_db", "Starting processes...")
+
+ log_message("setup_dev_db", "Starting mysqld...")
+ mysqld: subprocess.Popen | None = subprocess.Popen(
+ [
+ PATH_TO_MYSQLD,
+ '--datadir',
+ USE_DATADIR,
+ "--console",
+ ],
+ stdout=subprocess.PIPE,
+ stderr=subprocess.STDOUT,
+ text=True,
+ )
+ os.set_blocking(mysqld.stdout.fileno(), False)
+ mysqld_out_dump = threading.Thread(target=thread_pipe_dump, args=("mysqld-out", mysqld.stdout), daemon=True)
+ mysqld_out_dump.start()
+
+ log_message("setup_dev_db", "Creating database...")
+ create_db_run: subprocess.CompletedProcess = subprocess.run(
+ [
+ PATH_TO_MYSQL_ADMIN,
+ "--user=root",
+ '--password=password',
+ "create",
+ USE_DATABASE,
+ ],
+ stdout=subprocess.PIPE,
+ stderr=subprocess.STDOUT,
+ text=True,
+ )
+ log_message("mariadb_admin", create_db_run.stdout or "\n", end="")
+
+ flyway: subprocess.Popen | None = None
+ if not parsed_args.no_migrations:
+ log_message("setup_dev_db", "Starting flyway and migrating...")
+ flyway = subprocess.Popen(
+ [
+ PATH_TO_FLYWAY,
+ "-user=root",
+ "-password=password",
+ '-url=jdbc:mariadb://localhost:%d/%s' % (USE_PORT, USE_DATABASE),
+ '-locations=filesystem:%s' % (PATH_TO_MIGRATIONS),
+ "migrate",
+ ],
+ stdout=subprocess.PIPE,
+ stderr=subprocess.STDOUT,
+ text=True,
+ )
+ os.set_blocking(flyway.stdout.fileno(), False)
+ flyway_out_dump = threading.Thread(target=thread_pipe_dump, args=("flyway-out", flyway.stdout), daemon=True)
+ flyway_out_dump.start()
+
+
+ # main loop
+ while keep_running == True:
+ # pull outputs
+ polled: list[str]
+ exited: int | None
+
+ if mysqld != None:
+ exited = mysqld.poll()
+ if exited != None:
+ mysqld = None
+ log_message("setup_dev_db", 'mysqld exited with code %d' % (exited))
+
+ if flyway != None:
+ exited = flyway.poll()
+ if exited != None:
+ flyway = None
+ log_message("setup_dev_db", 'flyway exited with code %d' % (exited))
+
+ if flyway == None and mysqld == None:
+ keep_running = False
+
+ # "this is async right"
+ # "yeah"
+ # pulls the cover off
+ # "what the hell, this is just an infinite loop!"
+ time.sleep(0.001)
+
+ log_message("setup_dev_db", 'exiting...')
+
+ # exit mysqld and flyway
+ if mysqld != None:
+ mysqld.terminate()
+ if flyway != None:
+ flyway.terminate()
+
+ # block on mysqld/flyway exiting
+ if mysqld != None:
+ mysqld_exitcode: int | None = mysqld.wait()
+ log_message("setup_dev_db", 'mysqld exited with code %d' % (mysqld_exitcode))
+ if flyway != None:
+ flyway_exitcode: int | None = flyway.wait()
+ log_message("setup_dev_db", 'flyway exited with code %d' % (flyway_exitcode))
diff --git a/tools/setup_dev_db/setup.ps1 b/tools/setup_dev_db/setup.ps1
new file mode 100644
index 00000000000..b6712444cc4
--- /dev/null
+++ b/tools/setup_dev_db/setup.ps1
@@ -0,0 +1,85 @@
+function ExtractVersion {
+ param([string] $Path, [string] $Key)
+ foreach ($Line in Get-Content $Path) {
+ if ($Line.StartsWith("export $Key=")) {
+ return $Line.Substring("export $Key=".Length)
+ }
+ }
+ throw "Couldn't find value for $Key in $Path"
+}
+
+function ResolveMariaDBURL {
+ param([string] $Version)
+ return "https://mirror.rackspace.com/mariadb//mariadb-$Version/winx64-packages/mariadb-$Version-winx64.zip"
+}
+
+function ResolveFlywayURL {
+ param([string] $Version)
+ return "https://download.red-gate.com/maven/release/com/redgate/flyway/flyway-commandline/$Version/flyway-commandline-$Version-windows-x64.zip"
+}
+
+# Path is a /path/to/folder
+# Archive will be temporarily downloaded as /path/to/folder.zip
+function PullURLAndUnpack {
+ param([string] $URL, [string] $Path)
+ if(Test-Path "$Path.zip" -PathType Leaf) {
+ Remove-Item -Path "$Path.zip"
+ }
+ Write-Output "Pulling $URL to $Path.zip"
+ $ProgressPreference = 'SilentlyContinue'
+ Invoke-WebRequest `
+ "$URL" `
+ -OutFile "$Path.zip" `
+ -ErrorAction Stop
+ $ProgressPreference = 'Continue'
+ Write-Output "Expanding $Path.zip to $Path"
+ Expand-Archive "$Path.zip" -DestinationPath "$Path"
+}
+
+$ToolRoot = Split-Path $script:MyInvocation.MyCommand.Path
+
+$MARIADB_VERSION = ExtractVersion -Path "$ToolRoot/../../dependencies.sh" -Key "MARIADB_VERSION"
+$FLYWAY_VERSION = ExtractVersion -Path "$ToolRoot/../../dependencies.sh" -Key "FLYWAY_VERSION"
+
+$MARIADB_FOLDER = "$ToolRoot/.cache/mariadb/$MARIADB_VERSION"
+$MARIADB_BIN_FOLDER = "$MARIADB_FOLDER/mariadb-$MARIADB_VERSION-winx64/bin"
+$FLYWAY_FOLDER = "$ToolRoot/.cache/flyway/$FLYWAY_VERSION"
+
+$MYSQLD_PATH = "$MARIADB_BIN_FOLDER/mariadbd.exe"
+$MYSQLD_ADMIN_PATH = "$MARIADB_BIN_FOLDER/mariadb-admin.exe"
+$FLYWAY_PATH = "$FLYWAY_FOLDER/flyway-$FLYWAY_VERSION/flyway.cmd"
+
+# GET mariadb IF NOT EXISTS
+
+if(!(Test-Path $MYSQLD_PATH -PathType Leaf)) {
+ $MARIADB_URL = ResolveMariaDBURL $MARIADB_VERSION
+ PullURLAndUnpack $MARIADB_URL $MARIADB_FOLDER
+ if(!(Test-Path $MYSQLD_PATH -PathType Leaf)) {
+ Write-Error "Failed to find '$MYSQLD_PATH' after unpacking."
+ exit 1
+ }
+}
+
+# GET flyway IF NOT EXISTS
+
+if(!(Test-Path $FLYWAY_PATH -PathType Leaf)) {
+ $FLYWAY_URL = ResolveFlywayURL $FLYWAY_VERSION
+ PullURLAndUnpack $FLYWAY_URL $FLYWAY_FOLDER
+ if(!(Test-Path $FLYWAY_PATH -PathType Leaf)) {
+ Write-Error "Failed to find '$FLYWAY_PATH' after unpacking."
+ exit 1
+ }
+}
+
+# run database
+
+$DATABASE_DATA_DIR_RAW = "$ToolRoot/../../data/setup_dev_db"
+if(!(Test-Path $DATABASE_DATA_DIR_RAW -PathType Container)) {
+ New-Item $DATABASE_DATA_DIR_RAW -ItemType Directory
+ $DATABASE_DATA_DIR = Resolve-Path "$ToolRoot/../../data/setup_dev_db"
+ Write-Output "Bootstrapping database with data directory '$DATABASE_DATA_DIR'."
+ & $MARIADB_BIN_FOLDER/mariadb-install-db.exe -d $DATABASE_DATA_DIR -p password -D
+}
+$DATABASE_DATA_DIR = Resolve-Path "$ToolRoot/../../data/setup_dev_db"
+
+& $ToolRoot/../bootstrap/python_.ps1 $ToolRoot/invoke.py --dataDir $DATABASE_DATA_DIR --mysqld $MYSQLD_PATH --flyway $FLYWAY_PATH --migrations "../../sql/migrations" --mysql_admin $MYSQLD_ADMIN_PATH $args
|