@balena/pinejs 15.0.1 → 15.1.0-build-web-resource-4-528904929ba5aa3ec2cf3e80bd7800775c7b60a3-2

package/out/server-glue/webresource-handler.js

@@ -0,0 +1,217 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.setupUploadHooks = exports.getDefaultHandler = exports.getUploaderMiddlware = void 0;
+const busboy = require("busboy");
+const is = require("type-is");
+const uriParser = require("../sbvr-api/uri-parser");
+const sbvr_utils_1 = require("../sbvr-api/sbvr-utils");
+const permissions_1 = require("../sbvr-api/permissions");
+const sbvrUtils = require("../sbvr-api/sbvr-utils");
+const S3Handler_1 = require("./webresource-handlers/S3Handler");
+const NoopHandler_1 = require("./webresource-handlers/NoopHandler");
+const odata_to_abstract_sql_1 = require("@balena/odata-to-abstract-sql");
+const module_1 = require("./module");
+const ifFileInValidPath = async (fieldname, req) => {
+    if (req.method !== 'POST' && req.method !== 'PATCH') {
+        return false;
+    }
+    const apiRoot = (0, sbvr_utils_1.getApiRoot)(req);
+    if (apiRoot == null) {
+        return false;
+    }
+    const model = (0, sbvr_utils_1.getModel)(apiRoot);
+    const { resourceName } = await uriParser.parseOData({
+        url: req.url,
+        method: req.method,
+    });
+    const permission = req.method === 'POST' ? 'create' : 'update';
+    const vocab = model.versions[model.versions.length - 1];
+    const hasPermissions = await (0, permissions_1.checkPermissions)(req, permission, resourceName, vocab);
+    if (!hasPermissions) {
+        return false;
+    }
+    const fields = model.abstractSql.tables[resourceName].fields;
+    const dbFieldName = (0, odata_to_abstract_sql_1.odataNameToSqlName)(fieldname);
+    for (const field of fields) {
+        if (field.fieldName === dbFieldName && field.dataType === 'WebResource') {
+            return true;
+        }
+    }
+    return false;
+};
+const getUploaderMiddlware = (handler) => {
+    const completeUploads = [];
+    const filesUploaded = [];
+    return async (req, _res, next) => {
+        if (!is(req, ['multipart'])) {
+            return next();
+        }
+        const bb = busboy({ headers: req.headers });
+        let isAborting = false;
+        const done = () => {
+            req.unpipe(bb);
+            req.on('readable', req.read.bind(req));
+            bb.removeAllListeners();
+        };
+        const clearFiles = () => {
+            isAborting = true;
+            const deletions = filesUploaded.map((file) => handler.removeFile(file));
+            return Promise.all(deletions).catch((err) => console.error('Error deleting file', err));
+        };
+        bb.on('file', async (fieldname, filestream, info) => {
+            if (!isAborting && (await ifFileInValidPath(fieldname, req))) {
+                const file = {
+                    originalname: info.filename,
+                    encoding: info.encoding,
+                    mimetype: info.mimeType,
+                    stream: filestream,
+                    fieldname,
+                };
+                const promise = handler.handleFile(file).then((result) => {
+                    req.body[fieldname] = {
+                        filename: info.filename,
+                        contentType: info.mimeType,
+                        contentDisposition: undefined,
+                        size: result.size,
+                        href: result.filename,
+                    };
+                    filesUploaded.push(result.filename);
+                });
+                completeUploads.push(promise);
+            }
+            else {
+                filestream.resume();
+            }
+        });
+        bb.on('field', (name, val, _info) => {
+            req.body[name] = val;
+        });
+        bb.on('finish', async () => {
+            try {
+                await Promise.all(completeUploads);
+                done();
+                next();
+            }
+            catch (err) {
+                console.error('Error uploading file', err);
+                await clearFiles();
+                next(err);
+            }
+        });
+        bb.on('error', async (err) => {
+            await clearFiles();
+            done();
+            next(err);
+        });
+        req.pipe(bb);
+    };
+};
+exports.getUploaderMiddlware = getUploaderMiddlware;
+const getWebResourceFields = (request) => {
+    const fields = request.abstractSqlModel?.tables[request.resourceName]?.modifyFields ??
+        request.abstractSqlModel?.tables[request.resourceName]?.fields;
+    if (fields == null) {
+        return [];
+    }
+    return fields
+        .filter((f) => f.dataType === 'WebResource')
+        .map((f) => (0, odata_to_abstract_sql_1.sqlNameToODataName)(f.fieldName));
+};
+const getModifiedFields = (request) => {
+    return Object.entries(request.values)
+        .filter(([_key, value]) => value !== undefined)
+        .map(([key, _value]) => key);
+};
+const deleteFiles = async (keysToDelete, webResourceHandler) => {
+    const promises = keysToDelete.map((r) => webResourceHandler.removeFile(r));
+    await Promise.all(promises);
+};
+const getCreateWebResourceHook = (webResourceHandler) => {
+    return {
+        'POSTRUN-ERROR': async ({ tx, request }) => {
+            tx?.on('rollback', async () => {
+                const fields = getWebResourceFields(request);
+                if (fields.length === 0) {
+                    return;
+                }
+                const keysToDelete = fields
+                    .filter((f) => isDefined(request.values[f]))
+                    .map((f) => request.values[f].href);
+                await deleteFiles(keysToDelete, webResourceHandler);
+            });
+        },
+    };
+};
+const isDefined = (x) => x != null;
+const getWebResourcesHrefs = (webResources) => {
+    const hrefs = Object.values(webResources ?? {})
+        .filter(isDefined)
+        .map((resourceKey) => resourceKey.href);
+    return hrefs;
+};
+const getRemoveWebResourceHook = (webResourceHandler) => {
+    return {
+        PRERUN: async (args) => {
+            const { api, request } = args;
+            let fields = getWebResourceFields(request);
+            if (fields.length === 0) {
+                return;
+            }
+            if (request.method === 'PATCH') {
+                if (request.odataQuery?.key == null) {
+                    throw new module_1.errors.BadRequestError('WebResources can only be updated when providing a resource key.');
+                }
+                const allFields = getModifiedFields(request);
+                fields = fields.filter((f) => allFields.includes(f));
+            }
+            if (fields.length === 0) {
+                return;
+            }
+            const ids = await sbvrUtils.getAffectedIds(args);
+            if (ids.length === 0) {
+                return;
+            }
+            if (ids.length !== 1) {
+                throw new module_1.errors.BadRequestError('Resources containing webresources can only be updated/deleted one at a time.');
+            }
+            const webResources = (await api.get({
+                resource: request.resourceName,
+                passthrough: {
+                    tx: args.tx,
+                    req: module_1.permissions.root,
+                },
+                id: ids[0],
+                options: {
+                    $select: fields,
+                },
+            }));
+            request.custom.$pineWebResourcesToDelete =
+                getWebResourcesHrefs(webResources);
+        },
+        POSTRUN: ({ tx, request }) => {
+            tx.on('end', () => {
+                const keysToDelete = request.custom.$pineWebResourcesToDelete || [];
+                deleteFiles(keysToDelete, webResourceHandler);
+            });
+        },
+    };
+};
+const getDefaultHandler = () => {
+    let handler;
+    try {
+        handler = new S3Handler_1.S3Handler();
+    }
+    catch (e) {
+        console.warn(`Failed to initialize S3 handler, using noop ${e}`);
+        handler = new NoopHandler_1.NoopHandler();
+    }
+    return handler;
+};
+exports.getDefaultHandler = getDefaultHandler;
+const setupUploadHooks = (handler, apiRoot, resourceName) => {
+    sbvrUtils.addPureHook('PATCH', apiRoot, resourceName, getRemoveWebResourceHook(handler));
+    sbvrUtils.addPureHook('DELETE', apiRoot, resourceName, getRemoveWebResourceHook(handler));
+    sbvrUtils.addPureHook('POST', apiRoot, resourceName, getCreateWebResourceHook(handler));
+};
+exports.setupUploadHooks = setupUploadHooks;
+//# sourceMappingURL=webresource-handler.js.map

