netlify-cli 27.0.3 → 27.1.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/dist/utils/deploy/deploy-site.d.ts.map +1 -1
- package/dist/utils/deploy/deploy-site.js +8 -4
- package/dist/utils/deploy/deploy-site.js.map +1 -1
- package/dist/utils/deploy/hash-edge-functions.d.ts +11 -0
- package/dist/utils/deploy/hash-edge-functions.d.ts.map +1 -0
- package/dist/utils/deploy/hash-edge-functions.js +53 -0
- package/dist/utils/deploy/hash-edge-functions.js.map +1 -0
- package/dist/utils/deploy/hash-fns.d.ts.map +1 -1
- package/dist/utils/deploy/hash-fns.js +10 -0
- package/dist/utils/deploy/hash-fns.js.map +1 -1
- package/dist/utils/deploy/upload-files.d.ts +40 -5
- package/dist/utils/deploy/upload-files.d.ts.map +1 -1
- package/dist/utils/deploy/upload-files.js +33 -24
- package/dist/utils/deploy/upload-files.js.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy-site.d.ts","sourceRoot":"","sources":["../../../src/utils/deploy/deploy-site.ts"],"names":[],"mappings":"AAKA,OAAO,WAAW,MAAM,gCAAgC,CAAA;AACxD,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,yBAAyB,CAAA;
|
|
1
|
+
{"version":3,"file":"deploy-site.d.ts","sourceRoot":"","sources":["../../../src/utils/deploy/deploy-site.ts"],"names":[],"mappings":"AAKA,OAAO,WAAW,MAAM,gCAAgC,CAAA;AACxD,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAuBvD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAGjD,YAAY,EAAE,WAAW,EAAE,CAAA;AAS3B,eAAO,MAAM,UAAU,YACZ,WAAW,OACf,QAAQ,6QAsCV;IACD,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,WAAW,KAAK,IAAI,CAAA;IACxC,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,KAAK,CAAC,EAAE,MAAM,EAAE,CAAA;IAChB,UAAU,EAAE,MAAM,CAAA;CACnB;;;;EAmJF,CAAA"}
|
|
@@ -4,6 +4,7 @@ import cleanDeep from 'clean-deep';
|
|
|
4
4
|
import { warn } from '../command-helpers.js';
|
|
5
5
|
import { DEFAULT_CONCURRENT_HASH, DEFAULT_CONCURRENT_UPLOAD, DEFAULT_DEPLOY_TIMEOUT, DEFAULT_MAX_RETRY, DEFAULT_SYNC_LIMIT, } from './constants.js';
|
|
6
6
|
import { hashConfig } from './hash-config.js';
|
|
7
|
+
import hashEdgeFunctions from './hash-edge-functions.js';
|
|
7
8
|
import hashFiles from './hash-files.js';
|
|
8
9
|
import hashFns from './hash-fns.js';
|
|
9
10
|
import { deployFileNormalizer, getDbMigrationsDistPathIfExists, getDeployConfigPathIfExists, getEdgeFunctionsDistPathIfExists, isEdgeFunctionFile, } from './process-files.js';
|
|
@@ -50,7 +51,7 @@ skipFunctionsCache, statusCb = () => {
|
|
|
50
51
|
const edgeFunctionsDistPath = await getEdgeFunctionsDistPathIfExists(workingDir);
|
|
51
52
|
const deployConfigPath = await getDeployConfigPathIfExists(workingDir);
|
|
52
53
|
const dbMigrationsDistPath = await getDbMigrationsDistPathIfExists(workingDir);
|
|
53
|
-
const [{ files: staticFiles, filesShaMap: staticShaMap }, { fnConfig, fnShaMap, functionSchedules, functions, functionsWithNativeModules }, configFile,] = await Promise.all([
|
|
54
|
+
const [{ files: staticFiles, filesShaMap: staticShaMap }, { fnConfig, fnShaMap, functionSchedules, functions, functionsWithNativeModules }, configFile, { edgeFunctions, edgeFnShaMap },] = await Promise.all([
|
|
54
55
|
hashFiles({
|
|
55
56
|
assetType,
|
|
56
57
|
concurrentHash,
|
|
@@ -71,6 +72,7 @@ skipFunctionsCache, statusCb = () => {
|
|
|
71
72
|
rootDir: siteRoot,
|
|
72
73
|
}),
|
|
73
74
|
hashConfig({ config }),
|
|
75
|
+
hashEdgeFunctions(edgeFunctionsDistPath, { hashAlgorithm, statusCb }),
|
|
74
76
|
]);
|
|
75
77
|
const files = { ...staticFiles, [configFile.normalizedPath]: configFile.hash };
|
|
76
78
|
const filesShaMap = { ...staticShaMap, [configFile.hash]: [configFile] };
|
|
@@ -119,6 +121,7 @@ For more information, visit https://ntl.fyi/cli-native-modules.`);
|
|
|
119
121
|
body: {
|
|
120
122
|
files,
|
|
121
123
|
functions,
|
|
124
|
+
edge_functions: edgeFunctions,
|
|
122
125
|
function_schedules: functionSchedules,
|
|
123
126
|
functions_config: fnConfig,
|
|
124
127
|
async: Object.keys(files).length > syncFileLimit,
|
|
@@ -132,15 +135,16 @@ For more information, visit https://ntl.fyi/cli-native-modules.`);
|
|
|
132
135
|
let deploy = await api.updateSiteDeploy(deployParams);
|
|
133
136
|
if (deployParams.body.async)
|
|
134
137
|
deploy = await waitForDiff(api, deploy.id, siteId, deployTimeout);
|
|
135
|
-
const { required: requiredFiles, required_functions: requiredFns } = deploy;
|
|
138
|
+
const { required: requiredFiles, required_functions: requiredFns, required_edge_functions: requiredEdgeFns } = deploy;
|
|
136
139
|
statusCb({
|
|
137
140
|
type: 'create-deploy',
|
|
138
|
-
msg: `CDN requesting ${requiredFiles.length} files${Array.isArray(requiredFns) ? ` and ${requiredFns.length} functions` : ''}`,
|
|
141
|
+
msg: `CDN requesting ${requiredFiles.length} files${Array.isArray(requiredFns) ? ` and ${requiredFns.length} functions` : ''}${Array.isArray(requiredEdgeFns) ? ` and ${requiredEdgeFns.length} edge functions` : ''}`,
|
|
139
142
|
phase: 'stop',
|
|
140
143
|
});
|
|
141
144
|
const filesUploadList = getUploadList(requiredFiles, filesShaMap);
|
|
142
145
|
const functionsUploadList = getUploadList(requiredFns, fnShaMap);
|
|
143
|
-
const
|
|
146
|
+
const edgeFunctionsUploadList = getUploadList(requiredEdgeFns, edgeFnShaMap);
|
|
147
|
+
const uploadList = [...filesUploadList, ...functionsUploadList, ...edgeFunctionsUploadList];
|
|
144
148
|
await uploadFiles(api, deployId, uploadList, { concurrentUpload, statusCb, maxRetry });
|
|
145
149
|
statusCb({
|
|
146
150
|
type: 'wait-for-deploy',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy-site.js","sourceRoot":"","sources":["../../../src/utils/deploy/deploy-site.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,aAAa,CAAA;AAEhC,OAAO,EAAE,UAAU,IAAI,sBAAsB,EAAE,MAAM,gBAAgB,CAAA;AACrE,OAAO,SAAS,MAAM,YAAY,CAAA;AAIlC,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAA;AAE5C,OAAO,EACL,uBAAuB,EACvB,yBAAyB,EACzB,sBAAsB,EACtB,iBAAiB,EACjB,kBAAkB,GACnB,MAAM,gBAAgB,CAAA;AACvB,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAC7C,OAAO,SAAS,MAAM,iBAAiB,CAAA;AACvC,OAAO,OAAO,MAAM,eAAe,CAAA;AACnC,OAAO,EACL,oBAAoB,EACpB,+BAA+B,EAC/B,2BAA2B,EAC3B,gCAAgC,EAChC,kBAAkB,GACnB,MAAM,oBAAoB,CAAA;AAC3B,OAAO,WAAW,MAAM,mBAAmB,CAAA;AAC3C,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,WAAW,CAAA;AAErE,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AAIzD,MAAM,gBAAgB,GAAG,CAAC,aAA6C,EAAE,EAAE;IACzE,MAAM,KAAK,GAAG,aAAa,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;IAC3C,MAAM,OAAO,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAE7C,OAAO,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,OAAO,QAAQ,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAA;AACjF,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,UAAU,GAAG,KAAK,EAC7B,OAAoB,EACpB,GAAa;AACb,oFAAoF;AACpF,MAAM;AACN,iFAAiF;AACjF,GAAG,EACH;AACE,2IAA2I;AAC3I,SAAS;AACT,2IAA2I;AAC3I,MAAM,EACN,cAAc,GAAG,uBAAuB,EACxC,gBAAgB,GAAG,yBAAyB;AAC5C,2IAA2I;AAC3I,MAAM;AACN,2IAA2I;AAC3I,QAAQ,EACR,aAAa,GAAG,sBAAsB,EACtC,KAAK,GAAG,KAAK;AACb,2IAA2I;AAC3I,MAAM,EACN,KAAK,GAAG,EAAE;AACV,2IAA2I;AAC3I,eAAe;AACf,2IAA2I;AAC3I,aAAa;AACb,2IAA2I;AAC3I,YAAY,EACZ,QAAQ,GAAG,iBAAiB;AAC5B,2IAA2I;AAC3I,QAAQ;AACR,2IAA2I;AAC3I,kBAAkB,EAClB,QAAQ,GAAG,GAAG,EAAE;IACd,qBAAqB;AACvB,CAAC,EACD,aAAa,GAAG,kBAAkB,EAClC,MAAM,GAAG,kBAAkB,EAAE,EAC7B,UAAU,GAYX,EACD,EAAE;IACF,QAAQ,CAAC;QACP,IAAI,EAAE,SAAS;QACf,GAAG,EAAE,kBAAkB;QACvB,KAAK,EAAE,OAAO;KACf,CAAC,CAAA;IAEF,MAAM,qBAAqB,GAAG,MAAM,gCAAgC,CAAC,UAAU,CAAC,CAAA;IAChF,MAAM,gBAAgB,GAAG,MAAM,2BAA2B,CAAC,UAAU,CAAC,CAAA;IACtE,MAAM,oBAAoB,GAAG,MAAM,+BAA+B,CAAC,UAAU,CAAC,CAAA;IAC9E,MAAM,CACJ,EAAE,KAAK,EAAE,WAAW,EAAE,WAAW,EAAE,YAAY,EAAE,EACjD,EAAE,QAAQ,EAAE,QAAQ,EAAE,iBAAiB,EAAE,SAAS,EAAE,0BAA0B,EAAE,EAChF,UAAU,
|
|
1
|
+
{"version":3,"file":"deploy-site.js","sourceRoot":"","sources":["../../../src/utils/deploy/deploy-site.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import type { StatusCallback } from './status-cb.js';
|
|
2
|
+
import type { EdgeFunctionUploadFile } from './upload-files.js';
|
|
3
|
+
declare const hashEdgeFunctions: (edgeFunctionsDistPath: string | undefined, { hashAlgorithm, statusCb }: {
|
|
4
|
+
hashAlgorithm?: string;
|
|
5
|
+
statusCb: StatusCallback;
|
|
6
|
+
}) => Promise<{
|
|
7
|
+
edgeFunctions: Record<string, string>;
|
|
8
|
+
edgeFnShaMap: Record<string, EdgeFunctionUploadFile[]>;
|
|
9
|
+
}>;
|
|
10
|
+
export default hashEdgeFunctions;
|
|
11
|
+
//# sourceMappingURL=hash-edge-functions.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"hash-edge-functions.d.ts","sourceRoot":"","sources":["../../../src/utils/deploy/hash-edge-functions.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AACpD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAA;AAa/D,QAAA,MAAM,iBAAiB,0BACE,MAAM,GAAG,SAAS,+BACD;IAAE,aAAa,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,cAAc,CAAA;CAAE,KAC3F,OAAO,CAAC;IAET,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAErC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,sBAAsB,EAAE,CAAC,CAAA;CACvD,CAwCA,CAAA;eAEc,iBAAiB"}
|
|
@@ -0,0 +1,53 @@
|
|
|
1
|
+
import { createHash } from 'node:crypto';
|
|
2
|
+
import { createReadStream } from 'node:fs';
|
|
3
|
+
import { readFile } from 'node:fs/promises';
|
|
4
|
+
import { join } from 'node:path';
|
|
5
|
+
import { pipeline } from 'node:stream/promises';
|
|
6
|
+
const hashBundle = async (filepath, hashAlgorithm) => {
|
|
7
|
+
const hasher = createHash(hashAlgorithm);
|
|
8
|
+
await pipeline([createReadStream(filepath), hasher]);
|
|
9
|
+
return hasher.digest('hex');
|
|
10
|
+
};
|
|
11
|
+
// Reads the edge-bundler manifest from the dist directory and, for every bundle, computes its
|
|
12
|
+
// `code_sha` (sha256 of the bundle bytes — the deploy identity, recomputed rather than trusting the
|
|
13
|
+
// bundler's asset filename) so we can both declare it on deploy create and stream it on upload. We
|
|
14
|
+
// declare every format; bitballoon decides which ones actually ride this path and returns them in
|
|
15
|
+
// `required_edge_functions`.
|
|
16
|
+
const hashEdgeFunctions = async (edgeFunctionsDistPath, { hashAlgorithm = 'sha256', statusCb }) => {
|
|
17
|
+
const edgeFunctions = {};
|
|
18
|
+
const edgeFnShaMap = {};
|
|
19
|
+
if (!edgeFunctionsDistPath) {
|
|
20
|
+
return { edgeFunctions, edgeFnShaMap };
|
|
21
|
+
}
|
|
22
|
+
// `Partial` because this is whatever happens to be on disk, not something we produced.
|
|
23
|
+
let manifest;
|
|
24
|
+
try {
|
|
25
|
+
manifest = JSON.parse(await readFile(join(edgeFunctionsDistPath, 'manifest.json'), 'utf8'));
|
|
26
|
+
}
|
|
27
|
+
catch {
|
|
28
|
+
// No manifest (or an unreadable one) means there are no edge functions to declare.
|
|
29
|
+
return { edgeFunctions, edgeFnShaMap };
|
|
30
|
+
}
|
|
31
|
+
const bundles = manifest.bundles ?? [];
|
|
32
|
+
for (const bundle of bundles) {
|
|
33
|
+
const filepath = join(edgeFunctionsDistPath, bundle.asset);
|
|
34
|
+
const codeSha = await hashBundle(filepath, hashAlgorithm);
|
|
35
|
+
edgeFunctions[bundle.format] = codeSha;
|
|
36
|
+
const fileObj = {
|
|
37
|
+
assetType: 'edge-function',
|
|
38
|
+
filepath,
|
|
39
|
+
normalizedPath: codeSha,
|
|
40
|
+
hash: codeSha,
|
|
41
|
+
};
|
|
42
|
+
if (Array.isArray(edgeFnShaMap[codeSha])) {
|
|
43
|
+
edgeFnShaMap[codeSha].push(fileObj);
|
|
44
|
+
}
|
|
45
|
+
else {
|
|
46
|
+
edgeFnShaMap[codeSha] = [fileObj];
|
|
47
|
+
}
|
|
48
|
+
statusCb({ type: 'hashing', msg: `Hashing edge function bundle ${bundle.asset}`, phase: 'progress' });
|
|
49
|
+
}
|
|
50
|
+
return { edgeFunctions, edgeFnShaMap };
|
|
51
|
+
};
|
|
52
|
+
export default hashEdgeFunctions;
|
|
53
|
+
//# sourceMappingURL=hash-edge-functions.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"hash-edge-functions.js","sourceRoot":"","sources":["../../../src/utils/deploy/hash-edge-functions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AACxC,OAAO,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAA;AAC1C,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAC3C,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAChC,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AAO/C,MAAM,UAAU,GAAG,KAAK,EAAE,QAAgB,EAAE,aAAqB,EAAmB,EAAE;IACpF,MAAM,MAAM,GAAG,UAAU,CAAC,aAAa,CAAC,CAAA;IACxC,MAAM,QAAQ,CAAC,CAAC,gBAAgB,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,CAAC,CAAA;IACpD,OAAO,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;AAC7B,CAAC,CAAA;AAED,8FAA8F;AAC9F,oGAAoG;AACpG,mGAAmG;AACnG,kGAAkG;AAClG,6BAA6B;AAC7B,MAAM,iBAAiB,GAAG,KAAK,EAC7B,qBAAyC,EACzC,EAAE,aAAa,GAAG,QAAQ,EAAE,QAAQ,EAAwD,EAM3F,EAAE;IACH,MAAM,aAAa,GAA2B,EAAE,CAAA;IAChD,MAAM,YAAY,GAA6C,EAAE,CAAA;IAEjE,IAAI,CAAC,qBAAqB,EAAE,CAAC;QAC3B,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,CAAA;IACxC,CAAC;IAED,uFAAuF;IACvF,IAAI,QAA2B,CAAA;IAC/B,IAAI,CAAC;QACH,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,QAAQ,CAAC,IAAI,CAAC,qBAAqB,EAAE,eAAe,CAAC,EAAE,MAAM,CAAC,CAAsB,CAAA;IAClH,CAAC;IAAC,MAAM,CAAC;QACP,mFAAmF;QACnF,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,CAAA;IACxC,CAAC;IAED,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAO,IAAI,EAAE,CAAA;IACtC,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;QAC7B,MAAM,QAAQ,GAAG,IAAI,CAAC,qBAAqB,EAAE,MAAM,CAAC,KAAK,CAAC,CAAA;QAC1D,MAAM,OAAO,GAAG,MAAM,UAAU,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAA;QAEzD,aAAa,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,OAAO,CAAA;QAEtC,MAAM,OAAO,GAA2B;YACtC,SAAS,EAAE,eAAe;YAC1B,QAAQ;YACR,cAAc,EAAE,OAAO;YACvB,IAAI,EAAE,OAAO;SACd,CAAA;QACD,IAAI,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC;YACzC,YAAY,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QACrC,CAAC;aAAM,CAAC;YACN,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;QACnC,CAAC;QAED,QAAQ,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,gCAAgC,MAAM,CAAC,KAAK,EAAE,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,CAAA;IACvG,CAAC;IAED,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,CAAA;AACxC,CAAC,CAAA;AAED,eAAe,iBAAiB,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hash-fns.d.ts","sourceRoot":"","sources":["../../../src/utils/deploy/hash-fns.ts"],"names":[],"mappings":"AAOA,OAAO,WAAW,MAAM,gCAAgC,CAAA;AACxD,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAkGlD,QAAA,MAAM,OAAO,YACF,WAAW,eACP,MAAM,EAAE,oHAUlB;IACD,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,eAAe,CAAC,EAAE,QAAQ,CAAA;IAC1B,aAAa,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IAClC,YAAY,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IACjC,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IAC5B,kBAAkB,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;IACxC,QAAQ,EAAE,QAAQ,CAAA;IAClB,MAAM,EAAE,QAAQ,CAAA;CACjB,KACA,OAAO,CAAC;IACT,iBAAiB,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,EAAE,GAAG,SAAS,CAAA;IAChE,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACjC,0BAA0B,EAAE,QAAQ,EAAE,CAAA;IACtC,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,GAAG,SAAS,CAAA;IAC7C,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,EAAE,CAAC,GAAG,SAAS,CAAA;IACjD,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,GAAG,SAAS,CAAA;CAChD,
|
|
1
|
+
{"version":3,"file":"hash-fns.d.ts","sourceRoot":"","sources":["../../../src/utils/deploy/hash-fns.ts"],"names":[],"mappings":"AAOA,OAAO,WAAW,MAAM,gCAAgC,CAAA;AACxD,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAkGlD,QAAA,MAAM,OAAO,YACF,WAAW,eACP,MAAM,EAAE,oHAUlB;IACD,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,eAAe,CAAC,EAAE,QAAQ,CAAA;IAC1B,aAAa,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IAClC,YAAY,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IACjC,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IAC5B,kBAAkB,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;IACxC,QAAQ,EAAE,QAAQ,CAAA;IAClB,MAAM,EAAE,QAAQ,CAAA;CACjB,KACA,OAAO,CAAC;IACT,iBAAiB,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,EAAE,GAAG,SAAS,CAAA;IAChE,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACjC,0BAA0B,EAAE,QAAQ,EAAE,CAAA;IACtC,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,GAAG,SAAS,CAAA;IAC7C,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,EAAE,CAAC,GAAG,SAAS,CAAA;IACjD,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,GAAG,SAAS,CAAA;CAChD,CAmHA,CAAA;eAEc,OAAO"}
|
|
@@ -90,6 +90,16 @@ const hashFns = async (command, directories, { concurrentHash, functionsConfig,
|
|
|
90
90
|
statusCb,
|
|
91
91
|
tmpDir,
|
|
92
92
|
});
|
|
93
|
+
// ZISI's in-memory FunctionResult only nests bootstrap/runtime version into
|
|
94
|
+
// buildData when writing the manifest cache. Reconstruct it for direct-zip paths.
|
|
95
|
+
for (const func of functionZips) {
|
|
96
|
+
if (!func.buildData) {
|
|
97
|
+
func.buildData = {
|
|
98
|
+
bootstrapVersion: func.bootstrapVersion,
|
|
99
|
+
runtimeAPIVersion: func.runtimeAPIVersion,
|
|
100
|
+
};
|
|
101
|
+
}
|
|
102
|
+
}
|
|
93
103
|
const fileObjs = functionZips.map(({ buildData, displayName, generator, invocationMode, path: functionPath, priority, runtime, runtimeVersion, timeout, trafficRules, }) => ({
|
|
94
104
|
filepath: functionPath,
|
|
95
105
|
root: tmpDir,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hash-fns.js","sourceRoot":"","sources":["../../../src/utils/deploy/hash-fns.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"hash-fns.js","sourceRoot":"","sources":["../../../src/utils/deploy/hash-fns.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,42 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
1
|
+
import fs from 'fs';
|
|
2
|
+
import type { NetlifyAPI } from '@netlify/api';
|
|
3
|
+
import type { StatusCallback } from './status-cb.js';
|
|
4
|
+
export type UploadApi = Pick<NetlifyAPI, 'uploadDeployFile' | 'uploadDeployFunction' | 'uploadDeployEdgeFunction'>;
|
|
5
|
+
interface UploadFileBase {
|
|
6
|
+
filepath: string;
|
|
7
|
+
normalizedPath: string;
|
|
8
|
+
body?: fs.ReadStream;
|
|
9
|
+
}
|
|
10
|
+
export interface StaticUploadFile extends UploadFileBase {
|
|
11
|
+
assetType: 'file';
|
|
12
|
+
}
|
|
13
|
+
export interface FunctionUploadFile extends UploadFileBase {
|
|
14
|
+
assetType: 'function';
|
|
15
|
+
runtime?: string;
|
|
16
|
+
invocationMode?: string;
|
|
17
|
+
timeout?: number;
|
|
18
|
+
}
|
|
19
|
+
export interface EdgeFunctionUploadFile extends UploadFileBase {
|
|
20
|
+
assetType: 'edge-function';
|
|
21
|
+
hash: string;
|
|
22
|
+
}
|
|
23
|
+
export type UploadFile = StaticUploadFile | FunctionUploadFile | EdgeFunctionUploadFile;
|
|
24
|
+
interface UploadFilesOptions {
|
|
25
|
+
concurrentUpload: number;
|
|
26
|
+
maxRetry: number;
|
|
27
|
+
statusCb: StatusCallback;
|
|
28
|
+
}
|
|
29
|
+
declare const uploadFiles: (api: UploadApi, deployId: string, uploadList: UploadFile[], { concurrentUpload, maxRetry, statusCb }: UploadFilesOptions) => Promise<({
|
|
30
|
+
id?: string;
|
|
31
|
+
path?: string;
|
|
32
|
+
sha?: string;
|
|
33
|
+
mime_type?: string;
|
|
34
|
+
size?: number;
|
|
35
|
+
} | {
|
|
36
|
+
id?: string;
|
|
37
|
+
name?: string;
|
|
38
|
+
sha?: string;
|
|
39
|
+
region?: string;
|
|
40
|
+
})[]>;
|
|
6
41
|
export default uploadFiles;
|
|
7
42
|
//# sourceMappingURL=upload-files.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upload-files.d.ts","sourceRoot":"","sources":["../../../src/utils/deploy/upload-files.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"upload-files.d.ts","sourceRoot":"","sources":["../../../src/utils/deploy/upload-files.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,CAAA;AAEnB,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAK9C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AAEpD,MAAM,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,EAAE,kBAAkB,GAAG,sBAAsB,GAAG,0BAA0B,CAAC,CAAA;AASlH,UAAU,cAAc;IACtB,QAAQ,EAAE,MAAM,CAAA;IAChB,cAAc,EAAE,MAAM,CAAA;IACtB,IAAI,CAAC,EAAE,EAAE,CAAC,UAAU,CAAA;CACrB;AAED,MAAM,WAAW,gBAAiB,SAAQ,cAAc;IACtD,SAAS,EAAE,MAAM,CAAA;CAClB;AAED,MAAM,WAAW,kBAAmB,SAAQ,cAAc;IACxD,SAAS,EAAE,UAAU,CAAA;IACrB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB;AAED,MAAM,WAAW,sBAAuB,SAAQ,cAAc;IAC5D,SAAS,EAAE,eAAe,CAAA;IAC1B,IAAI,EAAE,MAAM,CAAA;CACb;AAED,MAAM,MAAM,UAAU,GAAG,gBAAgB,GAAG,kBAAkB,GAAG,sBAAsB,CAAA;AAQvF,UAAU,kBAAkB;IAC1B,gBAAgB,EAAE,MAAM,CAAA;IACxB,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,EAAE,cAAc,CAAA;CACzB;AAED,QAAA,MAAM,WAAW,QACV,SAAS,YACJ,MAAM,cACJ,UAAU,EAAE,4CACkB,kBAAkB;;;;;;;;;;;KAgF7D,CAAA;eA6Dc,WAAW"}
|
|
@@ -2,37 +2,40 @@ import fs from 'fs';
|
|
|
2
2
|
import backoff from 'backoff';
|
|
3
3
|
import pMap from 'p-map';
|
|
4
4
|
import { UPLOAD_INITIAL_DELAY, UPLOAD_MAX_DELAY, UPLOAD_RANDOM_FACTOR } from './constants.js';
|
|
5
|
-
|
|
5
|
+
class MissingAssetTypeError extends Error {
|
|
6
|
+
fileObj;
|
|
7
|
+
constructor(fileObj) {
|
|
8
|
+
super('File Object missing assetType property');
|
|
9
|
+
this.fileObj = fileObj;
|
|
10
|
+
}
|
|
11
|
+
}
|
|
6
12
|
const uploadFiles = async (api, deployId, uploadList, { concurrentUpload, maxRetry, statusCb }) => {
|
|
7
|
-
if (!concurrentUpload || !
|
|
13
|
+
if (!concurrentUpload || !maxRetry)
|
|
8
14
|
throw new Error('Missing required option concurrentUpload');
|
|
9
15
|
statusCb({
|
|
10
16
|
type: 'upload',
|
|
11
17
|
msg: `Uploading ${uploadList.length} files`,
|
|
12
18
|
phase: 'start',
|
|
13
19
|
});
|
|
14
|
-
// @ts-expect-error TS(7006) FIXME: Parameter 'fileObj' implicitly has an 'any' type.
|
|
15
20
|
const uploadFile = async (fileObj, index) => {
|
|
16
|
-
const {
|
|
21
|
+
const { body, filepath, normalizedPath } = fileObj;
|
|
17
22
|
const readStreamCtor = () => body ?? fs.createReadStream(filepath);
|
|
18
23
|
statusCb({
|
|
19
24
|
type: 'upload',
|
|
20
25
|
msg: `(${index}/${uploadList.length}) Uploading ${normalizedPath}...`,
|
|
21
26
|
phase: 'progress',
|
|
22
27
|
});
|
|
23
|
-
|
|
24
|
-
switch (assetType) {
|
|
28
|
+
switch (fileObj.assetType) {
|
|
25
29
|
case 'file': {
|
|
26
|
-
|
|
30
|
+
return await retryUpload(() => api.uploadDeployFile({
|
|
27
31
|
body: readStreamCtor,
|
|
28
32
|
deployId,
|
|
29
33
|
path: encodeURI(normalizedPath),
|
|
30
34
|
}), maxRetry);
|
|
31
|
-
break;
|
|
32
35
|
}
|
|
33
36
|
case 'function': {
|
|
34
|
-
|
|
35
|
-
|
|
37
|
+
const { invocationMode, runtime, timeout } = fileObj;
|
|
38
|
+
return await retryUpload((retryCount) => {
|
|
36
39
|
const params = {
|
|
37
40
|
body: readStreamCtor,
|
|
38
41
|
deployId,
|
|
@@ -42,21 +45,28 @@ const uploadFiles = async (api, deployId, uploadList, { concurrentUpload, maxRet
|
|
|
42
45
|
runtime,
|
|
43
46
|
};
|
|
44
47
|
if (retryCount > 0) {
|
|
45
|
-
// @ts-expect-error TS(2339) FIXME: Property 'xNfRetryCount' does not exist on type '{... Remove this comment to see the full error message
|
|
46
48
|
params.xNfRetryCount = retryCount;
|
|
47
49
|
}
|
|
48
50
|
return api.uploadDeployFunction(params);
|
|
49
51
|
}, maxRetry);
|
|
50
|
-
|
|
52
|
+
}
|
|
53
|
+
case 'edge-function': {
|
|
54
|
+
return await retryUpload((retryCount) => {
|
|
55
|
+
const params = {
|
|
56
|
+
body: readStreamCtor,
|
|
57
|
+
deployId,
|
|
58
|
+
codeSha: normalizedPath,
|
|
59
|
+
};
|
|
60
|
+
if (retryCount > 0) {
|
|
61
|
+
params.xNfRetryCount = retryCount;
|
|
62
|
+
}
|
|
63
|
+
return api.uploadDeployEdgeFunction(params);
|
|
64
|
+
}, maxRetry);
|
|
51
65
|
}
|
|
52
66
|
default: {
|
|
53
|
-
|
|
54
|
-
// @ts-expect-error TS(2339) FIXME: Property 'fileObj' does not exist on type 'Error'.
|
|
55
|
-
error.fileObj = fileObj;
|
|
56
|
-
throw error;
|
|
67
|
+
throw new MissingAssetTypeError(fileObj);
|
|
57
68
|
}
|
|
58
69
|
}
|
|
59
|
-
return response;
|
|
60
70
|
};
|
|
61
71
|
const results = await pMap(uploadList, uploadFile, { concurrency: concurrentUpload });
|
|
62
72
|
statusCb({
|
|
@@ -66,9 +76,10 @@ const uploadFiles = async (api, deployId, uploadList, { concurrentUpload, maxRet
|
|
|
66
76
|
});
|
|
67
77
|
return results;
|
|
68
78
|
};
|
|
69
|
-
|
|
79
|
+
const getErrorStatus = (error) => typeof error === 'object' && error !== null && 'status' in error && typeof error.status === 'number'
|
|
80
|
+
? error.status
|
|
81
|
+
: undefined;
|
|
70
82
|
const retryUpload = (uploadFn, maxRetry) => new Promise((resolve, reject) => {
|
|
71
|
-
// @ts-expect-error TS(7034) FIXME: Variable 'lastError' implicitly has type 'any' in ... Remove this comment to see the full error message
|
|
72
83
|
let lastError;
|
|
73
84
|
const fibonacciBackoff = backoff.fibonacci({
|
|
74
85
|
randomisationFactor: UPLOAD_RANDOM_FACTOR,
|
|
@@ -83,15 +94,14 @@ const retryUpload = (uploadFn, maxRetry) => new Promise((resolve, reject) => {
|
|
|
83
94
|
}
|
|
84
95
|
catch (error) {
|
|
85
96
|
lastError = error;
|
|
97
|
+
const status = getErrorStatus(error);
|
|
86
98
|
// We don't need to retry for 400 or 422 errors
|
|
87
|
-
|
|
88
|
-
if (error.status === 400 || error.status === 422) {
|
|
99
|
+
if (status === 400 || status === 422) {
|
|
89
100
|
reject(error);
|
|
90
101
|
return;
|
|
91
102
|
}
|
|
92
103
|
// observed errors: 408, 401 (4** swallowed), 502
|
|
93
|
-
|
|
94
|
-
if (error.status > 400 || error.name === 'FetchError') {
|
|
104
|
+
if ((status !== undefined && status > 400) || (error instanceof Error && error.name === 'FetchError')) {
|
|
95
105
|
fibonacciBackoff.backoff();
|
|
96
106
|
return;
|
|
97
107
|
}
|
|
@@ -107,7 +117,6 @@ const retryUpload = (uploadFn, maxRetry) => new Promise((resolve, reject) => {
|
|
|
107
117
|
// eslint-disable-next-line @typescript-eslint/no-misused-promises
|
|
108
118
|
fibonacciBackoff.on('ready', tryUpload);
|
|
109
119
|
fibonacciBackoff.on('fail', () => {
|
|
110
|
-
// @ts-expect-error TS(7005) FIXME: Variable 'lastError' implicitly has an 'any' type.
|
|
111
120
|
reject(lastError);
|
|
112
121
|
});
|
|
113
122
|
tryUpload();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upload-files.js","sourceRoot":"","sources":["../../../src/utils/deploy/upload-files.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,CAAA;
|
|
1
|
+
{"version":3,"file":"upload-files.js","sourceRoot":"","sources":["../../../src/utils/deploy/upload-files.ts"],"names":[],"mappings":"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"}
|