@zfqh/uniapp 0.3.22 → 0.3.24

package/lib/utils/cos.js

@@ -3,6 +3,7 @@ import SHA1 from 'crypto-js/sha1';
 import Base64 from 'crypto-js/enc-base64';
 import Crypto from 'crypto-js/core';
 import upload from '../configs/upload';
+import { IS_WEBVIEW_ENV } from './consts';
 import { cosCompress } from './index';
 const data = {};
 let promise = null;
@@ -20,81 +21,196 @@ export async function checkRefreshToken() {
     }
     return promise;
 }
+/**
+ * 是否使用 HTML5+ Uploader：
+ * H5 页面被宿主 web-view 嵌入（IS_WEBVIEW_ENV）、plus.uploader 可用，且存在文件路径。
+ */
+function canUsePlusUploader(filePath) {
+    let available = false;
+    // #ifdef WEB || H5
+    available =
+        IS_WEBVIEW_ENV && typeof filePath === 'string' && !!filePath && typeof plus !== 'undefined' && !!plus.uploader;
+    // #endif
+    return available;
+}
 class COS {
+    /** 生成 COS 上传签名表单 */
+    getFormData(Bucket, Key) {
+        const now = data.create_time || Math.round(Date.now() / 1000);
+        const exp = now + 1800; // 30分钟过期
+        const qKeyTime = now + ';' + exp;
+        const qSignAlgorithm = 'sha1';
+        const qAk = data.secret_id;
+        const policyData = {
+            expiration: new Date(exp * 1000).toISOString(),
+            conditions: [
+                { 'q-sign-algorithm': qSignAlgorithm },
+                { 'q-ak': qAk },
+                { 'q-sign-time': qKeyTime },
+                { bucket: Bucket },
+                { key: Key },
+            ],
+        };
+        const policy = JSON.stringify(policyData);
+        const signKey = HmacSHA1(qKeyTime, data.secret_key).toString(Crypto.enc.Hex);
+        const stringToSign = SHA1(policy).toString(Crypto.enc.Hex);
+        const qSignature = HmacSHA1(stringToSign, signKey).toString(Crypto.enc.Hex);
+        return {
+            key: Key,
+            policy: Base64.stringify(Crypto.enc.Utf8.parse(policy)),
+            success_action_status: 200,
+            'x-cos-security-token': data.session_token,
+            'q-sign-algorithm': qSignAlgorithm,
+            'q-ak': qAk,
+            'q-key-time': qKeyTime,
+            'q-signature': qSignature,
+        };
+    }
+    /**
+     * 统一上传入口：内部按运行环境选择 plus.uploader 或 uni.uploadFile，
+     * 两条链路的 success / fail / getTask 回调形态一致。
+     */
+    uploadHandler(options) {
+        const { url, filePath, file, name = 'file', formData = {}, getTask, success, fail } = options;
+        // 链路 1：H5 宿主 webview + plus.uploader + 文件路径（canUsePlusUploader 内部判断，命中后不再走 uni.uploadFile）
+        // #ifdef WEB || H5
+        if (canUsePlusUploader(filePath)) {
+            let plusTask;
+            let settled = false;
+            const progressCallbacks = new Set();
+            const plusSuccess = (res) => {
+                if (settled) {
+                    return;
+                }
+                settled = true;
+                success?.(res);
+            };
+            const plusFail = (err) => {
+                if (settled) {
+                    return;
+                }
+                settled = true;
+                fail?.(err);
+            };
+            try {
+                plusTask = plus.uploader.createUpload(url, { method: 'POST' }, (upload, status) => {
+                    const statusCode = Number(status) || 0;
+                    if (statusCode > 0) {
+                        plusSuccess({ statusCode, data: String(upload.responseText || '') });
+                    }
+                    else {
+                        // 网络失败，未取得 HTTP 状态码
+                        plusFail({ errMsg: 'uploadFile:fail' });
+                    }
+                });
+                plusTask.addEventListener('statechanged', (upload) => {
+                    const total = Number(upload.totalSize) || 0;
+                    const sent = Number(upload.uploadedSize) || 0;
+                    const progress = total > 0 ? Math.round((sent / total) * 100) : 0;
+                    progressCallbacks.forEach((cb) => cb({ progress, totalBytesSent: sent, totalBytesExpectedToSend: total }));
+                });
+                Object.keys(formData).forEach((key) => {
+                    const value = formData[key];
+                    if (value !== undefined && value !== null) {
+                        plusTask.addData(key, String(value));
+                    }
+                });
+                if (plusTask.addFile(filePath, { key: name })) {
+                    const taskLike = {
+                        abort: () => {
+                            if (settled) {
+                                return;
+                            }
+                            settled = true;
+                            plusTask.abort();
+                            fail?.({ errMsg: 'uploadFile:fail abort' });
+                        },
+                        onProgressUpdate: (cb) => {
+                            progressCallbacks.add(cb);
+                        },
+                        offProgressUpdate: (cb) => {
+                            progressCallbacks.delete(cb);
+                        },
+                    };
+                    getTask?.(taskLike);
+                    plusTask.start();
+                    return;
+                }
+                // 已确定走 plus 链路：路径无法被 HTML5+ 读取（如 blob/content）时直接失败，不再回退 uni.uploadFile
+                plusFail({ errMsg: 'uploadFile:fail' });
+                plusTask.abort();
+            }
+            catch (e) {
+                plusFail({ errMsg: 'uploadFile:fail' });
+                plusTask?.abort();
+            }
+            return;
+        }
+        // #endif
+        // 链路 2：uni.uploadFile（默认链路）
+        const task = uni.uploadFile({
+            url,
+            filePath,
+            file,
+            name,
+            formData,
+            success: (res) => {
+                success?.({ statusCode: res.statusCode, data: String(res.data ?? '') });
+            },
+            fail: (err) => {
+                fail?.(err);
+            },
+        });
+        getTask?.(task);
+    }
+    /** 处理上传结果：成功 / token 过期重试 / 失败 */
+    handleUploadResult(params, cosHost, statusCode, body, resolve, reject) {
+        if (statusCode === 200) {
+            resolve({ Location: `${cosHost}/${params.Key}` });
+            return;
+        }
+        const resBody = String(body || '');
+        const codeMatch = resBody.match(/<Code>([^<>]+)<\/Code>/);
+        if (codeMatch && codeMatch[1] === 'ExpiredToken' && data.expire_time !== 0) {
+            data.expire_time = 0;
+            checkRefreshToken()
+                .then(() => {
+                this.uploadFile(params)
+                    .then((e) => {
+                    resolve(e);
+                })
+                    .catch((e) => {
+                    reject(e);
+                });
+            })
+                .catch((e) => {
+                reject(e);
+            });
+            return;
+        }
+        const err = {
+            code: statusCode,
+            msg: 'Upload Fail',
+        };
+        const msgMatch = resBody.match(/<Message>([^<>]+)<\/Message>/);
+        if (msgMatch) {
+            err.msg = msgMatch[1];
+        }
+        reject(err);
+    }
     async uploadFile(params) {
         const { Bucket, Region, Key, FilePath, File } = params;
+        const cosHost = `${Bucket}.cos.${Region}.myqcloud.com`;
         return new Promise((resolve, reject) => {
-            const cosHost = `${Bucket}.cos.${Region}.myqcloud.com`;
-            const now = data.create_time || Math.round(Date.now() / 1000);
-            const exp = now + 1800; // 30分钟过期
-            const qKeyTime = now + ';' + exp;
-            const qSignAlgorithm = 'sha1';
-            const qAk = data.secret_id;
-            const policyData = {
-                expiration: new Date(exp * 1000).toISOString(),
-                conditions: [
-                    { 'q-sign-algorithm': qSignAlgorithm },
-                    { 'q-ak': qAk },
-                    { 'q-sign-time': qKeyTime },
-                    { bucket: Bucket },
-                    { key: Key },
-                ],
-            };
-            const policy = JSON.stringify(policyData);
-            const signKey = HmacSHA1(qKeyTime, data.secret_key).toString(Crypto.enc.Hex);
-            const stringToSign = SHA1(policy).toString(Crypto.enc.Hex);
-            const qSignature = HmacSHA1(stringToSign, signKey).toString(Crypto.enc.Hex);
-            const FormData = {
-                key: Key,
-                policy: Base64.stringify(Crypto.enc.Utf8.parse(policy)),
-                success_action_status: 200,
-                'x-cos-security-token': data.session_token,
-                'q-sign-algorithm': qSignAlgorithm,
-                'q-ak': qAk,
-                'q-key-time': qKeyTime,
-                'q-signature': qSignature,
-            };
-            const task = uni.uploadFile({
+            this.uploadHandler({
                 url: `https://${cosHost}`,
                 filePath: FilePath,
                 file: File,
                 name: 'file',
-                formData: FormData,
+                formData: this.getFormData(Bucket, Key),
+                getTask: params.getTask,
                 success: (res) => {
-                    if (res.statusCode === 200) {
-                        resolve({ Location: `${cosHost}/${Key}` });
-                    }
-                    else {
-                        const { data: e, statusCode } = res;
-                        const codeMatch = e.match(/<Code>([^<>]+)<\/Code>/);
-                        if (codeMatch && codeMatch[1] === 'ExpiredToken' && data.expire_time !== 0) {
-                            data.expire_time = 0;
-                            checkRefreshToken()
-                                .then(() => {
-                                this.uploadFile(params)
-                                    .then((e) => {
-                                    resolve(e);
-                                })
-                                    .catch((e) => {
-                                    reject(e);
-                                });
-                            })
-                                .catch((e) => {
-                                reject(e);
-                            });
-                        }
-                        else {
-                            const err = {
-                                code: statusCode,
-                                msg: 'Upload Fail',
-                            };
-                            const msgMatch = e.match(/<Message>([^<>]+)<\/Message>/);
-                            if (msgMatch) {
-                                err.msg = msgMatch[1];
-                            }
-                            reject(err);
-                        }
-                    }
+                    this.handleUploadResult(params, cosHost, res.statusCode, res.data, resolve, reject);
                 },
                 fail: (err) => {
                     reject({
@@ -102,7 +218,6 @@ class COS {
                     });
                 },
             });
-            params.getTask?.(task);
         });
     }
 }

package/lib/utils/navigate.d.ts

@@ -13,6 +13,7 @@ interface NavigateExtendOptions {
     webviewUrl?: string;
     needLogin?: boolean;
     native?: boolean;
+    appId?: string;
 }
 interface NavigateOptions extends UniNamespace.NavigateToOptions, NavigateExtendOptions {
 }

package/lib/utils/navigate.js

@@ -48,6 +48,19 @@ const navigate = function (url = '', type = 'navigateTo') {
             webviewPage = _webviewPage;
             navigateOptions = rest;
         }
+        if (opts['appId']) {
+            // #ifdef APP-PLUS
+            // 打开其他小程序
+            if (uni['sendHostEvent']) {
+                uni.sendHostEvent('openUniMP', {
+                    appid: opts['appId'],
+                    path: url.replace(/\//, ''),
+                });
+                return;
+            }
+            // #endif
+            url = `${opts['appId']}:/${url}`;
+        }
         const indexPage = getPage('index').replace(/^\/+/, '');
         const loginPage = getPage('login');
         const { isLogin } = uni.$store?.getters || {};

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@zfqh/uniapp",
-  "version": "0.3.22",
+  "version": "0.3.24",
   "description": "uniapp公共模块",
   "author": "yinjiazeng@163.com",
-  "license": "MIT",
+  "license": "UNLICENSED",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "publishConfig": {
@@ -22,11 +22,10 @@
     "docs",
     "lib",
     "types",
-    "CHANGELOG.md",
     "README.md"
   ],
   "dependencies": {
-    "@gmcb/uv-ui": "0.3.6",
+    "@gmcb/uv-ui": "0.3.8",
     "@tencentcloud/chat-uikit-engine": "^2.3.2",
     "@tencentcloud/tui-core": "^2.3.2",
     "crypto-js": "^4.2.0",
@@ -45,5 +44,5 @@
     "@types/qs": "^6.9.16",
     "@types/url-parse": "^1.4.11"
   },
-  "gitHead": "59595760375b8c8c71d6abe4e860d4ba8ca915a1"
+  "gitHead": "aa7b85e9ac9a07244607eee648b37981bac588be"
 }