add webclientv2

.gitignore

@@ -7,6 +7,7 @@ go.sum
 resources/*
 !resources/public/upload/.gitignore
 !resources/web
+!resources/web2
 !resources/i18n
 release
 data

http/controller/api/webClient.go

@@ -85,3 +85,23 @@ func (i *WebClient) SharedPeer(c *gin.Context) {
 		"peer":      pp,
 	})
 }
+
+// ServerConfigV2 服务配置
+// @Tags WEBCLIENT_V2
+// @Summary 服务配置
+// @Description 服务配置,给webclient提供api-server
+// @Accept  json
+// @Produce  json
+// @Success 200 {object} response.Response
+// @Failure 500 {object} response.Response
+// @Router /server-config [get]
+// @Security token
+func (i *WebClient) ServerConfigV2(c *gin.Context) {
+	response.Success(
+		c,
+		gin.H{
+			"id_server": global.Config.Rustdesk.IdServer,
+			"key":       global.Config.Rustdesk.Key,
+		},
+	)
+}

http/controller/web/index.go

@@ -17,6 +17,8 @@ func (i *Index) ConfigJs(c *gin.Context) {
 
 	tmp := `
 localStorage.setItem('api-server', "` + apiServer + `")
+const ws2_prefix = 'wc-'
+localStorage.setItem(ws2_prefix+'api-server', "` + apiServer + `")
 `
 	c.String(200, tmp)
 }

http/router/api.go

@@ -121,6 +121,7 @@ func WebClientRoutes(frg *gin.RouterGroup) {
 	}
 	{
 		frg.POST("/server-config", middleware.RustAuth(), w.ServerConfig)
+		frg.POST("/server-config-v2", middleware.RustAuth(), w.ServerConfigV2)
 	}
 
 }

resources/web2/assets/FontManifest.json

@@ -0,0 +1,42 @@
+[
+  {
+    "family": "MaterialIcons",
+    "fonts": [
+      {
+        "asset": "fonts/MaterialIcons-Regular.otf"
+      }
+    ]
+  },
+  {
+    "family": "GestureIcons",
+    "fonts": [
+      {
+        "asset": "assets/gestures.ttf"
+      }
+    ]
+  },
+  {
+    "family": "Tabbar",
+    "fonts": [
+      {
+        "asset": "assets/tabbar.ttf"
+      }
+    ]
+  },
+  {
+    "family": "PeerSearchbar",
+    "fonts": [
+      {
+        "asset": "assets/peer_searchbar.ttf"
+      }
+    ]
+  },
+  {
+    "family": "AddressBook",
+    "fonts": [
+      {
+        "asset": "assets/address_book.ttf"
+      }
+    ]
+  }
+]

resources/web2/assets/assets/actions.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" style="isolation:isolate" viewBox="496.063 521.772 32 32"><path fill="none" d="M496.063 521.772h32v32h-32v-32Z"/><path d="m513.817 535.858.87-8.052c.136-1.26-.279-1.399-.927-.31l-6.856 11.532c-.216.363-.049.658.374.658h3.031l-.87 8.052c-.136 1.26.279 1.399.927.309l6.856-11.531c.216-.363.048-.658-.374-.658h-3.031Z"/></svg>

resources/web2/assets/assets/arrow.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" style="isolation:isolate" viewBox="305.118 110.478 32 32"><path fill="none" d="M305.118 110.478h32v32h-32v-32Z"/><path d="m322.26 126.052-5.963-5.962a1.48 1.48 0 1 1 2.093-2.093l7.63 7.63c.47.47.47 1.233 0 1.703l-7.63 7.629a1.48 1.48 0 0 1-2.093 0 1.482 1.482 0 0 1 0-2.093l5.963-5.962a.603.603 0 0 0 0-.852Z"/></svg>

resources/web2/assets/assets/auth-auth0.svg

@@ -0,0 +1 @@
+<svg width="32" height="32"><path d="M29.307 9.932 26.161 0H5.796L2.692 9.932c-1.802 5.75.042 12.271 5.089 16.021L16.01 32l8.208-6.068c5.005-3.75 6.911-10.25 5.089-16.021l-8.214 6.104 3.12 9.938-8.208-6.13-8.208 6.104 3.141-9.911-8.25-6.063 10.177-.063 3.146-9.891 3.141 9.87z"/></svg>

resources/web2/assets/assets/auth-facebook.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><rect width="512" height="512" fill="#1877f2" rx="76.8"/><path fill="#fff" d="m355.6 330 11.4-74h-71v-48c0-20.2 9.9-40 41.7-40H370v-63s-29.3-5-57.3-5c-58.5 0-96.7 35.4-96.7 99.6V256h-65v74h65v182h80V330z"/></svg>

resources/web2/assets/assets/chat2.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="#fff"><path d="M12 2c5.523 0 10 4.477 10 10s-4.477 10-10 10a9.96 9.96 0 0 1-4.644-1.142l-4.29 1.117a.85.85 0 0 1-1.037-1.036l1.116-4.289A9.959 9.959 0 0 1 2 12C2 6.477 6.477 2 12 2Zm1.252 11H8.75l-.102.007a.75.75 0 0 0 0 1.486l.102.007h4.502l.101-.007a.75.75 0 0 0 0-1.486L13.252 13Zm1.998-3.5h-6.5l-.102.007a.75.75 0 0 0 0 1.486L8.75 11h6.5l.102-.007a.75.75 0 0 0 0-1.486L15.25 9.5Z"/></svg>

resources/web2/assets/assets/close.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" style="isolation:isolate" viewBox="679.559 521.772 32 32"><path fill="none" d="M679.559 521.772h32v32h-32v-32Z"/><path d="m695.559 536.034-5.305-5.305a1.229 1.229 0 1 0-1.738 1.738l5.305 5.305-5.305 5.305a1.229 1.229 0 0 0 0 1.738 1.23 1.23 0 0 0 1.738 0l5.305-5.305 5.305 5.305a1.229 1.229 0 1 0 1.738-1.738l-5.305-5.305 5.305-5.305a1.229 1.229 0 1 0-1.738-1.738l-5.305 5.305Z"/></svg>

resources/web2/assets/assets/folder.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" style="isolation:isolate" viewBox="129.858 75.669 32 32"><path fill="none" d="M129.858 75.669h32v32h-32v-32Z"/><path d="M138.617 99.535H153.1a2.76 2.76 0 0 0 2.758-2.758V89.32a2.76 2.76 0 0 0-2.758-2.759h-5.397a.552.552 0 0 1-.552-.552v-.827a1.38 1.38 0 0 0-1.379-1.38h-5.776c-.761 0-1.816.437-2.355.976l-.808.808c-.538.538-.975 1.593-.975 2.354v8.837a2.76 2.76 0 0 0 2.759 2.758Z"/></svg>

resources/web2/assets/assets/home.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" style="isolation:isolate" viewBox="13.554 106.603 32 32"><path fill="none" d="M13.554 106.603h32v32h-32v-32Z"/><path d="M32.944 132.507h3.661a1 1 0 0 0 1-1v-7.837h2.335c.552 0 .683-.316.293-.707l-9.972-9.971a.999.999 0 0 0-1.414 0l-9.971 9.971c-.391.391-.259.707.293.707h2.334v7.837a1 1 0 0 0 1 1h3.661a1 1 0 0 0 1-1v-2.966a.5.5 0 0 1 .5-.5h3.78a.5.5 0 0 1 .5.5v2.966c0 .552.449 1 1 1Z"/></svg>

resources/web2/assets/assets/insecure.svg

@@ -0,0 +1 @@
+<svg viewBox="0 0 347.97 347.97"><path fill="none" stroke="red" stroke-width="14.827" d="M317.469 61.615c-59.442 0-104.976-16.082-143.489-51.539-38.504 35.457-84.04 51.539-143.479 51.539 0 92.337-20.177 224.612 143.479 278.324 163.661-53.717 143.489-185.992 143.489-278.324z"/><g fill="red"><path d="m238.802 115.023-111.573 114.68-8.6-8.367L230.2 106.656z"/><path d="m125.559 108.093 114.68 111.572-8.368 8.601-114.68-111.572z"/></g></svg>

resources/web2/assets/assets/mac.svg

@@ -0,0 +1 @@
+<svg viewBox="0 0 384 512"><path fill="#fff" d="M318.7 268.7c-.2-36.7 16.4-64.4 50-84.8-18.8-26.9-47.2-41.7-84.7-44.6-35.5-2.8-74.3 20.7-88.5 20.7-15 0-49.4-19.7-76.4-19.7C63.3 141.2 4 184.8 4 273.5q0 39.3 14.4 81.2c12.8 36.7 59 126.7 107.2 125.2 25.2-.6 43-17.9 75.8-17.9 31.8 0 48.3 17.9 76.4 17.9 48.6-.7 90.4-82.5 102.6-119.3-65.2-30.7-61.7-90-61.7-91.9zm-56.6-164.2c27.3-32.4 24.8-61.9 24-72.5-24.1 1.4-52 16.4-67.9 34.9-17.5 19.8-27.8 44.3-25.6 71.9 26.1 2 49.9-11.4 69.5-34.3z"/></svg>

resources/web2/assets/assets/message_24dp_5F6368.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="-4 -4 32 32" width="24px" fill="#5f6368"><path d="M0 0h24v24H0z" fill="none"/><path d="M20 2H4c-1.1 0-1.99.9-1.99 2L2 22l4-4h14c1.1 0 2-.9 2-2V4c0-1.1-.9-2-2-2zm-2 12H6v-2h12v2zm0-3H6V9h12v2zm0-3H6V6h12v2z"/></svg>

resources/web2/assets/assets/screen.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" style="isolation:isolate" viewBox="321.118 40.669 32 32"><path fill="none" d="M321.118 40.669h32v32h-32v-32Z"/><path d="M344.588 47.817h-14.94a3.764 3.764 0 0 0-3.761 3.764v10.176a3.764 3.764 0 0 0 3.761 3.764h14.94a3.765 3.765 0 0 0 3.762-3.764V51.581a3.765 3.765 0 0 0-3.762-3.764Z"/></svg>

resources/web2/assets/assets/secure.svg

@@ -0,0 +1 @@
+<svg viewBox="0 0 347.97 347.97"><path fill="#3F7D46" d="M317.31 54.367c-59.376 0-104.86-16.964-143.33-54.367-38.461 37.403-83.947 54.367-143.32 54.367 0 97.405-20.155 236.94 143.32 293.6 163.48-56.666 143.33-196.2 143.33-293.6zm-155.2 171.41-47.749-47.756 21.379-21.378 26.37 26.376 50.121-50.122 21.378 21.378-71.499 71.502z"/></svg>

resources/web2/assets/assets/win.svg

@@ -0,0 +1 @@
+<svg viewBox="0 0 448 512"><path fill="#fff" d="m0 93.7 183.6-25.3v177.4H0V93.7zm0 324.6 183.6 25.3V268.4H0v149.9zm203.8 28L448 480V268.4H203.8v177.9zm0-380.6v180.1H448V32L203.8 65.7z"/></svg>

resources/web2/ffmpeg.js

@@ -0,0 +1,111 @@
+
+const ERROR_IMPORT_FAILURE = 'Failed to import FFmpeg core';
+
+let ffmpeg;
+let arrayBufferPool = [];
+const load = async ({ coreURL, wasmURL }) => {
+  const first = !ffmpeg;
+  try {
+    // when web worker type is `classic`.
+    importScripts([coreURL]);
+  } catch {
+    // when web worker type is `module`.
+    const module = await import(/* @vite-ignore */ coreURL);
+    self.createFFmpegCore = module.default;
+
+    if (!self.createFFmpegCore) {
+      throw ERROR_IMPORT_FAILURE;
+    }
+  }
+
+  try {
+    ffmpeg = await self.createFFmpegCore({
+      // Fix `Overload resolution failed.` when using multi-threaded ffmpeg-core.
+      // Encoded wasmURL and workerURL in the URL as a hack to fix locateFile issue.
+      mainScriptUrlOrBlob: `${coreURL}#${btoa(JSON.stringify({ wasmURL }))}`,
+    });
+  } catch(e) {
+    console.error(e);
+    throw ERROR_IMPORT_FAILURE;
+  }
+
+  return first;
+};
+
+const decode = async ({ codec, data }) => {
+  return ffmpeg.processFrame(codec, data, (_) =>{});
+};
+
+const recycle = (array) => {
+  ffmpeg.recycleFrame(array);
+}
+
+const close = () => {
+  ffmpeg.close();
+  ffmpeg = null;
+  arrayBufferPool = [];
+}
+
+// message handler is synchronous
+self.onmessage = async ({ data: { id, type, data } }) => {
+  try {
+    if (type !== "LOAD" && !ffmpeg) {
+      self.postMessage({
+        id,
+        type: "ERROR",
+        data: "FFmpeg not loaded",
+      });
+    } else if (type === "LOAD") {
+      const ret = await load(data);
+      self.postMessage({ id, type, data: ret });
+    } else if (type === "DECODE") {
+      // accept moved buffer first
+      if (data.arrayBuffer) {
+        arrayBufferPool.push(data.arrayBuffer);
+        if (arrayBufferPool.length > 8) {
+          arrayBufferPool.shift();
+        }
+      }
+      const ret = await decode(data);
+      if (ret === 0) {
+        var buffer = null;
+        while(arrayBufferPool.length > 0) {
+          var pop = arrayBufferPool.pop();
+          if (pop.byteLength  === ffmpeg.frameBuffer.data.length) {
+            buffer = pop;
+            break;
+          }
+        }
+        if (!buffer) {
+          buffer = new ArrayBuffer(ffmpeg.frameBuffer.data.length);
+          console.log("worker create arrayBuffer");
+        }
+        let array = new Uint8Array(buffer);
+        array.set(ffmpeg.frameBuffer.data);
+        self.postMessage({ id, type, data: {data: {data: buffer, yuvFormat: ffmpeg.frameBuffer.yuvFormat}}}, [buffer]);
+        recycle(ffmpeg.frameBuffer.data);
+      } else {
+        self.postMessage({
+          id,
+          type: "ERROR",
+          data: {},
+        });
+      }
+    } else if (type === "CLOSE") {
+      close();
+      self.postMessage({ id, type, data: {} });
+    } else {
+      self.postMessage({
+        id,
+        type: "ERROR",
+        data: `Unknown command: ${type}`,
+      });
+    }
+  } catch (e) {
+    self.postMessage({
+      id,
+      type: "ERROR",
+      data: e.toString(),
+    });
+  }
+};

