瀏覽代碼

[jsinterp] Add Debugger from yt-dlp
* https://github.com/yt-dlp/yt-dlp/commit/8f53dc4
* thx pukkandan

dirkf 1 年之前
父節點
當前提交
ad01fa6cca
共有 4 個文件被更改,包括 50 次插入5 次删除
  1. 5 3
      test/test_jsinterp.py
  2. 4 0
      test/test_youtube_signature.py
  3. 0 1
      youtube_dl/extractor/common.py
  4. 41 1
      youtube_dl/jsinterp.py

+ 5 - 3
test/test_jsinterp.py

@@ -577,9 +577,11 @@ class TestJSInterpreter(unittest.TestCase):
     def test_unary_operators(self):
     def test_unary_operators(self):
         jsi = JSInterpreter('function f(){return 2  -  - - 2;}')
         jsi = JSInterpreter('function f(){return 2  -  - - 2;}')
         self.assertEqual(jsi.call_function('f'), 0)
         self.assertEqual(jsi.call_function('f'), 0)
-        # fails
-        # jsi = JSInterpreter('function f(){return 2 + - + - - 2;}')
-        # self.assertEqual(jsi.call_function('f'), 0)
+        jsi = JSInterpreter('function f(){return 2 + - + - - 2;}')
+        self.assertEqual(jsi.call_function('f'), 0)
+        # https://github.com/ytdl-org/youtube-dl/issues/32815
+        jsi = JSInterpreter('function f(){return 0  - 7 * - 6;}')
+        self.assertEqual(jsi.call_function('f'), 42)
 
 
     """ # fails so far
     """ # fails so far
     def test_packed(self):
     def test_packed(self):

+ 4 - 0
test/test_youtube_signature.py

@@ -158,6 +158,10 @@ _NSIG_TESTS = [
         'https://www.youtube.com/s/player/b7910ca8/player_ias.vflset/en_US/base.js',
         'https://www.youtube.com/s/player/b7910ca8/player_ias.vflset/en_US/base.js',
         '_hXMCwMt9qE310D', 'LoZMgkkofRMCZQ',
         '_hXMCwMt9qE310D', 'LoZMgkkofRMCZQ',
     ),
     ),
+    (
+        'https://www.youtube.com/s/player/590f65a6/player_ias.vflset/en_US/base.js',
+        '1tm7-g_A9zsI8_Lay_', 'xI4Vem4Put_rOg',
+    ),
 ]
 ]
 
 
 
 

+ 0 - 1
youtube_dl/extractor/common.py

@@ -3033,7 +3033,6 @@ class InfoExtractor(object):
             transform_source=transform_source, default=None)
             transform_source=transform_source, default=None)
 
 
     def _extract_jwplayer_data(self, webpage, video_id, *args, **kwargs):
     def _extract_jwplayer_data(self, webpage, video_id, *args, **kwargs):
-
         # allow passing `transform_source` through to _find_jwplayer_data()
         # allow passing `transform_source` through to _find_jwplayer_data()
         transform_source = kwargs.pop('transform_source', None)
         transform_source = kwargs.pop('transform_source', None)
         kwfind = compat_kwargs({'transform_source': transform_source}) if transform_source else {}
         kwfind = compat_kwargs({'transform_source': transform_source}) if transform_source else {}

+ 41 - 1
youtube_dl/jsinterp.py

@@ -14,6 +14,7 @@ from .utils import (
     remove_quotes,
     remove_quotes,
     unified_timestamp,
     unified_timestamp,
     variadic,
     variadic,
+    write_string,
 )
 )
 from .compat import (
 from .compat import (
     compat_basestring,
     compat_basestring,
@@ -220,6 +221,42 @@ class LocalNameSpace(ChainMap):
         return 'LocalNameSpace%s' % (self.maps, )
         return 'LocalNameSpace%s' % (self.maps, )
 
 
 
 
+class Debugger(object):
+    ENABLED = False
+
+    @staticmethod
+    def write(*args, **kwargs):
+        level = kwargs.get('level', 100)
+
+        def truncate_string(s, left, right=0):
+            if s is None or len(s) <= left + right:
+                return s
+            return '...'.join((s[:left - 3], s[-right:] if right else ''))
+
+        write_string('[debug] JS: {0}{1}\n'.format(
+            '  ' * (100 - level),
+            ' '.join(truncate_string(compat_str(x), 50, 50) for x in args)))
+
+    @classmethod
+    def wrap_interpreter(cls, f):
+        def interpret_statement(self, stmt, local_vars, allow_recursion, *args, **kwargs):
+            if cls.ENABLED and stmt.strip():
+                cls.write(stmt, level=allow_recursion)
+            try:
+                ret, should_ret = f(self, stmt, local_vars, allow_recursion, *args, **kwargs)
+            except Exception as e:
+                if cls.ENABLED:
+                    if isinstance(e, ExtractorError):
+                        e = e.orig_msg
+                    cls.write('=> Raises:', e, '<-|', stmt, level=allow_recursion)
+                raise
+            if cls.ENABLED and stmt.strip():
+                if should_ret or not repr(ret) == stmt:
+                    cls.write(['->', '=>'][should_ret], repr(ret), '<-|', stmt, level=allow_recursion)
+            return ret, should_ret
+        return interpret_statement
+
+
 class JSInterpreter(object):
 class JSInterpreter(object):
     __named_object_counter = 0
     __named_object_counter = 0
 
 
@@ -416,7 +453,7 @@ class JSInterpreter(object):
         except Exception as e:
         except Exception as e:
             if allow_undefined:
             if allow_undefined:
                 return JS_Undefined
                 return JS_Undefined
-            raise self.Exception('Cannot get index {idx:.100}'.format(**locals()), expr=repr(obj), cause=e)
+            raise self.Exception('Cannot get index {idx!r:.100}'.format(**locals()), expr=repr(obj), cause=e)
 
 
     def _dump(self, obj, namespace):
     def _dump(self, obj, namespace):
         try:
         try:
@@ -438,6 +475,7 @@ class JSInterpreter(object):
     _FINALLY_RE = re.compile(r'finally\s*\{')
     _FINALLY_RE = re.compile(r'finally\s*\{')
     _SWITCH_RE = re.compile(r'switch\s*\(')
     _SWITCH_RE = re.compile(r'switch\s*\(')
 
 
+    @Debugger.wrap_interpreter
     def interpret_statement(self, stmt, local_vars, allow_recursion=100):
     def interpret_statement(self, stmt, local_vars, allow_recursion=100):
         if allow_recursion < 0:
         if allow_recursion < 0:
             raise self.Exception('Recursion limit reached')
             raise self.Exception('Recursion limit reached')
@@ -797,6 +835,8 @@ class JSInterpreter(object):
 
 
             def eval_method():
             def eval_method():
                 if (variable, member) == ('console', 'debug'):
                 if (variable, member) == ('console', 'debug'):
+                    if Debugger.ENABLED:
+                        Debugger.write(self.interpret_expression('[{}]'.format(arg_str), local_vars, allow_recursion))
                     return
                     return
                 types = {
                 types = {
                     'String': compat_str,
                     'String': compat_str,