fix: no longer use deprecated std functions

Author: shiftinv

deno.lock

@@ -1,4 +1,3 @@
-export * as http from "https://deno.land/[email protected]/http/mod.ts";
 export * as log from "https://deno.land/[email protected]/log/mod.ts";
 export * as hex from "https://deno.land/[email protected]/encoding/hex.ts";
 

deps.ts

@@ -51,7 +51,7 @@ export function requestLog(headers: Headers) {
     return {
         debug: proxyLog(log.debug),
         info: proxyLog(log.info),
-        warning: proxyLog(log.warning),
+        warn: proxyLog(log.warn),
         error: proxyLog(log.error),
         critical: proxyLog(log.critical),
     };

lib/util.ts

@@ -39,19 +39,19 @@ export async function sendWebhook(
 
         // if we'd wait longer than the configured limit, just return the 429
         if (resetms > config.maxWebhookRetryMs) {
-            reqLog.warning(
+            reqLog.warn(
                 `ratelimited for ${resetms}ms (> ${config.maxWebhookRetryMs}ms), not retrying`,
             );
             break;
         }
 
         // maybe wait and retry
         if (retries >= config.maxWebhookRetries) {
-            reqLog.warning(`reached maximum number of retries (${retries})`);
+            reqLog.warn(`reached maximum number of retries (${retries})`);
             break;
         }
         retries++;
-        reqLog.warning(`retrying after ${resetms}ms (retry ${retries})`);
+        reqLog.warn(`retrying after ${resetms}ms (retry ${retries})`);
         await sleep(resetms);
     } while (true);
 

lib/webhook.ts

@@ -1,4 +1,4 @@
-import { http, httpErrors, log } from "./deps.ts";
+import { httpErrors, log } from "./deps.ts";
 import config from "./lib/config.ts";
 import handler from "./lib/handler.ts";
 import { requestLog } from "./lib/util.ts";
@@ -19,7 +19,7 @@ function setupLogs() {
     });
 }
 
-async function handleRequest(req: Request, connInfo: http.ConnInfo): Promise<Response> {
+async function handleRequest(req: Request, info: Deno.ServeHandlerInfo): Promise<Response> {
     const reqLog = requestLog(req.headers);
 
     let res: Response;
@@ -33,7 +33,7 @@ async function handleRequest(req: Request, connInfo: http.ConnInfo): Promise<Res
         }
     } catch (err) {
         if (err instanceof httpErrors.HttpError && err.expose) {
-            reqLog.warning(`http error: ${err.message}`);
+            reqLog.warn(`http error: ${err.message}`);
             res = new Response(err.message, { status: err.status });
         } else {
             reqLog.critical(err);
@@ -60,7 +60,7 @@ async function handleRequest(req: Request, connInfo: http.ConnInfo): Promise<Res
 
     // log request
     const respLen = res.headers.get("content-length") || 0;
-    const addr = connInfo.remoteAddr as Deno.NetAddr;
+    const addr = info.remoteAddr;
     reqLog.info(
         `http: ${addr.hostname}:${addr.port} - ${req.method} ${req.url} ${res.status} ${respLen}`,
     );
@@ -72,13 +72,13 @@ if (import.meta.main) {
     setupLogs();
 
     if (!config.signKey) {
-        log.warning("url signing disabled");
+        log.warn("url signing disabled");
     }
 
     log.info(`starting webserver on ${config.hostname}:${config.port}`);
-    http.serve(handleRequest, {
+    Deno.serve({
         hostname: config.hostname,
         port: config.port,
         onListen: () => log.info(`listening on ${config.hostname}:${config.port}`),
-    });
+    }, handleRequest);
 }