Invert order of bandit opt overrides

Author: mtrudel

lib/hap.ex

@@ -86,19 +86,21 @@ defmodule HAP do
   def init(%HAP.AccessoryServer{} = accessory_server) do
     accessory_server = accessory_server |> HAP.AccessoryServer.compile()
 
+    bandit_opts =
+      [
+        plug: HAP.HTTPServer,
+        port: 0,
+        http_1_options: [clear_process_dict: false],
+        thousand_island_options: [handler_module: HAP.HAPSessionHandler, transport_module: HAP.HAPSessionTransport]
+      ]
+      |> Keyword.merge(accessory_server.bandit_opts)
+
     children = [
       {HAP.PersistentStorage, accessory_server.data_path},
       {HAP.AccessoryServerManager, accessory_server},
       HAP.EventManager,
       HAP.PairSetup,
-      {Bandit,
-       Keyword.merge(
-         accessory_server.bandit_opts,
-         plug: HAP.HTTPServer,
-         port: 0,
-         http_1_options: [clear_process_dict: false],
-         thousand_island_options: [handler_module: HAP.HAPSessionHandler, transport_module: HAP.HAPSessionTransport]
-       )}
+      {Bandit, bandit_opts}
     ]
 
     Supervisor.init(children, strategy: :rest_for_one)

lib/hap/accessory_server.ex

@@ -32,8 +32,9 @@ defmodule HAP.AccessoryServer do
   If it is `:host` then a value of `hap_data` is used. If it is anything else (as it will be
   when compiling for a Nerves target, for example), the value of `/root/hap_data` is used. This
   allows HAP to work out-of-the-box in conventional and Nerves environments.
-  * `bandit_opts`: Options to pass to Bandit. The values provided will be merged with a number of
-  fixed options required for proper operation; see lib/hap.ex for details.
+  * `bandit_opts`: Options to pass to Bandit. The values provided merged with HAP's default
+  options, many of which are required for proper operation. Care must be taken to ensure that such
+  options are not overwritten; see lib/hap.ex for details.
   * `accessory_type`: A HAP specified value indicating the primary function of this
   device. See `t:HAP.AccessoryServer.accessory_type/0` for details
   * `accessories`: A list of `HAP.Accessory` structs to include in this accessory server