@quenty/nevermore-cli 4.35.0 → 4.36.0
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/CHANGELOG.md +11 -0
- package/build-scripts/transform-inject-deploy-metadata.luau +54 -0
- package/dist/commands/batch-command/batch-deploy-command.d.ts.map +1 -1
- package/dist/commands/batch-command/batch-deploy-command.js +24 -7
- package/dist/commands/batch-command/batch-deploy-command.js.map +1 -1
- package/dist/commands/deploy-command/index.d.ts.map +1 -1
- package/dist/commands/deploy-command/index.js +26 -7
- package/dist/commands/deploy-command/index.js.map +1 -1
- package/dist/utils/deploy/deploy-metadata.d.ts +71 -0
- package/dist/utils/deploy/deploy-metadata.d.ts.map +1 -0
- package/dist/utils/deploy/deploy-metadata.js +118 -0
- package/dist/utils/deploy/deploy-metadata.js.map +1 -0
- package/dist/utils/deploy/deploy-metadata.test.d.ts +2 -0
- package/dist/utils/deploy/deploy-metadata.test.d.ts.map +1 -0
- package/dist/utils/deploy/deploy-metadata.test.js +93 -0
- package/dist/utils/deploy/deploy-metadata.test.js.map +1 -0
- package/dist/utils/open-cloud/open-cloud-client.d.ts.map +1 -1
- package/dist/utils/open-cloud/open-cloud-client.js +27 -30
- package/dist/utils/open-cloud/open-cloud-client.js.map +1 -1
- package/dist/utils/open-cloud/open-cloud-client.test.d.ts +2 -0
- package/dist/utils/open-cloud/open-cloud-client.test.d.ts.map +1 -0
- package/dist/utils/open-cloud/open-cloud-client.test.js +90 -0
- package/dist/utils/open-cloud/open-cloud-client.test.js.map +1 -0
- package/dist/utils/open-cloud/rate-limiter.d.ts +10 -1
- package/dist/utils/open-cloud/rate-limiter.d.ts.map +1 -1
- package/dist/utils/open-cloud/rate-limiter.js +29 -5
- package/dist/utils/open-cloud/rate-limiter.js.map +1 -1
- package/dist/utils/open-cloud/rate-limiter.test.js +23 -0
- package/dist/utils/open-cloud/rate-limiter.test.js.map +1 -1
- package/dist/utils/testing/runner/test-runner.d.ts.map +1 -1
- package/dist/utils/testing/runner/test-runner.js +13 -0
- package/dist/utils/testing/runner/test-runner.js.map +1 -1
- package/package.json +2 -2
- package/src/commands/batch-command/batch-deploy-command.ts +31 -6
- package/src/commands/deploy-command/index.ts +33 -6
- package/src/utils/deploy/deploy-metadata.test.ts +128 -0
- package/src/utils/deploy/deploy-metadata.ts +194 -0
- package/src/utils/open-cloud/open-cloud-client.test.ts +118 -0
- package/src/utils/open-cloud/open-cloud-client.ts +29 -32
- package/src/utils/open-cloud/rate-limiter.test.ts +30 -0
- package/src/utils/open-cloud/rate-limiter.ts +41 -5
- package/src/utils/testing/runner/test-runner.ts +22 -0
- package/tsconfig.tsbuildinfo +1 -1
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
import * as fs from 'fs/promises';
|
|
2
|
+
import { Readable, Transform } from 'node:stream';
|
|
3
|
+
import nodeFetch from 'node-fetch';
|
|
2
4
|
import { OutputHelper } from '@quenty/cli-output-helpers';
|
|
3
5
|
import { parseTestLogs, } from '../testing/test-log-parser.js';
|
|
4
6
|
function formatAuthError(action, scope, universeId, placeId, status, statusText, body, method, url) {
|
|
@@ -68,39 +70,34 @@ export class OpenCloudClient {
|
|
|
68
70
|
Accept: 'application/json',
|
|
69
71
|
'X-API-Key': apiKey,
|
|
70
72
|
};
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
onProgress(offset, totalBytes);
|
|
73
|
+
// Stream the place binary so we can report byte-level upload progress. We
|
|
74
|
+
// pin node-fetch here: undici (global fetch) cannot send a streaming request
|
|
75
|
+
// body to the Open Cloud versions endpoint on Node 24 — it throws "expected
|
|
76
|
+
// non-null body source" — whereas node-fetch's Node http stack accepts it.
|
|
77
|
+
// Content-Length is set so the upload isn't chunked. The rate limiter
|
|
78
|
+
// rebuilds this init per attempt, so each retry gets a fresh, un-disturbed
|
|
79
|
+
// stream (and progress restarts, correctly mirroring the re-sent bytes).
|
|
80
|
+
onProgress?.(0, totalBytes);
|
|
81
|
+
const makeUploadInit = () => {
|
|
82
|
+
let counted = 0;
|
|
83
|
+
const counter = new Transform({
|
|
84
|
+
transform(chunk, _enc, cb) {
|
|
85
|
+
counted += chunk.length;
|
|
86
|
+
onProgress?.(counted, totalBytes);
|
|
87
|
+
cb(null, chunk);
|
|
87
88
|
},
|
|
88
89
|
});
|
|
89
|
-
//
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
headers,
|
|
93
|
-
body: stream,
|
|
94
|
-
duplex: 'half',
|
|
95
|
-
});
|
|
96
|
-
}
|
|
97
|
-
else {
|
|
98
|
-
response = await this._rateLimiter.fetchAsync(url, {
|
|
90
|
+
// Node stream body: valid for node-fetch, but outside the DOM RequestInit
|
|
91
|
+
// type, so cast through unknown.
|
|
92
|
+
return {
|
|
99
93
|
method: 'POST',
|
|
100
|
-
headers,
|
|
101
|
-
body:
|
|
102
|
-
}
|
|
103
|
-
}
|
|
94
|
+
headers: { ...headers, 'Content-Length': String(totalBytes) },
|
|
95
|
+
body: Readable.from(fileBuffer).pipe(counter),
|
|
96
|
+
};
|
|
97
|
+
};
|
|
98
|
+
const response = await this._rateLimiter.fetchAsync(url, makeUploadInit, {
|
|
99
|
+
fetchImpl: nodeFetch,
|
|
100
|
+
});
|
|
104
101
|
if (!response.ok) {
|
|
105
102
|
const text = await response.text();
|
|
106
103
|
if (response.status === 401 || response.status === 403) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"open-cloud-client.js","sourceRoot":"","sources":["../../../src/utils/open-cloud/open-cloud-client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,aAAa,CAAC;AAClC,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAE1D,OAAO,EACL,aAAa,GAEd,MAAM,+BAA+B,CAAC;AA2BvC,SAAS,eAAe,CACtB,MAAc,EACd,KAAa,EACb,UAAkB,EAClB,OAAe,EACf,MAAc,EACd,UAAkB,EAClB,IAAY,EACZ,MAAc,EACd,GAAW;IAEX,4DAA4D;IAC5D,IAAI,UAAU,GAAG,EAAE,CAAC;IACpB,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAChC,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC;YAC9D,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;QACxC,CAAC;aAAM,IAAI,OAAO,MAAM,CAAC,OAAO,KAAK,QAAQ,EAAE,CAAC;YAC9C,UAAU,GAAG,MAAM,CAAC,OAAO,CAAC;QAC9B,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACP,WAAW;IACb,CAAC;IAED,MAAM,QAAQ,GAAG,UAAU;QACzB,CAAC,CAAC,GAAG,MAAM,YAAY,UAAU,KAAK,MAAM,GAAG;QAC/C,CAAC,CAAC,GAAG,MAAM,YAAY,MAAM,IAAI,UAAU,EAAE,CAAC;IAEhD,MAAM,GAAG,GAAG,YAAY,CAAC,SAAS,CAAC;IACnC,MAAM,IAAI,GAAG,YAAY,CAAC,UAAU,CAAC;IAErC,OAAO;QACL,YAAY,CAAC,WAAW,CAAC,QAAQ,CAAC;QAClC,EAAE;QACF,KAAK,GAAG,CAAC,QAAQ,CAAC,UAAU,KAAK,EAAE;QACnC,KAAK,GAAG,CAAC,WAAW,CAAC,OAAO,UAAU,EAAE;QACxC,KAAK,GAAG,CAAC,QAAQ,CAAC,UAAU,OAAO,EAAE;QACrC,EAAE;QACF,YAAY,CAAC,aAAa,CACxB,oFAAoF,CACrF;QACD,EAAE;QACF,KAAK,GAAG,CAAC,QAAQ,CAAC,UAAU,IAAI,CAC9B,gCAAgC,OAAO,QAAQ,CAChD,EAAE;QACH,KAAK,GAAG,CAAC,cAAc,CAAC,IAAI,IAAI,CAC9B,iDAAiD,CAClD,EAAE;QACH,KAAK,GAAG,CAAC,QAAQ,CAAC,UAAU,GAAG,CAAC,GAAG,MAAM,IAAI,GAAG,EAAE,CAAC,EAAE;KACtD,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACf,CAAC;AAED,MAAM,OAAO,eAAe;IAClB,OAAO,CAAqB;IAC5B,aAAa,CAAmC;IAChD,YAAY,CAAc;IAElC,YAAY,OAA+B;QACzC,IAAI,CAAC,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC;QACpC,IAAI,OAAO,OAAO,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;YACvC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;QAChC,CAAC;QACD,IAAI,CAAC,YAAY,GAAG,OAAO,CAAC,WAAW,CAAC;IAC1C,CAAC;IAEO,KAAK,CAAC,mBAAmB;QAC/B,IAAI,IAAI,CAAC,OAAO,IAAI,IAAI,EAAE,CAAC;YACzB,OAAO,IAAI,CAAC,OAAO,CAAC;QACtB,CAAC;QACD,IAAI,OAAO,IAAI,CAAC,aAAa,KAAK,UAAU,EAAE,CAAC;YAC7C,IAAI,CAAC,OAAO,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;YAC1C,OAAO,IAAI,CAAC,OAAO,CAAC;QACtB,CAAC;QACD,OAAO,IAAI,CAAC,aAAa,CAAC;IAC5B,CAAC;IAED,KAAK,CAAC,gBAAgB,CACpB,UAAkB,EAClB,OAAe,EACf,QAAgB,EAChB,OAAiB,EACjB,UAAmE;QAEnE,YAAY,CAAC,OAAO,CAClB,6CAA6C,OAAO,YAAY,CACjE,CAAC;QAEF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,mBAAmB,EAAE,CAAC;QAChD,MAAM,UAAU,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAC/C,MAAM,UAAU,GAAG,UAAU,CAAC,MAAM,CAAC;QACrC,MAAM,WAAW,GAAG,OAAO,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC;QACpD,MAAM,GAAG,GAAG,wCAAwC,UAAU,WAAW,OAAO,yBAAyB,WAAW,EAAE,CAAC;QAEvH,MAAM,OAAO,GAA2B;YACtC,cAAc,EAAE,0BAA0B;YAC1C,MAAM,EAAE,kBAAkB;YAC1B,WAAW,EAAE,MAAM;SACpB,CAAC;QAEF,IAAI,QAAkB,CAAC;QAEvB,IAAI,UAAU,EAAE,CAAC;YACf,uEAAuE;YACvE,kEAAkE;YAClE,MAAM,UAAU,GAAG,EAAE,GAAG,IAAI,CAAC;YAC7B,IAAI,MAAM,GAAG,CAAC,CAAC;YACf,MAAM,MAAM,GAAG,IAAI,cAAc,CAAa;gBAC5C,IAAI,CAAC,UAAU;oBACb,IAAI,MAAM,IAAI,UAAU,EAAE,CAAC;wBACzB,UAAU,CAAC,KAAK,EAAE,CAAC;wBACnB,OAAO;oBACT,CAAC;oBACD,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,GAAG,UAAU,EAAE,UAAU,CAAC,CAAC;oBACtD,UAAU,CAAC,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC;oBACrD,MAAM,GAAG,GAAG,CAAC;oBACb,UAAU,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;gBACjC,CAAC;aACF,CAAC,CAAC;YAEH,iEAAiE;YACjE,QAAQ,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,GAAG,EAAE;gBACjD,MAAM,EAAE,MAAM;gBACd,OAAO;gBACP,IAAI,EAAE,MAAM;gBACZ,MAAM,EAAE,MAAM;aACA,CAAC,CAAC;QACpB,CAAC;aAAM,CAAC;YACN,QAAQ,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,GAAG,EAAE;gBACjD,MAAM,EAAE,MAAM;gBACd,OAAO;gBACP,IAAI,EAAE,IAAI,UAAU,CAAC,UAAU,CAAC;aACjC,CAAC,CAAC;QACL,CAAC;QAED,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;YACjB,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;YACnC,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;gBACvD,MAAM,IAAI,KAAK,CACb,eAAe,CACb,QAAQ,EACR,uBAAuB,EACvB,UAAU,EACV,OAAO,EACP,QAAQ,CAAC,MAAM,EACf,QAAQ,CAAC,UAAU,EACnB,IAAI,EACJ,MAAM,EACN,GAAG,CACJ,CACF,CAAC;YACJ,CAAC;YACD,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;gBAC5B,MAAM,GAAG,GAAG,YAAY,CAAC,SAAS,CAAC;gBACnC,MAAM,IAAI,GAAG,YAAY,CAAC,UAAU,CAAC;gBACrC,MAAM,IAAI,KAAK,CACb;oBACE,YAAY,CAAC,WAAW,CACtB,+CAA+C,CAChD;oBACD,EAAE;oBACF,iEAAiE;oBACjE,2DAA2D;oBAC3D,EAAE;oBACF,KAAK,GAAG,CAAC,QAAQ,CAAC,OAAO,IAAI,CAC3B,gCAAgC,OAAO,QAAQ,CAChD,EAAE;oBACH,KAAK,GAAG,CAAC,QAAQ,CAAC,OAAO,GAAG,CAAC,QAAQ,GAAG,EAAE,CAAC,EAAE;iBAC9C,CAAC,IAAI,CAAC,IAAI,CAAC,CACb,CAAC;YACJ,CAAC;YACD,MAAM,IAAI,KAAK,CACb,kBAAkB,QAAQ,CAAC,MAAM,IAAI,QAAQ,CAAC,UAAU,KAAK,IAAI,EAAE,CACpE,CAAC;QACJ,CAAC;QAED,MAAM,IAAI,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAA8B,CAAC;QAClE,OAAO,IAAI,CAAC,aAAa,CAAC;IAC5B,CAAC;IAED,KAAK,CAAC,wBAAwB,CAC5B,UAAkB,EAClB,OAAe,EACf,YAAoB,EACpB,MAAc,EACd,SAAkB;QAElB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,mBAAmB,EAAE,CAAC;QAChD,MAAM,GAAG,GAAG,8CAA8C,UAAU,WAAW,OAAO,aAAa,YAAY,+BAA+B,CAAC;QAE/I,MAAM,IAAI,GAIN,EAAE,MAAM,EAAE,kBAAkB,EAAE,KAAK,EAAE,CAAC;QAC1C,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;YAC5B,yEAAyE;YACzE,wEAAwE;YACxE,6CAA6C;YAC7C,MAAM,gBAAgB,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,CAAC;YACrD,MAAM,cAAc,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,gBAAgB,CAAC,CAAC,CAAC;YACpE,IAAI,gBAAgB,GAAG,cAAc,EAAE,CAAC;gBACtC,YAAY,CAAC,IAAI,CACf,kCAAkC,gBAAgB,2HAA2H,CAC9K,CAAC;YACJ,CAAC;YACD,IAAI,CAAC,OAAO,GAAG,GAAG,cAAc,GAAG,CAAC;QACtC,CAAC;QAED,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,GAAG,EAAE;YACvD,MAAM,EAAE,MAAM;YACd,OAAO,EAAE;gBACP,cAAc,EAAE,kBAAkB;gBAClC,WAAW,EAAE,MAAM;aACpB;YACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;SAC3B,CAAC,CAAC;QAEH,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;YACjB,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;YACnC,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;gBACvD,MAAM,IAAI,KAAK,CACb,eAAe,CACb,gBAAgB,EAChB,6CAA6C,EAC7C,UAAU,EACV,OAAO,EACP,QAAQ,CAAC,MAAM,EACf,QAAQ,CAAC,UAAU,EACnB,IAAI,EACJ,MAAM,EACN,GAAG,CACJ,CACF,CAAC;YACJ,CAAC;YACD,MAAM,IAAI,KAAK,CACb,uBAAuB,QAAQ,CAAC,MAAM,IAAI,QAAQ,CAAC,UAAU,KAAK,IAAI,EAAE,CACzE,CAAC;QACJ,CAAC;QAED,OAAO,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAa,CAAC;IAC7C,CAAC;IAED,KAAK,CAAC,uBAAuB,CAC3B,QAAgB,EAChB,UAA+C;QAE/C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,mBAAmB,EAAE,CAAC;QAChD,MAAM,cAAc,GAAG,IAAI,CAAC;QAE5B,OAAO,IAAI,EAAE,CAAC;YACZ,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,UAAU,CACjD,oCAAoC,QAAQ,EAAE,EAC9C;gBACE,MAAM,EAAE,KAAK;gBACb,OAAO,EAAE;oBACP,WAAW,EAAE,MAAM;iBACpB;aACF,CACF,CAAC;YAEF,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;gBACjB,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;gBACnC,MAAM,IAAI,KAAK,CAAC,gBAAgB,QAAQ,CAAC,MAAM,KAAK,IAAI,EAAE,CAAC,CAAC;YAC9D,CAAC;YAED,MAAM,IAAI,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAa,CAAC;YAEjD,IAAI,IAAI,CAAC,KAAK,KAAK,YAAY,IAAI,IAAI,CAAC,KAAK,KAAK,QAAQ,EAAE,CAAC;gBAC3D,OAAO,IAAI,CAAC;YACd,CAAC;YAED,IAAI,UAAU,EAAE,CAAC;gBACf,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACzB,CAAC;YAED,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC,CAAC;QACtE,CAAC;IACH,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,QAAgB;QACrC,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,QAAQ,CAAC,CAAC;QACrD,OAAO,aAAa,CAAC,GAAG,CAAC,CAAC;IAC5B,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,mBAAmB,CAAC,QAAgB;QACxC,MAAM,WAAW,GAAG,CAAC,CAAC;QACtB,MAAM,YAAY,GAAG,IAAI,CAAC;QAE1B,KAAK,IAAI,OAAO,GAAG,CAAC,EAAE,OAAO,IAAI,WAAW,EAAE,OAAO,EAAE,EAAE,CAAC;YACxD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC;YACrD,IAAI,IAAI,IAAI,OAAO,KAAK,WAAW,EAAE,CAAC;gBACpC,OAAO,IAAI,CAAC;YACd,CAAC;YACD,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC;QACpE,CAAC;QAED,8CAA8C;QAC9C,OAAO,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC;IAC3C,CAAC;IAEO,KAAK,CAAC,kBAAkB,CAAC,QAAgB;QAC/C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,mBAAmB,EAAE,CAAC;QAChD,MAAM,QAAQ,GAAa,EAAE,CAAC;QAC9B,IAAI,SAA6B,CAAC;QAElC,GAAG,CAAC;YACF,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,oCAAoC,QAAQ,OAAO,CAAC,CAAC;YACzE,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;YAC3C,IAAI,SAAS,EAAE,CAAC;gBACd,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;YAC/C,CAAC;YAED,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE;gBAClE,MAAM,EAAE,KAAK;gBACb,OAAO,EAAE;oBACP,WAAW,EAAE,MAAM;iBACpB;aACF,CAAC,CAAC;YAEH,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;gBACjB,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;gBACnC,MAAM,IAAI,KAAK,CAAC,oBAAoB,QAAQ,CAAC,MAAM,KAAK,IAAI,EAAE,CAAC,CAAC;YAClE,CAAC;YAED,MAAM,IAAI,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAUlC,CAAC;YAEF,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,4BAA4B,IAAI,EAAE,EAAE,CAAC;gBAC5D,IAAI,KAAK,CAAC,kBAAkB,EAAE,MAAM,EAAE,CAAC;oBACrC,KAAK,MAAM,GAAG,IAAI,KAAK,CAAC,kBAAkB,EAAE,CAAC;wBAC3C,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;oBAC7B,CAAC;gBACH,CAAC;qBAAM,IAAI,KAAK,CAAC,QAAQ,EAAE,MAAM,EAAE,CAAC;oBAClC,QAAQ,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAC;gBACnC,CAAC;YACH,CAAC;YAED,SAAS,GAAG,IAAI,CAAC,aAAa,IAAI,SAAS,CAAC;QAC9C,CAAC,QAAQ,SAAS,EAAE;QAEpB,OAAO,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC7B,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,kBAAkB,CACtB,UAAkB,EAClB,OAAe,EACf,UAAmE;QAEnE,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,mBAAmB,EAAE,CAAC;QAChD,MAAM,GAAG,GAAG,yDAAyD,OAAO,EAAE,CAAC;QAE/E,YAAY,CAAC,OAAO,CAClB,4DAA4D,OAAO,YAAY,CAChF,CAAC;QAEF,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,GAAG,EAAE;YACvD,MAAM,EAAE,KAAK;YACb,OAAO,EAAE;gBACP,WAAW,EAAE,MAAM;aACpB;SACF,CAAC,CAAC;QAEH,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;YACjB,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;YACnC,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;gBACvD,MAAM,IAAI,KAAK,CACb,eAAe,CACb,gBAAgB,EAChB,qBAAqB,EACrB,UAAU,EACV,OAAO,EACP,QAAQ,CAAC,MAAM,EACf,QAAQ,CAAC,UAAU,EACnB,IAAI,EACJ,KAAK,EACL,GAAG,CACJ,CACF,CAAC;YACJ,CAAC;YACD,MAAM,IAAI,KAAK,CACb,0BAA0B,QAAQ,CAAC,MAAM,IAAI,QAAQ,CAAC,UAAU,KAAK,IAAI,EAAE,CAC5E,CAAC;QACJ,CAAC;QAED,MAAM,IAAI,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAyB,CAAC;QAC7D,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACnB,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAC;QACxE,CAAC;QAED,YAAY,CAAC,OAAO,CAAC,mCAAmC,CAAC,CAAC;QAC1D,OAAO,oBAAoB,CAAC,IAAI,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;IACzD,CAAC;CACF;AAED,MAAM,gBAAgB,GAAG,CAAC,CAAC;AAE3B,KAAK,UAAU,oBAAoB,CACjC,GAAW,EACX,UAAmE;IAEnE,IAAI,SAAS,GAAY,IAAI,CAAC;IAC9B,KAAK,IAAI,OAAO,GAAG,CAAC,EAAE,OAAO,IAAI,gBAAgB,EAAE,OAAO,EAAE,EAAE,CAAC;QAC7D,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,CAAC;YAClC,IAAI,QAAQ,CAAC,EAAE,EAAE,CAAC;gBAChB,OAAO,MAAM,0BAA0B,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;YAChE,CAAC;YACD,SAAS,GAAG,IAAI,KAAK,CACnB,oCAAoC,QAAQ,CAAC,MAAM,IAAI,QAAQ,CAAC,UAAU,EAAE,CAC7E,CAAC;YACF,6DAA6D;YAC7D,IACE,QAAQ,CAAC,MAAM,IAAI,GAAG;gBACtB,QAAQ,CAAC,MAAM,GAAG,GAAG;gBACrB,QAAQ,CAAC,MAAM,KAAK,GAAG;gBACvB,QAAQ,CAAC,MAAM,KAAK,GAAG,EACvB,CAAC;gBACD,MAAM,SAAS,CAAC;YAClB,CAAC;QACH,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,SAAS,GAAG,GAAG,CAAC;QAClB,CAAC;QAED,IAAI,OAAO,KAAK,gBAAgB,EAAE,CAAC;YACjC,MAAM;QACR,CAAC;QACD,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,GAAG,CAAC,CAAC,CAAC,CAAC;QAC9D,YAAY,CAAC,IAAI,CACf,wBAAwB,OAAO,IAAI,gBAAgB,YACjD,SAAS,YAAY,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CACnE,kBAAkB,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CACnD,CAAC;QACF,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC;IAC9D,CAAC;IACD,MAAM,SAAS,IAAI,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;AAClE,CAAC;AAED,KAAK,UAAU,0BAA0B,CACvC,QAAkB,EAClB,UAAmE;IAEnE,IAAI,CAAC,UAAU,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;QAClC,OAAO,MAAM,CAAC,IAAI,CAAC,MAAM,QAAQ,CAAC,WAAW,EAAE,CAAC,CAAC;IACnD,CAAC;IAED,yEAAyE;IACzE,2EAA2E;IAC3E,MAAM,aAAa,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;IAC7D,MAAM,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC,QAAQ,CAAC,aAAa,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAEnE,MAAM,MAAM,GAAiB,EAAE,CAAC;IAChC,IAAI,WAAW,GAAG,CAAC,CAAC;IACpB,MAAM,MAAM,GAAG,QAAQ,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;IACzC,UAAU,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC;IAE1B,OAAO,IAAI,EAAE,CAAC;QACZ,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;QAC5C,IAAI,IAAI;YAAE,MAAM;QAChB,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACnB,WAAW,IAAI,KAAK,CAAC,UAAU,CAAC;QAChC,UAAU,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;IACtC,CAAC;IAED,OAAO,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;AAC/B,CAAC"}
|
|
1
|
+
{"version":3,"file":"open-cloud-client.js","sourceRoot":"","sources":["../../../src/utils/open-cloud/open-cloud-client.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"open-cloud-client.test.d.ts","sourceRoot":"","sources":["../../../src/utils/open-cloud/open-cloud-client.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,90 @@
|
|
|
1
|
+
import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
|
|
2
|
+
import * as fs from 'fs/promises';
|
|
3
|
+
import { OpenCloudClient } from './open-cloud-client.js';
|
|
4
|
+
vi.mock('@quenty/cli-output-helpers', () => ({
|
|
5
|
+
OutputHelper: {
|
|
6
|
+
verbose: vi.fn(),
|
|
7
|
+
warn: vi.fn(),
|
|
8
|
+
formatDim: (s) => s,
|
|
9
|
+
formatInfo: (s) => s,
|
|
10
|
+
formatError: (s) => s,
|
|
11
|
+
formatWarning: (s) => s,
|
|
12
|
+
},
|
|
13
|
+
}));
|
|
14
|
+
vi.mock('fs/promises', () => ({ readFile: vi.fn() }));
|
|
15
|
+
describe('OpenCloudClient.uploadPlaceAsync', () => {
|
|
16
|
+
beforeEach(() => {
|
|
17
|
+
vi.mocked(fs.readFile).mockResolvedValue(Buffer.from([1, 2, 3, 4, 5]));
|
|
18
|
+
});
|
|
19
|
+
afterEach(() => {
|
|
20
|
+
vi.restoreAllMocks();
|
|
21
|
+
});
|
|
22
|
+
it('streams the upload via an injected fetch impl and reports byte-level progress', async () => {
|
|
23
|
+
// The upload streams its body through node-fetch (injected as fetchImpl):
|
|
24
|
+
// undici cannot send a streaming request body to the Open Cloud endpoint on
|
|
25
|
+
// Node 24 ("expected non-null body source"), so the limiter must drive the
|
|
26
|
+
// Node-http-based client. The body is handed over as a per-attempt factory
|
|
27
|
+
// so each retry gets a fresh, un-disturbed stream; a counting Transform on
|
|
28
|
+
// it drives byte-level progress. Content-Length is set so it isn't chunked.
|
|
29
|
+
let capturedInit;
|
|
30
|
+
let capturedFetchImpl;
|
|
31
|
+
const fakeLimiter = {
|
|
32
|
+
fetchAsync: vi.fn(async (_url, init, options) => {
|
|
33
|
+
capturedInit = typeof init === 'function' ? init() : init;
|
|
34
|
+
capturedFetchImpl = options?.fetchImpl;
|
|
35
|
+
// Drain the streaming body so the counting Transform fires progress,
|
|
36
|
+
// exactly as the real transport would as it sends bytes.
|
|
37
|
+
const body = capturedInit?.body;
|
|
38
|
+
for await (const _chunk of body) {
|
|
39
|
+
void _chunk;
|
|
40
|
+
}
|
|
41
|
+
return new Response(JSON.stringify({ versionNumber: 7 }), {
|
|
42
|
+
status: 200,
|
|
43
|
+
});
|
|
44
|
+
}),
|
|
45
|
+
};
|
|
46
|
+
const client = new OpenCloudClient({
|
|
47
|
+
apiKey: 'test-key',
|
|
48
|
+
rateLimiter: fakeLimiter,
|
|
49
|
+
});
|
|
50
|
+
const progress = [];
|
|
51
|
+
const version = await client.uploadPlaceAsync(1, 2, '/tmp/place.rbxl', false, (transferred, total) => progress.push([transferred, total]));
|
|
52
|
+
expect(version).toBe(7);
|
|
53
|
+
// A dedicated fetch impl (node-fetch) is injected, not the global default.
|
|
54
|
+
expect(typeof capturedFetchImpl).toBe('function');
|
|
55
|
+
// Content-Length pins the length so node-fetch doesn't chunk the upload.
|
|
56
|
+
const headers = capturedInit?.headers;
|
|
57
|
+
expect(headers['Content-Length']).toBe('5');
|
|
58
|
+
// Byte-level progress: an initial 0, then cumulative up to the full size.
|
|
59
|
+
expect(progress[0]).toEqual([0, 5]);
|
|
60
|
+
expect(progress[progress.length - 1]).toEqual([5, 5]);
|
|
61
|
+
});
|
|
62
|
+
it('marks the version Published only when publish is true', async () => {
|
|
63
|
+
const urls = [];
|
|
64
|
+
const fakeLimiter = {
|
|
65
|
+
fetchAsync: vi.fn(async (url, init) => {
|
|
66
|
+
urls.push(String(url));
|
|
67
|
+
// Drain the streamed body so the upload's Transform can complete.
|
|
68
|
+
const resolved = typeof init === 'function' ? init() : init;
|
|
69
|
+
const body = resolved?.body;
|
|
70
|
+
if (body) {
|
|
71
|
+
for await (const _chunk of body) {
|
|
72
|
+
void _chunk;
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
return new Response(JSON.stringify({ versionNumber: 1 }), {
|
|
76
|
+
status: 200,
|
|
77
|
+
});
|
|
78
|
+
}),
|
|
79
|
+
};
|
|
80
|
+
const client = new OpenCloudClient({
|
|
81
|
+
apiKey: 'test-key',
|
|
82
|
+
rateLimiter: fakeLimiter,
|
|
83
|
+
});
|
|
84
|
+
await client.uploadPlaceAsync(1, 2, '/tmp/place.rbxl', true);
|
|
85
|
+
await client.uploadPlaceAsync(1, 2, '/tmp/place.rbxl', false);
|
|
86
|
+
expect(urls[0]).toContain('versionType=Published');
|
|
87
|
+
expect(urls[1]).toContain('versionType=Saved');
|
|
88
|
+
});
|
|
89
|
+
});
|
|
90
|
+
//# sourceMappingURL=open-cloud-client.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"open-cloud-client.test.js","sourceRoot":"","sources":["../../../src/utils/open-cloud/open-cloud-client.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,10 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Minimal fetch shape the limiter drives. Defaults to the global `fetch`
|
|
3
|
+
* (undici). Callers can inject an alternative — e.g. node-fetch, whose Node
|
|
4
|
+
* `http` stack accepts a streaming request body against the Open Cloud upload
|
|
5
|
+
* endpoint where undici throws "expected non-null body source".
|
|
6
|
+
*/
|
|
7
|
+
export type FetchLike = (url: string | URL | Request, init?: RequestInit) => Promise<Response>;
|
|
1
8
|
export interface RateLimiterOptions {
|
|
2
9
|
/**
|
|
3
10
|
* Maximum number of concurrent in-flight requests. Defaults to 4.
|
|
@@ -49,6 +56,8 @@ export declare class RateLimiter {
|
|
|
49
56
|
* with jittered back-off
|
|
50
57
|
* - Tracks rate-limit headers from every response
|
|
51
58
|
*/
|
|
52
|
-
fetchAsync(url: string | URL | Request, init?: RequestInit)
|
|
59
|
+
fetchAsync(url: string | URL | Request, init?: RequestInit | (() => RequestInit), options?: {
|
|
60
|
+
fetchImpl?: FetchLike;
|
|
61
|
+
}): Promise<Response>;
|
|
53
62
|
}
|
|
54
63
|
//# sourceMappingURL=rate-limiter.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rate-limiter.d.ts","sourceRoot":"","sources":["../../../src/utils/open-cloud/rate-limiter.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"rate-limiter.d.ts","sourceRoot":"","sources":["../../../src/utils/open-cloud/rate-limiter.ts"],"names":[],"mappings":"AAoBA;;;;;GAKG;AACH,MAAM,MAAM,SAAS,GAAG,CACtB,GAAG,EAAE,MAAM,GAAG,GAAG,GAAG,OAAO,EAC3B,IAAI,CAAC,EAAE,WAAW,KACf,OAAO,CAAC,QAAQ,CAAC,CAAC;AAOvB,MAAM,WAAW,kBAAkB;IACjC;;;;OAIG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB;;;;OAIG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED;;;;;;;;;GASG;AACH,qBAAa,WAAW;IACtB,OAAO,CAAC,UAAU,CAAuB;IACzC,OAAO,CAAC,UAAU,CAAuB;IAEzC,kDAAkD;IAClD,OAAO,CAAC,MAAM,CAAyB;IACvC,OAAO,CAAC,SAAS,CAAK;IACtB,OAAO,CAAC,eAAe,CAAS;IAChC,OAAO,CAAC,WAAW,CAAS;gBAEhB,OAAO,GAAE,kBAAuB;IAQ5C,OAAO,CAAC,kBAAkB;YAeZ,kBAAkB;IAoBhC;;;;OAIG;IACH,OAAO,CAAC,aAAa;IAWrB,OAAO,CAAC,QAAQ;IAUhB;;;;;;;;OAQG;IACG,UAAU,CACd,GAAG,EAAE,MAAM,GAAG,GAAG,GAAG,OAAO,EAC3B,IAAI,CAAC,EAAE,WAAW,GAAG,CAAC,MAAM,WAAW,CAAC,EACxC,OAAO,CAAC,EAAE;QAAE,SAAS,CAAC,EAAE,SAAS,CAAA;KAAE,GAClC,OAAO,CAAC,QAAQ,CAAC;CAgErB"}
|
|
@@ -102,9 +102,10 @@ export class RateLimiter {
|
|
|
102
102
|
* with jittered back-off
|
|
103
103
|
* - Tracks rate-limit headers from every response
|
|
104
104
|
*/
|
|
105
|
-
async fetchAsync(url, init) {
|
|
105
|
+
async fetchAsync(url, init, options) {
|
|
106
106
|
await this._acquireAsync();
|
|
107
107
|
const route = _extractRoute(url);
|
|
108
|
+
const doFetch = options?.fetchImpl ?? fetch;
|
|
108
109
|
try {
|
|
109
110
|
let lastResponse = null;
|
|
110
111
|
let lastError = null;
|
|
@@ -113,13 +114,19 @@ export class RateLimiter {
|
|
|
113
114
|
let response = null;
|
|
114
115
|
let transportError = null;
|
|
115
116
|
try {
|
|
116
|
-
|
|
117
|
+
// Resolve init per attempt so a caller streaming a one-shot body
|
|
118
|
+
// (e.g. a progress-reporting upload) hands us a fresh, un-disturbed
|
|
119
|
+
// stream on every retry; a reused stream throws "body ... disturbed
|
|
120
|
+
// or locked". Plain-object inits (Uint8Array/string bodies) are just
|
|
121
|
+
// returned as-is and replay safely.
|
|
122
|
+
const resolvedInit = typeof init === 'function' ? init() : init;
|
|
123
|
+
response = await doFetch(url, resolvedInit);
|
|
117
124
|
this._updateFromHeaders(response.headers);
|
|
118
125
|
}
|
|
119
126
|
catch (err) {
|
|
120
127
|
transportError = err;
|
|
121
128
|
}
|
|
122
|
-
if (response && !
|
|
129
|
+
if (response && !_isRetryableResponse(response)) {
|
|
123
130
|
return response;
|
|
124
131
|
}
|
|
125
132
|
if (response) {
|
|
@@ -149,8 +156,25 @@ export class RateLimiter {
|
|
|
149
156
|
}
|
|
150
157
|
}
|
|
151
158
|
}
|
|
152
|
-
function
|
|
153
|
-
|
|
159
|
+
function _isRetryableResponse(response) {
|
|
160
|
+
const { status } = response;
|
|
161
|
+
if (status === 429 || RETRYABLE_SERVER_ERROR_STATUSES.has(status)) {
|
|
162
|
+
return true;
|
|
163
|
+
}
|
|
164
|
+
// 408 Request Timeout is transient by definition.
|
|
165
|
+
if (status === 408) {
|
|
166
|
+
return true;
|
|
167
|
+
}
|
|
168
|
+
// A large upload occasionally trips an edge/proxy that answers 400 with an
|
|
169
|
+
// HTML body ("Your browser sent an invalid request") — transient framing
|
|
170
|
+
// noise, not the API rejecting the payload. A genuine Open Cloud 400 comes
|
|
171
|
+
// back as a structured JSON error and must NOT be retried, so gate on the
|
|
172
|
+
// content type: retry a 400 only when it isn't application/json.
|
|
173
|
+
if (status === 400) {
|
|
174
|
+
const contentType = response.headers.get('content-type') ?? '';
|
|
175
|
+
return !contentType.toLowerCase().includes('application/json');
|
|
176
|
+
}
|
|
177
|
+
return false;
|
|
154
178
|
}
|
|
155
179
|
function _computeWaitSeconds(response, attempt) {
|
|
156
180
|
const retryAfter = response?.headers.get('retry-after');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rate-limiter.js","sourceRoot":"","sources":["../../../src/utils/open-cloud/rate-limiter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAE1D;;;GAGG;AACH,SAAS,aAAa,CAAC,GAA2B;IAChD,IAAI,CAAC;QACH,MAAM,MAAM,GACV,OAAO,GAAG,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,YAAY,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC;QAC1E,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,CAAC;QAC/B,wDAAwD;QACxD,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAC5D,4CAA4C;QAC5C,OAAO,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACtC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,SAAS,CAAC;IACnB,CAAC;AACH,CAAC;
|
|
1
|
+
{"version":3,"file":"rate-limiter.js","sourceRoot":"","sources":["../../../src/utils/open-cloud/rate-limiter.ts"],"names":[],"mappings":"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"}
|
|
@@ -143,5 +143,28 @@ describe('RateLimiter', () => {
|
|
|
143
143
|
expect(response.status).toBe(404);
|
|
144
144
|
expect(fetchMock).toHaveBeenCalledTimes(1);
|
|
145
145
|
});
|
|
146
|
+
it('retries a transient HTML edge 400 but not a structured JSON API 400', async () => {
|
|
147
|
+
// A large upload can trip an edge proxy that answers 400 with an HTML body
|
|
148
|
+
// — transient framing noise we should ride out. A genuine Open Cloud 400 is
|
|
149
|
+
// a JSON error and must be returned immediately, not retried.
|
|
150
|
+
vi.useFakeTimers();
|
|
151
|
+
const limiter = new RateLimiter();
|
|
152
|
+
// Edge 400 (text/html) then success — must retry.
|
|
153
|
+
fetchMock
|
|
154
|
+
.mockResolvedValueOnce(makeResponse(400, { 'content-type': 'text/html' }))
|
|
155
|
+
.mockResolvedValueOnce(makeResponse(200));
|
|
156
|
+
const edge = limiter.fetchAsync('https://apis.roblox.com/cloud/v2/a');
|
|
157
|
+
await vi.advanceTimersByTimeAsync(0);
|
|
158
|
+
expect(fetchMock).toHaveBeenCalledTimes(1);
|
|
159
|
+
await vi.advanceTimersByTimeAsync(1000); // 2^0 = 1s backoff
|
|
160
|
+
expect((await edge).status).toBe(200);
|
|
161
|
+
expect(fetchMock).toHaveBeenCalledTimes(2);
|
|
162
|
+
fetchMock.mockClear();
|
|
163
|
+
// API 400 (application/json) — must NOT retry.
|
|
164
|
+
fetchMock.mockResolvedValueOnce(makeResponse(400, { 'content-type': 'application/json' }));
|
|
165
|
+
const api = await limiter.fetchAsync('https://apis.roblox.com/cloud/v2/b');
|
|
166
|
+
expect(api.status).toBe(400);
|
|
167
|
+
expect(fetchMock).toHaveBeenCalledTimes(1);
|
|
168
|
+
});
|
|
146
169
|
});
|
|
147
170
|
//# sourceMappingURL=rate-limiter.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rate-limiter.test.js","sourceRoot":"","sources":["../../../src/utils/open-cloud/rate-limiter.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"rate-limiter.test.js","sourceRoot":"","sources":["../../../src/utils/open-cloud/rate-limiter.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test-runner.d.ts","sourceRoot":"","sources":["../../../../src/utils/testing/runner/test-runner.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,kCAAkC,CAAC;AACnE,OAAO,EACL,KAAK,gBAAgB,EAGtB,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"test-runner.d.ts","sourceRoot":"","sources":["../../../../src/utils/testing/runner/test-runner.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,kCAAkC,CAAC;AACnE,OAAO,EACL,KAAK,gBAAgB,EAGtB,MAAM,uBAAuB,CAAC;AAQ/B,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,gBAAgB,CAAC;IAC9B;;;;OAIG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,iBAAiB;IAChC,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB;;;OAGG;IACH,MAAM,EAAE,YAAY,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,8EAA8E;IAC9E,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED;;;;;GAKG;AACH,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,UAAU,EACnB,OAAO,EAAE,iBAAiB,GACzB,OAAO,CAAC,gBAAgB,CAAC,CA8D3B;AAED;;GAEG;AACH,wBAAsB,mBAAmB,CACvC,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,MAAM,GAAG,SAAS,GAC7B,OAAO,CAAC,MAAM,CAAC,CAajB"}
|
|
@@ -2,6 +2,7 @@ import * as fs from 'fs/promises';
|
|
|
2
2
|
import * as path from 'path';
|
|
3
3
|
import { randomUUID } from 'crypto';
|
|
4
4
|
import { parseTestLogs, parseTestCounts, } from '../test-log-parser.js';
|
|
5
|
+
import { buildDeployMetadataAttributes, gatherGitDeployInfo, injectDeployMetadataInPlaceAsync, packageUsesManifestAsync, } from '../../deploy/deploy-metadata.js';
|
|
5
6
|
/**
|
|
6
7
|
* Build, deploy, and run a test for a single package using the provided
|
|
7
8
|
* JobContext. The context determines the execution environment (cloud or local).
|
|
@@ -17,6 +18,18 @@ export async function runSingleTestAsync(context, options) {
|
|
|
17
18
|
packagePath,
|
|
18
19
|
packageName,
|
|
19
20
|
});
|
|
21
|
+
// Packages that ship or use the manifest get the same deploy-metadata stamp a
|
|
22
|
+
// real deploy would apply, so their specs can assert the injection actually
|
|
23
|
+
// ran. The per-session build is exclusively ours, so rewrite it in place.
|
|
24
|
+
if (await packageUsesManifestAsync(packagePath)) {
|
|
25
|
+
await injectDeployMetadataInPlaceAsync(builtPlace.rbxlPath, buildDeployMetadataAttributes(gatherGitDeployInfo(), {
|
|
26
|
+
target: 'test',
|
|
27
|
+
published: false,
|
|
28
|
+
timestamp: new Date().toISOString(),
|
|
29
|
+
placeId: builtPlace.target.placeId,
|
|
30
|
+
universeId: builtPlace.target.universeId,
|
|
31
|
+
}));
|
|
32
|
+
}
|
|
20
33
|
const scriptContent = scriptText ??
|
|
21
34
|
(await readTestScriptAsync(packagePath, builtPlace.target.scriptTemplate));
|
|
22
35
|
const deployment = await context.deployBuiltPlaceAsync({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test-runner.js","sourceRoot":"","sources":["../../../../src/utils/testing/runner/test-runner.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,aAAa,CAAC;AAClC,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAGpC,OAAO,EAEL,aAAa,EACb,eAAe,GAChB,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"test-runner.js","sourceRoot":"","sources":["../../../../src/utils/testing/runner/test-runner.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,aAAa,CAAC;AAClC,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAGpC,OAAO,EAEL,aAAa,EACb,eAAe,GAChB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EACL,6BAA6B,EAC7B,mBAAmB,EACnB,gCAAgC,EAChC,wBAAwB,GACzB,MAAM,iCAAiC,CAAC;AA2BzC;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,OAAmB,EACnB,OAA0B;IAE1B,MAAM,EACJ,WAAW,EACX,WAAW,EACX,SAAS,GAAG,OAAO,EACnB,UAAU,EACV,MAAM,GACP,GAAG,OAAO,CAAC;IAEZ,MAAM,SAAS,GAAG,UAAU,EAAE,CAAC;IAC/B,MAAM,UAAU,GAAG,MAAM,OAAO,CAAC,eAAe,CAAC;QAC/C,MAAM;QACN,cAAc,EAAE,QAAQ,SAAS,OAAO;QACxC,WAAW;QACX,WAAW;KACZ,CAAC,CAAC;IAEH,8EAA8E;IAC9E,4EAA4E;IAC5E,0EAA0E;IAC1E,IAAI,MAAM,wBAAwB,CAAC,WAAW,CAAC,EAAE,CAAC;QAChD,MAAM,gCAAgC,CACpC,UAAU,CAAC,QAAQ,EACnB,6BAA6B,CAAC,mBAAmB,EAAE,EAAE;YACnD,MAAM,EAAE,MAAM;YACd,SAAS,EAAE,KAAK;YAChB,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;YACnC,OAAO,EAAE,UAAU,CAAC,MAAM,CAAC,OAAO;YAClC,UAAU,EAAE,UAAU,CAAC,MAAM,CAAC,UAAU;SACzC,CAAC,CACH,CAAC;IACJ,CAAC;IAED,MAAM,aAAa,GACjB,UAAU;QACV,CAAC,MAAM,mBAAmB,CAAC,WAAW,EAAE,UAAU,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC;IAE7E,MAAM,UAAU,GAAG,MAAM,OAAO,CAAC,qBAAqB,CAAC;QACrD,UAAU;QACV,WAAW;QACX,WAAW;KACZ,CAAC,CAAC;IAEH,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,cAAc,CAAC,UAAU,EAAE;YACtD,aAAa;YACb,WAAW;YACX,SAAS;SACV,CAAC,CAAC;QAEH,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;QACvD,MAAM,MAAM,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC;QAEtC,OAAO;YACL,OAAO,EAAE,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC,OAAO;YACzC,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,UAAU,EAAE,eAAe,CAAC,MAAM,CAAC,IAAI,CAAC;YACxC,UAAU,EAAE,MAAM,CAAC,UAAU;SAC9B,CAAC;IACJ,CAAC;YAAS,CAAC;QACT,MAAM,OAAO,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;IACzC,CAAC;AACH,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,WAAmB,EACnB,UAA8B;IAE9B,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,MAAM,IAAI,KAAK,CACb,mDAAmD,WAAW,2EAA2E,CAC1I,CAAC;IACJ,CAAC;IAED,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;IACvD,IAAI,CAAC;QACH,OAAO,MAAM,EAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAC9C,CAAC;IAAC,MAAM,CAAC;QACP,MAAM,IAAI,KAAK,CAAC,0BAA0B,QAAQ,EAAE,CAAC,CAAC;IACxD,CAAC;AACH,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@quenty/nevermore-cli",
|
|
3
|
-
"version": "4.
|
|
3
|
+
"version": "4.36.0",
|
|
4
4
|
"description": "CLI interface for Nevermore",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"keywords": [
|
|
@@ -57,5 +57,5 @@
|
|
|
57
57
|
"engines": {
|
|
58
58
|
"node": ">=16"
|
|
59
59
|
},
|
|
60
|
-
"gitHead": "
|
|
60
|
+
"gitHead": "8ca327c64a238d0bb98a386d73865ec7d484a20e"
|
|
61
61
|
}
|
|
@@ -20,6 +20,11 @@ import {
|
|
|
20
20
|
type BatchDeployResult,
|
|
21
21
|
createDeployCommentConfig,
|
|
22
22
|
} from '../../utils/deploy/deploy-github-columns.js';
|
|
23
|
+
import {
|
|
24
|
+
buildDeployMetadataAttributes,
|
|
25
|
+
gatherGitDeployInfo,
|
|
26
|
+
injectDeployMetadataAsync,
|
|
27
|
+
} from '../../utils/deploy/deploy-metadata.js';
|
|
23
28
|
import { OpenCloudClient } from '../../utils/open-cloud/open-cloud-client.js';
|
|
24
29
|
import { RateLimiter } from '../../utils/open-cloud/rate-limiter.js';
|
|
25
30
|
import { CloudJobContext } from '../../utils/job-context/cloud-job-context.js';
|
|
@@ -208,6 +213,10 @@ async function _runAsync(args: BatchDeployArgs): Promise<void> {
|
|
|
208
213
|
});
|
|
209
214
|
const context = new CloudJobContext(reporter, client);
|
|
210
215
|
|
|
216
|
+
// Gathered once so every deployed package shares one timestamp and commit.
|
|
217
|
+
const deployGitInfo = gatherGitDeployInfo();
|
|
218
|
+
const deployTimestamp = new Date().toISOString();
|
|
219
|
+
|
|
211
220
|
await reporter.startAsync();
|
|
212
221
|
|
|
213
222
|
let exitCode = 0;
|
|
@@ -225,13 +234,29 @@ async function _runAsync(args: BatchDeployArgs): Promise<void> {
|
|
|
225
234
|
packageName: buildTarget.name,
|
|
226
235
|
});
|
|
227
236
|
|
|
228
|
-
const
|
|
237
|
+
const injected = await injectDeployMetadataAsync(
|
|
229
238
|
builtPlace,
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
239
|
+
buildDeployMetadataAttributes(deployGitInfo, {
|
|
240
|
+
target: targetName,
|
|
241
|
+
published: publish,
|
|
242
|
+
timestamp: deployTimestamp,
|
|
243
|
+
universeId: buildTarget.target.universeId,
|
|
244
|
+
placeId: buildTarget.target.placeId,
|
|
245
|
+
})
|
|
246
|
+
);
|
|
247
|
+
|
|
248
|
+
let version: number;
|
|
249
|
+
try {
|
|
250
|
+
({ version } = await uploadPlaceAsync({
|
|
251
|
+
builtPlace: injected.builtPlace,
|
|
252
|
+
args: { apiKey, publish },
|
|
253
|
+
client,
|
|
254
|
+
reporter: pkgReporter,
|
|
255
|
+
packageName: buildTarget.name,
|
|
256
|
+
}));
|
|
257
|
+
} finally {
|
|
258
|
+
await injected.cleanupAsync();
|
|
259
|
+
}
|
|
235
260
|
|
|
236
261
|
// Eagerly release build artifacts after upload
|
|
237
262
|
await context.releaseBuiltPlaceAsync(builtPlace);
|
|
@@ -19,6 +19,11 @@ import {
|
|
|
19
19
|
type BatchDeployResult,
|
|
20
20
|
createDeployCommentConfig,
|
|
21
21
|
} from '../../utils/deploy/deploy-github-columns.js';
|
|
22
|
+
import {
|
|
23
|
+
buildDeployMetadataAttributes,
|
|
24
|
+
gatherGitDeployInfo,
|
|
25
|
+
injectDeployMetadataAsync,
|
|
26
|
+
} from '../../utils/deploy/deploy-metadata.js';
|
|
22
27
|
import { OpenCloudClient } from '../../utils/open-cloud/open-cloud-client.js';
|
|
23
28
|
import { RateLimiter } from '../../utils/open-cloud/rate-limiter.js';
|
|
24
29
|
import { CloudJobContext } from '../../utils/job-context/cloud-job-context.js';
|
|
@@ -216,6 +221,11 @@ export class DeployCommand<T> implements CommandModule<T, DeployArgs> {
|
|
|
216
221
|
|
|
217
222
|
const publish = args.publish ?? false;
|
|
218
223
|
const showLogs = args.logs ?? false;
|
|
224
|
+
|
|
225
|
+
// Gathered once so every place in a multi-place deploy shares one timestamp
|
|
226
|
+
// and commit.
|
|
227
|
+
const deployGitInfo = gatherGitDeployInfo();
|
|
228
|
+
const deployTimestamp = new Date().toISOString();
|
|
219
229
|
const useSpinner = process.stdout.isTTY && !args.verbose;
|
|
220
230
|
const isGrouped = !process.stdout.isTTY || args.verbose || isCI();
|
|
221
231
|
const deployLabels = {
|
|
@@ -319,13 +329,30 @@ export class DeployCommand<T> implements CommandModule<T, DeployArgs> {
|
|
|
319
329
|
overrides: isMultiPlace ? undefined : args,
|
|
320
330
|
});
|
|
321
331
|
|
|
322
|
-
const
|
|
332
|
+
const injected = await injectDeployMetadataAsync(
|
|
323
333
|
builtPlace,
|
|
324
|
-
|
|
325
|
-
|
|
326
|
-
|
|
327
|
-
|
|
328
|
-
|
|
334
|
+
buildDeployMetadataAttributes(deployGitInfo, {
|
|
335
|
+
target: targetName,
|
|
336
|
+
published: publish,
|
|
337
|
+
timestamp: deployTimestamp,
|
|
338
|
+
universeId: args.universeId ?? buildTarget.target.universeId,
|
|
339
|
+
placeId: args.placeId ?? buildTarget.target.placeId,
|
|
340
|
+
})
|
|
341
|
+
);
|
|
342
|
+
|
|
343
|
+
let uploadResult: Awaited<ReturnType<typeof uploadPlaceAsync>>;
|
|
344
|
+
try {
|
|
345
|
+
uploadResult = await uploadPlaceAsync({
|
|
346
|
+
builtPlace: injected.builtPlace,
|
|
347
|
+
args,
|
|
348
|
+
client,
|
|
349
|
+
reporter: pkgReporter,
|
|
350
|
+
packageName: buildTarget.name,
|
|
351
|
+
});
|
|
352
|
+
} finally {
|
|
353
|
+
await injected.cleanupAsync();
|
|
354
|
+
}
|
|
355
|
+
const { version, target: uploadedTarget } = uploadResult;
|
|
329
356
|
|
|
330
357
|
await context.releaseBuiltPlaceAsync(builtPlace);
|
|
331
358
|
|