修复无法记录日志的问题

欧如栋 · 欧如栋 · commit b776111dd62c · 2023-07-04T18:14:11.000+08:00
diff --git a/bin/index.js b/bin/index.js
@@ -74,13 +74,13 @@ const upload = async (filePath, parts = [], requestUrl) =>{
 } else{
 console.log(chalk.red('网络连接异常，请重新执行命令继续上传'));
 logger.error(`分片（${currentChunkIndex}）上传时网络连接异常 (path: ${filePath}) , url: ${requestUrl})`);
- await logger.close();
- process.exit(1);
+ await logger.close(() => process.exit(1));
+ throw error;
 }
 } else{
 console.log(chalk.red((error.response && error.response.data) || error.message));
- await logger.close();
- process.exit(1);
+ await logger.close(() => process.exit(1));
+ throw error;
 }
 }
 }
@@ -121,8 +121,8 @@ const upload = async (filePath, parts = [], requestUrl) =>{
 logger.error(error.message);
 logger.error(error.stack);
 console.log(chalk(error.message));
- await logger.close();
- process.exit(1);
+ await logger.close(() => process.exit(1));
+ throw error;
 }
 
 
@@ -153,8 +153,8 @@ const upload = async (filePath, parts = [], requestUrl) =>{
 logger.error(error.message);
 logger.error(error.stack);
 console.log(chalk.red((error.response && error.response.data) || error.message));
- await logger.close();
- process.exit(1);
+ await logger.close(() => process.exit(1));
+ throw error;
 }
 
 console.log(chalk.green(`\n上传完毕 (${filePath})\n`))
@@ -189,9 +189,9 @@ const getFileMD5Success = async (filePath, requestUrl) =>{
 logger.error(`获取已上传信息错误(2) (path: ${filePath} , url: ${requestUrl})`);
 logger.error(error.message);
 logger.error(error.stack);
- console.log(chalk.red((error.response && error.response.data) || error.message));
- await logger.close();
- process.exit(1);
+ console.log(chalk.red((error.response && error.response.data) || error.message), `(path: ${filePath} , url: ${requestUrl}`);
+ await logger.close(() => process.exit(1));
+ throw error;
 }
 
 await upload(filePath, uploadedParts, requestUrl);
@@ -233,8 +233,8 @@ const getFileMD5 = async (filePath, requestUrl) =>{
 console.log(chalk.red((error.response && error.response.data) || error.message));
 logger.error(error.message);
 logger.error(error.stack);
- await logger.close();
- process.exit(1);
+ await logger.close(() => process.exit(1));
+ throw error;
 }
 }
 
@@ -269,8 +269,8 @@ const uploadDir = async (dir) =>{
 console.log(chalk.red((error.response && error.response.data) || error.message));
 logger.error(error.message);
 logger.error(error.stack);
- await logger.close();
- process.exit(1);
+ await logger.close(() => process.exit(1));
+ throw error;
 } else{
 return files;
 }
