From d43d3e3dfc83076d452d3fe07ada57cbfe48a4b7 Mon Sep 17 00:00:00 2001
From: James Feng Cao <jamesfengcao@torapp.info>
Date: Fri, 26 May 2023 15:48:51 +0800
Subject: [PATCH] add udrop

---
 en/changelog/index.html                  |  6 +--
 en/index.xml                             |  2 +-
 en/pccopy/index.html                     |  6 +--
 en/searchurl/bingAI/js/bingChatHub.js    |  2 +-
 en/searchurl/bingAI/js/generateImages.js |  7 ++-
 en/searchurl/cloudflare/redirect.js      | 68 +++++++++++++++++++-----
 en/sitemap.xml                           | 22 ++++----
 en/topposts/index.xml                    |  2 +-
 sitemap.xml                              |  2 +-
 9 files changed, 80 insertions(+), 37 deletions(-)

diff --git a/en/changelog/index.html b/en/changelog/index.html
index fa4b2c9..9142d9e 100644
--- a/en/changelog/index.html
+++ b/en/changelog/index.html
@@ -47,7 +47,7 @@
 <p><a href="https://github.com/torappinfo/uweb/releases/tag/v1">github</a></p>
 <p><a href="https://sourceforge.net/projects/uwebbrowser/files/v1/">sourceforge</a></p>
 <p><a href="https://my.powerfolder.com/getlink/fi61cC6VHjK72tfufmnLAz/">powerfolder</a></p>
-<p><a href="https://u.pcloud.link/publink/show?code=kZXFGdVZ4tBRn1r2yn8yjJUGmT0ecQlRu4e7">pcloud</a></p>
+<p><a href="https://www.udrop.com/folder/08ba413230f465ca0901bef68e857c0b/uweb">udrop</a></p>
 <p><a href="https://releases.pagure.org/uweb/">pagure</a></p>
 <h4 id="main-featuresreadmeindexhtml"><a href="../readme/index.html">Main features</a></h4>
 <h4 id="change-logs">Change logs</h4>
@@ -79,8 +79,8 @@
 </ul>
 
 </div>
-<p>Last Modified: 23 May 2023<br>
-enhance default.select with clipboard output<br>
+<p>Last Modified: 26 May 2023<br>
+add udrop<br>
 <pre></pre>
 </p>
 <script>
diff --git a/en/index.xml b/en/index.xml
index 4654386..336feca 100644
--- a/en/index.xml
+++ b/en/index.xml
@@ -208,7 +208,7 @@ uweb, termux &amp;amp; history versions
 github
 sourceforge
 powerfolder
-pcloud
+udrop
 pagure
 Main features Change logs 1004: bookmarklet &amp;quot;Show as html&amp;quot; to support clipboard site &amp;quot;netcut.cn&amp;quot;.
 998: Bookmarklets to support CSP sites.
diff --git a/en/pccopy/index.html b/en/pccopy/index.html
index 225d879..281ad96 100644
--- a/en/pccopy/index.html
+++ b/en/pccopy/index.html
@@ -57,7 +57,7 @@
     
   </ul>
   <p>Click the following links to install menus for long pressing the button &quot;link&quot;:<br>
-<a href="i:0gdefault.select::html2clip:html/clip:cat%0A">Copy selected text with html format to clipboard</a></p>
+<a href="i:0gdefault.select::copyHtml:html/clip:%0A">Copy selected text with html format to clipboard</a></p>
 <p><a href="i:0gdefault.select::Home:/uweb:printf file://data/data/info.torapp.uweb/files/home5.search%5C location.href=%5C%22i:15;cat;printf %5C%22%0A">Search with home screen</a></p>
 <p><a href="i:0gdefault.select::google Translate:/uweb:printf 'https://translate.google.com/?sl=auto&tl=en&op=translate&text=';cat|tr ' ' '%2B'%0A">google Translate</a></p>
 <p><a href="i:0gdefault.select::bing Translate:/uweb:printf 'https://cn.bing.com/translator/?from=&to=en&text=';cat|tr ' ' '%2B'%0A">bing translate</a></p>
@@ -91,8 +91,8 @@ To use ssh or scp, users need to install uweb compatible Termux provided on the
 PCs need command &quot;xsel&quot; available to operate on copy/paste.</p>
 
 </div>
-<p>Last Modified: 23 May 2023<br>
-enhance default.select with clipboard output<br>
+<p>Last Modified: 25 May 2023<br>
+rework cf/redirect.js<br>
 <pre></pre>
 </p>
 <script>
