Feat/newjitsu/profile builder UI (jitsucom#1137)

ProfileBuilder UI

.github/workflows/test-and-build.yml

@@ -13,7 +13,7 @@ env:
 jobs:
   build:
     name: Build Project
-    container: jitsucom/node18builder:latest
+    container: jitsucom/node22builder:latest
     timeout-minutes: 60
     runs-on: ubuntu-latest
     steps:

builder.Dockerfile

@@ -4,22 +4,13 @@
 
 # Run `docker login`
 # Build & push it with
-#    docker buildx build --platform linux/amd64 . -f builder.Dockerfile --push -t jitsucom/node18builder:latest
+#    docker buildx build --platform linux/amd64 . -f builder.Dockerfile --push -t jitsucom/node22builder:latest
 
-FROM debian:bullseye-slim
+FROM node:22-bookworm
 RUN apt-get update
-# Telnet is useful for debugging, and we need curl for Node 16
+# Telnet is useful for debugging, and we need curl for Node
 RUN apt-get install git curl telnet python3 ca-certificates gnupg g++ make -y
 
-#Install node 18, see https://github.com/nodesource/distributions#debian-and-ubuntu-based-distributions
-RUN mkdir -p /etc/apt/keyrings
-RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
-RUN echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_18.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list
-RUN apt-get update
-
-#We need bash for pnpm setup
-RUN apt-get install nodejs bash -y
-
 RUN npm -g install pnpm
 
 #Should be the same as playwrite version in ./libs/jitsu-js/package.json

cli/jitsu-cli/src/commands/deploy.ts

@@ -191,10 +191,20 @@ async function deployFunction(
       process.exit(1);
     } else {
       const existing = (await res.json()) as any;
-      existingFunctionId = existing.objects.find(f => f.slug === meta.slug)?.id;
+      existingFunctionId = existing.objects.find(f => f.slug === meta.slug || f.id === meta.id)?.id;
     }
   }
