Compare commits
1 Commits
main
...
admin-rede
| Author | SHA1 | Date |
|---|---|---|
 nameless
|
09cb438e0c |
|
|
@ -1,4 +1,3 @@
|
||||||
.env
|
.env
|
||||||
*.db
|
*.db
|
||||||
*.db-*
|
*.db-*
|
||||||
deno.lock
|
|
||||||
|
|
|
||||||
|
|
@ -1,128 +1,129 @@
|
||||||
|
import { Model } from "indexed_kv";
|
||||||
import { info } from "std/log/mod.ts";
|
import { info } from "std/log/mod.ts";
|
||||||
import { Elysia, Static, t } from "elysia";
|
import { createEndpoint, createMethodFilter, createPathFilter } from "t_rest/server";
|
||||||
import { Admin, adminSchema, adminStore } from "../app/adminStore.ts";
|
import { Admin, adminSchema, adminStore } from "../app/adminStore.ts";
|
||||||
import { getUser, withSessionAdmin, withSessionUser } from "./getUser.ts";
|
import { getUser, withAdmin, withUser } from "./withUser.ts";
|
||||||
import { TkvEntry } from "../utils/Tkv.ts";
|
|
||||||
|
|
||||||
const adminDataSchema = t.Intersect([adminSchema, t.Object({ tgUserId: t.Number() })]);
|
export type AdminData = Admin & { id: string };
|
||||||
|
|
||||||
export type AdminData = Static<typeof adminDataSchema>;
|
function getAdminData(adminEntry: Model<Admin>): AdminData {
|
||||||
|
return { id: adminEntry.id, ...adminEntry.value };
|
||||||
function getAdminData(adminEntry: TkvEntry<["admins", number], Admin>): AdminData {
|
|
||||||
return { tgUserId: adminEntry.key[1], ...adminEntry.value };
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export const adminsRoute = new Elysia()
|
export const adminsRoute = createPathFilter({
|
||||||
.get(
|
"": createMethodFilter({
|
||||||
"",
|
GET: createEndpoint(
|
||||||
async () => {
|
{},
|
||||||
const adminEntries = await Array.fromAsync(adminStore.list({ prefix: ["admins"] }));
|
async () => {
|
||||||
const admins = adminEntries.map(getAdminData);
|
const adminEntries = await adminStore.getAll();
|
||||||
return admins;
|
const admins = adminEntries.map(getAdminData);
|
||||||
},
|
return {
|
||||||
{
|
status: 200,
|
||||||
response: t.Array(adminDataSchema),
|
body: { type: "application/json", data: admins satisfies AdminData[] },
|
||||||
},
|
};
|
||||||
)
|
|
||||||
.post(
|
|
||||||
"",
|
|
||||||
async ({ query, body, set }) => {
|
|
||||||
return withSessionAdmin({ query, set }, async (sessionUser, sessionAdminEntry) => {
|
|
||||||
const newAdminUser = await getUser(body.tgUserId);
|
|
||||||
const newAdminKey = ["admins", body.tgUserId] as const;
|
|
||||||
const newAdminValue = { promotedBy: sessionAdminEntry.key[1] };
|
|
||||||
const newAdminResult = await adminStore.atomicSet(newAdminKey, null, newAdminValue);
|
|
||||||
if (!newAdminResult.ok) {
|
|
||||||
set.status = 409;
|
|
||||||
return "User is already an admin";
|
|
||||||
}
|
|
||||||
info(`User ${sessionUser.first_name} promoted user ${newAdminUser.first_name} to admin`);
|
|
||||||
return getAdminData({ ...newAdminResult, key: newAdminKey, value: newAdminValue });
|
|
||||||
});
|
|
||||||
},
|
|
||||||
{
|
|
||||||
query: t.Object({ sessionId: t.String() }),
|
|
||||||
body: t.Object({
|
|
||||||
tgUserId: t.Number(),
|
|
||||||
}),
|
|
||||||
response: {
|
|
||||||
200: adminDataSchema,
|
|
||||||
401: t.Literal("Must be logged in"),
|
|
||||||
403: t.Literal("Must be an admin"),
|
|
||||||
409: t.Literal("User is already an admin"),
|
|
||||||
},
|
},
|
||||||
},
|
),
|
||||||
)
|
POST: createEndpoint(
|
||||||
.post(
|
{
|
||||||
"/promote_self",
|
query: {
|
||||||
// if there are no admins, allow any user to promote themselves
|
sessionId: { type: "string" },
|
||||||
async ({ query, set }) => {
|
},
|
||||||
return withSessionUser({ query, set }, async (sessionUser) => {
|
body: {
|
||||||
const adminEntries = await Array.fromAsync(adminStore.list({ prefix: ["admins"] }));
|
type: "application/json",
|
||||||
if (adminEntries.length !== 0) {
|
schema: {
|
||||||
set.status = 409;
|
type: "object",
|
||||||
return "You are not allowed to promote yourself";
|
properties: {
|
||||||
}
|
tgUserId: adminSchema.properties.tgUserId,
|
||||||
const newAdminKey = ["admins", sessionUser.id] as const;
|
},
|
||||||
const newAdminValue = { promotedBy: null };
|
required: ["tgUserId"],
|
||||||
const newAdminResult = await adminStore.set(newAdminKey, newAdminValue);
|
},
|
||||||
info(`User ${sessionUser.first_name} promoted themselves to admin`);
|
},
|
||||||
return getAdminData({ ...newAdminResult, key: newAdminKey, value: newAdminValue });
|
|
||||||
});
|
|
||||||
},
|
|
||||||
{
|
|
||||||
query: t.Object({ sessionId: t.String() }),
|
|
||||||
response: {
|
|
||||||
200: adminDataSchema,
|
|
||||||
401: t.Literal("Must be logged in"),
|
|
||||||
403: t.Literal("Must be an admin"),
|
|
||||||
409: t.Literal("You are not allowed to promote yourself"),
|
|
||||||
},
|
},
|
||||||
},
|
async ({ query, body }) => {
|
||||||
)
|
return withAdmin(query, async (user, adminEntry) => {
|
||||||
.get(
|
const newAdminUser = await getUser(body.data.tgUserId);
|
||||||
"/:adminId",
|
const newAdminEntry = await adminStore.create({
|
||||||
async ({ params, set }) => {
|
tgUserId: body.data.tgUserId,
|
||||||
const adminEntry = await adminStore.get(["admins", Number(params.adminId)]);
|
promotedBy: adminEntry.id,
|
||||||
if (!adminEntry.versionstamp) {
|
});
|
||||||
set.status = 404;
|
info(`User ${user.first_name} promoted user ${newAdminUser.first_name} to admin`);
|
||||||
return "Admin not found";
|
return {
|
||||||
}
|
status: 200,
|
||||||
return getAdminData(adminEntry);
|
body: { type: "application/json", data: getAdminData(newAdminEntry) },
|
||||||
},
|
};
|
||||||
{
|
});
|
||||||
params: t.Object({ adminId: t.String() }),
|
|
||||||
response: {
|
|
||||||
200: adminDataSchema,
|
|
||||||
404: t.Literal("Admin not found"),
|
|
||||||
},
|
},
|
||||||
},
|
),
|
||||||
)
|
}),
|
||||||
.delete(
|
|
||||||
"/:adminId",
|
"promote_self": createMethodFilter({
|
||||||
async ({ params, query, set }) => {
|
POST: createEndpoint(
|
||||||
return withSessionAdmin({ query, set }, async (sessionUser) => {
|
{
|
||||||
const deletedAdminEntry = await adminStore.get(["admins", Number(params.adminId)]);
|
query: {
|
||||||
if (!deletedAdminEntry.versionstamp) {
|
sessionId: { type: "string" },
|
||||||
set.status = 404;
|
},
|
||||||
return "Admin not found";
|
|
||||||
}
|
|
||||||
const deletedAdminUser = await getUser(deletedAdminEntry.key[1]);
|
|
||||||
await adminStore.delete(["admins", Number(params.adminId)]);
|
|
||||||
info(
|
|
||||||
`User ${sessionUser.first_name} demoted user ${deletedAdminUser.first_name} from admin`,
|
|
||||||
);
|
|
||||||
return null;
|
|
||||||
});
|
|
||||||
},
|
|
||||||
{
|
|
||||||
params: t.Object({ adminId: t.String() }),
|
|
||||||
query: t.Object({ sessionId: t.String() }),
|
|
||||||
response: {
|
|
||||||
200: t.Null(),
|
|
||||||
401: t.Literal("Must be logged in"),
|
|
||||||
403: t.Literal("Must be an admin"),
|
|
||||||
404: t.Literal("Admin not found"),
|
|
||||||
},
|
},
|
||||||
},
|
// if there are no admins, allow any user to promote themselves
|
||||||
);
|
async ({ query }) => {
|
||||||
|
return withUser(query, async (user) => {
|
||||||
|
const adminEntries = await adminStore.getAll();
|
||||||
|
if (adminEntries.length === 0) {
|
||||||
|
const newAdminEntry = await adminStore.create({
|
||||||
|
tgUserId: user.id,
|
||||||
|
promotedBy: null,
|
||||||
|
});
|
||||||
|
info(`User ${user.first_name} promoted themselves to admin`);
|
||||||
|
return {
|
||||||
|
status: 200,
|
||||||
|
body: { type: "application/json", data: getAdminData(newAdminEntry) },
|
||||||
|
};
|
||||||
|
}
|
||||||
|
return {
|
||||||
|
status: 403,
|
||||||
|
body: { type: "text/plain", data: `You are not allowed to promote yourself` },
|
||||||
|
};
|
||||||
|
});
|
||||||
|
},
|
||||||
|
),
|
||||||
|
}),
|
||||||
|
|
||||||
|
"{adminId}": createPathFilter({
|
||||||
|
"": createMethodFilter({
|
||||||
|
GET: createEndpoint(
|
||||||
|
{},
|
||||||
|
async ({ params }) => {
|
||||||
|
const adminEntry = await adminStore.getById(params.adminId!);
|
||||||
|
if (!adminEntry) {
|
||||||
|
return { status: 404, body: { type: "text/plain", data: `Admin not found` } };
|
||||||
|
}
|
||||||
|
return {
|
||||||
|
status: 200,
|
||||||
|
body: { type: "application/json", data: getAdminData(adminEntry) },
|
||||||
|
};
|
||||||
|
},
|
||||||
|
),
|
||||||
|
DELETE: createEndpoint(
|
||||||
|
{
|
||||||
|
query: {
|
||||||
|
sessionId: { type: "string" },
|
||||||
|
},
|
||||||
|
},
|
||||||
|
async ({ params, query }) => {
|
||||||
|
const deletedAdminEntry = await adminStore.getById(params.adminId!);
|
||||||
|
if (!deletedAdminEntry) {
|
||||||
|
return { status: 404, body: { type: "text/plain", data: `Admin not found` } };
|
||||||
|
}
|
||||||
|
const deletedAdminUser = await getUser(deletedAdminEntry.value.tgUserId);
|
||||||
|
return withUser(query, async (chat) => {
|
||||||
|
await deletedAdminEntry.delete();
|
||||||
|
info(`User ${chat.first_name} demoted user ${deletedAdminUser.first_name} from admin`);
|
||||||
|
return {
|
||||||
|
status: 200,
|
||||||
|
body: { type: "application/json", data: null },
|
||||||
|
};
|
||||||
|
});
|
||||||
|
},
|
||||||
|
),
|
||||||
|
}),
|
||||||
|
}),
|
||||||
|
});
|
||||||
|
|
|
||||||
|
|
@ -1,14 +1,9 @@
|
||||||
import { Elysia, t } from "elysia";
|
import { createEndpoint, createMethodFilter } from "t_rest/server";
|
||||||
import { bot } from "../bot/mod.ts";
|
import { bot } from "../bot/mod.ts";
|
||||||
|
|
||||||
export const botRoute = new Elysia()
|
export const botRoute = createMethodFilter({
|
||||||
.get(
|
GET: createEndpoint({ query: null, body: null }, async () => {
|
||||||
"",
|
const username = bot.botInfo.username;
|
||||||
async () => {
|
return { status: 200, body: { type: "application/json", data: { username } } };
|
||||||
const username = bot.botInfo.username;
|
}),
|
||||||
return { username };
|
});
|
||||||
},
|
|
||||||
{
|
|
||||||
response: t.Object({ username: t.String() }),
|
|
||||||
},
|
|
||||||
);
|
|
||||||
|
|
|
||||||
|
|
@ -1,45 +0,0 @@
|
||||||
import { Chat } from "grammy_types";
|
|
||||||
import { Admin, adminStore } from "../app/adminStore.ts";
|
|
||||||
import { bot } from "../bot/mod.ts";
|
|
||||||
import { sessions } from "./sessionsRoute.ts";
|
|
||||||
import { TkvEntry } from "../utils/Tkv.ts";
|
|
||||||
|
|
||||||
export async function withSessionUser<O>(
|
|
||||||
{ query, set }: { query: { sessionId: string }; set: { status?: string | number } },
|
|
||||||
cb: (sessionUser: Chat.PrivateGetChat) => Promise<O>,
|
|
||||||
) {
|
|
||||||
const session = sessions.get(query.sessionId);
|
|
||||||
if (!session?.userId) {
|
|
||||||
set.status = 401;
|
|
||||||
return "Must be logged in";
|
|
||||||
}
|
|
||||||
const user = await getUser(session.userId);
|
|
||||||
return cb(user);
|
|
||||||
}
|
|
||||||
|
|
||||||
export async function withSessionAdmin<O>(
|
|
||||||
{ query, set }: { query: { sessionId: string }; set: { status?: string | number } },
|
|
||||||
cb: (
|
|
||||||
sessionUser: Chat.PrivateGetChat,
|
|
||||||
sessionAdminEntry: TkvEntry<["admins", number], Admin>,
|
|
||||||
) => Promise<O>,
|
|
||||||
) {
|
|
||||||
const session = sessions.get(query.sessionId);
|
|
||||||
if (!session?.userId) {
|
|
||||||
set.status = 401;
|
|
||||||
return "Must be logged in";
|
|
||||||
}
|
|
||||||
const sessionUser = await getUser(session.userId);
|
|
||||||
const sessionAdminEntry = await adminStore.get(["admins", sessionUser.id]);
|
|
||||||
if (!sessionAdminEntry.versionstamp) {
|
|
||||||
set.status = 403;
|
|
||||||
return "Must be an admin";
|
|
||||||
}
|
|
||||||
return cb(sessionUser, sessionAdminEntry);
|
|
||||||
}
|
|
||||||
|
|
||||||
export async function getUser(userId: number): Promise<Chat.PrivateGetChat> {
|
|
||||||
const chat = await bot.api.getChat(userId);
|
|
||||||
if (chat.type !== "private") throw new Error("Chat is not private");
|
|
||||||
return chat;
|
|
||||||
}
|
|
||||||
|
|
@ -1,40 +1,15 @@
|
||||||
import { Elysia, t } from "elysia";
|
import { createEndpoint, createMethodFilter } from "t_rest/server";
|
||||||
import { generationQueue } from "../app/generationQueue.ts";
|
import { generationQueue } from "../app/generationQueue.ts";
|
||||||
|
|
||||||
export const jobsRoute = new Elysia()
|
export const jobsRoute = createMethodFilter({
|
||||||
.get(
|
GET: createEndpoint(
|
||||||
"",
|
{ query: null, body: null },
|
||||||
async () => {
|
async () => ({
|
||||||
const allJobs = await generationQueue.getAllJobs();
|
status: 200,
|
||||||
return allJobs.map((job) => ({
|
body: {
|
||||||
id: job.id.join(":"),
|
type: "application/json",
|
||||||
place: job.place,
|
data: await generationQueue.getAllJobs(),
|
||||||
state: {
|
},
|
||||||
from: {
|
}),
|
||||||
language_code: job.state.from.language_code ?? null,
|
),
|
||||||
first_name: job.state.from.first_name,
|
});
|
||||||
last_name: job.state.from.last_name ?? null,
|
|
||||||
username: job.state.from.username ?? null,
|
|
||||||
},
|
|
||||||
progress: job.state.progress ?? null,
|
|
||||||
workerInstanceKey: job.state.workerInstanceKey ?? null,
|
|
||||||
},
|
|
||||||
}));
|
|
||||||
},
|
|
||||||
{
|
|
||||||
response: t.Array(t.Object({
|
|
||||||
id: t.String(),
|
|
||||||
place: t.Number(),
|
|
||||||
state: t.Object({
|
|
||||||
from: t.Object({
|
|
||||||
language_code: t.Nullable(t.String()),
|
|
||||||
first_name: t.String(),
|
|
||||||
last_name: t.Nullable(t.String()),
|
|
||||||
username: t.Nullable(t.String()),
|
|
||||||
}),
|
|
||||||
progress: t.Nullable(t.Number()),
|
|
||||||
workerInstanceKey: t.Nullable(t.String()),
|
|
||||||
}),
|
|
||||||
})),
|
|
||||||
},
|
|
||||||
);
|
|
||||||
|
|
|
||||||
|
|
@ -1,12 +1,12 @@
|
||||||
import { route } from "reroute";
|
import { route } from "reroute";
|
||||||
import { serveSpa } from "serve_spa";
|
import { serveSpa } from "serve_spa";
|
||||||
import { api } from "./serveApi.ts";
|
import { serveApi } from "./serveApi.ts";
|
||||||
import { fromFileUrl } from "std/path/mod.ts";
|
import { fromFileUrl } from "std/path/mod.ts";
|
||||||
|
|
||||||
export async function serveUi() {
|
export async function serveUi() {
|
||||||
const server = Deno.serve({ port: 5999 }, (request) =>
|
const server = Deno.serve({ port: 5999 }, (request) =>
|
||||||
route(request, {
|
route(request, {
|
||||||
"/api/*": (request) => api.fetch(request),
|
"/api/*": (request) => serveApi(request),
|
||||||
"/*": (request) =>
|
"/*": (request) =>
|
||||||
serveSpa(request, {
|
serveSpa(request, {
|
||||||
fsRoot: fromFileUrl(new URL("../ui/", import.meta.url)),
|
fsRoot: fromFileUrl(new URL("../ui/", import.meta.url)),
|
||||||
|
|
|
||||||
|
|
@ -1,39 +1,34 @@
|
||||||
import { Elysia, t } from "elysia";
|
import { deepMerge } from "std/collections/deep_merge.ts";
|
||||||
import { info } from "std/log/mod.ts";
|
import { info } from "std/log/mod.ts";
|
||||||
import { defaultParamsSchema, getConfig, setConfig } from "../app/config.ts";
|
import { createEndpoint, createMethodFilter } from "t_rest/server";
|
||||||
import { withSessionAdmin } from "./getUser.ts";
|
import { configSchema, getConfig, setConfig } from "../app/config.ts";
|
||||||
|
import { withAdmin } from "./withUser.ts";
|
||||||
|
|
||||||
export const paramsRoute = new Elysia()
|
export const paramsRoute = createMethodFilter({
|
||||||
.get(
|
GET: createEndpoint(
|
||||||
"",
|
{ query: null, body: null },
|
||||||
async () => {
|
async () => {
|
||||||
const config = await getConfig();
|
const config = await getConfig();
|
||||||
return config.defaultParams;
|
return { status: 200, body: { type: "application/json", data: config.defaultParams } };
|
||||||
},
|
},
|
||||||
|
),
|
||||||
|
|
||||||
|
PATCH: createEndpoint(
|
||||||
{
|
{
|
||||||
response: {
|
query: { sessionId: { type: "string" } },
|
||||||
200: defaultParamsSchema,
|
body: {
|
||||||
|
type: "application/json",
|
||||||
|
schema: configSchema.properties.defaultParams,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
)
|
async ({ query, body }) => {
|
||||||
.patch(
|
return withAdmin(query, async (user) => {
|
||||||
"",
|
|
||||||
async ({ query, body, set }) => {
|
|
||||||
return withSessionAdmin({ query, set }, async (user) => {
|
|
||||||
const config = await getConfig();
|
const config = await getConfig();
|
||||||
info(`User ${user.first_name} updated default params: ${JSON.stringify(body)}`);
|
info(`User ${user.first_name} updated default params: ${JSON.stringify(body.data)}`);
|
||||||
const defaultParams = { ...config.defaultParams, ...body };
|
const defaultParams = deepMerge(config.defaultParams ?? {}, body.data);
|
||||||
await setConfig({ defaultParams });
|
await setConfig({ defaultParams });
|
||||||
return config.defaultParams;
|
return { status: 200, body: { type: "application/json", data: config.defaultParams } };
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
{
|
),
|
||||||
query: t.Object({ sessionId: t.String() }),
|
});
|
||||||
body: defaultParamsSchema,
|
|
||||||
response: {
|
|
||||||
200: defaultParamsSchema,
|
|
||||||
401: t.Literal("Must be logged in"),
|
|
||||||
403: t.Literal("Must be an admin"),
|
|
||||||
},
|
|
||||||
},
|
|
||||||
);
|
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,4 @@
|
||||||
import { Elysia } from "elysia";
|
import { createLoggerMiddleware, createPathFilter } from "t_rest/server";
|
||||||
import { swagger } from "elysia/swagger";
|
|
||||||
import { adminsRoute } from "./adminsRoute.ts";
|
import { adminsRoute } from "./adminsRoute.ts";
|
||||||
import { botRoute } from "./botRoute.ts";
|
import { botRoute } from "./botRoute.ts";
|
||||||
import { jobsRoute } from "./jobsRoute.ts";
|
import { jobsRoute } from "./jobsRoute.ts";
|
||||||
|
|
@ -9,24 +8,18 @@ import { statsRoute } from "./statsRoute.ts";
|
||||||
import { usersRoute } from "./usersRoute.ts";
|
import { usersRoute } from "./usersRoute.ts";
|
||||||
import { workersRoute } from "./workersRoute.ts";
|
import { workersRoute } from "./workersRoute.ts";
|
||||||
|
|
||||||
export const api = new Elysia()
|
export const serveApi = createLoggerMiddleware(
|
||||||
.use(
|
createPathFilter({
|
||||||
swagger({
|
"admins": adminsRoute,
|
||||||
path: "/docs",
|
"bot": botRoute,
|
||||||
swaggerOptions: { url: "docs/json" } as never,
|
"jobs": jobsRoute,
|
||||||
documentation: {
|
"sessions": sessionsRoute,
|
||||||
info: { title: "Eris API", version: "0.1" },
|
"settings/params": paramsRoute,
|
||||||
servers: [{ url: "/api" }],
|
"stats": statsRoute,
|
||||||
},
|
"users": usersRoute,
|
||||||
}),
|
"workers": workersRoute,
|
||||||
)
|
}),
|
||||||
.group("/admins", (api) => api.use(adminsRoute))
|
{ filterStatus: (status) => status >= 400 },
|
||||||
.group("/bot", (api) => api.use(botRoute))
|
);
|
||||||
.group("/jobs", (api) => api.use(jobsRoute))
|
|
||||||
.group("/sessions", (api) => api.use(sessionsRoute))
|
|
||||||
.group("/settings/params", (api) => api.use(paramsRoute))
|
|
||||||
.group("/stats", (api) => api.use(statsRoute))
|
|
||||||
.group("/users", (api) => api.use(usersRoute))
|
|
||||||
.group("/workers", (api) => api.use(workersRoute));
|
|
||||||
|
|
||||||
export type Api = typeof api;
|
export type ApiHandler = typeof serveApi;
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
import { Elysia, NotFoundError, t } from "elysia";
|
import { createEndpoint, createMethodFilter, createPathFilter } from "t_rest/server";
|
||||||
import { ulid } from "ulid";
|
import { ulid } from "ulid";
|
||||||
|
|
||||||
export const sessions = new Map<string, Session>();
|
export const sessions = new Map<string, Session>();
|
||||||
|
|
@ -7,37 +7,30 @@ export interface Session {
|
||||||
userId?: number | undefined;
|
userId?: number | undefined;
|
||||||
}
|
}
|
||||||
|
|
||||||
export const sessionsRoute = new Elysia()
|
export const sessionsRoute = createPathFilter({
|
||||||
.post(
|
"": createMethodFilter({
|
||||||
"",
|
POST: createEndpoint(
|
||||||
async () => {
|
{ query: null, body: null },
|
||||||
const id = ulid();
|
async () => {
|
||||||
const session: Session = {};
|
const id = ulid();
|
||||||
sessions.set(id, session);
|
const session: Session = {};
|
||||||
return { id, userId: session.userId ?? null };
|
sessions.set(id, session);
|
||||||
},
|
return { status: 200, body: { type: "application/json", data: { id, ...session } } };
|
||||||
{
|
},
|
||||||
response: t.Object({
|
),
|
||||||
id: t.String(),
|
}),
|
||||||
userId: t.Nullable(t.Number()),
|
|
||||||
}),
|
"{sessionId}": createMethodFilter({
|
||||||
},
|
GET: createEndpoint(
|
||||||
)
|
{ query: null, body: null },
|
||||||
.get(
|
async ({ params }) => {
|
||||||
"/:sessionId",
|
const id = params.sessionId!;
|
||||||
async ({ params }) => {
|
const session = sessions.get(id);
|
||||||
const id = params.sessionId!;
|
if (!session) {
|
||||||
const session = sessions.get(id);
|
return { status: 401, body: { type: "text/plain", data: "Session not found" } };
|
||||||
if (!session) {
|
}
|
||||||
throw new NotFoundError("Session not found");
|
return { status: 200, body: { type: "application/json", data: { id, ...session } } };
|
||||||
}
|
},
|
||||||
return { id, userId: session.userId ?? null };
|
),
|
||||||
},
|
}),
|
||||||
{
|
});
|
||||||
params: t.Object({ sessionId: t.String() }),
|
|
||||||
response: t.Object({
|
|
||||||
id: t.String(),
|
|
||||||
userId: t.Nullable(t.Number()),
|
|
||||||
}),
|
|
||||||
},
|
|
||||||
);
|
|
||||||
|
|
|
||||||
|
|
@ -1,134 +1,125 @@
|
||||||
import { Elysia, t } from "elysia";
|
|
||||||
import { subMinutes } from "date-fns";
|
import { subMinutes } from "date-fns";
|
||||||
import { dailyStatsSchema, getDailyStats } from "../app/dailyStatsStore.ts";
|
import { createEndpoint, createMethodFilter, createPathFilter } from "t_rest/server";
|
||||||
|
import { getDailyStats } from "../app/dailyStatsStore.ts";
|
||||||
import { generationStore } from "../app/generationStore.ts";
|
import { generationStore } from "../app/generationStore.ts";
|
||||||
import { globalStats } from "../app/globalStats.ts";
|
import { globalStats } from "../app/globalStats.ts";
|
||||||
import { getUserDailyStats, userDailyStatsSchema } from "../app/userDailyStatsStore.ts";
|
import { getUserDailyStats } from "../app/userDailyStatsStore.ts";
|
||||||
import { getUserStats, userStatsSchema } from "../app/userStatsStore.ts";
|
import { getUserStats } from "../app/userStatsStore.ts";
|
||||||
import { withSessionAdmin } from "./getUser.ts";
|
|
||||||
|
|
||||||
const STATS_INTERVAL_MIN = 3;
|
const STATS_INTERVAL_MIN = 3;
|
||||||
|
|
||||||
export const statsRoute = new Elysia()
|
export const statsRoute = createPathFilter({
|
||||||
.get(
|
"": createMethodFilter({
|
||||||
"",
|
GET: createEndpoint(
|
||||||
async () => {
|
{ query: null, body: null },
|
||||||
const after = subMinutes(new Date(), STATS_INTERVAL_MIN);
|
async () => {
|
||||||
const generations = await generationStore.getAll({ after });
|
const after = subMinutes(new Date(), STATS_INTERVAL_MIN);
|
||||||
|
const generations = await generationStore.getAll({ after });
|
||||||
|
|
||||||
const imagesPerMinute = generations.length / STATS_INTERVAL_MIN;
|
const imagesPerMinute = generations.length / STATS_INTERVAL_MIN;
|
||||||
|
|
||||||
const stepsPerMinute = generations
|
const stepsPerMinute = generations
|
||||||
.map((generation) => generation.value.info?.steps ?? 0)
|
.map((generation) => generation.value.info?.steps ?? 0)
|
||||||
.reduce((sum, steps) => sum + steps, 0) / STATS_INTERVAL_MIN;
|
.reduce((sum, steps) => sum + steps, 0) / STATS_INTERVAL_MIN;
|
||||||
|
|
||||||
const pixelsPerMinute = generations
|
const pixelsPerMinute = generations
|
||||||
.map((generation) =>
|
.map((generation) =>
|
||||||
(generation.value.info?.width ?? 0) * (generation.value.info?.height ?? 0)
|
(generation.value.info?.width ?? 0) * (generation.value.info?.height ?? 0)
|
||||||
)
|
)
|
||||||
.reduce((sum, pixels) => sum + pixels, 0) / STATS_INTERVAL_MIN;
|
.reduce((sum, pixels) => sum + pixels, 0) / STATS_INTERVAL_MIN;
|
||||||
|
|
||||||
const pixelStepsPerMinute = generations
|
const pixelStepsPerMinute = generations
|
||||||
.map((generation) =>
|
.map((generation) =>
|
||||||
(generation.value.info?.width ?? 0) * (generation.value.info?.height ?? 0) *
|
(generation.value.info?.width ?? 0) * (generation.value.info?.height ?? 0) *
|
||||||
(generation.value.info?.steps ?? 0)
|
(generation.value.info?.steps ?? 0)
|
||||||
)
|
)
|
||||||
.reduce((sum, pixelSteps) => sum + pixelSteps, 0) / STATS_INTERVAL_MIN;
|
.reduce((sum, pixelSteps) => sum + pixelSteps, 0) / STATS_INTERVAL_MIN;
|
||||||
|
|
||||||
return {
|
|
||||||
imageCount: globalStats.imageCount,
|
|
||||||
stepCount: globalStats.stepCount,
|
|
||||||
pixelCount: globalStats.pixelCount,
|
|
||||||
pixelStepCount: globalStats.pixelStepCount,
|
|
||||||
userCount: globalStats.userIds.length,
|
|
||||||
imagesPerMinute,
|
|
||||||
stepsPerMinute,
|
|
||||||
pixelsPerMinute,
|
|
||||||
pixelStepsPerMinute,
|
|
||||||
};
|
|
||||||
},
|
|
||||||
{
|
|
||||||
response: {
|
|
||||||
200: t.Object({
|
|
||||||
imageCount: t.Number(),
|
|
||||||
stepCount: t.Number(),
|
|
||||||
pixelCount: t.Number(),
|
|
||||||
pixelStepCount: t.Number(),
|
|
||||||
userCount: t.Number(),
|
|
||||||
imagesPerMinute: t.Number(),
|
|
||||||
stepsPerMinute: t.Number(),
|
|
||||||
pixelsPerMinute: t.Number(),
|
|
||||||
pixelStepsPerMinute: t.Number(),
|
|
||||||
}),
|
|
||||||
},
|
|
||||||
},
|
|
||||||
)
|
|
||||||
.get(
|
|
||||||
"/daily/:year/:month/:day",
|
|
||||||
async ({ params }) => {
|
|
||||||
return getDailyStats(params.year, params.month, params.day);
|
|
||||||
},
|
|
||||||
{
|
|
||||||
params: t.Object({
|
|
||||||
year: t.Number(),
|
|
||||||
month: t.Number(),
|
|
||||||
day: t.Number(),
|
|
||||||
}),
|
|
||||||
response: {
|
|
||||||
200: dailyStatsSchema,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
)
|
|
||||||
.get(
|
|
||||||
"/users/:userId",
|
|
||||||
async ({ params }) => {
|
|
||||||
const userId = params.userId;
|
|
||||||
// deno-lint-ignore no-unused-vars
|
|
||||||
const { tagCountMap, ...stats } = await getUserStats(userId);
|
|
||||||
return stats;
|
|
||||||
},
|
|
||||||
{
|
|
||||||
params: t.Object({ userId: t.Number() }),
|
|
||||||
response: {
|
|
||||||
200: t.Omit(userStatsSchema, ["tagCountMap"]),
|
|
||||||
},
|
|
||||||
},
|
|
||||||
)
|
|
||||||
.get(
|
|
||||||
"/users/:userId/tagcount",
|
|
||||||
async ({ params, query, set }) => {
|
|
||||||
return withSessionAdmin({ query, set }, async () => {
|
|
||||||
const stats = await getUserStats(params.userId);
|
|
||||||
return {
|
return {
|
||||||
tagCountMap: stats.tagCountMap,
|
status: 200,
|
||||||
timestamp: stats.timestamp,
|
body: {
|
||||||
|
type: "application/json",
|
||||||
|
data: {
|
||||||
|
imageCount: globalStats.imageCount,
|
||||||
|
stepCount: globalStats.stepCount,
|
||||||
|
pixelCount: globalStats.pixelCount,
|
||||||
|
pixelStepCount: globalStats.pixelStepCount,
|
||||||
|
userCount: globalStats.userIds.length,
|
||||||
|
imagesPerMinute,
|
||||||
|
stepsPerMinute,
|
||||||
|
pixelsPerMinute,
|
||||||
|
pixelStepsPerMinute,
|
||||||
|
},
|
||||||
|
},
|
||||||
};
|
};
|
||||||
});
|
|
||||||
},
|
|
||||||
{
|
|
||||||
params: t.Object({ userId: t.Number() }),
|
|
||||||
query: t.Object({ sessionId: t.String() }),
|
|
||||||
response: {
|
|
||||||
200: t.Pick(userStatsSchema, ["tagCountMap", "timestamp"]),
|
|
||||||
401: t.Literal("Must be logged in"),
|
|
||||||
403: t.Literal("Must be an admin"),
|
|
||||||
},
|
},
|
||||||
},
|
),
|
||||||
)
|
}),
|
||||||
.get(
|
"daily/{year}/{month}/{day}": createMethodFilter({
|
||||||
"/users/:userId/daily/:year/:month/:day",
|
GET: createEndpoint(
|
||||||
async ({ params }) => {
|
{ query: null, body: null },
|
||||||
return getUserDailyStats(params.userId, params.year, params.month, params.day);
|
async ({ params }) => {
|
||||||
},
|
const year = Number(params.year);
|
||||||
{
|
const month = Number(params.month);
|
||||||
params: t.Object({
|
const day = Number(params.day);
|
||||||
userId: t.Number(),
|
const stats = await getDailyStats(year, month, day);
|
||||||
year: t.Number(),
|
return {
|
||||||
month: t.Number(),
|
status: 200,
|
||||||
day: t.Number(),
|
body: {
|
||||||
}),
|
type: "application/json",
|
||||||
response: {
|
data: {
|
||||||
200: userDailyStatsSchema,
|
imageCount: stats.imageCount,
|
||||||
|
pixelCount: stats.pixelCount,
|
||||||
|
userCount: stats.userIds.length,
|
||||||
|
timestamp: stats.timestamp,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
},
|
},
|
||||||
},
|
),
|
||||||
);
|
}),
|
||||||
|
"users/{userId}": createMethodFilter({
|
||||||
|
GET: createEndpoint(
|
||||||
|
{ query: null, body: null },
|
||||||
|
async ({ params }) => {
|
||||||
|
const userId = Number(params.userId);
|
||||||
|
const stats = await getUserStats(userId);
|
||||||
|
return {
|
||||||
|
status: 200,
|
||||||
|
body: {
|
||||||
|
type: "application/json",
|
||||||
|
data: {
|
||||||
|
imageCount: stats.imageCount,
|
||||||
|
pixelCount: stats.pixelCount,
|
||||||
|
tagCountMap: stats.tagCountMap,
|
||||||
|
timestamp: stats.timestamp,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
|
},
|
||||||
|
),
|
||||||
|
}),
|
||||||
|
"users/{userId}/daily/{year}/{month}/{day}": createMethodFilter({
|
||||||
|
GET: createEndpoint(
|
||||||
|
{ query: null, body: null },
|
||||||
|
async ({ params }) => {
|
||||||
|
const userId = Number(params.userId);
|
||||||
|
const year = Number(params.year);
|
||||||
|
const month = Number(params.month);
|
||||||
|
const day = Number(params.day);
|
||||||
|
const stats = await getUserDailyStats(userId, year, month, day);
|
||||||
|
return {
|
||||||
|
status: 200,
|
||||||
|
body: {
|
||||||
|
type: "application/json",
|
||||||
|
data: {
|
||||||
|
imageCount: stats.imageCount,
|
||||||
|
pixelCount: stats.pixelCount,
|
||||||
|
timestamp: stats.timestamp,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
|
},
|
||||||
|
),
|
||||||
|
}),
|
||||||
|
});
|
||||||
|
|
|
||||||
|
|
@ -1,55 +1,50 @@
|
||||||
import { Elysia, t } from "elysia";
|
import { createEndpoint, createMethodFilter, createPathFilter } from "t_rest/server";
|
||||||
import { adminSchema, adminStore } from "../app/adminStore.ts";
|
|
||||||
import { bot } from "../bot/mod.ts";
|
import { bot } from "../bot/mod.ts";
|
||||||
import { getUser } from "./getUser.ts";
|
import { getUser } from "./withUser.ts";
|
||||||
|
import { adminStore } from "../app/adminStore.ts";
|
||||||
|
|
||||||
export const usersRoute = new Elysia()
|
export const usersRoute = createPathFilter({
|
||||||
.get(
|
"{userId}/photo": createMethodFilter({
|
||||||
"/:userId/photo",
|
GET: createEndpoint(
|
||||||
async ({ params }) => {
|
{ query: null, body: null },
|
||||||
const user = await getUser(Number(params.userId));
|
async ({ params }) => {
|
||||||
if (!user.photo) {
|
const user = await getUser(Number(params.userId!));
|
||||||
throw new Error("User has no photo");
|
const photoData = user.photo?.small_file_id
|
||||||
}
|
? await fetch(
|
||||||
const photoFile = await bot.api.getFile(user.photo.small_file_id);
|
`https://api.telegram.org/file/bot${bot.token}/${await bot.api.getFile(
|
||||||
const photoData = await fetch(
|
user.photo.small_file_id,
|
||||||
`https://api.telegram.org/file/bot${bot.token}/${photoFile.file_path}`,
|
).then((file) => file.file_path)}`,
|
||||||
).then((resp) => {
|
).then((resp) => resp.arrayBuffer())
|
||||||
if (!resp.ok) {
|
: undefined;
|
||||||
throw new Error("Failed to fetch photo");
|
if (!photoData) {
|
||||||
|
return { status: 404, body: { type: "text/plain", data: "User has no photo" } };
|
||||||
}
|
}
|
||||||
return resp;
|
return {
|
||||||
}).then((resp) => resp.arrayBuffer());
|
status: 200,
|
||||||
|
body: {
|
||||||
|
type: "image/jpeg",
|
||||||
|
data: new Blob([photoData], { type: "image/jpeg" }),
|
||||||
|
},
|
||||||
|
};
|
||||||
|
},
|
||||||
|
),
|
||||||
|
}),
|
||||||
|
|
||||||
return new Response(new File([photoData], "avatar.jpg", { type: "image/jpeg" }));
|
"{userId}": createMethodFilter({
|
||||||
},
|
GET: createEndpoint(
|
||||||
{
|
{ query: null, body: null },
|
||||||
params: t.Object({ userId: t.String() }),
|
async ({ params }) => {
|
||||||
},
|
const user = await getUser(Number(params.userId!));
|
||||||
)
|
const [adminEntry] = await adminStore.getBy("tgUserId", { value: user.id });
|
||||||
.get(
|
const admin = adminEntry?.value;
|
||||||
"/:userId",
|
return {
|
||||||
async ({ params }) => {
|
status: 200,
|
||||||
const user = await getUser(Number(params.userId));
|
body: {
|
||||||
const adminEntry = await adminStore.get(["admins", user.id]);
|
type: "application/json",
|
||||||
return {
|
data: { ...user, admin },
|
||||||
id: user.id,
|
},
|
||||||
first_name: user.first_name,
|
};
|
||||||
last_name: user.last_name ?? null,
|
},
|
||||||
username: user.username ?? null,
|
),
|
||||||
bio: user.bio ?? null,
|
}),
|
||||||
admin: adminEntry.value ?? null,
|
});
|
||||||
};
|
|
||||||
},
|
|
||||||
{
|
|
||||||
params: t.Object({ userId: t.String() }),
|
|
||||||
response: t.Object({
|
|
||||||
id: t.Number(),
|
|
||||||
first_name: t.String(),
|
|
||||||
last_name: t.Nullable(t.String()),
|
|
||||||
username: t.Nullable(t.String()),
|
|
||||||
bio: t.Nullable(t.String()),
|
|
||||||
admin: t.Nullable(adminSchema),
|
|
||||||
}),
|
|
||||||
},
|
|
||||||
);
|
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,40 @@
|
||||||
|
import { Chat } from "grammy_types";
|
||||||
|
import { Model } from "indexed_kv";
|
||||||
|
import { Output } from "t_rest/client";
|
||||||
|
import { Admin, adminStore } from "../app/adminStore.ts";
|
||||||
|
import { bot } from "../bot/mod.ts";
|
||||||
|
import { sessions } from "./sessionsRoute.ts";
|
||||||
|
|
||||||
|
export async function withUser<O extends Output>(
|
||||||
|
query: { sessionId: string },
|
||||||
|
cb: (user: Chat.PrivateGetChat) => Promise<O>,
|
||||||
|
) {
|
||||||
|
const session = sessions.get(query.sessionId);
|
||||||
|
if (!session?.userId) {
|
||||||
|
return { status: 401, body: { type: "text/plain", data: "Must be logged in" } } as const;
|
||||||
|
}
|
||||||
|
const user = await getUser(session.userId);
|
||||||
|
return cb(user);
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function withAdmin<O extends Output>(
|
||||||
|
query: { sessionId: string },
|
||||||
|
cb: (user: Chat.PrivateGetChat, admin: Model<Admin>) => Promise<O>,
|
||||||
|
) {
|
||||||
|
const session = sessions.get(query.sessionId);
|
||||||
|
if (!session?.userId) {
|
||||||
|
return { status: 401, body: { type: "text/plain", data: "Must be logged in" } } as const;
|
||||||
|
}
|
||||||
|
const user = await getUser(session.userId);
|
||||||
|
const [admin] = await adminStore.getBy("tgUserId", { value: session.userId });
|
||||||
|
if (!admin) {
|
||||||
|
return { status: 403, body: { type: "text/plain", data: "Must be an admin" } } as const;
|
||||||
|
}
|
||||||
|
return cb(user, admin);
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function getUser(userId: number): Promise<Chat.PrivateGetChat> {
|
||||||
|
const chat = await bot.api.getChat(userId);
|
||||||
|
if (chat.type !== "private") throw new Error("Chat is not private");
|
||||||
|
return chat;
|
||||||
|
}
|
||||||
|
|
@ -2,7 +2,7 @@ import { subMinutes } from "date-fns";
|
||||||
import { Model } from "indexed_kv";
|
import { Model } from "indexed_kv";
|
||||||
import createOpenApiFetch from "openapi_fetch";
|
import createOpenApiFetch from "openapi_fetch";
|
||||||
import { info } from "std/log/mod.ts";
|
import { info } from "std/log/mod.ts";
|
||||||
import { Elysia, NotFoundError, Static, t } from "elysia";
|
import { createEndpoint, createMethodFilter, createPathFilter } from "t_rest/server";
|
||||||
import { activeGenerationWorkers } from "../app/generationQueue.ts";
|
import { activeGenerationWorkers } from "../app/generationQueue.ts";
|
||||||
import { generationStore } from "../app/generationStore.ts";
|
import { generationStore } from "../app/generationStore.ts";
|
||||||
import * as SdApi from "../app/sdApi.ts";
|
import * as SdApi from "../app/sdApi.ts";
|
||||||
|
|
@ -13,27 +13,20 @@ import {
|
||||||
} from "../app/workerInstanceStore.ts";
|
} from "../app/workerInstanceStore.ts";
|
||||||
import { getAuthHeader } from "../utils/getAuthHeader.ts";
|
import { getAuthHeader } from "../utils/getAuthHeader.ts";
|
||||||
import { omitUndef } from "../utils/omitUndef.ts";
|
import { omitUndef } from "../utils/omitUndef.ts";
|
||||||
import { withSessionAdmin } from "./getUser.ts";
|
import { withAdmin } from "./withUser.ts";
|
||||||
|
|
||||||
const workerResponseSchema = t.Intersect([
|
export type WorkerData = Omit<WorkerInstance, "sdUrl" | "sdAuth"> & {
|
||||||
t.Object({ id: t.String() }),
|
id: string;
|
||||||
t.Omit(workerInstanceSchema, ["sdUrl", "sdAuth"]),
|
isActive: boolean;
|
||||||
t.Object({
|
imagesPerMinute: number;
|
||||||
isActive: t.Boolean(),
|
stepsPerMinute: number;
|
||||||
imagesPerMinute: t.Number(),
|
pixelsPerMinute: number;
|
||||||
stepsPerMinute: t.Number(),
|
pixelStepsPerMinute: number;
|
||||||
pixelsPerMinute: t.Number(),
|
};
|
||||||
pixelStepsPerMinute: t.Number(),
|
|
||||||
}),
|
|
||||||
]);
|
|
||||||
|
|
||||||
export type WorkerResponse = Static<typeof workerResponseSchema>;
|
|
||||||
|
|
||||||
const workerRequestSchema = t.Omit(workerInstanceSchema, ["lastOnlineTime", "lastError"]);
|
|
||||||
|
|
||||||
const STATS_INTERVAL_MIN = 10;
|
const STATS_INTERVAL_MIN = 10;
|
||||||
|
|
||||||
async function getWorkerResponse(workerInstance: Model<WorkerInstance>): Promise<WorkerResponse> {
|
async function getWorkerData(workerInstance: Model<WorkerInstance>): Promise<WorkerData> {
|
||||||
const after = subMinutes(new Date(), STATS_INTERVAL_MIN);
|
const after = subMinutes(new Date(), STATS_INTERVAL_MIN);
|
||||||
|
|
||||||
const generations = await generationStore.getBy("workerInstanceKey", {
|
const generations = await generationStore.getBy("workerInstanceKey", {
|
||||||
|
|
@ -58,7 +51,7 @@ async function getWorkerResponse(workerInstance: Model<WorkerInstance>): Promise
|
||||||
)
|
)
|
||||||
.reduce((sum, pixelSteps) => sum + pixelSteps, 0) / STATS_INTERVAL_MIN;
|
.reduce((sum, pixelSteps) => sum + pixelSteps, 0) / STATS_INTERVAL_MIN;
|
||||||
|
|
||||||
return omitUndef({
|
return {
|
||||||
id: workerInstance.id,
|
id: workerInstance.id,
|
||||||
key: workerInstance.value.key,
|
key: workerInstance.value.key,
|
||||||
name: workerInstance.value.name,
|
name: workerInstance.value.name,
|
||||||
|
|
@ -69,177 +62,178 @@ async function getWorkerResponse(workerInstance: Model<WorkerInstance>): Promise
|
||||||
stepsPerMinute,
|
stepsPerMinute,
|
||||||
pixelsPerMinute,
|
pixelsPerMinute,
|
||||||
pixelStepsPerMinute,
|
pixelStepsPerMinute,
|
||||||
});
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
export const workersRoute = new Elysia()
|
export const workersRoute = createPathFilter({
|
||||||
.get(
|
"": createMethodFilter({
|
||||||
"",
|
GET: createEndpoint(
|
||||||
async () => {
|
{ query: null, body: null },
|
||||||
const workerInstances = await workerInstanceStore.getAll();
|
async () => {
|
||||||
const workers = await Promise.all(workerInstances.map(getWorkerResponse));
|
const workerInstances = await workerInstanceStore.getAll();
|
||||||
return workers;
|
const workers = await Promise.all(workerInstances.map(getWorkerData));
|
||||||
},
|
return {
|
||||||
{
|
status: 200,
|
||||||
response: t.Array(workerResponseSchema),
|
body: { type: "application/json", data: workers satisfies WorkerData[] },
|
||||||
},
|
};
|
||||||
)
|
|
||||||
.post(
|
|
||||||
"",
|
|
||||||
async ({ query, body, set }) => {
|
|
||||||
return withSessionAdmin({ query, set }, async (sessionUser) => {
|
|
||||||
const workerInstance = await workerInstanceStore.create(body);
|
|
||||||
info(`User ${sessionUser.first_name} created worker ${workerInstance.value.name}`);
|
|
||||||
return await getWorkerResponse(workerInstance);
|
|
||||||
});
|
|
||||||
},
|
|
||||||
{
|
|
||||||
query: t.Object({ sessionId: t.String() }),
|
|
||||||
body: workerRequestSchema,
|
|
||||||
response: {
|
|
||||||
200: workerResponseSchema,
|
|
||||||
401: t.Literal("Must be logged in"),
|
|
||||||
403: t.Literal("Must be an admin"),
|
|
||||||
},
|
},
|
||||||
},
|
),
|
||||||
)
|
POST: createEndpoint(
|
||||||
.get(
|
{
|
||||||
"/:workerId",
|
query: {
|
||||||
async ({ params }) => {
|
sessionId: { type: "string" },
|
||||||
const workerInstance = await workerInstanceStore.getById(params.workerId);
|
},
|
||||||
if (!workerInstance) {
|
body: {
|
||||||
throw new NotFoundError("Worker not found");
|
type: "application/json",
|
||||||
}
|
schema: workerInstanceSchema,
|
||||||
return await getWorkerResponse(workerInstance);
|
},
|
||||||
},
|
|
||||||
{
|
|
||||||
params: t.Object({ workerId: t.String() }),
|
|
||||||
response: {
|
|
||||||
200: workerResponseSchema,
|
|
||||||
},
|
},
|
||||||
},
|
async ({ query, body }) => {
|
||||||
)
|
return withAdmin(query, async (user) => {
|
||||||
.patch(
|
const workerInstance = await workerInstanceStore.create(body.data);
|
||||||
"/:workerId",
|
info(`User ${user.first_name} created worker ${workerInstance.value.name}`);
|
||||||
async ({ params, query, body, set }) => {
|
return {
|
||||||
const workerInstance = await workerInstanceStore.getById(params.workerId);
|
status: 200,
|
||||||
if (!workerInstance) {
|
body: { type: "application/json", data: await getWorkerData(workerInstance) },
|
||||||
throw new NotFoundError("Worker not found");
|
};
|
||||||
}
|
});
|
||||||
return withSessionAdmin({ query, set }, async (sessionUser) => {
|
|
||||||
info(
|
|
||||||
`User ${sessionUser.first_name} updated worker ${workerInstance.value.name}: ${
|
|
||||||
JSON.stringify(body)
|
|
||||||
}`,
|
|
||||||
);
|
|
||||||
await workerInstance.update(body);
|
|
||||||
return await getWorkerResponse(workerInstance);
|
|
||||||
});
|
|
||||||
},
|
|
||||||
{
|
|
||||||
params: t.Object({ workerId: t.String() }),
|
|
||||||
query: t.Object({ sessionId: t.String() }),
|
|
||||||
body: t.Partial(workerRequestSchema),
|
|
||||||
response: {
|
|
||||||
200: workerResponseSchema,
|
|
||||||
401: t.Literal("Must be logged in"),
|
|
||||||
403: t.Literal("Must be an admin"),
|
|
||||||
},
|
},
|
||||||
},
|
),
|
||||||
)
|
}),
|
||||||
.delete(
|
|
||||||
"/:workerId",
|
"{workerId}": createPathFilter({
|
||||||
async ({ params, query, set }) => {
|
"": createMethodFilter({
|
||||||
const workerInstance = await workerInstanceStore.getById(params.workerId);
|
GET: createEndpoint(
|
||||||
if (!workerInstance) {
|
{ query: null, body: null },
|
||||||
throw new Error("Worker not found");
|
async ({ params }) => {
|
||||||
}
|
const workerInstance = await workerInstanceStore.getById(params.workerId!);
|
||||||
return withSessionAdmin({ query, set }, async (sessionUser) => {
|
if (!workerInstance) {
|
||||||
info(`User ${sessionUser.first_name} deleted worker ${workerInstance.value.name}`);
|
return { status: 404, body: { type: "text/plain", data: `Worker not found` } };
|
||||||
await workerInstance.delete();
|
}
|
||||||
return null;
|
return {
|
||||||
});
|
status: 200,
|
||||||
},
|
body: { type: "application/json", data: await getWorkerData(workerInstance) },
|
||||||
{
|
};
|
||||||
params: t.Object({ workerId: t.String() }),
|
},
|
||||||
query: t.Object({ sessionId: t.String() }),
|
|
||||||
response: {
|
|
||||||
200: t.Null(),
|
|
||||||
401: t.Literal("Must be logged in"),
|
|
||||||
403: t.Literal("Must be an admin"),
|
|
||||||
},
|
|
||||||
},
|
|
||||||
)
|
|
||||||
.get(
|
|
||||||
"/:workerId/loras",
|
|
||||||
async ({ params }) => {
|
|
||||||
const workerInstance = await workerInstanceStore.getById(params.workerId);
|
|
||||||
if (!workerInstance) {
|
|
||||||
throw new NotFoundError("Worker not found");
|
|
||||||
}
|
|
||||||
const sdClient = createOpenApiFetch<SdApi.paths>({
|
|
||||||
baseUrl: workerInstance.value.sdUrl,
|
|
||||||
headers: getAuthHeader(workerInstance.value.sdAuth),
|
|
||||||
});
|
|
||||||
const lorasResponse = await sdClient.GET("/sdapi/v1/loras", {});
|
|
||||||
if (lorasResponse.error) {
|
|
||||||
throw new Error(
|
|
||||||
`Loras request failed: ${lorasResponse["error"]}`,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
const loras = (lorasResponse.data as Lora[]).map((lora) => ({
|
|
||||||
name: lora.name,
|
|
||||||
alias: lora.alias ?? null,
|
|
||||||
}));
|
|
||||||
return loras;
|
|
||||||
},
|
|
||||||
{
|
|
||||||
params: t.Object({ workerId: t.String() }),
|
|
||||||
response: t.Array(
|
|
||||||
t.Object({
|
|
||||||
name: t.String(),
|
|
||||||
alias: t.Nullable(t.String()),
|
|
||||||
}),
|
|
||||||
),
|
),
|
||||||
},
|
PATCH: createEndpoint(
|
||||||
)
|
{
|
||||||
.get(
|
query: {
|
||||||
"/:workerId/models",
|
sessionId: { type: "string" },
|
||||||
async ({ params }) => {
|
},
|
||||||
const workerInstance = await workerInstanceStore.getById(params.workerId);
|
body: {
|
||||||
if (!workerInstance) {
|
type: "application/json",
|
||||||
throw new NotFoundError("Worker not found");
|
schema: { ...workerInstanceSchema, required: [] },
|
||||||
}
|
},
|
||||||
const sdClient = createOpenApiFetch<SdApi.paths>({
|
},
|
||||||
baseUrl: workerInstance.value.sdUrl,
|
async ({ params, query, body }) => {
|
||||||
headers: getAuthHeader(workerInstance.value.sdAuth),
|
const workerInstance = await workerInstanceStore.getById(params.workerId!);
|
||||||
});
|
if (!workerInstance) {
|
||||||
const modelsResponse = await sdClient.GET("/sdapi/v1/sd-models", {});
|
return { status: 404, body: { type: "text/plain", data: `Worker not found` } };
|
||||||
if (modelsResponse.error) {
|
}
|
||||||
throw new Error(
|
return withAdmin(query, async (user) => {
|
||||||
`Models request failed: ${modelsResponse["error"]}`,
|
info(
|
||||||
);
|
`User ${user.first_name} updated worker ${workerInstance.value.name}: ${
|
||||||
}
|
JSON.stringify(body.data)
|
||||||
const models = modelsResponse.data.map((model) => ({
|
}`,
|
||||||
title: model.title,
|
);
|
||||||
modelName: model.model_name,
|
await workerInstance.update(omitUndef(body.data));
|
||||||
hash: model.hash ?? null,
|
return {
|
||||||
sha256: model.sha256 ?? null,
|
status: 200,
|
||||||
}));
|
body: { type: "application/json", data: await getWorkerData(workerInstance) },
|
||||||
return models;
|
};
|
||||||
},
|
});
|
||||||
{
|
},
|
||||||
params: t.Object({ workerId: t.String() }),
|
|
||||||
response: t.Array(
|
|
||||||
t.Object({
|
|
||||||
title: t.String(),
|
|
||||||
modelName: t.String(),
|
|
||||||
hash: t.Nullable(t.String()),
|
|
||||||
sha256: t.Nullable(t.String()),
|
|
||||||
}),
|
|
||||||
),
|
),
|
||||||
},
|
DELETE: createEndpoint(
|
||||||
);
|
{
|
||||||
|
query: {
|
||||||
|
sessionId: { type: "string" },
|
||||||
|
},
|
||||||
|
body: null,
|
||||||
|
},
|
||||||
|
async ({ params, query }) => {
|
||||||
|
const workerInstance = await workerInstanceStore.getById(params.workerId!);
|
||||||
|
if (!workerInstance) {
|
||||||
|
return { status: 404, body: { type: "text/plain", data: `Worker not found` } };
|
||||||
|
}
|
||||||
|
return withAdmin(query, async (user) => {
|
||||||
|
info(`User ${user.first_name} deleted worker ${workerInstance.value.name}`);
|
||||||
|
await workerInstance.delete();
|
||||||
|
return { status: 200, body: { type: "application/json", data: null } };
|
||||||
|
});
|
||||||
|
},
|
||||||
|
),
|
||||||
|
}),
|
||||||
|
|
||||||
|
"loras": createMethodFilter({
|
||||||
|
GET: createEndpoint(
|
||||||
|
{ query: null, body: null },
|
||||||
|
async ({ params }) => {
|
||||||
|
const workerInstance = await workerInstanceStore.getById(params.workerId!);
|
||||||
|
if (!workerInstance) {
|
||||||
|
return { status: 404, body: { type: "text/plain", data: `Worker not found` } };
|
||||||
|
}
|
||||||
|
const sdClient = createOpenApiFetch<SdApi.paths>({
|
||||||
|
baseUrl: workerInstance.value.sdUrl,
|
||||||
|
headers: getAuthHeader(workerInstance.value.sdAuth),
|
||||||
|
});
|
||||||
|
const lorasResponse = await sdClient.GET("/sdapi/v1/loras", {});
|
||||||
|
if (lorasResponse.error) {
|
||||||
|
return {
|
||||||
|
status: 500,
|
||||||
|
body: { type: "text/plain", data: `Loras request failed: ${lorasResponse["error"]}` },
|
||||||
|
};
|
||||||
|
}
|
||||||
|
const loras = (lorasResponse.data as Lora[]).map((lora) => ({
|
||||||
|
name: lora.name,
|
||||||
|
alias: lora.alias ?? null,
|
||||||
|
}));
|
||||||
|
return {
|
||||||
|
status: 200,
|
||||||
|
body: { type: "application/json", data: loras },
|
||||||
|
};
|
||||||
|
},
|
||||||
|
),
|
||||||
|
}),
|
||||||
|
|
||||||
|
"models": createMethodFilter({
|
||||||
|
GET: createEndpoint(
|
||||||
|
{ query: null, body: null },
|
||||||
|
async ({ params }) => {
|
||||||
|
const workerInstance = await workerInstanceStore.getById(params.workerId!);
|
||||||
|
if (!workerInstance) {
|
||||||
|
return { status: 404, body: { type: "text/plain", data: `Worker not found` } };
|
||||||
|
}
|
||||||
|
const sdClient = createOpenApiFetch<SdApi.paths>({
|
||||||
|
baseUrl: workerInstance.value.sdUrl,
|
||||||
|
headers: getAuthHeader(workerInstance.value.sdAuth),
|
||||||
|
});
|
||||||
|
const modelsResponse = await sdClient.GET("/sdapi/v1/sd-models", {});
|
||||||
|
if (modelsResponse.error) {
|
||||||
|
return {
|
||||||
|
status: 500,
|
||||||
|
body: {
|
||||||
|
type: "text/plain",
|
||||||
|
data: `Models request failed: ${modelsResponse["error"]}`,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
}
|
||||||
|
const models = modelsResponse.data.map((model) => ({
|
||||||
|
title: model.title,
|
||||||
|
modelName: model.model_name,
|
||||||
|
hash: model.hash,
|
||||||
|
sha256: model.sha256,
|
||||||
|
}));
|
||||||
|
return {
|
||||||
|
status: 200,
|
||||||
|
body: { type: "application/json", data: models },
|
||||||
|
};
|
||||||
|
},
|
||||||
|
),
|
||||||
|
}),
|
||||||
|
}),
|
||||||
|
});
|
||||||
|
|
||||||
export interface Lora {
|
export interface Lora {
|
||||||
name: string;
|
name: string;
|
||||||
|
|
|
||||||
|
|
@ -1,11 +1,24 @@
|
||||||
import { Static, t } from "elysia";
|
import { Store } from "indexed_kv";
|
||||||
|
import { JsonSchema, jsonType } from "t_rest/server";
|
||||||
import { db } from "./db.ts";
|
import { db } from "./db.ts";
|
||||||
import { Tkv } from "../utils/Tkv.ts";
|
|
||||||
|
|
||||||
export const adminSchema = t.Object({
|
export const adminSchema = {
|
||||||
promotedBy: t.Nullable(t.Number()),
|
type: "object",
|
||||||
|
properties: {
|
||||||
|
tgUserId: { type: "number" },
|
||||||
|
promotedBy: { type: ["string", "null"] },
|
||||||
|
},
|
||||||
|
required: ["tgUserId", "promotedBy"],
|
||||||
|
} as const satisfies JsonSchema;
|
||||||
|
|
||||||
|
export type Admin = jsonType<typeof adminSchema>;
|
||||||
|
|
||||||
|
type AdminIndices = {
|
||||||
|
tgUserId: number;
|
||||||
|
};
|
||||||
|
|
||||||
|
export const adminStore = new Store<Admin, AdminIndices>(db, "adminUsers", {
|
||||||
|
indices: {
|
||||||
|
tgUserId: { getValue: (adminUser) => adminUser.tgUserId },
|
||||||
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
export type Admin = Static<typeof adminSchema>;
|
|
||||||
|
|
||||||
export const adminStore = new Tkv<["admins", number], Admin>(db);
|
|
||||||
|
|
|
||||||
|
|
@ -1,45 +1,49 @@
|
||||||
import { Static, t } from "elysia";
|
|
||||||
import { Tkv } from "../utils/Tkv.ts";
|
|
||||||
import { db } from "./db.ts";
|
import { db } from "./db.ts";
|
||||||
|
import { JsonSchema, jsonType } from "t_rest/server";
|
||||||
|
|
||||||
export const defaultParamsSchema = t.Partial(t.Object({
|
export const configSchema = {
|
||||||
batch_size: t.Number(),
|
type: "object",
|
||||||
n_iter: t.Number(),
|
properties: {
|
||||||
width: t.Number(),
|
pausedReason: { type: ["string", "null"] },
|
||||||
height: t.Number(),
|
maxUserJobs: { type: "number" },
|
||||||
steps: t.Number(),
|
maxJobs: { type: "number" },
|
||||||
cfg_scale: t.Number(),
|
defaultParams: {
|
||||||
sampler_name: t.String(),
|
type: "object",
|
||||||
negative_prompt: t.String(),
|
properties: {
|
||||||
}));
|
batch_size: { type: "number" },
|
||||||
|
n_iter: { type: "number" },
|
||||||
|
width: { type: "number" },
|
||||||
|
height: { type: "number" },
|
||||||
|
steps: { type: "number" },
|
||||||
|
cfg_scale: { type: "number" },
|
||||||
|
sampler_name: { type: "string" },
|
||||||
|
negative_prompt: { type: "string" },
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
required: ["adminUsernames", "maxUserJobs", "maxJobs", "defaultParams"],
|
||||||
|
} as const satisfies JsonSchema;
|
||||||
|
|
||||||
export type DefaultParams = Static<typeof defaultParamsSchema>;
|
export type Config = jsonType<typeof configSchema>;
|
||||||
|
|
||||||
export const configSchema = t.Object({
|
|
||||||
pausedReason: t.Nullable(t.String()),
|
|
||||||
maxUserJobs: t.Number(),
|
|
||||||
maxJobs: t.Number(),
|
|
||||||
defaultParams: defaultParamsSchema,
|
|
||||||
});
|
|
||||||
|
|
||||||
export type Config = Static<typeof configSchema>;
|
|
||||||
|
|
||||||
export const configStore = new Tkv<["config"], Config>(db);
|
|
||||||
|
|
||||||
const defaultConfig: Config = {
|
|
||||||
pausedReason: null,
|
|
||||||
maxUserJobs: Infinity,
|
|
||||||
maxJobs: Infinity,
|
|
||||||
defaultParams: {},
|
|
||||||
};
|
|
||||||
|
|
||||||
export async function getConfig(): Promise<Config> {
|
export async function getConfig(): Promise<Config> {
|
||||||
const configEntry = await configStore.get(["config"]);
|
const configEntry = await db.get<Config>(["config"]);
|
||||||
return { ...defaultConfig, ...configEntry.value };
|
const config = configEntry?.value;
|
||||||
|
return {
|
||||||
|
pausedReason: config?.pausedReason ?? null,
|
||||||
|
maxUserJobs: config?.maxUserJobs ?? Infinity,
|
||||||
|
maxJobs: config?.maxJobs ?? Infinity,
|
||||||
|
defaultParams: config?.defaultParams ?? {},
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function setConfig<K extends keyof Config>(newConfig: Pick<Config, K>): Promise<void> {
|
export async function setConfig(newConfig: Partial<Config>): Promise<void> {
|
||||||
const configEntry = await configStore.get(["config"]);
|
const oldConfig = await getConfig();
|
||||||
const config = { ...defaultConfig, ...configEntry.value, ...newConfig };
|
const config: Config = {
|
||||||
await configStore.atomicSet(["config"], configEntry.versionstamp, config);
|
pausedReason: newConfig.pausedReason ?? oldConfig.pausedReason,
|
||||||
|
maxUserJobs: newConfig.maxUserJobs ?? oldConfig.maxUserJobs,
|
||||||
|
maxJobs: newConfig.maxJobs ?? oldConfig.maxJobs,
|
||||||
|
defaultParams: newConfig.defaultParams ?? oldConfig.defaultParams,
|
||||||
|
};
|
||||||
|
await db.set(["config"], config);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,21 +1,25 @@
|
||||||
import { hoursToMilliseconds, isSameDay, minutesToMilliseconds } from "date-fns";
|
import { hoursToMilliseconds, isSameDay, minutesToMilliseconds } from "date-fns";
|
||||||
import { UTCDateMini } from "date-fns/utc";
|
import { UTCDateMini } from "date-fns/utc";
|
||||||
import { Static, t } from "elysia";
|
|
||||||
import { info } from "std/log/mod.ts";
|
import { info } from "std/log/mod.ts";
|
||||||
|
import { JsonSchema, jsonType } from "t_rest/server";
|
||||||
import { db } from "./db.ts";
|
import { db } from "./db.ts";
|
||||||
import { generationStore } from "./generationStore.ts";
|
import { generationStore } from "./generationStore.ts";
|
||||||
import { kvMemoize } from "../utils/kvMemoize.ts";
|
import { kvMemoize } from "./kvMemoize.ts";
|
||||||
|
|
||||||
export const dailyStatsSchema = t.Object({
|
export const dailyStatsSchema = {
|
||||||
userIds: t.Array(t.Number()),
|
type: "object",
|
||||||
imageCount: t.Number(),
|
properties: {
|
||||||
stepCount: t.Number(),
|
userIds: { type: "array", items: { type: "number" } },
|
||||||
pixelCount: t.Number(),
|
imageCount: { type: "number" },
|
||||||
pixelStepCount: t.Number(),
|
stepCount: { type: "number" },
|
||||||
timestamp: t.Number(),
|
pixelCount: { type: "number" },
|
||||||
});
|
pixelStepCount: { type: "number" },
|
||||||
|
timestamp: { type: "number" },
|
||||||
|
},
|
||||||
|
required: ["userIds", "imageCount", "stepCount", "pixelCount", "pixelStepCount", "timestamp"],
|
||||||
|
} as const satisfies JsonSchema;
|
||||||
|
|
||||||
export type DailyStats = Static<typeof dailyStatsSchema>;
|
export type DailyStats = jsonType<typeof dailyStatsSchema>;
|
||||||
|
|
||||||
export const getDailyStats = kvMemoize(
|
export const getDailyStats = kvMemoize(
|
||||||
db,
|
db,
|
||||||
|
|
|
||||||
|
|
@ -46,7 +46,7 @@ export const activeGenerationWorkers = new Map<string, Worker<GenerationJob>>();
|
||||||
/**
|
/**
|
||||||
* Initializes queue workers for each SD instance when they become online.
|
* Initializes queue workers for each SD instance when they become online.
|
||||||
*/
|
*/
|
||||||
export async function processGenerationQueue(): Promise<never> {
|
export async function processGenerationQueue() {
|
||||||
while (true) {
|
while (true) {
|
||||||
for await (const workerInstance of workerInstanceStore.listAll()) {
|
for await (const workerInstance of workerInstanceStore.listAll()) {
|
||||||
const activeWorker = activeGenerationWorkers.get(workerInstance.id);
|
const activeWorker = activeGenerationWorkers.get(workerInstance.id);
|
||||||
|
|
@ -70,8 +70,7 @@ export async function processGenerationQueue(): Promise<never> {
|
||||||
return response;
|
return response;
|
||||||
})
|
})
|
||||||
.catch((error) => {
|
.catch((error) => {
|
||||||
const cleanedErrorMessage = error.message.replace(/url \([^)]+\)/, "");
|
workerInstance.update({ lastError: { message: error.message, time: Date.now() } })
|
||||||
workerInstance.update({ lastError: { message: cleanedErrorMessage, time: Date.now() } })
|
|
||||||
.catch(() => undefined);
|
.catch(() => undefined);
|
||||||
debug(`Worker ${workerInstance.value.key} is down: ${error}`);
|
debug(`Worker ${workerInstance.value.key} is down: ${error}`);
|
||||||
});
|
});
|
||||||
|
|
@ -142,6 +141,15 @@ async function processGenerationJob(
|
||||||
debug(`Generation started for ${formatUserChat(state)}`);
|
debug(`Generation started for ${formatUserChat(state)}`);
|
||||||
await updateJob({ state: state });
|
await updateJob({ state: state });
|
||||||
|
|
||||||
|
// check if bot can post messages in this chat
|
||||||
|
const chat = await bot.api.getChat(state.chat.id);
|
||||||
|
if (
|
||||||
|
(chat.type === "group" || chat.type === "supergroup") &&
|
||||||
|
(!chat.permissions?.can_send_messages || !chat.permissions?.can_send_photos)
|
||||||
|
) {
|
||||||
|
throw new Error("Bot doesn't have permissions to send photos in this chat");
|
||||||
|
}
|
||||||
|
|
||||||
// edit the existing status message
|
// edit the existing status message
|
||||||
await bot.api.editMessageText(
|
await bot.api.editMessageText(
|
||||||
state.replyMessage.chat.id,
|
state.replyMessage.chat.id,
|
||||||
|
|
@ -232,6 +240,8 @@ async function processGenerationJob(
|
||||||
if (progressResponse.data.progress > state.progress) {
|
if (progressResponse.data.progress > state.progress) {
|
||||||
state.progress = progressResponse.data.progress;
|
state.progress = progressResponse.data.progress;
|
||||||
await updateJob({ state: state });
|
await updateJob({ state: state });
|
||||||
|
await bot.api.sendChatAction(state.chat.id, "upload_photo", { maxAttempts: 1 })
|
||||||
|
.catch(() => undefined);
|
||||||
await bot.api.editMessageText(
|
await bot.api.editMessageText(
|
||||||
state.replyMessage.chat.id,
|
state.replyMessage.chat.id,
|
||||||
state.replyMessage.message_id,
|
state.replyMessage.message_id,
|
||||||
|
|
@ -279,31 +289,21 @@ async function processGenerationJob(
|
||||||
info,
|
info,
|
||||||
}, { retryCount: 5, retryDelayMs: 10000 });
|
}, { retryCount: 5, retryDelayMs: 10000 });
|
||||||
|
|
||||||
const uploadQueueSize = await uploadQueue.getAllJobs().then((jobs) =>
|
|
||||||
jobs.filter((job) => job.status !== "processing").length
|
|
||||||
);
|
|
||||||
|
|
||||||
// change status message to uploading images
|
// change status message to uploading images
|
||||||
await bot.api.editMessageText(
|
await bot.api.editMessageText(
|
||||||
state.replyMessage.chat.id,
|
state.replyMessage.chat.id,
|
||||||
state.replyMessage.message_id,
|
state.replyMessage.message_id,
|
||||||
uploadQueueSize > 10
|
`Uploading your images...`,
|
||||||
? `You are ${formatOrdinal(uploadQueueSize)} in upload queue.`
|
|
||||||
: `Uploading your images...`,
|
|
||||||
{ maxAttempts: 1 },
|
{ maxAttempts: 1 },
|
||||||
).catch(() => undefined);
|
).catch(() => undefined);
|
||||||
|
|
||||||
// send upload photo action
|
|
||||||
await bot.api.sendChatAction(state.chat.id, "upload_photo", { maxAttempts: 1 })
|
|
||||||
.catch(() => undefined);
|
|
||||||
|
|
||||||
debug(`Generation finished for ${formatUserChat(state)}`);
|
debug(`Generation finished for ${formatUserChat(state)}`);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Handles queue updates and updates the status message.
|
* Handles queue updates and updates the status message.
|
||||||
*/
|
*/
|
||||||
export async function updateGenerationQueue(): Promise<never> {
|
export async function updateGenerationQueue() {
|
||||||
while (true) {
|
while (true) {
|
||||||
const jobs = await generationQueue.getAllJobs();
|
const jobs = await generationQueue.getAllJobs();
|
||||||
|
|
||||||
|
|
@ -313,15 +313,17 @@ export async function updateGenerationQueue(): Promise<never> {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
return await bot.api.editMessageText(
|
// spread the updates in time randomly
|
||||||
|
await delay(Math.random() * 3_000);
|
||||||
|
|
||||||
|
await bot.api.editMessageText(
|
||||||
job.state.replyMessage.chat.id,
|
job.state.replyMessage.chat.id,
|
||||||
job.state.replyMessage.message_id,
|
job.state.replyMessage.message_id,
|
||||||
`You are ${formatOrdinal(job.place)} in queue.`,
|
`You are ${formatOrdinal(job.place)} in queue.`,
|
||||||
{ maxAttempts: 1 },
|
{ maxAttempts: 1 },
|
||||||
).catch(() => {});
|
).catch(() => undefined);
|
||||||
}));
|
}));
|
||||||
|
|
||||||
// delay between updates based on the number of jobs
|
await delay(10_000);
|
||||||
await delay(Math.min(15_000, Math.max(3_000, jobs.length * 100)));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,16 +1,23 @@
|
||||||
import { addDays } from "date-fns";
|
import { addDays } from "date-fns";
|
||||||
|
import { JsonSchema, jsonType } from "t_rest/server";
|
||||||
import { decodeTime } from "ulid";
|
import { decodeTime } from "ulid";
|
||||||
import { getDailyStats } from "./dailyStatsStore.ts";
|
import { getDailyStats } from "./dailyStatsStore.ts";
|
||||||
import { generationStore } from "./generationStore.ts";
|
import { generationStore } from "./generationStore.ts";
|
||||||
|
|
||||||
export interface GlobalStats {
|
export const globalStatsSchema = {
|
||||||
userIds: number[];
|
type: "object",
|
||||||
imageCount: number;
|
properties: {
|
||||||
stepCount: number;
|
userIds: { type: "array", items: { type: "number" } },
|
||||||
pixelCount: number;
|
imageCount: { type: "number" },
|
||||||
pixelStepCount: number;
|
stepCount: { type: "number" },
|
||||||
timestamp: number;
|
pixelCount: { type: "number" },
|
||||||
}
|
pixelStepCount: { type: "number" },
|
||||||
|
timestamp: { type: "number" },
|
||||||
|
},
|
||||||
|
required: ["userIds", "imageCount", "stepCount", "pixelCount", "pixelStepCount", "timestamp"],
|
||||||
|
} as const satisfies JsonSchema;
|
||||||
|
|
||||||
|
export type GlobalStats = jsonType<typeof globalStatsSchema>;
|
||||||
|
|
||||||
export const globalStats: GlobalStats = await getGlobalStats();
|
export const globalStats: GlobalStats = await getGlobalStats();
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,59 +1,24 @@
|
||||||
import { Static, t } from "elysia";
|
import { JsonSchema, jsonType } from "t_rest/server";
|
||||||
import { kvMemoize } from "../utils/kvMemoize.ts";
|
import { kvMemoize } from "./kvMemoize.ts";
|
||||||
import { db } from "./db.ts";
|
import { db } from "./db.ts";
|
||||||
import { generationStore } from "./generationStore.ts";
|
import { generationStore } from "./generationStore.ts";
|
||||||
import { hoursToMilliseconds, isSameDay, minutesToMilliseconds } from "date-fns";
|
|
||||||
import { UTCDateMini } from "date-fns/utc";
|
|
||||||
|
|
||||||
export const userDailyStatsSchema = t.Object({
|
export const userDailyStatsSchema = {
|
||||||
imageCount: t.Number(),
|
type: "object",
|
||||||
pixelCount: t.Number(),
|
properties: {
|
||||||
pixelStepCount: t.Number(),
|
imageCount: { type: "number" },
|
||||||
timestamp: t.Number(),
|
pixelCount: { type: "number" },
|
||||||
});
|
timestamp: { type: "number" },
|
||||||
|
},
|
||||||
|
required: ["imageCount", "pixelCount", "timestamp"],
|
||||||
|
} as const satisfies JsonSchema;
|
||||||
|
|
||||||
export type UserDailyStats = Static<typeof userDailyStatsSchema>;
|
export type UserDailyStats = jsonType<typeof userDailyStatsSchema>;
|
||||||
|
|
||||||
export const getUserDailyStats = kvMemoize(
|
export const getUserDailyStats = kvMemoize(
|
||||||
db,
|
db,
|
||||||
["userDailyStats"],
|
["userDailyStats"],
|
||||||
async (userId: number, year: number, month: number, day: number): Promise<UserDailyStats> => {
|
async (userId: number, year: number, month: number, day: number): Promise<UserDailyStats> => {
|
||||||
let imageCount = 0;
|
throw new Error("Not implemented");
|
||||||
let pixelCount = 0;
|
|
||||||
let pixelStepCount = 0;
|
|
||||||
|
|
||||||
for await (
|
|
||||||
const generation of generationStore.listBy("fromId", {
|
|
||||||
after: new Date(Date.UTC(year, month - 1, day)),
|
|
||||||
before: new Date(Date.UTC(year, month - 1, day + 1)),
|
|
||||||
value: userId,
|
|
||||||
})
|
|
||||||
) {
|
|
||||||
imageCount++;
|
|
||||||
pixelCount += (generation.value.info?.width ?? 0) * (generation.value.info?.height ?? 0);
|
|
||||||
pixelStepCount += (generation.value.info?.width ?? 0) *
|
|
||||||
(generation.value.info?.height ?? 0) *
|
|
||||||
(generation.value.info?.steps ?? 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
return {
|
|
||||||
imageCount,
|
|
||||||
pixelCount,
|
|
||||||
pixelStepCount,
|
|
||||||
timestamp: Date.now(),
|
|
||||||
};
|
|
||||||
},
|
|
||||||
{
|
|
||||||
// expire in 1 minute if was calculated on the same day, otherwise 7-14 days.
|
|
||||||
expireIn: (result, year, month, day) => {
|
|
||||||
const requestDate = new UTCDateMini(year, month - 1, day);
|
|
||||||
const calculatedDate = new UTCDateMini(result.timestamp);
|
|
||||||
return isSameDay(requestDate, calculatedDate)
|
|
||||||
? minutesToMilliseconds(1)
|
|
||||||
: hoursToMilliseconds(24 * 7 + Math.random() * 24 * 7);
|
|
||||||
},
|
|
||||||
// should cache if the stats are non-zero
|
|
||||||
shouldCache: (result) =>
|
|
||||||
result.imageCount > 0 || result.pixelCount > 0 || result.pixelStepCount > 0,
|
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
|
|
||||||
|
|
@ -1,23 +1,38 @@
|
||||||
import { minutesToMilliseconds } from "date-fns";
|
import { minutesToMilliseconds } from "date-fns";
|
||||||
import { Store } from "indexed_kv";
|
import { Store } from "indexed_kv";
|
||||||
import { info } from "std/log/mod.ts";
|
import { info } from "std/log/mod.ts";
|
||||||
import { Static, t } from "elysia";
|
import { JsonSchema, jsonType } from "t_rest/server";
|
||||||
import { db } from "./db.ts";
|
import { db } from "./db.ts";
|
||||||
import { generationStore } from "./generationStore.ts";
|
import { generationStore } from "./generationStore.ts";
|
||||||
import { kvMemoize } from "../utils/kvMemoize.ts";
|
import { kvMemoize } from "./kvMemoize.ts";
|
||||||
import { sortBy } from "std/collections/sort_by.ts";
|
import { sortBy } from "std/collections/sort_by.ts";
|
||||||
|
|
||||||
export const userStatsSchema = t.Object({
|
export const userStatsSchema = {
|
||||||
userId: t.Number(),
|
type: "object",
|
||||||
imageCount: t.Number(),
|
properties: {
|
||||||
stepCount: t.Number(),
|
userId: { type: "number" },
|
||||||
pixelCount: t.Number(),
|
imageCount: { type: "number" },
|
||||||
pixelStepCount: t.Number(),
|
stepCount: { type: "number" },
|
||||||
tagCountMap: t.Record(t.String(), t.Number()),
|
pixelCount: { type: "number" },
|
||||||
timestamp: t.Number(),
|
pixelStepCount: { type: "number" },
|
||||||
});
|
tagCountMap: {
|
||||||
|
type: "object",
|
||||||
|
additionalProperties: { type: "number" },
|
||||||
|
},
|
||||||
|
timestamp: { type: "number" },
|
||||||
|
},
|
||||||
|
required: [
|
||||||
|
"userId",
|
||||||
|
"imageCount",
|
||||||
|
"stepCount",
|
||||||
|
"pixelCount",
|
||||||
|
"pixelStepCount",
|
||||||
|
"tagCountMap",
|
||||||
|
"timestamp",
|
||||||
|
],
|
||||||
|
} as const satisfies JsonSchema;
|
||||||
|
|
||||||
export type UserStats = Static<typeof userStatsSchema>;
|
export type UserStats = jsonType<typeof userStatsSchema>;
|
||||||
|
|
||||||
type UserStatsIndices = {
|
type UserStatsIndices = {
|
||||||
userId: number;
|
userId: number;
|
||||||
|
|
|
||||||
|
|
@ -1,23 +1,37 @@
|
||||||
import { Store } from "indexed_kv";
|
import { Store } from "indexed_kv";
|
||||||
import { Static, t } from "elysia";
|
import { JsonSchema, jsonType } from "t_rest/server";
|
||||||
import { db } from "./db.ts";
|
import { db } from "./db.ts";
|
||||||
|
|
||||||
export const workerInstanceSchema = t.Object({
|
export const workerInstanceSchema = {
|
||||||
key: t.String(),
|
type: "object",
|
||||||
name: t.Nullable(t.String()),
|
properties: {
|
||||||
sdUrl: t.String(),
|
// used for counting stats
|
||||||
sdAuth: t.Nullable(t.Object({
|
key: { type: "string" },
|
||||||
user: t.String(),
|
// used for display
|
||||||
password: t.String(),
|
name: { type: ["string", "null"] },
|
||||||
})),
|
sdUrl: { type: "string" },
|
||||||
lastOnlineTime: t.Optional(t.Number()),
|
sdAuth: {
|
||||||
lastError: t.Optional(t.Object({
|
type: ["object", "null"],
|
||||||
message: t.String(),
|
properties: {
|
||||||
time: t.Number(),
|
user: { type: "string" },
|
||||||
})),
|
password: { type: "string" },
|
||||||
});
|
},
|
||||||
|
required: ["user", "password"],
|
||||||
|
},
|
||||||
|
lastOnlineTime: { type: "number" },
|
||||||
|
lastError: {
|
||||||
|
type: "object",
|
||||||
|
properties: {
|
||||||
|
message: { type: "string" },
|
||||||
|
time: { type: "number" },
|
||||||
|
},
|
||||||
|
required: ["message", "time"],
|
||||||
|
},
|
||||||
|
},
|
||||||
|
required: ["key", "name", "sdUrl", "sdAuth"],
|
||||||
|
} as const satisfies JsonSchema;
|
||||||
|
|
||||||
export type WorkerInstance = Static<typeof workerInstanceSchema>;
|
export type WorkerInstance = jsonType<typeof workerInstanceSchema>;
|
||||||
|
|
||||||
export const workerInstanceStore = new Store<WorkerInstance>(db, "workerInstances", {
|
export const workerInstanceStore = new Store<WorkerInstance>(db, "workerInstances", {
|
||||||
indices: {},
|
indices: {},
|
||||||
|
|
|
||||||
|
|
@ -12,9 +12,9 @@ export async function broadcastCommand(ctx: CommandContext<ErisContext>) {
|
||||||
return ctx.reply("I don't know who you are.");
|
return ctx.reply("I don't know who you are.");
|
||||||
}
|
}
|
||||||
|
|
||||||
const adminEntry = await adminStore.get(["admins", ctx.from.id]);
|
const [admin] = await adminStore.getBy("tgUserId", { value: ctx.from.id });
|
||||||
|
|
||||||
if (!adminEntry.versionstamp) {
|
if (!admin) {
|
||||||
return ctx.reply("Only a bot admin can use this command.");
|
return ctx.reply("Only a bot admin can use this command.");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -129,7 +129,7 @@ async function img2img(
|
||||||
chat: ctx.message.chat,
|
chat: ctx.message.chat,
|
||||||
requestMessage: ctx.message,
|
requestMessage: ctx.message,
|
||||||
replyMessage: replyMessage,
|
replyMessage: replyMessage,
|
||||||
}, { priority: 0, retryCount: 3, repeatDelayMs: 10_000 });
|
}, { retryCount: 3, repeatDelayMs: 10_000 });
|
||||||
|
|
||||||
debug(`Generation (img2img) enqueued for ${formatUserChat(ctx.message)}`);
|
debug(`Generation (img2img) enqueued for ${formatUserChat(ctx.message)}`);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -115,7 +115,7 @@ bot.api.setMyDescription(
|
||||||
bot.api.setMyCommands([
|
bot.api.setMyCommands([
|
||||||
{ command: "txt2img", description: "Generate image from text" },
|
{ command: "txt2img", description: "Generate image from text" },
|
||||||
{ command: "img2img", description: "Generate image from image" },
|
{ command: "img2img", description: "Generate image from image" },
|
||||||
{ command: "pnginfo", description: "Try to extract prompt from raw file" },
|
{ command: "pnginfo", description: "Show generation parameters of an image" },
|
||||||
{ command: "queue", description: "Show the current queue" },
|
{ command: "queue", description: "Show the current queue" },
|
||||||
{ command: "cancel", description: "Cancel all your requests" },
|
{ command: "cancel", description: "Cancel all your requests" },
|
||||||
]);
|
]);
|
||||||
|
|
|
||||||
|
|
@ -1,24 +1,12 @@
|
||||||
import * as ExifReader from "exifreader";
|
import { decode } from "png_chunk_text";
|
||||||
|
import extractChunks from "png_chunks_extract";
|
||||||
|
|
||||||
export function getPngInfo(pngData: ArrayBuffer): string | undefined {
|
export function getPngInfo(pngData: Uint8Array): string | undefined {
|
||||||
const info = ExifReader.load(pngData);
|
return extractChunks(pngData)
|
||||||
|
.filter((chunk) => chunk.name === "tEXt")
|
||||||
if (info.UserComment?.value && Array.isArray(info.UserComment.value)) {
|
.map((chunk) => decode(chunk.data))
|
||||||
// JPEG image
|
.find((textChunk) => textChunk.keyword === "parameters")
|
||||||
return String.fromCharCode(
|
?.text;
|
||||||
...info.UserComment.value
|
|
||||||
.filter((char): char is number => typeof char == "number")
|
|
||||||
.filter((char) => char !== 0),
|
|
||||||
).replace("UNICODE", "");
|
|
||||||
}
|
|
||||||
|
|
||||||
if (info.parameters?.description) {
|
|
||||||
// PNG image
|
|
||||||
return info.parameters.description;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Unknown image type
|
|
||||||
return undefined;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface PngInfo {
|
export interface PngInfo {
|
||||||
|
|
|
||||||
|
|
@ -20,9 +20,9 @@ async function pnginfo(ctx: ErisContext, includeRepliedTo: boolean): Promise<voi
|
||||||
const document = ctx.message?.document ||
|
const document = ctx.message?.document ||
|
||||||
(includeRepliedTo ? ctx.message?.reply_to_message?.document : undefined);
|
(includeRepliedTo ? ctx.message?.reply_to_message?.document : undefined);
|
||||||
|
|
||||||
if (document?.mime_type !== "image/png" && document?.mime_type !== "image/jpeg") {
|
if (document?.mime_type !== "image/png") {
|
||||||
await ctx.reply(
|
await ctx.reply(
|
||||||
"Please send me a PNG or JPEG file." +
|
"Please send me a PNG file." +
|
||||||
pnginfoQuestion.messageSuffixMarkdown(),
|
pnginfoQuestion.messageSuffixMarkdown(),
|
||||||
omitUndef(
|
omitUndef(
|
||||||
{
|
{
|
||||||
|
|
@ -37,14 +37,7 @@ async function pnginfo(ctx: ErisContext, includeRepliedTo: boolean): Promise<voi
|
||||||
|
|
||||||
const file = await ctx.api.getFile(document.file_id);
|
const file = await ctx.api.getFile(document.file_id);
|
||||||
const buffer = await fetch(file.getUrl()).then((resp) => resp.arrayBuffer());
|
const buffer = await fetch(file.getUrl()).then((resp) => resp.arrayBuffer());
|
||||||
const info = getPngInfo(buffer);
|
const params = parsePngInfo(getPngInfo(new Uint8Array(buffer)) ?? "");
|
||||||
if (!info) {
|
|
||||||
return void await ctx.reply(
|
|
||||||
"No info found in file.",
|
|
||||||
omitUndef({ reply_to_message_id: ctx.message?.message_id }),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
const params = parsePngInfo(info, undefined, true);
|
|
||||||
|
|
||||||
const paramsText = fmt([
|
const paramsText = fmt([
|
||||||
`${params.prompt}\n`,
|
`${params.prompt}\n`,
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,6 @@ import { generationQueue } from "../app/generationQueue.ts";
|
||||||
import { formatUserChat } from "../utils/formatUserChat.ts";
|
import { formatUserChat } from "../utils/formatUserChat.ts";
|
||||||
import { ErisContext } from "./mod.ts";
|
import { ErisContext } from "./mod.ts";
|
||||||
import { getPngInfo, parsePngInfo, PngInfo } from "./parsePngInfo.ts";
|
import { getPngInfo, parsePngInfo, PngInfo } from "./parsePngInfo.ts";
|
||||||
import { adminStore } from "../app/adminStore.ts";
|
|
||||||
|
|
||||||
export const txt2imgQuestion = new StatelessQuestion<ErisContext>(
|
export const txt2imgQuestion = new StatelessQuestion<ErisContext>(
|
||||||
"txt2img",
|
"txt2img",
|
||||||
|
|
@ -30,7 +29,6 @@ async function txt2img(ctx: ErisContext, match: string, includeRepliedTo: boolea
|
||||||
}
|
}
|
||||||
|
|
||||||
const config = await getConfig();
|
const config = await getConfig();
|
||||||
let priority = 0;
|
|
||||||
|
|
||||||
if (config.pausedReason != null) {
|
if (config.pausedReason != null) {
|
||||||
await ctx.reply(`I'm paused: ${config.pausedReason || "No reason given"}`, {
|
await ctx.reply(`I'm paused: ${config.pausedReason || "No reason given"}`, {
|
||||||
|
|
@ -39,26 +37,20 @@ async function txt2img(ctx: ErisContext, match: string, includeRepliedTo: boolea
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
const adminEntry = await adminStore.get(["admins", ctx.from.id]);
|
const jobs = await generationQueue.getAllJobs();
|
||||||
|
if (jobs.length >= config.maxJobs) {
|
||||||
|
await ctx.reply(`The queue is full. Try again later. (Max queue size: ${config.maxJobs})`, {
|
||||||
|
reply_to_message_id: ctx.message?.message_id,
|
||||||
|
});
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (adminEntry.versionstamp) {
|
const userJobs = jobs.filter((job) => job.state.from.id === ctx.message?.from?.id);
|
||||||
priority = 1;
|
if (userJobs.length >= config.maxUserJobs) {
|
||||||
} else {
|
await ctx.reply(`You already have ${userJobs.length} jobs in queue. Try again later.`, {
|
||||||
const jobs = await generationQueue.getAllJobs();
|
reply_to_message_id: ctx.message?.message_id,
|
||||||
if (jobs.length >= config.maxJobs) {
|
});
|
||||||
await ctx.reply(`The queue is full. Try again later. (Max queue size: ${config.maxJobs})`, {
|
return;
|
||||||
reply_to_message_id: ctx.message?.message_id,
|
|
||||||
});
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const userJobs = jobs.filter((job) => job.state.from.id === ctx.message?.from?.id);
|
|
||||||
if (userJobs.length >= config.maxUserJobs) {
|
|
||||||
await ctx.reply(`You already have ${userJobs.length} jobs in the queue. Try again later.`, {
|
|
||||||
reply_to_message_id: ctx.message?.message_id,
|
|
||||||
});
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
let params: Partial<PngInfo> = {};
|
let params: Partial<PngInfo> = {};
|
||||||
|
|
@ -68,26 +60,17 @@ async function txt2img(ctx: ErisContext, match: string, includeRepliedTo: boolea
|
||||||
if (includeRepliedTo && repliedToMsg?.document?.mime_type === "image/png") {
|
if (includeRepliedTo && repliedToMsg?.document?.mime_type === "image/png") {
|
||||||
const file = await ctx.api.getFile(repliedToMsg.document.file_id);
|
const file = await ctx.api.getFile(repliedToMsg.document.file_id);
|
||||||
const buffer = await fetch(file.getUrl()).then((resp) => resp.arrayBuffer());
|
const buffer = await fetch(file.getUrl()).then((resp) => resp.arrayBuffer());
|
||||||
params = parsePngInfo(getPngInfo(buffer) ?? "", params);
|
params = parsePngInfo(getPngInfo(new Uint8Array(buffer)) ?? "", params);
|
||||||
}
|
}
|
||||||
|
|
||||||
const repliedToText = repliedToMsg?.text || repliedToMsg?.caption;
|
const repliedToText = repliedToMsg?.text || repliedToMsg?.caption;
|
||||||
const isReply = includeRepliedTo && repliedToText;
|
if (includeRepliedTo && repliedToText) {
|
||||||
|
|
||||||
if (isReply) {
|
|
||||||
// TODO: remove bot command from replied to text
|
// TODO: remove bot command from replied to text
|
||||||
params = parsePngInfo(repliedToText, params);
|
params = parsePngInfo(repliedToText, params);
|
||||||
}
|
}
|
||||||
|
|
||||||
params = parsePngInfo(match, params, true);
|
params = parsePngInfo(match, params, true);
|
||||||
|
|
||||||
if (isReply) {
|
|
||||||
const parsedInfo = parsePngInfo(repliedToText, undefined, true);
|
|
||||||
if (parsedInfo.prompt !== params.prompt) {
|
|
||||||
params.seed = parsedInfo.seed ?? -1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!params.prompt) {
|
if (!params.prompt) {
|
||||||
await ctx.reply(
|
await ctx.reply(
|
||||||
"Please tell me what you want to see." +
|
"Please tell me what you want to see." +
|
||||||
|
|
@ -111,7 +94,7 @@ async function txt2img(ctx: ErisContext, match: string, includeRepliedTo: boolea
|
||||||
chat: ctx.message.chat,
|
chat: ctx.message.chat,
|
||||||
requestMessage: ctx.message,
|
requestMessage: ctx.message,
|
||||||
replyMessage: replyMessage,
|
replyMessage: replyMessage,
|
||||||
}, { retryCount: 3, retryDelayMs: 10_000, priority: priority });
|
}, { retryCount: 3, retryDelayMs: 10_000 });
|
||||||
|
|
||||||
debug(`Generation (txt2img) enqueued for ${formatUserChat(ctx.message)}`);
|
debug(`Generation (txt2img) enqueued for ${formatUserChat(ctx.message)}`);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
14
deno.json
14
deno.json
|
|
@ -11,10 +11,6 @@
|
||||||
"async": "https://deno.land/x/async@v2.0.2/mod.ts",
|
"async": "https://deno.land/x/async@v2.0.2/mod.ts",
|
||||||
"date-fns": "https://cdn.skypack.dev/date-fns@2.30.0?dts",
|
"date-fns": "https://cdn.skypack.dev/date-fns@2.30.0?dts",
|
||||||
"date-fns/utc": "https://cdn.skypack.dev/@date-fns/utc@1.1.0?dts",
|
"date-fns/utc": "https://cdn.skypack.dev/@date-fns/utc@1.1.0?dts",
|
||||||
"elysia": "https://esm.sh/elysia@0.7.21?dev",
|
|
||||||
"elysia/eden": "https://esm.sh/@elysiajs/eden@0.7.4?external=elysia&dev",
|
|
||||||
"elysia/swagger": "https://esm.sh/@elysiajs/swagger@0.7.4?external=elysia&dev",
|
|
||||||
"exifreader": "https://esm.sh/exifreader@4.14.1",
|
|
||||||
"file_type": "https://esm.sh/file-type@18.5.0",
|
"file_type": "https://esm.sh/file-type@18.5.0",
|
||||||
"grammy": "https://lib.deno.dev/x/grammy@1/mod.ts",
|
"grammy": "https://lib.deno.dev/x/grammy@1/mod.ts",
|
||||||
"grammy_autoquote": "https://lib.deno.dev/x/grammy_autoquote@1/mod.ts",
|
"grammy_autoquote": "https://lib.deno.dev/x/grammy_autoquote@1/mod.ts",
|
||||||
|
|
@ -27,6 +23,8 @@
|
||||||
"kvfs": "https://deno.land/x/kvfs@v0.1.0/mod.ts",
|
"kvfs": "https://deno.land/x/kvfs@v0.1.0/mod.ts",
|
||||||
"kvmq": "https://deno.land/x/kvmq@v0.3.0/mod.ts",
|
"kvmq": "https://deno.land/x/kvmq@v0.3.0/mod.ts",
|
||||||
"openapi_fetch": "https://esm.sh/openapi-fetch@0.7.6",
|
"openapi_fetch": "https://esm.sh/openapi-fetch@0.7.6",
|
||||||
|
"png_chunk_text": "https://esm.sh/png-chunk-text@1.0.0",
|
||||||
|
"png_chunks_extract": "https://esm.sh/png-chunks-extract@1.0.0",
|
||||||
"react": "https://esm.sh/react@18.2.0?dev",
|
"react": "https://esm.sh/react@18.2.0?dev",
|
||||||
"react-dom/client": "https://esm.sh/react-dom@18.2.0/client?external=react&dev",
|
"react-dom/client": "https://esm.sh/react-dom@18.2.0/client?external=react&dev",
|
||||||
"react-flip-move": "https://esm.sh/react-flip-move@3.0.5?external=react&dev",
|
"react-flip-move": "https://esm.sh/react-flip-move@3.0.5?external=react&dev",
|
||||||
|
|
@ -43,6 +41,8 @@
|
||||||
"std/path/": "https://deno.land/std@0.204.0/path/",
|
"std/path/": "https://deno.land/std@0.204.0/path/",
|
||||||
"swr": "https://esm.sh/swr@2.2.4?external=react&dev",
|
"swr": "https://esm.sh/swr@2.2.4?external=react&dev",
|
||||||
"swr/mutation": "https://esm.sh/swr@2.2.4/mutation?external=react&dev",
|
"swr/mutation": "https://esm.sh/swr@2.2.4/mutation?external=react&dev",
|
||||||
|
"t_rest/client": "https://esm.sh/ty-rest@0.4.1/client",
|
||||||
|
"t_rest/server": "https://esm.sh/ty-rest@0.4.1/server",
|
||||||
"twind/core": "https://esm.sh/@twind/core@1.1.3",
|
"twind/core": "https://esm.sh/@twind/core@1.1.3",
|
||||||
"twind/preset-tailwind": "https://esm.sh/@twind/preset-tailwind@1.1.4",
|
"twind/preset-tailwind": "https://esm.sh/@twind/preset-tailwind@1.1.4",
|
||||||
"ulid": "https://deno.land/x/ulid@v0.3.0/mod.ts"
|
"ulid": "https://deno.land/x/ulid@v0.3.0/mod.ts"
|
||||||
|
|
@ -55,9 +55,9 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"tasks": {
|
"tasks": {
|
||||||
"check": "deno check --unstable-kv main.ts && deno check --unstable-kv ui/main.tsx",
|
"check": "deno check --unstable main.ts && deno check --unstable ui/main.tsx",
|
||||||
"generate": "deno run npm:openapi-typescript http://localhost:7861/openapi.json -o app/sdApi.ts",
|
"generate": "deno run npm:openapi-typescript http://localhost:7861/openapi.json -o app/sdApi.ts",
|
||||||
"start": "deno run --unstable-kv --allow-env --allow-read=. --allow-write=db --allow-net main.ts",
|
"start": "deno run --unstable --allow-env --allow-read --allow-write --allow-net main.ts",
|
||||||
"test": "deno test"
|
"test": "deno test --unstable"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,369 @@
|
||||||
|
{
|
||||||
|
"version": "3",
|
||||||
|
"packages": {
|
||||||
|
"specifiers": {
|
||||||
|
"npm:@types/node": "npm:@types/node@18.16.19"
|
||||||
|
},
|
||||||
|
"npm": {
|
||||||
|
"@types/node@18.16.19": {
|
||||||
|
"integrity": "sha512-IXl7o+R9iti9eBW4Wg2hx1xQDig183jj7YLn8F7udNceyfkbn1ZxmzZXuak20gR40D7pIkIY1kYGx5VIGbaHKA==",
|
||||||
|
"dependencies": {}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"redirects": {
|
||||||
|
"https://cdn.skypack.dev/-/@date-fns/utc@v1.1.0-EKCmNY9452DyFBJfVVmZ/dist=es2019,mode=types/date.d.ts": "https://cdn.skypack.dev/-/@date-fns/utc@v1.1.0-EKCmNY9452DyFBJfVVmZ/dist=es2019,mode=types/date/index.d.ts",
|
||||||
|
"https://esm.sh/@grammyjs/types@2": "https://esm.sh/@grammyjs/types@2.12.1",
|
||||||
|
"https://esm.sh/@grammyjs/types@v2": "https://esm.sh/@grammyjs/types@2.0.0",
|
||||||
|
"https://esm.sh/@swc/core@1.2.212/types.d.ts": "https://esm.sh/v133/@swc/core@1.2.212/types.d.ts",
|
||||||
|
"https://esm.sh/telegram-format@2": "https://esm.sh/telegram-format@2.1.0",
|
||||||
|
"https://esm.sh/v128/@types/react@~18.2/index.d.ts": "https://esm.sh/v128/@types/react@18.2.25/index.d.ts",
|
||||||
|
"https://esm.sh/v133/@types/png-chunk-text@~1.0/index.d.ts": "https://esm.sh/v133/@types/png-chunk-text@1.0.2/index.d.ts",
|
||||||
|
"https://esm.sh/v133/@types/png-chunks-extract@~1.0/index.d.ts": "https://esm.sh/v133/@types/png-chunks-extract@1.0.1/index.d.ts",
|
||||||
|
"https://esm.sh/v133/@types/react-dom@~18.2/X-ZS9yZWFjdA/client~.d.ts": "https://esm.sh/v133/@types/react-dom@18.2.14/X-ZS9yZWFjdA/client~.d.ts",
|
||||||
|
"https://lib.deno.dev/x/grammy@1/mod.ts": "https://deno.land/x/grammy@v1.19.2/mod.ts",
|
||||||
|
"https://lib.deno.dev/x/grammy@^1.0/mod.ts": "https://deno.land/x/grammy@v1.19.2/mod.ts",
|
||||||
|
"https://lib.deno.dev/x/grammy@v1/mod.ts": "https://deno.land/x/grammy@v1.19.2/mod.ts",
|
||||||
|
"https://lib.deno.dev/x/grammy@v1/types.ts": "https://deno.land/x/grammy@v1.19.2/types.ts",
|
||||||
|
"https://lib.deno.dev/x/grammy_files@1/mod.ts": "https://deno.land/x/grammy_files@v1.0.4/mod.ts",
|
||||||
|
"https://lib.deno.dev/x/grammy_parse_mode@1/mod.ts": "https://deno.land/x/grammy_parse_mode@1.8.1/mod.ts",
|
||||||
|
"https://lib.deno.dev/x/grammy_runner@2/mod.ts": "https://deno.land/x/grammy_runner@v2.0.3/mod.ts",
|
||||||
|
"https://lib.deno.dev/x/grammy_stateless_question_alpha@3/mod.ts": "https://deno.land/x/grammy_stateless_question_alpha@v3.0.5/mod.ts",
|
||||||
|
"https://lib.deno.dev/x/grammy_types@3/mod.ts": "https://deno.land/x/grammy_types@v3.3.0/mod.ts"
|
||||||
|
},
|
||||||
|
"remote": {
|
||||||
|
"https://cdn.skypack.dev/-/@date-fns/utc@v1.1.0-EKCmNY9452DyFBJfVVmZ/dist=es2019,mode=imports/optimized/@date-fns/utc.js": "f3566d499010a4872640fc2c5f539e98d490d794f43e597a2da9aadf03b2c050",
|
||||||
|
"https://cdn.skypack.dev/-/@date-fns/utc@v1.1.0-EKCmNY9452DyFBJfVVmZ/dist=es2019,mode=imports/optimized/@date-fns/utc/date.js": "bd4ef50c3a846971a4b001bfdbfee22e9b523a4faaaa776c1001b5c8b450a025",
|
||||||
|
"https://cdn.skypack.dev/-/@date-fns/utc@v1.1.0-EKCmNY9452DyFBJfVVmZ/dist=es2019,mode=imports/optimized/@date-fns/utc/date/mini.js": "2d7a4c546f921006542c2f83b76a5d1a94c670f9c885382d998054f627aadd5a",
|
||||||
|
"https://cdn.skypack.dev/-/date-fns@v2.30.0-E7SpvwCL3wRUK0Q9mmOa/dist=es2019,mode=imports/optimized/date-fns.js": "9e81dde88a23d207bf9c40c8350525c9115eeede74000c9f94fcd4a65ce64865",
|
||||||
|
"https://cdn.skypack.dev/-/debug@v4.3.4-o4liVvMlOnQWbLSYZMXw/dist=es2019,mode=imports/optimized/debug.js": "671100993996e39b501301a87000607916d4d2d9f8fc8e9c5200ae5ba64a1389",
|
||||||
|
"https://cdn.skypack.dev/-/ms@v2.1.2-giBDZ1IA5lmQ3ZXaa87V/dist=es2019,mode=imports/optimized/ms.js": "fd88e2d51900437011f1ad232f3393ce97db1b87a7844b3c58dd6d65562c1276",
|
||||||
|
"https://cdn.skypack.dev/@date-fns/utc@1.1.0?dts": "9fafa18de74e61386a79482ca58b766c0be1f8fd10bdc931ef26bd4b8cdac91e",
|
||||||
|
"https://cdn.skypack.dev/date-fns@2.30.0?dts": "9cf78eb65f86f7b699e241a1e0ff94f3878d693e517e21ddc7fe727e3b479058",
|
||||||
|
"https://cdn.skypack.dev/debug@4.3.4": "7b1d010cc930f71b940ba5941da055bc181115229e29de7214bdb4425c68ea76",
|
||||||
|
"https://deno.land/std@0.135.0/_util/assert.ts": "e94f2eb37cebd7f199952e242c77654e43333c1ac4c5c700e929ea3aa5489f74",
|
||||||
|
"https://deno.land/std@0.135.0/_util/os.ts": "49b92edea1e82ba295ec946de8ffd956ed123e2948d9bd1d3e901b04e4307617",
|
||||||
|
"https://deno.land/std@0.135.0/bytes/bytes_list.ts": "67eb118e0b7891d2f389dad4add35856f4ad5faab46318ff99653456c23b025d",
|
||||||
|
"https://deno.land/std@0.135.0/bytes/equals.ts": "a60ef9f01fb6e06a4e0343fc44d53d39d12dd66bc3f09ac8e6eb9cc1a6335e48",
|
||||||
|
"https://deno.land/std@0.135.0/bytes/mod.ts": "4cef6fe8f0de217b9babbcbb0a566402b667f18a8e6d094a45e5fb3fc1afff70",
|
||||||
|
"https://deno.land/std@0.135.0/fmt/colors.ts": "30455035d6d728394781c10755351742dd731e3db6771b1843f9b9e490104d37",
|
||||||
|
"https://deno.land/std@0.135.0/io/buffer.ts": "bd0c4bf53db4b4be916ca5963e454bddfd3fcd45039041ea161dbf826817822b",
|
||||||
|
"https://deno.land/std@0.135.0/io/files.ts": "d199ef64e918a256320ba8d8d44ae91de87c9077df8f8d6cca013f1b9fbbe285",
|
||||||
|
"https://deno.land/std@0.135.0/io/mod.ts": "1a4e8d19d42745fb2ff68d6ffa801657a4a15713bf7e7173df2da4737f5c5450",
|
||||||
|
"https://deno.land/std@0.135.0/io/readers.ts": "15062a8863e6df8503ac6629924d04c5e65cf3da15997470525e705831a810c8",
|
||||||
|
"https://deno.land/std@0.135.0/io/streams.ts": "988a19155b52161f0035ce539e2f1d12edbc4c389fa7633da832a64e6edbe1a0",
|
||||||
|
"https://deno.land/std@0.135.0/io/util.ts": "078da53bba767bec0d45f7da44411f6dbf269e51ef7fcfea5e3714e04681c674",
|
||||||
|
"https://deno.land/std@0.135.0/io/writers.ts": "5db9995d2afc7ed391c88c6b441457df6fad6a0b09653e54c1dcd0387ab947fd",
|
||||||
|
"https://deno.land/std@0.135.0/path/_constants.ts": "df1db3ffa6dd6d1252cc9617e5d72165cd2483df90e93833e13580687b6083c3",
|
||||||
|
"https://deno.land/std@0.135.0/path/_interface.ts": "ee3b431a336b80cf445441109d089b70d87d5e248f4f90ff906820889ecf8d09",
|
||||||
|
"https://deno.land/std@0.135.0/path/_util.ts": "c1e9686d0164e29f7d880b2158971d805b6e0efc3110d0b3e24e4b8af2190d2b",
|
||||||
|
"https://deno.land/std@0.135.0/path/common.ts": "bee563630abd2d97f99d83c96c2fa0cca7cee103e8cb4e7699ec4d5db7bd2633",
|
||||||
|
"https://deno.land/std@0.135.0/path/glob.ts": "cb5255638de1048973c3e69e420c77dc04f75755524cb3b2e160fe9277d939ee",
|
||||||
|
"https://deno.land/std@0.135.0/path/mod.ts": "4275129bb766f0e475ecc5246aa35689eeade419d72a48355203f31802640be7",
|
||||||
|
"https://deno.land/std@0.135.0/path/posix.ts": "293cdaec3ecccec0a9cc2b534302dfe308adb6f10861fa183275d6695faace44",
|
||||||
|
"https://deno.land/std@0.135.0/path/separator.ts": "fe1816cb765a8068afb3e8f13ad272351c85cbc739af56dacfc7d93d710fe0f9",
|
||||||
|
"https://deno.land/std@0.135.0/path/win32.ts": "31811536855e19ba37a999cd8d1b62078235548d67902ece4aa6b814596dd757",
|
||||||
|
"https://deno.land/std@0.135.0/streams/conversion.ts": "712585bfa0172a97fb68dd46e784ae8ad59d11b88079d6a4ab098ff42e697d21",
|
||||||
|
"https://deno.land/std@0.135.0/testing/_diff.ts": "9d849cd6877694152e01775b2d93f9d6b7aef7e24bfe3bfafc4d7a1ac8e9f392",
|
||||||
|
"https://deno.land/std@0.135.0/testing/asserts.ts": "b0ef969032882b1f7eb1c7571e313214baa1485f7b61cf35807b2434e254365c",
|
||||||
|
"https://deno.land/std@0.186.0/async/deferred.ts": "42790112f36a75a57db4a96d33974a936deb7b04d25c6084a9fa8a49f135def8",
|
||||||
|
"https://deno.land/std@0.201.0/assert/assert.ts": "9a97dad6d98c238938e7540736b826440ad8c1c1e54430ca4c4e623e585607ee",
|
||||||
|
"https://deno.land/std@0.201.0/assert/assertion_error.ts": "4d0bde9b374dfbcbe8ac23f54f567b77024fb67dbb1906a852d67fe050d42f56",
|
||||||
|
"https://deno.land/std@0.201.0/async/abortable.ts": "fd682fa46f3b7b16b4606a5ab52a7ce309434b76f820d3221bdfb862719a15d7",
|
||||||
|
"https://deno.land/std@0.201.0/async/deadline.ts": "58f72a3cc0fcb731b2cc055ba046f4b5be3349ff6bf98f2e793c3b969354aab2",
|
||||||
|
"https://deno.land/std@0.201.0/async/debounce.ts": "adab11d04ca38d699444ac8a9d9856b4155e8dda2afd07ce78276c01ea5a4332",
|
||||||
|
"https://deno.land/std@0.201.0/async/deferred.ts": "42790112f36a75a57db4a96d33974a936deb7b04d25c6084a9fa8a49f135def8",
|
||||||
|
"https://deno.land/std@0.201.0/async/delay.ts": "a6142eb44cdd856b645086af2b811b1fcce08ec06bb7d50969e6a872ee9b8659",
|
||||||
|
"https://deno.land/std@0.201.0/async/mod.ts": "f04344fa21738e5ad6bea37a6bfffd57c617c2d372bb9f9dcfd118a1b622e576",
|
||||||
|
"https://deno.land/std@0.201.0/async/mux_async_iterator.ts": "70c7f2ee4e9466161350473ad61cac0b9f115cff4c552eaa7ef9d50c4cbb4cc9",
|
||||||
|
"https://deno.land/std@0.201.0/async/pool.ts": "47c1841cfa9c036144943d11747ddd44064f5baf8cb7ece25473ba873c6aceb0",
|
||||||
|
"https://deno.land/std@0.201.0/async/retry.ts": "296fb9c323e1325a69bee14ba947e7da7409a8dd9dd646d70cb51ea0d301f24e",
|
||||||
|
"https://deno.land/std@0.201.0/async/tee.ts": "47e42d35f622650b02234d43803d0383a89eb4387e1b83b5a40106d18ae36757",
|
||||||
|
"https://deno.land/std@0.201.0/bytes/copy.ts": "939d89e302a9761dcf1d9c937c7711174ed74c59eef40a1e4569a05c9de88219",
|
||||||
|
"https://deno.land/std@0.201.0/dotenv/load.ts": "0636983549b98f29ab75c9a22a42d9723f0a389ece5498fe971e7bb2556a12e2",
|
||||||
|
"https://deno.land/std@0.201.0/dotenv/mod.ts": "1da8c6d0e7f7d8a5c2b19400b763bc11739df24acec235dda7ea2cfd3d300057",
|
||||||
|
"https://deno.land/std@0.201.0/fmt/colors.ts": "87544aa2bc91087bb37f9c077970c85bfb041b48e4c37356129d7b450a415b6f",
|
||||||
|
"https://deno.land/std@0.201.0/fs/exists.ts": "cb59a853d84871d87acab0e7936a4dac11282957f8e195102c5a7acb42546bb8",
|
||||||
|
"https://deno.land/std@0.201.0/io/buf_writer.ts": "48c33c8f00b61dcbc7958706741cec8e59810bd307bc6a326cbd474fe8346dfd",
|
||||||
|
"https://deno.land/std@0.201.0/log/handlers.ts": "3a0883f65567f59a9a88e44c972b24b924621bc28ead91af11d7a6da93c4a64c",
|
||||||
|
"https://deno.land/std@0.201.0/log/levels.ts": "6309147664e9e008cd6671610f2505c4c95f181f6bae4816a84b33e0aec66859",
|
||||||
|
"https://deno.land/std@0.201.0/log/logger.ts": "180c50a07c43a556dc5794e913c82946399e89d683201d01c8f0091e1e4ae3fc",
|
||||||
|
"https://deno.land/std@0.201.0/log/mod.ts": "a274d2129c8d08d4c96e0fb165a595e6c730b5130b437a9ce04364156bfe955a",
|
||||||
|
"https://deno.land/std@0.202.0/assert/assert.ts": "9a97dad6d98c238938e7540736b826440ad8c1c1e54430ca4c4e623e585607ee",
|
||||||
|
"https://deno.land/std@0.202.0/assert/assertion_error.ts": "4d0bde9b374dfbcbe8ac23f54f567b77024fb67dbb1906a852d67fe050d42f56",
|
||||||
|
"https://deno.land/std@0.202.0/bytes/bytes_list.ts": "ecf5098c230b793970f43c06e8f30d70b937c031658365aeb3de9a8ae4d406a3",
|
||||||
|
"https://deno.land/std@0.202.0/bytes/concat.ts": "d26d6f3d7922e6d663dacfcd357563b7bf4a380ce5b9c2bbe0c8586662f25ce2",
|
||||||
|
"https://deno.land/std@0.202.0/bytes/copy.ts": "939d89e302a9761dcf1d9c937c7711174ed74c59eef40a1e4569a05c9de88219",
|
||||||
|
"https://deno.land/std@0.202.0/bytes/ends_with.ts": "4228811ebc71615d27f065c54b5e815ec1972538772b0f413c0efe05245b472e",
|
||||||
|
"https://deno.land/std@0.202.0/bytes/equals.ts": "fc190cce412b2136979181b163ec7e05f7e7a947e39102eee4b8c0d62519ddf9",
|
||||||
|
"https://deno.land/std@0.202.0/bytes/includes_needle.ts": "76a8163126fb2f8bf86fd7f22192c3bb04bf6a20b987a095127c2ca08adf3ba6",
|
||||||
|
"https://deno.land/std@0.202.0/bytes/index_of_needle.ts": "9c06610e9611b5647ac25952e71a22e09227c9f1b8cbeeb33399bf8bf8a7f649",
|
||||||
|
"https://deno.land/std@0.202.0/bytes/last_index_of_needle.ts": "f1602f221c3b678bc4f1e1c88a70a15ab7da32c21751dbbc6c957c956951d784",
|
||||||
|
"https://deno.land/std@0.202.0/bytes/mod.ts": "e869bba1e7a2e3a9cc6c2d55471888429a544e70a840c087672e656e7ba21815",
|
||||||
|
"https://deno.land/std@0.202.0/bytes/repeat.ts": "6f5e490d8d72bcbf8d84a6bb04690b9b3eb5822c5a11687bca73a2318a842294",
|
||||||
|
"https://deno.land/std@0.202.0/bytes/starts_with.ts": "3e607a70c9c09f5140b7a7f17a695221abcc7244d20af3eb47ccbb63f5885135",
|
||||||
|
"https://deno.land/std@0.202.0/collections/_utils.ts": "5114abc026ddef71207a79609b984614e66a63a4bda17d819d56b0e72c51527e",
|
||||||
|
"https://deno.land/std@0.202.0/collections/deep_merge.ts": "9db788ba56cb05b65c77166b789e58e125dff159b7f41bf4d19dc1cba19ecb8b",
|
||||||
|
"https://deno.land/std@0.202.0/collections/distinct_by.ts": "3afe11d81eafb30c7c9dbf568d94357f3d88153292c00671b72cd695deae6602",
|
||||||
|
"https://deno.land/std@0.202.0/collections/max_by.ts": "9d5940986aac51b2e4feaebef9cd8bf6e1eceeee5edcf3303e334b737f99520d",
|
||||||
|
"https://deno.land/std@0.202.0/collections/sort_by.ts": "1207755af756a5da04bebff39146c93cbe54f7870a5d67cf6922e871d96a01d5",
|
||||||
|
"https://deno.land/std@0.202.0/encoding/base64.ts": "144ae6234c1fbe5b68666c711dc15b1e9ee2aef6d42b3b4345bf9a6c91d70d0d",
|
||||||
|
"https://deno.land/std@0.202.0/flags/mod.ts": "0948466fc437f017f00c0b972a422b3dc3317a790bcf326429d23182977eaf9f",
|
||||||
|
"https://deno.land/std@0.202.0/fmt/bytes.ts": "f29cf69e0791d375f9f5d94ae1f0641e5a03b975f32ddf86d70f70fdf37e7b6a",
|
||||||
|
"https://deno.land/std@0.202.0/fmt/colors.ts": "c51c4642678eb690dcf5ffee5918b675bf01a33fba82acf303701ae1a4f8c8d9",
|
||||||
|
"https://deno.land/std@0.202.0/fmt/duration.ts": "7e73e2e7aa82013ea5885efd65e331c6b99506b3977bb9edcd2b6745ce3212e0",
|
||||||
|
"https://deno.land/std@0.202.0/http/etag.ts": "807382795850cde5c437c74bcc09392bc0fc56de348fc1271f383f4b28935b9f",
|
||||||
|
"https://deno.land/std@0.202.0/http/file_server.ts": "6f5c4a28c36995f31544abb49b86bee6e7a2d34664cac3936ff08ccad1682d85",
|
||||||
|
"https://deno.land/std@0.202.0/http/http_status.ts": "8a7bcfe3ac025199ad804075385e57f63d055b2aed539d943ccc277616d6f932",
|
||||||
|
"https://deno.land/std@0.202.0/http/util.ts": "4cf044067febaa26d0830e356b0f3a5f76d701a60d7ff7a516fad7b192f4c3a7",
|
||||||
|
"https://deno.land/std@0.202.0/media_types/_db.ts": "7606d83e31f23ce1a7968cbaee852810c2cf477903a095696cdc62eaab7ce570",
|
||||||
|
"https://deno.land/std@0.202.0/media_types/_util.ts": "0879b04cc810ff18d3dcd97d361e03c9dfb29f67d7fc4a9c6c9d387282ef5fe8",
|
||||||
|
"https://deno.land/std@0.202.0/media_types/content_type.ts": "ad98a5aa2d95f5965b2796072284258710a25e520952376ed432b0937ce743bc",
|
||||||
|
"https://deno.land/std@0.202.0/media_types/format_media_type.ts": "f5e1073c05526a6f5a516ac5c5587a1abd043bf1039c71cde1166aa4328c8baf",
|
||||||
|
"https://deno.land/std@0.202.0/media_types/get_charset.ts": "18b88274796fda5d353806bf409eb1d2ddb3f004eb4bd311662c4cdd8ac173db",
|
||||||
|
"https://deno.land/std@0.202.0/media_types/parse_media_type.ts": "31ccf2388ffab31b49500bb89fa0f5de189c8897e2ee6c9954f207637d488211",
|
||||||
|
"https://deno.land/std@0.202.0/media_types/type_by_extension.ts": "8c210d4e28ea426414dd8c61146eefbcc7e091a89ccde54bbbe883a154856afd",
|
||||||
|
"https://deno.land/std@0.202.0/media_types/vendor/mime-db.v1.52.0.ts": "6925bbcae81ca37241e3f55908d0505724358cda3384eaea707773b2c7e99586",
|
||||||
|
"https://deno.land/std@0.202.0/path/_basename.ts": "057d420c9049821f983f784fd87fa73ac471901fb628920b67972b0f44319343",
|
||||||
|
"https://deno.land/std@0.202.0/path/_constants.ts": "e49961f6f4f48039c0dfed3c3f93e963ca3d92791c9d478ac5b43183413136e0",
|
||||||
|
"https://deno.land/std@0.202.0/path/_extname.ts": "eaaa5aae1acf1f03254d681bd6a8ce42a9cb5b7ff2213a9d4740e8ab31283664",
|
||||||
|
"https://deno.land/std@0.202.0/path/_join.ts": "815f5e85b042285175b1492dd5781240ce126c23bd97bad6b8211fe7129c538e",
|
||||||
|
"https://deno.land/std@0.202.0/path/_normalize.ts": "a19ec8706b2707f9dd974662a5cd89fad438e62ab1857e08b314a8eb49a34d81",
|
||||||
|
"https://deno.land/std@0.202.0/path/_os.ts": "30b0c2875f360c9296dbe6b7f2d528f0f9c741cecad2e97f803f5219e91b40a2",
|
||||||
|
"https://deno.land/std@0.202.0/path/_relative.ts": "27bdeffb5311a47d85be26d37ad1969979359f7636c5cd9fcf05dcd0d5099dc5",
|
||||||
|
"https://deno.land/std@0.202.0/path/_resolve.ts": "7a3616f1093735ed327e758313b79c3c04ea921808ca5f19ddf240cb68d0adf6",
|
||||||
|
"https://deno.land/std@0.202.0/path/_util.ts": "4e191b1bac6b3bf0c31aab42e5ca2e01a86ab5a0d2e08b75acf8585047a86221",
|
||||||
|
"https://deno.land/std@0.202.0/path/basename.ts": "bdfa5a624c6a45564dc6758ef2077f2822978a6dbe77b0a3514f7d1f81362930",
|
||||||
|
"https://deno.land/std@0.202.0/path/extname.ts": "62c4b376300795342fe1e4746c0de518b4dc9c4b0b4617bfee62a2973a9555cf",
|
||||||
|
"https://deno.land/std@0.202.0/path/join.ts": "31c5419f23d91655b08ec7aec403f4e4cd1a63d39e28f6e42642ea207c2734f8",
|
||||||
|
"https://deno.land/std@0.202.0/path/relative.ts": "8bedac226afd360afc45d451a6c29fabceaf32978526bcb38e0c852661f66c61",
|
||||||
|
"https://deno.land/std@0.202.0/path/resolve.ts": "133161e4949fc97f9ca67988d51376b0f5eef8968a6372325ab84d39d30b80dc",
|
||||||
|
"https://deno.land/std@0.202.0/path/separator.ts": "40a3e9a4ad10bef23bc2cd6c610291b6c502a06237c2c4cd034a15ca78dedc1f",
|
||||||
|
"https://deno.land/std@0.202.0/streams/_common.ts": "3b2c1f0287ce2ad51fff4091a7d0f48375c85b0ec341468e76d5ac13bb0014dd",
|
||||||
|
"https://deno.land/std@0.202.0/streams/byte_slice_stream.ts": "c46d7c74836fc8c1a9acd9fe211cbe1bbaaee1b36087c834fb03af4991135c3a",
|
||||||
|
"https://deno.land/std@0.202.0/streams/iterate_reader.ts": "3b42d3056c8ccade561f1c7ac22d5e671e745933d9f9168fd3b5913588d911c3",
|
||||||
|
"https://deno.land/std@0.202.0/version.ts": "a39aa19f482555b66c041c6317bd8ce849401a3b580bd12e80fe0adf647b0ad1",
|
||||||
|
"https://deno.land/std@0.203.0/assert/assert.ts": "9a97dad6d98c238938e7540736b826440ad8c1c1e54430ca4c4e623e585607ee",
|
||||||
|
"https://deno.land/std@0.203.0/assert/assertion_error.ts": "4d0bde9b374dfbcbe8ac23f54f567b77024fb67dbb1906a852d67fe050d42f56",
|
||||||
|
"https://deno.land/std@0.203.0/flags/mod.ts": "0948466fc437f017f00c0b972a422b3dc3317a790bcf326429d23182977eaf9f",
|
||||||
|
"https://deno.land/std@0.203.0/path/_constants.ts": "e49961f6f4f48039c0dfed3c3f93e963ca3d92791c9d478ac5b43183413136e0",
|
||||||
|
"https://deno.land/std@0.203.0/path/_extname.ts": "eaaa5aae1acf1f03254d681bd6a8ce42a9cb5b7ff2213a9d4740e8ab31283664",
|
||||||
|
"https://deno.land/std@0.203.0/path/_join.ts": "815f5e85b042285175b1492dd5781240ce126c23bd97bad6b8211fe7129c538e",
|
||||||
|
"https://deno.land/std@0.203.0/path/_normalize.ts": "a19ec8706b2707f9dd974662a5cd89fad438e62ab1857e08b314a8eb49a34d81",
|
||||||
|
"https://deno.land/std@0.203.0/path/_os.ts": "30b0c2875f360c9296dbe6b7f2d528f0f9c741cecad2e97f803f5219e91b40a2",
|
||||||
|
"https://deno.land/std@0.203.0/path/_util.ts": "4e191b1bac6b3bf0c31aab42e5ca2e01a86ab5a0d2e08b75acf8585047a86221",
|
||||||
|
"https://deno.land/std@0.203.0/path/extname.ts": "62c4b376300795342fe1e4746c0de518b4dc9c4b0b4617bfee62a2973a9555cf",
|
||||||
|
"https://deno.land/std@0.203.0/path/join.ts": "31c5419f23d91655b08ec7aec403f4e4cd1a63d39e28f6e42642ea207c2734f8",
|
||||||
|
"https://deno.land/std@0.204.0/assert/assert.ts": "9a97dad6d98c238938e7540736b826440ad8c1c1e54430ca4c4e623e585607ee",
|
||||||
|
"https://deno.land/std@0.204.0/assert/assertion_error.ts": "4d0bde9b374dfbcbe8ac23f54f567b77024fb67dbb1906a852d67fe050d42f56",
|
||||||
|
"https://deno.land/std@0.204.0/path/_common/assert_path.ts": "061e4d093d4ba5aebceb2c4da3318bfe3289e868570e9d3a8e327d91c2958946",
|
||||||
|
"https://deno.land/std@0.204.0/path/_common/basename.ts": "0d978ff818f339cd3b1d09dc914881f4d15617432ae519c1b8fdc09ff8d3789a",
|
||||||
|
"https://deno.land/std@0.204.0/path/_common/common.ts": "9e4233b2eeb50f8b2ae10ecc2108f58583aea6fd3e8907827020282dc2b76143",
|
||||||
|
"https://deno.land/std@0.204.0/path/_common/constants.ts": "e49961f6f4f48039c0dfed3c3f93e963ca3d92791c9d478ac5b43183413136e0",
|
||||||
|
"https://deno.land/std@0.204.0/path/_common/dirname.ts": "2ba7fb4cc9fafb0f38028f434179579ce61d4d9e51296fad22b701c3d3cd7397",
|
||||||
|
"https://deno.land/std@0.204.0/path/_common/format.ts": "11aa62e316dfbf22c126917f5e03ea5fe2ee707386555a8f513d27ad5756cf96",
|
||||||
|
"https://deno.land/std@0.204.0/path/_common/from_file_url.ts": "ef1bf3197d2efbf0297a2bdbf3a61d804b18f2bcce45548ae112313ec5be3c22",
|
||||||
|
"https://deno.land/std@0.204.0/path/_common/glob_to_reg_exp.ts": "5c3c2b79fc2294ec803d102bd9855c451c150021f452046312819fbb6d4dc156",
|
||||||
|
"https://deno.land/std@0.204.0/path/_common/is_glob.ts": "567dce5c6656bdedfc6b3ee6c0833e1e4db2b8dff6e62148e94a917f289c06ad",
|
||||||
|
"https://deno.land/std@0.204.0/path/_common/normalize.ts": "2ba7fb4cc9fafb0f38028f434179579ce61d4d9e51296fad22b701c3d3cd7397",
|
||||||
|
"https://deno.land/std@0.204.0/path/_common/normalize_string.ts": "88c472f28ae49525f9fe82de8c8816d93442d46a30d6bb5063b07ff8a89ff589",
|
||||||
|
"https://deno.land/std@0.204.0/path/_common/relative.ts": "1af19d787a2a84b8c534cc487424fe101f614982ae4851382c978ab2216186b4",
|
||||||
|
"https://deno.land/std@0.204.0/path/_common/strip_trailing_separators.ts": "7ffc7c287e97bdeeee31b155828686967f222cd73f9e5780bfe7dfb1b58c6c65",
|
||||||
|
"https://deno.land/std@0.204.0/path/_common/to_file_url.ts": "a8cdd1633bc9175b7eebd3613266d7c0b6ae0fb0cff24120b6092ac31662f9ae",
|
||||||
|
"https://deno.land/std@0.204.0/path/_interface.ts": "6471159dfbbc357e03882c2266d21ef9afdb1e4aa771b0545e90db58a0ba314b",
|
||||||
|
"https://deno.land/std@0.204.0/path/_os.ts": "30b0c2875f360c9296dbe6b7f2d528f0f9c741cecad2e97f803f5219e91b40a2",
|
||||||
|
"https://deno.land/std@0.204.0/path/basename.ts": "04bb5ef3e86bba8a35603b8f3b69537112cdd19ce64b77f2522006da2977a5f3",
|
||||||
|
"https://deno.land/std@0.204.0/path/common.ts": "f4d061c7d0b95a65c2a1a52439edec393e906b40f1caf4604c389fae7caa80f5",
|
||||||
|
"https://deno.land/std@0.204.0/path/dirname.ts": "88a0a71c21debafc4da7a4cd44fd32e899462df458fbca152390887d41c40361",
|
||||||
|
"https://deno.land/std@0.204.0/path/extname.ts": "2da4e2490f3b48b7121d19fb4c91681a5e11bd6bd99df4f6f47d7a71bb6ecdf2",
|
||||||
|
"https://deno.land/std@0.204.0/path/format.ts": "3457530cc85d1b4bab175f9ae73998b34fd456c830d01883169af0681b8894fb",
|
||||||
|
"https://deno.land/std@0.204.0/path/from_file_url.ts": "e7fa233ea1dff9641e8d566153a24d95010110185a6f418dd2e32320926043f8",
|
||||||
|
"https://deno.land/std@0.204.0/path/glob.ts": "9c77cf47db1d786e2ebf66670824d03fd84ecc7c807cac24441eb9d5cb6a2986",
|
||||||
|
"https://deno.land/std@0.204.0/path/is_absolute.ts": "67232b41b860571c5b7537f4954c88d86ae2ba45e883ee37d3dec27b74909d13",
|
||||||
|
"https://deno.land/std@0.204.0/path/join.ts": "98d3d76c819af4a11a81d5ba2dbb319f1ce9d63fc2b615597d4bcfddd4a89a09",
|
||||||
|
"https://deno.land/std@0.204.0/path/mod.ts": "2d62a0a8b78a60e8e6f485d881bac6b61d58573b11cf585fb7c8fc50d9b20d80",
|
||||||
|
"https://deno.land/std@0.204.0/path/normalize.ts": "aa95be9a92c7bd4f9dc0ba51e942a1973e2b93d266cd74f5ca751c136d520b66",
|
||||||
|
"https://deno.land/std@0.204.0/path/parse.ts": "d87ff0deef3fb495bc0d862278ff96da5a06acf0625ca27769fc52ac0d3d6ece",
|
||||||
|
"https://deno.land/std@0.204.0/path/posix/_util.ts": "ecf49560fedd7dd376c6156cc5565cad97c1abe9824f4417adebc7acc36c93e5",
|
||||||
|
"https://deno.land/std@0.204.0/path/posix/basename.ts": "a630aeb8fd8e27356b1823b9dedd505e30085015407caa3396332752f6b8406a",
|
||||||
|
"https://deno.land/std@0.204.0/path/posix/common.ts": "e781d395dc76f6282e3f7dd8de13194abb8b04a82d109593141abc6e95755c8b",
|
||||||
|
"https://deno.land/std@0.204.0/path/posix/dirname.ts": "f48c9c42cc670803b505478b7ef162c7cfa9d8e751b59d278b2ec59470531472",
|
||||||
|
"https://deno.land/std@0.204.0/path/posix/extname.ts": "ee7f6571a9c0a37f9218fbf510c440d1685a7c13082c348d701396cc795e0be0",
|
||||||
|
"https://deno.land/std@0.204.0/path/posix/format.ts": "b94876f77e61bfe1f147d5ccb46a920636cd3cef8be43df330f0052b03875968",
|
||||||
|
"https://deno.land/std@0.204.0/path/posix/from_file_url.ts": "b97287a83e6407ac27bdf3ab621db3fccbf1c27df0a1b1f20e1e1b5acf38a379",
|
||||||
|
"https://deno.land/std@0.204.0/path/posix/glob.ts": "86c3f06d1c98303613c74650961c3e24bdb871cde2a97c3ae7f0f6d4abbef445",
|
||||||
|
"https://deno.land/std@0.204.0/path/posix/is_absolute.ts": "159900a3422d11069d48395568217eb7fc105ceda2683d03d9b7c0f0769e01b8",
|
||||||
|
"https://deno.land/std@0.204.0/path/posix/join.ts": "0c0d84bdc344876930126640011ec1b888e6facf74153ffad9ef26813aa2a076",
|
||||||
|
"https://deno.land/std@0.204.0/path/posix/mod.ts": "6bfa8a42d85345b12dbe8571028ca2c62d460b6ef968125e498602b43b6cf6b6",
|
||||||
|
"https://deno.land/std@0.204.0/path/posix/normalize.ts": "11de90a94ab7148cc46e5a288f7d732aade1d616bc8c862f5560fa18ff987b4b",
|
||||||
|
"https://deno.land/std@0.204.0/path/posix/parse.ts": "199208f373dd93a792e9c585352bfc73a6293411bed6da6d3bc4f4ef90b04c8e",
|
||||||
|
"https://deno.land/std@0.204.0/path/posix/relative.ts": "e2f230608b0f083e6deaa06e063943e5accb3320c28aef8d87528fbb7fe6504c",
|
||||||
|
"https://deno.land/std@0.204.0/path/posix/resolve.ts": "51579d83159d5c719518c9ae50812a63959bbcb7561d79acbdb2c3682236e285",
|
||||||
|
"https://deno.land/std@0.204.0/path/posix/separator.ts": "0b6573b5f3269a3164d8edc9cefc33a02dd51003731c561008c8bb60220ebac1",
|
||||||
|
"https://deno.land/std@0.204.0/path/posix/to_file_url.ts": "08d43ea839ee75e9b8b1538376cfe95911070a655cd312bc9a00f88ef14967b6",
|
||||||
|
"https://deno.land/std@0.204.0/path/posix/to_namespaced_path.ts": "c9228a0e74fd37e76622cd7b142b8416663a9b87db643302fa0926b5a5c83bdc",
|
||||||
|
"https://deno.land/std@0.204.0/path/relative.ts": "23d45ede8b7ac464a8299663a43488aad6b561414e7cbbe4790775590db6349c",
|
||||||
|
"https://deno.land/std@0.204.0/path/resolve.ts": "5b184efc87155a0af9fa305ff68a109e28de9aee81fc3e77cd01380f19daf867",
|
||||||
|
"https://deno.land/std@0.204.0/path/separator.ts": "40a3e9a4ad10bef23bc2cd6c610291b6c502a06237c2c4cd034a15ca78dedc1f",
|
||||||
|
"https://deno.land/std@0.204.0/path/to_file_url.ts": "edaafa089e0bce386e1b2d47afe7c72e379ff93b28a5829a5885e4b6c626d864",
|
||||||
|
"https://deno.land/std@0.204.0/path/to_namespaced_path.ts": "cf8734848aac3c7527d1689d2adf82132b1618eff3cc523a775068847416b22a",
|
||||||
|
"https://deno.land/std@0.204.0/path/windows/_util.ts": "f32b9444554c8863b9b4814025c700492a2b57ff2369d015360970a1b1099d54",
|
||||||
|
"https://deno.land/std@0.204.0/path/windows/basename.ts": "8a9dbf7353d50afbc5b221af36c02a72c2d1b2b5b9f7c65bf6a5a2a0baf88ad3",
|
||||||
|
"https://deno.land/std@0.204.0/path/windows/common.ts": "e781d395dc76f6282e3f7dd8de13194abb8b04a82d109593141abc6e95755c8b",
|
||||||
|
"https://deno.land/std@0.204.0/path/windows/dirname.ts": "5c2aa541384bf0bd9aca821275d2a8690e8238fa846198ef5c7515ce31a01a94",
|
||||||
|
"https://deno.land/std@0.204.0/path/windows/extname.ts": "07f4fa1b40d06a827446b3e3bcc8d619c5546b079b8ed0c77040bbef716c7614",
|
||||||
|
"https://deno.land/std@0.204.0/path/windows/format.ts": "343019130d78f172a5c49fdc7e64686a7faf41553268961e7b6c92a6d6548edf",
|
||||||
|
"https://deno.land/std@0.204.0/path/windows/from_file_url.ts": "d53335c12b0725893d768be3ac6bf0112cc5b639d2deb0171b35988493b46199",
|
||||||
|
"https://deno.land/std@0.204.0/path/windows/glob.ts": "0286fb89ecd21db5cbf3b6c79e2b87c889b03f1311e66fb769e6b905d4142332",
|
||||||
|
"https://deno.land/std@0.204.0/path/windows/is_absolute.ts": "245b56b5f355ede8664bd7f080c910a97e2169972d23075554ae14d73722c53c",
|
||||||
|
"https://deno.land/std@0.204.0/path/windows/join.ts": "e6600bf88edeeef4e2276e155b8de1d5dec0435fd526ba2dc4d37986b2882f16",
|
||||||
|
"https://deno.land/std@0.204.0/path/windows/mod.ts": "c3d1a36fbf9f6db1320bcb4fbda8de011d25461be3497105e15cbea1e3726198",
|
||||||
|
"https://deno.land/std@0.204.0/path/windows/normalize.ts": "9deebbf40c81ef540b7b945d4ccd7a6a2c5a5992f791e6d3377043031e164e69",
|
||||||
|
"https://deno.land/std@0.204.0/path/windows/parse.ts": "120faf778fe1f22056f33ded069b68e12447668fcfa19540c0129561428d3ae5",
|
||||||
|
"https://deno.land/std@0.204.0/path/windows/relative.ts": "026855cd2c36c8f28f1df3c6fbd8f2449a2aa21f48797a74700c5d872b86d649",
|
||||||
|
"https://deno.land/std@0.204.0/path/windows/resolve.ts": "5ff441ab18a2346abadf778121128ee71bda4d0898513d4639a6ca04edca366b",
|
||||||
|
"https://deno.land/std@0.204.0/path/windows/separator.ts": "ae21f27015f10510ed1ac4a0ba9c4c9c967cbdd9d9e776a3e4967553c397bd5d",
|
||||||
|
"https://deno.land/std@0.204.0/path/windows/to_file_url.ts": "8e9ea9e1ff364aa06fa72999204229952d0a279dbb876b7b838b2b2fea55cce3",
|
||||||
|
"https://deno.land/std@0.204.0/path/windows/to_namespaced_path.ts": "e0f4d4a5e77f28a5708c1a33ff24360f35637ba6d8f103d19661255ef7bfd50d",
|
||||||
|
"https://deno.land/x/async@v2.0.2/barrier.ts": "e5d35a8c565be07b5bd02ea8861745f57cd707fe72ba54eca34948ffe28495d7",
|
||||||
|
"https://deno.land/x/async@v2.0.2/lock.ts": "fd7dc5b54c72d0093072adddb1691e1ae4a801c55b2015589454ea60f1c59adb",
|
||||||
|
"https://deno.land/x/async@v2.0.2/mod.ts": "0671efa8602fe6a6c73caa84d4619b797c1fe0572e31cd78905045ee58c2a6ee",
|
||||||
|
"https://deno.land/x/async@v2.0.2/mutex.ts": "312dcad7468c82f84fd018be157df451361ed19bdc12fd59af8d12b2e6c3ae28",
|
||||||
|
"https://deno.land/x/async@v2.0.2/notify.ts": "3127ab5835c97527fdf978a5ec5844d71a2fd62a75988db6f175aac6f61259d0",
|
||||||
|
"https://deno.land/x/async@v2.0.2/queue.ts": "4df05fbaf376d37379224b68b2b8506a45be835f799139437e7bfc143db5127f",
|
||||||
|
"https://deno.land/x/async@v2.0.2/rw_lock.ts": "ea7a8cf2ee87c21d3fcbb44f2d654f28a06bf71d5ba7a930f04e5619cc4c82fb",
|
||||||
|
"https://deno.land/x/async@v2.0.2/semaphore.ts": "16aca813bc0f9ffed4eb15134271fb677407a6245d1f803294219a607940d636",
|
||||||
|
"https://deno.land/x/async@v2.0.2/stack.ts": "e24ebcbdcab032783e6b278b938475c221fbfb86f8eb71d3752679fcdf132d42",
|
||||||
|
"https://deno.land/x/async@v2.0.2/state.ts": "a71692b72371239120b196d0c6a249631bab867dd499e85c422c2e5ec9695999",
|
||||||
|
"https://deno.land/x/async@v2.0.2/testutil.ts": "c4b4092066ad6f24cf84012781831ff188e656a1e81abf31b0f712d2e1ad07b7",
|
||||||
|
"https://deno.land/x/grammy@v1.19.2/bot.ts": "8d13cd72f1512e3f76d685131c7d0db5ba51f2c877db5ac2c0aa4b0f6f876aa8",
|
||||||
|
"https://deno.land/x/grammy@v1.19.2/composer.ts": "8660f86990f4ef2afc4854a1f2610bb8d60f88116f3a57c8e5515a77b277f82d",
|
||||||
|
"https://deno.land/x/grammy@v1.19.2/context.ts": "4cf51ed7538750edb4379f757f6b8b3c1f3987242d58393160b463c9ca13c997",
|
||||||
|
"https://deno.land/x/grammy@v1.19.2/convenience/constants.ts": "3be0f6393ab2b2995fad6bcd4c9cf8a1a615ae4543fc864c107ba0dd38f123f6",
|
||||||
|
"https://deno.land/x/grammy@v1.19.2/convenience/frameworks.ts": "77e2f9fc841ab92d4310b556126447a42f131ad976a6adfff454c016f339b28e",
|
||||||
|
"https://deno.land/x/grammy@v1.19.2/convenience/inline_query.ts": "409d1940c7670708064efa495003bcbfdf6763a756b2e6303c464489fd3394ff",
|
||||||
|
"https://deno.land/x/grammy@v1.19.2/convenience/input_media.ts": "7af72a5fdb1af0417e31b1327003f536ddfdf64e06ab8bc7f5da6b574de38658",
|
||||||
|
"https://deno.land/x/grammy@v1.19.2/convenience/keyboard.ts": "21220dc2321c40203c699fa4eb7b07ed8217956ea0477c241a551224a58a278d",
|
||||||
|
"https://deno.land/x/grammy@v1.19.2/convenience/session.ts": "f92d57b6b2b61920912cf5c44d4db2f6ca999fe4f9adef170c321889d49667c2",
|
||||||
|
"https://deno.land/x/grammy@v1.19.2/convenience/webhook.ts": "f1da7d6426171fb7b5d5f6b59633f91d3bab9a474eea821f714932650965eb9e",
|
||||||
|
"https://deno.land/x/grammy@v1.19.2/core/api.ts": "7d4d8df3567e322ab3b793360ee48da09f46ad531ef994a87b3e6aef4ec23bf2",
|
||||||
|
"https://deno.land/x/grammy@v1.19.2/core/client.ts": "39639e4f5fc3a3f9d528c6906d7e3cdc268cf5d33929eeab801bb39642a59103",
|
||||||
|
"https://deno.land/x/grammy@v1.19.2/core/error.ts": "4638b2127ebe60249c78b83011d468f5e1e1a87748d32fe11a8200d9f824ad13",
|
||||||
|
"https://deno.land/x/grammy@v1.19.2/core/payload.ts": "420e17c3c2830b5576ea187cfce77578fe09f1204b25c25ea2f220ca7c86e73b",
|
||||||
|
"https://deno.land/x/grammy@v1.19.2/filter.ts": "201ddac882ab6cd46cae2d18eb8097460dfe7cedadaab2ba16959c5286d5a5f1",
|
||||||
|
"https://deno.land/x/grammy@v1.19.2/mod.ts": "b81cccf69779667b36bef5d0373d1567684917a3b9827873f3de7a7e6af1926f",
|
||||||
|
"https://deno.land/x/grammy@v1.19.2/platform.deno.ts": "84735643c8dde2cf8af5ac2e6b8eb0768452260878da93238d673cb1b4ccea55",
|
||||||
|
"https://deno.land/x/grammy@v1.19.2/types.deno.ts": "0f47eacde6d3d65f107f2abf16ecfe726298d30263367cc82e977c801b766229",
|
||||||
|
"https://deno.land/x/grammy@v1.19.2/types.ts": "729415590dfa188dbe924dea614dff4e976babdbabb28a307b869fc25777cdf0",
|
||||||
|
"https://deno.land/x/grammy_files@v1.0.4/deps.deno.ts": "ec398579e7a7f69788fc3c3ef90202bc9e031e13bfbd90ee37c88a655b6742ef",
|
||||||
|
"https://deno.land/x/grammy_files@v1.0.4/files.ts": "c69a4cfdcf5b75f32b9de97c36e2b197fe9d60feb360b71e89dff5ae22ba1114",
|
||||||
|
"https://deno.land/x/grammy_files@v1.0.4/mod.ts": "379c5f64594cd879653cdce715c318b3eed29ab26e071f356b9b61f9e3943bc3",
|
||||||
|
"https://deno.land/x/grammy_files@v1.0.4/plugin.ts": "a804b76d4ceaae727b874bb6c88bd7a7b16d086992aae04e23f24e0e4fccd3ab",
|
||||||
|
"https://deno.land/x/grammy_parse_mode@1.8.1/deps.deno.ts": "5297e947875ce8ea523e237bbbfa1eb7c709ed8d76dbeeb8d1a5128182a6753b",
|
||||||
|
"https://deno.land/x/grammy_parse_mode@1.8.1/format.ts": "570be2b4ba5d4122d4c69f6fae3d507f5a2aa4f6177501d8769f3bbc5e6c77ff",
|
||||||
|
"https://deno.land/x/grammy_parse_mode@1.8.1/hydrate.ts": "58e6887ede8319b6f4001bc3e007130c09ba40ca7eaada1387c77a510c9e6b6c",
|
||||||
|
"https://deno.land/x/grammy_parse_mode@1.8.1/mod.ts": "58b539ea91fa72c1fd66dd5415b6c4b63104301b07d9daf860bd66343db7062c",
|
||||||
|
"https://deno.land/x/grammy_parse_mode@1.8.1/transformer.ts": "794d49c27e62b024d3733759aaafab9043fcdacd4fe53a8d7d4703b39f4f049e",
|
||||||
|
"https://deno.land/x/grammy_runner@v2.0.3/deps.deno.ts": "bbbaffd1020e0c91acacf02fbc43cdaee04f1d63446cb6a42255d36a0c0e86d4",
|
||||||
|
"https://deno.land/x/grammy_runner@v2.0.3/distribute.ts": "318ed928c437ce0a09956abfa40c0b937bb507dc276bc3db5d571e15a4d1ede1",
|
||||||
|
"https://deno.land/x/grammy_runner@v2.0.3/mod.ts": "53c08b39527b0b47ffdf4c5996bc3cfbac802ab37074a7b900b2a63d3db273d3",
|
||||||
|
"https://deno.land/x/grammy_runner@v2.0.3/platform.deno.ts": "5990d453979176708af79baea54ba2bc4bdc662079f088ce7668b9f4d1962b8c",
|
||||||
|
"https://deno.land/x/grammy_runner@v2.0.3/queue.ts": "d715f98096405c558c2657ef245b5acd1b5de916eed39dbad1399db18e57e0f7",
|
||||||
|
"https://deno.land/x/grammy_runner@v2.0.3/runner.ts": "2600b9bd39e724d5c629c94e541f497868dfde6cf55be7745dc1d777c8a8b180",
|
||||||
|
"https://deno.land/x/grammy_runner@v2.0.3/sequentialize.ts": "137764a109ff3fe4bc8809b6d1d8865ed5c2ad8b649e7553b10302d70bf2e7fb",
|
||||||
|
"https://deno.land/x/grammy_runner@v2.0.3/sink.ts": "4c0acb814dee97ffffaea145413b53ccf64c0b00f105b0993383f25111ed8702",
|
||||||
|
"https://deno.land/x/grammy_runner@v2.0.3/source.ts": "68ce5aefa92205db4710c8ac313e0c8e8c2577dd1b88f350b32ee33549188d01",
|
||||||
|
"https://deno.land/x/grammy_runner@v2.0.3/worker.ts": "b6f88b9fde15a8dd892c8d4781e8010ef37b80faf04d6ad18db4a43e4faa42ad",
|
||||||
|
"https://deno.land/x/grammy_stateless_question_alpha@v3.0.5/mod.ts": "2c634ee172fa86da8581ccee02eb43a1af5f377837ee78668dd6dbea446038ab",
|
||||||
|
"https://deno.land/x/grammy_stateless_question_alpha@v3.0.5/source/deps.ts": "05a3cae17af42ec058729e14cc544f22eae8bde4792dab652f7a452a00e91301",
|
||||||
|
"https://deno.land/x/grammy_stateless_question_alpha@v3.0.5/source/identifier.ts": "162971fdfa5d48484c4db6ce664d60af27affb5e0bfdab41c065200332b30226",
|
||||||
|
"https://deno.land/x/grammy_stateless_question_alpha@v3.0.5/source/index.ts": "b3272436230d7f19f1e9ee515c52e03bbd20ff6963da9b4076d4d3e6935d969d",
|
||||||
|
"https://deno.land/x/grammy_types@v3.3.0/api.ts": "efc90a31eb6f59ae5e7a4cf5838f46529e2fa6fa7e97a51a82dbd28afad21592",
|
||||||
|
"https://deno.land/x/grammy_types@v3.3.0/inline.ts": "b5669d79f8c0c6f7d6ca856d548c1ac7d490efd54ee785d18a7c4fc12abfd73b",
|
||||||
|
"https://deno.land/x/grammy_types@v3.3.0/manage.ts": "e39ec87e74469f70f35aa51dc520b02136ea5e75f9d7a7e0e513846a00b63fd2",
|
||||||
|
"https://deno.land/x/grammy_types@v3.3.0/markup.ts": "7b547b79130a112f98fbd3f0f754c8bb926f7cab3040d244b5f597aea0e1ce09",
|
||||||
|
"https://deno.land/x/grammy_types@v3.3.0/message.ts": "e78a7797174c537bb8de80597e265121615fa36a531dd88ac5af27aa68779172",
|
||||||
|
"https://deno.land/x/grammy_types@v3.3.0/methods.ts": "7547cedfec2c2727b30b8fa38050aee6642c56673b21cfd0ac56b0e531f02795",
|
||||||
|
"https://deno.land/x/grammy_types@v3.3.0/mod.ts": "7b5f421b4fbb1761f7f0d68328eaddd515f3222ce3f3cdfbedd8d5a4781e91a7",
|
||||||
|
"https://deno.land/x/grammy_types@v3.3.0/passport.ts": "e3fb63aec96510bcc317ef48fd25b435444b8f407502d7568c00fce15f2958fd",
|
||||||
|
"https://deno.land/x/grammy_types@v3.3.0/payment.ts": "d23e9038c5b479b606e620dd84e3e67b6642ada110a962f2d5b5286e99ec7de5",
|
||||||
|
"https://deno.land/x/grammy_types@v3.3.0/settings.ts": "5e989f5bd6c587d55673bd8052293869aa2f372e9223dd7f6e28632bfe021b6e",
|
||||||
|
"https://deno.land/x/grammy_types@v3.3.0/update.ts": "6d5ec6d1f6d2acf021f807f6bbf7d541487f30672cfab4700e7f935a490c3b78",
|
||||||
|
"https://deno.land/x/indexed_kv@v0.6.1/mod.ts": "6acc28873c392c69eea7be8c70978f1973919dec5ca6c04d91d2221bbaa767f8",
|
||||||
|
"https://deno.land/x/kvfs@v0.1.0/mod.ts": "ceb4c28a6ed850f2fe40bf2349fc8564406811349c7dd6be615db3f098b0790e",
|
||||||
|
"https://deno.land/x/kvmq@v0.3.0/mod.ts": "ce39abbef6a8f0c25a9141dcac82ef165d4ad74a78289eace7bb168bbc645806",
|
||||||
|
"https://deno.land/x/lz4@v0.1.2/mod.ts": "4decfc1a3569d03fd1813bd39128b71c8f082850fe98ecfdde20025772916582",
|
||||||
|
"https://deno.land/x/lz4@v0.1.2/wasm.js": "b9c65605327ba273f0c76a6dc596ec534d4cda0f0225d7a94ebc606782319e46",
|
||||||
|
"https://deno.land/x/reroute@v0.1.0/mod.ts": "2cce7958e13efc2ef1be800dffe6c7043b96d3e514f35dee9cbf60d05d09d2fd",
|
||||||
|
"https://deno.land/x/serve_spa@v0.2.0/mod.ts": "3ddf85357324b2dd75721b3614accfa01af9a87c292a85e2ed17a9387665f400",
|
||||||
|
"https://deno.land/x/swc@0.2.1/lib/deno_swc.generated.js": "a112eb5a4871bcbd5b660d3fd9d7afdd5cf2bb9e135eb9b04aceaa24d16481a0",
|
||||||
|
"https://deno.land/x/swc@0.2.1/mod.ts": "9e03f5daf4c2a25208e34e19ce3e997d2e23a5a11ee8c8ed58023b0e3626073f",
|
||||||
|
"https://deno.land/x/ulid@v0.3.0/mod.ts": "f7ff065b66abd485051fc68af23becef6ccc7e81f7774d7fcfd894a4b2da1984",
|
||||||
|
"https://esm.sh/@grammyjs/types@2.0.0": "5e5d1ae9f014cb64f0af36fb91f9d35414d670049b77367818a70cd62092b2ac",
|
||||||
|
"https://esm.sh/@grammyjs/types@2.12.1": "eebe448d3bf3d4fdaeacee50e31b9e3947ce965d2591f1036e5c0273cb7aec36",
|
||||||
|
"https://esm.sh/@twind/core@1.1.3": "bf3e64c13de95b061a721831bf2aed322f6e7335848b06d805168c3212686c1d",
|
||||||
|
"https://esm.sh/@twind/preset-tailwind@1.1.4": "29f5e4774c344ff08d2636e3d86382060a8b40d6bce1c158b803df1823c2804c",
|
||||||
|
"https://esm.sh/file-type@18.5.0": "f01f6eddb05d365925545e26bd449f934dc042bead882b2795c35c4f48d690a3",
|
||||||
|
"https://esm.sh/openapi-fetch@0.7.6": "43eff6df93e773801cb6ade02b0f47c05d0bfe2fb044adbf2b94fa74ff30d35b",
|
||||||
|
"https://esm.sh/png-chunk-text@1.0.0": "08beb86f31b5ff70240650fe095b6c4e4037e5c1d5917f9338e7633cae680356",
|
||||||
|
"https://esm.sh/png-chunks-extract@1.0.0": "da06bbd3c08199d72ab16354abe5ffd2361cb891ccbb44d757a0a0a4fbfa12b5",
|
||||||
|
"https://esm.sh/react-dom@18.2.0/client?external=react&dev": "2eb39c339720d727591fd55fb44ffcb6f14b06812af0a71e7a2268185b5b6e73",
|
||||||
|
"https://esm.sh/react-flip-move@3.0.5?external=react&dev": "4390c0777a0bec583d3e6cb5e4b33831ac937d670d894a20e4f192ce8cd21bae",
|
||||||
|
"https://esm.sh/react-intl@6.4.7?external=react&dev": "60e68890e2c5ef3c02d37a89c53e056b1bbd1c8467a7aae62f0b634abc7a8a5f",
|
||||||
|
"https://esm.sh/react-router-dom@6.16.0?external=react&dev": "16046eba15c1ae1ce912e5ab6fdd1f6ce24ea8ac3970d5bdcdb1ebb0e40458c2",
|
||||||
|
"https://esm.sh/react@18.2.0?dev": "1fe185734f3d77826efb78a22779899d143bb1160baaf5bbf01edee9f4eaa9d5",
|
||||||
|
"https://esm.sh/stable/react@18.2.0/denonext/react.development.mjs": "88729b33eccbea2c09894f07459f32911777721a3b50fd32151182e82c4351e2",
|
||||||
|
"https://esm.sh/swr@2.2.4?external=react&dev": "e96c7c09e01c12fca1d871935973c7264353d8a1a1630fdf38ca1b364936ca66",
|
||||||
|
"https://esm.sh/telegram-format@2.1.0": "f7302f17a2fbd4ef793b7c065116a2994861904520d54126926bb910836a44b9",
|
||||||
|
"https://esm.sh/ty-rest@0.4.0/client": "66481393ac52b435a8b6e28d75ac2aaf95460d98a54308b718fe35c8d23e5e84",
|
||||||
|
"https://esm.sh/ty-rest@0.4.0/server": "14dc9ef120306504751b0faa1e436cd29fb231dae0c2518e1cf564326982c48c",
|
||||||
|
"https://esm.sh/ty-rest@0.4.1/client": "bb9bf7c41c824920272aeefb9fa62c4a180ef2d56217c02eb16000f928d85013",
|
||||||
|
"https://esm.sh/ty-rest@0.4.1/server": "9335b9acf42dd3d3e3ffacc6f420eda4805c606d409e6e0a2b724fcddeea8b72",
|
||||||
|
"https://esm.sh/use-local-storage@3.0.0?external=react&dev": "4cf7fce754a9488940daa76051389421c6341420cae5b8c7d2401158ffe79ec0",
|
||||||
|
"https://esm.sh/v132/@twind/core@1.1.3/denonext/core.mjs": "c2618087a5d5cc406c7dc1079015f4d7cc874bee167f74e9945694896d907b6d",
|
||||||
|
"https://esm.sh/v132/@twind/preset-tailwind@1.1.4/denonext/preset-tailwind.mjs": "3cb9f5cde89e11cd2adad54ff264f62f5000ccb1694cd88874b1856eb2d8d7f7",
|
||||||
|
"https://esm.sh/v133/@formatjs/ecma402-abstract@1.17.2/X-ZS9yZWFjdA/denonext/ecma402-abstract.development.mjs": "178a303e29d73369b4c7c1da5a18393c2baa8742a0e8a45be85f506c17f763d9",
|
||||||
|
"https://esm.sh/v133/@formatjs/fast-memoize@2.2.0/X-ZS9yZWFjdA/denonext/fast-memoize.development.mjs": "4c027b3308490b65dc899f683b1ff9be8da4b7a2e1e32433ef03bcb8f0fdf821",
|
||||||
|
"https://esm.sh/v133/@formatjs/icu-messageformat-parser@2.6.2/X-ZS9yZWFjdA/denonext/icu-messageformat-parser.development.mjs": "68c7a9be44aaa3e35bfe18668e17a2d4a465e11f59f3a1e025ee83fe1bd0b971",
|
||||||
|
"https://esm.sh/v133/@formatjs/icu-skeleton-parser@1.6.2/X-ZS9yZWFjdA/denonext/icu-skeleton-parser.development.mjs": "278cf26f11f5c4027a0bbd503832b162be979d0f4732e3b716760fc5543ecfac",
|
||||||
|
"https://esm.sh/v133/@formatjs/intl-localematcher@0.4.2/X-ZS9yZWFjdA/denonext/intl-localematcher.development.mjs": "26325e3fc4b1728583a863c46332b6878c377bbb918a39896eb0d9f39eb41357",
|
||||||
|
"https://esm.sh/v133/@formatjs/intl@2.9.3/X-ZS9yZWFjdA/denonext/intl.development.mjs": "42e7cf0cc4f4c3bca21956caefbd17b64fcb01ac07cb4a36d8a301188dcf1fce",
|
||||||
|
"https://esm.sh/v133/@grammyjs/types@2.0.0/denonext/types.mjs": "7ee61bd0c55a152ea1ffaf3fbe63fce6c103ae836265b23290284d6ba0e3bc5b",
|
||||||
|
"https://esm.sh/v133/@grammyjs/types@2.12.1/denonext/types.mjs": "3636f7a1ca7fef89fa735d832b72193a834bc7f5250b6bf182544be53a6ab218",
|
||||||
|
"https://esm.sh/v133/@remix-run/router@1.9.0/X-ZS9yZWFjdA/denonext/router.development.mjs": "97f96f031a7298b0afbbadb23177559ee9b915314d7adf0b9c6a8d7f452c70e7",
|
||||||
|
"https://esm.sh/v133/client-only@0.0.1/X-ZS9yZWFjdA/denonext/client-only.development.mjs": "b7efaef2653f7f628d084e24a4d5a857c9cd1a5e5060d1d9957e185ee98c8a28",
|
||||||
|
"https://esm.sh/v133/crc-32@0.3.0/denonext/crc-32.mjs": "92bbd96cd5a92e45267cf4b3d3928b9355d16963da1ba740637fb10f1daca590",
|
||||||
|
"https://esm.sh/v133/file-type@18.5.0/denonext/file-type.mjs": "785cac1bc363448647871e1b310422e01c9cfb7b817a68690710b786d3598311",
|
||||||
|
"https://esm.sh/v133/hoist-non-react-statics@3.3.2/X-ZS9yZWFjdA/denonext/hoist-non-react-statics.development.mjs": "fcafac9e3c33810f18ecb43dfc32ce80efc88adc63d3f49fd7ada0665d2146c6",
|
||||||
|
"https://esm.sh/v133/ieee754@1.2.1/denonext/ieee754.mjs": "9ec2806065f50afcd4cf3f3f2f38d93e777a92a5954dda00d219f57d4b24832f",
|
||||||
|
"https://esm.sh/v133/inherits@2.0.4/denonext/inherits.mjs": "8095f3d6aea060c904fb24ae50f2882779c0acbe5d56814514c8b5153f3b4b3b",
|
||||||
|
"https://esm.sh/v133/intl-messageformat@10.5.3/X-ZS9yZWFjdA/denonext/intl-messageformat.development.mjs": "d6b701c562c51ec4b4e1deb641c6623986abe304290bbb291e6404cb6a31dc41",
|
||||||
|
"https://esm.sh/v133/openapi-fetch@0.7.6/denonext/openapi-fetch.mjs": "1ec8ed23c9141c7f4e58de06f84525e310fe7dda1aeaf675c8edafb3d8292cfc",
|
||||||
|
"https://esm.sh/v133/peek-readable@5.0.0/denonext/peek-readable.mjs": "5e799ea86e9c501873f687eda9c891a75ed55ba666b5dd822eaa3d28a8a5f2b1",
|
||||||
|
"https://esm.sh/v133/png-chunk-text@1.0.0/denonext/png-chunk-text.mjs": "e8bb89595ceab2603531693319da08a9dd90d51169437de47a73cf8bac7baa11",
|
||||||
|
"https://esm.sh/v133/png-chunks-extract@1.0.0/denonext/png-chunks-extract.mjs": "2a9b62c9478e2bb79f7ccc9725be3b79afa473089ac978d8fd14a8b0cba7c040",
|
||||||
|
"https://esm.sh/v133/react-dom@18.2.0/X-ZS9yZWFjdA/denonext/client.development.js": "ebaa7a1fce9f40b8abdae0daab06348b7bbdf5a90e1e60d2116b45d3577f8fa4",
|
||||||
|
"https://esm.sh/v133/react-dom@18.2.0/X-ZS9yZWFjdA/denonext/react-dom.development.mjs": "b7e7937e4f3446bb2b6db5f73ae20d2b18a4116330486680c6c6f610f7d85f27",
|
||||||
|
"https://esm.sh/v133/react-flip-move@3.0.5/X-ZS9yZWFjdA/denonext/react-flip-move.development.mjs": "4644ea8644c7d6ccb3563fec092d05b82c647da4981e878b64fd06ab58d6cfc5",
|
||||||
|
"https://esm.sh/v133/react-intl@6.4.7/X-ZS9yZWFjdA/denonext/react-intl.development.mjs": "866e2105594ecf772144262d215ffd3245f09e8f1b14e97b5f13b4df8d52c419",
|
||||||
|
"https://esm.sh/v133/react-is@16.13.1/X-ZS9yZWFjdA/denonext/react-is.development.mjs": "9e2c3272e256b176f71660a52bf0f8a079babbd01e680de070d47ed51a9319bd",
|
||||||
|
"https://esm.sh/v133/react-router-dom@6.16.0/X-ZS9yZWFjdA/denonext/react-router-dom.development.mjs": "0b2d33abc84446dcf3430a42a1a7935b9a49f81192cba22b1263a884c6edf22d",
|
||||||
|
"https://esm.sh/v133/react-router@6.16.0/X-ZS9yZWFjdA/denonext/react-router.development.mjs": "e539a1882ef472de5bd8e4325a54e0f0d36a45a0bf53d4ffed09353225a2cf95",
|
||||||
|
"https://esm.sh/v133/readable-stream@3.6.2/denonext/readable-stream.mjs": "4d368fe1058f90ecfb37581103cae1646123180b8fc4aa77157fd733aed24e4a",
|
||||||
|
"https://esm.sh/v133/readable-web-to-node-stream@3.0.2/denonext/readable-web-to-node-stream.mjs": "8e7f8b7139f71b1cf94cb4d4772239755e996d88bcefb462f03fd6a0b8b4cd83",
|
||||||
|
"https://esm.sh/v133/scheduler@0.23.0/X-ZS9yZWFjdA/denonext/scheduler.development.mjs": "b6c8f513ecc4afb69b0c5c78a7674bb1c78f7e003946c6c8c655778d81d775db",
|
||||||
|
"https://esm.sh/v133/strtok3@7.0.0/denonext/core.js": "4934052fd9086facbb9436e905dfdee19ee27a43d0b0a8fca39648e833324577",
|
||||||
|
"https://esm.sh/v133/swr@2.2.4/X-ZS9yZWFjdA/denonext/_internal.development.js": "e64b6b30de0ddca08078301c3129c608ab8f2cc6279c704c462ebe3022e81275",
|
||||||
|
"https://esm.sh/v133/swr@2.2.4/X-ZS9yZWFjdA/denonext/swr.development.mjs": "d6be45253b10e1f6c2bd35f035530d5ac0e7c34c716508db131a143fb9818a82",
|
||||||
|
"https://esm.sh/v133/telegram-format@2.1.0/denonext/telegram-format.mjs": "f5b6a6df788e9b462ce3e0d3db8fb3446bfa5252440b9878a91496ca6fb2d693",
|
||||||
|
"https://esm.sh/v133/token-types@5.0.1/denonext/token-types.mjs": "eb8ef626bdfc077ae8f9b6c0842e3bdae25b4867dd9d38b7b1b5f003819a06d3",
|
||||||
|
"https://esm.sh/v133/tslib@2.6.2/X-ZS9yZWFjdA/denonext/tslib.development.mjs": "40dea6e88a1261c5c96a641d73276ffecae3f2d23b9a93d1c5294125f4474cdb",
|
||||||
|
"https://esm.sh/v133/ty-rest@0.4.0/denonext/client.js": "dd2a1f04d17c87b395d7a39789e41477e854afcfb66559be08348ad76625615b",
|
||||||
|
"https://esm.sh/v133/ty-rest@0.4.0/denonext/server.js": "98f33c86c304659703f3a1294ae93e78920d8de303dc0f4e360edd717a7bc667",
|
||||||
|
"https://esm.sh/v133/ty-rest@0.4.1/denonext/client.js": "466aeedd7bb139c85fb3051f0b7cecaf3e3afac98b4825b98a480f8a127692ed",
|
||||||
|
"https://esm.sh/v133/ty-rest@0.4.1/denonext/server.js": "00be1165ac96313b077629556a1587d4662f4e23bb0e815b945cc95cd3582370",
|
||||||
|
"https://esm.sh/v133/use-local-storage@3.0.0/X-ZS9yZWFjdA/denonext/use-local-storage.development.mjs": "1fdc00893fe7dac56e95e2817e05d413b674f5cb5a1c6afd8994e25c9e2a56c8",
|
||||||
|
"https://esm.sh/v133/use-sync-external-store@1.2.0/X-ZS9yZWFjdA/denonext/shim.development.js": "5388baf48494f5abe76f8a4a30810c48e828b52f1298826aa9a3f3378e2b533f",
|
||||||
|
"https://esm.sh/v133/util-deprecate@1.0.2/denonext/util-deprecate.mjs": "f69f67cf655c38428b0934e0f7c865c055834a87cc3866b629d6b2beb21005e9"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -11,18 +11,18 @@ export function AdminsPage(props: { sessionId: string | null }) {
|
||||||
const addDialogRef = useRef<HTMLDialogElement>(null);
|
const addDialogRef = useRef<HTMLDialogElement>(null);
|
||||||
|
|
||||||
const getSession = useSWR(
|
const getSession = useSWR(
|
||||||
sessionId ? ["/sessions/:sessionId", { params: { sessionId } }] as const : null,
|
sessionId ? ["sessions/{sessionId}", "GET", { params: { sessionId } }] as const : null,
|
||||||
(args) => fetchApi(...args).then(handleResponse),
|
(args) => fetchApi(...args).then(handleResponse),
|
||||||
);
|
);
|
||||||
const getUser = useSWR(
|
const getUser = useSWR(
|
||||||
getSession.data?.userId
|
getSession.data?.userId
|
||||||
? ["/users/:userId", { params: { userId: String(getSession.data.userId) } }] as const
|
? ["users/{userId}", "GET", { params: { userId: String(getSession.data.userId) } }] as const
|
||||||
: null,
|
: null,
|
||||||
(args) => fetchApi(...args).then(handleResponse),
|
(args) => fetchApi(...args).then(handleResponse),
|
||||||
);
|
);
|
||||||
|
|
||||||
const getAdmins = useSWR(
|
const getAdmins = useSWR(
|
||||||
["/admins", { method: "GET" }] as const,
|
["admins", "GET", {}] as const,
|
||||||
(args) => fetchApi(...args).then(handleResponse),
|
(args) => fetchApi(...args).then(handleResponse),
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
@ -32,10 +32,14 @@ export function AdminsPage(props: { sessionId: string | null }) {
|
||||||
<button
|
<button
|
||||||
className="button-filled"
|
className="button-filled"
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
fetchApi("/admins/promote_self", {
|
mutate(
|
||||||
method: "POST",
|
(key) => Array.isArray(key) && key[0] === "admins",
|
||||||
query: { sessionId: sessionId ?? "" },
|
async () =>
|
||||||
}).then(handleResponse).then(() => mutate(() => true));
|
fetchApi("admins/promote_self", "POST", {
|
||||||
|
query: { sessionId: sessionId ?? "" },
|
||||||
|
}).then(handleResponse),
|
||||||
|
{ populateCache: false },
|
||||||
|
);
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
Promote me to admin
|
Promote me to admin
|
||||||
|
|
@ -44,20 +48,14 @@ export function AdminsPage(props: { sessionId: string | null }) {
|
||||||
|
|
||||||
{getAdmins.data?.length
|
{getAdmins.data?.length
|
||||||
? (
|
? (
|
||||||
<ul className="flex flex-col gap-2">
|
<ul className="my-4 flex flex-col gap-2">
|
||||||
{getAdmins.data.map((admin) => (
|
{getAdmins.data.map((admin) => (
|
||||||
<AdminListItem key={admin.tgUserId} admin={admin} sessionId={sessionId} />
|
<AdminListItem key={admin.id} admin={admin} sessionId={sessionId} />
|
||||||
))}
|
))}
|
||||||
</ul>
|
</ul>
|
||||||
)
|
)
|
||||||
: getAdmins.data?.length === 0
|
: getAdmins.data?.length === 0
|
||||||
? (
|
? <p>No admins</p>
|
||||||
<ul className="flex flex-col gap-2">
|
|
||||||
<li className="flex flex-col gap-2 rounded-md bg-zinc-100 dark:bg-zinc-800 p-2">
|
|
||||||
<p key="no-admins" className="text-center text-gray-500">No admins.</p>
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
)
|
|
||||||
: getAdmins.error
|
: getAdmins.error
|
||||||
? <p className="alert">Loading admins failed</p>
|
? <p className="alert">Loading admins failed</p>
|
||||||
: <div className="spinner self-center" />}
|
: <div className="spinner self-center" />}
|
||||||
|
|
@ -95,13 +93,20 @@ function AddAdminDialog(props: {
|
||||||
onSubmit={(e) => {
|
onSubmit={(e) => {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
const data = new FormData(e.target as HTMLFormElement);
|
const data = new FormData(e.target as HTMLFormElement);
|
||||||
fetchApi("/admins", {
|
mutate(
|
||||||
method: "POST",
|
(key) => Array.isArray(key) && key[0] === "admins",
|
||||||
query: { sessionId: sessionId! },
|
async () =>
|
||||||
body: {
|
fetchApi("admins", "POST", {
|
||||||
tgUserId: Number(data.get("tgUserId") as string),
|
query: { sessionId: sessionId! },
|
||||||
},
|
body: {
|
||||||
}).then(handleResponse).then(() => mutate(() => true));
|
type: "application/json",
|
||||||
|
data: {
|
||||||
|
tgUserId: Number(data.get("tgUserId") as string),
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}).then(handleResponse),
|
||||||
|
{ populateCache: false },
|
||||||
|
);
|
||||||
dialogRef.current?.close();
|
dialogRef.current?.close();
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
|
|
@ -141,62 +146,92 @@ function AdminListItem(props: { admin: AdminData; sessionId: string | null }) {
|
||||||
const deleteDialogRef = useRef<HTMLDialogElement>(null);
|
const deleteDialogRef = useRef<HTMLDialogElement>(null);
|
||||||
|
|
||||||
const getAdminUser = useSWR(
|
const getAdminUser = useSWR(
|
||||||
["/users/:userId", { params: { userId: String(admin.tgUserId) } }] as const,
|
["users/{userId}", "GET", { params: { userId: String(admin.tgUserId) } }] as const,
|
||||||
(args) => fetchApi(...args).then(handleResponse),
|
(args) => fetchApi(...args).then(handleResponse),
|
||||||
);
|
);
|
||||||
|
|
||||||
const getSession = useSWR(
|
const getSession = useSWR(
|
||||||
sessionId ? ["/sessions/:sessionId", { params: { sessionId } }] as const : null,
|
sessionId ? ["sessions/{sessionId}", "GET", { params: { sessionId } }] as const : null,
|
||||||
(args) => fetchApi(...args).then(handleResponse),
|
(args) => fetchApi(...args).then(handleResponse),
|
||||||
);
|
);
|
||||||
const getUser = useSWR(
|
const getUser = useSWR(
|
||||||
getSession.data?.userId
|
getSession.data?.userId
|
||||||
? ["/users/:userId", { params: { userId: String(getSession.data.userId) } }] as const
|
? ["users/{userId}", "GET", { params: { userId: String(getSession.data.userId) } }] as const
|
||||||
: null,
|
: null,
|
||||||
(args) => fetchApi(...args).then(handleResponse),
|
(args) => fetchApi(...args).then(handleResponse),
|
||||||
);
|
);
|
||||||
|
const getAdminPhoto = useSWR(
|
||||||
|
["users/{userId}/photo", "GET", { params: { userId: String(admin.tgUserId) } }] as const,
|
||||||
|
(args) => fetchApi(...args).then(handleResponse).then((blob) => URL.createObjectURL(blob)),
|
||||||
|
);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<li className="flex flex-col gap-2 rounded-md bg-zinc-100 dark:bg-zinc-800 p-2">
|
<div className="max-h-sm rounded-md bg-zinc-100 dark:bg-zinc-800">
|
||||||
<p className="font-bold">
|
<div className="float-left flex flex-col p-10">
|
||||||
{getAdminUser.data?.first_name ?? admin.tgUserId} {getAdminUser.data?.last_name}{" "}
|
{/* user avatar */}
|
||||||
{getAdminUser.data?.username
|
{getAdminUser.data
|
||||||
? (
|
? (
|
||||||
<a href={`https://t.me/${getAdminUser.data.username}`} className="link">
|
getAdminPhoto.data
|
||||||
@{getAdminUser.data.username}
|
? (
|
||||||
</a>
|
<img
|
||||||
|
src={getAdminPhoto.data}
|
||||||
|
alt="avatar"
|
||||||
|
className="w-24 h-24 rounded-full shadow-lg"
|
||||||
|
/>
|
||||||
|
)
|
||||||
|
: (
|
||||||
|
<div className="w-9 h-9 rounded-full bg-zinc-400 dark:bg-zinc-500 flex items-center justify-center text-white text-2xl font-bold select-none">
|
||||||
|
{getAdminUser.data.first_name.at(0)?.toUpperCase()}
|
||||||
|
</div>
|
||||||
|
)
|
||||||
)
|
)
|
||||||
: null}
|
: null}
|
||||||
</p>
|
</div>
|
||||||
{getAdminUser.data?.bio
|
<div className="flex flex-col p-10">
|
||||||
? (
|
<h5 className="mb-1 text-xl font-medium text-gray-900 dark:text-white">
|
||||||
<p>
|
{getAdminUser.data?.first_name ?? admin.id} {getAdminUser.data?.last_name}
|
||||||
{getAdminUser.data?.bio}
|
</h5>
|
||||||
</p>
|
<p className="mb-1 text-xl font-medium text-gray-900 dark:text-white">
|
||||||
)
|
{getAdminUser.data?.username
|
||||||
: null}
|
? (
|
||||||
{getUser.data?.admin && (
|
<a href={`https://t.me/${getAdminUser.data.username}`} className="link">
|
||||||
<p className="flex gap-2">
|
@{getAdminUser.data.username}
|
||||||
<button
|
</a>
|
||||||
className="button-outlined"
|
)
|
||||||
onClick={() => deleteDialogRef.current?.showModal()}
|
: null}
|
||||||
>
|
|
||||||
Delete
|
|
||||||
</button>
|
|
||||||
</p>
|
</p>
|
||||||
)}
|
<span className="text-sm text-gray-500 dark:text-gray-400">
|
||||||
|
{getAdminUser.data?.bio
|
||||||
|
? (
|
||||||
|
<p>
|
||||||
|
{getAdminUser.data?.bio}
|
||||||
|
</p>
|
||||||
|
)
|
||||||
|
: null}
|
||||||
|
</span>
|
||||||
|
{getUser.data?.admin && (
|
||||||
|
<p className="flex gap-2">
|
||||||
|
<button
|
||||||
|
className="button-outlined"
|
||||||
|
onClick={() => deleteDialogRef.current?.showModal()}
|
||||||
|
>
|
||||||
|
Delete
|
||||||
|
</button>
|
||||||
|
</p>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
<DeleteAdminDialog
|
<DeleteAdminDialog
|
||||||
dialogRef={deleteDialogRef}
|
dialogRef={deleteDialogRef}
|
||||||
adminId={admin.tgUserId}
|
adminId={admin.id}
|
||||||
sessionId={sessionId}
|
sessionId={sessionId}
|
||||||
/>
|
/>
|
||||||
</li>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
function DeleteAdminDialog(props: {
|
function DeleteAdminDialog(props: {
|
||||||
dialogRef: React.RefObject<HTMLDialogElement>;
|
dialogRef: React.RefObject<HTMLDialogElement>;
|
||||||
adminId: number;
|
adminId: string;
|
||||||
sessionId: string | null;
|
sessionId: string | null;
|
||||||
}) {
|
}) {
|
||||||
const { dialogRef, adminId, sessionId } = props;
|
const { dialogRef, adminId, sessionId } = props;
|
||||||
|
|
@ -212,12 +247,15 @@ function DeleteAdminDialog(props: {
|
||||||
className="flex flex-col gap-4 p-4"
|
className="flex flex-col gap-4 p-4"
|
||||||
onSubmit={(e) => {
|
onSubmit={(e) => {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
|
mutate(
|
||||||
fetchApi("/admins/:adminId", {
|
(key) => Array.isArray(key) && key[0] === "admins",
|
||||||
method: "DELETE",
|
async () =>
|
||||||
query: { sessionId: sessionId! },
|
fetchApi("admins/{adminId}", "DELETE", {
|
||||||
params: { adminId: String(adminId) },
|
query: { sessionId: sessionId! },
|
||||||
}).then(handleResponse).then(() => mutate(() => true));
|
params: { adminId: adminId },
|
||||||
|
}).then(handleResponse),
|
||||||
|
{ populateCache: false },
|
||||||
|
);
|
||||||
dialogRef.current?.close();
|
dialogRef.current?.close();
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
|
|
|
||||||
10
ui/App.tsx
10
ui/App.tsx
|
|
@ -16,12 +16,10 @@ export function App() {
|
||||||
// initialize a new session when there is no session ID
|
// initialize a new session when there is no session ID
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (!sessionId) {
|
if (!sessionId) {
|
||||||
fetchApi("/sessions", { method: "POST" }).then((resp) => resp).then(handleResponse).then(
|
fetchApi("sessions", "POST", {}).then(handleResponse).then((session) => {
|
||||||
(session) => {
|
console.log("Initialized session", session.id);
|
||||||
console.log("Initialized session", session.id);
|
setSessionId(session.id);
|
||||||
setSessionId(session.id);
|
});
|
||||||
},
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
}, [sessionId]);
|
}, [sessionId]);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@ import React, { ReactNode } from "react";
|
||||||
import { NavLink } from "react-router-dom";
|
import { NavLink } from "react-router-dom";
|
||||||
import useSWR from "swr";
|
import useSWR from "swr";
|
||||||
import { cx } from "twind/core";
|
import { cx } from "twind/core";
|
||||||
import { API_URL, fetchApi, handleResponse } from "./apiClient.ts";
|
import { fetchApi, handleResponse } from "./apiClient.ts";
|
||||||
|
|
||||||
function NavTab(props: { to: string; children: ReactNode }) {
|
function NavTab(props: { to: string; children: ReactNode }) {
|
||||||
return (
|
return (
|
||||||
|
|
@ -23,42 +23,30 @@ export function AppHeader(props: {
|
||||||
const { className, sessionId, onLogOut } = props;
|
const { className, sessionId, onLogOut } = props;
|
||||||
|
|
||||||
const getSession = useSWR(
|
const getSession = useSWR(
|
||||||
sessionId ? ["/sessions/:sessionId", { method: "GET", params: { sessionId } }] as const : null,
|
sessionId ? ["sessions/{sessionId}", "GET", { params: { sessionId } }] as const : null,
|
||||||
(args) => fetchApi(...args).then(handleResponse),
|
(args) => fetchApi(...args).then(handleResponse),
|
||||||
{ onError: () => onLogOut() },
|
{ onError: () => onLogOut() },
|
||||||
);
|
);
|
||||||
|
|
||||||
const getUser = useSWR(
|
const getUser = useSWR(
|
||||||
getSession.data?.userId
|
getSession.data?.userId
|
||||||
? ["/users/:userId", {
|
? ["users/{userId}", "GET", { params: { userId: String(getSession.data.userId) } }] as const
|
||||||
method: "GET",
|
|
||||||
params: { userId: String(getSession.data.userId) },
|
|
||||||
}] as const
|
|
||||||
: null,
|
: null,
|
||||||
(args) => fetchApi(...args).then(handleResponse),
|
(args) => fetchApi(...args).then(handleResponse),
|
||||||
);
|
);
|
||||||
|
|
||||||
const getBot = useSWR(
|
const getBot = useSWR(
|
||||||
["/bot", { method: "GET" }] as const,
|
["bot", "GET", {}] as const,
|
||||||
(args) => fetchApi(...args).then(handleResponse),
|
(args) => fetchApi(...args).then(handleResponse),
|
||||||
);
|
);
|
||||||
|
|
||||||
const getUserPhoto = useSWR(
|
const getUserPhoto = useSWR(
|
||||||
getSession.data?.userId
|
getSession.data?.userId
|
||||||
? ["/users/:userId/photo", {
|
? ["users/{userId}/photo", "GET", {
|
||||||
method: "GET",
|
|
||||||
params: { userId: String(getSession.data.userId) },
|
params: { userId: String(getSession.data.userId) },
|
||||||
}] as const
|
}] as const
|
||||||
: null,
|
: null,
|
||||||
() =>
|
(args) => fetchApi(...args).then(handleResponse).then((blob) => URL.createObjectURL(blob)),
|
||||||
// elysia fetch can't download file
|
|
||||||
fetch(`${API_URL}/users/${getSession.data?.userId}/photo`)
|
|
||||||
.then((response) => {
|
|
||||||
if (!response.ok) throw new Error(response.statusText);
|
|
||||||
return response;
|
|
||||||
})
|
|
||||||
.then((response) => response.blob())
|
|
||||||
.then((blob) => blob ? URL.createObjectURL(blob) : null),
|
|
||||||
);
|
);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,7 @@ import { fetchApi, handleResponse } from "./apiClient.ts";
|
||||||
|
|
||||||
export function QueuePage() {
|
export function QueuePage() {
|
||||||
const getJobs = useSWR(
|
const getJobs = useSWR(
|
||||||
["/jobs", {}] as const,
|
["jobs", "GET", {}] as const,
|
||||||
(args) => fetchApi(...args).then(handleResponse),
|
(args) => fetchApi(...args).then(handleResponse),
|
||||||
{ refreshInterval: 2000 },
|
{ refreshInterval: 2000 },
|
||||||
);
|
);
|
||||||
|
|
@ -15,43 +15,36 @@ export function QueuePage() {
|
||||||
return (
|
return (
|
||||||
<FlipMove
|
<FlipMove
|
||||||
typeName={"ul"}
|
typeName={"ul"}
|
||||||
className="flex flex-col items-stretch gap-2 p-2 bg-zinc-200 dark:bg-zinc-800 rounded-md"
|
className="flex flex-col items-stretch gap-2 p-2 bg-zinc-200 dark:bg-zinc-800 rounded-xl"
|
||||||
enterAnimation="fade"
|
enterAnimation="fade"
|
||||||
leaveAnimation="fade"
|
leaveAnimation="fade"
|
||||||
>
|
>
|
||||||
{getJobs.data && getJobs.data.length === 0
|
{getJobs.data?.map((job) => (
|
||||||
? <li key="no-jobs" className="text-center text-gray-500">Queue is empty.</li>
|
<li
|
||||||
: (
|
className="flex items-baseline gap-2 bg-zinc-100 dark:bg-zinc-700 px-2 py-1 rounded-xl"
|
||||||
getJobs.data?.map((job) => (
|
key={job.id.join("/")}
|
||||||
<li
|
>
|
||||||
className="flex items-baseline gap-2 bg-zinc-100 dark:bg-zinc-700 px-2 py-1 rounded-md"
|
<span className="">
|
||||||
key={job.id}
|
{job.place}.
|
||||||
>
|
</span>
|
||||||
<span className="">{job.place}.</span>
|
<span>{getFlagEmoji(job.state.from.language_code)}</span>
|
||||||
<span>{getFlagEmoji(job.state.from.language_code ?? undefined)}</span>
|
<strong>{job.state.from.first_name} {job.state.from.last_name}</strong>
|
||||||
<strong>{job.state.from.first_name} {job.state.from.last_name}</strong>
|
{job.state.from.username
|
||||||
{job.state.from.username
|
? (
|
||||||
? (
|
<a className="link" href={`https://t.me/${job.state.from.username}`} target="_blank">
|
||||||
<a
|
@{job.state.from.username}
|
||||||
className="link"
|
</a>
|
||||||
href={`https://t.me/${job.state.from.username}`}
|
)
|
||||||
target="_blank"
|
: null}
|
||||||
>
|
<span className="flex-grow self-center h-full">
|
||||||
@{job.state.from.username}
|
{job.state.progress != null &&
|
||||||
</a>
|
<Progress className="w-full h-full" value={job.state.progress} />}
|
||||||
)
|
</span>
|
||||||
: null}
|
<span className="text-sm text-zinc-500 dark:text-zinc-400">
|
||||||
<span className="flex-grow self-center h-full">
|
{job.state.workerInstanceKey}
|
||||||
{job.state.progress != null && (
|
</span>
|
||||||
<Progress className="w-full h-full" value={job.state.progress} />
|
</li>
|
||||||
)}
|
))}
|
||||||
</span>
|
|
||||||
<span className="text-sm text-zinc-500 dark:text-zinc-400">
|
|
||||||
{job.state.workerInstanceKey}
|
|
||||||
</span>
|
|
||||||
</li>
|
|
||||||
))
|
|
||||||
)}
|
|
||||||
</FlipMove>
|
</FlipMove>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -2,23 +2,22 @@ import React, { useState } from "react";
|
||||||
import useSWR from "swr";
|
import useSWR from "swr";
|
||||||
import { cx } from "twind/core";
|
import { cx } from "twind/core";
|
||||||
import { fetchApi, handleResponse } from "./apiClient.ts";
|
import { fetchApi, handleResponse } from "./apiClient.ts";
|
||||||
import { omitUndef } from "../utils/omitUndef.ts";
|
|
||||||
|
|
||||||
export function SettingsPage(props: { sessionId: string | null }) {
|
export function SettingsPage(props: { sessionId: string | null }) {
|
||||||
const { sessionId } = props;
|
const { sessionId } = props;
|
||||||
|
|
||||||
const getSession = useSWR(
|
const getSession = useSWR(
|
||||||
sessionId ? ["/sessions/:sessionId", { params: { sessionId } }] as const : null,
|
sessionId ? ["sessions/{sessionId}", "GET", { params: { sessionId } }] as const : null,
|
||||||
(args) => fetchApi(...args).then(handleResponse),
|
(args) => fetchApi(...args).then(handleResponse),
|
||||||
);
|
);
|
||||||
const getUser = useSWR(
|
const getUser = useSWR(
|
||||||
getSession.data?.userId
|
getSession.data?.userId
|
||||||
? ["/users/:userId", { params: { userId: String( getSession.data.userId) } }] as const
|
? ["users/{userId}", "GET", { params: { userId: String(getSession.data.userId) } }] as const
|
||||||
: null,
|
: null,
|
||||||
(args) => fetchApi(...args).then(handleResponse),
|
(args) => fetchApi(...args).then(handleResponse),
|
||||||
);
|
);
|
||||||
const getParams = useSWR(
|
const getParams = useSWR(
|
||||||
["/settings/params", {}] as const,
|
["settings/params", "GET", {}] as const,
|
||||||
(args) => fetchApi(...args).then(handleResponse),
|
(args) => fetchApi(...args).then(handleResponse),
|
||||||
);
|
);
|
||||||
const [newParams, setNewParams] = useState<Partial<typeof getParams.data>>({});
|
const [newParams, setNewParams] = useState<Partial<typeof getParams.data>>({});
|
||||||
|
|
@ -30,10 +29,9 @@ export function SettingsPage(props: { sessionId: string | null }) {
|
||||||
onSubmit={(e) => {
|
onSubmit={(e) => {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
getParams.mutate(() =>
|
getParams.mutate(() =>
|
||||||
fetchApi("/settings/params", {
|
fetchApi("settings/params", "PATCH", {
|
||||||
method: "PATCH",
|
|
||||||
query: { sessionId: sessionId ?? "" },
|
query: { sessionId: sessionId ?? "" },
|
||||||
body: omitUndef(newParams ?? {}),
|
body: { type: "application/json", data: newParams ?? {} },
|
||||||
}).then(handleResponse)
|
}).then(handleResponse)
|
||||||
)
|
)
|
||||||
.then(() => setNewParams({}))
|
.then(() => setNewParams({}))
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,7 @@ import { Counter } from "./Counter.tsx";
|
||||||
|
|
||||||
export function StatsPage() {
|
export function StatsPage() {
|
||||||
const getGlobalStats = useSWR(
|
const getGlobalStats = useSWR(
|
||||||
["/stats", {}] as const,
|
["stats", "GET", {}] as const,
|
||||||
(args) => fetchApi(...args).then(handleResponse),
|
(args) => fetchApi(...args).then(handleResponse),
|
||||||
{ refreshInterval: 2_000 },
|
{ refreshInterval: 2_000 },
|
||||||
);
|
);
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
import React, { RefObject, useRef } from "react";
|
import React, { RefObject, useRef, useState } from "react";
|
||||||
import { FormattedRelativeTime } from "react-intl";
|
import { FormattedRelativeTime } from "react-intl";
|
||||||
import useSWR, { useSWRConfig } from "swr";
|
import useSWR, { useSWRConfig } from "swr";
|
||||||
import { WorkerResponse } from "../api/workersRoute.ts";
|
import { WorkerData } from "../api/workersRoute.ts";
|
||||||
import { Counter } from "./Counter.tsx";
|
import { Counter } from "./Counter.tsx";
|
||||||
import { fetchApi, handleResponse } from "./apiClient.ts";
|
import { fetchApi, handleResponse } from "./apiClient.ts";
|
||||||
|
|
||||||
|
|
@ -11,18 +11,18 @@ export function WorkersPage(props: { sessionId: string | null }) {
|
||||||
const addDialogRef = useRef<HTMLDialogElement>(null);
|
const addDialogRef = useRef<HTMLDialogElement>(null);
|
||||||
|
|
||||||
const getSession = useSWR(
|
const getSession = useSWR(
|
||||||
sessionId ? ["/sessions/:sessionId", { params: { sessionId } }] as const : null,
|
sessionId ? ["sessions/{sessionId}", "GET", { params: { sessionId } }] as const : null,
|
||||||
(args) => fetchApi(...args).then(handleResponse),
|
(args) => fetchApi(...args).then(handleResponse),
|
||||||
);
|
);
|
||||||
const getUser = useSWR(
|
const getUser = useSWR(
|
||||||
getSession.data?.userId
|
getSession.data?.userId
|
||||||
? ["/users/:userId", { params: { userId: String(getSession.data.userId) } }] as const
|
? ["users/{userId}", "GET", { params: { userId: String(getSession.data.userId) } }] as const
|
||||||
: null,
|
: null,
|
||||||
(args) => fetchApi(...args).then(handleResponse),
|
(args) => fetchApi(...args).then(handleResponse),
|
||||||
);
|
);
|
||||||
|
|
||||||
const getWorkers = useSWR(
|
const getWorkers = useSWR(
|
||||||
["/workers", { method: "GET" }] as const,
|
["workers", "GET", {}] as const,
|
||||||
(args) => fetchApi(...args).then(handleResponse),
|
(args) => fetchApi(...args).then(handleResponse),
|
||||||
{ refreshInterval: 5000 },
|
{ refreshInterval: 5000 },
|
||||||
);
|
);
|
||||||
|
|
@ -31,20 +31,14 @@ export function WorkersPage(props: { sessionId: string | null }) {
|
||||||
<>
|
<>
|
||||||
{getWorkers.data?.length
|
{getWorkers.data?.length
|
||||||
? (
|
? (
|
||||||
<ul className="flex flex-col gap-2">
|
<ul className="my-4 flex flex-col gap-2">
|
||||||
{getWorkers.data?.map((worker) => (
|
{getWorkers.data?.map((worker) => (
|
||||||
<WorkerListItem key={worker.id} worker={worker} sessionId={sessionId} />
|
<WorkerListItem key={worker.id} worker={worker} sessionId={sessionId} />
|
||||||
))}
|
))}
|
||||||
</ul>
|
</ul>
|
||||||
)
|
)
|
||||||
: getWorkers.data?.length === 0
|
: getWorkers.data?.length === 0
|
||||||
? (
|
? <p>No workers</p>
|
||||||
<ul className="flex flex-col gap-2">
|
|
||||||
<li className="flex flex-col gap-2 rounded-md bg-zinc-100 dark:bg-zinc-800 p-2">
|
|
||||||
<p key="no-workers" className="text-center text-gray-500">No workers.</p>
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
)
|
|
||||||
: getWorkers.error
|
: getWorkers.error
|
||||||
? <p className="alert">Loading workers failed</p>
|
? <p className="alert">Loading workers failed</p>
|
||||||
: <div className="spinner self-center" />}
|
: <div className="spinner self-center" />}
|
||||||
|
|
@ -88,16 +82,23 @@ function AddWorkerDialog(props: {
|
||||||
const user = data.get("user") as string;
|
const user = data.get("user") as string;
|
||||||
const password = data.get("password") as string;
|
const password = data.get("password") as string;
|
||||||
console.log(key, name, user, password);
|
console.log(key, name, user, password);
|
||||||
fetchApi("/workers", {
|
mutate(
|
||||||
method: "POST",
|
(key) => Array.isArray(key) && key[0] === "workers",
|
||||||
query: { sessionId: sessionId! },
|
async () =>
|
||||||
body: {
|
fetchApi("workers", "POST", {
|
||||||
key,
|
query: { sessionId: sessionId! },
|
||||||
name: name || null,
|
body: {
|
||||||
sdUrl,
|
type: "application/json",
|
||||||
sdAuth: user && password ? { user, password } : null,
|
data: {
|
||||||
},
|
key,
|
||||||
}).then(handleResponse).then(() => mutate(() => true));
|
name: name || null,
|
||||||
|
sdUrl,
|
||||||
|
sdAuth: user && password ? { user, password } : null,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}).then(handleResponse),
|
||||||
|
{ populateCache: false },
|
||||||
|
);
|
||||||
dialogRef.current?.close();
|
dialogRef.current?.close();
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
|
|
@ -183,7 +184,7 @@ function AddWorkerDialog(props: {
|
||||||
}
|
}
|
||||||
|
|
||||||
function WorkerListItem(props: {
|
function WorkerListItem(props: {
|
||||||
worker: WorkerResponse;
|
worker: WorkerData;
|
||||||
sessionId: string | null;
|
sessionId: string | null;
|
||||||
}) {
|
}) {
|
||||||
const { worker, sessionId } = props;
|
const { worker, sessionId } = props;
|
||||||
|
|
@ -191,12 +192,12 @@ function WorkerListItem(props: {
|
||||||
const deleteDialogRef = useRef<HTMLDialogElement>(null);
|
const deleteDialogRef = useRef<HTMLDialogElement>(null);
|
||||||
|
|
||||||
const getSession = useSWR(
|
const getSession = useSWR(
|
||||||
sessionId ? ["/sessions/:sessionId", { params: { sessionId } }] as const : null,
|
sessionId ? ["sessions/{sessionId}", "GET", { params: { sessionId } }] as const : null,
|
||||||
(args) => fetchApi(...args).then(handleResponse),
|
(args) => fetchApi(...args).then(handleResponse),
|
||||||
);
|
);
|
||||||
const getUser = useSWR(
|
const getUser = useSWR(
|
||||||
getSession.data?.userId
|
getSession.data?.userId
|
||||||
? ["/users/:userId", { params: { userId: String(getSession.data.userId) } }] as const
|
? ["users/{userId}", "GET", { params: { userId: String(getSession.data.userId) } }] as const
|
||||||
: null,
|
: null,
|
||||||
(args) => fetchApi(...args).then(handleResponse),
|
(args) => fetchApi(...args).then(handleResponse),
|
||||||
);
|
);
|
||||||
|
|
@ -289,14 +290,21 @@ function EditWorkerDialog(props: {
|
||||||
const user = data.get("user") as string;
|
const user = data.get("user") as string;
|
||||||
const password = data.get("password") as string;
|
const password = data.get("password") as string;
|
||||||
console.log(user, password);
|
console.log(user, password);
|
||||||
fetchApi("/workers/:workerId", {
|
mutate(
|
||||||
method: "PATCH",
|
(key) => Array.isArray(key) && key[0] === "workers",
|
||||||
params: { workerId: workerId },
|
async () =>
|
||||||
query: { sessionId: sessionId! },
|
fetchApi("workers/{workerId}", "PATCH", {
|
||||||
body: {
|
params: { workerId: workerId },
|
||||||
sdAuth: user && password ? { user, password } : null,
|
query: { sessionId: sessionId! },
|
||||||
},
|
body: {
|
||||||
}).then(handleResponse).then(() => mutate(() => true));
|
type: "application/json",
|
||||||
|
data: {
|
||||||
|
sdAuth: user && password ? { user, password } : null,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}).then(handleResponse),
|
||||||
|
{ populateCache: false },
|
||||||
|
);
|
||||||
dialogRef.current?.close();
|
dialogRef.current?.close();
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
|
|
@ -357,11 +365,15 @@ function DeleteWorkerDialog(props: {
|
||||||
className="flex flex-col gap-4 p-4"
|
className="flex flex-col gap-4 p-4"
|
||||||
onSubmit={(e) => {
|
onSubmit={(e) => {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
fetchApi("/workers/:workerId", {
|
mutate(
|
||||||
method: "DELETE",
|
(key) => Array.isArray(key) && key[0] === "workers",
|
||||||
params: { workerId: workerId },
|
async () =>
|
||||||
query: { sessionId: sessionId! },
|
fetchApi("workers/{workerId}", "DELETE", {
|
||||||
}).then(handleResponse).then(() => mutate(() => true));
|
params: { workerId: workerId },
|
||||||
|
query: { sessionId: sessionId! },
|
||||||
|
}).then(handleResponse),
|
||||||
|
{ populateCache: false },
|
||||||
|
);
|
||||||
dialogRef.current?.close();
|
dialogRef.current?.close();
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
|
|
|
||||||
|
|
@ -1,19 +1,15 @@
|
||||||
import { edenFetch } from "elysia/eden";
|
import { createFetcher, Output } from "t_rest/client";
|
||||||
import { Api } from "../api/serveApi.ts";
|
import { ApiHandler } from "../api/serveApi.ts";
|
||||||
|
|
||||||
export const API_URL = "/api";
|
export const fetchApi = createFetcher<ApiHandler>({
|
||||||
|
baseUrl: `${location.origin}/api/`,
|
||||||
|
});
|
||||||
|
|
||||||
export const fetchApi = edenFetch<Api>(API_URL);
|
export function handleResponse<T extends Output>(
|
||||||
|
|
||||||
export function handleResponse<
|
|
||||||
T extends
|
|
||||||
| { data: unknown; error: null }
|
|
||||||
| { data: null; error: { status: number; value: unknown } },
|
|
||||||
>(
|
|
||||||
response: T,
|
response: T,
|
||||||
): (T & { error: null })["data"] {
|
): (T & { status: 200 })["body"]["data"] {
|
||||||
if (response.error) {
|
if (response.status !== 200) {
|
||||||
throw new Error(`${response.error?.status}: ${response.error?.value}`);
|
throw new Error(String(response.body.data));
|
||||||
}
|
}
|
||||||
return response.data;
|
return response.body.data;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
76
utils/Tkv.ts
76
utils/Tkv.ts
|
|
@ -1,76 +0,0 @@
|
||||||
export type TkvEntry<K extends Deno.KvKey, T> = {
|
|
||||||
key: readonly [...K];
|
|
||||||
value: T;
|
|
||||||
versionstamp: string;
|
|
||||||
};
|
|
||||||
|
|
||||||
export type TkvEntryMaybe<K extends Deno.KvKey, T> = TkvEntry<K, T> | {
|
|
||||||
key: readonly [...K];
|
|
||||||
value: null;
|
|
||||||
versionstamp: null;
|
|
||||||
};
|
|
||||||
|
|
||||||
export type TkvListSelector<K extends Deno.KvKey> =
|
|
||||||
| { prefix: KvKeyPrefix<K> }
|
|
||||||
| { prefix: KvKeyPrefix<K>; start: readonly [...K] }
|
|
||||||
| { prefix: KvKeyPrefix<K>; end: readonly [...K] }
|
|
||||||
| { start: readonly [...K]; end: readonly [...K] };
|
|
||||||
|
|
||||||
export type KvKeyPrefix<Key extends Deno.KvKey> = Key extends readonly [infer Prefix, ...infer Rest]
|
|
||||||
? readonly [Prefix] | readonly [Prefix, ...Rest]
|
|
||||||
: never;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Typed wrapper for {@link Deno.Kv}
|
|
||||||
*/
|
|
||||||
export class Tkv<K extends Deno.KvKey, T> {
|
|
||||||
constructor(readonly db: Deno.Kv) {}
|
|
||||||
|
|
||||||
get(
|
|
||||||
key: readonly [...K],
|
|
||||||
options: Parameters<Deno.Kv["get"]>[1] = {},
|
|
||||||
): Promise<TkvEntryMaybe<K, T>> {
|
|
||||||
return this.db.get<T>(key, options) as any;
|
|
||||||
}
|
|
||||||
|
|
||||||
set(
|
|
||||||
key: readonly [...K],
|
|
||||||
value: T,
|
|
||||||
options: Parameters<Deno.Kv["set"]>[2] = {},
|
|
||||||
): ReturnType<Deno.Kv["set"]> {
|
|
||||||
return this.db.set(key, value, options);
|
|
||||||
}
|
|
||||||
|
|
||||||
atomicSet(
|
|
||||||
key: readonly [...K],
|
|
||||||
versionstamp: Parameters<Deno.AtomicOperation["check"]>[0]["versionstamp"],
|
|
||||||
value: T,
|
|
||||||
options: Parameters<Deno.AtomicOperation["set"]>[2] = {},
|
|
||||||
): ReturnType<Deno.AtomicOperation["commit"]> {
|
|
||||||
return this.db.atomic()
|
|
||||||
.check({ key, versionstamp })
|
|
||||||
.set(key, value, options)
|
|
||||||
.commit();
|
|
||||||
}
|
|
||||||
|
|
||||||
delete(key: readonly [...K]): ReturnType<Deno.Kv["delete"]> {
|
|
||||||
return this.db.delete(key);
|
|
||||||
}
|
|
||||||
|
|
||||||
atomicDelete(
|
|
||||||
key: readonly [...K],
|
|
||||||
versionstamp: Parameters<Deno.AtomicOperation["check"]>[0]["versionstamp"],
|
|
||||||
): ReturnType<Deno.AtomicOperation["commit"]> {
|
|
||||||
return this.db.atomic()
|
|
||||||
.check({ key, versionstamp })
|
|
||||||
.delete(key)
|
|
||||||
.commit();
|
|
||||||
}
|
|
||||||
|
|
||||||
list(
|
|
||||||
selector: TkvListSelector<K>,
|
|
||||||
options: Parameters<Deno.Kv["list"]>[1] = {},
|
|
||||||
): AsyncIterableIterator<TkvEntry<K, T>> {
|
|
||||||
return this.db.list<T>(selector as Deno.KvListSelector, options) as any;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Loading…
Reference in New Issue