Merge remote-tracking branch 'origin/tk' into wn11

# Conflicts:
#	wn/src/js_dom_run1.js

index.html

@@ -9,23 +9,59 @@
 </body>
 </html>
 <script>
+
+    // saf
+var saf,saf_class;
+;(function(){
+  var $toString = Function.toString
+    , cacheI = []
+    , cacheS = []
+    , idxI = [].indexOf.bind(cacheI)
+    , pushI = [].push.bind(cacheI)
+    , pushS = [].push.bind(cacheS)
+  Object.defineProperty(Function.prototype, 'toString', {
+    "enumerable": !1, "configurable": !0, "writable": !0,
+    "value": function toString() {
+      return typeof this == 'function' && cacheS[idxI(this)] || $toString.call(this);
+    }
+  })
+  function safe_func(func, name){
+    if (-1 == idxI(func)){
+      pushI(func)
+      pushS(`function ${name || func.name || ''}() { [native code] }`)
+    }
+    return func
+  };
+  safe_func(Function.prototype.toString, 'toString')
+  saf = safe_func
+  var ogpds = Object.getOwnPropertyDescriptors
+  var ok = Object.keys
+  saf_class=function(t) {
+    saf(t);for (var e=ogpds(t.prototype),o=ok(e),n=0;n<o.length; n++){
+    var r=e[o[n]].value;r&&"function"==typeof r&&"constructor"!==o[n]&&saf(t.prototype[o[n]]);
+    r=e[o[n]].get;r&&"function"==typeof r&&"constructor"!==o[n]&&saf(r);
+    r=e[o[n]].set;r&&"function"==typeof r&&"constructor"!==o[n]&&saf(r);}}
+})();
+var origslice = [].slice;
+
+
     Date.now = function now() {
-        return 1703561132362
+        return 1706767390635
     };
     Date.parse = function () {
-        return 1703561132362
+        return 1706767390635
     };
     Date.prototype.valueOf = function () {
-        return 1703561132362
+        return 1706767390635
     };
     Date.prototype.getTime = function () {
-        return 1703561132362
+        return 1706767390635
     };
     Date.prototype.toString = function () {
-        return 1703561132362
+        return 1706767390635
     };
     Performance.prototype.now = function now() {
-        return Number('1703561132362'.slice(8))
+        return Number('1706767390635'.slice(8))
     }
     times = 0
     Math.random = function random() {
@@ -45,69 +81,81 @@
     }
     idx = 0
 
-    addEventListener('DOMContentLoaded', function (e) {
-        debugger;
-        console.log(e)
-    })
 
     _join = Array.prototype.join;
-    Array.prototype.join = function (s) {
+    Array.prototype.join = saf(function (s) {
         _print('join', this.length, this, s)
         let res = _join.call(this, s)
         _print('joinres', res)
         return res;
-    }
+    })
     // document.cookie = 'sRpK8nqm_sc=A9EBM6mMAQAABr7rR-6k_cD1NDefUGYZBlvraANwxoU0F86e5XoQveY1mz4UARf3iT0AAAAAAAAAAAAAAAAAAA|1|0|27ee2b2f98e6c25dfd8413111062fcf921881318'
-    // _getOwnPropertyNames = Object.getOwnPropertyNames;
-    // Object.getOwnPropertyNames = function (a) {
-    //     let res = _getOwnPropertyNames(a);
-    //     _print('getOwnPropertyNames', a, res)
-    //     return res;
-    //
-    // }
+    _getOwnPropertyNames = Object.getOwnPropertyNames;
+    Object.getOwnPropertyNames = saf(function (a) {
+        let res = _getOwnPropertyNames(a);
+        _print('getOwnPropertyNames', a, res)
+        return res;
+
+    })
+    _getOwnPropertyDescriptors = Object.getOwnPropertyDescriptors;
+    Object.getOwnPropertyDescriptors = saf(function (a) {
+        let res = _getOwnPropertyDescriptors(a);
+        _print('getOwnPropertyDescriptors', a, res)
+        return res;
+
+    })
+_getOwnPropertyDescriptor = Object.getOwnPropertyDescriptor;
+    Object.getOwnPropertyDescriptor = saf(function (a, b) {
+        let res = _getOwnPropertyDescriptor(a,b);
+        _print('getOwnPropertyDescriptor', a,b, res)
+        return res;
+
+    })
+
 
+Object.defineProperties(crypto,{
+    getRandomValues: {
+        value: saf(function(){
+            var e=arguments[0];
+            return e.map(function(x, i){return e[i]= parseInt(2147193652)});
+        })
+    }
+})
     // var _hasOwnProperty = Object.hasOwnProperty;
     // Object.hasOwnProperty = function () {
     //     let res = _hasOwnProperty.apply(this, arguments);
     //     _print('Object.hasOwnProperty', arguments, res === undefined);
     //     return res;
     // }
