shennian 0.1.27 → 0.1.28

package/dist/src/region.d.ts

@@ -3,15 +3,12 @@ export declare const SERVERS: Record<Region, {
     url: string;
     label: string;
 }>;
-export type ServerProbe = {
-    region: Region;
-    url: string;
-    label: string;
-    latencyMs: number | null;
-};
 /**
- * Probe both servers, auto-select the fastest reachable one.
- * Returns the chosen server URL.
+ * Detect the best server region and return its URL.
+ *
+ * Strategy: timezone as primary signal, IP geolocation as supplement.
+ * - Chinese timezone → cn immediately (covers servers with UTC too via IP fallback).
+ * - Non-Chinese timezone → try IP to detect if physically in China.
  */
 export declare function detectAndChooseServer(): Promise<string>;
 export declare function urlToRegion(url: string): Region;

package/dist/src/region.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"region.d.ts","sourceRoot":"","sources":["../../src/region.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,MAAM,GAAG,IAAI,GAAG,QAAQ,CAAA;AAEpC,eAAO,MAAM,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAGlE,CAAA;AAkBD,MAAM,MAAM,WAAW,GAAG;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAAA;AAkBlG;;;GAGG;AACH,wBAAsB,qBAAqB,IAAI,OAAO,CAAC,MAAM,CAAC,CAa7D;AAED,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAE/C;AAED,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAElD"}
+{"version":3,"file":"region.d.ts","sourceRoot":"","sources":["../../src/region.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,MAAM,GAAG,IAAI,GAAG,QAAQ,CAAA;AAEpC,eAAO,MAAM,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAGlE,CAAA;AA6CD;;;;;;GAMG;AACH,wBAAsB,qBAAqB,IAAI,OAAO,CAAC,MAAM,CAAC,CAyC7D;AAED,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAE/C;AAED,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAElD"}

package/dist/src/region.js

@@ -3,14 +3,29 @@ export const SERVERS = {
     cn: { url: 'https://shennian.net', label: 'China  (shennian.net)' },
     global: { url: 'https://shennian.ai', label: 'Global (shennian.ai)' },
 };
-const REGIONS = ['cn', 'global'];
-async function measureLatency(url, timeoutMs = 5000) {
+const CN_TIMEZONES = [
+    'Asia/Shanghai', 'Asia/Chongqing', 'Asia/Chungking',
+    'Asia/Harbin', 'Asia/Urumqi', 'PRC',
+];
+function inferRegionByTimezone() {
+    try {
+        const tz = Intl.DateTimeFormat().resolvedOptions().timeZone;
+        if (CN_TIMEZONES.includes(tz))
+            return 'cn';
+    }
+    catch { /* Intl unavailable */ }
+    return 'global';
+}
+async function detectRegionByIP(timeoutMs = 1500) {
     const controller = new AbortController();
     const timer = setTimeout(() => controller.abort(), timeoutMs);
-    const start = performance.now();
     try {
-        await fetch(`${url}/health`, { signal: controller.signal });
-        return Math.round(performance.now() - start);
+        const res = await Promise.any([
+            fetch(`${SERVERS.cn.url}/geo`, { signal: controller.signal }),
+            fetch(`${SERVERS.global.url}/geo`, { signal: controller.signal }),
+        ]);
+        const data = await res.json();
+        return data.country === 'CN' ? 'cn' : 'global';
     }
     catch {
         return null;
@@ -19,37 +34,62 @@ async function measureLatency(url, timeoutMs = 5000) {
         clearTimeout(timer);
     }
 }
-async function probeAll() {
-    const results = await Promise.all(REGIONS.map(async (region) => {
-        const { url, label } = SERVERS[region];
-        const latencyMs = await measureLatency(url);
-        return { region, url, label, latencyMs };
-    }));
-    return results.sort((a, b) => {
-        if (a.latencyMs === null && b.latencyMs === null)
-            return 0;
-        if (a.latencyMs === null)
-            return 1;
-        if (b.latencyMs === null)
-            return -1;
-        return a.latencyMs - b.latencyMs;
-    });
+async function verifyReachable(url, timeoutMs = 3000) {
+    const controller = new AbortController();
+    const timer = setTimeout(() => controller.abort(), timeoutMs);
+    try {
+        await fetch(`${url}/health`, { signal: controller.signal });
+        return true;
+    }
+    catch {
+        return false;
+    }
+    finally {
+        clearTimeout(timer);
+    }
 }
 /**
- * Probe both servers, auto-select the fastest reachable one.
- * Returns the chosen server URL.
+ * Detect the best server region and return its URL.
+ *
+ * Strategy: timezone as primary signal, IP geolocation as supplement.
+ * - Chinese timezone → cn immediately (covers servers with UTC too via IP fallback).
+ * - Non-Chinese timezone → try IP to detect if physically in China.
  */
 export async function detectAndChooseServer() {
     console.log(chalk.gray('  Detecting best server...'));
-    const probes = await probeAll();
-    const reachable = probes.filter((p) => p.latencyMs !== null);
-    if (reachable.length === 0) {
+    const tzRegion = inferRegionByTimezone();
+    if (tzRegion === 'cn') {
+        const reachable = await verifyReachable(SERVERS.cn.url);
+        if (reachable) {
+            console.log(chalk.gray(`  Using ${SERVERS.cn.label} (timezone: China)`));
+            return SERVERS.cn.url;
+        }
+        const fallback = await verifyReachable(SERVERS.global.url);
+        if (fallback) {
+            console.log(chalk.gray(`  Using ${SERVERS.global.label} (cn unreachable, fallback)`));
+            return SERVERS.global.url;
+        }
         console.error(chalk.red('  Error: cannot reach any server.'));
         process.exit(1);
     }
-    const best = reachable[0];
-    console.log(chalk.gray(`  Using ${best.label} (${best.latencyMs}ms)`));
-    return best.url;
+    // Non-CN timezone: check IP to catch servers in China with UTC timezone
+    const ipRegion = await detectRegionByIP();
+    const region = ipRegion ?? tzRegion;
+    const reachable = await verifyReachable(SERVERS[region].url);
+    if (reachable) {
+        const source = ipRegion ? 'IP geolocation' : 'timezone';
+        console.log(chalk.gray(`  Using ${SERVERS[region].label} (${source})`));
+        return SERVERS[region].url;
+    }
+    // Fallback to the other server
+    const other = region === 'cn' ? 'global' : 'cn';
+    const fallback = await verifyReachable(SERVERS[other].url);
+    if (fallback) {
+        console.log(chalk.gray(`  Using ${SERVERS[other].label} (fallback)`));
+        return SERVERS[other].url;
+    }
+    console.error(chalk.red('  Error: cannot reach any server.'));
+    process.exit(1);
 }
 export function urlToRegion(url) {
     return url.includes('shennian.net') ? 'cn' : 'global';

package/dist/src/region.js.map

@@ -1 +1 @@
-{"version":3,"file":"region.js","sourceRoot":"","sources":["../../src/region.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"region.js","sourceRoot":"","sources":["../../src/region.ts"],"names":[],"mappings":"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"}