+
-
-
Peersky
-
+
+
Peersky
+
About
P2P Labs
ipfs://
diff --git a/src/pages/static/css/home.css b/src/pages/static/css/home.css
index 9f36442..c99f70f 100644
--- a/src/pages/static/css/home.css
+++ b/src/pages/static/css/home.css
@@ -7,9 +7,10 @@ html {
justify-content: center;
background-color: #000;
font-family: monospace;
+ position: relative; /* Ensure that body can contain absolutely positioned elements */
}
-.background {
+.home-background {
position: relative;
height: 100vh;
width: 100vw;
@@ -41,7 +42,7 @@ html {
z-index: 2;
}
-.content {
+.home-content {
margin-bottom: 4%;
display: flex;
flex-direction: column;
@@ -49,22 +50,22 @@ html {
color: #fff;
}
-.heading {
- font-size: 35px;
+.home-heading {
+ font-size: 35px;
}
-.links {
+.home-link {
margin-top: 10px;
display: flex;
gap: 20px;
}
-.links a {
- color: #fff;
+.home-link a {
+ color: var(--button-hover-color);
text-decoration: none;
transition: color 0.3s ease;
}
-.links a:hover {
+.home-link a:hover {
color: #cccccc;
-}
\ No newline at end of file
+}
diff --git a/src/pages/static/css/index.css b/src/pages/static/css/index.css
index ee8af62..cfebe48 100644
--- a/src/pages/static/css/index.css
+++ b/src/pages/static/css/index.css
@@ -3,14 +3,11 @@
--text-color: #FFFFFF;
--background-nav: #323440;
--background-url-input: #111827;
- --background-url-input-hover: #0f172a;
--background-find-menu: #27272a;
--button-color: #9ca3af;
--button-hover-color: #e5e7eb;
- --focus-shadow-color: #06b6d4;
- --border-radius: 6px;
+ --primary-color: #06b6d4;
--font-family-main: Arial, sans-serif;
- --font-size-medium: medium;
}
html,
@@ -58,21 +55,21 @@ button:hover {
margin-left: 6px;
margin-right: 6px;
color: var(--text-color);
- font-size: var(--font-size-medium);
- border-radius: var(--border-radius);
+ font-size: medium;
+ border-radius: 6px;
display: block;
width: 60%;
padding: 0.4rem;
}
#url:hover {
- background-color: var(--background-url-input-hover);
+ background-color: #1f2937;
}
#url:focus {
background-color: var(--background-url-input);
outline: none;
- box-shadow: 0 0 4px -1px var(--focus-shadow-color);
+ box-shadow: 0 0 4px -1px var(--primary-color);
}
find-menu {
@@ -81,8 +78,8 @@ find-menu {
align-items: center;
margin-top: -4px;
padding: 0.3em;
- border-radius: var(--border-radius);
- font-size: var(--font-size-medium);
+ border-radius: 6px;
+ font-size: medium;
background-color: var(--background-find-menu);
position: absolute;
z-index: 10;
From 95ed1145aa4a03ab829cffcac556ead668dea240 Mon Sep 17 00:00:00 2001
From: Akhilesh Thite
Date: Wed, 31 Jul 2024 23:03:47 +0530
Subject: [PATCH 018/108] feat: add a simple clock on home page
---
src/pages/clock.js | 41 +++++++++++++++++++++++++++++++++++++++++
src/pages/home.html | 3 +++
2 files changed, 44 insertions(+)
create mode 100644 src/pages/clock.js
diff --git a/src/pages/clock.js b/src/pages/clock.js
new file mode 100644
index 0000000..30f42c1
--- /dev/null
+++ b/src/pages/clock.js
@@ -0,0 +1,41 @@
+class Clock extends HTMLElement {
+ constructor() {
+ super();
+ this.updateTime();
+ }
+
+ connectedCallback() {
+ this.render();
+ this.startClock();
+ }
+
+ render() {
+ this.style.position = "absolute";
+ this.style.top = "20px";
+ this.style.right = "20px";
+ this.style.color = "#FFFFFF";
+ this.style.fontFamily = "monospace";
+ this.style.fontSize = "30px";
+ this.style.padding = "5px";
+ this.textContent = this.formatTime(this.currentTime);
+ }
+
+ startClock() {
+ setInterval(() => {
+ this.updateTime();
+ this.render();
+ }, 1000);
+ }
+
+ updateTime() {
+ this.currentTime = new Date();
+ }
+
+ formatTime(date) {
+ const hours = String(date.getHours()).padStart(2, "0");
+ const minutes = String(date.getMinutes()).padStart(2, "0");
+ return `${hours}:${minutes}`;
+ }
+}
+
+customElements.define("simple-clock", Clock);
diff --git a/src/pages/home.html b/src/pages/home.html
index aa0d09b..131e61a 100644
--- a/src/pages/home.html
+++ b/src/pages/home.html
@@ -17,5 +17,8 @@
ipfs://
+
+
+
\ No newline at end of file
From 7f58e1ed4e3bd331fc62995640efc1556e6cd290 Mon Sep 17 00:00:00 2001
From: Akhilesh Thite
Date: Wed, 31 Jul 2024 23:52:17 +0530
Subject: [PATCH 019/108] fix: enhance find menu search functionality
---
src/find-menu.js | 196 +++++++++++++++++++++++++----------------------
src/renderer.js | 4 +-
2 files changed, 108 insertions(+), 92 deletions(-)
diff --git a/src/find-menu.js b/src/find-menu.js
index aaaa56c..b049987 100644
--- a/src/find-menu.js
+++ b/src/find-menu.js
@@ -1,95 +1,111 @@
class FindMenu extends HTMLElement {
- constructor() {
- super();
-
- this.addEventListener('keydown', ({ key }) => {
- if (key === 'Escape') this.hide();
- });
- }
-
- async connectedCallback() {
- this.innerHTML = `
-
-
-
-
- `;
-
- this.input = this.querySelector('.find-menu-input');
- this.previousButton = this.querySelector('.find-menu-previous');
- this.nextButton = this.querySelector('.find-menu-next');
- this.hideButton = this.querySelector('.find-menu-hide');
-
- await this.loadSVG(this.previousButton, 'peersky://static/assets/svg/up.svg');
- await this.loadSVG(this.nextButton, 'peersky://static/assets/svg/down.svg');
- await this.loadSVG(this.hideButton, 'peersky://static/assets/svg/close.svg');
-
- this.input.addEventListener('input', (e) => {
+ constructor() {
+ super();
+
+ this.currentSearchValue = '';
+
+ this.addEventListener('keydown', ({ key }) => {
+ if (key === 'Escape') this.hide();
+ });
+ }
+
+ async connectedCallback() {
+ this.innerHTML = `
+
+
+
+
+ `;
+
+ this.input = this.querySelector('.find-menu-input');
+ this.previousButton = this.querySelector('.find-menu-previous');
+ this.nextButton = this.querySelector('.find-menu-next');
+ this.hideButton = this.querySelector('.find-menu-hide');
+
+ await this.loadSVG(this.previousButton, 'peersky://static/assets/svg/up.svg');
+ await this.loadSVG(this.nextButton, 'peersky://static/assets/svg/down.svg');
+ await this.loadSVG(this.hideButton, 'peersky://static/assets/svg/close.svg');
+
+ this.input.addEventListener('input', (e) => {
+ const { value } = this;
+ if (!value) return;
+ if (value.length > 0 && value !== this.currentSearchValue) {
+ this.currentSearchValue = value;
+ this.resetSearch();
+ }
+ this.dispatchEvent(new CustomEvent('next', { detail: { value } }));
+ });
+
+ this.input.addEventListener('keydown', ({ keyCode, shiftKey }) => {
+ if (keyCode === 13) {
const { value } = this;
- if (!value) return;
- this.dispatchEvent(new CustomEvent('next', { detail: { value } }));
- });
-
- this.input.addEventListener('keydown', ({ keyCode, shiftKey }) => {
- if (keyCode === 13) {
- const { value } = this;
- if (!value) return this.hide();
- const direction = shiftKey ? 'previous' : 'next';
- this.dispatchEvent(new CustomEvent(direction, { detail: { value, findNext: true } }));
+ if (!value) return this.hide();
+ if (value.length > 0 && value !== this.currentSearchValue) {
+ this.currentSearchValue = value;
+ this.resetSearch();
}
- });
-
- this.previousButton.addEventListener('click', () => {
- const { value } = this;
- if (!value) return;
- this.dispatchEvent(new CustomEvent('previous', { detail: { value, findNext: false } }));
- });
- this.nextButton.addEventListener('click', () => {
- const { value } = this;
- if (!value) return;
- this.dispatchEvent(new CustomEvent('next', { detail: { value, findNext: true } }));
- });
- this.hideButton.addEventListener('click', () => this.hide());
- }
-
- async loadSVG(button, svgPath) {
- const response = await fetch(svgPath);
- const svgContent = await response.text();
- const svgContainer = document.createElement("div");
- svgContainer.innerHTML = svgContent;
- svgContainer.querySelector("svg").setAttribute("width", "14");
- svgContainer.querySelector("svg").setAttribute("height", "14");
- svgContainer.querySelector("svg").setAttribute("fill", "currentColor");
- button.appendChild(svgContainer.firstChild);
- }
-
- get value() {
- return this.input.value;
- }
-
- show() {
- this.classList.toggle('hidden', false);
- setTimeout(() => {
- this.focus();
- }, 10);
- }
-
- hide() {
- this.classList.toggle('hidden', true);
- this.dispatchEvent(new CustomEvent('hide'));
- }
-
- toggle() {
- const isActive = this.classList.toggle('hidden');
- if (isActive) this.focus();
- else this.dispatchEvent(new CustomEvent('hide'));
- }
-
- focus() {
- this.input.focus();
- this.input.select();
+ const direction = shiftKey ? 'previous' : 'next';
+ this.dispatchEvent(new CustomEvent(direction, { detail: { value, findNext: true } }));
+ }
+ });
+
+ this.previousButton.addEventListener('click', () => {
+ const { value } = this;
+ if (!value) return;
+ this.dispatchEvent(new CustomEvent('previous', { detail: { value, findNext: false } }));
+ });
+ this.nextButton.addEventListener('click', () => {
+ const { value } = this;
+ if (!value) return;
+ this.dispatchEvent(new CustomEvent('next', { detail: { value, findNext: true } }));
+ });
+ this.hideButton.addEventListener('click', () => this.hide());
+ }
+
+ async loadSVG(button, svgPath) {
+ const response = await fetch(svgPath);
+ const svgContent = await response.text();
+ const svgContainer = document.createElement("div");
+ svgContainer.innerHTML = svgContent;
+ svgContainer.querySelector("svg").setAttribute("width", "14");
+ svgContainer.querySelector("svg").setAttribute("height", "14");
+ svgContainer.querySelector("svg").setAttribute("fill", "currentColor");
+ button.appendChild(svgContainer.firstChild);
+ }
+
+ resetSearch() {
+ const webview = document.querySelector('webview');
+ if (webview) {
+ webview.executeJavaScript('window.getSelection().removeAllRanges()');
}
}
-
- customElements.define('find-menu', FindMenu);
-
\ No newline at end of file
+
+ get value() {
+ return this.input.value;
+ }
+
+ show() {
+ this.classList.toggle('hidden', false);
+ setTimeout(() => {
+ this.focus();
+ }, 10);
+ }
+
+ hide() {
+ this.classList.toggle('hidden', true);
+ this.dispatchEvent(new CustomEvent('hide'));
+ }
+
+ toggle() {
+ const isActive = this.classList.toggle('hidden');
+ if (isActive) this.focus();
+ else this.dispatchEvent(new CustomEvent('hide'));
+ }
+
+ focus() {
+ this.input.focus();
+ this.input.select();
+ }
+}
+
+customElements.define('find-menu', FindMenu);
diff --git a/src/renderer.js b/src/renderer.js
index 5863afc..576f485 100755
--- a/src/renderer.js
+++ b/src/renderer.js
@@ -57,11 +57,11 @@ document.addEventListener("DOMContentLoaded", () => {
});
findMenu.addEventListener('next', ({ detail }) => {
- webviewContainer.webviewElement.executeJavaScript(`window.find("${detail.value}", ${detail.findNext})`);
+ webviewContainer.executeJavaScript(`window.find("${detail.value}", ${detail.findNext})`);
});
findMenu.addEventListener('previous', ({ detail }) => {
- webviewContainer.webviewElement.executeJavaScript(`window.find("${detail.value}", ${detail.findNext}, true)`);
+ webviewContainer.executeJavaScript(`window.find("${detail.value}", ${detail.findNext}, true)`);
});
findMenu.addEventListener('hide', () => {
From a19aaf1be968687d4c41855e949a54873de6ef73 Mon Sep 17 00:00:00 2001
From: Akhilesh Thite
Date: Thu, 1 Aug 2024 03:54:41 +0530
Subject: [PATCH 020/108] feat: add peer-bar UI
---
src/pages/home.html | 5 +++-
src/pages/peer-bar.js | 32 ++++++++++++++++++++++++++
src/pages/static/assets/svg/build.svg | 3 +++
src/pages/static/assets/svg/chat.svg | 4 ++++
src/pages/static/assets/svg/people.svg | 3 +++
src/pages/static/assets/svg/upload.svg | 4 ++++
src/pages/static/css/home.css | 26 +++++++++++++++++++++
7 files changed, 76 insertions(+), 1 deletion(-)
create mode 100644 src/pages/peer-bar.js
create mode 100644 src/pages/static/assets/svg/build.svg
create mode 100644 src/pages/static/assets/svg/chat.svg
create mode 100644 src/pages/static/assets/svg/people.svg
create mode 100644 src/pages/static/assets/svg/upload.svg
diff --git a/src/pages/home.html b/src/pages/home.html
index 131e61a..52ba3fe 100644
--- a/src/pages/home.html
+++ b/src/pages/home.html
@@ -4,6 +4,7 @@
Home
@@ -19,6 +20,8 @@
+
-
\ No newline at end of file
+
+
diff --git a/src/pages/peer-bar.js b/src/pages/peer-bar.js
new file mode 100644
index 0000000..c32d0eb
--- /dev/null
+++ b/src/pages/peer-bar.js
@@ -0,0 +1,32 @@
+class PeerBar extends HTMLElement {
+ constructor() {
+ super();
+ this.build();
+ }
+
+ build() {
+ const container = document.createElement('div');
+ container.className = 'peerbar';
+
+ const links = [
+ { href: 'peersky://p2p/chat/', img: 'chat.svg', alt: 'Peersky Chat' },
+ { href: 'peersky://p2p/upload/', img: 'upload.svg', alt: 'Peersky Upload' },
+ { href: 'peersky://p2p/build/', img: 'build.svg', alt: 'Peersky Build' },
+ { href: 'https://reader.distributed.press/', img: 'people.svg', alt: 'Social Reader' }
+ ];
+
+ links.forEach(link => {
+ const a = document.createElement('a');
+ a.href = link.href;
+ const img = document.createElement('img');
+ img.src = `peersky://static/assets/svg/${link.img}`;
+ img.alt = link.alt;
+ a.appendChild(img);
+ container.appendChild(a);
+ });
+
+ this.appendChild(container);
+ }
+}
+
+window.customElements.define('peer-bar', PeerBar);
diff --git a/src/pages/static/assets/svg/build.svg b/src/pages/static/assets/svg/build.svg
new file mode 100644
index 0000000..8e71020
--- /dev/null
+++ b/src/pages/static/assets/svg/build.svg
@@ -0,0 +1,3 @@
+
+
\ No newline at end of file
diff --git a/src/pages/static/assets/svg/chat.svg b/src/pages/static/assets/svg/chat.svg
new file mode 100644
index 0000000..35f466a
--- /dev/null
+++ b/src/pages/static/assets/svg/chat.svg
@@ -0,0 +1,4 @@
+
+
\ No newline at end of file
diff --git a/src/pages/static/assets/svg/people.svg b/src/pages/static/assets/svg/people.svg
new file mode 100644
index 0000000..341861a
--- /dev/null
+++ b/src/pages/static/assets/svg/people.svg
@@ -0,0 +1,3 @@
+
+
\ No newline at end of file
diff --git a/src/pages/static/assets/svg/upload.svg b/src/pages/static/assets/svg/upload.svg
new file mode 100644
index 0000000..9a4a363
--- /dev/null
+++ b/src/pages/static/assets/svg/upload.svg
@@ -0,0 +1,4 @@
+
+
\ No newline at end of file
diff --git a/src/pages/static/css/home.css b/src/pages/static/css/home.css
index c99f70f..31a8ad8 100644
--- a/src/pages/static/css/home.css
+++ b/src/pages/static/css/home.css
@@ -69,3 +69,29 @@ html {
.home-link a:hover {
color: #cccccc;
}
+
+.peerbar {
+ position: absolute;
+ top: 20px;
+ left: 20px;
+ display: flex;
+ flex-direction: column;
+ gap: 5px;
+ z-index: 3;
+}
+
+.peerbar a {
+ display: block;
+}
+
+.peerbar img {
+ width: 25px;
+ height: 25px;
+ filter: invert(62%) sepia(83%) saturate(447%) hue-rotate(142deg) brightness(93%) contrast(94%);
+ padding: 5px;
+ transition: transform 0.3s ease;
+}
+
+.peerbar img:hover {
+ transform: scale(1.1);
+}
From fdc643e88738a26ce79cb32810da6f62050e2903 Mon Sep 17 00:00:00 2001
From: Akhilesh Thite
Date: Thu, 1 Aug 2024 17:09:44 +0530
Subject: [PATCH 021/108] feat: implement auto-updater
---
.DS_Store | Bin 6148 -> 0 bytes
package-lock.json | 215 ++++++++++++++++----------------------------
package.json | 48 +++++++---
src/.DS_Store | Bin 6148 -> 0 bytes
src/auto-updater.js | 97 ++++++++++++++++++++
src/main.js | 15 +++-
6 files changed, 220 insertions(+), 155 deletions(-)
delete mode 100644 .DS_Store
delete mode 100644 src/.DS_Store
create mode 100644 src/auto-updater.js
diff --git a/.DS_Store b/.DS_Store
deleted file mode 100644
index c5df0e961e5c9742d6c4458306976cf3ecab2fa7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 6148
zcmeHK%Wl&^6upzAjnje@B#^p6vcxuoK%k;xlcvd{5_C}`SO5xfY+4i76U8wRiXvqV
z|G+P>;4siEb9$C#n;XgTz?bLG~Nteoh-!
zGA+A6p~eV~V>$9;>2LVj2CINo;NMe#_wE+?lu<-6<@YZi35Q6{pUTwKbDsV@otT~e
z&7Z_kI%~DQi&D9=wOw_p&aU&uJC}2BHk@T?cQ}2;wdYdC{$+XSzlg&5pnmg6CbMCb
zgi}R`f)FmRUq(qF=Utg4L8`c(?r>^OZBXA^EDqZH4Y&R1@v`AA4j!}`?!)%}a#?e3
z-MRPVbTE!D68TBZnFP)zW!DW}!e#v}
z$}4k?5|R{9NCUc1r3`w8loom7_8RX7O=w6X8Y4f0|6Q=8syFF9r6?zBBk-(?k&7c-
z#rv_wt0QuV-xN{C^bwJH_B{6{W)ji6V%!qzl8?I$eukA3!*^8lRqN(UZr#-A6gnPK
zkDdXWh_b%YSkFA8j9E?B$5ra(y+E?|#|oHz;qVz?%_?9OunOcA;Pb&nV(b`PX;eoC
zGW7%iR?w^rWxgJn;~MN3TxmoPOlT@lQ-yhA2u(-3Yy3I}R~j{)gn4`j6IqxSicrxp
zzN_3xbTr!BDqs~TDp1zdI^X~OtKa`clC4<ix83NmvYs{&uedq~RA=W+qqF}Tu*7MT4bpk%O_Rp75G@C)%t#kK$d
diff --git a/package-lock.json b/package-lock.json
index b2750ad..479bda5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -20,6 +20,8 @@
"@libp2p/tcp": "^9.0.26",
"@libp2p/webrtc": "^4.0.33",
"@libp2p/websockets": "^8.0.24",
+ "electron-updater": "^6.2.1",
+ "find-process": "^1.4.7",
"helia": "^4.2.1",
"hyper-sdk": "^5.0.0",
"hypercore-fetch": "^9.9.1",
@@ -31,7 +33,7 @@
"web3protocol": "^0.6.0"
},
"devDependencies": {
- "electron": "^29.4.0",
+ "electron": "^31.3.0",
"electron-builder": "^24.13.3",
"electron-rebuild": "^3.2.9"
}
@@ -2495,20 +2497,6 @@
"node": ">=12.0.0"
}
},
- "node_modules/@electron/osx-sign/node_modules/fs-extra": {
- "version": "10.1.0",
- "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
- "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
- "dev": true,
- "dependencies": {
- "graceful-fs": "^4.2.0",
- "jsonfile": "^6.0.1",
- "universalify": "^2.0.0"
- },
- "engines": {
- "node": ">=12"
- }
- },
"node_modules/@electron/osx-sign/node_modules/isbinaryfile": {
"version": "4.0.10",
"resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-4.0.10.tgz",
@@ -6184,20 +6172,6 @@
"electron-builder-squirrel-windows": "24.13.3"
}
},
- "node_modules/app-builder-lib/node_modules/fs-extra": {
- "version": "10.1.0",
- "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
- "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
- "dev": true,
- "dependencies": {
- "graceful-fs": "^4.2.0",
- "jsonfile": "^6.0.1",
- "universalify": "^2.0.0"
- },
- "engines": {
- "node": ">=12"
- }
- },
"node_modules/app-builder-lib/node_modules/semver": {
"version": "7.6.2",
"resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz",
@@ -6305,8 +6279,7 @@
"node_modules/argparse": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
- "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
- "dev": true
+ "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
},
"node_modules/asap": {
"version": "2.0.6",
@@ -6805,7 +6778,6 @@
"version": "9.2.4",
"resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.2.4.tgz",
"integrity": "sha512-upp+biKpN/XZMLim7aguUyW8s0FUpDvOtK6sbanMFDAMBzpHDqdhgVYm6zc9HJ6nWo7u2Lxk60i2M6Jd3aiNrA==",
- "dev": true,
"dependencies": {
"debug": "^4.3.4",
"sax": "^1.2.4"
@@ -6814,20 +6786,6 @@
"node": ">=12.0.0"
}
},
- "node_modules/builder-util/node_modules/fs-extra": {
- "version": "10.1.0",
- "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
- "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
- "dev": true,
- "dependencies": {
- "graceful-fs": "^4.2.0",
- "jsonfile": "^6.0.1",
- "universalify": "^2.0.0"
- },
- "engines": {
- "node": ">=12"
- }
- },
"node_modules/bytes": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
@@ -7236,7 +7194,6 @@
"version": "5.1.0",
"resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz",
"integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==",
- "dev": true,
"engines": {
"node": ">= 6"
}
@@ -7952,20 +7909,6 @@
"dmg-license": "^1.0.11"
}
},
- "node_modules/dmg-builder/node_modules/fs-extra": {
- "version": "10.1.0",
- "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
- "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
- "dev": true,
- "dependencies": {
- "graceful-fs": "^4.2.0",
- "jsonfile": "^6.0.1",
- "universalify": "^2.0.0"
- },
- "engines": {
- "node": ">=12"
- }
- },
"node_modules/dmg-license": {
"version": "1.0.11",
"resolved": "https://registry.npmjs.org/dmg-license/-/dmg-license-1.0.11.tgz",
@@ -8071,9 +8014,9 @@
}
},
"node_modules/electron": {
- "version": "29.4.0",
- "resolved": "https://registry.npmjs.org/electron/-/electron-29.4.0.tgz",
- "integrity": "sha512-4DTO8U66oiI8rShrDSu2zDPW6GWRiCebyb1MHSfQkLWCNI/PnLyGKeqYPUoVgc0FWaNN2sCBn8NKJHb++hE2LQ==",
+ "version": "31.3.0",
+ "resolved": "https://registry.npmjs.org/electron/-/electron-31.3.0.tgz",
+ "integrity": "sha512-3LMRMmK4UK0A+jYSLGLYdfhc20TgY2v5jD3iGmhRZlDYj0gn7xBj/waRjlNalysZ0D2rgPvoes0wHuf5e/Bguw==",
"dev": true,
"hasInstallScript": true,
"dependencies": {
@@ -8127,35 +8070,6 @@
"fs-extra": "^10.1.0"
}
},
- "node_modules/electron-builder-squirrel-windows/node_modules/fs-extra": {
- "version": "10.1.0",
- "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
- "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
- "dev": true,
- "peer": true,
- "dependencies": {
- "graceful-fs": "^4.2.0",
- "jsonfile": "^6.0.1",
- "universalify": "^2.0.0"
- },
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/electron-builder/node_modules/fs-extra": {
- "version": "10.1.0",
- "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
- "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
- "dev": true,
- "dependencies": {
- "graceful-fs": "^4.2.0",
- "jsonfile": "^6.0.1",
- "universalify": "^2.0.0"
- },
- "engines": {
- "node": ">=12"
- }
- },
"node_modules/electron-publish": {
"version": "24.13.1",
"resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-24.13.1.tgz",
@@ -8171,20 +8085,6 @@
"mime": "^2.5.2"
}
},
- "node_modules/electron-publish/node_modules/fs-extra": {
- "version": "10.1.0",
- "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
- "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
- "dev": true,
- "dependencies": {
- "graceful-fs": "^4.2.0",
- "jsonfile": "^6.0.1",
- "universalify": "^2.0.0"
- },
- "engines": {
- "node": ">=12"
- }
- },
"node_modules/electron-rebuild": {
"version": "3.2.9",
"resolved": "https://registry.npmjs.org/electron-rebuild/-/electron-rebuild-3.2.9.tgz",
@@ -8236,20 +8136,6 @@
"node": ">= 12.13.0"
}
},
- "node_modules/electron-rebuild/node_modules/fs-extra": {
- "version": "10.1.0",
- "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
- "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
- "dev": true,
- "dependencies": {
- "graceful-fs": "^4.2.0",
- "jsonfile": "^6.0.1",
- "universalify": "^2.0.0"
- },
- "engines": {
- "node": ">=12"
- }
- },
"node_modules/electron-rebuild/node_modules/semver": {
"version": "7.6.2",
"resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz",
@@ -8268,6 +8154,32 @@
"integrity": "sha512-132O1XCd7zcTkzS3FgkAzKmnBuNJjK8WjcTtNuoylj7MYbqw5eXehjQ5OK91g0zm7OTKIPeaAG4CPoRfD9M1Mg==",
"peer": true
},
+ "node_modules/electron-updater": {
+ "version": "6.2.1",
+ "resolved": "https://registry.npmjs.org/electron-updater/-/electron-updater-6.2.1.tgz",
+ "integrity": "sha512-83eKIPW14qwZqUUM6wdsIRwVKZyjmHxQ4/8G+1C6iS5PdDt7b1umYQyj1/qPpH510GmHEQe4q0kCPe3qmb3a0Q==",
+ "dependencies": {
+ "builder-util-runtime": "9.2.4",
+ "fs-extra": "^10.1.0",
+ "js-yaml": "^4.1.0",
+ "lazy-val": "^1.0.5",
+ "lodash.escaperegexp": "^4.1.2",
+ "lodash.isequal": "^4.5.0",
+ "semver": "^7.3.8",
+ "tiny-typed-emitter": "^2.1.0"
+ }
+ },
+ "node_modules/electron-updater/node_modules/semver": {
+ "version": "7.6.3",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+ "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
+ "bin": {
+ "semver": "bin/semver.js"
+ },
+ "engines": {
+ "node": ">=10"
+ }
+ },
"node_modules/emoji-regex": {
"version": "8.0.0",
"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
@@ -8692,6 +8604,19 @@
"node": ">=6"
}
},
+ "node_modules/find-process": {
+ "version": "1.4.7",
+ "resolved": "https://registry.npmjs.org/find-process/-/find-process-1.4.7.tgz",
+ "integrity": "sha512-/U4CYp1214Xrp3u3Fqr9yNynUrr5Le4y0SsJh2lMDDSbpwYSz3M2SMWQC+wqcx79cN8PQtHQIL8KnuY9M66fdg==",
+ "dependencies": {
+ "chalk": "^4.0.0",
+ "commander": "^5.1.0",
+ "debug": "^4.1.1"
+ },
+ "bin": {
+ "find-process": "bin/find-process.js"
+ }
+ },
"node_modules/find-up": {
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
@@ -8790,6 +8715,19 @@
"resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
"integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow=="
},
+ "node_modules/fs-extra": {
+ "version": "10.1.0",
+ "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
+ "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
+ "dependencies": {
+ "graceful-fs": "^4.2.0",
+ "jsonfile": "^6.0.1",
+ "universalify": "^2.0.0"
+ },
+ "engines": {
+ "node": ">=12"
+ }
+ },
"node_modules/fs-minipass": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
@@ -10538,7 +10476,6 @@
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
"integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
- "dev": true,
"dependencies": {
"argparse": "^2.0.1"
},
@@ -10649,7 +10586,6 @@
"version": "6.1.0",
"resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
"integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
- "dev": true,
"dependencies": {
"universalify": "^2.0.0"
},
@@ -10695,8 +10631,7 @@
"node_modules/lazy-val": {
"version": "1.0.5",
"resolved": "https://registry.npmjs.org/lazy-val/-/lazy-val-1.0.5.tgz",
- "integrity": "sha512-0/BnGCCfyUMkBpeDgWihanIAF9JmZhHBgUhEqzvf+adhNGLoP6TaiI5oF8oyb3I45P+PcnrqihSf01M0l0G5+Q==",
- "dev": true
+ "integrity": "sha512-0/BnGCCfyUMkBpeDgWihanIAF9JmZhHBgUhEqzvf+adhNGLoP6TaiI5oF8oyb3I45P+PcnrqihSf01M0l0G5+Q=="
},
"node_modules/lazystream": {
"version": "1.0.1",
@@ -11007,6 +10942,11 @@
"dev": true,
"peer": true
},
+ "node_modules/lodash.escaperegexp": {
+ "version": "4.1.2",
+ "resolved": "https://registry.npmjs.org/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz",
+ "integrity": "sha512-TM9YBvyC84ZxE3rgfefxUWiQKLilstD6k7PTGt6wfbtXF8ixIJLOL3VYyV/z+ZiPLsVxAsKAFVwWlWeb2Y8Yyw=="
+ },
"node_modules/lodash.flatten": {
"version": "4.4.0",
"resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz",
@@ -11014,6 +10954,11 @@
"dev": true,
"peer": true
},
+ "node_modules/lodash.isequal": {
+ "version": "4.5.0",
+ "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
+ "integrity": "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ=="
+ },
"node_modules/lodash.isplainobject": {
"version": "4.0.6",
"resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
@@ -14828,20 +14773,6 @@
"fs-extra": "^10.0.0"
}
},
- "node_modules/temp-file/node_modules/fs-extra": {
- "version": "10.1.0",
- "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
- "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
- "dev": true,
- "dependencies": {
- "graceful-fs": "^4.2.0",
- "jsonfile": "^6.0.1",
- "universalify": "^2.0.0"
- },
- "engines": {
- "node": ">=12"
- }
- },
"node_modules/temp/node_modules/rimraf": {
"version": "2.6.3",
"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
@@ -14963,6 +14894,11 @@
"node": ">= 4.5.0"
}
},
+ "node_modules/tiny-typed-emitter": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/tiny-typed-emitter/-/tiny-typed-emitter-2.1.0.tgz",
+ "integrity": "sha512-qVtvMxeXbVej0cQWKqVSSAHmKZEHAvxdF8HEUBFWts8h+xEo5m/lEiPakuyZ3BnCBjOD8i24kzNOiOLLgsSxhA=="
+ },
"node_modules/tmp": {
"version": "0.2.3",
"resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.3.tgz",
@@ -15191,7 +15127,6 @@
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
"integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
- "dev": true,
"engines": {
"node": ">= 10.0.0"
}
diff --git a/package.json b/package.json
index 103db5c..0f59d7a 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,6 @@
{
"name": "peersky-browser",
"version": "1.0.0",
- "private": true,
"description": "A minimal p2p web browser.",
"keywords": [
"peersky",
@@ -15,7 +14,7 @@
"author": "Akhilesh Thite (https://akhilesh.art/)",
"main": "src/main.js",
"type": "module",
- "repository": "https://github.com/p2plabsxyz/peersky-browser",
+ "repository": "https://github.com/p2plabsxyz/peersky-test",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1",
"start": "electron .",
@@ -29,7 +28,7 @@
"appId": "peersky.p2plabs.xyz",
"productName": "Peersky Browser",
"directories": {
- "output": "build"
+ "output": "dist"
},
"files": [
"node_modules/**/*",
@@ -39,22 +38,41 @@
"src/*"
],
"mac": {
+ "artifactName": "${name}-${version}-${os}-${arch}.${ext}",
+ "darkModeSupport": true,
+ "gatekeeperAssess": false,
"target": [
{
- "target": "dmg",
+ "target": "default",
"arch": [
- "arm64",
- "x64"
+ "x64",
+ "arm64"
]
}
],
"icon": "./public/icon.png"
},
"win": {
- "target": "nsis",
+ "target": [
+ {
+ "target": "nsis",
+ "arch": [
+ "ia32",
+ "x64"
+ ]
+ },
+ {
+ "target": "portable",
+ "arch": [
+ "ia32",
+ "x64"
+ ]
+ }
+ ],
"icon": "./public/icon.png"
},
"linux": {
+ "artifactName": "${name}-${version}-${os}-${arch}.${ext}",
"target": [
"AppImage",
"deb"
@@ -72,10 +90,14 @@
"role": "Viewer"
}
],
- "publish": {
- "provider": "github",
- "releaseType": "release"
- }
+ "publish": [
+ {
+ "provider": "github",
+ "owner": "p2plabsxyz",
+ "repo": "peersky-test",
+ "releaseType": "release"
+ }
+ ]
},
"dependencies": {
"@chainsafe/libp2p-gossipsub": "^13.0.0",
@@ -89,6 +111,8 @@
"@libp2p/tcp": "^9.0.26",
"@libp2p/webrtc": "^4.0.33",
"@libp2p/websockets": "^8.0.24",
+ "electron-updater": "^6.2.1",
+ "find-process": "^1.4.7",
"helia": "^4.2.1",
"hyper-sdk": "^5.0.0",
"hypercore-fetch": "^9.9.1",
@@ -100,7 +124,7 @@
"web3protocol": "^0.6.0"
},
"devDependencies": {
- "electron": "^29.4.0",
+ "electron": "^31.3.0",
"electron-builder": "^24.13.3",
"electron-rebuild": "^3.2.9"
}
diff --git a/src/.DS_Store b/src/.DS_Store
deleted file mode 100644
index 39d862eb719a2fcf87c561a65f9ac7090416150f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 6148
zcmeHKO>fgc5S>la##V%s14zA8vc$D2;j031ano|(S|d0B3U+N3gX@iKha93vK9?WE
zm0!Z&p>K9KRZ7}ZC4{OOY4**|zFBLZtz9n>snIljOf(=O56;-}(OhFZ&c0?Hm)Qa;
zGshl%rTR^wPm*GdEs6h80e*KqI-{6!Drx2Y=>#MESscLk{uo09j)i20|HYXXO%!`323V9J&PZK-ls3}wra4;(La*jlvZq}=60xhE@k
zLs91Gm_IOdQlUj@MFCOZssbCfJK*#G_09MHt3}ci1w?^6rGV-lMMonn$(^lhi{rC4
sfPaRwF|W0FS%SbE#o+Q$ybU*oe82%Pbl6%%1|~lOMh0m_fq$yN1zp{KumAu6
diff --git a/src/auto-updater.js b/src/auto-updater.js
new file mode 100644
index 0000000..61780e0
--- /dev/null
+++ b/src/auto-updater.js
@@ -0,0 +1,97 @@
+import { app } from "electron";
+import pkg from 'electron-updater';
+const { autoUpdater } = pkg;
+import path from "path";
+import fs from "fs";
+import findProcess from 'find-process';
+
+const feed = 'https://github.com/p2plabsxyz/peersky-test/releases/download/latest';
+const BUNDLE_NAME = 'peersky.p2plabs.xyz';
+const SHIP_IT_BINARY = 'ShipIt';
+
+let yaml = '';
+
+yaml += "provider: generic\n";
+yaml += "url: " + feed + "\n";
+yaml += "useMultipleRangeRequest: false\n";
+yaml += "channel: latest\n";
+yaml += "updaterCacheDirName: " + app.getName() + "\n";
+
+let updateFile = [path.join(process.resourcesPath, 'app-update.yml'), yaml];
+let devUpdateFile = [path.join(process.resourcesPath, 'dev-app-update.yml'), yaml];
+let checkFiles = [updateFile, devUpdateFile];
+
+for (let file of checkFiles) {
+ if (!fs.existsSync(file[0])) {
+ fs.writeFileSync(file[0], file[1], 'utf8');
+ }
+}
+
+let shouldRestartBeforeLaunch = false;
+
+async function makeSureAutoUpdateFinished() {
+ const shipItProcesses = await findProcess('name', SHIP_IT_BINARY);
+ if (shipItProcesses.some(f => f.cmd.includes(BUNDLE_NAME))) {
+ // if we don't restart, the old app from memory will keep running
+ shouldRestartBeforeLaunch = true;
+ console.debug('Waiting for auto update to finish');
+ setTimeout(makeSureAutoUpdateFinished, 1500);
+ } else {
+ if (shouldRestartBeforeLaunch) {
+ try {
+ const Electron = require('electron');
+ Electron.app.relaunch();
+ Electron.app.exit(0);
+ } catch (error) {
+ console.error('Failed to restart the app through electron', error);
+ process.exit(1);
+ }
+ }
+ }
+}
+
+function setupAutoUpdater() {
+ console.log('Setting feed URL for auto-updater');
+ autoUpdater.setFeedURL({
+ provider: 'github',
+ repo: 'peersky-test',
+ owner: 'p2plabsxyz',
+ });
+
+ autoUpdater.on('checking-for-update', () => {
+ console.log('Checking for update...');
+ });
+
+ autoUpdater.on('update-available', (info) => {
+ console.log('Update available:', info);
+ });
+
+ autoUpdater.on('update-not-available', (info) => {
+ console.log('Update not available:', info);
+ });
+
+ autoUpdater.on('error', (err) => {
+ console.error('Error in auto-updater:', err);
+ });
+
+ autoUpdater.on('download-progress', (progressObj) => {
+ let log_message = `Download speed: ${progressObj.bytesPerSecond} - Downloaded ${progressObj.percent}% (${progressObj.transferred}/${progressObj.total})`;
+ console.log(log_message);
+ });
+
+ autoUpdater.on('update-downloaded', (event, releaseNotes, releaseName) => {
+ console.log('Update downloaded; will install in 20 seconds');
+ setTimeout(() => {
+ makeSureAutoUpdateFinished().then(() => {
+ autoUpdater.quitAndInstall();
+ });
+ }, 20000); // 20 seconds delay after update is downloaded
+ });
+
+ console.log('Initiating check for updates in 10 seconds');
+ setTimeout(() => {
+ autoUpdater.checkForUpdates();
+ }, 10000); // 10 seconds delay after app launch
+}
+
+export { setupAutoUpdater };
diff --git a/src/main.js b/src/main.js
index 6f1706e..92b1b20 100755
--- a/src/main.js
+++ b/src/main.js
@@ -8,8 +8,14 @@ import { createHandler as createWeb3Handler } from './protocols/web3-handler.js'
import { ipfsOptions, hyperOptions } from "./protocols/config.js";
import { attachContextMenus } from "./context-menu.js";
import { registerShortcuts } from "./actions.js";
+import { setupAutoUpdater } from "./auto-updater.js";
-const __dirname = fileURLToPath(new URL('./', import.meta.url))
+const __dirname = fileURLToPath(new URL('./', import.meta.url));
+
+// // Uncomment while locally testing the AutoUpdater
+// Object.defineProperty(app, 'isPackaged', {
+// value: true
+// });
let mainWindow;
@@ -84,8 +90,11 @@ globalProtocol.registerSchemesAsPrivileged([
app.whenReady().then(async () => {
await setupProtocols(session.defaultSession);
- createWindow(null, true); // Create the main window
- registerShortcuts(); // Register global shortcuts
+ createWindow(null, true);
+ registerShortcuts();
+ // initializeAutoUpdater(); // Initialize auto-updater
+ console.log('App is prepared, setting up autoUpdater...');
+ setupAutoUpdater();
});
async function setupProtocols(session) {
From 27064d4149f0dfbbea5e020f6e61d4f9ce34150f Mon Sep 17 00:00:00 2001
From: Akhilesh Thite
Date: Fri, 2 Aug 2024 04:30:31 +0530
Subject: [PATCH 022/108] feat: add p2p apps for communicati
---
src/pages/p2p/chat/chat.js | 79 ++++++++++++++++++
src/pages/p2p/chat/index.html | 140 ++++++++++++++++++++++++++++++++
src/pages/p2p/upload/index.html | 130 +++++++++++++++++++++++++++++
src/pages/peer-bar.js | 6 +-
src/pages/static/css/index.css | 13 +--
5 files changed, 359 insertions(+), 9 deletions(-)
create mode 100644 src/pages/p2p/chat/chat.js
create mode 100644 src/pages/p2p/chat/index.html
create mode 100644 src/pages/p2p/upload/index.html
diff --git a/src/pages/p2p/chat/chat.js b/src/pages/p2p/chat/chat.js
new file mode 100644
index 0000000..532725b
--- /dev/null
+++ b/src/pages/p2p/chat/chat.js
@@ -0,0 +1,79 @@
+/* global Pear */
+import Hyperswarm from 'hyperswarm' // Module for P2P networking and connecting peers
+import crypto from 'hypercore-crypto' // Cryptographic functions for generating the key in app
+import b4a from 'b4a' // Module for buffer-to-string and vice-versa conversions
+
+const swarm = new Hyperswarm()
+
+// Unannounce the public key before exiting the process
+process.on('exit', () => {
+ swarm.destroy();
+ });
+ process.on('SIGINT', () => {
+ swarm.destroy();
+ process.exit();
+ });
+
+
+// When there's a new connection, listen for new messages, and add them to the UI
+swarm.on('connection', (peer) => {
+ // name incoming peers after first 6 chars of its public key as hex
+ const name = b4a.toString(peer.remotePublicKey, 'hex').substr(0, 6)
+ peer.on('data', message => onMessageAdded(name, message))
+ peer.on('error', e => console.log(`Connection error: ${e}`))
+})
+
+// When there's updates to the swarm, update the peers count
+swarm.on('update', () => {
+ document.querySelector('#peers-count').textContent = swarm.connections.size
+})
+
+document.querySelector('#create-chat-room').addEventListener('click', createChatRoom)
+document.querySelector('#join-form').addEventListener('submit', joinChatRoom)
+document.querySelector('#message-form').addEventListener('submit', sendMessage)
+
+async function createChatRoom() {
+ // Generate a new random topic (32 byte string)
+ const topicBuffer = crypto.randomBytes(32)
+ joinSwarm(topicBuffer)
+}
+
+async function joinChatRoom (e) {
+ e.preventDefault()
+ const topicStr = document.querySelector('#join-chat-room-topic').value
+ const topicBuffer = b4a.from(topicStr, 'hex')
+ joinSwarm(topicBuffer)
+}
+
+async function joinSwarm (topicBuffer) {
+ document.querySelector('#setup').classList.add('hidden')
+ document.querySelector('#loading').classList.remove('hidden')
+
+ // Join the swarm with the topic. Setting both client/server to true means that this app can act as both.
+ const discovery = swarm.join(topicBuffer, { client: true, server: true })
+ await discovery.flushed()
+
+ const topic = b4a.toString(topicBuffer, 'hex')
+ document.querySelector('#chat-room-topic').innerText = topic
+ document.querySelector('#loading').classList.add('hidden')
+ document.querySelector('#chat').classList.remove('hidden')
+}
+
+function sendMessage (e) {
+ const message = document.querySelector('#message').value
+ document.querySelector('#message').value = ''
+ e.preventDefault()
+
+ onMessageAdded('You', message)
+
+ // Send the message to all peers (that you are connected to)
+ const peers = [...swarm.connections]
+ for (const peer of peers) peer.write(message)
+}
+
+// appends element to #messages element with content set to sender and message
+function onMessageAdded (from, message) {
+ const $div = document.createElement('div')
+ $div.textContent = `<${from}> ${message}`
+ document.querySelector('#messages').appendChild($div)
+}
\ No newline at end of file
diff --git a/src/pages/p2p/chat/index.html b/src/pages/p2p/chat/index.html
new file mode 100644
index 0000000..aa288ef
--- /dev/null
+++ b/src/pages/p2p/chat/index.html
@@ -0,0 +1,140 @@
+Chat
+
+
+
+
+
+ Create
+
+
- or -
+
+
Loading ...
+
+
diff --git a/src/pages/p2p/upload/index.html b/src/pages/p2p/upload/index.html
new file mode 100644
index 0000000..afffede
--- /dev/null
+++ b/src/pages/p2p/upload/index.html
@@ -0,0 +1,130 @@
+Upload
+
+
+
+ Protocol:
+
+
+ Inter-Planetary File System (IPFS://)
+
+ Hypercore-Protocol (HYPER://)
+
+
+
+ Drop a file to upload it
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/peer-bar.js b/src/pages/peer-bar.js
index c32d0eb..330cdfb 100644
--- a/src/pages/peer-bar.js
+++ b/src/pages/peer-bar.js
@@ -9,9 +9,9 @@ class PeerBar extends HTMLElement {
container.className = 'peerbar';
const links = [
- { href: 'peersky://p2p/chat/', img: 'chat.svg', alt: 'Peersky Chat' },
- { href: 'peersky://p2p/upload/', img: 'upload.svg', alt: 'Peersky Upload' },
- { href: 'peersky://p2p/build/', img: 'build.svg', alt: 'Peersky Build' },
+ { href: 'peersky://p2p/chat/index', img: 'chat.svg', alt: 'Peersky Chat' },
+ { href: 'peersky://p2p/upload/index', img: 'upload.svg', alt: 'Peersky Upload' },
+ { href: 'peersky://p2p/build/index', img: 'build.svg', alt: 'Peersky Build' },
{ href: 'https://reader.distributed.press/', img: 'people.svg', alt: 'Social Reader' }
];
diff --git a/src/pages/static/css/index.css b/src/pages/static/css/index.css
index cfebe48..1c2db1a 100644
--- a/src/pages/static/css/index.css
+++ b/src/pages/static/css/index.css
@@ -1,12 +1,13 @@
:root {
- --background-color: #000000;
- --text-color: #FFFFFF;
+ --peersky-background-color: #000000;
+ --peersky-p2p-background-color: #18181b;
+ --peersky-text-color: #FFFFFF;
--background-nav: #323440;
--background-url-input: #111827;
--background-find-menu: #27272a;
--button-color: #9ca3af;
--button-hover-color: #e5e7eb;
- --primary-color: #06b6d4;
+ --peersky-primary-color: #06b6d4;
--font-family-main: Arial, sans-serif;
}
@@ -54,7 +55,7 @@ button:hover {
border: none;
margin-left: 6px;
margin-right: 6px;
- color: var(--text-color);
+ color: var(--peersky-text-color);
font-size: medium;
border-radius: 6px;
display: block;
@@ -69,7 +70,7 @@ button:hover {
#url:focus {
background-color: var(--background-url-input);
outline: none;
- box-shadow: 0 0 4px -1px var(--primary-color);
+ box-shadow: 0 0 4px -1px var(--peersky-primary-color);
}
find-menu {
@@ -92,7 +93,7 @@ find-menu {
font-size: inherit;
font-family: inherit;
background-color: var(--background-find-menu);
- color: var(--text-color);
+ color: var(--peersky-text-color);
outline: none;
}
From eb9fd2bf240bac83657a3d397662051d547ab6b1 Mon Sep 17 00:00:00 2001
From: Akhilesh Thite
Date: Fri, 2 Aug 2024 04:45:18 +0530
Subject: [PATCH 023/108] chore: rename build p2p directory to editor
---
src/pages/p2p/editor/codeEditor.js | 48 ++++++++
src/pages/p2p/editor/common.js | 12 ++
src/pages/p2p/editor/dweb.js | 172 +++++++++++++++++++++++++++++
src/pages/p2p/editor/index.html | 51 +++++++++
src/pages/p2p/editor/styles.css | 154 ++++++++++++++++++++++++++
src/pages/peer-bar.js | 2 +-
6 files changed, 438 insertions(+), 1 deletion(-)
create mode 100644 src/pages/p2p/editor/codeEditor.js
create mode 100644 src/pages/p2p/editor/common.js
create mode 100644 src/pages/p2p/editor/dweb.js
create mode 100644 src/pages/p2p/editor/index.html
create mode 100644 src/pages/p2p/editor/styles.css
diff --git a/src/pages/p2p/editor/codeEditor.js b/src/pages/p2p/editor/codeEditor.js
new file mode 100644
index 0000000..28d4459
--- /dev/null
+++ b/src/pages/p2p/editor/codeEditor.js
@@ -0,0 +1,48 @@
+import { $, loadingSpinner, backdrop, iframe } from './common.js'; // Import common functions
+
+// Attach event listeners directly using the $ selector function
+[$('#htmlCode'), $('#javascriptCode'), $('#cssCode')].forEach(element => {
+ element.addEventListener('input', () => update());
+});
+
+// Import CSS from Agregore theme to use in the iframe preview
+export let basicCSS = `
+@import url("agregore://theme/vars.css");
+ body, * {
+ font-size: 1.2rem;
+ margin: 0;
+ padding: 0;
+ font-family: var(--ag-theme-font-family);
+ background: var(--ag-theme-background);
+ color: var(--ag-theme-text);
+ }
+`;
+
+//Function for live Rendering
+export function update() {
+ let htmlCode = $('#htmlCode').value;
+ console.log('HTML Code:', htmlCode);
+ let cssCode = $('#cssCode').value;
+ console.log('CSS Code:', cssCode);
+ let javascriptCode = $('#javascriptCode').value;
+ console.log('JavaScript Code:', javascriptCode);
+ // Assemble all elements and Include the basic CSS from Agregore theme
+ let iframeContent = `
+
+
+
+ ${htmlCode}
+ `;
+
+ let iframeDoc = iframe.contentWindow.document;
+ iframeDoc.open();
+ iframeDoc.write(iframeContent);
+ iframeDoc.close();
+}
+
+
+// Show or hide the loading spinner
+export function showSpinner(show) {
+ backdrop.style.display = show ? 'block' : 'none';
+ loadingSpinner.style.display = show ? 'block' : 'none';
+}
\ No newline at end of file
diff --git a/src/pages/p2p/editor/common.js b/src/pages/p2p/editor/common.js
new file mode 100644
index 0000000..b01cca8
--- /dev/null
+++ b/src/pages/p2p/editor/common.js
@@ -0,0 +1,12 @@
+// Common module for exports
+export function $(query) {
+ return document.querySelector(query);
+}
+
+export const uploadButton = $('#uploadButton');
+export const protocolSelect = $('#protocolSelect');
+export const loadingSpinner = $('#loadingSpinner');
+export const backdrop = $('#backdrop');
+export const iframe = $('#viewer');
+export const fetchButton = $('#fetchButton');
+export const fetchCidInput = $('#fetchCidInput');
diff --git a/src/pages/p2p/editor/dweb.js b/src/pages/p2p/editor/dweb.js
new file mode 100644
index 0000000..105606a
--- /dev/null
+++ b/src/pages/p2p/editor/dweb.js
@@ -0,0 +1,172 @@
+import { update, showSpinner, basicCSS } from './codeEditor.js';
+import { $, uploadButton, protocolSelect, fetchButton, fetchCidInput } from './common.js';
+
+// assemble code before uploading
+export async function assembleCode() {
+ // Display loading spinner
+ showSpinner(true);
+
+ // Combine your code into a single HTML file
+ let combinedCode = `
+
+
+
+
+
+
+
+ ${document.getElementById("htmlCode").value}
+
+
+ `;
+
+ // Convert the combined code into a Blob
+ const blob = new Blob([combinedCode], { type: 'text/html' });
+ const file = new File([blob], "index.html", { type: 'text/html' });
+
+ // Upload the file
+ await uploadFile(file);
+ showSpinner(false);
+}
+
+uploadButton.addEventListener('click', assembleCode);
+
+// Upload code to Dweb
+async function uploadFile(file) {
+ const protocol = protocolSelect.value;
+
+ const formData = new FormData();
+
+ // Append file to the FormData
+ formData.append('file', file, file.name);
+
+
+ // Construct the URL based on the protocol
+ let url;
+ if (protocol === 'hyper') {
+ const hyperdriveUrl = await generateHyperdriveKey('drag-and-drop');
+ url = `${hyperdriveUrl}`;
+ } else {
+ url = `ipfs://bafyaabakaieac/`;
+ }
+
+ // Perform the upload for each file
+ try {
+ const response = await fetch(url, {
+ method: 'PUT',
+ body: formData,
+ });
+
+ if (!response.ok) {
+ addError(file, await response.text());
+ }
+ const urlResponse = protocol === 'hyper' ? response.url : response.headers.get('Location');
+ addURL(urlResponse);
+ } catch (error) {
+ console.error(`Error uploading ${file}:`, error);
+ } finally {
+ showSpinner(false);
+ }
+}
+
+
+
+async function generateHyperdriveKey(name) {
+ try {
+ const response = await fetch(`hyper://localhost/?key=${name}`, { method: 'POST' });
+ if (!response.ok) {
+ throw new Error(`Failed to generate Hyperdrive key: ${response.statusText}`);
+ }
+ return await response.text(); // This returns the hyper:// URL
+ } catch (error) {
+ console.error('Error generating Hyperdrive key:', error);
+ throw error;
+ }
+}
+
+
+function addURL(url) {
+ const listItem = document.createElement('li');
+ const link = document.createElement('a');
+ link.href = url;
+ link.textContent = url;
+
+ const copyContainer = document.createElement('span');
+ const copyIcon = '⊕'
+ copyContainer.innerHTML = copyIcon;
+ copyContainer.onclick = function() {
+ navigator.clipboard.writeText(url).then(() => {
+ copyContainer.textContent = ' Copied!';
+ setTimeout(() => {
+ copyContainer.innerHTML = copyIcon;
+ }, 3000);
+ }).catch(err => {
+ console.error('Error in copying text: ', err);
+ });
+ };
+
+ listItem.appendChild(link);
+ listItem.appendChild(copyContainer);
+ uploadListBox.appendChild(listItem);
+}
+
+
+function addError(name, text) {
+ uploadListBox.innerHTML += `Error in ${name}: ${text} `
+}
+
+// The fetchFromDWeb function detects which protocol is used and fetches the content
+async function fetchFromDWeb(url) {
+ if (!url) {
+ alert("Please enter a CID or Name.");
+ return;
+ }
+
+ if (!url.startsWith('ipfs://') && !url.startsWith('hyper://')) {
+ alert("Invalid protocol. URL must start with ipfs:// or hyper://");
+ return;
+ }
+
+ try {
+ const response = await fetch(url);
+ const data = await response.text();
+ parseAndDisplayData(data);
+ } catch (error) {
+ console.error("Error fetching from DWeb:", error);
+ alert("Failed to fetch from DWeb.");
+ }
+}
+
+// Modified event listener for fetchButton
+fetchButton.addEventListener('click', () => {
+ const cidOrName = fetchCidInput.value;
+ fetchFromDWeb(cidOrName);
+});
+
+// Parse the data and display it in the code editor
+function parseAndDisplayData(data) {
+ const parser = new DOMParser();
+ const doc = parser.parseFromString(data, 'text/html');
+
+ // Extracting CSS
+ const styleElements = Array.from(doc.querySelectorAll('style'));
+
+ // Remove the first element (agregore theme CSS)
+ styleElements.shift();
+
+ // Now combine the CSS from the remaining
- pear-ctrl {
- margin-top: 9px;
- margin-left: 9px;
- position: absolute;
- }
- pear-ctrl[data-platform="darwin"] {
- float: left;
- margin-top: 4px;
- }
-
- pear-ctrl:after {
- content: "";
- display: block;
- height: 1.8rem;
- position: fixed;
- z-index: -1;
- left: 0;
- top: 0;
- width: 100%;
- background-color: var(--peersky-p2p-background-color);
- }
-
- button,
- input {
- all: unset;
- border: 1px ridge var(--peersky-primary-color);
- background: var(--peersky-background-color);
- color: var(--peersky-text-color);
- padding: 0.45rem;
- font-family: monospace;
- font-size: 1rem;
- line-height: 1rem;
- }
-
- body {
- background-color: var(--peersky-p2p-background-color);
- font-family: monospace;
- margin: 0;
- padding: 0;
- }
-
- main {
- display: flex;
- height: 100vh;
- color: var(--peersky-text-color);
- justify-content: center;
- margin: 0;
- padding: 0;
- }
-
- .hidden {
- display: none !important;
- }
-
- #or {
- margin: 1.5rem auto;
- }
-
- #setup {
- display: flex;
- flex-direction: column;
- align-items: center;
- justify-content: center;
- }
-
- #loading {
- align-self: center;
- }
-
- #chat {
- display: flex;
- flex-direction: column;
- width: 100vw;
- padding: 0.75rem;
- }
-
- #header {
- margin-top: 2.2rem;
- margin-bottom: 0.75rem;
- }
-
- #details {
- display: flex;
- justify-content: space-between;
- }
-
- #messages {
- flex: 1;
- font-family: "Courier New", Courier, monospace;
- overflow-y: scroll;
- }
-
- #message-form {
- display: flex;
- }
+
- #message {
- flex: 1;
- }
-
-
-
- 
+ 
