nostrb 0.1.0.1 → 0.2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f6159cbd2c246ae573103bd68e56e7cd97b0d3d81d36d8e0816abc5bd23c3c1
-  data.tar.gz: 8bcf8fe77b3baa61882ea849df549b2800ebbf5e788d55c2c1c00efddc99e1f8
+  metadata.gz: a89ed8e93f661c8de971b8cba920363431d8a6a21ba22487877b09c041b25123
+  data.tar.gz: 4d2f947fc9244d1db2c003b27c004f7a666fa67e1f3e36283fecfb396228647c
 SHA512:
-  metadata.gz: 369121a3fa1b9ead9bc245a3bd5f18ce6a6e2cc3571e1c91019afb4752845de7edbef086b755ad3b90d4b1a072997b2cce8047e19c4db293cc14328332febb56
-  data.tar.gz: 8b19fa2c2b738e53711fdb4bbdac6a196ce8499b8a212b742be734318a526bd495bed6ddfd97f771c005323ee2583f6207feea8f79850b95e7c3aced24ac3cec
+  metadata.gz: 5d0a5f3137c9350da36a431790b3dc18dc3b0d38a32d605ba6bc3ee5c1c9b13950026e0aff037f486f55f6b5d0943323bbd4342de0e558289c7c785f7809c548
+  data.tar.gz: 6f835fda78aca5c38d43e05a73af41cc88a13a5ec7a880406bc7b35c9c984cddd0b5ebdce3a56b30faff9a276971584c750c419f010f0f5e52532465c63a2e53

data/Rakefile

@@ -5,11 +5,16 @@ Rake::TestTask.new :test do |t|
   t.warning = true
 end
 
+Rake::TestTask.new :test_less do |t|
+  t.pattern = "test/{[!r][!e][!l][!a][!y]}*.rb"
+  t.warning = true
+end
+
 task :relay do |t|
-  sh "ruby -I lib examples/relay.rb"
+  sh "bundle exec falcon serve --bind wss://localhost:7070"
 end
 
-task default: [:test, :relay]
+task default: [:test]
 
 begin
   require 'buildar'

data/VERSION

@@ -1 +1 @@
-0.1.0.1
+0.2.0.1

data/lib/nostrb/client.rb

@@ -0,0 +1,75 @@
+require 'async'
+require 'async/http/endpoint'
+require 'async/websocket/client'
+
+require 'nostrb/source'
+
+module Nostrb
+  class Client
+    attr_reader :url, :endpoint, :sid
+
+    def initialize(relay_url, sid: nil)
+      @url = relay_url
+      @endpoint = Async::HTTP::Endpoint.parse(@url)
+      @sid = sid.nil? ? Source.random_sid : sid
+    end
+
+    def log msg
+      warn msg
+    end
+
+    # open, send req, get response, return response
+    def single(req)
+      Sync do
+        Async::WebSocket::Client.connect(@endpoint) do |conn|
+          conn.write(Nostrb.json(req))
+          conn.flush
+          resp = conn.read
+          conn.shutdown
+          Nostrb.parse(resp.buffer)
+        end
+      end
+    end
+
+    def publish(signed_event)
+      case single(Nostrb::Source.publish(signed_event))
+      in ['OK', String => event_id, ok, String => msg]
+        log "id mismatch: #{event_id}" unless event_id == signed_event.id
+        log msg unless ok
+        ok
+      in ['NOTICE', String => msg]
+        log msg
+      end
+    end
+
+    def subscribe(*filters, &blk)
+      Sync do
+        Async::WebSocket::Client.connect(@endpoint) do |conn|
+          conn.write(Nostrb.json(Nostrb::Source.subscribe(@sid, *filters)))
+          conn.flush
+          eose = false
+          while !eose and resp = conn.read
+            case Nostrb.parse(resp.buffer)
+            in ['EVENT', String => sid, Hash => event]
+              log "sid mismatch: #{sid}" unless sid == @sid
+              yield event
+            in ['EOSE', String => sid]
+              log "sid mismatch: #{sid}" unless sid == @sid
+              eose = true
+            end
+          end
+          conn.shutdown
+        end
+      end
+    end
+
+    def close
+      case single(Nostrb::Source.close(@sid))
+      in ['CLOSED', String => sid, String => msg]
+        log "sid mismatch: #{sid}" unless sid == @sid
+        log msg unless msg.empty?
+        true
+      end
+    end
+  end
+end

