set bot to context, upgrade grammy

README.md

@@ -0,0 +1 @@
+# sofash

package.json

@@ -14,7 +14,7 @@
 		"prepare": "lefthook install"
 	},
 	"dependencies": {
-		"grammy": "^1.31.0",
+		"grammy": "^1.31.2",
 		"hono": "^4.6.9",
 		"zod": "^3.23.8"
 	},

scripts/set-webhook.ts

@@ -3,7 +3,7 @@ import { parseArgs } from "node:util";
 import { config } from "dotenv";
 import { Bot } from "grammy";
 import { z } from "zod";
-import { envSchema } from "../src/shared/env.ts";
+import { envSchema } from "../src/shared/context/env.ts";
 
 config();
 

src/main.ts

@@ -2,8 +2,8 @@ import { Bot, webhookCallback } from "grammy";
 import { Hono } from "hono";
 import { env } from "hono/adapter";
 import { contextStorage, getContext } from "hono/context-storage";
-import type { Context } from "./shared/context.ts";
-import { envSchema } from "./shared/env.ts";
+import type { Context } from "./shared/context/context.ts";
+import { envSchema } from "./shared/context/env.ts";
 
 if (import.meta.env.DEV) {
 	// dotenv needed during development to set env locally from process.env
@@ -15,22 +15,24 @@ if (import.meta.env.DEV) {
 
 const app = new Hono<Context>();
 
-// set validated and parsed env back to the context storage
 app.use(contextStorage());
 app.use(async (hc, next) => {
-	hc.set("env", envSchema.parse(env(hc)));
+	const parsedEnv = envSchema.parse(env(hc));
+	const bot = new Bot(parsedEnv.BOT_TOKEN);
+
+	hc.set("env", parsedEnv);
+	hc.set("bot", bot);
+
 	await next();
 });
 
 app.get("/", (hc) => hc.text("Hello CloudFlare!"));
 
 // cannot set this path to be secret since in CF secrets are accessed only
-// during request. the same goes for creating a bot instance outside of request
+// inside request. the same goes for creating a bot instance outside of request
 // scope since token is a secret that is accessible only inside request
 app.use("/telegram", (hc) => {
-	const { env } = getContext<Context>().var;
-
-	const bot = new Bot(env.BOT_TOKEN);
+	const { bot } = getContext<Context>().var;
 
 	bot.command("start", (tc) => tc.reply("Hello Telegram!"));
 	bot.on("message", (tc) =>

src/shared/context.ts → src/shared/context/context.ts

@@ -1,7 +1,8 @@
+import type { Bot } from "grammy";
 import type { Env as HonoEnv } from "hono";
 import type { Env } from "./env.ts";
 
 export interface Context extends HonoEnv {
 	// biome-ignore lint/style/useNamingConvention: 3-rd party type
-	Variables: { env: Env };
+	Variables: { env: Env; bot: Bot };
 }