fix(logging.ts): do not poll log entries without lastReqId

Signed-off-by: Maksim Sukharev <[email protected]>

Author: Antreesy

src/store/logging.spec.ts

@@ -270,17 +270,34 @@ describe('store:logging', () => {
 		expect(store.entries).toEqual([{ message: 'hello' }])
 	})
 
-	it('loads more newer entries from server', async () => {
+	it('loads more newer entries from server (with pollLog)', async () => {
 		vi.mocked(mocks.pollLog).mockImplementationOnce(() => ({
-			data: [{ message: 'hello' }],
+			data: [{ reqId: '456', message: 'hello' }],
+		}))
+
+		const store = useLogStore()
+		store.allEntries = [{ reqId: '123', message: 'hello' }]
+
+		await store.loadMore(false)
+		expect(mocks.pollLog).toBeCalledWith({ lastReqId: '123' })
+		expect(store.entries).toEqual([{ reqId: '456', message: 'hello' }, { reqId: '123', message: 'hello' }])
+	})
+
+	it('loads more newer entries from server (with getLog)', async () => {
+		vi.mocked(mocks.getLog).mockImplementationOnce(() => ({
+			data: {
+				data: [{ message: 'hello' }],
+				remain: false,
+			},
 		}))
 
 		const store = useLogStore()
 		store.allEntries = []
 		expect(store.entries).toEqual([])
 
 		await store.loadMore(false)
-		expect(mocks.pollLog).toBeCalledWith({ lastReqId: '' })
+		expect(mocks.pollLog).not.toBeCalled()
+		expect(mocks.getLog).toBeCalledWith({ offset: 0, query: '' })
 		expect(store.entries).toEqual([{ message: 'hello' }])
 	})
 
@@ -335,12 +352,12 @@ describe('store:logging', () => {
 		}))
 
 		const store = useLogStore()
-		store.allEntries = []
+		store.allEntries = [{ reqId: '123' }]
 		store.startPolling()
 		expect(mocks.pollLog).not.toBeCalled()
 		vi.advanceTimersByTime(POLLING_INTERVAL)
 		expect(mocks.pollLog).toBeCalledTimes(1)
-		expect(mocks.pollLog).toBeCalledWith({ lastReqId: '' })
+		expect(mocks.pollLog).toBeCalledWith({ lastReqId: '123' })
 	})
 
 	it('can poll for new entries with old available', async () => {
@@ -361,26 +378,27 @@ describe('store:logging', () => {
 
 	it('can stop polling for new entries', async () => {
 		vi.mocked(mocks.pollLog).mockImplementationOnce(() => ({
-			data: [{ reqId: '123' }],
+			data: [{ reqId: '456' }],
 		}))
 
 		const store = useLogStore()
-		store.allEntries = []
+		store.allEntries = [{ reqId: '123' }]
 		store.startPolling()
 		expect(mocks.pollLog).not.toBeCalled()
 		vi.advanceTimersByTime(POLLING_INTERVAL)
 		store.stopPolling()
 		vi.advanceTimersByTime(POLLING_INTERVAL)
 		expect(mocks.pollLog).toBeCalledTimes(1)
+		expect(mocks.pollLog).toBeCalledWith({ lastReqId: '123' })
 	})
 
 	it('only starts one polling timer', async () => {
 		vi.mocked(mocks.pollLog).mockImplementationOnce(() => ({
-			data: [{ reqId: '123' }],
+			data: [{ reqId: '456' }],
 		}))
 
 		const store = useLogStore()
-		store.allEntries = []
+		store.allEntries = [{ reqId: '123' }]
 		store.startPolling()
 		expect(mocks.pollLog).not.toBeCalled()
 		await vi.advanceTimersByTimeAsync(POLLING_INTERVAL / 2)
@@ -426,6 +444,7 @@ describe('store:logging', () => {
 		})
 
 		const store = useLogStore()
+		store.allEntries = [{ reqId: '123' }]
 		store.startPolling()
 		await vi.advanceTimersByTimeAsync(POLLING_INTERVAL)
 		expect(mocks.pollLog).toBeCalled()
@@ -444,6 +463,7 @@ describe('store:logging', () => {
 		})
 
 		const store = useLogStore()
+		store.allEntries = [{ reqId: '123' }]
 		store.startPolling()
 		await vi.advanceTimersByTimeAsync(POLLING_INTERVAL)
 		expect(mocks.pollLog).toBeCalled()

src/store/logging.ts

@@ -75,12 +75,12 @@ export const useLogStore = defineStore('logreader-logs', () => {
 		}
 
 		try {
-			if (older) {
+			if (older || !allEntries.value.length) {
 				const { data } = await getLog({ offset: allEntries.value.length, query: query.value })
 				allEntries.value.push(...data.data.map(parseRawLogEntry))
 				hasRemainingEntries.value = data.remain
 			} else {
-				const { data } = await pollLog({ lastReqId: allEntries.value[0]?.reqId || '' })
+				const { data } = await pollLog({ lastReqId: allEntries.value[0]!.reqId })
 				allEntries.value.splice(0, 0, ...data.map(parseRawLogEntry))
 			}
 		} catch (e) {
@@ -147,9 +147,9 @@ export const useLogStore = defineStore('logreader-logs', () => {
 
 		const doPolling = async () => {
 			try {
-				// Only poll if not using a local file
-				if (_settings.isEnabled && query.value === '') {
-					const { data } = await pollLog({ lastReqId: allEntries.value[0]?.reqId || '' })
+				// Only poll if not using a local file and store already has some known entries
+				if (_settings.isEnabled && query.value === '' && allEntries.value.length) {
+					const { data } = await pollLog({ lastReqId: allEntries.value[0]!.reqId })
 					allEntries.value.splice(0, 0, ...data.map(parseRawLogEntry))
 				}
 			} catch (e) {