@devrev/ts-adaas 1.12.3-0 → 1.12.3-beta.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/common/constants.js +11 -11
- package/dist/common/control-protocol.d.ts.map +1 -1
- package/dist/common/control-protocol.js +5 -1
- package/dist/common/event-type-translation.d.ts +24 -0
- package/dist/common/event-type-translation.d.ts.map +1 -0
- package/dist/common/event-type-translation.js +117 -0
- package/dist/common/helpers.d.ts.map +1 -1
- package/dist/common/helpers.js +25 -7
- package/dist/deprecated/adapter/index.d.ts.map +1 -1
- package/dist/deprecated/adapter/index.js +2 -0
- package/dist/logger/logger.d.ts +1 -6
- package/dist/logger/logger.d.ts.map +1 -1
- package/dist/logger/logger.interfaces.d.ts +3 -4
- package/dist/logger/logger.interfaces.d.ts.map +1 -1
- package/dist/logger/logger.js +6 -22
- package/dist/logger/logger.test.js +10 -71
- package/dist/state/state.d.ts.map +1 -1
- package/dist/state/state.js +4 -5
- package/dist/state/state.test.js +3 -3
- package/dist/tests/backwards-compatibility/backwards-compatibility.test.js +2 -17
- package/dist/tests/timeout-handling/timeout-1.js +2 -2
- package/dist/tests/timeout-handling/timeout-1.test.js +1 -1
- package/dist/tests/timeout-handling/timeout-2.js +3 -3
- package/dist/tests/timeout-handling/timeout-2.test.js +1 -1
- package/dist/tests/timeout-handling/timeout-3a.js +2 -2
- package/dist/tests/timeout-handling/timeout-3a.test.js +1 -1
- package/dist/tests/timeout-handling/timeout-3b.js +2 -2
- package/dist/tests/timeout-handling/timeout-3b.test.js +1 -1
- package/dist/types/extraction.d.ts +99 -2
- package/dist/types/extraction.d.ts.map +1 -1
- package/dist/types/extraction.js +102 -2
- package/dist/types/loading.d.ts +21 -1
- package/dist/types/loading.d.ts.map +1 -1
- package/dist/types/loading.js +23 -0
- package/dist/types/workers.d.ts +5 -14
- package/dist/types/workers.d.ts.map +1 -1
- package/dist/workers/process-task.d.ts.map +1 -1
- package/dist/workers/process-task.js +37 -37
- package/dist/workers/spawn.d.ts +3 -3
- package/dist/workers/spawn.d.ts.map +1 -1
- package/dist/workers/spawn.js +66 -47
- package/dist/workers/worker-adapter.d.ts.map +1 -1
- package/dist/workers/worker-adapter.js +6 -6
- package/dist/workers/worker-adapter.test.js +0 -7
- package/dist/workers/worker.js +1 -4
- package/package.json +1 -1
- package/dist/logger/logger.context.d.ts +0 -5
- package/dist/logger/logger.context.d.ts.map +0 -1
- package/dist/logger/logger.context.js +0 -27
- package/dist/logger/logger.worker-fixture.d.ts +0 -2
- package/dist/logger/logger.worker-fixture.d.ts.map +0 -1
- package/dist/logger/logger.worker-fixture.js +0 -10
- package/dist/workers/default-workers/attachments-deletion.d.ts +0 -2
- package/dist/workers/default-workers/attachments-deletion.d.ts.map +0 -1
- package/dist/workers/default-workers/attachments-deletion.js +0 -13
- package/dist/workers/default-workers/attachments-extraction.d.ts +0 -2
- package/dist/workers/default-workers/attachments-extraction.d.ts.map +0 -1
- package/dist/workers/default-workers/attachments-extraction.js +0 -95
- package/dist/workers/default-workers/data-deletion.d.ts +0 -2
- package/dist/workers/default-workers/data-deletion.d.ts.map +0 -1
- package/dist/workers/default-workers/data-deletion.js +0 -15
- package/dist/workers/default-workers/data-extraction.d.ts +0 -2
- package/dist/workers/default-workers/data-extraction.d.ts.map +0 -1
- package/dist/workers/default-workers/data-extraction.js +0 -100
- package/dist/workers/default-workers/delete-loader-attachment-state.d.ts +0 -2
- package/dist/workers/default-workers/delete-loader-attachment-state.d.ts.map +0 -1
- package/dist/workers/default-workers/delete-loader-attachment-state.js +0 -15
- package/dist/workers/default-workers/delete-loader-state.d.ts +0 -2
- package/dist/workers/default-workers/delete-loader-state.d.ts.map +0 -1
- package/dist/workers/default-workers/delete-loader-state.js +0 -15
- package/dist/workers/default-workers/external-sync-units-extraction.d.ts +0 -2
- package/dist/workers/default-workers/external-sync-units-extraction.d.ts.map +0 -1
- package/dist/workers/default-workers/external-sync-units-extraction.js +0 -27
- package/dist/workers/default-workers/load-attachments.d.ts +0 -2
- package/dist/workers/default-workers/load-attachments.d.ts.map +0 -1
- package/dist/workers/default-workers/load-attachments.js +0 -19
- package/dist/workers/default-workers/load-data.d.ts +0 -2
- package/dist/workers/default-workers/load-data.d.ts.map +0 -1
- package/dist/workers/default-workers/load-data.js +0 -18
- package/dist/workers/default-workers/metadata-extraction.d.ts +0 -2
- package/dist/workers/default-workers/metadata-extraction.d.ts.map +0 -1
- package/dist/workers/default-workers/metadata-extraction.js +0 -26
- package/dist/workers/dummy-extractor/data-normalization.d.ts +0 -5
- package/dist/workers/dummy-extractor/data-normalization.d.ts.map +0 -1
- package/dist/workers/dummy-extractor/data-normalization.js +0 -41
- package/dist/workers/dummy-extractor/external_domain_metadata.json +0 -58
package/dist/common/constants.js
CHANGED
|
@@ -4,14 +4,14 @@ exports.DEFAULT_SLEEP_DELAY_MS = exports.MEMORY_LOG_INTERVAL = exports.HARD_TIME
|
|
|
4
4
|
const extraction_1 = require("../types/extraction");
|
|
5
5
|
const helpers_1 = require("./helpers");
|
|
6
6
|
exports.ALLOWED_EXTRACTION_EVENT_TYPES = [
|
|
7
|
-
extraction_1.EventType.
|
|
8
|
-
extraction_1.EventType.
|
|
9
|
-
extraction_1.EventType.
|
|
10
|
-
extraction_1.EventType.
|
|
11
|
-
extraction_1.EventType.
|
|
12
|
-
extraction_1.EventType.
|
|
13
|
-
extraction_1.EventType.
|
|
14
|
-
extraction_1.EventType.
|
|
7
|
+
extraction_1.EventType.StartExtractingExternalSyncUnits,
|
|
8
|
+
extraction_1.EventType.StartExtractingMetadata,
|
|
9
|
+
extraction_1.EventType.StartExtractingData,
|
|
10
|
+
extraction_1.EventType.ContinueExtractingData,
|
|
11
|
+
extraction_1.EventType.StartDeletingExtractorState,
|
|
12
|
+
extraction_1.EventType.StartExtractingAttachments,
|
|
13
|
+
extraction_1.EventType.ContinueExtractingAttachments,
|
|
14
|
+
extraction_1.EventType.StartDeletingExtractorAttachmentsState,
|
|
15
15
|
];
|
|
16
16
|
exports.ALLOWED_LOADING_EVENT_TYPES = [
|
|
17
17
|
extraction_1.EventType.StartLoadingData,
|
|
@@ -24,9 +24,9 @@ exports.ALLOWED_EVENT_TYPES = [
|
|
|
24
24
|
...exports.ALLOWED_LOADING_EVENT_TYPES,
|
|
25
25
|
];
|
|
26
26
|
exports.STATELESS_EXTRACTION_EVENT_TYPES = [
|
|
27
|
-
extraction_1.EventType.
|
|
28
|
-
extraction_1.EventType.
|
|
29
|
-
extraction_1.EventType.
|
|
27
|
+
extraction_1.EventType.StartExtractingExternalSyncUnits,
|
|
28
|
+
extraction_1.EventType.StartDeletingExtractorState,
|
|
29
|
+
extraction_1.EventType.StartDeletingExtractorAttachmentsState,
|
|
30
30
|
];
|
|
31
31
|
exports.STATELESS_LOADING_EVENT_TYPES = [
|
|
32
32
|
extraction_1.EventType.StartDeletingLoaderState,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"control-protocol.d.ts","sourceRoot":"","sources":["../../src/common/control-protocol.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAEtC,OAAO,EACL,YAAY,EACZ,SAAS,EAET,kBAAkB,EAEnB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"control-protocol.d.ts","sourceRoot":"","sources":["../../src/common/control-protocol.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAEtC,OAAO,EACL,YAAY,EACZ,SAAS,EAET,kBAAkB,EAEnB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAInD,MAAM,WAAW,aAAa;IAC5B,KAAK,EAAE,YAAY,CAAC;IACpB,SAAS,EAAE,kBAAkB,GAAG,eAAe,CAAC;IAChD,IAAI,CAAC,EAAE,SAAS,CAAC;CAClB;AAED,eAAO,MAAM,IAAI,GAAU,6BAIxB,aAAa,KAAG,OAAO,CAAC,aAAa,CAgCvC,CAAC"}
|
|
@@ -3,9 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.emit = void 0;
|
|
4
4
|
const axios_client_internal_1 = require("../http/axios-client-internal");
|
|
5
5
|
const constants_1 = require("./constants");
|
|
6
|
+
const event_type_translation_1 = require("./event-type-translation");
|
|
6
7
|
const emit = async ({ event, eventType, data, }) => {
|
|
8
|
+
// Normalize outgoing event type to ensure we always send new event types
|
|
9
|
+
// TODO: Remove when the old types are completely phased out
|
|
10
|
+
const translatedEventType = (0, event_type_translation_1.translateOutgoingEventType)(eventType);
|
|
7
11
|
const newEvent = {
|
|
8
|
-
event_type:
|
|
12
|
+
event_type: translatedEventType,
|
|
9
13
|
event_context: event.payload.event_context,
|
|
10
14
|
event_data: Object.assign({}, data),
|
|
11
15
|
worker_metadata: {
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
import { EventType, ExtractorEventType } from '../types/extraction';
|
|
2
|
+
import { LoaderEventType } from '../types/loading';
|
|
3
|
+
/**
|
|
4
|
+
* Maps old incoming event type strings to new EventType enum values.
|
|
5
|
+
* This ensures backwards compatibility when the platform sends old event types.
|
|
6
|
+
* @param eventTypeString The raw event type string from the platform
|
|
7
|
+
* @returns The normalized EventType enum value
|
|
8
|
+
*/
|
|
9
|
+
export declare function translateIncomingEventType(eventTypeString: string): EventType;
|
|
10
|
+
/**
|
|
11
|
+
* Normalizes ExtractorEventType enum values by converting old enum members to new ones.
|
|
12
|
+
* Old enum members are deprecated and should be replaced with new ones.
|
|
13
|
+
*/
|
|
14
|
+
export declare function translateExtractorEventType(eventType: ExtractorEventType): ExtractorEventType;
|
|
15
|
+
/**
|
|
16
|
+
* Normalizes LoaderEventType enum values by converting old enum members to new ones.
|
|
17
|
+
* Old enum members are deprecated and should be replaced with new ones.
|
|
18
|
+
*/
|
|
19
|
+
export declare function translateLoaderEventType(eventType: LoaderEventType): LoaderEventType;
|
|
20
|
+
/**
|
|
21
|
+
* Normalizes any outgoing event type (Extractor or Loader) to ensure new event types are used.
|
|
22
|
+
*/
|
|
23
|
+
export declare function translateOutgoingEventType(eventType: ExtractorEventType | LoaderEventType): ExtractorEventType | LoaderEventType;
|
|
24
|
+
//# sourceMappingURL=event-type-translation.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"event-type-translation.d.ts","sourceRoot":"","sources":["../../src/common/event-type-translation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACpE,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAEnD;;;;;GAKG;AACH,wBAAgB,0BAA0B,CAAC,eAAe,EAAE,MAAM,GAAG,SAAS,CAwD7E;AAED;;;GAGG;AACH,wBAAgB,2BAA2B,CACzC,SAAS,EAAE,kBAAkB,GAC5B,kBAAkB,CA0CpB;AAED;;;GAGG;AACH,wBAAgB,wBAAwB,CACtC,SAAS,EAAE,eAAe,GACzB,eAAe,CAmBjB;AAED;;GAEG;AACH,wBAAgB,0BAA0B,CACxC,SAAS,EAAE,kBAAkB,GAAG,eAAe,GAC9C,kBAAkB,GAAG,eAAe,CAatC"}
|
|
@@ -0,0 +1,117 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.translateIncomingEventType = translateIncomingEventType;
|
|
4
|
+
exports.translateExtractorEventType = translateExtractorEventType;
|
|
5
|
+
exports.translateLoaderEventType = translateLoaderEventType;
|
|
6
|
+
exports.translateOutgoingEventType = translateOutgoingEventType;
|
|
7
|
+
const extraction_1 = require("../types/extraction");
|
|
8
|
+
const loading_1 = require("../types/loading");
|
|
9
|
+
/**
|
|
10
|
+
* Maps old incoming event type strings to new EventType enum values.
|
|
11
|
+
* This ensures backwards compatibility when the platform sends old event types.
|
|
12
|
+
* @param eventTypeString The raw event type string from the platform
|
|
13
|
+
* @returns The normalized EventType enum value
|
|
14
|
+
*/
|
|
15
|
+
function translateIncomingEventType(eventTypeString) {
|
|
16
|
+
// Create a reverse mapping from OLD string values to NEW enum member names
|
|
17
|
+
const eventTypeMap = {
|
|
18
|
+
// Old extraction event types from platform -> New enum members
|
|
19
|
+
[extraction_1.EventType.ExtractionExternalSyncUnitsStart]: extraction_1.EventType.StartExtractingExternalSyncUnits,
|
|
20
|
+
[extraction_1.EventType.ExtractionMetadataStart]: extraction_1.EventType.StartExtractingMetadata,
|
|
21
|
+
[extraction_1.EventType.ExtractionDataStart]: extraction_1.EventType.StartExtractingData,
|
|
22
|
+
[extraction_1.EventType.ExtractionDataContinue]: extraction_1.EventType.ContinueExtractingData,
|
|
23
|
+
[extraction_1.EventType.ExtractionDataDelete]: extraction_1.EventType.StartDeletingExtractorState,
|
|
24
|
+
[extraction_1.EventType.ExtractionAttachmentsStart]: extraction_1.EventType.StartExtractingAttachments,
|
|
25
|
+
[extraction_1.EventType.ExtractionAttachmentsContinue]: extraction_1.EventType.ContinueExtractingAttachments,
|
|
26
|
+
[extraction_1.EventType.ExtractionAttachmentsDelete]: extraction_1.EventType.StartDeletingExtractorAttachmentsState,
|
|
27
|
+
// New extraction event types (already correct, map to new enum members)
|
|
28
|
+
[extraction_1.EventType.StartExtractingExternalSyncUnits]: extraction_1.EventType.StartExtractingExternalSyncUnits,
|
|
29
|
+
[extraction_1.EventType.StartExtractingMetadata]: extraction_1.EventType.StartExtractingMetadata,
|
|
30
|
+
[extraction_1.EventType.StartExtractingData]: extraction_1.EventType.StartExtractingData,
|
|
31
|
+
[extraction_1.EventType.ContinueExtractingData]: extraction_1.EventType.ContinueExtractingData,
|
|
32
|
+
[extraction_1.EventType.StartDeletingExtractorState]: extraction_1.EventType.StartDeletingExtractorState,
|
|
33
|
+
[extraction_1.EventType.StartExtractingAttachments]: extraction_1.EventType.StartExtractingAttachments,
|
|
34
|
+
[extraction_1.EventType.ContinueExtractingAttachments]: extraction_1.EventType.ContinueExtractingAttachments,
|
|
35
|
+
[extraction_1.EventType.StartDeletingExtractorAttachmentsState]: extraction_1.EventType.StartDeletingExtractorAttachmentsState,
|
|
36
|
+
// Loading events
|
|
37
|
+
[extraction_1.EventType.StartLoadingData]: extraction_1.EventType.StartLoadingData,
|
|
38
|
+
[extraction_1.EventType.ContinueLoadingData]: extraction_1.EventType.ContinueLoadingData,
|
|
39
|
+
[extraction_1.EventType.StartLoadingAttachments]: extraction_1.EventType.StartLoadingAttachments,
|
|
40
|
+
[extraction_1.EventType.ContinueLoadingAttachments]: extraction_1.EventType.ContinueLoadingAttachments,
|
|
41
|
+
[extraction_1.EventType.StartDeletingLoaderState]: extraction_1.EventType.StartDeletingLoaderState,
|
|
42
|
+
[extraction_1.EventType.StartDeletingLoaderAttachmentState]: extraction_1.EventType.StartDeletingLoaderAttachmentState,
|
|
43
|
+
// Unknown
|
|
44
|
+
[extraction_1.EventType.UnknownEventType]: extraction_1.EventType.UnknownEventType,
|
|
45
|
+
};
|
|
46
|
+
const normalized = eventTypeMap[eventTypeString];
|
|
47
|
+
if (!normalized) {
|
|
48
|
+
console.warn(`Unknown event type received: ${eventTypeString}. This may indicate a new event type or a typo.`);
|
|
49
|
+
// Return the original string cast as EventType as a fallback
|
|
50
|
+
return eventTypeString;
|
|
51
|
+
}
|
|
52
|
+
return normalized;
|
|
53
|
+
}
|
|
54
|
+
/**
|
|
55
|
+
* Normalizes ExtractorEventType enum values by converting old enum members to new ones.
|
|
56
|
+
* Old enum members are deprecated and should be replaced with new ones.
|
|
57
|
+
*/
|
|
58
|
+
function translateExtractorEventType(eventType) {
|
|
59
|
+
var _a;
|
|
60
|
+
// Map old enum members to new enum members
|
|
61
|
+
const stringValue = eventType;
|
|
62
|
+
const mapping = {
|
|
63
|
+
// Old string values -> New enum members
|
|
64
|
+
[extraction_1.ExtractorEventType.ExtractionExternalSyncUnitsDone]: extraction_1.ExtractorEventType.ExternalSyncUnitExtractionDone,
|
|
65
|
+
[extraction_1.ExtractorEventType.ExtractionExternalSyncUnitsError]: extraction_1.ExtractorEventType.ExternalSyncUnitExtractionError,
|
|
66
|
+
[extraction_1.ExtractorEventType.ExtractionMetadataDone]: extraction_1.ExtractorEventType.MetadataExtractionDone,
|
|
67
|
+
[extraction_1.ExtractorEventType.ExtractionMetadataError]: extraction_1.ExtractorEventType.MetadataExtractionError,
|
|
68
|
+
[extraction_1.ExtractorEventType.ExtractionDataProgress]: extraction_1.ExtractorEventType.DataExtractionProgress,
|
|
69
|
+
[extraction_1.ExtractorEventType.ExtractionDataDelay]: extraction_1.ExtractorEventType.DataExtractionDelayed,
|
|
70
|
+
[extraction_1.ExtractorEventType.ExtractionDataDone]: extraction_1.ExtractorEventType.DataExtractionDone,
|
|
71
|
+
[extraction_1.ExtractorEventType.ExtractionDataError]: extraction_1.ExtractorEventType.DataExtractionError,
|
|
72
|
+
[extraction_1.ExtractorEventType.ExtractionDataDeleteDone]: extraction_1.ExtractorEventType.ExtractorStateDeletionDone,
|
|
73
|
+
[extraction_1.ExtractorEventType.ExtractionDataDeleteError]: extraction_1.ExtractorEventType.ExtractorStateDeletionError,
|
|
74
|
+
[extraction_1.ExtractorEventType.ExtractionAttachmentsProgress]: extraction_1.ExtractorEventType.AttachmentExtractionProgress,
|
|
75
|
+
[extraction_1.ExtractorEventType.ExtractionAttachmentsDelay]: extraction_1.ExtractorEventType.AttachmentExtractionDelayed,
|
|
76
|
+
[extraction_1.ExtractorEventType.ExtractionAttachmentsDone]: extraction_1.ExtractorEventType.AttachmentExtractionDone,
|
|
77
|
+
[extraction_1.ExtractorEventType.ExtractionAttachmentsError]: extraction_1.ExtractorEventType.AttachmentExtractionError,
|
|
78
|
+
[extraction_1.ExtractorEventType.ExtractionAttachmentsDeleteDone]: extraction_1.ExtractorEventType.ExtractorAttachmentsStateDeletionDone,
|
|
79
|
+
[extraction_1.ExtractorEventType.ExtractionAttachmentsDeleteError]: extraction_1.ExtractorEventType.ExtractorAttachmentsStateDeletionError,
|
|
80
|
+
};
|
|
81
|
+
// If there's a mapping, use it; otherwise return original (already new)
|
|
82
|
+
return (_a = mapping[stringValue]) !== null && _a !== void 0 ? _a : eventType;
|
|
83
|
+
}
|
|
84
|
+
/**
|
|
85
|
+
* Normalizes LoaderEventType enum values by converting old enum members to new ones.
|
|
86
|
+
* Old enum members are deprecated and should be replaced with new ones.
|
|
87
|
+
*/
|
|
88
|
+
function translateLoaderEventType(eventType) {
|
|
89
|
+
var _a;
|
|
90
|
+
// Map old enum members to new enum members
|
|
91
|
+
const stringValue = eventType;
|
|
92
|
+
const mapping = {
|
|
93
|
+
// Old string values -> New enum members
|
|
94
|
+
[loading_1.LoaderEventType.DataLoadingDelay]: loading_1.LoaderEventType.DataLoadingDelayed,
|
|
95
|
+
[loading_1.LoaderEventType.AttachmentLoadingProgress]: loading_1.LoaderEventType.AttachmentsLoadingProgress,
|
|
96
|
+
[loading_1.LoaderEventType.AttachmentLoadingDelayed]: loading_1.LoaderEventType.AttachmentsLoadingDelayed,
|
|
97
|
+
[loading_1.LoaderEventType.AttachmentLoadingDone]: loading_1.LoaderEventType.AttachmentsLoadingDone,
|
|
98
|
+
[loading_1.LoaderEventType.AttachmentLoadingError]: loading_1.LoaderEventType.AttachmentsLoadingError,
|
|
99
|
+
};
|
|
100
|
+
// If there's a mapping, use it; otherwise return original (already new)
|
|
101
|
+
return (_a = mapping[stringValue]) !== null && _a !== void 0 ? _a : eventType;
|
|
102
|
+
}
|
|
103
|
+
/**
|
|
104
|
+
* Normalizes any outgoing event type (Extractor or Loader) to ensure new event types are used.
|
|
105
|
+
*/
|
|
106
|
+
function translateOutgoingEventType(eventType) {
|
|
107
|
+
// Check if it's an ExtractorEventType by checking if the value exists in ExtractorEventType
|
|
108
|
+
if (Object.values(extraction_1.ExtractorEventType).includes(eventType)) {
|
|
109
|
+
return translateExtractorEventType(eventType);
|
|
110
|
+
}
|
|
111
|
+
// Otherwise treat as LoaderEventType
|
|
112
|
+
if (Object.values(loading_1.LoaderEventType).includes(eventType)) {
|
|
113
|
+
return translateLoaderEventType(eventType);
|
|
114
|
+
}
|
|
115
|
+
// If neither, return as-is
|
|
116
|
+
return eventType;
|
|
117
|
+
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../src/common/helpers.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,YAAY,EACZ,SAAS,EACT,kBAAkB,EACnB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAEL,UAAU,EACV,eAAe,EACf,YAAY,EACZ,eAAe,EAChB,MAAM,kBAAkB,CAAC;AAM1B,wBAAgB,wBAAwB,CAAC,SAAS,EAAE,SAAS,GAAG;IAC9D,SAAS,EAAE,kBAAkB,GAAG,eAAe,CAAC;CACjD,
|
|
1
|
+
{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../src/common/helpers.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,YAAY,EACZ,SAAS,EACT,kBAAkB,EACnB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAEL,UAAU,EACV,eAAe,EACf,YAAY,EACZ,eAAe,EAChB,MAAM,kBAAkB,CAAC;AAM1B,wBAAgB,wBAAwB,CAAC,SAAS,EAAE,SAAS,GAAG;IAC9D,SAAS,EAAE,kBAAkB,GAAG,eAAe,CAAC;CACjD,CAmFA;AAED,wBAAgB,gBAAgB,CAAC,EAAE,KAAK,EAAE,EAAE;IAAE,KAAK,EAAE,YAAY,CAAA;CAAE,UAElE;AAED,wBAAgB,cAAc,CAAC,EAC7B,kBAAkB,EAClB,SAAS,GACV,EAAE;IACD,kBAAkB,EAAE,MAAM,EAAE,CAAC;IAC7B,SAAS,EAAE,eAAe,EAAE,CAAC;CAC9B,GAAG,UAAU,EAAE,CA8Bf;AAED,wBAAgB,uBAAuB,CAAC,EACtC,aAAa,EACb,MAAM,GACP,EAAE;IACD,aAAa,EAAE,YAAY,EAAE,CAAC;IAC9B,MAAM,EAAE,YAAY,CAAC;CACtB,GAAG,YAAY,EAAE,CA4BjB;AAGD,wBAAgB,iBAAiB,QAiBhC;AAED,wBAAsB,KAAK,CAAC,EAAE,EAAE,MAAM,oBAGrC;AAED,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAmBzD;AAED,MAAM,WAAW,UAAU;IACzB,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,MAAM,CAAC;IACvB,eAAe,EAAE,MAAM,CAAC;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,MAAM,CAAC;IACvB,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAED,wBAAgB,cAAc,IAAI,UAAU,CAmD3C"}
|
package/dist/common/helpers.js
CHANGED
|
@@ -49,46 +49,64 @@ const loading_1 = require("../types/loading");
|
|
|
49
49
|
const constants_1 = require("./constants");
|
|
50
50
|
function getTimeoutErrorEventType(eventType) {
|
|
51
51
|
switch (eventType) {
|
|
52
|
+
// Metadata extraction (handles both old and new enum members)
|
|
53
|
+
case extraction_1.EventType.StartExtractingMetadata:
|
|
52
54
|
case extraction_1.EventType.ExtractionMetadataStart:
|
|
53
55
|
return {
|
|
54
|
-
eventType: extraction_1.ExtractorEventType.
|
|
56
|
+
eventType: extraction_1.ExtractorEventType.MetadataExtractionError,
|
|
55
57
|
};
|
|
58
|
+
// Data extraction (handles both old and new enum members)
|
|
59
|
+
case extraction_1.EventType.StartExtractingData:
|
|
60
|
+
case extraction_1.EventType.ContinueExtractingData:
|
|
56
61
|
case extraction_1.EventType.ExtractionDataStart:
|
|
57
62
|
case extraction_1.EventType.ExtractionDataContinue:
|
|
58
63
|
return {
|
|
59
|
-
eventType: extraction_1.ExtractorEventType.
|
|
64
|
+
eventType: extraction_1.ExtractorEventType.DataExtractionError,
|
|
60
65
|
};
|
|
66
|
+
// Data deletion (handles both old and new enum members)
|
|
67
|
+
case extraction_1.EventType.StartDeletingExtractorState:
|
|
61
68
|
case extraction_1.EventType.ExtractionDataDelete:
|
|
62
69
|
return {
|
|
63
|
-
eventType: extraction_1.ExtractorEventType.
|
|
70
|
+
eventType: extraction_1.ExtractorEventType.ExtractorStateDeletionError,
|
|
64
71
|
};
|
|
72
|
+
// Attachments extraction (handles both old and new enum members)
|
|
73
|
+
case extraction_1.EventType.StartExtractingAttachments:
|
|
74
|
+
case extraction_1.EventType.ContinueExtractingAttachments:
|
|
65
75
|
case extraction_1.EventType.ExtractionAttachmentsStart:
|
|
66
76
|
case extraction_1.EventType.ExtractionAttachmentsContinue:
|
|
67
77
|
return {
|
|
68
|
-
eventType: extraction_1.ExtractorEventType.
|
|
78
|
+
eventType: extraction_1.ExtractorEventType.AttachmentExtractionError,
|
|
69
79
|
};
|
|
80
|
+
// Attachments deletion (handles both old and new enum members)
|
|
81
|
+
case extraction_1.EventType.StartDeletingExtractorAttachmentsState:
|
|
70
82
|
case extraction_1.EventType.ExtractionAttachmentsDelete:
|
|
71
83
|
return {
|
|
72
|
-
eventType: extraction_1.ExtractorEventType.
|
|
84
|
+
eventType: extraction_1.ExtractorEventType.ExtractorAttachmentsStateDeletionError,
|
|
73
85
|
};
|
|
86
|
+
// External sync units (handles both old and new enum members)
|
|
87
|
+
case extraction_1.EventType.StartExtractingExternalSyncUnits:
|
|
74
88
|
case extraction_1.EventType.ExtractionExternalSyncUnitsStart:
|
|
75
89
|
return {
|
|
76
|
-
eventType: extraction_1.ExtractorEventType.
|
|
90
|
+
eventType: extraction_1.ExtractorEventType.ExternalSyncUnitExtractionError,
|
|
77
91
|
};
|
|
92
|
+
// Loading data
|
|
78
93
|
case extraction_1.EventType.StartLoadingData:
|
|
79
94
|
case extraction_1.EventType.ContinueLoadingData:
|
|
80
95
|
return {
|
|
81
96
|
eventType: loading_1.LoaderEventType.DataLoadingError,
|
|
82
97
|
};
|
|
98
|
+
// Deleting loader state
|
|
83
99
|
case extraction_1.EventType.StartDeletingLoaderState:
|
|
84
100
|
return {
|
|
85
101
|
eventType: loading_1.LoaderEventType.LoaderStateDeletionError,
|
|
86
102
|
};
|
|
103
|
+
// Loading attachments
|
|
87
104
|
case extraction_1.EventType.StartLoadingAttachments:
|
|
88
105
|
case extraction_1.EventType.ContinueLoadingAttachments:
|
|
89
106
|
return {
|
|
90
|
-
eventType: loading_1.LoaderEventType.
|
|
107
|
+
eventType: loading_1.LoaderEventType.AttachmentsLoadingError,
|
|
91
108
|
};
|
|
109
|
+
// Deleting loader attachment state
|
|
92
110
|
case extraction_1.EventType.StartDeletingLoaderAttachmentState:
|
|
93
111
|
return {
|
|
94
112
|
eventType: loading_1.LoaderEventType.LoaderAttachmentStateDeletionError,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/deprecated/adapter/index.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,YAAY,EACZ,SAAS,EAET,kBAAkB,EACnB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,QAAQ,EAAE,MAAM,oCAAoC,CAAC;AAE9D,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAK5D,OAAO,EAAE,KAAK,EAAsB,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/deprecated/adapter/index.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,YAAY,EACZ,SAAS,EAET,kBAAkB,EACnB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,QAAQ,EAAE,MAAM,oCAAoC,CAAC;AAE9D,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAK5D,OAAO,EAAE,KAAK,EAAsB,MAAM,mBAAmB,CAAC;AAG9D;;;;;;;;;;;;;GAaG;AAEH;;;;;;;GAOG;AAEH,wBAAsB,aAAa,CAAC,cAAc,EAChD,KAAK,EAAE,YAAY,EACnB,YAAY,EAAE,cAAc,EAC5B,kBAAkB,GAAE,OAAe,oCAiBpC;AAED,qBAAa,OAAO,CAAC,cAAc;IACjC,OAAO,CAAC,YAAY,CAAwB;IAC5C,OAAO,CAAC,UAAU,CAAa;IAE/B,OAAO,CAAC,KAAK,CAAe;IAC5B,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,WAAW,CAA4C;IAC/D,OAAO,CAAC,IAAI,CAAkB;IAC9B,OAAO,CAAC,aAAa,CAA0B;IAC/C,OAAO,CAAC,iBAAiB,CAAqB;gBAG5C,KAAK,EAAE,YAAY,EACnB,YAAY,EAAE,KAAK,CAAC,cAAc,CAAC,EACnC,kBAAkB,GAAE,OAAe;IAwBrC,IAAI,KAAK,IAAI,YAAY,CAAC,cAAc,CAAC,CAExC;IAED,IAAI,KAAK,CAAC,KAAK,EAAE,YAAY,CAAC,cAAc,CAAC,EAE5C;IAED,IAAI,SAAS,IAAI,QAAQ,EAAE,CAE1B;IAED,IAAI,SAAS,CAAC,KAAK,EAAE,QAAQ,EAAE,EAE9B;IAED;;;;;OAKG;IACG,IAAI,CAAC,YAAY,EAAE,kBAAkB,EAAE,IAAI,CAAC,EAAE,SAAS;IAkD7D;;;OAGG;IACH,OAAO,CAAC,WAAW;IAInB;;;OAGG;YACW,SAAS;CAiBxB"}
|
|
@@ -10,6 +10,7 @@ const constants_1 = require("../../common/constants");
|
|
|
10
10
|
const helpers_1 = require("../common/helpers");
|
|
11
11
|
// import { Logger } from '../../logger/logger';
|
|
12
12
|
const state_1 = require("../../state/state");
|
|
13
|
+
const event_type_translation_1 = require("../../common/event-type-translation");
|
|
13
14
|
/**
|
|
14
15
|
* Adapter class is used to interact with Airdrop platform. The class provides
|
|
15
16
|
* utilities to
|
|
@@ -33,6 +34,7 @@ const state_1 = require("../../state/state");
|
|
|
33
34
|
* @return The adapter instance
|
|
34
35
|
*/
|
|
35
36
|
async function createAdapter(event, initialState, isLocalDevelopment = false) {
|
|
37
|
+
event.payload.event_type = (0, event_type_translation_1.translateIncomingEventType)(event.payload.event_type);
|
|
36
38
|
const newInitialState = structuredClone(initialState);
|
|
37
39
|
const adapterState = await (0, state_1.createAdapterState)({
|
|
38
40
|
event,
|
package/dist/logger/logger.d.ts
CHANGED
|
@@ -33,9 +33,8 @@ export declare class Logger extends Console {
|
|
|
33
33
|
*
|
|
34
34
|
* @param message - The pre-formatted message string to log
|
|
35
35
|
* @param level - Log level (info, warn, error)
|
|
36
|
-
* @param sdkLog - Flag indicating if the log originated from the SDK
|
|
37
36
|
*/
|
|
38
|
-
logFn(message: string, level: LogLevel
|
|
37
|
+
logFn(message: string, level: LogLevel): void;
|
|
39
38
|
/**
|
|
40
39
|
* Stringifies and logs arguments to the appropriate destination.
|
|
41
40
|
* On main thread, converts arguments to strings and calls logFn.
|
|
@@ -50,10 +49,6 @@ export declare class Logger extends Console {
|
|
|
50
49
|
info(...args: unknown[]): void;
|
|
51
50
|
warn(...args: unknown[]): void;
|
|
52
51
|
error(...args: unknown[]): void;
|
|
53
|
-
sdkInfo(...args: unknown[]): void;
|
|
54
|
-
sdkWarn(...args: unknown[]): void;
|
|
55
|
-
sdkError(...args: unknown[]): void;
|
|
56
|
-
private getSdkLogFlag;
|
|
57
52
|
}
|
|
58
53
|
/**
|
|
59
54
|
* Converts a state object into a printable format where arrays are summarized.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../src/logger/logger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAyC,MAAM,OAAO,CAAC;AAE1E,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../src/logger/logger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAyC,MAAM,OAAO,CAAC;AAE1E,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAQvC,OAAO,EACL,kBAAkB,EAClB,sBAAsB,EAEtB,QAAQ,EAER,cAAc,EACf,MAAM,qBAAqB,CAAC;AAE7B;;;GAGG;AACH,qBAAa,MAAO,SAAQ,OAAO;IACjC,OAAO,CAAC,eAAe,CAAU;IACjC,OAAO,CAAC,OAAO,CAAC,CAAuB;IACvC,OAAO,CAAC,IAAI,CAAa;gBAEb,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,sBAAsB;IAUtD;;;;;OAKG;IACH,OAAO,CAAC,aAAa;IAOrB;;;;;;OAMG;IACH,OAAO,CAAC,eAAe;IASvB;;;;;;;;OAQG;IACH,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,GAAG,IAAI;IAa7C;;;;;;;;OAQG;IACH,OAAO,CAAC,eAAe;IAcd,GAAG,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI;IAI7B,IAAI,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI;IAI9B,IAAI,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI;IAI9B,KAAK,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI;CAGzC;AAED;;;;;;;GAOG;AAEH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,cAAc,CAqB5E;AAED;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAKtD;AAED;;;;;;;GAOG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,UAAU,GAAG,kBAAkB,CAwBzE;AAED;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,UAAU,GAAG,MAAM,CAE1D"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import
|
|
2
|
-
import
|
|
3
|
-
import
|
|
1
|
+
import { RawAxiosResponseHeaders } from 'axios';
|
|
2
|
+
import { AirdropEvent, EventContext } from '../types/extraction';
|
|
3
|
+
import { WorkerAdapterOptions } from '../types/workers';
|
|
4
4
|
export interface LoggerFactoryInterface {
|
|
5
5
|
event: AirdropEvent;
|
|
6
6
|
options?: WorkerAdapterOptions;
|
|
@@ -38,6 +38,5 @@ export interface AxiosErrorResponse {
|
|
|
38
38
|
}
|
|
39
39
|
export interface LoggerTags extends EventContext {
|
|
40
40
|
sdk_version: string;
|
|
41
|
-
sdk_log: boolean;
|
|
42
41
|
}
|
|
43
42
|
//# sourceMappingURL=logger.interfaces.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.interfaces.d.ts","sourceRoot":"","sources":["../../src/logger/logger.interfaces.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"logger.interfaces.d.ts","sourceRoot":"","sources":["../../src/logger/logger.interfaces.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,OAAO,CAAC;AAChD,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACjE,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAExD,MAAM,WAAW,sBAAsB;IACrC,KAAK,EAAE,YAAY,CAAC;IACpB,OAAO,CAAC,EAAE,oBAAoB,CAAC;CAChC;AAED,oBAAY,QAAQ;IAClB,IAAI,SAAS;IACb,IAAI,SAAS;IACb,KAAK,UAAU;CAChB;AAED,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,OAAO,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IAEf,SAAS,CAAC,EAAE,GAAG,CAAC;IAEhB,QAAQ,CAAC,EAAE,GAAG,CAAC;CAChB;AAED,MAAM,WAAW,cAAc;IAE7B,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,GAAG,cAAc,GAAG,cAAc,CAAC;CACtD;AAED,MAAM,WAAW,kBAAkB;IACjC,MAAM,EAAE;QACN,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;QAE3B,MAAM,EAAE,GAAG,CAAC;QACZ,GAAG,EAAE,MAAM,GAAG,SAAS,CAAC;KACzB,CAAC;IACF,YAAY,EAAE,OAAO,CAAC;IACtB,sBAAsB,EAAE,OAAO,CAAC;IAChC,QAAQ,CAAC,EAAE;QACT,IAAI,EAAE,OAAO,CAAC;QACd,OAAO,EAAE,uBAAuB,CAAC;QACjC,MAAM,EAAE,MAAM,CAAC;QACf,UAAU,EAAE,MAAM,CAAC;KACpB,CAAC;IACF,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,UAAW,SAAQ,YAAY;IAC9C,WAAW,EAAE,MAAM,CAAC;CACrB"}
|
package/dist/logger/logger.js
CHANGED
|
@@ -12,7 +12,6 @@ const node_worker_threads_1 = require("node:worker_threads");
|
|
|
12
12
|
const constants_1 = require("../common/constants");
|
|
13
13
|
const workers_1 = require("../types/workers");
|
|
14
14
|
const logger_constants_1 = require("./logger.constants");
|
|
15
|
-
const logger_context_1 = require("./logger.context");
|
|
16
15
|
const logger_interfaces_1 = require("./logger.interfaces");
|
|
17
16
|
/**
|
|
18
17
|
* Custom logger that extends Node.js Console with context-aware logging.
|
|
@@ -21,10 +20,9 @@ const logger_interfaces_1 = require("./logger.interfaces");
|
|
|
21
20
|
class Logger extends node_console_1.Console {
|
|
22
21
|
constructor({ event, options }) {
|
|
23
22
|
super(process.stdout, process.stderr);
|
|
24
|
-
(0, logger_context_1.ensureSdkLogContext)();
|
|
25
23
|
this.originalConsole = console;
|
|
26
24
|
this.options = options;
|
|
27
|
-
this.tags = Object.assign(Object.assign({}, event.payload.event_context), { sdk_version: constants_1.LIBRARY_VERSION
|
|
25
|
+
this.tags = Object.assign(Object.assign({}, event.payload.event_context), { sdk_version: constants_1.LIBRARY_VERSION });
|
|
28
26
|
}
|
|
29
27
|
/**
|
|
30
28
|
* Converts any value to a string using `util.inspect()` for complex types.
|
|
@@ -59,15 +57,14 @@ class Logger extends node_console_1.Console {
|
|
|
59
57
|
*
|
|
60
58
|
* @param message - The pre-formatted message string to log
|
|
61
59
|
* @param level - Log level (info, warn, error)
|
|
62
|
-
* @param sdkLog - Flag indicating if the log originated from the SDK
|
|
63
60
|
*/
|
|
64
|
-
logFn(message, level
|
|
61
|
+
logFn(message, level) {
|
|
65
62
|
var _a;
|
|
66
63
|
if ((_a = this.options) === null || _a === void 0 ? void 0 : _a.isLocalDevelopment) {
|
|
67
64
|
this.originalConsole[level](message);
|
|
68
65
|
return;
|
|
69
66
|
}
|
|
70
|
-
const logObject = Object.assign(
|
|
67
|
+
const logObject = Object.assign({ message }, this.tags);
|
|
71
68
|
this.originalConsole[level](JSON.stringify(logObject));
|
|
72
69
|
}
|
|
73
70
|
/**
|
|
@@ -79,17 +76,16 @@ class Logger extends node_console_1.Console {
|
|
|
79
76
|
* @param args - Values to log (will be stringified and truncated if needed)
|
|
80
77
|
* @param level - Log level (info, warn, error)
|
|
81
78
|
*/
|
|
82
|
-
stringifyAndLog(args, level
|
|
79
|
+
stringifyAndLog(args, level) {
|
|
83
80
|
let stringifiedArgs = args.map((arg) => this.valueToString(arg)).join(' ');
|
|
84
81
|
stringifiedArgs = this.truncateMessage(stringifiedArgs);
|
|
85
|
-
const sdkLogFlag = typeof sdkOverride === 'boolean' ? sdkOverride : this.getSdkLogFlag();
|
|
86
82
|
if (node_worker_threads_1.isMainThread) {
|
|
87
|
-
this.logFn(stringifiedArgs, level
|
|
83
|
+
this.logFn(stringifiedArgs, level);
|
|
88
84
|
}
|
|
89
85
|
else {
|
|
90
86
|
node_worker_threads_1.parentPort === null || node_worker_threads_1.parentPort === void 0 ? void 0 : node_worker_threads_1.parentPort.postMessage({
|
|
91
87
|
subject: workers_1.WorkerMessageSubject.WorkerMessageLog,
|
|
92
|
-
payload: { stringifiedArgs, level
|
|
88
|
+
payload: { stringifiedArgs, level },
|
|
93
89
|
});
|
|
94
90
|
}
|
|
95
91
|
}
|
|
@@ -105,18 +101,6 @@ class Logger extends node_console_1.Console {
|
|
|
105
101
|
error(...args) {
|
|
106
102
|
this.stringifyAndLog(args, logger_interfaces_1.LogLevel.ERROR);
|
|
107
103
|
}
|
|
108
|
-
sdkInfo(...args) {
|
|
109
|
-
this.stringifyAndLog(args, logger_interfaces_1.LogLevel.INFO, true);
|
|
110
|
-
}
|
|
111
|
-
sdkWarn(...args) {
|
|
112
|
-
this.stringifyAndLog(args, logger_interfaces_1.LogLevel.WARN, true);
|
|
113
|
-
}
|
|
114
|
-
sdkError(...args) {
|
|
115
|
-
this.stringifyAndLog(args, logger_interfaces_1.LogLevel.ERROR, true);
|
|
116
|
-
}
|
|
117
|
-
getSdkLogFlag() {
|
|
118
|
-
return (0, logger_context_1.getSdkLogContextValue)(this.tags.sdk_log);
|
|
119
|
-
}
|
|
120
104
|
}
|
|
121
105
|
exports.Logger = Logger;
|
|
122
106
|
/**
|
|
@@ -1,27 +1,20 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
const node_path_1 = __importDefault(require("node:path"));
|
|
7
3
|
const node_util_1 = require("node:util");
|
|
8
|
-
const node_worker_threads_1 = require("node:worker_threads");
|
|
9
4
|
const constants_1 = require("../common/constants");
|
|
10
5
|
const test_helpers_1 = require("../tests/test-helpers");
|
|
11
6
|
const extraction_1 = require("../types/extraction");
|
|
12
|
-
const workers_1 = require("../types/workers");
|
|
13
7
|
const logger_1 = require("./logger");
|
|
14
8
|
const logger_constants_1 = require("./logger.constants");
|
|
15
|
-
const logger_interfaces_1 = require("./logger.interfaces");
|
|
16
9
|
// Mock console methods
|
|
17
10
|
const mockConsoleInfo = jest.spyOn(console, 'info').mockImplementation();
|
|
18
11
|
const mockConsoleWarn = jest.spyOn(console, 'warn').mockImplementation();
|
|
19
12
|
const mockConsoleError = jest.spyOn(console, 'error').mockImplementation();
|
|
20
|
-
// Mock worker_threads
|
|
21
|
-
jest.mock('node:worker_threads', () => {
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
});
|
|
13
|
+
// Mock worker_threads
|
|
14
|
+
jest.mock('node:worker_threads', () => ({
|
|
15
|
+
isMainThread: true,
|
|
16
|
+
parentPort: null,
|
|
17
|
+
}));
|
|
25
18
|
describe(logger_1.Logger.name, () => {
|
|
26
19
|
let mockEvent;
|
|
27
20
|
let mockOptions;
|
|
@@ -59,7 +52,7 @@ describe(logger_1.Logger.name, () => {
|
|
|
59
52
|
// Assert
|
|
60
53
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
61
54
|
const tags = logger.tags;
|
|
62
|
-
expect(tags).toEqual(Object.assign(Object.assign({}, mockEvent.payload.event_context), { sdk_version: constants_1.LIBRARY_VERSION
|
|
55
|
+
expect(tags).toEqual(Object.assign(Object.assign({}, mockEvent.payload.event_context), { sdk_version: constants_1.LIBRARY_VERSION }));
|
|
63
56
|
});
|
|
64
57
|
it('should log string message as JSON with event context tags in production mode', () => {
|
|
65
58
|
// Arrange
|
|
@@ -68,7 +61,7 @@ describe(logger_1.Logger.name, () => {
|
|
|
68
61
|
// Act
|
|
69
62
|
logger.info(message);
|
|
70
63
|
// Assert
|
|
71
|
-
expect(mockConsoleInfo).toHaveBeenCalledWith(JSON.stringify(Object.assign(Object.assign({ message }, mockEvent.payload.event_context), { sdk_version: constants_1.LIBRARY_VERSION
|
|
64
|
+
expect(mockConsoleInfo).toHaveBeenCalledWith(JSON.stringify(Object.assign(Object.assign({ message }, mockEvent.payload.event_context), { sdk_version: constants_1.LIBRARY_VERSION })));
|
|
72
65
|
});
|
|
73
66
|
it('should log object message using inspect with proper formatting in production mode', () => {
|
|
74
67
|
// Arrange
|
|
@@ -78,7 +71,7 @@ describe(logger_1.Logger.name, () => {
|
|
|
78
71
|
// Act
|
|
79
72
|
logger.info(data);
|
|
80
73
|
// Assert
|
|
81
|
-
expect(mockConsoleInfo).toHaveBeenCalledWith(JSON.stringify(Object.assign(Object.assign({ message: expectedMessage }, mockEvent.payload.event_context), { sdk_version: constants_1.LIBRARY_VERSION
|
|
74
|
+
expect(mockConsoleInfo).toHaveBeenCalledWith(JSON.stringify(Object.assign(Object.assign({ message: expectedMessage }, mockEvent.payload.event_context), { sdk_version: constants_1.LIBRARY_VERSION })));
|
|
82
75
|
});
|
|
83
76
|
it('should join multiple arguments with space when logging in production mode', () => {
|
|
84
77
|
// Arrange
|
|
@@ -89,7 +82,7 @@ describe(logger_1.Logger.name, () => {
|
|
|
89
82
|
// Act
|
|
90
83
|
logger.info(text, data);
|
|
91
84
|
// Assert
|
|
92
|
-
expect(mockConsoleInfo).toHaveBeenCalledWith(JSON.stringify(Object.assign(Object.assign({ message: `${text} ${expectedDataMessage}` }, mockEvent.payload.event_context), { sdk_version: constants_1.LIBRARY_VERSION
|
|
85
|
+
expect(mockConsoleInfo).toHaveBeenCalledWith(JSON.stringify(Object.assign(Object.assign({ message: `${text} ${expectedDataMessage}` }, mockEvent.payload.event_context), { sdk_version: constants_1.LIBRARY_VERSION })));
|
|
93
86
|
});
|
|
94
87
|
it('should log mixed string and object arguments joined with spaces in production mode', () => {
|
|
95
88
|
// Arrange
|
|
@@ -101,60 +94,7 @@ describe(logger_1.Logger.name, () => {
|
|
|
101
94
|
// Act
|
|
102
95
|
logger.info(text1, data, text2);
|
|
103
96
|
// Assert
|
|
104
|
-
expect(mockConsoleInfo).toHaveBeenCalledWith(JSON.stringify(Object.assign(Object.assign({ message: `${text1} ${expectedDataMessage} ${text2}` }, mockEvent.payload.event_context), { sdk_version: constants_1.LIBRARY_VERSION
|
|
105
|
-
});
|
|
106
|
-
async function runWorkerLog(mode) {
|
|
107
|
-
const workerScriptPath = node_path_1.default.join(__dirname, 'logger.worker-fixture.js');
|
|
108
|
-
const worker = new node_worker_threads_1.Worker(workerScriptPath, {
|
|
109
|
-
workerData: {
|
|
110
|
-
event: mockEvent,
|
|
111
|
-
options: mockOptions,
|
|
112
|
-
message: 'Worker log',
|
|
113
|
-
mode,
|
|
114
|
-
},
|
|
115
|
-
});
|
|
116
|
-
try {
|
|
117
|
-
const logMessage = await new Promise((resolve, reject) => {
|
|
118
|
-
function cleanup() {
|
|
119
|
-
worker.off('message', handleMessage);
|
|
120
|
-
worker.off('exit', handleExit);
|
|
121
|
-
worker.off('error', handleError);
|
|
122
|
-
}
|
|
123
|
-
function handleMessage(message) {
|
|
124
|
-
const typedMessage = message;
|
|
125
|
-
if ((typedMessage === null || typedMessage === void 0 ? void 0 : typedMessage.subject) === workers_1.WorkerMessageSubject.WorkerMessageLog) {
|
|
126
|
-
cleanup();
|
|
127
|
-
resolve(typedMessage);
|
|
128
|
-
}
|
|
129
|
-
}
|
|
130
|
-
function handleExit(code) {
|
|
131
|
-
cleanup();
|
|
132
|
-
reject(new Error(`Worker exited before emitting log. Exit code: ${code.toString()}`));
|
|
133
|
-
}
|
|
134
|
-
function handleError(error) {
|
|
135
|
-
cleanup();
|
|
136
|
-
reject(error);
|
|
137
|
-
}
|
|
138
|
-
worker.on('message', handleMessage);
|
|
139
|
-
worker.once('exit', handleExit);
|
|
140
|
-
worker.once('error', handleError);
|
|
141
|
-
});
|
|
142
|
-
return logMessage;
|
|
143
|
-
}
|
|
144
|
-
finally {
|
|
145
|
-
await worker.terminate();
|
|
146
|
-
}
|
|
147
|
-
}
|
|
148
|
-
it('should set sdk_log to false for worker thread logs', async () => {
|
|
149
|
-
const logMessage = await runWorkerLog('user');
|
|
150
|
-
expect(logMessage.payload.sdk_log).toBe(false);
|
|
151
|
-
expect(logMessage.payload.level).toBe(logger_interfaces_1.LogLevel.INFO);
|
|
152
|
-
expect(logMessage.payload.stringifiedArgs).toContain('Worker log');
|
|
153
|
-
});
|
|
154
|
-
it('should keep sdk_log true for SDK logs inside worker thread', async () => {
|
|
155
|
-
const logMessage = await runWorkerLog('sdk');
|
|
156
|
-
expect(logMessage.payload.sdk_log).toBe(true);
|
|
157
|
-
expect(logMessage.payload.stringifiedArgs).toContain('Worker log');
|
|
97
|
+
expect(mockConsoleInfo).toHaveBeenCalledWith(JSON.stringify(Object.assign(Object.assign({ message: `${text1} ${expectedDataMessage} ${text2}` }, mockEvent.payload.event_context), { sdk_version: constants_1.LIBRARY_VERSION })));
|
|
158
98
|
});
|
|
159
99
|
it('should log directly without JSON wrapping in local development mode', () => {
|
|
160
100
|
// Arrange
|
|
@@ -303,7 +243,6 @@ describe(logger_1.Logger.name, () => {
|
|
|
303
243
|
const logObject = JSON.parse(callArgs);
|
|
304
244
|
expect(logObject.message).toBe('');
|
|
305
245
|
expect(logObject.sdk_version).toBe(constants_1.LIBRARY_VERSION);
|
|
306
|
-
expect(logObject.sdk_log).toBe(true);
|
|
307
246
|
});
|
|
308
247
|
it('[edge] should handle null and undefined values in log arguments', () => {
|
|
309
248
|
// Arrange
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"state.d.ts","sourceRoot":"","sources":["../../src/state/state.ts"],"names":[],"mappings":"AAUA,OAAO,EACL,YAAY,EAIZ,cAAc,EACf,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"state.d.ts","sourceRoot":"","sources":["../../src/state/state.ts"],"names":[],"mappings":"AAUA,OAAO,EACL,YAAY,EAIZ,cAAc,EACf,MAAM,oBAAoB,CAAC;AAE5B,wBAAsB,kBAAkB,CAAC,cAAc,EAAE,EACvD,KAAK,EACL,YAAY,EACZ,oBAAoB,EACpB,OAAO,GACR,EAAE,cAAc,CAAC,cAAc,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,CA0DjE;AAED,qBAAa,KAAK,CAAC,cAAc;IAC/B,OAAO,CAAC,MAAM,CAA+B;IAC7C,OAAO,CAAC,eAAe,CAAW;IAClC,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,SAAS,CAAS;gBAEd,EAAE,KAAK,EAAE,YAAY,EAAE,EAAE,cAAc,CAAC,cAAc,CAAC;IAenE,IAAI,KAAK,IAAI,YAAY,CAAC,cAAc,CAAC,CAExC;IAED,IAAI,KAAK,CAAC,KAAK,EAAE,YAAY,CAAC,cAAc,CAAC,EAE5C;IAED;;;;OAIG;IACG,IAAI,CAAC,YAAY,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IAoCvD;;;OAGG;IACG,SAAS,CAAC,KAAK,CAAC,EAAE,YAAY,CAAC,cAAc,CAAC;IAuCpD;;;OAGG;IACG,UAAU,IAAI,OAAO,CAAC,MAAM,CAAC;CAkBpC"}
|
package/dist/state/state.js
CHANGED
|
@@ -14,7 +14,6 @@ const logger_1 = require("../logger/logger");
|
|
|
14
14
|
const common_1 = require("../types/common");
|
|
15
15
|
const extraction_1 = require("../types/extraction");
|
|
16
16
|
const state_interfaces_1 = require("./state.interfaces");
|
|
17
|
-
const logger_context_1 = require("../logger/logger.context");
|
|
18
17
|
async function createAdapterState({ event, initialState, initialDomainMapping, options, }) {
|
|
19
18
|
// Deep clone the initial state to avoid mutating the original state
|
|
20
19
|
const deepCloneInitialState = structuredClone(initialState);
|
|
@@ -49,8 +48,8 @@ async function createAdapterState({ event, initialState, initialDomainMapping, o
|
|
|
49
48
|
process.exit(1);
|
|
50
49
|
}
|
|
51
50
|
}
|
|
52
|
-
// Set lastSyncStarted if the event type is
|
|
53
|
-
if (event.payload.event_type === extraction_1.EventType.
|
|
51
|
+
// Set lastSyncStarted if the event type is StartExtractingData
|
|
52
|
+
if (event.payload.event_type === extraction_1.EventType.StartExtractingData &&
|
|
54
53
|
!as.state.lastSyncStarted) {
|
|
55
54
|
as.state.lastSyncStarted = new Date().toISOString();
|
|
56
55
|
console.log(`Setting lastSyncStarted to ${as.state.lastSyncStarted}.`);
|
|
@@ -96,7 +95,7 @@ class State {
|
|
|
96
95
|
throw new Error(`Failed to parse state. ${error}`);
|
|
97
96
|
}
|
|
98
97
|
this.state = parsedState;
|
|
99
|
-
|
|
98
|
+
console.log('State fetched successfully. Current state', (0, logger_1.getPrintableState)(this.state));
|
|
100
99
|
}
|
|
101
100
|
catch (error) {
|
|
102
101
|
if (axios_1.default.isAxiosError(error) && ((_a = error.response) === null || _a === void 0 ? void 0 : _a.status) === 404) {
|
|
@@ -138,7 +137,7 @@ class State {
|
|
|
138
137
|
request_id: this.requestId,
|
|
139
138
|
},
|
|
140
139
|
});
|
|
141
|
-
|
|
140
|
+
console.log('State updated successfully to', (0, logger_1.getPrintableState)(this.state));
|
|
142
141
|
}
|
|
143
142
|
catch (error) {
|
|
144
143
|
console.error('Failed to update the state.', (0, logger_1.serializeError)(error));
|