@kapeta/local-cluster-service 0.8.0 → 0.8.2

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [0.8.2](https://github.com/kapetacom/local-cluster-service/compare/v0.8.1...v0.8.2) (2023-07-23)
+
+
+### Bug Fixes
+
+* Check for existing cluster services on the same point and exit if it exists ([#47](https://github.com/kapetacom/local-cluster-service/issues/47)) ([3c76c3c](https://github.com/kapetacom/local-cluster-service/commit/3c76c3c24927212e4a06dc627e6c7262b2c60c4f))
+
+## [0.8.1](https://github.com/kapetacom/local-cluster-service/compare/v0.8.0...v0.8.1) (2023-07-22)
+
+
+### Bug Fixes
+
+* Removed debug ([e002caa](https://github.com/kapetacom/local-cluster-service/commit/e002caa3ae20c5a9a7f521e6e47bf46abfcb9e96))
+
 # [0.8.0](https://github.com/kapetacom/local-cluster-service/compare/v0.7.6...v0.8.0) (2023-07-22)
 
 

package/dist/cjs/index.d.ts

@@ -12,6 +12,9 @@ export type StartResult = {
 declare const _default: {
     isRunning: () => boolean;
     getCurrentPort: () => number | undefined;
+    ping: (host: string, port: number) => Promise<{
+        ok: boolean;
+    }>;
     /**
      * Starts the local cluster service.
      * resolves when listening is done with port number. Rejects if listening failed.

package/dist/cjs/index.js

@@ -21,6 +21,7 @@ const routes_7 = __importDefault(require("./src/assets/routes"));
 const routes_8 = __importDefault(require("./src/providers/routes"));
 const routes_9 = __importDefault(require("./src/attachments/routes"));
 const utils_1 = require("./src/utils/utils");
+const request_1 = __importDefault(require("request"));
 let currentServer = null;
 function createServer() {
     const app = (0, express_1.default)();
@@ -33,6 +34,18 @@ function createServer() {
     app.use('/assets', routes_7.default);
     app.use('/providers', routes_8.default);
     app.use('/attachments', routes_9.default);
+    app.get('/status', async (req, res) => {
+        res.send({
+            ok: true,
+            dockerStatus: await containerManager_1.containerManager.checkAlive(),
+            socketStatus: socketManager_1.socketManager.isAlive()
+        });
+    });
+    app.get('/ping', async (req, res) => {
+        res.send({
+            ok: true
+        });
+    });
     app.use('/', (req, res) => {
         console.error('Invalid request: %s %s', req.method, req.originalUrl);
         res.status(400).send({
@@ -61,6 +74,17 @@ exports.default = {
         }
         return currentServer.port;
     },
+    ping: async function (host, port) {
+        return new Promise((resolve, reject) => {
+            request_1.default.get(`http://${host}:${port}/ping`, (err, res, body) => {
+                if (err) {
+                    reject(err);
+                    return;
+                }
+                resolve(JSON.parse(body));
+            });
+        });
+    },
     /**
      * Starts the local cluster service.
      * resolves when listening is done with port number. Rejects if listening failed.
@@ -83,6 +107,16 @@ exports.default = {
         if (clusterHost) {
             clusterService_1.clusterService.setClusterServiceHost(clusterHost);
         }
+        let pingResult = undefined;
+        try {
+            pingResult = await this.ping(clusterHost, clusterPort);
+        }
+        catch (e) {
+            //Ignore - expected to not be running since we're starting it
+        }
+        if (pingResult?.ok) {
+            throw new Error(`Cluster service already running on: ${clusterHost}:${clusterPort}.`);
+        }
         await clusterService_1.clusterService.init();
         currentServer = createServer();
         const port = clusterService_1.clusterService.getClusterServicePort();

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

@@ -41,7 +41,6 @@ router.put('/:handle/:name', async (req, res) => {
     try {
         const { handle, name } = req.params;
         const url = `${endpoint}/${handle}/${name}/attachments`;
-        console.log('Sending PUT', url);
         const result = await api.send({
             method: 'PUT',
             url,
@@ -53,7 +52,6 @@ router.put('/:handle/:name', async (req, res) => {
             },
             body: req
         });
-        console.log('Got result from upload', result);
         res.send(result);
     }
     catch (e) {

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

@@ -30,6 +30,7 @@ declare class ContainerManager {
     private _version;
     constructor();
     initialize(): Promise<void>;
+    checkAlive(): Promise<boolean>;
     isAlive(): boolean;
     getMountPoint(kind: string, mountName: string): string;
     createMounts(kind: string, mountOpts: StringMap): StringMap;

package/dist/cjs/src/containerManager.js

@@ -77,6 +77,25 @@ class ContainerManager {
         }
         throw new Error('Could not connect to docker daemon. Please make sure docker is running and working.');
     }
+    async checkAlive() {
+        if (!this._docker) {
+            try {
+                await this.initialize();
+            }
+            catch (e) {
+                this._alive = false;
+            }
+            return this._alive;
+        }
+        try {
+            await this._docker.ping();
+            this._alive = true;
+        }
+        catch (e) {
+            this._alive = false;
+        }
+        return this._alive;
+    }
     isAlive() {
         return this._alive;
     }

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

@@ -4,6 +4,7 @@ export declare class SocketManager {
     private _sockets;
     constructor();
     setIo(io: Server): void;
+    isAlive(): boolean;
     private get io();
     emit(context: string, type: string, payload: any): void;
     _bindIO(): void;

package/dist/cjs/src/socketManager.js

@@ -14,10 +14,12 @@ class SocketManager {
         return this;
     }
     setIo(io) {
-        console.log('Socket server ready');
         this._io = io;
         this._bindIO();
     }
+    isAlive() {
+        return !!this._io;
+    }
     get io() {
         if (!this._io) {
             throw new Error('Socket server not ready');
@@ -37,11 +39,9 @@ class SocketManager {
     _bindSocket(socket) {
         socket.on('disconnect', () => this._handleSocketDestroyed(socket));
         socket.on('join', (id) => {
-            console.log('socket joined ', id);
             socket.join(id);
         });
         socket.on('leave', (id) => {
-            console.log('socket left ', id);
             socket.leave(id);
         });
     }

package/dist/cjs/start.js

@@ -9,4 +9,5 @@ index_1.default
     .then(({ host, port }) => console.log('Listening on port %s:%s', host, port))
     .catch((e) => {
     console.error('Failed to start local cluster due to an error:\n\t - %s', e.toString());
+    process.exit(1);
 });

package/dist/esm/index.d.ts

@@ -12,6 +12,9 @@ export type StartResult = {
 declare const _default: {
     isRunning: () => boolean;
     getCurrentPort: () => number | undefined;
+    ping: (host: string, port: number) => Promise<{
+        ok: boolean;
+    }>;
     /**
      * Starts the local cluster service.
      * resolves when listening is done with port number. Rejects if listening failed.

package/dist/esm/index.js

@@ -16,6 +16,7 @@ import AssetsRoutes from './src/assets/routes';
 import ProviderRoutes from './src/providers/routes';
 import AttachmentRoutes from './src/attachments/routes';
 import { getBindHost } from './src/utils/utils';
+import request from "request";
 let currentServer = null;
 function createServer() {
     const app = express();
@@ -28,6 +29,18 @@ function createServer() {
     app.use('/assets', AssetsRoutes);
     app.use('/providers', ProviderRoutes);
     app.use('/attachments', AttachmentRoutes);
+    app.get('/status', async (req, res) => {
+        res.send({
+            ok: true,
+            dockerStatus: await containerManager.checkAlive(),
+            socketStatus: socketManager.isAlive()
+        });
+    });
+    app.get('/ping', async (req, res) => {
+        res.send({
+            ok: true
+        });
+    });
     app.use('/', (req, res) => {
         console.error('Invalid request: %s %s', req.method, req.originalUrl);
         res.status(400).send({
@@ -56,6 +69,17 @@ export default {
         }
         return currentServer.port;
     },
+    ping: async function (host, port) {
+        return new Promise((resolve, reject) => {
+            request.get(`http://${host}:${port}/ping`, (err, res, body) => {
+                if (err) {
+                    reject(err);
+                    return;
+                }
+                resolve(JSON.parse(body));
+            });
+        });
+    },
     /**
      * Starts the local cluster service.
      * resolves when listening is done with port number. Rejects if listening failed.
@@ -78,6 +102,16 @@ export default {
         if (clusterHost) {
             clusterService.setClusterServiceHost(clusterHost);
         }
+        let pingResult = undefined;
+        try {
+            pingResult = await this.ping(clusterHost, clusterPort);
+        }
+        catch (e) {
+            //Ignore - expected to not be running since we're starting it
+        }
+        if (pingResult?.ok) {
+            throw new Error(`Cluster service already running on: ${clusterHost}:${clusterPort}.`);
+        }
         await clusterService.init();
         currentServer = createServer();
         const port = clusterService.getClusterServicePort();

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

@@ -36,7 +36,6 @@ router.put('/:handle/:name', async (req, res) => {
     try {
         const { handle, name } = req.params;
         const url = `${endpoint}/${handle}/${name}/attachments`;
-        console.log('Sending PUT', url);
         const result = await api.send({
             method: 'PUT',
             url,
@@ -48,7 +47,6 @@ router.put('/:handle/:name', async (req, res) => {
             },
             body: req
         });
-        console.log('Got result from upload', result);
         res.send(result);
     }
     catch (e) {

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

@@ -30,6 +30,7 @@ declare class ContainerManager {
     private _version;
     constructor();
     initialize(): Promise<void>;
+    checkAlive(): Promise<boolean>;
     isAlive(): boolean;
     getMountPoint(kind: string, mountName: string): string;
     createMounts(kind: string, mountOpts: StringMap): StringMap;

package/dist/esm/src/containerManager.js

@@ -71,6 +71,25 @@ class ContainerManager {
         }
         throw new Error('Could not connect to docker daemon. Please make sure docker is running and working.');
     }
+    async checkAlive() {
+        if (!this._docker) {
+            try {
+                await this.initialize();
+            }
+            catch (e) {
+                this._alive = false;
+            }
+            return this._alive;
+        }
+        try {
+            await this._docker.ping();
+            this._alive = true;
+        }
+        catch (e) {
+            this._alive = false;
+        }
+        return this._alive;
+    }
     isAlive() {
         return this._alive;
     }

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

@@ -4,6 +4,7 @@ export declare class SocketManager {
     private _sockets;
     constructor();
     setIo(io: Server): void;
+    isAlive(): boolean;
     private get io();
     emit(context: string, type: string, payload: any): void;
     _bindIO(): void;

package/dist/esm/src/socketManager.js

@@ -8,10 +8,12 @@ export class SocketManager {
         return this;
     }
     setIo(io) {
-        console.log('Socket server ready');
         this._io = io;
         this._bindIO();
     }
+    isAlive() {
+        return !!this._io;
+    }
     get io() {
         if (!this._io) {
             throw new Error('Socket server not ready');
@@ -31,11 +33,9 @@ export class SocketManager {
     _bindSocket(socket) {
         socket.on('disconnect', () => this._handleSocketDestroyed(socket));
         socket.on('join', (id) => {
-            console.log('socket joined ', id);
             socket.join(id);
         });
         socket.on('leave', (id) => {
-            console.log('socket left ', id);
             socket.leave(id);
         });
     }

package/dist/esm/start.js

@@ -4,4 +4,5 @@ localClusterService
     .then(({ host, port }) => console.log('Listening on port %s:%s', host, port))
     .catch((e) => {
     console.error('Failed to start local cluster due to an error:\n\t - %s', e.toString());
+    process.exit(1);
 });

package/index.ts

@@ -17,6 +17,7 @@ import AssetsRoutes from './src/assets/routes';
 import ProviderRoutes from './src/providers/routes';
 import AttachmentRoutes from './src/attachments/routes';
 import { getBindHost } from './src/utils/utils';
+import request from "request";
 
 export type LocalClusterService = HTTP.Server & { host?: string; port?: number };
 
@@ -35,6 +36,20 @@ function createServer() {
     app.use('/assets', AssetsRoutes);
     app.use('/providers', ProviderRoutes);
     app.use('/attachments', AttachmentRoutes);
+    app.get('/status', async (req, res) => {
+        res.send({
+            ok: true,
+            dockerStatus: await containerManager.checkAlive(),
+            socketStatus: socketManager.isAlive()
+        });
+    });
+
+    app.get('/ping', async (req, res) => {
+        res.send({
+            ok: true
+        });
+    });
+
     app.use('/', (req: express.Request, res: express.Response) => {
         console.error('Invalid request: %s %s', req.method, req.originalUrl);
         res.status(400).send({
@@ -42,6 +57,7 @@ function createServer() {
             error: 'Unknown'
         });
     });
+
     const server = HTTP.createServer(app);
 
     //socket
@@ -68,6 +84,19 @@ export default {
         return currentServer.port;
     },
 
+    ping: async function(host:string, port:number): Promise<{ ok:boolean }> {
+        return new Promise((resolve, reject) => {
+            request.get(`http://${host}:${port}/ping`, (err, res, body) => {
+                if (err) {
+                    reject(err);
+                    return;
+                }
+
+                resolve(JSON.parse(body));
+            })
+        })
+    },
+
     /**
      * Starts the local cluster service.
      * resolves when listening is done with port number. Rejects if listening failed.
@@ -95,6 +124,17 @@ export default {
             clusterService.setClusterServiceHost(clusterHost);
         }
 
+        let pingResult = undefined;
+        try {
+            pingResult = await this.ping(clusterHost, clusterPort);
+        } catch (e: any) {
+            //Ignore - expected to not be running since we're starting it
+        }
+
+        if (pingResult?.ok) {
+            throw new Error(`Cluster service already running on: ${clusterHost}:${clusterPort}.`);
+        }
+
         await clusterService.init();
 
         currentServer = createServer();

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@kapeta/local-cluster-service",
-    "version": "0.8.0",
+    "version": "0.8.2",
     "description": "Manages configuration, ports and service discovery for locally running Kapeta systems",
     "type": "commonjs",
     "exports": {
@@ -31,7 +31,7 @@
     },
     "scripts": {
         "start": "node ./dist/cjs/start.js",
-        "dev": "nodemon -e js,ts,json ts-node --transpile-only ./start.ts",
+        "dev": "nodemon -e js,ts,json ./start.ts",
         "test": "echo its fine",
         "clean": "rm -rf ./dist",
         "build:esm": "tsc --module esnext --outDir ./dist/esm && echo '{\"type\":\"module\"}' > ./dist/esm/package.json",
@@ -63,7 +63,6 @@
         "request": "2.88.2",
         "request-promise": "4.2.6",
         "socket.io": "^4.5.2",
-        "ts-node": "^10.9.1",
         "typescript": "^5.1.6",
         "yaml": "^1.6.0"
     },
@@ -79,7 +78,8 @@
         "eslint": "^8.42.0",
         "eslint-config-prettier": "^8.8.0",
         "nodemon": "^2.0.2",
-        "prettier": "^2.8.8"
+        "prettier": "^2.8.8",
+        "ts-node": "^10.9.1"
     },
     "prettier": "@kapeta/prettier-config",
     "release": {

package/src/attachments/routes.ts

@@ -46,7 +46,6 @@ router.put('/:handle/:name', async (req: Request, res: Response) => {
     try {
         const {handle, name} = req.params;
         const url = `${endpoint}/${handle}/${name}/attachments`;
-        console.log('Sending PUT', url);
         const result = await api.send<{url:string}>({
             method: 'PUT',
             url,
@@ -58,7 +57,6 @@ router.put('/:handle/:name', async (req: Request, res: Response) => {
             },
             body: req
         });
-        console.log('Got result from upload', result);
         res.send(result);
     } catch (e:any) {
         res.status(e.status ?? 500).send(e);

package/src/containerManager.ts

@@ -105,6 +105,26 @@ class ContainerManager {
         throw new Error('Could not connect to docker daemon. Please make sure docker is running and working.');
     }
 
+    async checkAlive() {
+        if (!this._docker) {
+            try {
+                await this.initialize();
+            } catch (e) {
+                this._alive = false;
+            }
+            return this._alive;
+        }
+
+        try {
+            await this._docker.ping()
+            this._alive = true;
+        } catch (e) {
+            this._alive = false;
+        }
+
+        return this._alive;
+    }
+
     isAlive() {
         return this._alive;
     }

package/src/socketManager.ts

@@ -12,12 +12,14 @@ export class SocketManager {
     }
 
     setIo(io: Server) {
-        console.log('Socket server ready');
         this._io = io;
-
         this._bindIO();
     }
 
+    isAlive() {
+        return !!this._io;
+    }
+
     private get io() {
         if (!this._io) {
             throw new Error('Socket server not ready');
@@ -41,11 +43,9 @@ export class SocketManager {
     _bindSocket(socket: Socket) {
         socket.on('disconnect', () => this._handleSocketDestroyed(socket));
         socket.on('join', (id) => {
-            console.log('socket joined ', id);
             socket.join(id);
         });
         socket.on('leave', (id) => {
-            console.log('socket left ', id);
             socket.leave(id);
         });
     }

package/start.ts

@@ -5,4 +5,5 @@ localClusterService
     .then(({ host, port }) => console.log('Listening on port %s:%s', host, port))
     .catch((e) => {
         console.error('Failed to start local cluster due to an error:\n\t - %s', e.toString());
+        process.exit(1);
     });