diff --git a/CHANGELOG.md b/CHANGELOG.md index 7282c69..1b16e19 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,10 @@ All notable changes to this project are documented here. The project follows messages now name the exchange and its city. - One failing day no longer freezes the whole game: the error is caught, you get a heads-up, and time keeps running. +- Barcelona joins the map with Catnip-IX, local transit and peering. +- More exchanges now include FRIES-IX, Paella-NIX, KleyWrecks, + LO-NAPS, JINXED-IX and IX Strayla, plus BB-Kicks in Tokyo. + FRIES-IX 10G and 100G ports and LAG members are free. ## [1.10.0] — 2026-10-24 diff --git a/site/index.html b/site/index.html index c3ffb4c..2973cbc 100644 --- a/site/index.html +++ b/site/index.html @@ -578,7 +578,7 @@ const LANDS_LL=[{id:'am',ll:[[-166,68],[-157,71.2],[-141,69.8],[-128,70],[-115,6 LANDS_LL.push({id:'lk',ll:[[79.9, 9.8], [80.6, 9.6], [81.4, 8.5], [81.9, 7.4], [81.6, 6.4], [80.6, 5.9], [80.0, 6.2], [79.75, 7.2], [79.75, 8.3]]},{id:'sa',hide:true,ll:[[-77.5, 8.6], [-75, 10.8], [-71.5, 12.3], [-68, 10.6], [-62, 10.5], [-60, 8], [-57, 6], [-52, 5], [-50, 1.5], [-48, -1], [-44, -2.5], [-39, -3.5], [-35, -5.5], [-35, -9], [-37.5, -12.5], [-39, -15], [-39.7, -19], [-41, -22], [-44, -23], [-48, -26], [-48.6, -28.5], [-51, -31], [-53, -34], [-58, -34.5], [-57, -37], [-62, -39], [-65, -41], [-64, -43], [-67.5, -46], [-66, -48], [-69, -51], [-68.5, -53], [-70, -55], [-73, -53], [-75, -48], [-73.5, -43], [-73.5, -37], [-71.5, -32], [-71.3, -27], [-70.5, -20], [-71.5, -17], [-76, -14], [-78, -10], [-81, -6], [-80.5, -3], [-80, 0], [-79, 1.5], [-77.5, 4], [-77.4, 7.5]]},{id:'tw',ll:[[121.5, 25.35], [122.05, 25.0], [121.85, 24.3], [121.4, 23.0], [120.85, 21.9], [120.6, 22.3], [120.15, 22.9], [120.1, 23.6], [120.55, 24.5], [121.0, 25.1]]}); const LANDS=LANDS_LL.map(l=>({id:l.id,hide:!!l.hide,pts:l.ll.map(q=>proj(q[0],q[1]))})); const DECOR=[[[-73,78],[-60,81.5],[-35,82.5],[-20,81.5],[-18,77],[-20,72],[-23,70],[-30,68],[-38,65.5],[-43,60],[-48,61],[-52,64.5],[-54,68],[-55,71],[-60,76],[-68,77]],[[-80,73.5],[-72,71.5],[-67,69.5],[-62,66.5],[-64,63],[-71,62.5],[-78,64],[-83,66],[-88,70],[-85,73]],[[-110,76],[-95,77],[-80,79],[-70,82],[-90,82.3],[-105,79]],[[-118,73],[-105,72],[-100,69.5],[-110,68.8],[-118,70]],[[140,41.5],[141.6,42.4],[143.3,42],[145.6,43.3],[144.5,44],[141.9,45.5],[141.4,43.4],[140,42.6]],[[120.1,23],[121,25.2],[121.9,25],[121.5,22.5],[120.8,21.9]],[[122,11],[125.5,11.5],[126.5,9.5],[126.2,6.5],[124,6.5],[122,7]],[[95.3,5.6],[98,4],[100.3,2],[103.8,-1],[106,-3],[106,-5.9],[104.5,-5.9],[102.3,-4],[100.3,-1],[97.5,2.4],[95.2,4]],[[109.6,2],[111,1.6],[113,3.2],[115.5,5.2],[117.2,6.9],[119,5],[118,2],[117.5,0.6],[116.2,-2.5],[116,-4],[114.5,-3.4],[111.7,-3],[110,-1.6],[109,0.5]],[[119,-5.5],[120.5,-1],[121.5,1],[125,1.5],[123,-1],[121.5,-4.5]],[[131,-1.2],[134,-0.8],[138,-1.6],[141,-2.6],[145,-4.3],[147.5,-6],[147.5,-8],[146,-8],[143.4,-9.1],[141,-9.1],[139,-8],[138,-8.5],[137.7,-5.6],[134,-4],[132,-2.8]],[[172.6,-40.5],[174.3,-41.7],[173,-43.5],[171.2,-44.5],[170.6,-45.9],[169.2,-46.6],[166.5,-46],[167,-45],[168.4,-44],[170.8,-42.6],[171.5,-41.7]],[[144.6,-40.7],[148.3,-40.9],[148,-43.2],[146,-43.5]],[[49.3,-12],[50.5,-15.5],[49.5,-17.5],[47.1,-24.9],[45,-25.5],[43.8,-23.6],[43.3,-21],[44.4,-16.2],[46.5,-15.7],[48,-13.5]],[[79.8,9.8],[81.9,7.5],[81.2,6.2],[80,6],[79.7,8.2]],[[-85,21.9],[-82,23.2],[-77.5,22.3],[-74.2,20.2],[-77.7,19.9],[-80.5,21.8]],[[-74.5,18.5],[-72,19.9],[-68.4,18.6],[-70,18.2]],[[12.4,38.1],[15.6,38.3],[15.1,36.7]],[[8.2,41],[9.8,41.1],[9.6,39.1],[8.4,39]],[[11,78],[17,80],[27,80],[20,77]],[[52,71],[56,74],[64,76.5],[68,77],[58,74],[54,71]],[[142,46],[143.5,49],[143,54],[142,53],[141.8,48]],[[108.7,19],[111,19.7],[110,18.2]]].map(poly=>poly.map(q=>proj(q[0],q[1]))); -const CITY_LL={"mil":[9.19,45.46],"rom":[12.5,41.9],"pmo":[13.36,38.12],"lis":[-9.14,38.72],"ath":[23.73,37.98],"atn":[-84.39,33.75],"den":[-104.99,39.74],"phx":[-112.07,33.45],"bos":[-71.06,42.36],"hou":[-95.37,29.76],"slc":[-111.89,40.76],"jed":[39.25,21.55],"ruh":[46.72,24.71],"doh":[51.45,25.28],"kyv":[30.52,50.45],"mel":[144.96, -37.81],"bne":[153.03, -27.47],"drw":[131.05,-12.46],"osa":[135.5, 34.69],"kul":[101.69, 3.14],"bkk":[100.5, 13.76],"sgn":[106.66, 10.76],"khi":[67.14,25.0],"dac":[90.41, 23.81],"cbo":[80.0, 6.95],"waw":[21.01, 52.23],"prg":[14.42, 50.08],"vie":[16.37, 48.21],"bud":[19.04, 47.5],"buh":[26.1, 44.43],"tll":[24.45,58.9],"ist":[28.98, 41.01],"for":[-38.54, -3.73],"rio":[-43.11,-22.57],"bue":[-58.38, -34.6],"scl":[-70.67, -33.45],"lim":[-76.85,-12.05],"bog":[-74.07, 4.71],"pan":[-79.52, 8.98],"del":[77.21, 28.61],"maa":[80.18,13.25],"blr":[77.59, 12.97],"hyd":[78.49, 17.39],"tpe":[121.56, 25.03],"auh":[54.37, 24.45],"fuj":[56.15,25.07],"cpt":[18.42, -33.92],"stg":[9.18,48.78],"ber":[13.4,52.52],"zrh":[8.54,47.37],"nbo":[36.82,-1.29],"cai":[31.24,30.04],"sea":[-122.33,47.61],"sjc":[-121.89,37.34],"lax":[-118.24,34.05],"dal":[-96.8,32.78],"chi":[-87.63,41.88],"ash":[-77.49,39.04],"nyc":[-74.0,40.71],"mia":[-80.19,25.76],"tor":[-79.38,43.65],"mtl":[-73.57,45.5],"mex":[-99.13,19.43],"sao":[-46.63,-23.55],"lon":[-0.13,51.51],"dub":[-6.26,53.35],"rek":[-21.94,64.15],"ams":[4.9,52.37],"fra":[8.68,50.11],"par":[2.35,48.86],"mrs":[5.37,43.3],"mad":[-3.7,40.42],"sto":[18.07,59.33],"osl":[10.75,59.91],"cph":[12.57,55.68],"hel":[24.94,60.17],"beg":[20.46,44.79],"sof":[23.32,42.7],"mos":[37.62,55.76],"lag":[3.38,6.52],"jnb":[28.05,-26.2],"dxb":[55.27,25.2],"bom":[72.88,19.08],"sin":[103.82,1.35],"jkt":[106.85,-6.2],"mnl":[120.98,14.6],"hkg":[114.17,22.32],"sha":[121.47,31.23],"pek":[116.4,39.9],"icn":[126.98,37.57],"tok":[139.69,35.69],"syd":[151.21,-33.87],"per":[115.86,-31.95],"akl":[174.76,-36.85]}; +const CITY_LL={"bcn":[2.17,41.39],"mil":[9.19,45.46],"rom":[12.5,41.9],"pmo":[13.36,38.12],"lis":[-9.14,38.72],"ath":[23.73,37.98],"atn":[-84.39,33.75],"den":[-104.99,39.74],"phx":[-112.07,33.45],"bos":[-71.06,42.36],"hou":[-95.37,29.76],"slc":[-111.89,40.76],"jed":[39.25,21.55],"ruh":[46.72,24.71],"doh":[51.45,25.28],"kyv":[30.52,50.45],"mel":[144.96, -37.81],"bne":[153.03, -27.47],"drw":[131.05,-12.46],"osa":[135.5, 34.69],"kul":[101.69, 3.14],"bkk":[100.5, 13.76],"sgn":[106.66, 10.76],"khi":[67.14,25.0],"dac":[90.41, 23.81],"cbo":[80.0, 6.95],"waw":[21.01, 52.23],"prg":[14.42, 50.08],"vie":[16.37, 48.21],"bud":[19.04, 47.5],"buh":[26.1, 44.43],"tll":[24.45,58.9],"ist":[28.98, 41.01],"for":[-38.54, -3.73],"rio":[-43.11,-22.57],"bue":[-58.38, -34.6],"scl":[-70.67, -33.45],"lim":[-76.85,-12.05],"bog":[-74.07, 4.71],"pan":[-79.52, 8.98],"del":[77.21, 28.61],"maa":[80.18,13.25],"blr":[77.59, 12.97],"hyd":[78.49, 17.39],"tpe":[121.56, 25.03],"auh":[54.37, 24.45],"fuj":[56.15,25.07],"cpt":[18.42, -33.92],"stg":[9.18,48.78],"ber":[13.4,52.52],"zrh":[8.54,47.37],"nbo":[36.82,-1.29],"cai":[31.24,30.04],"sea":[-122.33,47.61],"sjc":[-121.89,37.34],"lax":[-118.24,34.05],"dal":[-96.8,32.78],"chi":[-87.63,41.88],"ash":[-77.49,39.04],"nyc":[-74.0,40.71],"mia":[-80.19,25.76],"tor":[-79.38,43.65],"mtl":[-73.57,45.5],"mex":[-99.13,19.43],"sao":[-46.63,-23.55],"lon":[-0.13,51.51],"dub":[-6.26,53.35],"rek":[-21.94,64.15],"ams":[4.9,52.37],"fra":[8.68,50.11],"par":[2.35,48.86],"mrs":[5.37,43.3],"mad":[-3.7,40.42],"sto":[18.07,59.33],"osl":[10.75,59.91],"cph":[12.57,55.68],"hel":[24.94,60.17],"beg":[20.46,44.79],"sof":[23.32,42.7],"mos":[37.62,55.76],"lag":[3.38,6.52],"jnb":[28.05,-26.2],"dxb":[55.27,25.2],"bom":[72.88,19.08],"sin":[103.82,1.35],"jkt":[106.85,-6.2],"mnl":[120.98,14.6],"hkg":[114.17,22.32],"sha":[121.47,31.23],"pek":[116.4,39.9],"icn":[126.98,37.57],"tok":[139.69,35.69],"syd":[151.21,-33.87],"per":[115.86,-31.95],"akl":[174.76,-36.85]}; const CITIES=[ {id:'sea',name:'Seattle',x:205,y:245,land:'am',reg:'AM',P:300,ix:'Sea-IX',dc:'Westin-ish Carrier Hotel'}, {id:'sjc',name:'San Jose',x:240,y:345,land:'am',reg:'AM',P:500,ix:'Silly-Con Valley IX',dc:'Equinox SV-ish'}, @@ -616,6 +616,7 @@ const CITIES=[ {id:'cai',name:'Cairo',x:0,y:0,land:'af',reg:'AF',P:600,ix:'Pharaoh-IX',dc:'Pyramid-adjacent DC',note:'Almost every Europe–Asia cable crosses Egypt. The tolls are legendary.'}, {id:'stg',name:'Stuttgart',x:0,y:0,land:'eu',reg:'EU',P:300,ix:'Spätzle-IX',dc:'Kehrwoche-certified DC',ixOnly:true,note:'Cars, engineers and Kehrwoche: every rack is swept on a strict rota. Nobody sells transit here, there is only the Spätzle-IX. Peer locally or haul your traffic to Frankfurt.'}, {id:'sto',name:'Stockholm',x:1110,y:160,land:'eu',reg:'EU',P:300,ix:'NodNod',dc:'Bunker-ish DC'}, + {id:'bcn',name:'Barcelona',x:0,y:0,land:'eu',reg:'EU',P:300,ix:'Catnip-IX',dc:'Poblenou-ish DC',note:'Catalonia’s own exchange. Small and proud, and local networks find it impossible to resist.'}, {id:'mad',name:'Madrid',x:935,y:392,land:'eu',reg:'EU',P:600,ix:'Siesta-IX',dc:'Interaction MAD'}, {id:'lag',name:'Lagos',x:1010,y:565,land:'af',reg:'AF',P:500,ix:'Jollof-IX',dc:'Rack Centre-ish'}, {id:'jnb',name:'Johannesburg',x:1130,y:730,land:'af',reg:'AF',P:400,za:true,ix:'Braai-IX',dc:'Teraco-ish'}, @@ -676,7 +677,7 @@ const CITIES=[ {id:'slc',name:'Salt Lake City',x:0,y:0,land:'am',reg:'AM',P:150,ix:'Fry-Sauce-IX',dc:'Great Salt Lake DC',note:'Cheap power, dry air and a surprising number of very quiet data centers.'}, ]; // Display-only nudges for cities that sit on top of each other at map scale; distances still use real lon/lat. -const CITY_NUDGE={stg:[30,6],fra:[-8,-8],auh:[-5,6],dxb:[9,-7],fuj:[8,15],rio:[14,-16],tll:[-4,22],osa:[-10,6],khi:[-2,-6],hou:[0,6],dal:[0,-4]}; +const CITY_NUDGE={bcn:[-6,-4],stg:[30,6],fra:[-8,-8],auh:[-5,6],dxb:[9,-7],fuj:[8,15],rio:[14,-16],tll:[-4,22],osa:[-10,6],khi:[-2,-6],hou:[0,6],dal:[0,-4]}; for(const c of CITIES){const q=CITY_LL[c.id];if(q){c.lon=q[0];c.lat=q[1];const pt=proj(q[0],q[1]),n=CITY_NUDGE[c.id]||[0,0];c.x=pt[0]+n[0];c.y=pt[1]+n[1];}} const CITY=Object.fromEntries(CITIES.map(c=>[c.id,c])); const CABLES=[ @@ -773,10 +774,10 @@ const NETS=[ {id:'lvl',name:'Level Tree',asn:3535,type:'t1',pol:'restrictive',share:.07,price:9,col:'#7B61FF',pops:['mil','rom','lis','ath','atn','den','phx','bos','hou','slc','ber','zrh','dub','cph','osl','tor','lax','mex','mtl','sea','sjc','dal','chi','ash','nyc','mia','sao','lon','ams','fra','par','mad','rio','bue','scl','bog','lim','pan','waw','prg','vie','bud','buh','ist'],ix:[],blurb:'Grew from a seedling into a global backbone. Leaves no route behind.'}, {id:'ntt',name:'Not That Telecom',asn:2941,type:'t1',pol:'restrictive',share:.06,price:8,col:'#4B3FC4',pops:['mil','atn','den','bos','hou','phx','jkt','mnl','per','lax','dxb','icn','sea','sjc','dal','ash','nyc','lon','ams','fra','sin','hkg','tok','syd','tpe','del','maa','blr','hyd','osa','kul','bkk','sgn'],ix:[],blurb:'Huge in Asia. "Which telecom?" "Not that one."'}, {id:'tly',name:'Tell-Ya Carrier',asn:1229,type:'t1',pol:'restrictive',share:.05,price:8,col:'#9D4EDD',pops:['mil','rom','pmo','ath','ber','osl','cph','hel','beg','sof','chi','ash','nyc','mia','lon','ams','fra','par','sto','mad','mrs','hkg','sin','tpe','tll','waw','vie','bud','buh','prg','kyv'],ix:[],blurb:'Nordic backbone that tells you exactly where your packets went.'}, - {id:'cog',name:'Cogentle',asn:714,type:'t1',pol:'restrictive',share:.04,price:3,col:'#B35CF0',pops:['mil','rom','lis','ath','atn','den','phx','bos','hou','slc','ber','zrh','dub','hel','sof','beg','tor','lax','mex','cph','icn','sea','sjc','dal','chi','ash','nyc','mia','sao','lon','ams','fra','par','mad','mrs','sto','sin','hkg','tok','rio','bue','scl','bog','lim','osa','waw','prg','vie','bud','buh','ist','kyv'],ix:[],blurb:'Cheapest transit on the map. Famously gentle, except during peering spats.'}, + {id:'cog',name:'Cogentle',asn:714,type:'t1',pol:'restrictive',share:.04,price:3,col:'#B35CF0',pops:['bcn','mil','rom','lis','ath','atn','den','phx','bos','hou','slc','ber','zrh','dub','hel','sof','beg','tor','lax','mex','cph','icn','sea','sjc','dal','chi','ash','nyc','mia','sao','lon','ams','fra','par','mad','mrs','sto','sin','hkg','tok','rio','bue','scl','bog','lim','osa','waw','prg','vie','bud','buh','ist','kyv'],ix:[],blurb:'Cheapest transit on the map. Famously gentle, except during peering spats.'}, {id:'tat',name:'Ta-Ta Comms',asn:6543,type:'t1',pol:'restrictive',share:.04,price:9,col:'#6A4C93',pops:['mil','pmo','lis','nbo','cai','jkt','dxb','nyc','ash','lon','fra','mrs','lag','jnb','bom','sin','hkg','tok','del','maa','blr','hyd','cpt','fuj','auh','tpe','khi','dac','cbo','kul','bkk','jed','ruh','doh'],ix:[],blurb:'Waves goodbye to latency across the Indian Ocean.'}, - {id:'drz',name:'Drizzle Electric',asn:9369,type:'t2',pol:'open',share:.04,price:4,col:'#1E90FF',pops:['mil','rom','pmo','lis','ath','atn','den','phx','bos','hou','slc','ber','zrh','nbo','akl','per','jkt','mnl','dub','rek','tor','mtl','lax','mex','sof','osl','icn','sea','sjc','dal','chi','ash','nyc','mia','lon','ams','fra','par','sto','mad','hkg','sin','tok','syd','jnb','for','rio','bue','scl','lim','bog','pan','del','maa','blr','hyd','tpe','auh','cpt','mel','bne','osa','kul','bkk','sgn','khi','dac','cbo','waw','prg','vie','bud','buh','tll','ist','kyv','jed','ruh','doh'],ix:'ALL',blurb:'Will peer with anyone, anywhere. Rumored to mail out IPv6 cakes.'}, - {id:'tng',name:'Tangerine Telecom',asn:5115,type:'t2',pol:'selective',minIx:15,minPni:40,share:.03,price:6,col:'#FF8C42',pops:['cai','nbo','dxb','par','mrs','mad','lon','ams','lag','jnb','waw','buh'],ix:['par','mrs','mad','lon','ams','lag','jnb','waw'],blurb:'Juicy reach into Europe and Africa.'}, + {id:'drz',name:'Drizzle Electric',asn:9369,type:'t2',pol:'open',share:.04,price:4,col:'#1E90FF',pops:['bcn','mil','rom','pmo','lis','ath','atn','den','phx','bos','hou','slc','ber','zrh','nbo','akl','per','jkt','mnl','dub','rek','tor','mtl','lax','mex','sof','osl','icn','sea','sjc','dal','chi','ash','nyc','mia','lon','ams','fra','par','sto','mad','hkg','sin','tok','syd','jnb','for','rio','bue','scl','lim','bog','pan','del','maa','blr','hyd','tpe','auh','cpt','mel','bne','osa','kul','bkk','sgn','khi','dac','cbo','waw','prg','vie','bud','buh','tll','ist','kyv','jed','ruh','doh'],ix:'ALL',blurb:'Will peer with anyone, anywhere. Rumored to mail out IPv6 cakes.'}, + {id:'tng',name:'Tangerine Telecom',asn:5115,type:'t2',pol:'selective',minIx:15,minPni:40,share:.03,price:6,col:'#FF8C42',pops:['bcn','cai','nbo','dxb','par','mrs','mad','lon','ams','lag','jnb','waw','buh'],ix:['bcn','par','mrs','mad','lon','ams','lag','jnb','waw'],blurb:'Juicy reach into Europe and Africa.'}, {id:'sgt',name:'SingTell',asn:7474,type:'t2',pol:'selective',minIx:15,minPni:40,share:.03,price:7,col:'#00A6A6',pops:['jkt','mnl','per','akl','icn','sin','hkg','tok','syd','bom','tpe','maa','kul','bkk','sgn','mel'],ix:['sin','hkg','tok','syd','bom','tpe','maa','kul','bkk'],blurb:'Sings your packets across Asia-Pacific.'}, {id:'vdp',name:'Voda-Phony',asn:1373,type:'t2',pol:'paid',paidFee:8000,share:.03,price:6,col:'#E63946',pops:['mil','rom','lis','ath','nbo','cai','ber','dub','dxb','lon','fra','ams','mad','mrs','jnb','bom','lag','cpt','del','maa','ist','prg','bud','buh','doh'],ix:[],blurb:'Ended free peering across Europe and handed it to Inter.Clink, its “interconnection partner”, who will happily sell you a direct connection. Paid peering only, over a PNI. Ring ring, it’s the invoice.'}, {id:'ctc',name:'China Telecomet',asn:4314,type:'t2',pol:'restrictive',share:.02,price:22,premium:2.5,cn:true,col:'#0B5CAD',pops:['pek','sha','hkg','sin','tok','lon','fra','nyc','sjc'],ix:[],blurb:'The biggest network in China. Its CN-Too premium route skips the congested border, for a price.'}, @@ -846,13 +847,14 @@ NETS.push( /* Rival exchanges. Big metros rarely have just one IX: challengers undercut the incumbent and share many members with it, but not all. The incumbent keeps the city id, challengers are 'city~n'. */ const XIX=[ - {id:'fra~2',c:'fra',name:'Kleyer-IX',cheap:0.5,take:0.55,blurb:'Two streets from DE-KICKS and publishes its prices on one web page, which DE-KICKS considers an act of war.'}, + {id:'jnb~2',c:'jnb',name:'JINXED-IX',cheap:.7,take:0.5,core:['drz','akm','cfl','tng'],blurb:'The older Johannesburg exchange, run by the local ISP association. Knock on wood before every maintenance window.'}, + {id:'fra~2',c:'fra',name:'KleyWrecks',cheap:.5,take:0.5,core:['drz','akm','cfl','slw','bdc','ydx'],blurb:'A smaller commercial exchange down the road from DE-KICKS. The service comes with a port, without the sales webinar.'}, {id:'fra~3',c:'fra',name:'Apfelwein-IX',cheap:0.3,take:0.3,blurb:'A community exchange run from above a cider bar. Tiny, cheap, and every member gets a glass.'}, {id:'ams~2',c:'ams',name:'NL-Nyx',cheap:0.6,take:0.6,blurb:'One fabric across the whole country. Distributed, cheap and a little smug about it.'}, - {id:'ams~3',c:'ams',name:'Fries-IX',cheap:0.25,take:0.3,blurb:'Volunteer-run, for hobby networks and the odd giant. Ports are almost free. Mayonnaise is extra.'}, - {id:'lon~2',c:'lon',name:'LONAPPLE',cheap:0.55,take:0.55,blurb:'Member-owned and not for profit. No frills, no sales team, everyone knows everyone.'}, + {id:'ams~3',c:'ams',name:'FRIES-IX',cheap:1,take:0.5,freeTo:1,core:['drz','akm','cfl','slw','msf'],blurb:'Settlement-free peering with Frysian roots. The 10G and 100G ports cost nothing. Bring an ASN and an appetite for route servers.'}, + {id:'lon~2',c:'lon',name:'LO-NAPS',cheap:.6,take:0.5,core:['drz','akm','cfl','slw','bdc','msf','fbk'],blurb:'Member-owned and not-for-profit. Smaller than LYNX, but the AGM has biscuits.'}, {id:'par~2',c:'par',name:'Baguette-IX',cheap:0.55,take:0.5,blurb:'The challenger. Fresh every morning, a bit crusty by the evening.'}, - {id:'mad~2',c:'mad',name:'Tapas-IX',cheap:0.5,take:0.55,blurb:'Small plates of peering at small prices, two blocks from the DE-KICKS fabric.'}, + {id:'mad~2',c:'mad',name:'Paella-NIX',cheap:.6,take:0.5,core:['drz','akm','cfl','tng','bdc','slw','msf'],blurb:'The long-established Madrid exchange. Neutral interconnection, local flavour and a route server that never takes a siesta.'}, {id:'mil~2',c:'mil',name:'Aperitivo-IX',cheap:0.5,take:0.45,blurb:'Opens at six, comes with free snacks, closes when the last session drops.'}, {id:'ber~2',c:'ber',name:'Club-Mate-IX',cheap:0.35,take:0.4,blurb:'Run by hackers on caffeine. The route server has a disco ball.'}, {id:'waw~2',c:'waw',name:'Bigos-IX',cheap:0.45,take:0.5,blurb:'Warsaw has more exchanges than anyone can count. This is the second biggest, this week.'}, @@ -867,8 +869,8 @@ const XIX=[ {id:'lax~2',c:'lax',name:'Smog-IX',cheap:0.6,take:0.45,blurb:'You can’t see the fabric, but it is definitely there.'}, {id:'sin~2',c:'sin',name:'Kopi-IX',cheap:0.6,take:0.5,blurb:'Strong, sweet and cheaper than the incumbent.'}, {id:'hkg~2',c:'hkg',name:'Dim-Sum-IX',cheap:0.6,take:0.5,blurb:'Lots of small sessions on little plates.'}, - {id:'tok~2',c:'tok',name:'Bento-IX',cheap:0.65,take:0.5,blurb:'Neatly packed, every member in its own compartment.'}, - {id:'syd~2',c:'syd',name:'Vegemite-IX',cheap:0.6,take:0.5,blurb:'An acquired taste. The locals love it.'}, + {id:'tok~2',c:'tok',name:'BB-Kicks',cheap:1,take:0.5,core:['drz','akm','cfl','sgt','msf','amz'],blurb:'Tokyo has more exchanges than anyone can name. This one was started by a broadband giant and never fell asleep.'}, + {id:'syd~2',c:'syd',name:'IX Strayla',cheap:.7,take:0.5,core:['drz','akm','cfl','ggl','spk','tsy'],blurb:'The nationwide not-for-profit exchange. Cheaper ports than Roo-IX, same distance from everything else.'}, {id:'bom~2',c:'bom',name:'Vada-Pav-IX',cheap:0.45,take:0.45,blurb:'Mumbai’s street-food exchange. Fast, spicy and cheap.'}, {id:'dxb~2',c:'dxb',name:'Shawarma-IX',cheap:0.6,take:0.4,blurb:'The challenger to the DE-KICKS fabric, wrapped and ready to go.'}, ]; @@ -942,7 +944,7 @@ TAIL.forEach(([name,type,home,blurb,sh],i)=>{const h=hstr(name),cand=home.flatMa const sel=(h>>>4)%10>=8; NETS.push({id:'tail'+i,name,asn:200000+(h%190000),type,tail:true,pol:sel?'selective':'open',...(sel?{minIx:1+(h>>>16)%3,minPni:6+(h>>>18)%8}:{}),share:sh||+(0.0006+((h>>>20)%15)*0.0001).toFixed(4),col:`hsl(${h%360} 55% 46%)`,pops:home.slice(),ix,blurb});}); const NET=Object.fromEntries(NETS.map(n=>[n.id,n])); -for(const X of XIX){X.members=NETS.filter(n=>Array.isArray(n.ix)&&n.ix.includes(X.id)||!n.tail&&(n.ix==='ALL'||Array.isArray(n.ix)&&n.ix.includes(X.c))&&hstr(n.id+'|'+X.id)%100<(n.ix==='ALL'?72:X.take*100)).map(n=>n.id);} +for(const X of XIX){X.members=NETS.filter(n=>Array.isArray(n.ix)&&n.ix.includes(X.id)||!n.tail&&(X.core?X.core.includes(n.id):(n.ix==='ALL'||Array.isArray(n.ix)&&n.ix.includes(X.c))&&hstr(n.id+'|'+X.id)%100<(n.ix==='ALL'?72:X.take*100))).map(n=>n.id);} const NSH={}; {const t=NETS.reduce((a,n)=>a+n.share,0); NETS.forEach(n=>NSH[n.id]=n.share/t);} const CN_W={ctc:.2,cun:.14,cmb:.08,tcs:.22,abc:.14,byd:.08,bdc:.08,akm:.02,msf:.02,amz:.01,drz:.01}; const RU_W={ydx:.24,vkl:.12,rtc:.14,ggl:.12,bdc:.08,akm:.05,cfl:.06,msf:.04,amz:.03,tly:.02,cog:.02,drz:.01}; @@ -1297,7 +1299,7 @@ function noRemote(id){const n=NET[id];if(!n||n.pol!=='selective')return false;re when a challenger in the same metro gets too popular. DE-KICKS harmonises instead. */ const IX_REG={EU:0.8}; function ixMul(x){const X=XIXM[x],c=ixCity(x);return (X?X.cheap:(CITY[c].ixCheap||1))*(IX_REG[CITY[c].reg]||1)*((S&&S.ixCut&&S.ixCut[x])||1);} -function ixPortMo(c,tier){return Math.round(PORT[tier].ix*(S.pops[ixCity(c)]?1:REMOTE_FEE)*dkMult(c)*ixMul(c));} +function ixPortMo(c,tier){const X=XIXM[c];if(X&&tier<=(X.freeTo??-1))return 0;return Math.round(PORT[tier].ix*(S.pops[ixCity(c)]?1:REMOTE_FEE)*dkMult(c)*ixMul(c));} function ixPriceWar(d){if(!S.ixp||Math.random()>=1/120)return; const mine=Object.keys(S.ixp).filter(x=>{const c=ixCity(x);return CITY[c].reg==='EU'&&ixStatic(c).length>1;});if(!mine.length)return; const x=pick(mine),c=ixCity(x),rival=pick(ixStatic(c).filter(y=>y!==x)); @@ -2456,6 +2458,7 @@ function cityPanel(c){ } return h+``; } +const portMo=v=>v?fmt$(v)+'/mo':'free'; function ixSection(c){const ids=ixIdsIn(c);if(ids.length<2)return ixBlock(c,false); let h=`

