Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions apps/twig/src/main/di/container.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,15 @@ import { AppLifecycleService } from "../services/app-lifecycle/service.js";
import { ConnectivityService } from "../services/connectivity/service.js";
import { ContextMenuService } from "../services/context-menu/service.js";
import { DeepLinkService } from "../services/deep-link/service.js";
import { DockBadgeService } from "../services/dock-badge/service.js";

import { ExternalAppsService } from "../services/external-apps/service.js";
import { FileWatcherService } from "../services/file-watcher/service.js";
import { FocusService } from "../services/focus/service.js";
import { FocusSyncService } from "../services/focus/sync-service.js";
import { FoldersService } from "../services/folders/service.js";
import { FsService } from "../services/fs/service.js";
import { GitService } from "../services/git/service.js";
import { NotificationService } from "../services/notification/service.js";
import { OAuthService } from "../services/oauth/service.js";
import { ProcessTrackingService } from "../services/process-tracking/service.js";
import { ShellService } from "../services/shell/service.js";
Expand All @@ -31,14 +32,15 @@ container.bind(MAIN_TOKENS.AppLifecycleService).to(AppLifecycleService);
container.bind(MAIN_TOKENS.ConnectivityService).to(ConnectivityService);
container.bind(MAIN_TOKENS.ContextMenuService).to(ContextMenuService);
container.bind(MAIN_TOKENS.DeepLinkService).to(DeepLinkService);
container.bind(MAIN_TOKENS.DockBadgeService).to(DockBadgeService);

