From 620392e6875890b161a4f6f28b1bd6217094de59 Mon Sep 17 00:00:00 2001
From: ayumi-signal <143036029+ayumi-signal@users.noreply.github.com>
Date: Mon, 5 Aug 2024 11:41:37 -0700
Subject: [PATCH] Save dns-fallback file

---
 .gitignore              |   1 -
 app/dns-fallback.ts     |   2 +-
 build/dns-fallback.json | 178 ++++++++++++++++++++++++++++++++++++++++
 package.json            |   2 +-
 4 files changed, 180 insertions(+), 3 deletions(-)
 create mode 100644 build/dns-fallback.json

diff --git a/.gitignore b/.gitignore
index 32250a00c6..a09dfdeaee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,7 +3,6 @@ node_modules_bkp
 .sass-cache
 coverage/*
 build/curve25519_compiled.js
-build/dns-fallback.json
 build/compact-locales
 stylesheets/*.css.map
 /dist
diff --git a/app/dns-fallback.ts b/app/dns-fallback.ts
index 6e5e596a59..bf689782cc 100644
--- a/app/dns-fallback.ts
+++ b/app/dns-fallback.ts
@@ -19,7 +19,7 @@ export async function getDNSFallback(): Promise<DNSFallbackType> {
     str = await readFile(configPath, 'utf8');
   } catch (error) {
     console.error(
-      'Warning: build/dns-fallback.json not build, run `yarn generate`'
+      'Warning: build/dns-fallback.json not build, run `npm run build:dns-fallback`'
     );
     cached = [];
     return cached;
diff --git a/build/dns-fallback.json b/build/dns-fallback.json
new file mode 100644
index 0000000000..0b004f21f0
--- /dev/null
+++ b/build/dns-fallback.json
@@ -0,0 +1,178 @@
+[
+  {
+    "domain": "cdn.signal.org",
+    "endpoints": [
+      {
+        "family": "ipv4",
+        "address": "13.227.74.123"
+      },
+      {
+        "family": "ipv4",
+        "address": "13.227.74.19"
+      },
+      {
+        "family": "ipv4",
+        "address": "13.227.74.59"
+      },
+      {
+        "family": "ipv4",
+        "address": "13.227.74.77"
+      },
+      {
+        "family": "ipv6",
+        "address": "2600:9000:2202:3800:1d:4f32:50c0:93a1"
+      },
+      {
+        "family": "ipv6",
+        "address": "2600:9000:2202:3a00:1d:4f32:50c0:93a1"
+      },
+      {
+        "family": "ipv6",
+        "address": "2600:9000:2202:4400:1d:4f32:50c0:93a1"
+      },
+      {
+        "family": "ipv6",
+        "address": "2600:9000:2202:6600:1d:4f32:50c0:93a1"
+      },
+      {
+        "family": "ipv6",
+        "address": "2600:9000:2202:9a00:1d:4f32:50c0:93a1"
+      },
+      {
+        "family": "ipv6",
+        "address": "2600:9000:2202:a200:1d:4f32:50c0:93a1"
+      },
+      {
+        "family": "ipv6",
+        "address": "2600:9000:2202:ce00:1d:4f32:50c0:93a1"
+      },
+      {
+        "family": "ipv6",
+        "address": "2600:9000:2202:ee00:1d:4f32:50c0:93a1"
+      }
+    ]
+  },
+  {
+    "domain": "cdn2.signal.org",
+    "endpoints": [
+      {
+        "family": "ipv4",
+        "address": "104.18.10.47"
+      },
+      {
+        "family": "ipv4",
+        "address": "104.18.11.47"
+      },
+      {
+        "family": "ipv6",
+        "address": "2606:4700::6812:a2f"
+      },
+      {
+        "family": "ipv6",
+        "address": "2606:4700::6812:b2f"
+      }
+    ]
+  },
+  {
+    "domain": "cdn3.signal.org",
+    "endpoints": [
+      {
+        "family": "ipv4",
+        "address": "104.18.10.47"
+      },
+      {
+        "family": "ipv4",
+        "address": "104.18.11.47"
+      },
+      {
+        "family": "ipv6",
+        "address": "2606:4700::6812:a2f"
+      },
+      {
+        "family": "ipv6",
+        "address": "2606:4700::6812:b2f"
+      }
+    ]
+  },
+  {
+    "domain": "cdsi.signal.org",
+    "endpoints": [
+      {
+        "family": "ipv4",
+        "address": "40.122.45.194"
+      },
+      {
+        "family": "ipv6",
+        "address": "2603:1030:7::1"
+      }
+    ]
+  },
+  {
+    "domain": "chat.signal.org",
+    "endpoints": [
+      {
+        "family": "ipv4",
+        "address": "13.248.212.111"
+      },
+      {
+        "family": "ipv4",
+        "address": "76.223.92.165"
+      },
+      {
+        "family": "ipv6",
+        "address": "2600:9000:a507:ab6d:4ce3:2f58:25d7:9cbf"
+      },
+      {
+        "family": "ipv6",
+        "address": "2600:9000:a61f:527c:d5eb:a431:5239:3232"
+      }
+    ]
+  },
+  {
+    "domain": "sfu.voip.signal.org",
+    "endpoints": [
+      {
+        "family": "ipv4",
+        "address": "34.128.167.52"
+      },
+      {
+        "family": "ipv6",
+        "address": "2600:1901:0:1603::"
+      }
+    ]
+  },
+  {
+    "domain": "storage.signal.org",
+    "endpoints": [
+      {
+        "family": "ipv4",
+        "address": "142.250.191.51"
+      },
+      {
+        "family": "ipv6",
+        "address": "2607:f8b0:4005:813::2013"
+      }
+    ]
+  },
+  {
+    "domain": "updates2.signal.org",
+    "endpoints": [
+      {
+        "family": "ipv4",
+        "address": "104.18.26.44"
+      },
+      {
+        "family": "ipv4",
+        "address": "104.18.27.44"
+      },
+      {
+        "family": "ipv6",
+        "address": "2606:4700::6812:1a2c"
+      },
+      {
+        "family": "ipv6",
+        "address": "2606:4700::6812:1b2c"
+      }
+    ]
+  }
+]
diff --git a/package.json b/package.json
index 1247a40110..56962b8b35 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
     "postinstall": "npm run build:acknowledgments && patch-package && npm run electron:install-app-deps",
     "postuninstall": "npm run build:acknowledgments",
     "start": "electron .",
-    "generate": "npm-run-all build-protobuf build:esbuild build:dns-fallback build:icu-types build:compact-locales sass get-expire-time copy-components",
+    "generate": "npm-run-all build-protobuf build:esbuild build:icu-types build:compact-locales sass get-expire-time copy-components",
     "build-release": "npm run build",
     "sign-release": "node ts/updater/generateSignature.js",
     "notarize": "echo 'No longer necessary'",