@ms-cloudpack/remote-cache 0.8.15 → 0.9.0

package/dist/{AzureRemoteCacheClient-RYQX2JZE.js → AzureRemoteCacheClient-WCVYZSMD.js}

@@ -1167,8 +1167,8 @@ var require_graceful_fs = __commonJS({
       fs2.createReadStream = createReadStream;
       fs2.createWriteStream = createWriteStream;
       var fs$readFile = fs2.readFile;
-      fs2.readFile = readFile;
-      function readFile(path, options, cb) {
+      fs2.readFile = readFile2;
+      function readFile2(path, options, cb) {
         if (typeof options === "function")
           cb = options, options = null;
         return go$readFile(path, options, cb);
@@ -1184,7 +1184,7 @@ var require_graceful_fs = __commonJS({
         }
         __name(go$readFile, "go$readFile");
       }
-      __name(readFile, "readFile");
+      __name(readFile2, "readFile");
       var fs$writeFile = fs2.writeFile;
       fs2.writeFile = writeFile;
       function writeFile(path, data, options, cb) {
@@ -3009,7 +3009,7 @@ var require_package16 = __commonJS({
     } catch (_) {
       _fs = __require("fs");
     }
-    function readFile(file, options, callback) {
+    function readFile2(file, options, callback) {
       if (callback == null) {
         callback = options;
         options = {};
@@ -3040,7 +3040,7 @@ var require_package16 = __commonJS({
         callback(null, obj);
       });
     }
-    __name(readFile, "readFile");
+    __name(readFile2, "readFile");
     function readFileSync(file, options) {
       options = options || {};
       if (typeof options === "string") {
@@ -3111,7 +3111,7 @@ var require_package16 = __commonJS({
     }
     __name(stripBom, "stripBom");
     var jsonfile = {
-      readFile,
+      readFile: readFile2,
       readFileSync,
       writeFile,
       writeFileSync
@@ -18516,7 +18516,7 @@ var require_package40 = __commonJS({
               }
               const file = _ref22;
               if (yield exists(file)) {
-                return readFile(file);
+                return readFile2(file);
               }
             }
             return null;
@@ -18535,7 +18535,7 @@ var require_package40 = __commonJS({
         })();
         let readJsonAndFile = exports2.readJsonAndFile = (() => {
           var _ref24 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (loc) {
-            const file = yield readFile(loc);
+            const file = yield readFile2(loc);
             try {
               return {
                 object: (0, (_map || _load_map()).default)(JSON.parse(stripBOM(file))),
@@ -18775,7 +18775,7 @@ var require_package40 = __commonJS({
           }, "getFirstSuitableFolder");
         })();
         exports2.copy = copy;
-        exports2.readFile = readFile;
+        exports2.readFile = readFile2;
         exports2.readFileRaw = readFileRaw;
         exports2.normalizeOS = normalizeOS;
         var _fs;
@@ -18886,10 +18886,10 @@ var require_package40 = __commonJS({
           });
         }
         __name(_readFile, "_readFile");
-        function readFile(loc) {
+        function readFile2(loc) {
           return _readFile(loc, "utf8").then(normalizeOS);
         }
-        __name(readFile, "readFile");
+        __name(readFile2, "readFile");
         function readFileRaw(loc) {
           return _readFile(loc, "binary");
         }
@@ -31334,7 +31334,7 @@ var require_async7 = __commonJS({
       opts = normalizeOptions(x, opts);
       var isFile = opts.isFile || defaultIsFile;
       var isDirectory = opts.isDirectory || defaultIsDir;
-      var readFile = opts.readFile || fs.readFile;
+      var readFile2 = opts.readFile || fs.readFile;
       var realpath = opts.realpath || defaultRealpath;
       var packageIterator = opts.packageIterator;
       var extensions = opts.extensions || [".js"];
@@ -31452,7 +31452,7 @@ var require_async7 = __commonJS({
           var pkgfile = path.join(pkgdir, "package.json");
           isFile(pkgfile, function(err2, ex) {
             if (!ex) return loadpkg(path.dirname(dir), cb2);
-            readFile(pkgfile, function(err3, body) {
+            readFile2(pkgfile, function(err3, body) {
               if (err3) cb2(err3);
               try {
                 var pkg = JSON.parse(body);
@@ -31480,7 +31480,7 @@ var require_async7 = __commonJS({
           isFile(pkgfile, function(err2, ex) {
             if (err2) return cb2(err2);
             if (!ex) return loadAsFile(path.join(x2, "index"), fpkg, cb2);
-            readFile(pkgfile, function(err3, body) {
+            readFile2(pkgfile, function(err3, body) {
               if (err3) return cb2(err3);
               try {
                 var pkg = JSON.parse(body);
@@ -39601,7 +39601,7 @@ var require_buffer_list = __commonJS({
         }, "clear")
       }, {
         key: "join",
-        value: /* @__PURE__ */ __name(function join(s) {
+        value: /* @__PURE__ */ __name(function join2(s) {
           if (this.length === 0) return "";
           var p = this.head;
           var ret = "" + p.data;
@@ -44880,8 +44880,8 @@ var require_CacheStorage = __commonJS({
       }
     };
     __name(_CacheStorage, "CacheStorage");
-    var CacheStorage = _CacheStorage;
-    exports.CacheStorage = CacheStorage;
+    var CacheStorage2 = _CacheStorage;
+    exports.CacheStorage = CacheStorage2;
   }
 });
 
@@ -44965,8 +44965,8 @@ var require_AzureBlobCacheStorage = __commonJS({
       maxBuffers: 5
     };
     async function createBlobClient(connectionString, containerName, blobName, credential) {
-      const { BlobServiceClient } = await Promise.resolve().then(() => __importStar(require_dist()));
-      const blobServiceClient = credential ? new BlobServiceClient(connectionString, credential) : BlobServiceClient.fromConnectionString(connectionString);
+      const { BlobServiceClient: BlobServiceClient2 } = await Promise.resolve().then(() => __importStar(require_dist()));
+      const blobServiceClient = credential ? new BlobServiceClient2(connectionString, credential) : BlobServiceClient2.fromConnectionString(connectionString);
       const containerClient = blobServiceClient.getContainerClient(containerName);
       const blobClient = containerClient.getBlobClient(blobName);
       return blobClient;
@@ -47246,7 +47246,7 @@ var require_lib14 = __commonJS({
     __name(isCustomProvider, "isCustomProvider");
     exports.isCustomProvider = isCustomProvider;
     var memo = /* @__PURE__ */ new Map();
-    function getCacheStorageProvider(cacheStorageConfig, internalCacheFolder, logger, cwd, incrementalCaching = false) {
+    function getCacheStorageProvider2(cacheStorageConfig, internalCacheFolder, logger, cwd, incrementalCaching = false) {
       let cacheStorage;
       if (isCustomProvider(cacheStorageConfig)) {
         try {
@@ -47272,8 +47272,8 @@ var require_lib14 = __commonJS({
       memo.set(key, cacheStorage);
       return cacheStorage;
     }
-    __name(getCacheStorageProvider, "getCacheStorageProvider");
-    exports.getCacheStorageProvider = getCacheStorageProvider;
+    __name(getCacheStorageProvider2, "getCacheStorageProvider");
+    exports.getCacheStorageProvider = getCacheStorageProvider2;
   }
 });
 
@@ -47356,21 +47356,76 @@ var require_api = __commonJS({
 // src/AzureRemoteCacheClient.ts
 var import_api = __toESM(require_api(), 1);
 import { existsSync } from "fs";
+
+// src/createCacheStorageConfig.ts
+var import_backfill_cache = __toESM(require_lib14(), 1);
+var import_storage_blob = __toESM(require_dist(), 1);
+import { join } from "path";
+import { readFile } from "fs/promises";
+import { lookup } from "mime-types";
+var _CustomAzureCacheStorage = class _CustomAzureCacheStorage extends import_backfill_cache.CacheStorage {
+  constructor({ container, storageAccount, credential }, logger, cwd) {
+    super(logger, cwd);
+    this.logger = logger;
+    this.cwd = cwd;
+    const connectionString = createBlobStorageUrl(storageAccount);
+    const blobStorageClient = new import_storage_blob.BlobServiceClient(connectionString, credential);
+    this.containerClient = blobStorageClient.getContainerClient(container);
+    const internalCacheFolder = "";
+    this.tarStorage = (0, import_backfill_cache.getCacheStorageProvider)(
+      {
+        provider: "azure-blob",
+        options: {
+          connectionString,
+          credential,
+          container
+        }
+      },
+      internalCacheFolder,
+      logger,
+      cwd
+    );
+  }
+  _fetch(hash) {
+    return this.tarStorage.fetch(hash);
+  }
+  async _put(hash, filesToCache) {
+    await Promise.all([
+      // Combine all the files in a tarball and upload it to the blob storage
+      this.tarStorage.put(hash, filesToCache),
+      // Upload the individual files to the blob storage
+      ...filesToCache.map(async (file) => {
+        const filePath = join(this.cwd, file);
+        const content = await readFile(filePath, { encoding: "utf-8" });
+        const blockBlobClient = this.containerClient.getBlockBlobClient(`${hash}/${file}`);
+        return blockBlobClient.upload(content, content.length, {
+          blobHTTPHeaders: {
+            blobContentType: lookup(file) || "application/octet-stream"
+          }
+        });
+      })
+    ]);
+  }
+};
+__name(_CustomAzureCacheStorage, "CustomAzureCacheStorage");
+var CustomAzureCacheStorage = _CustomAzureCacheStorage;
+function createCacheStorageConfig(remoteCacheClientOptions) {
+  return {
+    name: "Custom Azure Cache Storage",
+    provider: /* @__PURE__ */ __name((logger, cwd) => new CustomAzureCacheStorage(remoteCacheClientOptions, logger, cwd), "provider")
+  };
+}
+__name(createCacheStorageConfig, "createCacheStorageConfig");
+
+// src/AzureRemoteCacheClient.ts
 var _AzureRemoteCacheClient = class _AzureRemoteCacheClient {
-  constructor({ container, storageAccount, credential }) {
+  constructor(remoteCacheClientOptions) {
     this.logger = (0, import_api.makeLogger)("mute", process.stdout, process.stderr);
     this.config = {
       incrementalCaching: true,
       internalCacheFolder: "",
       // not used by azure-blob
-      cacheStorageConfig: {
-        provider: "azure-blob",
-        options: {
-          connectionString: createBlobStorageUrl(storageAccount),
-          credential,
-          container
-        }
-      }
+      cacheStorageConfig: createCacheStorageConfig(remoteCacheClientOptions)
     };
   }
   /**

package/dist/{getListOfBlobs-6GZGACOS.js → getListOfBlobs-WLTPEMDF.js}

@@ -22,8 +22,10 @@ async function getListOfBlobs({ container, storageAccount, credential }) {
   const blobStorageClient = new import_storage_blob.BlobServiceClient(createBlobStorageUrl(storageAccount), credential);
   const containerClient = blobStorageClient.getContainerClient(container);
   const blobs = /* @__PURE__ */ new Set();
-  for await (const blob of containerClient.listBlobsFlat()) {
-    blobs.add(blob.name);
+  for await (const blob of containerClient.listBlobsByHierarchy("/")) {
+    if (blob.kind === "blob") {
+      blobs.add(blob.name);
+    }
   }
   return blobs;
 }

package/dist/index.js

@@ -97,9 +97,9 @@ async function createRemoteCacheClient(params) {
   const { context, options } = params;
   const { container, loginMethod, storageAccount, cachePath, tenantId } = options;
   const { getCredential } = await import("./getCredential-TGHZRNZU.js");
-  const { AzureRemoteCacheClient } = await import("./AzureRemoteCacheClient-RYQX2JZE.js");
+  const { AzureRemoteCacheClient } = await import("./AzureRemoteCacheClient-WCVYZSMD.js");
   const { ReporterDecorator } = await import("./ReporterDecorator-V2YEIC5V.js");
-  const { getListOfBlobs } = await import("./getListOfBlobs-6GZGACOS.js");
+  const { getListOfBlobs } = await import("./getListOfBlobs-WLTPEMDF.js");
   const credential = await getCredential(
     { loginMethod, cachePath, tenantId },
     { ...context, azureLogger: azureLogEventHandler }

package/lib/AzureRemoteCacheClient.d.ts

@@ -1,9 +1,9 @@
-import type { RemoteCacheClientOptions } from './types/RemoteCacheClientOptions.js';
 import type { RemoteCacheClient, RemoteCacheClientOperationOptions, RemoteCacheClientUploadOperationOptions } from './types/RemoteCacheClient.js';
+import type { RemoteCacheClientOptions } from './types/RemoteCacheClientOptions.js';
 export declare class AzureRemoteCacheClient implements RemoteCacheClient {
     private readonly logger;
     private readonly config;
-    constructor({ container, storageAccount, credential }: RemoteCacheClientOptions);
+    constructor(remoteCacheClientOptions: RemoteCacheClientOptions);
     /**
      * Uploads the folder to the remote cache.
      * @param id - The unique identifier of the asset to upload.

package/lib/createCacheStorageConfig.d.ts

@@ -0,0 +1,4 @@
+import type { RemoteCacheClientOptions } from './types/RemoteCacheClientOptions.js';
+import type { CustomStorageConfig } from 'backfill-config';
+export declare function createCacheStorageConfig(remoteCacheClientOptions: RemoteCacheClientOptions): CustomStorageConfig;
+//# sourceMappingURL=createCacheStorageConfig.d.ts.map

package/lib/index.d.ts

@@ -1,5 +1,5 @@
 export { createRemoteCacheClient, type CreateRemoteCacheClientParams } from './createRemoteCacheClient.js';
-export type { RemoteCacheClient, RemoteCacheClientUploadOperationOptions as RemoteCacheClientDownloadOperationOptions, RemoteCacheClientOperationOptions, RemoteCacheClientOperationResult, } from './types/RemoteCacheClient.js';
+export type { RemoteCacheClient, RemoteCacheClientUploadOperationOptions, RemoteCacheClientOperationOptions, RemoteCacheClientOperationResult, } from './types/RemoteCacheClient.js';
 export type { LoginMethod } from './types/LoginMethod.js';
 export type { RemoteCacheClientOptions } from './types/RemoteCacheClientOptions.js';
 //# sourceMappingURL=index.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ms-cloudpack/remote-cache",
-  "version": "0.8.15",
+  "version": "0.9.0",
   "description": "Manages syncing the local Cloudpack cached assets to/from a remote storage service.",
   "license": "MIT",
   "type": "module",
@@ -27,11 +27,12 @@
     "lib/**/*.d.ts"
   ],
   "dependencies": {
-    "@ms-cloudpack/common-types": "^0.22.0",
+    "@ms-cloudpack/common-types": "^0.23.0",
     "@ms-cloudpack/retry": "^0.1.2",
     "@ms-cloudpack/task-reporter": "^0.14.5",
     "@ms-cloudpack/telemetry": "^0.6.3",
     "@napi-rs/keyring": "^1.0.0",
+    "mime-types": "^2.0.0",
     "node-dpapi-prebuilt": "^1.0.3"
   },
   "devDependencies": {
@@ -42,7 +43,10 @@
     "@azure/storage-blob": "^12.17.0",
     "@ms-cloudpack/eslint-plugin-internal": "*",
     "@ms-cloudpack/scripts": "*",
+    "@types/mime-types": "^2.0.0",
     "backfill": "^6.2.1",
-    "backfill-config": "^6.4.1"
+    "backfill-cache": "^5.8.1",
+    "backfill-config": "^6.4.1",
+    "backfill-logger": "^5.2.1"
   }
 }