@social-mail/social-mail-web-server 1.4.928 → 1.4.930
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.
- package/dist/server/seed/seed.d.ts.map +1 -1
- package/dist/server/seed/seed.js +4 -0
- package/dist/server/seed/seed.js.map +1 -1
- package/dist/server/storage/BaseStorage.d.ts +1 -0
- package/dist/server/storage/BaseStorage.d.ts.map +1 -1
- package/dist/server/storage/BaseStorage.js.map +1 -1
- package/dist/server/storage/azure/AzureStorage.d.ts +1 -0
- package/dist/server/storage/azure/AzureStorage.d.ts.map +1 -1
- package/dist/server/storage/azure/AzureStorage.js +3 -0
- package/dist/server/storage/azure/AzureStorage.js.map +1 -1
- package/dist/server/storage/db/DbStorage.d.ts +1 -0
- package/dist/server/storage/db/DbStorage.d.ts.map +1 -1
- package/dist/server/storage/db/DbStorage.js +39 -24
- package/dist/server/storage/db/DbStorage.js.map +1 -1
- package/dist/server/storage/s3/S3Storage.d.ts +1 -0
- package/dist/server/storage/s3/S3Storage.d.ts.map +1 -1
- package/dist/server/storage/s3/S3Storage.js +7 -2
- package/dist/server/storage/s3/S3Storage.js.map +1 -1
- package/dist/server/storage/volume/VolumeStorage.d.ts +1 -0
- package/dist/server/storage/volume/VolumeStorage.d.ts.map +1 -1
- package/dist/server/storage/volume/VolumeStorage.js +7 -1
- package/dist/server/storage/volume/VolumeStorage.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/server/seed/seed.ts +6 -0
- package/src/server/storage/BaseStorage.ts +2 -0
- package/src/server/storage/azure/AzureStorage.ts +4 -0
- package/src/server/storage/db/DbStorage.ts +6 -0
- package/src/server/storage/s3/S3Storage.ts +9 -2
- package/src/server/storage/volume/VolumeStorage.ts +8 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"seed.d.ts","sourceRoot":"","sources":["../../../src/server/seed/seed.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"seed.d.ts","sourceRoot":"","sources":["../../../src/server/seed/seed.ts"],"names":[],"mappings":"AAYA,wBAA8B,IAAI,kBAqCjC"}
|
package/dist/server/seed/seed.js
CHANGED
|
@@ -55,6 +55,7 @@ import seedTags from "./tags/seed-tags.js";
|
|
|
55
55
|
import DbLockContext from "../services/db-lock/DbLockContext.js";
|
|
56
56
|
import LockFile from "../storage/LockFile.js";
|
|
57
57
|
import { globalEnv } from "../../common/globalEnv.js";
|
|
58
|
+
import BaseStorage from "../storage/BaseStorage.js";
|
|
58
59
|
export default async function seed() {
|
|
59
60
|
const scope = globalServices.createScope();
|
|
60
61
|
try {
|
|
@@ -62,6 +63,9 @@ export default async function seed() {
|
|
|
62
63
|
try {
|
|
63
64
|
// making sure multiple workers don't interfere
|
|
64
65
|
const fl = __addDisposableResource(env_1, await LockFile.lock(`seed-lock-${globalEnv.serverID}.lock`), false);
|
|
66
|
+
// verify storage...
|
|
67
|
+
const storage = scope.resolve(BaseStorage);
|
|
68
|
+
await storage.verify();
|
|
65
69
|
// const migrationConfig = { version: globalEnv.version };
|
|
66
70
|
const version = globalEnv.version;
|
|
67
71
|
const lc = scope.resolve(DbLockContext);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"seed.js","sourceRoot":"","sources":["../../../src/server/seed/seed.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+BAA+B;AAC/B,OAAO,iBAAiB,MAAM,+BAA+B,CAAC;AAC9D,OAAO,aAAa,MAAM,2BAA2B,CAAC;AACtD,OAAO,MAAM,MAAM,iBAAiB,CAAC;AACrC,OAAO,QAAQ,MAAM,yBAAyB,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,QAAQ,MAAM,qBAAqB,CAAC;AAC3C,OAAO,aAAa,MAAM,sCAAsC,CAAC;AACjE,OAAO,QAAQ,MAAM,wBAAwB,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"seed.js","sourceRoot":"","sources":["../../../src/server/seed/seed.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+BAA+B;AAC/B,OAAO,iBAAiB,MAAM,+BAA+B,CAAC;AAC9D,OAAO,aAAa,MAAM,2BAA2B,CAAC;AACtD,OAAO,MAAM,MAAM,iBAAiB,CAAC;AACrC,OAAO,QAAQ,MAAM,yBAAyB,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,QAAQ,MAAM,qBAAqB,CAAC;AAC3C,OAAO,aAAa,MAAM,sCAAsC,CAAC;AACjE,OAAO,QAAQ,MAAM,wBAAwB,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AACtD,OAAO,WAAW,MAAM,2BAA2B,CAAC;AAEpD,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,IAAI;IAE9B,MAAM,KAAK,GAAG,cAAc,CAAC,WAAW,EAAE,CAAC;IAC3C,IAAI,CAAC;;;YAED,+CAA+C;YAC/C,MAAM,EAAE,kCAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,aAAa,SAAS,CAAC,QAAQ,OAAO,CAAC,QAAA,CAAC;YAEvE,oBAAoB;YACpB,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,WAAkB,CAAgB,CAAC;YAEjE,MAAM,OAAO,CAAC,MAAM,EAAE,CAAC;YAEvB,0DAA0D;YAE1D,MAAM,OAAO,GAAG,SAAS,CAAC,OAAO,CAAC;YAElC,MAAM,EAAE,GAAG,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;YACxC,MAAM,EAAE,CAAC,UAAU,CAAC,cAAc,EAAE,CAAC;YACrC,MAAM,EAAE,CAAC,UAAU,CAAC,mBAAmB,EAAE,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC,CAAC;YAErF,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;YACjD,MAAM,OAAO,CAAC,UAAU,CAAC,cAAc,EAAE,CAAC;YAC1C,MAAM,OAAO,CAAC,UAAU,CAAC,mBAAmB,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAC,CAAC,CAAC;YAG1F,OAAO,CAAC,aAAa,GAAG,KAAK,CAAC;YAC9B,OAAO,CAAC,WAAW,GAAG,KAAK,CAAC;YAG5B,MAAM,aAAa,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;YACpC,MAAM,aAAa,GAAG,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;YAC9C,MAAM,MAAM,CAAC,aAAa,CAAC,CAAC;YAC5B,MAAM,QAAQ,CAAC,OAAO,CAAC,CAAC;;;;;;;;;KAC3B;YAAS,CAAC;QACP,KAAK,CAAC,OAAO,EAAE,CAAC;IACpB,CAAC;AACL,CAAC"}
|
|
@@ -16,6 +16,7 @@ export default abstract class BaseStorage {
|
|
|
16
16
|
private tagService;
|
|
17
17
|
private dbLockService;
|
|
18
18
|
private diskCache;
|
|
19
|
+
abstract verify(): Promise<any>;
|
|
19
20
|
abstract createFile(cloudPath: string, file: LocalFile): Promise<string>;
|
|
20
21
|
abstract deleteFile(cloudPath: string): Promise<void>;
|
|
21
22
|
abstract streamFile(cloudPath: string): Promise<{
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseStorage.d.ts","sourceRoot":"","sources":["../../../src/server/storage/BaseStorage.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAe,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAC;AAErF,OAAO,aAAa,MAAM,8BAA8B,CAAC;AAGzD,OAAO,OAAO,MAAM,8BAA8B,CAAC;AASnD,OAAO,KAAK,WAAW,MAAM,kCAAkC,CAAC;AAEhE,OAAO,EAAE,SAAS,EAAE,MAAM,oDAAoD,CAAC;AAM/E,MAAM,MAAM,WAAW,GAAG;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,KAAK,CAAA;CAAE,GAAG;IAAE,SAAS,EAAE,KAAK,CAAC;IAAC,IAAI,EAAE,SAAS,CAAA;CAAE,CAAC;AAErG,MAAM,CAAC,OAAO,CAAC,QAAQ,OAAO,WAAW;IAGrC,SAAS,CAAC,aAAa,EAAE,aAAa,CAAC;IAGvC,OAAO,CAAC,UAAU,CAAiB;IAGnC,OAAO,CAAC,aAAa,CAAgB;IAGrC,OAAO,CAAC,SAAS,CAAmB;IAEpC,QAAQ,CAAC,UAAU,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC;IAExE,QAAQ,CAAC,UAAU,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAErD,QAAQ,CAAC,UAAU,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;IAElF,cAAc,CAAC,IAAI,EAAE,SAAS;IAI9B,eAAe,CAAC,IAAI,EAAE,SAAS,EAAE,KAAK,CAAC,EAAC,eAAe,EAAE,QAAQ,GAAE,OAAwC;IAqD3G,YAAY,CAAC,EAAE,SAAS,EAAE,WAAW,EAAE,WAAW,EAAC,EAAE,WAAW;IAqDhE,UAAU,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS;IAK5C,QAAQ,CAAC,IAAI,EAAE,SAAS,EAAE,KAAK,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC;YAiE1C,cAAc;CA8E/B"}
|
|
1
|
+
{"version":3,"file":"BaseStorage.d.ts","sourceRoot":"","sources":["../../../src/server/storage/BaseStorage.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAe,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAC;AAErF,OAAO,aAAa,MAAM,8BAA8B,CAAC;AAGzD,OAAO,OAAO,MAAM,8BAA8B,CAAC;AASnD,OAAO,KAAK,WAAW,MAAM,kCAAkC,CAAC;AAEhE,OAAO,EAAE,SAAS,EAAE,MAAM,oDAAoD,CAAC;AAM/E,MAAM,MAAM,WAAW,GAAG;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,KAAK,CAAA;CAAE,GAAG;IAAE,SAAS,EAAE,KAAK,CAAC;IAAC,IAAI,EAAE,SAAS,CAAA;CAAE,CAAC;AAErG,MAAM,CAAC,OAAO,CAAC,QAAQ,OAAO,WAAW;IAGrC,SAAS,CAAC,aAAa,EAAE,aAAa,CAAC;IAGvC,OAAO,CAAC,UAAU,CAAiB;IAGnC,OAAO,CAAC,aAAa,CAAgB;IAGrC,OAAO,CAAC,SAAS,CAAmB;IAEpC,QAAQ,CAAC,MAAM,IAAI,OAAO,CAAC,GAAG,CAAC;IAE/B,QAAQ,CAAC,UAAU,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC;IAExE,QAAQ,CAAC,UAAU,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAErD,QAAQ,CAAC,UAAU,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;IAElF,cAAc,CAAC,IAAI,EAAE,SAAS;IAI9B,eAAe,CAAC,IAAI,EAAE,SAAS,EAAE,KAAK,CAAC,EAAC,eAAe,EAAE,QAAQ,GAAE,OAAwC;IAqD3G,YAAY,CAAC,EAAE,SAAS,EAAE,WAAW,EAAE,WAAW,EAAC,EAAE,WAAW;IAqDhE,UAAU,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS;IAK5C,QAAQ,CAAC,IAAI,EAAE,SAAS,EAAE,KAAK,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC;YAiE1C,cAAc;CA8E/B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseStorage.js","sourceRoot":"","sources":["../../../src/server/storage/BaseStorage.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,qEAAqE;AACrE,OAAO,MAA2B,MAAM,4CAA4C,CAAC;AACrF,OAAO,iBAAiB,MAAM,+BAA+B,CAAC;AAC9D,OAAO,aAAa,MAAM,8BAA8B,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,cAAc,MAAM,oCAAoC,CAAC;AAEhE,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,KAAK,GAAG,MAAM,aAAa,CAAC;AACnC,OAAO,KAAK,MAAM,uBAAuB,CAAC;AAC1C,OAAO,iBAAiB,MAAM,+DAA+D,CAAC;AAC9F,OAAO,IAAI,MAAM,qBAAqB,CAAC;AACvC,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,UAAU,MAAM,qDAAqD,CAAC;AAE7E,OAAO,SAAS,MAAM,0BAA0B,CAAC;AAEjD,OAAO,EAAE,WAAW,EAAE,MAAM,sDAAsD,CAAC;AACnF,OAAO,aAAa,MAAM,sCAAsC,CAAC;AACjE,OAAO,QAAQ,MAAM,qDAAqD,CAAC;AAC3E,OAAO,gBAAgB,MAAM,uCAAuC,CAAC;AAIrE,MAAM,CAAC,OAAO,OAAgB,WAAW;
|
|
1
|
+
{"version":3,"file":"BaseStorage.js","sourceRoot":"","sources":["../../../src/server/storage/BaseStorage.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,qEAAqE;AACrE,OAAO,MAA2B,MAAM,4CAA4C,CAAC;AACrF,OAAO,iBAAiB,MAAM,+BAA+B,CAAC;AAC9D,OAAO,aAAa,MAAM,8BAA8B,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,cAAc,MAAM,oCAAoC,CAAC;AAEhE,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,KAAK,GAAG,MAAM,aAAa,CAAC;AACnC,OAAO,KAAK,MAAM,uBAAuB,CAAC;AAC1C,OAAO,iBAAiB,MAAM,+DAA+D,CAAC;AAC9F,OAAO,IAAI,MAAM,qBAAqB,CAAC;AACvC,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,UAAU,MAAM,qDAAqD,CAAC;AAE7E,OAAO,SAAS,MAAM,0BAA0B,CAAC;AAEjD,OAAO,EAAE,WAAW,EAAE,MAAM,sDAAsD,CAAC;AACnF,OAAO,aAAa,MAAM,sCAAsC,CAAC;AACjE,OAAO,QAAQ,MAAM,qDAAqD,CAAC;AAC3E,OAAO,gBAAgB,MAAM,uCAAuC,CAAC;AAIrE,MAAM,CAAC,OAAO,OAAgB,WAAW;IAsBrC,KAAK,CAAC,cAAc,CAAC,IAAe;QAChC,OAAO,MAAM,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;IAChE,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,IAAe,EAAE,KAAsB,EAAE,WAAoB,QAAQ,CAAC,eAAe,CAAC,IAAI,CAAC;QAC7G,MAAM,YAAY,GAAG,KAAK,CAAC;QAC3B,KAAK,KAAK,cAAc,CAAC,WAAW,EAAE,CAAC;QACvC,IAAI,CAAC;YAED,MAAM,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAE3B,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;YACzE,MAAM,EAAE,GAAG,KAAK,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;YAC5C,0BAA0B;YAC1B,EAAE,CAAC,aAAa,GAAG,KAAK,CAAC;YAEzB,MAAM,WAAW,GAAG,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;YAE7C,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC;YAC1C,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,EAAE,EAAE,IAAI,EAAE,EAAE,WAAW,EAAE,WAAW,EAAE,WAAW,EAAE,WAAW,EAAC,CAAC,CAAC;YAEtG,IAAG,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC;gBACf,MAAM,SAAS,GAAG,SAAS,EAAE,CAAC,aAAa,EAAE,CAAC;gBAE9C,sCAAsC;gBAGtC,IAAI,WAAW,KAAK,IAAI,EAAE,CAAC;;;wBACvB,MAAM,GAAG,kCAAG,IAAI,UAAU,EAAE,QAAA,CAAC;wBAC7B,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,UAAU,CAAC,UAAU,EAAE,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,EAAE,0BAA0B,CAAC,CAAC;wBACvG,MAAM,IAAI,CAAC,UAAU,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;;;;;;;;;iBAC5C;qBAAM,CAAC;oBACJ,MAAM,IAAI,CAAC,UAAU,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;gBAC3C,CAAC;gBAED,iCAAiC;gBAEjC,4DAA4D;gBAC5D,qDAAqD;gBACrD,qCAAqC;gBAErC,EAAE,CAAC,SAAS,GAAG,SAAS,CAAC;gBACzB,EAAE,CAAC,WAAW,GAAG,WAAW,CAAC;gBAC7B,MAAM,EAAE,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa,KAAK,CAAC,CAAC,aAAa,CAAC;qBAC7E,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;oBACvB,SAAS,EAAE,CAAC,CAAC,SAAS;oBACtB,WAAW,EAAE,CAAC,CAAC,WAAW;iBAC7B,CAAC,CAAC,CAAC;YACZ,CAAC;YACD,OAAO,EAAE,CAAC;QACd,CAAC;gBAAS,CAAC;YACP,IAAI,CAAC,YAAY,EAAE,CAAC;gBAChB,KAAK,CAAC,OAAO,EAAE,CAAC;YACpB,CAAC;QACL,CAAC;IACL,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,EAAE,SAAS,EAAE,WAAW,EAAE,WAAW,EAAc;QAElE,OAAO,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE;YAC7E,IAAI,EAAE,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;YAClD,IAAG,WAAW,EAAE,CAAC;gBACb,QAAO,WAAW,EAAE,CAAC;oBACjB,KAAK,IAAI;wBACL,MAAM,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;wBAClC,MAAM;oBACV;wBACI,MAAM,IAAI,iBAAiB,CAAC,iCAAiC,WAAW,EAAE,CAAC,CAAC;gBACpF,CAAC;YACL,CAAC;YACD,MAAM,GAAG,CAAC,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QAC1C,CAAC,CAAE,CAAC;QAEJ,yDAAyD;QACzD,0CAA0C;QAC1C,0BAA0B;QAC1B,2CAA2C;QAC3C,IAAI;QACJ,kBAAkB;QAClB,sBAAsB;QACtB,mDAAmD;QAEnD,oCAAoC;QACpC,iBAAiB;QACjB,QAAQ;QAER,2DAA2D;QAE3D,YAAY;QACZ,6BAA6B;QAC7B,uDAAuD;QACvD,mBAAmB;QACnB,0CAA0C;QAC1C,+FAA+F;QAC/F,gBAAgB;QAChB,wDAAwD;QACxD,YAAY;QACZ,iBAAiB;QACjB,wBAAwB;QACxB,4DAA4D;QAC5D,6BAA6B;QAC7B,mBAAmB;QACnB,2BAA2B;QAC3B,wGAAwG;QACxG,YAAY;QACZ,QAAQ;QACR,IAAI;QACJ,qBAAqB;IACzB,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,OAAgB,EAAE,IAAe;QAC9C,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,QAAQ,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC;QACpF,OAAO,CAAC,aAAa,GAAG,EAAE,CAAC,aAAa,CAAC;IAC7C,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,IAAe,EAAE,KAAwB;QAEpD,MAAM,KAAK,GAAG,cAAc,CAAC,WAAW,EAAE,CAAC;QAC3C,IAAI,CAAC;YACD,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,KAAK,KAAK,CAAC,eAAe,CAAC,CAAC;YACvD,MAAM,EAAE,GAAG,KAAK,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;YAC5C,EAAE,CAAC,aAAa,GAAG,KAAK,CAAC;YAEzB,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE,KAAK,EAAG,QAAQ,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC;YAE7F,MAAM,IAAI,GAAG,KAAK,EAAE,IAAI,IAAI,IAAI,CAAC,QAAQ,CAAC;YAC1C,MAAM,QAAQ,GAAG,KAAK,EAAE,QAAQ,CAAC;YAEjC,IAAI,OAAgB,CAAC;YAErB,IAAI,QAAQ,IAAI,IAAI,EAAE,CAAC;gBACnB,OAAO,GAAG,MAAM,EAAE,CAAC,QAAQ;qBACtB,KAAK,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAC7B,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,CAAC,CAAC,QAAQ;uBACzB,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI,CAAC;qBAC5B,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;qBACtB,KAAK,EAAE,CAAC;YACjB,CAAC;YAED,cAAc;YACd,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;YAE5E,8CAA8C;YAG9C,OAAO,KAAK,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC;gBACxB,IAAI;gBACJ,IAAI,EAAE,EAAE;aACX,CAAC,CAAC;YACH,OAAO,CAAC,WAAW,GAAG,WAAW,CAAC;YAClC,OAAO,CAAC,aAAa,GAAG,WAAW,CAAC,aAAa,CAAC;YAClD,IAAI,KAAK,EAAE,CAAC;gBACR,KAAK,CAAC,aAAa,GAAG,WAAW,CAAC,aAAa,CAAC;gBAChD,KAAK,CAAC,WAAW,GAAG,WAAW,CAAC;YACpC,CAAC;YACD,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC;YACpC,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;YACvC,OAAO,CAAC,SAAS,GAAG,KAAK,CAAC;YAC1B,IAAI,KAAK,EAAE,CAAC;gBACR,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE,CAAC;oBACtB,IAAI,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE,CAAC;wBACnD,MAAM,OAAO,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;wBAC3B,OAAO,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC;oBAC3B,CAAC;gBACL,CAAC;YACL,CAAC;YACD,MAAM,QAAQ,GAAG,OAAO,CAAC,IAAI,KAAI,EAAE,CAAC;YACpC,KAAK,MAAM,EAAE,KAAK,EAAE,IAAI,IAAI,EAAE,CAAC;gBAC3B,IAAI,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,KAAK,CAAC,EAAE,CAAC;oBAC1C,SAAS;gBACb,CAAC;gBACD,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;YACjD,CAAC;YACD,MAAM,EAAE,CAAC,WAAW,EAAE,CAAC;YACvB,OAAO,OAAO,CAAC;QACnB,CAAC;gBAAS,CAAC;YACP,KAAK,CAAC,OAAO,EAAE,CAAC;QACpB,CAAC;IACL,CAAC;IAEO,KAAK,CAAC,cAAc,CACxB,EAAqB,EACrB,IAAe,EACf,EAAE,WAAW,EAAE,WAAW,EAAE,WAAW,EAAE,WAAW,EAAC;QAErD;;;;;;;;;;;;;;;;;;;;;;;WAuBG;QAEH,KAAI,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAC,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC;;;gBAEvB,MAAM,YAAY,GAAG,MAAM,EAAE,CAAC,YAAY;qBACrC,KAAK,CAAC,EAAE,WAAW,EAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,KAAK,CAAC,CAAC,WAAW,CAAC;qBACpE,OAAO,EAAE,CAAC;gBAEf,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;oBAC5B,MAAM;gBACV,CAAC;gBAED,MAAY,MAAM,kCAAG,MAAM,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,qBAAqB,WAAW,IAAI,WAAW,EAAE,EAChG,QAAQ,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,OAAA,CAAC;gBAEjC,KAAK,MAAM,QAAQ,IAAI,YAAY,EAAE,CAAC;oBAClC,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,CAAC;wBACtB,MAAM,KAAK,CAAC,IAAI,CAAC,CAAC;wBAClB,SAAS;oBACb,CAAC;oBACD,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;oBACpD,IAAI,MAAM,aAAa,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC;wBACjD,OAAO,QAAQ,CAAC;oBACpB,CAAC;oBAED;;;;;;;;uBAQG;oBAEH,mCAAmC;oBACnC,uBAAuB;oBACvB,OAAO,CAAC,GAAG,CAAC,mEAAmE,CAAC,CAAC;gBACrF,CAAC;;;;;;;;;;;SACJ;QAED,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC,YAAY,CAAC,UAAU,CAAC,MAAM,CAAC;YAC/C,WAAW;YACX,WAAW;YACX,WAAW;YACX,WAAW;SACd,CAAC,CAAC;QACH,OAAO,EAAE,CAAC;IACd,CAAC;CAEJ;AArRa;IADT,MAAM;8BACkB,aAAa;kDAAC;AAG/B;IADP,MAAM;8BACa,cAAc;+CAAC;AAG3B;IADP,MAAM;8BACgB,aAAa;kDAAC;AAG7B;IADP,MAAM;8BACY,gBAAgB;8CAAC"}
|
|
@@ -5,6 +5,7 @@ import { LocalFile } from "@entity-access/server-pages/dist/core/LocalFile.js";
|
|
|
5
5
|
export default class AzureStorage extends BaseStorage {
|
|
6
6
|
container: BS.ContainerClient;
|
|
7
7
|
constructor();
|
|
8
|
+
verify(): Promise<void>;
|
|
8
9
|
createFile(cloudPath: string, file: LocalFile): Promise<string>;
|
|
9
10
|
deleteFile(cloudPath: string): Promise<void>;
|
|
10
11
|
streamFile(cloudPath: string): Promise<{
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AzureStorage.d.ts","sourceRoot":"","sources":["../../../../src/server/storage/azure/AzureStorage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC1C,OAAO,WAAW,MAAM,mBAAmB,CAAC;AAC5C,OAAO,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,MAAM,oDAAoD,CAAC;AAQ/E,MAAM,CAAC,OAAO,OAAO,YAAa,SAAQ,WAAW;IAGjD,SAAS,EAAE,EAAE,CAAC,eAAe,CAAC;;IAQxB,UAAU,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS;IAY7C,UAAU,CAAC,SAAS,EAAE,MAAM;IAI5B,UAAU,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC;KAAE,CAAC;CAOzF"}
|
|
1
|
+
{"version":3,"file":"AzureStorage.d.ts","sourceRoot":"","sources":["../../../../src/server/storage/azure/AzureStorage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC1C,OAAO,WAAW,MAAM,mBAAmB,CAAC;AAC5C,OAAO,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,MAAM,oDAAoD,CAAC;AAQ/E,MAAM,CAAC,OAAO,OAAO,YAAa,SAAQ,WAAW;IAGjD,SAAS,EAAE,EAAE,CAAC,eAAe,CAAC;;IAQxB,MAAM;IAIN,UAAU,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS;IAY7C,UAAU,CAAC,SAAS,EAAE,MAAM;IAI5B,UAAU,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC;KAAE,CAAC;CAOzF"}
|
|
@@ -10,6 +10,9 @@ export default class AzureStorage extends BaseStorage {
|
|
|
10
10
|
const client = BlobServiceClient.fromConnectionString(cs);
|
|
11
11
|
this.container = client.getContainerClient(container);
|
|
12
12
|
}
|
|
13
|
+
async verify() {
|
|
14
|
+
await this.container.getProperties();
|
|
15
|
+
}
|
|
13
16
|
async createFile(cloudPath, file) {
|
|
14
17
|
const body = file.openReadStream();
|
|
15
18
|
const md5 = await this.cryptoService.md5Buffer(file.openRead(), "base64");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AzureStorage.js","sourceRoot":"","sources":["../../../../src/server/storage/azure/AzureStorage.ts"],"names":[],"mappings":"AACA,OAAO,WAAW,MAAM,mBAAmB,CAAC;AAC5C,OAAO,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAE1C,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAEzD,MAAM,EAAE,iBAAiB,EAAE,GAAG,EAAE,CAAC;AAEjC,MAAM,EAAE,GAAG,SAAS,CAAC,YAAY,CAAC,gBAAgB,CAAC;AACnD,MAAM,SAAS,GAAG,SAAS,CAAC,YAAY,CAAC,SAAS,CAAC;AAEnD,MAAM,CAAC,OAAO,OAAO,YAAa,SAAQ,WAAW;IAKjD;QACI,KAAK,EAAE,CAAC;QACR,MAAM,MAAM,GAAG,iBAAiB,CAAC,oBAAoB,CAAC,EAAE,CAAC,CAAC;QAC1D,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;IAC1D,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,SAAiB,EAAE,IAAe;QAC/C,MAAM,IAAI,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QACnC,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,QAAQ,CAAC,CAAC;QAC1E,MAAM,cAAc,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAA;QACjD,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;QAC1D,MAAM,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,KAAK,CAAC,EAAE;YAC1C,eAAe,EAAE;gBACb,cAAc;aACjB;SACJ,CAAC,CAAC;QACH,OAAO,IAAI,CAAC,GAAG,CAAC;IACpB,CAAC;IACD,KAAK,CAAC,UAAU,CAAC,SAAiB;QAC9B,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;QAC1D,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;IAChC,CAAC;IACD,KAAK,CAAC,UAAU,CAAC,SAAiB;QAC9B,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;QAC1D,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC;QACrC,MAAM,WAAW,GAAG,MAAM,CAAC,WAAW,IAAI,0BAA0B,CAAC;QACrE,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,CAAC,kBAAkB,EAAE,CAAC;IAC9D,CAAC;CAEJ"}
|
|
1
|
+
{"version":3,"file":"AzureStorage.js","sourceRoot":"","sources":["../../../../src/server/storage/azure/AzureStorage.ts"],"names":[],"mappings":"AACA,OAAO,WAAW,MAAM,mBAAmB,CAAC;AAC5C,OAAO,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAE1C,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAEzD,MAAM,EAAE,iBAAiB,EAAE,GAAG,EAAE,CAAC;AAEjC,MAAM,EAAE,GAAG,SAAS,CAAC,YAAY,CAAC,gBAAgB,CAAC;AACnD,MAAM,SAAS,GAAG,SAAS,CAAC,YAAY,CAAC,SAAS,CAAC;AAEnD,MAAM,CAAC,OAAO,OAAO,YAAa,SAAQ,WAAW;IAKjD;QACI,KAAK,EAAE,CAAC;QACR,MAAM,MAAM,GAAG,iBAAiB,CAAC,oBAAoB,CAAC,EAAE,CAAC,CAAC;QAC1D,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;IAC1D,CAAC;IAED,KAAK,CAAC,MAAM;QACR,MAAM,IAAI,CAAC,SAAS,CAAC,aAAa,EAAE,CAAC;IACzC,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,SAAiB,EAAE,IAAe;QAC/C,MAAM,IAAI,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QACnC,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,QAAQ,CAAC,CAAC;QAC1E,MAAM,cAAc,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAA;QACjD,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;QAC1D,MAAM,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,KAAK,CAAC,EAAE;YAC1C,eAAe,EAAE;gBACb,cAAc;aACjB;SACJ,CAAC,CAAC;QACH,OAAO,IAAI,CAAC,GAAG,CAAC;IACpB,CAAC;IACD,KAAK,CAAC,UAAU,CAAC,SAAiB;QAC9B,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;QAC1D,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;IAChC,CAAC;IACD,KAAK,CAAC,UAAU,CAAC,SAAiB;QAC9B,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;QAC1D,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC;QACrC,MAAM,WAAW,GAAG,MAAM,CAAC,WAAW,IAAI,0BAA0B,CAAC;QACrE,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,CAAC,kBAAkB,EAAE,CAAC;IAC9D,CAAC;CAEJ"}
|
|
@@ -2,6 +2,7 @@ import { Stream } from "stream";
|
|
|
2
2
|
import BaseStorage from "../BaseStorage.js";
|
|
3
3
|
import { LocalFile } from "@entity-access/server-pages/dist/core/LocalFile.js";
|
|
4
4
|
export default class DbStorage extends BaseStorage {
|
|
5
|
+
verify(): Promise<void>;
|
|
5
6
|
createFile(cloudPath: string, file: LocalFile): Promise<string>;
|
|
6
7
|
deleteFile(cloudPath: string): Promise<void>;
|
|
7
8
|
streamFile(cloudPath: string): Promise<{
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DbStorage.d.ts","sourceRoot":"","sources":["../../../../src/server/storage/db/DbStorage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC1C,OAAO,WAAW,MAAM,mBAAmB,CAAC;AAS5C,OAAO,EAAE,SAAS,EAAE,MAAM,oDAAoD,CAAC;AAM/E,MAAM,CAAC,OAAO,OAAO,SAAU,SAAQ,WAAW;IAExC,UAAU,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC;IAuB/D,UAAU,CAAC,SAAS,EAAE,MAAM;IAoB5B,UAAU,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC;KAAE,CAAC;IA2BhF,WAAW;CAWpB"}
|
|
1
|
+
{"version":3,"file":"DbStorage.d.ts","sourceRoot":"","sources":["../../../../src/server/storage/db/DbStorage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC1C,OAAO,WAAW,MAAM,mBAAmB,CAAC;AAS5C,OAAO,EAAE,SAAS,EAAE,MAAM,oDAAoD,CAAC;AAM/E,MAAM,CAAC,OAAO,OAAO,SAAU,SAAQ,WAAW;IAExC,MAAM;IAMN,UAAU,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC;IAuB/D,UAAU,CAAC,SAAS,EAAE,MAAM;IAoB5B,UAAU,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC;KAAE,CAAC;IA2BhF,WAAW;CAWpB"}
|
|
@@ -66,12 +66,27 @@ import EntityAccessError from "@entity-access/entity-access/dist/common/EntityAc
|
|
|
66
66
|
const max = 16 * 1024 * 1024;
|
|
67
67
|
let seeded = false;
|
|
68
68
|
export default class DbStorage extends BaseStorage {
|
|
69
|
-
async
|
|
69
|
+
async verify() {
|
|
70
70
|
const env_1 = { stack: [], error: void 0, hasError: false };
|
|
71
71
|
try {
|
|
72
|
-
const sha256 = await this.cryptoService.hashBuffer(file.openRead(), "base64");
|
|
73
72
|
const scope = __addDisposableResource(env_1, await this.createScope(), false);
|
|
74
73
|
const db = scope.resolve(DbStorageContext);
|
|
74
|
+
await db.dbFiles.asQuery().first();
|
|
75
|
+
}
|
|
76
|
+
catch (e_1) {
|
|
77
|
+
env_1.error = e_1;
|
|
78
|
+
env_1.hasError = true;
|
|
79
|
+
}
|
|
80
|
+
finally {
|
|
81
|
+
__disposeResources(env_1);
|
|
82
|
+
}
|
|
83
|
+
}
|
|
84
|
+
async createFile(cloudPath, file) {
|
|
85
|
+
const env_2 = { stack: [], error: void 0, hasError: false };
|
|
86
|
+
try {
|
|
87
|
+
const sha256 = await this.cryptoService.hashBuffer(file.openRead(), "base64");
|
|
88
|
+
const scope = __addDisposableResource(env_2, await this.createScope(), false);
|
|
89
|
+
const db = scope.resolve(DbStorageContext);
|
|
75
90
|
const { fileID } = await db.dbFiles.statements.insert({
|
|
76
91
|
path: cloudPath,
|
|
77
92
|
sha256
|
|
@@ -87,18 +102,18 @@ export default class DbStorage extends BaseStorage {
|
|
|
87
102
|
}
|
|
88
103
|
return cloudPath;
|
|
89
104
|
}
|
|
90
|
-
catch (
|
|
91
|
-
|
|
92
|
-
|
|
105
|
+
catch (e_2) {
|
|
106
|
+
env_2.error = e_2;
|
|
107
|
+
env_2.hasError = true;
|
|
93
108
|
}
|
|
94
109
|
finally {
|
|
95
|
-
__disposeResources(
|
|
110
|
+
__disposeResources(env_2);
|
|
96
111
|
}
|
|
97
112
|
}
|
|
98
113
|
async deleteFile(cloudPath) {
|
|
99
|
-
const
|
|
114
|
+
const env_3 = { stack: [], error: void 0, hasError: false };
|
|
100
115
|
try {
|
|
101
|
-
const scope = __addDisposableResource(
|
|
116
|
+
const scope = __addDisposableResource(env_3, await this.createScope(), false);
|
|
102
117
|
const db = scope.resolve(DbStorageContext);
|
|
103
118
|
const file = await db.dbFiles.where({ cloudPath }, (p) => (x) => x.path === p.cloudPath).first();
|
|
104
119
|
if (!file) {
|
|
@@ -116,18 +131,18 @@ export default class DbStorage extends BaseStorage {
|
|
|
116
131
|
await db.dbFiles.all()
|
|
117
132
|
.delete(file, (p) => (x) => x.fileID === p.fileID);
|
|
118
133
|
}
|
|
119
|
-
catch (
|
|
120
|
-
|
|
121
|
-
|
|
134
|
+
catch (e_3) {
|
|
135
|
+
env_3.error = e_3;
|
|
136
|
+
env_3.hasError = true;
|
|
122
137
|
}
|
|
123
138
|
finally {
|
|
124
|
-
__disposeResources(
|
|
139
|
+
__disposeResources(env_3);
|
|
125
140
|
}
|
|
126
141
|
}
|
|
127
142
|
async streamFile(cloudPath) {
|
|
128
|
-
const
|
|
143
|
+
const env_4 = { stack: [], error: void 0, hasError: false };
|
|
129
144
|
try {
|
|
130
|
-
const scope = __addDisposableResource(
|
|
145
|
+
const scope = __addDisposableResource(env_4, await this.createScope(), false);
|
|
131
146
|
const db = scope.resolve(DbStorageContext);
|
|
132
147
|
const file = await db.dbFiles.where({ cloudPath }, (p) => (x) => x.path === p.cloudPath).first();
|
|
133
148
|
if (!file) {
|
|
@@ -150,18 +165,18 @@ export default class DbStorage extends BaseStorage {
|
|
|
150
165
|
})());
|
|
151
166
|
return { contentType: "", stream };
|
|
152
167
|
}
|
|
153
|
-
catch (
|
|
154
|
-
|
|
155
|
-
|
|
168
|
+
catch (e_4) {
|
|
169
|
+
env_4.error = e_4;
|
|
170
|
+
env_4.hasError = true;
|
|
156
171
|
}
|
|
157
172
|
finally {
|
|
158
|
-
__disposeResources(
|
|
173
|
+
__disposeResources(env_4);
|
|
159
174
|
}
|
|
160
175
|
}
|
|
161
176
|
async createScope() {
|
|
162
|
-
const
|
|
177
|
+
const env_5 = { stack: [], error: void 0, hasError: false };
|
|
163
178
|
try {
|
|
164
|
-
const scope = __addDisposableResource(
|
|
179
|
+
const scope = __addDisposableResource(env_5, globalServices.createScope(), false);
|
|
165
180
|
const db = scope.create(DbStorageContext);
|
|
166
181
|
scope.add(DbStorageContext, db);
|
|
167
182
|
if (!seeded) {
|
|
@@ -170,12 +185,12 @@ export default class DbStorage extends BaseStorage {
|
|
|
170
185
|
}
|
|
171
186
|
return scope;
|
|
172
187
|
}
|
|
173
|
-
catch (
|
|
174
|
-
|
|
175
|
-
|
|
188
|
+
catch (e_5) {
|
|
189
|
+
env_5.error = e_5;
|
|
190
|
+
env_5.hasError = true;
|
|
176
191
|
}
|
|
177
192
|
finally {
|
|
178
|
-
__disposeResources(
|
|
193
|
+
__disposeResources(env_5);
|
|
179
194
|
}
|
|
180
195
|
}
|
|
181
196
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DbStorage.js","sourceRoot":"","sources":["../../../../src/server/storage/db/DbStorage.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"DbStorage.js","sourceRoot":"","sources":["../../../../src/server/storage/db/DbStorage.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,7 @@ import { LocalFile } from "@entity-access/server-pages/dist/core/LocalFile.js";
|
|
|
4
4
|
export default class S3Storage extends BaseStorage {
|
|
5
5
|
private client;
|
|
6
6
|
constructor();
|
|
7
|
+
verify(): Promise<void>;
|
|
7
8
|
streamFile(Key: string): Promise<{
|
|
8
9
|
contentType: string;
|
|
9
10
|
stream: Stream;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"S3Storage.d.ts","sourceRoot":"","sources":["../../../../src/server/storage/s3/S3Storage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC1C,OAAO,WAAW,MAAM,mBAAmB,CAAC;AAG5C,OAAO,EAAE,SAAS,EAAE,MAAM,oDAAoD,CAAC;AAM/E,MAAM,CAAC,OAAO,OAAO,SAAU,SAAQ,WAAW;IAE9C,OAAO,CAAC,MAAM,CAAW;;
|
|
1
|
+
{"version":3,"file":"S3Storage.d.ts","sourceRoot":"","sources":["../../../../src/server/storage/s3/S3Storage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC1C,OAAO,WAAW,MAAM,mBAAmB,CAAC;AAG5C,OAAO,EAAE,SAAS,EAAE,MAAM,oDAAoD,CAAC;AAM/E,MAAM,CAAC,OAAO,OAAO,SAAU,SAAQ,WAAW;IAE9C,OAAO,CAAC,MAAM,CAAW;;IAmBnB,MAAM;IAMN,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;IAWzE,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC;IAiBzD,UAAU,CAAC,GAAG,EAAE,MAAM;CAO/B"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import BaseStorage from "../BaseStorage.js";
|
|
2
|
-
import { S3Client, GetObjectCommand, PutObjectCommand, DeleteObjectCommand } from "@aws-sdk/client-s3";
|
|
2
|
+
import { S3Client, GetObjectCommand, PutObjectCommand, DeleteObjectCommand, ListBucketsCommand } from "@aws-sdk/client-s3";
|
|
3
3
|
import { globalEnv } from "../../../common/globalEnv.js";
|
|
4
4
|
const Bucket = globalEnv.s3.bucket ?? "test-bucket";
|
|
5
5
|
export default class S3Storage extends BaseStorage {
|
|
@@ -12,10 +12,15 @@ export default class S3Storage extends BaseStorage {
|
|
|
12
12
|
accessKeyId,
|
|
13
13
|
secretAccessKey
|
|
14
14
|
},
|
|
15
|
-
forcePathStyle: true,
|
|
15
|
+
forcePathStyle: endpoint ? true : false,
|
|
16
16
|
region,
|
|
17
17
|
});
|
|
18
18
|
}
|
|
19
|
+
async verify() {
|
|
20
|
+
await this.client.send(new ListBucketsCommand({
|
|
21
|
+
Bucket
|
|
22
|
+
}));
|
|
23
|
+
}
|
|
19
24
|
async streamFile(Key) {
|
|
20
25
|
const r = await this.client.send(new GetObjectCommand({
|
|
21
26
|
Bucket,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"S3Storage.js","sourceRoot":"","sources":["../../../../src/server/storage/s3/S3Storage.ts"],"names":[],"mappings":"AACA,OAAO,WAAW,MAAM,mBAAmB,CAAC;AAE5C,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"S3Storage.js","sourceRoot":"","sources":["../../../../src/server/storage/s3/S3Storage.ts"],"names":[],"mappings":"AACA,OAAO,WAAW,MAAM,mBAAmB,CAAC;AAE5C,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAE3H,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAEzD,MAAM,MAAM,GAAG,SAAS,CAAC,EAAE,CAAC,MAAM,IAAI,aAAa,CAAC;AAGpD,MAAM,CAAC,OAAO,OAAO,SAAU,SAAQ,WAAW;IAI9C;QACI,KAAK,EAAE,CAAC;QAER,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC,EAAE,CAAC;QAExE,IAAI,CAAC,MAAM,GAAG,IAAI,QAAQ,CAAC;YACvB,QAAQ;YACR,WAAW,EAAE;gBACT,WAAW;gBACX,eAAe;aAClB;YACD,cAAc,EAAE,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK;YACvC,MAAM;SACT,CAAC,CAAC;IAEP,CAAC;IAED,KAAK,CAAC,MAAM;QACR,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,kBAAkB,CAAC;YAC1C,MAAM;SACT,CAAC,CAAC,CAAC;IACR,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,GAAW;QACxB,MAAM,CAAC,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,gBAAgB,CAAC;YAClD,MAAM;YACN,GAAG;SACN,CAAC,CAAC,CAAC;QACJ,OAAO;YACH,WAAW,EAAE,CAAC,CAAC,WAAW;YAC1B,MAAM,EAAE,CAAC,CAAC,IAAc;SAC3B,CAAE;IACP,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,GAAW,EAAE,IAAe;QAEzC,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,QAAQ,CAAC,CAAC;QACtF,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;QAEvE,MAAM,IAAI,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QAEnC,MAAM,CAAC,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,gBAAgB,CAAC;YAClD,MAAM;YACN,GAAG;YACH,cAAc;YACd,UAAU;YACV,IAAI;SACP,CAAC,CAAC,CAAC;QACJ,OAAO,GAAG,CAAC;IACf,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,GAAW;QACxB,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,mBAAmB,CAAC;YAC3C,MAAM;YACN,GAAG;SACN,CAAC,CAAC,CAAC;IACR,CAAC;CAEJ"}
|
|
@@ -3,6 +3,7 @@ import { LocalFile } from "@entity-access/server-pages/dist/core/LocalFile.js";
|
|
|
3
3
|
export default class VolumeStorage extends BaseStorage {
|
|
4
4
|
private root;
|
|
5
5
|
constructor(root: string);
|
|
6
|
+
verify(): Promise<any>;
|
|
6
7
|
createFile(cloudPath: string, file: LocalFile): Promise<string>;
|
|
7
8
|
deleteFile(cloudPath: string): Promise<void>;
|
|
8
9
|
streamFile(cloudPath: string): Promise<{
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"VolumeStorage.d.ts","sourceRoot":"","sources":["../../../../src/server/storage/volume/VolumeStorage.ts"],"names":[],"mappings":"AACA,OAAO,WAAW,MAAM,mBAAmB,CAAC;AAM5C,OAAO,EAAE,SAAS,EAAE,MAAM,oDAAoD,CAAC;AAE/E,MAAM,CAAC,OAAO,OAAO,aAAc,SAAQ,WAAW;IAEtC,OAAO,CAAC,IAAI;gBAAJ,IAAI,EAAE,MAAM;
|
|
1
|
+
{"version":3,"file":"VolumeStorage.d.ts","sourceRoot":"","sources":["../../../../src/server/storage/volume/VolumeStorage.ts"],"names":[],"mappings":"AACA,OAAO,WAAW,MAAM,mBAAmB,CAAC;AAM5C,OAAO,EAAE,SAAS,EAAE,MAAM,oDAAoD,CAAC;AAE/E,MAAM,CAAC,OAAO,OAAO,aAAc,SAAQ,WAAW;IAEtC,OAAO,CAAC,IAAI;gBAAJ,IAAI,EAAE,MAAM;IAKhC,MAAM,IAAI,OAAO,CAAC,GAAG,CAAC;IAOhB,UAAU,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS;IAM7C,UAAU,CAAC,SAAS,EAAE,MAAM;IAQ5B,UAAU,CAAC,SAAS,EAAE,MAAM;;;;IASlC,OAAO,CAAC,UAAU;CAQrB"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import BaseStorage from "../BaseStorage.js";
|
|
2
2
|
import path from "path";
|
|
3
3
|
import { unlink, writeFile } from "fs/promises";
|
|
4
|
-
import { createReadStream, existsSync } from "fs";
|
|
4
|
+
import { createReadStream, existsSync, mkdirSync } from "fs";
|
|
5
5
|
import sleep from "../../../common/sleep.js";
|
|
6
6
|
import ensureDir, { ensureParentFolder } from "../../../common/FileApi.js";
|
|
7
7
|
export default class VolumeStorage extends BaseStorage {
|
|
@@ -10,6 +10,12 @@ export default class VolumeStorage extends BaseStorage {
|
|
|
10
10
|
this.root = root;
|
|
11
11
|
ensureDir(root);
|
|
12
12
|
}
|
|
13
|
+
verify() {
|
|
14
|
+
if (!existsSync(this.root)) {
|
|
15
|
+
mkdirSync(this.root, { recursive: true });
|
|
16
|
+
}
|
|
17
|
+
return Promise.resolve();
|
|
18
|
+
}
|
|
13
19
|
async createFile(cloudPath, file) {
|
|
14
20
|
const filePath = this.toFilePath(cloudPath, true);
|
|
15
21
|
await writeFile(filePath, file.openRead());
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"VolumeStorage.js","sourceRoot":"","sources":["../../../../src/server/storage/volume/VolumeStorage.ts"],"names":[],"mappings":"AACA,OAAO,WAAW,MAAM,mBAAmB,CAAC;AAC5C,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"VolumeStorage.js","sourceRoot":"","sources":["../../../../src/server/storage/volume/VolumeStorage.ts"],"names":[],"mappings":"AACA,OAAO,WAAW,MAAM,mBAAmB,CAAC;AAC5C,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,EAAE,gBAAgB,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,IAAI,CAAC;AAC7D,OAAO,KAAK,MAAM,0BAA0B,CAAC;AAC7C,OAAO,SAAS,EAAE,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAG3E,MAAM,CAAC,OAAO,OAAO,aAAc,SAAQ,WAAW;IAElD,YAAoB,IAAY;QAC5B,KAAK,EAAE,CAAC;QADQ,SAAI,GAAJ,IAAI,CAAQ;QAE5B,SAAS,CAAC,IAAI,CAAC,CAAC;IACpB,CAAC;IAED,MAAM;QACF,IAAG,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;YACxB,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC9C,CAAC;QACD,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC7B,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,SAAiB,EAAE,IAAe;QAC/C,MAAM,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;QAClD,MAAM,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC3C,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,SAAiB;QAC9B,MAAM,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;QAC5C,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;YACxB,OAAO;QACX,CAAC;QACD,MAAM,MAAM,CAAC,QAAQ,CAAC,CAAC;IAC3B,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,SAAiB;QAC9B,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC;QACf,MAAM,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;QAC5C,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;YACxB,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC;QAC3C,CAAC;QACD,OAAO,EAAE,WAAW,EAAE,EAAE,EAAE,MAAM,EAAE,gBAAgB,CAAC,QAAQ,CAAC,EAAC,CAAC;IAClE,CAAC;IAEO,UAAU,CAAC,SAAiB,EAAE,MAAM,GAAG,KAAK;QAChD,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QACjD,IAAI,MAAM,EAAE,CAAC;YACT,kBAAkB,CAAC,QAAQ,CAAC,CAAC;QACjC,CAAC;QACD,OAAO,QAAQ,CAAC;IACpB,CAAC;CAEJ"}
|