open-source/qinglong
1
0
Fork 0
mirror of https://github.com/whyour/qinglong.git synced 2026-06-30 20:35:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

完善拉取私有仓库

Browse Source
This commit is contained in:
whyour
2022-05-18 01:14:10 +08:00
parent 1695b8c0fe
commit 7caabe9063
6 changed files with 96 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
back/api/subscription.ts
+19 -21
View File
@@ -28,17 +28,16 @@ export default (app: Router) => {
celebrate({
body: Joi.object({
type: Joi.string().required(),
schedule: Joi.string().optional(),
interval_schedule: Joi.object().optional(),
name: Joi.string().optional(),
schedule: Joi.string().optional().allow('').allow(null),
interval_schedule: Joi.object().optional().allow('').allow(null),
name: Joi.string().optional().allow('').allow(null),
url: Joi.string().required(),
whitelist: Joi.string().optional(),
blacklist: Joi.string().optional(),
branch: Joi.string().optional(),
dependences: Joi.string().optional(),
status: Joi.number().optional(),
pull_type: Joi.string().optional(),
pull_option: Joi.object().optional(),
whitelist: Joi.string().optional().allow('').allow(null),
blacklist: Joi.string().optional().allow('').allow(null),
branch: Joi.string().optional().allow('').allow(null),
dependences: Joi.string().optional().allow('').allow(null),
pull_type: Joi.string().optional().allow('').allow(null),
pull_option: Joi.object().optional().allow('').allow(null),
schedule_type: Joi.string().required(),
alias: Joi.string().required(),
}),
@@ -157,18 +156,17 @@ export default (app: Router) => {
celebrate({
body: Joi.object({
type: Joi.string().required(),
schedule: Joi.string().optional(),
interval_schedule: Joi.object().optional(),
name: Joi.string().optional(),
schedule: Joi.string().optional().allow('').allow(null),
interval_schedule: Joi.object().optional().allow('').allow(null),
name: Joi.string().optional().allow('').allow(null),
url: Joi.string().required(),
whitelist: Joi.string().optional(),
blacklist: Joi.string().optional(),
branch: Joi.string().optional(),
dependences: Joi.string().optional(),
status: Joi.number().optional(),
pull_type: Joi.string().optional(),
pull_option: Joi.object().optional(),
schedule_type: Joi.string().optional(),
whitelist: Joi.string().optional().allow('').allow(null),
blacklist: Joi.string().optional().allow('').allow(null),
branch: Joi.string().optional().allow('').allow(null),
dependences: Joi.string().optional().allow('').allow(null),
pull_type: Joi.string().optional().allow('').allow(null),
pull_option: Joi.object().optional().allow('').allow(null),
schedule_type: Joi.string().optional().allow('').allow(null),
alias: Joi.string().required(),
id: Joi.number().required(),
}),
back/loaders/express.ts
+2
View File
@@ -13,6 +13,7 @@ import UserService from '../services/user';
import handler from 'serve-handler';
import * as Sentry from '@sentry/node';
import { EnvModel } from '../data/env';
import { errors } from 'celebrate';
export default ({ app }: { app: Application }) => {
app.enable('trust proxy');
@@ -134,6 +135,7 @@ export default ({ app }: { app: Application }) => {
next(err);
});
app.use(errors());
app.use(Sentry.Handlers.errorHandler());
app.use(
back/loaders/initFile.ts
+8
View File
@@ -1,5 +1,6 @@
import fs from 'fs';
import path from 'path';
import os from 'os';
import dotenv from 'dotenv';
import Logger from './logger';
import { fileExist } from '../config/util';
@@ -15,6 +16,8 @@ const confFile = path.join(configPath, 'config.sh');
const authConfigFile = path.join(configPath, 'auth.json');
const sampleConfigFile = path.join(samplePath, 'config.sample.sh');
const sampleAuthFile = path.join(samplePath, 'auth.sample.json');
const homedir = os.homedir();
const sshPath = path.resolve(homedir, '.ssh');
export default async () => {
const authFileExist = await fileExist(authConfigFile);
@@ -23,6 +26,7 @@ export default async () => {
const logDirExist = await fileExist(logPath);
const configDirExist = await fileExist(configPath);
const uploadDirExist = await fileExist(uploadPath);
const sshDirExist = await fileExist(sshPath);
if (!configDirExist) {
fs.mkdirSync(configPath);
@@ -48,6 +52,10 @@ export default async () => {
fs.mkdirSync(uploadPath);
}
if (!sshDirExist) {
fs.mkdirSync(sshPath);
}
dotenv.config({ path: confFile });
Logger.info('✌️ Init file down');
back/services/subscription.ts
+32 -8
View File
@@ -27,6 +27,7 @@ import path from 'path';
import ScheduleService, { TaskCallbacks } from './schedule';
import { SimpleIntervalSchedule } from 'toad-scheduler';
import SockService from './sock';
import SshKeyService from './sshKey';
@Service()
export default class SubscriptionService {
@@ -34,6 +35,7 @@ export default class SubscriptionService {
@Inject('logger') private logger: winston.Logger,
private scheduleService: ScheduleService,
private sockService: SockService,
private sshKeyService: SshKeyService,
) {}
public async list(searchText?: string): Promise<Subscription[]> {
@@ -92,21 +94,44 @@ export default class SubscriptionService {
}
}
private formatCommand(doc: Subscription) {
private formatCommand(doc: Subscription, url?: string) {
let command = 'ql ';
const { type, url, whitelist, blacklist, dependences, branch } = doc;
let _url = url || doc.url;
const { type, whitelist, blacklist, dependences, branch } = doc;
if (type === 'file') {
command += `raw "${url}"`;
command += `raw "${_url}"`;
} else {
command += `repo "${url}" "${whitelist || ''}" "${blacklist || ''}" "${
command += `repo "${_url}" "${whitelist || ''}" "${blacklist || ''}" "${
dependences || ''
}" "${branch || ''}"`;
}
return command;
}
private handleTask(doc: Subscription, needCreate = true) {
doc.command = this.formatCommand(doc);
private handleTask(doc: Subscription, needCreate = true, needAddKey = true) {
let url = doc.url;
if (doc.type === 'private-repo') {
if (doc.pull_type === 'ssh-key') {
const host = doc.url!.replace(/.*\@([^\:]+)\:.*/, '$1');
url = doc.url!.replace(host, doc.alias);
if (needAddKey) {
this.sshKeyService.addSSHKey(
(doc.pull_option as any).private_key,
doc.alias,
host,
);
} else {
this.sshKeyService.removeSSHKey(doc.alias, host);
}
} else {
const host = doc.url!.replace(/.*\:\/\/([^\/]+)\/.*/, '$1');
const { username, password } = doc.pull_option as any;
url = doc.url!.replace(host, `${username}:${password}@${host}`);
}
}
doc.command = this.formatCommand(doc, url as string);
if (doc.schedule_type === 'crontab') {
this.scheduleService.cancelCronTask(doc as any);
needCreate &&
@@ -191,7 +216,6 @@ export default class SubscriptionService {
public async create(payload: Subscription): Promise<Subscription> {
const tab = new Subscription(payload);
console.log(tab);
const doc = await this.insert(tab);
this.handleTask(doc);
return doc;
@@ -246,7 +270,7 @@ export default class SubscriptionService {
public async remove(ids: number[]) {
const docs = await SubscriptionModel.findAll({ where: { id: ids } });
for (const doc of docs) {
this.handleTask(doc, false);
this.handleTask(doc, false, false);
}
await SubscriptionModel.destroy({ where: { id: ids } });
}