@kapeta/local-cluster-service 0.16.5 → 0.16.7

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [0.16.7](https://github.com/kapetacom/local-cluster-service/compare/v0.16.6...v0.16.7) (2023-08-24)
+
+
+### Bug Fixes
+
+* Load JS from provider endpoints if not available locally ([#63](https://github.com/kapetacom/local-cluster-service/issues/63)) ([83c7cb4](https://github.com/kapetacom/local-cluster-service/commit/83c7cb4a176a2b23ee5bf5e8a312e8a64abd9ea6))
+
+## [0.16.6](https://github.com/kapetacom/local-cluster-service/compare/v0.16.5...v0.16.6) (2023-08-21)
+
+
+### Bug Fixes
+
+* Add timeout when testing docker ([#62](https://github.com/kapetacom/local-cluster-service/issues/62)) ([c6e373e](https://github.com/kapetacom/local-cluster-service/commit/c6e373eab81f466b5a4fd8dbd9ca9f085f9b91de))
+
 ## [0.16.5](https://github.com/kapetacom/local-cluster-service/compare/v0.16.4...v0.16.5) (2023-08-14)
 
 

package/dist/cjs/index.js

@@ -100,6 +100,7 @@ exports.default = {
             throw new Error('Server already started');
         }
         try {
+            console.log('Testing docker runtime...');
             await containerManager_1.containerManager.initialize();
         }
         catch (e) {

package/dist/cjs/src/containerManager.js

@@ -62,7 +62,10 @@ class ContainerManager {
             ];
         for (const opts of connectOptions) {
             try {
-                const client = new node_docker_api_1.Docker(opts);
+                const client = new node_docker_api_1.Docker({
+                    ...opts,
+                    timeout: 10000,
+                });
                 await client.ping();
                 this._docker = client;
                 const versionInfo = await client.version();

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

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

package/dist/cjs/src/providerManager.js

@@ -6,9 +6,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.providerManager = void 0;
 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");
+const request_1 = __importDefault(require("request"));
+const PROVIDER_FILE_BASE = 'https://providers.kapeta.com/files';
 class ProviderManager {
     getWebProviders() {
         return definitionsManager_1.definitionsManager.getProviderDefinitions().filter((providerDefinition) => providerDefinition.hasWeb);
@@ -18,10 +19,9 @@ class ProviderManager {
         const id = `${handle}/${name}/${version}/web.js${sourceMap ? '.map' : ''}`;
         const cacheKey = `provider:web:${id}`;
         const file = cacheManager_1.cacheManager.get(cacheKey);
-        if (file && await fs_extra_1.default.pathExists(file)) {
+        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) => {
             return providerDefinition.definition.metadata.name === fullName && providerDefinition.version === version;
         });
@@ -33,7 +33,28 @@ class ProviderManager {
                 return fs_extra_1.default.readFile(path);
             }
         }
-        return null;
+        if (version === 'local') {
+            return null;
+        }
+        const url = `${PROVIDER_FILE_BASE}/${id}`;
+        return new Promise((resolve, reject) => {
+            console.log('Loading provider from %s', url);
+            request_1.default.get(url, (error, response, body) => {
+                if (error) {
+                    reject(error);
+                    return;
+                }
+                if (response.statusCode === 404) {
+                    resolve(null);
+                    return;
+                }
+                if (response.statusCode !== 200) {
+                    reject(new Error(`Failed to load provider from ${url}: ${body}`));
+                    return;
+                }
+                resolve(body);
+            });
+        });
     }
 }
 const providerDefinitions = definitionsManager_1.definitionsManager.getProviderDefinitions();
@@ -43,6 +64,7 @@ if (providerDefinitions.length > 0) {
         console.log(' - %s[%s:%s]', providerDefinition.definition.kind, providerDefinition.definition.metadata.name, providerDefinition.version);
         console.log('   from %s', providerDefinition.path);
     });
+    console.log('##');
 }
 else {
     console.log('## No providers found ##');

package/dist/esm/index.js

@@ -95,6 +95,7 @@ export default {
             throw new Error('Server already started');
         }
         try {
+            console.log('Testing docker runtime...');
             await containerManager.initialize();
         }
         catch (e) {

package/dist/esm/src/containerManager.js

@@ -56,7 +56,10 @@ class ContainerManager {
             ];
         for (const opts of connectOptions) {
             try {
-                const client = new Docker(opts);
+                const client = new Docker({
+                    ...opts,
+                    timeout: 10000,
+                });
                 await client.ping();
                 this._docker = client;
                 const versionInfo = await client.version();

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

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

package/dist/esm/src/providerManager.js

@@ -1,8 +1,9 @@
 import Path from 'path';
 import FSExtra from 'fs-extra';
-import { repositoryManager } from './repositoryManager';
 import { definitionsManager } from './definitionsManager';
-import { cacheManager } from "./cacheManager";
+import { cacheManager } from './cacheManager';
+import request from 'request';
+const PROVIDER_FILE_BASE = 'https://providers.kapeta.com/files';
 class ProviderManager {
     getWebProviders() {
         return definitionsManager.getProviderDefinitions().filter((providerDefinition) => providerDefinition.hasWeb);
@@ -12,10 +13,9 @@ class ProviderManager {
         const id = `${handle}/${name}/${version}/web.js${sourceMap ? '.map' : ''}`;
         const cacheKey = `provider:web:${id}`;
         const file = cacheManager.get(cacheKey);
-        if (file && await FSExtra.pathExists(file)) {
+        if (file && (await FSExtra.pathExists(file))) {
             return FSExtra.readFile(file, 'utf8');
         }
-        await repositoryManager.ensureAsset(handle, name, version, true);
         const installedProvider = this.getWebProviders().find((providerDefinition) => {
             return providerDefinition.definition.metadata.name === fullName && providerDefinition.version === version;
         });
@@ -27,7 +27,28 @@ class ProviderManager {
                 return FSExtra.readFile(path);
             }
         }
-        return null;
+        if (version === 'local') {
+            return null;
+        }
+        const url = `${PROVIDER_FILE_BASE}/${id}`;
+        return new Promise((resolve, reject) => {
+            console.log('Loading provider from %s', url);
+            request.get(url, (error, response, body) => {
+                if (error) {
+                    reject(error);
+                    return;
+                }
+                if (response.statusCode === 404) {
+                    resolve(null);
+                    return;
+                }
+                if (response.statusCode !== 200) {
+                    reject(new Error(`Failed to load provider from ${url}: ${body}`));
+                    return;
+                }
+                resolve(body);
+            });
+        });
     }
 }
 const providerDefinitions = definitionsManager.getProviderDefinitions();
@@ -37,6 +58,7 @@ if (providerDefinitions.length > 0) {
         console.log(' - %s[%s:%s]', providerDefinition.definition.kind, providerDefinition.definition.metadata.name, providerDefinition.version);
         console.log('   from %s', providerDefinition.path);
     });
+    console.log('##');
 }
 else {
     console.log('## No providers found ##');

package/index.ts

@@ -114,6 +114,7 @@ export default {
         }
 
         try {
+            console.log('Testing docker runtime...');
             await containerManager.initialize();
         } catch (e: any) {
             console.error(

package/package.json

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

package/src/containerManager.ts

@@ -110,7 +110,10 @@ class ContainerManager {
                   ];
         for (const opts of connectOptions) {
             try {
-                const client = new Docker(opts);
+                const client = new Docker({
+                    ...opts,
+                    timeout: 10000,
+                });
                 await client.ping();
                 this._docker = client;
                 const versionInfo: any = await client.version();

package/src/providerManager.ts

@@ -1,14 +1,12 @@
 import Path from 'path';
 import FSExtra from 'fs-extra';
-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 {
+import { cacheManager } from './cacheManager';
+import request from 'request';
 
+const PROVIDER_FILE_BASE = 'https://providers.kapeta.com/files';
 
+class ProviderManager {
     getWebProviders() {
         return definitionsManager.getProviderDefinitions().filter((providerDefinition) => providerDefinition.hasWeb);
     }
@@ -20,12 +18,10 @@ class ProviderManager {
         const cacheKey = `provider:web:${id}`;
 
         const file = cacheManager.get<string>(cacheKey);
-        if (file && await FSExtra.pathExists(file)) {
+        if (file && (await FSExtra.pathExists(file))) {
             return FSExtra.readFile(file, 'utf8');
         }
 
-        await repositoryManager.ensureAsset(handle, name, version, true);
-
         const installedProvider = this.getWebProviders().find((providerDefinition) => {
             return providerDefinition.definition.metadata.name === fullName && providerDefinition.version === version;
         });
@@ -34,12 +30,36 @@ class ProviderManager {
             //Check locally installed providers
             const path = Path.join(installedProvider.path, 'web', handle, `${name}.js${sourceMap ? '.map' : ''}`);
             if (await FSExtra.pathExists(path)) {
-                cacheManager.set(cacheKey, path, 24* 60 * 60 * 1000);
+                cacheManager.set(cacheKey, path, 24 * 60 * 60 * 1000);
                 return FSExtra.readFile(path);
             }
         }
 
-        return null;
+        if (version === 'local') {
+            return null;
+        }
+
+        const url = `${PROVIDER_FILE_BASE}/${id}`;
+        return new Promise((resolve, reject) => {
+            console.log('Loading provider from %s', url);
+            request.get(url, (error, response, body) => {
+                if (error) {
+                    reject(error);
+                    return;
+                }
+                if (response.statusCode === 404) {
+                    resolve(null);
+                    return;
+                }
+
+                if (response.statusCode !== 200) {
+                    reject(new Error(`Failed to load provider from ${url}: ${body}`));
+                    return;
+                }
+
+                resolve(body);
+            });
+        });
     }
 }
 
@@ -56,6 +76,7 @@ if (providerDefinitions.length > 0) {
         );
         console.log('   from %s', providerDefinition.path);
     });
+    console.log('##');
 } else {
     console.log('## No providers found ##');
 }