let app can run use ts

Signed-off-by: Raccoon <raccoon@hackmd.io>
This commit is contained in:
Raccoon 2021-06-12 05:08:03 +08:00
parent bf1ca53c65
commit 0387f67a50
No known key found for this signature in database
GPG Key ID: 06770355DC9ECD38
4 changed files with 24 additions and 17 deletions

28
app.js
View File

@ -20,14 +20,14 @@ var flash = require('connect-flash')
var apiMetrics = require('prometheus-api-metrics') var apiMetrics = require('prometheus-api-metrics')
// core // core
var config = require('./lib/config') var config = require('./dist/config')
var logger = require('./lib/logger') var logger = require('./dist/logger')
var response = require('./lib/response') var response = require('./dist/response')
var models = require('./lib/models') var models = require('./dist/models')
var csp = require('./lib/csp') var csp = require('./dist/csp')
const { Environment } = require('./lib/config/enum') const { Environment } = require('./dist/config/enum')
const { versionCheckMiddleware, checkVersion } = require('./lib/web/middleware/checkVersion') const { versionCheckMiddleware, checkVersion } = require('./dist/web/middleware/checkVersion')
function createHttpServer () { function createHttpServer () {
if (config.useSSL) { if (config.useSSL) {
@ -76,7 +76,7 @@ io.engine.ws = new (require('ws').Server)({
}) })
// others // others
var realtime = require('./lib/realtime/realtime.js') var realtime = require('./dist/realtime/realtime.js')
// assign socket io to realtime // assign socket io to realtime
realtime.io = io realtime.io = io
@ -138,7 +138,7 @@ app.use('/', express.static(path.join(__dirname, '/public'), { maxAge: config.st
app.use('/docs', express.static(path.resolve(__dirname, config.docsPath), { maxAge: config.staticCacheTime })) app.use('/docs', express.static(path.resolve(__dirname, config.docsPath), { maxAge: config.staticCacheTime }))
app.use('/uploads', express.static(path.resolve(__dirname, config.uploadsPath), { maxAge: config.staticCacheTime })) app.use('/uploads', express.static(path.resolve(__dirname, config.uploadsPath), { maxAge: config.staticCacheTime }))
app.use('/default.md', express.static(path.resolve(__dirname, config.defaultNotePath), { maxAge: config.staticCacheTime })) app.use('/default.md', express.static(path.resolve(__dirname, config.defaultNotePath), { maxAge: config.staticCacheTime }))
app.use(require('./lib/metrics').router) app.use(require('./dist/metrics').router)
// session // session
app.use(session({ app.use(session({
@ -164,7 +164,7 @@ server.on('resumeSession', function (id, cb) {
}) })
// middleware which blocks requests when we're too busy // middleware which blocks requests when we're too busy
app.use(require('./lib/middleware/tooBusy')) app.use(require('./dist/middleware/tooBusy'))
app.use(flash()) app.use(flash())
@ -173,10 +173,10 @@ app.use(passport.initialize())
app.use(passport.session()) app.use(passport.session())
// check uri is valid before going further // check uri is valid before going further
app.use(require('./lib/middleware/checkURIValid')) app.use(require('./dist/middleware/checkURIValid'))
// redirect url without trailing slashes // redirect url without trailing slashes
app.use(require('./lib/middleware/redirectWithoutTrailingSlashes')) app.use(require('./dist/middleware/redirectWithoutTrailingSlashes'))
app.use(require('./lib/middleware/codiMDVersion')) app.use(require('./dist/middleware/codiMDVersion'))
if (config.autoVersionCheck && process.env.NODE_ENV === Environment.production) { if (config.autoVersionCheck && process.env.NODE_ENV === Environment.production) {
checkVersion(app) checkVersion(app)
@ -227,7 +227,7 @@ app.locals.enableDropBoxSave = config.isDropboxEnable
app.locals.enableGitHubGist = config.isGitHubEnable app.locals.enableGitHubGist = config.isGitHubEnable
app.locals.enableGitlabSnippets = config.isGitlabSnippetsEnable app.locals.enableGitlabSnippets = config.isGitlabSnippetsEnable
app.use(require('./lib/routes').router) app.use(require('./dist/routes').router)
// response not found if no any route matxches // response not found if no any route matxches
app.get('*', function (req, res) { app.get('*', function (req, res) {

View File

@ -14,7 +14,7 @@ var moment = require('moment')
var DiffMatchPatch = require('@hackmd/diff-match-patch') var DiffMatchPatch = require('@hackmd/diff-match-patch')
var dmp = new DiffMatchPatch() var dmp = new DiffMatchPatch()
const { stripTags } = require('../../utils/string') const { stripTags } = require('../string')
// core // core
var config = require('../config') var config = require('../config')

View File

@ -117,7 +117,7 @@ const outputFormats = {
docx: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document' docx: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document'
} }
// async function actionPandoc (req, res, note) { async function actionPandoc (req, res, note) {
// var url = config.serverURL || 'http://' + req.get('host') // var url = config.serverURL || 'http://' + req.get('host')
// var body = note.content // var body = note.content
// var extracted = Note.extractMeta(body) // var extracted = Note.extractMeta(body)
@ -158,7 +158,7 @@ const outputFormats = {
// message: err.message // message: err.message
// }) // })
// } // }
// } }
function actionGist (req, res, note) { function actionGist (req, res, note) {
const data = { const data = {

7
lib/string.js Normal file
View File

@ -0,0 +1,7 @@
'use strict'
function stripTags (s) {
return s.replace(RegExp('</?[^<>]*>', 'gi'), '')
}
exports.stripTags = stripTags