BLD-ERPAuto/BIPMaterialManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: remove unused imports and fix logger test isolation

Browse Source 
- Remove unused imports (run, trackDuration, PerformanceTracker,
  ConfigManager, disconnectDb) flagged by ESLint
- Remove unused isSlow variable in performance-monitor catch block
- Add eslint-disable for require() in Playwright JS script
- Fix logger-performance test flakiness by using vi.resetModules()
  with dynamic imports to prevent cached logger references across
  test files

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
Misaka
2026-04-05 12:15:18 +08:00
parent e54d94fce2
commit e2669af870
14 changed files with 157 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/services/config/config-manager.ts
View File

@@ -20,7 +20,7 @@ import { dirname } from 'path'
import { app } from 'electron'
import yaml from 'js-yaml'
import { z } from 'zod'
import { createLogger, applyLoggingConfig, trackDuration } from '../logger'
import { createLogger, applyLoggingConfig } from '../logger'
import { applyAuditConfig } from '../logger/audit-logger'
import {
fullConfigSchema,
@@ -315,9 +315,12 @@ export class ConfigManager {
const { activeType, mysql, sqlserver, postgresql } = this.config.database
switch (activeType) {
case 'postgresql': return postgresql
case 'sqlserver': return sqlserver
default: return mysql
case 'postgresql':
return postgresql
case 'sqlserver':
return sqlserver
default:
return mysql
}
}

9
src/main/services/database/data-source.ts
View File

@@ -22,9 +22,12 @@ function getDatabaseType(): 'mysql' | 'mssql' | 'postgres' {
const configManager = ConfigManager.getInstance()
const dbType = configManager.getDatabaseType()
switch (dbType) {
case 'sqlserver': return 'mssql'
case 'postgresql': return 'postgres'
default: return 'mysql'
case 'sqlserver':
return 'mssql'
case 'postgresql':
return 'postgres'
default:
return 'mysql'
}
}

2
src/main/services/database/discrete-material-plan-dao.ts
View File

@@ -10,7 +10,7 @@
import { create, type IDatabaseService } from './index'
import { createDialect, type SqlDialect } from './dialects'
import { createLogger, run, getRequestId, trackDuration } from '../logger'
import { createLogger, getRequestId, trackDuration } from '../logger'
const log = createLogger('DiscreteMaterialPlanDAO')

4
src/main/services/database/extractor-operation-history-dao.ts
View File

@@ -11,7 +11,7 @@
import { create, type IDatabaseService } from './index'
import { createDialect, type SqlDialect } from './dialects'
import { createLogger, run, getRequestId, trackDuration } from '../logger'
import { createLogger, getRequestId, trackDuration } from '../logger'
import type {
OperationHistoryRecord,
BatchStats,
@@ -202,7 +202,7 @@ export class ExtractorOperationHistoryDAO {
`
const params = [status, batchId]
const result = await trackDuration(async () => await dbService.query(sqlString, params), {
await trackDuration(async () => await dbService.query(sqlString, params), {
operationName: 'ExtractorOperationHistoryDAO.updateBatchStatus',
context: { tableName, operationType: 'UPDATE', batchId }
})

2
src/main/services/database/materials-to-be-deleted-dao.ts
View File

@@ -10,7 +10,7 @@
import { create, type IDatabaseService } from './index'
import { createDialect, type SqlDialect } from './dialects'
import { createLogger, run, getRequestId, trackDuration } from '../logger'
import { createLogger, getRequestId, trackDuration } from '../logger'
const log = createLogger('MaterialsToBeDeletedDAO')

2
src/main/services/database/materials-type-to-be-deleted-dao.ts
View File

@@ -7,7 +7,7 @@
import { create, type IDatabaseService } from './index'
import { createDialect, type SqlDialect } from './dialects'
import { createLogger, run, getRequestId, trackDuration } from '../logger'
import { createLogger, getRequestId, trackDuration } from '../logger'
const log = createLogger('MaterialsTypeToBeDeletedDAO')

128
src/main/services/database/postgresql.ts
View File

@@ -18,37 +18,123 @@ export type { PostgreSqlConfig } from '../../types/database.types'
*/
const SQL_KEYWORDS = new Set([
// DML
'SELECT', 'FROM', 'WHERE', 'AND', 'OR', 'NOT', 'IN', 'IS', 'NULL',
'INSERT', 'INTO', 'VALUES', 'UPDATE', 'SET', 'DELETE',
'SELECT',
'FROM',
'WHERE',
'AND',
'OR',
'NOT',
'IN',
'IS',
'NULL',
'INSERT',
'INTO',
'VALUES',
'UPDATE',
'SET',
'DELETE',
// Ordering & limiting
'ORDER', 'BY', 'ASC', 'DESC', 'LIMIT', 'OFFSET',
'FETCH', 'NEXT', 'ROWS', 'ONLY',
'ORDER',
'BY',
'ASC',
'DESC',
'LIMIT',
'OFFSET',
'FETCH',
'NEXT',
'ROWS',
'ONLY',
// Joins
'JOIN', 'LEFT', 'RIGHT', 'INNER', 'OUTER', 'CROSS', 'FULL', 'ON',
'JOIN',
'LEFT',
'RIGHT',
'INNER',
'OUTER',
'CROSS',
'FULL',
'ON',
// Set operations
'UNION', 'ALL', 'INTERSECT', 'EXCEPT',
'UNION',
'ALL',
'INTERSECT',
'EXCEPT',
// Grouping
'GROUP', 'HAVING', 'DISTINCT',
'GROUP',
'HAVING',
'DISTINCT',
// DDL
'CREATE', 'ALTER', 'DROP', 'TABLE', 'INDEX', 'COLUMN',
'ADD', 'MODIFY', 'RENAME', 'TO',
'CREATE',
'ALTER',
'DROP',
'TABLE',
'INDEX',
'COLUMN',
'ADD',
'MODIFY',
'RENAME',
'TO',
// PostgreSQL specific
'CONFLICT', 'DO', 'NOTHING', 'EXCLUDED', 'RETURNING',
'MERGE', 'USING', 'MATCHED', 'WHEN', 'THEN', 'ELSE', 'END',
'TARGET', 'SOURCE',
'CONFLICT',
'DO',
'NOTHING',
'EXCLUDED',
'RETURNING',
'MERGE',
'USING',
'MATCHED',
'WHEN',
'THEN',
'ELSE',
'END',
'TARGET',
'SOURCE',
// Functions
'COUNT', 'SUM', 'AVG', 'MIN', 'MAX', 'EXISTS',
'CURRENT_TIMESTAMP', 'NOW', 'GETDATE',
'COALESCE', 'NULLIF', 'CAST', 'AS',
'COUNT',
'SUM',
'AVG',
'MIN',
'MAX',
'EXISTS',
'CURRENT_TIMESTAMP',
'NOW',
'GETDATE',
'COALESCE',
'NULLIF',
'CAST',
'AS',
// Transaction
'BEGIN', 'COMMIT', 'ROLLBACK', 'SAVEPOINT',
'BEGIN',
'COMMIT',
'ROLLBACK',
'SAVEPOINT',
// Types & values
'TRUE', 'FALSE', 'DEFAULT', 'PRIMARY', 'KEY',
'REFERENCES', 'FOREIGN', 'CONSTRAINT', 'UNIQUE', 'CHECK',
'CASE', 'BETWEEN', 'LIKE', 'ILIKE', 'ANY', 'SOME',
'TRUE',
'FALSE',
'DEFAULT',
'PRIMARY',
'KEY',
'REFERENCES',
'FOREIGN',
'CONSTRAINT',
'UNIQUE',
'CHECK',
'CASE',
'BETWEEN',
'LIKE',
'ILIKE',
'ANY',
'SOME',
// Common
'IF', 'WITH', 'RECURSIVE', 'OVER', 'PARTITION', 'WINDOW',
'ROW', 'FIRST', 'AFTER', 'BEFORE'
'IF',
'WITH',
'RECURSIVE',
'OVER',
'PARTITION',
'WINDOW',
'ROW',
'FIRST',
'AFTER',
'BEFORE'
])
/**

1
src/main/services/logger/performance-monitor.ts
View File

@@ -119,7 +119,6 @@ export async function trackDuration<T>(
return { result, durationMs, isSlow }
} catch (error) {
const durationMs = performance.now() - startTime
const isSlow = durationMs > slowThresholdMs
// Log the error with duration
logger.error(`${message} failed after ${durationMs.toFixed(2)}ms`, {

2
src/main/services/rustfs/rustfs-service.ts
View File

@@ -15,7 +15,7 @@ import {
type GetObjectCommandInput,
type DeleteObjectCommandInput
} from '@aws-sdk/client-s3'
import { createLogger, run, trackDuration, PerformanceTracker } from '../logger'
import { createLogger } from '../logger'
import type { RustfsConfig } from '../../types/config.schema'
import * as fs from 'fs'
import * as path from 'path'

2
src/main/services/update/update-service.ts
View File

@@ -1,6 +1,6 @@
import * as fs from 'fs'
import { ConfigManager } from '../config/config-manager'
import { createLogger, run, trackDuration, PerformanceTracker } from '../logger'
import { createLogger } from '../logger'
import type { UpdateConfig } from '../../types/config.schema'
import type { UserType } from '../../types/user.types'
import type {

7
src/main/services/user/bip-users-dao.ts
View File

@@ -8,13 +8,8 @@
* - Create, update, delete users
*/
import {
create,
disconnect as disconnectDb,
type IDatabaseService
} from '../database/index'
import { create, type IDatabaseService } from '../database/index'
import { createDialect, type SqlDialect } from '../database/dialects'
import { ConfigManager } from '../config/config-manager'
import type { UserInfo } from '../../types/user.types'
import { createLogger, logError } from '../logger'

40
tests/integration/logger-performance.test.ts
View File

@@ -5,14 +5,6 @@
*/
import { describe, it, expect, vi, beforeEach, afterEach, type Mock } from 'vitest'
import {
trackDuration,
PerformanceTracker,
createPerformanceTracker,
DEFAULT_SLOW_THRESHOLD_MS,
type TrackDurationOptions
} from '../../src/main/services/logger/performance-monitor'
import logger from '../../src/main/services/logger/index'
// Mock the logger to avoid noisy output during tests
vi.mock('../../src/main/services/logger', () => ({
@@ -26,7 +18,23 @@ vi.mock('../../src/main/services/logger', () => ({
}))
describe('Performance Monitor', () => {
beforeEach(() => {
let trackDuration: typeof import('../../src/main/services/logger/performance-monitor').trackDuration
let PerformanceTracker: typeof import('../../src/main/services/logger/performance-monitor').PerformanceTracker
let createPerformanceTracker: typeof import('../../src/main/services/logger/performance-monitor').createPerformanceTracker
let DEFAULT_SLOW_THRESHOLD_MS: typeof import('../../src/main/services/logger/performance-monitor').DEFAULT_SLOW_THRESHOLD_MS
let logger: typeof import('../../src/main/services/logger').default
beforeEach(async () => {
vi.resetModules()
const perfMod = await import('../../src/main/services/logger/performance-monitor')
const loggerMod = await import('../../src/main/services/logger/index')
trackDuration = perfMod.trackDuration
PerformanceTracker = perfMod.PerformanceTracker
createPerformanceTracker = perfMod.createPerformanceTracker
DEFAULT_SLOW_THRESHOLD_MS = perfMod.DEFAULT_SLOW_THRESHOLD_MS
logger = loggerMod.default
vi.clearAllMocks()
})
@@ -230,7 +238,7 @@ describe('Performance Monitor', () => {
})
})
it('should log summary with aggregated metrics', () => {
it('should log summary with aggregated metrics', async () => {
const tracker = new PerformanceTracker('TestService', 1000)
tracker.recordDuration(100)
@@ -248,7 +256,7 @@ describe('Performance Monitor', () => {
})
})
it('should include slow percentage in summary', () => {
it('should include slow percentage in summary', async () => {
const tracker = new PerformanceTracker('TestService', 50)
tracker.recordDuration(30) // Normal
@@ -261,7 +269,7 @@ describe('Performance Monitor', () => {
expect(summaryCall.slowPercentage).toContain('%')
})
it('should reset metrics when reset() is called', () => {
it('should reset metrics when reset() is called', async () => {
const tracker = new PerformanceTracker('TestService', 1000)
tracker.recordDuration(100)
@@ -275,7 +283,7 @@ describe('Performance Monitor', () => {
expect(metrics.slowOperationCount).toBe(0)
})
it('should return zero metrics when no operations tracked', () => {
it('should return zero metrics when no operations tracked', async () => {
const tracker = new PerformanceTracker('EmptyService')
const metrics = tracker.getMetrics()
@@ -288,7 +296,7 @@ describe('Performance Monitor', () => {
expect(metrics.slowOperationCount).toBe(0)
})
it('should use custom logger if provided', () => {
it('should use custom logger if provided', async () => {
const customLogger = {
debug: vi.fn(),
info: vi.fn(),
@@ -307,7 +315,7 @@ describe('Performance Monitor', () => {
})
describe('createPerformanceTracker', () => {
it('should create a tracker with default threshold', () => {
it('should create a tracker with default threshold', async () => {
const tracker = createPerformanceTracker('MyService')
expect(tracker).toBeInstanceOf(PerformanceTracker)
@@ -315,7 +323,7 @@ describe('Performance Monitor', () => {
expect(metrics.count).toBe(0)
})
it('should create a tracker with custom threshold', () => {
it('should create a tracker with custom threshold', async () => {
const tracker = createPerformanceTracker('FastService', 100)
tracker.recordDuration(150)

1
tests/playwright/verify_report_analysis.js
View File

@@ -1,3 +1,4 @@
/* eslint-disable @typescript-eslint/no-require-imports */
const { _electron: electron } = require('playwright')
;(async () => {

12
tests/unit/postgresql.test.ts
View File

@@ -132,7 +132,7 @@ describe('prepareSql', () => {
it('should preserve string literals with escaped quotes', () => {
const sql = "WHERE UserName = 'O''Brien'"
const result = prepareSql(sql)
expect(result).toBe('WHERE "UserName" = \'O\'\'Brien\'')
expect(result).toBe("WHERE \"UserName\" = 'O''Brien'")
})
it('should preserve $N parameter placeholders', () => {
@@ -145,17 +145,13 @@ describe('prepareSql', () => {
it('should handle COUNT(*) correctly', () => {
const sql = 'SELECT COUNT(*) as count FROM "dbo"."BIPUsers" WHERE UserName = $1'
const result = prepareSql(sql)
expect(result).toBe(
'SELECT COUNT(*) as count FROM "dbo"."BIPUsers" WHERE "UserName" = $1'
)
expect(result).toBe('SELECT COUNT(*) as count FROM "dbo"."BIPUsers" WHERE "UserName" = $1')
})
it('should quote underscore-containing column names', () => {
const sql = 'SELECT ERP_URL, ERP_Username, ERP_Password FROM "dbo"."BIPUsers"'
const result = prepareSql(sql)
expect(result).toBe(
'SELECT "ERP_URL", "ERP_Username", "ERP_Password" FROM "dbo"."BIPUsers"'
)
expect(result).toBe('SELECT "ERP_URL", "ERP_Username", "ERP_Password" FROM "dbo"."BIPUsers"')
})
it('should handle ON CONFLICT DO UPDATE SET with EXCLUDED', () => {
@@ -168,7 +164,7 @@ describe('prepareSql', () => {
})
it('should handle CURRENT_TIMESTAMP without quoting', () => {
const sql = "INSERT INTO t (OperationTime) VALUES (CURRENT_TIMESTAMP)"
const sql = 'INSERT INTO t (OperationTime) VALUES (CURRENT_TIMESTAMP)'
const result = prepareSql(sql)
expect(result).toBe('INSERT INTO "t" ("OperationTime") VALUES (CURRENT_TIMESTAMP)')
})