container.bind(MAIN_TOKENS.ExternalAppsService).to(ExternalAppsService);
container.bind(MAIN_TOKENS.FileWatcherService).to(FileWatcherService);
container.bind(MAIN_TOKENS.FocusService).to(FocusService);
container.bind(MAIN_TOKENS.FocusSyncService).to(FocusSyncService);
container.bind(MAIN_TOKENS.FoldersService).to(FoldersService);
container.bind(MAIN_TOKENS.FsService).to(FsService);
container.bind(MAIN_TOKENS.GitService).to(GitService);
container.bind(MAIN_TOKENS.NotificationService).to(NotificationService);
container.bind(MAIN_TOKENS.OAuthService).to(OAuthService);
container.bind(MAIN_TOKENS.ProcessTrackingService).to(ProcessTrackingService);
container.bind(MAIN_TOKENS.ShellService).to(ShellService);
Expand Down
3 changes: 2 additions & 1 deletion apps/twig/src/main/di/tokens.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export const MAIN_TOKENS = Object.freeze({
AppLifecycleService: Symbol.for("Main.AppLifecycleService"),
ConnectivityService: Symbol.for("Main.ConnectivityService"),
ContextMenuService: Symbol.for("Main.ContextMenuService"),
DockBadgeService: Symbol.for("Main.DockBadgeService"),

ExternalAppsService: Symbol.for("Main.ExternalAppsService"),
FileWatcherService: Symbol.for("Main.FileWatcherService"),
FocusService: Symbol.for("Main.FocusService"),
Expand All @@ -19,6 +19,7 @@ export const MAIN_TOKENS = Object.freeze({
FsService: Symbol.for("Main.FsService"),
GitService: Symbol.for("Main.GitService"),
DeepLinkService: Symbol.for("Main.DeepLinkService"),
NotificationService: Symbol.for("Main.NotificationService"),
OAuthService: Symbol.for("Main.OAuthService"),
ProcessTrackingService: Symbol.for("Main.ProcessTrackingService"),
ShellService: Symbol.for("Main.ShellService"),
Expand Down
4 changes: 2 additions & 2 deletions apps/twig/src/main/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import { initializeDeepLinks, registerDeepLinkHandlers } from "./deep-links.js";
import { container } from "./di/container.js";
import { MAIN_TOKENS } from "./di/tokens.js";
import type { AppLifecycleService } from "./services/app-lifecycle/service.js";
import type { DockBadgeService } from "./services/dock-badge/service.js";
import type { ExternalAppsService } from "./services/external-apps/service.js";
import type { NotificationService } from "./services/notification/service.js";
import type { OAuthService } from "./services/oauth/service.js";
import {
captureException,
Expand Down Expand Up @@ -50,7 +50,7 @@ function ensureClaudeConfigDir(): void {
function initializeServices(): void {
// Initialize services that need early startup
container.get<OAuthService>(MAIN_TOKENS.OAuthService);
container.get<DockBadgeService>(MAIN_TOKENS.DockBadgeService);
container.get<NotificationService>(MAIN_TOKENS.NotificationService);
container.get<UpdatesService>(MAIN_TOKENS.UpdatesService);
container.get<TaskLinkService>(MAIN_TOKENS.TaskLinkService);
container.get<ExternalAppsService>(MAIN_TOKENS.ExternalAppsService);
Expand Down
36 changes: 0 additions & 36 deletions apps/twig/src/main/services/dock-badge/service.ts

This file was deleted.

47 changes: 47 additions & 0 deletions apps/twig/src/main/services/notification/service.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
import { app, Notification } from "electron";
import { injectable, postConstruct } from "inversify";
import { logger } from "../../lib/logger";

const log = logger.scope("notification");

@injectable()
export class NotificationService {
private hasBadge = false;

@postConstruct()
init(): void {
app.on("browser-window-focus", () => this.clearDockBadge());
log.info("Notification service initialized");
}

send(title: string, body: string): void {
if (!Notification.isSupported()) {
log.warn("Notifications not supported on this platform");
return;
}

const notification = new Notification({ title, body });
notification.show();
log.info("Notification sent", { title, body });
}

showDockBadge(): void {
if (this.hasBadge) return;

this.hasBadge = true;
if (process.platform === "darwin" || process.platform === "linux") {
app.dock?.setBadge("•");
}
log.info("Dock badge shown");
}

private clearDockBadge(): void {
if (!this.hasBadge) return;

this.hasBadge = false;
if (process.platform === "darwin" || process.platform === "linux") {
app.dock?.setBadge("");
}
log.info("Dock badge cleared");
}
}
6 changes: 4 additions & 2 deletions apps/twig/src/main/trpc/router.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { analyticsRouter } from "./routers/analytics.js";
import { connectivityRouter } from "./routers/connectivity.js";
import { contextMenuRouter } from "./routers/context-menu.js";
import { deepLinkRouter } from "./routers/deep-link.js";
import { dockBadgeRouter } from "./routers/dock-badge.js";

import { encryptionRouter } from "./routers/encryption.js";
import { externalAppsRouter } from "./routers/external-apps.js";
import { fileWatcherRouter } from "./routers/file-watcher.js";
Expand All @@ -12,6 +12,7 @@ import { foldersRouter } from "./routers/folders.js";
import { fsRouter } from "./routers/fs.js";
import { gitRouter } from "./routers/git.js";
import { logsRouter } from "./routers/logs.js";
import { notificationRouter } from "./routers/notification.js";
import { oauthRouter } from "./routers/oauth.js";
import { osRouter } from "./routers/os.js";
import { processTrackingRouter } from "./routers/process-tracking.js";
Expand All @@ -27,14 +28,15 @@ export const trpcRouter = router({
analytics: analyticsRouter,
connectivity: connectivityRouter,
contextMenu: contextMenuRouter,
dockBadge: dockBadgeRouter,

encryption: encryptionRouter,
externalApps: externalAppsRouter,
fileWatcher: fileWatcherRouter,
focus: focusRouter,
folders: foldersRouter,
fs: fsRouter,
git: gitRouter,
notification: notificationRouter,
oauth: oauthRouter,
logs: logsRouter,
os: osRouter,
Expand Down
11 changes: 0 additions & 11 deletions apps/twig/src/main/trpc/routers/dock-badge.ts

This file was deleted.

15 changes: 15 additions & 0 deletions apps/twig/src/main/trpc/routers/notification.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import { z } from "zod";
import { container } from "../../di/container.js";
import { MAIN_TOKENS } from "../../di/tokens.js";
import type { NotificationService } from "../../services/notification/service.js";
import { publicProcedure, router } from "../trpc.js";

const getService = () =>
container.get<NotificationService>(MAIN_TOKENS.NotificationService);

export const notificationRouter = router({
send: publicProcedure
.input(z.object({ title: z.string(), body: z.string() }))
.mutation(({ input }) => getService().send(input.title, input.body)),
showDockBadge: publicProcedure.mutation(() => getService().showDockBadge()),
});
Binary file added apps/twig/src/renderer/assets/sounds/danilo.mp3
Binary file not shown.
Binary file added apps/twig/src/renderer/assets/sounds/guitar.mp3
Binary file not shown.
Binary file added apps/twig/src/renderer/assets/sounds/meep.mp3
Binary file not shown.
Binary file added apps/twig/src/renderer/assets/sounds/revi.mp3
Binary file not shown.
Loading
Loading