runlight 0.2.0 → 0.3.0

data/lib/runlight/safefetch.rb

@@ -80,22 +80,30 @@ module Runlight
       return false if g.nil?
 
       embedded = ->(hi, lo) { [hi >> 8, hi & 255, lo >> 8, lo & 255] }
-      zero = ->(groups) { groups.all?(&:zero?) }
-      # IPv4 inside IPv6: mapped (::ffff:0:0/96), the old compatible form (::/96), and NAT64 (64:ff9b::/96).
-      if zero.call(g[0, 5]) && (g[5] == 0xffff || g[5].zero?)
-        return g[5].zero? && g[6].zero? && g[7] <= 1 ? false : public_v4?(embedded.call(g[6], g[7]))
-      end
-      return public_v4?(embedded.call(g[6], g[7])) if g[0] == 0x64 && g[1] == 0xff9b && zero.call(g[2, 4])
+      # IPv4 inside IPv6: mapped (::ffff:0:0/96), the old compatible form (::/96), translated (::ffff:0:0:0/96),
+      # and NAT64 (64:ff9b::/96).
+      inside = embedded_v4(g)
+      return g[5].zero? && g[4].zero? && g[6].zero? && g[7] <= 1 ? false : public_v4?(inside) unless inside.nil?
       # 6to4 carries an IPv4 address in its second and third groups.
       return public_v4?(embedded.call(g[1], g[2])) if g[0] == 0x2002
-      return false if (g[0] & 0xfe00) == 0xfc00 || (g[0] & 0xffc0) == 0xfe80 || (g[0] & 0xff00) == 0xff00
-      # Teredo, documentation, and discard prefixes.
-      return false if g[0] == 0x2001 && (g[1].zero? || g[1] == 0xdb8)
-      return false if g[0] == 0x100 && zero.call(g[1, 3])
+      # Only global unicast (2000::/3) is public, which leaves out unique local, link-local, the old site-local,
+      # multicast, discard, and local-use NAT64 (64:ff9b:1::/48), which may carry any address.
+      return false if (g[0] & 0xe000) != 0x2000
+      # The protocol assignments (2001::/23, with Teredo and ORCHID) and the documentation prefixes.
+      return false if g[0] == 0x2001 && (g[1] < 0x200 || g[1] == 0xdb8)
+      return false if (g[0] & 0xfff0) == 0x3ff0
 
       true
     end
 
+    # The IPv4 address inside a mapped, compatible, translated, or NAT64 IPv6 address, or nil.
+    def embedded_v4(g)
+      inside = (g[0, 5].all?(&:zero?) && (g[5] == 0xffff || g[5].zero?)) ||
+               (g[0, 4].all?(&:zero?) && g[4] == 0xffff && g[5].zero?) ||
+               (g[0] == 0x64 && g[1] == 0xff9b && g[2, 4].all?(&:zero?))
+      inside ? [g[6] >> 8, g[6] & 255, g[7] >> 8, g[7] & 255] : nil
+    end
+
     # Names clouds give their metadata services.
     METADATA_NAMES = %w[metadata metadata.google.internal metadata.goog instance-data instance-data.ec2.internal].freeze
 
@@ -105,10 +113,8 @@ module Runlight
     def metadata_address?(ip)
       four = v4(ip)
       g = four.nil? ? v6(ip) : nil
-      # IPv4 inside IPv6, mapped (::ffff:0:0/96), compatible (::/96), or NAT64 (64:ff9b::/96), is read as IPv4.
-      if four.nil? && !g.nil? && ((g[0, 5].all?(&:zero?) && (g[5] == 0xffff || g[5].zero?)) || (g[0] == 0x64 && g[1] == 0xff9b && g[2, 4].all?(&:zero?)))
-        four = [g[6] >> 8, g[6] & 255, g[7] >> 8, g[7] & 255]
-      end
+      # IPv4 inside IPv6, mapped, compatible, translated, or NAT64, is read as IPv4.
+      four = embedded_v4(g) if four.nil? && !g.nil?
       return (four[0] == 169 && four[1] == 254) || four == [100, 100, 100, 200] unless four.nil?
       return false if g.nil?
       return true if (g[0] & 0xffc0) == 0xfe80

data/lib/runlight/server/config.rb

@@ -16,7 +16,8 @@ module Runlight
     #   RUNLIGHT_SECRET       signs sessions and encrypts saved keys (made and kept in DATA_DIR if unset)
     #   RUNLIGHT_TOKEN        also accepted as a bearer token on the API, and makes the first account
     #   RUNLIGHT_URL          the dashboard's public address, which can never become a link domain
