Merge pull request #144 from ragestudio/dev

comty.js

@@ -1 +1 @@
-Subproject commit fe5cb1a9a275444abd7307bbd8a4e7c68221369b
+Subproject commit 7c11af2643de00423a6ac680bba235c3352620a0

packages/app/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@comty/app",
-	"version": "1.42.0@alpha",
+	"version": "1.42.1@alpha",
 	"license": "ComtyLicense",
 	"main": "electron/main",
 	"type": "module",
@@ -34,7 +34,7 @@
 		"axios": "^1.7.7",
 		"bear-react-carousel": "^4.0.10-alpha.0",
 		"classnames": "2.3.1",
-		"comty.js": "^0.66.0",
+		"comty.js": "^0.66.1",
 		"d3": "^7.9.0",
 		"dashjs": "^5.0.0",
 		"dompurify": "^3.0.0",

packages/app/src/App.jsx

@@ -40,11 +40,15 @@ class ComtyApp extends React.Component {
 					await this.auth.flush()
 					await this.initialization()
 
+					app.cores.api.reset()
+
 					app.navigation.goMain()
 				},
 				onLogout: async () => {
 					await this.auth.flush()
 
+					app.cores.api.reset()
+
 					app.navigation.goAuth()
 				},
 				onInvalidSession: async (error) => {

packages/app/src/cores/api/api.core.js

@@ -24,6 +24,7 @@ export default class APICore extends Core {
 		listenEvent: this.listenEvent.bind(this),
 		unlistenEvent: this.unlistenEvent.bind(this),
 		emitEvent: this.emitEvent.bind(this),
+		reset: this.reset.bind(this),
 		measurePing: measurePing,
 		useRequest: useRequest,
 	}
@@ -84,6 +85,10 @@ export default class APICore extends Core {
 		return this.client.ws.sockets.get(instance).off(key, handler)
 	}
 
+	async reset() {
+		this.client.ws.connectAll()
+	}
+
 	async onInitialize() {
 		this.client = await createClient({
 			eventBus: app.eventBus,
@@ -93,15 +98,6 @@ export default class APICore extends Core {
 			},
 		})
 
-		// handle auth events
-		this.client.eventBus.on("auth:login_success", () => {
-			this.client.ws.connectAll()
-		})
-
-		this.client.eventBus.on("auth:logout_success", () => {
-			this.client.ws.connectAll()
-		})
-
 		// make a basic request to check if the API is available
 		await this.client
 			.baseRequest({

packages/server/Dockerfile

@@ -8,8 +8,9 @@ RUN apt install -y --no-install-recommends git
 RUN apt install -y --no-install-recommends ssh
 RUN apt install -y --no-install-recommends curl
 RUN apt install -y --no-install-recommends nscd
+RUN apt install -y --no-install-recommends bash
+RUN apt install -y --no-install-recommends which
 RUN apt install -y --no-install-recommends ca-certificates
-RUN apt install -y --no-install-recommends ffmpeg
 
 # Create workdir
 RUN mkdir -p /comty-server
@@ -41,6 +42,12 @@ RUN /comty-server/nginx-bin -v
 RUN chmod -R 777 /comty-server
 RUN chown -R node:node /comty-server
 
+# Install manual server dependencies
+RUN mkdir -p /root/.local/bin
+RUN "/comty-server/scripts/installLatestFfmpeg.sh"
+RUN mv /root/.local/bin/ffmpeg /bin/ffmpeg
+RUN mv /root/.local/bin/ffprobe /bin/ffprobe
+
 # Set user to node
 USER node
 

packages/server/classes/FFMPEGLib/index.js

@@ -57,6 +57,10 @@ export class FFMPEGLib extends EventEmitter {
 		}
 
 		return new Promise((resolve, reject) => {
+			if (!bin) {
+				return reject("No binary provided")
+			}
+
 			const process = child_process.exec(
 				`${bin} ${args}`,
 				{

packages/server/classes/MultiqualityHLSJob/index.js

@@ -108,9 +108,9 @@ export default class MultiqualityHLSJob extends FFMPEGLib {
 			fs.mkdirSync(outputPath, { recursive: true })
 		}
 
+		try {
 			const inputProbe = await Utils.probe(this.params.input)
 
-		try {
 			const result = await this.ffmpeg({
 				args: cmdStr,
 				cwd: outputPath,

packages/server/classes/SegmentedAudioMPDJob/index.js

@@ -105,9 +105,9 @@ export default class SegmentedAudioMPDJob extends FFMPEGLib {
 			fs.mkdirSync(outputPath, { recursive: true })
 		}
 
+		try {
 			const inputProbe = await Utils.probe(this.params.input)
 
-		try {
 			const ffmpegResult = await this.ffmpeg({
 				args: segmentationCmd,
 				onProcess: (process) => {

packages/server/eslint.config.mjs

@@ -0,0 +1,15 @@
+import js from "@eslint/js"
+import globals from "globals"
+import { defineConfig } from "eslint/config"
+
+export default defineConfig([
+	{
+		files: ["**/*.{js,mjs,cjs}"],
+		plugins: { js },
+		extends: ["js/recommended"],
+	},
+	{
+		files: ["**/*.{js,mjs,cjs}"],
+		languageOptions: { globals: globals.browser },
+	},
+])

packages/server/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@comty/server",
-	"version": "1.40.1@alpha",
+	"version": "1.42.1@alpha",
 	"license": "ComtyLicense",
 	"private": true,
 	"workspaces": [
@@ -40,7 +40,10 @@
 		"tree-kill": "^1.2.2"
 	},
 	"devDependencies": {
+		"@eslint/js": "^9.26.0",
 		"chai": "^5.1.0",
+		"eslint": "^9.26.0",
+		"globals": "^16.1.0",
 		"mocha": "^10.3.0"
 	},
 	"resolutions": {

packages/server/services/files/queues/fileProcess/index.js

@@ -1,4 +1,3 @@
-import path from "node:path"
 import fs from "node:fs"
 
 import Upload from "@shared-classes/Upload"

packages/server/services/posts/routes/posts/[post_id]/replies/get.js

@@ -6,7 +6,7 @@ export default {
 		return await PostClass.replies({
 			post_id: req.params.post_id,
 			for_user_id: req.auth?.session.user_id,
-			trim: req.query.trim,
+			page: req.query.page,
 			limit: req.query.limit,
 		})
 	},