@8bitbish/screenshot-service 1.0.1 → 1.0.2
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/dist/setup/pair.d.ts.map +1 -1
- package/dist/setup/pair.js +65 -2
- package/dist/setup/pair.js.map +1 -1
- package/package.json +1 -1
package/dist/setup/pair.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pair.d.ts","sourceRoot":"","sources":["../../setup/pair.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"pair.d.ts","sourceRoot":"","sources":["../../setup/pair.ts"],"names":[],"mappings":"AAMA,OAAO,EACL,kBAAkB,EAElB,qBAAqB,EACtB,MAAM,SAAS,CAAC;AAgDjB;;;;;;;;;;;GAWG;AACH,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,kBAAkB,EACxB,UAAU,CAAC,EAAE,qBAAqB,GACjC,OAAO,CAAC,IAAI,CAAC,CA8Hf;AAED,wFAAwF;AACxF,wBAAgB,sBAAsB,IAAI,MAAM,GAAG,IAAI,CAOtD"}
|
package/dist/setup/pair.js
CHANGED
|
@@ -3,11 +3,49 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.pairAndroidWireless = pairAndroidWireless;
|
|
4
4
|
exports.getLastAndroidEndpoint = getLastAndroidEndpoint;
|
|
5
5
|
const child_process_1 = require("child_process");
|
|
6
|
+
const util_1 = require("util");
|
|
6
7
|
const fs_1 = require("fs");
|
|
7
8
|
const os_1 = require("os");
|
|
8
9
|
const path_1 = require("path");
|
|
9
10
|
const detect_1 = require("./detect");
|
|
11
|
+
const execFileAsync = (0, util_1.promisify)(child_process_1.execFile);
|
|
10
12
|
const ANDROID_IP_FILE = (0, path_1.join)((0, os_1.homedir)(), ".screenshotAssistent-android-ip");
|
|
13
|
+
/**
|
|
14
|
+
* After Wireless Debugging pairing, the phone exposes its data port via mDNS as
|
|
15
|
+
* `_adb-tls-connect._tcp`. Pairing port and connect port are DIFFERENT — the
|
|
16
|
+
* connect port is dynamic and shown on the main Wireless Debugging screen.
|
|
17
|
+
* Polls `adb mdns services` for up to `timeoutMs` waiting for the entry to appear.
|
|
18
|
+
*/
|
|
19
|
+
async function discoverConnectPort(adb, ip, timeoutMs = 8000) {
|
|
20
|
+
const portRegex = new RegExp(ip.replace(/\./g, "\\.") + ":(\\d+)");
|
|
21
|
+
const deadline = Date.now() + timeoutMs;
|
|
22
|
+
while (Date.now() < deadline) {
|
|
23
|
+
try {
|
|
24
|
+
const { stdout } = await execFileAsync(adb, ["mdns", "services"], { timeout: 3000 });
|
|
25
|
+
for (const line of stdout.split("\n")) {
|
|
26
|
+
if (line.includes("_adb-tls-connect") && line.includes(ip)) {
|
|
27
|
+
const m = line.match(portRegex);
|
|
28
|
+
if (m)
|
|
29
|
+
return m[1];
|
|
30
|
+
}
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
catch { }
|
|
34
|
+
await new Promise(r => setTimeout(r, 500));
|
|
35
|
+
}
|
|
36
|
+
return null;
|
|
37
|
+
}
|
|
38
|
+
/** Returns the port if `<ip>` already appears as a connected device, else null. */
|
|
39
|
+
async function findExistingConnection(adb, ip) {
|
|
40
|
+
try {
|
|
41
|
+
const { stdout } = await execFileAsync(adb, ["devices"], { timeout: 3000, encoding: "utf8" });
|
|
42
|
+
const m = stdout.match(new RegExp("^" + ip.replace(/\./g, "\\.") + ":(\\d+)\\s+device", "m"));
|
|
43
|
+
if (m)
|
|
44
|
+
return m[1];
|
|
45
|
+
}
|
|
46
|
+
catch { }
|
|
47
|
+
return null;
|
|
48
|
+
}
|
|
11
49
|
function emitStep(cb, patch) {
|
|
12
50
|
const p = { ...patch };
|
|
13
51
|
cb?.(p);
|
|
@@ -26,7 +64,7 @@ function emitStep(cb, patch) {
|
|
|
26
64
|
* 3. Saves the IP for auto-reconnect on subsequent screenshots.
|
|
27
65
|
*/
|
|
28
66
|
async function pairAndroidWireless(opts, onProgress) {
|
|
29
|
-
const { ip, port, code, connectPort
|
|
67
|
+
const { ip, port, code, connectPort: userConnectPort } = opts;
|
|
30
68
|
if (!/^\d+\.\d+\.\d+\.\d+$/.test(ip))
|
|
31
69
|
throw new Error(`Invalid IP address: ${ip}`);
|
|
32
70
|
if (!/^\d+$/.test(port))
|
|
@@ -75,9 +113,34 @@ async function pairAndroidWireless(opts, onProgress) {
|
|
|
75
113
|
});
|
|
76
114
|
emitStep(onProgress, { ...pair, status: "done" });
|
|
77
115
|
// ── Step 2: connect ───────────────────────────────────────────────────────
|
|
116
|
+
// The pairing port is dead now. The persistent connect port is different
|
|
117
|
+
// (shown on the main Wireless Debugging screen) and is also broadcast via
|
|
118
|
+
// mDNS as `_adb-tls-connect._tcp`. Discover it automatically.
|
|
78
119
|
let connect = emitStep(onProgress, {
|
|
79
|
-
id: "connect", label:
|
|
120
|
+
id: "connect", label: "Detecting connection port…", status: "running", index: 2, total: TOTAL,
|
|
80
121
|
});
|
|
122
|
+
let connectPort = userConnectPort ?? null;
|
|
123
|
+
// 1. Did mDNS auto-connect us already? (Android 11+ often does this immediately after pairing.)
|
|
124
|
+
if (!connectPort) {
|
|
125
|
+
const existing = await findExistingConnection(adb, ip);
|
|
126
|
+
if (existing) {
|
|
127
|
+
(0, fs_1.writeFileSync)(ANDROID_IP_FILE, `${ip}:${existing}`, "utf8");
|
|
128
|
+
emitStep(onProgress, { ...connect, status: "done", label: `Connected on ${ip}:${existing}` });
|
|
129
|
+
return;
|
|
130
|
+
}
|
|
131
|
+
}
|
|
132
|
+
// 2. Discover via mDNS.
|
|
133
|
+
if (!connectPort) {
|
|
134
|
+
onProgress?.({ ...connect, log: "Looking for the device on the network (mDNS)…" });
|
|
135
|
+
connectPort = await discoverConnectPort(adb, ip);
|
|
136
|
+
}
|
|
137
|
+
// 3. If discovery fails, surface a clear error pointing the user at the right place.
|
|
138
|
+
if (!connectPort) {
|
|
139
|
+
throw new Error("Couldn't auto-detect the connection port for " + ip + ".\n" +
|
|
140
|
+
"Open Settings → Developer Options → Wireless Debugging on your phone (NOT the pairing sub-screen) and " +
|
|
141
|
+
"note the port shown next to the IP at the top — that's the connect port. Then retry.");
|
|
142
|
+
}
|
|
143
|
+
emitStep(onProgress, { ...connect, label: `Connecting to ${ip}:${connectPort}` });
|
|
81
144
|
await new Promise((resolve, reject) => {
|
|
82
145
|
const child = (0, child_process_1.spawn)(adb, ["connect", `${ip}:${connectPort}`], { stdio: ["ignore", "pipe", "pipe"] });
|
|
83
146
|
const lines = [];
|
package/dist/setup/pair.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pair.js","sourceRoot":"","sources":["../../setup/pair.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"pair.js","sourceRoot":"","sources":["../../setup/pair.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@8bitbish/screenshot-service",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.2",
|
|
4
4
|
"description": "Capture screenshots and recordings from connected iPhone and Android devices, with a built-in visual setup wizard.",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|