Fix edge-case errors and update Deno + libraries

.dvmrc

@@ -1 +1 @@
-1.22.0
+1.25.3

.github/workflows/tests.yml

@@ -6,9 +6,9 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: denoland/setup-deno@v1
         with:
-          deno-version: v1.22.0
+          deno-version: v1.25.3
       - run: |
           make test

Makefile

@@ -1,6 +1,6 @@
 .PHONY: start
 start:
-	deno run --watch --allow-net --allow-read --allow-env=PORT,USERBASE_APP_ID main.ts
+	deno run --watch --allow-net --allow-read=public,pages,.env,.env.defaults --allow-env main.ts
 
 .PHONY: format
 format:
@@ -10,4 +10,4 @@ format:
 test:
 	deno fmt --check
 	deno lint
-	deno test --allow-net --allow-read --allow-env=PORT,USERBASE_APP_ID --check=all
+	deno test --allow-net --allow-read=public,pages,.env,.env.defaults --allow-env --check=all

README.md

@@ -10,7 +10,7 @@ It's not compatible with Budget Zen v1 (not end-to-end encrypted), which you can
 
 ## Requirements
 
-This was tested with `deno@1.22.0`, though it's possible older versions might work.
+This was tested with `deno@1.25.3`, though it's possible older versions might work.
 
 There are no other dependencies. **Deno**!
 

lib/utils.ts

@@ -1,4 +1,4 @@
-import 'https://deno.land/std@0.142.0/dotenv/load.ts';
+import 'https://deno.land/std@0.156.0/dotenv/load.ts';
 
 import header from '../components/header.ts';
 import footer from '../components/footer.ts';

lib/utils_test.ts

@@ -1,4 +1,4 @@
-import { assertEquals } from 'https://deno.land/std@0.142.0/testing/asserts.ts';
+import { assertEquals } from 'https://deno.land/std@0.156.0/testing/asserts.ts';
 import { escapeHtml, formatNumber, splitArrayInChunks } from './utils.ts';
 
 Deno.test('that escapeHtml works', () => {

main.ts

@@ -1,4 +1,4 @@
-import { serve } from 'https://deno.land/std@0.142.0/http/server.ts';
+import { serve } from 'https://deno.land/std@0.156.0/http/server.ts';
 import routes, { Route } from './routes.ts';
 
 function handler(request: Request) {

main_test.ts

@@ -1,4 +1,4 @@
-import { assertEquals } from 'https://deno.land/std@0.142.0/testing/asserts.ts';
+import { assertEquals } from 'https://deno.land/std@0.156.0/testing/asserts.ts';
 import { abortController } from './main.ts';
 
 const baseUrl = 'http://localhost:8000';

public/js/script.js

@@ -506,6 +506,8 @@
         await fetchBudgets(expense.date.substring(0, 7))
       ).find((budget) => budget.name === expense.budget);
 
+      const { userbase } = window;
+
       if (!existingBudget) {
         const newBudgetId = `${generateId()}`;
 
@@ -520,8 +522,6 @@
         });
       }
 
-      const { userbase } = window;
-
       if (expense.id === 'newExpense') {
         expense.id = `${generateId()}`;
 
@@ -869,6 +869,8 @@
           10,
         );
 
+        const { userbase } = window;
+
         for (const budgetsToAdd of addBudgetChunks) {
           await userbase.putTransaction({
             databaseName: 'budgets',

routes.ts

@@ -1,4 +1,4 @@
-import { readableStreamFromReader } from 'https://deno.land/std@0.142.0/streams/mod.ts';
+import { serveFile } from 'https://deno.land/std@0.156.0/http/file_server.ts';
 import { baseUrl, basicLayoutResponse, isRunningLocally, PageContentResult, recordPageView } from './lib/utils.ts';
 
 // NOTE: This won't be necessary once https://github.com/denoland/deploy_feedback/issues/1 is closed
@@ -18,7 +18,7 @@ export interface Route {
   handler: (
     request: Request,
     match: URLPatternResult,
-  ) => (Response | Promise<Response>);
+  ) => Response | Promise<Response>;
 }
 
 interface Routes {
@@ -104,12 +104,11 @@ const routes: Routes = {
   robots: {
     pattern: new URLPattern({ pathname: '/robots.txt' }),
     handler: async (_request) => {
-      const file = await Deno.open(`public/robots.txt`, { read: true });
-      const readableStream = readableStreamFromReader(file);
+      const fileContents = await Deno.readTextFile(`public/robots.txt`);
 
       const oneDayInSeconds = 24 * 60 * 60;
 
-      return new Response(readableStream, {
+      return new Response(fileContents, {
         headers: {
           'content-type': 'text/plain',
           'cache-control': `max-age=${oneDayInSeconds}, public`,
@@ -119,12 +118,11 @@ const routes: Routes = {
   },
   public: {
     pattern: new URLPattern({ pathname: '/public/:filePath*' }),
-    handler: async (_request, match) => {
+    handler: async (request, match) => {
       const { filePath } = match.pathname.groups;
 
       try {
-        const file = await Deno.open(`public/${filePath}`, { read: true });
-        const readableStream = readableStreamFromReader(file);
+        const fullFilePath = `public/${filePath}`;
 
         const oneDayInSeconds = isRunningLocally(match) ? 0 : 24 * 60 * 60;
 
@@ -141,15 +139,21 @@ const routes: Routes = {
           headers['content-type'] = 'text/css';
         } else if (fileExtension === 'jpg') {
           headers['content-type'] = 'image/jpeg';
+          return serveFile(request, fullFilePath);
         } else if (fileExtension === 'png') {
           headers['content-type'] = 'image/png';
+          return serveFile(request, fullFilePath);
         } else if (fileExtension === 'svg') {
           headers['content-type'] = 'image/svg+xml';
-        } else if (fileExtension === 'json') {
-          headers['content-type'] = 'text/json';
+          return serveFile(request, fullFilePath);
+        } else if (fileExtension === 'ico') {
+          headers['content-type'] = 'image/x-icon';
+          return serveFile(request, fullFilePath);
         }
 
-        return new Response(readableStream, {
+        const fileContents = await Deno.readTextFile(fullFilePath);
+
+        return new Response(fileContents, {
           headers,
         });
       } catch (error) {