package/out/server-glue/webresource-handler.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"webresource-handler.js","sourceRoot":"","sources":["../../src/server-glue/webresource-handler.ts"],"names":[],"mappings":";;;AACA,iCAAiC;AACjC,8BAA8B;AAE9B,oDAAoD;AACpD,uDAA8D;AAC9D,yDAA2D;AAC3D,oDAAoD;AACpD,gEAA6D;AAC7D,oEAAiE;AACjE,yEAGuC;AACvC,qCAA+C;AAwB/C,MAAM,iBAAiB,GAAG,KAAK,EAC9B,SAAiB,EACjB,GAAoB,EACD,EAAE;IACrB,IAAI,GAAG,CAAC,MAAM,KAAK,MAAM,IAAI,GAAG,CAAC,MAAM,KAAK,OAAO,EAAE;QACpD,OAAO,KAAK,CAAC;KACb;IAED,MAAM,OAAO,GAAG,IAAA,uBAAU,EAAC,GAAG,CAAC,CAAC;IAChC,IAAI,OAAO,IAAI,IAAI,EAAE;QACpB,OAAO,KAAK,CAAC;KACb;IACD,MAAM,KAAK,GAAG,IAAA,qBAAQ,EAAC,OAAO,CAAC,CAAC;IAChC,MAAM,EAAE,YAAY,EAAE,GAAG,MAAM,SAAS,CAAC,UAAU,CAAC;QACnD,GAAG,EAAE,GAAG,CAAC,GAAG;QACZ,MAAM,EAAE,GAAG,CAAC,MAAM;KAClB,CAAC,CAAC;IAEH,MAAM,UAAU,GAAG,GAAG,CAAC,MAAM,KAAK,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC;IAC/D,MAAM,KAAK,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IACxD,MAAM,cAAc,GAAG,MAAM,IAAA,8BAAgB,EAC5C,GAAG,EACH,UAAU,EACV,YAAY,EACZ,KAAK,CACL,CAAC;IAEF,IAAI,CAAC,cAAc,EAAE;QACpB,OAAO,KAAK,CAAC;KACb;IAGD,MAAM,MAAM,GAAG,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,MAAM,CAAC;IAC7D,MAAM,WAAW,GAAG,IAAA,0CAAkB,EAAC,SAAS,CAAC,CAAC;IAClD,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;QAC3B,IAAI,KAAK,CAAC,SAAS,KAAK,WAAW,IAAI,KAAK,CAAC,QAAQ,KAAK,aAAa,EAAE;YACxE,OAAO,IAAI,CAAC;SACZ;KACD;IAKD,OAAO,KAAK,CAAC;AACd,CAAC,CAAC;AAEK,MAAM,oBAAoB,GAAG,CACnC,OAA2B,EACF,EAAE;IAC3B,MAAM,eAAe,GAAyB,EAAE,CAAC;IACjD,MAAM,aAAa,GAAa,EAAE,CAAC;IAEnC,OAAO,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE;QAChC,IAAI,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,WAAW,CAAC,CAAC,EAAE;YAC5B,OAAO,IAAI,EAAE,CAAC;SACd;QAED,MAAM,EAAE,GAAG,MAAM,CAAC,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;QAC5C,IAAI,UAAU,GAAG,KAAK,CAAC;QAEvB,MAAM,IAAI,GAAG,GAAG,EAAE;YACjB,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YACf,GAAG,CAAC,EAAE,CAAC,UAAU,EAAE,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;YACvC,EAAE,CAAC,kBAAkB,EAAE,CAAC;QACzB,CAAC,CAAC;QAEF,MAAM,UAAU,GAAG,GAAG,EAAE;YACvB,UAAU,GAAG,IAAI,CAAC;YAClB,MAAM,SAAS,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC;YAExE,OAAO,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE,CAC3C,OAAO,CAAC,KAAK,CAAC,qBAAqB,EAAE,GAAG,CAAC,CACzC,CAAC;QACH,CAAC,CAAC;QAEF,EAAE,CAAC,EAAE,CAAC,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,IAAI,EAAE,EAAE;YACnD,IAAI,CAAC,UAAU,IAAI,CAAC,MAAM,iBAAiB,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC,EAAE;gBAC7D,MAAM,IAAI,GAAiB;oBAC1B,YAAY,EAAE,IAAI,CAAC,QAAQ;oBAC3B,QAAQ,EAAE,IAAI,CAAC,QAAQ;oBACvB,QAAQ,EAAE,IAAI,CAAC,QAAQ;oBACvB,MAAM,EAAE,UAAU;oBAClB,SAAS;iBACT,CAAC;gBACF,MAAM,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE;oBACxD,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG;wBACrB,QAAQ,EAAE,IAAI,CAAC,QAAQ;wBACvB,WAAW,EAAE,IAAI,CAAC,QAAQ;wBAC1B,kBAAkB,EAAE,SAAS;wBAC7B,IAAI,EAAE,MAAM,CAAC,IAAI;wBACjB,IAAI,EAAE,MAAM,CAAC,QAAQ;qBACrB,CAAC;oBACF,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;gBACrC,CAAC,CAAC,CAAC;gBACH,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;aAC9B;iBAAM;gBACN,UAAU,CAAC,MAAM,EAAE,CAAC;aACpB;QACF,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE;YACnC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC;QACtB,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,EAAE,CAAC,QAAQ,EAAE,KAAK,IAAI,EAAE;YAC1B,IAAI;gBACH,MAAM,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;gBACnC,IAAI,EAAE,CAAC;gBACP,IAAI,EAAE,CAAC;aACP;YAAC,OAAO,GAAG,EAAE;gBACb,OAAO,CAAC,KAAK,CAAC,sBAAsB,EAAE,GAAG,CAAC,CAAC;gBAC3C,MAAM,UAAU,EAAE,CAAC;gBACnB,IAAI,CAAC,GAAG,CAAC,CAAC;aACV;QACF,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;YAC5B,MAAM,UAAU,EAAE,CAAC;YACnB,IAAI,EAAE,CAAC;YACP,IAAI,CAAC,GAAG,CAAC,CAAC;QACX,CAAC,CAAC,CAAC;QACH,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACd,CAAC,CAAC;AACH,CAAC,CAAC;AA7EW,QAAA,oBAAoB,wBA6E/B;AAGF,MAAM,oBAAoB,GAAG,CAAC,OAA+B,EAAY,EAAE;IAC1E,MAAM,MAAM,GACX,OAAO,CAAC,gBAAgB,EAAE,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,YAAY;QACpE,OAAO,CAAC,gBAAgB,EAAE,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC;IAChE,IAAI,MAAM,IAAI,IAAI,EAAE;QACnB,OAAO,EAAE,CAAC;KACV;IAED,OAAO,MAAM;SACX,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,aAAa,CAAC;SAC3C,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,0CAAkB,EAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;AAC/C,CAAC,CAAC;AAEF,MAAM,iBAAiB,GAAG,CAAC,OAA+B,EAAY,EAAE;IACvE,OAAO,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC;SACnC,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,KAAK,KAAK,SAAS,CAAC;SAC9C,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC;AAC/B,CAAC,CAAC;AAEF,MAAM,WAAW,GAAG,KAAK,EACxB,YAAsB,EACtB,kBAAsC,EACrC,EAAE;IACH,MAAM,QAAQ,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,kBAAkB,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;IAC3E,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC7B,CAAC,CAAC;AAEF,MAAM,wBAAwB,GAAG,CAAC,kBAAsC,EAAE,EAAE;IAC3E,OAAO;QACN,eAAe,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;YAC1C,EAAE,EAAE,EAAE,CAAC,UAAU,EAAE,KAAK,IAAI,EAAE;gBAC7B,MAAM,MAAM,GAAG,oBAAoB,CAAC,OAAO,CAAC,CAAC;gBAE7C,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;oBACxB,OAAO;iBACP;gBAED,MAAM,YAAY,GAAa,MAAM;qBACnC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;qBAC3C,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;gBACrC,MAAM,WAAW,CAAC,YAAY,EAAE,kBAAkB,CAAC,CAAC;YACrD,CAAC,CAAC,CAAC;QACJ,CAAC;KACkB,CAAC;AACtB,CAAC,CAAC;AAEF,MAAM,SAAS,GAAG,CAAI,CAAuB,EAAU,EAAE,CAAC,CAAC,IAAI,IAAI,CAAC;AAEpE,MAAM,oBAAoB,GAAG,CAAC,YAA4C,EAAE,EAAE;IAC7E,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,YAAY,IAAI,EAAE,CAAC;SAC7C,MAAM,CAAC,SAAS,CAAC;SACjB,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;IACzC,OAAO,KAAK,CAAC;AACd,CAAC,CAAC;AAEF,MAAM,wBAAwB,GAAG,CAAC,kBAAsC,EAAE,EAAE;IAC3E,OAAO;QACN,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;YACtB,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;YAC9B,IAAI,MAAM,GAAG,oBAAoB,CAAC,OAAO,CAAC,CAAC;YAE3C,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;gBACxB,OAAO;aACP;YAED,IAAI,OAAO,CAAC,MAAM,KAAK,OAAO,EAAE;gBAC/B,IAAI,OAAO,CAAC,UAAU,EAAE,GAAG,IAAI,IAAI,EAAE;oBACpC,MAAM,IAAI,eAAM,CAAC,eAAe,CAC/B,iEAAiE,CACjE,CAAC;iBACF;gBACD,MAAM,SAAS,GAAG,iBAAiB,CAAC,OAAO,CAAC,CAAC;gBAC7C,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;aACrD;YAED,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;gBACxB,OAAO;aACP;YAED,MAAM,GAAG,GAAG,MAAM,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;YACjD,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC,EAAE;gBACrB,OAAO;aACP;YAED,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC,EAAE;gBACrB,MAAM,IAAI,eAAM,CAAC,eAAe,CAC/B,8EAA8E,CAC9E,CAAC;aACF;YAED,MAAM,YAAY,GAAG,CAAC,MAAM,GAAG,CAAC,GAAG,CAAC;gBACnC,QAAQ,EAAE,OAAO,CAAC,YAAY;gBAC9B,WAAW,EAAE;oBACZ,EAAE,EAAE,IAAI,CAAC,EAAE;oBACX,GAAG,EAAE,oBAAW,CAAC,IAAI;iBACrB;gBACD,EAAE,EAAE,GAAG,CAAC,CAAC,CAAC;gBACV,OAAO,EAAE;oBACR,OAAO,EAAE,MAAM;iBACf;aACD,CAAC,CAA8C,CAAC;YAEjD,OAAO,CAAC,MAAM,CAAC,yBAAyB;gBACvC,oBAAoB,CAAC,YAAY,CAAC,CAAC;QACrC,CAAC;QACD,OAAO,EAAE,CAAC,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;YAC5B,EAAE,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE;gBACjB,MAAM,YAAY,GACjB,OAAO,CAAC,MAAM,CAAC,yBAAyB,IAAI,EAAE,CAAC;gBAEhD,WAAW,CAAC,YAAY,EAAE,kBAAkB,CAAC,CAAC;YAC/C,CAAC,CAAC,CAAC;QACJ,CAAC;KACkB,CAAC;AACtB,CAAC,CAAC;AAEK,MAAM,iBAAiB,GAAG,GAAuB,EAAE;IACzD,IAAI,OAA2B,CAAC;IAChC,IAAI;QACH,OAAO,GAAG,IAAI,qBAAS,EAAE,CAAC;KAC1B;IAAC,OAAO,CAAC,EAAE;QACX,OAAO,CAAC,IAAI,CAAC,+CAA+C,CAAC,EAAE,CAAC,CAAC;QACjE,OAAO,GAAG,IAAI,yBAAW,EAAE,CAAC;KAC5B;IACD,OAAO,OAAO,CAAC;AAChB,CAAC,CAAC;AATW,QAAA,iBAAiB,qBAS5B;AAEK,MAAM,gBAAgB,GAAG,CAC/B,OAA2B,EAC3B,OAAe,EACf,YAAoB,EACnB,EAAE;IACH,SAAS,CAAC,WAAW,CACpB,OAAO,EACP,OAAO,EACP,YAAY,EACZ,wBAAwB,CAAC,OAAO,CAAC,CACjC,CAAC;IAEF,SAAS,CAAC,WAAW,CACpB,QAAQ,EACR,OAAO,EACP,YAAY,EACZ,wBAAwB,CAAC,OAAO,CAAC,CACjC,CAAC;IAEF,SAAS,CAAC,WAAW,CACpB,MAAM,EACN,OAAO,EACP,YAAY,EACZ,wBAAwB,CAAC,OAAO,CAAC,CACjC,CAAC;AACH,CAAC,CAAC;AAzBW,QAAA,gBAAgB,oBAyB3B"}

