@midwayjs/upload 3.20.5 → 4.0.0-beta.1

package/dist/configuration.js

@@ -33,6 +33,7 @@ let UploadConfiguration = class UploadConfiguration {
         await (0, utils_1.stopAutoRemoveUploadTmpFile)();
     }
 };
+exports.UploadConfiguration = UploadConfiguration;
 __decorate([
     (0, core_1.Inject)(),
     __metadata("design:type", core_1.MidwayApplicationManager)
@@ -41,7 +42,7 @@ __decorate([
     (0, core_1.Config)('upload'),
     __metadata("design:type", Object)
 ], UploadConfiguration.prototype, "uploadConfig", void 0);
-UploadConfiguration = __decorate([
+exports.UploadConfiguration = UploadConfiguration = __decorate([
     (0, core_1.Configuration)({
         namespace: 'upload',
         importConfigs: [
@@ -51,5 +52,4 @@ UploadConfiguration = __decorate([
         ],
     })
 ], UploadConfiguration);
-exports.UploadConfiguration = UploadConfiguration;
 //# sourceMappingURL=configuration.js.map

package/dist/constants.js

@@ -4,11 +4,11 @@ exports.EXT_KEY = exports.DefaultUploadFileMimeType = exports.uploadWhiteList =
 exports.uploadWhiteList = [
     // images
     '.jpg',
-    '.jpeg',
-    '.png',
-    '.gif',
-    '.bmp',
-    '.wbmp',
+    '.jpeg', // image/jpeg
+    '.png', // image/png, image/x-png
+    '.gif', // image/gif
+    '.bmp', // image/bmp
+    '.wbmp', // image/vnd.wap.wbmp
     '.webp',
     '.tif',
     '.tiff',

package/dist/middleware.js

@@ -54,21 +54,19 @@ let UploadMiddleware = class UploadMiddleware {
                 this.uploadFileMimeTypeMap.set(ext, mime);
             }
         }
-        if (app.getFrameworkType() === core_1.MidwayFrameworkType.WEB_EXPRESS) {
+        if ('express' === app.getNamespace()) {
             return async (req, res, next) => {
                 return this.execUpload(req, req, res, next, true);
             };
         }
         else {
             return async (ctx, next) => {
-                var _a;
-                const req = ((_a = ctx.request) === null || _a === void 0 ? void 0 : _a.req) || ctx.request;
+                const req = ctx.request?.req || ctx.request;
                 return this.execUpload(ctx, req, ctx, next, false);
             };
         }
     }
     async execUpload(ctx, req, res, next, isExpress) {
-        var _a;
         const { mode, tmpdir, fileSize } = this.uploadConfig;
         const boundary = this.getUploadBoundary(req);
         if (!boundary) {
@@ -77,8 +75,7 @@ let UploadMiddleware = class UploadMiddleware {
         ctx.fields = {};
         ctx.files = [];
         ctx.cleanupRequestFiles = async () => {
-            var _a;
-            if (!((_a = ctx.files) === null || _a === void 0 ? void 0 : _a.length)) {
+            if (!ctx.files?.length) {
                 return [];
             }
             return Promise.all(ctx.files.map(async (fileInfo) => {
@@ -89,7 +86,7 @@ let UploadMiddleware = class UploadMiddleware {
                     await unlink(fileInfo.data);
                     return true;
                 }
-                catch (_a) {
+                catch {
                     return false;
                 }
             }));
@@ -132,7 +129,7 @@ let UploadMiddleware = class UploadMiddleware {
                 limit: fileSize,
             });
         }
-        else if (((_a = req === null || req === void 0 ? void 0 : req.originEvent) === null || _a === void 0 ? void 0 : _a.body) &&
+        else if (req?.originEvent?.body &&
             (typeof req.originEvent.body === 'string' ||
                 Buffer.isBuffer(req.originEvent.body))) {
             body = req.originEvent.body;
@@ -179,7 +176,6 @@ let UploadMiddleware = class UploadMiddleware {
         return next();
     }
     getUploadBoundary(request) {
-        var _a;
         const method = (request.method || request.httpMethod || '').toUpperCase();
         if (method !== 'POST' &&
             method !== 'PUT' &&
@@ -187,7 +183,7 @@ let UploadMiddleware = class UploadMiddleware {
             method !== 'PATCH') {
             return false;
         }
-        if (!((_a = request.headers) === null || _a === void 0 ? void 0 : _a['content-type'])) {
+        if (!request.headers?.['content-type']) {
             return false;
         }
         const contentType = request.headers['content-type'];
@@ -195,7 +191,7 @@ let UploadMiddleware = class UploadMiddleware {
             return false;
         }
         const boundaryMatch = /boundary=(.*)(;|\s|$)/.exec(contentType);
-        if (!(boundaryMatch === null || boundaryMatch === void 0 ? void 0 : boundaryMatch[1])) {
+        if (!boundaryMatch?.[1]) {
             return false;
         }
         return boundaryMatch[1];
@@ -257,6 +253,7 @@ let UploadMiddleware = class UploadMiddleware {
         return 'upload';
     }
 };
+exports.UploadMiddleware = UploadMiddleware;
 __decorate([
     (0, core_1.Config)('upload'),
     __metadata("design:type", Object)
@@ -271,8 +268,7 @@ __decorate([
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", Promise)
 ], UploadMiddleware.prototype, "init", null);
-UploadMiddleware = __decorate([
+exports.UploadMiddleware = UploadMiddleware = __decorate([
     (0, core_1.Middleware)()
 ], UploadMiddleware);
-exports.UploadMiddleware = UploadMiddleware;
 //# sourceMappingURL=middleware.js.map

package/dist/parse.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="node" />
 /// <reference types="node" />
+/// <reference types="node" />
 import { Readable } from 'stream';
 import { UploadFileInfo, UploadOptions } from './interface';
 export declare const parseMultipart: (body: any, boundary: string, uploadConfig: UploadOptions) => Promise<{

package/dist/parse.js

@@ -183,7 +183,7 @@ const parseHead = (headBuf) => {
                 try {
                     return String.fromCharCode(parseInt(code));
                 }
-                catch (_a) {
+                catch {
                     return origin;
                 }
             })
@@ -192,7 +192,7 @@ const parseHead = (headBuf) => {
             const headCol = {};
             value.split(/;\s+/).forEach((kv) => {
                 const [k, v] = kv.split('=');
-                headCol[k] = v ? v.replace(/^"/, '').replace(/"$/, '') : v !== null && v !== void 0 ? v : true;
+                headCol[k] = v ? v.replace(/^"/, '').replace(/"$/, '') : v ?? true;
             });
             head[name] = headCol;
         }

package/dist/utils.js

@@ -25,7 +25,7 @@ const autoRemoveUploadTmpFile = async (tmpDir, cleanTimeout) => {
                         await unlink(filePath);
                     }
                 }
-                catch (_a) {
+                catch {
                     return false;
                 }
             }));
@@ -49,7 +49,7 @@ const checkExists = async (path) => {
         await access(path, fs_1.constants.W_OK | fs_1.constants.R_OK);
         return true;
     }
-    catch (_a) {
+    catch {
         return false;
     }
 };
@@ -63,7 +63,7 @@ const ensureDir = async (dirPath) => {
         await mkdir(dirPath, { recursive: true });
         return true;
     }
-    catch (_a) {
+    catch {
         return false;
     }
 };

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@midwayjs/upload",
-  "version": "3.20.5",
+  "version": "4.0.0-beta.1",
   "description": "Midway Component for upload",
   "main": "dist/index.js",
   "typings": "index.d.ts",
   "scripts": {
     "build": "tsc",
-    "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand",
-    "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit",
+    "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand",
+    "cov": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --coverage --forceExit",
     "ci": "npm run test"
   },
   "keywords": [],
@@ -26,12 +26,12 @@
     "raw-body": "2.5.2"
   },
   "devDependencies": {
-    "@midwayjs/core": "^3.20.4",
-    "@midwayjs/express": "^3.20.4",
-    "@midwayjs/faas": "^3.20.4",
-    "@midwayjs/koa": "^3.20.5",
-    "@midwayjs/mock": "^3.20.4",
-    "@midwayjs/web": "^3.20.4"
+    "@midwayjs/core": "^4.0.0-beta.1",
+    "@midwayjs/express": "^4.0.0-beta.1",
+    "@midwayjs/faas": "^4.0.0-beta.1",
+    "@midwayjs/koa": "^4.0.0-beta.1",
+    "@midwayjs/mock": "^4.0.0-beta.1",
+    "@midwayjs/web": "^4.0.0-beta.1"
   },
-  "gitHead": "7ce57281bd3ef5d18dc50b47ff9bffb8a27c071e"
+  "gitHead": "832961ec3aff123c033197d8c00cb2bc9bad7ff8"
 }

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2013 - Now midwayjs
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.