@vyr/cli 0.0.25 → 0.0.26

package/output/remote/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vyr/remote",
-  "version": "0.0.25",
+  "version": "0.0.26",
   "description": "",
   "main": "./src/index.ts",
   "author": "",

package/output/rollup-config-plugin/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vyr/pack-rollup-config-plugin",
-  "version": "0.0.25",
+  "version": "0.0.26",
   "description": "",
   "main": "./index.js",
   "author": "",

package/output/runtime/build/data/global.d.ts

@@ -12,11 +12,17 @@ interface ScriptOption {
     getDefaultInput(): any;
     getPropertyOptions?: () => ScriptPropertyOptionsGetters;
 }
+interface interfaceOption {
+    label: string;
+    value: string;
+}
 declare class Template {
     visible: boolean;
 }
 declare class Global {
     readonly scripts: ScriptOption[];
     readonly template: Template;
+    readonly interfaces: interfaceOption[];
+    setInterfaces(interfaces: interfaceOption[]): void;
 }
 export { ScriptPropertyOptions, ScriptPropertyOptionsGetters, ScriptOption, Global, };

package/output/runtime/build/data/header.d.ts

@@ -7,5 +7,9 @@ declare class Status {
 }
 declare class Header {
     status: Status;
+    menus: {
+        label: string;
+        value: string;
+    }[];
 }
 export { Header };

package/output/runtime/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vyr/runtime",
-  "version": "0.0.25",
+  "version": "0.0.26",
   "description": " - Type Declarations",
   "main": "",
   "author": "",

package/output/service/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vyr/service",
-  "version": "0.0.25",
+  "version": "0.0.26",
   "description": "",
   "main": "./src/index.ts",
   "author": "",

package/output/service-asset/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vyr/service-asset",
-  "version": "0.0.25",
+  "version": "0.0.26",
   "description": "",
   "main": "./src/index.ts",
   "author": "",

package/output/service-asset/src/AssetService.ts

@@ -1,9 +1,8 @@
-import axios from 'axios'
 import { Service } from '@vyr/service'
 import { DraggableData, DraggableEndType, } from '@vyr/declare'
 import { runtime } from '@vyr/runtime'
 import { Descriptor, DeserializationObject } from '@vyr/engine'
-import { RpcService, Message, VirtualNode } from '@vyr/service-rpc'
+import { RpcService, Message, VirtualNode, request } from '@vyr/service-rpc'
 import { AssetMethodProvider } from "./AssetMethodProvider"
 
 class AssetService extends Service {
@@ -109,7 +108,7 @@ class AssetService extends Service {
     }
 
     async read(url: string) {
-        const res = await axios.get<string>(url, { responseType: 'text' })
+        const res = await request.get<string>(url, { responseType: 'text' })
         return res.data
     }
 }

package/output/service-example/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vyr/service-example",
-  "version": "0.0.25",
+  "version": "0.0.26",
   "description": "",
   "main": "./src/index.ts",
   "author": "",

package/output/service-example/src/ExampleService.ts

@@ -1,6 +1,5 @@
-import axios from 'axios'
 import { runtime } from '@vyr/runtime'
-import { Message, RpcService } from '@vyr/service-rpc'
+import { Message, RpcService, request } from '@vyr/service-rpc'
 import { Service } from '@vyr/service'
 import { AssetService } from '@vyr/service-asset'
 import { ExampleMethodProvider } from './ExampleMethodProvider'
@@ -41,12 +40,12 @@ class ExampleService extends Service {
     }
 
     async download(example: string, name: string) {
-        const res = await axios.get<string>('/download/example', { params: { example }, responseType: 'blob' })
+        const res = await request.get('/download/example', { params: { example }, responseType: 'blob' })
         AssetService.save(name, res.data)
     }
 
     async upload(formData: FormData) {
-        await axios.post<string>('/upload/example', formData)
+        await request.post<string>('/upload/example', formData)
     }
 }
 

package/output/service-graph/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vyr/service-graph",
-  "version": "0.0.25",
+  "version": "0.0.26",
   "description": "",
   "main": "./src/index.ts",
   "author": "",

