hex

storetext policies
zip first
2023-03-29 20:39:29 +08:00 · 2023-03-29 16:11:59 +08:00 · 2023-03-23 11:34:41 +08:00
7 changed files with 220 additions and 99 deletions
--- a/.env.development
+++ b/.env.development
@@ -1,6 +1,6 @@
 NODE_ENV = developement
 VUE_APP_BASE_NAME = developement
 VUE_APP_BASE_URL = http://localhost:8080
-VUE_APP_NOTE_MAX_COUNT = 409600
-VUE_APP_NOTE_MAX_DESC = 400K
+VUE_APP_NOTE_MAX_COUNT = 131072
+VUE_APP_NOTE_MAX_DESC = 128K

--- a/.env.production
+++ b/.env.production
@@ -1,5 +1,5 @@
 NODE_ENV = production
 VUE_APP_BASE_NAME = production
 VUE_APP_BASE_URL = https://flagnote.com
-VUE_APP_NOTE_MAX_COUNT = 409600
-VUE_APP_NOTE_MAX_DESC = 400K
+VUE_APP_NOTE_MAX_COUNT = 131072
+VUE_APP_NOTE_MAX_DESC = 128K
--- a/src/api/note.js
+++ b/src/api/note.js
@@ -1,7 +1,7 @@
 import axios from "axios";
 import { getStoreKey } from "@/api/lock";
 import storage from "@/libs/storage";
-import { md5, wrap} from "@/libs/secret";
+import { md5, wrap, convertHexStringToUint8Array} from "@/libs/secret";
 import NoteConstant from "@/libs/constants";

 axios.interceptors.response.use(undefined, (err) => {
@@ -48,8 +48,13 @@ export function saveNote(noteForm, secret) {
    });
  }

-  let bufferArrary = eval("[" + note.text + "]");
-  let array = Uint8Array.from(bufferArrary);
+  // let bufferArrary = eval("[" + note.text + "]");
+  // let array = Uint8Array.from(bufferArrary);
+
+  // let encoder = new TextEncoder()
+  // let array = encoder.encode(note.text)
+  let array = convertHexStringToUint8Array(note.text)
+
  let blob = new Blob([array], { type: "application/octet-stream" });
  let form = new FormData();
  form.append("file", blob, noteForm.key);
--- a/src/libs/secret.js
+++ b/src/libs/secret.js
@@ -4,6 +4,43 @@ import pako from "pako";

 const wasmFlate = window.wasm_bindgen;

