replace & copy

yzoz · yzoz · commit d6e0cd01e40c · 2019-08-06T03:29:22.000+03:00
diff --git a/.env.development b/.env.development
@@ -1,13 +1,14 @@
-WS = 'ws://localhost:11111/ws/'
-SRV = 'http://localhost:6699/'
+WS = "ws://localhost:2112/ws/"
+SRV = "http://localhost:6699/"
 DEBUG = true
-MODE = 'development'
+MODE = "development"
+VERSION = "0.2.2"
 
-TITLE = 'iYZoZ.com / incripto ::: crypto tunnel'
-DESCRIPTION = 'Peer 2 Peer Crypto Instant Messanger'
-H1 = 'iYZoZ.com ::: crypto tunnel'
-H2 = 'incripto_0.2'
-H3 = 'No Nothing'
+TITLE = "iYZoZ.com / incripto ::: crypto tunnel"
+DESCRIPTION = "Peer 2 Peer Crypto Instant Messanger"
+H1 = "iYZoZ.com ::: crypto tunnel"
+H2 = "incripto_0.2"
+H3 = "No Nothing"
 TAGLINE = '<p>no e-mail, no phone number, no password, no ip... just:::</p><img class="logo" src="/img/yzoz.png" alt="YZoZ" /><p>I suggest that the most savvy one should try to write me at:<br /><a href="https://yzoz.com/user/653644f1d879a00427c69c81b6e52c9e889ae2c8354650bba33249be4b503b15">653644f1d879a00427c69c81b6e52c9e889ae2c8354650bba33249be4b503b15</a><br />I will try to be online as often as possible. Why is this so important? Because your messages are not stored anywhere, but only pass through the server. Peer 2 Peer. At the same time, they are exposed to transparent and reliable encryption using the Elliptical Curve Curve25519 directly in your browser. The Name and Status are also stored there (:not so thick yet, because yzoz.com is still so young:)<br />But in the vast majority of cases, people are texting online, and there is no need to re-read the message. Actually, yzoz.com is just a site, and the concept has received the modest name <strong>incripto</strong>.</p>'
-LINKS = '<a href="https://github.com/yzoz/incripto">source</a> | <a href="https://vk.com/incripto">vk</a> | <a href="https://xn--b1agi6atw.xn--p1ai/">blog</a>'
+LINKS = '<a href="https://github.com/incripto">source</a> | <a href="https://vk.com/incripto">vk</a> | <a href="https://xn--b1agi6atw.xn--p1ai/">blog</a>'
 WTF = '<h5>Add shortcut from any browser</h5><img src="/img/firefox-mobile.png" alt="firefox mobile" /><h5>Use DevTools</h5><img src="/img/chromium-devtools.png" alt="chromium devtools" /><h5>Minimize your window</h5><img src="/img/firefox-minimized.png" alt="firefox minimized" />'
diff --git a/.env.production b/.env.production
@@ -1,13 +1,14 @@
-WS = 'wss://i.yzoz.com/ws/'
-SRV = 'https://i.yzoz.com/'
+WS = "wss://i.yzoz.com/ws/"
+SRV = "https://i.yzoz.com/"
 DEBUG = false
-MODE = 'production'
+MODE = "production"
+VERSION = "0.2"
 
-TITLE = 'iYZoZ.com / incripto ::: crypto tunnel'
-DESCRIPTION = 'Peer 2 Peer Crypto Instant Messanger'
-H1 = 'iYZoZ.com ::: crypto tunnel'
-H2 = 'incripto_0.2'
-H3 = 'No Nothing'
+TITLE = "iYZoZ.com / incripto ::: crypto tunnel"
+DESCRIPTION = "Peer 2 Peer Crypto Instant Messanger"
+H1 = "iYZoZ.com ::: crypto tunnel"
+H2 = "incripto_0.2"
+H3 = "No Nothing"
 TAGLINE = '<p>no e-mail, no phone number, no password, no ip... just:::</p><img class="logo" src="/img/yzoz.png" alt="YZoZ" /><p>I suggest that the most savvy one should try to write me at:<br /><a href="https://yzoz.com/user/653644f1d879a00427c69c81b6e52c9e889ae2c8354650bba33249be4b503b15">653644f1d879a00427c69c81b6e52c9e889ae2c8354650bba33249be4b503b15</a><br />I will try to be online as often as possible. Why is this so important? Because your messages are not stored anywhere, but only pass through the server. Peer 2 Peer. At the same time, they are exposed to transparent and reliable encryption using the Elliptical Curve Curve25519 directly in your browser. The Name and Status are also stored there (:not so thick yet, because yzoz.com is still so young:)<br />But in the vast majority of cases, people are texting online, and there is no need to re-read the message. Actually, yzoz.com is just a site, and the concept has received the modest name <strong>incripto</strong>.</p>'
