From d9635204863ccab0f9a2fa3d66f89dd68c866f9d Mon Sep 17 00:00:00 2001
From: Matt <matt@mattwb65.com>
Date: Wed, 16 Apr 2025 00:13:12 -0400
Subject: [PATCH] use EM modules

---
 webapp/index.js     | 19 +++++++++++--------
 webapp/package.json |  1 +
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/webapp/index.js b/webapp/index.js
index 38c21d9..bef01da 100644
--- a/webapp/index.js
+++ b/webapp/index.js
@@ -1,14 +1,15 @@
-const path = require('path');
-const express = require('express');
-const compression = require('compression');
-const commandLineArgs = require("command-line-args");
-const commandLineUsage = require("command-line-usage");
+import path from "path";
+import { fileURLToPath } from 'url';
+import express from "express";
+import compression from "compression";
+import commandLineArgs from "command-line-args";
+import commandLineUsage from "command-line-usage";
 
 // protobuf imports
-const { Mesh, Config  } = require("@meshtastic/protobufs");
+import { Mesh, Config  } from "@meshtastic/protobufs";
 
 // create prisma db client
-const { PrismaClient } = require("@prisma/client");
+import { PrismaClient } from "@prisma/client";
 const prisma = new PrismaClient();
 
 // return big ints as string when using JSON.stringify
@@ -46,7 +47,7 @@ if(options.help){
         },
     ]);
     console.log(usage);
-    return;
+    process.exit(1);
 }
 
 // get options and fallback to default values
@@ -76,6 +77,8 @@ const app = express();
 app.use(compression());
 
 // serve files inside the public folder from /
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
 app.use('/', express.static(path.join(__dirname, 'public')));
 
 app.get('/', async (req, res) => {
diff --git a/webapp/package.json b/webapp/package.json
index 2851d2c..2922591 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -5,6 +5,7 @@
   "main": "index.js",
   "author": "",
   "license": "ISC",
+  "type": "module",
   "dependencies": {
     "@meshtastic/protobufs": "npm:@jsr/meshtastic__protobufs@^2.6.2",
     "@prisma/client": "^5.11.0",