From b6762651249c2d7cfa44cb39e4f538ad795a0fde Mon Sep 17 00:00:00 2001 From: Piotr Rogowski Date: Sun, 26 Sep 2021 21:05:25 +0200 Subject: [PATCH] Simplify S3 location codes (#211) --- src/data/s3-edge-locations.json | 264 +++++++++++--------------------- src/utils/http.ts | 3 +- 2 files changed, 89 insertions(+), 178 deletions(-) diff --git a/src/data/s3-edge-locations.json b/src/data/s3-edge-locations.json index 0d9a6ba..47cc71a 100644 --- a/src/data/s3-edge-locations.json +++ b/src/data/s3-edge-locations.json @@ -1,183 +1,93 @@ { - "EZE51-C1": "Buenos Aires, Argentina", - "MEL50-C1": "Melbourne, Australia", - "PER50-C1": "Perth, Australia", - "SYD1-C1": "Sydney, Australia", - "SYD1-C2": "Sydney, Australia", - "VIE50-C1": "Vienna, Austria", - "BAH53-C1": "Manama, Bahrain", - "BRU50-C1": "Brussels, Belgium", - "GIG51-C2": "Rio de Janeiro, Brazil", - "GRU1-C2": "São Paulo, Brazil", - "GRU3-C1": "São Paulo, Brazil", - "GRU3-C2": "São Paulo, Brazil", - "GRU50-C1": "São Paulo, Brazil", - "SOF50-C1": "Sofia, Bulgaria", - "YUL62-C1": "Montréal, QC Canada", - "YTO50-C1": "Greater Toronto, ON Canada", - "YTO50-C3": "Greater Toronto, ON Canada", - "YVR50-C1": "Vancouver, BC Canada", - "SCL50-C1": "Santiago, Chile", + "EZE": "Buenos Aires, Argentina", + "MEL": "Melbourne, Australia", + "PER": "Perth, Australia", + "SYD": "Sydney, Australia", + "VIE": "Vienna, Austria", + "BAH": "Manama, Bahrain", + "BRU": "Brussels, Belgium", + "GIG": "Rio de Janeiro, Brazil", + "GRU": "São Paulo, Brazil", + "SOF": "Sofia, Bulgaria", + "YUL6": "Montréal, QC Canada", + "YTO": "Greater Toronto, ON Canada", + "YVR": "Vancouver, BC Canada", + "SCL": "Santiago, Chile", "BJS": "Beijing Beijing, China", - "HKG54-C1": "Hong Kong, China", - "HKG60-C1": "Hong Kong, China", - "HKG62-C1": "Hong Kong, China", - "HKG62-C2": "Hong Kong, China", + "HKG": "Hong Kong, China", "SHA": "Shanghai, China", "SZX": "Shenzhen, GD China", - "TPE50-C1": "Taipei, TW China", - "TPE51-C1": "Taipei, TW China", - "TPE52-C1": "Taipei, TW China", + "TPE": "Taipei, TW China", "ZHY": "Zhongwei, Zhongwei, NX China", - "BOG50-C1": "Bogotá, Colombia", - "ZAG50-C1": "Zagreb, Croatia", - "PRG50-C1": "Prague, Czech Republic", - "CPH50-C1": "Copenhagen, Denmark", - "CPH50-C2": "Copenhagen, Denmark", - "HEL50-C1": "Helsinki, Finland", - "HEL50-C2": "Helsinki, Finland", - "MRS52-C1": "Marseille, France", - "CDG3-C1": "Paris, France", - "CDG3-C2": "Paris, France", - "CDG50-C1": "Paris, France", - "CDG50-C2": "Paris, France", - "TXL52-C1": "Berlin, Germany", - "DUS51-C1": "Düsseldorf, Germany", - "FRA2-C2": "Frankfurt, Germany", - "FRA6-C1": "Frankfurt, Germany", - "FRA50-C1": "Frankfurt, Germany", - "FRA53-C1": "Frankfurt, Germany", - "FRA56-C1": "Frankfurt, Germany", - "FRA56-C2": "Frankfurt, Germany", - "HAM50-C1": "Hamburg, Germany", - "HAM50-C2": "Hamburg, Germany", - "MUC51-C1": "Munich, Germany", - "ATH50-C1": "Eleftherios Venizelos Athens, Greece", - "BUD50-C1": "Budapest, Hungary", - "BLR50-C2": "Bangalore, India", - "MAA50-C1": "Chennai, India", - "MAA50-C2": "Chennai, India", - "MAA51-C1": "Chennai, India", - "MAA51-C2": "Chennai, India", - "HYD50-C1": "Hyderabad, India", - "HYD50-C2": "Hyderabad, India", - "CCU50-C1": "Kolkata, India", - "CCU50-C2": "Kolkata, India", - "BOM50-C1": "Mumbai, India", - "BOM51-C1": "Mumbai, India", - "BOM51-C2": "Mumbai, India", - "BOM52-C1": "Mumbai, India", - "DEL51-C1": "New Delhi, India", - "DEL54-C1": "New Delhi, India", - "DEL54-C3": "New Delhi, India", - "CGK52-C1": "Jakarta, Indonesia", - "DUB2-C1": "Dublin, Ireland", - "TLV50-C2": "Tel Aviv, Israel", - "MXP64-C1": "Milan, Italy", - "PMO50": "Falcone Palermo, Italy", - "FCO50-C1": "Rome, Italy", - "FCO50-C2": "Rome, Italy", - "KIX56-C1": "Osaka, Japan", - "KIX56-C2": "Osaka, Japan", - "NRT12-C2": "Tokyo, Japan", - "NRT12-C4": "Tokyo, Japan", - "NRT20-C2": "Tokyo, Japan", - "NRT20-C3": "Tokyo, Japan", - "NRT20-C4": "Tokyo, Japan", - "NRT51-C2": "Tokyo, Japan", - "NRT51-C3": "Tokyo, Japan", - "NRT57-C1": "Tokyo, Japan", - "NRT57-C3": "Tokyo, Japan", - "NRT57-C4": "Tokyo, Japan", - "NBO50-C1": "Nairobi, Kenya", - "KUL50-C1": "Kuala Lumpur, Malaysia", - "QRO50-C1": "Querétaro, Mexico", - "QRO51-C1": "Querétaro, Mexico", - "AKL50-C1": "Auckland, New Zealand", - "AKL50-C2": "Auckland, New Zealand", - "OSL50-C1": "Gardermoen Oslo, Norway", - "MNL50-C1": "Manila, Philippines", - "WAW50-C1": "Warsaw, Poland", - "LIS50-C1": "Lisbon, Portugal", - "OTP50-C1": "Bucharest, Romania", - "SIN2-C1": "Singapore, Singapore", - "SIN5-C1": "Singapore, Singapore", - "SIN52-C2": "Singapore, Singapore", - "SIN52-C3": "Singapore, Singapore", - "CPT52-C1": "Cape Town, South Africa", - "JNB50-C1": "Johannesburg, South Africa", - "ICN51-C1": "Seoul South, Korea", - "ICN51-C2": "Seoul South, Korea", - "ICN54-C1": "Seoul South, Korea", - "ICN54-C2": "Seoul South, Korea", - "ICN55-C1": "Seoul South, Korea", - "MAD50-C1": "Madrid, Spain", - "MAD51-C2": "Madrid, Spain", - "ARN1-C1": "Stockholm, Sweden", - "ARN54-C1": "Stockholm, Sweden", - "ZRH50-C1": "Zürich, Switzerland", - "BKK50-C2": "Bangkok, Thailand", - "AMS1-C1": "Schiphol Amsterdam, Netherlands", - "AMS50-C1": "Schiphol Amsterdam, Netherlands", - "AMS54-C1": "Schiphol Amsterdam, Netherlands", - "DXB50-C1": "Dubai, United Arab Emirates", - "FJR50-C1": "Fujairah, United Arab Emirates", - "LHR3-C2": "London, UK", - "LHR52-C1": "London, UK", - "LHR61-C2": "London, UK", - "LHR62-C1": "London, UK", - "LHR62-C3": "London, UK", - "LHR62-C4": "London, UK", - "MAN50-C3": "Manchester, UK", - "IAD50-C2": "Ashburn, VA, US", - "IAD66-C1": "Ashburn, VA, US", - "IAD66-C2": "Ashburn, VA, US", - "IAD79-C2": "Ashburn, VA, US", - "IAD79-C3": "Ashburn, VA, US", - "IAD89-C3": "Ashburn, VA, US", - "ATL50-C1": "Atlanta, GA, US", - "ATL51-C1": "Atlanta, GA, US", - "ATL56-C1": "Atlanta, GA, US", - "ATL56-C3": "Atlanta, GA, US", - "BOS50-C1": "Boston, MA, US", - "BOS50-C3": "Boston, MA, US", - "ORD50-C1": "Chicago, IL, US", - "ORD51-C2": "Chicago, IL, US", - "ORD52-C2": "Chicago, IL, US", - "ORD53-C1": "Chicago, IL, US", - "DFW50-C1": "Dallas/Fort Worth, TX, US", - "DFW53-C1": "Dallas/Fort Worth, TX, US", - "DFW55-C3": "Dallas/Fort Worth, TX, US", - "DEN52-C1": "Denver, CO, US", - "HIO50-C1": "Hillsboro, OR, US", - "HIO50-C2": "Hillsboro, OR, US", - "IAH50-C1": "Houston, TX, US", - "IAH50-C3": "Houston, TX, US", - "JAX1-C1": "Jacksonville, FL, US", - "LAX3-C4": "Los Angeles, CA, US", - "LAX50-C1": "Los Angeles, CA, US", - "LAX50-C3": "Los Angeles, CA, US", - "LAX50-C4": "Los Angeles, CA, US", - "MIA3-C2": "Miami, FL, US", - "MIA3-C3": "Miami, FL, US", - "MSP50-C1": "Minneapolis, MN, US", - "MSP50-C2": "Minneapolis, MN, US", - "JFK51-C1": "New York, NY, US", - "EWR50-C1": "Newark, NJ, US", - "EWR52-C2": "Newark, NJ, US", - "EWR52-C3": "Newark, NJ, US", - "EWR52-C4": "Newark, NJ, US", - "EWR53-P1": "Newark, NJ, US", - "PHL50-C1": "Philadelphia, PA, US", - "PHX50-C1": "Phoenix, AZ, US", - "PHX50-C2": "Phoenix, AZ, US", - "SLC50-C1": "Salt Lake City, UT, US", - "SFO5-C1": "San Francisco, CA, US", - "SFO5-C3": "San Francisco, CA, US", - "SFO20-C1": "San Francisco, CA, US", - "SFO53-C1": "San Francisco, CA, US", - "SEA19-C1": "Seattle, WA, US", - "SEA19-C2": "Seattle, WA, US", - "SEA19-C3": "Seattle, WA, US", - "IND6": "Indianapolis, South Bend, IN, US" + "BOG": "Bogotá, Colombia", + "ZAG": "Zagreb, Croatia", + "PRG": "Prague, Czech Republic", + "CPH": "Copenhagen, Denmark", + "HEL": "Helsinki, Finland", + "MRS": "Marseille, France", + "CDG": "Paris, France", + "TXL": "Berlin, Germany", + "DUS": "Düsseldorf, Germany", + "FRA": "Frankfurt, Germany", + "HAM": "Hamburg, Germany", + "MUC": "Munich, Germany", + "ATH": "Eleftherios Venizelos Athens, Greece", + "BUD": "Budapest, Hungary", + "BLR": "Bangalore, India", + "MAA": "Chennai, India", + "HYD": "Hyderabad, India", + "CCU": "Kolkata, India", + "BOM": "Mumbai, India", + "DEL": "New Delhi, India", + "CGK": "Jakarta, Indonesia", + "DUB": "Dublin, Ireland", + "TLV": "Tel Aviv, Israel", + "MXP": "Milan, Italy", + "PMO": "Falcone Palermo, Italy", + "FCO": "Rome, Italy", + "KIX": "Osaka, Japan", + "NRT": "Tokyo, Japan", + "NBO": "Nairobi, Kenya", + "KUL": "Kuala Lumpur, Malaysia", + "QRO": "Querétaro, Mexico", + "AKL": "Auckland, New Zealand", + "OSL": "Gardermoen Oslo, Norway", + "MNL": "Manila, Philippines", + "WAW": "Warsaw, Poland", + "LIS": "Lisbon, Portugal", + "OTP": "Bucharest, Romania", + "SIN": "Singapore, Singapore", + "CPT": "Cape Town, South Africa", + "JNB": "Johannesburg, South Africa", + "ICN": "Seoul South, Korea", + "MAD": "Madrid, Spain", + "ARN": "Stockholm, Sweden", + "ZRH": "Zürich, Switzerland", + "BKK": "Bangkok, Thailand", + "AMS": "Schiphol Amsterdam, Netherlands", + "DXB": "Dubai, United Arab Emirates", + "FJR": "Fujairah, United Arab Emirates", + "LHR": "London, UK", + "MAN": "Manchester, UK", + "IAD6": "Ashburn, VA, US", + "IAD": "Ashburn, VA, US", + "ATL": "Atlanta, GA, US", + "BOS": "Boston, MA, US", + "ORD": "Chicago, IL, US", + "DFW": "Dallas/Fort Worth, TX, US", + "DEN": "Denver, CO, US", + "HIO": "Hillsboro, OR, US", + "IAH": "Houston, TX, US", + "JAX": "Jacksonville, FL, US", + "LAX": "Los Angeles, CA, US", + "MIA": "Miami, FL, US", + "MSP": "Minneapolis, MN, US", + "JFK": "New York, NY, US", + "EWR": "Newark, NJ, US", + "PHL": "Philadelphia, PA, US", + "PHX": "Phoenix, AZ, US", + "SLC": "Salt Lake City, UT, US", + "SFO": "San Francisco, CA, US", + "SEA": "Seattle, WA, US", + "IND": "Indianapolis, South Bend, IN, US" } diff --git a/src/utils/http.ts b/src/utils/http.ts index 730d209..093eda6 100644 --- a/src/utils/http.ts +++ b/src/utils/http.ts @@ -12,7 +12,8 @@ export const fetchWithProgress = async (url: string, onProgress?: onProgress, si let edgeLocation = null; if (edgeLocationCode) { - edgeLocation = (locations as LocationsType)[edgeLocationCode]; + // simplify location code (`MEL50-C1` => `MEL`) + edgeLocation = (locations as LocationsType)[edgeLocationCode.slice(0, 3)]; } if (!contentLength || isContentEncoded) {