fix: use ipinfo.io to allow https
This commit is contained in:
		
							parent
							
								
									03f99d61d8
								
							
						
					
					
						commit
						a3e4ed9b87
					
				
							
								
								
									
										2
									
								
								components.d.ts
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								components.d.ts
									
									
									
									
										vendored
									
									
								
							| @ -137,6 +137,7 @@ declare module '@vue/runtime-core' { | ||||
|     MenuLayout: typeof import('./src/components/MenuLayout.vue')['default'] | ||||
|     MetaTagGenerator: typeof import('./src/tools/meta-tag-generator/meta-tag-generator.vue')['default'] | ||||
|     MimeTypes: typeof import('./src/tools/mime-types/mime-types.vue')['default'] | ||||
|     NA: typeof import('naive-ui')['NA'] | ||||
|     NAlert: typeof import('naive-ui')['NAlert'] | ||||
|     NavbarButtons: typeof import('./src/components/NavbarButtons.vue')['default'] | ||||
|     NCheckbox: typeof import('naive-ui')['NCheckbox'] | ||||
| @ -163,6 +164,7 @@ declare module '@vue/runtime-core' { | ||||
|     NLayout: typeof import('naive-ui')['NLayout'] | ||||
|     NLayoutSider: typeof import('naive-ui')['NLayoutSider'] | ||||
|     NMenu: typeof import('naive-ui')['NMenu'] | ||||
|     NP: typeof import('naive-ui')['NP'] | ||||
|     NProgress: typeof import('naive-ui')['NProgress'] | ||||
|     NScrollbar: typeof import('naive-ui')['NScrollbar'] | ||||
|     NSlider: typeof import('naive-ui')['NSlider'] | ||||
|  | ||||
| @ -1,39 +1,25 @@ | ||||
| <script setup lang="ts"> | ||||
| import type { CKeyValueListItems } from '@/ui/c-key-value-list/c-key-value-list.types'; | ||||
| 
 | ||||
| const ipOrDomain = ref('8.8.8.8'); | ||||
| const ip = ref('8.8.8.8'); | ||||
| const errorMessage = ref(''); | ||||
| 
 | ||||
| const fields: Array<{ field: string; name: string }> = [ | ||||
|   { field: 'message', name: 'Message' }, | ||||
|   { field: 'continent', name: 'Continent Name' }, | ||||
|   { field: 'continentCode', name: 'Continent code' }, | ||||
|   { field: 'country', name: 'Country Name' }, | ||||
|   { field: 'countryCode', name: 'Country Code' }, | ||||
|   { field: 'ip', name: 'IP' }, | ||||
|   { field: 'hostname', name: 'Host Name' }, | ||||
|   { field: 'country', name: 'Country Code' }, | ||||
|   { field: 'region', name: 'Region/state Code' }, | ||||
|   { field: 'regionName', name: 'Region/state Name' }, | ||||
|   { field: 'city', name: 'City' }, | ||||
|   { field: 'district', name: 'District' }, | ||||
|   { field: 'zip', name: 'Zip Code' }, | ||||
|   { field: 'lat', name: 'Latitude' }, | ||||
|   { field: 'lon', name: 'Longitude' }, | ||||
|   { field: 'postal', name: 'Postal Code' }, | ||||
|   { field: 'loc', name: 'Latitude/Longitude' }, | ||||
|   { field: 'timezone', name: 'Timezone' }, | ||||
|   { field: 'offset', name: 'Timezone UTC DST offset (in seconds)' }, | ||||
|   { field: 'currency', name: 'National Currency' }, | ||||
|   { field: 'isp', name: 'ISP Name' }, | ||||
|   { field: 'org', name: 'Organization Name' }, | ||||
|   { field: 'as', name: 'AS Number and Organization' }, | ||||
|   { field: 'asname', name: 'AS name (RIR)' }, | ||||
|   { field: 'reverse', name: 'Reverse DNS of the IP' }, | ||||
|   { field: 'mobile', name: 'Mobile (cellular) connection' }, | ||||
|   { field: 'proxy', name: 'Proxy, VPN or Tor exit address' }, | ||||
|   { field: 'hosting', name: 'Hosting, colocated or data center' }, | ||||
|   { field: 'query', name: 'IP used for the query' }, | ||||
| ]; | ||||
| 
 | ||||
| const geoInfos = ref<CKeyValueListItems>([]); | ||||
| const geoInfosData = ref<any>({}); | ||||
| const status = ref<'pending' | 'error' | 'success'>('pending'); | ||||
| const token = useStorage('ip-geoloc:token', ''); | ||||
| 
 | ||||
| const openStreetMapUrl = computed( | ||||
|   () => { | ||||
| @ -47,7 +33,10 @@ async function onGetInfos() { | ||||
|   try { | ||||
|     status.value = 'pending'; | ||||
| 
 | ||||
|     const geoInfoQueryResponse = await fetch(`http://ip-api.com/json/${ipOrDomain.value}`); | ||||
|     const geoInfoQueryResponse = await fetch( | ||||
|       token.value !== '' | ||||
|         ? `https://ipinfo.io/${ip.value}/json?token=${token.value}` | ||||
|         : `https://ipinfo.io/${ip.value}/json`); | ||||
|     if (!geoInfoQueryResponse.ok) { | ||||
|       throw geoInfoQueryResponse.statusText; | ||||
|     } | ||||
| @ -80,8 +69,8 @@ async function onGetInfos() { | ||||
|   <div> | ||||
|     <div flex items-center gap-2> | ||||
|       <c-input-text | ||||
|         v-model:value="ipOrDomain" | ||||
|         placeholder="Enter an IPv4/6 or a domain name" | ||||
|         v-model:value="ip" | ||||
|         placeholder="Enter an IPv4/6" | ||||
|         @update:value="() => { status = 'pending' }" | ||||
|       /> | ||||
|       <c-button align-center @click="onGetInfos"> | ||||
| @ -89,6 +78,20 @@ async function onGetInfos() { | ||||
|       </c-button> | ||||
|     </div> | ||||
| 
 | ||||
|     <details mt-2> | ||||
|       <summary>Optional ipinfo.io token</summary> | ||||
|       <c-input-text | ||||
|         v-model:value="token" | ||||
|         placeholder="Optional ipinfo.io token" | ||||
|         @update:value="() => { status = 'pending' }" | ||||
|       /> | ||||
|       <n-p> | ||||
|         <n-a href="https://ipinfo.io/"> | ||||
|           Signup for a free token | ||||
|         </n-a> | ||||
|       </n-p> | ||||
|     </details> | ||||
| 
 | ||||
|     <n-divider /> | ||||
| 
 | ||||
|     <c-card v-if="status === 'pending'" mt-5> | ||||
|  | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user