Merge pull request #116 from XavierGeerinck/master

Fix issue with Javascript ! checking on state manager

Author: XavierGeerinck

src/actors/runtime/ActorStateManager.ts

@@ -70,11 +70,13 @@ export default class ActorStateManager<T> {
         return [false, null];
       }
 
-      return [true, stateMetadata?.getValue() || null];
+      const val = stateMetadata?.getValue();
+      return [true, val !== undefined ? val : null];
     }
 
     const [hasValue, value] = await this.actor.getStateProvider().tryLoadState(this.actor.getActorType(), this.actor.getId().getId(), stateName);
 
+
     if (hasValue) {
       stateChangeTracker.set(stateName, new StateMetadata(value, StateChangeKind.NONE));
     }

src/actors/runtime/StateProvider.ts

@@ -4,85 +4,85 @@ import ActorStateChange from "./ActorStateChange";
 import StateChangeKind from "./StateChangeKind";
 
 export default class StateProvider {
-    stateClient: DaprClient;
-    
-    constructor(daprClient: DaprClient) {
-        this.stateClient = daprClient;
-    }
+  stateClient: DaprClient;
 
-    async containsState(actorType: string, actorId: string, stateName: string): Promise<boolean> {
-        const rawStateValue = await this.stateClient.actor.stateGet(actorType, actorId, stateName);
-        return !!rawStateValue && rawStateValue.length > 0;
-    }
+  constructor(daprClient: DaprClient) {
+    this.stateClient = daprClient;
+  }
 
-    // SEE https://github.com/dapr/python-sdk/blob/0f0b6f6a1cf45d2ac0c519b48fc868898d81124e/dapr/actor/runtime/_state_provider.py#L24
-    async tryLoadState(actorType: string, actorId: string, stateName: string): Promise<[ boolean, any ]> {
-        const rawStateValue = await this.stateClient.actor.stateGet(actorType, actorId, stateName);
+  async containsState(actorType: string, actorId: string, stateName: string): Promise<boolean> {
+    const rawStateValue = await this.stateClient.actor.stateGet(actorType, actorId, stateName);
+    return !!rawStateValue && rawStateValue.length > 0;
+  }
 
-        if (!rawStateValue || rawStateValue.length === 0) {
-            return [ false, undefined ];
-        }
+  // SEE https://github.com/dapr/python-sdk/blob/0f0b6f6a1cf45d2ac0c519b48fc868898d81124e/dapr/actor/runtime/_state_provider.py#L24
+  async tryLoadState(actorType: string, actorId: string, stateName: string): Promise<[boolean, any]> {
+    const rawStateValue = await this.stateClient.actor.stateGet(actorType, actorId, stateName);
 
-        // const result = this.serializer.deserialize(rawStateValue);
-
-        return [ true, rawStateValue ];
+    if (!rawStateValue || rawStateValue.length === 0) {
+      return [false, undefined];
     }
 
-    /**
-     * Create and save the state through a transactional update request body. E.g.
-     * [
-     *     {
-     *         "operation": "upsert",
-     *         "request": {
-     *             "key": "key1",
-     *             "value": "myData"
-     *         }
-     *     },
-     *     {
-     *         "operation": "delete",
-     *         "request": {
-     *             "key": "key2"
-     *         }
-     *     }
-     * ]
-     * @param actorType 
-     * @param actorId 
-     * @param stateChanges 
-     */
-    async saveState(actorType: string, actorId: string, stateChanges: ActorStateChange<any>[]): Promise<void> {
-        const jsonOutput: OperationType[] = [];
+    // const result = this.serializer.deserialize(rawStateValue);
 
-        for (const state of stateChanges) {
-            let operation;
-            
-            switch (state.getChangeKind()) {
-                case StateChangeKind.ADD:
-                    // dapr doesn't know add, we use upsert
-                    // https://github.com/dapr/dapr/blob/master/pkg/actors/transactional_state_request.go
-                    operation = "upsert"; 
-                    break;
-                case StateChangeKind.REMOVE:
-                    operation = "remove";
-                    break;
-                case StateChangeKind.UPDATE:
-                    // dapr doesn't know add, we use upsert
-                    // https://github.com/dapr/dapr/blob/master/pkg/actors/transactional_state_request.go
-                    operation = "upsert";
-                    break;
-                default: 
-                    // skip
-                    continue;
-            }
+    return [true, rawStateValue];
+  }
 
-            jsonOutput.push({
-                operation,
-                request: {
-                    key: state.getStateName(),
-                    value: state.getValue() as string
-                }
-            });
-        }
+  /**
+   * Create and save the state through a transactional update request body. E.g.
+   * [
+   *     {
+   *         "operation": "upsert",
+   *         "request": {
+   *             "key": "key1",
+   *             "value": "myData"
+   *         }
+   *     },
+   *     {
+   *         "operation": "delete",
+   *         "request": {
+   *             "key": "key2"
+   *         }
+   *     }
+   * ]
+   * @param actorType 
+   * @param actorId 
+   * @param stateChanges 
+   */
+  async saveState(actorType: string, actorId: string, stateChanges: ActorStateChange<any>[]): Promise<void> {
+    const jsonOutput: OperationType[] = [];
 
-        await this.stateClient.actor.stateTransaction(actorType, actorId, jsonOutput);
+    for (const state of stateChanges) {
+      let operation;
+
+      switch (state.getChangeKind()) {
+        case StateChangeKind.ADD:
+          // dapr doesn't know add, we use upsert
+          // https://github.com/dapr/dapr/blob/master/pkg/actors/transactional_state_request.go
+          operation = "upsert";
+          break;
+        case StateChangeKind.REMOVE:
+          operation = "remove";
+          break;
+        case StateChangeKind.UPDATE:
+          // dapr doesn't know add, we use upsert
+          // https://github.com/dapr/dapr/blob/master/pkg/actors/transactional_state_request.go
+          operation = "upsert";
+          break;
+        default:
+          // skip
+          continue;
+      }
+
+      jsonOutput.push({
+        operation,
+        request: {
+          key: state.getStateName(),
+          value: state.getValue() as string
+        }
+      });
     }
+
+    await this.stateClient.actor.stateTransaction(actorType, actorId, jsonOutput);
+  }
 }