@kapeta/local-cluster-service 0.16.3 → 0.16.4

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [0.16.4](https://github.com/kapetacom/local-cluster-service/compare/v0.16.3...v0.16.4) (2023-08-14)
+
+
+### Bug Fixes
+
+* Avoid multiple layers of cache ([#61](https://github.com/kapetacom/local-cluster-service/issues/61)) ([e8efcd2](https://github.com/kapetacom/local-cluster-service/commit/e8efcd26184c792a8798781eb6bd9952ccfa0fec))
+
 ## [0.16.3](https://github.com/kapetacom/local-cluster-service/compare/v0.16.2...v0.16.3) (2023-08-14)
 
 

package/dist/cjs/src/providerManager.d.ts

@@ -1,9 +1,7 @@
 /// <reference types="node" />
 declare class ProviderManager {
-    private _webAssetCache;
-    constructor();
     getWebProviders(): import("@kapeta/local-cluster-config").DefinitionInfo[];
-    getAsset(handle: string, name: string, version: string, sourceMap?: boolean): Promise<string | Buffer | null>;
+    getProviderWebJS(handle: string, name: string, version: string, sourceMap?: boolean): Promise<string | Buffer | null>;
 }
 export declare const providerManager: ProviderManager;
 export {};

package/dist/cjs/src/providerManager.js

@@ -8,19 +8,18 @@ const path_1 = __importDefault(require("path"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const repositoryManager_1 = require("./repositoryManager");
 const definitionsManager_1 = require("./definitionsManager");
+const cacheManager_1 = require("./cacheManager");
 class ProviderManager {
-    _webAssetCache;
-    constructor() {
-        this._webAssetCache = {};
-    }
     getWebProviders() {
         return definitionsManager_1.definitionsManager.getProviderDefinitions().filter((providerDefinition) => providerDefinition.hasWeb);
     }
-    async getAsset(handle, name, version, sourceMap = false) {
+    async getProviderWebJS(handle, name, version, sourceMap = false) {
         const fullName = `${handle}/${name}`;
         const id = `${handle}/${name}/${version}/web.js${sourceMap ? '.map' : ''}`;
-        if (this._webAssetCache[id] && (await fs_extra_1.default.pathExists(this._webAssetCache[id]))) {
-            return fs_extra_1.default.readFile(this._webAssetCache[id], 'utf8');
+        const cacheKey = `provider:web:${id}`;
+        const file = cacheManager_1.cacheManager.get(cacheKey);
+        if (file && await fs_extra_1.default.pathExists(file)) {
+            return fs_extra_1.default.readFile(file, 'utf8');
         }
         await repositoryManager_1.repositoryManager.ensureAsset(handle, name, version, true);
         const installedProvider = this.getWebProviders().find((providerDefinition) => {
@@ -30,7 +29,7 @@ class ProviderManager {
             //Check locally installed providers
             const path = path_1.default.join(installedProvider.path, 'web', handle, `${name}.js${sourceMap ? '.map' : ''}`);
             if (await fs_extra_1.default.pathExists(path)) {
-                this._webAssetCache[id] = path;
+                cacheManager_1.cacheManager.set(cacheKey, path, 24 * 60 * 60 * 1000);
                 return fs_extra_1.default.readFile(path);
             }
         }

package/dist/cjs/src/providers/routes.js

@@ -14,7 +14,7 @@ router.get('/', async (req, res) => {
 });
 router.get('/asset/:handle/:name/:version/web.js', async (req, res) => {
     const { handle, name, version } = req.params;
-    let result = await providerManager_1.providerManager.getAsset(handle, name, version);
+    let result = await providerManager_1.providerManager.getProviderWebJS(handle, name, version);
     if (!result) {
         res.status(404).send('');
     }
@@ -27,7 +27,7 @@ router.get('/asset/:handle/:name/:version/web.js', async (req, res) => {
 });
 router.get('/asset/:handle/:name/:version/web.js.map', async (req, res) => {
     const { handle, name, version } = req.params;
-    const result = await providerManager_1.providerManager.getAsset(handle, name, version, true);
+    const result = await providerManager_1.providerManager.getProviderWebJS(handle, name, version, true);
     if (!result) {
         res.status(404).send('');
     }

package/dist/cjs/src/repositoryManager.d.ts

@@ -2,7 +2,6 @@ import { Task } from './taskManager';
 import { SourceOfChange } from './types';
 declare class RepositoryManager {
     private _registryService;
-    private _cache;
     private watcher;
     constructor();
     listenForChanges(): void;

package/dist/cjs/src/repositoryManager.js

@@ -29,14 +29,11 @@ const DEFAULT_PROVIDERS = [
     'kapeta/language-target-nodejs',
     'kapeta/language-target-java-spring-boot',
 ];
-const INSTALL_ATTEMPTED = {};
 class RepositoryManager {
     _registryService;
-    _cache;
     watcher;
     constructor() {
         this._registryService = new nodejs_registry_utils_1.RegistryService(nodejs_registry_utils_1.Config.data.registry.url);
-        this._cache = {};
         this.watcher = new RepositoryWatcher_1.RepositoryWatcher();
         this.listenForChanges();
     }
@@ -67,14 +64,10 @@ class RepositoryManager {
         //We make sure to only install one asset at a time - otherwise unexpected things might happen
         const createInstaller = (ref) => {
             return async () => {
-                if (INSTALL_ATTEMPTED[ref]) {
-                    return;
-                }
                 if (definitionsManager_1.definitionsManager.exists(ref)) {
                     return;
                 }
                 //console.log(`Installing asset: ${ref}`);
-                INSTALL_ATTEMPTED[ref] = true;
                 //Auto-install missing asset
                 try {
                     //We change to a temp dir to avoid issues with the current working directory
@@ -96,9 +89,6 @@ class RepositoryManager {
                 continue;
             }
             ref = (0, utils_1.normalizeKapetaUri)(ref);
-            if (INSTALL_ATTEMPTED[ref]) {
-                continue;
-            }
             if (definitionsManager_1.definitionsManager.exists(ref)) {
                 continue;
             }
@@ -119,17 +109,10 @@ class RepositoryManager {
         }
         const definitions = definitionsManager_1.definitionsManager.getDefinitions();
         const installedAsset = definitions.find((d) => d.definition.metadata.name === fullName && d.version === version);
-        if (installedAsset && this._cache[ref] === true) {
-            return;
-        }
-        if (!installedAsset && this._cache[ref] === false) {
-            return;
-        }
         let assetVersion;
         try {
             assetVersion = await this._registryService.getVersion(fullName, version);
             if (!assetVersion) {
-                this._cache[ref] = false;
                 return;
             }
         }
@@ -140,7 +123,6 @@ class RepositoryManager {
             }
             throw e;
         }
-        this._cache[ref] = true;
         let tasks = undefined;
         if (!installedAsset) {
             tasks = this._install([ref]);

package/dist/esm/src/providerManager.d.ts

@@ -1,9 +1,7 @@
 /// <reference types="node" />
 declare class ProviderManager {
-    private _webAssetCache;
-    constructor();
     getWebProviders(): import("@kapeta/local-cluster-config").DefinitionInfo[];
-    getAsset(handle: string, name: string, version: string, sourceMap?: boolean): Promise<string | Buffer | null>;
+    getProviderWebJS(handle: string, name: string, version: string, sourceMap?: boolean): Promise<string | Buffer | null>;
 }
 export declare const providerManager: ProviderManager;
 export {};

package/dist/esm/src/providerManager.js

@@ -2,19 +2,18 @@ import Path from 'path';
 import FSExtra from 'fs-extra';
 import { repositoryManager } from './repositoryManager';
 import { definitionsManager } from './definitionsManager';
+import { cacheManager } from "./cacheManager";
 class ProviderManager {
-    _webAssetCache;
-    constructor() {
-        this._webAssetCache = {};
-    }
     getWebProviders() {
         return definitionsManager.getProviderDefinitions().filter((providerDefinition) => providerDefinition.hasWeb);
     }
-    async getAsset(handle, name, version, sourceMap = false) {
+    async getProviderWebJS(handle, name, version, sourceMap = false) {
         const fullName = `${handle}/${name}`;
         const id = `${handle}/${name}/${version}/web.js${sourceMap ? '.map' : ''}`;
-        if (this._webAssetCache[id] && (await FSExtra.pathExists(this._webAssetCache[id]))) {
-            return FSExtra.readFile(this._webAssetCache[id], 'utf8');
+        const cacheKey = `provider:web:${id}`;
+        const file = cacheManager.get(cacheKey);
+        if (file && await FSExtra.pathExists(file)) {
+            return FSExtra.readFile(file, 'utf8');
         }
         await repositoryManager.ensureAsset(handle, name, version, true);
         const installedProvider = this.getWebProviders().find((providerDefinition) => {
@@ -24,7 +23,7 @@ class ProviderManager {
             //Check locally installed providers
             const path = Path.join(installedProvider.path, 'web', handle, `${name}.js${sourceMap ? '.map' : ''}`);
             if (await FSExtra.pathExists(path)) {
-                this._webAssetCache[id] = path;
+                cacheManager.set(cacheKey, path, 24 * 60 * 60 * 1000);
                 return FSExtra.readFile(path);
             }
         }

package/dist/esm/src/providers/routes.js

@@ -9,7 +9,7 @@ router.get('/', async (req, res) => {
 });
 router.get('/asset/:handle/:name/:version/web.js', async (req, res) => {
     const { handle, name, version } = req.params;
-    let result = await providerManager.getAsset(handle, name, version);
+    let result = await providerManager.getProviderWebJS(handle, name, version);
     if (!result) {
         res.status(404).send('');
     }
@@ -22,7 +22,7 @@ router.get('/asset/:handle/:name/:version/web.js', async (req, res) => {
 });
 router.get('/asset/:handle/:name/:version/web.js.map', async (req, res) => {
     const { handle, name, version } = req.params;
-    const result = await providerManager.getAsset(handle, name, version, true);
+    const result = await providerManager.getProviderWebJS(handle, name, version, true);
     if (!result) {
         res.status(404).send('');
     }

package/dist/esm/src/repositoryManager.d.ts

@@ -2,7 +2,6 @@ import { Task } from './taskManager';
 import { SourceOfChange } from './types';
 declare class RepositoryManager {
     private _registryService;
-    private _cache;
     private watcher;
     constructor();
     listenForChanges(): void;

package/dist/esm/src/repositoryManager.js

@@ -23,14 +23,11 @@ const DEFAULT_PROVIDERS = [
     'kapeta/language-target-nodejs',
     'kapeta/language-target-java-spring-boot',
 ];
-const INSTALL_ATTEMPTED = {};
 class RepositoryManager {
     _registryService;
-    _cache;
     watcher;
     constructor() {
         this._registryService = new RegistryService(Config.data.registry.url);
-        this._cache = {};
         this.watcher = new RepositoryWatcher();
         this.listenForChanges();
     }
@@ -61,14 +58,10 @@ class RepositoryManager {
         //We make sure to only install one asset at a time - otherwise unexpected things might happen
         const createInstaller = (ref) => {
             return async () => {
-                if (INSTALL_ATTEMPTED[ref]) {
-                    return;
-                }
                 if (definitionsManager.exists(ref)) {
                     return;
                 }
                 //console.log(`Installing asset: ${ref}`);
-                INSTALL_ATTEMPTED[ref] = true;
                 //Auto-install missing asset
                 try {
                     //We change to a temp dir to avoid issues with the current working directory
@@ -90,9 +83,6 @@ class RepositoryManager {
                 continue;
             }
             ref = normalizeKapetaUri(ref);
-            if (INSTALL_ATTEMPTED[ref]) {
-                continue;
-            }
             if (definitionsManager.exists(ref)) {
                 continue;
             }
@@ -113,17 +103,10 @@ class RepositoryManager {
         }
         const definitions = definitionsManager.getDefinitions();
         const installedAsset = definitions.find((d) => d.definition.metadata.name === fullName && d.version === version);
-        if (installedAsset && this._cache[ref] === true) {
-            return;
-        }
-        if (!installedAsset && this._cache[ref] === false) {
-            return;
-        }
         let assetVersion;
         try {
             assetVersion = await this._registryService.getVersion(fullName, version);
             if (!assetVersion) {
-                this._cache[ref] = false;
                 return;
             }
         }
@@ -134,7 +117,6 @@ class RepositoryManager {
             }
             throw e;
         }
-        this._cache[ref] = true;
         let tasks = undefined;
         if (!installedAsset) {
             tasks = this._install([ref]);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@kapeta/local-cluster-service",
-    "version": "0.16.3",
+    "version": "0.16.4",
     "description": "Manages configuration, ports and service discovery for locally running Kapeta systems",
     "type": "commonjs",
     "exports": {

package/src/providerManager.ts

@@ -4,23 +4,24 @@ import { repositoryManager } from './repositoryManager';
 import ClusterConfiguration from '@kapeta/local-cluster-config';
 import { StringMap } from './types';
 import { definitionsManager } from './definitionsManager';
+import {cacheManager} from "./cacheManager";
 
 class ProviderManager {
-    private _webAssetCache: StringMap;
-    constructor() {
-        this._webAssetCache = {};
-    }
+
 
     getWebProviders() {
         return definitionsManager.getProviderDefinitions().filter((providerDefinition) => providerDefinition.hasWeb);
     }
 
-    async getAsset(handle: string, name: string, version: string, sourceMap: boolean = false) {
+    async getProviderWebJS(handle: string, name: string, version: string, sourceMap: boolean = false) {
         const fullName = `${handle}/${name}`;
         const id = `${handle}/${name}/${version}/web.js${sourceMap ? '.map' : ''}`;
 
-        if (this._webAssetCache[id] && (await FSExtra.pathExists(this._webAssetCache[id]))) {
-            return FSExtra.readFile(this._webAssetCache[id], 'utf8');
+        const cacheKey = `provider:web:${id}`;
+
+        const file = cacheManager.get<string>(cacheKey);
+        if (file && await FSExtra.pathExists(file)) {
+            return FSExtra.readFile(file, 'utf8');
         }
 
         await repositoryManager.ensureAsset(handle, name, version, true);
@@ -33,8 +34,7 @@ class ProviderManager {
             //Check locally installed providers
             const path = Path.join(installedProvider.path, 'web', handle, `${name}.js${sourceMap ? '.map' : ''}`);
             if (await FSExtra.pathExists(path)) {
-                this._webAssetCache[id] = path;
-
+                cacheManager.set(cacheKey, path, 24* 60 * 60 * 1000);
                 return FSExtra.readFile(path);
             }
         }

package/src/providers/routes.ts

@@ -16,7 +16,7 @@ router.get('/', async (req: Request, res: Response) => {
 
 router.get('/asset/:handle/:name/:version/web.js', async (req: Request, res: Response) => {
     const { handle, name, version } = req.params;
-    let result = await providerManager.getAsset(handle, name, version);
+    let result = await providerManager.getProviderWebJS(handle, name, version);
 
     if (!result) {
         res.status(404).send('');
@@ -30,7 +30,7 @@ router.get('/asset/:handle/:name/:version/web.js', async (req: Request, res: Res
 
 router.get('/asset/:handle/:name/:version/web.js.map', async (req: Request, res: Response) => {
     const { handle, name, version } = req.params;
-    const result = await providerManager.getAsset(handle, name, version, true);
+    const result = await providerManager.getProviderWebJS(handle, name, version, true);
 
     if (!result) {
         res.status(404).send('');

package/src/repositoryManager.ts

@@ -28,16 +28,12 @@ const DEFAULT_PROVIDERS = [
     'kapeta/language-target-java-spring-boot',
 ];
 
-const INSTALL_ATTEMPTED: { [p: string]: boolean } = {};
-
 class RepositoryManager {
     private _registryService: RegistryService;
-    private _cache: { [key: string]: boolean };
     private watcher: RepositoryWatcher;
 
     constructor() {
         this._registryService = new RegistryService(Config.data.registry.url);
-        this._cache = {};
         this.watcher = new RepositoryWatcher();
         this.listenForChanges();
     }
@@ -74,15 +70,10 @@ class RepositoryManager {
         //We make sure to only install one asset at a time - otherwise unexpected things might happen
         const createInstaller = (ref: string) => {
             return async () => {
-                if (INSTALL_ATTEMPTED[ref]) {
-                    return;
-                }
-
                 if (definitionsManager.exists(ref)) {
                     return;
                 }
                 //console.log(`Installing asset: ${ref}`);
-                INSTALL_ATTEMPTED[ref] = true;
                 //Auto-install missing asset
                 try {
                     //We change to a temp dir to avoid issues with the current working directory
@@ -106,10 +97,6 @@ class RepositoryManager {
             }
             ref = normalizeKapetaUri(ref);
 
-            if (INSTALL_ATTEMPTED[ref]) {
-                continue;
-            }
-
             if (definitionsManager.exists(ref)) {
                 continue;
             }
@@ -144,19 +131,10 @@ class RepositoryManager {
             (d) => d.definition.metadata.name === fullName && d.version === version
         );
 
-        if (installedAsset && this._cache[ref] === true) {
-            return;
-        }
-
-        if (!installedAsset && this._cache[ref] === false) {
-            return;
-        }
-
         let assetVersion;
         try {
             assetVersion = await this._registryService.getVersion(fullName, version);
             if (!assetVersion) {
-                this._cache[ref] = false;
                 return;
             }
         } catch (e) {
@@ -167,7 +145,6 @@ class RepositoryManager {
             throw e;
         }
 
-        this._cache[ref] = true;
         let tasks: Task[] | undefined = undefined;
         if (!installedAsset) {
             tasks = this._install([ref]);