💄

Author: jeanp413

components/server/src/code-sync/code-sync-service.ts

@@ -260,7 +260,7 @@ export class CodeSyncService {
                 const userId = req.user.id;
                 const contentType = req.headers["content-type"] || "*/*";
                 let oldRevList: string[] | undefined;
-                const rev = await this.db.insert(
+                const newRev = await this.db.insert(
                     userId,
                     resourceKey,
                     async (rev, oldRevs) => {
@@ -294,13 +294,15 @@ export class CodeSyncService {
                 );
                 if (oldRevList && oldRevList.length > 0) {
                     // sync delete old revs from storage
-                    this.deleteObjects(userId, resourceKey, oldRevList).catch((e) => {});
+                    Promise.allSettled(oldRevList.map((rev) => this.deleteResource(userId, resourceKey, rev))).catch(
+                        () => {},
+                    );
                 }
-                if (!rev) {
+                if (!newRev) {
                     res.sendStatus(isEditSessionsResource ? 400 : 412);
                     return;
                 }
-                res.setHeader("etag", rev);
+                res.setHeader("etag", newRev);
                 res.sendStatus(200);
                 return;
             },
@@ -342,30 +344,7 @@ export class CodeSyncService {
             }
 
             const userId = req.user.id;
-            await this.db.deleteResource(userId, resource, ref, async (ref?: string) => {
-                const request = new DeleteRequest();
-                request.setOwnerId(userId);
-                if (ref) {
-                    request.setExact(toObjectName(resource, ref));
-                } else {
-                    request.setPrefix(getNamePrefix("editSessions") + resource);
-                }
-                try {
-                    const blobsClient = this.blobsProvider.getDefault();
-                    await util.promisify(blobsClient.delete.bind(blobsClient))(request);
-                } catch (e) {
-                    if (e.code === status.NOT_FOUND) {
-                        return;
-                    }
-                    if (ref) {
-                        log.error({ userId }, "code sync: failed to delete obj", e, {
-                            object: toObjectName(resource, ref),
-                        });
-                    } else {
-                        log.error({ userId }, "code sync: failed to delete", e);
-                    }
-                }
-            });
+            await this.deleteResource(userId, resource, ref);
             res.sendStatus(200);
         });
 
@@ -408,32 +387,35 @@ export class CodeSyncService {
         return JSON.stringify(extensions);
     }
 
-    protected async deleteObjects(userId: string, resourceKey: ServerResource, revs: string[]) {
-        const tasks = revs.map((rev) =>
-            this.db
-                .deleteResource(userId, resourceKey, rev, async (rev?: string) => {
-                    const obj = toObjectName(resourceKey, rev!);
-                    try {
-                        const request = new DeleteRequest();
-                        request.setOwnerId(userId);
-                        request.setExact(obj);
-                        const blobsClient = this.blobsProvider.getDefault();
-                        await util.promisify<DeleteRequest, DeleteResponse>(blobsClient.delete.bind(blobsClient))(
-                            request,
-                        );
-                    } catch (err) {
-                        if (err.code === status.NOT_FOUND) {
-                            return;
-                        }
-                        log.error({ userId }, "code sync: failed to delete obj", err, { object: obj });
-                        throw err;
+    protected async deleteResource(userId: string, resourceKey: ServerResource, rev?: string) {
+        try {
+            await this.db.deleteResource(userId, resourceKey, rev, async (rev?: string) => {
+                try {
+                    const request = new DeleteRequest();
+                    request.setOwnerId(userId);
+                    if (rev) {
+                        request.setExact(toObjectName(resourceKey, rev));
+                    } else {
+                        request.setPrefix(getNamePrefix("resourceKey") + resourceKey);
                     }
-                })
-                .catch((err) => {
-                    log.error({ userId }, "code sync: failed to delete", err);
-                }),
-        );
-        await Promise.allSettled(tasks);
-        return;
+                    const blobsClient = this.blobsProvider.getDefault();
+                    await util.promisify<DeleteRequest, DeleteResponse>(blobsClient.delete.bind(blobsClient))(request);
+                } catch (e) {
+                    if (e.code === status.NOT_FOUND) {
+                        return;
+                    }
+                    throw e;
+                }
+            });
+        } catch (e) {
+            if (rev) {
+                log.error({ userId }, "code sync: failed to delete obj", e, {
+                    object: toObjectName(resourceKey, rev),
+                });
+            } else {
+                log.error({ userId }, "code sync: failed to delete", e);
+            }
+            throw e;
+        }
     }
 }