zxq-com 0.0.20 → 0.0.21

package/dist/ws/zxqWs.d.ts

@@ -3,7 +3,6 @@ export interface WsConfig {
     name: string;
     url: string;
     trustIp?: string;
-    clientId?: string;
     debug?: boolean;
 }
 export declare const EVENT_TYPE: {

package/dist/zxq-com.cjs

@@ -1,4 +1,4 @@
-Object.defineProperty(exports,`__esModule`,{value:!0});var e=Object.create,t=Object.defineProperty,n=Object.getOwnPropertyDescriptor,r=Object.getOwnPropertyNames,i=Object.getPrototypeOf,a=Object.prototype.hasOwnProperty,o=(e,i,o,s)=>{if(i&&typeof i==`object`||typeof i==`function`)for(var c=r(i),l=0,u=c.length,d;l<u;l++)d=c[l],!a.call(e,d)&&d!==o&&t(e,d,{get:(e=>i[e]).bind(null,d),enumerable:!(s=n(i,d))||s.enumerable});return e},s=(n,r,a)=>(a=n==null?{}:e(i(n)),o(r||!n||!n.__esModule?t(a,`default`,{value:n,enumerable:!0}):a,n));const c=require(`./useDynamicComponent-YT-u9Rpv.cjs`),l=require(`./zxqWs-DO1p80Cs.cjs`),u=require(`./styles-BZV65AUo.cjs`),d=require(`./A2UIRenderer-DqVIH5p7.cjs`);let f=require(`vue`),p=require(`markdown-it`);p=s(p);const m={iconApi:`https://api.iconify.design`};function h(e){Object.assign(m,e)}function g(e){let t=`.`,n=`__`,r=`--`,i;if(e){let i=e.blockPrefix;i&&(t=i),i=e.elementPrefix,i&&(n=i),i=e.modifierPrefix,i&&(r=i)}let a={install(e){i=e.c;let t=e.context;t.bem={},t.bem.b=null,t.bem.els=null}};function o(e){let n,r;return{before(e){n=e.bem.b,r=e.bem.els,e.bem.els=null},after(e){e.bem.b=n,e.bem.els=r},$({context:n,props:r}){return e=typeof e==`string`?e:e({context:n,props:r}),n.bem.b=e,`${r?.bPrefix||t}${n.bem.b}`}}}function s(e){let r;return{before(e){r=e.bem.els},after(e){e.bem.els=r},$({context:r,props:i}){return e=typeof e==`string`?e:e({context:r,props:i}),r.bem.els=e.split(`,`).map(e=>e.trim()),r.bem.els.map(e=>`${i?.bPrefix||t}${r.bem.b}${n}${e}`).join(`, `)}}}function c(e){return{$({context:i,props:a}){e=typeof e==`string`?e:e({context:i,props:a});let o=e.split(`,`).map(e=>e.trim());function s(e){return o.map(o=>`&${a?.bPrefix||t}${i.bem.b}${e===void 0?``:`${n}${e}`}${r}${o}`).join(`, `)}let c=i.bem.els;if(c!==null){if(process.env.NODE_ENV!==`production`&&c.length>=2)throw Error(`[css-render/plugin-bem]: m(${e}) is invalid, using modifier inside multiple elements is not allowed`);return s(c[0])}else return s()}}}function l(e){return{$({context:i,props:a}){e=typeof e==`string`?e:e({context:i,props:a});let o=i.bem.els;if(process.env.NODE_ENV!==`production`&&o!==null&&o.length>=2)throw Error(`[css-render/plugin-bem]: notM(${e}) is invalid, using modifier inside multiple elements is not allowed`);return`&:not(${a?.bPrefix||t}${i.bem.b}${o!==null&&o.length>0?`${n}${o[0]}`:``}${r}${e})`}}}return Object.assign(a,{cB:((...e)=>i(o(e[0]),e[1],e[2])),cE:((...e)=>i(s(e[0]),e[1],e[2])),cM:((...e)=>i(c(e[0]),e[1],e[2])),cNotM:((...e)=>i(l(e[0]),e[1],e[2]))}),a}function _(e){let t=0;for(let n=0;n<e.length;++n)e[n]===`&`&&++t;return t}var v=/\s*,(?![^(]*\))\s*/g,y=/\s+/g;function b(e,t){let n=[];return t.split(v).forEach(t=>{let r=_(t);if(r){if(r===1){e.forEach(e=>{n.push(t.replace(`&`,e))});return}}else{e.forEach(e=>{n.push((e&&e+` `)+t)});return}let i=[t];for(;r--;){let t=[];i.forEach(n=>{e.forEach(e=>{t.push(n.replace(`&`,e))})}),i=t}i.forEach(e=>n.push(e))}),n}function x(e,t){let n=[];return t.split(v).forEach(t=>{e.forEach(e=>{n.push((e&&e+` `)+t)})}),n}function S(e){let t=[``];return e.forEach(e=>{e&&=e.trim(),e&&(t=e.includes(`&`)?b(t,e):x(t,e))}),t.join(`, `).replace(y,` `)}function C(e){if(!e)return;let t=e.parentElement;t&&t.removeChild(e)}function w(e,t){return(t??document.head).querySelector(`style[cssr-id="${e}"]`)}function T(e){let t=document.createElement(`style`);return t.setAttribute(`cssr-id`,e),t}function E(e){return e?/^\s*@(s|m)/.test(e):!1}var D=/[A-Z]/g;function O(e){return e.replace(D,e=>`-`+e.toLowerCase())}function k(e,t=`  `){return typeof e==`object`&&e?` {
+Object.defineProperty(exports,`__esModule`,{value:!0});var e=Object.create,t=Object.defineProperty,n=Object.getOwnPropertyDescriptor,r=Object.getOwnPropertyNames,i=Object.getPrototypeOf,a=Object.prototype.hasOwnProperty,o=(e,i,o,s)=>{if(i&&typeof i==`object`||typeof i==`function`)for(var c=r(i),l=0,u=c.length,d;l<u;l++)d=c[l],!a.call(e,d)&&d!==o&&t(e,d,{get:(e=>i[e]).bind(null,d),enumerable:!(s=n(i,d))||s.enumerable});return e},s=(n,r,a)=>(a=n==null?{}:e(i(n)),o(r||!n||!n.__esModule?t(a,`default`,{value:n,enumerable:!0}):a,n));const c=require(`./useDynamicComponent-YT-u9Rpv.cjs`),l=require(`./zxqWs-DuxjH3JW.cjs`),u=require(`./styles-BZV65AUo.cjs`),d=require(`./A2UIRenderer-DqVIH5p7.cjs`);let f=require(`vue`),p=require(`markdown-it`);p=s(p);const m={iconApi:`https://api.iconify.design`};function h(e){Object.assign(m,e)}function g(e){let t=`.`,n=`__`,r=`--`,i;if(e){let i=e.blockPrefix;i&&(t=i),i=e.elementPrefix,i&&(n=i),i=e.modifierPrefix,i&&(r=i)}let a={install(e){i=e.c;let t=e.context;t.bem={},t.bem.b=null,t.bem.els=null}};function o(e){let n,r;return{before(e){n=e.bem.b,r=e.bem.els,e.bem.els=null},after(e){e.bem.b=n,e.bem.els=r},$({context:n,props:r}){return e=typeof e==`string`?e:e({context:n,props:r}),n.bem.b=e,`${r?.bPrefix||t}${n.bem.b}`}}}function s(e){let r;return{before(e){r=e.bem.els},after(e){e.bem.els=r},$({context:r,props:i}){return e=typeof e==`string`?e:e({context:r,props:i}),r.bem.els=e.split(`,`).map(e=>e.trim()),r.bem.els.map(e=>`${i?.bPrefix||t}${r.bem.b}${n}${e}`).join(`, `)}}}function c(e){return{$({context:i,props:a}){e=typeof e==`string`?e:e({context:i,props:a});let o=e.split(`,`).map(e=>e.trim());function s(e){return o.map(o=>`&${a?.bPrefix||t}${i.bem.b}${e===void 0?``:`${n}${e}`}${r}${o}`).join(`, `)}let c=i.bem.els;if(c!==null){if(process.env.NODE_ENV!==`production`&&c.length>=2)throw Error(`[css-render/plugin-bem]: m(${e}) is invalid, using modifier inside multiple elements is not allowed`);return s(c[0])}else return s()}}}function l(e){return{$({context:i,props:a}){e=typeof e==`string`?e:e({context:i,props:a});let o=i.bem.els;if(process.env.NODE_ENV!==`production`&&o!==null&&o.length>=2)throw Error(`[css-render/plugin-bem]: notM(${e}) is invalid, using modifier inside multiple elements is not allowed`);return`&:not(${a?.bPrefix||t}${i.bem.b}${o!==null&&o.length>0?`${n}${o[0]}`:``}${r}${e})`}}}return Object.assign(a,{cB:((...e)=>i(o(e[0]),e[1],e[2])),cE:((...e)=>i(s(e[0]),e[1],e[2])),cM:((...e)=>i(c(e[0]),e[1],e[2])),cNotM:((...e)=>i(l(e[0]),e[1],e[2]))}),a}function _(e){let t=0;for(let n=0;n<e.length;++n)e[n]===`&`&&++t;return t}var v=/\s*,(?![^(]*\))\s*/g,y=/\s+/g;function b(e,t){let n=[];return t.split(v).forEach(t=>{let r=_(t);if(r){if(r===1){e.forEach(e=>{n.push(t.replace(`&`,e))});return}}else{e.forEach(e=>{n.push((e&&e+` `)+t)});return}let i=[t];for(;r--;){let t=[];i.forEach(n=>{e.forEach(e=>{t.push(n.replace(`&`,e))})}),i=t}i.forEach(e=>n.push(e))}),n}function x(e,t){let n=[];return t.split(v).forEach(t=>{e.forEach(e=>{n.push((e&&e+` `)+t)})}),n}function S(e){let t=[``];return e.forEach(e=>{e&&=e.trim(),e&&(t=e.includes(`&`)?b(t,e):x(t,e))}),t.join(`, `).replace(y,` `)}function C(e){if(!e)return;let t=e.parentElement;t&&t.removeChild(e)}function w(e,t){return(t??document.head).querySelector(`style[cssr-id="${e}"]`)}function T(e){let t=document.createElement(`style`);return t.setAttribute(`cssr-id`,e),t}function E(e){return e?/^\s*@(s|m)/.test(e):!1}var D=/[A-Z]/g;function O(e){return e.replace(D,e=>`-`+e.toLowerCase())}function k(e,t=`  `){return typeof e==`object`&&e?` {
 `+Object.entries(e).map(e=>t+`  ${O(e[0])}: ${e[1]};`).join(`
 `)+`
 `+t+`}`:`: ${e};`}function A(e,t,n){return typeof e==`function`?e({context:t.context,props:n}):e}function j(e,t,n,r){if(!t)return``;let i=A(t,n,r);if(!i)return``;if(typeof i==`string`)return`${e} {\n${i}\n}`;let a=Object.keys(i);if(a.length===0)return n.config.keepEmptyBlock?e+` {

package/dist/zxq-com.js

@@ -1,5 +1,5 @@
 import { a as useA2UIConfig, i as provideA2UI, n as MessageProcessor, o as __plugin_vue_export_helper_default, r as useMessageProcessor, t as useDynamicComponent } from "./useDynamicComponent-MEzwhjNJ.js";
-import { a as zwqWs, i as ws, n as log, r as useWs, t as EVENT_TYPE } from "./zxqWs-B3261phL.js";
+import { a as zwqWs, i as ws, n as log, r as useWs, t as EVENT_TYPE } from "./zxqWs-DKM2CXOp.js";
 import { n as appendToAll, r as merge$2 } from "./styles-BYpMnn-p.js";
 import { t as A2UIRenderer_default } from "./A2UIRenderer-lZ0ms8c-.js";
 import { Comment, Fragment, Teleport, Text, Transition, TransitionGroup, cloneVNode, computed, createBlock, createCommentVNode, createElementBlock, createElementVNode, createTextVNode, createVNode, defineComponent, getCurrentInstance, h, inject, isVNode, mergeProps, nextTick, normalizeClass, normalizeStyle, onActivated, onBeforeMount, onBeforeUnmount, onDeactivated, onMounted, onUnmounted, openBlock, provide, reactive, readonly, ref, renderList, renderSlot, resolveComponent, resolveDynamicComponent, shallowRef, toDisplayString, toRef, unref, useCssVars, useModel, vShow, watch, watchEffect, withCtx, withDirectives } from "vue";

package/dist/zxq-ws.cjs

@@ -1 +1 @@
-const e=require(`./zxqWs-DO1p80Cs.cjs`);exports.EVENT_TYPE=e.t,exports.log=e.n,exports.useWs=e.r,exports.ws=e.i,exports.zwqWs=e.a;
+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 { a as zwqWs, i as ws, n as log, r as useWs, t as EVENT_TYPE } from "./zxqWs-B3261phL.js";
+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-B3261phL.js → zxqWs-DKM2CXOp.js}

@@ -3,6 +3,10 @@ import { useWebSocket } from "@vueuse/core";
 function getUUID(e = "") {
 	return e + (crypto?.randomUUID?.() || `${Date.now()}_${Math.random().toString(16).slice(2)}`);
 }
+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__);
 }