-    #   TRUST_PROXY           "false" when no proxy sits in front, so forwarded addresses are ignored
+    #   TRUST_PROXY           unset believes forwarded addresses only from a private network; "false" never,
+    #                         "true" from anywhere, or the one header a CDN sets, such as cf-connecting-ip
     #   RUNLIGHT_GEO          city (the default), country, off, or the path to an MMDB file
     #   CRON_SECRET           lets a scheduler run the check over HTTP, at POST /api/check
     #   RUNLIGHT_OBSERVE_KEY  one key for every site's AI agent reports
@@ -115,7 +116,7 @@ module Runlight
       end
 
       # false with nothing in front, or the one header your proxy sets, such as cf-connecting-ip behind Cloudflare.
-      # Unset stays nil, so the library's default applies and it can warn when nothing sits in front.
+      # Unset stays nil, so the library's default applies: forwarding headers count only from a private address.
       def trust_proxy
         value = (get("TRUST_PROXY") || "").downcase
         return nil if value == ""

data/lib/runlight/store/sql.rb

@@ -27,6 +27,8 @@ module Runlight
 
       # The most visits journeys reads, newest first.
       JOURNEY_VISITS = 20_000
+      # The most visits a funnel is counted over: the newest in the range, so its rows fit in memory over any range.
+      FUNNEL_VISITS = 100_000
 
       # How long after a visit starts its events are looked for: far past any real visit.
       EVENT_TAIL_MS = 2 * 86_400_000

data/lib/runlight/store/sql_store.rb

@@ -25,6 +25,7 @@ module Runlight
     class SqlStore
       BOUNCE_MS = Sql::BOUNCE_MS
       JOURNEY_VISITS = Sql::JOURNEY_VISITS
+      FUNNEL_VISITS = Sql::FUNNEL_VISITS
       EVENT_TAIL_MS = Sql::EVENT_TAIL_MS
       MYSQL_COLLATION = Sql::MYSQL_COLLATION
 
@@ -34,6 +35,8 @@ module Runlight
       attr_reader :db,
                   # What the store's table and index names start with: `rl_` unless it was given another.
                   :prefix
+      # The most visits a funnel is counted over; smaller in tests, to try the cap.
+      attr_accessor :funnel_visits
 
       # `prefix` takes the place of `rl_` at the start of every table and index name, so two apps can each keep
       # Runlight's tables in one database. A database that is already prefixed keeps its own.
@@ -45,6 +48,7 @@ module Runlight
         end
         @db = db
         @prefix = prefix
+        @funnel_visits = FUNNEL_VISITS
         @ready = false
         @checked_all = false
       end
@@ -575,7 +579,18 @@ module Runlight
       # How many visits reached each step, in order, within the same visit. Step
       # one is the first matching row in the range; each later step must come
       # after the step before it. Filters choose which visits enter the funnel.
+      # {"counts" => Array<Integer>, "sampled" => bool}
       def funnel_counts(query, funnel)
+        # Past funnel_visits visits in the range, only the newest are counted: the range starts where the oldest
+        # of them began.
+        scope = Sql.visit_scope(query["filters"], query["site"], query["from"], query["to"], @db.dialect)
+        first = @db.all(
+          "SELECT COUNT(*) AS n, MIN(started_at) AS t FROM (SELECT s.started_at AS started_at FROM rl_sessions s WHERE s.site = ? AND s.started_at >= ? AND s.started_at < ? AND #{Sql::IS_VISIT}#{scope["sql"]}
+         ORDER BY s.started_at DESC, s.id LIMIT #{@funnel_visits + 1}) x",
+          [query["site"], query["from"], query["to"], *scope["params"]],
+        )[0] || {}
+        sampled = Sql.num(first["n"]) > @funnel_visits
+        query = query.merge("from" => [query["from"], Sql.num(first["t"]) + 1].max) if sampled
         # The rows of the picked visits that match any step, in order, read once and walked here: a join from
         # each step to the next is planned badly by Postgres, which cannot guess how many visits go on.
         v = Sql.visit_rows(query["filters"], query["site"], query["from"], query["to"], @db.dialect)
@@ -611,7 +626,7 @@ module Runlight
           reached += 1 if reached < counts.length && Sql.num(row["m#{reached}"]) == 1
         end
         close.call
-        counts
+        { "counts" => counts, "sampled" => sampled }
       end
 
       # Each visit's pageviews in order, at most `per_visit` of them, for journeys.

data/lib/runlight/version.rb

@@ -4,7 +4,7 @@ require "json"
 
 module Runlight
   # The gem's own version, which the release keeps equal to the npm package's.
-  GEM_VERSION = "0.2.0"
+  GEM_VERSION = "0.3.0"
 
   # The SDK's version and the HTTP API's, read from assets/build.json, which
   # scripts/ruby-assets.mts writes from the TypeScript SDK, so the two always

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: runlight
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Jon C. Phillips
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2026-10-18 00:00:00.000000000 Z
+date: 2026-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord