@base44-preview/cli 0.0.45-pr.406.ed52e60 → 0.0.45-pr.419.e270ff0

package/README.md

@@ -53,10 +53,14 @@ The CLI will guide you through project setup. For step-by-step tutorials, see th
 | [`whoami`](https://docs.base44.com/developers/references/cli/commands/whoami) | Display the current authenticated user |
 | [`agents pull`](https://docs.base44.com/developers/references/cli/commands/agents-pull) | Pull agents from Base44 to local files |
 | [`agents push`](https://docs.base44.com/developers/references/cli/commands/agents-push) | Push local agents to Base44 |
+| [`connectors list-available`](https://docs.base44.com/developers/references/cli/commands/connectors-list-available) | List all available integration types |
 | [`connectors pull`](https://docs.base44.com/developers/references/cli/commands/connectors-pull) | Pull connectors from Base44 to local files |
 | [`connectors push`](https://docs.base44.com/developers/references/cli/commands/connectors-push) | Push local connectors to Base44 |
 | [`entities push`](https://docs.base44.com/developers/references/cli/commands/entities-push) | Push local entities to Base44 |
-| [`functions deploy`](https://docs.base44.com/developers/references/cli/commands/functions-deploy) | Deploy local functions to Base44 |
+| `functions delete` | Delete deployed functions |
+| [`functions deploy`](https://docs.base44.com/developers/references/cli/commands/functions-deploy) | Deploy functions to Base44 |
+| `functions list` | List all deployed functions |
+| `functions pull` | Pull deployed functions from Base44 |
 | [`secrets list`](https://docs.base44.com/developers/references/cli/commands/secrets-list) | List project secret names |
 | [`secrets set`](https://docs.base44.com/developers/references/cli/commands/secrets-set) | Set one or more project secrets |
 | [`secrets delete`](https://docs.base44.com/developers/references/cli/commands/secrets-delete) | Delete a project secret |

package/dist/assets/deno-runtime/main.ts

@@ -0,0 +1,72 @@
+/**
+ * Deno Function Wrapper
+ *
+ * This script is executed by Deno to run user functions.
+ * It patches Deno.serve to inject a dynamic port before importing the user's function.
+ *
+ * Environment variables:
+ * - FUNCTION_PATH: Absolute path to the user's function entry file
+ * - FUNCTION_PORT: Port number for the function to listen on
+ * - FUNCTION_NAME: Name of the function (for logging)
+ */
+
+// Make this file a module for top-level await support
+export {};
+
+const functionPath = Deno.env.get("FUNCTION_PATH");
+const port = parseInt(Deno.env.get("FUNCTION_PORT") || "8000", 10);
+const functionName = Deno.env.get("FUNCTION_NAME") || "unknown";
+
+if (!functionPath) {
+  console.error("[wrapper] FUNCTION_PATH environment variable is required");
+  Deno.exit(1);
+}
+
+// Store the original Deno.serve
+const originalServe = Deno.serve.bind(Deno);
+
+// Patch Deno.serve to inject our port and add onListen callback
+// @ts-expect-error - We're intentionally overriding Deno.serve
+Deno.serve = (
+  optionsOrHandler:
+    | Deno.ServeOptions
+    | Deno.ServeHandler
+    | (Deno.ServeOptions & { handler: Deno.ServeHandler }),
+  maybeHandler?: Deno.ServeHandler,
+): Deno.HttpServer<Deno.NetAddr> => {
+  const onListen = () => {
+    // This message is used by FunctionManager to detect when the function is ready
+    console.log(`[${functionName}] Listening on http://localhost:${port}`);
+  };
+
+  // Handle the different Deno.serve signatures:
+  // 1. Deno.serve(handler)
+  // 2. Deno.serve(options, handler)
+  // 3. Deno.serve({ ...options, handler })
+  if (typeof optionsOrHandler === "function") {
+    // Signature: Deno.serve(handler)
+    return originalServe({ port, onListen }, optionsOrHandler);
+  }
+
+  if (maybeHandler) {
+    // Signature: Deno.serve(options, handler)
+    return originalServe({ ...optionsOrHandler, port, onListen }, maybeHandler);
+  }
+
+  // Signature: Deno.serve({ ...options, handler })
+  const options = optionsOrHandler as Deno.ServeOptions & {
+    handler: Deno.ServeHandler;
+  };
+  return originalServe({ ...options, port, onListen });
+};
+
+console.log(`[${functionName}] Starting function from ${functionPath}`);
+
+// Dynamically import the user's function
+// The function will call Deno.serve which is now patched to use our port
+try {
+  await import(functionPath);
+} catch (error) {
+  console.error(`[${functionName}] Failed to load function:`, error);
+  Deno.exit(1);
+}

package/dist/cli/index.js

@@ -179494,19 +179494,19 @@ var require_base64id = __commonJS((exports, module) => {
   /*!
    * base64id v0.1.0
    */
-  var crypto2 = __require("crypto");
+  var crypto = __require("crypto");
   var Base64Id = function() {};
   Base64Id.prototype.getRandomBytes = function(bytes) {
     var BUFFER_SIZE = 4096;
     var self2 = this;
     bytes = bytes || 12;
     if (bytes > BUFFER_SIZE) {
-      return crypto2.randomBytes(bytes);
+      return crypto.randomBytes(bytes);
     }
     var bytesInBuffer = parseInt(BUFFER_SIZE / bytes);
     var threshold = parseInt(bytesInBuffer * 0.85);
     if (!threshold) {
-      return crypto2.randomBytes(bytes);
+      return crypto.randomBytes(bytes);
     }
     if (this.bytesBufferIndex == null) {
       this.bytesBufferIndex = -1;
@@ -179518,14 +179518,14 @@ var require_base64id = __commonJS((exports, module) => {
     if (this.bytesBufferIndex == -1 || this.bytesBufferIndex > threshold) {
       if (!this.isGeneratingBytes) {
         this.isGeneratingBytes = true;
-        crypto2.randomBytes(BUFFER_SIZE, function(err, bytes2) {
+        crypto.randomBytes(BUFFER_SIZE, function(err, bytes2) {
           self2.bytesBuffer = bytes2;
           self2.bytesBufferIndex = 0;
           self2.isGeneratingBytes = false;
         });
       }
       if (this.bytesBufferIndex == -1) {
-        return crypto2.randomBytes(bytes);
+        return crypto.randomBytes(bytes);
       }
     }
     var result = this.bytesBuffer.slice(bytes * this.bytesBufferIndex, bytes * (this.bytesBufferIndex + 1));
@@ -179539,7 +179539,7 @@ var require_base64id = __commonJS((exports, module) => {
     }
     this.sequenceNumber = this.sequenceNumber + 1 | 0;
     rand.writeInt32BE(this.sequenceNumber, 11);
-    if (crypto2.randomBytes) {
+    if (crypto.randomBytes) {
       this.getRandomBytes(12).copy(rand);
     } else {
       [0, 4, 8].forEach(function(i5) {
@@ -238807,7 +238807,7 @@ function getTemplatesIndexPath() {
   return join8(ASSETS_DIR, "templates", "templates.json");
 }
 function getDenoWrapperPath() {
-  return join8(ASSETS_DIR, "deno-runtime", "main.js");
+  return join8(ASSETS_DIR, "deno-runtime", "main.ts");
 }
 function ensureNpmAssets(sourceDir) {
   if (existsSync(ASSETS_DIR))
@@ -248819,7 +248819,7 @@ function getTypesCommand(context) {
 // src/cli/dev/dev-server/main.ts
 import { dirname as dirname14, join as join20 } from "node:path";
 var import_cors = __toESM(require_lib4(), 1);
-var import_express6 = __toESM(require_express(), 1);
+var import_express4 = __toESM(require_express(), 1);
 
 // ../../node_modules/get-port/index.js
 import net from "node:net";
@@ -249177,36 +249177,6 @@ function createFunctionRouter(manager, logger) {
 // src/cli/dev/dev-server/db/database.ts
 var import_nedb = __toESM(require_nedb(), 1);
 
-// ../../node_modules/nanoid/index.js
-import { webcrypto as crypto } from "node:crypto";
-
-// ../../node_modules/nanoid/url-alphabet/index.js
-var urlAlphabet = "useandom-26T198340PX75pxJACKVERYMINDBUSHWOLF_GQZbfghjklqvwyzrict";
-
-// ../../node_modules/nanoid/index.js
-var POOL_SIZE_MULTIPLIER = 128;
-var pool;
-var poolOffset;
-function fillPool(bytes) {
-  if (!pool || pool.length < bytes) {
-    pool = Buffer.allocUnsafe(bytes * POOL_SIZE_MULTIPLIER);
-    crypto.getRandomValues(pool);
-    poolOffset = 0;
-  } else if (poolOffset + bytes > pool.length) {
-    crypto.getRandomValues(pool);
-    poolOffset = 0;
-  }
-  poolOffset += bytes;
-}
-function nanoid3(size = 21) {
-  fillPool(size |= 0);
-  let id2 = "";
-  for (let i5 = poolOffset - size;i5 < poolOffset; i5++) {
-    id2 += urlAlphabet[pool[i5] & 63];
-  }
-  return id2;
-}
-
 // src/cli/dev/dev-server/db/validator.ts
 var fieldTypes = [
   "string",
@@ -249353,63 +249323,18 @@ class Validator {
 }
 
 // src/cli/dev/dev-server/db/database.ts
-var USER_COLLECTION = "user";
-
 class Database {
   collections = new Map;
   schemas = new Map;
   validator = new Validator;
-  async load(entities) {
-    const userDataStore = new import_nedb.default;
-    this.collections.set(USER_COLLECTION, userDataStore);
-    const userInfo = await readAuth();
-    const now = new Date().toISOString().replace("Z", "000");
-    await userDataStore.insertAsync({
-      id: nanoid3(),
-      email: userInfo.email,
-      full_name: userInfo.name,
-      is_service: false,
-      is_verified: true,
-      disabled: null,
-      role: "admin",
-      collaborator_role: "editor",
-      created_date: now,
-      updated_date: now
-    });
+  load(entities) {
     for (const entity2 of entities) {
-      const entityName = this.normalizeName(entity2.name);
-      const clonedEntity = structuredClone(entity2);
-      if (entityName === USER_COLLECTION) {
-        ["full_name", "email"].forEach((predefinedField) => {
-          if (predefinedField in clonedEntity.properties) {
-            throw new Error(`Error syncing entities: Invalid User schema: User schema cannot contain base fields: ${predefinedField}. These fields are built-in and managed by the system.`);
-          }
-        });
-        clonedEntity.properties.full_name = { type: "string" };
-        clonedEntity.properties.email = { type: "string" };
-        clonedEntity.properties.role = { type: "string" };
-      } else {
-        this.collections.set(entityName, new import_nedb.default);
-      }
-      this.schemas.set(entityName, clonedEntity);
+      this.collections.set(entity2.name, new import_nedb.default);
+      this.schemas.set(entity2.name, entity2);
     }
-    if (!this.schemas.has(USER_COLLECTION)) {
-      this.schemas.set(USER_COLLECTION, {
-        name: "User",
-        type: "object",
-        properties: {
-          full_name: { type: "string" },
-          email: { type: "string" },
-          role: { type: "string" }
-        }
-      });
-    }
-  }
-  hasCollection(name2) {
-    return this.collections.has(this.normalizeName(name2));
   }
   getCollection(name2) {
-    return this.collections.get(this.normalizeName(name2));
+    return this.collections.get(name2);
   }
   getCollectionNames() {
     return Array.from(this.collections.keys());
@@ -249422,14 +249347,14 @@ class Database {
     this.schemas.clear();
   }
   validate(entityName, record2, partial2 = false) {
-    const schema9 = this.schemas.get(this.normalizeName(entityName));
+    const schema9 = this.schemas.get(entityName);
     if (!schema9) {
       throw new Error(`Entity "${entityName}" not found`);
     }
     return this.validator.validate(record2, schema9, partial2);
   }
   prepareRecord(entityName, record2, partial2 = false) {
-    const schema9 = this.schemas.get(this.normalizeName(entityName));
+    const schema9 = this.schemas.get(entityName);
     if (!schema9) {
       throw new Error(`Entity "${entityName}" not found`);
     }
@@ -249439,9 +249364,6 @@ class Database {
     }
     return this.validator.applyDefaults(filteredRecord, schema9);
   }
-  normalizeName(entityName) {
-    return entityName.toLowerCase();
-  }
 }
 
 // ../../node_modules/socket.io/wrapper.mjs
@@ -249476,42 +249398,40 @@ function broadcastEntityEvent(io6, appId, entityName, event) {
   });
 }
 
-// src/cli/dev/dev-server/routes/entities/entities-router.ts
-var import_express3 = __toESM(require_express(), 1);
-
-// src/cli/dev/dev-server/routes/entities/entities-user-router.ts
+// src/cli/dev/dev-server/routes/entities.ts
 var import_express2 = __toESM(require_express(), 1);
 
-// src/cli/dev/dev-server/routes/entities/utils.ts
-function stripInternalFields(doc2) {
-  if (Array.isArray(doc2)) {
-    return doc2.map((d5) => stripInternalFields(d5));
+// ../../node_modules/nanoid/index.js
+import { webcrypto as crypto } from "node:crypto";
+
+// ../../node_modules/nanoid/url-alphabet/index.js
+var urlAlphabet = "useandom-26T198340PX75pxJACKVERYMINDBUSHWOLF_GQZbfghjklqvwyzrict";
+
+// ../../node_modules/nanoid/index.js
+var POOL_SIZE_MULTIPLIER = 128;
+var pool;
+var poolOffset;
+function fillPool(bytes) {
+  if (!pool || pool.length < bytes) {
+    pool = Buffer.allocUnsafe(bytes * POOL_SIZE_MULTIPLIER);
+    crypto.getRandomValues(pool);
+    poolOffset = 0;
+  } else if (poolOffset + bytes > pool.length) {
+    crypto.getRandomValues(pool);
+    poolOffset = 0;
   }
-  const { _id, ...rest } = doc2;
-  return rest;
+  poolOffset += bytes;
 }
-
-// src/cli/dev/dev-server/routes/entities/entities-user-router.ts
-async function createUserRouter(db2) {
-  const router = import_express2.Router({ mergeParams: true });
-  router.get("/:id", async (req, res) => {
-    let result;
-    if (req.params.id === "me") {
-      const userInfo = await readAuth();
-      result = await db2.getCollection("User")?.findOneAsync({ email: userInfo.email });
-    } else {
-      result = await db2.getCollection("User")?.findOneAsync({ id: req.params.id });
-    }
-    if (!result) {
-      res.status(404).json({ error: `User with id "${req.params.id}" not found` });
-      return;
-    }
-    res.json(stripInternalFields(result));
-  });
-  return router;
+function nanoid3(size = 21) {
+  fillPool(size |= 0);
+  let id2 = "";
+  for (let i5 = poolOffset - size;i5 < poolOffset; i5++) {
+    id2 += urlAlphabet[pool[i5] & 63];
+  }
+  return id2;
 }
 
-// src/cli/dev/dev-server/routes/entities/entities-router.ts
+// src/cli/dev/dev-server/routes/entities.ts
 function parseSort(sort) {
   if (!sort) {
     return;
@@ -249534,9 +249454,16 @@ function parseFields(fields) {
   }
   return Object.keys(projection).length > 0 ? projection : undefined;
 }
-async function createEntityRoutes(db2, logger, broadcast) {
-  const router = import_express3.Router({ mergeParams: true });
-  const parseBody = import_express3.json();
+function stripInternalFields(doc2) {
+  if (Array.isArray(doc2)) {
+    return doc2.map((d5) => stripInternalFields(d5));
+  }
+  const { _id, ...rest } = doc2;
+  return rest;
+}
+function createEntityRoutes(db2, logger, remoteProxy, broadcast) {
+  const router = import_express2.Router({ mergeParams: true });
+  const parseBody = import_express2.json();
   function withCollection(handler) {
     return async (req, res) => {
       const collection = db2.getCollection(req.params.entityName);
@@ -249562,8 +249489,11 @@ async function createEntityRoutes(db2, logger, broadcast) {
     }
     broadcast(appId, entityName, createData(data));
   }
-  const userRouter = await createUserRouter(db2);
-  router.use("/User", userRouter);
+  router.get("/User/:id", (req, res, next) => {
+    logger.warn(`"${req.originalUrl}" is not supported in local development, passing call to production`);
+    req.url = req.originalUrl;
+    remoteProxy(req, res, next);
+  });
   router.get("/:entityName/:id", withCollection(async (req, res, collection) => {
     const { entityName, id: id2 } = req.params;
     try {
@@ -249735,7 +249665,7 @@ async function createEntityRoutes(db2, logger, broadcast) {
 }
 
 // src/cli/dev/dev-server/routes/integrations.ts
-var import_express4 = __toESM(require_express(), 1);
+var import_express3 = __toESM(require_express(), 1);
 var import_multer = __toESM(require_multer(), 1);
 import { createHash, randomUUID as randomUUID4 } from "node:crypto";
 import fs28 from "node:fs";
@@ -249744,8 +249674,8 @@ function createFileToken(fileUri) {
   return createHash("sha256").update(fileUri).digest("hex");
 }
 function createIntegrationRoutes(mediaFilesDir, baseUrl, remoteProxy, logger) {
-  const router = import_express4.Router({ mergeParams: true });
-  const parseBody = import_express4.json();
+  const router = import_express3.Router({ mergeParams: true });
+  const parseBody = import_express3.json();
   const privateFilesDir = path18.join(mediaFilesDir, "private");
   fs28.mkdirSync(mediaFilesDir, { recursive: true });
   fs28.mkdirSync(privateFilesDir, { recursive: true });
@@ -249815,7 +249745,7 @@ function createIntegrationRoutes(mediaFilesDir, baseUrl, remoteProxy, logger) {
   return router;
 }
 function createCustomIntegrationRoutes(remoteProxy, logger) {
-  const router = import_express4.Router({ mergeParams: true });
+  const router = import_express3.Router({ mergeParams: true });
   router.post("/:slug/:operationId", (req, res, next) => {
     logger.warn(`"${req.originalUrl}" is not supported in local development, passing call to production`);
     req.url = req.originalUrl;
@@ -249824,18 +249754,6 @@ function createCustomIntegrationRoutes(remoteProxy, logger) {
   return router;
 }
 
-// src/cli/dev/dev-server/routes/users.ts
-var import_express5 = __toESM(require_express(), 1);
-function createUsersRoutes() {
-  const router = import_express5.Router({ mergeParams: true });
-  const parseBody = import_express5.json();
-  router.post("/invite-user", parseBody, (req, _res, next) => {
-    console.log("invite-user", req.body);
-    next();
-  });
-  return router;
-}
-
 // src/cli/dev/dev-server/watcher.ts
 import { EventEmitter as EventEmitter4 } from "node:events";
 import { relative as relative6 } from "node:path";
@@ -251540,7 +251458,7 @@ async function createDevServer(options8) {
   const port = userPort ?? await getPorts({ port: DEFAULT_PORT });
   const baseUrl = `http://localhost:${port}`;
   const { functions, entities, project: project2 } = await options8.loadResources();
-  const app = import_express6.default();
+  const app = import_express4.default();
   const remoteProxy = import_http_proxy_middleware2.createProxyMiddleware({
     target: BASE44_APP_URL,
     changeOrigin: true
@@ -251557,17 +251475,7 @@ async function createDevServer(options8) {
     }
     next();
   });
-  app.use((req, res, next) => {
-    const auth2 = req.headers.authorization;
-    if (!auth2 || !auth2.startsWith("Bearer ")) {
-      res.status(401).json({ error: "Unauthorized" });
-      return;
-    }
-    next();
-  });
   const devLogger = createDevLogger();
-  const usersRoutes = createUsersRoutes();
-  app.use("/api/apps/:appId/users", usersRoutes);
   const functionManager = new FunctionManager(functions, devLogger, options8.denoWrapperPath);
   const functionRoutes = createFunctionRouter(functionManager, devLogger);
   app.use("/api/apps/:appId/functions", functionRoutes);
@@ -251575,12 +251483,12 @@ async function createDevServer(options8) {
     R2.info(`Loaded functions: ${functionManager.getFunctionNames().join(", ")}`);
   }
   const db2 = new Database;
-  await db2.load(entities);
+  db2.load(entities);
   if (db2.getCollectionNames().length > 0) {
     R2.info(`Loaded entities: ${db2.getCollectionNames().join(", ")}`);
   }
   let emitEntityEvent = () => {};
-  const entityRoutes = await createEntityRoutes(db2, devLogger, (...args) => emitEntityEvent(...args));
+  const entityRoutes = createEntityRoutes(db2, devLogger, remoteProxy, (...args) => emitEntityEvent(...args));
   app.use("/api/apps/:appId/entities", entityRoutes);
   const { path: mediaFilesDir } = await $dir();
   app.use("/media/private/:fileUri", (req, res, next) => {
@@ -251601,7 +251509,7 @@ async function createDevServer(options8) {
     }
     next();
   });
-  app.use("/media", import_express6.default.static(mediaFilesDir));
+  app.use("/media", import_express4.default.static(mediaFilesDir));
   const integrationRoutes = createIntegrationRoutes(mediaFilesDir, baseUrl, remoteProxy, devLogger);
   app.use("/api/apps/:appId/integration-endpoints", integrationRoutes);
   const customIntegrationRoutes = createCustomIntegrationRoutes(remoteProxy, devLogger);
@@ -251650,7 +251558,7 @@ async function createDevServer(options8) {
         if (previousEntityCount > 0) {
           devLogger.log("Entities directory changed, clearing data...");
         }
-        await db2.load(entities2);
+        db2.load(entities2);
         if (db2.getCollectionNames().length > 0) {
           devLogger.log(`Loaded entities: ${db2.getCollectionNames().join(", ")}`);
         }
@@ -256052,4 +255960,4 @@ export {
   CLIExitError
 };
 
-//# debugId=1D8798AB57E4532E64756E2164756E21
+//# debugId=8DF79D46442B07AB64756E2164756E21