@norcy/react-native-toolkit 0.1.121 → 0.1.124

package/lib/module/VersionManager.js.map

@@ -1 +1 @@
-{"version":3,"names":["getReadableVersion","DevConfig","BuildInPrefs","PrefData","semverGt","require","semverGte","semverCoerce","VersionInfo","currentAppVersion","version","latestAppVersion","currentBundleVersion","latestBundleVersion","VersionManager","init","_ref","addListenerOnce","getValue","CurrentBundleVersion","isDanger","__DEV__","hasValue","DevDanger","appVer","setBundleVer","bundleVer","setValue","hasNewAppVer","hasNewBundleVer","isValidVersion","minVer","maxVer","_minVer","_maxVer","trim"],"sources":["VersionManager.ts"],"sourcesContent":["import { getReadableVersion } from 'react-native-device-info';\nimport { DevConfig } from './DevConfig';\nimport { BuildInPrefs, PrefData } from './PrefData';\n\nconst semverGt = require('semver/functions/gt');\nconst semverGte = require('semver/functions/gte');\nconst semverCoerce = require('semver/functions/coerce');\n\nlet VersionInfo = {\n  currentAppVersion: semverCoerce(getReadableVersion()).version,\n  latestAppVersion: semverCoerce(getReadableVersion()).version,\n  currentBundleVersion: 0,\n  latestBundleVersion: 0,\n};\n\nexport const VersionManager = {\n  init: ({\n    latestAppVersion,\n    latestBundleVersion,\n  }: {\n    latestAppVersion: string;\n    latestBundleVersion?: string;\n  }) => {\n    if (latestAppVersion) {\n      VersionInfo.latestAppVersion = semverCoerce(latestAppVersion).version;\n    }\n\n    if (latestBundleVersion) {\n      VersionInfo.latestBundleVersion =\n        semverCoerce(latestBundleVersion).version;\n    }\n\n    PrefData.addListenerOnce(() => {\n      VersionInfo.currentBundleVersion = PrefData.getValue(\n        BuildInPrefs.CurrentBundleVersion\n      );\n    });\n  },\n\n  isDanger: () => {\n    if (__DEV__ && DevConfig.hasValue(BuildInPrefs.DevDanger)) {\n      return DevConfig.getValue(BuildInPrefs.DevDanger);\n    }\n    // current > online，就危险\n    if (semverGt(VersionInfo.currentAppVersion, VersionInfo.latestAppVersion)) {\n      return true;\n    }\n    return false;\n  },\n\n  appVer: () => {\n    return VersionInfo.currentAppVersion;\n  },\n\n  setBundleVer: (bundleVer: string) => {\n    if (bundleVer) {\n      VersionInfo.currentBundleVersion = semverCoerce(bundleVer).version;\n      PrefData.setValue(\n        BuildInPrefs.CurrentBundleVersion,\n        VersionInfo.currentBundleVersion\n      );\n    }\n  },\n\n  bundleVer: () => {\n    return VersionInfo.currentBundleVersion;\n  },\n\n  getReadableVersion: () => {\n    return (\n      VersionInfo.currentAppVersion +\n      (VersionInfo.currentBundleVersion\n        ? '(' + VersionInfo.currentBundleVersion + ')'\n        : '')\n    );\n  },\n\n  hasNewAppVer: () => {\n    // online > current，才有新版本\n    if (semverGt(VersionInfo.latestAppVersion, VersionInfo.currentAppVersion)) {\n      return true;\n    }\n    return false;\n  },\n\n  hasNewBundleVer: () => {\n    // latestBundleVersion 如果没命中，则为 0，此时判断为无新 Bundle\n    if (\n      semverGt(\n        VersionInfo.latestBundleVersion,\n        VersionInfo.currentBundleVersion\n      )\n    ) {\n      return true;\n    }\n    return false;\n  },\n\n  isValidVersion: (minVer?: string, maxVer?: string) => {\n    minVer = minVer?.trim();\n    maxVer = maxVer?.trim();\n    //  确保 cur 处于 [minVer, maxVer)\n    if (\n      !!minVer &&\n      semverGt(semverCoerce(minVer).version, VersionManager.appVer())\n    ) {\n      return false;\n    }\n    if (\n      !!maxVer &&\n      semverGte(VersionManager.appVer(), semverCoerce(maxVer).version)\n    ) {\n      return false;\n    }\n    return true;\n  },\n};\n"],"mappings":"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"}
+{"version":3,"names":["getReadableVersion","semverCoerce","semverGt","semverGte","DevConfig","BuildInPrefs","PrefData","safeCoerce","version","coerced","VersionInfo","currentAppVersion","latestAppVersion","currentBundleVersion","latestBundleVersion","VersionManager","init","_ref","Number","addListenerOnce","getValue","CurrentBundleVersion","isDanger","__DEV__","hasValue","DevDanger","appVer","setBundleVer","bundleVer","setValue","hasNewAppVer","hasNewBundleVer","isValidVersion","minVer","maxVer","_minVer","_maxVer","trim"],"sources":["VersionManager.ts"],"sourcesContent":["import { getReadableVersion } from 'react-native-device-info';\nimport semverCoerce from 'semver/functions/coerce';\nimport semverGt from 'semver/functions/gt';\nimport semverGte from 'semver/functions/gte';\nimport { DevConfig } from './DevConfig';\nimport { BuildInPrefs, PrefData } from './PrefData';\n\n// 辅助函数：安全获取版本\nconst safeCoerce = (version: string) => {\n  const coerced = semverCoerce(version);\n  return coerced ? coerced.version : '0.0.0';\n};\n\nlet VersionInfo = {\n  currentAppVersion: safeCoerce(getReadableVersion()),\n  latestAppVersion: safeCoerce(getReadableVersion()),\n  currentBundleVersion: 0,\n  latestBundleVersion: 0,\n};\n\nexport const VersionManager = {\n  init: ({\n    latestAppVersion,\n    latestBundleVersion,\n  }: {\n    latestAppVersion: string;\n    latestBundleVersion?: string;\n  }) => {\n    if (latestAppVersion) {\n      VersionInfo.latestAppVersion = safeCoerce(latestAppVersion);\n    }\n\n    if (latestBundleVersion) {\n      VersionInfo.latestBundleVersion = Number(latestBundleVersion);\n    }\n\n    PrefData.addListenerOnce(() => {\n      VersionInfo.currentBundleVersion = PrefData.getValue(\n        BuildInPrefs.CurrentBundleVersion\n      );\n    });\n  },\n\n  isDanger: () => {\n    if (__DEV__ && DevConfig.hasValue(BuildInPrefs.DevDanger)) {\n      return DevConfig.getValue(BuildInPrefs.DevDanger);\n    }\n    // current > online，就危险\n    return semverGt(\n      VersionInfo.currentAppVersion,\n      VersionInfo.latestAppVersion\n    );\n  },\n\n  appVer: () => {\n    return VersionInfo.currentAppVersion;\n  },\n\n  setBundleVer: (bundleVer: string) => {\n    if (bundleVer) {\n      VersionInfo.currentBundleVersion = Number(bundleVer);\n      PrefData.setValue(\n        BuildInPrefs.CurrentBundleVersion,\n        VersionInfo.currentBundleVersion\n      );\n    }\n  },\n\n  bundleVer: () => {\n    return VersionInfo.currentBundleVersion;\n  },\n\n  getReadableVersion: () => {\n    return (\n      VersionInfo.currentAppVersion +\n      (VersionInfo.currentBundleVersion\n        ? '(' + VersionInfo.currentBundleVersion + ')'\n        : '')\n    );\n  },\n\n  hasNewAppVer: () => {\n    // online > current，才有新版本\n    return semverGt(\n      VersionInfo.latestAppVersion,\n      VersionInfo.currentAppVersion\n    );\n  },\n\n  hasNewBundleVer: () => {\n    // latestBundleVersion 如果没命中，则为 0，此时判断为无新 Bundle\n    return VersionInfo.latestBundleVersion > VersionInfo.currentBundleVersion;\n  },\n\n  isValidVersion: (minVer?: string, maxVer?: string) => {\n    minVer = minVer?.trim();\n    maxVer = maxVer?.trim();\n    // 确保 cur 处于 [minVer, maxVer)\n    if (!!minVer && semverGt(safeCoerce(minVer), VersionManager.appVer())) {\n      return false;\n    }\n    if (!!maxVer && semverGte(VersionManager.appVer(), safeCoerce(maxVer))) {\n      return false;\n    }\n    return true;\n  },\n};\n"],"mappings":"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"}

