Compare commits
57 Commits
c0266903ec
...
v4.11.163
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d4d4c73c2b | ||
| 73fbc1c77a | |||
|
|
3dc732521f | ||
| b76aa3fe4a | |||
|
|
c0d1e87b8d | ||
| 04d4026e78 | |||
|
|
cfbc59d6a9 | ||
| dfe42fa942 | |||
|
|
6a8397425e | ||
| 641ec26142 | |||
|
|
1eaf246806 | ||
| 0e97e4d3b6 | |||
|
|
1636a8d0c6 | ||
| ac236750aa | |||
|
|
7e747e6c36 | ||
| 1b2cae5b12 | |||
|
|
76921c4e79 | ||
| 688efff7c9 | |||
|
|
9bc377b62a | ||
| 836ccce7a3 | |||
|
|
34c8e6e38c | ||
| e69bda3aa6 | |||
|
|
5d55e5d826 | ||
| b5902b9fc3 | |||
|
|
f60cf0bd3c | ||
| 83dec0ef54 | |||
|
|
40a76f02cd | ||
| 3def3cc456 | |||
|
|
30bd67d43a | ||
| ffeccee680 | |||
|
|
facbeee024 | ||
| 09102c7903 | |||
|
|
fa33ec7ac8 | ||
| c44f5cf14a | |||
|
|
27793d7c4f | ||
| 32b2902ef7 | |||
|
|
5cdb318854 | ||
| a28f05bb88 | |||
|
|
cecfe73b2e | ||
| b458c7918c | |||
|
|
d8660f4822 | ||
| dad83773a6 | |||
|
|
d2d35de46b | ||
| c752ec0b38 | |||
|
|
28752eb56e | ||
| 4f243a0fcf | |||
|
|
9bce616f26 | ||
| f16ab73c9a | |||
|
|
c29a15e073 | ||
| f5fe61e3eb | |||
|
|
a1a752b0fb | ||
| 7769250875 | |||
|
|
b3af9f3185 | ||
| 7906326790 | |||
|
|
3b4babb9d7 | ||
| 4b284ec747 | |||
| e1b4cfb9c8 |
2
cinny
2
cinny
Submodule cinny updated: b4258278d8...f62200ecd1
296
electron/main.js
296
electron/main.js
@@ -247,6 +247,10 @@ function extractDeepLinkFromArgv(argv) {
|
||||
|
||||
/**
|
||||
* Converts a paarrot:// deep link into an in-app hash route.
|
||||
* Supports:
|
||||
* - Hash routes: paarrot://anything/#/login/server/
|
||||
* - Path routes (SSO-safe): paarrot://desktop/login/server/?loginToken=...
|
||||
* Preserves SSO loginToken from the URL query (Synapse inserts it before `#`).
|
||||
* @param {string} deepLink - The incoming protocol URL.
|
||||
* @returns {string|null} Hash route value without leading #.
|
||||
*/
|
||||
@@ -259,17 +263,63 @@ function deepLinkToHashRoute(deepLink) {
|
||||
return null;
|
||||
}
|
||||
|
||||
const hashIndex = deepLink.indexOf('#');
|
||||
if (hashIndex === -1) {
|
||||
return null;
|
||||
let hashRoute = null;
|
||||
let loginToken = null;
|
||||
|
||||
try {
|
||||
const parsed = new URL(deepLink);
|
||||
loginToken = parsed.searchParams.get('loginToken');
|
||||
|
||||
if (parsed.hash && parsed.hash.length > 1) {
|
||||
const hashValue = parsed.hash.slice(1);
|
||||
hashRoute = hashValue.startsWith('/') ? hashValue : `/${hashValue}`;
|
||||
} else if (parsed.pathname && parsed.pathname !== '/') {
|
||||
// paarrot://desktop/login/... → /login/...
|
||||
hashRoute = parsed.pathname;
|
||||
if (parsed.search && parsed.search.length > 1) {
|
||||
// Keep non-loginToken query on the route; loginToken merged below
|
||||
const params = new URLSearchParams(parsed.search);
|
||||
params.delete('loginToken');
|
||||
const rest = params.toString();
|
||||
if (rest) {
|
||||
hashRoute += `?${rest}`;
|
||||
}
|
||||
}
|
||||
}
|
||||
} catch {
|
||||
const hashIndex = deepLink.indexOf('#');
|
||||
if (hashIndex !== -1) {
|
||||
const hashValue = deepLink.slice(hashIndex + 1);
|
||||
if (hashValue) {
|
||||
hashRoute = hashValue.startsWith('/') ? hashValue : `/${hashValue}`;
|
||||
}
|
||||
}
|
||||
|
||||
const match = deepLink.match(/[?&]loginToken=([^&#]+)/i);
|
||||
if (match) {
|
||||
try {
|
||||
loginToken = decodeURIComponent(match[1]);
|
||||
} catch {
|
||||
loginToken = match[1];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
const hashValue = deepLink.slice(hashIndex + 1);
|
||||
if (!hashValue) {
|
||||
return null;
|
||||
if (loginToken) {
|
||||
if (!hashRoute) {
|
||||
hashRoute = '/';
|
||||
}
|
||||
const queryIndex = hashRoute.indexOf('?');
|
||||
const pathPart = queryIndex === -1 ? hashRoute : hashRoute.slice(0, queryIndex);
|
||||
const params = new URLSearchParams(queryIndex === -1 ? '' : hashRoute.slice(queryIndex + 1));
|
||||
if (!params.has('loginToken')) {
|
||||
params.set('loginToken', loginToken);
|
||||
}
|
||||
const query = params.toString();
|
||||
hashRoute = query ? `${pathPart}?${query}` : pathPart;
|
||||
}
|
||||
|
||||
return hashValue.startsWith('/') ? hashValue : `/${hashValue}`;
|
||||
return hashRoute;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -389,6 +439,129 @@ function syncProtocolRegistrationState() {
|
||||
console.log(`[Protocol] ${PROTOCOL_SCHEME}:// before=${protocolRegistrationState.before} registerCall=${protocolRegistrationState.registerCall} after=${protocolRegistrationState.after}${protocolRegistrationState.error ? ` error=${protocolRegistrationState.error}` : ''}`);
|
||||
}
|
||||
|
||||
/**
|
||||
* Refresh Linux xdg-mime association for paarrot:// to the current app desktop file.
|
||||
* AppImage upgrades often leave a stale desktop id in mimeapps.list.
|
||||
*/
|
||||
async function ensureLinuxProtocolHandler() {
|
||||
const home = app.getPath('home');
|
||||
const searchDirs = [
|
||||
path.join(home, '.local', 'share', 'applications'),
|
||||
'/usr/share/applications',
|
||||
'/var/lib/flatpak/exports/share/applications',
|
||||
];
|
||||
|
||||
let desktopId = null;
|
||||
for (const dir of searchDirs) {
|
||||
try {
|
||||
if (!fs.existsSync(dir)) continue;
|
||||
const entries = fs.readdirSync(dir);
|
||||
// Prefer the newest AppImageLauncher desktop entry when several exist.
|
||||
const matches = entries
|
||||
.filter((name) => /paarrot/i.test(name) && name.endsWith('.desktop'))
|
||||
.map((name) => {
|
||||
try {
|
||||
return { name, mtime: fs.statSync(path.join(dir, name)).mtimeMs };
|
||||
} catch {
|
||||
return { name, mtime: 0 };
|
||||
}
|
||||
})
|
||||
.sort((a, b) => b.mtime - a.mtime);
|
||||
if (matches.length > 0) {
|
||||
desktopId = matches[0].name;
|
||||
break;
|
||||
}
|
||||
} catch {
|
||||
// keep looking
|
||||
}
|
||||
}
|
||||
|
||||
if (!desktopId) {
|
||||
desktopId = 'paarrot.desktop';
|
||||
}
|
||||
|
||||
// Rewrite mimeapps.list so stale AppImage ids cannot win over xdg-mime default.
|
||||
try {
|
||||
const mimeappsPath = path.join(home, '.config', 'mimeapps.list');
|
||||
let content = '';
|
||||
try {
|
||||
content = fs.readFileSync(mimeappsPath, 'utf8');
|
||||
} catch {
|
||||
content = '';
|
||||
}
|
||||
|
||||
const schemeLine = `x-scheme-handler/${PROTOCOL_SCHEME}=${desktopId}`;
|
||||
const lines = content ? content.split(/\r?\n/) : [];
|
||||
let section = null;
|
||||
const next = [];
|
||||
let wroteDefault = false;
|
||||
let wroteAdded = false;
|
||||
|
||||
for (const line of lines) {
|
||||
const trimmed = line.trim();
|
||||
if (trimmed === '[Default Applications]' || trimmed === '[Added Associations]') {
|
||||
section = trimmed;
|
||||
next.push(line);
|
||||
continue;
|
||||
}
|
||||
if (trimmed.startsWith('x-scheme-handler/paarrot=')) {
|
||||
if (section === '[Default Applications]') {
|
||||
next.push(schemeLine);
|
||||
wroteDefault = true;
|
||||
} else if (section === '[Added Associations]') {
|
||||
next.push(`${schemeLine};`);
|
||||
wroteAdded = true;
|
||||
}
|
||||
continue;
|
||||
}
|
||||
next.push(line);
|
||||
}
|
||||
|
||||
if (!next.some((l) => l.trim() === '[Default Applications]')) {
|
||||
next.push('', '[Default Applications]');
|
||||
}
|
||||
if (!wroteDefault) {
|
||||
const idx = next.findIndex((l) => l.trim() === '[Default Applications]');
|
||||
next.splice(idx + 1, 0, schemeLine);
|
||||
}
|
||||
if (!next.some((l) => l.trim() === '[Added Associations]')) {
|
||||
next.unshift('[Added Associations]');
|
||||
}
|
||||
if (!wroteAdded) {
|
||||
const idx = next.findIndex((l) => l.trim() === '[Added Associations]');
|
||||
next.splice(idx + 1, 0, `${schemeLine};`);
|
||||
}
|
||||
|
||||
fs.mkdirSync(path.dirname(mimeappsPath), { recursive: true });
|
||||
fs.writeFileSync(mimeappsPath, `${next.join('\n').replace(/\n{3,}/g, '\n\n').trim()}\n`);
|
||||
console.log(`[Protocol] mimeapps.list → ${desktopId} for x-scheme-handler/${PROTOCOL_SCHEME}`);
|
||||
} catch (error) {
|
||||
console.warn('[Protocol] Failed to rewrite mimeapps.list:', error);
|
||||
}
|
||||
|
||||
await new Promise((resolve) => {
|
||||
execFile(
|
||||
'xdg-mime',
|
||||
['default', desktopId, `x-scheme-handler/${PROTOCOL_SCHEME}`],
|
||||
{ timeout: 5000 },
|
||||
(error, _stdout, stderr) => {
|
||||
if (error) {
|
||||
console.warn(`[Protocol] xdg-mime default failed (${desktopId}):`, error.message, stderr);
|
||||
} else {
|
||||
console.log(`[Protocol] xdg-mime default → ${desktopId} for x-scheme-handler/${PROTOCOL_SCHEME}`);
|
||||
}
|
||||
resolve();
|
||||
}
|
||||
);
|
||||
});
|
||||
|
||||
await new Promise((resolve) => {
|
||||
execFile('update-desktop-database', [path.join(home, '.local', 'share', 'applications')], { timeout: 5000 }, () => {
|
||||
resolve();
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Reads a named Windows registry value.
|
||||
* @param {string} keyPath - Registry key path.
|
||||
@@ -920,6 +1093,12 @@ app.whenReady().then(() => {
|
||||
|
||||
syncProtocolRegistrationState();
|
||||
|
||||
if (process.platform === 'linux') {
|
||||
ensureLinuxProtocolHandler().catch((error) => {
|
||||
console.warn('[Protocol] Startup Linux protocol ensure failed:', error);
|
||||
});
|
||||
}
|
||||
|
||||
createWindow();
|
||||
createTray();
|
||||
|
||||
@@ -933,18 +1112,27 @@ app.whenReady().then(() => {
|
||||
console.error('Failed to start API server:', err);
|
||||
});
|
||||
|
||||
// Check for updates on startup (not in development mode)
|
||||
if (!isDev) {
|
||||
// Check for updates on start (after 3 seconds)
|
||||
setTimeout(() => {
|
||||
autoUpdater.checkForUpdates().catch(err => {
|
||||
console.error('Failed to check for updates:', err);
|
||||
// Check for updates on startup
|
||||
setTimeout(() => {
|
||||
if (isDev) {
|
||||
// Exercise the title-bar updater UI with a mock update.
|
||||
sendUpdaterEvent('update-available', {
|
||||
version: '99.0.0-dev',
|
||||
releaseNotes: 'Mock update for development — download to preview the title-bar progress UI.',
|
||||
releaseDate: new Date().toISOString(),
|
||||
mock: true,
|
||||
});
|
||||
}, 3000);
|
||||
return;
|
||||
}
|
||||
autoUpdater.checkForUpdates().catch((err) => {
|
||||
console.error('Failed to check for updates:', err);
|
||||
});
|
||||
}, 2500);
|
||||
|
||||
if (!isDev) {
|
||||
// Check for updates every 6 hours
|
||||
setInterval(() => {
|
||||
autoUpdater.checkForUpdates().catch(err => {
|
||||
autoUpdater.checkForUpdates().catch((err) => {
|
||||
console.error('Failed to check for updates:', err);
|
||||
});
|
||||
}, 6 * 60 * 60 * 1000);
|
||||
@@ -1053,6 +1241,14 @@ ipcMain.handle('protocol:repair', async () => {
|
||||
|
||||
syncProtocolRegistrationState();
|
||||
|
||||
if (process.platform === 'linux') {
|
||||
try {
|
||||
await ensureLinuxProtocolHandler();
|
||||
} catch (error) {
|
||||
console.warn('[Protocol] Failed to refresh Linux protocol handler:', error);
|
||||
}
|
||||
}
|
||||
|
||||
const status = await getProtocolStatusPayload();
|
||||
return {
|
||||
success: true,
|
||||
@@ -1195,10 +1391,61 @@ ipcMain.handle('get-background-sync-state', async () => {
|
||||
return { success: true, data: 'NotApplicable' };
|
||||
});
|
||||
|
||||
// Auto-updater IPC handlers
|
||||
// Auto-updater IPC handlers (mock in development so title-bar UI can be exercised)
|
||||
let mockDownloadTimer = null;
|
||||
let mockDownloadPercent = 0;
|
||||
|
||||
function sendUpdaterEvent(channel, payload) {
|
||||
if (mainWindow && !mainWindow.isDestroyed()) {
|
||||
mainWindow.webContents.send(channel, payload);
|
||||
}
|
||||
}
|
||||
|
||||
function startMockDownload() {
|
||||
if (mockDownloadTimer) {
|
||||
clearInterval(mockDownloadTimer);
|
||||
}
|
||||
mockDownloadPercent = 0;
|
||||
sendUpdaterEvent('update-download-progress', {
|
||||
percent: 0,
|
||||
transferred: 0,
|
||||
total: 100,
|
||||
mock: true,
|
||||
});
|
||||
|
||||
mockDownloadTimer = setInterval(() => {
|
||||
mockDownloadPercent = Math.min(100, mockDownloadPercent + 4 + Math.random() * 6);
|
||||
const percent = Math.round(mockDownloadPercent);
|
||||
sendUpdaterEvent('update-download-progress', {
|
||||
percent,
|
||||
transferred: percent,
|
||||
total: 100,
|
||||
mock: true,
|
||||
});
|
||||
|
||||
if (percent >= 100) {
|
||||
clearInterval(mockDownloadTimer);
|
||||
mockDownloadTimer = null;
|
||||
sendUpdaterEvent('update-downloaded', {
|
||||
version: '99.0.0-dev',
|
||||
releaseNotes: 'Mock update for development.',
|
||||
mock: true,
|
||||
});
|
||||
}
|
||||
}, 180);
|
||||
}
|
||||
|
||||
ipcMain.handle('check-for-updates', async () => {
|
||||
if (isDev) {
|
||||
return { success: false, error: 'Updates are not available in development mode' };
|
||||
sendUpdaterEvent('update-checking', { mock: true });
|
||||
await new Promise((resolve) => setTimeout(resolve, 600));
|
||||
sendUpdaterEvent('update-available', {
|
||||
version: '99.0.0-dev',
|
||||
releaseNotes: 'Mock update for development — download to preview the title-bar progress UI.',
|
||||
releaseDate: new Date().toISOString(),
|
||||
mock: true,
|
||||
});
|
||||
return { success: true, data: { updateInfo: { version: '99.0.0-dev' }, mock: true } };
|
||||
}
|
||||
try {
|
||||
const result = await autoUpdater.checkForUpdates();
|
||||
@@ -1210,7 +1457,8 @@ ipcMain.handle('check-for-updates', async () => {
|
||||
|
||||
ipcMain.handle('download-update', async () => {
|
||||
if (isDev) {
|
||||
return { success: false, error: 'Updates are not available in development mode' };
|
||||
startMockDownload();
|
||||
return { success: true, data: { mock: true } };
|
||||
}
|
||||
try {
|
||||
await autoUpdater.downloadUpdate();
|
||||
@@ -1222,7 +1470,12 @@ ipcMain.handle('download-update', async () => {
|
||||
|
||||
ipcMain.handle('install-update', () => {
|
||||
if (isDev) {
|
||||
return { success: false, error: 'Updates are not available in development mode' };
|
||||
sendUpdaterEvent('update-not-available', {
|
||||
version: app.getVersion(),
|
||||
mock: true,
|
||||
message: 'Mock install — restart skipped in development.',
|
||||
});
|
||||
return { success: true, data: { mock: true } };
|
||||
}
|
||||
autoUpdater.quitAndInstall();
|
||||
return { success: true };
|
||||
@@ -1230,7 +1483,8 @@ ipcMain.handle('install-update', () => {
|
||||
|
||||
ipcMain.handle('download-and-install-update', async () => {
|
||||
if (isDev) {
|
||||
return { success: false, error: 'Updates are not available in development mode' };
|
||||
startMockDownload();
|
||||
return { success: true, data: { mock: true } };
|
||||
}
|
||||
try {
|
||||
await autoUpdater.downloadUpdate();
|
||||
@@ -1241,6 +1495,8 @@ ipcMain.handle('download-and-install-update', async () => {
|
||||
}
|
||||
});
|
||||
|
||||
ipcMain.handle('updater-is-mock', () => ({ success: true, data: { mock: isDev } }));
|
||||
|
||||
// Screen capture / desktopCapturer handler
|
||||
ipcMain.handle('get-desktop-sources', async (event, opts) => {
|
||||
try {
|
||||
|
||||
@@ -130,6 +130,7 @@ contextBridge.exposeInMainWorld('electron', {
|
||||
updater: {
|
||||
checkForUpdates: () => ipcRenderer.invoke('check-for-updates'),
|
||||
downloadAndInstallUpdate: () => ipcRenderer.invoke('download-and-install-update'),
|
||||
isMock: () => ipcRenderer.invoke('updater-is-mock'),
|
||||
onUpdateAvailable: (callback) => {
|
||||
ipcRenderer.on('update-available', (_, info) => callback(info));
|
||||
},
|
||||
@@ -139,6 +140,9 @@ contextBridge.exposeInMainWorld('electron', {
|
||||
onUpdateDownloaded: (callback) => {
|
||||
ipcRenderer.on('update-downloaded', (_, info) => callback(info));
|
||||
},
|
||||
onUpdateNotAvailable: (callback) => {
|
||||
ipcRenderer.on('update-not-available', (_, info) => callback(info));
|
||||
},
|
||||
downloadUpdate: () => ipcRenderer.invoke('download-update'),
|
||||
installUpdate: () => ipcRenderer.invoke('install-update'),
|
||||
},
|
||||
|
||||
4
package-lock.json
generated
4
package-lock.json
generated
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "paarrot",
|
||||
"version": "4.11.133",
|
||||
"version": "4.11.137",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "paarrot",
|
||||
"version": "4.11.133",
|
||||
"version": "4.11.137",
|
||||
"license": "AGPL-3.0-only",
|
||||
"dependencies": {
|
||||
"adm-zip": "^0.5.18",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "paarrot",
|
||||
"version": "4.11.135",
|
||||
"version": "4.11.163",
|
||||
"description": "Paarrot - A Matrix client based on Cinny",
|
||||
"homepage": "https://github.com/Paarrot/Paarrot-Desktop",
|
||||
"repository": {
|
||||
@@ -13,7 +13,7 @@
|
||||
},
|
||||
"scripts": {
|
||||
"dev": "concurrently \"npm run dev:vite\" \"npm run dev:electron\"",
|
||||
"dev:vite": "cd cinny && npm start",
|
||||
"dev:vite": "cross-env BROWSER=none sh -c 'cd cinny && npm start'",
|
||||
"dev:electron": "wait-on http://localhost:38347 && cross-env NODE_ENV=development electron .",
|
||||
"build": "node -e \"require('fs').copyFileSync('config.json', 'cinny/config.json')\" && cd cinny && npm run build && cd .. && electron-builder --publish always",
|
||||
"build:local": "node -e \"require('fs').copyFileSync('config.json', 'cinny/config.json')\" && cd cinny && npm run build && cd .. && electron-builder",
|
||||
@@ -47,5 +47,9 @@
|
||||
"png2icons": "2.0.1",
|
||||
"sharp": "0.35.3",
|
||||
"wait-on": "9.0.10"
|
||||
},
|
||||
"allowScripts": {
|
||||
"electron-winstaller@5.4.0": true,
|
||||
"electron@43.1.0": true
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user