diff --git a/.eslintrc.json b/.eslintrc.json index 2a8c5a6..e61caec 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -1,6 +1,7 @@ { "env": { - "node": true + "node": true, + "es6": true }, "extends": "eslint:recommended", "rules": { diff --git a/actions/killServer.js b/actions/killServer.js index 01d62d3..333bcda 100644 --- a/actions/killServer.js +++ b/actions/killServer.js @@ -10,8 +10,8 @@ function killServer(domain, outPort) { shell.rm('-rf', conf(npath.confD(), domain, outPort)); shell.rm('-rf', npath.webRootDomain(domain, outPort)); - nginxReload(); removeFromList(domain, outPort); + nginxReload(); } module.exports = killServer; \ No newline at end of file diff --git a/actions/listServers.js b/actions/listServers.js new file mode 100644 index 0000000..349154c --- /dev/null +++ b/actions/listServers.js @@ -0,0 +1,12 @@ +var readServers = require('../utils/listFile').readServers; +var prettyjson = require('prettyjson'); + +var EOL = require('os').EOL; + +function listServers() { + var serversList = readServers(); + if(serversList) console.log(EOL + prettyjson.render(serversList) + EOL); + else console.log("\nNo servers were found! Create some using `up`!\n"); +} + +module.exports = listServers; \ No newline at end of file diff --git a/assets/tlds.txt b/assets/tlds.txt new file mode 100644 index 0000000..c87ced8 --- /dev/null +++ b/assets/tlds.txt @@ -0,0 +1,1542 @@ +# Version 2017110701, Last Updated Wed Nov 8 07:07:02 2017 UTC +AAA +AARP +ABARTH +ABB +ABBOTT +ABBVIE +ABC +ABLE +ABOGADO +ABUDHABI +AC +ACADEMY +ACCENTURE +ACCOUNTANT +ACCOUNTANTS +ACO +ACTIVE +ACTOR +AD +ADAC +ADS +ADULT +AE +AEG +AERO +AETNA +AF +AFAMILYCOMPANY +AFL +AFRICA +AG +AGAKHAN +AGENCY +AI +AIG +AIGO +AIRBUS +AIRFORCE +AIRTEL +AKDN +AL +ALFAROMEO +ALIBABA +ALIPAY +ALLFINANZ +ALLSTATE +ALLY +ALSACE +ALSTOM +AM +AMERICANEXPRESS +AMERICANFAMILY +AMEX +AMFAM +AMICA +AMSTERDAM +ANALYTICS +ANDROID +ANQUAN +ANZ +AO +AOL +APARTMENTS +APP +APPLE +AQ +AQUARELLE +AR +ARAB +ARAMCO +ARCHI +ARMY +ARPA +ART +ARTE +AS +ASDA +ASIA +ASSOCIATES +AT +ATHLETA +ATTORNEY +AU +AUCTION +AUDI +AUDIBLE +AUDIO +AUSPOST +AUTHOR +AUTO +AUTOS +AVIANCA +AW +AWS +AX +AXA +AZ +AZURE +BA +BABY +BAIDU +BANAMEX +BANANAREPUBLIC +BAND +BANK +BAR +BARCELONA +BARCLAYCARD +BARCLAYS +BAREFOOT +BARGAINS +BASEBALL +BASKETBALL +BAUHAUS +BAYERN +BB +BBC +BBT +BBVA +BCG +BCN +BD +BE +BEATS +BEAUTY +BEER +BENTLEY +BERLIN +BEST +BESTBUY +BET +BF +BG +BH +BHARTI +BI +BIBLE +BID +BIKE +BING +BINGO +BIO +BIZ +BJ +BLACK +BLACKFRIDAY +BLANCO +BLOCKBUSTER +BLOG +BLOOMBERG +BLUE +BM +BMS +BMW +BN +BNL +BNPPARIBAS +BO +BOATS +BOEHRINGER +BOFA +BOM +BOND +BOO +BOOK +BOOKING +BOOTS +BOSCH +BOSTIK +BOSTON +BOT +BOUTIQUE +BOX +BR +BRADESCO +BRIDGESTONE +BROADWAY +BROKER +BROTHER +BRUSSELS +BS +BT +BUDAPEST +BUGATTI +BUILD +BUILDERS +BUSINESS +BUY +BUZZ +BV +BW +BY +BZ +BZH +CA +CAB +CAFE +CAL +CALL +CALVINKLEIN +CAM +CAMERA +CAMP +CANCERRESEARCH +CANON +CAPETOWN +CAPITAL +CAPITALONE +CAR +CARAVAN +CARDS +CARE +CAREER +CAREERS +CARS +CARTIER +CASA +CASE +CASEIH +CASH +CASINO +CAT +CATERING +CATHOLIC +CBA +CBN +CBRE +CBS +CC +CD +CEB +CENTER +CEO +CERN +CF +CFA +CFD +CG +CH +CHANEL +CHANNEL +CHASE +CHAT +CHEAP +CHINTAI +CHRISTMAS +CHROME +CHRYSLER +CHURCH +CI +CIPRIANI +CIRCLE +CISCO +CITADEL +CITI +CITIC +CITY +CITYEATS +CK +CL +CLAIMS +CLEANING +CLICK +CLINIC +CLINIQUE +CLOTHING +CLOUD +CLUB +CLUBMED +CM +CN +CO +COACH +CODES +COFFEE +COLLEGE +COLOGNE +COM +COMCAST +COMMBANK +COMMUNITY +COMPANY +COMPARE +COMPUTER +COMSEC +CONDOS +CONSTRUCTION +CONSULTING +CONTACT +CONTRACTORS +COOKING +COOKINGCHANNEL +COOL +COOP +CORSICA +COUNTRY +COUPON +COUPONS +COURSES +CR +CREDIT +CREDITCARD +CREDITUNION +CRICKET +CROWN +CRS +CRUISE +CRUISES +CSC +CU +CUISINELLA +CV +CW +CX +CY +CYMRU +CYOU +CZ +DABUR +DAD +DANCE +DATA +DATE +DATING +DATSUN +DAY +DCLK +DDS +DE +DEAL +DEALER +DEALS +DEGREE +DELIVERY +DELL +DELOITTE +DELTA +DEMOCRAT +DENTAL +DENTIST +DESI +DESIGN +DEV +DHL +DIAMONDS +DIET +DIGITAL +DIRECT +DIRECTORY +DISCOUNT +DISCOVER +DISH +DIY +DJ +DK +DM +DNP +DO +DOCS +DOCTOR +DODGE +DOG +DOHA +DOMAINS +DOT +DOWNLOAD +DRIVE +DTV +DUBAI +DUCK +DUNLOP +DUNS +DUPONT +DURBAN +DVAG +DVR +DZ +EARTH +EAT +EC +ECO +EDEKA +EDU +EDUCATION +EE +EG +EMAIL +EMERCK +ENERGY +ENGINEER +ENGINEERING +ENTERPRISES +EPOST +EPSON +EQUIPMENT +ER +ERICSSON +ERNI +ES +ESQ +ESTATE +ESURANCE +ET +ETISALAT +EU +EUROVISION +EUS +EVENTS +EVERBANK +EXCHANGE +EXPERT +EXPOSED +EXPRESS +EXTRASPACE +FAGE +FAIL +FAIRWINDS +FAITH +FAMILY +FAN +FANS +FARM +FARMERS +FASHION +FAST +FEDEX +FEEDBACK +FERRARI +FERRERO +FI +FIAT +FIDELITY +FIDO +FILM +FINAL +FINANCE +FINANCIAL +FIRE +FIRESTONE +FIRMDALE +FISH +FISHING +FIT +FITNESS +FJ +FK +FLICKR +FLIGHTS +FLIR +FLORIST +FLOWERS +FLY +FM +FO +FOO +FOOD +FOODNETWORK +FOOTBALL +FORD +FOREX +FORSALE +FORUM +FOUNDATION +FOX +FR +FREE +FRESENIUS +FRL +FROGANS +FRONTDOOR +FRONTIER +FTR +FUJITSU +FUJIXEROX +FUN +FUND +FURNITURE +FUTBOL +FYI +GA +GAL +GALLERY +GALLO +GALLUP +GAME +GAMES +GAP +GARDEN +GB +GBIZ +GD +GDN +GE +GEA +GENT +GENTING +GEORGE +GF +GG +GGEE +GH +GI +GIFT +GIFTS +GIVES +GIVING +GL +GLADE +GLASS +GLE +GLOBAL +GLOBO +GM +GMAIL +GMBH +GMO +GMX +GN +GODADDY +GOLD +GOLDPOINT +GOLF +GOO +GOODHANDS +GOODYEAR +GOOG +GOOGLE +GOP +GOT +GOV +GP +GQ +GR +GRAINGER +GRAPHICS +GRATIS +GREEN +GRIPE +GROCERY +GROUP +GS +GT +GU +GUARDIAN +GUCCI +GUGE +GUIDE +GUITARS +GURU +GW +GY +HAIR +HAMBURG +HANGOUT +HAUS +HBO +HDFC +HDFCBANK +HEALTH +HEALTHCARE +HELP +HELSINKI +HERE +HERMES +HGTV +HIPHOP +HISAMITSU +HITACHI +HIV +HK +HKT +HM +HN +HOCKEY +HOLDINGS +HOLIDAY +HOMEDEPOT +HOMEGOODS +HOMES +HOMESENSE +HONDA +HONEYWELL +HORSE +HOSPITAL +HOST +HOSTING +HOT +HOTELES +HOTELS +HOTMAIL +HOUSE +HOW +HR +HSBC +HT +HU +HUGHES +HYATT +HYUNDAI +IBM +ICBC +ICE +ICU +ID +IE +IEEE +IFM +IKANO +IL +IM +IMAMAT +IMDB +IMMO +IMMOBILIEN +IN +INDUSTRIES +INFINITI +INFO +ING +INK +INSTITUTE +INSURANCE +INSURE +INT +INTEL +INTERNATIONAL +INTUIT +INVESTMENTS +IO +IPIRANGA +IQ +IR +IRISH +IS +ISELECT +ISMAILI +IST +ISTANBUL +IT +ITAU +ITV +IVECO +IWC +JAGUAR +JAVA +JCB +JCP +JE +JEEP +JETZT +JEWELRY +JIO +JLC +JLL +JM +JMP +JNJ +JO +JOBS +JOBURG +JOT +JOY +JP +JPMORGAN +JPRS +JUEGOS +JUNIPER +KAUFEN +KDDI +KE +KERRYHOTELS +KERRYLOGISTICS +KERRYPROPERTIES +KFH +KG +KH +KI +KIA +KIM +KINDER +KINDLE +KITCHEN +KIWI +KM +KN +KOELN +KOMATSU +KOSHER +KP +KPMG +KPN +KR +KRD +KRED +KUOKGROUP +KW +KY +KYOTO +KZ +LA +LACAIXA +LADBROKES +LAMBORGHINI +LAMER +LANCASTER +LANCIA +LANCOME +LAND +LANDROVER +LANXESS +LASALLE +LAT +LATINO +LATROBE +LAW +LAWYER +LB +LC +LDS +LEASE +LECLERC +LEFRAK +LEGAL +LEGO +LEXUS +LGBT +LI +LIAISON +LIDL +LIFE +LIFEINSURANCE +LIFESTYLE +LIGHTING +LIKE +LILLY +LIMITED +LIMO +LINCOLN +LINDE +LINK +LIPSY +LIVE +LIVING +LIXIL +LK +LOAN +LOANS +LOCKER +LOCUS +LOFT +LOL +LONDON +LOTTE +LOTTO +LOVE +LPL +LPLFINANCIAL +LR +LS +LT +LTD +LTDA +LU +LUNDBECK +LUPIN +LUXE +LUXURY +LV +LY +MA +MACYS +MADRID +MAIF +MAISON +MAKEUP +MAN +MANAGEMENT +MANGO +MAP +MARKET +MARKETING +MARKETS +MARRIOTT +MARSHALLS +MASERATI +MATTEL +MBA +MC +MCKINSEY +MD +ME +MED +MEDIA +MEET +MELBOURNE +MEME +MEMORIAL +MEN +MENU +MEO +MERCKMSD +METLIFE +MG +MH +MIAMI +MICROSOFT +MIL +MINI +MINT +MIT +MITSUBISHI +MK +ML +MLB +MLS +MM +MMA +MN +MO +MOBI +MOBILE +MOBILY +MODA +MOE +MOI +MOM +MONASH +MONEY +MONSTER +MOPAR +MORMON +MORTGAGE +MOSCOW +MOTO +MOTORCYCLES +MOV +MOVIE +MOVISTAR +MP +MQ +MR +MS +MSD +MT +MTN +MTR +MU +MUSEUM +MUTUAL +MV +MW +MX +MY +MZ +NA +NAB +NADEX +NAGOYA +NAME +NATIONWIDE +NATURA +NAVY +NBA +NC +NE +NEC +NET +NETBANK +NETFLIX +NETWORK +NEUSTAR +NEW +NEWHOLLAND +NEWS +NEXT +NEXTDIRECT +NEXUS +NF +NFL +NG +NGO +NHK +NI +NICO +NIKE +NIKON +NINJA +NISSAN +NISSAY +NL +NO +NOKIA +NORTHWESTERNMUTUAL +NORTON +NOW +NOWRUZ +NOWTV +NP +NR +NRA +NRW +NTT +NU +NYC +NZ +OBI +OBSERVER +OFF +OFFICE +OKINAWA +OLAYAN +OLAYANGROUP +OLDNAVY +OLLO +OM +OMEGA +ONE +ONG +ONL +ONLINE +ONYOURSIDE +OOO +OPEN +ORACLE +ORANGE +ORG +ORGANIC +ORIGINS +OSAKA +OTSUKA +OTT +OVH +PA +PAGE +PANASONIC +PANERAI +PARIS +PARS +PARTNERS +PARTS +PARTY +PASSAGENS +PAY +PCCW +PE +PET +PF +PFIZER +PG +PH +PHARMACY +PHD +PHILIPS +PHONE +PHOTO +PHOTOGRAPHY +PHOTOS +PHYSIO +PIAGET +PICS +PICTET +PICTURES +PID +PIN +PING +PINK +PIONEER +PIZZA +PK +PL +PLACE +PLAY +PLAYSTATION +PLUMBING +PLUS +PM +PN +PNC +POHL +POKER +POLITIE +PORN +POST +PR +PRAMERICA +PRAXI +PRESS +PRIME +PRO +PROD +PRODUCTIONS +PROF +PROGRESSIVE +PROMO +PROPERTIES +PROPERTY +PROTECTION +PRU +PRUDENTIAL +PS +PT +PUB +PW +PWC +PY +QA +QPON +QUEBEC +QUEST +QVC +RACING +RADIO +RAID +RE +READ +REALESTATE +REALTOR +REALTY +RECIPES +RED +REDSTONE +REDUMBRELLA +REHAB +REISE +REISEN +REIT +RELIANCE +REN +RENT +RENTALS +REPAIR +REPORT +REPUBLICAN +REST +RESTAURANT +REVIEW +REVIEWS +REXROTH +RICH +RICHARDLI +RICOH +RIGHTATHOME +RIL +RIO +RIP +RMIT +RO +ROCHER +ROCKS +RODEO +ROGERS +ROOM +RS +RSVP +RU +RUGBY +RUHR +RUN +RW +RWE +RYUKYU +SA +SAARLAND +SAFE +SAFETY +SAKURA +SALE +SALON +SAMSCLUB +SAMSUNG +SANDVIK +SANDVIKCOROMANT +SANOFI +SAP +SAPO +SARL +SAS +SAVE +SAXO +SB +SBI +SBS +SC +SCA +SCB +SCHAEFFLER +SCHMIDT +SCHOLARSHIPS +SCHOOL +SCHULE +SCHWARZ +SCIENCE +SCJOHNSON +SCOR +SCOT +SD +SE +SEARCH +SEAT +SECURE +SECURITY +SEEK +SELECT +SENER +SERVICES +SES +SEVEN +SEW +SEX +SEXY +SFR +SG +SH +SHANGRILA +SHARP +SHAW +SHELL +SHIA +SHIKSHA +SHOES +SHOP +SHOPPING +SHOUJI +SHOW +SHOWTIME +SHRIRAM +SI +SILK +SINA +SINGLES +SITE +SJ +SK +SKI +SKIN +SKY +SKYPE +SL +SLING +SM +SMART +SMILE +SN +SNCF +SO +SOCCER +SOCIAL +SOFTBANK +SOFTWARE +SOHU +SOLAR +SOLUTIONS +SONG +SONY +SOY +SPACE +SPIEGEL +SPOT +SPREADBETTING +SR +SRL +SRT +ST +STADA +STAPLES +STAR +STARHUB +STATEBANK +STATEFARM +STATOIL +STC +STCGROUP +STOCKHOLM +STORAGE +STORE +STREAM +STUDIO +STUDY +STYLE +SU +SUCKS +SUPPLIES +SUPPLY +SUPPORT +SURF +SURGERY +SUZUKI +SV +SWATCH +SWIFTCOVER +SWISS +SX +SY +SYDNEY +SYMANTEC +SYSTEMS +SZ +TAB +TAIPEI +TALK +TAOBAO +TARGET +TATAMOTORS +TATAR +TATTOO +TAX +TAXI +TC +TCI +TD +TDK +TEAM +TECH +TECHNOLOGY +TEL +TELECITY +TELEFONICA +TEMASEK +TENNIS +TEVA +TF +TG +TH +THD +THEATER +THEATRE +TIAA +TICKETS +TIENDA +TIFFANY +TIPS +TIRES +TIROL +TJ +TJMAXX +TJX +TK +TKMAXX +TL +TM +TMALL +TN +TO +TODAY +TOKYO +TOOLS +TOP +TORAY +TOSHIBA +TOTAL +TOURS +TOWN +TOYOTA +TOYS +TR +TRADE +TRADING +TRAINING +TRAVEL +TRAVELCHANNEL +TRAVELERS +TRAVELERSINSURANCE +TRUST +TRV +TT +TUBE +TUI +TUNES +TUSHU +TV +TVS +TW +TZ +UA +UBANK +UBS +UCONNECT +UG +UK +UNICOM +UNIVERSITY +UNO +UOL +UPS +US +UY +UZ +VA +VACATIONS +VANA +VANGUARD +VC +VE +VEGAS +VENTURES +VERISIGN +VERSICHERUNG +VET +VG +VI +VIAJES +VIDEO +VIG +VIKING +VILLAS +VIN +VIP +VIRGIN +VISA +VISION +VISTA +VISTAPRINT +VIVA +VIVO +VLAANDEREN +VN +VODKA +VOLKSWAGEN +VOLVO +VOTE +VOTING +VOTO +VOYAGE +VU +VUELOS +WALES +WALMART +WALTER +WANG +WANGGOU +WARMAN +WATCH +WATCHES +WEATHER +WEATHERCHANNEL +WEBCAM +WEBER +WEBSITE +WED +WEDDING +WEIBO +WEIR +WF +WHOSWHO +WIEN +WIKI +WILLIAMHILL +WIN +WINDOWS +WINE +WINNERS +WME +WOLTERSKLUWER +WOODSIDE +WORK +WORKS +WORLD +WOW +WS +WTC +WTF +XBOX +XEROX +XFINITY +XIHUAN +XIN +XN--11B4C3D +XN--1CK2E1B +XN--1QQW23A +XN--2SCRJ9C +XN--30RR7Y +XN--3BST00M +XN--3DS443G +XN--3E0B707E +XN--3HCRJ9C +XN--3OQ18VL8PN36A +XN--3PXU8K +XN--42C2D9A +XN--45BR5CYL +XN--45BRJ9C +XN--45Q11C +XN--4GBRIM +XN--54B7FTA0CC +XN--55QW42G +XN--55QX5D +XN--5SU34J936BGSG +XN--5TZM5G +XN--6FRZ82G +XN--6QQ986B3XL +XN--80ADXHKS +XN--80AO21A +XN--80AQECDR1A +XN--80ASEHDB +XN--80ASWG +XN--8Y0A063A +XN--90A3AC +XN--90AE +XN--90AIS +XN--9DBQ2A +XN--9ET52U +XN--9KRT00A +XN--B4W605FERD +XN--BCK1B9A5DRE4C +XN--C1AVG +XN--C2BR7G +XN--CCK2B3B +XN--CG4BKI +XN--CLCHC0EA0B2G2A9GCD +XN--CZR694B +XN--CZRS0T +XN--CZRU2D +XN--D1ACJ3B +XN--D1ALF +XN--E1A4C +XN--ECKVDTC9D +XN--EFVY88H +XN--ESTV75G +XN--FCT429K +XN--FHBEI +XN--FIQ228C5HS +XN--FIQ64B +XN--FIQS8S +XN--FIQZ9S +XN--FJQ720A +XN--FLW351E +XN--FPCRJ9C3D +XN--FZC2C9E2C +XN--FZYS8D69UVGM +XN--G2XX48C +XN--GCKR3F0F +XN--GECRJ9C +XN--GK3AT1E +XN--H2BREG3EVE +XN--H2BRJ9C +XN--H2BRJ9C8C +XN--HXT814E +XN--I1B6B1A6A2E +XN--IMR513N +XN--IO0A7I +XN--J1AEF +XN--J1AMH +XN--J6W193G +XN--JLQ61U9W7B +XN--JVR189M +XN--KCRX77D1X4A +XN--KPRW13D +XN--KPRY57D +XN--KPU716F +XN--KPUT3I +XN--L1ACC +XN--LGBBAT1AD8J +XN--MGB9AWBF +XN--MGBA3A3EJT +XN--MGBA3A4F16A +XN--MGBA7C0BBN0A +XN--MGBAAKC7DVF +XN--MGBAAM7A8H +XN--MGBAB2BD +XN--MGBAI9AZGQP6J +XN--MGBAYH7GPA +XN--MGBB9FBPOB +XN--MGBBH1A +XN--MGBBH1A71E +XN--MGBC0A9AZCG +XN--MGBCA7DZDO +XN--MGBERP4A5D4AR +XN--MGBGU82A +XN--MGBI4ECEXP +XN--MGBPL2FH +XN--MGBT3DHD +XN--MGBTX2B +XN--MGBX4CD0AB +XN--MIX891F +XN--MK1BU44C +XN--MXTQ1M +XN--NGBC5AZD +XN--NGBE9E0A +XN--NGBRX +XN--NODE +XN--NQV7F +XN--NQV7FS00EMA +XN--NYQY26A +XN--O3CW4H +XN--OGBPF8FL +XN--P1ACF +XN--P1AI +XN--PBT977C +XN--PGBS0DH +XN--PSSY2U +XN--Q9JYB4C +XN--QCKA1PMC +XN--QXAM +XN--RHQV96G +XN--ROVU88B +XN--RVC1E0AM3E +XN--S9BRJ9C +XN--SES554G +XN--T60B56A +XN--TCKWE +XN--TIQ49XQYJ +XN--UNUP4Y +XN--VERMGENSBERATER-CTB +XN--VERMGENSBERATUNG-PWB +XN--VHQUV +XN--VUQ861B +XN--W4R85EL8FHU5DNRA +XN--W4RS40L +XN--WGBH1C +XN--WGBL6A +XN--XHQ521B +XN--XKC2AL3HYE2A +XN--XKC2DL3A5EE0H +XN--Y9A3AQ +XN--YFRO4I67O +XN--YGBI2AMMX +XN--ZFR164B +XPERIA +XXX +XYZ +YACHTS +YAHOO +YAMAXUN +YANDEX +YE +YODOBASHI +YOGA +YOKOHAMA +YOU +YOUTUBE +YT +YUN +ZA +ZAPPOS +ZARA +ZERO +ZIP +ZIPPO +ZM +ZONE +ZUERICH +ZW diff --git a/build/fetchTLDS.js b/build/fetchTLDS.js new file mode 100644 index 0000000..bc796dc --- /dev/null +++ b/build/fetchTLDS.js @@ -0,0 +1,7 @@ +var https = require('https'); +var fs = require('fs-extra'); + +var file = fs.createWriteStream("./assets/tlds.txt"); +https.get("https://data.iana.org/TLD/tlds-alpha-by-domain.txt", function(response) { + response.pipe(file); +}); \ No newline at end of file diff --git a/index.js b/index.js index 1928e47..f34d099 100755 --- a/index.js +++ b/index.js @@ -3,21 +3,18 @@ // Requiring npm modules var program = require('commander'); var chalk = require('chalk'); -var fs = require('fs-extra'); -var prettyjson = require('prettyjson'); +//var fs = require('fs-extra'); // Requiring Actions var createProxyServer = require('./actions/createProxyServer'); var createStaticServer = require('./actions/createStaticServer'); var killServer = require('./actions/killServer'); +var listServers = require('./actions/listServers'); // Requiring utils var validate = require('./utils/validate'); var requirements = require('./utils/requirements'); -var appendToList = require('./utils/listFile').appendToList; -var readServers = require('./utils/listFile').readServers; -var EOL = require('os').EOL; // Check for requirements such as OS version and nginx install. Throw and exit if requirements not found. // #Roadmap: Add ability to satisfy any possible requirements. @@ -52,8 +49,7 @@ program .command('list') .description('List all available servers.') .action(function () { - var serversList = readServers(); - console.log(EOL + prettyjson.render(serversList) + EOL); + listServers(); }); program diff --git a/package-lock.json b/package-lock.json index 1e6be01..d926a88 100644 --- a/package-lock.json +++ b/package-lock.json @@ -682,11 +682,6 @@ "integrity": "sha512-xYuhvQ7I9PDJIGBWev9xm0+SMSed3ZDBAmvVjbFR1ZRLAF+vlXcQu6cRI9uAlj81rzikElRVteehwV7DuX2ZmQ==", "dev": true }, - "json-beautify": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json-beautify/-/json-beautify-1.0.1.tgz", - "integrity": "sha1-WYtQ1Mjqm4/KWru0C34svTrUwvw=" - }, "json-schema-traverse": { "version": "0.3.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz", @@ -1180,11 +1175,6 @@ "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", "dev": true }, - "validator": { - "version": "9.1.1", - "resolved": "https://registry.npmjs.org/validator/-/validator-9.1.1.tgz", - "integrity": "sha512-1TGGX1GKilfmcEa9rm+9nI9AqIUQK8oj4jZI0DmTGLTPM5jmowBBhyBIHCks73+P1QPZk2i6oOYUq583uOetHQ==" - }, "which": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/which/-/which-1.3.0.tgz", diff --git a/package.json b/package.json index 1e29975..1064781 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,8 @@ "description": "A cli tool to quickly create and manage nginx server blocks.", "main": "index.js", "scripts": { - "test": "echo \"Error: no test specified\" && exit 1" + "test": "echo \"Error: no test specified\" && exit 1", + "build": "node ./build/fetchTLDS" }, "repository": { "type": "git", @@ -30,10 +31,8 @@ "chalk": "^2.3.0", "commander": "^2.11.0", "fs-extra": "^4.0.2", - "json-beautify": "^1.0.1", "prettyjson": "^1.2.1", - "shelljs": "^0.7.8", - "validator": "^9.1.1" + "shelljs": "^0.7.8" }, "devDependencies": { "eslint": "^4.10.0" diff --git a/servers.up b/servers.up new file mode 100644 index 0000000..0637a08 --- /dev/null +++ b/servers.up @@ -0,0 +1 @@ +[] \ No newline at end of file diff --git a/utils/isFQDN.js b/utils/isFQDN.js new file mode 100644 index 0000000..5b9a6cd --- /dev/null +++ b/utils/isFQDN.js @@ -0,0 +1,61 @@ +// Module courtesy of TRGWII +// Original: https://github.com/trgwii/isFQDN + +'use strict'; + +var fs = require('fs-extra'); + +// Official list of TLDs should be fetched from: +// https://data.iana.org/TLD/tlds-alpha-by-domain.txt + +// You must have received a copy of the list along with `up` +// Run `npm run build` to update the cached list + +function isFQDN(domain) { + + // Importing and parsing `tlds.txt` file + var tlds = fs.readFileSync('./assets/tlds.txt', 'utf8') + .split(/[\r\n]+/) + .filter(x => !x.startsWith('#')); + + if (domain.length > 253) { + return false; + } + + var labels = domain.split('.').reverse(); + + if (labels.length < 2) { + return false; + } + + var tld = labels[0]; + + if (!tlds.includes(tld.toUpperCase())) { + return false; + } + + for (var label of labels) { + + const len = label.length; + + if (len > 63 || len === 0) { + return false; + } + + for (let i = 0; i < len; i++) { + + const char = label[i]; + + if ((i === 0 || i === len - 1) && char === '-') { + return false; + } + + if (!char.match(/^[a-zA-Z0-9-]$/)) { + return false; + } + } + } + return true; +}; + +module.exports = isFQDN; \ No newline at end of file diff --git a/utils/listFile.js b/utils/listFile.js index 66f19bf..d185eef 100644 --- a/utils/listFile.js +++ b/utils/listFile.js @@ -1,49 +1,48 @@ var fs = require('fs-extra'); var shell = require('shelljs'); -var beautifyJSON = require("json-beautify"); + +var removeFromArray = require('./removeFromArray'); var EOL = require('os').EOL; // \n if used on Linux, \r\n if used on Windows. -var listFilePath = "/etc/up-serve/servers.up"; +var listFilePath = "./servers.up"; function appendToList(domain, outPort, inPort) { inPort = inPort || undefined; - var jsonFile = {}; + var jsonFile = { "domains": [] }; var domBlock; if (!inPort) { domBlock = { - "type": "static", - "outPort": outPort, - "inPort": undefined - } + "domain": domain, + "type": "static", + "outPort": outPort + }; } else { domBlock = { - "type": "proxy", - "outPort": outPort, - "inPort": inPort - } + "domain": domain, + "type": "proxy", + "outPort": outPort, + "inPort": inPort + }; } if (fs.existsSync(listFilePath)) { jsonFile = fs.readFileSync(listFilePath); jsonFile = JSON.parse(jsonFile); - for (block in jsonFile) { - if (block[domain] == domain && block[domain].outPort == outPort) { - delete jsonFile.block; - return; + /*for (name in jsonFile) { + if (name == domain && jsonFile[name][outPort] == outPort) { + delete jsonFile[domain]; + console.log('\nDomain was deleted successfully.\n'); } - } - - jsonFile[domain] = domBlock; - jsonFile = beautifyJSON(jsonFile, null, 2, 30); - } - else { - jsonFile[domain] = domBlock; - jsonFile = beautifyJSON(jsonFile); + }*/ + jsonFile = removeFromArray(jsonFile.domains, domain, outPort); } + + jsonFile.domains.push(domBlock); + jsonFile = JSON.stringify(jsonFile, null, '\t'); fs.writeFileSync(listFilePath, jsonFile); } @@ -52,25 +51,25 @@ function removeFromList (domain, outPort) { if (fs.existsSync(listFilePath)) { jsonFile = fs.readFileSync(listFilePath); jsonFile = JSON.parse(jsonFile); + + // for (name in jsonFile) { + // if (name == domain && jsonFile[domain].outPort == outPort) { + // delete jsonFile[domain]; + // console.log('\nDomain was deleted successfully.\n'); + // } + // } + jsonFile = removeFromArray(jsonFile.domains, domain, outPort); - for (block in jsonFile) { - if (block[domain] == domain && block[domain].outPort == outPort) { - delete jsonFile.block; - console.log('\nDomain was deleted successfully.\n'); - return; - } - } - - jsonFile = beautifyJSON(jsonFile, null, 2, 30); + jsonFile = JSON.stringify(jsonFile, null, '\t'); + fs.writeFileSync(listFilePath, jsonFile); } - else { - console.log("\Domain was not in my list. Are you sure?\n") - } - fs.writeFileSync(listFilePath, jsonFile); + else console.log("\nNo servers were created using `up` yet.\n"); } function readServers () { - return JSON.parse(fs.readFileSync(listFilePath)); + var serversList = JSON.parse(fs.readFileSync(listFilePath)); + if(!serversList[0]) return undefined; + return serversList; } module.exports.appendToList = appendToList; diff --git a/utils/removeFromArray.js b/utils/removeFromArray.js new file mode 100644 index 0000000..38d2bba --- /dev/null +++ b/utils/removeFromArray.js @@ -0,0 +1,15 @@ +function removeFromArray (arr, dom, port) { + var shouldDelete = []; + + for(var i = 0; i < arr.length; i++) if((arr[i].domain == dom) && (arr[i].outPort == port)) shouldDelete = [true, i]; + + if (shouldDelete[0]) { + arr.splice(shouldDelete[1], 1); + console.log('\nItem was deleted!\n'); + } else { + console.log('\nItem was not found!\n'); + } + return arr; +} + +module.exports = removeFromArray; \ No newline at end of file diff --git a/utils/validate.js b/utils/validate.js index 29e3589..f8e38eb 100644 --- a/utils/validate.js +++ b/utils/validate.js @@ -1,9 +1,8 @@ -var validator = require('validator'); var parseToInt = require('./parseToInt'); var isIP = require('./isIP'); // Using Validator -var isDomain = validator.isFQDN; +var isDomain = require('./isFQDN'); function validate(domain, inPort, outPort) { //