Complete protobuf refactor

Author: tolauwae

justfile

@@ -0,0 +1,13 @@
+set default-list := true
+
+lint:
+    npx eslint src/**/* --config .eslint.config.mjs
+
+format:
+    npx eslint src/**/* --config .eslint.config.mjs --fix
+
+protocol:
+    temp_dir=$(mktemp -d) && trap 'rm -rf "$temp_dir"' EXIT && curl --fail --silent --show-error --location https://raw.githubusercontent.com/TOPLLab/WARDuino/7805f0bc87e79c55c151788a279f2ecb13e0fa7a/src/Debug/debug.proto --output "$temp_dir/debug.proto" && protoc --proto_path="$temp_dir" --plugin=protoc-gen-ts_proto=node_modules/.bin/protoc-gen-ts_proto --ts_proto_out=src/protocol/vendor --ts_proto_opt=env=node,forceLong=bigint,useOptionals=messages,outputEncodeMethods=true,outputJsonMethods=false "$temp_dir/debug.proto"
+
+test:
+    npm run test:all

package-lock.json

@@ -1,7 +1,7 @@
 {
   "name": "latch",
   "description": "A testing framework for constrained environments",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/TOPLLab/latch.git"
@@ -40,6 +40,7 @@
     "test:prebuild": "npm run build && npm run build:tests",
     "test": "npm run test:all",
     "test:all": "npm run test:prebuild && npm run test:ava && npm run test:integration && npm run test:end-to-end",
+    "protocol:generate": "just protocol",
     "test:ava": "ava",
     "test:integration": "npx ts-node ./tests/integration/precision.ts",
     "test:end-to-end": "npx ts-node ./tests/end-to-end/end2end.test.ts",

package.json

@@ -319,15 +319,19 @@ export class Testee { // TODO unified with testbed interface
         recover: (t: Testee) => Promise<any>,
         retries: number = 0): Promise<object | void> {
         let result: object | void = undefined;
-        let error;
-        while (0 <= retries && result === undefined) {
-            result = await attempt(testee, step, map).catch(async (err) => {
+        let error: unknown;
+        let succeeded = false;
+        while (0 <= retries && !succeeded) {
+            try {
+                result = await attempt(testee, step, map);
+                succeeded = true;
+            } catch (err) {
                 error = err;
                 await recover(testee);
-            });
-            retries--;
+                retries--;
+            }
         }
-        return (result === undefined) ? Promise.reject(error) : result;
+        return succeeded ? result! : Promise.reject(error);
     }
 
     public skipall(): Testee {

src/framework/Testee.ts

@@ -3,7 +3,8 @@ import {setTimeout} from 'timers/promises';
 import {Testee} from '../Testee';
 import {TestbedEvents} from '../../testbeds/Testbed';
 import {Breakpoint} from '../../debug/Breakpoint';
-import {breakpointHitParser} from '../../messaging/Parsers';
+import {DebugFrame} from '../../protocol/frame';
+import {HitBreakpoint, NotificationType} from '../../protocol/vendor/debug';
 
 export interface Dictionary {
     [index: string]: any;
@@ -32,16 +33,12 @@ export function awaitBreakpoint(): Action<Breakpoint> {
     return {
         act: (testee: Testee) => {
             return new Promise<Assertable<Breakpoint>>((resolve) => {
-                function breakpointListener(message: string) {
-                    // check breakpoint hit message
-                    try {
-                        const breakpoint = breakpointHitParser(message);
-                        // on success: remove listener + resolve
-                        testee.bed()?.removeListener(TestbedEvents.OnMessage, breakpointListener);
-                        resolve(assertable(breakpoint));
-                    } catch {
-                        // breakpoint not hit yet
-                    }
+                function breakpointListener(frame: DebugFrame) {
+                    if (frame.type !== NotificationType.NOTIFICATION_HIT_BREAKPOINT) return;
+                    const location = HitBreakpoint.decode(frame.payload).location;
+                    if (location === undefined) return;
+                    testee.bed()?.removeListener(TestbedEvents.OnMessage, breakpointListener);
+                    resolve(assertable(new Breakpoint(location.programCounter, 0)));
                 }
 
                 // await breakpoint hit

src/framework/scenario/Actions.ts

@@ -16,5 +16,7 @@ export * from './testbeds/TestbedSpecification';
 export * from './debug/Breakpoint';
 export * from './reporter/index';
 export * from './debug/WARDuino';
+export * from './protocol/frame';
+export * as DebugProtocol from './protocol/vendor/debug';
 
 export const latch = Framework.getImplementation();