@@ -298,12 +298,10 @@ const beforeUpload = async (filePath) =>{
 const isDirectory = stat.isDirectory();
 if (isDirectory && !isUploadDir){
 console.log(chalk.red(`\n${filePath}不合法，需指定一个文件\n`))
- await logger.close();
- process.exit(1);
+ await logger.close(() => process.exit(1));
 } else if (!isDirectory && isUploadDir){
 console.log(chalk.red(`\n${filePath}不合法，需指定一个文件夹\n`))
- await logger.close();
- process.exit(1);
+ await logger.close(() => process.exit(1));
 }
 fSize = stat.size;
 } catch (error){
@@ -314,8 +312,8 @@ const beforeUpload = async (filePath) =>{
 logger.error(error.stack);
 console.log(chalk.red((error.response && error.response.data) || error.message));
 }
- await logger.close();
- process.exit(1);
+ await logger.close(() => process.exit(1));
+ throw error;
 }
 if (isUploadDir){
 await uploadDir(filePath);
diff --git a/lib/log.js b/lib/log.js
@@ -1,9 +1,12 @@
 const{createLogger, format, transports } = require('winston');
 const{combine, timestamp, printf } = format;
+const util = require('util')
 
 const userHome = process.env.HOME || process.env.USERPROFILE;
 
-const formatLog = printf(({level, message, timestamp }) => `${timestamp} ${level}: ${JSON.stringify(message)}`);
+const formatLog = printf(({level, message, timestamp }) =>{
+ return `${timestamp} ${level}: ${JSON.stringify(util.inspect(message))}`
+});
 const transport = new (transports.DailyRotateFile)({
 filename: `${userHome}/.coding/log/coding-generic/%DATE%.log`,
 zippedArchive: true,
diff --git a/lib/request.js b/lib/request.js
@@ -1,4 +1,35 @@
 const axios = require('axios');
+const util = require('util')
+const logger = require('./log');
+
+
+const http = axios.create({
+ withCredentials: true,
+})
+
+
+// 响应拦截器
+const responseSuccess = response =>{
+ return Promise.resolve(response)
+}
+
+const responseFailed = error =>{
+ const url = error.config?.url
+ console.error('网络请求错误', `(${url})`);
+ logger.error(`网络请求错误 (${url})`);
+ logger.error(JSON.stringify(util.inspect(error)));
+ const{response } = error
+ if (response){
+ console.error('网络请求错误', response.data);
+ logger.error(response.data);
+ logger.error(response);
+
+ }
+ return Promise.reject(error)
+}
+http.interceptors.response.use(responseSuccess, responseFailed)
+
+
 
 /**
 * 获取已经上传完成的分片信息
@@ -12,10 +43,10 @@ const getExistChunks = (requestUrl,{
 fileSize,
 version,
 fileTag
-},{
+},{
 Authorization
 }) =>{
- return axios.post(`${requestUrl}?version=${version}&fileTag=${fileTag}&fileSize=${fileSize}&action=part-init`,{},{
+ return http.post(`${requestUrl}?version=${version}&fileTag=${fileTag}&fileSize=${fileSize}&action=part-init`,{},{
 headers:{Authorization }
 })
 }
@@ -32,22 +63,18 @@ const getExistChunks = (requestUrl,{
 * @param{string} Authorization
 */
 const uploadChunk = (requestUrl,{
- uploadId, 
+ uploadId,
 version,
- partNumber, 
- size, 
+ partNumber,
+ size,
 currentChunk,
 },{
 headers,
 Authorization
 }) =>{
- return axios({
+ return http.post(`${requestUrl}?version=${version}&uploadId=${uploadId}&partNumber=${partNumber}&size=${size}&action=part-upload`, currentChunk,{
 maxContentLength: Infinity,
- maxBodyLength: Infinity,
- method: 'post',
- url: `${requestUrl}?version=${version}&uploadId=${uploadId}&partNumber=${partNumber}&size=${size}&action=part-upload`,
- data: currentChunk,
- headers:{Authorization, ...headers }
+ maxBodyLength: Infinity, headers:{Authorization, ...headers }
 })
 }
 
@@ -68,7 +95,7 @@ const mergeAllChunks = (requestUrl,{
 },{
 Authorization
 }) =>{
- return axios.post(`${requestUrl}?version=${version}&uploadId=${uploadId}&fileTag=${fileTag}&size=${fileSize}&action=part-complete`,{},{
+ return http.post(`${requestUrl}?version=${version}&uploadId=${uploadId}&fileTag=${fileTag}&size=${fileSize}&action=part-complete`,{},{
 headers:{Authorization }
 })
 }
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
{
 "name": "coding-generic",
- "version": "1.2.10",
+ "version": "1.2.11",
 "description": "",
 "main": "index.js",
 "bin":{

-Original file line number
+Diff line change
 }else{
 console.log(chalk.red('网络连接异常，请重新执行命令继续上传'));
 logger.error(`分片（${currentChunkIndex}）上传时网络连接异常 (path: ${filePath}) , url: ${requestUrl})`);
 -awaitlogger.close();
 -process.exit(1);
 +awaitlogger.close(()=>process.exit(1));
 +throwerror;
+}
 }else{
 console.log(chalk.red((error.response&&error.response.data)||error.message));
 -awaitlogger.close();
 -process.exit(1);
 +awaitlogger.close(()=>process.exit(1));
 +throwerror;
+}
+}
+}
 logger.error(error.message);
 logger.error(error.stack);
 console.log(chalk(error.message));
 -awaitlogger.close();
 -process.exit(1);
 +awaitlogger.close(()=>process.exit(1));
 +throwerror;
+}
 logger.error(error.message);
 logger.error(error.stack);
 console.log(chalk.red((error.response&&error.response.data)||error.message));
 -awaitlogger.close();
 -process.exit(1);
 +awaitlogger.close(()=>process.exit(1));
 +throwerror;
+}
 console.log(chalk.green(`\n上传完毕 (${filePath})\n`))
 logger.error(`获取已上传信息错误(2) (path: ${filePath} , url: ${requestUrl})`);
 logger.error(error.message);
 logger.error(error.stack);
 -console.log(chalk.red((error.response&&error.response.data)||error.message));
 -awaitlogger.close();
 -process.exit(1);
 +console.log(chalk.red((error.response&&error.response.data)||error.message),`(path: ${filePath} , url: ${requestUrl}`);
 +awaitlogger.close(()=>process.exit(1));
 +throwerror;
+}
 awaitupload(filePath,uploadedParts,requestUrl);
 console.log(chalk.red((error.response&&error.response.data)||error.message));
 logger.error(error.message);
 logger.error(error.stack);
 -awaitlogger.close();
 -process.exit(1);
 +awaitlogger.close(()=>process.exit(1));
 +throwerror;
+}
+}
 console.log(chalk.red((error.response&&error.response.data)||error.message));
 logger.error(error.message);
 logger.error(error.stack);
 -awaitlogger.close();
 -process.exit(1);
 +awaitlogger.close(()=>process.exit(1));
 +throwerror;
 }else{
 returnfiles;
+}
 constisDirectory=stat.isDirectory();
 if(isDirectory&&!isUploadDir){
 console.log(chalk.red(`\n${filePath}不合法，需指定一个文件\n`))
 -awaitlogger.close();
 -process.exit(1);
 +awaitlogger.close(()=>process.exit(1));
 }elseif(!isDirectory&&isUploadDir){
 console.log(chalk.red(`\n${filePath}不合法，需指定一个文件夹\n`))
 -awaitlogger.close();
 -process.exit(1);
 +awaitlogger.close(()=>process.exit(1));
+}
 fSize=stat.size;
 }catch(error){
 logger.error(error.stack);
 console.log(chalk.red((error.response&&error.response.data)||error.message));
+}
 -awaitlogger.close();
 -process.exit(1);
 +awaitlogger.close(()=>process.exit(1));
 +throwerror;
+}
 if(isUploadDir){
 awaituploadDir(filePath);
-Original file line number
+Diff line change
@@ @@ -1,9 +1,12 @@ @@
 const{ createLogger, format, transports }=require('winston');
 const{ combine, timestamp, printf }=format;
 +constutil=require('util')
 constuserHome=process.env.HOME||process.env.USERPROFILE;
 -constformatLog=printf(({ level, message, timestamp })=>`${timestamp}${level}: ${JSON.stringify(message)}`);
 +constformatLog=printf(({ level, message, timestamp })=>{
 +return`${timestamp}${level}: ${JSON.stringify(util.inspect(message))}`
 +});
 consttransport=new(transports.DailyRotateFile)({
 filename: `${userHome}/.coding/log/coding-generic/%DATE%.log`,
 zippedArchive: true,
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "coding-generic",`
`3`		`-"version": "1.2.10",`
	`3`	`+"version": "1.2.11",`
`4`	`4`	`"description": "",`
`5`	`5`	`"main": "index.js",`
`6`	`6`	`"bin":{`