sportident.js 1.1.0 → 1.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/LICENSE CHANGED
@@ -1,6 +1,6 @@
1
1
  MIT License
2
2
 
3
- Copyright (c) 2018 Simon Hatt / 2024 Marcel Würsten
3
+ Copyright (c) 2018 Simon Hatt / 2024-2025 Marcel Würsten
4
4
 
5
5
  Permission is hereby granted, free of charge, to any person obtaining a copy
6
6
  of this software and associated documentation files (the "Software"), to deal
@@ -1,11 +1,10 @@
1
1
  import * as utils from '../utils';
2
- import type { ISiDevice, ISiDeviceDriverData } from '../SiDevice/ISiDevice';
2
+ import { type ISiDevice, type ISiDeviceDriverData } from '../SiDevice/ISiDevice';
3
3
  import type { ISiDeviceDriver, SiDeviceDriverWithAutodetectionEvents } from '../SiDevice/ISiDeviceDriver';
4
4
  import { SiDevice } from '../SiDevice/SiDevice';
5
- import type * as nav from './INavigatorWebSerial';
6
5
  export interface WebSerialSiDeviceDriverData extends ISiDeviceDriverData<WebSerialSiDeviceDriver> {
7
6
  driver: WebSerialSiDeviceDriver;
8
- device: nav.WebSerialDevice;
7
+ device: SerialPort;
9
8
  }
10
9
  export type IWebSerialSiDevice = ISiDevice<WebSerialSiDeviceDriverData>;
11
10
  export type WebSerialSiDevice = SiDevice<WebSerialSiDeviceDriverData>;
@@ -15,10 +14,10 @@ export declare class WebSerialSiDeviceDriver implements ISiDeviceDriver<WebSeria
15
14
  private siDeviceByIdent;
16
15
  private autodetectedSiDevices;
17
16
  private reader;
18
- constructor(navigatorSerial: nav.Serial);
17
+ constructor(navigatorSerial: Serial);
19
18
  detect(): Promise<WebSerialSiDevice>;
20
19
  getExistingDevices(): Promise<WebSerialSiDevice[]>;
21
- getSiDevice(navigatorWebSerialDevice: nav.WebSerialDevice): WebSerialSiDevice;
20
+ getSiDevice(navigatorWebSerialDevice: SerialPort): WebSerialSiDevice;
22
21
  forgetSiDevice(siDevice: IWebSerialSiDevice): void;
23
22
  open(device: IWebSerialSiDevice): Promise<void>;
24
23
  close(device: IWebSerialSiDevice): Promise<void>;