resources/web2/index.html

@@ -0,0 +1,341 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <!--
+    If you are serving your web app in a path other than the root, change the
+    href value below to reflect the base path you are serving from.
+
+    The path provided below has to start and end with a slash "/" in order for
+    it to work correctly.
+
+    For more details:
+    * https://developer.mozilla.org/en-US/docs/Web/HTML/Element/base
+
+    This is a placeholder for base href that will be replaced by the value of
+    the `--base-href` argument provided to `flutter build`.
+  -->
+    <base href="/webclient2/" />
+
+    <meta charset="UTF-8" />
+    <meta content="IE=Edge" http-equiv="X-UA-Compatible" />
+    <meta name="description" content="Remote Desktop." />
+
+    <!-- iOS meta tags & icons -->
+    <meta name="apple-mobile-web-app-capable" content="yes" />
+    <meta name="apple-mobile-web-app-status-bar-style" content="black" />
+    <meta name="apple-mobile-web-app-title" content="RustDesk" />
+    <link rel="apple-touch-icon" href="icons/Icon-192.png?v=1a7ad736" />
+
+    <!-- Favicon -->
+    <link rel="icon" type="image/svg+xml" href="favicon.svg?v=8fcccd9a" />
+
+    <title>RustDesk</title>
+    <script src="/webclient-config/index.js"></script>
+    <link rel="manifest" href="manifest.json" />
+    <script type="module" crossorigin src="js/dist/index.js?v=3"></script>
+    <link rel="modulepreload" href="js/dist/vendor.js?v=0b990c6e" />
+    <style>
+      html,
+      body,
+      #root {
+        height: 100%;
+        margin: 0;
+        padding: 0;
+      }
+      #root {
+        background-repeat: no-repeat;
+        background-size: 100% auto;
+      }
+
+      .loading-title {
+        font-size: 1.1rem;
+      }
+
+      .loading-sub-title {
+        margin-top: 20px;
+        font-size: 1rem;
+        color: #888;
+      }
+
+      .page-loading-warp {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        padding: 26px;
+      }
+      .ant-spin {
+        position: absolute;
+        display: none;
+        -webkit-box-sizing: border-box;
+        box-sizing: border-box;
+        margin: 0;
+        padding: 0;
+        color: rgba(0, 0, 0, 0.65);
+        color: #1890ff;
+        font-size: 14px;
+        font-variant: tabular-nums;
+        line-height: 1.5;
+        text-align: center;
+        list-style: none;
+        opacity: 0;
+        -webkit-transition: -webkit-transform 0.3s
+          cubic-bezier(0.78, 0.14, 0.15, 0.86);
+        transition: -webkit-transform 0.3s cubic-bezier(0.78, 0.14, 0.15, 0.86);
+        transition: transform 0.3s cubic-bezier(0.78, 0.14, 0.15, 0.86);
+        transition: transform 0.3s cubic-bezier(0.78, 0.14, 0.15, 0.86),
+          -webkit-transform 0.3s cubic-bezier(0.78, 0.14, 0.15, 0.86);
+        -webkit-font-feature-settings: "tnum";
+        font-feature-settings: "tnum";
+      }
+
+      .ant-spin-spinning {
+        position: static;
+        display: inline-block;
+        opacity: 1;
+      }
+
+      .ant-spin-dot {
+        position: relative;
+        display: inline-block;
+        width: 20px;
+        height: 20px;
+        font-size: 20px;
+      }
+
+      .ant-spin-dot-item {
+        position: absolute;
+        display: block;
+        width: 9px;
+        height: 9px;
+        background-color: #1890ff;
+        border-radius: 100%;
+        -webkit-transform: scale(0.75);
+        -ms-transform: scale(0.75);
+        transform: scale(0.75);
+        -webkit-transform-origin: 50% 50%;
+        -ms-transform-origin: 50% 50%;
+        transform-origin: 50% 50%;
+        opacity: 0.3;
+        -webkit-animation: antspinmove 1s infinite linear alternate;
+        animation: antSpinMove 1s infinite linear alternate;
+      }
+
+      .ant-spin-dot-item:nth-child(1) {
+        top: 0;
+        left: 0;
+      }
+
+      .ant-spin-dot-item:nth-child(2) {
+        top: 0;
+        right: 0;
+        -webkit-animation-delay: 0.4s;
+        animation-delay: 0.4s;
+      }
+
+      .ant-spin-dot-item:nth-child(3) {
+        right: 0;
+        bottom: 0;
+        -webkit-animation-delay: 0.8s;
+        animation-delay: 0.8s;
+      }
+
+      .ant-spin-dot-item:nth-child(4) {
+        bottom: 0;
+        left: 0;
+        -webkit-animation-delay: 1.2s;
+        animation-delay: 1.2s;
+      }
+
+      .ant-spin-dot-spin {
+        -webkit-transform: rotate(45deg);
+        -ms-transform: rotate(45deg);
+        transform: rotate(45deg);
+        -webkit-animation: antrotate 1.2s infinite linear;
+        animation: antRotate 1.2s infinite linear;
+      }
+
+      .ant-spin-lg .ant-spin-dot {
+        width: 32px;
+        height: 32px;
+        font-size: 32px;
+      }
+
+      .ant-spin-lg .ant-spin-dot i {
+        width: 14px;
+        height: 14px;
+      }
+
+      @media all and (-ms-high-contrast: none), (-ms-high-contrast: active) {
+        .ant-spin-blur {
+          background: #fff;
+          opacity: 0.5;
+        }
+      }
+
+      @-webkit-keyframes antSpinMove {
+        to {
+          opacity: 1;
+        }
+      }
+
+      @keyframes antSpinMove {
+        to {
+          opacity: 1;
+        }
+      }
+
+      @-webkit-keyframes antRotate {
+        to {
+          -webkit-transform: rotate(405deg);
+          transform: rotate(405deg);
+        }
+      }
+
+      @keyframes antRotate {
+        to {
+          -webkit-transform: rotate(405deg);
+          transform: rotate(405deg);
+        }
+      }
+    </style>
+  </head>
+
+  <body>
+    <div id="root">
+      <div
+        id="div-background"
+        style="
+          display: flex;
+          flex-direction: column;
+          align-items: center;
+          justify-content: center;
+          height: 100%;
+          min-height: 420px;
+        "
+      >
+        <img src="./favicon.svg?v=8fcccd9a" alt="logo" width="256" />
+        <div class="page-loading-warp">
+          <div class="ant-spin ant-spin-lg ant-spin-spinning">
+            <span class="ant-spin-dot ant-spin-dot-spin">
+              <i class="ant-spin-dot-item"></i>
+              <i class="ant-spin-dot-item"></i>
+              <i class="ant-spin-dot-item"></i><i class="ant-spin-dot-item"></i>
+            </span>
+          </div>
+        </div>
+        <div
+          style="display: flex; align-items: center; justify-content: center"
+        >
+          <img src="./favicon.svg?v=8fcccd9a" width="32" style="margin-right: 8px" />
+          <span id="span-text">RustDesk Web Client V2 Preview</span>
+        </div>
+      </div>
+    </div>
+    <!-- This script installs service_worker.js to provide PWA functionality to
+       application. For more information, see:
+       https://developers.google.com/web/fundamentals/primers/service-workers -->
+    <script>
+      const systemTheme = window.matchMedia("(prefers-color-scheme: dark)")
+        .matches
+        ? "dark"
+        : "light";
+      const myTheme = localStorage.getItem("wc-option:local:theme");
+      const them = myTheme || systemTheme;
+
+      const divBackground = document.querySelector("#div-background");
+      if (divBackground) {
+        divBackground.style.backgroundColor = them === "dark" ? "#000" : "#fff";
+      }
+      const spanConsole = document.querySelector("#span-text");
+      if (spanConsole) {
+        spanConsole.style.color = them === "dark" ? "#fff" : "#000";
+      }
+
+      const serviceWorkerVersion = "3267265270";
+      var scriptLoaded = false;
+      function loadMainDartJs() {
+        if (scriptLoaded) {
+          return;
+        }
+        scriptLoaded = true;
+        var scriptTag = document.createElement("script");
+        scriptTag.src = "main.dart.js?v=6d46937e";
+        scriptTag.type = "application/javascript";
+        document.body.append(scriptTag);
+      }
+
+      if ("serviceWorker" in navigator) {
+        // Service workers are supported. Use them.
+        window.addEventListener("load", function () {
+          // Wait for registration to finish before dropping the <script> tag.
+          // Otherwise, the browser will load the script multiple times,
+          // potentially different versions.
+          var serviceWorkerUrl =
+            "flutter_service_worker.js?v=" + serviceWorkerVersion;
+          navigator.serviceWorker.register(serviceWorkerUrl).then((reg) => {
+            function waitForActivation(serviceWorker) {
+              serviceWorker.addEventListener("statechange", () => {
+                if (serviceWorker.state == "activated") {
+                  console.log("Installed new service worker.");
+                  loadMainDartJs();
+                }
+              });
+            }
+            if (!reg.active && (reg.installing || reg.waiting)) {
+              // No active web worker and we have installed or are installing
+              // one for the first time. Simply wait for it to activate.
+              waitForActivation(reg.installing || reg.waiting);
+            } else if (!reg.active.scriptURL.endsWith(serviceWorkerVersion)) {
+              // When the app updates the serviceWorkerVersion changes, so we
+              // need to ask the service worker to update.
+              console.log("New service worker available.");
+              reg.update();
+              waitForActivation(reg.installing);
+            } else {
+              // Existing service worker is still good.
+              console.log("Loading app from service worker.");
+              loadMainDartJs();
+            }
+          });
+
+          // If service worker doesn't succeed in a reasonable amount of time,
+          // fallback to plaint <script> tag.
+          setTimeout(() => {
+            if (!scriptLoaded) {
+              console.warn(
+                "Failed to load app from service worker. Falling back to plain <script> tag."
+              );
+              loadMainDartJs();
+            }
+          }, 4000);
+        });
+      } else {
+        // Service workers not supported. Just drop the <script> tag.
+        loadMainDartJs();
+      }
+    </script>
+    <script src="libs/stream/ponyfill.min.js"></script>
+    <script src="libs/stream/StreamSaver.min.js"></script>
+    <script src="libs/firebase-app.js?8.10.1"></script>
+    <script src="libs/firebase-analytics.js?8.10.1"></script>
+
+    <script>
+      // Your web app's Firebase configuration
+      // For Firebase JS SDK v7.20.0 and later, measurementId is optional
+      const firebaseConfig = {
+        apiKey: "AIzaSyCgehIZk1aFP0E7wZtYRRqrfvNiNAF39-A",
+        authDomain: "rustdesk.firebaseapp.com",
+        databaseURL: "https://rustdesk.firebaseio.com",
+        projectId: "rustdesk",
+        storageBucket: "rustdesk.appspot.com",
+        messagingSenderId: "768133699366",
+        appId: "1:768133699366:web:d50faf0792cb208d7993e7",
+        measurementId: "G-9PEH85N6ZQ",
+      };
+
+      // Initialize Firebase
+      firebase.initializeApp(firebaseConfig);
+      firebase.analytics();
+    </script>
+  </body>
+</html>

