@vectorx/functions-framework 0.6.2 → 0.8.0

package/lib/async-context.js

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.newExecutionContext = newExecutionContext;
 exports.getCurrentEventID = getCurrentEventID;
 exports.getCurrentAsyncContext = getCurrentAsyncContext;
+exports.updateApmMeasurementData = updateApmMeasurementData;
 exports.isInFrameworkAsyncContext = isInFrameworkAsyncContext;
 exports.done = done;
 exports.wrapWithAsyncContext = wrapWithAsyncContext;
@@ -34,6 +35,15 @@ function getCurrentEventID() {
 function getCurrentAsyncContext() {
     return asyncLocalStorage.getStore();
 }
+function updateApmMeasurementData(updates) {
+    const context = asyncLocalStorage.getStore();
+    if (context !== undefined) {
+        if (!context.apmMeasurementData) {
+            context.apmMeasurementData = {};
+        }
+        Object.assign(context.apmMeasurementData, updates);
+    }
+}
 function isInFrameworkAsyncContext() {
     const context = asyncLocalStorage.getStore();
     return context !== undefined && context.id === CONTEXT_ID;

package/lib/index.js

@@ -21,3 +21,4 @@ __exportStar(require("./function-registry"), exports);
 __exportStar(require("./sse"), exports);
 __exportStar(require("./server"), exports);
 __exportStar(require("./logger"), exports);
+__exportStar(require("./async-context"), exports);

package/lib/logger.js

@@ -68,7 +68,16 @@ class FunctionsLogger {
         const eventId = (asyncContext === null || asyncContext === void 0 ? void 0 : asyncContext.eventID) || "";
         if (this.apmReporter && (asyncContext === null || asyncContext === void 0 ? void 0 : asyncContext.apmMeasurementData)) {
             const measurementData = Object.assign({}, asyncContext.apmMeasurementData);
-            this.apmReporter.report(apm_config_1.APM_MEASUREMENT_NAME, Object.assign(Object.assign({}, measurementData), { kit_runtime_event_type: LogType.ACCESS, kit_runtime_event_id: eventId, kit_runtime_event_data: message, kit_event_extInfo: {} }));
+            let kit_event_scene;
+            try {
+                const parsedMessage = JSON.parse(message);
+                if (parsedMessage.scene) {
+                    kit_event_scene = parsedMessage.scene;
+                }
+            }
+            catch (_a) {
+            }
+            this.apmReporter.report(apm_config_1.APM_MEASUREMENT_NAME, Object.assign(Object.assign({}, measurementData), { kit_runtime_event_type: LogType.ACCESS, kit_runtime_event_id: eventId, kit_runtime_event_data: message, kit_event_scene: kit_event_scene, kit_event_extInfo: {} }));
         }
     }
     logUserCodelog() {

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

@@ -31,6 +31,11 @@ function apmMiddleware() {
             kit_function_framework_version: kitInfo.functionsFrameworkVersion,
             kit_cloud_env: env,
             kit_runtime_event_id: (0, async_context_1.getCurrentEventID)(),
+            kit_event_scene: undefined,
+            kit_model_name: undefined,
+            kit_model_service_url: undefined,
+            kit_model_status_code: undefined,
+            kit_model_rt: undefined,
         };
         ctx.state.apmMeasurementData = baseMeasurementData;
         yield next();

package/lib/middlewares/middle-common-logger.js

@@ -59,6 +59,11 @@ function loggerMiddleware() {
                 userAgent: ctx.headers["user-agent"],
             };
             logger_1.functionsLogger.logAccesslog(logger_1.LogLevel.INFO, JSON.stringify(accessLog));
+            const asyncContext = (0, async_context_1.getCurrentAsyncContext)();
+            if (asyncContext === null || asyncContext === void 0 ? void 0 : asyncContext.userCodeLogsFlushTimer) {
+                clearTimeout(asyncContext.userCodeLogsFlushTimer);
+                asyncContext.userCodeLogsFlushTimer = undefined;
+            }
             logger_1.functionsLogger.logUserCodelog();
             process.stdout.write(chalk_1.default.greenBright(`▶️ ${chalk_1.default.gray(`[${new Date().toLocaleString()} - ${eventId.slice(0, -10)}]`)} - ${duration}ms\n`));
             process.stdout.write(chalk_1.default.greenBright(`\n`));

package/lib/utils/apm.js

@@ -54,7 +54,7 @@ class ApmReporter {
             context_appVersion: "unknown",
             context_osVersion: os.release(),
             context_userAgent: `Node/${process.version} ${os.platform()}/${os.release()} (${os.arch()})`,
-            context_artifactName: "xhsmpcloudbase",
+            context_artifactName: "miniprogram",
             context_deviceModel: "",
             context_matchedPath: "",
             context_deviceId: (0, machineId_1.machineIdSync)(true),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vectorx/functions-framework",
-  "version": "0.6.2",
+  "version": "0.8.0",
   "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.5.2",
+    "@vectorx/ai-types": "0.7.0",
     "async_hooks": "^1.0.0",
     "chalk": "4",
     "commander": "^12.1.0",

package/types/async-context.d.ts

@@ -11,6 +11,7 @@ export interface ExecutionContext {
 export declare function newExecutionContext(eventId: string, apmData?: Record<string, any>): ExecutionContext;
 export declare function getCurrentEventID(): string;
 export declare function getCurrentAsyncContext(): ExecutionContext | undefined;
+export declare function updateApmMeasurementData(updates: Record<string, any>): void;
 export declare function isInFrameworkAsyncContext(): boolean;
 export declare function done(): Promise<void>;
 export declare function wrapWithAsyncContext<T>(executionContext: ExecutionContext, fn: () => Promise<T>): Promise<T>;

package/types/index.d.ts

@@ -5,3 +5,4 @@ export * from "./function-registry";
 export * from "./sse";
 export * from "./server";
 export * from "./logger";
+export * from "./async-context";