@antelopejs/dms-media 0.6.0 → 0.6.1
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/README.md +3 -3
- package/dist/db/models/mediaFolders.model.d.ts +0 -3
- package/dist/db/models/mediaFolders.model.js +0 -29
- package/dist/db/models/mediaFolders.model.js.map +1 -1
- package/dist/db/tables/mediaDeclarations.table.d.ts +0 -4
- package/dist/db/tables/mediaDeclarations.table.js +0 -16
- package/dist/db/tables/mediaDeclarations.table.js.map +1 -1
- package/dist/declared/assets.d.ts +0 -2
- package/dist/declared/assets.js +12 -140
- package/dist/declared/assets.js.map +1 -1
- package/dist/declared/folders.d.ts +1 -5
- package/dist/declared/folders.js +14 -80
- package/dist/declared/folders.js.map +1 -1
- package/dist/declared/index.d.ts +0 -2
- package/dist/declared/index.js +0 -2
- package/dist/declared/index.js.map +1 -1
- package/dist/declared/records.d.ts +2 -30
- package/dist/declared/records.js +3 -33
- package/dist/declared/records.js.map +1 -1
- package/dist/derivatives.js +5 -17
- package/dist/derivatives.js.map +1 -1
- package/dist/implementations/interface-dms-media/index.d.ts +1 -3
- package/dist/implementations/interface-dms-media/index.js +0 -2
- package/dist/implementations/interface-dms-media/index.js.map +1 -1
- package/dist/routes/media/delivery-stream.js +7 -21
- package/dist/routes/media/delivery-stream.js.map +1 -1
- package/dist/routes/media/upload.js +2 -5
- package/dist/routes/media/upload.js.map +1 -1
- package/dist/test/antelope.test.js +4 -4
- package/dist/test/integration/media-declared-content.test.js +17 -317
- package/dist/test/integration/media-declared-content.test.js.map +1 -1
- package/dist/test/integration/media-linked-subfolders.test.js +2 -2
- package/dist/test/integration/media-linked-subfolders.test.js.map +1 -1
- package/dist/test/integration/media-storage-origin-unreachable.test.js +79 -0
- package/dist/test/integration/media-storage-origin-unreachable.test.js.map +1 -0
- package/dist/test/unit/declared.test.js +0 -66
- package/dist/test/unit/declared.test.js.map +1 -1
- package/dist/test/unit/library/realtime.test.js +1 -0
- package/dist/test/unit/library/realtime.test.js.map +1 -1
- package/dist/validation/declared.schema.d.ts +7 -36
- package/dist/validation/declared.schema.js +1 -12
- package/dist/validation/declared.schema.js.map +1 -1
- package/frontend-vue/package.json +1 -1
- package/package.json +8 -8
- package/skills/dms-media/SKILL.md +11 -24
- package/src/db/models/mediaFolders.model.ts +0 -44
- package/src/db/tables/mediaDeclarations.table.ts +3 -19
- package/src/declared/assets.ts +19 -210
- package/src/declared/folders.ts +22 -135
- package/src/declared/index.ts +0 -2
- package/src/declared/records.ts +8 -82
- package/src/derivatives.ts +7 -17
- package/src/implementations/interface-dms-media/index.ts +1 -8
- package/src/routes/media/delivery-stream.ts +12 -28
- package/src/routes/media/upload.ts +4 -6
- package/src/test/antelope.test.ts +4 -4
- package/src/test/integration/media-declared-content.test.ts +17 -360
- package/src/test/integration/media-linked-subfolders.test.ts +2 -2
- package/src/test/integration/media-storage-origin-unreachable.test.ts +110 -0
- package/src/test/unit/declared.test.ts +0 -87
- package/src/test/unit/library/realtime.test.ts +2 -0
- package/src/validation/declared.schema.ts +0 -13
- package/dist/declared/readiness.d.ts +0 -2
- package/dist/declared/readiness.js +0 -52
- package/dist/declared/readiness.js.map +0 -1
- package/dist/declared/retire.d.ts +0 -3
- package/dist/declared/retire.js +0 -118
- package/dist/declared/retire.js.map +0 -1
- package/dist/test/integration/media-declared-retire.test.js +0 -186
- package/dist/test/integration/media-declared-retire.test.js.map +0 -1
- package/src/declared/readiness.ts +0 -64
- package/src/declared/retire.ts +0 -206
- package/src/test/integration/media-declared-retire.test.ts +0 -257
- /package/dist/test/integration/{media-declared-retire.test.d.ts → media-storage-origin-unreachable.test.d.ts} +0 -0
package/dist/declared/records.js
CHANGED
|
@@ -2,15 +2,10 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.MediaDeclarationError = exports.DECLARED_CONTENT_AUTHOR = void 0;
|
|
4
4
|
exports.declaredModels = declaredModels;
|
|
5
|
-
exports.hashState = hashState;
|
|
6
|
-
exports.hashBytes = hashBytes;
|
|
7
5
|
exports.parseDeclaration = parseDeclaration;
|
|
8
6
|
exports.withDeclarationLock = withDeclarationLock;
|
|
9
7
|
exports.settlePendingDeclaration = settlePendingDeclaration;
|
|
10
|
-
exports.
|
|
11
|
-
exports.judgeMemberChange = judgeMemberChange;
|
|
12
|
-
exports.judgeDeclaredRow = judgeDeclaredRow;
|
|
13
|
-
const node_crypto_1 = require("node:crypto");
|
|
8
|
+
exports.rememberDeclaration = rememberDeclaration;
|
|
14
9
|
const interface_database_decorators_1 = require("@antelopejs/interface-database-decorators");
|
|
15
10
|
const db_1 = require("../db");
|
|
16
11
|
const declared_schema_1 = require("../validation/declared.schema");
|
|
@@ -37,12 +32,6 @@ function declaredModels(tenantId) {
|
|
|
37
32
|
declarationModel: (0, interface_database_decorators_1.GetModel)(db_1.MediaDeclarationModel, tenantId),
|
|
38
33
|
};
|
|
39
34
|
}
|
|
40
|
-
function hashState(state) {
|
|
41
|
-
return (0, node_crypto_1.createHash)("sha256").update(JSON.stringify(state)).digest("hex");
|
|
42
|
-
}
|
|
43
|
-
function hashBytes(bytes) {
|
|
44
|
-
return (0, node_crypto_1.createHash)("sha256").update(bytes).digest("hex");
|
|
45
|
-
}
|
|
46
35
|
function parseDeclaration(kind, input, schema) {
|
|
47
36
|
const parsed = schema.safeParse(input);
|
|
48
37
|
if (parsed.success)
|
|
@@ -69,26 +58,7 @@ function withDeclarationLock(tenantId, kind, key, work) {
|
|
|
69
58
|
async function settlePendingDeclaration(tenantId, kind, key) {
|
|
70
59
|
await pendingDeclarations.get(lockKey(tenantId, kind, key));
|
|
71
60
|
}
|
|
72
|
-
async function
|
|
73
|
-
|
|
74
|
-
await model.update(existing._id, applied);
|
|
75
|
-
return;
|
|
76
|
-
}
|
|
77
|
-
await model.insert(applied);
|
|
78
|
-
}
|
|
79
|
-
function judgeMemberChange(record, row, stateHash) {
|
|
80
|
-
if (!row)
|
|
81
|
-
return { status: "deleted" };
|
|
82
|
-
if (stateHash !== record.appliedHash)
|
|
83
|
-
return { status: "preserved", id: row._id };
|
|
84
|
-
return undefined;
|
|
85
|
-
}
|
|
86
|
-
function judgeDeclaredRow(record, row, stateHash, declaredHash) {
|
|
87
|
-
const change = judgeMemberChange(record, row, stateHash);
|
|
88
|
-
if (change || !row)
|
|
89
|
-
return change;
|
|
90
|
-
if (record.declaredHash === declaredHash)
|
|
91
|
-
return { status: "unchanged", id: row._id };
|
|
92
|
-
return undefined;
|
|
61
|
+
async function rememberDeclaration(models, kind, key, targetId) {
|
|
62
|
+
await models.declarationModel.insert({ kind, key, targetId });
|
|
93
63
|
}
|
|
94
64
|
//# sourceMappingURL=records.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"records.js","sourceRoot":"","sources":["../../src/declared/records.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"records.js","sourceRoot":"","sources":["../../src/declared/records.ts"],"names":[],"mappings":";;;AAqCA,wCAOC;AAGD,4CAaC;AAgBD,kDAeC;AAGD,4DAMC;AAGD,kDAOC;AA9GD,6FAAqE;AAErE,8BAKe;AAEf,mEAA0E;AAG7D,QAAA,uBAAuB,GAAqB;IACvD,GAAG,EAAE,oBAAoB;IACzB,IAAI,EAAE,QAAQ;IACd,KAAK,EAAE,EAAE;CACV,CAAC;AAEF,MAAM,WAAW,GAAyC;IACxD,MAAM,EAAE,cAAc;IACtB,KAAK,EAAE,YAAY;CACpB,CAAC;AAGF,MAAa,qBAAsB,SAAQ,KAAK;IAC9C,YAAY,IAA0B,EAAE,GAAW,EAAE,MAAc;QACjE,KAAK,CAAC,GAAG,WAAW,CAAC,IAAI,CAAC,KAAK,GAAG,MAAM,MAAM,EAAE,CAAC,CAAC;IACpD,CAAC;CACF;AAJD,sDAIC;AASD,SAAgB,cAAc,CAAC,QAAgB;IAC7C,OAAO;QACL,QAAQ;QACR,WAAW,EAAE,IAAA,wCAAQ,EAAC,qBAAgB,EAAE,QAAQ,CAAC;QACjD,UAAU,EAAE,IAAA,wCAAQ,EAAC,oBAAe,EAAE,QAAQ,CAAC;QAC/C,gBAAgB,EAAE,IAAA,wCAAQ,EAAC,0BAAqB,EAAE,QAAQ,CAAC;KAC5D,CAAC;AACJ,CAAC;AAGD,SAAgB,gBAAgB,CAC9B,IAA0B,EAC1B,KAAc,EACd,MAAc;IAEd,MAAM,MAAM,GAAG,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IACvC,IAAI,MAAM,CAAC,OAAO;QAAE,OAAO,MAAM,CAAC,IAAmC,CAAC;IACtE,MAAM,GAAG,GAAI,KAAuC,EAAE,GAAG,CAAC;IAC1D,MAAM,IAAI,qBAAqB,CAC7B,IAAI,EACJ,OAAO,GAAG,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EACnC,IAAA,2CAAyB,EAAC,MAAM,CAAC,KAAiB,CAAC,CACpD,CAAC;AACJ,CAAC;AAED,MAAM,mBAAmB,GAAG,IAAI,GAAG,EAA4B,CAAC;AAEhE,SAAS,OAAO,CACd,QAAgB,EAChB,IAA0B,EAC1B,GAAW;IAEX,OAAO,IAAI,CAAC,SAAS,CAAC,CAAC,QAAQ,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC;AAC/C,CAAC;AAMD,SAAgB,mBAAmB,CACjC,QAAgB,EAChB,IAA0B,EAC1B,GAAW,EACX,IAAsB;IAEtB,MAAM,EAAE,GAAG,OAAO,CAAC,QAAQ,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;IACxC,MAAM,QAAQ,GAAG,mBAAmB,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;IAClE,MAAM,IAAI,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACxD,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;IAC5C,mBAAmB,CAAC,GAAG,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;IACrC,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE;QACrB,IAAI,mBAAmB,CAAC,GAAG,CAAC,EAAE,CAAC,KAAK,OAAO;YAAE,mBAAmB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IAC9E,CAAC,CAAC,CAAC;IACH,OAAO,IAAI,CAAC;AACd,CAAC;AAGM,KAAK,UAAU,wBAAwB,CAC5C,QAAgB,EAChB,IAA0B,EAC1B,GAAW;IAEX,MAAM,mBAAmB,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC;AAC9D,CAAC;AAGM,KAAK,UAAU,mBAAmB,CACvC,MAAsB,EACtB,IAA0B,EAC1B,GAAW,EACX,QAAgB;IAEhB,MAAM,MAAM,CAAC,gBAAgB,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC,CAAC;AAChE,CAAC"}
|
package/dist/derivatives.js
CHANGED
|
@@ -12,13 +12,13 @@ exports.commitDerivative = commitDerivative;
|
|
|
12
12
|
exports.partitionDerivatives = partitionDerivatives;
|
|
13
13
|
exports.ensureDerivative = ensureDerivative;
|
|
14
14
|
const node_crypto_1 = require("node:crypto");
|
|
15
|
+
const consumers_1 = require("node:stream/consumers");
|
|
15
16
|
const interface_file_storage_1 = require("@antelopejs/interface-file-storage");
|
|
16
17
|
const sharp_1 = __importDefault(require("sharp"));
|
|
17
18
|
const asset_lifecycle_1 = require("./asset-lifecycle");
|
|
18
19
|
const constants_1 = require("./constants");
|
|
19
20
|
const image_limits_1 = require("./image-limits");
|
|
20
21
|
const presets_1 = require("./presets");
|
|
21
|
-
const read_urls_1 = require("./read-urls");
|
|
22
22
|
const storage_keys_1 = require("./routes/media/storage-keys");
|
|
23
23
|
const DERIVATIVES_PATH_PREFIX = "media-derivatives";
|
|
24
24
|
const GENERATION_FAILURE_RETRY_MS = 60_000;
|
|
@@ -33,29 +33,17 @@ exports.UnreadableImageError = UnreadableImageError;
|
|
|
33
33
|
const generationLocks = new Map();
|
|
34
34
|
const generationFailures = new Map();
|
|
35
35
|
async function downloadStorageBytes(storageKey, storage) {
|
|
36
|
-
|
|
37
|
-
if (!response.ok) {
|
|
38
|
-
throw new Error(`Failed to download ${storageKey}: ${response.status}`);
|
|
39
|
-
}
|
|
40
|
-
return Buffer.from(await response.arrayBuffer());
|
|
36
|
+
return (0, consumers_1.buffer)((await (0, interface_file_storage_1.ReadFile)(storageKey, storage)).body);
|
|
41
37
|
}
|
|
42
38
|
async function uploadStorageBytes(bytes, filename, mimetype, path, storage) {
|
|
43
|
-
const
|
|
39
|
+
const { resourceKey } = await (0, interface_file_storage_1.WriteFile)({
|
|
44
40
|
filename,
|
|
45
41
|
size: bytes.byteLength,
|
|
46
42
|
mimetype,
|
|
47
43
|
path,
|
|
48
44
|
metadata: { [constants_1.ORIGINAL_FILENAME_METADATA_KEY]: filename },
|
|
49
|
-
}, undefined, storage);
|
|
50
|
-
|
|
51
|
-
method: "PUT",
|
|
52
|
-
headers: presigned.headers,
|
|
53
|
-
body: new Uint8Array(bytes),
|
|
54
|
-
});
|
|
55
|
-
if (!response.ok) {
|
|
56
|
-
throw new Error(`Failed to upload ${filename}: ${response.status}`);
|
|
57
|
-
}
|
|
58
|
-
return presigned.resourceKey;
|
|
45
|
+
}, bytes, undefined, storage);
|
|
46
|
+
return resourceKey;
|
|
59
47
|
}
|
|
60
48
|
async function readSourceMetadata(source) {
|
|
61
49
|
try {
|
package/dist/derivatives.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"derivatives.js","sourceRoot":"","sources":["../src/derivatives.ts"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"derivatives.js","sourceRoot":"","sources":["../src/derivatives.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { AssetBindingConfig } from "@antelopejs/interface-dms-media";
|
|
2
|
-
import { ensureDeclaredFolder, importDeclaredAsset
|
|
2
|
+
import { ensureDeclaredFolder, importDeclaredAsset } from "../../declared";
|
|
3
3
|
export declare namespace internal {
|
|
4
4
|
const RegisterAssetBinding: {
|
|
5
5
|
register: (id: string, config: AssetBindingConfig) => void;
|
|
@@ -7,6 +7,4 @@ export declare namespace internal {
|
|
|
7
7
|
};
|
|
8
8
|
const EnsureMediaFolder: typeof ensureDeclaredFolder;
|
|
9
9
|
const ImportMediaAsset: typeof importDeclaredAsset;
|
|
10
|
-
const RetireMediaDeclaration: typeof retireDeclaration;
|
|
11
|
-
const PruneMediaDeclarations: typeof pruneDeclarations;
|
|
12
10
|
}
|
|
@@ -15,7 +15,5 @@ var internal;
|
|
|
15
15
|
};
|
|
16
16
|
internal.EnsureMediaFolder = declared_1.ensureDeclaredFolder;
|
|
17
17
|
internal.ImportMediaAsset = declared_1.importDeclaredAsset;
|
|
18
|
-
internal.RetireMediaDeclaration = declared_1.retireDeclaration;
|
|
19
|
-
internal.PruneMediaDeclarations = declared_1.pruneDeclarations;
|
|
20
18
|
})(internal || (exports.internal = internal = {}));
|
|
21
19
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/implementations/interface-dms-media/index.ts"],"names":[],"mappings":";;;AACA,6CAAqE;AACrE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/implementations/interface-dms-media/index.ts"],"names":[],"mappings":";;;AACA,6CAAqE;AACrE,6CAA2E;AAE3E,IAAiB,QAAQ,CAWxB;AAXD,WAAiB,QAAQ;IACV,6BAAoB,GAAG;QAClC,QAAQ,EAAE,CAAC,EAAU,EAAE,MAA0B,EAAQ,EAAE;YACzD,IAAA,0BAAe,EAAC,EAAE,EAAE,MAAM,CAAC,CAAC;QAC9B,CAAC;QACD,UAAU,EAAE,CAAC,EAAU,EAAQ,EAAE;YAC/B,IAAA,6BAAkB,EAAC,EAAE,CAAC,CAAC;QACzB,CAAC;KACF,CAAC;IACW,0BAAiB,GAAG,+BAAoB,CAAC;IACzC,yBAAgB,GAAG,8BAAmB,CAAC;AACtD,CAAC,EAXgB,QAAQ,wBAAR,QAAQ,QAWxB"}
|
|
@@ -3,11 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.openPublicCors = openPublicCors;
|
|
4
4
|
exports.streamStoredFile = streamStoredFile;
|
|
5
5
|
const node_crypto_1 = require("node:crypto");
|
|
6
|
-
const node_stream_1 = require("node:stream");
|
|
7
6
|
const interface_api_util_1 = require("@antelopejs/interface-api-util");
|
|
8
|
-
const
|
|
7
|
+
const interface_file_storage_1 = require("@antelopejs/interface-file-storage");
|
|
9
8
|
const constants_1 = require("./constants");
|
|
10
9
|
const delivery_headers_1 = require("./delivery-headers");
|
|
10
|
+
const HTTP_OK = 200;
|
|
11
11
|
const HTTP_NOT_MODIFIED = 304;
|
|
12
12
|
const HTTP_BAD_GATEWAY = 502;
|
|
13
13
|
const ETAG_HASH_LENGTH = 24;
|
|
@@ -15,11 +15,6 @@ const ANY_MATCH = "*";
|
|
|
15
15
|
const ANY_ORIGIN = "*";
|
|
16
16
|
const DENIED_ORIGIN = "false";
|
|
17
17
|
const HEAD_METHOD = "HEAD";
|
|
18
|
-
const FORWARDED_UPSTREAM_HEADERS = [
|
|
19
|
-
"Content-Length",
|
|
20
|
-
"Content-Range",
|
|
21
|
-
"Accept-Ranges",
|
|
22
|
-
];
|
|
23
18
|
function openPublicCors(response) {
|
|
24
19
|
const origin = response.peekHeaders()?.["Access-Control-Allow-Origin"];
|
|
25
20
|
if (origin && origin !== DENIED_ORIGIN)
|
|
@@ -54,12 +49,6 @@ function addRepresentationHeaders(response, file, etag) {
|
|
|
54
49
|
if (file.isPublic)
|
|
55
50
|
openPublicCors(response);
|
|
56
51
|
}
|
|
57
|
-
async function fetchUpstream(ctx, file) {
|
|
58
|
-
const range = ctx.rawRequest.headers.range;
|
|
59
|
-
const upstream = await fetch(await (0, read_urls_1.signedReadUrl)(file.storageKey, file.storage), { headers: range ? { Range: range } : {} });
|
|
60
|
-
(0, interface_api_util_1.assert)(upstream.ok && upstream.body, HTTP_BAD_GATEWAY, "File unavailable");
|
|
61
|
-
return upstream;
|
|
62
|
-
}
|
|
63
52
|
async function streamStoredFile(ctx, file) {
|
|
64
53
|
const response = ctx.response;
|
|
65
54
|
const etag = entityTag(file.storageKey);
|
|
@@ -69,14 +58,11 @@ async function streamStoredFile(ctx, file) {
|
|
|
69
58
|
response.setBody("");
|
|
70
59
|
return response;
|
|
71
60
|
}
|
|
72
|
-
const
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
}
|
|
78
|
-
const stream = response.getWriteStream((0, delivery_headers_1.normalizedMimetype)(file.mimetype), upstream.status);
|
|
79
|
-
const body = node_stream_1.Readable.fromWeb(upstream.body);
|
|
61
|
+
const stored = await (0, interface_file_storage_1.ReadFile)(file.storageKey, file.storage).catch(() => undefined);
|
|
62
|
+
(0, interface_api_util_1.assert)(stored, HTTP_BAD_GATEWAY, "File unavailable");
|
|
63
|
+
response.addHeader("Content-Length", String(stored.size));
|
|
64
|
+
const stream = response.getWriteStream((0, delivery_headers_1.normalizedMimetype)(file.mimetype), HTTP_OK);
|
|
65
|
+
const body = stored.body;
|
|
80
66
|
if (ctx.rawRequest.method === HEAD_METHOD) {
|
|
81
67
|
body.destroy();
|
|
82
68
|
stream.end();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"delivery-stream.js","sourceRoot":"","sources":["../../../src/routes/media/delivery-stream.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"delivery-stream.js","sourceRoot":"","sources":["../../../src/routes/media/delivery-stream.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,6 +15,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
15
15
|
exports.MediaUploadController = void 0;
|
|
16
16
|
const controller_1 = require("./controller");
|
|
17
17
|
const node_crypto_1 = require("node:crypto");
|
|
18
|
+
const consumers_1 = require("node:stream/consumers");
|
|
18
19
|
const interface_api_1 = require("@antelopejs/interface-api");
|
|
19
20
|
const interface_api_util_1 = require("@antelopejs/interface-api-util");
|
|
20
21
|
const interface_file_storage_1 = require("@antelopejs/interface-file-storage");
|
|
@@ -50,11 +51,7 @@ function mediaUploadPath(tenantId, folderId) {
|
|
|
50
51
|
return `media/${tenantId}/${folderId}`;
|
|
51
52
|
}
|
|
52
53
|
async function readStoredFile(storageKey, storage) {
|
|
53
|
-
|
|
54
|
-
const response = await fetch(readUrl.url);
|
|
55
|
-
if (!response.ok)
|
|
56
|
-
return undefined;
|
|
57
|
-
return Buffer.from(await response.arrayBuffer());
|
|
54
|
+
return (0, consumers_1.buffer)((await (0, interface_file_storage_1.ReadFile)(storageKey, storage)).body);
|
|
58
55
|
}
|
|
59
56
|
async function readImage(resourceKey, metadata) {
|
|
60
57
|
const storage = (0, config_1.getMediaConfig)().storage;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/routes/media/upload.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6CAAkD;AAClD,6CAAyC;AACzC,6DAAuE;AACvE,uEAA0E;AAC1E,+EAQ4C;AAC5C,uFAAkF;AAClF,6CAAgD;AAChD,yCAA8C;AAC9C,+CAAiE;AACjE,iCAA4C;AAC5C,mDAA4D;AAC5D,uDAO6B;AAC7B,qDAAsD;AACtD,uDAAuD;AACvD,gEAGuC;AACvC,kEAGwC;AACxC,uCAAyE;AACzE,+BAAsC;AAItC,MAAM,gBAAgB,GAAG,GAAG,CAAC;AAG7B,KAAK,UAAU,aAAa,CAAI,KAA2B;IACzD,IAAI,CAAC;QACH,OAAO,MAAM,KAAK,EAAE,CAAC;IACvB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,CAAC,CAAC,KAAK,YAAY,kCAAkB,CAAC;YAAE,MAAM,KAAK,CAAC;QACxD,MAAM,IAAI,0BAAU,CAAC,KAAK,CAAC,MAAM,EAAE;YACjC,MAAM,EAAE,KAAK,CAAC,MAAM;YACpB,OAAO,EAAE,KAAK,CAAC,OAAO;YACtB,GAAG,KAAK,CAAC,OAAO;SACjB,CAAC,CAAC;IACL,CAAC;AACH,CAAC;AAED,SAAS,eAAe,CAAC,QAAgB,EAAE,QAAgB;IACzD,OAAO,SAAS,QAAQ,IAAI,QAAQ,EAAE,CAAC;AACzC,CAAC;AAED,KAAK,UAAU,cAAc,CAC3B,UAAkB,EAClB,OAA2B;IAE3B,
|
|
1
|
+
{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/routes/media/upload.ts"],"names":[],"mappings":"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"}
|
|
@@ -100,7 +100,7 @@ exports.default = (0, config_1.defineConfig)({
|
|
|
100
100
|
source: {
|
|
101
101
|
type: "package",
|
|
102
102
|
package: "@antelopejs/dms",
|
|
103
|
-
version: ">=0.
|
|
103
|
+
version: ">=0.11.0 <1.0.0",
|
|
104
104
|
},
|
|
105
105
|
config: {
|
|
106
106
|
clientBaseUrl: `http://127.0.0.1:${API_PORT}`,
|
|
@@ -116,7 +116,7 @@ exports.default = (0, config_1.defineConfig)({
|
|
|
116
116
|
source: {
|
|
117
117
|
type: "package",
|
|
118
118
|
package: "@antelopejs/mongodb",
|
|
119
|
-
version: "1.
|
|
119
|
+
version: "1.5.0",
|
|
120
120
|
},
|
|
121
121
|
},
|
|
122
122
|
"auth-jwt": {
|
|
@@ -133,7 +133,7 @@ exports.default = (0, config_1.defineConfig)({
|
|
|
133
133
|
source: {
|
|
134
134
|
type: "package",
|
|
135
135
|
package: "@antelopejs/api",
|
|
136
|
-
version: "1.
|
|
136
|
+
version: "1.5.0",
|
|
137
137
|
},
|
|
138
138
|
config: {
|
|
139
139
|
servers: [{ protocol: "http", host: "127.0.0.1", port: API_PORT }],
|
|
@@ -144,7 +144,7 @@ exports.default = (0, config_1.defineConfig)({
|
|
|
144
144
|
source: {
|
|
145
145
|
type: "package",
|
|
146
146
|
package: "@antelopejs/file-storage-local",
|
|
147
|
-
version: "0.1.
|
|
147
|
+
version: "0.1.13",
|
|
148
148
|
},
|
|
149
149
|
},
|
|
150
150
|
nodemailer: {
|