@psdk/ohos-usb 0.5.19 → 0.5.21
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/build/connected.d.ts +2 -0
- package/build/connected.d.ts.map +1 -1
- package/build/connected.js +10 -2
- package/build/provider.d.ts +1 -1
- package/build/provider.d.ts.map +1 -1
- package/build/provider.js +6 -40
- package/package.json +3 -3
package/build/connected.d.ts
CHANGED
|
@@ -7,9 +7,11 @@ export interface OusbOptions {
|
|
|
7
7
|
}
|
|
8
8
|
export declare class OhosUsbConnectedDevice implements ConnectedDevice {
|
|
9
9
|
private readonly options;
|
|
10
|
+
private notifyCallback?;
|
|
10
11
|
constructor(options: OusbOptions);
|
|
11
12
|
get device(): usb.USBDevice;
|
|
12
13
|
get ohosUsb(): OhosUsb;
|
|
14
|
+
notify(callback: (value: Uint8Array) => Promise<void>): void;
|
|
13
15
|
canRead(): boolean;
|
|
14
16
|
connectionState(): ConnectionState;
|
|
15
17
|
deviceName(): string;
|
package/build/connected.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connected.d.ts","sourceRoot":"","sources":["../src/connected.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,eAAe,EAAE,eAAe,EAAE,WAAW,EAAC,MAAM,oBAAoB,CAAC;AAEjF,OAAO,EAAC,OAAO,EAAC,MAAM,YAAY,CAAC;AACnC,OAAO,GAAG,MAAM,kBAAkB,CAAC;AAEnC,MAAM,WAAW,WAAW;IAC1B,OAAO,EAAE,OAAO,CAAA;IAChB,MAAM,EAAE,GAAG,CAAC,SAAS,CAAA;CACtB;AAED,qBAAa,sBAAuB,YAAW,eAAe;IAC5D,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAc;
|
|
1
|
+
{"version":3,"file":"connected.d.ts","sourceRoot":"","sources":["../src/connected.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,eAAe,EAAE,eAAe,EAAE,WAAW,EAAC,MAAM,oBAAoB,CAAC;AAEjF,OAAO,EAAC,OAAO,EAAC,MAAM,YAAY,CAAC;AACnC,OAAO,GAAG,MAAM,kBAAkB,CAAC;AAEnC,MAAM,WAAW,WAAW;IAC1B,OAAO,EAAE,OAAO,CAAA;IAChB,MAAM,EAAE,GAAG,CAAC,SAAS,CAAA;CACtB;AAED,qBAAa,sBAAuB,YAAW,eAAe;IAC5D,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAc;IACtC,OAAO,CAAC,cAAc,CAAC,CAAuC;gBAE3C,OAAO,EAAE,WAAW;IAIvC,IAAI,MAAM,IAAI,GAAG,CAAC,SAAS,CAE1B;IAED,IAAI,OAAO,IAAI,OAAO,CAErB;IAED,MAAM,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,UAAU,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI;IAI5D,OAAO,IAAI,OAAO;IAIlB,eAAe,IAAI,eAAe;IAIlC,UAAU,IAAI,MAAM;IAIpB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAI3B,KAAK,IAAI,IAAI;IAGb,MAAM,IAAI,GAAG;IAIP,IAAI,CAAC,OAAO,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,UAAU,CAAC;IAUhD,KAAK,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;CAO7C"}
|
package/build/connected.js
CHANGED
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
import { ConnectionState } from "@psdk/frame-father";
|
|
3
3
|
export class OhosUsbConnectedDevice {
|
|
4
4
|
options;
|
|
5
|
+
notifyCallback;
|
|
5
6
|
constructor(options) {
|
|
6
7
|
this.options = options;
|
|
7
8
|
}
|
|
@@ -11,6 +12,9 @@ export class OhosUsbConnectedDevice {
|
|
|
11
12
|
get ohosUsb() {
|
|
12
13
|
return this.options.ohosUsb;
|
|
13
14
|
}
|
|
15
|
+
notify(callback) {
|
|
16
|
+
this.notifyCallback = callback;
|
|
17
|
+
}
|
|
14
18
|
canRead() {
|
|
15
19
|
return true;
|
|
16
20
|
}
|
|
@@ -23,14 +27,18 @@ export class OhosUsbConnectedDevice {
|
|
|
23
27
|
disconnect() {
|
|
24
28
|
this.ohosUsb.closeUsb();
|
|
25
29
|
}
|
|
26
|
-
flush() {
|
|
30
|
+
flush() {
|
|
31
|
+
}
|
|
27
32
|
origin() {
|
|
28
33
|
return this.device;
|
|
29
34
|
}
|
|
30
|
-
read(options) {
|
|
35
|
+
async read(options) {
|
|
31
36
|
const temp = new Uint8Array(512);
|
|
32
37
|
const length = this.ohosUsb.read_usb(temp);
|
|
33
38
|
const receive = temp.slice(0, length);
|
|
39
|
+
if (this.notifyCallback && receive.length > 0) {
|
|
40
|
+
await this.notifyCallback(receive);
|
|
41
|
+
}
|
|
34
42
|
return Promise.resolve(receive);
|
|
35
43
|
}
|
|
36
44
|
async write(data) {
|
package/build/provider.d.ts
CHANGED
package/build/provider.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provider.d.ts","sourceRoot":"","sources":["../src/provider.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,eAAe,EAAC,MAAM,oBAAoB,CAAC;AAEnD,OAAO,GAAG,MAAM,kBAAkB,CAAC;AASnC,qBAAa,OAAO;IAClB,OAAO,CAAC,KAAK,CAAkB;IAC/B,OAAO,CAAC,KAAK,CAAkB;IAC/B,OAAO,CAAC,KAAK,CAAkB;IAC/B,OAAO,CAAC,MAAM,CAAkB;IAChC,OAAO,CAAC,eAAe,CAAC,CAAyB;IAEjD,UAAU,IAAI,MAAM;IAIpB;;OAEG;IACG,OAAO,IAAI,OAAO,CAAC,eAAe,CAAC;IA2BzC,iBAAiB,CAAC,MAAM,EAAE,GAAG,CAAC,SAAS,GAAG,OAAO;IAoCjD;;;;OAIG;IACH,QAAQ,IAAI,OAAO;IAInB;;OAEG;IACH,QAAQ;IAWF,QAAQ,CAAC,QAAQ,EAAE,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"provider.d.ts","sourceRoot":"","sources":["../src/provider.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,eAAe,EAAC,MAAM,oBAAoB,CAAC;AAEnD,OAAO,GAAG,MAAM,kBAAkB,CAAC;AASnC,qBAAa,OAAO;IAClB,OAAO,CAAC,KAAK,CAAkB;IAC/B,OAAO,CAAC,KAAK,CAAkB;IAC/B,OAAO,CAAC,KAAK,CAAkB;IAC/B,OAAO,CAAC,MAAM,CAAkB;IAChC,OAAO,CAAC,eAAe,CAAC,CAAyB;IAEjD,UAAU,IAAI,MAAM;IAIpB;;OAEG;IACG,OAAO,IAAI,OAAO,CAAC,eAAe,CAAC;IA2BzC,iBAAiB,CAAC,MAAM,EAAE,GAAG,CAAC,SAAS,GAAG,OAAO;IAoCjD;;;;OAIG;IACH,QAAQ,IAAI,OAAO;IAInB;;OAEG;IACH,QAAQ;IAWF,QAAQ,CAAC,QAAQ,EAAE,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC;IAuBtD;;;;;OAKG;IACG,QAAQ,CAAC,SAAS,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC;CAiBvD"}
|
package/build/provider.js
CHANGED
|
@@ -56,10 +56,10 @@ export class OhosUsb {
|
|
|
56
56
|
for (let i = 0; i < usbInterface.endpoints.length; i++) {
|
|
57
57
|
let ep = usbInterface.endpoints[i];
|
|
58
58
|
if (ep.type == 2) {
|
|
59
|
-
if (ep.direction ==
|
|
59
|
+
if (ep.direction == 0) {
|
|
60
60
|
mUsbEndpointOut = ep;
|
|
61
61
|
}
|
|
62
|
-
else if (ep.direction ==
|
|
62
|
+
else if (ep.direction == 128) {
|
|
63
63
|
mUsbEndpointIn = ep;
|
|
64
64
|
}
|
|
65
65
|
}
|
|
@@ -105,12 +105,6 @@ export class OhosUsb {
|
|
|
105
105
|
}
|
|
106
106
|
}
|
|
107
107
|
async send_usb(sendData) {
|
|
108
|
-
let length = sendData.length;
|
|
109
|
-
let size = 512;
|
|
110
|
-
let count = 0;
|
|
111
|
-
let yushu = length % size;
|
|
112
|
-
count = (length + size - 1) / size;
|
|
113
|
-
let index = 0;
|
|
114
108
|
if (currentDevice != null) {
|
|
115
109
|
if (mUsbDeviceConnection == null) {
|
|
116
110
|
await usb.requestRight(currentDevice.name);
|
|
@@ -118,37 +112,9 @@ export class OhosUsb {
|
|
|
118
112
|
let ret = usb.claimInterface(mUsbDeviceConnection, mUsbInterface, true);
|
|
119
113
|
}
|
|
120
114
|
if (mUsbEndpointOut != null) {
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
return false;
|
|
125
|
-
}
|
|
126
|
-
}
|
|
127
|
-
else {
|
|
128
|
-
for (let i = 0; i < count; i++) {
|
|
129
|
-
if (yushu != 0 && i == (count - 1)) {
|
|
130
|
-
let temp = new Uint8Array(yushu);
|
|
131
|
-
for (let j = 0; j < yushu; j++) {
|
|
132
|
-
temp[j] = sendData[index + j];
|
|
133
|
-
}
|
|
134
|
-
let result = await usb.bulkTransfer(mUsbDeviceConnection, mUsbEndpointOut, temp, 1500);
|
|
135
|
-
if (result == -1) {
|
|
136
|
-
return false;
|
|
137
|
-
}
|
|
138
|
-
index = 0;
|
|
139
|
-
}
|
|
140
|
-
else {
|
|
141
|
-
let temp = new Uint8Array(size);
|
|
142
|
-
for (let j = 0; j < size; j++) {
|
|
143
|
-
temp[j] = sendData[index + j];
|
|
144
|
-
}
|
|
145
|
-
let result = await usb.bulkTransfer(mUsbDeviceConnection, mUsbEndpointOut, temp, 1500);
|
|
146
|
-
index += size;
|
|
147
|
-
if (result == -1) {
|
|
148
|
-
return false;
|
|
149
|
-
}
|
|
150
|
-
}
|
|
151
|
-
}
|
|
115
|
+
let result = await usb.bulkTransfer(mUsbDeviceConnection, mUsbEndpointOut, sendData, 1500);
|
|
116
|
+
if (result == -1) {
|
|
117
|
+
return false;
|
|
152
118
|
}
|
|
153
119
|
}
|
|
154
120
|
else {
|
|
@@ -168,7 +134,7 @@ export class OhosUsb {
|
|
|
168
134
|
* @param tempBytes 数据缓冲区
|
|
169
135
|
* @return 返回读取数据的长度
|
|
170
136
|
*/
|
|
171
|
-
read_usb(tempBytes) {
|
|
137
|
+
async read_usb(tempBytes) {
|
|
172
138
|
if (mUsbDeviceConnection == null) {
|
|
173
139
|
await usb.requestRight(currentDevice.name);
|
|
174
140
|
mUsbDeviceConnection = usb.connectDevice(currentDevice);
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@psdk/ohos-usb",
|
|
3
|
-
"version": "0.5.
|
|
3
|
+
"version": "0.5.21",
|
|
4
4
|
"description": "psdk - ohos usb device support",
|
|
5
5
|
"main": "build/index.js",
|
|
6
6
|
"types": "build/index.d.ts",
|
|
@@ -24,12 +24,12 @@
|
|
|
24
24
|
"typescript": "^5.5.3"
|
|
25
25
|
},
|
|
26
26
|
"dependencies": {
|
|
27
|
-
"@psdk/frame-father": "0.5.
|
|
27
|
+
"@psdk/frame-father": "0.5.21",
|
|
28
28
|
"await-timeout": "^1.1.1"
|
|
29
29
|
},
|
|
30
30
|
"files": [
|
|
31
31
|
"build",
|
|
32
32
|
"!build/browser/psdk*"
|
|
33
33
|
],
|
|
34
|
-
"gitHead": "
|
|
34
|
+
"gitHead": "1746a624a1de144d6a7c134b5b07c20e93e004bc"
|
|
35
35
|
}
|