spec-3nweb-server 1.8.7 → 1.8.9

package/build/asmail/resources/inbox.d.ts

@@ -33,9 +33,9 @@ export interface InboxParams {
     "authenticated/invites": AuthSenderInvites;
 }
 export declare class Inbox extends UserFiles<InboxParams> {
-    private metas;
-    private objFiles;
     private mailEventsSink;
+    private readonly metas;
+    private readonly objFiles;
     constructor(userId: string, path: string, mailEventsSink: MailEventsSink, writeBufferSize?: string | number, readBufferSize?: string | number);
     static make(userFolder: string, userId: string, mailEventsSink: MailEventsSink, writeBufferSize?: string | number, readBufferSize?: string | number): Promise<Inbox>;
     /**

package/build/asmail/resources/inbox.js

@@ -85,9 +85,9 @@ async function genMsgIdAndMakeFolder(delivPath, msgsFolder) {
 class Inbox extends user_files_1.UserFiles {
     constructor(userId, path, mailEventsSink, writeBufferSize, readBufferSize) {
         super(userId, path, writeBufferSize, readBufferSize);
+        this.mailEventsSink = mailEventsSink;
         this.metas = new MsgMetas(5 * 60 * 1000, (0, path_1.join)(this.path, 'delivery'), (0, path_1.join)(this.path, 'messages'));
         this.objFiles = new ObjFiles(5 * 60 * 1000, this.metas.deliveryFolder, this.metas.readyMsgsFolder);
-        this.mailEventsSink = mailEventsSink;
         Object.freeze(this);
     }
     static async make(userFolder, userId, mailEventsSink, writeBufferSize, readBufferSize) {

package/build/tests/protocols/asmail/retrieval/specs/events.js

@@ -33,6 +33,7 @@ exports.specs.definition = (setup) => (() => {
     let deliveryUrl;
     let user1;
     let sessionId;
+    let session2;
     (0, async_jasmine_1.beforeEachAsync)(async () => {
         asmailServer = setup().asmailServer;
         const retrievalUrl = await asmailServer.getRetrievalUrl();
@@ -40,23 +41,33 @@ exports.specs.definition = (setup) => (() => {
         deliveryUrl = await asmailServer.getDeliveryUrl();
         user1 = setup().user1;
         sessionId = await (0, test_utils_1.startSession)(user1, retrievalUrl);
+        session2 = await (0, test_utils_1.startSession)(user1, retrievalUrl);
     });
     (0, async_jasmine_1.itAsync)(`requires session to open web socket`, async () => {
         let rep = await (0, ws_utils_1.openSocket)(wsUrl, 'invalid session id');
         expect(rep.status).withContext('status for missing authorized session').toBe(retrieval_1.ERR_SC.needAuth);
     });
     (0, async_jasmine_1.itAsync)(`emits event on completion of message reception`, async () => {
-        let rep = await (0, ws_utils_1.openSocket)(wsUrl, sessionId);
-        expect(rep.status).toBe(retrieval_1.wsEventChannel.SC.ok);
-        const eventSrc = (0, ws_ipc_1.makeSubscriber)(rep.data, undefined);
-        const eventPromise = rxjs_1.Observable.create(obs => eventSrc.subscribe(retrieval_1.msgRecievedCompletely.EVENT_NAME, obs))
-            .take(1)
-            .toPromise();
+        globalThis.logTest = true;
+        function subscribeAndWaitInSession(rep) {
+            expect(rep.status).toBe(retrieval_1.wsEventChannel.SC.ok);
+            const eventSrc = (0, ws_ipc_1.makeSubscriber)(rep.data, undefined);
+            return rxjs_1.Observable.create(obs => eventSrc.subscribe(retrieval_1.msgRecievedCompletely.EVENT_NAME, obs))
+                .take(1)
+                .toPromise();
+        }
+        const eventPromises = [
+            subscribeAndWaitInSession(await (0, ws_utils_1.openSocket)(wsUrl, sessionId)),
+            subscribeAndWaitInSession(await (0, ws_utils_1.openSocket)(wsUrl, session2)),
+        ];
         // give some time for subscription to occur
         await (0, processes_1.sleep)(10);
         const msgId = await (0, test_utils_1.sendMsg)(deliveryUrl, user1.id, test_utils_1.msg);
-        const event = await eventPromise;
-        expect(typeof event).toBe('object');
-        expect(event.msgId).withContext(`message reception completion event should give a respective message id`).toBe(msgId);
+        for (const eventPromise of eventPromises) {
+            const event = await eventPromise;
+            expect(typeof event).toBe('object');
+            expect(event.msgId).withContext(`message reception completion event should give a respective message id`).toBe(msgId);
+        }
+        globalThis.logTest = false;
     });
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spec-3nweb-server",
-  "version": "1.8.7",
+  "version": "1.8.9",
   "description": "3NWeb spec server.",
   "main": "build/lib.js",
   "types": "build/lib.d.ts",
@@ -38,11 +38,11 @@
     "command-line-args": "^5.2.1",
     "command-line-usage": "^7.0.1",
     "ecma-nacl": "^2.4.0",
-    "express": "^4.19.2",
-    "js-yaml": "^4.1.0",
+    "express": "^4.22.2",
+    "js-yaml": "^4.3.0",
     "prompts": "^2.4.2",
     "punycode": "^2.1.1",
-    "ws": "^7.4.6",
+    "ws": "^7.5.11",
     "xsp-files": "^2.0.0"
   },
   "devDependencies": {

package/ts-code/asmail/resources/inbox.ts

@@ -56,8 +56,7 @@ type AuthSenderInvites = configApi.p.authSenderInvites.List;
 type AnonSenderInvites = configApi.p.anonSenderInvites.List;
 
 type MsgMeta = retrievalApi.MsgMeta;
-export type MsgEvents = retrievalApi.msgMainObjRecieved.Event |
-	retrievalApi.msgRecievedCompletely.Event;
+export type MsgEvents = retrievalApi.msgMainObjRecieved.Event | retrievalApi.msgRecievedCompletely.Event;
 
 export type MailEventsSink = (
 	userId: string, channel: string, event: MsgEvents
@@ -117,20 +116,16 @@ export interface InboxParams {
 
 export class Inbox extends UserFiles<InboxParams> {
 
-	private metas = new MsgMetas(
-		5*60*1000, join(this.path, 'delivery'), join(this.path, 'messages'));
+	private readonly metas = new MsgMetas(5*60*1000, join(this.path, 'delivery'), join(this.path, 'messages'));
 
-	private objFiles = new ObjFiles(
-		5*60*1000, this.metas.deliveryFolder, this.metas.readyMsgsFolder);
+	private readonly objFiles = new ObjFiles(5*60*1000, this.metas.deliveryFolder, this.metas.readyMsgsFolder);
 
-	private mailEventsSink: MailEventsSink;
-	
 	constructor(
-		userId: string, path: string, mailEventsSink: MailEventsSink,
+		userId: string, path: string,
+		private mailEventsSink: MailEventsSink,
 		writeBufferSize?: string|number, readBufferSize?: string|number
 	) {
 		super(userId, path, writeBufferSize, readBufferSize);
-		this.mailEventsSink = mailEventsSink;
 		Object.freeze(this);
 	}
 	
@@ -139,9 +134,7 @@ export class Inbox extends UserFiles<InboxParams> {
 		writeBufferSize?: string|number, readBufferSize?: string|number
 	): Promise<Inbox> {
 		const path = join(userFolder, 'mail');
-		const inbox = new Inbox(
-			userId, path, mailEventsSink, writeBufferSize, readBufferSize
-		);
+		const inbox = new Inbox(userId, path, mailEventsSink, writeBufferSize, readBufferSize);
 		await inbox.ensureUserExistsOnDisk();
 		return inbox;
 	}
@@ -285,9 +278,7 @@ export class Inbox extends UserFiles<InboxParams> {
 		this.objFiles.changeToReadingPathsInMsg(msgId);
 		
 		// raise event about completion of receiving a message
-		this.mailEventsSink(this.userId,
-			retrievalApi.msgRecievedCompletely.EVENT_NAME,
-			{ msgId });
+		this.mailEventsSink(this.userId, retrievalApi.msgRecievedCompletely.EVENT_NAME, { msgId });
 	}
 
 	private areAllMsgObjsComplete(

package/ts-code/asmail/resources/recipients.ts

@@ -317,9 +317,7 @@ export function makeRecipients(
 			}
 		} else {
 			const userFolder = userDataInRootFolder(rootFolder, userId);
-			inbox = await Inbox.make(
-				userFolder, userId, mailEventsSink, writeBufferSize, readBufferSize
-			);
+			inbox = await Inbox.make(userFolder, userId, mailEventsSink, writeBufferSize, readBufferSize);
 			boxes.set(userId, inbox);
 			return inbox;
 		}

package/ts-code/tests/libs-for-tests/ws-utils.ts

@@ -22,8 +22,7 @@ import { defer } from '../../lib-common/processes';
 import { makeConnectionException } from '../../lib-common/exceptions/http';
 import { globalAgent as agent } from 'https';
 
-export function openSocket(url: string, sessionId: string):
-		Promise<Reply<WebSocket>> {
+export function openSocket(url: string, sessionId: string): Promise<Reply<WebSocket>> {
 	if (!url.startsWith('wss://')) { throw new Error(
 		`Url protocol must be wss`); }
 	const headers: any = {};

package/ts-code/tests/protocols/asmail/retrieval/specs/events.ts

@@ -34,6 +34,7 @@ specs.definition = (setup: () => TestSetup) => (() => {
 	let deliveryUrl: string;
 	let user1: User;
 	let sessionId: string;
+	let session2: string;
 
 	beforeEachAsync(async () => {
 		asmailServer = setup().asmailServer;
@@ -42,6 +43,7 @@ specs.definition = (setup: () => TestSetup) => (() => {
 		deliveryUrl = await asmailServer.getDeliveryUrl();
 		user1 = setup().user1;
 		sessionId = await startSession(user1, retrievalUrl);
+		session2 = await startSession(user1, retrievalUrl);
 	});
 	
 	itAsync(`requires session to open web socket`, async () => {
@@ -53,26 +55,39 @@ specs.definition = (setup: () => TestSetup) => (() => {
 	
 	itAsync(`emits event on completion of message reception`, async () => {
 
-		let rep = await openSocket(wsUrl, sessionId);
-		expect(rep.status).toBe(api.SC.ok);
-		
-		const eventSrc = makeSubscriber(rep.data, undefined);
+		globalThis.logTest = true;
+
+		function subscribeAndWaitInSession(rep: Awaited<ReturnType<typeof openSocket>>) {
+			expect(rep.status).toBe(api.SC.ok);
+			
+			const eventSrc = makeSubscriber(rep.data, undefined);
+
+			return (Observable.create(obs => eventSrc.subscribe<msgRecievedCompletely.Event>(
+				msgRecievedCompletely.EVENT_NAME, obs
+			)) as Observable<msgRecievedCompletely.Event>)
+			.take(1)
+			.toPromise();
+		}
 
-		const eventPromise = (Observable.create(
-			obs => eventSrc.subscribe<msgRecievedCompletely.Event>(
-			msgRecievedCompletely.EVENT_NAME, obs)) as Observable<msgRecievedCompletely.Event>)
-		.take(1)
-		.toPromise();
+		const eventPromises = [
+			subscribeAndWaitInSession(await openSocket(wsUrl, sessionId)),
+			subscribeAndWaitInSession(await openSocket(wsUrl, session2)),
+		];
 		
 		// give some time for subscription to occur
 		await sleep(10);
 		
 		const msgId = await sendMsg(deliveryUrl, user1.id, msg);
 
-		const event = await eventPromise;
-		expect(typeof event).toBe('object');
-		expect(event.msgId).withContext(`message reception completion event should give a respective message id`).toBe(msgId);
+		for (const eventPromise of eventPromises) {
+			const event = await eventPromise;
+			expect(typeof event).toBe('object');
+			expect(event.msgId).withContext(
+				`message reception completion event should give a respective message id`
+			).toBe(msgId);
+		}
 
+		globalThis.logTest = false;
 	});
 
 });