data/lib/nostrb/event.rb

@@ -19,25 +19,38 @@ module Nostrb
       tag_values('d', tags).first
     end
 
+    def self.freeze_tags(tags)
+      tags.each { |a|
+        a.each { |s| s.freeze }
+        a.freeze
+      }
+      tags.freeze
+    end
+
     attr_reader :content, :kind, :tags, :pk
 
     def initialize(content = '', kind: 1, tags: [], pk:)
-      @content = Nostrb.txt!(content)
+      @content = Nostrb.txt!(content) # frozen
       @kind    = Nostrb.kind!(kind)
       @tags    = Nostrb.tags!(tags)
-      @pk      = Nostrb.key!(pk)
+      @pk      = Nostrb.key!(pk)      # frozen
     end
 
     alias_method :to_s, :content
 
     def serialize(created_at)
-      [0, self.pubkey, Nostrb.int!(created_at), @kind, @tags, @content]
+      [0, self.pubkey, Nostrb.int!(created_at), @kind, @tags, @content].freeze
+    end
+
+    def freeze
+      Event.freeze_tags(@tags)
+      self
     end
 
     def to_a = serialize(Time.now.to_i)
     def pubkey = SchnorrSig.bin2hex(@pk)
     def digest(created_at) = Event.digest(serialize(created_at))
-    def sign(sk) = SignedEvent.new(self, sk)
+    def sign(sk) = SignedEvent.new(self.freeze, sk)
 
     #
     # Tags
@@ -82,10 +95,11 @@ module Nostrb
       Nostrb.pubkey!(parsed.fetch("pubkey"))
       Nostrb.kind!(parsed.fetch("kind"))
       Nostrb.tags!(parsed.fetch("tags"))
+      Event.freeze_tags(parsed['tags'])
       Nostrb.int!(parsed.fetch("created_at"))
       Nostrb.id!(parsed.fetch("id"))
       Nostrb.sig!(parsed.fetch("sig"))
-      parsed
+      parsed.freeze
     end
 
     def self.digest(valid) = Nostrb.digest(Nostrb.json(serialize(valid)))
@@ -96,7 +110,7 @@ module Nostrb
              valid["created_at"],
              valid["kind"],
              valid["tags"],
-             valid["content"], ]
+             valid["content"], ].freeze
     end
 
     # Validate the id (optional) and signature
@@ -127,8 +141,8 @@ module Nostrb
     def initialize(event, sk)
       @event = Nostrb.check!(event, Event)
       @created_at = Time.now.to_i
-      @digest = @event.digest(@created_at)
-      @signature = SchnorrSig.sign(Nostrb.key!(sk), @digest)
+      @digest = @event.digest(@created_at).freeze
+      @signature = SchnorrSig.sign(Nostrb.key!(sk), @digest).freeze
     end
 
     def content = @event.content
@@ -138,8 +152,8 @@ module Nostrb
     def to_s = @event.to_s
     def serialize = @event.serialize(@created_at)
 
-    def id = SchnorrSig.bin2hex(@digest)
-    def sig = SchnorrSig.bin2hex(@signature)
+    def id = SchnorrSig.bin2hex(@digest).freeze
+    def sig = SchnorrSig.bin2hex(@signature).freeze
 
     def to_h
       Hash[ "content" => @event.content,
@@ -148,7 +162,7 @@ module Nostrb
             "pubkey" => @event.pubkey,
             "created_at" => @created_at,
             "id" => self.id,
-            "sig" => self.sig ]
+            "sig" => self.sig ].freeze
     end
   end
 end

data/lib/nostrb/filter.rb

@@ -71,6 +71,10 @@ module Nostrb
       @limit = nil
     end
 
+    def to_s
+      self.to_h.to_s
+    end
+
     def add_ids(*event_ids)
       @ids += event_ids.each { |id| Nostrb.id!(id) }
     end
@@ -138,7 +142,7 @@ module Nostrb
       h["since"] = @since unless @since.nil?
       h["until"] = @until unless @until.nil?
       h["limit"] = @limit unless @limit.nil?
