github_mirrors/puter
1
0
Fork 0
mirror of https://github.com/HeyPuter/puter.git synced 2025-01-23 14:20:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

use puter.js to retrieve server info

Browse Source
This commit is contained in:
Nariman Jelveh 2024-04-20 15:29:33 -07:00
parent 6a65ca4ebd
commit 8648a303f1
3 changed files with 4 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/UI/Settings/UITabAbout.js
View File

@ -17,8 +17,6 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
import { fetchServerInfo } from '../../services/VersionService.js';
// About // About
export default { export default {
id: 'about', id: 'about',
@ -95,9 +93,9 @@ export default {
}, },
init: ($el_window) => { init: ($el_window) => {
// server and version infomration // server and version infomration
fetchServerInfo(api_origin, auth_token) puter.os.version()
.then(res => { .then(res => {
const deployed_date = new Date(res.deployTimestamp).toLocaleString(); const deployed_date = new Date(res.deploy_timestamp).toLocaleString();
$el_window.find('.version').html(`Version: ${res.version} &bull; Server: ${res.location} &bull; Deployed: ${deployed_date}`); $el_window.find('.version').html(`Version: ${res.version} &bull; Server: ${res.location} &bull; Deployed: ${deployed_date}`);
}) })
.catch(error => { .catch(error => {

5
src/UI/UIWindowLogin.js
View File

@ -20,7 +20,6 @@
import UIWindow from './UIWindow.js' import UIWindow from './UIWindow.js'
import UIWindowSignup from './UIWindowSignup.js' import UIWindowSignup from './UIWindowSignup.js'
import UIWindowRecoverPassword from './UIWindowRecoverPassword.js' import UIWindowRecoverPassword from './UIWindowRecoverPassword.js'
import { fetchServerInfo } from '../services/VersionService.js';
async function UIWindowLogin(options){ async function UIWindowLogin(options){
options = options ?? {}; options = options ?? {};
@ -73,9 +72,9 @@ async function UIWindowLogin(options){
h += `</div>`; h += `</div>`;
// server and version infomration // server and version infomration
fetchServerInfo(api_origin, auth_token) puter.os.version()
.then(res => { .then(res => {
const deployed_date = new Date(res.deployTimestamp).toLocaleString(); const deployed_date = new Date(res.deploy_timestamp).toLocaleString();
$("#version-placeholder").html(`Version: ${res.version} &bull; Server: ${res.location} &bull; Deployed: ${deployed_date}`); $("#version-placeholder").html(`Version: ${res.version} &bull; Server: ${res.location} &bull; Deployed: ${deployed_date}`);
}) })
.catch(() => { .catch(() => {

49
src/services/VersionService.js
View File

@ -1,49 +0,0 @@
/**
* Copyright (C) 2024 Puter Technologies Inc.
*
* This file is part of Puter.
*
* Puter is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published
* by the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
let server_info = null;
export async function fetchServerInfo(api_origin, auth_token) {
if (server_info) return server_info;
try {
const res = await $.ajax({
url: api_origin + "/version",
type: 'GET',
contentType: "application/json",
headers: {
"Authorization": "Bearer " + auth_token
},
statusCode: {
401: function () {
logout();
}
}
});
server_info = {
version: res.version,
location: res.location,
deployTimestamp: res.deploy_timestamp
};
return server_info;
} catch (error) {
console.error('Failed to fetch server info:', error);
throw error;
}
}