@arcote.tech/arc-cli 0.7.7 → 0.7.8

package/dist/index.js

@@ -14860,10 +14860,11 @@ class ArcFunction {
       params: schema instanceof ArcObject ? schema : new ArcObject(schema)
     });
   }
-  withResult(schema) {
+  withResult(...schemas) {
+    const results = schemas.map((s) => s instanceof ArcObject ? s : new ArcObject(s));
     return new ArcFunction({
       ...this.data,
-      result: schema instanceof ArcObject ? schema : new ArcObject(schema)
+      results
     });
   }
   query(elements) {
@@ -14891,6 +14892,12 @@ class ArcFunction {
       description: desc
     });
   }
+  private() {
+    return new ArcFunction({
+      ...this.data,
+      isPrivate: true
+    });
+  }
   handle(handler) {
     return new ArcFunction({
       ...this.data,
@@ -14912,8 +14919,8 @@ class ArcFunction {
   get params() {
     return this.data.params;
   }
-  get result() {
-    return this.data.result;
+  get results() {
+    return this.data.results;
   }
   async verifyProtections(tokens) {
     if (!this.data.protections || this.data.protections.length === 0) {
@@ -14937,7 +14944,7 @@ class ArcFunction {
   toJsonSchema() {
     return {
       params: this.data.params?.toJsonSchema?.() ?? null,
-      result: this.data.result?.toJsonSchema?.() ?? null
+      results: this.data.results.map((r2) => r2.toJsonSchema())
     };
   }
 }
@@ -15294,19 +15301,26 @@ function buildContextAccessor(context2, adapters, contextMethod, onCall) {
     if (typeof ctxFn !== "function")
       continue;
     const methods = ctxFn.call(element2, adapters);
-    if (!methods || typeof methods !== "object")
+    if (!methods)
+      continue;
+    const elementName = element2.name;
+    if (typeof methods === "function") {
+      result[elementName] = (...args) => onCall({ element: elementName, method: "", args }, () => methods(...args));
+      continue;
+    }
+    if (typeof methods !== "object")
       continue;
     const wrapped = {};
     for (const [methodName, method] of Object.entries(methods)) {
       if (typeof method !== "function")
         continue;
-      wrapped[methodName] = (...args) => onCall({ element: element2.name, method: methodName, args }, () => method(...args));
+      wrapped[methodName] = (...args) => onCall({ element: elementName, method: methodName, args }, () => method(...args));
     }
-    result[element2.name] = wrapped;
+    result[elementName] = wrapped;
   }
   return result;
 }
-function executeDescriptor(descriptor, context2, adapters, contextMethod) {
+function executeDescriptor(descriptor, context2, adapters, contextMethod, options) {
   const element2 = context2.get(descriptor.element);
   if (!element2) {
     throw new Error(`Element '${descriptor.element}' not found in context`);
@@ -15316,10 +15330,19 @@ function executeDescriptor(descriptor, context2, adapters, contextMethod) {
     throw new Error(`Element '${descriptor.element}' has no ${contextMethod}`);
   }
   const methods = ctxFn.call(element2, adapters);
+  if (typeof methods === "function") {
+    if (options?.fromWire && methods.__isPrivate) {
+      throw new Error(`Element "${descriptor.element}" is private and not callable from a client.`);
+    }
+    return methods(...descriptor.args);
+  }
   const method = methods?.[descriptor.method];
   if (typeof method !== "function") {
     throw new Error(`Method '${descriptor.method}' not found on '${descriptor.element}'`);
   }
+  if (options?.fromWire && method.__isPrivate) {
+    throw new Error(`Method "${descriptor.element}.${descriptor.method}" is private and not callable from a client.`);
+  }
   return method(...descriptor.args);
 }
 
@@ -19202,7 +19225,7 @@ var init_dist = __esm(() => {
       this.data = data;
       this.#fn = fn ?? new ArcFunction({
         params: data.params,
-        result: null,
+        results: data.results,
         queryElements: data.queryElements,
         mutationElements: data.mutationElements,
         protections: data.protections || [],
@@ -19233,7 +19256,8 @@ var init_dist = __esm(() => {
       }, newFn);
     }
     withResult(...schemas) {
-      return new ArcCommand({ ...this.data, results: schemas }, this.#fn);
+      const newFn = this.#fn.withResult(...schemas);
+      return new ArcCommand({ ...this.data, results: newFn.data.results }, newFn);
     }
     handle(handler) {
       const newFn = new ArcFunction({
@@ -19324,7 +19348,7 @@ var init_dist = __esm(() => {
       this.data = data;
       this.#fn = fn ?? new ArcFunction({
         params: null,
-        result: null,
+        results: [],
         queryElements: data.queryElements,
         mutationElements: data.mutationElements,
         protections: [],
@@ -19430,7 +19454,7 @@ var init_dist = __esm(() => {
       this.data = data;
       this.#fn = fn ?? new ArcFunction({
         params: null,
-        result: null,
+        results: [],
         queryElements: data.queryElements,
         mutationElements: data.mutationElements,
         protections: data.protections || [],
@@ -22193,10 +22217,11 @@ class ArcFunction2 {
       params: schema instanceof ArcObject2 ? schema : new ArcObject2(schema)
     });
   }
-  withResult(schema) {
+  withResult(...schemas) {
+    const results = schemas.map((s) => s instanceof ArcObject2 ? s : new ArcObject2(s));
     return new ArcFunction2({
       ...this.data,
-      result: schema instanceof ArcObject2 ? schema : new ArcObject2(schema)
+      results
     });
   }
   query(elements) {
@@ -22224,6 +22249,12 @@ class ArcFunction2 {
       description: desc
     });
   }
+  private() {
+    return new ArcFunction2({
+      ...this.data,
+      isPrivate: true
+    });
+  }
   handle(handler) {
     return new ArcFunction2({
       ...this.data,
@@ -22245,8 +22276,8 @@ class ArcFunction2 {
   get params() {
     return this.data.params;
   }
-  get result() {
-    return this.data.result;
+  get results() {
+    return this.data.results;
   }
   async verifyProtections(tokens) {
     if (!this.data.protections || this.data.protections.length === 0) {
@@ -22270,7 +22301,7 @@ class ArcFunction2 {
   toJsonSchema() {
     return {
       params: this.data.params?.toJsonSchema?.() ?? null,
-      result: this.data.result?.toJsonSchema?.() ?? null
+      results: this.data.results.map((r2) => r2.toJsonSchema())
     };
   }
 }
@@ -22627,19 +22658,26 @@ function buildContextAccessor2(context2, adapters, contextMethod, onCall) {
     if (typeof ctxFn !== "function")
       continue;
     const methods = ctxFn.call(element2, adapters);
-    if (!methods || typeof methods !== "object")
+    if (!methods)
+      continue;
+    const elementName = element2.name;
+    if (typeof methods === "function") {
+      result[elementName] = (...args) => onCall({ element: elementName, method: "", args }, () => methods(...args));
+      continue;
+    }
+    if (typeof methods !== "object")
       continue;
     const wrapped = {};
     for (const [methodName, method] of Object.entries(methods)) {
       if (typeof method !== "function")
         continue;
-      wrapped[methodName] = (...args) => onCall({ element: element2.name, method: methodName, args }, () => method(...args));
+      wrapped[methodName] = (...args) => onCall({ element: elementName, method: methodName, args }, () => method(...args));
     }
-    result[element2.name] = wrapped;
+    result[elementName] = wrapped;
   }
   return result;
 }
-function executeDescriptor2(descriptor, context2, adapters, contextMethod) {
+function executeDescriptor2(descriptor, context2, adapters, contextMethod, options) {
   const element2 = context2.get(descriptor.element);
   if (!element2) {
     throw new Error(`Element '${descriptor.element}' not found in context`);
@@ -22649,10 +22687,19 @@ function executeDescriptor2(descriptor, context2, adapters, contextMethod) {
     throw new Error(`Element '${descriptor.element}' has no ${contextMethod}`);
   }
   const methods = ctxFn.call(element2, adapters);
+  if (typeof methods === "function") {
+    if (options?.fromWire && methods.__isPrivate) {
+      throw new Error(`Element "${descriptor.element}" is private and not callable from a client.`);
+    }
+    return methods(...descriptor.args);
+  }
   const method = methods?.[descriptor.method];
   if (typeof method !== "function") {
     throw new Error(`Method '${descriptor.method}' not found on '${descriptor.element}'`);
   }
+  if (options?.fromWire && method.__isPrivate) {
+    throw new Error(`Method "${descriptor.element}.${descriptor.method}" is private and not callable from a client.`);
+  }
   return method(...descriptor.args);
 }
 
@@ -24970,7 +25017,7 @@ var init_dist2 = __esm(() => {
       this.data = data;
       this.#fn = fn ?? new ArcFunction2({
         params: data.params,
-        result: null,
+        results: data.results,
         queryElements: data.queryElements,
         mutationElements: data.mutationElements,
         protections: data.protections || [],
@@ -25001,7 +25048,8 @@ var init_dist2 = __esm(() => {
       }, newFn);
     }
     withResult(...schemas) {
-      return new ArcCommand2({ ...this.data, results: schemas }, this.#fn);
+      const newFn = this.#fn.withResult(...schemas);
+      return new ArcCommand2({ ...this.data, results: newFn.data.results }, newFn);
     }
     handle(handler) {
       const newFn = new ArcFunction2({
@@ -25092,7 +25140,7 @@ var init_dist2 = __esm(() => {
       this.data = data;
       this.#fn = fn ?? new ArcFunction2({
         params: null,
-        result: null,
+        results: [],
         queryElements: data.queryElements,
         mutationElements: data.mutationElements,
         protections: [],
@@ -25198,7 +25246,7 @@ var init_dist2 = __esm(() => {
       this.data = data;
       this.#fn = fn ?? new ArcFunction2({
         params: null,
-        result: null,
+        results: [],
         queryElements: data.queryElements,
         mutationElements: data.mutationElements,
         protections: data.protections || [],
@@ -39069,7 +39117,7 @@ class ContextHandler {
       console.log(`[ARC:Seed] Seeded ${data.length} row(s) into ${tableName}`);
     }
   }
-  async executeCommand(commandName, params, rawToken) {
+  async executeCommand(commandName, params, rawToken, options) {
     const includePayloads = this.telemetry?.shouldIncludePayloads() ?? false;
     const baseAttrs = {
       "rpc.system": "arc",
@@ -39094,6 +39142,9 @@ class ContextHandler {
       if (!command) {
         throw new Error(`Command '${commandName}' not found`);
       }
+      if (!options?.internal && command.__isPrivate) {
+        throw new Error(`Command '${commandName}' is private and not callable from a client.`);
+      }
       try {
         return await command(params);
       } catch (error) {
@@ -39701,7 +39752,7 @@ class CronScheduler {
       console.log(`[ARC:Cron] ${commandName}: executing for ${instances.length} instance(s)...`);
       for (const instance of instances) {
         try {
-          await this.contextHandler.executeCommand(commandName, { _id: instance._id }, null);
+          await this.contextHandler.executeCommand(commandName, { _id: instance._id }, null, { internal: true });
         } catch (error) {
           console.error(`[ARC:Cron] ${commandName} failed for instance ${instance._id}:`, error);
         }
@@ -40788,16 +40839,35 @@ async function startPlatform(opts) {
   } else {
     log2("No context \u2014 server endpoints skipped");
   }
-  const platform3 = await startPlatformServer({
-    ws,
-    port,
-    manifest,
-    context: context2,
-    moduleAccess,
-    dbPath,
-    devMode
-  });
-  ok(`Server on http://localhost:${port}`);
+  const MAX_PORT_ATTEMPTS = devMode ? 20 : 1;
+  let platform3 = null;
+  let actualPort = port;
+  for (let i = 0;i < MAX_PORT_ATTEMPTS; i++) {
+    try {
+      platform3 = await startPlatformServer({
+        ws,
+        port: actualPort,
+        manifest,
+        context: context2,
+        moduleAccess,
+        dbPath,
+        devMode
+      });
+      break;
+    } catch (e2) {
+      const msg = e2.message || "";
+      const inUse = msg.includes("EADDRINUSE") || msg.includes("address already in use") || msg.includes("in use");
+      if (!inUse || i === MAX_PORT_ATTEMPTS - 1)
+        throw e2;
+      log2(`Port ${actualPort} in use, trying ${actualPort + 1}...`);
+      actualPort++;
+    }
+  }
+  if (!platform3) {
+    err(`Failed to bind a free port starting from ${port}`);
+    process.exit(1);
+  }
+  ok(`Server on http://localhost:${actualPort}`);
   if (platform3.contextHandler) {
     ok("Commands, queries, WebSocket \u2014 all on same port");
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arcote.tech/arc-cli",
-  "version": "0.7.7",
+  "version": "0.7.8",
   "description": "CLI tool for Arc framework",
   "module": "index.ts",
   "main": "dist/index.js",
@@ -12,13 +12,13 @@
     "build": "bun build --target=bun ./src/index.ts --outdir=dist --external @arcote.tech/arc --external @arcote.tech/arc-ds --external @arcote.tech/arc-react --external @arcote.tech/platform --external '@opentelemetry/*' && chmod +x dist/index.js"
   },
   "dependencies": {
-    "@arcote.tech/arc": "^0.7.7",
-    "@arcote.tech/arc-ds": "^0.7.7",
-    "@arcote.tech/arc-react": "^0.7.7",
-    "@arcote.tech/arc-host": "^0.7.7",
-    "@arcote.tech/arc-adapter-db-sqlite": "^0.7.7",
-    "@arcote.tech/arc-adapter-db-postgres": "^0.7.7",
-    "@arcote.tech/arc-otel": "^0.7.7",
+    "@arcote.tech/arc": "^0.7.8",
+    "@arcote.tech/arc-ds": "^0.7.8",
+    "@arcote.tech/arc-react": "^0.7.8",
+    "@arcote.tech/arc-host": "^0.7.8",
+    "@arcote.tech/arc-adapter-db-sqlite": "^0.7.8",
+    "@arcote.tech/arc-adapter-db-postgres": "^0.7.8",
+    "@arcote.tech/arc-otel": "^0.7.8",
     "@opentelemetry/api": "^1.9.0",
     "@opentelemetry/api-logs": "^0.57.0",
     "@opentelemetry/core": "^1.30.0",
@@ -31,7 +31,7 @@
     "@opentelemetry/sdk-trace-base": "^1.30.0",
     "@opentelemetry/sdk-trace-node": "^1.30.0",
     "@opentelemetry/semantic-conventions": "^1.27.0",
-    "@arcote.tech/platform": "^0.7.7",
+    "@arcote.tech/platform": "^0.7.8",
     "@clack/prompts": "^0.9.0",
     "commander": "^11.1.0",
     "chokidar": "^3.5.3",

package/src/platform/startup.ts

@@ -74,17 +74,39 @@ export async function startPlatform(
 
   // 3. Start the platform server. Cache headers + SSE behaviour are
   // controlled inside the server by `devMode`; we just pass the flag.
-  const platform = await startPlatformServer({
-    ws,
-    port,
-    manifest,
-    context,
-    moduleAccess,
-    dbPath,
-    devMode,
-  });
+  // In dev mode, if the port is busy, try incrementing up to 20 times.
+  const MAX_PORT_ATTEMPTS = devMode ? 20 : 1;
+  let platform: PlatformServer | null = null;
+  let actualPort = port;
+  for (let i = 0; i < MAX_PORT_ATTEMPTS; i++) {
+    try {
+      platform = await startPlatformServer({
+        ws,
+        port: actualPort,
+        manifest,
+        context,
+        moduleAccess,
+        dbPath,
+        devMode,
+      });
+      break;
+    } catch (e) {
+      const msg = (e as Error).message || "";
+      const inUse =
+        msg.includes("EADDRINUSE") ||
+        msg.includes("address already in use") ||
+        msg.includes("in use");
+      if (!inUse || i === MAX_PORT_ATTEMPTS - 1) throw e;
+      log(`Port ${actualPort} in use, trying ${actualPort + 1}...`);
+      actualPort++;
+    }
+  }
+  if (!platform) {
+    err(`Failed to bind a free port starting from ${port}`);
+    process.exit(1);
+  }
 
-  ok(`Server on http://localhost:${port}`);
+  ok(`Server on http://localhost:${actualPort}`);
   if (platform.contextHandler) {
     ok("Commands, queries, WebSocket — all on same port");
   }