document-drive 1.0.0-alpha.97 → 1.0.0-alpha.99

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "document-drive",
-    "version": "1.0.0-alpha.97",
+    "version": "1.0.0-alpha.99",
     "license": "AGPL-3.0-only",
     "type": "module",
     "module": "./src/index.ts",
@@ -36,7 +36,7 @@
     },
     "peerDependencies": {
         "document-model": "^1.8.0",
-        "document-model-libs": "^1.57.0"
+        "document-model-libs": "^1.90.1"
     },
     "optionalDependencies": {
         "@prisma/client": "^5.18.0",
@@ -69,7 +69,7 @@
         "@vitest/browser": "^2.0.5",
         "@vitest/coverage-v8": "^2.0.5",
         "document-model": "^1.7.0",
-        "document-model-libs": "^1.83.0",
+        "document-model-libs": "^1.90.1",
         "eslint": "^8.57.0",
         "eslint-config-prettier": "^9.1.0",
         "fake-indexeddb": "^5.0.2",

package/src/server/index.ts

@@ -549,6 +549,7 @@ export class BaseDocumentDriveServer
     }
 
     private defaultDrivesManagerDelegate = {
+        detachDrive: this.detachDrive.bind(this),
         emit: (...args: Parameters<DriveEvents['defaultRemoteDrive']>) =>
             this.emit('defaultRemoteDrive', ...args)
     };
@@ -2312,6 +2313,31 @@ export class BaseDocumentDriveServer
         return transmitter;
     }
 
