peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-18 12:37:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

video merge

Browse Source
This commit is contained in:
Peter Maquiran
2024-02-07 16:45:53 +01:00
parent 4c56fa819c
commit 60edd1ca01
11 changed files with 586 additions and 421 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gabinete-digital-fo.code-workspace
-3
View File
@@ -14,9 +14,6 @@
}, },
{ {
"path": "../sih" "path": "../sih"
},
{
"path": "../Ionic-Video-Capture-Play-main"
} }
], ],
"settings": { "settings": {
package-lock.json
Generated
+80 -9
View File
@@ -48,7 +48,9 @@
"@capacitor/push-notifications": "^5.1.0", "@capacitor/push-notifications": "^5.1.0",
"@capacitor/share": "^4.1.0", "@capacitor/share": "^4.1.0",
"@capacitor/storage": "^1.2.5", "@capacitor/storage": "^1.2.5",
"@capawesome/capacitor-file-picker": "^5.1.1", "@capawesome/capacitor-file-picker": "^5.3.0",
"@ffmpeg/core": "^0.12.6",
"@ffmpeg/ffmpeg": "^0.12.10",
"@fortawesome/angular-fontawesome": "^0.9.0", "@fortawesome/angular-fontawesome": "^0.9.0",
"@fortawesome/fontawesome-free": "^5.15.3", "@fortawesome/fontawesome-free": "^5.15.3",
"@fortawesome/fontawesome-svg-core": "^1.2.35", "@fortawesome/fontawesome-svg-core": "^1.2.35",
@@ -153,6 +155,7 @@
"lite-server": "^2.6.1", "lite-server": "^2.6.1",
"minisearch": "^6.0.1", "minisearch": "^6.0.1",
"moment": "^2.29.3", "moment": "^2.29.3",
"mux.js": "^6.3.0",
"neverthrow": "^6.1.0", "neverthrow": "^6.1.0",
"ng-lazyload-image": "^9.1.2", "ng-lazyload-image": "^9.1.2",
"ng2-pdf-viewer": "^3.0.8", "ng2-pdf-viewer": "^3.0.8",
@@ -3615,7 +3618,6 @@
"version": "7.14.8", "version": "7.14.8",
"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.8.tgz", "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.8.tgz",
"integrity": "sha512-twj3L8Og5SaCRCErB4x4ajbvBIVV77CGeFglHpeg5WC5FF8TZzBWXtTJ4MqaD9QszLYTtr+IsaAL2rEUevb+eg==", "integrity": "sha512-twj3L8Og5SaCRCErB4x4ajbvBIVV77CGeFglHpeg5WC5FF8TZzBWXtTJ4MqaD9QszLYTtr+IsaAL2rEUevb+eg==",
"dev": true,
"dependencies": { "dependencies": {
"regenerator-runtime": "^0.13.4" "regenerator-runtime": "^0.13.4"
}, },
@@ -4018,9 +4020,9 @@
} }
}, },
"node_modules/@capawesome/capacitor-file-picker": { "node_modules/@capawesome/capacitor-file-picker": {
"version": "5.1.1", "version": "5.3.0",
"resolved": "https://registry.npmjs.org/@capawesome/capacitor-file-picker/-/capacitor-file-picker-5.1.1.tgz", "resolved": "https://registry.npmjs.org/@capawesome/capacitor-file-picker/-/capacitor-file-picker-5.3.0.tgz",
"integrity": "sha512-VtWV/er8Kux5Bbb0BtRneAaL8aj7zKoSPSR5sn3QlVBccete+CX+nH3scg6JKrogoitNP35PS33LIoaz9WVZiA==", "integrity": "sha512-r+cfD+9FCBXMYtckSovgi7WoMWT5cxzNDaH3SDNuiORiyQklOl+7DExfhW00p1DqsDR+f50nADk/NBb4IsGVYg==",
"funding": [ "funding": [
{ {
"type": "github", "type": "github",
@@ -4231,6 +4233,33 @@
"node": ">=10.0.0" "node": ">=10.0.0"
} }
}, },
"node_modules/@ffmpeg/core": {
"version": "0.12.6",
"resolved": "https://registry.npmjs.org/@ffmpeg/core/-/core-0.12.6.tgz",
"integrity": "sha512-PrjWBTfGn2WVn9T7wGnzfFwChbqWeZc7tM9vvJZVRadYFUDakfzy7W0LpYC0cvvK0xT82qlBsk38lQhJ/Hps5A==",
"engines": {
"node": ">=16.x"
}
},
"node_modules/@ffmpeg/ffmpeg": {
"version": "0.12.10",
"resolved": "https://registry.npmjs.org/@ffmpeg/ffmpeg/-/ffmpeg-0.12.10.tgz",
"integrity": "sha512-lVtk8PW8e+NUzGZhPTWj2P1J4/NyuCrbDD3O9IGpSeLYtUZKBqZO8CNj1WYGghep/MXoM8e1qVY1GztTkf8YYQ==",
"dependencies": {
"@ffmpeg/types": "^0.12.2"
},
"engines": {
"node": ">=18.x"
}
},
"node_modules/@ffmpeg/types": {
"version": "0.12.2",
"resolved": "https://registry.npmjs.org/@ffmpeg/types/-/types-0.12.2.tgz",
"integrity": "sha512-NJtxwPoLb60/z1Klv0ueshguWQ/7mNm106qdHkB4HL49LXszjhjCCiL+ldHJGQ9ai2Igx0s4F24ghigy//ERdA==",
"engines": {
"node": ">=16.x"
}
},
"node_modules/@firebase/analytics": { "node_modules/@firebase/analytics": {
"version": "0.6.18", "version": "0.6.18",
"resolved": "https://registry.npmjs.org/@firebase/analytics/-/analytics-0.6.18.tgz", "resolved": "https://registry.npmjs.org/@firebase/analytics/-/analytics-0.6.18.tgz",
@@ -26817,6 +26846,22 @@
"resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz", "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
"integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==" "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA=="
}, },
"node_modules/mux.js": {
"version": "6.3.0",
"resolved": "https://registry.npmjs.org/mux.js/-/mux.js-6.3.0.tgz",
"integrity": "sha512-/QTkbSAP2+w1nxV+qTcumSDN5PA98P0tjrADijIzQHe85oBK3Akhy9AHlH0ne/GombLMz1rLyvVsmrgRxoPDrQ==",
"dependencies": {
"@babel/runtime": "^7.11.2",
"global": "^4.4.0"
},
"bin": {
"muxjs-transmux": "bin/transmux.js"
},
"engines": {
"node": ">=8",
"npm": ">=5"
}
},
"node_modules/nan": { "node_modules/nan": {
"version": "2.17.0", "version": "2.17.0",
"resolved": "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz", "resolved": "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz",
@@ -46185,7 +46230,6 @@
"version": "7.14.8", "version": "7.14.8",
"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.8.tgz", "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.8.tgz",
"integrity": "sha512-twj3L8Og5SaCRCErB4x4ajbvBIVV77CGeFglHpeg5WC5FF8TZzBWXtTJ4MqaD9QszLYTtr+IsaAL2rEUevb+eg==", "integrity": "sha512-twj3L8Og5SaCRCErB4x4ajbvBIVV77CGeFglHpeg5WC5FF8TZzBWXtTJ4MqaD9QszLYTtr+IsaAL2rEUevb+eg==",
"dev": true,
"requires": { "requires": {
"regenerator-runtime": "^0.13.4" "regenerator-runtime": "^0.13.4"
} }
@@ -46494,9 +46538,9 @@
"requires": {} "requires": {}
}, },
"@capawesome/capacitor-file-picker": { "@capawesome/capacitor-file-picker": {
"version": "5.1.1", "version": "5.3.0",
"resolved": "https://registry.npmjs.org/@capawesome/capacitor-file-picker/-/capacitor-file-picker-5.1.1.tgz", "resolved": "https://registry.npmjs.org/@capawesome/capacitor-file-picker/-/capacitor-file-picker-5.3.0.tgz",
"integrity": "sha512-VtWV/er8Kux5Bbb0BtRneAaL8aj7zKoSPSR5sn3QlVBccete+CX+nH3scg6JKrogoitNP35PS33LIoaz9WVZiA==", "integrity": "sha512-r+cfD+9FCBXMYtckSovgi7WoMWT5cxzNDaH3SDNuiORiyQklOl+7DExfhW00p1DqsDR+f50nADk/NBb4IsGVYg==",
"requires": {} "requires": {}
}, },
"@cnakazawa/watch": { "@cnakazawa/watch": {
@@ -46659,6 +46703,24 @@
"integrity": "sha512-Fxt+AfXgjMoin2maPIYzFZnQjAXjAL0PHscM5pRTtatFqB+vZxAM9tLp2Optnuw3QOQC40jTNeGYFOMvyf7v9g==", "integrity": "sha512-Fxt+AfXgjMoin2maPIYzFZnQjAXjAL0PHscM5pRTtatFqB+vZxAM9tLp2Optnuw3QOQC40jTNeGYFOMvyf7v9g==",
"dev": true "dev": true
}, },
"@ffmpeg/core": {
"version": "0.12.6",
"resolved": "https://registry.npmjs.org/@ffmpeg/core/-/core-0.12.6.tgz",
"integrity": "sha512-PrjWBTfGn2WVn9T7wGnzfFwChbqWeZc7tM9vvJZVRadYFUDakfzy7W0LpYC0cvvK0xT82qlBsk38lQhJ/Hps5A=="
},
"@ffmpeg/ffmpeg": {
"version": "0.12.10",
"resolved": "https://registry.npmjs.org/@ffmpeg/ffmpeg/-/ffmpeg-0.12.10.tgz",
"integrity": "sha512-lVtk8PW8e+NUzGZhPTWj2P1J4/NyuCrbDD3O9IGpSeLYtUZKBqZO8CNj1WYGghep/MXoM8e1qVY1GztTkf8YYQ==",
"requires": {
"@ffmpeg/types": "^0.12.2"
}
},
"@ffmpeg/types": {
"version": "0.12.2",
"resolved": "https://registry.npmjs.org/@ffmpeg/types/-/types-0.12.2.tgz",
"integrity": "sha512-NJtxwPoLb60/z1Klv0ueshguWQ/7mNm106qdHkB4HL49LXszjhjCCiL+ldHJGQ9ai2Igx0s4F24ghigy//ERdA=="
},
"@firebase/analytics": { "@firebase/analytics": {
"version": "0.6.18", "version": "0.6.18",
"resolved": "https://registry.npmjs.org/@firebase/analytics/-/analytics-0.6.18.tgz", "resolved": "https://registry.npmjs.org/@firebase/analytics/-/analytics-0.6.18.tgz",
@@ -64261,6 +64323,15 @@
"resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz", "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
"integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==" "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA=="
}, },
"mux.js": {
"version": "6.3.0",
"resolved": "https://registry.npmjs.org/mux.js/-/mux.js-6.3.0.tgz",
"integrity": "sha512-/QTkbSAP2+w1nxV+qTcumSDN5PA98P0tjrADijIzQHe85oBK3Akhy9AHlH0ne/GombLMz1rLyvVsmrgRxoPDrQ==",
"requires": {
"@babel/runtime": "^7.11.2",
"global": "^4.4.0"
}
},
"nan": { "nan": {
"version": "2.17.0", "version": "2.17.0",
"resolved": "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz", "resolved": "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz",
src/app/services/socket-connection-mcr.service.ts
+247 -215
View File
@@ -14,9 +14,9 @@ export class SocketConnectionMCRService {
// private onDisconnect: Function[] = [] // private onDisconnect: Function[] = []
// private onConnect: Function[] = [] // private onConnect: Function[] = []
// constructor(private http: HttpClient,) { constructor(private http: HttpClient, private _CMAPIService: CMAPIService) {
// window["http"] = this.http window["http"] = this.http
// } }
// connect() { // connect() {
@@ -67,137 +67,52 @@ export class SocketConnectionMCRService {
} }
// class ReconnectingWebSocketSignalR { class ReconnectingWebSocketSignalR {
// private connection: any private connection: any
// isOpen: boolean = false isOpen: boolean = false
// private callbacks: Function[] = []
// private onDisconnect: Function[] = []
// private onConnect: Function[] = []
// private stop = true
// constructor() {}
// connect() {
// console.log("try to connect=================================")
// this.stop = false
// this.connection = new signalR.HubConnectionBuilder()
// .withUrl("https://gdcmapi-dev.dyndns.info/FileHub", {
// transport: signalR.HttpTransportType.LongPolling,
// accessTokenFactory: () => SessionStore.user.Authorization
// }).configureLogging(signalR.LogLevel.Information)
// .build();
// this.connection.start()
// .then(() => {
// this.isOpen = true;
// console.log('WebSocket connection established');
// this.onConnect.forEach(callback => callback());
// })
// .catch((error) => {
// console.error("Error starting SignalR connection:", error);
// });
// this.connection.on("ReceiveMessage", (message) => {
// const data: any = JSON.parse(message)
// console.log("ReceiveMessage", data)
// this.callbacks.forEach(callback => callback(data));
// })
// this.connection.onclose((error) => {
// console.log('WebSocket connection closed..');
// this.isOpen = false;
// this.onDisconnect.forEach(callback => callback());
// // Attempt to reconnect after a delay
// if(this.stop == false) {
// setTimeout(() => {
// this.connect();
// }, 1000); // Adjust the delay as needed
// }
// });
// }
// disconnect() {
// this.stop = true
// if(this.isOpen == true) {
// this.connection.stop()
// .then(() => {
// console.log('WebSocket connection was closed by client');
// this.isOpen = false;
// this.onDisconnect.forEach(callback => callback());
// console.log("SignalR connection stopped.");
// })
// .catch((error) => {
// console.error("Error stopping SignalR connection by client:", error);
// });
// }
// }
// subscribe(callback) {
// this.callbacks.push(callback);
// }
// unsubscribe(callback) {
// this.callbacks = this.callbacks.filter(cb => cb !== callback);
// }
// onDisconnectCallback(callback) {
// this.onDisconnect.push(callback)
// }
// onConnectCallback(callback) {
// this.onConnect.push(callback)
// }
// }
interface socketResponse {
index: string
Guid: string
IsCompleted: Boolean
}
class ReconnectingWebSocket {
private url: string
private socket
isOpen: boolean
private callbacks: Function[] = [] private callbacks: Function[] = []
private onDisconnect: Function[] = [] private onDisconnect: Function[] = []
private onConnect: Function[] = [] private onConnect: Function[] = []
private whenConnected: Function[] = []
private stop = true private stop = true
http: HttpClient = window["http"]
constructor(url) { constructor() {}
this.url = url;
this.socket = null;
this.isOpen = false;
this.connect();
}
connect() { connect() {
this.socket = new WebSocket(this.url); console.log("try to connect=================================")
this.stop = false
this.socket.addEventListener('open', (event) => { this.connection = new signalR.HubConnectionBuilder()
.withUrl("https://gdcmapi-dev.dyndns.info/FileHub", {
transport: signalR.HttpTransportType.LongPolling,
accessTokenFactory: () => SessionStore.user.Authorization
}).configureLogging(signalR.LogLevel.Information)
.build();
this.connection.start()
.then(() => {
this.isOpen = true; this.isOpen = true;
console.log('WebSocket connection established'); console.log('WebSocket connection established');
// Example: Send a message to the server
this.socket.send('Hello, WebSocket Server!');
this.onConnect.forEach(callback => callback()); this.onConnect.forEach(callback => callback());
this.whenConnected.forEach(callback => callback())
})
.catch((error) => {
console.error("Error starting SignalR connection:", error);
}); });
this.socket.addEventListener('message', (event) => {
const data: socketResponse = JSON.parse(event.data) this.connection.on("ReceiveMessage", (message) => {
const data: any = JSON.parse(message)
console.log("ReceiveMessage", data)
this.callbacks.forEach(callback => callback(data)); this.callbacks.forEach(callback => callback(data));
}); })
this.socket.addEventListener('close', (event) => { this.connection.onclose((error) => {
console.log('WebSocket connection closed'); console.log('WebSocket connection closed..');
this.isOpen = false; this.isOpen = false;
this.onDisconnect.forEach(callback => callback()); this.onDisconnect.forEach(callback => callback());
// Attempt to reconnect after a delay // Attempt to reconnect after a delay
@@ -206,22 +121,27 @@ class ReconnectingWebSocket {
this.connect(); this.connect();
}, 1000); // Adjust the delay as needed }, 1000); // Adjust the delay as needed
} }
}); });
} }
send(message) { commit(path) {
if (this.isOpen) { this.connection.invoke("CommitUpload", path).catch(err => console.error(err.toString()));
this.socket.send(message);
} else {
console.error('WebSocket connection is not open. Unable to send message.');
}
} }
disconnect() { disconnect() {
this.stop = true this.stop = true
if (this.isOpen) { if(this.isOpen == true) {
this.isOpen = false; this.connection.stop()
this.socket.close(); .then(() => {
console.log('WebSocket connection was closed by client');
this.isOpen = false;
this.onDisconnect.forEach(callback => callback());
console.log("SignalR connection stopped.");
})
.catch((error) => {
console.error("Error stopping SignalR connection by client:", error);
});
} }
} }
@@ -239,94 +159,116 @@ class ReconnectingWebSocket {
onConnectCallback(callback) { onConnectCallback(callback) {
this.onConnect.push(callback) this.onConnect.push(callback)
} }
}
export class ObjectMergeNotification{
socket = new ReconnectingWebSocket('ws://localhost:3002');
callbacks: {[GUID: string]: Function} = {}
runWatch = true
CMAPIService: CMAPIService = window["CMAPIAPIRepository"]
watchCount = 0
constructor() {
this.socket.onDisconnectCallback(()=> {
console.log("run watch")
this.runWatch = true
this.watch()
})
this.socket.onConnectCallback(()=> {
console.log("open trigger")
this.runWatch = false
})
this.socket.subscribe((data: socketResponse) => {
if(data.IsCompleted == true) {
console.log("==================!!!====================")
try {
this.callbacks[data.Guid](data)
delete this.callbacks[data.Guid]
} catch (error) {}
} else {
console.log("else", data)
}
})
this.watch()
}
async watch() {
this.watchCount = 0;
if(this.runWatch) {
setTimeout(async () => {
for(const [key, funx] of Object.entries(this.callbacks)) {
const request = await this.CMAPIService.getVideoHeader(key)
if(request.isOk()) {
funx()
delete this.callbacks[key]
}
}
this.watchCount++
if(this.watchCount <= 15) {
this.watch()
} else {
this.runWatch = false
}
}, 1000)
registerWhenConnected(f: Function) {
if(this.isOpen) {
f();
} else { } else {
console.log("end loop============================") this.whenConnected.push(f);
} }
}
close() {
this.socket.disconnect();
this.watchCount = 0;
this.runWatch = false
} }
subscribe(GUID, callback:Function) {
this.callbacks[GUID] = callback;
}
unsubscribe(GUID) {
delete this.callbacks[GUID]
}
} }
interface socketResponse {
index: string
Guid: string
IsCompleted: Boolean
}
// class ReconnectingWebSocket {
// private url: string
// private socket
// isOpen: boolean
// private callbacks: Function[] = []
// private onDisconnect: Function[] = []
// private onConnect: Function[] = []
// private whenConnected: Function[] = []
// private stop = true
// http: HttpClient = window["http"]
// constructor(url) {
// this.url = url;
// this.socket = null;
// this.isOpen = false;
// }
// connect() {
// this.socket = new WebSocket(this.url);
// this.socket.addEventListener('open', (event) => {
// this.isOpen = true;
// console.log('WebSocket connection established');
// // Example: Send a message to the server
// this.socket.send('Hello, WebSocket Server!');
// this.onConnect.forEach(callback => callback());
// this.whenConnected.forEach(callback => callback())
// });
// this.socket.addEventListener('message', (event) => {
// const data: socketResponse = JSON.parse(event.data)
// this.callbacks.forEach(callback => callback(data));
// });
// this.socket.addEventListener('close', (event) => {
// console.log('WebSocket connection closed');
// this.isOpen = false;
// this.onDisconnect.forEach(callback => callback());
// // Attempt to reconnect after a delay
// if(this.stop == false) {
// setTimeout(() => {
// this.connect();
// }, 1000); // Adjust the delay as needed
// }
// });
// }
// send(message) {
// if (this.isOpen) {
// this.socket.send(message);
// } else {
// console.error('WebSocket connection is not open. Unable to send message.');
// }
// }
// disconnect() {
// this.stop = true
// if (this.isOpen) {
// this.isOpen = false;
// this.socket.close();
// }
// }
// subscribe(callback) {
// this.callbacks.push(callback);
// }
// unsubscribe(callback) {
// this.callbacks = this.callbacks.filter(cb => cb !== callback);
// }
// onDisconnectCallback(callback) {
// this.onDisconnect.push(callback)
// }
// onConnectCallback(callback) {
// this.onConnect.push(callback)
// }
// registerWhenConnected(f: Function) {
// if(this.isOpen) {
// f();
// } else {
// this.whenConnected.push(f);
// }
// }
// }
// export class ObjectMergeNotification{ // export class ObjectMergeNotification{
// socket = new ReconnectingWebSocketSignalR() // socket = new ReconnectingWebSocket('ws://localhost:3002');
// callbacks: {[GUID: string]: Function} = {} // callbacks: {[GUID: string]: Function} = {}
// runWatch = true // runWatch = true
// CMAPIService: CMAPIService = window["CMAPIAPIRepository"] // CMAPIService: CMAPIService = window["CMAPIAPIRepository"]
@@ -340,15 +282,14 @@ export class ObjectMergeNotification{
// }) // })
// this.socket.onConnectCallback(()=> { // this.socket.onConnectCallback(()=> {
// console.log("open trigger") // console.log("open trigger")
// this.runWatch = false // this.runWatch = false
// }) // })
// this.socket.subscribe((data: socketResponse) => { // this.socket.subscribe((data: socketResponse) => {
// if(data.IsCompleted == true) { // if(data.IsCompleted == true) {
// console.log("==================!!!====================") // console.log("==================!!!====================")
// try { // try {
// this.callbacks[data.Guid](data) // this.callbacks[data.Guid](data)
// delete this.callbacks[data.Guid] // delete this.callbacks[data.Guid]
// } catch (error) {} // } catch (error) {}
@@ -357,15 +298,11 @@ export class ObjectMergeNotification{
// } // }
// }) // })
// this.socket.connect();
// this.watch() // this.watch()
// } // }
// connect() {
// close() { // this.socket.connect()
// this.socket.disconnect();
// this.watchCount = 0;
// this.runWatch = false
// } // }
// async watch() { // async watch() {
@@ -386,11 +323,11 @@ export class ObjectMergeNotification{
// this.watchCount++ // this.watchCount++
// if(this.watchCount <= 15) { // if(this.watchCount <= 15) {
// this.watch() // this.watch()
// } else { // } else {
// this.runWatch = false // this.runWatch = false
// } // }
// }, 1000) // }, 1000)
@@ -399,6 +336,12 @@ export class ObjectMergeNotification{
// } // }
// } // }
// close() {
// this.socket.disconnect();
// this.watchCount = 0;
// this.runWatch = false
// }
// subscribe(GUID, callback:Function) { // subscribe(GUID, callback:Function) {
// this.callbacks[GUID] = callback; // this.callbacks[GUID] = callback;
// } // }
@@ -408,3 +351,92 @@ export class ObjectMergeNotification{
// } // }
// } // }
export class ObjectMergeNotification{
socket = new ReconnectingWebSocketSignalR()
callbacks: {[GUID: string]: Function} = {}
runWatch = true
CMAPIService: CMAPIService = window["CMAPIAPIRepository"]
watchCount = 0
constructor() {
this.socket.onDisconnectCallback(()=> {
console.log("run watch")
this.runWatch = true
this.watch()
})
this.socket.onConnectCallback(()=> {
console.log("open trigger")
this.runWatch = false
})
this.socket.subscribe((data: socketResponse) => {
if(data.IsCompleted == true) {
console.log("==================!!!====================")
try {
this.callbacks[data.Guid](data)
delete this.callbacks[data.Guid]
} catch (error) {}
} else {
console.log("else", data)
}
})
this.socket.connect();
this.watch()
}
connect() {
this.socket.connect();
}
close() {
this.socket.disconnect();
this.watchCount = 0;
this.runWatch = false
}
async watch() {
// this.watchCount = 0;
// if(this.runWatch) {
// setTimeout(async () => {
// for(const [key, funx] of Object.entries(this.callbacks)) {
// const request = await this.CMAPIService.getVideoHeader(key)
// if(request.isOk()) {
// funx()
// delete this.callbacks[key]
// }
// }
// this.watchCount++
// if(this.watchCount <= 15) {
// this.watch()
// } else {
// this.runWatch = false
// }
// }, 1000)
// } else {
// console.log("end loop============================")
// }
}
subscribe(GUID, callback:Function) {
this.callbacks[GUID] = callback;
}
unsubscribe(GUID) {
delete this.callbacks[GUID]
}
}
src/app/shared/API/middleware/middleware-service.service.ts
+12 -5
View File
@@ -23,7 +23,7 @@ export class MiddlewareServiceService {
window["MiddlewareServiceService"] = this window["MiddlewareServiceService"] = this
} }
refreshToken(refreshToken: string){ refreshToken(refreshToken: string) {
const data = { const data = {
refreshToken: refreshToken refreshToken: refreshToken
} }
@@ -186,15 +186,13 @@ export class MiddlewareServiceService {
const headers = new HttpHeaders(); const headers = new HttpHeaders();
headers.set('Authorization', 'Bearer ' + SessionStore.user.Authorization); headers.set('Authorization', 'Bearer ' + SessionStore.user.Authorization);
const geturl = 'http://localhost:3001/FileHub'; // const geturl = 'http://localhost:3001/FileHub';
// const geturl = environment.apiURL + 'Tasks/DelegateTask'; const geturl = environment.apiPCURL + 'FileContent/UploadFile';
// const geturl = environment.apiPCURL + 'FileContent';
let options = { let options = {
headers: headers headers: headers
}; };
const formData = new FormData(); const formData = new FormData();
formData.append("blobFile", blobFile); formData.append("blobFile", blobFile);
@@ -208,6 +206,15 @@ export class MiddlewareServiceService {
return this.http.post<IuploadFileLK>(`${geturl}`, formData, options) return this.http.post<IuploadFileLK>(`${geturl}`, formData, options)
} }
CMAPIRequestUpload() {
const geturl = environment.apiPCURL + 'FileContent/RequestUpload';
return this.http.get<string>(`${geturl}`)
}
CMAPIUploadStatus() {
const geturl = environment.apiPCURL + 'FileContent/UploadStatus';
return this.http.get<string>(`${geturl}`)
}
tryToReachTheServer() { tryToReachTheServer() {
src/app/shared/publication/new-publication/new-publication.page.html
+22 -16
View File
@@ -56,33 +56,35 @@
<ion-img *ngIf="checkFileType.checkFileType(seleted.FileExtension) == 'image'" <ion-img *ngIf="checkFileType.checkFileType(seleted.FileExtension) == 'image'"
name="image" ngDefaultControl [src]="seleted.FileBase64" style="height: 69px;"></ion-img> name="image" ngDefaultControl [src]="seleted.FileBase64" style="height: 69px;"></ion-img>
<div *ngIf="checkFileType.checkFileType(seleted.FileExtension) == 'video' && seleted.chucksManager" style="background: #ededed;">
<!-- <div class="progress-container" *ngIf="checkFileType.checkFileType(seleted.FileExtension) == 'video'">
<div class="progress-bar" id="myProgressBar"></div>
</div> -->
<!-- <div *ngIf="checkFileType.checkFileType(seleted.FileExtension) == 'video'">
<mat-progress-bar <mat-progress-bar
*ngIf="seleted.chucksManager"
mode="determinate" mode="determinate"
[style.width]="seleted.chucksManager.uploadPercentage" style="width: 50%"
></mat-progress-bar> ></mat-progress-bar>
</div> -->
</div>
<video *ngIf="checkFileType.checkFileType(seleted.FileExtension) == 'video' && checkDesktop() == true" width="70" height="70" <video *ngIf="checkFileType.checkFileType(seleted.FileExtension) == 'video' && checkDesktop() == true" width="70" height="70"
preload="metadata" webkit-playsinline="webkit-playsinline"> preload="metadata" webkit-playsinline="webkit-playsinline">
<source type="video/mp4" [src]="seleted.url"> <source type="video/mp4" [src]="seleted.FileBase64">
</video> </video>
<ion-icon *ngIf="seleted?.chucksManager?.manualRetry" src="assets/images/retry-svgrepo-com.svg" class="icon-download font-12"> </ion-icon> <video *ngIf="checkFileType.checkFileType(seleted.FileExtension) == 'video' && checkTableDivice() == true" width="70" height="70"
preload="metadata" webkit-playsinline="webkit-playsinline">
<source type="video/mp4" [src]="seleted.FileBase64">
</video>
</div> </div>
</div> </div>
<!-- Display the blurred image and count if there are more images -->
<div *ngIf="seletedContent.length > displayLimit" lot="start">
<ion-img [src]="'data:image/jpg;base64,' + seletedContent[displayLimit - 1].Base64"
style="filter: blur(5px);"></ion-img>
<p>mais {{ seletedContent.length - displayLimit }}</p>
</div>
<ion-label class="pl-10"> <ion-label class="pl-10">
<p>{{capturedImageTitle}}</p> <p>{{capturedImageTitle}}</p>
@@ -144,6 +146,10 @@
</div> </div>
</ion-label> </ion-label>
</div> </div>
<video id="yourVideoElementId" >videoss</video>
</div> </div>
</ion-content> </ion-content>
src/app/shared/publication/new-publication/new-publication.page.ts
+39 -28
View File
@@ -265,9 +265,9 @@ export class NewPublicationPage implements OnInit {
).then(r => r.blob()); */ ).then(r => r.blob()); */
/* console.log(await blob.arrayBuffer()); /* console.log(await blob.arrayBuffer());
console.log("base64 :data:video/mp4;base64,",this.arrayBufferToBase64(await blob.arrayBuffer())) */ console.log("base64 :data:video/mp4;base64,",this.arrayBufferToBase64(await blob.arrayBuffer())) */
this.convertBlobToBase64(blobFile.blob).then((value: string) => { this.convertBlobToBase64(blobFile.blob).then((value: string) => {
@@ -445,7 +445,6 @@ export class NewPublicationPage implements OnInit {
Files: this.seletedContent, Files: this.seletedContent,
} }
this.publicationFormMV.setDataToFrom(this.publication) this.publicationFormMV.setDataToFrom(this.publication)
const upload = await this.publicationFormMV.uploadVideosFiles() const upload = await this.publicationFormMV.uploadVideosFiles()
@@ -455,10 +454,12 @@ export class NewPublicationPage implements OnInit {
e.OriginalFileName = e.chucksManager.path.replace(".mp4", "") e.OriginalFileName = e.chucksManager.path.replace(".mp4", "")
e.FileExtension = "mp4" e.FileExtension = "mp4"
} }
this.publicationFormMV.ObjectMergeNotification.socket.commit(e.chucksManager.path)
return e return e
}) })
console.log("this.publication.Files", this.publication.Files) console.log("this.publication.Files", this.publication.Files)
} }
@@ -480,7 +481,7 @@ export class NewPublicationPage implements OnInit {
this.httpErroHandle.httpStatusHandle(error) this.httpErroHandle.httpStatusHandle(error)
if (error.status == 404) { if (error.status == 404) {
this.PublicationFolderService.deletePost(this.publication.ProcessId, this.publication.DocumentId) this.PublicationFolderService.deletePost(this.publication.ProcessId, this.publication.DocumentId)
this.goBack(); //this.goBack();
} }
} finally { } finally {
loader.remove() loader.remove()
@@ -507,7 +508,6 @@ export class NewPublicationPage implements OnInit {
Files: this.seletedContent, Files: this.seletedContent,
} }
this.publicationFormMV.setDataToFrom(this.publication) this.publicationFormMV.setDataToFrom(this.publication)
const upload = await this.publicationFormMV.uploadVideosFiles() const upload = await this.publicationFormMV.uploadVideosFiles()
@@ -519,49 +519,60 @@ export class NewPublicationPage implements OnInit {
e.Base64 = "" e.Base64 = ""
} }
alert("commit")
this.publicationFormMV.ObjectMergeNotification.socket.commit(e.chucksManager.path)
return e return e
}) })
}
this.publication.Files = this.publication.Files.map( (e:PublicationAttachmentEntity) => ({
FileBase64: e.Base64,
FileExtension: e.FileExtension,
OriginalFileName: e.OriginalFileName || 'foto'
}))
const loader = this.toastService.loading()
try { this.publication.Files = this.publication.Files.map( (e:PublicationAttachmentEntity) => ({
FileBase64: e.Base64,
FileExtension: e.FileExtension,
OriginalFileName: e.OriginalFileName || 'foto'
}))
await this.publications.CreatePublication(this.publication.ProcessId, this.publication).toPromise()
if (this.publicationTitle == '1') {
} else if (this.publicationTitle == '2') {
this.httpErroHandle.httpsSucessMessagge('Criar publicação')
} else if (this.publicationTitle == '3') { const loader = this.toastService.loading()
this.httpErroHandle.httpsSucessMessagge('Editar publicação')
try {
await this.publications.CreatePublication(this.publication.ProcessId, this.publication).toPromise()
if (this.publicationTitle == '1') {
} else if (this.publicationTitle == '2') {
this.httpErroHandle.httpsSucessMessagge('Criar publicação')
} else if (this.publicationTitle == '3') {
this.httpErroHandle.httpsSucessMessagge('Editar publicação')
}
//this.goBackToViewPublications.emit();
} catch (error) {
this.httpErroHandle.httpStatusHandle(error)
} finally {
loader.remove()
} }
this.goBackToViewPublications.emit();
} catch (error) {
this.httpErroHandle.httpStatusHandle(error)
} finally {
loader.remove()
} }
} else { } else {
this.toastService._badRequest("É necessário adicionar uma imagem ou vídeo") this.toastService._badRequest("É necessário adicionar uma imagem ou vídeo")
} }
} }
this.publicationFormMV.ObjectMergeNotification.close()
// this.publicationFormMV.ObjectMergeNotification.close()
} }
ngOnDestroy() { ngOnDestroy() {
this.publicationFormMV.ObjectMergeNotification.close() // this.publicationFormMV.ObjectMergeNotification.close()
} }
close() { close() {
src/app/shared/publication/upload/upload-streaming.service.ts
+128 -132
View File
@@ -2,6 +2,17 @@ import { Injectable } from '@angular/core';
import { ok, err, Result } from 'neverthrow'; import { ok, err, Result } from 'neverthrow';
import { ObjectMergeNotification } from 'src/app/services/socket-connection-mcr.service'; import { ObjectMergeNotification } from 'src/app/services/socket-connection-mcr.service';
import { CMAPIService } from "src/app/shared/repository/CMAPI/cmapi.service" import { CMAPIService } from "src/app/shared/repository/CMAPI/cmapi.service"
const objectMergeNotification = new ObjectMergeNotification()
export enum UploadError {
noConnection = 'noConnection',
slow = 'slow'
}
export type IOUploadError = "noConnection" | "slow"
@Injectable({ @Injectable({
providedIn: 'root' providedIn: 'root'
}) })
@@ -9,112 +20,85 @@ export class UploadStreamingService {
constructor( private CMAPIService: CMAPIService,) { } constructor( private CMAPIService: CMAPIService,) { }
} }
class UploadFileUseCase { class UploadFileUseCase {
CMAPIService: CMAPIService = window["CMAPIAPIRepository"] CMAPIService: CMAPIService = window["CMAPIAPIRepository"]
constructor() {} constructor() {}
async execute(PublicationAttachmentEntity: PublicationAttachmentEntity): Promise<Result<PublicationAttachmentEntity, PublicationAttachmentEntity>> { async execute(PublicationAttachmentEntity: PublicationAttachmentEntity): Promise<Result<true, IOUploadError >> {
return new Promise(async (resolve, reject) => { return new Promise(async (resolve, reject) => {
PublicationAttachmentEntity.chucksManager.clearManualRetry()
let path: string; let path: string;
const length = PublicationAttachmentEntity.chucksManager.chunks.totalChunks.toString() const length = PublicationAttachmentEntity.chucksManager.chunks.totalChunks.toString()
const readAndUploadChunk = async(index: number) => { const readAndUploadChunk = async(index: number) => {
const chunk = await PublicationAttachmentEntity.chucksManager.chunks.getChunks(index) const base64 = await PublicationAttachmentEntity.chucksManager.chunks.getChunks(index)
const blob = new Blob([chunk]);
const blobFile = new File([blob], "test.mp4", { type: blob.type });
return this.CMAPIService.FileContent({length, path: PublicationAttachmentEntity.chucksManager.path, index, blobFile})
}
if(!PublicationAttachmentEntity.chucksManager.hasPath()) { if(index == 2) {
const initIndex = 1 const base1 = await PublicationAttachmentEntity.chucksManager.chunks.getChunks(2)
const uploadRequest = await readAndUploadChunk(initIndex) // Get the video element from the DOM
const videoElement: any = document.getElementById("yourVideoElementId");
if(uploadRequest.isOk()) { // Set the src attribute of the video element to the blob URL
videoElement.src = "data:video/mp4;base64,"+ base1 + base64 ;
path = uploadRequest.value.data // Optionally, you can also set other attributes or play the video
videoElement.controls = true; // Add controls for play, pause, etc.
PublicationAttachmentEntity.chucksManager.setPath(path) videoElement.play(); // Auto-play the vid
PublicationAttachmentEntity.chucksManager.setResponse(initIndex, uploadRequest)
alert("passs")
} else {
alert("erro dfsdfsdfsdr")
PublicationAttachmentEntity.chucksManager.clearUploading()
PublicationAttachmentEntity.chucksManager.setManualRetry()
return reject(err(PublicationAttachmentEntity))
} }
const uploadRequest = this.CMAPIService.FileContent({length, path: PublicationAttachmentEntity.chucksManager.path, index, blobFile: base64})
uploadRequest.then((uploadRequest) => {
if(uploadRequest.isOk()) {
PublicationAttachmentEntity.chucksManager.setResponse(index, uploadRequest)
}
})
return uploadRequest;
} }
// if(!PublicationAttachmentEntity.chucksManager.hasPath()) {
// const guidRequest = await this.CMAPIService.RequestUpload()
// if(guidRequest.isOk()) {
// path = guidRequest.value+".mp4"
// PublicationAttachmentEntity.chucksManager.setPath(path)
// } else {
// const pingRequest = await this.CMAPIService.ping()
// if( pingRequest.isErr()) {
// return resolve(err(UploadError.noConnection))
// } else {
// return resolve(err(UploadError.slow))
// }
// }
// }
const allRequest: Promise<any>[] = [] const allRequest: Promise<any>[] = []
let connection = true let connection = true
let errorMessage: UploadError.noConnection | UploadError.slow
for (let index = 2; ( (index <= PublicationAttachmentEntity.chucksManager.chunks.totalChunks -1) && connection ); index++) { for (let index = 1; ( (index <= PublicationAttachmentEntity.chucksManager.chunks.totalChunks) ); index++) {
const needUpload = PublicationAttachmentEntity.chucksManager.needToUploadChunkIndex(index) const needUpload = PublicationAttachmentEntity.chucksManager.needToUploadChunkIndex(index)
if(needUpload) { if(needUpload) {
const request = readAndUploadChunk(index).then(async(uploadRequest) => { const request = readAndUploadChunk(index).then(async(uploadRequest) => {
if(uploadRequest.isErr()) {
const pingRequest = await this.CMAPIService.ping()
if( pingRequest.isErr()) {
connection = false
return reject(err(PublicationAttachmentEntity))
}
} else {
PublicationAttachmentEntity.chucksManager.setResponse(index, uploadRequest)
}
}) })
allRequest.push(request) allRequest.push(request)
// const request = readAndUploadChunk(index)
// const uploadRequest = await request
// allRequest.push(request)
// if(uploadRequest.isErr()) {
// const pingRequest = await this.CMAPIService.ping()
// if( pingRequest.isErr()) {
// reject(err(PublicationAttachmentEntity))
// }
// } else {
// PublicationAttachmentEntity.chucksManager.setResponse(index, uploadRequest)
// }
} }
} }
await Promise.all(allRequest)
if(!connection) { if(!connection) {
PublicationAttachmentEntity.chucksManager.clearUploading() return resolve(err(errorMessage))
PublicationAttachmentEntity.chucksManager.setManualRetry()
return reject(err(PublicationAttachmentEntity))
} else if (PublicationAttachmentEntity.chucksManager.chunks.totalChunks != 1) {
await Promise.all(allRequest)
const uploadRequest = await readAndUploadChunk(PublicationAttachmentEntity.chucksManager.chunks.totalChunks)
if(uploadRequest.isErr()) {
const pingRequest = await this.CMAPIService.ping()
if( pingRequest.isErr()) {
}
PublicationAttachmentEntity.chucksManager.clearUploading()
PublicationAttachmentEntity.chucksManager.setManualRetry()
return reject(err(PublicationAttachmentEntity))
} else {
PublicationAttachmentEntity.chucksManager.setResponse(PublicationAttachmentEntity.chucksManager.chunks.totalChunks, uploadRequest)
PublicationAttachmentEntity.chucksManager.doneChunkUpload()
return resolve(ok(PublicationAttachmentEntity))
}
} else { } else {
return resolve(ok(true))
PublicationAttachmentEntity.chucksManager.doneChunkUpload()
return resolve(ok(PublicationAttachmentEntity))
} }
}) })
} }
} }
@@ -215,7 +199,11 @@ export class PublicationFormMV {
private UploadFileUseCase = new UploadFileUseCase() private UploadFileUseCase = new UploadFileUseCase()
private form = new PublicationFormModel() private form = new PublicationFormModel()
ObjectMergeNotification = new ObjectMergeNotification() ObjectMergeNotification = objectMergeNotification
constructor() {
this.ObjectMergeNotification.connect();
}
setDataToFrom(data: IPublicationFormModelEntity) { setDataToFrom(data: IPublicationFormModelEntity) {
this.form.setData(data) this.form.setData(data)
@@ -231,12 +219,14 @@ export class PublicationFormMV {
if(!PublicationAttachmentEntity.hasChunkManger) { if(!PublicationAttachmentEntity.hasChunkManger) {
const fileBlob = PublicationAttachmentEntity.blobFile; const fileBlob = PublicationAttachmentEntity.blobFile;
const fileChunks = new Chunks({chunkSize: 2000 }) const fileChunks = new Chunks({chunkSize: 70 })
fileChunks.setFile(fileBlob) fileChunks.setFile(fileBlob)
PublicationAttachmentEntity.setChunkManger(fileChunks) PublicationAttachmentEntity.setChunkManger(fileChunks)
PublicationAttachmentEntity.chucksManager.registerOnLastChunk(()=> { PublicationAttachmentEntity.chucksManager.registerOnLastChunk(() => {
console.log("last chunk ===============================================")
const guid = PublicationAttachmentEntity.chucksManager.path const guid = PublicationAttachmentEntity.chucksManager.path
this.ObjectMergeNotification.subscribe(guid, (data) => { this.ObjectMergeNotification.subscribe(guid, (data) => {
@@ -246,29 +236,36 @@ export class PublicationFormMV {
}) })
}) })
} else { } else if(PublicationAttachmentEntity.chucksManager.doneUpload) {
if(PublicationAttachmentEntity.chucksManager.doneUpload) { return resolve(true)
alert("done")
return resolve(true)
}
} }
if( PublicationAttachmentEntity.chucksManager.isUploading == false) { let attemp = 0;
PublicationAttachmentEntity.chucksManager.setUploading() let result: Result<true, IOUploadError>
const result = await this.UploadFileUseCase.execute(PublicationAttachmentEntity)
PublicationAttachmentEntity.chucksManager.clearUploading()
PublicationAttachmentEntity.chucksManager.setManualRetry()
if( PublicationAttachmentEntity.chucksManager.isUploading == false) {
do {
attemp++
PublicationAttachmentEntity.chucksManager.clearManualRetry()
PublicationAttachmentEntity.chucksManager.setUploading()
result = await this.UploadFileUseCase.execute(PublicationAttachmentEntity)
PublicationAttachmentEntity.chucksManager.clearUploading()
} while (attemp<3 && result.isErr() && result?.error == 'slow')
PublicationAttachmentEntity.chucksManager.setManualRetry()
PublicationAttachmentEntity.chucksManager.doneChunkUpload()
if(result.isErr()) { if(result.isErr()) {
alert("error") resolve(false)
reject(false)
} else { } else {
alert("passs") resolve(true)
} }
} else { } else {
alert("not")
} }
}) })
@@ -276,36 +273,41 @@ export class PublicationFormMV {
} }
uploadVideosFiles(): Promise<Boolean> { uploadVideosFiles(): Promise<Boolean> {
return new Promise((resolve, reject)=> {
const videosFiles = this.getVideoFiles()
const videosFilesToUploads = videosFiles.filter( e => e.FileType == "video") return new Promise((resolve, reject) => {
const Promises: Promise<any>[] = [] // this.ObjectMergeNotification.socket.registerWhenConnected(() => {
const videosFiles = this.getVideoFiles()
for(const file of videosFilesToUploads) { const videosFilesToUploads = videosFiles.filter( e => e.FileType == "video")
const promise = this.upload(file)
Promises.push(promise)
}
// Use Promise.all to wait for all promises to resolve const Promises: Promise<any>[] = []
Promise.all(Promises)
.then((results) => {
// Check if every promise resolved successfully
const allPromisesResolvedSuccessfully = results.every((result) => result == true);
if (allPromisesResolvedSuccessfully) { for(const file of videosFilesToUploads) {
console.log('All promises resolved successfully.'); const promise = this.upload(file)
resolve(true) Promises.push(promise)
} else {
reject(false)
console.log('Some promises failed to resolve successfully.');
} }
})
.catch((error) => { // Use Promise.all to wait for all promises to resolve
reject(false) Promise.all(Promises)
console.error('An error occurred while resolving promises:', error); .then((results) => {
}); // Check if every promise resolved successfully
const allPromisesResolvedSuccessfully = results.every((result) => result == true);
if (allPromisesResolvedSuccessfully) {
console.log('All promises resolved successfully.');
resolve(true)
} else {
resolve(false)
console.log('Some promises failed to resolve successfully.');
}
})
.catch((error) => {
resolve(false)
console.error('An error occurred while resolving promises:', error);
});
//})
}) })
} }
@@ -325,29 +327,22 @@ export class Chunks {
return Math.ceil(this.file.size / this.chunkSize); return Math.ceil(this.file.size / this.chunkSize);
} }
// Function to read a chunk of the file
readChunk(start: number, end: number): Promise<ArrayBuffer> {
const file = this.file
return new Promise((resolve, reject) => {
const reader = new FileReader();
reader.onload = () => {
if (reader.result instanceof ArrayBuffer) {
resolve(reader.result);
} else {
reject(new Error("Failed to read chunk"));
}
};
reader.readAsArrayBuffer(file.slice(start, end));
});
}
setFile(file: File) { setFile(file: File) {
this.file = file this.file = file
} }
async getChunks(i: number) { // Function to read a chunk of the file
readChunk(start: number, end: number): any {
return new Promise((resolve, reject) => {
const reader = new FileReader();
reader.onload = (event: any) => resolve(event.target.result.split(',')[1]);
reader.onerror = (error) => reject(error);
reader.readAsDataURL(this.file.slice(start, end));
});
}
async getChunks(i: number): Promise<string> {
i-- i--
if(i < this.totalChunks) { if(i < this.totalChunks) {
const start = i * this.chunkSize; const start = i * this.chunkSize;
@@ -499,3 +494,4 @@ export class ChucksManager {
this.contentReady = true this.contentReady = true
} }
} }
src/app/shared/publication/view-publications/view-publications.page.html
+12 -10
View File
@@ -39,23 +39,25 @@
<p class="item-content-detail">{{publicationFolderService.FolderDetails[folderId].Detail}}</p> <p class="item-content-detail">{{publicationFolderService.FolderDetails[folderId].Detail}}</p>
<ion-card *ngFor="let publication of publicationFolderService.publicationList[folderId] let i = index"> <ion-card *ngFor="let publication of publicationFolderService.publicationList[folderId] let i = index">
<ion-card-content> <ion-card-content>
<swiper-container [modules]="swiperModules" [speed]=400 navigation="true" [pagination]="{clickable: true, dynamicBullets: true }"> <swiper-container [config]="swiperThumbsConfig" [modules]="swiperModules" [speed]=400 navigation="true" [pagination]="{clickable: true, dynamicBullets: true }">
<swiper-slide *ngFor="let files of publication.Files let k = index"> <swiper-slide *ngFor="let files of publication.Files let k = index" class="centered-slide">
<div (click)="viewPublicationDetail(publication.DocumentId, publication.ProcessId)"> <div class="cool">
<img *ngIf="checkFileType.checkFileType(files.FileExtension ) == 'image'" class="post-img cursor-pointer" <div (click)="viewPublicationDetail(publication.DocumentId, publication.ProcessId)">
[lazyLoad]="'data:image/jpg;base64,' + files.FileBase64"> <img *ngIf="checkFileType.checkFileType(files.FileExtension ) == 'image'" class="post-img cursor-pointer"
[lazyLoad]="'data:image/jpg;base64,' + files.FileBase64">
<video [appVisibility]="onVisibilityChange" #myVideo #videoElement *ngIf="checkFileType.checkFileType(files.FileExtension ) == 'video'" class="post-video" controls="controls" preload="metadata" <video [appVisibility]="onVisibilityChange" #myVideo #videoElement *ngIf="checkFileType.checkFileType(files.FileExtension ) == 'video'" class="post-video" controls="controls" preload="metadata"
webkit-playsinline="webkit-playsinline" class="videoPlayer" (click)="preventVideoPlay($event)"> webkit-playsinline="webkit-playsinline" class="videoPlayer" (click)="preventVideoPlay($event)">
<source [src]="files.FileBase64" type="video/mp4" > <source [src]="files.FileBase64" type="video/mp4" >
</video> </video>
</div>
</div> </div>
</swiper-slide> </swiper-slide>
<!-- <div *ngIf="publication?.Files?.length == 0"> <!-- <div *ngIf="publication?.Files?.length == 0">
src/app/shared/publication/view-publications/view-publications.page.scss
+7
View File
@@ -292,3 +292,10 @@ swiper-slide video {
align-items: center; align-items: center;
} }
.centered-slide {
display: flex;
justify-content: center;
align-items: center;
text-align: center;
}
src/app/shared/publication/view-publications/view-publications.page.ts
+12
View File
@@ -29,6 +29,18 @@ export class ViewPublicationsPage implements OnInit {
error: any; error: any;
oldpublicationIds = [] oldpublicationIds = []
swiperConfig = {
spaceBetween: 10,
navigation: true,
}
swiperThumbsConfig = {
spaceBetween: 10,
slidesPerView: 4,
freeMode: true,
watchSlidesProgress: true,
}
@Input() folderId: any; @Input() folderId: any;
@Output() addNewPublication = new EventEmitter<any>(); @Output() addNewPublication = new EventEmitter<any>();
@Output() editPublication = new EventEmitter<any>(); @Output() editPublication = new EventEmitter<any>();
src/app/shared/repository/CMAPI/cmapi.service.ts
+27 -3
View File
@@ -1,8 +1,10 @@
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { MiddlewareServiceService } from "src/app/shared/API/middleware/middleware-service.service"; import { MiddlewareServiceService } from "src/app/shared/API/middleware/middleware-service.service";
import { CMAPIAPIService } from "src/app/shared/API/CMAPI/cmapi-api.service"; import { CMAPIAPIService } from "src/app/shared/API/CMAPI/cmapi-api.service";
import { ok, err } from 'neverthrow'; import { ok, err, Result } from 'neverthrow';
import { Observable } from 'rxjs'; import { Observable } from 'rxjs';
import { environment } from 'src/environments/environment';
import { IuploadFileLK } from '../../API/middleware/interface';
@Injectable({ @Injectable({
providedIn: 'root' providedIn: 'root'
@@ -15,16 +17,38 @@ export class CMAPIService {
window["CMAPIAPIRepository"] = this window["CMAPIAPIRepository"] = this
} }
async FileContent({length, path, index, blobFile}) { async FileContent({length, path, index, blobFile}): Promise<Result<IuploadFileLK, "badRequest" | "other">> {
try { try {
const result = await this.MiddlewareServiceService.CMAPIFileContent({length, path, index, blobFile}).toPromise(); const result = await this.MiddlewareServiceService.CMAPIFileContent({length, path, index, blobFile}).toPromise();
return ok(result) return ok(result)
} catch (error) {
if(error.status >= 400 && error.status >= 499) {
return err("badRequest")
}
return err("other")
}
}
async RequestUpload(): Promise<Result<string, any>> {
try {
const result = await this.MiddlewareServiceService.CMAPIRequestUpload().toPromise();
return ok(result)
} catch (error) { } catch (error) {
return err(error) return err(error)
} }
}
async UploadStatus() {
try {
const result = await this.MiddlewareServiceService.CMAPIUploadStatus().toPromise();
return ok(result)
} catch (error) {
return err(error)
}
} }
async ping() { async ping() {