document-drive 1.0.0-alpha.67 → 1.0.0-alpha.69

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "document-drive",
-    "version": "1.0.0-alpha.67",
+    "version": "1.0.0-alpha.69",
     "license": "AGPL-3.0-only",
     "type": "module",
     "module": "./src/index.ts",

package/src/queue/base.ts

@@ -236,7 +236,7 @@ export class BaseQueueManager implements IQueueManager {
         } catch (e) {
             this.emit("jobFailed", nextJob, e as Error);
         } finally {
-            queue.setBlocked(false);
+            await queue.setBlocked(false);
             await this.processNextJob();
         }
     }

package/src/queue/redis.ts

@@ -1,5 +1,5 @@
 import { RedisClientType } from "redis";
-import { IJob, IQueue, IQueueManager, OperationJob } from "./types";
+import { IJob, IQueue, IQueueManager, IServerDelegate, OperationJob } from "./types";
 import { BaseQueueManager } from "./base";
 
 export class RedisQueue<T, R> implements IQueue<T, R> {
@@ -10,7 +10,7 @@ export class RedisQueue<T, R> implements IQueue<T, R> {
         this.client = client;
         this.id = id;
         this.client.hSet("queues", id, "true");
-
+        this.client.hSet(this.id, "blocked", "false");
     }
 
     async addJob(data: any) {
@@ -33,13 +33,13 @@ export class RedisQueue<T, R> implements IQueue<T, R> {
         if (blocked) {
             await this.client.hSet(this.id, "blocked", "true");
         } else {
-            await this.client.hDel(this.id, "blocked");
+            await this.client.hSet(this.id, "blocked", "false");
         }
     }
 
     async isBlocked() {
         const blockedResult = await this.client.hGet(this.id, "blocked");
-        if (blockedResult) {
+        if (blockedResult === "true") {
             return true;
         }
 
@@ -69,7 +69,6 @@ export class RedisQueue<T, R> implements IQueue<T, R> {
     }
 
     async removeDependencies(job: IJob<OperationJob>) {
-        const allDeps1 = await this.client.lLen(this.id + "-deps");
         await this.client.lRem(this.id + "-deps", 1, JSON.stringify(job));
         const allDeps = await this.client.lLen(this.id + "-deps");
         if (allDeps > 0) {
@@ -80,15 +79,15 @@ export class RedisQueue<T, R> implements IQueue<T, R> {
     }
 
     async isDeleted() {
-        const deleted = await this.client.hGet(this.id, "deleted");
-        return deleted === "true";
+        const active = await this.client.hGet("queues", this.id);
+        return active === "false";
     }
 
     async setDeleted(deleted: boolean) {
         if (deleted) {
-            await this.client.hSet(this.id, "deleted", "true");
+            await this.client.hSet("queues", this.id, "false");
         } else {
-            await this.client.hDel(this.id, "deleted");
+            await this.client.hSet("queues", this.id, "true");
         }
     }
 }
@@ -104,10 +103,12 @@ export class RedisQueueManager extends BaseQueueManager implements IQueueManager
 
     async init(delegate: IServerDelegate, onError: (error: Error) => void): Promise<void> {
         await super.init(delegate, onError);
-        // load all queues
         const queues = await this.client.hGetAll("queues");
         for (const queueId in queues) {
-            this.queues.push(new RedisQueue(queueId, this.client));
+            const active = await this.client.hGet("queues", queueId);
+            if (active === "true") {
+                this.queues.push(new RedisQueue(queueId, this.client));
+            }
         }
     }
 

package/src/server/types.ts

@@ -161,6 +161,10 @@ export abstract class BaseDocumentDriveServer {
         options?: GetDocumentOptions
     ): Promise<DocumentDriveDocument>;
 
+    abstract getDriveBySlug(
+        slug: string,
+    ): Promise<DocumentDriveDocument>;
+
     abstract getDocuments(drive: string): Promise<string[]>;
     abstract getDocument(
         drive: string,

package/src/storage/prisma.ts

@@ -329,6 +329,9 @@ export class PrismaStorage implements IDriveStorage {
 
     async getDocuments(drive: string) {
         const docs = await this.db.document.findMany({
+            select: {
+                id: true
+            },
             where: {
                 AND: {
                     driveId: drive,
@@ -513,11 +516,21 @@ export class PrismaStorage implements IDriveStorage {
     }
 
     async deleteDrive(id: string) {
+        // delete drive documents and operations
         await this.db.document.deleteMany({
             where: {
                 driveId: id
             }
         });
+
+        // delete drive and associated slug
+        await this.db.drive.deleteMany({
+            where: {
+                id
+            }
+        })
+
+        // delete drive itself
         await this.deleteDocument('drives', id);
     }