resources/web2/js/dist/ljw.js

@@ -0,0 +1,82 @@
+window._gwen = {}
+window._gwen.kv = {}
+const apiserver = localStorage.getItem('api-server')
+
+function stringToUint8Array(str) {
+    var arr = [];
+    for (var i = 0, j = str.length; i < j; ++i) {
+        arr.push(str.charCodeAt(i));
+    }
+
+    var tmpUint8Array = new Uint8Array(arr);
+    return tmpUint8Array
+}
+
+function getQueryVariable() {
+    const query = window.location.hash.substring(3);
+    const vars = query.split("&");
+    for (var i = 0; i < vars.length; i++) {
+        var pair = vars[i].split("=");
+        window._gwen.kv[pair[0]] = pair[1]
+    }
+}
+
+getQueryVariable()
+
+const id = window._gwen.kv.id || ''
+if (id) {
+    localStorage.setItem('remote-id', id)
+}
+const share_token = window._gwen.kv.share_token || ''
+if (share_token) {
+    fetch(apiserver + "/api/shared-peer", {
+        method: 'POST',
+        headers: {
+            'Content-Type': 'application/json',
+        },
+        body: JSON.stringify({share_token})
+    }).then(res => res.json()).then(res => {
+        if (res.code === 0) {
+            localStorage.setItem('custom-rendezvous-server', res.data.id_server)
+            localStorage.setItem('key', res.data.key)
+            const peer = res.data.peer
+            localStorage.setItem('remote-id', peer.info.id)
+            peer.tmppwd = stringToUint8Array(window.atob(peer.tmppwd)).toString()
+            const oldPeers = JSON.parse(localStorage.getItem('peers')) || {}
+            oldPeers[peer.info.id] = peer
+            localStorage.setItem('peers', JSON.stringify(oldPeers))
+        }
+    })
+}
+
+let fetching = false
+
+export function getServerConf(token) {
+    if (!token) {
+        return
+    }
+    const prefix = 'wc-'
+    console.log('getServerConf', token)
+    if (fetching) {
+        return
+    }
+    fetching = true
+    fetch(apiserver + "/api/server-config-v2", {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/json',
+                'Authorization': 'Bearer ' + token
+            }
+        }
+    ).then(res => res.json()).then(res => {
+        fetching = false
+        if (res.code === 0) {
+            if (!localStorage.getItem(prefix + 'custom-rendezvous-server') || !localStorage.getItem('key')) {
+                localStorage.setItem(prefix + 'custom-rendezvous-server', res.data.id_server)
+                localStorage.setItem(prefix + 'key', res.data.key)
+            }
+        }
+    }).catch(_ => {
+        fetching = false
+    })
+}

resources/web2/manifest.json

@@ -0,0 +1,35 @@
+{
+    "name": "rustdesk",
+    "short_name": "rustdesk",
+    "start_url": ".",
+    "display": "standalone",
+    "background_color": "#0175C2",
+    "theme_color": "#0175C2",
+    "description": "Remote Desktop.",
+    "orientation": "portrait-primary",
+    "prefer_related_applications": false,
+    "icons": [
+        {
+            "src": "icons/Icon-192.png",
+            "sizes": "192x192",
+            "type": "image/png"
+        },
+        {
+            "src": "icons/Icon-512.png",
+            "sizes": "512x512",
+            "type": "image/png"
+        },
+        {
+            "src": "icons/Icon-maskable-192.png",
+            "sizes": "192x192",
+            "type": "image/png",
+            "purpose": "maskable"
+        },
+        {
+            "src": "icons/Icon-maskable-512.png",
+            "sizes": "512x512",
+            "type": "image/png",
+            "purpose": "maskable"
+        }
+    ]
+}