feat: multipart upgrade to egg v3 (#123)

Author: fengmk2

multipart-file-mode/app/controller/ajax.js

@@ -1,9 +1,7 @@
-'use strict';
-
-const fs = require('mz/fs');
 const path = require('path');
+const fs = require('fs');
+const { pipeline } = require('stream/promises');
 const Controller = require('egg').Controller;
-const pump = require('mz-modules/pump');
 
 module.exports = class extends Controller {
  async show() {
@@ -21,7 +19,7 @@ module.exports = class extends Controller {
  const target = fs.createWriteStream(targetPath);
 
  try {
- await pump(source, target);
+ await pipeline(source, target);
  ctx.logger.warn('save %s to %s', file.filepath, targetPath);
  } finally {
  // delete those request tmp files

multipart-file-mode/app/controller/form.js

@@ -1,8 +1,6 @@
-'use strict';
-
-const fs = require('mz/fs');
 const path = require('path');
-const pump = require('mz-modules/pump');
+const fs = require('fs');
+const { pipeline } = require('stream/promises');
 const Controller = require('egg').Controller;
 
 module.exports = class extends Controller {
@@ -21,7 +19,7 @@ module.exports = class extends Controller {
  const target = fs.createWriteStream(targetPath);
 
  try {
- await pump(source, target);
+ await pipeline(source, target);
  ctx.logger.warn('save %s to %s', file.filepath, targetPath);
  } finally {
  // delete those request tmp files

multipart-file-mode/app/controller/home.js

@@ -1,5 +1,3 @@
-'use strict';
-
 const Controller = require('egg').Controller;
 
 module.exports = class extends Controller {

multipart-file-mode/app/controller/multiple.js

@@ -1,8 +1,6 @@
-'use strict';
-
-const fs = require('mz/fs');
 const path = require('path');
-const pump = require('mz-modules/pump');
+const fs = require('fs');
+const { pipeline } = require('stream/promises');
 const Controller = require('egg').Controller;
 
 module.exports = class extends Controller {
@@ -21,7 +19,7 @@ module.exports = class extends Controller {
  const targetPath = path.join(this.config.baseDir, 'app/public', filename);
  const source = fs.createReadStream(file.filepath);
  const target = fs.createWriteStream(targetPath);
- await pump(source, target);
+ await pipeline(source, target);
  ctx.logger.warn('save %s to %s', file.filepath, targetPath);
  }
  } finally {

multipart-file-mode/app/router.js

@@ -1,5 +1,3 @@
-'use strict';
-
 module.exports = app => {
  app.router.get('/', 'home.render');
 

multipart-file-mode/config/config.default.js

@@ -1,5 +1,3 @@
-'use strict';
-
 exports.keys = 'my keys';
 
 exports.view = {

multipart-file-mode/config/plugin.js

@@ -1,5 +1,3 @@
-'use strict';
-
 exports.nunjucks = {
  enable: true,
  package: 'egg-view-nunjucks',

multipart-file-mode/package.json

@@ -1,14 +1,12 @@
 {
  "name": "multipart-file-mode-example",
  "dependencies": {
- "egg": "^2.11.2",
- "egg-view-nunjucks": "^2.1.4",
- "mz": "^2.7.0",
- "mz-modules": "^2.1.0"
+ "egg": "^3.11.0",
+ "egg-view-nunjucks": "^2.3.0"
  },
  "devDependencies": {
- "egg-bin": "^4.3.5",
- "egg-mock": "^3.13.1"
+ "egg-bin": "^5.9.0",
+ "egg-mock": "^5.5.0"
  },
  "scripts": {
  "dev": "egg-bin dev",

multipart-file-mode/test/index.test.js

@@ -1,18 +1,11 @@
-'use strict';
-
 const path = require('path');
+const fs = require('fs/promises');
 const assert = require('assert');
-const mm = require('egg-mock');
-const rimraf = require('mz-modules/rimraf');
+const { app, mock } = require('egg-mock/bootstrap');
 
 describe('example multipart test', () => {
- let app;
- before(async () => {
- app = mm.app();
- await app.ready();
- });
- after(() => app.close());
- after(() => rimraf(path.join(app.config.baseDir, 'app/public')));
+ afterEach(mock.restore);
+ after(() => fs.rm(path.join(app.config.baseDir, 'app/public'), { force: true, recursive: true }));
 
  describe('form', () => {
  it('should upload', async () => {

multipart/app/controller/ajax.js

@@ -1,9 +1,7 @@
-'use strict';
-
 const fs = require('fs');
 const path = require('path');
+const { pipeline } = require('stream/promises');
 const Controller = require('egg').Controller;
-const pump = require('mz-modules/pump');
 
 class UploadAjaxController extends Controller {
  async show() {
@@ -15,7 +13,7 @@ class UploadAjaxController extends Controller {
  const filename = encodeURIComponent(stream.fields.name) + path.extname(stream.filename).toLowerCase();
  const target = path.join(this.config.baseDir, 'app/public', filename);
  const writeStream = fs.createWriteStream(target);
- await pump(stream, writeStream);
+ await pipeline(stream, writeStream);
 
  this.ctx.body = { url: '/public/' + filename };
  }