Internet Exchanges

${ids.length} exchanges compete in ${esc(CITY[c].name)}. Members overlap, but not completely, and the challengers undercut the incumbent. Small networks often sit on just one of them.

`; for(const x of ids)h+=ixBlock(x,true);return h;} @@ -2463,14 +2466,14 @@ function ixBlock(c,multi){const city=ixCity(c),C=CITY[city],ix=ixName(c),X=XIXM[ h+=`

${multi?esc(ix)+(X?' challenger':' incumbent'):'Internet Exchange'}

`; if(!ix&&C.cn){h+=`

Running an exchange in mainland China takes a different license entirely. Peer with Chinese networks over PNIs, or meet them in Hong Kong.

`;} else if(!ix){h+=`

There's no IX in ${C.name} yet. Found one: networks join over time, pay you for ports, and peer with you for free.

${S.pops[city]?btn(`Found your own IX ${fmt$(MYIX_COST)} + ${fmt$(MYIX_MO)}/mo`,'foundIx',{city:c},'pink',S.cashBuild a POP here first.

'}`;} - else if(S.ixp[c]===undefined){h+=`

${esc(ix)} is a shared switch. One port lets you peer with every member for free. Members: ${(()=>{const m=ixMembers(c),big=m.filter(id=>!NET[id].tail),t=m.length-big.length;return (big.map(id=>esc(NET[id].name)).join(', ')||'nobody yet')+(t?`, plus ${t} small network${t===1?'':'s'}`:'');})()}.

${S.pops[city]?'':REMOTE_WARN}${X?`

${esc(X.blurb)} Ports at ${Math.round(ixMul(c)*100)}% of the usual price.

`:''}${CITY[city].ixCheap?`

Run by a nonprofit. Public prices at a fraction of what other exchanges charge, and almost everyone is here.

`:''}${isDk(c)?`

Run by DE-KICKS Group. No public price list. Ask sales for a personalised quote and bring your haggling face.

`:''}
${PORT.map((P2,i)=>btn(`${P2.n} port ${isDk(c)?'Price on request ☎':fmt$(ixPortMo(c,i))+'/mo'}`,'buyIx',{city:c,tier:i},'',(!isDk(c)&&S.cash1))).join('')}
`;} + else if(S.ixp[c]===undefined){h+=`

${esc(ix)} is a shared switch. One port lets you peer with every member for free. Members: ${(()=>{const m=ixMembers(c),big=m.filter(id=>!NET[id].tail),t=m.length-big.length;return (big.map(id=>esc(NET[id].name)).join(', ')||'nobody yet')+(t?`, plus ${t} small network${t===1?'':'s'}`:'');})()}.

${S.pops[city]?'':REMOTE_WARN}${X?`

${esc(X.blurb)} ${X.freeTo!==undefined?`Ports up to ${PORT[X.freeTo].n} are free.`:`Ports at ${Math.round(ixMul(c)*100)}% of the usual price.`}

`:''}${CITY[city].ixCheap?`

Run by a nonprofit. Public prices at a fraction of what other exchanges charge, and almost everyone is here.

`:''}${isDk(c)?`

Run by DE-KICKS Group. No public price list. Ask sales for a personalised quote and bring your haggling face.

`:''}
${PORT.map((P2,i)=>btn(`${P2.n} port ${isDk(c)?'Price on request ☎':portMo(ixPortMo(c,i))}`,'buyIx',{city:c,tier:i},'',(!isDk(c)&&S.cash1))).join('')}
`;} else{const mine=!!S.myIx[c],u=R.useIx[c]||0,cap=ixCap(c),set=ixSessions(c),xdown=S.ev.ixdown&&S.ev.ixdown[c]>S.day; h+=`
${mine?`Your own fabric · ${myFab(c).n}`:lagName(S.ixp[c],(S.ixn||{})[c])}${xdown?' · FABRIC DOWN':''}${fmtG(u)}
${prefCtl('ix',c,S.ixPref&&S.ixPref[c])}${S.pops[city]?siteCtl('ix',c,city,(S.ixSite||{})[c]):''}`; if(isDk(c)&&S.dk){const ad=S.dk.add[c]||[],rt=S.dk.ret[c];h+=`

DE-KICKS personalised pricing: ${Math.round(dkMult(c)*100)}% of what a normal IX would charge${rt&&rt>S.day?` (promo, ${rt-S.day} days left)`:''}.

`; for(const x of ad)h+=`
${esc(x.n)}
${esc(x.blurb)} · ${fmt$(x.mo)}/mo
${btn(UI.confirm==='dk'+c+x.n?'Lose exclusive benefits?':'Opt out','dkOptOut',{city:c,n:x.n},'ghost sm')}
`;} if(isRemote(c))h+=`

Remote port via a reseller: 1.5× price, 80% usable, and ${ixMembers(c).filter(noRemote).length} member${ixMembers(c).filter(noRemote).length===1?'':'s'} here refuse remote peers.

`; if(mine){const f=S.myIx[c].fab|0,N=MYIX_FAB[f+1];h+=`
Members paying you${S.myIx[c].members.length} of up to ${myFab(c).max} · ${fmt$(S.myIx[c].members.length*MYIX_FEE)}/mo
${N?`
${btn(N.lvl>lvl()?`${N.n} fabric level ${N.lvl}`:`Upgrade fabric to ${N.n} ${fmt$(N.cost)} + ${fmt$(N.mo)}/mo`,'myIxUp',{city:c},'pink sm',N.lvl>lvl()||S.cash

A bigger fabric carries more traffic and has room for more members. Your router here still has to keep up.

`:'

Biggest fabric money can buy.

'}`;} - else h+=`
${PORT.map((P2,i)=>i>S.ixp[c]?btn(`Upgrade ${P2.n} ${fmt$(ixPortMo(c,i)*((S.ixn||{})[c]||1))}/mo`,'buyIx',{city:c,tier:i},'sm',(!!S.pops[city]&&!portOk(city,i))||(!S.pops[city]&&i>1)):'').join('')}${S.pops[city]&&((S.ixn||{})[c]||1)${fmt$(ixPortMo(c,S.ixp[c]))}/mo`,'lagIx',{city:c,d:1},'sm',S.cash1?btn('− member','lagIx',{city:c,d:-1},'ghost sm'):''}${btn(S.rs[c]?'Leave route server':'Join route server','rs',{city:c},S.rs[c]?'ghost sm':'pink sm')}${btn(UI.confirm==='ix'+c?'Really leave?':'Leave IX','cancelIx',{city:c},'ghost sm')}
`; + else h+=`
${PORT.map((P2,i)=>i>S.ixp[c]?btn(`Upgrade ${P2.n} ${portMo(ixPortMo(c,i)*((S.ixn||{})[c]||1))}`,'buyIx',{city:c,tier:i},'sm',(!!S.pops[city]&&!portOk(city,i))||(!S.pops[city]&&i>1)):'').join('')}${S.pops[city]&&((S.ixn||{})[c]||1)${portMo(ixPortMo(c,S.ixp[c]))}`,'lagIx',{city:c,d:1},'sm',S.cash1?btn('− member','lagIx',{city:c,d:-1},'ghost sm'):''}${btn(S.rs[c]?'Leave route server':'Join route server','rs',{city:c},S.rs[c]?'ghost sm':'pink sm')}${btn(UI.confirm==='ix'+c?'Really leave?':'Leave IX','cancelIx',{city:c},'ghost sm')}
`; h+=`
`; {const elig=mine?[]:ixMembers(c).filter(id=>!set.has(id)&&peerOk(id,'ix',c).ok);if(elig.length>1)h+=`
${btn(`Request all ${elig.length} willing peers`,'peerAll',{city:c},'pink sm')}
`;} for(const id of ixMembers(c).sort((a,b)=>NSH[b]-NSH[a])){const n=NET[id],on=set.has(id),viaRs=on&&!S.peers[id+'@'+c]&&!mine,chk=peerOk(id,'ix',c); diff --git a/tests/peering.test.js b/tests/peering.test.js index 7fd4d07..e754192 100644 --- a/tests/peering.test.js +++ b/tests/peering.test.js @@ -140,3 +140,76 @@ test('an IX meltdown at a rival exchange names the city, and a failing day tick assert.match(ev("document.getElementById('toasts').textContent"), /NOC glitched/); assert.deepEqual(errors.filter(e => !/tick failed/.test(e)), []); }); + +test('Amsterdam has FRIES-IX, with free 10G and 100G ports and paid larger ports', () => { + const { ev, errors } = load(); + setup(ev); + assert.deepEqual(JSON.parse(ev("JSON.stringify(ixIdsIn('ams'))")), ['ams', 'ams~2', 'ams~3']); + ev("ACT.buildPop({city:'ams'});S.pops.ams.rgen=RG.length-1;compute()"); + const cash = () => ev('S.cash'); + let c0 = cash(); + assert.equal(ev("ixPortMo('ams~3',0)"), 0, '10G port is free'); + ev("ACT.buyIx({city:'ams~3',tier:1})"); + assert.equal(ev("S.ixp['ams~3']"), 1); + assert.equal(cash(), c0, '100G port is free'); + assert.equal(ev("S.ixp.ams"), undefined, 'HAMS-IX is separate'); + c0 = cash(); + ev("ACT.lagIx({city:'ams~3',d:1})"); + assert.equal(cash(), c0, 'LAG members are free too'); + assert.equal(ev("ixPortMo('ams~3',2)"), ev("Math.round(PORT[2].ix*ixMul('ams~3'))"), '400G is a paid game tier'); + ev("ACT.buyIx({city:'ams',tier:1});ACT.rs({city:'ams~3'});compute()"); + assert.ok(ev("ixSessions('ams~3').has('drz')")); + assert.equal(ev("ixSessions('ams~3').has('ggl')"), false, 'Goggle is not a member'); + assert.equal(ev("R.useIx['ams~3']!==undefined&&R.useIx.ams!==undefined"), true, 'both fabrics carry traffic'); + assert.equal(ev("R.cost.ix"), ev("ixPortMo('ams',1)"), "only the HAMS-IX port is billed"); + ev("selectCity('ams');ACT.tab({t:'peer'})"); + const txt = ev("document.getElementById('panelBody').textContent"); + assert.match(txt, /FRIES-IX/); assert.match(txt, /HAMS-IX/); + assert.match(ev("ixBlock('ams~3',true)"), /LAG member free/); + ev("save();restored=migrate(JSON.parse(localStorage.getItem('sot-save-v1')));"); + assert.equal(ev("restored.ixp['ams~3']"), 1, 'free port survives save migration'); + assert.equal(ev("restored.ixn['ams~3']"), 2, 'free LAG survives save migration'); + ev("S.ev.ixdown={'ams~3':S.day+2};compute()"); + assert.equal(ev("R.useIx['ams~3']"), undefined, 'a FRIES-IX outage drops only that fabric'); + assert.notEqual(ev("R.useIx.ams"), undefined); + ev("S.ev.ixdown={};compute()"); + c0 = cash(); + ev("ACT.buyIx({city:'ams~3',tier:2})"); + assert.equal(ev("S.ixp['ams~3']"), 2); + assert.equal(c0 - cash(), ev("2*ixPortMo('ams~3',2)"), 'upgrading bills both LAG members'); + assert.equal(ev("R.cost.ix"), ev("ixPortMo('ams',1)+2*ixPortMo('ams~3',2)"), 'larger ports also have a recurring charge'); + ev("ACT.cancelIx({city:'ams~3'});ACT.cancelIx({city:'ams~3'})"); + assert.equal(ev("S.ixp['ams~3']"), undefined); + assert.equal(ev("S.ixp.ams"), 1, 'leaving FRIES-IX keeps the HAMS-IX port'); + assert.equal(ev("Object.keys(S.rs).filter(k=>S.rs[k]).length"), 0); + assert.deepEqual(errors, []); +}); + +test('community exchanges are wired up in every city, and Barcelona has Catnip-IX', () => { + const { ev, errors } = load(); + setup(ev); + const exchanges = ['ams~3', 'mad~2', 'fra~2', 'lon~2', 'jnb~2', 'syd~2', 'tok~2']; + assert.deepEqual(JSON.parse(ev("JSON.stringify(ixIdsIn('nyc'))")), ['nyc', 'nyc~2'], 'NYC keeps its two existing exchanges'); + assert.equal(ev("ixName('nyc')"), 'NY-Yikes'); + assert.equal(ev("isDk('nyc')"), true, 'NY-Yikes is already part of DE-KICKS Group'); + const bad = ev("XIX.filter(x=>x.core).map(x=>x.id).flatMap(k=>XIXM[k].members.filter(id=>!NET[id]||!NET[id].pops.includes(XIXM[k].c)).map(id=>k+':'+id)).join()"); + assert.equal(bad, '', 'every member has a POP in the city'); + assert.ok(ev("Object.keys(XIXM).every(k=>CITY[XIXM[k].c].ix&&ixIdsIn(XIXM[k].c).includes(k))"), 'each sits beside a main IX'); + ev("ACT.buildPop({city:'mad'})"); + assert.equal(ev("ixPortMo('mad~2',1)"), ev("Math.round(PORT[1].ix*0.6*IX_REG.EU)"), 'Paella-NIX is cheaper than Siesta-IX'); + assert.equal(ev("ixName('bcn')"), 'Catnip-IX'); + for (const k of exchanges) { + const c = k.split('~')[0]; + ev(`if(!S.pops.${c})ACT.buildPop({city:'${c}'});S.pops.${c}.rgen=RG.length-1;ACT.buyIx({city:'${k}',tier:1});ACT.rs({city:'${k}'})`); + assert.equal(ev(`S.ixp['${k}']`), 1, `port at ${k}`); + } + ev('compute()'); + for (const k of exchanges) + assert.ok(ev(`ixSessions('${k}').size`) > 0, `route server sessions at ${k}`); + for (const c of ['ams', 'mad', 'fra', 'lon', 'nyc', 'jnb', 'syd', 'tok', 'bcn']) { + ev(`selectCity('${c}');ACT.tab({t:'peer'})`); + const txt = ev("document.getElementById('panelBody').textContent"); + for (const k of JSON.parse(ev(`JSON.stringify(ixIdsIn('${c}'))`))) assert.ok(txt.includes(ev(`ixName('${k}')`)), `${k} shown in ${c}`); + } + assert.deepEqual(errors, []); +});