@protontech/drive-sdk 0.0.13 → 0.1.0

package/dist/internal/events/eventManager.test.js

@@ -1,120 +1,205 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const logger_1 = require("../../tests/logger");
-const apiService_1 = require("../apiService");
 const eventManager_1 = require("./eventManager");
+const interface_1 = require("./interface");
 jest.useFakeTimers();
+const POLLING_INTERVAL = 1;
 describe("EventManager", () => {
     let manager;
-    const getLastEventIdMock = jest.fn();
+    const getLatestEventIdMock = jest.fn();
     const getEventsMock = jest.fn();
-    const updateLatestEventIdMock = jest.fn();
     const listenerMock = jest.fn();
+    const mockLogger = (0, logger_1.getMockLogger)();
+    const subscriptions = [];
     beforeEach(() => {
-        jest.clearAllMocks();
-        getLastEventIdMock.mockImplementation(() => Promise.resolve("eventId1"));
-        getEventsMock.mockImplementation(() => Promise.resolve({
-            lastEventId: "eventId2",
-            more: false,
-            refresh: false,
-            events: ["event1", "event2"],
-        }));
-        manager = new eventManager_1.EventManager((0, logger_1.getMockLogger)(), getLastEventIdMock, getEventsMock, updateLatestEventIdMock);
-        manager.addListener(listenerMock);
+        const mockEventManager = {
+            getLogger: () => mockLogger,
+            getLatestEventId: getLatestEventIdMock,
+            getEvents: getEventsMock,
+        };
+        manager = new eventManager_1.EventManager(mockEventManager, POLLING_INTERVAL, null);
+        const subscription = manager.addListener(listenerMock);
+        subscriptions.push(subscription);
     });
     afterEach(async () => {
         await manager.stop();
+        while (subscriptions.length > 0) {
+            const subscription = subscriptions.pop();
+            subscription?.dispose();
+        }
+        jest.clearAllMocks();
     });
-    it("should get latest event ID on first run only", async () => {
-        await manager.start();
-        expect(getLastEventIdMock).toHaveBeenCalledTimes(1);
-        expect(getEventsMock).toHaveBeenCalledTimes(0);
-        expect(listenerMock).toHaveBeenCalledTimes(0);
-        expect(updateLatestEventIdMock).toHaveBeenCalledTimes(1);
-        expect(updateLatestEventIdMock).toHaveBeenCalledWith('eventId1');
-    });
-    it("should notify about events in the next run", async () => {
-        await manager.start();
-        expect(getLastEventIdMock).toHaveBeenCalledTimes(1);
+    it("should start polling when started", async () => {
+        getLatestEventIdMock.mockResolvedValue('EventId1');
+        const mockEvents = [
+            [{
+                    type: interface_1.DriveEventType.FastForward,
+                    treeEventScopeId: 'volume1',
+                    eventId: 'EventId2',
+                }],
+            [{
+                    type: interface_1.DriveEventType.FastForward,
+                    treeEventScopeId: 'volume1',
+                    eventId: 'EventId3',
+                }],
+        ];
+        getEventsMock.mockImplementationOnce(async function* () {
+            yield* mockEvents[0];
+        }).mockImplementationOnce(async function* () {
+            yield* mockEvents[1];
+        }).mockImplementationOnce(async function* () {
+        });
+        expect(getLatestEventIdMock).toHaveBeenCalledTimes(0);
         expect(getEventsMock).toHaveBeenCalledTimes(0);
-        expect(listenerMock).toHaveBeenCalledTimes(0);
-        expect(updateLatestEventIdMock).toHaveBeenCalledTimes(1);
-        expect(updateLatestEventIdMock).toHaveBeenCalledWith('eventId1');
-        updateLatestEventIdMock.mockClear();
+        expect(await manager.start()).toBeUndefined();
+        expect(getLatestEventIdMock).toHaveBeenCalledTimes(1);
+        expect(getEventsMock).toHaveBeenCalledWith('EventId1');
         await jest.runOnlyPendingTimersAsync();
-        expect(getEventsMock).toHaveBeenCalledTimes(1);
-        expect(listenerMock).toHaveBeenCalledTimes(1);
-        expect(updateLatestEventIdMock).toHaveBeenCalledTimes(1);
-        expect(updateLatestEventIdMock).toHaveBeenCalledWith('eventId2');
+        expect(getEventsMock).toHaveBeenCalledTimes(2);
+        expect(getEventsMock).toHaveBeenCalledWith('EventId2');
     });
-    it("should continue with more events", async () => {
-        getEventsMock.mockImplementation((lastEventId) => Promise.resolve({
-            lastEventId: lastEventId === "eventId1" ? "eventId2" : "eventId3",
-            more: lastEventId === "eventId1" ? true : false,
-            refresh: false,
-            events: lastEventId === "eventId1" ? ["event1", "event2"] : ["event3"],
-        }));
+    it("should stop polling when stopped", async () => {
+        getLatestEventIdMock.mockResolvedValue('eventId1');
+        getEventsMock.mockImplementation(async function* () {
+            yield {
+                type: interface_1.DriveEventType.FastForward,
+                treeEventScopeId: 'volume1',
+                eventId: 'eventId1',
+            };
+        });
         await manager.start();
         await jest.runOnlyPendingTimersAsync();
-        expect(getEventsMock).toHaveBeenCalledTimes(2);
-        expect(listenerMock).toHaveBeenCalledTimes(2);
-        expect(listenerMock).toHaveBeenCalledWith(["event1", "event2"], false);
-        expect(listenerMock).toHaveBeenCalledWith(["event3"], false);
-        expect(updateLatestEventIdMock).toHaveBeenCalledTimes(3);
-        expect(updateLatestEventIdMock).toHaveBeenCalledWith('eventId1');
-        expect(updateLatestEventIdMock).toHaveBeenCalledWith('eventId2');
-        expect(updateLatestEventIdMock).toHaveBeenCalledWith('eventId3');
+        const callsBeforeStop = getEventsMock.mock.calls.length;
+        await manager.stop();
+        await jest.runOnlyPendingTimersAsync();
+        // Should not have made additional calls after stopping
+        expect(getEventsMock).toHaveBeenCalledTimes(callsBeforeStop);
     });
-    it("should refresh if event does not exist", async () => {
-        getEventsMock.mockImplementation(() => Promise.reject(new apiService_1.NotFoundAPIError('Event not found', 2501)));
-        await manager.start();
+    it("should notify all listeners when getting events", async () => {
+        getLatestEventIdMock.mockResolvedValue('eventId1');
+        const mockEvents = [
+            {
+                type: interface_1.DriveEventType.NodeCreated,
+                nodeUid: 'node1',
+                parentNodeUid: 'parent1',
+                isTrashed: false,
+                isShared: false,
+                treeEventScopeId: 'volume1',
+                eventId: 'eventId2',
+            },
+        ];
+        getEventsMock.mockImplementationOnce(async function* () {
+            yield* mockEvents;
+        }).mockImplementation(async function* () {
+        });
+        expect(await manager.start()).toBeUndefined();
         await jest.runOnlyPendingTimersAsync();
-        expect(getLastEventIdMock).toHaveBeenCalledTimes(2);
         expect(listenerMock).toHaveBeenCalledTimes(1);
-        expect(listenerMock).toHaveBeenCalledWith([], true);
-        expect(updateLatestEventIdMock).toHaveBeenCalledTimes(1);
-        expect(updateLatestEventIdMock).toHaveBeenCalledWith('eventId1');
+        expect(listenerMock).toHaveBeenNthCalledWith(1, mockEvents[0]);
     });
-    it("should retry on error", async () => {
-        let index = 0;
-        getEventsMock.mockImplementation(() => {
-            index++;
-            if (index <= 3) {
-                return Promise.reject(new Error("Error"));
+    it("should propagate unsubscription errors", async () => {
+        getLatestEventIdMock.mockImplementation(() => {
+            throw new interface_1.UnsubscribeFromEventsSourceError("Not found");
+        });
+        await expect(manager.start()).rejects.toThrow(interface_1.UnsubscribeFromEventsSourceError);
+        expect(getLatestEventIdMock).toHaveBeenCalledTimes(1);
+        expect(listenerMock).toHaveBeenCalledTimes(0);
+        expect(getEventsMock).toHaveBeenCalledTimes(0);
+    });
+    it("should continue processing multiple events", async () => {
+        getLatestEventIdMock.mockResolvedValue('eventId1');
+        const mockEvents = [
+            {
+                type: interface_1.DriveEventType.NodeCreated,
+                nodeUid: 'node1',
+                parentNodeUid: 'parent1',
+                isTrashed: false,
+                isShared: false,
+                treeEventScopeId: 'volume1',
+                eventId: 'eventId2',
+            },
+            {
+                type: interface_1.DriveEventType.NodeCreated,
+                nodeUid: 'node2',
+                parentNodeUid: 'parent1',
+                isTrashed: false,
+                isShared: false,
+                treeEventScopeId: 'volume1',
+                eventId: 'eventId3',
             }
-            return Promise.resolve({
-                lastEventId: "eventId2",
-                more: false,
-                refresh: false,
-                events: ["event1", "event2"],
-            });
+        ];
+        getEventsMock.mockImplementationOnce(async function* () {
+            yield* mockEvents;
+        }).mockImplementation(async function* () {
+            // Empty generator for subsequent calls
         });
         await manager.start();
-        updateLatestEventIdMock.mockClear();
-        // First failure.
         await jest.runOnlyPendingTimersAsync();
-        expect(listenerMock).toHaveBeenCalledTimes(0);
-        expect(manager.nextPollTimeout).toBe(30000);
-        // Second failure.
+        expect(listenerMock).toHaveBeenCalledTimes(2);
+        expect(listenerMock).toHaveBeenNthCalledWith(1, mockEvents[0]);
+        expect(listenerMock).toHaveBeenNthCalledWith(2, mockEvents[1]);
+        getEventsMock.mockImplementationOnce(async function* () {
+            yield* mockEvents;
+        });
         await jest.runOnlyPendingTimersAsync();
-        expect(listenerMock).toHaveBeenCalledTimes(0);
-        expect(manager.nextPollTimeout).toBe(60000);
-        // Third failure.
+        expect(listenerMock).toHaveBeenCalledTimes(4);
+        expect(listenerMock).toHaveBeenNthCalledWith(1, mockEvents[0]);
+        expect(listenerMock).toHaveBeenNthCalledWith(2, mockEvents[1]);
+    });
+    it("should retry on error with exponential backoff", async () => {
+        getLatestEventIdMock.mockResolvedValue('eventId1');
+        let callCount = 0;
+        getEventsMock.mockImplementation(async function* () {
+            callCount++;
+            if (callCount <= 3) {
+                throw new Error("Network error");
+            }
+            yield {
+                type: interface_1.DriveEventType.FastForward,
+                treeEventScopeId: 'volume1',
+                eventId: 'eventId3',
+            };
+        });
+        expect(manager['retryIndex']).toEqual(0);
+        expect(await manager.start()).toBeUndefined();
+        expect(getEventsMock).toHaveBeenCalledTimes(1);
+        expect(manager['retryIndex']).toEqual(1);
+        await jest.runOnlyPendingTimersAsync();
+        expect(getEventsMock).toHaveBeenCalledTimes(2);
+        expect(manager['retryIndex']).toEqual(2);
         await jest.runOnlyPendingTimersAsync();
+        expect(manager['retryIndex']).toEqual(3);
         expect(listenerMock).toHaveBeenCalledTimes(0);
-        expect(manager.nextPollTimeout).toBe(90000);
-        // And now it passes.
         await jest.runOnlyPendingTimersAsync();
         expect(listenerMock).toHaveBeenCalledTimes(1);
-        expect(listenerMock).toHaveBeenCalledWith(["event1", "event2"], false);
-        expect(updateLatestEventIdMock).toHaveBeenCalledTimes(1);
-        expect(updateLatestEventIdMock).toHaveBeenCalledWith('eventId2');
+        // After success, retry index should reset
+        expect(manager['retryIndex']).toEqual(0);
     });
-    it("should stop polling", async () => {
-        await manager.start();
+    it("should stop polling when stopped immediately", async () => {
+        getLatestEventIdMock.mockResolvedValue('eventId1');
+        getEventsMock.mockImplementation(async function* () {
+            yield {
+                type: interface_1.DriveEventType.FastForward,
+                treeEventScopeId: 'volume1',
+                eventId: 'eventId1',
+            };
+        });
+        expect(await manager.start()).toBeUndefined();
+        expect(getEventsMock).toHaveBeenCalledTimes(1);
         await manager.stop();
         await jest.runOnlyPendingTimersAsync();
-        expect(getEventsMock).toHaveBeenCalledTimes(0);
+        // getEvents should have been called once during start, but not again after stop
+        expect(getEventsMock).toHaveBeenCalledTimes(1);
+    });
+    it("should handle empty event streams", async () => {
+        getLatestEventIdMock.mockResolvedValue('eventId1');
+        getEventsMock.mockImplementation(async function* () {
+            // Empty generator - no events
+        });
+        await manager.start();
+        await jest.runOnlyPendingTimersAsync();
+        expect(listenerMock).toHaveBeenCalledTimes(0);
     });
 });
 //# sourceMappingURL=eventManager.test.js.map

package/dist/internal/events/eventManager.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"eventManager.test.js","sourceRoot":"","sources":["../../../src/internal/events/eventManager.test.ts"],"names":[],"mappings":";;AAAA,+CAAmD;AACnD,8CAAiD;AACjD,iDAA8C;AAE9C,IAAI,CAAC,aAAa,EAAE,CAAC;AAErB,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;IAC1B,IAAI,OAA6B,CAAC;IAElC,MAAM,kBAAkB,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC;IACrC,MAAM,aAAa,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC;IAChC,MAAM,uBAAuB,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC;IAC1C,MAAM,YAAY,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC;IAE/B,UAAU,CAAC,GAAG,EAAE;QACZ,IAAI,CAAC,aAAa,EAAE,CAAC;QAErB,kBAAkB,CAAC,kBAAkB,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC;QACzE,aAAa,CAAC,kBAAkB,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC;YACnD,WAAW,EAAE,UAAU;YACvB,IAAI,EAAE,KAAK;YACX,OAAO,EAAE,KAAK;YACd,MAAM,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC;SAC/B,CAAC,CAAC,CAAC;QAEJ,OAAO,GAAG,IAAI,2BAAY,CACtB,IAAA,sBAAa,GAAE,EACf,kBAAkB,EAClB,aAAa,EACb,uBAAuB,CAC1B,CAAC;QACF,OAAO,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;IACtC,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,KAAK,IAAI,EAAE;QACjB,MAAM,OAAO,CAAC,IAAI,EAAE,CAAC;IACzB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,8CAA8C,EAAE,KAAK,IAAI,EAAE;QAC1D,MAAM,OAAO,CAAC,KAAK,EAAE,CAAC;QACtB,MAAM,CAAC,kBAAkB,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;QACpD,MAAM,CAAC,aAAa,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;QAC/C,MAAM,CAAC,YAAY,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;QAC9C,MAAM,CAAC,uBAAuB,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;QACzD,MAAM,CAAC,uBAAuB,CAAC,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC;IACrE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4CAA4C,EAAE,KAAK,IAAI,EAAE;QACxD,MAAM,OAAO,CAAC,KAAK,EAAE,CAAC;QACtB,MAAM,CAAC,kBAAkB,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;QACpD,MAAM,CAAC,aAAa,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;QAC/C,MAAM,CAAC,YAAY,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;QAC9C,MAAM,CAAC,uBAAuB,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;QACzD,MAAM,CAAC,uBAAuB,CAAC,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC;QACjE,uBAAuB,CAAC,SAAS,EAAE,CAAC;QACpC,MAAM,IAAI,CAAC,yBAAyB,EAAE,CAAC;QACvC,MAAM,CAAC,aAAa,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;QAC/C,MAAM,CAAC,YAAY,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;QAC9C,MAAM,CAAC,uBAAuB,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;QACzD,MAAM,CAAC,uBAAuB,CAAC,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC;IACrE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kCAAkC,EAAE,KAAK,IAAI,EAAE;QAC9C,aAAa,CAAC,kBAAkB,CAAC,CAAC,WAAmB,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC;YACtE,WAAW,EAAE,WAAW,KAAK,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,UAAU;YACjE,IAAI,EAAE,WAAW,KAAK,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK;YAC/C,OAAO,EAAE,KAAK;YACd,MAAM,EAAE,WAAW,KAAK,UAAU,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;SACzE,CAAC,CAAC,CAAC;QACJ,MAAM,OAAO,CAAC,KAAK,EAAE,CAAC;QACtB,MAAM,IAAI,CAAC,yBAAyB,EAAE,CAAC;QACvC,MAAM,CAAC,aAAa,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;QAC/C,MAAM,CAAC,YAAY,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;QAC9C,MAAM,CAAC,YAAY,CAAC,CAAC,oBAAoB,CAAC,CAAC,QAAQ,EAAE,QAAQ,CAAC,EAAE,KAAK,CAAC,CAAC;QACvE,MAAM,CAAC,YAAY,CAAC,CAAC,oBAAoB,CAAC,CAAC,QAAQ,CAAC,EAAE,KAAK,CAAC,CAAC;QAC7D,MAAM,CAAC,uBAAuB,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;QACzD,MAAM,CAAC,uBAAuB,CAAC,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC;QACjE,MAAM,CAAC,uBAAuB,CAAC,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC;QACjE,MAAM,CAAC,uBAAuB,CAAC,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC;IACrE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,wCAAwC,EAAE,KAAK,IAAI,EAAE;QACpD,aAAa,CAAC,kBAAkB,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,6BAAgB,CAAC,iBAAiB,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;QACtG,MAAM,OAAO,CAAC,KAAK,EAAE,CAAC;QACtB,MAAM,IAAI,CAAC,yBAAyB,EAAE,CAAC;QACvC,MAAM,CAAC,kBAAkB,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;QACpD,MAAM,CAAC,YAAY,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;QAC9C,MAAM,CAAC,YAAY,CAAC,CAAC,oBAAoB,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;QACpD,MAAM,CAAC,uBAAuB,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;QACzD,MAAM,CAAC,uBAAuB,CAAC,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC;IACrE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uBAAuB,EAAE,KAAK,IAAI,EAAE;QACnC,IAAI,KAAK,GAAG,CAAC,CAAC;QACd,aAAa,CAAC,kBAAkB,CAAC,GAAG,EAAE;YAClC,KAAK,EAAE,CAAC;YACR,IAAI,KAAK,IAAI,CAAC,EAAE,CAAC;gBACb,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;YAC9C,CAAC;YACD,OAAO,OAAO,CAAC,OAAO,CAAC;gBACnB,WAAW,EAAE,UAAU;gBACvB,IAAI,EAAE,KAAK;gBACX,OAAO,EAAE,KAAK;gBACd,MAAM,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC;aAC/B,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QACH,MAAM,OAAO,CAAC,KAAK,EAAE,CAAC;QACtB,uBAAuB,CAAC,SAAS,EAAE,CAAC;QAEpC,iBAAiB;QACjB,MAAM,IAAI,CAAC,yBAAyB,EAAE,CAAC;QACvC,MAAM,CAAC,YAAY,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;QAC9C,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAE5C,kBAAkB;QAClB,MAAM,IAAI,CAAC,yBAAyB,EAAE,CAAC;QACvC,MAAM,CAAC,YAAY,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;QAC9C,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAE5C,iBAAiB;QACjB,MAAM,IAAI,CAAC,yBAAyB,EAAE,CAAC;QACvC,MAAM,CAAC,YAAY,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;QAC9C,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAE5C,qBAAqB;QACrB,MAAM,IAAI,CAAC,yBAAyB,EAAE,CAAC;QACvC,MAAM,CAAC,YAAY,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;QAC9C,MAAM,CAAC,YAAY,CAAC,CAAC,oBAAoB,CAAC,CAAC,QAAQ,EAAE,QAAQ,CAAC,EAAE,KAAK,CAAC,CAAC;QACvE,MAAM,CAAC,uBAAuB,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;QACzD,MAAM,CAAC,uBAAuB,CAAC,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC;IACrE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,qBAAqB,EAAE,KAAK,IAAI,EAAE;QACjC,MAAM,OAAO,CAAC,KAAK,EAAE,CAAC;QACtB,MAAM,OAAO,CAAC,IAAI,EAAE,CAAC;QACrB,MAAM,IAAI,CAAC,yBAAyB,EAAE,CAAC;QACvC,MAAM,CAAC,aAAa,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;IACnD,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
+{"version":3,"file":"eventManager.test.js","sourceRoot":"","sources":["../../../src/internal/events/eventManager.test.ts"],"names":[],"mappings":"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"}

package/dist/internal/events/index.d.ts

@@ -1,6 +1,7 @@
-import { ProtonDriveEntitiesCache, ProtonDriveTelemetry } from "../../interface";
+import { ProtonDriveTelemetry } from "../../interface";
 import { DriveAPIService } from "../apiService";
-import { DriveListener } from "./interface";
+import { DriveListener, EventSubscription, LatestEventIdProvider } from "./interface";
+import { SharesManager } from "../shares/manager";
 export type { DriveEvent, DriveListener } from "./interface";
 export { DriveEventType } from "./interface";
 /**
@@ -10,41 +11,20 @@ export { DriveEventType } from "./interface";
  */
 export declare class DriveEventsService {
     private telemetry;
+    private shareManagement;
+    private cacheEventListeners;
+    private latestEventIdProvider?;
     private apiService;
-    private cache;
-    private subscribedToRemoteDataUpdates;
-    private listeners;
-    private coreEvents;
-    private volumesEvents;
+    private coreEvents?;
+    private volumeEventManagers;
     private logger;
-    constructor(telemetry: ProtonDriveTelemetry, apiService: DriveAPIService, driveEntitiesCache: ProtonDriveEntitiesCache);
+    constructor(telemetry: ProtonDriveTelemetry, apiService: DriveAPIService, shareManagement: SharesManager, cacheEventListeners?: DriveListener[], latestEventIdProvider?: LatestEventIdProvider | undefined);
     /**
-     * Loads all the subscribed volumes (including core events) from the
-     * cache and starts listening to their events. Any additional volume
-     * that is subscribed to later will be automatically started.
+     * Subscribe to drive events. The treeEventScopeId can be obtained from a node.
      */
-    subscribeToRemoteDataUpdates(): Promise<void>;
-    /**
-     * Subscribe to given volume. The volume will be polled for events
-     * with the polling interval depending on the type of the volume.
-     * Own volumes are polled with highest frequency, while others are
-     * polled with lower frequency depending on the total number of
-     * subscriptions.
-     *
-     * @param isOwnVolume - Owned volumes are polled with higher frequency.
-     */
-    listenToVolume(volumeId: string, isOwnVolume?: boolean): Promise<void>;
-    private loadSubscribedVolumeEventServices;
+    subscribeToTreeEvents(treeEventScopeId: string, callback: DriveListener): Promise<EventSubscription>;
+    subscribeToCoreEvents(callback: DriveListener): Promise<EventSubscription>;
     private sendNumberOfVolumeSubscriptionsToTelemetry;
     private createVolumeEventManager;
-    /**
-     * Listen to the drive events. The listener will be called with the
-     * new events as they arrive.
-     *
-     * One call always provides events from withing the same volume. The
-     * second argument of the callback `fullRefreshVolumeId` is thus single
-     * ID and if multiple volumes must be fully refreshed, client will
-     * receive multiple calls.
-     */
-    addListener(callback: DriveListener): void;
+    private getDefaultVolumePollingInterval;
 }

package/dist/internal/events/index.js

@@ -2,13 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DriveEventsService = exports.DriveEventType = void 0;
 const apiService_1 = require("./apiService");
-const cache_1 = require("./cache");
 const coreEventManager_1 = require("./coreEventManager");
 const volumeEventManager_1 = require("./volumeEventManager");
+const eventManager_1 = require("./eventManager");
 var interface_1 = require("./interface");
 Object.defineProperty(exports, "DriveEventType", { enumerable: true, get: function () { return interface_1.DriveEventType; } });
 const OWN_VOLUME_POLLING_INTERVAL = 30;
 const OTHER_VOLUME_POLLING_INTERVAL = 60;
+const CORE_POLLING_INTERVAL = 30;
 /**
  * Service for listening to drive events. The service is responsible for
  * managing the subscriptions to the events and notifying the listeners
@@ -16,101 +17,84 @@ const OTHER_VOLUME_POLLING_INTERVAL = 60;
  */
 class DriveEventsService {
     telemetry;
+    shareManagement;
+    cacheEventListeners;
+    latestEventIdProvider;
     apiService;
-    cache;
-    subscribedToRemoteDataUpdates = false;
-    listeners = [];
     coreEvents;
-    volumesEvents;
+    volumeEventManagers;
     logger;
-    constructor(telemetry, apiService, driveEntitiesCache) {
+    constructor(telemetry, apiService, shareManagement, cacheEventListeners = [], latestEventIdProvider) {
         this.telemetry = telemetry;
+        this.shareManagement = shareManagement;
+        this.cacheEventListeners = cacheEventListeners;
+        this.latestEventIdProvider = latestEventIdProvider;
         this.telemetry = telemetry;
         this.logger = telemetry.getLogger('events');
         this.apiService = new apiService_1.EventsAPIService(apiService);
-        this.cache = new cache_1.EventsCache(driveEntitiesCache);
-        // FIXME: Allow to pass own core events manager from the public interface.
-        this.coreEvents = new coreEventManager_1.CoreEventManager(this.logger, this.apiService, this.cache);
-        this.volumesEvents = {};
+        this.volumeEventManagers = {};
     }
     /**
-     * Loads all the subscribed volumes (including core events) from the
-     * cache and starts listening to their events. Any additional volume
-     * that is subscribed to later will be automatically started.
+     * Subscribe to drive events. The treeEventScopeId can be obtained from a node.
      */
-    async subscribeToRemoteDataUpdates() {
-        if (this.subscribedToRemoteDataUpdates) {
-            return;
-        }
-        await this.loadSubscribedVolumeEventServices();
-        this.sendNumberOfVolumeSubscriptionsToTelemetry();
-        this.subscribedToRemoteDataUpdates = true;
-        await this.coreEvents.startSubscription();
-        await Promise.all(Object.values(this.volumesEvents)
-            .map((volumeEvents) => volumeEvents.startSubscription()));
-    }
-    /**
-     * Subscribe to given volume. The volume will be polled for events
-     * with the polling interval depending on the type of the volume.
-     * Own volumes are polled with highest frequency, while others are
-     * polled with lower frequency depending on the total number of
-     * subscriptions.
-     *
-     * @param isOwnVolume - Owned volumes are polled with higher frequency.
-     */
-    async listenToVolume(volumeId, isOwnVolume = false) {
-        await this.loadSubscribedVolumeEventServices();
-        if (this.volumesEvents[volumeId]) {
-            return;
-        }
+    async subscribeToTreeEvents(treeEventScopeId, callback) {
+        const volumeId = treeEventScopeId;
         this.logger.debug(`Creating volume event manager for volume ${volumeId}`);
-        const manager = this.createVolumeEventManager(volumeId, isOwnVolume);
-        // FIXME: Use dynamic algorithm to determine polling interval for non-own volumes.
-        manager.setPollingInterval(isOwnVolume ? OWN_VOLUME_POLLING_INTERVAL : OTHER_VOLUME_POLLING_INTERVAL);
-        if (this.subscribedToRemoteDataUpdates) {
-            await manager.startSubscription();
+        let manager = this.volumeEventManagers[volumeId];
+        let started = true;
+        if (manager === undefined) {
+            manager = await this.createVolumeEventManager(volumeId);
+            this.volumeEventManagers[volumeId] = manager;
+            started = false;
             this.sendNumberOfVolumeSubscriptionsToTelemetry();
         }
+        const eventSubscription = manager.addListener(callback);
+        if (!started) {
+            await manager.start();
+        }
+        return eventSubscription;
     }
-    async loadSubscribedVolumeEventServices() {
-        for (const volumeId of await this.cache.getSubscribedVolumeIds()) {
-            if (!this.volumesEvents[volumeId]) {
-                const isOwnVolume = await this.cache.isOwnVolume(volumeId) || false;
-                this.createVolumeEventManager(volumeId, isOwnVolume);
+    // FIXME: Allow to pass own core events manager from the public interface.
+    async subscribeToCoreEvents(callback) {
+        if (this.latestEventIdProvider === null || this.latestEventIdProvider === undefined) {
+            throw new Error('Cannot subscribe to events without passing a latestEventIdProvider in ProtonDriveClient initialization');
+        }
+        if (this.coreEvents === undefined) {
+            const coreEventManager = new coreEventManager_1.CoreEventManager(this.logger, this.apiService);
+            const latestEventId = this.latestEventIdProvider.getLatestEventId('core') ?? null;
+            this.coreEvents = new eventManager_1.EventManager(coreEventManager, CORE_POLLING_INTERVAL, latestEventId);
+            for (const listener of this.cacheEventListeners) {
+                this.coreEvents.addListener(listener);
             }
         }
+        const eventSubscription = this.coreEvents.addListener(callback);
+        await this.coreEvents.start();
+        return eventSubscription;
     }
     sendNumberOfVolumeSubscriptionsToTelemetry() {
         this.telemetry.logEvent({
             eventName: 'volumeEventsSubscriptionsChanged',
-            numberOfVolumeSubscriptions: Object.keys(this.volumesEvents).length,
+            numberOfVolumeSubscriptions: Object.keys(this.volumeEventManagers).length,
         });
     }
-    createVolumeEventManager(volumeId, isOwnVolume) {
-        const manager = new volumeEventManager_1.VolumeEventManager(this.logger, this.apiService, this.cache, volumeId, isOwnVolume);
-        for (const listener of this.listeners) {
-            manager.addListener(listener);
+    async createVolumeEventManager(volumeId) {
+        if (this.latestEventIdProvider === null || this.latestEventIdProvider === undefined) {
+            throw new Error('Cannot subscribe to events without passing a latestEventIdProvider in ProtonDriveClient initialization');
         }
-        this.volumesEvents[volumeId] = manager;
-        return manager;
-    }
-    /**
-     * Listen to the drive events. The listener will be called with the
-     * new events as they arrive.
-     *
-     * One call always provides events from withing the same volume. The
-     * second argument of the callback `fullRefreshVolumeId` is thus single
-     * ID and if multiple volumes must be fully refreshed, client will
-     * receive multiple calls.
-     */
-    addListener(callback) {
-        // Add new listener to the list for any new event manager.
-        this.listeners.push(callback);
-        // Add new listener to all existings managers.
-        this.coreEvents.addListener(callback);
-        for (const volumeEvents of Object.values(this.volumesEvents)) {
-            volumeEvents.addListener(callback);
+        const isOwnVolume = await this.shareManagement.isOwnVolume(volumeId);
+        const pollingInterval = this.getDefaultVolumePollingInterval(isOwnVolume);
+        const volumeEventManager = new volumeEventManager_1.VolumeEventManager(this.logger, this.apiService, volumeId);
+        const latestEventId = this.latestEventIdProvider.getLatestEventId(volumeId);
+        const eventManager = new eventManager_1.EventManager(volumeEventManager, pollingInterval, latestEventId);
+        for (const listener of this.cacheEventListeners) {
+            eventManager.addListener(listener);
         }
+        await eventManager.start();
+        this.volumeEventManagers[volumeId] = eventManager;
+        return eventManager;
+    }
+    getDefaultVolumePollingInterval(isOwnVolume) {
+        return isOwnVolume ? OWN_VOLUME_POLLING_INTERVAL : OTHER_VOLUME_POLLING_INTERVAL;
     }
 }
 exports.DriveEventsService = DriveEventsService;

package/dist/internal/events/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/internal/events/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/internal/events/index.ts"],"names":[],"mappings":";;;AAGA,6CAAgD;AAChD,yDAAsD;AACtD,6DAA0D;AAC1D,iDAA8C;AAI9C,yCAA6C;AAApC,2GAAA,cAAc,OAAA;AAEvB,MAAM,2BAA2B,GAAG,EAAE,CAAC;AACvC,MAAM,6BAA6B,GAAG,EAAE,CAAC;AACzC,MAAM,qBAAqB,GAAG,EAAE,CAAC;AAEjC;;;;GAIG;AACH,MAAa,kBAAkB;IAMP;IAAsE;IAAwC;IAAmD;IAL7K,UAAU,CAAmB;IAC7B,UAAU,CAA4B;IACtC,mBAAmB,CAAmD;IACtE,MAAM,CAAS;IAEvB,YAAoB,SAA+B,EAAE,UAA2B,EAAU,eAA8B,EAAU,sBAAuC,EAAE,EAAU,qBAA6C;QAA9M,cAAS,GAAT,SAAS,CAAsB;QAAuC,oBAAe,GAAf,eAAe,CAAe;QAAU,wBAAmB,GAAnB,mBAAmB,CAAsB;QAAU,0BAAqB,GAArB,qBAAqB,CAAwB;QAC9N,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QAC5C,IAAI,CAAC,UAAU,GAAG,IAAI,6BAAgB,CAAC,UAAU,CAAC,CAAC;QACnD,IAAI,CAAC,mBAAmB,GAAG,EAAE,CAAC;IAClC,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,qBAAqB,CAAC,gBAAwB,EAAE,QAAuB;QACzE,MAAM,QAAQ,GAAG,gBAAgB,CAAC;QAClC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,4CAA4C,QAAQ,EAAE,CAAC,CAAC;QAC1E,IAAI,OAAO,GAAG,IAAI,CAAC,mBAAmB,CAAC,QAAQ,CAAC,CAAC;QACjD,IAAI,OAAO,GAAG,IAAI,CAAC;QACnB,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;YACxB,OAAO,GAAG,MAAM,IAAI,CAAC,wBAAwB,CAAC,QAAQ,CAAC,CAAC;YACxD,IAAI,CAAC,mBAAmB,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC;YAC7C,OAAO,GAAG,KAAK,CAAC;YAChB,IAAI,CAAC,0CAA0C,EAAE,CAAC;QACtD,CAAC;QACD,MAAM,iBAAiB,GAAG,OAAO,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QACxD,IAAI,CAAC,OAAO,EAAE,CAAC;YACX,MAAM,OAAO,CAAC,KAAK,EAAE,CAAC;QAC1B,CAAC;QACD,OAAO,iBAAiB,CAAC;IAC7B,CAAC;IAED,0EAA0E;IAC1E,KAAK,CAAC,qBAAqB,CAAC,QAAuB;QAC/C,IAAI,IAAI,CAAC,qBAAqB,KAAK,IAAI,IAAI,IAAI,CAAC,qBAAqB,KAAK,SAAS,EAAE,CAAC;YAClF,MAAM,IAAI,KAAK,CAAC,wGAAwG,CAAC,CAAC;QAC9H,CAAC;QACD,IAAI,IAAI,CAAC,UAAU,KAAK,SAAS,EAAE,CAAC;YAChC,MAAM,gBAAgB,GAAG,IAAI,mCAAgB,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;YAC5E,MAAM,aAAa,GAAG,IAAI,CAAC,qBAAqB,CAAC,gBAAgB,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC;YAClF,IAAI,CAAC,UAAU,GAAG,IAAI,2BAAY,CAAC,gBAAgB,EAAE,qBAAqB,EAAE,aAAa,CAAC,CAAC;YAC3F,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,mBAAmB,EAAE,CAAC;gBAC9C,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;YAC1C,CAAC;QACL,CAAC;QACD,MAAM,iBAAiB,GAAG,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QAChE,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;QAC9B,OAAO,iBAAiB,CAAC;IAC7B,CAAC;IAEO,0CAA0C;QAC9C,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC;YACpB,SAAS,EAAE,kCAAkC;YAC7C,2BAA2B,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC,MAAM;SAC5E,CAAC,CAAC;IACP,CAAC;IAEO,KAAK,CAAC,wBAAwB,CAAC,QAAgB;QACnD,IAAI,IAAI,CAAC,qBAAqB,KAAK,IAAI,IAAI,IAAI,CAAC,qBAAqB,KAAK,SAAS,EAAE,CAAC;YAClF,MAAM,IAAI,KAAK,CAAC,wGAAwG,CAAC,CAAC;QAC9H,CAAC;QACD,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QACrE,MAAM,eAAe,GAAG,IAAI,CAAC,+BAA+B,CAAC,WAAW,CAAC,CAAC;QAC1E,MAAM,kBAAkB,GAAG,IAAI,uCAAkB,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;QAC1F,MAAM,aAAa,GAAG,IAAI,CAAC,qBAAqB,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;QAC5E,MAAM,YAAY,GAAG,IAAI,2BAAY,CAAa,kBAAkB,EAAE,eAAe,EAAE,aAAa,CAAC,CAAC;QACtG,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,mBAAmB,EAAE,CAAC;YAC9C,YAAY,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QACvC,CAAC;QACD,MAAM,YAAY,CAAC,KAAK,EAAE,CAAC;QAC3B,IAAI,CAAC,mBAAmB,CAAC,QAAQ,CAAC,GAAG,YAAY,CAAC;QAClD,OAAO,YAAY,CAAC;IACxB,CAAC;IAEO,+BAA+B,CAAC,WAAoB;QACxD,OAAO,WAAW,CAAC,CAAC,CAAC,2BAA2B,CAAC,CAAC,CAAC,6BAA6B,CAAA;IACpF,CAAC;CACJ;AA/ED,gDA+EC"}