package/lib/typescript/VersionManager.d.ts

@@ -4,7 +4,7 @@ export declare const VersionManager: {
         latestBundleVersion?: string | undefined;
     }) => void;
     isDanger: () => any;
-    appVer: () => any;
+    appVer: () => string;
     setBundleVer: (bundleVer: string) => void;
     bundleVer: () => number;
     getReadableVersion: () => string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@norcy/react-native-toolkit",
-  "version": "0.1.121",
+  "version": "0.1.124",
   "description": "My Toolkit",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",

package/src/ConfigDataModel.ts

@@ -44,7 +44,9 @@ const handleVersionInfo = () => {
     latestAppVersion: ConfigDataModel.get(
       Platform.OS === 'android' ? 'aov' : 'ov'
     ),
-    latestBundleVersion: ConfigDataModel.get('bov'),
+    latestBundleVersion: ConfigDataModel.get(
+      Platform.OS === 'android' ? 'abov' : 'bov'
+    ),
   });
 };
 

package/src/MessageModel.ts

@@ -1,6 +1,5 @@
 import { Object } from 'leancloud-storage';
 import { Platform } from 'react-native';
-import { getReadableVersion } from 'react-native-device-info';
 import { ConfigDataModel } from './ConfigDataModel';
 import { FreConfigType, FrequenceManager } from './Frequence';
 import { LoginManager, LoginResultDataType } from './LoginManager';