-// saf
-var saf,saf_class;
-;(function(){
-  var $toString = Function.toString
-    , cacheI = []
-    , cacheS = []
-    , idxI = [].indexOf.bind(cacheI)
-    , pushI = [].push.bind(cacheI)
-    , pushS = [].push.bind(cacheS)
-  Object.defineProperty(Function.prototype, 'toString', {
-    "enumerable": !1, "configurable": !0, "writable": !0,
-    "value": function toString() {
-      return typeof this == 'function' && cacheS[idxI(this)] || $toString.call(this);
-    }
-  })
-  function safe_func(func, name){
-    if (-1 == idxI(func)){
-      pushI(func)
-      pushS(`function ${name || func.name || ''}() { [native code] }`)
+
+
+;
+
+
+
+
+    _defin = Object.defineProperty;
+Object.defineProperty = saf(function (p, v, d) {
+    if (v === 'positionalSignals') {
+        if (Array.isArray(d.value) && d.value.length > 50) {
+            let res = [];
+            d.value.forEach((e, i) => {
+                if (e && e.length == 2) {
+                    res.push(i + '==' + e[1].length + '=>')
+                    res.push(e[1] + '')
+                } else {
+                    res.push(i + '==0=>iii')
+                }
+
+            })
+            _print([].slice.call(res).join('iii'))
+        }
     }
-    return func
-  };
-  safe_func(Function.prototype.toString, 'toString')
-  saf = safe_func
-  var ogpds = Object.getOwnPropertyDescriptors
-  var ok = Object.keys
-  saf_class=function(t) {
-    saf(t);for (var e=ogpds(t.prototype),o=ok(e),n=0;n<o.length; n++){
-    var r=e[o[n]].value;r&&"function"==typeof r&&"constructor"!==o[n]&&saf(t.prototype[o[n]]);
-    r=e[o[n]].get;r&&"function"==typeof r&&"constructor"!==o[n]&&saf(r);
-    r=e[o[n]].set;r&&"function"==typeof r&&"constructor"!==o[n]&&saf(r);}}
-})();
-var origslice = [].slice
+    return _defin(p, v, d)
+})
 
 </script>
-<script src="src_out.js"></script>
+<script src="/assets/app/scripts/swa-common.js"></script>
 <!--<script src="env/get_pixels.js"></script>-->
 <!--<script src="https://www.jetblue.com/js/src/jb-74873.js"></script>-->
 
@@ -181,10 +229,10 @@ var origslice = [].slice
     //         websocket.send(JSON.stringify(ret))
     //     }
     // }()
-    debugger
     try {
         sendXHr()
     } catch (e) {
     }
     console.log('结束times', window.times)
+    debugger;
 </script>
\ No newline at end of file

wn/Dockerfile

-FROM python:3.10.1-slim
+FROM python:3.12.1-bookworm
 RUN mkdir -p "/home/opt/lcc-wn"
 RUN apt update
 RUN apt install curl vim -y
 RUN pip3 install requests loguru curl_cffi tls_client pyquery nacos-sdk-python pyyaml pymongo
-RUN curl -fsSL https://deb.nodesource.com/setup_20.x |  bash -
+RUN curl -fsSL https://deb.nodesource.com/setup_19.x |  bash -
 RUN apt install nodejs -y
 WORKDIR /home/opt/lcc-wn/
 RUN apt install -y make g++
 COPY src/package.json /home/opt/lcc-wn/package.json
 COPY src/package-lock.json /home/opt/lcc-wn/package-lock.json
+# RUN npm config set registry https://registry.npmmirror.com
 RUN cd /home/opt/lcc-wn/ && npm i
 RUN npm i ffi-napi
 

wn/src/main.py

@@ -262,8 +262,8 @@ while True:
                     #     '_id': token,
                     #     'update_time': int(time.time() * 1000)
                     # })
-                    code = open('src2.js', 'r', encoding='utf-8').read()
-                    with open('src_run1.js', 'w', encoding='utf-8') as f:
+                    code = open('src.js', 'r', encoding='utf-8').read()
+                    with open('src_run2.js', 'w', encoding='utf-8') as f:
                         f.write(code + '\n\n' + get_random_location() + ';;' + c
                                 +
                                 ';;;\n\n' + '''
@@ -290,8 +290,8 @@ setTimeout(r=> {
                                    "pax": {"ADT": 1, "CHD": 0, "INF": 0, "UNN": 0}, "redempoint": false,
                                    "pointsBreakup": {"option": "", "value": 0}, "isMultiCity": false}`)
                         xhr.setRequestHeader('user-agent', ENV.navigatorparams.useragent)
-                        xhr.setRequestHeader('xhr_url', xhr_url)
-                        xhr.setRequestHeader('xhr_res', xhr_res)
+                        //xhr.setRequestHeader('xhr_url', xhr_url)
+                        //xhr.setRequestHeader('xhr_res', xhr_res)
                         print22(JSON.stringify(xhr.headers))
                         _process.exit(0)
                         }, 1000)
@@ -302,8 +302,8 @@ setTimeout(r=> {
                         # f.write(code + '\n\n' + get_random_location() + ';;' + c)
 
                 code1 = open('js_dom_run.js','r').read()
-                with open('js_dom_run1.js', 'w', encoding='utf-8') as f:
-                    f.write(code1 + '\n\n' + c)
+                # with open('js_dom_run2js', 'w', encoding='utf-8') as f:
+                #     f.write(code1 + '\n\n' + c)
             t1 = time.time()
             # token = list(db.token_shape.aggregate( [ {'$match': {'update_time':{'$gte': int(time.time() * 1000) - 60*60*12}}}, { '$sample': { 'size': 1 } } ] ))[0]['_id']
             # token = '11'