-LINKS = '<a href="https://github.com/yzoz/incripto">source</a> | <a href="https://vk.com/incripto">vk</a> | <a href="https://xn--b1agi6atw.xn--p1ai/">blog</a>'
+LINKS = '<a href="https://github.com/incripto">source</a> | <a href="https://vk.com/incripto">vk</a> | <a href="https://xn--b1agi6atw.xn--p1ai/">blog</a>'
 WTF = '<h5>Add shortcut from any browser</h5><img src="/img/firefox-mobile.png" alt="firefox mobile" /><h5>Use DevTools</h5><img src="/img/chromium-devtools.png" alt="chromium devtools" /><h5>Minimize your window</h5><img src="/img/firefox-minimized.png" alt="firefox minimized" />'
diff --git a/assets/arrow-right.png b/assets/arrow-right.png
diff --git a/package.json b/package.json
@@ -20,16 +20,16 @@
   },
   "devDependencies": {
     "babel-minify": "^0.5.0",
+    "copy": "^0.3.2",
     "dotenv-flow": "^3.0.0",
     "postcss": "^7.0.17",
+    "replace-in-file": "^4.1.2",
     "rollup": "^1.18.0",
     "rollup-plugin-commonjs": "^10.0.1",
-    "rollup-plugin-copy": "^3.1.0",
     "rollup-plugin-less": "^1.1.2",
     "rollup-plugin-node-resolve": "^5.2.0",
     "rollup-plugin-postcss": "^2.0.3",
     "rollup-plugin-replace": "^2.2.0",
-    "rollup-plugin-replace-html-vars": "^1.0.3",
     "rollup-plugin-vue": "^5.0.1",
     "vue-template-compiler": "^2.6.10"
   }
diff --git a/rollup.config.js b/rollup.config.js
@@ -3,12 +3,45 @@ import vue from 'rollup-plugin-vue';
 import commonjs from 'rollup-plugin-commonjs';
 import replace from 'rollup-plugin-replace';
 import less from 'rollup-plugin-less';
-import replaceHtmlVars from 'rollup-plugin-replace-html-vars';
-import copy from 'rollup-plugin-copy';
+import copy from 'copy';
 import * as dotenv from 'dotenv-flow';
+import * as fileReplace from 'replace-in-file';
 
 dotenv.config();
 
