.envrc

@@ -1 +0,0 @@
-eval "$(lorri direnv)"

.gitignore

@@ -1,2 +1 @@
 /target
-result*

Cargo.toml

@@ -7,10 +7,9 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-rocket = "0"
+rocket = "0.4.2"
-rocket_contrib = "0"
+rocket_contrib = "0.4.2"
-rocket_prometheus = "0.3"
 serde = "1.0"
 serde_json = "1.0"
 serde_derive = "1.0"
-pathfinding = "2"
+pathfinding = "2.0.1"

docker.nix

@@ -1,22 +0,0 @@
-{ system ? builtins.currentSystem }:
-
-let
-  sources = import ./nix/sources.nix;
-  pkgs = import sources.nixpkgs { };
-  callPackage = pkgs.lib.callPackageWith pkgs;
-  pneuma = callPackage ./pneuma.nix { };
-
-  dockerImage = pkg:
-    pkgs.dockerTools.buildImage {
-      name = "xena/pneuma";
-      tag = pkg.version;
-
-      contents = [ pkg ];
-
-      config = {
-        Cmd = [ "/bin/pneuma" ];
-        WorkingDir = "/";
-      };
-    };
-
-in dockerImage pneuma

nix/rust.nix

@@ -1,7 +0,0 @@
-{ sources ? import ./sources.nix }:
-
-let
-  pkgs = import sources.nixpkgs { overlays = [ (import sources.nixpkgs-mozilla) ]; };
-  date = "2020-02-28";
-in
-  pkgs.rustChannelOf { inherit date; channel = "nightly"; }

nix/sources.json

@@ -1,50 +0,0 @@
-{
-    "naersk": {
-        "branch": "master",
-        "description": "Build rust crates in Nix. No configuration, no code generation. IFD and sandbox friendly.",
-        "homepage": "",
-        "owner": "nmattia",
-        "repo": "naersk",
-        "rev": "ee15d1214a8fb58967a24d629062e4ccdd9a925a",
-        "sha256": "1x5yjbizwvsqrwvfjaljd6wsfmd3ijvw2zgk89545nipqi5ibx7b",
-        "type": "tarball",
-        "url": "https://github.com/nmattia/naersk/archive/ee15d1214a8fb58967a24d629062e4ccdd9a925a.tar.gz",
-        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
-    },
-    "niv": {
-        "branch": "master",
-        "description": "Easy dependency management for Nix projects",
-        "homepage": "https://github.com/nmattia/niv",
-        "owner": "nmattia",
-        "repo": "niv",
-        "rev": "2ecfd86b631714b457e56d70dd83fa60435baeb6",
-        "sha256": "01j6727cws8blg1npp54b4w6xa0gpgyzhyws2vqgp8clnlnmqqhi",
-        "type": "tarball",
-        "url": "https://github.com/nmattia/niv/archive/2ecfd86b631714b457e56d70dd83fa60435baeb6.tar.gz",
-        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
-    },
-    "nixpkgs": {
-        "branch": "nixpkgs-unstable",
-        "description": "A read-only mirror of NixOS/nixpkgs tracking the released channels. Send issues and PRs to",
-        "homepage": "https://github.com/NixOS/nixpkgs",
-        "owner": "NixOS",
-        "repo": "nixpkgs-channels",
-        "rev": "cc1ae9f21b9e0ce998e706a3de1bad0b5259f22d",
-        "sha256": "0zjafww05h50ncapw51b5qxgbv9prjyag0j22jnfc3kcs5xr4ap0",
-        "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs-channels/archive/cc1ae9f21b9e0ce998e706a3de1bad0b5259f22d.tar.gz",
-        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
-    },
-    "nixpkgs-mozilla": {
-        "branch": "master",
-        "description": "mozilla related nixpkgs (extends nixos/nixpkgs repo)",
-        "homepage": null,
-        "owner": "mozilla",
-        "repo": "nixpkgs-mozilla",
-        "rev": "36455d54de0b40d9432bba6d8207a5582210b3eb",
-        "sha256": "0ll0ws3jpidhrcz70hzq1l46y0bbzm87spw03x4zdpacq0n1yqrn",
-        "type": "tarball",
-        "url": "https://github.com/mozilla/nixpkgs-mozilla/archive/36455d54de0b40d9432bba6d8207a5582210b3eb.tar.gz",
-        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
-    }
-}

nix/sources.nix

@@ -1,134 +0,0 @@
-# This file has been generated by Niv.
-
-let
-
-  #
-  # The fetchers. fetch_<type> fetches specs of type <type>.
-  #
-
-  fetch_file = pkgs: spec:
-    if spec.builtin or true then
-      builtins_fetchurl { inherit (spec) url sha256; }
-    else
-      pkgs.fetchurl { inherit (spec) url sha256; };
-
-  fetch_tarball = pkgs: spec:
-    if spec.builtin or true then
-      builtins_fetchTarball { inherit (spec) url sha256; }
-    else
-      pkgs.fetchzip { inherit (spec) url sha256; };
-
-  fetch_git = spec:
-    builtins.fetchGit { url = spec.repo; inherit (spec) rev ref; };
-
-  fetch_builtin-tarball = spec:
-    builtins.trace
-      ''
-        WARNING:
-          The niv type "builtin-tarball" will soon be deprecated. You should
-          instead use `builtin = true`.
-
-          $ niv modify <package> -a type=tarball -a builtin=true
-      ''
-      builtins_fetchTarball { inherit (spec) url sha256; };
-
-  fetch_builtin-url = spec:
-    builtins.trace
-      ''
-        WARNING:
-          The niv type "builtin-url" will soon be deprecated. You should
-          instead use `builtin = true`.
-
-          $ niv modify <package> -a type=file -a builtin=true
-      ''
-      (builtins_fetchurl { inherit (spec) url sha256; });
-
-  #
-  # Various helpers
-  #
-
-  # The set of packages used when specs are fetched using non-builtins.
-  mkPkgs = sources:
-    let
-      sourcesNixpkgs =
-        import (builtins_fetchTarball { inherit (sources.nixpkgs) url sha256; }) {};
-      hasNixpkgsPath = builtins.any (x: x.prefix == "nixpkgs") builtins.nixPath;
-      hasThisAsNixpkgsPath = <nixpkgs> == ./.;
-    in
-      if builtins.hasAttr "nixpkgs" sources
-      then sourcesNixpkgs
-      else if hasNixpkgsPath && ! hasThisAsNixpkgsPath then
-        import <nixpkgs> {}
-      else
-        abort
-          ''
-            Please specify either <nixpkgs> (through -I or NIX_PATH=nixpkgs=...) or
-            add a package called "nixpkgs" to your sources.json.
-          '';
-
-  # The actual fetching function.
-  fetch = pkgs: name: spec:
-
-    if ! builtins.hasAttr "type" spec then
-      abort "ERROR: niv spec ${name} does not have a 'type' attribute"
-    else if spec.type == "file" then fetch_file pkgs spec
-    else if spec.type == "tarball" then fetch_tarball pkgs spec
-    else if spec.type == "git" then fetch_git spec
-    else if spec.type == "builtin-tarball" then fetch_builtin-tarball spec
-    else if spec.type == "builtin-url" then fetch_builtin-url spec
-    else
-      abort "ERROR: niv spec ${name} has unknown type ${builtins.toJSON spec.type}";
-
-  # Ports of functions for older nix versions
-
-  # a Nix version of mapAttrs if the built-in doesn't exist
-  mapAttrs = builtins.mapAttrs or (
-    f: set: with builtins;
-    listToAttrs (map (attr: { name = attr; value = f attr set.${attr}; }) (attrNames set))
-  );
-
-  # fetchTarball version that is compatible between all the versions of Nix
-  builtins_fetchTarball = { url, sha256 }@attrs:
-    let
-      inherit (builtins) lessThan nixVersion fetchTarball;
-    in
-      if lessThan nixVersion "1.12" then
-        fetchTarball { inherit url; }
-      else
-        fetchTarball attrs;
-
-  # fetchurl version that is compatible between all the versions of Nix
-  builtins_fetchurl = { url, sha256 }@attrs:
-    let
-      inherit (builtins) lessThan nixVersion fetchurl;
-    in
-      if lessThan nixVersion "1.12" then
-        fetchurl { inherit url; }
-      else
-        fetchurl attrs;
-
-  # Create the final "sources" from the config
-  mkSources = config:
-    mapAttrs (
-      name: spec:
-        if builtins.hasAttr "outPath" spec
-        then abort
-          "The values in sources.json should not have an 'outPath' attribute"
-        else
-          spec // { outPath = fetch config.pkgs name spec; }
-    ) config.sources;
-
-  # The "config" used by the fetchers
-  mkConfig =
-    { sourcesFile ? ./sources.json
-    , sources ? builtins.fromJSON (builtins.readFile sourcesFile)
-    , pkgs ? mkPkgs sources
-    }: rec {
-      # The sources, i.e. the attribute set of spec name to spec
-      inherit sources;
-
-      # The "pkgs" (evaluated nixpkgs) to use for e.g. non-builtin fetchers
-      inherit pkgs;
-    };
-in
-mkSources (mkConfig {}) // { __functor = _: settings: mkSources (mkConfig settings); }

pneuma.nix

@@ -1,16 +0,0 @@
-{ sources ? import ./nix/sources.nix }:
-let
-  rust = import ./nix/rust.nix { inherit sources; };
-  pkgs = import sources.nixpkgs { };
-  naersk = pkgs.callPackage sources.naersk {
-    rustc = rust.rust;
-    cargo = rust.rust;
-  };
-in
-naersk.buildPackage {
-  src = builtins.filterSource
-    (path: type: type != "directory" || builtins.baseNameOf path != "target")
-    ./.;
-  doCheck = false;
-  remapPathPrefix = true;
-}

shell.nix

