Simplify

Author: RogerPodacter

Gemfile

@@ -65,6 +65,7 @@ gem "memoist", "~> 0.16.2"
 
 gem "awesome_print", "~> 1.9"
 
+gem 'facet_rails_common', git: 'https://github.com/0xfacet/facet_rails_common.git'
 
 gem "redis", "~> 5.0"
 

Gemfile.lock

@@ -14,6 +14,13 @@ GIT
       rbsecp256k1 (~> 6.0)
       scrypt (~> 3.0)
 
+GIT
+  remote: https://github.com/0xfacet/facet_rails_common.git
+  revision: 2d5cf107df9ea12bb7ab59a8b1ce4d38b4de483b
+  specs:
+    facet_rails_common (0.1.0)
+      order_query (~> 0.5.3)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -216,6 +223,9 @@ GEM
       bigdecimal (>= 3.0)
       ostruct (>= 0.2)
     openssl (3.3.0)
+    order_query (0.5.5)
+      activerecord (>= 5.0, < 8.1)
+      activesupport (>= 5.0, < 8.1)
     ostruct (0.6.3)
     parallel (1.27.0)
     parser (3.2.2.4)
@@ -406,6 +416,7 @@ DEPENDENCIES
   debug
   dotenv-rails (~> 2.8)
   eth!
+  facet_rails_common!
   fastlz (~> 0.1.0)
   httparty (~> 0.22.0)
   jwt (~> 2.8)

app/models/collections_params_extractor.rb

@@ -101,7 +101,12 @@ def extract(content_uri)
     begin
       # Parse JSON (preserves key order)
       # Use DataUri to correctly handle optional parameters like ESIP6
-      json_str = DataUri.new(content_uri).decoded_data
+      json_str = if content_uri.start_with?("data:,{")
+        content_uri.sub(/\Adata:,/, '')
+      else
+        DataUri.new(content_uri).decoded_data
+      end
+      
       # TODO: make sure this is safe
       data = JSON.parse(json_str)
 

app/models/generic_protocol_extractor.rb

@@ -26,8 +26,11 @@ def extract(content_uri)
     return DEFAULT_PARAMS unless valid_data_uri?(content_uri)
     begin
       # Extract JSON from data URI using DataUri to support optional params (e.g., ESIP6)
-      json_str = DataUri.new(content_uri).decoded_data
-
+      json_str = if content_uri.start_with?("data:,{")
+        content_uri.sub(/\Adata:,/, '')
+      else
+        DataUri.new(content_uri).decoded_data
+      end
       # Parse with security checks
       data = parse_json_safely(json_str)
 
@@ -57,6 +60,8 @@ def valid_data_uri?(uri)
     return false unless uri.is_a?(String)
     return false unless DataUri.valid?(uri)
 
+    return true if uri.start_with?("data:,{")
+    
     # Ensure the payload is JSON (starts with '{')
     begin
       payload = DataUri.new(uri).decoded_data