trmnl_preview 0.32.2 → 0.32.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9cf02342886e42a2a4b60b068657e4f58b446226febe78f8b8bcfa7758a8d54
-  data.tar.gz: 3d63d0f368a43254e0fd6b1ae134559ec58be55c1179fbc33a603ebcfd561e05
+  metadata.gz: 55b67180ccff89b08d78384020c460edfdcafe59515cb23253e227cdc8f279cc
+  data.tar.gz: f95ebeec6e33edc5398bae038860acbe18dc4846d93676b98c7bb73a33800f24
 SHA512:
-  metadata.gz: 5ab520c731381e951386bb168172c268a91732e94890e89a886dc685f5a980662b33ba6735138aa93374e96810dc1e405bb084b017debe6abb632dd72a9d152d
-  data.tar.gz: 4033ff9382961fa5b6500e3eea051b42bef94c2c73afbedd89a2a6e2d06f3d690a3ddb37fc63df96d642912a463310fcf49e1f6766b21da90b7ee02e0bc099d5
+  metadata.gz: f8a5d6c769d20a3e7bef9b5c74f4d29ccad61f642210a0f7a4c2203393db36b950d34f56050b1b7e9b93d2293160d03a2f658b7be45951a63197eb400145d9af
+  data.tar.gz: 4e0b560990974bb719c0a99f441f6e85e8904e75e2172c3cf8ac230f4020260023ea481507f68946e1f876ada648fe76963360a877a611a3456ae454d27ce808

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 
 # Changelog
 
+## 0.32.3
+
+- The poller refuses a polling URL line that TRMNL refuses, before it sends a request, and gives TRMNL's reason. A line that is not a complete http(s) URL, such as `h` or `//example.com`, has no host because a field it needs is empty, still has a `{{` or `{%`, or has a space or a non-ASCII host. Before, such a line could wait 10 seconds or fail with a connection error that did not say what was wrong.
+
 ## 0.32.2
 
 - The Docker image starts again. The 0.32.1 image kept the X display lock from its build in `/tmp`, so the display never started and every command, such as `trmnlp serve` or `trmnlp test`, waited forever. Running with `--tmpfs /tmp` worked around it. A stopped container started again had the same problem, and now clears the lock before the display starts. If the display still does not start, trmnlp stops within 10 seconds and prints why, where it used to wait forever.

data/lib/trmnlp/outbound_request.rb

@@ -37,6 +37,9 @@ module TRMNLP
     end
 
     def call(verb, url, headers:, body:)
+      refusal = refusal_reason(encoded(url))
+      return [nil, refusal] if refusal
+
       attempts = 0
       begin
         attempts += 1
@@ -82,6 +85,22 @@ module TRMNLP
       connection.get("#{url}#{url.include?('?') ? '&' : '?'}#{body}")
     end
 
+    # The same urls and words as TRMNL, which refuses these before it sends a request.
+    def refusal_reason(url)
+      return 'the url still contains an unrendered template tag' if url.match?(/\{\{|\{%/)
+
+      uri = URI.parse(url)
+      return 'the url is not a complete http(s) url' unless %w[http https].include?(uri.scheme&.downcase)
+
+      'the url has no host, so a field it needs is probably empty' if uri.hostname.to_s.empty?
+    rescue URI::InvalidURIError
+      if url.match?(/[^\x00-\x7F]/)
+        'the url host has non-ASCII characters, use its punycode (xn--) form'
+      else
+        'the url has a character that must be percent-encoded, such as a space'
+      end
+    end
+
     def failure_reason(response)
       return 'the host replied 429 Too Many Requests' if response.status == 429
 

data/lib/trmnlp/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TRMNLP
-  VERSION = '0.32.2'
+  VERSION = '0.32.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trmnl_preview
 version: !ruby/object:Gem::Version
-  version: 0.32.2
+  version: 0.32.3
 platform: ruby
 authors:
 - Rockwell Schrock