@@ -1,9 +0,0 @@
-let
-  sources = import ./nix/sources.nix;
-  niv = import sources.niv { };
-  pkgs = import sources.nixpkgs { };
-  rust = import ./nix/rust.nix { inherit sources; };
-in pkgs.mkShell {
-  buildInputs = [ rust.rust niv.niv ];
-  nativeBuildInputs = [ pkgs.removeReferencesTo ];
-}

src/main.rs

@@ -1,12 +1,14 @@
 #![feature(proc_macro_hygiene, decl_macro)]
 
-#[macro_use]
+#[macro_use] extern crate rocket;
-extern crate rocket;
+#[macro_use] extern crate rocket_contrib;
+#[macro_use] extern crate serde_derive;
 
 use rocket::State;
 use rocket_contrib::json::Json;
+use pathfinding::grid::Grid;
 use std::collections::HashMap;
-use std::sync::Mutex;
+use std::sync::{Arc, Mutex};
 
 mod battlesnake;
 
@@ -28,11 +30,8 @@ fn ping() -> &'static str {
     "OK - Pneuma online"
 }
 
-#[post("/start", format = "json", data = "<msg>")]
+#[post("/begin", format = "json", data = "<msg>")]
-fn start(
+fn begin(cache: State<Cache>, msg: Json<battlesnake::SnakeRequest>) -> Json<battlesnake::StartResponse> {
-    cache: State<Cache>,
-    msg: Json<battlesnake::SnakeRequest>,
-) -> Json<battlesnake::StartResponse> {
     let head = msg.you.body[0];
     let target = find_target(&msg);
     let path = find_path(&msg, &head, &target);
@@ -41,10 +40,9 @@ fn start(
         path: path,
     };
 
-    cache
+    if let Some(x) = cache.lock().expect("wanted cache to be unlockable").get_mut(&msg.game.id) {
-        .lock()
+        *x = gs;
-        .expect("wanted to lock cache")
+    };
-        .insert(msg.game.id.clone(), gs);
 
     Json(battlesnake::StartResponse{
         color: "#5ce8c3".to_string(),
@@ -56,7 +54,7 @@ fn start(
 fn find_path(
     msg: &battlesnake::SnakeRequest,
     head: &battlesnake::Coord,
-    target: &battlesnake::Coord,
+    target: &battlesnake::Coord
 ) -> Option<Vec<battlesnake::Coord>> {
     let path = pathfinding::directed::astar::astar(
         head,
@@ -68,20 +66,10 @@ fn find_path(
     match path {
         None => return None,
         Some(x) => {
-            return Some(x.0.iter().rev().cloned().collect());
+            return Some(x.0);
+        },
     }
 }
-}
-
-#[post("/end", format = "json", data = "<msg>")]
-fn end(cache_state: State<Cache>, msg: Json<battlesnake::SnakeRequest>) -> String {
-    cache_state
-        .lock()
-        .expect("wanted cache to be lockable")
-        .remove(&msg.game.id);
-
-    "OK".to_string()
-}
 
 #[post("/move", format = "json", data = "<msg>")]
 fn make_move(
@@ -93,7 +81,6 @@ fn make_move(
     let mut cache = cache_state.lock().expect("wanted cache to be unlockable");
     let gs = cache.get_mut(&msg.game.id).unwrap();
     if gs.path.is_none() {
-        println!("recalculating path");
         gs.target = *find_target(&msg);
         gs.path = find_path(&msg, &head, &gs.target);
     }
@@ -101,33 +88,18 @@ fn make_move(
     match gs.path.as_mut().unwrap().pop() {
         None => {
             gs.path = None;
-            let target = msg.board.safe_neighbors(&head)[0].0;
-            let next_move = battlesnake::Line {
-                start: &head,
-                end: &target,
-            }
-            .direction()
-            .to_string();
-            println!("moving to {}, target: {:?}", next_move, target);
             Json(battlesnake::MoveResponse {
-                move_field: next_move,
+                move_field: "up".to_string(),
             })
         }
-        Some(next) => {
+        Some(next) => Json(battlesnake::MoveResponse {
-            let next_move = battlesnake::Line {
+            move_field: battlesnake::Line {
                 start: &head,
                 end: &next,
             }
             .direction()
-            .to_string();
+            .to_string(),
-            println!(
+        }),
-                "moving to {} {:?}, target: {:?}",
-                next_move, next, gs.target
-            );
-            Json(battlesnake::MoveResponse {
-                move_field: next_move,
-            })
-        }
     }
 }
 
@@ -154,11 +126,12 @@ fn find_target<'a>(gs: &'a battlesnake::SnakeRequest) -> &'a battlesnake::Coord
 fn main() {
     let map = HashMap::<String, GameState>::new();
     let mutex_map = Mutex::from(map);
-    let prometheus = rocket_prometheus::PrometheusMetrics::new();
+    rocket::ignite().mount("/", routes![
-    rocket::ignite()
+        index,
-        .attach(prometheus.clone())
+        begin,
-        .mount("/metrics", prometheus)
+        ping,
-        .mount("/", routes![index, start, ping, make_move, end,])
+        make_move,
+    ])
         .manage(mutex_map)
         .launch();
 }