feat: make vera invite id invisible

vera 邀请链接中的ID改为隐式传参
Privoce · Mar 30, 2021 · adb2d30 · adb2d30
1 parent 06ac3f0
commit adb2d30
Show file tree

Hide file tree

Showing 6 changed files with 74 additions and 9 deletions.
diff --git a/public/crx/assets/option.js b/public/crx/assets/option.js
@@ -0,0 +1,29 @@
+chrome.storage.sync.get(null, function (items) {
+  // Notify that we saved.
+  console.log('all local items', items);
+  if (items) {
+    let fragments = document.createDocumentFragment();
+    Object.keys(items).forEach((key) => {
+      let item = document.createElement('li');
+      item.classList.add('item');
+      item.setAttribute('data-key', key);
+      item.style.cursor = 'pointer';
+      item.title = 'Click to remove';
+      item.innerHTML = items[key];
+      item.addEventListener('click', (evt) => {
+        console.log(evt.target);
+        let currItemEle = evt.target;
+        let key = currItemEle.dataset.key;
+        if (key) {
+          chrome.storage.sync.remove(key, (resp) => {
+            console.log('remove', resp);
+            currItemEle.remove();
+          });
+        }
+      });
+      fragments.appendChild(item);
+    });
+    let localList = document.querySelector('.locals');
+    localList.appendChild(fragments);
+  }
+});
diff --git a/public/crx/option.html b/public/crx/option.html
@@ -7,6 +7,10 @@
     <title>Portal Option</title>
   </head>
   <body>
-    Portal Option Page
+    <h1>Portal Option Page</h1>
+    <section>
+      <ul class="locals"></ul>
+    </section>
   </body>
+  <script src="./assets/option.js"></script>
 </html>
diff --git a/public/crx/vera/catch.invite.id.js b/public/crx/vera/catch.invite.id.js
@@ -0,0 +1,13 @@
+console.log('catch invite id');
+let url = new URL(location.href);
+let paths = url.pathname.split('/');
+let decodedUrl = decodeURIComponent(paths[paths.length - 1]);
+console.log('decodedUrl', decodedUrl);
+let id = new URLSearchParams(new URL(decodedUrl).search).get('portal-vera-id');
+console.log('catch the id', id);
+if (id) {
+  chrome.storage.sync.set({ pvid: id }, function () {
+    // Notify that we saved.
+    console.log('pvid saved', id);
+  });
+}
diff --git a/public/crx/vera/content_script.js b/public/crx/vera/content_script.js
@@ -4,5 +4,5 @@
   // const peerObj = await import(peerSrc);
   // console.log({ peerObj });
   const contentScript = await import(src);
-  contentScript.main(/* chrome: no need to pass it */);
+  await contentScript.main(/* chrome: no need to pass it */);
 })();
diff --git a/public/crx/vera/main.js b/public/crx/vera/main.js
@@ -2,8 +2,8 @@ import Widget from './models/Widget.js';
 import Panel from './models/Panel.js';
 import { peerKey, installCheckKey } from './models/config.js';
 // 初始化挂件
-export function main() {
-  const { pvid } = init();
+export async function main() {
+  const pvid = await init();
   const widget = new Widget(pvid);
   const inviteHandler = () => {
     console.log('portal vera id', pvid);
@@ -28,8 +28,21 @@ export function main() {
   widget.show();
 }
 const init = () => {
-  // localStorage.getItem()
-  document.documentElement.setAttribute(installCheckKey, 1);
-  let pvid = new URLSearchParams(location.search).get(peerKey) || null;
-  return { pvid };
+  return new Promise((resolve) => {
+    chrome.storage.sync.get(['pvid'], function (res) {
+      // Notify that we saved.
+      console.log('pvid from storage', res.pvid);
+      if (res.pvid) {
+        chrome.storage.sync.remove('pvid', () => {
+          console.log('pvid removed');
+        });
+        resolve(res.pvid);
+      } else {
+        resolve(null);
+      }
+    });
+  });
+  // document.documentElement.setAttribute(installCheckKey, 1);
+  // let pvid = new URLSearchParams(location.search).get(peerKey) || null;
+  // return { pvid };
 };
diff --git a/public/manifest.json b/public/manifest.json
@@ -2,7 +2,7 @@
   "name": "Portal - Home of Your Web Apps",
   "short_name": "Portal",
   "description": "像积木一样自由组建你的浏览器主页！",
-  "version": "1.8.22",
+  "version": "1.9.0",
   "manifest_version": 2,
   "homepage_url": "https://nicegoodthings.com/",
   "permissions": ["tabs", "identity", "history", "storage"],
@@ -27,6 +27,7 @@
   "content_scripts": [
     {
       "matches": ["<all_urls>"],
+      "exclude_matches": ["https://nicegoodthings.com/transfer/*"],
       "js": [
         "crx/vera/assets/authing.min.js",
         "crx/vera/assets/tf.min.js",
@@ -37,6 +38,11 @@
       ],
       "css": ["crx/vera/style.css"],
       "run_at": "document_idle"
+    },
+    {
+      "matches": ["https://nicegoodthings.com/transfer/*"],
+      "js": ["crx/vera/catch.invite.id.js"],
+      "run_at": "document_idle"
     }
   ],
   "web_accessible_resources": ["crx/vera/*"],