-
+  let functionPayload = {};
+  if (kind === "profile") {
+    functionPayload = {
+      draft: code,
+      kind: "profile",
+    };
+  } else {
+    functionPayload = {
+      code,
+    };
+  }
   if (!existingFunctionId) {
     const id = cuid();
     const res = await fetch(`${host}/api/${workspace.id}/config/function`, {
@@ -211,7 +221,9 @@ async function deployFunction(
         description: meta.description,
         version: packageJson.version,
         name: meta.name,
+        // we always add code to the initial function creation
         code,
+        ...functionPayload,
       }),
     });
     if (!res.ok) {
@@ -236,7 +248,7 @@ async function deployFunction(
         description: meta.description,
         version: packageJson.version,
         name: meta.name,
-        code,
+        ...functionPayload,
       }),
     });
     if (!res.ok) {

cli/jitsu-cli/src/lib/compiled-function.ts

@@ -7,6 +7,7 @@ export type CompiledFunction = {
   func: JitsuFunction;
   meta: {
     slug: string;
+    id?: string;
     name?: string;
     description?: string;
   };
@@ -47,16 +48,29 @@ export async function getFunctionFromFilePath(
   assertTrue(typeof exports.default === "function", `Default export from ${filePath} is not a function`);
 
   let name = exports.config?.name || exports.config?.slug || getSlug(filePath);
+  let id = exports.config?.id;
   if (kind === "profile") {
     const profileBuilderId = exports.config?.profileBuilderId;
     const profileBuilder = profileBuilders.find(pb => pb.id === profileBuilderId);
-    name = `${profileBuilder.name} profile function`;
+    if (!profileBuilder) {
+      throw new Error(
+        `Cannot find profile builder with id ${profileBuilderId} for profile function ${filePath}. Please setup Profile Builder in UI first.`
+      );
+    }
+    name = name || `${profileBuilder.name} function`;
+    id = id || profileBuilder.functions[0]?.functionId;
+    if (!id) {
+      throw new Error(
+        `Cannot find function id for profile function ${filePath}. Please setup Profile Builder in UI first.`
+      );
+    }
   }
 
   return {
     func: exports.default,
     meta: {
       slug: exports.config?.slug || getSlug(filePath),
+      id: id,
       name: name,
       description: exports.config?.description,
     },

libs/core-functions/__tests__/udf.test.ts

@@ -56,7 +56,7 @@ export default udf;
         type: "page",
         context: {},
       },
-      config: {
+      variables: {
         prop1: "test_prop1",
       },
       store: {

libs/core-functions/src/functions/lib/mongodb.ts

@@ -1,5 +1,5 @@
 import { getLog, getSingleton, parseNumber, requireDefined } from "juava";
-import { MongoClient, ObjectId } from "mongodb";
+import { MongoClient, MongoClientOptions, ObjectId } from "mongodb";
 import { AnalyticsServerEvent } from "@jitsu/protocols/analytics";
 import { AnonymousEventsStore } from "@jitsu/protocols/functions";
 
@@ -22,7 +22,7 @@ async function createClient() {
 
   // Create a new MongoClient
   const client = new MongoClient(mongodbURL, {
-    compressors: ["zstd"],
+    compressors: process.env.MONGODB_NETWORK_COMPRESSION ? process.env.MONGODB_NETWORK_COMPRESSION : ["zstd"],
     serverSelectionTimeoutMS: 60000,
     maxPoolSize: 32,
     connectTimeoutMS: 60000,

services/profiles/src/lib/udf-wrapper-code.ts → libs/core-functions/src/functions/lib/profiles-udf-wrapper-code.ts

@@ -37,15 +37,15 @@ function isDropResult(result) {
 
 async function runChain(
     chain,
-    ctx,
     events,
-    user
+    user,
+    ctx
 ) {
     const execLog = [];
     const f = chain[0];
     let result = undefined;
     try {
-        result = await f.f(ctx, events, user);
+        result = await f.f(events, user, ctx);
     } catch (err) {
         if (err.name === DropRetryErrorName) {
             result = "drop";
@@ -64,10 +64,10 @@ async function runChain(
     return {result, execLog};
 }
 
-const wrappedFunctionChain = async function (ctx, events, user) {
+const wrappedFunctionChain = async function (events, user, ctx) {
     let chain = [];
     //** @UDF_FUNCTIONS_CHAIN **//
-    const chainRes = await runChain(chain, ctx, events, user);
+    const chainRes = await runChain(chain, events, user, ctx);
     checkError(chainRes);
     return chainRes.result;
 };
@@ -155,7 +155,7 @@ const wrappedUserFunction = (id, f, funcCtx) => {
         };
     }
 
-    return async function (c, events, user) {
+    return async function (events, user, c) {
         const fetchLogEnabled = _jitsu_fetch_log_level !== "debug" || (funcCtx.function.debugTill && funcCtx.function.debugTill > new Date());
         let ftch = fetch
         if (fetchLogEnabled) {
@@ -170,7 +170,7 @@ const wrappedUserFunction = (id, f, funcCtx) => {
             store,
             fetch: ftch,
         };
-        return await f(ctx, events, user);
+        return await f(events, user, ctx);
     }
 };
 

services/profiles/src/lib/udf-wrapper-code.txtjs → libs/core-functions/src/functions/lib/profiles-udf-wrapper-code.txtjs

@@ -24,15 +24,15 @@ function isDropResult(result) {
 
 async function runChain(
     chain,
-    ctx,
     events,
-    user
+    user,
+    ctx
 ) {
     const execLog = [];
     const f = chain[0];
     let result = undefined;
     try {
-        result = await f.f(ctx, events, user);
+        result = await f.f(events, user, ctx);
     } catch (err) {
         if (err.name === DropRetryErrorName) {
             result = "drop";
@@ -51,10 +51,10 @@ async function runChain(
     return {result, execLog};
 }
 
-const wrappedFunctionChain = async function (ctx, events, user) {
+const wrappedFunctionChain = async function (events, user, ctx) {
     let chain = [];
     //** @UDF_FUNCTIONS_CHAIN **//
-    const chainRes = await runChain(chain, ctx, events, user);
+    const chainRes = await runChain(chain, events, user, ctx);
     checkError(chainRes);
     return chainRes.result;
 };
@@ -142,7 +142,7 @@ const wrappedUserFunction = (id, f, funcCtx) => {
         };
     }
 
-    return async function (c, events, user) {
+    return async function (events, user, c) {
         const fetchLogEnabled = _jitsu_fetch_log_level !== "debug" || (funcCtx.function.debugTill && funcCtx.function.debugTill > new Date());
         let ftch = fetch
         if (fetchLogEnabled) {
@@ -157,7 +157,7 @@ const wrappedUserFunction = (id, f, funcCtx) => {
             store,
             fetch: ftch,
         };
-        return await f(ctx, events, user);
+        return await f(events, user, ctx);
     }
 };