onboardconnect-agent 1.1.44 → 1.1.45
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/index.js +40 -23
- package/dist/index.js.map +1 -1
- package/package.json +1 -1
package/dist/index.js
CHANGED
|
@@ -51,30 +51,37 @@ async function ocMain() {
|
|
|
51
51
|
// get connectionId from the exchange-token response). Best-effort: failure
|
|
52
52
|
// is logged and tolerated — UI just won't show connectionId until next try.
|
|
53
53
|
if (!credentials.connectionId) {
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
54
|
+
// Best-effort connectionId backfill — runs FIRE-AND-FORGET with a timeout.
|
|
55
|
+
// Previously this was awaited with no timeout, so a slow/hanging request
|
|
56
|
+
// blocked the entire boot (relay + local UI never started). The value is
|
|
57
|
+
// cosmetic (UI display) and is persisted for the next start; it must never
|
|
58
|
+
// delay startup.
|
|
59
|
+
const credsForBackfill = credentials;
|
|
60
|
+
void (async () => {
|
|
61
|
+
try {
|
|
62
|
+
const httpBase = credsForBackfill.relayUrl
|
|
63
|
+
.replace(/^wss:\/\//i, "https://")
|
|
64
|
+
.replace(/^ws:\/\//i, "http://")
|
|
65
|
+
.replace(/\/relay\/?$/, "");
|
|
66
|
+
const apiBase = httpBase.includes("oc-worker-agent-relay")
|
|
67
|
+
? "https://oc-worker-tenant-api.wpolanco.workers.dev"
|
|
68
|
+
: httpBase;
|
|
69
|
+
const res = await fetch(`${apiBase}/api/tenant/agent/connection-info?agentId=${encodeURIComponent(credsForBackfill.agentId)}`, { headers: { Authorization: `Bearer ${credsForBackfill.agentToken}` }, signal: AbortSignal.timeout(5000) });
|
|
70
|
+
if (res.ok) {
|
|
71
|
+
const data = (await res.json());
|
|
72
|
+
if (data.connectionId) {
|
|
73
|
+
await store.saveCredentials({ ...credsForBackfill, connectionId: data.connectionId });
|
|
74
|
+
logger.info(`Connection ID backfilled (applies on next restart): ${data.connectionId}`);
|
|
75
|
+
}
|
|
76
|
+
}
|
|
77
|
+
else {
|
|
78
|
+
logger.warn(`connection-info fetch returned ${res.status}`);
|
|
69
79
|
}
|
|
70
80
|
}
|
|
71
|
-
|
|
72
|
-
logger.warn(`connection-info fetch
|
|
81
|
+
catch (err) {
|
|
82
|
+
logger.warn(`connection-info fetch failed: ${err instanceof Error ? err.message : String(err)}`);
|
|
73
83
|
}
|
|
74
|
-
}
|
|
75
|
-
catch (err) {
|
|
76
|
-
logger.warn(`connection-info fetch failed: ${err instanceof Error ? err.message : String(err)}`);
|
|
77
|
-
}
|
|
84
|
+
})();
|
|
78
85
|
}
|
|
79
86
|
}
|
|
80
87
|
else {
|
|
@@ -92,9 +99,19 @@ async function ocMain() {
|
|
|
92
99
|
relay.setBlockedByHeartbeat(reason);
|
|
93
100
|
logger.error(`Agent blocked by relay: ${reason}`);
|
|
94
101
|
}, () => relay.paused);
|
|
95
|
-
// Connect to relay only if credentials are present
|
|
102
|
+
// Connect to relay only if credentials are present. NON-BLOCKING and
|
|
103
|
+
// NON-FATAL: a failure here (e.g. corrupt/undecryptable LDAP credentials —
|
|
104
|
+
// "Unsupported state or unable to authenticate data" after a keyfile change)
|
|
105
|
+
// must NOT crash the process or block the local UI. Previously this was
|
|
106
|
+
// awaited, so a decrypt failure rejected ocMain → process.exit(1) → the
|
|
107
|
+
// node-windows restart-death loop, leaving no UI to fix the credentials from.
|
|
96
108
|
if (credentials) {
|
|
97
|
-
|
|
109
|
+
relay.connect().catch((err) => {
|
|
110
|
+
const msg = err instanceof Error ? err.message : String(err);
|
|
111
|
+
logger.error(`Relay connection failed at startup: ${msg}. ` +
|
|
112
|
+
`If this is a credential-decryption error, re-run setup to re-enter credentials. ` +
|
|
113
|
+
`The local agent UI remains available at http://localhost:7432.`);
|
|
114
|
+
});
|
|
98
115
|
heartbeat.start();
|
|
99
116
|
}
|
|
100
117
|
// After UI setup completes, start the relay and heartbeat with new credentials
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAC;AACrC,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACrC,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACrC,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAGvC,MAAM,MAAM,GAAG,IAAI,QAAQ,CAAC,MAAM,CAAC,CAAC;AACpC,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAEnC,iFAAiF;AAEjF,IAAI,UAAU,KAAK,WAAW,EAAE,CAAC;IAC/B,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,MAAM,CAAC,gBAAgB,CAAC,CAAC;IACvD,MAAM,WAAW,EAAE,CAAC;IACpB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC;AAED,iFAAiF;AAEjF,IAAI,UAAU,KAAK,OAAO,EAAE,CAAC;IAC3B,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,MAAM,MAAM,CAAC,YAAY,CAAC,CAAC;IACtD,MAAM,KAAK,EAAE,CAAC;IACd,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC;AAED,iFAAiF;AAEjF,IAAI,UAAU,KAAK,OAAO,EAAE,CAAC;IAC3B,MAAM,KAAK,GAAG,IAAI,OAAO,EAAE,CAAC;IAC5B,MAAM,KAAK,GAAG,MAAM,KAAK,CAAC,WAAW,EAAE,CAAC;IACxC,IAAI,KAAK,EAAE,CAAC;QACV,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAChB,OAAO,CAAC,GAAG,CAAC,0DAA0D,CAAC,CAAC;QACxE,OAAO,CAAC,GAAG,CAAC,0CAA0C,CAAC,CAAC;QACxD,OAAO,CAAC,GAAG,CAAC,KAAK,KAAK,EAAE,CAAC,CAAC;QAC1B,OAAO,CAAC,GAAG,CAAC,0DAA0D,CAAC,CAAC;QACxE,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAClB,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,6DAA6D,CAAC,CAAC;IAC7E,CAAC;IACD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC;AAED,KAAK,UAAU,MAAM;IACnB,MAAM,CAAC,IAAI,CAAC,0CAA0C,CAAC,CAAC;IAExD,+BAA+B;IAC/B,MAAM,OAAO,GAAG,IAAI,SAAS,EAAE,CAAC;IAChC,MAAM,OAAO,CAAC,eAAe,EAAE,CAAC;IAEhC,MAAM,KAAK,GAAG,IAAI,OAAO,EAAE,CAAC;IAC5B,IAAI,WAAW,GAAG,MAAM,KAAK,CAAC,eAAe,EAAE,CAAC;IAEhD,IAAI,WAAW,EAAE,CAAC;QAChB,MAAM,CAAC,IAAI,CAAC,aAAa,WAAW,CAAC,OAAO,EAAE,CAAC,CAAC;QAChD,MAAM,CAAC,IAAI,CAAC,cAAc,WAAW,CAAC,QAAQ,EAAE,CAAC,CAAC;QAElD,0EAA0E;QAC1E,2EAA2E;QAC3E,4EAA4E;QAC5E,IAAI,CAAC,WAAW,CAAC,YAAY,EAAE,CAAC;YAC9B,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|