@@ -1 +1 @@
1
- {"version":3,"file":"WebSerialSiDeviceDriver.d.ts","sourceRoot":"","sources":["../../src/SiDevice/WebSerialSiDeviceDriver.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,UAAU,CAAC;AAClC,OAAO,KAAK,EAAE,SAAS,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5E,OAAO,KAAK,EAAE,eAAe,EAAE,qCAAqC,EAAE,MAAM,6BAA6B,CAAC;AAE1G,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,KAAK,KAAK,GAAG,MAAM,uBAAuB,CAAC;AAOlD,MAAM,WAAW,2BAA4B,SAAQ,mBAAmB,CAAC,uBAAuB,CAAC;IAChG,MAAM,EAAE,uBAAuB,CAAC;IAChC,MAAM,EAAE,GAAG,CAAC,eAAe,CAAC;CAC5B;AAED,MAAM,MAAM,kBAAkB,GAAG,SAAS,CAAC,2BAA2B,CAAC,CAAC;AACxE,MAAM,MAAM,iBAAiB,GAAG,QAAQ,CAAC,2BAA2B,CAAC,CAAC;AAEtE,qBAAa,uBAAwB,YAAW,eAAe,CAAC,2BAA2B,CAAC;IAS/E,OAAO,CAAC,eAAe;IAR5B,IAAI,SAAe;IAE1B,OAAO,CAAC,eAAe,CAA8C;IAErE,OAAO,CAAC,qBAAqB,CAA8C;IAE3E,OAAO,CAAC,MAAM,CAA+C;gBAEzC,eAAe,EAAE,GAAG,CAAC,MAAM;IAE/C,MAAM,IAAI,OAAO,CAAC,iBAAiB,CAAC;IAsBpC,kBAAkB,IAAI,OAAO,CAAC,iBAAiB,EAAE,CAAC;IAIlD,WAAW,CAAC,wBAAwB,EAAE,GAAG,CAAC,eAAe,GAAG,iBAAiB;IAc7E,cAAc,CAAC,QAAQ,EAAE,kBAAkB;IAU3C,IAAI,CAAC,MAAM,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IASzC,KAAK,CAAC,MAAM,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IAehD,OAAO,CAAC,MAAM,EAAE,kBAAkB,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAwBtD,IAAI,CAAC,MAAM,EAAE,kBAAkB,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CAe1E;AAED,MAAM,WAAW,uBAAwB,SAAQ,KAAK,CAAC,WAAW,CAAC,qCAAqC,CAAC,2BAA2B,CAAC,CAAC;CAAG;AAGzI,eAAO,MAAM,0BAA0B,uBAAwB,MAAM,KAAG,uBAAiG,CAAC"}
1
+ {"version":3,"file":"WebSerialSiDeviceDriver.d.ts","sourceRoot":"","sources":["../../src/SiDevice/WebSerialSiDeviceDriver.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,UAAU,CAAC;AAClC,OAAO,EAAqB,KAAK,SAAS,EAAE,KAAK,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AACpG,OAAO,KAAK,EAAE,eAAe,EAAE,qCAAqC,EAAE,MAAM,6BAA6B,CAAC;AAE1G,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAQhD,MAAM,WAAW,2BAA4B,SAAQ,mBAAmB,CAAC,uBAAuB,CAAC;IAChG,MAAM,EAAE,uBAAuB,CAAC;IAChC,MAAM,EAAE,UAAU,CAAC;CACnB;AAED,MAAM,MAAM,kBAAkB,GAAG,SAAS,CAAC,2BAA2B,CAAC,CAAC;AACxE,MAAM,MAAM,iBAAiB,GAAG,QAAQ,CAAC,2BAA2B,CAAC,CAAC;AAEtE,qBAAa,uBAAwB,YAAW,eAAe,CAAC,2BAA2B,CAAC;IAS/E,OAAO,CAAC,eAAe;IAR5B,IAAI,SAAe;IAE1B,OAAO,CAAC,eAAe,CAA8C;IAErE,OAAO,CAAC,qBAAqB,CAA8C;IAE3E,OAAO,CAAC,MAAM,CAA+C;gBAEzC,eAAe,EAAE,MAAM;IAE3C,MAAM,IAAI,OAAO,CAAC,iBAAiB,CAAC;IAiCpC,kBAAkB,IAAI,OAAO,CAAC,iBAAiB,EAAE,CAAC;IAIlD,WAAW,CAAC,wBAAwB,EAAE,UAAU,GAAG,iBAAiB;IAcpE,cAAc,CAAC,QAAQ,EAAE,kBAAkB;IAU3C,IAAI,CAAC,MAAM,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IASzC,KAAK,CAAC,MAAM,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IAiBhD,OAAO,CAAC,MAAM,EAAE,kBAAkB,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IA+BtD,IAAI,CAAC,MAAM,EAAE,kBAAkB,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CAe1E;AAED,MAAM,WAAW,uBAAwB,SAAQ,KAAK,CAAC,WAAW,CAAC,qCAAqC,CAAC,2BAA2B,CAAC,CAAC;CAAG;AAGzI,eAAO,MAAM,0BAA0B,uBAAwB,MAAM,KAAG,uBAA6F,CAAC"}
@@ -44,8 +44,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
44
44
  Object.defineProperty(exports, "__esModule", { value: true });
45
45
  exports.getWebSerialSiDeviceDriver = exports.WebSerialSiDeviceDriver = void 0;
46
46
  const utils = __importStar(require("../utils"));
47
+ const ISiDevice_1 = require("../SiDevice/ISiDevice");
47
48
  const ISiDeviceDriver_1 = require("../SiDevice/ISiDeviceDriver");
48
49
  const SiDevice_1 = require("../SiDevice/SiDevice");
50
+ //import type * as nav from './INavigatorWebSerial';
49
51
  const siDeviceFilters = [{ usbVendorId: 0x10c4, usbProductId: 0x800a }];
50
52
  const matchesSiDeviceFilters = (usbVendorId, usbProductId) => siDeviceFilters.some((filter) => usbVendorId === filter.usbVendorId && usbProductId === filter.usbProductId);
51
53
  const getIdent = (device) => `${device.getInfo().usbProductId}`;
@@ -74,6 +76,17 @@ class WebSerialSiDeviceDriver {
74
76
  }
75
77
  const siDevice = this.getSiDevice(navigatorWebSerialDevice);
76
78
  this.autodetectedSiDevices[ident] = siDevice;
79
+ navigatorWebSerialDevice.addEventListener("disconnect", () => {
80
+ console.log("serial disconnect event, closing si device!");
81
+ siDevice.close();
82
+ });
83
+ this.navigatorSerial.addEventListener("disconnect", (event) => {
84
+ console.log(event.target, "disconnected");
85
+ if (event.target == navigatorWebSerialDevice) {
86
+ console.log("matches device, close sidevice");
87
+ siDevice.close();
88
+ }
89
+ });
77
90
  return siDevice.open();
78
91
  });
