@vyr/service-rpc-universal 0.0.19 → 0.0.20

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "@vyr/service-rpc-universal",
-  "version": "0.0.19",
+  "version": "0.0.20",
   "description": "",
   "main": "./src/index.ts",
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@vyr/engine": "0.0.19"
+    "moment": "^2.30.1",
+    "@vyr/engine": "0.0.20"
   },
   "files": [
     "package.json",

package/src/Message.ts

@@ -3,6 +3,7 @@ import * as rpc from './rpc'
 import * as sidebar from './sidebar'
 import * as asset from './asset'
 import * as scene from './scene'
+import * as example from './example'
 import * as dep from './dep'
 
 /** 通信消息 */
@@ -11,6 +12,7 @@ class Message extends IMessage {
   static sidebar = sidebar
   static asset = asset
   static scene = scene
+  static example = example
   static dep = dep
 }
 

package/src/RpcService.ts

@@ -1,5 +1,5 @@
 import axios from 'axios'
-import { Descriptor, Listener } from '@vyr/engine'
+import { Serialization, Listener } from '@vyr/engine'
 import { Service } from '@vyr/service'
 import { path, tokenKey, topic, Confirm, Message } from '@vyr/service-rpc-universal'
 
@@ -55,7 +55,7 @@ class RpcService extends Service {
         this.socket = new window.io(location.href, params)
 
         this.socket.on(topic, (content: string) => {
-            const msg = Descriptor.deserialization<Message>(content)
+            const msg = Serialization.parse(content) as Message
             if (msg.message !== undefined) return config.notify(msg.message)
             this._delayTrigger(msg)
         })
@@ -106,7 +106,7 @@ class RpcService extends Service {
     trigger<T extends Message = Message>(method: string, msg: T) {
         this._listener.trigger(method, msg)
     }
-    listen<T extends Message = Message>(method: string, cb: (msg: T) => void) {
+    listen<T extends Message = Message>(method: string, cb: (msg: T, ...others: any[]) => void) {
         this._listener.listen(method, cb)
     }
     unlisten<T extends Message = Message>(method: string, cb: (msg: T) => void) {
@@ -114,8 +114,18 @@ class RpcService extends Service {
     }
 
     /**向服务端发送数据 */
-    send(msg: Message) {
-        this.socket.emit(topic, Descriptor.serialization(msg))
+    send<T extends Message | void = Message>(msg: Message) {
+        return new Promise<T>(resolve => {
+            this.socket.emit(topic, Serialization.stringify(msg), (content: string) => {
+                if (content) {
+                    const msg = Serialization.parse(content)
+                    resolve(msg as T)
+                } else {
+                    //@ts-ignore
+                    resolve()
+                }
+            })
+        })
     }
 }
 

package/src/domain/Entity.ts

@@ -0,0 +1,12 @@
+abstract class Entity {
+    static primaryKey: string
+    static dateFormat = 'YYYY-MM-DD HH:mm:ss'
+
+    abstract toVO(): Entity
+
+    abstract toDO(): Entity
+}
+
+export {
+    Entity
+}

package/src/domain/Example.ts

@@ -0,0 +1,80 @@
+import moment from 'moment'
+import { Entity } from './Entity'
+
+abstract class Example extends Entity {
+    static primaryKey: keyof Example = 'id'
+    id: string
+    name: string
+    badge: string
+    author: string
+    radio: string
+    download: number
+    image: string
+    abstract createTime: string | number
+
+    constructor(record: Partial<Example>) {
+        super()
+        this.id = record.id ?? ''
+        this.name = record.name ?? ''
+        this.badge = record.badge ?? ''
+        this.author = record.author ?? ''
+        this.radio = record.radio ?? ''
+        this.download = record.download ?? 0
+        this.image = record.image ?? ''
+    }
+
+    toVO() {
+        let createTime
+        if (typeof this.createTime === 'number') {
+            createTime = moment(this.createTime).format(Example.dateFormat)
+        } else {
+            createTime = this.createTime
+        }
+        const vo: ExampleVO = new ExampleVO({
+            ...this,
+            createTime,
+        })
+
+        return vo
+    }
+
+    toDO() {
+        let createTime
+        if (typeof this.createTime === 'number') {
+            createTime = this.createTime
+        } else {
+            const date = moment(this.createTime, Example.dateFormat)
+            createTime = date.valueOf()
+        }
+
+        const DO: ExampleDO = new ExampleDO({
+            ...this,
+            createTime
+        })
+
+        return DO
+    }
+}
+
+class ExampleDO extends Example {
+    createTime: number
+
+    constructor(record: Partial<ExampleDO> = {}) {
+        super(record)
+        this.createTime = record.createTime ?? 0
+    }
+}
+
+class ExampleVO extends Example {
+    createTime: string
+
+    constructor(record: Partial<ExampleVO> = {}) {
+        super(record)
+        this.createTime = record.createTime ?? ''
+    }
+}
+
+export {
+    ExampleDO,
+    ExampleVO,
+}

package/src/domain/User.ts

@@ -0,0 +1,84 @@
+import moment from 'moment'
+import { Entity } from './Entity'
+
+abstract class User extends Entity {
+    static primaryKey: keyof User = 'id'
+    id: string
+    name = ''
+    password = ''
+    token = ''
+    role = ''
+    abstract createTime: string | number
+
+    constructor(record: Partial<User>) {
+        super()
+        this.id = record.id ?? ''
+        this.name = record.name ?? ''
+        this.password = record.password ?? ''
+        this.token = record.token ?? ''
+        this.role = record.role ?? ''
+    }
+
+    toVO() {
+        let createTime
+        if (typeof this.createTime === 'number') {
+            createTime = moment(this.createTime).format(User.dateFormat)
+        } else {
+            createTime = this.createTime
+        }
+
+        const VO: UserVO = new UserVO({
+            ...this,
+            createTime
+        })
+
+        return VO
+    }
+
+    toDO() {
+        let createTime
+        if (typeof this.createTime === 'number') {
+            createTime = this.createTime
+        } else {
+            const date = moment(this.createTime, User.dateFormat)
+            createTime = date.valueOf()
+        }
+
+        const DO: UserDO = new UserDO({
+            ...this,
+            createTime
+        })
+
+        return DO
+    }
+}
+
+class UserDO extends User {
+    createTime: number
+
+    constructor(record: Partial<UserDO> = {}) {
+        super(record)
+        this.createTime = record.createTime ?? 0
+    }
+
+    toJSON() {
+        return {
+            ...this,
+            token: '',
+        }
+    }
+}
+
+class UserVO extends User {
+    createTime: string
+
+    constructor(record: Partial<UserVO> = {}) {
+        super(record)
+        this.createTime = record.createTime ?? ''
+    }
+}
+
+export {
+    UserDO,
+    UserVO,
+}

package/src/domain/index.ts

@@ -0,0 +1,3 @@
+export * from './Entity'
+export * from './Example'
+export * from './User'

package/src/example/apply.ts

@@ -0,0 +1,35 @@
+import { IMessage } from '../IMessage'
+
+const Method = '/cli/example.apply'
+
+interface RequestParams {
+    example: string
+    node: string
+}
+
+class RequestMessage extends IMessage {
+    method = Method
+    params: RequestParams
+
+    constructor(example: string, node: string) {
+        super()
+        this.params = { example, node }
+    }
+}
+
+interface NoticeParams {
+
+}
+
+class NoticeMessage extends IMessage {
+    method = Method
+    params: NoticeParams
+
+    constructor() {
+        super()
+        this.params = {}
+    }
+}
+
+
+export { Method, RequestMessage, NoticeMessage }

package/src/example/create.ts

@@ -0,0 +1,36 @@
+import { IMessage } from '../IMessage'
+
+const Method = '/cli/example.create'
+
+interface RequestParams {
+    name: string
+    image: string
+    node: string
+}
+
+class RequestMessage extends IMessage {
+    method = Method
+    params: RequestParams
+
+    constructor(params: RequestParams) {
+        super()
+        this.params = params
+    }
+}
+
+interface NoticeParams {
+    example: string
+}
+
+class NoticeMessage extends IMessage {
+    method = Method
+    params: NoticeParams
+
+    constructor(example: NoticeParams['example']) {
+        super()
+        this.params = { example }
+    }
+}
+
+
+export { Method, RequestMessage, NoticeMessage }

package/src/example/delete.ts

@@ -0,0 +1,33 @@
+import { IMessage } from '../IMessage'
+
+const Method = '/cli/example.delete'
+
+interface RequestParams {
+    example: string
+}
+
+class RequestMessage extends IMessage {
+    method = Method
+    params: RequestParams
+
+    constructor(example: RequestParams['example']) {
+        super()
+        this.params = { example }
+    }
+}
+
+interface NoticeParams {
+}
+
+class NoticeMessage extends IMessage {
+    method = Method
+    params: NoticeParams
+
+    constructor() {
+        super()
+        this.params = {}
+    }
+}
+
+
+export { Method, RequestMessage, NoticeMessage }

package/src/example/index.ts

@@ -0,0 +1,5 @@
+export * as initialize from './initialize'
+export * as list from './list'
+export * as create from './create'
+export * as delete from './delete'
+export * as apply from './apply'

package/src/example/initialize.ts

@@ -0,0 +1,22 @@
+import { IMessage } from '../IMessage'
+
+const Method = '/cli/example.initialize'
+
+class RequestMessage extends IMessage {
+    method = Method
+    constructor() {
+        super()
+    }
+}
+
+class NoticeMessage extends IMessage {
+    method = Method
+    params
+    constructor() {
+        super()
+        this.params = {  }
+    }
+}
+
+
+export { Method, RequestMessage, NoticeMessage }

package/src/example/list.ts

@@ -0,0 +1,35 @@
+import { ExampleVO } from '../domain'
+import { IMessage } from '../IMessage'
+
+const Method = '/cli/example.list'
+
+interface RequestParams {
+    name: string
+}
+
+class RequestMessage extends IMessage {
+    method = Method
+    params: RequestParams
+
+    constructor(name: RequestParams['name']) {
+        super()
+        this.params = { name }
+    }
+}
+
+interface NoticeParams {
+    list: ExampleVO[]
+}
+
+class NoticeMessage extends IMessage {
+    method = Method
+    params: NoticeParams
+
+    constructor(list: NoticeParams['list']) {
+        super()
+        this.params = { list }
+    }
+}
+
+
+export { Method, RequestMessage, NoticeMessage }

package/src/index.ts

@@ -4,7 +4,7 @@ export * from './Message'
 export * from './VirtualNode'
 export * from './VirtualNode'
 export * from './UseRecord'
-export * from './User'
+export * from './domain'
 export * from './rpc/confirm'
 
 const path = '/rpc.io'

package/src/rpc/getUser.ts

@@ -1,6 +1,6 @@
 import { DeserializationObject } from '@vyr/engine'
 import { IMessage } from '../IMessage'
-import { User } from '../User'
+import { UserVO } from '../domain'
 
 const Method = '/cli/rpc.getUser'
 
@@ -20,7 +20,7 @@ class RequestMessage extends IMessage {
 
 
 interface NoticeParams {
-    user: DeserializationObject<User> | null
+    user: DeserializationObject<UserVO> | null
 }
 
 class NoticeMessage extends IMessage {

package/src/User.ts

@@ -1,21 +0,0 @@
-class User {
-    name = ''
-    password = ''
-    token = ''
-    role = ''
-
-    constructor(user: Partial<User> = {}) {
-        this.name = user.name ?? ''
-        this.password = user.password ?? ''
-        this.token = user.token ?? ''
-        this.role = user.role ?? ''
-    }
-
-    clone() {
-        const user = new User(this)
-        user.password = ''
-        return user
-    }
-}
-
-export { User }