dsh-relay-phone 0.11.3 → 0.11.4
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/package.json +1 -1
- package/src/index.js +0 -18
- package/src/pump.js +8 -17
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "dsh-relay-phone",
|
|
3
|
-
"version": "0.11.
|
|
3
|
+
"version": "0.11.4",
|
|
4
4
|
"description": "Remote-control your local DeepSeek Harness from a phone through your own zero-knowledge relay: phone-first page, QR pairing, end-to-end encryption, approvals, full desktop UI fallback.",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "src/index.js",
|
package/src/index.js
CHANGED
|
@@ -165,23 +165,6 @@ export default class RelayBridgeService extends Service {
|
|
|
165
165
|
}
|
|
166
166
|
}
|
|
167
167
|
|
|
168
|
-
/**
|
|
169
|
-
* The root token DSH 0.2 wants on the index exchange. A browser that opens the
|
|
170
|
-
* desktop UI locally already has it in its URL; one arriving through the relay
|
|
171
|
-
* does not, which is why that shell used to come back unauthenticated.
|
|
172
|
-
*/
|
|
173
|
-
upstreamIndexToken() {
|
|
174
|
-
const connection = this.ctx.get('connection')
|
|
175
|
-
if (!connection || typeof connection.authenticatedUrl !== 'function') return null
|
|
176
|
-
try {
|
|
177
|
-
const target = this.upstreamTarget()
|
|
178
|
-
const url = new URL(connection.authenticatedUrl(`${target.protocol}//${target.authority}/`))
|
|
179
|
-
return url.searchParams.get('token')
|
|
180
|
-
} catch {
|
|
181
|
-
return null
|
|
182
|
-
}
|
|
183
|
-
}
|
|
184
|
-
|
|
185
168
|
mergeConfig(base, stored) {
|
|
186
169
|
return {
|
|
187
170
|
relayScheme: stored.relayScheme ?? base.relayScheme ?? 'http',
|
|
@@ -236,7 +219,6 @@ export default class RelayBridgeService extends Service {
|
|
|
236
219
|
dshPort: this.config.dshPort,
|
|
237
220
|
resolveTarget: () => this.upstreamTarget(),
|
|
238
221
|
resolveAuthCookie: () => this.upstreamAuthCookie(),
|
|
239
|
-
resolveIndexToken: () => this.upstreamIndexToken(),
|
|
240
222
|
pairing: this.pairing,
|
|
241
223
|
cryptoBox: this.cryptoBox,
|
|
242
224
|
mobile: this.mobile,
|
package/src/pump.js
CHANGED
|
@@ -59,8 +59,6 @@ export class PumpManager {
|
|
|
59
59
|
protocol: 'http:',
|
|
60
60
|
}))
|
|
61
61
|
this.resolveAuthCookie = options.resolveAuthCookie ?? (() => null)
|
|
62
|
-
// Root token for DSH 0.2's index exchange; null on older hosts.
|
|
63
|
-
this.resolveIndexToken = options.resolveIndexToken ?? (() => null)
|
|
64
62
|
this.pairing = options.pairing // PairingService
|
|
65
63
|
this.cryptoBox = options.cryptoBox
|
|
66
64
|
this.client = options.client
|
|
@@ -580,6 +578,13 @@ export class PumpManager {
|
|
|
580
578
|
if (this.streams.get(sid)?.upstream !== upstream) return
|
|
581
579
|
stream.upstream = null
|
|
582
580
|
let out = normalizeResponse(stream.respBuffer)
|
|
581
|
+
// Documents are the only relayed requests a browser navigates to, so a
|
|
582
|
+
// status here explains "the desktop UI is blank" reports: a 401/302 means
|
|
583
|
+
// the host did not accept the session the pump injected.
|
|
584
|
+
if (stream.relay && stream.injectBoot) {
|
|
585
|
+
const status = out.toString('latin1').split('\r\n', 1)[0]
|
|
586
|
+
auditLog(`document ${status} cookie=${this.resolveAuthCookie() ? 'yes' : 'no'} path=${stream.info?.path ?? '?'}`)
|
|
587
|
+
}
|
|
583
588
|
if (stream.sealResponse) {
|
|
584
589
|
out = this.cryptoBox.seal(this.cryptoBox.envelopeKey, out)
|
|
585
590
|
this.respond(sid, 200, 'application/octet-stream', out, { 'x-relay-enc': '1' }, { keepAlive: stream.keepAlive })
|
|
@@ -643,21 +648,7 @@ export class PumpManager {
|
|
|
643
648
|
// Any inbound copy was dropped in the loop above, so a client cannot forge it.
|
|
644
649
|
rewritten.push('x-dsh-relay: 1')
|
|
645
650
|
if (authCookie) rewritten.push(`Cookie: ${authCookie}`)
|
|
646
|
-
|
|
647
|
-
// DSH 0.2 guards the index exchange with a root token, and the pump already
|
|
648
|
-
// uses that token to mint the API cookie. A browser arriving through the
|
|
649
|
-
// relay has no token of its own, so the desktop shell it received came back
|
|
650
|
-
// unauthenticated even though every later API call would have worked.
|
|
651
|
-
let requestLine = lines[0]
|
|
652
|
-
if (stream.relay && isDocument && !isUpgrade && info.path === '/') {
|
|
653
|
-
const token = this.resolveIndexToken()
|
|
654
|
-
if (token) {
|
|
655
|
-
const query = new URLSearchParams(info.query)
|
|
656
|
-
query.set('token', token)
|
|
657
|
-
requestLine = `${info.method} /?${query.toString()} ${info.version}`
|
|
658
|
-
}
|
|
659
|
-
}
|
|
660
|
-
const out = `${requestLine}\r\n${rewritten.join('\r\n')}\r\n\r\n`
|
|
651
|
+
const out = `${lines[0]}\r\n${rewritten.join('\r\n')}\r\n\r\n`
|
|
661
652
|
|
|
662
653
|
if (isUpgrade) {
|
|
663
654
|
const upstream = net.connect({ host: target.host, port: target.port })
|