@kapeta/local-cluster-service 0.7.5 → 0.7.6

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [0.7.6](https://github.com/kapetacom/local-cluster-service/compare/v0.7.5...v0.7.6) (2023-07-17)
+
+
+### Bug Fixes
+
+* Adjustments to make docker interaction work on Linux ([#45](https://github.com/kapetacom/local-cluster-service/issues/45)) ([4c9530c](https://github.com/kapetacom/local-cluster-service/commit/4c9530c1a509c490e95cc16029202650f79e127e))
+
 ## [0.7.5](https://github.com/kapetacom/local-cluster-service/compare/v0.7.4...v0.7.5) (2023-07-17)
 
 

package/definitions.d.ts

@@ -5,6 +5,10 @@ declare module '@kapeta/nodejs-api-client' {
     }
 }
 
+declare module 'recursive-watch' {
+    export default function watch(path:string, callback:(filename:string) => void):() => void;
+}
+
 declare module '@kapeta/nodejs-registry-utils' {
     import { Dependency, Kind } from '@kapeta/schemas';
 
@@ -16,7 +20,7 @@ declare module '@kapeta/nodejs-registry-utils' {
     export class RegistryService {
         constructor(url: string);
 
-        async getVersion(fullName: string, version: string): Promise<AssetVersion>;
+        getVersion(fullName: string, version: string): Promise<AssetVersion>;
     }
 
     export const Config: any;

package/dist/cjs/index.js

@@ -19,6 +19,7 @@ const routes_5 = __importDefault(require("./src/identities/routes"));
 const routes_6 = __importDefault(require("./src/filesystem/routes"));
 const routes_7 = __importDefault(require("./src/assets/routes"));
 const routes_8 = __importDefault(require("./src/providers/routes"));
+const utils_1 = require("./src/utils/utils");
 let currentServer = null;
 function createServer() {
     const app = (0, express_1.default)();
@@ -30,11 +31,11 @@ function createServer() {
     app.use('/files', routes_6.default);
     app.use('/assets', routes_7.default);
     app.use('/providers', routes_8.default);
-    app.use('/', (err, req, res) => {
-        console.error('Request failed: %s %s', req.method, req.originalUrl, err);
-        res.status(500).send({
+    app.use('/', (req, res) => {
+        console.error('Invalid request: %s %s', req.method, req.originalUrl);
+        res.status(400).send({
             ok: false,
-            error: err.error ?? err.message,
+            error: 'Unknown'
         });
     });
     const server = http_1.default.createServer(app);
@@ -90,7 +91,7 @@ exports.default = {
         if (clusterHost !== host) {
             storageService_1.storageService.put('cluster', 'host', host);
         }
-        return new Promise((resolve, reject) => {
+        return new Promise(async (resolve, reject) => {
             if (!currentServer) {
                 reject(new Error(`Current server wasn't set`));
                 return;
@@ -102,7 +103,8 @@ exports.default = {
                 }
                 reject(err);
             });
-            currentServer.listen(port, host, () => resolve({ host, port, dockerStatus: containerManager_1.containerManager.isAlive() }));
+            const bindHost = (0, utils_1.getBindHost)(host);
+            currentServer.listen(port, bindHost, () => resolve({ host, port, dockerStatus: containerManager_1.containerManager.isAlive() }));
             currentServer.host = host;
             currentServer.port = port;
         });

package/dist/cjs/src/containerManager.js

@@ -12,6 +12,7 @@ const fs_extra_1 = __importDefault(require("fs-extra"));
 const node_docker_api_1 = require("node-docker-api");
 const nodejs_utils_1 = require("@kapeta/nodejs-utils");
 const local_cluster_config_1 = __importDefault(require("@kapeta/local-cluster-config"));
+const utils_1 = require("./utils/utils");
 const LABEL_PORT_PREFIX = 'kapeta_port-';
 const NANO_SECOND = 1000000;
 const HEALTH_CHECK_INTERVAL = 2000;
@@ -61,7 +62,11 @@ class ContainerManager {
                 await client.ping();
                 this._docker = client;
                 const versionInfo = await client.version();
-                this._version = versionInfo.Server?.Version;
+                this._version = versionInfo.Server?.Version ?? versionInfo.Version;
+                if (!this._version) {
+                    console.warn('Failed to determine version from response', versionInfo);
+                    this._version = '0.0.0';
+                }
                 this._alive = true;
                 console.log('Connected to docker daemon with version: %s', this._version);
                 return;
@@ -171,13 +176,14 @@ class ContainerManager {
             kapeta: 'true',
         };
         await this.pull(image);
+        const bindHost = (0, utils_1.getBindHost)();
         const ExposedPorts = {};
         lodash_1.default.forEach(opts.ports, (portInfo, containerPort) => {
             ExposedPorts['' + containerPort] = {};
             PortBindings['' + containerPort] = [
                 {
                     HostPort: '' + portInfo.hostPort,
-                    HostIp: '127.0.0.1',
+                    HostIp: bindHost,
                 },
             ];
             Labels[LABEL_PORT_PREFIX + portInfo.hostPort] = portInfo.type;

package/dist/cjs/src/repositoryManager.js

@@ -7,6 +7,7 @@ exports.repositoryManager = void 0;
 const node_fs_1 = __importDefault(require("node:fs"));
 const node_os_1 = __importDefault(require("node:os"));
 const node_path_1 = __importDefault(require("node:path"));
+const recursive_watch_1 = __importDefault(require("recursive-watch"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const local_cluster_config_1 = __importDefault(require("@kapeta/local-cluster-config"));
 const nodejs_utils_1 = require("@kapeta/nodejs-utils");
@@ -39,70 +40,69 @@ class RepositoryManager {
         let allDefinitions = local_cluster_config_1.default.getDefinitions();
         console.log('Watching local repository for provider changes: %s', baseDir);
         try {
-            this.watcher = node_fs_1.default.watch(baseDir, { recursive: true });
-        }
-        catch (e) {
-            // Fallback to run without watch mode due to potential platform issues.
-            // https://nodejs.org/docs/latest/api/fs.html#caveats
-            console.log('Unable to watch for changes. Changes to assets will not update automatically.');
-            return;
-        }
-        this.watcher.on('change', (eventType, filename) => {
-            if (!filename) {
-                return;
-            }
-            const [handle, name, version] = filename.toString().split(/\//g);
-            if (!name || !version) {
-                return;
-            }
-            if (!this.changeEventsEnabled) {
-                return;
-            }
-            const ymlPath = node_path_1.default.join(baseDir, handle, name, version, 'kapeta.yml');
-            const newDefinitions = local_cluster_config_1.default.getDefinitions();
-            const newDefinition = newDefinitions.find((d) => d.ymlPath === ymlPath);
-            let currentDefinition = allDefinitions.find((d) => d.ymlPath === ymlPath);
-            const ymlExists = node_fs_1.default.existsSync(ymlPath);
-            let type;
-            if (ymlExists) {
-                if (currentDefinition) {
-                    type = 'updated';
+            this.watcher = (0, recursive_watch_1.default)(baseDir, (filename) => {
+                if (!filename) {
+                    return;
                 }
-                else if (newDefinition) {
-                    type = 'added';
-                    currentDefinition = newDefinition;
+                const [handle, name, version] = filename.toString().split(/\//g);
+                if (!name || !version) {
+                    return;
                 }
-                else {
-                    //Other definition was added / updated - ignore
+                if (!this.changeEventsEnabled) {
                     return;
                 }
-            }
-            else {
-                if (currentDefinition) {
-                    const ref = (0, nodejs_utils_1.parseKapetaUri)(`${currentDefinition.definition.metadata.name}:${currentDefinition.version}`).id;
-                    delete INSTALL_ATTEMPTED[ref];
-                    //Something was removed
-                    type = 'removed';
+                const ymlPath = node_path_1.default.join(baseDir, handle, name, version, 'kapeta.yml');
+                const newDefinitions = local_cluster_config_1.default.getDefinitions();
+                const newDefinition = newDefinitions.find((d) => d.ymlPath === ymlPath);
+                let currentDefinition = allDefinitions.find((d) => d.ymlPath === ymlPath);
+                const ymlExists = node_fs_1.default.existsSync(ymlPath);
+                let type;
+                if (ymlExists) {
+                    if (currentDefinition) {
+                        type = 'updated';
+                    }
+                    else if (newDefinition) {
+                        type = 'added';
+                        currentDefinition = newDefinition;
+                    }
+                    else {
+                        //Other definition was added / updated - ignore
+                        return;
+                    }
                 }
                 else {
-                    //Other definition was removed - ignore
-                    return;
+                    if (currentDefinition) {
+                        const ref = (0, nodejs_utils_1.parseKapetaUri)(`${currentDefinition.definition.metadata.name}:${currentDefinition.version}`).id;
+                        delete INSTALL_ATTEMPTED[ref];
+                        //Something was removed
+                        type = 'removed';
+                    }
+                    else {
+                        //Other definition was removed - ignore
+                        return;
+                    }
                 }
-            }
-            const payload = {
-                type,
-                definition: currentDefinition?.definition,
-                asset: { handle, name, version },
-            };
-            allDefinitions = newDefinitions;
-            socketManager_1.socketManager.emit(`assets`, 'changed', payload);
-        });
+                const payload = {
+                    type,
+                    definition: currentDefinition?.definition,
+                    asset: { handle, name, version },
+                };
+                allDefinitions = newDefinitions;
+                socketManager_1.socketManager.emit(`assets`, 'changed', payload);
+            });
+        }
+        catch (e) {
+            // Fallback to run without watch mode due to potential platform issues.
+            // https://nodejs.org/docs/latest/api/fs.html#caveats
+            console.log('Unable to watch for changes. Changes to assets will not update automatically.', e);
+            return;
+        }
     }
     stopListening() {
         if (!this.watcher) {
             return;
         }
-        this.watcher.close();
+        this.watcher();
         this.watcher = undefined;
     }
     async _install(refs) {

package/dist/cjs/src/utils/BlockInstanceRunner.js

@@ -160,6 +160,7 @@ class BlockInstanceRunner {
         const dockerOpts = localContainer.options ?? {};
         const homeDir = localContainer.userHome ? localContainer.userHome : '/root';
         const workingDir = localContainer.workingDir ? localContainer.workingDir : '/workspace';
+        const bindHost = (0, utils_1.getBindHost)();
         const ExposedPorts = {};
         const addonEnv = {};
         const PortBindings = {};
@@ -173,7 +174,7 @@ class BlockInstanceRunner {
             addonEnv[`KAPETA_LOCAL_SERVER_PORT_${portType.toUpperCase()}`] = '' + thisPort;
             PortBindings[dockerPort] = [
                 {
-                    HostIp: '127.0.0.1',
+                    HostIp: bindHost,
                     HostPort: `${publicPort}`,
                 },
             ];
@@ -390,6 +391,7 @@ class BlockInstanceRunner {
                 }
             }
         }
+        const bindHost = (0, utils_1.getBindHost)();
         if (!container) {
             const ExposedPorts = {};
             const addonEnv = {};
@@ -403,7 +405,7 @@ class BlockInstanceRunner {
                 const publicPort = await serviceManager_1.serviceManager.ensureServicePort(this._systemId, blockInstance.id, portType);
                 PortBindings[dockerPort] = [
                     {
-                        HostIp: '127.0.0.1',
+                        HostIp: bindHost,
                         HostPort: `${publicPort}`,
                     },
                 ];

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

@@ -1 +1,5 @@
 export declare function readYML(path: string): any;
+export declare function isWindows(): boolean;
+export declare function isMac(): boolean;
+export declare function isLinux(): boolean;
+export declare function getBindHost(preferredHost?: string): string;

package/dist/cjs/src/utils/utils.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.readYML = void 0;
+exports.getBindHost = exports.isLinux = exports.isMac = exports.isWindows = exports.readYML = void 0;
 const node_fs_1 = __importDefault(require("node:fs"));
 const yaml_1 = __importDefault(require("yaml"));
 function readYML(path) {
@@ -16,3 +16,21 @@ function readYML(path) {
     }
 }
 exports.readYML = readYML;
+function isWindows() {
+    return 'win32' === process.platform;
+}
+exports.isWindows = isWindows;
+function isMac() {
+    return 'darwin' === process.platform;
+}
+exports.isMac = isMac;
+function isLinux() {
+    return !isWindows() && !isMac();
+}
+exports.isLinux = isLinux;
+function getBindHost(preferredHost = '127.0.0.1') {
+    // On Linux we need to bind to 0.0.0.0 to be able to connect to it from docker containers. 
+    // TODO: This might pose a security risk - so we should authenticate all requests using a shared secret/nonce that we pass around.
+    return isLinux() ? '0.0.0.0' : preferredHost;
+}
+exports.getBindHost = getBindHost;

package/dist/esm/index.js

@@ -14,6 +14,7 @@ import IdentitiesRoutes from './src/identities/routes';
 import FilesystemRoutes from './src/filesystem/routes';
 import AssetsRoutes from './src/assets/routes';
 import ProviderRoutes from './src/providers/routes';
+import { getBindHost } from './src/utils/utils';
 let currentServer = null;
 function createServer() {
     const app = express();
@@ -25,11 +26,11 @@ function createServer() {
     app.use('/files', FilesystemRoutes);
     app.use('/assets', AssetsRoutes);
     app.use('/providers', ProviderRoutes);
-    app.use('/', (err, req, res) => {
-        console.error('Request failed: %s %s', req.method, req.originalUrl, err);
-        res.status(500).send({
+    app.use('/', (req, res) => {
+        console.error('Invalid request: %s %s', req.method, req.originalUrl);
+        res.status(400).send({
             ok: false,
-            error: err.error ?? err.message,
+            error: 'Unknown'
         });
     });
     const server = HTTP.createServer(app);
@@ -85,7 +86,7 @@ export default {
         if (clusterHost !== host) {
             storageService.put('cluster', 'host', host);
         }
-        return new Promise((resolve, reject) => {
+        return new Promise(async (resolve, reject) => {
             if (!currentServer) {
                 reject(new Error(`Current server wasn't set`));
                 return;
@@ -97,7 +98,8 @@ export default {
                 }
                 reject(err);
             });
-            currentServer.listen(port, host, () => resolve({ host, port, dockerStatus: containerManager.isAlive() }));
+            const bindHost = getBindHost(host);
+            currentServer.listen(port, bindHost, () => resolve({ host, port, dockerStatus: containerManager.isAlive() }));
             currentServer.host = host;
             currentServer.port = port;
         });

package/dist/esm/src/containerManager.js

@@ -6,6 +6,7 @@ import FSExtra from 'fs-extra';
 import { Docker } from 'node-docker-api';
 import { parseKapetaUri } from '@kapeta/nodejs-utils';
 import ClusterConfiguration from '@kapeta/local-cluster-config';
+import { getBindHost } from './utils/utils';
 const LABEL_PORT_PREFIX = 'kapeta_port-';
 const NANO_SECOND = 1000000;
 const HEALTH_CHECK_INTERVAL = 2000;
@@ -55,7 +56,11 @@ class ContainerManager {
                 await client.ping();
                 this._docker = client;
                 const versionInfo = await client.version();
-                this._version = versionInfo.Server?.Version;
+                this._version = versionInfo.Server?.Version ?? versionInfo.Version;
+                if (!this._version) {
+                    console.warn('Failed to determine version from response', versionInfo);
+                    this._version = '0.0.0';
+                }
                 this._alive = true;
                 console.log('Connected to docker daemon with version: %s', this._version);
                 return;
@@ -165,13 +170,14 @@ class ContainerManager {
             kapeta: 'true',
         };
         await this.pull(image);
+        const bindHost = getBindHost();
         const ExposedPorts = {};
         _.forEach(opts.ports, (portInfo, containerPort) => {
             ExposedPorts['' + containerPort] = {};
             PortBindings['' + containerPort] = [
                 {
                     HostPort: '' + portInfo.hostPort,
-                    HostIp: '127.0.0.1',
+                    HostIp: bindHost,
                 },
             ];
             Labels[LABEL_PORT_PREFIX + portInfo.hostPort] = portInfo.type;

package/dist/esm/src/repositoryManager.js

@@ -1,6 +1,7 @@
 import FS from 'node:fs';
 import os from 'node:os';
 import Path from 'node:path';
+import watch from 'recursive-watch';
 import FSExtra from 'fs-extra';
 import ClusterConfiguration from '@kapeta/local-cluster-config';
 import { parseKapetaUri } from '@kapeta/nodejs-utils';
@@ -33,70 +34,69 @@ class RepositoryManager {
         let allDefinitions = ClusterConfiguration.getDefinitions();
         console.log('Watching local repository for provider changes: %s', baseDir);
         try {
-            this.watcher = FS.watch(baseDir, { recursive: true });
-        }
-        catch (e) {
-            // Fallback to run without watch mode due to potential platform issues.
-            // https://nodejs.org/docs/latest/api/fs.html#caveats
-            console.log('Unable to watch for changes. Changes to assets will not update automatically.');
-            return;
-        }
-        this.watcher.on('change', (eventType, filename) => {
-            if (!filename) {
-                return;
-            }
-            const [handle, name, version] = filename.toString().split(/\//g);
-            if (!name || !version) {
-                return;
-            }
-            if (!this.changeEventsEnabled) {
-                return;
-            }
-            const ymlPath = Path.join(baseDir, handle, name, version, 'kapeta.yml');
-            const newDefinitions = ClusterConfiguration.getDefinitions();
-            const newDefinition = newDefinitions.find((d) => d.ymlPath === ymlPath);
-            let currentDefinition = allDefinitions.find((d) => d.ymlPath === ymlPath);
-            const ymlExists = FS.existsSync(ymlPath);
-            let type;
-            if (ymlExists) {
-                if (currentDefinition) {
-                    type = 'updated';
+            this.watcher = watch(baseDir, (filename) => {
+                if (!filename) {
+                    return;
                 }
-                else if (newDefinition) {
-                    type = 'added';
-                    currentDefinition = newDefinition;
+                const [handle, name, version] = filename.toString().split(/\//g);
+                if (!name || !version) {
+                    return;
                 }
-                else {
-                    //Other definition was added / updated - ignore
+                if (!this.changeEventsEnabled) {
                     return;
                 }
-            }
-            else {
-                if (currentDefinition) {
-                    const ref = parseKapetaUri(`${currentDefinition.definition.metadata.name}:${currentDefinition.version}`).id;
-                    delete INSTALL_ATTEMPTED[ref];
-                    //Something was removed
-                    type = 'removed';
+                const ymlPath = Path.join(baseDir, handle, name, version, 'kapeta.yml');
+                const newDefinitions = ClusterConfiguration.getDefinitions();
+                const newDefinition = newDefinitions.find((d) => d.ymlPath === ymlPath);
+                let currentDefinition = allDefinitions.find((d) => d.ymlPath === ymlPath);
+                const ymlExists = FS.existsSync(ymlPath);
+                let type;
+                if (ymlExists) {
+                    if (currentDefinition) {
+                        type = 'updated';
+                    }
+                    else if (newDefinition) {
+                        type = 'added';
+                        currentDefinition = newDefinition;
+                    }
+                    else {
+                        //Other definition was added / updated - ignore
+                        return;
+                    }
                 }
                 else {
-                    //Other definition was removed - ignore
-                    return;
+                    if (currentDefinition) {
+                        const ref = parseKapetaUri(`${currentDefinition.definition.metadata.name}:${currentDefinition.version}`).id;
+                        delete INSTALL_ATTEMPTED[ref];
+                        //Something was removed
+                        type = 'removed';
+                    }
+                    else {
+                        //Other definition was removed - ignore
+                        return;
+                    }
                 }
-            }
-            const payload = {
-                type,
-                definition: currentDefinition?.definition,
-                asset: { handle, name, version },
-            };
-            allDefinitions = newDefinitions;
-            socketManager.emit(`assets`, 'changed', payload);
-        });
+                const payload = {
+                    type,
+                    definition: currentDefinition?.definition,
+                    asset: { handle, name, version },
+                };
+                allDefinitions = newDefinitions;
+                socketManager.emit(`assets`, 'changed', payload);
+            });
+        }
+        catch (e) {
+            // Fallback to run without watch mode due to potential platform issues.
+            // https://nodejs.org/docs/latest/api/fs.html#caveats
+            console.log('Unable to watch for changes. Changes to assets will not update automatically.', e);
+            return;
+        }
     }
     stopListening() {
         if (!this.watcher) {
             return;
         }
-        this.watcher.close();
+        this.watcher();
         this.watcher = undefined;
     }
     async _install(refs) {

package/dist/esm/src/utils/BlockInstanceRunner.js

@@ -1,6 +1,6 @@
 import FS from 'node:fs';
 import ClusterConfig from '@kapeta/local-cluster-config';
-import { readYML } from './utils';
+import { getBindHost, readYML } from './utils';
 import { parseKapetaUri } from '@kapeta/nodejs-utils';
 import { serviceManager } from '../serviceManager';
 import { containerManager, toLocalBindVolume } from '../containerManager';
@@ -154,6 +154,7 @@ export class BlockInstanceRunner {
         const dockerOpts = localContainer.options ?? {};
         const homeDir = localContainer.userHome ? localContainer.userHome : '/root';
         const workingDir = localContainer.workingDir ? localContainer.workingDir : '/workspace';
+        const bindHost = getBindHost();
         const ExposedPorts = {};
         const addonEnv = {};
         const PortBindings = {};
@@ -167,7 +168,7 @@ export class BlockInstanceRunner {
             addonEnv[`KAPETA_LOCAL_SERVER_PORT_${portType.toUpperCase()}`] = '' + thisPort;
             PortBindings[dockerPort] = [
                 {
-                    HostIp: '127.0.0.1',
+                    HostIp: bindHost,
                     HostPort: `${publicPort}`,
                 },
             ];
@@ -384,6 +385,7 @@ export class BlockInstanceRunner {
                 }
             }
         }
+        const bindHost = getBindHost();
         if (!container) {
             const ExposedPorts = {};
             const addonEnv = {};
@@ -397,7 +399,7 @@ export class BlockInstanceRunner {
                 const publicPort = await serviceManager.ensureServicePort(this._systemId, blockInstance.id, portType);
                 PortBindings[dockerPort] = [
                     {
-                        HostIp: '127.0.0.1',
+                        HostIp: bindHost,
                         HostPort: `${publicPort}`,
                     },
                 ];

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

@@ -1 +1,5 @@
 export declare function readYML(path: string): any;
+export declare function isWindows(): boolean;
+export declare function isMac(): boolean;
+export declare function isLinux(): boolean;
+export declare function getBindHost(preferredHost?: string): string;

package/dist/esm/src/utils/utils.js

@@ -9,3 +9,17 @@ export function readYML(path) {
         throw new Error('Failed to parse plan YAML: ' + err);
     }
 }
+export function isWindows() {
+    return 'win32' === process.platform;
+}
+export function isMac() {
+    return 'darwin' === process.platform;
+}
+export function isLinux() {
+    return !isWindows() && !isMac();
+}
+export function getBindHost(preferredHost = '127.0.0.1') {
+    // On Linux we need to bind to 0.0.0.0 to be able to connect to it from docker containers. 
+    // TODO: This might pose a security risk - so we should authenticate all requests using a shared secret/nonce that we pass around.
+    return isLinux() ? '0.0.0.0' : preferredHost;
+}

package/index.ts

@@ -15,6 +15,7 @@ import IdentitiesRoutes from './src/identities/routes';
 import FilesystemRoutes from './src/filesystem/routes';
 import AssetsRoutes from './src/assets/routes';
 import ProviderRoutes from './src/providers/routes';
+import { getBindHost } from './src/utils/utils';
 
 export type LocalClusterService = HTTP.Server & { host?: string; port?: number };
 
@@ -32,11 +33,11 @@ function createServer() {
     app.use('/files', FilesystemRoutes);
     app.use('/assets', AssetsRoutes);
     app.use('/providers', ProviderRoutes);
-    app.use('/', (err: any, req: express.Request, res: express.Response) => {
-        console.error('Request failed: %s %s', req.method, req.originalUrl, err);
-        res.status(500).send({
+    app.use('/', (req: express.Request, res: express.Response) => {
+        console.error('Invalid request: %s %s', req.method, req.originalUrl);
+        res.status(400).send({
             ok: false,
-            error: err.error ?? err.message,
+            error: 'Unknown'
         });
     });
     const server = HTTP.createServer(app);
@@ -108,7 +109,7 @@ export default {
             storageService.put('cluster', 'host', host);
         }
 
-        return new Promise((resolve, reject) => {
+        return new Promise(async (resolve, reject) => {
             if (!currentServer) {
                 reject(new Error(`Current server wasn't set`));
                 return;
@@ -121,7 +122,9 @@ export default {
                 reject(err);
             });
 
-            currentServer.listen(port, host, () => resolve({ host, port, dockerStatus: containerManager.isAlive() }));
+            const bindHost = getBindHost(host);
+
+            currentServer.listen(port, bindHost, () => resolve({ host, port, dockerStatus: containerManager.isAlive() }));
             currentServer.host = host;
             currentServer.port = port;
         });

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@kapeta/local-cluster-service",
-    "version": "0.7.5",
+    "version": "0.7.6",
     "description": "Manages configuration, ports and service discovery for locally running Kapeta systems",
     "type": "commonjs",
     "exports": {
@@ -59,6 +59,7 @@
         "node-cache": "^5.1.2",
         "node-docker-api": "1.1.22",
         "node-uuid": "^1.4.8",
+        "recursive-watch": "^1.1.4",
         "request": "2.88.2",
         "request-promise": "4.2.6",
         "socket.io": "^4.5.2",

package/src/containerManager.ts

@@ -7,6 +7,7 @@ import { Docker } from 'node-docker-api';
 import { parseKapetaUri } from '@kapeta/nodejs-utils';
 import ClusterConfiguration from '@kapeta/local-cluster-config';
 import { Container } from 'node-docker-api/lib/container';
+import { getBindHost } from './utils/utils';
 
 type StringMap = { [key: string]: string };
 
@@ -88,7 +89,11 @@ class ContainerManager {
                 await client.ping();
                 this._docker = client;
                 const versionInfo: any = await client.version();
-                this._version = versionInfo.Server?.Version;
+                this._version = versionInfo.Server?.Version ?? versionInfo.Version;
+                if (!this._version) {
+                    console.warn('Failed to determine version from response', versionInfo);
+                    this._version = '0.0.0';
+                }
                 this._alive = true;
                 console.log('Connected to docker daemon with version: %s', this._version);
                 return;
@@ -226,6 +231,8 @@ class ContainerManager {
 
         await this.pull(image);
 
+        const bindHost = getBindHost();
+
         const ExposedPorts: { [key: string]: any } = {};
 
         _.forEach(opts.ports, (portInfo: any, containerPort) => {
@@ -233,7 +240,7 @@ class ContainerManager {
             PortBindings['' + containerPort] = [
                 {
                     HostPort: '' + portInfo.hostPort,
-                    HostIp: '127.0.0.1',
+                    HostIp: bindHost,
                 },
             ];
 

package/src/repositoryManager.ts

@@ -1,6 +1,7 @@
 import FS from 'node:fs';
 import os from 'node:os';
 import Path from 'node:path';
+import watch from 'recursive-watch';
 import FSExtra, { FSWatcher } from 'fs-extra';
 import ClusterConfiguration from '@kapeta/local-cluster-config';
 import { parseKapetaUri } from '@kapeta/nodejs-utils';
@@ -15,7 +16,7 @@ class RepositoryManager {
     private changeEventsEnabled: boolean;
     private _registryService: RegistryService;
     private _cache: { [key: string]: boolean };
-    private watcher?: FSWatcher;
+    private watcher?: () => void;
     private _installQueue: (() => Promise<void>)[];
     private _processing: boolean = false;
     constructor() {
@@ -40,74 +41,73 @@ class RepositoryManager {
 
         console.log('Watching local repository for provider changes: %s', baseDir);
         try {
-            this.watcher = FS.watch(baseDir, { recursive: true });
+            this.watcher = watch(baseDir, (filename:string) => {
+                if (!filename) {
+                    return;
+                }
+    
+                const [handle, name, version] = filename.toString().split(/\//g);
+                if (!name || !version) {
+                    return;
+                }
+    
+                if (!this.changeEventsEnabled) {
+                    return;
+                }
+    
+                const ymlPath = Path.join(baseDir, handle, name, version, 'kapeta.yml');
+                const newDefinitions = ClusterConfiguration.getDefinitions();
+    
+                const newDefinition = newDefinitions.find((d) => d.ymlPath === ymlPath);
+                let currentDefinition = allDefinitions.find((d) => d.ymlPath === ymlPath);
+                const ymlExists = FS.existsSync(ymlPath);
+                let type;
+                if (ymlExists) {
+                    if (currentDefinition) {
+                        type = 'updated';
+                    } else if (newDefinition) {
+                        type = 'added';
+                        currentDefinition = newDefinition;
+                    } else {
+                        //Other definition was added / updated - ignore
+                        return;
+                    }
+                } else {
+                    if (currentDefinition) {
+                        const ref = parseKapetaUri(
+                            `${currentDefinition.definition.metadata.name}:${currentDefinition.version}`
+                        ).id;
+                        delete INSTALL_ATTEMPTED[ref];
+                        //Something was removed
+                        type = 'removed';
+                    } else {
+                        //Other definition was removed - ignore
+                        return;
+                    }
+                }
+    
+                const payload = {
+                    type,
+                    definition: currentDefinition?.definition,
+                    asset: { handle, name, version },
+                };
+    
+                allDefinitions = newDefinitions;
+                socketManager.emit(`assets`, 'changed', payload);
+            });
         } catch (e) {
             // Fallback to run without watch mode due to potential platform issues.
             // https://nodejs.org/docs/latest/api/fs.html#caveats
-            console.log('Unable to watch for changes. Changes to assets will not update automatically.');
+            console.log('Unable to watch for changes. Changes to assets will not update automatically.', e);
             return;
         }
-        this.watcher.on('change', (eventType, filename) => {
-            if (!filename) {
-                return;
-            }
-
-            const [handle, name, version] = filename.toString().split(/\//g);
-            if (!name || !version) {
-                return;
-            }
-
-            if (!this.changeEventsEnabled) {
-                return;
-            }
-
-            const ymlPath = Path.join(baseDir, handle, name, version, 'kapeta.yml');
-            const newDefinitions = ClusterConfiguration.getDefinitions();
-
-            const newDefinition = newDefinitions.find((d) => d.ymlPath === ymlPath);
-            let currentDefinition = allDefinitions.find((d) => d.ymlPath === ymlPath);
-            const ymlExists = FS.existsSync(ymlPath);
-            let type;
-            if (ymlExists) {
-                if (currentDefinition) {
-                    type = 'updated';
-                } else if (newDefinition) {
-                    type = 'added';
-                    currentDefinition = newDefinition;
-                } else {
-                    //Other definition was added / updated - ignore
-                    return;
-                }
-            } else {
-                if (currentDefinition) {
-                    const ref = parseKapetaUri(
-                        `${currentDefinition.definition.metadata.name}:${currentDefinition.version}`
-                    ).id;
-                    delete INSTALL_ATTEMPTED[ref];
-                    //Something was removed
-                    type = 'removed';
-                } else {
-                    //Other definition was removed - ignore
-                    return;
-                }
-            }
-
-            const payload = {
-                type,
-                definition: currentDefinition?.definition,
-                asset: { handle, name, version },
-            };
-
-            allDefinitions = newDefinitions;
-            socketManager.emit(`assets`, 'changed', payload);
-        });
     }
 
     stopListening() {
         if (!this.watcher) {
             return;
         }
-        this.watcher.close();
+        this.watcher();
         this.watcher = undefined;
     }
 

package/src/utils/BlockInstanceRunner.ts

@@ -1,6 +1,6 @@
 import FS from 'node:fs';
 import ClusterConfig, { DefinitionInfo } from '@kapeta/local-cluster-config';
-import { readYML } from './utils';
+import { getBindHost, readYML } from './utils';
 import { KapetaURI, parseKapetaUri } from '@kapeta/nodejs-utils';
 import { serviceManager } from '../serviceManager';
 import { containerManager, DockerMounts, toLocalBindVolume } from '../containerManager';
@@ -199,6 +199,8 @@ export class BlockInstanceRunner {
         const homeDir = localContainer.userHome ? localContainer.userHome : '/root';
         const workingDir = localContainer.workingDir ? localContainer.workingDir : '/workspace';
 
+        const bindHost = getBindHost();
+
         const ExposedPorts: AnyMap = {};
         const addonEnv: StringMap = {};
         const PortBindings: AnyMap = {};
@@ -214,7 +216,7 @@ export class BlockInstanceRunner {
 
             PortBindings[dockerPort] = [
                 {
-                    HostIp: '127.0.0.1', //No public
+                    HostIp: bindHost, 
                     HostPort: `${publicPort}`,
                 },
             ];
@@ -464,6 +466,8 @@ export class BlockInstanceRunner {
             }
         }
 
+        const bindHost = getBindHost();
+
         if (!container) {
             const ExposedPorts: AnyMap = {};
             const addonEnv: StringMap = {};
@@ -482,7 +486,7 @@ export class BlockInstanceRunner {
                     );
                     PortBindings[dockerPort] = [
                         {
-                            HostIp: '127.0.0.1', //No public
+                            HostIp: bindHost,
                             HostPort: `${publicPort}`,
                         },
                     ];

package/src/utils/utils.ts

@@ -10,3 +10,21 @@ export function readYML(path: string) {
         throw new Error('Failed to parse plan YAML: ' + err);
     }
 }
+
+export function isWindows() {
+    return 'win32' === process.platform;
+}
+
+export function isMac() {
+    return 'darwin' === process.platform;
+}
+
+export function isLinux() {
+    return !isWindows() && !isMac();
+}
+
+export function getBindHost(preferredHost = '127.0.0.1') {
+    // On Linux we need to bind to 0.0.0.0 to be able to connect to it from docker containers. 
+    // TODO: This might pose a security risk - so we should authenticate all requests using a shared secret/nonce that we pass around.
+    return isLinux() ? '0.0.0.0' : preferredHost;
+}