@tmsfe/tms-core 0.0.91 → 0.0.94

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tmsfe/tms-core",
-  "version": "0.0.91",
+  "version": "0.0.94",
   "description": "tms运行时框架",
   "repository": {
     "type": "git",

package/src/index-proxy.js

@@ -65,7 +65,7 @@ const asyncFuncNames = [
   // 这行是tms-ui的
   'showDrawer', 'hideDrawer', 'showModal', 'hideModal',
   // 这行是runtime的
-  'getPhone', 'login', 'getLoginInfo', 'getOpenId', 'getMycarPubOpenId', 'getSinanPubOpenId',
+  'getPhone', 'registerPhone', 'login', 'getLoginInfo', 'getOpenId', 'getMycarPubOpenId', 'getSinanPubOpenId',
   // tms-core
   'setAuthInfo', 'getConfig', 'navigateToWebview', 'callCloudFunc', 'getEncryptUserInfo',
   'setUserLocation', 'getUserLocation', 'getMpOpenId', 'getOuterOpenId',

package/src/report/clone.ts

@@ -6,10 +6,15 @@ const maxArrLen = 10;
 const maxStrLen = 200;
 const maxFieldLen = 20;
 
-function isBasicsType(obj: any): { isBasics: boolean, value: any } {
+// 字符串字段白名单，白名单内的字段不截断
+const fieldWhiteList = [
+  'tmapExtra', // 手图跳过来时附加的加密数据，用于分析用户操作路径，奉刚要求字段不能截断
+];
+
+function isBasicsType(obj: any, isConstraintLen = true): { isBasics: boolean, value: any } {
   const type = typeof obj;
-  if (obj === null || obj === undefined
-    || type === 'number' || type === 'boolean' || type === 'bigint') {
+  const arr1 = ['number', 'boolean', 'bigint'];
+  if (obj === null || obj === undefined || arr1.includes(type)) {
     return { isBasics: true, value: obj };
   }
   if (type === 'string') {
@@ -19,7 +24,7 @@ function isBasicsType(obj: any): { isBasics: boolean, value: any } {
       return { isBasics: true, value: '' };
     }
 
-    const value = obj.substring(0, maxStrLen);
+    const value = isConstraintLen ? obj.substring(0, maxStrLen) : obj;
     return { isBasics: true, value };
   }
   if (type === 'function' || type === 'symbol') {
@@ -61,7 +66,8 @@ function deepClone(obj: any, depth = 0, maxDepth = 5): any {
       continue;
     }
     const value = obj[name];
-    const res1 = isBasicsType(value);
+    const isConstraintLen = !fieldWhiteList.includes(name);
+    const res1 = isBasicsType(value, isConstraintLen);
     if (res1.isBasics) {
       // @ts-ignore
       newObj[name] = res1.value;

package/src/report/proxy/app.ts

@@ -18,8 +18,11 @@ function proxyNavigateApi(api: string): void {
       const { url = '' } = args[0] || {};
       const [path, params = ''] = url.split('?');
       const data = {};
-      params.split('&').map((str: string) => {
-        let [key, value = ''] = str.split('=');
+      params.split('&').forEach((str: string) => {
+        const [key, val] = str.split('=');
+        let value = val || '';
+        // 简单判断是否encodeURIComponent字段，如果时的话则抛弃掉
+        // 因为在后端会被decode导致反序列化时语法错误
         if (value.indexOf('%') !== -1) {
           value = '';
         }

package/src/runtime/index.js

@@ -9,7 +9,7 @@ import Login from './login';
 import Car from './car';
 import getOpenAppTrafficData from './getopenapptrafficdata';
 
-const { loginFn, getOpenId, getMycarPubOpenId, getSinanPubOpenId, getPhone } = Login;
+const { loginFn, getOpenId, getMycarPubOpenId, getSinanPubOpenId, getPhone, registerPhone } = Login;
 
 /**
  * __resolver__ 用于维护 app.tms.fn 中数据的填充
@@ -205,6 +205,7 @@ async function queryServicePermissions(param = {}) {
 
 const api = {
   getPhone,
+  registerPhone,
   login,
   getLoginInfo,
   getOpenId,

package/src/runtime/{login.js → login.ts}

@@ -18,6 +18,12 @@
 
 import getOpenAppTrafficData from './getopenapptrafficdata';
 
+interface PhoneRegisterResult {
+  success: boolean,
+  phone: string,
+  errMsg: string,
+}
+
 /**
  * 调用wx.login获取登录code
  * @private
@@ -93,6 +99,7 @@ const getOpenId = async () => {
     return getOpenIdProm;
   }
 
+  // eslint-disable-next-line @typescript-eslint/no-misused-promises
   getOpenIdProm = new Promise(async (resolve, reject) => {
     getApp().tms.callCloudFunc('user', { $url: 'user/getOpenId' })
       .then((res) => {
@@ -192,15 +199,42 @@ const getSinanPubOpenId = () => {
 const getPhone = () => getApp().tms.createRequest({ withAuth: true }).post('user/phone/fetch')
   .then((res) => {
     if (res && res.errCode === 0) {
-      return (res.resData && res.resData.phoneno) || '';
+      return (res.resData?.phoneno) || '';
     }
     return Promise.reject(res);
   });
 
+
+/**
+ * 绑定手机号
+ */
+async function registerPhone({ encryptedData, iv }: {encryptedData: string, iv: string}): Promise<PhoneRegisterResult> {
+  try {
+    const result = await getApp().tms.createRequest().post('user/phone/regist', {
+      iv,
+      isCipher: 1,
+      phoneno: encryptedData,
+    });
+    return {
+      success: result.errCode === 0,
+      phone: result.errCode === 0 ? result.resData.phoneno : '',
+      errMsg: result.errMsg,
+    };
+  } catch (error: any) {
+    console.error(error);
+    return {
+      success: false,
+      phone: '',
+      errMsg: '绑定失败',
+    };
+  }
+}
+
 const runtimeObj = {
   loginFn,
   getOpenId,
   getPhone,
+  registerPhone,
   getMycarPubOpenId,
   getSinanPubOpenId,
 };