@observertc/observer-js 0.9.27-beta → 0.30.0-beta

package/src/middlewares/DeleteOutdatedSfuEntries.ts

@@ -1,168 +0,0 @@
-import { Middleware } from './Middleware';
-import { TransactionContext } from './TransactionContext';
-import { createLogger } from '../common/logger';
-import { StorageProvider } from '..';
-
-export const logger = createLogger('DeleteOutdatedSfuEntries');
-
-export function createDeleteOutdatedSfuEntries(
-	storages: StorageProvider,
-	maxIdleTimeInMs: bigint,
-): Middleware<TransactionContext> {
-	const process = async (transaction: TransactionContext) => {
-		const {
-			updatedSfus,
-			deletedSfus,
-			
-			updatedSfuTransports,
-			deletedSfuTransports,
-
-			updatedSfuInboundRtpPads,
-			deletedSfuInboundRtpPads,
-
-			updatedSfuOutboundRtpPads,
-			deletedSfuOutboundRtpPads,
-
-			updatedSfuSctpChannels,
-			deletedSfuSctpChannels
-
-		} = transaction;
-
-		const now = BigInt(Date.now());
-
-		for (const [ sfuTransportId, sfuTransport ] of storages.sfuTransportStorage.localEntries()) {
-			if (updatedSfuTransports.has(sfuTransportId)) {
-				continue;
-			}
-			
-			const { touched, sfuId } = sfuTransport;
-
-			if (touched && now - touched < maxIdleTimeInMs) {
-				if (!deletedSfus.has(sfuId ?? 'not exists')) {
-					continue;
-				}
-			}
-
-			deletedSfuTransports.add(sfuTransportId);
-
-			if (sfuId) {
-				let storedSfu = updatedSfus.get(sfuId);
-
-				if (storedSfu) {
-					storedSfu.sfuTransportIds = storedSfu.sfuTransportIds.filter((transportId) => transportId !== sfuTransportId);
-				} else {
-					storedSfu = await storages.sfuStorage.get(sfuId);
-					if (storedSfu) {
-						storedSfu.sfuTransportIds = storedSfu.sfuTransportIds.filter((transportId) => transportId !== sfuTransportId);
-						await storages.sfuStorage.set(sfuId, storedSfu);
-					}
-				}
-			}
-		}
-
-		for (const [ sfuInboundPadId, sfuInboundPad ] of storages.sfuInboundRtpPadStorage.localEntries()) {
-			if (updatedSfuInboundRtpPads.has(sfuInboundPadId)) {
-				continue;
-			}
-
-			const { touched, sfuTransportId, sfuId } = sfuInboundPad;
-
-			if (touched && now - touched < maxIdleTimeInMs) {
-				if (
-					!deletedSfuTransports.has(sfuTransportId ?? 'not exists') && 
-					!deletedSfus.has(sfuId ?? 'not exists')
-				) {
-					continue;
-				}
-			}
-
-			deletedSfuInboundRtpPads.add(sfuInboundPadId);
-
-			if (sfuTransportId) {
-				let storedSfuTransport = updatedSfuTransports.get(sfuTransportId);
-
-				if (!storedSfuTransport) {
-					storedSfuTransport = await storages.sfuTransportStorage.get(sfuTransportId);
-					if (storedSfuTransport) {
-						updatedSfuTransports.set(sfuTransportId, storedSfuTransport);
-					}
-				}
-				if (storedSfuTransport) {
-					storedSfuTransport.inboundRtpPadIds = storedSfuTransport.inboundRtpPadIds.filter((tId) => tId !== sfuInboundPadId);
-				}
-			}
-		}
-
-		for (const [ sfuOutboundPadId, sfuOutboundPad ] of storages.sfuOutboundRtpPadStorage.localEntries()) {
-			if (updatedSfuOutboundRtpPads.has(sfuOutboundPadId)) {
-				continue;
-			}
-
-			const { touched, sfuTransportId, sfuId } = sfuOutboundPad;
-
-			if (touched && now - touched < maxIdleTimeInMs) {
-				if (
-					!deletedSfuTransports.has(sfuTransportId ?? 'not exists') && 
-					!deletedSfus.has(sfuId ?? 'not exists')
-				) {
-					continue;
-				}
-			}
-
-			deletedSfuOutboundRtpPads.add(sfuOutboundPadId);
-
-			if (sfuTransportId) {
-				let storedSfuTransport = updatedSfuTransports.get(sfuTransportId);
-
-				if (!storedSfuTransport) {
-					storedSfuTransport = await storages.sfuTransportStorage.get(sfuTransportId);
-					if (storedSfuTransport) {
-						updatedSfuTransports.set(sfuTransportId, storedSfuTransport);
-					}
-				}
-				if (storedSfuTransport) {
-					storedSfuTransport.outboundRtpPadIds = storedSfuTransport.outboundRtpPadIds.filter((tId) => tId !== sfuOutboundPadId);
-				}
-			}
-		}
-
-		for (const [ sctpChannelId, sctpChannel ] of storages.sfuSctpChannelStorage.localEntries()) {
-			if (updatedSfuSctpChannels.has(sctpChannelId)) {
-				continue;
-			}
-
-			const { touched, sfuTransportId, sfuId } = sctpChannel;
-
-			if (touched && now - touched < maxIdleTimeInMs) {
-				if (
-					!deletedSfuTransports.has(sfuTransportId ?? 'not exists') && 
-					!deletedSfus.has(sfuId ?? 'not exists')
-				) {
-					continue;
-				}
-			}
-
-			deletedSfuSctpChannels.add(sctpChannelId);
-
-			if (sfuTransportId) {
-				let storedSfuTransport = updatedSfuTransports.get(sfuTransportId);
-
-				if (!storedSfuTransport) {
-					storedSfuTransport = await storages.sfuTransportStorage.get(sfuTransportId);
-					if (storedSfuTransport) {
-						updatedSfuTransports.set(sfuTransportId, storedSfuTransport);
-					}
-				}
-				if (storedSfuTransport) {
-					storedSfuTransport.sctpChannelIds = storedSfuTransport.sctpChannelIds.filter((tId) => tId !== sctpChannelId);
-				}
-			}
-		}
-	};
-	const result = async (context: TransactionContext, next?: Middleware<TransactionContext>) => {
-		await process(context);
-		if (next) await next(context);
-	};
-	
-	return result;
-}

