Update

Author: alopatindev

_do.cr

@@ -63,6 +63,7 @@ BUILD_DIR        = Path[".build"]
 BACKUP_DIR       = Path[".backup"]
 CACHE_DIR        = BUILD_DIR.join(".cache")
 BANLISTS         = CACHE_DIR.join("banlists.txt")
+RELAYS           = Path["relays.json"]
 BROKEN_POST_URLS = CACHE_DIR.join("broken_post_urls.txt")
 COMMON_ROOT      = Path["_ohmyvps/alpine/alpine-root"]
 
@@ -73,6 +74,8 @@ MIRROR_FROM_TO = [
   {MEDIA_HOST, [{MIRROR_HOST, SERVER_MEDIA_DIR}]},
 ]
 
+RELAY_URI = "wss://nostr.codonaft.com"
+
 USER_AGENT = "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/135.0.0.0 Safari/537.36"
 
 NAMESERVER = "1.1.1.1"
@@ -95,7 +98,7 @@ def main
     sync(hosts)
   elsif ARGV.size >= 1 && ARGV[0] == "sync-nostr"
     profiles = ARGV.size > 1 && ARGV[1] == "profiles"
-    sync_nostr(config, profiles: profiles, output_relays: ["ws://localhost:7777", "wss://nostr.codonaft.com", "wss://purplepag.es", "wss://user.kindpag.es", "wss://nostr.oxtr.dev", "wss://nostr.girino.org"])
+    sync_nostr(config, profiles: profiles, output_relays: ["ws://localhost:7777", RELAY_URI, "wss://purplepag.es", "wss://user.kindpag.es", "wss://nostr.oxtr.dev", "wss://nostr.girino.org"])
   elsif ARGV[0] == "follow"
     follow(config, ARGV[1..].to_set, ["wss://purplepag.es", "wss://user.kindpag.es", "wss://relay.vertexlab.io"])
   elsif ARGV.size >= 1 && ARGV[0] == "health"
@@ -253,6 +256,7 @@ def build
   )
 
   generate_certbot_script(MEDIA_HOST)
+  maybe_generate_relays
 end
 
 def configure(config)
@@ -520,7 +524,7 @@ def health(config, hosts : Array(String))
   end
 
   banlists =
-    if nonempty_exists?(BANLISTS) && File.info(BANLISTS).modification_time + 1.days > Time.utc
+    if updated_today?(BANLISTS)
       File.read_lines(BANLISTS).to_set
     else
       update_banlists
@@ -700,6 +704,48 @@ def generate_certbot_script(host)
   File.chmod(output, 0o755)
 end
 
+def maybe_generate_relays
+  return if updated_today?(RELAYS)
+
+  puts("generating relays list")
+  online = JSON.parse(HTTP::Client.get("https://api.nostr.watch/v1/online").body).as_a.map { |i| i.as_s }
+  old = JSON.parse(File.read(RELAYS)).as_a.map { |i| i.as_s }
+  relays = (online + old).to_set - [RELAY_URI]
+  resolvable_relays = select_resolvable(relays.map { |i| URI.parse(i) })
+  File.write(RELAYS, resolvable_relays.map { |i| i.to_s }.sort.uniq.to_json)
+end
+
+def select_resolvable(uris : Iterable(URI)) : Array(URI)
+  ch = Channel(URI?).new
+
+  uris.reject { |i| i.host.nil? }.map do |uri|
+    spawn do
+      host = uri.host.not_nil!
+      result =
+        if host.includes?(".onion")
+          uri
+        elsif Socket::IPAddress.parse_v4_fields?(host).nil? && Socket::IPAddress.parse_v6_fields?(host).nil?
+          begin
+            Socket::Addrinfo.resolve(host, nil, :INET, :STREAM)
+            uri
+          rescue
+            begin
+              Socket::Addrinfo.resolve(host, nil, :INET6, :STREAM)
+              uri
+            rescue
+              nil
+            end
+          end
+        else
+          nil
+        end
+      ch.send(result)
+    end
+  end
+
+  uris.size.times.compact_map { ch.receive }.to_a
+end
+
 def check_icmp(host)
   output = `ping -c1 #{host} 2>&1 | grep --extended-regexp '(^ping:|100%|time=[0-9\\.]*)' | sed 's!.*time=!!;s!.*transmitted, !!'`.strip
   if output.starts_with?("ping:") || output.includes?("100%")
@@ -1903,6 +1949,10 @@ def nonempty_exists?(path : Path)
   File.file?(path) && !File.empty?(path)
 end
 
+def updated_today?(path : Path)
+  nonempty_exists?(path) && File.info(path).modification_time + 1.days > Time.utc
+end
+
 def print_expiration(time)
   if time.nil?
     warn("unknown expiration")

_hosts/media.codonaft/etc/conf.d/broadcastr

@@ -3,7 +3,7 @@ broadcastr_args="
   --tor-proxy 127.0.0.1:9050
   --allowed-pubkeys npub1alptdev5srcw2hxg03567p4k6xs3lgj7f6545suc0rzp0xw98svse7rg94,efd4d4a38bcd0004d31031a17972a6a6a3b32fe6f3953958c47d6325f2b8d106,e681745398e44c2ed67f116a02bc9e53d63d7de5eb26039224486801b0ac3c39
   --allowed-kinds 0,1,3,5,6,7,8,9,11,16,17,20,21,22,24,30,31,32,33,40,41,42,43,44,62,818,1018,1021,1022,1063,1068,1111,1222,1244,1311,1337,1617,1618,1619,1621,1630,1631,1632,1633,1971,1984,1985,1987,2003,2004,2022,4550,9041,9321,9734,9735,9802,10000,10001,10002,10003,10004,10005,10006,10007,10009,10012,10013,10015,10020,10030,10050,10051,10063,10166,30000,30002,30003,30004,30005,30006,30007,30008,30009,30015,30017,30018,30019,30020,30023,30030,30040,30041,30267,30311,30312,30388,30402,30402,30617,30818,30819,31388,31922,31923,31924,31925,31989,31990,32267,32388,34550,38172,38173,39089,39092,39701
-  --relays https://codonaft.com/relays.json,https://api.nostr.watch/v1/online,https://codonaft.com/relays_broadcasters.json,file:///etc/broadcastr/allowed.json
+  --relays https://codonaft.com/relays.json,https://codonaft.com/relays_broadcasters.json,file:///etc/broadcastr/allowed.json
   --blocked-relays file:///etc/broadcastr/blocked.json
   --disable-spam-nostr-band
 "