@oneuptime/common 9.5.9 → 9.5.12

package/Types/Monitor/MonitorStep.ts

@@ -29,6 +29,9 @@ import MonitorStepExceptionMonitor, {
 import MonitorStepSnmpMonitor, {
   MonitorStepSnmpMonitorUtil,
 } from "./MonitorStepSnmpMonitor";
+import MonitorStepDnsMonitor, {
+  MonitorStepDnsMonitorUtil,
+} from "./MonitorStepDnsMonitor";
 import Zod, { ZodSchema } from "../../Utils/Schema/Zod";
 
 export interface MonitorStepType {
@@ -72,6 +75,9 @@ export interface MonitorStepType {
 
   // SNMP monitor
   snmpMonitor?: MonitorStepSnmpMonitor | undefined;
+
+  // DNS monitor
+  dnsMonitor?: MonitorStepDnsMonitor | undefined;
 }
 
 export default class MonitorStep extends DatabaseProperty {
@@ -98,6 +104,7 @@ export default class MonitorStep extends DatabaseProperty {
       metricMonitor: undefined,
       exceptionMonitor: undefined,
       snmpMonitor: undefined,
+      dnsMonitor: undefined,
     };
   }
 
@@ -129,6 +136,7 @@ export default class MonitorStep extends DatabaseProperty {
       metricMonitor: undefined,
       exceptionMonitor: undefined,
       snmpMonitor: undefined,
+      dnsMonitor: undefined,
     };
 
     return monitorStep;
@@ -224,6 +232,11 @@ export default class MonitorStep extends DatabaseProperty {
     return this;
   }
 
+  public setDnsMonitor(dnsMonitor: MonitorStepDnsMonitor): MonitorStep {
+    this.data!.dnsMonitor = dnsMonitor;
+    return this;
+  }
+
   public setCustomCode(customCode: string): MonitorStep {
     this.data!.customCode = customCode;
     return this;
@@ -332,6 +345,16 @@ export default class MonitorStep extends DatabaseProperty {
       }
     }
 
+    if (monitorType === MonitorType.DNS) {
+      if (!value.data.dnsMonitor) {
+        return "DNS configuration is required";
+      }
+
+      if (!value.data.dnsMonitor.queryName) {
+        return "DNS query name (domain) is required";
+      }
+    }
+
     return null;
   }
 
@@ -377,6 +400,9 @@ export default class MonitorStep extends DatabaseProperty {
           snmpMonitor: this.data.snmpMonitor
             ? MonitorStepSnmpMonitorUtil.toJSON(this.data.snmpMonitor)
             : undefined,
+          dnsMonitor: this.data.dnsMonitor
+            ? MonitorStepDnsMonitorUtil.toJSON(this.data.dnsMonitor)
+            : undefined,
         },
       });
     }
@@ -482,6 +508,9 @@ export default class MonitorStep extends DatabaseProperty {
       snmpMonitor: json["snmpMonitor"]
         ? (json["snmpMonitor"] as JSONObject)
         : undefined,
+      dnsMonitor: json["dnsMonitor"]
+        ? (json["dnsMonitor"] as JSONObject)
+        : undefined,
     }) as any;
 
     return monitorStep;
