Add @nordeck/matrix-meetings-calendar package and move dateTimeUtils …

…into it.

Signed-off-by: Mikhail Aheichyk <[email protected]>

.changeset/cuddly-rings-beam.md

@@ -0,0 +1,6 @@
+---
+'@nordeck/matrix-meetings-widget': patch
+'@nordeck/matrix-meetings-bot': patch
+---
+
+Use `@nordeck/matrix-meetings-calendar` package.

.changeset/heavy-glasses-shout.md

@@ -0,0 +1,5 @@
+---
+'@nordeck/matrix-meetings-calendar': major
+---
+
+Initial release

.dockerignore

@@ -5,3 +5,5 @@
 !/matrix-meetings-bot/conf
 !/matrix-meetings-bot/lib
 !/resolutions/matrix-sdk-crypto-nodejs
+!/packages/calendar/package.json
+!/packages/calendar/lib

.github/workflows/ci.yml

@@ -32,6 +32,10 @@ jobs:
       - name: type checking and declarations
         run: yarn tsc
 
+      - name: Check Calendar Linting Rules
+        working-directory: ./packages/calendar/
+        run: yarn run lint
+
       - name: Check Linting Rules
         working-directory: ./matrix-meetings-widget/
         run: yarn run lint
@@ -40,6 +44,10 @@ jobs:
         working-directory: ./matrix-meetings-widget/
         run: yarn translate --fail-on-update
 
+      - name: test calendar
+        working-directory: ./packages/calendar/
+        run: yarn test:all
+
       - name: test
         working-directory: ./matrix-meetings-widget/
         run: yarn test:all
@@ -111,6 +119,10 @@ jobs:
       - name: type checking and declarations
         run: yarn tsc
 
+      - name: Check Calendar Linting Rules
+        working-directory: ./packages/calendar/
+        run: yarn run lint
+
       - name: Check Linting Rules
         working-directory: ./matrix-meetings-bot/
         run: yarn run lint
@@ -119,6 +131,10 @@ jobs:
         working-directory: ./matrix-meetings-bot/
         run: yarn translate --fail-on-update
 
+      - name: test calendar
+        working-directory: ./packages/calendar/
+        run: yarn test:all
+
       - name: test
         working-directory: ./matrix-meetings-bot/
         run: yarn test:all

.prettierignore

@@ -2,6 +2,7 @@
 **/coverage/
 matrix-meetings-bot/lib/
 matrix-meetings-bot/storage
+packages/calendar/lib
 
 # Ignore the helm chart
 charts/

matrix-meetings-bot/Dockerfile

@@ -4,6 +4,8 @@ WORKDIR /build
 COPY package.json yarn.lock ./
 COPY matrix-meetings-bot/package.json ./matrix-meetings-bot/
 COPY resolutions/matrix-sdk-crypto-nodejs ./resolutions/matrix-sdk-crypto-nodejs/
+COPY packages/calendar/package.json ./packages/calendar/package.json
+COPY packages/calendar/lib ./packages/calendar/lib
 RUN yarn install --production --frozen-lockfile --network-timeout 1000000
 
 FROM node:20-alpine3.19
@@ -15,6 +17,7 @@ RUN set -x\
     && chmod -R g+w /app/storage
 USER 101
 COPY --from=node_modules /build/node_modules/ ./node_modules
+COPY --from=node_modules /build/packages/calendar/ ./packages/calendar/
 COPY matrix-meetings-bot/conf ./conf
 COPY matrix-meetings-bot/lib ./lib
 CMD ["node", "./lib/index.js"]

matrix-meetings-bot/package.json

@@ -45,11 +45,12 @@
     "html-entities": "^2.4.0",
     "i18next": "^23.7.14",
     "i18next-fs-backend": "^2.3.1",
-    "joi": "^17.11.0",
     "i18next-http-middleware": "^3.5.0",
+    "joi": "^17.11.0",
     "lodash": "^4.17.20",
     "luxon": "^3.3.0",
     "matrix-bot-sdk": "^0.7.0",
