fix: removed previously commented out code and re-enabled some husky …

…features
lnco-epfl · Sep 13, 2024 · 8d95a00 · 8d95a00
1 parent 5bbce5c
commit 8d95a00
Show file tree

Hide file tree

Showing 8 changed files with 3 additions and 365 deletions.
diff --git a/.husky/install.mjs b/.husky/install.mjs
@@ -4,5 +4,5 @@
 if (process.env.NODE_ENV === 'production' || process.env.CI === 'true') {
   process.exit(0);
 }
-//const husky = (await import('husky')).default;
-//husky.install();
+const husky = (await import('husky')).default;
+husky.install();
diff --git a/docs/meilisearch-integration.excalidraw.png b/docs/meilisearch-integration.excalidraw.png
diff --git a/docs/meilisearch.md b/docs/meilisearch.md
diff --git a/src/di/container.ts b/src/di/container.ts
@@ -1,26 +1,13 @@
 import { Redis } from 'ioredis';
 
-// import { MeiliSearch } from 'meilisearch';
 import { FastifyInstance } from 'fastify';
 
-// import Etherpad from '@graasp/etherpad-api';
-// import { CRON_3AM_MONDAY, JobServiceBuilder } from '../jobs';
 import { BaseLogger } from '../logger';
 import { MailerService } from '../plugins/mailer/service';
-// import FileService from '../services/file/service';
 import { fileRepositoryFactory } from '../services/file/utils/factory';
-
-/*
-import { wrapEtherpadErrors } from '../services/item/plugins/etherpad/etherpad';
-import { RandomPadNameFactory } from '../services/item/plugins/etherpad/service';
-import { EtherpadServiceConfig } from '../services/item/plugins/etherpad/serviceConfig';
-*/
 import FileItemService from '../services/item/plugins/file/service';
-// import { H5PService } from '../services/item/plugins/html/h5p/service';
 import { ImportExportService } from '../services/item/plugins/importExport/service';
 import { PublicationService } from '../services/item/plugins/publication/publicationState/service';
-// import { MeiliSearchWrapper } from '../services/item/plugins/publication/published/plugins/search/meilisearch';
-// import { SearchService } from '../services/item/plugins/publication/published/plugins/search/service';
 import { ValidationQueue } from '../services/item/plugins/publication/validation/validationQueue';
 import { ItemService } from '../services/item/service';
 import {
@@ -34,8 +21,6 @@ import {
   MAILER_CONFIG_SMTP_PORT,
   MAILER_CONFIG_SMTP_USE_SSL,
   MAILER_CONFIG_USERNAME,
-  /*MEILISEARCH_MASTER_KEY,
-MEILISEARCH_URL,*/
   REDIS_HOST,
   REDIS_PASSWORD,
   REDIS_PORT,
@@ -44,7 +29,6 @@ MEILISEARCH_URL,*/
 } from '../utils/config';
 import { buildRepositories } from '../utils/repositories';
 import {
-  // ETHERPAD_NAME_FACTORY_DI_KEY,
   FASTIFY_LOGGER_DI_KEY,
   FILE_ITEM_TYPE_DI_KEY,
   FILE_REPOSITORY_DI_KEY,
@@ -99,57 +83,6 @@ export const registerDependencies = (instance: FastifyInstance) => {
     }),
   );
 
