3 Commits

Author SHA1 Message Date
Jesse-Ma
89d099fecf delete files 2023-03-10 16:37:27 +08:00
Jesse-Ma
8ce9342b8e async way blocked :( 2023-03-10 13:42:36 +08:00
Jesse-Ma
11987b0a77 router done 2023-03-10 10:30:43 +08:00
18 changed files with 21892 additions and 1445 deletions

View File

@@ -1,6 +1,6 @@
NODE_ENV = developement
VUE_APP_BASE_NAME = developement
VUE_APP_BASE_URL = http://localhost:8080
VUE_APP_NOTE_MAX_COUNT = 131072
VUE_APP_NOTE_MAX_DESC = 128K
VUE_APP_NOTE_MAX_COUNT = 409600
VUE_APP_NOTE_MAX_DESC = 400K

View File

@@ -1,5 +1,5 @@
NODE_ENV = production
VUE_APP_BASE_NAME = production
VUE_APP_BASE_URL = https://flagnote.com
VUE_APP_NOTE_MAX_COUNT = 131072
VUE_APP_NOTE_MAX_DESC = 128K
VUE_APP_NOTE_MAX_COUNT = 409600
VUE_APP_NOTE_MAX_DESC = 400K

20618
package-lock.json generated Normal file

File diff suppressed because it is too large Load Diff

View File

@@ -11,11 +11,12 @@
},
"dependencies": {
"axios": "^0.27.2",
"bluebird": "^3.7.2",
"clipboard": "^2.0.11",
"crypto-js": "^4.1.1",
"escape-html": "^1.0.3",
"file-saver": "^2.0.5",
"html2canvas": "^1.4.1",
"localforage": "^1.10.0",
"pako": "^2.1.0",
"qrcodejs2": "^0.0.2",
"view-design": "^4.7.0",

View File

@@ -24,31 +24,29 @@
background-color: #dddddd
}
</style>
<script src="https://cdn.jsdelivr.net/npm/vue@2.7.14/dist/vue.min.js" rel="stylesheet"
<script src="https://cdn.jsdelivr.net/npm/vue@2.7.14/dist/vue.min.js"
type="text/javascript"></script>
<script src="https://cdn.jsdelivr.net/npm/vue-router@3.6.5/dist/vue-router.min.js" rel="stylesheet"
<script src="https://cdn.jsdelivr.net/npm/vue-router@3.6.5/dist/vue-router.min.js"
type="text/javascript"></script>
<script src="https://cdn.jsdelivr.net/npm/axios@0.27.2/dist/axios.min.js" rel="stylesheet"
<script src="https://cdn.jsdelivr.net/npm/axios@0.27.2/dist/axios.min.js"
type="text/javascript"></script>
<script src="https://cdn.jsdelivr.net/npm/view-design@4.7.0/dist/iview.min.js" rel="stylesheet"
<script src="https://cdn.jsdelivr.net/npm/view-design@4.7.0/dist/iview.min.js"
type="text/javascript"></script>
<script src="https://cdn.jsdelivr.net/npm/pako@2.1.0/dist/pako.min.js" rel="stylesheet"
<script src="https://cdn.jsdelivr.net/npm/pako@2.1.0/dist/pako.min.js"
type="text/javascript"></script>
<script src="https://cdn.jsdelivr.net/npm/crypto-js@4.1.1/crypto-js.min.js" rel="stylesheet"
<script src="https://cdn.jsdelivr.net/npm/crypto-js@4.1.1/crypto-js.min.js"
type="text/javascript"></script>
<script src="https://cdn.jsdelivr.net/npm/vue-i18n@8.21.1/dist/vue-i18n.min.js" rel="stylesheet"
<script src="https://cdn.jsdelivr.net/npm/vue-i18n@8.21.1/dist/vue-i18n.min.js"
type="text/javascript"></script>
<script src="https://cdn.jsdelivr.net/npm/file-saver@2.0.5/dist/FileSaver.min.js" rel="stylesheet"
<script src="https://cdn.jsdelivr.net/npm/file-saver@2.0.5/dist/FileSaver.min.js"
type="text/javascript"></script>
<script src="https://cdn.jsdelivr.net/npm/qrcodejs2@0.0.2/qrcode.min.js" rel="stylesheet"
<script src="https://cdn.jsdelivr.net/npm/qrcodejs2@0.0.2/qrcode.min.js"
type="text/javascript"></script>
<script src="https://cdn.jsdelivr.net/npm/clipboard@2.0.11/dist/clipboard.min.js" rel="stylesheet"
<script src="https://cdn.jsdelivr.net/npm/clipboard@2.0.11/dist/clipboard.min.js"
type="text/javascript"></script>
<script src="https://cdn.jsdelivr.net/npm/wasm-flate@1.0.2-browser/wasm_flate.min.js" rel="stylesheet"
<script src="https://cdn.jsdelivr.net/npm/wasm-flate@1.0.2-browser/wasm_flate.js"
type="text/javascript"></script>
<script src="https://cdn.jsdelivr.net/npm/html2canvas@1.4.1/dist/html2canvas.min.js" rel="stylesheet"
type="text/javascript"></script>
<script>
<script type="text/javascript">
window.wasm_flate_bg_path = "https://cdn.jsdelivr.net/npm/wasm-flate@1.0.2-browser/wasm_flate_bg.wasm"
</script>

