Refactor framed stream

crates/items_2/src/channelevents.rs

@@ -967,6 +967,16 @@ impl Events for ChannelEvents {
         }
     }
 
+    fn to_json_string(&self) -> String {
+        match self {
+            ChannelEvents::Events(item) => item.to_json_string(),
+            ChannelEvents::Status(item) => {
+                error!("TODO convert status to json");
+                String::new()
+            }
+        }
+    }
+
     fn to_json_vec_u8(&self) -> Vec<u8> {
         match self {
             ChannelEvents::Events(item) => item.to_json_vec_u8(),

crates/items_2/src/empty.rs

@@ -28,6 +28,7 @@ pub fn empty_events_dyn_ev(scalar_type: &ScalarType, shape: &Shape) -> Result<Bo
                 STRING => Box::new(K::<String>::empty()),
                 Enum => Box::new(K::<EnumVariant>::empty()),
                 ChannelStatus => Box::new(K::<u32>::empty()),
+                CaStatus => Box::new(K::<i16>::empty()),
             }
         }
         Shape::Wave(..) => {
@@ -48,6 +49,7 @@ pub fn empty_events_dyn_ev(scalar_type: &ScalarType, shape: &Shape) -> Result<Bo
                 STRING => Box::new(K::<String>::empty()),
                 Enum => Box::new(K::<EnumVariant>::empty()),
                 ChannelStatus => Box::new(K::<u32>::empty()),
+                CaStatus => Box::new(K::<i16>::empty()),
             }
         }
         Shape::Image(..) => {

crates/items_2/src/eventsdim0.rs

@@ -979,7 +979,7 @@ impl<STY: ScalarOps> Events for EventsDim0<STY> {
         Box::new(dst)
     }
 
-    fn to_json_vec_u8(&self) -> Vec<u8> {
+    fn to_json_string(&self) -> String {
         // TODO redesign with mut access, rename to `into_` and take the values out.
         let mut tss = self.tss.clone();
         let mut pulses = self.pulses.clone();
@@ -1000,7 +1000,11 @@ impl<STY: ScalarOps> Events for EventsDim0<STY> {
             timed_out: false,
             continue_at: None,
         };
-        serde_json::to_vec(&ret).unwrap()
+        serde_json::to_string(&ret).unwrap()
+    }
+
+    fn to_json_vec_u8(&self) -> Vec<u8> {
+        self.to_json_string().into_bytes()
     }
 
     fn to_cbor_vec_u8(&self) -> Vec<u8> {

crates/items_2/src/eventsdim1.rs

@@ -949,7 +949,7 @@ impl<STY: ScalarOps> Events for EventsDim1<STY> {
         Box::new(item)
     }
 
-    fn to_json_vec_u8(&self) -> Vec<u8> {
+    fn to_json_string(&self) -> String {
         let ret = EventsDim1ChunkOutput {
             // TODO use &mut to swap the content
             tss: self.tss.clone(),
@@ -957,7 +957,11 @@ impl<STY: ScalarOps> Events for EventsDim1<STY> {
             values: self.values.clone(),
             scalar_type: STY::scalar_type_name().into(),
         };
-        serde_json::to_vec(&ret).unwrap()
+        serde_json::to_string(&ret).unwrap()
+    }
+
+    fn to_json_vec_u8(&self) -> Vec<u8> {
+        self.to_json_string().into_bytes()
     }
 
     fn to_cbor_vec_u8(&self) -> Vec<u8> {

crates/items_2/src/eventsxbindim0.rs

@@ -358,6 +358,10 @@ impl<STY: ScalarOps> Events for EventsXbinDim0<STY> {
         Box::new(dst)
     }
 
+    fn to_json_string(&self) -> String {
+        todo!()
+    }
+
     fn to_json_vec_u8(&self) -> Vec<u8> {
         todo!()
     }