package/output/service-rpc/package.json

@@ -1,13 +1,15 @@
 {
   "name": "@vyr/service-rpc-universal",
-  "version": "0.0.25",
+  "version": "0.0.26",
   "description": "",
   "main": "./src/index.ts",
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "moment": "^2.30.1",
-    "@vyr/engine": "0.0.25"
+    "@vyr/engine": "0.0.26",
+    "camelcase-keys": "^10.0.1",
+    "decamelize-keys": "^2.0.1",
+    "moment": "^2.30.1"
   },
   "files": [
     "package.json",

package/output/service-rpc/src/RpcService.ts

@@ -1,12 +1,10 @@
-import axios from 'axios'
 import { Serialization, Listener } from '@vyr/engine'
 import { Service } from '@vyr/service'
 import { path, tokenKey, topic, Confirm, Message } from '@vyr/service-rpc-universal'
+import { request } from './request'
 
 interface RpcServiceConfig {
     token: string
-    notify: (msg: string) => void
-    confirm: (options: Partial<Confirm>, value?: string) => Promise<Confirm>
 }
 
 const _logout = () => {
@@ -17,10 +15,14 @@ const _logout = () => {
 }
 
 class RpcService extends Service {
+    static notify = (msg: string) => { }
+    static confirm = async (options: Partial<Confirm>, value?: string) => {
+        return options as Confirm
+    }
 
     static async login(name: string, password: string) {
         const data = new Message.rpc.login.RequestMessage(name, password)
-        const res = await axios.post<InstanceType<typeof Message['rpc']['login']['NoticeMessage']>>(Message.rpc.login.Method, data)
+        const res = await request.post<InstanceType<typeof Message['rpc']['login']['NoticeMessage']>>(Message.rpc.login.Method, data)
         window.localStorage.setItem(tokenKey, res.data.params.token)
 
         const location = new URL(window.location.href)
@@ -30,7 +32,7 @@ class RpcService extends Service {
 
     static async getUser() {
         const data = new Message.rpc.getUser.RequestMessage()
-        const res = await axios.get<InstanceType<typeof Message['rpc']['getUser']['NoticeMessage']>>(Message.rpc.getUser.Method, data)
+        const res = await request.get<InstanceType<typeof Message['rpc']['getUser']['NoticeMessage']>>(Message.rpc.getUser.Method, data)
         return res.data.params.user
     }
 
@@ -42,21 +44,19 @@ class RpcService extends Service {
     }
 
     private _listener = new Listener<{ [k: string]: (msg: Message) => void }>()
-    private confirm
     private socket: any
     private needTrigger = false
     private msgQueue: Message[] = []
 
     constructor(name: string, config: RpcServiceConfig) {
         super(name)
-        this.confirm = config.confirm
         const params = { path, extraHeaders: { authorization: 'Bearer ' + config.token }, autoConnect: false }
         //@ts-ignore
         this.socket = new window.io(location.href, params)
 
         this.socket.on(topic, (content: string) => {
             const msg = Serialization.parse(content) as Message
-            if (msg.message !== undefined) return config.notify(msg.message)
+            if (msg.message !== undefined) return RpcService.notify(msg.message)
             this._delayTrigger(msg)
         })
         this.socket.on('disconnect', () => {
@@ -67,7 +67,7 @@ class RpcService extends Service {
     }
 
     private _onConfirm = async (msg: InstanceType<typeof Message['rpc']['confirm']['NoticeMessage']>) => {
-        const result = await this.confirm(msg.params.config)
+        const result = await RpcService.confirm(msg.params.config)
         msg.params.config.value = result.value
         msg.params.config.success = result.success
         this.send(msg)

package/output/service-rpc/src/asset/add.ts

@@ -1,7 +1,7 @@
 import { Descriptor, DeserializationObject } from '@vyr/engine'
 import { IMessage } from '../IMessage'
 
-const Method = '/cli/asset.add'
+const Method = '/vyr/asset.add'
 
 interface Params {
     url: string

package/output/service-rpc/src/asset/close.ts

@@ -4,7 +4,7 @@ interface RequestParams {
     url: string
 }
 
-const Method = '/cli/asset.close'
+const Method = '/vyr/asset.close'
 
 class RequestMessage extends IMessage {
     method = Method

package/output/service-rpc/src/asset/copy.ts

@@ -1,6 +1,6 @@
 import { IMessage } from '../IMessage'
 
-const Method = '/cli/asset.copy'
+const Method = '/vyr/asset.copy'
 
 interface RequestParams {
     /**需要复制的文件路径 */

package/output/service-rpc/src/asset/create.ts

@@ -1,6 +1,6 @@
 import { IMessage } from '../IMessage'
 
-const Method = '/cli/asset.create'
+const Method = '/vyr/asset.create'
 
 interface RequestParams {
     fileType: boolean

package/output/service-rpc/src/asset/cut.ts

@@ -1,6 +1,6 @@
 import { IMessage } from '../IMessage'
 
-const Method = '/cli/asset.cut'
+const Method = '/vyr/asset.cut'
 
 interface RequestParams {
     /**需要剪切的文件路径 */

package/output/service-rpc/src/asset/delete.ts

@@ -1,6 +1,6 @@
 import { IMessage } from '../IMessage'
 
-const Method = '/cli/asset.delete'
+const Method = '/vyr/asset.delete'
 
 interface Params {
     urls: string[]

package/output/service-rpc/src/asset/dragdrap.ts

@@ -1,7 +1,7 @@
 import { DraggableEndType, DraggableData } from '@vyr/declare'
 import { IMessage } from '../IMessage'
 
-const Method = '/cli/asset.dragdrap'
+const Method = '/vyr/asset.dragdrap'
 
 interface Params {
     url: string

package/output/service-rpc/src/asset/initialize.ts

@@ -2,7 +2,7 @@ import { DeserializationObject } from '@vyr/engine'
 import { IMessage } from '../IMessage'
 import { VirtualNode } from '../VirtualNode'
 
-const Method = '/cli/asset.initialize'
+const Method = '/vyr/asset.initialize'
 
 class RequestMessage extends IMessage {
     method = Method

package/output/service-rpc/src/asset/open.ts

@@ -1,6 +1,6 @@
 import { IMessage } from '../IMessage'
 
-const Method = '/cli/asset.open'
+const Method = '/vyr/asset.open'
 
 interface RequestParams {
     url: string

package/output/service-rpc/src/asset/remove.ts

@@ -1,6 +1,6 @@
 import { IMessage } from '../IMessage'
 
-const Method = '/cli/asset.remove'
+const Method = '/vyr/asset.remove'
 
 interface Params {
     url: string

package/output/service-rpc/src/asset/rename.ts

@@ -1,6 +1,6 @@
 import { IMessage } from '../IMessage'
 
-const Method = '/cli/asset.rename'
+const Method = '/vyr/asset.rename'
 
 interface RequestParams {
     url: string

package/output/service-rpc/src/asset/select.ts

@@ -1,6 +1,6 @@
 import { IMessage } from '../IMessage'
 
-const Method = '/cli/asset.select'
+const Method = '/vyr/asset.select'
 
 interface RequestParams {
     url: string

package/output/service-rpc/src/asset/update.ts

@@ -1,7 +1,7 @@
 import { Descriptor, DeserializationObject } from '@vyr/engine'
 import { IMessage } from '../IMessage'
 
-const Method = '/cli/asset.update'
+const Method = '/vyr/asset.update'
 
 interface RequestParams {
     url: string

package/output/service-rpc/src/dep/add.ts

@@ -1,6 +1,6 @@
 import { IMessage } from '../IMessage'
 
-const Method = '/cli/dep.add'
+const Method = '/vyr/dep.add'
 
 
 interface NoticeParams {

package/output/service-rpc/src/dep/create.ts

@@ -1,6 +1,6 @@
 import { IMessage } from '../IMessage'
 
-const Method = '/cli/dep.create'
+const Method = '/vyr/dep.create'
 
 
 interface NoticeParams {

package/output/service-rpc/src/dep/delete.ts

@@ -1,6 +1,6 @@
 import { IMessage } from '../IMessage'
 
-const Method = '/cli/dep.delete'
+const Method = '/vyr/dep.delete'
 
 
 interface NoticeParams {

package/output/service-rpc/src/dep/remove.ts

@@ -1,6 +1,6 @@
 import { IMessage } from '../IMessage'
 
-const Method = '/cli/dep.remove'
+const Method = '/vyr/dep.remove'
 
 
 interface NoticeParams {

package/output/service-rpc/src/dep/update.ts

@@ -1,6 +1,6 @@
 import { IMessage } from '../IMessage'
 
-const Method = '/cli/dep.update'
+const Method = '/vyr/dep.update'
 
 
 interface NoticeParams {

package/output/service-rpc/src/domain/Entity.ts

@@ -1,6 +1,13 @@
+import camelcaseKeys from 'camelcase-keys'
+import decamelizeKeys from 'decamelize-keys'
+
 abstract class Entity {
     static primaryKey: string
     static dateFormat = 'YYYY-MM-DD HH:mm:ss'
+    /**下划线转驼峰 */
+    static camelcaseKeys = (data: any) => camelcaseKeys(data, { deep: true })
+    /**驼峰转下划线 */
+    static decamelizeKeys = (data: any) => decamelizeKeys(data, { deep: true })
 
     abstract toVO(): Entity
 

package/output/service-rpc/src/example/apply.ts

@@ -1,6 +1,6 @@
 import { IMessage } from '../IMessage'
 
-const Method = '/cli/example.apply'
+const Method = '/vyr/example.apply'
 
 interface RequestParams {
     example: string

package/output/service-rpc/src/example/create.ts

@@ -1,6 +1,6 @@
 import { IMessage } from '../IMessage'
 
-const Method = '/cli/example.create'
+const Method = '/vyr/example.create'
 
 interface RequestParams {
     name: string

package/output/service-rpc/src/example/delete.ts

@@ -1,6 +1,6 @@
 import { IMessage } from '../IMessage'
 
-const Method = '/cli/example.delete'
+const Method = '/vyr/example.delete'
 
 interface RequestParams {
     example: string

package/output/service-rpc/src/example/initialize.ts

@@ -1,6 +1,6 @@
 import { IMessage } from '../IMessage'
 
-const Method = '/cli/example.initialize'
+const Method = '/vyr/example.initialize'
 
 class RequestMessage extends IMessage {
     method = Method

package/output/service-rpc/src/example/list.ts

@@ -1,7 +1,7 @@
 import { ExampleVO } from '../domain'
 import { IMessage } from '../IMessage'
 
-const Method = '/cli/example.list'
+const Method = '/vyr/example.list'
 
 interface RequestParams {
     name: string

package/output/service-rpc/src/index.ts

@@ -7,7 +7,7 @@ export * from './UseRecord'
 export * from './domain'
 export * from './rpc/confirm'
 
-const path = '/rpc.io'
+const path = '/vyr.io'
 const topic = '/service'
 const tokenKey = '@vyr/key'
 

package/output/service-rpc/src/locale/LanguageProvider.ts

@@ -1,12 +1,16 @@
 import { LanguageProvider } from '@vyr/locale'
 
 interface ZhCNLanguageProvider extends LanguageProvider {
-
+    'request.error.general': string
+    'request.error.401': string
 }
 
 const zhCnLanguageProvider: ZhCNLanguageProvider = {
     id: 'zh_CN',
     name: '@vyr/service-rpc',
+
+    'request.error.general': '服务错误，请稍后重试！',
+    'request.error.401': '无效的会话，或者会话已过期，请重新登录。'
 }
 
 export {

package/output/service-rpc/src/request/index.ts

@@ -0,0 +1,50 @@
+import axios, { AxiosResponse, InternalAxiosRequestConfig } from 'axios'
+import { language } from '../locale';
+import { RpcService } from '../RpcService';
+
+const request = axios.create({
+  baseURL: '',
+})
+
+// 请求拦截器
+request.interceptors.request.use(
+  (config: InternalAxiosRequestConfig) => {
+    const token = RpcService.getToken()
+
+    if (token) {
+      config.headers['Authorization'] = 'Bearer ' + token;
+    }
+
+    // FormData数据去请求头Content-Type
+    if (config.data instanceof FormData) {
+      delete config.headers['Content-Type'];
+    }
+    return config;
+  },
+  (error: any) => {
+    return Promise.reject(error);
+  }
+);
+
+// 响应拦截器
+request.interceptors.response.use(
+  (response: AxiosResponse) => {
+    return response
+  },
+  (error: any) => {
+    let message = language.get('request.error.general')
+    const { response, status } = error;
+
+    if (status === 401) {
+      message = language.get('request.error.401')
+    } else if (response.data !== null && typeof response.data === 'object') {
+      if (response.data.message) message = response.data.message
+    }
+    RpcService.notify(message)
+    return Promise.reject(error);
+  }
+)
+
+export {
+  request
+}

package/output/service-rpc/src/rpc/confirm.ts

@@ -1,7 +1,7 @@
 import { Generate } from '@vyr/engine'
 import { IMessage } from '../IMessage'
 
-const Method = '/cli/rpc.confirm'
+const Method = '/vyr/rpc.confirm'
 
 interface Confirm {
     type?: string

package/output/service-rpc/src/rpc/connection.ts

@@ -1,6 +1,6 @@
 import { IMessage } from '../IMessage'
 
-const Method = '/cli/rpc.connection'
+const Method = '/vyr/rpc.connection'
 
 interface NoticeParams {
     client: string

package/output/service-rpc/src/rpc/disconnect.ts

@@ -1,6 +1,6 @@
 import { IMessage } from '../IMessage'
 
-const Method = '/cli/rpc.disconnect'
+const Method = '/vyr/rpc.disconnect'
 
 interface NoticeParams {
     client: string

package/output/service-rpc/src/rpc/getUser.ts

@@ -2,7 +2,7 @@ import { DeserializationObject } from '@vyr/engine'
 import { IMessage } from '../IMessage'
 import { UserVO } from '../domain'
 
-const Method = '/cli/rpc.getUser'
+const Method = '/vyr/rpc.getUser'
 
 interface RequestParams {
 

package/output/service-rpc/src/rpc/login.ts

@@ -1,6 +1,6 @@
 import { IMessage } from '../IMessage'
 
-const Method = '/cli/rpc.login'
+const Method = '/vyr/rpc.login'
 
 interface RequestParams {
     name: string

package/output/service-rpc/src/rpc/logout.ts

@@ -1,6 +1,6 @@
 import { IMessage } from '../IMessage'
 
-const Method = '/cli/rpc.logout'
+const Method = '/vyr/rpc.logout'
 
 interface Params {
 

package/output/service-rpc/src/rpc/redo.ts

@@ -1,6 +1,6 @@
 import { IMessage } from '../IMessage'
 
-const Method = '/cli/rpc.redo'
+const Method = '/vyr/rpc.redo'
 
 interface NoticeParams { }
 

package/output/service-rpc/src/rpc/undo.ts

@@ -1,6 +1,6 @@
 import { IMessage } from '../IMessage'
 
-const Method = '/cli/rpc.undo'
+const Method = '/vyr/rpc.undo'
 
 interface NoticeParams { }
 

package/output/service-rpc/src/scene/add.ts

@@ -1,7 +1,7 @@
 import { Descriptor, DeserializationObject } from '@vyr/engine'
 import { IMessage } from '../IMessage'
 
-const Method = '/cli/scene.add'
+const Method = '/vyr/scene.add'
 
 interface Params {
     parent: string

package/output/service-rpc/src/scene/create.ts

@@ -1,6 +1,6 @@
 import { IMessage } from '../IMessage'
 
-const Method = '/cli/scene.create'
+const Method = '/vyr/scene.create'
 
 interface Params {
     url: string

package/output/service-rpc/src/scene/delete.ts

@@ -1,6 +1,6 @@
 import { IMessage } from '../IMessage'
 
-const Method = '/cli/scene.delete'
+const Method = '/vyr/scene.delete'
 
 interface Params {
     url: string