mirror of
https://git.mirrors.martin98.com/https://github.com/sub-store-org/Sub-Store.git
synced 2026-03-25 15:13:18 +08:00
Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f96d9dea74 | ||
|
|
01eb69d8ae | ||
|
|
797ba6f601 | ||
|
|
128353a7f3 |
1
.github/workflows/main.yml
vendored
1
.github/workflows/main.yml
vendored
@@ -1,5 +1,6 @@
|
||||
name: build
|
||||
on:
|
||||
workflow_dispatch:
|
||||
push:
|
||||
branches:
|
||||
- master
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "sub-store",
|
||||
"version": "2.16.6",
|
||||
"version": "2.16.8",
|
||||
"description": "Advanced Subscription Manager for QX, Loon, Surge, Stash and ShadowRocket.",
|
||||
"main": "src/main.js",
|
||||
"scripts": {
|
||||
|
||||
@@ -66,6 +66,8 @@ function shadowsocks(proxy, includeUnsupportedProxy) {
|
||||
`${proxy.name}=shadowsocks,${proxy.server},${proxy.port},${proxy.cipher},"${proxy.password}"`,
|
||||
);
|
||||
|
||||
let isShadowTLS;
|
||||
|
||||
// obfs
|
||||
if (isPresent(proxy, 'plugin')) {
|
||||
if (proxy.plugin === 'obfs') {
|
||||
@@ -97,6 +99,7 @@ function shadowsocks(proxy, includeUnsupportedProxy) {
|
||||
);
|
||||
// udp-port
|
||||
result.appendIfPresent(`,udp-port=${proxy['udp-port']}`, 'udp-port');
|
||||
isShadowTLS = true;
|
||||
} else if (['shadow-tls'].includes(proxy.plugin) && proxy['plugin-opts']) {
|
||||
const password = proxy['plugin-opts'].password;
|
||||
const host = proxy['plugin-opts'].host;
|
||||
@@ -119,6 +122,7 @@ function shadowsocks(proxy, includeUnsupportedProxy) {
|
||||
`,udp-port=${proxy['udp-port']}`,
|
||||
'udp-port',
|
||||
);
|
||||
isShadowTLS = true;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -130,7 +134,7 @@ function shadowsocks(proxy, includeUnsupportedProxy) {
|
||||
result.append(`,udp=true`);
|
||||
}
|
||||
|
||||
if (!includeUnsupportedProxy && result.includes(',shadow-tls-password=')) {
|
||||
if (!includeUnsupportedProxy && isShadowTLS) {
|
||||
throw new Error(
|
||||
`shadow-tls is not supported(请使用 includeUnsupportedProxy 参数)`,
|
||||
);
|
||||
|
||||
@@ -174,6 +174,14 @@ async function doSync() {
|
||||
|
||||
const resp = await syncToGist(files);
|
||||
const body = JSON.parse(resp.body);
|
||||
delete body.history;
|
||||
delete body.forks;
|
||||
delete body.owner;
|
||||
Object.values(body.files).forEach((file) => {
|
||||
delete file.content;
|
||||
});
|
||||
$.info('上传配置响应:');
|
||||
$.info(JSON.stringify(body, null, 2));
|
||||
|
||||
for (const artifact of allArtifacts) {
|
||||
if (artifact.sync) {
|
||||
|
||||
@@ -625,6 +625,15 @@ async function syncArtifacts() {
|
||||
const resp = await syncToGist(files);
|
||||
const body = JSON.parse(resp.body);
|
||||
|
||||
delete body.history;
|
||||
delete body.forks;
|
||||
delete body.owner;
|
||||
Object.values(body.files).forEach((file) => {
|
||||
delete file.content;
|
||||
});
|
||||
$.info('上传配置响应:');
|
||||
$.info(JSON.stringify(body, null, 2));
|
||||
|
||||
for (const artifact of allArtifacts) {
|
||||
if (artifact.sync) {
|
||||
artifact.updated = new Date().getTime();
|
||||
@@ -743,6 +752,16 @@ async function syncArtifact(req, res) {
|
||||
});
|
||||
artifact.updated = new Date().getTime();
|
||||
const body = JSON.parse(resp.body);
|
||||
|
||||
delete body.history;
|
||||
delete body.forks;
|
||||
delete body.owner;
|
||||
Object.values(body.files).forEach((file) => {
|
||||
delete file.content;
|
||||
});
|
||||
$.info('上传配置响应:');
|
||||
$.info(JSON.stringify(body, null, 2));
|
||||
|
||||
let files = body.files;
|
||||
let isGitLab;
|
||||
if (Array.isArray(files)) {
|
||||
|
||||
@@ -114,15 +114,17 @@ export default class Gist {
|
||||
return;
|
||||
});
|
||||
} else {
|
||||
return this.http.get('/gists').then((response) => {
|
||||
const gists = JSON.parse(response.body);
|
||||
for (let g of gists) {
|
||||
if (g.description === this.key) {
|
||||
return g;
|
||||
return this.http
|
||||
.get('/gists?per_page=100&page=1')
|
||||
.then((response) => {
|
||||
const gists = JSON.parse(response.body);
|
||||
for (let g of gists) {
|
||||
if (g.description === this.key) {
|
||||
return g;
|
||||
}
|
||||
}
|
||||
}
|
||||
return;
|
||||
});
|
||||
return;
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user