chore: fixed some things regarding apis

Author: ovflowd

create-node-meeting-artifacts.mjs

@@ -18,18 +18,18 @@ import * as meetings from './src/meeting.mjs';
 // Step 1: Application configuration
 const config = getConfig();
 
-// Step 2: Initialize Google Calendar client with API Key
+// Step 2: Initialize HackMD client with meeting configuration
+const hackmdClient = hackmd.createHackMDClient(config);
+
+// Step 3: Initialize Google Calendar client with API Key
 const calendarClient = google.createCalendarClient(config.google);
 
-// Step 3: Initialize GitHub client
+// Step 4: Initialize GitHub client
 const githubClient = github.createGitHubClient(config);
 
-// Step 4: Read meeting configuration from templates
+// Step 5: Read meeting configuration from templates
 const meetingConfig = await meetings.readMeetingConfig(config);
 
-// Step 5: Initialize HackMD client with meeting configuration
-const hackmdClient = hackmd.createHackMDClient(config, meetingConfig);
-
 // Step 6: Find next meeting event in calendar
 const event = await google.findNextMeetingEvent(calendarClient, meetingConfig);
 
@@ -56,11 +56,12 @@ const meetingAgenda = meetings.generateMeetingAgenda(
   meetingConfig
 );
 
-// Step 11: Create HackMD document with meeting notes
+// Step 11: Create HackMD document with meeting notes and tags
 const hackmdNote = await hackmd.createMeetingNotesDocument(
   hackmdClient,
   meetingTitle,
-  ''
+  '',
+  meetingConfig
 );
 
 // Step 12: Get the HackMD document link
@@ -76,7 +77,7 @@ const issueContent = await meetings.generateMeetingIssue(
   minutesDocLink
 );
 
