Personal_mirrors/bitburner-src
1
0
Fork 0
mirror of https://github.com/bitburner-official/bitburner-src.git synced 2025-03-08 03:24:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

[refactor] Moved isValidIPAddress to its own TS file

Browse Source
This commit is contained in:
Steven Evans
2018-07-04 21:30:50 -04:00
parent 8b98321b9c
commit bdb935d104
5 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/DarkWeb.js
View File

@ -3,7 +3,7 @@ import {Player} from "./Player";
import {SpecialServerIps} from "./SpecialServerIps";
import {post} from "./Terminal";
import {isValidIPAddress} from "../utils/IPAddress";
import {isValidIPAddress} from "../utils/helpers/isValidIPAddress";
import {formatNumber} from "../utils/StringHelperFunctions";

2
src/NetscriptEvaluator.js
View File

@ -10,7 +10,7 @@ import {Script, findRunningScript,
import {parse, Node} from "../utils/acorn";
import {printArray} from "../utils/HelperFunctions";
import {isValidIPAddress} from "../utils/IPAddress";
import {isValidIPAddress} from "../utils/helpers/isValidIPAddress";
import {isString} from "../utils/helpers/isString";
var Promise = require("bluebird");

3
src/Server.js
View File

@ -5,9 +5,10 @@ import {Player} from "./Player";
import {RunningScript, Script} from "./Script";
import {SpecialServerNames, SpecialServerIps} from "./SpecialServerIps";
import {getRandomInt} from "../utils/helpers/getRandomInt";
import {createRandomIp, isValidIPAddress, ipExists} from "../utils/IPAddress";
import {createRandomIp, ipExists} from "../utils/IPAddress";
import {Reviver, Generic_toJSON,
Generic_fromJSON} from "../utils/JSONReviver";
import {isValidIPAddress} from "../utils/helpers/isValidIPAddress";
function Server(params={ip:createRandomIp(), hostname:""}) {
/* Properties */

10
utils/IPAddress.js
View File

@ -30,12 +30,4 @@ function ipExists(ip) {
return false;
}
function isValidIPAddress(ipaddress) {
if (/^(25[0-6]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-6]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-6]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-6]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/.test(ipaddress))
{
return true;
}
return false;
}
export {createRandomIp, ipExists, isValidIPAddress};
export {createRandomIp, ipExists};

12
utils/helpers/isValidIPAddress.ts Normal file
View File

@ -0,0 +1,12 @@
/**
* Checks whether a IP Address string is valid.
* @param ipaddress A string representing a potential IP Address
*/
export function isValidIPAddress(ipaddress: string) {
const byteRange: string = "(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)";
const regexStr: string = `^${byteRange}\.${byteRange}\.${byteRange}\.${byteRange}$`;
const ipAddressRegex: RegExp = new RegExp(regexStr);
return ipAddressRegex.test(ipaddress);
}