update to latest percury unblocker

This commit is contained in:
Percs 2024-07-27 05:02:14 -05:00
parent a56729a5dc
commit 8d4c4ac4d6
3 changed files with 66 additions and 35 deletions

View file

@ -26,8 +26,9 @@
"devDependencies": {
"@fastify/static": "^7.0.3",
"@mercuryworkshop/bare-as-module3": "^2.2.2",
"@mercuryworkshop/epoxy-transport": "^2.1.3",
"@mercuryworkshop/epoxy-transport": "^2.1.5",
"@mercuryworkshop/libcurl-transport": "^1.3.7",
"wisp-server-node": "^1.1.3",
"@rsdoctor/rspack-plugin": "^0.3.7",
"@rspack/cli": "^0.7.5",
"@rspack/core": "^0.7.5",
@ -57,7 +58,6 @@
"idb-map-entries": "^0.3.2",
"meriyah": "^4.4.2",
"parse-domain": "^8.0.2",
"set-cookie-parser": "^2.6.0",
"wisp-server-node": "^1.1.1"
"set-cookie-parser": "^2.6.0"
}
}

55
pnpm-lock.yaml generated
View file

@ -41,9 +41,6 @@ importers:
set-cookie-parser:
specifier: ^2.6.0
version: 2.6.0
wisp-server-node:
specifier: ^1.1.1
version: 1.1.1
devDependencies:
'@fastify/static':
specifier: ^7.0.3
@ -52,8 +49,8 @@ importers:
specifier: ^2.2.2
version: 2.2.2
'@mercuryworkshop/epoxy-transport':
specifier: ^2.1.3
version: 2.1.3(typescript@5.4.5)
specifier: ^2.1.5
version: 2.1.5
'@mercuryworkshop/libcurl-transport':
specifier: ^1.3.7
version: 1.3.7(typescript@5.4.5)
@ -105,6 +102,9 @@ importers:
typescript:
specifier: ^5.4.5
version: 5.4.5
wisp-server-node:
specifier: ^1.1.3
version: 1.1.3
packages:
@ -213,11 +213,11 @@ packages:
'@mercuryworkshop/bare-mux@2.0.2':
resolution: {integrity: sha512-1rnqFfI29VXi3jrMbkotHV+NnafJ3tpTIuH3Ov/BtVAfZMNGcsCRr3dwEKRWc+mDb0tWdNWC0PnZghgfAlbr+A==}
'@mercuryworkshop/epoxy-tls@2.0.6-1':
resolution: {integrity: sha512-sirpgUiIO6gxjvoI+QDRebsWEgutHiMbV5ghx2Q39IkfGqYNFinaMIDZRno8yY4IZCxydf9KAo/V+1xEMwvJ+w==}
'@mercuryworkshop/epoxy-tls@2.1.0-1':
resolution: {integrity: sha512-vyC2xVEd3gUl00r3CxqVd7qOe0FrkZQT2l6EP0qohqzcwV6oDq27nAa/I/gceYl38lDiqatxEoKKO4okvNbKCw==}
'@mercuryworkshop/epoxy-transport@2.1.3':
resolution: {integrity: sha512-cxuaPCVUmGnB1c/8cdoyhTIrZfL5feqH/sZRclkj8wFmrGz4PzzOHZRNMOrlzNoEiJDPYqHC4qJ6mNuiPC4vCw==}
'@mercuryworkshop/epoxy-transport@2.1.5':
resolution: {integrity: sha512-e4XTHaIK2BEPolhfZmn4OLK9kS4DjnpfzGSazc0yiMMm7j7G2RwevUOp/wO83TkV5jOZdC4O79iaDvFWdDIRuw==}
'@mercuryworkshop/libcurl-transport@1.3.7':
resolution: {integrity: sha512-Ef2BpZRPzkWaCf6FDv63uYyocz96sIwbScI2GrU/Oiu5Etyyq5bOo0mA6sHh8KCwioFSulvh61lO2MbfaEzH9g==}
@ -2518,8 +2518,8 @@ packages:
engines: {node: '>= 8'}
hasBin: true
wisp-server-node@1.1.1:
resolution: {integrity: sha512-JQGQ5CqNaMFxlmvHIJTQDAqGYGWq4Szt1Ou57Qkhgb4s88IEPHEJyLlqZ/wGvoks7/8z5UNJW0QBeTASr2Ikog==}
wisp-server-node@1.1.3:
resolution: {integrity: sha512-q44uIL68WhOnSEE1HJvMwXVZ6OzFIK+PBQfv04cr3svfOpbZfsuzLiYUz12P57PkxZxfNsjsYqrXjvf55P8S4Q==}
word-wrap@1.2.5:
resolution: {integrity: sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==}
@ -2572,6 +2572,18 @@ packages:
utf-8-validate:
optional: true
ws@8.18.0:
resolution: {integrity: sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==}
engines: {node: '>=10.0.0'}
peerDependencies:
bufferutil: ^4.0.1
utf-8-validate: '>=5.0.2'
peerDependenciesMeta:
bufferutil:
optional: true
utf-8-validate:
optional: true
ws@8.8.1:
resolution: {integrity: sha512-bGy2JzvzkPowEJV++hF07hAD6niYSr0JzBNo/J29WsB57A2r7Wlc1UFcTR9IzrPvuNVO4B8LGqF8qcpsVOhJCA==}
engines: {node: '>=10.0.0'}
@ -2732,17 +2744,11 @@ snapshots:
'@mercuryworkshop/bare-mux@2.0.2': {}
'@mercuryworkshop/epoxy-tls@2.0.6-1': {}
'@mercuryworkshop/epoxy-tls@2.1.0-1': {}
'@mercuryworkshop/epoxy-transport@2.1.3(typescript@5.4.5)':
'@mercuryworkshop/epoxy-transport@2.1.5':
dependencies:
'@mercuryworkshop/epoxy-tls': 2.0.6-1
esbuild-plugin-umd-wrapper: 2.0.0
rollup: 4.17.2
rollup-plugin-node-resolve: 5.2.0(rollup@4.17.2)
rollup-plugin-typescript2: 0.36.0(rollup@4.17.2)(typescript@5.4.5)
transitivePeerDependencies:
- typescript
'@mercuryworkshop/epoxy-tls': 2.1.0-1
'@mercuryworkshop/libcurl-transport@1.3.7(typescript@5.4.5)':
dependencies:
@ -5355,11 +5361,11 @@ snapshots:
dependencies:
isexe: 2.0.0
wisp-server-node@1.1.1:
wisp-server-node@1.1.3:
dependencies:
bufferutil: 4.0.8
utf-8-validate: 6.0.4
ws: 8.17.1(bufferutil@4.0.8)(utf-8-validate@6.0.4)
ws: 8.18.0(bufferutil@4.0.8)(utf-8-validate@6.0.4)
word-wrap@1.2.5: {}
@ -5392,6 +5398,11 @@ snapshots:
bufferutil: 4.0.8
utf-8-validate: 6.0.4
ws@8.18.0(bufferutil@4.0.8)(utf-8-validate@6.0.4):
optionalDependencies:
bufferutil: 4.0.8
utf-8-validate: 6.0.4
ws@8.8.1(bufferutil@4.0.8)(utf-8-validate@6.0.4):
optionalDependencies:
bufferutil: 4.0.8

