@mearl/cloud-server 2.22.0 → 3.0.0-beta.0

package/LICENSE

@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

package/README.md

@@ -78,6 +78,10 @@ mearl-cloud-server --foreground
     npx @mearl/cloud-connector start "ws://10.0.1.100:8080/ws?token=xxx"
 ```
 
+部署在反向代理或沙箱中时，由部署宿主或 preset 安装器通过 `MEARL_CLOUD_PUBLIC_URL` 提供外部入口，可使用 `{port}` 占位符。核心不探测组织专属沙箱变量或内部端口映射接口；相关自动发现由独立能力包处理。当前阶段尚未接通这些内部适配，内部产品仍保留原实现。
+
+普通入口的连接命令保持双引号参数形式。外部路径含 `$` 等 shell 元字符时，输出命令使用 POSIX 字面量引用；这类命令在 POSIX 兼容终端执行，其他终端应将完整 publicUrl 作为一个字面量参数传给 `start`。
+
 运行时文件位于 `~/.mearl/`：
 
 - `cloud-server.json` - 连接配置（含 server URL、pid、端口等），统一 `@mearl/client` 自动读取
@@ -95,13 +99,7 @@ mearl-cloud-server --foreground
 
 - `MEARL_TOKEN` - 鉴权密钥（覆盖 --token 选项）
 - `CLOUD_SERVER_HOST` - 公网主机名（默认自动获取）
-- `OPENSANDBOX_ID` - 非空时启用 OpenSandbox 环境自适应
-- `AONE_SANDBOX_ENDPOINT_TEMPLATE` - OpenSandbox 注入的入口模板；必须包含 `{port}`，server 会用 connector 端口替换并生成 `wss://` 连接地址
-
-OpenSandbox 中 connector listener 会绑定 `0.0.0.0`，公开地址以平台注入的 endpoint
-template 为准，不会从容器 hostname 推导路由前缀。
-OpenSandbox 与通过 `AONE_SANDBOX_ID` 及本地端口映射接口识别的 AONE Sandbox
-是两种独立环境，server 会分别选择对应的入口解析方式。
+- `MEARL_CLOUD_PUBLIC_URL` - 明确配置的外部入口，支持 `{port}` 占位符；有显式路径和查询参数时保留，根路径使用 `path` 选项，鉴权 token 由 Server 设置。HTTP/WS 入口生成 `ws://`，HTTPS/WSS 入口生成 `wss://`。
 
 ### 编程方式
 

package/dist/chunks/{chunk-33X2BGX5.js → chunk-LXICEBLN.js}

@@ -14,23 +14,21 @@ var CONFIG_FILE = join(CONFIG_DIR, "cloud-server.json");
 var MODE_FILE = join(CONFIG_DIR, "cloud-server-mode.json");
 var LOG_FILE = join(CONFIG_DIR, "cloud-server.log");
 
-// src/sandbox.ts
-var PORT_PLACEHOLDER = "{port}";
-function resolveOpenSandboxEndpoint(port, env = process.env) {
-  if (!env.OPENSANDBOX_ID?.trim()) return null;
-  const template = env.AONE_SANDBOX_ENDPOINT_TEMPLATE?.trim();
-  if (!template?.includes(PORT_PLACEHOLDER)) return null;
-  const rendered = template.replaceAll(PORT_PLACEHOLDER, String(port));
+// src/publicEndpoint.ts
+function resolveCloudPublicEndpoint(port, env = process.env) {
+  const template = env.MEARL_CLOUD_PUBLIC_URL?.trim();
+  if (!template) return null;
+  const rendered = template.replaceAll("{port}", String(port));
   const endpoint = /^[a-z][a-z\d+.-]*:\/\//i.test(rendered) ? rendered : `https://${rendered}`;
-  try {
-    const parsed = new URL(endpoint);
-    if (!["http:", "https:", "ws:", "wss:"].includes(parsed.protocol) || !parsed.hostname) {
-      return null;
-    }
-    return parsed.toString();
-  } catch {
-    return null;
+  const parsed = new URL(endpoint);
+  if (!["http:", "https:", "ws:", "wss:"].includes(parsed.protocol) || !parsed.hostname || parsed.username || parsed.password || parsed.hash) {
+    throw new Error("MEARL_CLOUD_PUBLIC_URL requires an HTTP(S) or WebSocket URL without embedded credentials or a fragment");
   }
+  return parsed.toString();
+}
+function formatConnectorCommand(url) {
+  const argument = /[$`"\\\r\n]/.test(url) ? "'" + url.replaceAll("'", "'\\''") + "'" : `"${url}"`;
+  return `npx @mearl/cloud-connector start ${argument}`;
 }
 
 // src/index.ts
@@ -85,23 +83,18 @@ var CloudServer = class {
     return randomBytes(24).toString("base64url");
   }
   async start() {
+    const ingressUrl = resolveCloudPublicEndpoint(this.options.port);
     const token = this.getToken();
     await this.createListener(this.options.agentPort, "127.0.0.1", true);
     await this.createListener(this.options.port, "0.0.0.0", false);
     const localWsUrl = `ws://localhost:${this.options.agentPort}${this.options.path}?token=${token}`;
     let publicWsUrl;
-    const sandboxUrl = await this.getSandboxPublicUrl(this.options.port);
-    if (sandboxUrl) {
-      try {
-        const parsedUrl = new URL(sandboxUrl);
-        parsedUrl.protocol = "wss:";
-        parsedUrl.pathname = this.options.path;
-        parsedUrl.search = `?token=${token}`;
-        publicWsUrl = parsedUrl.toString();
-      } catch {
-        const httpsUrl = sandboxUrl.replace("https://", "wss://");
-        publicWsUrl = `${httpsUrl}${this.options.path}?token=${token}`;
-      }
+    if (ingressUrl) {
+      const parsedUrl = new URL(ingressUrl);
+      parsedUrl.protocol = ["http:", "ws:"].includes(parsedUrl.protocol) ? "ws:" : "wss:";
+      if (parsedUrl.pathname === "/") parsedUrl.pathname = this.options.path;
+      parsedUrl.searchParams.set("token", token);
+      publicWsUrl = parsedUrl.toString();
     } else {
       const publicHost = process.env.CLOUD_SERVER_HOST || this.getPublicIP();
       publicWsUrl = `ws://${publicHost}:${this.options.port}${this.options.path}?token=${token}`;
@@ -111,7 +104,7 @@ var CloudServer = class {
         "[CloudServer] Connector traffic is using unencrypted ws://. Use a TLS-terminating proxy and wss:// when the connection crosses a trusted network."
       );
     }
-    const connectorCommand = `npx @mearl/cloud-connector start "${publicWsUrl}"`;
+    const connectorCommand = formatConnectorCommand(publicWsUrl);
     console.log(
       `[CloudServer] Connector listener on 0.0.0.0:${this.options.port} (network); agent listener on 127.0.0.1:${this.options.agentPort} (local only)`
     );
@@ -504,37 +497,6 @@ var CloudServer = class {
     }
     return "localhost";
   }
-  async getSandboxPublicUrl(port) {
-    if (process.env.OPENSANDBOX_ID?.trim()) {
-      const endpoint = resolveOpenSandboxEndpoint(port);
-      if (!endpoint) {
-        console.warn(
-          "[CloudServer] OpenSandbox detected, but AONE_SANDBOX_ENDPOINT_TEMPLATE is missing, invalid, or does not contain {port}."
-        );
-      }
-      return endpoint;
-    }
-    if (!process.env.AONE_SANDBOX_ID) {
-      return null;
-    }
-    const mappingApiUrl = "http://localhost:58596/api/port-mapping";
-    try {
-      const response = await fetch(`${mappingApiUrl}?port=${port}`);
-      if (!response.ok) {
-        return null;
-      }
-      const data = await response.json();
-      if (data.success && data.url) {
-        return data.url;
-      }
-    } catch (error) {
-      console.error(
-        `[CloudServer] Failed to query sandbox port mapping:`,
-        error instanceof Error ? error.message : String(error)
-      );
-    }
-    return null;
-  }
   writeConfigFile(info) {
     try {
       const config = { server: info.localUrl, ...info };
@@ -566,5 +528,6 @@ export {
   CONFIG_FILE,
   MODE_FILE,
   LOG_FILE,
+  formatConnectorCommand,
   CloudServer
 };

package/dist/cli.js

@@ -3,8 +3,9 @@ import {
   CONFIG_FILE,
   CloudServer,
   LOG_FILE,
-  MODE_FILE
-} from "./chunks/chunk-33X2BGX5.js";
+  MODE_FILE,
+  formatConnectorCommand
+} from "./chunks/chunk-LXICEBLN.js";
 
 // src/cli.ts
 import { Command, CommanderError, InvalidArgumentError } from "commander";
@@ -17,7 +18,7 @@ function formatConnectInfo(record) {
   const config = record;
   const lines = [];
   if (config.port) lines.push(`  port:       ${config.port}`);
-  const command = config.publicUrl ? `npx @mearl/cloud-connector start "${config.publicUrl}"` : config.connectorCommand;
+  const command = config.publicUrl ? formatConnectorCommand(config.publicUrl) : config.connectorCommand;
   if (command) {
     lines.push("");
     lines.push("  Connect from your local machine:");
@@ -176,7 +177,7 @@ async function runQoderCloudServerCommand(command, dependencies) {
 }
 
 // src/cli.ts
-var CLOUD_SERVER_VERSION = true ? "2.22.0" : "unknown";
+var CLOUD_SERVER_VERSION = true ? "3.0.0-beta.0" : "unknown";
 var COMMANDS = ["start", "stop", "restart", "status", "logs"];
 var START_OPTION_NAMES = /* @__PURE__ */ new Set([
   "foreground",

package/dist/index.d.ts

@@ -59,7 +59,6 @@ export declare class CloudServer {
     private rejectPendingForWs;
     private startHeartbeatCheck;
     private getPublicIP;
-    private getSandboxPublicUrl;
     private writeConfigFile;
     getStats(): {
         connections: number;

package/dist/index.js

@@ -1,6 +1,6 @@
 import {
   CloudServer
-} from "./chunks/chunk-33X2BGX5.js";
+} from "./chunks/chunk-LXICEBLN.js";
 export {
   CloudServer
 };

package/dist/publicEndpoint.d.ts

@@ -0,0 +1,4 @@
+/** Explicit ingress configuration supplied by the deployment host or preset installer. */
+export declare function resolveCloudPublicEndpoint(port: number, env?: NodeJS.ProcessEnv): string | null;
+/** Keep ordinary commands portable; shell-active paths use literal POSIX quoting. */
+export declare function formatConnectorCommand(url: string): string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mearl/cloud-server",
-  "version": "2.22.0",
+  "version": "3.0.0-beta.0",
   "description": "Cloud WebSocket server for Mearl — bridges cloud agents to local connectors",
   "type": "module",
   "engines": {
@@ -28,21 +28,21 @@
     "cloud-server",
     "websocket"
   ],
-  "license": "ISC",
+  "license": "Apache-2.0",
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
   },
   "dependencies": {
     "commander": "^15.0.0",
     "ws": "^8.18.0",
-    "@mearl/client": "2.22.0",
-    "@mearl/cloud-types": "2.22.0",
-    "@mearl/daemon-core": "2.22.0"
+    "@mearl/client": "3.0.0-beta.0",
+    "@mearl/cloud-types": "3.0.0-beta.0",
+    "@mearl/daemon-core": "3.0.0-beta.0"
   },
   "devDependencies": {
     "@types/node": "^24.9.1",
     "@types/ws": "^8.5.13",
-    "esbuild": "^0.25.2",
+    "esbuild": "^0.28.2",
     "typescript": "^5.8.3"
   },
   "scripts": {

package/dist/sandbox.d.ts

@@ -1,6 +0,0 @@
-/**
- * Resolve the ingress endpoint injected into an OpenSandbox environment.
- * The template is authoritative because its routing prefix cannot be derived
- * from the container hostname.
- */
-export declare function resolveOpenSandboxEndpoint(port: number, env?: NodeJS.ProcessEnv): string | null;