Compare commits
3 commits
main
...
patch/msaa
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4d6487b7e3 | ||
|
|
8739b1aa2b | ||
|
|
6d6c6b52ce |
5 changed files with 21 additions and 18 deletions
|
|
@ -22,5 +22,5 @@ MINIO_ACCESS_KEY = ''
|
||||||
MINIO_SECRET_KEY = ''
|
MINIO_SECRET_KEY = ''
|
||||||
|
|
||||||
# APP and TRACKER VERSIONS
|
# APP and TRACKER VERSIONS
|
||||||
VERSION = 1.16.0
|
VERSION = 1.17.6
|
||||||
TRACKER_VERSION = '11.0.1'
|
TRACKER_VERSION = '11.0.1'
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,6 @@ import Logger from 'App/logger'
|
||||||
|
|
||||||
// TODO: composition instead of inheritance
|
// TODO: composition instead of inheritance
|
||||||
// needSkipMessage() and next() methods here use buf and p protected properties,
|
// needSkipMessage() and next() methods here use buf and p protected properties,
|
||||||
// which should be probably somehow incapsulated
|
|
||||||
export default class MFileReader extends RawMessageReader {
|
export default class MFileReader extends RawMessageReader {
|
||||||
private pLastMessageID: number = 0
|
private pLastMessageID: number = 0
|
||||||
private currentTime: number
|
private currentTime: number
|
||||||
|
|
@ -15,20 +14,19 @@ export default class MFileReader extends RawMessageReader {
|
||||||
private noIndexes: boolean = false
|
private noIndexes: boolean = false
|
||||||
constructor(data: Uint8Array, private startTime?: number, private logger= console) {
|
constructor(data: Uint8Array, private startTime?: number, private logger= console) {
|
||||||
super(data)
|
super(data)
|
||||||
// if (noIndexes) this.noIndexes = true
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public checkForIndexes() {
|
public checkForIndexes() {
|
||||||
// 0xff 0xff 0xff 0xff 0xff 0xff 0xff 0xff = no indexes + weird failover (don't ask)
|
// 0xff 0xff 0xff 0xff 0xff 0xff 0xff 0xff = no indexes + weird fail over (don't ask)
|
||||||
const skipIndexes = this.readCustomIndex(this.buf.slice(0, 8)) === 72057594037927940
|
const skipIndexes = this.readCustomIndex(this.buf.slice(0, 8)) === 72057594037927940
|
||||||
|| this.readCustomIndex(this.buf.slice(0, 9)) === 72057594037927940
|
|| this.readCustomIndex(this.buf.slice(0, 9)) === 72057594037927940
|
||||||
|
|
||||||
if (skipIndexes) {
|
if (skipIndexes) {
|
||||||
|
if (!this.noIndexes) {
|
||||||
|
this.skip(8)
|
||||||
|
}
|
||||||
this.noIndexes = true
|
this.noIndexes = true
|
||||||
this.skip(8)
|
|
||||||
return true
|
|
||||||
}
|
}
|
||||||
return false
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private needSkipMessage(): boolean {
|
private needSkipMessage(): boolean {
|
||||||
|
|
@ -49,17 +47,19 @@ export default class MFileReader extends RawMessageReader {
|
||||||
return id
|
return id
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Reads the messages from byteArray, returns null if read ended
|
||||||
|
* will reset to last correct pointer if encountered bad read
|
||||||
|
* (i.e mobfile was split in two parts and it encountered partial message)
|
||||||
|
* then will proceed to read next message when next mobfile part will be added
|
||||||
|
* via super.append
|
||||||
|
* */
|
||||||
private readRawMessage(): RawMessage | null {
|
private readRawMessage(): RawMessage | null {
|
||||||
if (!this.noIndexes) this.skip(8)
|
|
||||||
try {
|
try {
|
||||||
const msg = super.readMessage()
|
return super.readMessage()
|
||||||
if (!msg) {
|
|
||||||
this.skip(-8)
|
|
||||||
}
|
|
||||||
return msg
|
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
this.error = true
|
|
||||||
this.logger.error("Read message error:", e)
|
this.logger.error("Read message error:", e)
|
||||||
|
this.error = true
|
||||||
return null
|
return null
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -102,6 +102,7 @@ export default class MFileReader extends RawMessageReader {
|
||||||
|
|
||||||
const index = this.noIndexes ? 0 : this.getLastMessageID()
|
const index = this.noIndexes ? 0 : this.getLastMessageID()
|
||||||
const msg = Object.assign(rewriteMessage(rMsg), {
|
const msg = Object.assign(rewriteMessage(rMsg), {
|
||||||
|
// @ts-ignore
|
||||||
time: this.currentTime ?? rMsg.timestamp - this.startTime!,
|
time: this.currentTime ?? rMsg.timestamp - this.startTime!,
|
||||||
tabId: this.currentTab,
|
tabId: this.currentTab,
|
||||||
}, !this.noIndexes ? { _index: index } : {})
|
}, !this.noIndexes ? { _index: index } : {})
|
||||||
|
|
|
||||||
|
|
@ -913,7 +913,6 @@ export default class RawMessageReader extends PrimitiveReader {
|
||||||
|
|
||||||
default:
|
default:
|
||||||
throw new Error(`Unrecognizable message type: ${ tp }; Pointer at the position ${this.p} of ${this.buf.length}`)
|
throw new Error(`Unrecognizable message type: ${ tp }; Pointer at the position ${this.p} of ${this.buf.length}`)
|
||||||
return null;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -10,6 +10,9 @@
|
||||||
|
|
||||||
ARCH=${ARCH:-amd64}
|
ARCH=${ARCH:-amd64}
|
||||||
|
|
||||||
|
GIT_ROOT=$(git rev-parse --show-toplevel)
|
||||||
|
source $GIT_ROOT/scripts/lib/_docker.sh
|
||||||
|
|
||||||
git_sha=$(git rev-parse --short HEAD)
|
git_sha=$(git rev-parse --short HEAD)
|
||||||
image_tag=${IMAGE_TAG:-$git_sha}
|
image_tag=${IMAGE_TAG:-$git_sha}
|
||||||
check_prereq() {
|
check_prereq() {
|
||||||
|
|
|
||||||
|
|
@ -15,10 +15,10 @@ type: application
|
||||||
# This is the chart version. This version number should be incremented each time you make changes
|
# This is the chart version. This version number should be incremented each time you make changes
|
||||||
# to the chart and its templates, including the app version.
|
# to the chart and its templates, including the app version.
|
||||||
# Versions are expected to follow Semantic Versioning (frontends://semver.org/)
|
# Versions are expected to follow Semantic Versioning (frontends://semver.org/)
|
||||||
version: 0.1.10
|
version: 0.1.16
|
||||||
|
|
||||||
# This is the version number of the application being deployed. This version number should be
|
# This is the version number of the application being deployed. This version number should be
|
||||||
# incremented each time you make changes to the application. Versions are not expected to
|
# incremented each time you make changes to the application. Versions are not expected to
|
||||||
# follow Semantic Versioning. They should reflect the version the application is using.
|
# follow Semantic Versioning. They should reflect the version the application is using.
|
||||||
# It is recommended to use it with quotes.
|
# It is recommended to use it with quotes.
|
||||||
AppVersion: "v1.17.0"
|
AppVersion: "v1.17.6"
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue