document-drive 1.0.0-alpha.81 → 1.0.0-alpha.83

package/package.json

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

package/src/cache/redis.ts

@@ -1,14 +1,18 @@
 import { Document } from "document-model/document";
 import { ICache } from "./types";
 import type { RedisClientType } from "redis";
-import { logger } from "../utils/logger";
 
 class RedisCache implements ICache {
     private redis: RedisClientType;
+    private timeoutInSeconds: number;
 
-    constructor(redis: RedisClientType) {
+    constructor(redis: RedisClientType, timeoutInSeconds: number | undefined = 5 * 60) {
         this.redis = redis;
-        this.redis.flushAll().catch(logger.error);
+        this.timeoutInSeconds = timeoutInSeconds;
+    }
+
+    private static _getId(drive: string, id: string) {
+        return `cache:${drive}:${id}`;
     }
 
     async setDocument(drive: string, id: string, document: Document) {
@@ -21,17 +25,28 @@ class RedisCache implements ICache {
             return e;
         });
         const doc = { ...document, operations: { global, local } }
-        return (await this.redis.hSet(drive, id, JSON.stringify(doc))) > 0;
+        const redisId = RedisCache._getId(drive, id);
+        const result = await this.redis.set(redisId, JSON.stringify(doc), {
+            EX: this.timeoutInSeconds ? this.timeoutInSeconds : undefined
+        });
+
+        if (result === 'OK') {
+            return true;
+        }
+
+        return false;
     }
 
     async getDocument(drive: string, id: string) {
-        const doc = await this.redis.hGet(drive, id);
+        const redisId = RedisCache._getId(drive, id);
+        const doc = await this.redis.get(redisId);
 
         return doc ? JSON.parse(doc) as Document : undefined;
     }
 
     async deleteDocument(drive: string, id: string) {
-        return (await this.redis.hDel(drive, id)) > 0;
+        const redisId = RedisCache._getId(drive, id);
+        return (await this.redis.del(redisId)) > 0;
     }
 }
 

package/src/queue/base.ts

@@ -253,6 +253,6 @@ export class BaseQueueManager implements IQueueManager {
     }
 
     protected getQueueId(driveId: string, documentId?: string) {
-        return `${driveId}${documentId ? `:${documentId}` : ''}`;
+        return `queue:${driveId}${documentId ? `:${documentId}` : ''}`;
     }
 }

package/src/server/index.ts

@@ -22,6 +22,7 @@ import {
     Operation,
     OperationScope
 } from 'document-model/document';
+import { ClientError } from 'graphql-request';
 import { createNanoEvents, Unsubscribe } from 'nanoevents';
 import { ICache } from '../cache';
 import InMemoryCache from '../cache/memory';
@@ -231,6 +232,16 @@ export class DocumentDriveServer extends BaseDocumentDriveServer {
                                 : 'ERROR',
                             error
                         );
+
+                        if (error instanceof ClientError) {
+                            this.emit(
+                                'clientStrandsError',
+                                driveId,
+                                trigger,
+                                error.response.status,
+                                error.message
+                            );
+                        }
                     },
                     revisions => {
                         const errorRevision = revisions.filter(
@@ -686,6 +697,21 @@ export class DocumentDriveServer extends BaseDocumentDriveServer {
         });
     }
 
+    public async registerPullResponderTrigger(
+        id: string,
+        url: string,
+        options: Pick<RemoteDriveOptions, 'pullFilter' | 'pullInterval'>
+    ) {
+        const pullTrigger =
+            await PullResponderTransmitter.createPullResponderTrigger(
+                id,
+                url,
+                options
+            );
+
+        return pullTrigger;
+    }
+
     async deleteDrive(id: string) {
         const result = await Promise.allSettled([
             this.stopSyncRemoteDrive(id),

package/src/server/types.ts

@@ -4,7 +4,8 @@ import type {
     DocumentDriveLocalState,
     DocumentDriveState,
     ListenerCallInfo,
-    ListenerFilter
+    ListenerFilter,
+    Trigger
 } from 'document-model-libs/document-drive';
 import type {
     Action,
@@ -20,7 +21,11 @@ import type {
 } from 'document-model/document';
 import { Unsubscribe } from 'nanoevents';
 import { OperationError } from './error';
-import { ITransmitter, StrandUpdateSource } from './listener/transmitter/types';
+import {
+    ITransmitter,
+    PullResponderTrigger,
+    StrandUpdateSource
+} from './listener/transmitter/types';
 
 export type DriveInput = State<
     Omit<DocumentDriveState, '__typename' | 'id' | 'nodes'> & { id?: string },
@@ -138,6 +143,12 @@ export type SyncStatus = 'SYNCING' | UpdateStatus;
 export interface DriveEvents {
     syncStatus: (driveId: string, status: SyncStatus, error?: Error) => void;
     strandUpdate: (update: StrandUpdate) => void;
+    clientStrandsError: (
+        driveId: string,
+        trigger: Trigger,
+        status: number,
+        errorMessage: string
+    ) => void;
 }
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -342,6 +353,12 @@ export abstract class BaseDocumentDriveServer {
     ): Promise<ITransmitter | undefined>;
 
     abstract clearStorage(): Promise<void>;
+
+    abstract registerPullResponderTrigger(
+        id: string,
+        url: string,
+        options: Pick<RemoteDriveOptions, 'pullFilter' | 'pullInterval'>
+    ): Promise<PullResponderTrigger>;
 }
 
 export abstract class BaseListenerManager {

package/src/storage/prisma.ts

@@ -31,14 +31,14 @@ import {
 
 type Transaction =
     | Omit<
-          PrismaClient<Prisma.PrismaClientOptions, never>,
-          | '$connect'
-          | '$disconnect'
-          | '$on'
-          | '$transaction'
-          | '$use'
-          | '$extends'
-      >
+        PrismaClient<Prisma.PrismaClientOptions, never>,
+        | '$connect'
+        | '$disconnect'
+        | '$on'
+        | '$transaction'
+        | '$use'
+        | '$extends'
+    >
     | ExtendedPrismaClient;
 
 function storageToOperation(
@@ -495,21 +495,21 @@ export class PrismaStorage implements IDriveStorage {
     }
 
     async deleteDocument(drive: string, id: string) {
-        await this.db.document.delete({
-            where: {
-                id_driveId: {
+        try {
+            await this.db.document.deleteMany({
+                where: {
                     driveId: drive,
                     id: id
                 }
-            },
-            include: {
-                operations: {
-                    include: {
-                        attachments: true
-                    }
-                }
+            });
+        } catch (e: any) {
+            // Ignore Error: P2025: An operation failed because it depends on one or more records that were required but not found.
+            if ((e.code && e.code === "P2025") || (e.message && e.message.includes("An operation failed because it depends on one or more records that were required but not found."))) {
+                return;
             }
-        });
+
+            throw e;
+        }
     }
 
     async getDrives() {
@@ -541,13 +541,6 @@ 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: {
@@ -555,7 +548,7 @@ export class PrismaStorage implements IDriveStorage {
             }
         });
 
-        // delete drive itself
+        // delete drive document and its operations
         await this.deleteDocument('drives', id);
     }