-// Step 14: Create GitHub issue with HackMD link
+// // Step 14: Create GitHub issue with HackMD link
 const githubIssue = await github.createGitHubIssue(
   githubClient,
   meetingConfig,
@@ -98,7 +99,8 @@ const minutesContent = await meetings.generateMeetingMinutes(
 await hackmd.updateMeetingNotesDocument(
   hackmdClient,
   hackmdNote.id,
-  minutesContent
+  minutesContent,
+  meetingConfig
 );
 
 // Output success information with links

global.d.ts

@@ -5,14 +5,14 @@
 
 import type { calendar_v3 } from '@googleapis/calendar';
 import type { RestEndpointMethodTypes } from '@octokit/rest';
-import type { HackMDAPI } from '@hackmd/api';
+import type { API } from '@hackmd/api';
 import type { SingleNote } from '@hackmd/api/dist/type.d.ts';
 
 declare global {
   // Google API type aliases
   type CalendarEvent = calendar_v3.Schema$Event;
   type CalendarClient = calendar_v3.Calendar;
-  type HackMDClient = HackMDAPI;
+  type HackMDClient = API;
   type HackMDNote = SingleNote;
 
   // GitHub API type aliases

src/google.mjs

@@ -1,7 +1,5 @@
 import { calendar } from '@googleapis/calendar';
 
-import { TIME_CONSTANTS } from './constants.mjs';
-
 /**
  * Creates an authenticated Google Calendar client using API Key
  * @param {import('./types.d.ts').GoogleConfig} gConfig - Google configuration object
@@ -11,21 +9,33 @@ export const createCalendarClient = ({ apiKey: auth }) =>
   calendar({ version: 'v3', auth });
 
 /**
- * Finds the next meeting event in Google Calendar within the next week
+ * Finds the next meeting event in Google Calendar for the current week
  * @param {import('@googleapis/calendar').calendar_v3.Calendar} calendarClient - Google Calendar client
  * @param {import('./types.d.ts').MeetingConfig} meetingConfig - Meeting configuration object
  * @returns {Promise<CalendarEvent>} Calendar event object
  */
 export const findNextMeetingEvent = async (calendarClient, meetingConfig) => {
   const now = new Date();
 
-  const nextWeek = new Date(now.getTime() + TIME_CONSTANTS.WEEK_IN_MS);
+  // Calculate the start of the current week (Saturday 00:00:00 UTC)
+  // This handles the scenario where we want a full week from Saturday to Friday
+  const daysSinceStartOfWeek = (now.getUTCDay() + 1) % 7; // Saturday = 0, Sunday = 1, ..., Friday = 6
+  const weekStart = new Date(now);
+
+  weekStart.setUTCDate(now.getUTCDate() - daysSinceStartOfWeek);
+  weekStart.setUTCHours(0, 0, 0, 0);
+
+  // Calculate the end of the week (Friday 23:59:59 UTC)
+  const weekEnd = new Date(weekStart);
+
+  weekEnd.setUTCDate(weekStart.getUTCDate() + 6);
+  weekEnd.setUTCHours(23, 59, 59, 999);
 
   // Search for events in the specified calendar using the filter text
   const response = await calendarClient.events.list({
     calendarId: meetingConfig.properties.CALENDAR_ID?.replace(/"/g, ''),
-    timeMin: now.toISOString(),
-    timeMax: nextWeek.toISOString(),
+    timeMin: weekStart.toISOString(),
+    timeMax: weekEnd.toISOString(),
     singleEvents: true,
     // Replace spaces with dots for Google Calendar search compatibility
     q: meetingConfig.properties.CALENDAR_FILTER?.replace(/"/g, '').replace(
@@ -36,7 +46,11 @@ export const findNextMeetingEvent = async (calendarClient, meetingConfig) => {
 
   // Ensure we found at least one event
   if (!response.data.items || response.data.items.length === 0) {
-    throw new Error('Could not find calendar event for the next week');
+    throw new Error(
+      `No meeting found for ${meetingConfig?.properties?.GROUP_NAME || 'this group'} ` +
+        `in the current week (${weekStart.toISOString().split('T')[0]} to ${weekEnd.toISOString().split('T')[0]}). ` +
+        `This is expected for bi-weekly meetings or meetings that don't occur every week.`
+    );
   }
 
   // Return the first (next) event found

src/hackmd.mjs

@@ -5,36 +5,65 @@ import { HACKMD_DEFAULT_PERMISSIONS } from './constants.mjs';
 /**
  * Creates a HackMD API client
  * @param {import('./types.d.ts').AppConfig} config - Application configuration
- * @param {import('./types.d.ts').MeetingConfig} meetingConfig - Meeting configuration
  * @returns {HackMDClient} Configured HackMD API client
  */
-export const createHackMDClient = ({ hackmd: { apiToken } }, meetingConfig) => {
-  // Use team-specific API endpoint if teamName is provided in meeting config
-  const teamName = meetingConfig.properties.HACKMD_TEAM_NAME;
-
-  const baseURL = teamName
-    ? `https://api.hackmd.io/v1/teams/${teamName}`
-    : 'https://api.hackmd.io/v1';
-
-  return new HackMDAPI(apiToken, baseURL);
+export const createHackMDClient = ({ hackmd: { apiToken } }) => {
+  return new HackMDAPI(apiToken);
 };
 
 /**
- * Creates a new meeting notes document in HackMD
+ * Creates a new meeting notes document in HackMD with appropriate tags
  * @param {HackMDAPI} hackmdClient - HackMD API client
  * @param {string} title - Document title
  * @param {string} content - Document content in Markdown
+ * @param {import('./types.d.ts').MeetingConfig} meetingConfig - Meeting configuration for tags
  * @returns {Promise<HackMDNote>} Created note data with ID and URLs
  */
-export const createMeetingNotesDocument = (hackmdClient, title, content) =>
-  hackmdClient.createNote({ title, content, ...HACKMD_DEFAULT_PERMISSIONS });
+export const createMeetingNotesDocument = (
+  hackmdClient,
+  title,
+  content,
+  meetingConfig
+) => {
+  const meetingTag =
+    meetingConfig?.properties?.GROUP_NAME ??
+    meetingConfig?.properties?.AGENDA_TAG;
+
+  const teamName = meetingConfig?.properties?.HACKMD_TEAM_NAME;
+
+  const noteOptions = {
+    title,
+    content,
+    tags: [meetingTag, 'Meetings'],
+    ...HACKMD_DEFAULT_PERMISSIONS,
+  };
+
+  if (teamName) {
+    return hackmdClient.createTeamNote(teamName, noteOptions);
+  }
+
+  return hackmdClient.createNote(noteOptions);
+};
 
 /**
- * Updates an existing meeting notes document in HackMD
+ * Updates an existing meeting notes document in HackMD with retry logic
  * @param {HackMDClient} hackmdClient - HackMD API client
  * @param {string} noteId - HackMD note ID
  * @param {string} content - Updated document content in Markdown
+ * @param {import('./types.d.ts').MeetingConfig} meetingConfig - Meeting configuration for team context
  * @returns {Promise<HackMDNote>} Updated note data
  */
-export const updateMeetingNotesDocument = (hackmdClient, noteId, content) =>
-  hackmdClient.updateNote(noteId, { content });
+export const updateMeetingNotesDocument = (
+  hackmdClient,
+  noteId,
+  content,
+  meetingConfig
+) => {
+  const teamName = meetingConfig?.properties?.HACKMD_TEAM_NAME;
+
+  if (teamName) {
+    return hackmdClient.updateTeamNote(teamName, noteId, { content });
+  }
+
+  return hackmdClient.updateNote(noteId, { content });
+};