moonwall 1.0.1-dev.0 → 1.0.1
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/cli/cmds/components/LogViewer.d.ts.map +1 -1
- package/dist/cli/cmds/components/LogViewer.js +6 -2
- package/dist/cli/cmds/components/LogViewer.js.map +1 -1
- package/dist/cli/internal/commandParsers.d.ts.map +1 -1
- package/dist/cli/internal/commandParsers.js +4 -1
- package/dist/cli/internal/commandParsers.js.map +1 -1
- package/dist/cli/internal/deriveTestIds.d.ts.map +1 -1
- package/dist/cli/internal/deriveTestIds.js +7 -2
- package/dist/cli/internal/deriveTestIds.js.map +1 -1
- package/dist/cli/internal/testIdParser.d.ts.map +1 -1
- package/dist/cli/internal/testIdParser.js +4 -1
- package/dist/cli/internal/testIdParser.js.map +1 -1
- package/dist/internal/common.d.ts.map +1 -1
- package/dist/internal/common.js +4 -1
- package/dist/internal/common.js.map +1 -1
- package/dist/internal/logger.d.ts.map +1 -1
- package/dist/internal/logger.js +4 -1
- package/dist/internal/logger.js.map +1 -1
- package/dist/services/cache/StartupCacheService.d.ts.map +1 -1
- package/dist/services/cache/StartupCacheService.js +4 -1
- package/dist/services/cache/StartupCacheService.js.map +1 -1
- package/dist/services/chopsticks/chopsticksConfigParser.d.ts.map +1 -1
- package/dist/services/chopsticks/chopsticksConfigParser.js +4 -1
- package/dist/services/chopsticks/chopsticksConfigParser.js.map +1 -1
- package/dist/services/chopsticks/launchChopsticksEffect.d.ts.map +1 -1
- package/dist/services/chopsticks/launchChopsticksEffect.js +5 -2
- package/dist/services/chopsticks/launchChopsticksEffect.js.map +1 -1
- package/dist/services/config/configAccessors.d.ts.map +1 -1
- package/dist/services/config/configAccessors.js +4 -1
- package/dist/services/config/configAccessors.js.map +1 -1
- package/dist/services/network/PortDiscoveryService.d.ts.map +1 -1
- package/dist/services/network/PortDiscoveryService.js +4 -2
- package/dist/services/network/PortDiscoveryService.js.map +1 -1
- package/dist/services/network/RpcPortDiscoveryService.d.ts.map +1 -1
- package/dist/services/network/RpcPortDiscoveryService.js +4 -2
- package/dist/services/network/RpcPortDiscoveryService.js.map +1 -1
- package/dist/services/process/ProcessManagerService.d.ts.map +1 -1
- package/dist/services/process/ProcessManagerService.js +4 -1
- package/dist/services/process/ProcessManagerService.js.map +1 -1
- package/package.json +6 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LogViewer.d.ts","sourceRoot":"","sources":["../../../../src/cli/cmds/components/LogViewer.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA2C,MAAM,OAAO,CAAC;AAGhE,OAAO,KAAK,EAAE,WAAW,EAAE,oCAAoC;
|
|
1
|
+
{"version":3,"file":"LogViewer.d.ts","sourceRoot":"","sources":["../../../../src/cli/cmds/components/LogViewer.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA2C,MAAM,OAAO,CAAC;AAGhE,OAAO,KAAK,EAAE,WAAW,EAAE,oCAAoC;AAQ/D,UAAU,cAAc;IACtB,GAAG,EAAE,WAAW,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,IAAI,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,IAAI,CAAC;IACvB,SAAS,CAAC,EAAE,MAAM,IAAI,CAAC;IACvB,UAAU,CAAC,EAAE;QACX,WAAW,EAAE,MAAM,CAAC;QACpB,QAAQ,EAAE,MAAM,CAAC;QACjB,KAAK,EAAE,MAAM,CAAC;KACf,CAAC;CACH;AAOD,eAAO,MAAM,SAAS,EAAE,KAAK,CAAC,EAAE,CAAC,cAAc,CAwR9C,CAAC"}
|
|
@@ -3,6 +3,10 @@ import { useState, useEffect, useCallback } from "react";
|
|
|
3
3
|
import { Box, Text, useInput, useApp } from "ink";
|
|
4
4
|
import fs from "node:fs";
|
|
5
5
|
import { executeTests } from "../runTests.js";
|
|
6
|
+
/** Matches log lines containing error indicators */
|
|
7
|
+
const errorRegex = /error|panic|fail/i;
|
|
8
|
+
/** Matches log lines containing warning indicators */
|
|
9
|
+
const warnRegex = /warn/i;
|
|
6
10
|
export const LogViewer = ({ env, logFilePath, onExit, onNextLog, onPrevLog, zombieInfo, }) => {
|
|
7
11
|
const [lines, setLines] = useState([]);
|
|
8
12
|
const [paused, setPaused] = useState(false);
|
|
@@ -158,9 +162,9 @@ export const LogViewer = ({ env, logFilePath, onExit, onNextLog, onPrevLog, zomb
|
|
|
158
162
|
const shortPath = logFilePath.split("/").slice(-2).join("/");
|
|
159
163
|
const visibleTestOutput = testOutput.slice(-testOutputLines);
|
|
160
164
|
const getLineColor = (line) => {
|
|
161
|
-
if (
|
|
165
|
+
if (errorRegex.test(line))
|
|
162
166
|
return "red";
|
|
163
|
-
if (
|
|
167
|
+
if (warnRegex.test(line))
|
|
164
168
|
return "yellow";
|
|
165
169
|
return "white";
|
|
166
170
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LogViewer.js","sourceRoot":"","sources":["../../../../src/cli/cmds/components/LogViewer.tsx"],"names":[],"mappings":";AAAA,OAAc,EAAE,QAAQ,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,OAAO,CAAC;AAChE,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,KAAK,CAAC;AAClD,OAAO,EAAE,MAAM,SAAS,CAAC;AAEzB,OAAO,EAAE,YAAY,EAAE,uBAAuB;
|
|
1
|
+
{"version":3,"file":"LogViewer.js","sourceRoot":"","sources":["../../../../src/cli/cmds/components/LogViewer.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commandParsers.d.ts","sourceRoot":"","sources":["../../../src/cli/internal/commandParsers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,oBAAoB,EACpB,aAAa,EACb,QAAQ,EACR,gBAAgB,EAChB,eAAe,EAEhB,iCAAiC;
|
|
1
|
+
{"version":3,"file":"commandParsers.d.ts","sourceRoot":"","sources":["../../../src/cli/internal/commandParsers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,oBAAoB,EACpB,aAAa,EACb,QAAQ,EACR,gBAAgB,EAChB,eAAe,EAEhB,iCAAiC;AAgBlC,wBAAgB,cAAc,CAAC,UAAU,EAAE,gBAAgB;;EAO1D;AAqBD,qBAAa,mBAAmB;IAC9B,OAAO,CAAC,IAAI,CAAW;IACvB,OAAO,CAAC,GAAG,CAAS;IACpB,OAAO,CAAC,MAAM,CAAU;IACxB,OAAO,CAAC,UAAU,CAAgB;IAClC,OAAO,CAAC,eAAe,CAAC,CAAkB;gBAE9B,OAAO,EAAE;QACnB,UAAU,EAAE,aAAa,CAAC;QAC1B,eAAe,CAAC,EAAE,QAAQ,EAAE,CAAC;QAC7B,eAAe,CAAC,EAAE,eAAe,CAAC;KACnC;IAWD,OAAO,CAAC,WAAW;IAWb,SAAS;IA8Bf,qBAAqB,IAAI,mBAAmB;IAQ5C,mBAAmB,IAAI,mBAAmB;IAO1C,OAAO,CAAC,KAAK;IAMb,OAAO,CAAC,gBAAgB;IAgBxB;;;;;;;;;OASG;IACG,gBAAgB,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAmFtD,KAAK,IAAI;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,EAAE,CAAC;QAAC,MAAM,EAAE,OAAO,CAAA;KAAE;WAQ5C,MAAM,CAAC,OAAO,EAAE;QAC3B,UAAU,EAAE,aAAa,CAAC;QAC1B,eAAe,CAAC,EAAE,QAAQ,EAAE,CAAC;QAC7B,eAAe,CAAC,EAAE,eAAe,CAAC;QAClC,OAAO,CAAC,EAAE,OAAO,CAAC;KACnB;aAbe,MAAM;cAAQ,MAAM,EAAE;gBAAU,OAAO;;CA0BxD;AAED,wBAAgB,qBAAqB,CAAC,WAAW,EAAE,oBAAoB,EAAE,GAAG;IAC1E,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,MAAM,EAAE,OAAO,CAAC;CACjB,CAoDA;AA8BD;;;GAGG;AACH,eAAO,MAAM,WAAW,QAAa,OAAO,CAAC,MAAM,CA2BlD,CAAC"}
|
|
@@ -2,10 +2,13 @@ import { createLogger } from "../../util/index.js";
|
|
|
2
2
|
import path from "node:path";
|
|
3
3
|
import net from "node:net";
|
|
4
4
|
import { Effect } from "effect";
|
|
5
|
+
import { regex } from "arkregex";
|
|
5
6
|
import { standardRepos } from "../lib/repoDefinitions/index.js";
|
|
6
7
|
import { shardManager } from "../lib/shardManager.js";
|
|
7
8
|
import invariant from "tiny-invariant";
|
|
8
9
|
import { StartupCacheService, StartupCacheServiceLive } from "./effect/index.js";
|
|
10
|
+
/** Matches --chain=<name> or --chain <name> in CLI arguments */
|
|
11
|
+
const chainArgRegex = regex("--chain[=\\s]?(\\S+)");
|
|
9
12
|
const logger = createLogger({ name: "commandParsers" });
|
|
10
13
|
export function parseZombieCmd(launchSpec) {
|
|
11
14
|
if (launchSpec) {
|
|
@@ -140,7 +143,7 @@ export class LaunchCommandParser {
|
|
|
140
143
|
// Check if using --dev flag
|
|
141
144
|
const hasDevFlag = this.args.includes("--dev");
|
|
142
145
|
// Extract chain name from --chain=XXX or --chain XXX
|
|
143
|
-
const existingChainName = chainArg?.match(
|
|
146
|
+
const existingChainName = chainArg?.match(chainArgRegex)?.[1];
|
|
144
147
|
// We can generate raw chain spec for both --dev mode and explicit --chain=XXX
|
|
145
148
|
const canGenerateRawSpec = hasDevFlag || !!existingChainName;
|
|
146
149
|
const cacheDir = this.launchSpec.startupCacheDir || path.join(process.cwd(), "tmp", "startup-cache");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commandParsers.js","sourceRoot":"","sources":["../../../src/cli/internal/commandParsers.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"commandParsers.js","sourceRoot":"","sources":["../../../src/cli/internal/commandParsers.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deriveTestIds.d.ts","sourceRoot":"","sources":["../../../src/cli/internal/deriveTestIds.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"deriveTestIds.d.ts","sourceRoot":"","sources":["../../../src/cli/internal/deriveTestIds.ts"],"names":[],"mappings":"AAYA,UAAU,oBAAoB;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,wBAAsB,aAAa,CAAC,MAAM,EAAE,oBAAoB,iBAiD/D"}
|
|
@@ -2,7 +2,12 @@ import chalk from "chalk";
|
|
|
2
2
|
import fs from "node:fs";
|
|
3
3
|
import { confirm } from "@inquirer/prompts";
|
|
4
4
|
import path from "node:path";
|
|
5
|
+
import { regex } from "arkregex";
|
|
5
6
|
import { hasSuiteDefinition, replaceSuiteId } from "./testIdParser.js";
|
|
7
|
+
/** Matches hyphens, underscores, and spaces for sanitization */
|
|
8
|
+
const sanitizeCharsRegex = regex("[-_ ]", "g");
|
|
9
|
+
/** Matches special characters in filenames for sort ordering */
|
|
10
|
+
const specialCharsRegex = regex("[ \\t!@#$%^&*()_+\\-=\\[\\]{};':\"\\\\|,.<>/?]+");
|
|
6
11
|
export async function deriveTestIds(params) {
|
|
7
12
|
const usedPrefixes = new Set();
|
|
8
13
|
const { rootDir, singlePrefix } = params;
|
|
@@ -48,7 +53,7 @@ function getTopLevelDirs(rootDir) {
|
|
|
48
53
|
.filter((dir) => fs.statSync(path.join(rootDir, dir)).isDirectory());
|
|
49
54
|
}
|
|
50
55
|
function generatePrefix(directory, usedPrefixes, rootPrefix) {
|
|
51
|
-
const sanitizedDir = directory.replace(
|
|
56
|
+
const sanitizedDir = directory.replace(sanitizeCharsRegex, "").toUpperCase();
|
|
52
57
|
let prefix = rootPrefix ?? sanitizedDir[0];
|
|
53
58
|
let additionalIndex = 1;
|
|
54
59
|
while (usedPrefixes.has(prefix) && additionalIndex < sanitizedDir.length) {
|
|
@@ -110,7 +115,7 @@ function generateId(directory, rootDir, prefix) {
|
|
|
110
115
|
}
|
|
111
116
|
}
|
|
112
117
|
function hasSpecialCharacters(filename) {
|
|
113
|
-
return
|
|
118
|
+
return specialCharsRegex.test(filename);
|
|
114
119
|
}
|
|
115
120
|
function customFileSort(a, b) {
|
|
116
121
|
const aHasSpecialChars = hasSpecialCharacters(a);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deriveTestIds.js","sourceRoot":"","sources":["../../../src/cli/internal/deriveTestIds.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,kBAAkB,EAAE,cAAc,EAAE,0BAA0B;
|
|
1
|
+
{"version":3,"file":"deriveTestIds.js","sourceRoot":"","sources":["../../../src/cli/internal/deriveTestIds.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"testIdParser.d.ts","sourceRoot":"","sources":["../../../src/cli/internal/testIdParser.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"testIdParser.d.ts","sourceRoot":"","sources":["../../../src/cli/internal/testIdParser.ts"],"names":[],"mappings":"AAMA,MAAM,WAAW,OAAO;IACtB,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB;AAoCD;;;GAGG;AACH,wBAAgB,cAAc,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CA8B3D;AAED;;;GAGG;AACH,wBAAgB,cAAc,CAAC,WAAW,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CA6BrF;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAI/D;AAED,MAAM,WAAW,eAAe;IAC9B,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB;AAED;;;;;;;;GAQG;AACH,wBAAsB,4BAA4B,CAChD,QAAQ,EAAE,MAAM,EAAE,EAClB,YAAY,EAAE,MAAM,EAAE,EACtB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,MAAM,EAAE,CAAC,CAmEnB"}
|
|
@@ -1,4 +1,7 @@
|
|
|
1
1
|
import { Lang, parse, findInFiles } from "@ast-grep/napi";
|
|
2
|
+
import { regex } from "arkregex";
|
|
3
|
+
/** Matches leading/trailing quotes (single, double, backtick) */
|
|
4
|
+
const quotesRegex = regex("^['\"`]|['\"`]$", "g");
|
|
2
5
|
/**
|
|
3
6
|
* Extracts the "id" property value from an object literal AST node.
|
|
4
7
|
* Traverses children to find a "pair" node where the key is "id".
|
|
@@ -10,7 +13,7 @@ function extractIdFromObject(objNode) {
|
|
|
10
13
|
const value = child.field("value");
|
|
11
14
|
if (key?.text() === "id" && value) {
|
|
12
15
|
// Remove quotes from the string literal
|
|
13
|
-
return value.text().replace(
|
|
16
|
+
return value.text().replace(quotesRegex, "");
|
|
14
17
|
}
|
|
15
18
|
}
|
|
16
19
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"testIdParser.js","sourceRoot":"","sources":["../../../src/cli/internal/testIdParser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,IAAI,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"testIdParser.js","sourceRoot":"","sources":["../../../src/cli/internal/testIdParser.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../src/internal/common.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../src/internal/common.ts"],"names":[],"mappings":"AAKA,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAEvD;AAED,wBAAsB,gBAAgB,CACpC,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EACd,MAAM,GAAE,GAAG,EAAO,EAClB,SAAS,GAAE,MAAc,GACxB,OAAO,CAAC,GAAG,CAAC,CA6Cd"}
|
package/dist/internal/common.js
CHANGED
|
@@ -1,5 +1,8 @@
|
|
|
1
|
+
import { regex } from "arkregex";
|
|
2
|
+
/** Matches ws:// or wss:// protocol prefix */
|
|
3
|
+
const wsProtocolRegex = regex("^ws(s)?:");
|
|
1
4
|
export function normalizeUrlToHttps(url) {
|
|
2
|
-
return url.replace(
|
|
5
|
+
return url.replace(wsProtocolRegex, "http$1:");
|
|
3
6
|
}
|
|
4
7
|
export async function directRpcRequest(endpoint, method, params = [], timeoutMs = 10000 // Default 10 second timeout
|
|
5
8
|
) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../src/internal/common.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,mBAAmB,CAAC,GAAW;IAC7C,OAAO,GAAG,CAAC,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../src/internal/common.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AAEjC,8CAA8C;AAC9C,MAAM,eAAe,GAAG,KAAK,CAAC,UAAU,CAAC,CAAC;AAE1C,MAAM,UAAU,mBAAmB,CAAC,GAAW;IAC7C,OAAO,GAAG,CAAC,OAAO,CAAC,eAAe,EAAE,SAAS,CAAC,CAAC;AACjD,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,QAAgB,EAChB,MAAc,EACd,SAAgB,EAAE,EAClB,YAAoB,KAAK,CAAC,4BAA4B;;IAEtD,MAAM,IAAI,GAAG;QACX,OAAO,EAAE,KAAK;QACd,EAAE,EAAE,CAAC;QACL,MAAM;QACN,MAAM;KACP,CAAC;IAEF,IAAI,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;QAC9B,OAAO,CAAC,GAAG,CAAC,uDAAuD,CAAC,CAAC;IACvE,CAAC;IAED,wCAAwC;IACxC,MAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAC;IACzC,MAAM,SAAS,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,KAAK,EAAE,EAAE,SAAS,CAAC,CAAC;IAElE,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,QAAQ,EAAE;YACrC,MAAM,EAAE,MAAM;YACd,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;YAC1B,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;YAC/C,MAAM,EAAE,UAAU,CAAC,MAAM;SAC1B,CAAC,CAAC;QAEH,YAAY,CAAC,SAAS,CAAC,CAAC;QAExB,MAAM,YAAY,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAoB,CAAC;QAEhE,IAAI,YAAY,CAAC,KAAK,EAAE,CAAC;YACvB,MAAM,IAAI,KAAK,CAAC,YAAY,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAC9C,CAAC;QAED,OAAO,YAAY,CAAC,MAAM,CAAC;IAC7B,CAAC;IAAC,OAAO,KAAU,EAAE,CAAC;QACpB,YAAY,CAAC,SAAS,CAAC,CAAC;QACxB,IAAI,KAAK,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;YAChC,MAAM,IAAI,KAAK,CACb,kBAAkB,QAAQ,oBAAoB,SAAS,eAAe,MAAM,GAAG,EAC/E,EAAE,KAAK,EAAE,KAAK,EAAE,CACjB,CAAC;QACJ,CAAC;QACD,MAAM,IAAI,KAAK,CAAC,kBAAkB,QAAQ,oBAAoB,MAAM,MAAM,KAAK,CAAC,OAAO,EAAE,EAAE;YACzF,KAAK,EAAE,KAAK;SACb,CAAC,CAAC;IACL,CAAC;AACH,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../src/internal/logger.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../src/internal/logger.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAOnC,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAuBD,wBAAgB,YAAY,CAAC,OAAO,EAAE,aAAa,GAAG,MAAM,CAqB3D;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAE1D;AAED,wBAAgB,YAAY,IAAI,IAAI,CAEnC;AAGD,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,IAAI,CAQxE;AAED;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,gEAAgE;IAChE,IAAI,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IAChC,oDAAoD;IACpD,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC;CACnB;AAID,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,cAAc,CAexD;AAGD,YAAY,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC"}
|
package/dist/internal/logger.js
CHANGED
|
@@ -1,5 +1,8 @@
|
|
|
1
1
|
import pino from "pino";
|
|
2
2
|
import pinoPretty from "pino-pretty";
|
|
3
|
+
import { regex } from "arkregex";
|
|
4
|
+
/** Matches glob wildcards for converting to regex patterns */
|
|
5
|
+
const globWildcardRegex = regex("\\*", "g");
|
|
3
6
|
const logLevel = process.env.LOG_LEVEL || "info";
|
|
4
7
|
// Create pretty stream for all contexts
|
|
5
8
|
const prettyStream = pinoPretty({
|
|
@@ -42,7 +45,7 @@ export function clearLoggers() {
|
|
|
42
45
|
}
|
|
43
46
|
// Helper function to enable/disable specific loggers
|
|
44
47
|
export function setLoggerEnabled(pattern, enabled) {
|
|
45
|
-
const regex = new RegExp(pattern.replace(
|
|
48
|
+
const regex = new RegExp(pattern.replace(globWildcardRegex, ".*"));
|
|
46
49
|
loggers.forEach((logger, name) => {
|
|
47
50
|
if (regex.test(name)) {
|
|
48
51
|
logger.level = enabled ? logLevel : "silent";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/internal/logger.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,OAAO,UAAU,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/internal/logger.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StartupCacheService.d.ts","sourceRoot":"","sources":["../../../src/services/cache/StartupCacheService.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,OAAO,EAAY,MAAM,EAAE,KAAK,EAAkB,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"StartupCacheService.d.ts","sourceRoot":"","sources":["../../../src/services/cache/StartupCacheService.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,OAAO,EAAY,MAAM,EAAE,KAAK,EAAkB,MAAM,QAAQ,CAAC;AAG1E,OAAO,EAAE,iBAAiB,EAAsB,qBAAqB;AAQrE,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,oBAAoB,CAAC,EAAE,OAAO,CAAC;IACxC,QAAQ,CAAC,SAAS,CAAC,EAAE,OAAO,CAAC;CAC9B;AAED,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC;IAC5B,QAAQ,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC;CACpC;;iCAKgC,CAC3B,MAAM,EAAE,kBAAkB,KACvB,MAAM,CAAC,MAAM,CAAC,kBAAkB,EAAE,iBAAiB,CAAC;;AAL7D,qBAAa,mBAAoB,SAAQ,wBAOtC;CAAG;AAwPN,eAAO,MAAM,uBAAuB,gDAQlC,CAAC;AAEH,eAAO,MAAM,2BAA2B,gDAOtC,CAAC"}
|
|
@@ -2,9 +2,12 @@ import { Command, FileSystem, Path } from "@effect/platform";
|
|
|
2
2
|
import { NodeContext } from "@effect/platform-node";
|
|
3
3
|
import { createLogger } from "../../util/index.js";
|
|
4
4
|
import { Context, Duration, Effect, Layer, Option, Stream } from "effect";
|
|
5
|
+
import { regex } from "arkregex";
|
|
5
6
|
import * as crypto from "node:crypto";
|
|
6
7
|
import { StartupCacheError } from "../errors.js";
|
|
7
8
|
import { withFileLock } from "./FileLock.js";
|
|
9
|
+
/** Matches --chain=<name> or --chain <name> in CLI arguments */
|
|
10
|
+
const chainArgRegex = regex("--chain[=\\s]?(\\S+)");
|
|
8
11
|
const logger = createLogger({ name: "StartupCacheService" });
|
|
9
12
|
export class StartupCacheService extends Context.Tag("StartupCacheService")() {
|
|
10
13
|
}
|
|
@@ -102,7 +105,7 @@ const getCachedArtifactsImpl = (config) => Effect.gen(function* () {
|
|
|
102
105
|
const shortHash = binaryHash.substring(0, 12);
|
|
103
106
|
const chainName = config.isDevMode
|
|
104
107
|
? "dev"
|
|
105
|
-
: config.chainArg?.match(
|
|
108
|
+
: config.chainArg?.match(chainArgRegex)?.[1] || "default";
|
|
106
109
|
const binName = pathService.basename(config.binPath);
|
|
107
110
|
const cacheSubDir = pathService.join(config.cacheDir, `${binName}-${chainName}-${shortHash}`);
|
|
108
111
|
const hashPath = pathService.join(cacheSubDir, "binary.hash");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StartupCacheService.js","sourceRoot":"","sources":["../../../src/services/cache/StartupCacheService.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"StartupCacheService.js","sourceRoot":"","sources":["../../../src/services/cache/StartupCacheService.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chopsticksConfigParser.d.ts","sourceRoot":"","sources":["../../../src/services/chopsticks/chopsticksConfigParser.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"chopsticksConfigParser.d.ts","sourceRoot":"","sources":["../../../src/services/chopsticks/chopsticksConfigParser.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAIhC,OAAO,EAAE,oBAAoB,EAAE,KAAK,gBAAgB,EAAE,+BAA+B;AAqGrF;;;GAGG;AACH,MAAM,WAAW,yBAAyB;IACxC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,cAAc,CAAC,EAAE,OAAO,GAAG,QAAQ,GAAG,SAAS,CAAC;IAChD,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,sBAAsB,CAAC,EAAE,OAAO,CAAC;CAClC;AAED;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,yBAAyB,GACpC,YAAY,MAAM,EAClB,YAAY,yBAAyB,KACpC,MAAM,CAAC,MAAM,CAAC,gBAAgB,EAAE,oBAAoB,CA4FnD,CAAC;AAEL;;GAEG;AACH,eAAO,MAAM,wBAAwB,GACnC,QAAQ,gBAAgB,KACvB,MAAM,CAAC,MAAM,CAAC,gBAAgB,EAAE,oBAAoB,CA+BnD,CAAC"}
|
|
@@ -10,8 +10,11 @@
|
|
|
10
10
|
import { Effect } from "effect";
|
|
11
11
|
import * as fs from "node:fs";
|
|
12
12
|
import * as yaml from "yaml";
|
|
13
|
+
import { regex } from "arkregex";
|
|
13
14
|
import { ChopsticksSetupError } from "./ChopsticksService.js";
|
|
14
15
|
import { createLogger } from "../../util/index.js";
|
|
16
|
+
/** Matches ${env.VAR_NAME} environment variable references in chopsticks configs */
|
|
17
|
+
const envVarPatternRegex = regex("\\$\\{env\\.([^}]+)}", "g");
|
|
15
18
|
// Local values to avoid value import from chopsticks (which initializes loggers)
|
|
16
19
|
const BuildBlockModeValues = {
|
|
17
20
|
Batch: "Batch",
|
|
@@ -24,7 +27,7 @@ const logger = createLogger({ name: "chopsticksConfigParser" });
|
|
|
24
27
|
* Supports ${env.VAR_NAME} syntax
|
|
25
28
|
*/
|
|
26
29
|
const resolveEnvVars = (value) => {
|
|
27
|
-
return value.replace(
|
|
30
|
+
return value.replace(envVarPatternRegex, (_, varName) => {
|
|
28
31
|
const envValue = process.env[varName];
|
|
29
32
|
if (envValue === undefined) {
|
|
30
33
|
logger.warn(`Environment variable ${varName} is not set`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chopsticksConfigParser.js","sourceRoot":"","sources":["../../../src/services/chopsticks/chopsticksConfigParser.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,EAAE,oBAAoB,EAAyB,+BAA+B;AAErF,OAAO,EAAE,YAAY,EAAE,4BAA4B;AAEnD,iFAAiF;AACjF,MAAM,oBAAoB,GAAG;IAC3B,KAAK,EAAE,OAAyB;IAChC,MAAM,EAAE,QAA0B;IAClC,OAAO,EAAE,SAA2B;CACrC,CAAC;AAEF,MAAM,MAAM,GAAG,YAAY,CAAC,EAAE,IAAI,EAAE,wBAAwB,EAAE,CAAC,CAAC;AAEhE;;;GAGG;AACH,MAAM,cAAc,GAAG,CAAC,KAAa,EAAU,EAAE;IAC/C,OAAO,KAAK,CAAC,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"chopsticksConfigParser.js","sourceRoot":"","sources":["../../../src/services/chopsticks/chopsticksConfigParser.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"launchChopsticksEffect.d.ts","sourceRoot":"","sources":["../../../src/services/chopsticks/launchChopsticksEffect.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,EAAE,MAAM,EAAE,KAAK,EAAc,MAAM,QAAQ,CAAC;AACnD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEtD,OAAO,KAAK,EAAE,oBAAoB,EAAE,iCAAiC;
|
|
1
|
+
{"version":3,"file":"launchChopsticksEffect.d.ts","sourceRoot":"","sources":["../../../src/services/chopsticks/launchChopsticksEffect.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,8 +10,11 @@
|
|
|
10
10
|
*/
|
|
11
11
|
import { Effect, Layer } from "effect";
|
|
12
12
|
import { createLogger } from "../../util/index.js";
|
|
13
|
+
import { regex } from "arkregex";
|
|
13
14
|
import * as fs from "node:fs";
|
|
14
15
|
import * as path from "node:path";
|
|
16
|
+
/** Matches [cause]: Error: <message> in Effect error format */
|
|
17
|
+
const effectCauseRegex = regex("\\[cause\\]:\\s*Error:\\s*(.+)", "s");
|
|
15
18
|
// Re-export BuildBlockMode values for consumers who need them before dynamic import
|
|
16
19
|
// These match the values from @acala-network/chopsticks
|
|
17
20
|
export const BuildBlockModeValues = {
|
|
@@ -588,7 +591,7 @@ export async function launchChopsticksFromSpec(spec, options) {
|
|
|
588
591
|
const errorString = String(error);
|
|
589
592
|
// Extract the relevant cause message from Effect's error format
|
|
590
593
|
// Format: "(FiberFailure) ChopsticksSetupError: ... [cause]: Error: actual message"
|
|
591
|
-
const causeMatch = errorString.match(
|
|
594
|
+
const causeMatch = errorString.match(effectCauseRegex);
|
|
592
595
|
if (causeMatch) {
|
|
593
596
|
throw new Error(`Chopsticks config validation failed: ${causeMatch[1].trim()}`);
|
|
594
597
|
}
|
|
@@ -609,7 +612,7 @@ export async function launchChopsticksFromSpec(spec, options) {
|
|
|
609
612
|
catch (error) {
|
|
610
613
|
// Re-throw with clearer message - use same extraction as config validation
|
|
611
614
|
const errorString = String(error);
|
|
612
|
-
const causeMatch = errorString.match(
|
|
615
|
+
const causeMatch = errorString.match(effectCauseRegex);
|
|
613
616
|
const causeMessage = causeMatch ? causeMatch[1].trim() : errorString;
|
|
614
617
|
throw new Error(`Chopsticks failed to connect to endpoint '${configResult.endpoint}': ${causeMessage}`);
|
|
615
618
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"launchChopsticksEffect.js","sourceRoot":"","sources":["../../../src/services/chopsticks/launchChopsticksEffect.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"launchChopsticksEffect.js","sourceRoot":"","sources":["../../../src/services/chopsticks/launchChopsticksEffect.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configAccessors.d.ts","sourceRoot":"","sources":["../../../src/services/config/configAccessors.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,WAAW,EAAE,iCAAiC;
|
|
1
|
+
{"version":3,"file":"configAccessors.d.ts","sourceRoot":"","sources":["../../../src/services/config/configAccessors.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,WAAW,EAAE,iCAAiC;AAW5E;;;GAGG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,cAAc,GAAG,IAAI,CAE5D;AAED;;;GAGG;AACH,wBAAgB,eAAe,IAAI,cAAc,GAAG,SAAS,CAE5D;AAsCD;;;GAGG;AACH,wBAAgB,gBAAgB,IAAI,cAAc,CAsBjD;AAED;;GAEG;AACH,wBAAgB,WAAW,SAe1B;AAED;;GAEG;AACH,wBAAgB,wBAAwB,IAAI,WAAW,CAStD;AAED;;GAEG;AACH,wBAAgB,mBAAmB,IAAI,OAAO,CAG7C;AAED;;GAEG;AACH,wBAAgB,sBAAsB,IAAI,OAAO,CAGhD;AAED;;GAEG;AACH,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAKnD;AAmBD;;GAEG;AACH,wBAAgB,WAAW,IAAI,IAAI,CAOlC"}
|
|
@@ -1,6 +1,9 @@
|
|
|
1
1
|
import { readFileSync } from "node:fs";
|
|
2
2
|
import JSONC from "jsonc-parser";
|
|
3
3
|
import path, { extname } from "node:path";
|
|
4
|
+
import { regex } from "arkregex";
|
|
5
|
+
/** Matches ${VAR_NAME} environment variable references */
|
|
6
|
+
const envVarRegex = regex("\\$\\{([^}]+)}", "g");
|
|
4
7
|
let cachedConfig;
|
|
5
8
|
/**
|
|
6
9
|
* Sets the cached config. Used by async loaders to populate the cache.
|
|
@@ -34,7 +37,7 @@ function parseConfigSync(filePath) {
|
|
|
34
37
|
}
|
|
35
38
|
function replaceEnvVars(value) {
|
|
36
39
|
if (typeof value === "string") {
|
|
37
|
-
return value.replace(
|
|
40
|
+
return value.replace(envVarRegex, (match, group) => {
|
|
38
41
|
const envVarValue = process.env[group];
|
|
39
42
|
return envVarValue || match;
|
|
40
43
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configAccessors.js","sourceRoot":"","sources":["../../../src/services/config/configAccessors.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,KAAK,MAAM,cAAc,CAAC;AACjC,OAAO,IAAI,EAAE,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"configAccessors.js","sourceRoot":"","sources":["../../../src/services/config/configAccessors.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,KAAK,MAAM,cAAc,CAAC;AACjC,OAAO,IAAI,EAAE,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AAEjC,0DAA0D;AAC1D,MAAM,WAAW,GAAG,KAAK,CAAC,gBAAgB,EAAE,GAAG,CAAC,CAAC;AAEjD,IAAI,YAAwC,CAAC;AAE7C;;;GAGG;AACH,MAAM,UAAU,eAAe,CAAC,MAAsB;IACpD,YAAY,GAAG,MAAM,CAAC;AACxB,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,eAAe;IAC7B,OAAO,YAAY,CAAC;AACtB,CAAC;AAED,SAAS,eAAe,CAAC,QAAgB;IACvC,IAAI,MAAW,CAAC;IAEhB,MAAM,IAAI,GAAG,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IAE5C,QAAQ,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC1B,KAAK,OAAO;YACV,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAC1B,MAAM;QACR,KAAK,SAAS;YACZ,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAC3B,MAAM;QACR;YACE,MAAM,GAAG,SAAS,CAAC;YACnB,MAAM;IACV,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,cAAc,CAAC,KAAU;IAChC,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,OAAO,KAAK,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;YACjD,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YACvC,OAAO,WAAW,IAAI,KAAK,CAAC;QAC9B,CAAC,CAAC,CAAC;IACL,CAAC;IACD,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QACzB,OAAO,KAAK,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IACnC,CAAC;IACD,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;QAChD,OAAO,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC3F,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,gBAAgB;IAC9B,IAAI,YAAY,EAAE,CAAC;QACjB,OAAO,YAAY,CAAC;IACtB,CAAC;IAED,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC;IAEhD,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,MAAM,IAAI,KAAK,CAAC,iEAAiE,CAAC,CAAC;IACrF,CAAC;IAED,MAAM,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,UAAU,CAAC,CAAC;IAEjG,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,eAAe,CAAC,QAAQ,CAAC,CAAC;QACzC,MAAM,cAAc,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC;QAC9C,YAAY,GAAG,cAAgC,CAAC;QAChD,OAAO,YAAY,CAAC;IACtB,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACjB,MAAM,IAAI,KAAK,CAAC,0BAA0B,QAAQ,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC;IACtE,CAAC;AACH,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,WAAW;IACzB,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC;IAEhD,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,MAAM,IAAI,KAAK,CAAC,eAAe,OAAO,CAAC,GAAG,CAAC,aAAa,sBAAsB,CAAC,CAAC;IAClF,CAAC;IACD,MAAM,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,UAAU,CAAC,CAAC;IACjG,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,eAAe,CAAC,QAAQ,CAAC,CAAC;QACzC,MAAM,cAAc,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC;QAC9C,YAAY,GAAG,cAAgC,CAAC;IAClD,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACjB,MAAM,IAAI,KAAK,CAAC,0BAA0B,QAAQ,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC;IACtE,CAAC;AACH,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,wBAAwB;IACtC,MAAM,YAAY,GAAG,gBAAgB,EAAE,CAAC;IACxC,MAAM,MAAM,GAAG,YAAY,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,KAAK,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;IAEhG,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,MAAM,IAAI,KAAK,CAAC,eAAe,OAAO,CAAC,GAAG,CAAC,aAAa,sBAAsB,CAAC,CAAC;IAClF,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,mBAAmB;IACjC,MAAM,GAAG,GAAG,wBAAwB,EAAE,CAAC;IACvC,OAAO,GAAG,CAAC,UAAU,CAAC,IAAI,KAAK,KAAK,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,0BAA0B,CAAC;AACnG,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,sBAAsB;IACpC,MAAM,GAAG,GAAG,wBAAwB,EAAE,CAAC;IACvC,OAAO,GAAG,CAAC,UAAU,CAAC,IAAI,KAAK,QAAQ,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,UAAU,CAAC,0BAA0B,CAAC;AACnG,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,WAAW,CAAC,MAAc;IACxC,MAAM,GAAG,GAAG,wBAAwB,EAAE,CAAC;IACvC,MAAM,WAAW,GAAG,cAAc,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IAEhD,OAAO,WAAW,KAAK,SAAS,CAAC;AACnC,CAAC;AAED,SAAS,cAAc,CAAC,SAAc,EAAE,MAAc;IACpD,IAAI,OAAO,SAAS,KAAK,QAAQ,IAAI,CAAC,SAAS;QAAE,OAAO,SAAS,CAAC;IAElE,IAAI,MAAM,CAAC,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,EAAE,CAAC;QACrC,OAAO,SAAS,CAAC,MAAM,CAAC,CAAC;IAC3B,CAAC;IAED,KAAK,MAAM,GAAG,IAAI,SAAS,EAAE,CAAC;QAC5B,MAAM,MAAM,GAAG,cAAc,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,CAAC;QACtD,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;YACzB,OAAO,MAAM,CAAC;QAChB,CAAC;IACH,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,WAAW;IACzB,MAAM,GAAG,GAAG,wBAAwB,EAAE,CAAC;IAEvC,KAAK,MAAM,MAAM,IAAI,GAAG,CAAC,OAAO,IAAI,EAAE,EAAE,CAAC;QACvC,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACvC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;IAC3B,CAAC;AACH,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PortDiscoveryService.d.ts","sourceRoot":"","sources":["../../../src/services/network/PortDiscoveryService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAY,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"PortDiscoveryService.d.ts","sourceRoot":"","sources":["../../../src/services/network/PortDiscoveryService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAY,MAAM,QAAQ,CAAC;AAI1D,OAAO,EAAE,kBAAkB,EAAE,qBAAqB;;IAa9C;;;;;OAKG;2BACoB,CACrB,GAAG,EAAE,MAAM,EACX,WAAW,CAAC,EAAE,MAAM,KACjB,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,kBAAkB,CAAC;;AAflD;;GAEG;AACH,qBAAa,oBAAqB,SAAQ,yBAcvC;CAAG;AA+FN;;GAEG;AACH,eAAO,MAAM,wBAAwB,iDAEnC,CAAC"}
|
|
@@ -1,7 +1,10 @@
|
|
|
1
1
|
import { Effect, Context, Layer, Schedule } from "effect";
|
|
2
2
|
import { exec } from "node:child_process";
|
|
3
3
|
import { promisify } from "node:util";
|
|
4
|
+
import { regex } from "arkregex";
|
|
4
5
|
import { PortDiscoveryError } from "../errors.js";
|
|
6
|
+
/** Matches host:port in lsof output */
|
|
7
|
+
const lsofPortRegex = regex("(?:.+):(\\d+)");
|
|
5
8
|
const execAsync = promisify(exec);
|
|
6
9
|
/**
|
|
7
10
|
* Service for discovering ports used by a process
|
|
@@ -16,8 +19,7 @@ const parsePortsFromLsof = (stdout) => {
|
|
|
16
19
|
const ports = [];
|
|
17
20
|
const lines = stdout.split("\n");
|
|
18
21
|
for (const line of lines) {
|
|
19
|
-
const
|
|
20
|
-
const match = line.match(regex);
|
|
22
|
+
const match = line.match(lsofPortRegex);
|
|
21
23
|
if (match) {
|
|
22
24
|
ports.push(Number.parseInt(match[1], 10));
|
|
23
25
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PortDiscoveryService.js","sourceRoot":"","sources":["../../../src/services/network/PortDiscoveryService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAC1D,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EAAE,kBAAkB,EAAE,qBAAqB;AAElD,MAAM,SAAS,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;AAElC;;GAEG;AACH,MAAM,OAAO,oBAAqB,SAAQ,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC,EAc1E;CAAG;AAEN;;;GAGG;AACH,MAAM,kBAAkB,GAAG,CAAC,MAAc,EAAY,EAAE;IACtD,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAEjC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,MAAM,KAAK,GAAG,
|
|
1
|
+
{"version":3,"file":"PortDiscoveryService.js","sourceRoot":"","sources":["../../../src/services/network/PortDiscoveryService.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RpcPortDiscoveryService.d.ts","sourceRoot":"","sources":["../../../src/services/network/RpcPortDiscoveryService.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,OAAO,EAAY,MAAM,EAAE,KAAK,EAAgC,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"RpcPortDiscoveryService.d.ts","sourceRoot":"","sources":["../../../src/services/network/RpcPortDiscoveryService.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,OAAO,EAAY,MAAM,EAAE,KAAK,EAAgC,MAAM,QAAQ,CAAC;AAExF,OAAO,EAAE,kBAAkB,EAAE,qBAAqB;;IAc9C;;;;OAIG;8BACuB,CAAC,MAAM,EAAE;QACjC,GAAG,EAAE,MAAM,CAAC;QACZ,eAAe,EAAE,OAAO,CAAC;QACzB,WAAW,CAAC,EAAE,MAAM,CAAC;KACtB,KAAK,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,kBAAkB,CAAC;;AAfnD;;GAEG;AACH,qBAAa,uBAAwB,SAAQ,4BAc1C;CAAG;AAiON;;GAEG;AACH,eAAO,MAAM,2BAA2B,oDAEtC,CAAC"}
|
|
@@ -5,7 +5,10 @@ import * as NodeFileSystem from "@effect/platform-node/NodeFileSystem";
|
|
|
5
5
|
import * as NodeSocket from "@effect/platform-node/NodeSocket";
|
|
6
6
|
import { createLogger } from "../../util/index.js";
|
|
7
7
|
import { Context, Deferred, Effect, Layer, Option, Schedule } from "effect";
|
|
8
|
+
import { regex } from "arkregex";
|
|
8
9
|
import { PortDiscoveryError } from "../errors.js";
|
|
10
|
+
/** Matches host:port in lsof output */
|
|
11
|
+
const lsofPortRegex = regex("(?:.+):(\\d+)");
|
|
9
12
|
const logger = createLogger({ name: "RpcPortDiscoveryService" });
|
|
10
13
|
const debug = logger.debug.bind(logger);
|
|
11
14
|
/**
|
|
@@ -17,9 +20,8 @@ export class RpcPortDiscoveryService extends Context.Tag("RpcPortDiscoveryServic
|
|
|
17
20
|
* Parse ports from lsof output
|
|
18
21
|
*/
|
|
19
22
|
const parsePortsFromLsof = (stdout) => {
|
|
20
|
-
const regex = /(?:.+):(\d+)/;
|
|
21
23
|
return stdout.split("\n").flatMap((line) => {
|
|
22
|
-
const match = line.match(
|
|
24
|
+
const match = line.match(lsofPortRegex);
|
|
23
25
|
return match ? [Number.parseInt(match[1], 10)] : [];
|
|
24
26
|
});
|
|
25
27
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RpcPortDiscoveryService.js","sourceRoot":"","sources":["../../../src/services/network/RpcPortDiscoveryService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAwB,MAAM,kBAAkB,CAAC;AACzE,OAAO,KAAK,mBAAmB,MAAM,2CAA2C,CAAC;AACjF,OAAO,KAAK,WAAW,MAAM,mCAAmC,CAAC;AACjE,OAAO,KAAK,cAAc,MAAM,sCAAsC,CAAC;AACvE,OAAO,KAAK,UAAU,MAAM,kCAAkC,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,4BAA4B;AACnD,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAc,MAAM,QAAQ,CAAC;AACxF,OAAO,EAAE,kBAAkB,EAAE,qBAAqB;AAElD,MAAM,MAAM,GAAG,YAAY,CAAC,EAAE,IAAI,EAAE,yBAAyB,EAAE,CAAC,CAAC;AACjE,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AAExC;;GAEG;AACH,MAAM,OAAO,uBAAwB,SAAQ,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC,EAchF;CAAG;AAEN;;GAEG;AACH,MAAM,kBAAkB,GAAG,CAAC,MAAc,EAAY,EAAE;IACtD,
|
|
1
|
+
{"version":3,"file":"RpcPortDiscoveryService.js","sourceRoot":"","sources":["../../../src/services/network/RpcPortDiscoveryService.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ProcessManagerService.d.ts","sourceRoot":"","sources":["../../../src/services/process/ProcessManagerService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAS,KAAK,EAAgB,MAAM,QAAQ,CAAC;AACrE,OAAO,EAAE,UAAU,EAAQ,MAAM,kBAAkB,CAAC;AAEpD,OAAO,EAAS,KAAK,YAAY,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"ProcessManagerService.d.ts","sourceRoot":"","sources":["../../../src/services/process/ProcessManagerService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAS,KAAK,EAAgB,MAAM,QAAQ,CAAC;AACrE,OAAO,EAAE,UAAU,EAAQ,MAAM,kBAAkB,CAAC;AAEpD,OAAO,EAAS,KAAK,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAE9D,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,qBAAqB;AAQ7D;;GAEG;AACH,MAAM,WAAW,eAAgB,SAAQ,YAAY;IACnD,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,yBAAyB,CAAC,EAAE,MAAM,CAAC;IACnC,aAAa,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CACrC;AAED;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,IAAI,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;IACrC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC;CAChC;AAED;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,OAAO,EAAE,eAAe,CAAC;IAClC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;CAC1B;;oBAUmB,CACd,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,aAAa,CAAC,MAAM,CAAC,KACxB,MAAM,CAAC,MAAM,CAAC,eAAe,EAAE,eAAe,CAAC;;AAXxD;;;;GAIG;AACH,qBAAa,OAAQ,SAAQ,YAQ1B;CAAG;AAEN;;GAEG;AACH,eAAO,MAAM,WAAW,oCAiBtB,CAAC;;IAQC;;;;OAIG;qBACc,CACf,MAAM,EAAE,aAAa,KAClB,MAAM,CAAC,MAAM,CAChB;QAAE,MAAM,EAAE,mBAAmB,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,YAAY,CAAC,CAAA;KAAE,EAC3E,eAAe,GAAG,YAAY,CAC/B;;AAhBL;;GAEG;AACH,qBAAa,qBAAsB,SAAQ,0BAexC;CAAG;AAkON;;GAEG;AACH,eAAO,MAAM,yBAAyB,kDAEpC,CAAC;AAEH;;;GAGG;AACH,eAAO,MAAM,6BAA6B,GACxC,cAAc,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,EAClC,UAAU,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC,UAAU,CAAC,KAC3C,KAAK,CAAC,KAAK,CAAC,qBAAqB,CAQhC,CAAC"}
|
|
@@ -2,8 +2,11 @@ import { Context, Effect, Fiber, Layer, pipe, Stream } from "effect";
|
|
|
2
2
|
import { FileSystem, Path } from "@effect/platform";
|
|
3
3
|
import { NodeFileSystem, NodePath, NodeStream } from "@effect/platform-node";
|
|
4
4
|
import { spawn } from "node:child_process";
|
|
5
|
+
import { regex } from "arkregex";
|
|
5
6
|
import { NodeLaunchError, ProcessError } from "../errors.js";
|
|
6
7
|
import { createLogger } from "../../util/index.js";
|
|
8
|
+
/** Matches the artifact of node_node_undefined in log paths */
|
|
9
|
+
const nodeUndefinedRegex = regex("node_node_undefined", "g");
|
|
7
10
|
const logger = createLogger({ name: "ProcessManagerService" });
|
|
8
11
|
/**
|
|
9
12
|
* Service for spawning child processes.
|
|
@@ -46,7 +49,7 @@ const getLogPath = (config, pid) => pipe(Effect.all([Path.Path, Effect.sync(() =
|
|
|
46
49
|
const baseName = pathService.basename(config.command);
|
|
47
50
|
return pathService
|
|
48
51
|
.join(dirPath, `${baseName}_node_${port}_${pid}.log`)
|
|
49
|
-
.replace(
|
|
52
|
+
.replace(nodeUndefinedRegex, "chopsticks");
|
|
50
53
|
}), Effect.mapError((cause) => new ProcessError({
|
|
51
54
|
cause,
|
|
52
55
|
operation: "spawn",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ProcessManagerService.js","sourceRoot":"","sources":["../../../src/services/process/ProcessManagerService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACrE,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAC7E,OAAO,EAAE,KAAK,EAAqB,MAAM,oBAAoB,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,qBAAqB;AAC7D,OAAO,EAAE,YAAY,EAAE,4BAA4B;AAEnD,MAAM,MAAM,GAAG,YAAY,CAAC,EAAE,IAAI,EAAE,uBAAuB,EAAE,CAAC,CAAC;AA6B/D;;;;GAIG;AACH,MAAM,OAAO,OAAQ,SAAQ,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,EAQhD;CAAG;AAEN;;GAEG;AACH,MAAM,CAAC,MAAM,WAAW,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,EAAE;IAChD,KAAK,EAAE,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE,CACvB,MAAM,CAAC,GAAG,CAAC;QACT,GAAG,EAAE,GAAG,EAAE;YACR,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,EAAE,CAAC,GAAG,IAAI,CAAC,CAAoB,CAAC;YAC3D,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;gBAC1B,MAAM,CAAC,KAAK,CAAC,wBAAwB,KAAK,EAAE,CAAC,CAAC;YAChD,CAAC,CAAC,CAAC;YACH,OAAO,KAAK,CAAC;QACf,CAAC;QACD,KAAK,EAAE,CAAC,KAAK,EAAE,EAAE,CACf,IAAI,eAAe,CAAC;YAClB,KAAK;YACL,OAAO;YACP,IAAI,EAAE,CAAC,GAAG,IAAI,CAAC;SAChB,CAAC;KACL,CAAC;CACL,CAAC,CAAC;AAEH;;GAEG;AACH,MAAM,OAAO,qBAAsB,SAAQ,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC,EAe5E;CAAG;AAEN;;GAEG;AACH,MAAM,UAAU,GAAG,CACjB,MAAqB,EACrB,GAAW,EACqC,EAAE,CAClD,IAAI,CACF,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,EACzD,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,CAAC,EAAE,EAAE;IAChC,MAAM,OAAO,GAAG,MAAM,CAAC,YAAY,IAAI,WAAW,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,EAAE,WAAW,CAAC,CAAC;IACjF,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;IAC5D,MAAM,IAAI,GAAG,OAAO,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,SAAS,CAAC;IACjD,MAAM,QAAQ,GAAG,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAEtD,OAAO,WAAW;SACf,IAAI,CAAC,OAAO,EAAE,GAAG,QAAQ,SAAS,IAAI,IAAI,GAAG,MAAM,CAAC;SACpD,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"ProcessManagerService.js","sourceRoot":"","sources":["../../../src/services/process/ProcessManagerService.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "moonwall",
|
|
3
3
|
"type": "module",
|
|
4
|
-
"version": "1.0.1
|
|
4
|
+
"version": "1.0.1",
|
|
5
5
|
"description": "Testing framework for Substrate-based networks",
|
|
6
6
|
"author": "timbrinded",
|
|
7
7
|
"license": "ISC",
|
|
@@ -55,6 +55,7 @@
|
|
|
55
55
|
"@vitest/ui": "^4.0.18",
|
|
56
56
|
"@zombienet/orchestrator": "0.0.114",
|
|
57
57
|
"@zombienet/utils": "^0.0.30",
|
|
58
|
+
"arkregex": "^0.0.5",
|
|
58
59
|
"bottleneck": "2.19.5",
|
|
59
60
|
"cfonts": "^3.3.1",
|
|
60
61
|
"chalk": "^5.6.2",
|
|
@@ -154,6 +155,9 @@
|
|
|
154
155
|
"test": "vitest run src/cli/internal/effect/__tests__/",
|
|
155
156
|
"test:e2e": "cd test && pnpm moonwall test dev_multi",
|
|
156
157
|
"start": "cd test && pnpm exec moonwall",
|
|
157
|
-
"display-reports": "pnpm exec vite preview --base __vitest__ --outDir html"
|
|
158
|
+
"display-reports": "pnpm exec vite preview --base __vitest__ --outDir html",
|
|
159
|
+
"changeset": "changeset",
|
|
160
|
+
"changeset:version": "changeset version",
|
|
161
|
+
"changeset:release": "sleep 1 && pnpm changeset publish"
|
|
158
162
|
}
|
|
159
163
|
}
|