Merge pull request #511 from Dainius14/master

Switch to browser native SubtleCrypt.digest()
This commit is contained in:
Ajay Ramachandran 2020-10-15 13:35:42 -04:00 committed by GitHub
commit 8930f4cfeb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 326 additions and 91 deletions

File diff suppressed because one or more lines are too long

5
package-lock.json generated
View file

@ -10494,11 +10494,6 @@
"traverse": "0.4.x" "traverse": "0.4.x"
} }
}, },
"js-sha256": {
"version": "0.9.0",
"resolved": "https://registry.npmjs.org/js-sha256/-/js-sha256-0.9.0.tgz",
"integrity": "sha512-sga3MHh9sgQN2+pJ9VYZ+1LPwXOxuBJBA5nrR5/ofPfuiJBE2hnjsaN8se8JznOmGLN2p49Pe5U/ttafcs/apA=="
},
"js-tokens": { "js-tokens": {
"version": "4.0.0", "version": "4.0.0",
"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",

View file

@ -11,7 +11,6 @@
"babel-loader": "^8.0.6", "babel-loader": "^8.0.6",
"babel-preset-env": "^1.7.0", "babel-preset-env": "^1.7.0",
"concurrently": "^5.1.0", "concurrently": "^5.1.0",
"js-sha256": "^0.9.0",
"react": "^16.12.0", "react": "^16.12.0",
"react-dom": "^16.12.0" "react-dom": "^16.12.0"
}, },

View file

