Skip to content

fix: adapt deviceId import to cjs and esm #491

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 28, 2025
Merged

fix: adapt deviceId import to cjs and esm #491

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d28b29c
fix: deviceId method
blva Aug 28, 2025
d2523b8
fix: adapt deviceId import to cjs and esm
blva Aug 28, 2025
a796173
clean up
blva Aug 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/helpers/deviceId.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { getDeviceId } from "@mongodb-js/device-id";
import * as nodeMachineId from "node-machine-id";
import type { LoggerBase } from "../common/logger.js";
import { LogId } from "../common/logger.js";

Expand All @@ -17,7 +16,11 @@ export class DeviceId {
private constructor(logger: LoggerBase, timeout: number = DEVICE_ID_TIMEOUT) {
this.logger = logger;
this.timeout = timeout;
this.getMachineId = (): Promise<string> => nodeMachineId.machineId(true);
this.getMachineId = async (): Promise<string> => {
const nodeMachineId = await import("node-machine-id");
const machineId = nodeMachineId.default?.machineId || nodeMachineId.machineId;
return machineId(true);
};
this.abortController = new AbortController();

this.deviceIdPromise = DeviceId.UnknownDeviceId;
Expand Down
Loading