+copy(['assets/**/*'], 'dist/static/', {flatten: true}, (e, f) => {
+    if (e) throw e;
+    f.forEach( (f) => {
+        console.log(`Copying to ${f.relative}`);
+    });
+});
+
+let copy2replace = new Promise( (resolve) => {
+    copy.each(['src/index.html', 'src/manifest.webmanifest', 'src/robots.txt', 'src/sw.js'], 'dist/', {flatten: true}, (e, f) => {
+        if (e) throw e;
+        resolve(f);
+    });
+});
+
+const options = {
+    files: ['dist/index.html', 'dist/manifest.webmanifest', 'dist/robots.txt', 'dist/sw.js'],
+    from: ['I-TITLE-I', 'I-DESCRIPTION-I', 'I-H1-I', 'I-H2-I', 'I-H3-I', 'I-TAGLINE-I', 'I-LINKS-I', 'I-VERSION-I'],
+    to: [process.env.TITLE, process.env.DESCRIPTION, process.env.H1, process.env.H2, process.env.H3, process.env.TAGLINE, process.env.LINKS, process.env.VERSION],
+};
+
+copy2replace.then( (f) => {
+    f.forEach( (f) => {
+        console.log(`Copying to ${f.relative}`);
+    });
+    try {
+        const results = fileReplace.sync(options);
+        console.log('Replacement results:', results);
+    }
+    catch (e) {
+        console.error('Error occurred:', e);
+    }
+});
+
 const plugins = [
     less({
         include: 'src/index.less',
@@ -27,11 +60,6 @@ const plugins = [
           'idb': ['openDB']
         }
     }),
-    replaceHtmlVars({
-        files: ['src/index.html', 'src/manifest.webmanifest'],
-        from: ['I-TITLE-I', 'I-DESCRIPTION-I', 'I-H1-I', 'I-H2-I', 'I-H3-I', 'I-TAGLINE-I', 'I-LINKS-I'],
-        to: [process.env.TITLE, process.env.DESCRIPTION, process.env.H1, process.env.H2, process.env.H3, process.env.TAGLINE, process.env.LINKS],
-    }),
     replace({
         'process.env.NODE_ENV': JSON.stringify(process.env.MODE),
         'process.env.DEBUG_MODE': process.env.TITLE,
@@ -43,13 +71,7 @@ const plugins = [
         'I-TAGLINE-I': process.env.TAGLINE,
         'I-LINKS-I': process.env.LINKS,
         'I-WTF-I': process.env.WTF
-    }),
-    copy({
-        targets: [
-          { src: ['src/index.html', 'src/manifest.webmanifest', 'src/robots.txt', 'src/sw.js'], dest: 'dist/'},
-          { src: 'assets/**/*', dest: 'dist/static/' }
-        ]
-      })
+    })
 ];
 
 let config = {
@@ -71,4 +93,4 @@ if (process.env.MODE == 'production') {
     config.output.sourcemap = false;
 };
 
-export default config;
+export default config;
diff --git a/src/App.vue b/src/App.vue
@@ -183,7 +183,7 @@
                         let m = pack.data;
                         let n = pack.nonce;
                         let s = pack.snd;
-                        let r = this.$store.state.sec;
+                        let r = this.$store.state.priv;
 
                         let txt;
                         try {
@@ -311,7 +311,9 @@
                 window.scrollTo(0, 999999);
             },
             reload () {
-                document.location.reload(true);
+                //document.location.reload(true);
+                this.$disconnect();
+                this.$connect(this.$store.state.ws, { format: 'json' });
             }
         },
         components: { Online }
diff --git a/src/index.html b/src/index.html
@@ -1,12 +1,12 @@
 <!DOCTYPE html>
 <html lang="en">
 	<head>
-		<title>iYZoZ.com / incripto ::: crypto tunnel</title>
+		<title>I-TITLE-I</title>
 		<meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
 		<meta http-equiv="Pragma" content="no-cache" />
 		<meta http-equiv="Expires" content="0" />
 		<meta charset="utf-8" />
-		<meta name="description" content="Peer 2 Peer Crypto Instant Messanger" /> 
+		<meta name="description" content="I-DESCRIPTION-I" /> 
 		<meta http-equiv="X-UA-Compatible" content="IE=edge" />
 		<meta name="viewport" content="width=device-width, initial-scale=1.0, shrink-to-fit=no" />
 		<meta name="theme-color" content="#000000" />
@@ -21,21 +21,12 @@
 	</head>
 	<body>
 		<data>
-			<h1>iYZoZ.com ::: crypto tunnel</h1>
-			<h2>incripto_0.2</h2>
-			<h3>No Nothing</h3>
-			<div class="content">
-<p>no e-mail, no phone number, no password, no ip... just:::</p>
-<img class="logo" src="/img/yzoz.png" alt="YZoZ" />
-<p>Use JavaScript :)</p>
-<p>I suggest that the most savvy one should try to write me at:<br />
-<a href="https://yzoz.com/user/653644f1d879a00427c69c81b6e52c9e889ae2c8354650bba33249be4b503b15">653644f1d879a00427c69c81b6e52c9e889ae2c8354650bba33249be4b503b15</a><br />
-I will try to be online as often as possible. Why is this so important? Because your messages are not stored anywhere, but only pass through the server. Peer 2 Peer. At the same time, they are exposed to transparent and reliable encryption using the Elliptical Curve Curve25519 directly in your browser. The Name and Status are also stored there (:not so thick yet, because yzoz.com is still so young:)<br />
-But in the vast majority of cases, people are texting online, and there is no need to re-read the message. Actually, yzoz.com is just a site, and the concept has received the modest name <strong>incripto</strong>.</p>
-</div>
-			<div class="links">
-<a href="https://github.com/yzoz/incripto">source</a> | <a href="https://vk.com/incripto">vk</a> | <a href="https://xn--b1agi6atw.xn--p1ai/">blog</a>
+			<h1>I-H1-I</h1>
+			<h2>I-H2-I</h2>
+			<h3>I-H3-I</h3>
+			<div class="content">I-TAGLINE-I</p>
 </div>
