Upgrade to maxminddb 0.26.0

oschwald · oschwald · commit 19d2a2959f8d · 2025-03-28T10:00:46.000-07:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -19,7 +19,7 @@ crate-type = ["cdylib", "rlib"]
 default = ["console_error_panic_hook"]
 
 [dependencies]
-maxminddb = "0.25.0"
+maxminddb = "0.26.0"
 js-sys = "0.3"
 cfg-if = "1.0"
 serde = { version = "1.0", features = ["derive"] }
diff --git a/src/lib.rs b/src/lib.rs
@@ -169,7 +169,11 @@ impl Maxmind {
 
     pub fn lookup_city(&self, ip_str: &str) -> Result<CityResponse, JsError> {
         let ip_addr_str: IpAddr = ip_str.parse::<IpAddr>().expect_throw("Invalid IP");
-        let result: geoip2::City = self.db.lookup(ip_addr_str).expect_throw("Result Not Found");
+        let result: geoip2::City = self
+            .db
+            .lookup(ip_addr_str)
+            .expect_throw("Lookup Error")
+            .expect_throw("Result Not Found");
 
         // Convert the geoip2::City to our CityResponse
         let response = convert_city_response(result);
@@ -179,12 +183,12 @@ impl Maxmind {
 
     pub fn lookup_prefix(&self, ip_str: &str) -> Result<PrefixResponse, JsError> {
         let ip_addr_str: IpAddr = ip_str.parse::<IpAddr>().expect_throw("Invalid IP");
-        let result: (geoip2::City, usize) = self
+        let result: (Option<geoip2::City>, usize) = self
             .db
             .lookup_prefix(ip_addr_str)
-            .expect_throw("Result Not Found");
+            .expect_throw("Lookup Error");
 
-        let response = convert_city_response(result.0);
+        let response = convert_city_response(result.0.expect_throw("Result Not Found"));
 
         Ok(PrefixResponse {
             city: response,
