commit 6bf9bd3fa22667f4f84a7f3b5dc0dff433c3abab · kitten.sh/lan-network

+5

.changeset/funny-sloths-joke.md

···

       1
       1
       +
       ---

     

       2
       2
       +
       'lan-network': patch

     

       3
       3
       +
       ---

     

       4
       4
       +
       

     

       5
       5
       +
       Fix probing and fallback methods for Windows

+17 -2

src/network.ts

···

       46
       46
        
       };

     

       47
       47
        
       

     

       48
       48
        
       /** Determines if an assignment is internal (indicated by the flag or by a zeroed mac address) */

     

       49
       49
       -
       export const isInternal = (assignment: NetworkAssignment) =>

     

       50
       50
       -
         assignment.internal || parseMacStr(assignment.mac).every(x => !x);

     

       49
       49
       +
       export const isInternal = (assignment: NetworkAssignment) => {

     

       50
       50
       +
         if (assignment.internal) {

     

       51
       51
       +
           return true;

     

       52
       52
       +
         }

     

       53
       53
       +
         const mac = parseMacStr(assignment.mac);

     

       54
       54
       +
         if (mac.every(x => !x)) {

     

       55
       55
       +
           return true;

     

       56
       56
       +
         } else if (mac[0] === 0 && mac[1] === 21 && mac[2] === 93) {

     

       57
       57
       +
           // NOTE(@kitten): Microsoft virtual interface

     

       58
       58
       +
           return true;

     

       59
       59
       +
         } else if (assignment.iname.includes('vEthernet')) {

     

       60
       60
       +
           // NOTE(@kitten): Other Windows virtual interfaces

     

       61
       61
       +
           return true;

     

       62
       62
       +
         } else {

     

       63
       63
       +
           return false;

     

       64
       64
       +
         }

     

       65
       65
       +
       };

     

       51
       66
        
       

     

       52
       67
        
       export const interfaceAssignments = (): NetworkAssignment[] => {

     

       53
       68
        
         const candidates: NetworkAssignment[] = [];

+3 -3

src/route.ts

···

       1
       1
        
       import { createSocket } from 'dgram';

     

       2
       2
        
       

     

       3
       3
       -
       const NOOP_PORT = 65535;

     

       4
       4
       -
       const NOOP_IP = '255.255.255.255';

     

       3
       3
       +
       const PROBE_PORT = 53;

     

       4
       4
       +
       const PROBE_IP = '1.1.1.1';

     

       5
       5
        
       const NO_ROUTE_IP = '0.0.0.0';

     

       6
       6
        
       

     

       7
       7
        
       class DefaultRouteError extends TypeError {

     
···

       16
       16
        
             socket.close();

     

       17
       17
        
             socket.unref();

     

       18
       18
        
           });

     

       19
       19
       -
           socket.connect(NOOP_PORT, NOOP_IP, () => {

     

       19
       19
       +
           socket.connect(PROBE_PORT, PROBE_IP, () => {

     

       20
       20
        
             const address = socket.address();

     

       21
       21
        
             if (address && 'address' in address && address.address !== NO_ROUTE_IP) {

     

       22
       22
        
               resolve(address.address);