feat: require serverURLs option for CN apps

Author: leeyeh

demo/leaderboard/leaderboard.js

@@ -1,17 +1,13 @@
-let configs = {};
+let configs;
 try {
-  configs = JSON.parse(localStorage.getItem('js-sdk-demo/configs')) || {};
+  configs = JSON.parse(localStorage.getItem('js-sdk-demo/configs')) || {
+    appId: 'FNHw86LIu6lnFToIEDemKCQl-gzGzoHsz',
+    appKey: 'DyvpOorH5HK1CVLDqDhb4gNT',
+    serverURLs: 'https://fnhw86li.lc-cn-n1-shared.com',
+  };
 } catch (e) {}
 
-const {
-  appId = 'FNHw86LIu6lnFToIEDemKCQl-gzGzoHsz',
-  appKey = 'DyvpOorH5HK1CVLDqDhb4gNT',
-} = configs;
-
-AV.init({
-  appId,
-  appKey,
-});
+AV.init(configs);
 
 const MAX_RESULTS_COUNT = 12;
 
@@ -127,14 +123,13 @@ var app = new Vue({
           limit: MAX_RESULTS_COUNT,
           selectUserKeys: ['username'],
         }),
-        Promise.resolve(AV.User.current()).then(
-          currentUser =>
-            currentUser
-              ? leaderboard.getResultsAroundUser(currentUser, {
-                  limit: 3,
-                  selectUserKeys: ['username'],
-                })
-              : []
+        Promise.resolve(AV.User.current()).then(currentUser =>
+          currentUser
+            ? leaderboard.getResultsAroundUser(currentUser, {
+                limit: 3,
+                selectUserKeys: ['username'],
+              })
+            : []
         ),
       ])
         .then(([topRankings, [beforeUserRankings, userRanking]]) => {

demo/live-query/app.js

@@ -1,17 +1,13 @@
-let configs = {};
+let configs;
 try {
-  configs = JSON.parse(localStorage.getItem('js-sdk-demo/configs')) || {};
+  configs = JSON.parse(localStorage.getItem('js-sdk-demo/configs')) || {
+    appId: 'FNHw86LIu6lnFToIEDemKCQl-gzGzoHsz',
+    appKey: 'DyvpOorH5HK1CVLDqDhb4gNT',
+    serverURLs: 'https://fnhw86li.lc-cn-n1-shared.com',
+  };
 } catch (e) {}
 
-const {
-  appId = 'FNHw86LIu6lnFToIEDemKCQl-gzGzoHsz',
-  appKey = 'DyvpOorH5HK1CVLDqDhb4gNT',
-} = configs;
-
-AV.init({
-  appId,
-  appKey,
-});
+AV.init(configs);
 
 var Todo = AV.Object.extend('Todo');
 
@@ -40,8 +36,8 @@ var bind = (subscription, initialStats, onChange) => {
   };
   const upsert = value => {
     let existed = false;
-    stats = stats.map(
-      target => (target.id === value.id ? ((existed = true), value) : target)
+    stats = stats.map(target =>
+      target.id === value.id ? ((existed = true), value) : target
     );
     if (!existed) stats = [value, ...stats];
     return onChange(stats);

demo/settings/index.html

@@ -12,6 +12,9 @@
       <div class="pure-control-group">
         <label>APP_KEY: </label><input v-model="configs.appKey"></label>
       </div>
+      <div class="pure-control-group">
+        <label>SERVER_URL: </label><input v-model="configs.serverURLs"></label>
+      </div>
       <div class="pure-controls"><input type="submit" class="pure-button pure-button-primary"></div>
       Presets:
       <div class="pure-button-group">
@@ -30,10 +33,12 @@
   "cn-n1(default)": {
     appId: 'FNHw86LIu6lnFToIEDemKCQl-gzGzoHsz',
     appKey: 'DyvpOorH5HK1CVLDqDhb4gNT',
+    serverURLs: 'https://fnhw86li.lc-cn-n1-shared.com',
   },
   "cn-e1": {
     appId: 'Ugf2ahNIhknfzoirYUx0POpQ-9Nh9j0Va',
     appKey: 'BlBownlFSWkWGQIkHLrbvmw8',
+    serverURLs: 'https://ugf2ahni.lc-cn-e1-shared.com',
   },
   "us-la1": {
     appId: 'xCoMNb82GqwCQlEJNEItW5VD-MdYXbMMI',

src/init.js

@@ -3,6 +3,8 @@ const AppRouter = require('./app-router');
 const { isNullOrUndefined } = require('./utils');
 const { extend, isObject } = require('underscore');
 
+const isCNApp = appId => appId.slice(-9) !== '-MdYXbMMI';
+
 const fillServerURLs = url => ({
   push: url,
   stats: url,
@@ -12,20 +14,11 @@ const fillServerURLs = url => ({
 });
 
 function getDefaultServerURLs(appId) {
-  let domain;
-  const id = appId.slice(0, 8).toLowerCase();
-  switch (appId.slice(-9)) {
-    case '-9Nh9j0Va':
-      // TAB
-      domain = 'lncldapi.com';
-      break;
-    case '-MdYXbMMI':
-      // US
-      domain = 'lncldglobal.com';
-      break;
-    default:
-      domain = 'lncld.net';
+  if (isCNApp(appId)) {
+    return {};
   }
+  const id = appId.slice(0, 8).toLowerCase();
+  const domain = 'lncldglobal.com';
   return {
     push: `https://${id}.push.${domain}`,
     stats: `https://${id}.stats.${domain}`,
@@ -82,6 +75,13 @@ AV.init = function init(options, ...params) {
   if (!appKey) throw new TypeError('appKey must be a string');
   if (process.env.CLIENT_PLATFORM && masterKey)
     console.warn('MasterKey is not supposed to be used in browser.');
+  if (isCNApp(appId)) {
+    if (!serverURLs) {
+      throw new TypeError(
+        `serverURLs option is required for apps from CN region`
+      );
+    }
+  }
   AV._config.applicationId = appId;
   AV._config.applicationKey = appKey;
   AV._config.masterKey = masterKey;

test/test.js

@@ -13,33 +13,11 @@ if (typeof require !== 'undefined') {
 //   serverURLs: 'https://cn-stg1.leancloud.cn',
 // });
 
-function serverURLsWithSuffix(appId, suffix) {
-  const id = appId.slice(0, 8).toLowerCase();
-
-  return {
-    push: `https://${id}.push.${suffix}`,
-    stats: `https://${id}.stats.${suffix}`,
-    engine: `https://${id}.engine.${suffix}`,
-    api: `https://${id}.api.${suffix}`,
-    rtm: `https://${id}.rtm.${suffix}`,
-  };
-}
-
-function serverUrls() {
-  if (process.env.SERVER_URL) {
-    return process.env.SERVER_URL;
-  } else if (process.env.SERVER_URL_SUFFIX) {
-    return serverURLsWithSuffix(process.env.SERVER_URL_SUFFIX);
-  } else {
-    return undefined;
-  }
-}
-
 AV.init({
   appId: process.env.APPID || '95TNUaOSUd8IpKNW0RSqSEOm-9Nh9j0Va',
   appKey: process.env.APPKEY || 'gNAE1iHowdQvV7cqpfCMGaGN',
   masterKey: process.env.MASTERKEY || 'ue9M9nqwD4MQNXD3oiN5rAOv',
   hookKey: process.env.HOOKKEY || '2iCbUZDgEF0siKxmCn2kVQXV',
-  serverURLs: serverUrls(),
+  serverURLs: process.env.SERVER_URL || 'https://95tnuaos.lc-cn-e1-shared.com',
 });
 AV.setProduction(true);