View file

@ -44,6 +44,7 @@ const flex = css`
const col = css`
flex-direction: column;
`;
const store = $store(
{
url: "https://google.com",
@ -57,6 +58,7 @@ const store = $store(
"://" +
location.host +
"/bare/",
proxy: "",
},
{ ident: "settings", backing: "localstorage", autosave: "auto" }
);
@ -83,7 +85,7 @@ function App() {
}
iframe {
border: 4px solid #313131;
background-color: #fff;
background-color: #121212;
border-radius: 1rem;
margin: 2em;
margin-top: 0.5em;
@ -120,6 +122,9 @@ function App() {
outline: none;
padding: 0.45em;
}
.input_row input {
flex-grow: 1
}
`;
return html`
@ -127,15 +132,30 @@ function App() {
<h1>Percury Unblocker</h1>
<p>surf the unblocked and mostly buggy web</p>
<div class=${`${flex} ${col} cfg`}>
<input bind:value=${use(store.wispurl)}></input>
<input bind:value=${use(store.bareurl)}></input>
<div class=${[flex, col, "cfg"]}>
<div class=${[flex, "input_row"]}>
<label for="wisp_url_input">Wisp URL:</label>
<input id="wisp_url_input" bind:value=${use(store.wispurl)}></input>
</div>
<div class=${[flex, "input_row"]}>
<label for="bare_url_input">Bare URL:</label>
<input id="bare_url_input" bind:value=${use(store.bareurl)}></input>
</div>
<div class=${[flex, "input_row"]}>
<label for="proxy_url_input">SOCKS/HTTP Proxy URL:</label>
<input id="proxy_url_input" bind:value=${use(store.proxy)}></input>
</div>
<div class=${`${flex} buttons`}>
<button on:click=${() => connection.setTransport("/baremod/index.mjs", [store.bareurl])}>use bare server 3</button>
<button on:click=${() => connection.setTransport("/libcurl/index.mjs", [{ wisp: store.wispurl }])}>use libcurl.js</button>
<button on:click=${() => connection.setTransport("/epoxy/index.mjs", [{ wisp: store.wispurl }])}>use epoxy</button>
<div class=${[flex, "buttons"]}>
<button on:click=${() => connection.setTransport("/uv/baremod.js", [store.bareurl])}>use bare server 3</button>
<button on:click=${() =>
connection.setTransport("/uv/curlmod.js", [
{
wisp: store.wispurl,
proxy: store.proxy ? store.proxy : undefined,
},
])}>use libcurl.js</button>
<button on:click=${() => connection.setTransport("/uv/epxmod.js", [{ wisp: store.wispurl }])}>use epoxy</button>
<button on:click=${() => window.open(this.urlencoded)}>open in fullscreen</button>
</div>
</div>