eduvia/workavia-drive
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

🩹 backend,oo: fixed begin editing session process (#525)

Browse Source
This commit is contained in:
Eric Doughty-Papassideris
2024-09-19 00:55:55 +02:00
parent 9db0fddc98
commit c23984355d
5 changed files with 140 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tdrive/connectors/onlyoffice-connector/src/controllers/backend-callbacks.controller.ts
+51 -39
View File
@@ -1,12 +1,21 @@
import { Request, Response } from 'express';
import logger from '@/lib/logger';
import { createSingleProcessorLock } from '@/lib/single-processor-lock';
import onlyofficeService, { Callback, CommandError, ErrorCode } from '@/services/onlyoffice.service';
import driveService from '@/services/drive.service';
import forgottenProcessorService from '@/services/forgotten-processor.service';
import { IHealthProvider, registerHealthProvider } from '@/services/health-providers.service';
interface RequestQuery {
editing_session_key: string;
}
const keyCheckLock = createSingleProcessorLock<[status: number, body: unknown]>();
registerHealthProvider({
async getHealthData() {
return { checks: { locks: keyCheckLock.getWorstStats() } };
},
});
/**
* These routes are called by Twake Drive backend, for ex. before editing or retreiving a file,
@@ -26,51 +35,54 @@ export default class TwakeDriveBackendCallbackController {
* - `{ error: number }`: there was an error retreiving the status of the key, http status `!= 200`
*/
public async checkSessionStatus(req: Request<RequestQuery>, res: Response): Promise<void> {
try {
const forgottenURL = await onlyofficeService.getForgotten(req.params.editing_session_key);
const [status, body] = await keyCheckLock.runWithLock(req.params.editing_session_key, async () => {
try {
await forgottenProcessorService.processForgottenFile(req.params.editing_session_key, forgottenURL);
} catch (error) {
logger.error(`processForgottenFile failed`, { error });
return void res.status(502).send({ error: -57650 });
const forgottenURL = await onlyofficeService.getForgotten(req.params.editing_session_key);
try {
await forgottenProcessorService.processForgottenFile(req.params.editing_session_key, forgottenURL);
} catch (error) {
logger.error(`processForgottenFile failed`, { error });
return [502, { error: -57650 }];
}
return [200, { status: 'updated' }];
} catch (e) {
if (!(e instanceof CommandError && e.errorCode == ErrorCode.KEY_MISSING_OR_DOC_NOT_FOUND)) {
logger.error(`getForgotten failed`, { error: e });
return [e instanceof CommandError ? 502 : 500, { error: -57651 }];
}
}
return void res.send({ status: 'updated' });
} catch (e) {
if (!(e instanceof CommandError && e.errorCode == ErrorCode.KEY_MISSING_OR_DOC_NOT_FOUND)) {
logger.error(`getForgotten failed`, { error: e });
return void res.status(e instanceof CommandError ? 502 : 500).send({ error: -57651 });
const info = await onlyofficeService.getInfoAndWaitForCallbackUnsafe(req.params.editing_session_key);
if (info.error === ErrorCode.KEY_MISSING_OR_DOC_NOT_FOUND) {
// just start using it
return [200, { status: 'unknown' }];
}
}
const info = await onlyofficeService.getInfoAndWaitForCallbackUnsafe(req.params.editing_session_key);
if (info.error === ErrorCode.KEY_MISSING_OR_DOC_NOT_FOUND) {
// just start using it
return void res.send({ status: 'unknown' });
}
if (info.error !== undefined) {
logger.error(`getInfo failed`, { error: info });
return void res.status(502).send({ error: -57652 });
}
switch (info.result.status) {
case Callback.Status.BEING_EDITED:
case Callback.Status.BEING_EDITED_BUT_IS_SAVED:
// use it as is
return void res.send({ status: 'live' });
if (info.error !== undefined) {
logger.error(`getInfo failed`, { error: info });
return [502, { error: -57652 }];
}
switch (info.result.status) {
case Callback.Status.BEING_EDITED:
case Callback.Status.BEING_EDITED_BUT_IS_SAVED:
// use it as is
return [200, { status: 'live' }];
case Callback.Status.CLOSED_WITHOUT_CHANGES:
// just cancel it
return void res.send({ status: 'expired' });
case Callback.Status.CLOSED_WITHOUT_CHANGES:
// just cancel it
return [200, { status: 'expired' }];
case Callback.Status.ERROR_FORCE_SAVING:
case Callback.Status.ERROR_SAVING:
return void res.status(502).send({ error: info.result.status });
case Callback.Status.ERROR_FORCE_SAVING:
case Callback.Status.ERROR_SAVING:
return [502, { error: info.result.status }];
case Callback.Status.READY_FOR_SAVING:
// upload it, have to do it here for correct user stored in url in OO
await driveService.endEditing(req.params.editing_session_key, info.result.url);
return void res.send({ status: 'updated' });
case Callback.Status.READY_FOR_SAVING:
// upload it, have to do it here for correct user stored in url in OO
await driveService.endEditing(req.params.editing_session_key, info.result.url);
return [200, { status: 'updated' }];
default:
throw new Error(`Unexpected callback status: ${JSON.stringify(info.result)}`);
}
default:
throw new Error(`Unexpected callback status: ${JSON.stringify(info.result)}`);
}
});
await res.status(status).send(body);
}
}
tdrive/connectors/onlyoffice-connector/src/controllers/onlyoffice.controller.ts
+8 -7
View File
@@ -73,13 +73,6 @@ class OnlyOfficeController {
const officeTokenPayload = jwt.verify(token, CREDENTIALS_SECRET) as OfficeToken;
const { preview, /* company_id, file_id, user_id, drive_file_id, */ in_page_token /* editing_session_key */ } = officeTokenPayload;
// Ignore errors generated by pending request
// try-catch not needed because it is async
// there may be later reasons to wait for callbacks
// to process and eventually respond accordingly to
// OO an error for certain statuses
void OnlyOffice.default.ooCallbackCalled(req.body); // has to be single thread per key
// check token is an in_page_token and allow save
if (!in_page_token) throw new Error('OO Callback invalid token, must be a in_page_token');
if (preview) throw new Error('OO Callback invalid token, must not be a preview token for save operation');
@@ -125,6 +118,14 @@ class OnlyOfficeController {
`OO Callback unexpected status field: ${OnlyOffice.Callback.StatusToString(req.body.status)} in ${JSON.stringify(req.body)}`,
);
}
// Ignore errors generated by pending request
// try-catch not needed because it is async
// there may be later reasons to wait for callbacks
// to process and eventually respond accordingly to
// OO an error for certain statuses
void OnlyOffice.default.ooCallbackCalled(req.body); // has to be single thread per key
return respondToOO(0);
} catch (error) {
logger.error(`OO Callback root error`, { error });