@origintrail-official/dkg-core 10.0.0 → 10.0.2
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/crypto/canonicalize.d.ts.map +1 -1
- package/dist/crypto/canonicalize.js +6 -1
- package/dist/crypto/canonicalize.js.map +1 -1
- package/dist/crypto/index.d.ts +1 -0
- package/dist/crypto/index.d.ts.map +1 -1
- package/dist/crypto/index.js +1 -0
- package/dist/crypto/index.js.map +1 -1
- package/dist/crypto/term-canon.d.ts +2 -0
- package/dist/crypto/term-canon.d.ts.map +1 -0
- package/dist/crypto/term-canon.js +667 -0
- package/dist/crypto/term-canon.js.map +1 -0
- package/dist/ensure-dkg-node-config.d.ts +27 -0
- package/dist/ensure-dkg-node-config.d.ts.map +1 -1
- package/dist/ensure-dkg-node-config.js +55 -2
- package/dist/ensure-dkg-node-config.js.map +1 -1
- package/dist/errors.d.ts +18 -0
- package/dist/errors.d.ts.map +1 -1
- package/dist/errors.js +21 -0
- package/dist/errors.js.map +1 -1
- package/dist/index.d.ts +7 -3
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +6 -2
- package/dist/index.js.map +1 -1
- package/dist/log-redaction.d.ts +45 -0
- package/dist/log-redaction.d.ts.map +1 -0
- package/dist/log-redaction.js +163 -0
- package/dist/log-redaction.js.map +1 -0
- package/dist/logger.d.ts +18 -2
- package/dist/logger.d.ts.map +1 -1
- package/dist/logger.js +23 -4
- package/dist/logger.js.map +1 -1
- package/dist/proto/index.d.ts +1 -1
- package/dist/proto/index.d.ts.map +1 -1
- package/dist/proto/index.js +1 -1
- package/dist/proto/index.js.map +1 -1
- package/dist/proto/storage-ack.d.ts +9 -0
- package/dist/proto/storage-ack.d.ts.map +1 -1
- package/dist/proto/storage-ack.js +13 -0
- package/dist/proto/storage-ack.js.map +1 -1
- package/dist/protocol-router.d.ts +1 -0
- package/dist/protocol-router.d.ts.map +1 -1
- package/dist/protocol-router.js +20 -0
- package/dist/protocol-router.js.map +1 -1
- package/dist/publisher-extension.d.ts +0 -12
- package/dist/publisher-extension.d.ts.map +1 -1
- package/dist/publisher-extension.js +7 -7
- package/dist/publisher-extension.js.map +1 -1
- package/dist/rdf-literal-size.d.ts +49 -0
- package/dist/rdf-literal-size.d.ts.map +1 -0
- package/dist/rdf-literal-size.js +111 -0
- package/dist/rdf-literal-size.js.map +1 -0
- package/dist/setup-network.d.ts +64 -0
- package/dist/setup-network.d.ts.map +1 -0
- package/dist/setup-network.js +58 -0
- package/dist/setup-network.js.map +1 -0
- package/dist/telemetry-api.d.ts +89 -0
- package/dist/telemetry-api.d.ts.map +1 -0
- package/dist/telemetry-api.js +124 -0
- package/dist/telemetry-api.js.map +1 -0
- package/package.json +4 -1
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"term-canon.js","sourceRoot":"","sources":["../../src/crypto/term-canon.ts"],"names":[],"mappings":"AAAA,gFAAgF;AAChF,+EAA+E;AAC/E,8EAA8E;AAC9E,gFAAgF;AAChF,kFAAkF;AAClF,2EAA2E;AAC3E,sEAAsE;AACtE,6EAA6E;AAC7E,+EAA+E;AAC/E,uCAAuC;AACvC,EAAE;AACF,8EAA8E;AAC9E,0EAA0E;AAC1E,kFAAkF;AAClF,8EAA8E;AAC9E,gCAAgC;AAChC,EAAE;AACF,qEAAqE;AACrE,6EAA6E;AAC7E,iFAAiF;AACjF,mFAAmF;AACnF,gFAAgF;AAChF,EAAE;AACF,uEAAuE;AACvE,4EAA4E;AAC5E,iFAAiF;AACjF,uEAAuE;AACvE,yEAAyE;AACzE,6EAA6E;AAC7E,iFAAiF;AACjF,iFAAiF;AACjF,4EAA4E;AAC5E,0EAA0E;AAC1E,8EAA8E;AAC9E,+EAA+E;AAC/E,2DAA2D;AAC3D,+EAA+E;AAC/E,gFAAgF;AAEhF,MAAM,GAAG,GAAG,mCAAmC,CAAC;AAChD,MAAM,UAAU,GAAG,GAAG,GAAG,QAAQ,CAAC;AAClC,MAAM,WAAW,GAAG,GAAG,GAAG,SAAS,CAAC;AAEpC,MAAM,aAAa,GAAG,IAAI,GAAG,CAC3B;IACE,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;IACzC,oBAAoB,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,iBAAiB;IAChF,cAAc,EAAE,aAAa,EAAE,eAAe,EAAE,cAAc;CAC/D,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,GAAG,CAAC,CAAC,CACtB,CAAC;AACF,MAAM,cAAc,GAAG,IAAI,GAAG,CAC5B,CAAC,UAAU,EAAE,iBAAiB,EAAE,mBAAmB,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,GAAG,CAAC,CAAC,CACzE,CAAC;AAEF,iFAAiF;AACjF,iFAAiF;AACjF,kFAAkF;AAClF,iFAAiF;AACjF,0BAA0B;AAC1B,MAAM,OAAO,GAAG,CAAC,oBAAoB,CAAC;AACtC,MAAM,OAAO,GAAG,oBAAoB,CAAC;AACrC,+EAA+E;AAC/E,kFAAkF;AAClF,iFAAiF;AACjF,MAAM,QAAQ,GAAG,CAAC,CAAC,EAAE,IAAI,IAAI,CAAC,CAAC;AAC/B,MAAM,QAAQ,GAAG,CAAC,EAAE,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC;AACnC,MAAM,SAAS,GAAG,GAAG,IAAI,GAAG,CAAC;AAE7B,iFAAiF;AACjF,kFAAkF;AAClF,+EAA+E;AAC/E,2EAA2E;AAC3E,0EAA0E;AAC1E,+EAA+E;AAC/E,iBAAiB;AACjB,MAAM,UAAU,GAAG,uEAAuE,CAAC;AAE3F,MAAM,UAAU,6BAA6B,CAAC,MAAc;IAC1D,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,IAAI,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,OAAO;QAAE,OAAO,MAAM,CAAC,CAAC,sBAAsB;IACrG,MAAM,CAAC,GAAG,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAClC,IAAI,CAAC,CAAC;QAAE,OAAO,MAAM,CAAC;IACtB,MAAM,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IAClB,4EAA4E;IAC5E,iFAAiF;IACjF,yEAAyE;IACzE,MAAM,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IAC3B,MAAM,EAAE,GAAG,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;IACrE,4EAA4E;IAC5E,uEAAuE;IACvE,MAAM,GAAG,GAAG,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAEpC,IAAI,IAAI,KAAK,SAAS;QAAE,OAAO,IAAI,GAAG,KAAK,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;IAChE,IAAI,EAAE,KAAK,SAAS,IAAI,EAAE,KAAK,UAAU;QAAE,OAAO,IAAI,GAAG,GAAG,CAAC,CAAC,qBAAqB;IAEnF,IAAI,CAAC;QACH,IAAI,aAAa,CAAC,GAAG,CAAC,EAAE,CAAC;YAAE,OAAO,gBAAgB,CAAC,GAAG,CAAC,IAAI,QAAQ,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;QAC7E,IAAI,EAAE,KAAK,GAAG,GAAG,SAAS;YAAE,OAAO,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC;QAC/D,IAAI,EAAE,KAAK,GAAG,GAAG,SAAS;YAAE,OAAO,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC;QAC/D,IAAI,EAAE,KAAK,GAAG,GAAG,QAAQ;YAAE,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;QACpE,IAAI,EAAE,KAAK,GAAG,GAAG,OAAO;YAAE,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;QAClE,IAAI,EAAE,KAAK,GAAG,GAAG,UAAU;YAAE,OAAO,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC;QACjE,IAAI,EAAE,KAAK,GAAG,GAAG,MAAM;YAAE,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC;QACzD,IAAI,EAAE,KAAK,GAAG,GAAG,MAAM;YAAE,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC;QACzD,IAAI,EAAE,KAAK,GAAG,GAAG,OAAO;YAAE,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC;QAC3D,IAAI,EAAE,KAAK,GAAG,GAAG,YAAY;YAAE,OAAO,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC;QACrE,IAAI,EAAE,KAAK,GAAG,GAAG,WAAW;YAAE,OAAO,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC;QACnE,IAAI,EAAE,KAAK,GAAG,GAAG,QAAQ;YAAE,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC;QAC7D,IAAI,EAAE,KAAK,GAAG,GAAG,MAAM;YAAE,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC;QACzD,IAAI,cAAc,CAAC,GAAG,CAAC,EAAE,CAAC;YAAE,OAAO,IAAI,CAAC,aAAa,CAAC,GAAG,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;IACtE,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,QAAQ,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC,4DAA4D;IACxF,CAAC;IACD,OAAO,QAAQ,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC,8CAA8C;AAC1E,CAAC;AAED,8EAA8E;AAC9E,+EAA+E;AAC/E,MAAM,IAAI,GAAG,CAAC,QAAgB,EAAE,EAAU,EAAE,EAAE,CAAC,IAAI,QAAQ,OAAO,EAAE,GAAG,CAAC;AACxE,MAAM,QAAQ,GAAG,CAAC,GAAW,EAAE,EAAU,EAAE,EAAE,CAAC,IAAI,GAAG,OAAO,EAAE,GAAG,CAAC;AAElE,kFAAkF;AAClF,MAAM,aAAa,GAAG,kDAAkD,CAAC;AACzE,SAAS,iBAAiB,CAAC,GAAW;IACpC,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC,KAAK,EAAE,CAAS,EAAE,EAAE;QAC9D,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QACf,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC;YAC3B,MAAM,EAAE,GAAG,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YACpC,yEAAyE;YACzE,2EAA2E;YAC3E,wEAAwE;YACxE,6EAA6E;YAC7E,IAAI,EAAE,GAAG,QAAQ;gBAAE,OAAO,KAAK,CAAC;YAChC,OAAO,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;QAClC,CAAC;QACD,QAAQ,CAAC,EAAE,CAAC;YACV,KAAK,GAAG,CAAC,CAAC,OAAO,IAAI,CAAC;YACtB,KAAK,GAAG,CAAC,CAAC,OAAO,IAAI,CAAC;YACtB,KAAK,GAAG,CAAC,CAAC,OAAO,IAAI,CAAC;YACtB,KAAK,GAAG,CAAC,CAAC,OAAO,IAAI,CAAC;YACtB,KAAK,GAAG,CAAC,CAAC,OAAO,IAAI,CAAC;YACtB,KAAK,GAAG,CAAC,CAAC,OAAO,GAAG,CAAC;YACrB,KAAK,GAAG,CAAC,CAAC,OAAO,GAAG,CAAC;YACrB,KAAK,IAAI,CAAC,CAAC,OAAO,IAAI,CAAC;YACvB,OAAO,CAAC,CAAC,OAAO,KAAK,CAAC;QACxB,CAAC;IACH,CAAC,CAAC,CAAC;IACH,6EAA6E;IAC7E,OAAO,OAAO,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;AACzG,CAAC;AAED,iFAAiF;AACjF,mFAAmF;AACnF,gDAAgD;AAChD,SAAS,gBAAgB,CAAC,GAAW;IACnC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC;QAAE,OAAO,GAAG,CAAC;IACpC,OAAO,GAAG,CAAC,OAAO,CAAC,sCAAsC,EAAE,CAAC,KAAK,EAAE,CAAS,EAAE,EAAE;QAC9E,MAAM,EAAE,GAAG,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QACpC,OAAO,EAAE,GAAG,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;IAC1D,CAAC,CAAC,CAAC;AACL,CAAC;AAED,oFAAoF;AACpF,kFAAkF;AAClF,oFAAoF;AACpF,iFAAiF;AACjF,mFAAmF;AACnF,qFAAqF;AACrF,SAAS,aAAa,CAAC,CAAS,EAAE,CAAS,EAAE,CAAS;IACpD,MAAM,EAAE,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IAChC,MAAM,GAAG,GAAG,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,IAAI,CAAC,GAAG,IAAI,CAAC;IAC/C,MAAM,GAAG,GAAG,EAAE,GAAG,GAAG,GAAG,IAAI,CAAC;IAC5B,MAAM,GAAG,GAAG,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,EAAE,CAAC;IAClE,MAAM,GAAG,GAAG,GAAG,GAAG,IAAI,GAAG,GAAG,GAAG,EAAE,GAAG,GAAG,GAAG,IAAI,GAAG,GAAG,CAAC;IACrD,OAAO,GAAG,GAAG,OAAO,GAAG,GAAG,GAAG,OAAO,CAAC;AACvC,CAAC;AACD,gFAAgF;AAChF,+EAA+E;AAC/E,2EAA2E;AAC3E,qDAAqD;AACrD,SAAS,aAAa,CAAC,GAAW;IAChC,MAAM,CAAC,GAAG,GAAG,GAAG,OAAO,CAAC;IACxB,MAAM,GAAG,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,GAAG,OAAO,CAAC;IAClD,MAAM,GAAG,GAAG,CAAC,GAAG,GAAG,GAAG,OAAO,CAAC,CAAC,cAAc;IAC7C,MAAM,GAAG,GAAG,CAAC,GAAG,GAAG,GAAG,GAAG,KAAK,GAAG,GAAG,GAAG,MAAM,GAAG,GAAG,GAAG,OAAO,CAAC,GAAG,IAAI,CAAC,CAAC,WAAW;IAClF,MAAM,CAAC,GAAG,GAAG,GAAG,GAAG,GAAG,IAAI,CAAC;IAC3B,MAAM,GAAG,GAAG,GAAG,GAAG,CAAC,IAAI,GAAG,GAAG,GAAG,GAAG,GAAG,EAAE,GAAG,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,WAAW;IACnE,MAAM,EAAE,GAAG,CAAC,EAAE,GAAG,GAAG,GAAG,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC,UAAU;IAC7C,MAAM,CAAC,GAAG,GAAG,GAAG,CAAC,IAAI,GAAG,EAAE,GAAG,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC,UAAU;IACtD,MAAM,CAAC,GAAG,EAAE,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,UAAU;IAClD,OAAO,EAAE,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC;AAC3C,CAAC;AAED,kFAAkF;AAClF,mFAAmF;AACnF,kFAAkF;AAClF,oEAAoE;AACpE,SAAS,mBAAmB,CAC1B,CAAS,EACT,EAAU,EACV,CAAS,EACT,SAAiB;IAEjB,MAAM,IAAI,GAAG,aAAa,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC;IAClF,OAAO,aAAa,CAAC,IAAI,CAAC,CAAC;AAC7B,CAAC;AAED,SAAS,eAAe,CAAC,OAAe,EAAE,EAAU,EAAE,EAAU,EAAE,EAAE,GAAG,CAAC,EAAE,EAAE,GAAG,CAAC,EAAE,EAAE,GAAG,CAAC;IACtF,MAAM,OAAO,GACX,CAAC,aAAa,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC,GAAG,OAAO,CAAC,GAAG,MAAM;QAC3E,MAAM,CAAC,EAAE,CAAC,GAAG,KAAK,GAAG,MAAM,CAAC,EAAE,CAAC,GAAG,GAAG,GAAG,MAAM,CAAC,EAAE,CAAC,CAAC;IACrD,MAAM,MAAM,GAAG,OAAO,GAAG,SAAS,CAAC;IACnC,OAAO,MAAM,IAAI,QAAQ,IAAI,MAAM,IAAI,QAAQ,CAAC;AAClD,CAAC;AAED,kFAAkF;AAClF,SAAS,gBAAgB,CAAC,GAAW;IACnC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC;QAAE,OAAO,IAAI,CAAC,CAAK,0CAA0C;IACxF,MAAM,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC,CAAM,+BAA+B;IAC9E,IAAI,CAAC,GAAG,OAAO,IAAI,CAAC,GAAG,OAAO;QAAE,OAAO,IAAI,CAAC,CAAG,gDAAgD;IAC/F,OAAO,IAAI,CAAC,CAAC,QAAQ,EAAE,OAAO,WAAW,GAAG,CAAC;AAC/C,CAAC;AAED,kFAAkF;AAClF,SAAS,YAAY,CAAC,GAAW;IAC/B,IAAI,GAAG,KAAK,MAAM,IAAI,GAAG,KAAK,GAAG;QAAE,OAAO,MAAM,CAAC;IACjD,IAAI,GAAG,KAAK,OAAO,IAAI,GAAG,KAAK,GAAG;QAAE,OAAO,OAAO,CAAC;IACnD,MAAM,IAAI,KAAK,CAAC,wBAAwB,GAAG,EAAE,CAAC,CAAC;AACjD,CAAC;AAED,kFAAkF;AAClF,SAAS,YAAY,CAAC,GAAW;IAC/B,MAAM,CAAC,GAAG,4BAA4B,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACjD,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,SAAS,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,wBAAwB,GAAG,EAAE,CAAC,CAAC;IAC/G,MAAM,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IACvC,MAAM,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IAC7C,+EAA+E;IAC/E,iFAAiF;IACjF,iEAAiE;IACjE,IAAI,IAAI,CAAC,MAAM,GAAG,EAAE;QAAE,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;IAC/D,MAAM,MAAM,GAAG,MAAM,CAAC,CAAC,MAAM,IAAI,GAAG,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC,CAAC;IAC9D,MAAM,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC;IAC/C,IAAI,MAAM,GAAG,QAAQ,IAAI,MAAM,GAAG,QAAQ;QAAE,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;IACzF,MAAM,GAAG,GAAG,MAAM,KAAK,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC;IACzC,MAAM,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG,IAAI,CAAC,CAAC,GAAG,KAAK,GAAG,IAAI,IAAI,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;IACtE,OAAO,IAAI,KAAK,EAAE,CAAC,CAAC,CAAC,GAAG,IAAI,GAAG,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,IAAI,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;AACjE,CAAC;AAED,kFAAkF;AAClF,SAAS,WAAW,CAAC,GAAW,EAAE,OAAgB;IAChD,IAAI,CAAC,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC;IAC5B,IAAI,OAAO;QAAE,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IAChC,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;QAAE,OAAO,KAAK,CAAC;IAClC,IAAI,CAAC,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC;IACjC,IAAI,CAAC,KAAK,CAAC,QAAQ;QAAE,OAAO,MAAM,CAAC;IACnC,4EAA4E;IAC5E,iFAAiF;IACjF,kFAAkF;IAClF,8EAA8E;IAC9E,IAAI,CAAC,KAAK,CAAC;QAAE,OAAO,GAAG,CAAC;IACxB,MAAM,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC;IAClB,MAAM,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IACtB,2EAA2E;IAC3E,0EAA0E;IAC1E,MAAM,QAAQ,GAAG,OAAO,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,EAAE,CAAC,CAAC,QAAQ,EAAE,EAAE,KAAK,CAAC,CAAC;IACpG,MAAM,KAAK,GAAG,oBAAoB,CAAC,QAAQ,CAAC,CAAC;IAC7C,OAAO,GAAG,CAAC,CAAC,CAAC,IAAI,KAAK,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC;AACnC,CAAC;AAED,iFAAiF;AACjF,oFAAoF;AACpF,8EAA8E;AAC9E,+EAA+E;AAC/E,sEAAsE;AACtE,SAAS,qBAAqB,CAAC,CAAS,EAAE,QAAgB,EAAE,OAAgB;IAC1E,MAAM,CAAC,GAAG,wCAAwC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAClE,IAAI,CAAC,CAAC;QAAE,OAAO,QAAQ,CAAC;IACxB,MAAM,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;IACnC,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC;IACzB,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,mBAAmB;IACzF,MAAM,EAAE,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,4DAA4D;IAC/E,MAAM,EAAE,GAAG,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACzD,IAAI,EAAE,CAAC,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC;QAAE,OAAO,QAAQ,CAAC,CAAC,2CAA2C;IAChG,iFAAiF;IACjF,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;IAClC,IAAI,GAAG,GAAG,EAAE,GAAG,GAAG,CAAC;IACnB,IAAI,GAAG,GAAG,CAAC,EAAE,GAAG,CAAC,GAAG,EAAE,CAAC,GAAG,GAAG,CAAC;IAC9B,IAAI,CAAC,IAAI,CAAC;QAAE,GAAG,IAAI,GAAG,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC;;QAC/B,GAAG,IAAI,GAAG,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;IAC9B,OAAO,GAAG,KAAK,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC;AAC/C,CAAC;AAED,+EAA+E;AAC/E,SAAS,WAAW,CAAC,CAAS;IAC5B,MAAM,EAAE,GAAG,IAAI,QAAQ,CAAC,IAAI,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;IAC5C,EAAE,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IACpB,MAAM,IAAI,GAAG,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;IAChC,MAAM,GAAG,GAAG,MAAM,CAAC,CAAC,IAAI,IAAI,GAAG,CAAC,GAAG,MAAM,CAAC,CAAC;IAC3C,MAAM,QAAQ,GAAG,IAAI,GAAG,gBAAgB,CAAC;IACzC,MAAM,IAAI,GAAG,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,GAAG,CAAC,EAAE,IAAI,GAAG,CAAC,CAAC;IAC3D,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,GAAG,IAAI,CAAC,CAAC;IAC3C,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACrE,CAAC;AAED,SAAS,cAAc,CAAC,GAAW;IACjC,8EAA8E;IAC9E,2EAA2E;IAC3E,gFAAgF;IAChF,mEAAmE;IACnE,IAAI,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC;QAAE,OAAO,GAAG,CAAC;IACxC,IAAI,mBAAmB,CAAC,IAAI,CAAC,GAAG,CAAC;QAAE,OAAO,QAAQ,CAAC;IACnD,IAAI,iBAAiB,CAAC,IAAI,CAAC,GAAG,CAAC;QAAE,OAAO,CAAC,QAAQ,CAAC;IAClD,IAAI,CAAC,2CAA2C,CAAC,IAAI,CAAC,GAAG,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,uBAAuB,GAAG,EAAE,CAAC,CAAC;IAC1G,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC;AACrB,CAAC;AAED,oFAAoF;AACpF,iFAAiF;AACjF,mFAAmF;AACnF,gFAAgF;AAChF,8EAA8E;AAC9E,gFAAgF;AAChF,mFAAmF;AACnF,SAAS,qBAAqB,CAAC,CAAS;IACtC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;QAC5B,MAAM,CAAC,GAAG,8BAA8B,CAAC,IAAI,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QACtE,IAAI,CAAC,CAAC;YAAE,MAAM;QACd,MAAM,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,uBAAuB;QACzD,MAAM,GAAG,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,wBAAwB;QAClE,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;QAC1B,MAAM,KAAK,GAAa,EAAE,CAAC;QAC3B,KAAK,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,GAAG,EAAE,EAAE,IAAI,GAAG,EAAE,CAAC,EAAE,CAAC;YAC7C,IAAI,CAAC,IAAI,EAAE;gBAAE,SAAS;YACtB,MAAM,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,IAAI,GAAG,EAAE,CAAC,CAAC;YAChC,IAAI,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC;gBAAE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC1C,CAAC;QACD,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;YACjB,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,gCAAgC;YAClG,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;QAC7B,CAAC;IACH,CAAC;IACD,OAAO,CAAC,CAAC,QAAQ,EAAE,CAAC;AACtB,CAAC;AAED,SAAS,oBAAoB,CAAC,CAAS;IACrC,MAAM,CAAC,GAAG,mCAAmC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACtD,IAAI,CAAC,CAAC;QAAE,OAAO,CAAC,CAAC;IACjB,MAAM,OAAO,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IACrB,MAAM,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;IACxB,MAAM,GAAG,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IAC/B,MAAM,MAAM,GAAG,OAAO,GAAG,IAAI,CAAC;IAC9B,MAAM,QAAQ,GAAG,OAAO,CAAC,MAAM,GAAG,GAAG,CAAC;IACtC,IAAI,QAAQ,IAAI,CAAC;QAAE,OAAO,kBAAkB,CAAC,KAAK,GAAG,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,GAAG,MAAM,EAAE,CAAC,CAAC;IACpF,IAAI,QAAQ,IAAI,MAAM,CAAC,MAAM;QAAE,OAAO,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC;IACpF,OAAO,kBAAkB,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;AACtF,CAAC;AAED,SAAS,kBAAkB,CAAC,CAAS;IACnC,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC;QAAE,OAAO,CAAC,CAAC;IAC/B,OAAO,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;AACjD,CAAC;AAED,kFAAkF;AAClF,2DAA2D;AAC3D,8EAA8E;AAC9E,8EAA8E;AAC9E,6EAA6E;AAC7E,sDAAsD;AACtD,SAAS,eAAe,CAAC,CAAS;IAChC,MAAM,CAAC,GAAG,sBAAsB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACzC,IAAI,CAAC,CAAC;QAAE,OAAO,EAAE,IAAI,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;IACvD,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IAChB,MAAM,IAAI,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,MAAM,GAAG,EAAE,CAAC,MAAM,CAAC,CAAC;IAC9C,IAAI,EAAE,KAAK,GAAG;QAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;IAC3D,MAAM,CAAC,GAAG,QAAQ,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IACvC,MAAM,EAAE,GAAG,QAAQ,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IACxC,IAAI,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,GAAG;QAAE,MAAM,IAAI,KAAK,CAAC,eAAe,EAAE,EAAE,CAAC,CAAC;IACvE,MAAM,GAAG,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC;IACxB,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;AACtE,CAAC;AAED,kFAAkF;AAClF,kFAAkF;AAClF,iFAAiF;AACjF,+DAA+D;AAC/D,SAAS,QAAQ,CAAC,IAAwB;IACxC,IAAI,IAAI,KAAK,SAAS;QAAE,OAAO,EAAE,CAAC;IAClC,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC,8CAA8C;IAC7F,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC;AACjC,CAAC;AAED,kFAAkF;AAClF,2CAA2C;AAC3C,SAAS,UAAU,CAAC,OAAe;IACjC,MAAM,CAAC,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC;IAC1B,OAAO,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,IAAI,CAAC,GAAG,IAAI,KAAK,EAAE,CAAC,IAAI,CAAC,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/D,CAAC;AACD,SAAS,WAAW,CAAC,OAAe,EAAE,EAAU;IAC9C,OAAO,CAAC,EAAE,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;AAC7F,CAAC;AACD,+EAA+E;AAC/E,kFAAkF;AAClF,SAAS,WAAW,CAAC,OAAe,EAAE,EAAU,EAAE,EAAU;IAC1D,IAAI,EAAE,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC;IACzB,IAAI,GAAG,GAAG,EAAE,CAAC;IACb,IAAI,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;IAChB,IAAI,EAAE,GAAG,WAAW,CAAC,OAAO,EAAE,EAAE,CAAC,EAAE,CAAC;QAClC,EAAE,GAAG,CAAC,CAAC;QACP,GAAG,IAAI,CAAC,CAAC;QACT,IAAI,GAAG,GAAG,EAAE,EAAE,CAAC;YAAC,GAAG,GAAG,CAAC,CAAC;YAAC,EAAE,IAAI,EAAE,CAAC;QAAC,CAAC;IACtC,CAAC;IACD,OAAO,GAAG,OAAO,CAAC,EAAE,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC;AACnD,CAAC;AACD,SAAS,OAAO,CAAC,CAAS;IACxB,MAAM,GAAG,GAAG,CAAC,GAAG,EAAE,CAAC;IACnB,MAAM,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IACvD,OAAO,GAAG,CAAC,CAAC,CAAC,IAAI,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC;AAC/B,CAAC;AACD,MAAM,IAAI,GAAG,CAAC,CAAS,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;AAEvD,iFAAiF;AACjF,4EAA4E;AAC5E,+EAA+E;AAC/E,gDAAgD;AAChD,SAAS,aAAa,CAAC,EAAU,EAAE,EAAU,EAAE,EAAU,EAAE,QAAgB;IACzE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE;QAAE,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;IACzE,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC;QACd,MAAM,OAAO,GAAG,EAAE,KAAK,CAAC,IAAI,QAAQ,KAAK,EAAE,CAAC;QAC5C,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,OAAO;YAAE,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;QAC7D,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;IACzB,CAAC;IACD,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;AAC1B,CAAC;AAED,gFAAgF;AAChF,iFAAiF;AACjF,+EAA+E;AAC/E,mFAAmF;AACnF,mFAAmF;AACnF,+EAA+E;AAC/E,MAAM,IAAI,GAAG,WAAW,CAAC;AAEzB,gFAAgF;AAChF,+EAA+E;AAC/E,8EAA8E;AAC9E,yEAAyE;AACzE,mCAAmC;AACnC,SAAS,aAAa,CAAC,GAAW;IAChC,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC;IACjD,MAAM,CAAC,GAAG,IAAI,MAAM,CAAC,KAAK,IAAI,2DAA2D,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACtG,IAAI,CAAC,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;IAChD,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;IAC3C,MAAM,GAAG,GAAG,CAAC,EAAE,CAAC;IAChB,MAAM,GAAG,GAAG,CAAC,EAAE,CAAC;IAChB,IAAI,GAAG,GAAG,CAAC,IAAI,GAAG,GAAG,EAAE;QAAE,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;IAClD,IAAI,GAAG,GAAG,CAAC,IAAI,GAAG,GAAG,WAAW,CAAC,EAAE,EAAE,GAAG,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC;IAClE,MAAM,QAAQ,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;IAChC,MAAM,EAAE,KAAK,EAAE,GAAG,aAAa,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;IACzD,mFAAmF;IACnF,IAAI,IAAI,GAAG,aAAa,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;IAC/D,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAC9B,IAAI,KAAK;QAAE,IAAI,IAAI,EAAE,CAAC;IACtB,2EAA2E;IAC3E,MAAM,QAAQ,GAAG,KAAK,GAAG,EAAE,GAAG,CAAC,EAAE,GAAG,SAAS,CAAC;IAC9C,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,GAAG,IAAI,CAAC,CAAC,CAAC;IAC5C,MAAM,QAAQ,GAAG,CAAC,CAAC,QAAQ,GAAG,IAAI,CAAC,GAAG,IAAI,CAAC,GAAG,IAAI,CAAC;IACnD,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC;IAC5C,kFAAkF;IAClF,gFAAgF;IAChF,+EAA+E;IAC/E,qEAAqE;IACrE,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,QAAQ,EAAE,EAAE,MAAM,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,QAAQ,GAAG,EAAE,CAAC,EAAE,QAAQ,GAAG,EAAE,EAAE,CAAC,EAAE,CAAC;QACtG,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAC;IAChE,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,GAAG,EAAE,CAAC,CAAC,IAAI,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC,IAAI,EAAE,GAAG,QAAQ,GAAG,CAAC;AAC5I,CAAC;AAED,iFAAiF;AACjF,sCAAsC;AACtC,SAAS,SAAS,CAAC,GAAW;IAC5B,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC;IACjD,MAAM,CAAC,GAAG,mCAAmC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACzD,IAAI,CAAC,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;IAC5C,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;IAC/B,MAAM,QAAQ,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;IAChC,MAAM,EAAE,KAAK,EAAE,GAAG,aAAa,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;IACzD,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAC9B,MAAM,QAAQ,GAAG,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE,GAAG,CAAC,EAAE,GAAG,SAAS,CAAC,GAAG,IAAI,CAAC,GAAG,IAAI,CAAC,GAAG,IAAI,CAAC;IACzE,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,GAAG,EAAE,CAAC,CAAC,IAAI,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC,IAAI,EAAE,GAAG,QAAQ,GAAG,CAAC;AACvF,CAAC;AAED,wEAAwE;AACxE,sEAAsE;AACtE,SAAS,SAAS,CAAC,GAAW;IAC5B,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC;IACjD,MAAM,CAAC,GAAG,IAAI,MAAM,CAAC,KAAK,IAAI,sBAAsB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACjE,IAAI,CAAC,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;IAC5C,MAAM,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAClB,MAAM,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAClB,IAAI,GAAG,GAAG,CAAC,IAAI,GAAG,GAAG,EAAE;QAAE,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;IAClD,IAAI,GAAG,GAAG,CAAC,IAAI,GAAG,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC;IACpE,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,GAAG,mBAAmB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,GAAG,CAAC,EAAE,SAAS,CAAC,CAAC;IAC/F,8FAA8F;IAC9F,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,QAAQ,EAAE,EAAE,MAAM,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;IACrH,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;AAChE,CAAC;AAED,SAAS,UAAU,CAAC,GAAW;IAC7B,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC;IACjD,IAAI,CAAC,IAAI,MAAM,CAAC,IAAI,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;IAC9E,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,GAAG,mBAAmB,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,SAAS,CAAC,CAAC;IAC7E,uFAAuF;IACvF,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,QAAQ,EAAE,EAAE,MAAM,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAC;IACtH,OAAO,OAAO,CAAC,CAAC,CAAC,CAAC;AACpB,CAAC;AAED,SAAS,eAAe,CAAC,GAAW;IAClC,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC;IACjD,MAAM,CAAC,GAAG,IAAI,MAAM,CAAC,KAAK,IAAI,aAAa,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACxD,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE;QAAE,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;IAC7E,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,GAAG,mBAAmB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,SAAS,CAAC,CAAC;IACxF,0EAA0E;IAC1E,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,QAAQ,EAAE,EAAE,MAAM,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;IAC3H,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;AAC7C,CAAC;AAED,4EAA4E;AAC5E,gFAAgF;AAChF,0EAA0E;AAC1E,MAAM,aAAa,GAAG,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;AACvE,8EAA8E;AAC9E,gFAAgF;AAChF,gFAAgF;AAChF,6EAA6E;AAC7E,+EAA+E;AAC/E,oFAAoF;AACpF,mFAAmF;AACnF,+EAA+E;AAC/E,SAAS,aAAa,CAAC,GAAW,EAAE,EAAU,EAAE,QAAyC;IACvF,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC;IACjD,MAAM,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACxB,IAAI,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;IAClE,OAAO,SAAS,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,+CAA+C;AACtF,CAAC;AACD,SAAS,cAAc,CAAC,GAAW;IACjC,OAAO,aAAa,CAAC,GAAG,EAAE,qBAAqB,EAAE,CAAC,CAAC,EAAE,EAAE;QACrD,MAAM,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAClB,MAAM,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAClB,OAAO,GAAG,IAAI,CAAC,IAAI,GAAG,IAAI,EAAE,IAAI,GAAG,IAAI,CAAC,IAAI,GAAG,IAAI,aAAa,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC;IAC5E,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,WAAW,CAAC,GAAW;IAC9B,OAAO,aAAa,CAAC,GAAG,EAAE,aAAa,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;AAC7E,CAAC;AAED,SAAS,SAAS,CAAC,GAAW;IAC5B,OAAO,aAAa,CAAC,GAAG,EAAE,cAAc,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;AAC9E,CAAC;AAED,kFAAkF;AAClF,8EAA8E;AAC9E,gFAAgF;AAChF,6EAA6E;AAC7E,wEAAwE;AACxE,oFAAoF;AACpF,mEAAmE;AACnE,MAAM,WAAW,GACf,iGAAiG,CAAC;AACpG,SAAS,aAAa,CAAC,GAAW,EAAE,EAAU;IAC5C,MAAM,CAAC,GAAG,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAChC,IAAI,CAAC,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,qBAAqB,GAAG,EAAE,CAAC,CAAC;IACpD,MAAM,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;IAC1C,IAAI,CAAC,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,IAAI;QAAE,MAAM,IAAI,KAAK,CAAC,gBAAgB,CAAC,CAAC,CAAC,aAAa;IAE3F,MAAM,IAAI,GAAG,EAAE,KAAK,GAAG,GAAG,mBAAmB,CAAC;IAC9C,MAAM,IAAI,GAAG,EAAE,KAAK,GAAG,GAAG,iBAAiB,CAAC;IAC5C,qFAAqF;IACrF,IAAI,IAAI,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,IAAI,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC;IAC7F,IAAI,IAAI,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC;IAEhF,6EAA6E;IAC7E,iFAAiF;IACjF,IAAI,MAAM,GAAG,GAAG,CAAC;IACjB,IAAI,UAAU,GAAG,EAAE,CAAC;IACpB,IAAI,IAAI,EAAE,CAAC;QACT,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAC9B,IAAI,GAAG,KAAK,CAAC,CAAC,EAAE,CAAC;YACf,MAAM,GAAG,IAAI,CAAC;QAChB,CAAC;aAAM,CAAC;YACN,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,IAAI,GAAG,CAAC;YACnC,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;YAC1D,IAAI,UAAU,CAAC,MAAM,GAAG,EAAE;gBAAE,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;YACjE,UAAU,GAAG,UAAU,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC,CAAC;QAC3E,CAAC;IACH,CAAC;IAED,MAAM,MAAM,GAAG,GAAG,GAAG,MAAM,CAAC,CAAC,IAAI,GAAG,CAAC,GAAG,MAAM,CAAC,EAAE,IAAI,GAAG,CAAC,CAAC;IAC1D,MAAM,YAAY,GAChB,MAAM,GAAG,MAAM,CAAC,CAAC,IAAI,GAAG,CAAC,GAAG,KAAK,GAAG,MAAM,CAAC,CAAC,IAAI,GAAG,CAAC,GAAG,GAAG,GAAG,MAAM,CAAC,EAAE,IAAI,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC;IAClG,MAAM,aAAa,GAAG,YAAY,GAAG,SAAS,GAAG,UAAU,CAAC;IAE5D,wEAAwE;IACxE,MAAM,GAAG,GAAG,IAAI,KAAK,GAAG,CAAC;IACzB,MAAM,YAAY,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC;IAC5C,MAAM,YAAY,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,aAAa,CAAC;IAC1D,IAAI,YAAY,GAAG,OAAO,IAAI,YAAY,GAAG,OAAO;QAAE,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC;IAC7F,IAAI,YAAY,GAAG,QAAQ,IAAI,YAAY,GAAG,QAAQ;QAAE,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;IAEjG,sEAAsE;IACtE,MAAM,EAAE,GAAG,MAAM,GAAG,GAAG,CAAC;IACxB,MAAM,EAAE,GAAG,MAAM,GAAG,GAAG,CAAC;IACxB,MAAM,UAAU,GAAG,aAAa,GAAG,SAAS,CAAC;IAC7C,MAAM,OAAO,GAAG,aAAa,GAAG,SAAS,CAAC;IAC1C,MAAM,CAAC,GAAG,UAAU,GAAG,MAAM,CAAC;IAC9B,IAAI,GAAG,GAAG,UAAU,GAAG,MAAM,CAAC;IAC9B,MAAM,CAAC,GAAG,GAAG,GAAG,KAAK,CAAC;IACtB,GAAG,IAAI,KAAK,CAAC;IACb,MAAM,GAAG,GAAG,GAAG,GAAG,GAAG,CAAC;IACtB,MAAM,CAAC,GAAG,GAAG,GAAG,GAAG,CAAC;IAEpB,IAAI,IAAI,GAAG,EAAE,CAAC;IACd,IAAI,EAAE,GAAG,EAAE;QAAE,IAAI,IAAI,GAAG,EAAE,GAAG,CAAC;IAC9B,IAAI,EAAE,GAAG,EAAE;QAAE,IAAI,IAAI,GAAG,EAAE,GAAG,CAAC;IAC9B,IAAI,CAAC,GAAG,EAAE;QAAE,IAAI,IAAI,GAAG,CAAC,GAAG,CAAC;IAC5B,IAAI,IAAI,GAAG,EAAE,CAAC;IACd,IAAI,CAAC,GAAG,EAAE;QAAE,IAAI,IAAI,GAAG,CAAC,GAAG,CAAC;IAC5B,IAAI,GAAG,GAAG,EAAE;QAAE,IAAI,IAAI,GAAG,GAAG,GAAG,CAAC;IAChC,IAAI,CAAC,GAAG,EAAE,IAAI,OAAO,GAAG,EAAE,EAAE,CAAC;QAC3B,MAAM,OAAO,GAAG,OAAO,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,EAAE,CAAC;QACpG,IAAI,IAAI,GAAG,CAAC,GAAG,OAAO,GAAG,CAAC;IAC5B,CAAC;IACD,MAAM,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;IAC7C,2EAA2E;IAC3E,uCAAuC;IACvC,IAAI,IAAI,KAAK,EAAE;QAAE,OAAO,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC;IAC9C,OAAO,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,IAAI,IAAI,EAAE,CAAC;AACrC,CAAC"}
|
|
@@ -29,6 +29,24 @@
|
|
|
29
29
|
* Logging: keeps the `[setup] ...` console.log prefix verbatim so
|
|
30
30
|
* user-visible output is unchanged from pre-extraction.
|
|
31
31
|
*/
|
|
32
|
+
/**
|
|
33
|
+
* Read the persisted `networkConfig` selector from a node's home directory,
|
|
34
|
+
* honoring BOTH `config.json` and `config.yaml`. A present, parseable
|
|
35
|
+
* `config.json` is authoritative (its `networkConfig`, or `undefined` if
|
|
36
|
+
* unset — `config.yaml` is not consulted); `config.yaml` is read only when
|
|
37
|
+
* `config.json` is absent. Returns `undefined` when no config exists or
|
|
38
|
+
* `networkConfig` is unset/blank.
|
|
39
|
+
*
|
|
40
|
+
* NOTE: on a CORRUPT `config.json` this falls through to `config.yaml`
|
|
41
|
+
* (best-effort), whereas the daemon's `loadConfig` re-throws and refuses to
|
|
42
|
+
* boot — harmless divergence since a corrupt config.json makes the node
|
|
43
|
+
* unbootable, so the resolved name is moot.
|
|
44
|
+
*
|
|
45
|
+
* Setup flows use this (not a json-only read) so a YAML-only node's network
|
|
46
|
+
* is correctly identified and not mis-resolved to the legacy testnet fallback
|
|
47
|
+
* (which would misfire the testnet faucet against a mainnet node).
|
|
48
|
+
*/
|
|
49
|
+
export declare function readPersistedNetworkConfigName(home: string): string | undefined;
|
|
32
50
|
/**
|
|
33
51
|
* The fields of `network/<env>.json` that `ensureDkgNodeConfig` actually
|
|
34
52
|
* reads. Adapters can pass their full `NetworkConfig` shape — the helper
|
|
@@ -59,6 +77,15 @@ export interface EnsureDkgNodeConfigOptions {
|
|
|
59
77
|
agentName: string;
|
|
60
78
|
/** Loaded `network/<env>.json` slice. */
|
|
61
79
|
network: DkgNodeNetworkConfig;
|
|
80
|
+
/**
|
|
81
|
+
* The network overlay name to persist as `config.networkConfig` (e.g.
|
|
82
|
+
* `'mainnet-gnosis'`). Callers resolve this via `resolveSetupNetworkName`
|
|
83
|
+
* and MUST load `network` from the SAME name so the persisted selector and
|
|
84
|
+
* the network slice agree. Persisting it explicitly is what makes setup
|
|
85
|
+
* default new nodes onto mainnet without relying on (or mutating) the
|
|
86
|
+
* `project.json#defaultNetwork` runtime fallback.
|
|
87
|
+
*/
|
|
88
|
+
networkConfigName: string;
|
|
62
89
|
/** Daemon API port to use when no existing config has one. */
|
|
63
90
|
apiPort: number;
|
|
64
91
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ensure-dkg-node-config.d.ts","sourceRoot":"","sources":["../src/ensure-dkg-node-config.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;
|
|
1
|
+
{"version":3,"file":"ensure-dkg-node-config.d.ts","sourceRoot":"","sources":["../src/ensure-dkg-node-config.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AAUH;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,8BAA8B,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAuB/E;AAUD;;;;GAIG;AACH,MAAM,WAAW,oBAAoB;IACnC,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAC;IAChC,UAAU,CAAC,EAAE;QACX,OAAO,EAAE,OAAO,CAAC;QACjB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;KACxB,CAAC;CACH;AAED;;;;GAIG;AACH,MAAM,WAAW,sBAAsB;IACrC,mDAAmD;IACnD,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,mDAAmD;IACnD,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB;AAED,MAAM,WAAW,0BAA0B;IACzC,kDAAkD;IAClD,SAAS,EAAE,MAAM,CAAC;IAClB,yCAAyC;IACzC,OAAO,EAAE,oBAAoB,CAAC;IAC9B;;;;;;;OAOG;IACH,iBAAiB,EAAE,MAAM,CAAC;IAC1B,8DAA8D;IAC9D,OAAO,EAAE,MAAM,CAAC;IAChB;;;;;;;;;;;OAWG;IACH,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC9B,SAAS,CAAC,EAAE,sBAAsB,CAAC;CACpC;AAED;;;;;GAKG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,0BAA0B,GAAG,IAAI,CA6E1E"}
|
|
@@ -29,11 +29,58 @@
|
|
|
29
29
|
* Logging: keeps the `[setup] ...` console.log prefix verbatim so
|
|
30
30
|
* user-visible output is unchanged from pre-extraction.
|
|
31
31
|
*/
|
|
32
|
-
import { existsSync, mkdirSync, writeFileSync } from 'node:fs';
|
|
32
|
+
import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs';
|
|
33
33
|
import { dirname, join } from 'node:path';
|
|
34
34
|
import { fileURLToPath } from 'node:url';
|
|
35
|
+
import yaml from 'js-yaml';
|
|
35
36
|
import { resolveDkgConfigHome } from './dkg-home.js';
|
|
36
37
|
const __dirname = dirname(fileURLToPath(import.meta.url));
|
|
38
|
+
/**
|
|
39
|
+
* Read the persisted `networkConfig` selector from a node's home directory,
|
|
40
|
+
* honoring BOTH `config.json` and `config.yaml`. A present, parseable
|
|
41
|
+
* `config.json` is authoritative (its `networkConfig`, or `undefined` if
|
|
42
|
+
* unset — `config.yaml` is not consulted); `config.yaml` is read only when
|
|
43
|
+
* `config.json` is absent. Returns `undefined` when no config exists or
|
|
44
|
+
* `networkConfig` is unset/blank.
|
|
45
|
+
*
|
|
46
|
+
* NOTE: on a CORRUPT `config.json` this falls through to `config.yaml`
|
|
47
|
+
* (best-effort), whereas the daemon's `loadConfig` re-throws and refuses to
|
|
48
|
+
* boot — harmless divergence since a corrupt config.json makes the node
|
|
49
|
+
* unbootable, so the resolved name is moot.
|
|
50
|
+
*
|
|
51
|
+
* Setup flows use this (not a json-only read) so a YAML-only node's network
|
|
52
|
+
* is correctly identified and not mis-resolved to the legacy testnet fallback
|
|
53
|
+
* (which would misfire the testnet faucet against a mainnet node).
|
|
54
|
+
*/
|
|
55
|
+
export function readPersistedNetworkConfigName(home) {
|
|
56
|
+
const pick = (obj) => {
|
|
57
|
+
if (obj && typeof obj === 'object') {
|
|
58
|
+
const nc = obj.networkConfig;
|
|
59
|
+
if (typeof nc === 'string' && nc.trim())
|
|
60
|
+
return nc.trim();
|
|
61
|
+
}
|
|
62
|
+
return undefined;
|
|
63
|
+
};
|
|
64
|
+
const jsonPath = join(home, 'config.json');
|
|
65
|
+
if (existsSync(jsonPath)) {
|
|
66
|
+
try {
|
|
67
|
+
const raw = JSON.parse(readFileSync(jsonPath, 'utf-8'));
|
|
68
|
+
if (raw && typeof raw === 'object')
|
|
69
|
+
return pick(raw);
|
|
70
|
+
}
|
|
71
|
+
catch { /* corrupt JSON — fall through to YAML */ }
|
|
72
|
+
}
|
|
73
|
+
const yamlPath = join(home, 'config.yaml');
|
|
74
|
+
if (existsSync(yamlPath)) {
|
|
75
|
+
try {
|
|
76
|
+
const raw = yaml.load(readFileSync(yamlPath, 'utf-8'));
|
|
77
|
+
if (raw && typeof raw === 'object')
|
|
78
|
+
return pick(raw);
|
|
79
|
+
}
|
|
80
|
+
catch { /* corrupt YAML */ }
|
|
81
|
+
}
|
|
82
|
+
return undefined;
|
|
83
|
+
}
|
|
37
84
|
function log(msg) {
|
|
38
85
|
console.log(`[setup] ${msg}`);
|
|
39
86
|
}
|
|
@@ -47,7 +94,7 @@ function dkgDir() {
|
|
|
47
94
|
* extraction output).
|
|
48
95
|
*/
|
|
49
96
|
export function ensureDkgNodeConfig(opts) {
|
|
50
|
-
const { agentName, network, apiPort, existing, overrides } = opts;
|
|
97
|
+
const { agentName, network, networkConfigName, apiPort, existing, overrides } = opts;
|
|
51
98
|
const dir = dkgDir();
|
|
52
99
|
const configPath = join(dir, 'config.json');
|
|
53
100
|
// A pre-existing config gates the store-default seeding below (issue #960):
|
|
@@ -73,6 +120,12 @@ export function ensureDkgNodeConfig(opts) {
|
|
|
73
120
|
const config = {
|
|
74
121
|
...existing,
|
|
75
122
|
name: overrides?.nameExplicit ? agentName : (existing.name ?? agentName),
|
|
123
|
+
// Persist the selected network EXPLICITLY. Unlike `chain`/`autoUpdate`
|
|
124
|
+
// (deliberately left to the runtime resolver above), the network
|
|
125
|
+
// selector is pinned so a node never silently follows a change to the
|
|
126
|
+
// `project.json#defaultNetwork` runtime fallback — switching networks is
|
|
127
|
+
// a deliberate, money-bearing act, not an implicit default drift.
|
|
128
|
+
networkConfig: networkConfigName,
|
|
76
129
|
apiPort: overrides?.portExplicit ? apiPort : (existing.apiPort ?? apiPort),
|
|
77
130
|
nodeRole: existing.nodeRole ?? network.defaultNodeRole,
|
|
78
131
|
contextGraphs: existing.contextGraphs ?? network.defaultContextGraphs,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ensure-dkg-node-config.js","sourceRoot":"","sources":["../src/ensure-dkg-node-config.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AAEH,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"ensure-dkg-node-config.js","sourceRoot":"","sources":["../src/ensure-dkg-node-config.ts"],"names":[],"mappings":"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"}
|
package/dist/errors.d.ts
CHANGED
|
@@ -9,6 +9,24 @@
|
|
|
9
9
|
export declare class DKGError extends Error {
|
|
10
10
|
constructor(message: string);
|
|
11
11
|
}
|
|
12
|
+
/**
|
|
13
|
+
* Funded operational-wallet selection — cross-package error contract.
|
|
14
|
+
*
|
|
15
|
+
* Defined in this UI-safe shared package so every consumer references one
|
|
16
|
+
* source: the chain adapter (which throws the error + builds the message), the
|
|
17
|
+
* daemon route/lifecycle handlers, the publisher async-job classifier, and
|
|
18
|
+
* node-ui. dkg-chain re-exports NO_FUNDED_PUBLISHER_WALLET_CODE for chain-side
|
|
19
|
+
* imports.
|
|
20
|
+
*/
|
|
21
|
+
export declare const NO_FUNDED_PUBLISHER_WALLET_CODE = "NO_FUNDED_PUBLISHER_WALLET";
|
|
22
|
+
/** The literal prefix every InsufficientPublisherFundsError message starts with.
|
|
23
|
+
* The chain formatter builds the message from this; consumers that only have a
|
|
24
|
+
* (possibly re-wrapped, code-stripped) message string match on it via
|
|
25
|
+
* {@link messageIndicatesNoFundedPublisherWallet}. */
|
|
26
|
+
export declare const NO_FUNDED_PUBLISHER_WALLET_MESSAGE_PREFIX = "No operational wallet has enough funds";
|
|
27
|
+
/** True iff a message string indicates a no-funded-wallet publish failure — the
|
|
28
|
+
* fallback used when the structured `.code` was lost to a re-wrap. */
|
|
29
|
+
export declare function messageIndicatesNoFundedPublisherWallet(message: unknown): boolean;
|
|
12
30
|
/**
|
|
13
31
|
* An error caused by invalid user input or a pre-condition that the user
|
|
14
32
|
* can fix. CLI handlers can show these messages directly without a stack trace.
|
package/dist/errors.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../src/errors.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,4CAA4C;AAC5C,qBAAa,QAAS,SAAQ,KAAK;gBACrB,OAAO,EAAE,MAAM;CAI5B;AAED;;;GAGG;AACH,qBAAa,YAAa,SAAQ,QAAQ;gBAC5B,OAAO,EAAE,MAAM;CAI5B;AAED;;;GAGG;AACH,qBAAa,gBAAiB,SAAQ,QAAQ;aACC,KAAK,CAAC,EAAE,OAAO;gBAAhD,OAAO,EAAE,MAAM,EAAkB,KAAK,CAAC,EAAE,OAAO,YAAA;CAI7D;AAED,iDAAiD;AACjD,qBAAa,oBAAqB,SAAQ,YAAY;IACpD,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;gBAEf,QAAQ,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,EAAE,IAAI,SAAsB;CAW5E;AAED,kEAAkE;AAClE,qBAAa,6BAA8B,SAAQ,oBAAoB;IACrE,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,SAAS,EAAE,OAAO,GAAG,SAAS,CAAC;gBAE5B,IAAI,EAAE;QAChB,WAAW,EAAE,MAAM,CAAC;QACpB,QAAQ,EAAE,MAAM,CAAC;QACjB,SAAS,EAAE,OAAO,GAAG,SAAS,CAAC;QAC/B,OAAO,EAAE,MAAM,CAAC;QAChB,IAAI,EAAE,MAAM,CAAC;KACd;CAOF;AAED;;;GAGG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM,CAInD;AAED;;;GAGG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAMhE"}
|
|
1
|
+
{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../src/errors.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,4CAA4C;AAC5C,qBAAa,QAAS,SAAQ,KAAK;gBACrB,OAAO,EAAE,MAAM;CAI5B;AAED;;;;;;;;GAQG;AACH,eAAO,MAAM,+BAA+B,+BAA+B,CAAC;AAE5E;;;uDAGuD;AACvD,eAAO,MAAM,yCAAyC,2CACZ,CAAC;AAO3C;uEACuE;AACvE,wBAAgB,uCAAuC,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAEjF;AAED;;;GAGG;AACH,qBAAa,YAAa,SAAQ,QAAQ;gBAC5B,OAAO,EAAE,MAAM;CAI5B;AAED;;;GAGG;AACH,qBAAa,gBAAiB,SAAQ,QAAQ;aACC,KAAK,CAAC,EAAE,OAAO;gBAAhD,OAAO,EAAE,MAAM,EAAkB,KAAK,CAAC,EAAE,OAAO,YAAA;CAI7D;AAED,iDAAiD;AACjD,qBAAa,oBAAqB,SAAQ,YAAY;IACpD,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;gBAEf,QAAQ,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,EAAE,IAAI,SAAsB;CAW5E;AAED,kEAAkE;AAClE,qBAAa,6BAA8B,SAAQ,oBAAoB;IACrE,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,SAAS,EAAE,OAAO,GAAG,SAAS,CAAC;gBAE5B,IAAI,EAAE;QAChB,WAAW,EAAE,MAAM,CAAC;QACpB,QAAQ,EAAE,MAAM,CAAC;QACjB,SAAS,EAAE,OAAO,GAAG,SAAS,CAAC;QAC/B,OAAO,EAAE,MAAM,CAAC;QAChB,IAAI,EAAE,MAAM,CAAC;KACd;CAOF;AAED;;;GAGG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM,CAInD;AAED;;;GAGG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAMhE"}
|
package/dist/errors.js
CHANGED
|
@@ -12,6 +12,27 @@ export class DKGError extends Error {
|
|
|
12
12
|
this.name = 'DKGError';
|
|
13
13
|
}
|
|
14
14
|
}
|
|
15
|
+
/**
|
|
16
|
+
* Funded operational-wallet selection — cross-package error contract.
|
|
17
|
+
*
|
|
18
|
+
* Defined in this UI-safe shared package so every consumer references one
|
|
19
|
+
* source: the chain adapter (which throws the error + builds the message), the
|
|
20
|
+
* daemon route/lifecycle handlers, the publisher async-job classifier, and
|
|
21
|
+
* node-ui. dkg-chain re-exports NO_FUNDED_PUBLISHER_WALLET_CODE for chain-side
|
|
22
|
+
* imports.
|
|
23
|
+
*/
|
|
24
|
+
export const NO_FUNDED_PUBLISHER_WALLET_CODE = 'NO_FUNDED_PUBLISHER_WALLET';
|
|
25
|
+
/** The literal prefix every InsufficientPublisherFundsError message starts with.
|
|
26
|
+
* The chain formatter builds the message from this; consumers that only have a
|
|
27
|
+
* (possibly re-wrapped, code-stripped) message string match on it via
|
|
28
|
+
* {@link messageIndicatesNoFundedPublisherWallet}. */
|
|
29
|
+
export const NO_FUNDED_PUBLISHER_WALLET_MESSAGE_PREFIX = 'No operational wallet has enough funds';
|
|
30
|
+
const NO_FUNDED_PUBLISHER_WALLET_MARKER = new RegExp(NO_FUNDED_PUBLISHER_WALLET_MESSAGE_PREFIX, 'i');
|
|
31
|
+
/** True iff a message string indicates a no-funded-wallet publish failure — the
|
|
32
|
+
* fallback used when the structured `.code` was lost to a re-wrap. */
|
|
33
|
+
export function messageIndicatesNoFundedPublisherWallet(message) {
|
|
34
|
+
return typeof message === 'string' && NO_FUNDED_PUBLISHER_WALLET_MARKER.test(message);
|
|
35
|
+
}
|
|
15
36
|
/**
|
|
16
37
|
* An error caused by invalid user input or a pre-condition that the user
|
|
17
38
|
* can fix. CLI handlers can show these messages directly without a stack trace.
|
package/dist/errors.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../src/errors.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,4CAA4C;AAC5C,MAAM,OAAO,QAAS,SAAQ,KAAK;IACjC,YAAY,OAAe;QACzB,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,UAAU,CAAC;IACzB,CAAC;CACF;AAED;;;GAGG;AACH,MAAM,OAAO,YAAa,SAAQ,QAAQ;IACxC,YAAY,OAAe;QACzB,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,cAAc,CAAC;IAC7B,CAAC;CACF;AAED;;;GAGG;AACH,MAAM,OAAO,gBAAiB,SAAQ,QAAQ;IACC;IAA7C,YAAY,OAAe,EAAkB,KAAe;QAC1D,KAAK,CAAC,OAAO,CAAC,CAAC;QAD4B,UAAK,GAAL,KAAK,CAAU;QAE1D,IAAI,CAAC,IAAI,GAAG,kBAAkB,CAAC;IACjC,CAAC;CACF;AAED,iDAAiD;AACjD,MAAM,OAAO,oBAAqB,SAAQ,YAAY;IAC3C,IAAI,CAAS;IACb,QAAQ,CAAU;IAE3B,YAAY,QAAiB,EAAE,OAAgB,EAAE,IAAI,GAAG,mBAAmB;QACzE,KAAK,CACH,OAAO;YACP,CAAC,QAAQ,IAAI,IAAI;gBACf,CAAC,CAAC,4BAA4B,QAAQ,SAAS;gBAC/C,CAAC,CAAC,mBAAmB,CAAC,CACzB,CAAC;QACF,IAAI,CAAC,IAAI,GAAG,sBAAsB,CAAC;QACnC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC3B,CAAC;CACF;AAED,kEAAkE;AAClE,MAAM,OAAO,6BAA8B,SAAQ,oBAAoB;IAC5D,WAAW,CAAS;IACpB,IAAI,CAAS;IACb,SAAS,CAAsB;IAExC,YAAY,IAMX;QACC,KAAK,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,OAAO,EAAE,8BAA8B,CAAC,CAAC;QACnE,IAAI,CAAC,IAAI,GAAG,+BAA+B,CAAC;QAC5C,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;QACpC,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;QAChC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;IACxB,CAAC;CACF;AAED;;;GAGG;AACH,MAAM,UAAU,cAAc,CAAC,GAAY;IACzC,IAAI,GAAG,YAAY,KAAK;QAAE,OAAO,GAAG,CAAC,OAAO,CAAC;IAC7C,IAAI,OAAO,GAAG,KAAK,QAAQ;QAAE,OAAO,GAAG,CAAC;IACxC,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC;AACrB,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,YAAY,CAAC,GAAY,EAAE,IAAY;IACrD,OAAO,CACL,GAAG,YAAY,KAAK;QACpB,MAAM,IAAI,GAAG;QACZ,GAA6B,CAAC,IAAI,KAAK,IAAI,CAC7C,CAAC;AACJ,CAAC"}
|
|
1
|
+
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../src/errors.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,4CAA4C;AAC5C,MAAM,OAAO,QAAS,SAAQ,KAAK;IACjC,YAAY,OAAe;QACzB,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,UAAU,CAAC;IACzB,CAAC;CACF;AAED;;;;;;;;GAQG;AACH,MAAM,CAAC,MAAM,+BAA+B,GAAG,4BAA4B,CAAC;AAE5E;;;uDAGuD;AACvD,MAAM,CAAC,MAAM,yCAAyC,GACpD,wCAAwC,CAAC;AAE3C,MAAM,iCAAiC,GAAG,IAAI,MAAM,CAClD,yCAAyC,EACzC,GAAG,CACJ,CAAC;AAEF;uEACuE;AACvE,MAAM,UAAU,uCAAuC,CAAC,OAAgB;IACtE,OAAO,OAAO,OAAO,KAAK,QAAQ,IAAI,iCAAiC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;AACxF,CAAC;AAED;;;GAGG;AACH,MAAM,OAAO,YAAa,SAAQ,QAAQ;IACxC,YAAY,OAAe;QACzB,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,cAAc,CAAC;IAC7B,CAAC;CACF;AAED;;;GAGG;AACH,MAAM,OAAO,gBAAiB,SAAQ,QAAQ;IACC;IAA7C,YAAY,OAAe,EAAkB,KAAe;QAC1D,KAAK,CAAC,OAAO,CAAC,CAAC;QAD4B,UAAK,GAAL,KAAK,CAAU;QAE1D,IAAI,CAAC,IAAI,GAAG,kBAAkB,CAAC;IACjC,CAAC;CACF;AAED,iDAAiD;AACjD,MAAM,OAAO,oBAAqB,SAAQ,YAAY;IAC3C,IAAI,CAAS;IACb,QAAQ,CAAU;IAE3B,YAAY,QAAiB,EAAE,OAAgB,EAAE,IAAI,GAAG,mBAAmB;QACzE,KAAK,CACH,OAAO;YACP,CAAC,QAAQ,IAAI,IAAI;gBACf,CAAC,CAAC,4BAA4B,QAAQ,SAAS;gBAC/C,CAAC,CAAC,mBAAmB,CAAC,CACzB,CAAC;QACF,IAAI,CAAC,IAAI,GAAG,sBAAsB,CAAC;QACnC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC3B,CAAC;CACF;AAED,kEAAkE;AAClE,MAAM,OAAO,6BAA8B,SAAQ,oBAAoB;IAC5D,WAAW,CAAS;IACpB,IAAI,CAAS;IACb,SAAS,CAAsB;IAExC,YAAY,IAMX;QACC,KAAK,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,OAAO,EAAE,8BAA8B,CAAC,CAAC;QACnE,IAAI,CAAC,IAAI,GAAG,+BAA+B,CAAC;QAC5C,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;QACpC,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;QAChC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;IACxB,CAAC;CACF;AAED;;;GAGG;AACH,MAAM,UAAU,cAAc,CAAC,GAAY;IACzC,IAAI,GAAG,YAAY,KAAK;QAAE,OAAO,GAAG,CAAC,OAAO,CAAC;IAC7C,IAAI,OAAO,GAAG,KAAK,QAAQ;QAAE,OAAO,GAAG,CAAC;IACxC,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC;AACrB,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,YAAY,CAAC,GAAY,EAAE,IAAY;IACrD,OAAO,CACL,GAAG,YAAY,KAAK;QACpB,MAAM,IAAI,GAAG;QACZ,GAA6B,CAAC,IAAI,KAAK,IAAI,CAC7C,CAAC;AACJ,CAAC"}
|
package/dist/index.d.ts
CHANGED
|
@@ -8,7 +8,9 @@ export * from './publisher-extension.js';
|
|
|
8
8
|
export * from './imported-artifact-bytes.js';
|
|
9
9
|
export * from './imported-artifact-metadata.js';
|
|
10
10
|
export * from './event-bus.js';
|
|
11
|
-
export { Logger, createOperationContext, type OperationContext, type OperationName, type LogSink } from './logger.js';
|
|
11
|
+
export { Logger, createOperationContext, type OperationContext, type OperationName, type LogSink, type LogRecord } from './logger.js';
|
|
12
|
+
export { createLogRedactor, redactLogEntry, redactMessage, DEFAULT_SENSITIVE_KEYS, REDACTED } from './log-redaction.js';
|
|
13
|
+
export { getTracer, withSpan, linkedSpan, currentTraceIds, activeSpanContext, getMetrics, rebuildMetrics, type WithSpanOpts, type DkgMetrics, } from './telemetry-api.js';
|
|
12
14
|
export * from './crypto/index.js';
|
|
13
15
|
export * from './proto/index.js';
|
|
14
16
|
export { DKGNode, type RelayStats, type RelayReservationDetail, DEFAULT_RELAY_SERVER_CAPACITY, RELAY_CAPACITY_MULTIPLIER, RELAY_DEFAULT_DURATION_LIMIT_MS, RELAY_RESERVATION_TTL_MS, EDGE_NODE_MAX_CONNECTIONS, deriveRelayCaps, checkFdLimit, validateRelayServerCapacity, type RelayCapacityValidation, type DerivedRelayCaps, DEFAULT_RELAY_RESERVATION_COUNT, MAX_RELAY_RESERVATION_COUNT, validateRelayReservationCount, type RelayReservationCountValidation, type NetworkTunables, pickNetworkTunables, isPublicLikeAddress, isLocalOrInternalHostname, } from './node.js';
|
|
@@ -27,12 +29,14 @@ export { ProtocolOutbox, type ProtocolOutboxOptions, DEFAULT_PROTOCOL_OUTBOX_BAC
|
|
|
27
29
|
export { findPackageRepoDir, blueGreenSlotEntryPoint, blueGreenSlotReady, } from './blue-green.js';
|
|
28
30
|
export { FAUCET_WALLETS_PER_REQUEST, getFundableWalletAddresses, requestFaucetFunding, type FaucetResult, type FundableWalletConfigLike, type FundableWalletEntryLike, type FundableWalletSource, } from './faucet.js';
|
|
29
31
|
export { fundWalletsBestEffort, logManualFundingInstructions, readWallets, readWalletsWithRetry, type FundWalletsBestEffortOptions, type FundWalletsNetworkConfig, } from './faucet-orchestration.js';
|
|
30
|
-
export { ensureDkgNodeConfig, type DkgNodeConfigOverrides, type DkgNodeNetworkConfig, type EnsureDkgNodeConfigOptions, } from './ensure-dkg-node-config.js';
|
|
32
|
+
export { ensureDkgNodeConfig, readPersistedNetworkConfigName, type DkgNodeConfigOverrides, type DkgNodeNetworkConfig, type EnsureDkgNodeConfigOptions, } from './ensure-dkg-node-config.js';
|
|
33
|
+
export { DEFAULT_SETUP_NETWORK, LEGACY_FALLBACK_NETWORK, SELECTABLE_SETUP_NETWORKS, resolveSetupNetworkName, type ResolveSetupNetworkNameOptions, } from './setup-network.js';
|
|
31
34
|
export { resolveCliPackageDir } from './resolve-cli-package-dir.js';
|
|
32
35
|
export { resolveDkgCli, type ResolvedDkgCli } from './resolve-dkg-cli.js';
|
|
33
36
|
export { startDaemon } from './daemon-lifecycle.js';
|
|
34
37
|
export { assertSafeIri, isSafeIri, sparqlIri, escapeSparqlLiteral, sparqlString, sparqlInt, assertSafeRdfTerm, } from './sparql-safe.js';
|
|
35
|
-
export {
|
|
38
|
+
export { JAVA_WRITE_UTF_MAX_BYTES, DKG_RDF_LITERAL_SAFE_MUTF8_BYTES, OVERSIZED_RDF_LITERAL_ERROR_CODE, OversizedRdfLiteralError, javaModifiedUtf8ByteLength, rdfLiteralTermMutf8ByteLength, isOversizedRdfLiteralError, assertRdfLiteralMutf8Safe, assertQuadLiteralsMutf8Safe, type RdfLiteralSizeContext, type QuadLiteralLike, } from './rdf-literal-size.js';
|
|
39
|
+
export { DKGError, DKGUserError, DKGInternalError, PayloadTooLargeError, SwmGossipPayloadTooLargeError, toErrorMessage, hasErrorCode, NO_FUNDED_PUBLISHER_WALLET_CODE, NO_FUNDED_PUBLISHER_WALLET_MESSAGE_PREFIX, messageIndicatesNoFundedPublisherWallet, } from './errors.js';
|
|
36
40
|
export { dkgHomeDir, resolveDkgConfigHome, dkgAuthTokenPath, isDkgMonorepoRoot, findDkgMonorepoRoot, resolveDkgHome, readDaemonPid, isProcessAlive, readDkgApiPort, loadAuthTokenSync, loadAuthToken, toEip55Checksum, } from './dkg-home.js';
|
|
37
41
|
export { type Quad as ExtractionQuad, type ExtractionInput, type ConverterOutput, type ExtractionOutput, type ExtractionPipeline, ExtractionPipelineRegistry, } from './extraction-pipeline.js';
|
|
38
42
|
export * from './transducers.js';
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAC;AAC3B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,cAAc,CAAC;AAC7B,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC/C,cAAc,mBAAmB,CAAC;AAClC,cAAc,YAAY,CAAC;AAC3B,cAAc,0BAA0B,CAAC;AACzC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,iCAAiC,CAAC;AAChD,cAAc,gBAAgB,CAAC;AAC/B,OAAO,EAAE,MAAM,EAAE,sBAAsB,EAAE,KAAK,gBAAgB,EAAE,KAAK,aAAa,EAAE,KAAK,OAAO,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/dist/index.js
CHANGED
|
@@ -9,6 +9,8 @@ export * from './imported-artifact-bytes.js';
|
|
|
9
9
|
export * from './imported-artifact-metadata.js';
|
|
10
10
|
export * from './event-bus.js';
|
|
11
11
|
export { Logger, createOperationContext } from './logger.js';
|
|
12
|
+
export { createLogRedactor, redactLogEntry, redactMessage, DEFAULT_SENSITIVE_KEYS, REDACTED } from './log-redaction.js';
|
|
13
|
+
export { getTracer, withSpan, linkedSpan, currentTraceIds, activeSpanContext, getMetrics, rebuildMetrics, } from './telemetry-api.js';
|
|
12
14
|
export * from './crypto/index.js';
|
|
13
15
|
export * from './proto/index.js';
|
|
14
16
|
export { DKGNode,
|
|
@@ -45,12 +47,14 @@ export { ProtocolOutbox, DEFAULT_PROTOCOL_OUTBOX_BACKOFFS_MS, DEFAULT_PROTOCOL_O
|
|
|
45
47
|
export { findPackageRepoDir, blueGreenSlotEntryPoint, blueGreenSlotReady, } from './blue-green.js';
|
|
46
48
|
export { FAUCET_WALLETS_PER_REQUEST, getFundableWalletAddresses, requestFaucetFunding, } from './faucet.js';
|
|
47
49
|
export { fundWalletsBestEffort, logManualFundingInstructions, readWallets, readWalletsWithRetry, } from './faucet-orchestration.js';
|
|
48
|
-
export { ensureDkgNodeConfig, } from './ensure-dkg-node-config.js';
|
|
50
|
+
export { ensureDkgNodeConfig, readPersistedNetworkConfigName, } from './ensure-dkg-node-config.js';
|
|
51
|
+
export { DEFAULT_SETUP_NETWORK, LEGACY_FALLBACK_NETWORK, SELECTABLE_SETUP_NETWORKS, resolveSetupNetworkName, } from './setup-network.js';
|
|
49
52
|
export { resolveCliPackageDir } from './resolve-cli-package-dir.js';
|
|
50
53
|
export { resolveDkgCli } from './resolve-dkg-cli.js';
|
|
51
54
|
export { startDaemon } from './daemon-lifecycle.js';
|
|
52
55
|
export { assertSafeIri, isSafeIri, sparqlIri, escapeSparqlLiteral, sparqlString, sparqlInt, assertSafeRdfTerm, } from './sparql-safe.js';
|
|
53
|
-
export {
|
|
56
|
+
export { JAVA_WRITE_UTF_MAX_BYTES, DKG_RDF_LITERAL_SAFE_MUTF8_BYTES, OVERSIZED_RDF_LITERAL_ERROR_CODE, OversizedRdfLiteralError, javaModifiedUtf8ByteLength, rdfLiteralTermMutf8ByteLength, isOversizedRdfLiteralError, assertRdfLiteralMutf8Safe, assertQuadLiteralsMutf8Safe, } from './rdf-literal-size.js';
|
|
57
|
+
export { DKGError, DKGUserError, DKGInternalError, PayloadTooLargeError, SwmGossipPayloadTooLargeError, toErrorMessage, hasErrorCode, NO_FUNDED_PUBLISHER_WALLET_CODE, NO_FUNDED_PUBLISHER_WALLET_MESSAGE_PREFIX, messageIndicatesNoFundedPublisherWallet, } from './errors.js';
|
|
54
58
|
export { dkgHomeDir, resolveDkgConfigHome, dkgAuthTokenPath, isDkgMonorepoRoot, findDkgMonorepoRoot, resolveDkgHome, readDaemonPid, isProcessAlive, readDkgApiPort, loadAuthTokenSync, loadAuthToken, toEip55Checksum, } from './dkg-home.js';
|
|
55
59
|
export { ExtractionPipelineRegistry, } from './extraction-pipeline.js';
|
|
56
60
|
export * from './transducers.js';
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAC;AAC3B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,cAAc,CAAC;AAC7B,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC/C,cAAc,mBAAmB,CAAC;AAClC,cAAc,YAAY,CAAC;AAC3B,cAAc,0BAA0B,CAAC;AACzC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,iCAAiC,CAAC;AAChD,cAAc,gBAAgB,CAAC;AAC/B,OAAO,EAAE,MAAM,EAAE,sBAAsB,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,45 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* At-source redaction of secrets from log records before they leave the node.
|
|
3
|
+
*
|
|
4
|
+
* Why this exists: V10 nodes are run by independent operators, and once a
|
|
5
|
+
* secret (a wallet private key, a mnemonic, an API token) is shipped to a
|
|
6
|
+
* remote collector it is irreversibly leaked. Redaction therefore runs on the
|
|
7
|
+
* node, on the copy of every log record that is about to be FORWARDED. The
|
|
8
|
+
* local dashboard DB keeps full-fidelity records for the operator's own
|
|
9
|
+
* debugging — redaction only protects data that crosses the trust boundary.
|
|
10
|
+
*
|
|
11
|
+
* Design choices (deliberately conservative to avoid mangling useful logs):
|
|
12
|
+
* - Structured "key: value" / key=value / "key":"value" shapes are redacted
|
|
13
|
+
* by KEY NAME (high precision). This is how DKG actually logs secrets
|
|
14
|
+
* (e.g. operationalWalletPrivateKey, mnemonic).
|
|
15
|
+
* - JWTs are redacted by shape (eyJ….….…) — effectively zero false positives.
|
|
16
|
+
* - We deliberately do NOT blanket-redact 0x-prefixed 64-hex strings: in DKG
|
|
17
|
+
* those are overwhelmingly Merkle roots, KC roots and tx hashes (public,
|
|
18
|
+
* non-secret) and nuking them would destroy debuggability. A bare private
|
|
19
|
+
* key with no key-name context is a residual gap best closed with a
|
|
20
|
+
* collector-side OTTL/regex backstop (see the PoC stack).
|
|
21
|
+
*/
|
|
22
|
+
import type { LogRecord } from './logger.js';
|
|
23
|
+
/**
|
|
24
|
+
* Default sensitive key names whose values are scrubbed from log messages
|
|
25
|
+
* before forwarding. Matched case-insensitively.
|
|
26
|
+
*/
|
|
27
|
+
export declare const DEFAULT_SENSITIVE_KEYS: readonly string[];
|
|
28
|
+
export declare const REDACTED = "[REDACTED]";
|
|
29
|
+
/**
|
|
30
|
+
* Redact the free-form `message` of a log record. The two patterns are:
|
|
31
|
+
* 1. JWT-shaped tokens (header.payload.signature, base64url) — by shape.
|
|
32
|
+
* 2. `<sensitiveKey><sep><value>` — the value is replaced, the key kept.
|
|
33
|
+
* Quoted values (single/double/backtick) are redacted whole (so a quoted
|
|
34
|
+
* mnemonic with spaces is fully removed); bare values up to the next
|
|
35
|
+
* delimiter otherwise.
|
|
36
|
+
*/
|
|
37
|
+
export declare function redactMessage(message: string, keyRegex: RegExp, jwtRegex: RegExp, phraseRegex?: RegExp): string;
|
|
38
|
+
/**
|
|
39
|
+
* Compile a redactor once, then reuse it on the hot path (one per shipper).
|
|
40
|
+
* `extraKeys` are operator-configured additional sensitive key names.
|
|
41
|
+
*/
|
|
42
|
+
export declare function createLogRedactor(extraKeys?: readonly string[]): (record: LogRecord) => LogRecord;
|
|
43
|
+
/** One-shot convenience (recompiles each call — do not use on the hot path). */
|
|
44
|
+
export declare function redactLogEntry(record: LogRecord, extraKeys?: readonly string[]): LogRecord;
|
|
45
|
+
//# sourceMappingURL=log-redaction.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"log-redaction.d.ts","sourceRoot":"","sources":["../src/log-redaction.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAE7C;;;GAGG;AACH,eAAO,MAAM,sBAAsB,EAAE,SAAS,MAAM,EA6BnD,CAAC;AAEF,eAAO,MAAM,QAAQ,eAAe,CAAC;AAerC;;;;;;;GAOG;AACH,wBAAgB,aAAa,CAC3B,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,WAAW,GAAE,MAA6B,GACzC,MAAM,CAYR;AA2DD;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,SAAS,GAAE,SAAS,MAAM,EAAO,GAAG,CAAC,MAAM,EAAE,SAAS,KAAK,SAAS,CAerG;AAED,gFAAgF;AAChF,wBAAgB,cAAc,CAAC,MAAM,EAAE,SAAS,EAAE,SAAS,GAAE,SAAS,MAAM,EAAO,GAAG,SAAS,CAE9F"}
|
|
@@ -0,0 +1,163 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* At-source redaction of secrets from log records before they leave the node.
|
|
3
|
+
*
|
|
4
|
+
* Why this exists: V10 nodes are run by independent operators, and once a
|
|
5
|
+
* secret (a wallet private key, a mnemonic, an API token) is shipped to a
|
|
6
|
+
* remote collector it is irreversibly leaked. Redaction therefore runs on the
|
|
7
|
+
* node, on the copy of every log record that is about to be FORWARDED. The
|
|
8
|
+
* local dashboard DB keeps full-fidelity records for the operator's own
|
|
9
|
+
* debugging — redaction only protects data that crosses the trust boundary.
|
|
10
|
+
*
|
|
11
|
+
* Design choices (deliberately conservative to avoid mangling useful logs):
|
|
12
|
+
* - Structured "key: value" / key=value / "key":"value" shapes are redacted
|
|
13
|
+
* by KEY NAME (high precision). This is how DKG actually logs secrets
|
|
14
|
+
* (e.g. operationalWalletPrivateKey, mnemonic).
|
|
15
|
+
* - JWTs are redacted by shape (eyJ….….…) — effectively zero false positives.
|
|
16
|
+
* - We deliberately do NOT blanket-redact 0x-prefixed 64-hex strings: in DKG
|
|
17
|
+
* those are overwhelmingly Merkle roots, KC roots and tx hashes (public,
|
|
18
|
+
* non-secret) and nuking them would destroy debuggability. A bare private
|
|
19
|
+
* key with no key-name context is a residual gap best closed with a
|
|
20
|
+
* collector-side OTTL/regex backstop (see the PoC stack).
|
|
21
|
+
*/
|
|
22
|
+
/**
|
|
23
|
+
* Default sensitive key names whose values are scrubbed from log messages
|
|
24
|
+
* before forwarding. Matched case-insensitively.
|
|
25
|
+
*/
|
|
26
|
+
export const DEFAULT_SENSITIVE_KEYS = [
|
|
27
|
+
'privateKey',
|
|
28
|
+
'private_key',
|
|
29
|
+
'privKey',
|
|
30
|
+
'operationalWalletPrivateKey',
|
|
31
|
+
'managementWalletPrivateKey',
|
|
32
|
+
'mnemonic',
|
|
33
|
+
'seedPhrase',
|
|
34
|
+
'seed_phrase',
|
|
35
|
+
'seed',
|
|
36
|
+
'secret',
|
|
37
|
+
'secretKey',
|
|
38
|
+
'clientSecret',
|
|
39
|
+
'password',
|
|
40
|
+
'passphrase',
|
|
41
|
+
'passwd',
|
|
42
|
+
'pwd',
|
|
43
|
+
'apiKey',
|
|
44
|
+
'api_key',
|
|
45
|
+
'apiToken',
|
|
46
|
+
'accessToken',
|
|
47
|
+
'access_token',
|
|
48
|
+
'refreshToken',
|
|
49
|
+
'refresh_token',
|
|
50
|
+
'token',
|
|
51
|
+
'authorization',
|
|
52
|
+
'bearer',
|
|
53
|
+
'sessionKey',
|
|
54
|
+
'encryptionKey',
|
|
55
|
+
];
|
|
56
|
+
export const REDACTED = '[REDACTED]';
|
|
57
|
+
/**
|
|
58
|
+
* Keys whose value is a multi-word secret PHRASE (BIP39-style). Their unquoted
|
|
59
|
+
* value must be consumed across whitespace, otherwise `mnemonic=legal winner
|
|
60
|
+
* thank year …` would only redact `legal` and ship the rest of the phrase.
|
|
61
|
+
* Handled by a dedicated matcher and EXCLUDED from the single-token matcher so
|
|
62
|
+
* a value is never processed twice.
|
|
63
|
+
*/
|
|
64
|
+
const PHRASE_KEYS = ['mnemonic', 'seedPhrase', 'seed_phrase', 'seedphrase', 'seed', 'passphrase'];
|
|
65
|
+
function escapeRegExp(s) {
|
|
66
|
+
return s.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
|
|
67
|
+
}
|
|
68
|
+
/**
|
|
69
|
+
* Redact the free-form `message` of a log record. The two patterns are:
|
|
70
|
+
* 1. JWT-shaped tokens (header.payload.signature, base64url) — by shape.
|
|
71
|
+
* 2. `<sensitiveKey><sep><value>` — the value is replaced, the key kept.
|
|
72
|
+
* Quoted values (single/double/backtick) are redacted whole (so a quoted
|
|
73
|
+
* mnemonic with spaces is fully removed); bare values up to the next
|
|
74
|
+
* delimiter otherwise.
|
|
75
|
+
*/
|
|
76
|
+
export function redactMessage(message, keyRegex, jwtRegex, phraseRegex = DEFAULT_PHRASE_REGEX) {
|
|
77
|
+
if (!message)
|
|
78
|
+
return message;
|
|
79
|
+
// Reset lastIndex defensively (these are global regexes reused across calls).
|
|
80
|
+
jwtRegex.lastIndex = 0;
|
|
81
|
+
keyRegex.lastIndex = 0;
|
|
82
|
+
phraseRegex.lastIndex = 0;
|
|
83
|
+
let out = message.replace(jwtRegex, REDACTED);
|
|
84
|
+
// Phrase keys first (multi-word values), then single-token keys. The two key
|
|
85
|
+
// sets are disjoint, so no value is rewritten twice.
|
|
86
|
+
out = out.replace(phraseRegex, (_full, keyAndSep) => `${keyAndSep}${REDACTED}`);
|
|
87
|
+
out = out.replace(keyRegex, (_full, keyAndSep) => `${keyAndSep}${REDACTED}`);
|
|
88
|
+
return out;
|
|
89
|
+
}
|
|
90
|
+
function buildKeyRegex(keys) {
|
|
91
|
+
const alt = keys.map(escapeRegExp).join('|');
|
|
92
|
+
// group 1 = key (optionally quoted) + separator (kept verbatim)
|
|
93
|
+
// group 2 = value (redacted): a quoted run, or a bare token up to a delimiter
|
|
94
|
+
return new RegExp('(' +
|
|
95
|
+
'["\'`]?\\b(?:' + alt + ')\\b["\'`]?' + // key, optionally quoted
|
|
96
|
+
'\\s*[:=]\\s*' + // : or =
|
|
97
|
+
')' +
|
|
98
|
+
'(' +
|
|
99
|
+
'"[^"]*"' + '|' +
|
|
100
|
+
"'[^']*'" + '|' +
|
|
101
|
+
'`[^`]*`' + '|' +
|
|
102
|
+
// auth-scheme + credential as ONE value, so `authorization: Bearer <token>`
|
|
103
|
+
// redacts the token too (not just the scheme word).
|
|
104
|
+
'(?:Bearer|Basic|Bot|Token|Digest|ApiKey)\\s+[^\\s,;}\\]\\)]+' + '|' +
|
|
105
|
+
'[^\\s,;}\\]\\)]+' + // bare token
|
|
106
|
+
')', 'gi');
|
|
107
|
+
}
|
|
108
|
+
/**
|
|
109
|
+
* Like `buildKeyRegex` but the VALUE matcher consumes a multi-word run for
|
|
110
|
+
* unquoted phrase secrets. The value is a quoted run, OR a bare first token
|
|
111
|
+
* followed by up to 23 more whitespace-separated ALPHA words — so it redacts
|
|
112
|
+
* BOTH a single-token secret (`seed=12345`, `seed=0xabc`) AND a full BIP39-style
|
|
113
|
+
* phrase (`seed=legal winner thank …`), while the 24-word cap + alpha-only
|
|
114
|
+
* continuation stop it from swallowing an entire trailing sentence or crossing a
|
|
115
|
+
* `,`/`;`/`}` delimiter. Phrase keys are handled ONLY here (excluded from the
|
|
116
|
+
* single-token matcher), so this MUST also cover the single-token case. Only
|
|
117
|
+
* fires on `key: …` / `key=…` (a bare key word in prose is left untouched).
|
|
118
|
+
*/
|
|
119
|
+
function buildPhraseKeyRegex(keys) {
|
|
120
|
+
const alt = keys.map(escapeRegExp).join('|');
|
|
121
|
+
return new RegExp('(' +
|
|
122
|
+
'["\'`]?\\b(?:' + alt + ')\\b["\'`]?' +
|
|
123
|
+
'\\s*[:=]\\s*' +
|
|
124
|
+
')' +
|
|
125
|
+
'(' +
|
|
126
|
+
'"[^"]*"' + '|' +
|
|
127
|
+
"'[^']*'" + '|' +
|
|
128
|
+
'`[^`]*`' + '|' +
|
|
129
|
+
'[^\\s,;}\\]\\)]+(?:\\s+[A-Za-z]+){0,23}' + // single token, + up to 23 trailing alpha words
|
|
130
|
+
')', 'gi');
|
|
131
|
+
}
|
|
132
|
+
/** Default phrase matcher for direct `redactMessage` callers. */
|
|
133
|
+
const DEFAULT_PHRASE_REGEX = buildPhraseKeyRegex(PHRASE_KEYS);
|
|
134
|
+
// JWT: three base64url segments separated by dots, starting with the
|
|
135
|
+
// canonical `eyJ` ('{"' base64url-encoded). Conservative min lengths.
|
|
136
|
+
const JWT_SOURCE = '\\beyJ[A-Za-z0-9_-]{6,}\\.[A-Za-z0-9_-]{6,}\\.[A-Za-z0-9_-]{6,}\\b';
|
|
137
|
+
/**
|
|
138
|
+
* Compile a redactor once, then reuse it on the hot path (one per shipper).
|
|
139
|
+
* `extraKeys` are operator-configured additional sensitive key names.
|
|
140
|
+
*/
|
|
141
|
+
export function createLogRedactor(extraKeys = []) {
|
|
142
|
+
const keys = extraKeys.length ? [...DEFAULT_SENSITIVE_KEYS, ...extraKeys] : DEFAULT_SENSITIVE_KEYS;
|
|
143
|
+
const phraseSet = new Set(PHRASE_KEYS.map((k) => k.toLowerCase()));
|
|
144
|
+
// Phrase keys get the multi-word matcher; everything else (incl. extraKeys)
|
|
145
|
+
// gets the single-token matcher. Disjoint sets → a value is never matched twice.
|
|
146
|
+
const singleKeys = keys.filter((k) => !phraseSet.has(k.toLowerCase()));
|
|
147
|
+
const keyRegex = buildKeyRegex(singleKeys);
|
|
148
|
+
const phraseRegex = buildPhraseKeyRegex(PHRASE_KEYS);
|
|
149
|
+
const jwtRegex = new RegExp(JWT_SOURCE, 'g');
|
|
150
|
+
return (record) => {
|
|
151
|
+
if (!record || !record.message)
|
|
152
|
+
return record;
|
|
153
|
+
const redacted = redactMessage(record.message, keyRegex, jwtRegex, phraseRegex);
|
|
154
|
+
if (redacted === record.message)
|
|
155
|
+
return record; // no change → no alloc
|
|
156
|
+
return { ...record, message: redacted };
|
|
157
|
+
};
|
|
158
|
+
}
|
|
159
|
+
/** One-shot convenience (recompiles each call — do not use on the hot path). */
|
|
160
|
+
export function redactLogEntry(record, extraKeys = []) {
|
|
161
|
+
return createLogRedactor(extraKeys)(record);
|
|
162
|
+
}
|
|
163
|
+
//# sourceMappingURL=log-redaction.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"log-redaction.js","sourceRoot":"","sources":["../src/log-redaction.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAIH;;;GAGG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAsB;IACvD,YAAY;IACZ,aAAa;IACb,SAAS;IACT,6BAA6B;IAC7B,4BAA4B;IAC5B,UAAU;IACV,YAAY;IACZ,aAAa;IACb,MAAM;IACN,QAAQ;IACR,WAAW;IACX,cAAc;IACd,UAAU;IACV,YAAY;IACZ,QAAQ;IACR,KAAK;IACL,QAAQ;IACR,SAAS;IACT,UAAU;IACV,aAAa;IACb,cAAc;IACd,cAAc;IACd,eAAe;IACf,OAAO;IACP,eAAe;IACf,QAAQ;IACR,YAAY;IACZ,eAAe;CAChB,CAAC;AAEF,MAAM,CAAC,MAAM,QAAQ,GAAG,YAAY,CAAC;AAErC;;;;;;GAMG;AACH,MAAM,WAAW,GAAsB,CAAC,UAAU,EAAE,YAAY,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC;AAErH,SAAS,YAAY,CAAC,CAAS;IAC7B,OAAO,CAAC,CAAC,OAAO,CAAC,qBAAqB,EAAE,MAAM,CAAC,CAAC;AAClD,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,aAAa,CAC3B,OAAe,EACf,QAAgB,EAChB,QAAgB,EAChB,cAAsB,oBAAoB;IAE1C,IAAI,CAAC,OAAO;QAAE,OAAO,OAAO,CAAC;IAC7B,8EAA8E;IAC9E,QAAQ,CAAC,SAAS,GAAG,CAAC,CAAC;IACvB,QAAQ,CAAC,SAAS,GAAG,CAAC,CAAC;IACvB,WAAW,CAAC,SAAS,GAAG,CAAC,CAAC;IAC1B,IAAI,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IAC9C,6EAA6E;IAC7E,qDAAqD;IACrD,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,KAAK,EAAE,SAAiB,EAAE,EAAE,CAAC,GAAG,SAAS,GAAG,QAAQ,EAAE,CAAC,CAAC;IACxF,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,SAAiB,EAAE,EAAE,CAAC,GAAG,SAAS,GAAG,QAAQ,EAAE,CAAC,CAAC;IACrF,OAAO,GAAG,CAAC;AACb,CAAC;AAED,SAAS,aAAa,CAAC,IAAuB;IAC5C,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC7C,gEAAgE;IAChE,8EAA8E;IAC9E,OAAO,IAAI,MAAM,CACf,GAAG;QACD,eAAe,GAAG,GAAG,GAAG,aAAa,GAAG,yBAAyB;QACjE,cAAc,GAAG,SAAS;QAC5B,GAAG;QACH,GAAG;QACD,SAAS,GAAG,GAAG;QACf,SAAS,GAAG,GAAG;QACf,SAAS,GAAG,GAAG;QACf,4EAA4E;QAC5E,oDAAoD;QACpD,8DAA8D,GAAG,GAAG;QACpE,kBAAkB,GAAG,aAAa;QACpC,GAAG,EACH,IAAI,CACL,CAAC;AACJ,CAAC;AAED;;;;;;;;;;GAUG;AACH,SAAS,mBAAmB,CAAC,IAAuB;IAClD,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC7C,OAAO,IAAI,MAAM,CACf,GAAG;QACD,eAAe,GAAG,GAAG,GAAG,aAAa;QACrC,cAAc;QAChB,GAAG;QACH,GAAG;QACD,SAAS,GAAG,GAAG;QACf,SAAS,GAAG,GAAG;QACf,SAAS,GAAG,GAAG;QACf,yCAAyC,GAAG,gDAAgD;QAC9F,GAAG,EACH,IAAI,CACL,CAAC;AACJ,CAAC;AAED,iEAAiE;AACjE,MAAM,oBAAoB,GAAG,mBAAmB,CAAC,WAAW,CAAC,CAAC;AAE9D,qEAAqE;AACrE,sEAAsE;AACtE,MAAM,UAAU,GAAG,oEAAoE,CAAC;AAExF;;;GAGG;AACH,MAAM,UAAU,iBAAiB,CAAC,YAA+B,EAAE;IACjE,MAAM,IAAI,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,sBAAsB,EAAE,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,sBAAsB,CAAC;IACnG,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;IACnE,4EAA4E;IAC5E,iFAAiF;IACjF,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;IACvE,MAAM,QAAQ,GAAG,aAAa,CAAC,UAAU,CAAC,CAAC;IAC3C,MAAM,WAAW,GAAG,mBAAmB,CAAC,WAAW,CAAC,CAAC;IACrD,MAAM,QAAQ,GAAG,IAAI,MAAM,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC;IAC7C,OAAO,CAAC,MAAiB,EAAa,EAAE;QACtC,IAAI,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO;YAAE,OAAO,MAAM,CAAC;QAC9C,MAAM,QAAQ,GAAG,aAAa,CAAC,MAAM,CAAC,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC;QAChF,IAAI,QAAQ,KAAK,MAAM,CAAC,OAAO;YAAE,OAAO,MAAM,CAAC,CAAC,uBAAuB;QACvE,OAAO,EAAE,GAAG,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC;IAC1C,CAAC,CAAC;AACJ,CAAC;AAED,gFAAgF;AAChF,MAAM,UAAU,cAAc,CAAC,MAAiB,EAAE,YAA+B,EAAE;IACjF,OAAO,iBAAiB,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,CAAC;AAC9C,CAAC"}
|