@botpress/cli 0.2.3 → 0.2.4

package/dist/command-implementations/dev-command.js

@@ -38,6 +38,7 @@ var import_build_command = require("./build-command");
 var import_project_command = require("./project-command");
 const DEFAULT_BOT_PORT = 8075;
 const DEFAULT_INTEGRATION_PORT = 8076;
+const TUNNEL_HELLO_INTERVAL = 5e3;
 class DevCommand extends import_project_command.ProjectCommand {
   _initialDef = void 0;
   async run() {
@@ -71,6 +72,8 @@ class DevCommand extends import_project_command.ProjectCommand {
     });
     const supervisor = new utils.tunnel.TunnelSupervisor(wsTunnelUrl, tunnelId, this.logger);
     supervisor.events.on("connected", ({ tunnel }) => {
+      const timer = setInterval(() => tunnel.hello(), TUNNEL_HELLO_INTERVAL);
+      tunnel.events.on("close", () => clearInterval(timer));
       tunnel.events.on(
         "request",
         (req) => void this._forwardTunnelRequest(`http://localhost:${port}`, req).then((res) => {

package/dist/command-implementations/dev-command.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/command-implementations/dev-command.ts"],
-  "sourcesContent": ["import type * as bpclient from '@botpress/client'\nimport type { Bot as BotImpl, IntegrationDefinition } from '@botpress/sdk'\nimport { TunnelRequest, TunnelResponse } from '@bpinternal/tunnel'\nimport axios, { AxiosRequestConfig, AxiosResponse } from 'axios'\nimport chalk from 'chalk'\nimport * as pathlib from 'path'\nimport * as uuid from 'uuid'\nimport type { ApiClient } from '../api-client'\nimport type commandDefinitions from '../command-definitions'\nimport * as errors from '../errors'\nimport * as utils from '../utils'\nimport { Worker } from '../worker'\nimport { BuildCommand } from './build-command'\nimport { ProjectCommand } from './project-command'\n\nconst DEFAULT_BOT_PORT = 8075\nconst DEFAULT_INTEGRATION_PORT = 8076\n\nexport type DevCommandDefinition = typeof commandDefinitions.dev\nexport class DevCommand extends ProjectCommand<DevCommandDefinition> {\n  private _initialDef: IntegrationDefinition | undefined = undefined\n\n  public async run(): Promise<void> {\n    this.logger.warn('This command is experimental and subject to breaking changes without notice.')\n\n    const api = await this.ensureLoginAndCreateClient(this.argv)\n\n    this._initialDef = await this.readIntegrationDefinitionFromFS()\n\n    let env: Record<string, string> = {\n      ...process.env,\n      BP_API_URL: api.url,\n      BP_TOKEN: api.token,\n    }\n\n    let defaultPort = DEFAULT_BOT_PORT\n    if (this._initialDef) {\n      defaultPort = DEFAULT_INTEGRATION_PORT\n      const secrets = await this.promptSecrets(this._initialDef, this.argv)\n      env = { ...env, ...secrets }\n    }\n\n    const port = this.argv.port ?? defaultPort\n\n    const urlParseResult = utils.url.parse(this.argv.tunnelUrl)\n    if (urlParseResult.status === 'error') {\n      throw new errors.BotpressCLIError(`Invalid tunnel URL: ${urlParseResult.error}`)\n    }\n\n    const tunnelId = uuid.v4()\n\n    const { url: parsedTunnelUrl } = urlParseResult\n    const isSecured = parsedTunnelUrl.protocol === 'https' || parsedTunnelUrl.protocol === 'wss'\n\n    const wsTunnelUrl: string = utils.url.format({ ...parsedTunnelUrl, protocol: isSecured ? 'wss' : 'ws' })\n    const httpTunnelUrl: string = utils.url.format({\n      ...parsedTunnelUrl,\n      protocol: isSecured ? 'https' : 'http',\n      path: `/${tunnelId}`,\n    })\n\n    const supervisor = new utils.tunnel.TunnelSupervisor(wsTunnelUrl, tunnelId, this.logger)\n    supervisor.events.on('connected', ({ tunnel }) => {\n      tunnel.events.on(\n        'request',\n        (req) =>\n          void this._forwardTunnelRequest(`http://localhost:${port}`, req)\n            .then((res) => {\n              tunnel.send(res)\n            })\n            .catch((thrown) => {\n              const err = errors.BotpressCLIError.wrap(thrown, 'An error occurred while handling request')\n              this.logger.error(err.message)\n              tunnel.send({\n                requestId: req.id,\n                status: 500,\n                body: err.message,\n              })\n            })\n      )\n    })\n    await supervisor.start()\n\n    await this._runBuild()\n    await this._deploy(api, httpTunnelUrl)\n    const worker = await this._spawnWorker(env, port)\n\n    try {\n      const watcher = await utils.filewatcher.FileWatcher.watch(\n        this.argv.workDir,\n        async (events) => {\n          const typescriptEvents = events.filter((e) => pathlib.extname(e.path) === '.ts')\n          if (typescriptEvents.length === 0) {\n            return\n          }\n\n          this.logger.log('Changes detected, rebuilding')\n          await this._restart(api, worker, httpTunnelUrl)\n        },\n        {\n          ignore: [this.projectPaths.abs.outDir],\n        }\n      )\n\n      await Promise.race([worker.wait(), watcher.wait(), supervisor.wait()])\n\n      if (worker.running) {\n        await worker.kill()\n      }\n      await watcher.close()\n      supervisor.close()\n    } catch (thrown) {\n      throw errors.BotpressCLIError.wrap(thrown, 'An error occurred while running the dev server')\n    } finally {\n      if (worker.running) {\n        await worker.kill()\n      }\n    }\n  }\n\n  private _restart = async (api: ApiClient, worker: Worker, tunnelUrl: string) => {\n    try {\n      await this._runBuild()\n    } catch (thrown) {\n      const error = errors.BotpressCLIError.wrap(thrown, 'Build failed')\n      this.logger.error(error.message)\n      return\n    }\n\n    await this._deploy(api, tunnelUrl)\n    await worker.reload()\n  }\n\n  private _deploy = async (api: ApiClient, tunnelUrl: string) => {\n    const integrationDef = await this.readIntegrationDefinitionFromFS()\n    if (integrationDef) {\n      this._checkSecrets(integrationDef)\n      await this._deployDevIntegration(api, tunnelUrl, integrationDef)\n    } else {\n      await this._deployDevBot(api, tunnelUrl)\n    }\n  }\n\n  private _checkSecrets(integrationDef: IntegrationDefinition) {\n    const initialSecrets = this._initialDef?.secrets ?? []\n    const currentSecrets = integrationDef.secrets ?? []\n    const newSecrets = currentSecrets.filter((s) => !initialSecrets.includes(s))\n    if (newSecrets.length > 0) {\n      throw new errors.BotpressCLIError('Secrets were added while the server was running. A restart is required.')\n    }\n  }\n\n  private _spawnWorker = async (env: Record<string, string>, port: number) => {\n    const outfile = this.projectPaths.abs.outFile\n    const importPath = utils.path.toUnix(outfile)\n    const requireFrom = utils.path.rmExtension(importPath)\n    const code = `require('${requireFrom}').default.start(${port})`\n    const worker = await Worker.spawn(\n      {\n        type: 'code',\n        code,\n        env,\n      },\n      this.logger\n    ).catch((thrown) => {\n      throw errors.BotpressCLIError.wrap(thrown, 'Could not start dev worker')\n    })\n\n    return worker\n  }\n\n  private _runBuild() {\n    return new BuildCommand(this.api, this.prompt, this.logger, this.argv).run()\n  }\n\n  private async _deployDevIntegration(\n    api: ApiClient,\n    externalUrl: string,\n    integrationDef: IntegrationDefinition\n  ): Promise<void> {\n    const devId = await this.projectCache.get('devId')\n\n    let integration: bpclient.Integration | undefined = undefined\n\n    if (devId) {\n      const resp = await api.client.getIntegration({ id: devId }).catch(async (thrown) => {\n        const err = errors.BotpressCLIError.wrap(thrown, `Could not find existing dev integration with id \"${devId}\"`)\n        this.logger.warn(err.message)\n        return { integration: undefined }\n      })\n\n      if (resp.integration?.dev) {\n        integration = resp.integration\n      } else {\n        await this.projectCache.rm('devId')\n      }\n    }\n\n    const line = this.logger.line()\n    line.started(`Deploying dev integration ${chalk.bold(integrationDef.name)}...`)\n    if (integration) {\n      const resp = await api.client\n        .updateIntegration({ ...integrationDef, id: integration.id, url: externalUrl })\n        .catch((thrown) => {\n          throw errors.BotpressCLIError.wrap(thrown, `Could not update dev integration \"${integrationDef.name}\"`)\n        })\n      integration = resp.integration\n    } else {\n      const resp = await api.client\n        .createIntegration({ ...integrationDef, dev: true, url: externalUrl })\n        .catch((thrown) => {\n          throw errors.BotpressCLIError.wrap(thrown, `Could not deploy dev integration \"${integrationDef.name}\"`)\n        })\n      integration = resp.integration\n    }\n\n    line.success(`Dev Integration deployed with id \"${integration.id}\"`)\n    await this.projectCache.set('devId', integration.id)\n  }\n\n  private async _deployDevBot(api: ApiClient, externalUrl: string): Promise<void> {\n    const devId = await this.projectCache.get('devId')\n\n    let bot: bpclient.Bot | undefined = undefined\n\n    if (devId) {\n      const resp = await api.client.getBot({ id: devId }).catch(async (thrown) => {\n        const err = errors.BotpressCLIError.wrap(thrown, `Could not find existing dev bot with id \"${devId}\"`)\n        this.logger.warn(err.message)\n        return { bot: undefined }\n      })\n\n      if (resp.bot?.dev) {\n        bot = resp.bot\n      } else {\n        await this.projectCache.rm('devId')\n      }\n    }\n\n    if (!bot) {\n      const createLine = this.logger.line()\n      createLine.started('Creating dev bot...')\n      const resp = await api.client\n        .createBot({\n          dev: true,\n          url: externalUrl,\n        })\n        .catch((thrown) => {\n          throw errors.BotpressCLIError.wrap(thrown, 'Could not deploy dev bot')\n        })\n\n      bot = resp.bot\n      createLine.success(`Dev Bot created with id \"${bot.id}\"`)\n      await this.projectCache.set('devId', bot.id)\n    }\n\n    const outfile = this.projectPaths.abs.outFile\n    const { default: botImpl } = utils.require.requireJsFile<{ default: BotImpl }>(outfile)\n\n    const integrations = this.prepareIntegrations(botImpl, bot)\n\n    const updateLine = this.logger.line()\n    updateLine.started('Deploying dev bot...')\n\n    const { bot: updatedBot } = await api.client\n      .updateBot({\n        ...botImpl.definition,\n        id: bot.id,\n        integrations,\n        url: externalUrl,\n      })\n      .catch((thrown) => {\n        throw errors.BotpressCLIError.wrap(thrown, 'Could not deploy dev bot')\n      })\n    updateLine.success(`Dev Bot deployed with id \"${updatedBot.id}\"`)\n\n    this.displayWebhookUrls(updatedBot)\n  }\n\n  private _forwardTunnelRequest = async (baseUrl: string, request: TunnelRequest): Promise<TunnelResponse> => {\n    const axiosConfig = {\n      method: request.method,\n      url: this._formatLocalUrl(baseUrl, request),\n      headers: request.headers,\n      data: request.body,\n      responseType: 'text',\n      validateStatus: () => true,\n    } satisfies AxiosRequestConfig\n\n    this.logger.debug(`Forwarding request to ${axiosConfig.url}`)\n    const response = await axios(axiosConfig)\n    this.logger.debug('Sending back response up the tunnel')\n\n    return {\n      requestId: request.id,\n      status: response.status,\n      headers: this._getHeaders(response.headers),\n      body: response.data,\n    }\n  }\n\n  private _formatLocalUrl = (baseUrl: string, req: TunnelRequest): string => {\n    if (req.query) {\n      return `${baseUrl}${req.path}?${req.query}`\n    }\n    return `${baseUrl}${req.path}`\n  }\n\n  private _getHeaders = (res: AxiosResponse['headers']): TunnelResponse['headers'] => {\n    const headers: TunnelResponse['headers'] = {}\n    for (const key in res) {\n      if (typeof res[key] === 'string' || typeof res[key] === 'number') {\n        headers[key] = res[key]\n      }\n    }\n    return headers\n  }\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["import type * as bpclient from '@botpress/client'\nimport type { Bot as BotImpl, IntegrationDefinition } from '@botpress/sdk'\nimport { TunnelRequest, TunnelResponse } from '@bpinternal/tunnel'\nimport axios, { AxiosRequestConfig, AxiosResponse } from 'axios'\nimport chalk from 'chalk'\nimport * as pathlib from 'path'\nimport * as uuid from 'uuid'\nimport type { ApiClient } from '../api-client'\nimport type commandDefinitions from '../command-definitions'\nimport * as errors from '../errors'\nimport * as utils from '../utils'\nimport { Worker } from '../worker'\nimport { BuildCommand } from './build-command'\nimport { ProjectCommand } from './project-command'\n\nconst DEFAULT_BOT_PORT = 8075\nconst DEFAULT_INTEGRATION_PORT = 8076\nconst TUNNEL_HELLO_INTERVAL = 5000\n\nexport type DevCommandDefinition = typeof commandDefinitions.dev\nexport class DevCommand extends ProjectCommand<DevCommandDefinition> {\n  private _initialDef: IntegrationDefinition | undefined = undefined\n\n  public async run(): Promise<void> {\n    this.logger.warn('This command is experimental and subject to breaking changes without notice.')\n\n    const api = await this.ensureLoginAndCreateClient(this.argv)\n\n    this._initialDef = await this.readIntegrationDefinitionFromFS()\n\n    let env: Record<string, string> = {\n      ...process.env,\n      BP_API_URL: api.url,\n      BP_TOKEN: api.token,\n    }\n\n    let defaultPort = DEFAULT_BOT_PORT\n    if (this._initialDef) {\n      defaultPort = DEFAULT_INTEGRATION_PORT\n      const secrets = await this.promptSecrets(this._initialDef, this.argv)\n      env = { ...env, ...secrets }\n    }\n\n    const port = this.argv.port ?? defaultPort\n\n    const urlParseResult = utils.url.parse(this.argv.tunnelUrl)\n    if (urlParseResult.status === 'error') {\n      throw new errors.BotpressCLIError(`Invalid tunnel URL: ${urlParseResult.error}`)\n    }\n\n    const tunnelId = uuid.v4()\n\n    const { url: parsedTunnelUrl } = urlParseResult\n    const isSecured = parsedTunnelUrl.protocol === 'https' || parsedTunnelUrl.protocol === 'wss'\n\n    const wsTunnelUrl: string = utils.url.format({ ...parsedTunnelUrl, protocol: isSecured ? 'wss' : 'ws' })\n    const httpTunnelUrl: string = utils.url.format({\n      ...parsedTunnelUrl,\n      protocol: isSecured ? 'https' : 'http',\n      path: `/${tunnelId}`,\n    })\n\n    const supervisor = new utils.tunnel.TunnelSupervisor(wsTunnelUrl, tunnelId, this.logger)\n    supervisor.events.on('connected', ({ tunnel }) => {\n      // prevents the tunnel from closing due to inactivity\n      const timer = setInterval(() => tunnel.hello(), TUNNEL_HELLO_INTERVAL)\n      tunnel.events.on('close', () => clearInterval(timer))\n\n      tunnel.events.on(\n        'request',\n        (req) =>\n          void this._forwardTunnelRequest(`http://localhost:${port}`, req)\n            .then((res) => {\n              tunnel.send(res)\n            })\n            .catch((thrown) => {\n              const err = errors.BotpressCLIError.wrap(thrown, 'An error occurred while handling request')\n              this.logger.error(err.message)\n              tunnel.send({\n                requestId: req.id,\n                status: 500,\n                body: err.message,\n              })\n            })\n      )\n    })\n    await supervisor.start()\n\n    await this._runBuild()\n    await this._deploy(api, httpTunnelUrl)\n    const worker = await this._spawnWorker(env, port)\n\n    try {\n      const watcher = await utils.filewatcher.FileWatcher.watch(\n        this.argv.workDir,\n        async (events) => {\n          const typescriptEvents = events.filter((e) => pathlib.extname(e.path) === '.ts')\n          if (typescriptEvents.length === 0) {\n            return\n          }\n\n          this.logger.log('Changes detected, rebuilding')\n          await this._restart(api, worker, httpTunnelUrl)\n        },\n        {\n          ignore: [this.projectPaths.abs.outDir],\n        }\n      )\n\n      await Promise.race([worker.wait(), watcher.wait(), supervisor.wait()])\n\n      if (worker.running) {\n        await worker.kill()\n      }\n      await watcher.close()\n      supervisor.close()\n    } catch (thrown) {\n      throw errors.BotpressCLIError.wrap(thrown, 'An error occurred while running the dev server')\n    } finally {\n      if (worker.running) {\n        await worker.kill()\n      }\n    }\n  }\n\n  private _restart = async (api: ApiClient, worker: Worker, tunnelUrl: string) => {\n    try {\n      await this._runBuild()\n    } catch (thrown) {\n      const error = errors.BotpressCLIError.wrap(thrown, 'Build failed')\n      this.logger.error(error.message)\n      return\n    }\n\n    await this._deploy(api, tunnelUrl)\n    await worker.reload()\n  }\n\n  private _deploy = async (api: ApiClient, tunnelUrl: string) => {\n    const integrationDef = await this.readIntegrationDefinitionFromFS()\n    if (integrationDef) {\n      this._checkSecrets(integrationDef)\n      await this._deployDevIntegration(api, tunnelUrl, integrationDef)\n    } else {\n      await this._deployDevBot(api, tunnelUrl)\n    }\n  }\n\n  private _checkSecrets(integrationDef: IntegrationDefinition) {\n    const initialSecrets = this._initialDef?.secrets ?? []\n    const currentSecrets = integrationDef.secrets ?? []\n    const newSecrets = currentSecrets.filter((s) => !initialSecrets.includes(s))\n    if (newSecrets.length > 0) {\n      throw new errors.BotpressCLIError('Secrets were added while the server was running. A restart is required.')\n    }\n  }\n\n  private _spawnWorker = async (env: Record<string, string>, port: number) => {\n    const outfile = this.projectPaths.abs.outFile\n    const importPath = utils.path.toUnix(outfile)\n    const requireFrom = utils.path.rmExtension(importPath)\n    const code = `require('${requireFrom}').default.start(${port})`\n    const worker = await Worker.spawn(\n      {\n        type: 'code',\n        code,\n        env,\n      },\n      this.logger\n    ).catch((thrown) => {\n      throw errors.BotpressCLIError.wrap(thrown, 'Could not start dev worker')\n    })\n\n    return worker\n  }\n\n  private _runBuild() {\n    return new BuildCommand(this.api, this.prompt, this.logger, this.argv).run()\n  }\n\n  private async _deployDevIntegration(\n    api: ApiClient,\n    externalUrl: string,\n    integrationDef: IntegrationDefinition\n  ): Promise<void> {\n    const devId = await this.projectCache.get('devId')\n\n    let integration: bpclient.Integration | undefined = undefined\n\n    if (devId) {\n      const resp = await api.client.getIntegration({ id: devId }).catch(async (thrown) => {\n        const err = errors.BotpressCLIError.wrap(thrown, `Could not find existing dev integration with id \"${devId}\"`)\n        this.logger.warn(err.message)\n        return { integration: undefined }\n      })\n\n      if (resp.integration?.dev) {\n        integration = resp.integration\n      } else {\n        await this.projectCache.rm('devId')\n      }\n    }\n\n    const line = this.logger.line()\n    line.started(`Deploying dev integration ${chalk.bold(integrationDef.name)}...`)\n    if (integration) {\n      const resp = await api.client\n        .updateIntegration({ ...integrationDef, id: integration.id, url: externalUrl })\n        .catch((thrown) => {\n          throw errors.BotpressCLIError.wrap(thrown, `Could not update dev integration \"${integrationDef.name}\"`)\n        })\n      integration = resp.integration\n    } else {\n      const resp = await api.client\n        .createIntegration({ ...integrationDef, dev: true, url: externalUrl })\n        .catch((thrown) => {\n          throw errors.BotpressCLIError.wrap(thrown, `Could not deploy dev integration \"${integrationDef.name}\"`)\n        })\n      integration = resp.integration\n    }\n\n    line.success(`Dev Integration deployed with id \"${integration.id}\"`)\n    await this.projectCache.set('devId', integration.id)\n  }\n\n  private async _deployDevBot(api: ApiClient, externalUrl: string): Promise<void> {\n    const devId = await this.projectCache.get('devId')\n\n    let bot: bpclient.Bot | undefined = undefined\n\n    if (devId) {\n      const resp = await api.client.getBot({ id: devId }).catch(async (thrown) => {\n        const err = errors.BotpressCLIError.wrap(thrown, `Could not find existing dev bot with id \"${devId}\"`)\n        this.logger.warn(err.message)\n        return { bot: undefined }\n      })\n\n      if (resp.bot?.dev) {\n        bot = resp.bot\n      } else {\n        await this.projectCache.rm('devId')\n      }\n    }\n\n    if (!bot) {\n      const createLine = this.logger.line()\n      createLine.started('Creating dev bot...')\n      const resp = await api.client\n        .createBot({\n          dev: true,\n          url: externalUrl,\n        })\n        .catch((thrown) => {\n          throw errors.BotpressCLIError.wrap(thrown, 'Could not deploy dev bot')\n        })\n\n      bot = resp.bot\n      createLine.success(`Dev Bot created with id \"${bot.id}\"`)\n      await this.projectCache.set('devId', bot.id)\n    }\n\n    const outfile = this.projectPaths.abs.outFile\n    const { default: botImpl } = utils.require.requireJsFile<{ default: BotImpl }>(outfile)\n\n    const integrations = this.prepareIntegrations(botImpl, bot)\n\n    const updateLine = this.logger.line()\n    updateLine.started('Deploying dev bot...')\n\n    const { bot: updatedBot } = await api.client\n      .updateBot({\n        ...botImpl.definition,\n        id: bot.id,\n        integrations,\n        url: externalUrl,\n      })\n      .catch((thrown) => {\n        throw errors.BotpressCLIError.wrap(thrown, 'Could not deploy dev bot')\n      })\n    updateLine.success(`Dev Bot deployed with id \"${updatedBot.id}\"`)\n\n    this.displayWebhookUrls(updatedBot)\n  }\n\n  private _forwardTunnelRequest = async (baseUrl: string, request: TunnelRequest): Promise<TunnelResponse> => {\n    const axiosConfig = {\n      method: request.method,\n      url: this._formatLocalUrl(baseUrl, request),\n      headers: request.headers,\n      data: request.body,\n      responseType: 'text',\n      validateStatus: () => true,\n    } satisfies AxiosRequestConfig\n\n    this.logger.debug(`Forwarding request to ${axiosConfig.url}`)\n    const response = await axios(axiosConfig)\n    this.logger.debug('Sending back response up the tunnel')\n\n    return {\n      requestId: request.id,\n      status: response.status,\n      headers: this._getHeaders(response.headers),\n      body: response.data,\n    }\n  }\n\n  private _formatLocalUrl = (baseUrl: string, req: TunnelRequest): string => {\n    if (req.query) {\n      return `${baseUrl}${req.path}?${req.query}`\n    }\n    return `${baseUrl}${req.path}`\n  }\n\n  private _getHeaders = (res: AxiosResponse['headers']): TunnelResponse['headers'] => {\n    const headers: TunnelResponse['headers'] = {}\n    for (const key in res) {\n      if (typeof res[key] === 'string' || typeof res[key] === 'number') {\n        headers[key] = res[key]\n      }\n    }\n    return headers\n  }\n}\n"],
+  "mappings": "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",
   "names": ["chalk", "axios"]
 }

package/e2e/api.ts

@@ -0,0 +1,25 @@
+import { Client } from '@botpress/client'
+
+export type ApiBot = Awaited<ReturnType<Client['listBots']>>['bots'][0]
+export const fetchAllBots = async (client: Client): Promise<ApiBot[]> => {
+  let allBots: ApiBot[] = []
+  let nextToken: string | undefined = undefined
+  do {
+    const { bots, meta } = await client.listBots({ nextToken })
+    allBots = allBots.concat(bots)
+    nextToken = meta.nextToken
+  } while (nextToken)
+  return allBots
+}
+
+export type ApiIntegration = Awaited<ReturnType<Client['listIntegrations']>>['integrations'][0]
+export const fetchAllIntegrations = async (client: Client): Promise<ApiIntegration[]> => {
+  let allIntegrations: ApiIntegration[] = []
+  let nextToken: string | undefined = undefined
+  do {
+    const { integrations, meta } = await client.listIntegrations({ nextToken })
+    allIntegrations = allIntegrations.concat(integrations)
+    nextToken = meta.nextToken
+  } while (nextToken)
+  return allIntegrations
+}

package/e2e/defaults.ts

@@ -0,0 +1,20 @@
+import * as consts from '../src/consts'
+
+const noBuild = false
+const secrets = [] satisfies string[]
+const sourceMap = false
+const verbose = false
+const confirm = true
+const json = false
+const entryPoint = consts.defaultEntrypoint
+const outDir = consts.defaultOutputFolder
+export default {
+  noBuild,
+  secrets,
+  sourceMap,
+  verbose,
+  confirm,
+  json,
+  entryPoint,
+  outDir,
+}

package/e2e/index.ts

@@ -0,0 +1,83 @@
+import { Logger } from '@bpinternal/log4bot'
+import yargs, { YargsConfig, YargsSchema } from '@bpinternal/yargs-extra'
+import * as consts from '../src/consts'
+import { createDeployBot } from './tests/create-deploy-bot'
+import { createDeployIntegration } from './tests/create-deploy-integration'
+import { devBot } from './tests/dev-bot'
+import { Test } from './typings'
+import { sleep, TmpDirectory } from './utils'
+
+const tests: Test[] = [createDeployBot, createDeployIntegration, devBot]
+
+const timeout = (ms: number) =>
+  sleep(ms).then(() => {
+    throw new Error(`Timeout after ${ms}ms`)
+  })
+
+const TIMEOUT = 20_000
+
+const configSchema = {
+  timeout: {
+    type: 'number',
+    default: TIMEOUT,
+  },
+  verbose: {
+    type: 'boolean',
+    default: false,
+    alias: 'v',
+  },
+  filter: {
+    type: 'string',
+  },
+  workspaceId: {
+    type: 'string',
+    demandOption: true,
+  },
+  token: {
+    type: 'string',
+    demandOption: true,
+  },
+  apiUrl: {
+    type: 'string',
+    default: consts.defaultBotpressApiUrl,
+  },
+  tunnelUrl: {
+    type: 'string',
+    default: consts.defaultTunnelUrl,
+  },
+} satisfies YargsSchema
+
+const main = async (argv: YargsConfig<typeof configSchema>): Promise<never> => {
+  const logger = new Logger('e2e', { level: argv.verbose ? 'debug' : 'info' })
+
+  const filterRegex = argv.filter ? new RegExp(argv.filter) : null
+  const filteredTests = tests.filter(({ name }) => (filterRegex ? filterRegex.test(name) : true))
+  logger.info(`Running ${filteredTests.length} / ${tests.length} tests`)
+
+  for (const { name, handler } of filteredTests) {
+    const logLine = `### Running test: "${name}" ###`
+    const logPad = '#'.repeat(logLine.length)
+    logger.info(logPad)
+    logger.info(logLine)
+    logger.info(logPad + '\n')
+
+    const tmpDir = TmpDirectory.create()
+    try {
+      const t0 = Date.now()
+      await Promise.race([handler({ tmpDir: tmpDir.path, ...argv }), timeout(argv.timeout)])
+      const t1 = Date.now()
+      logger.info(`SUCCESS: "${name}" (${t1 - t0}ms)`)
+    } catch (thrown) {
+      const err = thrown instanceof Error ? thrown : new Error(`${thrown}`)
+      logger.attachError(err).error(`FAILURE: "${name}"`)
+      process.exit(1)
+    } finally {
+      tmpDir.cleanup()
+    }
+  }
+
+  logger.info('All tests passed')
+  process.exit(0)
+}
+
+void yargs.command('$0', 'Run E2E Tests', configSchema, main).parse()

package/e2e/tests/create-deploy-bot.ts

@@ -0,0 +1,50 @@
+import { Client } from '@botpress/client'
+import pathlib from 'path'
+import * as uuid from 'uuid'
+import impl from '../../src/command-implementations'
+import { ApiBot, fetchAllBots } from '../api'
+import defaults from '../defaults'
+import { Test } from '../typings'
+import * as utils from '../utils'
+
+const fetchBot = async (client: Client, botName: string): Promise<ApiBot | undefined> => {
+  const bots = await fetchAllBots(client)
+  return bots.find(({ name }) => name === botName)
+}
+
+export const createDeployBot: Test = {
+  name: 'cli should allow creating, building, deploying and mannaging a bot',
+  handler: async ({ tmpDir, ...creds }) => {
+    const botpressHomeDir = pathlib.join(tmpDir, '.botpresshome')
+    const baseDir = pathlib.join(tmpDir, 'bots')
+    const botName = uuid.v4()
+    const botDir = pathlib.join(baseDir, botName)
+
+    const argv = {
+      ...defaults,
+      botpressHome: botpressHomeDir,
+      confirm: true,
+      ...creds,
+    }
+
+    const client = new Client({ host: creds.apiUrl, token: creds.token, workspaceId: creds.workspaceId })
+
+    await impl.init({ ...argv, workDir: baseDir, name: botName, type: 'bot' }).then(utils.handleExitCode)
+    await utils.npmInstall({ workDir: botDir }).then(utils.handleExitCode)
+    await impl.build({ ...argv, workDir: botDir }).then(utils.handleExitCode)
+    await impl.login({ ...argv }).then(utils.handleExitCode)
+    await impl.bots.subcommands.create({ ...argv, name: botName }).then(utils.handleExitCode)
+
+    const bot = await fetchBot(client, botName)
+    if (!bot) {
+      throw new Error(`Bot ${botName} should have been created`)
+    }
+
+    await impl.deploy({ ...argv, workDir: botDir, createNewBot: false, botId: bot.id }).then(utils.handleExitCode)
+    await impl.bots.subcommands.delete({ ...argv, botRef: bot.id }).then(utils.handleExitCode)
+
+    if (await fetchBot(client, botName)) {
+      throw new Error(`Bot ${botName} should have been deleted`)
+    }
+  },
+}

package/e2e/tests/create-deploy-integration.ts

@@ -0,0 +1,55 @@
+import { Client } from '@botpress/client'
+
+import pathlib from 'path'
+import * as uuid from 'uuid'
+import impl from '../../src/command-implementations'
+import { ApiIntegration, fetchAllIntegrations } from '../api'
+import defaults from '../defaults'
+import { Test } from '../typings'
+import * as utils from '../utils'
+
+const fetchIntegration = async (client: Client, integrationName: string): Promise<ApiIntegration | undefined> => {
+  const integrations = await fetchAllIntegrations(client)
+  return integrations.find(({ name }) => name === integrationName)
+}
+
+export const createDeployIntegration: Test = {
+  name: 'cli should allow creating, building, deploying and mannaging an integration',
+  handler: async ({ tmpDir, ...creds }) => {
+    const botpressHomeDir = pathlib.join(tmpDir, '.botpresshome')
+    const baseDir = pathlib.join(tmpDir, 'integrations')
+    const integrationName = `myintegration-${uuid.v4()}`.replace(/-/g, '')
+    const integrationDir = pathlib.join(baseDir, integrationName)
+
+    const argv = {
+      ...defaults,
+      botpressHome: botpressHomeDir,
+      confirm: true,
+      ...creds,
+    }
+
+    const client = new Client({ host: creds.apiUrl, token: creds.token, workspaceId: creds.workspaceId })
+
+    await impl
+      .init({ ...argv, workDir: baseDir, name: integrationName, type: 'integration' })
+      .then(utils.handleExitCode)
+    await utils.npmInstall({ workDir: integrationDir }).then(utils.handleExitCode)
+    await impl.build({ ...argv, workDir: integrationDir }).then(utils.handleExitCode)
+    await impl.login({ ...argv }).then(utils.handleExitCode)
+
+    await impl
+      .deploy({ ...argv, createNewBot: undefined, botId: undefined, workDir: integrationDir })
+      .then(utils.handleExitCode)
+
+    const integration = await fetchIntegration(client, integrationName)
+    if (!integration) {
+      throw new Error(`Integration ${integrationName} should have been created`)
+    }
+
+    await impl.integrations.subcommands.delete({ ...argv, integrationRef: integration.id }).then(utils.handleExitCode)
+
+    if (await fetchIntegration(client, integrationName)) {
+      throw new Error(`Integration ${integrationName} should have been deleted`)
+    }
+  },
+}

package/e2e/tests/dev-bot.ts

@@ -0,0 +1,57 @@
+import findProcess from 'find-process'
+import pathlib from 'path'
+import * as uuid from 'uuid'
+import impl from '../../src/command-implementations'
+import defaults from '../defaults'
+import { Test } from '../typings'
+import * as utils from '../utils'
+
+const handleExitCode = ({ exitCode }: { exitCode: number }) => {
+  if (exitCode !== 0) {
+    throw new Error(`Command exited with code ${exitCode}`)
+  }
+}
+
+const PORT = 8075
+
+export const devBot: Test = {
+  name: 'cli should allow creating and running a bot locally',
+  handler: async ({ tmpDir, tunnelUrl, ...creds }) => {
+    const botpressHomeDir = pathlib.join(tmpDir, '.botpresshome')
+    const baseDir = pathlib.join(tmpDir, 'bots')
+    const botName = uuid.v4()
+    const botDir = pathlib.join(baseDir, botName)
+
+    const argv = {
+      ...defaults,
+      botpressHome: botpressHomeDir,
+      confirm: true,
+      ...creds,
+    }
+
+    await impl.init({ ...argv, workDir: baseDir, name: botName, type: 'bot' }).then(handleExitCode)
+    await utils.npmInstall({ workDir: botDir }).then(handleExitCode)
+    await impl.login({ ...argv }).then(handleExitCode)
+
+    const cmdPromise = impl.dev({ ...argv, workDir: botDir, port: PORT, tunnelUrl }).then(handleExitCode)
+    await utils.sleep(5000)
+
+    const allProcess = await findProcess('port', PORT)
+    if (allProcess.length === 0) {
+      throw new Error(`Expected to find a process listening on port ${PORT}`)
+    }
+    if (allProcess.length > 1) {
+      throw new Error(`Expected to find only one process listening on port ${PORT}`)
+    }
+    const botProcess = allProcess[0]
+
+    /**
+     * TODO:
+     * - try calling the Bot locally to see if it works
+     * - allow listing dev bots in API and find the one we just created (by name)
+     */
+
+    process.kill(botProcess.pid)
+    await cmdPromise
+  },
+}

package/e2e/typings.ts

@@ -0,0 +1,12 @@
+export type TestProps = {
+  tmpDir: string
+  workspaceId: string
+  token: string
+  apiUrl: string
+  tunnelUrl: string
+}
+
+export type Test = {
+  name: string
+  handler: (props: TestProps) => Promise<void>
+}

package/e2e/utils.ts

@@ -0,0 +1,42 @@
+import childprocess from 'child_process'
+import tmp from 'tmp'
+
+export const sleep = (ms: number) => new Promise<void>((resolve) => setTimeout(resolve, ms))
+
+export class TmpDirectory {
+  private _closed = false
+
+  public static create() {
+    return new TmpDirectory(tmp.dirSync({ unsafeCleanup: true }))
+  }
+
+  private constructor(private _res: tmp.DirResult) {}
+
+  public get path() {
+    if (this._closed) {
+      throw new Error('Cannot access tmp directory after cleanup')
+    }
+    return this._res.name
+  }
+
+  public cleanup() {
+    if (this._closed) {
+      return
+    }
+    this._res.removeCallback()
+  }
+}
+
+export const npmInstall = async ({ workDir }: { workDir: string }) => {
+  const { status } = childprocess.spawnSync('pnpm', ['install'], {
+    cwd: workDir,
+    stdio: 'inherit',
+  })
+  return { exitCode: status ?? 0 }
+}
+
+export const handleExitCode = ({ exitCode }: { exitCode: number }) => {
+  if (exitCode !== 0) {
+    throw new Error(`Command exited with code ${exitCode}`)
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@botpress/cli",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "description": "Botpress CLI",
   "scripts": {
     "build": "pnpm run bundle && pnpm run template:gen",
@@ -8,7 +8,9 @@
     "start": "node dist/index.js",
     "type:check": "tsc --noEmit",
     "bundle": "ts-node -T build.ts",
-    "template:gen": "pnpm -r --stream -F echo-bot -F empty-integration exec bp gen"
+    "template:gen": "pnpm -r --stream -F echo-bot -F empty-integration exec bp gen",
+    "e2e:test": "ts-node -T ./e2e",
+    "unit:test": "pnpm vitest --run"
   },
   "keywords": [],
   "author": "",
@@ -19,7 +21,7 @@
   "main": "dist/index.js",
   "dependencies": {
     "@botpress/client": "0.1.3",
-    "@bpinternal/tunnel": "^0.0.2",
+    "@bpinternal/tunnel": "^0.1.0",
     "@bpinternal/yargs-extra": "^0.0.3",
     "@parcel/watcher": "^2.1.0",
     "@types/lodash": "^4.14.191",
@@ -46,11 +48,15 @@
   },
   "devDependencies": {
     "@botpress/sdk": "0.1.5",
+    "@bpinternal/log4bot": "^0.0.4",
     "@types/bluebird": "^3.5.38",
     "@types/prompts": "^2.0.14",
     "@types/semver": "^7.3.11",
+    "@types/tmp": "^0.2.3",
     "@types/uuid": "^9.0.1",
+    "find-process": "^1.4.7",
     "glob": "^9.3.4",
+    "tmp": "^0.2.1",
     "ts-node": "^10.9.1"
   },
   "engines": {