Merge 005fe03104 into b09f0de143

function/ql.js

@@ -4,16 +4,17 @@ const got = require('got');
 require('dotenv').config();
 const { readFile } = require('fs/promises');
 const path = require('path');
-
-const qlDir = '/ql';
 const fs = require('fs');
+let Fileexists280 = fs.existsSync('/ql/data/db/keyv.sqlite');
 let Fileexists = fs.existsSync('/ql/data/config/auth.json');
-let authFile="";
+let authFile = "";
-if (Fileexists) 
+if (Fileexists280)
-	authFile="/ql/data/config/auth.json"
+    authFile = "/ql/data/db/keyv.sqlite"
+else if (Fileexists)
+    authFile = "/ql/data/config/auth.json"
 else
-	authFile="/ql/config/auth.json"
+    authFile = "/ql/config/auth.json"
-//const authFile = path.join(qlDir, 'config/auth.json');
+
 
 const api = got.extend({
     prefixUrl: 'http://127.0.0.1:5600',
@@ -21,10 +22,11 @@ const api = got.extend({
 });
 
 async function getToken() {
-  const authConfig = JSON.parse(await readFile(authFile));
+    const authConfig = await readFile(authFile);
-  return authConfig.token;
+    // console.log(authConfig.toString().match(/"token":"(.*?)",/)[1])
+    return authConfig.toString().match(/"token":"(.*?)",/)[1];
 }
-
+// getToken()
 module.exports.getEnvs = async () => {
     const token = await getToken();
     const body = await api({
@@ -140,7 +142,7 @@ module.exports.EnableCk = async (eid) => {
     return body;
 };
 
-module.exports.getstatus = async(eid) => {
+module.exports.getstatus = async (eid) => {
     const envs = await this.getEnvs();
     var tempid = 0;
     for (let i = 0; i < envs.length; i++) {
@@ -158,7 +160,7 @@ module.exports.getstatus = async(eid) => {
     return 99;
 };
 
-module.exports.getEnvById = async(eid) => {
+module.exports.getEnvById = async (eid) => {
     const envs = await this.getEnvs();
     var tempid = 0;
     for (let i = 0; i < envs.length; i++) {
@@ -180,7 +182,7 @@ module.exports.getEnvByPtPin = async (Ptpin) => {
     const envs = await this.getEnvs();
     for (let i = 0; i < envs.length; i++) {
         var tempptpin = decodeURIComponent(envs[i].value.match(/pt_pin=([^; ]+)(?=;?)/) && envs[i].value.match(/pt_pin=([^; ]+)(?=;?)/)[1]);
-	if(tempptpin==Ptpin){		 
+        if (tempptpin == Ptpin) {
             return envs[i];
         }
     }

jd_indeps.sh

@@ -53,6 +53,7 @@ pnpm i -g request@2.88.2
 pnpm i -g jsdom@24.1.1
 pnpm i -g moment@2.30.1
 pnpm i -g cheerio@1.0.0
+pnpm i -g tunnel
 # pnpm install -g tough-cookie@4.1.4
 pnpm i -g https-proxy-agent@7.0.5
 pip3 install -i https://pypi.tuna.tsinghua.edu.cn/simple/ jieba