+			<div class="links">I-LINKS-I</div>
 		</data>
 		<script type="text/javascript" src="/index.js"></script>
 	</body>
diff --git a/src/lib/crypt.js b/src/lib/crypt.js
@@ -5,7 +5,7 @@ import { box, randomBytes } from "tweetnacl";
 const crypt = {
 
     nonce () {
-        return randomBytes(16)
+        return randomBytes(16);
     },
 
     b2h (b) {
diff --git a/src/lib/proto.js b/src/lib/proto.js
@@ -65,6 +65,15 @@ syncyarnlock -s -k // updates package.json with versions installed from yarn.loc
 yarn install // updates yarn.lock with current version constraint from package.json
 
 */
+`
+copyfiles(['assets/**/*', 'dist/static/'], {
+    up: true,
+    verbose: true,
+    flat: true
+}, (e) => {
+    if (e) throw e;
+});
+`
 
 out = {
 	m: 'get',
diff --git a/src/manifest.webmanifest b/src/manifest.webmanifest
@@ -1,10 +1,10 @@
 {
     "background_color": "black",
     "theme_color": "#000000",
-    "description": "Peer 2 Peer Crypto Instant Messanger",
+    "description": "I-DESCRIPTION-I",
     "display": "standalone",
-    "name": "iYZoZ.com ::: crypto tunnel",
-    "short_name": "incripto_0.2",
+    "name": "I-H1-I",
+    "short_name": "I-H2-I",
     "start_url": "/",
     "orientation": "portrait",
     "icons": [{
diff --git a/src/sw.js b/src/sw.js
@@ -1,4 +1,4 @@
-let v = 'v0.2.1';
+let v = 'v' + 'I-VERSION-I';
 
 self.addEventListener('install', e => {
     console.log(v + ' installing…');
diff --git a/src/views/Peer.vue b/src/views/Peer.vue
@@ -43,7 +43,7 @@
                         this.$store.state.addr,
                         this.msg,
                         this.$store.state.rec,
-                        this.$store.state.sec
+                        this.$store.state.priv
                     );
 
                     let date = new Date();
diff --git a/src/views/Profile.vue b/src/views/Profile.vue
@@ -12,8 +12,6 @@
             <p>{{ status }}</p>
             <h6>public addres:</h6>
             <p>{{ addr }} <a v-bind:href="userurl"><i class="material-icons">link</i></a></p>
-            <h6>sing public:</h6>
-            <p>{{ pub }}</p>
         </div>
     </div>
 </template>
@@ -45,9 +43,6 @@
             addr () {
                 return this.$store.state.addr;
             },
-            pub () {
-                return this.$store.state.pub;
-            },
             userurl () {
                 return this.$store.state.srv + 'user/' + this.$store.state.addr;
             }
@@ -62,12 +57,12 @@
                 let p = e.target.value;
                 this.$store.state.priv = p;
                 this.$db.set('settings', 'priv', p);
-                [this.$store.state.pub, this.$store.state.sec, this.$store.state.addr] = await this.$crypt.recKeys(p);
+                this.$store.state.addr = await this.$crypt.recKeys(p);
             },
             async gen () {
                 this.$store.state.priv = this.$crypt.genKey();
                 this.$db.set('settings', 'priv', this.$store.state.priv);
-                [this.$store.state.pub, this.$store.state.sec, this.$store.state.addr] = await this.$crypt.recKeys(this.$store.state.priv);
+                this.$store.state.addr = await this.$crypt.recKeys(this.$store.state.priv);
             }
         }
     };
