@kapeta/local-cluster-service 0.21.0 → 0.21.2

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [0.21.2](https://github.com/kapetacom/local-cluster-service/compare/v0.21.1...v0.21.2) (2023-09-19)
+
+
+### Bug Fixes
+
+* Handle windows paths in watcher ([#81](https://github.com/kapetacom/local-cluster-service/issues/81)) ([a2b7c3d](https://github.com/kapetacom/local-cluster-service/commit/a2b7c3dc9efba4d1b6d0a1a64703f7cf40ea3278))
+
+## [0.21.1](https://github.com/kapetacom/local-cluster-service/compare/v0.21.0...v0.21.1) (2023-09-19)
+
+
+### Bug Fixes
+
+* Use mounts and real paths - otherwise it fails on windows ([#80](https://github.com/kapetacom/local-cluster-service/issues/80)) ([8e73fdd](https://github.com/kapetacom/local-cluster-service/commit/8e73fddbaafcbcef547a72fd78f2b063ceed10b8))
+
 # [0.21.0](https://github.com/kapetacom/local-cluster-service/compare/v0.20.4...v0.21.0) (2023-09-17)
 
 

package/dist/cjs/src/RepositoryWatcher.js

@@ -96,7 +96,7 @@ class RepositoryWatcher extends node_events_1.EventEmitter {
         if (path.startsWith(this.baseDir)) {
             const relativePath = node_path_1.default.relative(this.baseDir, path);
             // Inside the repo we can use the path to determine the handle, name and version
-            [handle, name, version] = relativePath.split(/\//g);
+            [handle, name, version] = relativePath.split(node_path_1.default.sep);
             if (!handle || !name || !version) {
                 // Do nothing with this
                 return;
@@ -134,7 +134,6 @@ class RepositoryWatcher extends node_events_1.EventEmitter {
         if (!path) {
             return;
         }
-        //console.log('File changed', eventName, path);
         const assetIdentity = await this.getAssetIdentity(path);
         if (!assetIdentity) {
             return;
@@ -144,7 +143,7 @@ class RepositoryWatcher extends node_events_1.EventEmitter {
         }
         // If this is false it's because we're watching a symlink target
         const withinRepo = path.startsWith(this.baseDir);
-        if (withinRepo && assetIdentity.version === 'local' && path.endsWith('/local')) {
+        if (withinRepo && assetIdentity.version === 'local' && path.endsWith(node_path_1.default.sep + 'local')) {
             // This is likely a symlink target
             if (eventName === 'add') {
                 //console.log('Checking if we should add symlink target', handle, name, version, path);
@@ -244,7 +243,7 @@ class RepositoryWatcher extends node_events_1.EventEmitter {
             }
             catch (e) { }
             if (symbolicLink) {
-                const realPath = `${await fs_extra_1.default.realpath(path)}/kapeta.yml`;
+                const realPath = node_path_1.default.join(await fs_extra_1.default.realpath(path), 'kapeta.yml');
                 if (await this.exists(realPath)) {
                     //console.log('Watching symlink target %s => %s', path, realPath);
                     this.watcher?.add(realPath);
@@ -261,7 +260,7 @@ class RepositoryWatcher extends node_events_1.EventEmitter {
         if (!path.startsWith(this.baseDir)) {
             return false;
         }
-        if (path.includes('/node_modules/')) {
+        if (path.includes(node_path_1.default.sep + 'node_modules' + node_path_1.default.sep)) {
             return true;
         }
         const filename = node_path_1.default.basename(path);

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

@@ -158,6 +158,10 @@ class BlockInstanceRunner {
         if (localContainer.healthcheck) {
             HealthCheck = containerManager_1.containerManager.toDockerHealth({ cmd: localContainer.healthcheck });
         }
+        const realLocalPath = node_fs_1.default.realpathSync(baseDir);
+        const Mounts = containerManager_1.containerManager.toDockerMounts({
+            [workingDir]: (0, containerManager_1.toLocalBindVolume)(realLocalPath)
+        });
         const systemUri = (0, nodejs_utils_1.parseKapetaUri)(this._systemId);
         return this.ensureContainer({
             ...dockerOpts,
@@ -185,10 +189,10 @@ class BlockInstanceRunner {
             HostConfig: {
                 ...customHostConfigs,
                 Binds: [
-                    `${(0, containerManager_1.toLocalBindVolume)(local_cluster_config_1.default.getKapetaBasedir())}:${homeDir}/.kapeta`,
-                    `${(0, containerManager_1.toLocalBindVolume)(baseDir)}:${workingDir}`,
+                    `${(0, containerManager_1.toLocalBindVolume)(local_cluster_config_1.default.getKapetaBasedir())}:${homeDir}/.kapeta`
                 ],
                 PortBindings,
+                Mounts
             },
         });
     }

package/dist/esm/src/RepositoryWatcher.js

@@ -96,7 +96,7 @@ class RepositoryWatcher extends node_events_1.EventEmitter {
         if (path.startsWith(this.baseDir)) {
             const relativePath = node_path_1.default.relative(this.baseDir, path);
             // Inside the repo we can use the path to determine the handle, name and version
-            [handle, name, version] = relativePath.split(/\//g);
+            [handle, name, version] = relativePath.split(node_path_1.default.sep);
             if (!handle || !name || !version) {
                 // Do nothing with this
                 return;
@@ -134,7 +134,6 @@ class RepositoryWatcher extends node_events_1.EventEmitter {
         if (!path) {
             return;
         }
-        //console.log('File changed', eventName, path);
         const assetIdentity = await this.getAssetIdentity(path);
         if (!assetIdentity) {
             return;
@@ -144,7 +143,7 @@ class RepositoryWatcher extends node_events_1.EventEmitter {
         }
         // If this is false it's because we're watching a symlink target
         const withinRepo = path.startsWith(this.baseDir);
-        if (withinRepo && assetIdentity.version === 'local' && path.endsWith('/local')) {
+        if (withinRepo && assetIdentity.version === 'local' && path.endsWith(node_path_1.default.sep + 'local')) {
             // This is likely a symlink target
             if (eventName === 'add') {
                 //console.log('Checking if we should add symlink target', handle, name, version, path);
@@ -244,7 +243,7 @@ class RepositoryWatcher extends node_events_1.EventEmitter {
             }
             catch (e) { }
             if (symbolicLink) {
-                const realPath = `${await fs_extra_1.default.realpath(path)}/kapeta.yml`;
+                const realPath = node_path_1.default.join(await fs_extra_1.default.realpath(path), 'kapeta.yml');
                 if (await this.exists(realPath)) {
                     //console.log('Watching symlink target %s => %s', path, realPath);
                     this.watcher?.add(realPath);
@@ -261,7 +260,7 @@ class RepositoryWatcher extends node_events_1.EventEmitter {
         if (!path.startsWith(this.baseDir)) {
             return false;
         }
-        if (path.includes('/node_modules/')) {
+        if (path.includes(node_path_1.default.sep + 'node_modules' + node_path_1.default.sep)) {
             return true;
         }
         const filename = node_path_1.default.basename(path);

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

@@ -158,6 +158,10 @@ class BlockInstanceRunner {
         if (localContainer.healthcheck) {
             HealthCheck = containerManager_1.containerManager.toDockerHealth({ cmd: localContainer.healthcheck });
         }
+        const realLocalPath = node_fs_1.default.realpathSync(baseDir);
+        const Mounts = containerManager_1.containerManager.toDockerMounts({
+            [workingDir]: (0, containerManager_1.toLocalBindVolume)(realLocalPath)
+        });
         const systemUri = (0, nodejs_utils_1.parseKapetaUri)(this._systemId);
         return this.ensureContainer({
             ...dockerOpts,
@@ -185,10 +189,10 @@ class BlockInstanceRunner {
             HostConfig: {
                 ...customHostConfigs,
                 Binds: [
-                    `${(0, containerManager_1.toLocalBindVolume)(local_cluster_config_1.default.getKapetaBasedir())}:${homeDir}/.kapeta`,
-                    `${(0, containerManager_1.toLocalBindVolume)(baseDir)}:${workingDir}`,
+                    `${(0, containerManager_1.toLocalBindVolume)(local_cluster_config_1.default.getKapetaBasedir())}:${homeDir}/.kapeta`
                 ],
                 PortBindings,
+                Mounts
             },
         });
     }

package/package.json

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

package/src/RepositoryWatcher.ts

@@ -101,7 +101,7 @@ export class RepositoryWatcher extends EventEmitter {
         if (path.startsWith(this.baseDir)) {
             const relativePath = Path.relative(this.baseDir, path);
             // Inside the repo we can use the path to determine the handle, name and version
-            [handle, name, version] = relativePath.split(/\//g);
+            [handle, name, version] = relativePath.split(Path.sep);
             if (!handle || !name || !version) {
                 // Do nothing with this
                 return;
@@ -143,8 +143,6 @@ export class RepositoryWatcher extends EventEmitter {
             return;
         }
 
-        //console.log('File changed', eventName, path);
-
         const assetIdentity = await this.getAssetIdentity(path);
         if (!assetIdentity) {
             return;
@@ -156,7 +154,7 @@ export class RepositoryWatcher extends EventEmitter {
 
         // If this is false it's because we're watching a symlink target
         const withinRepo = path.startsWith(this.baseDir);
-        if (withinRepo && assetIdentity.version === 'local' && path.endsWith('/local')) {
+        if (withinRepo && assetIdentity.version === 'local' && path.endsWith(Path.sep + 'local')) {
             // This is likely a symlink target
             if (eventName === 'add') {
                 //console.log('Checking if we should add symlink target', handle, name, version, path);
@@ -271,7 +269,7 @@ export class RepositoryWatcher extends EventEmitter {
             } catch (e) {}
 
             if (symbolicLink) {
-                const realPath = `${await FS.realpath(path)}/kapeta.yml`;
+                const realPath = Path.join(await FS.realpath(path), 'kapeta.yml');
                 if (await this.exists(realPath)) {
                     //console.log('Watching symlink target %s => %s', path, realPath);
                     this.watcher?.add(realPath);
@@ -288,7 +286,7 @@ export class RepositoryWatcher extends EventEmitter {
         if (!path.startsWith(this.baseDir)) {
             return false;
         }
-        if (path.includes('/node_modules/')) {
+        if (path.includes(Path.sep + 'node_modules' + Path.sep)) {
             return true;
         }
 

package/src/utils/BlockInstanceRunner.ts

@@ -211,6 +211,12 @@ export class BlockInstanceRunner {
             HealthCheck = containerManager.toDockerHealth({ cmd: localContainer.healthcheck });
         }
 
+        const realLocalPath = FS.realpathSync(baseDir);
+
+        const Mounts = containerManager.toDockerMounts({
+            [workingDir]: toLocalBindVolume(realLocalPath)
+        });
+
         const systemUri = parseKapetaUri(this._systemId);
 
         return this.ensureContainer({
@@ -239,10 +245,10 @@ export class BlockInstanceRunner {
             HostConfig: {
                 ...customHostConfigs,
                 Binds: [
-                    `${toLocalBindVolume(ClusterConfig.getKapetaBasedir())}:${homeDir}/.kapeta`,
-                    `${toLocalBindVolume(baseDir)}:${workingDir}`,
+                    `${toLocalBindVolume(ClusterConfig.getKapetaBasedir())}:${homeDir}/.kapeta`
                 ],
                 PortBindings,
+                Mounts
             },
         });
     }