Feat: Remove CPU thresold in threshold watcher (#33)

Author: J-Hoplin

.github/workflows/publish.yaml

@@ -19,6 +19,14 @@ jobs:
         run: npm test
       - name: Build project
         run: npm run build
+
+      - name: Version patch and push
+        run: |
+          cd libs/error-types
+          git config user.name "${{ secrets.ACTION_GIT_USER_NAME }}"
+          git config user.email "${{ secrets.ACTION_GIT_USER_EMAIL }}"
+          yarn version --patch -m "chore(release): %s"
+          git push origin HEAD
       - name: Publish to registry
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

Readme.md

@@ -1,6 +1,7 @@
 # Puppeteer Pool Manager
 
 ![NPM Version](https://img.shields.io/npm/v/%40hoplin%2Fpuppeteer-pool?style=for-the-badge)
+
 ### Puppeteer Pool Manager
 
 <div style="display: flex; align-items: center;">
@@ -200,7 +201,6 @@ main();
 - Config
   - Support config customize
 - Threshold Watcher
-  - CPU
   - Memory
   - Support safe pool instance reset in runtime
 - Metrics
@@ -230,7 +230,6 @@ config path, you can pass path to `start()` function as parameter.
   "threshold": {
     "activate": true,
     "interval": 5,
-    "cpu": 80,
     "memory": 2048
   }
 }
@@ -257,12 +256,9 @@ config path, you can pass path to `start()` function as parameter.
 
 - `activate`: Activate threshold watcher
 - `interval`: Interval of threshold watcher
-- `cpu`: CPU threshold value
 - `memory`: Memory threshold value
   - **Inteager Validation**
     - `interval` should be at least 1
     - `interval` should be integer
-    - `cpu` should be at least 1
-    - `cpu` should be integer
     - `memory` should be at least 1
     - `memory` should be integer

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hoplin/puppeteer-pool",
-  "version": "2.1.0-alpha-1",
+  "version": "2.1.0",
   "main": "dist/index.js",
   "description": "Puppeteer Pool Manager for worker server, process daemon, commands etc...",
   "repository": "https://github.com/J-Hoplin/Puppeteer-Pool.git",

src/configs/config.ts

@@ -26,7 +26,6 @@ export const app_config = {
   threshold: {
     activate: true,
     interval: 5,
-    cpu: 80,
     memory: 2048,
   },
 };
@@ -92,12 +91,6 @@ export const loadConfig = (configPath: string = null): ConfigType => {
       'Threshold Config',
       'Interval',
     );
-    // Threshold CPU configs
-    if (loadedConfig.threshold?.cpu) {
-      app_config.threshold.cpu =
-        loadedConfig.threshold.cpu ?? app_config.threshold.cpu;
-      ValidateInteager(app_config.threshold.cpu, 1, 'CPU Config', 'CPU');
-    }
     // Threshold Memory configs
     if (loadedConfig.threshold?.memory) {
       app_config.threshold.memory =

src/pool/dispatcher.ts

@@ -14,7 +14,6 @@ const DEFAULT_VALUES = {
   CONCURRENCY_LEVEL: 1,
   CONTEXT_MODE: ContextMode.SHARED,
   THRESHOLD: {
-    cpu: 80,
     memory: 1024,
   },
   QUEUE_CHECK_INTERVAL: 100,
@@ -50,7 +49,7 @@ export class TaskDispatcher extends EventEmitter {
   private logLevel: LogLevel;
   private launchOptions: PuppeteerLaunchOptions = {};
   private poolConfig: ConfigType;
-  private threshold: { cpu: number; memory: number } = DEFAULT_VALUES.THRESHOLD;
+  private threshold: { memory: number } = DEFAULT_VALUES.THRESHOLD;
 
   // Logger
   private logger: Logger = new Logger();
@@ -167,7 +166,6 @@ export class TaskDispatcher extends EventEmitter {
     );
     if (this.poolConfig.threshold.activate) {
       this.threshold = {
-        cpu: this.poolConfig.threshold.cpu,
         memory: this.poolConfig.threshold.memory,
       };
       this.metricsWatcher.startThresholdWatcher(
@@ -256,7 +254,6 @@ export class TaskDispatcher extends EventEmitter {
       );
       if (this.poolConfig.threshold.activate) {
         this.threshold = {
-          cpu: this.poolConfig.threshold.cpu,
           memory: this.poolConfig.threshold.memory,
         };
         this.metricsWatcher.startThresholdWatcher(

src/watcher/metrics.ts

@@ -19,22 +19,18 @@ export class MetricsWatcher {
   }
 
   public startThresholdWatcher(
-    limit: { cpu: number; memory: number },
+    limit: { memory: number },
     cbOverThreshold: () => Promise<void>,
     checkIntervalSecond: number,
   ) {
     /**
-     * cpu: Should be a percentage
      * memory: Should be in MB
      */
     this.intervalId = setInterval(async () => {
       const metrics = await this.metrics();
-      if (
-        metrics.cpuUsage > limit.cpu ||
-        metrics.memoryUsageValue > limit.memory
-      ) {
+      if (metrics.memoryUsageValue > limit.memory) {
         this.logger.warn(
-          `Over threshold: CPU: ${metrics.cpuUsage.toFixed(2)}% Memory: ${metrics.memoryUsageValue.toFixed(2)}MB`,
+          `Over threshold - Memory: ${metrics.memoryUsageValue.toFixed(2)}MB`,
         );
         await cbOverThreshold();
       }