mirror of
https://github.com/johannesjo/super-productivity.git
synced 2026-07-17 16:37:43 +00:00
* fix(issue): prevent crash from orphan issueProviderId (#7135) The Jira image-headers effect in task-detail-panel subscribed to selectIssueProviderById without an error handler, so a task with an issueProviderId pointing at a deleted provider (e.g. after sync convergence where taskIdsToUnlink didn't cover all local tasks) propagated the selector throw to Zone.js as a crash dialog. Wrap the inner selector observable in catchError that logs and falls back to of(null); the downstream jiraCfg?.isEnabled guard handles the fallback. Also drop IssueLog.log(issueProviderKey, issueProvider) from the throwing variant of the selector: providers may carry credentials (host, token, apiKey) and IssueLog history is exportable. * fix(focus-mode): sync tray countdown with in-app timer during breaks Tray title was rebuilt from a cached currentFocusSessionTime that only refreshed when CURRENT_TASK_UPDATED fired. addTimeSpent is gated on an active current task, so during focus-mode breaks or task-less focus sessions the cache froze while the in-app timer kept ticking. Add the tick action to taskChangeElectron$ so the cache refreshes every second whenever the focus timer is running. Fixes #7278 * fix(ci): restore GitHub Actions SHA pins undone by0e9218bd68Commit0e9218bd68silently reverted PR #7212 (github-actions-minor group bump) along with its stated sync/client-id work. This restores the 15 workflow files to their pre-revert state. Actions restored to newer pinned SHAs: - actions/upload-artifact v7.0.0 -> v7.0.1 - step-security/harden-runner v2.16.1 -> v2.17.0 - softprops/action-gh-release v2.6.1 -> v3.0.0 - signpath/github-action-submit-signing-request v2.0 -> v2.1 - anthropics/claude-code-action v1.0.89 -> v1.0.93 - docker/build-push-action v7.0.0 -> v7.1.0 - easingthemes/ssh-deploy v5.1.1 -> v6.0.3 * fix: restore i18n, UI, and docs work undone by0e9218bd68Commit0e9218bd68silently reverted the following work alongside its stated sync/client-id changes. Files where later master commits (fec7b25f23, etc.) already re-applied the reverted work are intentionally left untouched. Restored: - #7232 docs/long-term-plans/location-based-reminders.md (513 lines) - #7199 Romanian i18n phase 3 (ro.json + ro-md.json, ~1168 lines) - #7049 Polish translation improvements - #7143 planner component styling (4 scss files) - #7211 add-task-bar preserve time estimate when typing title - #7208 task.reducer roll-up estimates for added subtasks - #6767 focus-mode pomodoro reset button - #7205 plugin-dev github-issue-provider TOKEN description - #7231 mobile-bottom-nav FAB fix -a4fe03272iOS keyboard accessory bar (global-theme + dialog-fullscreen-markdown) -309670db3ShortSyntaxEffects undefined guard -667a7986fDropbox PKCE auth comment/behavior * fix(electron): restore electron + e2e work undone by0e9218bd68Commit0e9218bd68silently reverted the following electron/e2e work. Files already re-fixed by later master commits are left as-is: - e2e/tests/sync/supersync-archive-conflict.spec.ts (de33234976+191d129ff3) Restored: -e8a3e156ebfix(electron): Linux autostart IDB backing-store recovery (re-adds electron/clear-stale-idb-locks.ts + start-app.ts wiring) -5ce78a5b63fix(electron): macOS Cmd+Q / Dock > Quit hang (setIsQuiting + before-quit delegate to close-handler) -46e0fa2d01fix(sync): FILE_SYNC_LIST_FILES IPC contract (electronAPI.d.ts + local-file-sync + preload + ipc-events) -ea1ef16307fix(android): session-only SAF permissions on OEM devices -8865dc0a50test(e2e): supersync parallel-worker stampede guard (SUPERSYNC_SERVER_HEALTHY env-var fallback + goto retry loop) -af7c7687e2test(e2e): block WS-triggered downloads in non-WS specs -265b44db5dtest(e2e): premature waitForURL on daily-summary (this is literally the fix the bad commit's message claimed to add) Conflict resolutions: - e2e/utils/supersync-helpers.ts: kept the refined getDoneTaskElement checks fromd64014d086(later thanc558bcab5e) while restoring the goto retry loop from8865dc0a50. - electron/start-app.ts: unioned imports (setIsQuiting + clearStaleLevelDbLocks from theirs, fs from ours). * fix(sync): restore sync-core work undone by0e9218bd68Commit0e9218bd68silently reverted parts of several sync fixes. Most sync-core reverts have already been re-addressed differently on master by later commits (1f5184f6e7,05cd875dd6,09f5ced2c9,7df43358ab,d9158d6adb,32dbc95ed9,8c3b08e016,f89fe1ebc3) — those files are intentionally left untouched to avoid reverting master's newer work. This PR restores only the pieces that are genuinely still missing: -e8a3e156ebfix(electron): IDB backing-store autoreload (in-app piece) operation-log-hydrator.service.ts + .spec.ts (the electron/clear- stale-idb-locks.ts piece was restored in the prior commit) Plus three low-risk documentation/cleanup restorations: - operation-sync.util.ts — add "Nextcloud" to isFileBasedProvider JSDoc - dropbox.ts — restore improved _getRedirectUri JSDoc (667a7986fb) - dialog-get-and-enter-auth-code.component.ts — restore isNativePlatform comment explaining why manual code entry flow is used (667a7986fb) - file-adapter.interface.ts — remove stray "// NEW" comment (46e0fa2d01) Intentionally NOT restored (master's newer work covers or supersedes): - sync-trigger.service.ts / sync.effects.ts (05cd875dd6) - sync-wrapper.service.ts (1f5184f6e7) - sync-errors.ts (1f5184f6e7re-added LegacySyncFormatDetectedError) - file-based-sync-adapter.service.ts + spec (1f5184f6e7+d9158d6adb) - file-based-sync.types.ts (1f5184f6e7) - operation-log.const.ts (32dbc95ed9bumped IDB_OPEN_RETRIES to 5) - dialog-sync-initial-cfg.component.ts (f89fe1ebc3)
271 lines
8.6 KiB
TypeScript
271 lines
8.6 KiB
TypeScript
import {
|
|
ipcRenderer,
|
|
IpcRendererEvent,
|
|
webFrame,
|
|
contextBridge,
|
|
webUtils,
|
|
} from 'electron';
|
|
import { ElectronAPI } from './electronAPI.d';
|
|
import { IPC, IPCEventValue } from './shared-with-frontend/ipc-events.const';
|
|
import { LocalBackupMeta } from '../src/app/imex/local-backup/local-backup.model';
|
|
import {
|
|
PluginManifest,
|
|
PluginNodeScriptRequest,
|
|
PluginNodeScriptResult,
|
|
} from '../packages/plugin-api/src/types';
|
|
import {
|
|
LocalRestApiRequestPayload,
|
|
LocalRestApiResponsePayload,
|
|
} from './shared-with-frontend/local-rest-api.model';
|
|
|
|
const _send: (channel: IPCEventValue, ...args: unknown[]) => void = (channel, ...args) =>
|
|
ipcRenderer.send(channel, ...args);
|
|
const _invoke: (channel: IPCEventValue, ...args: unknown[]) => Promise<unknown> = (
|
|
channel,
|
|
...args
|
|
) => ipcRenderer.invoke(channel, ...args);
|
|
|
|
const isGnomeDesktop = (): boolean => {
|
|
if (process.platform !== 'linux') {
|
|
return false;
|
|
}
|
|
|
|
const desktopValues = [
|
|
process.env.XDG_CURRENT_DESKTOP,
|
|
process.env.XDG_SESSION_DESKTOP,
|
|
process.env.DESKTOP_SESSION,
|
|
process.env.GNOME_SHELL_SESSION_MODE,
|
|
]
|
|
.filter((value): value is string => !!value)
|
|
.map((value) => value.toLowerCase());
|
|
|
|
return desktopValues.some(
|
|
(value) => value.includes('gnome') || value.includes('ubuntu'),
|
|
);
|
|
};
|
|
|
|
const ea: ElectronAPI = {
|
|
on: (
|
|
channel: string,
|
|
listener: (event: IpcRendererEvent, ...args: unknown[]) => void,
|
|
) => {
|
|
// NOTE: there is no proper way to unsubscribe apart from unsubscribing all
|
|
ipcRenderer.on(channel, listener);
|
|
},
|
|
// INVOKE
|
|
// ------
|
|
getUserDataPath: () => _invoke('GET_PATH', 'userData') as Promise<string>,
|
|
getBackupPath: () => _invoke('GET_BACKUP_PATH') as Promise<string>,
|
|
checkBackupAvailable: () =>
|
|
_invoke('BACKUP_IS_AVAILABLE') as Promise<false | LocalBackupMeta>,
|
|
loadBackupData: (backupPath) =>
|
|
_invoke('BACKUP_LOAD_DATA', backupPath) as Promise<string>,
|
|
fileSyncSave: (filePath) =>
|
|
_invoke('FILE_SYNC_SAVE', filePath) as Promise<string | Error>,
|
|
fileSyncLoad: (filePath) =>
|
|
_invoke('FILE_SYNC_LOAD', filePath) as Promise<{
|
|
rev: string;
|
|
dataStr: string | undefined;
|
|
}>,
|
|
fileSyncRemove: (filePath) => _invoke('FILE_SYNC_REMOVE', filePath) as Promise<void>,
|
|
fileSyncListFiles: (args) =>
|
|
_invoke('FILE_SYNC_LIST_FILES', args) as Promise<string[] | Error>,
|
|
checkDirExists: (dirPath) =>
|
|
_invoke('CHECK_DIR_EXISTS', dirPath) as Promise<true | Error>,
|
|
|
|
pickDirectory: () => _invoke('PICK_DIRECTORY') as Promise<string | undefined>,
|
|
|
|
showOpenDialog: (options: {
|
|
properties: string[];
|
|
title?: string;
|
|
defaultPath?: string;
|
|
}) => _invoke('SHOW_OPEN_DIALOG', options) as Promise<string[] | undefined>,
|
|
// STANDARD
|
|
// --------
|
|
setZoomFactor: (zoomFactor: number) => {
|
|
webFrame.setZoomFactor(zoomFactor);
|
|
},
|
|
getZoomFactor: () => webFrame.getZoomFactor(),
|
|
isLinux: () => process.platform === 'linux',
|
|
isGnomeDesktop,
|
|
isMacOS: () => process.platform === 'darwin',
|
|
isSnap: () => process && process.env && !!process.env.SNAP,
|
|
isFlatpak: () => process && process.env && !!process.env.FLATPAK_ID,
|
|
|
|
// CLIPBOARD IMAGES
|
|
// ----------------
|
|
saveClipboardImage: (
|
|
basePath: string,
|
|
fileName: string,
|
|
base64Data: string,
|
|
mimeType: string,
|
|
) =>
|
|
_invoke('CLIPBOARD_IMAGE_SAVE', {
|
|
basePath,
|
|
fileName,
|
|
base64Data,
|
|
mimeType,
|
|
}) as Promise<string>,
|
|
|
|
loadClipboardImage: (basePath: string, imageId: string) =>
|
|
_invoke('CLIPBOARD_IMAGE_LOAD', { basePath, imageId }) as Promise<{
|
|
base64: string;
|
|
mimeType: string;
|
|
} | null>,
|
|
|
|
deleteClipboardImage: (basePath: string, imageId: string) =>
|
|
_invoke('CLIPBOARD_IMAGE_DELETE', { basePath, imageId }) as Promise<boolean>,
|
|
|
|
listClipboardImages: (basePath: string) =>
|
|
_invoke('CLIPBOARD_IMAGE_LIST', { basePath }) as Promise<
|
|
{ id: string; mimeType: string; createdAt: number; size: number }[]
|
|
>,
|
|
|
|
getClipboardImagePath: (basePath: string, imageId: string) =>
|
|
_invoke('CLIPBOARD_IMAGE_GET_PATH', { basePath, imageId }) as Promise<string | null>,
|
|
|
|
getClipboardFilePaths: () => _invoke('CLIPBOARD_GET_FILE_PATHS') as Promise<string[]>,
|
|
|
|
copyClipboardImageFile: (basePath: string, filePath: string) =>
|
|
_invoke('CLIPBOARD_COPY_IMAGE_FILE', {
|
|
basePath,
|
|
filePath,
|
|
}) as Promise<{
|
|
id: string;
|
|
mimeType: string;
|
|
size: number;
|
|
createdAt: number;
|
|
} | null>,
|
|
|
|
readClipboardImage: (basePath: string) =>
|
|
_invoke('CLIPBOARD_READ_IMAGE', { basePath }) as Promise<{
|
|
id: string;
|
|
mimeType: string;
|
|
size: number;
|
|
createdAt: number;
|
|
} | null>,
|
|
|
|
getPathForFile: (file: File) => {
|
|
try {
|
|
return webUtils.getPathForFile(file);
|
|
} catch (error) {
|
|
console.error('[CLIPBOARD] Error getting path for file:', error);
|
|
return null;
|
|
}
|
|
},
|
|
|
|
// SEND
|
|
// ----
|
|
relaunch: () => _send('RELAUNCH'),
|
|
exit: () => _send('EXIT'),
|
|
flashFrame: () => _send('FLASH_FRAME'),
|
|
showOrFocus: () => _send('SHOW_OR_FOCUS'),
|
|
lockScreen: () => _send('LOCK_SCREEN'),
|
|
shutdownNow: () => _send('SHUTDOWN_NOW'),
|
|
reloadMainWin: () => _send('RELOAD_MAIN_WIN'),
|
|
openDevTools: () => _send('OPEN_DEV_TOOLS'),
|
|
showEmojiPanel: () => _send('SHOW_EMOJI_PANEL'),
|
|
informAboutAppReady: () => _send('APP_READY'),
|
|
|
|
openPath: (path: string) => _send('OPEN_PATH', path),
|
|
openExternalUrl: (url: string) => _send('OPEN_EXTERNAL', url),
|
|
saveFileDialog: (filename: string, data: string) =>
|
|
_invoke('SAVE_FILE_DIALOG', { filename, data }) as Promise<{
|
|
success: boolean;
|
|
path?: string;
|
|
}>,
|
|
shareNative: (payload: {
|
|
text?: string;
|
|
url?: string;
|
|
title?: string;
|
|
files?: string[];
|
|
}) =>
|
|
_invoke('SHARE_NATIVE', payload) as Promise<{
|
|
success: boolean;
|
|
error?: string;
|
|
}>,
|
|
scheduleRegisterBeforeClose: (id) => _send('REGISTER_BEFORE_CLOSE', { id }),
|
|
unscheduleRegisterBeforeClose: (id) => _send('UNREGISTER_BEFORE_CLOSE', { id }),
|
|
setDoneRegisterBeforeClose: (id) => _send('BEFORE_CLOSE_DONE', { id }),
|
|
|
|
setProgressBar: (args) => _send('SET_PROGRESS_BAR', args),
|
|
|
|
sendAppSettingsToElectron: (globalCfg) =>
|
|
_send('TRANSFER_SETTINGS_TO_ELECTRON', globalCfg),
|
|
sendSettingsUpdate: (globalCfg) => _send('UPDATE_SETTINGS', globalCfg),
|
|
updateTitleBarDarkMode: (isDarkMode: boolean) =>
|
|
_send('UPDATE_TITLE_BAR_DARK_MODE', isDarkMode),
|
|
registerGlobalShortcuts: (keyboardCfg) =>
|
|
_send('REGISTER_GLOBAL_SHORTCUTS', keyboardCfg),
|
|
showFullScreenBlocker: (args) => _send('FULL_SCREEN_BLOCKER', args),
|
|
|
|
makeJiraRequest: (args) => _send('JIRA_MAKE_REQUEST_EVENT', args),
|
|
jiraSetupImgHeaders: (args) => _send('JIRA_SETUP_IMG_HEADERS', args),
|
|
|
|
backupAppData: (appData) => _send('BACKUP', appData),
|
|
|
|
updateCurrentTask: (
|
|
task,
|
|
isPomodoroEnabled,
|
|
currentPomodoroSessionTime,
|
|
isFocusModeEnabled?,
|
|
currentFocusSessionTime?,
|
|
focusModeMode?,
|
|
) =>
|
|
_send(
|
|
'CURRENT_TASK_UPDATED',
|
|
task,
|
|
isPomodoroEnabled,
|
|
currentPomodoroSessionTime,
|
|
isFocusModeEnabled,
|
|
currentFocusSessionTime,
|
|
focusModeMode,
|
|
),
|
|
|
|
exec: (command: string) => _send('EXEC', command),
|
|
|
|
updateTodayTasks: (tasks: any[]) => _send('TODAY_TASKS_UPDATED', tasks),
|
|
|
|
onSwitchTask: (listener: (taskId: string) => void) => {
|
|
// We register the listener directly without using standard 'on' method
|
|
// Because the standard 'on' method doesn't strip out the event arg like we need
|
|
ipcRenderer.on('SWITCH_TASK', (_: any, taskId: string) => listener(taskId));
|
|
},
|
|
|
|
// Plugin API
|
|
pluginExecNodeScript: (
|
|
pluginId: string,
|
|
manifest: PluginManifest,
|
|
request: PluginNodeScriptRequest,
|
|
) =>
|
|
_invoke(
|
|
'PLUGIN_EXEC_NODE_SCRIPT',
|
|
pluginId,
|
|
manifest,
|
|
request,
|
|
) as Promise<PluginNodeScriptResult>,
|
|
|
|
// Plugin OAuth
|
|
pluginOAuthPrepare: () => _invoke('PLUGIN_OAUTH_PREPARE') as Promise<{ port: number }>,
|
|
pluginOAuthStart: (url: string) => _send('PLUGIN_OAUTH_START', { url }),
|
|
onPluginOAuthCb: (
|
|
listener: (data: { code?: string; error?: string; state?: string }) => void,
|
|
) => {
|
|
ipcRenderer.on(
|
|
IPC.PLUGIN_OAUTH_CB,
|
|
(_: unknown, data: { code?: string; error?: string; state?: string }) =>
|
|
listener(data),
|
|
);
|
|
},
|
|
|
|
onLocalRestApiRequest: (listener: (payload: LocalRestApiRequestPayload) => void) => {
|
|
ipcRenderer.on(IPC.LOCAL_REST_API_REQUEST, (_event, payload) =>
|
|
listener(payload as LocalRestApiRequestPayload),
|
|
);
|
|
},
|
|
sendLocalRestApiResponse: (payload: LocalRestApiResponsePayload) =>
|
|
_send(IPC.LOCAL_REST_API_RESPONSE, payload),
|
|
};
|
|
|
|
// Expose ea to window for ipc-event.ts using contextBridge for context isolation
|
|
contextBridge.exposeInMainWorld('ea', ea);
|