package/out/server-glue/webresource-handlers/NoopHandler.d.ts

@@ -0,0 +1,5 @@
+import { IncomingFile, UploadResponse, WebResourceHandler } from '../webresource-handler';
+export declare class NoopHandler implements WebResourceHandler {
+    handleFile(resource: IncomingFile): Promise<UploadResponse>;
+    removeFile(_fileReference: string): Promise<void>;
+}

package/out/server-glue/webresource-handlers/NoopHandler.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NoopHandler = void 0;
+class NoopHandler {
+    async handleFile(resource) {
+        resource.stream.resume();
+        return {
+            filename: 'noop',
+            size: 0,
+        };
+    }
+    async removeFile(_fileReference) {
+        return;
+    }
+}
+exports.NoopHandler = NoopHandler;
+//# sourceMappingURL=NoopHandler.js.map

package/out/server-glue/webresource-handlers/NoopHandler.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"NoopHandler.js","sourceRoot":"","sources":["../../../src/server-glue/webresource-handlers/NoopHandler.ts"],"names":[],"mappings":";;;AAMA,MAAa,WAAW;IAChB,KAAK,CAAC,UAAU,CAAC,QAAsB;QAE7C,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;QACzB,OAAO;YACN,QAAQ,EAAE,MAAM;YAChB,IAAI,EAAE,CAAC;SACP,CAAC;IACH,CAAC;IAEM,KAAK,CAAC,UAAU,CAAC,cAAsB;QAC7C,OAAO;IACR,CAAC;CACD;AAbD,kCAaC"}

