Merge pull request #657 from BlueBubblesApp/development

v1.9.8

.github/workflows/main.yml

@@ -10,7 +10,7 @@ jobs:
     strategy:
       matrix:
         os: [macOS-13]
-        python-version: ["pypy3.10", "3.10"]
+        python-version: ["3.10"]
 
     steps:
       - uses: actions/checkout@v4
@@ -20,8 +20,6 @@ jobs:
         uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
-      - name: Setup Python ${{ matrix.python-version }}
-        run: python -m pip install setuptools
       - name: Setup Node.js 20.11
         uses: actions/setup-node@v4
         with:

.gitignore

@@ -2,7 +2,6 @@ node_modules/
 dist/
 release/
 .vscode
-.github
 .DS_Store
 **/*.log
 .env

README.md

@@ -5,27 +5,28 @@ This is the back-end server for the BlueBubbles App. It allows you to forward yo
 ## Pre-requisites
 
 -   NodeJS: https://nodejs.org/en/
--   Yarn Package Manager: https://yarnpkg.com/
 -   Git: https://git-scm.com/
 
+**Warning**: Yarn may not work for this project. You may run into build errors.
+
 ## Development
 
 1. Clone the repository
     - `git clone [email protected]:BlueBubblesApp/BlueBubbles-Server.git`
 2. Navigate into the repository on your local machine
     - `cd BlueBubbles-Server`
 3. Install the server dependencies
-    - `yarn`
+    - `npm install`
 4. Run the dev server (this will start both the renderer and server)
-    - `yarn start`
+    - `npm run start`
 
 ### macOS Warning
 
 If you are using macOS 10.x and are having issues building/running the server, please downgrade the `node-mac-permissions` dependency to `v2.2.0`. The reason it's on a newer version is to fix a production crashing issue on Big Sur+. Please downgrade it manually for testing on macOS v10.x.
 
 ```bash
 cd packages/server
-yarn add [email protected]
+npm install [email protected]
 ```
 
 ## Structure / Directory Map

package.json

@@ -1,6 +1,6 @@
 {
     "name": "bluebubbles-server",
-    "version": "1.9.7",
+    "version": "1.9.8",
     "description": "BlueBubbles Server is the app that powers the BlueBubbles app ecosystem",
     "private": true,
     "workspaces": [
@@ -9,8 +9,10 @@
     "scripts": {
         "start": "concurrently \"cd ./packages/ui && npm run start\" \"cd ./packages/server && npm run start\"",
         "build-ui": "cd ./packages/ui && npm run build && mkdir -p ../server/dist/static && rm -rf ../server/dist/static && cp -R ./build/** ../server/dist/ && cd ../../",
-        "build-server": "./node_modules/ngrok/bin/ngrok update && cd ./packages/server && npm run dist && cd ../../",
-        "build": "npm run build-ui && npm run build-server && rm -rf ./dist && mkdir -p ./dist && cp -R ./packages/server/release/* ./dist/ && rm -rf ./packages/server/release/ && rm -rf ./packages/ui/build/"
+        "build-server": "cd ./packages/server && npm run dist && cd ../../",
+        "release-server": "cd ./packages/server && npm run release && cd ../../",
+        "build": "npm run build-ui && npm run build-server && rm -rf ./dist && mkdir -p ./dist && cp -R ./packages/server/releases/* ./dist/ && rm -rf ./packages/server/releases/ && rm -rf ./packages/ui/build/",
+        "release": "npm run build-ui && npm run release-server"
     },
     "repository": "https://www.github.com/BlueBubblesApp/BlueBubbles-Server",
     "author": "BlueBubbles Development Team <[email protected]>",
@@ -20,9 +22,9 @@
     },
     "homepage": "https://www.bluebubbles.app",
     "devEngines": {
-        "node": "18.x",
-        "npm": ">=8.x",
-        "yarn": ">=1.x"
+        "node": "20.11.x",
+        "npm": ">=10.x",
+        "python": ">=3.10.x"
     },
     "devDependencies": {
         "concurrently": "^7.0.0"

packages/server/.env.example

@@ -1,3 +1,3 @@
-APPLEID=
-APPLEIDPASS=
-TEAMID=
+APPLE_ID=
+APPLE_APP_SPECIFIC_PASSWORD=
+APPLE_TEAM_ID=

packages/server/appResources/macos/daemons/cloudflare/README.md

@@ -6,6 +6,8 @@ The `.md5` files within this directory contain a single string that is correlate
 
 ## Clourflared
 
-This is the official cloudflare daemon, downloaded from: https://github.com/cloudflare/cloudflared/releases/latest/download/cloudflared-darwin-amd64.tgz
+This is the official cloudflare daemon (x86; amd64), downloaded from: https://github.com/cloudflare/cloudflared/releases/latest/download/cloudflared-darwin-amd64.tgz
+
+The arm64 (Apple Silicon) build is from Homebrew: https://formulae.brew.sh/formula/cloudflared
 
 The dummy `cloudflared-config.yml` file is for the daemon to use as to not interfere with the default system configuration

packages/server/appResources/macos/daemons/cloudflare/arm64/cloudflared.md5

@@ -0,0 +1 @@
+bb5b2df38ee82a42ec156ceb0b3744fa