@salesforce/core 3.6.1 → 3.6.2

package/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [3.6.2](https://github.com/forcedotcom/sfdx-core/compare/v3.6.1...v3.6.2) (2021-09-17)
+
+
+### Bug Fixes
+
+* improve time to build auths for many orgs @W-9914839@ ([#478](https://github.com/forcedotcom/sfdx-core/issues/478)) ([c788541](https://github.com/forcedotcom/sfdx-core/commit/c7885415d59994b28552227f0b84dcee5d3ec7cf))
+
 ### [3.6.1](https://github.com/forcedotcom/sfdx-core/compare/v3.6.0...v3.6.1) (2021-09-13)
 
 

package/lib/crypto/crypto.js

@@ -15,6 +15,7 @@ const ts_types_1 = require("@salesforce/ts-types");
 const kit_1 = require("@salesforce/kit");
 const logger_1 = require("../logger");
 const messages_1 = require("../messages");
+const cache_1 = require("../util/cache");
 const keyChain_1 = require("./keyChain");
 const secureBuffer_1 = require("./secureBuffer");
 const TAG_DELIMITER = ':';
@@ -31,6 +32,11 @@ const messages = messages_1.Messages.load('@salesforce/core', 'encryption', [
     'authDecryptError',
     'macKeychainOutOfSync',
 ]);
+const makeSecureBuffer = (password) => {
+    const newSb = new secureBuffer_1.SecureBuffer();
+    newSb.consume(Buffer.from(ts_types_1.ensure(password), 'utf8'));
+    return newSb;
+};
 /**
  * osxKeyChain promise wrapper.
  */
@@ -43,11 +49,24 @@ const keychainPromises = {
      * @param account The keychain account name.
      */
     getPassword(_keychain, service, account) {
-        return new Promise((resolve, reject) => _keychain.getPassword({ service, account }, (err, password) => {
-            if (err)
-                return reject(err);
-            return resolve({ username: account, password: ts_types_1.ensure(password) });
-        }));
+        const sb = cache_1.Cache.get(`${service}:${account}`);
+        if (!sb) {
+            return new Promise((resolve, reject) => {
+                return _keychain.getPassword({ service, account }, (err, password) => {
+                    if (err)
+                        return reject(err);
+                    cache_1.Cache.set(`${service}:${account}`, makeSecureBuffer(password));
+                    return resolve({ username: account, password: ts_types_1.ensure(password) });
+                });
+            });
+        }
+        else {
+            const pw = sb.value((buffer) => buffer.toString('utf8'));
+            cache_1.Cache.set(`${service}:${account}`, makeSecureBuffer(pw));
+            return new Promise((resolve) => {
+                return resolve({ username: account, password: ts_types_1.ensure(pw) });
+            });
+        }
     },
     /**
      * Sets a generic password item in OSX keychain.

package/lib/util/cache.d.ts

@@ -0,0 +1,11 @@
+export declare class Cache extends Map {
+    #private;
+    private constructor();
+    static instance(): Cache;
+    static set<V>(key: string, value: V): void;
+    static get<V>(key: string): V | undefined;
+    static disable(): void;
+    static enable(): void;
+    static get hits(): number;
+    static get lookups(): number;
+}

package/lib/util/cache.js

@@ -0,0 +1,70 @@
+"use strict";
+var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
+    if (kind === "m") throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _a, _Cache_instance, _Cache_enabled, _Cache_hits, _Cache_lookups;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Cache = void 0;
+/*
+ * Copyright (c) 2020, 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
+ */
+class Cache extends Map {
+    /* eslint-enable @typescript-eslint/explicit-member-accessibility */
+    constructor() {
+        super();
+        _Cache_hits.set(this, void 0);
+        _Cache_lookups.set(this, void 0);
+        __classPrivateFieldSet(this, _Cache_hits, 0, "f");
+        __classPrivateFieldSet(this, _Cache_lookups, 0, "f");
+    }
+    static instance() {
+        if (!__classPrivateFieldGet(Cache, _a, "f", _Cache_instance)) {
+            __classPrivateFieldSet(Cache, _a, true, "f", _Cache_enabled);
+            __classPrivateFieldSet(Cache, _a, new Cache(), "f", _Cache_instance);
+        }
+        return __classPrivateFieldGet(Cache, _a, "f", _Cache_instance);
+    }
+    static set(key, value) {
+        if (__classPrivateFieldGet(Cache, _a, "f", _Cache_enabled)) {
+            Cache.instance().set(key, value);
+        }
+    }
+    static get(key) {
+        var _b, _c;
+        if (!__classPrivateFieldGet(Cache, _a, "f", _Cache_enabled)) {
+            return undefined;
+        }
+        __classPrivateFieldSet(_b = Cache.instance(), _Cache_lookups, +__classPrivateFieldGet(_b, _Cache_lookups, "f") + 1, "f");
+        __classPrivateFieldSet(_c = Cache.instance(), _Cache_hits, __classPrivateFieldGet(_c, _Cache_hits, "f") + (Cache.instance().has(key) ? 1 : 0), "f");
+        return __classPrivateFieldGet(Cache, _a, "f", _Cache_instance).get(key);
+    }
+    static disable() {
+        __classPrivateFieldSet(Cache, _a, false, "f", _Cache_enabled);
+    }
+    static enable() {
+        __classPrivateFieldSet(Cache, _a, true, "f", _Cache_enabled);
+    }
+    static get hits() {
+        return __classPrivateFieldGet(Cache.instance(), _Cache_hits, "f");
+    }
+    static get lookups() {
+        return __classPrivateFieldGet(Cache.instance(), _Cache_lookups, "f");
+    }
+}
+exports.Cache = Cache;
+_a = Cache, _Cache_hits = new WeakMap(), _Cache_lookups = new WeakMap();
+/* eslint-disable @typescript-eslint/explicit-member-accessibility */
+_Cache_instance = { value: void 0 };
+_Cache_enabled = { value: true };
+//# sourceMappingURL=cache.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/core",
-  "version": "3.6.1",
+  "version": "3.6.2",
   "description": "Core libraries to interact with SFDX projects, orgs, and APIs.",
   "main": "lib/exported",
   "license": "BSD-3-Clause",