Skip to content

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

Clean device node states on logout

Hakan Shehu8ca2821a0405
diff --git a/server/src/data/redis.ts b/server/src/data/redis.ts
index 69ba9ff8..ab48174d 100644
--- a/server/src/data/redis.ts
+++ b/server/src/data/redis.ts
@@ -1,6 +1,23 @@
import { createClient } from 'redis';
const REDIS_URL = process.env.REDIS_URL || '';
+const REDIS_HOST = process.env.REDIS_HOST;
+const REDIS_PASSWORD = process.env.REDIS_PASSWORD;
+const REDIS_PORT = process.env.REDIS_PORT;
+const REDIS_DB = process.env.REDIS_DB;
+
+if (!REDIS_URL || !REDIS_HOST || !REDIS_PASSWORD || !REDIS_PORT || !REDIS_DB) {
+ throw new Error('Redis configuration is missing');
+}
+
+export const redisConfig = {
+ url: REDIS_URL,
+ host: REDIS_HOST,
+ password: REDIS_PASSWORD,
+ port: parseInt(REDIS_PORT),
+ db: parseInt(REDIS_DB),
+};
+
export const redis = createClient({
url: REDIS_URL,
});
diff --git a/server/src/index.ts b/server/src/index.ts
index a9eadf6a..11782ed7 100644
--- a/server/src/index.ts
+++ b/server/src/index.ts
@@ -3,6 +3,7 @@ import { initRedis } from '@/data/redis';
import { initChangesSubscriber } from '@/consumers/changes-subcriber';
import { migrate } from '@/data/database';
import { initEventWorker } from '@/queues/events';
+import { initTaskWorker } from '@/queues/tasks';
migrate().then(() => {
initApi();
@@ -11,6 +12,7 @@ migrate().then(() => {
console.log('Redis initialized');
initEventWorker();
+ initTaskWorker();
initChangesSubscriber().then(() => {
console.log('Change subscriber started');
diff --git a/server/src/queues/events.ts b/server/src/queues/events.ts
index ac3ccd54..e8d2418a 100644
--- a/server/src/queues/events.ts
+++ b/server/src/queues/events.ts
@@ -1,5 +1,5 @@
import { database } from '@/data/database';
-import { CHANNEL_NAMES, redis } from '@/data/redis';
+import { CHANNEL_NAMES, redis, redisConfig } from '@/data/redis';
import { CreateNodeUserState } from '@/data/schema';
import { NodeTypes } from '@/lib/constants';
import { generateId, IdType } from '@/lib/id';
@@ -14,21 +14,12 @@ import { ServerNodeAttributes } from '@/types/nodes';
import { Job, Queue, Worker } from 'bullmq';
import { difference } from 'lodash';
-const REDIS_HOST = process.env.REDIS_HOST;
-const REDIS_PASSWORD = process.env.REDIS_PASSWORD;
-const REDIS_PORT = process.env.REDIS_PORT;
-const REDIS_DB = process.env.REDIS_DB;
-
-if (!REDIS_HOST || !REDIS_PASSWORD || !REDIS_PORT || !REDIS_DB) {
- throw new Error('Redis configuration is missing');
-}
-
const eventQueue = new Queue('events', {
connection: {
- host: REDIS_HOST,
- password: REDIS_PASSWORD,
- port: parseInt(REDIS_PORT),
- db: parseInt(REDIS_DB),
+ host: redisConfig.host,
+ password: redisConfig.password,
+ port: redisConfig.port,
+ db: redisConfig.db,
},
defaultJobOptions: {
removeOnComplete: true,
@@ -42,10 +33,10 @@ export const enqueueEvent = async (event: NodeEvent): Promise<void> => {
export const initEventWorker = () => {
return new Worker('events', handleEventJob, {
connection: {
- host: REDIS_HOST,
- password: REDIS_PASSWORD,
- port: parseInt(REDIS_PORT),
- db: parseInt(REDIS_DB),
+ host: redisConfig.host,
+ password: redisConfig.password,
+ port: redisConfig.port,
+ db: redisConfig.db,
},
});
};
diff --git a/server/src/queues/tasks.ts b/server/src/queues/tasks.ts
new file mode 100644
index 00000000..c8ba8e05
--- /dev/null
+++ b/server/src/queues/tasks.ts
@@ -0,0 +1,60 @@
+import { database } from '@/data/database';
+import { redisConfig } from '@/data/redis';
+import { CleanDeviceDataTask, Task } from '@/types/tasks';
+import { Job, Queue, Worker } from 'bullmq';
+
+const taskQueue = new Queue('tasks', {
+ connection: {
+ host: redisConfig.host,
+ password: redisConfig.password,
+ port: redisConfig.port,
+ db: redisConfig.db,
+ },
+ defaultJobOptions: {
+ removeOnComplete: true,
+ },
+});
+
+export const enqueueTask = async (task: Task): Promise<void> => {
+ await taskQueue.add('task', task);
+};
+
+export const initTaskWorker = () => {
+ return new Worker('tasks', handleTaskJob, {
+ connection: {
+ host: redisConfig.host,
+ password: redisConfig.password,
+ port: redisConfig.port,
+ db: redisConfig.db,
+ },
+ });
+};
+
+const handleTaskJob = async (job: Job) => {
+ const task = job.data as Task;
+
+ switch (task.type) {
+ case 'clean_device_data':
+ return handleCleanDeviceDataTask(task);
+ }
+};
+
+const handleCleanDeviceDataTask = async (
+ task: CleanDeviceDataTask,
+): Promise<void> => {
+ const device = await database
+ .selectFrom('devices')
+ .where('id', '=', task.deviceId)
+ .selectAll()
+ .executeTakeFirst();
+
+ if (device) {
+ //device is still active
+ return;
+ }
+
+ await database
+ .deleteFrom('node_device_states')
+ .where('device_id', '=', task.deviceId)
+ .execute();
+};
diff --git a/server/src/routes/accounts.ts b/server/src/routes/accounts.ts
index d0042596..4a10d303 100644
--- a/server/src/routes/accounts.ts
+++ b/server/src/routes/accounts.ts
@@ -16,6 +16,7 @@ import { WorkspaceOutput, WorkspaceRole } from '@/types/workspaces';
import { authMiddleware } from '@/middlewares/auth';
import { generateToken } from '@/lib/tokens';
import { mapNode } from '@/lib/nodes';
+import { enqueueTask } from '@/queues/tasks';
const GoogleUserInfoUrl = 'https://www.googleapis.com/oauth2/v1/userinfo';
const SaltRounds = 10;
@@ -218,6 +219,11 @@ accountsRouter.delete(
.where('id', '=', req.account.deviceId)
.execute();
+ await enqueueTask({
+ type: 'clean_device_data',
+ deviceId: req.account.deviceId,
+ });
+
return res.status(200).end();
},
);
diff --git a/server/src/types/tasks.ts b/server/src/types/tasks.ts
new file mode 100644
index 00000000..aa459e5d
--- /dev/null
+++ b/server/src/types/tasks.ts
@@ -0,0 +1,6 @@
+export type Task = CleanDeviceDataTask;
+
+export type CleanDeviceDataTask = {
+ type: 'clean_device_data';
+ deviceId: string;
+};