@nrwl/nx-cloud 12.5.2 → 13.0.0-beta.4
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/bin/nx-cloud.js +5 -5
- package/bin/nx-cloud.js.map +1 -1
- package/lib/core/api/run-group.api.js +59 -1
- package/lib/core/api/run-group.api.js.map +1 -1
- package/lib/core/commands/clean-up-agents.js +2 -2
- package/lib/core/commands/clean-up-agents.js.map +1 -1
- package/lib/core/commands/start-ci-run.js +4 -4
- package/lib/core/commands/start-ci-run.js.map +1 -1
- package/lib/core/commands/stop-all-agents.js +3 -3
- package/lib/core/commands/stop-all-agents.js.map +1 -1
- package/lib/core/file-storage/e2e-encryption.js +7 -7
- package/lib/core/file-storage/e2e-encryption.js.map +1 -1
- package/lib/core/file-storage/file-storage.js +43 -24
- package/lib/core/file-storage/file-storage.js.map +1 -1
- package/lib/core/runners/cloud-enabled/{task-runner-life-cycle.d.ts → cloud-enabled-life-cycle.d.ts} +4 -3
- package/lib/core/runners/cloud-enabled/cloud-enabled-life-cycle.js +121 -0
- package/lib/core/runners/cloud-enabled/cloud-enabled-life-cycle.js.map +1 -0
- package/lib/core/runners/cloud-enabled/cloud-enabled.runner.js +165 -1
- package/lib/core/runners/cloud-enabled/cloud-enabled.runner.js.map +1 -1
- package/lib/core/runners/cloud-enabled/cloud-remote-cache.js +113 -1
- package/lib/core/runners/cloud-enabled/cloud-remote-cache.js.map +1 -1
- package/lib/core/runners/cloud-enabled/cloud-run.api.js +135 -1
- package/lib/core/runners/cloud-enabled/cloud-run.api.js.map +1 -1
- package/lib/core/runners/distributed-agent/distributed-agent.api.js +73 -1
- package/lib/core/runners/distributed-agent/distributed-agent.api.js.map +1 -1
- package/lib/core/runners/distributed-agent/{distributed-agent.runner.d.ts → distributed-agent.impl.d.ts} +0 -0
- package/lib/core/runners/distributed-agent/distributed-agent.impl.js +233 -0
- package/lib/core/runners/distributed-agent/distributed-agent.impl.js.map +1 -0
- package/lib/core/runners/distributed-execution/distributed-execution.api.d.ts +1 -1
- package/lib/core/runners/distributed-execution/distributed-execution.api.js +117 -1
- package/lib/core/runners/distributed-execution/distributed-execution.api.js.map +1 -1
- package/lib/core/runners/distributed-execution/distributed-execution.runner.js +270 -1
- package/lib/core/runners/distributed-execution/distributed-execution.runner.js.map +1 -1
- package/lib/core/terminal-output/end-of-run-message.d.ts +2 -5
- package/lib/core/terminal-output/end-of-run-message.js +4 -41
- package/lib/core/terminal-output/end-of-run-message.js.map +1 -1
- package/lib/core/terminal-output/message-reporter.js +1 -1
- package/lib/core/terminal-output/message-reporter.js.map +1 -1
- package/lib/core/terminal-output/output-obfuscator.js +1 -1
- package/lib/core/terminal-output/output-obfuscator.js.map +1 -1
- package/lib/generators/init/init.js +1 -1
- package/lib/generators/init/init.js.map +1 -1
- package/lib/nx-cloud-tasks-runner.js +7 -7
- package/lib/nx-cloud-tasks-runner.js.map +1 -1
- package/lib/utilities/axios.js +1 -1
- package/lib/utilities/axios.js.map +1 -1
- package/lib/utilities/environment.d.ts +1 -0
- package/lib/utilities/environment.js +5 -4
- package/lib/utilities/environment.js.map +1 -1
- package/lib/utilities/metric-logger.d.ts +34 -0
- package/lib/utilities/metric-logger.js +72 -0
- package/lib/utilities/metric-logger.js.map +1 -0
- package/package.json +1 -1
- package/lib/core/runners/cloud-enabled/task-runner-life-cycle.js +0 -1
- package/lib/core/runners/cloud-enabled/task-runner-life-cycle.js.map +0 -1
- package/lib/core/runners/distributed-agent/distributed-agent.runner.js +0 -1
- package/lib/core/runners/distributed-agent/distributed-agent.runner.js.map +0 -1
|
@@ -1 +1,270 @@
|
|
|
1
|
-
const a7_0x4ef3=['status','createStartRequest','Distributed\x20Execution\x20Terminated','defineProperty','Waiting...','logCommand','targetDependencies','find','join','completedTasks','length','Command\x20execution\x20failed.','note','next','wait','write','runUrl','stdout','log','Extracting\x20artifacts','createTaskGraph','taskId','Retrieving\x20artifacts\x20from\x20','COMPLETED','readFileSync','../../../utilities/create-no-new-messages-timeout','assign','copyFilesFromCache','../../file-storage/e2e-encryption','message','criticalErrorMessage','project','createNoNewMessagesTimeout','unparse','done','getDependencyConfigs','has','target','DistributedExecutionApi','VERBOSE_LOGGING','Processing\x20task\x20','lifeCycle','defaultTargetDependencies','../../file-storage/file-storage','push','projects','overrides','./distributed-execution.api','ENCRYPTION_KEY','Error:','reset','nx.json','strip-json-comments','See\x20run\x20details\x20at\x20','splitTasksIntoStages','executionStatus:\x20','configuration','../../error/print-run-group-error','throw','projectGraph','parse','Cache','dependencies','build','Unable\x20to\x20complete\x20a\x20run.','then','url','value','Starting\x20distributed\x20command\x20execution','executionStatus','Main\x20job\x20terminated\x20with\x20an\x20error:\x20\x22','completeRunGroupWithError','E2EEncryption','exit','getOutputs','endTask','printRunGroupError','__awaiter','executionId:\x20','error:\x20','../../../utilities/environment','nodes','commandStatus','retrieve','self','get','output','nxCloudDistributedTasksRunner','Successfully\x20completed\x20running\x20the\x20command.','./node_modules/.cache/nx','error','hash','success','__esModule','terminalOutput','axiosException','addVerticalSeparator','@nrwl/workspace/src/utilities/output','start','Waiter','@nrwl/workspace/src/tasks-runner/cache','@nrwl/workspace/src/tasks-runner/utils'];(function(_0x3ccbad,_0x4ef352){const _0x2f2a6b=function(_0x40774f){while(--_0x40774f){_0x3ccbad['push'](_0x3ccbad['shift']());}};_0x2f2a6b(++_0x4ef352);}(a7_0x4ef3,0x163));const a7_0x2f2a=function(_0x3ccbad,_0x4ef352){_0x3ccbad=_0x3ccbad-0x0;let _0x2f2a6b=a7_0x4ef3[_0x3ccbad];return _0x2f2a6b;};'use strict';var __awaiter=this&&this[a7_0x2f2a('0x1c')]||function(_0x3bef68,_0x355ad2,_0x5b1805,_0x52e596){function _0x3c4009(_0x336756){return _0x336756 instanceof _0x5b1805?_0x336756:new _0x5b1805(function(_0x3c10c7){_0x3c10c7(_0x336756);});}return new(_0x5b1805||(_0x5b1805=Promise))(function(_0x3a66a7,_0x40889c){function _0x6b1299(_0x2a4045){try{_0x217f44(_0x52e596[a7_0x2f2a('0x42')](_0x2a4045));}catch(_0x2c1217){_0x40889c(_0x2c1217);}}function _0x1fe3a7(_0x3204a2){try{_0x217f44(_0x52e596[a7_0x2f2a('0x9')](_0x3204a2));}catch(_0xce0b6b){_0x40889c(_0xce0b6b);}}function _0x217f44(_0x1acef2){_0x1acef2[a7_0x2f2a('0x57')]?_0x3a66a7(_0x1acef2[a7_0x2f2a('0x12')]):_0x3c4009(_0x1acef2[a7_0x2f2a('0x12')])[a7_0x2f2a('0x10')](_0x6b1299,_0x1fe3a7);}_0x217f44((_0x52e596=_0x52e596['apply'](_0x3bef68,_0x355ad2||[]))['next']());});};Object[a7_0x2f2a('0x38')](exports,a7_0x2f2a('0x2c'),{'value':!![]});exports[a7_0x2f2a('0x26')]=void 0x0;const Observable_1=require('rxjs/internal/Observable');const cache_1=require(a7_0x2f2a('0x33'));const output_1=require(a7_0x2f2a('0x30'));const utils_1=require(a7_0x2f2a('0x34'));const stripJsonComments=require(a7_0x2f2a('0x3'));const fs_1=require('fs');const distributed_execution_api_1=require(a7_0x2f2a('0x64'));const file_storage_1=require(a7_0x2f2a('0x60'));const e2e_encryption_1=require(a7_0x2f2a('0x51'));const waiter_1=require('../../../utilities/waiter');const environment_1=require(a7_0x2f2a('0x1f'));const print_run_group_error_1=require(a7_0x2f2a('0x8'));const create_no_new_messages_timeout_1=require(a7_0x2f2a('0x4e'));class NoopLifeCycle{['scheduleTask'](_0x42b178){}['startTask'](_0x2bf9d9){}[a7_0x2f2a('0x1a')](_0x2f57ef,_0x314f9b){}}function runDistributedExecution(_0x14a945,_0x431ab0,_0x1465b3,_0x5e127e,_0x45faac,_0x351fa7,_0x30f8c3){return __awaiter(this,void 0x0,void 0x0,function*(){const _0x347141=JSON[a7_0x2f2a('0xb')](stripJsonComments(fs_1[a7_0x2f2a('0x4d')](a7_0x2f2a('0x2'))['toString']()));const _0x38b170=new TaskOrderer(_0x1465b3[a7_0x2f2a('0xa')],getDefaultDependencyConfigs(_0x347141,_0x431ab0))[a7_0x2f2a('0x5')](_0x30f8c3);const _0x3551a8=yield _0x14a945[a7_0x2f2a('0x31')](distributed_execution_api_1[a7_0x2f2a('0x36')](_0x351fa7,_0x38b170,_0x431ab0));return yield processTasks(_0x14a945,_0x5e127e,_0x45faac,_0x431ab0,_0x3551a8,_0x30f8c3,_0x1465b3);});}function processTasks(_0x2a55dd,_0x1035bd,_0x4816d8,_0x112751,_0x10d6b4,_0x235b7a,_0x4e3b5c){return __awaiter(this,void 0x0,void 0x0,function*(){const _0x366a13={};const _0x8cf2b4=create_no_new_messages_timeout_1[a7_0x2f2a('0x55')]();const _0x486d97=new waiter_1[(a7_0x2f2a('0x32'))]();while(!![]){if(environment_1['VERBOSE_LOGGING']){output_1[a7_0x2f2a('0x25')][a7_0x2f2a('0x41')]({'title':a7_0x2f2a('0x39')});}yield _0x486d97[a7_0x2f2a('0x43')]();const _0x52fb77=yield _0x2a55dd[a7_0x2f2a('0x35')](_0x10d6b4);if(environment_1[a7_0x2f2a('0x5c')]){output_1[a7_0x2f2a('0x25')][a7_0x2f2a('0x41')]({'title':'Status\x20update','bodyLines':[a7_0x2f2a('0x1d')+_0x10d6b4,a7_0x2f2a('0x6')+_0x52fb77[a7_0x2f2a('0x14')],'number\x20of\x20completed\x20tasks:\x20'+_0x52fb77[a7_0x2f2a('0x3e')][a7_0x2f2a('0x3f')],a7_0x2f2a('0x1e')+_0x52fb77[a7_0x2f2a('0x53')]]});}if(_0x52fb77[a7_0x2f2a('0x53')]){output_1[a7_0x2f2a('0x25')][a7_0x2f2a('0x29')]({'title':a7_0x2f2a('0x37'),'bodyLines':[a7_0x2f2a('0x0'),_0x52fb77[a7_0x2f2a('0x53')]]});process[a7_0x2f2a('0x18')](0x1);}_0x8cf2b4(_0x52fb77['completedTasks'][a7_0x2f2a('0x3f')]);for(const _0x44f477 of _0x52fb77['completedTasks']){if(_0x366a13[_0x44f477['taskId']])continue;yield processTask(_0x1035bd,_0x4816d8,_0x4e3b5c,_0x112751,_0x235b7a,_0x44f477);_0x486d97[a7_0x2f2a('0x1')]();_0x366a13[_0x44f477[a7_0x2f2a('0x4a')]]=!![];}if(_0x52fb77['executionStatus']===a7_0x2f2a('0x4c')){return{'commandStatus':_0x52fb77['commandStatus'],'runUrl':_0x52fb77[a7_0x2f2a('0x45')]};}}});}function processTask(_0x524510,_0x4396a1,_0x496d22,_0x249c59,_0x2de617,_0x5858f2){return __awaiter(this,void 0x0,void 0x0,function*(){if(environment_1['VERBOSE_LOGGING']){output_1[a7_0x2f2a('0x25')][a7_0x2f2a('0x41')]({'title':a7_0x2f2a('0x5d')+_0x5858f2['taskId']});}const _0x158675=_0x2de617[a7_0x2f2a('0x3c')](_0x2b9cf0=>_0x5858f2[a7_0x2f2a('0x4a')]===_0x2b9cf0['id']);if(!_0x158675){throw new Error('Found\x20unknown\x20task:\x20'+_0x5858f2[a7_0x2f2a('0x4a')]);}if(environment_1['VERBOSE_LOGGING']){output_1[a7_0x2f2a('0x25')]['note']({'title':a7_0x2f2a('0x4b')+_0x5858f2['url']});}yield _0x524510[a7_0x2f2a('0x22')](_0x5858f2[a7_0x2f2a('0x2a')],_0x5858f2[a7_0x2f2a('0x11')],_0x249c59['cacheDirectory']||a7_0x2f2a('0x28'));const _0x74e842=yield _0x4396a1[a7_0x2f2a('0x24')](Object[a7_0x2f2a('0x4f')](Object[a7_0x2f2a('0x4f')]({},_0x158675),{'hash':_0x5858f2[a7_0x2f2a('0x2a')]}));const _0x15f56b=utils_1[a7_0x2f2a('0x19')](_0x496d22[a7_0x2f2a('0xa')][a7_0x2f2a('0x20')],_0x158675);if(environment_1[a7_0x2f2a('0x5c')]){output_1[a7_0x2f2a('0x25')][a7_0x2f2a('0x41')]({'title':a7_0x2f2a('0x48'),'bodyLines':_0x15f56b});}yield _0x4396a1[a7_0x2f2a('0x50')](_0x5858f2[a7_0x2f2a('0x2a')],_0x74e842,_0x15f56b);output_1['output'][a7_0x2f2a('0x3a')](getCommand(_0x158675));process[a7_0x2f2a('0x46')][a7_0x2f2a('0x44')](_0x74e842[a7_0x2f2a('0x2d')]);output_1['output'][a7_0x2f2a('0x2f')]();});}function getCommand(_0x1ede15){const _0x464b12=utils_1[a7_0x2f2a('0x56')](_0x1ede15[a7_0x2f2a('0x63')]||{});const _0x2572a2=_0x1ede15[a7_0x2f2a('0x5a')][a7_0x2f2a('0x7')]?':'+_0x1ede15[a7_0x2f2a('0x5a')][a7_0x2f2a('0x7')]:'';return['nx','run',_0x1ede15[a7_0x2f2a('0x5a')][a7_0x2f2a('0x54')]+':'+_0x1ede15[a7_0x2f2a('0x5a')]['target']+_0x2572a2,..._0x464b12][a7_0x2f2a('0x3d')]('\x20');}const nxCloudDistributedTasksRunner=(_0x252a92,_0x206e8a,_0x5751e4)=>{if(environment_1[a7_0x2f2a('0x5c')]){output_1['output'][a7_0x2f2a('0x41')]({'title':a7_0x2f2a('0x13')});}_0x206e8a[a7_0x2f2a('0x5e')]=new NoopLifeCycle();const _0x1c37ae=environment_1['getRunGroup']();if(!_0x1c37ae){print_run_group_error_1[a7_0x2f2a('0x1b')]();return process[a7_0x2f2a('0x18')](0x1);}const _0x67852c=new e2e_encryption_1[(a7_0x2f2a('0x17'))](environment_1[a7_0x2f2a('0x65')]||_0x206e8a['encryptionKey']);const _0x40e868=new file_storage_1['FileStorage'](_0x67852c,0x3);const _0x3e1515=new cache_1[(a7_0x2f2a('0xc'))](_0x206e8a);const _0x1f0d59=new distributed_execution_api_1[(a7_0x2f2a('0x5b'))](_0x206e8a);runDistributedExecution(_0x1f0d59,_0x206e8a,_0x5751e4,_0x40e868,_0x3e1515,_0x1c37ae,_0x252a92)[a7_0x2f2a('0x10')](_0x2ab9c5=>{if(_0x2ab9c5[a7_0x2f2a('0x21')]===0x0){output_1[a7_0x2f2a('0x25')][a7_0x2f2a('0x2b')]({'title':a7_0x2f2a('0x27'),'bodyLines':[a7_0x2f2a('0x4')+_0x2ab9c5['runUrl']]});}else{output_1[a7_0x2f2a('0x25')][a7_0x2f2a('0x29')]({'title':a7_0x2f2a('0x40'),'bodyLines':['See\x20run\x20details\x20at\x20'+_0x2ab9c5[a7_0x2f2a('0x45')]]});}process['exit'](_0x2ab9c5[a7_0x2f2a('0x21')]);})['catch'](_0x2b3330=>{output_1[a7_0x2f2a('0x25')]['error']({'title':a7_0x2f2a('0xf'),'bodyLines':[_0x2b3330[a7_0x2f2a('0x52')]]});if(_0x2b3330[a7_0x2f2a('0x2e')]){console[a7_0x2f2a('0x47')](_0x2b3330[a7_0x2f2a('0x2e')]);}else{console[a7_0x2f2a('0x47')](_0x2b3330);}_0x1f0d59[a7_0x2f2a('0x16')](_0x1c37ae,a7_0x2f2a('0x15')+_0x2b3330[a7_0x2f2a('0x52')]+'\x22')['finally'](()=>process[a7_0x2f2a('0x18')](0x1));});return new Observable_1['Observable'](()=>{});};exports[a7_0x2f2a('0x26')]=nxCloudDistributedTasksRunner;class TaskOrderer{constructor(_0x4ba4cf,_0x35d6db){this[a7_0x2f2a('0xa')]=_0x4ba4cf;this[a7_0x2f2a('0x5f')]=_0x35d6db;}[a7_0x2f2a('0x5')](_0x4da07f){if(_0x4da07f['length']===0x0)return[];const _0x400fc5=[];const _0x185702=this['createTaskGraph'](_0x4da07f);const _0x1d5d72=new Set(_0x4da07f['map'](_0x4b8c6d=>_0x4b8c6d['id']));let _0x3aa94f=0x0;while(_0x1d5d72['size']>0x0){const _0x20b5b9=_0x400fc5[_0x3aa94f]=[];for(const _0x88040b of _0x1d5d72){let _0x306f84=!![];for(const _0xc05f2e of _0x185702[a7_0x2f2a('0xd')][_0x88040b]){if(_0x1d5d72[a7_0x2f2a('0x59')](_0xc05f2e)){_0x306f84=![];break;}}if(!_0x306f84){continue;}const _0x2ad8f2=_0x185702['tasks'][_0x88040b];_0x20b5b9[a7_0x2f2a('0x61')](_0x2ad8f2);}for(const _0x123e92 of _0x20b5b9){_0x1d5d72['delete'](_0x123e92['id']);}_0x3aa94f++;}return _0x400fc5;}[a7_0x2f2a('0x49')](_0x4101c1){const _0x8dbacf={'tasks':{},'dependencies':{}};for(const _0x24e103 of _0x4101c1){_0x8dbacf['tasks'][_0x24e103['id']]=_0x24e103;_0x8dbacf[a7_0x2f2a('0xd')][_0x24e103['id']]=[];const _0x42acd0=utils_1[a7_0x2f2a('0x58')](_0x24e103['target'],this[a7_0x2f2a('0x5f')],this[a7_0x2f2a('0xa')]);if(!_0x42acd0){continue;}const _0x27e452=new Set(this[a7_0x2f2a('0xa')][a7_0x2f2a('0xd')][_0x24e103[a7_0x2f2a('0x5a')][a7_0x2f2a('0x54')]]['map'](_0x2daa9b=>_0x2daa9b[a7_0x2f2a('0x5a')]));for(const _0x198fe1 of _0x42acd0){if(_0x198fe1[a7_0x2f2a('0x62')]===a7_0x2f2a('0x23')){for(const _0x1141d0 of _0x4101c1){if(_0x1141d0[a7_0x2f2a('0x5a')][a7_0x2f2a('0x54')]===_0x24e103[a7_0x2f2a('0x5a')][a7_0x2f2a('0x54')]&&_0x1141d0['target'][a7_0x2f2a('0x5a')]===_0x198fe1[a7_0x2f2a('0x5a')]){_0x8dbacf[a7_0x2f2a('0xd')][_0x24e103['id']][a7_0x2f2a('0x61')](_0x1141d0['id']);}}}else if(_0x198fe1[a7_0x2f2a('0x62')]===a7_0x2f2a('0xd')){for(const _0x379724 of _0x4101c1){if(_0x27e452[a7_0x2f2a('0x59')](_0x379724[a7_0x2f2a('0x5a')][a7_0x2f2a('0x54')])&&_0x379724[a7_0x2f2a('0x5a')][a7_0x2f2a('0x5a')]===_0x198fe1[a7_0x2f2a('0x5a')]){_0x8dbacf[a7_0x2f2a('0xd')][_0x24e103['id']][a7_0x2f2a('0x61')](_0x379724['id']);}}}}}return _0x8dbacf;}}function getDefaultDependencyConfigs(_0x25f623,_0x2929f9){var _0x382492,_0x30e0b3;const _0x1120cc=(_0x382492=_0x25f623[a7_0x2f2a('0x3b')])!==null&&_0x382492!==void 0x0?_0x382492:{};const _0x1b4f39=_0x2929f9?(_0x30e0b3=_0x2929f9['strictlyOrderedTargets'])!==null&&_0x30e0b3!==void 0x0?_0x30e0b3:[a7_0x2f2a('0xe')]:[];for(const _0x554bb1 of _0x1b4f39){_0x1120cc[_0x554bb1]=_0x1120cc[_0x554bb1]||[];_0x1120cc[_0x554bb1][a7_0x2f2a('0x61')]({'target':_0x554bb1,'projects':a7_0x2f2a('0xd')});}return _0x1120cc;}
|
|
1
|
+
"use strict";
|
|
2
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
+
});
|
|
10
|
+
};
|
|
11
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
+
exports.nxCloudDistributedTasksRunner = void 0;
|
|
13
|
+
const Observable_1 = require("rxjs/internal/Observable");
|
|
14
|
+
const cache_1 = require("@nrwl/workspace/src/tasks-runner/cache");
|
|
15
|
+
const output_1 = require("@nrwl/workspace/src/utilities/output");
|
|
16
|
+
const utils_1 = require("@nrwl/workspace/src/tasks-runner/utils");
|
|
17
|
+
const stripJsonComments = require("strip-json-comments");
|
|
18
|
+
const fs_1 = require("fs");
|
|
19
|
+
const distributed_execution_api_1 = require("./distributed-execution.api");
|
|
20
|
+
const file_storage_1 = require("../../file-storage/file-storage");
|
|
21
|
+
const e2e_encryption_1 = require("../../file-storage/e2e-encryption");
|
|
22
|
+
const waiter_1 = require("../../../utilities/waiter");
|
|
23
|
+
const environment_1 = require("../../../utilities/environment");
|
|
24
|
+
const print_run_group_error_1 = require("../../error/print-run-group-error");
|
|
25
|
+
const create_no_new_messages_timeout_1 = require("../../../utilities/create-no-new-messages-timeout");
|
|
26
|
+
const metric_logger_1 = require("../../../utilities/metric-logger");
|
|
27
|
+
class NoopLifeCycle {
|
|
28
|
+
scheduleTask(task) { }
|
|
29
|
+
startTask(task) { }
|
|
30
|
+
endTask(task, code) { }
|
|
31
|
+
}
|
|
32
|
+
function runDistributedExecution(api, options, context, fileStorage, cache, runGroup, tasks) {
|
|
33
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
34
|
+
const nxjson = JSON.parse(stripJsonComments((0, fs_1.readFileSync)('nx.json').toString()));
|
|
35
|
+
const stages = new TaskOrderer(context.projectGraph, getDefaultDependencyConfigs(nxjson, options)).splitTasksIntoStages(tasks);
|
|
36
|
+
const id = yield api.start((0, distributed_execution_api_1.createStartRequest)(runGroup, stages, options));
|
|
37
|
+
return yield processTasks(api, fileStorage, cache, options, id, tasks, context);
|
|
38
|
+
});
|
|
39
|
+
}
|
|
40
|
+
function processTasks(api, fileStorage, cache, options, executionId, tasks, context) {
|
|
41
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
42
|
+
const processedTasks = {};
|
|
43
|
+
const failIfNumberOfCompletedTasksDoesNotChangeIn30Mins = (0, create_no_new_messages_timeout_1.createNoNewMessagesTimeout)();
|
|
44
|
+
const waiter = new waiter_1.Waiter();
|
|
45
|
+
while (true) {
|
|
46
|
+
if (environment_1.VERBOSE_LOGGING) {
|
|
47
|
+
output_1.output.note({
|
|
48
|
+
title: 'Waiting...',
|
|
49
|
+
});
|
|
50
|
+
}
|
|
51
|
+
yield waiter.wait();
|
|
52
|
+
const r = yield api.status(executionId);
|
|
53
|
+
if (environment_1.VERBOSE_LOGGING) {
|
|
54
|
+
output_1.output.note({
|
|
55
|
+
title: `Status update`,
|
|
56
|
+
bodyLines: [
|
|
57
|
+
`executionId: ${executionId}`,
|
|
58
|
+
`executionStatus: ${r.executionStatus}`,
|
|
59
|
+
`number of completed tasks: ${r.completedTasks.length}`,
|
|
60
|
+
`error: ${r.criticalErrorMessage}`,
|
|
61
|
+
],
|
|
62
|
+
});
|
|
63
|
+
}
|
|
64
|
+
if (r.criticalErrorMessage) {
|
|
65
|
+
output_1.output.error({
|
|
66
|
+
title: 'Distributed Execution Terminated',
|
|
67
|
+
bodyLines: ['Error:', r.criticalErrorMessage],
|
|
68
|
+
});
|
|
69
|
+
process.exit(1);
|
|
70
|
+
}
|
|
71
|
+
failIfNumberOfCompletedTasksDoesNotChangeIn30Mins(r.completedTasks.length);
|
|
72
|
+
for (const t of r.completedTasks) {
|
|
73
|
+
if (processedTasks[t.taskId])
|
|
74
|
+
continue;
|
|
75
|
+
yield processTask(fileStorage, cache, context, options, tasks, t);
|
|
76
|
+
waiter.reset();
|
|
77
|
+
processedTasks[t.taskId] = true;
|
|
78
|
+
}
|
|
79
|
+
if (r.executionStatus === 'COMPLETED') {
|
|
80
|
+
return { commandStatus: r.commandStatus, runUrl: r.runUrl };
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
});
|
|
84
|
+
}
|
|
85
|
+
function processTask(fileStorage, cache, context, options, tasks, completedTask) {
|
|
86
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
87
|
+
if (environment_1.VERBOSE_LOGGING) {
|
|
88
|
+
output_1.output.note({
|
|
89
|
+
title: `Processing task ${completedTask.taskId}`,
|
|
90
|
+
});
|
|
91
|
+
}
|
|
92
|
+
const matchingTask = tasks.find((tt) => completedTask.taskId === tt.id);
|
|
93
|
+
if (!matchingTask) {
|
|
94
|
+
throw new Error(`Found unknown task: ${completedTask.taskId}`);
|
|
95
|
+
}
|
|
96
|
+
if (environment_1.VERBOSE_LOGGING) {
|
|
97
|
+
output_1.output.note({
|
|
98
|
+
title: `Retrieving artifacts from ${completedTask.url}`,
|
|
99
|
+
});
|
|
100
|
+
}
|
|
101
|
+
yield fileStorage.retrieve(completedTask.hash, completedTask.url, options.cacheDirectory || './node_modules/.cache/nx');
|
|
102
|
+
const cachedResult = yield cache.get(Object.assign(Object.assign({}, matchingTask), { hash: completedTask.hash }));
|
|
103
|
+
const outputs = (0, utils_1.getOutputs)(context.projectGraph.nodes, matchingTask);
|
|
104
|
+
if (environment_1.VERBOSE_LOGGING) {
|
|
105
|
+
output_1.output.note({
|
|
106
|
+
title: `Extracting artifacts`,
|
|
107
|
+
bodyLines: outputs,
|
|
108
|
+
});
|
|
109
|
+
}
|
|
110
|
+
yield cache.copyFilesFromCache(completedTask.hash, cachedResult, outputs);
|
|
111
|
+
output_1.output.logCommand(getCommand(matchingTask));
|
|
112
|
+
process.stdout.write(cachedResult.terminalOutput);
|
|
113
|
+
output_1.output.addVerticalSeparator();
|
|
114
|
+
});
|
|
115
|
+
}
|
|
116
|
+
function getCommand(task) {
|
|
117
|
+
const args = (0, utils_1.unparse)(task.overrides || {});
|
|
118
|
+
const config = task.target.configuration
|
|
119
|
+
? `:${task.target.configuration}`
|
|
120
|
+
: '';
|
|
121
|
+
return [
|
|
122
|
+
'nx',
|
|
123
|
+
'run',
|
|
124
|
+
`${task.target.project}:${task.target.target}${config}`,
|
|
125
|
+
...args,
|
|
126
|
+
].join(' ');
|
|
127
|
+
}
|
|
128
|
+
const nxCloudDistributedTasksRunner = (tasks, options, context) => {
|
|
129
|
+
if (environment_1.VERBOSE_LOGGING) {
|
|
130
|
+
output_1.output.note({
|
|
131
|
+
title: 'Starting distributed command execution',
|
|
132
|
+
});
|
|
133
|
+
}
|
|
134
|
+
options.lifeCycle = new NoopLifeCycle();
|
|
135
|
+
const runGroup = (0, environment_1.getRunGroup)();
|
|
136
|
+
if (!runGroup) {
|
|
137
|
+
(0, print_run_group_error_1.printRunGroupError)();
|
|
138
|
+
return process.exit(1);
|
|
139
|
+
}
|
|
140
|
+
const encryption = new e2e_encryption_1.E2EEncryption(environment_1.ENCRYPTION_KEY || options.encryptionKey);
|
|
141
|
+
const fileStorage = new file_storage_1.FileStorage(encryption, 3);
|
|
142
|
+
const cache = new cache_1.Cache(options);
|
|
143
|
+
const api = new distributed_execution_api_1.DistributedExecutionApi(options);
|
|
144
|
+
runDistributedExecution(api, options, context, fileStorage, cache, runGroup, tasks)
|
|
145
|
+
.then((r) => __awaiter(void 0, void 0, void 0, function* () {
|
|
146
|
+
if (r.commandStatus === 0) {
|
|
147
|
+
output_1.output.success({
|
|
148
|
+
title: 'Successfully completed running the command.',
|
|
149
|
+
bodyLines: [`See run details at ${r.runUrl}`],
|
|
150
|
+
});
|
|
151
|
+
}
|
|
152
|
+
else {
|
|
153
|
+
output_1.output.error({
|
|
154
|
+
title: 'Command execution failed.',
|
|
155
|
+
bodyLines: [`See run details at ${r.runUrl}`],
|
|
156
|
+
});
|
|
157
|
+
}
|
|
158
|
+
yield (0, metric_logger_1.submitRunMetrics)(options);
|
|
159
|
+
process.exit(r.commandStatus);
|
|
160
|
+
}))
|
|
161
|
+
.catch((e) => {
|
|
162
|
+
output_1.output.error({
|
|
163
|
+
title: 'Unable to complete a run.',
|
|
164
|
+
bodyLines: [e.message],
|
|
165
|
+
});
|
|
166
|
+
if (e.axiosException) {
|
|
167
|
+
console.log(e.axiosException);
|
|
168
|
+
}
|
|
169
|
+
else {
|
|
170
|
+
console.log(e);
|
|
171
|
+
}
|
|
172
|
+
api
|
|
173
|
+
.completeRunGroupWithError(runGroup, `Main job terminated with an error: "${e.message}"`)
|
|
174
|
+
.finally(() => process.exit(1));
|
|
175
|
+
});
|
|
176
|
+
return new Observable_1.Observable(() => { });
|
|
177
|
+
};
|
|
178
|
+
exports.nxCloudDistributedTasksRunner = nxCloudDistributedTasksRunner;
|
|
179
|
+
class TaskOrderer {
|
|
180
|
+
constructor(projectGraph, defaultTargetDependencies) {
|
|
181
|
+
this.projectGraph = projectGraph;
|
|
182
|
+
this.defaultTargetDependencies = defaultTargetDependencies;
|
|
183
|
+
}
|
|
184
|
+
splitTasksIntoStages(tasks) {
|
|
185
|
+
if (tasks.length === 0)
|
|
186
|
+
return [];
|
|
187
|
+
const stages = [];
|
|
188
|
+
const taskGraph = this.createTaskGraph(tasks);
|
|
189
|
+
const notStagedTaskIds = new Set(tasks.map((t) => t.id));
|
|
190
|
+
let stageIndex = 0;
|
|
191
|
+
// Loop through tasks and try to stage them. As tasks are staged, they are removed from the loop
|
|
192
|
+
while (notStagedTaskIds.size > 0) {
|
|
193
|
+
const currentStage = (stages[stageIndex] = []);
|
|
194
|
+
for (const taskId of notStagedTaskIds) {
|
|
195
|
+
let ready = true;
|
|
196
|
+
for (const dependency of taskGraph.dependencies[taskId]) {
|
|
197
|
+
if (notStagedTaskIds.has(dependency)) {
|
|
198
|
+
// dependency has not been staged yet, this task is not ready to be staged.
|
|
199
|
+
ready = false;
|
|
200
|
+
break;
|
|
201
|
+
}
|
|
202
|
+
}
|
|
203
|
+
// Some dependency still has not been staged, skip it for now, it will be processed again
|
|
204
|
+
if (!ready) {
|
|
205
|
+
continue;
|
|
206
|
+
}
|
|
207
|
+
// All the dependencies have been staged, let's stage it.
|
|
208
|
+
const task = taskGraph.tasks[taskId];
|
|
209
|
+
currentStage.push(task);
|
|
210
|
+
}
|
|
211
|
+
// Remove the entire new stage of tasks from the list
|
|
212
|
+
for (const task of currentStage) {
|
|
213
|
+
notStagedTaskIds.delete(task.id);
|
|
214
|
+
}
|
|
215
|
+
stageIndex++;
|
|
216
|
+
}
|
|
217
|
+
return stages;
|
|
218
|
+
}
|
|
219
|
+
createTaskGraph(tasks) {
|
|
220
|
+
const graph = {
|
|
221
|
+
tasks: {},
|
|
222
|
+
dependencies: {},
|
|
223
|
+
};
|
|
224
|
+
for (const task of tasks) {
|
|
225
|
+
graph.tasks[task.id] = task;
|
|
226
|
+
graph.dependencies[task.id] = [];
|
|
227
|
+
const dependencyConfigs = (0, utils_1.getDependencyConfigs)(task.target, this.defaultTargetDependencies, this.projectGraph);
|
|
228
|
+
if (!dependencyConfigs) {
|
|
229
|
+
continue;
|
|
230
|
+
}
|
|
231
|
+
const projectDependencies = new Set(this.projectGraph.dependencies[task.target.project].map((dependency) => dependency.target));
|
|
232
|
+
for (const dependencyConfig of dependencyConfigs) {
|
|
233
|
+
if (dependencyConfig.projects === 'self') {
|
|
234
|
+
for (const t of tasks) {
|
|
235
|
+
if (t.target.project === task.target.project &&
|
|
236
|
+
t.target.target === dependencyConfig.target) {
|
|
237
|
+
graph.dependencies[task.id].push(t.id);
|
|
238
|
+
}
|
|
239
|
+
}
|
|
240
|
+
}
|
|
241
|
+
else if (dependencyConfig.projects === 'dependencies') {
|
|
242
|
+
for (const t of tasks) {
|
|
243
|
+
if (projectDependencies.has(t.target.project) &&
|
|
244
|
+
t.target.target === dependencyConfig.target) {
|
|
245
|
+
graph.dependencies[task.id].push(t.id);
|
|
246
|
+
}
|
|
247
|
+
}
|
|
248
|
+
}
|
|
249
|
+
}
|
|
250
|
+
}
|
|
251
|
+
return graph;
|
|
252
|
+
}
|
|
253
|
+
}
|
|
254
|
+
function getDefaultDependencyConfigs(nxJson, runnerOptions) {
|
|
255
|
+
var _a, _b;
|
|
256
|
+
const defaults = (_a = nxJson.targetDependencies) !== null && _a !== void 0 ? _a : {};
|
|
257
|
+
const strictlyOrderedTargets = runnerOptions
|
|
258
|
+
? (_b = runnerOptions.strictlyOrderedTargets) !== null && _b !== void 0 ? _b : ['build']
|
|
259
|
+
: [];
|
|
260
|
+
// Strictly Ordered Targets depend on their dependencies
|
|
261
|
+
for (const target of strictlyOrderedTargets) {
|
|
262
|
+
defaults[target] = defaults[target] || [];
|
|
263
|
+
defaults[target].push({
|
|
264
|
+
target,
|
|
265
|
+
projects: 'dependencies',
|
|
266
|
+
});
|
|
267
|
+
}
|
|
268
|
+
return defaults;
|
|
269
|
+
}
|
|
270
|
+
//# sourceMappingURL=distributed-execution.runner.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"distributed-execution.runner.js","sourceRoot":"","sources":["../../../../../../../../libs/nx-packages/nx-cloud/src/lib/core/runners/distributed-execution/distributed-execution.runner.ts"],"names":[],"mappings":";;;;;;;;;;;;AAIA,yDAAsD;AACtD,kEAA+D;AAC/D,iEAA8D;AAC9D,kEAIgD;AAChD,yDAAyD;AACzD,2BAAkC;AAClC,2EAGqC;AAErC,kEAA8D;AAC9D,sEAAkE;AAClE,sDAAmD;AACnD,gEAIwC;AACxC,6EAAuE;AACvE,sGAA+F;
|
|
1
|
+
{"version":3,"file":"distributed-execution.runner.js","sourceRoot":"","sources":["../../../../../../../../libs/nx-packages/nx-cloud/src/lib/core/runners/distributed-execution/distributed-execution.runner.ts"],"names":[],"mappings":";;;;;;;;;;;;AAIA,yDAAsD;AACtD,kEAA+D;AAC/D,iEAA8D;AAC9D,kEAIgD;AAChD,yDAAyD;AACzD,2BAAkC;AAClC,2EAGqC;AAErC,kEAA8D;AAC9D,sEAAkE;AAClE,sDAAmD;AACnD,gEAIwC;AACxC,6EAAuE;AACvE,sGAA+F;AAC/F,oEAAoE;AAEpE,MAAM,aAAa;IACjB,YAAY,CAAC,IAAU,IAAS,CAAC;IAEjC,SAAS,CAAC,IAAU,IAAS,CAAC;IAE9B,OAAO,CAAC,IAAU,EAAE,IAAY,IAAS,CAAC;CAC3C;AAED,SAAe,uBAAuB,CACpC,GAA4B,EAC5B,OAA+B,EAC/B,OAAY,EACZ,WAAwB,EACxB,KAAY,EACZ,QAAgB,EAChB,KAAa;;QAEb,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CACvB,iBAAiB,CAAC,IAAA,iBAAY,EAAC,SAAS,CAAC,CAAC,QAAQ,EAAE,CAAC,CACtD,CAAC;QACF,MAAM,MAAM,GAAG,IAAI,WAAW,CAC5B,OAAO,CAAC,YAAY,EACpB,2BAA2B,CAAC,MAAM,EAAE,OAAc,CAAC,CACpD,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC;QAE9B,MAAM,EAAE,GAAG,MAAM,GAAG,CAAC,KAAK,CAAC,IAAA,8CAAkB,EAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;QAC1E,OAAO,MAAM,YAAY,CACvB,GAAG,EACH,WAAW,EACX,KAAK,EACL,OAAO,EACP,EAAE,EACF,KAAK,EACL,OAAO,CACR,CAAC;IACJ,CAAC;CAAA;AAED,SAAe,YAAY,CACzB,GAA4B,EAC5B,WAAwB,EACxB,KAAY,EACZ,OAA+B,EAC/B,WAAmB,EACnB,KAAa,EACb,OAAY;;QAEZ,MAAM,cAAc,GAAG,EAAE,CAAC;QAC1B,MAAM,iDAAiD,GACrD,IAAA,2DAA0B,GAAE,CAAC;QAC/B,MAAM,MAAM,GAAG,IAAI,eAAM,EAAE,CAAC;QAC5B,OAAO,IAAI,EAAE;YACX,IAAI,6BAAe,EAAE;gBACnB,eAAM,CAAC,IAAI,CAAC;oBACV,KAAK,EAAE,YAAY;iBACpB,CAAC,CAAC;aACJ;YAED,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;YACpB,MAAM,CAAC,GAAG,MAAM,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;YAExC,IAAI,6BAAe,EAAE;gBACnB,eAAM,CAAC,IAAI,CAAC;oBACV,KAAK,EAAE,eAAe;oBACtB,SAAS,EAAE;wBACT,gBAAgB,WAAW,EAAE;wBAC7B,oBAAoB,CAAC,CAAC,eAAe,EAAE;wBACvC,8BAA8B,CAAC,CAAC,cAAc,CAAC,MAAM,EAAE;wBACvD,UAAU,CAAC,CAAC,oBAAoB,EAAE;qBACnC;iBACF,CAAC,CAAC;aACJ;YAED,IAAI,CAAC,CAAC,oBAAoB,EAAE;gBAC1B,eAAM,CAAC,KAAK,CAAC;oBACX,KAAK,EAAE,kCAAkC;oBACzC,SAAS,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC,oBAAoB,CAAC;iBAC9C,CAAC,CAAC;gBACH,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;aACjB;YAED,iDAAiD,CAAC,CAAC,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;YAE3E,KAAK,MAAM,CAAC,IAAI,CAAC,CAAC,cAAc,EAAE;gBAChC,IAAI,cAAc,CAAC,CAAC,CAAC,MAAM,CAAC;oBAAE,SAAS;gBACvC,MAAM,WAAW,CAAC,WAAW,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;gBAClE,MAAM,CAAC,KAAK,EAAE,CAAC;gBACf,cAAc,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC;aACjC;YACD,IAAI,CAAC,CAAC,eAAe,KAAK,WAAW,EAAE;gBACrC,OAAO,EAAE,aAAa,EAAE,CAAC,CAAC,aAAa,EAAE,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC;aAC7D;SACF;IACH,CAAC;CAAA;AAED,SAAe,WAAW,CACxB,WAAwB,EACxB,KAAY,EACZ,OAAY,EACZ,OAA+B,EAC/B,KAAa,EACb,aAA4D;;QAE5D,IAAI,6BAAe,EAAE;YACnB,eAAM,CAAC,IAAI,CAAC;gBACV,KAAK,EAAE,mBAAmB,aAAa,CAAC,MAAM,EAAE;aACjD,CAAC,CAAC;SACJ;QACD,MAAM,YAAY,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,aAAa,CAAC,MAAM,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC;QACxE,IAAI,CAAC,YAAY,EAAE;YACjB,MAAM,IAAI,KAAK,CAAC,uBAAuB,aAAa,CAAC,MAAM,EAAE,CAAC,CAAC;SAChE;QAED,IAAI,6BAAe,EAAE;YACnB,eAAM,CAAC,IAAI,CAAC;gBACV,KAAK,EAAE,6BAA6B,aAAa,CAAC,GAAG,EAAE;aACxD,CAAC,CAAC;SACJ;QAED,MAAM,WAAW,CAAC,QAAQ,CACxB,aAAa,CAAC,IAAI,EAClB,aAAa,CAAC,GAAG,EACjB,OAAO,CAAC,cAAc,IAAI,0BAA0B,CACrD,CAAC;QAEF,MAAM,YAAY,GAAG,MAAM,KAAK,CAAC,GAAG,iCAC/B,YAAY,KACf,IAAI,EAAE,aAAa,CAAC,IAAI,IACxB,CAAC;QACH,MAAM,OAAO,GAAG,IAAA,kBAAU,EAAC,OAAO,CAAC,YAAY,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC;QAErE,IAAI,6BAAe,EAAE;YACnB,eAAM,CAAC,IAAI,CAAC;gBACV,KAAK,EAAE,sBAAsB;gBAC7B,SAAS,EAAE,OAAO;aACnB,CAAC,CAAC;SACJ;QACD,MAAM,KAAK,CAAC,kBAAkB,CAAC,aAAa,CAAC,IAAI,EAAE,YAAY,EAAE,OAAO,CAAC,CAAC;QAE1E,eAAM,CAAC,UAAU,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC,CAAC;QAC5C,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC;QAClD,eAAM,CAAC,oBAAoB,EAAE,CAAC;IAChC,CAAC;CAAA;AAED,SAAS,UAAU,CAAC,IAAU;IAC5B,MAAM,IAAI,GAAa,IAAA,eAAO,EAAC,IAAI,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC;IAErD,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,aAAa;QACtC,CAAC,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE;QACjC,CAAC,CAAC,EAAE,CAAC;IAEP,OAAO;QACL,IAAI;QACJ,KAAK;QACL,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,MAAM,EAAE;QACvD,GAAG,IAAI;KACR,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACd,CAAC;AAEM,MAAM,6BAA6B,GAAQ,CAChD,KAAa,EACb,OAA+B,EAC/B,OAAY,EACmB,EAAE;IACjC,IAAI,6BAAe,EAAE;QACnB,eAAM,CAAC,IAAI,CAAC;YACV,KAAK,EAAE,wCAAwC;SAChD,CAAC,CAAC;KACJ;IACD,OAAO,CAAC,SAAS,GAAG,IAAI,aAAa,EAAE,CAAC;IACxC,MAAM,QAAQ,GAAG,IAAA,yBAAW,GAAE,CAAC;IAC/B,IAAI,CAAC,QAAQ,EAAE;QACb,IAAA,0CAAkB,GAAE,CAAC;QACrB,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KACxB;IAED,MAAM,UAAU,GAAG,IAAI,8BAAa,CAAC,4BAAc,IAAI,OAAO,CAAC,aAAa,CAAC,CAAC;IAC9E,MAAM,WAAW,GAAG,IAAI,0BAAW,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;IACnD,MAAM,KAAK,GAAG,IAAI,aAAK,CAAC,OAAO,CAAC,CAAC;IACjC,MAAM,GAAG,GAAG,IAAI,mDAAuB,CAAC,OAAO,CAAC,CAAC;IAEjD,uBAAuB,CACrB,GAAG,EACH,OAAO,EACP,OAAO,EACP,WAAW,EACX,KAAK,EACL,QAAQ,EACR,KAAK,CACN;SACE,IAAI,CAAC,CAAO,CAAC,EAAE,EAAE;QAChB,IAAI,CAAC,CAAC,aAAa,KAAK,CAAC,EAAE;YACzB,eAAM,CAAC,OAAO,CAAC;gBACb,KAAK,EAAE,6CAA6C;gBACpD,SAAS,EAAE,CAAC,sBAAsB,CAAC,CAAC,MAAM,EAAE,CAAC;aAC9C,CAAC,CAAC;SACJ;aAAM;YACL,eAAM,CAAC,KAAK,CAAC;gBACX,KAAK,EAAE,2BAA2B;gBAClC,SAAS,EAAE,CAAC,sBAAsB,CAAC,CAAC,MAAM,EAAE,CAAC;aAC9C,CAAC,CAAC;SACJ;QAED,MAAM,IAAA,gCAAgB,EAAC,OAAO,CAAC,CAAC;QAChC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC;IAChC,CAAC,CAAA,CAAC;SACD,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;QACX,eAAM,CAAC,KAAK,CAAC;YACX,KAAK,EAAE,2BAA2B;YAClC,SAAS,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;SACvB,CAAC,CAAC;QACH,IAAI,CAAC,CAAC,cAAc,EAAE;YACpB,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC;SAC/B;aAAM;YACL,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;SAChB;QACD,GAAG;aACA,yBAAyB,CACxB,QAAQ,EACR,uCAAuC,CAAC,CAAC,OAAO,GAAG,CACpD;aACA,OAAO,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IACpC,CAAC,CAAC,CAAC;IACL,OAAO,IAAI,uBAAU,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;AAClC,CAAC,CAAC;AAjEW,QAAA,6BAA6B,iCAiExC;AAEF,MAAM,WAAW;IACf,YACmB,YAAiB,EACjB,yBAA8B;QAD9B,iBAAY,GAAZ,YAAY,CAAK;QACjB,8BAAyB,GAAzB,yBAAyB,CAAK;IAC9C,CAAC;IAEJ,oBAAoB,CAAC,KAAa;QAChC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,EAAE,CAAC;QAElC,MAAM,MAAM,GAAa,EAAE,CAAC;QAC5B,MAAM,SAAS,GAAG,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;QAC9C,MAAM,gBAAgB,GAAG,IAAI,GAAG,CAAS,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QACjE,IAAI,UAAU,GAAG,CAAC,CAAC;QAEnB,gGAAgG;QAChG,OAAO,gBAAgB,CAAC,IAAI,GAAG,CAAC,EAAE;YAChC,MAAM,YAAY,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,CAAQ,CAAC;YACtD,KAAK,MAAM,MAAM,IAAI,gBAAgB,EAAE;gBACrC,IAAI,KAAK,GAAG,IAAI,CAAC;gBACjB,KAAK,MAAM,UAAU,IAAI,SAAS,CAAC,YAAY,CAAC,MAAM,CAAC,EAAE;oBACvD,IAAI,gBAAgB,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE;wBACpC,2EAA2E;wBAC3E,KAAK,GAAG,KAAK,CAAC;wBACd,MAAM;qBACP;iBACF;gBAED,yFAAyF;gBACzF,IAAI,CAAC,KAAK,EAAE;oBACV,SAAS;iBACV;gBAED,yDAAyD;gBACzD,MAAM,IAAI,GAAG,SAAS,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;gBACrC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aACzB;YAED,qDAAqD;YACrD,KAAK,MAAM,IAAI,IAAI,YAAY,EAAE;gBAC/B,gBAAgB,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;aAClC;YACD,UAAU,EAAE,CAAC;SACd;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAEO,eAAe,CAAC,KAAa;QACnC,MAAM,KAAK,GAAG;YACZ,KAAK,EAAE,EAAE;YACT,YAAY,EAAE,EAAE;SACjB,CAAC;QACF,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;YACxB,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC;YAC5B,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC;YACjC,MAAM,iBAAiB,GAAG,IAAA,4BAAoB,EAC5C,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,yBAAyB,EAC9B,IAAI,CAAC,YAAY,CAClB,CAAC;YAEF,IAAI,CAAC,iBAAiB,EAAE;gBACtB,SAAS;aACV;YAED,MAAM,mBAAmB,GAAG,IAAI,GAAG,CACjC,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,GAAG,CACrD,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,MAAM,CAClC,CACF,CAAC;YAEF,KAAK,MAAM,gBAAgB,IAAI,iBAAiB,EAAE;gBAChD,IAAI,gBAAgB,CAAC,QAAQ,KAAK,MAAM,EAAE;oBACxC,KAAK,MAAM,CAAC,IAAI,KAAK,EAAE;wBACrB,IACE,CAAC,CAAC,MAAM,CAAC,OAAO,KAAK,IAAI,CAAC,MAAM,CAAC,OAAO;4BACxC,CAAC,CAAC,MAAM,CAAC,MAAM,KAAK,gBAAgB,CAAC,MAAM,EAC3C;4BACA,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;yBACxC;qBACF;iBACF;qBAAM,IAAI,gBAAgB,CAAC,QAAQ,KAAK,cAAc,EAAE;oBACvD,KAAK,MAAM,CAAC,IAAI,KAAK,EAAE;wBACrB,IACE,mBAAmB,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC;4BACzC,CAAC,CAAC,MAAM,CAAC,MAAM,KAAK,gBAAgB,CAAC,MAAM,EAC3C;4BACA,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;yBACxC;qBACF;iBACF;aACF;SACF;QACD,OAAO,KAAK,CAAC;IACf,CAAC;CACF;AAED,SAAS,2BAA2B,CAClC,MAAW,EACX,aAEC;;IAED,MAAM,QAAQ,GAA0B,MAAA,MAAM,CAAC,kBAAkB,mCAAI,EAAE,CAAC;IAExE,MAAM,sBAAsB,GAAG,aAAa;QAC1C,CAAC,CAAC,MAAA,aAAa,CAAC,sBAAsB,mCAAI,CAAC,OAAO,CAAC;QACnD,CAAC,CAAC,EAAE,CAAC;IACP,wDAAwD;IACxD,KAAK,MAAM,MAAM,IAAI,sBAAsB,EAAE;QAC3C,QAAQ,CAAC,MAAM,CAAC,GAAG,QAAQ,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QAC1C,QAAQ,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC;YACpB,MAAM;YACN,QAAQ,EAAE,cAAc;SACzB,CAAC,CAAC;KACJ;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC"}
|
|
@@ -1,11 +1,8 @@
|
|
|
1
|
-
import { MessageReporter } from './message-reporter';
|
|
2
1
|
import { RunContext } from '../models/run-context.model';
|
|
3
2
|
import { TaskExecution } from '../models/task-execution.model';
|
|
4
3
|
export declare class EndOfRunMessage {
|
|
5
|
-
private readonly messages;
|
|
6
4
|
private readonly runContext;
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
patchReporters(): void;
|
|
5
|
+
private readonly taskExecutions;
|
|
6
|
+
constructor(runContext: RunContext, taskExecutions: TaskExecution[]);
|
|
10
7
|
printCacheHitsMessage(): void;
|
|
11
8
|
}
|
|
@@ -4,51 +4,14 @@ exports.EndOfRunMessage = void 0;
|
|
|
4
4
|
const environment_1 = require("../../utilities/environment");
|
|
5
5
|
const print_message_1 = require("../../utilities/print-message");
|
|
6
6
|
class EndOfRunMessage {
|
|
7
|
-
constructor(
|
|
8
|
-
this.messages = messages;
|
|
7
|
+
constructor(runContext, taskExecutions) {
|
|
9
8
|
this.runContext = runContext;
|
|
10
|
-
this.
|
|
11
|
-
this.patchReporters();
|
|
12
|
-
}
|
|
13
|
-
// We patch reporters temporary. Nx 10 should have a proper way of printing remote cache hits.
|
|
14
|
-
patchReporters() {
|
|
15
|
-
try {
|
|
16
|
-
const reporter = require('@nrwl/workspace/src/tasks-runner/default-reporter');
|
|
17
|
-
const old = reporter.DefaultReporter.prototype.printResults;
|
|
18
|
-
const that = this;
|
|
19
|
-
reporter.DefaultReporter.prototype.printResults = function () {
|
|
20
|
-
old.apply(this, arguments);
|
|
21
|
-
that.printCacheHitsMessage();
|
|
22
|
-
};
|
|
23
|
-
}
|
|
24
|
-
catch (e) { }
|
|
25
|
-
try {
|
|
26
|
-
const reporter = require('@nrwl/workspace/src/tasks-runner/run-one-reporter');
|
|
27
|
-
const old = reporter.RunOneReporter.prototype.printResults;
|
|
28
|
-
const that = this;
|
|
29
|
-
reporter.RunOneReporter.prototype.printResults = function () {
|
|
30
|
-
old.apply(this, arguments);
|
|
31
|
-
that.printCacheHitsMessage();
|
|
32
|
-
};
|
|
33
|
-
}
|
|
34
|
-
catch (e) { }
|
|
35
|
-
try {
|
|
36
|
-
const reporter = require('@nrwl/workspace/src/tasks-runner/empty-reporter');
|
|
37
|
-
const old = reporter.EmptyReporter.prototype.printResults;
|
|
38
|
-
const that = this;
|
|
39
|
-
reporter.EmptyReporter.prototype.printResults = function () {
|
|
40
|
-
old.apply(this, arguments);
|
|
41
|
-
that.printCacheHitsMessage();
|
|
42
|
-
};
|
|
43
|
-
}
|
|
44
|
-
catch (e) { }
|
|
9
|
+
this.taskExecutions = taskExecutions;
|
|
45
10
|
}
|
|
46
11
|
printCacheHitsMessage() {
|
|
47
|
-
if (this.messages.anyErrors)
|
|
48
|
-
return;
|
|
49
12
|
if (environment_1.AGENT_RUNNING_IN_DISTRIBUTED_EXECUTION)
|
|
50
13
|
return;
|
|
51
|
-
const hits = this.
|
|
14
|
+
const hits = this.taskExecutions
|
|
52
15
|
.filter((t) => this.runContext.statuses[t.hash] === 'remote-cache-hit')
|
|
53
16
|
.map((t) => t.projectName);
|
|
54
17
|
if (hits.length === 0 && !this.runContext.runUrl) {
|
|
@@ -63,7 +26,7 @@ class EndOfRunMessage {
|
|
|
63
26
|
message.push(`See run details at ${this.runContext.runUrl}`);
|
|
64
27
|
}
|
|
65
28
|
if (message.length > 0) {
|
|
66
|
-
print_message_1.printMessage(message.join(' '));
|
|
29
|
+
(0, print_message_1.printMessage)(message.join(' '));
|
|
67
30
|
}
|
|
68
31
|
}
|
|
69
32
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"end-of-run-message.js","sourceRoot":"","sources":["../../../../../../../libs/nx-packages/nx-cloud/src/lib/core/terminal-output/end-of-run-message.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"end-of-run-message.js","sourceRoot":"","sources":["../../../../../../../libs/nx-packages/nx-cloud/src/lib/core/terminal-output/end-of-run-message.ts"],"names":[],"mappings":";;;AAEA,6DAAqF;AACrF,iEAA6D;AAE7D,MAAa,eAAe;IAC1B,YACmB,UAAsB,EACtB,cAA+B;QAD/B,eAAU,GAAV,UAAU,CAAY;QACtB,mBAAc,GAAd,cAAc,CAAiB;IAElD,CAAC;IAED,qBAAqB;QACnB,IAAI,oDAAsC;YAAE,OAAO;QAEnD,MAAM,IAAI,GAAG,IAAI,CAAC,cAAc;aAC7B,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,kBAAkB,CAAC;aACtE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;QAE7B,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE;YAChD,OAAO;SACR;QAED,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,MAAM,WAAW,CAAC;QACzE,MAAM,OAAO,GAAG,EAAW,CAAC;QAC5B,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;YACnB,OAAO,CAAC,IAAI,CAAC,eAAe,QAAQ,gCAAgC,CAAC,CAAC;SACvE;QACD,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE;YAC1B,OAAO,CAAC,IAAI,CAAC,sBAAsB,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC;SAC9D;QACD,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;YACtB,IAAA,4BAAY,EAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;SACjC;IACH,CAAC;CACF;AA9BD,0CA8BC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"message-reporter.js","sourceRoot":"","sources":["../../../../../../../libs/nx-packages/nx-cloud/src/lib/core/terminal-output/message-reporter.ts"],"names":[],"mappings":";;;AAAA,iEAA8D;AAE9D,iEAA6D;AAE7D,MAAa,eAAe;IAK1B,YAA6B,OAA+B;QAA/B,YAAO,GAAP,OAAO,CAAwB;QAJ5D,eAAU,GAAkB,IAAI,CAAC;QACjC,aAAQ,GAAkB,IAAI,CAAC;QAC/B,YAAO,GAAkB,IAAI,CAAC;IAEiC,CAAC;IAEhE,IAAI,SAAS;QACX,OAAO,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,QAAQ,CAAC;IAC1C,CAAC;IAED,aAAa;QACX,IAAI,IAAI,CAAC,SAAS,EAAE;YAClB,MAAM,SAAS,GAAG,EAAW,CAAC;YAC9B,IAAI,IAAI,CAAC,UAAU,EAAE;gBACnB,SAAS,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC;aACxC;YACD,IAAI,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,QAAQ,KAAK,IAAI,CAAC,UAAU,EAAE;gBACtD,SAAS,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;aACtC;YACD,eAAM,CAAC,IAAI,CAAC;gBACV,KAAK,EAAE,mBAAmB;gBAC1B,SAAS;aACV,CAAC,CAAC;SACJ;QACD,IAAI,IAAI,CAAC,OAAO,EAAE;YAChB,4BAAY,
|
|
1
|
+
{"version":3,"file":"message-reporter.js","sourceRoot":"","sources":["../../../../../../../libs/nx-packages/nx-cloud/src/lib/core/terminal-output/message-reporter.ts"],"names":[],"mappings":"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"}
|
|
@@ -46,7 +46,7 @@ class OutputObfuscator {
|
|
|
46
46
|
}
|
|
47
47
|
loadSecretKeys() {
|
|
48
48
|
var _a;
|
|
49
|
-
const userDefinedMaskedProps = (_a = JSON.parse(stripJsonComments(fs_1.readFileSync('nx.json').toString()))
|
|
49
|
+
const userDefinedMaskedProps = (_a = JSON.parse(stripJsonComments((0, fs_1.readFileSync)('nx.json').toString()))
|
|
50
50
|
.tasksRunnerOptions.default.options.maskedProperties) !== null && _a !== void 0 ? _a : [];
|
|
51
51
|
/**
|
|
52
52
|
* Try and convert all secret keys from snake-case to camelCase so we can properly
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"output-obfuscator.js","sourceRoot":"","sources":["../../../../../../../libs/nx-packages/nx-cloud/src/lib/core/terminal-output/output-obfuscator.ts"],"names":[],"mappings":";;;AAAA,yDAAyD;AACzD,2BAAkC;AAElC,MAAa,gBAAgB;IAG3B;QAFQ,qBAAgB,GAAa,EAAE,CAAC;QAGtC,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;IAChD,CAAC;IAED,SAAS,CAAC,cAAsB;QAC9B,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE;YACjC,OAAO,cAAc,CAAC;SACvB;QAED;;;;;WAKG;QACH,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE;YAC1C,MAAM,kBAAkB,GAAG,IAAI,MAAM,CAAC,MAAM,SAAS,UAAU,CAAC,CAAC;YACjE,cAAc,GAAG,cAAc,CAAC,OAAO,CAAC,kBAAkB,EAAE,YAAY,CAAC,CAAC;QAC5E,CAAC,CAAC,CAAC;QAEH;;;WAGG;QACH,MAAM,YAAY,GAAa,IAAI,CAAC,gBAAgB;aACjD,MAAM,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,IAAI,OAAO,CAAC,GAAG,CAAC;aAC/C,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAE,CAAC,CAAC;QAC/C,YAAY,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,EAAE;YACnC,cAAc,GAAG,cAAc,CAAC,OAAO,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;QACnE,CAAC,CAAC,CAAC;QAEH,OAAO,cAAc,CAAC;IACxB,CAAC;IAED,WAAW,CAAC,KAAa;QACvB,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;YAC1B,OAAO,KAAK;iBACT,WAAW,EAAE;iBACb,OAAO,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC;SAC9D;aAAM;YACL,OAAO,KAAK,CAAC;SACd;IACH,CAAC;IAEO,cAAc;;QACpB,MAAM,sBAAsB,GAC1B,MAAA,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,iBAAY,
|
|
1
|
+
{"version":3,"file":"output-obfuscator.js","sourceRoot":"","sources":["../../../../../../../libs/nx-packages/nx-cloud/src/lib/core/terminal-output/output-obfuscator.ts"],"names":[],"mappings":";;;AAAA,yDAAyD;AACzD,2BAAkC;AAElC,MAAa,gBAAgB;IAG3B;QAFQ,qBAAgB,GAAa,EAAE,CAAC;QAGtC,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;IAChD,CAAC;IAED,SAAS,CAAC,cAAsB;QAC9B,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE;YACjC,OAAO,cAAc,CAAC;SACvB;QAED;;;;;WAKG;QACH,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE;YAC1C,MAAM,kBAAkB,GAAG,IAAI,MAAM,CAAC,MAAM,SAAS,UAAU,CAAC,CAAC;YACjE,cAAc,GAAG,cAAc,CAAC,OAAO,CAAC,kBAAkB,EAAE,YAAY,CAAC,CAAC;QAC5E,CAAC,CAAC,CAAC;QAEH;;;WAGG;QACH,MAAM,YAAY,GAAa,IAAI,CAAC,gBAAgB;aACjD,MAAM,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,IAAI,OAAO,CAAC,GAAG,CAAC;aAC/C,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAE,CAAC,CAAC;QAC/C,YAAY,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,EAAE;YACnC,cAAc,GAAG,cAAc,CAAC,OAAO,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;QACnE,CAAC,CAAC,CAAC;QAEH,OAAO,cAAc,CAAC;IACxB,CAAC;IAED,WAAW,CAAC,KAAa;QACvB,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;YAC1B,OAAO,KAAK;iBACT,WAAW,EAAE;iBACb,OAAO,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC;SAC9D;aAAM;YACL,OAAO,KAAK,CAAC;SACd;IACH,CAAC;IAEO,cAAc;;QACpB,MAAM,sBAAsB,GAC1B,MAAA,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,IAAA,iBAAY,EAAC,SAAS,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;aAC9D,kBAAkB,CAAC,OAAO,CAAC,OAAO,CAAC,gBAAgB,mCAAI,EAAE,CAAC;QAE/D;;;WAGG;QACH,MAAM,oBAAoB,GAAG,sBAAsB,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAE1E,eAAe;QACf,OAAO,KAAK,CAAC,IAAI,CACf,IAAI,GAAG,CAAC,sBAAsB,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC,CAC7D,CAAC;IACJ,CAAC;CACF;AA/DD,4CA+DC"}
|
|
@@ -43,7 +43,7 @@ function updateNxJsonUsingNrwlWorkspace(token) {
|
|
|
43
43
|
});
|
|
44
44
|
}
|
|
45
45
|
function readNpmScope() {
|
|
46
|
-
const nxJson = JSON.parse(fs_1.readFileSync('nx.json').toString());
|
|
46
|
+
const nxJson = JSON.parse((0, fs_1.readFileSync)('nx.json').toString());
|
|
47
47
|
return nxJson.npmScope;
|
|
48
48
|
}
|
|
49
49
|
function removeTrailingSlash(apiUrl) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../../libs/nx-packages/nx-cloud/src/lib/generators/init/init.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2BAAkC;AAClC,+BAAkC;AAElC,SAAS,YAAY,CAAC,IAAI,EAAE,KAAa;;IACvC,MAAM,iBAAiB,GAAG,MAAA,MAAA,MAAA,IAAI,CAAC,kBAAkB,0CAAE,OAAO,0CAAE,OAAO,mCAAI,EAAE,CAAC;IAE1E,MAAM,OAAO,mCACR,iBAAiB,KACpB,WAAW,EAAE,KAAK,GACnB,CAAC;IAEF,kCAAkC;IAClC,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE;QACxB,OAAO,CAAC,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC;KACpC;IACD,IAAI,OAAO,CAAC,GAAG,CAAC,YAAY,EAAE;QAC5B,OAAO,CAAC,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC;KACxC;IAED,IAAI,CAAC,kBAAkB,GAAG;QACxB,OAAO,EAAE;YACP,MAAM,EAAE,gBAAgB;YACxB,OAAO;SACR;KACF,CAAC;AACJ,CAAC;AAED,SAAS,uBAAuB,CAAC,IAAS,EAAE,KAAa;IACvD,OAAO,CAAC,cAAc,CAAC,CAAC,UAAU,CAAC,IAAI,EAAE,SAAS,EAAE,CAAC,IAAI,EAAE,EAAE;QAC3D,YAAY,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAC1B,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,8BAA8B,CAAC,KAAa;IACnD,OAAO,OAAO,CAAC,iBAAiB,CAAC,CAAC,gBAAgB,CAAC,SAAS,EAAE,CAAC,IAAI,EAAE,EAAE;QACrE,YAAY,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAC1B,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,YAAY;IACnB,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,iBAAY,
|
|
1
|
+
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../../libs/nx-packages/nx-cloud/src/lib/generators/init/init.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,10 +18,10 @@ const axios_1 = require("./utilities/axios");
|
|
|
18
18
|
const cloud_enabled_runner_1 = require("./core/runners/cloud-enabled/cloud-enabled.runner");
|
|
19
19
|
const nxCloudTasksRunner = (tasks, options, context) => {
|
|
20
20
|
if (!environment_1.ACCESS_TOKEN && !options.accessToken) {
|
|
21
|
-
return tasks_runner_v2_1.tasksRunnerV2(tasks, options, context);
|
|
21
|
+
return (0, tasks_runner_v2_1.tasksRunnerV2)(tasks, options, context);
|
|
22
22
|
}
|
|
23
23
|
if (environment_1.INVOKED_BY_RUNNER) {
|
|
24
|
-
return tasks_runner_v2_1.tasksRunnerV2(tasks, options, context);
|
|
24
|
+
return (0, tasks_runner_v2_1.tasksRunnerV2)(tasks, options, context);
|
|
25
25
|
}
|
|
26
26
|
if (environment_1.AGENT_RUNNING_IN_DISTRIBUTED_EXECUTION) {
|
|
27
27
|
verifyAllOperationsAreCacheableOnAgent(tasks, options);
|
|
@@ -30,7 +30,7 @@ const nxCloudTasksRunner = (tasks, options, context) => {
|
|
|
30
30
|
if (process.env.NX_CLOUD_DISTRIBUTED_EXECUTION === 'true' &&
|
|
31
31
|
!environment_1.AGENT_RUNNING_IN_DISTRIBUTED_EXECUTION) {
|
|
32
32
|
verifyAllOperationsAreCacheableOnMainJob(tasks, options);
|
|
33
|
-
return from_1.from(verifyNxCloudWorkspaceEnabled(options)).pipe(switchMap_1.switchMap((res) => {
|
|
33
|
+
return (0, from_1.from)(verifyNxCloudWorkspaceEnabled(options)).pipe((0, switchMap_1.switchMap)((res) => {
|
|
34
34
|
if (res.data.enabled) {
|
|
35
35
|
return require('./core/runners/distributed-execution/distributed-execution.runner').nxCloudDistributedTasksRunner(tasks, options, context);
|
|
36
36
|
}
|
|
@@ -45,15 +45,15 @@ const nxCloudTasksRunner = (tasks, options, context) => {
|
|
|
45
45
|
'Execution will now continue using this machine only.',
|
|
46
46
|
],
|
|
47
47
|
});
|
|
48
|
-
return cloud_enabled_runner_1.cloudEnabledTasksRunner(tasks, options, context);
|
|
48
|
+
return (0, cloud_enabled_runner_1.cloudEnabledTasksRunner)(tasks, options, context);
|
|
49
49
|
}));
|
|
50
50
|
}
|
|
51
|
-
return cloud_enabled_runner_1.cloudEnabledTasksRunner(tasks, options, context);
|
|
51
|
+
return (0, cloud_enabled_runner_1.cloudEnabledTasksRunner)(tasks, options, context);
|
|
52
52
|
};
|
|
53
53
|
function verifyNxCloudWorkspaceEnabled(options) {
|
|
54
54
|
return __awaiter(this, void 0, void 0, function* () {
|
|
55
|
-
const axiosInstance = axios_1.createApiAxiosInstance(options);
|
|
56
|
-
return yield axios_1.axiosMultipleTries(() => axiosInstance.get('/nx-cloud/executions/workspace-status'), 30);
|
|
55
|
+
const axiosInstance = (0, axios_1.createApiAxiosInstance)(options);
|
|
56
|
+
return yield (0, axios_1.axiosMultipleTries)(() => axiosInstance.get('/nx-cloud/executions/workspace-status'), 30);
|
|
57
57
|
});
|
|
58
58
|
}
|
|
59
59
|
function verifyAllOperationsAreCacheableOnMainJob(tasks, options) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nx-cloud-tasks-runner.js","sourceRoot":"","sources":["../../../../../libs/nx-packages/nx-cloud/src/lib/nx-cloud-tasks-runner.ts"],"names":[],"mappings":";;;;;;;;;;;AAMA,wDAAqD;AACrD,iEAA8D;AAC9D,sFAAiF;AACjF,iEAA8D;AAE9D,yDAMiC;AACjC,6CAA+E;AAC/E,4FAA4F;AAE5F,MAAM,kBAAkB,GAAQ,CAC9B,KAAa,EACb,OAA+B,EAC/B,OAAY,EACe,EAAE;IAC7B,IAAI,CAAC,0BAAY,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE;QACzC,OAAO,+BAAa,
|
|
1
|
+
{"version":3,"file":"nx-cloud-tasks-runner.js","sourceRoot":"","sources":["../../../../../libs/nx-packages/nx-cloud/src/lib/nx-cloud-tasks-runner.ts"],"names":[],"mappings":"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"}
|
package/lib/utilities/axios.js
CHANGED
|
@@ -58,7 +58,7 @@ function axiosMultipleTries(axiosCallCreator, attemptsLeft = 10) {
|
|
|
58
58
|
title: `Received ${code}. Retrying in 10 seconds.`,
|
|
59
59
|
});
|
|
60
60
|
}
|
|
61
|
-
yield waiter_1.wait(10000);
|
|
61
|
+
yield (0, waiter_1.wait)(10000);
|
|
62
62
|
return axiosMultipleTries(axiosCallCreator, attemptsLeft - 1);
|
|
63
63
|
}
|
|
64
64
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"axios.js","sourceRoot":"","sources":["../../../../../../libs/nx-packages/nx-cloud/src/lib/utilities/axios.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,iEAA8D;AAC9D,+CAKuB;AACvB,qCAAgC;AAGhC,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;AAE/B,MAAa,cAAc;IACzB,YACkB,IAA2B,EAC3B,OAAe,EACf,cAAmB;QAFnB,SAAI,GAAJ,IAAI,CAAuB;QAC3B,YAAO,GAAP,OAAO,CAAQ;QACf,mBAAc,GAAd,cAAc,CAAK;IAClC,CAAC;CACL;AAND,wCAMC;AAED,SAAgB,sBAAsB,CAAC,OAA+B;IACpE,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,IAAI,qBAAqB,CAAC;IACrD,MAAM,SAAS,GAAG,0BAAY,CAAC,CAAC,CAAC,0BAAY,CAAC,CAAC,CAAC,OAAO,CAAC,WAAY,CAAC;IAErE,IAAI,CAAC,SAAS,EAAE;QACd,MAAM,IAAI,KAAK,CAAC,2BAA2B,SAAS,EAAE,CAAC,CAAC;KACzD;IAED,OAAO,KAAK,CAAC,MAAM,CAAC;QAClB,OAAO,EAAE,OAAO;QAChB,OAAO,EAAE,kCAAoB,CAAC,CAAC,CAAC,+BAAiB,CAAC,CAAC,CAAC,KAAK;QACzD,OAAO,EAAE,EAAE,aAAa,EAAE,SAAS,EAAE;KACtC,CAAC,CAAC;AACL,CAAC;AAbD,wDAaC;AAED,SAAsB,kBAAkB,CACtC,gBAAoC,EACpC,YAAY,GAAG,EAAE;;QAEjB,IAAI;YACF,OAAO,MAAM,gBAAgB,EAAE,CAAC;SACjC;QAAC,OAAO,
|
|
1
|
+
{"version":3,"file":"axios.js","sourceRoot":"","sources":["../../../../../../libs/nx-packages/nx-cloud/src/lib/utilities/axios.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,iEAA8D;AAC9D,+CAKuB;AACvB,qCAAgC;AAGhC,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;AAE/B,MAAa,cAAc;IACzB,YACkB,IAA2B,EAC3B,OAAe,EACf,cAAmB;QAFnB,SAAI,GAAJ,IAAI,CAAuB;QAC3B,YAAO,GAAP,OAAO,CAAQ;QACf,mBAAc,GAAd,cAAc,CAAK;IAClC,CAAC;CACL;AAND,wCAMC;AAED,SAAgB,sBAAsB,CAAC,OAA+B;IACpE,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,IAAI,qBAAqB,CAAC;IACrD,MAAM,SAAS,GAAG,0BAAY,CAAC,CAAC,CAAC,0BAAY,CAAC,CAAC,CAAC,OAAO,CAAC,WAAY,CAAC;IAErE,IAAI,CAAC,SAAS,EAAE;QACd,MAAM,IAAI,KAAK,CAAC,2BAA2B,SAAS,EAAE,CAAC,CAAC;KACzD;IAED,OAAO,KAAK,CAAC,MAAM,CAAC;QAClB,OAAO,EAAE,OAAO;QAChB,OAAO,EAAE,kCAAoB,CAAC,CAAC,CAAC,+BAAiB,CAAC,CAAC,CAAC,KAAK;QACzD,OAAO,EAAE,EAAE,aAAa,EAAE,SAAS,EAAE;KACtC,CAAC,CAAC;AACL,CAAC;AAbD,wDAaC;AAED,SAAsB,kBAAkB,CACtC,gBAAoC,EACpC,YAAY,GAAG,EAAE;;QAEjB,IAAI;YACF,OAAO,MAAM,gBAAgB,EAAE,CAAC;SACjC;QAAC,OAAO,CAAM,EAAE;YACf,MAAM,IAAI,GACR,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,QAAQ,IAAI,CAAC,CAAC,QAAQ,CAAC,MAAM,KAAK,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;YACxE,IACE,IAAI,KAAK,cAAc;gBACvB,IAAI,KAAK,cAAc;gBACvB,IAAI,KAAK,WAAW;gBACpB,IAAI,KAAK,WAAW;gBACpB,IAAI,KAAK,QAAQ;gBACjB,IAAI,KAAK,GAAG;gBACZ,IAAI,KAAK,GAAG,EACZ;gBACA,IAAI,YAAY,KAAK,CAAC,EAAE;oBACtB,MAAM,IAAI,cAAc,CACtB,SAAS,EACT,qCAAqC,IAAI,EAAE,EAC3C,CAAC,CACF,CAAC;iBACH;qBAAM;oBACL,IAAI,6BAAe,EAAE;wBACnB,eAAM,CAAC,IAAI,CAAC;4BACV,KAAK,EAAE,YAAY,IAAI,2BAA2B;yBACnD,CAAC,CAAC;qBACJ;oBACD,MAAM,IAAA,aAAI,EAAC,KAAK,CAAC,CAAC;oBAClB,OAAO,kBAAkB,CAAC,gBAAgB,EAAE,YAAY,GAAG,CAAC,CAAC,CAAC;iBAC/D;aACF;iBAAM;gBACL,IAAI,CAAC,CAAC,CAAC,QAAQ,EAAE;oBACf,MAAM,IAAI,cAAc,CACtB,SAAS,EACT,6CAA6C,CAAC,CAAC,OAAO,EAAE,EACxD,CAAC,CACF,CAAC;iBACH;gBACD,IAAI,OAAO,GAAG,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO;oBACnC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO;oBACzB,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC;gBACpB,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;oBAC/B,OAAO,GAAG,CAAC,CAAC,OAAO,CAAC;iBACrB;gBACD,MAAM,IAAI,cAAc,CACtB,SAAS,EACT,6CAA6C,OAAO,EAAE,EACtD,CAAC,CACF,CAAC;aACH;SACF;IACH,CAAC;CAAA;AAtDD,gDAsDC"}
|
|
@@ -7,6 +7,7 @@ export declare const INVOKED_BY_RUNNER: boolean;
|
|
|
7
7
|
export declare const NX_CLOUD_DISTRIBUTED_EXECUTION_ID: string | undefined;
|
|
8
8
|
export declare const AGENT_RUNNING_IN_DISTRIBUTED_EXECUTION: boolean;
|
|
9
9
|
export declare const NUMBER_OF_TRIES: number;
|
|
10
|
+
export declare const NX_CLOUD_FORCE_METRICS: boolean;
|
|
10
11
|
export declare let ACCESS_TOKEN: any;
|
|
11
12
|
export declare let ENCRYPTION_KEY: any;
|
|
12
13
|
export declare let VERBOSE_LOGGING: any;
|