Merge pull request #544 from obeli-sk/webhook-wit-bump

refactor(wit): Bump `obelisk_webhook` to 5.2.0, add `execution-id-current`

Author: tomasol

crates/utils/src/wit.rs

@@ -52,11 +52,11 @@ pub const WIT_OBELISK_WORKFLOW_PACKAGE: [&str; 3] = [
 ];
 
 pub const WIT_OBELISK_WEBHOOK_PACKAGE: [&str; 3] = [
-    "obelisk_webhook@5.1.0",
-    "obelisk_webhook@5.1.0.wit",
+    "obelisk_webhook@5.2.0",
+    "obelisk_webhook@5.2.0.wit",
     include_str!(concat!(
         env!("CARGO_MANIFEST_DIR"),
-        "/wit/obelisk_webhook@5.1.0/obelisk_webhook@5.1.0.wit"
+        "/wit/obelisk_webhook@5.2.0/obelisk_webhook@5.2.0.wit"
     )),
 ];
 

crates/wasm-workers/src/registry.rs

@@ -258,7 +258,8 @@ impl ComponentConfigRegistry {
                     "wasi" => true,
                     "obelisk" => matches!(
                         import.ffqn.ifc_fqn.pkg_fqn_name().to_string().as_str(),
-                        "obelisk:webhook@5.1.0"
+                        "obelisk:webhook@5.2.0"
+                            | "obelisk:webhook@5.1.0"
                             | "obelisk:webhook@5.0.0"
                             | "obelisk:log@1.0.0"
                             | "obelisk:types@4.0.0"

crates/wasm-workers/src/webhook/webhook_trigger.rs

@@ -70,7 +70,7 @@ pub(crate) mod types {
                     import obelisk:types/execution@4.2.0;
                     import obelisk:types/backtrace@4.2.0;
                     import obelisk:types/join-set@4.2.0;
-                    import obelisk:webhook/webhook-support@5.1.0;
+                    import obelisk:webhook/webhook-support@5.2.0;
                 }",
         world: "any:any/bindings",
         imports: {
@@ -633,8 +633,15 @@ impl WebhookSupportHost for WebhookEndpointCtx {
         })
     }
 
+    /// Deprecated, use `execution_id_current`.
     async fn current_execution_id(
         &mut self,
+    ) -> wasmtime::Result<types::obelisk::webhook::webhook_support::ExecutionId> {
+        self.execution_id_current().await
+    }
+
+    async fn execution_id_current(
+        &mut self,
     ) -> wasmtime::Result<types::obelisk::webhook::webhook_support::ExecutionId> {
         Ok(types::obelisk::webhook::webhook_support::ExecutionId {
             id: self.execution_id.to_string(),

crates/webhook-js-runtime/src/webhook_js_runtime.rs

@@ -346,7 +346,7 @@ fn setup_obelisk_api(context: &mut Context) -> JsResult<()> {
 
     // obelisk.executionIdCurrent()
     let current_execution_id_fn = NativeFunction::from_fn_ptr(|_this, _args, _ctx| {
-        let exec_id = webhook_support::current_execution_id();
+        let exec_id = webhook_support::execution_id_current();
         Ok(JsValue::from(js_string!(exec_id.id)))
     });
     obelisk.set(

crates/webhook-js-runtime/wit/world.wit

@@ -1,6 +1,6 @@
 package any:any;
 
 world any {
-    import obelisk:webhook/webhook-support@5.1.0;
+    import obelisk:webhook/webhook-support@5.2.0;
     import obelisk:log/log@1.0.0;
 }

…_webhook@5.1.0/obelisk_webhook@5.1.0.wit …_webhook@5.2.0/obelisk_webhook@5.2.0.witwit/obelisk_webhook@5.1.0/obelisk_webhook@5.1.0.wit renamed to wit/obelisk_webhook@5.2.0/obelisk_webhook@5.2.0.wit wit/obelisk_webhook@5.1.0/obelisk_webhook@5.1.0.wit renamed to wit/obelisk_webhook@5.2.0/obelisk_webhook@5.2.0.wit

@@ -1,4 +1,4 @@
-package obelisk:webhook@5.1.0;
+package obelisk:webhook@5.2.0;
 
 @since(version = 5.0.0)
 interface webhook-support {
@@ -65,10 +65,17 @@ interface webhook-support {
     @since(version = 5.0.0)
     execution-id-generate: func() -> execution-id;
 
-    /// Get the execution ID of the current webhook handler invocation.
-    /// Returns the ID assigned to this webhook execution by the engine.
+    /// Use `execution-id-get`
     @since(version = 5.1.0)
+    @deprecated(version = 5.2.0)
     current-execution-id: func() -> execution-id;
+
+    /// Get the execution ID of the current webhook handler invocation.
+    /// Returns the ID assigned to this webhook execution by the engine.
+    @since(version = 5.2.0)
+    execution-id-current: func() -> execution-id;
+
+
     /// Call a function and wait for the result.
     /// Creates a child execution, waits for it to complete, and returns the result.
     /// Parameters are serialized as a JSON array.

wit/obelisk_webhook@latest

@@ -1 +1 @@
-obelisk_webhook@5.1.0
+obelisk_webhook@5.2.0/