fix: update version to 1.0.4 in package.json and improve error handling in executeStatement

Author: bitofsky

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bitofsky/databricks-sql",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "Databricks SQL client for Node.js - Direct REST API without SDK",
   "main": "dist/index.cjs",
   "module": "dist/index.js",

src/api/executeStatement.ts

@@ -27,13 +27,8 @@ async function fetchMetrics(
   statementId: string,
   signal?: AbortSignal
 ): Promise<QueryMetrics | undefined> {
-  try {
-    const queryInfo = await getQueryMetrics(auth, statementId, signal)
-    return queryInfo.metrics
-  } catch {
-    // Ignore metrics fetch errors - non-critical
-    return undefined
-  }
+  const queryInfo = await getQueryMetrics(auth, statementId, signal)
+  return queryInfo.metrics
 }
 
 /**
@@ -54,7 +49,13 @@ export async function executeStatement(
 
   // Helper to call onProgress with optional metrics
   const emitProgress = onProgress
-    ? async (statementId: string) => onProgress(result, enableMetrics ? await fetchMetrics(auth, statementId, signal) : undefined)
+    ? async () => result ? onProgress(
+      result,
+      enableMetrics ? await fetchMetrics(auth, result.statement_id, signal).catch(e => {
+        logger?.error?.(`executeStatement Failed to fetch query metrics for statement ${result?.statement_id}: ${String(e)}`, { statementId: result?.statement_id })
+        return undefined
+      }) : undefined
+    ) : undefined
     : undefined
 
   // 1. Build request (filter out undefined values)
@@ -100,9 +101,9 @@ export async function executeStatement(
     // 3. Poll until terminal state
     while (!TERMINAL_STATES.has(result.status.state)) {
       logger?.info?.(`executeStatement Statement ${result.statement_id} in state ${result.status.state}; polling for status...`)
-      await emitProgress?.(result.statement_id)
       await delay(POLL_INTERVAL_MS, signal)
       result = await getStatement(auth, result.statement_id, signal)
+      await emitProgress?.()
     }
   } catch (err) {
     if (err instanceof AbortError || signal?.aborted) {
@@ -118,7 +119,7 @@ export async function executeStatement(
   }
 
   // 4. Final progress callback
-  await emitProgress?.(result.statement_id)
+  await emitProgress?.()
 
   // 5. Handle terminal states
   if (result.status.state === 'SUCCEEDED')

test/executeStatement.spec.ts

@@ -90,7 +90,6 @@ describe('executeStatement', () => {
         body: expect.stringContaining('"wait_timeout":"0s"'),
       })
     )
-    expect(onProgress).toHaveBeenCalledWith(expect.objectContaining({ status: { state: 'PENDING' } }), undefined)
     expect(onProgress).toHaveBeenCalledWith(expect.objectContaining({ status: { state: 'SUCCEEDED' } }), undefined)
   })
 
@@ -116,7 +115,7 @@ describe('executeStatement', () => {
     // Only 2 calls: postStatement + getStatement (no metrics calls)
     expect(mockFetch).toHaveBeenCalledTimes(2)
     // onProgress should be called without metrics
-    expect(onProgress).toHaveBeenCalledWith(expect.objectContaining({ status: { state: 'PENDING' } }), undefined)
+    expect(onProgress).toHaveBeenCalledWith(expect.objectContaining({ status: { state: 'SUCCEEDED' } }), undefined)
   })
 
   it('should fetch metrics when enableMetrics is true', async () => {
@@ -127,15 +126,15 @@ describe('executeStatement', () => {
         ok: true,
         json: () => Promise.resolve(mockPendingResult),
       })
-      // getQueryMetrics (during polling)
+      // getStatement
       .mockResolvedValueOnce({
         ok: true,
-        json: () => Promise.resolve(mockQueryInfo),
+        json: () => Promise.resolve(mockSucceededAfterPolling),
       })
-      // getStatement
+      // getQueryMetrics (during polling)
       .mockResolvedValueOnce({
         ok: true,
-        json: () => Promise.resolve(mockSucceededAfterPolling),
+        json: () => Promise.resolve(mockQueryInfo),
       })
       // getQueryMetrics (final)
       .mockResolvedValueOnce({
@@ -153,17 +152,9 @@ describe('executeStatement', () => {
     await vi.advanceTimersByTimeAsync(5000)
     await resultPromise
 
-    // 4 calls: postStatement + getQueryMetrics + getStatement + getQueryMetrics
+    // 4 calls: postStatement + getStatement + getQueryMetrics + getQueryMetrics
     expect(mockFetch).toHaveBeenCalledTimes(4)
 
-    // Check that onProgress was called with metrics
-    expect(onProgress).toHaveBeenCalledWith(
-      expect.objectContaining({ status: { state: 'PENDING' } }),
-      expect.objectContaining({
-        total_time_ms: 959,
-        execution_time_ms: 642,
-      })
-    )
     expect(onProgress).toHaveBeenCalledWith(
       expect.objectContaining({ status: { state: 'SUCCEEDED' } }),
       expect.objectContaining({
@@ -180,18 +171,18 @@ describe('executeStatement', () => {
         ok: true,
         json: () => Promise.resolve(mockPendingResult),
       })
-      // getQueryMetrics fails (401 - no retry)
+      // getStatement
+      .mockResolvedValueOnce({
+        ok: true,
+        json: () => Promise.resolve(mockSucceededAfterPolling),
+      })
+      // getQueryMetrics fails again (401 - no retry)
       .mockResolvedValueOnce({
         ok: false,
         status: 401,
         statusText: 'Unauthorized',
         text: () => Promise.resolve('Unauthorized'),
       })
-      // getStatement
-      .mockResolvedValueOnce({
-        ok: true,
-        json: () => Promise.resolve(mockSucceededAfterPolling),
-      })
       // getQueryMetrics fails again (401 - no retry)
       .mockResolvedValueOnce({
         ok: false,
@@ -213,7 +204,7 @@ describe('executeStatement', () => {
     // Statement should still succeed even if metrics fail
     expect(result.status.state).toBe('SUCCEEDED')
     // onProgress should be called without metrics (undefined)
-    expect(onProgress).toHaveBeenCalledWith(expect.objectContaining({ status: { state: 'PENDING' } }), undefined)
+    expect(onProgress).toHaveBeenCalledWith(expect.objectContaining({ status: { state: 'SUCCEEDED' } }), undefined)
   })
 
   it('should throw DatabricksSqlError when statement fails', async () => {