@yoooclaw/phone-notifications 1.11.9 → 1.11.12

package/dist/index.cjs

@@ -5574,7 +5574,7 @@ function readBuildInjectedVersion() {
   if (false) {
     return void 0;
   }
-  const version = "1.11.9".trim();
+  const version = "1.11.12".trim();
   return version || void 0;
 }
 function readPluginVersionFromPackageJson() {
@@ -12985,20 +12985,14 @@ async function handleHttpRequest(opts, frame) {
   const mappedPath = mapPath(frame.path);
   const url = new URL(mappedPath, opts.gatewayBaseUrl);
   const startedAtMs = Date.now();
-  const trustedProxyHeader = opts.gatewayTrustedProxyHeader?.trim();
-  const trustedProxyUser = opts.gatewayTrustedProxyUser?.trim();
-  const trustedProxyHeaderLower = trustedProxyHeader?.toLowerCase();
   const localHeaders = {};
   for (const [k, v] of Object.entries(frame.headers ?? {})) {
     const lower = k.toLowerCase();
-    if (lower === "authorization" || lower === "x-openclaw-password") continue;
-    if (trustedProxyHeaderLower && lower === trustedProxyHeaderLower) continue;
-    localHeaders[k] = v;
+    if (lower !== "authorization" && lower !== "x-openclaw-password") {
+      localHeaders[k] = v;
+    }
   }
   localHeaders[RELAY_INTERNAL_HTTP_HEADER] = "1";
-  if (trustedProxyHeader && trustedProxyUser) {
-    localHeaders[trustedProxyHeader] = trustedProxyUser;
-  }
   const authAttempts = buildLocalGatewayAuthAttempts(opts, localHeaders);
   opts.logger.info(
     `TunnelProxy: HTTP id=${frame.id} ${frame.method} ${frame.path} \u2192 ${url.toString()}${summarizeRequestHeaders(frame.headers)}, authAttempts=${authAttempts.map((a) => a.label).join(" -> ")}, body=${previewText2(frame.body)}`
@@ -13443,16 +13437,6 @@ var TunnelProxy = class {
       `TunnelProxy: cleared stale stored device token after gateway mismatch (deviceId=${this.deviceIdentity.deviceId})`
     );
   }
-  /**
-   * 当 Gateway 处于 trusted-proxy 模式时，构造注入到本地连接的 user header。
-   * 其他模式或参数未配齐时返回 undefined，本地用户保持原握手路径不受影响。
-   */
-  buildTrustedProxyHeaders() {
-    const headerName = this.opts.gatewayTrustedProxyHeader?.trim();
-    const headerValue = this.opts.gatewayTrustedProxyUser?.trim();
-    if (!headerName || !headerValue) return void 0;
-    return { [headerName]: headerValue };
-  }
   async maybeAutoApproveGatewayPairing(frame) {
     const errorCode = typeof frame?.error?.code === "string" ? frame.error.code : void 0;
     const detailsCode = typeof frame?.error?.details?.code === "string" ? frame.error.details.code : void 0;
@@ -13623,12 +13607,10 @@ var TunnelProxy = class {
     this.gatewayWsConnecting = true;
     this.gatewayWsReady = false;
     const wsUrl = this.opts.gatewayBaseUrl.replace(/^http/, "ws");
-    const trustedProxyHeaders = this.buildTrustedProxyHeaders();
-    const trustedProxyHint = trustedProxyHeaders ? `, trustedProxyHeader=${Object.keys(trustedProxyHeaders)[0]}` : "";
     this.opts.logger.info(
-      `TunnelProxy: RPC WS connecting to gateway ${wsUrl} (pending=${this.gatewayWsPending.length}${trustedProxyHint})`
+      `TunnelProxy: RPC WS connecting to gateway ${wsUrl} (pending=${this.gatewayWsPending.length})`
     );
-    const ws = trustedProxyHeaders ? new wrapper_default(wsUrl, { headers: trustedProxyHeaders }) : new wrapper_default(wsUrl);
+    const ws = new wrapper_default(wsUrl);
     ws.on("open", () => {
       this.gatewayWs = ws;
       this.opts.logger.info(
@@ -13961,8 +13943,6 @@ function createTunnelService(opts) {
           gatewayAuthMode: opts.gatewayAuthMode,
           gatewayToken: opts.gatewayToken,
           gatewayPassword: opts.gatewayPassword,
-          gatewayTrustedProxyHeader: opts.gatewayTrustedProxyHeader,
-          gatewayTrustedProxyUser: opts.gatewayTrustedProxyUser,
           client,
           logger
         });
@@ -14075,14 +14055,9 @@ function readHostGatewayConfig(params) {
   }
   return configData;
 }
-var DEFAULT_TRUSTED_PROXY_HEADER = "x-forwarded-user";
-var DEFAULT_TRUSTED_PROXY_USER = "openclaw";
 function resolveLocalGatewayAuth(params) {
   const envGatewayToken = trimToUndefined2(process.env.OPENCLAW_GATEWAY_TOKEN) ?? trimToUndefined2(process.env.QCLAW_GATEWAY_TOKEN);
   const envGatewayPassword = trimToUndefined2(process.env.OPENCLAW_GATEWAY_PASSWORD) ?? trimToUndefined2(process.env.QCLAW_GATEWAY_PASSWORD);
-  const envTrustedProxyUser = trimToUndefined2(
-    process.env.OPENCLAW_GATEWAY_TRUSTED_PROXY_USER
-  );
   const configData = readHostGatewayConfig(params);
   let configGatewayAuthMode;
   const rawGatewayAuthMode = trimToUndefined2(configData?.gateway?.auth?.mode);
@@ -14091,18 +14066,10 @@ function resolveLocalGatewayAuth(params) {
   }
   const configGatewayToken = trimToUndefined2(configData?.gateway?.auth?.token);
   const configGatewayPassword = trimToUndefined2(configData?.gateway?.auth?.password);
-  let gatewayTrustedProxyHeader;
-  let gatewayTrustedProxyUser;
-  if (rawGatewayAuthMode === "trusted-proxy") {
-    gatewayTrustedProxyHeader = trimToUndefined2(configData?.gateway?.auth?.trustedProxy?.userHeader) ?? DEFAULT_TRUSTED_PROXY_HEADER;
-    gatewayTrustedProxyUser = envTrustedProxyUser ?? DEFAULT_TRUSTED_PROXY_USER;
-  }
   return {
     gatewayAuthMode: configGatewayAuthMode,
     gatewayToken: envGatewayToken ?? configGatewayToken,
-    gatewayPassword: envGatewayPassword ?? configGatewayPassword,
-    gatewayTrustedProxyHeader,
-    gatewayTrustedProxyUser
+    gatewayPassword: envGatewayPassword ?? configGatewayPassword
   };
 }
 function resolveExclusiveTunnelHint(params) {
@@ -14151,21 +14118,10 @@ function registerRelayTunnelLifecycle(deps) {
     return null;
   }
   const gatewayPort = process.env.OPENCLAW_GATEWAY_PORT ?? process.env.QCLAW_GATEWAY_PORT ?? "18789";
-  const {
-    gatewayAuthMode,
-    gatewayToken,
-    gatewayPassword,
-    gatewayTrustedProxyHeader,
-    gatewayTrustedProxyUser
-  } = resolveLocalGatewayAuth({
+  const { gatewayAuthMode, gatewayToken, gatewayPassword } = resolveLocalGatewayAuth({
     stateDir: openclawDir,
     logger
   });
-  if (gatewayTrustedProxyHeader && gatewayTrustedProxyUser) {
-    logger.info(
-      `Relay tunnel: gateway in trusted-proxy mode, will inject ${gatewayTrustedProxyHeader} header on local connections`
-    );
-  }
   const tunnelService = createTunnelService({
     tunnelUrl,
     heartbeatSec: config.relay?.heartbeatSec,
@@ -14174,8 +14130,6 @@ function registerRelayTunnelLifecycle(deps) {
     gatewayAuthMode,
     gatewayToken,
     gatewayPassword,
-    gatewayTrustedProxyHeader,
-    gatewayTrustedProxyUser,
     logger
   });
   api.registerService(tunnelService);