ucap/ucap-lg-web
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug fixed

Browse Source
This commit is contained in:
richard-loafle 2020-04-16 09:27:51 +09:00
parent 2435cd88c8
commit d2d106c490
4 changed files with 28 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
package-lock.json generated
View File

@ -1981,9 +1981,9 @@
"integrity": "sha512-nWev387pHxeBHtOu0EvRTVQ0/JeJL44Ew0PzQaiqHsC5mghkJ6ok7z22nk9nmuZ7lONxGJmW7CHT8X8lyviZJg==" "integrity": "sha512-nWev387pHxeBHtOu0EvRTVQ0/JeJL44Ew0PzQaiqHsC5mghkJ6ok7z22nk9nmuZ7lONxGJmW7CHT8X8lyviZJg=="
}, },
"@ucap/protocol": { "@ucap/protocol": {
"version": "0.0.11", "version": "0.0.13",
"resolved": "http://10.81.13.221:8081/nexus/repository/npm-all/@ucap/protocol/-/protocol-0.0.11.tgz", "resolved": "http://10.81.13.221:8081/nexus/repository/npm-all/@ucap/protocol/-/protocol-0.0.13.tgz",
"integrity": "sha512-nmwejglPVtC7elUn8x05ENFyqFz0z2pFibpblqAUW3m8HQHBSIKLqfctVsHzk5iP9/JyCDCTDuJ2DjMhMVJB8g==" "integrity": "sha512-S7RM3ht24ZEp1qNh4fEupgSV1U2JLDqltEt2Xpzk/1UnwLK+O4h1QVSBmfONErP2Ms2tVi3ZXiihWtDlKQ1v9g=="
}, },
"@ucap/protocol-authentication": { "@ucap/protocol-authentication": {
"version": "0.0.5", "version": "0.0.5",
@ -2026,9 +2026,9 @@
"integrity": "sha512-IuFzc8BTGt3CegTm8DNBDa65/hDnFYaUehkv+bbXvsebUUwy8ttpIVm1yi57jl4AQCyYLqxEW0YotCxnICOARA==" "integrity": "sha512-IuFzc8BTGt3CegTm8DNBDa65/hDnFYaUehkv+bbXvsebUUwy8ttpIVm1yi57jl4AQCyYLqxEW0YotCxnICOARA=="
}, },
"@ucap/protocol-ping": { "@ucap/protocol-ping": {
"version": "0.0.4", "version": "0.0.5",
"resolved": "http://10.81.13.221:8081/nexus/repository/npm-all/@ucap/protocol-ping/-/protocol-ping-0.0.4.tgz", "resolved": "http://10.81.13.221:8081/nexus/repository/npm-all/@ucap/protocol-ping/-/protocol-ping-0.0.5.tgz",
"integrity": "sha512-w6jLCCVew66WrDbN/SkC3ND1Rj7u22wkbDCQxuW87hJt/PdfGPu4fnep6OL8GCo4CtLCgUEt7iOWNAxMv8ipUg==" "integrity": "sha512-lr/NZYyPL52xWnEWDq6ex6X+BdpELBn8j66/kFeoJgftLnv0zsWJh47948hbpLlrolE+wHd8Ncb1fw3bbjhCjw=="
}, },
"@ucap/protocol-query": { "@ucap/protocol-query": {
"version": "0.0.5", "version": "0.0.5",
@ -2061,9 +2061,9 @@
"integrity": "sha512-PVrQJC5g+eywOPQ8BATnlr3UDLXW7HDZpNuBCablvtEcylIIIbP0czsZsEWGuLCJqSQ9pZy/sEQDbGiM7yTpmQ==" "integrity": "sha512-PVrQJC5g+eywOPQ8BATnlr3UDLXW7HDZpNuBCablvtEcylIIIbP0czsZsEWGuLCJqSQ9pZy/sEQDbGiM7yTpmQ=="
}, },
"@ucap/web-socket": { "@ucap/web-socket": {
"version": "0.0.5", "version": "0.0.9",
"resolved": "http://10.81.13.221:8081/nexus/repository/npm-all/@ucap/web-socket/-/web-socket-0.0.5.tgz", "resolved": "http://10.81.13.221:8081/nexus/repository/npm-all/@ucap/web-socket/-/web-socket-0.0.9.tgz",
"integrity": "sha512-BsdH5llLxlFGPjER3rvSLaNKtdQyXhhVyAbPStYJPstBNfcyq0Al8/C97aXFWlpLrmvib+s3AT7o1OmPhv8ZWw==" "integrity": "sha512-X3KABxW1lLMbLOkdBt59WuT4mMfsCki7fFiQIIn9QX/8WlJtdHOV8/AA7WvlmccaxSG8Y0AjSs9AgO0bmUCI9A=="
}, },
"@ucap/web-storage": { "@ucap/web-storage": {
"version": "0.0.5", "version": "0.0.5",

6
package.json
View File

@ -79,7 +79,7 @@
"@ucap/ng-ui-authentication": "~0.0.15", "@ucap/ng-ui-authentication": "~0.0.15",
"@ucap/ng-ui-skin-default": "~0.0.1", "@ucap/ng-ui-skin-default": "~0.0.1",
"@ucap/pi": "~0.0.5", "@ucap/pi": "~0.0.5",
"@ucap/protocol": "~0.0.11", "@ucap/protocol": "~0.0.13",
"@ucap/protocol-authentication": "~0.0.5", "@ucap/protocol-authentication": "~0.0.5",
"@ucap/protocol-buddy": "~0.0.5", "@ucap/protocol-buddy": "~0.0.5",
"@ucap/protocol-event": "~0.0.5", "@ucap/protocol-event": "~0.0.5",
@ -88,14 +88,14 @@
"@ucap/protocol-info": "~0.0.5", "@ucap/protocol-info": "~0.0.5",
"@ucap/protocol-inner": "~0.0.4", "@ucap/protocol-inner": "~0.0.4",
"@ucap/protocol-option": "~0.0.7", "@ucap/protocol-option": "~0.0.7",
"@ucap/protocol-ping": "~0.0.4", "@ucap/protocol-ping": "~0.0.5",
"@ucap/protocol-query": "~0.0.5", "@ucap/protocol-query": "~0.0.5",
"@ucap/protocol-room": "~0.0.5", "@ucap/protocol-room": "~0.0.5",
"@ucap/protocol-service": "~0.0.4", "@ucap/protocol-service": "~0.0.4",
"@ucap/protocol-status": "~0.0.5", "@ucap/protocol-status": "~0.0.5",
"@ucap/protocol-sync": "~0.0.4", "@ucap/protocol-sync": "~0.0.4",
"@ucap/protocol-umg": "~0.0.5", "@ucap/protocol-umg": "~0.0.5",
"@ucap/web-socket": "~0.0.5", "@ucap/web-socket": "~0.0.9",
"@ucap/web-storage": "~0.0.5", "@ucap/web-storage": "~0.0.5",
"autolinker": "^3.13.0", "autolinker": "^3.13.0",
"axios": "^0.19.2", "axios": "^0.19.2",

38
src/app/resolvers/app-session.resolver.ts
View File

@ -119,30 +119,22 @@ export class AppSessionResolver implements Resolve<void> {
}) })
); );
this.protocolService this.protocolService.connect(versionInfo2Res.serverIp);
.connect(versionInfo2Res.serverIp)
.pipe(take(1)) const destroy$ = new Subject<boolean>();
this.sessionStorageService.changed$
.pipe(
takeUntil(destroy$),
filter((param) => AppKey.LoginSession === param.key),
map((param) => param.value)
)
.subscribe( .subscribe(
() => { (v) => {
const destroy$ = new Subject<boolean>(); if ((v as LoginSession).alive) {
this.sessionStorageService.changed$ destroy$.next(true);
.pipe( destroy$.unsubscribe();
takeUntil(destroy$), resolve();
filter((param) => AppKey.LoginSession === param.key), }
map((param) => param.value)
)
.subscribe(
(v) => {
if ((v as LoginSession).alive) {
destroy$.next(true);
destroy$.unsubscribe();
resolve();
}
},
(error) => {
reject(error);
}
);
}, },
(error) => { (error) => {
reject(error); reject(error);

2
src/app/services/app.service.ts
View File

@ -148,7 +148,7 @@ export class AppService {
const initProtocol = new Promise<void>(async (resolve, reject) => { const initProtocol = new Promise<void>(async (resolve, reject) => {
try { try {
this.protocolService.connection$.subscribe((connected) => { this.protocolService.connected$.subscribe((connected) => {
if (connected) { if (connected) {
this.appAuthenticationService this.appAuthenticationService
.createSession() .createSession()