Skip to content

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

Improve server create mutation

Hakan Shehu6b809d8eb712
diff --git a/apps/desktop/src/main/mutations/servers/server-create.ts b/apps/desktop/src/main/mutations/servers/server-create.ts
index f6d4a606..b4c37470 100644
--- a/apps/desktop/src/main/mutations/servers/server-create.ts
+++ b/apps/desktop/src/main/mutations/servers/server-create.ts
@@ -1,7 +1,6 @@
import { databaseService } from '@/main/data/database-service';
import { serverService } from '@/main/services/server-service';
import { MutationHandler } from '@/main/types';
-import { eventBus } from '@/shared/lib/event-bus';
import { MutationError } from '@/shared/mutations';
import {
ServerCreateMutationInput,
@@ -27,40 +26,14 @@ export class ServerCreateMutationHandler
);
}
- const config = await serverService.fetchServerConfig(input.domain);
- if (config === null) {
+ const server = await serverService.createServer(input.domain);
+ if (server === null) {
throw new MutationError(
'invalid_server_domain',
'Could not fetch server configuration. Please make sure the domain is correct.'
);
}
- const createdAt = new Date();
- await databaseService.appDatabase
- .insertInto('servers')
- .values({
- domain: input.domain,
- name: config.name,
- avatar: config.avatar,
- attributes: JSON.stringify(config.attributes),
- version: config.version,
- created_at: createdAt.toISOString(),
- })
- .execute();
-
- eventBus.publish({
- type: 'server_created',
- server: {
- domain: input.domain,
- name: config.name,
- avatar: config.avatar,
- attributes: config.attributes,
- version: config.version,
- createdAt,
- lastSyncedAt: null,
- },
- });
-
return {
success: true,
};
diff --git a/apps/desktop/src/main/services/server-service.ts b/apps/desktop/src/main/services/server-service.ts
index 7d692797..25bcfcfb 100644
--- a/apps/desktop/src/main/services/server-service.ts
+++ b/apps/desktop/src/main/services/server-service.ts
@@ -37,6 +37,50 @@ class ServerService {
return state?.isAvailable ?? false;
}
+ public async createServer(domain: string): Promise<Server | null> {
+ if (this.states.has(domain)) {
+ return null;
+ }
+
+ const config = await this.fetchServerConfig(domain);
+ if (config === null) {
+ return null;
+ }
+
+ const createdServer = await databaseService.appDatabase
+ .insertInto('servers')
+ .returningAll()
+ .values({
+ domain,
+ name: config.name,
+ avatar: config.avatar,
+ attributes: JSON.stringify(config.attributes),
+ version: config.version,
+ created_at: new Date().toISOString(),
+ })
+ .executeTakeFirst();
+
+ if (!createdServer) {
+ return null;
+ }
+
+ const server = mapServer(createdServer);
+ eventBus.publish({
+ type: 'server_created',
+ server,
+ });
+
+ const state: ServerState = {
+ isAvailable: true,
+ lastCheckedAt: new Date(),
+ lastCheckedSuccessfullyAt: new Date(),
+ count: 1,
+ };
+
+ this.states.set(domain, state);
+ return server;
+ }
+
private async syncServer(server: Server) {
const config = await this.fetchServerConfig(server.domain);
const existingState = this.states.get(server.domain);