@ms-cloudpack/remote-cache 0.7.3 → 0.7.5

package/dist/{chunk-YEA5VY6V.js → chunk-FUGMINXQ.js}

@@ -8,7 +8,7 @@ import {
   __commonJS,
   __name,
   __require
-} from "./chunk-E6II3DDV.js";
+} from "./chunk-B4GP6UPK.js";
 
 // ../../node_modules/.store/safe-buffer-npm-5.2.1-3481c8aa9b/package/index.js
 var require_package = __commonJS({

package/dist/{chunk-65RH3KSH.js → chunk-IVPGYNQL.js}

@@ -6,7 +6,7 @@ const __filename = topLevelUrl.fileURLToPath(import.meta.url);
 const __dirname = topLevelPath.dirname(__filename);
 import {
   __name
-} from "./chunk-E6II3DDV.js";
+} from "./chunk-B4GP6UPK.js";
 
 // src/createBlobStorageUrl.ts
 function createBlobStorageUrl(storageAccount) {

package/dist/{chunk-W3GZC77T.js → chunk-OXARBRZV.js}

@@ -7,20 +7,20 @@ const __dirname = topLevelPath.dirname(__filename);
 import {
   esm_node_exports,
   init_esm_node,
-  init_tslib_es6,
-  require_commonjs,
-  require_commonjs3 as require_commonjs2,
-  require_dist,
-  tslib_es6_exports
-} from "./chunk-LRLTRMOZ.js";
+  require_commonjs2,
+  require_dist
+} from "./chunk-26KCJU2L.js";
 import {
   __commonJS,
   __esm,
   __export,
   __name,
   __require,
-  __toCommonJS
-} from "./chunk-E6II3DDV.js";
+  __toCommonJS,
+  init_tslib_es6,
+  require_commonjs,
+  tslib_es6_exports
+} from "./chunk-B4GP6UPK.js";
 
 // ../../node_modules/.store/xml2js-npm-0.5.0-06e57a2771/package/lib/defaults.js
 var require_defaults = __commonJS({

package/dist/{getCredential-TIS4HQAY.js → getCredential-3U7LKZRE.js}

@@ -6,17 +6,14 @@ const __filename = topLevelUrl.fileURLToPath(import.meta.url);
 const __dirname = topLevelPath.dirname(__filename);
 import {
   require_package
-} from "./chunk-YEA5VY6V.js";
+} from "./chunk-FUGMINXQ.js";
 import {
   init_esm_node,
-  init_tslib_es6,
-  require_commonjs,
-  require_commonjs2,
-  require_commonjs3,
+  require_commonjs as require_commonjs2,
+  require_commonjs2 as require_commonjs3,
   require_dist,
-  tslib_es6_exports,
   v4_default
-} from "./chunk-LRLTRMOZ.js";
+} from "./chunk-26KCJU2L.js";
 import {
   __commonJS,
   __esm,
@@ -24,8 +21,11 @@ import {
   __name,
   __require,
   __toCommonJS,
-  __toESM
-} from "./chunk-E6II3DDV.js";
+  __toESM,
+  init_tslib_es6,
+  require_commonjs,
+  tslib_es6_exports
+} from "./chunk-B4GP6UPK.js";
 
 // ../../node_modules/.store/@azure-core-client-npm-1.9.2-1ef0857920/package/dist/commonjs/base64.js
 var require_base64 = __commonJS({
@@ -2349,9 +2349,9 @@ var require_package2 = __commonJS({
   }
 });
 
-// ../../node_modules/.store/debug-virtual-1d970e8425/package/src/common.js
+// ../../node_modules/.store/debug-virtual-11377b508d/package/src/common.js
 var require_common = __commonJS({
-  "../../node_modules/.store/debug-virtual-1d970e8425/package/src/common.js"(exports, module) {
+  "../../node_modules/.store/debug-virtual-11377b508d/package/src/common.js"(exports, module) {
     function setup(env) {
       createDebug.debug = createDebug;
       createDebug.default = createDebug;
@@ -2523,9 +2523,9 @@ var require_common = __commonJS({
   }
 });
 
-// ../../node_modules/.store/debug-virtual-1d970e8425/package/src/browser.js
+// ../../node_modules/.store/debug-virtual-11377b508d/package/src/browser.js
 var require_browser = __commonJS({
-  "../../node_modules/.store/debug-virtual-1d970e8425/package/src/browser.js"(exports, module) {
+  "../../node_modules/.store/debug-virtual-11377b508d/package/src/browser.js"(exports, module) {
     exports.formatArgs = formatArgs;
     exports.save = save;
     exports.load = load;
@@ -2697,9 +2697,9 @@ var require_browser = __commonJS({
   }
 });
 
-// ../../node_modules/.store/debug-virtual-1d970e8425/package/src/node.js
+// ../../node_modules/.store/debug-virtual-11377b508d/package/src/node.js
 var require_node = __commonJS({
-  "../../node_modules/.store/debug-virtual-1d970e8425/package/src/node.js"(exports, module) {
+  "../../node_modules/.store/debug-virtual-11377b508d/package/src/node.js"(exports, module) {
     var tty = __require("tty");
     var util = __require("util");
     exports.init = init;
@@ -2878,9 +2878,9 @@ var require_node = __commonJS({
   }
 });
 
-// ../../node_modules/.store/debug-virtual-1d970e8425/package/src/index.js
+// ../../node_modules/.store/debug-virtual-11377b508d/package/src/index.js
 var require_src = __commonJS({
-  "../../node_modules/.store/debug-virtual-1d970e8425/package/src/index.js"(exports, module) {
+  "../../node_modules/.store/debug-virtual-11377b508d/package/src/index.js"(exports, module) {
     if (typeof process === "undefined" || process.type === "renderer" || process.browser === true || process.__nwjs) {
       module.exports = require_browser();
     } else {
@@ -25501,6 +25501,7 @@ To work with multiple accounts for the same Client ID and Tenant ID, please prov
         try {
           const interactiveRequest = {
             openBrowser: async (url) => {
+              this.logger.verbose(`Opening browser to ${url}`);
               await interactiveBrowserMockable.open(url, { wait: true, newInstance: true });
             },
             scopes,
@@ -26177,17 +26178,24 @@ var tokenCachePersistenceOptions = {
 };
 
 // src/utils/isProcessRunning.ts
+function isErrorWithCode(error) {
+  return error instanceof Error && "code" in error;
+}
+__name(isErrorWithCode, "isErrorWithCode");
 function isProcessRunning(pid) {
   try {
     process.kill(pid, 0);
     return true;
   } catch (error) {
-    if (error instanceof Error && "code" in error && error.code === "EPERM") {
+    if (isErrorWithCode(error) && error.code === "ERR_INVALID_ARG_TYPE") {
+      console.log(`Invalid PID: ${pid}`);
+      return false;
+    } else if (isErrorWithCode(error) && error.code === "EPERM") {
       console.log(
         `Permission issue indicates that process ${pid} exists but user doesn't have permission to signal it.`
       );
       return true;
-    } else if (error instanceof Error && "code" in error && error.code === "ESRCH") {
+    } else if (isErrorWithCode(error) && error.code === "ESRCH") {
       console.log(`Process ${pid} does not exist.`);
       return false;
     } else {
@@ -26290,17 +26298,21 @@ function getCredentialInternal(loginMethod, authenticationRecord, tenantId) {
   }
 }
 __name(getCredentialInternal, "getCredentialInternal");
-async function getCredential(loginMethod, cachePath, tenantId) {
+async function getCredential(options, context) {
+  var _a;
+  const { loginMethod, cachePath, tenantId } = options;
+  const { reporter, azureLogger } = context;
   if (loginMethod == "azure-cli") {
     return new import_identity3.AzureCliCredential();
   }
+  const tasks = {};
+  azureLogger.once("MsalBrowserOpen", (url) => {
+    tasks.interactiveAuthentication = reporter.addTask(
+      `Prepare to sign in \u2013 we are launching a browser page for you. Simply follow the instructions on the login page to seamlessly complete the authentication process. You can manually access the login page by navigating to the folliwing url if you inadvertently close the authentication page or prefer to use a different web browser or a profile. ${url}`
+    );
+  });
   (0, import_identity3.useIdentityPlugin)(import_identity_cache_persistence.cachePersistencePlugin);
   const credential = getCredentialInternal(loginMethod, getAuthenticationRecord(cachePath), tenantId);
-  if (loginMethod == "interactive") {
-    console.warn(
-      "Prepare to sign in \u2013 we may launch a browser page for you. Simply follow the instructions on the login page to seamlessly complete the authentication process."
-    );
-  }
   tryCleaningLockFile();
   const storageScope = "https://storage.azure.com/.default";
   const authenticationRecord = await credential.authenticate(storageScope);
@@ -26311,6 +26323,9 @@ async function getCredential(loginMethod, cachePath, tenantId) {
   if (authenticationRecord) {
     saveAuthenticationRecord(cachePath, authenticationRecord);
   }
+  (_a = tasks.interactiveAuthentication) == null ? void 0 : _a.complete({
+    message: "You have successfully signed in."
+  });
   return storageCustomCredential;
 }
 __name(getCredential, "getCredential");

package/dist/{getListOfBlobs-ZMH5R6FS.js → getListOfBlobs-YTVBR3IU.js}

@@ -6,15 +6,15 @@ const __filename = topLevelUrl.fileURLToPath(import.meta.url);
 const __dirname = topLevelPath.dirname(__filename);
 import {
   createBlobStorageUrl
-} from "./chunk-65RH3KSH.js";
+} from "./chunk-IVPGYNQL.js";
 import {
   require_dist
-} from "./chunk-W3GZC77T.js";
-import "./chunk-LRLTRMOZ.js";
+} from "./chunk-OXARBRZV.js";
+import "./chunk-26KCJU2L.js";
 import {
   __name,
   __toESM
-} from "./chunk-E6II3DDV.js";
+} from "./chunk-B4GP6UPK.js";
 
 // src/getListOfBlobs.ts
 var import_storage_blob = __toESM(require_dist(), 1);

package/dist/index.js

@@ -5,8 +5,25 @@ const require = topLevelCreateRequire(import.meta.url);
 const __filename = topLevelUrl.fileURLToPath(import.meta.url);
 const __dirname = topLevelPath.dirname(__filename);
 import {
-  __name
-} from "./chunk-E6II3DDV.js";
+  __name,
+  require_commonjs
+} from "./chunk-B4GP6UPK.js";
+
+// src/registerAzureLogger.ts
+import EventEmitter from "events";
+var logger = require_commonjs();
+function registerAzureLogger() {
+  const emitter = new EventEmitter();
+  logger.setLogLevel("verbose");
+  logger.AzureLogger.log = (...messages) => {
+    if (messages[0] === "azure:identity:verbose Node.js MSAL Open Browser =>" && messages[1].includes("Opening browser")) {
+      const url = messages[1].split(" ")[3];
+      emitter.emit("MsalBrowserOpen", url);
+    }
+  };
+  return emitter;
+}
+__name(registerAzureLogger, "registerAzureLogger");
 
 // src/decorators/InMemoryDecorator.ts
 var _InMemoryDecorator = class _InMemoryDecorator {
@@ -75,13 +92,17 @@ var blockListIsInvalidRetryPolicy = {
 // src/createRemoteCacheClient.ts
 import { RetryManager } from "@ms-cloudpack/retry";
 async function createRemoteCacheClient(params) {
+  const azureLogEventHandler = registerAzureLogger();
   const { context, options } = params;
   const { container, loginMethod, storageAccount, cachePath, tenantId } = options;
-  const { getCredential } = await import("./getCredential-TIS4HQAY.js");
-  const { AzureRemoteCacheClient } = await import("./AzureRemoteCacheClient-4Q4WE4D3.js");
-  const { ReporterDecorator } = await import("./ReporterDecorator-YVGD2WYR.js");
-  const { getListOfBlobs } = await import("./getListOfBlobs-ZMH5R6FS.js");
-  const credential = await getCredential(loginMethod, cachePath, tenantId);
+  const { getCredential } = await import("./getCredential-3U7LKZRE.js");
+  const { AzureRemoteCacheClient } = await import("./AzureRemoteCacheClient-ZZ27K4AF.js");
+  const { ReporterDecorator } = await import("./ReporterDecorator-I4CR7TWD.js");
+  const { getListOfBlobs } = await import("./getListOfBlobs-YTVBR3IU.js");
+  const credential = await getCredential(
+    { loginMethod, cachePath, tenantId },
+    { reporter: context.reporter, azureLogger: azureLogEventHandler }
+  );
   const remoteCacheClientOptions = {
     storageAccount,
     container,

package/lib/authentication/getCredential.d.ts

@@ -1,10 +1,20 @@
+/// <reference types="node" resolution-mode="require"/>
 import { type TokenCredential } from '@azure/identity';
 import type { LoginMethod } from '../types/LoginMethod.js';
+import type { TaskReporter } from '@ms-cloudpack/task-reporter';
+import type EventEmitter from 'events';
 /**
  * Gets a credential for the given login method.
  * If the login method is 'azure-cli', it will return an AzureCliCredential.
  * Otherwise, it will return an InteractiveBrowserCredential or a DeviceCodeCredential with persistent token settings.
  * If an authentication record has never been saved before, it will authenticate the credential and save the authentication record.
  */
-export declare function getCredential(loginMethod: LoginMethod, cachePath: string, tenantId?: string): Promise<TokenCredential>;
+export declare function getCredential(options: {
+    loginMethod: LoginMethod;
+    cachePath: string;
+    tenantId?: string;
+}, context: {
+    reporter: TaskReporter;
+    azureLogger: EventEmitter;
+}): Promise<TokenCredential>;
 //# sourceMappingURL=getCredential.d.ts.map

package/lib/registerAzureLogger.d.ts

@@ -0,0 +1,7 @@
+/// <reference types="node" resolution-mode="require"/>
+import EventEmitter from 'events';
+/**
+ * Registers a custom logger for the Azure SDK that emits events for some specific log messages.
+ */
+export declare function registerAzureLogger(): EventEmitter<[never]>;
+//# sourceMappingURL=registerAzureLogger.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ms-cloudpack/remote-cache",
-  "version": "0.7.3",
+  "version": "0.7.5",
   "description": "Manages syncing the local Cloudpack cached assets to/from a remote storage service.",
   "license": "MIT",
   "type": "module",
@@ -29,12 +29,13 @@
   "dependencies": {
     "@azure/msal-node-extensions": "^1.0.10",
     "@ms-cloudpack/retry": "^0.1.1",
-    "@ms-cloudpack/task-reporter": "^0.14.0",
+    "@ms-cloudpack/task-reporter": "^0.14.1",
     "@ms-cloudpack/telemetry": "^0.5.2"
   },
   "devDependencies": {
     "@azure/identity": "^4.0.0",
     "@azure/identity-cache-persistence": "^1.1.0",
+    "@azure/logger": "^1.0.0",
     "@azure/storage-blob": "^12.17.0",
     "@ms-cloudpack/eslint-plugin-internal": "*",
     "@ms-cloudpack/scripts": "*",

package/dist/chunk-E6II3DDV.js

@@ -1,57 +0,0 @@
-import { createRequire as topLevelCreateRequire } from 'node:module';
-import topLevelPath from 'node:path';
-import topLevelUrl from 'node:url';
-const require = topLevelCreateRequire(import.meta.url);
-const __filename = topLevelUrl.fileURLToPath(import.meta.url);
-const __dirname = topLevelPath.dirname(__filename);
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
-var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
-  get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
-}) : x)(function(x) {
-  if (typeof require !== "undefined")
-    return require.apply(this, arguments);
-  throw Error('Dynamic require of "' + x + '" is not supported');
-});
-var __esm = (fn, res) => function __init() {
-  return fn && (res = (0, fn[__getOwnPropNames(fn)[0]])(fn = 0)), res;
-};
-var __commonJS = (cb, mod) => function __require2() {
-  return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
-};
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-
-export {
-  __name,
-  __require,
-  __esm,
-  __commonJS,
-  __export,
-  __toESM,
-  __toCommonJS
-};