@ -1,5 +1,5 @@
@babel/code-frame @babel/code-frame
7.8.3 <https://github.com/babel/babel/tree/master/packages/babel-code-frame> 7.10.4 <https://github.com/babel/babel>
MIT License MIT License
Copyright (c) 2014-present Sebastian McKenzie and other contributors Copyright (c) 2014-present Sebastian McKenzie and other contributors
@ -27,7 +27,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
****************************** ******************************
@babel/core @babel/core
7.8.3 <https://github.com/babel/babel/tree/master/packages/babel-core> 7.11.1 <https://github.com/babel/babel>
MIT License MIT License
Copyright (c) 2014-present Sebastian McKenzie and other contributors Copyright (c) 2014-present Sebastian McKenzie and other contributors
@ -55,7 +55,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
****************************** ******************************
@babel/generator @babel/generator
7.8.3 <https://github.com/babel/babel/tree/master/packages/babel-generator> 7.11.0 <https://github.com/babel/babel>
MIT License MIT License
Copyright (c) 2014-present Sebastian McKenzie and other contributors Copyright (c) 2014-present Sebastian McKenzie and other contributors
@ -83,7 +83,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
****************************** ******************************
@babel/helper-function-name @babel/helper-function-name
7.8.3 <https://github.com/babel/babel/tree/master/packages/babel-helper-function-name> 7.10.4 <https://github.com/babel/babel>
MIT License MIT License
Copyright (c) 2014-present Sebastian McKenzie and other contributors Copyright (c) 2014-present Sebastian McKenzie and other contributors
@ -111,7 +111,175 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
****************************** ******************************
@babel/helper-get-function-arity @babel/helper-get-function-arity
7.8.3 <https://github.com/babel/babel/tree/master/packages/babel-helper-get-function-arity> 7.10.4 <https://github.com/babel/babel>
MIT License
Copyright (c) 2014-present Sebastian McKenzie and other contributors
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
******************************
@babel/helper-member-expression-to-functions
7.11.0 <https://github.com/babel/babel>
MIT License
Copyright (c) 2014-present Sebastian McKenzie and other contributors
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
******************************
@babel/helper-module-imports
7.10.4 <https://github.com/babel/babel>
MIT License
Copyright (c) 2014-present Sebastian McKenzie and other contributors
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
******************************
@babel/helper-module-transforms
7.11.0 <https://github.com/babel/babel>
MIT License
Copyright (c) 2014-present Sebastian McKenzie and other contributors
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
******************************
@babel/helper-optimise-call-expression
7.10.4 <https://github.com/babel/babel>
MIT License
Copyright (c) 2014-present Sebastian McKenzie and other contributors
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
******************************
@babel/helper-replace-supers
7.10.4 <https://github.com/babel/babel>
MIT License
Copyright (c) 2014-present Sebastian McKenzie and other contributors
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
******************************
@babel/helper-simple-access
7.10.4 <https://github.com/babel/babel>
MIT License MIT License
Copyright (c) 2014-present Sebastian McKenzie and other contributors Copyright (c) 2014-present Sebastian McKenzie and other contributors
@ -139,7 +307,35 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
****************************** ******************************
@babel/helper-split-export-declaration @babel/helper-split-export-declaration
7.8.3 <https://github.com/babel/babel/tree/master/packages/babel-helper-split-export-declaration> 7.11.0 <https://github.com/babel/babel>
MIT License
Copyright (c) 2014-present Sebastian McKenzie and other contributors
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
******************************
@babel/helper-validator-identifier
7.10.4 <https://github.com/babel/babel>
MIT License MIT License
Copyright (c) 2014-present Sebastian McKenzie and other contributors Copyright (c) 2014-present Sebastian McKenzie and other contributors
@ -167,7 +363,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
****************************** ******************************
@babel/helpers @babel/helpers
7.8.3 <https://github.com/babel/babel/tree/master/packages/babel-helpers> 7.10.4 <https://github.com/babel/babel>
MIT License MIT License
Copyright (c) 2014-present Sebastian McKenzie and other contributors Copyright (c) 2014-present Sebastian McKenzie and other contributors
@ -195,7 +391,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
****************************** ******************************
@babel/highlight @babel/highlight
7.8.3 <https://github.com/babel/babel/tree/master/packages/babel-highlight> 7.10.4 <https://github.com/babel/babel>
MIT License MIT License
Copyright (c) 2014-present Sebastian McKenzie and other contributors Copyright (c) 2014-present Sebastian McKenzie and other contributors
@ -223,7 +419,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
****************************** ******************************
@babel/parser @babel/parser
7.8.3 <https://github.com/babel/babel/tree/master/packages/babel-parser> 7.11.3 <https://github.com/babel/babel>
Copyright (C) 2012-2014 by various contributors (see AUTHORS) Copyright (C) 2012-2014 by various contributors (see AUTHORS)
Permission is hereby granted, free of charge, to any person obtaining a copy Permission is hereby granted, free of charge, to any person obtaining a copy
@ -248,7 +444,7 @@ THE SOFTWARE.
****************************** ******************************
@babel/template @babel/template
7.8.3 <https://github.com/babel/babel/tree/master/packages/babel-template> 7.10.4 <https://github.com/babel/babel>
MIT License MIT License
Copyright (c) 2014-present Sebastian McKenzie and other contributors Copyright (c) 2014-present Sebastian McKenzie and other contributors
@ -276,7 +472,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
****************************** ******************************
@babel/traverse @babel/traverse
7.8.3 <https://github.com/babel/babel/tree/master/packages/babel-traverse> 7.11.0 <https://github.com/babel/babel>
MIT License MIT License
Copyright (c) 2014-present Sebastian McKenzie and other contributors Copyright (c) 2014-present Sebastian McKenzie and other contributors
@ -304,7 +500,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
****************************** ******************************
@babel/types @babel/types
7.8.3 <https://github.com/babel/babel/tree/master/packages/babel-types> 7.11.0 <https://github.com/babel/babel>
MIT License MIT License
Copyright (c) 2014-present Sebastian McKenzie and other contributors Copyright (c) 2014-present Sebastian McKenzie and other contributors
@ -1313,7 +1509,7 @@ POSSIBILITY OF SUCH DAMAGE.
****************************** ******************************
acorn acorn
6.4.0 <https://github.com/acornjs/acorn> 6.4.1 <https://github.com/acornjs/acorn>
Copyright (C) 2012-2018 by various contributors (see AUTHORS) Copyright (C) 2012-2018 by various contributors (see AUTHORS)
Permission is hereby granted, free of charge, to any person obtaining a copy Permission is hereby granted, free of charge, to any person obtaining a copy
@ -1450,10 +1646,10 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
****************************** ******************************
anymatch anymatch
2.0.0 <https://github.com/micromatch/anymatch> 3.1.1 <https://github.com/micromatch/anymatch>
The ISC License The ISC License
Copyright (c) 2014 Elan Shanker Copyright (c) 2019 Elan Shanker, Paul Miller (https://paulmillr.com)
Permission to use, copy, modify, and/or distribute this software for any Permission to use, copy, modify, and/or distribute this software for any
purpose with or without fee is hereby granted, provided that the above purpose with or without fee is hereby granted, provided that the above
@ -2432,10 +2628,10 @@ authors: Michael Mclaughlin <M8ch88l@gmail.com>
****************************** ******************************
binary-extensions binary-extensions
1.13.1 <https://github.com/sindresorhus/binary-extensions> 2.1.0 <https://github.com/sindresorhus/binary-extensions>
MIT License MIT License
Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com) Copyright (c) 2019 Sindre Sorhus <sindresorhus@gmail.com> (https://sindresorhus.com), Paul Miller (https://paulmillr.com)
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
@ -2508,7 +2704,7 @@ SOFTWARE.
****************************** ******************************
braces braces
2.3.2 <https://github.com/micromatch/braces> 3.0.2 <https://github.com/micromatch/braces>
The MIT License (MIT) The MIT License (MIT)
Copyright (c) 2014-2018, Jon Schlinkert. Copyright (c) 2014-2018, Jon Schlinkert.
@ -3358,9 +3554,29 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
****************************** ******************************
chokidar chokidar
2.1.8 <https://github.com/paulmillr/chokidar> 3.4.2 <https://github.com/paulmillr/chokidar>
license: MIT The MIT License (MIT)
authors: Paul Miller <https://paulmillr.com>
Copyright (c) 2012-2019 Paul Miller (https://paulmillr.com), Elan Shanker
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the “Software”), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
****************************** ******************************
@ -4266,7 +4482,7 @@ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH RE
****************************** ******************************
elliptic elliptic
6.5.2 <https://github.com/indutny/elliptic> 6.5.3 <https://github.com/indutny/elliptic>
license: MIT license: MIT
authors: Fedor Indutny <fedor@indutny.com> authors: Fedor Indutny <fedor@indutny.com>
@ -4705,10 +4921,10 @@ USE OR PERFORMANCE OF THIS SOFTWARE.
****************************** ******************************
fill-range fill-range
4.0.0 <https://github.com/jonschlinkert/fill-range> 7.0.1 <https://github.com/jonschlinkert/fill-range>
The MIT License (MIT) The MIT License (MIT)
Copyright (c) 2014-2017, Jon Schlinkert Copyright (c) 2014-present, Jon Schlinkert.
Permission is hereby granted, free of charge, to any person obtaining a copy Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal of this software and associated documentation files (the "Software"), to deal
@ -5019,10 +5235,10 @@ https://creativecommons.org/licenses/by-sa/4.0/
****************************** ******************************
glob-parent glob-parent
3.1.0 <https://github.com/es128/glob-parent> 5.1.1 <https://github.com/gulpjs/glob-parent>
The ISC License The ISC License
Copyright (c) 2015 Elan Shanker Copyright (c) 2015, 2019 Elan Shanker
Permission to use, copy, modify, and/or distribute this software for any Permission to use, copy, modify, and/or distribute this software for any
purpose with or without fee is hereby granted, provided that the above purpose with or without fee is hereby granted, provided that the above
@ -5492,28 +5708,16 @@ THE SOFTWARE.
****************************** ******************************
is-binary-path is-binary-path
1.0.1 <https://github.com/sindresorhus/is-binary-path> 2.1.0 <https://github.com/sindresorhus/is-binary-path>
The MIT License (MIT) MIT License
Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com) Copyright (c) 2019 Sindre Sorhus <sindresorhus@gmail.com> (https://sindresorhus.com), Paul Miller (https://paulmillr.com)
Permission is hereby granted, free of charge, to any person obtaining a copy Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
****************************** ******************************
@ -5721,10 +5925,10 @@ THE SOFTWARE.
****************************** ******************************
is-number is-number
3.0.0 <https://github.com/jonschlinkert/is-number> 7.0.0 <https://github.com/jonschlinkert/is-number>
The MIT License (MIT) The MIT License (MIT)
Copyright (c) 2014-2016, Jon Schlinkert Copyright (c) 2014-present, Jon Schlinkert.
Permission is hereby granted, free of charge, to any person obtaining a copy Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal of this software and associated documentation files (the "Software"), to deal
@ -5936,7 +6140,7 @@ SOFTWARE.
****************************** ******************************
json5 json5
2.1.1 <https://github.com/json5/json5> 2.1.3 <https://github.com/json5/json5>
MIT License MIT License
Copyright (c) 2012-2018 Aseem Kishore, and [others]. Copyright (c) 2012-2018 Aseem Kishore, and [others].
@ -5965,7 +6169,7 @@ SOFTWARE.
****************************** ******************************
kind-of kind-of
6.0.2 <https://github.com/jonschlinkert/kind-of> 6.0.3 <https://github.com/jonschlinkert/kind-of>
The MIT License (MIT) The MIT License (MIT)
Copyright (c) 2014-2017, Jon Schlinkert. Copyright (c) 2014-2017, Jon Schlinkert.
@ -6060,7 +6264,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
****************************** ******************************
lodash lodash
4.17.15 <https://github.com/lodash/lodash> 4.17.19 <https://github.com/lodash/lodash>
Copyright OpenJS Foundation and other contributors <https://openjsf.org/> Copyright OpenJS Foundation and other contributors <https://openjsf.org/>
Based on Underscore.js, copyright Jeremy Ashkenas, Based on Underscore.js, copyright Jeremy Ashkenas,
@ -6370,7 +6574,7 @@ IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
****************************** ******************************
minimist minimist
1.2.0 <https://github.com/substack/minimist> 1.2.5 <https://github.com/substack/minimist>
This software is released under the MIT license: This software is released under the MIT license:
Permission is hereby granted, free of charge, to any person obtaining a copy of Permission is hereby granted, free of charge, to any person obtaining a copy of
@ -6434,7 +6638,7 @@ THE SOFTWARE.
****************************** ******************************
mkdirp mkdirp
0.5.1 <https://github.com/substack/node-mkdirp> 0.5.5 <https://github.com/substack/node-mkdirp>
Copyright 2010 James Halliday (mail@substack.net) Copyright 2010 James Halliday (mail@substack.net)
This project is free software released under the MIT/X11 license: This project is free software released under the MIT/X11 license:
@ -7180,6 +7384,33 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE. SOFTWARE.
******************************
picomatch
2.2.1 <https://github.com/micromatch/picomatch>
The MIT License (MIT)
Copyright (c) 2017-present, Jon Schlinkert.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
****************************** ******************************
pify pify
@ -7720,27 +7951,28 @@ IN THE SOFTWARE.
****************************** ******************************
readdirp readdirp
2.2.1 <https://github.com/paulmillr/readdirp> 3.4.0 <https://github.com/paulmillr/readdirp>
This software is released under the MIT license: MIT License
Copyright (c) 2012-2015 Thorsten Lorenz Copyright (c) 2012-2019 Thorsten Lorenz, Paul Miller (https://paulmillr.com)
Permission is hereby granted, free of charge, to any person obtaining a copy of Permission is hereby granted, free of charge, to any person obtaining a copy
this software and associated documentation files (the "Software"), to deal in of this software and associated documentation files (the "Software"), to deal
the Software without restriction, including without limitation the rights to in the Software without restriction, including without limitation the rights
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
the Software, and to permit persons to whom the Software is furnished to do so, copies of the Software, and to permit persons to whom the Software is
subject to the following conditions: furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software. copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
****************************** ******************************
@ -8456,7 +8688,7 @@ IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
****************************** ******************************
serialize-javascript serialize-javascript
2.1.2 <https://github.com/yahoo/serialize-javascript> 4.0.0 <https://github.com/yahoo/serialize-javascript>
Copyright 2014 Yahoo! Inc. Copyright 2014 Yahoo! Inc.
All rights reserved. All rights reserved.
@ -9455,7 +9687,7 @@ SUCH DAMAGE.
****************************** ******************************
terser-webpack-plugin terser-webpack-plugin
1.4.3 <https://github.com/webpack-contrib/terser-webpack-plugin> 1.4.5 <https://github.com/webpack-contrib/terser-webpack-plugin>
Copyright JS Foundation and other contributors Copyright JS Foundation and other contributors
Permission is hereby granted, free of charge, to any person obtaining Permission is hereby granted, free of charge, to any person obtaining
@ -9647,10 +9879,10 @@ THE SOFTWARE.
****************************** ******************************
to-regex-range to-regex-range
2.1.1 <https://github.com/micromatch/to-regex-range> 5.0.1 <https://github.com/micromatch/to-regex-range>
The MIT License (MIT) The MIT License (MIT)
Copyright (c) 2015-2017, Jon Schlinkert Copyright (c) 2015-present, Jon Schlinkert.
Permission is hereby granted, free of charge, to any person obtaining a copy Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal of this software and associated documentation files (the "Software"), to deal
@ -10342,7 +10574,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
****************************** ******************************
watchpack watchpack
1.6.0 <https://github.com/webpack/watchpack> 1.7.4 <https://github.com/webpack/watchpack>
Copyright JS Foundation and other contributors Copyright JS Foundation and other contributors
Permission is hereby granted, free of charge, to any person obtaining Permission is hereby granted, free of charge, to any person obtaining
@ -10365,6 +10597,13 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
******************************
watchpack-chokidar2
2.0.0 <https://github.com/webpack/watchpack>
license: MIT
authors: Tobias Koppers @sokra
****************************** ******************************
webpack webpack
@ -10589,7 +10828,7 @@ THE SOFTWARE.
****************************** ******************************
yargs-parser yargs-parser
13.1.1 <https://github.com/yargs/yargs-parser> 13.1.2 <https://github.com/yargs/yargs-parser>
Copyright (c) 2016, Contributors Copyright (c) 2016, Contributors
Permission to use, copy, modify, and/or distribute this software Permission to use, copy, modify, and/or distribute this software

View file

@ -544,7 +544,7 @@ function incorrectVideoCheck(videoID?: string, sponsorTime?: SponsorTime): boole
} }
} }
function sponsorsLookup(id: string) { async function sponsorsLookup(id: string) {
video = document.querySelector('video') // Youtube video player video = document.querySelector('video') // Youtube video player
//there is no video here //there is no video here
if (video == null) { if (video == null) {
@ -569,7 +569,7 @@ function sponsorsLookup(id: string) {
updateAdFlag(); updateAdFlag();
// Make sure it doesn't get double called with the playing event // Make sure it doesn't get double called with the playing event
if (Math.abs(lastCheckVideoTime - video.currentTime) > 0.3 if (Math.abs(lastCheckVideoTime - video.currentTime) > 0.3
|| (lastCheckVideoTime !== video.currentTime && Date.now() - lastCheckTime > 2000)) { || (lastCheckVideoTime !== video.currentTime && Date.now() - lastCheckTime > 2000)) {
lastCheckTime = Date.now(); lastCheckTime = Date.now();
lastCheckVideoTime = video.currentTime; lastCheckVideoTime = video.currentTime;
@ -580,7 +580,7 @@ function sponsorsLookup(id: string) {
}); });
video.addEventListener('playing', () => { video.addEventListener('playing', () => {
// Make sure it doesn't get double called with the play event // Make sure it doesn't get double called with the play event
if (Math.abs(lastCheckVideoTime - video.currentTime) > 0.3 if (Math.abs(lastCheckVideoTime - video.currentTime) > 0.3
|| (lastCheckVideoTime !== video.currentTime && Date.now() - lastCheckTime > 2000)) { || (lastCheckVideoTime !== video.currentTime && Date.now() - lastCheckTime > 2000)) {
lastCheckTime = Date.now(); lastCheckTime = Date.now();
lastCheckVideoTime = video.currentTime; lastCheckVideoTime = video.currentTime;
@ -592,7 +592,7 @@ function sponsorsLookup(id: string) {
if (!video.paused){ if (!video.paused){
// Reset lastCheckVideoTime // Reset lastCheckVideoTime
lastCheckTime = Date.now(); lastCheckTime = Date.now();
lastCheckVideoTime = video.currentTime; lastCheckVideoTime = video.currentTime;
startSponsorSchedule(); startSponsorSchedule();
} }
@ -621,7 +621,8 @@ function sponsorsLookup(id: string) {
// Check for hashPrefix setting // Check for hashPrefix setting
let getRequest; let getRequest;
if (Config.config.hashPrefix) { if (Config.config.hashPrefix) {
getRequest = utils.asyncRequestToServer('GET', "/api/skipSegments/" + utils.getHash(id, 1).substr(0,4), { const hashPrefix = (await utils.getHash(id, 1)).substr(0, 4);
getRequest = utils.asyncRequestToServer('GET', "/api/skipSegments/" + hashPrefix, {
categories categories
}); });
} else { } else {

View file

@ -1,6 +1,5 @@
import Config from "./config"; import Config from "./config";
import { CategorySelection, SponsorTime, FetchResponse } from "./types"; import { CategorySelection, SponsorTime, FetchResponse } from "./types";
import { sha256 } from 'js-sha256';
import * as CompileConfig from "../config.json"; import * as CompileConfig from "../config.json";
@ -380,19 +379,21 @@ class Utils {
return typeof(browser) !== "undefined"; return typeof(browser) !== "undefined";
} }
getHash(value: string, times=5000): string { async getHash(value: string, times = 5000): Promise<string> {
if (times <= 0) return ""; if (times <= 0) return "";
let hashBuffer = new TextEncoder().encode(value).buffer;
for (let i = 0; i < times; i++) { for (let i = 0; i < times; i++) {
let hash = sha256.create(); hashBuffer = await crypto.subtle.digest('SHA-256', hashBuffer);
hash.update(value);
hash.hex();
value = hash.toString();
} }
return value; const hashArray = Array.from(new Uint8Array(hashBuffer));
const hashHex = hashArray.map(b => b.toString(16).padStart(2, '0')).join('');
return hashHex;
} }
} }
export default Utils; export default Utils;