Support nodes

Author: mmdzov

app.js

@@ -33,7 +33,7 @@ def();
 
   const nodes = await api.getNodes();
 
-  const ws = new Ws({ url, accessToken: api.accessToken, DB: DBType });
+  const ws = new Ws({ url, accessToken: api.accessToken, DB: DBType, api });
 
   ws.logs();
 
@@ -42,9 +42,10 @@ def();
 
     const ws = new Ws({
       url,
-      accessToken: api.accessToken,
+      accessToken: `${api.accessToken}d`,
       DB: DBType,
       node,
+      api,
     });
 
     ws.logs();
@@ -78,7 +79,7 @@ if (process.env.NODE_ENV.includes("production")) {
 }
 
 // Api server
-if (Boolean(process.env?.API_ENABLE) === true) {
+if (process.env?.API_ENABLE === "true") {
   const PORT = process.env?.API_PORT;
 
   let address = new Server().CleanAddress(

config.js

@@ -12,14 +12,25 @@ class Ws {
    */
   constructor(params) {
     let patch = params.node ? `node/${params.node}` : "core";
+    this.access_token = params.accessToken;
+    this.params = params;
 
-    const url = `${Boolean(process.env.SSL) === true ? "wss" : "ws"}://${
+    const url = `${process.env.SSL === "true" ? "wss" : "ws"}://${
       params.url
     }/api/${patch}/logs?interval=${process.env.FETCH_INTERVAL_LOGS_WS}&token=${
-      params.accessToken
+      this.access_token
     }`;
     const db = new DBAdapter(params.DB);
     const ws = new WebSocket(url);
+
+    ws.on("unexpected-response", async (error, response) => {
+      const token = await params.api.token();
+
+      const _ws = new Ws({ ...params, accessToken: token });
+
+      _ws.logs();
+    });
+
     const user = new User();
     const ipGuard = new IPGuard(new DBSqlite3());
 
@@ -92,6 +103,19 @@ class Api {
         "Content-Type": "application/x-www-form-urlencoded",
       },
     });
+
+    this.axios.interceptors.response.use(
+      (value) => value,
+      async (error) => {
+        if (
+          error?.response?.data?.detail === "Could not validate credentials"
+        ) {
+          await this.token();
+        }
+
+        return error;
+      },
+    );
   }
 
   /**
@@ -109,8 +133,11 @@ class Api {
       });
 
       this.accessToken = data.access_token;
+      this.axios.defaults.headers.common.Authorization = `Bearer ${data.access_token}`;
       this.accessTokenType = data.token_type;
       this.accessTokenExpireAt = new Date() + 1000 * 60 * 60;
+
+      return data.access_token;
     } catch (e) {
       console.error(e);
     }
@@ -122,6 +149,8 @@ class Api {
     try {
       const { data } = await this.axios.get("/nodes");
 
+      if (!data) return nodes;
+
       nodes = data
         .filter((item) => item.status === "connected")
         .map((item) => item.id);

telegram/tg.js

@@ -8,7 +8,7 @@ const { join } = require("path");
 const { File } = require("../utils");
 
 function tg() {
-  if (Boolean(process.env.TG_ENABLE) === false) return;
+  if (process.env.TG_ENABLE === "false") return;
 
   let bot = null;
 

types.js

@@ -25,6 +25,7 @@
  * @property {string} accessToken
  * @property {object} DB
  * @property {string} node
+ * @property {Object} api
  */
 
 /**

utils.js

@@ -14,7 +14,7 @@ function banIP(ip, email) {
 
   childProcess.on("close", (code) => {
     if (code === 0) {
-      if (Boolean(process.env.TG_ENABLE) === true)
+      if (process.env.TG_ENABLE === "true")
         globalThis.bot.api.sendMessage(
           process.env.TG_ADMIN,
           `${email}: IP ${ip} banned successfully.
@@ -195,7 +195,7 @@ class IPGuard {
       usersCsv = usersCsv.split("\r\n").map((item) => item.split(","));
     }
 
-    if (usersCsv.some((item) => item[0] === data.email) === false)
+    if (usersCsv && usersCsv.some((item) => item[0] === data.email) === false)
       usersCsv = null;
 
     let userCsv = null;