Fixed shared types generation

.gitignore

@@ -55,3 +55,7 @@ Thumbs.db
 
 
 backend/public/
+
+frontend/projects/shared-call-components/src/lib/typings/
+
+backend/src/typings/

backend/package.json

@@ -26,8 +26,8 @@
 		"dev:start": "cross-env USE_HTTPS=false SERVER_CORS_ORIGIN=* nodemon -I --exec node --experimental-specifier-resolution=node --loader ts-node/esm ./src/server.ts",
 		"lint": "eslint src --fix",
 		"format": "prettier --ignore-path .gitignore --write '**/*.{ts,js,json,md}'",
-		"pack": "npm pack",
-		"dev:sync-call-pro": "npm run build && npm run pack && cp openvidu-call-server-**.tgz ../../openvidu-call-pro/backend && cd ../../openvidu-call-pro/backend && npm install openvidu-call-server-**.tgz "
+		"package": "npm run build && npm pack",
+		"lib:sync-call-pro": "npm run package && cp openvidu-call-server-*.tgz ../../openvidu-call-pro/backend"
 	},
 	"dependencies": {
 		"@aws-sdk/client-s3": "3.673.0",
@@ -51,7 +51,6 @@
 		"@types/cors": "2.8.17",
 		"@types/express": "4.17.21",
 		"@types/node": "^20.12.14",
-		"@types/openvidu-call": "file:types-openvidu-call-1.0.0.tgz",
 		"@types/swagger-jsdoc": "^6.0.4",
 		"@types/swagger-ui-express": "^4.1.6",
 		"@types/validator": "^13.12.2",
@@ -65,8 +64,5 @@
 		"prettier": "3.3.3",
 		"ts-node": "10.9.2",
 		"typescript": "5.4.5"
-	},
-	"peerDependencies": {
-		"@types/openvidu-call": "file:types-openvidu-call-1.0.0.tgz"
 	}
 }

backend/src/controllers/embedded.controller.ts

@@ -1,7 +1,7 @@
 import { Request, Response } from 'express';
 import { LoggerService } from '../services/logger.service.js';
 import { LiveKitService } from '../services/livekit.service.js';
-import { TokenOptions } from 'openvidu-call';
+import { TokenOptions } from '@typings-ce';
 
 const logger = LoggerService.getInstance();
 const livekitService = LiveKitService.getInstance();

backend/src/controllers/global-preferences/global-preferences.controller.ts

@@ -1,7 +1,7 @@
 import { Request, Response } from 'express';
 import { CALL_PRIVATE_ACCESS } from '../../config.js';
 import { LoggerService } from '../../services/logger.service.js';
-import { GlobalPreferences } from 'openvidu-call';
+import { GlobalPreferences } from '@typings-ce';
 
 const logger = LoggerService.getInstance();
 

backend/src/controllers/global-preferences/room-preferences.controller.ts

@@ -4,13 +4,13 @@ import { GlobalPreferencesService } from '../../services/preferences/index.js';
 import { OpenViduCallError } from '../../models/error.model.js';
 
 const logger = LoggerService.getInstance();
