fix: keep sdkVersion property always up-to-date with the correct version of the SDK (#829)

Co-authored-by: Guy Bedford <[email protected]>

Author: JakeChampion

runtime/fastly/CMakeLists.txt

@@ -19,4 +19,6 @@ add_builtin(fastly::fetch SRC builtins/fetch/fetch.cpp builtins/fetch/request-re
 add_builtin(fastly::cache_override SRC builtins/cache-override.cpp)
 add_builtin(fastly::fetch_event SRC builtins/fetch-event.cpp DEPENDENCIES OpenSSL)
 
+add_compile_definitions(PUBLIC RUNTIME_VERSION=${RUNTIME_VERSION})
+
 project(FastlyJS)

runtime/fastly/build-debug.sh

@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 cd "$(dirname "$0")" || exit 1
-HOST_API=$(realpath host-api) cmake -B build-debug -DCMAKE_BUILD_TYPE=Debug -DENABLE_BUILTIN_WEB_FETCH=0 -DENABLE_BUILTIN_WEB_FETCH_FETCH_EVENT=0
+RUNTIME_VERSION=$(npm pkg get version --json --prefix=../../ | jq -r)
+HOST_API=$(realpath host-api) cmake -B build-debug -DCMAKE_BUILD_TYPE=Debug -DENABLE_BUILTIN_WEB_FETCH=0 -DENABLE_BUILTIN_WEB_FETCH_FETCH_EVENT=0 -DRUNTIME_VERSION="\"starlingmonkey-$RUNTIME_VERSION\""
 cmake --build build-debug --parallel 10
 mv build-debug/starling.wasm/starling.wasm ../../

runtime/fastly/build-release.sh

@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 cd "$(dirname "$0")" || exit 1
-HOST_API=$(realpath host-api) cmake -B build-release -DCMAKE_BUILD_TYPE=Release -DENABLE_BUILTIN_WEB_FETCH=0 -DENABLE_BUILTIN_WEB_FETCH_FETCH_EVENT=0
+RUNTIME_VERSION=$(npm pkg get version --json --prefix=../../ | jq -r)
+HOST_API=$(realpath host-api) cmake -B build-release -DCMAKE_BUILD_TYPE=Release -DENABLE_BUILTIN_WEB_FETCH=0 -DENABLE_BUILTIN_WEB_FETCH_FETCH_EVENT=0 -DRUNTIME_VERSION="\"starlingmonkey-$RUNTIME_VERSION\""
 cmake --build build-release
 mv build-release/starling.wasm/starling.wasm ../../

runtime/fastly/builtins/fastly.h

@@ -11,8 +11,6 @@
 
 namespace fastly::fastly {
 
-#define RUNTIME_VERSION "starlingmonkey-dev"
-
 class Env : public builtins::BuiltinNoConstructor<Env> {
 private:
   static bool env_get(JSContext *cx, unsigned argc, JS::Value *vp);

runtime/js-compute-runtime/Makefile

@@ -38,6 +38,8 @@ WIT_BINDGEN ?= $(shell which wit-bindgen)
 # Default optimization flgs for clang/clang++.
 OPT_FLAGS ?= -O2
 
+RUNTIME_VERSION ?= $(shell npm pkg get version --json | jq -r)
+
 # Command helpers for making nice build output.
 include mk/commands.mk
 
@@ -92,6 +94,7 @@ SM_OBJ += $(wildcard $(SM_SRC)/lib/*.a)
 # This is required when using spidermonkey headers, as it allows us to enable
 # the streams library when setting up the js context.
 DEFINES := -DMOZ_JS_STREAMS
+DEFINES += -DRUNTIME_VERSION='"$(RUNTIME_VERSION)"'
 
 # Flags for c++ compilation
 CXX_FLAGS := -std=gnu++20 -Wall -Werror -Qunused-arguments

runtime/js-compute-runtime/js-compute-builtins.h

@@ -32,8 +32,6 @@ const JSErrorFormatString js_ErrorFormatString[JSErrNum_Limit] = {
 
 #include "host_interface/host_api.h"
 
-#define RUNTIME_VERSION "3.13.2-dev"
-
 const JSErrorFormatString *GetErrorMessage(void *userRef, unsigned errorNumber);
 
 JSObject *PromiseRejectedWithPendingError(JSContext *cx);