+
+CryptoJS.enc.Uint8Array = {
+
+  /**
+  * WordArray转Uint8Array
+  * @param wordArray
+  * @returns {Uint8Array}
+  */
+  stringify: function (wordArray) {
+    var len = wordArray.words.length,
+      u8_array = new Uint8Array(len << 2),
+      offset = 0, word, i;
+    for (i = 0; i < len; i++) {
+      word = wordArray.words[i];
+      u8_array[offset++] = word >> 24;
+      u8_array[offset++] = (word >> 16) & 0xff;
+      u8_array[offset++] = (word >> 8) & 0xff;
+      u8_array[offset++] = word & 0xff;
+    }
+    return u8_array;
+  },
+
+  /**
+  * Uint8Array转WordArray
+  * @param u8arr
+  * @returns {WordArray}
+  */
+  parse: function (u8arr) {
+    var len = u8arr.length;
+    var words = [];
+    for (var i = 0; i < len; i++) {
+      words[i >>> 2] |= (u8arr[i] & 0xff) << (24 - (i % 4) * 8);
+    }
+    return CryptoJS.lib.WordArray.create(words, len);
+  }
+};
+
 /**
 * @word 要加密的内容
 * @keyWord String  服务器随机返回的关键字
@@ -11,14 +48,14 @@ const wasmFlate = window.wasm_bindgen;

 export function wrap(text, secretKey) {
  text = "FLAGNOTE#" + text;
-  let result = aesEncrypt(text, secretKey);
-  result = noteZip(result);
+  let ui8ary = noteZip(text);
+  let result = aesEncrypt(convertUint8ArrayToWordArray(ui8ary), secretKey);
  return result;
 }

-export function unwrap(storeText, secretKey) {
-  let result = noteUnzip(storeText);
-  result = aesDecrypt(result, secretKey);
+export function unwrap(text, secretKey) {
+  let wdary = aesDecrypt(text, secretKey);
+  let result = noteUnzip(convertWordArrayToUint8Array(wdary));
  if (result.startsWith("FLAGNOTE#")) {
    return result.substring(9);
  }
@@ -37,39 +74,37 @@ export function aesEncrypt(word, keyWord) {
  let key = CryptoJS.enc.Utf8.parse(keyWord);
  let encrypted = CryptoJS.AES.encrypt(word, key, {
    mode: CryptoJS.mode.ECB,
-    padding: CryptoJS.pad.Pkcs7,
+    padding: CryptoJS.pad.ZeroPadding,
  });
-  return encrypted.toString();
+  return encrypted.ciphertext.toString();
 }

 //解密
 export function aesDecrypt(word, keyWord) {
-
  let key = CryptoJS.enc.Utf8.parse(keyWord);
-  let decrypt = CryptoJS.AES.decrypt(word, key, {
+  var srcs = CryptoJS.enc.Hex.parse(word);
+  let decrypt = CryptoJS.AES.decrypt({
+    ciphertext: srcs
+  }, key, {
    mode: CryptoJS.mode.ECB,
-    padding: CryptoJS.pad.Pkcs7,
+    padding: CryptoJS.pad.ZeroPadding,
  });
-  return CryptoJS.enc.Utf8.stringify(decrypt).toString();
+  return decrypt;
 }

 //base64 encode
-export function encode(text) {
-  return Buffer.from(text, 'utf-8').toString('base64');
-}
+// export function encode(text) {
+//   return Buffer.from(text, 'utf-8').toString('base64');
+// }

 //base64 decode
-export function decode(text) {
-  return Buffer.from(text,'base64').toString('utf-8');
-}
+// export function decode(text) {
+//   return Buffer.from(text,'base64').toString('utf-8');
+// }

-export function noteUnzip(text) {
-  let charData = text.split(",").map(function (x) {
-    return parseInt(x);
-  });
-  let binData = new Uint8Array(charData);
-  let data = unzip(binData);
-  text   = String.fromCharCode.apply(null, new Uint8Array(data));
+export function noteUnzip(wdary) {
+  let data = unzip(wdary);
+  let text = new TextDecoder().decode(data);
  return text;
 }

@@ -80,51 +115,77 @@ export function noteZip(text) {
  return text;
 }

-export function zip(data){
-   if(wasmFlate.__wbindgen_wasm_module){
-     return wasmFlate.gzip_encode_raw(data);
-   }
+export function zip(data) {
+  if (wasmFlate.__wbindgen_wasm_module) {
+    return wasmFlate.gzip_encode_raw(data);
+  }

  return pako.gzip(data);
 }

-export function unzip(data){
-  if(wasmFlate.__wbindgen_wasm_module){
+export function unzip(data) {
+  if (wasmFlate.__wbindgen_wasm_module) {
    return wasmFlate.gzip_decode_raw(data);
  }

  return pako.ungzip(data);
 }

-// function convertWordArrayToUint8Array(wordArray) {
-// 	var len = wordArray.words.length,
-// 		u8_array = new Uint8Array(len << 2),
-// 		offset = 0, word, i
-// 	;
-// 	for (i=0; i<len; i++) {
-// 		word = wordArray.words[i];
-// 		u8_array[offset++] = word >> 24;
-// 		u8_array[offset++] = (word >> 16) & 0xff;
-// 		u8_array[offset++] = (word >> 8) & 0xff;
-// 		u8_array[offset++] = word & 0xff;
-// 	}
-// 	return u8_array;
-// }
+function convertWordArrayToUint8Array(wordArray) {

-// function convertUint8ArrayToWordArray(u8Array) {
-// 	var words = [], i = 0, len = u8Array.length;
- 
-// 	while (i < len) {
-// 		words.push(
-// 			(u8Array[i++] << 24) |
-// 			(u8Array[i++] << 16) |
-// 			(u8Array[i++] << 8)  |
-// 			(u8Array[i++])
-// 		);
-// 	}
- 
-// 	return {
-// 		sigBytes: words.length * 4,
-// 		words: words
-// 	};
-// }
+  let rr = CryptoJS.enc.Uint8Array.stringify(wordArray);
+  return rr;
+  // console.log(rr)
+
+
+  // var len = wordArray.words.length,
+  //   u8_array = new Uint8Array(len << 2),
+  //   offset = 0, word, i
+  //   ;
+  // for (i = 0; i < len; i++) {
+  //   word = wordArray.words[i];
+  //   u8_array[offset++] = word >> 24;
+  //   u8_array[offset++] = (word >> 16) & 0xff;
+  //   u8_array[offset++] = (word >> 8) & 0xff;
+  //   u8_array[offset++] = word & 0xff;
+  // }
+  // return u8_array;
+}
+
+function convertUint8ArrayToWordArray(u8Array) {
+
+  let rr = CryptoJS.enc.Uint8Array.parse(u8Array);
+  return rr;
+  // console.log(rr)
+
+  // var words = [], i = 0, len = u8Array.length;
+
+  // while (i < len) {
+  //   words.push(
+  //     (u8Array[i++] << 24) |
+  //     (u8Array[i++] << 16) |
+  //     (u8Array[i++] << 8) |
+  //     (u8Array[i++])
+  //   );
+  // }
+
+  // return {
+  //   sigBytes: words.length * 4,
+  //   words: words
+  // };
+}
+
+export function convertHexStringToUint8Array(hexString) {
+  var result = [];
+  for (var i = 0; i < hexString.length; i += 2) {
+    result.push(parseInt(hexString.substr(i, 2), 16));
+  }
+  return Uint8Array.from(result);
+  // Uint8Array.from(hexString.match(/.{1,2}/g).map((byte) => parseInt(byte, 16)));
+}
+
+export function convertUint8ArrayToHexString(byteArray) {
+  return Array.prototype.map.call(byteArray, function(byte) {
+    return ('0' + (byte & 0xFF).toString(16)).slice(-2);
+  }).join('');
+}
--- a/src/views/EditNote.vue
+++ b/src/views/EditNote.vue
@@ -113,10 +113,9 @@
              <Button-group vertical size="large">
                <Button aria-label="create note" type="error" style="border-radius: 0px;font-size: 24px;"
                  @click="createNote(); switchMenu(); " icon="md-add"></Button>
-                
-                <Button aria-label="crop" v-show="model.showDownloadText" type="error" 
-                 style="border-radius: 0px;font-size: 24px;" @click="saveImage();switchMenu();"
-                 icon="md-crop"></Button>
+
+                <Button aria-label="crop" v-show="model.showDownloadText" type="error"
+                  style="border-radius: 0px;font-size: 24px;" @click="saveImage(); switchMenu();" icon="md-crop"></Button>

                <Button aria-label="download text" v-show="model.showDownloadText" type="error"
                  style="border-radius: 0px;font-size: 24px;" @click="downLoadText(); switchMenu();"
@@ -144,7 +143,7 @@
              :lg="{ span: 18, offset: 3 }" :xl="{ span: 16, offset: 4 }" :xxl="{ span: 16, offset: 4 }">
            <Card :padding="0">
              <Form :model="noteForm" :label-width="80">
-                <div  ref="html2canvas" id="wrapper" style="border-left: 2px solid #ed4014;">
+                <div ref="html2canvas" id="wrapper" style="border-left: 2px solid #ed4014;">
                  <Input element-id="noteText" type="textarea" :border="false" v-model="noteForm.text" autofocus
                    :autosize="{ minRows: 30, maxRows: 409600 }" :placeholder="$t('content.noteTip')" @input="recordText"
                    @on-keydown="recordEventKdown" />
@@ -192,7 +191,7 @@ import { unwrap } from '../libs/secret'
 import { saveNote } from "@/api/note";
 import { getStoreKey } from "@/api/lock";
 import storage from "@/libs/storage";
-import { setStoreText,setNewStoreText } from "@/libs/noteStorage";
+import { setStoreText, setNewStoreText } from "@/libs/noteStorage";
 import { saveAs } from 'file-saver';
 import { isWeixin } from "@/libs/utils";
 import NoteConstant from "@/libs/constants";
@@ -231,12 +230,15 @@ export default {
      toTopState: false,
      showMenuState: false,
      showHeaderShade: false,
-      pageSession: '',
      errorInfo: '',
+      lastEditTime: 0,
+      backStoreTextInterval: null,
+      lastStoreCount: 0,
+      lastStoreTime: 0,
    }
  },
  created() {
-    this.pageSession = new Date().getTime();
+    this.editTime = new Date().getTime();

    // read $route
    this.noteForm.key = this.$route.params.name;
@@ -272,7 +274,7 @@ export default {
      // }

      storage.local.setText(storeKey, "0|" + this.secret.cipher + "|0|" + this.state.initTime + "|");
-      storage.session.delete(keyMeta.key+".keyMeta");
+      storage.session.delete(keyMeta.key + ".keyMeta");
    } else {
      // second edit
      let noteMeta = this.$route.meta.noteMeta;
@@ -290,6 +292,10 @@ export default {
      }
    }

+    this.lastStoreCount = this.noteForm.text.length;
+    this.lastEditTime = new Date().getTime();
+    this.lastStoreTime = this.lastEditTime;
+
    this.bindCtrlAllEvent();
    this.bindToTopEvent();

@@ -310,12 +316,15 @@ export default {
    const someOtherEl = document.querySelector('#wrapper');

    myObserver.observe(someOtherEl);
+
+    window.addEventListener('beforeunload', e => this.beforeunloadHandler(e))
  },
  updated() {
  },
  beforeDestroy() {
  },
  destroyed() {
+    window.removeEventListener('beforeunload', e => this.beforeunloadHandler(e))
  },
  computed: {},
  watch: {},
@@ -352,7 +361,49 @@ export default {
        return;
      }

-      setStoreText(this.noteForm, this.state, this.secret);
+      let nowEditCount = this.noteForm.text.length;
+      let nowEditTime = new Date().getTime();
+
+      if (nowEditCount < 1024) {
+        setStoreText(this.noteForm, this.state, this.secret);
+        this.lastStoreTime = nowEditTime;
+        this.lastStoreCount = nowEditCount;
+      } else {
+        if (null == this.backStoreTextInterval) {
+          this.backStoreTextInterval = window.setInterval(this.backStoreFunction(), 500);
+        }
+      }
+
+      this.lastEditTime = nowEditTime;
+    },
+    backStoreFunction() {
+      let that = this;
+      return function () {
+        that.backStoreText(that);
+      }
+    },
+    backStoreText(that) {
+      let nowEditCount = that.noteForm.text.length;
+      let nowEditTime = new Date().getTime();
+      if (Math.abs(nowEditCount - that.lastStoreCount) > 10) {
+        setStoreText(that.noteForm, that.state, that.secret);
+        that.lastStoreTime = that.lastEditTime;
+        that.lastStoreCount = nowEditCount;
+      } else {
+        if (nowEditTime - that.lastEditTime >= 1000 && nowEditTime - that.lastEditTime < 20000) {
+          if (that.lastEditTime != that.lastStoreTime) {
+            setStoreText(that.noteForm, that.state, that.secret);
+            that.lastStoreTime = that.lastEditTime;
+            that.lastStoreCount = nowEditCount;
+          }
+        } else if (nowEditTime - that.lastEditTime >= 20000) {
+          if (that.backStoreTextInterval != null) {
+            let ivl = that.backStoreTextInterval;
+            that.backStoreTextInterval = null;
+            window.clearInterval(ivl);
+          }
+        }
+      }
    },
    // recordEventKup(event) {
    // let tn = event.currentTarget.value;
@@ -392,7 +443,7 @@ export default {
        }

        this.noteForm.text = event.currentTarget.value;
-        setStoreText(this.noteForm, this.state, this.secret);
+        this.recordText();

      } else if (event.ctrlKey && (event.which == 13)) {
        //save
@@ -439,16 +490,16 @@ export default {

          that.state.commited = 1;
          setStoreText(this.noteForm, this.state, this.secret);
-          
+
          location.reload();
          this.state.locking = 0;
        } else {
          alert(res.data.code);
          this.model.submitting = false;
          this.state.locking = 0;
-          if(res.data.code=="100013"||res.data.code=="800001"){
+          if (res.data.code == "100013" || res.data.code == "800001") {
            let key = setNewStoreText(this.noteForm);
-            location.href="/"+key;
+            location.href = "/" + key;
          }

        }
@@ -511,24 +562,24 @@ export default {

      let that = this;
      let a = document.createElement('a');
-      html2canvas(canvasID,{
-        scale: 1, 
-        windowWidth: parseInt(document.getElementById("noteText").offsetWidth)+2,
+      html2canvas(canvasID, {
+        scale: 1,
+        windowWidth: parseInt(document.getElementById("noteText").offsetWidth) + 2,
        onclone: (clonedDocument) => {
          let nt = clonedDocument.getElementById("noteText");
          const div = clonedDocument.createElement('div')
          div.innerText = nt.value

-          div.style.color="black";
+          div.style.color = "black";
          div.style.padding = "10px";
          div.style.textAlign = "left";
          div.style.wordBreak = "break-word";
          div.style.whiteSpace = "pre-wrap";
          div.style.verticalAlign = "top";
-          div.style.fontSize ="15px";
-          div.style.width= "100%";
-          div.style.border="0px";
-          div.style.fontFamily="'Helvetica Neue', Helvetica, 'PingFang SC', 'Hiragino Sans GB', 'Microsoft YaHei', '微软雅黑', Arial, sans-serif";
+          div.style.fontSize = "15px";
+          div.style.width = "100%";
+          div.style.border = "0px";
+          div.style.fontFamily = "'Helvetica Neue', Helvetica, 'PingFang SC', 'Hiragino Sans GB', 'Microsoft YaHei', '微软雅黑', Arial, sans-serif";

          nt.style.display = 'none'

@@ -550,6 +601,9 @@ export default {
        document.body.removeChild(a);
      });
    },
+    beforeunloadHandler() {
+      this.recordText();
+    },
  }
 }
 </script>
--- a/src/views/ViewNote.vue
+++ b/src/views/ViewNote.vue
@@ -336,7 +336,7 @@

 <script>

-import { md5, unwrap } from "@/libs/secret";
+import { md5, unwrap, convertUint8ArrayToHexString} from "@/libs/secret";
 import { getStoreKey } from "@/api/lock";
 import { deleteNote, getNoteBlob } from "@/api/note";
 import storage from "@/libs/storage";
@@ -589,8 +589,9 @@ export default {
              return;
            }

-            var bytes = new Uint8Array(e.target.result);
-            let bytesString = bytes.join(",");
+            // let decoder = new TextDecoder();
+            // let bytesString = decoder.decode(e.target.result);
+            let bytesString = convertUint8ArrayToHexString(new Uint8Array(e.target.result));
            that.noteForm.text = unwrap(bytesString, that.secret.secretKey);
            //that.noteForm.escapeText = getEscapeText(that.noteForm.text);

--- a/vue.config.js
+++ b/vue.config.js
@@ -6,10 +6,10 @@ module.exports = defineConfig({

  assetsDir: 'static',
  productionSourceMap: false,
-  
+
  configureWebpack: (config) => {
-    config.experiments = { asyncWebAssembly: true,syncWebAssembly:true }
-    
+    config.experiments = { asyncWebAssembly: true, syncWebAssembly: true }
+

    config.externals = {
      'vue': 'Vue',
@@ -24,8 +24,8 @@ module.exports = defineConfig({
      "file-saver": 'saveAs',
      "clipboard": "ClipboardJS",
      "vue-i18n": "VueI18n",
-      "html2canvas":"html2canvas",
-      "wasm_flate":"wasm_flate"
+      "html2canvas": "html2canvas",
+      "wasm_flate": "wasm_flate"
    };

    // 为生产环境修改配置
@@ -68,7 +68,7 @@ module.exports = defineConfig({
    proxy: {
      "/note": {
        target: "https://flagnote.com/", // 后台接口域名
-//        target: "http://localhost:10000/", // 后台接口域名
+        //        target: "http://localhost:10000/", // 后台接口域名
        secure: false, // 如果是https接口，需要配置这个参数
        changeOrigin: true, //是否跨域
        pathRewrite: {
Author	SHA1	Message	Date
Jesse-Ma	9f1a0b75e3	hex	2023-03-29 20:39:29 +08:00
Jesse-Ma	0de98e660b	storetext policies	2023-03-29 16:11:59 +08:00
Jesse-Ma	b017e7bda1	zip first	2023-03-23 11:34:41 +08:00