From 70db11221350919781a2bfd72a9ebe75a50f0fb8 Mon Sep 17 00:00:00 2001 From: Vitaly Puzrin Date: Thu, 29 Nov 2018 21:10:51 +0300 Subject: [PATCH] Deps cleanup: drop bluebird --- examples/.eslintrc.yml | 5 ++++- examples/server.js | 17 +++++++---------- package.json | 1 - 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/examples/.eslintrc.yml b/examples/.eslintrc.yml index 40b0021..4315849 100644 --- a/examples/.eslintrc.yml +++ b/examples/.eslintrc.yml @@ -1,2 +1,5 @@ +env: + es6: true + parserOptions: - ecmaVersion: 6 + ecmaVersion: 2017 diff --git a/examples/server.js b/examples/server.js index 0a6336b..936aede 100644 --- a/examples/server.js +++ b/examples/server.js @@ -5,7 +5,6 @@ const http = require('http'); const pako = require('../'); const multiparty = require('multiparty'); -const Promise = require('bluebird'); const fs = require('fs'); @@ -22,7 +21,7 @@ function error(msg) { -const server = http.createServer((req, res) => { +const server = http.createServer(async (req, res) => { console.log('--- received request'); @@ -30,7 +29,7 @@ const server = http.createServer((req, res) => { // file system. Don't do such things on production. res.setHeader('Access-Control-Allow-Origin', '*'); - Promise.coroutine(function* () { + try { // // Check request size early by header and terminate immediately for big data // @@ -49,7 +48,7 @@ const server = http.createServer((req, res) => { maxFilesSize: MAX_FILES_SIZE }); - let files = yield new Promise(resolve => { + let files = await new Promise(resolve => { form.parse(req, function (e, fields, files) { if (e) err = e; resolve(files); @@ -66,9 +65,7 @@ const server = http.createServer((req, res) => { // // But that's just a quick sample to explain data reencoding steps from // browser to server. Feel free to improve. - let bin = yield Promise.fromCallback(cb => { - fs.readFile(files.binson[0].path, cb); - }); + let bin = fs.readFileSync(files.binson[0].path); // Kludge - here we should cleanup all files fs.unlinkSync(files.binson[0].path); @@ -86,12 +83,12 @@ const server = http.createServer((req, res) => { console.log('--- received object is: ', obj); res.end('ok'); - })() - .catch(err => { + } + catch (err) { console.log(err); res.statusCode = err.statusCode || 400; res.end(err.message); - }); + } }); diff --git a/package.json b/package.json index 48535f4..40331c8 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,6 @@ "devDependencies": { "ansi": "^0.3.1", "benchmark": "^2.1.4", - "bluebird": "^3.5.0", "browserify": "^16.2.3", "eslint": "^5.9.0", "istanbul": "^0.4.5",