ngx-web-serial 0.0.2 → 0.0.3

package/README.md

@@ -1,8 +1,10 @@
 [![Publish to GitHub Packages](https://github.com/mattfors/ngx-web-serial/actions/workflows/build.yml/badge.svg)](https://github.com/mattfors/ngx-web-serial/actions/workflows/build.yml)
 
-# Angular Web Serial
+# NgxWebSerial
 
-Angular Web Serial is an angular module for connecting to serial devices with the Web Serial API.
+NgxWebSerial is an angular library for connecting to serial devices with the Web Serial API and RxJS.
+
+Connecting, transmitting and receiving data are abstracted to RxJS observables which will be familiar to anyone using Angular.
 
 ## Installation
 
@@ -11,10 +13,10 @@ npm i ngx-web-serial
 ```
 
 ## Usage
-Below is the basic usage of the module. A pipe is used to accumulate the raw data from the serial port.
+Below demonstrates the basic usage. A pipe is used to accumulate the raw data from the serial port.
 ```typescript
 import { Component } from '@angular/core';
-import { AngularSerialService, provideAngularSerial } from 'ngx-web-serial';
+import { NgxWebSerial, provideNgxWebSerial } from 'ngx-web-serial';
 import { Observable, scan } from 'rxjs';
 import { AsyncPipe } from '@angular/common';
 
@@ -22,7 +24,7 @@ import { AsyncPipe } from '@angular/common';
   selector: 'app-root',
   standalone: true,
   imports: [AsyncPipe],
-  providers: [provideAngularSerial()],
+  providers: [provideNgxWebSerial()],
   template: `
     <button (click)="open()">Open</button>
     <input #inputField
@@ -38,7 +40,7 @@ export class AppComponent {
 
   data$: Observable<string>;
 
-  constructor(private serial: AngularSerialService) {
+  constructor(private serial: NgxWebSerial) {
     this.data$ = this.serial.read().pipe(
       scan((acc, value) => acc + value, '')
     );
@@ -49,7 +51,7 @@ export class AppComponent {
   }
 
   write(value: string): void {
-    this.serial.write(value + '\r').subscribe();
+    this.serial.write(value).subscribe();
   }
 
 }
@@ -59,5 +61,5 @@ export class AppComponent {
 ## Mock serial device
 The module can be used with a mock serial device for testing or if you do not have a real serial device. Provide a function which takes and returns a string. In this example, the text transmitted to the serial device will be echoed back with 'Hello'.
 ```typescript
-providers: [provideAngularSerialTest(i => `Hello ${i}!\n`)]
+providers: [provideNgxWebSerialTest(i => `Hello ${i}!\n`)]
 ```

package/esm2022/lib/ngx-web-serial.service.mjs

@@ -3,7 +3,7 @@ import { BehaviorSubject, catchError, filter, firstValueFrom, from, interval, ma
 import { DOCUMENT } from '@angular/common';
 import { MockSerial } from './mock-serial';
 import * as i0 from "@angular/core";
-export class NgxWebSerialService {
+export class NgxWebSerial {
     constructor(serial, ngZone) {
         this.serial = serial;
         this.ngZone = ngZone;
@@ -92,18 +92,18 @@ export class NgxWebSerialService {
             this.abortController.abort();
         }
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: NgxWebSerialService, deps: [{ token: 'Serial' }, { token: i0.NgZone }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: NgxWebSerialService }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: NgxWebSerial, deps: [{ token: 'Serial' }, { token: i0.NgZone }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: NgxWebSerial }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: NgxWebSerialService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: NgxWebSerial, decorators: [{
             type: Injectable
         }], ctorParameters: () => [{ type: undefined, decorators: [{
                     type: Inject,
                     args: ['Serial']
                 }] }, { type: i0.NgZone }] });
-export function provideAngularSerial() {
+export function provideNgxWebSerial() {
     return [
-        NgxWebSerialService,
+        NgxWebSerial,
         {
             provide: 'Serial',
             useFactory: (document) => document.defaultView?.navigator?.serial,
@@ -111,9 +111,9 @@ export function provideAngularSerial() {
         }
     ];
 }
-export function provideAngularSerialTest(responseFunction) {
+export function provideNgxWebSerialTest(responseFunction) {
     return [
-        NgxWebSerialService,
+        NgxWebSerial,
         {
             provide: 'Serial',
             useFactory: () => new MockSerial(responseFunction || ((input) => input)),
@@ -121,4 +121,4 @@ export function provideAngularSerialTest(responseFunction) {
         }
     ];
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ngx-web-serial.service.js","sourceRoot":"","sources":["../../../../projects/ngx-web-serial/src/lib/ngx-web-serial.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { FactoryProvider, Inject, Injectable, NgZone, Provider } from '@angular/core';\nimport {\n  BehaviorSubject,\n  catchError,\n  filter,\n  firstValueFrom,\n  from,\n  interval,\n  map,\n  Observable,\n  Subject,\n  Subscriber,\n  takeUntil,\n  throwError,\n  timer\n} from 'rxjs';\nimport { DOCUMENT } from '@angular/common';\nimport { MockSerial } from './mock-serial';\n\n@Injectable()\nexport class NgxWebSerialService {\n\n  private port: SerialPort | null = null;\n  private abortController: AbortController | null = null;\n  private dataStream: WritableStream | null = null;\n  private dataSubject: Subject<string> = new Subject<string>();\n  private writer: WritableStreamDefaultWriter<Uint8Array> | null = null;\n  private connectedSubject: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);\n\n  private readonly sink: UnderlyingSink =  {\n    write: (chunk: any) => {\n      this.ngZone.run(() => {\n        this.dataSubject.next(chunk);\n      });\n    }\n  }\n\n  constructor(\n    @Inject('Serial') readonly serial: Serial | undefined,\n    private ngZone: NgZone\n  ) {\n  }\n\n  /**\n   * Establishes a connection to a serial port using the Web Serial API.\n   */\n  open(serialOptions: SerialOptions = { baudRate: 9600 }, options?: SerialPortRequestOptions): Observable<void> {\n    return new Observable<void>((observer: Subscriber<void>) => {\n      if (!this.serial) {\n        observer.error('Web serial not supported.');\n        return;\n      }\n      this.serial.requestPort(options)\n        .then((port: SerialPort) => {\n          this.port = port;\n          return this.port.open(serialOptions);\n        })\n        .then(() => {\n          if (!this.port?.readable || !this.port?.writable) {\n            observer.error('Port is not readable or writable.');\n            return;\n          }\n          this.connectedSubject.next(true);\n          this.abortController = new AbortController();\n          this.dataStream = new WritableStream(this.sink);\n          this.writer = this.port?.writable.getWriter();\n          observer.next();\n          return this.port.readable\n            .pipeThrough(new TextDecoderStream())\n            .pipeTo(this.dataStream, {signal: this.abortController.signal})\n            .catch(() => this.closePort().catch((err) => observer.error(err)));\n        })\n        .catch((err) => observer.error(err))\n        .finally(() => observer.complete());\n    });\n  }\n\n  isConnected(): Observable<boolean> {\n    return this.connectedSubject.asObservable();\n  }\n\n  read(): Observable<string> {\n    return this.dataSubject.asObservable();\n  }\n\n  write(data: string): Observable<void> {\n    if (this.writer) {\n      return from(this.writer.write(new TextEncoder().encode(data)));\n\n    }\n    return throwError(() => new Error('No writer available.'));\n  }\n\n\n  private waitForReadableUnlock(period: number = 50, timeout: number = 5000): Promise<void> {\n    return firstValueFrom(interval(period).pipe(\n      filter(() => !this.port?.readable?.locked),\n      map(() => undefined),\n      takeUntil(timer(timeout)),\n      catchError(() => throwError(() => new Error('Timeout waiting for readable stream to unlock')))\n    ));\n  }\n\n  private closePort(): Promise<void> {\n    this.abortController = null;\n    if (this.writer) {\n      this.writer.releaseLock();\n      this.writer = null;\n    }\n    if (this.port) {\n      return this.waitForReadableUnlock()\n        .then(() => this.port!.close())\n        .then(() => {\n          this.port = null;\n          this.connectedSubject.next(false);\n        });\n    } else {\n      return Promise.resolve();\n    }\n  }\n  close(): void {\n    if (this.abortController) {\n      this.abortController.abort();\n    }\n  }\n}\n\nexport function provideAngularSerial(): Provider[] {\n  return [\n    NgxWebSerialService,\n    {\n      provide: 'Serial',\n      useFactory: (document: Document) => document.defaultView?.navigator?.serial,\n      deps: [DOCUMENT]\n    }\n  ];\n}\n\nexport function provideAngularSerialTest(responseFunction?: (input: string) => string): Provider[] {\n  return [\n    NgxWebSerialService,\n    {\n      provide: 'Serial',\n      useFactory: () => new MockSerial(responseFunction || ((input: string) => input)),\n      deps: []\n    } as FactoryProvider\n  ];\n}\n"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ngx-web-serial.service.js","sourceRoot":"","sources":["../../../../projects/ngx-web-serial/src/lib/ngx-web-serial.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { FactoryProvider, Inject, Injectable, NgZone, Provider } from '@angular/core';\nimport {\n  BehaviorSubject,\n  catchError,\n  filter,\n  firstValueFrom,\n  from,\n  interval,\n  map,\n  Observable,\n  Subject,\n  Subscriber,\n  takeUntil,\n  throwError,\n  timer\n} from 'rxjs';\nimport { DOCUMENT } from '@angular/common';\nimport { MockSerial } from './mock-serial';\n\n@Injectable()\nexport class NgxWebSerial {\n\n  private port: SerialPort | null = null;\n  private abortController: AbortController | null = null;\n  private dataStream: WritableStream | null = null;\n  private dataSubject: Subject<string> = new Subject<string>();\n  private writer: WritableStreamDefaultWriter<Uint8Array> | null = null;\n  private connectedSubject: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);\n\n  private readonly sink: UnderlyingSink =  {\n    write: (chunk: any) => {\n      this.ngZone.run(() => {\n        this.dataSubject.next(chunk);\n      });\n    }\n  }\n\n  constructor(\n    @Inject('Serial') readonly serial: Serial | undefined,\n    private ngZone: NgZone\n  ) {\n  }\n\n  /**\n   * Establishes a connection to a serial port using the Web Serial API.\n   */\n  open(serialOptions: SerialOptions = { baudRate: 9600 }, options?: SerialPortRequestOptions): Observable<void> {\n    return new Observable<void>((observer: Subscriber<void>) => {\n      if (!this.serial) {\n        observer.error('Web serial not supported.');\n        return;\n      }\n      this.serial.requestPort(options)\n        .then((port: SerialPort) => {\n          this.port = port;\n          return this.port.open(serialOptions);\n        })\n        .then(() => {\n          if (!this.port?.readable || !this.port?.writable) {\n            observer.error('Port is not readable or writable.');\n            return;\n          }\n          this.connectedSubject.next(true);\n          this.abortController = new AbortController();\n          this.dataStream = new WritableStream(this.sink);\n          this.writer = this.port?.writable.getWriter();\n          observer.next();\n          return this.port.readable\n            .pipeThrough(new TextDecoderStream())\n            .pipeTo(this.dataStream, {signal: this.abortController.signal})\n            .catch(() => this.closePort().catch((err) => observer.error(err)));\n        })\n        .catch((err) => observer.error(err))\n        .finally(() => observer.complete());\n    });\n  }\n\n  isConnected(): Observable<boolean> {\n    return this.connectedSubject.asObservable();\n  }\n\n  read(): Observable<string> {\n    return this.dataSubject.asObservable();\n  }\n\n  write(data: string): Observable<void> {\n    if (this.writer) {\n      return from(this.writer.write(new TextEncoder().encode(data)));\n\n    }\n    return throwError(() => new Error('No writer available.'));\n  }\n\n\n  private waitForReadableUnlock(period: number = 50, timeout: number = 5000): Promise<void> {\n    return firstValueFrom(interval(period).pipe(\n      filter(() => !this.port?.readable?.locked),\n      map(() => undefined),\n      takeUntil(timer(timeout)),\n      catchError(() => throwError(() => new Error('Timeout waiting for readable stream to unlock')))\n    ));\n  }\n\n  private closePort(): Promise<void> {\n    this.abortController = null;\n    if (this.writer) {\n      this.writer.releaseLock();\n      this.writer = null;\n    }\n    if (this.port) {\n      return this.waitForReadableUnlock()\n        .then(() => this.port!.close())\n        .then(() => {\n          this.port = null;\n          this.connectedSubject.next(false);\n        });\n    } else {\n      return Promise.resolve();\n    }\n  }\n  close(): void {\n    if (this.abortController) {\n      this.abortController.abort();\n    }\n  }\n}\n\nexport function provideNgxWebSerial(): Provider[] {\n  return [\n    NgxWebSerial,\n    {\n      provide: 'Serial',\n      useFactory: (document: Document) => document.defaultView?.navigator?.serial,\n      deps: [DOCUMENT]\n    }\n  ];\n}\n\nexport function provideNgxWebSerialTest(responseFunction?: (input: string) => string): Provider[] {\n  return [\n    NgxWebSerial,\n    {\n      provide: 'Serial',\n      useFactory: () => new MockSerial(responseFunction || ((input: string) => input)),\n      deps: []\n    } as FactoryProvider\n  ];\n}\n"]}

package/fesm2022/ngx-web-serial.mjs

@@ -34,7 +34,7 @@ class MockSerial {
     }
 }
 
-class NgxWebSerialService {
+class NgxWebSerial {
     constructor(serial, ngZone) {
         this.serial = serial;
         this.ngZone = ngZone;
@@ -123,18 +123,18 @@ class NgxWebSerialService {
             this.abortController.abort();
         }
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: NgxWebSerialService, deps: [{ token: 'Serial' }, { token: i0.NgZone }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: NgxWebSerialService }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: NgxWebSerial, deps: [{ token: 'Serial' }, { token: i0.NgZone }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: NgxWebSerial }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: NgxWebSerialService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: NgxWebSerial, decorators: [{
             type: Injectable
         }], ctorParameters: () => [{ type: undefined, decorators: [{
                     type: Inject,
                     args: ['Serial']
                 }] }, { type: i0.NgZone }] });
-function provideAngularSerial() {
+function provideNgxWebSerial() {
     return [
-        NgxWebSerialService,
+        NgxWebSerial,
         {
             provide: 'Serial',
             useFactory: (document) => document.defaultView?.navigator?.serial,
@@ -142,9 +142,9 @@ function provideAngularSerial() {
         }
     ];
 }
-function provideAngularSerialTest(responseFunction) {
+function provideNgxWebSerialTest(responseFunction) {
     return [
-        NgxWebSerialService,
+        NgxWebSerial,
         {
             provide: 'Serial',
             useFactory: () => new MockSerial(responseFunction || ((input) => input)),
@@ -161,5 +161,5 @@ function provideAngularSerialTest(responseFunction) {
  * Generated bundle index. Do not edit.
  */
 
-export { NgxWebSerialService, provideAngularSerial, provideAngularSerialTest };
+export { NgxWebSerial, provideNgxWebSerial, provideNgxWebSerialTest };
 //# sourceMappingURL=ngx-web-serial.mjs.map

package/fesm2022/ngx-web-serial.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"ngx-web-serial.mjs","sources":["../../../projects/ngx-web-serial/src/lib/mock-serial.ts","../../../projects/ngx-web-serial/src/lib/ngx-web-serial.service.ts","../../../projects/ngx-web-serial/src/public-api.ts","../../../projects/ngx-web-serial/src/ngx-web-serial.ts"],"sourcesContent":["export class MockSerial {\n  private readableController: ReadableStreamDefaultController<Uint8Array> | null = null;\n  readonly responseFunction: (input: string) => string;\n  readonly readableStream: ReadableStream<Uint8Array>;\n  constructor(responseFunction: (input: string) => string) {\n    this.responseFunction = responseFunction;\n    this.readableStream = new ReadableStream({\n      start: (controller) => {\n        this.readableController = controller;\n      },\n      cancel: () => {\n        this.readableController = null;\n      }\n    });\n  }\n\n  requestPort(options?: SerialPortRequestOptions): Promise<SerialPort> {\n    return Promise.resolve({\n      open: () => Promise.resolve(),\n      close: () => this.readableStream.cancel(),\n      readable: this.readableStream,\n      writable: new WritableStream({\n        write: (chunk) => {\n          const input = new TextDecoder().decode(chunk);\n          const response = this.responseFunction(input);\n          if (this.readableController) {\n            this.readableController.enqueue(new TextEncoder().encode(response));\n          }\n        }\n      })\n    } as any as SerialPort);\n  }\n}\n","import { FactoryProvider, Inject, Injectable, NgZone, Provider } from '@angular/core';\nimport {\n  BehaviorSubject,\n  catchError,\n  filter,\n  firstValueFrom,\n  from,\n  interval,\n  map,\n  Observable,\n  Subject,\n  Subscriber,\n  takeUntil,\n  throwError,\n  timer\n} from 'rxjs';\nimport { DOCUMENT } from '@angular/common';\nimport { MockSerial } from './mock-serial';\n\n@Injectable()\nexport class NgxWebSerialService {\n\n  private port: SerialPort | null = null;\n  private abortController: AbortController | null = null;\n  private dataStream: WritableStream | null = null;\n  private dataSubject: Subject<string> = new Subject<string>();\n  private writer: WritableStreamDefaultWriter<Uint8Array> | null = null;\n  private connectedSubject: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);\n\n  private readonly sink: UnderlyingSink =  {\n    write: (chunk: any) => {\n      this.ngZone.run(() => {\n        this.dataSubject.next(chunk);\n      });\n    }\n  }\n\n  constructor(\n    @Inject('Serial') readonly serial: Serial | undefined,\n    private ngZone: NgZone\n  ) {\n  }\n\n  /**\n   * Establishes a connection to a serial port using the Web Serial API.\n   */\n  open(serialOptions: SerialOptions = { baudRate: 9600 }, options?: SerialPortRequestOptions): Observable<void> {\n    return new Observable<void>((observer: Subscriber<void>) => {\n      if (!this.serial) {\n        observer.error('Web serial not supported.');\n        return;\n      }\n      this.serial.requestPort(options)\n        .then((port: SerialPort) => {\n          this.port = port;\n          return this.port.open(serialOptions);\n        })\n        .then(() => {\n          if (!this.port?.readable || !this.port?.writable) {\n            observer.error('Port is not readable or writable.');\n            return;\n          }\n          this.connectedSubject.next(true);\n          this.abortController = new AbortController();\n          this.dataStream = new WritableStream(this.sink);\n          this.writer = this.port?.writable.getWriter();\n          observer.next();\n          return this.port.readable\n            .pipeThrough(new TextDecoderStream())\n            .pipeTo(this.dataStream, {signal: this.abortController.signal})\n            .catch(() => this.closePort().catch((err) => observer.error(err)));\n        })\n        .catch((err) => observer.error(err))\n        .finally(() => observer.complete());\n    });\n  }\n\n  isConnected(): Observable<boolean> {\n    return this.connectedSubject.asObservable();\n  }\n\n  read(): Observable<string> {\n    return this.dataSubject.asObservable();\n  }\n\n  write(data: string): Observable<void> {\n    if (this.writer) {\n      return from(this.writer.write(new TextEncoder().encode(data)));\n\n    }\n    return throwError(() => new Error('No writer available.'));\n  }\n\n\n  private waitForReadableUnlock(period: number = 50, timeout: number = 5000): Promise<void> {\n    return firstValueFrom(interval(period).pipe(\n      filter(() => !this.port?.readable?.locked),\n      map(() => undefined),\n      takeUntil(timer(timeout)),\n      catchError(() => throwError(() => new Error('Timeout waiting for readable stream to unlock')))\n    ));\n  }\n\n  private closePort(): Promise<void> {\n    this.abortController = null;\n    if (this.writer) {\n      this.writer.releaseLock();\n      this.writer = null;\n    }\n    if (this.port) {\n      return this.waitForReadableUnlock()\n        .then(() => this.port!.close())\n        .then(() => {\n          this.port = null;\n          this.connectedSubject.next(false);\n        });\n    } else {\n      return Promise.resolve();\n    }\n  }\n  close(): void {\n    if (this.abortController) {\n      this.abortController.abort();\n    }\n  }\n}\n\nexport function provideAngularSerial(): Provider[] {\n  return [\n    NgxWebSerialService,\n    {\n      provide: 'Serial',\n      useFactory: (document: Document) => document.defaultView?.navigator?.serial,\n      deps: [DOCUMENT]\n    }\n  ];\n}\n\nexport function provideAngularSerialTest(responseFunction?: (input: string) => string): Provider[] {\n  return [\n    NgxWebSerialService,\n    {\n      provide: 'Serial',\n      useFactory: () => new MockSerial(responseFunction || ((input: string) => input)),\n      deps: []\n    } as FactoryProvider\n  ];\n}\n","/*\n * Public API Surface of ngx-web-serial\n */\n\nexport * from './lib/ngx-web-serial.service';\n","/**\n * Generated bundle index. Do not edit.\n */\n\nexport * from './public-api';\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"ngx-web-serial.mjs","sources":["../../../projects/ngx-web-serial/src/lib/mock-serial.ts","../../../projects/ngx-web-serial/src/lib/ngx-web-serial.service.ts","../../../projects/ngx-web-serial/src/public-api.ts","../../../projects/ngx-web-serial/src/ngx-web-serial.ts"],"sourcesContent":["export class MockSerial {\n  private readableController: ReadableStreamDefaultController<Uint8Array> | null = null;\n  readonly responseFunction: (input: string) => string;\n  readonly readableStream: ReadableStream<Uint8Array>;\n  constructor(responseFunction: (input: string) => string) {\n    this.responseFunction = responseFunction;\n    this.readableStream = new ReadableStream({\n      start: (controller) => {\n        this.readableController = controller;\n      },\n      cancel: () => {\n        this.readableController = null;\n      }\n    });\n  }\n\n  requestPort(options?: SerialPortRequestOptions): Promise<SerialPort> {\n    return Promise.resolve({\n      open: () => Promise.resolve(),\n      close: () => this.readableStream.cancel(),\n      readable: this.readableStream,\n      writable: new WritableStream({\n        write: (chunk) => {\n          const input = new TextDecoder().decode(chunk);\n          const response = this.responseFunction(input);\n          if (this.readableController) {\n            this.readableController.enqueue(new TextEncoder().encode(response));\n          }\n        }\n      })\n    } as any as SerialPort);\n  }\n}\n","import { FactoryProvider, Inject, Injectable, NgZone, Provider } from '@angular/core';\nimport {\n  BehaviorSubject,\n  catchError,\n  filter,\n  firstValueFrom,\n  from,\n  interval,\n  map,\n  Observable,\n  Subject,\n  Subscriber,\n  takeUntil,\n  throwError,\n  timer\n} from 'rxjs';\nimport { DOCUMENT } from '@angular/common';\nimport { MockSerial } from './mock-serial';\n\n@Injectable()\nexport class NgxWebSerial {\n\n  private port: SerialPort | null = null;\n  private abortController: AbortController | null = null;\n  private dataStream: WritableStream | null = null;\n  private dataSubject: Subject<string> = new Subject<string>();\n  private writer: WritableStreamDefaultWriter<Uint8Array> | null = null;\n  private connectedSubject: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);\n\n  private readonly sink: UnderlyingSink =  {\n    write: (chunk: any) => {\n      this.ngZone.run(() => {\n        this.dataSubject.next(chunk);\n      });\n    }\n  }\n\n  constructor(\n    @Inject('Serial') readonly serial: Serial | undefined,\n    private ngZone: NgZone\n  ) {\n  }\n\n  /**\n   * Establishes a connection to a serial port using the Web Serial API.\n   */\n  open(serialOptions: SerialOptions = { baudRate: 9600 }, options?: SerialPortRequestOptions): Observable<void> {\n    return new Observable<void>((observer: Subscriber<void>) => {\n      if (!this.serial) {\n        observer.error('Web serial not supported.');\n        return;\n      }\n      this.serial.requestPort(options)\n        .then((port: SerialPort) => {\n          this.port = port;\n          return this.port.open(serialOptions);\n        })\n        .then(() => {\n          if (!this.port?.readable || !this.port?.writable) {\n            observer.error('Port is not readable or writable.');\n            return;\n          }\n          this.connectedSubject.next(true);\n          this.abortController = new AbortController();\n          this.dataStream = new WritableStream(this.sink);\n          this.writer = this.port?.writable.getWriter();\n          observer.next();\n          return this.port.readable\n            .pipeThrough(new TextDecoderStream())\n            .pipeTo(this.dataStream, {signal: this.abortController.signal})\n            .catch(() => this.closePort().catch((err) => observer.error(err)));\n        })\n        .catch((err) => observer.error(err))\n        .finally(() => observer.complete());\n    });\n  }\n\n  isConnected(): Observable<boolean> {\n    return this.connectedSubject.asObservable();\n  }\n\n  read(): Observable<string> {\n    return this.dataSubject.asObservable();\n  }\n\n  write(data: string): Observable<void> {\n    if (this.writer) {\n      return from(this.writer.write(new TextEncoder().encode(data)));\n\n    }\n    return throwError(() => new Error('No writer available.'));\n  }\n\n\n  private waitForReadableUnlock(period: number = 50, timeout: number = 5000): Promise<void> {\n    return firstValueFrom(interval(period).pipe(\n      filter(() => !this.port?.readable?.locked),\n      map(() => undefined),\n      takeUntil(timer(timeout)),\n      catchError(() => throwError(() => new Error('Timeout waiting for readable stream to unlock')))\n    ));\n  }\n\n  private closePort(): Promise<void> {\n    this.abortController = null;\n    if (this.writer) {\n      this.writer.releaseLock();\n      this.writer = null;\n    }\n    if (this.port) {\n      return this.waitForReadableUnlock()\n        .then(() => this.port!.close())\n        .then(() => {\n          this.port = null;\n          this.connectedSubject.next(false);\n        });\n    } else {\n      return Promise.resolve();\n    }\n  }\n  close(): void {\n    if (this.abortController) {\n      this.abortController.abort();\n    }\n  }\n}\n\nexport function provideNgxWebSerial(): Provider[] {\n  return [\n    NgxWebSerial,\n    {\n      provide: 'Serial',\n      useFactory: (document: Document) => document.defaultView?.navigator?.serial,\n      deps: [DOCUMENT]\n    }\n  ];\n}\n\nexport function provideNgxWebSerialTest(responseFunction?: (input: string) => string): Provider[] {\n  return [\n    NgxWebSerial,\n    {\n      provide: 'Serial',\n      useFactory: () => new MockSerial(responseFunction || ((input: string) => input)),\n      deps: []\n    } as FactoryProvider\n  ];\n}\n","/*\n * Public API Surface of ngx-web-serial\n */\n\nexport * from './lib/ngx-web-serial.service';\n","/**\n * Generated bundle index. Do not edit.\n */\n\nexport * from './public-api';\n"],"names":[],"mappings":";;;;;MAAa,UAAU,CAAA;AAIrB,IAAA,WAAA,CAAY,gBAA2C,EAAA;QAH/C,IAAkB,CAAA,kBAAA,GAAuD,IAAI;AAInF,QAAA,IAAI,CAAC,gBAAgB,GAAG,gBAAgB;AACxC,QAAA,IAAI,CAAC,cAAc,GAAG,IAAI,cAAc,CAAC;AACvC,YAAA,KAAK,EAAE,CAAC,UAAU,KAAI;AACpB,gBAAA,IAAI,CAAC,kBAAkB,GAAG,UAAU;aACrC;YACD,MAAM,EAAE,MAAK;AACX,gBAAA,IAAI,CAAC,kBAAkB,GAAG,IAAI;;AAEjC,SAAA,CAAC;;AAGJ,IAAA,WAAW,CAAC,OAAkC,EAAA;QAC5C,OAAO,OAAO,CAAC,OAAO,CAAC;AACrB,YAAA,IAAI,EAAE,MAAM,OAAO,CAAC,OAAO,EAAE;YAC7B,KAAK,EAAE,MAAM,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE;YACzC,QAAQ,EAAE,IAAI,CAAC,cAAc;YAC7B,QAAQ,EAAE,IAAI,cAAc,CAAC;AAC3B,gBAAA,KAAK,EAAE,CAAC,KAAK,KAAI;oBACf,MAAM,KAAK,GAAG,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC;oBAC7C,MAAM,QAAQ,GAAG,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC;AAC7C,oBAAA,IAAI,IAAI,CAAC,kBAAkB,EAAE;AAC3B,wBAAA,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;;;aAGxE;AACmB,SAAA,CAAC;;AAE1B;;MCZY,YAAY,CAAA;IAiBvB,WAC6B,CAAA,MAA0B,EAC7C,MAAc,EAAA;QADK,IAAM,CAAA,MAAA,GAAN,MAAM;QACzB,IAAM,CAAA,MAAA,GAAN,MAAM;QAjBR,IAAI,CAAA,IAAA,GAAsB,IAAI;QAC9B,IAAe,CAAA,eAAA,GAA2B,IAAI;QAC9C,IAAU,CAAA,UAAA,GAA0B,IAAI;AACxC,QAAA,IAAA,CAAA,WAAW,GAAoB,IAAI,OAAO,EAAU;QACpD,IAAM,CAAA,MAAA,GAAmD,IAAI;AAC7D,QAAA,IAAA,CAAA,gBAAgB,GAA6B,IAAI,eAAe,CAAU,KAAK,CAAC;AAEvE,QAAA,IAAA,CAAA,IAAI,GAAoB;AACvC,YAAA,KAAK,EAAE,CAAC,KAAU,KAAI;AACpB,gBAAA,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,MAAK;AACnB,oBAAA,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC;AAC9B,iBAAC,CAAC;;SAEL;;AAQD;;AAEG;IACH,IAAI,CAAC,gBAA+B,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE,OAAkC,EAAA;AACxF,QAAA,OAAO,IAAI,UAAU,CAAO,CAAC,QAA0B,KAAI;AACzD,YAAA,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;AAChB,gBAAA,QAAQ,CAAC,KAAK,CAAC,2BAA2B,CAAC;gBAC3C;;AAEF,YAAA,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,OAAO;AAC5B,iBAAA,IAAI,CAAC,CAAC,IAAgB,KAAI;AACzB,gBAAA,IAAI,CAAC,IAAI,GAAG,IAAI;gBAChB,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC;AACtC,aAAC;iBACA,IAAI,CAAC,MAAK;AACT,gBAAA,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,EAAE;AAChD,oBAAA,QAAQ,CAAC,KAAK,CAAC,mCAAmC,CAAC;oBACnD;;AAEF,gBAAA,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC;AAChC,gBAAA,IAAI,CAAC,eAAe,GAAG,IAAI,eAAe,EAAE;gBAC5C,IAAI,CAAC,UAAU,GAAG,IAAI,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC;gBAC/C,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,SAAS,EAAE;gBAC7C,QAAQ,CAAC,IAAI,EAAE;AACf,gBAAA,OAAO,IAAI,CAAC,IAAI,CAAC;AACd,qBAAA,WAAW,CAAC,IAAI,iBAAiB,EAAE;AACnC,qBAAA,MAAM,CAAC,IAAI,CAAC,UAAU,EAAE,EAAC,MAAM,EAAE,IAAI,CAAC,eAAe,CAAC,MAAM,EAAC;qBAC7D,KAAK,CAAC,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,KAAK,CAAC,CAAC,GAAG,KAAK,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;AACtE,aAAC;AACA,iBAAA,KAAK,CAAC,CAAC,GAAG,KAAK,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC;iBAClC,OAAO,CAAC,MAAM,QAAQ,CAAC,QAAQ,EAAE,CAAC;AACvC,SAAC,CAAC;;IAGJ,WAAW,GAAA;AACT,QAAA,OAAO,IAAI,CAAC,gBAAgB,CAAC,YAAY,EAAE;;IAG7C,IAAI,GAAA;AACF,QAAA,OAAO,IAAI,CAAC,WAAW,CAAC,YAAY,EAAE;;AAGxC,IAAA,KAAK,CAAC,IAAY,EAAA;AAChB,QAAA,IAAI,IAAI,CAAC,MAAM,EAAE;AACf,YAAA,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;;QAGhE,OAAO,UAAU,CAAC,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;;AAIpD,IAAA,qBAAqB,CAAC,MAAA,GAAiB,EAAE,EAAE,UAAkB,IAAI,EAAA;QACvE,OAAO,cAAc,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,IAAI,CACzC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,EAAE,MAAM,CAAC,EAC1C,GAAG,CAAC,MAAM,SAAS,CAAC,EACpB,SAAS,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,EACzB,UAAU,CAAC,MAAM,UAAU,CAAC,MAAM,IAAI,KAAK,CAAC,+CAA+C,CAAC,CAAC,CAAC,CAC/F,CAAC;;IAGI,SAAS,GAAA;AACf,QAAA,IAAI,CAAC,eAAe,GAAG,IAAI;AAC3B,QAAA,IAAI,IAAI,CAAC,MAAM,EAAE;AACf,YAAA,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE;AACzB,YAAA,IAAI,CAAC,MAAM,GAAG,IAAI;;AAEpB,QAAA,IAAI,IAAI,CAAC,IAAI,EAAE;YACb,OAAO,IAAI,CAAC,qBAAqB;iBAC9B,IAAI,CAAC,MAAM,IAAI,CAAC,IAAK,CAAC,KAAK,EAAE;iBAC7B,IAAI,CAAC,MAAK;AACT,gBAAA,IAAI,CAAC,IAAI,GAAG,IAAI;AAChB,gBAAA,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC;AACnC,aAAC,CAAC;;aACC;AACL,YAAA,OAAO,OAAO,CAAC,OAAO,EAAE;;;IAG5B,KAAK,GAAA;AACH,QAAA,IAAI,IAAI,CAAC,eAAe,EAAE;AACxB,YAAA,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE;;;AAtGrB,IAAA,SAAA,IAAA,CAAA,IAAA,GAAA,EAAA,CAAA,kBAAA,CAAA,EAAA,UAAA,EAAA,QAAA,EAAA,OAAA,EAAA,SAAA,EAAA,QAAA,EAAA,EAAA,EAAA,IAAA,EAAA,YAAY,kBAkBb,QAAQ,EAAA,EAAA,EAAA,KAAA,EAAA,EAAA,CAAA,MAAA,EAAA,CAAA,EAAA,MAAA,EAAA,EAAA,CAAA,eAAA,CAAA,UAAA,EAAA,CAAA,CAAA;mHAlBP,YAAY,EAAA,CAAA,CAAA;;4FAAZ,YAAY,EAAA,UAAA,EAAA,CAAA;kBADxB;;0BAmBI,MAAM;2BAAC,QAAQ;;SAyFJ,mBAAmB,GAAA;IACjC,OAAO;QACL,YAAY;AACZ,QAAA;AACE,YAAA,OAAO,EAAE,QAAQ;AACjB,YAAA,UAAU,EAAE,CAAC,QAAkB,KAAK,QAAQ,CAAC,WAAW,EAAE,SAAS,EAAE,MAAM;YAC3E,IAAI,EAAE,CAAC,QAAQ;AAChB;KACF;AACH;AAEM,SAAU,uBAAuB,CAAC,gBAA4C,EAAA;IAClF,OAAO;QACL,YAAY;AACZ,QAAA;AACE,YAAA,OAAO,EAAE,QAAQ;AACjB,YAAA,UAAU,EAAE,MAAM,IAAI,UAAU,CAAC,gBAAgB,KAAK,CAAC,KAAa,KAAK,KAAK,CAAC,CAAC;AAChF,YAAA,IAAI,EAAE;AACY;KACrB;AACH;;ACnJA;;AAEG;;ACFH;;AAEG;;;;"}

package/lib/ngx-web-serial.service.d.ts

@@ -2,7 +2,7 @@
 import { NgZone, Provider } from '@angular/core';
 import { Observable } from 'rxjs';
 import * as i0 from "@angular/core";
-export declare class NgxWebSerialService {
+export declare class NgxWebSerial {
     readonly serial: Serial | undefined;
     private ngZone;
     private port;
@@ -23,8 +23,8 @@ export declare class NgxWebSerialService {
     private waitForReadableUnlock;
     private closePort;
     close(): void;
-    static ɵfac: i0.ɵɵFactoryDeclaration<NgxWebSerialService, never>;
-    static ɵprov: i0.ɵɵInjectableDeclaration<NgxWebSerialService>;
+    static ɵfac: i0.ɵɵFactoryDeclaration<NgxWebSerial, never>;
+    static ɵprov: i0.ɵɵInjectableDeclaration<NgxWebSerial>;
 }
-export declare function provideAngularSerial(): Provider[];
-export declare function provideAngularSerialTest(responseFunction?: (input: string) => string): Provider[];
+export declare function provideNgxWebSerial(): Provider[];
+export declare function provideNgxWebSerialTest(responseFunction?: (input: string) => string): Provider[];

package/package.json

@@ -1,6 +1,23 @@
 {
   "name": "ngx-web-serial",
-  "version": "0.0.2",
+  "version": "0.0.3",
+  "description": "Angular library for Web Serial API with RxJS",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/mattfors/ngx-web-serial"
+  },
+  "author": "Matthew Fors",
+  "license": "MIT",
+  "publishConfig": {
+    "registry": "https://registry.npmjs.org"
+  },
+  "keywords": [
+    "serial",
+    "rs232",
+    "angular",
+    "arduino",
+    "RxJS"
+  ],
   "peerDependencies": {
     "@angular/common": "^17.3.0",
     "@angular/core": "^17.3.0"