ACaaD · OlliMartin · Mar 8, 2025 · Mar 8, 2025 · Mar 8, 2025 · Mar 8, 2025
diff --git a/acaad.abstractions/package.json b/acaad.abstractions/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@acaad/abstractions",
-  "version": "0.1.0-alpha.1",
+  "version": "0.1.0-alpha.2",
   "description": "Abstractions for Any Computer as a Device (ACaaD)",
   "files": [
     "./dist"

diff --git a/acaad.core/package.json b/acaad.core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@acaad/core",
-  "version": "0.1.0-alpha.1",
+  "version": "0.1.0-alpha.2",
   "description": "acaad",
   "main": "dist/cjs/src/index.js",
   "module": "./dist/esnext/src/index.js",

diff --git a/acaad.core/src/ComponentManager.ts b/acaad.core/src/ComponentManager.ts
@@ -738,7 +738,7 @@
         ).pipe(Effect.withSpan('acaad:cs:onUnhandledEvent'));
       }
 
-      this._logger.logWarning(`Discarded valid, but unhandled event: '${event.name}'`);
+      this._logger.logTrace(`Discarded valid, but unhandled event: '${event.name}'`);
       return yield* Effect.void;
     });
   }

diff --git a/acaad.core/src/services/AcaadResponseParser.ts b/acaad.core/src/services/AcaadResponseParser.ts
@@ -81,7 +81,9 @@ export class AcaadResponseParser implements IResponseParser {
     outcome: AcaadOutcome
   ): Effect.Effect<unknown, AcaadError> {
     return Effect.gen(this, function* () {
-      return yield* this.parseSingleValue(metadata, outcome.outcomeRaw);
+      const jsonParsed = yield* this.tryParseJsonEff(metadata, outcome.outcomeRaw!);
+
+      return yield* this.parseSingleValue(metadata, jsonParsed);
     });
   }
 

