nvue3 1.1.16 → 1.1.18

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "nvue3",
-	"version": "1.1.16",
+	"version": "1.1.18",
 	"description": "for uniapp & vue3",
 	"main": "src/kernel.js",
 	"scripts": {
@@ -9,9 +9,9 @@
 	"author": "",
 	"license": "ISC",
 	"dependencies": {
-		"nodejs_patch": "^1.0.0"
+		"nodejs_patch": "^1.0.17"
 	},
 	"devDependencies": {
-		"nodejs_patch": "^1.0.0"
+		"nodejs_patch": "^1.0.17"
 	}
 }

package/src/http.js

@@ -4,6 +4,7 @@
 const tstShow = 350;
 const isDebug = (process.env.NODE_ENV === 'development');
 // const isDebug = true;
+const nextPost = [];
 
 const baseResp = {
 	success: 1,
@@ -12,23 +13,23 @@ const baseResp = {
 	data: {}
 };
 
+const toastConf = {
+	'l': '加载中...',
+	'r': '读取中...',
+	'f': '正在刷新...',
+	's': '保存中...',
+	'd': '删除中...',
+	'm': '发送短信...',
+	'p': '请求支付...',
+};
+
+const aliasConf = {};
+
 const config = {
-	path: '',
-	token: '',
-	modal: false, //出错时显示model，否则显示toast
-	timeout: 6000,
+	path: '', //API根目录
+	timeout: 6000, //请求最大耗时
 	mintime: 100, //两次modal或toast之间间隔最短时间，小于此时间的不显示
 	detection: 0, //检测相同API连续请求间隔，小于此时间的报错，0不检测
-	toast: {
-		'l': '加载中...',
-		'r': '读取中...',
-		'f': '正在刷新...',
-		's': '保存中...',
-		'd': '删除中...',
-		'm': '发送短信...',
-		'p': '请求支付...',
-	},
-	alias: {}
 };
 
 let processor;
@@ -50,6 +51,11 @@ const _request = class {
 			throw new Error('api 请求目标必须是string类型地址，且必填');
 		}
 
+		if ((nextPost.length > 0) && (this.method === 'POST')) {
+			data._append = JSON.parse(JSON.stringify(nextPost));
+			nextPost.length = 0;
+		}
+
 		let host = config.path;
 
 		if (uri[0] === '!') { //uri第1个字符为!，静默处理
@@ -69,7 +75,7 @@ const _request = class {
 		}
 
 		if (uri[0] !== '/') { //uri第1个字符为toast，提取出来
-			this.toast = config.toast[uri[0]] || '';
+			this.toast = toastConf[uri[0]] || '';
 			uri = uri.slice(1);
 		}
 
@@ -111,14 +117,14 @@ function apiAlias(api) {
 	let a = `/${uri[1]}`;
 	let b = `/${uri[1]}/${uri[2]}`;
 
-	if (config.alias[b]) {
+	if (aliasConf[b]) {
 		let append = uri.slice(3).join('/');
-		return `${config.alias[b]}/${append}`;
+		return `${aliasConf[b]}/${append}`;
 	}
 
-	if (config.alias[a]) {
+	if (aliasConf[a]) {
 		let append = uri.slice(2).join('/');
-		return `${config.alias[a]}/${append}`;
+		return `${aliasConf[a]}/${append}`;
 	}
 
 	return api;
@@ -326,11 +332,11 @@ function doComplete(request, res, resolve, reject) {
 		}
 	}
 
-	if (isDebug || config.debug) console.log(request)
+	console.log(request)
 }
 
 
-function doRequest(request) {
+async function doRequest(request) {
 
 	if (request.toast) {
 		request.loading = true;
@@ -340,15 +346,20 @@ function doRequest(request) {
 		});
 	}
 
+
 	return new Promise(async (resolve, reject) => {
 		request.timer.ready = Date.now();
+		console.log('======');
 		request.header.put = await processor.header(request.api, request.request, request.method);
+		console.log(request);
 
 		const contType = (request.method === 'UPLOAD') ? 'multipart/form-data' : 'application/json';
 		request.header.put['content-type'] = contType;
 		delete request.header.put['referer'];
 
 		request.timer.before = Date.now();
+
+
 		uni.request({
 			url: request.api,
 			method: request.method,
@@ -357,14 +368,17 @@ function doRequest(request) {
 			data: request.request,
 			header: request.header.put,
 			success: (res) => {
+				console.log('http success', res);
 				request.timer.after = Date.now();
 				doSuccess(request, res, resolve, reject);
 			},
 			fail: (res) => {
+				console.log('http fail', res);
 				request.timer.after = Date.now();
 				doFail(request, res, resolve, reject);
 			},
 			complete: (res) => {
+				console.log('http complete', res);
 				doComplete(request, res, resolve, reject);
 			}
 		});
@@ -389,7 +403,7 @@ function thisPost(api, data = {}) {
  * save=`s/upload/save/`
  * 
  */
-function doUploadAliYun(uri, option) {
+async function doUploadAliYun(uri, option) {
 
 	return new Promise(async (resolve, reject) => {
 		let { file, mime, used, source } = option;
@@ -472,7 +486,7 @@ function doUploadAliYun(uri, option) {
  * 操作频率检查
  * @param {Object} api
  */
-function FrequencyDetection(api) {
+async function FrequencyDetection(api) {
 
 	if (api[0] === '@') return null; //不检查频率
 
@@ -494,36 +508,147 @@ function FrequencyDetection(api) {
 }
 
 
+
+async function downloadFile(url, callback) {
+
+	const key = url.md5();
+
+	async function download_file(path) {
+		return new Promise((resolve, reject) => {
+
+			const task = uni.downloadFile({
+				url: path,
+				success: (res) => {
+					if (res.statusCode === 200) {
+						console.log('下载成功', res);
+						//#ifdef H5
+						uni.setStorageSync(key, { file: res.tempFilePath });
+						resolve({ success: true, file: res.tempFilePath })
+						//#endif
+
+						//#ifndef H5
+						uni.saveFile({
+							tempFilePath: res.tempFilePath,
+							success: (file) => {
+								console.log('保存成功', file);
+								uni.setStorageSync(key, { file: file.savedFilePath });
+								resolve({ success: true, file: file.savedFilePath })
+							},
+							fail: err => {
+								resolve({ success: false, message: err.errMsg })
+							}
+						});
+						//#endif
+					}
+					else {
+						console.log('download null', { res })
+						resolve({ success: false, message: '文件不存在' })
+					}
+				},
+				fail: err => {
+					console.log('download error', { err })
+					resolve({ success: false, message: err.errMsg })
+				}
+			});
+
+			task.onProgressUpdate((res) => {
+				// console.log('下载进度', res.progress, progress);
+				// console.log('已经下载的数据长度', res.totalBytesWritten);
+				// console.log('预期需要下载的数据总长度', res.totalBytesExpectedToWrite);
+				// 满足测试条件，取消下载任务。
+				// if (res.progress > 50000) { task.abort(); }
+
+				if (typeof callback === 'function') callback(task, res);
+
+			});
+
+
+
+		});
+
+	}
+
+
+	return new Promise(async (resolve, reject) => {
+
+		let cache = uni.getStorageSync(key);
+		if (!cache) return resolve(await download_file(url));
+
+		uni.getSavedFileInfo({
+			filePath: cache.file,
+			success: async (res) => {
+				if (res.size > 0) {
+					console.log('从缓存读取成功', cache, res);
+					return resolve(cache)
+				}
+
+				console.log('从缓存读取成功，但是空文件', cache, res);
+				resolve(await download_file(url))
+			},
+			fail: async (err) => {
+				console.log('从缓存读取失败', cache, err);
+				resolve(await download_file(url))
+			}
+		});
+
+	});
+
+}
+
+
+
 export default class {
 	processor = null;
 
 	constructor(pro, conf) {
 		this.processor = processor = pro;
-		Object.assign(config, conf);
+		for (let k in config) config[k] = conf[k];
+		if (conf.toast) Object.assign(toastConf, conf.toast);
+		if (conf.alias) Object.assign(aliasConf, conf.alias);
 		if (isDebug) console.log(config);
 	}
 
-	get(api, data = {}) {
+	async get(api, data = {}) {
 		if (config.detection > 0) {
-			const fd = FrequencyDetection(api);
+			const fd = await FrequencyDetection(api);
 			if (fd) return fd;
 		}
 
-		return doRequest(new _request(api, data, 'get'));
+		return await doRequest(new _request(api, data, 'get'));
 	}
 
-	post(api, data = {}) {
+	async post(api, data = {}) {
 		if (config.detection > 0) {
-			const fd = FrequencyDetection(api);
+			const fd = await FrequencyDetection(api);
 			if (fd) return fd;
 		}
 
-		return doRequest(new _request(api, data, 'post'));
+		return await doRequest(new _request(api, data, 'post'));
 	}
 
+	next(data) {
+		/**
+		 * 下一次post时请求时携带，后端用_append获取
+		 * 主要用于发送不紧急的数据，没必要发起一次http请求
+		 * 数据是array，后端遍历读取即可
+		 */
+		// if (data === undefined) return JSON.parse(JSON.stringify(nextPost));
+		if (data === undefined) return [...nextPost];
+
+		if (data === 'clear') {
+			nextPost.length = 0;
+			return;
+		}
+
+		nextPost.push(data);
+	}
+
+	async upload(uri, option) {
+		return await doUploadAliYun(uri, option);
+	}
 
-	upload(uri, option) {
-		return doUploadAliYun(uri, option);
+	async download(uri, callback) {
+		return await downloadFile(uri, callback);
 	}
 
 

package/src/kernel.js

@@ -53,12 +53,14 @@ export default {
 
 		if (!config.http.error) return;
 
-		app.config.errorHandler = (error, instance, info) => {
+		app.config.errorHandler = (error, instance, trace) => {
 			try {
 				if (error === lastError) return;
 				lastError = error;
-				console.log({ error, instance, info });
-				http.post(`!@${config.http.error}/error`, { error, instance, info }).then(res => {}, err => {});
+				// console.log({ error, instance, trace });
+				console.trace(error)
+				console.trace(trace)
+				http.post(`!@${config.http.error}/error`, { error, instance, trace });
 			}
 			catch (err) {
 				console.log({ err })
@@ -69,8 +71,10 @@ export default {
 			try {
 				if (error === lastWarn) return;
 				lastWarn = error;
-				console.log({ error, instance, trace });
-				http.post(`!@${config.http.error}/warn`, { error, instance, trace }).then(res => {}, err => {});
+				// console.log({ error, instance, trace });
+				console.trace(error)
+				console.trace(trace)
+				http.post(`!@${config.http.error}/warn`, { error, instance, trace });
 			}
 			catch (err) {
 				console.log({ err })

package/src/soft.js

@@ -250,7 +250,7 @@ export default class {
 		//#endif
 	}
 
-	device() {
+	get device() {
 		return {
 			system: this.system,
 			brand: this.brand,