package/out/server-glue/webresource-handlers/S3Handler.d.ts

@@ -0,0 +1,11 @@
+import { IncomingFile, UploadResponse, WebResourceHandler } from '../webresource-handler';
+export declare class S3Handler implements WebResourceHandler {
+    private readonly config;
+    private readonly bucket;
+    private readonly endpoint;
+    private client;
+    constructor();
+    handleFile(resource: IncomingFile): Promise<UploadResponse>;
+    removeFile(fileReference: string): Promise<void>;
+    private getS3URL;
+}

package/out/server-glue/webresource-handlers/S3Handler.js

@@ -0,0 +1,58 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.S3Handler = void 0;
+const env_parsing_1 = require("@balena/env-parsing");
+const client_s3_1 = require("@aws-sdk/client-s3");
+const lib_storage_1 = require("@aws-sdk/lib-storage");
+const crypto_1 = require("crypto");
+class S3Handler {
+    constructor() {
+        this.endpoint = (0, env_parsing_1.requiredVar)('S3_ENDPOINT');
+        this.config = {
+            region: (0, env_parsing_1.optionalVar)('S3_REGION', 'us-east-1'),
+            credentials: {
+                accessKeyId: (0, env_parsing_1.requiredVar)('S3_ACCESS_KEY'),
+                secretAccessKey: (0, env_parsing_1.requiredVar)('S3_SECRET_KEY'),
+            },
+            endpoint: this.endpoint,
+            forcePathStyle: true,
+        };
+        this.bucket = (0, env_parsing_1.optionalVar)('S3_STORAGE_ADAPTER_BUCKET', 'balena-pine-web-resources');
+        this.client = new client_s3_1.S3Client(this.config);
+    }
+    async handleFile(resource) {
+        let size = 0;
+        const key = `${resource.fieldname}_${(0, crypto_1.randomUUID)()}_${resource.originalname}`;
+        const params = {
+            Bucket: this.bucket,
+            ACL: 'public-read',
+            StorageClass: 'STANDARD',
+            Key: key,
+            Body: resource.stream,
+            ContentType: resource.mimetype,
+        };
+        const upload = new lib_storage_1.Upload({ client: this.client, params });
+        upload.on('httpUploadProgress', (ev) => {
+            size = ev.total ? ev.total : ev.loaded;
+        });
+        await upload.done();
+        const filename = this.getS3URL(key);
+        return { size, filename };
+    }
+    async removeFile(fileReference) {
+        const fileReferences = fileReference.split('/');
+        const fileKey = fileReferences[fileReferences.length - 1];
+        const command = new client_s3_1.DeleteObjectCommand({
+            Bucket: this.bucket,
+            Key: fileKey,
+        });
+        await this.client.send(command);
+    }
+    getS3URL(key) {
+        return this.endpoint.includes(this.bucket)
+            ? `${this.endpoint}/${key}`
+            : `${this.endpoint}/${this.bucket}/${key}`;
+    }
+}
+exports.S3Handler = S3Handler;
+//# sourceMappingURL=S3Handler.js.map

