fixing some logic and adding new WASM variable function

Author: chris-hoefgen

src/main/java/com/devcycle/sdk/server/local/api/DVCLocalClient.java

@@ -12,6 +12,7 @@
 import com.devcycle.sdk.server.local.model.BucketedUserConfig;
 import com.devcycle.sdk.server.local.model.DVCLocalOptions;
 import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 
 public final class DVCLocalClient {
 
@@ -100,10 +101,6 @@ public <T> Variable<T> variable(User user, String key, T defaultValue) {
       throw new IllegalArgumentException("Missing parameter: defaultValue");
     }
 
-    if (!configManager.isConfigInitialized()) {
-      System.out.println("Variable called before DVCClient has initialized, returning default value");
-    }
-
     TypeEnum variableType = TypeEnum.fromClass(defaultValue.getClass());
     Variable<T> defaultVariable = (Variable<T>) Variable.builder()
             .key(key)
@@ -113,40 +110,41 @@ public <T> Variable<T> variable(User user, String key, T defaultValue) {
             .isDefaulted(true)
             .build();
 
-    if (!isInitialized) {
+    if (!configManager.isConfigInitialized() || !isInitialized) {
+      System.out.println("Variable called before DVCClient has initialized, returning default value");
+      try {
+        eventQueueManager.queueAggregateEvent(Event.builder().type("aggVariableDefaulted").target(key).build(), null);
+      } catch (Exception e) {
+        System.out.printf("Unable to parse aggVariableDefaulted event for Variable %s due to error: %s", key, e.toString());
+      }
       return defaultVariable;
     }
 
     try {
-      BucketedUserConfig bucketedUserConfig = localBucketing.generateBucketedConfig(sdkKey, user);
-      if (bucketedUserConfig.variables.containsKey(key)) {
-        BaseVariable baseVariable = bucketedUserConfig.variables.get(key);
+      String variableJSON = localBucketing.getVariable(sdkKey, user, key, variableType, true);
+      if (variableJSON == null || variableJSON.isEmpty()) {
+        return defaultVariable;
+      } else {
+        ObjectMapper mapper = new ObjectMapper();
+        Variable baseVariable = mapper.readValue(variableJSON, Variable.class);
+
         Variable<T> variable = (Variable<T>) Variable.builder()
-          .key(key)
-          .type(baseVariable.getType())
-          .value(baseVariable.getValue())
-          .defaultValue(defaultValue)
-          .isDefaulted(false)
-          .build();
+                .key(key)
+                .type(baseVariable.getType())
+                .value(baseVariable.getValue())
+                .defaultValue(defaultValue)
+                .isDefaulted(false)
+                .build();
         if (variable.getType() != variableType) {
-          throw new IllegalArgumentException("Variable type mismatch, returning default value");
+          System.out.printf("Variable type mismatch, returning default value");
+          return variable;
         }
         variable.setDefaultValue(defaultValue);
         variable.setIsDefaulted(false);
-        eventQueueManager.queueAggregateEvent(Event.builder().type("aggVariableEvaluated").target(key).build(), bucketedUserConfig);
         return variable;
-      } else {
-        eventQueueManager.queueAggregateEvent(Event.builder().type("aggVariableDefaulted").target(key).build(), bucketedUserConfig);
-        return defaultVariable;
       }
     } catch (Exception e) {
-      System.out.printf("Unable to parse JSON for Variable %s due to error: %s", key, e.toString());
-    }
-
-    try {
-      eventQueueManager.queueAggregateEvent(Event.builder().type("aggVariableDefaulted").target(key).build(), null);
-    } catch (Exception e) {
-      System.out.printf("Unable to parse aggVariableDefaulted event for Variable %s due to error: %s", key, e.toString());
+      System.out.printf("Unable to parse load Variable %s due to error: %s", key, e);
     }
     return defaultVariable;
   }

src/main/java/com/devcycle/sdk/server/local/bucketing/LocalBucketing.java

@@ -12,6 +12,7 @@
 import java.util.concurrent.atomic.AtomicReference;
 
 import com.devcycle.sdk.server.common.model.User;
+import com.devcycle.sdk.server.common.model.Variable;
 import com.devcycle.sdk.server.local.model.BucketedUserConfig;
 import com.devcycle.sdk.server.local.model.FlushPayload;
 import com.fasterxml.jackson.annotation.JsonInclude;
@@ -31,6 +32,8 @@ public class LocalBucketing {
     private Set<Integer> pinnedAddresses;
     private HashMap<String, Integer> sdkKeyAddresses;
 
+    private HashMap<Variable.TypeEnum, Integer> variableTypeMap = new HashMap<Variable.TypeEnum, Integer>();
+
     public LocalBucketing() {
         OBJECT_MAPPER.setSerializationInclusion(JsonInclude.Include.NON_NULL);
 
@@ -53,6 +56,12 @@ public LocalBucketing() {
 
         Memory mem = linker.get(store, "", "memory").get().memory();
         memRef.set(mem);
+
+        // WASM time seems problematic for getting global values so we'll just hardcode them
+        variableTypeMap.put(Variable.TypeEnum.BOOLEAN, 0);
+        variableTypeMap.put(Variable.TypeEnum.NUMBER, 1);
+        variableTypeMap.put(Variable.TypeEnum.STRING, 2);
+        variableTypeMap.put(Variable.TypeEnum.JSON, 3);
     }
 
     private Collection<Extern> setImportsOnLinker() {
@@ -166,6 +175,26 @@ public BucketedUserConfig generateBucketedConfig(String sdkKey, User user) throw
         return config;
     }
 
+    public String getVariable(String sdkKey, User user, String key, Variable.TypeEnum variableTypeEnum, boolean shouldTrackEvent) throws JsonProcessingException {
+        // need some kind of mutex?
+        String userString = OBJECT_MAPPER.writeValueAsString(user);
+
+        int wasmVariableType = this.variableTypeMap.get(variableTypeEnum);
+
+        unpinAll();
+        int sdkKeyAddress = getSDKKeyAddress(sdkKey);
+        int userAddress = newWasmString(userString);
+        int keyAddress = newWasmString(key);
+
+        Func getVariablePtr = linker.get(store, "", "variableForUser").get().func();
+        WasmFunctions.Function5<Integer, Integer, Integer, Integer, Integer, Integer    > variableForUser = WasmFunctions.func(
+                store, getVariablePtr, I32, I32, I32, I32, I32, I32);
+
+        int resultAddress = variableForUser.call(sdkKeyAddress, userAddress, keyAddress, wasmVariableType, shouldTrackEvent ? 1 : 0);
+        String variableString = readWasmString(resultAddress);
+        return variableString;
+    }
+
     public void initEventQueue(String sdkKey, String options) {
         unpinAll();
         int sdkKeyAddress = getSDKKeyAddress(sdkKey);