document-drive 1.0.0-experimental.3 → 1.0.0-experimental.5

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "document-drive",
-    "version": "1.0.0-experimental.3",
+    "version": "1.0.0-experimental.5",
     "license": "AGPL-3.0-only",
     "type": "module",
     "module": "./src/index.ts",
@@ -16,7 +16,7 @@
         "./cache/redis": "./src/cache/redis.ts",
         "./cache/memory": "./src/cache/memory.ts",
         "./queue/redis": "./src/queue/redis.ts",
-        "./queue/memory": "./src/queue/memory.ts",
+        "./queue/base": "./src/queue/base.ts",
         "./utils": "./src/utils/index.ts",
         "./utils/graphql": "./src/utils/graphql.ts",
         "./logger": "./src/utils/logger.ts"

package/src/server/index.ts

@@ -438,7 +438,7 @@ export class DocumentDriveServer extends BaseDocumentDriveServer {
         return documentModel;
     }
 
-    async addDrive(drive: DriveInput) {
+    async addDrive(drive: DriveInput): Promise<DocumentDriveDocument> {
         const id = drive.global.id || generateUUID();
         if (!id) {
             throw new Error('Invalid Drive Id');
@@ -459,7 +459,7 @@ export class DocumentDriveServer extends BaseDocumentDriveServer {
         return document;
     }
 
-    async addRemoteDrive(url: string, options: RemoteDriveOptions) {
+    async addRemoteDrive(url: string, options: RemoteDriveOptions): Promise<DocumentDriveDocument> {
         const { id, name, slug, icon } = await requestPublicDrive(url);
         const {
             pullFilter,
@@ -823,22 +823,19 @@ export class DocumentDriveServer extends BaseDocumentDriveServer {
         }
     }
 
+    queueOperation(drive: string, id: string, operation: Operation, forceSync = true): Promise<IOperationResult> {
+        return this.queueOperations(drive, id, [operation], forceSync);
+    }
 
     async queueOperations(drive: string,
         id: string,
         operations: Operation[],
         forceSync = true) {
-        // try {
-        //     await this.getDocument(drive, id);
-        // } catch (error) {
-        //     logger.error('Error getting document', error);
-        //     throw error;
-        // }
 
         try {
             const jobId = await this.queueManager.addJob({ driveId: drive, documentId: id, operations, forceSync });
 
-            return new Promise((resolve, reject) => {
+            return new Promise<IOperationResult>((resolve, reject) => {
                 const unsubscribe = this.queueManager.on('jobCompleted', (job, result) => {
                     if (job.jobId === jobId) {
                         unsubscribe();
@@ -1014,18 +1011,22 @@ export class DocumentDriveServer extends BaseDocumentDriveServer {
         }
     }
 
+    queueDriveOperation(drive: string, operation: Operation<DocumentDriveAction | BaseAction>, forceSync = true): Promise<IOperationResult<DocumentDriveDocument>> {
+        return this.queueDriveOperations(drive, [operation], forceSync);
+    }
+
     async queueDriveOperations(
         drive: string,
         operations: Operation<DocumentDriveAction | BaseAction>[],
         forceSync = true
-    ): Promise<IOperationResult> {
+    ): Promise<IOperationResult<DocumentDriveDocument>> {
         const jobId = await this.queueManager.addJob({ driveId: drive, operations, forceSync });
-        return new Promise((resolve, reject) => {
+        return new Promise<IOperationResult<DocumentDriveDocument>>((resolve, reject) => {
             const unsubscribe = this.queueManager.on('jobCompleted', (job, result) => {
                 if (job.jobId === jobId) {
                     unsubscribe();
                     unsubscribeError();
-                    resolve(result);
+                    resolve(result as IOperationResult<DocumentDriveDocument>);
                 }
             });
             const unsubscribeError = this.queueManager.on('jobFailed', (job, error) => {

package/src/server/types.ts

@@ -178,13 +178,39 @@ export abstract class BaseDocumentDriveServer {
         forceSync?: boolean
     ): Promise<IOperationResult>;
 
+    abstract queueOperation(
+        drive: string,
+        id: string,
+        operation: Operation,
+        forceSync?: boolean
+    ): Promise<IOperationResult>;
+    abstract queueOperations(
+        drive: string,
+        id: string,
+        operations: Operation[],
+        forceSync?: boolean
+    ): Promise<IOperationResult>;
+
     abstract addDriveOperation(
         drive: string,
-        operation: Operation<DocumentDriveAction | BaseAction>
+        operation: Operation<DocumentDriveAction | BaseAction>,
+        forceSync?: boolean
     ): Promise<IOperationResult<DocumentDriveDocument>>;
     abstract addDriveOperations(
         drive: string,
-        operations: Operation<DocumentDriveAction | BaseAction>[]
+        operations: Operation<DocumentDriveAction | BaseAction>[],
+        forceSync?: boolean
+    ): Promise<IOperationResult<DocumentDriveDocument>>;
+
+    abstract queueDriveOperation(
+        drive: string,
+        operation: Operation<DocumentDriveAction | BaseAction>,
+        forceSync?: boolean
+    ): Promise<IOperationResult<DocumentDriveDocument>>;
+    abstract queueDriveOperations(
+        drive: string,
+        operations: Operation<DocumentDriveAction | BaseAction>[],
+        forceSync?: boolean
     ): Promise<IOperationResult<DocumentDriveDocument>>;
 
     abstract addAction(

package/src/storage/types.ts

@@ -8,7 +8,6 @@ import type {
     DocumentHeader,
     Operation
 } from 'document-model/document';
-import { GetDocumentOptions } from '../server';
 
 export type DocumentStorage<D extends Document = Document> = Omit<
     D,