diff --git a/mqtt/index.js b/mqtt/index.js index 57af425..d20d2cc 100644 --- a/mqtt/index.js +++ b/mqtt/index.js @@ -1,14 +1,13 @@ -const crypto = require("crypto"); -const mqtt = require("mqtt"); -const commandLineArgs = require("command-line-args"); -const commandLineUsage = require("command-line-usage"); -const PositionUtil = require("./utils/position_util"); - -const { Mesh, Mqtt, Portnums, Telemetry } = require("@meshtastic/protobufs"); -const { fromBinary } = require("@bufbuild/protobuf"); +import crypto from 'crypto'; +import mqtt from "mqtt"; +import commandLineArgs from 'command-line-args'; +import commandLineUsage from 'command-line-usage'; +import { fromBinary } from '@bufbuild/protobuf'; +import { Mesh, Mqtt, Portnums, Telemetry } from '@meshtastic/protobufs'; +import PositionUtil from './utils/position_util.js'; // create prisma db client -const { PrismaClient } = require("@prisma/client"); +import { PrismaClient } from "@prisma/client"; const prisma = new PrismaClient(); // meshtastic bitfield flags @@ -203,7 +202,7 @@ if(options.help){ }, ]); console.log(usage); - return; + process.exit(1); } // get options and fallback to default values diff --git a/mqtt/package.json b/mqtt/package.json index 90b1ca3..2a87a4c 100644 --- a/mqtt/package.json +++ b/mqtt/package.json @@ -5,6 +5,7 @@ "author": "", "license": "ISC", "description": "", + "type": "module", "dependencies": { "@bufbuild/protobuf": "^2.2.5", "@meshtastic/protobufs": "npm:@jsr/meshtastic__protobufs@^2.6.2", diff --git a/mqtt/utils/node_id_util.js b/mqtt/utils/node_id_util.js index 5397df1..f9b1e00 100644 --- a/mqtt/utils/node_id_util.js +++ b/mqtt/utils/node_id_util.js @@ -1,4 +1,4 @@ -class NodeIdUtil { +export default class NodeIdUtil { /** * Converts the provided hex id to a numeric id, for example: !FFFFFFFF to 4294967295 @@ -18,6 +18,4 @@ class NodeIdUtil { } -} - -module.exports = NodeIdUtil; +} \ No newline at end of file diff --git a/mqtt/utils/position_util.js b/mqtt/utils/position_util.js index 6824b0b..9eef1e3 100644 --- a/mqtt/utils/position_util.js +++ b/mqtt/utils/position_util.js @@ -1,4 +1,4 @@ -class PositionUtil { +export default class PositionUtil { /** * Obfuscates the provided latitude or longitude down to the provided precision in bits. @@ -61,6 +61,4 @@ class PositionUtil { } -} - -module.exports = PositionUtil; +} \ No newline at end of file