@ms-cloudpack/remote-cache 0.10.22 → 0.11.0

package/dist/index.js

@@ -4,20 +4,18 @@ import topLevelUrl from 'node:url';
 const require = topLevelCreateRequire(import.meta.url);
 const __filename = topLevelUrl.fileURLToPath(import.meta.url);
 const __dirname = topLevelPath.dirname(__filename);
-import {
-  require_commonjs as require_commonjs5,
-  require_commonjs2 as require_commonjs7,
-  require_dist
-} from "./chunk-2F4TLFG2.js";
 import {
   init_tslib_es6,
   require_commonjs,
-  require_commonjs3 as require_commonjs2,
-  require_commonjs4 as require_commonjs3,
-  require_commonjs5 as require_commonjs4,
+  require_commonjs2,
+  require_commonjs3,
+  require_commonjs4,
+  require_commonjs5,
   require_commonjs6,
+  require_commonjs7,
+  require_dist,
   tslib_es6_exports
-} from "./chunk-SAK6X2DV.js";
+} from "./chunk-XND2VV4N.js";
 import {
   __commonJS,
   __name,
@@ -3211,7 +3209,7 @@ var require_dist2 = __commonJS({
       return coreAuth.isSASCredential(credential) || coreAuth.isNamedKeyCredential(credential) || coreAuth.isTokenCredential(credential);
     }
     __name(isCredential, "isCredential");
-    var logger2 = logger$1.createClientLogger("data-tables");
+    var logger = logger$1.createClientLogger("data-tables");
     function setTokenChallengeAuthenticationPolicy(pipeline, credential, scopes) {
       pipeline.removePolicy({ name: "bearerTokenPolicy" });
       pipeline.addPolicy(coreRestPipeline.bearerTokenAuthenticationPolicy({
@@ -3323,7 +3321,7 @@ var require_dist2 = __commonJS({
         const credential = isCredential(credentialOrOptions) ? credentialOrOptions : void 0;
         const clientOptions = (!isCredential(credentialOrOptions) ? credentialOrOptions : options) || {};
         const internalPipelineOptions = Object.assign(Object.assign({}, clientOptions), { endpoint: clientOptions.endpoint || this.url, loggingOptions: {
-          logger: logger2.info,
+          logger: logger.info,
           additionalAllowedHeaderNames: [...TablesLoggingAllowedHeaderNames]
         }, deserializationOptions: {
           parseXML: coreXml.parseXML
@@ -3386,7 +3384,7 @@ var require_dist2 = __commonJS({
           try {
             await this.table.create({ name }, updatedOptions);
           } catch (e) {
-            handleTableAlreadyExists(e, Object.assign(Object.assign({}, updatedOptions), { logger: logger2, tableName: name }));
+            handleTableAlreadyExists(e, Object.assign(Object.assign({}, updatedOptions), { logger, tableName: name }));
           }
         });
       }
@@ -3402,7 +3400,7 @@ var require_dist2 = __commonJS({
             await this.table.delete(name, updatedOptions);
           } catch (e) {
             if (e.statusCode === 404) {
-              logger2.info("TableServiceClient.deleteTable: Table doesn't exist");
+              logger.info("TableServiceClient.deleteTable: Table doesn't exist");
             } else {
               throw e;
             }
@@ -4120,7 +4118,7 @@ var require_dist2 = __commonJS({
         this.clientOptions = (!isCredential(credentialOrOptions) ? credentialOrOptions : options) || {};
         this.allowInsecureConnection = (_a = this.clientOptions.allowInsecureConnection) !== null && _a !== void 0 ? _a : false;
         const internalPipelineOptions = Object.assign(Object.assign({}, this.clientOptions), { endpoint: this.clientOptions.endpoint || this.url, loggingOptions: {
-          logger: logger2.info,
+          logger: logger.info,
           additionalAllowedHeaderNames: [...TablesLoggingAllowedHeaderNames]
         }, deserializationOptions: {
           parseXML: coreXml.parseXML
@@ -4178,7 +4176,7 @@ var require_dist2 = __commonJS({
             await this.table.delete(this.tableName, updatedOptions);
           } catch (e) {
             if (e.statusCode === 404) {
-              logger2.info("TableClient.deleteTable: Table doesn't exist");
+              logger.info("TableClient.deleteTable: Table doesn't exist");
             } else {
               throw e;
             }
@@ -4216,7 +4214,7 @@ var require_dist2 = __commonJS({
           try {
             await this.table.create({ name: this.tableName }, updatedOptions);
           } catch (e) {
-            handleTableAlreadyExists(e, Object.assign(Object.assign({}, updatedOptions), { logger: logger2, tableName: this.tableName }));
+            handleTableAlreadyExists(e, Object.assign(Object.assign({}, updatedOptions), { logger, tableName: this.tableName }));
           }
         });
       }
@@ -4672,22 +4670,6 @@ var require_dist2 = __commonJS({
   }
 });
 
-// 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 {
   cacheClient;
@@ -4773,31 +4755,30 @@ __name(createTableStorageUrl, "createTableStorageUrl");
 // src/createRemoteCacheClient.ts
 var import_storage_blob = __toESM(require_dist(), 1);
 async function createRemoteCacheClient(params) {
-  const azureLogEventHandler = registerAzureLogger();
   const { context, options } = params;
   const { container, loginMethod, storageAccount, cachePath, tenantId } = options;
-  const { getCredential } = await import("./getCredential-LMSBNT2W.js");
-  const { AzureRemoteCacheClient } = await import("./AzureRemoteCacheClient-2Q6MBWDN.js");
-  const { ReporterDecorator } = await import("./ReporterDecorator-VYNWC6CL.js");
-  const { getListOfBlobs } = await import("./getListOfBlobs-BGP2V7PV.js");
-  const credential = await getCredential(
-    { loginMethod, cachePath, tenantId },
-    { ...context, azureLogger: azureLogEventHandler }
-  );
-  const blobStorageClient = new import_storage_blob.BlobServiceClient(createBlobStorageUrl(storageAccount), credential);
-  const containerClient = blobStorageClient.getContainerClient(container);
-  const listOfBlobs = await getListOfBlobs(containerClient, context);
-  const client = new ReporterDecorator(
-    new RetryDecorator({
-      retryManager: new RetryManager([blockListIsInvalidRetryPolicy]),
-      cacheClient: new InMemoryDecorator({
-        cacheClient: new AzureRemoteCacheClient(containerClient),
-        getList: /* @__PURE__ */ __name(() => Promise.resolve(listOfBlobs), "getList")
-      })
-    }),
-    context
-  );
-  return client;
+  const { telemetryClient } = context;
+  return telemetryClient.tracer.startActiveSpan("CREATE_REMOTE_CACHE_CLIENT", async () => {
+    const { getCredential } = await import("@ms-cloudpack/auth");
+    const { AzureRemoteCacheClient } = await import("./AzureRemoteCacheClient-RQPQQPU4.js");
+    const { ReporterDecorator } = await import("./ReporterDecorator-VYNWC6CL.js");
+    const { getListOfBlobs } = await import("./getListOfBlobs-BGP2V7PV.js");
+    const credential = await getCredential({ loginMethod, cachePath, tenantId }, context);
+    const blobStorageClient = new import_storage_blob.BlobServiceClient(createBlobStorageUrl(storageAccount), credential);
+    const containerClient = blobStorageClient.getContainerClient(container);
+    const listOfBlobs = await getListOfBlobs(containerClient, context);
+    const client = new ReporterDecorator(
+      new RetryDecorator({
+        retryManager: new RetryManager([blockListIsInvalidRetryPolicy]),
+        cacheClient: new InMemoryDecorator({
+          cacheClient: new AzureRemoteCacheClient(containerClient),
+          getList: /* @__PURE__ */ __name(() => Promise.resolve(listOfBlobs), "getList")
+        })
+      }),
+      context
+    );
+    return client;
+  });
 }
 __name(createRemoteCacheClient, "createRemoteCacheClient");
 
@@ -4927,12 +4908,8 @@ var defaultStorageAccount = "cloudpackstorage";
 async function createAppRegistryClient(params) {
   const { context, options } = params;
   const { loginMethod, cachePath, tenantId = defaultTenantId, storageAccount = defaultStorageAccount } = options;
-  const azureLogEventHandler = registerAzureLogger();
-  const { getCredential } = await import("./getCredential-LMSBNT2W.js");
-  const credential = await getCredential(
-    { loginMethod, cachePath, tenantId },
-    { ...context, azureLogger: azureLogEventHandler }
-  );
+  const { getCredential } = await import("@ms-cloudpack/auth");
+  const credential = await getCredential({ loginMethod, cachePath, tenantId }, context);
   const url = createTableStorageUrl(storageAccount);
   const client = new AzureAppRegistryClient(url, credential);
   return client;

package/lib/AzureAppRegistryClient.d.ts

@@ -1,7 +1,7 @@
 import type { AppRegistration, AppRegistrationVersion } from './types/AppRegistration.js';
 import type { AppRegistryClient } from './types/AppRegistryClient.js';
 import type { PageSettings } from '@azure/core-paging';
-import type { TokenCredential } from '@azure/identity';
+import type { TokenCredential } from '@ms-cloudpack/auth';
 import type { PagedResult } from './types/PagedResult.js';
 export declare class AzureAppRegistryClient implements AppRegistryClient {
     readonly storageUrl: string;

package/lib/createAppRegistryClient.d.ts

@@ -1,6 +1,6 @@
 import type { TaskReporter } from '@ms-cloudpack/task-reporter';
 import type { TelemetryClient } from '@ms-cloudpack/telemetry';
-import type { LoginMethod } from './types/LoginMethod.js';
+import type { LoginMethod } from '@ms-cloudpack/auth';
 import type { RemoteCacheConfig } from '@ms-cloudpack/common-types';
 import type { AppRegistryClient } from './index.js';
 /**

package/lib/createRemoteCacheClient.d.ts

@@ -2,7 +2,7 @@ import type { RemoteCacheConfig } from '@ms-cloudpack/common-types';
 import type { TaskReporter } from '@ms-cloudpack/task-reporter';
 import type { RemoteCacheClient } from './types/RemoteCacheClient.js';
 import type { TelemetryClient } from '@ms-cloudpack/telemetry';
-import type { LoginMethod } from './types/LoginMethod.js';
+import type { LoginMethod } from '@ms-cloudpack/auth';
 export interface CreateRemoteCacheClientParams {
     options: RemoteCacheConfig & {
         loginMethod: LoginMethod;

package/lib/index.d.ts

@@ -1,7 +1,6 @@
 export { createRemoteCacheClient, type CreateRemoteCacheClientParams } from './createRemoteCacheClient.js';
 export { createAppRegistryClient, type CreateAppRegistryClientParams } from './createAppRegistryClient.js';
 export type { RemoteCacheClient, RemoteCacheClientUploadOperationOptions, RemoteCacheClientOperationOptions, RemoteCacheClientOperationResult, } from './types/RemoteCacheClient.js';
-export type { LoginMethod } from './types/LoginMethod.js';
 export type { AppRegistration, AppRegistrationVersion } from './types/AppRegistration.js';
 export type { AppRegistryClient } from './types/AppRegistryClient.js';
 export type { PagedResult } from './types/PagedResult.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ms-cloudpack/remote-cache",
-  "version": "0.10.22",
+  "version": "0.11.0",
   "description": "Manages syncing the local Cloudpack cached assets to/from a remote storage service.",
   "license": "MIT",
   "type": "module",
@@ -27,22 +27,16 @@
     "lib/**/*.d.ts"
   ],
   "dependencies": {
-    "@ms-cloudpack/common-types": "^0.24.11",
-    "@ms-cloudpack/environment": "^0.1.1",
+    "@ms-cloudpack/auth": "^0.1.1",
+    "@ms-cloudpack/common-types": "^0.24.12",
     "@ms-cloudpack/retry": "^0.1.3",
     "@ms-cloudpack/task-reporter": "^0.16.0",
-    "@ms-cloudpack/telemetry": "^0.11.4",
-    "@napi-rs/keyring": "^1.0.0",
-    "mime-types": "^2.0.0",
-    "node-dpapi-prebuilt": "^1.0.3"
+    "@ms-cloudpack/telemetry": "^0.11.5",
+    "mime-types": "^2.0.0"
   },
   "devDependencies": {
     "@azure/core-paging": "^1.0.0",
     "@azure/data-tables": "^13.0.0",
-    "@azure/identity": "patch:@azure/identity@npm%3A4.3.0#~/.yarn/patches/@azure-identity-npm-4.3.0-e85334d38f.patch",
-    "@azure/logger": "^1.0.0",
-    "@azure/msal-common": "14.13.0",
-    "@azure/msal-node": "2.11.0",
     "@azure/storage-blob": "^12.17.0",
     "@ms-cloudpack/eslint-plugin-internal": "*",
     "@ms-cloudpack/scripts": "*",

package/dist/chunk-N4V3CONX.js

@@ -1,80 +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);
-import {
-  __commonJS,
-  __name,
-  __require
-} from "./chunk-NFU5RQB4.js";
-
-// ../../node_modules/.store/safe-buffer-npm-5.2.1-3481c8aa9b/package/index.js
-var require_package = __commonJS({
-  "../../node_modules/.store/safe-buffer-npm-5.2.1-3481c8aa9b/package/index.js"(exports, module) {
-    var buffer = __require("buffer");
-    var Buffer = buffer.Buffer;
-    function copyProps(src, dst) {
-      for (var key in src) {
-        dst[key] = src[key];
-      }
-    }
-    __name(copyProps, "copyProps");
-    if (Buffer.from && Buffer.alloc && Buffer.allocUnsafe && Buffer.allocUnsafeSlow) {
-      module.exports = buffer;
-    } else {
-      copyProps(buffer, exports);
-      exports.Buffer = SafeBuffer;
-    }
-    function SafeBuffer(arg, encodingOrOffset, length) {
-      return Buffer(arg, encodingOrOffset, length);
-    }
-    __name(SafeBuffer, "SafeBuffer");
-    SafeBuffer.prototype = Object.create(Buffer.prototype);
-    copyProps(Buffer, SafeBuffer);
-    SafeBuffer.from = function(arg, encodingOrOffset, length) {
-      if (typeof arg === "number") {
-        throw new TypeError("Argument must not be a number");
-      }
-      return Buffer(arg, encodingOrOffset, length);
-    };
-    SafeBuffer.alloc = function(size, fill, encoding) {
-      if (typeof size !== "number") {
-        throw new TypeError("Argument must be a number");
-      }
-      var buf = Buffer(size);
-      if (fill !== void 0) {
-        if (typeof encoding === "string") {
-          buf.fill(fill, encoding);
-        } else {
-          buf.fill(fill);
-        }
-      } else {
-        buf.fill(0);
-      }
-      return buf;
-    };
-    SafeBuffer.allocUnsafe = function(size) {
-      if (typeof size !== "number") {
-        throw new TypeError("Argument must be a number");
-      }
-      return Buffer(size);
-    };
-    SafeBuffer.allocUnsafeSlow = function(size) {
-      if (typeof size !== "number") {
-        throw new TypeError("Argument must be a number");
-      }
-      return buffer.SlowBuffer(size);
-    };
-  }
-});
-
-export {
-  require_package
-};
-/*! Bundled license information:
-
-.store/safe-buffer-npm-5.2.1-3481c8aa9b/package/index.js:
-  (*! safe-buffer. MIT License. Feross Aboukhadijeh <https://feross.org/opensource> *)
-*/