package/out/server-glue/webresource-handlers/S3Handler.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"S3Handler.js","sourceRoot":"","sources":["../../../src/server-glue/webresource-handlers/S3Handler.ts"],"names":[],"mappings":";;;AAAA,qDAA+D;AAM/D,kDAI4B;AAC5B,sDAA8C;AAE9C,mCAAoC;AAEpC,MAAa,SAAS;IAMrB;QACC,IAAI,CAAC,QAAQ,GAAG,IAAA,yBAAW,EAAC,aAAa,CAAC,CAAC;QAC3C,IAAI,CAAC,MAAM,GAAG;YACb,MAAM,EAAE,IAAA,yBAAW,EAAC,WAAW,EAAE,WAAW,CAAC;YAC7C,WAAW,EAAE;gBACZ,WAAW,EAAE,IAAA,yBAAW,EAAC,eAAe,CAAC;gBACzC,eAAe,EAAE,IAAA,yBAAW,EAAC,eAAe,CAAC;aAC7C;YACD,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,cAAc,EAAE,IAAI;SACpB,CAAC;QAEF,IAAI,CAAC,MAAM,GAAG,IAAA,yBAAW,EACxB,2BAA2B,EAC3B,2BAA2B,CAC3B,CAAC;QACF,IAAI,CAAC,MAAM,GAAG,IAAI,oBAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACzC,CAAC;IAEM,KAAK,CAAC,UAAU,CAAC,QAAsB;QAC7C,IAAI,IAAI,GAAG,CAAC,CAAC;QACb,MAAM,GAAG,GAAG,GAAG,QAAQ,CAAC,SAAS,IAAI,IAAA,mBAAU,GAAE,IAChD,QAAQ,CAAC,YACV,EAAE,CAAC;QACH,MAAM,MAAM,GAAG;YACd,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,GAAG,EAAE,aAAa;YAClB,YAAY,EAAE,UAAU;YACxB,GAAG,EAAE,GAAG;YACR,IAAI,EAAE,QAAQ,CAAC,MAAM;YACrB,WAAW,EAAE,QAAQ,CAAC,QAAQ;SAC9B,CAAC;QACF,MAAM,MAAM,GAAG,IAAI,oBAAM,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;QAE3D,MAAM,CAAC,EAAE,CAAC,oBAAoB,EAAE,CAAC,EAAE,EAAE,EAAE;YACtC,IAAI,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,MAAO,CAAC;QACzC,CAAC,CAAC,CAAC;QAEH,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;QACpB,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QACpC,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;IAC3B,CAAC;IAEM,KAAK,CAAC,UAAU,CAAC,aAAqB;QAC5C,MAAM,cAAc,GAAG,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAChD,MAAM,OAAO,GAAG,cAAc,CAAC,cAAc,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QAE1D,MAAM,OAAO,GAAG,IAAI,+BAAmB,CAAC;YACvC,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,GAAG,EAAE,OAAO;SACZ,CAAC,CAAC;QAEH,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACjC,CAAC;IAEO,QAAQ,CAAC,GAAW;QAC3B,OAAO,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC;YACzC,CAAC,CAAC,GAAG,IAAI,CAAC,QAAQ,IAAI,GAAG,EAAE;YAC3B,CAAC,CAAC,GAAG,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,MAAM,IAAI,GAAG,EAAE,CAAC;IAC7C,CAAC;CACD;AAlED,8BAkEC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@balena/pinejs",
-  "version": "15.0.1",
+  "version": "15.1.0-build-web-resource-4-528904929ba5aa3ec2cf3e80bd7800775c7b60a3-2",
   "main": "out/server-glue/module",
   "repository": "git@github.com:balena-io/pinejs.git",
   "license": "Apache-2.0",
