@appsemble/node-utils 0.39.1 → 0.40.0

package/README.md

@@ -1,9 +1,9 @@
-# ![](https://gitlab.com/appsemble/appsemble/-/raw/0.39.1/config/assets/logo.svg) Appsemble Node Utilities
+# ![](https://gitlab.com/appsemble/appsemble/-/raw/0.40.0/config/assets/logo.svg) Appsemble Node Utilities
 
 > NodeJS utilities used by Appsemble internally.
 
 [![npm](https://img.shields.io/npm/v/@appsemble/node-utils)](https://www.npmjs.com/package/@appsemble/node-utils)
-[![GitLab CI](https://gitlab.com/appsemble/appsemble/badges/0.39.1/pipeline.svg)](https://gitlab.com/appsemble/appsemble/-/releases/0.39.1)
+[![GitLab CI](https://gitlab.com/appsemble/appsemble/badges/0.40.0/pipeline.svg)](https://gitlab.com/appsemble/appsemble/-/releases/0.40.0)
 [![Prettier](https://img.shields.io/badge/code_style-prettier-ff69b4.svg)](https://prettier.io)
 
 ## Table of Contents
@@ -26,5 +26,5 @@ compatibility is not guaranteed.
 
 ## License
 
-[LGPL-3.0-only](https://gitlab.com/appsemble/appsemble/-/blob/0.39.1/LICENSE.md) ©
+[LGPL-3.0-only](https://gitlab.com/appsemble/appsemble/-/blob/0.40.0/LICENSE.md) ©
 [Appsemble](https://appsemble.com)

package/app.js

@@ -170,7 +170,7 @@ export async function patchDefinition(appPath, patches) {
                 doc.setIn(key, createPatchValue(doc, value));
             }
         }
-        const prettierOptions = (await resolveConfig(path, { editorconfig: true }));
+        const prettierOptions = (await resolveConfig(path, { editorconfig: true })) ?? {};
         prettierOptions.parser = 'yaml';
         await writeFile(path, await format(String(doc), prettierOptions));
         logger.verbose(`Successfully updated ${path}`);

package/jsonschema.d.ts

@@ -1,3 +1,3 @@
 import { type ValidatorResult } from 'jsonschema';
 import { type Context } from 'koa';
-export declare function handleValidatorResult(ctx: Context, result: ValidatorResult, msg?: string): void;
+export declare function handleValidatorResult(ctx: Context, result: ValidatorResult, msg?: string, code?: string): void;

package/jsonschema.js

@@ -1,10 +1,10 @@
 import { throwKoaError } from './koa.js';
-export function handleValidatorResult(ctx, result, msg = 'JSON schema validation failed') {
+export function handleValidatorResult(ctx, result, msg = 'JSON schema validation failed', code) {
     if (!result.valid) {
         if (ctx.response === undefined) {
             throw new Error(msg, { cause: result.errors });
         }
-        throwKoaError(ctx, 400, msg, { errors: result.errors });
+        throwKoaError(ctx, 400, msg, { code, errors: result.errors });
     }
 }
 //# sourceMappingURL=jsonschema.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appsemble/node-utils",
-  "version": "0.39.1",
+  "version": "0.40.0",
   "description": "NodeJS utilities used by Appsemble internally.",
   "keywords": [
     "app",
@@ -40,9 +40,9 @@
     "test": "vitest"
   },
   "dependencies": {
-    "@appsemble/lang-sdk": "0.39.1",
-    "@appsemble/types": "0.39.1",
-    "@appsemble/utils": "0.39.1",
+    "@appsemble/lang-sdk": "0.40.0",
+    "@appsemble/types": "0.40.0",
+    "@appsemble/utils": "0.40.0",
     "@aws-sdk/client-s3": "3.1130.0",
     "@aws-sdk/lib-storage": "3.1130.0",
     "@formatjs/fast-memoize": "^2.0.0",

package/s3.d.ts

@@ -30,8 +30,15 @@ export interface InitS3ClientParams {
      * on demand.
      */
     bucket?: string;
+    /**
+     * The time in milliseconds a request may go without socket activity before it fails with a
+     * `TimeoutError`, which the client retries.
+     *
+     * When unset, a stalled connection lasts until the operating system gives up on it.
+     */
+    socketTimeout?: number;
 }
-export declare function initS3Client({ accessKey, bucket, endPoint, pathStyle, port, region, secretKey, useSSL, }: InitS3ClientParams): void;
+export declare function initS3Client({ accessKey, bucket, endPoint, pathStyle, port, region, secretKey, socketTimeout, useSSL, }: InitS3ClientParams): void;
 /**
  * @returns The configured single bucket, or `undefined` in the bucket-per-app layout.
  */

package/s3.js

@@ -11,7 +11,7 @@ let s3Region;
 export const blockAssetsBucketName = 'appsemble-block-assets';
 // S3 limits the number of keys in a single DeleteObjects request.
 const deleteBatchSize = 1000;
-export function initS3Client({ accessKey, bucket, endPoint, pathStyle = true, port = 9000, region = 'us-east-1', secretKey, useSSL = true, }) {
+export function initS3Client({ accessKey, bucket, endPoint, pathStyle = true, port = 9000, region = 'us-east-1', secretKey, socketTimeout, useSSL = true, }) {
     try {
         s3Client = new S3Client({
             endpoint: `${useSSL ? 'https' : 'http'}://${endPoint}:${port}`,
@@ -22,6 +22,7 @@ export function initS3Client({ accessKey, bucket, endPoint, pathStyle = true, po
             // S3-compatible stores that do not implement flexible checksums.
             requestChecksumCalculation: 'WHEN_REQUIRED',
             responseChecksumValidation: 'WHEN_REQUIRED',
+            ...(socketTimeout && { requestHandler: { socketTimeout } }),
         });
         s3Bucket = bucket || undefined;
         s3Region = region;