Feat/doris 1508 upgrade to v4.5

.circleci/config.yml

@@ -49,8 +49,34 @@ commands:
         steps:
             - run:
                 name: Build and run unit tests
-                command: npm run build
+                command: |
+                    npm run build
+                    npm run test
+
+    functional_steps:
+            steps:
+                - functional_precondition
+                - checkout
+                - dependencies_setup
+                - build_unit_test_steps
+                - functional_test_setup
 
+    run_test_suite:
+        parameters:
+            browser:
+                default: "chrome"
+                type: string
+            protocol:
+                default: "https"
+                type: string
+            groupname:
+                default: ""
+                type: string
+        steps:
+            - run:
+                name: Run functional tests (<<parameters.browser>> / <<parameters.protocol>>) <<parameters.groupname>>
+                command:
+                    node test/functional/runTests.js --selenium=remote --reporters=junit --app=remote --browsers=<<parameters.browser>> --protocol=<<parameters.protocol>> --groupname="<<parameters.groupname>>"
 jobs:
     build-and-unit-test:
         executor: dashjs-executor
@@ -62,8 +88,7 @@ jobs:
                 name: Deploy
                 command: |
                     if [ "${CIRCLE_BRANCH}" = "development" ] && [ -n "$DEPLOY_HOST" ] && [ -n "$DEPLOY_USER" ] && [ -n "$DEPLOY_PASSWORD" ]; then
-                        sudo npm install -g grunt-cli
-                        grunt deploy --git-commit=$CIRCLE_SHA1 --ftp-host=$DEPLOY_HOST --ftp-user=$DEPLOY_USER --ftp-pass=$DEPLOY_PASSWORD
+                        node deploy.js --host=$DEPLOY_HOST --user=$DEPLOY_USER --password=$DEPLOY_PASSWORD
                     else
                         echo "Not on development branch or deploy not configured. Dry run only, nothing will be deployed."
                     fi
@@ -112,23 +137,52 @@ jobs:
             - store_test_results:
                 path: test/functional/reports
 
-    functional-tests-all:
+    functional-tests-VOD_LIVE:
         executor: dashjs-executor
         steps:
-            - functional_precondition
-            - checkout
-            - dependencies_setup
-            - build_unit_test_steps
-            - functional_test_setup
-            - run:
-                name: Run functional tests (chrome / https)
-                command:
-                    node test/functional/runTests.js --selenium=remote --reporters=junit --app=remote --browsers=chrome --protocol=https
-            - run:
-                name: Run functional tests (chrome / http)
-                when: always # run tests even if some previous tests failed
-                command:
-                    node test/functional/runTests.js --selenium=remote --reporters=junit --app=remote --browsers=chrome --protocol=http
+            - functional_steps
+            - run_test_suite:
+                groupname: VOD (Static MPD)
+            - run_test_suite:
+                groupname: LIVE (Dynamic MPD)
+            - run_test_suite:
+                groupname: Live Low Latency
+            - store_test_results:
+                path: test/functional/reports
+
+    functional-tests-DRM:
+        executor: dashjs-executor
+        steps:
+            - functional_steps
+            - run_test_suite:
+                groupname: DRM (modern)
+            - run_test_suite:
+                groupname: DRM Content (conservative/legacy)
+            - store_test_results:
+                path: test/functional/reports
+
+    functional-tests-Subtitles_Thumbnails_Audio_Smooth:
+        executor: dashjs-executor
+        steps:
+            - functional_steps
+            - run_test_suite:
+                groupname: Subtitles and Captions
+            - run_test_suite:
+                groupname: Thumbnails
+            - run_test_suite:
+                groupname: Audio-only
+            - run_test_suite:
+                groupname: Smooth Streaming
+
+            - store_test_results:
+                path: test/functional/reports
+
+    functional-tests-only-http:
+        executor: dashjs-executor
+        steps:
+            - functional_steps
+            - run_test_suite:
+                protocol: http
             - store_test_results:
                 path: test/functional/reports
 
@@ -151,11 +205,14 @@ workflows:
     scheduled-workflow:
         triggers:
             - schedule:
-                cron: "0 0 * * 0"
+                cron: "0 0 * * 0,3"
                 filters:
                     branches:
                         only:
                             - development
         jobs:
