@oclif/plugin-update 3.1.32 → 4.0.1-qa.0

package/lib/commands/update.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const core_1 = require("@oclif/core");
 const inquirer_1 = require("inquirer");
-const path = (0, tslib_1.__importStar)(require("path"));
+const path = tslib_1.__importStar(require("path"));
 const semver_1 = require("semver");
 const update_1 = require("../update");
 class UpdateCommand extends core_1.Command {
@@ -42,7 +42,6 @@ class UpdateCommand extends core_1.Command {
         return version;
     }
 }
-exports.default = UpdateCommand;
 UpdateCommand.description = 'update the <%= config.bin %> CLI';
 UpdateCommand.args = {
     channel: core_1.Args.string({ optional: true }),
@@ -85,3 +84,4 @@ UpdateCommand.flags = {
         description: 'Force a re-download of the requested version.',
     }),
 };
+exports.default = UpdateCommand;

package/lib/hooks/init.js

@@ -3,9 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.init = void 0;
 const tslib_1 = require("tslib");
 const core_1 = require("@oclif/core");
-const cross_spawn_1 = (0, tslib_1.__importDefault)(require("cross-spawn"));
-const fs = (0, tslib_1.__importStar)(require("fs-extra"));
-const path = (0, tslib_1.__importStar)(require("path"));
+const child_process_1 = require("child_process");
+const node_fs_1 = require("node:fs");
+const promises_1 = require("node:fs/promises");
+const path = tslib_1.__importStar(require("path"));
 const util_1 = require("../util");
 // eslint-disable-next-line unicorn/prefer-module
 const debug = require('debug')('cli:updater');
