refactor: ♻️emoves Env parameter
Removes the `Env` parameter from several functions to simplify their signatures and rely on the global `env` for configuration. This change reduces the number of arguments passed around, making the code cleaner and easier to maintain.
This commit is contained in:
@@ -1,8 +1,8 @@
|
||||
import { env as cloudflareEnv } from "cloudflare:workers";
|
||||
import type { HonoRequest } from "hono";
|
||||
import isEqual from "lodash.isequal";
|
||||
import { DateTime, type DurationLike } from "luxon";
|
||||
|
||||
import type { Env } from "~/types/env";
|
||||
import type { WatchStatus } from "~/types/title/watchStatus";
|
||||
|
||||
import { FailedToQueueTaskError } from "../errors/FailedToQueueTask";
|
||||
@@ -24,20 +24,20 @@ type QueueBody = {
|
||||
};
|
||||
|
||||
type ScheduleConfig =
|
||||
| { delay: DurationLike; epochTime: never }
|
||||
| { epochTime: number; delay: never };
|
||||
| { delay: DurationLike; epochTime?: never }
|
||||
| { epochTime: number; delay?: never };
|
||||
|
||||
interface QueueTaskOptionalArgs {
|
||||
scheduleConfig?: ScheduleConfig;
|
||||
/** when req is not provided, that means the task is being created locally */
|
||||
req?: HonoRequest;
|
||||
env?: Cloudflare.Env;
|
||||
}
|
||||
|
||||
export async function queueTask(
|
||||
env: Env,
|
||||
queueName: QueueName,
|
||||
body: QueueBody[QueueName],
|
||||
{ scheduleConfig, req }: QueueTaskOptionalArgs = {},
|
||||
{ scheduleConfig, req, env = cloudflareEnv }: QueueTaskOptionalArgs = {},
|
||||
) {
|
||||
const domain = req
|
||||
? getCurrentDomain(req)
|
||||
@@ -114,7 +114,7 @@ export async function queueTask(
|
||||
}
|
||||
|
||||
async function checkIfTaskExists(
|
||||
env: Env,
|
||||
env: Cloudflare.Env,
|
||||
queueName: QueueName,
|
||||
taskId: string,
|
||||
expectedBody: QueueBody[QueueName],
|
||||
|
||||
@@ -1,14 +1,10 @@
|
||||
import type { Env } from "~/types/env";
|
||||
import { env } from "cloudflare:workers";
|
||||
|
||||
import { getAdminSdkCredentials } from "../gcloud/getAdminSdkCredentials";
|
||||
import { getGoogleAuthToken } from "../gcloud/getGoogleAuthToken";
|
||||
import type { QueueName } from "./queueName";
|
||||
|
||||
export async function removeTask(
|
||||
env: Env,
|
||||
queueName: QueueName,
|
||||
taskId: string,
|
||||
) {
|
||||
export async function removeTask(queueName: QueueName, taskId: string) {
|
||||
const adminSdkCredentials = getAdminSdkCredentials(env);
|
||||
const { projectId } = adminSdkCredentials;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user