@salesforce/core 5.3.18 → 5.3.20

package/lib/logger/logger.js

@@ -71,6 +71,7 @@ class Logger {
      * `Logger`.
      */
     constructor(optionsOrName) {
+        const enabled = process.env.SFDX_DISABLE_LOG_FILE !== 'true' && process.env.SF_DISABLE_LOG_FILE !== 'true';
         const options = typeof optionsOrName === 'string'
             ? { name: optionsOrName, level: Logger.DEFAULT_LEVEL, fields: {} }
             : optionsOrName;
@@ -89,9 +90,9 @@ class Logger {
                 name: options.name ?? Logger.ROOT_NAME,
                 base: options.fields ?? {},
                 level,
-                enabled: process.env.SFDX_DISABLE_LOG_FILE !== 'true' && process.env.SF_DISABLE_LOG_FILE !== 'true',
+                enabled,
             };
-            if (options.useMemoryLogger || global_1.Global.getEnvironmentMode() === global_1.Mode.TEST) {
+            if (options.useMemoryLogger || global_1.Global.getEnvironmentMode() === global_1.Mode.TEST || !enabled) {
                 this.memoryLogger = new memoryLogger_1.MemoryLogger();
                 this.pinoLogger = (0, pino_1.pino)({
                     ...commonOptions,

package/lib/org/org.js

@@ -28,7 +28,7 @@ const connection_1 = require("./connection");
 const authInfo_1 = require("./authInfo");
 const scratchOrgCreate_1 = require("./scratchOrgCreate");
 const orgConfigProperties_1 = require("./orgConfigProperties");
-const messages = new messages_1.Messages('@salesforce/core', 'org', new Map([["notADevHub", "The provided dev hub username %s is not a valid dev hub."], ["noUsernameFound", "No username found."], ["noDevHubFound", "Unable to associate this scratch org with a DevHub."], ["deleteOrgHubError", "The Dev Hub org cannot be deleted."], ["insufficientAccessToDelete", "You do not have the appropriate permissions to delete a scratch org. Please contact your Salesforce admin."], ["scratchOrgNotFound", "Attempting to delete an expired or deleted org"], ["sandboxDeleteFailed", "The sandbox org deletion failed with a result of %s."], ["sandboxNotFound", "We can't find a SandboxProcess for the sandbox %s."], ["sandboxInfoCreateFailed", "The sandbox org creation failed with a result of %s."], ["missingAuthUsername", "The sandbox %s does not have an authorized username."], ["orgPollingTimeout", "Sandbox status is %s; timed out waiting for completion."], ["NotFoundOnDevHub", "The scratch org does not belong to the dev hub username %s."], ["AuthInfoOrgIdUndefined", "AuthInfo orgId is undefined."], ["sandboxCreateNotComplete", "The sandbox creation has not completed."], ["SandboxProcessNotFoundBySandboxName", "We can't find a SandboxProcess with the SandboxName %s."], ["MultiSandboxProcessNotFoundBySandboxName", "We found more than one SandboxProcess with the SandboxName %s."], ["sandboxNotResumable", "The sandbox %s cannot resume with status of %s."]]));
+const messages = new messages_1.Messages('@salesforce/core', 'org', new Map([["notADevHub", "The provided dev hub username %s is not a valid dev hub."], ["noUsernameFound", "No username found."], ["noDevHubFound", "Unable to associate this scratch org with a DevHub."], ["deleteOrgHubError", "The Dev Hub org cannot be deleted."], ["insufficientAccessToDelete", "You do not have the appropriate permissions to delete a scratch org. Please contact your Salesforce admin."], ["scratchOrgNotFound", "Attempting to delete an expired or deleted org"], ["sandboxDeleteFailed", "The sandbox org deletion failed with a result of %s."], ["sandboxNotFound", "We can't find a SandboxProcess for the sandbox %s."], ["sandboxInfoCreateFailed", "The sandbox org creation failed with a result of %s."], ["missingAuthUsername", "The sandbox %s does not have an authorized username."], ["orgPollingTimeout", "Sandbox status is %s; timed out waiting for completion."], ["NotFoundOnDevHub", "The scratch org does not belong to the dev hub username %s."], ["AuthInfoOrgIdUndefined", "AuthInfo orgId is undefined."], ["sandboxCreateNotComplete", "The sandbox creation has not completed."], ["SandboxProcessNotFoundBySandboxName", "We can't find a SandboxProcess with the SandboxName %s."], ["MultiSandboxProcessNotFoundBySandboxName", "We found more than one SandboxProcess with the SandboxName %s."], ["sandboxNotResumable", "The sandbox %s cannot resume with status of %s."], ["UnexpectedResponse", "Unexpected response from the platform"], ["UnexpectedResponse.actions", ["Check that the instance URL is correct and the org still exists.", "See what's at the URL that's causing the problem: %s."]]]));
 var OrgTypes;
 (function (OrgTypes) {
     OrgTypes["Scratch"] = "scratch";
@@ -546,7 +546,17 @@ class Org extends kit_1.AsyncOptionalCreatable {
             method: 'GET',
         };
         const conn = this.getConnection();
-        await conn.request(requestInfo);
+        try {
+            await conn.request(requestInfo);
+        }
+        catch (e) {
+            // an html error page like https://computing-connect-6970-dev-ed.scratch.my.salesforce.com/services/data/v50.0
+            // where the message is an entire html page
+            if (e instanceof Error && (e.name.includes('ERROR_HTTP') || e.message.includes('<html '))) {
+                throw messages.createError('UnexpectedResponse', [], [conn.baseUrl()], e);
+            }
+            throw e;
+        }
     }
     /**
      * Reads and returns the content of all user auth files for this org as an array.

package/messages/org.md

@@ -65,3 +65,13 @@ We found more than one SandboxProcess with the SandboxName %s.
 # sandboxNotResumable
 
 The sandbox %s cannot resume with status of %s.
+
+# UnexpectedResponse
+
+Unexpected response from the platform
+
+# UnexpectedResponse.actions
+
+- Check that the instance URL is correct and the org still exists.
+
+- See what's at the URL that's causing the problem: %s.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/core",
-  "version": "5.3.18",
+  "version": "5.3.20",
   "description": "Core libraries to interact with SFDX projects, orgs, and APIs.",
   "main": "lib/exported",
   "types": "lib/exported.d.ts",
@@ -64,7 +64,7 @@
     "@salesforce/prettier-config": "^0.0.3",
     "@salesforce/ts-sinon": "^1.4.18",
     "@types/benchmark": "^2.1.3",
-    "@types/chai-string": "^1.4.3",
+    "@types/chai-string": "^1.4.4",
     "@types/jsonwebtoken": "9.0.3",
     "@types/lodash": "^4.14.200",
     "@types/proper-lockfile": "^4.1.2",
@@ -74,7 +74,7 @@
     "benchmark": "^2.1.4",
     "chai": "^4.3.10",
     "chai-string": "^1.5.0",
-    "eslint": "^8.52.0",
+    "eslint": "^8.53.0",
     "eslint-config-prettier": "^8.10.0",
     "eslint-config-salesforce": "^2.0.2",
     "eslint-config-salesforce-license": "^0.2.0",