fix

src/core/actions.ts

@@ -26,6 +26,8 @@ export type BridgeOptions = {
     sourceName?: string
     sourceId?: string
     sourceData?: string[]
+    sourceExt?: boolean
+    sourceRtr?: boolean
     sourceFile?: string
     sourceBidirectional?: boolean
     target?: string
@@ -81,6 +83,8 @@ function createSource(options: BridgeOptions) {
         return new ConsoleSource({
             id: Number(options.sourceId),
             data: options.sourceData.map(Number),
+            ext: options.sourceExt ?? false,
+            rtr: options.sourceRtr ?? false,
         })
     }
 

src/core/bridge.ts

@@ -1,5 +1,6 @@
 import Source from '#/source/source'
 import Target from '#/target/target'
+import * as assert from '#assert'
 import std from '#std'
 import hae from '#utils/hae'
 
@@ -29,6 +30,7 @@ export class Bridge {
         await this.source.receive(
             hae.log(async message => {
                 std.log('bridging forward', {message})
+                assert.isMessage(message)
                 await this.target.send(message)
                 if (!this.source.continuous) await this.stop()
             })
@@ -37,6 +39,7 @@ export class Bridge {
         await this.target.receive(
             hae.log(async message => {
                 std.log('bridging backward', {message})
+                assert.isMessage(message)
                 await this.source.send(message)
             })
         )

src/core/message.ts

@@ -4,24 +4,25 @@ import {Message as CANMessage} from '*can.node'
 export default class Message {
     id: number
     data: number[]
+    ext: boolean
+    rtr: boolean
 
-    // TODO: ext
-    // TODO: rtr
-
-    private constructor(id: number, data: number[]) {
+    private constructor(id: number, data: number[], ext: boolean, rtr: boolean) {
         assert.isNumber(id)
         assert.isNumbers(data)
 
         this.id = id
         this.data = data
+        this.ext = ext
+        this.rtr = rtr
     }
 
-    static fromJSON(message: {id: number; data: number[]}) {
-        return new Message(message.id, message.data)
+    static fromJSON(message: {id: number; data: number[]; ext: boolean; rtr: boolean}) {
+        return new Message(message.id, message.data, message.ext, message.rtr)
     }
 
     toJSON() {
-        return {id: this.id, data: this.id}
+        return {id: this.id, data: this.data}
     }
 
     static fromString(message: string) {
@@ -34,11 +35,11 @@ export default class Message {
     }
 
     static fromCAN(message: CANMessage): Message {
-        return this.fromJSON({id: message.id, data: Array.from(message.data)})
+        return this.fromJSON({id: message.id, data: Array.from(message.data), ext: message.ext, rtr: message.rtr})
     }
 
     toCAN(): CANMessage {
-        return {id: this.id, data: Buffer.from(this.data), ext: false, rtr: false}
+        return {id: this.id, data: Buffer.from(this.data), ext: this.ext, rtr: this.rtr}
     }
 
     static fromArrayBuffer(message: ArrayBuffer | ArrayBuffer[]) {

src/index.ts

@@ -30,6 +30,8 @@ bridge
     .option('--source-name [string]', '', 'can2x')
     .option('--source-id [number]', '')
     .option('--source-data [numbers...]', '')
+    .option('--source-ext [boolean]', '', false) // TODO: docs
+    .option('--source-rtr [boolean]', '', false) // TODO: docs
     .option('--source-bidirectional [boolean]', '', true)
     .addOption(
         new Option('--target [string]', '')

src/source/console.ts

@@ -3,7 +3,7 @@ import Message from '#core/message'
 import {Processor} from '#core/types'
 import std from '#std'
 
-export type ConsoleSourceOptions = {id: number; data: number[]}
+export type ConsoleSourceOptions = {id: number; data: number[]; ext: boolean; rtr: boolean}
 
 export class ConsoleSource extends Source {
     options: ConsoleSourceOptions
@@ -14,7 +14,12 @@ export class ConsoleSource extends Source {
     }
 
     async receive(processor: Processor) {
-        const message = Message.fromJSON({id: this.options.id, data: this.options.data})
+        const message = Message.fromJSON({
+            id: this.options.id,
+            data: this.options.data,
+            ext: this.options.ext,
+            rtr: this.options.rtr,
+        })
         std.log('console received', {message})
         this.processor = processor
         this.processor(message)

src/source/http.ts

@@ -40,7 +40,7 @@ export class HTTPSource extends Source {
                 std.log('http source received', {message: req.body})
 
                 if (check.isDefined(this.processor)) {
-                    this.processor(req.body)
+                    this.processor(Message.fromJSON(req.body))
                 } else {
                     std.log('no processor defined')
                 }

src/source/ws.ts

@@ -38,10 +38,10 @@ export class WSSource extends Source {
                 std.log('websocket source error', {error})
             })
 
-            this.ws.on('message', (message: string) => {
+            this.ws.on('message', (message: Buffer) => {
                 std.log('websocket source received', {message})
                 if (check.isUndefined(this.processor)) return std.log('no processor defined')
-                this.processor(Message.fromString(message))
+                this.processor(Message.fromBuffer(message))
             })
         })
 

src/target/console.ts

@@ -9,7 +9,7 @@ export class ConsoleTarget extends Target {
 
     async send(message: Message) {
         std.log('console target sending', {message})
-        std.out(message.id, message.data)
+        std.out(message.toString())
         std.log('console target sent')
     }
 }

src/utils/assert.ts

@@ -1,4 +1,5 @@
 import * as check from '#check'
+import Message from '#core/message'
 import * as utils from '#utils'
 
 export function isDefined<T>(element: T | undefined | null, msg: string): asserts element is T {
@@ -51,3 +52,7 @@ export function isName(name: string) {
 export function isBuffer(element: unknown): asserts element is Buffer {
     if (!check.isBuffer(element)) throw new Error(`Element "${element} is not a buffer`)
 }
+
+export function isMessage(element: any): asserts element is Message {
+    if (!(element instanceof Message)) throw new Error(`Object "${element}" is not a message"`)
+}