-  /* register MeiliSearch and its wrapper.
-  registerValue(
-    MeiliSearch,
-    new MeiliSearch({
-      host: MEILISEARCH_URL,
-      apiKey: MEILISEARCH_MASTER_KEY,
-    }),
-  );
-
-  // Will be registered automatically when db will be injectable.
-  registerValue(
-    MeiliSearchWrapper,
-    new MeiliSearchWrapper(
-      db,
-      resolveDependency(MeiliSearch),
-      resolveDependency(FileService),
-      resolveDependency(BaseLogger),
-    ),
-  );
-  */
-
-  /*
-  // Launch Job workers
-  const jobServiceBuilder = new JobServiceBuilder(resolveDependency(BaseLogger));
-  jobServiceBuilder
-    .registerTask('rebuild-index', {
-      handler: () => resolveDependency(SearchService).rebuildIndex(),
-      pattern: CRON_3AM_MONDAY,
-    })
-    .build();
-  */
-
-  /*
-  // Register EtherPad
-  const etherPadConfig = resolveDependency(EtherpadServiceConfig);
-
-  // connect to etherpad server
-  registerValue(
-    Etherpad,
-    wrapEtherpadErrors(
-      new Etherpad({
-        url: etherPadConfig.url,
-        apiKey: etherPadConfig.apiKey,
-        apiVersion: etherPadConfig.apiVersion,
-      }),
-    ),
-  );
-
-  registerValue(ETHERPAD_NAME_FACTORY_DI_KEY, new RandomPadNameFactory());
-  */
-
   registerValue(
     ImportExportService,
     new ImportExportService(

diff --git a/src/jobs.ts b/src/jobs.ts
diff --git a/src/plugins/meta.ts b/src/plugins/meta.ts
@@ -5,8 +5,6 @@ import { FastifyPluginAsync } from 'fastify';
 
 import { UnionOfConst } from '@graasp/sdk';
 
-// import { resolveDependency } from '../di/utils';
-// import { SearchService } from '../services/item/plugins/publication/published/plugins/search/service';
 import {
   EMBEDDED_LINK_ITEM_IFRAMELY_HREF_ORIGIN,
   /*, ETHERPAD_URL */
@@ -71,22 +69,16 @@ class UnHealthyStatus extends ServiceStatus {
 const plugin: FastifyPluginAsync = async (fastify) => {
   fastify.get('/status', async (_, reply) => {
     const { db } = fastify;
-    // const searchService = resolveDependency(SearchService);
     const api = new HealthyStatus().format();
     const database = (await getDBStatusCheck(db.manager)).format();
-    // const etherpad = (await getEtherpadStatusCheck()).format();
-    // const meilisearch = (await getSearchStatusCheck(searchService)).format();
     const iframely = (await getIframelyStatusCheck()).format();
 
     // allow request cross origin
     reply.header('Access-Control-Allow-Origin', '*');
     return {
       api,
       database,
-      // meilisearch,
-      // etherpad,
       iframely,
-      // add nudenet, etc...
     };
   });
 };
@@ -108,25 +100,6 @@ const getDBStatusCheck = async (manager: EntityManager): Promise<ServiceStatus>
   }
 };
 
-/*
-const getEtherpadStatusCheck = async (): Promise<ServiceStatus> => {
-  try {
-    const etherpadApiEndpoint = new URL(`${ETHERPAD_URL}/api`);
-    const res = await fetch(etherpadApiEndpoint.toString());
-    if (res.ok) {
-      const response = (await res.json()) satisfies { currentVersion: string };
-      return new HealthyStatus(`Running ${response.currentVersion}`);
-    }
-    return new UnHealthyStatus('Etherpad');
-  } catch (err) {
-    if (err.code === 'ENOTFOUND') {
-      return new UnreachableStatus();
-    }
-    return new UnexpectedErrorStatus(err);
-  }
-};
-*/
-
 const getIframelyStatusCheck = async (): Promise<ServiceStatus> => {
   try {
     const iframelyEndpoint = new URL(`${EMBEDDED_LINK_ITEM_IFRAMELY_HREF_ORIGIN}/iframely`);
@@ -144,21 +117,4 @@ const getIframelyStatusCheck = async (): Promise<ServiceStatus> => {
   }
 };
 
-/*
-const getSearchStatusCheck = async (search: SearchService): Promise<ServiceStatus> => {
-  try {
-    const res = await search.getHealth();
-    if (res.status) {
-      return new HealthyStatus();
-    }
-    return new UnHealthyStatus('Meilisearch');
-  } catch (err) {
-    if (err.code === 'ENOTFOUND') {
-      return new UnreachableStatus();
-    }
-    return new UnexpectedErrorStatus(err);
-  }
-};
-*/
-
 export default plugin;