chore: rename ds

docs/libraries/workflow/GOTCHAS.md

@@ -108,3 +108,17 @@ the internal location.
 > **\*** Even if they did know about each other via atomics, there is no guarantee of consistency from
 > `buffer_unordered`. Preemptively incrementing the location ensures consistency regardless of the order or
 > completion time of the futures.
+
+## Hashmaps in activity inputs/outputs
+
+`std::collections::HashMap` does not implement `Hash`. To get around this, use `util::HashableMap`:
+
+```rust
+use util::AsHashableExt;
+
+ctx
+	.activity(MyActivityInput {
+		map: input.map.as_hashable(),
+	})
+	.await?;
+```

fern/definition/servers/__package__.yml

@@ -77,7 +77,7 @@ types:
 
   CreateServerRuntimeRequest:
     properties:
-      image: uuid
+      build: uuid
       arguments: optional<list<string>>
       environment: optional<map<string, string>>
 
@@ -91,7 +91,7 @@ types:
       protocol: commons.PortProtocol
       internal_port: optional<integer>
       routing: optional<commons.PortRouting>
-  
+
   CreateServerResponse:
     properties:
       server:

fern/definition/servers/common.yml

@@ -17,11 +17,12 @@ types:
       lifecycle: Lifecycle
       created_at: long
       started_at: optional<long>
+      connectable_at: optional<long>
       destroyed_at: optional<long>
 
   Runtime:
     properties:
-      image: uuid
+      build: uuid
       arguments: optional<list<string>>
       environment: optional<map<string, string>>
 

lib/bolt/core/src/dep/cargo/cli.rs

@@ -176,10 +176,9 @@ pub async fn build<'a, T: AsRef<str>>(ctx: &ProjectContext, opts: BuildOpts<'a,
 
 					FROM rust:1.80.0-slim AS rust
 
-					RUN apt-get update && apt-get install -y protobuf-compiler pkg-config libssl-dev g++ git
-
-					RUN apt-get install --yes libpq-dev wget
-					RUN wget https://github.com/mozilla/sccache/releases/download/v0.2.15/sccache-v0.2.15-x86_64-unknown-linux-musl.tar.gz \
+					RUN apt-get update \
+					    && apt-get install --yes protobuf-compiler pkg-config libssl-dev g++ git libpq-dev wget \
+					    && wget https://github.com/mozilla/sccache/releases/download/v0.2.15/sccache-v0.2.15-x86_64-unknown-linux-musl.tar.gz \
 						&& tar xzf sccache-v0.2.15-x86_64-unknown-linux-musl.tar.gz \
 						&& mv sccache-v0.2.15-x86_64-unknown-linux-musl/sccache /usr/local/bin/sccache \
 						&& chmod +x /usr/local/bin/sccache
@@ -191,13 +190,12 @@ pub async fn build<'a, T: AsRef<str>>(ctx: &ProjectContext, opts: BuildOpts<'a,
 
 					# Build and copy all binaries from target directory into an empty image (it is not
 					# included in the output because of cache mount)
-					RUN chmod +x ./build_script.sh
 					RUN \
 						--mount=type=cache,target=/usr/local/cargo/git \
 						--mount=type=cache,target=/usr/local/cargo/registry \
 						--mount=type=cache,target=/usr/rivet/target \
 						--mount=type=cache,target=/usr/rivet/oss/target \
-						sh -c ./build_script.sh && mkdir /usr/bin/rivet && find target/{optimization} -maxdepth 1 -type f ! -name "*.*" -exec mv {{}} /usr/bin/rivet/ \;
+						chmod +x ./build_script.sh && sh -c ./build_script.sh && mkdir /usr/bin/rivet && find target/{optimization} -maxdepth 1 -type f ! -name "*.*" -exec mv {{}} /usr/bin/rivet/ \;
 					
 					# Create an empty image and copy binaries + test outputs to it (this is to minimize the
 					# size of the image)

lib/chirp-workflow/macros/src/lib.rs

@@ -49,7 +49,10 @@ pub fn workflow(attr: TokenStream, item: TokenStream) -> TokenStream {
 		input_ident,
 		input_type,
 		output_type,
-	} = parse_trait_fn(&ctx_ty, "Workflow", &item_fn);
+	} = match parse_trait_fn(&ctx_ty, "Workflow", &item_fn) {
+		Ok(x) => x,
+		Err(err) => return err,
+	};
 
 	let struct_ident = Ident::new(&name, proc_macro2::Span::call_site());
 	let fn_name = item_fn.sig.ident.to_string();
@@ -97,7 +100,10 @@ pub fn activity(attr: TokenStream, item: TokenStream) -> TokenStream {
 		input_ident,
 		input_type,
 		output_type,
-	} = parse_trait_fn(&ctx_ty, "Activity", &item_fn);
+	} = match parse_trait_fn(&ctx_ty, "Activity", &item_fn) {
+		Ok(x) => x,
+		Err(err) => return err,
+	};
 
 	let struct_ident = Ident::new(&name, proc_macro2::Span::call_site());
 	let fn_name = item_fn.sig.ident.to_string();
@@ -165,7 +171,10 @@ pub fn operation(attr: TokenStream, item: TokenStream) -> TokenStream {
 		input_ident,
 		input_type,
 		output_type,
-	} = parse_trait_fn(&ctx_ty, "Operation", &item_fn);
+	} = match parse_trait_fn(&ctx_ty, "Operation", &item_fn) {
+		Ok(x) => x,
+		Err(err) => return err,
+	};
 
 	let struct_ident = Ident::new(&name, proc_macro2::Span::call_site());
 	let fn_name = item_fn.sig.ident.to_string();
