From eceef112bcab6881b2ee33e1b6bb8e6d3a993931 Mon Sep 17 00:00:00 2001 From: SukkaW Date: Sun, 4 Feb 2024 23:18:32 +0800 Subject: [PATCH] Update AI / CDN Hosts --- Build/build-internal-reverse-chn-cidr.ts | 13 +++++++++---- Source/domainset/cdn.conf | 5 +++++ Source/non_ip/ai.conf | 5 +++++ 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/Build/build-internal-reverse-chn-cidr.ts b/Build/build-internal-reverse-chn-cidr.ts index 7a6edf35..af53ac63 100644 --- a/Build/build-internal-reverse-chn-cidr.ts +++ b/Build/build-internal-reverse-chn-cidr.ts @@ -4,6 +4,7 @@ import path from 'path'; import { task } from './trace'; import { exclude, merge } from 'fast-cidr-tools'; +import { getChnCidrPromise } from './build-chn-cidr'; // https://en.wikipedia.org/wiki/Reserved_IP_addresses const RESERVED_IPV4_CIDR = [ @@ -25,10 +26,14 @@ const RESERVED_IPV4_CIDR = [ '240.0.0.0/4' ]; -export const buildInternalReverseChnCIDR = task(import.meta.path, async () => { - const cidr = await processLineFromReadline(await fetchRemoteTextByLine('https://raw.githubusercontent.com/misakaio/chnroutes2/master/chnroutes.txt')); +export const buildInternalReverseChnCIDR = task(import.meta.path, async (span) => { + const cidrPromise = getChnCidrPromise(); + const peeked = Bun.peek(cidrPromise); + const cidr: string[] = peeked === cidrPromise + ? await span.traceChildPromise('download chnroutes2', cidrPromise) + : (peeked as string[]); - const reversedCidr = merge( + const reversedCidr = span.traceChildSync('build reversed chn cidr', () => merge( exclude( ['0.0.0.0/0'], RESERVED_IPV4_CIDR.concat(cidr), @@ -38,7 +43,7 @@ export const buildInternalReverseChnCIDR = task(import.meta.path, async () => { '223.118.0.0/15', '223.120.0.0/15' ]) - ); + )); return Bun.write(path.resolve(import.meta.dir, '../List/internal/reversed-chn-cidr.txt'), `${reversedCidr.join('\n')}\n`); }); diff --git a/Source/domainset/cdn.conf b/Source/domainset/cdn.conf index e24ecf48..fa6aae9a 100644 --- a/Source/domainset/cdn.conf +++ b/Source/domainset/cdn.conf @@ -282,6 +282,7 @@ ajax.googleapis.com .storage.googleapis.com .firestore.googleapis.com .firebasestorage.googleapis.com +.content-storage-upload.googleapis.com cdn.firebase.com .ytimg.com .ggpht.com @@ -788,6 +789,7 @@ app.viral-loops.com widget.cluster.groovehq.com bot.ivy.ai cdn.dotaoutpost.com +widget.uservoice.com staticw2.yotpo.com cdn-yotpo-images-production.yotpo.com @@ -2374,3 +2376,6 @@ assets.buttondown.email .xda-cdn.com static.underhentai.net redircdn.com +images7.design-editor.com +images8.design-editor.com +images.design-editor.com diff --git a/Source/non_ip/ai.conf b/Source/non_ip/ai.conf index 70ee5240..d189a9cc 100644 --- a/Source/non_ip/ai.conf +++ b/Source/non_ip/ai.conf @@ -16,5 +16,10 @@ DOMAIN-SUFFIX,claude.ai DOMAIN-SUFFIX,bard.google.com # Google Generative Language API DOMAIN-SUFFIX,generativelanguage.googleapis.com +# Google AI Studio +DOMAIN,ai.google.dev +DOMAIN-SUFFIX,makersuite.google.com +DOMAIN,alkalicore-pa.clients6.google.com +DOMAIN,alkalimakersuite-pa.clients6.google.com # POE DOMAIN-SUFFIX,poe.com