@vectorx/functions-framework 0.5.1 → 0.6.2

package/lib/function-wrapper.js

@@ -1,4 +1,37 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -22,7 +55,31 @@ const wrapEventFunction = (execute, projectConfig) => {
         var _a;
         let event;
         if (ctx.request.files) {
-            event = Object.assign(Object.assign({}, ctx.request.files), ctx.request.body);
+            const filesWithBuffer = {};
+            const fs = yield Promise.resolve().then(() => __importStar(require("fs")));
+            for (const [key, fileOrFiles] of Object.entries(ctx.request.files)) {
+                const files = Array.isArray(fileOrFiles) ? fileOrFiles : [fileOrFiles];
+                const processedFiles = yield Promise.all(files.map((file) => __awaiter(void 0, void 0, void 0, function* () {
+                    if (file && typeof file === "object" && (file.filepath || file.path)) {
+                        const filePath = file.filepath || file.path;
+                        try {
+                            const buffer = fs.readFileSync(filePath);
+                            try {
+                                fs.unlinkSync(filePath);
+                            }
+                            catch (e) {
+                            }
+                            return Object.assign(Object.assign({}, file), { buffer });
+                        }
+                        catch (e) {
+                            return file;
+                        }
+                    }
+                    return file;
+                })));
+                filesWithBuffer[key] = Array.isArray(fileOrFiles) ? processedFiles : processedFiles[0];
+            }
+            event = Object.assign(Object.assign({}, filesWithBuffer), ctx.request.body);
         }
         else if (ctx.request.body) {
             event = ctx.request.body;
@@ -83,7 +140,6 @@ const wrapEventFunction = (execute, projectConfig) => {
             result = yield execute(event, context);
         }
         catch (e) {
-            console.log("============>>>>>>>>>> function wrapper error ", e);
             ctx.state.error = e;
             if (hasSwitchSSEMode) {
                 const sse = (_a = ctx.sse) === null || _a === void 0 ? void 0 : _a.call(ctx);
@@ -93,9 +149,7 @@ const wrapEventFunction = (execute, projectConfig) => {
                         data: e.message,
                         comment: "uncaught-exception-from-user-code",
                     };
-                    console.log("============>>>>>>>>>> errorEvent ", errorEvent);
                     sse.emit("error", errorEvent);
-                    console.log("============>>>>>>>>>> sse.end(errorEvent) ");
                     sse.end(errorEvent);
                 }
             }

package/lib/middlewares/middle-apm-injection.js

@@ -25,6 +25,7 @@ function apmMiddleware() {
             kit_agent_desc: agentInfo.desc,
             kit_agent_id: agentInfo.agentId,
             kit_agent_version: agentInfo.version,
+            kit_agent_name: agentInfo.name,
             context_artifactVersion: kitInfo.agentRuntimeVersion,
             kit_agent_runtime_version: kitInfo.agentRuntimeVersion,
             kit_function_framework_version: kitInfo.functionsFrameworkVersion,

package/lib/middlewares/middle-context-injection.js

@@ -27,6 +27,7 @@ function contextInjectionMiddleware(frameworkOptions, projectConfig) {
             agentId: projectConfig.agentId,
             version: projectConfig.version || "",
             desc: projectConfig.desc || "",
+            name: projectConfig.name || "",
         };
         yield next();
     });

package/lib/request.js

@@ -150,9 +150,8 @@ class Request {
                 clearTimeout(timer);
                 return Promise.reject(x);
             });
-            console.log("=== res ===", res);
             const ret = {
-                data: stream ? (res.body ? stream_1.Readable.toWeb(res.body) : res.body) : res.json(),
+                data: stream ? (res.body ? stream_1.Readable.toWeb(res.body) : res.body) : yield res.json(),
                 statusCode: res.status,
                 header: res.headers,
             };

package/lib/server.js

@@ -16,7 +16,6 @@ exports.createServer = createServer;
 const http_1 = __importDefault(require("http"));
 const koa_1 = __importDefault(require("koa"));
 const koa_body_1 = require("koa-body");
-const raw_body_1 = __importDefault(require("raw-body"));
 const error_1 = require("./error");
 const middlewares_1 = require("./middlewares");
 const unified_responder_1 = require("./unified-responder");
@@ -45,20 +44,33 @@ function createServer(options, router, projectConfig) {
     app.use((0, koa_body_1.koaBody)({
         multipart: true,
         patchKoa: true,
-        onError: (err, ctx) => {
-            return (0, unified_responder_1.sendResponse)(ctx, undefined, (0, error_1.newBadRequestErr)(err), 400);
+        formidable: {
+            maxFileSize: 50 * 1024 * 1024,
+            enabledPlugins: ["octetstream", "json", "multipart"],
+            keepExtensions: true,
+            filter: ({ originalFilename }) => {
+                return !!originalFilename;
+            },
         },
-    }));
-    app.use((ctx, next) => __awaiter(this, void 0, void 0, function* () {
-        if (!(ctx.request.files || ctx.request.body || ctx.state.isTimeout)) {
+        onError: (err, ctx) => {
+            var _a;
             try {
-                ctx.rawBody = yield (0, raw_body_1.default)(ctx.req);
-            }
-            catch (err) {
-                return (0, unified_responder_1.sendResponse)(ctx, undefined, (0, error_1.newBadRequestErr)(err), 400);
+                const h = ((_a = ctx.request) === null || _a === void 0 ? void 0 : _a.headers) || {};
+                console.error("[koa-body][error]", {
+                    message: err === null || err === void 0 ? void 0 : err.message,
+                    name: err === null || err === void 0 ? void 0 : err.name,
+                    code: err === null || err === void 0 ? void 0 : err.code,
+                    status: err === null || err === void 0 ? void 0 : err.status,
+                    headers: {
+                        "content-type": h["content-type"],
+                        "content-length": h["content-length"],
+                        "transfer-encoding": h["transfer-encoding"],
+                    },
+                });
             }
-        }
-        yield next();
+            catch (_) { }
+            return (0, unified_responder_1.sendResponse)(ctx, undefined, (0, error_1.newBadRequestErr)(err), 400);
+        },
     }));
     app.use((0, middlewares_1.openGwRequestMiddleware)(projectConfig.agentId));
     app.use((0, middlewares_1.functionRouteMiddleware)(router, projectConfig));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vectorx/functions-framework",
-  "version": "0.5.1",
+  "version": "0.6.2",
   "description": "VectorX Functions Framework",
   "main": "lib/index.js",
   "types": "types/index.d.ts",
@@ -25,7 +25,7 @@
     "node": ">=18.0.0"
   },
   "dependencies": {
-    "@vectorx/ai-types": "0.4.1",
+    "@vectorx/ai-types": "0.5.2",
     "async_hooks": "^1.0.0",
     "chalk": "4",
     "commander": "^12.1.0",

package/types/function-loader.d.ts

@@ -19,6 +19,7 @@ export interface ProjectConfig {
     agentId: string;
     version: string;
     desc: string;
+    name: string;
     "@vectorx/agent-runtime": string;
     "@vectorx/functions-framework": string;
 }