fix saving into db

Author: davwas

apps/server/src/modules/tldraw/entities/tldraw-drawing.entity.ts

@@ -30,7 +30,7 @@ export class TldrawDrawing {
 	version: string;
 
 	@Property({ nullable: false })
-	value: string;
+	value: Buffer;
 
 	@Property({ nullable: true })
 	clock?: number;
@@ -48,6 +48,6 @@ export interface TldrawDrawingProps {
 	version: string;
 	clock?: number;
 	action?: string;
-	value: string;
+	value: Buffer;
 	part?: number;
 }

apps/server/src/modules/tldraw/factory/tldraw.factory.ts

@@ -7,7 +7,7 @@ export const tldrawEntityFactory = BaseFactory.define<TldrawDrawing, TldrawDrawi
 		return {
 			_id: 'test-id',
 			docName: 'test-name',
-			value: 'test-value',
+			value: Buffer.from('test'),
 			version: `test-version-${sequence}`,
 		};
 	}

apps/server/src/modules/tldraw/repo/mongodb-adapter.ts

@@ -16,22 +16,49 @@ export class MongodbAdapter {
 		this.collectionName = this.configService.get<string>('TLDRAW_DB_COLLECTION_NAME') ?? 'drawings';
 	}
 
+	/**
+	 * Apply a $query and get one document from MongoDB.
+	 * @param {object} query
+	 * @returns {Promise<TldrawDrawing | null>}
+	 */
 	get(query: object): Promise<TldrawDrawing | null> {
 		const collection = this.getCollection();
 		return collection.findOne<TldrawDrawing>(query, { allowDiskUse: true });
 	}
 
-	async put(query: object, values: object) {
+	/**
+	 * Store one document in MongoDB.
+	 * @param {object} query
+	 * @param {object} values
+	 * @returns {Promise<object>} Stored document
+	 */
+	async put(query: object, values: object): Promise<TldrawDrawing | null> {
 		const collection = this.getCollection();
 		await collection.updateOne(query, { $set: values }, { upsert: true });
+		return this.get(query);
 	}
 
-	async del(query: object) {
+	/**
+	 * Removes all documents that fit the $query
+	 * @param {object} query
+	 * @returns {Promise<object>} Contains status of the operation
+	 */
+	del(query: object): Promise<object> {
 		const collection = this.getCollection();
-		await collection.deleteMany(query);
+		const bulk = collection.initializeOrderedBulkOp();
+		bulk.find(query).delete();
+		return bulk.execute();
 	}
 
-	readAsCursor(query: object, opts: object = {}) {
+	/**
+	 * Get all or at least $opts.limit documents that fit the $query.
+	 * @param {object} query
+	 * @param {object} [opts]
+	 * @param {number} [opts.limit]
+	 * @param {boolean} [opts.reverse]
+	 * @returns {Promise<Array<object>>}
+	 */
+	readAsCursor(query: object, opts: object = {}): Promise<TldrawDrawing[]> {
 		// eslint-disable-next-line @typescript-eslint/ban-ts-comment
 		// @ts-ignore
 		const { limit = 0, reverse = false } = opts;
@@ -44,6 +71,21 @@ export class MongodbAdapter {
 		return curs.toArray();
 	}
 
+	/**
+	 * Close connection to MongoDB instance.
+	 */
+	async close() {
+		await this.orm.close();
+	}
+
+	/**
+	 * Delete database
+	 */
+	async flush() {
+		await this.getCollection().drop();
+		await this.close();
+	}
+
 	getCollection() {
 		return this.em.getCollection(this.collectionName);
 	}

apps/server/src/modules/tldraw/repo/utils.ts

@@ -97,10 +97,10 @@ const convertMongoUpdates = (docs: TldrawDrawing[]) => {
 		if (!doc.part) {
 			// eslint-disable-next-line @typescript-eslint/ban-ts-comment
 			// @ts-ignore
-			updates.push(doc.value);
+			updates.push(doc.value.buffer);
 		} else if (doc.part === 1) {
 			// merge the docs together that got split because of mongodb size limits
-			const parts = [Buffer.from(doc.value)];
+			const parts = [Buffer.from(doc.value.buffer)];
 			let j;
 			let currentPartId: number | undefined = doc.part;
 			// eslint-disable-next-line no-plusplus
@@ -113,7 +113,7 @@ const convertMongoUpdates = (docs: TldrawDrawing[]) => {
 					if (currentPartId !== part.part - 1) {
 						throw new Error('Couldnt merge updates together because a part is missing!');
 					}
-					parts.push(Buffer.from(part.value));
+					parts.push(Buffer.from(part.value.buffer));
 					currentPartId = part.part;
 				} else {
 					break;

apps/server/src/modules/tldraw/repo/y-mongodb.ts

@@ -65,7 +65,7 @@ export class YMongodb {
 		};
 	}
 
-	public async createIndex(): Promise<void> {
+	async createIndex(): Promise<void> {
 		const collection = this.adapter.getCollection();
 		await collection.createIndex({
 			version: 1,