Skip to content

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

Fix loading assets path

Hakan Shehu2056d4b225de
diff --git a/apps/desktop/src/main/mutations/server-node-sync.ts b/apps/desktop/src/main/mutations/server-node-sync.ts
index 0733928a..921ec1ce 100644
--- a/apps/desktop/src/main/mutations/server-node-sync.ts
+++ b/apps/desktop/src/main/mutations/server-node-sync.ts
@@ -15,119 +15,123 @@ export class ServerNodeSyncMutationHandler
public async handleMutation(
input: ServerNodeSyncMutationInput
): Promise<ServerNodeSyncMutationOutput> {
- const workspace = await databaseService.appDatabase
- .selectFrom('workspaces')
- .selectAll()
- .where((eb) =>
- eb.and([
- eb('account_id', '=', input.accountId),
- eb('workspace_id', '=', input.workspaceId),
- ])
- )
- .executeTakeFirst();
-
- if (!workspace) {
- return {
- success: false,
- };
- }
-
- const userId = workspace.user_id;
- const workspaceDatabase =
- await databaseService.getWorkspaceDatabase(userId);
-
- let count = 0;
- while (count++ < 10) {
- const existingNode = await workspaceDatabase
- .selectFrom('nodes')
- .where('id', '=', input.id)
+ try {
+ const workspace = await databaseService.appDatabase
+ .selectFrom('workspaces')
.selectAll()
+ .where((eb) =>
+ eb.and([
+ eb('account_id', '=', input.accountId),
+ eb('workspace_id', '=', input.workspaceId),
+ ])
+ )
.executeTakeFirst();
- if (!existingNode) {
- const ydoc = new YDoc(input.id, input.state);
- const attributes = ydoc.getAttributes();
- const state = ydoc.getState();
+ if (!workspace) {
+ return {
+ success: false,
+ };
+ }
+
+ const userId = workspace.user_id;
+ const workspaceDatabase =
+ await databaseService.getWorkspaceDatabase(userId);
- const result = await workspaceDatabase
- .insertInto('nodes')
- .returningAll()
- .values({
- id: input.id,
- attributes: JSON.stringify(attributes),
- state: state,
- created_at: input.createdAt,
- created_by: input.createdBy,
- version_id: input.versionId,
- server_created_at: input.serverCreatedAt,
- server_version_id: input.versionId,
- })
- .onConflict((cb) => cb.doNothing())
+ let count = 0;
+ while (count++ < 10) {
+ const existingNode = await workspaceDatabase
+ .selectFrom('nodes')
+ .where('id', '=', input.id)
+ .selectAll()
.executeTakeFirst();
- if (result) {
- socketService.sendMessage(workspace.account_id, {
- type: 'local_node_sync',
- nodeId: input.id,
- userId: userId,
- versionId: input.versionId,
- workspaceId: input.workspaceId,
- });
+ if (!existingNode) {
+ const ydoc = new YDoc(input.id, input.state);
+ const attributes = ydoc.getAttributes();
+ const state = ydoc.getState();
- eventBus.publish({
- type: 'node_created',
- userId: userId,
- node: mapNode(result),
- });
+ const result = await workspaceDatabase
+ .insertInto('nodes')
+ .returningAll()
+ .values({
+ id: input.id,
+ attributes: JSON.stringify(attributes),
+ state: state,
+ created_at: input.createdAt,
+ created_by: input.createdBy,
+ version_id: input.versionId,
+ server_created_at: input.serverCreatedAt,
+ server_version_id: input.versionId,
+ })
+ .onConflict((cb) => cb.doNothing())
+ .executeTakeFirst();
- return {
- success: true,
- };
- }
- } else {
- const ydoc = new YDoc(input.id, existingNode.state);
- ydoc.applyUpdate(input.state);
+ if (result) {
+ socketService.sendMessage(workspace.account_id, {
+ type: 'local_node_sync',
+ nodeId: input.id,
+ userId: userId,
+ versionId: input.versionId,
+ workspaceId: input.workspaceId,
+ });
- const attributes = ydoc.getAttributes();
- const state = ydoc.getState();
+ eventBus.publish({
+ type: 'node_created',
+ userId: userId,
+ node: mapNode(result),
+ });
- const updatedNode = await workspaceDatabase
- .updateTable('nodes')
- .returningAll()
- .set({
- state: state,
- attributes: JSON.stringify(attributes),
- server_created_at: input.serverCreatedAt,
- server_updated_at: input.serverUpdatedAt,
- server_version_id: input.versionId,
- updated_at: input.updatedAt,
- updated_by: input.updatedBy,
- version_id: input.versionId,
- })
- .where('id', '=', input.id)
- .where('version_id', '=', existingNode.version_id)
- .executeTakeFirst();
+ return {
+ success: true,
+ };
+ }
+ } else {
+ const ydoc = new YDoc(input.id, existingNode.state);
+ ydoc.applyUpdate(input.state);
+
+ const attributes = ydoc.getAttributes();
+ const state = ydoc.getState();
+
+ const updatedNode = await workspaceDatabase
+ .updateTable('nodes')
+ .returningAll()
+ .set({
+ state: state,
+ attributes: JSON.stringify(attributes),
+ server_created_at: input.serverCreatedAt,
+ server_updated_at: input.serverUpdatedAt,
+ server_version_id: input.versionId,
+ updated_at: input.updatedAt,
+ updated_by: input.updatedBy,
+ version_id: input.versionId,
+ })
+ .where('id', '=', input.id)
+ .where('version_id', '=', existingNode.version_id)
+ .executeTakeFirst();
- if (updatedNode) {
- socketService.sendMessage(workspace.account_id, {
- type: 'local_node_sync',
- nodeId: input.id,
- userId: userId,
- versionId: input.versionId,
- workspaceId: input.workspaceId,
- });
+ if (updatedNode) {
+ socketService.sendMessage(workspace.account_id, {
+ type: 'local_node_sync',
+ nodeId: input.id,
+ userId: userId,
+ versionId: input.versionId,
+ workspaceId: input.workspaceId,
+ });
- eventBus.publish({
- type: 'node_updated',
- userId: userId,
- node: mapNode(updatedNode),
- });
+ eventBus.publish({
+ type: 'node_updated',
+ userId: userId,
+ node: mapNode(updatedNode),
+ });
- return {
- success: true,
- };
+ return {
+ success: true,
+ };
+ }
}
}
+ } catch (error) {
+ // console.error('Error syncing node', error);
}
return {
diff --git a/apps/desktop/src/main/mutations/server-user-node-sync.ts b/apps/desktop/src/main/mutations/server-user-node-sync.ts
index ef8d25ee..91ba6ab5 100644
--- a/apps/desktop/src/main/mutations/server-user-node-sync.ts
+++ b/apps/desktop/src/main/mutations/server-user-node-sync.ts
@@ -13,75 +13,79 @@ export class ServerUserNodeSyncMutationHandler
public async handleMutation(
input: ServerUserNodeSyncMutationInput
): Promise<ServerUserNodeSyncMutationOutput> {
- const workspace = await databaseService.appDatabase
- .selectFrom('workspaces')
- .selectAll()
- .where((eb) =>
- eb.and([
- eb('account_id', '=', input.accountId),
- eb('workspace_id', '=', input.workspaceId),
- ])
- )
- .executeTakeFirst();
+ try {
+ const workspace = await databaseService.appDatabase
+ .selectFrom('workspaces')
+ .selectAll()
+ .where((eb) =>
+ eb.and([
+ eb('account_id', '=', input.accountId),
+ eb('workspace_id', '=', input.workspaceId),
+ ])
+ )
+ .executeTakeFirst();
- if (!workspace) {
- return {
- success: false,
- };
- }
+ if (!workspace) {
+ return {
+ success: false,
+ };
+ }
- const userId = workspace.user_id;
- const workspaceDatabase =
- await databaseService.getWorkspaceDatabase(userId);
+ const userId = workspace.user_id;
+ const workspaceDatabase =
+ await databaseService.getWorkspaceDatabase(userId);
- const createdUserNode = await workspaceDatabase
- .insertInto('user_nodes')
- .returningAll()
- .values({
- user_id: input.userId,
- node_id: input.nodeId,
- version_id: input.versionId,
- last_seen_at: input.lastSeenAt,
- last_seen_version_id: input.lastSeenVersionId,
- mentions_count: input.mentionsCount,
- created_at: input.createdAt,
- updated_at: input.updatedAt,
- })
- .onConflict((cb) =>
- cb.columns(['node_id', 'user_id']).doUpdateSet({
+ const createdUserNode = await workspaceDatabase
+ .insertInto('user_nodes')
+ .returningAll()
+ .values({
+ user_id: input.userId,
+ node_id: input.nodeId,
+ version_id: input.versionId,
last_seen_at: input.lastSeenAt,
last_seen_version_id: input.lastSeenVersionId,
mentions_count: input.mentionsCount,
+ created_at: input.createdAt,
updated_at: input.updatedAt,
- version_id: input.versionId,
})
- )
- .executeTakeFirst();
+ .onConflict((cb) =>
+ cb.columns(['node_id', 'user_id']).doUpdateSet({
+ last_seen_at: input.lastSeenAt,
+ last_seen_version_id: input.lastSeenVersionId,
+ mentions_count: input.mentionsCount,
+ updated_at: input.updatedAt,
+ version_id: input.versionId,
+ })
+ )
+ .executeTakeFirst();
- socketService.sendMessage(workspace.account_id, {
- type: 'local_user_node_sync',
- userId: input.userId,
- nodeId: input.nodeId,
- versionId: input.versionId,
- workspaceId: input.workspaceId,
- });
-
- if (createdUserNode) {
- eventBus.publish({
- type: 'user_node_created',
- userId: userId,
- userNode: {
- userId: createdUserNode.user_id,
- nodeId: createdUserNode.node_id,
- lastSeenAt: createdUserNode.last_seen_at,
- lastSeenVersionId: createdUserNode.last_seen_version_id,
- mentionsCount: createdUserNode.mentions_count,
- attributes: createdUserNode.attributes,
- versionId: createdUserNode.version_id,
- createdAt: createdUserNode.created_at,
- updatedAt: createdUserNode.updated_at,
- },
+ socketService.sendMessage(workspace.account_id, {
+ type: 'local_user_node_sync',
+ userId: input.userId,
+ nodeId: input.nodeId,
+ versionId: input.versionId,
+ workspaceId: input.workspaceId,
});
+
+ if (createdUserNode) {
+ eventBus.publish({
+ type: 'user_node_created',
+ userId: userId,
+ userNode: {
+ userId: createdUserNode.user_id,
+ nodeId: createdUserNode.node_id,
+ lastSeenAt: createdUserNode.last_seen_at,
+ lastSeenVersionId: createdUserNode.last_seen_version_id,
+ mentionsCount: createdUserNode.mentions_count,
+ attributes: createdUserNode.attributes,
+ versionId: createdUserNode.version_id,
+ createdAt: createdUserNode.created_at,
+ updatedAt: createdUserNode.updated_at,
+ },
+ });
+ }
+ } catch (error) {
+ // console.error('Error syncing user node', error);
}
return {
diff --git a/apps/desktop/src/main/services/asset-service.ts b/apps/desktop/src/main/services/asset-service.ts
index ef2ab630..d38a00c2 100644
--- a/apps/desktop/src/main/services/asset-service.ts
+++ b/apps/desktop/src/main/services/asset-service.ts
@@ -33,7 +33,7 @@ class AssetService {
return path.join(this.assetsDir, url);
}
- return path.join(__dirname, 'assets', url);
+ return path.join(this.getAssetsSourcePath(), url);
}
public getEmojiData(): EmojiData {