Merge branch 'development'

package.json

@@ -1,6 +1,6 @@
 {
   "name": "my-server-status",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "REST API to get information about your server",
   "main": "src/index.ts",
   "scripts": {
@@ -18,7 +18,7 @@
     "dotenv": "^16.0.3",
     "execa": "^5.1.1",
     "express": "^4.18.2",
-    "systeminformation": "^5.17.12"
+    "systeminformation": "^5.18.4"
   },
   "optionalDependencies": {
     "osx-temperature-sensor": "^1.0.8"

src/config/data.json

@@ -138,5 +138,10 @@
       "cpus"
     ],
     "network": ["iface", "rx_sec", "tx_sec"]
+  },
+  "docker": {
+    "info": ["containers", "containersRunning", "containersPaused", "containersStopped", "images", "ncpu", "memTotal"],
+    "images": ["id", "container", "comment", "os", "architecture", "parent", "dockerVersion", "size", "author", "created", "containerConfig", "config", "repoTags"],
+    "containers": ["id", "name", "image", "imageId", "command", "created", "started", "finished", "state", "restartCount", "platform", "ports", "mounts"]
   }
 }

src/controllers/docker/containers.controller.ts

@@ -0,0 +1,16 @@
+import si, { Systeminformation } from "systeminformation";
+import dataConfig from "../../config/data.json";
+
+const getDockerContainers = async () => {
+  const {
+    dockerContainers
+  }: {
+    dockerContainers: Systeminformation.DockerContainerData
+  } = await si.get({
+    dockerContainers: dataConfig.docker.containers.join(","),
+  });
+
+  return dockerContainers;
+};
+
+export default getDockerContainers;

src/controllers/docker/images.controller.ts

@@ -0,0 +1,16 @@
+import si, { Systeminformation } from "systeminformation";
+import dataConfig from "../../config/data.json";
+
+const getDockerImages = async () => {
+  const {
+    dockerImages,
+  }: {
+    dockerImages: Systeminformation.DockerImageData
+  } = await si.get({
+    dockerImages: dataConfig.docker.images.join(","),
+  });
+
+  return dockerImages;
+};
+
+export default getDockerImages;

src/controllers/docker/information.controller.ts

@@ -0,0 +1,16 @@
+import si, { Systeminformation } from "systeminformation";
+import dataConfig from "../../config/data.json";
+
+const getDockerInfo = async () => {
+  const {
+    dockerInfo,
+  }: {
+    dockerInfo: Systeminformation.DockerInfoData;
+  } = await si.get({
+    dockerInfo: dataConfig.docker.info.join(","),
+  });
+
+  return dockerInfo;
+};
+
+export default getDockerInfo;

src/index.ts

@@ -14,12 +14,18 @@ const startServer = () => {
 }
 
 const main = async () => {
-  const root = await checkRootAccess();
-  if (root) {
-    startServer();
-  }
+  if (process.platform === "linux" || process.platform === "darwin") {
+    const root = await checkRootAccess();
+    if (root) {
+      startServer();
+    }
+    else {
+      console.error("No root permissions detected");
+      process.exit(1);
+    }
+  } 
   else {
-    console.error("No root permissions detected");
+    console.error("OS not supported");
     process.exit(1);
   }
 }

src/routes/index.ts

@@ -6,4 +6,8 @@ const router: Router = Router();
 
 router.use('/v1', authMiddleware, RouterV1)
 
+router.get('*', (req, res) => {
+  res.status(404).send("Endpoint not found")
+})
+
 export default router;

src/routes/v1/docker/containers.route.ts

@@ -0,0 +1,13 @@
+import { Request, Response } from "express";
+import getDockerContainers from "../../../controllers/docker/containers.controller";
+
+const ContainersRoute = async (req: Request, res: Response) => {
+  try {
+    const data = await getDockerContainers();
+    res.json(data)
+  } catch (error) {
+    res.status(500).send();
+  }
+}
+
+export default ContainersRoute;

src/routes/v1/docker/images.route.ts

@@ -0,0 +1,13 @@
+import { Request, Response } from "express";
+import getDockerImages from "../../../controllers/docker/images.controller";
+
+const ImagesRoute = async (req: Request, res: Response) => {
+  try {
+    const data = await getDockerImages();
+    res.json(data)
+  } catch (error) {
+    res.status(500).send();
+  }
+}
+
+export default ImagesRoute;

src/routes/v1/docker/index.ts

@@ -0,0 +1,12 @@
+import { Router } from 'express';
+import InformationRoute from './information.route';
+import ImagesRoute from './images.route';
+import ContainersRoute from './containers.route';
+
+const router: Router = Router();
+
+router.get('/information', InformationRoute)
+router.get('/images', ImagesRoute)
+router.get('/containers', ContainersRoute)
+
+export default router;

src/routes/v1/docker/information.route.ts

@@ -0,0 +1,13 @@
+import { Request, Response } from "express";
+import getDockerInfo from "../../../controllers/docker/information.controller";
+
+const InformationRoute = async (req: Request, res: Response) => {
+  try {
+    const data = await getDockerInfo();
+    res.json(data)
+  } catch (error) {
+    res.status(500).send();
+  }
+}
+
+export default InformationRoute;

src/routes/v1/index.ts

@@ -11,6 +11,7 @@ import OsRoute from './os.route';
 import ApiVersionRute from './apiVersion.route';
 import ShutdownRoute from './shutdown.route';
 import RebootRoute from './reboot.route';
+import DockerRoutes from './docker'
 
 const router: Router = Router();
 
@@ -27,4 +28,6 @@ router.get('/os', OsRoute);
 router.get('/shutdown', ShutdownRoute);
 router.get('/reboot', RebootRoute);
 
+router.use('/docker', DockerRoutes);
+
 export default router;