Fix crashes

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "reoserv"
-version = "1.15.0"
+version = "1.16.0"
 authors = ["Richard Leek <richard@richardleek.com>"]
 edition = "2024"
 description = "The rust powered endless online server emulator"
@@ -47,9 +47,10 @@ evalexpr = "13.1"
 duration-str = "0.21"
 version-compare = "0.2"
 mail-send = "0.5"
-tokio-tungstenite = "0.28"
+tokio-tungstenite = "0.29"
 hex = "0.4"
-rusqlite = { version = "0.38.0", features = ["bundled"] }
+rusqlite = { version = "0.39", features = ["bundled"] }
+regex = "1.12.3"
 
 [target.'cfg(windows)'.build-dependencies]
 winres = "0.1"

Dockerfile

@@ -30,7 +30,7 @@ RUN addgroup --gid 1000 reoserv && \
 WORKDIR /reoserv
 
 COPY --from=builder /app/target/release/reoserv ./
-COPY README.md LICENSE.txt install.mysql.sql install.sqlite.sql migrate-schema.sql ./
+COPY README.md LICENSE.txt ./
 COPY config ./config
 COPY data ./data
 

README.md

@@ -43,17 +43,13 @@ Reoserv supports both MySQL/MariaDB and SQLite.
     - For MySQL/MariaDB, set `host`, `port`, `name`, `username`, and `password`.
     - For SQLite, set `name` (the server will use `<name>.db` in the working directory).
 
-3. Install the database schema:
+3. Start the server normally. It will create the migration log table and apply any missing migrations from `data/migrations/` automatically:
     ```sh
-    ./reoserv --install
+    cargo run
     ```
 
 > [!WARNING]
-> If you are upgrading from an older schema version, run migrations before starting the server:
-> ```sh
-> ./reoserv --migrate
-> ```
-> Back up your database first. This is especially important if your schema still uses legacy tables such as `Bank` instead of `character_bank`.
+> Back up your database first before upgrading an older installation. Startup now applies pending migrations automatically, including legacy schema transitions.
 
 4. If you choose MySQL/MariaDB and are using the provided Compose setup, start only the database service with:
     ```sh
@@ -80,16 +76,10 @@ Build/start the stack:
 docker compose up -d --build
 ```
 
-Install schema in the container:
+Start the server in the container to let startup migrations create or upgrade the schema:
 
 ```sh
-docker compose run --rm reoserv ./reoserv --install
-```
-
-For upgrades, run migrations in the container:
-
-```sh
-docker compose run --rm reoserv ./reoserv --migrate
+docker compose run --rm reoserv ./reoserv
 ```
 
 ## Start the server

config/Config.toml

@@ -191,6 +191,9 @@ spike_damage = 0.2
 # Show drops to deep client players when using #item and #npc command
 info_reveals_drops = true
 
+# How often character usage increments in seconds
+usage_rate = 60
+
 [bard]
 
 # Graphic IDs of weapons that are valid instruments
@@ -232,6 +235,8 @@ max_items = 250
 
 [character]
 
+min_name_length = 3
+
 # Should be between 12 and 14
 max_name_length = 12
 

install.mysql.sql → data/migrations/0001-bootstrap.mysql.sql

@@ -1,3 +1,5 @@
+-- reoserv: skip-if-table-exists=accounts
+
 CREATE TABLE
     IF NOT EXISTS `accounts` (
         `id` INTEGER NOT NULL AUTO_INCREMENT,
@@ -205,4 +207,4 @@ CREATE INDEX IF NOT EXISTS `idx_character_spells_character_id` ON `character_spe
 
 CREATE INDEX IF NOT EXISTS `idx_bans_account_id` ON `bans` (`account_id`);
 
-CREATE INDEX IF NOT EXISTS `idx_bans_ip` ON `bans` (`ip`);
+CREATE INDEX IF NOT EXISTS `idx_bans_ip` ON `bans` (`ip`);

install.sqlite.sql → data/migrations/0001-bootstrap.sqlite.sql

@@ -1,3 +1,5 @@
+-- reoserv: skip-if-table-exists=accounts
+
 CREATE TABLE
     IF NOT EXISTS `accounts` (
         `id` INTEGER PRIMARY KEY,
@@ -198,4 +200,4 @@ CREATE INDEX IF NOT EXISTS `idx_character_spells_character_id` ON `character_spe
 
 CREATE INDEX IF NOT EXISTS `idx_bans_account_id` ON `bans` (`account_id`);
 
-CREATE INDEX IF NOT EXISTS `idx_bans_ip` ON `bans` (`ip`);
+CREATE INDEX IF NOT EXISTS `idx_bans_ip` ON `bans` (`ip`);

migrate-schema.sql → data/migrations/0002-legacy-migrate.sql

@@ -1,3 +1,5 @@
+-- reoserv: skip-if-table-missing=Account
+
 INSERT INTO
     `accounts` (
         `id`,
@@ -293,4 +295,4 @@ DROP TABLE IF EXISTS `GuildRank`;
 
 DROP TABLE IF EXISTS `Guild`;
 
-DROP TABLE IF EXISTS `Account`;
+DROP TABLE IF EXISTS `Account`;

data/migrations/0003-unique-character-name.sql

@@ -0,0 +1 @@
+CREATE UNIQUE INDEX IF NOT EXISTS `characters_name_unique` ON `characters` (`name`);

dist-workspace.toml

@@ -15,9 +15,6 @@ include = [
     "data",
     "README.md",
     "LICENSE.txt",
-    "install.mysql.sql",
-    "install.sqlite.sql",
-    "migrate-schema.sql",
 ]
 # Target platforms to build apps for (Rust target-triple syntax)
 targets = [

src/character.rs

@@ -103,7 +103,7 @@ pub struct Character {
     pub bank: Vec<Item>,
     pub trade_items: Vec<Item>,
     pub spells: Vec<Spell>,
-    pub logged_in_at: Option<DateTime<Utc>>,
+    pub usage_ticks: i32,
     pub quests: Vec<QuestProgress>,
     pub captcha_open: bool,
     pub warp_suck_ticks: i32,