⬆️ Update to modern JavaScript

jysperm · jysperm · commit 792ccfcb5ec8 · 2023-02-20T14:49:55.000+08:00
diff --git a/app.js b/app.js
@@ -1,80 +1,80 @@
-'use strict';
+'use strict'
 
-var express = require('express');
-var timeout = require('connect-timeout');
-var path = require('path');
-var cookieParser = require('cookie-parser');
-var bodyParser = require('body-parser');
-var AV = require('leanengine');
+const express = require('express')
+const timeout = require('connect-timeout')
+const path = require('path')
+const cookieParser = require('cookie-parser')
+const bodyParser = require('body-parser')
+const AV = require('leanengine')
 
 // Loads cloud function definitions.
 // You can split them into several files, but don't forget to load them into the main file.
-require('./cloud');
+require('./cloud')
 
-var app = express();
+const app = express()
 
 // Configures template engine.
-app.set('views', path.join(__dirname, 'views'));
-app.set('view engine', 'ejs');
+app.set('views', path.join(__dirname, 'views'))
+app.set('view engine', 'ejs')
 
 // Configures default timeout.
-app.use(timeout('15s'));
+app.use(timeout('15s'))
 
 // Loads LeanEngine middleware.
-app.use(AV.express());
+app.use(AV.express())
 
-app.enable('trust proxy');
+app.enable('trust proxy')
 // Uncomment the following line to redirect all HTTP requests to HTTPS.
-// app.use(AV.Cloud.HttpsRedirect());
+// app.use(AV.Cloud.HttpsRedirect())
 
-app.use(express.static('public'));
+app.use(express.static('public'))
 
-app.use(bodyParser.json());
-app.use(bodyParser.urlencoded({ extended: false }));
-app.use(cookieParser());
+app.use(bodyParser.json())
+app.use(bodyParser.urlencoded({ extended: false }))
+app.use(cookieParser())
 
-app.get('/', function(req, res) {
-  res.header('Cache-Control', 'no-cache');
-  res.render('index', { currentTime: new Date() });
-});
+app.get('/', (req, res) => {
+  res.header('Cache-Control', 'no-cache')
+  res.render('index', { currentTime: new Date() })
+})
 
 // You can put routings in multiple files according to their categories.
-app.use('/todos', require('./routes/todos'));
+app.use('/todos', require('./routes/todos'))
 
-app.use(function(req, res, next) {
+app.use((req, res, next) => {
   // If there is no routing answering, throw a 404 exception to exception handlers.
   if (!res.headersSent) {
-    var err = new Error('Not Found');
-    err.status = 404;
-    next(err);
+    const err = new Error('Not Found')
+    err.status = 404
+    next(err)
   }
-});
+})
 
-// error handlers
-app.use(function(err, req, res, next) {
+// error handler
+app.use((err, req, res, next) => {
   if (req.timedout && req.headers.upgrade === 'websocket') {
     // Ignores websocket timeout.
-    return;
+    return
   }
 
-  var statusCode = err.status || 500;
+  const statusCode = err.status || 500
   if (statusCode === 500) {
-    console.error(err.stack || err);
+    console.error(err.stack || err)
   }
   if (req.timedout) {
-    console.error('Request timeout: url=%s, timeout=%d, please check whether its execution time is too long, or the response callback is invalid.', req.originalUrl, err.timeout);
+    console.error('Request timeout: url=%s, timeout=%d, please check whether its execution time is too long, or the response callback is invalid.', req.originalUrl, err.timeout)
   }
-  res.status(statusCode);
+  res.status(statusCode)
   // Do not output exception details by default.
-  var error = {};
+  let error = {}
   if (app.get('env') === 'development') {
     // Displays exception stack on page if running in the development enviroment.
-    error = err;
+    error = err
   }
   res.render('error', {
     message: err.message,
     error: error
-  });
-});
+  })
+})
 
-module.exports = app;
+module.exports = app
diff --git a/routes/todos.js b/routes/todos.js
@@ -1,39 +1,49 @@
-'use strict';
-var router = require('express').Router();
-var AV = require('leanengine');
+'use strict'
 
-var Todo = AV.Object.extend('Todo');
+const router = require('express').Router()
+const AV = require('leanengine')
+
+const Todo = AV.Object.extend('Todo')
 
 // Todo list
-router.get('/', function(req, res, next) {
-  var query = new AV.Query(Todo);
-  query.descending('createdAt');
-  query.find().then(function(results) {
+router.get('/', async (req, res, next) => {
+  try {
+    const query = new AV.Query(Todo)
+    query.descending('createdAt')
+
+    const results = await query.find()
+
     res.render('todos', {
       title: 'TODO &#21015;&#34920;',
       todos: results
-    });
-  }, function(err) {
+    })
+  } catch (err) {
     if (err.code === 101) {
       // Todo class does not exist in the cloud yet.
       res.render('todos', {
         title: 'TODO &#21015;&#34920;',
         todos: []
-      });
+      })
     } else {
-      next(err);
+      next(err)
     }
-  }).catch(next);
-});
+  }
+})
 
 // Creates a new todo item.
-router.post('/', function(req, res, next) {
-  var content = req.body.content;
-  var todo = new Todo();
-  todo.set('content', content);
-  todo.save().then(function(todo) {
-    res.redirect('/todos');
-  }).catch(next);
-});
-
-module.exports = router;
+router.post('/', async (req, res, next) => {
+  try {
+    const content = req.body.content
+    const todo = new Todo()
+
+    todo.set('content', content)
+
+    await todo.save()
+
+    res.redirect('/todos')
+  } catch (err) {
+    next(err)
+  }
+})
+
+module.exports = router
diff --git a/server.js b/server.js
@@ -1,30 +1,30 @@
-'use strict';
+'use strict'
 
-var AV = require('leanengine');
+const AV = require('leanengine')
 
 AV.init({
   appId: process.env.LEANCLOUD_APP_ID,
   appKey: process.env.LEANCLOUD_APP_KEY,
   masterKey: process.env.LEANCLOUD_APP_MASTER_KEY
-});
+})
 
 // Comment the following line if you do not want to use masterKey.
-AV.Cloud.useMasterKey();
+AV.Cloud.useMasterKey()
 
-var app = require('./app');
+const app = require('./app')
 
 // Retrieves the port number from environment variable `LEANCLOUD_APP_PORT`.
 // LeanEngine runtime will assign a port and set the environment variable automatically.
-var PORT = parseInt(process.env.LEANCLOUD_APP_PORT || process.env.PORT || 3000);
+const PORT = parseInt(process.env.LEANCLOUD_APP_PORT || process.env.PORT || 3000)
 
-app.listen(PORT, function (err) {
-  console.log('Node app is running on port:', PORT);
+app.listen(PORT, (err) => {
+  console.log('Node app is running on port:', PORT)
 
   // Registers a global exception handler for uncaught exceptions.
-  process.on('uncaughtException', function(err) {
-    console.error('Caught exception:', err.stack);
+  process.on('uncaughtException', err => {
+    console.error('Caught exception:', err.stack)
   });
-  process.on('unhandledRejection', function(reason, p) {
-    console.error('Unhandled Rejection at: Promise ', p, ' reason: ', reason.stack);
-  });
-});
+  process.on('unhandledRejection', (reason, p) => {
+    console.error('Unhandled Rejection at: Promise ', p, ' reason: ', reason.stack)
+  })
+})
