@microbt/environment 1.2.12 → 1.2.14

package/dist/esm/business-host.d.ts

@@ -0,0 +1,5 @@
+export declare const SUPPORTED_DOMAINS: string[];
+export declare function getBusinessHost(): string;
+export declare function getBusinessHostname(): string;
+export declare function getBusinessOrigin(): string;
+export declare function isOriginalHostInjected(): boolean;

package/dist/esm/business-host.js

@@ -0,0 +1,90 @@
+// src/business-host.ts
+var SUPPORTED_DOMAINS = [
+  "superacme.com",
+  "eu-cinmoore.com",
+  "cinmoore.com",
+  "cinmoore.cn",
+  "safio365.com",
+  "sensforge.com",
+  "fronai.cn",
+  "superacmeglobal.com",
+  "cinvue.com",
+  "0.0.0.0",
+  "127.0.0.1",
+  "localhost"
+];
+var ORIGINAL_HOST_REGEX = /(?:^|[\s;(])originalHost\s*:\s*([^;\s)]+)/i;
+var HOST_PATTERN = /^(?:[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?(?::\d{1,5})?$/i;
+function getLocationHost() {
+  if (typeof location === "undefined") {
+    throw new Error("location is not defined");
+  }
+  return location.host;
+}
+function getUserAgent() {
+  if (typeof navigator === "undefined") {
+    return "";
+  }
+  return navigator.userAgent || "";
+}
+function getHostnameFromHost(host) {
+  return host.replace(/:\d+$/, "");
+}
+function isSupportedDomain(hostname) {
+  const normalizedHostname = hostname.toLowerCase();
+  return SUPPORTED_DOMAINS.some(
+    (domain) => normalizedHostname === domain || normalizedHostname.endsWith(`.${domain}`)
+  );
+}
+function normalizeOriginalHost(rawHost) {
+  const host = rawHost == null ? void 0 : rawHost.trim().toLowerCase();
+  if (!host || !HOST_PATTERN.test(host)) {
+    return void 0;
+  }
+  const portMatch = host.match(/:(\d+)$/);
+  if (portMatch) {
+    const port = Number(portMatch[1]);
+    if (port < 1 || port > 65535) {
+      return void 0;
+    }
+  }
+  const hostname = getHostnameFromHost(host);
+  if (!isSupportedDomain(hostname)) {
+    return void 0;
+  }
+  return host;
+}
+function resolveOriginalHost() {
+  const match = getUserAgent().match(ORIGINAL_HOST_REGEX);
+  return normalizeOriginalHost(match == null ? void 0 : match[1]);
+}
+function getBusinessHost() {
+  var _a;
+  return (_a = resolveOriginalHost()) != null ? _a : getLocationHost();
+}
+function getBusinessHostname() {
+  return getHostnameFromHost(getBusinessHost());
+}
+function getBusinessOrigin() {
+  const originalHost = resolveOriginalHost();
+  if (originalHost) {
+    return `https://${originalHost}`;
+  }
+  if (typeof location === "undefined") {
+    throw new Error("location is not defined");
+  }
+  if (location.origin) {
+    return location.origin;
+  }
+  return `${location.protocol}//${location.host}`;
+}
+function isOriginalHostInjected() {
+  return Boolean(resolveOriginalHost());
+}
+export {
+  SUPPORTED_DOMAINS,
+  getBusinessHost,
+  getBusinessHostname,
+  getBusinessOrigin,
+  isOriginalHostInjected
+};

package/dist/esm/cookie.js

@@ -1,4 +1,5 @@
 // src/cookie.ts
+import { getBusinessHostname } from "./business-host";
 var COOKIE_REGEX = (name) => new RegExp("(^| )" + name.replace(/[.*+?^${}()|[\]\\]/g, "\\$&") + "=([^;]*)");
 function getCookie(name) {
   try {
@@ -12,7 +13,7 @@ function getCookie(name) {
   }
 }
 function getRUID() {
-  return getCookie(`RUID_${location.hostname}`);
+  return getCookie(`RUID_${getBusinessHostname()}`);
 }
 export {
   getCookie,

package/dist/esm/environment/index.d.ts

@@ -1,4 +1,5 @@
-export declare const SUPPORTED_DOMAINS: string[];
+import { SUPPORTED_DOMAINS } from '../business-host';
+export { SUPPORTED_DOMAINS };
 export declare function environment(): string;
 export declare function region(): string;
 export declare function isAWSDomain(): boolean;

package/dist/esm/environment/index.js

@@ -1,25 +1,10 @@
 // src/environment/index.ts
+import { getBusinessHost, SUPPORTED_DOMAINS } from "../business-host";
 import { EnvironmentStrategyFactory } from "./factory";
-var SUPPORTED_DOMAINS = [
-  "superacme.com",
-  "eu-cinmoore.com",
-  "cinmoore.com",
-  "cinmoore.cn",
-  "safio365.com",
-  "sensforge.com",
-  "fronai.cn",
-  "superacmeglobal.com",
-  "cinvue.com",
-  "0.0.0.0",
-  "127.0.0.1",
-  "localhost"
-];
 function getCurrentDomain() {
-  if (typeof location === "undefined") {
-    throw new Error("location is not defined");
-  }
-  const host = location.host;
-  const domain = SUPPORTED_DOMAINS.find((d) => host.endsWith(d));
+  const host = getBusinessHost();
+  const hostname = host.replace(/:\d+$/, "").toLowerCase();
+  const domain = SUPPORTED_DOMAINS.find((d) => hostname === d || hostname.endsWith(`.${d}`));
   if (!domain) {
     throw new Error(`Unsupported domain: ${host}`);
   }
@@ -27,9 +12,10 @@ function getCurrentDomain() {
 }
 function environment() {
   try {
+    const host = getBusinessHost();
     const domain = getCurrentDomain();
     const strategy = EnvironmentStrategyFactory.getStrategy(domain);
-    return strategy.getEnvironment(location.host);
+    return strategy.getEnvironment(host);
   } catch (error) {
     console.warn("Failed to determine environment:", error);
     return "unknown";
@@ -37,9 +23,10 @@ function environment() {
 }
 function region() {
   try {
+    const host = getBusinessHost();
     const domain = getCurrentDomain();
     const strategy = EnvironmentStrategyFactory.getStrategy(domain);
-    return strategy.getRegion(location.host);
+    return strategy.getRegion(host);
   } catch (error) {
     console.warn("Failed to determine region:", error);
     return "unknown";
@@ -47,9 +34,10 @@ function region() {
 }
 function isAWSDomain() {
   try {
+    const host = getBusinessHost();
     const domain = getCurrentDomain();
     const strategy = EnvironmentStrategyFactory.getStrategy(domain);
-    return strategy.isAWS(location.host);
+    return strategy.isAWS(host);
   } catch (error) {
     console.warn("Failed to determine AWS domain:", error);
     return false;

package/dist/esm/gateway/index.js

@@ -1,9 +1,13 @@
 // src/gateway/index.ts
-import { environment, isAWSDomain, region, SUPPORTED_DOMAINS } from "../environment/index";
+import { getBusinessHost, SUPPORTED_DOMAINS } from "../business-host";
+import { environment, isAWSDomain, region } from "../environment/index";
 import { URLStrategyFactory } from "./factory";
 function getCurrentDomain() {
-  const host = location.host;
-  const domain = SUPPORTED_DOMAINS.find((domain2) => host.endsWith(domain2));
+  const host = getBusinessHost();
+  const hostname = host.replace(/:\d+$/, "").toLowerCase();
+  const domain = SUPPORTED_DOMAINS.find(
+    (domain2) => hostname === domain2 || hostname.endsWith(`.${domain2}`)
+  );
   if (!domain) {
     throw new Error(`Unsupported domain: ${host}`);
   }

package/dist/esm/global.d.ts

@@ -15,6 +15,10 @@ declare global {
         iOS_Native_InjectJavascript: {
           postMessage: (p: null) => void;
         };
+        // native 可随时 removeScriptMessageHandler 摘除，声明为可选
+        iOS_Native_FlushMessageQueue?: {
+          postMessage: (p: null) => void;
+        };
       };
     };
     __bl?: {

package/dist/esm/hybrid.js

@@ -1,43 +1,84 @@
 // src/hybrid.ts
+import { arms } from "./arms";
 import Logger from "./logger";
 import { iOSWebview } from "./platform";
 var queue = [];
-document.addEventListener("WebViewJavascriptBridgeReady", () => {
-  queue.forEach(({ method, params, callback }) => {
-    if (window.SuperAcme && typeof window.SuperAcme.call === "function") {
-      window.SuperAcme.call(method, params, callback);
-    }
-  });
-  queue.length = 0;
+var isFlushMessageQueueAvailable = () => {
+  var _a, _b, _c;
+  if (!iOSWebview) {
+    return true;
+  }
+  const postMessage = (_c = (_b = (_a = window.webkit) == null ? void 0 : _a.messageHandlers) == null ? void 0 : _b.iOS_Native_FlushMessageQueue) == null ? void 0 : _c.postMessage;
+  return typeof postMessage === "function";
+};
+var hasReportedMissingHandler = false;
+var reportMissingHandlerOnce = () => {
+  if (hasReportedMissingHandler) {
+    return;
+  }
+  hasReportedMissingHandler = true;
+  Logger.warn("iOS_Native_FlushMessageQueue unavailable, bridge call rejected");
+  arms.sum("BRIDGE_FLUSH_QUEUE_MISSING");
+};
+var buildErrorResponse = (code, method, params, message, stack) => JSON.stringify({
+  success: false,
+  error: {
+    code,
+    message,
+    method,
+    params,
+    stack,
+    timestamp: (/* @__PURE__ */ new Date()).toISOString()
+  }
 });
-function bridgeCall(method, params, callback) {
+var invokeBridge = (method, params, callback) => {
   var _a;
-  if (method === "log") {
-    Logger.debug("bridgeCall", method, params);
-  } else {
-    Logger.info("bridgeCall", method, params);
-  }
   try {
     if (((_a = window.SuperAcme) == null ? void 0 : _a.call) && typeof window.SuperAcme.call === "function") {
+      if (!isFlushMessageQueueAvailable()) {
+        reportMissingHandlerOnce();
+        callback(
+          buildErrorResponse(
+            "BRIDGE_FLUSH_QUEUE_MISSING",
+            method,
+            params,
+            "iOS_Native_FlushMessageQueue is unavailable"
+          )
+        );
+        return;
+      }
       window.SuperAcme.call(method, params, callback);
     } else {
       queue.push({ method, params, callback });
     }
   } catch (error) {
     Logger.error("bridgeCall failed:", error);
-    const errorResponse = {
-      success: false,
-      error: {
-        code: "BRIDGE_CALL_ERROR",
-        message: error instanceof Error ? error.message : String(error),
+    callback(
+      buildErrorResponse(
+        "BRIDGE_CALL_ERROR",
         method,
         params,
-        stack: error instanceof Error ? error.stack : void 0,
-        timestamp: (/* @__PURE__ */ new Date()).toISOString()
-      }
-    };
-    callback(JSON.stringify(errorResponse));
+        error instanceof Error ? error.message : String(error),
+        error instanceof Error ? error.stack : void 0
+      )
+    );
+  }
+};
+document.addEventListener("WebViewJavascriptBridgeReady", () => {
+  queue.forEach(({ method, params, callback }) => {
+    if (window.SuperAcme && typeof window.SuperAcme.call === "function") {
+      invokeBridge(method, params, callback);
+    }
+  });
+  queue.length = 0;
+});
+function bridgeCall(method, params, callback) {
+  if (method === "log") {
+    Logger.debug("bridgeCall", method, params);
+  } else {
+    Logger.info("bridgeCall", method, params);
   }
+  invokeBridge(method, params, callback);
 }
 function bridgeBootstrap() {
   function bootstrap(callback) {

package/dist/esm/index.d.ts

@@ -1,4 +1,5 @@
 export * from './arms';
+export * from './business-host';
 export * from './cookie';
 export * from './environment/index';
 export * from './gateway/index';

package/dist/esm/index.js

@@ -1,5 +1,6 @@
 // src/index.ts
 export * from "./arms";
+export * from "./business-host";
 export * from "./cookie";
 export * from "./environment/index";
 export * from "./gateway/index";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@microbt/environment",
-  "version": "1.2.12",
+  "version": "1.2.14",
   "description": "microbt app library for environment",
   "keywords": [],
   "license": "MIT",