@@ -18,20 +18,20 @@
     "webpack-server": "grunt server",
     "webpack-build": "npm run webpack-browser && npm run webpack-module && npm run webpack-server",
     "lint": "balena-lint -e js -e ts src build typings Gruntfile.ts && npx tsc --project tsconfig.dev.json --noEmit",
-    "test": "npm run lint && npm run build && npm run webpack-build && npm run test:compose",
-    "test:compose": "trap 'docker-compose -f docker-compose.npm-test.yml down ; echo Stopped ; exit 0' SIGINT; docker-compose -f docker-compose.npm-test.yml up -d && sleep 2 && DATABASE_URL=postgres://docker:docker@localhost:5431/postgres npm run mocha",
+    "test": "npm run lint & npm run build && npm run webpack-build && npm run test:compose",
+    "test:compose": "trap 'docker-compose -f docker-compose.npm-test.yml down ; echo Stopped ; exit 0' SIGINT; docker-compose -f docker-compose.npm-test.yml up -d && sleep 2 && DATABASE_URL=postgres://docker:docker@localhost:5431/postgres S3_ENDPOINT=http://localhost:43680 S3_ACCESS_KEY=USERNAME S3_SECRET_KEY=PASSWORD npm run mocha",
     "mocha": "TS_NODE_FILES=true mocha",
     "prettify": "balena-lint -e js -e ts --fix src build typings Gruntfile.ts"
   },
   "dependencies": {
-    "@balena/abstract-sql-compiler": "^9.0.2",
-    "@balena/abstract-sql-to-typescript": "^2.0.0",
+    "@balena/abstract-sql-compiler": "9.0.3-build-bumps-sbvr-types-with-web-resource-aa97f14f560002592f9d270a6746423f38eaf5da-1",
+    "@balena/abstract-sql-to-typescript": "2.1.0-build-add-web-resource-f0327d04d7bccca132d040a45f91eb23c30d8f3d-1",
     "@balena/env-parsing": "^1.1.5",
     "@balena/lf-to-abstract-sql": "^5.0.0",
-    "@balena/odata-parser": "^3.0.0",
-    "@balena/odata-to-abstract-sql": "^6.0.1",
+    "@balena/odata-parser": "^2.4.6",
+    "@balena/odata-to-abstract-sql": "6.0.2-build-bumps-for-web-resource-fc6584414cedc9d72ae810bc2804a00d218b48a7-1",
     "@balena/sbvr-parser": "^1.4.3",
-    "@balena/sbvr-types": "^5.0.0",
+    "@balena/sbvr-types": "5.1.0-build-web-resource-2-18a09938422881c4507118f81f2d5395e132e741-1",
     "@types/body-parser": "^1.19.2",
     "@types/compression": "^1.7.2",
     "@types/cookie-parser": "^1.4.3",
@@ -51,6 +51,7 @@
     "@types/randomstring": "^1.1.8",
     "@types/websql": "^0.0.27",
     "commander": "^10.0.1",
+    "busboy": "^1.6.0",
     "deep-freeze": "^0.0.1",
     "eventemitter3": "^5.0.0",
     "express-session": "^1.17.3",
@@ -58,18 +59,21 @@
     "memoizee": "^0.4.15",
     "pinejs-client-core": "^6.12.3",
     "randomstring": "^1.2.3",
-    "typed-error": "^3.2.2"
+    "type-is": "^1.6.18",
+    "typed-error": "^3.2.1"
   },
   "devDependencies": {
     "@balena/lint": "^6.2.2",
     "@faker-js/faker": "^7.6.0",
+    "@types/busboy": "^1.5.0",
     "@types/chai": "^4.3.4",
     "@types/chai-as-promised": "^7.1.5",
     "@types/grunt": "^0.4.27",
     "@types/mocha": "^10.0.1",
     "@types/supertest": "^2.0.12",
     "@types/terser-webpack-plugin": "^5.2.0",
-    "@types/webpack": "^5.28.1",
+    "@types/type-is": "^1.6.3",
+    "@types/webpack": "^5.28.0",
     "chai": "^4.3.7",
     "grunt": "^1.6.1",
     "grunt-check-dependencies": "^1.0.0",
@@ -98,13 +102,14 @@
     "webpack-dev-server": "^4.13.3"
   },
   "optionalDependencies": {
+    "@aws-sdk/client-s3": "^3.200.0",
+    "@aws-sdk/lib-storage": "^3.200.0",
     "bcrypt": "^5.1.0",
     "body-parser": "^1.20.2",
     "compression": "^1.7.4",
     "cookie-parser": "^1.4.6",
     "express": "^4.18.2",
     "method-override": "^3.0.0",
-    "multer": "1.4.5-lts.1",
     "mysql": "^2.18.1",
     "passport": "^0.6.0",
     "passport-local": "^1.0.0",
@@ -134,6 +139,6 @@
     "recursive": true
   },
   "versionist": {
-    "publishedAt": "2023-05-18T16:00:09.855Z"
+    "publishedAt": "2023-05-24T14:54:34.406Z"
   }
 }

