document-drive 4.0.0-staging.6 → 4.0.1

package/dist/src/queue/base.js

@@ -1,18 +1,17 @@
+import { logger } from "#utils/logger";
+import { runAsap } from "#utils/misc";
+import { generateId } from "document-model";
+import { createNanoEvents } from "nanoevents";
+import { isOperationJob, } from "./types.js";
 export class MemoryQueue {
     id;
-    running = false;
+    blocked = false;
     deleted = false;
     items = [];
     dependencies = new Array();
     constructor(id) {
         this.id = id;
     }
-    async isRunning() {
-        return this.running;
-    }
-    async setRunning(running) {
-        this.running = running;
-    }
     async setDeleted(deleted) {
         this.deleted = deleted;
     }
@@ -33,22 +32,211 @@ export class MemoryQueue {
     getId() {
         return this.id;
     }
+    async setBlocked(blocked) {
+        this.blocked = blocked;
+    }
     async isBlocked() {
-        return this.running || this.deleted || this.dependencies.length > 0;
+        return this.blocked;
     }
     async getJobs() {
         return this.items;
     }
-    async addDependency(job) {
-        if (!this.dependencies.includes(job.jobId)) {
-            this.dependencies.push(job.jobId);
+    async addDependencies(job) {
+        if (!this.dependencies.find((j) => j.jobId === job.jobId)) {
+            this.dependencies.push(job);
+        }
+        if (!this.isBlocked()) {
+            this.setBlocked(true);
+        }
+    }
+    async removeDependencies(job) {
+        this.dependencies = this.dependencies.filter((j) => j.jobId !== job.jobId && j.driveId !== job.driveId);
+        if (this.dependencies.length === 0) {
+            await this.setBlocked(false);
         }
     }
-    async removeDependency(job) {
-        const index = this.dependencies.indexOf(job.jobId);
-        if (index > -1) {
-            this.dependencies.splice(index, 1);
+}
+export class BaseQueueManager {
+    emitter = createNanoEvents();
+    ticker = 0;
+    queues = [];
+    workers;
+    timeout;
+    delegate;
+    constructor(workers = 3, timeout = 0) {
+        this.workers = workers;
+        this.timeout = timeout;
+    }
+    async init(delegate, onError) {
+        this.delegate = delegate;
+        for (let i = 0; i < this.workers; i++) {
+            setTimeout(() => this.processNextJob.bind(this)().catch(onError), 100 * i);
         }
+        return Promise.resolve();
+    }
+    async addJob(job) {
+        if (!this.delegate) {
+            throw new Error("No server delegate defined");
+        }
+        const jobId = generateId();
+        const queue = this.getQueue(job.driveId, job.documentId);
+        if (await queue.isDeleted()) {
+            throw new Error("Queue is deleted");
+        }
+        // checks if the job is for a document that doesn't exist in storage yet
+        const newDocument = job.documentId && !(await this.delegate.exists(job.documentId));
+        // if it is a new document and queue is not yet blocked then
+        // blocks it so the jobs are not processed until it's ready
+        if (newDocument && !(await queue.isBlocked())) {
+            await queue.setBlocked(true);
+            // checks if there any job in the queue adding the file and adds as dependency
+            const driveQueue = this.getQueue(job.driveId);
+            const jobs = await driveQueue.getJobs();
+            for (const driveJob of jobs) {
+                const actions = isOperationJob(driveJob)
+                    ? driveJob.operations
+                    : driveJob.actions;
+                const op = actions.find((j) => {
+                    const input = j.input;
+                    return j.type === "ADD_FILE" && input.id === job.documentId;
+                });
+                if (op) {
+                    await queue.addDependencies(driveJob);
+                }
+            }
+        }
+        // if it has ADD_FILE operations then adds the job as
+        // a dependency to the corresponding document queues
+        const actions = isOperationJob(job) ? job.operations : (job.actions ?? []);
+        const addFileOps = actions.filter((j) => j.type === "ADD_FILE");
+        for (const addFileOp of addFileOps) {
+            const input = addFileOp.input;
+            const q = this.getQueue(job.driveId, input.id);
+            await q.addDependencies({ jobId, ...job });
+        }
+        // remove document if operations contains delete_node
+        const removeFileOps = actions.filter((j) => j.type === "DELETE_NODE");
+        for (const removeFileOp of removeFileOps) {
+            const input = removeFileOp.input;
+            const queue = this.getQueue(job.driveId, input.id);
+            await queue.setDeleted(true);
+        }
+        await queue.addJob({ jobId, ...job });
+        return jobId;
+    }
+    getQueue(driveId, documentId) {
+        const queueId = this.getQueueId(driveId, documentId);
+        let queue = this.queues.find((q) => q.getId() === queueId);
+        if (!queue) {
+            queue = new MemoryQueue(queueId);
+            this.queues.push(queue);
+        }
+        return queue;
+    }
+    removeQueue(driveId, documentId) {
+        const queueId = this.getQueueId(driveId, documentId);
+        this.queues = this.queues.filter((q) => q.getId() !== queueId);
+        this.emit("queueRemoved", queueId);
+    }
+    getQueueByIndex(index) {
+        const queue = this.queues[index];
+        if (queue) {
+            return queue;
+        }
+        return null;
+    }
+    getQueues() {
+        return this.queues.map((q) => q.getId());
+    }
+    retryNextJob(timeout) {
+        const _timeout = timeout !== undefined ? timeout : this.timeout;
+        const retry = _timeout > 0 ? (fn) => setTimeout(fn, _timeout) : runAsap;
+        retry(() => this.processNextJob());
+    }
+    async findFirstNonEmptyQueue(ticker) {
+        const numQueues = this.queues.length;
+        for (let i = 0; i < numQueues; i++) {
+            const index = (ticker + i) % numQueues;
+            const queue = this.queues[index];
+            if (queue && (await queue.amountOfJobs()) > 0) {
+                return index;
+            }
+        }
+        return null;
+    }
+    async processNextJob() {
+        if (!this.delegate) {
+            throw new Error("No server delegate defined");
+        }
+        if (this.queues.length === 0) {
+            this.retryNextJob();
+            return;
+        }
+        const queue = this.queues[this.ticker];
+        if (!queue) {
+            this.ticker = 0;
+            this.retryNextJob();
+            return;
+        }
+        // if no jobs in the current queue then looks for the
+        // next queue with jobs. If no jobs in any queue then
+        // retries after a timeout
+        const amountOfJobs = await queue.amountOfJobs();
+        if (amountOfJobs === 0) {
+            const nextTicker = await this.findFirstNonEmptyQueue(this.ticker);
+            if (nextTicker !== null) {
+                this.ticker = nextTicker;
+                this.retryNextJob(0);
+            }
+            else {
+                this.retryNextJob();
+            }
+            return;
+        }
+        this.ticker = this.ticker === this.queues.length - 1 ? 0 : this.ticker + 1;
+        const isBlocked = await queue.isBlocked();
+        if (isBlocked) {
+            this.retryNextJob();
+            return;
+        }
+        await queue.setBlocked(true);
+        const nextJob = await queue.getNextJob();
+        if (!nextJob) {
+            this.retryNextJob();
+            return;
+        }
+        try {
+            const result = await this.delegate.processJob(nextJob);
+            // unblock the document queues of each add_file operation
+            const actions = isOperationJob(nextJob)
+                ? nextJob.operations
+                : nextJob.actions;
+            const addFileActions = actions.filter((op) => op.type === "ADD_FILE");
+            if (addFileActions.length > 0) {
+                for (const addFile of addFileActions) {
+                    const documentQueue = this.getQueue(nextJob.driveId, addFile.input.id);
+                    await documentQueue.removeDependencies(nextJob);
+                }
+            }
+            this.emit("jobCompleted", nextJob, result);
+        }
+        catch (e) {
+            logger.error(`job failed`, e);
+            this.emit("jobFailed", nextJob, e);
+        }
+        finally {
+            await queue.setBlocked(false);
+            this.retryNextJob(0);
+        }
+    }
+    emit(event, ...args) {
+        this.emitter.emit(event, ...args);
+    }
+    on(event, cb) {
+        return this.emitter.on(event, cb);
+    }
+    getQueueId(driveId, documentId) {
+        return `queue:${driveId}${documentId ? `:${documentId}` : ""}`;
     }
 }
 //# sourceMappingURL=base.js.map

package/dist/src/queue/base.js.map

@@ -1 +1 @@
-{"version":3,"file":"base.js","sourceRoot":"","sources":["../../../src/queue/base.ts"],"names":[],"mappings":"AAEA,MAAM,OAAO,WAAW;IACd,EAAE,CAAS;IACX,OAAO,GAAG,KAAK,CAAC;IAChB,OAAO,GAAG,KAAK,CAAC;IAChB,KAAK,GAAc,EAAE,CAAC;IACtB,YAAY,GAAG,IAAI,KAAK,EAAS,CAAC;IAE1C,YAAY,EAAU;QACpB,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;IACf,CAAC;IACD,KAAK,CAAC,SAAS;QACb,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IACD,KAAK,CAAC,UAAU,CAAC,OAAgB;QAC/B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,OAAgB;QAC/B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,SAAS;QACb,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,IAAa;QACxB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACtB,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;IAED,KAAK,CAAC,UAAU;QACd,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;QAC/B,OAAO,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAC9B,CAAC;IAED,KAAK,CAAC,YAAY;QAChB,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAC5C,CAAC;IAED,KAAK;QACH,OAAO,IAAI,CAAC,EAAE,CAAC;IACjB,CAAC;IAED,KAAK,CAAC,SAAS;QACb,OAAO,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC;IACtE,CAAC;IAED,KAAK,CAAC,OAAO;QACX,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,GAAc;QAChC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;YAC3C,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACpC,CAAC;IACH,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,GAAc;QACnC,MAAM,KAAK,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACnD,IAAI,KAAK,GAAG,CAAC,CAAC,EAAE,CAAC;YACf,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;QACrC,CAAC;IACH,CAAC;CACF"}
+{"version":3,"file":"base.js","sourceRoot":"","sources":["../../../src/queue/base.ts"],"names":[],"mappings":"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"}

package/dist/src/queue/redis.d.ts

@@ -1,2 +1,28 @@
-export {};
+import { type RedisClientType } from "redis";
+import { BaseQueueManager } from "./base.js";
+import { type IJob, type IQueue, type IQueueManager, type IServerDelegate, type Job } from "./types.js";
+export declare class RedisQueue<T> implements IQueue<T> {
+    private id;
+    private client;
+    constructor(id: string, client: RedisClientType);
+    addJob(data: any): Promise<void>;
+    getNextJob(): Promise<IJob<T> | undefined>;
+    amountOfJobs(): Promise<number>;
+    setBlocked(blocked: boolean): Promise<void>;
+    isBlocked(): Promise<boolean>;
+    getId(): string;
+    getJobs(): Promise<IJob<T>[]>;
+    addDependencies(job: IJob<Job>): Promise<void>;
+    hasDependency(job: IJob<Job>): Promise<boolean>;
+    removeDependencies(job: IJob<Job>): Promise<void>;
+    isDeleted(): Promise<boolean>;
+    setDeleted(deleted: boolean): Promise<void>;
+}
+export declare class RedisQueueManager extends BaseQueueManager implements IQueueManager {
+    private client;
+    constructor(workers: number | undefined, timeout: number | undefined, client: RedisClientType);
+    init(delegate: IServerDelegate, onError: (error: Error) => void): Promise<void>;
+    getQueue(driveId: string, documentId?: string): import("./types.js").IJobQueue;
+    removeQueue(driveId: string, documentId?: string | undefined): void;
+}
 //# sourceMappingURL=redis.d.ts.map

package/dist/src/queue/redis.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"redis.d.ts","sourceRoot":"","sources":["../../../src/queue/redis.ts"],"names":[],"mappings":""}
+{"version":3,"file":"redis.d.ts","sourceRoot":"","sources":["../../../src/queue/redis.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,OAAO,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,EACL,KAAK,IAAI,EACT,KAAK,MAAM,EACX,KAAK,aAAa,EAClB,KAAK,eAAe,EACpB,KAAK,GAAG,EACT,MAAM,YAAY,CAAC;AAEpB,qBAAa,UAAU,CAAC,CAAC,CAAE,YAAW,MAAM,CAAC,CAAC,CAAC;IAC7C,OAAO,CAAC,EAAE,CAAS;IACnB,OAAO,CAAC,MAAM,CAAkB;gBAEpB,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,eAAe;IAOzC,MAAM,CAAC,IAAI,EAAE,GAAG;IAIhB,UAAU;IAQV,YAAY;IAIZ,UAAU,CAAC,OAAO,EAAE,OAAO;IAQ3B,SAAS;IASf,KAAK;IAIC,OAAO;IAKP,eAAe,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC;IAQ9B,aAAa,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC;IAK5B,kBAAkB,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC;IAUjC,SAAS;IAKT,UAAU,CAAC,OAAO,EAAE,OAAO;CAOlC;AAED,qBAAa,iBACX,SAAQ,gBACR,YAAW,aAAa;IAExB,OAAO,CAAC,MAAM,CAAkB;gBAEpB,OAAO,oBAAI,EAAE,OAAO,oBAAI,EAAE,MAAM,EAAE,eAAe;IAKvD,IAAI,CACR,QAAQ,EAAE,eAAe,EACzB,OAAO,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,GAC9B,OAAO,CAAC,IAAI,CAAC;IAWhB,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM;IAY7C,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI;CAMpE"}

package/dist/src/queue/redis.js

@@ -1,123 +1,111 @@
-// import { type RedisClientType } from "redis";
-// import { BaseQueueManager } from "./base.js";
-// import {
-//   type IJob,
-//   type IQueue,
-//   type IQueueManager,
-//   type IServerDelegate,
-//   type Job,
-// } from "./types.js";
-export {};
-// export class RedisQueue<T> implements IQueue<T> {
-//   private id: string;
-//   private client: RedisClientType;
-//   constructor(id: string, client: RedisClientType) {
-//     this.client = client;
-//     this.id = id;
-//     this.client.hSet("queues", id, "true");
-//     this.client.hSet(this.id, "blocked", "false");
-//   }
-//   async addJob(data: any) {
-//     await this.client.lPush(this.id + "-jobs", JSON.stringify(data));
-//   }
-//   async getNextJob() {
-//     const job = await this.client.rPop(this.id + "-jobs");
-//     if (!job) {
-//       return undefined;
-//     }
-//     return JSON.parse(job) as IJob<T>;
-//   }
-//   async amountOfJobs() {
-//     return this.client.lLen(this.id + "-jobs");
-//   }
-//   async setBlocked(blocked: boolean) {
-//     if (blocked) {
-//       await this.client.hSet(this.id, "blocked", "true");
-//     } else {
-//       await this.client.hSet(this.id, "blocked", "false");
-//     }
-//   }
-//   async isBlocked() {
-//     const blockedResult = await this.client.hGet(this.id, "blocked");
-//     if (blockedResult === "true") {
-//       return true;
-//     }
-//     return false;
-//   }
-//   getId() {
-//     return this.id;
-//   }
-//   async getJobs() {
-//     const entries = await this.client.lRange(this.id + "-jobs", 0, -1);
-//     return entries.map((e) => JSON.parse(e) as IJob<T>);
-//   }
-//   async addDependencies(job: IJob<Job>) {
-//     if (await this.hasDependency(job)) {
-//       return;
-//     }
-//     await this.client.lPush(this.id + "-deps", JSON.stringify(job));
-//     await this.setBlocked(true);
-//   }
-//   async hasDependency(job: IJob<Job>) {
-//     const deps = await this.client.lRange(this.id + "-deps", 0, -1);
-//     return deps.some((d) => d === JSON.stringify(job));
-//   }
-//   async removeDependencies(job: IJob<Job>) {
-//     await this.client.lRem(this.id + "-deps", 1, JSON.stringify(job));
-//     const allDeps = await this.client.lLen(this.id + "-deps");
-//     if (allDeps > 0) {
-//       await this.setBlocked(true);
-//     } else {
-//       await this.setBlocked(false);
-//     }
-//   }
-//   async isDeleted() {
-//     const active = await this.client.hGet("queues", this.id);
-//     return active === "false";
-//   }
-//   async setDeleted(deleted: boolean) {
-//     if (deleted) {
-//       await this.client.hSet("queues", this.id, "false");
-//     } else {
-//       await this.client.hSet("queues", this.id, "true");
-//     }
-//   }
-// }
-// export class RedisQueueManager
-//   extends BaseQueueManager
-//   implements IQueueManager
-// {
-//   private client: RedisClientType;
-//   constructor(workers = 3, timeout = 0, client: RedisClientType) {
-//     super(workers, timeout);
-//     this.client = client;
-//   }
-//   async init(
-//     delegate: IServerDelegate,
-//     onError: (error: Error) => void,
-//   ): Promise<void> {
-//     await super.init(delegate, onError);
-//     const queues = await this.client.hGetAll("queues");
-//     for (const queueId in queues) {
-//       const active = await this.client.hGet("queues", queueId);
-//       if (active === "true") {
-//         this.queues.push(new RedisQueue(queueId, this.client));
-//       }
-//     }
-//   }
-//   getQueue(driveId: string, documentId?: string) {
-//     const queueId = this.getQueueId(driveId, documentId);
-//     let queue = this.queues.find((q) => q.getId() === queueId);
-//     if (!queue) {
-//       queue = new RedisQueue(queueId, this.client);
-//       this.queues.push(queue);
-//     }
-//     return queue;
-//   }
-//   removeQueue(driveId: string, documentId?: string | undefined): void {
-//     super.removeQueue(driveId, documentId);
-//     const queueId = this.getQueueId(driveId, documentId);
-//     this.client.hDel("queues", queueId);
-//   }
-// }
+import { BaseQueueManager } from "./base.js";
+export class RedisQueue {
+    id;
+    client;
+    constructor(id, client) {
+        this.client = client;
+        this.id = id;
+        this.client.hSet("queues", id, "true");
+        this.client.hSet(this.id, "blocked", "false");
+    }
+    async addJob(data) {
+        await this.client.lPush(this.id + "-jobs", JSON.stringify(data));
+    }
+    async getNextJob() {
+        const job = await this.client.rPop(this.id + "-jobs");
+        if (!job) {
+            return undefined;
+        }
+        return JSON.parse(job);
+    }
+    async amountOfJobs() {
+        return this.client.lLen(this.id + "-jobs");
+    }
+    async setBlocked(blocked) {
+        if (blocked) {
+            await this.client.hSet(this.id, "blocked", "true");
+        }
+        else {
+            await this.client.hSet(this.id, "blocked", "false");
+        }
+    }
+    async isBlocked() {
+        const blockedResult = await this.client.hGet(this.id, "blocked");
+        if (blockedResult === "true") {
+            return true;
+        }
+        return false;
+    }
+    getId() {
+        return this.id;
+    }
+    async getJobs() {
+        const entries = await this.client.lRange(this.id + "-jobs", 0, -1);
+        return entries.map((e) => JSON.parse(e));
+    }
+    async addDependencies(job) {
+        if (await this.hasDependency(job)) {
+            return;
+        }
+        await this.client.lPush(this.id + "-deps", JSON.stringify(job));
+        await this.setBlocked(true);
+    }
+    async hasDependency(job) {
+        const deps = await this.client.lRange(this.id + "-deps", 0, -1);
+        return deps.some((d) => d === JSON.stringify(job));
+    }
+    async removeDependencies(job) {
+        await this.client.lRem(this.id + "-deps", 1, JSON.stringify(job));
+        const allDeps = await this.client.lLen(this.id + "-deps");
+        if (allDeps > 0) {
+            await this.setBlocked(true);
+        }
+        else {
+            await this.setBlocked(false);
+        }
+    }
+    async isDeleted() {
+        const active = await this.client.hGet("queues", this.id);
+        return active === "false";
+    }
+    async setDeleted(deleted) {
+        if (deleted) {
+            await this.client.hSet("queues", this.id, "false");
+        }
+        else {
+            await this.client.hSet("queues", this.id, "true");
+        }
+    }
+}
+export class RedisQueueManager extends BaseQueueManager {
+    client;
+    constructor(workers = 3, timeout = 0, client) {
+        super(workers, timeout);
+        this.client = client;
+    }
+    async init(delegate, onError) {
+        await super.init(delegate, onError);
+        const queues = await this.client.hGetAll("queues");
+        for (const queueId in queues) {
+            const active = await this.client.hGet("queues", queueId);
+            if (active === "true") {
+                this.queues.push(new RedisQueue(queueId, this.client));
+            }
+        }
+    }
+    getQueue(driveId, documentId) {
+        const queueId = this.getQueueId(driveId, documentId);
+        let queue = this.queues.find((q) => q.getId() === queueId);
+        if (!queue) {
+            queue = new RedisQueue(queueId, this.client);
+            this.queues.push(queue);
+        }
+        return queue;
+    }
+    removeQueue(driveId, documentId) {
+        super.removeQueue(driveId, documentId);
+        const queueId = this.getQueueId(driveId, documentId);
+        this.client.hDel("queues", queueId);
+    }
+}
 //# sourceMappingURL=redis.js.map

package/dist/src/queue/redis.js.map

@@ -1 +1 @@
-{"version":3,"file":"redis.js","sourceRoot":"","sources":["../../../src/queue/redis.ts"],"names":[],"mappings":"AAAA,gDAAgD;AAChD,gDAAgD;AAChD,WAAW;AACX,eAAe;AACf,iBAAiB;AACjB,wBAAwB;AACxB,0BAA0B;AAC1B,cAAc;AACd,uBAAuB;;AAEvB,oDAAoD;AACpD,wBAAwB;AACxB,qCAAqC;AAErC,uDAAuD;AACvD,4BAA4B;AAC5B,oBAAoB;AACpB,8CAA8C;AAC9C,qDAAqD;AACrD,MAAM;AAEN,8BAA8B;AAC9B,wEAAwE;AACxE,MAAM;AAEN,yBAAyB;AACzB,6DAA6D;AAC7D,kBAAkB;AAClB,0BAA0B;AAC1B,QAAQ;AACR,yCAAyC;AACzC,MAAM;AAEN,2BAA2B;AAC3B,kDAAkD;AAClD,MAAM;AAEN,yCAAyC;AACzC,qBAAqB;AACrB,4DAA4D;AAC5D,eAAe;AACf,6DAA6D;AAC7D,QAAQ;AACR,MAAM;AAEN,wBAAwB;AACxB,wEAAwE;AACxE,sCAAsC;AACtC,qBAAqB;AACrB,QAAQ;AAER,oBAAoB;AACpB,MAAM;AAEN,cAAc;AACd,sBAAsB;AACtB,MAAM;AAEN,sBAAsB;AACtB,0EAA0E;AAC1E,2DAA2D;AAC3D,MAAM;AAEN,4CAA4C;AAC5C,2CAA2C;AAC3C,gBAAgB;AAChB,QAAQ;AACR,uEAAuE;AACvE,mCAAmC;AACnC,MAAM;AAEN,0CAA0C;AAC1C,uEAAuE;AACvE,0DAA0D;AAC1D,MAAM;AAEN,+CAA+C;AAC/C,yEAAyE;AACzE,iEAAiE;AACjE,yBAAyB;AACzB,qCAAqC;AACrC,eAAe;AACf,sCAAsC;AACtC,QAAQ;AACR,MAAM;AAEN,wBAAwB;AACxB,gEAAgE;AAChE,iCAAiC;AACjC,MAAM;AAEN,yCAAyC;AACzC,qBAAqB;AACrB,4DAA4D;AAC5D,eAAe;AACf,2DAA2D;AAC3D,QAAQ;AACR,MAAM;AACN,IAAI;AAEJ,iCAAiC;AACjC,6BAA6B;AAC7B,6BAA6B;AAC7B,IAAI;AACJ,qCAAqC;AAErC,qEAAqE;AACrE,+BAA+B;AAC/B,4BAA4B;AAC5B,MAAM;AAEN,gBAAgB;AAChB,iCAAiC;AACjC,uCAAuC;AACvC,uBAAuB;AACvB,2CAA2C;AAC3C,0DAA0D;AAC1D,sCAAsC;AACtC,kEAAkE;AAClE,iCAAiC;AACjC,kEAAkE;AAClE,UAAU;AACV,QAAQ;AACR,MAAM;AAEN,qDAAqD;AACrD,4DAA4D;AAC5D,kEAAkE;AAElE,oBAAoB;AACpB,sDAAsD;AACtD,iCAAiC;AACjC,QAAQ;AAER,oBAAoB;AACpB,MAAM;AAEN,0EAA0E;AAC1E,8CAA8C;AAE9C,4DAA4D;AAC5D,2CAA2C;AAC3C,MAAM;AACN,IAAI"}
+{"version":3,"file":"redis.js","sourceRoot":"","sources":["../../../src/queue/redis.ts"],"names":[],"mappings":"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"}

package/dist/src/queue/types.d.ts

@@ -1,32 +1,24 @@
 import { type AddOperationOptions, type IOperationResult } from "#server/types";
-import type { Action, Operation, OperationScope, PHDocument } from "document-model";
+import type { Action, Operation } from "document-model";
 import type { Unsubscribe } from "nanoevents";
 export interface BaseJob {
-    documentId: string;
+    driveId: string;
+    documentId?: string;
     actions?: Action[];
     options?: AddOperationOptions;
 }
-export interface DocumentJob extends Omit<BaseJob, "actions"> {
-    documentType: string;
-    initialState?: PHDocument;
-}
 export interface OperationJob extends BaseJob {
     operations: Operation[];
 }
 export interface ActionJob extends BaseJob {
     actions: Action[];
 }
-export type Job = DocumentJob | OperationJob | ActionJob;
+export type Job = OperationJob | ActionJob;
 export type JobId = string;
 export interface QueueEvents {
-    jobAdded: (job: IJob<Job>) => void;
-    jobStarted: (job: IJob<Job>) => void;
     jobCompleted: (job: IJob<Job>, result: IOperationResult) => void;
     jobFailed: (job: IJob<Job>, error: Error) => void;
-    queueRemoved: (queue: {
-        documentId: string;
-        scope: OperationScope;
-    }) => void;
+    queueRemoved: (queueId: string) => void;
 }
 export interface IServerDelegate {
     exists: (documentId: string) => Promise<boolean>;
@@ -34,6 +26,10 @@ export interface IServerDelegate {
 }
 export interface IQueueManager {
     addJob: (job: Job) => Promise<JobId>;
+    getQueue: (driveId: string, documentId?: string) => IQueue<Job>;
+    removeQueue: (driveId: string, documentId?: string) => void;
+    getQueueByIndex: (index: number) => IQueue<Job> | null;
+    getQueues: () => string[];
     init: (delegate: IServerDelegate, onError: (error: Error) => void) => Promise<void>;
     on: <K extends keyof QueueEvents>(this: this, event: K, cb: QueueEvents[K]) => Unsubscribe;
 }
@@ -45,17 +41,15 @@ export interface IQueue<T> {
     getNextJob(): Promise<IJob<T> | undefined>;
     amountOfJobs(): Promise<number>;
     getId(): string;
+    setBlocked(blocked: boolean): Promise<void>;
     isBlocked(): Promise<boolean>;
     isDeleted(): Promise<boolean>;
-    isRunning(): Promise<boolean>;
     setDeleted(deleted: boolean): Promise<void>;
-    setRunning(running: boolean): Promise<void>;
     getJobs(): Promise<IJob<T>[]>;
-    addDependency: (job: IJob<Job>) => Promise<void>;
-    removeDependency: (job: IJob<Job>) => Promise<void>;
+    addDependencies: (job: IJob<Job>) => Promise<void>;
+    removeDependencies: (job: IJob<Job>) => Promise<void>;
 }
 export type IJobQueue = IQueue<Job>;
-export declare function isDocumentJob(job: Job): job is DocumentJob;
 export declare function isOperationJob(job: Job): job is OperationJob;
 export declare function isActionJob(job: Job): job is ActionJob;
 //# sourceMappingURL=types.d.ts.map