From 1a2409c02a85be765893dbfee98d9621eb2220b0 Mon Sep 17 00:00:00 2001
From: OZAWA Sakuro <10973+sakuro@users.noreply.github.com>
Date: Thu, 23 Apr 2026 20:11:07 +0900
Subject: [PATCH 1/2] :sparkles: Add rcon exec and rcon eval commands (#87)

- Add `factorix rcon exec` to send a Factorio console command via RCon
- Add `factorix rcon eval` to evaluate a Lua script; reads from stdin when script argument is omitted
- sentinel_command: "/c" required for Factorio compatibility
---
 .rubocop.yml                                 |  4 +
 CHANGELOG.md                                 |  5 ++
 README.md                                    |  1 +
 doc/components/cli.md                        | 52 +++++++++++++
 doc/factorix.1                               | 43 +++++++++++
 factorix.gemspec                             |  1 +
 lib/factorix.rb                              |  8 ++
 lib/factorix/cli.rb                          |  2 +
 lib/factorix/cli/commands/rcon/eval.rb       | 43 +++++++++++
 lib/factorix/cli/commands/rcon/exec.rb       | 42 ++++++++++
 lib/factorix/errors.rb                       |  5 ++
 spec/factorix/cli/commands/rcon/eval_spec.rb | 80 ++++++++++++++++++++
 spec/factorix/cli/commands/rcon/exec_spec.rb | 63 +++++++++++++++
 13 files changed, 349 insertions(+)
 create mode 100644 lib/factorix/cli/commands/rcon/eval.rb
 create mode 100644 lib/factorix/cli/commands/rcon/exec.rb
 create mode 100644 spec/factorix/cli/commands/rcon/eval_spec.rb
 create mode 100644 spec/factorix/cli/commands/rcon/exec_spec.rb

diff --git a/.rubocop.yml b/.rubocop.yml
index 03a3013..b02e5cc 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -76,6 +76,10 @@ RSpec/IndexedLet:
     - '^error\d+$'    # Allow error1, error2, etc.
     - '^suggestion\d+$' # Allow suggestion1, suggestion2, etc.
 
+RSpec/SpecFilePathFormat:
+  CustomTransform:
+    RCon: rcon
+
 Style/HashEachMethods:
   Exclude:
     - lib/factorix/cli/commands/cache/stat.rb # cache.each is not Hash#each, it's Cache::Base#each
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 04647e1..830025f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 ## [Unreleased]
 
+### Added
+
+- Add `rcon exec` command to execute a Factorio console command via RCon (#87)
+- Add `rcon eval` command to evaluate a Lua script in a running Factorio server via RCon (#87)
+
 ## [0.12.0] - 2026-04-21
 
 ### Added
diff --git a/README.md b/README.md
index ff6bc0f..b8a4113 100644
--- a/README.md
+++ b/README.md
@@ -21,6 +21,7 @@ Factorix simplifies Factorio MOD management by providing:
 - **Blueprint Conversion**: Decode/encode Factorio blueprint strings to/from JSON
 - **MOD Portal Integration**: Upload new MODs or update existing ones, edit metadata
 - **Game Control**: Launch Factorio from the command line
+- **RCon**: Execute console commands and Lua scripts on a running Factorio server via RCon
 - **Game Download**: Download Factorio game files (alpha, expansion, demo, headless)
 - **Cross-platform Support**: Works on Windows, Linux, macOS, and WSL
 
diff --git a/doc/components/cli.md b/doc/components/cli.md
index 2366d4f..dbad239 100644
--- a/doc/components/cli.md
+++ b/doc/components/cli.md
@@ -571,6 +571,58 @@ Validate the structure of a MOD changelog.txt file.
 
 **Use case**: CI validation of changelog structure before release
 
+### RCon::Exec
+
+Execute a Factorio console command via RCon.
+
+**Requirements**: Factorio server must be running with RCon enabled.
+
+**Arguments**:
+- `command` (required) - Console command to execute (e.g. `/server-save`)
+
+**Options**:
+- `--host` - RCon host (default: from config, fallback `localhost`)
+- `--port` - RCon port (default: from config, fallback `27015`)
+- `--password` - RCon password (default: from config)
+
+**Configuration**: Connection settings can be set in the config file:
+```ruby
+config.rcon.host = "192.168.1.10"
+config.rcon.port = 25575
+config.rcon.password = "secret"
+```
+
+**Output**: Server response, if any. Empty responses are suppressed.
+
+**Errors**:
+- `RConConnectionError` - server unreachable
+- `RConAuthenticationError` - wrong password
+
+**Examples**:
+```bash
+factorix rcon exec /server-save
+factorix rcon exec --host 192.168.1.10 --port 25575 --password secret /server-save
+```
+
+### RCon::Eval
+
+Evaluate a Lua script in a running Factorio server via RCon. Wraps the script in `/c <script>` before sending.
+
+**Requirements**: Factorio server must be running with RCon enabled.
+
+**Arguments**:
+- `script` (optional) - Lua script to evaluate; reads from stdin if omitted
+
+**Options**: Same as `rcon exec` (`--host`, `--port`, `--password`)
+
+**Output**: Server response from `rcon.print(...)` calls, if any.
+
+**Examples**:
+```bash
+factorix rcon eval "rcon.print(game.tick)"
+echo "rcon.print(game.tick)" | factorix rcon eval
+```
+
 ### MOD::Settings::Restore
 
 Restore MOD settings from JSON format.
diff --git a/doc/factorix.1 b/doc/factorix.1
index fa4d77b..46c8e91 100644
--- a/doc/factorix.1
+++ b/doc/factorix.1
@@ -77,6 +77,49 @@ Remove expired entries only.
 .TP
 .BR \-\-older\-than =\fIAGE\fR
 Remove entries older than AGE (e.g., 30s, 5m, 2h, 7d).
+.SH RCON COMMANDS
+These commands connect to a running Factorio server via the Source RCON protocol.
+The server must be started with RCON enabled (e.g.
+.BR \-\-rcon\-port " and " \-\-rcon\-password
+flags).
+Connection settings can be configured in the Factorix config file under
+.BR config.rcon .
+.SS factorix rcon exec COMMAND
+Execute a Factorio console command via RCon.
+.TP
+.BR \-\-host =\fIVALUE\fR
+RCon host (default: config value or localhost).
+.TP
+.BR \-\-port =\fIVALUE\fR
+RCon port (default: config value or 27015).
+.TP
+.BR \-\-password =\fIVALUE\fR
+RCon password (default: config value).
+.PP
+.RS
+factorix rcon exec /server-save
+.RE
+.SS factorix rcon eval [SCRIPT]
+Evaluate a Lua script in a running Factorio server via RCon.
+The script is wrapped in
+.B /c
+before sending.
+If SCRIPT is omitted, reads from stdin.
+.TP
+.BR \-\-host =\fIVALUE\fR
+RCon host (default: config value or localhost).
+.TP
+.BR \-\-port =\fIVALUE\fR
+RCon port (default: config value or 27015).
+.TP
+.BR \-\-password =\fIVALUE\fR
+RCon password (default: config value).
+.PP
+.RS
+factorix rcon eval "rcon.print(game.tick)"
+.br
+echo "rcon.print(game.tick)" | factorix rcon eval
+.RE
 .SH MOD COMMANDS
 .SS factorix mod list
 List installed MOD(s).
diff --git a/factorix.gemspec b/factorix.gemspec
index 0d73ef5..5f34f21 100644
--- a/factorix.gemspec
+++ b/factorix.gemspec
@@ -44,6 +44,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "dry-inflector", "~> 1.0"
   spec.add_dependency "dry-logger", "~> 1.2"
   spec.add_dependency "parslet", "~> 2.0"
+  spec.add_dependency "rcon-client", "~> 0.5"
   spec.add_dependency "retriable", "~> 3.1"
   spec.add_dependency "rubyzip", "~> 3.2"
   spec.add_dependency "tint_me", "~> 1.1"
diff --git a/lib/factorix.rb b/lib/factorix.rb
index b62dc36..1aeec2e 100644
--- a/lib/factorix.rb
+++ b/lib/factorix.rb
@@ -27,6 +27,13 @@ module Factorix
     setting :data_dir, constructor: ->(v) { v ? Pathname(v) : nil }
   end
 
+  # RCON connection settings
+  setting :rcon do
+    setting :host, default: "localhost"
+    setting :port, default: 27015
+    setting :password, default: nil
+  end
+
   # HTTP timeout settings
   setting :http do
     setting :connect_timeout, default: 5
@@ -129,6 +136,7 @@ def self.load_config(path=nil)
     "installed_mod" => "InstalledMOD",
     "mac_os" => "MacOS",
     "mod" => "MOD",
+    "rcon" => "RCon",
     "game_download_api" => "GameDownloadAPI",
     "mod_download_api" => "MODDownloadAPI",
     "mod_info" => "MODInfo",
diff --git a/lib/factorix/cli.rb b/lib/factorix/cli.rb
index c707be3..a3e092b 100644
--- a/lib/factorix/cli.rb
+++ b/lib/factorix/cli.rb
@@ -45,5 +45,7 @@ class CLI
     register "mod settings restore", Commands::MOD::Settings::Restore
     register "cache stat", Commands::Cache::Stat
     register "cache evict", Commands::Cache::Evict
+    register "rcon exec", Commands::RCon::Exec
+    register "rcon eval", Commands::RCon::Eval
   end
 end
diff --git a/lib/factorix/cli/commands/rcon/eval.rb b/lib/factorix/cli/commands/rcon/eval.rb
new file mode 100644
index 0000000..0ec462a
--- /dev/null
+++ b/lib/factorix/cli/commands/rcon/eval.rb
@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require "rcon/client"
+
+module Factorix
+  class CLI
+    module Commands
+      module RCon
+        # Evaluate a Lua script in Factorio via RCon
+        class Eval < Base
+          desc "Evaluate a Lua script in Factorio via RCon"
+
+          argument :script, required: false, desc: "Lua script to evaluate; reads from stdin if omitted"
+
+          option :host, default: nil, desc: "RCon host"
+          option :port, default: nil, desc: "RCon port"
+          option :password, default: nil, desc: "RCon password"
+
+          # @param script [String, nil] Lua script to evaluate; reads from stdin if nil
+          # @param host [String, nil] RCon host override
+          # @param port [String, nil] RCon port override
+          # @param password [String, nil] RCon password override
+          # @return [void]
+          def call(script: nil, host: nil, port: nil, password: nil, **)
+            lua = script || $stdin.read
+            rcon_host = host || Factorix.config.rcon.host
+            rcon_port = port ? Integer(port) : Factorix.config.rcon.port
+            rcon_password = password || Factorix.config.rcon.password
+
+            ::RCon::Client.open(rcon_host, rcon_port, password: rcon_password, sentinel_command: "/c") do |client|
+              result = client.execute("/c #{lua}")
+              say result unless result.empty?
+            end
+          rescue ::RCon::Client::ConnectionError => e
+            raise RConConnectionError, e.message
+          rescue ::RCon::Client::AuthenticationError => e
+            raise RConAuthenticationError, e.message
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/factorix/cli/commands/rcon/exec.rb b/lib/factorix/cli/commands/rcon/exec.rb
new file mode 100644
index 0000000..419e681
--- /dev/null
+++ b/lib/factorix/cli/commands/rcon/exec.rb
@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require "rcon/client"
+
+module Factorix
+  class CLI
+    module Commands
+      module RCon
+        # Execute a Factorio console command via RCon
+        class Exec < Base
+          desc "Execute a Factorio console command via RCon"
+
+          argument :command, required: true, desc: "Console command to execute (e.g. /server-save)"
+
+          option :host, default: nil, desc: "RCon host"
+          option :port, default: nil, desc: "RCon port"
+          option :password, default: nil, desc: "RCon password"
+
+          # @param command [String] console command to execute
+          # @param host [String, nil] RCon host override
+          # @param port [String, nil] RCon port override
+          # @param password [String, nil] RCon password override
+          # @return [void]
+          def call(command:, host: nil, port: nil, password: nil, **)
+            rcon_host = host || Factorix.config.rcon.host
+            rcon_port = port ? Integer(port) : Factorix.config.rcon.port
+            rcon_password = password || Factorix.config.rcon.password
+
+            ::RCon::Client.open(rcon_host, rcon_port, password: rcon_password, sentinel_command: "/c") do |client|
+              result = client.execute(command)
+              say result unless result.empty?
+            end
+          rescue ::RCon::Client::ConnectionError => e
+            raise RConConnectionError, e.message
+          rescue ::RCon::Client::AuthenticationError => e
+            raise RConAuthenticationError, e.message
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/factorix/errors.rb b/lib/factorix/errors.rb
index df5ea7d..701f0e1 100644
--- a/lib/factorix/errors.rb
+++ b/lib/factorix/errors.rb
@@ -57,6 +57,11 @@ class DigestMismatchError < InfrastructureError; end
   # External command not found
   class CommandNotFoundError < InfrastructureError; end
 
+  # RCON errors
+  class RConError < InfrastructureError; end
+  class RConConnectionError < RConError; end
+  class RConAuthenticationError < RConError; end
+
   # File format related errors
   class FileFormatError < InfrastructureError; end
 
diff --git a/spec/factorix/cli/commands/rcon/eval_spec.rb b/spec/factorix/cli/commands/rcon/eval_spec.rb
new file mode 100644
index 0000000..72bcab3
--- /dev/null
+++ b/spec/factorix/cli/commands/rcon/eval_spec.rb
@@ -0,0 +1,80 @@
+# frozen_string_literal: true
+
+RSpec.describe Factorix::CLI::Commands::RCon::Eval do
+  let(:rcon_client) { instance_double(RCon::Client) }
+
+  before do
+    allow(RCon::Client).to receive(:open).and_yield(rcon_client)
+    allow(rcon_client).to receive(:execute).and_return("")
+  end
+
+  describe "#call" do
+    context "when a script is given as an argument" do
+      it "executes the script wrapped in /c" do
+        run_command(Factorix::CLI::Commands::RCon::Eval, %w[rcon.print(game.tick)])
+
+        expect(rcon_client).to have_received(:execute).with("/c rcon.print(game.tick)")
+      end
+    end
+
+    context "when no script is given" do
+      it "reads the script from stdin" do
+        allow($stdin).to receive(:read).and_return("rcon.print(game.tick)")
+
+        run_command(Factorix::CLI::Commands::RCon::Eval)
+
+        expect(rcon_client).to have_received(:execute).with("/c rcon.print(game.tick)")
+      end
+    end
+
+    it "connects with config defaults" do
+      run_command(Factorix::CLI::Commands::RCon::Eval, %w[rcon.print(game.tick)])
+
+      expect(RCon::Client).to have_received(:open).with("localhost", 27015, password: nil, sentinel_command: "/c")
+    end
+
+    it "uses CLI options to override connection settings" do
+      run_command(Factorix::CLI::Commands::RCon::Eval, %w[--host rconserver --port 25575 --password secret rcon.print(game.tick)])
+
+      expect(RCon::Client).to have_received(:open).with("rconserver", 25575, password: "secret", sentinel_command: "/c")
+    end
+
+    context "when the server returns output" do
+      before { allow(rcon_client).to receive(:execute).and_return("3600") }
+
+      it "prints the output" do
+        result = run_command(Factorix::CLI::Commands::RCon::Eval, %w[rcon.print(game.tick)])
+
+        expect(result.stdout).to include("3600")
+      end
+    end
+
+    context "when the server returns no output" do
+      it "prints nothing" do
+        result = run_command(Factorix::CLI::Commands::RCon::Eval, %w[rcon.print(game.tick)])
+
+        expect(result.stdout).to eq("")
+      end
+    end
+
+    context "when the connection fails" do
+      before { allow(RCon::Client).to receive(:open).and_raise(RCon::Client::ConnectionError, "connection refused") }
+
+      it "raises RConConnectionError" do
+        expect {
+          run_command(Factorix::CLI::Commands::RCon::Eval, %w[rcon.print(game.tick)])
+        }.to raise_error(Factorix::RConConnectionError, "connection refused")
+      end
+    end
+
+    context "when authentication fails" do
+      before { allow(RCon::Client).to receive(:open).and_raise(RCon::Client::AuthenticationError, "bad password") }
+
+      it "raises RConAuthenticationError" do
+        expect {
+          run_command(Factorix::CLI::Commands::RCon::Eval, %w[rcon.print(game.tick)])
+        }.to raise_error(Factorix::RConAuthenticationError, "bad password")
+      end
+    end
+  end
+end
diff --git a/spec/factorix/cli/commands/rcon/exec_spec.rb b/spec/factorix/cli/commands/rcon/exec_spec.rb
new file mode 100644
index 0000000..914b1d1
--- /dev/null
+++ b/spec/factorix/cli/commands/rcon/exec_spec.rb
@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+RSpec.describe Factorix::CLI::Commands::RCon::Exec do
+  let(:rcon_client) { instance_double(RCon::Client) }
+
+  before do
+    allow(RCon::Client).to receive(:open).and_yield(rcon_client)
+    allow(rcon_client).to receive(:execute).and_return("")
+  end
+
+  describe "#call" do
+    it "connects with config defaults and executes the command" do
+      run_command(Factorix::CLI::Commands::RCon::Exec, %w[/server-save])
+
+      expect(RCon::Client).to have_received(:open).with("localhost", 27015, password: nil, sentinel_command: "/c")
+      expect(rcon_client).to have_received(:execute).with("/server-save")
+    end
+
+    it "uses CLI options to override connection settings" do
+      run_command(Factorix::CLI::Commands::RCon::Exec, %w[--host rconserver --port 25575 --password secret /server-save])
+
+      expect(RCon::Client).to have_received(:open).with("rconserver", 25575, password: "secret", sentinel_command: "/c")
+    end
+
+    context "when the server returns output" do
+      before { allow(rcon_client).to receive(:execute).and_return("saved") }
+
+      it "prints the output" do
+        result = run_command(Factorix::CLI::Commands::RCon::Exec, %w[/server-save])
+
+        expect(result.stdout).to include("saved")
+      end
+    end
+
+    context "when the server returns no output" do
+      it "prints nothing" do
+        result = run_command(Factorix::CLI::Commands::RCon::Exec, %w[/server-save])
+
+        expect(result.stdout).to eq("")
+      end
+    end
+
+    context "when the connection fails" do
+      before { allow(RCon::Client).to receive(:open).and_raise(RCon::Client::ConnectionError, "connection refused") }
+
+      it "raises RConConnectionError" do
+        expect {
+          run_command(Factorix::CLI::Commands::RCon::Exec, %w[/server-save])
+        }.to raise_error(Factorix::RConConnectionError, "connection refused")
+      end
+    end
+
+    context "when authentication fails" do
+      before { allow(RCon::Client).to receive(:open).and_raise(RCon::Client::AuthenticationError, "bad password") }
+
+      it "raises RConAuthenticationError" do
+        expect {
+          run_command(Factorix::CLI::Commands::RCon::Exec, %w[/server-save])
+        }.to raise_error(Factorix::RConAuthenticationError, "bad password")
+      end
+    end
+  end
+end

From 83d204d95199e477f7bc614d01fe2a09c8bf59e9 Mon Sep 17 00:00:00 2001
From: OZAWA Sakuro <10973+sakuro@users.noreply.github.com>
Date: Thu, 23 Apr 2026 20:24:57 +0900
Subject: [PATCH 2/2] :sparkles: Add rcon completion support for zsh, bash, and
 fish

---
 completion/_factorix.bash | 21 ++++++++++++++-
 completion/_factorix.fish | 33 +++++++++++++++++-------
 completion/_factorix.zsh  | 54 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 98 insertions(+), 10 deletions(-)

diff --git a/completion/_factorix.bash b/completion/_factorix.bash
index 3969353..2fd962c 100644
--- a/completion/_factorix.bash
+++ b/completion/_factorix.bash
@@ -17,7 +17,7 @@ _factorix() {
   local confirmable_opts="-y --yes"
 
   # Top-level commands
-  local commands="version man launch path download blueprint mod cache completion"
+  local commands="version man launch path download blueprint mod cache rcon completion"
 
   # blueprint subcommands
   local blueprint_commands="decode encode"
@@ -28,6 +28,10 @@ _factorix() {
   # cache subcommands
   local cache_commands="stat evict"
 
+  # rcon subcommands
+  local rcon_commands="exec eval"
+  local rcon_opts="--host --port --password"
+
   # mod image subcommands
   local image_commands="list add edit"
 
@@ -110,6 +114,21 @@ _factorix() {
       fi
       return
       ;;
+    rcon)
+      if [[ $cword -eq 2 ]]; then
+        COMPREPLY=($(compgen -W "$rcon_commands" -- "$cur"))
+      else
+        case "${words[2]}" in
+          exec|eval)
+            COMPREPLY=($(compgen -W "$global_opts $rcon_opts" -- "$cur"))
+            ;;
+          *)
+            COMPREPLY=($(compgen -W "$global_opts" -- "$cur"))
+            ;;
+        esac
+      fi
+      return
+      ;;
     mod)
       if [[ $cword -eq 2 ]]; then
         COMPREPLY=($(compgen -W "$mod_commands" -- "$cur"))
diff --git a/completion/_factorix.fish b/completion/_factorix.fish
index 0e889fa..5043cb3 100644
--- a/completion/_factorix.fish
+++ b/completion/_factorix.fish
@@ -107,15 +107,16 @@ complete -c factorix -l log-level -d 'Set log level' -xa 'debug info warn error
 complete -c factorix -s q -l quiet -d 'Suppress non-essential output'
 
 # Top-level commands
-complete -c factorix -n "not __factorix_using_command version; and not __factorix_using_command man; and not __factorix_using_command launch; and not __factorix_using_command path; and not __factorix_using_command download; and not __factorix_using_command blueprint; and not __factorix_using_command mod; and not __factorix_using_command cache; and not __factorix_using_command completion" -a version -d 'Display Factorix version'
-complete -c factorix -n "not __factorix_using_command version; and not __factorix_using_command man; and not __factorix_using_command launch; and not __factorix_using_command path; and not __factorix_using_command download; and not __factorix_using_command blueprint; and not __factorix_using_command mod; and not __factorix_using_command cache; and not __factorix_using_command completion" -a man -d 'Display the Factorix manual page'
-complete -c factorix -n "not __factorix_using_command version; and not __factorix_using_command man; and not __factorix_using_command launch; and not __factorix_using_command path; and not __factorix_using_command download; and not __factorix_using_command blueprint; and not __factorix_using_command mod; and not __factorix_using_command cache; and not __factorix_using_command completion" -a launch -d 'Launch Factorio game'
-complete -c factorix -n "not __factorix_using_command version; and not __factorix_using_command man; and not __factorix_using_command launch; and not __factorix_using_command path; and not __factorix_using_command download; and not __factorix_using_command blueprint; and not __factorix_using_command mod; and not __factorix_using_command cache; and not __factorix_using_command completion" -a path -d 'Display Factorio and Factorix paths'
-complete -c factorix -n "not __factorix_using_command version; and not __factorix_using_command man; and not __factorix_using_command launch; and not __factorix_using_command path; and not __factorix_using_command download; and not __factorix_using_command blueprint; and not __factorix_using_command mod; and not __factorix_using_command cache; and not __factorix_using_command completion" -a download -d 'Download Factorio game files'
-complete -c factorix -n "not __factorix_using_command version; and not __factorix_using_command man; and not __factorix_using_command launch; and not __factorix_using_command path; and not __factorix_using_command download; and not __factorix_using_command blueprint; and not __factorix_using_command mod; and not __factorix_using_command cache; and not __factorix_using_command completion" -a blueprint -d 'Blueprint decode/encode commands'
-complete -c factorix -n "not __factorix_using_command version; and not __factorix_using_command man; and not __factorix_using_command launch; and not __factorix_using_command path; and not __factorix_using_command download; and not __factorix_using_command blueprint; and not __factorix_using_command mod; and not __factorix_using_command cache; and not __factorix_using_command completion" -a mod -d 'MOD management commands'
-complete -c factorix -n "not __factorix_using_command version; and not __factorix_using_command man; and not __factorix_using_command launch; and not __factorix_using_command path; and not __factorix_using_command download; and not __factorix_using_command blueprint; and not __factorix_using_command mod; and not __factorix_using_command cache; and not __factorix_using_command completion" -a cache -d 'Cache management commands'
-complete -c factorix -n "not __factorix_using_command version; and not __factorix_using_command man; and not __factorix_using_command launch; and not __factorix_using_command path; and not __factorix_using_command download; and not __factorix_using_command blueprint; and not __factorix_using_command mod; and not __factorix_using_command cache; and not __factorix_using_command completion" -a completion -d 'Generate shell completion script'
+complete -c factorix -n "not __factorix_using_command version; and not __factorix_using_command man; and not __factorix_using_command launch; and not __factorix_using_command path; and not __factorix_using_command download; and not __factorix_using_command blueprint; and not __factorix_using_command mod; and not __factorix_using_command cache; and not __factorix_using_command rcon; and not __factorix_using_command completion" -a version -d 'Display Factorix version'
+complete -c factorix -n "not __factorix_using_command version; and not __factorix_using_command man; and not __factorix_using_command launch; and not __factorix_using_command path; and not __factorix_using_command download; and not __factorix_using_command blueprint; and not __factorix_using_command mod; and not __factorix_using_command cache; and not __factorix_using_command rcon; and not __factorix_using_command completion" -a man -d 'Display the Factorix manual page'
+complete -c factorix -n "not __factorix_using_command version; and not __factorix_using_command man; and not __factorix_using_command launch; and not __factorix_using_command path; and not __factorix_using_command download; and not __factorix_using_command blueprint; and not __factorix_using_command mod; and not __factorix_using_command cache; and not __factorix_using_command rcon; and not __factorix_using_command completion" -a launch -d 'Launch Factorio game'
+complete -c factorix -n "not __factorix_using_command version; and not __factorix_using_command man; and not __factorix_using_command launch; and not __factorix_using_command path; and not __factorix_using_command download; and not __factorix_using_command blueprint; and not __factorix_using_command mod; and not __factorix_using_command cache; and not __factorix_using_command rcon; and not __factorix_using_command completion" -a path -d 'Display Factorio and Factorix paths'
+complete -c factorix -n "not __factorix_using_command version; and not __factorix_using_command man; and not __factorix_using_command launch; and not __factorix_using_command path; and not __factorix_using_command download; and not __factorix_using_command blueprint; and not __factorix_using_command mod; and not __factorix_using_command cache; and not __factorix_using_command rcon; and not __factorix_using_command completion" -a download -d 'Download Factorio game files'
+complete -c factorix -n "not __factorix_using_command version; and not __factorix_using_command man; and not __factorix_using_command launch; and not __factorix_using_command path; and not __factorix_using_command download; and not __factorix_using_command blueprint; and not __factorix_using_command mod; and not __factorix_using_command cache; and not __factorix_using_command rcon; and not __factorix_using_command completion" -a blueprint -d 'Blueprint decode/encode commands'
+complete -c factorix -n "not __factorix_using_command version; and not __factorix_using_command man; and not __factorix_using_command launch; and not __factorix_using_command path; and not __factorix_using_command download; and not __factorix_using_command blueprint; and not __factorix_using_command mod; and not __factorix_using_command cache; and not __factorix_using_command rcon; and not __factorix_using_command completion" -a mod -d 'MOD management commands'
+complete -c factorix -n "not __factorix_using_command version; and not __factorix_using_command man; and not __factorix_using_command launch; and not __factorix_using_command path; and not __factorix_using_command download; and not __factorix_using_command blueprint; and not __factorix_using_command mod; and not __factorix_using_command cache; and not __factorix_using_command rcon; and not __factorix_using_command completion" -a cache -d 'Cache management commands'
+complete -c factorix -n "not __factorix_using_command version; and not __factorix_using_command man; and not __factorix_using_command launch; and not __factorix_using_command path; and not __factorix_using_command download; and not __factorix_using_command blueprint; and not __factorix_using_command mod; and not __factorix_using_command cache; and not __factorix_using_command rcon; and not __factorix_using_command completion" -a rcon -d 'RCon commands'
+complete -c factorix -n "not __factorix_using_command version; and not __factorix_using_command man; and not __factorix_using_command launch; and not __factorix_using_command path; and not __factorix_using_command download; and not __factorix_using_command blueprint; and not __factorix_using_command mod; and not __factorix_using_command cache; and not __factorix_using_command rcon; and not __factorix_using_command completion" -a completion -d 'Generate shell completion script'
 
 # blueprint subcommands
 complete -c factorix -n "__factorix_using_command blueprint" -a decode -d 'Decode a Factorio blueprint string to JSON'
@@ -143,6 +144,20 @@ complete -c factorix -n "__factorix_using_command download" -s c -l channel -d '
 complete -c factorix -n "__factorix_using_command download" -s d -l directory -d 'Download directory' -ra '(__fish_complete_directories)'
 complete -c factorix -n "__factorix_using_command download" -s o -l output -d 'Output filename' -r
 
+# rcon subcommands
+complete -c factorix -n "__factorix_using_command rcon" -a exec -d 'Execute a Factorio console command'
+complete -c factorix -n "__factorix_using_command rcon" -a eval -d 'Evaluate a Lua script'
+
+# rcon exec options
+complete -c factorix -n "__factorix_using_subcommand rcon exec" -l host -d 'RCon host' -r
+complete -c factorix -n "__factorix_using_subcommand rcon exec" -l port -d 'RCon port' -r
+complete -c factorix -n "__factorix_using_subcommand rcon exec" -l password -d 'RCon password' -r
+
+# rcon eval options
+complete -c factorix -n "__factorix_using_subcommand rcon eval" -l host -d 'RCon host' -r
+complete -c factorix -n "__factorix_using_subcommand rcon eval" -l port -d 'RCon port' -r
+complete -c factorix -n "__factorix_using_subcommand rcon eval" -l password -d 'RCon password' -r
+
 # cache subcommands
 complete -c factorix -n "__factorix_using_command cache" -a stat -d 'Display cache statistics'
 complete -c factorix -n "__factorix_using_command cache" -a evict -d 'Evict cache entries'
diff --git a/completion/_factorix.zsh b/completion/_factorix.zsh
index 467efb0..2ac01b4 100644
--- a/completion/_factorix.zsh
+++ b/completion/_factorix.zsh
@@ -43,6 +43,7 @@ _factorix() {
         'blueprint:Blueprint decode/encode commands'
         'mod:MOD management commands'
         'cache:Cache management commands'
+        'rcon:RCon commands'
         'completion:Generate shell completion script'
       )
       _describe -t commands 'factorix command' commands
@@ -78,6 +79,9 @@ _factorix() {
         cache)
           _factorix_cache
           ;;
+        rcon)
+          _factorix_rcon
+          ;;
       esac
       ;;
   esac
@@ -461,6 +465,56 @@ _factorix_mod_settings() {
   esac
 }
 
+_factorix_rcon() {
+  local context state state_descr line
+  typeset -A opt_args
+
+  local -a global_opts
+  global_opts=(
+    '(-c --config-path)'{-c,--config-path}'[Path to configuration file]:config file:_files'
+    '--log-level[Set log level]:level:(debug info warn error fatal)'
+    '(-q --quiet)'{-q,--quiet}'[Suppress non-essential output]'
+  )
+
+  local -a rcon_opts
+  rcon_opts=(
+    '--host[RCon host]:host:'
+    '--port[RCon port]:port:'
+    '--password[RCon password]:password:'
+  )
+
+  _arguments -C \
+    '1:subcommand:->subcommand' \
+    '*::arg:->args'
+
+  case $state in
+    subcommand)
+      local -a subcommands
+      subcommands=(
+        'exec:Execute a Factorio console command'
+        'eval:Evaluate a Lua script'
+      )
+      _describe -t subcommands 'rcon subcommand' subcommands
+      ;;
+    args)
+      case $line[1] in
+        exec)
+          _arguments \
+            $global_opts \
+            $rcon_opts \
+            '1:console command:'
+          ;;
+        eval)
+          _arguments \
+            $global_opts \
+            $rcon_opts \
+            '1:Lua script:'
+          ;;
+      esac
+      ;;
+  esac
+}
+
 _factorix_cache() {
   local context state state_descr line
   typeset -A opt_args