Skip to content

Commit 7ee51e5

Browse files
committed
Fixed nits.
1 parent f462b19 commit 7ee51e5

File tree

7 files changed

+20
-19
lines changed

7 files changed

+20
-19
lines changed

src/common/control-protocol.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,11 @@ export const emit = async ({
2323
data,
2424
}: EmitInterface): Promise<AxiosResponse> => {
2525
// Normalize outgoing event type to ensure we always send new event types
26-
const normalizedEventType = normalizeOutgoingEventType(eventType);
26+
// TODO: Remove when the old types are completely phased out
27+
const translatedEventType = normalizeOutgoingEventType(eventType);
2728

2829
const newEvent: ExtractorEvent | LoaderEvent = {
29-
event_type: normalizedEventType,
30+
event_type: translatedEventType,
3031
event_context: event.payload.event_context,
3132
event_data: {
3233
...data,

src/tests/timeout-handling/timeout-1.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { EventType } from '../../types/extraction';
1+
import { EventType, ExtractorEventType } from '../../types/extraction';
22
import { MockServer } from '../mock-server';
33
import { createEvent } from '../test-helpers';
44
import run from './extraction';
@@ -43,6 +43,6 @@ describe('timeout-1 extraction', () => {
4343
// Expect last request to be emission of done event
4444
expect(lastRequest.url).toContain('airdrop.external-extractor.message');
4545
expect(lastRequest.method).toBe('POST');
46-
expect(lastRequest.body.event_type).toBe('DATA_EXTRACTION_DONE');
46+
expect(lastRequest.body.event_type).toBe(ExtractorEventType.DataExtractionDone);
4747
});
4848
});

src/tests/timeout-handling/timeout-2.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { EventType } from '../../types/extraction';
1+
import { EventType, ExtractorEventType } from '../../types/extraction';
22
import { MockServer } from '../mock-server';
33
import { createEvent } from '../test-helpers';
44
import run from './extraction';
@@ -45,6 +45,6 @@ describe('timeout-2 extraction', () => {
4545
// Expect last request to be emission of progress event
4646
expect(lastRequest.url).toContain('airdrop.external-extractor.message');
4747
expect(lastRequest.method).toBe('POST');
48-
expect(lastRequest.body.event_type).toBe('DATA_EXTRACTION_PROGRESS');
48+
expect(lastRequest.body.event_type).toBe(ExtractorEventType.DataExtractionProgress);
4949
});
5050
});

src/tests/timeout-handling/timeout-3a.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { EventType } from '../../types/extraction';
1+
import { EventType, ExtractorEventType } from '../../types/extraction';
22
import { MockServer } from '../mock-server';
33
import { createEvent } from '../test-helpers';
44
import run from './extraction';
@@ -45,6 +45,6 @@ describe('timeout-3a extraction', () => {
4545
// Expect last request to be emission of error event since we force-kill the worker
4646
expect(lastRequest.url).toContain('airdrop.external-extractor.message');
4747
expect(lastRequest.method).toBe('POST');
48-
expect(lastRequest.body.event_type).toBe('DATA_EXTRACTION_ERROR');
48+
expect(lastRequest.body.event_type).toBe(ExtractorEventType.DataExtractionError);
4949
});
5050
});

src/tests/timeout-handling/timeout-3b.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { EventType } from '../../types/extraction';
1+
import { EventType, ExtractorEventType } from '../../types/extraction';
22
import { MockServer } from '../mock-server';
33
import { createEvent } from '../test-helpers';
44
import run from './extraction';
@@ -45,6 +45,6 @@ describe('timeout-3b extraction', () => {
4545
// Expect last request to be emission of progress event
4646
expect(lastRequest.url).toContain('airdrop.external-extractor.message');
4747
expect(lastRequest.method).toBe('POST');
48-
expect(lastRequest.body.event_type).toBe('DATA_EXTRACTION_PROGRESS');
48+
expect(lastRequest.body.event_type).toBe(ExtractorEventType.DataExtractionProgress);
4949
});
5050
});

src/types/workers.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@ export interface WorkerAdapterInterface<ConnectorState> {
3030
* @param {boolean=} isLocalDevelopment - A flag to indicate if the adapter is being used in local development
3131
* @param {number=} timeout - The timeout for the worker thread
3232
* @param {number=} batchSize - Maximum number of extracted items in a batch
33-
* @param {Partial<Record<EventType, string>>=} worker_path_overrides - A map of event types to custom worker paths to override default worker paths
33+
* @param {Record<EventType, string>=} worker_path_overrides - A map of event types to custom worker paths to override default worker paths
3434
*/
3535
export interface WorkerAdapterOptions {
3636
isLocalDevelopment?: boolean;
3737
timeout?: number;
3838
batchSize?: number;
39-
worker_path_overrides?: Partial<Record<EventType, string>>;
39+
workerPathOverrides?: Record<EventType, string>;
4040
}
4141

4242
/**

src/workers/spawn.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -133,16 +133,16 @@ export async function spawn<ConnectorState>({
133133
// Normalize incoming event type for backwards compatibility
134134
// This allows the SDK to accept both old and new event type formats
135135
const originalEventType = event.payload.event_type;
136-
const normalizedEventType = normalizeIncomingEventType(
136+
const translatedEventType = normalizeIncomingEventType(
137137
event.payload.event_type as string
138138
);
139139

140140
// Update the event with the normalized event type
141-
event.payload.event_type = normalizedEventType;
141+
event.payload.event_type = translatedEventType;
142142

143-
if (normalizedEventType !== originalEventType) {
143+
if (translatedEventType !== originalEventType) {
144144
console.log(
145-
`Event type normalized from ${originalEventType} to ${normalizedEventType}`
145+
`Event type normalized from ${originalEventType} to ${translatedEventType}.`
146146
);
147147
}
148148

@@ -165,10 +165,10 @@ export async function spawn<ConnectorState>({
165165

166166
let script = null;
167167
if (
168-
options?.worker_path_overrides &&
169-
options.worker_path_overrides[normalizedEventType as EventType]
168+
options?.workerPathOverrides &&
169+
options.workerPathOverrides[translatedEventType as EventType]
170170
) {
171-
script = options.worker_path_overrides[normalizedEventType as EventType];
171+
script = options.workerPathOverrides[translatedEventType as EventType];
172172
} else {
173173
script = getWorkerPath({
174174
event,

0 commit comments

Comments
 (0)