@salesforce/core 6.7.6 → 6.7.7-qa.0

package/lib/webOAuthServer.js

@@ -37,7 +37,7 @@ const node_querystring_1 = require("node:querystring");
 const node_url_1 = require("node:url");
 const node_net_1 = require("node:net");
 const node_events_1 = require("node:events");
-const jsforce_1 = require("jsforce");
+const jsforce_node_1 = require("@jsforce/jsforce-node");
 const kit_1 = require("@salesforce/kit");
 const ts_types_1 = require("@salesforce/ts-types");
 const logger_1 = require("./logger/logger");
@@ -66,9 +66,15 @@ const iconPaths = ['/favicon.ico', '/apple-touch-icon-precomposed.png'];
  * ```
  */
 class WebOAuthServer extends kit_1.AsyncCreatable {
+    static DEFAULT_PORT = 1717;
+    authUrl;
+    logger;
+    webServer;
+    oauth2;
+    oauthConfig;
+    oauthError = new Error('Oauth Error');
     constructor(options) {
         super(options);
-        this.oauthError = new Error('Oauth Error');
         this.oauthConfig = options.oauthConfig;
     }
     /**
@@ -159,7 +165,7 @@ class WebOAuthServer extends kit_1.AsyncCreatable {
         if (this.oauthConfig.useVerifier !== false)
             this.oauthConfig.useVerifier = true;
         this.webServer = await WebServer.create({ port });
-        this.oauth2 = new jsforce_1.OAuth2(this.oauthConfig);
+        this.oauth2 = new jsforce_node_1.OAuth2(this.oauthConfig);
         this.authUrl = authInfo_1.AuthInfo.getAuthorizationUrl(this.oauthConfig, this.oauth2);
     }
     /**
@@ -178,6 +184,7 @@ class WebOAuthServer extends kit_1.AsyncCreatable {
                     this.logger.debug(`processing request for uri: ${url.pathname}`);
                     if (request.method === 'GET') {
                         if (url.pathname?.startsWith('/OauthRedirect') && url.query) {
+                            // eslint-disable-next-line no-param-reassign
                             request.query = (0, node_querystring_1.parse)(url.query);
                             if (request.query.error) {
                                 const errorName = typeof request.query.error_description === 'string'
@@ -285,17 +292,19 @@ class WebOAuthServer extends kit_1.AsyncCreatable {
     }
 }
 exports.WebOAuthServer = WebOAuthServer;
-WebOAuthServer.DEFAULT_PORT = 1717;
 /**
  * Handles the actions specific to the http server
  */
 class WebServer extends kit_1.AsyncCreatable {
+    static DEFAULT_CLIENT_SOCKET_TIMEOUT = 20_000;
+    server;
+    port = WebOAuthServer.DEFAULT_PORT;
+    host = 'localhost';
+    logger;
+    sockets = [];
+    redirectStatus = new node_events_1.EventEmitter();
     constructor(options) {
         super(options);
-        this.port = WebOAuthServer.DEFAULT_PORT;
-        this.host = 'localhost';
-        this.sockets = [];
-        this.redirectStatus = new node_events_1.EventEmitter();
         if (options.port)
             this.port = options.port;
         if (options.host)
@@ -346,7 +355,9 @@ class WebServer extends kit_1.AsyncCreatable {
      * @param response the response to write the error to.
      */
     sendError(status, message, response) {
+        // eslint-disable-next-line no-param-reassign
         response.statusMessage = message;
+        // eslint-disable-next-line no-param-reassign
         response.statusCode = status;
         response.end();
     }
@@ -407,6 +418,7 @@ class WebServer extends kit_1.AsyncCreatable {
         // We don't validate the origin here because:
         // 1. The default login URL (login.salesforce.com) will not match after a redirect or if user choose a custom domain in login.
         // 2. There's no fixed list of auth URLs we could check against.
+        // eslint-disable-next-line no-param-reassign
         response.statusCode = 204; // No Content response
         response.setHeader('Access-Control-Allow-Methods', 'GET');
         response.setHeader('Access-Control-Request-Headers', 'GET');
@@ -478,5 +490,4 @@ class WebServer extends kit_1.AsyncCreatable {
     }
 }
 exports.WebServer = WebServer;
-WebServer.DEFAULT_CLIENT_SOCKET_TIMEOUT = 20_000;
 //# sourceMappingURL=webOAuthServer.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/core",
-  "version": "6.7.6",
+  "version": "6.7.7-qa.0",
   "description": "Core libraries to interact with SFDX projects, orgs, and APIs.",
   "main": "lib/index",
   "types": "lib/index.d.ts",
@@ -8,6 +8,62 @@
   "engines": {
     "node": ">=18.0.0"
   },
+  "exports": {
+    ".": {
+      "types": "./lib/index.d.ts",
+      "require": "./lib/index.js",
+      "import": "./lib/index.js",
+      "default": "./lib/index.js"
+    },
+    "./testSetup": {
+      "types": "./lib/testSetup.d.ts",
+      "require": "./lib/testSetup.js",
+      "import": "./lib/testSetup.js",
+      "default": "./lib/testSetup.js"
+    },
+    "./messages": {
+      "types": "./lib/messages.d.ts",
+      "require": "./lib/messages.js",
+      "import": "./lib/messages.js",
+      "default": "./lib/messages.js"
+    },
+    "./sfError": {
+      "types": "./lib/sfError.d.ts",
+      "require": "./lib/sfError.js",
+      "import": "./lib/sfError.js",
+      "default": "./lib/sfError.js"
+    },
+    "./lifecycle": {
+      "types": "./lib/lifecycleEvents.d.ts",
+      "require": "./lib/lifecycleEvents.js",
+      "import": "./lib/lifecycleEvents.js",
+      "default": "./lib/lifecycleEvents.js"
+    },
+    "./logger": {
+      "types": "./lib/logger/logger.d.ts",
+      "require": "./lib/logger/logger.js",
+      "import": "./lib/logger/logger.js",
+      "default": "./lib/logger/logger.js"
+    },
+    "./configAggregator": {
+      "types": "./lib/config/configAggregator.d.ts",
+      "require": "./lib/config/configAggregator.js",
+      "import": "./lib/config/configAggregator.js",
+      "default": "./lib/config/configAggregator.js"
+    },
+    "./project": {
+      "types": "./lib/sfProject.d.ts",
+      "require": "./lib/sfProject.js",
+      "import": "./lib/sfProject.js",
+      "default": "./lib/sfProject.js"
+    },
+    "./messageTransformer": {
+      "types": "./lib/messageTransformer.d.ts",
+      "require": "./lib/messageTransformer.js",
+      "import": "./lib/messageTransformer.js",
+      "default": "./lib/messageTransformer.js"
+    }
+  },
   "scripts": {
     "build": "wireit",
     "clean": "sf-clean",
@@ -18,7 +74,6 @@
     "link-check": "wireit",
     "lint": "wireit",
     "lint-fix": "yarn sf-lint --fix",
-    "postcompile": "tsc -p typedocExamples",
     "prepack": "sf-prepack",
     "prepare": "sf-install",
     "test": "wireit",
@@ -39,6 +94,7 @@
     "messageTransformer/messageTransformer.ts"
   ],
   "dependencies": {
+    "@jsforce/jsforce-node": "^3.0.0-next.3",
     "@salesforce/kit": "^3.1.0",
     "@salesforce/schemas": "^1.7.0",
     "@salesforce/ts-types": "^2.0.9",
@@ -47,7 +103,6 @@
     "faye": "^1.4.0",
     "form-data": "^4.0.0",
     "js2xmlparser": "^4.0.1",
-    "jsforce": "^2.0.0-beta.29",
     "jsonwebtoken": "9.0.2",
     "jszip": "3.10.1",
     "pino": "^8.19.0",
@@ -69,7 +124,7 @@
     "chai-string": "^1.5.0",
     "ts-node": "^10.9.2",
     "ts-patch": "^3.1.1",
-    "typescript": "^5.4.3"
+    "typescript": "^5.4.4"
   },
   "repository": {
     "type": "git",
@@ -160,6 +215,9 @@
         "./!(CHANGELOG).md"
       ],
       "output": []
+    },
+    "compile-typedoc": {
+      "command": "tsc -p typedocExamples"
     }
   }
 }

package/lib/util/checkLightningDomain.d.ts

@@ -1,2 +0,0 @@
-/** @deprecated.  Use sfdcUrl.checkLightningdomain */
-export default function checkLightningDomain(url: string): Promise<boolean>;

package/lib/util/checkLightningDomain.js

@@ -1,30 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-/*
- * Copyright (c) 2021, salesforce.com, inc.
- * All rights reserved.
- * Licensed under the BSD 3-Clause license.
- * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
- */
-const node_url_1 = require("node:url");
-const kit_1 = require("@salesforce/kit");
-const myDomainResolver_1 = require("../status/myDomainResolver");
-const sfdcUrl_1 = require("./sfdcUrl");
-/** @deprecated.  Use sfdcUrl.checkLightningdomain */
-async function checkLightningDomain(url) {
-    const domain = `https://${/https?:\/\/([^.]*)/.exec(url)?.slice(1, 2).pop()}.lightning.force.com`;
-    const quantity = new kit_1.Env().getNumber('SFDX_DOMAIN_RETRY', 240) ?? 0;
-    const timeout = new kit_1.Duration(quantity, kit_1.Duration.Unit.SECONDS);
-    if (new sfdcUrl_1.SfdcUrl(url).isInternalUrl() || timeout.seconds === 0) {
-        return true;
-    }
-    const resolver = await myDomainResolver_1.MyDomainResolver.create({
-        url: new node_url_1.URL(domain),
-        timeout,
-        frequency: new kit_1.Duration(1, kit_1.Duration.Unit.SECONDS),
-    });
-    await resolver.resolve();
-    return true;
-}
-exports.default = checkLightningDomain;
-//# sourceMappingURL=checkLightningDomain.js.map