From 4606b368a0646c819405cb19b08fb0950bec7c31 Mon Sep 17 00:00:00 2001
From: Zagrios <40181755+Zagrios@users.noreply.github.com>
Date: Mon, 3 Feb 2025 14:12:34 +0100
Subject: [PATCH 1/6] remove name for certificate verification
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index c28d7c46..25a6bfb6 100644
--- a/README.md
+++ b/README.md
@@ -472,7 +472,7 @@
Credits
- - Zagrios - Mathieu Gries - Lead Developer & Founder.
+ - Zagrios - Lead Developer & Founder.
- Iluhadesu - Co-Developer & Co-Founder, Discord Bot Developer.
- GaetanGrd - Co-Developer & Co-Founder, Documentation Lead.
- cheddZy - Icon Creator.
From 59432da5bf93e7a2c1be77ef90c626659d3e4b56 Mon Sep 17 00:00:00 2001
From: Zagrios <40181755+Zagrios@users.noreply.github.com>
Date: Mon, 3 Feb 2025 19:28:16 +0100
Subject: [PATCH 2/6] Add base headers to requests in RequestService
---
src/main/services/request.service.ts | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/main/services/request.service.ts b/src/main/services/request.service.ts
index d51cf4a6..6a07a2e7 100644
--- a/src/main/services/request.service.ts
+++ b/src/main/services/request.service.ts
@@ -10,16 +10,22 @@ import path from 'path';
import { pipeline } from 'stream/promises';
import sanitize from 'sanitize-filename';
import internal from 'stream';
+import { app } from 'electron';
export class RequestService {
private static instance: RequestService;
private preferredFamily: number | undefined = undefined;
+ private readonly baseHeaders = {
+ 'User-Agent': `BSManager/${app.getVersion()} (Electron/${process.versions.electron} Chrome/${process.versions.chrome} Node/${process.versions.node})`,
+ }
+
public static getInstance(): RequestService {
if (!RequestService.instance) {
RequestService.instance = new RequestService();
}
return RequestService.instance;
+
}
private constructor() {}
@@ -32,7 +38,7 @@ export class RequestService {
try {
// @ts-ignore (ESM is not well supported in this project, We need to move out electron-react-boilerplate, and use Vite)
- const res = await got(url, { dnsLookupIpVersion: family, responseType: 'json' });
+ const res = await got(url, { dnsLookupIpVersion: family, responseType: 'json', headers: this.baseHeaders });
this.preferredFamily = family;
return { data: res.body as T, headers: res.headers };
} catch (err) {
@@ -67,7 +73,7 @@ export class RequestService {
let file: WriteStream | undefined;
// @ts-ignore (ESM is not well supported in this project, We need to move out electron-react-boilerplate, and use Vite)
- stream = got.stream(url, { dnsLookupIpVersion: family });
+ stream = got.stream(url, { dnsLookupIpVersion: family, headers: this.baseHeaders });
stream.on('response', (response) => {
this.preferredFamily = family;
@@ -130,6 +136,7 @@ export class RequestService {
data: null,
};
+ const headers = { ...this.baseHeaders, ...(options?.headers ?? {}) };
const familiesToTry = this.preferredFamily ? [this.preferredFamily, this.preferredFamily === 4 ? 6 : 4] : [4, 6];
let attempt = 0;
@@ -142,9 +149,8 @@ export class RequestService {
}
const family = familiesToTry[attempt++];
-
// @ts-ignore (ESM is not well supported in this project, We need to move out electron-react-boilerplate, and use Vite)
- stream = got.stream(url, { dnsLookupIpVersion: family, ...(options ?? {}) });
+ stream = got.stream(url, { dnsLookupIpVersion: family, ...(options ?? {}), headers });
let data = Buffer.alloc(0);
let response: IncomingMessage;
From 911e3ab50e36158c03f706ab7c622e2d41319255 Mon Sep 17 00:00:00 2001
From: Zagrios <40181755+Zagrios@users.noreply.github.com>
Date: Mon, 3 Feb 2025 19:47:25 +0100
Subject: [PATCH 3/6] bumb to 1.5.2
---
package.json | 2 +-
release/app/package-lock.json | 4 ++--
release/app/package.json | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/package.json b/package.json
index d4a37ee5..4134377e 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
"name": "bs-manager",
"description": "Manage maps, mods and more for Beat Saber",
"main": "./.erb/dll/main.bundle.dev.js",
- "version": "1.5.1",
+ "version": "1.5.2",
"scripts": {
"build-rust-scripts": "ts-node ./.erb/scripts/build-rust-scripts.js",
"build": "concurrently \"npm run build:main\" \"npm run build:renderer\"",
diff --git a/release/app/package-lock.json b/release/app/package-lock.json
index 913c6d91..07252f9b 100644
--- a/release/app/package-lock.json
+++ b/release/app/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "bs-manager",
- "version": "1.5.1",
+ "version": "1.5.2",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "bs-manager",
- "version": "1.5.1",
+ "version": "1.5.2",
"hasInstallScript": true,
"license": "MIT",
"dependencies": {
diff --git a/release/app/package.json b/release/app/package.json
index 7b62e1ba..df0fa26a 100644
--- a/release/app/package.json
+++ b/release/app/package.json
@@ -1,6 +1,6 @@
{
"name": "bs-manager",
- "version": "1.5.1",
+ "version": "1.5.2",
"description": "BSManager",
"main": "./dist/main/main.js",
"author": {
From 31a8438c8fdb641ae97f5bd2fc6fcc35c9d14a08 Mon Sep 17 00:00:00 2001
From: MathieuG-P <40181755+Zagrios@users.noreply.github.com>
Date: Mon, 3 Feb 2025 20:07:31 +0100
Subject: [PATCH 4/6] Update release-linux.yaml
---
.github/workflows/release-linux.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/release-linux.yaml b/.github/workflows/release-linux.yaml
index 7e361647..328a877b 100644
--- a/.github/workflows/release-linux.yaml
+++ b/.github/workflows/release-linux.yaml
@@ -21,7 +21,7 @@ jobs:
uses: actions/checkout@v4
- name: Install rpm/flatpak packages
- run: sudo apt-get install -y flatpak flatpak-builder rpm libarchive-tools
+ run: sudo apt-get install -y --fix-missing flatpak flatpak-builder rpm libarchive-tools
- name: Setup flatpak repo
run: |
From 0f4738b262a947783f443098edf248d97c2a31ea Mon Sep 17 00:00:00 2001
From: MathieuG-P <40181755+Zagrios@users.noreply.github.com>
Date: Mon, 3 Feb 2025 20:25:54 +0100
Subject: [PATCH 5/6] Update release-linux.yaml
---
.github/workflows/release-linux.yaml | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/.github/workflows/release-linux.yaml b/.github/workflows/release-linux.yaml
index 328a877b..89d9b693 100644
--- a/.github/workflows/release-linux.yaml
+++ b/.github/workflows/release-linux.yaml
@@ -20,8 +20,11 @@ jobs:
- name: Check out Git repository
uses: actions/checkout@v4
+ - name: update apt-get
+ run: sudo apt-get update
+
- name: Install rpm/flatpak packages
- run: sudo apt-get install -y --fix-missing flatpak flatpak-builder rpm libarchive-tools
+ run: sudo apt-get install -y flatpak flatpak-builder rpm libarchive-tools
- name: Setup flatpak repo
run: |
From c10c3713c58d1559459a1446f3098de6723c26b2 Mon Sep 17 00:00:00 2001
From: MathieuG-P <40181755+Zagrios@users.noreply.github.com>
Date: Tue, 4 Feb 2025 00:47:43 +0100
Subject: [PATCH 6/6] Update build.yaml
---
.github/workflows/build.yaml | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 8a7bdc1a..37a1cda6 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -25,6 +25,11 @@ jobs:
node-version: 22.11.0
cache: "npm"
+ # Update package lists
+ - name: update apt-get
+ if: matrix.os == 'ubuntu-latest'
+ run: sudo apt-get update
+
# Install and setup rpm/Flatpak for Ubuntu
- name: Install rpm/flatpak packages (Ubuntu only)
if: matrix.os == 'ubuntu-latest'