update:夸克扫码

Author: hjdhnx

Diff for: README.md

@@ -13,12 +13,11 @@ nodejs作为服务端的drpy实现。全面升级异步写法
 
 ## 更新记录
 
-### 20241221
+### 20241222
 
-更新至V1.0.17
+更新至V1.0.18
 
-1. 增加`ENV`管理cookie
-2. 解决源排序问题
+1. 夸克扫码获取cookie功能修复
 
 [点此查看完整更新记录](docs/updateRecord.md)
 

Diff for: config/env.json

@@ -1,6 +1,6 @@
 {
   "ali_cookie": "test",
-  "quark_cookie": "test",
+  "quark_cookie": "__pus=; __puus=",
   "uc_cookie": "test",
   "bili_cookie": "test"
 }

Diff for: controllers/web.js

@@ -1,6 +1,7 @@
 import {readFileSync, existsSync} from 'fs';
 import path from 'path';
 import {ENV} from '../utils/env.js';
+import COOKIE from '../utils/cookieManager.js';
 
 const COOKIE_AUTH_CODE = process.env.COOKIE_AUTH_CODE || 'drpys';
 
@@ -45,8 +46,19 @@ export default (fastify, options, done) => {
                 });
             }
 
+            let cookie_obj = COOKIE.parse(value);
+            let cookie_str = value;
+
+            if (key === 'quark_cookie') {
+                // console.log(cookie_obj);
+                cookie_str = COOKIE.stringify({
+                    __pus: cookie_obj.__pus || '',
+                    __puus: cookie_obj.__puus || '',
+                });
+                console.log(cookie_str);
+            }
             // 调用 ENV.set 设置环境变量
-            ENV.set(key, value);
+            ENV.set(key, cookie_str);
 
             // 返回成功响应
             return reply.code(200).send({

Diff for: docs/updateRecord.md

@@ -1,5 +1,13 @@
 # drpyS更新记录
 
+### 20241222
+
+更新至V1.0.18
+
+1. 修复`cookie管理工具`扫码获取夸克和UC的cookie不正确的问题，感谢 [@Hiram-Wong](https://github.com/Hiram-Wong)
+2. `COOKIE.parse` 支持列表，修复 `COOKIE.stringify` 可以直接将obj转为正确的cookie字符串，区别于 `COOKIE.serialize` 方法
+3. 夸克cookie入库自动清洗，只保留有效部分
+
 ### 20241221
 
 更新至V1.0.17

Diff for: js/_fq3.js

@@ -19,9 +19,11 @@ const rule = {
         log(ck);
         // log(cookieToJson(ck));
         let ck_obj = COOKIE.parse(ck[0]);
+        let ck_obj1 = COOKIE.parse(ck);
         log(ck_obj);
+        log(ck_obj1);
         log(ck_obj.BAIDUID);
-        log(COOKIE.stringify("name", 'echo', {
+        log(COOKIE.serialize("name", 'echo', {
             httpOnly: true,
             maxAge: 60 * 60 * 24 * 7, // 1 week
         }));

Diff for: package.json

@@ -1,6 +1,6 @@
 {
   "name": "drpy-node",
-  "version": "1.0.17",
+  "version": "1.0.18",
   "main": "index.js",
   "type": "module",
   "scripts": {

Diff for: utils/cookieManager.js

@@ -76,35 +76,48 @@ const NullObject = (() => {
  * Parse the given cookie header string into an object
  * The object has the various cookies as keys(names) => values
  */
-export function parse(str, options) {
+export function parse(input, options) {
     const obj = new NullObject();
-    const len = str.length;
-    if (len < 2) return obj;
     const dec = options?.decode || decode;
-    let index = 0;
-    do {
-        const eqIdx = str.indexOf("=", index);
-        if (eqIdx === -1) break;
-        const colonIdx = str.indexOf(";", index);
-        const endIdx = colonIdx === -1 ? len : colonIdx;
-        if (eqIdx > endIdx) {
-            index = str.lastIndexOf(";", eqIdx - 1) + 1;
-            continue;
-        }
-        const keyStartIdx = startIndex(str, index, eqIdx);
-        const keyEndIdx = endIndex(str, eqIdx, keyStartIdx);
-        const key = str.slice(keyStartIdx, keyEndIdx);
-        if (obj[key] === undefined) {
+
+    // If input is an array, process each string
+    const headers = Array.isArray(input) ? input : [input];
+
+    for (const str of headers) {
+        const len = str.length;
+        if (len < 2) continue;
+
+        let index = 0;
+        do {
+            const eqIdx = str.indexOf("=", index);
+            if (eqIdx === -1) break;
+            const colonIdx = str.indexOf(";", index);
+            const endIdx = colonIdx === -1 ? len : colonIdx;
+
+            if (eqIdx > endIdx) {
+                index = str.lastIndexOf(";", eqIdx - 1) + 1;
+                continue;
+            }
+
+            const keyStartIdx = startIndex(str, index, eqIdx);
+            const keyEndIdx = endIndex(str, eqIdx, keyStartIdx);
+            const key = str.slice(keyStartIdx, keyEndIdx); // Keep original case
+
             let valStartIdx = startIndex(str, eqIdx + 1, endIdx);
             let valEndIdx = endIndex(str, endIdx, valStartIdx);
             const value = dec(str.slice(valStartIdx, valEndIdx));
+
+            // Always overwrite with the latest value for the same key
             obj[key] = value;
-        }
-        index = endIdx + 1;
-    } while (index < len);
+
+            index = endIdx + 1;
+        } while (index < len);
+    }
+
     return obj;
 }
 
+
 function startIndex(str, index, max) {
     do {
         const code = str.charCodeAt(index);
@@ -226,6 +239,13 @@ function isDate(val) {
     return __toString.call(val) === "[object Date]";
 }
 
+export function stringify(obj, encode = 0) {
+    return Object.entries(obj)
+        .map(([key, value]) => encode ? serialize(key, value) : decodeURIComponent(serialize(key, value)))
+        .join("; ")
+}
+
+
 // Export as default object for named and default usage
-const COOKIE = {parse, serialize, stringify: serialize};
+const COOKIE = {parse, serialize, stringify};
 export default COOKIE;