solari_browser/
types.rs

1//! Wire types for the Solari Browser control plane. serde field names match the
2//! JSON wire EXACTLY (camelCase where the API is camelCase).
3
4use serde::{Deserialize, Deserializer, Serialize};
5use serde_json::{Map, Value};
6
7// ---------------------------------------------------------------------------
8// Regions
9// ---------------------------------------------------------------------------
10
11/// Supported Solari regions. More coming soon.
12#[derive(Debug, Clone, Copy, PartialEq, Eq, Default)]
13pub enum SolariRegion {
14    /// `https://api.getsolari.com`
15    #[default]
16    UsWest,
17}
18
19impl SolariRegion {
20    /// The API base URL this region resolves to.
21    pub fn base_url(&self) -> &'static str {
22        match self {
23            SolariRegion::UsWest => "https://api.getsolari.com",
24        }
25    }
26}
27
28// ---------------------------------------------------------------------------
29// Storage state (cookies + localStorage)
30// ---------------------------------------------------------------------------
31
32/// Cookie `sameSite` policy, as Playwright spells it.
33#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
34pub enum SameSite {
35    Strict,
36    Lax,
37    None,
38}
39
40/// One cookie in a [`StorageState`].
41#[derive(Debug, Clone, Default, Serialize, Deserialize)]
42#[serde(rename_all = "camelCase")]
43pub struct Cookie {
44    pub name: String,
45    pub value: String,
46    #[serde(default, skip_serializing_if = "Option::is_none")]
47    pub domain: Option<String>,
48    #[serde(default, skip_serializing_if = "Option::is_none")]
49    pub path: Option<String>,
50    #[serde(default, skip_serializing_if = "Option::is_none")]
51    pub expires: Option<f64>,
52    #[serde(default, skip_serializing_if = "Option::is_none")]
53    pub http_only: Option<bool>,
54    #[serde(default, skip_serializing_if = "Option::is_none")]
55    pub secure: Option<bool>,
56    #[serde(default, skip_serializing_if = "Option::is_none")]
57    pub same_site: Option<SameSite>,
58}
59
60/// One `localStorage` key/value pair.
61#[derive(Debug, Clone, Default, Serialize, Deserialize)]
62pub struct LocalStorageEntry {
63    pub name: String,
64    pub value: String,
65}
66
67/// One origin's `localStorage` in a [`StorageState`].
68#[derive(Debug, Clone, Default, Serialize, Deserialize)]
69#[serde(rename_all = "camelCase")]
70pub struct StorageOrigin {
71    pub origin: String,
72    #[serde(default, skip_serializing_if = "Option::is_none")]
73    pub local_storage: Option<Vec<LocalStorageEntry>>,
74}
75
76/// A browser profile's persisted state — Playwright's `storageState` shape.
77/// Unknown keys round-trip through [`StorageState::extra`].
78#[derive(Debug, Clone, Default, Serialize, Deserialize)]
79#[serde(rename_all = "camelCase")]
80pub struct StorageState {
81    #[serde(default, skip_serializing_if = "Option::is_none")]
82    pub cookies: Option<Vec<Cookie>>,
83    #[serde(default, skip_serializing_if = "Option::is_none")]
84    pub origins: Option<Vec<StorageOrigin>>,
85    /// Any additional keys the wire carried (TS index signature).
86    #[serde(flatten)]
87    pub extra: Map<String, Value>,
88}
89
90// ---------------------------------------------------------------------------
91// Managed proxy
92// ---------------------------------------------------------------------------
93
94/// Managed proxy tier.
95#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
96#[serde(rename_all = "lowercase")]
97pub enum ProxyTier {
98    /// Rotating residential IPs (default).
99    Residential,
100    /// Fixed ISP IP.
101    Static,
102    /// Carrier / mobile IPs.
103    Mobile,
104}
105
106/// Managed proxy egress request.
107#[derive(Debug, Clone, Default, Serialize)]
108#[serde(rename_all = "camelCase")]
109pub struct ProxyRequest {
110    /// ISO-3166-1 alpha-2, lowercase. Defaults to `"us"` server-side.
111    #[serde(skip_serializing_if = "Option::is_none")]
112    pub country: Option<String>,
113    /// Proxy tier. Defaults to [`ProxyTier::Residential`] server-side.
114    #[serde(skip_serializing_if = "Option::is_none")]
115    pub tier: Option<ProxyTier>,
116    /// Pin egress to a specific ASN (e.g. `"20057"` for AT&T Mobility).
117    #[serde(skip_serializing_if = "Option::is_none")]
118    pub asn: Option<String>,
119    /// Sticky-session id (alnum + dash, <=32 chars). Pins the egress IP for
120    /// `session_duration` minutes.
121    #[serde(skip_serializing_if = "Option::is_none")]
122    pub session: Option<String>,
123    /// Sticky lifetime in minutes (1-30, default 10). Only with `session`.
124    #[serde(skip_serializing_if = "Option::is_none")]
125    pub session_duration: Option<u32>,
126    /// US-only geo narrowing (e.g. `"california"`).
127    #[serde(skip_serializing_if = "Option::is_none")]
128    pub state: Option<String>,
129    /// US-only city pin (e.g. `"los_angeles"`).
130    #[serde(skip_serializing_if = "Option::is_none")]
131    pub city: Option<String>,
132}
133
134impl ProxyRequest {
135    /// A request pinned to a country code.
136    pub fn country(code: impl Into<String>) -> Self {
137        ProxyRequest {
138            country: Some(code.into()),
139            ..Default::default()
140        }
141    }
142
143    pub fn tier(mut self, tier: ProxyTier) -> Self {
144        self.tier = Some(tier);
145        self
146    }
147
148    pub fn asn(mut self, asn: impl Into<String>) -> Self {
149        self.asn = Some(asn.into());
150        self
151    }
152
153    /// Pin the egress IP under a sticky-session id.
154    pub fn session(mut self, id: impl Into<String>) -> Self {
155        self.session = Some(id.into());
156        self
157    }
158
159    pub fn session_duration(mut self, minutes: u32) -> Self {
160        self.session_duration = Some(minutes);
161        self
162    }
163
164    pub fn state(mut self, state: impl Into<String>) -> Self {
165        self.state = Some(state.into());
166        self
167    }
168
169    pub fn city(mut self, city: impl Into<String>) -> Self {
170        self.city = Some(city.into());
171        self
172    }
173}
174
175/// What to send as the `proxy` field of `POST /sessions`.
176///
177/// Mirrors the TS union `string | ProxyRequest | "off" | "smart"`:
178///
179/// ```
180/// # use solari_browser::{ProxySpec, ProxyRequest, ProxyTier};
181/// ProxySpec::country("us");                                    // proxy: "us"
182/// ProxySpec::off();                                            // proxy: "off"
183/// ProxySpec::smart();                                          // proxy: "smart"
184/// ProxySpec::from(ProxyRequest::country("us").tier(ProxyTier::Static));
185/// ```
186#[derive(Debug, Clone, Serialize)]
187#[serde(untagged)]
188pub enum ProxySpec {
189    /// A bare string: a country code, or the literals `"off"` / `"smart"`.
190    Shorthand(String),
191    /// A full egress request object.
192    Request(ProxyRequest),
193}
194
195impl ProxySpec {
196    /// Shorthand country pin, e.g. `ProxySpec::country("gb")`.
197    pub fn country(code: impl Into<String>) -> Self {
198        ProxySpec::Shorthand(code.into())
199    }
200
201    /// Explicitly disable managed proxy egress (`proxy: "off"`).
202    pub fn off() -> Self {
203        ProxySpec::Shorthand("off".to_string())
204    }
205
206    /// Let the gateway sweep proxy strategies on block (`proxy: "smart"`).
207    pub fn smart() -> Self {
208        ProxySpec::Shorthand("smart".to_string())
209    }
210}
211
212impl From<ProxyRequest> for ProxySpec {
213    fn from(r: ProxyRequest) -> Self {
214        ProxySpec::Request(r)
215    }
216}
217
218/// Coarse confirmation of the proxy the gateway resolved for a session.
219///
220/// Carries NO credentials by design: egress is applied server-side (the pool
221/// attaches the upstream to your session), so a caller never dials the proxy
222/// and never needs its address or account.
223#[derive(Debug, Clone, Deserialize)]
224#[serde(rename_all = "camelCase")]
225pub struct ResolvedProxyConfig {
226    pub timezone_id: String,
227    pub country: String,
228    #[serde(default)]
229    pub tier: Option<ProxyTier>,
230}
231
232/// `GET /proxy/countries` — supported egress countries, plus whether the
233/// gateway actually has residential credentials configured.
234#[derive(Debug, Clone, Default, Deserialize)]
235pub struct ProxyCountries {
236    /// False when this gateway has no residential proxy credentials — sending a
237    /// `proxy` spec will fail.
238    #[serde(default)]
239    pub enabled: bool,
240    /// Supported ISO-3166-1 alpha-2 country codes, lowercase.
241    #[serde(default)]
242    pub countries: Vec<String>,
243}
244
245// ---------------------------------------------------------------------------
246// Sessions
247// ---------------------------------------------------------------------------
248
249/// A live browser session.
250#[derive(Debug, Clone)]
251pub struct Session {
252    pub id: String,
253    /// Playwright wire-protocol endpoint (upstream, as returned by the API).
254    pub ws_endpoint: String,
255    /// Raw CDP endpoint — for `chromiumoxide` / Puppeteer. Derived from
256    /// `ws_endpoint` when the API does not return one.
257    pub cdp_endpoint: String,
258    /// Plan-tier deadline (ISO 8601 UTC); the session auto-releases at this point.
259    pub expires_at: String,
260    /// Three-state, mirroring the TS `storageState?: StorageState | null`:
261    /// - `None` — no profile attached to this session.
262    /// - `Some(None)` — a profile is attached but has no saved state yet.
263    /// - `Some(Some(state))` — the profile's state.
264    pub storage_state: Option<Option<StorageState>>,
265    /// Present only when a managed proxy was requested.
266    pub proxy: Option<ResolvedProxyConfig>,
267}
268
269/// `GET /sessions/:id`. The API proxies the pool's view through verbatim, so
270/// every field is optional and unknown keys land in [`SessionView::extra`].
271#[derive(Debug, Clone, Default, Deserialize)]
272#[serde(rename_all = "camelCase")]
273pub struct SessionView {
274    #[serde(default)]
275    pub session_id: Option<String>,
276    #[serde(default)]
277    pub status: Option<String>,
278    #[serde(default)]
279    pub expires_at: Option<String>,
280    #[serde(flatten)]
281    pub extra: Map<String, Value>,
282}
283
284/// Presigned URL for a session's replay.
285#[derive(Debug, Clone)]
286pub struct ReplayUrl {
287    pub url: String,
288    /// Lifetime of the presigned URL. `0` when the API omits it.
289    pub expires_in_seconds: u64,
290    /// Content encoding of the object behind `url`. `"gzip"` when omitted.
291    pub content_encoding: String,
292}
293
294// ---------------------------------------------------------------------------
295// Profiles
296// ---------------------------------------------------------------------------
297
298/// A stored browser profile (cookies + localStorage).
299#[derive(Debug, Clone, Deserialize)]
300#[serde(rename_all = "camelCase")]
301pub struct Profile {
302    pub id: String,
303    #[serde(default)]
304    pub name: String,
305    /// Any additional keys the wire carried (TS index signature).
306    #[serde(flatten)]
307    pub extra: Map<String, Value>,
308}
309
310/// Result of `POST /profiles/:id/save`.
311#[derive(Debug, Clone, Default)]
312pub struct ProfileSaveResult {
313    /// Monotonic version of the saved state. `0` when the API omits it.
314    pub version: u64,
315    /// Size of the saved state in bytes. `0` when the API omits it.
316    pub size_bytes: u64,
317}
318
319// ---------------------------------------------------------------------------
320// Internal wire shapes
321// ---------------------------------------------------------------------------
322
323/// Wire body for `POST /sessions`. Falsy/unset fields are omitted; when every
324/// field is omitted the request is sent with no body at all.
325#[derive(Debug, Clone, Default, Serialize)]
326#[serde(rename_all = "camelCase")]
327pub(crate) struct CreateSessionRequest {
328    #[serde(skip_serializing_if = "Option::is_none")]
329    pub profile_id: Option<String>,
330    #[serde(skip_serializing_if = "is_false")]
331    pub recording: bool,
332    #[serde(skip_serializing_if = "is_false")]
333    pub stealth: bool,
334    #[serde(skip_serializing_if = "is_false")]
335    pub captcha: bool,
336    #[serde(skip_serializing_if = "Option::is_none")]
337    pub proxy: Option<ProxySpec>,
338}
339
340fn is_false(b: &bool) -> bool {
341    !*b
342}
343
344/// Presigned pointer to a profile's storage state, returned on session create.
345#[derive(Debug, Clone, Deserialize)]
346#[serde(rename_all = "camelCase")]
347pub(crate) struct StorageStateUrl {
348    #[serde(default)]
349    pub url: Option<String>,
350    #[allow(dead_code)]
351    #[serde(default)]
352    pub expires_in_seconds: Option<u64>,
353}
354
355/// `201` response from `POST /sessions`.
356#[derive(Debug, Clone, Deserialize)]
357#[serde(rename_all = "camelCase")]
358pub(crate) struct CreateSessionResponse {
359    #[serde(default)]
360    pub session_id: Option<String>,
361    #[serde(default)]
362    pub ws_endpoint: Option<String>,
363    #[serde(default)]
364    pub cdp_endpoint: Option<String>,
365    #[serde(default)]
366    pub expires_at: Option<String>,
367    /// Absent vs explicit `null` are distinguished.
368    #[serde(default, deserialize_with = "double_option")]
369    pub storage_state_url: Option<Option<StorageStateUrl>>,
370    /// Legacy inline state, for gateways that predate `storageStateUrl`.
371    #[serde(default, deserialize_with = "double_option")]
372    pub storage_state: Option<Option<StorageState>>,
373    #[serde(default)]
374    pub proxy: Option<ResolvedProxyConfig>,
375}
376
377/// `GET /sessions/:id/replay-url`.
378#[derive(Debug, Clone, Deserialize)]
379#[serde(rename_all = "camelCase")]
380pub(crate) struct ReplayUrlResponse {
381    #[serde(default)]
382    pub url: Option<String>,
383    #[serde(default)]
384    pub expires_in_seconds: Option<u64>,
385    #[serde(default)]
386    pub content_encoding: Option<String>,
387}
388
389/// `POST /profiles/:id/save`.
390#[derive(Debug, Clone, Deserialize)]
391#[serde(rename_all = "camelCase")]
392pub(crate) struct ProfileSaveResponse {
393    #[serde(default)]
394    pub version: Option<u64>,
395    #[serde(default)]
396    pub size_bytes: Option<u64>,
397}
398
399/// Distinguish "key absent" (`None`) from "key present and null" (`Some(None)`).
400/// Requires `#[serde(default)]` alongside it.
401fn double_option<'de, T, D>(de: D) -> Result<Option<Option<T>>, D::Error>
402where
403    T: serde::Deserialize<'de>,
404    D: Deserializer<'de>,
405{
406    serde::Deserialize::deserialize(de).map(Some)
407}
408
409// ---------------------------------------------------------------------------
410
411#[cfg(test)]
412mod resolved_proxy_tests {
413    use super::*;
414
415    /// REGRESSION GUARD for the shipped fix: the resolved-proxy type carries NO
416    /// credentials.
417    ///
418    /// `ResolvedProxyConfig` used to carry `server`/`username`/`password`. The
419    /// gateway stopped sending them (they disclose the proxy vendor's account),
420    /// so this binding deserialized empty strings forever — a contract that was
421    /// not merely dead but misleading: a caller could read `proxy.server`, get
422    /// `""`, and conclude no proxy was applied.
423    ///
424    /// Rust has no reflection, so the field set is read back out of the derived
425    /// `Debug` output. That is exactly the surface that matters anyway: whatever
426    /// `{:?}` prints is what ends up in somebody's log.
427    fn debug_field_names(dbg: &str) -> Vec<String> {
428        let inner = dbg
429            .split_once('{')
430            .and_then(|(_, rest)| rest.rsplit_once('}'))
431            .map(|(inner, _)| inner)
432            .unwrap_or("");
433        let mut names = Vec::new();
434        let mut depth = 0usize;
435        for part in inner.split(',') {
436            // Only split on top-level commas (Some(..) / nested braces).
437            if depth == 0 {
438                if let Some((name, _)) = part.split_once(':') {
439                    let name = name.trim();
440                    if !name.is_empty() {
441                        names.push(name.to_string());
442                    }
443                }
444            }
445            depth += part.matches(['(', '{', '[']).count();
446            depth = depth.saturating_sub(part.matches([')', '}', ']']).count());
447        }
448        names
449    }
450
451    #[test]
452    fn resolved_proxy_config_has_exactly_the_confirmation_fields() {
453        let wire = r#"{"timezoneId":"America/Los_Angeles","country":"us","tier":"mobile"}"#;
454        let rp: ResolvedProxyConfig = serde_json::from_str(wire).unwrap();
455
456        let names = debug_field_names(&format!("{rp:?}"));
457        assert_eq!(
458            names,
459            vec!["timezone_id", "country", "tier"],
460            "ResolvedProxyConfig must stay a COARSE CONFIRMATION: egress is applied \
461             server-side, so a caller never dials the proxy and must never receive \
462             its address or account. Got: {names:?}"
463        );
464    }
465
466    #[test]
467    fn legacy_credential_keys_are_dropped_not_resurrected() {
468        let wire = r#"{
469            "timezoneId":"America/Los_Angeles",
470            "country":"us",
471            "tier":"mobile",
472            "server":"http://resi.vendor.example:8000",
473            "username":"acct-12345",
474            "password":"hunter2"
475        }"#;
476        let rp: ResolvedProxyConfig = serde_json::from_str(wire).unwrap();
477
478        assert_eq!(rp.timezone_id, "America/Los_Angeles");
479        assert_eq!(rp.country, "us");
480
481        let rendered = format!("{rp:?}");
482        for secret in ["resi.vendor.example", "acct-12345", "hunter2", "server", "username", "password"] {
483            assert!(
484                !rendered.contains(secret),
485                "resolved proxy leaks {secret:?}: {rendered}"
486            );
487        }
488    }
489}
solari_browser/types.rs

solari_browser/
types.rs