-            - functional-tests-all
+            - functional-tests-VOD_LIVE
+            - functional-tests-DRM
+            - functional-tests-Subtitles_Thumbnails_Audio_Smooth
+            - functional-tests-only-http
 

.eslintrc

@@ -0,0 +1,39 @@
+{
+    "env": {
+        "browser": true,
+        "es6": true,
+        "mocha": true,
+        "node": true
+    },
+    "globals": {
+        "dashjs": true,
+        "WebKitMediaSource": true,
+        "MediaSource": true,
+        "WebKitMediaKeys": true,
+        "MSMediaKeys": true,
+        "MediaKeys": true
+    },
+    "parser": "babel-eslint",
+    "rules": {
+        "no-caller": 2,
+        "no-undef": 2,
+        "no-unused-vars": 2,
+        "no-use-before-define": 0,
+        "strict": 0,
+        "no-loop-func": 0,
+        "quotes": [
+            "error",
+            "single",
+            {
+                "allowTemplateLiterals": true
+            }
+        ],
+        "indent": [
+            "error",
+            4,
+            {
+                "SwitchCase": 1
+            }
+        ]
+    }
+}

.github/workflows/deploy.yml

@@ -0,0 +1,53 @@
+name: deploy
+
+on:
+    workflow_call:
+        inputs:
+            envname:
+                required: true
+                type: string
+            deploy_path:
+                required: true
+                type: string
+        secrets:
+            host:
+                required: true
+            user:
+                required: true
+            private_key:
+                required: true
+
+jobs:
+    deploy:
+        runs-on: ubuntu-latest
+
+        steps:
+            -   uses: actions/checkout@v2
+            -   name: Use Node.js
+                uses: actions/setup-node@v2
+                with:
+                    node-version: "14.x"
+            -   name: Install dependencies
+                run: npm install
+            -   name: Run build
+                run: npm run build
+            -   name: Find and Replace
+                uses: jacobtomlinson/gha-find-replace@v2
+                env:
+                    replacement_string: ${{ format('{0} - commit <a href="https://github.com/Dash-Industry-Forum/dash.js/commit/{1}">{2}</a>', github.ref_name, github.sha, github.sha)}}
+                with:
+                    find: "<!-- commit-info -->"
+                    replace: ${{env.replacement_string}}
+                    include: "samples/dash-if-reference-player/index.html"
+            -   name: Copy to deploy directory for deployment
+                run: |
+                    mkdir ${{inputs.envname}}
+                    cp -R contrib dist samples test/functional/config test/functional/tests ${{inputs.envname}} 
+            -   name: Install SSH Key
+                uses: shimataro/ssh-key-action@v2
+                with:
+                    key: ${{ secrets.private_key }}
+                    known_hosts: unnecessary
+
+            -   name: Deploy with rsync
+                run: rsync -av -c -e "ssh -o StrictHostKeyChecking=no -oHostKeyAlgorithms=+ssh-dss" ${{inputs.envname}} ${{ secrets.user }}@${{ secrets.host }}:${{ inputs.deploy_path }}

.github/workflows/deploy_latest.yml

@@ -0,0 +1,17 @@
+name: deploy
+
+on:
+    push:
+        branches:
+            - 'master'
+
+jobs:
+    deploy_staging:
+        uses: ./.github/workflows/deploy.yml
+        with:
+            envname: latest
+            deploy_path: '/377335/dash.js'
+        secrets:
+            host: ${{secrets.HOST}}
+            user: ${{secrets.USER}}
+            private_key: ${{secrets.PRIVATE_KEY}}

.github/workflows/deploy_nightly.yml

@@ -0,0 +1,17 @@
+name: deploy
+
+on:
+    push:
+        branches:
+            - 'development'
+
+jobs:
+    deploy_staging:
+        uses: ./.github/workflows/deploy.yml
+        with:
+            envname: nightly
+            deploy_path: '/377335/dash.js'
+        secrets:
+            host: ${{secrets.HOST}}
+            user: ${{secrets.USER}}
+            private_key: ${{secrets.PRIVATE_KEY}}

.gitignore

@@ -1,4 +1,5 @@
 /simple.html
+samples/mpds
 #################
 ## Node.js
 #################
@@ -187,3 +188,5 @@ build/typings/
 
 # Vim
 .vimrc
+
+dashjs-*.tgz