-      h
+      h.freeze
     end
   end
 end

data/lib/nostrb/json.rb

@@ -14,6 +14,6 @@ module Nostrb
     space_before: '',
   }
 
-  def self.parse(json) = JSON.parse(json, **JSON_OPTIONS)
-  def self.json(object) = JSON.generate(object, **JSON_OPTIONS)
+  def self.parse(json) = JSON.parse(json, **JSON_OPTIONS).freeze
+  def self.json(object) = JSON.generate(object, **JSON_OPTIONS).freeze
 end

data/lib/nostrb/oj.rb

@@ -1,6 +1,6 @@
 require 'oj'
 
 module Nostrb
-  def self.parse(json)  = Oj.load(json, mode: :strict)
-  def self.json(object) = Oj.dump(object, mode: :strict)
+  def self.parse(json)  = Oj.load(json, mode: :strict).freeze
+  def self.json(object) = Oj.dump(object, mode: :strict).freeze
 end

data/lib/nostrb/relay.rb

@@ -14,7 +14,7 @@ require 'set' # jruby wants this
 # for replaceable events with same timestamp, lowest id wins
 
 module Nostrb
-  class Server
+  class Relay
     def self.event(sid, event) = ["EVENT", Nostrb.sid!(sid), event.to_h]
     def self.ok(eid, msg = "", ok: true)
       ["OK", Nostrb.id!(eid), !!ok, ok ? Nostrb.txt!(msg) : Nostrb.help!(msg)]
@@ -58,10 +58,10 @@ module Nostrb
         when 'CLOSE'
           [handle_close(Nostrb.sid!(a[1]))]
         else
-          [Server.notice("unexpected: #{a[0].inspect}")]
+          [Relay.notice("unexpected: #{a[0].inspect}")]
         end
       rescue StandardError => e
-        [Server.error(e)]
+        [Relay.error(e)]
       end
     end
 
@@ -70,7 +70,7 @@ module Nostrb
       begin
         hsh = SignedEvent.validate!(hsh)
       rescue Nostrb::Error, KeyError, RuntimeError => e
-        return Server.error(e)
+        return Relay.error(e)
       end
 
       eid = hsh.fetch('id')
@@ -94,11 +94,11 @@ module Nostrb
           raise(SignedEvent::Error, "kind: #{hsh['kind']}")
         end
 
-        Server.ok(eid)
+        Relay.ok(eid)
       rescue SignedEvent::Error => e
-        Server.ok(eid, Server.message(e), ok: false)
+        Relay.ok(eid, Relay.message(e), ok: false)
       rescue Nostrb::Error, KeyError, RuntimeError => e
-        Server.error(e)
+        Relay.error(e)
       end
     end
 
@@ -124,19 +124,19 @@ module Nostrb
 
       filters.each { |f|
         @reader.process_events(f).each { |h|
-          responses << Server.event(sid, h) if f.match? h
+          responses << Relay.event(sid, h) if f.match? h
         }
         @reader.process_r_events(f).each { |h|
-          responses << Server.event(sid, h) if f.match? h
+          responses << Relay.event(sid, h) if f.match? h
         }
       }
       responses = responses.to_a
-      responses << Server.eose(sid)
+      responses << Relay.eose(sid)
     end
 
     # single response
     def handle_close(sid)
-      Server.closed(sid, "reason: CLOSE requested")
+      Relay.closed(sid, "reason: CLOSE requested")
     end
   end
 end

data/lib/nostrb/sequel.rb

@@ -4,7 +4,7 @@ require 'nostrb/sqlite'
 module Nostrb
   module Sequel
     class Storage < SQLite::Storage
-      FILENAME = 'sequel.db'
+      FILENAME = 'sequel.tmp.db'
       TABLES = [:events, :tags, :r_events, :r_tags]
 
       def self.schema_line(col, cfg)
@@ -77,7 +77,7 @@ module Nostrb
       end
 
       def create_tables
-        @db.create_table :events do
+        @db.create_table :events, strict: true do
           text :content,    null: false
           int  :kind,       null: false
           text :tags,       null: false
@@ -89,8 +89,7 @@ module Nostrb
           text :sig,        null: false
         end
 
