@salesforce/core 3.7.5 → 3.7.8

package/lib/{sfdxProject.d.ts → sfProject.d.ts}

@@ -54,7 +54,7 @@ export declare type ProjectJson = ConfigContents & {
  * be in a top level property that represents your project or plugin.
  *
  * ```
- * const project = await SfdxProject.resolve();
+ * const project = await SfProject.resolve();
  * const projectJson = await project.resolveProjectConfig();
  * const myPluginProperties = projectJson.get('myplugin') || {};
  * myPluginProperties.myprop = 'someValue';
@@ -64,7 +64,7 @@ export declare type ProjectJson = ConfigContents & {
  *
  * **See** [force:project:create](https://developer.salesforce.com/docs/atlas.en-us.sfdx_dev.meta/sfdx_dev/sfdx_dev_ws_create_new.htm)
  */
-export declare class SfdxProjectJson extends ConfigFile {
+export declare class SfProjectJson extends ConfigFile {
     static BLOCKLIST: string[];
     static getFileName(): string;
     static getDefaultOptions(isGlobal?: boolean): ConfigFile.Options;
@@ -115,7 +115,7 @@ export declare class SfdxProjectJson extends ConfigFile {
      */
     getUniquePackageDirectories(): NamedPackageDir[];
     /**
-     * Get a list of the unique package names from within sfdx-project.json. Use {@link SfdxProject.getUniquePackageDirectories}
+     * Get a list of the unique package names from within sfdx-project.json. Use {@link SfProject.getUniquePackageDirectories}
      * for data other than the names.
      */
     getUniquePackageNames(): string[];
@@ -131,51 +131,51 @@ export declare class SfdxProjectJson extends ConfigFile {
     private validateKeys;
 }
 /**
- * Represents an SFDX project directory. This directory contains a {@link SfdxProjectJson} config file as well as
+ * Represents an SFDX project directory. This directory contains a {@link SfProjectJson} config file as well as
  * a hidden .sfdx folder that contains all the other local project config files.
  *
  * ```
- * const project = await SfdxProject.resolve();
+ * const project = await SfProject.resolve();
  * const projectJson = await project.resolveProjectConfig();
  * console.log(projectJson.sfdcLoginUrl);
  * ```
  */
-export declare class SfdxProject {
+export declare class SfProject {
     private path;
     private static instances;
     private projectConfig;
-    private sfdxProjectJson;
-    private sfdxProjectJsonGlobal;
+    private sfProjectJson;
+    private sfProjectJsonGlobal;
     private packageDirectories?;
     private activePackage;
     /**
-     * Do not directly construct instances of this class -- use {@link SfdxProject.resolve} instead.
+     * Do not directly construct instances of this class -- use {@link SfProject.resolve} instead.
      *
      * @ignore
      */
-    private constructor();
+    protected constructor(path: string);
     /**
      * Get a Project from a given path or from the working directory.
      *
      * @param path The path of the project.
      *
-     * **Throws** *{@link SfdxError}{ name: 'InvalidProjectWorkspaceError' }* If the current folder is not located in a workspace.
+     * **Throws** *{@link SfError}{ name: 'InvalidProjectWorkspaceError' }* If the current folder is not located in a workspace.
      */
-    static resolve(path?: string): Promise<SfdxProject>;
+    static resolve(path?: string): Promise<SfProject>;
     /**
      * Get a Project from a given path or from the working directory.
      *
      * @param path The path of the project.
      *
-     * **Throws** *{@link SfdxError}{ name: 'InvalidProjectWorkspaceError' }* If the current folder is not located in a workspace.
+     * **Throws** *{@link SfError}{ name: 'InvalidProjectWorkspaceError' }* If the current folder is not located in a workspace.
      */
-    static getInstance(path?: string): SfdxProject;
+    static getInstance(path?: string): SfProject;
     /**
      * Performs an upward directory search for an sfdx project file. Returns the absolute path to the project.
      *
      * @param dir The directory path to start traversing from.
      *
-     * **Throws** *{@link SfdxError}{ name: 'InvalidProjectWorkspaceError' }* If the current folder is not located in a workspace.
+     * **Throws** *{@link SfError}{ name: 'InvalidProjectWorkspaceError' }* If the current folder is not located in a workspace.
      *
      * **See** {@link traverseForFile}
      *
@@ -187,7 +187,7 @@ export declare class SfdxProject {
      *
      * @param dir The directory path to start traversing from.
      *
-     * **Throws** *{@link SfdxError}{ name: 'InvalidProjectWorkspaceError' }* If the current folder is not located in a workspace.
+     * **Throws** *{@link SfError}{ name: 'InvalidProjectWorkspaceError' }* If the current folder is not located in a workspace.
      *
      * **See** {@link traverseForFileSync}
      *
@@ -202,24 +202,24 @@ export declare class SfdxProject {
      * Get the sfdx-project.json config. The global sfdx-project.json is used for user defaults
      * that are not checked in to the project specific file.
      *
-     * *Note:* When reading values from {@link SfdxProjectJson}, it is recommended to use
-     * {@link SfdxProject.resolveProjectConfig} instead.
+     * *Note:* When reading values from {@link SfProjectJson}, it is recommended to use
+     * {@link SfProject.resolveProjectConfig} instead.
      *
      * @param isGlobal True to get the global project file, otherwise the local project config.
      */
-    retrieveSfdxProjectJson(isGlobal?: boolean): Promise<SfdxProjectJson>;
+    retrieveSfProjectJson(isGlobal?: boolean): Promise<SfProjectJson>;
     /**
      * Get the sfdx-project.json config. The global sfdx-project.json is used for user defaults
      * that are not checked in to the project specific file.
      *
-     * *Note:* When reading values from {@link SfdxProjectJson}, it is recommended to use
-     * {@link SfdxProject.resolveProjectConfig} instead.
+     * *Note:* When reading values from {@link SfProjectJson}, it is recommended to use
+     * {@link SfProject.resolveProjectConfig} instead.
      *
-     * This is the sync method of {@link SfdxProject.resolveSfdxProjectJson}
+     * This is the sync method of {@link SfProject.resolveSfProjectJson}
      *
      * @param isGlobal True to get the global project file, otherwise the local project config.
      */
-    getSfdxProjectJson(isGlobal?: boolean): SfdxProjectJson;
+    getSfProjectJson(isGlobal?: boolean): SfProjectJson;
     /**
      * Returns a read-only list of `packageDirectories` within sfdx-project.json, first reading
      * and validating the file if necessary. i.e. modifying this array will not affect the
@@ -238,7 +238,7 @@ export declare class SfdxProject {
      */
     getUniquePackageDirectories(): NamedPackageDir[];
     /**
-     * Get a list of the unique package names from within sfdx-project.json. Use {@link SfdxProject.getUniquePackageDirectories}
+     * Get a list of the unique package names from within sfdx-project.json. Use {@link SfProject.getUniquePackageDirectories}
      * for data other than the names.
      */
     getUniquePackageNames(): string[];
@@ -293,11 +293,11 @@ export declare class SfdxProject {
      */
     getDefaultPackage(): NamedPackageDir;
     /**
-     * The project config is resolved from local and global {@link SfdxProjectJson},
+     * The project config is resolved from local and global {@link SfProjectJson},
      * {@link ConfigAggregator}, and a set of defaults. It is recommended to use
-     * this when reading values from SfdxProjectJson.
+     * this when reading values from SfProjectJson.
      *
-     * The global {@link SfdxProjectJson} is used to allow the user to provide default values they
+     * The global {@link SfProjectJson} is used to allow the user to provide default values they
      * may not want checked into their project's source.
      *
      * @returns A resolved config object that contains a bunch of different
@@ -305,3 +305,13 @@ export declare class SfdxProject {
      */
     resolveProjectConfig(): Promise<JsonMap>;
 }
+/**
+ * @deprecated use SfProject instead
+ */
+export declare class SfdxProject extends SfProject {
+}
+/**
+ * @deprecated use SfProjectJson instead
+ */
+export declare class SfdxProjectJson extends SfProjectJson {
+}

package/lib/{sfdxProject.js → sfProject.js}

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SfdxProject = exports.SfdxProjectJson = void 0;
+exports.SfdxProjectJson = exports.SfdxProject = exports.SfProject = exports.SfProjectJson = void 0;
 /*
  * Copyright (c) 2020, salesforce.com, inc.
  * All rights reserved.
@@ -8,15 +8,15 @@ exports.SfdxProject = exports.SfdxProjectJson = void 0;
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 const path_1 = require("path");
+const fs = require("fs");
 const kit_1 = require("@salesforce/kit");
 const ts_types_1 = require("@salesforce/ts-types");
 const sfdcUrl_1 = require("./util/sfdcUrl");
 const configAggregator_1 = require("./config/configAggregator");
 const configFile_1 = require("./config/configFile");
 const validator_1 = require("./schema/validator");
-const fs_1 = require("./util/fs");
 const internal_1 = require("./util/internal");
-const sfdxError_1 = require("./sfdxError");
+const sfError_1 = require("./sfError");
 const sfdc_1 = require("./util/sfdc");
 const messages_1 = require("./messages");
 messages_1.Messages.importMessagesDirectory(__dirname);
@@ -36,7 +36,7 @@ const coreMessages = messages_1.Messages.load('@salesforce/core', 'core', ['inva
  * be in a top level property that represents your project or plugin.
  *
  * ```
- * const project = await SfdxProject.resolve();
+ * const project = await SfProject.resolve();
  * const projectJson = await project.resolveProjectConfig();
  * const myPluginProperties = projectJson.get('myplugin') || {};
  * myPluginProperties.myprop = 'someValue';
@@ -46,12 +46,12 @@ const coreMessages = messages_1.Messages.load('@salesforce/core', 'core', ['inva
  *
  * **See** [force:project:create](https://developer.salesforce.com/docs/atlas.en-us.sfdx_dev.meta/sfdx_dev/sfdx_dev_ws_create_new.htm)
  */
-class SfdxProjectJson extends configFile_1.ConfigFile {
+class SfProjectJson extends configFile_1.ConfigFile {
     static getFileName() {
         return internal_1.SFDX_PROJECT_JSON;
     }
     static getDefaultOptions(isGlobal = false) {
-        const options = configFile_1.ConfigFile.getDefaultOptions(isGlobal, SfdxProjectJson.getFileName());
+        const options = configFile_1.ConfigFile.getDefaultOptions(isGlobal, SfProjectJson.getFileName());
         options.isState = false;
         return options;
     }
@@ -229,7 +229,7 @@ class SfdxProjectJson extends configFile_1.ConfigFile {
         return uniqueValues;
     }
     /**
-     * Get a list of the unique package names from within sfdx-project.json. Use {@link SfdxProject.getUniquePackageDirectories}
+     * Get a list of the unique package names from within sfdx-project.json. Use {@link SfProject.getUniquePackageDirectories}
      * for data other than the names.
      */
     getUniquePackageNames() {
@@ -248,31 +248,31 @@ class SfdxProjectJson extends configFile_1.ConfigFile {
         return this.getContents().packageDirectories && this.getContents().packageDirectories.length > 1;
     }
     doesPackageExist(packagePath) {
-        return fs_1.fs.existsSync(packagePath);
+        return fs.existsSync(packagePath);
     }
     validateKeys() {
         // Verify that the configObject does not have upper case keys; throw if it does.  Must be heads down camel case.
-        const upperCaseKey = sfdc_1.sfdc.findUpperCaseKeys(this.toObject(), SfdxProjectJson.BLOCKLIST);
+        const upperCaseKey = sfdc_1.sfdc.findUpperCaseKeys(this.toObject(), SfProjectJson.BLOCKLIST);
         if (upperCaseKey) {
             throw coreMessages.createError('invalidJsonCasing', [upperCaseKey, this.getPath()]);
         }
     }
 }
-exports.SfdxProjectJson = SfdxProjectJson;
-SfdxProjectJson.BLOCKLIST = ['packageAliases'];
+exports.SfProjectJson = SfProjectJson;
+SfProjectJson.BLOCKLIST = ['packageAliases'];
 /**
- * Represents an SFDX project directory. This directory contains a {@link SfdxProjectJson} config file as well as
+ * Represents an SFDX project directory. This directory contains a {@link SfProjectJson} config file as well as
  * a hidden .sfdx folder that contains all the other local project config files.
  *
  * ```
- * const project = await SfdxProject.resolve();
+ * const project = await SfProject.resolve();
  * const projectJson = await project.resolveProjectConfig();
  * console.log(projectJson.sfdcLoginUrl);
  * ```
  */
-class SfdxProject {
+class SfProject {
     /**
-     * Do not directly construct instances of this class -- use {@link SfdxProject.resolve} instead.
+     * Do not directly construct instances of this class -- use {@link SfProject.resolve} instead.
      *
      * @ignore
      */
@@ -284,38 +284,38 @@ class SfdxProject {
      *
      * @param path The path of the project.
      *
-     * **Throws** *{@link SfdxError}{ name: 'InvalidProjectWorkspaceError' }* If the current folder is not located in a workspace.
+     * **Throws** *{@link SfError}{ name: 'InvalidProjectWorkspaceError' }* If the current folder is not located in a workspace.
      */
     static async resolve(path) {
         path = await this.resolveProjectPath(path || process.cwd());
-        if (!SfdxProject.instances.has(path)) {
-            const project = new SfdxProject(path);
-            SfdxProject.instances.set(path, project);
+        if (!SfProject.instances.has(path)) {
+            const project = new SfProject(path);
+            SfProject.instances.set(path, project);
         }
-        return (0, ts_types_1.ensure)(SfdxProject.instances.get(path));
+        return (0, ts_types_1.ensure)(SfProject.instances.get(path));
     }
     /**
      * Get a Project from a given path or from the working directory.
      *
      * @param path The path of the project.
      *
-     * **Throws** *{@link SfdxError}{ name: 'InvalidProjectWorkspaceError' }* If the current folder is not located in a workspace.
+     * **Throws** *{@link SfError}{ name: 'InvalidProjectWorkspaceError' }* If the current folder is not located in a workspace.
      */
     static getInstance(path) {
         // Store instance based on the path of the actual project.
         path = this.resolveProjectPathSync(path || process.cwd());
-        if (!SfdxProject.instances.has(path)) {
-            const project = new SfdxProject(path);
-            SfdxProject.instances.set(path, project);
+        if (!SfProject.instances.has(path)) {
+            const project = new SfProject(path);
+            SfProject.instances.set(path, project);
         }
-        return (0, ts_types_1.ensure)(SfdxProject.instances.get(path));
+        return (0, ts_types_1.ensure)(SfProject.instances.get(path));
     }
     /**
      * Performs an upward directory search for an sfdx project file. Returns the absolute path to the project.
      *
      * @param dir The directory path to start traversing from.
      *
-     * **Throws** *{@link SfdxError}{ name: 'InvalidProjectWorkspaceError' }* If the current folder is not located in a workspace.
+     * **Throws** *{@link SfError}{ name: 'InvalidProjectWorkspaceError' }* If the current folder is not located in a workspace.
      *
      * **See** {@link traverseForFile}
      *
@@ -329,7 +329,7 @@ class SfdxProject {
      *
      * @param dir The directory path to start traversing from.
      *
-     * **Throws** *{@link SfdxError}{ name: 'InvalidProjectWorkspaceError' }* If the current folder is not located in a workspace.
+     * **Throws** *{@link SfError}{ name: 'InvalidProjectWorkspaceError' }* If the current folder is not located in a workspace.
      *
      * **See** {@link traverseForFileSync}
      *
@@ -348,54 +348,54 @@ class SfdxProject {
      * Get the sfdx-project.json config. The global sfdx-project.json is used for user defaults
      * that are not checked in to the project specific file.
      *
-     * *Note:* When reading values from {@link SfdxProjectJson}, it is recommended to use
-     * {@link SfdxProject.resolveProjectConfig} instead.
+     * *Note:* When reading values from {@link SfProjectJson}, it is recommended to use
+     * {@link SfProject.resolveProjectConfig} instead.
      *
      * @param isGlobal True to get the global project file, otherwise the local project config.
      */
-    async retrieveSfdxProjectJson(isGlobal = false) {
-        const options = SfdxProjectJson.getDefaultOptions(isGlobal);
+    async retrieveSfProjectJson(isGlobal = false) {
+        const options = SfProjectJson.getDefaultOptions(isGlobal);
         if (isGlobal) {
-            if (!this.sfdxProjectJsonGlobal) {
-                this.sfdxProjectJsonGlobal = await SfdxProjectJson.create(options);
+            if (!this.sfProjectJsonGlobal) {
+                this.sfProjectJsonGlobal = await SfProjectJson.create(options);
             }
-            return this.sfdxProjectJsonGlobal;
+            return this.sfProjectJsonGlobal;
         }
         else {
             options.rootFolder = this.getPath();
-            if (!this.sfdxProjectJson) {
-                this.sfdxProjectJson = await SfdxProjectJson.create(options);
+            if (!this.sfProjectJson) {
+                this.sfProjectJson = await SfProjectJson.create(options);
             }
-            return this.sfdxProjectJson;
+            return this.sfProjectJson;
         }
     }
     /**
      * Get the sfdx-project.json config. The global sfdx-project.json is used for user defaults
      * that are not checked in to the project specific file.
      *
-     * *Note:* When reading values from {@link SfdxProjectJson}, it is recommended to use
-     * {@link SfdxProject.resolveProjectConfig} instead.
+     * *Note:* When reading values from {@link SfProjectJson}, it is recommended to use
+     * {@link SfProject.resolveProjectConfig} instead.
      *
-     * This is the sync method of {@link SfdxProject.resolveSfdxProjectJson}
+     * This is the sync method of {@link SfProject.resolveSfProjectJson}
      *
      * @param isGlobal True to get the global project file, otherwise the local project config.
      */
-    getSfdxProjectJson(isGlobal = false) {
-        const options = SfdxProjectJson.getDefaultOptions(isGlobal);
+    getSfProjectJson(isGlobal = false) {
+        const options = SfProjectJson.getDefaultOptions(isGlobal);
         if (isGlobal) {
-            if (!this.sfdxProjectJsonGlobal) {
-                this.sfdxProjectJsonGlobal = new SfdxProjectJson(options);
-                this.sfdxProjectJsonGlobal.readSync();
+            if (!this.sfProjectJsonGlobal) {
+                this.sfProjectJsonGlobal = new SfProjectJson(options);
+                this.sfProjectJsonGlobal.readSync();
             }
-            return this.sfdxProjectJsonGlobal;
+            return this.sfProjectJsonGlobal;
         }
         else {
             options.rootFolder = this.getPath();
-            if (!this.sfdxProjectJson) {
-                this.sfdxProjectJson = new SfdxProjectJson(options);
-                this.sfdxProjectJson.readSync();
+            if (!this.sfProjectJson) {
+                this.sfProjectJson = new SfProjectJson(options);
+                this.sfProjectJson.readSync();
             }
-            return this.sfdxProjectJson;
+            return this.sfProjectJson;
         }
     }
     /**
@@ -405,7 +405,7 @@ class SfdxProject {
      */
     getPackageDirectories() {
         if (!this.packageDirectories) {
-            this.packageDirectories = this.getSfdxProjectJson().getPackageDirectoriesSync();
+            this.packageDirectories = this.getSfProjectJson().getPackageDirectoriesSync();
         }
         return this.packageDirectories;
     }
@@ -420,14 +420,14 @@ class SfdxProject {
      * for packaging operations that want to do something for each package entry.
      */
     getUniquePackageDirectories() {
-        return this.getSfdxProjectJson().getUniquePackageDirectories();
+        return this.getSfProjectJson().getUniquePackageDirectories();
     }
     /**
-     * Get a list of the unique package names from within sfdx-project.json. Use {@link SfdxProject.getUniquePackageDirectories}
+     * Get a list of the unique package names from within sfdx-project.json. Use {@link SfProject.getUniquePackageDirectories}
      * for data other than the names.
      */
     getUniquePackageNames() {
-        return this.getSfdxProjectJson().getUniquePackageNames();
+        return this.getSfProjectJson().getUniquePackageNames();
     }
     /**
      * Returns the package from a file path.
@@ -471,13 +471,13 @@ class SfdxProject {
      * Has package directories defined in the project.
      */
     hasPackages() {
-        return this.getSfdxProjectJson().hasPackages();
+        return this.getSfProjectJson().hasPackages();
     }
     /**
      * Has multiple package directories (MPD) defined in the project.
      */
     hasMultiplePackages() {
-        return this.getSfdxProjectJson().hasMultiplePackages();
+        return this.getSfProjectJson().hasMultiplePackages();
     }
     /**
      * Get the currently activated package on the project. This has no implication on sfdx-project.json
@@ -506,17 +506,17 @@ class SfdxProject {
      */
     getDefaultPackage() {
         if (!this.hasPackages()) {
-            throw new sfdxError_1.SfdxError('The sfdx-project.json does not have any packageDirectories defined.');
+            throw new sfError_1.SfError('The sfdx-project.json does not have any packageDirectories defined.');
         }
         const defaultPackage = this.getPackageDirectories().find((packageDir) => packageDir.default === true);
         return defaultPackage || this.getPackageDirectories()[0];
     }
     /**
-     * The project config is resolved from local and global {@link SfdxProjectJson},
+     * The project config is resolved from local and global {@link SfProjectJson},
      * {@link ConfigAggregator}, and a set of defaults. It is recommended to use
-     * this when reading values from SfdxProjectJson.
+     * this when reading values from SfProjectJson.
      *
-     * The global {@link SfdxProjectJson} is used to allow the user to provide default values they
+     * The global {@link SfProjectJson} is used to allow the user to provide default values they
      * may not want checked into their project's source.
      *
      * @returns A resolved config object that contains a bunch of different
@@ -527,8 +527,8 @@ class SfdxProject {
         if (!this.projectConfig) {
             // Do fs operations in parallel
             const [global, local, configAggregator] = await Promise.all([
-                this.retrieveSfdxProjectJson(true),
-                this.retrieveSfdxProjectJson(),
+                this.retrieveSfProjectJson(true),
+                this.retrieveSfProjectJson(),
                 configAggregator_1.ConfigAggregator.create(),
             ]);
             await Promise.all([global.read(), local.read()]);
@@ -551,7 +551,19 @@ class SfdxProject {
         return this.projectConfig;
     }
 }
+exports.SfProject = SfProject;
+// Cache of SfProject instances per path.
+SfProject.instances = new Map();
+/**
+ * @deprecated use SfProject instead
+ */
+class SfdxProject extends SfProject {
+}
 exports.SfdxProject = SfdxProject;
-// Cache of SfdxProject instances per path.
-SfdxProject.instances = new Map();
-//# sourceMappingURL=sfdxProject.js.map
+/**
+ * @deprecated use SfProjectJson instead
+ */
+class SfdxProjectJson extends SfProjectJson {
+}
+exports.SfdxProjectJson = SfdxProjectJson;
+//# sourceMappingURL=sfProject.js.map

package/lib/status/pollingClient.d.ts

@@ -1,7 +1,7 @@
 import { AsyncOptionalCreatable, Duration } from '@salesforce/kit';
 import { AnyJson } from '@salesforce/ts-types';
 import { Logger } from '../logger';
-import { StatusResult } from './streamingClient';
+import { StatusResult } from './types';
 /**
  * This is a polling client that can be used to poll the status of long running tasks. It can be used as a replacement
  * for Streaming when streaming topics are not available or when streaming handshakes are failing. Why wouldn't you
@@ -38,7 +38,7 @@ export declare class PollingClient extends AsyncOptionalCreatable<PollingClient.
      * Returns a promise to call the specified polling function using the interval and timeout specified
      * in the polling options.
      */
-    subscribe(): Promise<AnyJson | undefined>;
+    subscribe<T = AnyJson>(): Promise<T>;
 }
 export declare namespace PollingClient {
     /**

package/lib/status/pollingClient.js

@@ -11,7 +11,8 @@ const kit_1 = require("@salesforce/kit");
 const ts_types_1 = require("@salesforce/ts-types");
 const ts_retry_promise_1 = require("ts-retry-promise");
 const logger_1 = require("../logger");
-const sfdxError_1 = require("../sfdxError");
+const sfError_1 = require("../sfError");
+const lifecycleEvents_1 = require("../lifecycleEvents");
 /**
  * This is a polling client that can be used to poll the status of long running tasks. It can be used as a replacement
  * for Streaming when streaming topics are not available or when streaming handshakes are failing. Why wouldn't you
@@ -60,9 +61,14 @@ class PollingClient extends kit_1.AsyncOptionalCreatable {
                 result = await this.options.poll();
             }
             catch (error) {
-                errorInPollingFunction = error;
+                const err = (errorInPollingFunction = error);
+                if (['ETIMEDOUT', 'ENOTFOUND', 'ECONNRESET', 'socket hang up'].some((retryableNetworkError) => err.message.includes(retryableNetworkError))) {
+                    this.logger.debug('Network error on the request', err);
+                    await lifecycleEvents_1.Lifecycle.getInstance().emitWarning('Network error occurred. Continuing to poll.');
+                    throw sfError_1.SfError.wrap(err);
+                }
                 // there was an actual error thrown, so we don't want to keep retrying
-                throw new ts_retry_promise_1.NotRetryableError(error.name);
+                throw new ts_retry_promise_1.NotRetryableError(err.name);
             }
             if (result.completed) {
                 return result.payload;
@@ -82,7 +88,7 @@ class PollingClient extends kit_1.AsyncOptionalCreatable {
                 throw errorInPollingFunction;
             }
             this.logger.debug('Polling timed out');
-            throw new sfdxError_1.SfdxError('The client has timed out.', (_a = this.options.timeoutErrorName) !== null && _a !== void 0 ? _a : 'PollingClientTimeout');
+            throw new sfError_1.SfError('The client has timed out.', (_a = this.options.timeoutErrorName) !== null && _a !== void 0 ? _a : 'PollingClientTimeout');
         }
     }
 }

package/lib/status/streamingClient.d.ts

@@ -113,7 +113,7 @@ export declare class StreamingClient extends AsyncOptionalCreatable<StreamingCli
      * Subscribe to streaming events. When the streaming processor that's set in the options completes execution it
      * returns a payload in the StatusResult object. The payload is just echoed here for convenience.
      *
-     * **Throws** *{@link SfdxError}{ name: '{@link StreamingClient.TimeoutErrorType.SUBSCRIBE}'}* When the subscribe timeout occurs.
+     * **Throws** *{@link SfError}{ name: '{@link StreamingClient.TimeoutErrorType.SUBSCRIBE}'}* When the subscribe timeout occurs.
      *
      * @param streamInit This function should call the platform apis that result in streaming updates on push topics.
      * {@link StatusResult}

package/lib/status/streamingClient.js

@@ -13,7 +13,7 @@ const lib_1 = require("@salesforce/kit/lib");
 const lib_2 = require("@salesforce/ts-types/lib");
 const Faye = require("faye");
 const logger_1 = require("../logger");
-const sfdxError_1 = require("../sfdxError");
+const sfError_1 = require("../sfError");
 const messages_1 = require("../messages");
 const types_1 = require("./types");
 Object.defineProperty(exports, "CometClient", { enumerable: true, get: function () { return types_1.CometClient; } });
@@ -151,7 +151,7 @@ class StreamingClient extends lib_1.AsyncOptionalCreatable {
             this.cometClient.setHeader('Authorization', `OAuth ${accessToken}`);
         }
         else {
-            throw new sfdxError_1.SfdxError('Missing or invalid access token', 'MissingOrInvalidAccessToken');
+            throw new sfError_1.SfError('Missing or invalid access token', 'MissingOrInvalidAccessToken');
         }
         this.log(`Streaming client target url: ${this.targetUrl}`);
         this.log(`options.subscribeTimeout (ms): ${this.options.subscribeTimeout.milliseconds}`);
@@ -201,7 +201,7 @@ class StreamingClient extends lib_1.AsyncOptionalCreatable {
      * Subscribe to streaming events. When the streaming processor that's set in the options completes execution it
      * returns a payload in the StatusResult object. The payload is just echoed here for convenience.
      *
-     * **Throws** *{@link SfdxError}{ name: '{@link StreamingClient.TimeoutErrorType.SUBSCRIBE}'}* When the subscribe timeout occurs.
+     * **Throws** *{@link SfError}{ name: '{@link StreamingClient.TimeoutErrorType.SUBSCRIBE}'}* When the subscribe timeout occurs.
      *
      * @param streamInit This function should call the platform apis that result in streaming updates on push topics.
      * {@link StatusResult}
@@ -342,13 +342,13 @@ exports.StreamingClient = StreamingClient;
                 logger.warn('envDep is deprecated');
             }
             if (!streamProcessor) {
-                throw new sfdxError_1.SfdxError('Missing stream processor', 'MissingArg');
+                throw new sfError_1.SfError('Missing stream processor', 'MissingArg');
             }
             if (!org) {
-                throw new sfdxError_1.SfdxError('Missing org', 'MissingArg');
+                throw new sfError_1.SfError('Missing org', 'MissingArg');
             }
             if (!channel) {
-                throw new sfdxError_1.SfdxError('Missing streaming channel', 'MissingArg');
+                throw new sfError_1.SfError('Missing streaming channel', 'MissingArg');
             }
             this.org = org;
             this.apiVersion = org.getConnection().getApiVersion();

package/lib/testSetup.d.ts

@@ -4,7 +4,7 @@ import * as sinonType from 'sinon';
 import { AnyJson, JsonMap, Optional } from '@salesforce/ts-types';
 import { ConfigContents } from './config/configStore';
 import { Logger } from './logger';
-import { SfdxError } from './sfdxError';
+import { SfError } from './sfError';
 import { CometClient, CometSubscription, Message, StreamingExtension } from './status/streamingClient';
 import { SfOrg } from './globalInfo';
 /**
@@ -85,7 +85,7 @@ export interface TestContext {
         [configName: string]: Optional<ConfigStub>;
         GlobalInfo?: ConfigStub;
         Aliases?: ConfigStub;
-        SfdxProjectJson?: ConfigStub;
+        SfProjectJson?: ConfigStub;
         SfdxConfig?: ConfigStub;
     };
     /**
@@ -252,7 +252,7 @@ export declare const testSetup: (sinon?: any) => TestContext;
  *
  * **See** {@link shouldThrow}
  */
-export declare const unexpectedResult: SfdxError;
+export declare const unexpectedResult: SfError;
 /**
  * Use for this testing pattern:
  * ```
@@ -302,7 +302,7 @@ export interface StreamingMockCometSubscriptionOptions {
     /**
      * If it's an error that states what that error should be.
      */
-    subscriptionErrbackError?: SfdxError;
+    subscriptionErrbackError?: SfError;
     /**
      * A list of messages to playback for the client. One message per process tick.
      */