document-drive 1.28.4 → 1.29.0-dev.1

package/dist/src/storage/browser.js

@@ -6,7 +6,6 @@ export class BrowserStorage {
     db;
     static DBName = "DOCUMENT_DRIVES";
     static SEP = ":";
-    static DRIVES_KEY = "DRIVES";
     static DOCUMENT_KEY = "DOCUMENT";
     static MANIFEST_KEY = "MANIFEST";
     constructor(namespace) {
@@ -28,6 +27,14 @@ export class BrowserStorage {
         const db = await this.db;
         await db.setItem(this.buildDocumentKey(documentId), document);
     }
+    async get(documentId) {
+        const db = await this.db;
+        const document = await db.getItem(this.buildDocumentKey(documentId));
+        if (!document) {
+            throw new Error(`Document with id ${documentId} not found`);
+        }
+        return document;
+    }
     ////////////////////////////////
     // IDriveStorage
     ////////////////////////////////
@@ -48,11 +55,7 @@ export class BrowserStorage {
         return manifest.documentIds;
     }
     async getDocument(driveId, id) {
-        const document = await (await this.db).getItem(this.buildDocumentKey(id));
-        if (!document) {
-            throw new Error(`Document with id ${id} not found`);
-        }
-        return document;
+        return this.get(id);
     }
     async createDocument(drive, id, document) {
         await this.create(id, document);
@@ -93,13 +96,16 @@ export class BrowserStorage {
         const db = await this.db;
         const keys = await db.keys();
         return keys
-            .filter((key) => key.startsWith(BrowserStorage.DRIVES_KEY))
-            .map((key) => key.slice(BrowserStorage.DRIVES_KEY.length + BrowserStorage.SEP.length));
+            .filter((key) => key.startsWith(BrowserStorage.MANIFEST_KEY))
+            .map((key) => key.slice(BrowserStorage.MANIFEST_KEY.length + BrowserStorage.SEP.length));
     }
     async getDrive(id) {
-        const db = await this.db;
-        const drive = await db.getItem(this.buildDriveKey(id));
-        if (!drive) {
+        let drive;
+        try {
+            drive = await this.get(id);
+        }
+        catch {
+            // preserve throwing a specialized error for drives
             throw new DriveNotFoundError(id);
         }
         return drive;
@@ -116,8 +122,21 @@ export class BrowserStorage {
         throw new Error(`Drive with slug ${slug} not found`);
     }
     async createDrive(id, drive) {
-        const db = await this.db;
-        await db.setItem(this.buildDriveKey(id), drive);
+        // check if a drive with the same slug already exists
+        const slug = drive.initialState.state.global.slug;
+        if (slug) {
+            let existingDrive;
+            try {
+                existingDrive = await this.getDriveBySlug(slug);
+            }
+            catch {
+                // do nothing
+            }
+            if (existingDrive) {
+                throw new Error(`Drive with slug ${slug} already exists`);
+            }
+        }
+        await this.create(id, drive);
         // Initialize an empty manifest for the new drive
         await this.updateDriveManifest(id, { documentIds: [] });
     }
@@ -129,13 +148,13 @@ export class BrowserStorage {
         // Delete the drive and its manifest
         const db = await this.db;
         await db.removeItem(this.buildManifestKey(id));
-        return db.removeItem(this.buildDriveKey(id));
+        return db.removeItem(this.buildDocumentKey(id));
     }
     async addDriveOperations(id, operations, header) {
         const drive = await this.getDrive(id);
         const mergedOperations = mergeOperations(drive.operations, operations);
         const db = await this.db;
-        await db.setItem(this.buildDriveKey(id), {
+        await db.setItem(this.buildDocumentKey(id), {
             ...drive,
             ...header,
             operations: mergedOperations,
@@ -144,16 +163,13 @@ export class BrowserStorage {
     async getSynchronizationUnitsRevision(units) {
         const results = await Promise.allSettled(units.map(async (unit) => {
             try {
-                const document = await (unit.documentId
-                    ? this.getDocument(unit.driveId, unit.documentId)
-                    : this.getDrive(unit.driveId));
+                const document = await this.get(unit.documentId);
                 if (!document) {
                     return undefined;
                 }
                 const operation = document.operations[unit.scope].at(-1);
                 if (operation) {
                     return {
-                        driveId: unit.driveId,
                         documentId: unit.documentId,
                         scope: unit.scope,
                         branch: unit.branch,
@@ -186,7 +202,7 @@ export class BrowserStorage {
         const drive = await this.getDrive(driveId);
         const migratedDrive = migrateDocumentOperationSignatures(drive);
         if (migratedDrive !== drive) {
-            return (await this.db).setItem(this.buildDriveKey(driveId), migratedDrive);
+            return (await this.db).setItem(this.buildDocumentKey(driveId), migratedDrive);
         }
     }
     async migrateDocument(drive, id) {
@@ -199,9 +215,6 @@ export class BrowserStorage {
     ////////////////////////////////
     // Private methods
     ////////////////////////////////
-    buildDriveKey(driveId) {
-        return `${BrowserStorage.DRIVES_KEY}${BrowserStorage.SEP}${driveId}`;
-    }
     buildDocumentKey(documentId) {
         return `${BrowserStorage.DOCUMENT_KEY}${BrowserStorage.SEP}${documentId}`;
     }

package/dist/src/storage/filesystem.d.ts

@@ -7,6 +7,7 @@ export declare class FilesystemStorage implements IDriveStorage, IDocumentStorag
     constructor(basePath: string);
     exists(documentId: string): Promise<boolean>;
     create(documentId: string, document: PHDocument): Promise<void>;
+    get<TDocument extends PHDocument>(documentId: string): Promise<TDocument>;
     getDocuments(drive: string): Promise<string[]>;
     checkDocumentExists(drive: string, id: string): Promise<boolean>;
     getDocument<TDocument extends PHDocument>(drive: string, id: string): Promise<TDocument>;
@@ -21,7 +22,6 @@ export declare class FilesystemStorage implements IDriveStorage, IDocumentStorag
     deleteDrive(id: string): Promise<void>;
     addDriveOperations(id: string, operations: Operation<DocumentDriveAction>[], header: DocumentHeader): Promise<void>;
     getSynchronizationUnitsRevision(units: SynchronizationUnitQuery[]): Promise<{
-        driveId: string;
         documentId: string;
         scope: string;
         branch: string;
@@ -29,7 +29,6 @@ export declare class FilesystemStorage implements IDriveStorage, IDocumentStorag
         revision: number;
     }[]>;
     private _buildDocumentPath;
-    private _buildDrivePath;
     private _buildManifestPath;
     private getDriveManifest;
     private updateDriveManifest;

package/dist/src/storage/filesystem.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"filesystem.d.ts","sourceRoot":"","sources":["../../../src/storage/filesystem.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,mBAAmB,EACxB,KAAK,qBAAqB,EAC3B,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EAAE,KAAK,wBAAwB,EAAE,MAAM,eAAe,CAAC;AAE9D,OAAO,EACL,KAAK,cAAc,EACnB,KAAK,SAAS,EAEd,KAAK,UAAU,EAChB,MAAM,gBAAgB,CAAC;AAKxB,OAAO,EAAE,KAAK,gBAAgB,EAAE,KAAK,aAAa,EAAE,MAAM,YAAY,CAAC;AAavE,qBAAa,iBAAkB,YAAW,aAAa,EAAE,gBAAgB;IACvE,OAAO,CAAC,QAAQ,CAAS;gBAEb,QAAQ,EAAE,MAAM;IAS5B,MAAM,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAKtC,MAAM,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU;IAW/C,YAAY,CAAC,KAAK,EAAE,MAAM;IAKhC,mBAAmB,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAI1D,WAAW,CAAC,SAAS,SAAS,UAAU,EAC5C,KAAK,EAAE,MAAM,EACb,EAAE,EAAE,MAAM,GACT,OAAO,CAAC,SAAS,CAAC;IAWf,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU;IAgB9D,YAAY;IAeZ,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM;IA0BxC,qBAAqB,CACzB,KAAK,EAAE,MAAM,EACb,EAAE,EAAE,MAAM,EACV,UAAU,EAAE,SAAS,EAAE,EACvB,MAAM,EAAE,cAAc;IAuBlB,SAAS;IAWT,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,qBAAqB,CAAC;IAWpD,cAAc,CAAC,IAAI,EAAE,MAAM;IAmB3B,WAAW,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,qBAAqB;IAUpD,WAAW,CAAC,EAAE,EAAE,MAAM;IActB,kBAAkB,CACtB,EAAE,EAAE,MAAM,EACV,UAAU,EAAE,SAAS,CAAC,mBAAmB,CAAC,EAAE,EAC5C,MAAM,EAAE,cAAc,GACrB,OAAO,CAAC,IAAI,CAAC;IAqBV,+BAA+B,CACnC,KAAK,EAAE,wBAAwB,EAAE,GAChC,OAAO,CACR;QACE,OAAO,EAAE,MAAM,CAAC;QAChB,UAAU,EAAE,MAAM,CAAC;QACnB,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,EAAE,MAAM,CAAC;QACf,WAAW,EAAE,MAAM,CAAC;QACpB,QAAQ,EAAE,MAAM,CAAC;KAClB,EAAE,CACJ;IAgDD,OAAO,CAAC,kBAAkB;IAI1B,OAAO,CAAC,eAAe;IAIvB,OAAO,CAAC,kBAAkB;YAIZ,gBAAgB;YAWhB,mBAAmB;CAOlC"}
+{"version":3,"file":"filesystem.d.ts","sourceRoot":"","sources":["../../../src/storage/filesystem.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,mBAAmB,EACxB,KAAK,qBAAqB,EAC3B,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EAAE,KAAK,wBAAwB,EAAE,MAAM,eAAe,CAAC;AAE9D,OAAO,EACL,KAAK,cAAc,EACnB,KAAK,SAAS,EAEd,KAAK,UAAU,EAChB,MAAM,gBAAgB,CAAC;AAKxB,OAAO,EAAE,KAAK,gBAAgB,EAAE,KAAK,aAAa,EAAE,MAAM,YAAY,CAAC;AAavE,qBAAa,iBAAkB,YAAW,aAAa,EAAE,gBAAgB;IACvE,OAAO,CAAC,QAAQ,CAAS;gBAEb,QAAQ,EAAE,MAAM;IAS5B,MAAM,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAK5C,MAAM,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU;IAS/C,GAAG,CAAC,SAAS,SAAS,UAAU,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC;IAgBnE,YAAY,CAAC,KAAK,EAAE,MAAM;IAKhC,mBAAmB,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAI1D,WAAW,CAAC,SAAS,SAAS,UAAU,EAC5C,KAAK,EAAE,MAAM,EACb,EAAE,EAAE,MAAM,GACT,OAAO,CAAC,SAAS,CAAC;IAIf,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU;IAgB9D,YAAY;IAeZ,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM;IA0BxC,qBAAqB,CACzB,KAAK,EAAE,MAAM,EACb,EAAE,EAAE,MAAM,EACV,UAAU,EAAE,SAAS,EAAE,EACvB,MAAM,EAAE,cAAc;IAuBlB,SAAS;IAWT,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,qBAAqB,CAAC;IASpD,cAAc,CAAC,IAAI,EAAE,MAAM;IAmB3B,WAAW,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,qBAAqB;IAqBpD,WAAW,CAAC,EAAE,EAAE,MAAM;IAYtB,kBAAkB,CACtB,EAAE,EAAE,MAAM,EACV,UAAU,EAAE,SAAS,CAAC,mBAAmB,CAAC,EAAE,EAC5C,MAAM,EAAE,cAAc,GACrB,OAAO,CAAC,IAAI,CAAC;IAqBV,+BAA+B,CACnC,KAAK,EAAE,wBAAwB,EAAE,GAChC,OAAO,CACR;QACE,UAAU,EAAE,MAAM,CAAC;QACnB,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,EAAE,MAAM,CAAC;QACf,WAAW,EAAE,MAAM,CAAC;QACpB,QAAQ,EAAE,MAAM,CAAC;KAClB,EAAE,CACJ;IA4CD,OAAO,CAAC,kBAAkB;IAI1B,OAAO,CAAC,kBAAkB;YAIZ,gBAAgB;YAWhB,mBAAmB;CAOlC"}

package/dist/src/storage/filesystem.js

@@ -22,11 +22,23 @@ export class FilesystemStorage {
         const documentExists = existsSync(this._buildDocumentPath(documentId));
         return Promise.resolve(documentExists);
     }
-    async create(documentId, document) {
+    create(documentId, document) {
         const documentPath = this._buildDocumentPath(documentId);
         writeFileSync(documentPath, stringify(document), {
             encoding: "utf-8",
         });
+        return Promise.resolve();
+    }
+    get(documentId) {
+        try {
+            const content = readFileSync(this._buildDocumentPath(documentId), {
+                encoding: "utf-8",
+            });
+            return Promise.resolve(JSON.parse(content));
+        }
+        catch (error) {
+            throw new Error(`Document with id ${documentId} not found`);
+        }
     }
     ////////////////////////////////
     // IDriveStorage
@@ -39,15 +51,7 @@ export class FilesystemStorage {
         return this.exists(id);
     }
     async getDocument(drive, id) {
-        try {
-            const content = readFileSync(this._buildDocumentPath(id), {
-                encoding: "utf-8",
-            });
-            return JSON.parse(content);
-        }
-        catch (error) {
-            throw new Error(`Document with id ${id} not found`);
-        }
+        return this.get(id);
     }
     async createDocument(drive, id, document) {
         const documentPath = this._buildDocumentPath(id);
@@ -113,18 +117,16 @@ export class FilesystemStorage {
         // get anything that starts with drive-
         const files = await fs.readdir(this.basePath, { withFileTypes: true });
         return (files
-            .filter((file) => file.name.startsWith("drive-"))
-            // remove drive- prefix and extension
-            .map((file) => file.name.replace("drive-", "").replace(".json", "")));
+            .filter((file) => file.name.startsWith("manifest-"))
+            // remove manifest- prefix and extension
+            .map((file) => file.name.replace("manifest-", "").replace(".json", "")));
     }
     async getDrive(id) {
         try {
-            const content = readFileSync(this._buildDrivePath(id), {
-                encoding: "utf-8",
-            });
-            return JSON.parse(content);
+            return await this.get(id);
         }
         catch (error) {
+            // preserve throwing a specialized error for drives
             throw new DriveNotFoundError(id);
         }
     }
@@ -140,10 +142,21 @@ export class FilesystemStorage {
         throw new Error(`Drive with slug ${slug} not found`);
     }
     async createDrive(id, drive) {
-        const drivePath = this._buildDrivePath(id);
-        writeFileSync(drivePath, stringify(drive), {
-            encoding: "utf-8",
-        });
+        // check if a drive with the same slug already exists
+        const slug = drive.initialState.state.global.slug;
+        if (slug) {
+            let existingDrive;
+            try {
+                existingDrive = await this.getDriveBySlug(slug);
+            }
+            catch {
+                // do nothing
+            }
+            if (existingDrive) {
+                throw new Error(`Drive with slug ${slug} already exists`);
+            }
+        }
+        await this.create(id, drive);
         // Initialize an empty manifest for the new drive
         await this.updateDriveManifest(id, { documentIds: [] });
     }
@@ -153,15 +166,13 @@ export class FilesystemStorage {
         // Delete each document from this drive (may not actually delete the file if shared with other drives)
         await Promise.all(documents.map((doc) => this.deleteDocument(id, doc)));
         // Delete the drive manifest and the drive itself
-        await fs.rm(this._buildManifestPath(id)).catch(() => {
-            /* ignore error if manifest doesn't exist */
-        });
-        await fs.rm(this._buildDrivePath(id));
+        await fs.rm(this._buildManifestPath(id));
+        await fs.rm(this._buildDocumentPath(id));
     }
     async addDriveOperations(id, operations, header) {
         const drive = await this.getDrive(id);
         const mergedOperations = mergeOperations(drive.operations, operations);
-        const drivePath = this._buildDrivePath(id);
+        const drivePath = this._buildDocumentPath(id);
         writeFileSync(drivePath, stringify({
             ...drive,
             ...header,
@@ -173,16 +184,13 @@ export class FilesystemStorage {
     async getSynchronizationUnitsRevision(units) {
         const results = await Promise.allSettled(units.map(async (unit) => {
             try {
-                const document = await (unit.documentId
-                    ? this.getDocument(unit.driveId, unit.documentId)
-                    : this.getDrive(unit.driveId));
+                const document = await this.get(unit.documentId);
                 if (!document) {
                     return undefined;
                 }
                 const operation = document.operations[unit.scope].at(-1);
                 if (operation) {
                     return {
-                        driveId: unit.driveId,
                         documentId: unit.documentId,
                         scope: unit.scope,
                         branch: unit.branch,
@@ -208,9 +216,6 @@ export class FilesystemStorage {
     _buildDocumentPath(documentId) {
         return `${this.basePath}/document-${documentId}.json`;
     }
-    _buildDrivePath(driveId) {
-        return `${this.basePath}/drive-${driveId}.json`;
-    }
     _buildManifestPath(driveId) {
         return `${this.basePath}/manifest-${driveId}.json`;
     }

package/dist/src/storage/ipfs.d.ts

@@ -8,6 +8,7 @@ export declare class IPFSStorage implements IStorage, IDocumentStorage {
     constructor(helia: Helia);
     exists(documentId: string): Promise<boolean>;
     create(documentId: string, document: PHDocument): Promise<void>;
+    get<TDocument extends PHDocument>(documentId: string): Promise<TDocument>;
     checkDocumentExists(drive: string, id: string): Promise<boolean>;
     getDocuments(drive: string): Promise<string[]>;
     getDocument<TDocument extends PHDocument>(drive: string, id: string): Promise<TDocument>;
@@ -22,7 +23,6 @@ export declare class IPFSStorage implements IStorage, IDocumentStorage {
     addDriveOperations(id: string, operations: Operation<DocumentDriveAction>[], header: DocumentHeader): Promise<void>;
     clearStorage(): Promise<void>;
     getSynchronizationUnitsRevision(units: SynchronizationUnitQuery[]): Promise<{
-        driveId: string;
         documentId: string;
         scope: string;
         branch: string;

package/dist/src/storage/ipfs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ipfs.d.ts","sourceRoot":"","sources":["../../../src/storage/ipfs.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,mBAAmB,EACxB,KAAK,qBAAqB,EAC3B,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EAAE,KAAK,wBAAwB,EAAE,MAAM,eAAe,CAAC;AAG9D,OAAO,EACL,KAAK,cAAc,EACnB,KAAK,SAAS,EAEd,KAAK,UAAU,EAChB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,OAAO,CAAC;AAEnC,OAAO,KAAK,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAO7D,qBAAa,WAAY,YAAW,QAAQ,EAAE,gBAAgB;IAC5D,OAAO,CAAC,EAAE,CAAM;gBAEJ,KAAK,EAAE,KAAK;IAQlB,MAAM,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAmB5C,MAAM,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAW/D,mBAAmB,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAIhE,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAK9C,WAAW,CAAC,SAAS,SAAS,UAAU,EAC5C,KAAK,EAAE,MAAM,EACb,EAAE,EAAE,MAAM,GACT,OAAO,CAAC,SAAS,CAAC;IAkBf,cAAc,CAClB,KAAK,EAAE,MAAM,EACb,EAAE,EAAE,MAAM,EACV,QAAQ,EAAE,UAAU,GACnB,OAAO,CAAC,IAAI,CAAC;IAaV,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAgCxD,qBAAqB,CAAC,SAAS,SAAS,UAAU,EACtD,KAAK,EAAE,MAAM,EACb,EAAE,EAAE,MAAM,EACV,UAAU,EAAE,SAAS,EAAE,EACvB,MAAM,EAAE,cAAc,GACrB,OAAO,CAAC,IAAI,CAAC;IAeV,SAAS,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAoB9B,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,qBAAqB,CAAC;IAepD,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,qBAAqB,CAAC;IAkB5D,WAAW,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC;IAcpE,WAAW,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA2BtC,kBAAkB,CACtB,EAAE,EAAE,MAAM,EACV,UAAU,EAAE,SAAS,CAAC,mBAAmB,CAAC,EAAE,EAC5C,MAAM,EAAE,cAAc,GACrB,OAAO,CAAC,IAAI,CAAC;IAcV,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAa7B,+BAA+B,CACnC,KAAK,EAAE,wBAAwB,EAAE,GAChC,OAAO,CACR;QACE,OAAO,EAAE,MAAM,CAAC;QAChB,UAAU,EAAE,MAAM,CAAC;QACnB,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,EAAE,MAAM,CAAC;QACf,WAAW,EAAE,MAAM,CAAC;QACpB,QAAQ,EAAE,MAAM,CAAC;KAClB,EAAE,CACJ;IAgDD,OAAO,CAAC,kBAAkB;IAI1B,OAAO,CAAC,eAAe;IAIvB,OAAO,CAAC,uBAAuB;YAIjB,gBAAgB;YAgBhB,mBAAmB;CASlC"}
+{"version":3,"file":"ipfs.d.ts","sourceRoot":"","sources":["../../../src/storage/ipfs.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,mBAAmB,EACxB,KAAK,qBAAqB,EAC3B,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EAAE,KAAK,wBAAwB,EAAE,MAAM,eAAe,CAAC;AAG9D,OAAO,EACL,KAAK,cAAc,EACnB,KAAK,SAAS,EAEd,KAAK,UAAU,EAChB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,OAAO,CAAC;AAEnC,OAAO,KAAK,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAO7D,qBAAa,WAAY,YAAW,QAAQ,EAAE,gBAAgB;IAC5D,OAAO,CAAC,EAAE,CAAM;gBAEJ,KAAK,EAAE,KAAK;IAQlB,MAAM,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAmB5C,MAAM,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAO/D,GAAG,CAAC,SAAS,SAAS,UAAU,EACpC,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,SAAS,CAAC;IAsBf,mBAAmB,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAIhE,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAK9C,WAAW,CAAC,SAAS,SAAS,UAAU,EAC5C,KAAK,EAAE,MAAM,EACb,EAAE,EAAE,MAAM,GACT,OAAO,CAAC,SAAS,CAAC;IAIf,cAAc,CAClB,KAAK,EAAE,MAAM,EACb,EAAE,EAAE,MAAM,EACV,QAAQ,EAAE,UAAU,GACnB,OAAO,CAAC,IAAI,CAAC;IAaV,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAgCxD,qBAAqB,CAAC,SAAS,SAAS,UAAU,EACtD,KAAK,EAAE,MAAM,EACb,EAAE,EAAE,MAAM,EACV,UAAU,EAAE,SAAS,EAAE,EACvB,MAAM,EAAE,cAAc,GACrB,OAAO,CAAC,IAAI,CAAC;IAeV,SAAS,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAoB9B,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,qBAAqB,CAAC;IAepD,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,qBAAqB,CAAC;IAkB5D,WAAW,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC;IAcpE,WAAW,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA2BtC,kBAAkB,CACtB,EAAE,EAAE,MAAM,EACV,UAAU,EAAE,SAAS,CAAC,mBAAmB,CAAC,EAAE,EAC5C,MAAM,EAAE,cAAc,GACrB,OAAO,CAAC,IAAI,CAAC;IAcV,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAa7B,+BAA+B,CACnC,KAAK,EAAE,wBAAwB,EAAE,GAChC,OAAO,CACR;QACE,UAAU,EAAE,MAAM,CAAC;QACnB,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,EAAE,MAAM,CAAC;QACf,WAAW,EAAE,MAAM,CAAC;QACpB,QAAQ,EAAE,MAAM,CAAC;KAClB,EAAE,CACJ;IA4CD,OAAO,CAAC,kBAAkB;IAI1B,OAAO,CAAC,eAAe;IAIvB,OAAO,CAAC,uBAAuB;YAIjB,gBAAgB;YAgBhB,mBAAmB;CASlC"}

package/dist/src/storage/ipfs.js

@@ -30,19 +30,9 @@ export class IPFSStorage {
     async create(documentId, document) {
         await this.fs.writeBytes(new TextEncoder().encode(stringify(document)), this._buildDocumentPath(documentId));
     }
-    ////////////////////////////////s
-    // IDriveStorage
-    ////////////////////////////////
-    async checkDocumentExists(drive, id) {
-        return this.exists(id);
-    }
-    async getDocuments(drive) {
-        const manifest = await this.getDriveManifest(drive);
-        return manifest.documentIds;
-    }
-    async getDocument(drive, id) {
+    async get(documentId) {
         try {
-            const documentPath = this._buildDocumentPath(id);
+            const documentPath = this._buildDocumentPath(documentId);
             const chunks = [];
             for await (const chunk of this.fs.cat(documentPath)) {
                 chunks.push(chunk);
@@ -52,9 +42,22 @@ export class IPFSStorage {
             return JSON.parse(content);
         }
         catch (error) {
-            throw new Error(`Document with id ${id} not found`);
+            throw new Error(`Document with id ${documentId} not found`);
         }
     }
+    ////////////////////////////////s
+    // IDriveStorage
+    ////////////////////////////////
+    async checkDocumentExists(drive, id) {
+        return this.exists(id);
+    }
+    async getDocuments(drive) {
+        const manifest = await this.getDriveManifest(drive);
+        return manifest.documentIds;
+    }
+    async getDocument(drive, id) {
+        return this.get(id);
+    }
     async createDocument(drive, id, document) {
         await this.create(id, document);
         // Update the drive manifest to include this document
@@ -208,16 +211,13 @@ export class IPFSStorage {
     async getSynchronizationUnitsRevision(units) {
         const results = await Promise.allSettled(units.map(async (unit) => {
             try {
-                const document = await (unit.documentId
-                    ? this.getDocument(unit.driveId, unit.documentId)
-                    : this.getDrive(unit.driveId));
+                const document = await this.get(unit.documentId);
                 if (!document) {
                     return undefined;
                 }
                 const operation = document.operations[unit.scope].at(-1);
                 if (operation) {
                     return {
-                        driveId: unit.driveId,
                         documentId: unit.documentId,
                         scope: unit.scope,
                         branch: unit.branch,

package/dist/src/storage/memory.d.ts

@@ -4,16 +4,14 @@ import { type DocumentHeader, type Operation, type OperationFromDocument, type P
 import { type IDocumentStorage, type IDriveStorage } from "./types.js";
 export declare class MemoryStorage implements IDriveStorage, IDocumentStorage {
     private documents;
-    private drives;
     private driveManifests;
-    private slugToDriveId;
     constructor();
     exists(documentId: string): Promise<boolean>;
     create(documentId: string, document: PHDocument): Promise<void>;
+    get<TDocument extends PHDocument>(documentId: string): Promise<TDocument>;
     checkDocumentExists(drive: string, id: string): Promise<boolean>;
     getDocuments(drive: string): Promise<string[]>;
     getDocument<TDocument extends PHDocument>(driveId: string, id: string): Promise<TDocument>;
-    saveDocument(drive: string, id: string, document: PHDocument): Promise<void>;
     clearStorage(): Promise<void>;
     createDocument(drive: string, id: string, document: PHDocument): Promise<void>;
     addDocumentOperations(drive: string, id: string, operations: Operation[], header: DocumentHeader): Promise<void>;
@@ -25,7 +23,6 @@ export declare class MemoryStorage implements IDriveStorage, IDocumentStorage {
     addDriveOperations(id: string, operations: OperationFromDocument<DocumentDriveDocument>[], header: DocumentHeader): Promise<void>;
     deleteDrive(id: string): Promise<void>;
     getSynchronizationUnitsRevision(units: SynchronizationUnitQuery[]): Promise<{
-        driveId: string;
         documentId: string;
         scope: string;
         branch: string;

package/dist/src/storage/memory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"memory.d.ts","sourceRoot":"","sources":["../../../src/storage/memory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AAE7E,OAAO,EAAE,KAAK,wBAAwB,EAAE,MAAM,eAAe,CAAC;AAE9D,OAAO,EACL,KAAK,cAAc,EACnB,KAAK,SAAS,EACd,KAAK,qBAAqB,EAE1B,KAAK,UAAU,EAChB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,KAAK,gBAAgB,EAAE,KAAK,aAAa,EAAE,MAAM,YAAY,CAAC;AAMvE,qBAAa,aAAc,YAAW,aAAa,EAAE,gBAAgB;IACnE,OAAO,CAAC,SAAS,CAA6B;IAC9C,OAAO,CAAC,MAAM,CAAwC;IACtD,OAAO,CAAC,cAAc,CAAgC;IACtD,OAAO,CAAC,aAAa,CAA8B;;IAYnD,MAAM,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAI5C,MAAM,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU;IAU/C,mBAAmB,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAIhE,YAAY,CAAC,KAAK,EAAE,MAAM;IAKpB,WAAW,CAAC,SAAS,SAAS,UAAU,EAC5C,OAAO,EAAE,MAAM,EACf,EAAE,EAAE,MAAM,GACT,OAAO,CAAC,SAAS,CAAC;IASf,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU;IAS5D,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAO7B,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU;IAS9D,qBAAqB,CACzB,KAAK,EAAE,MAAM,EACb,EAAE,EAAE,MAAM,EACV,UAAU,EAAE,SAAS,EAAE,EACvB,MAAM,EAAE,cAAc,GACrB,OAAO,CAAC,IAAI,CAAC;IAeV,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM;IAcxC,SAAS;IAIT,QAAQ,CAAC,EAAE,EAAE,MAAM;IAQnB,cAAc,CAAC,IAAI,EAAE,MAAM;IAQ3B,WAAW,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,qBAAqB;IAYpD,kBAAkB,CACtB,EAAE,EAAE,MAAM,EACV,UAAU,EAAE,qBAAqB,CAAC,qBAAqB,CAAC,EAAE,EAC1D,MAAM,EAAE,cAAc,GACrB,OAAO,CAAC,IAAI,CAAC;IAcV,WAAW,CAAC,EAAE,EAAE,MAAM;IAmCtB,+BAA+B,CACnC,KAAK,EAAE,wBAAwB,EAAE,GAChC,OAAO,CACR;QACE,OAAO,EAAE,MAAM,CAAC;QAChB,UAAU,EAAE,MAAM,CAAC;QACnB,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,EAAE,MAAM,CAAC;QACf,WAAW,EAAE,MAAM,CAAC;QACpB,QAAQ,EAAE,MAAM,CAAC;KAClB,EAAE,CACJ;IAgDD,OAAO,CAAC,gBAAgB;IAQxB,OAAO,CAAC,mBAAmB;CAG5B"}
+{"version":3,"file":"memory.d.ts","sourceRoot":"","sources":["../../../src/storage/memory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AAE7E,OAAO,EAAE,KAAK,wBAAwB,EAAE,MAAM,eAAe,CAAC;AAE9D,OAAO,EACL,KAAK,cAAc,EACnB,KAAK,SAAS,EACd,KAAK,qBAAqB,EAE1B,KAAK,UAAU,EAChB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,KAAK,gBAAgB,EAAE,KAAK,aAAa,EAAE,MAAM,YAAY,CAAC;AAMvE,qBAAa,aAAc,YAAW,aAAa,EAAE,gBAAgB;IACnE,OAAO,CAAC,SAAS,CAA6B;IAC9C,OAAO,CAAC,cAAc,CAAgC;;IAWtD,MAAM,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAM5C,MAAM,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU;IAM/C,GAAG,CAAC,SAAS,SAAS,UAAU,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC;IAkBzE,mBAAmB,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAIhE,YAAY,CAAC,KAAK,EAAE,MAAM;IAK1B,WAAW,CAAC,SAAS,SAAS,UAAU,EACtC,OAAO,EAAE,MAAM,EACf,EAAE,EAAE,MAAM,GACT,OAAO,CAAC,SAAS,CAAC;IAIf,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAK7B,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU;IAS9D,qBAAqB,CACzB,KAAK,EAAE,MAAM,EACb,EAAE,EAAE,MAAM,EACV,UAAU,EAAE,SAAS,EAAE,EACvB,MAAM,EAAE,cAAc,GACrB,OAAO,CAAC,IAAI,CAAC;IAeV,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM;IAcxC,SAAS;IAIT,QAAQ,CAAC,EAAE,EAAE,MAAM;IAQnB,cAAc,CAAC,IAAI,EAAE,MAAM;IAW3B,WAAW,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,qBAAqB;IAqBpD,kBAAkB,CACtB,EAAE,EAAE,MAAM,EACV,UAAU,EAAE,qBAAqB,CAAC,qBAAqB,CAAC,EAAE,EAC1D,MAAM,EAAE,cAAc,GACrB,OAAO,CAAC,IAAI,CAAC;IAcV,WAAW,CAAC,EAAE,EAAE,MAAM;IA4BtB,+BAA+B,CACnC,KAAK,EAAE,wBAAwB,EAAE,GAChC,OAAO,CACR;QACE,UAAU,EAAE,MAAM,CAAC;QACnB,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,EAAE,MAAM,CAAC;QACf,WAAW,EAAE,MAAM,CAAC;QACpB,QAAQ,EAAE,MAAM,CAAC;KAClB,EAAE,CACJ;IA4CD,OAAO,CAAC,gBAAgB;IAQxB,OAAO,CAAC,mBAAmB;CAG5B"}

package/dist/src/storage/memory.js

@@ -2,24 +2,32 @@ import { DriveNotFoundError } from "#server/error";
 import { mergeOperations } from "#utils/misc";
 export class MemoryStorage {
     documents;
-    drives;
     driveManifests;
-    slugToDriveId = {};
     constructor() {
         this.documents = {};
-        this.drives = {};
         this.driveManifests = {};
     }
     ////////////////////////////////
     // IDocumentStorage
     ////////////////////////////////
     exists(documentId) {
-        return Promise.resolve(!!this.documents[documentId]);
+        return Promise.resolve(!!this.documents[documentId] || !!this.documents[`drive/${documentId}`]);
     }
     create(documentId, document) {
         this.documents[documentId] = document;
         return Promise.resolve();
     }
+    get(documentId) {
+        const document = this.documents[documentId];
+        if (!document) {
+            const drive = this.documents[`drive/${documentId}`];
+            if (drive) {
+                return Promise.resolve(drive);
+            }
+            throw new Error(`Document with id ${documentId} not found`);
+        }
+        return Promise.resolve(document);
+    }
     ////////////////////////////////
     // IDriveStorage
     ////////////////////////////////
@@ -30,25 +38,12 @@ export class MemoryStorage {
         const manifest = this.getDriveManifest(drive);
         return Promise.resolve([...manifest.documentIds]);
     }
-    async getDocument(driveId, id) {
-        const document = this.documents[id];
-        if (!document) {
-            throw new Error(`Document with id ${id} not found`);
-        }
-        return document;
-    }
-    async saveDocument(drive, id, document) {
-        this.documents[id] = document;
-        // Update the drive manifest
-        const manifest = this.getDriveManifest(drive);
-        manifest.documentIds.add(id);
-        this.updateDriveManifest(drive, manifest);
+    getDocument(driveId, id) {
+        return this.get(id);
     }
     async clearStorage() {
         this.documents = {};
-        this.drives = {};
         this.driveManifests = {};
-        this.slugToDriveId = {};
     }
     async createDocument(drive, id, document) {
         await this.create(id, document);
@@ -82,35 +77,47 @@ export class MemoryStorage {
         delete this.documents[id];
     }
     async getDrives() {
-        return Object.keys(this.drives);
+        return Object.keys(this.driveManifests);
     }
     async getDrive(id) {
-        const drive = this.drives[id];
+        const drive = this.documents[`drive/${id}`];
         if (!drive) {
             throw new DriveNotFoundError(id);
         }
         return drive;
     }
     async getDriveBySlug(slug) {
-        const driveId = this.slugToDriveId[slug];
-        if (!driveId) {
-            throw new Error(`Drive with slug ${slug} not found`);
+        for (const driveId of Object.keys(this.driveManifests)) {
+            const drive = this.documents[`drive/${driveId}`];
+            if (drive.initialState.state.global.slug === slug) {
+                return drive;
+            }
         }
-        return this.getDrive(driveId);
+        throw new Error(`Drive with slug ${slug} not found`);
     }
     async createDrive(id, drive) {
-        this.drives[id] = drive;
-        // Initialize an empty manifest for the new drive
-        this.updateDriveManifest(id, { documentIds: new Set() });
-        const { slug } = drive.initialState.state.global;
+        // check if a drive with the same slug already exists
+        const slug = drive.initialState.state.global.slug;
         if (slug) {
-            this.slugToDriveId[slug] = id;
+            let existingDrive;
+            try {
+                existingDrive = await this.getDriveBySlug(slug);
+            }
+            catch {
+                // do nothing
+            }
+            if (existingDrive) {
+                throw new Error(`Drive with slug ${slug} already exists`);
+            }
         }
+        await this.create(`drive/${id}`, drive);
+        // Initialize an empty manifest for the new drive
+        this.updateDriveManifest(id, { documentIds: new Set() });
     }
     async addDriveOperations(id, operations, header) {
         const drive = await this.getDrive(id);
         const mergedOperations = mergeOperations(drive.operations, operations);
-        this.drives[id] = {
+        this.documents[`drive/${id}`] = {
             ...drive,
             ...header,
             operations: mergedOperations,
@@ -135,27 +142,18 @@ export class MemoryStorage {
         }));
         // Delete the drive manifest and the drive itself
         delete this.driveManifests[id];
-        delete this.drives[id];
-        // Clean up slug mapping if needed
-        for (const [slug, driveId] of Object.entries(this.slugToDriveId)) {
-            if (driveId === id) {
-                delete this.slugToDriveId[slug];
-            }
-        }
+        delete this.documents[id];
     }
     async getSynchronizationUnitsRevision(units) {
         const results = await Promise.allSettled(units.map(async (unit) => {
             try {
-                const document = await (unit.documentId
-                    ? this.getDocument(unit.driveId, unit.documentId)
-                    : this.getDrive(unit.driveId));
+                const document = await this.get(unit.documentId);
                 if (!document) {
                     return undefined;
                 }
                 const operation = document.operations[unit.scope].at(-1);
                 if (operation) {
                     return {
-                        driveId: unit.driveId,
                         documentId: unit.documentId,
                         scope: unit.scope,
                         branch: unit.branch,

package/dist/src/storage/prisma/factory.d.ts

@@ -1,8 +1,9 @@
 import { PrismaStorage } from "#storage/prisma/index";
+import { IOperationsCache } from "#storage/types";
 export declare class PrismaStorageFactory {
-    private readonly dbUrl;
-    private prisma;
-    constructor(dbUrl: string);
+    private readonly prisma;
+    private readonly cache;
+    constructor(dbUrl: string, cache: IOperationsCache);
     build(): PrismaStorage;
 }
 //# sourceMappingURL=factory.d.ts.map

package/dist/src/storage/prisma/factory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../../../src/storage/prisma/factory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAItD,qBAAa,oBAAoB;IAGnB,OAAO,CAAC,QAAQ,CAAC,KAAK;IAFlC,OAAO,CAAC,MAAM,CAAoC;gBAErB,KAAK,EAAE,MAAM;IAU1C,KAAK;CAGN"}
+{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../../../src/storage/prisma/factory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAIlD,qBAAa,oBAAoB;IAC/B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAoC;IAC3D,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAmB;gBAE7B,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,gBAAgB;IAWlD,KAAK;CAGN"}

package/dist/src/storage/prisma/factory.js

@@ -2,19 +2,19 @@ import { PrismaStorage } from "#storage/prisma/index";
 import Prisma from "@prisma/client";
 const PrismaClient = Prisma.PrismaClient;
 export class PrismaStorageFactory {
-    dbUrl;
     prisma;
-    constructor(dbUrl) {
-        this.dbUrl = dbUrl;
+    cache;
+    constructor(dbUrl, cache) {
+        this.cache = cache;
         this.prisma = new PrismaClient({
             datasources: {
                 db: {
-                    url: this.dbUrl,
+                    url: dbUrl,
                 },
             },
         });
     }
     build() {
-        return new PrismaStorage(this.prisma);
+        return new PrismaStorage(this.prisma, this.cache);
     }
 }