@gct-paas/core 6.0.0-dev.36 → 6.0.0-dev.38

package/dist/{redirect-index-BslisRYH.js → redirect-index-Ch1652Mu.js}

@@ -1,2 +1,2 @@
-/*! @gct-paas/core v6.0.0-dev.36 */
+/*! @gct-paas/core v6.0.0-dev.37 */
 import{createElementBlock as e,defineComponent as r,openBlock as t,unref as a}from"vue";import{useRouter as p}from"vue-router";var o=/* @__PURE__ */r({__name:"redirect-index",setup(r){const{currentRoute:o,replace:i}=p(),{params:s,query:u}=a(o),{path:m,_redirect_type:n="path"}=s;Reflect.deleteProperty(s,"_redirect_type"),Reflect.deleteProperty(s,"path");const c=Array.isArray(m)?m.join("/"):m;return i("name"===n?{name:c,query:u,params:JSON.parse(s._origin_params??"{}")}:{path:c.startsWith("/")?c:"/"+c,query:u}),(r,a)=>(t(),e("div"))}});export{o as default};

package/es/modules/mqtt/mqtt-manager.d.ts

@@ -12,10 +12,10 @@ import { IMqttClient, IMqttConnectOptions, IMqttManager } from './interfaces/i-m
  *
  * // 创建一个 MQTT 客户端实例
  * const client = manager.create('device-001', {
- *   brokerUrl: 'ws://localhost:8083/mqtt',
  *   username: 'admin',
  *   password: 'password',
  * });
+ * // 默认连接地址随页面协议自动切换：HTTP 使用 ws，HTTPS 使用 wss。
  *
  * // 连接
  * client.connect();

package/es/modules/mqtt/mqtt-manager.mjs

@@ -1,5 +1,6 @@
 import { DEFAULT_MQTT_INSTANCE_ID } from "./enums/mqtt-status.enum.mjs";
 import { MqttClient } from "./mqtt-client.mjs";
+import { getMqttBrokerUrl } from "./utils/mqtt-broker-url.util.mjs";
 import { createUUID } from "qx-util";
 //#region src/modules/mqtt/mqtt-manager.ts
 /**
@@ -15,10 +16,10 @@ import { createUUID } from "qx-util";
 *
 * // 创建一个 MQTT 客户端实例
 * const client = manager.create('device-001', {
-*   brokerUrl: 'ws://localhost:8083/mqtt',
 *   username: 'admin',
 *   password: 'password',
 * });
+* // 默认连接地址随页面协议自动切换：HTTP 使用 ws，HTTPS 使用 wss。
 *
 * // 连接
 * client.connect();
@@ -64,7 +65,7 @@ var MqttManager = class {
 			console.warn(`MqttManager: 实例 ${instanceId} 已存在，返回已注册的实例`);
 			return this._clients.get(instanceId);
 		}
-		const client = new MqttClient(instanceId, `ws://${location.host}/mqtt`, {
+		const client = new MqttClient(instanceId, getMqttBrokerUrl(location.protocol, location.host), {
 			clientId: `gct_mqtt_${_gct.store.userInfo.userId}_${instanceId}_${this.uuid}`,
 			...options
 		});

package/es/modules/mqtt/utils/mqtt-broker-url.util.d.ts

@@ -0,0 +1,6 @@
+/**
+ * 根据页面地址生成 MQTT WebSocket 连接地址。
+ *
+ * HTTPS 页面必须使用 WSS，避免浏览器因 Mixed Content 拦截 MQTT 连接。
+ */
+export declare function getMqttBrokerUrl(protocol: string, host: string): string;

package/es/modules/mqtt/utils/mqtt-broker-url.util.mjs

@@ -0,0 +1,11 @@
+//#region src/modules/mqtt/utils/mqtt-broker-url.util.ts
+/**
+* 根据页面地址生成 MQTT WebSocket 连接地址。
+*
+* HTTPS 页面必须使用 WSS，避免浏览器因 Mixed Content 拦截 MQTT 连接。
+*/
+function getMqttBrokerUrl(protocol, host) {
+	return `${protocol === "https:" ? "wss:" : "ws:"}//${host}/mqtt`;
+}
+//#endregion
+export { getMqttBrokerUrl };

package/es/modules/user-stores/store/user.store.d.ts

@@ -23,6 +23,7 @@ export declare const useUserStore: import('pinia').StoreDefinition<"user", UserS
             gender?: number | undefined;
             globalSuperAdmin?: number | undefined;
             ip?: string | undefined;
+            kickOut?: boolean | undefined;
             match?: boolean | undefined;
             minioDomain?: string | undefined;
             mobile?: string | undefined;
@@ -95,6 +96,7 @@ export declare const useUserStore: import('pinia').StoreDefinition<"user", UserS
         gender?: number | undefined;
         globalSuperAdmin?: number | undefined;
         ip?: string | undefined;
+        kickOut?: boolean | undefined;
         match?: boolean | undefined;
         minioDomain?: string | undefined;
         mobile?: string | undefined;
@@ -164,6 +166,7 @@ export declare const useUserStore: import('pinia').StoreDefinition<"user", UserS
             gender?: number | undefined;
             globalSuperAdmin?: number | undefined;
             ip?: string | undefined;
+            kickOut?: boolean | undefined;
             match?: boolean | undefined;
             minioDomain?: string | undefined;
             mobile?: string | undefined;
@@ -239,6 +242,7 @@ export declare const useUserStore: import('pinia').StoreDefinition<"user", UserS
             gender?: number | undefined;
             globalSuperAdmin?: number | undefined;
             ip?: string | undefined;
+            kickOut?: boolean | undefined;
             match?: boolean | undefined;
             minioDomain?: string | undefined;
             mobile?: string | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gct-paas/core",
-  "version": "6.0.0-dev.36",
+  "version": "6.0.0-dev.38",
   "type": "module",
   "description": "paas 平台核心包",
   "loader": "dist/index.esm.min.js",
@@ -33,7 +33,7 @@
   "dependencies": {
     "@fingerprintjs/fingerprintjs": "^5.1.0",
     "@floating-ui/dom": "^1.7.6",
-    "@gct-paas/api": "^6.0.0-dev.12",
+    "@gct-paas/api": "^6.0.0-dev.13",
     "@module-federation/runtime": "^2.2.3",
     "@vueuse/core": "^14.1.0",
     "async-validator": "^4.2.5",
@@ -60,7 +60,7 @@
     "playwright": "^1.58.0"
   },
   "peerDependencies": {
-    "@gct-paas/api": "^6.0.0-dev.12",
+    "@gct-paas/api": "^6.0.0-dev.13",
     "vue": ">=3",
     "vue-i18n": ">=11",
     "vue-router": ">=4"