@adobe/spacecat-shared-utils 1.88.0 → 1.89.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/CHANGELOG.md +7 -0
- package/package.json +1 -1
- package/src/constants.js +2 -0
- package/src/index.d.ts +31 -0
- package/src/index.js +3 -3
- package/src/metrics-store.js +60 -0
- package/src/s3.js +47 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,10 @@
|
|
|
1
|
+
# [@adobe/spacecat-shared-utils-v1.89.0](https://github.com/adobe/spacecat-shared/compare/@adobe/spacecat-shared-utils-v1.88.0...@adobe/spacecat-shared-utils-v1.89.0) (2026-01-22)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Features
|
|
5
|
+
|
|
6
|
+
* moved `calculateCpcValue` function to spacecat-shared-utils ([#1048](https://github.com/adobe/spacecat-shared/issues/1048)) ([5006e5b](https://github.com/adobe/spacecat-shared/commit/5006e5be51c8959f2e6d72664251e1e0264d44a1))
|
|
7
|
+
|
|
1
8
|
# [@adobe/spacecat-shared-utils-v1.88.0](https://github.com/adobe/spacecat-shared/compare/@adobe/spacecat-shared-utils-v1.87.1...@adobe/spacecat-shared-utils-v1.88.0) (2026-01-22)
|
|
2
9
|
|
|
3
10
|
|
package/package.json
CHANGED
package/src/constants.js
CHANGED
package/src/index.d.ts
CHANGED
|
@@ -17,6 +17,8 @@ export { AUTHORING_TYPES, DELIVERY_TYPES } from './aem.js';
|
|
|
17
17
|
|
|
18
18
|
export { OPPORTUNITY_TYPES } from './constants.js';
|
|
19
19
|
|
|
20
|
+
export const DEFAULT_CPC_VALUE: number;
|
|
21
|
+
|
|
20
22
|
/** UTILITY FUNCTIONS */
|
|
21
23
|
export function arrayEquals<T>(a: T[], b: T[]): boolean;
|
|
22
24
|
|
|
@@ -287,6 +289,35 @@ export function getStoredMetrics(config: object, context: object):
|
|
|
287
289
|
*/
|
|
288
290
|
export function storeMetrics(content: object, config: object, context: object): Promise<string>;
|
|
289
291
|
|
|
292
|
+
/**
|
|
293
|
+
* Retrieves an object from S3 by its key and returns its JSON parsed content.
|
|
294
|
+
* If the object is not JSON, returns the raw body.
|
|
295
|
+
* If the object is not found, returns null.
|
|
296
|
+
* @param s3Client - The S3 client
|
|
297
|
+
* @param bucketName - The name of the S3 bucket
|
|
298
|
+
* @param key - The key of the S3 object
|
|
299
|
+
* @param log - A logger instance
|
|
300
|
+
* @returns The content of the S3 object or null if not found
|
|
301
|
+
*/
|
|
302
|
+
export function getObjectFromKey(
|
|
303
|
+
s3Client: any,
|
|
304
|
+
bucketName: string,
|
|
305
|
+
key: string,
|
|
306
|
+
log: any
|
|
307
|
+
): Promise<any | null>;
|
|
308
|
+
|
|
309
|
+
/**
|
|
310
|
+
* Fetches the organic traffic data for a site from S3 and calculates the CPC value
|
|
311
|
+
* @param context - Context object
|
|
312
|
+
* @param context.env - Environment variables
|
|
313
|
+
* @param context.env.S3_IMPORTER_BUCKET_NAME - S3 importer bucket name
|
|
314
|
+
* @param context.s3Client - S3 client
|
|
315
|
+
* @param context.log - Logger
|
|
316
|
+
* @param siteId - The site ID
|
|
317
|
+
* @returns CPC value in dollars
|
|
318
|
+
*/
|
|
319
|
+
export function calculateCPCValue(context: object, siteId: string): Promise<number>;
|
|
320
|
+
|
|
290
321
|
export function s3Wrapper(fn: (request: object, context: object) => Promise<Response>):
|
|
291
322
|
(request: object, context: object) => Promise<Response>;
|
|
292
323
|
|
package/src/index.js
CHANGED
|
@@ -76,11 +76,11 @@ export {
|
|
|
76
76
|
extractUrlsFromSuggestion,
|
|
77
77
|
} from './url-extractors.js';
|
|
78
78
|
|
|
79
|
-
export { getStoredMetrics, storeMetrics } from './metrics-store.js';
|
|
79
|
+
export { getStoredMetrics, storeMetrics, calculateCPCValue } from './metrics-store.js';
|
|
80
80
|
|
|
81
|
-
export { s3Wrapper } from './s3.js';
|
|
81
|
+
export { s3Wrapper, getObjectFromKey } from './s3.js';
|
|
82
82
|
|
|
83
|
-
export { OPPORTUNITY_TYPES } from './constants.js';
|
|
83
|
+
export { OPPORTUNITY_TYPES, DEFAULT_CPC_VALUE } from './constants.js';
|
|
84
84
|
|
|
85
85
|
export { fetch } from './adobe-fetch.js';
|
|
86
86
|
export { tracingFetch, SPACECAT_USER_AGENT } from './tracing-fetch.js';
|
package/src/metrics-store.js
CHANGED
|
@@ -10,6 +10,8 @@
|
|
|
10
10
|
* governing permissions and limitations under the License.
|
|
11
11
|
*/
|
|
12
12
|
import { GetObjectCommand, PutObjectCommand } from '@aws-sdk/client-s3';
|
|
13
|
+
import { getObjectFromKey } from './s3.js';
|
|
14
|
+
import { DEFAULT_CPC_VALUE } from './constants.js';
|
|
13
15
|
|
|
14
16
|
function createFilePath({ siteId, source, metric }) {
|
|
15
17
|
if (!siteId) {
|
|
@@ -80,3 +82,61 @@ export async function storeMetrics(content, config, context) {
|
|
|
80
82
|
throw new Error(`Failed to upload metrics to ${filePath}, error: ${e.message}`);
|
|
81
83
|
}
|
|
82
84
|
}
|
|
85
|
+
|
|
86
|
+
/**
|
|
87
|
+
* Fetches the organic traffic data for a site from S3 and calculate the CPC value as per
|
|
88
|
+
* https://wiki.corp.adobe.com/pages/viewpage.action?spaceKey=AEMSites&title=Success+Studio+Projected+Business+Impact+Metrics#SuccessStudioProjectedBusinessImpactMetrics-IdentifyingCPCvalueforadomain
|
|
89
|
+
* @param context
|
|
90
|
+
* @param siteId
|
|
91
|
+
* @returns {object} Object containing either { success: true, value: number } on success
|
|
92
|
+
* or { success: false, reason: string, value: number } on failure
|
|
93
|
+
*/
|
|
94
|
+
export async function calculateCPCValue(context, siteId) {
|
|
95
|
+
if (!context?.env?.S3_IMPORTER_BUCKET_NAME) {
|
|
96
|
+
throw new Error('S3 importer bucket name is required');
|
|
97
|
+
}
|
|
98
|
+
if (!context.s3Client) {
|
|
99
|
+
throw new Error('S3 client is required');
|
|
100
|
+
}
|
|
101
|
+
if (!context.log) {
|
|
102
|
+
throw new Error('Logger is required');
|
|
103
|
+
}
|
|
104
|
+
if (!siteId) {
|
|
105
|
+
throw new Error('SiteId is required');
|
|
106
|
+
}
|
|
107
|
+
const { s3Client, log } = context;
|
|
108
|
+
const bucketName = context.env.S3_IMPORTER_BUCKET_NAME;
|
|
109
|
+
const key = `metrics/${siteId}/ahrefs/organic-traffic.json`;
|
|
110
|
+
try {
|
|
111
|
+
const organicTrafficData = await getObjectFromKey(s3Client, bucketName, key, log);
|
|
112
|
+
if (!Array.isArray(organicTrafficData) || organicTrafficData.length === 0) {
|
|
113
|
+
log.warn(`Organic traffic data not available for ${siteId}. Using Default CPC value.`);
|
|
114
|
+
return {
|
|
115
|
+
success: false,
|
|
116
|
+
reason: 'Organic traffic data not available',
|
|
117
|
+
value: DEFAULT_CPC_VALUE,
|
|
118
|
+
};
|
|
119
|
+
}
|
|
120
|
+
const lastTraffic = organicTrafficData.at(-1);
|
|
121
|
+
if (!lastTraffic.cost || !lastTraffic.value) {
|
|
122
|
+
log.warn(`Invalid organic traffic data present for ${siteId} - cost:${lastTraffic.cost} value:${lastTraffic.value}, Using Default CPC value.`);
|
|
123
|
+
return {
|
|
124
|
+
success: false,
|
|
125
|
+
reason: 'Invalid organic traffic data',
|
|
126
|
+
value: DEFAULT_CPC_VALUE,
|
|
127
|
+
};
|
|
128
|
+
}
|
|
129
|
+
// dividing by 100 for cents to dollar conversion
|
|
130
|
+
return {
|
|
131
|
+
success: true,
|
|
132
|
+
value: lastTraffic.cost / lastTraffic.value / 100,
|
|
133
|
+
};
|
|
134
|
+
} catch (err) {
|
|
135
|
+
log.error(`Error fetching organic traffic data for site ${siteId}. Using Default CPC value.`, err);
|
|
136
|
+
return {
|
|
137
|
+
success: false,
|
|
138
|
+
reason: 'Error fetching organic traffic data',
|
|
139
|
+
value: DEFAULT_CPC_VALUE,
|
|
140
|
+
};
|
|
141
|
+
}
|
|
142
|
+
}
|
package/src/s3.js
CHANGED
|
@@ -10,9 +10,55 @@
|
|
|
10
10
|
* governing permissions and limitations under the License.
|
|
11
11
|
*/
|
|
12
12
|
|
|
13
|
-
import { S3Client } from '@aws-sdk/client-s3';
|
|
13
|
+
import { GetObjectCommand, S3Client } from '@aws-sdk/client-s3';
|
|
14
14
|
import { instrumentAWSClient } from './xray.js';
|
|
15
15
|
|
|
16
|
+
/**
|
|
17
|
+
* Retrieves an object from S3 by its key and returns its JSON parsed content.
|
|
18
|
+
* If the object is not JSON, returns the raw body.
|
|
19
|
+
* If the object is not found, returns null.
|
|
20
|
+
* @param {import('@aws-sdk/client-s3').S3Client} s3Client - an S3 client
|
|
21
|
+
* @param {string} bucketName - the name of the S3 bucket
|
|
22
|
+
* @param {string} key - the key of the S3 object
|
|
23
|
+
* @param {import('@azure/logger').Logger} log - a logger instance
|
|
24
|
+
* @returns {Promise<import('@aws-sdk/client-s3').GetObjectOutput['Body'] | null>}
|
|
25
|
+
* - the content of the S3 object
|
|
26
|
+
*/
|
|
27
|
+
export async function getObjectFromKey(s3Client, bucketName, key, log) {
|
|
28
|
+
if (!s3Client || !bucketName || !key) {
|
|
29
|
+
log.error(
|
|
30
|
+
'Invalid input parameters in getObjectFromKey: ensure s3Client, bucketName, and key are provided.',
|
|
31
|
+
);
|
|
32
|
+
return null;
|
|
33
|
+
}
|
|
34
|
+
const command = new GetObjectCommand({
|
|
35
|
+
Bucket: bucketName,
|
|
36
|
+
Key: key,
|
|
37
|
+
});
|
|
38
|
+
try {
|
|
39
|
+
const response = await s3Client.send(command);
|
|
40
|
+
const contentType = response.ContentType;
|
|
41
|
+
const body = await response.Body.transformToString();
|
|
42
|
+
|
|
43
|
+
if (contentType && contentType.includes('application/json')) {
|
|
44
|
+
try {
|
|
45
|
+
return JSON.parse(body);
|
|
46
|
+
} catch (parseError) {
|
|
47
|
+
log.error(`Unable to parse content for key ${key}`, parseError);
|
|
48
|
+
return null;
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
// Always return body for non-JSON content types
|
|
52
|
+
return body;
|
|
53
|
+
} catch (err) {
|
|
54
|
+
log.error(
|
|
55
|
+
`Error while fetching S3 object from bucket ${bucketName} using key ${key}`,
|
|
56
|
+
err,
|
|
57
|
+
);
|
|
58
|
+
return null;
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
|
|
16
62
|
/**
|
|
17
63
|
* Adds an S3Client instance and bucket to the context.
|
|
18
64
|
*
|