diff --git a/acaad.core/tests/integration/events/inbound-events.test.ts b/acaad.core/tests/integration/events/inbound-events.test.ts
@@ -54,7 +54,12 @@ describe('inbound events', () => {
     const rndServer = intTestContext.getRandomServer();
     const rndCd = rndServer.getRandomComponent(ComponentType.Sensor);
 
-    const event = TestEventFactory.createComponentOutcomeEvent(rndCd.toIdentifier());
+    const expectedOutcomeRaw = 'the-original-outcome';
+    const event = TestEventFactory.createComponentOutcomeEvent(
+      rndCd.toIdentifier(),
+      undefined,
+      expectedOutcomeRaw
+    );
 
     const checkpoint = stateObserver.waitForSpanAsync('acaad:cs:updateComponentState');
 
@@ -66,7 +71,7 @@ describe('inbound events', () => {
 
     const expectedStateUpdate: InboundStateUpdate = {
       originalOutcome: event.outcome,
-      determinedTargetState: event.outcome.outcomeRaw,
+      determinedTargetState: expectedOutcomeRaw,
       metadata: expect.anything()
     };
 

diff --git a/acaad.core/tests/integration/factories/test-event-factory.ts b/acaad.core/tests/integration/factories/test-event-factory.ts
@@ -12,7 +12,7 @@ export class TestEventFactory {
       componentName,
       new AcaadOutcome({
         success: true,
-        outcomeRaw: outcomeRaw
+        outcomeRaw: JSON.stringify(outcomeRaw)
       })
     );
   }
@@ -30,7 +30,9 @@ export class TestEventFactory {
       componentDescriptor.toIdentifier(),
       new AcaadOutcome({
         success: true,
-        outcomeRaw: targetState ? componentDescriptor.onIff.toString() : 'not-the-on-iff-value'
+        outcomeRaw: JSON.stringify(
+          targetState ? componentDescriptor.onIff.toString() : 'not-the-on-iff-value'
+        )
       })
     );
   }

diff --git a/acaad.core/tests/unit/services/AcaadResponseParser.test.ts b/acaad.core/tests/unit/services/AcaadResponseParser.test.ts
@@ -162,13 +162,13 @@ describe('AcaadResponseParser', () => {
 
   it.each([
     {
-      outcomeRaw: 'test-string',
+      outcomeRaw: '\"test-string\"',
       cardinality: 'Single',
       type: 'String',
       expectedResult: 'test-string'
     },
     {
-      outcomeRaw: '',
+      outcomeRaw: '\"\"',
       cardinality: 'Single',
       type: 'String',
       expectedResult: ''
@@ -186,19 +186,19 @@ describe('AcaadResponseParser', () => {
       expectedResult: false
     },
     {
-      outcomeRaw: 'tRUe',
+      outcomeRaw: '\"tRUe\"',
       cardinality: 'Single',
       type: 'Boolean',
       expectedResult: true
     },
     {
-      outcomeRaw: 'faLSE',
+      outcomeRaw: '\"faLSE\"',
       cardinality: 'Single',
       type: 'Boolean',
       expectedResult: false
     },
     {
-      outcomeRaw: 'test-string',
+      outcomeRaw: '\"test-string\"',
       cardinality: 'Single',
       type: 'Boolean',
       expectedError: new OutcomeNotParseableError('Boolean', 'Single', 'test-string')
@@ -210,7 +210,7 @@ describe('AcaadResponseParser', () => {
       expectedResult: 1337
     },
     {
-      outcomeRaw: 'test-string',
+      outcomeRaw: '\"test-string\"',
       cardinality: 'Single',
       type: 'Long',
       expectedError: new OutcomeNotParseableError('Long', 'Single', 'test-string')
@@ -228,7 +228,7 @@ describe('AcaadResponseParser', () => {
       expectedResult: 1337.4711
     },
     {
-      outcomeRaw: 'test-string',
+      outcomeRaw: '\"test-string\"',
       cardinality: 'Single',
       type: 'Decimal',
       expectedError: new OutcomeNotParseableError('Decimal', 'Single', 'test-string')

diff --git a/acaad.testing/package.json b/acaad.testing/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@acaad/testing",
-  "version": "0.1.0-alpha.1",
+  "version": "0.1.0-alpha.2",
   "description": "acaad",
   "main": "dist/cjs/index.js",
   "module": "./dist/esnext/index.js",

diff --git a/acaad.toolchain/package.json b/acaad.toolchain/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@acaad/toolchain",
-  "version": "0.1.0-alpha.1",
+  "version": "0.1.0-alpha.2",
   "description": "acaad",
   "author": {
     "name": "OlliMartin",

diff --git a/common/changes/@acaad/abstractions/hotfix-SingleValueParse_2025-03-08-12-29.json b/common/changes/@acaad/abstractions/hotfix-SingleValueParse_2025-03-08-12-29.json
@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@acaad/abstractions",
+      "comment": "",
+      "type": "none"
+    }
+  ],
+  "packageName": "@acaad/abstractions"
+}
diff --git a/common/changes/@acaad/core/hotfix-SingleValueParse_2025-03-08-11-37.json b/common/changes/@acaad/core/hotfix-SingleValueParse_2025-03-08-11-37.json
@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@acaad/core",
+      "comment": "Fixed issue in single-value parsing",
+      "type": "none"
+    }
+  ],
+  "packageName": "@acaad/core"
+}
diff --git a/common/changes/@acaad/testing/hotfix-SingleValueParse_2025-03-08-12-29.json b/common/changes/@acaad/testing/hotfix-SingleValueParse_2025-03-08-12-29.json
@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@acaad/testing",
+      "comment": "",
+      "type": "none"
+    }
+  ],
+  "packageName": "@acaad/testing"
+}
diff --git a/common/changes/@acaad/toolchain/hotfix-SingleValueParse_2025-03-08-12-29.json b/common/changes/@acaad/toolchain/hotfix-SingleValueParse_2025-03-08-12-29.json
@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@acaad/toolchain",
+      "comment": "",
+      "type": "none"
+    }
+  ],
+  "packageName": "@acaad/toolchain"
+}
diff --git a/common/changes/iobroker.acaad/hotfix-SingleValueParse_2025-03-08-11-37.json b/common/changes/iobroker.acaad/hotfix-SingleValueParse_2025-03-08-11-37.json
@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "iobroker.acaad",
+      "comment": "Adjustments for new core release",
+      "type": "none"
+    }
+  ],
+  "packageName": "iobroker.acaad"
+}
diff --git a/common/changes/iobroker.acaad/hotfix-SingleValueParse_2025-03-08-12-29.json b/common/changes/iobroker.acaad/hotfix-SingleValueParse_2025-03-08-12-29.json
@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "iobroker.acaad",
+      "comment": "Parse single values as well",
+      "type": "none"
+    }
+  ],
+  "packageName": "iobroker.acaad"
+}