diff --git a/en/searchurl/bingAI/js/bingChatHub.js b/en/searchurl/bingAI/js/bingChatHub.js
index b3d72d0..e981ca7 100644
--- a/en/searchurl/bingAI/js/bingChatHub.js
+++ b/en/searchurl/bingAI/js/bingChatHub.js
@@ -168,7 +168,7 @@ class Chat {
     try {
       //let restsrstUrl = 'wss://sydney.bing.com/sydney/ChatHub';
       //if (this.chatWithMagic==true)
-      let restsrstUrl = URLTrue(this.magicUrl.replace('http', 'ws'), "sydney/ChatHub");
+      let restsrstUrl = this.magicUrl.replace('http', 'ws')+"sydney/ChatHub";
       
       let chatWebSocket = new WebSocket(restsrstUrl);
       chatWebSocket.onopen = () => {
diff --git a/en/searchurl/bingAI/js/generateImages.js b/en/searchurl/bingAI/js/generateImages.js
index 866afd0..fbed9c4 100644
--- a/en/searchurl/bingAI/js/generateImages.js
+++ b/en/searchurl/bingAI/js/generateImages.js
@@ -16,7 +16,9 @@ async function generateImages(text,requestId,countF){
     theUrls.append('q', text);
     theUrls.append('iframeid', requestId);
     let theUrl = magicUrl+`images/create?${theUrls.toString()}`;
-    let response  = await fetch(theUrl);
+    let response  = await fetch(theUrl,
+      {"sec-fetch-site": "same-origin",
+       "referer": "https://www.bing.com/search?q=bingAI"});
     let html = (await response.text());
     //let cookieID = response.headers.get('cookieID');
 
@@ -40,6 +42,7 @@ async function generateImages(text,requestId,countF){
     let ur = urr[1];
     ur = ur.replaceAll('&amp;','&');
     let imgPageHtmlUrl = magicUrl + `${ur}`;
+    let options = {"sec-fetch-site":"same-origin",             "referer":"https://www.bing.com/images/create?partner=sydney&showselective=1&sude=1&kseed=7000"};
     for(let count = 1;count<=20;count++){
         if((!!countF)&&(typeof countF =='function')){
             countF(count);
@@ -47,7 +50,7 @@ async function generateImages(text,requestId,countF){
         await sleep(3000);
         let imgPageHtml;
         try{
-            imgPageHtml = (await (await fetch(imgPageHtmlUrl)).text());
+          imgPageHtml = (await (await fetch(imgPageHtmlUrl,options)).text());
         }catch(e){
             console.error(e);
         }
diff --git a/en/searchurl/cloudflare/redirect.js b/en/searchurl/cloudflare/redirect.js
index 34008ee..a3348d6 100644
--- a/en/searchurl/cloudflare/redirect.js
+++ b/en/searchurl/cloudflare/redirect.js
@@ -3,25 +3,65 @@ export default {
     let url = req.url;
     let iSlash = url.indexOf('/',11);
     let nUrl = url.substring(iSlash+1);
-    return goUrl(req, nUrl);
+    if(nUrl.startsWith("ws"))
+      return await websocketHandler(req, nUrl);
+    return await goUrl(req, nUrl);
   }
 }
 
-function goUrl(request, url) {
+async function goUrl(request, url) {
   let fp = {
     method: request.method,
-    headers: {}
+  };
+  fp.headers = new Headers(request.headers);
+  for(var i = 2; i < arguments.length-1; i=i+2){
+    fp.headers[arguments[i]] = arguments[i+1];
   }
-  let reqHeaders = new Headers(request.headers);
-  let dropHeaders = ["cookie","user-agent","accept","accept-language"];
-  let he = reqHeaders.entries();
-  for (let h of he) {
-    let key = h[0],
-	value = h[1];
-    if (dropHeaders.includes(key)) {
-      fp.headers[key] = value;
-    }
-  }
-  return fetch(url, fp);
+  return await fetch(url, fp);
 }
 
+async function handleSession(req, serverWebSocket, url) {
+  let isAccept = false;
+  //let ws = new WebSocket(url);
+  let resp = await goUrl(req, url);
+  let ws = resp.webSocket;
+  if (!ws) {
+    throw new Error("server didn't accept WebSocket");
+  }
+  ws.accept();
+  
+  serverWebSocket.addEventListener("message", event => {
+    ws.send(event.data);
+  });
+  ws.addEventListener("message", event => {
+    serverWebSocket.send(event.data)
+  });
+  ws.addEventListener("open", event => {
+    isAccept = true;
+    serverWebSocket.accept();
+  })
+  ws.addEventListener("close", event => {
+    serverWebSocket.close(event.code, event.reason);
+  })
+  ws.addEventListener("error", event => {
+    if(!isAccept){
+      serverWebSocket.accept();
+    }
+    serverWebSocket.close();
+  });
+  serverWebSocket.addEventListener("error", event => {
+    serverWebSocket.close();
+  })
+  serverWebSocket.addEventListener("close",event => {
+    ws.close(event.code, event.reason);
+  });
+}
+
+async function websocketHandler(req, url){
+  const [client, server] = Object.values(new WebSocketPair())
+  await handleSession(req, server, url);
+  return new Response(null, {
+    status: 101,
+    webSocket: client
+  });
+}
diff --git a/en/sitemap.xml b/en/sitemap.xml
index a4e6a3e..cdc7a77 100644
--- a/en/sitemap.xml
+++ b/en/sitemap.xml
@@ -3,7 +3,7 @@
   xmlns:xhtml="http://www.w3.org/1999/xhtml">
   <url>
     <loc>/en/_posts/</loc>
-    <lastmod>2023-05-23T16:42:12+08:00</lastmod>
+    <lastmod>2023-05-25T14:58:48+08:00</lastmod>
     <xhtml:link
                 rel="alternate"
                 hreflang="zh"
@@ -45,7 +45,7 @@
                 />
   </url><url>
     <loc>/en/tags/</loc>
-    <lastmod>2023-05-23T16:42:12+08:00</lastmod>
+    <lastmod>2023-05-25T14:58:48+08:00</lastmod>
     <xhtml:link
                 rel="alternate"
                 hreflang="zh"
@@ -58,7 +58,7 @@
                 />
   </url><url>
     <loc>/en/</loc>
-    <lastmod>2023-05-23T16:42:12+08:00</lastmod>
+    <lastmod>2023-05-26T15:47:44+08:00</lastmod>
     <xhtml:link
                 rel="alternate"
                 hreflang="zh"
@@ -113,7 +113,7 @@
                 />
   </url><url>
     <loc>/en/topposts/</loc>
-    <lastmod>2023-05-23T16:21:17+08:00</lastmod>
+    <lastmod>2023-05-26T15:47:44+08:00</lastmod>
     <xhtml:link
                 rel="alternate"
                 hreflang="zh"
@@ -210,7 +210,7 @@
                 />
   </url><url>
     <loc>/en/changelog/</loc>
-    <lastmod>2023-05-23T16:21:17+08:00</lastmod>
+    <lastmod>2023-05-26T15:47:44+08:00</lastmod>
   </url><url>
     <loc>/en/sitemap/</loc>
     <lastmod>2023-02-01T09:52:11+08:00</lastmod>
@@ -304,10 +304,10 @@
                 />
   </url><url>
     <loc>/en/tags/clipboard/</loc>
-    <lastmod>2023-05-23T16:42:12+08:00</lastmod>
+    <lastmod>2023-05-25T14:58:48+08:00</lastmod>
   </url><url>
     <loc>/en/tags/pc/</loc>
-    <lastmod>2023-05-23T16:42:12+08:00</lastmod>
+    <lastmod>2023-05-25T14:58:48+08:00</lastmod>
     <xhtml:link
                 rel="alternate"
                 hreflang="zh"
@@ -320,7 +320,7 @@
                 />
   </url><url>
     <loc>/en/tags/ssh/</loc>
-    <lastmod>2023-05-23T16:42:12+08:00</lastmod>
+    <lastmod>2023-05-25T14:58:48+08:00</lastmod>
     <xhtml:link
                 rel="alternate"
                 hreflang="zh"
@@ -333,7 +333,7 @@
                 />
   </url><url>
     <loc>/en/tags/termux/</loc>
-    <lastmod>2023-05-23T16:42:12+08:00</lastmod>
+    <lastmod>2023-05-25T14:58:48+08:00</lastmod>
     <xhtml:link
                 rel="alternate"
                 hreflang="zh"
@@ -346,7 +346,7 @@
                 />
   </url><url>
     <loc>/en/pccopy/</loc>
-    <lastmod>2023-05-23T16:42:12+08:00</lastmod>
+    <lastmod>2023-05-25T14:58:48+08:00</lastmod>
     <xhtml:link
                 rel="alternate"
                 hreflang="zh"
@@ -359,7 +359,7 @@
                 />
   </url><url>
     <loc>/en/tags/windows/</loc>
-    <lastmod>2023-05-23T16:42:12+08:00</lastmod>
+    <lastmod>2023-05-25T14:58:48+08:00</lastmod>
     <xhtml:link
                 rel="alternate"
                 hreflang="zh"
diff --git a/en/topposts/index.xml b/en/topposts/index.xml
index ff7a0c8..b1b5478 100644
--- a/en/topposts/index.xml
+++ b/en/topposts/index.xml
@@ -63,7 +63,7 @@ uweb, termux &amp;amp; history versions
 github
 sourceforge
 powerfolder
-pcloud
+udrop
 pagure
 Main features Change logs 1004: bookmarklet &amp;quot;Show as html&amp;quot; to support clipboard site &amp;quot;netcut.cn&amp;quot;.
 998: Bookmarklets to support CSP sites.
diff --git a/sitemap.xml b/sitemap.xml
index f4b5054..c87183f 100644
--- a/sitemap.xml
+++ b/sitemap.xml
@@ -4,7 +4,7 @@
   <sitemap>
     <loc>en/sitemap.xml</loc>
     
-      <lastmod>2023-05-23T16:42:12+08:00</lastmod>
+      <lastmod>2023-05-26T15:47:44+08:00</lastmod>
     
   </sitemap>