Updated to use proper JSON module import syntax from node.js v18+ (https://nodejs.org/docs/latest-v18.x/api/esm.html#json-modules), plus minor code clean-up

Author: blu3mania

.github/workflows/test-linux-and-macos.yml

@@ -15,10 +15,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macOS-latest]
-        node: [10, 12, 14, 16, 18, 20]
-        exclude:
-          - os: macOS-latest
-            node: 16
+        node: [18, 20, 22]
 
     steps:
       - name: Checkout repository

.github/workflows/test-windows.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: windows-latest
     strategy:
       matrix:
-        node: [16, 18, 20]
+        node: [18, 20, 22]
 
     steps:
       - name: Checkout repository

README.md

@@ -1,6 +1,6 @@
 # disk-space-monitor
 [![Apache 2.0 License](https://img.shields.io/badge/License-Apache%202.0-yellow)](https://raw.githubusercontent.com/blu3mania/disk-space-monitor/main/LICENSE)
-[![node.js 10+](https://img.shields.io/badge/node.js-10.16.3-blue?logo=node.js)](https://nodejs.org/en/)
+[![node.js 18+](https://img.shields.io/badge/node.js-18.0.0-blue?logo=node.js)](https://nodejs.org/en/)
 [![Latest Release](https://img.shields.io/github/v/release/blu3mania/disk-space-monitor)](https://github.com/blu3mania/disk-space-monitor/releases/latest)
 
 Monitor disk space usage and notify user by email or system notification.

package.json

@@ -25,10 +25,12 @@
     "url": "https://github.com/blu3mania/disk-space-monitor.git"
   },
   "dependencies": {
-    "chalk": "^5.0.1",
-    "diskusage": "^1.1.3",
+    "chalk": "^5.3.0",
+    "diskusage": "^1.2.0",
     "node-notifier": "^10.0.1",
-    "nodemailer": "^6.7.8"
+    "node-windows": "^1.0.0-beta.8",
+    "nodemailer": "^6.9.13",
+    "npm-platform-dependencies": "^0.1.0"
   },
   "win32Dependencies": {
     "node-windows": "^1.0.0-beta.8"
@@ -38,6 +40,5 @@
   },
   "linuxDependencies": {
     "node-linux": "^0.1.12"
-  },
-  "devDependencies": {}
+  }
 }

src/app.js

@@ -11,7 +11,7 @@ import {
     warning,
     info,
     verbose } from './print.js';
-import settings from './settings.json' assert {type: 'json'};
+import settings from './settings.json' with {type: 'json'};
 
 const NotificationType = {
     Email: 'email',
@@ -152,12 +152,11 @@ function checkDiskFreeSpace(disk, diskInfo) {
     if (diskInfo.free < disk.thresholdInBytes) {
         if (!disk.notificationTriggered) {
             disk.notificationTriggered = true;
+            warning(replaceMacro('Free space on disk {DISK} has dropped under {THRESHOLD}!', disk, diskInfo));
             if (settings.notificationTypes.find(type => type.toLowerCase() === NotificationType.Email)) {
-                warning(replaceMacro('Free space on disk {DISK} has dropped under {THRESHOLD}! Sending email notification...', disk, diskInfo));
                 sendEmailNotification(disk, diskInfo);
             }
             if (settings.notificationTypes.find(type => type.toLowerCase() === NotificationType.Desktop)) {
-                warning(replaceMacro('Free space on disk {DISK} has dropped under {THRESHOLD}! Showing desktop notification...', disk, diskInfo));
                 sendDesktopNotification(disk, diskInfo);
             }
         }

src/install-service.js

@@ -5,7 +5,7 @@ import {
     warning,
     info,
     verbose } from './print.js';
-import settings from './settings.json' assert {type: 'json'};
+import settings from './settings.json' with {type: 'json'};
 
 main();
 

src/uninstall-service.js

@@ -4,7 +4,7 @@ import url from 'url';
 import {
     info,
     verbose } from './print.js';
-import settings from './settings.json' assert {type: 'json'};
+import settings from './settings.json' with {type: 'json'};
 
 main();