-const preferenceService = GlobalPreferencesService.getInstance();
 
 export const updateRoomPreferences = async (req: Request, res: Response) => {
 	logger.verbose(`Updating room preferences: ${JSON.stringify(req.body)}`);
 	const roomPreferences = req.body;
 
 	try {
+		const preferenceService = GlobalPreferencesService.getInstance();
 		preferenceService.validateRoomPreferences(roomPreferences);
 
 		const savedPreferences = await preferenceService.updateRoomPreferences(roomPreferences);
@@ -31,6 +31,7 @@ export const updateRoomPreferences = async (req: Request, res: Response) => {
 
 export const getRoomPreferences = async (req: Request, res: Response) => {
 	try {
+		const preferenceService = GlobalPreferencesService.getInstance();
 		const preferences = await preferenceService.getRoomPreferences();
 
 		if (!preferences) {

backend/src/controllers/room.controller.ts

@@ -3,7 +3,7 @@ import { LiveKitService } from '../services/livekit.service.js';
 import { LoggerService } from '../services/logger.service.js';
 import { OpenViduCallError } from '../models/error.model.js';
 import { RoomService } from '../services/room.service.js';
-import { TokenOptions } from 'openvidu-call';
+import { TokenOptions } from '@typings-ce';
 
 const livekitService = LiveKitService.getInstance();
 const roomService = RoomService.getInstance();

backend/src/middlewares/broadcasting.middleware.ts

@@ -1,6 +1,6 @@
 import { Request, Response, NextFunction } from 'express';
 import { GlobalPreferencesService } from '../services/preferences/index.js';
-import { RoomPreferences } from 'openvidu-call';
+import { RoomPreferences } from '@typings-ce';
 import { LoggerService } from '../services/logger.service.js';
 
 export const withBroadcastingEnabled = async (req: Request, res: Response, next: NextFunction) => {

backend/src/middlewares/recording.middleware.ts

@@ -1,6 +1,6 @@
 import { Request, Response, NextFunction } from 'express';
 import { GlobalPreferencesService } from '../services/preferences/index.js';
-import { RoomPreferences } from 'openvidu-call';
+import { RoomPreferences } from '@typings-ce';
 import { LoggerService } from '../services/logger.service.js';
 
 export const withRecordingEnabled = async (req: Request, res: Response, next: NextFunction) => {

backend/src/services/livekit.service.ts

@@ -14,7 +14,7 @@ import {
 import { LIVEKIT_API_KEY, LIVEKIT_API_SECRET, LIVEKIT_URL, LIVEKIT_URL_PRIVATE } from '../config.js';
 import { LoggerService } from './logger.service.js';
 import { errorLivekitIsNotAvailable, errorParticipantAlreadyExists, internalError } from '../models/error.model.js';
-import { TokenOptions } from 'openvidu-call';
+import { TokenOptions } from '@typings-ce';
 
 export class LiveKitService {
 	protected static instance: LiveKitService;

backend/src/services/preferences/global-preferences-storage.interface.ts

@@ -1,4 +1,4 @@
-import { GlobalPreferences } from 'openvidu-call';
+import { GlobalPreferences } from '@typings-ce';
 
 /**
  * Interface for managing global preferences storage.

backend/src/services/preferences/global-preferences.service.ts

@@ -3,7 +3,7 @@
  * regardless of the underlying storage mechanism.
  */
 
-import { GlobalPreferences, RoomPreferences } from 'openvidu-call';
+import { GlobalPreferences, RoomPreferences } from '@typings-ce';
 import { LoggerService } from '../logger.service.js';
 import { GlobalPreferencesStorage } from './global-preferences-storage.interface.js';
 import { GlobalPreferencesStorageFactory } from './global-preferences.factory.js';
@@ -16,6 +16,7 @@ export class GlobalPreferencesService<T extends GlobalPreferences = GlobalPrefer
 	protected storage: GlobalPreferencesStorage;
 	protected constructor() {
 		this.storage = GlobalPreferencesStorageFactory.create();
+		console.log('00000000000000000000 GlobalPreferencesService created');
 	}
 
 	static getInstance() {
@@ -26,6 +27,10 @@ export class GlobalPreferencesService<T extends GlobalPreferences = GlobalPrefer
 		return GlobalPreferencesService.instance;
 	}
 
+	static setInstance(instance: GlobalPreferencesService) {
+		GlobalPreferencesService.instance = instance;
+	}
+
 	/**
 	 * Initializes default preferences if not already initialized.
 	 * @returns {Promise<T>} Default global preferences.
@@ -79,13 +84,13 @@ export class GlobalPreferencesService<T extends GlobalPreferences = GlobalPrefer
 
 	/**
 	 * Resets room preferences to default values.
-	 * @returns {Promise<GlobalPreferences>}
+	 * @returns {Promise<T>}
 	 */
-	async resetRoomPreferences(): Promise<GlobalPreferences> {
+	async resetRoomPreferences(): Promise<T> {
 		const preferences = this.getDefaultPreferences();
 		const existingPreferences = await this.getGlobalPreferences();
 		existingPreferences.roomPreferences = preferences.roomPreferences;
-		return this.storage.savePreferences(existingPreferences);
+		return this.storage.savePreferences(existingPreferences) as Promise<T>;
 	}
 
 	/**
@@ -119,9 +124,9 @@ export class GlobalPreferencesService<T extends GlobalPreferences = GlobalPrefer
 
 	/**
 	 * Returns the default global preferences.
-	 * @returns {T}
+	 * @returns {GlobalPreferences}
 	 */
-	protected getDefaultPreferences(): T {
+	protected getDefaultPreferences(): GlobalPreferences {
 		return {
 			projectId: CALL_NAME_ID,
 			roomPreferences: {
@@ -130,7 +135,7 @@ export class GlobalPreferencesService<T extends GlobalPreferences = GlobalPrefer
 				chatPreferences: { enabled: true },
 				virtualBackgroundPreferences: { enabled: true }
 			}
-		} as T;
+		};
 	}
 
 	/**

backend/src/services/preferences/index.ts

@@ -1 +1,3 @@
 export * from './global-preferences.service.js';
+export * from './global-preferences-storage.interface.js';
+export * from './global-preferences.factory.js';

backend/src/services/preferences/s3-preferences-storage.ts

@@ -3,7 +3,7 @@
  * This is used when the application is configured to operate in "s3" mode.
  */
 
-import { GlobalPreferences } from 'openvidu-call';
+import { GlobalPreferences } from '@typings-ce';
 import { GlobalPreferencesStorage } from './global-preferences-storage.interface.js';
 import { S3Service } from '../s3.service.js';
 import { LoggerService } from '../logger.service.js';

backend/tsconfig.json

@@ -13,7 +13,9 @@
 		"forceConsistentCasingInFileNames": true, /* Disallow inconsistently-cased references to the same file. */
 		"experimentalDecorators": true, /* Enables experimental support for ES7 decorators. */
 		"emitDecoratorMetadata": true, /* Enables experimental support for emitting type metadata for decorators. */
-
+		"paths": {
+			"@typings-ce": ["./src/typings/ce/index.ts"]
+		}
 	},
 	"include": ["src/**/*.ts", "index.ts"],
 	"exclude": ["node_modules", "tests/**/*.ts", "tests/**/*.tsx"],

frontend/package.json

@@ -30,7 +30,6 @@
     "@types/chai": "4.3.19",
     "@types/mocha": "9.1.1",
     "@types/node": "20.12.14",
-    "@types/openvidu-call": "file:types-openvidu-call-1.0.0.tgz",
     "@types/pixelmatch": "^5.2.6",
     "@types/pngjs": "^6.0.5",
     "@types/selenium-webdriver": "4.1.26",

frontend/projects/shared-call-components/src/lib/pages/console/room-preferences/room-preferences.component.ts

@@ -1,7 +1,7 @@
 import { Component, OnInit } from '@angular/core';
 import { GlobalPreferencesService, NotificationService } from '../../../services';
 import { DynamicGridComponent, ToggleCardComponent } from '../../../components';
-import { RoomPreferences } from 'openvidu-call';
+import { RoomPreferences } from '@typings-ce';
 
 @Component({
 	selector: 'ov-room-preferences',

frontend/projects/shared-call-components/src/lib/pages/video-room/video-room.component.ts

@@ -16,7 +16,7 @@ import {
 	ChatPreferences,
 	RecordingPreferences,
 	VirtualBackgroundPreferences
-} from 'openvidu-call';
+} from '@typings-ce';
 import { HttpService, ContextService, GlobalPreferencesService } from '../../services';
 
 @Component({

frontend/projects/shared-call-components/src/lib/services/global-preferences/global-preferences.service.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { RoomPreferences } from 'openvidu-call';
+import { RoomPreferences } from '@typings-ce';
 import { LoggerService } from 'openvidu-components-angular';
 import { HttpService } from '../http/http.service';
 

frontend/projects/shared-call-components/src/lib/services/http/http.service.ts

@@ -1,6 +1,6 @@
 import { HttpClient, HttpHeaders } from '@angular/common/http';
 import { Injectable } from '@angular/core';
-import { GlobalPreferences, RoomPreferences } from 'openvidu-call';
+import { GlobalPreferences, RoomPreferences } from '@typings-ce';
 import { RecordingInfo } from 'openvidu-components-angular';
 import { lastValueFrom } from 'rxjs';
 

frontend/tsconfig.json

@@ -22,13 +22,13 @@
 			"core-js/es7/reflect": ["./node_modules/core-js/proposals/reflect-metadata"],
 			"@app/*": ["src/app/*"],
 			"@lib/*": ["projects/shared-call-components/src/lib/*"],
+			"@typings-ce": ["projects/shared-call-components/src/lib/typings/ce/index.ts"],
 			// "@services/*": ["src/app/services/*"],
 			// "@models/*": ["src/app/models/*"],
 			// "@guards/*": ["src/app/guards/*"],
 			// "@pages/*": ["src/app/pages/*"],
 			"@environment/*": ["src/environments/*"],
-			"shared-call-components": ["dist/shared-call-components"],
-			"@types/openvidu-call": ["../types/dist"]
+			"shared-call-components": ["dist/shared-call-components"]
 		},
 		"importHelpers": true,
 		"target": "ES2022",

prepare.sh

@@ -9,6 +9,7 @@ cd ..
 # Build backend
 cd backend
 npm install
+npm run build
 cd ..
 
 # Build frontend

types/package.json

@@ -11,10 +11,9 @@
 	"scripts": {
 		"build": "tsc",
 		"serve": "tsc -w",
-		"package": "npm run build && npm pack",
-		"sync-ce": "npm run package && PACKAGE=$(ls types-openvidu-call-*.tgz) && cp $PACKAGE ../frontend && cp $PACKAGE ../backend",
-		"sync-pro": "npm run package && PACKAGE=$(ls types-openvidu-call-*.tgz) && cp $PACKAGE ../../openvidu-call-pro/frontend && cp $PACKAGE ../../openvidu-call-pro/backend",
-		"sync": "npm run sync-ce && npm run sync-pro"
+		"sync-ce": "./sync-types.sh ce",
+		"sync-pro": "./sync-types.sh pro",
+		"sync": "./sync-types.sh"
 	},
 	"devDependencies": {
 		"typescript": "^5.6.3"

types/src/types/global-preferences.ts → types/src/global-preferences.ts

@@ -1,5 +1,4 @@
-import { RoomPreferences } from './room-preferences';
-
+import { RoomPreferences } from './room-preferences.js';
 export interface GlobalPreferences {
 	projectId: string;
 	roomPreferences: RoomPreferences;

types/src/index.ts

@@ -1,3 +1,3 @@
-export * from './types/global-preferences.js';
-export * from './types/room-preferences.js';
+export * from './global-preferences.js';
+export * from './room-preferences.js';
 export * from './types/token.js';

types/src/types/room-preferences.ts → types/src/room-preferences.ts

@@ -4,22 +4,18 @@ export interface RoomPreferences {
 	chatPreferences: ChatPreferences;
 	virtualBackgroundPreferences: VirtualBackgroundPreferences;
 }
-
 export interface RecordingPreferences {
 	enabled: boolean;
 	// outputMode: string;
 	// hasAudio: boolean;
 	// hasVideo: boolean;
 }
-
 export interface BroadcastingPreferences {
 	enabled: boolean;
 }
-
 export interface ChatPreferences {
 	enabled: boolean;
 }
-
 export interface VirtualBackgroundPreferences {
 	enabled: boolean;
 }