bunqueue 2.7.12 → 2.7.14
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/application/clientTracking.d.ts +23 -0
- package/dist/application/clientTracking.d.ts.map +1 -1
- package/dist/application/clientTracking.js +80 -25
- package/dist/application/clientTracking.js.map +1 -1
- package/dist/application/lockManager.d.ts +1 -1
- package/dist/application/lockManager.d.ts.map +1 -1
- package/dist/application/lockManager.js +1 -1
- package/dist/application/lockManager.js.map +1 -1
- package/dist/application/queueManager.d.ts +7 -0
- package/dist/application/queueManager.d.ts.map +1 -1
- package/dist/application/queueManager.js +9 -0
- package/dist/application/queueManager.js.map +1 -1
- package/dist/cli/client.d.ts.map +1 -1
- package/dist/cli/client.js +15 -2
- package/dist/cli/client.js.map +1 -1
- package/dist/cli/index.d.ts.map +1 -1
- package/dist/cli/index.js +31 -2
- package/dist/cli/index.js.map +1 -1
- package/dist/cli/output.d.ts +1 -1
- package/dist/cli/output.d.ts.map +1 -1
- package/dist/cli/output.js +67 -8
- package/dist/cli/output.js.map +1 -1
- package/dist/client/sandboxed/wrapper.d.ts.map +1 -1
- package/dist/client/sandboxed/wrapper.js +34 -5
- package/dist/client/sandboxed/wrapper.js.map +1 -1
- package/dist/client/tcp/client.d.ts +9 -0
- package/dist/client/tcp/client.d.ts.map +1 -1
- package/dist/client/tcp/client.js +73 -20
- package/dist/client/tcp/client.js.map +1 -1
- package/dist/client/tcp/connection.d.ts.map +1 -1
- package/dist/client/tcp/connection.js +6 -1
- package/dist/client/tcp/connection.js.map +1 -1
- package/dist/client/tcp/types.d.ts +7 -0
- package/dist/client/tcp/types.d.ts.map +1 -1
- package/dist/infrastructure/persistence/sqlite.d.ts +38 -0
- package/dist/infrastructure/persistence/sqlite.d.ts.map +1 -1
- package/dist/infrastructure/persistence/sqlite.js +97 -0
- package/dist/infrastructure/persistence/sqlite.js.map +1 -1
- package/dist/infrastructure/persistence/sqliteBatch.d.ts +8 -0
- package/dist/infrastructure/persistence/sqliteBatch.d.ts.map +1 -1
- package/dist/infrastructure/persistence/sqliteBatch.js +16 -0
- package/dist/infrastructure/persistence/sqliteBatch.js.map +1 -1
- package/dist/infrastructure/server/handlers/advanced.d.ts.map +1 -1
- package/dist/infrastructure/server/handlers/advanced.js +8 -2
- package/dist/infrastructure/server/handlers/advanced.js.map +1 -1
- package/dist/infrastructure/server/handlers/management.d.ts +1 -1
- package/dist/infrastructure/server/handlers/management.d.ts.map +1 -1
- package/dist/infrastructure/server/handlers/management.js +27 -12
- package/dist/infrastructure/server/handlers/management.js.map +1 -1
- package/dist/infrastructure/server/tcp.d.ts.map +1 -1
- package/dist/infrastructure/server/tcp.js +8 -4
- package/dist/infrastructure/server/tcp.js.map +1 -1
- package/dist/shared/lock.d.ts.map +1 -1
- package/dist/shared/lock.js +15 -0
- package/dist/shared/lock.js.map +1 -1
- package/package.json +1 -1
package/dist/cli/client.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/cli/client.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/cli/client.ts"],"names":[],"mappings":"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"}
|
package/dist/cli/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/cli/index.ts"],"names":[],"mappings":";AACA;;;GAGG;AAUH,yBAAyB;AACzB,UAAU,aAAa;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,OAAO,CAAC;IACd,IAAI,EAAE,OAAO,CAAC;IACd,OAAO,EAAE,OAAO,CAAC;CAClB;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/cli/index.ts"],"names":[],"mappings":";AACA;;;GAGG;AAUH,yBAAyB;AACzB,UAAU,aAAa;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,OAAO,CAAC;IACd,IAAI,EAAE,OAAO,CAAC;IACd,OAAO,EAAE,OAAO,CAAC;CAClB;AA4BD,6CAA6C;AAC7C,wBAAgB,kBAAkB,IAAI;IAAE,OAAO,EAAE,aAAa,CAAC;IAAC,WAAW,EAAE,MAAM,EAAE,CAAA;CAAE,CAmGtF;AAqBD,qBAAqB;AACrB,wBAAsB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAoF1C"}
|
package/dist/cli/index.js
CHANGED
|
@@ -10,6 +10,31 @@ import { isBackupCommand, executeBackupCommand } from './commands/backup';
|
|
|
10
10
|
import { runDoctor } from './commands/doctor';
|
|
11
11
|
import { VERSION } from '../shared/version';
|
|
12
12
|
import { resolveToken } from '../client/resolveToken';
|
|
13
|
+
/**
|
|
14
|
+
* Resolve TCP port from env when not set via --port flag.
|
|
15
|
+
* Priority: explicit CLI flag (caller-checked) > TCP_PORT (server's primary var)
|
|
16
|
+
* > BUNQUEUE_TCP_PORT > BQ_TCP_PORT. Reads TCP_PORT first so users
|
|
17
|
+
* running both server and client in the same shell with TCP_PORT=X get
|
|
18
|
+
* consistent behavior — same var binds the server AND routes the client.
|
|
19
|
+
*/
|
|
20
|
+
function resolveEnvPort(currentPort) {
|
|
21
|
+
const envPort = Bun.env.TCP_PORT ?? Bun.env.BUNQUEUE_TCP_PORT ?? Bun.env.BQ_TCP_PORT;
|
|
22
|
+
if (!envPort)
|
|
23
|
+
return currentPort;
|
|
24
|
+
const parsed = parseInt(envPort, 10);
|
|
25
|
+
if (isNaN(parsed) || parsed < 1 || parsed > 65535) {
|
|
26
|
+
console.warn(`Warning: Invalid env port "${envPort}". Using ${currentPort}.`);
|
|
27
|
+
return currentPort;
|
|
28
|
+
}
|
|
29
|
+
return parsed;
|
|
30
|
+
}
|
|
31
|
+
/**
|
|
32
|
+
* Resolve host from env when not set via --host flag.
|
|
33
|
+
* Priority: HOST (server's primary var) > BUNQUEUE_HOST > BQ_HOST.
|
|
34
|
+
*/
|
|
35
|
+
function resolveEnvHost(currentHost) {
|
|
36
|
+
return Bun.env.HOST ?? Bun.env.BUNQUEUE_HOST ?? Bun.env.BQ_HOST ?? currentHost;
|
|
37
|
+
}
|
|
13
38
|
/** Parse global options from process.argv */
|
|
14
39
|
export function parseGlobalOptions() {
|
|
15
40
|
const allArgs = process.argv.slice(2);
|
|
@@ -54,10 +79,10 @@ export function parseGlobalOptions() {
|
|
|
54
79
|
else if (arg === '--json') {
|
|
55
80
|
json = true;
|
|
56
81
|
}
|
|
57
|
-
else if (arg === '--help') {
|
|
82
|
+
else if (arg === '--help' || arg === '-h') {
|
|
58
83
|
help = true;
|
|
59
84
|
}
|
|
60
|
-
else if (arg === '--version') {
|
|
85
|
+
else if (arg === '--version' || arg === '-v') {
|
|
61
86
|
version = true;
|
|
62
87
|
}
|
|
63
88
|
else if (arg.startsWith('--host=')) {
|
|
@@ -107,6 +132,10 @@ export function parseGlobalOptions() {
|
|
|
107
132
|
// Fall back to environment variables for token if not set via CLI flag
|
|
108
133
|
// Priority: --token flag > BQ_TOKEN > BUNQUEUE_TOKEN
|
|
109
134
|
token = resolveToken(token);
|
|
135
|
+
if (!portExplicit)
|
|
136
|
+
port = resolveEnvPort(port);
|
|
137
|
+
if (!hostExplicit)
|
|
138
|
+
host = resolveEnvHost(host);
|
|
110
139
|
return {
|
|
111
140
|
options: { host, port, token, json, help, version },
|
|
112
141
|
commandArgs,
|
package/dist/cli/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/cli/index.ts"],"names":[],"mappings":";AACA;;;GAGG;AAEH,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACjD,OAAO,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAC1E,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAYtD,6CAA6C;AAC7C,MAAM,UAAU,kBAAkB;IAChC,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAEtC,+DAA+D;IAC/D,IAAI,IAAI,GAAG,WAAW,CAAC;IACvB,IAAI,IAAI,GAAG,IAAI,CAAC;IAChB,IAAI,KAAyB,CAAC;IAC9B,IAAI,IAAI,GAAG,KAAK,CAAC;IACjB,IAAI,IAAI,GAAG,KAAK,CAAC;IACjB,IAAI,OAAO,GAAG,KAAK,CAAC;IACpB,IAAI,YAAY,GAAG,KAAK,CAAC;IACzB,IAAI,YAAY,GAAG,KAAK,CAAC;IAEzB,MAAM,WAAW,GAAa,EAAE,CAAC;IACjC,IAAI,CAAC,GAAG,CAAC,CAAC;IAEV,OAAO,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;QAC1B,MAAM,GAAG,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;QAEvB,IAAI,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,IAAI,EAAE,CAAC;YACrC,IAAI,GAAG,OAAO,CAAC,EAAE,CAAC,CAAC,IAAI,WAAW,CAAC;YACnC,YAAY,GAAG,IAAI,CAAC;QACtB,CAAC;aAAM,IAAI,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,IAAI,EAAE,CAAC;YAC5C,MAAM,GAAG,GAAG,OAAO,CAAC,EAAE,CAAC,CAAC,IAAI,MAAM,CAAC;YACnC,MAAM,MAAM,GAAG,QAAQ,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;YACjC,IAAI,KAAK,CAAC,MAAM,CAAC,IAAI,MAAM,GAAG,CAAC,IAAI,MAAM,GAAG,KAAK,EAAE,CAAC;gBAClD,OAAO,CAAC,IAAI,CAAC,0BAA0B,GAAG,6BAA6B,CAAC,CAAC;gBACzE,IAAI,GAAG,IAAI,CAAC;YACd,CAAC;iBAAM,CAAC;gBACN,IAAI,GAAG,MAAM,CAAC;gBACd,YAAY,GAAG,IAAI,CAAC;YACtB,CAAC;QACH,CAAC;aAAM,IAAI,GAAG,KAAK,SAAS,IAAI,GAAG,KAAK,IAAI,EAAE,CAAC;YAC7C,MAAM,OAAO,GAAG,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;YAC/B,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;gBAC1B,OAAO,CAAC,IAAI,CAAC,mDAAmD,CAAC,CAAC;YACpE,CAAC;iBAAM,CAAC;gBACN,KAAK,GAAG,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC;YACvB,CAAC;QACH,CAAC;aAAM,IAAI,GAAG,KAAK,QAAQ,EAAE,CAAC;YAC5B,IAAI,GAAG,IAAI,CAAC;QACd,CAAC;aAAM,IAAI,GAAG,KAAK,QAAQ,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/cli/index.ts"],"names":[],"mappings":";AACA;;;GAGG;AAEH,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACjD,OAAO,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAC1E,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAYtD;;;;;;GAMG;AACH,SAAS,cAAc,CAAC,WAAmB;IACzC,MAAM,OAAO,GAAG,GAAG,CAAC,GAAG,CAAC,QAAQ,IAAI,GAAG,CAAC,GAAG,CAAC,iBAAiB,IAAI,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC;IACrF,IAAI,CAAC,OAAO;QAAE,OAAO,WAAW,CAAC;IACjC,MAAM,MAAM,GAAG,QAAQ,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;IACrC,IAAI,KAAK,CAAC,MAAM,CAAC,IAAI,MAAM,GAAG,CAAC,IAAI,MAAM,GAAG,KAAK,EAAE,CAAC;QAClD,OAAO,CAAC,IAAI,CAAC,8BAA8B,OAAO,YAAY,WAAW,GAAG,CAAC,CAAC;QAC9E,OAAO,WAAW,CAAC;IACrB,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;;GAGG;AACH,SAAS,cAAc,CAAC,WAAmB;IACzC,OAAO,GAAG,CAAC,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,GAAG,CAAC,aAAa,IAAI,GAAG,CAAC,GAAG,CAAC,OAAO,IAAI,WAAW,CAAC;AACjF,CAAC;AAED,6CAA6C;AAC7C,MAAM,UAAU,kBAAkB;IAChC,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAEtC,+DAA+D;IAC/D,IAAI,IAAI,GAAG,WAAW,CAAC;IACvB,IAAI,IAAI,GAAG,IAAI,CAAC;IAChB,IAAI,KAAyB,CAAC;IAC9B,IAAI,IAAI,GAAG,KAAK,CAAC;IACjB,IAAI,IAAI,GAAG,KAAK,CAAC;IACjB,IAAI,OAAO,GAAG,KAAK,CAAC;IACpB,IAAI,YAAY,GAAG,KAAK,CAAC;IACzB,IAAI,YAAY,GAAG,KAAK,CAAC;IAEzB,MAAM,WAAW,GAAa,EAAE,CAAC;IACjC,IAAI,CAAC,GAAG,CAAC,CAAC;IAEV,OAAO,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;QAC1B,MAAM,GAAG,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;QAEvB,IAAI,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,IAAI,EAAE,CAAC;YACrC,IAAI,GAAG,OAAO,CAAC,EAAE,CAAC,CAAC,IAAI,WAAW,CAAC;YACnC,YAAY,GAAG,IAAI,CAAC;QACtB,CAAC;aAAM,IAAI,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,IAAI,EAAE,CAAC;YAC5C,MAAM,GAAG,GAAG,OAAO,CAAC,EAAE,CAAC,CAAC,IAAI,MAAM,CAAC;YACnC,MAAM,MAAM,GAAG,QAAQ,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;YACjC,IAAI,KAAK,CAAC,MAAM,CAAC,IAAI,MAAM,GAAG,CAAC,IAAI,MAAM,GAAG,KAAK,EAAE,CAAC;gBAClD,OAAO,CAAC,IAAI,CAAC,0BAA0B,GAAG,6BAA6B,CAAC,CAAC;gBACzE,IAAI,GAAG,IAAI,CAAC;YACd,CAAC;iBAAM,CAAC;gBACN,IAAI,GAAG,MAAM,CAAC;gBACd,YAAY,GAAG,IAAI,CAAC;YACtB,CAAC;QACH,CAAC;aAAM,IAAI,GAAG,KAAK,SAAS,IAAI,GAAG,KAAK,IAAI,EAAE,CAAC;YAC7C,MAAM,OAAO,GAAG,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;YAC/B,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;gBAC1B,OAAO,CAAC,IAAI,CAAC,mDAAmD,CAAC,CAAC;YACpE,CAAC;iBAAM,CAAC;gBACN,KAAK,GAAG,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC;YACvB,CAAC;QACH,CAAC;aAAM,IAAI,GAAG,KAAK,QAAQ,EAAE,CAAC;YAC5B,IAAI,GAAG,IAAI,CAAC;QACd,CAAC;aAAM,IAAI,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,IAAI,EAAE,CAAC;YAC5C,IAAI,GAAG,IAAI,CAAC;QACd,CAAC;aAAM,IAAI,GAAG,KAAK,WAAW,IAAI,GAAG,KAAK,IAAI,EAAE,CAAC;YAC/C,OAAO,GAAG,IAAI,CAAC;QACjB,CAAC;aAAM,IAAI,GAAG,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;YACrC,IAAI,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YACpB,YAAY,GAAG,IAAI,CAAC;QACtB,CAAC;aAAM,IAAI,GAAG,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;YACrC,MAAM,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YACzB,MAAM,MAAM,GAAG,QAAQ,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;YACjC,IAAI,KAAK,CAAC,MAAM,CAAC,IAAI,MAAM,GAAG,CAAC,IAAI,MAAM,GAAG,KAAK,EAAE,CAAC;gBAClD,OAAO,CAAC,IAAI,CAAC,0BAA0B,GAAG,6BAA6B,CAAC,CAAC;gBACzE,IAAI,GAAG,IAAI,CAAC;YACd,CAAC;iBAAM,CAAC;gBACN,IAAI,GAAG,MAAM,CAAC;gBACd,YAAY,GAAG,IAAI,CAAC;YACtB,CAAC;QACH,CAAC;aAAM,IAAI,GAAG,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;YACtC,MAAM,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YACzB,IAAI,CAAC,GAAG,EAAE,CAAC;gBACT,OAAO,CAAC,IAAI,CAAC,oDAAoD,CAAC,CAAC;YACrE,CAAC;iBAAM,CAAC;gBACN,KAAK,GAAG,GAAG,CAAC;YACd,CAAC;QACH,CAAC;aAAM,CAAC;YACN,uCAAuC;YACvC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACxB,CAAC;QACD,CAAC,EAAE,CAAC;IACN,CAAC;IAED,uFAAuF;IACvF,MAAM,YAAY,GAChB,WAAW,CAAC,CAAC,CAAC,KAAK,OAAO,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,IAAI,WAAW,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC;IAE5F,8DAA8D;IAC9D,gDAAgD;IAChD,8DAA8D;IAC9D,IAAI,YAAY,EAAE,CAAC;QACjB,IAAI,YAAY,EAAE,CAAC;YACjB,WAAW,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QACnC,CAAC;QACD,IAAI,YAAY,EAAE,CAAC;YACjB,WAAW,CAAC,IAAI,CAAC,YAAY,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;QAC/C,CAAC;IACH,CAAC;IAED,uEAAuE;IACvE,qDAAqD;IACrD,KAAK,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC;IAE5B,IAAI,CAAC,YAAY;QAAE,IAAI,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC;IAC/C,IAAI,CAAC,YAAY;QAAE,IAAI,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC;IAE/C,OAAO;QACL,OAAO,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE;QACnD,WAAW;KACZ,CAAC;AACJ,CAAC;AAED,mCAAmC;AACnC,KAAK,UAAU,gBAAgB,CAAC,IAAY,EAAE,QAAgB;IAC5D,OAAO,CAAC,GAAG,CAAC,qBAAqB,OAAO,EAAE,CAAC,CAAC;IAC5C,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,UAAU,IAAI,IAAI,QAAQ,SAAS,EAAE;YAC5D,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC;SAClC,CAAC,CAAC;QACH,IAAI,CAAC,IAAI,CAAC,EAAE;YAAE,OAAO;QACrB,MAAM,IAAI,GAAG,CAAC,MAAM,IAAI,CAAC,IAAI,EAAE,CAAyB,CAAC;QACzD,IAAI,CAAC,IAAI,CAAC,OAAO;YAAE,OAAO;QAC1B,OAAO,CAAC,GAAG,CAAC,qBAAqB,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;QACjD,IAAI,IAAI,CAAC,OAAO,KAAK,OAAO,EAAE,CAAC;YAC7B,OAAO,CAAC,GAAG,CAAC,yDAAyD,CAAC,CAAC;QACzE,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,CAAC,GAAG,CAAC,0BAA0B,IAAI,IAAI,QAAQ,GAAG,CAAC,CAAC;IAC7D,CAAC;AACH,CAAC;AAED,qBAAqB;AACrB,MAAM,CAAC,KAAK,UAAU,IAAI;IACxB,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,GAAG,kBAAkB,EAAE,CAAC;IAEtD,mBAAmB;IACnB,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;QACpB,YAAY,CAAC,OAAO,CAAC,CAAC;QACtB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,gCAAgC;IAChC,IAAI,OAAO,CAAC,IAAI,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC7C,SAAS,EAAE,CAAC;QACZ,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,8CAA8C;IAC9C,MAAM,OAAO,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;IAE/B,2FAA2F;IAC3F,IAAI,CAAC,OAAO,IAAI,OAAO,KAAK,OAAO,IAAI,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;QAC/D,MAAM,UAAU,GAAG,OAAO,KAAK,OAAO,CAAC,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC;QAC5E,MAAM,SAAS,CAAC,UAAU,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;QAC1C,OAAO;IACT,CAAC;IAED,4BAA4B;IAC5B,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;QACjB,uCAAuC;QACvC,SAAS,EAAE,CAAC;QACZ,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,uEAAuE;IACvE,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;QAC1B,MAAM,gBAAgB,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC;QACvD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,4CAA4C;IAC5C,IAAI,OAAO,KAAK,QAAQ,EAAE,CAAC;QACzB,MAAM,SAAS,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC;QAChD,OAAO;IACT,CAAC;IAED,iDAAiD;IACjD,IAAI,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC;QAC7B,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,oBAAoB,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;YAChE,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;gBACjB,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;YAC/C,CAAC;iBAAM,CAAC;gBACN,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;gBAC5B,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC;oBAChB,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;gBACpD,CAAC;YACH,CAAC;YACD,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACvC,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAI,GAAG,YAAY,KAAK,EAAE,CAAC;gBACzB,OAAO,CAAC,KAAK,CAAC,UAAU,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;YACzC,CAAC;iBAAM,CAAC;gBACN,OAAO,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAC;YAC1C,CAAC;YACD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;QACD,OAAO;IACT,CAAC;IAED,+CAA+C;IAC/C,IAAI,CAAC;QACH,MAAM,cAAc,CAAC,OAAO,EAAE,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE;YAClD,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,IAAI,EAAE,OAAO,CAAC,IAAI;SACnB,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,IAAI,GAAG,YAAY,KAAK,EAAE,CAAC;YACzB,OAAO,CAAC,KAAK,CAAC,UAAU,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;QACzC,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAC;QAC1C,CAAC;QACD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;AACH,CAAC;AAED,kDAAkD;AAClD,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;IACrB,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,GAAY,EAAE,EAAE;QAC5B,OAAO,CAAC,KAAK,CAAC,cAAc,EAAE,GAAG,CAAC,CAAC;QACnC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC,CAAC,CAAC;AACL,CAAC"}
|
package/dist/cli/output.d.ts
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
* Formats command responses for terminal display
|
|
4
4
|
*/
|
|
5
5
|
/** Main output formatter */
|
|
6
|
-
export declare function formatOutput(response: Record<string, unknown>, command: string, asJson: boolean): string;
|
|
6
|
+
export declare function formatOutput(response: Record<string, unknown>, command: string, asJson: boolean, subcommand?: string): string;
|
|
7
7
|
/** Format error message */
|
|
8
8
|
export declare function formatError(message: string, asJson: boolean): string;
|
|
9
9
|
//# sourceMappingURL=output.d.ts.map
|
package/dist/cli/output.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"output.d.ts","sourceRoot":"","sources":["../../src/cli/output.ts"],"names":[],"mappings":"AAAA;;;GAGG;
|
|
1
|
+
{"version":3,"file":"output.d.ts","sourceRoot":"","sources":["../../src/cli/output.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAgXH,4BAA4B;AAC5B,wBAAgB,YAAY,CAC1B,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACjC,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,OAAO,EACf,UAAU,CAAC,EAAE,MAAM,GAClB,MAAM,CAUR;AAED,2BAA2B;AAC3B,wBAAgB,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,GAAG,MAAM,CAKpE"}
|
package/dist/cli/output.js
CHANGED
|
@@ -30,12 +30,56 @@ function str(value, fallback = '') {
|
|
|
30
30
|
// value is narrowed to number | boolean | bigint | symbol | function — all have a defined toString.
|
|
31
31
|
return value.toString();
|
|
32
32
|
}
|
|
33
|
+
/**
|
|
34
|
+
* Derive a job's state from its fields when not explicitly provided.
|
|
35
|
+
* The server-side Job domain object doesn't carry an explicit `state` field
|
|
36
|
+
* (state is tracked separately in jobIndex), so responses like PULL omit it.
|
|
37
|
+
*
|
|
38
|
+
* Used only as a display fallback when the response includes a Job object
|
|
39
|
+
* but no explicit state. Conservative: errs toward 'unknown' rather than
|
|
40
|
+
* guessing 'active' for a job that may actually be in DLQ/failed/stalled.
|
|
41
|
+
* - explicit state field present → use it
|
|
42
|
+
* - completedAt → completed
|
|
43
|
+
* - attempts >= maxAttempts && no completedAt → likely failed / DLQ → unknown
|
|
44
|
+
* - startedAt && !completedAt → likely active, but not certain → unknown
|
|
45
|
+
* for the most common pull-response case the caller (PULL) knows it's
|
|
46
|
+
* active and will pass `state` explicitly in future iterations
|
|
47
|
+
* - runAt > now → delayed
|
|
48
|
+
* - else → waiting
|
|
49
|
+
*/
|
|
50
|
+
function deriveJobState(job) {
|
|
51
|
+
if (typeof job.state === 'string' && job.state.length > 0)
|
|
52
|
+
return job.state;
|
|
53
|
+
const completedAt = typeof job.completedAt === 'number' ? job.completedAt : 0;
|
|
54
|
+
const startedAt = typeof job.startedAt === 'number' ? job.startedAt : 0;
|
|
55
|
+
const attempts = typeof job.attempts === 'number' ? job.attempts : 0;
|
|
56
|
+
const maxAttempts = typeof job.maxAttempts === 'number' ? job.maxAttempts : 0;
|
|
57
|
+
const runAt = typeof job.runAt === 'number' ? job.runAt : 0;
|
|
58
|
+
if (completedAt > 0)
|
|
59
|
+
return 'completed';
|
|
60
|
+
// A job whose retries are exhausted with no completion is in DLQ. We can't
|
|
61
|
+
// tell from timestamps alone whether it's there or merely retrying, so
|
|
62
|
+
// surface 'unknown' rather than confidently print 'active'.
|
|
63
|
+
if (maxAttempts > 0 && attempts >= maxAttempts && startedAt > 0)
|
|
64
|
+
return 'unknown';
|
|
65
|
+
if (startedAt > 0)
|
|
66
|
+
return 'active';
|
|
67
|
+
if (runAt > Date.now())
|
|
68
|
+
return 'delayed';
|
|
69
|
+
// If we have zero signal at all (no timestamps, no state), fall back to
|
|
70
|
+
// 'unknown' rather than confidently print 'waiting'. Real responses from
|
|
71
|
+
// the server include a `runAt` (set at push time), so 'waiting' inference
|
|
72
|
+
// still triggers for real waiting jobs.
|
|
73
|
+
if (runAt === 0 && startedAt === 0 && completedAt === 0)
|
|
74
|
+
return 'unknown';
|
|
75
|
+
return 'waiting';
|
|
76
|
+
}
|
|
33
77
|
/** Format a job object for display */
|
|
34
78
|
function formatJob(job) {
|
|
35
79
|
const lines = [
|
|
36
80
|
`${color('Job:', colors.bold)} ${str(job.id)}`,
|
|
37
81
|
` Queue: ${str(job.queue)}`,
|
|
38
|
-
` State: ${
|
|
82
|
+
` State: ${deriveJobState(job)}`,
|
|
39
83
|
` Priority: ${str(job.priority)}`,
|
|
40
84
|
` Attempts: ${str(job.attempts)}/${str(job.maxAttempts)}`,
|
|
41
85
|
` Data: ${JSON.stringify(job.data)}`,
|
|
@@ -227,16 +271,27 @@ function formatCollection(r, command) {
|
|
|
227
271
|
return null;
|
|
228
272
|
}
|
|
229
273
|
/** Format a successful response based on its content */
|
|
230
|
-
function formatSuccess(response, command) {
|
|
274
|
+
function formatSuccess(response, command, subcommand) {
|
|
231
275
|
// Unwrap nested data wrapper (server wraps workers, webhooks, logs, metrics in {data: {...}})
|
|
232
276
|
const r = unwrap(response);
|
|
233
277
|
// Job created
|
|
234
278
|
if ('id' in r && typeof r.id === 'string' && command === 'push') {
|
|
235
279
|
return color(`Job created: ${r.id}`, colors.green);
|
|
236
280
|
}
|
|
237
|
-
// Batch jobs
|
|
281
|
+
// Batch jobs IDs returned. Wording depends on command + subcommand.
|
|
238
282
|
if ('ids' in r && Array.isArray(r.ids)) {
|
|
239
|
-
|
|
283
|
+
const n = r.ids.length;
|
|
284
|
+
const idsStr = r.ids.join(', ');
|
|
285
|
+
let verb = 'Affected';
|
|
286
|
+
if (command === 'push')
|
|
287
|
+
verb = 'Created';
|
|
288
|
+
else if (command === 'queue') {
|
|
289
|
+
verb = subcommand === 'drain' ? 'Drained' : 'Cleaned';
|
|
290
|
+
}
|
|
291
|
+
else if (command === 'dlq') {
|
|
292
|
+
verb = subcommand === 'retry' ? 'Retried' : subcommand === 'purge' ? 'Purged' : 'Affected';
|
|
293
|
+
}
|
|
294
|
+
return color(`${verb} ${n} jobs${idsStr ? ': ' + idsStr : ''}`, colors.green);
|
|
240
295
|
}
|
|
241
296
|
// Try collection/list formats
|
|
242
297
|
const collection = formatCollection(r, command);
|
|
@@ -248,9 +303,13 @@ function formatSuccess(response, command) {
|
|
|
248
303
|
// State
|
|
249
304
|
if ('state' in r)
|
|
250
305
|
return `State: ${str(r.state)}`;
|
|
251
|
-
// Result
|
|
252
|
-
if ('result' in r)
|
|
306
|
+
// Result. undefined → no result stored yet (job not completed or removeOnComplete).
|
|
307
|
+
if ('result' in r) {
|
|
308
|
+
if (r.result === undefined || r.result === null) {
|
|
309
|
+
return color('No result available (job not completed or result was removed)', colors.yellow);
|
|
310
|
+
}
|
|
253
311
|
return `Result: ${JSON.stringify(r.result, null, 2)}`;
|
|
312
|
+
}
|
|
254
313
|
// Progress
|
|
255
314
|
if ('progress' in r) {
|
|
256
315
|
const msg = r.message ? ` - ${str(r.message)}` : '';
|
|
@@ -271,14 +330,14 @@ function formatSuccess(response, command) {
|
|
|
271
330
|
return color('OK', colors.green);
|
|
272
331
|
}
|
|
273
332
|
/** Main output formatter */
|
|
274
|
-
export function formatOutput(response, command, asJson) {
|
|
333
|
+
export function formatOutput(response, command, asJson, subcommand) {
|
|
275
334
|
if (asJson) {
|
|
276
335
|
return JSON.stringify(response, null, 2);
|
|
277
336
|
}
|
|
278
337
|
if (!response.ok) {
|
|
279
338
|
return formatError(str(response.error, 'Unknown error'), false);
|
|
280
339
|
}
|
|
281
|
-
return formatSuccess(response, command);
|
|
340
|
+
return formatSuccess(response, command, subcommand);
|
|
282
341
|
}
|
|
283
342
|
/** Format error message */
|
|
284
343
|
export function formatError(message, asJson) {
|
package/dist/cli/output.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"output.js","sourceRoot":"","sources":["../../src/cli/output.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"output.js","sourceRoot":"","sources":["../../src/cli/output.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,uBAAuB;AACvB,MAAM,MAAM,GAAG;IACb,KAAK,EAAE,SAAS;IAChB,IAAI,EAAE,SAAS;IACf,GAAG,EAAE,SAAS;IACd,GAAG,EAAE,UAAU;IACf,KAAK,EAAE,UAAU;IACjB,MAAM,EAAE,UAAU;IAClB,IAAI,EAAE,UAAU;IAChB,IAAI,EAAE,UAAU;CACR,CAAC;AAEX,oCAAoC;AACpC,MAAM,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,KAAK,IAAI,GAAG,CAAC,GAAG,CAAC,QAAQ,KAAK,GAAG,CAAC;AAEvE,+BAA+B;AAC/B,SAAS,KAAK,CAAC,IAAY,EAAE,SAAiB;IAC5C,OAAO,aAAa,CAAC,CAAC,CAAC,GAAG,SAAS,GAAG,IAAI,GAAG,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;AACrE,CAAC;AAED,6CAA6C;AAC7C,SAAS,GAAG,CAAC,KAAc,EAAE,QAAQ,GAAG,EAAE;IACxC,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS;QAAE,OAAO,QAAQ,CAAC;IAC3D,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC;IAC5C,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IAC5D,oGAAoG;IACpG,OAAQ,KAAgC,CAAC,QAAQ,EAAE,CAAC;AACtD,CAAC;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,SAAS,cAAc,CAAC,GAA4B;IAClD,IAAI,OAAO,GAAG,CAAC,KAAK,KAAK,QAAQ,IAAI,GAAG,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC;QAAE,OAAO,GAAG,CAAC,KAAK,CAAC;IAE5E,MAAM,WAAW,GAAG,OAAO,GAAG,CAAC,WAAW,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;IAC9E,MAAM,SAAS,GAAG,OAAO,GAAG,CAAC,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;IACxE,MAAM,QAAQ,GAAG,OAAO,GAAG,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;IACrE,MAAM,WAAW,GAAG,OAAO,GAAG,CAAC,WAAW,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;IAC9E,MAAM,KAAK,GAAG,OAAO,GAAG,CAAC,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IAE5D,IAAI,WAAW,GAAG,CAAC;QAAE,OAAO,WAAW,CAAC;IACxC,2EAA2E;IAC3E,uEAAuE;IACvE,4DAA4D;IAC5D,IAAI,WAAW,GAAG,CAAC,IAAI,QAAQ,IAAI,WAAW,IAAI,SAAS,GAAG,CAAC;QAAE,OAAO,SAAS,CAAC;IAClF,IAAI,SAAS,GAAG,CAAC;QAAE,OAAO,QAAQ,CAAC;IACnC,IAAI,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE;QAAE,OAAO,SAAS,CAAC;IACzC,wEAAwE;IACxE,yEAAyE;IACzE,0EAA0E;IAC1E,wCAAwC;IACxC,IAAI,KAAK,KAAK,CAAC,IAAI,SAAS,KAAK,CAAC,IAAI,WAAW,KAAK,CAAC;QAAE,OAAO,SAAS,CAAC;IAC1E,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,sCAAsC;AACtC,SAAS,SAAS,CAAC,GAA4B;IAC7C,MAAM,KAAK,GAAG;QACZ,GAAG,KAAK,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE;QAC9C,iBAAiB,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE;QACjC,iBAAiB,cAAc,CAAC,GAAG,CAAC,EAAE;QACtC,iBAAiB,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE;QACpC,iBAAiB,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE;QAC5D,iBAAiB,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;KAC5C,CAAC;IAEF,IAAI,GAAG,CAAC,QAAQ,KAAK,SAAS,IAAI,GAAG,CAAC,QAAQ,KAAK,CAAC,EAAE,CAAC;QACrD,KAAK,CAAC,IAAI,CAAC,iBAAiB,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;IACpD,CAAC;IACD,IAAI,GAAG,CAAC,SAAS,EAAE,CAAC;QAClB,KAAK,CAAC,IAAI,CAAC,iBAAiB,IAAI,IAAI,CAAC,GAAG,CAAC,SAAmB,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;IACjF,CAAC;IACD,IAAI,GAAG,CAAC,SAAS,EAAE,CAAC;QAClB,KAAK,CAAC,IAAI,CAAC,iBAAiB,IAAI,IAAI,CAAC,GAAG,CAAC,SAAmB,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;IACjF,CAAC;IACD,IAAI,GAAG,CAAC,KAAK,EAAE,CAAC;QACd,KAAK,CAAC,IAAI,CAAC,iBAAiB,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IACnE,CAAC;IAED,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC1B,CAAC;AAED,oDAAoD;AACpD,SAAS,GAAG,CAAC,IAAY,EAAE,KAAa;IACtC,MAAM,WAAW,GAAG,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;IAC1C,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,GAAG,WAAW,CAAC,CAAC;IACjD,OAAO,IAAI,GAAG,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;AACpC,CAAC;AAED,6BAA6B;AAC7B,SAAS,eAAe,CAAC,IAA+B;IACtD,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACtB,OAAO,KAAK,CAAC,eAAe,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;IAC/C,CAAC;IAED,MAAM,MAAM,GAAG;QACb,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC;QACjC,GAAG,CAAC,KAAK,CAAC,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC;QACpC,GAAG,CAAC,KAAK,CAAC,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC;QACpC,GAAG,CAAC,KAAK,CAAC,UAAU,EAAE,MAAM,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC;QACvC,KAAK,CAAC,UAAU,EAAE,MAAM,CAAC,IAAI,CAAC;KAC/B,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAEZ,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAC5B;QACE,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;QACpB,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC;QACvB,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC;QAC5B,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;QAC1B,GAAG,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE;KAC/C,CAAC,IAAI,CAAC,GAAG,CAAC,CACZ,CAAC;IAEF,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,GAAG,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACtD,CAAC;AAED,0BAA0B;AAC1B,SAAS,WAAW,CAAC,KAA8B;IACjD,MAAM,KAAK,GAAG;QACZ,KAAK,CAAC,oBAAoB,EAAE,MAAM,CAAC,IAAI,CAAC;QACxC,EAAE;QACF,KAAK,KAAK,CAAC,UAAU,EAAE,MAAM,CAAC,IAAI,CAAC,QAAQ,GAAG,CAAC,KAAK,CAAC,OAAO,EAAE,GAAG,CAAC,EAAE;QACpE,KAAK,KAAK,CAAC,SAAS,EAAE,MAAM,CAAC,KAAK,CAAC,SAAS,GAAG,CAAC,KAAK,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE;QACpE,KAAK,KAAK,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,CAAC,QAAQ,GAAG,CAAC,KAAK,CAAC,OAAO,EAAE,GAAG,CAAC,EAAE;QACtE,KAAK,KAAK,CAAC,YAAY,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,KAAK,CAAC,SAAS,EAAE,GAAG,CAAC,EAAE;QACrE,KAAK,KAAK,CAAC,SAAS,EAAE,MAAM,CAAC,GAAG,CAAC,SAAS,GAAG,CAAC,KAAK,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE;QAClE,KAAK,KAAK,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,YAAY,GAAG,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE;KAChE,CAAC;IAEF,IAAI,KAAK,CAAC,WAAW,KAAK,SAAS,EAAE,CAAC;QACpC,KAAK,CAAC,IAAI,CAAC,EAAE,EAAE,sBAAsB,GAAG,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;QAC/D,KAAK,CAAC,IAAI,CAAC,sBAAsB,GAAG,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;QAC3D,KAAK,CAAC,IAAI,CAAC,sBAAsB,GAAG,CAAC,KAAK,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC;QAC9D,KAAK,CAAC,IAAI,CAAC,sBAAsB,GAAG,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;IAC7D,CAAC;IAED,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC1B,CAAC;AAED,2BAA2B;AAC3B,SAAS,YAAY,CAAC,MAA8B;IAClD,OAAO,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;SAC1B,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,KAAK,GAAG,KAAK,KAAK,EAAE,CAAC;SAC3C,IAAI,CAAC,IAAI,CAAC,CAAC;AAChB,CAAC;AAED,yBAAyB;AACzB,SAAS,YAAY,CAAC,MAAgB;IACpC,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACxB,OAAO,KAAK,CAAC,iBAAiB,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;IACjD,CAAC;IACD,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAClD,CAAC;AAED,uBAAuB;AACvB,SAAS,cAAc,CAAC,IAA+B;IACrD,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACtB,OAAO,KAAK,CAAC,oBAAoB,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;IACpD,CAAC;IAED,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;QAC7B,MAAM,QAAQ,GACZ,GAAG,CAAC,QAAQ,KAAK,IAAI,IAAI,GAAG,CAAC,QAAQ,KAAK,SAAS;YACjD,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC;YACnB,CAAC,CAAC,SAAS,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC;QACxC,OAAO,KAAK,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,IAAI,CAAC,gBAAgB,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,mBAAmB,QAAQ,qBAAqB,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC;IACnJ,CAAC,CAAC,CAAC;IAEH,OAAO,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AAC5B,CAAC;AAED,0BAA0B;AAC1B,SAAS,aAAa,CAAC,OAAkC;IACvD,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACzB,OAAO,KAAK,CAAC,uBAAuB,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;IACvD,CAAC;IAED,OAAO,OAAO;SACX,GAAG,CACF,CAAC,CAAC,EAAE,EAAE,CACJ,KAAK,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAE,CAAC,CAAC,MAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,CACjI;SACA,IAAI,CAAC,IAAI,CAAC,CAAC;AAChB,CAAC;AAED,2BAA2B;AAC3B,SAAS,cAAc,CAAC,QAAmC;IACzD,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC1B,OAAO,KAAK,CAAC,wBAAwB,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;IACxD,CAAC;IAED,OAAO,QAAQ;SACZ,GAAG,CACF,CAAC,CAAC,EAAE,EAAE,CACJ,KAAK,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,iBAAkB,CAAC,CAAC,MAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CACxG;SACA,IAAI,CAAC,MAAM,CAAC,CAAC;AAClB,CAAC;AAED,sBAAsB;AACtB,SAAS,aAAa,CAAC,IAA+B;IACpD,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACtB,OAAO,KAAK,CAAC,cAAc,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;IAC7C,CAAC;IAED,OAAO,IAAI;SACR,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;QACX,MAAM,EAAE,GAAG,GAAG,CAAC,GAAG,CAAC,KAAK,IAAI,GAAG,CAAC,EAAE,CAAC,CAAC;QACpC,MAAM,QAAQ,GACZ,GAAG,CAAC,QAAQ,KAAK,IAAI,IAAI,GAAG,CAAC,QAAQ,KAAK,SAAS;YACjD,CAAC,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,QAAkB,CAAC,CAAC,WAAW,EAAE;YAChD,CAAC,CAAC,GAAG,CAAC,SAAS;gBACb,CAAC,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,SAAmB,CAAC,CAAC,WAAW,EAAE;gBACjD,CAAC,CAAC,SAAS,CAAC;QAClB,OAAO,KAAK,KAAK,CAAC,EAAE,EAAE,MAAM,CAAC,IAAI,CAAC,gBAAgB,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,gBAAgB,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,EAAE,SAAS,CAAC,EAAE,MAAM,CAAC,GAAG,CAAC,iBAAiB,QAAQ,EAAE,CAAC;IAC1J,CAAC,CAAC;SACD,IAAI,CAAC,MAAM,CAAC,CAAC;AAClB,CAAC;AAED,kBAAkB;AAClB,SAAS,UAAU,CAAC,IAA+B;IACjD,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACtB,OAAO,KAAK,CAAC,eAAe,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;IAC/C,CAAC;IAED,OAAO,IAAI;SACR,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;QACX,MAAM,UAAU,GACd,GAAG,CAAC,KAAK,KAAK,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,KAAK,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC;QACzF,OAAO,MAAM,GAAG,CAAC,SAAS,KAAK,IAAI,IAAI,GAAG,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,SAAmB,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,SAAS,KAAK,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,EAAE,UAAU,CAAC,KAAK,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC;IAC9M,CAAC,CAAC;SACD,IAAI,CAAC,IAAI,CAAC,CAAC;AAChB,CAAC;AAED,uEAAuE;AACvE,SAAS,MAAM,CAAC,QAAiC;IAC/C,IACE,MAAM,IAAI,QAAQ;QAClB,QAAQ,CAAC,IAAI;QACb,OAAO,QAAQ,CAAC,IAAI,KAAK,QAAQ;QACjC,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,EAC7B,CAAC;QACD,OAAO,EAAE,GAAG,QAAQ,EAAE,GAAI,QAAQ,CAAC,IAAgC,EAAE,CAAC;IACxE,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,qFAAqF;AACrF,SAAS,gBAAgB,CAAC,CAA0B,EAAE,OAAe;IACnE,IAAI,KAAK,IAAI,CAAC,EAAE,CAAC;QACf,OAAO,CAAC,CAAC,GAAG,KAAK,IAAI;YACnB,CAAC,CAAC,KAAK,CAAC,kBAAkB,EAAE,MAAM,CAAC,MAAM,CAAC;YAC1C,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GAA8B,CAAC,CAAC;IAClD,CAAC;IACD,IAAI,MAAM,IAAI,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC;QACzC,OAAO,OAAO,KAAK,KAAK;YACtB,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,IAAiC,CAAC;YACpD,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,IAAiC,CAAC,CAAC;IAC3D,CAAC;IACD,qEAAqE;IACrE,IAAI,SAAS,IAAI,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC;QAC/C,OAAO,aAAa,CAAC,CAAC,CAAC,OAAoC,CAAC,CAAC;IAC/D,CAAC;IACD,IAAI,UAAU,IAAI,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC;QACjD,OAAO,cAAc,CAAC,CAAC,CAAC,QAAqC,CAAC,CAAC;IACjE,CAAC;IACD,IAAI,OAAO,IAAI,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC;QAC3C,OAAO,cAAc,CAAC,CAAC,CAAC,KAAkC,CAAC,CAAC;IAC9D,CAAC;IACD,IAAI,UAAU,IAAI,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC;QACjD,OAAO,cAAc,CAAC,CAAC,CAAC,QAAqC,CAAC,CAAC;IACjE,CAAC;IACD,IAAI,SAAS,IAAI,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC;QAC/C,OAAO,aAAa,CAAC,CAAC,CAAC,OAAoC,CAAC,CAAC;IAC/D,CAAC;IACD,IAAI,MAAM,IAAI,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC;QACzC,OAAO,UAAU,CAAC,CAAC,CAAC,IAAiC,CAAC,CAAC;IACzD,CAAC;IACD,IAAI,OAAO,IAAI,CAAC,IAAI,OAAO,CAAC,CAAC,KAAK,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC;QAC3E,OAAO,WAAW,CAAC,CAAC,CAAC,KAAgC,CAAC,CAAC;IACzD,CAAC;IACD,IAAI,QAAQ,IAAI,CAAC,EAAE,CAAC;QAClB,OAAO,YAAY,CAAC,CAAC,CAAC,MAAgC,CAAC,CAAC;IAC1D,CAAC;IACD,IAAI,QAAQ,IAAI,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,UAAU,IAAI,CAAC,CAAC,EAAE,CAAC;QACnE,OAAO,YAAY,CAAC,CAAC,CAAC,MAAkB,CAAC,CAAC;IAC5C,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,wDAAwD;AACxD,SAAS,aAAa,CACpB,QAAiC,EACjC,OAAe,EACf,UAAmB;IAEnB,8FAA8F;IAC9F,MAAM,CAAC,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC;IAE3B,cAAc;IACd,IAAI,IAAI,IAAI,CAAC,IAAI,OAAO,CAAC,CAAC,EAAE,KAAK,QAAQ,IAAI,OAAO,KAAK,MAAM,EAAE,CAAC;QAChE,OAAO,KAAK,CAAC,gBAAgB,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;IACrD,CAAC;IACD,oEAAoE;IACpE,IAAI,KAAK,IAAI,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC;QACvC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC;QACvB,MAAM,MAAM,GAAG,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAChC,IAAI,IAAI,GAAG,UAAU,CAAC;QACtB,IAAI,OAAO,KAAK,MAAM;YAAE,IAAI,GAAG,SAAS,CAAC;aACpC,IAAI,OAAO,KAAK,OAAO,EAAE,CAAC;YAC7B,IAAI,GAAG,UAAU,KAAK,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;QACxD,CAAC;aAAM,IAAI,OAAO,KAAK,KAAK,EAAE,CAAC;YAC7B,IAAI,GAAG,UAAU,KAAK,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,KAAK,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC;QAC7F,CAAC;QACD,OAAO,KAAK,CAAC,GAAG,IAAI,IAAI,CAAC,QAAQ,MAAM,CAAC,CAAC,CAAC,IAAI,GAAG,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;IAChF,CAAC;IAED,8BAA8B;IAC9B,MAAM,UAAU,GAAG,gBAAgB,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;IAChD,IAAI,UAAU,KAAK,IAAI;QAAE,OAAO,UAAU,CAAC;IAE3C,oBAAoB;IACpB,IAAI,UAAU,IAAI,CAAC;QAAE,OAAO,KAAK,CAAC,sBAAsB,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;IACzF,QAAQ;IACR,IAAI,OAAO,IAAI,CAAC;QAAE,OAAO,UAAU,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC;IAClD,oFAAoF;IACpF,IAAI,QAAQ,IAAI,CAAC,EAAE,CAAC;QAClB,IAAI,CAAC,CAAC,MAAM,KAAK,SAAS,IAAI,CAAC,CAAC,MAAM,KAAK,IAAI,EAAE,CAAC;YAChD,OAAO,KAAK,CAAC,+DAA+D,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;QAC/F,CAAC;QACD,OAAO,WAAW,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC;IACxD,CAAC;IACD,WAAW;IACX,IAAI,UAAU,IAAI,CAAC,EAAE,CAAC;QACpB,MAAM,GAAG,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACpD,OAAO,aAAa,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,GAAG,EAAE,CAAC;IAC/C,CAAC;IACD,gBAAgB;IAChB,IAAI,QAAQ,IAAI,CAAC,EAAE,CAAC;QAClB,OAAO,CAAC,CAAC,MAAM;YACb,CAAC,CAAC,KAAK,CAAC,iBAAiB,EAAE,MAAM,CAAC,MAAM,CAAC;YACzC,CAAC,CAAC,KAAK,CAAC,iBAAiB,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;IAC7C,CAAC;IACD,QAAQ;IACR,IAAI,OAAO,IAAI,CAAC;QAAE,OAAO,UAAU,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC;IAClD,8BAA8B;IAC9B,IAAI,SAAS,IAAI,CAAC,IAAI,OAAO,CAAC,CAAC,OAAO,KAAK,QAAQ;QAAE,OAAO,CAAC,CAAC,OAAO,CAAC;IAEtE,OAAO,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;AACnC,CAAC;AAED,4BAA4B;AAC5B,MAAM,UAAU,YAAY,CAC1B,QAAiC,EACjC,OAAe,EACf,MAAe,EACf,UAAmB;IAEnB,IAAI,MAAM,EAAE,CAAC;QACX,OAAO,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;IAC3C,CAAC;IAED,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;QACjB,OAAO,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,EAAE,eAAe,CAAC,EAAE,KAAK,CAAC,CAAC;IAClE,CAAC;IAED,OAAO,aAAa,CAAC,QAAQ,EAAE,OAAO,EAAE,UAAU,CAAC,CAAC;AACtD,CAAC;AAED,2BAA2B;AAC3B,MAAM,UAAU,WAAW,CAAC,OAAe,EAAE,MAAe;IAC1D,IAAI,MAAM,EAAE,CAAC;QACX,OAAO,IAAI,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC;IACvD,CAAC;IACD,OAAO,KAAK,CAAC,UAAU,OAAO,EAAE,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC;AAChD,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wrapper.d.ts","sourceRoot":"","sources":["../../../src/client/sandboxed/wrapper.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAcH;;GAEG;AACH,wBAAsB,mBAAmB,CACvC,SAAS,EAAE,MAAM,EACjB,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"wrapper.d.ts","sourceRoot":"","sources":["../../../src/client/sandboxed/wrapper.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAcH;;GAEG;AACH,wBAAsB,mBAAmB,CACvC,SAAS,EAAE,MAAM,EACjB,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC,MAAM,CAAC,CAoHjB;AAED;;GAEG;AACH,wBAAsB,oBAAoB,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAWpF"}
|
|
@@ -2,9 +2,9 @@
|
|
|
2
2
|
* Worker Wrapper Script Generator
|
|
3
3
|
* Creates the wrapper script that loads processor in worker process
|
|
4
4
|
*/
|
|
5
|
-
import { mkdir, unlink } from 'node:fs/promises';
|
|
5
|
+
import { mkdir, unlink, realpath } from 'node:fs/promises';
|
|
6
6
|
import { closeSync, fsyncSync, openSync, writeSync } from 'node:fs';
|
|
7
|
-
import { join } from 'node:path';
|
|
7
|
+
import { join, normalize } from 'node:path';
|
|
8
8
|
/**
|
|
9
9
|
* Escape a string for safe embedding in a template literal
|
|
10
10
|
* Prevents code injection via backticks or backslashes in paths
|
|
@@ -16,9 +16,38 @@ function escapeForTemplateLiteral(str) {
|
|
|
16
16
|
* Create wrapper script file that loads the processor
|
|
17
17
|
*/
|
|
18
18
|
export async function createWrapperScript(queueName, processorPath) {
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
19
|
+
// Normalize the path so double slashes from callers like
|
|
20
|
+
// `${TMPDIR}/file` (TMPDIR often ends with `/`) don't trip the Worker's
|
|
21
|
+
// import resolver. Then resolve symlinks (e.g. macOS `/var` → `/private/var`)
|
|
22
|
+
// so the import target matches what Bun's module loader will see.
|
|
23
|
+
const normalized = normalize(processorPath.startsWith('/') ? processorPath : `${process.cwd()}/${processorPath}`);
|
|
24
|
+
// Verify the processor file is visible on disk before generating a wrapper
|
|
25
|
+
// that will import it from a Worker thread. On macOS, files written by
|
|
26
|
+
// Bun.write (no fsync) can briefly be invisible to fresh Worker processes,
|
|
27
|
+
// surfacing as ModuleNotFound when the wrapper's top-level await import()
|
|
28
|
+
// runs. Poll briefly with a fast cap to catch the race without slowing
|
|
29
|
+
// the happy path.
|
|
30
|
+
let processorVisible = false;
|
|
31
|
+
for (let i = 0; i < 20; i++) {
|
|
32
|
+
if (await Bun.file(normalized).exists()) {
|
|
33
|
+
processorVisible = true;
|
|
34
|
+
break;
|
|
35
|
+
}
|
|
36
|
+
await Bun.sleep(5);
|
|
37
|
+
}
|
|
38
|
+
if (!processorVisible) {
|
|
39
|
+
throw new Error(`Processor file not visible after polling: ${normalized}`);
|
|
40
|
+
}
|
|
41
|
+
// Resolve symlinks AFTER the existence check so a non-existent file fails
|
|
42
|
+
// with a clear error rather than realpath's ENOENT.
|
|
43
|
+
let fullPath;
|
|
44
|
+
try {
|
|
45
|
+
fullPath = await realpath(normalized);
|
|
46
|
+
}
|
|
47
|
+
catch {
|
|
48
|
+
// realpath can fail in restricted sandboxes; fall back to normalized.
|
|
49
|
+
fullPath = normalized;
|
|
50
|
+
}
|
|
22
51
|
// Escape the path to prevent code injection via backticks or template expressions
|
|
23
52
|
const escapedPath = escapeForTemplateLiteral(fullPath);
|
|
24
53
|
const wrapperCode = `
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wrapper.js","sourceRoot":"","sources":["../../../src/client/sandboxed/wrapper.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"wrapper.js","sourceRoot":"","sources":["../../../src/client/sandboxed/wrapper.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,15 @@
|
|
|
5
5
|
*/
|
|
6
6
|
import { EventEmitter } from 'events';
|
|
7
7
|
import type { ConnectionOptions, ConnectionHealth } from './types';
|
|
8
|
+
/**
|
|
9
|
+
* Sentinel error class for the synthetic rejection issued by close()/rejectAll().
|
|
10
|
+
* Using a dedicated subclass (instead of matching `error.message`) ensures the
|
|
11
|
+
* process-level filter never collides with user code that happens to throw an
|
|
12
|
+
* Error whose message is "Client closed" (Redis, HTTP, DB pool clients all do).
|
|
13
|
+
*/
|
|
14
|
+
export declare class ClientClosedError extends Error {
|
|
15
|
+
constructor(message?: string);
|
|
16
|
+
}
|
|
8
17
|
/**
|
|
9
18
|
* TCP Client - manages connection to bunqueue server
|
|
10
19
|
* Supports pipelining for high-throughput operations
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../src/client/tcp/client.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,KAAK,EAAE,iBAAiB,EAAE,gBAAgB,
|
|
1
|
+
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../src/client/tcp/client.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,46 @@ import { ReconnectManager } from './reconnect';
|
|
|
10
10
|
import { createConnection, CommandQueue } from './connection';
|
|
11
11
|
import { pack, unpack } from 'msgpackr';
|
|
12
12
|
import { FrameParser } from '../../infrastructure/server/protocol';
|
|
13
|
+
/**
|
|
14
|
+
* Sentinel error class for the synthetic rejection issued by close()/rejectAll().
|
|
15
|
+
* Using a dedicated subclass (instead of matching `error.message`) ensures the
|
|
16
|
+
* process-level filter never collides with user code that happens to throw an
|
|
17
|
+
* Error whose message is "Client closed" (Redis, HTTP, DB pool clients all do).
|
|
18
|
+
*/
|
|
19
|
+
export class ClientClosedError extends Error {
|
|
20
|
+
constructor(message = 'Client closed') {
|
|
21
|
+
super(message);
|
|
22
|
+
this.name = 'ClientClosedError';
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
/**
|
|
26
|
+
* One-time installer of a process-level filter that swallows the synthetic
|
|
27
|
+
* ClientClosedError issued by close()/rejectAll(). Catches the rare chained-
|
|
28
|
+
* Promise leak that `cmd.promise?.catch(() => {})` in rejectAll cannot reach
|
|
29
|
+
* (e.g. await-then-throw patterns where the rejection propagates through the
|
|
30
|
+
* awaiter's own Promise chain).
|
|
31
|
+
*
|
|
32
|
+
* Implementation note: the listener is intentionally a no-op for non-matching
|
|
33
|
+
* rejections. process.on('unhandledRejection', fn) calls all registered
|
|
34
|
+
* listeners independently — so existing handlers (e.g. main.ts shutdown
|
|
35
|
+
* handler) still fire for real rejections. We must NOT re-throw here because
|
|
36
|
+
* a throw inside an unhandledRejection listener becomes an uncaughtException,
|
|
37
|
+
* which would interact badly with main.ts's existing uncaughtException
|
|
38
|
+
* handler and cause double-shutdown attempts.
|
|
39
|
+
*/
|
|
40
|
+
let clientClosedFilterInstalled = false;
|
|
41
|
+
function installClientClosedFilter() {
|
|
42
|
+
if (clientClosedFilterInstalled)
|
|
43
|
+
return;
|
|
44
|
+
clientClosedFilterInstalled = true;
|
|
45
|
+
process.on('unhandledRejection', (reason) => {
|
|
46
|
+
if (reason instanceof ClientClosedError) {
|
|
47
|
+
return; // swallow — other listeners (if any) fire independently
|
|
48
|
+
}
|
|
49
|
+
// Non-matching rejection: no-op here. Other registered listeners (or the
|
|
50
|
+
// runtime default per --unhandled-rejections) handle it independently.
|
|
51
|
+
});
|
|
52
|
+
}
|
|
13
53
|
/**
|
|
14
54
|
* TCP Client - manages connection to bunqueue server
|
|
15
55
|
* Supports pipelining for high-throughput operations
|
|
@@ -248,7 +288,9 @@ export class TcpClient extends EventEmitter {
|
|
|
248
288
|
this.health.recordCommandSent();
|
|
249
289
|
const reqId = this.generateReqId();
|
|
250
290
|
const commandWithReqId = { ...command, reqId };
|
|
251
|
-
|
|
291
|
+
// Definite-assignment assertion: assigned synchronously by Promise executor below.
|
|
292
|
+
let pendingRef;
|
|
293
|
+
const promise = new Promise((resolve, reject) => {
|
|
252
294
|
const timeout = setTimeout(() => {
|
|
253
295
|
// Try to remove from in-flight
|
|
254
296
|
const removed = this.commands.removeByReqId(reqId);
|
|
@@ -257,7 +299,7 @@ export class TcpClient extends EventEmitter {
|
|
|
257
299
|
reject(new Error('Command timeout'));
|
|
258
300
|
}
|
|
259
301
|
}, this.options.commandTimeout);
|
|
260
|
-
|
|
302
|
+
pendingRef = {
|
|
261
303
|
id: 0,
|
|
262
304
|
reqId,
|
|
263
305
|
command: commandWithReqId,
|
|
@@ -271,11 +313,13 @@ export class TcpClient extends EventEmitter {
|
|
|
271
313
|
},
|
|
272
314
|
timeout,
|
|
273
315
|
};
|
|
274
|
-
// Add to in-flight tracking
|
|
275
|
-
this.commands.addInFlight(pending);
|
|
276
|
-
// Send immediately
|
|
277
|
-
this.socket?.write(FrameParser.frame(pack(commandWithReqId)));
|
|
278
316
|
});
|
|
317
|
+
// Promise constructor executor is synchronous, so pendingRef is assigned.
|
|
318
|
+
pendingRef.promise = promise;
|
|
319
|
+
this.commands.addInFlight(pendingRef);
|
|
320
|
+
// Send immediately (this.socket null-checked at entry of sendDirect)
|
|
321
|
+
this.socket.write(FrameParser.frame(pack(commandWithReqId)));
|
|
322
|
+
return promise;
|
|
279
323
|
}
|
|
280
324
|
/**
|
|
281
325
|
* Process queued commands
|
|
@@ -313,8 +357,10 @@ export class TcpClient extends EventEmitter {
|
|
|
313
357
|
this.health.recordCommandSent();
|
|
314
358
|
const reqId = this.generateReqId();
|
|
315
359
|
const commandWithReqId = { ...command, reqId };
|
|
316
|
-
|
|
317
|
-
|
|
360
|
+
const id = this.commands.nextId();
|
|
361
|
+
// Definite-assignment assertion: assigned synchronously by Promise executor below.
|
|
362
|
+
let pendingRef;
|
|
363
|
+
const promise = new Promise((resolve, reject) => {
|
|
318
364
|
const timeout = setTimeout(() => {
|
|
319
365
|
// Try to remove from queue first
|
|
320
366
|
if (this.commands.remove(id)) {
|
|
@@ -329,7 +375,7 @@ export class TcpClient extends EventEmitter {
|
|
|
329
375
|
reject(new Error('Command timeout'));
|
|
330
376
|
}
|
|
331
377
|
}, this.options.commandTimeout);
|
|
332
|
-
|
|
378
|
+
pendingRef = {
|
|
333
379
|
id,
|
|
334
380
|
reqId,
|
|
335
381
|
command: commandWithReqId,
|
|
@@ -343,24 +389,31 @@ export class TcpClient extends EventEmitter {
|
|
|
343
389
|
},
|
|
344
390
|
timeout,
|
|
345
391
|
};
|
|
346
|
-
// Add to queue
|
|
347
|
-
this.commands.enqueue(pending);
|
|
348
|
-
// Connect if needed, then process queue
|
|
349
|
-
if (!this.connected && !this.connecting) {
|
|
350
|
-
// Connection errors during send are handled by command timeout/rejection
|
|
351
|
-
this.connect().catch(() => { });
|
|
352
|
-
}
|
|
353
|
-
else if (this.connected) {
|
|
354
|
-
this.processQueue();
|
|
355
|
-
}
|
|
356
392
|
});
|
|
393
|
+
// Promise constructor executor is synchronous, so pendingRef is assigned.
|
|
394
|
+
pendingRef.promise = promise;
|
|
395
|
+
this.commands.enqueue(pendingRef);
|
|
396
|
+
// Connect if needed, then process queue
|
|
397
|
+
if (!this.connected && !this.connecting) {
|
|
398
|
+
// Connection errors during send are handled by command timeout/rejection
|
|
399
|
+
this.connect().catch(() => { });
|
|
400
|
+
}
|
|
401
|
+
else if (this.connected) {
|
|
402
|
+
this.processQueue();
|
|
403
|
+
}
|
|
404
|
+
return promise;
|
|
357
405
|
}
|
|
358
406
|
/** Close connection */
|
|
359
407
|
close() {
|
|
360
408
|
this.reconnect.setClosed(true);
|
|
361
409
|
this.health.stopPing();
|
|
362
410
|
this.reconnect.cancelReconnect();
|
|
363
|
-
|
|
411
|
+
// Install a process-level filter for the synthetic ClientClosedError we
|
|
412
|
+
// are about to issue. Catches the rare case where a caller's .catch() is
|
|
413
|
+
// attached on a chained Promise that our cmd.promise?.catch() cannot
|
|
414
|
+
// reach (await-then-throw patterns).
|
|
415
|
+
installClientClosedFilter();
|
|
416
|
+
this.commands.rejectAll(new ClientClosedError());
|
|
364
417
|
if (this.socket) {
|
|
365
418
|
this.socket.end();
|
|
366
419
|
this.socket = null;
|