@@ -13,9 +12,6 @@ import { VipManager } from './VipManager';
 const AV = require('leancloud-storage');
 const EventEmitter = require('events').EventEmitter;
 const eventEmitter = new EventEmitter();
-const semverGt = require('semver/functions/gt');
-const semverGte = require('semver/functions/gte');
-const semverCoerce = require('semver/functions/coerce');
 
 export interface Message {
   objectId: string;
@@ -41,18 +37,10 @@ let MyMessages: Message[] = [];
 
 const _filterByVersion = (items: Message[]): Message[] => {
   let ret: Message[] = [];
-  const curVer = semverCoerce(getReadableVersion()).version;
   for (const item of items) {
-    const minVer = item.minVer?.trim();
-    const maxVer = item.maxVer?.trim();
-    //  确保 cur 处于 [minVer, maxVer)
-    if (!!minVer && semverGt(semverCoerce(minVer).version, curVer)) {
+    if (!VersionManager.isValidVersion(item.minVer, item.maxVer)) {
       continue;
     }
-    if (!!maxVer && semverGte(curVer, semverCoerce(maxVer).version)) {
-      continue;
-    }
-
     ret.push(item);
   }
   return ret;

package/src/VersionManager.ts

@@ -1,14 +1,19 @@
 import { getReadableVersion } from 'react-native-device-info';
+import semverCoerce from 'semver/functions/coerce';
+import semverGt from 'semver/functions/gt';
+import semverGte from 'semver/functions/gte';
 import { DevConfig } from './DevConfig';
 import { BuildInPrefs, PrefData } from './PrefData';
 
-const semverGt = require('semver/functions/gt');
-const semverGte = require('semver/functions/gte');
-const semverCoerce = require('semver/functions/coerce');
+// 辅助函数：安全获取版本
+const safeCoerce = (version: string) => {
+  const coerced = semverCoerce(version);
+  return coerced ? coerced.version : '0.0.0';
+};
 
 let VersionInfo = {
-  currentAppVersion: semverCoerce(getReadableVersion()).version,
-  latestAppVersion: semverCoerce(getReadableVersion()).version,
+  currentAppVersion: safeCoerce(getReadableVersion()),
+  latestAppVersion: safeCoerce(getReadableVersion()),
   currentBundleVersion: 0,
   latestBundleVersion: 0,
 };
@@ -22,12 +27,11 @@ export const VersionManager = {
     latestBundleVersion?: string;
   }) => {
     if (latestAppVersion) {
-      VersionInfo.latestAppVersion = semverCoerce(latestAppVersion).version;
+      VersionInfo.latestAppVersion = safeCoerce(latestAppVersion);
     }
 
     if (latestBundleVersion) {
-      VersionInfo.latestBundleVersion =
-        semverCoerce(latestBundleVersion).version;
+      VersionInfo.latestBundleVersion = Number(latestBundleVersion);
     }
 
     PrefData.addListenerOnce(() => {
@@ -42,10 +46,10 @@ export const VersionManager = {
       return DevConfig.getValue(BuildInPrefs.DevDanger);
     }
     // current > online，就危险
-    if (semverGt(VersionInfo.currentAppVersion, VersionInfo.latestAppVersion)) {
-      return true;
-    }
-    return false;
+    return semverGt(
+      VersionInfo.currentAppVersion,
+      VersionInfo.latestAppVersion
+    );
   },
 
   appVer: () => {
@@ -54,7 +58,7 @@ export const VersionManager = {
 
   setBundleVer: (bundleVer: string) => {
     if (bundleVer) {
-      VersionInfo.currentBundleVersion = semverCoerce(bundleVer).version;
+      VersionInfo.currentBundleVersion = Number(bundleVer);
       PrefData.setValue(
         BuildInPrefs.CurrentBundleVersion,
         VersionInfo.currentBundleVersion
@@ -77,39 +81,25 @@ export const VersionManager = {
 
   hasNewAppVer: () => {
     // online > current，才有新版本
-    if (semverGt(VersionInfo.latestAppVersion, VersionInfo.currentAppVersion)) {
-      return true;
-    }
-    return false;
+    return semverGt(
+      VersionInfo.latestAppVersion,
+      VersionInfo.currentAppVersion
+    );
   },
 
   hasNewBundleVer: () => {
     // latestBundleVersion 如果没命中，则为 0，此时判断为无新 Bundle
-    if (
-      semverGt(
-        VersionInfo.latestBundleVersion,
-        VersionInfo.currentBundleVersion
-      )
-    ) {
-      return true;
-    }
-    return false;
+    return VersionInfo.latestBundleVersion > VersionInfo.currentBundleVersion;
   },
 
   isValidVersion: (minVer?: string, maxVer?: string) => {
     minVer = minVer?.trim();
     maxVer = maxVer?.trim();
-    //  确保 cur 处于 [minVer, maxVer)
-    if (
-      !!minVer &&
-      semverGt(semverCoerce(minVer).version, VersionManager.appVer())
-    ) {
+    // 确保 cur 处于 [minVer, maxVer)
+    if (!!minVer && semverGt(safeCoerce(minVer), VersionManager.appVer())) {
       return false;
     }
-    if (
-      !!maxVer &&
-      semverGte(VersionManager.appVer(), semverCoerce(maxVer).version)
-    ) {
+    if (!!maxVer && semverGte(VersionManager.appVer(), safeCoerce(maxVer))) {
       return false;
     }
     return true;