@automattic/vip 4.0.9 → 4.0.10

package/dist/lib/keychain/insecure.js

@@ -1,7 +1,7 @@
 "use strict";
 
 exports.__esModule = true;
-exports.default = void 0;
+exports.Insecure = void 0;
 var _configstore = _interopRequireDefault(require("configstore"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 class Insecure {
@@ -40,4 +40,4 @@ class Insecure {
     }
   }
 }
-exports.default = Insecure;
+exports.Insecure = Insecure;

package/dist/lib/keychain/secure.js

@@ -1,7 +1,7 @@
 "use strict";
 
 exports.__esModule = true;
-exports.default = void 0;
+exports.Secure = void 0;
 var _keytar = _interopRequireDefault(require("@github/keytar"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 class Secure {
@@ -16,4 +16,4 @@ class Secure {
     return _keytar.default.deletePassword(service, service);
   }
 }
-exports.default = Secure;
+exports.Secure = Secure;

package/dist/lib/keychain.js

@@ -1,22 +1,27 @@
 "use strict";
 
 exports.__esModule = true;
-exports.default = void 0;
+exports.getKeychain = getKeychain;
 var _debug = _interopRequireDefault(require("debug"));
-var _insecure = _interopRequireDefault(require("./keychain/insecure"));
+var _insecure = require("./keychain/insecure");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 let keychain;
 const debug = (0, _debug.default)('@automattic/vip:keychain');
-try {
-  // Try using Secure keychain ("keytar") first
-  // eslint-disable-next-line @typescript-eslint/no-require-imports
-  const Secure = require('./keychain/secure').default;
-  keychain = new Secure();
-} catch (error) {
-  debug('Cannot use Secure keychain; falling back to Insecure keychain (Details: %o)', error);
-
-  // Fallback to Insecure keychain if we can't
-  keychain = new _insecure.default('vip-go-cli');
-}
-const exportedKeychain = keychain;
-var _default = exports.default = exportedKeychain;
+async function getKeychain() {
+  if (typeof keychain === 'undefined') {
+    try {
+      const {
+        Secure
+      } = await import('./keychain/secure.js');
+      const kc = new Secure();
+      // We don't know if the secure keychain is actually usable until we try to communicate with it.
+      await kc.getPassword('non-existent-password-fraude-perit-virtus');
+      debug('Using Secure keychain');
+      keychain = kc;
+    } catch (error) {
+      debug('Cannot use Secure keychain; falling back to Insecure keychain (Details: %o)', error);
+      keychain = new _insecure.Insecure('vip-go-cli');
+    }
+  }
+  return keychain;
+}

package/dist/lib/token.js

@@ -5,8 +5,7 @@ exports.default = exports.SERVICE = void 0;
 var _jwtDecode = require("jwt-decode");
 var _nodeCrypto = require("node:crypto");
 var _api = require("./api");
-var _keychain = _interopRequireDefault(require("./keychain"));
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+var _keychain = require("./keychain");
 // Config
 const SERVICE = exports.SERVICE = 'vip-go-cli';
 class Token {
@@ -62,29 +61,34 @@ class Token {
   }
   static async uuid() {
     const service = Token.getServiceName('-uuid');
-    let _uuid = await _keychain.default.getPassword(service);
+    const keychain = await (0, _keychain.getKeychain)();
+    let _uuid = await keychain.getPassword(service);
     if (!_uuid) {
       _uuid = (0, _nodeCrypto.randomUUID)();
-      await _keychain.default.setPassword(service, _uuid);
+      await keychain.setPassword(service, _uuid);
     }
     return _uuid;
   }
   static async setUuid(_uuid) {
     const service = Token.getServiceName('-uuid');
-    await _keychain.default.setPassword(service, _uuid);
+    const keychain = await (0, _keychain.getKeychain)();
+    await keychain.setPassword(service, _uuid);
   }
-  static set(token) {
+  static async set(token) {
     const service = Token.getServiceName();
-    return _keychain.default.setPassword(service, token);
+    const keychain = await (0, _keychain.getKeychain)();
+    return keychain.setPassword(service, token);
   }
   static async get() {
     const service = Token.getServiceName();
-    const token = (await _keychain.default.getPassword(service)) ?? '';
-    return new Token(token);
+    const keychain = await (0, _keychain.getKeychain)();
+    const token = await keychain.getPassword(service);
+    return new Token(token ?? '');
   }
-  static purge() {
+  static async purge() {
     const service = Token.getServiceName();
-    return _keychain.default.deletePassword(service);
+    const keychain = await (0, _keychain.getKeychain)();
+    return keychain.deletePassword(service);
   }
   static getServiceName(modifier = '') {
     let service = SERVICE;

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@automattic/vip",
-  "version": "4.0.9",
+  "version": "4.0.10",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@automattic/vip",
-      "version": "4.0.9",
+      "version": "4.0.10",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
@@ -11418,9 +11418,9 @@
       "license": "MIT"
     },
     "node_modules/js-yaml": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-5.1.0.tgz",
-      "integrity": "sha512-s8VA5jkR8f22S3NAXmhKPFqGUduqZGlsufabVOgN14iTdw/RXcym7bKkbwjxLK9Yw2lEvvmJjFp119+KPeo8Kg==",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-5.2.0.tgz",
+      "integrity": "sha512-YeLUMlvR4Ou1B119LIaM0r65JvbOBooJDc9yEu0dClb/uSC5P4FrLU8OCCz/HXWvtPoIrR0dRzABTjo1sTN9Bw==",
       "funding": [
         {
           "type": "github",
@@ -14172,9 +14172,9 @@
       }
     },
     "node_modules/tar": {
-      "version": "7.5.16",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.16.tgz",
-      "integrity": "sha512-56adEpPMouktRlBLXiaYFFzZ/3+JXa8P9n7WbR+ibIjtviN55mEaOkiysCnPnWm+7kkui1Dn8J9l+g6zV8731w==",
+      "version": "7.5.19",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.19.tgz",
+      "integrity": "sha512-4LeEWl96twnS2Q7Bz4MGqgazLqO+hJN63GZxXoIqh1T3VweYD997gbU1ItNsQafqqXTXd5WFyFdReLtwvRBNiw==",
       "license": "BlueOak-1.0.0",
       "dependencies": {
         "@isaacs/fs-minipass": "^4.0.0",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@automattic/vip",
-  "version": "4.0.9",
+  "version": "4.0.10",
   "description": "The VIP Javascript library & CLI",
   "main": "index.js",
   "bin": {