Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
/*
Warnings:

- A unique constraint covering the columns `[job_id,proxy_id]` on the table `proxy_job` will be added. If there are existing duplicate values, this will fail.

*/
-- CreateIndex
CREATE UNIQUE INDEX `proxy_job_job_id_proxy_id_key` ON `proxy_job`(`job_id`, `proxy_id`);
1 change: 1 addition & 0 deletions prisma/schema.prisma
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ model proxy_job {

@@index([job_id], map: "job_id")
@@index([proxy_id], map: "proxy_id")
@@unique([job_id, proxy_id])
}

model schedule_job {
Expand Down
34 changes: 34 additions & 0 deletions src/api/proxies/proxies.controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@ import { t } from "elysia";

import { proxy_status } from "@generated/prisma";
import {
addProxiesToJob,
addProxy,
addProxyToJob,
deleteProxy,
getAllProxies,
getJobProxies,
getProxy,
removeProxyFromJob,
testProxyViaTheAPI,
Expand Down Expand Up @@ -51,6 +53,26 @@ export const proxiesController = createElysia({ prefix: "/proxies" })
}),
},
)
.get(
"/getJobProxies",
({ query }) => {
return getJobProxies(query.jobId).then((data) => {
return data?.proxies?.map((e) => {
return {
id: e.id,
proxy_id: e.proxy_id,
proxy_ip: e.proxy.proxy_ip,
proxy_port: e.proxy.proxy_port,
};
});
});
},
{
query: z.object({
jobId: z.coerce.number(),
}),
},
)
.post(
"/addProxy",
({ body }) => {
Expand Down Expand Up @@ -118,6 +140,18 @@ export const proxiesController = createElysia({ prefix: "/proxies" })
}),
},
)
.post(
"/addProxiesToJob",
({ body }) => {
return addProxiesToJob(Number(body.job_id ?? 0), body.proxy_ids);
},
{
body: z.object({
job_id: z.coerce.number().positive(),
proxy_ids: z.array(z.coerce.number().positive()),
}),
},
)
Comment thread
moda20 marked this conversation as resolved.
.post(
"/removeProxyFromJob",
({ body }) => {
Expand Down
6 changes: 3 additions & 3 deletions src/generated/prisma/edge.js

Large diffs are not rendered by default.

8 changes: 7 additions & 1 deletion src/generated/prisma/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9250,6 +9250,7 @@ export namespace Prisma {

export type proxy_jobWhereUniqueInput = Prisma.AtLeast<{
id?: number
job_id_proxy_id?: proxy_jobJob_idProxy_idCompoundUniqueInput
AND?: proxy_jobWhereInput | proxy_jobWhereInput[]
OR?: proxy_jobWhereInput[]
NOT?: proxy_jobWhereInput | proxy_jobWhereInput[]
Expand All @@ -9261,7 +9262,7 @@ export namespace Prisma {
injection_count?: IntFilter<"proxy_job"> | number
schedule_job?: XOR<Schedule_jobScalarRelationFilter, schedule_jobWhereInput>
proxy?: XOR<ProxyScalarRelationFilter, proxyWhereInput>
}, "id">
}, "id" | "job_id_proxy_id">

export type proxy_jobOrderByWithAggregationInput = {
id?: SortOrder
Expand Down Expand Up @@ -10478,6 +10479,11 @@ export namespace Prisma {
isNot?: proxyWhereInput
}

export type proxy_jobJob_idProxy_idCompoundUniqueInput = {
job_id: number
proxy_id: number
}

export type proxy_jobCountOrderByAggregateInput = {
id?: SortOrder
job_id?: SortOrder
Expand Down
6 changes: 3 additions & 3 deletions src/generated/prisma/index.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/generated/prisma/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "prisma-client-9589e7a8c6192533fb208745603407f8a8dbfb8ff2d72b3e3644670f1ceb717a",
"name": "prisma-client-d65e57739e4de989cedac12e719a995e7d206787f5b01131a3cb4f031ac585c1",
"main": "index.js",
"types": "index.d.ts",
"browser": "default.js",
Expand Down
1 change: 1 addition & 0 deletions src/generated/prisma/schema.prisma
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ model proxy_job {
schedule_job schedule_job @relation(fields: [job_id], references: [job_id], onDelete: NoAction, onUpdate: NoAction, map: "proxy_job_ibfk_1")
proxy proxy @relation(fields: [proxy_id], references: [id], onDelete: NoAction, onUpdate: NoAction, map: "proxy_job_ibfk_2")

@@unique([job_id, proxy_id])
@@index([job_id], map: "job_id")
@@index([proxy_id], map: "proxy_id")
}
Expand Down
4 changes: 2 additions & 2 deletions src/generated/prisma/wasm.js
Original file line number Diff line number Diff line change
Expand Up @@ -307,8 +307,8 @@ const config = {
}
}
},
"inlineSchema": "generator client {\n provider = \"prisma-client-js\"\n output = \"../src/generated/prisma\"\n binaryTargets = [\"linux-arm64-openssl-1.1.x\", \"darwin-arm64\", \"debian-openssl-1.1.x\", \"linux-arm64-openssl-3.0.x\", \"debian-openssl-3.0.x\"]\n}\n\ndatasource db {\n provider = \"mysql\"\n url = env(\"DATABASE_URL\")\n}\n\n/// This model or at least one of its fields has comments in the database, and requires an additional setup for migrations: Read more: https://pris.ly/d/database-comments\nmodel cache_files {\n id Int @id @unique(map: \"id\") @default(autoincrement())\n job_log_id String @db.VarChar(255)\n created_at DateTime @default(now()) @db.DateTime(0)\n updated_at DateTime @default(now()) @db.DateTime(0)\n file_name String @db.VarChar(255)\n file_tags String? @db.VarChar(255)\n file_path String @db.VarChar(255)\n file_size BigInt\n time_to_live BigInt\n file_type String @db.VarChar(255)\n last_downloaded DateTime? @db.DateTime(0)\n\n schedule_job_log schedule_job_log @relation(fields: [job_log_id], references: [job_log_id], onDelete: NoAction, onUpdate: NoAction)\n}\n\n/// This model or at least one of its fields has comments in the database, and requires an additional setup for migrations: Read more: https://pris.ly/d/database-comments\nmodel output_files {\n id Int @id @unique(map: \"id\") @default(autoincrement())\n job_log_id String @db.VarChar(255)\n created_at DateTime @default(now()) @db.DateTime(0)\n updated_at DateTime @default(now()) @db.DateTime(0)\n file_name String @db.VarChar(255)\n file_tags String? @db.VarChar(255)\n file_path String @db.VarChar(255)\n file_size BigInt\n file_type String @db.VarChar(255)\n last_downloaded DateTime? @db.DateTime(0)\n\n schedule_job_log schedule_job_log @relation(fields: [job_log_id], references: [job_log_id], onDelete: NoAction, onUpdate: NoAction)\n}\n\n/// This model or at least one of its fields has comments in the database, and requires an additional setup for migrations: Read more: https://pris.ly/d/database-comments\nmodel proxy {\n id Int @id @default(autoincrement())\n proxy_ip String @db.VarChar(255)\n proxy_port Int\n protocol String @db.VarChar(255)\n username String? @db.VarChar(255)\n password String? @db.VarChar(255)\n description String? @db.Text\n status proxy_status @default(active)\n created_at DateTime @default(now()) @db.DateTime(0)\n updated_at DateTime @default(now()) @updatedAt() @db.DateTime(0)\n jobs proxy_job[]\n}\n\n/// This model or at least one of its fields has comments in the database, and requires an additional setup for migrations: Read more: https://pris.ly/d/database-comments\nmodel proxy_job {\n id Int @id @default(autoincrement())\n job_id Int\n proxy_id Int\n created_at DateTime @default(now()) @db.DateTime(0)\n updated_at DateTime @default(now()) @updatedAt() @db.DateTime(0)\n use_count Int @default(0)\n injection_count Int @default(0)\n schedule_job schedule_job @relation(fields: [job_id], references: [job_id], onDelete: NoAction, onUpdate: NoAction, map: \"proxy_job_ibfk_1\")\n proxy proxy @relation(fields: [proxy_id], references: [id], onDelete: NoAction, onUpdate: NoAction, map: \"proxy_job_ibfk_2\")\n\n @@index([job_id], map: \"job_id\")\n @@index([proxy_id], map: \"proxy_id\")\n}\n\nmodel schedule_job {\n job_id Int @id @default(autoincrement())\n job_name String @unique(map: \"job_name\") @default(\"\") @db.VarChar(200)\n job_param String? @db.LongText\n job_cron_setting String @default(\"\") @db.VarChar(100)\n consumer String @default(\"\") @db.VarChar(1000)\n exclusive String @default(\"\") @db.VarChar(5)\n status String @default(\"\") @db.VarChar(10)\n average_time Float? @db.Float\n created_at DateTime? @default(now()) @db.DateTime(0)\n job_logs schedule_job_log[]\n proxies proxy_job[]\n}\n\nmodel schedule_job_log {\n job_log_id String @id @db.VarChar(100)\n job_id Int\n machine String? @db.VarChar(100)\n start_time DateTime @db.DateTime(0)\n end_time DateTime? @db.DateTime(0)\n result String? @db.LongText\n error String? @db.LongText\n schedule_job schedule_job @relation(fields: [job_id], references: [job_id], onDelete: NoAction, onUpdate: NoAction)\n cache_files cache_files[]\n output_files output_files[]\n events job_event_log[]\n\n @@index([job_id], map: \"job_id\")\n}\n\nmodel job_event_log {\n id Int @id @default(autoincrement())\n job_log_id String @db.VarChar(255)\n event String @db.Text\n event_message String @db.LongText\n type String @db.VarChar(255)\n schedule_job_log schedule_job_log @relation(fields: [job_log_id], references: [job_log_id], onDelete: NoAction, onUpdate: NoAction)\n created_at DateTime @default(now()) @db.DateTime(0)\n handled_on DateTime? @db.DateTime(0)\n\n @@index([type], map: \"type\")\n}\n\nenum proxy_status {\n active\n inactive\n}\n",
"inlineSchemaHash": "92317ce2b1bd9881fe4e1aec35e4d3b206faf07d36c51d1681be7e59242b8179",
"inlineSchema": "generator client {\n provider = \"prisma-client-js\"\n output = \"../src/generated/prisma\"\n binaryTargets = [\"linux-arm64-openssl-1.1.x\", \"darwin-arm64\", \"debian-openssl-1.1.x\", \"linux-arm64-openssl-3.0.x\", \"debian-openssl-3.0.x\"]\n}\n\ndatasource db {\n provider = \"mysql\"\n url = env(\"DATABASE_URL\")\n}\n\n/// This model or at least one of its fields has comments in the database, and requires an additional setup for migrations: Read more: https://pris.ly/d/database-comments\nmodel cache_files {\n id Int @id @unique(map: \"id\") @default(autoincrement())\n job_log_id String @db.VarChar(255)\n created_at DateTime @default(now()) @db.DateTime(0)\n updated_at DateTime @default(now()) @db.DateTime(0)\n file_name String @db.VarChar(255)\n file_tags String? @db.VarChar(255)\n file_path String @db.VarChar(255)\n file_size BigInt\n time_to_live BigInt\n file_type String @db.VarChar(255)\n last_downloaded DateTime? @db.DateTime(0)\n\n schedule_job_log schedule_job_log @relation(fields: [job_log_id], references: [job_log_id], onDelete: NoAction, onUpdate: NoAction)\n}\n\n/// This model or at least one of its fields has comments in the database, and requires an additional setup for migrations: Read more: https://pris.ly/d/database-comments\nmodel output_files {\n id Int @id @unique(map: \"id\") @default(autoincrement())\n job_log_id String @db.VarChar(255)\n created_at DateTime @default(now()) @db.DateTime(0)\n updated_at DateTime @default(now()) @db.DateTime(0)\n file_name String @db.VarChar(255)\n file_tags String? @db.VarChar(255)\n file_path String @db.VarChar(255)\n file_size BigInt\n file_type String @db.VarChar(255)\n last_downloaded DateTime? @db.DateTime(0)\n\n schedule_job_log schedule_job_log @relation(fields: [job_log_id], references: [job_log_id], onDelete: NoAction, onUpdate: NoAction)\n}\n\n/// This model or at least one of its fields has comments in the database, and requires an additional setup for migrations: Read more: https://pris.ly/d/database-comments\nmodel proxy {\n id Int @id @default(autoincrement())\n proxy_ip String @db.VarChar(255)\n proxy_port Int\n protocol String @db.VarChar(255)\n username String? @db.VarChar(255)\n password String? @db.VarChar(255)\n description String? @db.Text\n status proxy_status @default(active)\n created_at DateTime @default(now()) @db.DateTime(0)\n updated_at DateTime @default(now()) @updatedAt() @db.DateTime(0)\n jobs proxy_job[]\n}\n\n/// This model or at least one of its fields has comments in the database, and requires an additional setup for migrations: Read more: https://pris.ly/d/database-comments\nmodel proxy_job {\n id Int @id @default(autoincrement())\n job_id Int\n proxy_id Int\n created_at DateTime @default(now()) @db.DateTime(0)\n updated_at DateTime @default(now()) @updatedAt() @db.DateTime(0)\n use_count Int @default(0)\n injection_count Int @default(0)\n schedule_job schedule_job @relation(fields: [job_id], references: [job_id], onDelete: NoAction, onUpdate: NoAction, map: \"proxy_job_ibfk_1\")\n proxy proxy @relation(fields: [proxy_id], references: [id], onDelete: NoAction, onUpdate: NoAction, map: \"proxy_job_ibfk_2\")\n\n @@unique([job_id, proxy_id])\n @@index([job_id], map: \"job_id\")\n @@index([proxy_id], map: \"proxy_id\")\n}\n\nmodel schedule_job {\n job_id Int @id @default(autoincrement())\n job_name String @unique(map: \"job_name\") @default(\"\") @db.VarChar(200)\n job_param String? @db.LongText\n job_cron_setting String @default(\"\") @db.VarChar(100)\n consumer String @default(\"\") @db.VarChar(1000)\n exclusive String @default(\"\") @db.VarChar(5)\n status String @default(\"\") @db.VarChar(10)\n average_time Float? @db.Float\n created_at DateTime? @default(now()) @db.DateTime(0)\n job_logs schedule_job_log[]\n proxies proxy_job[]\n}\n\nmodel schedule_job_log {\n job_log_id String @id @db.VarChar(100)\n job_id Int\n machine String? @db.VarChar(100)\n start_time DateTime @db.DateTime(0)\n end_time DateTime? @db.DateTime(0)\n result String? @db.LongText\n error String? @db.LongText\n schedule_job schedule_job @relation(fields: [job_id], references: [job_id], onDelete: NoAction, onUpdate: NoAction)\n cache_files cache_files[]\n output_files output_files[]\n events job_event_log[]\n\n @@index([job_id], map: \"job_id\")\n}\n\nmodel job_event_log {\n id Int @id @default(autoincrement())\n job_log_id String @db.VarChar(255)\n event String @db.Text\n event_message String @db.LongText\n type String @db.VarChar(255)\n schedule_job_log schedule_job_log @relation(fields: [job_log_id], references: [job_log_id], onDelete: NoAction, onUpdate: NoAction)\n created_at DateTime @default(now()) @db.DateTime(0)\n handled_on DateTime? @db.DateTime(0)\n\n @@index([type], map: \"type\")\n}\n\nenum proxy_status {\n active\n inactive\n}\n",
"inlineSchemaHash": "8d8b4c97aa2ecf0fa2afdb39cedafb0819013eec326cff6ad4f76c38754fd016",
"copyEngine": true
}
config.dirname = '/'
Expand Down
33 changes: 33 additions & 0 deletions src/repositories/proxies.ts
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,39 @@ export const addProxyToJob = async (id: number, job_ids: number[]) => {
});
};

export const addProxiesToJob = async (jobId: number, proxyIds: number[]) => {
const existingJobIdLinks = await prisma.proxy_job.findMany({
where: {
job_id: jobId,
},
});

const linksToDelete = existingJobIdLinks.filter(
(e) => !proxyIds.includes(e.proxy_id),
);
const linksToCreate = proxyIds.filter(
(e) => !existingJobIdLinks.map((e) => e.proxy_id).includes(e),
);

return prisma.$transaction(async (tx) => {
await tx.proxy_job.createMany({
data: linksToCreate.map((proxyId) => ({
proxy_id: proxyId,
job_id: jobId,
})),
});

await tx.proxy_job.deleteMany({
where: {
job_id: jobId,
proxy_id: {
in: linksToDelete.map((e) => e.proxy_id),
},
},
});
});
};
Comment thread
moda20 marked this conversation as resolved.

export const incrementProxyInjection = (proxyJobId: number) => {
return prisma.proxy_job.update({
where: {
Expand Down