@social-mail/social-mail-web-server 1.14.46 → 1.14.49

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -14,7 +14,7 @@ export default async function seedUI(config) {
14
14
  await config.saveVersion(UIPackageConfig, {
15
15
  package: "@social-mail/social-mail-client",
16
16
  view: "dist/web/AppIndex",
17
- version: "1.10.84"
17
+ version: "1.10.87"
18
18
  });
19
19
  await config.saveVersion(WebComponentsPackageConfig, {
20
20
  package: "@social-mail/web-components",
@@ -1 +1 @@
1
- {"version":3,"file":"FileConversionService.d.ts","sourceRoot":"","sources":["../../../../src/server/services/convert/FileConversionService.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,oDAAoD,CAAC;AAC/E,OAAO,OAAO,MAAM,iCAAiC,CAAC;AAYtD,OAAO,OAAO,MAAM,6CAA6C,CAAC;AAGlE,UAAU,sBAAsB;IAC5B,OAAO,EAAE,OAAO,CAAC;IACjB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,GAAG,CAAC,EAAE,MAAM,CAAC;CAChB;AAyCD,MAAM,CAAC,OAAO,OAAO,qBAAqB;IAGtC,OAAO,CAAC,eAAe,CAAkB;IAGzC,OAAO,CAAC,YAAY,CAAe;IAE7B,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,EAAE,QAAiB,EAAE,YAAqB,EAAE,GAAI,KAAK,EAAE;;;KAAK;IAkBvG,WAAW,CAAC,MAAM,EAAE,SAAS;IAa7B,eAAe,CAAC,IAAI,EAAE,MAAM;IAY5B,SAAS,CAAC,GAAG,EAAE,SAAS;IASxB,qBAAqB,CAAC,EACxB,OAAO,EACP,aAAa,EACb,IAAI,EACJ,QAAQ,EACR,GAA6E,EAC7E,YAAY,EACf,EAAE,sBAAsB,GAAI,OAAO,CAAC,SAAS,CAAC;IAoCzC,mBAAmB,CAAC,OAAO,EAAE,OAAO,EAAE,aAAa,CAAC,EAAE,MAAM;CAerE"}
1
+ {"version":3,"file":"FileConversionService.d.ts","sourceRoot":"","sources":["../../../../src/server/services/convert/FileConversionService.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,oDAAoD,CAAC;AAC/E,OAAO,OAAO,MAAM,iCAAiC,CAAC;AAWtD,OAAO,OAAO,MAAM,6CAA6C,CAAC;AAGlE,UAAU,sBAAsB;IAC5B,OAAO,EAAE,OAAO,CAAC;IACjB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,GAAG,CAAC,EAAE,MAAM,CAAC;CAChB;AAyCD,MAAM,CAAC,OAAO,OAAO,qBAAqB;IAGtC,OAAO,CAAC,eAAe,CAAkB;IAGzC,OAAO,CAAC,YAAY,CAAe;IAE7B,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,EAAE,QAAiB,EAAE,YAAqB,EAAE,GAAI,KAAK,EAAE;;;KAAK;IAkBvG,WAAW,CAAC,MAAM,EAAE,SAAS;IAa7B,eAAe,CAAC,IAAI,EAAE,MAAM;IAY5B,SAAS,CAAC,GAAG,EAAE,SAAS;IASxB,qBAAqB,CAAC,EACxB,OAAO,EACP,aAAa,EACb,IAAI,EACJ,QAAQ,EACR,GAA6E,EAC7E,YAAY,EACf,EAAE,sBAAsB,GAAI,OAAO,CAAC,SAAS,CAAC;IAmCzC,mBAAmB,CAAC,OAAO,EAAE,OAAO,EAAE,aAAa,CAAC,EAAE,MAAM;CAerE"}
@@ -67,7 +67,6 @@ import TimeSpan from "@entity-access/entity-access/dist/types/TimeSpan.js";
67
67
  import CacheService from "../cache/CacheService.js";
68
68
  import SocialMailContext from "../../model/SocialMailContext.js";
69
69
  import { globalEnv } from "../../../common/globalEnv.js";
70
- import LockFile from "../../storage/LockFile.js";
71
70
  import { join, parse } from "path";
72
71
  import { rmdir, unlink } from "fs/promises";
73
72
  import { randomBytes } from "crypto";
@@ -186,37 +185,26 @@ let FileConversionService = class FileConversionService {
186
185
  }
187
186
  async downloadConvertedFile({ appFile, fileContentID, type, fileName, key = `/file-1/${type}/${fileContentID ?? appFile.fileContentID}/${fileName}`, senderDomain }) {
188
187
  const ttl = TimeSpan.fromDays(30);
189
- let lockFileName = null;
188
+ let transform = false;
190
189
  // transform here...
191
190
  if (/^(size|max|jpg|png|webp|gif|face\-circle|remove-bg)\(?/i.test(type)) {
192
- lockFileName = `${globalEnv.serverID}-img`;
191
+ transform = true;
193
192
  }
194
193
  if (/^webm\-branded?$/i.test(type)) {
195
- lockFileName = `${globalEnv.serverID}-video`;
194
+ transform = true;
196
195
  }
197
196
  if (/^(webm|mp4)/i.test(type)) {
198
- lockFileName = `${globalEnv.serverID}-video`;
197
+ transform = true;
199
198
  }
200
199
  if (/^(pdf|html)$/i.test(type)) {
201
- lockFileName = `${globalEnv.serverID}-doc`;
200
+ transform = true;
202
201
  }
203
- if (!lockFileName) {
202
+ if (!transform) {
204
203
  return await this.downloadFileContent(appFile, fileContentID);
205
204
  }
206
205
  return await this.cacheService.get({ key, ttl, factory: async () => {
207
- const env_3 = { stack: [], error: void 0, hasError: false };
208
- try {
209
- const f = await this.downloadFileContent(appFile);
210
- const _ = __addDisposableResource(env_3, await LockFile.lock(lockFileName), false);
211
- return await this.transform(type, f, { fileName, senderDomain });
212
- }
213
- catch (e_3) {
214
- env_3.error = e_3;
215
- env_3.hasError = true;
216
- }
217
- finally {
218
- __disposeResources(env_3);
219
- }
206
+ const f = await this.downloadFileContent(appFile);
207
+ return await this.transform(type, f, { fileName, senderDomain });
220
208
  } });
221
209
  }
222
210
  async downloadFileContent(appFile, fileContentID) {
@@ -1 +1 @@
1
- {"version":3,"file":"FileConversionService.js","sourceRoot":"","sources":["../../../../src/server/services/convert/FileConversionService.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"FileConversionService.js","sourceRoot":"","sources":["../../../../src/server/services/convert/FileConversionService.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+BAA+B;AAC/B,OAAO,MAAM,EAAE,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAC;AACrG,OAAO,eAAe,MAAM,kCAAkC,CAAC;AAC/D,OAAO,EAAE,SAAS,EAAE,MAAM,oDAAoD,CAAC;AAE/E,OAAO,QAAQ,MAAM,qDAAqD,CAAC;AAC3E,OAAO,YAAY,MAAM,0BAA0B,CAAC;AACpD,OAAO,iBAAiB,MAAM,kCAAkC,CAAC;AACjE,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AACzD,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,MAAM,CAAC;AACnC,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAC;AACrC,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EAAE,OAAO,EAAE,MAAM,KAAK,CAAC;AAC9B,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,IAAI,CAAC;AAC3C,OAAO,OAAO,MAAM,6CAA6C,CAAC;AAClE,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAWlC,MAAM,SAAS,GAAG,CAAC,IAAI,EAAE,EAAE;IACvB,SAAQ,CAAC;QACL,MAAM,CAAC,GAAG,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,GAAG,GAAG,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,eAAe,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC;QACpG,IAAG,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC;YAChB,SAAS,CAAC,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAC,CAAC,CAAC;YACjC,OAAO,CAAC,CAAC;QACb,CAAC;IACL,CAAC;AACL,CAAC,CAAC;AAEF,MAAM,WAAW,GAAG,EAAS,CAAC;AAE9B,IAAI,IAAI,GAAG,SAAS,CAAC,GAAG,CAAC,IAAW,CAAC;AACrC,IAAI,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;IACtB,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;IACpB,WAAW,CAAC,IAAI,GAAG,IAAI,CAAC;IACxB,WAAW,CAAC,IAAI,GAAG,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC;AAC1C,CAAC;KAAM,CAAC;IACJ,WAAW,CAAC,IAAI,GAAG,IAAI,CAAC;AAC5B,CAAC;AAEA,MAAM,UAAU,GAAG,IAAI,KAAK,CAAC;IAClB,OAAO,EAAE,CAAC,OAAO,EAAE,QAAQ,EAAE,EAAE;QAC3B,IAAI,CAAC;YACD,MAAM,CAAC,GAAE,OAAO,CAAC,WAAW,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;YACvD,CAAC,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE;gBAChB,IAAI,CAAC,CAAC,IAAI,KAAK,oBAAoB,EAAE,CAAC;oBAClC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gBACrB,CAAC;gBACD,QAAQ,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;YACtB,CAAC,CAAC,CAAC;QACP,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QAC1B,CAAC;IACL,CAAC;CACJ,CAAC,CAAC;AAII,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;IAQtC,KAAK,CAAC,SAAS,CAAC,IAAY,EAAE,MAAiB,EAAE,EAAE,QAAQ,GAAG,KAAK,CAAC,EAAE,YAAY,GAAG,KAAK,CAAC,EAAE,GAAI,KAAK,EAAE,GAAG,EAAE;;;YACzG,QAAQ,KAAK,MAAM,CAAC,QAAQ,CAAC;YAC7B,MAAY,SAAS,kCAAG,MAAM,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,OAAA,CAAC;YACrD,MAAM,CAAC,GAAG,IAAI,GAAG,CAAC,4BAA4B,IAAI,IAAI,QAAQ,EAAE,CAAC,CAAC;YAClE,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,UAAU,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC;YAC/C,IAAI,YAAY,EAAE,CAAC;gBACf,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,cAAc,EAAE,YAAY,CAAC,CAAC;YACrD,CAAC;YACD,MAAM,EAAE,GAAG,MAAM,KAAK,CAAC,CAAC,EAAE,EAAE,UAAU,EAAE,CAAC,CAAC;YAC1C,IAAI,EAAE,CAAC,MAAM,GAAG,GAAG,EAAE,CAAC;gBAClB,MAAM,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC;YACrC,CAAC;YACD,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAC;YACtC,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,cAAc,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC;YACpF,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAW,CAAC,CAAC;YAClC,OAAO,EAAE,CAAC;;;;;;;;;;;KACb;IAED,KAAK,CAAC,WAAW,CAAC,MAAiB;;;YAC/B,MAAY,SAAS,kCAAG,MAAM,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,OAAA,CAAC;YACrD,MAAM,CAAC,GAAG,IAAI,GAAG,CAAC,iCAAiC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;YACtE,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,UAAU,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC;YAC/C,MAAM,EAAE,GAAG,MAAM,KAAK,CAAC,CAAC,EAAE,EAAE,UAAU,EAAE,CAAC,CAAC;YAC1C,IAAI,EAAE,CAAC,MAAM,GAAG,GAAG,EAAE,CAAC;gBAClB,MAAM,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC;YACrC,CAAC;YACD,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,cAAc,CAAC,MAAM,EAAE,WAAW,EAAE,YAAY,CAAC,CAAC;YACxF,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAW,CAAC,CAAC;YAClC,OAAO,EAAE,CAAC;;;;;;;;;;;KACb;IAED,KAAK,CAAC,eAAe,CAAC,IAAY;QAC9B,MAAM,CAAC,GAAG,IAAI,GAAG,CAAC,sCAAsC,IAAI,EAAE,CAAC,CAAC;QAChE,MAAM,EAAE,GAAG,MAAM,KAAK,CAAC,CAAC,EAAE,EAAE,UAAU,EAAE,CAAC,CAAC;QAC1C,IAAI,EAAE,CAAC,MAAM,GAAG,GAAG,EAAE,CAAC;YAClB,MAAM,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC;QACrC,CAAC;QACD,OAAO,OAAO,CAAC,QAAQ,CAAE,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,CAAC,EAAG,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE;gBACzE,qBAAqB,EAAE,QAAQ;gBAC/B,cAAc,EAAE,UAAU;aAC7B,EAAE,CAAC,CAAC;IACT,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,GAAc;QAC1B,MAAM,IAAI,GAAG,GAAG,CAAC,QAAQ,CAAC;QAC1B,MAAM,MAAM,GAAG,SAAS,CAAC,YAAY,CAAC,CAAC;QACvC,MAAM,EAAE,GAAG,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QAC9B,MAAM,CAAC,GAAG,IAAI,SAAS,CAAC,EAAE,EAAE,IAAI,EAAE,KAAK,CAAC,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;QAC1H,MAAM,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QACpB,OAAO,CAAC,CAAC;IACb,CAAC;IAED,KAAK,CAAC,qBAAqB,CAAC,EACxB,OAAO,EACP,aAAa,EACb,IAAI,EACJ,QAAQ,EACR,GAAG,GAAG,WAAW,IAAI,IAAI,aAAa,IAAI,OAAO,CAAC,aAAa,IAAI,QAAQ,EAAE,EAC7E,YAAY,EACS;QAErB,MAAM,GAAG,GAAG,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;QAElC,IAAI,SAAS,GAAG,KAAK,CAAC;QAEtB,oBAAoB;QACpB,IAAI,yDAAyD,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;YAEvE,SAAS,GAAG,IAAI,CAAC;QACrB,CAAC;QAED,IAAI,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;YACjC,SAAS,GAAG,IAAI,CAAC;QACrB,CAAC;QAED,IAAI,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;YAC5B,SAAS,GAAG,IAAI,CAAC;QACrB,CAAC;QAED,IAAI,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;YAC7B,SAAS,GAAG,IAAI,CAAC;QACrB,CAAC;QAED,IAAG,CAAC,SAAS,EAAE,CAAC;YACZ,OAAO,MAAM,IAAI,CAAC,mBAAmB,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;QAClE,CAAC;QAED,OAAO,MAAM,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,IAAI,EAAE;gBAC/D,MAAM,CAAC,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC;gBAClD,OAAO,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,QAAQ,EAAE,YAAY,EAAE,CAAC,CAAC;YACrE,CAAC,EAAC,CAAC,CAAC;IAER,CAAC;IAED,KAAK,CAAC,mBAAmB,CAAC,OAAgB,EAAE,aAAsB;QAC9D,IAAG,CAAC,aAAa,IAAI,aAAa,KAAK,OAAO,CAAC,aAAa,EAAE,CAAC;YAC3D,OAAO,IAAI,CAAC,eAAe,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;QACzD,CAAC;QACD,MAAM,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC;QAC9B,MAAM,EAAE,GAAG,eAAe,CAAC,OAAO,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;QAC5D,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC,YAAY;aAC3B,KAAK,CAAC,EAAE,aAAa,EAAE,SAAS,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa,KAAK,CAAC,CAAC,aAAa;eAC3E,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,SAAS,CAAC,CACtD;aACA,WAAW,EAAE,CAAC;QAEnB,OAAO,IAAI,CAAC,eAAe,CAAC,mBAAmB,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;IACjE,CAAC;CAEJ,CAAA;AAlHW;IADP,MAAM;8BACkB,eAAe;8DAAC;AAGjC;IADP,MAAM;8BACe,YAAY;2DAAC;AANlB,qBAAqB;IADzC,cAAc;GACM,qBAAqB,CAqHzC;eArHoB,qBAAqB"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@social-mail/social-mail-web-server",
3
- "version": "1.14.46",
3
+ "version": "1.14.49",
4
4
  "description": "## Phase 1",
5
5
  "main": "index.js",
6
6
  "type": "module",
@@ -17,7 +17,7 @@ export default async function seedUI(config: DBConfig) {
17
17
  await config.saveVersion(UIPackageConfig, {
18
18
  package: "@social-mail/social-mail-client",
19
19
  view: "dist/web/AppIndex",
20
- version: "1.10.84"
20
+ version: "1.10.87"
21
21
  });
22
22
 
23
23
  await config.saveVersion(WebComponentsPackageConfig, {
@@ -7,7 +7,6 @@ import TimeSpan from "@entity-access/entity-access/dist/types/TimeSpan.js";
7
7
  import CacheService from "../cache/CacheService.js";
8
8
  import SocialMailContext from "../../model/SocialMailContext.js";
9
9
  import { globalEnv } from "../../../common/globalEnv.js";
10
- import LockFile from "../../storage/LockFile.js";
11
10
  import { join, parse } from "path";
12
11
  import { rmdir, unlink } from "fs/promises";
13
12
  import { randomBytes } from "crypto";
@@ -136,33 +135,32 @@ export default class FileConversionService {
136
135
 
137
136
  const ttl = TimeSpan.fromDays(30);
138
137
 
139
- let lockFileName = null;
138
+ let transform = false;
140
139
 
141
140
  // transform here...
142
141
  if (/^(size|max|jpg|png|webp|gif|face\-circle|remove-bg)\(?/i.test(type)) {
143
142
 
144
- lockFileName = `${globalEnv.serverID}-img`;
143
+ transform = true;
145
144
  }
146
145
 
147
146
  if (/^webm\-branded?$/i.test(type)) {
148
- lockFileName = `${globalEnv.serverID}-video`;
147
+ transform = true;
149
148
  }
150
149
 
151
150
  if (/^(webm|mp4)/i.test(type)) {
152
- lockFileName = `${globalEnv.serverID}-video`;
151
+ transform = true;
153
152
  }
154
153
 
155
154
  if (/^(pdf|html)$/i.test(type)) {
156
- lockFileName = `${globalEnv.serverID}-doc`;
155
+ transform = true;
157
156
  }
158
157
 
159
- if(!lockFileName) {
158
+ if(!transform) {
160
159
  return await this.downloadFileContent(appFile, fileContentID);
161
160
  }
162
161
 
163
162
  return await this.cacheService.get({ key, ttl, factory: async () => {
164
163
  const f = await this.downloadFileContent(appFile);
165
- using _ = await LockFile.lock(lockFileName);
166
164
  return await this.transform(type, f, { fileName, senderDomain });
167
165
  }});
168
166