package/src/middlewares/Middleware.ts

@@ -1,10 +0,0 @@
-export type Middleware<T> = (input: T, next?: Middleware<T>) => Promise<void>;
-
-export function createMiddlewareFromAsyncProcess<T>(process: (input: T) => Promise<void>) {
-	const middleware: Middleware<T> = async (input, next) => {
-		await process(input);
-		if (next) await next(input);
-	};
-	
-	return middleware;
-}

package/src/middlewares/Processor.ts

@@ -1,59 +0,0 @@
-import { createLogger } from '../common/logger';
-import { Middleware } from './Middleware';
-
-const logger = createLogger('Middleware');
-
-export interface Processor<T> {
-	use(value: T): Promise<void | T>;
-	addMiddleware(...middlewares: Middleware<T>[]): Processor<T>;
-	removeMiddleware(...middlewares: Middleware<T>[]): Processor<T>;
-	getSize(): number;
-}
-
-export function createProcessor<T>(...processes: Middleware<T>[]): Processor<T> {
-	const stack: Middleware<T>[] = [ ...processes ];
-	const result: Processor<T> = {
-		addMiddleware: (...middlewares: Middleware<T>[]) => {
-			if (middlewares && 0 < middlewares.length) {
-				stack.push(...middlewares);
-			}
-			
-			return result;
-		},
-
-		removeMiddleware: (...middlewares: Middleware<T>[]) => {
-			if (middlewares && 0 < middlewares.length) {
-				for (const middleware of middlewares) {
-					const index = stack.indexOf(middleware);
-
-					if (0 < index) stack.splice(index, 1);
-				}
-			}
-			
-			return result;
-		},
-		use: async (value: T): Promise<void> => {
-			const executeMiddleware = async (input: T, index: number): Promise<void> => {
-				if (index >= stack.length) {
-					return;
-				}
-
-				const process = stack[index];
-				const next = async (nextInput: T) => await executeMiddleware(nextInput, index + 1);
-				
-				return process(input, next).catch((err) => {
-					logger.error(`Error occurred executing process ${process.name}`, err);
-					
-					return;
-				});
-			};
-
-			return executeMiddleware(value, 0);
-		},
-		getSize: (): number => {
-			return stack.length;
-		}
-	};
-
-	return result;
-}