-        @db.create_table :tags do
-          # text :event_id, null: false # fk
+        @db.create_table :tags, strict: true do
           foreign_key :event_id, :events,
                       key: :id,
                       type: :text,
@@ -103,7 +102,7 @@ module Nostrb
           text :json,       null: false
         end
 
-        @db.create_table :r_events do
+        @db.create_table :r_events, strict: true do
           text :content,    null: false
           int  :kind,       null: false
           text :tags,       null: false
@@ -120,7 +119,7 @@ module Nostrb
                 }
         end
 
-        @db.create_table :r_tags do
+        @db.create_table :r_tags, strict: true do
           foreign_key :r_event_id, :r_events,
                       key: :id,
                       type: :text,
@@ -145,7 +144,7 @@ module Nostrb
               'pubkey' => event_row.fetch(:pubkey),
               'created_at' => event_row.fetch(:created_at),
               'id' => event_row.fetch(:id),
-              'sig' => event_row.fetch(:sig), ]
+              'sig' => event_row.fetch(:sig), ].freeze
       end
 
       def self.event_clauses(filter)

data/lib/nostrb/source.rb

@@ -11,30 +11,30 @@ module Nostrb
     #######################
     # Client Requests
 
-    def self.publish(signed) = ["EVENT", signed.to_h]
+    def self.publish(signed) = ["EVENT", signed.to_h].freeze
 
     def self.subscribe(sid, *filters)
       ["REQ", Nostrb.sid!(sid), *filters.map { |f|
          Nostrb.check!(f, Filter).to_h
-      }]
+      }].freeze
     end
 
-    def self.close(sid) = ["CLOSE", Nostrb.sid!(sid)]
+    def self.close(sid) = ["CLOSE", Nostrb.sid!(sid)].freeze
 
     #######################
     # Utils / Init
 
     def self.random_sid
-      SchnorrSig.bin2hex Random.bytes(32)
+      SchnorrSig.bin2hex(Random.bytes(32)).freeze
     end
 
     attr_reader :pk
 
     def initialize(pk)
-      @pk = Nostrb.key!(pk)
+      @pk = Nostrb.key!(pk).freeze
     end
 
-    def pubkey = SchnorrSig.bin2hex(@pk)
+    def pubkey = SchnorrSig.bin2hex(@pk).freeze
 
     ############################
     # Event Creation

data/lib/nostrb/sqlite.rb

@@ -112,7 +112,7 @@ module Nostrb
       MB = KB * 1024
       GB = MB * 1024
 
-      FILENAME = 'tmp.db'
+      FILENAME = 'sqlite.tmp.db'
       CONFIG = {
         default_transaction_mode: :immediate,
       }
@@ -241,7 +241,7 @@ CREATE TABLE events (content    TEXT NOT NULL,
                      pubkey     TEXT NOT NULL,
                      created_at INT NOT NULL,
                      id         TEXT PRIMARY KEY NOT NULL,
-                     sig        TEXT NOT NULL)
+                     sig        TEXT NOT NULL) STRICT
 SQL
 
         @db.execute <<SQL
@@ -250,7 +250,7 @@ CREATE TABLE tags (event_id    TEXT NOT NULL REFERENCES events (id)
                    created_at  INT NOT NULL,
                    tag         TEXT NOT NULL,
                    value       TEXT NOT NULL,
-                   json        TEXT NOT NULL)
+                   json        TEXT NOT NULL) STRICT
 SQL
 
         @db.execute <<SQL
@@ -261,7 +261,7 @@ CREATE TABLE r_events (content    TEXT NOT NULL,
                        pubkey     TEXT NOT NULL,
                        created_at INT NOT NULL,
                        id         TEXT PRIMARY KEY NOT NULL,
-                       sig        TEXT NOT NULL)
+                       sig        TEXT NOT NULL) STRICT
 SQL
 
         @db.execute <<SQL
@@ -270,7 +270,7 @@ CREATE TABLE r_tags (r_event_id TEXT NOT NULL REFERENCES r_events (id)
                      created_at INT NOT NULL,
                      tag        TEXT NOT NULL,
                      value      TEXT NOT NULL,
-                     json       TEXT NOT NULL)
+                     json       TEXT NOT NULL) STRICT
 SQL
       end
 
