Socket
Socket
Sign inDemoInstall

@applitools/core-base

Package Overview
Dependencies
29
Maintainers
51
Versions
99
Alerts
File Explorer

Advanced tools

Install Socket

Detect and block malicious and high-risk dependencies

Install

Comparing version 1.7.4 to 1.7.5

dist/get-account-info.js

7

CHANGELOG.md
# Changelog
## [1.7.5](https://github.com/applitools/eyes.sdk.javascript1/compare/js/core-base@1.7.4...js/core-base@1.7.5) (2023-12-19)
### Bug Fixes
* avoid caching concurrency ([#2103](https://github.com/applitools/eyes.sdk.javascript1/issues/2103)) ([34db2e9](https://github.com/applitools/eyes.sdk.javascript1/commit/34db2e9c554b0851b18b514b1a8a82b83ff310cd))
## [1.7.4](https://github.com/applitools/eyes.sdk.javascript1/compare/js/core-base@1.7.3...js/core-base@1.7.4) (2023-12-05)

@@ -4,0 +11,0 @@

7

dist/close-batch.js

@@ -28,7 +28,10 @@ "use strict";

const utils = __importStar(require("@applitools/utils"));
function makeCloseBatch({ requests, logger: mainLogger }) {
function makeCloseBatch({ requests, agentId: defaultAgentId, logger: mainLogger }) {
return async function closeBatch({ settings, logger = mainLogger, }) {
logger = logger.extend(mainLogger, { tags: [`close-batch-base-${utils.general.shortid()}`] });
settings = (utils.types.isArray(settings) ? settings : [settings]).map(settings => {
settings.agentId = `${defaultAgentId} ${settings.agentId ? `[${settings.agentId}]` : ''}`.trim();
return settings;
});
logger.log('Command "closeBatch" is called with settings', settings);
settings = utils.types.isArray(settings) ? settings : [settings];
const results = await Promise.allSettled(settings.map(settings => (settings.batchId ? requests.closeBatch({ settings, logger }) : null)));

@@ -35,0 +38,0 @@ const error = results.find(({ status }) => status === 'rejected');

@@ -13,18 +13,19 @@ "use strict";

const delete_test_1 = require("./delete-test");
const get_account_info_1 = require("./get-account-info");
function makeCore({ agentId = 'core-base', concurrency, cwd = process.cwd(), logger: defaultLogger, }) {
const logger = (0, logger_1.makeLogger)({ logger: defaultLogger, format: { label: 'core-base' } });
logger.log(`Core is initialized in directory ${cwd} for agent ${agentId}`);
const coreRequests = (0, requests_1.makeCoreRequests)({ agentId, logger });
const requests = (0, requests_1.makeCoreRequestsWithCache)({ logger });
return {
openEyes: (0, open_eyes_1.makeOpenEyes)({ requests: coreRequests, concurrency, cwd, logger }),
openFunctionalSession: (0, open_functional_session_1.makeOpenFunctionalSession)({ requests: coreRequests, concurrency, cwd, logger }),
locate: (0, locate_1.makeLocate)({ requests: coreRequests, logger }),
locateText: (0, locate_text_1.makeLocateText)({ requests: coreRequests, logger }),
extractText: (0, extract_text_1.makeExtractText)({ requests: coreRequests, logger }),
closeBatch: (0, close_batch_1.makeCloseBatch)({ requests: coreRequests, logger }),
deleteTest: (0, delete_test_1.makeDeleteTest)({ requests: coreRequests, logger }),
getAccountInfo: coreRequests.getAccountInfo,
logEvent: coreRequests.logEvent,
openEyes: (0, open_eyes_1.makeOpenEyes)({ requests, agentId, concurrency, cwd, logger }),
openFunctionalSession: (0, open_functional_session_1.makeOpenFunctionalSession)({ requests, agentId, concurrency, cwd, logger }),
locate: (0, locate_1.makeLocate)({ requests, agentId, logger }),
locateText: (0, locate_text_1.makeLocateText)({ requests, agentId, logger }),
extractText: (0, extract_text_1.makeExtractText)({ requests, agentId, logger }),
closeBatch: (0, close_batch_1.makeCloseBatch)({ requests, agentId, logger }),
deleteTest: (0, delete_test_1.makeDeleteTest)({ requests, agentId, logger }),
getAccountInfo: (0, get_account_info_1.makeGetAccountInfo)({ requests, agentId, logger }),
logEvent: requests.logEvent,
};
}
exports.makeCore = makeCore;

@@ -28,7 +28,10 @@ "use strict";

const utils = __importStar(require("@applitools/utils"));
function makeDeleteTest({ requests, logger: mainLogger }) {
function makeDeleteTest({ requests, agentId: defaultAgentId, logger: mainLogger }) {
return async function deleteTest({ settings, logger = mainLogger, }) {
logger = logger.extend(mainLogger, { tags: [`delete-test-base-${utils.general.shortid()}`] });
settings = (utils.types.isArray(settings) ? settings : [settings]).map(settings => {
settings.agentId = `${defaultAgentId} ${settings.agentId ? `[${settings.agentId}]` : ''}`.trim();
return settings;
});
logger.log('Command "deleteTest" is called with settings', settings);
settings = utils.types.isArray(settings) ? settings : [settings];
const results = await Promise.allSettled(settings.map(settings => requests.deleteTest({ settings, logger })));

@@ -35,0 +38,0 @@ const error = results.find(({ status }) => status === 'rejected');

@@ -29,8 +29,6 @@ "use strict";

const utils = __importStar(require("@applitools/utils"));
function makeExtractText({ requests, logger: mainLogger }) {
function makeExtractText({ requests, agentId: defaultAgentId, logger: mainLogger }) {
return async function extractText({ target, settings, logger = mainLogger, }) {
logger = logger.extend(mainLogger, { tags: [`extract-text-base-${utils.general.shortid()}`] });
logger.log('Command "extractText" is called with settings', settings);
settings = utils.types.isArray(settings) ? settings : [settings];
const results = await Promise.all(settings.map(async (settings) => {
settings = await Promise.all((utils.types.isArray(settings) ? settings : [settings]).map(async (settings) => {
var _a, _b, _c, _d, _e;

@@ -43,2 +41,7 @@ const account = await requests.getAccountInfo({ settings, logger });

};
settings.agentId = `${defaultAgentId} ${settings.agentId ? `[${settings.agentId}]` : ''}`.trim();
return settings;
}));
logger.log('Command "extractText" is called with settings', settings);
const results = await Promise.all(settings.map(async (settings) => {
target = await (0, transform_target_1.transformTarget)({ target, settings });

@@ -45,0 +48,0 @@ return requests.extractText({ target, settings, logger });

@@ -29,3 +29,3 @@ "use strict";

const utils = __importStar(require("@applitools/utils"));
function makeLocateText({ requests, logger: mainLogger }) {
function makeLocateText({ requests, agentId: defaultAgentId, logger: mainLogger }) {
return async function locateText({ target, settings, logger = mainLogger, }) {

@@ -40,2 +40,3 @@ var _a, _b, _c, _d, _e;

};
settings.agentId = `${defaultAgentId} ${settings.agentId ? `[${settings.agentId}]` : ''}`.trim();
logger.log('Command "locateText" is called with settings', settings);

@@ -42,0 +43,0 @@ target = await (0, transform_target_1.transformTarget)({ target, settings });

@@ -29,3 +29,3 @@ "use strict";

const utils = __importStar(require("@applitools/utils"));
function makeLocate({ requests, logger: mainLogger }) {
function makeLocate({ requests, agentId: defaultAgentId, logger: mainLogger }) {
return async function locate({ target, settings, logger = mainLogger, }) {

@@ -40,2 +40,3 @@ var _a, _b, _c, _d, _e;

};
settings.agentId = `${defaultAgentId} ${settings.agentId ? `[${settings.agentId}]` : ''}`.trim();
logger.log('Command "locate" is called with settings', settings);

@@ -42,0 +43,0 @@ target = await (0, transform_target_1.transformTarget)({ target, settings });

@@ -39,3 +39,3 @@ "use strict";

const utils = __importStar(require("@applitools/utils"));
function makeOpenEyes({ requests, concurrency, cwd = process.cwd(), logger: mainLogger }) {
function makeOpenEyes({ requests, agentId: defaultAgentId, concurrency, cwd = process.cwd(), logger: mainLogger, }) {
const throttle = concurrency ? (0, throat_1.default)(concurrency) : (fn) => fn();

@@ -45,3 +45,2 @@ return async function openEyes({ settings, logger = mainLogger, }) {

logger = logger.extend(mainLogger, { tags: [`eyes-base-${utils.general.shortid()}`] });
logger.log('Command "openEyes" is called with settings', settings);
if (!settings.ignoreGitBranching && !settings.gitBranchingTimestamp) {

@@ -68,2 +67,4 @@ let branchName = settings.branchName;

}
settings.agentId = `${defaultAgentId} ${settings.agentId ? `[${settings.agentId}]` : ''}`.trim();
logger.log('Command "openEyes" is called with settings', settings);
return new Promise((resolve, reject) => {

@@ -70,0 +71,0 @@ throttle(() => {

@@ -36,6 +36,7 @@ "use strict";

const utils = __importStar(require("@applitools/utils"));
function makeOpenFunctionalSession({ requests, concurrency, logger: mainLogger }) {
function makeOpenFunctionalSession({ requests, agentId: defaultAgentId, concurrency, logger: mainLogger, }) {
const throttle = concurrency ? (0, throat_1.default)(concurrency) : (fn) => fn();
return async function openFunctionalSession({ settings, logger = mainLogger, }) {
logger = logger.extend(mainLogger, { tags: [`functional-session-base-${utils.general.shortid()}`] });
settings.agentId = `${defaultAgentId} ${settings.agentId ? `[${settings.agentId}]` : ''}`.trim();
logger.log('Command "openFunctionalSession" is called with settings', settings);

@@ -42,0 +43,0 @@ return new Promise((resolve, reject) => {

@@ -26,3 +26,3 @@ "use strict";

Object.defineProperty(exports, "__esModule", { value: true });
exports.makeFunctionalSessionRequests = exports.makeEyesRequests = exports.makeCoreRequests = void 0;
exports.makeCoreRequestsWithCache = void 0;
const logger_1 = require("@applitools/logger");

@@ -32,9 +32,10 @@ const req_eyes_1 = require("./req-eyes");

const utils = __importStar(require("@applitools/utils"));
function makeCoreRequests({ agentId: defaultAgentId, fetch, logger: defaultLogger, }) {
exports.makeCoreRequestsWithCache = utils.general.cachify(makeCoreRequests, () => 'default');
function makeCoreRequests({ fetch, logger: defaultLogger } = {}) {
const mainLogger = (0, logger_1.makeLogger)({ logger: defaultLogger, format: { label: 'core-requests' } });
const getAccountInfoWithCache = utils.general.cachify(getAccountInfo, ([{ settings }]) => {
return [settings.eyesServerUrl, settings.apiKey];
return [settings.eyesServerUrl, settings.apiKey, settings.proxy];
});
const getBatchBranchesWithCache = utils.general.cachify(getBatchBranches, ([{ settings }]) => {
return [settings.batchId, settings.eyesServerUrl, settings.apiKey];
return [settings.batchId, settings.eyesServerUrl, settings.apiKey, settings.proxy];
});

@@ -57,4 +58,3 @@ const core = {

logger = logger.extend(mainLogger, { tags: [`core-request-${utils.general.shortid()}`] });
const agentId = `${defaultAgentId} ${settings.agentId ? `[${settings.agentId}]` : ''}`.trim();
const req = (0, req_eyes_1.makeReqEyes)({ settings: { ...settings, agentId }, fetch, logger });
const req = (0, req_eyes_1.makeReqEyes)({ settings, fetch, logger });
logger.log('Request "openEyes" called with settings', settings);

@@ -68,3 +68,3 @@ const accountPromise = getAccountInfoWithCache({ settings });

startInfo: {
agentId,
agentId: settings.agentId,
agentSessionId: settings.userTestId,

@@ -147,4 +147,3 @@ agentRunId: settings.userTestId,

logger = logger.extend(mainLogger, { tags: [`core-request-${utils.general.shortid()}`] });
const agentId = `${defaultAgentId} ${settings.agentId ? `[${settings.agentId}]` : ''}`.trim();
const req = (0, req_eyes_1.makeReqEyes)({ settings: { ...settings, agentId }, fetch, logger });
const req = (0, req_eyes_1.makeReqEyes)({ settings, fetch, logger });
logger.log('Request "openFunctionalSession" called with settings', settings);

@@ -158,3 +157,3 @@ const accountPromise = getAccountInfoWithCache({ settings });

startInfo: {
agentId,
agentId: settings.agentId,
agentSessionId: settings.userTestId,

@@ -218,4 +217,3 @@ agentRunId: settings.userTestId,

logger = logger.extend(mainLogger, { tags: [`core-request-${utils.general.shortid()}`] });
const agentId = `${defaultAgentId} ${settings.agentId ? `[${settings.agentId}]` : ''}`.trim();
const req = (0, req_eyes_1.makeReqEyes)({ settings: { ...settings, agentId }, fetch, logger });
const req = (0, req_eyes_1.makeReqEyes)({ settings, fetch, logger });
logger.log('Request "locate" called for target', target, 'with settings', settings);

@@ -250,4 +248,3 @@ const account = await getAccountInfoWithCache({ settings });

logger = logger.extend(mainLogger, { tags: [`core-request-${utils.general.shortid()}`] });
const agentId = `${defaultAgentId} ${settings.agentId ? `[${settings.agentId}]` : ''}`.trim();
const req = (0, req_eyes_1.makeReqEyes)({ settings: { ...settings, agentId }, fetch, logger });
const req = (0, req_eyes_1.makeReqEyes)({ settings, fetch, logger });
logger.log('Request "locateText" called for target', target, 'with settings', settings);

@@ -283,4 +280,3 @@ const account = await getAccountInfoWithCache({ settings });

logger = logger.extend(mainLogger, { tags: [`core-request-${utils.general.shortid()}`] });
const agentId = `${defaultAgentId} ${settings.agentId ? `[${settings.agentId}]` : ''}`.trim();
const req = (0, req_eyes_1.makeReqEyes)({ settings: { ...settings, agentId }, fetch, logger });
const req = (0, req_eyes_1.makeReqEyes)({ settings, fetch, logger });
logger.log('Request "extractText" called for target', target, 'with settings', settings);

@@ -315,4 +311,3 @@ const account = await getAccountInfoWithCache({ settings });

logger = logger.extend(mainLogger, { tags: [`core-request-${utils.general.shortid()}`] });
const agentId = `${defaultAgentId} ${settings.agentId ? `[${settings.agentId}]` : ''}`.trim();
const req = (0, req_eyes_1.makeReqEyes)({ settings: { ...settings, agentId }, fetch, logger });
const req = (0, req_eyes_1.makeReqEyes)({ settings, fetch, logger });
logger.log('Request "getAccountInfo" called with settings', settings);

@@ -331,3 +326,3 @@ const response = await req('/api/sessions/renderinfo', {

apiKey: settings.apiKey,
agentId,
agentId: settings.agentId,
proxy: settings.proxy,

@@ -339,3 +334,3 @@ useDnsCache: settings.useDnsCache,

accessToken,
agentId,
agentId: settings.agentId,
proxy: settings.proxy,

@@ -354,4 +349,3 @@ useDnsCache: settings.useDnsCache,

logger = logger.extend(mainLogger, { tags: [`core-request-${utils.general.shortid()}`] });
const agentId = `${defaultAgentId} ${settings.agentId ? `[${settings.agentId}]` : ''}`.trim();
const req = (0, req_eyes_1.makeReqEyes)({ settings: { ...settings, agentId }, fetch, logger });
const req = (0, req_eyes_1.makeReqEyes)({ settings, fetch, logger });
logger.log('Request "getBatchBranches" called with settings', settings);

@@ -373,4 +367,3 @@ const response = await req(`/api/sessions/batches/${settings.batchId}/config/bypointerId`, {

logger = logger.extend(mainLogger, { tags: [`core-request-${utils.general.shortid()}`] });
const agentId = `${defaultAgentId} ${settings.agentId ? `[${settings.agentId}]` : ''}`.trim();
const req = (0, req_eyes_1.makeReqEyes)({ settings: { ...settings, agentId }, fetch, logger });
const req = (0, req_eyes_1.makeReqEyes)({ settings, fetch, logger });
logger.log('Request "closeBatch" called with settings', settings);

@@ -387,4 +380,3 @@ await req(`/api/sessions/batches/${settings.batchId}/close/bypointerId`, {

logger = logger.extend(mainLogger, { tags: [`core-request-${utils.general.shortid()}`] });
const agentId = `${defaultAgentId} ${settings.agentId ? `[${settings.agentId}]` : ''}`.trim();
const req = (0, req_eyes_1.makeReqEyes)({ settings: { ...settings, agentId }, fetch, logger });
const req = (0, req_eyes_1.makeReqEyes)({ settings, fetch, logger });
logger.log('Request "deleteTest" called with settings', settings);

@@ -405,4 +397,3 @@ await req(`/api/sessions/batches/${settings.batchId}/${settings.testId}`, {

settings = utils.types.isArray(settings) ? settings : [settings];
const agentId = `${defaultAgentId} ${settings[0].agentId ? `[${settings[0].agentId}]` : ''}`.trim();
const req = (0, req_eyes_1.makeReqEyes)({ settings: { ...settings[0], agentId }, fetch, logger });
const req = (0, req_eyes_1.makeReqEyes)({ settings: settings[0], fetch, logger });
logger.log('Request "logEvent" called with settings', settings);

@@ -428,3 +419,2 @@ await req(`/api/sessions/log`, {

}
exports.makeCoreRequests = makeCoreRequests;
function makeEyesRequests({ core, test, req, upload, logger: mainLogger, }) {

@@ -611,3 +601,2 @@ let resultResponsePromise;

}
exports.makeEyesRequests = makeEyesRequests;
function makeFunctionalSessionRequests({ core, test, req, logger: mainLogger, }) {

@@ -714,3 +703,2 @@ let resultResponsePromise;

}
exports.makeFunctionalSessionRequests = makeFunctionalSessionRequests;
function transformCheckOptions({ target, settings }) {

@@ -717,0 +705,0 @@ var _a, _b;

{
"name": "@applitools/core-base",
"version": "1.7.4",
"version": "1.7.5",
"homepage": "https://applitools.com",

@@ -5,0 +5,0 @@ "bugs": {

@@ -7,5 +7,6 @@ import type { CloseBatchSettings } from './types';

requests: CoreRequests;
agentId: string;
logger: Logger;
};
export declare function makeCloseBatch({ requests, logger: mainLogger }: Options): ({ settings, logger, }: {
export declare function makeCloseBatch({ requests, agentId: defaultAgentId, logger: mainLogger }: Options): ({ settings, logger, }: {
settings: MaybeArray<CloseBatchSettings>;

@@ -12,0 +13,0 @@ logger?: Logger | undefined;

@@ -7,5 +7,6 @@ import type { DeleteTestSettings } from './types';

requests: CoreRequests;
agentId: string;
logger: Logger;
};
export declare function makeDeleteTest({ requests, logger: mainLogger }: Options): ({ settings, logger, }: {
export declare function makeDeleteTest({ requests, agentId: defaultAgentId, logger: mainLogger }: Options): ({ settings, logger, }: {
settings: MaybeArray<DeleteTestSettings>;

@@ -12,0 +13,0 @@ logger?: Logger | undefined;

@@ -7,5 +7,6 @@ import type { Target, ExtractTextSettings } from './types';

requests: CoreRequests;
agentId: string;
logger: Logger;
};
export declare function makeExtractText({ requests, logger: mainLogger }: Options): ({ target, settings, logger, }: {
export declare function makeExtractText({ requests, agentId: defaultAgentId, logger: mainLogger }: Options): ({ target, settings, logger, }: {
target: Target;

@@ -12,0 +13,0 @@ settings: MaybeArray<ExtractTextSettings>;

@@ -7,5 +7,6 @@ import type { Target, LocateTextSettings, LocateTextResult } from './types';

requests: CoreRequests;
agentId: string;
logger: Logger;
};
export declare function makeLocateText({ requests, logger: mainLogger }: Options): <TPattern extends string>({ target, settings, logger, }: {
export declare function makeLocateText({ requests, agentId: defaultAgentId, logger: mainLogger }: Options): <TPattern extends string>({ target, settings, logger, }: {
target: Target;

@@ -12,0 +13,0 @@ settings: LocateTextSettings<TPattern, utils.Region>;

@@ -7,5 +7,6 @@ import type { Target, LocateSettings, LocateResult } from './types';

requests: CoreRequests;
agentId: string;
logger: Logger;
};
export declare function makeLocate({ requests, logger: mainLogger }: Options): <TLocator extends string>({ target, settings, logger, }: {
export declare function makeLocate({ requests, agentId: defaultAgentId, logger: mainLogger }: Options): <TLocator extends string>({ target, settings, logger, }: {
target: Target;

@@ -12,0 +13,0 @@ settings: LocateSettings<TLocator, utils.Region>;

@@ -6,2 +6,3 @@ import type { OpenSettings, Eyes } from './types';

requests: CoreRequests;
agentId: string;
concurrency?: number;

@@ -11,3 +12,3 @@ cwd?: string;

};
export declare function makeOpenEyes({ requests, concurrency, cwd, logger: mainLogger }: Options): ({ settings, logger, }: {
export declare function makeOpenEyes({ requests, agentId: defaultAgentId, concurrency, cwd, logger: mainLogger, }: Options): ({ settings, logger, }: {
settings: OpenSettings;

@@ -14,0 +15,0 @@ logger?: Logger | undefined;

@@ -6,2 +6,3 @@ import type { OpenSettings, FunctionalSession } from './types';

requests: CoreRequests;
agentId: string;
concurrency?: number;

@@ -11,3 +12,3 @@ cwd?: string;

};
export declare function makeOpenFunctionalSession({ requests, concurrency, logger: mainLogger }: Options): ({ settings, logger, }: {
export declare function makeOpenFunctionalSession({ requests, agentId: defaultAgentId, concurrency, logger: mainLogger, }: Options): ({ settings, logger, }: {
settings: OpenSettings;

@@ -14,0 +15,0 @@ logger?: Logger | undefined;

@@ -1,6 +0,4 @@

import type { Core, Eyes, FunctionalSession, EyesServerSettings, OpenSettings, ReportSettings, VisualTest, FunctionalTest } from '../types';
import type { Core, Eyes, FunctionalSession, EyesServerSettings, OpenSettings, ReportSettings } from '../types';
import { type Fetch } from '@applitools/req';
import { type Logger } from '@applitools/logger';
import { type ReqEyes } from './req-eyes';
import { type Upload } from './upload';
export interface CoreRequests extends Core {

@@ -39,19 +37,11 @@ openEyes(options: {

}
export declare function makeCoreRequests({ agentId: defaultAgentId, fetch, logger: defaultLogger, }: {
agentId: string;
export declare const makeCoreRequestsWithCache: typeof makeCoreRequests & {
getCachedValues(): CoreRequests[];
setCachedValue(key: any, value: CoreRequests): void;
clearCache(): void;
};
declare function makeCoreRequests({ fetch, logger: defaultLogger }?: {
fetch?: Fetch;
logger?: Logger;
}): CoreRequests;
export declare function makeEyesRequests({ core, test, req, upload, logger: mainLogger, }: {
core: CoreRequests;
test: VisualTest;
req: ReqEyes;
upload: Upload;
logger: Logger;
}): EyesRequests;
export declare function makeFunctionalSessionRequests({ core, test, req, logger: mainLogger, }: {
core: CoreRequests;
test: FunctionalTest;
req: ReqEyes;
logger: Logger;
}): FunctionalSessionRequests;
export {};
SocketSocket SOC 2 Logo

Product

  • Package Alerts
  • Integrations
  • Docs
  • Pricing
  • FAQ
  • Roadmap

Packages

Stay in touch

Get open source security insights delivered straight into your inbox.


  • Terms
  • Privacy
  • Security

Made with ⚡️ by Socket Inc