@@ -13,7 +14,7 @@ function timestamp(msg) {
     return `[${new Date().toISOString()}] ${msg}`;
 }
 async function mtime(f) {
-    const { mtime } = await fs.stat(f);
+    const { mtime } = await (0, promises_1.stat)(f);
     return mtime;
 }
 const init = async function (opts) {
@@ -26,7 +27,11 @@ const init = async function (opts) {
     const autoupdatefile = path.join(this.config.cacheDir, 'autoupdate');
     const autoupdatelogfile = path.join(this.config.cacheDir, 'autoupdate.log');
     const clientRoot = this.config.scopedEnvVar('OCLIF_CLIENT_HOME') || path.join(this.config.dataDir, 'client');
-    const autoupdateEnv = Object.assign(Object.assign({}, process.env), { [this.config.scopedEnvVarKey('TIMESTAMPS')]: '1', [this.config.scopedEnvVarKey('SKIP_ANALYTICS')]: '1' });
+    const autoupdateEnv = {
+        ...process.env,
+        [this.config.scopedEnvVarKey('TIMESTAMPS')]: '1',
+        [this.config.scopedEnvVarKey('SKIP_ANALYTICS')]: '1',
+    };
     async function autoupdateNeeded() {
         try {
             const m = await mtime(autoupdatefile);
@@ -47,18 +52,19 @@ const init = async function (opts) {
     }
     await (0, util_1.touch)(lastrunfile);
     const clientDir = path.join(clientRoot, this.config.version);
-    if (await fs.pathExists(clientDir))
+    if ((0, node_fs_1.existsSync)(clientDir))
         await (0, util_1.touch)(clientDir);
     if (!await autoupdateNeeded())
         return;
     debug('autoupdate running');
-    await fs.outputFile(autoupdatefile, '');
+    await (0, promises_1.writeFile)(autoupdatefile, '');
     debug(`spawning autoupdate on ${binPath}`);
-    const fd = await fs.open(autoupdatelogfile, 'a');
-    fs.write(fd, timestamp(`starting \`${binPath} update --autoupdate\` from ${process.argv.slice(1, 3).join(' ')}\n`));
-    (0, cross_spawn_1.default)(binPath, ['update', '--autoupdate'], {
+    const fd = await (0, promises_1.open)(autoupdatelogfile, 'a');
+    await (0, promises_1.writeFile)(fd, timestamp(`starting \`${binPath} update --autoupdate\` from ${process.argv.slice(1, 3).join(' ')}\n`));
+    const stream = fd.createWriteStream();
+    (0, child_process_1.spawn)(binPath, ['update', '--autoupdate'], {
         detached: !this.config.windows,
-        stdio: ['ignore', fd, fd],
+        stdio: ['ignore', stream, stream],
         env: autoupdateEnv,
     })
         .on('error', (e) => process.emitWarning(e))

package/lib/tar.js

@@ -2,8 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.extract = void 0;
 const tslib_1 = require("tslib");
-const fs = (0, tslib_1.__importStar)(require("fs-extra"));
-const path = (0, tslib_1.__importStar)(require("path"));
+const fs = tslib_1.__importStar(require("node:fs/promises"));
+const node_fs_1 = require("node:fs");
+const path = tslib_1.__importStar(require("path"));
 const util_1 = require("./util");
 const debug = require('debug')('oclif-update');
 const ignore = (_, header) => {
@@ -22,7 +23,7 @@ const ignore = (_, header) => {
 async function extract(stream, basename, output, sha) {
     const getTmp = () => `${output}.partial.${Math.random().toString().split('.')[1].slice(0, 5)}`;
     let tmp = getTmp();
-    if (fs.pathExistsSync(tmp))
+    if ((0, node_fs_1.existsSync)(tmp))
         tmp = getTmp();
     debug(`extracting to ${tmp}`);
     try {
@@ -60,26 +61,27 @@ async function extract(stream, basename, output, sha) {
             gunzip.on('error', reject);
             stream.pipe(gunzip).pipe(extract);
         });
-        if (await fs.pathExists(output)) {
+        if ((0, node_fs_1.existsSync)(output)) {
             try {
                 const tmp = getTmp();
-                await fs.move(output, tmp);
-                await fs.remove(tmp).catch(debug);
+                const { move } = await Promise.resolve().then(() => tslib_1.__importStar(require('fs-extra')));
+                await move(output, tmp);
+                await fs.rm(tmp, { recursive: true, force: true }).catch(debug);
             }
             catch (error) {
                 debug(error);
-                await fs.remove(output);
+                await fs.rm(tmp, { recursive: true, force: true }).catch(debug);
             }
         }
         const from = path.join(tmp, basename);
         debug('moving %s to %s', from, output);
         await fs.rename(from, output);
-        await fs.remove(tmp).catch(debug);
+        await fs.rm(tmp, { recursive: true, force: true }).catch(debug);
         await (0, util_1.touch)(output);
         debug('done extracting');
     }
     catch (error) {
-        await fs.remove(tmp).catch(process.emitWarning);
+        await fs.rm(tmp, { recursive: true, force: true }).catch(process.emitWarning);
         throw error;
     }
 }

package/lib/update.d.ts

@@ -16,27 +16,10 @@ export declare class Updater {
     runUpdate(options: Updater.Options): Promise<void>;
     findLocalVersions(): Promise<string[]>;
     fetchVersionIndex(): Promise<Updater.VersionIndex>;
-    private ensureClientDir;
-    private composeS3SubDir;
-    private s3ChannelManifestKey;
-    private s3VersionManifestKey;
-    private s3VersionIndexKey;
-    private fetchChannelManifest;
     private fetchVersionManifest;
-    private fetchManifest;
-    private downloadAndExtract;
     private update;
     private updateToExistingVersion;
-    private notUpdatable;
-    private alreadyOnVersion;
-    private determineChannel;
-    private determinePlatform;
-    private determineCurrentVersion;
     private findLocalVersion;
-    private setChannel;
-    private logChop;
-    private mtime;
-    private debounce;
     private tidy;
     private touch;
     private refreshConfig;

package/lib/update.js

@@ -3,13 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Updater = void 0;
 const tslib_1 = require("tslib");
 /* eslint-disable unicorn/prefer-module */
-const color_1 = (0, tslib_1.__importDefault)(require("@oclif/color"));
 const core_1 = require("@oclif/core");
-const fs = (0, tslib_1.__importStar)(require("fs-extra"));
-const http_call_1 = (0, tslib_1.__importDefault)(require("http-call"));
-const path = (0, tslib_1.__importStar)(require("path"));
-const lodash_throttle_1 = (0, tslib_1.__importDefault)(require("lodash.throttle"));
-const filesize_1 = (0, tslib_1.__importDefault)(require("filesize"));
+const chalk_1 = require("chalk");
+const node_fs_1 = require("node:fs");
+const promises_1 = require("node:fs/promises");
+const http_call_1 = tslib_1.__importDefault(require("http-call"));
+const path = tslib_1.__importStar(require("path"));
+const lodash_throttle_1 = tslib_1.__importDefault(require("lodash.throttle"));
+const filesize_1 = tslib_1.__importDefault(require("filesize"));
 const tar_1 = require("./tar");
 const util_1 = require("./util");
 const filesize = (n) => {
@@ -25,17 +26,19 @@ class Updater {
     async runUpdate(options) {
         const { autoUpdate, version, force = false } = options;
         if (autoUpdate)
-            await this.debounce();
+            await debounce(this.config.cacheDir);
         core_1.ux.action.start(`${this.config.name}: Updating CLI`);
-        if (this.notUpdatable()) {
+        if (notUpdatable(this.config)) {
             core_1.ux.action.stop('not updatable');
             return;
         }
-        const channel = options.channel || await this.determineChannel(version);
-        const current = await this.determineCurrentVersion();
+        const [channel, current] = await Promise.all([
+            options.channel ?? determineChannel({ version, config: this.config }),
+            determineCurrentVersion(this.clientBin, this.config.version),
+        ]);
         if (version) {
             const localVersion = force ? null : await this.findLocalVersion(version);
-            if (this.alreadyOnVersion(current, localVersion || null)) {
+            if (alreadyOnVersion(current, localVersion || null)) {
                 core_1.ux.action.stop(this.config.scopedEnvVar('HIDE_UPDATED_MESSAGE') ? 'done' : `already on version ${current}`);
                 return;
             }
@@ -59,9 +62,9 @@ class Updater {
             core_1.ux.log(`Updating to a specific version will not update the channel. If autoupdate is enabled, the CLI will eventually be updated back to ${channel}.`);
         }
         else {
-            const manifest = await this.fetchChannelManifest(channel);
+            const manifest = await fetchChannelManifest(channel, this.config);
             const updated = manifest.sha ? `${manifest.version}-${manifest.sha}` : manifest.version;
-            if (!force && this.alreadyOnVersion(current, updated)) {
+            if (!force && alreadyOnVersion(current, updated)) {
                 core_1.ux.action.stop(this.config.scopedEnvVar('HIDE_UPDATED_MESSAGE') ? 'done' : `already on version ${current}`);
             }
             else {
@@ -76,15 +79,14 @@ class Updater {
         core_1.ux.debug('done');
     }
     async findLocalVersions() {
-        await this.ensureClientDir();
-        return fs
-            .readdirSync(this.clientRoot)
+        await ensureClientDir(this.clientRoot);
+        return (await (0, promises_1.readdir)(this.clientRoot))
             .filter(dirOrFile => dirOrFile !== 'bin' && dirOrFile !== 'current')
             .map(f => path.join(this.clientRoot, f));
     }
     async fetchVersionIndex() {
         core_1.ux.action.status = 'fetching version index';
-        const newIndexUrl = this.config.s3Url(this.s3VersionIndexKey());
+        const newIndexUrl = this.config.s3Url(s3VersionIndexKey(this.config));
         try {
             const { body } = await http_call_1.default.get(newIndexUrl);
             if (typeof body === 'string') {
@@ -92,234 +94,57 @@ class Updater {
             }
             return body;
         }
-        catch (_a) {
+        catch {
             throw new Error(`No version indices exist for ${this.config.name}.`);
         }
     }
-    async ensureClientDir() {
-        try {
-            await fs.mkdirp(this.clientRoot);
-        }
-        catch (error) {
-            if (error.code === 'EEXIST') {
-                // for some reason the client directory is sometimes a file
-                // if so, this happens. Delete it and recreate
-                await fs.remove(this.clientRoot);
-                await fs.mkdirp(this.clientRoot);
-            }
-            else {
-                throw error;
-            }
-        }
-    }
-    composeS3SubDir() {
-        let s3SubDir = this.config.pjson.oclif.update.s3.folder || '';
-        if (s3SubDir !== '' && s3SubDir.slice(-1) !== '/')
-            s3SubDir = `${s3SubDir}/`;
-        return s3SubDir;
-    }
-    s3ChannelManifestKey(channel) {
-        const { bin, arch } = this.config;
-        const s3SubDir = this.composeS3SubDir();
-        return path.join(s3SubDir, 'channels', channel, `${bin}-${this.determinePlatform()}-${arch}-buildmanifest`);
-    }
-    s3VersionManifestKey(version, hash) {
-        const { bin, arch } = this.config;
-        const s3SubDir = this.composeS3SubDir();
-        return path.join(s3SubDir, 'versions', version, hash, `${bin}-v${version}-${hash}-${this.determinePlatform()}-${arch}-buildmanifest`);
-    }
-    s3VersionIndexKey() {
-        const { bin, arch } = this.config;
-        const s3SubDir = this.composeS3SubDir();
-        return path.join(s3SubDir, 'versions', `${bin}-${this.determinePlatform()}-${arch}-tar-gz.json`);
-    }
-    async fetchChannelManifest(channel) {
-        const s3Key = this.s3ChannelManifestKey(channel);
-        try {
-            return await this.fetchManifest(s3Key);
-        }
-        catch (error) {
-            if (error.statusCode === 403)
-                throw new Error(`HTTP 403: Invalid channel ${channel}`);
-            throw error;
-        }
-    }
     async fetchVersionManifest(version, url) {
         const parts = url.split('/');
         const hashIndex = parts.indexOf(version) + 1;
         const hash = parts[hashIndex];
-        const s3Key = this.s3VersionManifestKey(version, hash);
-        return this.fetchManifest(s3Key);
-    }
-    async fetchManifest(s3Key) {
-        core_1.ux.action.status = 'fetching manifest';
-        const url = this.config.s3Url(s3Key);
-        const { body } = await http_call_1.default.get(url);
-        if (typeof body === 'string') {
-            return JSON.parse(body);
-        }
-        return body;
-    }
-    async downloadAndExtract(output, manifest, channel) {
-        const { version, gz, sha256gz } = manifest;
-        const gzUrl = gz || this.config.s3Url(this.config.s3Key('versioned', {
-            version,
-            channel,
-            bin: this.config.bin,
-            platform: this.determinePlatform(),
-            arch: this.config.arch,
-            ext: 'gz',
-        }));
-        const { response: stream } = await http_call_1.default.stream(gzUrl);
-        stream.pause();
-        const baseDir = manifest.baseDir || this.config.s3Key('baseDir', {
-            version,
-            channel,
-            bin: this.config.bin,
-            platform: this.determinePlatform(),
-            arch: this.config.arch,
-        });
-        const extraction = (0, tar_1.extract)(stream, baseDir, output, sha256gz);
-        if (core_1.ux.action.type === 'spinner') {
-            const total = Number.parseInt(stream.headers['content-length'], 10);
-            let current = 0;
-            const updateStatus = (0, lodash_throttle_1.default)((newStatus) => {
-                core_1.ux.action.status = newStatus;
-            }, 250, { leading: true, trailing: false });
-            stream.on('data', data => {
-                current += data.length;
-                updateStatus(`${filesize(current)}/${filesize(total)}`);
-            });
-        }
-        stream.resume();
-        await extraction;
+        const s3Key = s3VersionManifestKey({ version, hash, config: this.config });
+        return fetchManifest(s3Key, this.config);
     }
     // eslint-disable-next-line max-params
     async update(manifest, current, updated, force, channel) {
-        core_1.ux.action.start(`${this.config.name}: Updating CLI from ${color_1.default.green(current)} to ${color_1.default.green(updated)}${channel === 'stable' ? '' : ' (' + color_1.default.yellow(channel) + ')'}`);
-        await this.ensureClientDir();
+        core_1.ux.action.start(`${this.config.name}: Updating CLI from ${(0, chalk_1.green)(current)} to ${(0, chalk_1.green)(updated)}${channel === 'stable' ? '' : ' (' + (0, chalk_1.yellow)(channel) + ')'}`);
+        await ensureClientDir(this.clientRoot);
         const output = path.join(this.clientRoot, updated);
-        if (force || !await fs.pathExists(output))
-            await this.downloadAndExtract(output, manifest, channel);
+        if (force || !(0, node_fs_1.existsSync)(output))
+            await downloadAndExtract(output, manifest, channel, this.config);
         await this.refreshConfig(updated);
-        await this.setChannel(channel);
+        await setChannel(channel, this.config.dataDir);
         await this.createBin(updated);
     }
     async updateToExistingVersion(current, updated) {
-        core_1.ux.action.start(`${this.config.name}: Updating CLI from ${color_1.default.green(current)} to ${color_1.default.green(updated)}`);
-        await this.ensureClientDir();
+        core_1.ux.action.start(`${this.config.name}: Updating CLI from ${(0, chalk_1.green)(current)} to ${(0, chalk_1.green)(updated)}`);
+        await ensureClientDir(this.clientRoot);
         await this.refreshConfig(updated);
         await this.createBin(updated);
     }
-    notUpdatable() {
-        if (!this.config.binPath) {
-            const instructions = this.config.scopedEnvVar('UPDATE_INSTRUCTIONS');
-            if (instructions)
-                core_1.ux.warn(instructions);
-            return true;
-        }
-        return false;
-    }
-    alreadyOnVersion(current, updated) {
-        return current === updated;
-    }
-    async determineChannel(version) {
-        var _a, _b;
-        const channelPath = path.join(this.config.dataDir, 'channel');
-        const channel = fs.existsSync(channelPath) ? (await fs.readFile(channelPath, 'utf8')).trim() : 'stable';
-        try {
-            const { body } = await http_call_1.default.get(`${(_a = this.config.npmRegistry) !== null && _a !== void 0 ? _a : 'https://registry.npmjs.org'}/${this.config.pjson.name}`);
-            const tags = body['dist-tags'];
-            const tag = (_b = Object.keys(tags).find(v => tags[v] === version)) !== null && _b !== void 0 ? _b : channel;
-            // convert from npm style tag defaults to OCLIF style
-            if (tag === 'latest')
-                return 'stable';
-            if (tag === 'latest-rc')
-                return 'stable-rc';
-            return tag;
-        }
-        catch (_c) {
-            return channel;
-        }
-    }
-    determinePlatform() {
-        return this.config.platform === 'wsl' ? 'linux' : this.config.platform;
-    }
-    async determineCurrentVersion() {
-        try {
-            const currentVersion = await fs.readFile(this.clientBin, 'utf8');
-            const matches = currentVersion.match(/\.\.[/\\|](.+)[/\\|]bin/);
-            return matches ? matches[1] : this.config.version;
-        }
-        catch (error) {
-            core_1.ux.debug(error);
-        }
-        return this.config.version;
-    }
     async findLocalVersion(version) {
         const versions = await this.findLocalVersions();
         return versions
             .map(file => path.basename(file))
             .find(file => file.startsWith(version));
     }
-    async setChannel(channel) {
-        const channelPath = path.join(this.config.dataDir, 'channel');
-        await fs.writeFile(channelPath, channel, 'utf8');
-    }
-    async logChop() {
-        try {
-            core_1.ux.debug('log chop');
-            const logChopper = require('log-chopper').default;
-            await logChopper.chop(this.config.errlog);
-        }
-        catch (error) {
-            core_1.ux.debug(error.message);
-        }
-    }
-    async mtime(f) {
-        const { mtime } = await fs.stat(f);
-        return mtime;
-    }
-    // when autoupdating, wait until the CLI isn't active
-    async debounce() {
-        let output = false;
-        const lastrunfile = path.join(this.config.cacheDir, 'lastrun');
-        const m = await this.mtime(lastrunfile);
-        m.setHours(m.getHours() + 1);
-        if (m > new Date()) {
-            const msg = `waiting until ${m.toISOString()} to update`;
-            if (output) {
-                core_1.ux.debug(msg);
-            }
-            else {
-                core_1.ux.log(msg);
-                output = true;
-            }
-            await (0, util_1.wait)(60 * 1000); // wait 1 minute
-            return this.debounce();
-        }
-        core_1.ux.log('time to update');
-    }
     // removes any unused CLIs
     async tidy() {
         core_1.ux.debug('tidy');
         try {
             const root = this.clientRoot;
-            if (!await fs.pathExists(root))
+            if (!(0, node_fs_1.existsSync)(root))
                 return;
             const files = await (0, util_1.ls)(root);
-            const promises = files.map(async (f) => {
-                if (['bin', 'current', this.config.version].includes(path.basename(f.path)))
-                    return;
-                const mtime = f.stat.mtime;
+            const isNotSpecial = (fPath, version) => !(['bin', 'current', version].includes(path.basename(fPath)));
+            const isOld = (fStat) => {
+                const mtime = fStat.mtime;
                 mtime.setHours(mtime.getHours() + (42 * 24));
-                if (mtime < new Date()) {
-                    await fs.remove(f.path);
-                }
-            });
-            for (const p of promises)
-                await p; // eslint-disable-line no-await-in-loop
-            await this.logChop();
+                return mtime < new Date();
+            };
+            await Promise.all(files.filter(f => isNotSpecial(this.config.version, f.path) && isOld(f.stat))
+                .map(f => (0, promises_1.rm)(f.path, { recursive: true, force: true })));
+            await logChop(this.config.errlog);
         }
         catch (error) {
             core_1.ux.warn(error);
@@ -330,9 +155,9 @@ class Updater {
         try {
             const p = path.join(this.clientRoot, this.config.version);
             core_1.ux.debug('touching client at', p);
-            if (!await fs.pathExists(p))
+            if (!(0, node_fs_1.existsSync)(p))
                 return;
-            await fs.utimes(p, new Date(), new Date());
+            return (0, promises_1.utimes)(p, new Date(), new Date());
         }
         catch (error) {
             core_1.ux.warn(error);
@@ -346,6 +171,7 @@ class Updater {
         const { bin, windows } = this.config;
         const binPathEnvVar = this.config.scopedEnvVarKey('BINPATH');
         const redirectedEnvVar = this.config.scopedEnvVarKey('REDIRECTED');
+        await (0, promises_1.mkdir)(path.dirname(dst), { recursive: true });
         if (windows) {
             const body = `@echo off
 setlocal enableextensions
@@ -353,7 +179,7 @@ set ${redirectedEnvVar}=1
 set ${binPathEnvVar}=%~dp0${bin}
 "%~dp0..\\${version}\\bin\\${bin}.cmd" %*
 `;
-            await fs.outputFile(dst, body);
+            await (0, promises_1.writeFile)(dst, body);
         }
         else {
             /* eslint-disable no-useless-escape */
@@ -375,12 +201,173 @@ DIR=$(get_script_dir)
 ${binPathEnvVar}="\$DIR/${bin}" ${redirectedEnvVar}=1 "$DIR/../${version}/bin/${bin}" "$@"
 `;
             /* eslint-enable no-useless-escape */
-            await fs.remove(dst);
-            await fs.outputFile(dst, body);
-            await fs.chmod(dst, 0o755);
-            await fs.remove(path.join(this.clientRoot, 'current'));
-            await fs.symlink(`./${version}`, path.join(this.clientRoot, 'current'));
+            await (0, promises_1.writeFile)(dst, body, { mode: 0o755 });
+            await (0, promises_1.rm)(path.join(this.clientRoot, 'current'), { recursive: true, force: true });
+            await (0, promises_1.symlink)(`./${version}`, path.join(this.clientRoot, 'current'));
         }
     }
 }
 exports.Updater = Updater;
+const alreadyOnVersion = (current, updated) => current === updated;
+const ensureClientDir = async (clientRoot) => {
+    try {
+        await (0, promises_1.mkdir)(clientRoot, { recursive: true });
+    }
+    catch (error) {
+        if (error.code === 'EEXIST') {
+            // for some reason the client directory is sometimes a file
+            // if so, this happens. Delete it and recreate
+            await (0, promises_1.rm)(clientRoot, { recursive: true, force: true });
+            await (0, promises_1.mkdir)(clientRoot, { recursive: true });
+        }
+        else {
+            throw error;
+        }
+    }
+};
+const mtime = async (f) => (await (0, promises_1.stat)(f)).mtime;
+const notUpdatable = (config) => {
+    if (!config.binPath) {
+        const instructions = config.scopedEnvVar('UPDATE_INSTRUCTIONS');
+        if (instructions)
+            core_1.ux.warn(instructions);
+        return true;
+    }
+    return false;
+};
+const composeS3SubDir = (config) => {
+    let s3SubDir = config.pjson.oclif.update.s3.folder || '';
+    if (s3SubDir !== '' && s3SubDir.slice(-1) !== '/')
+        s3SubDir = `${s3SubDir}/`;
+    return s3SubDir;
+};
+const fetchManifest = async (s3Key, config) => {
+    core_1.ux.action.status = 'fetching manifest';
+    const url = config.s3Url(s3Key);
+    const { body } = await http_call_1.default.get(url);
+    if (typeof body === 'string') {
+        return JSON.parse(body);
+    }
+    return body;
+};
+const s3VersionIndexKey = (config) => {
+    const { bin, arch } = config;
+    const s3SubDir = composeS3SubDir(config);
+    return path.join(s3SubDir, 'versions', `${bin}-${determinePlatform(config)}-${arch}-tar-gz.json`);
+};
+const determinePlatform = (config) => config.platform === 'wsl' ? 'linux' : config.platform;
+const s3ChannelManifestKey = (channel, config) => {
+    const { bin, arch } = config;
+    const s3SubDir = composeS3SubDir(config);
+    return path.join(s3SubDir, 'channels', channel, `${bin}-${determinePlatform(config)}-${arch}-buildmanifest`);
+};
+const s3VersionManifestKey = ({ version, hash, config }) => {
+    const { bin, arch } = config;
+    const s3SubDir = composeS3SubDir(config);
+    return path.join(s3SubDir, 'versions', version, hash, `${bin}-v${version}-${hash}-${determinePlatform(config)}-${arch}-buildmanifest`);
+};
+// when autoupdating, wait until the CLI isn't active
+const debounce = async (cacheDir) => {
+    let output = false;
+    const lastrunfile = path.join(cacheDir, 'lastrun');
+    const m = await mtime(lastrunfile);
+    m.setHours(m.getHours() + 1);
+    if (m > new Date()) {
+        const msg = `waiting until ${m.toISOString()} to update`;
+        if (output) {
+            core_1.ux.debug(msg);
+        }
+        else {
+            core_1.ux.log(msg);
+            output = true;
+        }
+        await (0, util_1.wait)(60 * 1000); // wait 1 minute
+        return debounce(cacheDir);
+    }
+    core_1.ux.log('time to update');
+};
+const setChannel = async (channel, dataDir) => (0, promises_1.writeFile)(path.join(dataDir, 'channel'), channel, 'utf8');
+const fetchChannelManifest = async (channel, config) => {
+    const s3Key = s3ChannelManifestKey(channel, config);
+    try {
+        return await fetchManifest(s3Key, config);
+    }
+    catch (error) {
+        if (error.statusCode === 403)
+            throw new Error(`HTTP 403: Invalid channel ${channel}`);
+        throw error;
+    }
+};
+const downloadAndExtract = async (output, manifest, channel, config) => {
+    const { version, gz, sha256gz } = manifest;
+    const gzUrl = gz ?? config.s3Url(config.s3Key('versioned', {
+        version,
+        channel,
+        bin: config.bin,
+        platform: determinePlatform(config),
+        arch: config.arch,
+        ext: 'gz',
+    }));
+    const { response: stream } = await http_call_1.default.stream(gzUrl);
+    stream.pause();
+    const baseDir = manifest.baseDir ?? config.s3Key('baseDir', {
+        version,
+        channel,
+        bin: config.bin,
+        platform: determinePlatform(config),
+        arch: config.arch,
+    });
+    const extraction = (0, tar_1.extract)(stream, baseDir, output, sha256gz);
+    if (core_1.ux.action.type === 'spinner') {
+        const total = Number.parseInt(stream.headers['content-length'], 10);
+        let current = 0;
+        const updateStatus = (0, lodash_throttle_1.default)((newStatus) => {
+            core_1.ux.action.status = newStatus;
+        }, 250, { leading: true, trailing: false });
+        stream.on('data', data => {
+            current += data.length;
+            updateStatus(`${filesize(current)}/${filesize(total)}`);
+        });
+    }
+    stream.resume();
+    await extraction;
+};
+const determineChannel = async ({ version, config }) => {
+    const channelPath = path.join(config.dataDir, 'channel');
+    const channel = (0, node_fs_1.existsSync)(channelPath) ? (await (0, promises_1.readFile)(channelPath, 'utf8')).trim() : 'stable';
+    try {
+        const { body } = await http_call_1.default.get(`${config.npmRegistry ?? 'https://registry.npmjs.org'}/${config.pjson.name}`);
+        const tags = body['dist-tags'];
+        const tag = Object.keys(tags).find(v => tags[v] === version) ?? channel;
+        // convert from npm style tag defaults to OCLIF style
+        if (tag === 'latest')
+            return 'stable';
+        if (tag === 'latest-rc')
+            return 'stable-rc';
+        return tag;
+    }
+    catch {
+        return channel;
+    }
+};
+const determineCurrentVersion = async (clientBin, version) => {
+    try {
+        const currentVersion = await (0, promises_1.readFile)(clientBin, 'utf8');
+        const matches = currentVersion.match(/\.\.[/\\|](.+)[/\\|]bin/);
+        return matches ? matches[1] : version;
+    }
+    catch (error) {
+        core_1.ux.debug(error);
+    }
+    return version;
+};
+const logChop = async (errlogPath) => {
+    try {
+        core_1.ux.debug('log chop');
+        const logChopper = require('log-chopper').default;
+        await logChopper.chop(errlogPath);
+    }
+    catch (error) {
+        core_1.ux.debug(error.message);
+    }
+};

package/lib/util.d.ts

@@ -5,5 +5,4 @@ export declare function ls(dir: string): Promise<Array<{
     path: string;
     stat: fs.Stats;
 }>>;
-export declare function rm(dir: string): Promise<void>;
 export declare function wait(ms: number, unref?: boolean): Promise<void>;

package/lib/util.js

@@ -1,14 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.wait = exports.rm = exports.ls = exports.touch = void 0;
+exports.wait = exports.ls = exports.touch = void 0;
 const tslib_1 = require("tslib");
-const fs = (0, tslib_1.__importStar)(require("fs-extra"));
-const path = (0, tslib_1.__importStar)(require("path"));
+const fs = tslib_1.__importStar(require("fs-extra"));
+const path = tslib_1.__importStar(require("path"));
 async function touch(p) {
     try {
         await fs.utimes(p, new Date(), new Date());
     }
-    catch (_a) {
+    catch {
         await fs.outputFile(p, '');
     }
 }
@@ -19,14 +19,6 @@ async function ls(dir) {
     return Promise.all(paths.map(path => fs.stat(path).then(stat => ({ path, stat }))));
 }
 exports.ls = ls;
-async function rm(dir) {
-    return new Promise(resolve => {
-        fs.rm(dir, { recursive: true, force: true }, () => {
-            resolve();
-        });
-    });
-}
-exports.rm = rm;
 function wait(ms, unref = false) {
     return new Promise(resolve => {
         const t = setTimeout(() => resolve(), ms);

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "3.1.32",
+  "version": "4.0.1-qa.0",
   "commands": {
     "update": {
       "id": "update",

package/package.json

@@ -1,15 +1,14 @@
 {
   "name": "@oclif/plugin-update",
-  "version": "3.1.32",
+  "version": "4.0.1-qa.0",
   "author": "Salesforce",
   "bugs": "https://github.com/oclif/plugin-update/issues",
   "dependencies": {
-    "@oclif/color": "^1.0.10",
     "@oclif/core": "^2.11.8",
-    "cross-spawn": "^7.0.3",
+    "chalk": "^4",
     "debug": "^4.3.1",
     "filesize": "^6.1.0",
-    "fs-extra": "^9.0.1",
+    "fs-extra": "^11.1.1",
     "http-call": "^5.3.0",
     "inquirer": "^8.2.6",
     "lodash.throttle": "^4.1.1",
@@ -21,17 +20,15 @@
     "@oclif/plugin-help": "^5.2.17",
     "@oclif/test": "^2.4.4",
     "@types/chai": "^4.3.5",
-    "@types/cross-spawn": "^6.0.2",
     "@types/execa": "^0.9.0",
-    "@types/fs-extra": "^8.0.1",
+    "@types/fs-extra": "^11.0.1",
     "@types/glob": "^7.1.3",
     "@types/inquirer": "^8.2.0",
     "@types/lodash.throttle": "^4.1.6",
     "@types/mocha": "^9",
-    "@types/node": "^14.18.54",
+    "@types/node": "^16",
     "@types/semver": "^7.5.0",
     "@types/supports-color": "^7.2.0",
-    "@types/write-json-file": "^3.2.1",
     "chai": "^4.3.7",
     "eslint": "^7.32.0",
     "eslint-config-oclif": "^4",
@@ -44,10 +41,10 @@
     "sinon": "^12.0.1",
     "ts-node": "^9.1.1",
     "tslib": "^2.6.1",
-    "typescript": "4.4.3"
+    "typescript": "^5.1.6"
   },
   "engines": {
-    "node": ">=12.0.0"
+    "node": ">=16.0.0"
   },
   "files": [
     "oclif.manifest.json",