heroku 10.13.2 → 11.0.0-alpha.1

package/lib/lib/run/colorize.js

@@ -1,26 +1,23 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.COLORS = void 0;
-const color_1 = require("@heroku-cli/color");
-const core_1 = require("@oclif/core");
-exports.COLORS = [
-    s => color_1.default.yellow(s),
-    s => color_1.default.green(s),
-    s => color_1.default.cyan(s),
-    s => color_1.default.magenta(s),
-    s => color_1.default.blue(s),
-    s => color_1.default.bold.green(s),
-    s => color_1.default.bold.cyan(s),
-    s => color_1.default.bold.magenta(s),
-    s => color_1.default.bold.yellow(s),
-    s => color_1.default.bold.blue(s),
+import { color } from '@heroku-cli/color';
+import { ux } from '@oclif/core';
+export const COLORS = [
+    s => color.yellow(s),
+    s => color.green(s),
+    s => color.cyan(s),
+    s => color.magenta(s),
+    s => color.blue(s),
+    s => color.bold.green(s),
+    s => color.bold.cyan(s),
+    s => color.bold.magenta(s),
+    s => color.bold.yellow(s),
+    s => color.bold.blue(s),
 ];
 const assignedColors = {};
 function getColorForIdentifier(i) {
     i = i.split('.')[0];
     if (assignedColors[i])
         return assignedColors[i];
-    assignedColors[i] = exports.COLORS[Object.keys(assignedColors).length % exports.COLORS.length];
+    assignedColors[i] = COLORS[Object.keys(assignedColors).length % COLORS.length];
     return assignedColors[i];
 }
 // get initial colors so they are the same every time
@@ -30,22 +27,22 @@ getColorForIdentifier('web');
 getColorForIdentifier('postgres');
 getColorForIdentifier('heroku-postgres');
 const lineRegex = /^(.*?\[([\w-]+)([\d.]+)?]:)(.*)?$/;
-const red = color_1.default.red;
-const dim = (i) => color_1.default.dim(i);
+const red = color.red;
+const dim = (i) => color.dim(i);
 const other = dim;
-const path = (i) => color_1.default.green(i);
-const method = (i) => color_1.default.bold.magenta(i);
+const path = (i) => color.green(i);
+const method = (i) => color.bold.magenta(i);
 const status = (code) => {
     if (code < 200)
         return code;
     if (code < 300)
-        return color_1.default.green(code);
+        return color.green(code);
     if (code < 400)
-        return color_1.default.cyan(code);
+        return color.cyan(code);
     if (code < 500)
-        return color_1.default.yellow(code);
+        return color.yellow(code);
     if (code < 600)
-        return color_1.default.red(code);
+        return color.red(code);
     return code;
 };
 const ms = (s) => {
@@ -53,14 +50,14 @@ const ms = (s) => {
     if (!ms)
         return s;
     if (ms < 100)
-        return color_1.default.greenBright(s);
+        return color.greenBright(s);
     if (ms < 500)
-        return color_1.default.green(s);
+        return color.green(s);
     if (ms < 5000)
-        return color_1.default.yellow(s);
+        return color.yellow(s);
     if (ms < 10000)
-        return color_1.default.yellowBright(s);
-    return color_1.default.red(s);
+        return color.yellowBright(s);
+    return color.red(s);
 };
 function colorizeRouter(body) {
     const encodeColor = ([k, v]) => {
@@ -95,30 +92,30 @@ function colorizeRouter(body) {
         }).join(' ');
     }
     catch (error) {
-        core_1.ux.warn(error);
+        ux.warn(error);
         return body;
     }
 }
 const state = (s) => {
     switch (s) {
         case 'down': return red(s);
-        case 'up': return color_1.default.greenBright(s);
-        case 'starting': return color_1.default.yellowBright(s);
-        case 'complete': return color_1.default.greenBright(s);
+        case 'up': return color.greenBright(s);
+        case 'starting': return color.yellowBright(s);
+        case 'complete': return color.greenBright(s);
         default: return s;
     }
 };
 function colorizeRun(body) {
     try {
         if (body.match(/^Stopping all processes with SIGTERM$/))
-            return color_1.default.red(body);
+            return color.red(body);
         const starting = body.match(/^(Starting process with command )(`.+`)(by user )?(.*)?$/);
         if (starting) {
             return [
                 starting[1],
-                color_1.default.cmd(starting[2]),
+                color.cmd(starting[2]),
                 starting[3] || '',
-                color_1.default.green(starting[4] || ''),
+                color.green(starting[4] || ''),
             ].join('');
         }
         const stateChange = body.match(/^(State changed from )(\w+)( to )(\w+)$/);
@@ -134,37 +131,37 @@ function colorizeRun(body) {
         if (exited) {
             return [
                 exited[1],
-                exited[2] === '0' ? color_1.default.greenBright(exited[2]) : color_1.default.red(exited[2]),
+                exited[2] === '0' ? color.greenBright(exited[2]) : color.red(exited[2]),
             ].join('');
         }
     }
     catch (error) {
-        core_1.ux.warn(error);
+        ux.warn(error);
     }
     return body;
 }
 function colorizeWeb(body) {
     try {
         if (body.match(/^Unidling$/))
-            return color_1.default.yellow(body);
+            return color.yellow(body);
         if (body.match(/^Restarting$/))
-            return color_1.default.yellow(body);
+            return color.yellow(body);
         if (body.match(/^Stopping all processes with SIGTERM$/))
-            return color_1.default.red(body);
+            return color.red(body);
         const starting = body.match(/^(Starting process with command )(`.+`)(by user )?(.*)?$/);
         if (starting) {
             return [
                 (starting[1]),
-                color_1.default.cmd(starting[2]),
+                color.cmd(starting[2]),
                 (starting[3] || ''),
-                color_1.default.green(starting[4] || ''),
+                color.green(starting[4] || ''),
             ].join('');
         }
         const exited = body.match(/^(Process exited with status )(\d+)$/);
         if (exited) {
             return [
                 exited[1],
-                exited[2] === '0' ? color_1.default.greenBright(exited[2]) : color_1.default.red(exited[2]),
+                exited[2] === '0' ? color.greenBright(exited[2]) : color.red(exited[2]),
             ].join('');
         }
         const stateChange = body.match(/^(State changed from )(\w+)( to )(\w+)$/);
@@ -200,48 +197,48 @@ function colorizeWeb(body) {
         }
     }
     catch (error) {
-        core_1.ux.warn(error);
+        ux.warn(error);
     }
     return body;
 }
 function colorizeAPI(body) {
     if (body.match(/^Build succeeded$/))
-        return color_1.default.greenBright(body);
+        return color.greenBright(body);
     // eslint-disable-next-line unicorn/prefer-starts-ends-with
     if (body.match(/^Build failed/))
-        return color_1.default.red(body);
+        return color.red(body);
     const build = body.match(/^(Build started by user )(.+)$/);
     if (build) {
         return [
             build[1],
-            color_1.default.green(build[2]),
+            color.green(build[2]),
         ].join('');
     }
     const deploy = body.match(/^(Deploy )([\w]+)( by user )(.+)$/);
     if (deploy) {
         return [
             deploy[1],
-            color_1.default.cyan(deploy[2]),
+            color.cyan(deploy[2]),
             deploy[3],
-            color_1.default.green(deploy[4]),
+            color.green(deploy[4]),
         ].join('');
     }
     const release = body.match(/^(Release )(v[\d]+)( created by user )(.+)$/);
     if (release) {
         return [
             release[1],
-            color_1.default.magenta(release[2]),
+            color.magenta(release[2]),
             release[3],
-            color_1.default.green(release[4]),
+            color.green(release[4]),
         ].join('');
     }
     const starting = body.match(/^(Starting process with command )(`.+`)(by user )?(.*)?$/);
     if (starting) {
         return [
             (starting[1]),
-            color_1.default.cmd(starting[2]),
+            color.cmd(starting[2]),
             (starting[3] || ''),
-            color_1.default.green(starting[4] || ''),
+            color.green(starting[4] || ''),
         ].join('');
     }
     return body;
@@ -257,8 +254,8 @@ function colorizePG(body) {
     if (create) {
         return [
             other(create[1]),
-            color_1.default.magenta(create[2]),
-            color_1.default.cyan(create[3]),
+            color.magenta(create[2]),
+            color.cyan(create[3]),
         ].join('');
     }
     if (body.match(/source=\w+ sample#/)) {
@@ -266,7 +263,7 @@ function colorizePG(body) {
     }
     return body;
 }
-function colorize(line) {
+export default function colorize(line) {
     if (process.env.HEROKU_LOGS_COLOR === '0' || process.env.HEROKU_COLOR === '0')
         return line;
     const parsed = line.match(lineRegex);
@@ -297,4 +294,3 @@ function colorize(line) {
     }
     return getColorForIdentifier(identifier)(header) + ' ' + body;
 }
-exports.default = colorize;

package/lib/lib/run/dyno.d.ts

@@ -1,9 +1,8 @@
-/// <reference types="node" />
-/// <reference types="node" />
-/// <reference types="node" />
-/// <reference types="node" />
+/// <reference types="node" resolution-mode="require"/>
+/// <reference types="node" resolution-mode="require"/>
+/// <reference types="node" resolution-mode="require"/>
+/// <reference types="node" resolution-mode="require"/>
 import { APIClient } from '@heroku-cli/command';
-import { IOptions } from '@heroku-cli/command/lib/api-client';
 import { Dyno as APIDyno } from '@heroku-cli/schema';
 import { HTTP } from '@heroku/http-call';
 import * as net from 'net';
@@ -30,6 +29,12 @@ interface DynoOpts {
     size?: string;
     type?: string;
 }
+interface IOptions {
+    debug?: boolean;
+    debugHeaders?: boolean;
+    preauth?: boolean;
+    required?: boolean;
+}
 export default class Dyno extends Duplex {
     opts: DynoOpts;
     get _useSSH(): boolean | undefined;

package/lib/lib/run/dyno.js

@@ -1,21 +1,39 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
 /* eslint-disable @typescript-eslint/ban-ts-comment */
-const color_1 = require("@heroku-cli/color");
-const notifications_1 = require("@heroku-cli/notifications");
-const child_process_1 = require("child_process");
-const core_1 = require("@oclif/core");
-const debug_1 = require("debug");
-const https = require("https");
-const net = require("net");
-const stream_1 = require("stream");
-const tls = require("tls");
-const tty = require("tty");
-const url_1 = require("url");
-const helpers_1 = require("./helpers");
-const debug = (0, debug_1.default)('heroku:run');
+import { color } from '@heroku-cli/color';
+import { notify } from '@heroku-cli/notifications';
+import { spawn } from 'child_process';
+import { ux } from '@oclif/core';
+import debugFactory from 'debug';
+import * as https from 'https';
+import * as net from 'net';
+import { Duplex, Transform } from 'stream';
+import * as tls from 'tls';
+import * as tty from 'tty';
+import { URL, parse } from 'url';
+import { buildEnvFromFlag } from './helpers.js';
+const debug = debugFactory('heroku:run');
 const wait = (ms) => new Promise(resolve => setTimeout(() => resolve(), ms));
-class Dyno extends stream_1.Duplex {
+export default class Dyno extends Duplex {
+    opts;
+    get _useSSH() {
+        if (this.uri) {
+            /* tslint:disable:no-http-string */
+            return this.uri.protocol === 'http:' || this.uri.protocol === 'https:';
+            /* tslint:enable:no-http-string */
+        }
+    }
+    dyno;
+    heroku;
+    input;
+    p;
+    reject;
+    resolve;
+    uri;
+    legacyUri;
+    unpipeStdin;
+    useSSH;
+    _notified;
+    _startedAt;
     constructor(opts) {
         super();
         this.opts = opts;
@@ -26,20 +44,13 @@ class Dyno extends stream_1.Duplex {
             this.opts.showStatus = true;
         }
     }
-    get _useSSH() {
-        if (this.uri) {
-            /* tslint:disable:no-http-string */
-            return this.uri.protocol === 'http:' || this.uri.protocol === 'https:';
-            /* tslint:enable:no-http-string */
-        }
-    }
     /**
      * Starts the dyno
      */
     async start() {
         this._startedAt = Date.now();
         if (this.opts.showStatus) {
-            core_1.ux.action.start(`Running ${color_1.default.cyan.bold(this.opts.command)} on ${color_1.default.app(this.opts.app)}`);
+            ux.action.start(`Running ${color.cyan.bold(this.opts.command)} on ${color.app(this.opts.app)}`);
         }
         await this._doStart();
     }
@@ -70,7 +81,7 @@ class Dyno extends stream_1.Duplex {
                 await this.attach();
             }
             else if (this.opts.showStatus) {
-                core_1.ux.action.stop(this._status('done'));
+                ux.action.stop(this._status('done'));
             }
         }
         catch (error) {
@@ -86,15 +97,15 @@ class Dyno extends stream_1.Duplex {
             throw error;
         }
         finally {
-            core_1.ux.action.stop();
+            ux.action.stop();
         }
     }
     // Attaches stdin/stdout to dyno
     attach() {
         this.pipe(process.stdout);
         if (this.dyno && this.dyno.attach_url) {
-            this.uri = new url_1.URL(this.dyno.attach_url);
-            this.legacyUri = (0, url_1.parse)(this.dyno.attach_url);
+            this.uri = new URL(this.dyno.attach_url);
+            this.legacyUri = parse(this.dyno.attach_url);
         }
         if (this._useSSH) {
             this.p = this._ssh();
@@ -111,7 +122,7 @@ class Dyno extends stream_1.Duplex {
             this.resolve = resolve;
             this.reject = reject;
             if (this.opts.showStatus) {
-                core_1.ux.action.status = this._status('starting');
+                ux.action.status = this._status('starting');
             }
             // @ts-ignore
             const c = tls.connect(Number.parseInt(this.uri.port, 10), this.uri.hostname, {
@@ -125,7 +136,7 @@ class Dyno extends stream_1.Duplex {
                 const pathnameWithSearchParams = this.uri.pathname + this.uri.search;
                 c.write(pathnameWithSearchParams.slice(1) + '\r\n', () => {
                     if (this.opts.showStatus) {
-                        core_1.ux.action.status = this._status('connecting');
+                        ux.action.status = this._status('connecting');
                     }
                 });
             });
@@ -155,7 +166,7 @@ class Dyno extends stream_1.Duplex {
             // @ts-ignore
             this.dyno = dyno;
             // @ts-ignore
-            core_1.ux.action.stop(this._status(this.dyno.state));
+            ux.action.stop(this._status(this.dyno.state));
             // @ts-ignore
             if (this.dyno.state === 'starting' || this.dyno.state === 'up') {
                 return this._connect();
@@ -206,15 +217,14 @@ class Dyno extends stream_1.Duplex {
         });
     }
     _handle(localServer) {
-        var _a;
         const addr = localServer.address();
         const host = addr.address;
-        const port = addr.port;
+        const { port } = addr;
         let lastErr = '';
         // does not actually uncork but allows error to be displayed when attempting to read
         this.uncork();
         if (this.opts.listen) {
-            core_1.ux.log(`listening on port ${host}:${port} for ssh client`);
+            ux.stderr(`listening on port ${host}:${port} for ssh client`);
         }
         else {
             const params = [host, '-p', port.toString(), '-oStrictHostKeyChecking=no', '-oUserKnownHostsFile=/dev/null', '-oServerAliveInterval=20'];
@@ -230,18 +240,17 @@ class Dyno extends stream_1.Duplex {
                     params.push('-t');
                 }
             }
-            const sshProc = (0, child_process_1.spawn)('ssh', params, { stdio });
+            const sshProc = spawn('ssh', params, { stdio });
             // only receives stdout with --exit-code
             if (sshProc.stdout) {
                 sshProc.stdout.setEncoding('utf8');
                 sshProc.stdout.on('data', this._readData());
             }
-            (_a = sshProc.stderr) === null || _a === void 0 ? void 0 : _a.on('data', data => {
-                var _a;
+            sshProc.stderr?.on('data', data => {
                 lastErr = data.toString();
                 // suppress host key and permission denied messages
                 const messages = [
-                    "Warning: Permanently added '[127.0.0.1]"
+                    "Warning: Permanently added '[127.0.0.1]",
                 ];
                 const killMessages = [
                     'too many authentication failures',
@@ -254,7 +263,7 @@ class Dyno extends stream_1.Duplex {
                 if (killMessages.some(message => data.includes(message))) {
                     sshProc.kill();
                     localServer.close();
-                    (_a = this.reject) === null || _a === void 0 ? void 0 : _a.call(this, lastErr);
+                    this.reject?.(lastErr);
                 }
             });
             sshProc.on('close', () => {
@@ -266,8 +275,8 @@ class Dyno extends stream_1.Duplex {
                     }
                     msgs.push('Check that your ssh key has been uploaded to heroku with `heroku keys:add`.');
                     // eslint-disable-next-line unicorn/no-array-push-push
-                    msgs.push(`See ${color_1.default.cyan('https://devcenter.heroku.com/articles/one-off-dynos#shield-private-spaces')}`);
-                    core_1.ux.error(msgs.join('\n'));
+                    msgs.push(`See ${color.cyan('https://devcenter.heroku.com/articles/one-off-dynos#shield-private-spaces')}`);
+                    ux.error(msgs.join('\n'));
                 }
                 // cleanup local server
                 localServer.close();
@@ -283,7 +292,7 @@ class Dyno extends stream_1.Duplex {
         return debug && (debug === '1' || debug.toUpperCase() === 'TRUE');
     }
     _env() {
-        const c = this.opts.env ? (0, helpers_1.buildEnvFromFlag)(this.opts.env) : {};
+        const c = this.opts.env ? buildEnvFromFlag(this.opts.env) : {};
         c.TERM = process.env.TERM;
         if (tty.isatty(1)) {
             c.COLUMNS = process.stdout.columns;
@@ -304,7 +313,7 @@ class Dyno extends stream_1.Duplex {
             // discard first line
             if (c && firstLine) {
                 if (this.opts.showStatus)
-                    core_1.ux.action.stop(this._status('up'));
+                    ux.action.stop(this._status('up'));
                 firstLine = false;
                 this._readStdin(c);
                 return;
@@ -325,7 +334,7 @@ class Dyno extends stream_1.Duplex {
                     this.resolve();
                 }
                 else {
-                    const err = new Error(`Process exited with code ${color_1.default.red(code.toString())}`);
+                    const err = new Error(`Process exited with code ${color.red(code.toString())}`);
                     err.exitCode = code;
                     // @ts-ignore
                     this.reject(err);
@@ -337,7 +346,7 @@ class Dyno extends stream_1.Duplex {
     }
     _readStdin(c) {
         this.input = c;
-        const stdin = process.stdin;
+        const { stdin } = process;
         stdin.setEncoding('utf8');
         // without this the CLI will hang on rake db:migrate
         // until a character is pressed
@@ -349,18 +358,18 @@ class Dyno extends stream_1.Duplex {
             stdin.setRawMode(true);
             stdin.pipe(c);
             let sigints = [];
-            stdin.on('data', function (c) {
+            stdin.on('data', c => {
                 if (c.toString() === '\u0003') {
                     sigints.push(Date.now());
                 }
                 sigints = sigints.filter(d => d > Date.now() - 1000);
                 if (sigints.length >= 4) {
-                    core_1.ux.error('forcing dyno disconnect', { exit: 1 });
+                    ux.error('forcing dyno disconnect', { exit: 1 });
                 }
             });
         }
         else {
-            stdin.pipe(new stream_1.Transform({
+            stdin.pipe(new Transform({
                 objectMode: true,
                 transform: (chunk, _, next) => c.write(chunk, next),
                 // eslint-disable-next-line unicorn/no-hex-escape
@@ -401,11 +410,10 @@ class Dyno extends stream_1.Duplex {
                 message: 'dyno is up',
                 // sound: true
             };
-            (0, notifications_1.notify)(notification);
+            notify(notification);
         }
         catch (error) {
-            core_1.ux.warn(error);
+            ux.warn(error);
         }
     }
 }
-exports.default = Dyno;

package/lib/lib/run/helpers.js

@@ -1,11 +1,8 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildEnvFromFlag = exports.buildCommand = exports.revertSortedArgs = void 0;
 /* eslint-disable @typescript-eslint/ban-ts-comment */
-const core_1 = require("@oclif/core");
+import { ux } from '@oclif/core';
 // this function exists because oclif sorts argv
 // and to capture all non-flag command inputs
-function revertSortedArgs(processArgs, argv) {
+export function revertSortedArgs(processArgs, argv) {
     const originalInputOrder = [];
     const flagRegex = /^--?/;
     let isSeparatorPresent = false;
@@ -25,8 +22,7 @@ function revertSortedArgs(processArgs, argv) {
     }
     return originalInputOrder;
 }
-exports.revertSortedArgs = revertSortedArgs;
-function buildCommand(args, prependLauncher = false) {
+export function buildCommand(args, prependLauncher = false) {
     const prependText = prependLauncher ? 'launcher ' : '';
     if (args.length === 1) {
         // do not add quotes around arguments if there is only one argument
@@ -42,8 +38,7 @@ function buildCommand(args, prependLauncher = false) {
     }
     return `${prependText}${cmd.trim()}`;
 }
-exports.buildCommand = buildCommand;
-function buildEnvFromFlag(flag) {
+export function buildEnvFromFlag(flag) {
     const env = {};
     for (const v of flag.split(';')) {
         const m = v.match(/^\s*([\w.-]+)\s*=\s*(.*)?\s*$/);
@@ -51,8 +46,7 @@ function buildEnvFromFlag(flag) {
         if (m)
             env[m[1]] = m[2];
         else
-            core_1.ux.warn(`env flag ${v} appears invalid. Avoid using ';' in values.`);
+            ux.warn(`env flag ${v} appears invalid. Avoid using ';' in values.`);
     }
     return env;
 }
-exports.buildEnvFromFlag = buildEnvFromFlag;

package/lib/lib/run/log-displayer.d.ts

@@ -1,4 +1,5 @@
 import { APIClient } from '@heroku-cli/command';
+import { EventSource } from 'eventsource';
 interface LogDisplayerOptions {
     app: string;
     dyno?: string;
@@ -7,5 +8,16 @@ interface LogDisplayerOptions {
     tail: boolean;
     type?: string;
 }
-declare function logDisplayer(heroku: APIClient, options: LogDisplayerOptions): Promise<void>;
-export default logDisplayer;
+export declare class LogDisplayer {
+    private heroku;
+    constructor(heroku: APIClient);
+    display(options: LogDisplayerOptions): Promise<void>;
+    private setupProcessHandlers;
+    private getGenerationByAppId;
+    private buildRequestBodyParameters;
+    private createLogSession;
+    createEventSourceInstance(url: string, options?: any): EventSource;
+    private readLogs;
+}
+export default function logDisplayer(heroku: APIClient, options: LogDisplayerOptions): Promise<void>;
+export {};