inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-09-17 14:21:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "AAE-30878 Migrating from event-emitter to eventemitter3 which is … (#11116)" (#11186)

Browse Source 
This reverts commit 49375181e4.
This commit is contained in:
Vito Albano
2025-09-10 15:57:01 +01:00
committed by GitHub
parent c8c1ae7838
commit fd29e953d6
15 changed files with 267 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/js-api/package.json
View File

@@ -15,7 +15,7 @@
"url": "https://github.com/Alfresco/alfresco-ng2-components/issues"
},
"dependencies": {
"eventemitter3": "^5.0.1",
"event-emitter": "^0.3.5",
"superagent": "^9.0.1",
"tslib": "^2.6.1"
},

51
lib/js-api/src/alfrescoApi.ts
View File

@@ -15,7 +15,7 @@
* limitations under the License.
*/
import { EventEmitter } from 'eventemitter3';
import ee, { EmitterMethod, Emitter } from 'event-emitter';
import { ContentAuth } from './authentication/contentAuth';
import { ProcessAuth } from './authentication/processAuth';
import { Oauth2Auth } from './authentication/oauth2Auth';
@@ -26,12 +26,11 @@ import { AlfrescoApiConfig } from './alfrescoApiConfig';
import { Authentication } from './authentication/authentication';
import { AlfrescoApiType } from './to-deprecate/alfresco-api-type';
import { HttpClient } from './api-clients/http-client.interface';
import { AlfrescoApiClient, AlfrescoApiClientPromise } from './alfrescoApiClient';
type EventEmitterInstance = InstanceType<typeof EventEmitter>;
export class AlfrescoApi extends AlfrescoApiClient implements AlfrescoApiType {
export class AlfrescoApi implements Emitter, AlfrescoApiType {
__type = 'legacy-client';
storage: Storage;
config: AlfrescoApiConfig;
contentClient: ContentClient;
contentPrivateClient: ContentClient;
processClient: ProcessClient;
@@ -44,11 +43,21 @@ export class AlfrescoApi extends AlfrescoApiClient implements AlfrescoApiType {
processAuth: ProcessAuth;
contentAuth: ContentAuth;
on: EmitterMethod;
off: EmitterMethod;
once: EmitterMethod;
bufferEvents: string[] = [];
emit: (type: string, ...args: any[]) => void;
username: string;
constructor(config?: AlfrescoApiConfig, httpClient?: HttpClient) {
super(undefined, httpClient);
constructor(
config?: AlfrescoApiConfig,
public httpClient?: HttpClient
) {
ee(this);
if (config) {
this.setConfig(config);
@@ -386,15 +395,14 @@ export class AlfrescoApi extends AlfrescoApiClient implements AlfrescoApiType {
return this.contentAuth.validateTicket();
}
private loginBPMECM(username: string, password: string): AlfrescoApiClientPromise<[string, string]> {
private loginBPMECM(username: string, password: string): Promise<[string, string]> {
const contentPromise = this.contentAuth.login(username, password);
const processPromise = this.processAuth.login(username, password);
const eventEmitter: EventEmitterInstance = new EventEmitter();
const promise = new Promise<[string, string]>((resolve, reject) => {
const promise: any = new Promise<[string, string]>((resolve, reject) => {
Promise.all([contentPromise, processPromise]).then(
(data) => {
eventEmitter.emit('success');
promise.emit('success');
resolve(data);
},
(error) => {
@@ -402,15 +410,16 @@ export class AlfrescoApi extends AlfrescoApiClient implements AlfrescoApiType {
this.processAuth.invalidateSession();
if (error.status === 401) {
eventEmitter.emit('unauthorized');
promise.emit('unauthorized');
}
eventEmitter.emit('error');
promise.emit('error');
reject(error);
}
);
});
return this.addPromiseListeners(promise, eventEmitter);
ee(promise); // jshint ignore:line
return promise;
}
/**
@@ -443,29 +452,29 @@ export class AlfrescoApi extends AlfrescoApiClient implements AlfrescoApiType {
return Promise.resolve();
}
private _logoutBPMECM(): AlfrescoApiClientPromise<void> {
private _logoutBPMECM(): Promise<void> {
const contentPromise = this.contentAuth.logout();
const processPromise = this.processAuth.logout();
const eventEmitter: EventEmitterInstance = new EventEmitter();
const promise = new Promise<void>((resolve, reject) => {
const promise: any = new Promise<void>((resolve, reject) => {
Promise.all([contentPromise, processPromise]).then(
() => {
this.config.ticket = undefined;
eventEmitter.emit('logout');
promise.emit('logout');
resolve();
},
(error) => {
if (error.status === 401) {
eventEmitter.emit('unauthorized');
promise.emit('unauthorized');
}
eventEmitter.emit('error');
promise.emit('error');
reject(error);
}
);
});
return this.addPromiseListeners(promise, eventEmitter);
ee(promise); // jshint ignore:line
return promise;
}
/**

72
lib/js-api/src/alfrescoApiClient.ts
View File

@@ -15,7 +15,7 @@
* limitations under the License.
*/
import { EventEmitter } from 'eventemitter3';
import ee from 'event-emitter';
import { AlfrescoApiConfig } from './alfrescoApiConfig';
import { Authentication } from './authentication/authentication';
import { SuperagentHttpClient } from './superagentHttpClient';
@@ -25,13 +25,11 @@ import { Storage } from './storage';
declare const Buffer: any;
type EventEmitterInstance = InstanceType<typeof EventEmitter>;
export type AlfrescoApiClientPromise<T = any> = Promise<T> & {
on: <K extends string | symbol>(event: K, fn: (...args: any[]) => void, context?: any) => AlfrescoApiClientPromise<T>;
off: <K extends string | symbol>(event: K, fn?: (...args: any[]) => void, context?: any) => AlfrescoApiClientPromise<T>;
once: <K extends string | symbol>(event: K, fn: (...args: any[]) => void, context?: any) => AlfrescoApiClientPromise<T>;
emit: <K extends string | symbol>(event: K, ...args: any[]) => boolean;
on: ee.EmitterMethod;
off: ee.EmitterMethod;
once: ee.EmitterMethod;
emit: (type: string, ...args: any[]) => void;
abort?: () => void;
};
@@ -64,8 +62,11 @@ export function buildCollectionParam(param: string[], collectionFormat: string):
}
}
export class AlfrescoApiClient implements LegacyHttpClient {
private eventEmitter = new EventEmitter();
export class AlfrescoApiClient implements ee.Emitter, LegacyHttpClient {
on: ee.EmitterMethod;
off: ee.EmitterMethod;
once: ee.EmitterMethod;
emit: (type: string, ...args: any[]) => void;
storage: Storage;
host: string;
@@ -104,29 +105,13 @@ export class AlfrescoApiClient implements LegacyHttpClient {
constructor(host?: string, httpClient?: HttpClient) {
this.host = host;
this.storage = Storage.getInstance();
// fallback for backward compatibility
this.httpClient = httpClient || new SuperagentHttpClient();
}
// EventEmitter delegation methods
on<K extends string | symbol>(event: K, fn: (...args: any[]) => void, context?: any): this {
this.eventEmitter.on(event, fn, context);
return this;
}
off<K extends string | symbol>(event: K, fn?: (...args: any[]) => void, context?: any): this {
this.eventEmitter.off(event, fn, context);
return this;
}
once<K extends string | symbol>(event: K, fn: (...args: any[]) => void, context?: any): this {
this.eventEmitter.once(event, fn, context);
return this;
}
emit<K extends string | symbol>(event: K, ...args: any[]): boolean {
return this.eventEmitter.emit(event, ...args);
ee(this);
}
request<T = any>(options: RequestOptions): Promise<T> {
@@ -340,7 +325,7 @@ export class AlfrescoApiClient implements LegacyHttpClient {
return {
apiClientEmitter,
eventEmitter: new EventEmitter()
eventEmitter: ee({})
};
}
@@ -389,22 +374,27 @@ export class AlfrescoApiClient implements LegacyHttpClient {
return Boolean(contentType?.match(/^application\/json(;.*)?$/i));
}
addPromiseListeners<T = any>(promise: Promise<T>, eventEmitter: EventEmitterInstance): AlfrescoApiClientPromise<T> {
private addPromiseListeners<T = any>(promise: Promise<T>, eventEmitter: ee.Emitter): AlfrescoApiClientPromise<T> {
return Object.assign(promise, {
on<K extends string | symbol>(event: K, fn: (...args: any[]) => void, context?: any): AlfrescoApiClientPromise<T> {
eventEmitter.on(event, fn, context);
return this as AlfrescoApiClientPromise<T>;
on() {
// eslint-disable-next-line prefer-spread,prefer-rest-params
eventEmitter.on.apply(eventEmitter, arguments);
return this;
},
once<K extends string | symbol>(event: K, fn: (...args: any[]) => void, context?: any): AlfrescoApiClientPromise<T> {
eventEmitter.once(event, fn, context);
return this as AlfrescoApiClientPromise<T>;
once() {
// eslint-disable-next-line prefer-spread,prefer-rest-params
eventEmitter.once.apply(eventEmitter, arguments);
return this;
},
emit<K extends string | symbol>(event: K, ...args: any[]): boolean {
return eventEmitter.emit(event, ...args);
emit() {
// eslint-disable-next-line prefer-spread,prefer-rest-params
eventEmitter.emit.apply(eventEmitter, arguments);
return this;
},
off<K extends string | symbol>(event: K, fn?: (...args: any[]) => void, context?: any): AlfrescoApiClientPromise<T> {
eventEmitter.off(event, fn, context);
return this as AlfrescoApiClientPromise<T>;
off() {
// eslint-disable-next-line prefer-spread,prefer-rest-params
eventEmitter.off.apply(eventEmitter, arguments);
return this;
}
});
}

13
lib/js-api/src/api-clients/http-client.interface.ts
View File

@@ -16,9 +16,7 @@
*/
import { Authentication } from '../authentication/authentication';
import { EventEmitter } from 'eventemitter3';
type EventEmitterInstance = InstanceType<typeof EventEmitter>;
import { Emitter } from 'event-emitter';
export interface RequestOptions {
path: string;
@@ -95,13 +93,8 @@ export interface SecurityOptions {
}
export interface Emitters {
readonly eventEmitter: EventEmitterInstance;
readonly apiClientEmitter: {
on: EventEmitterInstance['on'];
off: EventEmitterInstance['off'];
once: EventEmitterInstance['once'];
emit: EventEmitterInstance['emit'];
};
readonly eventEmitter: Emitter;
readonly apiClientEmitter: Emitter;
}
export interface HttpClient {

11
lib/js-api/src/authentication/contentAuth.ts
View File

@@ -15,7 +15,7 @@
* limitations under the License.
*/
import { EventEmitter } from 'eventemitter3';
import ee from 'event-emitter';
import { AuthenticationApi, TicketBody } from '../api/auth-rest-api';
import { AlfrescoApiClient } from '../alfrescoApiClient';
import { AlfrescoApiConfig } from '../alfrescoApiConfig';
@@ -104,7 +104,8 @@ export class ContentAuth extends AlfrescoApiClient {
});
});
return this.addPromiseListeners(promise, new EventEmitter());
ee(promise); // jshint ignore:line
return promise;
}
/**
@@ -132,7 +133,8 @@ export class ContentAuth extends AlfrescoApiClient {
);
});
return this.addPromiseListeners(promise, new EventEmitter());
ee(promise); // jshint ignore:line
return promise;
}
/**
@@ -158,7 +160,8 @@ export class ContentAuth extends AlfrescoApiClient {
);
});
return this.addPromiseListeners(promise, new EventEmitter());
ee(promise); // jshint ignore:line
return promise;
}
/**

8
lib/js-api/src/authentication/oauth2Auth.ts
View File

@@ -15,7 +15,7 @@
* limitations under the License.
*/
import { EventEmitter } from 'eventemitter3';
import ee from 'event-emitter';
import { AlfrescoApiClient } from '../alfrescoApiClient';
import { AlfrescoApiConfig } from '../alfrescoApiConfig';
import { Authentication } from './authentication';
@@ -604,7 +604,7 @@ export class Oauth2Auth extends AlfrescoApiClient {
}
);
return this.addPromiseListeners(promise, new EventEmitter());
ee(promise); // jshint ignore:line
}
pollingRefreshToken() {
@@ -654,7 +654,9 @@ export class Oauth2Auth extends AlfrescoApiClient {
);
});
return this.addPromiseListeners(promise, new EventEmitter());
ee(promise); // jshint ignore:line
return promise;
}
universalBtoa(stringToConvert: string) {

8
lib/js-api/src/authentication/processAuth.ts
View File

@@ -15,7 +15,7 @@
* limitations under the License.
*/
import { EventEmitter } from 'eventemitter3';
import ee from 'event-emitter';
import { AlfrescoApiClient, AlfrescoApiClientPromise } from '../alfrescoApiClient';
import { AlfrescoApiConfig } from '../alfrescoApiConfig';
import { Authentication } from './authentication';
@@ -123,7 +123,8 @@ export class ProcessAuth extends AlfrescoApiClient {
);
});
return this.addPromiseListeners(promise, new EventEmitter());
ee(promise); // jshint ignore:line
return promise;
}
/**
@@ -153,7 +154,8 @@ export class ProcessAuth extends AlfrescoApiClient {
);
});
return this.addPromiseListeners(promise, new EventEmitter());
ee(promise);
return promise;
}
/**

8
lib/js-api/src/superagentHttpClient.ts
View File

@@ -15,7 +15,7 @@
* limitations under the License.
*/
import { EventEmitter } from 'eventemitter3';
import ee, { Emitter } from 'event-emitter';
import superagent, { Response, SuperAgentRequest } from 'superagent';
import { Authentication } from './authentication/authentication';
import { RequestOptions, HttpClient, SecurityOptions, Emitters } from './api-clients/http-client.interface';
@@ -26,8 +26,6 @@ import { isBrowser, paramToString } from './utils';
declare const Blob: any;
declare const Buffer: any;
type EventEmitterInstance = InstanceType<typeof EventEmitter>;
const isProgressEvent = (event: ProgressEvent | unknown): event is ProgressEvent => (event as ProgressEvent)?.lengthComputable;
export class SuperagentHttpClient implements HttpClient {
@@ -136,7 +134,7 @@ export class SuperagentHttpClient implements HttpClient {
contentType: string,
accept: string,
responseType: string,
eventEmitter: EventEmitterInstance,
eventEmitter: ee.Emitter,
returnType: string,
securityOptions: SecurityOptions
) {
@@ -270,7 +268,7 @@ export class SuperagentHttpClient implements HttpClient {
}
}
private progress(event: ProgressEvent | unknown, eventEmitter: EventEmitterInstance): void {
private progress(event: ProgressEvent | unknown, eventEmitter: Emitter): void {
if (isProgressEvent(event)) {
const percent = Math.round((event.loaded / event.total) * 100);