Skip to content

Open-source and local-first Slack and Notion alternative that puts you in control of your data

Refactor url generation for servers

Hakan Shehu3ab7a1b62714
diff --git a/desktop/src/components/app.tsx b/desktop/src/components/app.tsx
index 68f575d3..f7011fc3 100644
--- a/desktop/src/components/app.tsx
+++ b/desktop/src/components/app.tsx
@@ -1,76 +1,29 @@
import React from 'react';
+import Axios from 'axios';
import { Login } from '@/components/accounts/login';
import { AppLoading } from '@/components/app-loading';
import { AccountContext } from '@/contexts/account';
-import Axios from 'axios';
import { AxiosContext } from '@/contexts/axios';
import { Outlet } from 'react-router-dom';
import { AccountLogout } from '@/components/accounts/account-logout';
-import { AppDatabaseContext } from '@/contexts/app-database';
-import {
- Kysely,
- SqliteAdapter,
- DummyDriver,
- SqliteIntrospector,
- SqliteQueryCompiler,
-} from 'kysely';
-import { AppDatabaseSchema } from '@/electron/schemas/app';
-import { useQuery } from '@tanstack/react-query';
import { DelayedComponent } from '@/components/ui/delayed-component';
-
-const SERVER_URL = 'http://localhost:3000';
-
-const appDatabase = new Kysely<AppDatabaseSchema>({
- dialect: {
- createAdapter: () => new SqliteAdapter(),
- createDriver: () => new DummyDriver(),
- createIntrospector: (db) => new SqliteIntrospector(db),
- createQueryCompiler: () => new SqliteQueryCompiler(),
- },
-});
+import { useAccountsQuery } from '@/queries/use-accounts-query';
+import { useWorkspacesQuery } from '@/queries/use-workspaces-query';
+import { useServersQuery } from '@/queries/use-servers-query';
+import { buildApiBaseUrl } from '@/lib/servers';
export const App = () => {
const [showLogout, setShowLogout] = React.useState(false);
- const accountsQuery = useQuery({
- queryKey: ['accounts'],
- queryFn: async ({ queryKey }) => {
- const query = appDatabase
- .selectFrom('accounts')
- .where('status', '=', 'active')
- .selectAll()
- .compile();
- return await window.neuron.executeAppQueryAndSubscribe({
- key: queryKey,
- query: query,
- });
- },
- });
+ const { data: servers, isPending: isPendingServers } = useServersQuery();
+ const { data: accounts, isPending: isPendingAccounts } = useAccountsQuery();
+ const { data: workspaces, isPending: isPendingWorkspaces } =
+ useWorkspacesQuery();
- const workspacesQuery = useQuery({
- queryKey: ['workspaces'],
- queryFn: async ({ queryKey }) => {
- const query = appDatabase
- .selectFrom('workspaces')
- .where(
- 'account_id',
- 'in',
- appDatabase
- .selectFrom('accounts')
- .where('status', '=', 'active')
- .select('id'),
- )
- .selectAll()
- .compile();
- return await window.neuron.executeAppQueryAndSubscribe({
- key: queryKey,
- query: query,
- });
- },
- });
+ const isPending =
+ isPendingServers || isPendingAccounts || isPendingWorkspaces;
- const isLoading = accountsQuery.isPending || workspacesQuery.isPending;
- if (isLoading) {
+ if (isPending) {
return (
<DelayedComponent>
<AppLoading />
@@ -78,80 +31,49 @@ export const App = () => {
);
}
- if (accountsQuery.data.rows.length == 0) {
- return (
- <AppDatabaseContext.Provider
- value={{
- database: appDatabase,
- query: (query) => window.neuron.executeAppQuery(query),
- queryAndSubscribe: (context) =>
- window.neuron.executeAppQueryAndSubscribe(context),
- mutate: (mutation) => window.neuron.executeAppMutation(mutation),
- }}
- >
- <Login />
- </AppDatabaseContext.Provider>
- );
+ if (accounts.length == 0) {
+ return <Login />;
}
- const account = accountsQuery.data.rows[0];
+ const account = accounts[0];
+ const server = servers.find((server) => server.domain === account.server);
+
+ if (!server) {
+ return <p>Server not found.</p>;
+ }
+
+ const accountWorkspaces = workspaces.filter(
+ (workspace) => workspace.accountId === account.id,
+ );
+
const axios = Axios.create({
- baseURL: SERVER_URL,
+ baseURL: buildApiBaseUrl(server),
headers: {
Authorization: `Bearer ${account.token}`,
},
});
return (
- <AppDatabaseContext.Provider
+ <AccountContext.Provider
value={{
- database: appDatabase,
- query: (query) => window.neuron.executeAppQuery(query),
- queryAndSubscribe: (context) =>
- window.neuron.executeAppQueryAndSubscribe(context),
- mutate: (mutation) => window.neuron.executeAppMutation(mutation),
+ ...account,
+ workspaces: accountWorkspaces,
+ logout: () => {
+ setShowLogout(true);
+ },
}}
>
- <AccountContext.Provider
- value={{
- id: account.id,
- name: account.name,
- avatar: account.avatar,
- token: account.token,
- email: account.email,
- deviceId: account.device_id,
- status: account.status,
- server: account.server,
- workspaces: workspacesQuery.data?.rows.map((row) => {
- return {
- id: row.id,
- name: row.name,
- description: row.description,
- avatar: row.avatar,
- versionId: row.version_id,
- accountId: row.account_id,
- role: row.role,
- userId: row.user_id,
- synced: row.synced,
- };
- }),
- logout: () => {
- setShowLogout(true);
- },
- }}
- >
- <AxiosContext.Provider value={axios}>
- <Outlet />
- </AxiosContext.Provider>
- {showLogout && (
- <AccountLogout
- id={account.id}
- onCancel={() => {
- setShowLogout(false);
- }}
- />
- )}
- </AccountContext.Provider>
- </AppDatabaseContext.Provider>
+ <AxiosContext.Provider value={axios}>
+ <Outlet />
+ </AxiosContext.Provider>
+ {showLogout && (
+ <AccountLogout
+ id={account.id}
+ onCancel={() => {
+ setShowLogout(false);
+ }}
+ />
+ )}
+ </AccountContext.Provider>
);
};
diff --git a/desktop/src/components/root.tsx b/desktop/src/components/root.tsx
index fde54478..8f0a3fc0 100644
--- a/desktop/src/components/root.tsx
+++ b/desktop/src/components/root.tsx
@@ -12,6 +12,15 @@ import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
import { DndProvider } from 'react-dnd';
import { HTML5Backend } from 'react-dnd-html5-backend';
import { useEventBus } from '@/hooks/use-event-bus';
+import {
+ DummyDriver,
+ Kysely,
+ SqliteAdapter,
+ SqliteIntrospector,
+ SqliteQueryCompiler,
+} from 'kysely';
+import { AppDatabaseSchema } from '@/electron/schemas/app';
+import { AppDatabaseContext } from '@/contexts/app-database';
const router = createBrowserRouter([
{
@@ -40,6 +49,15 @@ const router = createBrowserRouter([
},
]);
+const appDatabase = new Kysely<AppDatabaseSchema>({
+ dialect: {
+ createAdapter: () => new SqliteAdapter(),
+ createDriver: () => new DummyDriver(),
+ createIntrospector: (db) => new SqliteIntrospector(db),
+ createQueryCompiler: () => new SqliteQueryCompiler(),
+ },
+});
+
export const Root = () => {
const eventBus = useEventBus();
const queryClient = React.useMemo(() => {
@@ -115,12 +133,22 @@ export const Root = () => {
return (
<QueryClientProvider client={queryClient}>
- <DndProvider backend={HTML5Backend}>
- <TooltipProvider>
- <RouterProvider router={router} />
- </TooltipProvider>
- <Toaster />
- </DndProvider>
+ <AppDatabaseContext.Provider
+ value={{
+ database: appDatabase,
+ query: (query) => window.neuron.executeAppQuery(query),
+ queryAndSubscribe: (context) =>
+ window.neuron.executeAppQueryAndSubscribe(context),
+ mutate: (mutation) => window.neuron.executeAppMutation(mutation),
+ }}
+ >
+ <DndProvider backend={HTML5Backend}>
+ <TooltipProvider>
+ <RouterProvider router={router} />
+ </TooltipProvider>
+ <Toaster />
+ </DndProvider>
+ </AppDatabaseContext.Provider>
</QueryClientProvider>
);
};
diff --git a/desktop/src/electron/account-manager.ts b/desktop/src/electron/account-manager.ts
index 93e628c6..5dd32cd5 100644
--- a/desktop/src/electron/account-manager.ts
+++ b/desktop/src/electron/account-manager.ts
@@ -1,14 +1,14 @@
import * as fs from 'node:fs';
+import Axios, { AxiosInstance } from 'axios';
import { Account } from '@/types/accounts';
import { Workspace } from '@/types/workspaces';
import { WorkspaceManager } from '@/electron/workspace-manager';
import { SocketManager } from '@/electron/socket-manager';
import { ServerMutation } from '@/types/mutations';
-import Axios, { AxiosInstance } from 'axios';
import { Kysely } from 'kysely';
import { AppDatabaseSchema } from '@/electron/schemas/app';
-
-const SERVER_URL = 'http://localhost:3000';
+import { Server } from '@/types/servers';
+import { buildApiBaseUrl } from '@/lib/servers';
export class AccountManager {
public readonly account: Account;
@@ -19,6 +19,7 @@ export class AccountManager {
private readonly database: Kysely<AppDatabaseSchema>;
constructor(
+ server: Server,
account: Account,
appPath: string,
workspaces: Workspace[],
@@ -26,9 +27,9 @@ export class AccountManager {
) {
this.account = account;
this.database = database;
- this.socket = new SocketManager(account);
+ this.socket = new SocketManager(server, account);
this.axios = Axios.create({
- baseURL: SERVER_URL,
+ baseURL: buildApiBaseUrl(server),
headers: {
Authorization: `Bearer ${account.token}`,
DeviceId: account.deviceId,
diff --git a/desktop/src/electron/app-manager.ts b/desktop/src/electron/app-manager.ts
index be102d2c..84c79d6d 100644
--- a/desktop/src/electron/app-manager.ts
+++ b/desktop/src/electron/app-manager.ts
@@ -8,7 +8,6 @@ import {
SqliteDialect,
} from 'kysely';
import { AccountManager } from '@/electron/account-manager';
-import { ServerManager } from '@/electron/server-manager';
import { AppDatabaseSchema } from '@/electron/schemas/app';
import { appDatabaseMigrations } from '@/electron/migrations/app';
import { Account } from '@/types/accounts';
@@ -26,7 +25,7 @@ import { Server } from '@/types/servers';
const EVENT_LOOP_INTERVAL = 1000;
class AppManager {
- private readonly servers: Map<string, ServerManager>;
+ private readonly servers: Map<string, Server>;
private readonly accounts: Map<string, AccountManager>;
private readonly appPath: string;
private readonly database: Kysely<AppDatabaseSchema>;
@@ -34,7 +33,7 @@ class AppManager {
private initPromise: Promise<void> | null = null;
constructor() {
- this.servers = new Map<string, ServerManager>();
+ this.servers = new Map<string, Server>();
this.accounts = new Map<string, AccountManager>();
this.appPath = app.getPath('userData');
this.subscribers = new Map();
@@ -140,6 +139,13 @@ class AppManager {
return;
}
+ if (affectedTables.has('servers')) {
+ const servers = await this.getServers();
+ for (const server of servers) {
+ this.servers.set(server.domain, server);
+ }
+ }
+
if (affectedTables.has('accounts')) {
const accounts = await this.getAccounts();
for (const account of accounts) {
@@ -147,7 +153,13 @@ class AppManager {
continue;
}
+ const server = this.servers.get(account.server);
+ if (!server) {
+ continue;
+ }
+
const accountManager = new AccountManager(
+ server,
account,
this.appPath,
[],
@@ -243,8 +255,7 @@ class AppManager {
const servers = await this.getServers();
for (const server of servers) {
- const serverManager = new ServerManager(server);
- this.servers.set(server.domain, serverManager);
+ this.servers.set(server.domain, server);
}
const accounts = await this.getAccounts();
@@ -253,7 +264,14 @@ class AppManager {
const accountWorkspaces = workspaces.filter(
(workspace) => workspace.accountId === account.id,
);
+
+ const server = this.servers.get(account.server);
+ if (!server) {
+ continue;
+ }
+
const accountManager = new AccountManager(
+ server,
account,
this.appPath,
accountWorkspaces,
diff --git a/desktop/src/electron/migrations/app.ts b/desktop/src/electron/migrations/app.ts
index b68aad7b..52e88fff 100644
--- a/desktop/src/electron/migrations/app.ts
+++ b/desktop/src/electron/migrations/app.ts
@@ -18,7 +18,7 @@ const createServersTable: Migration = {
},
};
-const addNeuronServers: Migration = {
+const insertNeuronServers: Migration = {
up: async (db) => {
await db
.insertInto('servers')
@@ -27,7 +27,7 @@ const addNeuronServers: Migration = {
domain: 'localhost:3000',
name: 'Localhost',
avatar: '',
- attributes: '{}',
+ attributes: '{ "insecure": true }',
version: '0.1.0',
created_at: new Date().toISOString(),
},
@@ -101,7 +101,7 @@ const createWorkspacesTable: Migration = {
export const appDatabaseMigrations: Record<string, Migration> = {
'00001_create_servers_table': createServersTable,
- '00002_add_neuron_servers': addNeuronServers,
+ '00002_insert_neuron_servers': insertNeuronServers,
'00003_create_accounts_table': createAccountsTable,
'00004_create_workspaces_table': createWorkspacesTable,
};
diff --git a/desktop/src/electron/server-manager.ts b/desktop/src/electron/server-manager.ts
deleted file mode 100644
index aab363e2..00000000
--- a/desktop/src/electron/server-manager.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { Server } from '@/types/servers';
-
-export class ServerManager {
- public readonly server: Server;
-
- constructor(server: Server) {
- this.server = server;
- }
-}
diff --git a/desktop/src/electron/socket-manager.ts b/desktop/src/electron/socket-manager.ts
index c1ae1672..216aa9ce 100644
--- a/desktop/src/electron/socket-manager.ts
+++ b/desktop/src/electron/socket-manager.ts
@@ -1,7 +1,7 @@
import { WebSocket } from 'ws';
import { Account } from '@/types/accounts';
-
-const SOCKET_URL = 'ws://localhost:3000';
+import { Server } from '@/types/servers';
+import { buildSynapseUrl } from '@/lib/servers';
export type SocketMessage = {
type: string;
@@ -9,13 +9,15 @@ export type SocketMessage = {
};
export class SocketManager {
+ private readonly server: Server;
private readonly account: Account;
private socket: WebSocket | null;
private closingCount: number;
private listeners: Map<string, ((payload: any) => void)[]>;
private lastInitAt: number;
- constructor(account: Account) {
+ constructor(server: Server, account: Account) {
+ this.server = server;
this.account = account;
this.socket = null;
this.closingCount = 0;
@@ -37,7 +39,7 @@ export class SocketManager {
this.lastInitAt = Date.now();
this.closingCount = 0;
this.socket = new WebSocket(
- `${SOCKET_URL}/v1/synapse?device_id=${this.account.deviceId}`,
+ buildSynapseUrl(this.server, this.account.deviceId),
);
this.socket.onmessage = (event) => {
diff --git a/desktop/src/lib/servers.ts b/desktop/src/lib/servers.ts
new file mode 100644
index 00000000..a261fcaf
--- /dev/null
+++ b/desktop/src/lib/servers.ts
@@ -0,0 +1,11 @@
+import { Server } from '@/types/servers';
+
+export const buildApiBaseUrl = (server: Server): string => {
+ const protocol = server.attributes?.insecure ? 'http' : 'https';
+ return `${protocol}://${server.domain}`;
+};
+
+export const buildSynapseUrl = (server: Server, deviceId: string) => {
+ const protocol = server.attributes?.insecure ? 'ws' : 'wss';
+ return `${protocol}://${server.domain}/v1/synapse?device_id=${deviceId}`;
+};
diff --git a/desktop/src/queries/use-accounts-query.tsx b/desktop/src/queries/use-accounts-query.tsx
new file mode 100644
index 00000000..d9ed3d68
--- /dev/null
+++ b/desktop/src/queries/use-accounts-query.tsx
@@ -0,0 +1,41 @@
+import { useAppDatabase } from '@/contexts/app-database';
+import { SelectAccount, SelectServer } from '@/electron/schemas/app';
+import { Account } from '@/types/accounts';
+import { useQuery } from '@tanstack/react-query';
+import { QueryResult } from 'kysely';
+
+export const useAccountsQuery = () => {
+ const appDatabase = useAppDatabase();
+ return useQuery<QueryResult<SelectAccount>, Error, Account[], string[]>({
+ queryKey: ['accounts'],
+ queryFn: async ({ queryKey }) => {
+ const query = appDatabase.database
+ .selectFrom('accounts')
+ .selectAll()
+ .where('status', '=', 'active')
+ .compile();
+
+ return await window.neuron.executeAppQueryAndSubscribe({
+ key: queryKey,
+ query: query,
+ });
+ },
+ select: (data: QueryResult<SelectAccount>): Account[] => {
+ const rows = data?.rows ?? [];
+ return rows.map(mapAccount);
+ },
+ });
+};
+
+const mapAccount = (row: SelectAccount): Account => {
+ return {
+ id: row.id,
+ name: row.name,
+ avatar: row.avatar,
+ token: row.token,
+ email: row.email,
+ deviceId: row.device_id,
+ status: row.status,
+ server: row.server,
+ };
+};
diff --git a/desktop/src/queries/use-workspaces-query.tsx b/desktop/src/queries/use-workspaces-query.tsx
new file mode 100644
index 00000000..2dc4dc9b
--- /dev/null
+++ b/desktop/src/queries/use-workspaces-query.tsx
@@ -0,0 +1,50 @@
+import { useAppDatabase } from '@/contexts/app-database';
+import { SelectWorkspace } from '@/electron/schemas/app';
+import { Workspace } from '@/types/workspaces';
+import { useQuery } from '@tanstack/react-query';
+import { QueryResult } from 'kysely';
+
+export const useWorkspacesQuery = () => {
+ const appDatabase = useAppDatabase();
+ return useQuery<QueryResult<SelectWorkspace>, Error, Workspace[], string[]>({
+ queryKey: ['workspaces'],
+ queryFn: async ({ queryKey }) => {
+ const query = appDatabase.database
+ .selectFrom('workspaces')
+ .selectAll()
+ .where(
+ 'account_id',
+ 'in',
+ appDatabase.database
+ .selectFrom('accounts')
+ .where('status', '=', 'active')
+ .select('id'),
+ )
+
+ .compile();
+
+ return await window.neuron.executeAppQueryAndSubscribe({
+ key: queryKey,
+ query: query,
+ });
+ },
+ select: (data: QueryResult<SelectWorkspace>): Workspace[] => {
+ const rows = data?.rows ?? [];
+ return rows.map(mapWorkspaces);
+ },
+ });
+};
+
+const mapWorkspaces = (row: SelectWorkspace): Workspace => {
+ return {
+ id: row.id,
+ name: row.name,
+ description: row.description,
+ avatar: row.avatar,
+ versionId: row.version_id,
+ accountId: row.account_id,
+ role: row.role,
+ userId: row.user_id,
+ synced: row.synced === 1,
+ };
+};
diff --git a/desktop/src/types/servers.ts b/desktop/src/types/servers.ts
index df2d30c6..25dfdabb 100644
--- a/desktop/src/types/servers.ts
+++ b/desktop/src/types/servers.ts
@@ -9,7 +9,7 @@ export type Server = {
};
export type ServerAttributes = {
- name: string;
+ insecure?: string;
};
export type ServerConfig = {
diff --git a/server/src/routes/config.ts b/server/src/routes/config.ts
index 688b1de0..526e3114 100644
--- a/server/src/routes/config.ts
+++ b/server/src/routes/config.ts
@@ -8,7 +8,7 @@ configRouter.get('/', async (req: Request, res: Response) => {
avatar: '',
version: '0.1.0',
attributes: {
- type: '',
+ insecure: true,
},
});
});