Skip to content

Remove network-interfaces, use os.networkInterfaces() directly #7195

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

Closed
ryancbahan wants to merge 1 commit into from
Closed

Remove network-interfaces, use os.networkInterfaces() directly #7195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion packages/cli-kit/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,6 @@
"macaddress": "0.5.3",
"minimatch": "9.0.8",
"mrmime": "1.0.1",
"network-interfaces": "1.1.0",
"node-abort-controller": "3.1.1",
"node-fetch": "3.3.2",
"open": "8.4.2",
Expand Down
16 changes: 14 additions & 2 deletions packages/cli-kit/src/public/node/vendor/dev_server/dev-server-2024.ts
View file
Open in desktop
Copy link
Copy Markdown
Contributor

@gonzaloriestra gonzaloriestra Apr 6, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We are vendoring this from https://github.com/Shopify/dev_server, I think we should remove the dependency from there and then update this code.

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {assertConnectable, getIpFromHosts} from './network/index.js'
import {assertCompatibleEnvironment} from './env.js'
import * as ni from 'network-interfaces'
import fs from 'node:fs'
import os from 'node:os'

import type {HostOptions} from './types.js'

Expand Down Expand Up @@ -52,7 +52,7 @@ function assertRunning2024(projectName: string): void {
function getBackendIp(projectName: string): string {
try {
const backendIp = resolveBackendHost(projectName)
ni.fromIp(backendIp, {internal: true, ipVersion: 4})
assertIpOnLocalInterface(backendIp)

return backendIp
} catch (error) {
Expand All @@ -75,6 +75,18 @@ function resolveBackendHost(name: string): string {
}
}

function assertIpOnLocalInterface(ip: string): void {
const interfaces = os.networkInterfaces()
for (const addresses of Object.values(interfaces)) {
for (const addr of addresses ?? []) {
if (addr.address === ip && addr.internal && addr.family === 'IPv4') {
return
}
}
}
throw new Error(`No suitable interfaces were found with IP address "${ip}"`)
}

// Allow overrides for more concise test setup. Meh.
let assertRunningOverride: typeof assertRunning2024 | undefined

Expand Down
5 changes: 0 additions & 5 deletions packages/cli-kit/src/public/node/vendor/dev_server/network-interfaces.d.ts
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading