zxq-com 0.0.19 → 0.0.21

package/dist/zxq-ws.cjs

@@ -1 +1 @@
-const e=require(`./zxqWs-5Aa3WYS2.cjs`);exports.EVENT_TYPE=e.t,exports.useWs=e.n,exports.ws=e.r,exports.zwqWs=e.i;
+const e=require(`./zxqWs-DuxjH3JW.cjs`);exports.EVENT_TYPE=e.t,exports.log=e.n,exports.useWs=e.r,exports.ws=e.i,exports.zwqWs=e.a;

package/dist/zxq-ws.js

@@ -1,2 +1,2 @@
-import { i as zwqWs, n as useWs, r as ws, t as EVENT_TYPE } from "./zxqWs-4JH5RjsE.js";
-export { EVENT_TYPE, useWs, ws, zwqWs };
+import { a as zwqWs, i as ws, n as log, r as useWs, t as EVENT_TYPE } from "./zxqWs-DKM2CXOp.js";
+export { EVENT_TYPE, log, useWs, ws, zwqWs };

package/dist/{zxqWs-4JH5RjsE.js → zxqWs-DKM2CXOp.js}

@@ -3,13 +3,17 @@ import { useWebSocket } from "@vueuse/core";
 function getUUID(e = "") {
 	return e + (crypto?.randomUUID?.() || `${Date.now()}_${Math.random().toString(16).slice(2)}`);
 }
-function log(...e) {
-	isDevelopment() && console.log("【zxqWs】", ...e);
+function getCookie(e) {
+	let p = document.cookie.match(/* @__PURE__ */ RegExp("(^| )" + e + "=([^;]+)"));
+	return p ? p[2] : null;
 }
 function isDevelopment() {
 	return typeof process < "u" && process?.env && typeof process.env.NODE_ENV == "string" ? process.env.NODE_ENV === "development" : typeof __DEV__ < "u" ? typeof __DEV__ == "boolean" ? __DEV__ : !1 : !!(typeof window < "u" && window.__VUE_DEVTOOLS_GLOBAL_HOOK__);
 }
-var clientId = "";
+var wsConfig = {};
+function log(...e) {
+	(isDevelopment() || wsConfig.debug) && console.log("【zxqWs】", ...e);
+}
 const EVENT_TYPE = {
 	CLIENT_NAME: "__client-name",
 	DEV1: "dev-1",
@@ -32,7 +36,7 @@ var urlRef = ref(), { status, data, send, close, open } = useWebSocket(urlRef, {
 	}
 });
 function sendMsg(e) {
-	e.clientId = clientId, send(JSON.stringify(e));
+	e.clientId = getCookie("zxq_app_client_id") || "dev", send(JSON.stringify(e));
 }
 const ws = {
 	sendMsg,
@@ -40,66 +44,63 @@ const ws = {
 	status
 };
 var subscribeMap = /* @__PURE__ */ new Map();
-function zwqWs(e, d) {
-	clientId = d.clientId || "", urlRef.value || (urlRef.value = d.url, open()), watch(status, (e) => {
+function zwqWs(e, p) {
+	Object.assign(wsConfig, p), urlRef.value || (urlRef.value = p.url, open()), watch(status, (e) => {
 		log("ws status", e), e === "OPEN" && sendMsg({
 			event: EVENT_TYPE.CLIENT_NAME,
-			payload: {
-				name: d.name,
-				clientId
-			}
+			payload: { name: p.name }
 		});
 	}), watch(data, (e) => {
 		if (e !== "pong") try {
-			let { sourceIp: f, event: p, payload: m } = JSON.parse(e);
-			if (d?.trustIp && f !== d.trustIp) return;
-			let h = subscribeMap.get(p);
-			h && h.forEach(({ fn: e, off: d }) => {
-				e(m), d && d();
+			let { sourceIp: m, event: h, payload: g } = JSON.parse(e);
+			if (p?.trustIp && m !== p.trustIp) return;
+			let _ = subscribeMap.get(h);
+			_ && _.forEach(({ fn: e, off: p }) => {
+				e(g), p && p();
 			});
 		} catch (e) {
 			console.error("ws 数据格式有误", e);
 		}
 	});
 }
-function useWs(d, f) {
-	f && zwqWs(null, f), status.value === "CLOSED" && urlRef.value && open();
-	let p = getUUID();
-	function g(e) {
-		let f = subscribeMap.get(d);
-		if (f) f.set(p, { fn: e });
+function useWs(p, m) {
+	m && zwqWs(null, m), status.value === "CLOSED" && urlRef.value && open();
+	let h = getUUID();
+	function _(e) {
+		let m = subscribeMap.get(p);
+		if (m) m.set(h, { fn: e });
 		else {
-			let f = (/* @__PURE__ */ new Map()).set(p, { fn: e });
-			subscribeMap.set(d, f);
+			let m = (/* @__PURE__ */ new Map()).set(h, { fn: e });
+			subscribeMap.set(p, m);
 		}
 	}
-	function _() {
-		let e = subscribeMap.get(d);
-		e && e.has(p) && (e.delete(p), e.size === 0 && subscribeMap.delete(d));
+	function v() {
+		let e = subscribeMap.get(p);
+		e && e.has(h) && (e.delete(h), e.size === 0 && subscribeMap.delete(p));
 	}
-	function v(e) {
+	function y(e) {
 		log("ws once");
-		let f = subscribeMap.get(d);
-		if (f) f.set(p, { fn: e });
+		let m = subscribeMap.get(p);
+		if (m) m.set(h, { fn: e });
 		else {
-			let f = (/* @__PURE__ */ new Map()).set(p, {
+			let m = (/* @__PURE__ */ new Map()).set(h, {
 				fn: e,
-				off: _
+				off: v
 			});
-			subscribeMap.set(d, f);
+			subscribeMap.set(p, m);
 		}
 	}
 	onBeforeUnmount(() => {
-		_();
+		v();
 	});
-	function y(e) {
+	function b(e) {
 		sendMsg(e);
 	}
 	return {
-		on: g,
-		off: _,
-		once: v,
-		emit: y
+		on: _,
+		off: v,
+		once: y,
+		emit: b
 	};
 }
-export { zwqWs as i, useWs as n, ws as r, EVENT_TYPE as t };
+export { zwqWs as a, ws as i, log as n, useWs as r, EVENT_TYPE as t };

package/dist/zxqWs-DuxjH3JW.cjs

@@ -0,0 +1 @@
+const e=require(`./zxq-com.cjs`);let t=require(`vue`),n=require(`@vueuse/core`);function r(e=``){return e+(crypto?.randomUUID?.()||`${Date.now()}_${Math.random().toString(16).slice(2)}`)}function i(e){let t=document.cookie.match(RegExp(`(^| )`+e+`=([^;]+)`));return t?t[2]:null}function a(){return typeof process<`u`&&process?.env&&typeof process.env.NODE_ENV==`string`?process.env.NODE_ENV===`development`:typeof __DEV__<`u`?typeof __DEV__==`boolean`?__DEV__:!1:!!(typeof window<`u`&&window.__VUE_DEVTOOLS_GLOBAL_HOOK__)}var o={};function s(...e){(a()||o.debug)&&console.log(`【zxqWs】`,...e)}const c={CLIENT_NAME:`__client-name`,DEV1:`dev-1`,DEV2:`dev-2`};var l=(0,t.ref)(),{status:u,data:d,send:f,close:p,open:m}=(0,n.useWebSocket)(l,{immediate:!1,autoConnect:!1,heartbeat:{message:`ping`,interval:5e3,pongTimeout:15e3},autoReconnect:{retries:3,delay:1e4,onFailed(){console.error(`超过重连次数`)}}});function h(e){e.clientId=i(`zxq_app_client_id`)||`dev`,f(JSON.stringify(e))}const g={sendMsg:h,close:p,status:u};var _=new Map;function v(e,n){Object.assign(o,n),l.value||(l.value=n.url,m()),(0,t.watch)(u,e=>{s(`ws status`,e),e===`OPEN`&&h({event:c.CLIENT_NAME,payload:{name:n.name}})}),(0,t.watch)(d,e=>{if(e!==`pong`)try{let{sourceIp:t,event:r,payload:i}=JSON.parse(e);if(n?.trustIp&&t!==n.trustIp)return;let a=_.get(r);a&&a.forEach(({fn:e,off:t})=>{e(i),t&&t()})}catch(e){console.error(`ws 数据格式有误`,e)}})}function y(e,n){n&&v(null,n),u.value===`CLOSED`&&l.value&&m();let i=r();function a(t){let n=_.get(e);if(n)n.set(i,{fn:t});else{let n=new Map().set(i,{fn:t});_.set(e,n)}}function o(){let t=_.get(e);t&&t.has(i)&&(t.delete(i),t.size===0&&_.delete(e))}function c(t){s(`ws once`);let n=_.get(e);if(n)n.set(i,{fn:t});else{let n=new Map().set(i,{fn:t,off:o});_.set(e,n)}}(0,t.onBeforeUnmount)(()=>{o()});function d(e){h(e)}return{on:a,off:o,once:c,emit:d}}Object.defineProperty(exports,`a`,{enumerable:!0,get:function(){return v}}),Object.defineProperty(exports,`i`,{enumerable:!0,get:function(){return g}}),Object.defineProperty(exports,`n`,{enumerable:!0,get:function(){return s}}),Object.defineProperty(exports,`r`,{enumerable:!0,get:function(){return y}}),Object.defineProperty(exports,`t`,{enumerable:!0,get:function(){return c}});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zxq-com",
-  "version": "0.0.19",
+  "version": "0.0.21",
   "files": [
     "dist"
   ],

package/dist/zxqWs-5Aa3WYS2.cjs

@@ -1 +0,0 @@
-const e=require(`./zxq-com.cjs`);let t=require(`vue`),n=require(`@vueuse/core`);function r(e=``){return e+(crypto?.randomUUID?.()||`${Date.now()}_${Math.random().toString(16).slice(2)}`)}function i(...e){a()&&console.log(`【zxqWs】`,...e)}function a(){return typeof process<`u`&&process?.env&&typeof process.env.NODE_ENV==`string`?process.env.NODE_ENV===`development`:typeof __DEV__<`u`?typeof __DEV__==`boolean`?__DEV__:!1:!!(typeof window<`u`&&window.__VUE_DEVTOOLS_GLOBAL_HOOK__)}var o=``;const s={CLIENT_NAME:`__client-name`,DEV1:`dev-1`,DEV2:`dev-2`};var c=(0,t.ref)(),{status:l,data:u,send:d,close:f,open:p}=(0,n.useWebSocket)(c,{immediate:!1,autoConnect:!1,heartbeat:{message:`ping`,interval:5e3,pongTimeout:15e3},autoReconnect:{retries:3,delay:1e4,onFailed(){console.error(`超过重连次数`)}}});function m(e){e.clientId=o,d(JSON.stringify(e))}const h={sendMsg:m,close:f,status:l};var g=new Map;function _(e,n){o=n.clientId||``,c.value||(c.value=n.url,p()),(0,t.watch)(l,e=>{i(`ws status`,e),e===`OPEN`&&m({event:s.CLIENT_NAME,payload:{name:n.name,clientId:o}})}),(0,t.watch)(u,e=>{if(e!==`pong`)try{let{sourceIp:t,event:r,payload:i}=JSON.parse(e);if(n?.trustIp&&t!==n.trustIp)return;let a=g.get(r);a&&a.forEach(({fn:e,off:t})=>{e(i),t&&t()})}catch(e){console.error(`ws 数据格式有误`,e)}})}function v(e,n){n&&_(null,n),l.value===`CLOSED`&&c.value&&p();let a=r();function o(t){let n=g.get(e);if(n)n.set(a,{fn:t});else{let n=new Map().set(a,{fn:t});g.set(e,n)}}function s(){let t=g.get(e);t&&t.has(a)&&(t.delete(a),t.size===0&&g.delete(e))}function u(t){i(`ws once`);let n=g.get(e);if(n)n.set(a,{fn:t});else{let n=new Map().set(a,{fn:t,off:s});g.set(e,n)}}(0,t.onBeforeUnmount)(()=>{s()});function d(e){m(e)}return{on:o,off:s,once:u,emit:d}}Object.defineProperty(exports,`i`,{enumerable:!0,get:function(){return _}}),Object.defineProperty(exports,`n`,{enumerable:!0,get:function(){return v}}),Object.defineProperty(exports,`r`,{enumerable:!0,get:function(){return h}}),Object.defineProperty(exports,`t`,{enumerable:!0,get:function(){return s}});