@potatosalad775/eqcaps-device-bridge 0.2.4 → 0.3.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/README.md +51 -3
- package/dist/browser/index.d.ts +2 -2
- package/dist/browser/index.d.ts.map +1 -1
- package/dist/browser/index.js +1 -1
- package/dist/browser/index.js.map +1 -1
- package/dist/browser/web-apis.d.ts +9 -0
- package/dist/browser/web-apis.d.ts.map +1 -1
- package/dist/browser/web-apis.js.map +1 -1
- package/dist/browser/webbluetooth.d.ts.map +1 -1
- package/dist/browser/webbluetooth.js +13 -0
- package/dist/browser/webbluetooth.js.map +1 -1
- package/dist/browser/webhid.d.ts +45 -5
- package/dist/browser/webhid.d.ts.map +1 -1
- package/dist/browser/webhid.js +114 -9
- package/dist/browser/webhid.js.map +1 -1
- package/dist/browser/webserial.d.ts.map +1 -1
- package/dist/browser/webserial.js +10 -0
- package/dist/browser/webserial.js.map +1 -1
- package/dist/bytes.d.ts +4 -1
- package/dist/bytes.d.ts.map +1 -1
- package/dist/bytes.js +11 -2
- package/dist/bytes.js.map +1 -1
- package/dist/device.d.ts +34 -2
- package/dist/device.d.ts.map +1 -1
- package/dist/device.js +86 -2
- package/dist/device.js.map +1 -1
- package/dist/handler.d.ts +23 -1
- package/dist/handler.d.ts.map +1 -1
- package/dist/handler.js.map +1 -1
- package/dist/handlers/fosi-audio-usb-hid.d.ts +10 -0
- package/dist/handlers/fosi-audio-usb-hid.d.ts.map +1 -1
- package/dist/handlers/fosi-audio-usb-hid.js +169 -29
- package/dist/handlers/fosi-audio-usb-hid.js.map +1 -1
- package/dist/handlers/ktmicro-usb-hid.d.ts +8 -0
- package/dist/handlers/ktmicro-usb-hid.d.ts.map +1 -1
- package/dist/handlers/ktmicro-usb-hid.js +39 -28
- package/dist/handlers/ktmicro-usb-hid.js.map +1 -1
- package/dist/handlers/walkplay-hid.d.ts +25 -0
- package/dist/handlers/walkplay-hid.d.ts.map +1 -1
- package/dist/handlers/walkplay-hid.js +182 -38
- package/dist/handlers/walkplay-hid.js.map +1 -1
- package/dist/index.d.ts +3 -3
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -1
- package/dist/index.js.map +1 -1
- package/dist/io.d.ts +6 -2
- package/dist/io.d.ts.map +1 -1
- package/dist/io.js +20 -4
- package/dist/io.js.map +1 -1
- package/dist/protocols.d.ts +5 -1
- package/dist/protocols.d.ts.map +1 -1
- package/dist/protocols.js +133 -6
- package/dist/protocols.js.map +1 -1
- package/dist/transport.d.ts +12 -0
- package/dist/transport.d.ts.map +1 -1
- package/dist/transport.js +2 -1
- package/dist/transport.js.map +1 -1
- package/package.json +2 -2
package/dist/index.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
export { BridgeError, isBridgeError } from './errors.ts';
|
|
2
2
|
export type { BridgeErrorCode } from './errors.ts';
|
|
3
3
|
export type { HidCollectionInfo, HidReportInfo, HidTransport, SerialPortIdentity, StreamTransport, Transport, TransportKind } from './transport.ts';
|
|
4
|
-
export type { AnyHandler, Codec, Handler, HandlerCapabilities, HandlerContext, PullRequest, PullResult, PushRequest, PushResult, HidFrame, HidHandler, Slot, StreamHandler, WireField, WireGrid, WriteState } from './handler.ts';
|
|
4
|
+
export type { AnyHandler, Codec, Handler, HandlerCapabilities, HandlerContext, HandlerControl, PullRequest, PullResult, PushRequest, PushResult, HidFrame, HidHandler, Slot, StreamHandler, WireField, WireGrid, WriteState } from './handler.ts';
|
|
5
5
|
export { SPP } from './handler.ts';
|
|
6
6
|
export { HANDLERS } from './handlers/index.ts';
|
|
7
7
|
export type { HandlerId, HandlerOptions } from './handlers/index.ts';
|
|
@@ -13,6 +13,6 @@ export { identityOf, usbHex } from './identity.ts';
|
|
|
13
13
|
export type { DeviceIdentity } from './identity.ts';
|
|
14
14
|
export { analyzeCodec, handlerCodeUrl, MAX_ANALYSED_BANDS } from './analysis.ts';
|
|
15
15
|
export type { CodecAnalysis } from './analysis.ts';
|
|
16
|
-
export { openDevice, transportsOf } from './device.ts';
|
|
17
|
-
export type { BridgeDevice, DeviceCapabilities, OpenOptions } from './device.ts';
|
|
16
|
+
export { handlerTransports, openDevice, transportsOf } from './device.ts';
|
|
17
|
+
export type { BridgeDevice, ControlWriteResult, DeviceCapabilities, OpenOptions } from './device.ts';
|
|
18
18
|
//# sourceMappingURL=index.d.ts.map
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AACzD,YAAY,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AACnD,YAAY,EACX,iBAAiB,EACjB,aAAa,EACb,YAAY,EACZ,kBAAkB,EAClB,eAAe,EACf,SAAS,EACT,aAAa,EACb,MAAM,gBAAgB,CAAC;AACxB,YAAY,EACX,UAAU,EACV,KAAK,EACL,OAAO,EACP,mBAAmB,EACnB,cAAc,EACd,WAAW,EACX,UAAU,EACV,WAAW,EACX,UAAU,EACV,QAAQ,EACR,UAAU,EACV,IAAI,EACJ,aAAa,EACb,SAAS,EACT,QAAQ,EACR,UAAU,EACV,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AACnC,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC/C,YAAY,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrE,OAAO,EACN,aAAa,EACb,iBAAiB,EACjB,kBAAkB,EAClB,UAAU,EACV,eAAe,EACf,MAAM,gBAAgB,CAAC;AACxB,YAAY,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC9C,YAAY,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AACjE,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AACnD,YAAY,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AACjF,YAAY,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AACnD,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AACzD,YAAY,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AACnD,YAAY,EACX,iBAAiB,EACjB,aAAa,EACb,YAAY,EACZ,kBAAkB,EAClB,eAAe,EACf,SAAS,EACT,aAAa,EACb,MAAM,gBAAgB,CAAC;AACxB,YAAY,EACX,UAAU,EACV,KAAK,EACL,OAAO,EACP,mBAAmB,EACnB,cAAc,EACd,cAAc,EACd,WAAW,EACX,UAAU,EACV,WAAW,EACX,UAAU,EACV,QAAQ,EACR,UAAU,EACV,IAAI,EACJ,aAAa,EACb,SAAS,EACT,QAAQ,EACR,UAAU,EACV,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AACnC,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC/C,YAAY,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrE,OAAO,EACN,aAAa,EACb,iBAAiB,EACjB,kBAAkB,EAClB,UAAU,EACV,eAAe,EACf,MAAM,gBAAgB,CAAC;AACxB,YAAY,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC9C,YAAY,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AACjE,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AACnD,YAAY,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AACjF,YAAY,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AACnD,OAAO,EAAE,iBAAiB,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC1E,YAAY,EACX,YAAY,EACZ,kBAAkB,EAClB,kBAAkB,EAClB,WAAW,EACX,MAAM,aAAa,CAAC"}
|
package/dist/index.js
CHANGED
|
@@ -8,5 +8,5 @@ export { guessProtocol, KNOWN_HID_VENDORS, protocolForMatches, protocolOf, proto
|
|
|
8
8
|
export { chooserFilters } from "./chooser.js";
|
|
9
9
|
export { identityOf, usbHex } from "./identity.js";
|
|
10
10
|
export { analyzeCodec, handlerCodeUrl, MAX_ANALYSED_BANDS } from "./analysis.js";
|
|
11
|
-
export { openDevice, transportsOf } from "./device.js";
|
|
11
|
+
export { handlerTransports, openDevice, transportsOf } from "./device.js";
|
|
12
12
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,0FAA0F;AAC1F,8FAA8F;AAC9F,iEAAiE;AAEjE,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,0FAA0F;AAC1F,8FAA8F;AAC9F,iEAAiE;AAEjE,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AA8BzD,OAAO,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AACnC,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAE/C,OAAO,EACN,aAAa,EACb,iBAAiB,EACjB,kBAAkB,EAClB,UAAU,EACV,eAAe,EACf,MAAM,gBAAgB,CAAC;AAExB,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAE9C,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAEnD,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAEjF,OAAO,EAAE,iBAAiB,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC"}
|
package/dist/io.d.ts
CHANGED
|
@@ -6,8 +6,12 @@ import type { HidTransport, StreamTransport } from './transport.ts';
|
|
|
6
6
|
* so a fast answer can't be missed.
|
|
7
7
|
*/
|
|
8
8
|
export declare function waitForInput(transport: HidTransport, match: (data: Uint8Array, reportId: number) => boolean, timeoutMs: number, what: string): Promise<Uint8Array>;
|
|
9
|
-
/**
|
|
10
|
-
|
|
9
|
+
/**
|
|
10
|
+
* Sends an output report and waits for the matching input report. With `resendMs`, sends it again
|
|
11
|
+
* every `resendMs` until an answer matches or `timeoutMs` runs out: for a read, which changes
|
|
12
|
+
* nothing, on a device that drops requests while it's busy.
|
|
13
|
+
*/
|
|
14
|
+
export declare function hidRequest(transport: HidTransport, reportId: number, data: Uint8Array | number[], match: (data: Uint8Array, reportId: number) => boolean, timeoutMs: number, what: string, resendMs?: number): Promise<Uint8Array>;
|
|
11
15
|
/**
|
|
12
16
|
* Reads a byte stream into a buffer until `frame` finds a complete frame in it. `frame` returns
|
|
13
17
|
* the frame's [start, end) or null while incomplete. Bytes after the frame stay in the buffer for
|
package/dist/io.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"io.d.ts","sourceRoot":"","sources":["../src/io.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AAG9D,OAAO,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC1D,OAAO,KAAK,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAEpE;;;GAGG;AACH,wBAAgB,YAAY,CAC3B,SAAS,EAAE,YAAY,EACvB,KAAK,EAAE,CAAC,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,KAAK,OAAO,EACtD,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,MAAM,GACV,OAAO,CAAC,UAAU,CAAC,CAarB;AAED
|
|
1
|
+
{"version":3,"file":"io.d.ts","sourceRoot":"","sources":["../src/io.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AAG9D,OAAO,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC1D,OAAO,KAAK,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAEpE;;;GAGG;AACH,wBAAgB,YAAY,CAC3B,SAAS,EAAE,YAAY,EACvB,KAAK,EAAE,CAAC,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,KAAK,OAAO,EACtD,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,MAAM,GACV,OAAO,CAAC,UAAU,CAAC,CAarB;AAED;;;;GAIG;AACH,wBAAsB,UAAU,CAC/B,SAAS,EAAE,YAAY,EACvB,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,UAAU,GAAG,MAAM,EAAE,EAC3B,KAAK,EAAE,CAAC,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,KAAK,OAAO,EACtD,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,MAAM,EACZ,QAAQ,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,UAAU,CAAC,CAiBrB;AAED;;;;GAIG;AACH,qBAAa,YAAY;IACxB,OAAO,CAAC,MAAM,CAAgB;IAC9B,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAkB;gBAEhC,SAAS,EAAE,eAAe;IAIhC,SAAS,CACd,KAAK,EAAE,CAAC,MAAM,EAAE,SAAS,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI,EAC7D,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,MAAM,EACZ,GAAG,GAAE,MAAM,MAAiB,GAC1B,OAAO,CAAC,UAAU,CAAC;IAmBtB;;;OAGG;IACG,IAAI,CAAC,IAAI,EAAE,UAAU;CAM3B;AAED;;;;GAIG;AACH,MAAM,WAAW,SAAS;IACzB,KAAK,EAAE,UAAU,EAAE,CAAC;IACpB,MAAM,CAAC,IAAI,EAAE,UAAU,GAAG,MAAM,CAAC;IACjC,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,UAAU,CAAC;CACjC;AAID,wBAAgB,SAAS,CACxB,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,OAAO,CAAC,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC,EAC1C,OAAO,GAAE,CAAC,MAAM,EAAE,UAAU,CAAC,EAAO,GAClC,SAAS,CAmBX;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAC9B,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,WAAW,EACpB,OAAO,EAAE;IAAE,MAAM,CAAC,EAAE,OAAO,CAAC;IAAC,IAAI,CAAC,EAAE,OAAO,CAAA;CAAE,QAQ7C;AAED,oFAAoF;AACpF,wBAAgB,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAG9D;AAED,eAAO,MAAM,QAAQ,GAAI,UAAU,MAAM,EAAE,MAAM,SAAS,CAAC,MAAM,CAAC,EAAE,iBAAe,KAAG,QAGzC,CAAC;AAE9C,wBAAgB,SAAS,CAAC,SAAS,EAAE,YAAY,EAAE,KAAK,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAIjF"}
|
package/dist/io.js
CHANGED
|
@@ -20,13 +20,29 @@ export function waitForInput(transport, match, timeoutMs, what) {
|
|
|
20
20
|
});
|
|
21
21
|
});
|
|
22
22
|
}
|
|
23
|
-
/**
|
|
24
|
-
|
|
23
|
+
/**
|
|
24
|
+
* Sends an output report and waits for the matching input report. With `resendMs`, sends it again
|
|
25
|
+
* every `resendMs` until an answer matches or `timeoutMs` runs out: for a read, which changes
|
|
26
|
+
* nothing, on a device that drops requests while it's busy.
|
|
27
|
+
*/
|
|
28
|
+
export async function hidRequest(transport, reportId, data, match, timeoutMs, what, resendMs) {
|
|
25
29
|
const answer = waitForInput(transport, match, timeoutMs, what);
|
|
26
30
|
// Keeps a send failure from leaving the wait's rejection unhandled.
|
|
27
31
|
answer.catch(() => { });
|
|
28
|
-
|
|
29
|
-
|
|
32
|
+
const frame = Uint8Array.from(data);
|
|
33
|
+
await transport.sendReport(reportId, frame);
|
|
34
|
+
if (resendMs === undefined)
|
|
35
|
+
return answer;
|
|
36
|
+
let cancel = () => { };
|
|
37
|
+
const again = () => {
|
|
38
|
+
cancel = after(resendMs, () => {
|
|
39
|
+
// A failed resend is left to the timeout, as a missing answer.
|
|
40
|
+
transport.sendReport(reportId, frame).catch(() => { });
|
|
41
|
+
again();
|
|
42
|
+
});
|
|
43
|
+
};
|
|
44
|
+
again();
|
|
45
|
+
return answer.finally(() => cancel());
|
|
30
46
|
}
|
|
31
47
|
/**
|
|
32
48
|
* Reads a byte stream into a buffer until `frame` finds a complete frame in it. `frame` returns
|
package/dist/io.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"io.js","sourceRoot":"","sources":["../src/io.ts"],"names":[],"mappings":"AAAA,+CAA+C;AAG/C,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AAItC;;;GAGG;AACH,MAAM,UAAU,YAAY,CAC3B,SAAuB,EACvB,KAAsD,EACtD,SAAiB,EACjB,IAAY;IAEZ,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACtC,MAAM,MAAM,GAAG,KAAK,CAAC,SAAS,EAAE,GAAG,EAAE;YACpC,WAAW,EAAE,CAAC;YACd,MAAM,CAAC,IAAI,WAAW,CAAC,SAAS,EAAE,gBAAgB,IAAI,WAAW,SAAS,KAAK,CAAC,CAAC,CAAC;QACnF,CAAC,CAAC,CAAC;QACH,MAAM,WAAW,GAAG,SAAS,CAAC,aAAa,CAAC,CAAC,QAAQ,EAAE,IAAI,EAAE,EAAE;YAC9D,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,QAAQ,CAAC;gBAAE,OAAO;YACnC,MAAM,EAAE,CAAC;YACT,WAAW,EAAE,CAAC;YACd,OAAO,CAAC,IAAI,CAAC,CAAC;QACf,CAAC,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;AACJ,CAAC;AAED
|
|
1
|
+
{"version":3,"file":"io.js","sourceRoot":"","sources":["../src/io.ts"],"names":[],"mappings":"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"}
|
package/dist/protocols.d.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { Control } from '@potatosalad775/eqcaps-core';
|
|
1
2
|
import type { Slot } from './handler.ts';
|
|
2
3
|
import { type HandlerId, type HandlerOptions } from './handlers/index.ts';
|
|
3
4
|
interface ProtocolBase {
|
|
@@ -12,6 +13,8 @@ interface ProtocolBase {
|
|
|
12
13
|
experimental?: boolean;
|
|
13
14
|
/** Serial ports: the baud rate. Default 115200 over USB, 9600 over Bluetooth. */
|
|
14
15
|
baudRate?: number;
|
|
16
|
+
/** The device's controls besides the EQ that this bridge's handler drives (SPEC §9.1). */
|
|
17
|
+
controls?: readonly Control[];
|
|
15
18
|
}
|
|
16
19
|
/** How to drive one device: a handler and its settings. */
|
|
17
20
|
export type Protocol = {
|
|
@@ -22,7 +25,8 @@ export type Protocol = {
|
|
|
22
25
|
}[HandlerId];
|
|
23
26
|
/**
|
|
24
27
|
* Why this bridge can't drive a profile's `protocol`, or undefined when it can: a handler it
|
|
25
|
-
* doesn't have (data newer than the bridge), or settings that handler doesn't take.
|
|
28
|
+
* doesn't have (data newer than the bridge), or settings that handler doesn't take. Strict about
|
|
29
|
+
* controls, which `protocolOf` leaves out when it doesn't know them.
|
|
26
30
|
*/
|
|
27
31
|
export declare function protocolProblem(raw: unknown): string | undefined;
|
|
28
32
|
/**
|
package/dist/protocols.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"protocols.d.ts","sourceRoot":"","sources":["../src/protocols.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"protocols.d.ts","sourceRoot":"","sources":["../src/protocols.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,KAAK,EAAc,IAAI,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAY,KAAK,SAAS,EAAE,KAAK,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAEpF,UAAU,YAAY;IACrB;;;OAGG;IACH,OAAO,CAAC,EAAE,SAAS,IAAI,EAAE,CAAC;IAC1B,+DAA+D;IAC/D,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,mDAAmD;IACnD,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,iFAAiF;IACjF,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,0FAA0F;IAC1F,QAAQ,CAAC,EAAE,SAAS,OAAO,EAAE,CAAC;CAC9B;AAED,2DAA2D;AAC3D,MAAM,MAAM,QAAQ,GAAG;KACrB,CAAC,IAAI,SAAS,GAAG,YAAY,GAAG;QAAE,OAAO,EAAE,CAAC,CAAC;QAAC,OAAO,CAAC,EAAE,cAAc,CAAC,CAAC,CAAC,CAAA;KAAE;CAC5E,CAAC,SAAS,CAAC,CAAC;AAwQb;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAOhE;AAED;;;GAGG;AACH,wBAAgB,UAAU,CACzB,OAAO,EAAE;IAAE,QAAQ,CAAC,EAAE,OAAO,CAAA;CAAE,GAAG,IAAI,GAAG,SAAS,GAChD,QAAQ,GAAG,SAAS,CAOtB;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CACjC,OAAO,EAAE,QAAQ,CAAC;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE;QAAE,QAAQ,CAAC,EAAE,OAAO,CAAA;KAAE,CAAA;CAAE,CAAC,GACnF;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,QAAQ,CAAA;CAAE,GAAG,SAAS,CAMvD;AAgDD,6FAA6F;AAC7F,eAAO,MAAM,iBAAiB,EAAE,SAAS,MAAM,EAA4C,CAAC;AAE5F,iGAAiG;AACjG,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,QAAQ,GAAG,SAAS,CAGpE"}
|
package/dist/protocols.js
CHANGED
|
@@ -16,6 +16,15 @@ const byte = (v) => {
|
|
|
16
16
|
};
|
|
17
17
|
/** Any finite number. */
|
|
18
18
|
const number = (v) => typeof v === 'number' && Number.isFinite(v) ? v : fail(`${JSON.stringify(v)} is not a number`);
|
|
19
|
+
/** A number above 0. */
|
|
20
|
+
const positive = (v) => typeof v === 'number' && Number.isFinite(v) && v > 0
|
|
21
|
+
? v
|
|
22
|
+
: fail(`${JSON.stringify(v)} is not above 0`);
|
|
23
|
+
/** A number of 0 or more. */
|
|
24
|
+
const nonNegative = (v) => typeof v === 'number' && Number.isFinite(v) && v >= 0
|
|
25
|
+
? v
|
|
26
|
+
: fail(`${JSON.stringify(v)} is not 0 or more`);
|
|
27
|
+
const flag = (v) => typeof v === 'boolean' ? v : fail(`${JSON.stringify(v)} is not a boolean`);
|
|
19
28
|
const isObject = (v) => typeof v === 'object' && v !== null && !Array.isArray(v);
|
|
20
29
|
/** KT Micro's per-band register pairs. */
|
|
21
30
|
const registers = (v) => Array.isArray(v) && v.length > 0
|
|
@@ -33,14 +42,18 @@ const registers = (v) => Array.isArray(v) && v.length > 0
|
|
|
33
42
|
*/
|
|
34
43
|
const OPTIONS = {
|
|
35
44
|
'fiio-usb-hid': { reportId: byte, saveCommand: byte },
|
|
36
|
-
'walkplay-hid': { defaultSlot: byte },
|
|
45
|
+
'walkplay-hid': { defaultSlot: byte, enableCommand: flag, micGainDone: flag },
|
|
37
46
|
'moondrop-usb-hid': {},
|
|
38
47
|
'moondrop-old-fashioned-hid': {},
|
|
39
48
|
'conexant-usb-hid': {},
|
|
40
49
|
'ktmicro-usb-hid': {
|
|
41
50
|
baseRegister: byte,
|
|
42
51
|
bandRegisters: registers,
|
|
43
|
-
customSlot: byte
|
|
52
|
+
customSlot: byte,
|
|
53
|
+
freqUnit: positive,
|
|
54
|
+
slotRegister: flag,
|
|
55
|
+
preampRegister: flag,
|
|
56
|
+
frameDelay: nonNegative
|
|
44
57
|
},
|
|
45
58
|
'fosi-audio-usb-hid': { reportId: byte, bandwidth: number, defaultSlot: byte },
|
|
46
59
|
'qudelix-usb-hid': {},
|
|
@@ -53,10 +66,118 @@ const OPTIONS = {
|
|
|
53
66
|
'edifier-serial': {},
|
|
54
67
|
airoha: {}
|
|
55
68
|
};
|
|
56
|
-
|
|
69
|
+
const KINDS = new Set(['toggle', 'choice', 'range']);
|
|
70
|
+
const ROLES = new Set([
|
|
71
|
+
'volume',
|
|
72
|
+
'output-gain',
|
|
73
|
+
'dac-filter',
|
|
74
|
+
'upsampling',
|
|
75
|
+
'usb-mode',
|
|
76
|
+
'sound-mode',
|
|
77
|
+
'light',
|
|
78
|
+
'tone-bass',
|
|
79
|
+
'tone-treble',
|
|
80
|
+
'amp-mode',
|
|
81
|
+
'mic-gain',
|
|
82
|
+
'balance-left',
|
|
83
|
+
'balance-right'
|
|
84
|
+
]);
|
|
85
|
+
const numbers = (v, what) => Array.isArray(v) && v.length > 0 && v.every((x) => typeof x === 'number' && Number.isFinite(x))
|
|
86
|
+
? v
|
|
87
|
+
: fail(`${what}: not a list of numbers`);
|
|
88
|
+
/**
|
|
89
|
+
* A profile's controls. Strict (CI): every control must be one this bridge's handler drives,
|
|
90
|
+
* with a kind and role it knows. Lenient (apps, SPEC §9.1): such controls are left out, and an
|
|
91
|
+
* unknown role alone is dropped, so newer data never stops a device from being driven.
|
|
92
|
+
*/
|
|
93
|
+
function readControls(raw, id, strict) {
|
|
94
|
+
const driven = HANDLERS[id].controls ?? {};
|
|
95
|
+
const out = [];
|
|
96
|
+
for (const c of Array.isArray(raw) ? raw : fail('controls: not a list')) {
|
|
97
|
+
if (!isObject(c))
|
|
98
|
+
fail('controls: not an object');
|
|
99
|
+
const { id: key, name, kind, role, values, range, unit, when, firmware, disablesEq, reconnect } = c;
|
|
100
|
+
if (typeof key !== 'string' || !/^[a-z][A-Za-z0-9]*$/.test(key)) {
|
|
101
|
+
fail(`controls: id ${JSON.stringify(key)}`);
|
|
102
|
+
}
|
|
103
|
+
const at = `controls.${key}`;
|
|
104
|
+
const skip = (why) => (strict ? fail(`${at}: ${why}`) : undefined);
|
|
105
|
+
if (!Object.hasOwn(driven, key)) {
|
|
106
|
+
skip(`${id} has no control "${key}"`);
|
|
107
|
+
continue;
|
|
108
|
+
}
|
|
109
|
+
if (typeof kind !== 'string' || !KINDS.has(kind)) {
|
|
110
|
+
skip(`unknown kind ${JSON.stringify(kind)}`);
|
|
111
|
+
continue;
|
|
112
|
+
}
|
|
113
|
+
if (typeof name !== 'string' || !name)
|
|
114
|
+
fail(`${at}: name`);
|
|
115
|
+
const control = {
|
|
116
|
+
id: key,
|
|
117
|
+
name: name,
|
|
118
|
+
kind: kind
|
|
119
|
+
};
|
|
120
|
+
if (role !== undefined) {
|
|
121
|
+
if (typeof role === 'string' && ROLES.has(role))
|
|
122
|
+
control.role = role;
|
|
123
|
+
else
|
|
124
|
+
skip(`unknown role ${JSON.stringify(role)}`);
|
|
125
|
+
}
|
|
126
|
+
if (kind === 'choice') {
|
|
127
|
+
if (!Array.isArray(values) || values.length < 2)
|
|
128
|
+
fail(`${at}: values`);
|
|
129
|
+
control.values = values.map((v) => {
|
|
130
|
+
const { value, name: label } = isObject(v) ? v : fail(`${at}: values`);
|
|
131
|
+
if (typeof value !== 'number' || !Number.isFinite(value))
|
|
132
|
+
fail(`${at}: value ${String(value)}`);
|
|
133
|
+
if (typeof label !== 'string' || !label)
|
|
134
|
+
fail(`${at}: name of value ${String(value)}`);
|
|
135
|
+
return { value: value, name: label };
|
|
136
|
+
});
|
|
137
|
+
}
|
|
138
|
+
else if (values !== undefined)
|
|
139
|
+
fail(`${at}: values on a ${kind}`);
|
|
140
|
+
if (kind === 'range') {
|
|
141
|
+
const { min, max, step } = isObject(range) ? range : fail(`${at}: range`);
|
|
142
|
+
const [lo, hi] = numbers([min, max], `${at}: range`);
|
|
143
|
+
if (step !== undefined && !(typeof step === 'number' && step > 0))
|
|
144
|
+
fail(`${at}: step`);
|
|
145
|
+
control.range =
|
|
146
|
+
step === undefined ? { min: lo, max: hi } : { min: lo, max: hi, step: step };
|
|
147
|
+
if (unit !== undefined)
|
|
148
|
+
control.unit = unit === 'dB' ? 'dB' : fail(`${at}: unit`);
|
|
149
|
+
}
|
|
150
|
+
else if (range !== undefined || unit !== undefined)
|
|
151
|
+
fail(`${at}: range on a ${kind}`);
|
|
152
|
+
if (when !== undefined) {
|
|
153
|
+
const { control: other, values: held } = isObject(when) ? when : fail(`${at}: when`);
|
|
154
|
+
if (typeof other !== 'string')
|
|
155
|
+
fail(`${at}: when.control`);
|
|
156
|
+
control.when = { control: other, values: numbers(held, `${at}: when.values`) };
|
|
157
|
+
}
|
|
158
|
+
if (firmware !== undefined) {
|
|
159
|
+
const { min, max } = isObject(firmware) ? firmware : fail(`${at}: firmware`);
|
|
160
|
+
if ([min, max].some((v) => v !== undefined && typeof v !== 'string') || (!min && !max)) {
|
|
161
|
+
fail(`${at}: firmware`);
|
|
162
|
+
}
|
|
163
|
+
control.firmware = {
|
|
164
|
+
...(min !== undefined ? { min: min } : {}),
|
|
165
|
+
...(max !== undefined ? { max: max } : {})
|
|
166
|
+
};
|
|
167
|
+
}
|
|
168
|
+
if (disablesEq !== undefined)
|
|
169
|
+
control.disablesEq = numbers(disablesEq, `${at}: disablesEq`);
|
|
170
|
+
if (reconnect !== undefined) {
|
|
171
|
+
control.reconnect = typeof reconnect === 'boolean' ? reconnect : fail(`${at}: reconnect`);
|
|
172
|
+
}
|
|
173
|
+
out.push(control);
|
|
174
|
+
}
|
|
175
|
+
return out;
|
|
176
|
+
}
|
|
177
|
+
function read(raw, strict = false) {
|
|
57
178
|
if (!isObject(raw))
|
|
58
179
|
fail('not an object');
|
|
59
|
-
const { handler, options, presets, disconnectOnSave, experimental, baudRate } = raw;
|
|
180
|
+
const { handler, options, presets, disconnectOnSave, experimental, baudRate, controls } = raw;
|
|
60
181
|
if (typeof handler !== 'string' || !Object.hasOwn(HANDLERS, handler)) {
|
|
61
182
|
fail(`this bridge has no handler "${String(handler)}"`);
|
|
62
183
|
}
|
|
@@ -127,15 +248,21 @@ function read(raw) {
|
|
|
127
248
|
? baudRate
|
|
128
249
|
: fail('baudRate: not a positive integer');
|
|
129
250
|
}
|
|
251
|
+
if (controls !== undefined) {
|
|
252
|
+
const list = readControls(controls, id, strict);
|
|
253
|
+
if (list.length)
|
|
254
|
+
out.controls = list;
|
|
255
|
+
}
|
|
130
256
|
return out;
|
|
131
257
|
}
|
|
132
258
|
/**
|
|
133
259
|
* Why this bridge can't drive a profile's `protocol`, or undefined when it can: a handler it
|
|
134
|
-
* doesn't have (data newer than the bridge), or settings that handler doesn't take.
|
|
260
|
+
* doesn't have (data newer than the bridge), or settings that handler doesn't take. Strict about
|
|
261
|
+
* controls, which `protocolOf` leaves out when it doesn't know them.
|
|
135
262
|
*/
|
|
136
263
|
export function protocolProblem(raw) {
|
|
137
264
|
try {
|
|
138
|
-
read(raw);
|
|
265
|
+
read(raw, true);
|
|
139
266
|
return undefined;
|
|
140
267
|
}
|
|
141
268
|
catch (e) {
|
package/dist/protocols.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"protocols.js","sourceRoot":"","sources":["../src/protocols.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"protocols.js","sourceRoot":"","sources":["../src/protocols.ts"],"names":[],"mappings":"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"}
|
package/dist/transport.d.ts
CHANGED
|
@@ -30,6 +30,12 @@ export interface HidTransport {
|
|
|
30
30
|
receiveFeatureReport(reportId: number): Promise<Uint8Array>;
|
|
31
31
|
/** Subscribes to input reports (`data` excludes the report id). Returns the unsubscribe. */
|
|
32
32
|
onInputReport(listener: (reportId: number, data: Uint8Array) => void): () => void;
|
|
33
|
+
/**
|
|
34
|
+
* Calls `listener` once when the device goes away on its own (unplugged, out of range), never
|
|
35
|
+
* for `close()`. Returns the unsubscribe. Optional: without it, a lost device only shows as an
|
|
36
|
+
* operation failing with `transport`.
|
|
37
|
+
*/
|
|
38
|
+
onDisconnect?(listener: () => void): () => void;
|
|
33
39
|
close(): Promise<void>;
|
|
34
40
|
}
|
|
35
41
|
/** Identity of a serial port, as Web Serial's `getInfo()` exposes it. */
|
|
@@ -52,6 +58,12 @@ export interface StreamTransport {
|
|
|
52
58
|
write(data: Uint8Array): Promise<void>;
|
|
53
59
|
/** The next received bytes, or null if nothing arrives within `timeoutMs`. */
|
|
54
60
|
read(timeoutMs: number): Promise<Uint8Array | null>;
|
|
61
|
+
/**
|
|
62
|
+
* Calls `listener` once when the device goes away on its own (unplugged, out of range), never
|
|
63
|
+
* for `close()`. Returns the unsubscribe. Optional: without it, a lost device only shows as an
|
|
64
|
+
* operation failing with `transport`.
|
|
65
|
+
*/
|
|
66
|
+
onDisconnect?(listener: () => void): () => void;
|
|
55
67
|
close(): Promise<void>;
|
|
56
68
|
}
|
|
57
69
|
export type Transport = HidTransport | StreamTransport;
|
package/dist/transport.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transport.d.ts","sourceRoot":"","sources":["../src/transport.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"transport.d.ts","sourceRoot":"","sources":["../src/transport.ts"],"names":[],"mappings":"AAYA,yEAAyE;AACzE,MAAM,WAAW,aAAa;IAC7B,QAAQ,EAAE,MAAM,CAAC;IACjB,4FAA4F;IAC5F,IAAI,CAAC,EAAE,MAAM,CAAC;CACd;AAED,4FAA4F;AAC5F,MAAM,WAAW,iBAAiB;IACjC,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,aAAa,EAAE,CAAC;IAC9B,aAAa,EAAE,aAAa,EAAE,CAAC;IAC/B,cAAc,EAAE,aAAa,EAAE,CAAC;IAChC,QAAQ,EAAE,iBAAiB,EAAE,CAAC;CAC9B;AAED,MAAM,WAAW,YAAY;IAC5B,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC;IACrB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,kEAAkE;IAClE,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,WAAW,EAAE,SAAS,iBAAiB,EAAE,CAAC;IACnD,oDAAoD;IACpD,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9D,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACrE;;;OAGG;IACH,oBAAoB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;IAC5D,4FAA4F;IAC5F,aAAa,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,KAAK,IAAI,GAAG,MAAM,IAAI,CAAC;IAClF;;;;OAIG;IACH,YAAY,CAAC,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC;IAChD,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACvB;AAED,yEAAyE;AACzE,MAAM,WAAW,kBAAkB;IAClC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,wEAAwE;IACxE,uBAAuB,CAAC,EAAE,MAAM,CAAC;CACjC;AAED;;;GAGG;AACH,MAAM,WAAW,eAAe;IAC/B,QAAQ,CAAC,IAAI,EAAE,QAAQ,GAAG,KAAK,CAAC;IAChC,yBAAyB;IACzB,QAAQ,CAAC,MAAM,CAAC,EAAE,kBAAkB,CAAC;IACrC,qDAAqD;IACrD,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAC1B,KAAK,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACvC,8EAA8E;IAC9E,IAAI,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC,CAAC;IACpD;;;;OAIG;IACH,YAAY,CAAC,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC;IAChD,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACvB;AAED,MAAM,MAAM,SAAS,GAAG,YAAY,GAAG,eAAe,CAAC;AACvD,MAAM,MAAM,aAAa,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC"}
|
package/dist/transport.js
CHANGED
|
@@ -7,6 +7,7 @@
|
|
|
7
7
|
// - an input listener sees every report that arrives after it subscribes, in order;
|
|
8
8
|
// - `read()` returns the bytes that arrived since the last read, buffered, so nothing is lost
|
|
9
9
|
// between two reads;
|
|
10
|
-
// - methods reject with a `BridgeError` of code `transport` when the device is gone
|
|
10
|
+
// - methods reject with a `BridgeError` of code `transport` when the device is gone;
|
|
11
|
+
// - `onDisconnect`, where the platform reports it, fires when the device goes, not on `close()`.
|
|
11
12
|
export {};
|
|
12
13
|
//# sourceMappingURL=transport.js.map
|
package/dist/transport.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transport.js","sourceRoot":"","sources":["../src/transport.ts"],"names":[],"mappings":"AAAA,4EAA4E;AAC5E,+FAA+F;AAC/F,wFAAwF;AACxF,EAAE;AACF,+FAA+F;AAC/F,6FAA6F;AAC7F,oFAAoF;AACpF,8FAA8F;AAC9F,uBAAuB;AACvB,qFAAqF"}
|
|
1
|
+
{"version":3,"file":"transport.js","sourceRoot":"","sources":["../src/transport.ts"],"names":[],"mappings":"AAAA,4EAA4E;AAC5E,+FAA+F;AAC/F,wFAAwF;AACxF,EAAE;AACF,+FAA+F;AAC/F,6FAA6F;AAC7F,oFAAoF;AACpF,8FAA8F;AAC9F,uBAAuB;AACvB,qFAAqF;AACrF,iGAAiG"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@potatosalad775/eqcaps-device-bridge",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.3.0",
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public"
|
|
6
6
|
},
|
|
@@ -33,6 +33,6 @@
|
|
|
33
33
|
"build": "node -e \"require('fs').rmSync('dist', { recursive: true, force: true })\" && tsc -p tsconfig.build.json"
|
|
34
34
|
},
|
|
35
35
|
"dependencies": {
|
|
36
|
-
"@potatosalad775/eqcaps-core": "0.
|
|
36
|
+
"@potatosalad775/eqcaps-core": "0.3.0"
|
|
37
37
|
}
|
|
38
38
|
}
|