Feature monitor the resource over proxy #840
Open
ugurerkan wants to merge 4 commits from rebasesoftware/feature/request-with-http-proxy into master
14 changed files with 785 additions and 28 deletions
@ -0,0 +1,23 @@ |
|||
-- You should not modify if this have pushed to Github, unless it does serious wrong with the db. |
|||
BEGIN TRANSACTION; |
|||
|
|||
CREATE TABLE proxy ( |
|||
id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, |
|||
user_id INT NOT NULL, |
|||
protocol VARCHAR(10) NOT NULL, |
|||
host VARCHAR(255) NOT NULL, |
|||
port SMALLINT NOT NULL, |
|||
auth BOOLEAN NOT NULL, |
|||
username VARCHAR(255) NULL, |
|||
password VARCHAR(255) NULL, |
|||
active BOOLEAN NOT NULL DEFAULT 1, |
|||
'default' BOOLEAN NOT NULL DEFAULT 0, |
|||
created_date DATETIME DEFAULT (DATETIME('now')) NOT NULL |
|||
); |
|||
|
|||
ALTER TABLE monitor ADD COLUMN proxy_id INTEGER REFERENCES proxy(id); |
|||
|
|||
CREATE INDEX proxy_id ON monitor (proxy_id); |
|||
CREATE INDEX proxy_user_id ON proxy (user_id); |
|||
|
|||
COMMIT; |
|||
@ -0,0 +1,21 @@ |
|||
const { BeanModel } = require("redbean-node/dist/bean-model"); |
|||
|
|||
class Proxy extends BeanModel { |
|||
toJSON() { |
|||
return { |
|||
id: this._id, |
|||
userId: this._user_id, |
|||
protocol: this._protocol, |
|||
host: this._host, |
|||
port: this._port, |
|||
auth: !!this._auth, |
|||
username: this._username, |
|||
password: this._password, |
|||
active: !!this._active, |
|||
default: !!this._default, |
|||
createdDate: this._created_date, |
|||
}; |
|||
} |
|||
} |
|||
|
|||
module.exports = Proxy; |
|||
@ -0,0 +1,170 @@ |
|||
const { R } = require("redbean-node"); |
|||
const HttpProxyAgent = require("http-proxy-agent"); |
|||
const HttpsProxyAgent = require("https-proxy-agent"); |
|||
const SocksProxyAgent = require("socks-proxy-agent"); |
|||
const { debug } = require("../src/util"); |
|||
|
|||
class Proxy { |
|||
|
|||
static SUPPORTED_PROXY_PROTOCOLS = ["http", "https", "socks", "socks5", "socks4"] |
|||
|
|||
/** |
|||
* Saves and updates given proxy entity |
|||
* |
|||
* @param proxy |
|||
* @param proxyID |
|||
* @param userID |
|||
* @return {Promise<Bean>} |
|||
*/ |
|||
static async save(proxy, proxyID, userID) { |
|||
let bean; |
|||
|
|||
if (proxyID) { |
|||
bean = await R.findOne("proxy", " id = ? AND user_id = ? ", [proxyID, userID]); |
|||
|
|||
if (!bean) { |
|||
throw new Error("proxy not found"); |
|||
} |
|||
|
|||
} else { |
|||
bean = R.dispense("proxy"); |
|||
} |
|||
|
|||
// Make sure given proxy protocol is supported
|
|||
if (!this.SUPPORTED_PROXY_PROTOCOLS.includes(proxy.protocol)) { |
|||
throw new Error(` |
|||
Unsupported proxy protocol "${proxy.protocol}. |
|||
Supported protocols are ${this.SUPPORTED_PROXY_PROTOCOLS.join(", ")}."` |
|||
); |
|||
} |
|||
|
|||
// When proxy is default update deactivate old default proxy
|
|||
if (proxy.default) { |
|||
await R.exec("UPDATE proxy SET `default` = 0 WHERE `default` = 1"); |
|||
} |
|||
|
|||
bean.user_id = userID; |
|||
bean.protocol = proxy.protocol; |
|||
bean.host = proxy.host; |
|||
bean.port = proxy.port; |
|||
bean.auth = proxy.auth; |
|||
bean.username = proxy.username; |
|||
bean.password = proxy.password; |
|||
bean.active = proxy.active || true; |
|||
bean.default = proxy.default || false; |
|||
|
|||
await R.store(bean); |
|||
|
|||
if (proxy.applyExisting) { |
|||
await applyProxyEveryMonitor(bean.id, userID); |
|||
} |
|||
|
|||
return bean; |
|||
} |
|||
|
|||
/** |
|||
* Deletes proxy with given id and removes it from monitors |
|||
* |
|||
* @param proxyID |
|||
* @param userID |
|||
* @return {Promise<void>} |
|||
*/ |
|||
static async delete(proxyID, userID) { |
|||
const bean = await R.findOne("proxy", " id = ? AND user_id = ? ", [proxyID, userID]); |
|||
|
|||
if (!bean) { |
|||
throw new Error("proxy not found"); |
|||
} |
|||
|
|||
// Delete removed proxy from monitors if exists
|
|||
await R.exec("UPDATE monitor SET proxy_id = null WHERE proxy_id = ?", [proxyID]); |
|||
|
|||
// Delete proxy from list
|
|||
await R.trash(bean); |
|||
} |
|||
|
|||
/** |
|||
* Create HTTP and HTTPS agents related with given proxy bean object |
|||
* |
|||
* @param proxy proxy bean object |
|||
* @param options http and https agent options |
|||
* @return {{httpAgent: Agent, httpsAgent: Agent}} |
|||
*/ |
|||
static createAgents(proxy, options) { |
|||
const { httpAgentOptions, httpsAgentOptions } = options || {}; |
|||
let agent; |
|||
let httpAgent; |
|||
let httpsAgent; |
|||
|
|||
const proxyOptions = { |
|||
protocol: proxy.protocol, |
|||
host: proxy.host, |
|||
port: proxy.port, |
|||
}; |
|||
|
|||
if (proxy.auth) { |
|||
proxyOptions.auth = `${proxy.username}:${proxy.password}`; |
|||
} |
|||
|
|||
debug(`Proxy Options: ${JSON.stringify(proxyOptions)}`); |
|||
debug(`HTTP Agent Options: ${JSON.stringify(httpAgentOptions)}`); |
|||
debug(`HTTPS Agent Options: ${JSON.stringify(httpsAgentOptions)}`); |
|||
|
|||
switch (proxy.protocol) { |
|||
case "http": |
|||
case "https": |
|||
httpAgent = new HttpProxyAgent({ |
|||
...httpAgentOptions || {}, |
|||
...proxyOptions |
|||
}); |
|||
|
|||
httpsAgent = new HttpsProxyAgent({ |
|||
...httpsAgentOptions || {}, |
|||
...proxyOptions, |
|||
}); |
|||
break; |
|||
case "socks": |
|||
case "socks5": |
|||
case "socks4": |
|||
agent = new SocksProxyAgent({ |
|||
...httpAgentOptions, |
|||
...httpsAgentOptions, |
|||
...proxyOptions, |
|||
}); |
|||
|
|||
httpAgent = agent; |
|||
httpsAgent = agent; |
|||
break; |
|||
|
|||
default: throw new Error(`Unsupported proxy protocol provided. ${proxy.protocol}`); |
|||
} |
|||
|
|||
return { |
|||
httpAgent, |
|||
httpsAgent |
|||
}; |
|||
} |
|||
} |
|||
|
|||
/** |
|||
* Applies given proxy id to monitors |
|||
* |
|||
* @param proxyID |
|||
* @param userID |
|||
* @return {Promise<void>} |
|||
*/ |
|||
async function applyProxyEveryMonitor(proxyID, userID) { |
|||
// Find all monitors with id and proxy id
|
|||
const monitors = await R.getAll("SELECT id, proxy_id FROM monitor WHERE user_id = ?", [userID]); |
|||
|
|||
// Update proxy id not match with given proxy id
|
|||
for (const monitor of monitors) { |
|||
if (monitor.proxy_id !== proxyID) { |
|||
await R.exec("UPDATE monitor SET proxy_id = ? WHERE id = ?", [proxyID, monitor.id]); |
|||
} |
|||
} |
|||
} |
|||
|
|||
module.exports = { |
|||
Proxy, |
|||
}; |
|||
@ -0,0 +1,206 @@ |
|||
Saibamen
commented 4 years ago
(Migrated from github.com)
Review
Saibamen
commented 4 years ago
(Migrated from github.com)
Review
|
|||
<template> |
|||
|
Review
|
|||
<form @submit.prevent="submit"> |
|||
|
Review
|
|||
<div ref="modal" class="modal fade" tabindex="-1" data-bs-backdrop="static"> |
|||
|
Review
|
|||
<div class="modal-dialog"> |
|||
|
Review
|
|||
<div class="modal-content"> |
|||
|
Review
|
|||
<div class="modal-header"> |
|||
|
Review
|
|||
<h5 id="exampleModalLabel" class="modal-title"> |
|||
|
Review
|
|||
{{ $t("Setup Proxy") }} |
|||
|
Review
|
|||
</h5> |
|||
|
Review
|
|||
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close" /> |
|||
|
Review
|
|||
</div> |
|||
|
Review
|
|||
<div class="modal-body"> |
|||
|
Review
|
|||
<div class="mb-3"> |
|||
|
Review
|
|||
<label for="proxy-protocol" class="form-label">{{ $t("Proxy Protocol") }}</label> |
|||
|
Review
|
|||
<select id="proxy-protocol" v-model="proxy.protocol" class="form-select"> |
|||
|
Review
|
|||
<option value="https">HTTPS</option> |
|||
|
Review
|
|||
<option value="http">HTTP</option> |
|||
|
Review
|
|||
<option value="socks">SOCKS</option> |
|||
|
Review
|
|||
<option value="socks5">SOCKS v5</option> |
|||
|
Review
|
|||
<option value="socks4">SOCKS v4</option> |
|||
|
Review
|
|||
</select> |
|||
|
Review
|
|||
</div> |
|||
|
Review
|
|||
|
|||
|
Review
|
|||
<div class="mb-3"> |
|||
|
Review
|
|||
<label for="proxy-host" class="form-label">{{ $t("Proxy Server") }}</label> |
|||
|
Review
|
|||
<div class="d-flex"> |
|||
|
Review
|
|||
<input id="proxy-host" v-model="proxy.host" type="text" class="form-control" required :placeholder="$t('Server Address')"> |
|||
|
Review
|
|||
<input v-model="proxy.port" type="number" class="form-control ms-2" style="width: 100px" required min="1" max="65535" :placeholder="$t('Port')"> |
|||
|
Review
|
|||
</div> |
|||
|
Review
|
|||
</div> |
|||
|
Review
|
|||
|
|||
|
Review
|
|||
<div class="mb-3"> |
|||
|
Review
|
|||
<div class="form-check form-switch"> |
|||
|
Review
|
|||
<input id="mark-auth" v-model="proxy.auth" class="form-check-input" type="checkbox"> |
|||
|
Review
|
|||
<label for="mark-auth" class="form-check-label">{{ $t("Proxy server has authentication") }}</label> |
|||
|
Review
|
|||
</div> |
|||
|
Review
|
|||
</div> |
|||
|
Review
|
|||
|
|||
|
Review
|
|||
<div v-if="proxy.auth" class="mb-3"> |
|||
|
Review
|
|||
<label for="proxy-username" class="form-label">{{ $t("User") }}</label> |
|||
|
Review
|
|||
<input id="proxy-username" v-model="proxy.username" type="text" class="form-control" required> |
|||
|
Review
|
|||
</div> |
|||
|
Review
|
|||
|
|||
|
Review
|
|||
<div v-if="proxy.auth" class="mb-3"> |
|||
|
Review
|
|||
<label for="proxy-password" class="form-label">{{ $t("Password") }}</label> |
|||
|
Review
|
|||
<input id="proxy-password" v-model="proxy.password" type="text" class="form-control" required> |
|||
|
Review
|
|||
</div> |
|||
|
Review
|
|||
|
|||
|
Review
|
|||
<div class="mb-3 mt-4"> |
|||
|
Review
|
|||
<hr class="dropdown-divider mb-4"> |
|||
|
Review
|
|||
|
|||
|
Review
|
|||
<div class="form-check form-switch"> |
|||
|
Review
|
|||
<input id="mark-active" v-model="proxy.active" class="form-check-input" type="checkbox"> |
|||
|
Review
|
|||
<label for="mark-active" class="form-check-label">{{ $t("enabled") }}</label> |
|||
|
Review
|
|||
</div> |
|||
|
Review
|
|||
<div class="form-text"> |
|||
|
Review
|
|||
{{ $t("enableProxyDescription") }} |
|||
|
Review
|
|||
</div> |
|||
|
Review
|
|||
|
|||
|
Review
|
|||
<br /> |
|||
|
Review
|
|||
|
|||
|
Review
|
|||
<div class="form-check form-switch"> |
|||
|
Review
|
|||
<input id="mark-default" v-model="proxy.default" class="form-check-input" type="checkbox"> |
|||
|
Review
|
|||
<label for="mark-default" class="form-check-label">{{ $t("setAsDefault") }}</label> |
|||
|
Review
|
|||
</div> |
|||
|
Review
|
|||
<div class="form-text"> |
|||
|
Review
|
|||
{{ $t("setAsDefaultProxyDescription") }} |
|||
|
Review
|
|||
</div> |
|||
|
Review
|
|||
|
|||
|
Review
|
|||
<br /> |
|||
|
Review
|
|||
|
|||
|
Review
|
|||
<div class="form-check form-switch"> |
|||
|
Review
|
|||
<input id="apply-existing" v-model="proxy.applyExisting" class="form-check-input" type="checkbox"> |
|||
|
Review
|
|||
<label class="form-check-label" for="apply-existing">{{ $t("Apply on all existing monitors") }}</label> |
|||
|
Review
|
|||
</div> |
|||
|
Review
|
|||
</div> |
|||
|
Review
|
|||
</div> |
|||
|
Review
|
|||
|
|||
|
Review
|
|||
<div class="modal-footer"> |
|||
|
Review
|
|||
<button v-if="id" type="button" class="btn btn-danger" :disabled="processing" @click="deleteConfirm"> |
|||
|
Review
|
|||
{{ $t("Delete") }} |
|||
|
Review
|
|||
</button> |
|||
|
Review
|
|||
<button type="submit" class="btn btn-primary" :disabled="processing"> |
|||
|
Review
|
|||
<div v-if="processing" class="spinner-border spinner-border-sm me-1"></div> |
|||
|
Review
|
|||
{{ $t("Save") }} |
|||
|
Review
|
|||
</button> |
|||
|
Review
|
|||
</div> |
|||
|
Review
|
|||
</div> |
|||
|
Review
|
|||
</div> |
|||
|
Review
|
|||
</div> |
|||
|
Review
|
|||
</form> |
|||
|
Review
|
|||
|
|||
|
Review
|
|||
<Confirm ref="confirmDelete" btn-style="btn-danger" :yes-text="$t('Yes')" :no-text="$t('No')" @yes="deleteProxy"> |
|||
|
Review
|
|||
{{ $t("deleteProxyMsg") }} |
|||
|
Review
|
|||
</Confirm> |
|||
|
Review
|
|||
</template> |
|||
|
Review
|
|||
|
|||
|
Review
|
|||
<script lang="ts"> |
|||
|
Review
|
|||
import { Modal } from "bootstrap"; |
|||
|
Review
|
|||
|
|||
|
Review
|
|||
import Confirm from "./Confirm.vue"; |
|||
|
Review
|
|||
|
|||
|
Review
|
|||
export default { |
|||
|
Review
|
|||
components: { |
|||
|
Review
|
|||
Confirm, |
|||
|
Review
|
|||
}, |
|||
|
Review
|
|||
props: {}, |
|||
|
Review
|
|||
emits: ["added"], |
|||
|
Review
|
|||
data() { |
|||
|
Review
|
|||
return { |
|||
|
Review
|
|||
model: null, |
|||
|
Review
|
|||
processing: false, |
|||
|
Review
|
|||
id: null, |
|||
|
Review
|
|||
proxy: { |
|||
|
Review
|
|||
protocol: null, |
|||
|
Review
|
|||
host: null, |
|||
|
Review
|
|||
port: null, |
|||
|
Review
|
|||
auth: false, |
|||
|
Review
|
|||
username: null, |
|||
|
Review
|
|||
password: null, |
|||
|
Review
|
|||
active: false, |
|||
|
Review
|
|||
default: false, |
|||
|
Review
|
|||
applyExisting: false, |
|||
|
Review
|
|||
} |
|||
|
Review
|
|||
}; |
|||
|
Review
|
|||
}, |
|||
|
Review
|
|||
|
|||
|
Review
|
|||
mounted() { |
|||
|
Review
|
|||
this.modal = new Modal(this.$refs.modal); |
|||
|
Review
|
|||
}, |
|||
|
Review
|
|||
|
|||
|
Review
|
|||
methods: { |
|||
|
Review
|
|||
deleteConfirm() { |
|||
|
Review
|
|||
this.modal.hide(); |
|||
|
Review
|
|||
this.$refs.confirmDelete.show(); |
|||
|
Review
|
|||
}, |
|||
|
Review
|
|||
|
|||
|
Review
|
|||
show(proxyID) { |
|||
|
Review
|
|||
if (proxyID) { |
|||
|
Review
|
|||
this.id = proxyID; |
|||
|
Review
|
|||
|
|||
|
Review
|
|||
for (let proxy of this.$root.proxyList) { |
|||
|
Review
|
|||
if (proxy.id === proxyID) { |
|||
|
Review
|
|||
this.proxy = proxy; |
|||
|
Review
|
|||
break; |
|||
|
Review
|
|||
} |
|||
|
Review
|
|||
} |
|||
|
Review
|
|||
} else { |
|||
|
Review
|
|||
this.id = null; |
|||
|
Review
|
|||
this.proxy = { |
|||
|
Review
|
|||
protocol: "https", |
|||
|
Review
|
|||
host: null, |
|||
|
Review
|
|||
port: null, |
|||
|
Review
|
|||
auth: false, |
|||
|
Review
|
|||
username: null, |
|||
|
Review
|
|||
password: null, |
|||
|
Review
|
|||
active: true, |
|||
|
Review
|
|||
default: false, |
|||
|
Review
|
|||
applyExisting: false, |
|||
|
Review
|
|||
}; |
|||
|
Review
|
|||
} |
|||
|
Review
|
|||
|
|||
|
Review
|
|||
this.modal.show(); |
|||
|
Review
|
|||
}, |
|||
|
Review
|
|||
|
|||
|
Review
|
|||
submit() { |
|||
|
Review
|
|||
this.processing = true; |
|||
|
Review
|
|||
this.$root.getSocket().emit("addProxy", this.proxy, this.id, (res) => { |
|||
|
Review
|
|||
this.$root.toastRes(res); |
|||
|
Review
|
|||
this.processing = false; |
|||
|
Review
|
|||
|
|||
|
Review
|
|||
if (res.ok) { |
|||
|
Review
|
|||
this.modal.hide(); |
|||
|
Review
|
|||
|
|||
|
Review
|
|||
// Emit added event, doesn't emit edit. |
|||
|
Review
|
|||
if (! this.id) { |
|||
|
Review
|
|||
this.$emit("added", res.id); |
|||
|
Review
|
|||
} |
|||
|
Review
|
|||
} |
|||
|
Review
|
|||
}); |
|||
|
Review
|
|||
}, |
|||
|
Review
|
|||
|
|||
|
Review
|
|||
deleteProxy() { |
|||
|
Review
|
|||
this.processing = true; |
|||
|
Review
|
|||
this.$root.getSocket().emit("deleteProxy", this.id, (res) => { |
|||
|
Review
|
|||
this.$root.toastRes(res); |
|||
|
Review
|
|||
this.processing = false; |
|||
|
Review
|
|||
|
|||
|
Review
|
|||
if (res.ok) { |
|||
|
Review
|
|||
this.modal.hide(); |
|||
|
Review
|
|||
} |
|||
|
Review
|
|||
}); |
|||
|
Review
|
|||
}, |
|||
|
Review
|
|||
}, |
|||
|
Review
|
|||
}; |
|||
|
Review
|
|||
</script> |
|||
|
Review
|
|||
|
|||
|
Review
|
|||
<style lang="scss" scoped> |
|||
|
Review
|
|||
@import "../assets/vars.scss"; |
|||
|
Review
|
|||
|
|||
|
Review
|
|||
.dark { |
|||
|
Review
|
|||
.modal-dialog .form-text, .modal-dialog p { |
|||
|
Review
|
|||
color: $dark-font-color; |
|||
|
Review
|
|||
} |
|||
|
Review
|
|||
} |
|||
|
Review
|
|||
</style> |
|||
|
Review
|
|||
Loading…
Reference in new issue