浏览代码

use puter.js to retrieve server info

Nariman Jelveh 1 年之前
父节点
当前提交
8648a303f1
共有 3 个文件被更改,包括 4 次插入56 次删除
  1. 2 4
      src/UI/Settings/UITabAbout.js
  2. 2 3
      src/UI/UIWindowLogin.js
  3. 0 49
      src/services/VersionService.js

+ 2 - 4
src/UI/Settings/UITabAbout.js

@@ -17,8 +17,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import { fetchServerInfo } from '../../services/VersionService.js';
-
 // About
 export default {
     id: 'about',
@@ -95,9 +93,9 @@ export default {
     },
     init: ($el_window) => {
         // server and version infomration
-        fetchServerInfo(api_origin, auth_token)
+        puter.os.version()
         .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}`);
         })
         .catch(error => {

+ 2 - 3
src/UI/UIWindowLogin.js

@@ -20,7 +20,6 @@
 import UIWindow from './UIWindow.js'
 import UIWindowSignup from './UIWindowSignup.js'
 import UIWindowRecoverPassword from './UIWindowRecoverPassword.js'
-import { fetchServerInfo } from '../services/VersionService.js';
 
 async function UIWindowLogin(options){
     options = options ?? {};
@@ -73,9 +72,9 @@ async function UIWindowLogin(options){
         h += `</div>`;
 
         // server and version infomration
-        fetchServerInfo(api_origin, auth_token)
+        puter.os.version()
         .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}`);
         })
         .catch(() => {

+ 0 - 49
src/services/VersionService.js

@@ -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;
-    }
-}