From 72b9946f2d512c0941da024d3419563b115effaf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Batuhan=20Co=C5=9Fkun?= Date: Sun, 13 Apr 2025 17:17:11 +0300 Subject: [PATCH] =?UTF-8?q?G=C3=BCncelleme?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- configs/config.json | 6 ++++++ modules/apis/app.js | 3 +++ modules/apis/models/servers.js | 11 +++++++++-- modules/apis/v1/get/instance.js | 6 ++++++ modules/apis/v1/get/servers.js | 11 ++++------- modules/ulak/{servers.js => app.js} | 0 modules/ulak/services/proccess.js | 10 ++++++++++ modules/ulak/services/query.js | 13 +++++++++++++ 8 files changed, 51 insertions(+), 9 deletions(-) create mode 100644 configs/config.json rename modules/ulak/{servers.js => app.js} (100%) create mode 100644 modules/ulak/services/proccess.js create mode 100644 modules/ulak/services/query.js diff --git a/configs/config.json b/configs/config.json new file mode 100644 index 0000000..73d0a53 --- /dev/null +++ b/configs/config.json @@ -0,0 +1,6 @@ +{ + "title": "Arslanşah", + "description": "Yeni bir protokol", + "url": "localhost", + "version": "1.0" +} \ No newline at end of file diff --git a/modules/apis/app.js b/modules/apis/app.js index a398864..74bfc89 100644 --- a/modules/apis/app.js +++ b/modules/apis/app.js @@ -6,6 +6,9 @@ const moduleServers = require("./models/servers"); const apiServers = require("./v1/get/servers"); app.use(apiServers); +const apiInstance = require("./v1/get/instance"); +app.use(apiInstance); + module.exports = app; \ No newline at end of file diff --git a/modules/apis/models/servers.js b/modules/apis/models/servers.js index 0881bc5..64791e1 100644 --- a/modules/apis/models/servers.js +++ b/modules/apis/models/servers.js @@ -1,12 +1,17 @@ const { DataTypes } = require("sequelize"); const Database = require("../../../database/db"); -module.exports = Database.define("servers", { +const Servers = Database.define("servers", { title: { type: DataTypes.CHAR(60), unique: false, allowNull: false }, + description: { + type: DataTypes.CHAR(255), + unique: false, + allowNull: true + }, url: { type: DataTypes.CHAR(255), unique: true, @@ -17,4 +22,6 @@ module.exports = Database.define("servers", { unique: false, allowNull: false } -}); \ No newline at end of file +}); + +module.exports = Servers; \ No newline at end of file diff --git a/modules/apis/v1/get/instance.js b/modules/apis/v1/get/instance.js index 8935dfc..4aa937d 100644 --- a/modules/apis/v1/get/instance.js +++ b/modules/apis/v1/get/instance.js @@ -1,7 +1,13 @@ const express = require("express"); const router = express(); +const configs = require("../../../../configs/config.json"); + +const path = require('path'); +const fs = require("fs"); router.get("/api/v1/instance", (req, res) => { + configs.query_data = new Date() + res.json(configs) }); module.exports = router; \ No newline at end of file diff --git a/modules/apis/v1/get/servers.js b/modules/apis/v1/get/servers.js index e959152..dc863f3 100644 --- a/modules/apis/v1/get/servers.js +++ b/modules/apis/v1/get/servers.js @@ -1,13 +1,10 @@ const express = require("express"); +const { getServiceInstance } = require("../../../ulak/services/query"); const router = express(); -router.get("/api/v1/servers", (req, res) => { - res.send({ - 1:{ - title: "Arslarşah", - url: "https://arslansah.com.tr/" - } - }); +router.get("/api/v1/servers", async (req, res) => { + const service = await getServiceInstance(); + }); module.exports = router; \ No newline at end of file diff --git a/modules/ulak/servers.js b/modules/ulak/app.js similarity index 100% rename from modules/ulak/servers.js rename to modules/ulak/app.js diff --git a/modules/ulak/services/proccess.js b/modules/ulak/services/proccess.js new file mode 100644 index 0000000..09c3d35 --- /dev/null +++ b/modules/ulak/services/proccess.js @@ -0,0 +1,10 @@ +exports.service = ({title, url, version}) => { + console.log(title, url, version); +}; + +exports.getServiceInstance = async function(url){ + const result = await fetch(`https://${url}/api/v1/instance`) + .then(res => res.json()); + + return result; +}; \ No newline at end of file diff --git a/modules/ulak/services/query.js b/modules/ulak/services/query.js new file mode 100644 index 0000000..c37c55a --- /dev/null +++ b/modules/ulak/services/query.js @@ -0,0 +1,13 @@ +const Servers = require("../../apis/models/servers"); + +exports.getServers = async function(){ + return servers.findAll(); +}; + +exports.findServer = async function(url){ + return Servers.findOne({ + where: { + url: url + } + }) +} \ No newline at end of file