package/src/middlewares/TransactionContext.ts

@@ -1,176 +0,0 @@
-import { StorageProvider } from '../storages/StorageProvider';
-import * as Models from '../models/Models';
-import { ObservedCalls } from '../samples/ObservedCalls';
-import { v4 as uuid } from 'uuid';
-import { EvaluatorContext } from '../common/types';
-import { Writable } from '../common/utils';
-import { ObservedSfus } from '../samples/ObservedSfus';
-
-export type TransactionContext = {
-	id: string;
-	observedCalls: ObservedCalls;
-	observedSfus: ObservedSfus;
-
-	clients: ReadonlyMap<string, Models.Client>;
-
-	updatedPeerConnections: Map<string, Models.PeerConnection>;
-	deletedPeerConnections: Set<string>;
-
-	updatedInboundAudioTracks: Map<string, Models.InboundTrack>;
-	deletedInboundAudioTracks: Set<string>;
-
-	updatedOutboundAudioTracks: Map<string, Models.OutboundTrack>;
-	deletedOutboundAudioTracks: Set<string>;
-
-	updatedInboundVideoTracks: Map<string, Models.InboundTrack>;
-	deletedInboundVideoTracks: Set<string>;
-
-	updatedOutboundVideoTracks: Map<string, Models.OutboundTrack>;
-	deletedOutboundVideoTracks: Set<string>;
-
-	updatedSfus: Map<string, Models.Sfu>;
-	deletedSfus: Set<string>;
-
-	updatedSfuTransports: Map<string, Models.SfuTransport>;
-	deletedSfuTransports: Set<string>;
-
-	updatedSfuInboundRtpPads: Map<string, Models.SfuInboundRtpPad>;
-	deletedSfuInboundRtpPads: Set<string>;
-
-	updatedSfuOutboundRtpPads: Map<string, Models.SfuOutboundRtpPad>;
-	deletedSfuOutboundRtpPads: Set<string>;
-
-	updatedSfuSctpChannels: Map<string, Models.SfuSctpChannel>;
-	deletedSfuSctpChannels: Set<string>;
-
-	// build for another middleware
-	evaluatorContext: Writable<Omit<EvaluatorContext, 'observedCalls' | 'observedSfus'>>;
-};
-
-export async function createTransactionContext(
-	evaluatorContext: EvaluatorContext,
-	storageProvider: StorageProvider,
-	observedCalls: ObservedCalls,
-	observedSfus: ObservedSfus,
-): Promise<TransactionContext> {
-	const {
-		clientStorage,
-		peerConnectionStorage,
-		inboundTrackStorage,
-		outboundTrackStorage,
-		sfuStorage,
-		sfuTransportStorage,
-		sfuInboundRtpPadStorage,
-		sfuOutboundRtpPadStorage,
-		sfuSctpChannelStorage,
-	} = storageProvider;
-
-	const [
-		[
-			clients, 
-			peerConnections,
-			inboundAudioTrackEntries,
-			inboundVideoTrackEntries,
-			outboundAudioTrackEntries,
-			outboundVideoTrackEntries,
-		],
-		[
-			sfus,
-			sfuTransports,
-			sfuInboundRtpPads,
-			sfuOutboundRtpPads,
-			sfuSctpChannels
-		]
-	] = await Promise.all([
-		Promise.all([
-			clientStorage.getAll(observedCalls.clientIds()), 
-			peerConnectionStorage.getAll(observedCalls.peerConnectionIds()),
-			inboundTrackStorage.getAll(observedCalls.inboundAudioTrackIds()),
-			inboundTrackStorage.getAll(observedCalls.inboundVideoTrackIds()),
-			outboundTrackStorage.getAll(observedCalls.outboundAudioTrackIds()),
-			outboundTrackStorage.getAll(observedCalls.outboundVideoTrackIds()),
-		]),
-		Promise.all([
-			sfuStorage.getAll(observedSfus.sfuIds()),
-			sfuTransportStorage.getAll(observedSfus.sfuTransportIds()),
-			sfuInboundRtpPadStorage.getAll(observedCalls.peerConnectionIds()),
-			sfuOutboundRtpPadStorage.getAll(observedCalls.peerConnectionIds()),
-			sfuSctpChannelStorage.getAll(observedCalls.peerConnectionIds()),
-		])
-	]);
-
-	// const peerConnectionIds = Array.from(clients.values()).flatMap((client) => client.peerConnectionIds);
-
-	// const sfuTransportIds = Array.from(sfus.values()).flatMap((sfu) => sfu.sfuTransportIds);
-
-	// const [peerConnections, sfuTransports] = await Promise.all([
-	// 	peerConnectionStorage.getAll(peerConnectionIds),
-	// 	sfuTransportStorage.getAll(sfuTransportIds),
-	// ]);
-
-	// const peerConnectionValues = Array.from(peerConnections.values());
-	// const inboundTrackIds = peerConnectionValues.flatMap((pc) => pc.inboundTrackIds);
-	// const outboundTrackIds = peerConnectionValues.flatMap((pc) => pc.outboundTrackIds);
-
-	// const sfuTransportValues = Array.from(sfuTransports.values());
-	// const sfuInboundRtpPadIds = sfuTransportValues.flatMap((sfuTransport) => sfuTransport.inboundRtpPadIds);
-	// const sfuOutboundRtpPadIds = sfuTransportValues.flatMap((sfuTransport) => sfuTransport.outboundRtpPadIds);
-	// const sfuSctpChannelIds = sfuTransportValues.flatMap((sfuTransport) => sfuTransport.sctpChannelIds);
-
-	// const [inboundTracks, outboundTracks, sfuInboundRtpPads, sfuOutboundRtpPads, sfuSctpChannels] = await Promise.all([
-	// 	inboundTrackStorage.getAll(inboundTrackIds),
-	// 	outboundTrackStorage.getAll(outboundTrackIds),
-	// 	sfuInboundRtpPadStorage.getAll(sfuInboundRtpPadIds),
-	// 	sfuOutboundRtpPadStorage.getAll(sfuOutboundRtpPadIds),
-	// 	sfuSctpChannelStorage.getAll(sfuSctpChannelIds),
-	// ]);
-
-	// const inboundTrackEntries = Array.from(inboundTracks);
-	// const outboundTrackEntries = Array.from(outboundTracks);
-
-	// const inboundAudioTrackEntries = inboundTrackEntries.filter((e) => e[1].kind === 'audio');
-	// const inboundVideoTrackEntries = inboundTrackEntries.filter((e) => e[1].kind === 'video');
-	// const outboundAudioTrackEntries = outboundTrackEntries.filter((e) => e[1].kind === 'audio');
-	// const outboundVideoTrackEntries = outboundTrackEntries.filter((e) => e[1].kind === 'video');
-
-	const transactionContext: TransactionContext = {
-		id: uuid(),
-		observedCalls,
-		observedSfus,
-		
-		clients,
-		updatedPeerConnections: new Map<string, Models.PeerConnection>(peerConnections.entries()),
-		deletedPeerConnections: new Set<string>(),
-
-		updatedInboundAudioTracks: new Map<string, Models.InboundTrack>(inboundAudioTrackEntries),
-		deletedInboundAudioTracks: new Set<string>(),
-
-		updatedInboundVideoTracks: new Map<string, Models.InboundTrack>(inboundVideoTrackEntries),
-		deletedInboundVideoTracks: new Set<string>(),
-
-		updatedOutboundAudioTracks: new Map<string, Models.OutboundTrack>(outboundAudioTrackEntries),
-		deletedOutboundAudioTracks: new Set<string>(),
-
-		updatedOutboundVideoTracks: new Map<string, Models.OutboundTrack>(outboundVideoTrackEntries),
-		deletedOutboundVideoTracks: new Set<string>(),
-
-		updatedSfus: new Map<string, Models.Sfu>(sfus.entries()),
-		deletedSfus: new Set<string>(),
-
-		updatedSfuTransports: new Map<string, Models.SfuTransport>(sfuTransports.entries()),
-		deletedSfuTransports: new Set<string>(),
-
-		updatedSfuInboundRtpPads: new Map<string, Models.SfuInboundRtpPad>(sfuInboundRtpPads.entries()),
-		deletedSfuInboundRtpPads: new Set<string>(),
-
-		updatedSfuOutboundRtpPads: new Map<string, Models.SfuOutboundRtpPad>(sfuOutboundRtpPads.entries()),
-		deletedSfuOutboundRtpPads: new Set<string>(),
-
-		updatedSfuSctpChannels: new Map<string, Models.SfuSctpChannel>(sfuSctpChannels.entries()),
-		deletedSfuSctpChannels: new Set<string>(),
-
-		evaluatorContext,
-	};
-	
-	return transactionContext;
-}

