x

Author: liw003

src/ec.ts

@@ -121,10 +121,21 @@ class EC{
         return new Uint8Array(await subtle.exportKey('raw',result))
     }
 
-    base64Encode(arr:Uint8Array):string{
-        return base64js.fromByteArray(arr,76)
+    base64Encode(arr:Uint8Array,urlsafe = 0):string{
+        let r = base64js.fromByteArray(arr,76)
+        if (urlsafe) {
+            r = r.replace(/\+/g, '-')
+            r = r.replace(/\//g, '_')
+            r = r.replace(/=/g, '')
+        }
+        return r
     }
-    base64Decode(str:string):Uint8Array{
+    base64Decode(str:string,urlsafe = 0):Uint8Array{
+        if (urlsafe) {
+            str = str.replace(/-/g, '+')
+            str = str.replace(/_/g, '/')
+            str = str.replace(/=/g, '')
+        }
         return base64js.toByteArray(str)
     }
     async generateNewKeyPair(seckey ?:string): Promise<{private:string,public:string}>{

src/index.ts

@@ -1,6 +1,8 @@
 
 (async function () {
 
+  let g_urlsafe = 1 as 1|0
+
   interface InputData {
     prefix: string;
     pubkey: string;
@@ -65,7 +67,7 @@
     try {
       let te = new TextEncoder();
       let enc = await ec.encrypt(p, te.encode(text));
-      setCipherText(ec.base64Encode(enc));
+      setCipherText(ec.base64Encode(enc,g_urlsafe));
       return true;
     } catch (error) {
       setErrMsg(error as string);
@@ -111,7 +113,7 @@
       return;
     }
     try {
-      let arr = ec.base64Decode(base64);
+      let arr = ec.base64Decode(base64,g_urlsafe);
       let dec = await ec.decrypt(p, arr);
       let te = new TextDecoder();
       setPlainText(te.decode(dec));
@@ -259,6 +261,7 @@
 
 
     let msg = `
+    v2   
    ${G_Input?.prefix || ""} ${newLine}
    备份时间:${beijingtime()} ${newLine}
 
@@ -297,6 +300,7 @@
 
 
     let msg = `
+    v2-urlsafe
    ${G_Input?.prefix || ""}  ${newLine}
    备份时间:${beijingtime()} ${newLine}
 
@@ -334,14 +338,12 @@
     let jsonstring = JSON.stringify(s);
     let arr = new TextEncoder().encode(jsonstring);
     let dataBuff = await ec.encrypt(webPublic, arr);
-    let data = ec.base64Encode(dataBuff);
+    let data = ec.base64Encode(dataBuff,1);
 
-    // Convert to URL-safe base64 for data2
-    let data2 = regularBase64ToUrlSafe(data);
 
     let bookmark = `${location.origin}${
       location.pathname
-    }?t=${new Date().toISOString()}#&data2=${encodeURIComponent(data2)}`;
+    }?t=${new Date().toISOString()}#&data2=${encodeURIComponent(data)}`;
 
     let a = document.createElement("a");
     a.innerText = bookmark;
@@ -403,21 +405,6 @@
   btime.innerText = `Package:${__BUILD_MOD__} \n ${__BUILD_TIME__} `;
 
 
-  // Convert URL-safe base64 to regular base64
-  function urlSafeBase64ToRegular(urlSafeBase64: string): string {
-    return urlSafeBase64
-      .replace(/-/g, '+')
-      .replace(/_/g, '/');
-  }
-
-  // Convert regular base64 to URL-safe base64
-  function regularBase64ToUrlSafe(regularBase64: string): string {
-    return regularBase64
-      .replace(/\+/g, '-')
-      .replace(/\//g, '_')
-      .replace(/=/g, ''); // Remove padding
-  }
-
   (async function initDefaultValues() {
 
     console.log(location.hash);
@@ -428,7 +415,10 @@
 
     // Use data2 if available, otherwise use data
     if (data2) {
-      data = urlSafeBase64ToRegular(data2);
+      data = data2
+    }
+    if (data && !data2) {
+      g_urlsafe = 0
     }
 
     if (!data) {
@@ -438,7 +428,7 @@
     let ttlog = console.log;
     ttlog({ webPrivate, webPublic });
 
-    let plainBf = await ec.decrypt(webPrivate, ec.base64Decode(data));
+    let plainBf = await ec.decrypt(webPrivate, ec.base64Decode(data,g_urlsafe));
     let plain = new TextDecoder().decode(plainBf);
     ttlog(plain);
 

src/types.d.ts

@@ -65,8 +65,8 @@ declare interface  EC{
     decrypt(privateKeyB64:string,data:Uint8Array):Promise<Uint8Array>
     generateNewKeyPair(seckey ?:string): Promise<{private:string,public:string}>
 
-    base64Encode(arr:Uint8Array):string 
-    base64Decode(str:string):Uint8Array
+    base64Encode(arr:Uint8Array,urlsafe ?:1|0):string 
+    base64Decode(str:string,urlsafe ?:1|0):Uint8Array
   }
 declare function initEC():EC;