v0.3.7: fix #115 (#116)

package.json

@@ -8,7 +8,7 @@
   "module": "./dist/index.mjs",
   "name": "chameleon-ultra.js",
   "type": "commonjs",
-  "version": "0.3.6",
+  "version": "0.3.7",
   "bugs": {
     "url": "https://github.com/taichunmin/chameleon-ultra.js/issues"
   },

src/ChameleonUltra.ts

@@ -291,17 +291,13 @@ export class ChameleonUltra {
    */
   async _writeBuffer (buf: Buffer): Promise<void> {
     await this.invokeHook('_writeBuffer', { buf }, async (ctx, next) => {
-      try {
-        if (!Buffer.isBuffer(ctx.buf)) throw new TypeError('buf should be a Buffer')
-        if (!this.isConnected()) await this.connect()
-        this.logger.send(ChameleonUltraFrame.inspect(ctx.buf))
-        const writer = (this.port?.writable as any)?.getWriter()
-        if (_.isNil(writer)) throw new Error('Failed to getWriter(). Did you remember to use adapter plugin?')
-        await writer.write(ctx.buf)
-        writer.releaseLock()
-      } catch (err) {
-        throw _.merge(new Error(err.message ?? 'Failed to connect'), { originalError: err })
-      }
+      if (!Buffer.isBuffer(ctx.buf)) throw new TypeError('buf should be a Buffer')
+      if (!this.isConnected()) await this.connect()
+      this.logger.send(ChameleonUltraFrame.inspect(ctx.buf))
+      const writer = (this.port?.writable as any)?.getWriter()
+      if (_.isNil(writer)) throw new Error('Failed to getWriter(). Did you remember to use adapter plugin?')
+      await writer.write(ctx.buf)
+      writer.releaseLock()
     })
   }
 

src/plugin/WebbleAdapter.ts

@@ -142,18 +142,17 @@ interface AdapterInstallResp {
 }
 
 class ChameleonWebbleAdapterRxSource implements UnderlyingSource<Buffer> {
-  adapter: WebbleAdapter
-  bufs: Buffer[] = []
-  controller?: ReadableStreamDefaultController<Buffer>
+  #controller?: ReadableStreamDefaultController<Buffer>
+  readonly #adapter: WebbleAdapter
 
-  constructor (adapter: WebbleAdapter) { this.adapter = adapter }
+  constructor (adapter: WebbleAdapter) { this.#adapter = adapter }
 
-  start (controller: ReadableStreamDefaultController<Buffer>): void { this.controller = controller }
+  start (controller: ReadableStreamDefaultController<Buffer>): void { this.#controller = controller }
 
   onNotify (event: any): void {
-    const buf = this.adapter.Buffer?.from((event?.target?.value as Uint8Array))
-    this.adapter.logger.webble(`onNotify = ${buf?.toString('hex')}`)
-    this.controller?.enqueue(buf)
+    const buf = this.#adapter.Buffer?.fromView((event?.target?.value as DataView))
+    this.#adapter.logger.webble(`onNotify = ${buf?.toString('hex')}`)
+    this.#controller?.enqueue(buf)
   }
 }
 
@@ -163,12 +162,13 @@ class ChameleonWebbleAdapterTxSink implements UnderlyingSink<Buffer> {
 
   constructor (adapter: WebbleAdapter) {
     this.#adapter = adapter
-    if (_.isNil(this.#adapter.send)) throw new Error('this.adapter.send can not be null')
-    if (_.isNil(this.#adapter.Buffer)) throw new Error('this.adapter.Buffer can not be null')
+    if (_.isNil(this.#adapter.Buffer)) throw new Error('this.#adapter.Buffer can not be null')
     this.#Buffer = this.#adapter.Buffer
   }
 
   async write (chunk: Buffer): Promise<void> {
+    if (_.isNil(this.#adapter.send)) throw new Error('this.#adapter.send can not be null')
+
     // 20 bytes are left for the attribute data
     // https://stackoverflow.com/questions/38913743/maximum-packet-length-for-bluetooth-le
     let buf1: Buffer | null = null