@dimah-s3/server 1.4.2 → 1.5.0
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/api/index.js +101 -4
- package/dist/api/index.js.map +1 -1
- package/dist/api/routes/multipart/init.d.ts.map +1 -1
- package/dist/api/routes/upload.d.ts.map +1 -1
- package/dist/helpers/index.d.ts +1 -0
- package/dist/helpers/index.d.ts.map +1 -1
- package/dist/helpers/object-s3.d.ts +21 -0
- package/dist/helpers/object-s3.d.ts.map +1 -0
- package/dist/helpers/resolve-route.d.ts +2 -5
- package/dist/helpers/resolve-route.d.ts.map +1 -1
- package/dist/helpers/resolve-target.d.ts +2 -2
- package/dist/helpers/resolve-target.d.ts.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +120 -10
- package/dist/index.js.map +1 -1
- package/dist/plugins.js +105 -8
- package/dist/plugins.js.map +1 -1
- package/dist/put.d.ts.map +1 -1
- package/dist/types/config.d.ts +2 -1
- package/dist/types/config.d.ts.map +1 -1
- package/dist/types/hook-contexts.d.ts +18 -1
- package/dist/types/hook-contexts.d.ts.map +1 -1
- package/dist/types/index.d.ts +1 -1
- package/dist/types/index.d.ts.map +1 -1
- package/package.json +6 -6
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolve-route.d.ts","sourceRoot":"","sources":["../../src/helpers/resolve-route.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"resolve-route.d.ts","sourceRoot":"","sources":["../../src/helpers/resolve-route.ts"],"names":[],"mappings":"AAGA,OAAO,EAGL,KAAK,cAAc,EACpB,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EACV,WAAW,EACX,qBAAqB,EACrB,aAAa,EACb,cAAc,EACd,mBAAmB,EACpB,MAAM,SAAS,CAAC;AAEjB,MAAM,MAAM,YAAY,CAAC,CAAC,SAAS,cAAc,IAAI;IACnD,KAAK,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC;IACtB,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,mBAAmB,CAAC;CAC7B,CAAC;AAEF,MAAM,MAAM,kBAAkB,CAAC,CAAC,SAAS,QAAQ,GAAG,WAAW,IAC7D,YAAY,CAAC,CAAC,CAAC,GAAG,cAAc,CAAC;AAEnC,MAAM,MAAM,eAAe,GAAG;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACnC,CAAC;AAEF,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,qBAAqB,EAC7B,IAAI,EAAE,MAAM,GACX,aAAa,CAMf;AAUD,sFAAsF;AACtF,wBAAgB,oBAAoB,CAAC,CAAC,SAAS,cAAc,EAC3D,KAAK,EAAE,aAAa,EACpB,OAAO,EAAE,CAAC,GACT,OAAO,CAAC,KAAK,IAAI,WAAW,CAAC,CAAC,CAAC,CAIjC;AAED,gFAAgF;AAChF,wBAAsB,SAAS,CAAC,CAAC,SAAS,cAAc,EACtD,MAAM,EAAE,qBAAqB,EAC7B,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,CAAC,GACT,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAKzB;AAED,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE,IAAI,CAAC,aAAa,EAAE,MAAM,GAAG,QAAQ,CAAC,EAC7C,GAAG,EAAE,MAAM,GACV,mBAAmB,CAErB;AAED;;;GAGG;AACH,wBAAsB,gBAAgB,CAAC,CAAC,SAAS,QAAQ,GAAG,WAAW,EACrE,MAAM,EAAE,qBAAqB,EAC7B,KAAK,EAAE,eAAe,EACtB,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,CAAC,GACT,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAwBhC;AAED,6DAA6D;AAC7D,wBAAsB,gBAAgB,CAAC,CAAC,SAAS,cAAc,EAC7D,MAAM,EAAE,qBAAqB,EAC7B,KAAK,EAAE;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,EACrC,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,CAAC,GACT,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAQ1B"}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import { normalizeObjectKey, type S3ObjectAcl } from "@dimah-s3/core";
|
|
2
|
-
import type { OpenedRoute, ResolvedRoute, UploadObjectContext } from "../types";
|
|
2
|
+
import type { ObjectS3Headers, OpenedRoute, ResolvedRoute, UploadObjectContext } from "../types";
|
|
3
3
|
export type ResolvedObject = {
|
|
4
4
|
key: string;
|
|
5
5
|
bucket: string;
|
|
6
6
|
metadata?: Record<string, string>;
|
|
7
7
|
acl: S3ObjectAcl;
|
|
8
|
-
};
|
|
8
|
+
} & ObjectS3Headers;
|
|
9
9
|
type RouteKeyPrefix = ResolvedRoute["keyPrefix"];
|
|
10
10
|
/**
|
|
11
11
|
* Strip leading/trailing slashes and reject `.` / `..` / empty segments,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolve-target.d.ts","sourceRoot":"","sources":["../../src/helpers/resolve-target.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAElB,KAAK,WAAW,EACjB,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"resolve-target.d.ts","sourceRoot":"","sources":["../../src/helpers/resolve-target.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAElB,KAAK,WAAW,EACjB,MAAM,gBAAgB,CAAC;AAKxB,OAAO,KAAK,EACV,eAAe,EACf,WAAW,EACX,aAAa,EACb,mBAAmB,EAEpB,MAAM,SAAS,CAAC;AAEjB,MAAM,MAAM,cAAc,GAAG;IAC3B,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAClC,GAAG,EAAE,WAAW,CAAC;CAClB,GAAG,eAAe,CAAC;AAEpB,KAAK,cAAc,GAAG,aAAa,CAAC,WAAW,CAAC,CAAC;AAEjD;;;GAGG;AACH,OAAO,EAAE,kBAAkB,EAAE,CAAC;AAE9B;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAIvD;AAUD,yEAAyE;AACzE,wBAAgB,kBAAkB,CAChC,SAAS,EAAE,cAAc,EACzB,GAAG,EAAE,MAAM,GACV,MAAM,CAIR;AAED,kFAAkF;AAClF,wBAAgB,eAAe,CAC7B,GAAG,EAAE,MAAM,EACX,SAAS,EAAE,cAAc,GACxB,MAAM,CAMR;AAgBD,uFAAuF;AACvF,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,MAAM,GAAG,KAAK,EACtB,QAAQ,EAAE,MAAM,GACf,MAAM,CAIR;AASD,wBAAsB,mBAAmB,CACvC,KAAK,EAAE,WAAW,CAAC,QAAQ,GAAG,WAAW,CAAC,EAC1C,OAAO,EAAE,IAAI,CAAC,mBAAmB,EAAE,QAAQ,GAAG,WAAW,CAAC,GACzD,OAAO,CAAC,cAAc,CAAC,CAiCzB;AAED,wBAAgB,mBAAmB,CACjC,KAAK,EAAE,aAAa,EACpB,GAAG,EAAE,MAAM,GACV;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAKjC"}
|
package/dist/index.d.ts
CHANGED
|
@@ -11,5 +11,5 @@ export { chainHooks, definePlugin } from "./plugin";
|
|
|
11
11
|
export type { DimahS3Plugin, DimahS3PluginHooks, PluginContextMap, PluginEndpointMap, PluginInitEnv, } from "./plugin";
|
|
12
12
|
export { ROUTE_FEATURES, ROUTE_OPERATIONS } from "./types";
|
|
13
13
|
export { isFeatureOn } from "./helpers";
|
|
14
|
-
export type { DeleteConfig, DeleteGuardContext, DeleteOnDeletedContext, DimahS3Config, DimahS3Logger, DimahS3RouteConfig, DisabledFeature, DownloadConfig, DownloadGuardContext, DownloadOnPresignedContext, DownloadResolveInfo, EnabledFeature, EnabledUploadConfig, FeatureToggle, GuardContext, MultipartConfig, MultipartOnAbortContext, MultipartOnInitContext, MultipartOnListContext, MultipartGuardContext, MultipartUploadContext, ObjectFile, OpenedRoute, ResolvedDimahS3Config, ResolvedFeature, ResolvedRoute, ResolvedUploadConfig, RouteFeature, RouteGuardContext, RouteOperation, StoredObjectContext, UploadConfig, UploadConfirmGuardContext, UploadGuardContext, UploadObjectContext, UploadObjectInfo, UploadOnConfirmedContext, UploadOnPresignedContext, } from "./types";
|
|
14
|
+
export type { DeleteConfig, DeleteGuardContext, DeleteOnDeletedContext, DimahS3Config, DimahS3Logger, DimahS3RouteConfig, DisabledFeature, DownloadConfig, DownloadGuardContext, DownloadOnPresignedContext, DownloadResolveInfo, EnabledFeature, EnabledUploadConfig, FeatureToggle, GuardContext, MultipartConfig, MultipartOnAbortContext, MultipartOnInitContext, MultipartOnListContext, MultipartGuardContext, MultipartUploadContext, ObjectFile, ObjectS3Headers, OpenedRoute, ResolvedDimahS3Config, ResolvedFeature, ResolvedRoute, ResolvedUploadConfig, RouteFeature, RouteGuardContext, RouteOperation, StoredObjectContext, UploadConfig, UploadConfirmGuardContext, UploadGuardContext, UploadObjectContext, UploadObjectInfo, UploadOnConfirmedContext, UploadOnPresignedContext, } from "./types";
|
|
15
15
|
//# sourceMappingURL=index.d.ts.map
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAClC,YAAY,EAAE,cAAc,EAAE,MAAM,OAAO,CAAC;AAC5C,YAAY,EAAE,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AACzE,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EACL,QAAQ,EACR,MAAM,EACN,UAAU,EACV,aAAa,EACb,cAAc,GACf,MAAM,UAAU,CAAC;AAClB,YAAY,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAE7C,OAAO,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,OAAO,CAAC;AAC7D,YAAY,EAAE,iBAAiB,EAAE,MAAM,OAAO,CAAC;AAE/C,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AACpD,YAAY,EACV,aAAa,EACb,kBAAkB,EAClB,gBAAgB,EAChB,iBAAiB,EACjB,aAAa,GACd,MAAM,UAAU,CAAC;AAElB,OAAO,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AACxC,YAAY,EACV,YAAY,EACZ,kBAAkB,EAClB,sBAAsB,EACtB,aAAa,EACb,aAAa,EACb,kBAAkB,EAClB,eAAe,EACf,cAAc,EACd,oBAAoB,EACpB,0BAA0B,EAC1B,mBAAmB,EACnB,cAAc,EACd,mBAAmB,EACnB,aAAa,EACb,YAAY,EACZ,eAAe,EACf,uBAAuB,EACvB,sBAAsB,EACtB,sBAAsB,EACtB,qBAAqB,EACrB,sBAAsB,EACtB,UAAU,EACV,WAAW,EACX,qBAAqB,EACrB,eAAe,EACf,aAAa,EACb,oBAAoB,EACpB,YAAY,EACZ,iBAAiB,EACjB,cAAc,EACd,mBAAmB,EACnB,YAAY,EACZ,yBAAyB,EACzB,kBAAkB,EAClB,mBAAmB,EACnB,gBAAgB,EAChB,wBAAwB,EACxB,wBAAwB,GACzB,MAAM,SAAS,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAClC,YAAY,EAAE,cAAc,EAAE,MAAM,OAAO,CAAC;AAC5C,YAAY,EAAE,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AACzE,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EACL,QAAQ,EACR,MAAM,EACN,UAAU,EACV,aAAa,EACb,cAAc,GACf,MAAM,UAAU,CAAC;AAClB,YAAY,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAE7C,OAAO,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,OAAO,CAAC;AAC7D,YAAY,EAAE,iBAAiB,EAAE,MAAM,OAAO,CAAC;AAE/C,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AACpD,YAAY,EACV,aAAa,EACb,kBAAkB,EAClB,gBAAgB,EAChB,iBAAiB,EACjB,aAAa,GACd,MAAM,UAAU,CAAC;AAElB,OAAO,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AACxC,YAAY,EACV,YAAY,EACZ,kBAAkB,EAClB,sBAAsB,EACtB,aAAa,EACb,aAAa,EACb,kBAAkB,EAClB,eAAe,EACf,cAAc,EACd,oBAAoB,EACpB,0BAA0B,EAC1B,mBAAmB,EACnB,cAAc,EACd,mBAAmB,EACnB,aAAa,EACb,YAAY,EACZ,eAAe,EACf,uBAAuB,EACvB,sBAAsB,EACtB,sBAAsB,EACtB,qBAAqB,EACrB,sBAAsB,EACtB,UAAU,EACV,eAAe,EACf,WAAW,EACX,qBAAqB,EACrB,eAAe,EACf,aAAa,EACb,oBAAoB,EACpB,YAAY,EACZ,iBAAiB,EACjB,cAAc,EACd,mBAAmB,EACnB,YAAY,EACZ,yBAAyB,EACzB,kBAAkB,EAClB,mBAAmB,EACnB,gBAAgB,EAChB,wBAAwB,EACxB,wBAAwB,GACzB,MAAM,SAAS,CAAC"}
|
package/dist/index.js
CHANGED
|
@@ -175,6 +175,73 @@ function previousKeyFromMetadata(metadata) {
|
|
|
175
175
|
return value || void 0;
|
|
176
176
|
}
|
|
177
177
|
|
|
178
|
+
// src/helpers/object-s3.ts
|
|
179
|
+
var MAX_S3_TAGS = 10;
|
|
180
|
+
var MAX_TAG_KEY_CHARS = 128;
|
|
181
|
+
var MAX_TAG_VALUE_CHARS = 256;
|
|
182
|
+
function present(value) {
|
|
183
|
+
const trimmed = value?.trim();
|
|
184
|
+
return trimmed ? trimmed : void 0;
|
|
185
|
+
}
|
|
186
|
+
function assertTagEntry(key, value) {
|
|
187
|
+
if (key.length === 0) {
|
|
188
|
+
throw errors.validationError("S3 object tag keys cannot be empty");
|
|
189
|
+
}
|
|
190
|
+
if (key.length > MAX_TAG_KEY_CHARS) {
|
|
191
|
+
throw errors.validationError(
|
|
192
|
+
`S3 object tag keys cannot exceed ${MAX_TAG_KEY_CHARS} characters`
|
|
193
|
+
);
|
|
194
|
+
}
|
|
195
|
+
if (value.length > MAX_TAG_VALUE_CHARS) {
|
|
196
|
+
throw errors.validationError(
|
|
197
|
+
`S3 object tag values cannot exceed ${MAX_TAG_VALUE_CHARS} characters`
|
|
198
|
+
);
|
|
199
|
+
}
|
|
200
|
+
}
|
|
201
|
+
function encodeObjectTagging(tagging) {
|
|
202
|
+
const entries = Object.entries(tagging);
|
|
203
|
+
if (entries.length > MAX_S3_TAGS) {
|
|
204
|
+
throw errors.validationError(
|
|
205
|
+
`S3 object tagging allows at most ${MAX_S3_TAGS} tags`
|
|
206
|
+
);
|
|
207
|
+
}
|
|
208
|
+
return entries.map(([key, value]) => {
|
|
209
|
+
assertTagEntry(key, value);
|
|
210
|
+
return `${encodeURIComponent(key)}=${encodeURIComponent(value)}`;
|
|
211
|
+
}).join("&");
|
|
212
|
+
}
|
|
213
|
+
function taggingHeader(tagging) {
|
|
214
|
+
if (!tagging || Object.keys(tagging).length === 0) return void 0;
|
|
215
|
+
return encodeObjectTagging(tagging);
|
|
216
|
+
}
|
|
217
|
+
function normalizeObjectS3(info) {
|
|
218
|
+
const storageClass = present(info?.storageClass);
|
|
219
|
+
const cacheControl = present(info?.cacheControl);
|
|
220
|
+
const tagging = info?.tagging && Object.keys(info.tagging).length > 0 ? info.tagging : void 0;
|
|
221
|
+
if (tagging) encodeObjectTagging(tagging);
|
|
222
|
+
return {
|
|
223
|
+
...storageClass ? { storageClass } : {},
|
|
224
|
+
...cacheControl ? { cacheControl } : {},
|
|
225
|
+
...tagging ? { tagging } : {}
|
|
226
|
+
};
|
|
227
|
+
}
|
|
228
|
+
function objectCommandExtras(opts) {
|
|
229
|
+
const tagging = taggingHeader(opts.tagging);
|
|
230
|
+
return {
|
|
231
|
+
...opts.storageClass ? { StorageClass: opts.storageClass } : {},
|
|
232
|
+
...opts.cacheControl ? { CacheControl: opts.cacheControl } : {},
|
|
233
|
+
...tagging ? { Tagging: tagging } : {}
|
|
234
|
+
};
|
|
235
|
+
}
|
|
236
|
+
function objectPutHeaders(opts) {
|
|
237
|
+
const tagging = taggingHeader(opts.tagging);
|
|
238
|
+
return {
|
|
239
|
+
...opts.cacheControl ? { "Cache-Control": opts.cacheControl } : {},
|
|
240
|
+
...opts.storageClass ? { "x-amz-storage-class": opts.storageClass } : {},
|
|
241
|
+
...tagging ? { "x-amz-tagging": tagging } : {}
|
|
242
|
+
};
|
|
243
|
+
}
|
|
244
|
+
|
|
178
245
|
// src/helpers/resolve-target.ts
|
|
179
246
|
function assertSafeObjectKey(key) {
|
|
180
247
|
const normalized = normalizeObjectKey(key);
|
|
@@ -237,7 +304,8 @@ async function resolveUploadTarget(route2, context) {
|
|
|
237
304
|
key,
|
|
238
305
|
bucket,
|
|
239
306
|
metadata: Object.keys(metadata).length > 0 ? metadata : info?.metadata,
|
|
240
|
-
acl: resolveAcl(info, route2)
|
|
307
|
+
acl: resolveAcl(info, route2),
|
|
308
|
+
...normalizeObjectS3(info)
|
|
241
309
|
};
|
|
242
310
|
}
|
|
243
311
|
function resolveStoredTarget(route2, key) {
|
|
@@ -577,7 +645,17 @@ async function putObject(config, input) {
|
|
|
577
645
|
const request = requestFromHeaders(input.headers);
|
|
578
646
|
await runHook(config.guard, { request });
|
|
579
647
|
const fileSize = body.byteLength;
|
|
580
|
-
const {
|
|
648
|
+
const {
|
|
649
|
+
route: route2,
|
|
650
|
+
key,
|
|
651
|
+
bucket,
|
|
652
|
+
metadata,
|
|
653
|
+
acl,
|
|
654
|
+
storageClass,
|
|
655
|
+
cacheControl,
|
|
656
|
+
tagging,
|
|
657
|
+
stored
|
|
658
|
+
} = await openUploadTarget(
|
|
581
659
|
config,
|
|
582
660
|
{
|
|
583
661
|
route: input.route,
|
|
@@ -589,6 +667,7 @@ async function putObject(config, input) {
|
|
|
589
667
|
request,
|
|
590
668
|
"upload"
|
|
591
669
|
);
|
|
670
|
+
const objectS3 = normalizeObjectS3({ storageClass, cacheControl, tagging });
|
|
592
671
|
await runHook(route2.upload.guard, {
|
|
593
672
|
...stored,
|
|
594
673
|
file: {
|
|
@@ -599,6 +678,7 @@ async function putObject(config, input) {
|
|
|
599
678
|
metadata,
|
|
600
679
|
clientMetadata: input.metadata,
|
|
601
680
|
acl,
|
|
681
|
+
...objectS3,
|
|
602
682
|
replace: route2.upload.replace
|
|
603
683
|
});
|
|
604
684
|
await route2.client.send(
|
|
@@ -609,7 +689,8 @@ async function putObject(config, input) {
|
|
|
609
689
|
ContentType: input.contentType,
|
|
610
690
|
ContentLength: fileSize,
|
|
611
691
|
Metadata: metadata,
|
|
612
|
-
ACL: acl
|
|
692
|
+
ACL: acl,
|
|
693
|
+
...objectCommandExtras(objectS3)
|
|
613
694
|
})
|
|
614
695
|
);
|
|
615
696
|
const head = await headObjectOrNotFound(route2.client, bucket, key);
|
|
@@ -1043,7 +1124,17 @@ var multipartComplete = createS3Endpoint(
|
|
|
1043
1124
|
async function handleMultipartInit(config, input, request) {
|
|
1044
1125
|
const fileSize = Math.floor(input.fileSize);
|
|
1045
1126
|
const fileName = input.fileName;
|
|
1046
|
-
const {
|
|
1127
|
+
const {
|
|
1128
|
+
route: route2,
|
|
1129
|
+
key,
|
|
1130
|
+
bucket,
|
|
1131
|
+
metadata,
|
|
1132
|
+
acl,
|
|
1133
|
+
storageClass,
|
|
1134
|
+
cacheControl,
|
|
1135
|
+
tagging,
|
|
1136
|
+
stored
|
|
1137
|
+
} = await openUploadTarget(
|
|
1047
1138
|
config,
|
|
1048
1139
|
{
|
|
1049
1140
|
route: input.route,
|
|
@@ -1055,6 +1146,7 @@ async function handleMultipartInit(config, input, request) {
|
|
|
1055
1146
|
request,
|
|
1056
1147
|
"multipart"
|
|
1057
1148
|
);
|
|
1149
|
+
const objectS3 = normalizeObjectS3({ storageClass, cacheControl, tagging });
|
|
1058
1150
|
await runHook(route2.upload.guard, {
|
|
1059
1151
|
...stored,
|
|
1060
1152
|
file: {
|
|
@@ -1065,6 +1157,7 @@ async function handleMultipartInit(config, input, request) {
|
|
|
1065
1157
|
metadata,
|
|
1066
1158
|
clientMetadata: input.metadata,
|
|
1067
1159
|
acl,
|
|
1160
|
+
...objectS3,
|
|
1068
1161
|
replace: route2.upload.replace
|
|
1069
1162
|
});
|
|
1070
1163
|
const { UploadId } = await route2.client.send(
|
|
@@ -1074,7 +1167,8 @@ async function handleMultipartInit(config, input, request) {
|
|
|
1074
1167
|
ContentType: input.contentType,
|
|
1075
1168
|
ContentDisposition: buildContentDisposition(fileName),
|
|
1076
1169
|
Metadata: metadata,
|
|
1077
|
-
ACL: acl
|
|
1170
|
+
ACL: acl,
|
|
1171
|
+
...objectCommandExtras(objectS3)
|
|
1078
1172
|
})
|
|
1079
1173
|
);
|
|
1080
1174
|
if (!UploadId) {
|
|
@@ -1094,6 +1188,7 @@ async function handleMultipartInit(config, input, request) {
|
|
|
1094
1188
|
metadata,
|
|
1095
1189
|
clientMetadata: input.metadata,
|
|
1096
1190
|
acl,
|
|
1191
|
+
...objectS3,
|
|
1097
1192
|
replace: route2.upload.replace
|
|
1098
1193
|
},
|
|
1099
1194
|
config
|
|
@@ -1241,7 +1336,17 @@ function objectUserMetadata(metadata) {
|
|
|
1241
1336
|
async function handleUpload(config, input, request) {
|
|
1242
1337
|
const fileSize = Math.floor(input.fileSize);
|
|
1243
1338
|
const fileName = input.fileName;
|
|
1244
|
-
const {
|
|
1339
|
+
const {
|
|
1340
|
+
route: route2,
|
|
1341
|
+
key,
|
|
1342
|
+
bucket,
|
|
1343
|
+
metadata,
|
|
1344
|
+
acl,
|
|
1345
|
+
storageClass,
|
|
1346
|
+
cacheControl,
|
|
1347
|
+
tagging,
|
|
1348
|
+
stored
|
|
1349
|
+
} = await openUploadTarget(
|
|
1245
1350
|
config,
|
|
1246
1351
|
{
|
|
1247
1352
|
route: input.route,
|
|
@@ -1253,6 +1358,7 @@ async function handleUpload(config, input, request) {
|
|
|
1253
1358
|
request,
|
|
1254
1359
|
"upload"
|
|
1255
1360
|
);
|
|
1361
|
+
const objectS3 = normalizeObjectS3({ storageClass, cacheControl, tagging });
|
|
1256
1362
|
const method = route2.upload.method ?? "POST";
|
|
1257
1363
|
if (route2.upload.checksum && !input.checksum) {
|
|
1258
1364
|
throw errors.validationError("Checksum is required for this route");
|
|
@@ -1277,6 +1383,7 @@ async function handleUpload(config, input, request) {
|
|
|
1277
1383
|
metadata,
|
|
1278
1384
|
clientMetadata: input.metadata,
|
|
1279
1385
|
acl,
|
|
1386
|
+
...objectS3,
|
|
1280
1387
|
replace: route2.upload.replace
|
|
1281
1388
|
};
|
|
1282
1389
|
await runHook(route2.upload.guard, hookCtx);
|
|
@@ -1285,6 +1392,7 @@ async function handleUpload(config, input, request) {
|
|
|
1285
1392
|
"Content-Type": contentType,
|
|
1286
1393
|
...objectUserMetadata(metadata),
|
|
1287
1394
|
"Content-Disposition": buildContentDisposition(fileName),
|
|
1395
|
+
...objectPutHeaders(objectS3),
|
|
1288
1396
|
...input.checksum ? { "x-amz-checksum-sha256": input.checksum } : {}
|
|
1289
1397
|
};
|
|
1290
1398
|
const url2 = await getSignedUrl(
|
|
@@ -1297,6 +1405,7 @@ async function handleUpload(config, input, request) {
|
|
|
1297
1405
|
Metadata: metadata,
|
|
1298
1406
|
ContentDisposition: buildContentDisposition(fileName),
|
|
1299
1407
|
ContentLength: fileSize,
|
|
1408
|
+
...objectCommandExtras(objectS3),
|
|
1300
1409
|
...input.checksum ? { ChecksumSHA256: input.checksum, ChecksumAlgorithm: "SHA256" } : {}
|
|
1301
1410
|
}),
|
|
1302
1411
|
{
|
|
@@ -1330,6 +1439,7 @@ async function handleUpload(config, input, request) {
|
|
|
1330
1439
|
"Content-Type": contentType,
|
|
1331
1440
|
"Content-Disposition": buildContentDisposition(fileName),
|
|
1332
1441
|
...objectUserMetadata(metadata),
|
|
1442
|
+
...objectPutHeaders(objectS3),
|
|
1333
1443
|
...input.checksum ? { "x-amz-checksum-sha256": input.checksum } : {}
|
|
1334
1444
|
};
|
|
1335
1445
|
const { url, fields: signedFields } = await createPresignedPost(
|
|
@@ -1440,10 +1550,10 @@ var RESERVED_PLUGIN_IDS = [
|
|
|
1440
1550
|
|
|
1441
1551
|
// src/plugin/apply-plugins.ts
|
|
1442
1552
|
function mergeHookField(pluginHooks, userHook, order = "plugins-first") {
|
|
1443
|
-
const
|
|
1444
|
-
if (
|
|
1445
|
-
if (
|
|
1446
|
-
return chainHooks(...
|
|
1553
|
+
const present2 = (order === "user-first" ? [userHook, ...pluginHooks] : [...pluginHooks, userHook]).filter((h) => h != null);
|
|
1554
|
+
if (present2.length === 0) return void 0;
|
|
1555
|
+
if (present2.length === 1) return present2[0];
|
|
1556
|
+
return chainHooks(...present2);
|
|
1447
1557
|
}
|
|
1448
1558
|
function mergeHooks(keys, plugins, userFeature, pick, lifecycleKeys = /* @__PURE__ */ new Set()) {
|
|
1449
1559
|
const merged = { ...userFeature };
|