shaka-player 3.2.9 → 3.2.12

package/lib/util/string_utils.js

@@ -11,6 +11,7 @@ goog.require('shaka.log');
 goog.require('shaka.util.BufferUtils');
 goog.require('shaka.util.Error');
 goog.require('shaka.util.Lazy');
+goog.require('shaka.util.Platform');
 
 
 /**
@@ -37,18 +38,84 @@ shaka.util.StringUtils = class {
       uint8 = uint8.subarray(3);
     }
 
-    // Use the TextDecoder interface to decode the text.  This has the advantage
-    // compared to the previously-standard decodeUriComponent that it will
-    // continue parsing even if it finds an invalid UTF8 character, rather than
-    // stop and throw an error.
-    const utf8decoder = new TextDecoder();
-    const decoded = utf8decoder.decode(uint8);
-    if (decoded.includes('\uFFFD')) {
-      shaka.log.alwaysError('Decoded string contains an "unknown character" ' +
-                            'codepoint.  That probably means the UTF8 ' +
-                            'encoding was incorrect!');
+    if (window.TextDecoder && !shaka.util.Platform.isPS4()) {
+      // Use the TextDecoder interface to decode the text.  This has the
+      // advantage compared to the previously-standard decodeUriComponent that
+      // it will continue parsing even if it finds an invalid UTF8 character,
+      // rather than stop and throw an error.
+      const utf8decoder = new TextDecoder();
+      const decoded = utf8decoder.decode(uint8);
+      if (decoded.includes('\uFFFD')) {
+        shaka.log.alwaysError('Decoded string contains an "unknown character' +
+                              '" codepoint.  That probably means the UTF8 ' +
+                              'encoding was incorrect!');
+      }
+      return decoded;
+    } else {
+      // Homebrewed UTF-8 decoder based on
+      // https://en.wikipedia.org/wiki/UTF-8#Encoding
+      // Unlike decodeURIComponent, won't throw on bad encoding.
+      // In this way, it is similar to TextDecoder.
+
+      let decoded = '';
+      for (let i = 0; i < uint8.length; ++i) {
+        // By default, the "replacement character" codepoint.
+        let codePoint = 0xFFFD;
+
+        // Top bit is 0, 1-byte encoding.
+        if ((uint8[i] & 0x80) == 0) {
+          codePoint = uint8[i];
+
+        // Top 3 bits of byte 0 are 110, top 2 bits of byte 1 are 10,
+        // 2-byte encoding.
+        } else if (uint8.length >= i + 2 &&
+            (uint8[i] & 0xe0) == 0xc0 &&
+            (uint8[i + 1] & 0xc0) == 0x80) {
+          codePoint = ((uint8[i] & 0x1f) << 6) |
+                      ((uint8[i + 1] & 0x3f));
+          i += 1;  // Consume one extra byte.
+
+        // Top 4 bits of byte 0 are 1110, top 2 bits of byte 1 and 2 are 10,
+        // 3-byte encoding.
+        } else if (uint8.length >= i + 3 &&
+            (uint8[i] & 0xf0) == 0xe0 &&
+            (uint8[i + 1] & 0xc0) == 0x80 &&
+            (uint8[i + 2] & 0xc0) == 0x80) {
+          codePoint = ((uint8[i] & 0x0f) << 12) |
+                      ((uint8[i + 1] & 0x3f) << 6) |
+                      ((uint8[i + 2] & 0x3f));
+          i += 2;  // Consume two extra bytes.
+
+        // Top 5 bits of byte 0 are 11110, top 2 bits of byte 1, 2 and 3 are 10,
+        // 4-byte encoding.
+        } else if (uint8.length >= i + 4 &&
+            (uint8[i] & 0xf1) == 0xf0 &&
+            (uint8[i + 1] & 0xc0) == 0x80 &&
+            (uint8[i + 2] & 0xc0) == 0x80 &&
+            (uint8[i + 3] & 0xc0) == 0x80) {
+          codePoint = ((uint8[i] & 0x07) << 18) |
+                      ((uint8[i + 1] & 0x3f) << 12) |
+                      ((uint8[i + 2] & 0x3f) << 6) |
+                      ((uint8[i + 3] & 0x3f));
+          i += 3;  // Consume three extra bytes.
+        }
+
+        // JavaScript strings are a series of UTF-16 characters.
+        if (codePoint <= 0xffff) {
+          decoded += String.fromCharCode(codePoint);
+        } else {
+          // UTF-16 surrogate-pair encoding, based on
+          // https://en.wikipedia.org/wiki/UTF-16#Description
+          const baseCodePoint = codePoint - 0x10000;
+          const highPart = baseCodePoint >> 10;
+          const lowPart = baseCodePoint & 0x3ff;
+          decoded += String.fromCharCode(0xd800 + highPart);
+          decoded += String.fromCharCode(0xdc00 + lowPart);
+        }
+      }
+
+      return decoded;
     }
-    return decoded;
   }
 
 
@@ -141,8 +208,30 @@ shaka.util.StringUtils = class {
    * @export
    */
   static toUTF8(str) {
-    const utf8Encoder = new TextEncoder();
-    return shaka.util.BufferUtils.toArrayBuffer(utf8Encoder.encode(str));
+    if (window.TextEncoder && !shaka.util.Platform.isPS4()) {
+      const utf8Encoder = new TextEncoder();
+      return shaka.util.BufferUtils.toArrayBuffer(utf8Encoder.encode(str));
+    } else {
+      // http://stackoverflow.com/a/13691499
+      // Converts the given string to a URI encoded string.  If a character
+      // falls in the ASCII range, it is not converted; otherwise it will be
+      // converted to a series of URI escape sequences according to UTF-8.
+      // Example: 'g#€' -> 'g#%E3%82%AC'
+      const encoded = encodeURIComponent(str);
+      // Convert each escape sequence individually into a character.  Each
+      // escape sequence is interpreted as a code-point, so if an escape
+      // sequence happens to be part of a multi-byte sequence, each byte will
+      // be converted to a single character.
+      // Example: 'g#%E3%82%AC' -> '\x67\x35\xe3\x82\xac'
+      const utf8 = unescape(encoded);
+
+      const result = new Uint8Array(utf8.length);
+      for (let i = 0; i < utf8.length; i++) {
+        const item = utf8[i];
+        result[i] = item.charCodeAt(0);
+      }
+      return shaka.util.BufferUtils.toArrayBuffer(result);
+    }
   }
 
 

