@dbos-inc/koa-serve 3.5.44-preview.gc094fdab44 → 3.6.5-preview

package/dist/src/dboshttp.d.ts

@@ -1,9 +1,39 @@
 /// <reference types="node" />
 /// <reference types="node" />
 /// <reference types="node/http" />
+import 'reflect-metadata';
 import { IncomingHttpHeaders } from 'http';
 import { ParsedUrlQuery } from 'querystring';
+import { MethodRegistrationBase } from '@dbos-inc/dbos-sdk';
 import { DBOSLifecycleCallback, MethodParameter } from '@dbos-inc/dbos-sdk';
+export declare enum ArgRequiredOptions {
+    REQUIRED = "REQUIRED",
+    OPTIONAL = "OPTIONAL",
+    DEFAULT = "DEFAULT"
+}
+export declare function requestArgValidation(methReg: MethodRegistrationBase): void;
+export declare function ArgRequired(target: object, propertyKey: PropertyKey, param: number): void;
+export declare function ArgOptional(target: object, propertyKey: PropertyKey, param: number): void;
+export declare function ArgDate(): (target: object, propertyKey: PropertyKey, param: number) => void;
+export declare function ArgVarchar(length: number): (target: object, propertyKey: PropertyKey, param: number) => void;
+export declare function DefaultArgRequired<T extends {
+    new (...args: unknown[]): object;
+}>(ctor: T): void;
+export declare function DefaultArgValidate<T extends {
+    new (...args: unknown[]): object;
+}>(ctor: T): void;
+export declare function DefaultArgOptional<T extends {
+    new (...args: unknown[]): object;
+}>(ctor: T): void;
+export declare enum LogMasks {
+    NONE = "NONE",
+    HASH = "HASH",
+    SKIP = "SKIP"
+}
+export declare const LOGGER = "log";
+export declare function SkipLogging(target: object, propertyKey: PropertyKey, param: number): void;
+export declare function LogMask(mask: LogMasks): (target: object, propertyKey: PropertyKey, param: number) => void;
+export declare function logMethodArgs<Args extends unknown[]>(methReg: MethodRegistrationBase, args: Args): Args;
 export declare enum APITypes {
     GET = "GET",
     POST = "POST",
@@ -31,6 +61,15 @@ export interface DBOSHTTPMethodInfo {
 export interface DBOSHTTPArgInfo {
     argSource?: ArgSources;
 }
+/**
+ * This error can be thrown by DBOS applications to indicate
+ *  the HTTP response code, in addition to the message.
+ * Note that any error with a 'status' field can be used.
+ */
+export declare class DBOSResponseError extends Error {
+    readonly status: number;
+    constructor(msg: string, status?: number);
+}
 /**
  * HTTPRequest includes useful information from http.IncomingMessage and parsed body,
  *   URL parameters, and parsed query string.
@@ -68,7 +107,22 @@ export declare class DBOSHTTPBase implements DBOSLifecycleCallback {
     patchApi(url: string): <This, Args extends unknown[], Return>(target: object, propertyKey: string, descriptor: TypedPropertyDescriptor<(this: This, ...args: Args) => Promise<Return>>) => TypedPropertyDescriptor<(this: This, ...args: Args) => Promise<Return>>;
     /** Decorator indicating that the method is the target of HTTP DELETE operations for `url` */
     deleteApi(url: string): <This, Args extends unknown[], Return>(target: object, propertyKey: string, descriptor: TypedPropertyDescriptor<(this: This, ...args: Args) => Promise<Return>>) => TypedPropertyDescriptor<(this: This, ...args: Args) => Promise<Return>>;
+    /** Parameter decorator indicating which source to use (URL, BODY, etc) for arg data */
+    static argSource(source: ArgSources): (target: object, propertyKey: PropertyKey, param: number) => void;
     protected getArgSource(arg: MethodParameter): ArgSources;
     logRegisteredEndpoints(): void;
+    static argRequired(target: object, propertyKey: PropertyKey, parameterIndex: number): void;
+    static argOptional(target: object, propertyKey: PropertyKey, parameterIndex: number): void;
+    static argDate(): (target: object, propertyKey: PropertyKey, param: number) => void;
+    static argVarchar(n: number): (target: object, propertyKey: PropertyKey, param: number) => void;
+    static defaultArgRequired<T extends {
+        new (...args: unknown[]): object;
+    }>(ctor: T): void;
+    static defaultArgOptional<T extends {
+        new (...args: unknown[]): object;
+    }>(ctor: T): void;
+    static defaultArgValidate<T extends {
+        new (...args: unknown[]): object;
+    }>(ctor: T): void;
 }
 //# sourceMappingURL=dboshttp.d.ts.map

package/dist/src/dboshttp.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dboshttp.d.ts","sourceRoot":"","sources":["../../src/dboshttp.ts"],"names":[],"mappings":";;;AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,MAAM,CAAC;AAC3C,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAG7C,OAAO,EAAQ,qBAAqB,EAAuB,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAEvG,oBAAY,QAAQ;IAClB,GAAG,QAAQ;IACX,IAAI,SAAS;IACb,GAAG,QAAQ;IACX,KAAK,UAAU;IACf,MAAM,WAAW;CAClB;AAED,oBAAY,UAAU;IACpB,IAAI,SAAS,CAAE,mBAAmB;IAClC,OAAO,YAAY,CAAE,4CAA4C;IACjE,IAAI,SAAS,CAAE,oBAAoB;IACnC,KAAK,UAAU;CAChB;AAED,MAAM,WAAW,kBAAkB;IACjC,iBAAiB,EAAE,MAAM,CAAC;IAC1B,kBAAkB,EAAE,MAAM,EAAE,CAAC;CAC9B;AAED,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,QAAQ,CAAC;CACnB;AAED,MAAM,WAAW,kBAAkB;IACjC,aAAa,CAAC,EAAE,WAAW,EAAE,CAAC;CAC/B;AAED,MAAM,WAAW,eAAe;IAC9B,SAAS,CAAC,EAAE,UAAU,CAAC;CACxB;AAED;;;;GAIG;AACH,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,OAAO,CAAC,EAAE,mBAAmB,CAAC;IACvC,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IAC/B,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC;IACxB,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,KAAK,CAAC,EAAE,cAAc,CAAC;IAChC,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;CAC7B;AAED,eAAO,MAAM,QAAQ,aAAa,CAAC;AAEnC,eAAO,MAAM,gBAAgB,yBAAyB,CAAC;AAEvD,eAAO,MAAM,eAAe,iBAAiB,CAAC;AAC9C,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,mBAAmB,GAAG,MAAM,CAQ3E;AAED,wBAAgB,oBAAoB,CAAC,CAAC,EAAE,KAAK,WAE5C;AAED,qBAAa,YAAa,YAAW,qBAAqB;IACxD,MAAM,CAAC,mBAAmB,EAAE,MAAM,CAAU;IAE5C,MAAM,KAAK,WAAW,IAAI,eAAe,CAMxC;IAED,UAAU,CAAC,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,kDAI1B,MAAM,eACD,MAAM,cACP,wBAAwB,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,IAAI,EAAE,IAAI,KAAK,QAAQ,MAAM,CAAC,CAAC,oCAAxC,IAAI,WAAW,IAAI,KAAK,QAAQ,MAAM,CAAC;IAiBtF,0FAA0F;IAC1F,MAAM,CAAC,GAAG,EAAE,MAAM;IAIlB,2FAA2F;IAC3F,OAAO,CAAC,GAAG,EAAE,MAAM;IAInB,0FAA0F;IAC1F,MAAM,CAAC,GAAG,EAAE,MAAM;IAIlB,4FAA4F;IAC5F,QAAQ,CAAC,GAAG,EAAE,MAAM;IAIpB,6FAA6F;IAC7F,SAAS,CAAC,GAAG,EAAE,MAAM;IAIrB,SAAS,CAAC,YAAY,CAAC,GAAG,EAAE,eAAe;IAK3C,sBAAsB,IAAI,IAAI;CAkB/B"}
+{"version":3,"file":"dboshttp.d.ts","sourceRoot":"","sources":["../../src/dboshttp.ts"],"names":[],"mappings":"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"}

package/dist/src/dboshttp.js

@@ -1,8 +1,374 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DBOSHTTPBase = exports.isClientRequestError = exports.getOrGenerateRequestID = exports.RequestIDHeader = exports.WorkflowIDHeader = exports.DBOSHTTP = exports.ArgSources = exports.APITypes = void 0;
+exports.DBOSHTTPBase = exports.isClientRequestError = exports.getOrGenerateRequestID = exports.RequestIDHeader = exports.WorkflowIDHeader = exports.DBOSHTTP = exports.DBOSResponseError = exports.ArgSources = exports.APITypes = exports.logMethodArgs = exports.LogMask = exports.SkipLogging = exports.LOGGER = exports.LogMasks = exports.DefaultArgOptional = exports.DefaultArgValidate = exports.DefaultArgRequired = exports.ArgVarchar = exports.ArgDate = exports.ArgOptional = exports.ArgRequired = exports.requestArgValidation = exports.ArgRequiredOptions = void 0;
+require("reflect-metadata");
 const node_crypto_1 = require("node:crypto");
+const node_crypto_2 = __importDefault(require("node:crypto"));
 const dbos_sdk_1 = require("@dbos-inc/dbos-sdk");
+const VALIDATOR = 'validator';
+var ArgRequiredOptions;
+(function (ArgRequiredOptions) {
+    ArgRequiredOptions["REQUIRED"] = "REQUIRED";
+    ArgRequiredOptions["OPTIONAL"] = "OPTIONAL";
+    ArgRequiredOptions["DEFAULT"] = "DEFAULT";
+})(ArgRequiredOptions || (exports.ArgRequiredOptions = ArgRequiredOptions = {}));
+function getValidatorClassInfo(methReg) {
+    const valInfo = methReg.defaults?.getRegisteredInfo(VALIDATOR);
+    return {
+        defaultArgRequired: valInfo?.defaultArgRequired ?? ArgRequiredOptions.DEFAULT,
+        defaultArgValidate: valInfo?.defaultArgValidate ?? false,
+    };
+}
+function requestArgValidation(methReg) {
+    methReg.getRegisteredInfo(VALIDATOR).performArgValidation = true;
+}
+exports.requestArgValidation = requestArgValidation;
+function getValidatorFuncInfo(methReg) {
+    const valInfo = methReg.getRegisteredInfo(VALIDATOR);
+    return {
+        performArgValidation: valInfo.performArgValidation ?? false,
+    };
+}
+function getValidatorArgInfo(param) {
+    const valInfo = param.getRegisteredInfo(VALIDATOR);
+    return {
+        required: valInfo.required ?? ArgRequiredOptions.DEFAULT,
+    };
+}
+class ValidationMiddleware {
+    installMiddleware(methReg) {
+        const valInfo = getValidatorClassInfo(methReg);
+        const defaultArgRequired = valInfo.defaultArgRequired;
+        const defaultArgValidate = valInfo.defaultArgValidate;
+        let shouldValidate = getValidatorFuncInfo(methReg).performArgValidation ||
+            defaultArgRequired === ArgRequiredOptions.REQUIRED ||
+            defaultArgValidate;
+        for (const a of methReg.args) {
+            if (getValidatorArgInfo(a).required === ArgRequiredOptions.REQUIRED) {
+                shouldValidate = true;
+            }
+        }
+        if (shouldValidate) {
+            requestArgValidation(methReg);
+            methReg.addEntryInterceptor(validateMethodArgs, 20);
+        }
+    }
+}
+const validationMiddleware = new ValidationMiddleware();
+function validateMethodArgs(methReg, args) {
+    const validationError = (msg) => {
+        const err = new dbos_sdk_1.Error.DBOSDataValidationError(msg);
+        dbos_sdk_1.DBOS.span?.addEvent('DataValidationError', { message: err.message });
+        return err;
+    };
+    // Input validation
+    methReg.args.forEach((argDescriptor, idx) => {
+        let argValue = args[idx];
+        // So... there is such a thing as "undefined", and another thing called "null"
+        // We will fold this to "undefined" for our APIs.  It's just a rule of ours.
+        if (argValue === null) {
+            argValue = undefined;
+            args[idx] = undefined;
+        }
+        if (argValue === undefined) {
+            const valInfo = getValidatorClassInfo(methReg);
+            const defaultArgRequired = valInfo.defaultArgRequired;
+            const defaultArgValidate = valInfo.defaultArgValidate;
+            const argRequired = getValidatorArgInfo(argDescriptor).required;
+            if (argRequired === ArgRequiredOptions.REQUIRED ||
+                (argRequired === ArgRequiredOptions.DEFAULT &&
+                    (defaultArgRequired === ArgRequiredOptions.REQUIRED || defaultArgValidate))) {
+                if (idx >= args.length) {
+                    throw validationError(`Insufficient number of arguments calling ${methReg.name} - ${args.length}/${methReg.args.length}`);
+                }
+                else {
+                    throw validationError(`Missing required argument ${argDescriptor.name} of ${methReg.name}`);
+                }
+            }
+        }
+        if (argValue === undefined) {
+            return;
+        }
+        if (argValue instanceof String) {
+            argValue = argValue.toString();
+            args[idx] = argValue;
+        }
+        if (argValue instanceof Boolean) {
+            argValue = argValue.valueOf();
+            args[idx] = argValue;
+        }
+        if (argValue instanceof Number) {
+            argValue = argValue.valueOf();
+            args[idx] = argValue;
+        }
+        if (argValue instanceof BigInt) {
+            // ES2020+
+            argValue = argValue.valueOf();
+            args[idx] = argValue;
+        }
+        // Argument validation - below - if we have any info about it
+        if (!argDescriptor.dataType)
+            return;
+        // Maybe look into https://www.npmjs.com/package/validator
+        //  We could support emails and other validations too with something like that...
+        if (argDescriptor.dataType.dataType === 'text' || argDescriptor.dataType.dataType === 'varchar') {
+            if (typeof argValue !== 'string') {
+                throw validationError(`Argument ${argDescriptor.name} of ${methReg.name} is marked as type '${argDescriptor.dataType.dataType}' and should be a string`);
+            }
+            if (argDescriptor.dataType.length > 0) {
+                if (argValue.length > argDescriptor.dataType.length) {
+                    throw validationError(`Argument ${argDescriptor.name} of ${methReg.name} is marked as type '${argDescriptor.dataType.dataType}' with maximum length ${argDescriptor.dataType.length} but has length ${argValue.length}`);
+                }
+            }
+        }
+        if (argDescriptor.dataType.dataType === 'boolean') {
+            if (typeof argValue !== 'boolean') {
+                if (typeof argValue === 'number') {
+                    if (argValue === 0 || argValue === 1) {
+                        argValue = argValue !== 0 ? true : false;
+                        args[idx] = argValue;
+                    }
+                    else {
+                        throw validationError(`Argument ${argDescriptor.name} of ${methReg.name} is marked as type '${argDescriptor.dataType.dataType}' and may be a number (0 or 1) convertible to boolean, but was ${argValue}.`);
+                    }
+                }
+                else if (typeof argValue === 'string') {
+                    if (argValue.toLowerCase() === 't' || argValue.toLowerCase() === 'true' || argValue === '1') {
+                        argValue = true;
+                        args[idx] = argValue;
+                    }
+                    else if (argValue.toLowerCase() === 'f' || argValue.toLowerCase() === 'false' || argValue === '0') {
+                        argValue = false;
+                        args[idx] = argValue;
+                    }
+                    else {
+                        throw validationError(`Argument ${argDescriptor.name} of ${methReg.name} is marked as type '${argDescriptor.dataType.dataType}' and may be a string convertible to boolean, but was ${argValue}.`);
+                    }
+                }
+                else {
+                    throw validationError(`Argument ${argDescriptor.name} of ${methReg.name} is marked as type '${argDescriptor.dataType.dataType}' and should be a boolean`);
+                }
+            }
+        }
+        if (argDescriptor.dataType.dataType === 'decimal') {
+            // Range check precision and scale... wishing there was a bigdecimal
+            //  Floats don't really permit us to check the scale.
+            if (typeof argValue !== 'number') {
+                throw validationError(`Argument ${argDescriptor.name} of ${methReg.name} is marked as type '${argDescriptor.dataType.dataType}' and should be a number`);
+            }
+            let prec = argDescriptor.dataType.precision;
+            if (prec > 0) {
+                if (argDescriptor.dataType.scale > 0) {
+                    prec = prec - argDescriptor.dataType.scale;
+                }
+                if (Math.abs(argValue) >= Math.exp(prec)) {
+                    throw validationError(`Argument ${argDescriptor.name} of ${methReg.name} is out of range for type '${argDescriptor.dataType.formatAsString()}`);
+                }
+            }
+        }
+        if (argDescriptor.dataType.dataType === 'double' || argDescriptor.dataType.dataType === 'integer') {
+            if (typeof argValue !== 'number') {
+                if (typeof argValue === 'string') {
+                    const n = parseFloat(argValue);
+                    if (isNaN(n)) {
+                        throw validationError(`Argument ${argDescriptor.name} of ${methReg.name} is marked as type '${argDescriptor.dataType.dataType}' and should be a number`);
+                    }
+                    argValue = n;
+                    args[idx] = argValue;
+                }
+                else if (typeof argValue === 'bigint') {
+                    // Hum, maybe we should allow bigint as a type, number won't even do 64-bit.
+                    argValue = Number(argValue).valueOf();
+                    args[idx] = argValue;
+                }
+                else {
+                    throw validationError(`Argument ${argDescriptor.name} of ${methReg.name} is marked as type '${argDescriptor.dataType.dataType}' and should be a number`);
+                }
+            }
+            if (argDescriptor.dataType.dataType === 'integer') {
+                if (!Number.isInteger(argValue)) {
+                    throw validationError(`Argument ${argDescriptor.name} of ${methReg.name} is marked as type '${argDescriptor.dataType.dataType}' but has a fractional part`);
+                }
+            }
+        }
+        if (argDescriptor.dataType.dataType === 'timestamp') {
+            if (!(argValue instanceof Date)) {
+                if (typeof argValue === 'string') {
+                    const d = Date.parse(argValue);
+                    if (isNaN(d)) {
+                        throw validationError(`Argument ${argDescriptor.name} of ${methReg.name} is marked as type '${argDescriptor.dataType.dataType}' but is a string that will not parse as Date`);
+                    }
+                    argValue = new Date(d);
+                    args[idx] = argValue;
+                }
+                else {
+                    throw validationError(`Argument ${argDescriptor.name} of ${methReg.name} is marked as type '${argDescriptor.dataType.dataType}' but is not a date or time`);
+                }
+            }
+        }
+        if (argDescriptor.dataType.dataType === 'uuid') {
+            // This validation is loose.  A tighter one would be:
+            // /^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[1-5][0-9a-fA-F]{3}-[89abAB][0-9a-fA-F]{3}-[0-9a-fA-F]{12}$/
+            // That matches UUID version 1-5.
+            if (!/^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$/.test(String(argValue))) {
+                throw validationError(`Argument ${argDescriptor.name} of ${methReg.name} is marked as type '${argDescriptor.dataType.dataType}' but is not a valid UUID`);
+            }
+        }
+        // JSON can be anything.  We can validate it against a schema at some later version...
+    });
+    return args;
+}
+function ArgRequired(target, propertyKey, param) {
+    const curParam = dbos_sdk_1.DBOS.associateParamWithInfo(VALIDATOR, 
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+    Object.getOwnPropertyDescriptor(target, propertyKey).value, {
+        ctorOrProto: target,
+        name: propertyKey.toString(),
+        param,
+    });
+    curParam.required = ArgRequiredOptions.REQUIRED;
+    dbos_sdk_1.DBOS.registerMiddlewareInstaller(validationMiddleware);
+}
+exports.ArgRequired = ArgRequired;
+function ArgOptional(target, propertyKey, param) {
+    const curParam = dbos_sdk_1.DBOS.associateParamWithInfo(VALIDATOR, 
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+    Object.getOwnPropertyDescriptor(target, propertyKey).value, {
+        ctorOrProto: target,
+        name: propertyKey.toString(),
+        param,
+    });
+    curParam.required = ArgRequiredOptions.OPTIONAL;
+    dbos_sdk_1.DBOS.registerMiddlewareInstaller(validationMiddleware);
+}
+exports.ArgOptional = ArgOptional;
+function ArgDate() {
+    // TODO a little more info about it - is it a date or timestamp precision?
+    return function (target, propertyKey, param) {
+        const curParam = dbos_sdk_1.DBOS.associateParamWithInfo('type', 
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+        Object.getOwnPropertyDescriptor(target, propertyKey).value, {
+            ctorOrProto: target,
+            name: propertyKey.toString(),
+            param,
+        });
+        if (!curParam.dataType)
+            curParam.dataType = new dbos_sdk_1.DBOSDataType();
+        curParam.dataType.dataType = 'timestamp';
+        dbos_sdk_1.DBOS.registerMiddlewareInstaller(validationMiddleware);
+    };
+}
+exports.ArgDate = ArgDate;
+function ArgVarchar(length) {
+    return function (target, propertyKey, param) {
+        const curParam = dbos_sdk_1.DBOS.associateParamWithInfo('type', 
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+        Object.getOwnPropertyDescriptor(target, propertyKey).value, {
+            ctorOrProto: target,
+            name: propertyKey.toString(),
+            param,
+        });
+        curParam.dataType = dbos_sdk_1.DBOSDataType.varchar(length);
+        dbos_sdk_1.DBOS.registerMiddlewareInstaller(validationMiddleware);
+    };
+}
+exports.ArgVarchar = ArgVarchar;
+function DefaultArgRequired(ctor) {
+    const clsreg = dbos_sdk_1.DBOS.associateClassWithInfo(VALIDATOR, ctor);
+    clsreg.defaultArgRequired = ArgRequiredOptions.REQUIRED;
+    dbos_sdk_1.DBOS.registerMiddlewareInstaller(validationMiddleware);
+}
+exports.DefaultArgRequired = DefaultArgRequired;
+function DefaultArgValidate(ctor) {
+    const clsreg = dbos_sdk_1.DBOS.associateClassWithInfo(VALIDATOR, ctor);
+    clsreg.defaultArgValidate = true;
+    dbos_sdk_1.DBOS.registerMiddlewareInstaller(validationMiddleware);
+}
+exports.DefaultArgValidate = DefaultArgValidate;
+function DefaultArgOptional(ctor) {
+    const clsreg = dbos_sdk_1.DBOS.associateClassWithInfo(VALIDATOR, ctor);
+    clsreg.defaultArgRequired = ArgRequiredOptions.OPTIONAL;
+    dbos_sdk_1.DBOS.registerMiddlewareInstaller(validationMiddleware);
+}
+exports.DefaultArgOptional = DefaultArgOptional;
+var LogMasks;
+(function (LogMasks) {
+    LogMasks["NONE"] = "NONE";
+    LogMasks["HASH"] = "HASH";
+    LogMasks["SKIP"] = "SKIP";
+})(LogMasks || (exports.LogMasks = LogMasks = {}));
+exports.LOGGER = 'log';
+function SkipLogging(target, propertyKey, param) {
+    const curParam = dbos_sdk_1.DBOS.associateParamWithInfo(exports.LOGGER, 
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+    Object.getOwnPropertyDescriptor(target, propertyKey).value, {
+        ctorOrProto: target,
+        name: propertyKey.toString(),
+        param,
+    });
+    curParam.logMask = LogMasks.SKIP;
+}
+exports.SkipLogging = SkipLogging;
+function LogMask(mask) {
+    return function (target, propertyKey, param) {
+        const curParam = dbos_sdk_1.DBOS.associateParamWithInfo(exports.LOGGER, 
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+        Object.getOwnPropertyDescriptor(target, propertyKey).value, {
+            ctorOrProto: target,
+            name: propertyKey.toString(),
+            param,
+        });
+        curParam.logMask = mask;
+    };
+}
+exports.LogMask = LogMask;
+function generateSaltedHash(data, salt) {
+    const hash = node_crypto_2.default.createHash('sha256'); // You can use other algorithms like 'md5', 'sha512', etc.
+    hash.update(data + salt);
+    return hash.digest('hex');
+}
+function getLoggerArgInfo(param) {
+    const valInfo = param.getRegisteredInfo(exports.LOGGER);
+    return {
+        logMask: valInfo.logMask ?? LogMasks.NONE,
+    };
+}
+class LoggingMiddleware {
+    installMiddleware(methReg) {
+        methReg.addEntryInterceptor(logMethodArgs, 30);
+    }
+}
+const logMiddleware = new LoggingMiddleware();
+dbos_sdk_1.DBOS.registerMiddlewareInstaller(logMiddleware);
+function logMethodArgs(methReg, args) {
+    // Argument logging
+    args.forEach((argValue, idx) => {
+        let loggedArgValue = argValue;
+        const logMask = getLoggerArgInfo(methReg.args[idx]).logMask;
+        if (logMask === LogMasks.SKIP) {
+            return;
+        }
+        else {
+            if (logMask !== LogMasks.NONE) {
+                // For now this means hash
+                if (methReg.args[idx].dataType?.dataType === 'json') {
+                    loggedArgValue = generateSaltedHash(JSON.stringify(argValue), 'JSONSALT');
+                }
+                else {
+                    // Yes, we are doing the same as above for now.
+                    // It can be better if we have verified the type of the data
+                    loggedArgValue = generateSaltedHash(JSON.stringify(argValue), 'DBOSSALT');
+                }
+            }
+            dbos_sdk_1.DBOS.span?.setAttribute(methReg.args[idx].name, loggedArgValue);
+        }
+    });
+    return args;
+}
+exports.logMethodArgs = logMethodArgs;
 var APITypes;
 (function (APITypes) {
     APITypes["GET"] = "GET";
@@ -18,6 +384,19 @@ var ArgSources;
     ArgSources["BODY"] = "BODY";
     ArgSources["QUERY"] = "QUERY";
 })(ArgSources || (exports.ArgSources = ArgSources = {}));
+/**
+ * This error can be thrown by DBOS applications to indicate
+ *  the HTTP response code, in addition to the message.
+ * Note that any error with a 'status' field can be used.
+ */
+class DBOSResponseError extends Error {
+    status;
+    constructor(msg, status = 500) {
+        super(msg);
+        this.status = status;
+    }
+}
+exports.DBOSResponseError = DBOSResponseError;
 exports.DBOSHTTP = 'dboshttp';
 exports.WorkflowIDHeader = 'dbos-idempotency-key';
 exports.RequestIDHeader = 'X-Request-ID';
@@ -48,7 +427,7 @@ class DBOSHTTPBase {
         // eslint-disable-next-line @typescript-eslint/no-this-alias
         const er = this;
         return function apidec(target, propertyKey, descriptor) {
-            const { regInfo } = dbos_sdk_1.DBOS.associateFunctionWithInfo(er, descriptor.value, {
+            const { registration, regInfo } = dbos_sdk_1.DBOS.associateFunctionWithInfo(er, descriptor.value, {
                 ctorOrProto: target,
                 name: propertyKey,
             });
@@ -59,6 +438,7 @@ class DBOSHTTPBase {
                 apiURL: url,
                 apiType: verb,
             });
+            requestArgValidation(registration);
             return descriptor;
         };
     }
@@ -82,9 +462,22 @@ class DBOSHTTPBase {
     deleteApi(url) {
         return this.httpApiDec(APITypes.DELETE, url);
     }
+    /** Parameter decorator indicating which source to use (URL, BODY, etc) for arg data */
+    static argSource(source) {
+        return function (target, propertyKey, param) {
+            const curParam = dbos_sdk_1.DBOS.associateParamWithInfo(exports.DBOSHTTP, 
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+            Object.getOwnPropertyDescriptor(target, propertyKey).value, {
+                ctorOrProto: target,
+                name: propertyKey.toString(),
+                param,
+            });
+            curParam.argSource = source;
+        };
+    }
     getArgSource(arg) {
-        void arg;
-        return ArgSources.AUTO;
+        const arginfo = arg.getRegisteredInfo(exports.DBOSHTTP);
+        return arginfo?.argSource ?? ArgSources.AUTO;
     }
     logRegisteredEndpoints() {
         dbos_sdk_1.DBOS.logger.info('HTTP endpoints supported:');
@@ -103,6 +496,27 @@ class DBOSHTTPBase {
             }
         }
     }
+    static argRequired(target, propertyKey, parameterIndex) {
+        ArgRequired(target, propertyKey, parameterIndex);
+    }
+    static argOptional(target, propertyKey, parameterIndex) {
+        ArgOptional(target, propertyKey, parameterIndex);
+    }
+    static argDate() {
+        return ArgDate();
+    }
+    static argVarchar(n) {
+        return ArgVarchar(n);
+    }
+    static defaultArgRequired(ctor) {
+        return DefaultArgRequired(ctor);
+    }
+    static defaultArgOptional(ctor) {
+        return DefaultArgOptional(ctor);
+    }
+    static defaultArgValidate(ctor) {
+        return DefaultArgValidate(ctor);
+    }
 }
 exports.DBOSHTTPBase = DBOSHTTPBase;
 //# sourceMappingURL=dboshttp.js.map

package/dist/src/dboshttp.js.map

@@ -1 +1 @@
-{"version":3,"file":"dboshttp.js","sourceRoot":"","sources":["../../src/dboshttp.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"dboshttp.js","sourceRoot":"","sources":["../../src/dboshttp.ts"],"names":[],"mappings":"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"}

package/dist/src/dboskoa.js

@@ -268,7 +268,7 @@ class DBOSKoa extends dboshttp_1.DBOSHTTPBase {
                     catch (e) {
                         if (e instanceof Error) {
                             span?.setStatus({ code: api_1.SpanStatusCode.ERROR, message: e.message });
-                            let st = 500;
+                            let st = e?.status || 500;
                             if ((0, dboshttp_1.isClientRequestError)(e)) {
                                 st = 400; // Set to 400: client-side error.
                             }