View File

@@ -6,11 +6,18 @@
<meta name="renderer" content="webkit" />
<meta name="force-rendering" content="webkit" />
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
<meta name="viewport"
content="width=device-width,initial-scale=1.0, minimum-scale=1.0, maximum-scale=2.0, user-scalable=yes" />
<meta name="keywords" content="flagnote" />
<meta name="description" content="flag note" />
<meta name="theme-color" content="#ed4014" />
<meta name="format-detection" content="telephone=no,email=no,adress=no" />
<meta name="google" content="notranslate">
<meta http-equiv="Expires" content="0" />
<meta http-equiv="Pragma" content="no-cache" />
<meta http-equiv="Cache-control" content="no-cache" />
<meta http-equiv="Cache" content="no-cache" />
<link rel="icon" href="/static/favicon.png" />
<title>flagnote.com</title>
<style>
body {
@@ -18,7 +25,10 @@
}
</style>
<script>
const servicePath = "";
//const servicePath="https://flagnote.com";
function ajaxGet(url) {
let data = null;
let xmlhttp = new XMLHttpRequest();
@@ -52,12 +62,8 @@
let keyMeta = getKeyMeta();
if (keyMeta && keyMeta.key) {
sessionStorage.setItem(keyMeta.key + ".keyMeta", JSON.stringify(keyMeta));
location.href = "/" + keyMeta.key;
} else {
location.href = "/100006";
}
sessionStorage.setItem("keyMeta", JSON.stringify(keyMeta));
location.href = "/" + keyMeta.key;
</script>
</head>

View File

@@ -1,7 +1,7 @@
import axios from "axios";
import { getStoreKey } from "@/api/lock";
import storage from "@/libs/storage";
import { md5, wrap, convertHexStringToUint8Array} from "@/libs/secret";
import { md5, wrap } from "@/libs/secret";
import NoteConstant from "@/libs/constants";
axios.interceptors.response.use(undefined, (err) => {
@@ -17,10 +17,10 @@ axios.interceptors.response.use(undefined, (err) => {
}
});
export function saveNote(noteForm, secret) {
export async function saveNote(noteForm, secret) {
let storeKey = secret.storeKey;
let storeInfo = storage.local.getText(storeKey);
const storeInfo = await storage.local.getText(storeKey);
let starray = storeInfo.split("|");
if (starray[2] == "1") {
@@ -48,13 +48,8 @@ export function saveNote(noteForm, secret) {
});
}
// 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 bufferArrary = eval("[100,111,32,110,111,116,32," + note.text + ",100,111,32,101,118,105,108]");
let array = Uint8Array.from(bufferArrary);
let blob = new Blob([array], { type: "application/octet-stream" });
let form = new FormData();
form.append("file", blob, noteForm.key);
@@ -76,14 +71,13 @@ export function saveNote(noteForm, secret) {
});
}
export function deleteNote(key) {
export async function deleteNote(key) {
let storeKey = getStoreKey(key);
let storeInfo = storage.local.getText(storeKey);
const storeInfo = await storage.local.getText(storeKey);
let note = {
cipher: storeInfo.substring(2, 34),
key: key,
};
return axios({
url: NoteConstant.servicePath + "/note/" + key + "/delete",
method: "post",
@@ -102,6 +96,28 @@ export function getNoteBlob(key) {
});
}
export function getNoteMetaNew(key) {
let url = NoteConstant.servicePath + "/note/" + key + "/noteMeta";
return axios({
url: url,
method: "get",
ignoreError: 1,
original: true,
source: true,
});
}
export function getKeyMetaNew() {
let url = NoteConstant.servicePath + "/note/keyMeta";
return axios({
url: url,
method: "get",
ignoreError: 1,
original: true,
source: true,
});
}
export function getNoteMeta(key) {
let url = NoteConstant.servicePath + "/note/" + key + "/noteMeta";
let noteMeta = null;

View File

@@ -26,9 +26,6 @@ const zh = {
"100006": "服务器不可用!",
"100011": "笔记为空!",
"100012": "笔记过大,超过{0}!",
"100013": "The address is used, Copy to a new address.",
"100014": "The text has been modified.",
"800001": "Repetitive Submit!",
}
};
export default zh;

View File

@@ -1,4 +1,3 @@
import { getKeyMeta } from "@/api/note";
import { getStoreKey } from "@/api/lock";
import { wrap } from "@/libs/secret";
import storage from "@/libs/storage";
@@ -12,7 +11,7 @@ export function setStoreText(noteForm, state, secret) {
storeText = wrap(text, secret.secretKey);
}
storage.local.setText(
return storage.local.setText(
secret.storeKey,
state.lock +
"|" +
@@ -26,8 +25,7 @@ export function setStoreText(noteForm, state, secret) {
);
}
export function setNewStoreText(noteForm) {
let keyMeta =getKeyMeta();
export function setNewStoreText(noteForm,keyMeta) {
let storeKey = getStoreKey(keyMeta.key);
let text = noteForm.text;
@@ -38,7 +36,7 @@ export function setNewStoreText(noteForm) {
storeText = wrap(text, keyMeta.secretKey);
}
storage.local.setText(
return storage.local.setText(
storeKey,
"0|" +
keyMeta.cipher +
@@ -47,8 +45,6 @@ export function setNewStoreText(noteForm) {
"|" +
storeText
);
return keyMeta.key;
}
export function clearStoreText(key) {

View File

@@ -4,43 +4,6 @@ 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 服务器随机返回的关键字
@@ -48,14 +11,14 @@ CryptoJS.enc.Uint8Array = {
export function wrap(text, secretKey) {
text = "FLAGNOTE#" + text;
let ui8ary = noteZip(text);
let result = aesEncrypt(convertUint8ArrayToWordArray(ui8ary), secretKey);
let result = aesEncrypt(text, secretKey);
result = noteZip(result);
return result;
}
export function unwrap(text, secretKey) {
let wdary = aesDecrypt(text, secretKey);
let result = noteUnzip(convertWordArrayToUint8Array(wdary));
export function unwrap(storeText, secretKey) {
let result = noteUnzip(storeText);
result = aesDecrypt(result, secretKey);
if (result.startsWith("FLAGNOTE#")) {
return result.substring(9);
}
@@ -74,37 +37,39 @@ 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.ZeroPadding,
padding: CryptoJS.pad.Pkcs7,
});
return encrypted.ciphertext.toString();
return encrypted.toString();
}
//解密
export function aesDecrypt(word, keyWord) {
let key = CryptoJS.enc.Utf8.parse(keyWord);
var srcs = CryptoJS.enc.Hex.parse(word);
let decrypt = CryptoJS.AES.decrypt({
ciphertext: srcs
}, key, {
let decrypt = CryptoJS.AES.decrypt(word, key, {
mode: CryptoJS.mode.ECB,
padding: CryptoJS.pad.ZeroPadding,
padding: CryptoJS.pad.Pkcs7,
});
return decrypt;
return CryptoJS.enc.Utf8.stringify(decrypt).toString();
}
//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(wdary) {
let data = unzip(wdary);
let text = new TextDecoder().decode(data);
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));
return text;
}
@@ -115,77 +80,51 @@ 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) {
// 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;
// }
let rr = CryptoJS.enc.Uint8Array.stringify(wordArray);
return rr;
// console.log(rr)
// 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++])
// );
// }
// 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('');
}
// return {
// sigBytes: words.length * 4,
// words: words
// };
// }

View File

@@ -1,3 +1,5 @@
import localforage from "localforage";
class Storage {
constructor() {
this.session = new Session();
@@ -29,23 +31,23 @@ class Session {
class Local {
setObject(key, value) {
localStorage.setItem(key, JSON.stringify(value));
return localforage.setItem(key, JSON.stringify(value));
}
getObject(key) {
return JSON.parse(localStorage.getItem(key));
return JSON.parse(localforage.getItem(key));
}
delete(key) {
localStorage.removeItem(key);
return localforage.removeItem(key);
}
setText(key, value) {
localStorage.setItem(key, value);
return localforage.setItem(key, value);
}
getText(key) {
return localStorage.getItem(key);
return localforage.getItem(key);
}
getUseSize() {

View File

@@ -1,12 +1,15 @@
import Vue from 'vue'
import App from './App.vue'
import router from './router'
import getRouter from './router/'
import axios from 'axios'
import VueAxios from 'vue-axios'
import './plugins/iview.js'
import {Promise} from "bluebird";
import i18n from './i18n/'
import NoteConstant from "@/libs/constants";
axios.defaults.baseURL = NoteConstant.servicePath;
Vue.use(VueAxios, axios)
@@ -16,10 +19,12 @@ Vue.config.debug = debugFlag;
Vue.config.devtools = debugFlag;
Vue.config.productionTip = debugFlag;
new Vue({
i18n,
router,
render: h => h(App)
}).$mount('#app')
Promise.try(getRouter).then((router)=>{
new Vue({
i18n,
router,
render: h => h(App)
}).$mount('#app')
});

View File

@@ -1,127 +1,131 @@
import Vue from "vue";
import { getNoteMetaNew } from "@/api/note";
import VueRouter from "vue-router";
import EditNote from "@/views/EditNote.vue";
import ViewNote from "@/views/ViewNote.vue";
import ErrorRoute from "@/views/ErrorRoute.vue";
import ErrorNote from "@/views/ErrorNote.vue";
import { getNoteMeta } from "@/api/note";
import { getStoreKey } from "@/api/lock";
import storage from "@/libs/storage";
import { getStoreKey } from "@/api/lock";
Vue.use(VueRouter);
var keyMeta = null;
var noteMeta = null;
var errorMeta = null;
export default async function getRouter() {
let path = location.pathname;
let key = path.substring(1, path.length);
//let errorMeta = null;
function getKeyMetaParam() {
return keyMeta;
}
function getNoteMetaParam() {
return noteMeta;
}
function getErrorMetaParam() {
return errorMeta;
}
function getNoteView() {
if (errorMeta) {
return;
}
let path = location.pathname;
let key = path.substring(1, path.length);
keyMeta = storage.session.getObject(key+".keyMeta");
if (keyMeta && keyMeta.key) {
key = keyMeta.key;
}
let regKey = /^[abcdefhikmnopqstuvwxyz23456789]{16}$/;
if (!regKey.test(key)) {
errorMeta = 100002;
return ErrorNote;
}
if (keyMeta && keyMeta.key) {
//firstEdit
return EditNote;
}
//set noteMeta
noteMeta = getNoteMeta(key);
//server error
if (!noteMeta) {
errorMeta = 100006;
return ErrorNote;
}
//invalidated key
if (!noteMeta.key) {
errorMeta = 100002;
return ErrorNote;
}
//validated state
if (1 == noteMeta.state) {
return ViewNote;
}
//deleted
if (0 == noteMeta.state) {
let storeKey = getStoreKey(key);
storage.local.delete(storeKey);
// user deleted
if (noteMeta.ttl > 0) {
errorMeta = 100003;
return ErrorNote;
} else {// timeout
errorMeta = 100004;
return ErrorNote;
if (path == "/") {
//errorMeta = 100002;
return errorRouter(100002);
}
}
if (null == noteMeta.state) {
let storeKey = getStoreKey(key);
//if has storage , then edit
if (storage.local.getText(storeKey)) {
return EditNote;
} else {
//storage is empty
let df = storage.session.getText(storeKey + "_delete")
if (df) {//unsubmitted,user deleted.
errorMeta = 100003;
return ErrorNote;
} else {//unsubmitted
errorMeta = 100005;
return ErrorNote;
}
let keyMeta = storage.session.getObject("keyMeta");
storage.session.delete("keyMeta");
let regKey = /^[abcdefhikmnopqstuvwxyz23456789]{16}$/;
if (!regKey.test(key)) {
return errorRouter(100002);
}
}
// other exception
errorMeta = 100001;
return ErrorNote;
if (keyMeta && keyMeta.key) {
// if(document.referrer=="/"){
// }
return noteRouter(EditNote, keyMeta, null);
}
let resp = await getNoteMetaNew(key);
if (null == resp || null == resp.data) {
return errorRouter(100006);
}
let result = resp.data;
if (result.code != '000000') {
return errorRouter(parseInt(result.code));
}
let noteMeta = result.data;
if (null == noteMeta) {
return errorRouter(100001);
}
if (null == noteMeta.key) {
return errorRouter(100002);
}
//view
if (1 == noteMeta.state) {
return noteRouter(ViewNote, keyMeta, noteMeta);
}
//deleted
if (0 == noteMeta.state) {
let storeKey = getStoreKey(key);
storage.local.delete(storeKey);
// user deleted
if (noteMeta.ttl > 0) {
// errorMeta = 100003;
return errorRouter(100003);
} else {// timeout
// errorMeta = 100004;
return errorRouter(100004);
}
}
//edit or unsubmitted
if (null == noteMeta.state) {
let storeKey = getStoreKey(key);
const storeInfo = await storage.local.getText(storeKey);
//if has storage , then edit
if (null != storeInfo) {
return noteRouter(EditNote, keyMeta, noteMeta);
}
//storage is empty
let df = storage.session.getText(storeKey + "_delete")
if (df) {//unsubmitted,user deleted.
// errorMeta = 100003;
return errorRouter(100003);
} else {//unsubmitted
// errorMeta = 100005;
return errorRouter(100005);
}
}
return errorRouter(100001);
}
const routes = [
{ path: "/error_:code([0-9]{6})", component: ErrorNote },
{
path: "/:name([a-z0-9]{10,20})",
name: "note",
component: getNoteView(),
meta: { keyMeta: getKeyMetaParam(), noteMeta: getNoteMetaParam(), errorMeta: getErrorMetaParam() },
},
{ path: "/:path(.*)", component: ErrorRoute }
];
function noteRouter(noteView, keyMeta, noteMeta) {
const routes = [
{
path: "/:name([a-z0-9]{10,20})",
name: "note",
component: noteView,
meta: { keyMeta: keyMeta, noteMeta: noteMeta },
}
];
const router = new VueRouter({
routes,
mode: "history",
});
const router = new VueRouter({
routes,
mode: "history",
});
return router;
}
function errorRouter(errorCode) {
const routes = [
{
path: "/:name([a-z0-9]{10,20})",
name: "error",
component: ErrorNote,
errorMeta: errorCode
}
];
const router = new VueRouter({
routes,
mode: "history",
});
return router;
}
export default router;

View File

@@ -100,7 +100,7 @@
<Button-group size="large">
<Button aria-label="publish" type="error" :loading="model.submitting"
style="margin-left:5px; border-radius: 0px;font-size: 21px;" @click="submitNote()"
icon="md-cloud-upload"></Button>
icon="md-share"></Button>
<Button aria-label="menu" type="error" style="margin-left:3px; border-radius: 0px;font-size: 24px;"
@click="switchMenu()" @blur.native="hideMenu()" icon="md-menu"></Button>
@@ -113,12 +113,18 @@
<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 type="error" icon="md-refresh" style="border-radius: 0px;font-size: 14px;font-size: 24px;"
@click="refreshPage()"></Button>
-->
<Button aria-label="download text" v-show="model.showDownloadText" type="error"
style="border-radius: 0px;font-size: 24px;" @click="downLoadText(); switchMenu();"
style="border-radius: 0px;font-size: 24px;" @click="downLoadText(); switchMenu(); "
icon="md-download"></Button>
<Button aria-label="history text" v-show="model.showHistoryText" type="error"
style="border-radius: 0px;font-size: 24px;" @click="downLoadText(); switchMenu(); "
icon="md-download"></Button>
<Button type="error" icon="md-trash" style="border-radius: 0px;font-size: 24px;"
@@ -143,7 +149,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 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" />
@@ -157,7 +163,7 @@
</Content>
<Footer class="layout-footer-center">2023 &copy; flagnote.com</Footer>
<Footer class="layout-footer-center">2022 &copy; flagnote.com</Footer>
</Layout>
<Modal v-model="model.showDelete" width="360" footer-hide class-name="fnmodal" :styles="{ borderRadius: 0 }">
@@ -191,11 +197,11 @@ 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";
import html2canvas from "html2canvas";
import { getKeyMeta } from "@/api/note";
export default {
name: 'EditNote',
@@ -230,15 +236,12 @@ export default {
toTopState: false,
showMenuState: false,
showHeaderShade: false,
pageSession: '',
errorInfo: '',
lastEditTime: 0,
backStoreTextInterval: null,
lastStoreCount: 0,
lastStoreTime: 0,
}
},
created() {
this.editTime = new Date().getTime();
this.pageSession = new Date().getTime();
// read $route
this.noteForm.key = this.$route.params.name;
@@ -274,28 +277,27 @@ export default {
// }
storage.local.setText(storeKey, "0|" + this.secret.cipher + "|0|" + this.state.initTime + "|");
storage.session.delete(keyMeta.key + ".keyMeta");
} else {
// second edit
let noteMeta = this.$route.meta.noteMeta;
this.secret.secretKey = noteMeta.secretKey;
let storeInfo = storage.local.getText(storeKey);
let starray = storeInfo.split('|');
this.state.lock = parseInt(starray[0]);
this.secret.cipher = starray[1];
this.state.initTime = parseInt(starray[3]);
let that = this;
storage.local.getText(storeKey).then(function(storeInfo){
let starray = storeInfo.split('|');
that.state.lock = parseInt(starray[0]);
that.secret.cipher = starray[1];
that.state.initTime = parseInt(starray[3]);
//draw text;
if (starray[4]) {
that.noteForm.text = unwrap(starray[4], that.secret.secretKey);
}
});
//draw text;
if (starray[4]) {
this.noteForm.text = unwrap(starray[4], this.secret.secretKey);
}
}
this.lastStoreCount = this.noteForm.text.length;
this.lastEditTime = new Date().getTime();
this.lastStoreTime = this.lastEditTime;
this.bindCtrlAllEvent();
this.bindToTopEvent();
@@ -316,15 +318,12 @@ 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: {},
@@ -361,49 +360,7 @@ export default {
return;
}
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);
}
}
}
setStoreText(this.noteForm, this.state, this.secret);
},
// recordEventKup(event) {
// let tn = event.currentTarget.value;
@@ -443,16 +400,13 @@ export default {
}
this.noteForm.text = event.currentTarget.value;
this.recordText();
setStoreText(this.noteForm, this.state, this.secret);
} else if (event.ctrlKey && (event.which == 13)) {
//save
this.submitNote();
}
},
save() {
return saveNote(this.noteForm, this.secret);
},
validateForm() {
let text = this.noteForm.text;
if (text.length > NoteConstant.noteMaxCount) {
@@ -481,25 +435,28 @@ export default {
return;
}
setStoreText(this.noteForm, this.state, this.secret);
this.model.submitting = true;
let that = this;
this.save().then(res => {
saveNote(this.noteForm, this.secret).then(res => {
if (res.data && res.data.code == "000000") {
storage.session.setText(that.secret.storeKey + "_share", '1');
that.state.commited = 1;
setStoreText(this.noteForm, this.state, this.secret);
location.reload();
this.state.locking = 0;
setStoreText(this.noteForm, this.state, this.secret).then(function(){
location.reload();
});
} else {
alert(res.data.code);
this.model.submitting = false;
this.state.locking = 0;
if (res.data.code == "100013" || res.data.code == "800001") {
let key = setNewStoreText(this.noteForm);
location.href = "/" + key;
if(res.data.code=="100013"||res.data.code=="800001"){
let keyMeta = getKeyMeta();
setNewStoreText(this.noteForm,keyMeta).then(function () {
location.href="/"+keyMeta.key;
});
}
}
@@ -545,65 +502,7 @@ export default {
}
}
}
},
dataURLToBlob(dataurl) {
let arr = dataurl.split(',');
let mime = arr[0].match(/:(.*?);/)[1];
let bstr = atob(arr[1]);
let n = bstr.length;
let u8arr = new Uint8Array(n);
while (n--) {
u8arr[n] = bstr.charCodeAt(n);
}
return new Blob([u8arr], { type: mime });
},
saveImage() {
let canvasID = this.$refs["html2canvas"];
let that = this;
let a = document.createElement('a');
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.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";
nt.style.display = 'none'
nt.parentElement.parentElement.style.borderLeftColor = "white";
nt.parentElement.append(div)
}
}).then(canvas => {
let dom = document.body.appendChild(canvas);
dom.style.display = 'none';
a.style.display = 'none';
document.body.removeChild(dom);
let blob = that.dataURLToBlob(dom.toDataURL('image/png'));
a.setAttribute('href', URL.createObjectURL(blob));
a.setAttribute('download', that.noteForm.key + '.png');
document.body.appendChild(a);
a.click();
URL.revokeObjectURL(blob);
document.body.removeChild(a);
});
},
beforeunloadHandler() {
this.recordText();
},
}
}
}
</script>

View File

@@ -81,7 +81,7 @@
</Content>
<Footer class="layout-footer-center">2023 &copy; flagnote.com</Footer>
<Footer class="layout-footer-center">2022 &copy; flagnote.com</Footer>
</Layout>
</div>

View File

@@ -172,17 +172,17 @@
<img style="height:40px;float:left;cursor: pointer;" alt="refresh flagnote" src="/static/logo.png"
v-on:click="refreshPage()">
<!--
<div style="float:left;width:auto;vertical-align: center;">
<div style="font-size: 18px;
color: red;
line-height: 40px;
display: inline-block;
font-weight: bold;
height: 40px;">{{
state.ttlDesc
}}</div>
</div>
-->
<div style="float:left;width:auto;vertical-align: center;">
<div style="font-size: 18px;
color: red;
line-height: 40px;
display: inline-block;
font-weight: bold;
height: 40px;">{{
state.ttlDesc
}}</div>
</div>
-->
<div style="float:left;width:auto;">
@@ -220,19 +220,18 @@
<div id="noteMenu" :class="[showMenuState ? 'showBlock' : 'hideBlock']"
style="z-index: 100; position: absolute;top:43px;right:0px;left:auto;">
<Button-group vertical size="large">
<Button aria-label="new note" type="error" icon="md-add" style="border-radius: 0px;font-size: 24px;"
<Button type="error" icon="md-add" style="border-radius: 0px;font-size: 24px;"
@click="createNote(); switchMenu();"></Button>
<!--
<Button type="error" icon="md-refresh" style="border-radius: 0px;font-size: 24px;"
@click="refreshPage()"></Button>
-->
<Button aria-label="crop" v-show="model.showDownloadText" type="error" icon="md-crop"
style="border-radius: 0px;font-size: 24px;" @click="saveImage(); switchMenu();"></Button>
<Button type="error" icon="md-refresh" style="border-radius: 0px;font-size: 24px;"
@click="refreshPage()"></Button>
-->
<Button aria-label="download text" v-show="model.showDownloadText" type="error"
style="border-radius: 0px;font-size: 24px;" @click="downLoadText(); " icon="md-download"></Button>
style="border-radius: 0px;font-size: 24px;" @click="downLoadText(); switchMenu();"
icon="md-download"></Button>
<Button type="error" icon="md-trash" style="border-radius: 0px;font-size: 24px;"
@click="showDeleteModel(); switchMenu();"></Button>
@@ -255,9 +254,9 @@
<Col :xs="{ span: 24, offset: 0 }" :sm="{ span: 22, offset: 1 }" :md="{ span: 20, offset: 2 }"
:lg="{ span: 18, offset: 3 }" :xl="{ span: 16, offset: 4 }" :xxl="{ span: 16, offset: 4 }">
<Card :padding="0">
<div ref="html2canvas" id="wrapper" style="border-left: 2px solid white;">
<div id="wrapper" style="border-left: 2px solid white;">
<Input element-id="noteText" readonly type="textarea" :border="false" v-model="noteForm.text"
:autosize="{ minRows: 30, maxRows: 409600 }" :placeholder="$t('content.noteTip')" />
:autosize="{ minRows: 30, maxRows: 409600 }" :placeholder="$t('content.noteTip')" />
</div>
</Card>
</Col>
@@ -267,7 +266,7 @@
<Footer class="layout-footer-center">
2023 &copy; flagnote.com
2022 &copy; flagnote.com
</Footer>
</Layout>
@@ -275,11 +274,11 @@
<Modal v-model="model.showShare" width="360" footer-hide class-name="qrmodal" :styles="{ borderRadius: 0 }"
@on-cancel="closeShareModel">
<p style="text-align: center;
z-index: 1000;
position: absolute;
top: -2px;
left: 0px;
width: 100%;">
z-index: 1000;
position: absolute;
top: -2px;
left: 0px;
width: 100%;">
<Tag style="border-radius: 0px;" v-show="model.copyTip" color="#ed4014" text="">Url Copied.</Tag>
</p>
<p style="text-align: center;margin-top:20px;line-height:100%">
@@ -304,7 +303,7 @@
<p style="text-align: center;margin-top:10px;">
<Button type="error" style="border-radius: 0px;font-size:19px;" @click="closeTtlDeleteModel()">{{
$t("button.close")
$t("button.close")
}}</Button>
</p>
</Modal>
@@ -315,7 +314,7 @@
</p>
<p style="text-align: center;">
<Button type="error" :loading="model.deleting" style="border-radius: 0px;font-size:19px;" @click="dropNote()">{{
$t("button.yes")
$t("button.yes")
}}</Button>
</p>
</Modal>
@@ -326,17 +325,20 @@
</p>
<p style="text-align: center;">
<Button type="error" style="border-radius: 0px;font-size: 19px;" @click="cloaseErrorMessage()">{{
$t("button.close")
$t("button.close")
}}</Button>
</p>
</Modal>
</div>
</template>
<script>
import { md5, unwrap, convertUint8ArrayToHexString} from "@/libs/secret";
import { md5, unwrap } from "@/libs/secret";
import { getStoreKey } from "@/api/lock";
import { deleteNote, getNoteBlob } from "@/api/note";
import storage from "@/libs/storage";
@@ -345,7 +347,6 @@ import QRCode from "qrcodejs2";
import Clipboard from "clipboard";
import { saveAs } from 'file-saver';
import { isWeixin, getNoteUrl } from "@/libs/utils";
import html2canvas from "html2canvas";
export default {
name: 'ViewNote',
@@ -419,9 +420,13 @@ export default {
this.startClock();
storage.local.dynamicClear();
this.loadText();
let that = this;
storage.local.getText(this.secret.storeKey).then(function(storeInfo){
that.loadText(storeInfo);
});
storage.local.dynamicClear();
this.bindCtrlAllEvent();
this.bindCopyUrlEvent();
@@ -516,8 +521,9 @@ export default {
that.state.ttl = that.state.initTtl - (new Date().getTime() - that.state.initTime);
if (that.state.ttl <= 0) {
storage.local.delete(that.secret.storeKey);
location.reload();
storage.local.delete(that.secret.storeKey).then(function(){
location.reload();
});
}
}, 1000)
},
@@ -552,9 +558,10 @@ export default {
this.model.deleting = true;
let that = this;
deleteNote(this.noteForm.key).then(res => {
if (res.data && res.data.code == "000000") {
storage.local.delete(that.secret.storeKey);
location.reload();
if (res.data&&res.data.code=="000000") {
storage.local.delete(that.secret.storeKey).then(function(){
location.reload();
});
} else {
that.model.deleting = false;
}
@@ -562,11 +569,9 @@ export default {
alert(error);
});
},
loadText() {
loadText(storeInfo) {
let that = this;
let storeInfo = storage.local.getText(this.secret.storeKey);
let starray = [];
if (storeInfo) {
starray = storeInfo.split('|');
@@ -589,9 +594,9 @@ export default {
return;
}
// let decoder = new TextDecoder();
// let bytesString = decoder.decode(e.target.result);
let bytesString = convertUint8ArrayToHexString(new Uint8Array(e.target.result));
var bytes = new Uint8Array(e.target.result);
bytes = bytes.subarray(7,bytes.length-7);
let bytesString = bytes.join(",");
that.noteForm.text = unwrap(bytesString, that.secret.secretKey);
//that.noteForm.escapeText = getEscapeText(that.noteForm.text);
@@ -663,62 +668,6 @@ export default {
}
}
},
dataURLToBlob(dataurl) {
let arr = dataurl.split(',');
let mime = arr[0].match(/:(.*?);/)[1];
let bstr = atob(arr[1]);
let n = bstr.length;
let u8arr = new Uint8Array(n);
while (n--) {
u8arr[n] = bstr.charCodeAt(n);
}
return new Blob([u8arr], { type: mime });
},
saveImage() {
let canvasID = this.$refs["html2canvas"];
let that = this;
let a = document.createElement('a');
html2canvas(canvasID,{
scale: 1,
windowWidth: document.getElementById("noteText").offsetWidth,
onclone: (clonedDocument) => {
let nt = clonedDocument.getElementById("noteText");
const div = clonedDocument.createElement('div')
div.innerText = nt.value
div.style.color="black";
div.style.padding = "0px";
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";
nt.style.display = 'none'
nt.parentElement.parentElement.style.borderLeftColor = "white";
nt.parentElement.append(div)
}
}).then(canvas => {
let dom = document.body.appendChild(canvas);
dom.style.display = 'none';
a.style.display = 'none';
document.body.removeChild(dom);
let blob = that.dataURLToBlob(dom.toDataURL('image/png'));
a.setAttribute('href', URL.createObjectURL(blob));
a.setAttribute('download', that.noteForm.key + '.png');
document.body.appendChild(a);
a.click();
URL.revokeObjectURL(blob);
document.body.removeChild(a);
});
},
}
}
</script>

View File

@@ -8,7 +8,7 @@ module.exports = defineConfig({
productionSourceMap: false,
configureWebpack: (config) => {
config.experiments = { asyncWebAssembly: true, syncWebAssembly: true }
config.experiments = { asyncWebAssembly: true,syncWebAssembly:true }
config.externals = {
@@ -23,9 +23,7 @@ module.exports = defineConfig({
"iview": 'ViewUI',
"file-saver": 'saveAs',
"clipboard": "ClipboardJS",
"vue-i18n": "VueI18n",
"html2canvas": "html2canvas",
"wasm_flate": "wasm_flate"
"vue-i18n": "VueI18n"
};
// 为生产环境修改配置
@@ -68,7 +66,7 @@ module.exports = defineConfig({
proxy: {
"/note": {
target: "https://flagnote.com/", // 后台接口域名
// target: "http://localhost:10000/", // 后台接口域名
// target: "http://localhost:10000/", // 后台接口域名
secure: false, // 如果是https接口需要配置这个参数
changeOrigin: true, //是否跨域
pathRewrite: {

1817
yarn.lock

File diff suppressed because it is too large Load Diff