@prosopo/scripts 3.1.138 → 3.1.140

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.
@@ -1,134 +1,118 @@
1
- import fs from "node:fs";
1
+ import { getRootDir } from "../workspace/dist/projectInfo.js";
2
2
  import path from "node:path";
3
- import { parse, stringify } from "@iarna/toml";
4
3
  import { loadEnv } from "@prosopo/dotenv";
5
- import { parseLogLevel, getLogger } from "@prosopo/logger";
6
- import "../workspace/dist/index.js";
7
- import { getRootDir } from "../workspace/dist/projectInfo.js";
4
+ import { getLogger, parseLogLevel } from "@prosopo/logger";
5
+ import fs from "node:fs";
6
+ import { parse, stringify } from "@iarna/toml";
7
+ //#region src/scripts/setVersion.ts
8
8
  loadEnv();
9
- const logLevel = parseLogLevel(process.env.PROSOPO_LOG_LEVEL);
10
- const log = getLogger(logLevel, "setVersion");
9
+ var logLevel = parseLogLevel(process.env.PROSOPO_LOG_LEVEL);
10
+ var log = getLogger(logLevel, "setVersion");
11
11
  log.info(() => ({ data: { logLevel } }));
12
- const parseVersion = (version) => {
13
- try {
14
- const parts = version.split(".");
15
- if (parts.length !== 3) {
16
- throw new Error();
17
- }
18
- let [major, minor, patch] = parts;
19
- major = Number.parseInt(major ?? "").toString();
20
- minor = Number.parseInt(minor ?? "").toString();
21
- patch = Number.parseInt(patch ?? "").toString();
22
- if (major === "NaN" || minor === "NaN" || patch === "NaN") {
23
- throw new Error();
24
- }
25
- return `${major}.${minor}.${patch}`;
26
- } catch (e) {
27
- throw new Error("Version must be in the format of x.y.z");
28
- }
12
+ var parseVersion = (version) => {
13
+ try {
14
+ const parts = version.split(".");
15
+ if (parts.length !== 3) throw new Error();
16
+ let [major, minor, patch] = parts;
17
+ major = Number.parseInt(major ?? "").toString();
18
+ minor = Number.parseInt(minor ?? "").toString();
19
+ patch = Number.parseInt(patch ?? "").toString();
20
+ if (major === "NaN" || minor === "NaN" || patch === "NaN") throw new Error();
21
+ return `${major}.${minor}.${patch}`;
22
+ } catch (e) {
23
+ throw new Error("Version must be in the format of x.y.z");
24
+ }
29
25
  };
30
- const find = (pth, filter) => {
31
- const files = fs.readdirSync(pth);
32
- const results = [];
33
- for (const file of files) {
34
- const fullPath = path.join(pth, file);
35
- if (filter(fullPath)) {
36
- results.push(fullPath);
37
- }
38
- try {
39
- if (fs.statSync(fullPath).isDirectory()) {
40
- results.push(...find(fullPath, filter));
41
- }
42
- } catch (e) {
43
- log.debug(() => ({ data: { fullPath }, msg: "Not a directory" }));
44
- }
45
- }
46
- return results;
26
+ var find = (pth, filter) => {
27
+ const files = fs.readdirSync(pth);
28
+ const results = [];
29
+ for (const file of files) {
30
+ const fullPath = path.join(pth, file);
31
+ if (filter(fullPath)) results.push(fullPath);
32
+ try {
33
+ if (fs.statSync(fullPath).isDirectory()) results.push(...find(fullPath, filter));
34
+ } catch (e) {
35
+ log.debug(() => ({
36
+ data: { fullPath },
37
+ msg: "Not a directory"
38
+ }));
39
+ }
40
+ }
41
+ return results;
47
42
  };
48
43
  async function setVersion(versionIn, ignore) {
49
- log.info(() => ({ data: { versionIn }, msg: "Setting version to" }));
50
- const version = parseVersion(versionIn);
51
- const root = getRootDir();
52
- const ignorePaths = ["node_modules", "cargo-cache", ...ignore ?? []];
53
- log.debug(() => ({ data: { ignorePaths }, msg: "Ignoring paths" }));
54
- const files = find(root, (pth) => {
55
- if (ignorePaths.some((ignorePath) => pth.includes(ignorePath))) {
56
- return false;
57
- }
58
- const basename = path.basename(pth);
59
- return basename === "package.json" || basename === "Cargo.toml";
60
- });
61
- files.filter((pth) => path.extname(pth) === ".json").forEach((pth) => {
62
- log.debug(() => ({ data: { pth }, msg: "setting version in" }));
63
- const content = fs.readFileSync(pth, "utf8");
64
- const jsonContent = JSON.parse(content);
65
- if (jsonContent.version) {
66
- jsonContent.version = version;
67
- }
68
- for (const obj of [
69
- jsonContent.dependencies ?? {},
70
- jsonContent.devDependencies ?? {},
71
- jsonContent.peerDependencies ?? {}
72
- ]) {
73
- for (const key of Object.keys(obj)) {
74
- if (key.startsWith("@prosopo") && !key.includes("typechain")) {
75
- log.debug(() => ({
76
- data: { key, version, pth },
77
- msg: "setting dependency version"
78
- }));
79
- obj[key] = version;
80
- }
81
- }
82
- }
83
- fs.writeFileSync(pth, `${JSON.stringify(jsonContent, null, 4)}
84
- `);
85
- });
86
- files.filter((pth) => path.extname(pth) === ".toml").filter((pth) => {
87
- return !ignorePaths.some((ignorePath) => pth.includes(ignorePath));
88
- }).forEach((pth) => {
89
- log.debug(() => ({ data: { pth }, msg: "setting version in" }));
90
- const content = fs.readFileSync(pth, "utf8");
91
- const tomlContent = parse(content);
92
- if (tomlContent.workspace) {
93
- if (tomlContent.workspace.version) {
94
- tomlContent.workspace.version = version;
95
- }
96
- } else {
97
- tomlContent.package.version = version;
98
- }
99
- fs.writeFileSync(pth, `${stringify(tomlContent)}
100
- `);
101
- });
102
- files.filter((pth) => path.extname(pth) === ".toml").forEach((pth) => {
103
- log.debug(() => ({
104
- data: { pth },
105
- msg: "setting dependency versions in"
106
- }));
107
- const content = fs.readFileSync(pth, "utf8");
108
- const tomlContent = parse(content);
109
- if (tomlContent.workspace) {
110
- if (tomlContent.workspace.version) {
111
- tomlContent.workspace.version = version;
112
- }
113
- } else {
114
- for (const obj of [
115
- tomlContent.dependencies ?? {},
116
- tomlContent["dev-dependencies"] ?? {}
117
- ]) {
118
- for (const [key, value] of Object.entries(obj)) {
119
- if (value.path) {
120
- path.join(value.path, "Cargo.toml");
121
- const depContent = fs.readFileSync(pth, "utf8");
122
- const depTomlContent = parse(depContent);
123
- value.version = depTomlContent.version;
124
- }
125
- }
126
- }
127
- }
128
- fs.writeFileSync(pth, `${stringify(tomlContent)}
129
- `);
130
- });
44
+ log.info(() => ({
45
+ data: { versionIn },
46
+ msg: "Setting version to"
47
+ }));
48
+ const version = parseVersion(versionIn);
49
+ const root = getRootDir();
50
+ const ignorePaths = [
51
+ "node_modules",
52
+ "cargo-cache",
53
+ ...ignore ?? []
54
+ ];
55
+ log.debug(() => ({
56
+ data: { ignorePaths },
57
+ msg: "Ignoring paths"
58
+ }));
59
+ const files = find(root, (pth) => {
60
+ if (ignorePaths.some((ignorePath) => pth.includes(ignorePath))) return false;
61
+ const basename = path.basename(pth);
62
+ return basename === "package.json" || basename === "Cargo.toml";
63
+ });
64
+ files.filter((pth) => path.extname(pth) === ".json").forEach((pth) => {
65
+ log.debug(() => ({
66
+ data: { pth },
67
+ msg: "setting version in"
68
+ }));
69
+ const content = fs.readFileSync(pth, "utf8");
70
+ const jsonContent = JSON.parse(content);
71
+ if (jsonContent.version) jsonContent.version = version;
72
+ for (const obj of [
73
+ jsonContent.dependencies ?? {},
74
+ jsonContent.devDependencies ?? {},
75
+ jsonContent.peerDependencies ?? {}
76
+ ]) for (const key of Object.keys(obj)) if (key.startsWith("@prosopo") && !key.includes("typechain")) {
77
+ log.debug(() => ({
78
+ data: {
79
+ key,
80
+ version,
81
+ pth
82
+ },
83
+ msg: "setting dependency version"
84
+ }));
85
+ obj[key] = version;
86
+ }
87
+ fs.writeFileSync(pth, `${JSON.stringify(jsonContent, null, 4)}\n`);
88
+ });
89
+ files.filter((pth) => path.extname(pth) === ".toml").filter((pth) => {
90
+ return !ignorePaths.some((ignorePath) => pth.includes(ignorePath));
91
+ }).forEach((pth) => {
92
+ log.debug(() => ({
93
+ data: { pth },
94
+ msg: "setting version in"
95
+ }));
96
+ const tomlContent = parse(fs.readFileSync(pth, "utf8"));
97
+ if (tomlContent.workspace) {
98
+ if (tomlContent.workspace.version) tomlContent.workspace.version = version;
99
+ } else tomlContent.package.version = version;
100
+ fs.writeFileSync(pth, `${stringify(tomlContent)}\n`);
101
+ });
102
+ files.filter((pth) => path.extname(pth) === ".toml").forEach((pth) => {
103
+ log.debug(() => ({
104
+ data: { pth },
105
+ msg: "setting dependency versions in"
106
+ }));
107
+ const tomlContent = parse(fs.readFileSync(pth, "utf8"));
108
+ if (tomlContent.workspace) {
109
+ if (tomlContent.workspace.version) tomlContent.workspace.version = version;
110
+ } else for (const obj of [tomlContent.dependencies ?? {}, tomlContent["dev-dependencies"] ?? {}]) for (const [key, value] of Object.entries(obj)) if (value.path) {
111
+ path.join(value.path, "Cargo.toml");
112
+ value.version = parse(fs.readFileSync(pth, "utf8")).version;
113
+ }
114
+ fs.writeFileSync(pth, `${stringify(tomlContent)}\n`);
115
+ });
131
116
  }
132
- export {
133
- setVersion as default
134
- };
117
+ //#endregion
118
+ export { setVersion as default };
@@ -1,7 +1,3 @@
1
- import { setup, updateEnvFile } from "./setup.js";
2
1
  import { setupProvider } from "./provider.js";
3
- export {
4
- setup,
5
- setupProvider,
6
- updateEnvFile
7
- };
2
+ import { setup, updateEnvFile } from "./setup.js";
3
+ export { setup, setupProvider, updateEnvFile };
@@ -1,11 +1,11 @@
1
1
  import { datasetWithSolutionHashes } from "@prosopo/datasets";
2
2
  import { Tasks } from "@prosopo/provider";
3
+ //#region src/setup/provider.ts
3
4
  async function setupProvider(env) {
4
- const logger = env.logger;
5
- const tasks = new Tasks(env);
6
- logger.info(() => ({ msg: " - providerSetDataset" }));
7
- await tasks.datasetManager.providerSetDataset(datasetWithSolutionHashes);
5
+ const logger = env.logger;
6
+ const tasks = new Tasks(env);
7
+ logger.info(() => ({ msg: " - providerSetDataset" }));
8
+ await tasks.datasetManager.providerSetDataset(datasetWithSolutionHashes);
8
9
  }
9
- export {
10
- setupProvider
11
- };
10
+ //#endregion
11
+ export { setupProvider };
@@ -1,139 +1,117 @@
1
+ import { updateDemoHTMLFiles, updateEnvFiles } from "../util/updateEnv.js";
2
+ import "../util/index.js";
3
+ import { setupProvider } from "./provider.js";
4
+ import { registerSiteKey } from "./site.js";
1
5
  import path from "node:path";
2
- import { getSecret, defaultConfig } from "@prosopo/cli";
6
+ import { defaultConfig, getSecret } from "@prosopo/cli";
3
7
  import { ProsopoEnvError } from "@prosopo/common";
4
8
  import { getEnvFile } from "@prosopo/dotenv";
5
9
  import { ProviderEnvironment } from "@prosopo/env";
6
- import { getPair, generateMnemonic, getDefaultSiteKeys } from "@prosopo/keyring";
7
- import { getLogger, LogLevel } from "@prosopo/logger";
10
+ import { generateMnemonic, getDefaultSiteKeys, getPair } from "@prosopo/keyring";
11
+ import { LogLevel, getLogger } from "@prosopo/logger";
8
12
  import { get } from "@prosopo/util";
9
13
  import fse from "fs-extra";
10
- import "../util/index.js";
11
- import { setupProvider } from "./provider.js";
12
- import { registerSiteKey } from "./site.js";
13
- import { updateDemoHTMLFiles, updateEnvFiles } from "../util/updateEnv.js";
14
- const logger = getLogger(LogLevel.enum.info, "setup");
15
- const __dirname = path.resolve();
14
+ //#region src/setup/setup.ts
15
+ var logger = getLogger(LogLevel.enum.info, "setup");
16
+ var __dirname = path.resolve();
16
17
  function getRootDir() {
17
- const rootDir = process.env.PROSOPO_ROOT_DIR || path.resolve(__dirname, "../..");
18
- logger.info(() => ({ msg: "Root dir:", data: { rootDir } }));
19
- return rootDir;
18
+ const rootDir = process.env.PROSOPO_ROOT_DIR || path.resolve(__dirname, "../..");
19
+ logger.info(() => ({
20
+ msg: "Root dir:",
21
+ data: { rootDir }
22
+ }));
23
+ return rootDir;
20
24
  }
21
25
  function getDatasetFilePath() {
22
- const datasetFile = process.env.PROSOPO_PROVIDER_DATASET_FILE || path.resolve("../data/captchas.json");
23
- logger.info(() => ({ msg: "Dataset file:", data: { datasetFile } }));
24
- return datasetFile;
26
+ const datasetFile = process.env.PROSOPO_PROVIDER_DATASET_FILE || path.resolve("../data/captchas.json");
27
+ logger.info(() => ({
28
+ msg: "Dataset file:",
29
+ data: { datasetFile }
30
+ }));
31
+ return datasetFile;
25
32
  }
26
33
  function getDefaultProvider() {
27
- const host = process.env.PROSOPO_PROVIDER_HOST || "localhost";
28
- return {
29
- url: process.env.PROSOPO_API_PORT ? `https://${host}:${process.env.PROSOPO_API_PORT}` : `https://${host}:9229`,
30
- datasetFile: getDatasetFilePath(),
31
- address: process.env.PROSOPO_PROVIDER_ADDRESS || "",
32
- secret: getSecret(),
33
- captchaDatasetId: "",
34
- pair: getPair(getSecret())
35
- };
34
+ const host = process.env.PROSOPO_PROVIDER_HOST || "localhost";
35
+ return {
36
+ url: process.env.PROSOPO_API_PORT ? `https://${host}:${process.env.PROSOPO_API_PORT}` : `https://${host}:9229`,
37
+ datasetFile: getDatasetFilePath(),
38
+ address: process.env.PROSOPO_PROVIDER_ADDRESS || "",
39
+ secret: getSecret(),
40
+ captchaDatasetId: "",
41
+ pair: getPair(getSecret())
42
+ };
36
43
  }
37
44
  async function copyEnvFile() {
38
- try {
39
- const rootDir = getRootDir();
40
- const tplLocation = path.resolve(rootDir, "./dev/scripts");
41
- const tplEnvFile = getEnvFile(tplLocation, "env");
42
- const envFile = getEnvFile(tplLocation, ".env");
43
- await fse.copy(tplEnvFile, envFile, { overwrite: false });
44
- } catch (err) {
45
- logger.debug(() => ({ msg: "Error copying env file", err }));
46
- }
45
+ try {
46
+ const rootDir = getRootDir();
47
+ const tplLocation = path.resolve(rootDir, "./dev/scripts");
48
+ const tplEnvFile = getEnvFile(tplLocation, "env");
49
+ const envFile = getEnvFile(tplLocation, ".env");
50
+ await fse.copy(tplEnvFile, envFile, { overwrite: false });
51
+ } catch (err) {
52
+ logger.debug(() => ({
53
+ msg: "Error copying env file",
54
+ err
55
+ }));
56
+ }
47
57
  }
48
58
  function updateEnvFileVar(source, name, value) {
49
- const envVar = new RegExp(`.*(${name}=)(.*)`, "g");
50
- if (envVar.test(source)) {
51
- return source.replace(envVar, `$1${value}`);
52
- }
53
- return `${source}
54
- ${name}=${value}`;
59
+ const envVar = new RegExp(`.*(${name}=)(.*)`, "g");
60
+ if (envVar.test(source)) return source.replace(envVar, `$1${value}`);
61
+ return `${source}\n${name}=${value}`;
55
62
  }
56
63
  async function updateEnvFile(vars) {
57
- const rootDir = getRootDir();
58
- const envFile = getEnvFile(rootDir, ".env");
59
- let readEnvFile = await fse.readFile(envFile, "utf8");
60
- for (const key in vars) {
61
- readEnvFile = updateEnvFileVar(readEnvFile, key, get(vars, key));
62
- }
63
- logger.info(() => ({ msg: `Updating ${envFile}` }));
64
- await fse.writeFile(envFile, readEnvFile);
64
+ const envFile = getEnvFile(getRootDir(), ".env");
65
+ let readEnvFile = await fse.readFile(envFile, "utf8");
66
+ for (const key in vars) readEnvFile = updateEnvFileVar(readEnvFile, key, get(vars, key));
67
+ logger.info(() => ({ msg: `Updating ${envFile}` }));
68
+ await fse.writeFile(envFile, readEnvFile);
65
69
  }
66
70
  async function setup(provider, sites) {
67
- if (!provider && !sites) {
68
- logger.info(() => ({ msg: "No setup required, exiting." }));
69
- process.exit(0);
70
- }
71
- const defaultProvider = getDefaultProvider();
72
- if (defaultProvider.secret) {
73
- const hasProviderAccount = defaultProvider.address && defaultProvider.secret;
74
- logger.debug(() => ({
75
- msg: "ENVIRONMENT",
76
- data: { nodeEnv: process.env.NODE_ENV }
77
- }));
78
- const [mnemonic, address] = !hasProviderAccount ? await generateMnemonic() : [defaultProvider.secret, defaultProvider.address];
79
- logger.debug(() => ({ msg: `Address: ${address}` }));
80
- logger.debug(() => ({ msg: `Mnemonic: ${mnemonic}` }));
81
- logger.debug(() => ({ msg: "Writing .env file..." }));
82
- await copyEnvFile();
83
- if (!process.env.PROSOPO_SITE_KEY) {
84
- throw new ProsopoEnvError("DEVELOPER.PROSOPO_SITE_KEY_MISSING");
85
- }
86
- const config = defaultConfig();
87
- const providerSecret = config.account.secret;
88
- const pair = getPair(providerSecret);
89
- const authAccount = getPair(config.authAccount.secret);
90
- const env = new ProviderEnvironment(config, pair, authAccount);
91
- await env.isReady();
92
- defaultProvider.secret = mnemonic;
93
- env.logger.info(() => ({
94
- msg: `Registering provider... ${defaultProvider.address}`
95
- }));
96
- defaultProvider.pair = getPair(providerSecret);
97
- if (provider) {
98
- await setupProvider(env);
99
- if (!hasProviderAccount) {
100
- await updateEnvFile({
101
- PROVIDER_MNEMONIC: `"${mnemonic}"`,
102
- PROVIDER_ADDRESS: address
103
- });
104
- }
105
- }
106
- if (sites) {
107
- for (const siteKey of getDefaultSiteKeys()) {
108
- siteKey.pair = getPair(siteKey.secret);
109
- env.logger.info(() => ({
110
- msg: `Registering ${siteKey.secret} siteKey ... ${siteKey.pair?.address}`
111
- }));
112
- await registerSiteKey(env, siteKey.pair.address, siteKey.settings);
113
- env.logger.debug(() => ({
114
- msg: "Updating env files with PROSOPO_SITE_KEY"
115
- }));
116
- await updateDemoHTMLFiles(
117
- [/data-sitekey="(\w{48})"/, /siteKey:\s*'(\w{48})'/],
118
- siteKey.pair.address,
119
- env.logger
120
- );
121
- const envVarNames = siteKey.settings.captchaType === "image" ? [
122
- "PROSOPO_SITE_KEY",
123
- `PROSOPO_SITE_KEY_${siteKey.settings.captchaType.toUpperCase()}`
124
- ] : [
125
- `PROSOPO_SITE_KEY_${siteKey.settings.captchaType.toUpperCase()}`
126
- ];
127
- await updateEnvFiles(envVarNames, siteKey.pair.address, env.logger);
128
- }
129
- }
130
- process.exit();
131
- } else {
132
- console.error("no secret found in .env file");
133
- throw new ProsopoEnvError("GENERAL.NO_MNEMONIC_OR_SEED");
134
- }
71
+ if (!provider && !sites) {
72
+ logger.info(() => ({ msg: "No setup required, exiting." }));
73
+ process.exit(0);
74
+ }
75
+ const defaultProvider = getDefaultProvider();
76
+ if (defaultProvider.secret) {
77
+ const hasProviderAccount = defaultProvider.address && defaultProvider.secret;
78
+ logger.debug(() => ({
79
+ msg: "ENVIRONMENT",
80
+ data: { nodeEnv: process.env.NODE_ENV }
81
+ }));
82
+ const [mnemonic, address] = !hasProviderAccount ? await generateMnemonic() : [defaultProvider.secret, defaultProvider.address];
83
+ logger.debug(() => ({ msg: `Address: ${address}` }));
84
+ logger.debug(() => ({ msg: `Mnemonic: ${mnemonic}` }));
85
+ logger.debug(() => ({ msg: "Writing .env file..." }));
86
+ await copyEnvFile();
87
+ if (!process.env.PROSOPO_SITE_KEY) throw new ProsopoEnvError("DEVELOPER.PROSOPO_SITE_KEY_MISSING");
88
+ const config = defaultConfig();
89
+ const providerSecret = config.account.secret;
90
+ const env = new ProviderEnvironment(config, getPair(providerSecret), getPair(config.authAccount.secret));
91
+ await env.isReady();
92
+ defaultProvider.secret = mnemonic;
93
+ env.logger.info(() => ({ msg: `Registering provider... ${defaultProvider.address}` }));
94
+ defaultProvider.pair = getPair(providerSecret);
95
+ if (provider) {
96
+ await setupProvider(env);
97
+ if (!hasProviderAccount) await updateEnvFile({
98
+ PROVIDER_MNEMONIC: `"${mnemonic}"`,
99
+ PROVIDER_ADDRESS: address
100
+ });
101
+ }
102
+ if (sites) for (const siteKey of getDefaultSiteKeys()) {
103
+ siteKey.pair = getPair(siteKey.secret);
104
+ env.logger.info(() => ({ msg: `Registering ${siteKey.secret} siteKey ... ${siteKey.pair?.address}` }));
105
+ await registerSiteKey(env, siteKey.pair.address, siteKey.settings);
106
+ env.logger.debug(() => ({ msg: "Updating env files with PROSOPO_SITE_KEY" }));
107
+ await updateDemoHTMLFiles([/data-sitekey="(\w{48})"/, /siteKey:\s*'(\w{48})'/], siteKey.pair.address, env.logger);
108
+ await updateEnvFiles(siteKey.settings.captchaType === "image" ? ["PROSOPO_SITE_KEY", `PROSOPO_SITE_KEY_${siteKey.settings.captchaType.toUpperCase()}`] : [`PROSOPO_SITE_KEY_${siteKey.settings.captchaType.toUpperCase()}`], siteKey.pair.address, env.logger);
109
+ }
110
+ process.exit();
111
+ } else {
112
+ console.error("no secret found in .env file");
113
+ throw new ProsopoEnvError("GENERAL.NO_MNEMONIC_OR_SEED");
114
+ }
135
115
  }
136
- export {
137
- setup,
138
- updateEnvFile
139
- };
116
+ //#endregion
117
+ export { setup, updateEnvFile };
@@ -1,25 +1,24 @@
1
1
  import { Tasks } from "@prosopo/provider";
2
- import { Tier, ClientSettingsSchema, CaptchaType } from "@prosopo/types";
2
+ import { CaptchaType, ClientSettingsSchema, Tier } from "@prosopo/types";
3
+ //#region src/setup/site.ts
3
4
  async function registerSiteKey(env, siteKey, settings = {}) {
4
- const logger = env.logger;
5
- const tasks = new Tasks(env);
6
- logger.info(() => ({
7
- msg: "registerSiteKey",
8
- data: { siteKey, captchaType: settings.captchaType }
9
- }));
10
- await tasks.clientTaskManager.registerSiteKey(
11
- siteKey,
12
- Tier.Professional,
13
- ClientSettingsSchema.parse({
14
- captchaType: CaptchaType.frictionless,
15
- frictionlessThreshold: 0.8,
16
- powDifficulty: 4,
17
- imageThreshold: 0.8,
18
- ...settings,
19
- domains: settings.domains && settings.domains.length > 0 ? settings.domains : ["localhost", "0.0.0.0"]
20
- })
21
- );
5
+ const logger = env.logger;
6
+ const tasks = new Tasks(env);
7
+ logger.info(() => ({
8
+ msg: "registerSiteKey",
9
+ data: {
10
+ siteKey,
11
+ captchaType: settings.captchaType
12
+ }
13
+ }));
14
+ await tasks.clientTaskManager.registerSiteKey(siteKey, Tier.Professional, ClientSettingsSchema.parse({
15
+ captchaType: CaptchaType.frictionless,
16
+ frictionlessThreshold: .8,
17
+ powDifficulty: 4,
18
+ imageThreshold: .8,
19
+ ...settings,
20
+ domains: settings.domains && settings.domains.length > 0 ? settings.domains : ["localhost", "0.0.0.0"]
21
+ }));
22
22
  }
23
- export {
24
- registerSiteKey
25
- };
23
+ //#endregion
24
+ export { registerSiteKey };
package/dist/util/exec.js CHANGED
@@ -1,46 +1,37 @@
1
1
  import { spawn } from "node:child_process";
2
2
  import { stdin } from "node:process";
3
- const exec = (command, options) => {
4
- let { pipe, printCmd } = options || {};
5
- pipe = pipe === void 0 || pipe;
6
- printCmd = printCmd === void 0 || printCmd;
7
- if (printCmd) {
8
- console.log(`[exec] ${command}`);
9
- }
10
- const prc = spawn(command, {
11
- shell: true
12
- });
13
- if (pipe || pipe === void 0) {
14
- prc.stdout.pipe(process.stdout);
15
- prc.stderr.pipe(process.stderr);
16
- }
17
- stdin.pipe(prc.stdin);
18
- const stdoutData = [];
19
- const stderrData = [];
20
- prc.stdout.on("data", (data) => {
21
- stdoutData.push(data.toString());
22
- });
23
- prc.stderr.on("data", (data) => {
24
- stderrData.push(data.toString());
25
- });
26
- return new Promise((resolve, reject) => {
27
- prc.on("close", (code) => {
28
- if (pipe || pipe === void 0) {
29
- console.log("");
30
- }
31
- const output = {
32
- stdout: stdoutData.join(""),
33
- stderr: stderrData.join(""),
34
- code
35
- };
36
- if (code === 0) {
37
- resolve(output);
38
- } else {
39
- reject(output);
40
- }
41
- });
42
- });
43
- };
44
- export {
45
- exec
3
+ //#region src/util/exec.ts
4
+ var exec = (command, options) => {
5
+ let { pipe, printCmd } = options || {};
6
+ pipe = pipe === void 0 || pipe;
7
+ printCmd = printCmd === void 0 || printCmd;
8
+ if (printCmd) console.log(`[exec] ${command}`);
9
+ const prc = spawn(command, { shell: true });
10
+ if (pipe || pipe === void 0) {
11
+ prc.stdout.pipe(process.stdout);
12
+ prc.stderr.pipe(process.stderr);
13
+ }
14
+ stdin.pipe(prc.stdin);
15
+ const stdoutData = [];
16
+ const stderrData = [];
17
+ prc.stdout.on("data", (data) => {
18
+ stdoutData.push(data.toString());
19
+ });
20
+ prc.stderr.on("data", (data) => {
21
+ stderrData.push(data.toString());
22
+ });
23
+ return new Promise((resolve, reject) => {
24
+ prc.on("close", (code) => {
25
+ if (pipe || pipe === void 0) console.log("");
26
+ const output = {
27
+ stdout: stdoutData.join(""),
28
+ stderr: stderrData.join(""),
29
+ code
30
+ };
31
+ if (code === 0) resolve(output);
32
+ else reject(output);
33
+ });
34
+ });
46
35
  };
36
+ //#endregion
37
+ export { exec };