@yume-chan/adb 3.0.0-beta.2 → 3.0.0-beta.3
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/esm/banner.d.ts.map +1 -1
- package/esm/banner.js.map +1 -1
- package/esm/daemon/crypto.d.ts.map +1 -1
- package/esm/daemon/crypto.js +53 -18
- package/esm/daemon/crypto.js.map +1 -1
- package/esm/server/client.d.ts.map +1 -1
- package/esm/server/client.js +2 -1
- package/esm/server/client.js.map +1 -1
- package/esm/service/subprocess/shell/spawner.d.ts.map +1 -1
- package/esm/service/subprocess/shell/spawner.js.map +1 -1
- package/esm/service/sync/request/push.d.ts.map +1 -1
- package/esm/service/sync/request/push.js +15 -29
- package/esm/service/sync/request/push.js.map +1 -1
- package/package.json +6 -6
- package/src/banner.ts +1 -2
- package/src/daemon/crypto.ts +65 -23
- package/src/server/client.ts +5 -1
- package/src/service/subprocess/shell/spawner.ts +3 -1
- package/src/service/sync/request/push.ts +31 -34
- package/esm/banner.spec.d.ts +0 -2
- package/esm/banner.spec.d.ts.map +0 -1
- package/esm/daemon/auth/packet-processor.spec.d.ts +0 -2
- package/esm/daemon/auth/packet-processor.spec.d.ts.map +0 -1
- package/esm/daemon/auth/public-key.spec.d.ts +0 -2
- package/esm/daemon/auth/public-key.spec.d.ts.map +0 -1
- package/esm/daemon/crypto.spec.d.ts +0 -2
- package/esm/daemon/crypto.spec.d.ts.map +0 -1
- package/esm/server/client.spec.d.ts +0 -2
- package/esm/server/client.spec.d.ts.map +0 -1
- package/esm/service/reverse/response.spec.d.ts +0 -2
- package/esm/service/reverse/response.spec.d.ts.map +0 -1
- package/esm/service/subprocess/none/process.spec.d.ts +0 -2
- package/esm/service/subprocess/none/process.spec.d.ts.map +0 -1
- package/esm/service/subprocess/none/spawner.spec.d.ts +0 -2
- package/esm/service/subprocess/none/spawner.spec.d.ts.map +0 -1
- package/esm/service/subprocess/shell/process.spec.d.ts +0 -2
- package/esm/service/subprocess/shell/process.spec.d.ts.map +0 -1
- package/esm/service/subprocess/shell/shared.spec.d.ts +0 -2
- package/esm/service/subprocess/shell/shared.spec.d.ts.map +0 -1
- package/esm/service/subprocess/shell/spawner.spec.d.ts +0 -2
- package/esm/service/subprocess/shell/spawner.spec.d.ts.map +0 -1
- package/esm/service/subprocess/utils.spec.d.ts +0 -2
- package/esm/service/subprocess/utils.spec.d.ts.map +0 -1
- package/esm/service/sync/socket-pool.spec.d.ts +0 -2
- package/esm/service/sync/socket-pool.spec.d.ts.map +0 -1
- package/esm/service/sync/socket.spec.d.ts +0 -2
- package/esm/service/sync/socket.spec.d.ts.map +0 -1
- package/esm/utils/base64.spec.d.ts +0 -2
- package/esm/utils/base64.spec.d.ts.map +0 -1
- package/esm/utils/md5.spec.d.ts +0 -2
- package/esm/utils/md5.spec.d.ts.map +0 -1
- package/yume-chan-adb-3.0.0-beta.0.tgz +0 -0
package/esm/banner.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"banner.d.ts","sourceRoot":"","sources":["../src/banner.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAE1D,eAAO,MAAM,YAAY;;;;;CAKf,CAAC;AAEX,MAAM,MAAM,YAAY,GAAG,CAAC,OAAO,YAAY,CAAC,CAAC,MAAM,OAAO,YAAY,CAAC,CAAC;AAE5E,qBAAa,SAAS;;IAClB,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM;
|
|
1
|
+
{"version":3,"file":"banner.d.ts","sourceRoot":"","sources":["../src/banner.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAE1D,eAAO,MAAM,YAAY;;;;;CAKf,CAAC;AAEX,MAAM,MAAM,YAAY,GAAG,CAAC,OAAO,YAAY,CAAC,CAAC,MAAM,OAAO,YAAY,CAAC,CAAC;AAE5E,qBAAa,SAAS;;IAClB,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM;IA6C3B,IAAI,KAAK,gJAER;IAGD,IAAI,OAAO,uBAEV;IAGD,IAAI,KAAK,uBAER;IAGD,IAAI,MAAM,uBAET;IAGD,IAAI,QAAQ,0BAEX;gBAIG,KAAK,EAAE,eAAe,CAAC,eAAe,GAAG,SAAS,EAClD,OAAO,EAAE,MAAM,GAAG,SAAS,EAC3B,KAAK,EAAE,MAAM,GAAG,SAAS,EACzB,MAAM,EAAE,MAAM,GAAG,SAAS,EAC1B,QAAQ,EAAE,SAAS,UAAU,EAAE;CAQtC"}
|
package/esm/banner.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"banner.js","sourceRoot":"","sources":["../src/banner.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,MAAM,YAAY,GAAG;IACxB,OAAO,EAAE,iBAAiB;IAC1B,KAAK,EAAE,kBAAkB;IACzB,MAAM,EAAE,mBAAmB;IAC3B,QAAQ,EAAE,UAAU;CACd,CAAC;AAIX,MAAM,OAAO,SAAS;IAClB,MAAM,CAAC,KAAK,CAAC,MAAc;QACvB,IAAI,KAAkD,CAAC;QACvD,IAAI,OAA2B,CAAC;QAChC,IAAI,KAAyB,CAAC;QAC9B,IAAI,MAA0B,CAAC;QAC/B,IAAI,QAAQ,GAAiB,EAAE,CAAC;QAEhC,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAClC,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACpB,KAAK,GAAG,CAAC,MAAM,CAAC,CAAC,CAAE,CAAC,IAAI,EAAE,IAAI,SAAS,
|
|
1
|
+
{"version":3,"file":"banner.js","sourceRoot":"","sources":["../src/banner.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,MAAM,YAAY,GAAG;IACxB,OAAO,EAAE,iBAAiB;IAC1B,KAAK,EAAE,kBAAkB;IACzB,MAAM,EAAE,mBAAmB;IAC3B,QAAQ,EAAE,UAAU;CACd,CAAC;AAIX,MAAM,OAAO,SAAS;IAClB,MAAM,CAAC,KAAK,CAAC,MAAc;QACvB,IAAI,KAAkD,CAAC;QACvD,IAAI,OAA2B,CAAC;QAChC,IAAI,KAAyB,CAAC;QAC9B,IAAI,MAA0B,CAAC;QAC/B,IAAI,QAAQ,GAAiB,EAAE,CAAC;QAEhC,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAClC,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACpB,KAAK,GAAG,CAAC,MAAM,CAAC,CAAC,CAAE,CAAC,IAAI,EAAE,IAAI,SAAS,CACQ,CAAC;YAChD,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAE,CAAC;YACzB,KAAK,MAAM,IAAI,IAAI,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;gBAClC,qBAAqB;gBACrB,IAAI,CAAC,IAAI,EAAE,CAAC;oBACR,SAAS;gBACb,CAAC;gBAED,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBACjC,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;oBACxB,SAAS;gBACb,CAAC;gBAED,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,QAAQ,CAAC;gBAC9B,QAAQ,GAAG,EAAE,CAAC;oBACV,KAAK,YAAY,CAAC,OAAO;wBACrB,OAAO,GAAG,KAAK,CAAC;wBAChB,MAAM;oBACV,KAAK,YAAY,CAAC,KAAK;wBACnB,KAAK,GAAG,KAAK,CAAC;wBACd,MAAM;oBACV,KAAK,YAAY,CAAC,MAAM;wBACpB,MAAM,GAAG,KAAK,CAAC;wBACf,MAAM;oBACV,KAAK,YAAY,CAAC,QAAQ;wBACtB,QAAQ,GAAG,KAAM,CAAC,KAAK,CAAC,GAAG,CAAiB,CAAC;wBAC7C,MAAM;gBACd,CAAC;YACL,CAAC;QACL,CAAC;QAED,OAAO,IAAI,SAAS,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;IAClE,CAAC;IAEQ,MAAM,CAA8C;IAC7D,IAAI,KAAK;QACL,OAAO,IAAI,CAAC,MAAM,CAAC;IACvB,CAAC;IAEQ,QAAQ,CAAqB;IACtC,IAAI,OAAO;QACP,OAAO,IAAI,CAAC,QAAQ,CAAC;IACzB,CAAC;IAEQ,MAAM,CAAqB;IACpC,IAAI,KAAK;QACL,OAAO,IAAI,CAAC,MAAM,CAAC;IACvB,CAAC;IAEQ,OAAO,CAAqB;IACrC,IAAI,MAAM;QACN,OAAO,IAAI,CAAC,OAAO,CAAC;IACxB,CAAC;IAEQ,SAAS,GAA0B,EAAE,CAAC;IAC/C,IAAI,QAAQ;QACR,OAAO,IAAI,CAAC,SAAS,CAAC;IAC1B,CAAC;IAED,yDAAyD;IACzD,YACI,KAAkD,EAClD,OAA2B,EAC3B,KAAyB,EACzB,MAA0B,EAC1B,QAA+B;QAE/B,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;QACpB,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;QACxB,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;QACpB,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC;IAC9B,CAAC;CACJ"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"crypto.d.ts","sourceRoot":"","sources":["../../src/daemon/crypto.ts"],"names":[],"mappings":"AAMA;;;;;;GAMG;AACH,wBAAgB,UAAU,CACtB,KAAK,EAAE,UAAU,EACjB,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,GACf,MAAM,
|
|
1
|
+
{"version":3,"file":"crypto.d.ts","sourceRoot":"","sources":["../../src/daemon/crypto.ts"],"names":[],"mappings":"AAMA;;;;;;GAMG;AACH,wBAAgB,UAAU,CACtB,KAAK,EAAE,UAAU,EACjB,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,GACf,MAAM,CAeR;AAED;;;;;;;GAOG;AAGH,wBAAgB,UAAU,CACtB,KAAK,EAAE,UAAU,EACjB,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,MAAM,EACb,YAAY,CAAC,EAAE,OAAO,QAqBzB;AAED,MAAM,WAAW,mBAAmB;IAChC,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACb;AA0CD,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,UAAU,GAAG,mBAAmB,CAoCvE;AAeD,wBAAgB,UAAU,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,UAuB9C;AAED;;;;;;GAMG;AACH,wBAAgB,MAAM,CAClB,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,GAChB,MAAM,CAkBR;AAED,eAAO,MAAM,kBAAkB,KAAK,CAAC;AAErC,eAAO,MAAM,aAAa,KAAO,CAAC;AAClC,eAAO,MAAM,iBAAiB,IAAO,CAAC;AACtC,eAAO,MAAM,SAAS,IAAO,CAAC;AAC9B,eAAO,MAAM,QAAQ,IAAO,CAAC;AAG7B,eAAO,MAAM,gBAAgB,yBAiB3B,CAAC;AAYH,wBAAgB,OAAO,CACnB,UAAU,EAAE,mBAAmB,EAC/B,IAAI,EAAE,UAAU,GACjB,UAAU,CAAC,WAAW,CAAC,CA2CzB"}
|
package/esm/daemon/crypto.js
CHANGED
|
@@ -8,9 +8,11 @@ import { getUint64BigEndian, setInt64BigEndian, setInt64LittleEndian, } from "@y
|
|
|
8
8
|
*/
|
|
9
9
|
export function getBigUint(array, byteOffset, length) {
|
|
10
10
|
let result = 0n;
|
|
11
|
-
//
|
|
12
|
-
|
|
13
|
-
|
|
11
|
+
// The leading bytes that do not fill a whole 64-bit word.
|
|
12
|
+
for (let j = 0; j < length % 8; j += 1) {
|
|
13
|
+
result = (result << 8n) | BigInt(array[byteOffset + j]);
|
|
14
|
+
}
|
|
15
|
+
for (let i = byteOffset + (length % 8); i < byteOffset + length; i += 8) {
|
|
14
16
|
result <<= 64n;
|
|
15
17
|
const value = getUint64BigEndian(array, i);
|
|
16
18
|
result |= value;
|
|
@@ -48,12 +50,6 @@ export function setBigUint(array, byteOffset, length, value, littleEndian) {
|
|
|
48
50
|
array.subarray(byteOffset, position + 8).fill(0);
|
|
49
51
|
}
|
|
50
52
|
}
|
|
51
|
-
// These values are correct only if
|
|
52
|
-
// modulus length is 2048 and
|
|
53
|
-
// public exponent (e) is 65537
|
|
54
|
-
// Anyway, that's how this library generates keys
|
|
55
|
-
// To support other parameters,
|
|
56
|
-
// a proper ASN.1 parser can be used
|
|
57
53
|
// References:
|
|
58
54
|
//
|
|
59
55
|
// https://tools.ietf.org/html/rfc8017#appendix-A.1.2
|
|
@@ -66,16 +62,55 @@ export function setBigUint(array, byteOffset, length, value, littleEndian) {
|
|
|
66
62
|
//
|
|
67
63
|
// https://www.itu.int/rec/T-REC-X.690-201508-I/en
|
|
68
64
|
// X.690: Specification of Distinguished Encoding Rules (DER)
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
65
|
+
/**
|
|
66
|
+
* One DER tag-length-value header: where its content starts and how long it is.
|
|
67
|
+
* @param data The DER-encoded data.
|
|
68
|
+
* @param offset The offset of the header in the data.
|
|
69
|
+
* @returns The content offset and length.
|
|
70
|
+
*/
|
|
71
|
+
function derHeader(data, offset) {
|
|
72
|
+
offset = offset + 1; // Only low-tag-number forms occur in a PKCS #8 RSA key.
|
|
73
|
+
let length = data[offset];
|
|
74
|
+
offset += 1;
|
|
75
|
+
if (length & 0x80) {
|
|
76
|
+
const lengthBytes = length & 0x7f;
|
|
77
|
+
length = 0;
|
|
78
|
+
for (let i = 0; i < lengthBytes; i += 1) {
|
|
79
|
+
length = (length << 8) | data[offset];
|
|
80
|
+
offset += 1;
|
|
81
|
+
}
|
|
76
82
|
}
|
|
77
|
-
|
|
78
|
-
|
|
83
|
+
return { offset, length };
|
|
84
|
+
}
|
|
85
|
+
export function rsaParsePrivateKey(key) {
|
|
86
|
+
// PrivateKeyInfo ::= SEQUENCE {
|
|
87
|
+
// version INTEGER,
|
|
88
|
+
// privateKeyAlgorithm AlgorithmIdentifier,
|
|
89
|
+
// privateKey OCTET STRING -- wrapping an RSAPrivateKey
|
|
90
|
+
// }
|
|
91
|
+
// RSAPrivateKey ::= SEQUENCE {
|
|
92
|
+
// version Version,
|
|
93
|
+
// modulus INTEGER, -- n
|
|
94
|
+
// publicExponent INTEGER, -- e
|
|
95
|
+
// privateExponent INTEGER -- d
|
|
96
|
+
// -- ... other fields omitted
|
|
97
|
+
// }
|
|
98
|
+
let offset = derHeader(key, 0).offset; // into PrivateKeyInfo
|
|
99
|
+
let header = derHeader(key, offset); // skip version
|
|
100
|
+
offset = header.offset + header.length;
|
|
101
|
+
header = derHeader(key, offset); // skip privateKeyAlgorithm
|
|
102
|
+
offset = header.offset + header.length;
|
|
103
|
+
offset = derHeader(key, offset).offset; // into OCTET STRING
|
|
104
|
+
offset = derHeader(key, offset).offset; // into RSAPrivateKey
|
|
105
|
+
header = derHeader(key, offset); // skip version
|
|
106
|
+
offset = header.offset + header.length;
|
|
107
|
+
const nHeader = derHeader(key, offset); // get modulus
|
|
108
|
+
offset = nHeader.offset + nHeader.length;
|
|
109
|
+
const eHeader = derHeader(key, offset); // skip publicExponent
|
|
110
|
+
offset = eHeader.offset + eHeader.length;
|
|
111
|
+
const dHeader = derHeader(key, offset); // get privateExponent
|
|
112
|
+
const n = getBigUint(key, nHeader.offset, nHeader.length);
|
|
113
|
+
const d = getBigUint(key, dHeader.offset, dHeader.length);
|
|
79
114
|
return { n, d };
|
|
80
115
|
}
|
|
81
116
|
function nonNegativeMod(m, d) {
|
package/esm/daemon/crypto.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"crypto.js","sourceRoot":"","sources":["../../src/daemon/crypto.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,kBAAkB,EAClB,iBAAiB,EACjB,oBAAoB,GACvB,MAAM,yBAAyB,CAAC;AAEjC;;;;;;GAMG;AACH,MAAM,UAAU,UAAU,CACtB,KAAiB,EACjB,UAAkB,EAClB,MAAc;IAEd,IAAI,MAAM,GAAG,EAAE,CAAC;IAEhB,
|
|
1
|
+
{"version":3,"file":"crypto.js","sourceRoot":"","sources":["../../src/daemon/crypto.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/server/client.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/server/client.ts"],"names":[],"mappings":"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"}
|
package/esm/server/client.js
CHANGED
|
@@ -384,7 +384,8 @@ export class AdbServerClient {
|
|
|
384
384
|
signal: waitAbortController.signal,
|
|
385
385
|
});
|
|
386
386
|
const transport = new AdbServerTransport(this, info?.serial ?? "", banner, transportId, disconnected);
|
|
387
|
-
|
|
387
|
+
const abortDisconnectWait = () => waitAbortController.abort();
|
|
388
|
+
void transport.disconnected.then(abortDisconnectWait, abortDisconnectWait);
|
|
388
389
|
return transport;
|
|
389
390
|
}
|
|
390
391
|
async createAdb(device) {
|
package/esm/server/client.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/server/client.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/server/client.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"spawner.d.ts","sourceRoot":"","sources":["../../../../src/service/subprocess/shell/spawner.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,KAAK,EACR,WAAW,EACX,eAAe,EACf,cAAc,EACd,cAAc,EACjB,MAAM,yBAAyB,CAAC;AAGjC,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAQxD,MAAM,WAAW,uBAAuB;IACpC,IAAI,KAAK,IAAI,cAAc,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC,CAAC;IAEzD,IAAI,MAAM,IAAI,cAAc,CAAC,UAAU,CAAC,CAAC;IACzC,IAAI,MAAM,IAAI,cAAc,CAAC,UAAU,CAAC,CAAC;IAEzC,IAAI,MAAM,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAE9B,IAAI,IAAI,gBAAgB,CAAC,IAAI,CAAC,CAAC;CAClC;AAED,MAAM,MAAM,uBAAuB,GAAG,CAClC,OAAO,EAAE,MAAM,GAAG,SAAS,MAAM,EAAE,EACnC,MAAM,CAAC,EAAE,WAAW,KACnB,OAAO,CAAC,uBAAuB,CAAC,GACjC,oBAAoB,CAAC,IAAI,CACrB,uBAAuB,CAAC,UAAU,CAAC,UAAU,CAAC,EAC9C,uBAAuB,CAAC,UAAU,CAAC,MAAM,CAAC,CAC7C,CAAC;AAEN,yBAAiB,uBAAuB,CAAC;IACrC,UAAiB,UAAU,CAAC,CAAC;QACzB,MAAM,EAAE,CAAC,CAAC;QACV,MAAM,EAAE,CAAC,CAAC;QACV,QAAQ,EAAE,MAAM,CAAC;KACpB;CACJ;AAED,wBAAgB,uBAAuB,CACnC,KAAK,EAAE,CACH,OAAO,EAAE,SAAS,MAAM,EAAE,EAC1B,MAAM,EAAE,WAAW,GAAG,SAAS,KAC9B,OAAO,CAAC,uBAAuB,CAAC,GACtC,uBAAuB,
|
|
1
|
+
{"version":3,"file":"spawner.d.ts","sourceRoot":"","sources":["../../../../src/service/subprocess/shell/spawner.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,KAAK,EACR,WAAW,EACX,eAAe,EACf,cAAc,EACd,cAAc,EACjB,MAAM,yBAAyB,CAAC;AAGjC,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAQxD,MAAM,WAAW,uBAAuB;IACpC,IAAI,KAAK,IAAI,cAAc,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC,CAAC;IAEzD,IAAI,MAAM,IAAI,cAAc,CAAC,UAAU,CAAC,CAAC;IACzC,IAAI,MAAM,IAAI,cAAc,CAAC,UAAU,CAAC,CAAC;IAEzC,IAAI,MAAM,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAE9B,IAAI,IAAI,gBAAgB,CAAC,IAAI,CAAC,CAAC;CAClC;AAED,MAAM,MAAM,uBAAuB,GAAG,CAClC,OAAO,EAAE,MAAM,GAAG,SAAS,MAAM,EAAE,EACnC,MAAM,CAAC,EAAE,WAAW,KACnB,OAAO,CAAC,uBAAuB,CAAC,GACjC,oBAAoB,CAAC,IAAI,CACrB,uBAAuB,CAAC,UAAU,CAAC,UAAU,CAAC,EAC9C,uBAAuB,CAAC,UAAU,CAAC,MAAM,CAAC,CAC7C,CAAC;AAEN,yBAAiB,uBAAuB,CAAC;IACrC,UAAiB,UAAU,CAAC,CAAC;QACzB,MAAM,EAAE,CAAC,CAAC;QACV,MAAM,EAAE,CAAC,CAAC;QACV,QAAQ,EAAE,MAAM,CAAC;KACpB;CACJ;AAED,wBAAgB,uBAAuB,CACnC,KAAK,EAAE,CACH,OAAO,EAAE,SAAS,MAAM,EAAE,EAC1B,MAAM,EAAE,WAAW,GAAG,SAAS,KAC9B,OAAO,CAAC,uBAAuB,CAAC,GACtC,uBAAuB,CAgEzB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"spawner.js","sourceRoot":"","sources":["../../../../src/service/subprocess/shell/spawner.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAG5D,OAAO,EACH,iBAAiB,EACjB,iBAAiB,EACjB,YAAY,EACZ,aAAa,GAChB,MAAM,aAAa,CAAC;AA8BrB,MAAM,UAAU,uBAAuB,CACnC,KAGqC;IAErC,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACvB,MAAM,EAAE,cAAc,EAAE,CAAC;QAEzB,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;YAC9B,OAAO,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC;QACpC,CAAC;QAED,MAAM,cAAc,GAAG,KAAK,CACxB,OAAO,EACP,MAAM,CAKL,CAAC;QAEN,cAAc,CAAC,IAAI,GAAG,CAAC,OAAO,EAAE,EAAE;YAC9B,MAAM,WAAW,GAAG,cAAc,CAAC,IAAI,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;gBACtD,IAAI,CAAC;oBACD,MAAM,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;wBACnD,OAAO,EAAE,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC;wBACrC,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,aAAa,EAAE,CAAC;wBAC/C,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,aAAa,EAAE,CAAC;wBAC/C,OAAO,CAAC,MAAM;qBACjB,CAAC,CAAC;oBACH,OAAO;wBACH,MAAM;wBACN,MAAM;wBACN,QAAQ;
|
|
1
|
+
{"version":3,"file":"spawner.js","sourceRoot":"","sources":["../../../../src/service/subprocess/shell/spawner.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAG5D,OAAO,EACH,iBAAiB,EACjB,iBAAiB,EACjB,YAAY,EACZ,aAAa,GAChB,MAAM,aAAa,CAAC;AA8BrB,MAAM,UAAU,uBAAuB,CACnC,KAGqC;IAErC,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACvB,MAAM,EAAE,cAAc,EAAE,CAAC;QAEzB,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;YAC9B,OAAO,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC;QACpC,CAAC;QAED,MAAM,cAAc,GAAG,KAAK,CACxB,OAAO,EACP,MAAM,CAKL,CAAC;QAEN,cAAc,CAAC,IAAI,GAAG,CAAC,OAAO,EAAE,EAAE;YAC9B,MAAM,WAAW,GAAG,cAAc,CAAC,IAAI,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;gBACtD,IAAI,CAAC;oBACD,MAAM,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;wBACnD,OAAO,EAAE,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC;wBACrC,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,aAAa,EAAE,CAAC;wBAC/C,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,aAAa,EAAE,CAAC;wBAC/C,OAAO,CAAC,MAAM;qBACjB,CAAC,CAAC;oBACH,OAAO;wBACH,MAAM;wBACN,MAAM;wBACN,QAAQ;qBAGX,CAAC;gBACN,CAAC;wBAAS,CAAC;oBACP,MAAM,OAAO,CAAC,IAAI,EAAE,CAAC;gBACzB,CAAC;YACL,CAAC,CAAC,CAAC;YAEH,OAAO,iBAAiB,CACpB,KAAK,IAAI,EAAE;gBACP,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,WAAW,CAAC;gBAEvD,OAAO;oBACH,MAAM,EAAE,iBAAiB,CAAC,MAAM,CAAC;oBACjC,MAAM,EAAE,iBAAiB,CAAC,MAAM,CAAC;oBACjC,QAAQ;iBACX,CAAC;YACN,CAAC,EACD;gBACI,KAAK,CAAC,QAAQ;oBACV,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,WAAW,CAAC;oBAEvD,OAAO;wBACH,MAAM,EAAE,iBAAiB,CAAC,MAAM,CAAC;wBACjC,MAAM,EAAE,iBAAiB,CAAC,MAAM,CAAC;wBACjC,QAAQ;qBACX,CAAC;gBACN,CAAC;aACJ,CACJ,CAAC;QACN,CAAC,CAAC;QAEF,OAAO,cAAc,CAAC;IAC1B,CAAC,CAAC;AACN,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"push.d.ts","sourceRoot":"","sources":["../../../../src/service/sync/request/push.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAER,cAAc,EAEjB,MAAM,yBAAyB,CAAC;AACjC,OAAO,
|
|
1
|
+
{"version":3,"file":"push.d.ts","sourceRoot":"","sources":["../../../../src/service/sync/request/push.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAER,cAAc,EAEjB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAGH,eAAe,EAClB,MAAM,yBAAyB,CAAC;AAIjC,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAEtD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAMpD,eAAO,MAAM,aAAa,QAAY,CAAC;AAEvC,eAAO,MAAM,UAAU;;;;GAAkD,CAAC;AAE1E,MAAM,WAAW,WAAW;IACxB;;OAEG;IACH,QAAQ,EAAE,cAAc,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC,CAAC;IACtD;;OAEG;IACH,YAAY,EAAE,MAAM,CAAC;IACrB;;;;OAIG;IACH,WAAW,CAAC,EAAE,WAAW,CAAC,MAAM,GAAG,SAAS,CAAC;IAC7C;;;OAGG;IACH,eAAe,EAAE,MAAM,CAAC;CAC3B;AAgGD,MAAM,WAAW,aAAa;IAC1B,IAAI,EAAE,UAAU,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,aAAa,GAAG,SAAS,CAAC;IACjC,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CACnC;AAED,wBAAsB,MAAM,CAAC,EACzB,IAAI,EACJ,IAAI,EACJ,IAAyB,EACzB,UAAkB,EAClB,KAA+B,EAC/B,UAA0B,GAC7B,EAAE,aAAa,GAAG,OAAO,CAAC,WAAW,CAAC,CA2BtC;AAED,eAAO,MAAM,aAAa;;;;;;;;GAGzB,CAAC;AAEF,MAAM,WAAW,aAAc,SAAQ,aAAa;IAChD;;;;;;;;;OASG;IACH,WAAW,CAAC,EAAE,WAAW,CAAC,MAAM,GAAG,SAAS,CAAC;IAE7C;;;;;OAKG;IACH,MAAM,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;CAChC;AAED,wBAAsB,MAAM,CAAC,EACzB,IAAI,EACJ,IAAI,EACJ,IAAyB,EACzB,UAAkB,EAClB,KAA+B,EAC/B,UAA0B,EAC1B,WAAqC,EACrC,MAAc,GACjB,EAAE,aAAa,GAAG,OAAO,CAAC,WAAW,CAAC,CAmFtC;AAED,MAAM,WAAW,WAAY,SAAQ,aAAa;IAC9C,OAAO,EAAE,CAAC,GAAG,CAAC,CAAC;CAClB;AAED,wBAAgB,IAAI,CAAC,OAAO,EAAE,WAAW,wBAiBxC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { PromiseResolver } from "@yume-chan/async";
|
|
2
|
-
import { DistributionStream, MaybeConsumable } from "@yume-chan/stream-extra";
|
|
2
|
+
import { DelayedCloseWritableStream, DistributionStream, MaybeConsumable, } from "@yume-chan/stream-extra";
|
|
3
3
|
import { struct, u32 } from "@yume-chan/struct";
|
|
4
4
|
import { NOOP } from "../../../utils/no-op.js";
|
|
5
5
|
import { LinuxFileType } from "../android.js";
|
|
@@ -24,7 +24,7 @@ class SendWritableStream extends MaybeConsumable.WritableStream {
|
|
|
24
24
|
start: (controller_) => {
|
|
25
25
|
controller = controller_;
|
|
26
26
|
// Start reading response immediately,
|
|
27
|
-
// the server
|
|
27
|
+
// the server may send error response before the whole file is sent.
|
|
28
28
|
socket.readResponse(ResponseId.Ok, OkResponse).then(() => this.#finish(), (e) => this.#finish(e));
|
|
29
29
|
},
|
|
30
30
|
write: async (chunk) => {
|
|
@@ -81,9 +81,13 @@ class SendWritableStream extends MaybeConsumable.WritableStream {
|
|
|
81
81
|
}
|
|
82
82
|
}
|
|
83
83
|
catch (e) {
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
84
|
+
const finalError =
|
|
85
|
+
// Use SuppressedError if available and there is an existing error.
|
|
86
|
+
error && typeof SuppressedError !== "undefined"
|
|
87
|
+
? new SuppressedError(e, error)
|
|
88
|
+
: e;
|
|
89
|
+
this.#trySetError(finalError);
|
|
90
|
+
this.#resolver.reject(finalError);
|
|
87
91
|
}
|
|
88
92
|
}
|
|
89
93
|
}
|
|
@@ -100,9 +104,8 @@ export async function sendV1({ pool, path, type = LinuxFileType.File, permission
|
|
|
100
104
|
}
|
|
101
105
|
const distributeStream = new DistributionStream(packetSize, true);
|
|
102
106
|
const sendStream = new SendWritableStream(pool, socket, mtime);
|
|
103
|
-
void distributeStream.readable.pipeTo(sendStream).catch(NOOP);
|
|
104
107
|
return {
|
|
105
|
-
writable: distributeStream.writable,
|
|
108
|
+
writable: new DelayedCloseWritableStream(distributeStream.writable, distributeStream.readable.pipeTo(sendStream)),
|
|
106
109
|
get bytesWritten() {
|
|
107
110
|
return sendStream.bytesWritten;
|
|
108
111
|
},
|
|
@@ -149,18 +152,8 @@ export async function sendV2({ pool, path, type = LinuxFileType.File, permission
|
|
|
149
152
|
const distributeStream = new DistributionStream(packetSize, true);
|
|
150
153
|
const sendStream = new SendWritableStream(pool, socket, mtime);
|
|
151
154
|
if (!compressStream) {
|
|
152
|
-
const pipe = distributeStream.readable.pipeTo(sendStream);
|
|
153
|
-
const writer = distributeStream.writable.getWriter();
|
|
154
155
|
return {
|
|
155
|
-
writable: new
|
|
156
|
-
write(chunk) {
|
|
157
|
-
return writer.write(chunk);
|
|
158
|
-
},
|
|
159
|
-
async close() {
|
|
160
|
-
await writer.close();
|
|
161
|
-
await pipe;
|
|
162
|
-
},
|
|
163
|
-
}),
|
|
156
|
+
writable: new DelayedCloseWritableStream(distributeStream.writable, distributeStream.readable.pipeTo(sendStream)),
|
|
164
157
|
get bytesWritten() {
|
|
165
158
|
return sendStream.bytesWritten;
|
|
166
159
|
},
|
|
@@ -170,22 +163,15 @@ export async function sendV2({ pool, path, type = LinuxFileType.File, permission
|
|
|
170
163
|
},
|
|
171
164
|
};
|
|
172
165
|
}
|
|
173
|
-
const pipe = compressStream.readable
|
|
174
|
-
.pipeThrough(distributeStream)
|
|
175
|
-
.pipeTo(sendStream);
|
|
176
|
-
const writer = compressStream.writable.getWriter();
|
|
177
166
|
let bytesWritten = 0;
|
|
178
167
|
return {
|
|
179
|
-
writable: new MaybeConsumable.
|
|
168
|
+
writable: new DelayedCloseWritableStream(new MaybeConsumable.WrapWritableStream(compressStream.writable, {
|
|
180
169
|
write(chunk) {
|
|
181
170
|
bytesWritten += chunk.length;
|
|
182
|
-
return writer.write(chunk);
|
|
183
171
|
},
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
},
|
|
188
|
-
}),
|
|
172
|
+
}), compressStream.readable
|
|
173
|
+
.pipeThrough(distributeStream)
|
|
174
|
+
.pipeTo(sendStream)),
|
|
189
175
|
get bytesWritten() {
|
|
190
176
|
return bytesWritten;
|
|
191
177
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"push.js","sourceRoot":"","sources":["../../../../src/service/sync/request/push.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAMnD,OAAO,
|
|
1
|
+
{"version":3,"file":"push.js","sourceRoot":"","sources":["../../../../src/service/sync/request/push.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@yume-chan/adb",
|
|
3
|
-
"version": "3.0.0-beta.
|
|
3
|
+
"version": "3.0.0-beta.3",
|
|
4
4
|
"description": "TypeScript implementation of Android Debug Bridge (ADB) protocol.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"adb",
|
|
@@ -27,13 +27,13 @@
|
|
|
27
27
|
"sideEffects": false,
|
|
28
28
|
"dependencies": {
|
|
29
29
|
"@yume-chan/async": "^4.1.3",
|
|
30
|
-
"@yume-chan/
|
|
31
|
-
"@yume-chan/
|
|
32
|
-
"@yume-chan/
|
|
33
|
-
"@yume-chan/
|
|
30
|
+
"@yume-chan/event": "3.0.0-beta.3",
|
|
31
|
+
"@yume-chan/struct": "3.0.0-beta.3",
|
|
32
|
+
"@yume-chan/no-data-view": "3.0.0-beta.3",
|
|
33
|
+
"@yume-chan/stream-extra": "3.0.0-beta.3"
|
|
34
34
|
},
|
|
35
35
|
"devDependencies": {
|
|
36
|
-
"@types/node": "^26.
|
|
36
|
+
"@types/node": "^26.5.1",
|
|
37
37
|
"prettier": "^3.9.6",
|
|
38
38
|
"typescript": "^6.0.3",
|
|
39
39
|
"@yume-chan/eslint-config": "^1.0.0",
|
package/src/banner.ts
CHANGED
|
@@ -21,8 +21,7 @@ export class AdbBanner {
|
|
|
21
21
|
const pieces = banner.split("::");
|
|
22
22
|
if (pieces.length > 1) {
|
|
23
23
|
state = (pieces[0]!.trim() || undefined) as
|
|
24
|
-
|
|
25
|
-
| undefined;
|
|
24
|
+
AdbServerClient.ConnectionState | undefined;
|
|
26
25
|
const props = pieces[1]!;
|
|
27
26
|
for (const prop of props.split(";")) {
|
|
28
27
|
// istanbul ignore if
|
package/src/daemon/crypto.ts
CHANGED
|
@@ -18,10 +18,12 @@ export function getBigUint(
|
|
|
18
18
|
): bigint {
|
|
19
19
|
let result = 0n;
|
|
20
20
|
|
|
21
|
-
//
|
|
22
|
-
|
|
21
|
+
// The leading bytes that do not fill a whole 64-bit word.
|
|
22
|
+
for (let j = 0; j < length % 8; j += 1) {
|
|
23
|
+
result = (result << 8n) | BigInt(array[byteOffset + j]!);
|
|
24
|
+
}
|
|
23
25
|
|
|
24
|
-
for (let i = byteOffset; i < byteOffset + length; i += 8) {
|
|
26
|
+
for (let i = byteOffset + (length % 8); i < byteOffset + length; i += 8) {
|
|
25
27
|
result <<= 64n;
|
|
26
28
|
const value = getUint64BigEndian(array, i);
|
|
27
29
|
result |= value;
|
|
@@ -73,14 +75,6 @@ export interface SimpleRsaPrivateKey {
|
|
|
73
75
|
d: bigint;
|
|
74
76
|
}
|
|
75
77
|
|
|
76
|
-
// These values are correct only if
|
|
77
|
-
// modulus length is 2048 and
|
|
78
|
-
// public exponent (e) is 65537
|
|
79
|
-
// Anyway, that's how this library generates keys
|
|
80
|
-
|
|
81
|
-
// To support other parameters,
|
|
82
|
-
// a proper ASN.1 parser can be used
|
|
83
|
-
|
|
84
78
|
// References:
|
|
85
79
|
//
|
|
86
80
|
// https://tools.ietf.org/html/rfc8017#appendix-A.1.2
|
|
@@ -94,20 +88,68 @@ export interface SimpleRsaPrivateKey {
|
|
|
94
88
|
// https://www.itu.int/rec/T-REC-X.690-201508-I/en
|
|
95
89
|
// X.690: Specification of Distinguished Encoding Rules (DER)
|
|
96
90
|
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
91
|
+
/**
|
|
92
|
+
* One DER tag-length-value header: where its content starts and how long it is.
|
|
93
|
+
* @param data The DER-encoded data.
|
|
94
|
+
* @param offset The offset of the header in the data.
|
|
95
|
+
* @returns The content offset and length.
|
|
96
|
+
*/
|
|
97
|
+
function derHeader(
|
|
98
|
+
data: Uint8Array,
|
|
99
|
+
offset: number,
|
|
100
|
+
): { offset: number; length: number } {
|
|
101
|
+
offset = offset + 1; // Only low-tag-number forms occur in a PKCS #8 RSA key.
|
|
102
|
+
|
|
103
|
+
let length = data[offset]!;
|
|
104
|
+
offset += 1;
|
|
105
|
+
|
|
106
|
+
if (length & 0x80) {
|
|
107
|
+
const lengthBytes = length & 0x7f;
|
|
108
|
+
length = 0;
|
|
109
|
+
for (let i = 0; i < lengthBytes; i += 1) {
|
|
110
|
+
length = (length << 8) | data[offset]!;
|
|
111
|
+
offset += 1;
|
|
112
|
+
}
|
|
107
113
|
}
|
|
108
114
|
|
|
109
|
-
|
|
110
|
-
|
|
115
|
+
return { offset, length };
|
|
116
|
+
}
|
|
117
|
+
|
|
118
|
+
export function rsaParsePrivateKey(key: Uint8Array): SimpleRsaPrivateKey {
|
|
119
|
+
// PrivateKeyInfo ::= SEQUENCE {
|
|
120
|
+
// version INTEGER,
|
|
121
|
+
// privateKeyAlgorithm AlgorithmIdentifier,
|
|
122
|
+
// privateKey OCTET STRING -- wrapping an RSAPrivateKey
|
|
123
|
+
// }
|
|
124
|
+
// RSAPrivateKey ::= SEQUENCE {
|
|
125
|
+
// version Version,
|
|
126
|
+
// modulus INTEGER, -- n
|
|
127
|
+
// publicExponent INTEGER, -- e
|
|
128
|
+
// privateExponent INTEGER -- d
|
|
129
|
+
// -- ... other fields omitted
|
|
130
|
+
// }
|
|
131
|
+
|
|
132
|
+
let offset = derHeader(key, 0).offset; // into PrivateKeyInfo
|
|
133
|
+
|
|
134
|
+
let header = derHeader(key, offset); // skip version
|
|
135
|
+
offset = header.offset + header.length;
|
|
136
|
+
header = derHeader(key, offset); // skip privateKeyAlgorithm
|
|
137
|
+
offset = header.offset + header.length;
|
|
138
|
+
|
|
139
|
+
offset = derHeader(key, offset).offset; // into OCTET STRING
|
|
140
|
+
offset = derHeader(key, offset).offset; // into RSAPrivateKey
|
|
141
|
+
|
|
142
|
+
header = derHeader(key, offset); // skip version
|
|
143
|
+
offset = header.offset + header.length;
|
|
144
|
+
|
|
145
|
+
const nHeader = derHeader(key, offset); // get modulus
|
|
146
|
+
offset = nHeader.offset + nHeader.length;
|
|
147
|
+
const eHeader = derHeader(key, offset); // skip publicExponent
|
|
148
|
+
offset = eHeader.offset + eHeader.length;
|
|
149
|
+
const dHeader = derHeader(key, offset); // get privateExponent
|
|
150
|
+
|
|
151
|
+
const n = getBigUint(key, nHeader.offset, nHeader.length);
|
|
152
|
+
const d = getBigUint(key, dHeader.offset, dHeader.length);
|
|
111
153
|
return { n, d };
|
|
112
154
|
}
|
|
113
155
|
|
package/src/server/client.ts
CHANGED
|
@@ -510,7 +510,11 @@ export class AdbServerClient {
|
|
|
510
510
|
disconnected,
|
|
511
511
|
);
|
|
512
512
|
|
|
513
|
-
|
|
513
|
+
const abortDisconnectWait = () => waitAbortController.abort();
|
|
514
|
+
void transport.disconnected.then(
|
|
515
|
+
abortDisconnectWait,
|
|
516
|
+
abortDisconnectWait,
|
|
517
|
+
);
|
|
514
518
|
|
|
515
519
|
return transport;
|
|
516
520
|
}
|
|
@@ -78,7 +78,9 @@ export function adbShellProtocolSpawner(
|
|
|
78
78
|
stdout,
|
|
79
79
|
stderr,
|
|
80
80
|
exitCode,
|
|
81
|
-
} satisfies AdbShellProtocolSpawner.WaitResult<
|
|
81
|
+
} satisfies AdbShellProtocolSpawner.WaitResult<
|
|
82
|
+
Uint8Array[]
|
|
83
|
+
>;
|
|
82
84
|
} finally {
|
|
83
85
|
await process.kill();
|
|
84
86
|
}
|
|
@@ -4,7 +4,11 @@ import type {
|
|
|
4
4
|
WritableStream,
|
|
5
5
|
WritableStreamDefaultController,
|
|
6
6
|
} from "@yume-chan/stream-extra";
|
|
7
|
-
import {
|
|
7
|
+
import {
|
|
8
|
+
DelayedCloseWritableStream,
|
|
9
|
+
DistributionStream,
|
|
10
|
+
MaybeConsumable,
|
|
11
|
+
} from "@yume-chan/stream-extra";
|
|
8
12
|
import { struct, u32 } from "@yume-chan/struct";
|
|
9
13
|
|
|
10
14
|
import { NOOP } from "../../../utils/no-op.js";
|
|
@@ -63,7 +67,7 @@ class SendWritableStream extends MaybeConsumable.WritableStream<Uint8Array> {
|
|
|
63
67
|
controller = controller_;
|
|
64
68
|
|
|
65
69
|
// Start reading response immediately,
|
|
66
|
-
// the server
|
|
70
|
+
// the server may send error response before the whole file is sent.
|
|
67
71
|
socket.readResponse(ResponseId.Ok, OkResponse).then(
|
|
68
72
|
() => this.#finish(),
|
|
69
73
|
(e) => this.#finish(e),
|
|
@@ -126,9 +130,13 @@ class SendWritableStream extends MaybeConsumable.WritableStream<Uint8Array> {
|
|
|
126
130
|
this.#resolver.resolve();
|
|
127
131
|
}
|
|
128
132
|
} catch (e) {
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
133
|
+
const finalError =
|
|
134
|
+
// Use SuppressedError if available and there is an existing error.
|
|
135
|
+
error && typeof SuppressedError !== "undefined"
|
|
136
|
+
? new SuppressedError(e, error)
|
|
137
|
+
: e;
|
|
138
|
+
this.#trySetError(finalError);
|
|
139
|
+
this.#resolver.reject(finalError);
|
|
132
140
|
}
|
|
133
141
|
}
|
|
134
142
|
}
|
|
@@ -163,10 +171,12 @@ export async function sendV1({
|
|
|
163
171
|
|
|
164
172
|
const distributeStream = new DistributionStream(packetSize, true);
|
|
165
173
|
const sendStream = new SendWritableStream(pool, socket, mtime);
|
|
166
|
-
void distributeStream.readable.pipeTo(sendStream).catch(NOOP);
|
|
167
174
|
|
|
168
175
|
return {
|
|
169
|
-
writable:
|
|
176
|
+
writable: new DelayedCloseWritableStream(
|
|
177
|
+
distributeStream.writable,
|
|
178
|
+
distributeStream.readable.pipeTo(sendStream),
|
|
179
|
+
),
|
|
170
180
|
get bytesWritten() {
|
|
171
181
|
return sendStream.bytesWritten;
|
|
172
182
|
},
|
|
@@ -260,19 +270,11 @@ export async function sendV2({
|
|
|
260
270
|
const sendStream = new SendWritableStream(pool, socket, mtime);
|
|
261
271
|
|
|
262
272
|
if (!compressStream) {
|
|
263
|
-
const pipe = distributeStream.readable.pipeTo(sendStream);
|
|
264
|
-
|
|
265
|
-
const writer = distributeStream.writable.getWriter();
|
|
266
273
|
return {
|
|
267
|
-
writable: new
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
async close() {
|
|
272
|
-
await writer.close();
|
|
273
|
-
await pipe;
|
|
274
|
-
},
|
|
275
|
-
}),
|
|
274
|
+
writable: new DelayedCloseWritableStream(
|
|
275
|
+
distributeStream.writable,
|
|
276
|
+
distributeStream.readable.pipeTo(sendStream),
|
|
277
|
+
),
|
|
276
278
|
get bytesWritten() {
|
|
277
279
|
return sendStream.bytesWritten;
|
|
278
280
|
},
|
|
@@ -283,23 +285,18 @@ export async function sendV2({
|
|
|
283
285
|
};
|
|
284
286
|
}
|
|
285
287
|
|
|
286
|
-
const pipe = compressStream.readable
|
|
287
|
-
.pipeThrough(distributeStream)
|
|
288
|
-
.pipeTo(sendStream);
|
|
289
|
-
|
|
290
|
-
const writer = compressStream.writable.getWriter();
|
|
291
288
|
let bytesWritten = 0;
|
|
292
289
|
return {
|
|
293
|
-
writable: new
|
|
294
|
-
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
|
|
298
|
-
|
|
299
|
-
|
|
300
|
-
|
|
301
|
-
|
|
302
|
-
|
|
290
|
+
writable: new DelayedCloseWritableStream(
|
|
291
|
+
new MaybeConsumable.WrapWritableStream(compressStream.writable, {
|
|
292
|
+
write(chunk) {
|
|
293
|
+
bytesWritten += chunk.length;
|
|
294
|
+
},
|
|
295
|
+
}),
|
|
296
|
+
compressStream.readable
|
|
297
|
+
.pipeThrough(distributeStream)
|
|
298
|
+
.pipeTo(sendStream),
|
|
299
|
+
),
|
|
303
300
|
get bytesWritten() {
|
|
304
301
|
return bytesWritten;
|
|
305
302
|
},
|
package/esm/banner.spec.d.ts
DELETED
package/esm/banner.spec.d.ts.map
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"banner.spec.d.ts","sourceRoot":"","sources":["../src/banner.spec.ts"],"names":[],"mappings":""}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"packet-processor.spec.d.ts","sourceRoot":"","sources":["../../../src/daemon/auth/packet-processor.spec.ts"],"names":[],"mappings":""}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"public-key.spec.d.ts","sourceRoot":"","sources":["../../../src/daemon/auth/public-key.spec.ts"],"names":[],"mappings":""}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"crypto.spec.d.ts","sourceRoot":"","sources":["../../src/daemon/crypto.spec.ts"],"names":[],"mappings":""}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"client.spec.d.ts","sourceRoot":"","sources":["../../src/server/client.spec.ts"],"names":[],"mappings":""}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"response.spec.d.ts","sourceRoot":"","sources":["../../../src/service/reverse/response.spec.ts"],"names":[],"mappings":""}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"process.spec.d.ts","sourceRoot":"","sources":["../../../../src/service/subprocess/none/process.spec.ts"],"names":[],"mappings":""}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"spawner.spec.d.ts","sourceRoot":"","sources":["../../../../src/service/subprocess/none/spawner.spec.ts"],"names":[],"mappings":""}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"process.spec.d.ts","sourceRoot":"","sources":["../../../../src/service/subprocess/shell/process.spec.ts"],"names":[],"mappings":""}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"shared.spec.d.ts","sourceRoot":"","sources":["../../../../src/service/subprocess/shell/shared.spec.ts"],"names":[],"mappings":""}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"spawner.spec.d.ts","sourceRoot":"","sources":["../../../../src/service/subprocess/shell/spawner.spec.ts"],"names":[],"mappings":""}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"utils.spec.d.ts","sourceRoot":"","sources":["../../../src/service/subprocess/utils.spec.ts"],"names":[],"mappings":""}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"socket-pool.spec.d.ts","sourceRoot":"","sources":["../../../src/service/sync/socket-pool.spec.ts"],"names":[],"mappings":""}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"socket.spec.d.ts","sourceRoot":"","sources":["../../../src/service/sync/socket.spec.ts"],"names":[],"mappings":""}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"base64.spec.d.ts","sourceRoot":"","sources":["../../src/utils/base64.spec.ts"],"names":[],"mappings":""}
|
package/esm/utils/md5.spec.d.ts
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"md5.spec.d.ts","sourceRoot":"","sources":["../../src/utils/md5.spec.ts"],"names":[],"mappings":""}
|
|
Binary file
|