Merge branch 'express-v5'

Author: endel

README.md

@@ -1,6 +1,6 @@
 # uWebSockets.js + Express
 
-Express API compatibility layer for uWebSockets.js.
+Express API compatibility layer for [uWebSockets.js](https://github.com/uNetworking/uWebSockets.js).
 
 ## Usage
 

build.mjs

@@ -25,8 +25,8 @@ async function main() {
       declaration: true,
       emitDeclarationOnly: true,
       skipLibCheck: true,
-      module: "commonjs",
-      target,
+      module: ts.ModuleKind.CommonJS,
+      target: ts.ScriptTarget.ES2017,
       outDir: outdir,
       esModuleInterop: true,
       experimentalDecorators: true,

example/async_test.ts

@@ -1,5 +1,5 @@
 import uWS from "uWebSockets.js";
-import express from "express";
+// import express from "express";
 import expressify from "../src";
 
 // import promisified timers
@@ -8,7 +8,7 @@ import { setTimeout } from "timers/promises";
 const PORT = 8080;
 const app = expressify(uWS.App());
 
-app.get('/', async (req, res) => {
+app.get('/', async function asyncGet(req, res) {
   res.header("Cache-Control", "no-cache, no-store, must-revalidate");
   await setTimeout(1000);
 
@@ -17,4 +17,4 @@ app.get('/', async (req, res) => {
   res.end();
 });
 
-app.listen(PORT, () => console.log(`Listening on ${PORT}`));
+app.listen(PORT, () => console.log(`Listening on http://localhost:${PORT}`));

example/experiment.ts

@@ -36,5 +36,4 @@ app.get('/test', (_req, res) => {
 
 app.use('/colyseus', root);
 
-app.listen(8080);
-console.log("Listening on 8080");
+app.listen(8080, () => console.log("Listening on http://localhost:8080"));

example/express_router.ts

@@ -36,4 +36,4 @@ monitor.get("/api", (req, res) => res.json({ data: [1, 2, 3, 4, 5] }));
 app.use("/monitor", monitor);
 
 
-app.listen(PORT);
+app.listen(PORT, () => console.log(`Server is running on http://localhost:${PORT}`));

example/middleware_serve_index.ts

@@ -10,4 +10,4 @@ const app = expressify(uWS.App());
 app.use('/', serveIndex(path.join(__dirname, ".."), { icons: true, hidden: true }))
 app.use('/', express.static(path.join(__dirname, "..")));
 
-app.listen(PORT, () => console.log("Listening on", PORT));
+app.listen(PORT, () => console.log(`Listening on http://localhost:${PORT}`));

example/middleware_session.ts

@@ -1,15 +1,10 @@
-import express from "express";
-import expressify from "../src";
 import uWS from "uWebSockets.js";
-
 import session from "express-session";
+import expressify from "../src";
 
 const PORT = 8080;
-
 const app = expressify(uWS.App());
 
-// app.use(cookieParser());
-
 // Use the session middleware
 app.use(session({
   secret: "shhh",

example/middleware_static.ts

@@ -8,4 +8,4 @@ const PORT = 8080;
 const app = expressify(uWS.App());
 app.use('/', express.static(path.join(__dirname, "static")));
 
-app.listen(PORT, () => console.log("Listening on", PORT));
+app.listen(PORT, () => console.log(`Listening on http://localhost:${PORT}`));

example/render.ts

@@ -29,7 +29,7 @@ app.get("/render", (req, res) => {
 
 app.get("/redirect", (req, res) => {
   console.log("Let's redirect back!");
-  res.redirect('back');
+  res.redirect(req.get('Referrer') || '/')
 });
 
-app.listen(PORT, () => console.log(`Listening at ${PORT}`));
+app.listen(PORT, () => console.log(`Listening at http://localhost:${PORT}`));

example/uwebsockets_express.ts

@@ -1,6 +1,12 @@
 import uWS from "uWebSockets.js";
 import express from "express";
-import expressify from "../src";
+import expressify, { ServerResponse } from "../src";
+
+// // @ts-ignore
+// const res = new ServerResponse(undefined, undefined, undefined);
+// // @ts-ignore
+// res.setHeader("X-Test", "test");
+// process.exit();
 
 const PORT = 8080;
 
@@ -12,7 +18,8 @@ users.get("/param/:id", (req, res) => res.json({ id: req.params.id }));
 const app = expressify(uWS.App());
 app.use("/users", users);
 
-app.get('/', (req, res) => res.send("Hello world!"));
+app.get('/', function getRoot (req, res) {
+  res.send("Hello world!");
+});
 
-app.listen(PORT);
-console.log("Server is running on port http://localhost:" + PORT);
+app.listen(PORT, () => console.log(`Listening on http://localhost:${PORT}`));