@mixd-id/web-scaffold 0.1.230406242 → 0.1.230406243

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mixd-id/web-scaffold",
   "private": false,
-  "version": "0.1.230406242",
+  "version": "0.1.230406243",
   "scripts": {
     "dev": "vite serve",
     "build": "vite build",

package/src/components/Alert.vue

@@ -15,8 +15,9 @@
 							<h5 :class="$style.title">{{ title }}</h5>
 						</div>
 
-						<div :class="$style.details" v-if="message">
-							<p class="text-center break-words">{{ message }}</p>
+						<div :class="$style.details">
+							<p class="text-center break-words" v-if="message">{{ message }}</p>
+							<p class="text-center break-words max-w-[420px]" v-if="stack">{{ stack }}</p>
 						</div>
 
 						<div :class="$style.details" v-if="details">
@@ -128,7 +129,6 @@ export default{
 		},
 
 		message(){
-
 			if(this.err.errors){
 				return typeof this.err.errors === 'object' && Object.keys(this.err.errors).length > 0 ?
             Object.values(this.err.errors).join("\n") :
@@ -150,6 +150,12 @@ export default{
 			}
 		},
 
+    stack(){
+      if(this.err.stack){
+        return this.err.stack
+      }
+    },
+
 		details(){
 
 			if(this.alert.details && typeof this.alert.details === 'object'){

package/src/components/Modal.vue

@@ -118,6 +118,8 @@ export default{
 		},
 
     dismiss(){
+      if(this.isDisabled) return
+
       if(this.hash){
         this.$router.push({ hash: this.$route.hash.replace(this.hash, '') })
       }

package/src/components/Textarea.vue

@@ -1,7 +1,7 @@
 <template>
 	<div :class="computedClass">
 		<slot name="start"></slot>
-		<textarea :maxlength="maxlength"
+		<textarea :maxlength="maxlength" :class="itemClass"
 			:placeholder="placeholder" :rows="rows" ref="input" @focus="isActive = true" @blur="onBlur" @input="onInput"
 			:value="modelValue" :readonly="Boolean(readonly)" />
 		<div v-if="state === -2 && !!(errors)">
@@ -29,6 +29,8 @@ export default{
 
 		customClass: String,
 
+    itemClass: String,
+
 		state: {
 			type: Number,
 			default: 1 // 1:normal, -1:disabled, -2:error

package/src/themes/default/index.js

@@ -23,7 +23,7 @@ const plugin = Plugin(function({ addBase, config, theme }) {
       '--base-500': '255, 255, 255',
       '--base': '236, 236, 236',
 
-      "--text-50": '232, 232, 232',
+      "--text-50": '229, 229, 229',
       "--text-100": '223, 223, 223',
       "--text-200": '218, 218, 218',
       "--text-300": '191, 191, 191',
@@ -70,7 +70,7 @@ const plugin = Plugin(function({ addBase, config, theme }) {
       "--base-500": '22, 26, 33',
       "--base": '22, 26, 33',
 
-      "--text-50": '28, 34, 41',
+      "--text-50": '33, 39, 46',
       "--text-100": '48, 54, 61',
       "--text-200": '53, 59, 66',
       "--text-300": '77, 77, 77',

package/src/utils/wss.js

@@ -129,7 +129,15 @@ class WSS extends EventEmitter2{
 
       socket.on('message', async (binaryData) => {
 
-        const { _requestId, path, params } = await this.fromBinaryData(binaryData);
+        let obj
+        try{
+          obj = await this.fromBinaryData(binaryData);
+        }
+        catch(e){
+          return socket.close(1002, e.message);
+        }
+
+        const { _requestId, path, params } = obj
 
         let status = 200
         let data
@@ -142,7 +150,7 @@ class WSS extends EventEmitter2{
               }
             }
             catch(e){
-              socket.close(1002, e.message);
+              return socket.close(1002, e.message);
             }
             break
 
@@ -158,6 +166,10 @@ class WSS extends EventEmitter2{
               data = arr.length > 0 ? JSON.parse(JSON.stringify(arr.pop())) : data
             }
             catch(e){
+              if(this._opt.debug){
+                console.error(e)
+              }
+
               status = 500
               data = {
                 name: e.name,

package/src/utils/wss.mjs

@@ -121,14 +121,14 @@ class WSS extends EventEmitter2{
       this._readyState = 2
       this.send('_auth', this._opt.auth)
         .then(() => {
+          this._readyState = 1
+
           reconnect ? this.emit('reconnect', null, []) : this.emit('connect', null, [])
 
           for(let sendParams of this._pendingSend){
             this.sendSync(sendParams.path, sendParams.params, sendParams.cb, sendParams.err)
           }
           this._pendingSend = []
-
-          this._readyState = 1
         })
     };
 
@@ -178,24 +178,26 @@ class WSS extends EventEmitter2{
     };
   }
 
-  async reconnect(){
+  async reconnect(opt){
     if(this._instance){
       this._instance.close()
     }
 
+    Object.assign(this._opt, opt)
+
     await this.connect(true)
   }
 
   sendSync(path, params, cb, err, override){
-    if(this._instance.readyState !== 1 && this._readyState !== 1){
+    if(this._instance.readyState !== 1 || (path !== '_auth' && this._readyState !== 1)){
       this._pendingSend.push({ path, params, cb, err })
       return
     }
 
-    if(!navigator.onLine){
+    /*if(!navigator.onLine){
       err({ message: 'Unable to send, network disconnected' })
       return
-    }
+    }*/
 
     const _requestId = ++this._counter
 
@@ -216,14 +218,14 @@ class WSS extends EventEmitter2{
           t1: new Date().getTime()
         }
 
-        setTimeout(() => {
+        /*setTimeout(() => {
           if(this._callbacks[_requestId]){
             err({ message: 'Timeout' })
             delete this._callbacks[_requestId]
 
             this.reconnect()
           }
-        }, (override ?? {}).timeout ?? this._opt.timeout)
+        }, (override ?? {}).timeout ?? this._opt.timeout)*/
       })
   }