79
92
  }
@@ -123,35 +136,45 @@ class WebSerialSiDeviceDriver {
123
136
  console.warn(e);
124
137
  }
125
138
  this.forgetSiDevice(device);
126
- yield navigatorDevice.readable.cancel();
139
+ if (navigatorDevice.readable != null) {
140
+ yield navigatorDevice.readable.cancel();
141
+ }
127
142
  yield navigatorDevice.close();
128
143
  });
129
144
  }
130
145
  receive(device) {
131
146
  return __awaiter(this, void 0, void 0, function* () {
132
147
  const navigatorDevice = device.data.device;
133
- this.reader = navigatorDevice.readable.getReader();
134
148
  try {
135
- while (true) {
136
- const { value, done } = yield this.reader.read();
137
- if (done) {
138
- if (value == undefined) {
139
- return [];
149
+ let readable = navigatorDevice.readable;
150
+ if (readable != null) {
151
+ this.reader = readable.getReader();
152
+ while (true) {
153
+ const { value, done } = yield this.reader.read();
154
+ if (done) {
155
+ if (value == undefined) {
156
+ return [];
157
+ }
158
+ return value;
159
+ }
160
+ if (value != undefined) {
161
+ return value;
140
162
  }
141
- return value;
142
- }
143
- if (value != undefined) {
144
- return value;
145
163
  }
146
164
  }
165
+ else {
166
+ this.close(device);
167
+ throw new ISiDevice_1.DeviceClosedError("Device closing!");
168
+ }
147
169
  }
148
170
  catch (error) {
149
- console.warn(error);
171
+ throw error;
150
172
  }
151
173
  finally {
152
- this.reader.releaseLock();
174
+ if (this.reader != undefined) {
175
+ this.reader.releaseLock();
176
+ }
153
177
  }
154
- return [];
155
178
  });
156
179
  }
157
180
  send(device, uint8Data) {
@@ -1 +1 @@
1
- {"version":3,"file":"WebSerialSiDeviceDriver.js","sourceRoot":"","sources":["../../src/SiDevice/WebSerialSiDeviceDriver.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"WebSerialSiDeviceDriver.js","sourceRoot":"","sources":["../../src/SiDevice/WebSerialSiDeviceDriver.ts"],"names":[],"mappings":"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"}
@@ -2,10 +2,9 @@ import * as utils from '../utils';
2
2
  import type { ISiDevice, ISiDeviceDriverData } from '../SiDevice/ISiDevice';
3
3
  import type { ISiDeviceDriver, ISiDeviceDriverWithAutodetection, ISiDeviceDriverWithDetection, SiDeviceDriverWithAutodetectionEvents } from '../SiDevice/ISiDeviceDriver';
4
4
  import { SiDevice } from '../SiDevice/SiDevice';
5
- import type * as nav from './INavigatorWebUsb';
6
5
  export interface WebUsbSiDeviceDriverData extends ISiDeviceDriverData<WebUsbSiDeviceDriver> {
7
6
  driver: WebUsbSiDeviceDriver;
8
- device: nav.WebUsbDevice;
7
+ device: USBDevice;
9
8
  }
10
9
  export type IWebUsbSiDevice = ISiDevice<WebUsbSiDeviceDriverData>;
11
10
  export type WebUsbSiDevice = SiDevice<WebUsbSiDeviceDriverData>;
@@ -15,15 +14,15 @@ export declare class WebUsbSiDeviceDriver implements ISiDeviceDriver<WebUsbSiDev
15
14
  private siDeviceByIdent;
16
15
  private autodetectedSiDevices;
17
16
  private autodetectionCallbacks?;
18
- constructor(navigatorUsb: nav.WebUsb);
17
+ constructor(navigatorUsb: USB);
19
18
  detect(): Promise<WebUsbSiDevice>;
20
19
  getExistingDevices(): Promise<WebUsbSiDevice[]>;
21
- getSiDevice(navigatorWebUsbDevice: nav.WebUsbDevice): WebUsbSiDevice;
20
+ getSiDevice(navigatorWebUsbDevice: USBDevice): WebUsbSiDevice;
22
21
  forgetSiDevice(siDevice: IWebUsbSiDevice): void;
23
22
  startAutoDetection(): Promise<IWebUsbSiDevice[]>;
24
23
  getAutodetectedDevices(): Promise<WebUsbSiDevice[]>;
25
- autodetectSiDevices(navigatorWebUsbDevices: nav.WebUsbDevice[]): Promise<WebUsbSiDevice[]>;
26
- autodetectSiDevice(navigatorWebUsbDevice: nav.WebUsbDevice): Promise<WebUsbSiDevice>;
24
+ autodetectSiDevices(navigatorWebUsbDevices: USBDevice[]): Promise<WebUsbSiDevice[]>;
25
+ autodetectSiDevice(navigatorWebUsbDevice: USBDevice): Promise<WebUsbSiDevice>;
27
26
  registerAutodetectionCallbacks(): void;
28
27
  stopAutoDetection(): Promise<void>;
29
28
  deregisterAutodetectionCallbacks(): void;
@@ -1 +1 @@
1
- {"version":3,"file":"WebUsbSiDeviceDriver.d.ts","sourceRoot":"","sources":["../../src/SiDevice/WebUsbSiDeviceDriver.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,UAAU,CAAC;AAElC,OAAO,KAAK,EAAE,SAAS,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAE5E,OAAO,KAAK,EAAE,eAAe,EAAE,gCAAgC,EAAE,4BAA4B,EAAE,qCAAqC,EAAE,MAAM,6BAA6B,CAAC;AAC1K,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,KAAK,KAAK,GAAG,MAAM,oBAAoB,CAAC;AA8B/C,MAAM,WAAW,wBAAyB,SAAQ,mBAAmB,CAAC,oBAAoB,CAAC;IAC1F,MAAM,EAAE,oBAAoB,CAAC;IAC7B,MAAM,EAAE,GAAG,CAAC,YAAY,CAAC;CACzB;AAOD,MAAM,MAAM,eAAe,GAAG,SAAS,CAAC,wBAAwB,CAAC,CAAC;AAClE,MAAM,MAAM,cAAc,GAAG,QAAQ,CAAC,wBAAwB,CAAC,CAAC;AAEhE,qBAAa,oBACZ,YAAW,eAAe,CAAC,wBAAwB,CAAC,EAAE,4BAA4B,CAAC,wBAAwB,EAAE,EAAE,CAAC,EAAE,gCAAgC,CAAC,wBAAwB,CAAC;IAUhK,OAAO,CAAC,YAAY;IARzB,IAAI,SAAY;IAEvB,OAAO,CAAC,eAAe,CAA2C;IAElE,OAAO,CAAC,qBAAqB,CAA2C;IAExE,OAAO,CAAC,sBAAsB,CAAC,CAA+B;gBAE1C,YAAY,EAAE,GAAG,CAAC,MAAM;IAE5C,MAAM,IAAI,OAAO,CAAC,cAAc,CAAC;IAcjC,kBAAkB,IAAI,OAAO,CAAC,cAAc,EAAE,CAAC;IAI/C,WAAW,CAAC,qBAAqB,EAAE,GAAG,CAAC,YAAY,GAAG,cAAc;IAcpE,cAAc,CAAC,QAAQ,EAAE,eAAe;IAUxC,kBAAkB,IAAI,OAAO,CAAC,eAAe,EAAE,CAAC;IAKhD,sBAAsB,IAAI,OAAO,CAAC,cAAc,EAAE,CAAC;IAInD,mBAAmB,CAAC,sBAAsB,EAAE,GAAG,CAAC,YAAY,EAAE,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;IAsB1F,kBAAkB,CAAC,qBAAqB,EAAE,GAAG,CAAC,YAAY,GAAG,OAAO,CAAC,cAAc,CAAC;IAapF,8BAA8B,IAAI,IAAI;IA4BtC,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC;IAKlC,gCAAgC,IAAI,IAAI;IASxC,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAMhC,IAAI,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IA8FtC,KAAK,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAoCnD,OAAO,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAgB7C,IAAI,CAAC,MAAM,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CAKvE;AAED,MAAM,WAAW,oBAAqB,SAAQ,KAAK,CAAC,WAAW,CAAC,qCAAqC,CAAC,wBAAwB,CAAC,CAAC;CAAG;AAGnI,eAAO,MAAM,uBAAuB,oBAAqB,GAAG,KAAG,oBAAwF,CAAC"}
1
+ {"version":3,"file":"WebUsbSiDeviceDriver.d.ts","sourceRoot":"","sources":["../../src/SiDevice/WebUsbSiDeviceDriver.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,UAAU,CAAC;AAElC,OAAO,KAAK,EAAE,SAAS,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAE5E,OAAO,KAAK,EAAE,eAAe,EAAE,gCAAgC,EAAE,4BAA4B,EAAE,qCAAqC,EAAE,MAAM,6BAA6B,CAAC;AAC1K,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AA8BhD,MAAM,WAAW,wBAAyB,SAAQ,mBAAmB,CAAC,oBAAoB,CAAC;IAC1F,MAAM,EAAE,oBAAoB,CAAC;IAC7B,MAAM,EAAE,SAAS,CAAC;CAClB;AAOD,MAAM,MAAM,eAAe,GAAG,SAAS,CAAC,wBAAwB,CAAC,CAAC;AAClE,MAAM,MAAM,cAAc,GAAG,QAAQ,CAAC,wBAAwB,CAAC,CAAC;AAEhE,qBAAa,oBACZ,YAAW,eAAe,CAAC,wBAAwB,CAAC,EAAE,4BAA4B,CAAC,wBAAwB,EAAE,EAAE,CAAC,EAAE,gCAAgC,CAAC,wBAAwB,CAAC;IAUhK,OAAO,CAAC,YAAY;IARzB,IAAI,SAAY;IAEvB,OAAO,CAAC,eAAe,CAA2C;IAElE,OAAO,CAAC,qBAAqB,CAA2C;IAExE,OAAO,CAAC,sBAAsB,CAAC,CAA+B;gBAE1C,YAAY,EAAE,GAAG;IAErC,MAAM,IAAI,OAAO,CAAC,cAAc,CAAC;IAcjC,kBAAkB,IAAI,OAAO,CAAC,cAAc,EAAE,CAAC;IAI/C,WAAW,CAAC,qBAAqB,EAAE,SAAS,GAAG,cAAc;IAc7D,cAAc,CAAC,QAAQ,EAAE,eAAe;IAUxC,kBAAkB,IAAI,OAAO,CAAC,eAAe,EAAE,CAAC;IAKhD,sBAAsB,IAAI,OAAO,CAAC,cAAc,EAAE,CAAC;IAInD,mBAAmB,CAAC,sBAAsB,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;IAsBnF,kBAAkB,CAAC,qBAAqB,EAAE,SAAS,GAAG,OAAO,CAAC,cAAc,CAAC;IAkB7E,8BAA8B,IAAI,IAAI;IA4BtC,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC;IAKlC,gCAAgC,IAAI,IAAI;IASxC,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAMhC,IAAI,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IA+FtC,KAAK,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAoCnD,OAAO,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAgB7C,IAAI,CAAC,MAAM,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CAKvE;AAED,MAAM,WAAW,oBAAqB,SAAQ,KAAK,CAAC,WAAW,CAAC,qCAAqC,CAAC,wBAAwB,CAAC,CAAC;CAAG;AAGnI,eAAO,MAAM,uBAAuB,oBAAqB,GAAG,KAAG,oBAAiF,CAAC"}
@@ -148,6 +148,11 @@ class WebUsbSiDeviceDriver {
148
148
  if (!matchesSiDeviceFilters(navigatorWebUsbDevice.vendorId, navigatorWebUsbDevice.productId)) {
149
149
  return Promise.reject(new Error('Not a SI device'));
150
150
  }
151
+ this.navigatorUsb.addEventListener("disconnect", (event) => {
152
+ if (event.device == navigatorWebUsbDevice) {
153
+ siDevice.close();
154
+ }
155
+ });
151
156
  const ident = getIdent(navigatorWebUsbDevice);
152
157
  if (this.autodetectedSiDevices[ident] !== undefined) {
153
158
  return Promise.reject(new Error('Duplicate SI device'));
@@ -279,13 +284,14 @@ class WebUsbSiDeviceDriver {
279
284
  .then(() => {
280
285
  try {
281
286
  console.debug('Setting Baudrate...');
282
- return navigatorDevice.controlTransferOut({
287
+ navigatorDevice.controlTransferOut({
283
288
  requestType: 'vendor',
284
289
  recipient: 'interface',
285
290
  request: 0x1e,
286
291
  value: 0x00,
287
292
  index: findInterface(navigatorDevice).interfaceNumber
288
293
  }, new Uint8Array([0x00, 0x96, 0x00, 0x00]).buffer);
294
+ return;
289
295
  }
290
296
  catch (e) {
291
297
  console.error('Failed setting baudrate on web usb device:', e);
@@ -1 +1 @@
1
- {"version":3,"file":"WebUsbSiDeviceDriver.js","sourceRoot":"","sources":["../../src/SiDevice/WebUsbSiDeviceDriver.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"WebUsbSiDeviceDriver.js","sourceRoot":"","sources":["../../src/SiDevice/WebUsbSiDeviceDriver.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "sportident.js",
3
- "version": "1.1.0",
3
+ "version": "1.2.0",
4
4
  "description": "JavaScript interface to SportIdent devices",
5
5
  "scripts": {
6
6
  "build": "tsc -b --verbose",
@@ -1,62 +0,0 @@
1
- import type * as utils from '../utils';
2
- export interface WebSerialConnectEvent extends utils.IEvent<'connect'> {
3
- device: WebSerialDevice;
4
- target: unknown;
5
- defaultPrevented: boolean;
6
- }
7
- export interface WebSerialDisconnectEvent extends utils.IEvent<'disconnect'> {
8
- device: WebSerialDevice;
9
- target: unknown;
10
- defaultPrevented: boolean;
11
- }
12
- export type WebSerialEvents = {
13
- connect: WebSerialConnectEvent;
14
- disconnect: WebSerialDisconnectEvent;
15
- };
16
- interface SerialPortRequestOptions {
17
- filters: SerialPortFilter[];
18
- }
19
- export interface Serial extends EventTarget {
20
- onconnect: EventHandler | undefined;
21
- ondisconnect: EventHandler | undefined;
22
- getPorts(): Promise<WebSerialDevice[]>;
23
- requestPort(options?: SerialPortRequestOptions): Promise<WebSerialDevice>;
24
- }
25
- export interface WebSerialDevice {
26
- onconnect: EventHandler;
27
- ondisconnect: EventHandler;
28
- readonly readable: ReadableStream;
29
- readonly writable: WritableStream;
30
- open(options: SerialOptions): Promise<void>;
31
- close(): Promise<void>;
32
- getInfo(): Partial<SerialPortInfo>;
33
- forget(): Promise<void>;
34
- }
35
- type EventHandler = (event: Event) => void;
36
- type ParityType = 'none' | 'even' | 'odd' | 'mark' | 'space';
37
- type FlowControlType = 'none' | 'hardware';
38
- interface SerialOptions {
39
- baudRate: number;
40
- dataBits?: number | undefined;
41
- stopBits?: number | undefined;
42
- parity?: ParityType | undefined;
43
- bufferSize?: number | undefined;
44
- flowControl?: FlowControlType | undefined;
45
- }
46
- interface SerialPortInfo extends SerialPortInfoBase, SerialPortFilter {
47
- }
48
- interface SerialPortInfoBase {
49
- serialNumber: string;
50
- manufacturer: string;
51
- locationId: string;
52
- vendorId: string;
53
- vendor: string;
54
- productId: string;
55
- product: string;
56
- }
57
- interface SerialPortFilter {
58
- usbVendorId: number;
59
- usbProductId?: number | undefined;
60
- }
61
- export {};
62
- //# sourceMappingURL=INavigatorWebSerial.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"INavigatorWebSerial.d.ts","sourceRoot":"","sources":["../../src/SiDevice/INavigatorWebSerial.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,KAAK,MAAM,UAAU,CAAC;AAEvC,MAAM,WAAW,qBAAsB,SAAQ,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC;IACrE,MAAM,EAAE,eAAe,CAAC;IACxB,MAAM,EAAE,OAAO,CAAC;IAChB,gBAAgB,EAAE,OAAO,CAAC;CAC1B;AAED,MAAM,WAAW,wBAAyB,SAAQ,KAAK,CAAC,MAAM,CAAC,YAAY,CAAC;IAC3E,MAAM,EAAE,eAAe,CAAC;IACxB,MAAM,EAAE,OAAO,CAAC;IAChB,gBAAgB,EAAE,OAAO,CAAC;CAC1B;AAED,MAAM,MAAM,eAAe,GAAG;IAC7B,OAAO,EAAE,qBAAqB,CAAC;IAC/B,UAAU,EAAE,wBAAwB,CAAC;CACrC,CAAC;AAEF,UAAU,wBAAwB;IACjC,OAAO,EAAE,gBAAgB,EAAE,CAAC;CAC5B;AACD,MAAM,WAAW,MAAO,SAAQ,WAAW;IAC1C,SAAS,EAAE,YAAY,GAAG,SAAS,CAAC;IACpC,YAAY,EAAE,YAAY,GAAG,SAAS,CAAC;IACvC,QAAQ,IAAI,OAAO,CAAC,eAAe,EAAE,CAAC,CAAC;IACvC,WAAW,CAAC,OAAO,CAAC,EAAE,wBAAwB,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;CAC1E;AAGD,MAAM,WAAW,eAAe;IAC/B,SAAS,EAAE,YAAY,CAAC;IACxB,YAAY,EAAE,YAAY,CAAC;IAC3B,QAAQ,CAAC,QAAQ,EAAE,cAAc,CAAC;IAClC,QAAQ,CAAC,QAAQ,EAAE,cAAc,CAAC;IAClC,IAAI,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5C,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACvB,OAAO,IAAI,OAAO,CAAC,cAAc,CAAC,CAAC;IACnC,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACxB;AACD,KAAK,YAAY,GAAG,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;AAC3C,KAAK,UAAU,GAAG,MAAM,GAAG,MAAM,GAAG,KAAK,GAAG,MAAM,GAAG,OAAO,CAAC;AAC7D,KAAK,eAAe,GAAG,MAAM,GAAG,UAAU,CAAC;AAC3C,UAAU,aAAa;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9B,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9B,MAAM,CAAC,EAAE,UAAU,GAAG,SAAS,CAAC;IAChC,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,WAAW,CAAC,EAAE,eAAe,GAAG,SAAS,CAAC;CAC1C;AACD,UAAU,cAAe,SAAQ,kBAAkB,EAAE,gBAAgB;CAAG;AACxE,UAAU,kBAAkB;IAC3B,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;CAChB;AAED,UAAU,gBAAgB;IACzB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAClC"}
@@ -1,3 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- //# sourceMappingURL=INavigatorWebSerial.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"INavigatorWebSerial.js","sourceRoot":"","sources":["../../src/SiDevice/INavigatorWebSerial.ts"],"names":[],"mappings":""}
@@ -1,55 +0,0 @@
1
- import type * as utils from '../utils';
2
- export interface WebUsbConnectEvent extends utils.IEvent<'connect'> {
3
- device: WebUsbDevice;
4
- target: unknown;
5
- defaultPrevented: boolean;
6
- }
7
- export interface WebUsbDisconnectEvent extends utils.IEvent<'disconnect'> {
8
- device: WebUsbDevice;
9
- target: unknown;
10
- defaultPrevented: boolean;
11
- }
12
- export type WebUsbEvents = {
13
- connect: WebUsbConnectEvent;
14
- disconnect: WebUsbDisconnectEvent;
15
- };
16
- export interface WebUsb extends utils.IEventTarget<WebUsbEvents> {
17
- getDevices: () => Promise<WebUsbDevice[]>;
18
- requestDevice: (args: RequestDeviceArgs) => Promise<WebUsbDevice>;
19
- }
20
- interface RequestDeviceArgs {
21
- filters: WebUsbDeviceFilter[];
22
- }
23
- interface WebUsbDeviceFilter {
24
- vendorId?: number;
25
- productId?: number;
26
- }
27
- export interface WebUsbDevice {
28
- configurations: any[];
29
- serialNumber: string;
30
- vendorId: number;
31
- productId: number;
32
- opened: boolean;
33
- open: () => Promise<void>;
34
- close: () => Promise<void>;
35
- reset: () => Promise<void>;
36
- selectConfiguration: (configuration: number) => Promise<void>;
37
- claimInterface: (interfaceNumber: number) => Promise<void>;
38
- releaseInterface: (interfaceNumber: number) => Promise<void>;
39
- selectAlternateInterface: (interfaceNumber: number, alternate: number) => Promise<void>;
40
- transferIn: (endpoint: number, length: number) => Promise<WebUsbTransferInData>;
41
- transferOut: (endpoint: number, buffer: ArrayBuffer) => Promise<void>;
42
- controlTransferOut: (endpoint: WebUsbControlTransferSetup, data?: ArrayBuffer) => Promise<void>;
43
- }
44
- export interface WebUsbTransferInData {
45
- data?: DataView;
46
- }
47
- interface WebUsbControlTransferSetup {
48
- recipient: string;
49
- request: number;
50
- requestType: string;
51
- index: number;
52
- value: number;
53
- }
54
- export {};
55
- //# sourceMappingURL=INavigatorWebUsb.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"INavigatorWebUsb.d.ts","sourceRoot":"","sources":["../../src/SiDevice/INavigatorWebUsb.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,KAAK,MAAM,UAAU,CAAC;AAEvC,MAAM,WAAW,kBAAmB,SAAQ,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC;IAClE,MAAM,EAAE,YAAY,CAAC;IACrB,MAAM,EAAE,OAAO,CAAC;IAChB,gBAAgB,EAAE,OAAO,CAAC;CAC1B;AAED,MAAM,WAAW,qBAAsB,SAAQ,KAAK,CAAC,MAAM,CAAC,YAAY,CAAC;IACxE,MAAM,EAAE,YAAY,CAAC;IACrB,MAAM,EAAE,OAAO,CAAC;IAChB,gBAAgB,EAAE,OAAO,CAAC;CAC1B;AAED,MAAM,MAAM,YAAY,GAAG;IAC1B,OAAO,EAAE,kBAAkB,CAAC;IAC5B,UAAU,EAAE,qBAAqB,CAAC;CAClC,CAAC;AAEF,MAAM,WAAW,MAAO,SAAQ,KAAK,CAAC,YAAY,CAAC,YAAY,CAAC;IAC/D,UAAU,EAAE,MAAM,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC;IAC1C,aAAa,EAAE,CAAC,IAAI,EAAE,iBAAiB,KAAK,OAAO,CAAC,YAAY,CAAC,CAAC;CAClE;AAED,UAAU,iBAAiB;IAC1B,OAAO,EAAE,kBAAkB,EAAE,CAAC;CAC9B;AAED,UAAU,kBAAkB;IAC3B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,YAAY;IAC5B,cAAc,EAAE,GAAG,EAAE,CAAC;IACtB,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,OAAO,CAAC;IAChB,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1B,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3B,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3B,mBAAmB,EAAE,CAAC,aAAa,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9D,cAAc,EAAE,CAAC,eAAe,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3D,gBAAgB,EAAE,CAAC,eAAe,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7D,wBAAwB,EAAE,CAAC,eAAe,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACxF,UAAU,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,oBAAoB,CAAC,CAAC;IAChF,WAAW,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACtE,kBAAkB,EAAE,CAAC,QAAQ,EAAE,0BAA0B,EAAE,IAAI,CAAC,EAAE,WAAW,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAChG;AAED,MAAM,WAAW,oBAAoB;IACpC,IAAI,CAAC,EAAE,QAAQ,CAAC;CAChB;AAED,UAAU,0BAA0B;IACnC,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;CACd"}
@@ -1,3 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- //# sourceMappingURL=INavigatorWebUsb.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"INavigatorWebUsb.js","sourceRoot":"","sources":["../../src/SiDevice/INavigatorWebUsb.ts"],"names":[],"mappings":""}