Skip to content

Commit

Permalink
[uWebsockets.js] Upgrade to v20.31.0 (#8332)
Browse files Browse the repository at this point in the history
* [uWebsockets.js] Upgrade to v20.31.0

* [uWebsockets.js] Upgrade to v20.31.0

* [uWebsockets.js] Refactor(server.js): escape unsafe html using regex

* [uWebsockets.js] Refactor(postgres.js): change database driver from pg to postgres.js

* [uWebsockets.js] Refactor(postgres.js): fix warn invalid date header

* [uwebsockets.js] Update README.md

* [uWebsockets.js] Refactor(server.js): improve fortunes

* [uWebsockets.js] Refactor(server.js): update fortunes

* [uWebsockets.js] Upgrade to v20.31.0

* [uWebsockets.js] Refactor server.js, utils.js, and postgres.js
  • Loading branch information
masfahru committed Jul 26, 2023
1 parent 134d906 commit aaa328a
Show file tree
Hide file tree
Showing 6 changed files with 65 additions and 345 deletions.
2 changes: 1 addition & 1 deletion frameworks/JavaScript/uwebsockets.js/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ uWebSockets is a web server written in C/C++ (https://github.com/uNetworking/uWe
The tests were run with:

- [uWebSockets.js](https://github.com/uNetworking/uWebSockets.js/)
- [pg](https://github.com/brianc/node-postgres)
- [postgres](https://github.com/porsager/postgres/)

## Database

Expand Down
285 changes: 12 additions & 273 deletions frameworks/JavaScript/uwebsockets.js/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 2 additions & 4 deletions frameworks/JavaScript/uwebsockets.js/package.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
{
"dependencies": {
"html-escaper": "^3.0.3",
"pg": "^8.11.0",
"pg-pool": "^3.6.0",
"uWebSockets.js": "uNetworking/uWebSockets.js#v20.30.0"
"postgres": "^3.3.5",
"uWebSockets.js": "uNetworking/uWebSockets.js#v20.31.0"
},
"license": "MIT",
"main": "src/server.js",
Expand Down
21 changes: 6 additions & 15 deletions frameworks/JavaScript/uwebsockets.js/src/database/postgres.js
Original file line number Diff line number Diff line change
@@ -1,24 +1,15 @@
import Pool from "pg-pool";
import postgres from "postgres";

const pool = new Pool({
const sql = postgres({
host: "tfb-database",
user: "benchmarkdbuser",
password: "benchmarkdbpass",
database: "hello_world",
max: 1
});

await pool.connect();
export const fortunes = async () => await sql`SELECT id, message FROM fortune`;

const query = (text, values) =>
pool.query(text, values || []).then((r) => r.rows);
export const find = async (id) => await sql`SELECT id, randomNumber FROM world WHERE id = ${id}`.then((arr) => arr[0]);

export const fortunes = () => query("SELECT * FROM fortune");

export const find = (id) =>
query("SELECT * FROM world WHERE id = $1", [id]).then((arr) => arr[0]);

export const update = (obj) =>
query("UPDATE world SET randomNumber = $1 WHERE id = $2", [
obj.randomNumber,
obj.id,
]);
export const update = async (obj) => await sql`UPDATE world SET randomNumber = ${obj.randomNumber} WHERE id = ${obj.id}`;
Loading

0 comments on commit aaa328a

Please sign in to comment.