chore: adapt to new woothee/tungstenite

kill a now unused argument to register

Closes #110

Author: pjenvey

autopush-common/src/db/commands.rs

@@ -8,6 +8,7 @@ use cadence::{Counted, StatsdClient};
 use chrono::Utc;
 use futures::{future, Future};
 use futures_backoff::retry_if;
+use rusoto_core::RusotoError;
 use rusoto_dynamodb::{
     AttributeValue, BatchWriteItemError, DeleteItemError, DeleteItemInput, DeleteItemOutput,
     DynamoDb, GetItemError, GetItemInput, GetItemOutput, ListTablesInput, ListTablesOutput,
@@ -25,11 +26,10 @@ use crate::util::timing::sec_since_epoch;
 
 macro_rules! retryable_error {
     ($name:ident, $type:ty, $property:ident) => {
-        pub fn $name(err: &$type) -> bool {
+        pub fn $name(err: &RusotoError<$type>) -> bool {
             match err {
-                $property::InternalServerError(_) | $property::ProvisionedThroughputExceeded(_) => {
-                    true
-                }
+                RusotoError::Service($property::InternalServerError(_))
+                | RusotoError::Service($property::ProvisionedThroughputExceeded(_)) => true,
                 _ => false,
             }
         }

autopush-common/src/db/mod.rs

@@ -200,7 +200,6 @@ impl DynamoStorage {
         channel_id: &Uuid,
         message_month: &str,
         endpoint: &str,
-        key: Option<String>,
     ) -> MyFuture<RegisterResponse> {
         let ddb = self.ddb.clone();
         let mut chids = HashSet::new();

autopush/Cargo.toml

@@ -53,5 +53,4 @@ tokio-service = "0.1.0"
 tokio-tungstenite = { version = "0.8.0", default-features = false }
 tungstenite = { version = "0.8.1", default-features = false }
 uuid = { version = "0.7.4", features = ["serde", "v4"] }
-# XXX: pin woothee until >= 0.8.1
 woothee = "0.10.0"

autopush/src/client.rs

@@ -18,7 +18,6 @@ use std::rc::Rc;
 use std::time::Duration;
 use tokio_core::reactor::Timeout;
 use uuid::Uuid;
-use woothee::parser::Parser;
 
 use autopush_common::db::{CheckStorageResponse, HelloResponse, RegisterResponse};
 use autopush_common::errors::*;
@@ -489,8 +488,7 @@ where
         }
         let now = ms_since_epoch();
         let elapsed = (now - webpush.connected_at) / 1_000;
-        let parser = Parser::new();
-        let (ua_result, metrics_os, metrics_browser) = parse_user_agent(&parser, &user_agent);
+        let (ua_result, metrics_os, metrics_browser) = parse_user_agent(&user_agent);
         // dogstatsd doesn't support timers: use histogram instead
         srv.metrics
             .time_with_tags("ua.connection.lifespan", elapsed)
@@ -553,7 +551,7 @@ where
         "connection_type" => &stats.connection_type,
         "ua_name" => ua_result.name,
         "ua_os_family" => metrics_os,
-        "ua_os_ver" => ua_result.os_version,
+        "ua_os_ver" => ua_result.os_version.into_owned(),
         "ua_browser_family" => metrics_browser,
         "ua_browser_ver" => ua_result.version,
         "ua_category" => ua_result.category,
@@ -863,7 +861,7 @@ where
                     Ok(endpoint) => {
                         data.srv
                             .ddb
-                            .register(&uaid, &channel_id, &message_month, &endpoint, key)
+                            .register(&uaid, &channel_id, &message_month, &endpoint)
                     }
                     Err(_) => Box::new(future::ok(RegisterResponse::Error {
                         error_msg: "Failed to generate endpoint".to_string(),

autopush/src/main.rs

@@ -1,4 +1,3 @@
-#[macro_use]
 extern crate slog;
 #[macro_use]
 extern crate slog_scope;

autopush/src/server/mod.rs

@@ -30,7 +30,7 @@ use tokio_core::reactor::{Core, Handle, Timeout};
 use tokio_io;
 use tokio_tungstenite::{accept_hdr_async, WebSocketStream};
 use tungstenite::handshake::server::Request;
-use tungstenite::Message;
+use tungstenite::{self, Message};
 use uuid::Uuid;
 
 use autopush_common::db::DynamoStorage;
@@ -919,6 +919,8 @@ where
                     self.ws_pong_timeout = false;
                     task::current().notify();
                 }
+
+                Message::Close(_) => return Err(tungstenite::Error::ConnectionClosed.into()),
             }
         }
     }

autopush/src/user_agent.rs

@@ -11,17 +11,15 @@ const VALID_UA_BROWSER: &[&str] = &["Chrome", "Firefox", "Safari", "Opera"];
 // field). Windows has many values and we only care that its Windows
 const VALID_UA_OS: &[&str] = &["Firefox OS", "Linux", "Mac OSX"];
 
-pub fn parse_user_agent<'a>(
-    parser: &'a Parser,
-    agent: &str,
-) -> (WootheeResult<'a>, &'a str, &'a str) {
+pub fn parse_user_agent(agent: &str) -> (WootheeResult, &str, &str) {
+    let parser = Parser::new();
     let wresult = parser.parse(&agent).unwrap_or_else(|| WootheeResult {
         name: "",
         category: "",
         os: "",
-        os_version: "".to_string(),
+        os_version: "".into(),
         browser_type: "",
-        version: "".to_string(),
+        version: "",
         vendor: "",
     });
 
@@ -43,15 +41,12 @@ pub fn parse_user_agent<'a>(
 
 #[cfg(test)]
 mod tests {
-    use woothee::parser::Parser;
-
     use super::parse_user_agent;
 
     #[test]
     fn test_linux() {
         let agent = r#"Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.1.2) Gecko/20090807 Mandriva Linux/1.9.1.2-1.1mud2009.1 (2009.1) Firefox/3.5.2 FirePHP/0.3,gzip(gfe),gzip(gfe)"#;
-        let parser = Parser::new();
-        let (ua_result, metrics_os, metrics_browser) = parse_user_agent(&parser, &agent);
+        let (ua_result, metrics_os, metrics_browser) = parse_user_agent(&agent);
         assert_eq!(metrics_os, "Linux");
         assert_eq!(ua_result.os, "Linux");
         assert_eq!(metrics_browser, "Firefox");
@@ -60,8 +55,7 @@ mod tests {
     #[test]
     fn test_windows() {
         let agent = r#"Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.2.3) Gecko/20100401 Firefox/3.6.3 (.NET CLR 3.5.30729)"#;
-        let parser = Parser::new();
-        let (ua_result, metrics_os, metrics_browser) = parse_user_agent(&parser, &agent);
+        let (ua_result, metrics_os, metrics_browser) = parse_user_agent(&agent);
         assert_eq!(metrics_os, "Windows");
         assert_eq!(ua_result.os, "Windows 7");
         assert_eq!(metrics_browser, "Firefox");
@@ -71,8 +65,7 @@ mod tests {
     fn test_osx() {
         let agent =
             r#"Mozilla/5.0 (Macintosh; Intel Mac OS X 10.5; rv:2.1.1) Gecko/ Firefox/5.0.1"#;
-        let parser = Parser::new();
-        let (ua_result, metrics_os, metrics_browser) = parse_user_agent(&parser, &agent);
+        let (ua_result, metrics_os, metrics_browser) = parse_user_agent(&agent);
         assert_eq!(metrics_os, "Mac OSX");
         assert_eq!(ua_result.os, "Mac OSX");
         assert_eq!(metrics_browser, "Firefox");
@@ -82,8 +75,7 @@ mod tests {
     fn test_other() {
         let agent =
             r#"BlackBerry9000/4.6.0.167 Profile/MIDP-2.0 Configuration/CLDC-1.1 VendorID/102"#;
-        let parser = Parser::new();
-        let (ua_result, metrics_os, metrics_browser) = parse_user_agent(&parser, &agent);
+        let (ua_result, metrics_os, metrics_browser) = parse_user_agent(&agent);
         assert_eq!(metrics_os, "Other");
         assert_eq!(ua_result.os, "BlackBerry");
         assert_eq!(metrics_browser, "Other");