package/maintained-branches.md

@@ -0,0 +1,15 @@
+# Maintained Shaka Player Branches
+
+We are currently maintaining the following branches of Shaka Player:
+
+ - v4.1 (latest)
+ - v4.0 (previous)
+ - v3.3 (LTS until April 30, 2023)
+ - v3.2 (in use by the Cast Application Framework)
+
+Other branches are no longer receiving bug fixes, and we recommend you upgrade
+to a maintained branch.  For details on upgrading, please see our
+[upgrade guide](https://shaka-player-demo.appspot.com/docs/api/tutorial-upgrade.html).
+
+For more information on how these branches are chosen, please refer to our
+[Branch Maintenance Policy](https://shaka-project.github.io/maintenance/shaka-player.html#branch-maintenance-policy).

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "shaka-player",
   "description": "DASH/EME video player library",
-  "version": "3.2.9",
+  "version": "3.2.12",
   "homepage": "https://github.com/shaka-project/shaka-player",
   "author": "Google",
   "maintainers": [
@@ -27,7 +27,6 @@
     "eslint-config-google": "^0.14.0",
     "eslint-plugin-shaka-rules": "file:./build/eslint-plugin-shaka-rules",
     "esprima": "^4.0.1",
-    "fastestsmallesttextencoderdecoder": "^1.0.22",
     "fontfaceonload": "^1.0.2",
     "google-closure-compiler-java": "^20220301.0.0",
     "google-closure-deps": "https://gitpkg.now.sh/google/closure-library/closure-deps?d7736da6",
@@ -50,7 +49,7 @@
     "less": "https://gitpkg.now.sh/joeyparrish/less.js/packages/less?28c63a43",
     "less-plugin-clean-css": "github:austingardner/less-plugin-clean-css#4e9e77bf",
     "material-design-lite": "^1.3.0",
-    "mux.js": "^6.1.0",
+    "mux.js": "^6.2.0",
     "open-sans-fonts": "^1.6.2",
     "postcss-less": "^6.0.0",
     "pwacompat": "^2.0.17",
@@ -71,7 +70,6 @@
       "dialog-polyfill/dist/dialog-polyfill.js",
       "eme-encryption-scheme-polyfill/index.js",
       "es6-promise-polyfill/promise.min.js",
-      "fastestsmallesttextencoderdecoder/EncoderDecoderTogether.min.js",
       "google-closure-library/closure/goog/base.js",
       "less/dist/less.js",
       "material-design-lite/dist/material.indigo-blue.min.css",
@@ -96,7 +94,7 @@
     "prepublishOnly": "python build/checkversion.py && python build/all.py --force"
   },
   "dependencies": {
-    "eme-encryption-scheme-polyfill": "^2.0.5"
+    "eme-encryption-scheme-polyfill": "^2.1.1"
   },
   "engines": {
     "node": ">=14"

package/test/player_src_equals_integration.js

@@ -305,6 +305,8 @@ describe('Player Src Equals', () => {
     expect(stats.loadLatency).toBeGreaterThan(0);
     expect(stats.manifestTimeSeconds).toBeNaN(); // There's no manifest.
     expect(stats.drmTimeSeconds).toBeNaN(); // There's no DRM.
+    expect(stats.height).toBe(110);
+    expect(stats.width).toBe(256);
   });
 
   it('plays with external text tracks', async () => {

package/test/text/simple_text_displayer_unit.js

@@ -127,6 +127,33 @@ describe('SimpleTextDisplayer', () => {
           [shakaCue]);
     });
 
+    it('flattens nested cue payloads correctly', () => {
+      const level0ContainerCue = new shaka.text.Cue(10, 30, '');
+      level0ContainerCue.isContainer = true;
+
+      const level1NonContainerCueA = new shaka.text.Cue(10, 20, '');
+      const level1NonContainerCueB = new shaka.text.Cue(20, 30, '');
+
+      // Add a trailing whitespace character to get a space-delimited expected
+      // result.
+      const cueANestedCue0 = new shaka.text.Cue(10, 20, 'Cue A Test0 ');
+      const cueANestedCue1 = new shaka.text.Cue(10, 20, 'Cue A Test1');
+      const cueBNestedCue0 = new shaka.text.Cue(20, 30, 'Cue B Test0 ');
+      const cueBNestedCue1 = new shaka.text.Cue(20, 30, 'Cue B Test1');
+
+      level1NonContainerCueA.nestedCues = [cueANestedCue0, cueANestedCue1];
+      level1NonContainerCueB.nestedCues = [cueBNestedCue0, cueBNestedCue1];
+      level0ContainerCue.nestedCues =
+          [level1NonContainerCueA, level1NonContainerCueB];
+
+      verifyHelper(
+          [
+            {startTime: 10, endTime: 20, text: 'Cue A Test0 Cue A Test1'},
+            {startTime: 20, endTime: 30, text: 'Cue B Test0 Cue B Test1'},
+          ],
+          [level0ContainerCue]);
+    });
+
     // Regression test for b/159050711
     it('maintains the styles of the parent cue', () => {
       const shakaCue = new shaka.text.Cue(10, 20, '');

package/test/text/ui_text_displayer_unit.js

@@ -50,6 +50,7 @@ describe('UITextDisplayer', () => {
   });
 
   beforeEach(() => {
+    video.currentTime = 0;
     textDisplayer = new shaka.text.UITextDisplayer(video, videoContainer);
   });
 
@@ -396,4 +397,68 @@ describe('UITextDisplayer', () => {
     expect(parentCueElements.length).toBe(1);
     expect(parentCueElements[0].textContent).toBe('');
   });
+
+  it('creates separate elements for cue regions', () => {
+    const cueRegion = new shaka.text.CueRegion();
+    cueRegion.id = 'regionId';
+    cueRegion.height = 80;
+    cueRegion.heightUnits = shaka.text.CueRegion.units.PERCENTAGE;
+    cueRegion.width = 80;
+    cueRegion.widthUnits = shaka.text.CueRegion.units.PERCENTAGE;
+    cueRegion.viewportAnchorX = 10;
+    cueRegion.viewportAnchorY = 10;
+    cueRegion.viewportAnchorUnits = shaka.text.CueRegion.units.PERCENTAGE;
+
+    // These all attach to the same region, but only one region element should
+    // be created.
+    const cues = [
+      new shaka.text.Cue(0, 100, ''),
+      new shaka.text.Cue(0, 100, ''),
+      new shaka.text.Cue(0, 100, ''),
+    ];
+    for (const cue of cues) {
+      cue.displayAlign = shaka.text.Cue.displayAlign.CENTER;
+      cue.region = cueRegion;
+    }
+
+    textDisplayer.setTextVisibility(true);
+    textDisplayer.append(cues);
+    updateCaptions();
+
+    const textContainer = videoContainer.querySelector('.shaka-text-container');
+    const allRegionElements = textContainer.querySelectorAll(
+        '.shaka-text-region');
+
+    // Verify that the nested cues are all attached to a single region element.
+    expect(allRegionElements.length).toBe(1);
+    const regionElement = allRegionElements[0];
+    const children = Array.from(regionElement.childNodes).filter(
+        (e) => e.nodeType == Node.ELEMENT_NODE);
+    expect(children.length).toBe(3);
+
+    // Verify styles applied to the region element.
+    const regionCssObj = parseCssText(regionElement.style.cssText);
+    const expectRegionCssObj = {
+      'position': 'absolute',
+      'height': '80%',
+      'width': '80%',
+      'top': '10%',
+      'left': '10%',
+      'display': 'flex',
+      'flex-direction': 'column',
+      'align-items': 'center',
+      'justify-content': 'center',
+    };
+    expect(regionCssObj).toEqual(jasmine.objectContaining(expectRegionCssObj));
+
+    for (const caption of children) {
+      // Verify that styles applied to the nested cues _DO NOT_ include region
+      // placement.
+      const cueCssObj = parseCssText(caption.style.cssText);
+      expect(Object.keys(cueCssObj)).not.toContain('height');
+      expect(Object.keys(cueCssObj)).not.toContain('width');
+      expect(Object.keys(cueCssObj)).not.toContain('top');
+      expect(Object.keys(cueCssObj)).not.toContain('left');
+    }
+  });
 });

package/test/util/string_utils_unit.js

@@ -5,6 +5,29 @@
  */
 
 describe('StringUtils', () => {
+  describe('with TextDecoder', () => {
+    if (window.TextDecoder) {
+      defineStringUtilTests();
+    }
+  });
+
+  describe('without TextDecoder', () => {
+    let originalTextDecoder;
+
+    beforeAll(() => {
+      originalTextDecoder = window.TextDecoder;
+      window['TextDecoder'] = null;
+    });
+
+    afterAll(() => {
+      window.TextDecoder = originalTextDecoder;
+    });
+
+    defineStringUtilTests();
+  });
+});
+
+function defineStringUtilTests() {
   const StringUtils = shaka.util.StringUtils;
 
   it('parses fromUTF8', () => {
@@ -16,19 +39,34 @@ describe('StringUtils', () => {
   });
 
   it('won\'t break if given cut-off UTF8 character', () => {
-    // This array contains the first half of a 2-byte UTF8 character, stranded
-    // at the very end of the string.
-    const arr1 = [0x53, 0x61, 0x6e, 0x20, 0x4a, 0x6f, 0x73, 0x81];
+    const arr1 = [0x53, 0x61, 0x6e, 0x20, 0x4a, 0x6f, 0x73, 0xc3, 0xa9];
     expect(StringUtils.fromUTF8(new Uint8Array(arr1)))
+        .toBe('San Jos\u00E9');
+
+    // This array contains the first half of a 2-byte UTF8 character
+    // (0xc3 0xa9 = é).  The half-character is stranded at the very end of the
+    // string.
+    const arr = [0x53, 0x61, 0x6e, 0x20, 0x4a, 0x6f, 0x73, 0xc3];
+    expect(StringUtils.fromUTF8(new Uint8Array(arr)))
         .toBe('San Jos\uFFFD');
+  });
 
-    // For reasons I don't know, it seems like 0xE9 cannot be the start of a
-    // UTF8 character.  Perhaps it is a reserved number?
-    const arr2 = [0x4a, 0x6f, 0x73, 0xE9, 0x33, 0x33, 0x20, 0x53, 0x61, 0x6e];
-    expect(StringUtils.fromUTF8(new Uint8Array(arr2)))
+  it('won\'t break if given an invalid UTF-8 sequence', () => {
+    // 0xe9 0x33 0x33 is an invalid UTF-8 sequence.
+    const arr = [0x4a, 0x6f, 0x73, 0xE9, 0x33, 0x33, 0x20, 0x53, 0x61, 0x6e];
+    expect(StringUtils.fromUTF8(new Uint8Array(arr)))
         .toBe('Jos\uFFFD33 San');
   });
 
+  it('can handle an 8-byte character', () => {
+    // This is the UTF-8 encoding of the US flag emoji.
+    // It decodes into two Unicode codepoints, which becomes 4 JavaScript
+    // UTF-16 characters.
+    const arr = [0xf0, 0x9f, 0x87, 0xba, 0xf0, 0x9f, 0x87, 0xb8];
+    expect(StringUtils.fromUTF8(new Uint8Array(arr)))
+        .toBe('\uD83C\uDDFA\uD83C\uDDF8');
+  });
+
   it('strips the BOM in fromUTF8', () => {
     // This is 4 Unicode characters, the last will be split into a surrogate
     // pair.
@@ -125,4 +163,4 @@ describe('StringUtils', () => {
     expect(StringUtils.fromUTF16(buffer, true).length)
         .toBe(buffer.byteLength / 2);
   });
-});
+}

package/ui/less/ad_controls.less

@@ -71,6 +71,10 @@
   .ad-text-shadow();
 }
 
+.shaka-ad-controls .shaka-ad-position:not(.shaka-hidden) + .shaka-ad-counter {
+  margin-left: 0.75em;
+}
+
 .shaka-skip-ad-container {
   /* Skip button is positioned at the very right edge of the
    * video container unlike the rest of the bottom controls. */

package/app-engine/README.md

@@ -1,9 +0,0 @@
-# Google App Engine Code
-
-This folder contains source code for the services we run on Google App Engine
-(appspot.com).
-
- - shaka-player-demo: Our hosted demo on https://shaka-player-demo.appspot.com/
-
- - demo-version-index: An index of Shaka Player releases and demos, hosted at
-                       https://index-dot-shaka-player-demo.appspot.com/

package/app-engine/demo-version-index/README.md

@@ -1,14 +0,0 @@
-# Google App Engine Version Index
-
-This folder contains everything necessary to host an index of Shaka Player
-releases and demos at https://index-dot-shaka-player-demo.appspot.com/
-
- - app.yaml: App Engine config file.  Defines the runtime (Python 3).
-
- - main.py: A python service that queries available versions and generates the
-            index from a template.
-
- - requirements.txt: Used by App Engine to install the necessary Python server
-                     requirements (Flask, App Engine API).
-
- - templates/index.html: A Jinja2 template used to generate the index HTML.

package/app-engine/demo-version-index/app.yaml

@@ -1,2 +0,0 @@
-runtime: python39
-default_expiration: 1s

package/app-engine/demo-version-index/main.py

@@ -1,162 +0,0 @@
-# Shaka Player Version Index - Appspot Entrypoint
-# Copyright 2022 Google LLC
-# SPDX-License-Identifier: Apache-2.0
-
-# Generate an index of Shaka Player versions on appspot.
-
-import collections
-import google.appengine.api.modules
-import jinja2
-import os
-import random
-import re
-
-from flask import Flask, render_template
-
-DEMO_URL_TEMPLATE = 'https://{0}-dot-shaka-player-demo.appspot.com/'
-
-# In Google Hosted Libraries
-HOSTED_URL_TEMPLATE = 'https://ajax.googleapis.com/ajax/libs/shaka-player/{0}/shaka-player.{1}'
-
-# Before Google Hosted Libraries, v1 appspot URLs
-V1_URL_TEMPLATE = 'https://{0}-dot-shaka-player-demo.appspot.com/shaka-player.{1}'
-# Before Google Hosted Libraries, v2 appspot URLs
-V2_URL_TEMPLATE = 'https://{0}-dot-shaka-player-demo.appspot.com/dist/shaka-player.{1}'
-
-def version_to_demo_url(v):
-  return DEMO_URL_TEMPLATE.format(v.replace('.', '-'))
-
-def version_to_lib_url(v):
-  if v == 'nightly':
-    return V2_URL_TEMPLATE.format(v, 'compiled.js')
-  elif (version_key(v) == version_key('v1.6.5') or
-      version_key(v) >= version_key('v2.0.6')):
-    return HOSTED_URL_TEMPLATE.format(v.replace('v', ''), 'compiled.js')
-  elif version_key(v) >= version_key('v2.0.0-beta'):
-    return V2_URL_TEMPLATE.format(v.replace('.', '-'), 'compiled.js')
-  else:
-    return V1_URL_TEMPLATE.format(v.replace('.', '-'), 'compiled.js')
-
-def version_to_ui_lib_url(v):
-  if v == 'nightly':
-    return V2_URL_TEMPLATE.format(v, 'ui.js')
-  elif version_key(v) >= version_key('v2.5.0'):
-    return HOSTED_URL_TEMPLATE.format(v.replace('v', ''), 'ui.js')
-  else:
-    return None
-
-def version_to_lib_externs_url(v):
-  if v == 'nightly':
-    return V2_URL_TEMPLATE.format(v, 'compiled.externs.js')
-  elif version_key(v) >= version_key('v2.0.6'):
-    return HOSTED_URL_TEMPLATE.format(v.replace('v', ''), 'compiled.externs.js')
-  else:
-    return None
-
-def version_to_ui_lib_externs_url(v):
-  if v == 'nightly':
-    return V2_URL_TEMPLATE.format(v, 'ui.externs.js')
-  elif version_key(v) >= version_key('v2.5.0'):
-    return HOSTED_URL_TEMPLATE.format(v.replace('v', ''), 'ui.externs.js')
-  else:
-    return None
-
-def version_to_lib_defs_url(v):
-  if v == 'nightly':
-    return V2_URL_TEMPLATE.format(v, 'compiled.d.ts')
-  elif version_key(v) >= version_key('v3.0.6'):
-    return HOSTED_URL_TEMPLATE.format(v.replace('v', ''), 'compiled.d.ts')
-  else:
-    return None
-
-def version_to_ui_lib_defs_url(v):
-  if v == 'nightly':
-    return V2_URL_TEMPLATE.format(v, 'ui.d.ts')
-  elif version_key(v) >= version_key('v3.0.6'):
-    return HOSTED_URL_TEMPLATE.format(v.replace('v', ''), 'ui.d.ts')
-  else:
-    return None
-
-def version_to_metadata(v):
-  return {
-    'version': v,
-    'best': False,  # Corrected later in another loop
-    'demo': version_to_demo_url(v),
-    'lib': version_to_lib_url(v),
-    'ui_lib': version_to_ui_lib_url(v),
-    'lib_externs': version_to_lib_externs_url(v),
-    'ui_lib_externs': version_to_ui_lib_externs_url(v),
-    'lib_defs': version_to_lib_defs_url(v),
-    'ui_lib_defs': version_to_ui_lib_defs_url(v),
-  }
-
-def is_release_version(name):
-  return re.match(r'v\d+-\d+-\d+(?:-.+)?', name)
-
-def appengine_version_to_package_version(version):
-  # Replace the first two dashes with dots.  More dashes indicate a prerelease
-  # version, as seen in "v2.0.0-beta3".
-  return version.replace('-', '.', 2)
-
-def version_key(version):
-  if version == 'nightly':
-    # A false version number for nightly, greater than any actual release
-    # version.
-    return [float('inf')]
-
-  assert version[0] == 'v'
-  main_version, _, suffix = version[1:].partition('-')
-  if not suffix:
-    suffix = '}}}'  # this puts main releases after prerelease versions
-  version_tuple = [int(x) for x in main_version.split('.')]
-  return version_tuple + [suffix]
-
-def get_appengine_versions():
-  if os.getenv('SERVER_SOFTWARE', '').startswith('Google App Engine/'):
-    # NOTE: this doesn't return anything useful in a local dev server.
-    return google.appengine.api.modules.modules.get_versions()
-
-  # For a local dev server, fake it so we can test sorting.
-  fake_versions = [
-    'v1-6-0', 'v1-6-1', 'v1-6-2', 'v1-6-3', 'v1-6-4', 'v1-6-5',
-    'v2-0-0-beta', 'v2-0-0-beta2', 'v2-0-0-beta3', 'v2-0-0',
-    'v2-1-0', 'v2-1-1', 'v2-1-2',
-    'v2-2-1', 'v2-2-2-beta', 'v2-2-2-beta2', 'v2-2-2', 'v2-2-9', 'v2-2-10',
-  ]
-  random.shuffle(fake_versions)  # in-place shuffle
-  return fake_versions
-
-
-app = Flask(__name__)
-
-@app.route('/')
-def root():
-  appengine_versions = get_appengine_versions()
-  # Filter for release versions only.
-  appengine_versions = filter(is_release_version, appengine_versions)
-
-  # Now convert from appengine versions (v2-0-0) to package versions (v2.0.0).
-  versions = list(map(appengine_version_to_package_version, appengine_versions))
-  # Now sort, putting prerelease versions ahead of the corresponding release.
-  versions.sort(key=version_key)
-
-  version_metadata = collections.OrderedDict()
-  latest_by_branch = {}
-  for v in versions:
-    version_metadata[v] = version_to_metadata(v)
-
-    # Because |versions| is already sorted, we can just overwrite the entry
-    # in the latest_by_branch dictionary.
-    branch_key = tuple(version_key(v)[0:2])
-    latest_by_branch[branch_key] = v
-
-  for v in latest_by_branch.values():
-    version_metadata[v]['best'] = True
-
-  # Append nightly rather than filter for it, so that it always appears at the
-  # end of the list.
-  version_metadata['nightly'] = version_to_metadata('nightly')
-  version_metadata['nightly']['best'] = True
-
-  for i in version_metadata.values(): print(i)
-  return render_template('index.html', versions=version_metadata.values())

package/app-engine/demo-version-index/requirements.txt

@@ -1,6 +0,0 @@
-# Shaka Player Version Index - Appspot Python Runtime Requirements
-# Copyright 2022 Google LLC
-# SPDX-License-Identifier: Apache-2.0
-
-Flask==2.0.3
-appengine-python-standard==0.3.1