init

Signed-off-by: Takeshi Yoneda <t.y.mathetake@gmail.com>

Author: mathetake

go/javascript.go

@@ -6,7 +6,6 @@ import (
 	"log"
 	"math/rand"
 	"os"
-	"strings"
 	"sync"
 
 	"github.com/dop251/goja"
@@ -44,9 +43,8 @@ type (
 func newJavaScriptFilterConfig(userCode string) gosdk.HttpFilterConfig {
 	c := &javaScriptFilterConfig{}
 
-	script := completeJavaScriptCode(userCode)
 	for i := range numberOfVMPool {
-		vm, err := newJavaScriptVM(script, os.Stdout)
+		vm, err := newJavaScriptVM(userCode, os.Stdout)
 		if err != nil {
 			log.Printf("failed to create JavaScript VM: %v", err)
 			return nil
@@ -56,15 +54,6 @@ func newJavaScriptFilterConfig(userCode string) gosdk.HttpFilterConfig {
 	return c
 }
 
-func completeJavaScriptCode(userCode string) string {
-	return strings.Join([]string{
-		userCode,
-		fmt.Sprintf(functionDeclTemplate, javaScriptExportedSymbolOnConfig),
-		fmt.Sprintf(functionDeclTemplate, javaScriptExportedSymbolOnRequestHeaders),
-		fmt.Sprintf(functionDeclTemplate, javaScriptExportedSymbolOnResponseHeaders),
-	}, "\n")
-}
-
 func newJavaScriptVM(script string, w io.Writer) (*javaScriptVM, error) {
 	vm := goja.New()
 	console := vm.NewObject()

integration/envoy.yaml

@@ -36,23 +36,28 @@ static_resources:
                       filter_config:
                         "@type": "type.googleapis.com/google.protobuf.StringValue"
                         value: |
-                          /// Called with String argument passed from the host.
-                          function OnConfigure () {
-                              console.log("OnConfigure called");
-                          }
+                          /// Called when the filter is configured. This is called once per VM instance.
+                          function OnConfigure () {}
                           /// Called when a request header is received. `ctx` object has the following properties:
                           ///
-                          /// - `getHeader(name: String): String`: Function to get a header value.
-                          /// - `setHeader(name: String, value: String): void`: Function to set a header value.
+                          /// - `getRequestHeader(name: String): String`: Function to get a request header value.
+                          /// - `setRequestHeader(name: String, value: String): void`: Function to set a request header value.
                           function OnRequestHeaders(ctx) {
                               console.log("OnRequestHeader called");
+                              let foo = ctx.getRequestHeader("foo");
+                              ctx.setRequestHeader("x-foo", foo);
                           }
                           /// Called when a response header is received. `ctx` object has the following properties:
                           ///
-                          /// - `getHeader(name: String): String`: Function to get a header value.
-                          /// - `setHeader(name: String, value: String): void`: Function to set a header value.
+                          /// - `getRequestHeader(name: String): String`: Function to get a request header value.
+                          /// - `getResponseHeader(name: String): String`: Function to get a response header value.
+                          /// - `setResponseHeader(name: String, value: String): void`: Function to set a response header value.
                           function OnResponseHeaders(ctx) {
-                              console.log("OnResponseHeader called");
+                              let dog = ctx.getRequestHeader("dog");
+                              ctx.setResponseHeader("x-dog", dog);
+                              let status = ctx.getResponseHeader(":status");
+                              ctx.setResponseHeader("x-status", status);
+                              console.log("Response status: ", status);
                           }
                   - name: dynamic_modules/passthrough
                     typed_config:

integration/main_test.go

@@ -332,6 +332,48 @@ func TestIntegration(t *testing.T) {
 		}
 	})
 
+	t.Run("javascript", func(t *testing.T) {
+		require.Eventually(t, func() bool {
+			req, err := http.NewRequest("GET", "http://localhost:1062/headers", nil)
+			require.NoError(t, err)
+			req.Header.Set("dog", "cat")
+			req.Header.Set("foo", "bar")
+
+			resp, err := http.DefaultClient.Do(req)
+			if err != nil {
+				t.Logf("Envoy not ready yet: %v", err)
+				return false
+			}
+			defer func() {
+				require.NoError(t, resp.Body.Close())
+			}()
+			body, err := io.ReadAll(resp.Body)
+			if err != nil {
+				t.Logf("Envoy not ready yet: %v", err)
+				return false
+			}
+
+			t.Logf("response: headers=%v, body=%s", resp.Header, string(body))
+			require.Equal(t, 200, resp.StatusCode)
+
+			// HttpBin returns a JSON object containing the request headers in this format.
+			type httpBinHeadersBody struct {
+				Headers map[string][]string `json:"headers"`
+			}
+			var headersBody httpBinHeadersBody
+			require.NoError(t, json.Unmarshal(body, &headersBody))
+
+			require.Contains(t, headersBody.Headers["X-Foo"], "bar")
+			require.Contains(t, headersBody.Headers["Foo"], "bar")
+			require.Contains(t, headersBody.Headers["Dog"], "cat")
+
+			// We also need to check that the response headers were mutated.
+			require.Equal(t, "cat", resp.Header.Get("x-dog"))
+			require.Equal(t, "200", resp.Header.Get("x-status"))
+			return true
+		}, 30*time.Second, 200*time.Millisecond)
+	})
+
 	t.Run("http_metrics", func(t *testing.T) {
 		// Send test request
 		require.Eventually(t, func() bool {