From 4ad0ffe4aa7e21bba56bb5911da5db8106e780d8 Mon Sep 17 00:00:00 2001
From: waterbang <waterbang@qq.com>
Date: Thu, 26 Oct 2023 18:31:10 +0800
Subject: [PATCH] =?UTF-8?q?:bug:=20[plugin/cli]=20cli-0.4.8=20client-0.4.2?=
 =?UTF-8?q?=20=E9=80=9A=E4=BF=A1=E4=B8=AD=E9=9C=80=E8=A6=81=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E7=9A=84=E6=98=AF=E5=AF=B9=E6=96=B9=E7=9A=84=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plaoc/cli/plaoc.ts                                   |  2 +-
 plaoc/demo/src/pages/DwebServiceWorker.vue           | 12 ++----------
 plaoc/scripts/npm.cli.json                           |  2 +-
 plaoc/scripts/npm.client.json                        |  2 +-
 .../components/dweb-service-worker/FetchEvent.ts     |  5 +++--
 plaoc/src/server/http-external-server.ts             |  1 +
 6 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/plaoc/cli/plaoc.ts b/plaoc/cli/plaoc.ts
index 296a8db929..7b27c9219f 100755
--- a/plaoc/cli/plaoc.ts
+++ b/plaoc/cli/plaoc.ts
@@ -12,7 +12,7 @@ import { doWebAdvCommand } from "./web-dav.ts";
 await new Command()
   .name("@plaoc/cli")
   .description("plaoc front-end and back-end packaging tools.")
-  .version(`v0.4.7`)
+  .version(`v0.4.8`)
   .command("serve", doServeCommand)
   .example("developer service", "plaoc serve http://xx.xx.xx.xx:xxxx/")
 
diff --git a/plaoc/demo/src/pages/DwebServiceWorker.vue b/plaoc/demo/src/pages/DwebServiceWorker.vue
index 670e84dac3..daa8eab232 100644
--- a/plaoc/demo/src/pages/DwebServiceWorker.vue
+++ b/plaoc/demo/src/pages/DwebServiceWorker.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { onMounted, ref } from "vue";
 import LogPanel, { defineLogAction } from "../components/LogPanel.vue";
-import { dwebServiceWorker, toastPlugin, updateControllerPlugin } from "../plugin";
+import { dwebServiceWorker, updateControllerPlugin } from "../plugin";
 const $logPanel = ref<typeof LogPanel>();
 // let console: Console;
 
@@ -80,14 +80,6 @@ const download = defineLogAction(
   { name: "download", args: [], logPanel: $logPanel }
 );
 
-const check = defineLogAction(
-  async () => {
-    const { version } = await updateControllerPlugin.getVersion();
-    toastPlugin.show({ text: `当前版本：${version}` });
-  },
-  { name: "check", args: [], logPanel: $logPanel }
-);
-
 const message = ref("这里显示收到的消息");
 
 // 向desktop.dweb.waterbang.top.dweb 发送消息
@@ -100,6 +92,7 @@ const sayHi = async () => {
 };
 dwebServiceWorker.addEventListener("fetch", async (event) => {
   console.log("Dweb Service Worker fetch!", event);
+  console.log("xxxx=>", await event.getRemoteManifest());
   const url = new URL(event.request.url);
   if (url.pathname.endsWith("/say/hi")) {
     const hiMessage = url.searchParams.get("message");
@@ -135,7 +128,6 @@ const title = "Dweb Service Worker";
       <h2 class="card-title">下载测试</h2>
       <div class="justify-end card-actions btn-group">
         <button class="inline-block rounded-full btn btn-accent" @click="download">下载新版本</button>
-        <button class="inline-block rounded-full btn btn-accent" @click="check">检查版本升级</button>
       </div>
       <div>
         <progress class="w-56 progress progress-accent" :value="progress" max="100"></progress>
diff --git a/plaoc/scripts/npm.cli.json b/plaoc/scripts/npm.cli.json
index d8f5259633..9e4b318063 100644
--- a/plaoc/scripts/npm.cli.json
+++ b/plaoc/scripts/npm.cli.json
@@ -6,7 +6,7 @@
     "watchDir": "./src/cli",
     "denoShim": true,
     "name": "@plaoc/cli",
-    "version": "0.4.7",
+    "version": "0.4.8",
     "lib": [
       "ES2022",
       "DOM"
diff --git a/plaoc/scripts/npm.client.json b/plaoc/scripts/npm.client.json
index 3cf13710c7..db4fdae6b7 100644
--- a/plaoc/scripts/npm.client.json
+++ b/plaoc/scripts/npm.client.json
@@ -6,7 +6,7 @@
     "watchDir": "./src/client",
     "denoShim": false,
     "name": "@plaoc/plugins",
-    "version": "0.4.1",
+    "version": "0.4.2",
     "importMap": "./import_map.json",
     "lib": [
       "ES2022",
diff --git a/plaoc/src/client/components/dweb-service-worker/FetchEvent.ts b/plaoc/src/client/components/dweb-service-worker/FetchEvent.ts
index 2d106eb2a5..4b65149d13 100644
--- a/plaoc/src/client/components/dweb-service-worker/FetchEvent.ts
+++ b/plaoc/src/client/components/dweb-service-worker/FetchEvent.ts
@@ -11,8 +11,9 @@ export class ServiceWorkerFetchEvent extends Event {
   }
   /**查询连接者的信息 */
   async getRemoteManifest():Promise<$JmmAppInstallManifest> {
-    const { ipc } = this.fetchEvent;
-    const mmid = ipc.remote.mmid;
+    const { request } = this.fetchEvent;
+    const mmid = request.headers.get("x-Dweb-Host");
+    console.log("getRemoteManifest查询id=>",mmid)
     const res = await this.plugin.buildApiRequest("/query",{
       pathPrefix:"dns.std.dweb",
       search:{
diff --git a/plaoc/src/server/http-external-server.ts b/plaoc/src/server/http-external-server.ts
index b8b9d466b7..644d3dd8cb 100644
--- a/plaoc/src/server/http-external-server.ts
+++ b/plaoc/src/server/http-external-server.ts
@@ -178,6 +178,7 @@ export class Server_external extends HttpServer {
           }
           const ext_options = this._getOptions();
           // 请求跟外部app通信，并拿到返回值
+          event.headers.append("X-Dweb-Host",jsProcess.mmid)
           return await jsProcess.nativeFetch(
             `http://${ext_options.subdomain}.${mmid}:${ext_options.port}${event.pathname}${event.search}`,
             {