@ms-cloudpack/bundler-ori 0.2.5 → 0.2.7
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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildWithRetries.d.ts","sourceRoot":"","sources":["../src/buildWithRetries.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAC1D,OAAO,EAAS,KAAK,WAAW,IAAI,cAAc,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"buildWithRetries.d.ts","sourceRoot":"","sources":["../src/buildWithRetries.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAC1D,OAAO,EAAS,KAAK,WAAW,IAAI,cAAc,EAAE,MAAM,UAAU,CAAC;AAuBrE;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,EAAE;IACvC,2BAA2B;IAC3B,QAAQ,EAAE,eAAe,CAAC;IAC1B,0GAA0G;IAC1G,SAAS,EAAE,MAAM,CAAC;CACnB,GAAG,OAAO,CAAC,cAAc,CAAC,CAoC1B"}
|
package/lib/buildWithRetries.js
CHANGED
|
@@ -1,13 +1,17 @@
|
|
|
1
1
|
import { RetryManager } from '@ms-cloudpack/retry';
|
|
2
2
|
import { build } from 'oribuild';
|
|
3
3
|
/**
|
|
4
|
-
* Retry 2 times (3 in total) if the error message contains
|
|
5
|
-
*
|
|
4
|
+
* Retry 2 times (3 in total) if the error message contains
|
|
5
|
+
* 'room is closed', 'failed marshalling message' or 'ori api-service'.
|
|
6
|
+
* The first two are intermittent errors which may be caused by race conditions.
|
|
7
|
+
* The last one is a known error message from the ori API service.
|
|
6
8
|
*/
|
|
7
9
|
const intermittentErrorRetryPolicy = {
|
|
8
10
|
maxRetries: 2,
|
|
9
11
|
handle: (error) => error instanceof Error &&
|
|
10
|
-
(error.message.includes('room is closed') ||
|
|
12
|
+
(error.message.includes('room is closed') ||
|
|
13
|
+
error.message.includes('failed marshalling message') ||
|
|
14
|
+
error.message.includes('ori api-service')),
|
|
11
15
|
};
|
|
12
16
|
/** Retry 1 time (2 in total) if a timeout error was thrown by ori */
|
|
13
17
|
const timeoutRetryPolicy = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildWithRetries.js","sourceRoot":"","sources":["../src/buildWithRetries.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAoB,MAAM,qBAAqB,CAAC;AAErE,OAAO,EAAE,KAAK,EAAsC,MAAM,UAAU,CAAC;AAErE
|
|
1
|
+
{"version":3,"file":"buildWithRetries.js","sourceRoot":"","sources":["../src/buildWithRetries.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAoB,MAAM,qBAAqB,CAAC;AAErE,OAAO,EAAE,KAAK,EAAsC,MAAM,UAAU,CAAC;AAErE;;;;;GAKG;AACH,MAAM,4BAA4B,GAAgB;IAChD,UAAU,EAAE,CAAC;IACb,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE,CAChB,KAAK,YAAY,KAAK;QACtB,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAC;YACvC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,4BAA4B,CAAC;YACpD,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC;CAC/C,CAAC;AAEF,qEAAqE;AACrE,MAAM,kBAAkB,GAAgB;IACtC,UAAU,EAAE,CAAC;IACb,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,YAAY,KAAK,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,2BAA2B,CAAC;CACjG,CAAC;AAEF;;GAEG;AACH,MAAM,UAAU,gBAAgB,CAAC,MAKhC;IACC,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC;IACvC,MAAM,YAAY,GAAG,IAAI,YAAY,CAAC,CAAC,4BAA4B,EAAE,kBAAkB,CAAC,CAAC,CAAC;IAE1F,IAAI,SAAS,GAAG,QAAQ,CAAC,yBAAyB,CAAC;IACnD,IAAI,UAAU,GAAG,KAAK,CAAC;IAEvB,OAAO,YAAY,CAAC,KAAK,CAAC,KAAK,EAAE,YAAY,EAAE,EAAE;QAC/C,IAAI,YAAY,CAAC,MAAM,KAAK,kBAAkB,EAAE,CAAC;YAC/C,OAAO,CAAC,IAAI,CACV,iBAAiB,SAAS,oBAAoB,SAAS,uBAAuB,SAAS,GAAG,CAAC,aAAa,CACzG,CAAC;YACF,SAAS,IAAI,CAAC,CAAC;YACf,UAAU,GAAG,IAAI,CAAC;QACpB,CAAC;aAAM,IAAI,YAAY,CAAC,MAAM,KAAK,4BAA4B,EAAE,CAAC;YAChE,OAAO,CAAC,IAAI,CACV,4BAA4B,SAAS,WAAW,YAAY,CAAC,YAAY,IAAI,YAAY,CAAC,MAAM,CAAC,UAAU,IAAI;gBAC7G,mCAAoC,YAAY,CAAC,SAAmB,CAAC,OAAO,EAAE,CACjF,CAAC;QACJ,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,EAAE,GAAG,QAAQ,EAAE,yBAAyB,EAAE,SAAS,EAAE,CAAC,CAAC;QAElF,IAAI,UAAU,EAAE,CAAC;YACf,wFAAwF;YACxF,kFAAkF;YAClF,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC;gBACnB,IAAI,EACF,wDAAwD,SAAS,MAAM;oBACvE,2GAA2G,SAAS,SAAS;oBAC7H,gEAAgE;aAClB,CAAC,CAAC;QACtD,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC,CAAC,CAAC;AACL,CAAC","sourcesContent":["import { RetryManager, type RetryPolicy } from '@ms-cloudpack/retry';\nimport type { OriBuildOptions } from './getOriOptions.js';\nimport { build, type BuildResult as OriBuildResult } from 'oribuild';\n\n/**\n * Retry 2 times (3 in total) if the error message contains\n * 'room is closed', 'failed marshalling message' or 'ori api-service'.\n * The first two are intermittent errors which may be caused by race conditions.\n * The last one is a known error message from the ori API service.\n */\nconst intermittentErrorRetryPolicy: RetryPolicy = {\n maxRetries: 2,\n handle: (error) =>\n error instanceof Error &&\n (error.message.includes('room is closed') ||\n error.message.includes('failed marshalling message') ||\n error.message.includes('ori api-service')),\n};\n\n/** Retry 1 time (2 in total) if a timeout error was thrown by ori */\nconst timeoutRetryPolicy: RetryPolicy = {\n maxRetries: 1,\n handle: (error) => error instanceof Error && error.message.includes('within the timeout window'),\n};\n\n/**\n * Call ori `build()` with retries. This is a separate function for testing of retry logic.\n */\nexport function buildWithRetries(params: {\n /** Params passed to ori */\n oriInput: OriBuildOptions;\n /** Just used to identify the bundled package in log messages (ori options don't contain this raw path) */\n inputPath: string;\n}): Promise<OriBuildResult> {\n const { oriInput, inputPath } = params;\n const retryManager = new RetryManager([intermittentErrorRetryPolicy, timeoutRetryPolicy]);\n\n let timeoutMs = oriInput.buildAcknowledgeTimeoutMs;\n let hadTimeout = false;\n\n return retryManager.retry(async (retryContext) => {\n if (retryContext.policy === timeoutRetryPolicy) {\n console.warn(\n `ori build for ${inputPath} timed out after ${timeoutMs}ms. Will retry with ${timeoutMs * 2}ms timeout.`,\n );\n timeoutMs *= 2;\n hadTimeout = true;\n } else if (retryContext.policy === intermittentErrorRetryPolicy) {\n console.warn(\n `Will retry ori build for ${inputPath} (retry ${retryContext.retryAttempt}/${retryContext.policy.maxRetries}) ` +\n `after known intermittent error: ${(retryContext.lastError as Error).message}`,\n );\n }\n\n const result = await build({ ...oriInput, buildAcknowledgeTimeoutMs: timeoutMs });\n\n if (hadTimeout) {\n // Include a warning in the output recommending increasing the timeout for this package.\n // The warning is more visible this way than if it was only logged to the console.\n result.warnings.push({\n text:\n `Build succeeded on retry after increasing timeout to ${timeoutMs}ms. ` +\n `You may want to add cloudpack packageSettings with \\`{ \"bundlerOptions\": { \"buildAcknowledgeTimeoutMs\": ${timeoutMs} } }\\` ` +\n 'to use a longer timeout for this package on the first attempt.',\n } as unknown as OriBuildResult['warnings'][number]);\n }\n\n return result;\n });\n}\n"]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createOriCapabilities.d.ts","sourceRoot":"","sources":["../src/createOriCapabilities.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,wCAAwC,EAAE,MAAM,4BAA4B,CAAC;AAC3F,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAG1D,wBAAgB,qBAAqB,CACnC,cAAc,EAAE,OAAO,CAAC,eAAe,CAAC,GACvC,wCAAwC,CAAC,eAAe,CAAC,
|
|
1
|
+
{"version":3,"file":"createOriCapabilities.d.ts","sourceRoot":"","sources":["../src/createOriCapabilities.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,wCAAwC,EAAE,MAAM,4BAA4B,CAAC;AAC3F,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAG1D,wBAAgB,qBAAqB,CACnC,cAAc,EAAE,OAAO,CAAC,eAAe,CAAC,GACvC,wCAAwC,CAAC,eAAe,CAAC,CAwB3D"}
|
|
@@ -17,6 +17,9 @@ export function createOriCapabilities(bundlerOptions) {
|
|
|
17
17
|
config.alias = mergeObjects([config.alias || {}, options]);
|
|
18
18
|
return config;
|
|
19
19
|
},
|
|
20
|
+
// This is a placeholder for the density capability. It doesn't do anything in the bundler.
|
|
21
|
+
// It's just a workaround for a post-bundle task. This will be replaced with 'plugins' in the future.
|
|
22
|
+
density: (config) => config,
|
|
20
23
|
};
|
|
21
24
|
}
|
|
22
25
|
//# sourceMappingURL=createOriCapabilities.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createOriCapabilities.js","sourceRoot":"","sources":["../src/createOriCapabilities.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D,MAAM,UAAU,qBAAqB,CACnC,cAAwC;IAExC,OAAO;QACL,cAAc,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE;YAClC,0DAA0D;YAC1D,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;YAE7F,MAAM,CAAC,MAAM,GAAG;gBACd,GAAG,MAAM,CAAC,MAAM;gBAChB,GAAG,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC,CAAC;gBAChE,uDAAuD;gBACvD,GAAG,cAAc,CAAC,MAAM;aACzB,CAAC;YAEF,OAAO,MAAM,CAAC;QAChB,CAAC;QACD,KAAK,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE;YACzB,uCAAuC;YACvC,MAAM,CAAC,KAAK,GAAG,YAAY,CAAC,CAAC,MAAM,CAAC,KAAK,IAAI,EAAE,EAAE,OAAO,CAAC,CAAC,CAAC;YAC3D,OAAO,MAAM,CAAC;QAChB,CAAC;
|
|
1
|
+
{"version":3,"file":"createOriCapabilities.js","sourceRoot":"","sources":["../src/createOriCapabilities.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D,MAAM,UAAU,qBAAqB,CACnC,cAAwC;IAExC,OAAO;QACL,cAAc,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE;YAClC,0DAA0D;YAC1D,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;YAE7F,MAAM,CAAC,MAAM,GAAG;gBACd,GAAG,MAAM,CAAC,MAAM;gBAChB,GAAG,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC,CAAC;gBAChE,uDAAuD;gBACvD,GAAG,cAAc,CAAC,MAAM;aACzB,CAAC;YAEF,OAAO,MAAM,CAAC;QAChB,CAAC;QACD,KAAK,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE;YACzB,uCAAuC;YACvC,MAAM,CAAC,KAAK,GAAG,YAAY,CAAC,CAAC,MAAM,CAAC,KAAK,IAAI,EAAE,EAAE,OAAO,CAAC,CAAC,CAAC;YAC3D,OAAO,MAAM,CAAC;QAChB,CAAC;QACD,2FAA2F;QAC3F,qGAAqG;QACrG,OAAO,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM;KAC5B,CAAC;AACJ,CAAC","sourcesContent":["import type { InternalBundlerCapabilityImplementations } from '@ms-cloudpack/common-types';\nimport type { OriBuildOptions } from './getOriOptions.ts';\nimport { mergeObjects } from '@ms-cloudpack/package-utilities';\n\nexport function createOriCapabilities(\n bundlerOptions: Partial<OriBuildOptions>,\n): InternalBundlerCapabilityImplementations<OriBuildOptions> {\n return {\n 'asset-inline': (config, options) => {\n // Make sure that the leading dot exists in the extensions\n const extensions = options.extensions.map((ext) => (!ext.startsWith('.') ? `.${ext}` : ext));\n\n config.loader = {\n ...config.loader,\n ...Object.fromEntries(extensions.map((ext) => [ext, 'dataurl'])),\n // bundler options take precedence in terms of loaders.\n ...bundlerOptions.loader,\n };\n\n return config;\n },\n alias: (config, options) => {\n // Add aliases to the ori configuration\n config.alias = mergeObjects([config.alias || {}, options]);\n return config;\n },\n // This is a placeholder for the density capability. It doesn't do anything in the bundler.\n // It's just a workaround for a post-bundle task. This will be replaced with 'plugins' in the future.\n density: (config) => config,\n };\n}\n"]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ms-cloudpack/bundler-ori",
|
|
3
|
-
"version": "0.2.
|
|
3
|
+
"version": "0.2.7",
|
|
4
4
|
"description": "An abstraction to bundle source code using ori.",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"type": "module",
|
|
@@ -14,12 +14,12 @@
|
|
|
14
14
|
}
|
|
15
15
|
},
|
|
16
16
|
"dependencies": {
|
|
17
|
-
"@ms-cloudpack/bundler-capabilities": "^0.2.
|
|
18
|
-
"@ms-cloudpack/bundler-utilities": "^0.1.
|
|
19
|
-
"@ms-cloudpack/common-types": "^0.23.
|
|
20
|
-
"@ms-cloudpack/package-utilities": "^10.4.
|
|
17
|
+
"@ms-cloudpack/bundler-capabilities": "^0.2.3",
|
|
18
|
+
"@ms-cloudpack/bundler-utilities": "^0.1.15",
|
|
19
|
+
"@ms-cloudpack/common-types": "^0.23.6",
|
|
20
|
+
"@ms-cloudpack/package-utilities": "^10.4.2",
|
|
21
21
|
"@ms-cloudpack/path-string-parsing": "^1.2.5",
|
|
22
|
-
"@ms-cloudpack/path-utilities": "^2.7.
|
|
22
|
+
"@ms-cloudpack/path-utilities": "^2.7.56",
|
|
23
23
|
"@ms-cloudpack/retry": "^0.1.2",
|
|
24
24
|
"oribuild": "0.0.0-pre-alpha.15-2024082214-6bd86a4"
|
|
25
25
|
},
|