diff --git a/JavaScript/c-commonjs/api/user.js b/JavaScript/c-commonjs/api/user.js index b2e65b7..57843c4 100644 --- a/JavaScript/c-commonjs/api/user.js +++ b/JavaScript/c-commonjs/api/user.js @@ -6,25 +6,25 @@ const users = db.crud('users'); module.exports = { async read(id) { - return users.read(id, ['id', 'login']); + return await users.read(id, ['id', 'login']); }, async create({ login, password }) { const passwordHash = await common.hash(password); - return users.create({ login, password: passwordHash }); + return await users.create({ login, password: passwordHash }); }, async update(id, { login, password }) { const passwordHash = await common.hash(password); - return users.update(id, { login, password: passwordHash }); + return await users.update(id, { login, password: passwordHash }); }, async delete(id) { - return users.delete(id); + return await users.delete(id); }, async find(mask) { const sql = 'SELECT login from users where login like $1'; - return users.query(sql, [mask]); + return await users.query(sql, [mask]); }, }; diff --git a/JavaScript/c-commonjs/db.js b/JavaScript/c-commonjs/db.js index 45a4a52..3964203 100644 --- a/JavaScript/c-commonjs/db.js +++ b/JavaScript/c-commonjs/db.js @@ -52,7 +52,7 @@ const crud = (table) => ({ }, async delete(id) { - const sql = 'DELETE FROM ${table} WHERE id = $1'; + const sql = `DELETE FROM ${table} WHERE id = $1`; return pool.query(sql, [id]); }, }); diff --git a/JavaScript/c-commonjs/static/client.js b/JavaScript/c-commonjs/static/client.js index 35e400e..ebe8c66 100644 --- a/JavaScript/c-commonjs/static/client.js +++ b/JavaScript/c-commonjs/static/client.js @@ -72,6 +72,6 @@ const scaffold = (url) => { say: ['message'], } }); - const data = await api.talks.say('hello'); + const data = await api.user.read(); console.dir({ data }); })(); diff --git a/JavaScript/c-commonjs/transport/http.js b/JavaScript/c-commonjs/transport/http.js index e12b373..a169fb6 100644 --- a/JavaScript/c-commonjs/transport/http.js +++ b/JavaScript/c-commonjs/transport/http.js @@ -20,21 +20,23 @@ const receiveArgs = async (req) => { }; module.exports = (routing, port, console) => { - http.createServer(async (req, res) => { - res.writeHead(200, HEADERS); - if (req.method !== 'POST') return void res.end('"Not found"'); - const { url, socket } = req; - const [place, name, method] = url.substring(1).split('/'); - if (place !== 'api') return void res.end('"Not found"'); - const entity = routing[name]; - if (!entity) return void res.end('"Not found"'); - const handler = entity[method]; - if (!handler) return void res.end('"Not found"'); - const { args } = await receiveArgs(req); - console.log(`${socket.remoteAddress} ${method} ${url}`); - const result = await handler(args); - res.end(JSON.stringify(result)); - }).listen(port); + http + .createServer(async (req, res) => { + res.writeHead(200, HEADERS); + if (req.method !== 'POST') return void res.end('"Not found"'); + const { url, socket } = req; + const [place, name, method] = url.substring(1).split('/'); + if (place !== 'api') return void res.end('"Not found"'); + const entity = routing[name]; + if (!entity) return void res.end('"Not found"'); + const handler = entity[method]; + if (!handler) return void res.end('"Not found"'); + const { args } = await receiveArgs(req); + console.log(`${socket.remoteAddress} ${method} ${url}`); + const result = await handler(...args); + res.end(JSON.stringify(result)); + }) + .listen(port); console.log(`API on port ${port}`); }; diff --git a/JavaScript/c-commonjs/transport/ws.js b/JavaScript/c-commonjs/transport/ws.js index 708d24c..c9665d6 100644 --- a/JavaScript/c-commonjs/transport/ws.js +++ b/JavaScript/c-commonjs/transport/ws.js @@ -25,7 +25,9 @@ module.exports = (routing, port, console) => { console.log(`${ip} ${name}.${method}(${parameters})`); try { const result = await handler(...args); - connection.send(JSON.stringify(result), { binary: false }); + connection.send( + JSON.stringify(result), { binary: false } + ); } catch (err) { console.error(err); connection.send('"Server error"', { binary: false }); diff --git a/JavaScript/d-messenger/lib/db.js b/JavaScript/d-messenger/lib/db.js index 5e26018..c03d384 100644 --- a/JavaScript/d-messenger/lib/db.js +++ b/JavaScript/d-messenger/lib/db.js @@ -10,7 +10,7 @@ const crud = (pool) => (table) => ({ async read(id, fields = ['*']) { const names = fields.join(', '); - const sql = `SELECT ${names} FROM ${table}`; + const sql = `SELECT ${names} FROM "${table}"`; if (!id) return pool.query(sql); return pool.query(`${sql} WHERE id = $1`, [id]); }, @@ -40,13 +40,13 @@ const crud = (pool) => (table) => ({ updates[i] = `${key} = $${++i}`; } const delta = updates.join(', '); - const sql = `UPDATE ${table} SET ${delta} WHERE id = $${++i}`; + const sql = `UPDATE "${table}" SET ${delta} WHERE id = $${++i}`; data.push(id); return pool.query(sql, data); }, async delete(id) { - const sql = 'DELETE FROM ${table} WHERE id = $1'; + const sql = `DELETE FROM "${table}" WHERE id = $1`; return pool.query(sql, [id]); }, }); diff --git a/JavaScript/d-messenger/transport/http.js b/JavaScript/d-messenger/transport/http.js index ecc9711..a169fb6 100644 --- a/JavaScript/d-messenger/transport/http.js +++ b/JavaScript/d-messenger/transport/http.js @@ -33,7 +33,7 @@ module.exports = (routing, port, console) => { if (!handler) return void res.end('"Not found"'); const { args } = await receiveArgs(req); console.log(`${socket.remoteAddress} ${method} ${url}`); - const result = await handler(args); + const result = await handler(...args); res.end(JSON.stringify(result)); }) .listen(port);