fix some stuff

cloud-apim · Jul 18, 2024 · 3a6f7a7 · 3a6f7a7
1 parent 2537a05
commit 3a6f7a7
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 8 deletions.
diff --git a/js-runtime/src/runtime.js b/js-runtime/src/runtime.js
@@ -22,8 +22,11 @@ function eval_externalApiCode(module, externalApiUrl, externalApiHeaders) {
           }));
         }
         
-        function raw_storage(operation, key, value) {
-          let finalValue = value;
+        function raw_storage(operation, key, value, opts) {
+          let finalValue = value || null;
+          if (finalValue && !(typeof finalValue === 'string' || finalValue instanceof String)) {
+            finalValue = JSON.stringify(finalValue);
+          }
           const response = Http.request({
             url: '${externalApiUrl}/apis/v1/storage/_rpc',
             method: 'POST',
@@ -37,13 +40,14 @@ function eval_externalApiCode(module, externalApiUrl, externalApiHeaders) {
             operation,
             key,
             value: finalValue,
+            opts: opts || {}
           }));
           let responseBody = response.body;
           if (typeof responseBody === 'string' || responseBody instanceof String) {
             responseBody = JSON.parse(responseBody);
           }
-          if (response.status === 200 || response.status === 204) {
-            return responseBody.value || null;
+          if (response.status === 200 || response.status === 201 || response.status === 204) {
+            return responseBody ? responseBody.value || null : null;
           } else {
             throw new Error(responseBody.error, { cause: responseBody.error_description })
           }
@@ -72,7 +76,7 @@ function eval_externalApiCode(module, externalApiUrl, externalApiHeaders) {
             findItems: (pattern) => raw_storage('find', pattern, null),
             getItem: (key) => raw_storage('get', key, null),
             removeItem: (key) => raw_storage('remove', key, null),
-            setItem: (key, value) => raw_storage('set', key, value),
+            setItem: (key, value, opts) => raw_storage('set', key, value, opts),
             clear: () => raw_storage('clear', null, null),
           }
         };
@@ -83,11 +87,15 @@ function eval_externalApiCode(module, externalApiUrl, externalApiHeaders) {
   }
 }
 
-function eval_source(src, module, externalApiUrl, externalApiHeaders) {
+function eval_source(src, module, env, externalApiUrl, externalApiHeaders) {
   const externalApiCode = eval_externalApiCode(module, externalApiUrl, externalApiHeaders)
   // TODO: remove all global objects from extism
   const code = `(function() {
     var exports = {};
+    
+    var process = {
+      env: ${JSON.stringify(env)}
+    };
 
     function FakeResolvedPromise(result) {
       return {
@@ -220,7 +228,7 @@ function cloud_apim_module_plugin_execute(phase, idx) {
     delete cleanedInput.module;
     delete cleanedInput.externalApiUrl;
     delete cleanedInput.externalApiHeaders;
-    const exps = eval_source(code, module, inputJson.externalApiUrl, inputJson.externalApiHeaders || {});
+    const exps = eval_source(code, module, inputJson.env || {}, inputJson.externalApiUrl, inputJson.externalApiHeaders || {});
     if (exps[phase]) {
       const result = exps[phase](cleanedInput);
       if (result) {

diff --git a/src/main/resources/wasm/otoroshi-plugin-dynamic-js-modules-runtime.wasm b/src/main/resources/wasm/otoroshi-plugin-dynamic-js-modules-runtime.wasm
diff --git a/src/main/scala/com/cloud/apim/otoroshi/plugins/jsdynmodules/plugin.scala b/src/main/scala/com/cloud/apim/otoroshi/plugins/jsdynmodules/plugin.scala
@@ -70,6 +70,7 @@ case class JsModulePluginConfig(
      headers: Map[String, String],
      externalApiUrl: Option[String],
      externalApiHeaders: Option[Map[String, String]],
+     env: Map[String, String],
 ) extends NgPluginConfig {
   override def json: JsValue = JsModulePluginConfig.format.writes(this)
   def wasmConfig(): WasmConfig = {
@@ -88,13 +89,15 @@ object JsModulePluginConfig {
     Map.empty,
     None,
     None,
+    Map.empty,
   )
   val format = new Format[JsModulePluginConfig] {
     override def writes(o: JsModulePluginConfig): JsValue = Json.obj(
       "runtime_ref" -> o.runtimeRef.map(JsString.apply).getOrElse(JsNull).asValue,
       "module" -> o.module,
       "module_path" -> o.modulePath,
       "headers" -> o.headers,
+      "env" -> o.env,
       "external_api_url" -> o.externalApiUrl.map(JsString.apply).getOrElse(JsNull).asValue,
       "external_api_headers" -> o.externalApiHeaders.map(map => JsObject(map.mapValues(_.json))).getOrElse(JsNull).asValue,
     )
@@ -106,7 +109,7 @@ object JsModulePluginConfig {
         headers = json.select("headers").asOpt[Map[String, String]].getOrElse(Map.empty),
         externalApiUrl = json.select("external_api_url").asOpt[String].filterNot(_.isBlank),
         externalApiHeaders = json.select("external_api_headers").asOpt[Map[String, String]],
-
+        env = json.select("env").asOpt[Map[String, String]].getOrElse(Map.empty)
       )
     } match {
       case Failure(e) => JsError(e.getMessage)
@@ -157,6 +160,7 @@ class JsModulePlugin extends NgAccessValidator with NgRequestTransformer with Ng
     "module_path",
     "module",
     "headers",
+    "env",
     "external_api_url",
     "external_api_headers",
   )
@@ -178,6 +182,10 @@ class JsModulePlugin extends NgAccessValidator with NgRequestTransformer with Ng
       "type" -> "object",
       "label" -> "HTTP headers",
     ),
+    "env" -> Json.obj(
+      "type" -> "object",
+      "label" -> "Env. variables",
+    ),
     "external_api_url" -> Json.obj(
       "type" -> "string",
       "label" -> "External API url",
@@ -407,6 +415,7 @@ class JsModulePlugin extends NgAccessValidator with NgRequestTransformer with Ng
                   "cloud_apim_module_plugin_execute_on_validate",
                   Json.obj(
                     "code" -> code,
+                    "env" -> pluginConfig.env,
                     "module" -> pluginConfig.modulePath,
                     "externalApiUrl" -> pluginConfig.externalApiUrl.map(_.json).getOrElse(JsNull).asValue,
                     "externalApiHeaders" -> pluginConfig.externalApiHeaders.map(map => JsObject(map.mapValues(_.json))).getOrElse(JsNull).asValue,
@@ -468,6 +477,7 @@ class JsModulePlugin extends NgAccessValidator with NgRequestTransformer with Ng
                   "cloud_apim_module_plugin_execute_on_backend_call",
                   Json.obj(
                     "code" -> code,
+                    "env" -> pluginConfig.env,
                     "module" -> pluginConfig.modulePath,
                     "externalApiUrl" -> pluginConfig.externalApiUrl.map(_.json).getOrElse(JsNull).asValue,
                     "externalApiHeaders" -> pluginConfig.externalApiHeaders.map(map => JsObject(map.mapValues(_.json))).getOrElse(JsNull).asValue,
@@ -526,6 +536,7 @@ class JsModulePlugin extends NgAccessValidator with NgRequestTransformer with Ng
                   "cloud_apim_module_plugin_execute_on_request",
                   Json.obj(
                     "code" -> code,
+                    "env" -> pluginConfig.env,
                     "module" -> pluginConfig.modulePath,
                     "externalApiUrl" -> pluginConfig.externalApiUrl.map(_.json).getOrElse(JsNull).asValue,
                     "externalApiHeaders" -> pluginConfig.externalApiHeaders.map(map => JsObject(map.mapValues(_.json))).getOrElse(JsNull).asValue,
@@ -595,6 +606,7 @@ class JsModulePlugin extends NgAccessValidator with NgRequestTransformer with Ng
                   "cloud_apim_module_plugin_execute_on_response",
                   Json.obj(
                     "code" -> code,
+                    "env" -> pluginConfig.env,
                     "module" -> pluginConfig.modulePath,
                     "externalApiUrl" -> pluginConfig.externalApiUrl.map(_.json).getOrElse(JsNull).asValue,
                     "externalApiHeaders" -> pluginConfig.externalApiHeaders.map(map => JsObject(map.mapValues(_.json))).getOrElse(JsNull).asValue,
@@ -662,6 +674,7 @@ class JsModulePlugin extends NgAccessValidator with NgRequestTransformer with Ng
                   "cloud_apim_module_plugin_execute_on_error",
                   Json.obj(
                     "code" -> code,
+                    "env" -> pluginConfig.env,
                     "module" -> pluginConfig.modulePath,
                     "externalApiUrl" -> pluginConfig.externalApiUrl.map(_.json).getOrElse(JsNull).asValue,
                     "externalApiHeaders" -> pluginConfig.externalApiHeaders.map(map => JsObject(map.mapValues(_.json))).getOrElse(JsNull).asValue,