@@ -507,6 +536,7 @@ export default class MonitorStep extends DatabaseProperty {
         traceMonitor: Zod.any().optional(),
         metricMonitor: Zod.any().optional(),
         snmpMonitor: Zod.any().optional(),
+        dnsMonitor: Zod.any().optional(),
       }).openapi({
         type: "object",
         example: {

package/Types/Monitor/MonitorStepDnsMonitor.ts

@@ -0,0 +1,46 @@
+import { JSONObject } from "../JSON";
+import DnsRecordType from "./DnsMonitor/DnsRecordType";
+
+export default interface MonitorStepDnsMonitor {
+  queryName: string;
+  recordType: DnsRecordType;
+  hostname?: string | undefined; // DNS server (e.g. "8.8.8.8"), empty = system default
+  port: number;
+  timeout: number;
+  retries: number;
+}
+
+export class MonitorStepDnsMonitorUtil {
+  public static getDefault(): MonitorStepDnsMonitor {
+    return {
+      queryName: "",
+      recordType: DnsRecordType.A,
+      hostname: "",
+      port: 53,
+      timeout: 5000,
+      retries: 3,
+    };
+  }
+
+  public static fromJSON(json: JSONObject): MonitorStepDnsMonitor {
+    return {
+      queryName: (json["queryName"] as string) || "",
+      recordType: (json["recordType"] as DnsRecordType) || DnsRecordType.A,
+      hostname: (json["hostname"] as string) || undefined,
+      port: (json["port"] as number) || 53,
+      timeout: (json["timeout"] as number) || 5000,
+      retries: (json["retries"] as number) || 3,
+    };
+  }
+
+  public static toJSON(monitor: MonitorStepDnsMonitor): JSONObject {
+    return {
+      queryName: monitor.queryName,
+      recordType: monitor.recordType,
+      hostname: monitor.hostname,
+      port: monitor.port,
+      timeout: monitor.timeout,
+      retries: monitor.retries,
+    };
+  }
+}

package/Types/Monitor/MonitorType.ts

@@ -26,6 +26,9 @@ enum MonitorType {
 
   // Network device monitoring
   SNMP = "SNMP",
+
+  // DNS monitoring
+  DNS = "DNS",
 }
 
 export default MonitorType;
@@ -179,6 +182,13 @@ export class MonitorTypeHelper {
           "This monitor type lets you monitor network devices like switches, routers, and firewalls via SNMP.",
         icon: IconProp.Signal,
       },
+      {
+        monitorType: MonitorType.DNS,
+        title: "DNS",
+        description:
+          "This monitor type lets you monitor DNS resolution for your domains, verify record values, and check DNSSEC validity.",
+        icon: IconProp.GlobeAlt,
+      },
     ];
 
     return monitorTypeProps;
@@ -224,7 +234,8 @@ export class MonitorTypeHelper {
       monitorType === MonitorType.SSLCertificate ||
       monitorType === MonitorType.SyntheticMonitor ||
       monitorType === MonitorType.CustomJavaScriptCode ||
-      monitorType === MonitorType.SNMP;
+      monitorType === MonitorType.SNMP ||
+      monitorType === MonitorType.DNS;
     return isProbeableMonitor;
   }
 
@@ -246,6 +257,7 @@ export class MonitorTypeHelper {
       MonitorType.Traces,
       MonitorType.Exceptions,
       MonitorType.SNMP,
+      MonitorType.DNS,
     ];
   }
 
@@ -278,7 +290,8 @@ export class MonitorTypeHelper {
       monitorType === MonitorType.SSLCertificate ||
       monitorType === MonitorType.SyntheticMonitor ||
       monitorType === MonitorType.CustomJavaScriptCode ||
-      monitorType === MonitorType.SNMP
+      monitorType === MonitorType.SNMP ||
+      monitorType === MonitorType.DNS
     ) {
       return true;
     }

package/Types/Probe/ProbeMonitorResponse.ts

@@ -7,6 +7,7 @@ import CustomCodeMonitorResponse from "../Monitor/CustomCodeMonitor/CustomCodeMo
 import SslMonitorResponse from "../Monitor/SSLMonitor/SslMonitorResponse";
 import SyntheticMonitorResponse from "../Monitor/SyntheticMonitors/SyntheticMonitorResponse";
 import SnmpMonitorResponse from "../Monitor/SnmpMonitor/SnmpMonitorResponse";
+import DnsMonitorResponse from "../Monitor/DnsMonitor/DnsMonitorResponse";
 import MonitorEvaluationSummary from "../Monitor/MonitorEvaluationSummary";
 import ObjectID from "../ObjectID";
 import Port from "../Port";
@@ -30,6 +31,7 @@ export default interface ProbeMonitorResponse {
   syntheticMonitorResponse?: Array<SyntheticMonitorResponse> | undefined;
   customCodeMonitorResponse?: CustomCodeMonitorResponse | undefined;
   snmpResponse?: SnmpMonitorResponse | undefined;
+  dnsResponse?: DnsMonitorResponse | undefined;
   monitoredAt: Date;
   isTimeout?: boolean | undefined;
   ingestedAt?: Date | undefined;

package/UI/Components/Markdown.tsx/MarkdownViewer.tsx

@@ -8,8 +8,63 @@ import React, {
 import ReactMarkdown from "react-markdown";
 // https://github.com/remarkjs/remark-gfm
 import remarkGfm from "remark-gfm";
-import { Prism as SyntaxHighlighter } from "react-syntax-highlighter";
+import SyntaxHighlighter from "react-syntax-highlighter/dist/esm/prism-light";
 import { a11yDark } from "react-syntax-highlighter/dist/esm/styles/prism";
+import javascript from "react-syntax-highlighter/dist/esm/languages/prism/javascript";
+import typescript from "react-syntax-highlighter/dist/esm/languages/prism/typescript";
+import jsx from "react-syntax-highlighter/dist/esm/languages/prism/jsx";
+import tsx from "react-syntax-highlighter/dist/esm/languages/prism/tsx";
+import python from "react-syntax-highlighter/dist/esm/languages/prism/python";
+import bash from "react-syntax-highlighter/dist/esm/languages/prism/bash";
+import json from "react-syntax-highlighter/dist/esm/languages/prism/json";
+import yaml from "react-syntax-highlighter/dist/esm/languages/prism/yaml";
+import sql from "react-syntax-highlighter/dist/esm/languages/prism/sql";
+import go from "react-syntax-highlighter/dist/esm/languages/prism/go";
+import java from "react-syntax-highlighter/dist/esm/languages/prism/java";
+import css from "react-syntax-highlighter/dist/esm/languages/prism/css";
+import markup from "react-syntax-highlighter/dist/esm/languages/prism/markup";
+import markdown from "react-syntax-highlighter/dist/esm/languages/prism/markdown";
+import docker from "react-syntax-highlighter/dist/esm/languages/prism/docker";
+import rust from "react-syntax-highlighter/dist/esm/languages/prism/rust";
+import c from "react-syntax-highlighter/dist/esm/languages/prism/c";
+import cpp from "react-syntax-highlighter/dist/esm/languages/prism/cpp";
+import csharp from "react-syntax-highlighter/dist/esm/languages/prism/csharp";
+import ruby from "react-syntax-highlighter/dist/esm/languages/prism/ruby";
+import php from "react-syntax-highlighter/dist/esm/languages/prism/php";
+import graphql from "react-syntax-highlighter/dist/esm/languages/prism/graphql";
+import http from "react-syntax-highlighter/dist/esm/languages/prism/http";
+
+SyntaxHighlighter.registerLanguage("javascript", javascript);
+SyntaxHighlighter.registerLanguage("js", javascript);
+SyntaxHighlighter.registerLanguage("typescript", typescript);
+SyntaxHighlighter.registerLanguage("ts", typescript);
+SyntaxHighlighter.registerLanguage("jsx", jsx);
+SyntaxHighlighter.registerLanguage("tsx", tsx);
+SyntaxHighlighter.registerLanguage("python", python);
+SyntaxHighlighter.registerLanguage("bash", bash);
+SyntaxHighlighter.registerLanguage("shell", bash);
+SyntaxHighlighter.registerLanguage("json", json);
+SyntaxHighlighter.registerLanguage("yaml", yaml);
+SyntaxHighlighter.registerLanguage("yml", yaml);
+SyntaxHighlighter.registerLanguage("sql", sql);
+SyntaxHighlighter.registerLanguage("go", go);
+SyntaxHighlighter.registerLanguage("java", java);
+SyntaxHighlighter.registerLanguage("css", css);
+SyntaxHighlighter.registerLanguage("markup", markup);
+SyntaxHighlighter.registerLanguage("html", markup);
+SyntaxHighlighter.registerLanguage("xml", markup);
+SyntaxHighlighter.registerLanguage("markdown", markdown);
+SyntaxHighlighter.registerLanguage("md", markdown);
+SyntaxHighlighter.registerLanguage("docker", docker);
+SyntaxHighlighter.registerLanguage("dockerfile", docker);
+SyntaxHighlighter.registerLanguage("rust", rust);
+SyntaxHighlighter.registerLanguage("c", c);
+SyntaxHighlighter.registerLanguage("cpp", cpp);
+SyntaxHighlighter.registerLanguage("csharp", csharp);
+SyntaxHighlighter.registerLanguage("ruby", ruby);
+SyntaxHighlighter.registerLanguage("php", php);
+SyntaxHighlighter.registerLanguage("graphql", graphql);
+SyntaxHighlighter.registerLanguage("http", http);
 import mermaid from "mermaid";
 
 // Initialize mermaid

package/UI/esbuild-config.js

@@ -39,6 +39,54 @@ function createRefractorCompatibilityPlugin() {
   };
 }
 
+// Plugin to force mermaid to use its pre-bundled CJS build (no dynamic imports)
+function createMermaidPlugin() {
+  const candidateRoots = [
+    path.resolve(__dirname, '../node_modules/mermaid'),
+    path.resolve(__dirname, '../../node_modules/mermaid'),
+  ];
+  const mermaidRoot = candidateRoots.find((p) => fs.existsSync(p));
+
+  return {
+    name: 'mermaid-prebundled',
+    setup(build) {
+      if (!mermaidRoot) return;
+      const bundlePath = path.join(mermaidRoot, 'dist', 'mermaid.min.js');
+
+      // Intercept bare "mermaid" imports and serve the pre-bundled CJS file
+      // with an ESM export appended. The CJS file declares a local var
+      // __esbuild_esm_mermaid_nm and assigns .mermaid on it, so we inline
+      // the file contents and export from the same scope.
+      build.onResolve({ filter: /^mermaid$/ }, () => {
+        return { path: 'mermaid-wrapper', namespace: 'mermaid-ns' };
+      });
+
+      build.onLoad({ filter: /^mermaid-wrapper$/, namespace: 'mermaid-ns' }, () => {
+        let cjsSource = fs.readFileSync(bundlePath, 'utf8');
+        // The CJS bundle ends with a line that tries globalThis.__esbuild_esm_mermaid_nm
+        // which fails because the var is local-scoped when bundled. Strip it and
+        // expose the local var on globalThis ourselves before that line.
+        cjsSource = cjsSource.replace(
+          /globalThis\["mermaid"\]\s*=\s*globalThis\.__esbuild_esm_mermaid_nm\["mermaid"\]\.default;?\s*$/,
+          ''
+        );
+        const contents = cjsSource + `
+;globalThis.__esbuild_esm_mermaid_nm = typeof __esbuild_esm_mermaid_nm !== "undefined" ? __esbuild_esm_mermaid_nm : {};
+var _mermaid_export = __esbuild_esm_mermaid_nm.mermaid;
+if (_mermaid_export && _mermaid_export.default) { _mermaid_export = _mermaid_export.default; }
+export default _mermaid_export;
+export { _mermaid_export as mermaid };
+`;
+        return {
+          contents,
+          loader: 'js',
+          resolveDir: path.dirname(bundlePath),
+        };
+      });
+    },
+  };
+}
+
 // CSS Plugin to handle CSS/SCSS files
 function createCSSPlugin() {
   return {
@@ -161,12 +209,13 @@ function createConfig(options) {
     entryPoints: [entryPoint],
     bundle: true,
     outdir,
-    format: 'esm', // Changed from 'iife' to 'esm' to support splitting
+    format: 'esm',
     platform: 'browser',
     target: 'es2017',
     sourcemap: isDev ? 'inline' : false,
     minify: false,
-    splitting: true, // Now supported with ESM format
+    treeShaking: true,
+    splitting: true,
     publicPath,
     define: {
       'process.env.NODE_ENV': JSON.stringify(isDev ? 'development' : 'production'),
@@ -177,7 +226,7 @@ function createConfig(options) {
       'react': path.resolve('./node_modules/react'),
       ...additionalAlias,
     },
-    plugins: [createRefractorCompatibilityPlugin(), createCSSPlugin(), createFileLoaderPlugin()],
+    plugins: [createMermaidPlugin(), createRefractorCompatibilityPlugin(), createCSSPlugin(), createFileLoaderPlugin()],
     loader: {
       '.tsx': 'tsx',
       '.ts': 'ts',

package/UI/index.d.ts

@@ -2,3 +2,29 @@ declare module "*.png";
 declare module "*.svg";
 declare module "*.jpg";
 declare module "*.gif";
+
+declare module "react-syntax-highlighter/dist/esm/prism-light";
+declare module "react-syntax-highlighter/dist/esm/styles/prism";
+declare module "react-syntax-highlighter/dist/esm/languages/prism/javascript";
+declare module "react-syntax-highlighter/dist/esm/languages/prism/typescript";
+declare module "react-syntax-highlighter/dist/esm/languages/prism/jsx";
+declare module "react-syntax-highlighter/dist/esm/languages/prism/tsx";
+declare module "react-syntax-highlighter/dist/esm/languages/prism/python";
+declare module "react-syntax-highlighter/dist/esm/languages/prism/bash";
+declare module "react-syntax-highlighter/dist/esm/languages/prism/json";
+declare module "react-syntax-highlighter/dist/esm/languages/prism/yaml";
+declare module "react-syntax-highlighter/dist/esm/languages/prism/sql";
+declare module "react-syntax-highlighter/dist/esm/languages/prism/go";
+declare module "react-syntax-highlighter/dist/esm/languages/prism/java";
+declare module "react-syntax-highlighter/dist/esm/languages/prism/css";
+declare module "react-syntax-highlighter/dist/esm/languages/prism/markup";
+declare module "react-syntax-highlighter/dist/esm/languages/prism/markdown";
+declare module "react-syntax-highlighter/dist/esm/languages/prism/docker";
+declare module "react-syntax-highlighter/dist/esm/languages/prism/rust";
+declare module "react-syntax-highlighter/dist/esm/languages/prism/c";
+declare module "react-syntax-highlighter/dist/esm/languages/prism/cpp";
+declare module "react-syntax-highlighter/dist/esm/languages/prism/csharp";
+declare module "react-syntax-highlighter/dist/esm/languages/prism/ruby";
+declare module "react-syntax-highlighter/dist/esm/languages/prism/php";
+declare module "react-syntax-highlighter/dist/esm/languages/prism/graphql";
+declare module "react-syntax-highlighter/dist/esm/languages/prism/http";

package/Utils/Monitor/MonitorMetricType.ts

@@ -85,7 +85,8 @@ class MonitorMetricTypeUtil {
       monitorType === MonitorType.Ping ||
       monitorType === MonitorType.IP ||
       monitorType === MonitorType.Port ||
-      monitorType === MonitorType.SNMP
+      monitorType === MonitorType.SNMP ||
+      monitorType === MonitorType.DNS
     ) {
       return [MonitorMetricType.IsOnline, MonitorMetricType.ResponseTime];
     }

package/build/dist/Server/API/OpenSourceDeploymentAPI.js

@@ -23,6 +23,11 @@ export default class OpenSourceDeploymentAPI extends BaseAPI {
                 deployment.oneuptimeVersion =
                     body["oneuptimeVersion"] || "unknown";
                 deployment.instanceUrl = body["instanceUrl"] || "";
+                // Skip localhost instances - these are default/unconfigured deployments.
+                if (deployment.instanceUrl === "http://localhost/" ||
+                    deployment.instanceUrl === "http://localhost") {
+                    return Response.sendEmptySuccessResponse(req, res);
+                }
                 await OpenSourceDeploymentService.create({
                     data: deployment,
                     props: {

package/build/dist/Server/API/OpenSourceDeploymentAPI.js.map

@@ -1 +1 @@
-{"version":3,"file":"OpenSourceDeploymentAPI.js","sourceRoot":"","sources":["../../../../Server/API/OpenSourceDeploymentAPI.ts"],"names":[],"mappings":"AAAA,OAAO,oBAAoB,MAAM,kDAAkD,CAAC;AAEpF,OAAO,GAAG,MAAM,qBAAqB,CAAC;AACtC,OAAO,GAAG,MAAM,iBAAiB,CAAC;AAClC,OAAO,2BAEN,MAAM,yCAAyC,CAAC;AACjD,OAAO,EAAE,8BAA8B,EAAE,MAAM,sBAAsB,CAAC;AACtE,OAAO,MAAM,MAAM,iBAAiB,CAAC;AACrC,OAAO,QAAQ,MAAM,mBAAmB,CAAC;AAMzC,OAAO,OAAO,MAAM,WAAW,CAAC;AAEhC,MAAM,CAAC,OAAO,OAAO,uBAAwB,SAAQ,OAGpD;IACC;;QACE,KAAK,CAAC,oBAAoB,EAAE,2BAA2B,CAAC,CAAC;QAEzD,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,GAAG,MAAA,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC,cAAc,EAAE,0CAAE,QAAQ,EAAE,WAAW,EAChE,KAAK,EAAE,GAAmB,EAAE,GAAoB,EAAE,IAAkB,EAAE,EAAE;;YACtE,IAAI,CAAC;gBACH,MAAM,IAAI,GAAe,GAAG,CAAC,IAAI,CAAC;gBAElC,MAAM,UAAU,GAAyB,IAAI,oBAAoB,EAAE,CAAC;gBAEpE,UAAU,CAAC,KAAK,GAAI,IAAI,CAAC,OAAO,CAAY,IAAI,EAAE,CAAC;gBACnD,UAAU,CAAC,IAAI,GAAI,IAAI,CAAC,MAAM,CAAY,IAAI,EAAE,CAAC;gBACjD,UAAU,CAAC,WAAW,GAAI,IAAI,CAAC,aAAa,CAAY,IAAI,EAAE,CAAC;gBAC/D,UAAU,CAAC,kBAAkB;oBAC1B,IAAI,CAAC,oBAAoB,CAAY,IAAI,EAAE,CAAC;gBAC/C,UAAU,CAAC,gBAAgB;oBACxB,IAAI,CAAC,kBAAkB,CAAY,IAAI,SAAS,CAAC;gBACpD,UAAU,CAAC,WAAW,GAAI,IAAI,CAAC,aAAa,CAAY,IAAI,EAAE,CAAC;gBAE/D,MAAM,2BAA2B,CAAC,MAAM,CAAC;oBACvC,IAAI,EAAE,UAAU;oBAChB,KAAK,EAAE;wBACL,MAAM,EAAE,IAAI;qBACb;iBACF,CAAC,CAAC;gBAEH,IAAI,8BAA8B,EAAE,CAAC;oBACnC,GAAG,CAAC,IAAI,CAAC;wBACP,GAAG,EAAE,GAAG,CAAC,UAAU,CAAC,8BAA8B,CAAC;wBACnD,IAAI,EAAE;4BACJ,KAAK,EAAE,CAAA,MAAA,UAAU,CAAC,KAAK,0CAAE,QAAQ,EAAE,KAAI,EAAE;4BACzC,IAAI,EAAE,CAAA,MAAA,UAAU,CAAC,IAAI,0CAAE,QAAQ,EAAE,KAAI,EAAE;4BACvC,WAAW,EAAE,CAAA,MAAA,UAAU,CAAC,WAAW,0CAAE,QAAQ,EAAE,KAAI,EAAE;4BACrD,kBAAkB,EAChB,CAAA,MAAA,UAAU,CAAC,kBAAkB,0CAAE,QAAQ,EAAE,KAAI,EAAE;4BACjD,gBAAgB,EAAE,CAAA,MAAA,UAAU,CAAC,gBAAgB,0CAAE,QAAQ,EAAE,KAAI,EAAE;4BAC/D,WAAW,EAAE,CAAA,MAAA,UAAU,CAAC,WAAW,0CAAE,QAAQ,EAAE,KAAI,EAAE;yBACtD;qBACF,CAAC,CAAC,KAAK,CAAC,CAAC,GAAU,EAAE,EAAE;wBACtB,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;oBACpB,CAAC,CAAC,CAAC;gBACL,CAAC;gBAED,OAAO,QAAQ,CAAC,wBAAwB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;YACrD,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,IAAI,CAAC,GAAG,CAAC,CAAC;YACZ,CAAC;QACH,CAAC,CACF,CAAC;IACJ,CAAC;CACF"}
+{"version":3,"file":"OpenSourceDeploymentAPI.js","sourceRoot":"","sources":["../../../../Server/API/OpenSourceDeploymentAPI.ts"],"names":[],"mappings":"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"}

package/build/dist/Server/Middleware/UserAuthorization.js

@@ -112,10 +112,9 @@ export default class UserMiddleware {
             oneuptimeRequest.userAuthorization = JSONWebToken.decode(accessToken);
         }
         catch (err) {
-            // if the token is invalid or expired, it'll throw this error.
+            // if the token is invalid or expired, return 401 so clients can refresh the token.
             logger.error(err);
-            oneuptimeRequest.userType = UserType.Public;
-            return next();
+            return Response.sendErrorResponse(req, res, new NotAuthenticatedException("AccessToken is invalid or expired. Please refresh your token."));
         }
         if (oneuptimeRequest.userAuthorization.isMasterAdmin) {
             oneuptimeRequest.userType = UserType.MasterAdmin;

package/build/dist/Server/Middleware/UserAuthorization.js.map

@@ -1 +1 @@
-{"version":3,"file":"UserAuthorization.js","sourceRoot":"","sources":["../../../../Server/Middleware/UserAuthorization.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"UserAuthorization.js","sourceRoot":"","sources":["../../../../Server/Middleware/UserAuthorization.ts"],"names":[],"mappings":"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"}

package/build/dist/Server/Services/MonitorService.js

@@ -56,7 +56,7 @@ export class Service extends DatabaseService {
         super(Model);
     }
     getMonitorDestinationInfo(monitor) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f;
         let monitorDestination = "";
         let requestType = "";
         const monitorType = monitor.monitorType;
@@ -90,6 +90,13 @@ export class Service extends DatabaseService {
                         monitorDestination = `${monitorDestination}:${port}`;
                     }
                 }
+                // For DNS monitors, use the queryName from dnsMonitor config
+                if (monitorType === MonitorType.DNS && ((_f = firstStep === null || firstStep === void 0 ? void 0 : firstStep.data) === null || _f === void 0 ? void 0 : _f.dnsMonitor)) {
+                    monitorDestination = firstStep.data.dnsMonitor.queryName || "";
+                    if (firstStep.data.dnsMonitor.hostname) {
+                        monitorDestination = `${monitorDestination} @${firstStep.data.dnsMonitor.hostname}`;
+                    }
+                }
             }
         }
         return {