build: bump version to 0.1.5

The `authors` field is sufficient to represent all queries that
`author` could have been used in.  See
https://github.com/fiatjaf/nostr/issues/34 for the discussion leading
to this removal.

Cargo.lock

@@ -435,7 +435,7 @@ dependencies = [
 
 [[package]]
 name = "nostr-rs-relay"
-version = "0.1.3"
+version = "0.1.5"
 dependencies = [
  "bitcoin_hashes",
  "env_logger",

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "nostr-rs-relay"
-version = "0.1.3"
+version = "0.1.5"
 edition = "2021"
 
 [dependencies]

src/conn.rs

@@ -53,7 +53,7 @@ impl ClientConn {
                 v.push(id);
             }
         }
-        return v;
+        v
     }
 
     /// Add a new subscription for this connection.

src/db.rs

@@ -181,16 +181,6 @@ fn query_from_sub(sub: &Subscription) -> String {
     for f in sub.filters.iter() {
         // individual filter components
         let mut filter_components: Vec<String> = Vec::new();
-        // Query for "author"
-        // https://github.com/fiatjaf/nostr/issues/34
-        // I believe the author & authors fields are redundant.
-        if f.author.is_some() {
-            let author_str = f.author.as_ref().unwrap();
-            if is_hex(author_str) {
-                let author_clause = format!("author = x'{}'", author_str);
-                filter_components.push(author_clause);
-            }
-        }
         // Query for "authors"
         if f.authors.is_some() {
             let authors_escaped: Vec<String> = f

src/main.rs

@@ -18,6 +18,7 @@ use tokio::sync::broadcast;
 use tokio::sync::broadcast::{Receiver, Sender};
 use tokio::sync::mpsc;
 use tokio::sync::oneshot;
+use tungstenite::protocol::WebSocketConfig;
 
 /// Start running a Nostr relay server.
 fn main() -> Result<(), Error> {
@@ -93,8 +94,15 @@ async fn nostr_server(
 ) {
     // get a broadcast channel for clients to communicate on
     let mut bcast_rx = broadcast.subscribe();
+    // websocket configuration / limits
+    let config = WebSocketConfig {
+        max_send_queue: None,
+        max_message_size: Some(2 << 19), // 512K
+        max_frame_size: Some(2 << 19),   // 512k
+        accept_unmasked_frames: false,   // follow the spec
+    };
     // upgrade the TCP connection to WebSocket
-    let conn = tokio_tungstenite::accept_async(stream).await;
+    let conn = tokio_tungstenite::accept_async_with_config(stream, Some(config)).await;
     let ws_stream = conn.expect("websocket handshake error");
     // wrap websocket into a stream & sink of Nostr protocol messages
     let mut nostr_stream = protostream::wrap_ws_in_nostr(ws_stream);

src/subscription.rs

@@ -16,12 +16,9 @@ pub struct Subscription {
 /// element can be present if it should be used in filtering, or
 /// absent ([`None`]) if it should be ignored.
 #[derive(Serialize, Deserialize, PartialEq, Debug, Clone)]
-#[serde(deny_unknown_fields)]
 pub struct ReqFilter {
     /// Event hash
     pub id: Option<String>,
-    /// Author public key
-    pub author: Option<String>,
     /// Event kind
     pub kind: Option<u64>,
     /// Referenced event hash
@@ -114,13 +111,6 @@ impl ReqFilter {
             .map(|vs| vs.contains(&event.pubkey.to_owned()))
             .unwrap_or(true)
     }
-    /// Check for a specific author match
-    fn author_match(&self, event: &Event) -> bool {
-        self.author
-            .as_ref()
-            .map(|v| v == &event.pubkey)
-            .unwrap_or(true)
-    }
     /// Check if this filter either matches, or does not care about the event tags.
     fn event_match(&self, event: &Event) -> bool {
         self.event
@@ -148,7 +138,6 @@ impl ReqFilter {
         self.id.as_ref().map(|v| v == &event.id).unwrap_or(true)
             && self.since.map(|t| event.created_at > t).unwrap_or(true)
             && self.kind_match(event.kind)
-            && self.author_match(event)
             && self.authors_match(event)
             && self.pubkey_match(event)
             && self.event_match(event)
@@ -165,17 +154,7 @@ mod tests {
         let s: Subscription = serde_json::from_str(raw_json)?;
         assert_eq!(s.id, "some-id");
         assert_eq!(s.filters.len(), 1);
-        assert_eq!(s.filters.get(0).unwrap().author, None);
+        assert_eq!(s.filters.get(0).unwrap().authors, None);
-        Ok(())
-    }
-
-    #[test]
-    fn multi_empty_request_parse() -> Result<()> {
-        let raw_json = r#"["REQ","some-id",{}]"#;
-        let s: Subscription = serde_json::from_str(raw_json)?;
-        assert_eq!(s.id, "some-id");
-        assert_eq!(s.filters.len(), 1);
-        assert_eq!(s.filters.get(0).unwrap().author, None);
         Ok(())
     }
 
@@ -277,23 +256,6 @@ mod tests {
         Ok(())
     }
 
-    #[test]
-    fn author_single() -> Result<()> {
-        // subscription with a filter for ID
-        let s: Subscription = serde_json::from_str(r#"["REQ","xyz",{"author":"abc"}]"#)?;
-        let e = Event {
-            id: "123".to_owned(),
-            pubkey: "abc".to_owned(),
-            created_at: 0,
-            kind: 0,
-            tags: Vec::new(),
-            content: "".to_owned(),
-            sig: "".to_owned(),
-        };
-        assert_eq!(s.interested_in_event(&e), true);
-        Ok(())
-    }
-
     #[test]
     fn authors_single() -> Result<()> {
         // subscription with a filter for ID
@@ -311,6 +273,7 @@ mod tests {
         Ok(())
     }
     #[test]
+
     fn authors_multi_pubkey() -> Result<()> {
         // check for any of a set of authors, against the pubkey
         let s: Subscription = serde_json::from_str(r#"["REQ","xyz",{"authors":["abc", "bcd"]}]"#)?;