Merge branch 'dev' into alpha

packages/uni-app/dist/uts.js

 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+exports.__esModule = true;
 exports.initUtsClassName = exports.initUtsIndexClassName = exports.initUtsPackageName = exports.initUtsProxyClass = exports.initUtsProxyFunction = exports.normalizeArg = void 0;
 var utils_1 = require("./utils");
 var callbackId = 1;
@@ -7,7 +7,9 @@ var proxy;
 var callbacks = {};
 function normalizeArg(arg) {
     if (typeof arg === 'function') {
-        var id = callbackId++;
+        // 查找该函数是否已缓存
+        var oldId = Object.keys(callbacks).find(function (id) { return callbacks[id] === arg; });
+        var id = oldId ? parseInt(oldId) : callbackId++;
         callbacks[id] = arg;
         return id;
     }
@@ -36,10 +38,14 @@ function resolveSyncResult(res) {
     return res.params;
 }
 function invokePropGetter(args) {
+    if (args.errMsg) {
+        throw new Error(args.errMsg);
+    }
+    delete args.errMsg;
     return resolveSyncResult(getProxy().invokeSync(args, function () { }));
 }
 function initProxyFunction(async, _a, instanceId) {
-    var pkg = _a.package, cls = _a.class, propOrMethod = _a.name, method = _a.method, companion = _a.companion, methodParams = _a.params;
+    var pkg = _a.package, cls = _a["class"], propOrMethod = _a.name, method = _a.method, companion = _a.companion, methodParams = _a.params, errMsg = _a.errMsg;
     var invokeCallback = function (_a) {
         var id = _a.id, name = _a.name, params = _a.params, keepAlive = _a.keepAlive;
         var callback = callbacks[id];
@@ -57,18 +63,21 @@ function initProxyFunction(async, _a, instanceId) {
         ? { id: instanceId, name: propOrMethod, method: methodParams }
         : {
             package: pkg,
-            class: cls,
+            "class": cls,
             name: method || propOrMethod,
             companion: companion,
-            method: methodParams,
+            method: methodParams
         };
     return function () {
         var args = [];
         for (var _i = 0; _i < arguments.length; _i++) {
             args[_i] = arguments[_i];
         }
+        if (errMsg) {
+            throw new Error(errMsg);
+        }
         var invokeArgs = (0, utils_1.extend)({}, baseArgs, {
-            params: args.map(function (arg) { return normalizeArg(arg); }),
+            params: args.map(function (arg) { return normalizeArg(arg); })
         });
         if (async) {
             return new Promise(function (resolve, reject) {
@@ -100,18 +109,23 @@ function initUtsStaticMethod(async, opts) {
 }
 exports.initUtsProxyFunction = initUtsStaticMethod;
 function initUtsProxyClass(_a) {
-    var pkg = _a.package, cls = _a.class, constructorParams = _a.constructor.params, methods = _a.methods, props = _a.props, staticProps = _a.staticProps, staticMethods = _a.staticMethods;
+    var pkg = _a.package, cls = _a["class"], constructorParams = _a.constructor.params, methods = _a.methods, props = _a.props, staticProps = _a.staticProps, staticMethods = _a.staticMethods, errMsg = _a.errMsg;
     var baseOptions = {
         package: pkg,
-        class: cls,
+        "class": cls,
+        errMsg: errMsg
     };
-    var ProxyClass = (function () {
+    var ProxyClass = /** @class */ (function () {
         function UtsClass() {
             var params = [];
             for (var _i = 0; _i < arguments.length; _i++) {
                 params[_i] = arguments[_i];
             }
+            if (errMsg) {
+                throw new Error(errMsg);
+            }
             var target = {};
+            // 初始化实例 ID
             var instanceId = initProxyFunction(false, (0, utils_1.extend)({ name: 'constructor', params: constructorParams }, baseOptions), 0).apply(null, params);
             if (!instanceId) {
                 throw new Error("new ".concat(cls, " is failed"));
@@ -119,19 +133,25 @@ function initUtsProxyClass(_a) {
             return new Proxy(this, {
                 get: function (_, name) {
                     if (!target[name]) {
+                        //实例方法
                         if ((0, utils_1.hasOwn)(methods, name)) {
                             var _a = methods[name], async = _a.async, params_1 = _a.params;
                             target[name] = initUtsInstanceMethod(!!async, (0, utils_1.extend)({
                                 name: name,
-                                params: params_1,
+                                params: params_1
                             }, baseOptions), instanceId);
                         }
                         else if (props.includes(name)) {
-                            return invokePropGetter({ id: instanceId, name: name });
+                            // 实例属性
+                            return invokePropGetter({
+                                id: instanceId,
+                                name: name,
+                                errMsg: errMsg
+                            });
                         }
                     }
                     return target[name];
-                },
+                }
             });
         }
         return UtsClass;
@@ -142,15 +162,17 @@ function initUtsProxyClass(_a) {
             if ((0, utils_1.hasOwn)(staticMethods, name)) {
                 if (!staticMethodCache[name]) {
                     var _a = staticMethods[name], async = _a.async, params = _a.params;
+                    // 静态方法
                     staticMethodCache[name] = initUtsStaticMethod(!!async, (0, utils_1.extend)({ name: name, companion: true, params: params }, baseOptions));
                 }
                 return staticMethodCache[name];
             }
             if (staticProps.includes(name)) {
+                // 静态属性
                 return invokePropGetter((0, utils_1.extend)({ name: name, companion: true }, baseOptions));
             }
             return Reflect.get(target, name, receiver);
-        },
+        }
     });
 }
 exports.initUtsProxyClass = initUtsProxyClass;

packages/uni-app/src/uts.ts

@@ -4,14 +4,17 @@ declare const plus: any
 let callbackId = 1
 let proxy: any
 const callbacks: Record<string, Function> = {}
+
 export function normalizeArg(arg: unknown) {
   if (typeof arg === 'function') {
-    const id = callbackId++
+    // 查找该函数是否已缓存
+    const oldId = Object.keys(callbacks).find((id) => callbacks[id] === arg)
+    const id = oldId ? parseInt(oldId) : callbackId++
     callbacks[id] = arg
     return id
   } else if (isPlainObject(arg)) {
     Object.keys(arg).forEach((name) => {
-      ; (arg as any)[name] = normalizeArg((arg as any)[name])
+      ;(arg as any)[name] = normalizeArg((arg as any)[name])
     })
   }
   return arg
@@ -58,6 +61,10 @@ interface ProxyFunctionOptions {
    * 方法参数列表
    */
   params: Parameter[]
+  /**
+   * 运行时提示的错误信息
+   */
+  errMsg?: string
 }
 
 interface ProxyClassOptions {
@@ -80,6 +87,10 @@ interface ProxyClassOptions {
       params: Parameter[]
     }
   }
+  /**
+   * 运行时提示的错误信息
+   */
+  errMsg?: string
 }
 
 interface InvokeInstanceArgs {
@@ -87,6 +98,10 @@ interface InvokeInstanceArgs {
   name: string
   params?: unknown[]
   method?: Parameter[]
+  /**
+   * 运行时提示的错误信息
+   */
+  errMsg?: string
 }
 interface InvokeStaticArgs {
   /**
@@ -113,6 +128,10 @@ interface InvokeStaticArgs {
    * 是否是伴生对象
    */
   companion?: boolean
+  /**
+   * 运行时提示的错误信息
+   */
+  errMsg?: string
 }
 
 type InvokeArgs = InvokeInstanceArgs | InvokeStaticArgs
@@ -156,7 +175,11 @@ function resolveSyncResult(res: InvokeSyncRes) {
 }
 
 function invokePropGetter(args: InvokeArgs) {
-  return resolveSyncResult(getProxy().invokeSync(args, () => { }))
+  if (args.errMsg) {
+    throw new Error(args.errMsg)
+  }
+  delete args.errMsg
+  return resolveSyncResult(getProxy().invokeSync(args, () => {}))
 }
 
 function initProxyFunction(
@@ -168,6 +191,7 @@ function initProxyFunction(
     method,
     companion,
     params: methodParams,
+    errMsg,
   }: ProxyFunctionOptions,
   instanceId: number
 ) {
@@ -190,13 +214,16 @@ function initProxyFunction(
   const baseArgs: InvokeArgs = instanceId
     ? { id: instanceId, name: propOrMethod, method: methodParams }
     : {
-      package: pkg,
-      class: cls,
-      name: method || propOrMethod,
-      companion,
-      method: methodParams,
-    }
+        package: pkg,
+        class: cls,
+        name: method || propOrMethod,
+        companion,
+        method: methodParams,
+      }
   return (...args: unknown[]) => {
+    if (errMsg) {
+      throw new Error(errMsg)
+    }
     const invokeArgs = extend({}, baseArgs, {
       params: args.map((arg) => normalizeArg(arg)),
     })
@@ -238,13 +265,18 @@ export function initUtsProxyClass({
   props,
   staticProps,
   staticMethods,
+  errMsg,
 }: ProxyClassOptions): any {
   const baseOptions = {
     package: pkg,
     class: cls,
+    errMsg,
   }
   const ProxyClass = class UtsClass {
     constructor(...params: unknown[]) {
+      if (errMsg) {
+        throw new Error(errMsg)
+      }
       const target: Record<string, Function> = {}
       // 初始化实例 ID
       const instanceId = initProxyFunction(
@@ -274,7 +306,11 @@ export function initUtsProxyClass({
               )
             } else if (props.includes(name as string)) {
               // 实例属性
-              return invokePropGetter({ id: instanceId, name: name as string })
+              return invokePropGetter({
+                id: instanceId,
+                name: name as string,
+                errMsg,
+              })
             }
           }
           return target[name as string]

packages/uni-cli-shared/lib/uts/utils.js

@@ -32,6 +32,7 @@ Please run \`${command}\` and try again.`
 }
 
 module.exports = {
+  version: require('../../package.json').version,
   normalizePath,
   installDepTips
 }

packages/uni-cli-shared/lib/uts/uts.js

@@ -88,11 +88,11 @@ function resolveUTSCompiler() {
             });
         }
         catch (e) {
-            let version = require('@dcloudio/uni-cli-shared/package.json').version;
-            if (version.startsWith('2.0.')) {
-                version = '^3.0.0-alpha-3060920221117001';
+            let utsCompilerVersion = utils_1.version;
+            if (utils_1.version.startsWith('2.0.')) {
+                utsCompilerVersion = '^3.0.0-alpha-3060920221117001';
             }
-            console.error((0, utils_1.installDepTips)('devDependencies', '@dcloudio/uni-uts-v1', version));
+            console.error((0, utils_1.installDepTips)('devDependencies', '@dcloudio/uni-uts-v1', utsCompilerVersion));
             process.exit(0);
         }
     }

src/platforms/app-plus/service/api/device/soter-authentication.js

@@ -96,7 +96,7 @@ export function startSoterAuthentication ({
     return {
       authMode: supportMode[0] || 'fingerPrint',
       errCode: 90001,
-      errMsg: 'startSoterAuthentication:fail'
+      errMsg: 'startSoterAuthentication:fail not support'
     }
   }
   const supportRequestAuthMode = []