@botpress/cli 0.3.2 → 0.4.1

package/dist/code-generation/integration-secret.js

@@ -30,17 +30,26 @@ class IntegrationSecretIndexModule extends import_module.Module {
   static async create(integration) {
     let content = import_const.GENERATED_HEADER;
     content += "class Secrets {\n";
-    for (const secretName of integration.secrets ?? []) {
+    for (const [secretName, { optional }] of Object.entries(integration.secrets ?? {})) {
       const envVariableName = secretEnvVariableName(secretName);
       const fieldName = import_utils.casing.to.screamingSnakeCase(secretName);
-      content += `  public get ${fieldName}(): string {
+      if (optional) {
+        content += `  public get ${fieldName}(): string | undefined {
 `;
-      content += `    const envVarValue = process.env.${envVariableName}
+        content += `    const envVarValue = process.env.${envVariableName}
 `;
-      content += `    if (!envVarValue) { throw new Error('Missing environment variable ${envVariableName}') }
+        content += "    return envVarValue\n";
+        content += "  }\n";
+      } else {
+        content += `  public get ${fieldName}(): string {
 `;
-      content += "    return envVarValue\n";
-      content += "  }\n";
+        content += `    const envVarValue = process.env.${envVariableName}
+`;
+        content += `    if (!envVarValue) throw new Error('Missing required secret "${secretName}"')
+`;
+        content += "    return envVarValue\n";
+        content += "  }\n";
+      }
     }
     content += "}\n";
     content += "export const secrets = new Secrets()\n";

package/dist/code-generation/integration-secret.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/code-generation/integration-secret.ts"],
-  "sourcesContent": ["import type { IntegrationDefinition } from '@botpress/sdk'\nimport { casing } from '../utils'\nimport { GENERATED_HEADER, INDEX_FILE } from './const'\nimport { Module } from './module'\n\nexport const secretEnvVariableName = (secretName: string) => `SECRET_${casing.to.screamingSnakeCase(secretName)}`\n\nexport class IntegrationSecretIndexModule extends Module {\n  public static async create(integration: IntegrationDefinition): Promise<IntegrationSecretIndexModule> {\n    let content = GENERATED_HEADER\n    content += 'class Secrets {\\n'\n    for (const secretName of integration.secrets ?? []) {\n      const envVariableName = secretEnvVariableName(secretName)\n      const fieldName = casing.to.screamingSnakeCase(secretName)\n      content += `  public get ${fieldName}(): string {\\n`\n      content += `    const envVarValue = process.env.${envVariableName}\\n`\n      content += `    if (!envVarValue) { throw new Error('Missing environment variable ${envVariableName}') }\\n`\n      content += '    return envVarValue\\n'\n      content += '  }\\n'\n    }\n    content += '}\\n'\n    content += 'export const secrets = new Secrets()\\n'\n    return new IntegrationSecretIndexModule({ content, exportName: 'secrets', path: INDEX_FILE })\n  }\n}\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,mBAAuB;AACvB,mBAA6C;AAC7C,oBAAuB;AAEhB,MAAM,wBAAwB,CAAC,eAAuB,UAAU,oBAAO,GAAG,mBAAmB,UAAU;AAEvG,MAAM,qCAAqC,qBAAO;AAAA,EACvD,aAAoB,OAAO,aAA2E;AACpG,QAAI,UAAU;AACd,eAAW;AACX,eAAW,cAAc,YAAY,WAAW,CAAC,GAAG;AAClD,YAAM,kBAAkB,sBAAsB,UAAU;AACxD,YAAM,YAAY,oBAAO,GAAG,mBAAmB,UAAU;AACzD,iBAAW,gBAAgB;AAAA;AAC3B,iBAAW,uCAAuC;AAAA;AAClD,iBAAW,yEAAyE;AAAA;AACpF,iBAAW;AACX,iBAAW;AAAA,IACb;AACA,eAAW;AACX,eAAW;AACX,WAAO,IAAI,6BAA6B,EAAE,SAAS,YAAY,WAAW,MAAM,wBAAW,CAAC;AAAA,EAC9F;AACF;",
+  "sourcesContent": ["import type { IntegrationDefinition } from '@botpress/sdk'\nimport { casing } from '../utils'\nimport { GENERATED_HEADER, INDEX_FILE } from './const'\nimport { Module } from './module'\n\nexport const secretEnvVariableName = (secretName: string) => `SECRET_${casing.to.screamingSnakeCase(secretName)}`\n\nexport class IntegrationSecretIndexModule extends Module {\n  public static async create(integration: IntegrationDefinition): Promise<IntegrationSecretIndexModule> {\n    let content = GENERATED_HEADER\n    content += 'class Secrets {\\n'\n    for (const [secretName, { optional }] of Object.entries(integration.secrets ?? {})) {\n      const envVariableName = secretEnvVariableName(secretName)\n      const fieldName = casing.to.screamingSnakeCase(secretName)\n\n      if (optional) {\n        content += `  public get ${fieldName}(): string | undefined {\\n`\n        content += `    const envVarValue = process.env.${envVariableName}\\n`\n        content += '    return envVarValue\\n'\n        content += '  }\\n'\n      } else {\n        content += `  public get ${fieldName}(): string {\\n`\n        content += `    const envVarValue = process.env.${envVariableName}\\n`\n        content += `    if (!envVarValue) throw new Error('Missing required secret \"${secretName}\"')\\n`\n        content += '    return envVarValue\\n'\n        content += '  }\\n'\n      }\n    }\n    content += '}\\n'\n    content += 'export const secrets = new Secrets()\\n'\n    return new IntegrationSecretIndexModule({ content, exportName: 'secrets', path: INDEX_FILE })\n  }\n}\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,mBAAuB;AACvB,mBAA6C;AAC7C,oBAAuB;AAEhB,MAAM,wBAAwB,CAAC,eAAuB,UAAU,oBAAO,GAAG,mBAAmB,UAAU;AAEvG,MAAM,qCAAqC,qBAAO;AAAA,EACvD,aAAoB,OAAO,aAA2E;AACpG,QAAI,UAAU;AACd,eAAW;AACX,eAAW,CAAC,YAAY,EAAE,SAAS,CAAC,KAAK,OAAO,QAAQ,YAAY,WAAW,CAAC,CAAC,GAAG;AAClF,YAAM,kBAAkB,sBAAsB,UAAU;AACxD,YAAM,YAAY,oBAAO,GAAG,mBAAmB,UAAU;AAEzD,UAAI,UAAU;AACZ,mBAAW,gBAAgB;AAAA;AAC3B,mBAAW,uCAAuC;AAAA;AAClD,mBAAW;AACX,mBAAW;AAAA,MACb,OAAO;AACL,mBAAW,gBAAgB;AAAA;AAC3B,mBAAW,uCAAuC;AAAA;AAClD,mBAAW,mEAAmE;AAAA;AAC9E,mBAAW;AACX,mBAAW;AAAA,MACb;AAAA,IACF;AACA,eAAW;AACX,eAAW;AACX,WAAO,IAAI,6BAA6B,EAAE,SAAS,YAAY,WAAW,MAAM,wBAAW,CAAC;AAAA,EAC9F;AACF;",
   "names": []
 }

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

@@ -154,9 +154,9 @@ class DevCommand extends import_project_command.ProjectCommand {
     }
   };
   _checkSecrets(integrationDef) {
-    const initialSecrets = this._initialDef?.secrets ?? [];
-    const currentSecrets = integrationDef.secrets ?? [];
-    const newSecrets = currentSecrets.filter((s) => !initialSecrets.includes(s));
+    const initialSecrets = this._initialDef?.secrets ?? {};
+    const currentSecrets = integrationDef.secrets ?? {};
+    const newSecrets = Object.keys(currentSecrets).filter((s) => !initialSecrets[s]);
     if (newSecrets.length > 0) {
       throw new errors.BotpressCLIError("Secrets were added while the server was running. A restart is required.");
     }

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 * as bpsdk 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 { prepareUpdateBotBody } from '../api/bot-body'\nimport type { ApiClient } from '../api/client'\nimport { prepareUpdateIntegrationBody, CreateIntegrationBody } from '../api/integration-body'\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: bpsdk.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    let worker: Worker | undefined = undefined\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('request', (req) => {\n        if (!worker) {\n          this.logger.debug('Worker not ready yet, ignoring request')\n          tunnel.send({ requestId: req.id, status: 503, body: 'Worker not ready yet' })\n          return\n        }\n\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    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          if (!worker) {\n            this.logger.debug('Worker not ready yet, ignoring file change event')\n            return\n          }\n\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: bpsdk.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: bpsdk.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\n    const integrationBody: CreateIntegrationBody = {\n      ...this.parseIntegrationDefinition(integrationDef),\n      url: externalUrl,\n    }\n\n    if (integration) {\n      const updateIntegrationBody = prepareUpdateIntegrationBody(\n        { ...integrationBody, id: integration.id },\n        integration\n      )\n\n      const resp = await api.client.updateIntegration(updateIntegrationBody).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.createIntegration({ ...integrationBody, dev: true }).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    line.commit()\n\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      createLine.commit()\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: bpsdk.Bot }>(outfile)\n\n    const updateLine = this.logger.line()\n    updateLine.started('Deploying dev bot...')\n\n    const updateBotBody = prepareUpdateBotBody(\n      {\n        id: bot.id,\n        url: externalUrl,\n        ...this.parseBot(botImpl),\n      },\n      bot\n    )\n\n    const { bot: updatedBot } = await api.client.updateBot(updateBotBody).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    updateLine.commit()\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 * as bpsdk 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 { prepareUpdateBotBody } from '../api/bot-body'\nimport type { ApiClient } from '../api/client'\nimport { prepareUpdateIntegrationBody, CreateIntegrationBody } from '../api/integration-body'\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: bpsdk.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    let worker: Worker | undefined = undefined\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('request', (req) => {\n        if (!worker) {\n          this.logger.debug('Worker not ready yet, ignoring request')\n          tunnel.send({ requestId: req.id, status: 503, body: 'Worker not ready yet' })\n          return\n        }\n\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    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          if (!worker) {\n            this.logger.debug('Worker not ready yet, ignoring file change event')\n            return\n          }\n\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: bpsdk.IntegrationDefinition) {\n    const initialSecrets = this._initialDef?.secrets ?? {}\n    const currentSecrets = integrationDef.secrets ?? {}\n    const newSecrets = Object.keys(currentSecrets).filter((s) => !initialSecrets[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: bpsdk.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\n    const integrationBody: CreateIntegrationBody = {\n      ...this.parseIntegrationDefinition(integrationDef),\n      url: externalUrl,\n    }\n\n    if (integration) {\n      const updateIntegrationBody = prepareUpdateIntegrationBody(\n        { ...integrationBody, id: integration.id },\n        integration\n      )\n\n      const resp = await api.client.updateIntegration(updateIntegrationBody).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.createIntegration({ ...integrationBody, dev: true }).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    line.commit()\n\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      createLine.commit()\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: bpsdk.Bot }>(outfile)\n\n    const updateLine = this.logger.line()\n    updateLine.started('Deploying dev bot...')\n\n    const updateBotBody = prepareUpdateBotBody(\n      {\n        id: bot.id,\n        url: externalUrl,\n        ...this.parseBot(botImpl),\n      },\n      bot\n    )\n\n    const { bot: updatedBot } = await api.client.updateBot(updateBotBody).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    updateLine.commit()\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/dist/command-implementations/gen-command.js

@@ -28,7 +28,6 @@ __export(gen_command_exports, {
 });
 module.exports = __toCommonJS(gen_command_exports);
 var import_chalk = __toESM(require("chalk"));
-var import_lodash = __toESM(require("lodash"));
 var codegen = __toESM(require("../code-generation"));
 var errors = __toESM(require("../errors"));
 var utils = __toESM(require("../utils"));
@@ -61,15 +60,9 @@ class GenerateCommand extends import_project_command.ProjectCommand {
     if (!secrets) {
       return;
     }
-    for (const secret of secrets) {
-      if (!utils.casing.is.screamingSnakeCase(secret)) {
-        throw new errors.BotpressCLIError(`Secret ${secret} should be in SCREAMING_SNAKE_CASE`);
-      }
-    }
-    const groups = (0, import_lodash.default)(secrets).groupBy().mapValues((s) => s.length).toPairs().value();
-    for (const [secret, count] of groups) {
-      if (count > 1) {
-        throw new errors.BotpressCLIError(`Secret ${secret} is dupplicated; It appears ${count} times`);
+    for (const secretName in secrets) {
+      if (!utils.casing.is.screamingSnakeCase(secretName)) {
+        throw new errors.BotpressCLIError(`Secret ${secretName} should be in SCREAMING_SNAKE_CASE`);
       }
     }
   }

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/command-implementations/gen-command.ts"],
-  "sourcesContent": ["import type { IntegrationDefinition } from '@botpress/sdk'\nimport chalk from 'chalk'\nimport _ from 'lodash'\nimport * as codegen from '../code-generation'\nimport type commandDefinitions from '../command-definitions'\nimport * as errors from '../errors'\nimport * as utils from '../utils'\nimport { ProjectCommand } from './project-command'\n\nexport type GenerateCommandDefinition = typeof commandDefinitions.generate\nexport class GenerateCommand extends ProjectCommand<GenerateCommandDefinition> {\n  public async run(): Promise<void> {\n    const integrationDef = await this.readIntegrationDefinitionFromFS()\n    if (!integrationDef) {\n      this.logger.warn('No typings to generate for bot')\n      return\n    }\n\n    this._validateSecrets(integrationDef)\n\n    const line = this.logger.line()\n\n    const { name } = integrationDef\n    line.started(`Generating typings for integration ${chalk.bold(name)}...`)\n\n    const fromWorkDir = this.projectPaths.rel('workDir')\n    const fromOutDir = this.projectPaths.rel('outDir')\n\n    const typingFiles = await codegen.generateIntegrationImplementationTypings(\n      integrationDef,\n      fromOutDir.implementationDir\n    )\n\n    const secretFiles = await codegen.generateIntegrationSecrets(integrationDef, fromOutDir.secretsDir)\n\n    const indexFile = await codegen.generateIntegrationIndex(fromOutDir.implementationDir, fromOutDir.secretsDir)\n\n    const generatedFiles = [...typingFiles, ...secretFiles, indexFile]\n\n    await this.writeGeneratedFilesToOutFolder(generatedFiles)\n\n    line.success(`Typings available at ${chalk.grey(fromWorkDir.outDir)}`)\n  }\n\n  private _validateSecrets(integrationDef: IntegrationDefinition): void {\n    const { secrets } = integrationDef\n    if (!secrets) {\n      return\n    }\n\n    for (const secret of secrets) {\n      if (!utils.casing.is.screamingSnakeCase(secret)) {\n        throw new errors.BotpressCLIError(`Secret ${secret} should be in SCREAMING_SNAKE_CASE`)\n      }\n    }\n\n    const groups = _(secrets)\n      .groupBy()\n      .mapValues((s) => s.length)\n      .toPairs()\n      .value()\n\n    for (const [secret, count] of groups) {\n      if (count > 1) {\n        throw new errors.BotpressCLIError(`Secret ${secret} is dupplicated; It appears ${count} times`)\n      }\n    }\n  }\n}\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,mBAAkB;AAClB,oBAAc;AACd,cAAyB;AAEzB,aAAwB;AACxB,YAAuB;AACvB,6BAA+B;AAGxB,MAAM,wBAAwB,sCAA0C;AAAA,EAC7E,MAAa,MAAqB;AAChC,UAAM,iBAAiB,MAAM,KAAK,gCAAgC;AAClE,QAAI,CAAC,gBAAgB;AACnB,WAAK,OAAO,KAAK,gCAAgC;AACjD;AAAA,IACF;AAEA,SAAK,iBAAiB,cAAc;AAEpC,UAAM,OAAO,KAAK,OAAO,KAAK;AAE9B,UAAM,EAAE,KAAK,IAAI;AACjB,SAAK,QAAQ,sCAAsC,aAAAA,QAAM,KAAK,IAAI,MAAM;AAExE,UAAM,cAAc,KAAK,aAAa,IAAI,SAAS;AACnD,UAAM,aAAa,KAAK,aAAa,IAAI,QAAQ;AAEjD,UAAM,cAAc,MAAM,QAAQ;AAAA,MAChC;AAAA,MACA,WAAW;AAAA,IACb;AAEA,UAAM,cAAc,MAAM,QAAQ,2BAA2B,gBAAgB,WAAW,UAAU;AAElG,UAAM,YAAY,MAAM,QAAQ,yBAAyB,WAAW,mBAAmB,WAAW,UAAU;AAE5G,UAAM,iBAAiB,CAAC,GAAG,aAAa,GAAG,aAAa,SAAS;AAEjE,UAAM,KAAK,+BAA+B,cAAc;AAExD,SAAK,QAAQ,wBAAwB,aAAAA,QAAM,KAAK,YAAY,MAAM,GAAG;AAAA,EACvE;AAAA,EAEQ,iBAAiB,gBAA6C;AACpE,UAAM,EAAE,QAAQ,IAAI;AACpB,QAAI,CAAC,SAAS;AACZ;AAAA,IACF;AAEA,eAAW,UAAU,SAAS;AAC5B,UAAI,CAAC,MAAM,OAAO,GAAG,mBAAmB,MAAM,GAAG;AAC/C,cAAM,IAAI,OAAO,iBAAiB,UAAU,0CAA0C;AAAA,MACxF;AAAA,IACF;AAEA,UAAM,aAAS,cAAAC,SAAE,OAAO,EACrB,QAAQ,EACR,UAAU,CAAC,MAAM,EAAE,MAAM,EACzB,QAAQ,EACR,MAAM;AAET,eAAW,CAAC,QAAQ,KAAK,KAAK,QAAQ;AACpC,UAAI,QAAQ,GAAG;AACb,cAAM,IAAI,OAAO,iBAAiB,UAAU,qCAAqC,aAAa;AAAA,MAChG;AAAA,IACF;AAAA,EACF;AACF;",
-  "names": ["chalk", "_"]
+  "sourcesContent": ["import type { IntegrationDefinition } from '@botpress/sdk'\nimport chalk from 'chalk'\nimport * as codegen from '../code-generation'\nimport type commandDefinitions from '../command-definitions'\nimport * as errors from '../errors'\nimport * as utils from '../utils'\nimport { ProjectCommand } from './project-command'\n\nexport type GenerateCommandDefinition = typeof commandDefinitions.generate\nexport class GenerateCommand extends ProjectCommand<GenerateCommandDefinition> {\n  public async run(): Promise<void> {\n    const integrationDef = await this.readIntegrationDefinitionFromFS()\n    if (!integrationDef) {\n      this.logger.warn('No typings to generate for bot')\n      return\n    }\n\n    this._validateSecrets(integrationDef)\n\n    const line = this.logger.line()\n\n    const { name } = integrationDef\n    line.started(`Generating typings for integration ${chalk.bold(name)}...`)\n\n    const fromWorkDir = this.projectPaths.rel('workDir')\n    const fromOutDir = this.projectPaths.rel('outDir')\n\n    const typingFiles = await codegen.generateIntegrationImplementationTypings(\n      integrationDef,\n      fromOutDir.implementationDir\n    )\n\n    const secretFiles = await codegen.generateIntegrationSecrets(integrationDef, fromOutDir.secretsDir)\n\n    const indexFile = await codegen.generateIntegrationIndex(fromOutDir.implementationDir, fromOutDir.secretsDir)\n\n    const generatedFiles = [...typingFiles, ...secretFiles, indexFile]\n\n    await this.writeGeneratedFilesToOutFolder(generatedFiles)\n\n    line.success(`Typings available at ${chalk.grey(fromWorkDir.outDir)}`)\n  }\n\n  private _validateSecrets(integrationDef: IntegrationDefinition): void {\n    const { secrets } = integrationDef\n    if (!secrets) {\n      return\n    }\n\n    for (const secretName in secrets) {\n      if (!utils.casing.is.screamingSnakeCase(secretName)) {\n        throw new errors.BotpressCLIError(`Secret ${secretName} should be in SCREAMING_SNAKE_CASE`)\n      }\n    }\n  }\n}\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,mBAAkB;AAClB,cAAyB;AAEzB,aAAwB;AACxB,YAAuB;AACvB,6BAA+B;AAGxB,MAAM,wBAAwB,sCAA0C;AAAA,EAC7E,MAAa,MAAqB;AAChC,UAAM,iBAAiB,MAAM,KAAK,gCAAgC;AAClE,QAAI,CAAC,gBAAgB;AACnB,WAAK,OAAO,KAAK,gCAAgC;AACjD;AAAA,IACF;AAEA,SAAK,iBAAiB,cAAc;AAEpC,UAAM,OAAO,KAAK,OAAO,KAAK;AAE9B,UAAM,EAAE,KAAK,IAAI;AACjB,SAAK,QAAQ,sCAAsC,aAAAA,QAAM,KAAK,IAAI,MAAM;AAExE,UAAM,cAAc,KAAK,aAAa,IAAI,SAAS;AACnD,UAAM,aAAa,KAAK,aAAa,IAAI,QAAQ;AAEjD,UAAM,cAAc,MAAM,QAAQ;AAAA,MAChC;AAAA,MACA,WAAW;AAAA,IACb;AAEA,UAAM,cAAc,MAAM,QAAQ,2BAA2B,gBAAgB,WAAW,UAAU;AAElG,UAAM,YAAY,MAAM,QAAQ,yBAAyB,WAAW,mBAAmB,WAAW,UAAU;AAE5G,UAAM,iBAAiB,CAAC,GAAG,aAAa,GAAG,aAAa,SAAS;AAEjE,UAAM,KAAK,+BAA+B,cAAc;AAExD,SAAK,QAAQ,wBAAwB,aAAAA,QAAM,KAAK,YAAY,MAAM,GAAG;AAAA,EACvE;AAAA,EAEQ,iBAAiB,gBAA6C;AACpE,UAAM,EAAE,QAAQ,IAAI;AACpB,QAAI,CAAC,SAAS;AACZ;AAAA,IACF;AAEA,eAAW,cAAc,SAAS;AAChC,UAAI,CAAC,MAAM,OAAO,GAAG,mBAAmB,UAAU,GAAG;AACnD,cAAM,IAAI,OAAO,iBAAiB,UAAU,8CAA8C;AAAA,MAC5F;AAAA,IACF;AAAA,EACF;AACF;",
+  "names": ["chalk"]
 }

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

@@ -162,23 +162,29 @@ class ProjectCommand extends import_global_command.GlobalCommand {
       return {};
     }
     const secretArgv = this._parseArgvSecrets(argv.secrets);
-    const invalidSecret = Object.keys(secretArgv).find((s) => !secretDefinitions.includes(s));
+    const invalidSecret = Object.keys(secretArgv).find((s) => !secretDefinitions[s]);
     if (invalidSecret) {
       throw new errors.BotpressCLIError(`Secret ${invalidSecret} is not defined in integration definition`);
     }
     const values = {};
-    for (const secretDef of secretDefinitions) {
-      const argvSecret = secretArgv[secretDef];
+    for (const [secretName, { optional }] of Object.entries(secretDefinitions)) {
+      const argvSecret = secretArgv[secretName];
       if (argvSecret) {
-        this.logger.debug(`Using secret "${secretDef}" from argv`);
-        values[secretDef] = argvSecret;
+        this.logger.debug(`Using secret "${secretName}" from argv`);
+        values[secretName] = argvSecret;
         continue;
       }
-      const prompted = await this.prompt.text(`Enter value for secret "${secretDef}"`);
-      if (!prompted) {
-        throw new errors.BotpressCLIError("Secret is required");
+      const mode = optional ? "optional" : "required";
+      const prompted = await this.prompt.text(`Enter value for secret "${secretName}" (${mode})`);
+      if (prompted) {
+        values[secretName] = prompted;
+        continue;
+      }
+      if (optional) {
+        this.logger.warn(`Secret "${secretName}" is unassigned`);
+        continue;
       }
-      values[secretDef] = prompted;
+      throw new errors.BotpressCLIError(`Secret "${secretName}" is required`);
     }
     const envVariables = import_lodash.default.mapKeys(values, (_v, k) => codegen.secretEnvVariableName(k));
     return envVariables;

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/command-implementations/project-command.ts"],
-  "sourcesContent": ["import type * as bpclient from '@botpress/client'\nimport type * as bpsdk from '@botpress/sdk'\nimport type { YargsConfig } from '@bpinternal/yargs-extra'\nimport chalk from 'chalk'\nimport fs from 'fs'\nimport _ from 'lodash'\nimport pathlib from 'path'\nimport * as codegen from '../code-generation'\nimport type * as config from '../config'\nimport * as consts from '../consts'\nimport * as errors from '../errors'\nimport type { CommandArgv, CommandDefinition } from '../typings'\nimport * as utils from '../utils'\nimport { GlobalCommand } from './global-command'\n\nexport type ProjectCommandDefinition = CommandDefinition<typeof config.schemas.project>\nexport type ProjectCache = { botId: string; devId: string }\n\ntype ConfigurableProjectPaths = { entryPoint: string; outDir: string; workDir: string }\ntype ConstantProjectPaths = typeof consts.fromOutDir & typeof consts.fromWorkDir\ntype AllProjectPaths = ConfigurableProjectPaths & ConstantProjectPaths\n\nclass ProjectPaths extends utils.path.PathStore<keyof AllProjectPaths> {\n  public constructor(argv: CommandArgv<ProjectCommandDefinition>) {\n    const absWorkDir = utils.path.absoluteFrom(utils.path.cwd(), argv.workDir)\n    const absEntrypoint = utils.path.absoluteFrom(absWorkDir, argv.entryPoint)\n    const absOutDir = utils.path.absoluteFrom(absWorkDir, argv.outDir)\n    super({\n      workDir: absWorkDir,\n      entryPoint: absEntrypoint,\n      outDir: absOutDir,\n      ..._.mapValues(consts.fromOutDir, (p) => utils.path.absoluteFrom(absOutDir, p)),\n      ..._.mapValues(consts.fromWorkDir, (p) => utils.path.absoluteFrom(absWorkDir, p)),\n    })\n  }\n}\n\nexport abstract class ProjectCommand<C extends ProjectCommandDefinition> extends GlobalCommand<C> {\n  protected get projectPaths() {\n    return new ProjectPaths(this.argv)\n  }\n\n  protected get projectCache() {\n    return new utils.cache.FSKeyValueCache<ProjectCache>(this.projectPaths.abs.projectCacheFile)\n  }\n\n  protected parseBot(bot: bpsdk.Bot) {\n    return {\n      ...bot.props,\n      integrations: _(bot.props.integrations)\n        .values()\n        .filter(utils.guards.is.defined)\n        .keyBy((i) => i.id)\n        .mapValues(({ enabled, configuration }) => ({ enabled, configuration }))\n        .value(),\n      configuration: bot.props.configuration\n        ? {\n            ...bot.props.configuration,\n            schema: utils.schema.mapZodToJsonSchema(bot.props.configuration),\n          }\n        : undefined,\n      events: bot.props.events\n        ? _.mapValues(bot.props.events, (event) => ({\n            ...event,\n            schema: utils.schema.mapZodToJsonSchema(event),\n          }))\n        : undefined,\n      states: bot.props.states\n        ? _.mapValues(bot.props.states, (state) => ({\n            ...state,\n            schema: utils.schema.mapZodToJsonSchema(state),\n          }))\n        : undefined,\n    }\n  }\n\n  protected parseIntegrationDefinition(integration: bpsdk.IntegrationDefinition) {\n    return {\n      ...integration,\n      configuration: integration.configuration\n        ? {\n            ...integration.configuration,\n            schema: utils.schema.mapZodToJsonSchema(integration.configuration),\n          }\n        : undefined,\n      events: integration.events\n        ? _.mapValues(integration.events, (event) => ({\n            ...event,\n            schema: utils.schema.mapZodToJsonSchema(event),\n          }))\n        : undefined,\n      actions: integration.actions\n        ? _.mapValues(integration.actions, (action) => ({\n            ...action,\n            input: {\n              ...action.input,\n              schema: utils.schema.mapZodToJsonSchema(action.input),\n            },\n            output: {\n              ...action.output,\n              schema: utils.schema.mapZodToJsonSchema(action.output),\n            },\n          }))\n        : undefined,\n      channels: integration.channels\n        ? _.mapValues(integration.channels, (channel) => ({\n            ...channel,\n            messages: _.mapValues(channel.messages, (message) => ({\n              ...message,\n              schema: utils.schema.mapZodToJsonSchema(message),\n            })),\n          }))\n        : undefined,\n      states: integration.states\n        ? _.mapValues(integration.states, (state) => ({\n            ...state,\n            schema: utils.schema.mapZodToJsonSchema(state),\n          }))\n        : undefined,\n    }\n  }\n\n  protected async readIntegrationDefinitionFromFS(): Promise<bpsdk.IntegrationDefinition | undefined> {\n    const abs = this.projectPaths.abs\n    const rel = this.projectPaths.rel('workDir')\n\n    if (!fs.existsSync(abs.definition)) {\n      this.logger.debug(`Integration definition not found at ${rel.definition}`)\n      return\n    }\n\n    const { outputFiles } = await utils.esbuild.buildEntrypoint({\n      cwd: abs.workDir,\n      outfile: '',\n      entrypoint: rel.definition,\n      write: false,\n    })\n\n    const artifact = outputFiles[0]\n    if (!artifact) {\n      throw new errors.BotpressCLIError('Could not read integration definition')\n    }\n\n    const { default: definition } = utils.require.requireJsCode<{ default: bpsdk.IntegrationDefinition }>(artifact.text)\n    return definition\n  }\n\n  protected async writeGeneratedFilesToOutFolder(files: codegen.File[]) {\n    for (const file of files) {\n      const filePath = utils.path.absoluteFrom(this.projectPaths.abs.outDir, file.path)\n      const dirPath = pathlib.dirname(filePath)\n      await fs.promises.mkdir(dirPath, { recursive: true })\n      await fs.promises.writeFile(filePath, file.content)\n    }\n  }\n\n  protected displayWebhookUrls(bot: bpclient.Bot) {\n    if (!_.keys(bot.integrations).length) {\n      this.logger.debug('No integrations in bot')\n      return\n    }\n\n    this.logger.log('Integrations:')\n    for (const integration of Object.values(bot.integrations).filter(utils.guards.is.defined)) {\n      if (!integration.enabled) {\n        this.logger.log(`${chalk.grey(integration.name)} ${chalk.italic('(disabled)')}: ${integration.webhookUrl}`, {\n          prefix: { symbol: '\u25CB', indent: 2 },\n        })\n      } else {\n        this.logger.log(`${chalk.bold(integration.name)} : ${integration.webhookUrl}`, {\n          prefix: { symbol: '\u25CF', indent: 2 },\n        })\n      }\n    }\n  }\n\n  protected async promptSecrets(\n    integrationDef: bpsdk.IntegrationDefinition,\n    argv: YargsConfig<typeof config.schemas.secrets>\n  ): Promise<Record<string, string>> {\n    const { secrets: secretDefinitions } = integrationDef\n    if (!secretDefinitions) {\n      return {}\n    }\n\n    const secretArgv = this._parseArgvSecrets(argv.secrets)\n    const invalidSecret = Object.keys(secretArgv).find((s) => !secretDefinitions.includes(s))\n    if (invalidSecret) {\n      throw new errors.BotpressCLIError(`Secret ${invalidSecret} is not defined in integration definition`)\n    }\n\n    const values: Record<string, string> = {}\n    for (const secretDef of secretDefinitions) {\n      const argvSecret = secretArgv[secretDef]\n      if (argvSecret) {\n        this.logger.debug(`Using secret \"${secretDef}\" from argv`)\n        values[secretDef] = argvSecret\n        continue\n      }\n\n      const prompted = await this.prompt.text(`Enter value for secret \"${secretDef}\"`)\n      if (!prompted) {\n        throw new errors.BotpressCLIError('Secret is required')\n      }\n      values[secretDef] = prompted\n    }\n\n    const envVariables = _.mapKeys(values, (_v, k) => codegen.secretEnvVariableName(k))\n    return envVariables\n  }\n\n  private _parseArgvSecrets(argvSecrets: string[]): Record<string, string> {\n    const parsed: Record<string, string> = {}\n    for (const secret of argvSecrets) {\n      const [key, value] = this._splitOnce(secret, '=')\n      if (!value) {\n        throw new errors.BotpressCLIError(\n          `Secret \"${key}\" is missing a value. Expected format: \"SECRET_NAME=secretValue\"`\n        )\n      }\n      parsed[key!] = value\n    }\n\n    return parsed\n  }\n\n  private _splitOnce = (text: string, separator: string): [string, string | undefined] => {\n    const index = text.indexOf(separator)\n    if (index === -1) {\n      return [text, undefined]\n    }\n    return [text.slice(0, index), text.slice(index + 1)]\n  }\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["import type * as bpclient from '@botpress/client'\nimport type * as bpsdk from '@botpress/sdk'\nimport type { YargsConfig } from '@bpinternal/yargs-extra'\nimport chalk from 'chalk'\nimport fs from 'fs'\nimport _ from 'lodash'\nimport pathlib from 'path'\nimport * as codegen from '../code-generation'\nimport type * as config from '../config'\nimport * as consts from '../consts'\nimport * as errors from '../errors'\nimport type { CommandArgv, CommandDefinition } from '../typings'\nimport * as utils from '../utils'\nimport { GlobalCommand } from './global-command'\n\nexport type ProjectCommandDefinition = CommandDefinition<typeof config.schemas.project>\nexport type ProjectCache = { botId: string; devId: string }\n\ntype ConfigurableProjectPaths = { entryPoint: string; outDir: string; workDir: string }\ntype ConstantProjectPaths = typeof consts.fromOutDir & typeof consts.fromWorkDir\ntype AllProjectPaths = ConfigurableProjectPaths & ConstantProjectPaths\n\nclass ProjectPaths extends utils.path.PathStore<keyof AllProjectPaths> {\n  public constructor(argv: CommandArgv<ProjectCommandDefinition>) {\n    const absWorkDir = utils.path.absoluteFrom(utils.path.cwd(), argv.workDir)\n    const absEntrypoint = utils.path.absoluteFrom(absWorkDir, argv.entryPoint)\n    const absOutDir = utils.path.absoluteFrom(absWorkDir, argv.outDir)\n    super({\n      workDir: absWorkDir,\n      entryPoint: absEntrypoint,\n      outDir: absOutDir,\n      ..._.mapValues(consts.fromOutDir, (p) => utils.path.absoluteFrom(absOutDir, p)),\n      ..._.mapValues(consts.fromWorkDir, (p) => utils.path.absoluteFrom(absWorkDir, p)),\n    })\n  }\n}\n\nexport abstract class ProjectCommand<C extends ProjectCommandDefinition> extends GlobalCommand<C> {\n  protected get projectPaths() {\n    return new ProjectPaths(this.argv)\n  }\n\n  protected get projectCache() {\n    return new utils.cache.FSKeyValueCache<ProjectCache>(this.projectPaths.abs.projectCacheFile)\n  }\n\n  protected parseBot(bot: bpsdk.Bot) {\n    return {\n      ...bot.props,\n      integrations: _(bot.props.integrations)\n        .values()\n        .filter(utils.guards.is.defined)\n        .keyBy((i) => i.id)\n        .mapValues(({ enabled, configuration }) => ({ enabled, configuration }))\n        .value(),\n      configuration: bot.props.configuration\n        ? {\n            ...bot.props.configuration,\n            schema: utils.schema.mapZodToJsonSchema(bot.props.configuration),\n          }\n        : undefined,\n      events: bot.props.events\n        ? _.mapValues(bot.props.events, (event) => ({\n            ...event,\n            schema: utils.schema.mapZodToJsonSchema(event),\n          }))\n        : undefined,\n      states: bot.props.states\n        ? _.mapValues(bot.props.states, (state) => ({\n            ...state,\n            schema: utils.schema.mapZodToJsonSchema(state),\n          }))\n        : undefined,\n    }\n  }\n\n  protected parseIntegrationDefinition(integration: bpsdk.IntegrationDefinition) {\n    return {\n      ...integration,\n      configuration: integration.configuration\n        ? {\n            ...integration.configuration,\n            schema: utils.schema.mapZodToJsonSchema(integration.configuration),\n          }\n        : undefined,\n      events: integration.events\n        ? _.mapValues(integration.events, (event) => ({\n            ...event,\n            schema: utils.schema.mapZodToJsonSchema(event),\n          }))\n        : undefined,\n      actions: integration.actions\n        ? _.mapValues(integration.actions, (action) => ({\n            ...action,\n            input: {\n              ...action.input,\n              schema: utils.schema.mapZodToJsonSchema(action.input),\n            },\n            output: {\n              ...action.output,\n              schema: utils.schema.mapZodToJsonSchema(action.output),\n            },\n          }))\n        : undefined,\n      channels: integration.channels\n        ? _.mapValues(integration.channels, (channel) => ({\n            ...channel,\n            messages: _.mapValues(channel.messages, (message) => ({\n              ...message,\n              schema: utils.schema.mapZodToJsonSchema(message),\n            })),\n          }))\n        : undefined,\n      states: integration.states\n        ? _.mapValues(integration.states, (state) => ({\n            ...state,\n            schema: utils.schema.mapZodToJsonSchema(state),\n          }))\n        : undefined,\n    }\n  }\n\n  protected async readIntegrationDefinitionFromFS(): Promise<bpsdk.IntegrationDefinition | undefined> {\n    const abs = this.projectPaths.abs\n    const rel = this.projectPaths.rel('workDir')\n\n    if (!fs.existsSync(abs.definition)) {\n      this.logger.debug(`Integration definition not found at ${rel.definition}`)\n      return\n    }\n\n    const { outputFiles } = await utils.esbuild.buildEntrypoint({\n      cwd: abs.workDir,\n      outfile: '',\n      entrypoint: rel.definition,\n      write: false,\n    })\n\n    const artifact = outputFiles[0]\n    if (!artifact) {\n      throw new errors.BotpressCLIError('Could not read integration definition')\n    }\n\n    const { default: definition } = utils.require.requireJsCode<{ default: bpsdk.IntegrationDefinition }>(artifact.text)\n    return definition\n  }\n\n  protected async writeGeneratedFilesToOutFolder(files: codegen.File[]) {\n    for (const file of files) {\n      const filePath = utils.path.absoluteFrom(this.projectPaths.abs.outDir, file.path)\n      const dirPath = pathlib.dirname(filePath)\n      await fs.promises.mkdir(dirPath, { recursive: true })\n      await fs.promises.writeFile(filePath, file.content)\n    }\n  }\n\n  protected displayWebhookUrls(bot: bpclient.Bot) {\n    if (!_.keys(bot.integrations).length) {\n      this.logger.debug('No integrations in bot')\n      return\n    }\n\n    this.logger.log('Integrations:')\n    for (const integration of Object.values(bot.integrations).filter(utils.guards.is.defined)) {\n      if (!integration.enabled) {\n        this.logger.log(`${chalk.grey(integration.name)} ${chalk.italic('(disabled)')}: ${integration.webhookUrl}`, {\n          prefix: { symbol: '\u25CB', indent: 2 },\n        })\n      } else {\n        this.logger.log(`${chalk.bold(integration.name)} : ${integration.webhookUrl}`, {\n          prefix: { symbol: '\u25CF', indent: 2 },\n        })\n      }\n    }\n  }\n\n  protected async promptSecrets(\n    integrationDef: bpsdk.IntegrationDefinition,\n    argv: YargsConfig<typeof config.schemas.secrets>\n  ): Promise<Record<string, string>> {\n    const { secrets: secretDefinitions } = integrationDef\n    if (!secretDefinitions) {\n      return {}\n    }\n\n    const secretArgv = this._parseArgvSecrets(argv.secrets)\n    const invalidSecret = Object.keys(secretArgv).find((s) => !secretDefinitions[s])\n    if (invalidSecret) {\n      throw new errors.BotpressCLIError(`Secret ${invalidSecret} is not defined in integration definition`)\n    }\n\n    const values: Record<string, string> = {}\n    for (const [secretName, { optional }] of Object.entries(secretDefinitions)) {\n      const argvSecret = secretArgv[secretName]\n      if (argvSecret) {\n        this.logger.debug(`Using secret \"${secretName}\" from argv`)\n        values[secretName] = argvSecret\n        continue\n      }\n\n      const mode = optional ? 'optional' : 'required'\n      const prompted = await this.prompt.text(`Enter value for secret \"${secretName}\" (${mode})`)\n      if (prompted) {\n        values[secretName] = prompted\n        continue\n      }\n\n      if (optional) {\n        this.logger.warn(`Secret \"${secretName}\" is unassigned`)\n        continue\n      }\n\n      throw new errors.BotpressCLIError(`Secret \"${secretName}\" is required`)\n    }\n\n    const envVariables = _.mapKeys(values, (_v, k) => codegen.secretEnvVariableName(k))\n    return envVariables\n  }\n\n  private _parseArgvSecrets(argvSecrets: string[]): Record<string, string> {\n    const parsed: Record<string, string> = {}\n    for (const secret of argvSecrets) {\n      const [key, value] = this._splitOnce(secret, '=')\n      if (!value) {\n        throw new errors.BotpressCLIError(\n          `Secret \"${key}\" is missing a value. Expected format: \"SECRET_NAME=secretValue\"`\n        )\n      }\n      parsed[key!] = value\n    }\n\n    return parsed\n  }\n\n  private _splitOnce = (text: string, separator: string): [string, string | undefined] => {\n    const index = text.indexOf(separator)\n    if (index === -1) {\n      return [text, undefined]\n    }\n    return [text.slice(0, index), text.slice(index + 1)]\n  }\n}\n"],
+  "mappings": "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",
   "names": ["_", "fs", "pathlib", "chalk"]
 }

package/dist/utils/prompt-utils.js

@@ -24,17 +24,10 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var prompt_utils_exports = {};
 __export(prompt_utils_exports, {
-  CLIPrompt: () => CLIPrompt,
-  NonInteractiveError: () => NonInteractiveError
+  CLIPrompt: () => CLIPrompt
 });
 module.exports = __toCommonJS(prompt_utils_exports);
 var import_prompts = __toESM(require("prompts"));
-class NonInteractiveError extends Error {
-  constructor(message) {
-    super(`${message}:
-  Cannot prompt for input in non-interactive mode`);
-  }
-}
 class CLIPrompt {
   constructor(_props, _logger) {
     this._props = _props;
@@ -42,7 +35,7 @@ class CLIPrompt {
   }
   async confirm(message) {
     if (this._props.confirm) {
-      this._logger.debug(`Confirming automatically: ${message}`);
+      this._logger.debug(`Confirming automatically (non-interactive mode): ${message}`);
       return true;
     }
     const { confirm } = await this._prompts({
@@ -56,9 +49,10 @@ class CLIPrompt {
     }
     return true;
   }
-  async password(message, opts) {
+  async password(message, opts = {}) {
     if (this._props.confirm) {
-      throw new NonInteractiveError(message);
+      this._logger.debug(`Return default (non-interactive mode): ${message}`);
+      return opts?.default;
     }
     const { prompted } = await this._prompts({
       type: "password",
@@ -68,9 +62,10 @@ class CLIPrompt {
     });
     return prompted ? prompted : void 0;
   }
-  async select(message, opts) {
+  async select(message, opts = {}) {
     if (this._props.confirm) {
-      throw new NonInteractiveError(message);
+      this._logger.debug(`Return default (non-interactive mode): ${message}`);
+      return opts?.default;
     }
     const { prompted } = await this._prompts({
       type: "autocomplete",
@@ -81,9 +76,10 @@ class CLIPrompt {
     });
     return prompted ? prompted : void 0;
   }
-  async text(message, opts) {
+  async text(message, opts = {}) {
     if (this._props.confirm) {
-      throw new NonInteractiveError(message);
+      this._logger.debug(`Return default (non-interactive mode): ${message}`);
+      return opts?.default;
     }
     const { prompted } = await this._prompts({
       type: "text",
@@ -100,7 +96,6 @@ class CLIPrompt {
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  CLIPrompt,
-  NonInteractiveError
+  CLIPrompt
 });
 //# sourceMappingURL=prompt-utils.js.map

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/utils/prompt-utils.ts"],
-  "sourcesContent": ["import prompts from 'prompts'\nimport type { Logger } from '../logger'\n\nexport type CLIPromptsProps = {\n  confirm: boolean\n}\n\nexport type CLIPromptsChoice<V extends string> = {\n  title: string\n  value: V\n}\n\nexport class NonInteractiveError extends Error {\n  constructor(message: string) {\n    super(`${message}:\\n  Cannot prompt for input in non-interactive mode`)\n  }\n}\n\nexport class CLIPrompt {\n  constructor(private _props: CLIPromptsProps, private _logger: Logger) {}\n\n  public async confirm(message: string): Promise<boolean> {\n    if (this._props.confirm) {\n      this._logger.debug(`Confirming automatically: ${message}`)\n      return true\n    }\n\n    const { confirm } = await this._prompts({\n      type: 'confirm',\n      name: 'confirm',\n      message,\n      initial: false,\n    })\n\n    if (!confirm) {\n      return false\n    }\n    return true\n  }\n\n  public async password(message: string, opts?: { initial?: string }): Promise<string | undefined> {\n    if (this._props.confirm) {\n      throw new NonInteractiveError(message)\n    }\n\n    const { prompted } = await this._prompts({\n      type: 'password',\n      name: 'prompted',\n      message,\n      initial: opts?.initial,\n    })\n\n    return prompted ? prompted : undefined\n  }\n\n  public async select<V extends string>(\n    message: string,\n    opts?: { initial?: CLIPromptsChoice<V>; choices: CLIPromptsChoice<V>[] }\n  ): Promise<V | undefined> {\n    if (this._props.confirm) {\n      throw new NonInteractiveError(message)\n    }\n\n    const { prompted } = await this._prompts({\n      type: 'autocomplete',\n      name: 'prompted',\n      message,\n      initial: opts?.initial?.value,\n      choices: opts?.choices,\n    })\n    return prompted ? prompted : undefined\n  }\n\n  public async text(message: string, opts?: { initial?: string }): Promise<string | undefined> {\n    if (this._props.confirm) {\n      throw new NonInteractiveError(message)\n    }\n\n    const { prompted } = await this._prompts({\n      type: 'text',\n      name: 'prompted',\n      message,\n      initial: opts?.initial,\n    })\n\n    return prompted ? prompted : undefined\n  }\n\n  private _prompts = (...args: Parameters<typeof prompts>): ReturnType<typeof prompts> => {\n    this._logger.cleanup()\n    return prompts(...args)\n  }\n}\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,qBAAoB;AAYb,MAAM,4BAA4B,MAAM;AAAA,EAC7C,YAAY,SAAiB;AAC3B,UAAM,GAAG;AAAA,kDAA6D;AAAA,EACxE;AACF;AAEO,MAAM,UAAU;AAAA,EACrB,YAAoB,QAAiC,SAAiB;AAAlD;AAAiC;AAAA,EAAkB;AAAA,EAEvE,MAAa,QAAQ,SAAmC;AACtD,QAAI,KAAK,OAAO,SAAS;AACvB,WAAK,QAAQ,MAAM,6BAA6B,SAAS;AACzD,aAAO;AAAA,IACT;AAEA,UAAM,EAAE,QAAQ,IAAI,MAAM,KAAK,SAAS;AAAA,MACtC,MAAM;AAAA,MACN,MAAM;AAAA,MACN;AAAA,MACA,SAAS;AAAA,IACX,CAAC;AAED,QAAI,CAAC,SAAS;AACZ,aAAO;AAAA,IACT;AACA,WAAO;AAAA,EACT;AAAA,EAEA,MAAa,SAAS,SAAiB,MAA0D;AAC/F,QAAI,KAAK,OAAO,SAAS;AACvB,YAAM,IAAI,oBAAoB,OAAO;AAAA,IACvC;AAEA,UAAM,EAAE,SAAS,IAAI,MAAM,KAAK,SAAS;AAAA,MACvC,MAAM;AAAA,MACN,MAAM;AAAA,MACN;AAAA,MACA,SAAS,MAAM;AAAA,IACjB,CAAC;AAED,WAAO,WAAW,WAAW;AAAA,EAC/B;AAAA,EAEA,MAAa,OACX,SACA,MACwB;AACxB,QAAI,KAAK,OAAO,SAAS;AACvB,YAAM,IAAI,oBAAoB,OAAO;AAAA,IACvC;AAEA,UAAM,EAAE,SAAS,IAAI,MAAM,KAAK,SAAS;AAAA,MACvC,MAAM;AAAA,MACN,MAAM;AAAA,MACN;AAAA,MACA,SAAS,MAAM,SAAS;AAAA,MACxB,SAAS,MAAM;AAAA,IACjB,CAAC;AACD,WAAO,WAAW,WAAW;AAAA,EAC/B;AAAA,EAEA,MAAa,KAAK,SAAiB,MAA0D;AAC3F,QAAI,KAAK,OAAO,SAAS;AACvB,YAAM,IAAI,oBAAoB,OAAO;AAAA,IACvC;AAEA,UAAM,EAAE,SAAS,IAAI,MAAM,KAAK,SAAS;AAAA,MACvC,MAAM;AAAA,MACN,MAAM;AAAA,MACN;AAAA,MACA,SAAS,MAAM;AAAA,IACjB,CAAC;AAED,WAAO,WAAW,WAAW;AAAA,EAC/B;AAAA,EAEQ,WAAW,IAAI,SAAiE;AACtF,SAAK,QAAQ,QAAQ;AACrB,eAAO,eAAAA,SAAQ,GAAG,IAAI;AAAA,EACxB;AACF;",
+  "sourcesContent": ["import prompts from 'prompts'\nimport type { Logger } from '../logger'\n\nexport type CLIPromptsProps = {\n  confirm: boolean\n}\n\nexport type CLIPromptsChoice<V extends string> = {\n  title: string\n  value: V\n}\n\ntype PasswordOptions = Partial<{\n  default: string | undefined\n  initial: string\n}>\ntype SelectOptions<V extends string> = Partial<{\n  default: V | undefined\n  initial: CLIPromptsChoice<V>\n  choices: CLIPromptsChoice<V>[]\n}>\ntype TextOptions = Partial<{\n  default: string | undefined\n  initial: string\n}>\n\nexport class CLIPrompt {\n  constructor(private _props: CLIPromptsProps, private _logger: Logger) {}\n\n  public async confirm(message: string): Promise<boolean> {\n    if (this._props.confirm) {\n      this._logger.debug(`Confirming automatically (non-interactive mode): ${message}`)\n      return true\n    }\n\n    const { confirm } = await this._prompts({\n      type: 'confirm',\n      name: 'confirm',\n      message,\n      initial: false,\n    })\n\n    if (!confirm) {\n      return false\n    }\n    return true\n  }\n\n  public async password(message: string, opts: PasswordOptions = {}): Promise<string | undefined> {\n    if (this._props.confirm) {\n      this._logger.debug(`Return default (non-interactive mode): ${message}`)\n      return opts?.default\n    }\n\n    const { prompted } = await this._prompts({\n      type: 'password',\n      name: 'prompted',\n      message,\n      initial: opts?.initial,\n    })\n\n    return prompted ? prompted : undefined\n  }\n\n  public async select<V extends string>(message: string, opts: SelectOptions<V> = {}): Promise<V | undefined> {\n    if (this._props.confirm) {\n      this._logger.debug(`Return default (non-interactive mode): ${message}`)\n      return opts?.default\n    }\n\n    const { prompted } = await this._prompts({\n      type: 'autocomplete',\n      name: 'prompted',\n      message,\n      initial: opts?.initial?.value,\n      choices: opts?.choices,\n    })\n    return prompted ? prompted : undefined\n  }\n\n  public async text(message: string, opts: TextOptions = {}): Promise<string | undefined> {\n    if (this._props.confirm) {\n      this._logger.debug(`Return default (non-interactive mode): ${message}`)\n      return opts?.default\n    }\n\n    const { prompted } = await this._prompts({\n      type: 'text',\n      name: 'prompted',\n      message,\n      initial: opts?.initial,\n    })\n\n    return prompted ? prompted : undefined\n  }\n\n  private _prompts = (...args: Parameters<typeof prompts>): ReturnType<typeof prompts> => {\n    this._logger.cleanup()\n    return prompts(...args)\n  }\n}\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,qBAAoB;AA0Bb,MAAM,UAAU;AAAA,EACrB,YAAoB,QAAiC,SAAiB;AAAlD;AAAiC;AAAA,EAAkB;AAAA,EAEvE,MAAa,QAAQ,SAAmC;AACtD,QAAI,KAAK,OAAO,SAAS;AACvB,WAAK,QAAQ,MAAM,oDAAoD,SAAS;AAChF,aAAO;AAAA,IACT;AAEA,UAAM,EAAE,QAAQ,IAAI,MAAM,KAAK,SAAS;AAAA,MACtC,MAAM;AAAA,MACN,MAAM;AAAA,MACN;AAAA,MACA,SAAS;AAAA,IACX,CAAC;AAED,QAAI,CAAC,SAAS;AACZ,aAAO;AAAA,IACT;AACA,WAAO;AAAA,EACT;AAAA,EAEA,MAAa,SAAS,SAAiB,OAAwB,CAAC,GAAgC;AAC9F,QAAI,KAAK,OAAO,SAAS;AACvB,WAAK,QAAQ,MAAM,0CAA0C,SAAS;AACtE,aAAO,MAAM;AAAA,IACf;AAEA,UAAM,EAAE,SAAS,IAAI,MAAM,KAAK,SAAS;AAAA,MACvC,MAAM;AAAA,MACN,MAAM;AAAA,MACN;AAAA,MACA,SAAS,MAAM;AAAA,IACjB,CAAC;AAED,WAAO,WAAW,WAAW;AAAA,EAC/B;AAAA,EAEA,MAAa,OAAyB,SAAiB,OAAyB,CAAC,GAA2B;AAC1G,QAAI,KAAK,OAAO,SAAS;AACvB,WAAK,QAAQ,MAAM,0CAA0C,SAAS;AACtE,aAAO,MAAM;AAAA,IACf;AAEA,UAAM,EAAE,SAAS,IAAI,MAAM,KAAK,SAAS;AAAA,MACvC,MAAM;AAAA,MACN,MAAM;AAAA,MACN;AAAA,MACA,SAAS,MAAM,SAAS;AAAA,MACxB,SAAS,MAAM;AAAA,IACjB,CAAC;AACD,WAAO,WAAW,WAAW;AAAA,EAC/B;AAAA,EAEA,MAAa,KAAK,SAAiB,OAAoB,CAAC,GAAgC;AACtF,QAAI,KAAK,OAAO,SAAS;AACvB,WAAK,QAAQ,MAAM,0CAA0C,SAAS;AACtE,aAAO,MAAM;AAAA,IACf;AAEA,UAAM,EAAE,SAAS,IAAI,MAAM,KAAK,SAAS;AAAA,MACvC,MAAM;AAAA,MACN,MAAM;AAAA,MACN;AAAA,MACA,SAAS,MAAM;AAAA,IACjB,CAAC;AAED,WAAO,WAAW,WAAW;AAAA,EAC/B;AAAA,EAEQ,WAAW,IAAI,SAAiE;AACtF,SAAK,QAAQ,QAAQ;AACrB,eAAO,eAAAA,SAAQ,GAAG,IAAI;AAAA,EACxB;AACF;",
   "names": ["prompts"]
 }

package/e2e/index.ts

@@ -4,10 +4,11 @@ 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 { requiredSecrets } from './tests/integration-secrets'
 import { Test } from './typings'
 import { sleep, TmpDirectory } from './utils'
 
-const tests: Test[] = [createDeployBot, createDeployIntegration, devBot]
+const tests: Test[] = [createDeployBot, createDeployIntegration, devBot, requiredSecrets]
 
 const timeout = (ms: number) =>
   sleep(ms).then(() => {

package/e2e/tests/integration-secrets.ts

@@ -0,0 +1,98 @@
+import { Client } from '@botpress/client'
+import * as sdk from '@botpress/sdk'
+import fs from 'fs'
+import pathlib from 'path'
+import * as uuid from 'uuid'
+import impl from '../../src/command-implementations'
+import { fetchAllIntegrations, ApiIntegration } from '../api'
+import defaults from '../defaults'
+import { Test } from '../typings'
+import * as utils from '../utils'
+
+type SecretDef = NonNullable<sdk.IntegrationDefinitionProps['secrets']>
+
+const fetchIntegration = async (client: Client, integrationName: string): Promise<ApiIntegration | undefined> => {
+  const integrations = await fetchAllIntegrations(client)
+  return integrations.find(({ name }) => name === integrationName)
+}
+
+const appendSecretDefinition = (originalTsContent: string, secrets: SecretDef): string => {
+  const regex = /( *)version: (['"].*['"]),/
+  const replacement = [
+    'version: $2,',
+    'secrets: {',
+    ...Object.entries(secrets).map(([secretName, secretDef]) => `  ${secretName}: ${JSON.stringify(secretDef)},`),
+    '},',
+  ]
+    .map((s) => `$1${s}`) // for indentation
+    .join('\n')
+
+  const modifiedTsContent = originalTsContent.replace(regex, replacement)
+  return modifiedTsContent
+}
+
+export const requiredSecrets: Test = {
+  name: 'cli should require required secrets',
+  handler: async ({ tmpDir, dependencies, ...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 definitionPath = pathlib.join(integrationDir, 'integration.definition.ts')
+
+    const argv = {
+      ...defaults,
+      botpressHome: botpressHomeDir,
+      confirm: true,
+      ...creds,
+    }
+
+    const client = new Client({ apiUrl: creds.apiUrl, token: creds.token, workspaceId: creds.workspaceId })
+
+    await impl
+      .init({ ...argv, workDir: baseDir, name: integrationName, type: 'integration' })
+      .then(utils.handleExitCode)
+
+    const originalDefinition: string = fs.readFileSync(definitionPath, 'utf-8')
+    const modifiedDefinition = appendSecretDefinition(originalDefinition, {
+      REQUIRED_SECRET: {},
+      OPTIONAL_SECRET: { optional: true },
+    })
+    fs.writeFileSync(definitionPath, modifiedDefinition, 'utf-8')
+    await impl.build({ ...argv, workDir: integrationDir }).then(utils.handleExitCode)
+
+    await utils.fixBotpressDependencies({ workDir: integrationDir, target: dependencies })
+    await utils.npmInstall({ workDir: integrationDir }).then(utils.handleExitCode)
+    await impl.build({ ...argv, workDir: integrationDir }).then(utils.handleExitCode)
+    await impl.login({ ...argv }).then(utils.handleExitCode)
+
+    const { exitCode } = await impl.deploy({
+      ...argv,
+      workDir: integrationDir,
+      secrets: ['OPTIONAL_SECRET=lol'],
+      botId: undefined,
+      createNewBot: undefined,
+    })
+    if (exitCode === 0) {
+      throw new Error('Expected deploy to fail')
+    }
+
+    await impl
+      .deploy({
+        ...argv,
+        workDir: integrationDir,
+        secrets: ['REQUIRED_SECRET=lol'],
+        botId: undefined,
+        createNewBot: undefined,
+      })
+      .then(utils.handleExitCode)
+
+    // cleanup deployed integration
+    const integration = await fetchIntegration(client, integrationName)
+    if (!integration) {
+      throw new Error(`Integration ${integrationName} should have been created`)
+    }
+    await client.deleteIntegration({ id: integration.id })
+  },
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@botpress/cli",
-  "version": "0.3.2",
+  "version": "0.4.1",
   "description": "Botpress CLI",
   "scripts": {
     "build": "pnpm run bundle && pnpm run template:gen",
@@ -20,7 +20,7 @@
   },
   "main": "dist/index.js",
   "dependencies": {
-    "@botpress/client": "0.3.4",
+    "@botpress/client": "0.3.5",
     "@bpinternal/tunnel": "^0.1.0",
     "@bpinternal/yargs-extra": "^0.0.3",
     "@bpinternal/zod-to-json-schema": "^3.21.4",
@@ -47,7 +47,7 @@
     "zod": "^3.20.6"
   },
   "devDependencies": {
-    "@botpress/sdk": "0.3.2",
+    "@botpress/sdk": "0.4.1",
     "@bpinternal/log4bot": "^0.0.4",
     "@types/bluebird": "^3.5.38",
     "@types/json-schema": "^7.0.11",

package/templates/echo-bot/package.json

@@ -8,8 +8,8 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@botpress/client": "0.3.4",
-    "@botpress/sdk": "0.3.2",
+    "@botpress/client": "0.3.5",
+    "@botpress/sdk": "0.4.1",
     "zod": "^3.20.6"
   },
   "devDependencies": {

package/templates/empty-integration/package.json

@@ -8,8 +8,8 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@botpress/client": "0.3.4",
-    "@botpress/sdk": "0.3.2",
+    "@botpress/client": "0.3.5",
+    "@botpress/sdk": "0.4.1",
     "zod": "^3.20.6"
   },
   "devDependencies": {

package/templates/empty-integration/src/index.ts

@@ -1,7 +1,6 @@
 import * as botpress from '.botpress'
 
-const logger = console
-logger.info('starting integration')
+console.info('starting integration')
 
 class NotImplementedError extends Error {
   constructor() {