+    async detachDrive(driveId: string) {
+        const documentDrive = await this.getDrive(driveId);
+        const listeners = documentDrive.state.local.listeners || [];
+        const triggers = documentDrive.state.local.triggers || [];
+
+        for (const listener of listeners) {
+            await this.addDriveAction(
+                driveId,
+                actions.removeListener({ listenerId: listener.listenerId })
+            );
+        }
+
+        for (const trigger of triggers) {
+            await this.addDriveAction(
+                driveId,
+                actions.removeTrigger({ triggerId: trigger.id })
+            );
+        }
+
+        await this.addDriveAction(
+            driveId,
+            actions.setSharingType({ type: 'LOCAL' })
+        );
+    }
+
     private async addListener(
         driveId: string,
         operation: Operation<Action<'ADD_LISTENER', AddListenerInput>>

package/src/server/types.ts

@@ -231,6 +231,27 @@ export type DefaultRemoteDriveInfo = DefaultRemoteDriveInput & {
     metadata?: DriveInfo;
 };
 
+export type RemoveDriveStrategy = 'remove' | 'detach';
+
+/**
+ * Options for removing old remote drives.
+ *
+ * Allows specifying different strategies for handling old remote drives:
+ *
+ * - `remove-all`: Remove all remote drives.
+ * - `preserve-all`: Preserve all remote drives (this is the default behavior).
+ * - `remove-by-id`: Remove the remote drives specified by their IDs.
+ * - `remove-by-url`: Remove the remote drives specified by their URLs.
+ * - `preserve-by-id`: Preserve remote drives by their IDs and remove the rest.
+ * - `preserve-by-url`: Preserve remote drives by their URLs and remove the rest.
+ * - `detach-by-id`: Detach remote drives by their IDs (changes the remote drive to a local drive).
+ * - `detach-by-url`: Detach remote drives by their URLs (changes the remote drive to a local drive).
+ * - `preserve-by-id-and-detach`: Preserve the remote drives specified by their IDs and detach the rest.
+ * - `preserve-by-url-and-detach`: Preserve the remote drives specified by their URLs and detach the rest.
+ *
+ * Each strategy is represented by an object with a `strategy` property and,
+ * depending on the strategy, additional properties such as `ids` or `urls`.
+ */
 export type RemoveOldRemoteDrivesOption =
     | {
           strategy: 'remove-all';
@@ -253,6 +274,22 @@ export type RemoveOldRemoteDrivesOption =
     | {
           strategy: 'preserve-by-url';
           urls: string[];
+      }
+    | {
+          strategy: 'detach-by-id';
+          ids: string[];
+      }
+    | {
+          strategy: 'detach-by-url';
+          urls: string[];
+      }
+    | {
+          strategy: 'preserve-by-id-and-detach';
+          ids: string[];
+      }
+    | {
+          strategy: 'preserve-by-url-and-detach';
+          urls: string[];
       };
 
 export type DocumentDriveServerOptions = {

package/src/utils/default-drives-manager.ts

@@ -5,6 +5,7 @@ import {
     IBaseDocumentDriveServer,
     IReadModeDriveServer,
     RemoteDriveAccessLevel,
+    RemoveDriveStrategy,
     RemoveOldRemoteDrivesOption
 } from '../server';
 import { DriveNotFoundError } from '../server/error';
@@ -13,6 +14,7 @@ import { logger } from './logger';
 
 export interface IServerDelegateDrivesManager {
     emit: (...args: Parameters<DriveEvents['defaultRemoteDrive']>) => void;
+    detachDrive: (driveId: string) => Promise<void>;
 }
 
 function isReadModeDriveServer(obj: unknown): obj is IReadModeDriveServer {
@@ -75,8 +77,9 @@ export class DefaultDrivesManager implements IDefaultDrivesManager {
     }
 
     private async preserveDrivesById(
-        drivesIdsToRemove: string[],
-        drives: string[]
+        driveIdsToPreserve: string[],
+        drives: string[],
+        removeStrategy: RemoveDriveStrategy = 'detach'
     ) {
         const getAllDrives = drives.map(driveId =>
             this.server.getDrive(driveId)
@@ -89,11 +92,16 @@ export class DefaultDrivesManager implements IDefaultDrivesManager {
                     drive.state.local.triggers.length > 0
             )
             .filter(
-                drive => !drivesIdsToRemove.includes(drive.state.global.id)
+                drive => !driveIdsToPreserve.includes(drive.state.global.id)
             );
 
         const driveIds = drivesToRemove.map(drive => drive.state.global.id);
-        await this.removeDrivesById(driveIds);
+
+        if (removeStrategy === 'detach') {
+            await this.detachDrivesById(driveIds);
+        } else {
+            await this.removeDrivesById(driveIds);
+        }
     }
 
     private async removeDrivesById(driveIds: string[]) {
@@ -102,18 +110,41 @@ export class DefaultDrivesManager implements IDefaultDrivesManager {
         }
     }
 
+    private async detachDrivesById(driveIds: string[]) {
+        const detachDrivesPromises = driveIds.map(driveId =>
+            this.delegate.detachDrive(driveId)
+        );
+
+        await Promise.all(detachDrivesPromises);
+    }
+
     async removeOldremoteDrives() {
         const driveids = await this.server.getDrives();
 
         switch (this.removeOldRemoteDrivesConfig.strategy) {
+            case 'preserve-by-id-and-detach':
             case 'preserve-by-id': {
+                const detach: RemoveDriveStrategy =
+                    this.removeOldRemoteDrivesConfig.strategy ===
+                    'preserve-by-id-and-detach'
+                        ? 'detach'
+                        : 'remove';
+
                 await this.preserveDrivesById(
                     this.removeOldRemoteDrivesConfig.ids,
-                    driveids
+                    driveids,
+                    detach
                 );
                 break;
             }
+            case 'preserve-by-url-and-detach':
             case 'preserve-by-url': {
+                const detach: RemoveDriveStrategy =
+                    this.removeOldRemoteDrivesConfig.strategy ===
+                    'preserve-by-url-and-detach'
+                        ? 'detach'
+                        : 'remove';
+
                 const getDrivesInfo = this.removeOldRemoteDrivesConfig.urls.map(
                     url => requestPublicDrive(url)
                 );
@@ -122,7 +153,11 @@ export class DefaultDrivesManager implements IDefaultDrivesManager {
                     await Promise.all(getDrivesInfo)
                 ).map(driveInfo => driveInfo.id);
 
-                await this.preserveDrivesById(drivesIdsToPreserve, driveids);
+                await this.preserveDrivesById(
+                    drivesIdsToPreserve,
+                    driveids,
+                    detach
+                );
                 break;
             }
             case 'remove-by-id': {
@@ -163,6 +198,35 @@ export class DefaultDrivesManager implements IDefaultDrivesManager {
                 await this.removeDrivesById(drivesToRemove);
                 break;
             }
+            case 'detach-by-id': {
+                const drivesIdsToRemove =
+                    this.removeOldRemoteDrivesConfig.ids.filter(driveId =>
+                        driveids.includes(driveId)
+                    );
+                const detachDrivesPromises = drivesIdsToRemove.map(driveId =>
+                    this.delegate.detachDrive(driveId)
+                );
+
+                await Promise.all(detachDrivesPromises);
+                break;
+            }
+            case 'detach-by-url': {
+                const getDrivesInfo = this.removeOldRemoteDrivesConfig.urls.map(
+                    driveUrl => requestPublicDrive(driveUrl)
+                );
+                const drivesInfo = await Promise.all(getDrivesInfo);
+
+                const drivesIdsToRemove = drivesInfo
+                    .map(driveInfo => driveInfo.id)
+                    .filter(driveId => driveids.includes(driveId));
+
+                const detachDrivesPromises = drivesIdsToRemove.map(driveId =>
+                    this.delegate.detachDrive(driveId)
+                );
+
+                await Promise.all(detachDrivesPromises);
+                break;
+            }
         }
     }
 

package/src/utils/graphql.ts

@@ -234,6 +234,20 @@ export async function fetchDocument<D extends Document>(
                         timestamp
                         type
                         inputText
+                        context {
+                            signer {
+                                user {
+                                    address
+                                    networkId
+                                    chainId
+                                }
+                                app {
+                                    name
+                                    key
+                                }
+                                signatures
+                            }
+                        }
                     }
                     ... on ${name} {
                         state {