@@ -394,6 +394,10 @@ SQL
     end
 
     class Writer < Storage
+      def self.serialize_tags(valid)
+        valid.merge("tags" => Nostrb.json(valid["tags"]))
+      end
+
       # a valid hash, as returned from SignedEvent.validate!
       def add_event(valid)
         @add_event ||= @db.prepare("INSERT INTO events
@@ -402,12 +406,10 @@ SQL
         @add_tag ||= @db.prepare("INSERT INTO tags
                                      VALUES (:event_id, :created_at,
                                              :tag, :value, :json)")
-        tags = valid["tags"]
-        valid["tags"] = Nostrb.json(tags)
-        @add_event.execute(valid) # insert event
-        tags.each { |a|           # insert tags
-          @add_tag.execute(event_id: valid.fetch('id'),
-                           created_at: valid.fetch('created_at'),
+        @add_event.execute(Writer.serialize_tags(valid)) # insert event
+        valid["tags"].each { |a|                         # insert tags
+          @add_tag.execute(event_id: valid['id'],
+                           created_at: valid['created_at'],
                            tag: a[0],
                            value: a[1],
                            json: Nostrb.json(a))
@@ -423,14 +425,13 @@ SQL
         @add_rtag ||= @db.prepare("INSERT INTO r_tags
                                       VALUES (:r_event_id, :created_at,
                                               :tag, :value, :json)")
-        tags = valid.fetch('tags')
-        d_tags = tags.select { |a| a[0] == 'd' }
-        valid['d_tag'] = d_tags.empty? ? nil : d_tags[0][1]
-        valid['tags'] = Nostrb.json(tags)
-        @add_r_event.execute(valid) # upsert event
-        tags.each { |a|             # insert tags
-          @add_rtag.execute(r_event_id: valid.fetch('id'),
-                            created_at: valid.fetch('created_at'),
+        tags = valid['tags']
+        record = Writer.serialize_tags(valid)
+        record['d_tag'] = Event.d_tag(tags)
+        @add_r_event.execute(record) # upsert event
+        tags.each { |a|              # insert tags
+          @add_rtag.execute(r_event_id: valid['id'],
+                            created_at: valid['created_at'],
                             tag: a[0],
                             value: a[1],
                             json: Nostrb.json(a))

data/lib/nostrb.rb

@@ -7,14 +7,12 @@ rescue LoadError
 end
 
 module Nostrb
-  GEMS = %w[rbsecp256k1 oj sqlite3 sequel]
-
   class Error < RuntimeError; end
   class SizeError < Error; end
   class FormatError < Error; end
 
   # return 32 bytes binary
-  def self.digest(str) = Digest::SHA256.digest(str)
+  def self.digest(str) = Digest::SHA256.digest(str).freeze
 
   def self.check!(val, cls)
     val.is_a?(cls) ? val : raise(TypeError, "#{cls} expected: #{val.inspect}")
@@ -45,7 +43,7 @@ module Nostrb
     end
     raise(SizeError, str.length) if !length.nil? and str.length != length
     raise(SizeError, str.length) if !max.nil? and str.length > max
-    str
+    str.freeze
   end
 
   def self.bin!(str, length: nil, max: nil)
@@ -58,6 +56,7 @@ module Nostrb
     str!(str, binary: false, length: length, max: max)
   end
   def self.pubkey!(str) = txt!(str, length: 64)
+
   def self.id!(str) = txt!(str, length: 64)
   def self.sid!(str) = txt!(str, max: 64)
   def self.sig!(str) = txt!(str, length: 128)
@@ -73,39 +72,44 @@ module Nostrb
     ary!(ary, max: 9999).each { |a| ary!(a, max: 99).each { |s| txt!(s) } }
   end
 
-  def self.rbsecp256k1?
-    begin
-      require 'rbsecp256k1'; Secp256k1
-    rescue LoadError, NameError
-      false
+  # optional dependencies
+  module Optional
+    GEMS = %w[rbsecp256k1 oj sqlite3 sequel]
+
+    def self.rbsecp256k1?
+      begin
+        require 'rbsecp256k1'; ::Secp256k1
+      rescue LoadError, NameError
+        false
+      end
     end
-  end
 
-  def self.oj?
-    begin
-      require 'oj'; Oj
-    rescue LoadError, NameError
-      false
+    def self.oj?
+      begin
+        require 'oj'; ::Oj
+      rescue LoadError, NameError
+        false
+      end
     end
-  end
 
-  def self.sqlite3?
-    begin
-      require 'sqlite3'; SQLite3
-    rescue LoadError, NameError
-      false
+    def self.sqlite3?
+      begin
+        require 'sqlite3'; ::SQLite3
+      rescue LoadError, NameError
+        false
+      end
     end
-  end
 
-  def self.sequel?
-    begin
-      require 'sequel'; Sequel
-    rescue LoadError, NameError
-      false
+    def self.sequel?
+      begin
+        require 'sequel'; ::Sequel
+      rescue LoadError, NameError
+        false
+      end
     end
-  end
 
-  def self.gem_check
-    GEMS.map { |gem| [gem, self.send("#{gem}?")] }.to_h
+    def self.gem_check
+      GEMS.map { |gem| [gem, self.send("#{gem}?")] }.to_h
+    end
   end
 end

data/test/relay.rb

@@ -12,7 +12,7 @@ DB_FILE = ENV['INPUT_DB_FILE'] || 'testing.db'
 # use SQLite backing
 SQLite::Setup.new(DB_FILE).setup
 
-describe Server do
+describe Relay do
   def valid_response!(resp)
     types = ["EVENT", "OK", "EOSE", "CLOSED", "NOTICE"]
     expect(resp).must_be_kind_of Array
@@ -26,7 +26,7 @@ describe Server do
   describe "class functions" do
     it "has an EVENT response, given subscriber_id and requested event" do
       sid = '1234'
-      resp = Server.event(sid, Test::SIGNED)
+      resp = Relay.event(sid, Test::SIGNED)
       valid_response!(resp)
       expect(resp[0]).must_equal "EVENT"
       expect(resp[1]).must_equal sid
@@ -36,7 +36,7 @@ describe Server do
 
     it "has an OK response, given an event_id" do
       # positive ok
-      resp = Server.ok(Test::SIGNED.id)
+      resp = Relay.ok(Test::SIGNED.id)
       valid_response!(resp)
       expect(resp[0]).must_equal "OK"
       expect(resp[1]).must_equal Test::SIGNED.id
@@ -44,7 +44,7 @@ describe Server do
       expect(resp[3]).must_be_kind_of String # empty by default
 
       # negative ok
-      resp = Server.ok(Test::SIGNED.id, "error: testing", ok: false)
+      resp = Relay.ok(Test::SIGNED.id, "error: testing", ok: false)
       valid_response!(resp)
       expect(resp[0]).must_equal "OK"
       expect(resp[1]).must_equal Test::SIGNED.id
@@ -54,14 +54,14 @@ describe Server do
 
       # ok:false requires nonempty message
       expect {
-        Server.ok(Test::SIGNED.id, "", ok: false)
+        Relay.ok(Test::SIGNED.id, "", ok: false)
       }.must_raise FormatError
-      expect { Server.ok(Test::SIGNED.id, ok: false) }.must_raise FormatError
+      expect { Relay.ok(Test::SIGNED.id, ok: false) }.must_raise FormatError
     end
 
     it "has an EOSE response to conclude a series of EVENT responses" do
       sid = '1234'
-      resp = Server.eose(sid)
+      resp = Relay.eose(sid)
       valid_response!(resp)
       expect(resp[0]).must_equal "EOSE"
       expect(resp[1]).must_equal sid
@@ -70,7 +70,7 @@ describe Server do
     it "has a CLOSED response to shut down a subscriber" do
       sid = '1234'
       msg = "closed: bye"
-      resp = Server.closed(sid, msg)
+      resp = Relay.closed(sid, msg)
       valid_response!(resp)
       expect(resp[0]).must_equal "CLOSED"
       expect(resp[1]).must_equal sid
@@ -80,7 +80,7 @@ describe Server do
     it "has a NOTICE response to provide any message to the user" do
       msg = "all i ever really wanna do is get nice, " +
             "get loose and goof this little slice of life"
-      resp = Server.notice(msg)
+      resp = Relay.notice(msg)
       valid_response!(resp)
       expect(resp[0]).must_equal "NOTICE"
       expect(resp[1]).must_equal msg
@@ -89,16 +89,16 @@ describe Server do
     it "formats Exceptions to a common string representation" do
       r = RuntimeError.new("stuff")
       expect(r).must_be_kind_of Exception
-      expect(Server.message(r)).must_equal "RuntimeError: stuff"
+      expect(Relay.message(r)).must_equal "RuntimeError: stuff"
 
       e = Nostrb::Error.new("things")
       expect(e).must_be_kind_of Exception
-      expect(Server.message(e)).must_equal "Error: things"
+      expect(Relay.message(e)).must_equal "Error: things"
     end
 
     it "uses NOTICE to return errors" do
       e = RuntimeError.new "stuff"
-      resp = Server.error(e)
+      resp = Relay.error(e)
       valid_response!(resp)
       expect(resp[0]).must_equal "NOTICE"
       expect(resp[1]).must_equal "RuntimeError: stuff"
@@ -106,14 +106,14 @@ describe Server do
   end
 
   it "has no initialization parameters" do
-    s = Server.new(DB_FILE)
-    expect(s).must_be_kind_of Server
+    s = Relay.new(DB_FILE)
+    expect(s).must_be_kind_of Relay
   end
 
   # respond OK: true
   it "has a single response to EVENT requests" do
     json = Nostrb.json(Source.publish(Test::SIGNED))
-    responses = Server.new(DB_FILE).ingest(json)
+    responses = Relay.new(DB_FILE).ingest(json)
     expect(responses).must_be_kind_of Array
     expect(responses.length).must_equal 1
 
@@ -126,7 +126,7 @@ describe Server do
 
   # store and retrieve with a subscription filter
   it "stores inbound events" do
-    s = Server.new(DB_FILE)
+    s = Relay.new(DB_FILE)
     sk, pk = SchnorrSig.keypair
     e = Event.new('sqlite', pk: pk).sign(sk)
     resp = s.ingest Nostrb.json(Source.publish(e))
@@ -152,7 +152,7 @@ describe Server do
   end
 
   it "has multiple responses to REQ requets" do
-    s = Server.new(DB_FILE)
+    s = Relay.new(DB_FILE)
     sk, pk = SchnorrSig.keypair
     e = Event.new('first', pk: pk).sign(sk)
     resp = s.ingest Nostrb.json(Source.publish(e))
@@ -204,7 +204,7 @@ describe Server do
   end
 
   it "has a single response to CLOSE requests" do
-    s = Server.new(DB_FILE)
+    s = Relay.new(DB_FILE)
     sid = Test::EVENT.pubkey
     responses = s.ingest(Nostrb.json(Source.close(sid)))
 
@@ -221,9 +221,9 @@ describe Server do
   describe "error handling" do
     # invalid request type
     it "handles unknown unknown request types with an error notice" do
-      a = Source.publish Test::SIGNED
+      a = Source.publish(Test::SIGNED).dup
       a[0] = 'NONSENSE'
-      responses = Server.new(DB_FILE).ingest(Nostrb.json(a))
+      responses = Relay.new(DB_FILE).ingest(Nostrb.json(a))
       expect(responses).must_be_kind_of Array
       expect(responses.length).must_equal 1
 
@@ -236,10 +236,10 @@ describe Server do
 
     # replace leading open brace with space
     it "handles JSON parse errors with an error notice" do
-      j = Nostrb.json(Nostrb::Source.publish(Test::SIGNED))
+      j = Nostrb.json(Nostrb::Source.publish(Test::SIGNED)).dup
       expect(j[9]).must_equal '{'
       j[9] = ' '
-      resp = Server.new(DB_FILE).ingest(j)
+      resp = Relay.new(DB_FILE).ingest(j)
       expect(resp).must_be_kind_of Array
       expect(resp.length).must_equal 1
 
@@ -251,11 +251,12 @@ describe Server do
 
     # add "stuff":"things"
     it "handles unexpected fields with an error notice" do
-      a = Nostrb::Source.publish(Test::SIGNED)
+      a = Nostrb::Source.publish(Test::SIGNED).dup
       expect(a[1]).must_be_kind_of Hash
+      a[1] = a[1].dup
       a[1]["stuff"] = "things"
 
-      resp = Server.new(DB_FILE).ingest(Nostrb.json(a))
+      resp = Relay.new(DB_FILE).ingest(Nostrb.json(a))
       expect(resp).must_be_kind_of Array
       expect(resp.length).must_equal 1
 
@@ -269,9 +270,11 @@ describe Server do
     it "handles missing fields with an error notice" do
       a = Nostrb::Source.publish(Test::SIGNED)
       expect(a[1]).must_be_kind_of Hash
+      a = a.dup
+      a[1] = a[1].dup
       a[1].delete("tags")
 
-      resp = Server.new(DB_FILE).ingest(Nostrb.json(a))
+      resp = Relay.new(DB_FILE).ingest(Nostrb.json(a))
       expect(resp).must_be_kind_of Array
       expect(resp.length).must_equal 1
 
@@ -283,11 +286,12 @@ describe Server do
 
     # cut "id" in half
     it "handles field format errors with an error notice" do
-      a = Nostrb::Source.publish(Test::SIGNED)
+      a = Nostrb::Source.publish(Test::SIGNED).dup
       expect(a[1]).must_be_kind_of Hash
+      a[1] = a[1].dup
       a[1]["id"] = a[1]["id"].slice(0, 32)
 
-      resp = Server.new(DB_FILE).ingest(Nostrb.json(a))
+      resp = Relay.new(DB_FILE).ingest(Nostrb.json(a))
       expect(resp).must_be_kind_of Array
       expect(resp.length).must_equal 1
 
@@ -301,9 +305,11 @@ describe Server do
     it "handles invalid signature with OK:false" do
       a = Nostrb::Source.publish(Test::SIGNED)
       expect(a[1]).must_be_kind_of Hash
+      a = a.dup
+      a[1] = a[1].dup
       a[1]["sig"] = SchnorrSig.bin2hex(Random.bytes(64))
 
-      resp = Server.new(DB_FILE).ingest(Nostrb.json(a))
+      resp = Relay.new(DB_FILE).ingest(Nostrb.json(a))
       expect(resp).must_be_kind_of Array
       expect(resp.length).must_equal 1
 
@@ -318,16 +324,17 @@ describe Server do
 
     # "id" and "sig" spoofed from another event
     it "handles spoofed id with OK:false" do
-      orig = Source.publish(Test.new_event('orig'))
-      spoof = Source.publish(Test::SIGNED)
+      orig = Source.publish(Test.new_event('orig')).dup
+      spoof = Source.publish(Test::SIGNED).dup
 
+      orig[1] = orig[1].dup
       orig[1]["id"] = spoof[1]["id"]
       orig[1]["sig"] = spoof[1]["sig"]
 
       # now sig and id agree with each other, but not orig's content/metadata
       # the signature should verify, but the id should not
 
-      resp = Server.new(DB_FILE).ingest(Nostrb.json(orig))
+      resp = Relay.new(DB_FILE).ingest(Nostrb.json(orig))
       expect(resp).must_be_kind_of Array
       expect(resp.length).must_equal 1
 
@@ -342,10 +349,11 @@ describe Server do
 
     # random "id"
     it "handles invalid id with OK:false" do
-      a = Source.publish(Test::SIGNED)
+      a = Source.publish(Test::SIGNED).dup
+      a[1] = a[1].dup
       a[1]["id"] = SchnorrSig.bin2hex(Random.bytes(32))
 
-      resp = Server.new(DB_FILE).ingest(Nostrb.json(a))
+      resp = Relay.new(DB_FILE).ingest(Nostrb.json(a))
       expect(resp).must_be_kind_of Array
       expect(resp.length).must_equal 1
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nostrb
 version: !ruby/object:Gem::Version
-  version: 0.1.0.1
+  version: 0.2.0.1
 platform: ruby
 authors:
 - Rick Hull
@@ -33,6 +33,7 @@ files:
 - Rakefile
 - VERSION
 - lib/nostrb.rb
+- lib/nostrb/client.rb
 - lib/nostrb/event.rb
 - lib/nostrb/filter.rb
 - lib/nostrb/json.rb