@@ -207,10 +216,14 @@ struct TraitFnOutput {
 	output_type: syn::Type,
 }
 
-fn parse_trait_fn(ctx_ty: &syn::Type, trait_name: &str, item_fn: &syn::ItemFn) -> TraitFnOutput {
+fn parse_trait_fn(
+	ctx_ty: &syn::Type,
+	trait_name: &str,
+	item_fn: &syn::ItemFn,
+) -> Result<TraitFnOutput, TokenStream> {
 	// Check if is async
 	if item_fn.sig.asyncness.is_none() {
-		panic!("the async keyword is missing from the function declaration");
+		return Err(error(item_fn.sig.span(), "function must be async"));
 	}
 
 	let mut arg_names = vec![];
@@ -224,25 +237,30 @@ fn parse_trait_fn(ctx_ty: &syn::Type, trait_name: &str, item_fn: &syn::ItemFn) -
 					arg_names.push(arg_name);
 					arg_types.push((*arg.ty).clone());
 				}
-				_ => panic!("Unsupported input parameter pattern"),
+				_ => {
+					return Err(error(arg.pat.span(), "unsupported input parameter pattern"));
+				}
 			}
 		} else {
-			panic!("Unsupported input parameter type");
+			return Err(error(input.span(), "unsupported input parameter type"));
 		}
 	}
 
 	if arg_types.len() != 2 || &arg_types[0] != ctx_ty {
-		panic!(
-			"{} function must have exactly two parameters: ctx: {:?} and input: YourInputType",
-			trait_name,
-			ctx_ty.to_token_stream().to_string(),
-		);
+		return Err(error(
+			item_fn.sig.span(),
+			&format!(
+				"{} function must have exactly two parameters: ctx: {:?} and input: YourInputType",
+				trait_name,
+				ctx_ty.to_token_stream().to_string()
+			),
+		));
 	}
 
 	let input_type = if let syn::Type::Reference(syn::TypeReference { elem, .. }) = &arg_types[1] {
 		elem.clone()
 	} else {
-		panic!("Input type must be a reference");
+		return Err(error(arg_types[1].span(), "input type must be a reference"));
 	};
 
 	let output_type = match &item_fn.sig.output {
@@ -255,31 +273,49 @@ fn parse_trait_fn(ctx_ty: &syn::Type, trait_name: &str, item_fn: &syn::ItemFn) -
 							if let Some(GenericArgument::Type(ty)) = args.args.first() {
 								ty.clone()
 							} else {
-								panic!("Unsupported Result type");
+								return Err(error(args.span(), "unsupported Result type"));
 							}
 						}
-						_ => panic!("Unsupported Result type"),
+						_ => {
+							return Err(error(segment.arguments.span(), "unsupported Result type"))
+						}
 					}
 				} else {
-					panic!("{} function must return a GlobalResult type", trait_name,);
+					return Err(error(
+						path.span(),
+						&format!("{} function must return a GlobalResult type", trait_name),
+					));
 				}
 			}
-			_ => panic!("Unsupported output type"),
+			_ => return Err(error(ty.span(), "unsupported output type")),
 		},
-		_ => panic!("{} function must have a return type", trait_name),
+		_ => {
+			return Err(error(
+				item_fn.sig.output.span(),
+				&format!("{} function must have a return type", trait_name),
+			));
+		}
 	};
 
-	TraitFnOutput {
+	Ok(TraitFnOutput {
 		ctx_ident: Ident::new(&arg_names[0], proc_macro2::Span::call_site()),
 		input_ident: Ident::new(&arg_names[1], proc_macro2::Span::call_site()),
 		input_type,
 		output_type,
-	}
+	})
 }
 
 #[proc_macro_attribute]
 pub fn signal(attr: TokenStream, item: TokenStream) -> TokenStream {
 	let name = parse_macro_input!(attr as LitStr);
+	if !name
+		.value()
+		.chars()
+		.all(|c| c.is_alphanumeric() || c == '_')
+	{
+		return error(name.span(), "invalid signal name, must be [A-Za-z_]");
+	}
+
 	let item_struct = parse_macro_input!(item as ItemStruct);
 
 	let struct_ident = &item_struct.ident;
@@ -323,6 +359,14 @@ pub fn signal(attr: TokenStream, item: TokenStream) -> TokenStream {
 #[proc_macro_attribute]
 pub fn message(attr: TokenStream, item: TokenStream) -> TokenStream {
 	let name = parse_macro_input!(attr as LitStr);
+	if !name
+		.value()
+		.chars()
+		.all(|c| c.is_alphanumeric() || c == '_')
+	{
+		return error(name.span(), "invalid message name, must be [A-Za-z_]");
+	}
+
 	let item_struct = parse_macro_input!(item as ItemStruct);
 
 	// If also a signal, don't derive serde traits
@@ -421,7 +465,7 @@ pub fn workflow_test(_attr: TokenStream, item: TokenStream) -> TokenStream {
 	result.into()
 }
 
-fn error(span: proc_macro2::Span, msg: &str) -> proc_macro::TokenStream {
+fn error(span: proc_macro2::Span, msg: &str) -> TokenStream {
 	syn::Error::new(span, msg).to_compile_error().into()
 }