@linxin666/dsh-remote-web-ui 0.2.0 → 0.2.1

package/src/tunnel.ts

@@ -86,6 +86,9 @@ export class TunnelManager {
   private urlTimer: unknown | undefined
   private restartTimer: unknown | undefined
   private attempts = 0
+  // Generation counter: a stale ensureBinary resolution from an earlier
+  // start() must not spawn a second handle after a stop/start cycle.
+  private generation = 0
   private stopping = false
   private readonly urlListeners = new Set<(url: string) => void>()
   private readonly phaseListeners = new Set<(info: TunnelInfo) => void>()
@@ -123,6 +126,7 @@ export class TunnelManager {
     this.stopping = false
     this.targetUrl = targetUrl
     this.attempts = 0
+    this.generation += 1
     this.attempt()
   }
 
@@ -153,12 +157,13 @@ export class TunnelManager {
 
   private attempt(): void {
     if (this.stopping || this.targetUrl === undefined) return
+    const gen = this.generation
     this.setPhase('starting')
     this.handle = undefined
     this.url = undefined
     this.error = undefined
     void this.ensureBinary().then(() => {
-      if (this.stopping || this.targetUrl === undefined) return
+      if (this.stopping || this.targetUrl === undefined || gen !== this.generation) return
       const handle = this.factory(this.targetUrl)
       this.handle = handle
       this.urlTimer = this.timer.setTimeout(() => {
@@ -181,7 +186,7 @@ export class TunnelManager {
       })
     }).catch((value: unknown) => {
       // Binary install failed (no network, no platform build): report it.
-      if (this.stopping || this.targetUrl === undefined) return
+      if (this.stopping || this.targetUrl === undefined || gen !== this.generation) return
       const message = value instanceof Error ? value.message : String(value)
       this.fail(`could not obtain the cloudflared binary: ${message}`)
     })

package/src/update.ts

@@ -280,14 +280,14 @@ function familyUpdatePackages(
  */
 export async function fetchLatestVersion(
   name: string,
-  fetchImpl: (url: string) => Promise<{ ok: boolean; json(): Promise<unknown> }>,
+  fetchImpl: (url: string, init?: RequestInit) => Promise<{ ok: boolean; json(): Promise<unknown> }>,
   timeoutMs = 10_000,
 ): Promise<string | undefined> {
   try {
     const controller = new AbortController()
     const timer = setTimeout(() => { controller.abort() }, timeoutMs)
     try {
-      const response = await fetchImpl(NPM_REGISTRY + '/' + name.replace('/', '%2F') + '/latest')
+      const response = await fetchImpl(NPM_REGISTRY + '/' + name.replace('/', '%2F') + '/latest', { signal: controller.signal })
       if (!response.ok) return undefined
       const body = await response.json()
       if (typeof body !== 'object' || body === null) return undefined