Fix environment

Cargo.toml

@@ -194,7 +194,7 @@ arrayvec = "0.7.2"
 async-channel = "2.5"
 async-stream = "0.3.6"
 async-trait = "0.1.68"
-axum = { version = "0.7", features = ["tracing", "http2"] }
+axum = { version = "0.7", features = ["tracing", "http2", "macros"] }
 axum-extra = { version = "0.9", features = ["typed-header"] }
 base64 = "0.21.2"
 bigdecimal = "0.4.7"
@@ -307,6 +307,7 @@ serde_json = { version = "1.0.128", features = ["raw_value"] }
 serde_path_to_error = "0.1.9"
 serde_with = { version = "3.3.0", features = ["base64", "hex"] }
 serial_test = "2.0.0"
+sfv = "0.15"
 sha3 = "0.10.0"
 slab = "0.4.7"
 sled = "0.34.7"

crates/bindings-macro/src/environment.rs

@@ -63,19 +63,21 @@ pub(crate) fn expand(args: TokenStream, mut item: ItemStruct) -> syn::Result<Tok
         let constraint = match values.as_deref() {
             None => quote!(<#ty as ::spacetimedb::rt::EnvironmentValue>::constraint()),
             Some([value]) => {
-                quote!(::spacetimedb::spacetimedb_lib::environment::EnvVarType::StringLiteral(#value.into()))
+                quote!(::spacetimedb::spacetimedb_lib::db::raw_def::v10::RawEnvVarTypeV10::StringLiteral(#value.into()))
             }
-            Some(values) => quote!(::spacetimedb::spacetimedb_lib::environment::EnvVarType::Union(
-                ::std::vec![#(#values.into()),*]
-            )),
+            Some(values) => quote!(
+                ::spacetimedb::spacetimedb_lib::db::raw_def::v10::RawEnvVarTypeV10::Union(
+                    ::std::vec![#(#values.into()),*]
+                )
+            ),
         };
         let constraint = if values.is_some() {
             quote!(<#ty as ::spacetimedb::rt::StringEnvironmentValue>::with_constraint(#constraint))
         } else {
             constraint
         };
         declarations.push(
-            quote!(::spacetimedb::spacetimedb_lib::environment::EnvironmentDeclaration {
+            quote!(::spacetimedb::spacetimedb_lib::db::raw_def::v10::RawEnvironmentDeclarationV10 {
                 name: #name.into(),
                 ty: #constraint,
                 optional: <#ty as ::spacetimedb::rt::EnvironmentValue>::OPTIONAL,
@@ -96,7 +98,7 @@ pub(crate) fn expand(args: TokenStream, mut item: ItemStruct) -> syn::Result<Tok
     }
     let vis = &item.vis;
     let access = format_ident!("{}Access", item.ident.unraw());
-    let symbol = format!("__preinit__20_register_environment_{}", item.ident.unraw());
+    let symbol = "__preinit__20_register_environment_there_can_only_be_one";
     Ok(quote! {
         #[allow(non_snake_case)]
         #item

crates/bindings-macro/src/environment/value.rs

@@ -69,17 +69,19 @@ pub(crate) fn derive(item: DeriveInput) -> syn::Result<TokenStream> {
         values.push(value);
     }
     let constraint = match values.as_slice() {
-        [value] => quote!(::spacetimedb::spacetimedb_lib::environment::EnvVarType::StringLiteral(#value.into())),
-        values => quote!(::spacetimedb::spacetimedb_lib::environment::EnvVarType::Union(
-            ::std::vec![#(#values.into()),*]
-        )),
+        [value] => {
+            quote!(::spacetimedb::spacetimedb_lib::db::raw_def::v10::RawEnvVarTypeV10::StringLiteral(#value.into()))
+        }
+        values => quote!(
+            ::spacetimedb::spacetimedb_lib::db::raw_def::v10::RawEnvVarTypeV10::Union(::std::vec![#(#values.into()),*])
+        ),
     };
     let ident = &item.ident;
     Ok(quote! {
         impl ::spacetimedb::rt::EnvironmentValue for #ident {
             const OPTIONAL: bool = false;
 
-            fn constraint() -> ::spacetimedb::spacetimedb_lib::environment::EnvVarType {
+            fn constraint() -> ::spacetimedb::spacetimedb_lib::db::raw_def::v10::RawEnvVarTypeV10 {
                 #constraint
             }
 

crates/bindings/Cargo.toml

@@ -42,6 +42,7 @@ serde_json.workspace = true
 [dev-dependencies]
 insta.workspace = true
 trybuild.workspace = true
+spacetimedb-lib = { path = "../lib", features = ["test"] }
 
 [lints]
 workspace = true

crates/bindings/src/rt.rs

@@ -5,7 +5,8 @@ use crate::table::IndexAlgo;
 use crate::{sys, AnonymousViewContext, IterBuf, ReducerContext, ReducerResult, SpacetimeType, Table, ViewContext};
 use spacetimedb_lib::bsatn::EncodeError;
 use spacetimedb_lib::db::raw_def::v10::{
-    CaseConversionPolicy, ExplicitNames as RawExplicitNames, RawModuleDefV10Builder,
+    CaseConversionPolicy, ExplicitNames as RawExplicitNames, RawEnvVarTypeV10, RawEnvironmentDeclarationV10,
+    RawModuleDefV10Builder,
 };
 pub use spacetimedb_lib::db::raw_def::v9::Lifecycle as LifecycleReducer;
 use spacetimedb_lib::db::raw_def::v9::{RawIndexAlgorithm, TableType, ViewResultHeader};
@@ -929,7 +930,7 @@ pub fn register_case_conversion_policy(policy: CaseConversionPolicy) {
 pub trait EnvironmentValue: Sized {
     const OPTIONAL: bool;
 
-    fn constraint() -> spacetimedb_lib::environment::EnvVarType;
+    fn constraint() -> RawEnvVarTypeV10;
 
     /// Decode a checked host result. Errors must identify only the key, never its value.
     fn from_environment(value: Option<String>, key: &str) -> Self;
@@ -947,8 +948,8 @@ pub trait RequiredEnvironmentValue: EnvironmentValue {}
 impl EnvironmentValue for String {
     const OPTIONAL: bool = false;
 
-    fn constraint() -> spacetimedb_lib::environment::EnvVarType {
-        spacetimedb_lib::environment::EnvVarType::String
+    fn constraint() -> RawEnvVarTypeV10 {
+        RawEnvVarTypeV10::String
     }
 
     fn from_environment(value: Option<String>, key: &str) -> Self {
@@ -961,7 +962,7 @@ impl RequiredEnvironmentValue for String {}
 impl<T: RequiredEnvironmentValue> EnvironmentValue for Option<T> {
     const OPTIONAL: bool = true;
 
-    fn constraint() -> spacetimedb_lib::environment::EnvVarType {
+    fn constraint() -> RawEnvVarTypeV10 {
         T::constraint()
     }
 
@@ -983,9 +984,7 @@ mod string_environment_value_sealed {
     message = "`#[env(values(...))]` requires `String` or `Option<String>`; map enum variants with `#[env(value = \"...\")]` instead"
 )]
 pub trait StringEnvironmentValue: EnvironmentValue + string_environment_value_sealed::Sealed {
-    fn with_constraint(
-        constraint: spacetimedb_lib::environment::EnvVarType,
-    ) -> spacetimedb_lib::environment::EnvVarType {
+    fn with_constraint(constraint: RawEnvVarTypeV10) -> RawEnvVarTypeV10 {
         constraint
     }
 }
@@ -995,7 +994,7 @@ impl StringEnvironmentValue for Option<String> {}
 
 /// Register declarative ENV metadata without reading any environment values.
 #[doc(hidden)]
-pub fn register_environment(declarations: fn() -> Vec<spacetimedb_lib::environment::EnvironmentDeclaration>) {
+pub fn register_environment(declarations: fn() -> Vec<RawEnvironmentDeclarationV10>) {
     register_describer(move |module| {
         module.inner.add_environment(declarations());
     });
@@ -1067,7 +1066,6 @@ extern "C" fn __describe_module__(description: BytesSink) {
     }
 
     // Serialize the module to bsatn.
-    module.inner.ensure_environment();
     let module_def = module.inner.finish();
     let module_def = RawModuleDef::V10(module_def);
     let bytes = bsatn::to_vec(&module_def).expect("unable to serialize typespace");

crates/bindings/tests/environment_enum_values.rs

@@ -1,5 +1,6 @@
 use spacetimedb::rt::EnvironmentValue as _;
-use spacetimedb::spacetimedb_lib::environment::{EnvVarType, EnvironmentDeclaration, EnvironmentSchema};
+use spacetimedb::spacetimedb_lib::environment::EnvironmentSchema;
+use spacetimedb_lib::db::raw_def::v10::{RawEnvVarTypeV10, RawEnvironmentDeclarationV10};
 use std::collections::BTreeMap;
 
 #[derive(Debug, PartialEq, Eq, spacetimedb::SpacetimeType, spacetimedb::EnvironmentValue)]
@@ -29,14 +30,15 @@ fn typed_mappings_match_exact_schema_strings_and_optional_absence() {
     ];
     assert_eq!(
         Mode::constraint(),
-        EnvVarType::Union(cases.iter().map(|(s, _)| s.to_string()).collect())
+        RawEnvVarTypeV10::Union(cases.iter().map(|(s, _)| s.to_string()).collect())
     );
     assert_eq!(Option::<Mode>::constraint(), Mode::constraint());
-    let schema = EnvironmentSchema::new(vec![EnvironmentDeclaration {
+    let schema = EnvironmentSchema::new(vec![RawEnvironmentDeclarationV10 {
         name: "MODE".into(),
         ty: Mode::constraint(),
         optional: false,
-    }])
+    }
+    .into()])
     .unwrap();
     for (value, variant) in cases {
         schema
@@ -49,7 +51,7 @@ fn typed_mappings_match_exact_schema_strings_and_optional_absence() {
         );
     }
     assert_eq!(Option::<Mode>::from_environment(None, "MODE"), None);
-    assert_eq!(Literal::constraint(), EnvVarType::StringLiteral("only".into()));
+    assert_eq!(Literal::constraint(), RawEnvVarTypeV10::StringLiteral("only".into()));
     assert_eq!(Literal::from_environment(Some("only".into()), "VALUE"), Literal::Only);
     for rejected in ["InProgress", "ready", "in progress ", "private-unmapped-value"] {
         assert!(schema

crates/cli/Cargo.toml

@@ -42,6 +42,7 @@ dirs.workspace = true
 duct.workspace = true
 futures.workspace = true
 fs-err.workspace = true
+headers.workspace = true
 http.workspace = true
 is-terminal.workspace = true
 itertools.workspace = true

crates/cli/src/schema_extract.rs

@@ -43,16 +43,7 @@ fn inspect_blocking(extractor: PathBuf, bytes: Vec<u8>, host_type: String) -> an
 }
 
 pub(crate) fn read_program(path: &std::path::Path) -> anyhow::Result<Vec<u8>> {
-    use std::io::Read;
-    let mut bytes = Vec::new();
-    std::fs::File::open(path)?
-        .take(spacetimedb_client_api_messages::publish::MAX_MODULE_BYTES as u64 + 1)
-        .read_to_end(&mut bytes)?;
-    ensure!(
-        bytes.len() <= spacetimedb_client_api_messages::publish::MAX_MODULE_BYTES,
-        "Module exceeds publish size limit"
-    );
-    Ok(bytes)
+    Ok(std::fs::read(path)?)
 }
 
 const MAX_SCHEMA_BYTES: u64 = 16 * 1024 * 1024;

crates/cli/src/schema_extract/tests.rs

@@ -89,7 +89,9 @@ fn inspector(script: &str) -> (tempfile::TempDir, PathBuf) {
 async fn local_inspection_passes_exact_bytes_host_and_requires_success() {
     use spacetimedb_lib::db::raw_def::v10::{RawModuleDefV10, RawModuleDefV10Section};
     let raw = RawModuleDef::V10(RawModuleDefV10 {
-        sections: vec![RawModuleDefV10Section::Environment(schema().into_declarations())],
+        sections: vec![RawModuleDefV10Section::Environment(
+            schema().into_declarations().into_iter().map(Into::into).collect(),
+        )],
     });
     let json = serde_json::to_string(&SerdeWrapper(raw)).unwrap();
     let (dir, extractor) = inspector(&format!(
@@ -118,7 +120,9 @@ async fn local_inspection_passes_exact_bytes_host_and_requires_success() {
 async fn synchronous_generate_adapter_uses_same_exact_byte_protocol_inside_a_runtime() {
     use spacetimedb_lib::db::raw_def::v10::{RawModuleDefV10, RawModuleDefV10Section};
     let raw = RawModuleDef::V10(RawModuleDefV10 {
-        sections: vec![RawModuleDefV10Section::Environment(schema().into_declarations())],
+        sections: vec![RawModuleDefV10Section::Environment(
+            schema().into_declarations().into_iter().map(Into::into).collect(),
+        )],
     });
     let json = serde_json::to_string(&SerdeWrapper(raw)).unwrap();
     let (_dir, extractor) = inspector(&format!(

crates/cli/src/subcommands/env.rs

@@ -97,11 +97,8 @@ async fn fetch(request: reqwest::RequestBuilder, query: Query) -> anyhow::Result
         .body(query.sql()?)
         .send()
         .await?;
-    ensure!(
-        response.status().is_success(),
-        "Environment read failed with HTTP {}",
-        response.status()
-    );
+    let response = response.error_for_status().context("failed to fetch environment")?;
+    // TODO(noa): what are we doing here. what. why are we manually buffering. help me
     let mut body = Vec::new();
     let limit = MAX_ENV_VARS * (MAX_ENV_KEY_BYTES + MAX_ENV_VALUE_BYTES) * 6 + 64 * 1024;
     let mut stream = response.bytes_stream();