@salesforce/core 3.6.5 → 3.7.2

package/lib/org/connection.d.ts

@@ -1,8 +1,9 @@
 /// <reference types="node" />
 import { AsyncResult, DeployOptions, DeployResultLocator } from 'jsforce/api/metadata';
-import { Callback } from 'jsforce/connection';
 import { JsonCollection, JsonMap, Optional } from '@salesforce/ts-types';
-import { Connection as JSForceConnection, ConnectionOptions, ExecuteOptions, QueryResult, RequestInfo, Tooling as JSForceTooling } from 'jsforce';
+import { Connection as JSForceConnection, ConnectionConfig, HttpRequest, QueryOptions, QueryResult, Record, Schema } from 'jsforce';
+import { Tooling as JSForceTooling } from 'jsforce/lib/api/tooling';
+import { StreamPromise } from 'jsforce/lib/util/promise';
 import { AuthFields, AuthInfo } from '../org/authInfo';
 import { ConfigAggregator } from '../config/configAggregator';
 export declare const SFDX_HTTP_HEADERS: {
@@ -14,10 +15,11 @@ declare type recentValidationOptions = {
     id: string;
     rest?: boolean;
 };
-export declare type DeployOptionsWithRest = DeployOptions & {
+export declare type DeployOptionsWithRest = Partial<DeployOptions> & {
     rest?: boolean;
 };
-export interface Tooling extends JSForceTooling {
+export interface Tooling<S extends Schema = Schema> extends JSForceTooling<S> {
+    _logger: any;
     /**
      * Executes a query and auto-fetches (i.e., "queryMore") all results.  This is especially
      * useful with large query result sizes, such as over 2000 records.  The default maximum
@@ -26,7 +28,7 @@ export interface Tooling extends JSForceTooling {
      * @param soql The SOQL string.
      * @param options The query options.  NOTE: the autoFetch option will always be true.
      */
-    autoFetchQuery<T>(soql: string, options?: ExecuteOptions): Promise<QueryResult<T>>;
+    autoFetchQuery<T extends Schema = S>(soql: string, options?: QueryOptions): Promise<QueryResult<T>>;
 }
 /**
  * Handles connections and requests to Salesforce Orgs.
@@ -43,14 +45,12 @@ export interface Tooling extends JSForceTooling {
  * connection.query('SELECT Name from Account');
  * ```
  */
-export declare class Connection extends JSForceConnection {
+export declare class Connection<S extends Schema = Schema> extends JSForceConnection<S> {
     /**
      * Tooling api reference.
      */
-    tooling: Tooling;
+    get tooling(): Tooling<S>;
     private logger;
-    private _transport;
-    private _normalizeUrl;
     private options;
     private username;
     /**
@@ -60,13 +60,13 @@ export declare class Connection extends JSForceConnection {
      * @param options The options for the class instance.
      * @ignore
      */
-    constructor(options: Connection.Options);
+    constructor(options: Connection.Options<S>);
     /**
      * Creates an instance of a Connection. Performs additional async initializations.
      *
      * @param options Constructor options.
      */
-    static create(this: new (options: Connection.Options) => Connection, options: Connection.Options): Promise<Connection>;
+    static create<S extends Schema>(this: new (options: Connection.Options<S>) => Connection<S>, options: Connection.Options<S>): Promise<Connection<S>>;
     /**
      * Async initializer.
      */
@@ -81,7 +81,7 @@ export declare class Connection extends JSForceConnection {
      * @param options JSForce deploy options + a boolean for rest
      * @param callback
      */
-    deploy(zipInput: Buffer, options: DeployOptionsWithRest, callback?: Callback<AsyncResult>): Promise<DeployResultLocator<AsyncResult>>;
+    deploy(zipInput: Buffer, options: DeployOptionsWithRest): Promise<DeployResultLocator<AsyncResult & Schema>>;
     /**
      * Send REST API request with given HTTP request info, with connected session information
      * and SFDX headers.
@@ -89,14 +89,7 @@ export declare class Connection extends JSForceConnection {
      * @param request HTTP request object or URL to GET request.
      * @param options HTTP API request options.
      */
-    request<T = JsonCollection>(request: RequestInfo | string, options?: JsonMap): Promise<T>;
-    /**
-     * Send REST API request with given HTTP request info, with connected session information
-     * and SFDX headers. This method returns a raw http response which includes a response body and statusCode.
-     *
-     * @param request HTTP request object or URL to GET request.
-     */
-    requestRaw(request: RequestInfo): Promise<JsonMap>;
+    request<R = unknown>(request: string | HttpRequest, options?: JsonMap): StreamPromise<R>;
     /**
      * The Force API base url for the instance.
      */
@@ -167,9 +160,9 @@ export declare class Connection extends JSForceConnection {
      * fetch size is 10,000 records. Modify this via the options argument.
      *
      * @param soql The SOQL string.
-     * @param executeOptions The query options. NOTE: the autoFetch option will always be true.
+     * @param queryOptions The query options. NOTE: the autoFetch option will always be true.
      */
-    autoFetchQuery<T>(soql: string, executeOptions?: ExecuteOptions): Promise<QueryResult<T>>;
+    autoFetchQuery<T extends Schema = S>(soql: string, queryOptions?: Partial<QueryOptions>): Promise<QueryResult<T>>;
     /**
      * Executes a query using either standard REST or Tooling API, returning a single record.
      * Will throw if either zero records are found OR multiple records are found.
@@ -177,7 +170,7 @@ export declare class Connection extends JSForceConnection {
      * @param soql The SOQL string.
      * @param options The query options.
      */
-    singleRecordQuery<T>(soql: string, options?: SingleRecordQueryOptions): Promise<T>;
+    singleRecordQuery<T extends Record>(soql: string, options?: SingleRecordQueryOptions): Promise<T>;
     private loadInstanceApiVersion;
 }
 export declare const SingleRecordQueryErrors: {
@@ -193,7 +186,7 @@ export declare namespace Connection {
     /**
      * Connection Options.
      */
-    interface Options {
+    interface Options<S extends Schema> {
         /**
          * AuthInfo instance.
          */
@@ -205,7 +198,7 @@ export declare namespace Connection {
         /**
          * Additional connection parameters.
          */
-        connectionOptions?: ConnectionOptions;
+        connectionOptions?: ConnectionConfig<S>;
     }
 }
 export {};

package/lib/org/connection.js

@@ -9,12 +9,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SingleRecordQueryErrors = exports.Connection = exports.DNS_ERROR_NAME = exports.SFDX_HTTP_HEADERS = void 0;
 /* eslint-disable @typescript-eslint/ban-ts-comment */
 const url_1 = require("url");
+const FormData = require("form-data");
 const kit_1 = require("@salesforce/kit");
 const ts_types_1 = require("@salesforce/ts-types");
 const jsforce_1 = require("jsforce");
-// no types for Transport
-// @ts-ignore
-const Transport = require("jsforce/lib/transport");
+const tooling_1 = require("jsforce/lib/api/tooling");
 const myDomainResolver_1 = require("../status/myDomainResolver");
 const configAggregator_1 = require("../config/configAggregator");
 const logger_1 = require("../logger");
@@ -27,12 +26,6 @@ const messages = messages_1.Messages.load('@salesforce/core', 'connection', [
     'domainNotFoundError',
     'noInstanceUrlError',
 ]);
-/**
- * The 'async' in our request override replaces the jsforce promise with the node promise, then returns it back to
- * jsforce which expects .thenCall. Add .thenCall to the node promise to prevent breakage.
- */
-// @ts-ignore
-Promise.prototype.thenCall = jsforce_1.Promise.prototype.thenCall;
 const clientId = `sfdx toolbelt:${process.env.SFDX_SET_CLIENT_IDS || ''}`;
 exports.SFDX_HTTP_HEADERS = {
     'content-type': 'application/json',
@@ -69,6 +62,13 @@ class Connection extends jsforce_1.Connection {
         this.options = options;
         this.username = options.authInfo.getUsername();
     }
+    // The following are all initialized in either this constructor or the super constructor, sometimes conditionally...
+    /**
+     * Tooling api reference.
+     */
+    get tooling() {
+        return super.tooling;
+    }
     /**
      * Creates an instance of a Connection. Performs additional async initializations.
      *
@@ -87,8 +87,9 @@ class Connection extends jsforce_1.Connection {
             const configAggregator = options.configAggregator || (await configAggregator_1.ConfigAggregator.create());
             baseOptions.version = ts_types_1.asString(configAggregator.getInfo('apiVersion').value);
         }
+        const providedOptions = options.authInfo.getConnectionOptions();
         // Get connection options from auth info and create a new jsForce connection
-        options.connectionOptions = Object.assign(baseOptions, options.authInfo.getConnectionOptions());
+        options.connectionOptions = Object.assign(baseOptions, providedOptions);
         const conn = new this(options);
         await conn.init();
         try {
@@ -129,7 +130,7 @@ class Connection extends jsforce_1.Connection {
      * @param options JSForce deploy options + a boolean for rest
      * @param callback
      */
-    async deploy(zipInput, options, callback) {
+    async deploy(zipInput, options) {
         const rest = options.rest;
         // neither API expects this option
         delete options.rest;
@@ -137,37 +138,29 @@ class Connection extends jsforce_1.Connection {
             this.logger.debug('deploy with REST');
             const headers = {
                 Authorization: this && `OAuth ${this.accessToken}`,
-                clientId: this.oauth2 && this.oauth2.clientId,
                 'Sforce-Call-Options': 'client=sfdx-core',
             };
-            const url = `${this.baseUrl()}/metadata/deployRequest`;
-            const request = Transport.prototype._getHttpRequestModule();
-            return new Promise((resolve, reject) => {
-                const req = request.post(url, { headers }, (err, httpResponse, body) => {
-                    let res;
-                    try {
-                        res = JSON.parse(body);
-                    }
-                    catch (e) {
-                        reject(sfdxError_1.SfdxError.wrap(body));
-                    }
-                    resolve(res);
-                });
-                const form = req.form();
-                // Add the zip file
-                form.append('file', zipInput, {
-                    contentType: 'application/zip',
-                    filename: 'package.xml',
-                });
-                // Add the deploy options
-                form.append('entity_content', JSON.stringify({ deployOptions: options }), {
-                    contentType: 'application/json',
-                });
+            const client = this.oauth2 && this.oauth2.clientId;
+            if (client) {
+                headers.clientId = client;
+            }
+            const form = new FormData();
+            // Add the zip file
+            form.append('file', zipInput, {
+                contentType: 'application/zip',
+                filename: 'package.xml',
             });
+            // Add the deploy options
+            form.append('entity_content', JSON.stringify({ deployOptions: options }), {
+                contentType: 'application/json',
+            });
+            const url = `${this.baseUrl()}/metadata/deployRequest`;
+            const httpRequest = { method: 'POST', url, headers, body: form };
+            return this.request(httpRequest);
         }
         else {
             this.logger.debug('deploy with SOAP');
-            return this.metadata.deploy(zipInput, options, callback);
+            return this.metadata.deploy(zipInput, options);
         }
     }
     /**
@@ -177,27 +170,12 @@ class Connection extends jsforce_1.Connection {
      * @param request HTTP request object or URL to GET request.
      * @param options HTTP API request options.
      */
-    async request(request, options) {
-        const requestInfo = ts_types_1.isString(request) ? { method: 'GET', url: request } : request;
-        requestInfo.headers = Object.assign({}, exports.SFDX_HTTP_HEADERS, requestInfo.headers);
-        this.logger.debug(`request: ${JSON.stringify(requestInfo)}`);
-        return super.request(requestInfo, options);
-    }
-    /**
-     * Send REST API request with given HTTP request info, with connected session information
-     * and SFDX headers. This method returns a raw http response which includes a response body and statusCode.
-     *
-     * @param request HTTP request object or URL to GET request.
-     */
-    async requestRaw(request) {
-        const headers = this.accessToken ? { Authorization: `Bearer ${this.accessToken}` } : {};
-        kit_1.merge(headers, exports.SFDX_HTTP_HEADERS, request.headers);
-        return this._transport.httpRequest({
-            method: request.method,
-            url: request.url,
-            headers,
-            body: request.body,
-        });
+    request(request, options) {
+        const httpRequest = ts_types_1.isString(request) ? { method: 'GET', url: request } : request;
+        httpRequest.headers = Object.assign({}, exports.SFDX_HTTP_HEADERS, httpRequest.headers);
+        this.logger.debug(`request: ${JSON.stringify(httpRequest)}`);
+        //  The "as" is a workaround for the jsforce typings.
+        return super.request(httpRequest, options);
     }
     /**
      * The Force API base url for the instance.
@@ -347,33 +325,21 @@ class Connection extends jsforce_1.Connection {
      * fetch size is 10,000 records. Modify this via the options argument.
      *
      * @param soql The SOQL string.
-     * @param executeOptions The query options. NOTE: the autoFetch option will always be true.
+     * @param queryOptions The query options. NOTE: the autoFetch option will always be true.
      */
-    async autoFetchQuery(soql, executeOptions = {}) {
+    async autoFetchQuery(soql, queryOptions = {}) {
         const config = await configAggregator_1.ConfigAggregator.create();
         // take the limit from the calling function, then the config, then default 10,000
-        const maxFetch = config.getInfo('maxQueryLimit').value || executeOptions.maxFetch || 10000;
-        const options = Object.assign(executeOptions, {
+        const maxFetch = config.getInfo('maxQueryLimit').value || queryOptions.maxFetch || 10000;
+        const options = Object.assign(queryOptions, {
             autoFetch: true,
             maxFetch,
         });
-        const records = [];
-        return new Promise((resolve, reject) => {
-            const query = this.query(soql, options)
-                .on('record', (rec) => records.push(rec))
-                .on('error', (err) => reject(err))
-                .on('end', () => {
-                const totalSize = ts_types_1.getNumber(query, 'totalSize') || 0;
-                if (totalSize > records.length) {
-                    process.emitWarning(`The query result is missing ${totalSize - records.length} records due to a ${maxFetch} record limit. Increase the number of records returned by setting the config value "maxQueryLimit" or the environment variable "SFDX_MAX_QUERY_LIMIT" to ${totalSize} or greater than ${maxFetch}.`);
-                }
-                resolve({
-                    done: true,
-                    totalSize,
-                    records,
-                });
-            });
-        });
+        const query = await this.query(soql, options);
+        if (query.totalSize > query.records.length) {
+            process.emitWarning(`The query result is missing ${query.totalSize - query.records.length} records due to a ${maxFetch} record limit. Increase the number of records returned by setting the config value "maxQueryLimit" or the environment variable "SFDX_MAX_QUERY_LIMIT" to ${query.totalSize} or greater than ${maxFetch}.`);
+        }
+        return query;
     }
     /**
      * Executes a query using either standard REST or Tooling API, returning a single record.
@@ -445,4 +411,10 @@ exports.SingleRecordQueryErrors = {
     NoRecords: 'SingleRecordQuery_NoRecords',
     MultipleRecords: 'SingleRecordQuery_MultipleRecords',
 };
+// jsforce does some interesting proxy loading on lib classes.
+// Setting this in the Connection.tooling getter will not work, it
+// must be set on the prototype.
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-ignore
+tooling_1.Tooling.prototype.autoFetchQuery = Connection.prototype.autoFetchQuery; // eslint-disable-line @typescript-eslint/unbound-method
 //# sourceMappingURL=connection.js.map

package/lib/org/org.js

@@ -131,9 +131,11 @@ class Org extends kit_1.AsyncOptionalCreatable {
         const thisOrgAuthConfig = this.getConnection().getAuthInfoFields();
         const trimmedId = sfdc_1.sfdc.trimTo15(thisOrgAuthConfig.orgId);
         const DEV_HUB_SOQL = `SELECT CreatedDate,Edition,ExpirationDate FROM ActiveScratchOrg WHERE ScratchOrg='${trimmedId}'`;
-        let results;
         try {
-            results = await devHubConnection.query(DEV_HUB_SOQL);
+            const results = await devHubConnection.query(DEV_HUB_SOQL);
+            if (ts_types_1.getNumber(results, 'records.length') !== 1) {
+                throw new sfdxError_1.SfdxError('No results', 'NoResultsError');
+            }
         }
         catch (err) {
             if (err.name === 'INVALID_TYPE') {
@@ -141,9 +143,6 @@ class Org extends kit_1.AsyncOptionalCreatable {
             }
             throw err;
         }
-        if (ts_types_1.getNumber(results, 'records.length') !== 1) {
-            throw new sfdxError_1.SfdxError('No results', 'NoResultsError');
-        }
         return thisOrgAuthConfig;
     }
     /**

package/lib/org/user.d.ts

@@ -168,6 +168,7 @@ export declare class User extends AsyncCreatable<User.Options> {
      * @param fields The configuration the new user should have.
      */
     private createUserInternal;
+    private rawRequest;
     /**
      * Update the remaining required fields for the user.
      *

package/lib/org/user.js

@@ -10,6 +10,7 @@ exports.User = exports.DefaultUserFields = exports.REQUIRED_FIELDS = void 0;
 const os_1 = require("os");
 const kit_1 = require("@salesforce/kit");
 const ts_types_1 = require("@salesforce/ts-types");
+const http_api_1 = require("jsforce/lib/http-api");
 const connection_1 = require("../org/connection");
 const logger_1 = require("../logger");
 const messages_1 = require("../messages");
@@ -230,7 +231,7 @@ class User extends kit_1.AsyncCreatable {
                     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
                     // @ts-ignore TODO: expose `soap` on Connection however appropriate
                     const soap = userConnection.soap;
-                    await soap.setPassword(info.getFields().userId, buffer.toString('utf8'));
+                    await soap.setPassword(ts_types_1.ensureString(info.getFields().userId), buffer.toString('utf8'));
                     this.logger.debug(`Set password for userId: ${info.getFields().userId}`);
                     resolve();
                 }
@@ -387,7 +388,7 @@ class User extends kit_1.AsyncCreatable {
             headers: scimHeaders,
             body,
         };
-        const response = await conn.requestRaw(info);
+        const response = await this.rawRequest(conn, info);
         const responseBody = kit_1.parseJsonMap(ts_types_1.ensureString(response['body']));
         const statusCode = ts_types_1.asNumber(response.statusCode);
         this.logger.debug(`user create response.statusCode: ${response.statusCode}`);
@@ -418,6 +419,14 @@ class User extends kit_1.AsyncCreatable {
             userId: fields.id,
         };
     }
+    async rawRequest(conn, options) {
+        return new Promise((resolve, reject) => {
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            const httpApi = new http_api_1.HttpApi(conn, options);
+            httpApi.on('response', (response) => resolve(response));
+            httpApi.request(options).catch(reject);
+        });
+    }
     /**
      * Update the remaining required fields for the user.
      *

package/lib/status/pollingClient.d.ts

@@ -1,7 +1,8 @@
+/// <reference types="sfdx-faye" />
 import { AsyncOptionalCreatable, Duration } from '@salesforce/kit';
 import { AnyJson } from '@salesforce/ts-types';
 import { Logger } from '../logger';
-import { StatusResult } from './client';
+import { StatusResult } from './streamingClient';
 /**
  * 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

package/lib/status/streamingClient.d.ts

@@ -1,75 +1,8 @@
-/// <reference types="node" />
-import { EventEmitter } from 'events';
 import { AsyncOptionalCreatable, Duration, Env } from '@salesforce/kit/lib';
-import { AnyFunction, AnyJson, JsonMap } from '@salesforce/ts-types/lib';
+import { AnyJson } from '@salesforce/ts-types/lib';
+import type { Client as CometClient, StreamProcessor } from 'sfdx-faye';
 import { Org } from '../org/org';
-import { StatusResult } from './client';
-/**
- * Types for defining extensions.
- */
-export interface StreamingExtension {
-    /**
-     * Extension for outgoing message.
-     *
-     * @param message The message.
-     * @param callback The callback to invoke after the message is processed.
-     */
-    outgoing?: (message: JsonMap, callback: AnyFunction) => void;
-    /**
-     * Extension for the incoming message.
-     *
-     * @param message The message.
-     * @param callback The callback to invoke after the message is processed.
-     */
-    incoming?: (message: JsonMap, callback: AnyFunction) => void;
-}
-/**
- * Function type for processing messages
- */
-export declare type StreamProcessor = (message: JsonMap) => StatusResult;
-/**
- * Comet client interface. The is to allow for mocking the inner streaming Cometd implementation.
- * The Faye implementation is used by default but it could be used to adapt another Cometd impl.
- */
-export declare abstract class CometClient extends EventEmitter {
-    /**
-     * Disable polling features.
-     *
-     * @param label Polling feature label.
-     */
-    abstract disable(label: string): void;
-    /**
-     * Add a custom extension to the underlying client.
-     *
-     * @param extension The json function for the extension.
-     */
-    abstract addExtension(extension: StreamingExtension): void;
-    /**
-     * Sets an http header name/value.
-     *
-     * @param name The header name.
-     * @param value The header value.
-     */
-    abstract setHeader(name: string, value: string): void;
-    /**
-     * handshake with the streaming channel
-     *
-     * @param callback Callback for the handshake when it successfully completes. The handshake should throw
-     * errors when errors are encountered.
-     */
-    abstract handshake(callback: () => void): void;
-    /**
-     * Subscribes to Comet topics. Subscribe should perform a handshake if one hasn't been performed yet.
-     *
-     * @param channel The topic to subscribe to.
-     * @param callback The callback to execute once a message has been received.
-     */
-    abstract subscribe(channel: string, callback: (message: JsonMap) => void): CometSubscription;
-    /**
-     * Method to call to disconnect the client from the server.
-     */
-    abstract disconnect(): void;
-}
+export { Client as CometClient, Message, StreamProcessor, CometSubscription, StatusResult, StreamingExtension, } from 'sfdx-faye';
 /**
  * Inner streaming client interface. This implements the Cometd behavior.
  * Also allows for mocking the functional behavior.
@@ -88,13 +21,6 @@ export interface StreamingClientIfc {
      */
     setLogger: (logLine: (message: string) => void) => void;
 }
-/**
- * The subscription object returned from the cometd subscribe object.
- */
-export interface CometSubscription {
-    callback(callback: () => void): void;
-    errback(callback: (error: Error) => void): void;
-}
 /**
  * Api wrapper to support Salesforce streaming. The client contains an internal implementation of a cometd specification.
  *

package/lib/status/streamingClient.js

@@ -8,15 +8,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.StreamingClient = exports.CometClient = void 0;
 /* eslint-disable @typescript-eslint/ban-ts-comment */
-const events_1 = require("events");
 const url_1 = require("url");
 const lib_1 = require("@salesforce/kit/lib");
 const lib_2 = require("@salesforce/ts-types/lib");
-// @ts-ignore
 const Faye = require("sfdx-faye");
 const logger_1 = require("../logger");
 const sfdxError_1 = require("../sfdxError");
 const messages_1 = require("../messages");
+var sfdx_faye_1 = require("sfdx-faye");
+Object.defineProperty(exports, "CometClient", { enumerable: true, get: function () { return sfdx_faye_1.Client; } });
 messages_1.Messages.importMessagesDirectory(__dirname);
 const messages = messages_1.Messages.load('@salesforce/core', 'streaming', [
     'waitParamValidValueError',
@@ -25,13 +25,6 @@ const messages = messages_1.Messages.load('@salesforce/core', 'streaming', [
     'genericTimeout',
     'handshakeApiVersionError',
 ]);
-/**
- * Comet client interface. The is to allow for mocking the inner streaming Cometd implementation.
- * The Faye implementation is used by default but it could be used to adapt another Cometd impl.
- */
-class CometClient extends events_1.EventEmitter {
-}
-exports.CometClient = CometClient;
 /**
  * Validation helper
  *
@@ -382,6 +375,7 @@ exports.StreamingClient = StreamingClient;
                     });
                 },
                 setLogger: (logLine) => {
+                    // @ts-ignore
                     Faye.logger = {};
                     ['info', 'error', 'fatal', 'warn', 'debug'].forEach((element) => {
                         lib_1.set(Faye.logger, element, logLine);

package/lib/testSetup.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="sfdx-faye" />
 /// <reference types="node" />
 import { EventEmitter } from 'events';
 import * as sinonType from 'sinon';
@@ -5,7 +6,7 @@ import { AnyJson, JsonMap, Optional } from '@salesforce/ts-types';
 import { ConfigContents } from './config/configStore';
 import { Logger } from './logger';
 import { SfdxError } from './sfdxError';
-import { CometClient, CometSubscription, StreamingExtension } from './status/streamingClient';
+import { CometClient, CometSubscription, Message, StreamingExtension } from './status/streamingClient';
 import { SfOrg } from './globalInfo';
 /**
  * Different parts of the system that are mocked out. They can be restored for
@@ -306,7 +307,7 @@ export interface StreamingMockCometSubscriptionOptions {
     /**
      * A list of messages to playback for the client. One message per process tick.
      */
-    messagePlaylist?: JsonMap[];
+    messagePlaylist?: Message[];
 }
 /**
  * Simulates a comet subscription to a streaming channel.
@@ -366,7 +367,7 @@ export declare class StreamingMockCometClient extends CometClient {
      * @param channel The streaming channel.
      * @param callback The function to invoke after the subscription completes.
      */
-    subscribe(channel: string, callback: (message: JsonMap) => void): CometSubscription;
+    subscribe(channel: string, callback: (message: Message) => void): CometSubscription;
     /**
      * Fake disconnect. Does Nothing.
      */

package/lib/testSetup.js

@@ -413,7 +413,7 @@ class StreamingMockCometClient extends streamingClient_1.CometClient {
      * @param {StreamingMockCometSubscriptionOptions} options Extends the StreamingClient options.
      */
     constructor(options) {
-        super();
+        super(options.url);
         this.options = options;
         if (!this.options.messagePlaylist) {
             this.options.messagePlaylist = [{ id: this.options.id }];

package/lib/util/getJwtAudienceUrl.d.ts

@@ -1,4 +1,4 @@
-import { OAuth2Options } from 'jsforce';
-export declare function getJwtAudienceUrl(options: OAuth2Options & {
+import { OAuth2Config } from 'jsforce';
+export declare function getJwtAudienceUrl(options: OAuth2Config & {
     createdOrgInstance?: string;
 }): Promise<string>;

package/lib/util/sfdcUrl.js

@@ -70,6 +70,7 @@ class SfdcUrl extends url_1.URL {
             '.salesforce.com',
             '.salesforceliveagent.com',
             '.secure.force.com',
+            'crmforce.mil',
         ];
         const allowlistOfSalesforceHosts = ['developer.salesforce.com', 'trailhead.salesforce.com'];
         return allowlistOfSalesforceDomainPatterns.some((pattern) => {

package/lib/webOAuthServer.d.ts

@@ -1,8 +1,7 @@
 /// <reference types="node" />
 import * as http from 'http';
 import { AsyncCreatable } from '@salesforce/kit';
-import { OAuth2Options } from 'jsforce';
-import { AuthInfo } from './org/authInfo';
+import { AuthInfo, OAuth2Config } from './org/authInfo';
 /**
  * Handles the creation of a web server for web based login flows.
  *
@@ -80,7 +79,7 @@ export declare class WebOAuthServer extends AsyncCreatable<WebOAuthServer.Option
 }
 export declare namespace WebOAuthServer {
     interface Options {
-        oauthConfig: OAuth2Options;
+        oauthConfig: OAuth2Config;
     }
     type Request = http.IncomingMessage & {
         query: {

package/lib/webOAuthServer.js

@@ -13,6 +13,7 @@ const url_1 = require("url");
 const net_1 = require("net");
 const kit_1 = require("@salesforce/kit");
 const ts_types_1 = require("@salesforce/ts-types");
+const jsforce_1 = require("jsforce");
 const logger_1 = require("./logger");
 const authInfo_1 = require("./org/authInfo");
 const sfdxError_1 = require("./sfdxError");
@@ -132,7 +133,7 @@ class WebOAuthServer extends kit_1.AsyncCreatable {
         if (!this.oauthConfig.redirectUri)
             this.oauthConfig.redirectUri = `http://localhost:${port}/OauthRedirect`;
         this.webServer = await WebServer.create({ port });
-        this.oauth2 = new authInfo_1.OAuth2WithVerifier(this.oauthConfig);
+        this.oauth2 = new jsforce_1.OAuth2(this.oauthConfig);
         this.authUrl = authInfo_1.AuthInfo.getAuthorizationUrl(this.oauthConfig, this.oauth2);
     }
     /**