Merge pull request #14 from radu-matei/toolkit

fermyon · Jan 27, 2022 · ffaa969 · ffaa969
2 parents 299cfc5 + 92826dd
commit ffaa969
Show file tree

Hide file tree

Showing 12 changed files with 74 additions and 36 deletions.
diff --git a/crates/http/src/lib.rs b/crates/http/src/lib.rs
@@ -5,16 +5,15 @@ use hyper::{
     service::{make_service_fn, service_fn},
     Body, Request, Response, Server,
 };
-use spin_http_v01::{Method, SpinHttpV01, SpinHttpV01Data};
-use std::{net::SocketAddr, str::FromStr};
-use std::{sync::Arc, time::Instant};
+use spin_http::{Method, SpinHttp, SpinHttpData};
+use std::{net::SocketAddr, str::FromStr, sync::Arc, time::Instant};
 use url::Url;
 use wasmtime::{Instance, Store};
 
-wit_bindgen_wasmtime::import!("crates/http/spin_http_v01.wit");
+wit_bindgen_wasmtime::import!("wit/ephemeral/spin-http.wit");
 
-type ExecutionContext = spin_engine::ExecutionContext<SpinHttpV01Data>;
-type RuntimeContext = spin_engine::RuntimeContext<SpinHttpV01Data>;
+type ExecutionContext = spin_engine::ExecutionContext<SpinHttpData>;
+type RuntimeContext = spin_engine::RuntimeContext<SpinHttpData>;
 
 #[derive(Clone)]
 pub struct HttpEngine(pub Arc<ExecutionContext>);