+    "@nordeck/matrix-meetings-calendar": "0.0.1",
     "mime-types": "^2.1.35",
     "mustache": "^4.2.0",
     "nestjs-pino": "^3.5.0",
@@ -109,7 +110,10 @@
     "roots": [
       "<rootDir>/src",
       "<rootDir>/test"
-    ]
+    ],
+    "moduleNameMapper": {
+      "matrix-meetings-(.*)": "<rootDir>/../packages/$1/src/index.ts"
+    }
   },
   "files": [
     "test/*",

matrix-meetings-bot/src/client/JitsiClient.ts

@@ -24,7 +24,7 @@ import { MeetingSharingInformationDto } from '../dto/MeetingSharingInformationDt
 export class JitsiClient {
   private logger = new Logger(JitsiClient.name);
 
-  private cached_jitsi_dial_in_numbers = null;
+  private cached_jitsi_dial_in_numbers: unknown = null;
 
   constructor(
     @Inject(ModuleProviderToken.APP_CONFIGURATION)
@@ -110,7 +110,7 @@ export class JitsiClient {
         );
         const response = await fetch(url, { method: 'get' });
         if (response.ok) {
-          result = (await response.json()).id;
+          result = ((await response.json()) as any).id;
         } else {
           this.logger.error(
             `Could not fetch jitsi_pin_url ${this.appConfig.jitsi_pin_url} ${

matrix-meetings-bot/src/middleware/MatrixAuthMiddleware.ts

@@ -127,8 +127,7 @@ export class MatrixAuthMiddleware implements NestMiddleware {
 
     if (response.ok) {
       const result = await response.json();
-      const userId = result.sub;
-      return userId;
+      return (result as any).sub; // user id
     } else {
       const text = await response.text();
       const status = response.status;
@@ -156,7 +155,7 @@ export class MatrixAuthMiddleware implements NestMiddleware {
     }
     if (response.ok) {
       const json = await response.json();
-      return json.user_id;
+      return (json as any).user_id;
     } else {
       const text = await response.text();
       const status = response.status;

matrix-meetings-bot/src/service/RoomMessageService.ts

@@ -15,6 +15,7 @@
  */
 
 import { Injectable, Logger } from '@nestjs/common';
+import { parseICalDate } from '@nordeck/matrix-meetings-calendar';
 import i18next from 'i18next';
 import { MatrixClient } from 'matrix-bot-sdk';
 import { MatrixEndpoint } from '../MatrixEndpoint';
@@ -24,7 +25,6 @@ import { ISyncParams } from '../matrix/dto/ISyncParams';
 import { IMeeting } from '../model/IMeeting';
 import { IUserContext } from '../model/IUserContext';
 import { StateEventName } from '../model/StateEventName';
-import { parseICalDate } from '../shared';
 import { formatRRuleText } from '../shared/format';
 import { IMeetingChanges } from '../util/IMeetingChanges';
 

matrix-meetings-bot/src/shared/calendarUtils/extractCalendarChange.ts

@@ -14,9 +14,12 @@
  * limitations under the License.
  */
 
+import {
+  formatICalDate,
+  parseICalDate,
+} from '@nordeck/matrix-meetings-calendar';
 import { differenceWith, isEqual } from 'lodash';
 import { CalendarEntryDto, DateTimeEntryDto } from '../../dto/CalendarEntryDto';
-import { formatICalDate, parseICalDate } from '../dateTimeUtils';
 import { isRRuleEntry, isRRuleOverrideEntry, isSingleEntry } from './helpers';
 
 export type CalendarChange =

matrix-meetings-bot/src/shared/calendarUtils/generateRruleSet.ts

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
+import { parseICalDate } from '@nordeck/matrix-meetings-calendar';
 import { DateTime } from 'luxon';
 import { RRule, RRuleSet } from 'rrule';
 import { CalendarEntryDto } from '../../dto/CalendarEntryDto';
-import { parseICalDate } from '../dateTimeUtils';
 import { isFiniteSeries } from './helpers';
 
 export function generateRruleSet(entry: CalendarEntryDto & { rrule: string }): {

matrix-meetings-bot/src/shared/calendarUtils/getCalendarEnd.ts

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
+import { parseICalDate } from '@nordeck/matrix-meetings-calendar';
 import { max } from 'lodash';
 import { DateTime } from 'luxon';
 import { CalendarEntryDto } from '../../dto/CalendarEntryDto';
-import { parseICalDate } from '../dateTimeUtils';
 import { generateRruleSet } from './generateRruleSet';
 import { isRRuleEntry, isRRuleOverrideEntry, isSingleEntry } from './helpers';
 

matrix-meetings-bot/src/shared/index.ts

@@ -15,4 +15,3 @@
  */
 
 export { getForceDeletionTime } from './calendarUtils';
-export { formatICalDate, parseICalDate, toISOString } from './dateTimeUtils';

matrix-meetings-bot/src/util/TemplateHelper.ts

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
+import { parseICalDate } from '@nordeck/matrix-meetings-calendar';
 import i18next from 'i18next';
 import { fullNumericDateFormat } from '../dateFormat';
 import { CalendarEntryDto } from '../dto/CalendarEntryDto';
 import { IUserContext } from '../model/IUserContext';
-import { parseICalDate } from '../shared';
 import { getSingleOrRecurringEntry } from '../shared/calendarUtils';
 import { formatRRuleText } from '../shared/format';
 

matrix-meetings-bot/src/util/migrateMeetingTime.ts

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
+import { formatICalDate } from '@nordeck/matrix-meetings-calendar';
 import { DateTime } from 'luxon';
 import { v4 as uuiv4 } from 'uuid';
 import { CalendarEntryDto } from '../dto/CalendarEntryDto';
-import { formatICalDate } from '../shared';
 
 export interface IMeetingTime {
   start_time?: string;

matrix-meetings-bot/tsconfig.json

@@ -5,6 +5,7 @@
     "emitDecoratorMetadata": true,
     "module": "commonjs",
     "target": "es6",
+    "lib": ["esnext"],
     "noImplicitAny": true,
     "sourceMap": true,
     "outDir": "./lib",

matrix-meetings-widget/craco.config.js

@@ -15,7 +15,10 @@
  */
 
 module.exports = {
-  plugins: [{ plugin: require('./scripts/craco/ignoreRRuleWarnings') }],
+  plugins: [
+    { plugin: require('./scripts/craco/ignoreRRuleWarnings') },
+    { plugin: importLocalPackages() },
+  ],
 
   webpack: {
     configure: {
@@ -28,3 +31,31 @@ module.exports = {
     },
   },
 };
+
+/**
+ * Craco plugin for using local packages from the same mono repository.
+ */
+function importLocalPackages() {
+  const path = require('path');
+  const { getLoader, loaderByName } = require('@craco/craco');
+  const absolutePath = path.join(__dirname, '../packages');
+
+  function overrideWebpackConfig({ webpackConfig }) {
+    const { isFound, match } = getLoader(
+      webpackConfig,
+      loaderByName('babel-loader'),
+    );
+    if (isFound) {
+      const include = Array.isArray(match.loader.include)
+        ? match.loader.include
+        : [match.loader.include];
+
+      match.loader.include = include.concat(absolutePath);
+    }
+    return webpackConfig;
+  }
+
+  return {
+    overrideWebpackConfig,
+  };
+}

matrix-meetings-widget/package.json

@@ -26,6 +26,7 @@
     "joi": "^17.11.0",
     "lodash": "^4.17.20",
     "luxon": "^3.3.0",
+    "@nordeck/matrix-meetings-calendar": "0.0.1",
     "matrix-widget-api": "^1.5.0",
     "mustache": "^4.2.0",
     "react": "^17.0.2",
@@ -103,7 +104,10 @@
   "jest": {
     "transformIgnorePatterns": [
       "(?!(/node_modules/(@fullcalendar)/))(/node_modules/.+.(js|jsx|mjs|cjs|ts|tsx)$)"
-    ]
+    ],
+    "moduleNameMapper": {
+      "matrix-meetings-(.*)": "<rootDir>/../packages/$1/src/index.ts"
+    }
   },
   "repository": {
     "type": "git",

matrix-meetings-widget/src/components/meetings/MeetingCardShareMeetingContent/useDownloadIcsFile.ts

@@ -14,12 +14,17 @@
  * limitations under the License.
  */
 
+import {
+  CalendarEntry,
+  DateTimeEntry,
+  formatICalDate,
+  parseICalDate,
+} from '@nordeck/matrix-meetings-calendar';
 import { isArray, uniq } from 'lodash';
 import { DateTime } from 'luxon';
 import { useEffect, useMemo, useState } from 'react';
 import { tzlib_get_ical_block } from 'timezones-ical-library';
-import { CalendarEntry, DateTimeEntry } from '../../../lib/matrix';
-import { formatICalDate, isDefined, parseICalDate } from '../../../lib/utils';
+import { isDefined } from '../../../lib/utils';
 import {
   Meeting,
   selectNordeckMeetingMetadataEventByRoomId,

matrix-meetings-widget/src/components/meetings/MeetingCardShareMeetingContent/useMeetingEmail.ts

@@ -14,12 +14,10 @@
  * limitations under the License.
  */
 
+import { parseICalDate } from '@nordeck/matrix-meetings-calendar';
 import { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
-import {
-  isRecurringCalendarSourceEntry,
-  parseICalDate,
-} from '../../../lib/utils';
+import { isRecurringCalendarSourceEntry } from '../../../lib/utils';
 import { Meeting } from '../../../reducer/meetingsApi';
 import { fullNumericDateFormat } from '../../common/DateTimePickers';
 import { formatRRuleText } from '../RecurrenceEditor/utils';

matrix-meetings-widget/src/components/meetings/ScheduleMeetingModal/ScheduleMeeting.tsx

@@ -26,14 +26,14 @@ import {
   TextField,
 } from '@mui/material';
 import { unstable_useId as useId, visuallyHidden } from '@mui/utils';
+import { parseICalDate } from '@nordeck/matrix-meetings-calendar';
 import { DateTime } from 'luxon';
 import { ChangeEvent, useCallback, useEffect, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import {
   getInitialMeetingTimes,
   isBotUser,
   isRecurringCalendarSourceEntry,
-  parseICalDate,
 } from '../../../lib/utils';
 import {
   Meeting,

matrix-meetings-widget/src/components/meetings/ScheduleMeetingModal/ScheduleMeetingModal.tsx

@@ -15,12 +15,9 @@
  */
 
 import { useWidgetApi } from '@matrix-widget-toolkit/react';
+import { parseICalDate, toISOString } from '@nordeck/matrix-meetings-calendar';
 import { useEffect, useMemo, useState } from 'react';
-import {
-  isRecurringCalendarSourceEntry,
-  parseICalDate,
-  toISOString,
-} from '../../../lib/utils';
+import { isRecurringCalendarSourceEntry } from '../../../lib/utils';
 import { Meeting } from '../../../reducer/meetingsApi';
 import { EditRecurringMessage } from './EditRecurringMessage';
 import { ScheduleMeeting } from './ScheduleMeeting';

matrix-meetings-widget/src/components/meetings/ScheduleMeetingModal/editMeetingThunk.tsx

@@ -14,12 +14,15 @@
  * limitations under the License.
  */
 
+import {
+  CalendarEntry,
+  formatICalDate,
+} from '@nordeck/matrix-meetings-calendar';
 import { createAsyncThunk } from '@reduxjs/toolkit';
 import { t } from 'i18next';
 import { DateTime } from 'luxon';
 import { ModalButtonKind } from 'matrix-widget-api';
-import { CalendarEntry } from '../../../lib/matrix';
-import { formatICalDate, normalizeCalendarEntry } from '../../../lib/utils';
+import { normalizeCalendarEntry } from '../../../lib/utils';
 import { overrideCalendarEntries } from '../../../lib/utils/calendarUtils/overrideCalendarEntries';
 import { meetingBotApi } from '../../../reducer/meetingBotApi';
 import {