package/src/config-loader/config-loader.ts

@@ -27,6 +27,12 @@ import * as path from 'path';
 import * as sbvrUtils from '../sbvr-api/sbvr-utils';
 
 import * as permissions from '../sbvr-api/permissions';
+import {
+	getDefaultHandler,
+	getUploaderMiddlware,
+	WebResourceHandler,
+	setupUploadHooks,
+} from '../server-glue/webresource-handler';
 import { AliasValidNodeType } from '../sbvr-api/translations';
 
 export type SetupFunction = (
@@ -55,6 +61,7 @@ export interface Model {
 	translations?: Dictionary<
 		Definition | Dictionary<string | AliasValidNodeType>
 	>;
+	webResourceHandler?: WebResourceHandler;
 }
 export interface User {
 	username: string;
@@ -195,15 +202,33 @@ export const setup = (app: Express.Application) => {
 						);
 
 						const apiRoute = `/${model.apiRoot}/*`;
+						const webResourceHandler =
+							model.webResourceHandler ?? getDefaultHandler();
+
+						const fileUploadMiddleware =
+							getUploaderMiddlware(webResourceHandler);
 						app
 							.route(apiRoute)
 							.options((_req, res) => res.status(200).end())
 							.get(sbvrUtils.handleODataRequest)
 							.put(sbvrUtils.handleODataRequest)
-							.post(sbvrUtils.handleODataRequest)
-							.patch(sbvrUtils.handleODataRequest)
+							.post(fileUploadMiddleware, sbvrUtils.handleODataRequest)
+							.patch(fileUploadMiddleware, sbvrUtils.handleODataRequest)
 							.merge(sbvrUtils.handleODataRequest)
 							.delete(sbvrUtils.handleODataRequest);
+						app.options(apiRoute, (_req, res) => res.status(200).end());
+
+						const loadedModel = sbvrUtils.getModel(model.apiRoot!);
+						if (translateTo == null) {
+							const resources = Object.entries(
+								loadedModel.abstractSql.tables,
+							).filter(([_resourceName, table]) =>
+								table.fields.some((f) => f.dataType === 'WebResource'),
+							);
+							for (const [resource, _table] of resources) {
+								setupUploadHooks(webResourceHandler, model.apiRoot!, resource);
+							}
+						}
 
 						console.info(
 							'Successfully executed ' + model.modelName + ' model.',

package/src/sbvr-api/sbvr-utils.ts

@@ -1153,6 +1153,10 @@ const $getAffectedIds = async ({
 	return result.rows.map((row) => row[idField]);
 };
 
+export const getModel = (vocabulary: string) => {
+	return models[vocabulary];
+};
+
 const runODataRequest = (req: Express.Request, vocabulary: string) => {
 	if (env.DEBUG) {
 		api[vocabulary].logger.log('Parsing', req.method, req.url);
@@ -1328,8 +1332,13 @@ const runODataRequest = (req: Express.Request, vocabulary: string) => {
 	};
 };
 
-export const handleODataRequest: Express.Handler = async (req, res, next) => {
+export const getApiRoot = (req: Express.Request): string | undefined => {
 	const [, apiRoot] = req.url.split('/', 2);
+	return apiRoot;
+};
+
+export const handleODataRequest: Express.Handler = async (req, res, next) => {
+	const apiRoot = getApiRoot(req);
 	if (apiRoot == null || models[apiRoot] == null) {
 		return next('route');
 	}

package/src/server-glue/server.ts

@@ -3,7 +3,6 @@ import type * as Compression from 'compression';
 import type * as CookieParser from 'cookie-parser';
 import type * as ExpressSession from 'express-session';
 import type * as MethodOverride from 'method-override';
-import type * as Multer from 'multer';
 import type * as Passport from 'passport';
 import type * as Path from 'path';
 import type * as ServeStatic from 'serve-static';
@@ -35,7 +34,6 @@ if (!process.browser) {
 	const serveStatic: typeof ServeStatic = require('serve-static');
 	const cookieParser: typeof CookieParser = require('cookie-parser');
 	const bodyParser: typeof BodyParser = require('body-parser');
-	const multer: typeof Multer = require('multer');
 	const methodOverride: typeof MethodOverride = require('method-override');
 	const expressSession: typeof ExpressSession = require('express-session');
 	// tslint:enable:no-var-requires
@@ -47,7 +45,6 @@ if (!process.browser) {
 
 	app.use(cookieParser());
 	app.use(bodyParser());
-	app.use(multer().any());
 	app.use(methodOverride());
 	app.use(
 		expressSession({