package/src/middlewares/TransactoinProcessor.ts

@@ -1,28 +0,0 @@
-import { ReportsCollector } from '../common/ReportsCollector';
-import { StorageProvider } from '../storages/StorageProvider';
-import { createCommitTransactionMiddleware } from './CommitTransactionMiddleware';
-import { createDeleteOutdatedCallEntries } from './DeleteOutdatedCallEntries';
-import { createDeleteOutdatedSfuEntries } from './DeleteOutdatedSfuEntries';
-import { Processor, createProcessor } from './Processor';
-import { TransactionContext } from './TransactionContext';
-import { createVisitObservedCallsMiddleware } from './VisitObservedCallsMiddleware';
-import { createVisitObservedSfusMiddleware } from './VisitObservedSfusMiddleware';
-
-export function createTransactionProcessor(
-	storageProvider: StorageProvider,
-	reportsCollector: ReportsCollector,
-	fetchSamples: boolean,
-	maxIdleTimeInMs: bigint,
-	findRemoteMatches?: boolean,
-): Processor<TransactionContext> {
-	return createProcessor(
-		// all of these middlewares must execute sequentially!
-		createVisitObservedCallsMiddleware(storageProvider, reportsCollector, fetchSamples, findRemoteMatches),
-		createVisitObservedSfusMiddleware(reportsCollector, fetchSamples),
-		createDeleteOutdatedCallEntries(storageProvider, maxIdleTimeInMs),
-		createDeleteOutdatedSfuEntries(storageProvider, maxIdleTimeInMs),
-
-		// must be the last one!
-		createCommitTransactionMiddleware(storageProvider, reportsCollector)
-	);
-}

