From 06660a82496b35934006ca37fa354144d43b8264 Mon Sep 17 00:00:00 2001 From: Virgil Clyne Date: Thu, 28 Nov 2024 14:46:45 +0800 Subject: [PATCH] feat: Console Update CHANGELOG.md Update request.dev.js Update setENV.mjs --- CHANGELOG.md | 1 + src/function/setENV.mjs | 9 +++++---- src/request.dev.js | 28 ++++++++++++++-------------- 3 files changed, 20 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index aa3a075..60ca1e1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,3 +9,4 @@ * 升级了 `@nsnanocat/util` * `util` 由 `submodule` 更改为 `package` * `$platform` 改为 `$app` + * 使用了全新的 `Console` polyfill diff --git a/src/function/setENV.mjs b/src/function/setENV.mjs index 48d5d8a..8623a31 100644 --- a/src/function/setENV.mjs +++ b/src/function/setENV.mjs @@ -1,4 +1,4 @@ -import { Lodash as _, getStorage, log } from "@nsnanocat/util"; +import { Lodash as _, getStorage, Console } from "@nsnanocat/util"; /** * Set Environment Variables @@ -9,12 +9,13 @@ import { Lodash as _, getStorage, log } from "@nsnanocat/util"; * @return {Object} { Settings, Caches, Configs } */ export default function setENV(name, platforms, database) { - log("☑️ Set Environment Variables", ""); + Console.info("☑️ Set Environment Variables", ""); const { Settings, Caches, Configs } = getStorage(name, platforms, database); /***************** Settings *****************/ - log(`✅ Set Environment Variables, Settings: ${typeof Settings}, Settings内容: ${JSON.stringify(Settings)}`, ""); + Console.debug(`Settings: ${typeof Settings}, Settings内容: ${JSON.stringify(Settings)}`, ""); /***************** Caches *****************/ - //log(`✅ Set Environment Variables, Caches: ${typeof Caches}, Caches内容: ${JSON.stringify(Caches)}`, ""); + //Console.debug(`Caches: ${typeof Caches}, Caches内容: ${JSON.stringify(Caches)}`, ""); /***************** Configs *****************/ + Console.info("✅ Set Environment Variables"); return { Settings, Caches, Configs }; }; diff --git a/src/request.dev.js b/src/request.dev.js index 9262ecc..04508d8 100644 --- a/src/request.dev.js +++ b/src/request.dev.js @@ -1,4 +1,4 @@ -import { $app, Lodash as _, Storage, fetch, notification, log, logError, wait, done, gRPC } from "@nsnanocat/util"; +import { $app, Lodash as _, Storage, Console, fetch, notification, Console, logError, wait, done, gRPC } from "@nsnanocat/util"; import { URL } from "@nsnanocat/url"; import database from "./function/database.mjs"; import setENV from "./function/setENV.mjs"; @@ -7,13 +7,13 @@ let $response = undefined; /***************** Processing *****************/ // 解构URL const url = new URL($request.url); -log(`⚠ url: ${url.toJSON()}`, ""); +Console.debug(`url: ${url.toJSON()}`); // 获取连接参数 const PATHs = url.pathname.split("/").filter(Boolean); -log(`⚠ PATHs: ${PATHs}`, ""); +Console.debug(`PATHs: ${PATHs}`); // 解析格式 const FORMAT = ($request.headers?.["Content-Type"] ?? $request.headers?.["content-type"])?.split(";")?.[0]; -log(`⚠ FORMAT: ${FORMAT}`, ""); +Console.debug(`FORMAT: ${FORMAT}`); !(async () => { /** * 设置 @@ -42,7 +42,7 @@ log(`⚠ FORMAT: ${FORMAT}`, ""); case "application/vnd.apple.mpegurl": case "audio/mpegurl": //body = M3U8.parse($request.body); - //log(`🚧 body: ${JSON.stringify(body)}`, ""); + //Console.debug(`🚧 body: ${JSON.stringify(body)}`); //$request.body = M3U8.stringify(body); break; case "text/xml": @@ -52,19 +52,19 @@ log(`⚠ FORMAT: ${FORMAT}`, ""); case "application/plist": case "application/x-plist": //body = XML.parse($request.body); - //log(`🚧 body: ${JSON.stringify(body)}`, ""); + //Console.debug(`🚧 body: ${JSON.stringify(body)}`); //$request.body = XML.stringify(body); break; case "text/vtt": case "application/vtt": //body = VTT.parse($request.body); - //log(`🚧 body: ${JSON.stringify(body)}`, ""); + //Console.debug(`🚧 body: ${JSON.stringify(body)}`); //$request.body = VTT.stringify(body); break; case "text/json": case "application/json": //body = JSON.parse($request.body ?? "{}"); - //log(`🚧 body: ${JSON.stringify(body)}`, ""); + //Console.debug(`🚧 body: ${JSON.stringify(body)}`); //$request.body = JSON.stringify(body); break; case "application/protobuf": @@ -74,9 +74,9 @@ log(`⚠ FORMAT: ${FORMAT}`, ""); case "application/grpc+proto": case "application/vnd.apple.flatbuffer": case "application/octet-stream": { - //log(`🚧 $request.body: ${JSON.stringify($request.body)}`, ""); + //Console.debug(`🚧 $request.body: ${JSON.stringify($request.body)}`); let rawBody = $app === "Quantumult X" ? new Uint8Array($request.bodyBytes ?? []) : ($request.body ?? new Uint8Array()); - //log(`🚧 isBuffer? ${ArrayBuffer.isView(rawBody)}: ${JSON.stringify(rawBody)}`, ""); + //Console.debug(`🚧 isBuffer? ${ArrayBuffer.isView(rawBody)}: ${JSON.stringify(rawBody)}`); switch (FORMAT) { case "application/protobuf": case "application/x-protobuf": @@ -172,13 +172,13 @@ log(`⚠ FORMAT: ${FORMAT}`, ""); } if ($request.headers?.Host) $request.headers.Host = url.hostname; $request.url = url.toString(); - log("🚧 调试信息", `$request.url: ${$request.url}`, ""); + Console.debug(`$request.url: ${$request.url}`); })() .catch(e => logError(e)) .finally(() => { switch (typeof $response) { case "object": // 有构造回复数据，返回构造的回复数据 - //log("🚧 finally", `echo $response: ${JSON.stringify($response, null, 2)}`, ""); + //Console.debug("🚧 finally", `echo $response: ${JSON.stringify($response, null, 2)}`); if ($response.headers?.["Content-Encoding"]) $response.headers["Content-Encoding"] = "identity"; if ($response.headers?.["content-encoding"]) $response.headers["content-encoding"] = "identity"; switch ($app) { @@ -195,11 +195,11 @@ log(`⚠ FORMAT: ${FORMAT}`, ""); } break; case "undefined": // 无构造回复数据，发送修改的请求数据 - //log("🚧 finally", `$request: ${JSON.stringify($request, null, 2)}`, ""); + //Console.debug("🚧 finally", `$request: ${JSON.stringify($request, null, 2)}`); done($request); break; default: - logError(`不合法的 $response 类型: ${typeof $response}`, ""); + Console.error(`不合法的 $response 类型: ${typeof $response}`); break; } });