Skip to content

Commit

Permalink
refactor: Use @asd14/m, @ads14/pluginus
Browse files Browse the repository at this point in the history
  • Loading branch information
andreidmt committed Oct 27, 2020
1 parent 88e396e commit 3cf2ec5
Show file tree
Hide file tree
Showing 12 changed files with 14 additions and 24 deletions.
2 changes: 1 addition & 1 deletion examples/simple.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ app
const server = http.createServer(middleware)

server.listen({
port: Config.PORT,
port: process.env.PORT,
})

server.on("error", error => {
Expand Down
6 changes: 3 additions & 3 deletions src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ const debug = require("debug")("blocks:Main")

const connect = require("connect")
const path = require("path")
const { pluginus } = require("@mutant-ws/pluginus")
const { is, forEach, reduce } = require("@mutant-ws/m")
const { pluginus } = require("@asd14/pluginus")
const { is, forEach, reduce } = require("@asd14/m")

const { BaseError } = require("./errors/base")
const { NotFoundError } = require("./errors/not-found")
Expand Down Expand Up @@ -47,7 +47,7 @@ const block = ({
"./middleware/res-goodbye",
]

return pluginus({ files: PLUGIN_PATHS }).then(Plugins => {
return pluginus({ source: PLUGIN_PATHS }).then(Plugins => {
forEach(item => {
const { authenticate, authorize, action, ...rest } =
typeof item === "string" ? require(item) : item
Expand Down
2 changes: 1 addition & 1 deletion src/middleware/req-body.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ const cuid = require("cuid")
const Busboy = require("busboy")
const slugify = require("@sindresorhus/slugify")
const { tmpdir } = require("os")
const { pipe, isEmpty } = require("@mutant-ws/m")
const { pipe, isEmpty } = require("@asd14/m")
const { createWriteStream } = require("fs")
const { extname, basename, join } = require("path")

Expand Down
2 changes: 1 addition & 1 deletion src/middleware/req-bootstrap.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ const debug = require("debug")("blocks:BootstrapMiddleware")

const cuid = require("cuid")
const contentType = require("content-type")
const { pick } = require("@mutant-ws/m")
const { pick } = require("@asd14/m")

module.exports = () => (req, res, next) => {
req.ctx = {
Expand Down
2 changes: 1 addition & 1 deletion src/middleware/req-cors.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const debug = require("debug")("blocks:CORSMiddleware")

const cors = require("cors")
const { is, isEmpty } = require("@mutant-ws/m")
const { is, isEmpty } = require("@asd14/m")

module.exports = () => {
const ORIGIN = process.env.CORS_ORIGIN
Expand Down
2 changes: 1 addition & 1 deletion src/middleware/req-jwt.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const debug = require("debug")("blocks:JWTDecodeMiddleware")

const jwt = require("jsonwebtoken")
const { is, isEmpty } = require("@mutant-ws/m")
const { is, isEmpty } = require("@asd14/m")

const { InputError } = require("../errors/input")

Expand Down
2 changes: 1 addition & 1 deletion src/middleware/res-goodbye.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const debug = require("debug")("blocks:GoodbyeMiddleware")

const { get, is } = require("@mutant-ws/m")
const { get, is } = require("@asd14/m")
const accepts = require("accepts")

const toNowInMs = start => {
Expand Down
12 changes: 1 addition & 11 deletions src/middleware/res-helmet.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const debug = require("debug")("blocks:HelmetMiddleware")

const helmet = require("helmet")
const { get, when, same, pipe, is } = require("@mutant-ws/m")
const { get, when, same, pipe, is } = require("@asd14/m")

const toBool = source => (is(source) ? source === "true" : null)

Expand All @@ -11,17 +11,7 @@ const getBool = (prop, _default) =>
module.exports = () => {
return helmet({
contentSecurityPolicy: false,
dnsPrefetchControl: getBool("DNS_PREFETCH_CONTROL", true),
expectCt: getBool("EXPECT_CT", false),
featurePolicy: getBool("FEATURE_POLICY", false),
frameguard: getBool("FRAMEGUARD", true),
hidePoweredBy: getBool("HIDE_POWER_BY", false),
hsts: getBool("HSTS", true),
ieNoOpen: getBool("IE_NO_OPEN", true),
noCache: getBool("NO_CACHE", true),
noSniff: getBool("NO_SNIFF", true),
permittedCrossDomainPolicies: getBool("CROSSDOMAIN", true),
referrerPolicy: getBool("REFERER_POLICY", false),
xssFilter: getBool("XSS_FILTER", true),
})
}
2 changes: 1 addition & 1 deletion src/plugins/query-parser.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const debug = require("debug")("blocks:QueryParserPlugin")

const qs = require("qs")
const { is } = require("@mutant-ws/m")
const { is } = require("@asd14/m")

module.exports = {
create: () => {
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/router.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const {
pick,
is,
isEmpty,
} = require("@mutant-ws/m")
} = require("@asd14/m")

const { InputError } = require("../errors/input")
const { AuthenticationError } = require("../errors/authentication")
Expand Down
2 changes: 1 addition & 1 deletion src/routes/ping.route.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const { elapsedTime, is } = require("@mutant-ws/m")
const { elapsedTime, is } = require("@asd14/m")

module.exports = {
method: "GET",
Expand Down
2 changes: 1 addition & 1 deletion tests/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ const path = require("path")
const jwt = require("jsonwebtoken")
const { describe } = require("riteway")
const { createReadStream, existsSync } = require("fs")
const { GET, POST, MULTIPART, set } = require("@mutant-ws/fetch-node")
const { GET, POST, MULTIPART, set } = require("@asd14/fetch-node")

const { block } = require("../src")

Expand Down

0 comments on commit 3cf2ec5

Please sign in to comment.