@@ -32,7 +36,7 @@ var urlRef = ref(), { status, data, send, close, open } = useWebSocket(urlRef, {
 	}
 });
 function sendMsg(e) {
-	e.clientId = wsConfig.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, f) {
-	Object.assign(wsConfig, f), urlRef.value || (urlRef.value = f.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: f.name,
-				clientId: wsConfig.clientId
-			}
+			payload: { name: p.name }
 		});
 	}), watch(data, (e) => {
 		if (e !== "pong") try {
-			let { sourceIp: p, event: m, payload: h } = JSON.parse(e);
-			if (f?.trustIp && p !== f.trustIp) return;
-			let g = subscribeMap.get(m);
-			g && g.forEach(({ fn: e, off: f }) => {
-				e(h), f && f();
+			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(f, p) {
-	p && zwqWs(null, p), status.value === "CLOSED" && urlRef.value && open();
-	let m = getUUID();
-	function g(e) {
-		let p = subscribeMap.get(f);
-		if (p) p.set(m, { 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 p = (/* @__PURE__ */ new Map()).set(m, { fn: e });
-			subscribeMap.set(f, p);
+			let m = (/* @__PURE__ */ new Map()).set(h, { fn: e });
+			subscribeMap.set(p, m);
 		}
 	}
-	function _() {
-		let e = subscribeMap.get(f);
-		e && e.has(m) && (e.delete(m), e.size === 0 && subscribeMap.delete(f));
+	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 p = subscribeMap.get(f);
-		if (p) p.set(m, { fn: e });
+		let m = subscribeMap.get(p);
+		if (m) m.set(h, { fn: e });
 		else {
-			let p = (/* @__PURE__ */ new Map()).set(m, {
+			let m = (/* @__PURE__ */ new Map()).set(h, {
 				fn: e,
-				off: _
+				off: v
 			});
-			subscribeMap.set(f, p);
+			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 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.20",
+  "version": "0.0.21",
   "files": [
     "dist"
   ],

package/dist/zxqWs-DO1p80Cs.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(){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 a={};function o(...e){(i()||a.debug)&&console.log(`【zxqWs】`,...e)}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=a.clientId,d(JSON.stringify(e))}const h={sendMsg:m,close:f,status:l};var g=new Map;function _(e,n){Object.assign(a,n),c.value||(c.value=n.url,p()),(0,t.watch)(l,e=>{o(`ws status`,e),e===`OPEN`&&m({event:s.CLIENT_NAME,payload:{name:n.name,clientId:a.clientId}})}),(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 i=r();function a(t){let n=g.get(e);if(n)n.set(i,{fn:t});else{let n=new Map().set(i,{fn:t});g.set(e,n)}}function s(){let t=g.get(e);t&&t.has(i)&&(t.delete(i),t.size===0&&g.delete(e))}function u(t){o(`ws once`);let n=g.get(e);if(n)n.set(i,{fn:t});else{let n=new Map().set(i,{fn:t,off:s});g.set(e,n)}}(0,t.onBeforeUnmount)(()=>{s()});function d(e){m(e)}return{on:a,off:s,once:u,emit:d}}Object.defineProperty(exports,`a`,{enumerable:!0,get:function(){return _}}),Object.defineProperty(exports,`i`,{enumerable:!0,get:function(){return h}}),Object.defineProperty(exports,`n`,{enumerable:!0,get:function(){return o}}),Object.defineProperty(exports,`r`,{enumerable:!0,get:function(){return v}}),Object.defineProperty(exports,`t`,{enumerable:!0,get:function(){return s}});