faraday_ln_paywall 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 189f22ecf57061e88d58a3d9e70fa410e506779d
-  data.tar.gz: d3b011669e55c07c16ab39cf024b1b9d8cf83e44
+  metadata.gz: e4b36c056ecb79191ceb42493b4672204e987df6
+  data.tar.gz: 239fcea1e9093d674879cad9ff9280e41ed21431
 SHA512:
-  metadata.gz: 4bab8106092af137cc83eac83b7b2097a2099bb4da90b921d796ac31135a3a23071f1da5b176e89dc39ac7390c5b92f8ea3028642f1173a6fea382e22a95d83e
-  data.tar.gz: 7b6f5913247aa87fea555ac86c1bb52b48a515e77a3d89453f024072f475e87ca292ada25ac8b3a568300452b022c05b4653507acff7a9c9e955e315842d020b
+  metadata.gz: af6d7c79810f155208ca721122449d9a2be992ecba5297036a4c5be26c162f2044449472aec862abf567eaed063031ade574946a14e8606c41bd3549daf968f1
+  data.tar.gz: a83bbe7be6d258fcd0931b55afb3383ab99056b32a123b9433a86461020360c66e0cdc073d2eda74104a704222997eb90abbd461ab428de25180155ae42e629f

data/example.rb

@@ -2,11 +2,13 @@ require "bundler/setup"
 require "faraday_ln_paywall"
 require "faraday"
 
-conn = Faraday.new(:url => 'https://fourohtwo.herokuapp.com') do |faraday|
+conn = Faraday.new(:url => 'https://lightning-2pdf.herokuapp.com/') do |faraday|
+#conn = Faraday.new(:url => 'https://fourohtwo.herokuapp.com') do |faraday|
   faraday.use FaradayLnPaywall::Middleware, {
-    max_amount: 1000,
+    max_amount: 100,
     timeout: 300
   }
   faraday.adapter  Faraday.default_adapter
 end
-puts conn.get("/402").body
+puts conn.post("/html", "# hallo").body
+# puts conn.get("/402").body

data/lib/faraday_ln_paywall/middleware.rb

@@ -26,7 +26,7 @@ module FaradayLnPaywall
     end
 
     def validate_invoice!(invoice)
-      if !@options[:max_amount].nil? && @options[:max_amount] < invoice.amount
+      if !@options[:max_amount].nil? && @options[:max_amount] < invoice_amount_in_satoshi(invoice)
         raise PaymentError, "invoice amount greater than expected maximum of #{@options[:max_amount]}"
       end
       if !invoice.expiry.nil? && Time.now.to_i > invoice.timestamp + invoice.expiry.to_i
@@ -47,20 +47,35 @@ module FaradayLnPaywall
     end
 
     def call(request_env)
-      @app.call(request_env).on_complete do |response_env|
+      original_call = request_env.dup
+      response = @app.call(request_env)
+      response.on_complete do |response_env|
         if payment_requested?(response_env)
           payment = pay(response_env)
           if payment && payment.payment_error == ""
             preimage = payment.payment_preimage.each_byte.map { |b| b.to_s(16).rjust(2, '0') }.join
-            request_env[:request_headers].merge!('X-Preimage' => preimage)
-            @app.call(request_env)
+            original_call[:request_headers].merge!('X-Preimage' => preimage)
+            response = @app.call(original_call)
           else
             raise PaymentError, payment.payment_error
           end
         end
       end
+      response
     end
 
+    # todo move to Lightning/invoice gem
+    def invoice_amount_in_satoshi(invoice)
+      return if invoice.amount.nil?
+      multi = {
+        'm' => 0.001,
+        'u' => 0.000001,
+        'n' => 0.000000001,
+        'p' => 0.000000000001
+      }[invoice.multiplier]
+
+      (invoice.amount * multi * 100000000).to_i # amount in bitcoin * 100000000
+    end
   end
 end
 

data/lib/faraday_ln_paywall/version.rb

@@ -1,3 +1,3 @@
 module FaradayLnPaywall
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faraday_ln_paywall
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - bumi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-21 00:00:00.000000000 Z
+date: 2018-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler