Merge branch 'main' of https://git.n8x.sx/chiko/77th_eventcalenderntfy

Reviewed-on: #1

.gitignore

@@ -37,3 +37,4 @@ report.[0-9]_.[0-9]_.[0-9]_.[0-9]_.json
 
 *.db
 *.sqlite
+data

Crontab

@@ -0,0 +1,2 @@
+1 * * * * bun run ./src/app.ts --today > /dev/null 2>&1
+0 * * * * bun run ./src/app.ts > /dev/null 2>&1

Dockerfile

@@ -1,44 +1,89 @@
 FROM debian:12 AS base
+ARG BUILD_DATE
+ARG VERSION
+LABEL build_version="77th_eventcalendarntfy ${VERSION}, Build-date:- ${BUILD_DATE}"
+LABEL maintainer="chiko <chiko@xcsone.de>"
 WORKDIR /opt/app
+<<<<<<< HEAD
+RUN set -eux && \
+    echo "Updating APT" && \
+        apt-get update -y -qq && \
+        apt-get upgrade -y -qq && \
+    echo "Installing tools" && \
+        apt-get install -y -qq \
+            curl unzip cron ca-certificates logrotate && \
+    echo "Cleaning up" && \
+        apt-get --yes autoremove --purge && \
+        apt-get clean --yes && \
+        rm --recursive --force --verbose /var/lib/apt/lists/* && \
+        rm --recursive --force --verbose /tmp/* && \
+        rm --recursive --force --verbose /var/tmp/* && \
+        rm --recursive --force --verbose /var/cache/apt/archives/* && \
+        truncate --size 0 /var/log/*log
+=======
 RUN apt-get update && \
-    apt-get install -y curl unzip ca-certificates python3 python3-pip && \
+    # apt-get install -y curl unzip cron ca-certificates python3 python3-pip && \
+    apt-get install -y curl unzip cron ca-certificates python3 python3-pip && \
     rm -rf /var/lib/apt/lists/*
+>>>>>>> 999bdf7222a68995dd40ec7da967b360f67d354a
 # install BunJs
 RUN curl -fsSL https://bun.com/install | bash
 ENV PATH="/root/.bun/bin:$PATH"
-# symlink python3 to python
-RUN ln -s /usr/bin/python3 /usr/bin/python
-
 # install dependencies into temp directory
 # this will cache them and speed up future builds
 FROM base AS install
 RUN mkdir -p /temp/dev
 COPY package.json bun.lock /temp/dev/
 RUN cd /temp/dev && bun install --frozen-lockfile
-# and install python dependencies
-COPY ./requirements.txt .
-RUN pip3 install --break-system-packages -r ./requirements.txt
 
 # install with --production (exclude devDependencies)
 RUN mkdir -p /temp/prod
 COPY package.json bun.lock /temp/prod/
 RUN cd /temp/prod && bun install --frozen-lockfile --production
 
+<<<<<<< HEAD
+COPY ./docker/Crontab /etc/cron.d/
+RUN chmod 0644 /etc/cron.d/Crontab
+COPY ./docker/cron-bun-log /etc/logrotate.d/
+RUN mkdir /var/log/cron && touch /var/log/cron.log
+=======
+# and install python dependencies
+# COPY ./requirements.txt .
+# RUN python3 -m pip install --break-system-packages -r requirements.txt
+# RUN python3 -m pip install -U python-dotenv
+>>>>>>> 999bdf7222a68995dd40ec7da967b360f67d354a
+
 # copy node_modules from temp directory
 # then copy all (non-ignored) project files into the image
 FROM base AS prerelease
 COPY --from=install /temp/dev/node_modules node_modules
-COPY . .
+COPY . ./
+<<<<<<< HEAD
+=======
 
+>>>>>>> 999bdf7222a68995dd40ec7da967b360f67d354a
 # [optional] tests & build
 ENV NODE_ENV=production
 
 # copy production dependencies and source code into final image
 FROM base AS release
+WORKDIR /opt/app
 COPY --from=install /temp/prod/node_modules node_modules
-COPY --from=prerelease /opt/app/src/app.ts .
 COPY --from=prerelease /opt/app/package.json .
-VOLUME ["/opt/app/data/db"]
+#COPY --from=prerelease .entrypoint.sh .
-# run the app
+<<<<<<< HEAD
-USER bun
+COPY . ./
-ENTRYPOINT ["./entrypoint.sh"]
+RUN mkdir /var/log/cron && touch /var/log/cron.log
+VOLUME /opt/app/data/db
+# VOLUME /var/log/cron
+=======
+COPY Crontab /etc/cron.d/
+RUN chmod 0644 /etc/cron.d/Crontab
+COPY . ./
+# USER bun
+RUN touch /var/log/cron.log
+# RUN chmod +x entrypoint.sh
+# ENTRYPOINT ["./entrypoint.sh"]
+VOLUME /opt/app/data/db
+>>>>>>> 999bdf7222a68995dd40ec7da967b360f67d354a
+CMD bun run ./src/app.ts --today && cron && tail -f /var/log/cron.log

docker-compose.yml

@@ -0,0 +1,49 @@
+services:
+  app:
+    build: .
+    volumes:
+      - ./data/db:/opt/app/data/db
+<<<<<<< HEAD
+      - ./data/app/log:/var/log
+=======
+>>>>>>> 999bdf7222a68995dd40ec7da967b360f67d354a
+    env_file:
+      - path: ./.env
+        required: true
+    depends_on:
+      apprise:
+        condition: service_healthy
+    links: 
+      - apprise
+  apprise:
+    image: caronc/apprise:latest
+    hostname: apprise
+    environment:
+      - APPRISE_WORKER_COUNT=1
+      - APPRISE_STATEFUL_MODE=simple
+      # - PUID=$(id -u)
+      # - PGID=$(id -g)
+    volumes:
+      - ./data/apprise/config:/config
+      - ./data/apprise/plugin:/plugin
+      - ./data/apprise/attach:/attach
+<<<<<<< HEAD
+    # ports:
+      #- 8880:8000
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:8000/status"]
+      interval: 10s
+      timeout: 5s
+=======
+    ports:
+      - 8000:8000
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:8000/status"]
+      interval: 30s
+      timeout: 10s
+>>>>>>> 999bdf7222a68995dd40ec7da967b360f67d354a
+      retries: 5
+# networks:
+#   default:
+#     external: true
+#     name: npm

docker/Crontab

@@ -0,0 +1,2 @@
+8 * * * * bun run ./src/app.ts --today > /var/log/cron.log 2>&1
+*/15 * * * * bun run ./src/app.ts > /var/log/cron.log 2>&1

docker/cron-bun-log

@@ -0,0 +1,8 @@
+/var/log/cron.log {
+    daily
+    rotate 7
+    compress
+    missingok
+    notifempty
+    copytruncate
+}

entrypoint.sh

@@ -1,6 +0,0 @@
-#!/bin/bash
-crontab -l > mycron
-echo "0 8 * * * bun run ./src/app.ts --today > /dev/null 2>&1" >> mycron
-echo "0 * * * * bun run ./src/app.ts > /dev/null 2>&1" >> mycron
-crontab mycron
-rm mycron

package.json

@@ -12,7 +12,8 @@
     "dev:init": "bun run ./src/app.ts --init",
     "db:init": "bun run ./run/db_init.ts",
     "db:deleteall": "bun run ./run/db_deleteall.ts",
-    "build": "bun build ./src/app.ts --compile --outfile ./build/77th_event_calendar_notification",
+    "build": "bun build --compile --minify --sourcemap ./src/app.ts --outfile ./build/77th_event_calendar_notification",
+    "build:linux": "bun build --compile --minify --sourcemap --target=bun-linux-arm64 ./src/app.ts --outfile ./build/77th_event_calendar_notification",
     "docker:build": "docker build -t chiko/77th_eventcalendarntfy:0.1.0 ."
   },
   "peerDependencies": {

requirements.txt

@@ -1 +0,0 @@
-apprise

src/app.ts

@@ -1,31 +1,25 @@
 import { TEventType } from "./component/event/event.types";
 import { db } from "./sql";
 import { Event, type TEventEntityNew, type TGetEventsOptions } from "./component/event/events";
+import { createPlaceholders, getTsNow, pad_l2 } from "./util";
 import { sendNotification } from "./sendNotification";
-import { createPlaceholders, pad_l2 } from "./util";
 
 const argv = require('minimist')(process.argv.slice(2));
-console.dir(argv)
+console.log("App started");
+console.dir({argv})
 
-// const TS_TODAY = new Date();
+async function main ( ) {
-
+  console.log("Excecuting main()");
-function getTsNow() {
-  const now = new Date();
-  const rtn = {
-    year: now.getFullYear(),
-    month: now.getMonth() + 1,
-    day: now.getDate(),
-    minute: now.getMinutes(),
-    seconds: now.getSeconds()
-  }
-  return rtn;
-}
-
-async function main( ) {
   const TODAY = getTsNow();
+  console.dir(TODAY);
   const events_currentMonth = await Event.fetch_events( TODAY.year, TODAY.month , -120 );
+  console.log("events_currentMonth.length:" + events_currentMonth.length );
   const events_nextMonth = await Event.fetch_events( TODAY.year, TODAY.month + 1 , -120 );
+  console.log("events_nextMonth.length:" + events_nextMonth.length );
   const events = [...events_currentMonth, ...events_nextMonth];
+  console.log("events.length:" + events.length );
+  
+  // const TS_TODAY = new Date();
   // Write to JSON File Section START
   // const data = JSON.stringify(events, null, 2);
   // const TS = `${TS_TODAY.getFullYear()}-${TS_TODAY.getMonth() + 1}-${TS_TODAY.getDate()}_${TS_TODAY.getHours()}-${TS_TODAY.getMinutes()}-${TS_TODAY.getSeconds()}`;
@@ -33,16 +27,19 @@ async function main( ) {
   // Write to JSON File Section END
 
   const allEventUids = events.map( event => { return event.uid; });
+  console.dir(allEventUids );
   const placeholders = createPlaceholders( allEventUids );
   const getAllRelevantEventsQuery = db.query(
     `SELECT * FROM events WHERE uid IN (${placeholders}); `
   ).as(Event );
   const AllRelevantEvents = getAllRelevantEventsQuery.all(...allEventUids);
-
+  console.log("AllRelevantEvents.length:" + AllRelevantEvents.length );
   const eventsToInsert: TEventEntityNew[] = [];
   for ( const ev of events ) {
+    console.log("loop ev: " + [ ev.uid, ev.title, ev.date_at ].join( ", " ) );
     const found = AllRelevantEvents.find(event => event.uid === ev.uid);
     if ( found ) {
+      console.log("loop ev found: " + [ found.uid, found.title, found.date_at ].join( ", " ) );
       if (
         found.title != ev.title ||
         found.description != ev.description ||
@@ -55,29 +52,34 @@ async function main( ) {
         found.timezone != ev.timezone ||
         found.link != ev.link
       ) {
+        console.log("loop ev different (changed): " + [ ev.uid, ev.title, ev.date_at ].join( ", " ) );
         const newEventToInsert: TEventEntityNew = {... ev, notification: "changed"};
         eventsToInsert.push( newEventToInsert );
       }
     } else {
+      console.log("loop ev added (new): " + [ ev.uid, ev.title, ev.date_at ].join( ", " ) );
       const newEventToInsert: TEventEntityNew = {... ev, notification: "new"};
       eventsToInsert.push( newEventToInsert );
     }
   }
-
+  console.dir(eventsToInsert)
   Event.insert( eventsToInsert, db);
-  const options: TGetEventsOptions = {
+  const where: TGetEventsOptions = {}
-  }
+  where.notification = ["new", "changed"]
-  if (argv.today) {
+  if ( argv.today ) {
-    options.date = {
+    where.date = {
       year: TODAY.year,
       month: TODAY.month,
       day: TODAY.day
     }
-  } else {
-    options.notification = ["new", "changed"]
   }
-  const list_of_events = Event.get_events( options, db );
+  const list_of_events = Event.get_events( where, db );
+  console.dir({
+    list_of_events,
+    where
+  });
   for ( const ev of list_of_events ) {
+    console.log("loop list_of_events - ev: " + [ev.uid, ev.title, ev.date_at, "notification:" + ev.notification].join( ", " ) );
     const body = [
       `Title: ${ev.title}`,
       `Location: ${ev.location}`,
@@ -87,6 +89,7 @@ async function main( ) {
       `By: ${ev.posted_by}`,
       `Link: ${ev.link}`,
     ].join("\n");
+    console.log("loop list_of_events - ev 'body': " + body );
     const notification_prefix = ( (event: Event) => {
       switch( event.notification) {
         case "new":
@@ -112,11 +115,34 @@ async function main( ) {
       }
       return false;
     })( ev );
-    sendNotification(
+    const title = `${today_prefix ? "TODAY " : ""}${notification_prefix ? notification_prefix + ": " : ""} ${ev.title} (${ TEventType[ ev.event_type ] })`;
-      `${today_prefix ? "TODAY " : ""}${notification_prefix ? notification_prefix + ": " : ""} ${ev.title} (${ TEventType[ ev.event_type ] })`,
+<<<<<<< HEAD
-      `${body}`
+    console.log("loop list_of_events - ev 'title': " + title );
-      // `${ev.link || "https://77th-jsoc.com/#/events"}`
+    await sendNotification( title, body, ev.link ? ev.link : null);
-    );
+=======
+
+    await fetch("http://apprise:8000/notify", {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json"
+      },
+      body: JSON.stringify({
+        urls: [
+          `ntfys://${process.env.ntfy_username}:${process.env.ntfy_password}@${process.env.ntfy_host}/${process.env.ntfy_topic}${ ev.link ? `?click=${ev.link}`: "?click=https://77th-jsoc.com/#/events" }`,
+          `discord://${process.env.dc_webhook}?avatar_url=${process.env.dc_avatar_url}&botname=${process.env.dc_botname}`
+        ].join(","),
+        title: title,
+        body: body,
+        format: "text"
+      })
+    });
+    
+    // await sendNotification(
+    //   title,
+    //   body
+    //   // `${ev.link || "https://77th-jsoc.com/#/events"}`
+    // );
+>>>>>>> 999bdf7222a68995dd40ec7da967b360f67d354a
     ev.set_notification("done", db);
   }
 };

src/notification.py

@@ -1,37 +1,41 @@
 from dotenv import load_dotenv
 import os
 
-load_dotenv()  # Load environment variables from .env file
+def main():
-ntfy_username = os.getenv('ntfy_username')
+	load_dotenv()  # Load environment variables from .env file
-ntfy_password = os.getenv('ntfy_password')
+	ntfy_username = os.getenv('ntfy_username')
-ntfy_host = os.getenv('ntfy_host')
+	ntfy_password = os.getenv('ntfy_password')
-ntfy_topic = os.getenv('ntfy_topic')
+	ntfy_host = os.getenv('ntfy_host')
-dc_webhook = os.getenv('dc_webhook')
+	ntfy_topic = os.getenv('ntfy_topic')
-dc_botname = os.getenv('dc_botname')
+	dc_webhook = os.getenv('dc_webhook')
-dc_avatar_url = os.getenv('dc_avatar_url')
+	dc_botname = os.getenv('dc_botname')
+	dc_avatar_url = os.getenv('dc_avatar_url')
 
-from argparse import ArgumentParser
+	from argparse import ArgumentParser
-import apprise
+	import apprise
 
-parser = ArgumentParser()
+	parser = ArgumentParser()
-parser.add_argument("--title")
+	parser.add_argument("--title")
-parser.add_argument("--body")
+	parser.add_argument("--body")
-parser.add_argument("--click")
+	parser.add_argument("--click")
-args = parser.parse_args()
+	args = parser.parse_args()
-print(args)
+	print(args)
 
-apobj = apprise.Apprise()
+	apobj = apprise.Apprise()
-# config = apprise.AppriseConfig()
+	# config = apprise.AppriseConfig()
-# config.add('https://myserver:8080/path/to/config')
+	# config.add('https://myserver:8080/path/to/config')
-if ntfy_host and ntfy_topic:
+	if ntfy_host and ntfy_topic:
-	ntfy_link = f"ntfys://{ntfy_username}:{ntfy_password}@{ntfy_host}/{ntfy_topic}"
+		ntfy_link = f"ntfys://{ntfy_username}:{ntfy_password}@{ntfy_host}/{ntfy_topic}"
-	if args.click:
+		if args.click:
-		ntfy_link = ntfy_link + "?click=" + args.click
+			ntfy_link = ntfy_link + "?click=" + args.click
-	apobj.add(ntfy_link)
+		apobj.add(ntfy_link)
-if dc_webhook:
+	if dc_webhook:
-    apobj.add(f"discord://{dc_webhook}?avatar_url={dc_avatar_url}&botname={dc_botname}");
+		apobj.add(f"discord://{dc_webhook}?avatar_url={dc_avatar_url}&botname={dc_botname}");
 
-apobj.notify(
+	apobj.notify(
-	body=args.body,
+		body=args.body,
-	title=args.title
+		title=args.title
-)
+	)
+
+if __name__ == '__main__':
+	main()

src/sendNotification.ts

@@ -1,14 +1,45 @@
+<<<<<<< HEAD
+export async function sendNotification(title: string, body: string, link?: string | null) {
+  console.dir({
+    sendNotification: {
+      title,
+      body,
+      link
+    }
+  });
+  const response = await fetch("http://apprise:8000/notify", {
+    method: "POST",
+    headers: {
+    "Content-Type": "application/json"
+    },
+    body: JSON.stringify({
+    urls: [
+        `ntfys://${process.env.ntfy_username}:${process.env.ntfy_password}@${process.env.ntfy_host}/${process.env.ntfy_topic}${ link ? `?click=${link}`: "?click=https://77th-jsoc.com/#/events" }`,
+        `discord://${process.env.dc_webhook}?avatar_url=${process.env.dc_avatar_url}&botname=${process.env.dc_botname}`
+    ].join(","),
+    title: title,
+    body: body,
+    format: "text"
+    })
+  });
+  const responseBody = await response.json();
+  return responseBody;
+} 
+=======
 import * as Bun from "bun";
 
-export function sendNotification(title: string, body: string, click?: string | null) {
+export async function sendNotification(title: string, body: string, click?: string | null) {
     const command = [
-        "python",
+        "python3",
-        "./app/notification.py",
+        "./src/notification.py",
         `--title=${title}`,
         `--body=${body}`,
     ];
-    if (click) {
+    if ( click ) {
         command.push(`--click=${click}`);
     }
-    Bun.spawn(command);
+    const proc = Bun.spawn(command);
+    const text = await proc.stdout.text();
+    console.log("sendNotification: " + text);
 }
+>>>>>>> 999bdf7222a68995dd40ec7da967b360f67d354a

src/sendNotificationPy.ts

@@ -0,0 +1,16 @@
+import * as Bun from "bun";
+
+export async function sendNotificationPy(title: string, body: string, click?: string | null) {
+    const command = [
+        "python3",
+        "./src/notification.py",
+        `--title=${title}`,
+        `--body=${body}`,
+    ];
+    if ( click ) {
+        command.push(`--click=${click}`);
+    }
+    const proc = Bun.spawn(command);
+    const text = await proc.stdout.text();
+    console.log("sendNotification: " + text);
+}

src/sql.ts

@@ -11,3 +11,5 @@ export const db = new Database(db_filepath);
 export function init () {
   Event.createTable(db);
 }
+
+init();

src/util.ts

@@ -27,3 +27,15 @@ export function pad_l2 ( _thing: string | number ): string {
   };
   return _thing.padStart(2, "0");
 }
+
+export function getTsNow() {
+  const now = new Date();
+  const rtn = {
+    year: now.getFullYear(),
+    month: now.getMonth() + 1,
+    day: now.getDate(),
+    minute: now.getMinutes(),
+    seconds: now.getSeconds()
+  }
+  return rtn;
+}