@botpress/cli 6.8.1 → 6.8.3

package/dist/utils/tunnel-utils.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/utils/tunnel-utils.ts"],
-  "sourcesContent": ["import { TunnelTail, ClientCloseEvent, ClientErrorEvent, errors } from '@bpinternal/tunnel'\nimport { Logger } from '../logger'\nimport { EventEmitter } from './event-emitter'\n\nexport type ReconnectionTriggerEvent =\n  | {\n      type: 'init'\n      ev: null\n    }\n  | {\n      type: 'error'\n      ev: ClientErrorEvent\n    }\n  | {\n      type: 'close'\n      ev: ClientCloseEvent\n    }\n\nexport type ReconnectedEvent = {\n  tunnel: TunnelTail\n  ev: ReconnectionTriggerEvent\n}\n\nexport class ReconnectionFailedError extends Error {\n  public constructor(public readonly event: ReconnectionTriggerEvent) {\n    const reason = ReconnectionFailedError._reason(event)\n    super(`Reconnection failed: ${reason}`)\n  }\n\n  private static _reason(event: ReconnectionTriggerEvent): string {\n    if (event.type === 'error') {\n      return 'error'\n    }\n\n    if (event.type === 'close') {\n      return `${event.ev.code} ${event.ev.reason}`\n    }\n\n    return 'init'\n  }\n}\n\nexport class TunnelSupervisor {\n  private _tunnel?: TunnelTail\n  private _closed = false\n  private _started = false\n\n  public readonly events = new EventEmitter<{\n    connectionFailed: ReconnectionTriggerEvent\n    manuallyClosed: null\n    connected: {\n      tunnel: TunnelTail\n      ev: ReconnectionTriggerEvent\n    }\n  }>()\n\n  public constructor(\n    private _tunnelUrl: string,\n    private _tunnelId: string,\n    private _logger: Logger\n  ) {}\n\n  public async start(): Promise<void> {\n    if (this._closed) {\n      throw new Error('Cannot start: Tunnel is closed')\n    }\n    if (this._started) {\n      throw new Error('Cannot start: Tunnel is already started')\n    }\n\n    this._started = true\n    const tunnel = await this._reconnect({ type: 'init', ev: null })\n    this._tunnel = tunnel\n  }\n\n  public get closed(): boolean {\n    return this._closed\n  }\n\n  /**\n   * @returns Promise that rejects when a reconnection attempt fails and resolves when the tunnel is closed manually\n   */\n  public async wait(): Promise<void> {\n    if (this._closed) {\n      throw new Error('Cannot wait: Tunnel is closed')\n    }\n\n    return new Promise((resolve, reject) => {\n      this.events.on('connectionFailed', (ev) => {\n        reject(new ReconnectionFailedError(ev))\n      })\n\n      this.events.on('manuallyClosed', () => {\n        resolve()\n      })\n    })\n  }\n\n  public close(): void {\n    if (this._closed) {\n      return\n    }\n\n    this._closed = true\n    this._tunnel?.close()\n    this.events.emit('manuallyClosed', null)\n  }\n\n  private _reconnectSync(ev: ReconnectionTriggerEvent): void {\n    void this._reconnect(ev)\n      .then((t) => {\n        this._tunnel = t\n      })\n      .catch(() => this.events.emit('connectionFailed', ev))\n  }\n\n  private async _reconnect(ev: ReconnectionTriggerEvent): Promise<TunnelTail> {\n    const newTunnel = async () => {\n      const tunnel = await TunnelTail.new(this._tunnelUrl, this._tunnelId)\n      this._registerListeners(tunnel)\n      this.events.emit('connected', { tunnel, ev })\n      return tunnel\n    }\n\n    if (ev.type === 'init') {\n      // skip logging on the first connection attempt\n      return newTunnel()\n    }\n\n    const line = this._logger.line()\n    line.started('Reconnecting tunnel...')\n    const tunnel = await newTunnel()\n    line.success('Reconnected')\n    line.commit()\n    return tunnel\n  }\n\n  private _registerListeners(tunnel: TunnelTail) {\n    tunnel.events.on('error', ({ target, type }) => {\n      this._logger.error(`Tunnel error: ${type}`)\n      this._reconnectSync({ type: 'error', ev: { target, type } })\n    })\n    tunnel.events.on('close', ({ code, reason, target, type, wasClean }) => {\n      this._logger.error(`Tunnel closed: ${code} ${reason}`)\n\n      if (code === errors.CLOSE_CODES.TUNNEL_ID_CONFLICT) {\n        throw new Error('Cannot start: Tunnel Id is already used, choose a different tunnel id.')\n      }\n\n      this._reconnectSync({ type: 'close', ev: { code, reason, target, type, wasClean } })\n    })\n  }\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["import { TunnelTail, ClientCloseEvent, ClientErrorEvent, errors } from '@bpinternal/tunnel'\nimport { BotpressCLIError } from '../errors'\nimport { Logger } from '../logger'\nimport { EventEmitter } from './event-emitter'\n\nexport type ReconnectionTriggerEvent =\n  | {\n      type: 'init'\n      ev: null\n    }\n  | {\n      type: 'error'\n      ev: ClientErrorEvent\n    }\n  | {\n      type: 'close'\n      ev: ClientCloseEvent\n    }\n\nexport type ReconnectedEvent = {\n  tunnel: TunnelTail\n  ev: ReconnectionTriggerEvent\n}\n\nexport class ReconnectionFailedError extends Error {\n  public constructor(\n    public readonly event: ReconnectionTriggerEvent,\n    cause?: Error\n  ) {\n    const reason = ReconnectionFailedError._reason(event)\n    const message = cause ? `Reconnection failed: ${reason}: ${cause.message}` : `Reconnection failed: ${reason}`\n    const options = cause ? { cause } : undefined\n    super(message, options)\n  }\n\n  private static _reason(event: ReconnectionTriggerEvent): string {\n    if (event.type === 'error') {\n      return 'error'\n    }\n\n    if (event.type === 'close') {\n      return `${event.ev.code} ${event.ev.reason}`\n    }\n\n    return 'init'\n  }\n}\n\nexport class TunnelSupervisor {\n  private _tunnel?: TunnelTail\n  private _closed = false\n  private _started = false\n\n  public readonly events = new EventEmitter<{\n    connectionFailed: { ev: ReconnectionTriggerEvent; cause: Error }\n    manuallyClosed: null\n    connected: {\n      tunnel: TunnelTail\n      ev: ReconnectionTriggerEvent\n    }\n  }>()\n\n  public constructor(\n    private _tunnelUrl: string,\n    private _tunnelId: string,\n    private _logger: Logger\n  ) {}\n\n  public async start(): Promise<void> {\n    if (this._closed) {\n      throw new Error('Cannot start: Tunnel is closed')\n    }\n    if (this._started) {\n      throw new Error('Cannot start: Tunnel is already started')\n    }\n\n    this._started = true\n    const tunnel = await this._reconnect({ type: 'init', ev: null })\n    this._tunnel = tunnel\n  }\n\n  public get closed(): boolean {\n    return this._closed\n  }\n\n  /**\n   * @returns Promise that rejects when a reconnection attempt fails and resolves when the tunnel is closed manually\n   */\n  public async wait(): Promise<void> {\n    if (this._closed) {\n      throw new Error('Cannot wait: Tunnel is closed')\n    }\n\n    return new Promise((resolve, reject) => {\n      this.events.on('connectionFailed', ({ ev, cause }) => {\n        reject(new ReconnectionFailedError(ev, cause))\n      })\n\n      this.events.on('manuallyClosed', () => {\n        resolve()\n      })\n    })\n  }\n\n  public close(): void {\n    if (this._closed) {\n      return\n    }\n\n    this._closed = true\n    this._tunnel?.close()\n    this.events.emit('manuallyClosed', null)\n  }\n\n  private _reconnectSync(ev: ReconnectionTriggerEvent): void {\n    void this._reconnect(ev)\n      .then((t) => {\n        this._tunnel = t\n      })\n      .catch((thrown) => {\n        // carry the real failure as the cause; the dev server then tears down and the single\n        // \"running the dev server\" error surfaces this reason (avoids a duplicate log line here)\n        this.events.emit('connectionFailed', { ev, cause: BotpressCLIError.map(thrown) })\n      })\n  }\n\n  private async _reconnect(ev: ReconnectionTriggerEvent): Promise<TunnelTail> {\n    const newTunnel = async () => {\n      const tunnel = await TunnelTail.new(this._tunnelUrl, this._tunnelId)\n      this._registerListeners(tunnel)\n      this.events.emit('connected', { tunnel, ev })\n      return tunnel\n    }\n\n    if (ev.type === 'init') {\n      // skip logging on the first connection attempt\n      return newTunnel()\n    }\n\n    const line = this._logger.line()\n    line.started('Reconnecting tunnel...')\n    const tunnel = await newTunnel()\n    line.success('Reconnected')\n    line.commit()\n    return tunnel\n  }\n\n  private _registerListeners(tunnel: TunnelTail) {\n    tunnel.events.on('error', ({ target, type }) => {\n      this._logger.error(`Tunnel error: ${type}`)\n      this._reconnectSync({ type: 'error', ev: { target, type } })\n    })\n    tunnel.events.on('close', ({ code, reason, target, type, wasClean }) => {\n      this._logger.error(`Tunnel closed: ${code} ${reason}`)\n\n      if (code === errors.CLOSE_CODES.TUNNEL_ID_CONFLICT) {\n        throw new Error('Cannot start: Tunnel Id is already used, choose a different tunnel id.')\n      }\n\n      this._reconnectSync({ type: 'close', ev: { code, reason, target, type, wasClean } })\n    })\n  }\n}\n"],
+  "mappings": "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",
   "names": ["tunnel"]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@botpress/cli",
-  "version": "6.8.1",
+  "version": "6.8.3",
   "description": "Botpress CLI",
   "scripts": {
     "build": "pnpm run build:types && pnpm run bundle && pnpm run template:gen",