yarn.lock is not useless, yuv.js must be in /, because it is called in global.js as web worker, deploy.sh not tested yet

This commit is contained in:
rustdesk 2022-05-18 01:44:42 +08:00
parent 6de6d6c7a7
commit 85332a6245
7 changed files with 27 additions and 19 deletions

View File

@ -1,7 +1,12 @@
#!/usr/bin/env bash #!/usr/bin/env bash
cd build/web/ cd build/web/
python3 -c 'x=open("./main.dart.js", "rt").read();import re;y=re.search("https://.*canvaskit-wasm@([\d\.]+)/bin/",x);dirname="canvaskit@"+y.groups()[0];z=x.replace(y.group(),"/"+dirname+"/");f=open("./main.dart.js", "wt");f.write(z);import os;os.system("ln -s canvaskit " + dirname);' python3 -c 'x=open("./main.dart.js", "rt").read();import re;y=re.search("https://.*canvaskit-wasm@([\d\.]+)/bin/",x);dirname="canvaskit@"+y.groups()[0];z=x.replace(y.group(),"/"+dirname+"/");f=open("./main.dart.js", "wt");f.write(z);import os;os.system("ln -s canvaskit " + dirname);'
mv jds/dist/index.js ./
mv jds/dist/vendor.js ./
/bin/rm -rf js
python3 -c 'import hashlib;x=hashlib.sha1(open("./main.dart.js").read().encode()).hexdigest()[:10];y=open("index.html","rt").read().replace("main.dart.js", "main.dart.js?v="+x);open("index.html","wt").write(y)' python3 -c 'import hashlib;x=hashlib.sha1(open("./main.dart.js").read().encode()).hexdigest()[:10];y=open("index.html","rt").read().replace("main.dart.js", "main.dart.js?v="+x);open("index.html","wt").write(y)'
python3 -c 'import hashlib;x=hashlib.sha1(open("./index.js").read().encode()).hexdigest()[:10];y=open("index.html","rt").read().replace("js/dist/index.js", "index.js?v="+x);open("index.html","wt").write(y)'
python3 -c 'import hashlib;x=hashlib.sha1(open("./vendor.js").read().encode()).hexdigest()[:10];y=open("index.html","rt").read().replace("js/dist/vendor.js", "vendor.js?v="+x);open("index.html","wt").write(y)'
tar czf x * tar czf x *
scp x sg:/tmp/ scp x sg:/tmp/
ssh sg "sudo tar xzf /tmp/x -C /var/www/html/web.rustdesk.com/ && /bin/rm /tmp/x && sudo chown www-data:www-data /var/www/html/web.rustdesk.com/ -R" ssh sg "sudo tar xzf /tmp/x -C /var/www/html/web.rustdesk.com/ && /bin/rm /tmp/x && sudo chown www-data:www-data /var/www/html/web.rustdesk.com/ -R"

View File

@ -5,4 +5,5 @@ js/src/rendezvous.ts
ogvjs* ogvjs*
libopus.js libopus.js
libopus.wasm libopus.wasm
yuv-canvas* yuv-canvas*
node_modules

View File

@ -32,11 +32,10 @@
<title>RustDesk</title> <title>RustDesk</title>
<link rel="manifest" href="manifest.json"> <link rel="manifest" href="manifest.json">
<script src="libs/ogvjs-1.8.6/ogv.js"></script> <script src="ogvjs-1.8.6/ogv.js"></script>
<script src="libs/yuv.js"></script>
<script type="module" crossorigin src="js/dist/index.js"></script> <script type="module" crossorigin src="js/dist/index.js"></script>
<link rel="modulepreload" href="js/dist/vendor.js"> <link rel="modulepreload" href="js/dist/vendor.js">
<script src="libs/yuv-canvas-1.2.6.js"></script> <script src="yuv-canvas-1.2.6.js"></script>
<style> <style>
.loading { .loading {
display: flex; display: flex;
@ -181,4 +180,4 @@
</script> </script>
</body> </body>
</html> </html>

View File

@ -1,16 +1,15 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head>
<head> <meta charset="UTF-8" />
<meta charset="UTF-8" /> <link rel="icon" type="image/svg+xml" href="favicon.svg?v2" />
<link rel="icon" type="image/svg+xml" href="favicon.svg?v2" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <script src="ogvjs-1.8.6/ogv.js"></script>
<title>Vite App</title> <script src="./yuv-canvas-1.2.6.js"></script>
</head> <title>Vite App</title>
</head>
<body> <body>
<div id="app"></div> <div id="app"></div>
<script type="module" src="/src/main.ts"></script> <script type="module" src="/src/main.ts"></script>
</body> </body>
</html>
</html>

4
flutter/web/yarn.lock Normal file
View File

@ -0,0 +1,4 @@
# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
# yarn lockfile v1

0
flutter/web/libs/yuv.wasm → flutter/web/yuv.wasm Executable file → Normal file
View File