matty/peertube-plugin-livechat
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix #124 (dirty hack):

Browse Source 
This commit is a dirty hack to fix issue with ARM64 Prosody AppImage.
The fixed appimagebuild tool is not released by the dev team.
So i patch it in my build script. This is not a good solution, but it
works, and let me go forward.
This commit is contained in:
John Livingston
2023-05-31 18:13:35 +02:00
parent 0185b56cab
commit f644ad0d88
11 changed files with 63 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/lib/diagnostic/prosody.ts
View File

@ -40,7 +40,7 @@ export async function diagProsody (test: string, options: RegisterServerOptions)
level: 'error',
message: 'Error: no Prosody server.'
})
if (process.arch !== 'x64' && process.arch !== 'x86_64') {
if (process.arch !== 'x64' && process.arch !== 'x86_64' && process.arch !== 'arm64') {
result.messages.push({
level: 'error',
message: 'Error: your CPU is a ' +

2
server/lib/federation/types.ts
View File

@ -45,7 +45,7 @@ interface LiveChatJSONLDInfosV0 {
links: LiveChatJSONLDLink[]
}
// LiveChatJSONLDInfosV1 is the data format that comes with plugin v6.4.0.
// LiveChatJSONLDInfosV1 is the data format that comes with plugin v7.0.0.
interface LiveChatJSONLDInfosV1 {
type: 'xmpp'
jid: string // room JID

13
server/lib/prosody/config.ts
View File

@ -51,15 +51,22 @@ async function getProsodyFilePaths (options: RegisterServerOptions): Promise<Pro
// } else {
// appImageToExtract = path.resolve(__dirname, '../../prosody/livechat-prosody-x86_64.AppImage')
// }
if (process.arch !== 'x64' && process.arch !== 'x86_64') {
logger.info('Node process.arch is ' + process.arch + ', cant use the Prosody AppImage')
} else {
if (process.arch === 'x64' || process.arch === 'x86_64') {
logger.debug('Node process.arch is ' + process.arch + ', we will be using the x86_64 Prosody AppImage')
appImageToExtract = path.resolve(__dirname, '../../prosody/livechat-prosody-x86_64.AppImage')
exec = path.resolve(appImageExtractPath, 'squashfs-root/AppRun')
execArgs = ['prosody']
execCtl = exec
execCtlArgs = ['prosodyctl']
} else if (process.arch === 'arm64') {
logger.debug('Node process.arch is ' + process.arch + ', we will be using the aarch64 Prosody AppImage')
appImageToExtract = path.resolve(__dirname, '../../prosody/livechat-prosody-aarch64.AppImage')
exec = path.resolve(appImageExtractPath, 'squashfs-root/AppRun')
execArgs = ['prosody']
execCtl = exec
execCtlArgs = ['prosodyctl']
} else {
logger.info('Node process.arch is ' + process.arch + ', cant use the Prosody AppImage')
}
}

2
server/lib/settings.ts
View File

@ -62,7 +62,7 @@ async function initSettings (options: RegisterServerOptions): Promise<void> {
descriptionHTML: loc('diagnostic')
})
if (process.arch !== 'x64' && process.arch !== 'x86_64') {
if (process.arch !== 'x64' && process.arch !== 'x86_64' && process.arch !== 'arm64') {
registerSetting({
name: 'prosody-arch-warning',
type: 'html',