@@ -40,7 +39,7 @@ impl HttpEngine {
         instance: Instance,
         req: Request<Body>,
     ) -> Result<Response<Body>, Error> {
-        let r = SpinHttpV01::new(&mut store, &instance, |host| host.data.as_mut().unwrap())?;
+        let r = SpinHttp::new(&mut store, &instance, |host| host.data.as_mut().unwrap())?;
 
         let (parts, bytes) = req.into_parts();
         let bytes = hyper::body::to_bytes(bytes).await?.to_vec();
@@ -56,7 +55,7 @@ impl HttpEngine {
         // let params: &Vec<(&str, &str)> = &params.into_iter().map(|(k, v)| (&**k, &**v)).collect();
         let params = &Vec::new();
 
-        let req = spin_http_v01::Request {
+        let req = spin_http::Request {
             method,
             uri,
             headers,

diff --git a/crates/http/tests/rust-http-test/src/lib.rs b/crates/http/tests/rust-http-test/src/lib.rs
@@ -1,10 +1,10 @@
-use spin_http_v01::{Request, Response};
+use spin_http::{Request, Response};
 
-wit_bindgen_rust::export!("../../spin_http_v01.wit");
+wit_bindgen_rust::export!("../../../../wit/ephemeral/spin-http.wit");
 
-struct SpinHttpV01 {}
+struct SpinHttp {}
 
-impl spin_http_v01::SpinHttpV01 for SpinHttpV01 {
+impl spin_http::SpinHttp for SpinHttp {
     fn handler(req: Request) -> Response {
         let body = Some(
             format!(

diff --git a/crates/redis/src/lib.rs b/crates/redis/src/lib.rs
@@ -2,14 +2,14 @@ use anyhow::Result;
 use async_trait::async_trait;
 use futures::StreamExt;
 use redis::Client;
-use spin_redis_trigger_v01::*;
+use spin_redis_trigger::{SpinRedisTrigger, SpinRedisTriggerData};
 use std::{sync::Arc, time::Instant};
 use wasmtime::{Instance, Store};
 
-wit_bindgen_wasmtime::import!("crates/redis/wit/spin_redis_trigger_v01.wit");
+wit_bindgen_wasmtime::import!("wit/ephemeral/spin-redis-trigger.wit");
 
-type ExecutionContext = spin_engine::ExecutionContext<SpinRedisTriggerV01Data>;
-type RuntimeContext = spin_engine::RuntimeContext<SpinRedisTriggerV01Data>;
+type ExecutionContext = spin_engine::ExecutionContext<SpinRedisTriggerData>;
+type RuntimeContext = spin_engine::RuntimeContext<SpinRedisTriggerData>;
 
 #[derive(Clone)]
 pub struct RedisEngine(pub Arc<ExecutionContext>);
@@ -34,8 +34,7 @@ impl RedisEngine {
         instance: Instance,
         payload: &[u8],
     ) -> Result<()> {
-        let r =
-            SpinRedisTriggerV01::new(&mut store, &instance, |host| host.data.as_mut().unwrap())?;
+        let r = SpinRedisTrigger::new(&mut store, &instance, |host| host.data.as_mut().unwrap())?;
 
         let _ = r.handler(&mut store, payload)?;
         Ok(())

diff --git a/crates/redis/tests/rust/src/lib.rs b/crates/redis/tests/rust/src/lib.rs
@@ -1,12 +1,12 @@
 use std::str::{from_utf8, Utf8Error};
 
-use spin_redis_trigger_v01::*;
+use spin_redis_trigger::*;
 
-wit_bindgen_rust::export!("../../wit/spin_redis_trigger_v01.wit");
+wit_bindgen_rust::export!("../../../../wit/ephemeral/spin-redis-trigger.wit");
 
-struct SpinRedisTriggerV01 {}
+struct SpinRedisTrigger {}
 
-impl spin_redis_trigger_v01::SpinRedisTriggerV01 for SpinRedisTriggerV01 {
+impl spin_redis_trigger::SpinRedisTrigger for SpinRedisTrigger {
     fn handler(payload: Payload) -> Result<(), Error> {
         println!("Message: {}", from_utf8(&payload)?);
         Ok(())

diff --git a/crates/redis/wit/spin_redis_trigger_v01.wit b/crates/redis/wit/spin_redis_trigger_v01.wit
diff --git a/crates/http/spin_http_v01.wit → wit/ephemeral/http-types.wit b/crates/http/spin_http_v01.wit → wit/ephemeral/http-types.wit
@@ -56,6 +56,3 @@ enum http-error {
     request-error,
     runtime-error,
 }
-
-// The entrypoint for an HTTP handler.
-handler: function(req: request) -> response
diff --git a/wit/ephemeral/spin-http.wit b/wit/ephemeral/spin-http.wit
@@ -0,0 +1,4 @@
+use * from http-types
+
+// The entrypoint for an HTTP handler.
+handler: function(req: request) -> response
diff --git a/wit/ephemeral/spin-redis-trigger.wit b/wit/ephemeral/spin-redis-trigger.wit
@@ -0,0 +1,4 @@
+use * from types
+
+// The entrypoint for a Redis handler.
+handler: function(payload: payload) -> expected<_, error>
diff --git a/wit/ephemeral/types.wit b/wit/ephemeral/types.wit
@@ -0,0 +1,7 @@
+// General purpose error.
+enum error {
+    success,
+    error,
+}
+
+type payload = list<u8>
diff --git a/wit/ephemeral/wasi-cache.wit b/wit/ephemeral/wasi-cache.wit
@@ -0,0 +1,15 @@
+// A simple cache interface.
+
+use * from types
+
+// Set the payload for the given key.
+// Implementations may choose to ignore the time-to-live (in seconds) argument.
+// TODO (@radu-matei): perhaps return the number of bytes written?
+set: function(key: string, value: payload, ttl: option<u32>) -> expected<_, error>
+
+// Get the payload stored in the cache for the given key.
+// If not found, return a success result with an empty payload.
+get: function(key: string) -> expected<payload, error>
+
+// Delete the cache entry for the given key.
+delete: function(key: string) -> expected<_, error>
diff --git a/wit/ephemeral/wasi-log.wit b/wit/ephemeral/wasi-log.wit
@@ -0,0 +1,20 @@
+// Log levels.
+enum level {
+    trace,
+    debug,
+    info,
+    warn,
+    error,
+    fatal
+}
+
+// General log function.
+log: function(msg: string, lvl: level)
+
+// Specialized log functions.
+trace: function(msg: string)
+debug: function(msg: string)
+info: function(msg: string)
+warn: function(msg: string)
+error: function(msg: string)
+fatal: function(msg: string)
diff --git a/wit/ephemeral/wasi-outbound-http.wit b/wit/ephemeral/wasi-outbound-http.wit
@@ -0,0 +1,4 @@
+use * from http-types
+
+// Send an HTTP request and return a response or a potential error.
+request: function(req: request) -> expected<response, http-error>