package/src/middlewares/VisitObservedCallsMiddleware.ts

@@ -1,172 +0,0 @@
-import { Middleware } from './Middleware';
-import { TransactionContext } from './TransactionContext';
-import { ReportsCollector } from '../common/ReportsCollector';
-import { visitClient } from './visitors/visitClient';
-import { visitPeerConnection } from './visitors/visitPeerConnection';
-import { createLogger } from '../common/logger';
-import { visitInboundAudioTrack } from './visitors/visitInboundAudioTrack';
-import { visitOutboundAudioTrack } from './visitors/visitOutboundAudioTrack';
-import { visitOutboundVideoTrack } from './visitors/visitOutboundVideoTarck';
-import { visitInboundVideoTrack } from './visitors/visitInboundVideoTrack';
-import { InboundTrack } from '../models/Models';
-import { StorageProvider } from '../storages/StorageProvider';
-import { findRemoteMatches as findRemoteMatchFunc } from '../processes/findRemoteMatches';
-
-export const logger = createLogger('VisitObservedCallsMiddleware');
-
-const emptyMap = new Map();
-
-export function createVisitObservedCallsMiddleware(
-	storages: StorageProvider,
-	reports: ReportsCollector,
-	fetchSamples: boolean,
-	findRemoteMatches?: boolean,
-): Middleware<TransactionContext> {
-	const process = async (transaction: TransactionContext) => {
-		const {
-			observedCalls,
-			clients,
-			updatedPeerConnections,
-			updatedInboundAudioTracks,
-			updatedInboundVideoTracks,
-			updatedOutboundAudioTracks,
-			updatedOutboundVideoTracks,
-		} = transaction;
-
-		const visitedPeerConnectionIds = new Set<string>();
-		const visitedInboundAudioTrackIds = new Set<string>();
-		const visitedInboundVideoTrackIds = new Set<string>();
-		const visitedOutboundAudioTrackIds = new Set<string>();
-		const visitedOutboundVideoTrackIds = new Set<string>();
-
-		const {
-			remoteTrackIds,
-			remotePeerConnectionIds,
-			remoteClientIds
-		} = !findRemoteMatches ? {
-			remoteTrackIds: emptyMap,
-			remotePeerConnectionIds: emptyMap,
-			remoteClientIds: emptyMap,
-		} : await findRemoteMatchFunc(
-			storages,
-			clients,
-			new Map<string, InboundTrack>([ ...updatedInboundAudioTracks, ...updatedInboundVideoTracks ])
-		);
-		
-		const now = BigInt(Date.now());
-		const fakeTouched = { touched: BigInt(0) };
-		
-		for (const observedCall of observedCalls.observedCalls()) {
-			const { callId, serviceId, roomId } = observedCall;
-
-			for (const observedClient of observedCall.observedClients()) {
-				const { clientId } = observedClient;
-				const storedClient = clients.get(clientId);
-
-				if (!storedClient) {
-					// should not happen as client joined must have run before this
-					logger.warn('Client has not been registered');
-					continue;
-				}
-				
-				visitClient(
-					observedClient, 
-					storedClient, 
-					reports, 
-					fetchSamples
-				);
-				
-				for (const observedPeerConnection of observedClient.observedPeerConnections()) {
-					const { peerConnectionId } = observedPeerConnection;
-
-					visitPeerConnection(observedPeerConnection, storedClient, updatedPeerConnections, reports, fetchSamples);
-
-					const storedPeerConnection = updatedPeerConnections.get(peerConnectionId);
-
-					if (!storedPeerConnection) {
-						// should not happen, as the visit function should add the peer connection if it does not exists
-						logger.warn(
-							`PeerConnection ${peerConnectionId} has not been registered for client: ${clientId}, call ${callId}, room: ${roomId}, service: ${serviceId}`
-						);
-						continue;
-					}
-					
-					storedPeerConnection.touched = now;
-					visitedPeerConnectionIds.add(peerConnectionId);
-
-					for (const observedInboundAudioTrack of observedPeerConnection.inboundAudioTracks()) {
-						const { trackId } = observedInboundAudioTrack;
-
-						visitInboundAudioTrack(
-							observedInboundAudioTrack,
-							storedPeerConnection,
-							updatedInboundAudioTracks,
-							reports,
-							fetchSamples,
-							remoteTrackIds.get(trackId),
-							remotePeerConnectionIds.get(trackId),
-							remoteClientIds.get(trackId),
-						);
-
-						visitedInboundAudioTrackIds.add(trackId);
-						(updatedInboundAudioTracks.get(trackId) ?? fakeTouched).touched = now;
-					}
-
-					for (const observedInboundVideoTrack of observedPeerConnection.inboundVideoTracks()) {
-						const { trackId } = observedInboundVideoTrack;
-
-						visitInboundVideoTrack(
-							observedInboundVideoTrack,
-							storedPeerConnection,
-							updatedInboundVideoTracks,
-							reports,
-							fetchSamples,
-							remoteTrackIds.get(trackId),
-							remotePeerConnectionIds.get(trackId),
-							remoteClientIds.get(trackId),
-						);
-
-						visitedInboundVideoTrackIds.add(trackId);
-						(updatedInboundVideoTracks.get(trackId) ?? fakeTouched).touched = now;
-					}
-
-					for (const observedOutboundAudioTrack of observedPeerConnection.outboundAudioTracks()) {
-						const { trackId } = observedOutboundAudioTrack;
-
-						visitOutboundAudioTrack(
-							observedOutboundAudioTrack,
-							storedPeerConnection,
-							updatedOutboundAudioTracks,
-							reports,
-							fetchSamples
-						);
-
-						visitedOutboundAudioTrackIds.add(trackId);
-						(updatedOutboundAudioTracks.get(trackId) ?? fakeTouched).touched = now;
-					}
-
-					for (const observedOutboundVideoTrack of observedPeerConnection.outboundVideoTracks()) {
-						const { trackId } = observedOutboundVideoTrack;
-
-						visitOutboundVideoTrack(
-							observedOutboundVideoTrack,
-							storedPeerConnection,
-							updatedOutboundVideoTracks,
-							reports,
-							fetchSamples
-						);
-
-						visitedOutboundVideoTrackIds.add(trackId);
-						(updatedOutboundVideoTracks.get(trackId) ?? fakeTouched).touched = now;
-					}
-				}
-			}
-		}
-	};
-	const result = async (context: TransactionContext, next?: Middleware<TransactionContext>) => {
-		await process(context);
-		if (next) await next(context);
-	};
-	
-	return result;
-}