Merge pull request #28 from utage-tech/afx-csgo-broadcast

Shugo Kawamura · web-flow · commit 8637bd3f87f6 · 2019-06-11T18:16:09.000+09:00
Supported some of hidden args(A,C,F) B is not supported yet!
diff --git a/public/js/hostname.js b/public/js/hostname.js
@@ -1,24 +1,49 @@
 
 const steamplay = "steam://rungame/730/76561202255233023/+playcast%20%22"
 
-function RewriteIp(element,prefix){ // aタグのリンクを現在のホスト名に書き換える
+function RewriteIp(element,prefix,postfix){ // aタグのリンクを現在のホスト名に書き換える
     var href = steamplay + prefix + element.attr("href");
-    console.log("href :" + href + "%22")
-    element.attr("href", href + "%22")
+    console.log("href :" + href + postfix)
+    element.attr("href", href + postfix)
 }
 
-var ip = location.href;
+const ip = location.href;
 var match = ip + "match/"
-var replay = ip + "match/"
+var replay = ip + "replay/"
 
 console.log(ip);
 
 $(function () {  
-    $('#a_match').each(function(index, element) {
-        RewriteIp($(element),match)
-    })
-
-    $('#a_replay').each(function(index, element) {
-        RewriteIp($(element),replay)
-    })
-});
+    $("a[data-type='a_match']").each(function(i){
+        RewriteIp($(this),match,"%22")
+    });
+
+    $("a[data-type='a_replay']").each(function(i){
+        RewriteIp($(this),replay,"%22")
+    });
+
+    $("a[data-type='a_replay-a']").each(function(i){
+        RewriteIp($(this), match,"%22%20a") // [" a"]
+    });
+    
+    $("a[data-type='a_replay-c']").each(function(i){
+        RewriteIp($(this),match,"%22%20c") // [" c"]
+    });
+
+    replay_f(0);
+})
+
+$("th[data-type='a_replay-f']").children('input').keyup(function () {
+    replay_f($(this).val())
+    console.log($(this).val())
+});
+
+function replay_f(frag) {
+    $("th[data-type='a_replay-f']").each(function(i){
+        //console.log('test')
+        var token = $(this).children('a').attr("data-token")
+        var play = steamplay + match + token + "%22%20f" + frag
+        console.log(play)
+        $(this).children('a').attr("href",play)   
+    });
+}
diff --git a/readme.md b/readme.md
@@ -1,3 +1,7 @@
+## Counter-Strike: Global Offensive tv_broadcast GOTV+ Server  
+https://developer.valvesoftware.com/wiki/Counter-Strike:_Global_Offensive_Broadcast   
+GOTV+,HTTP and dem based GOTV. Supports CDN,HLAE,Reshade and other external softwere.
+
 # Todo
 
 -> Save matches as a demo replay  
@@ -9,7 +13,7 @@
 ### Installation
 1. `npm i`  
 2. `npm i -g typescript`  
-3. `build`  
+3. `npm run build`  
 
 ### Usage
 1. `npm start` to start tv_broadcast server  
diff --git a/src/config.ts b/src/config.ts
@@ -1,5 +1,7 @@
 module.exports = {
+    port: 3000,
     EnableAuth : false,
     auth: "SuperStrongPassword",
-    DropS1Frag: false
+    DropS1Frag: false,
+    frag_delay: 10
 }
diff --git a/src/server.ts b/src/server.ts
@@ -26,12 +26,14 @@ app.get('/replay/:token/sync', function (req:any, res:any) {
   var r_sync = match[req.params.token].firstsync
   const r = {
     tick: r_sync.tick,
-    rtdelay: sync.rtdelay,
-    rcvage: sync.rcvage,
+    //rtdelay: sync.rtdelay,
+    rtdelay: 2,
+    //rcvage: r_sync.rcvage,
+    rcvage: 2,
     fragment: r_sync.fragment,
     signup_fragment: sync.signup_fragment,
     tps: sync.tps,
-    protocool: sync.protocool,
+    protocol: sync.protocol,
   }
   //console.log(r)
   res.send(r);
@@ -65,18 +67,19 @@ app.get('/replay/:token/:fragment_number/:frametype', function (req:any, res:any
 //  playcast "http://586f7685.ngrok.io/match/s85568392920768736t1477086968"
 app.post('/reset/:token/', (req:any, res:any) => {
   res.send("ACK");
-  match[req.params.token].sync.signup_fragment = null;
+  match[req.params.token].sync.signup_fragment = -1;
 })
 
 
 class Matches{
-  sync: match_sync
-  firstsync: replay_sync // sync for replay
-  start:any = []
-  full:any = []
-  delta: any = []
-  token: string
-  time: string;
+  public sync: match_sync
+  public firstsync: replay_sync // sync for replay
+  public start:any = []
+  public full:any = []
+  public delta: any = []
+  public token: string
+  public auth: string
+  public time: string
   
   constructor() {
     this.sync = new match_sync();
@@ -85,27 +88,54 @@ class Matches{
     this.full[-1] = Buffer.alloc(16, 0, "binary")
     this.delta[-1] = Buffer.alloc(16, 0, "binary")
     this.token = ""
+    this.auth = ""
     this.time = new Date().toJSON()
   }
 }
 
 class match_sync{
-  tick: number
-  rtdelay: number
-  rcvage: number
-  fragment: number
-  signup_fragment: number
-  tps: number
-  protocool: number;
-
+  public tick: number
+  //public rtdelay: number
+  private _rtdelay: Date
+  private _rcvage: Date
+  public fragment: number
+  public signup_fragment: number
+  public tps: number
+  public protocol : number;
+  public full_received: any
+  public full_received_tick: any
+  
   constructor() {
     this.tick = -1
-    this.rtdelay = 2
-    this.rcvage = 2
+    this._rtdelay = new Date()
+    //this.rtdelay = 2
+    this._rcvage = new Date()
     this.fragment = -1
     this.signup_fragment = -1
     this.tps = 32
-    this.protocool = 4
+    this.protocol  = 4
+    this.full_received = {};
+    this.full_received_tick = {}
+  }
+
+  
+  public rtdelay(i:number) {
+    var now = new Date()
+    //var i = this.fragment - config.frag_delay
+    var selected_full = this.full_received[i];
+    var sec = ((now.getTime() - selected_full.getTime()) / 1000);
+    console.log(sec)
+    return sec;
+  }
+  
+
+  public rcvage() {
+    var now = new Date()
+    var i = this.fragment;
+    var last_full = this.full_received[i];
+    var sec = ((now.getTime() - last_full.getTime()) / 1000);
+    console.log(sec)
+    return sec;
   }
 }
 
@@ -118,19 +148,47 @@ class replay_sync{
     this.fragment = -1  }
 }
 
-var match: any = {}
+var match: Imatches = {};
+interface Imatches{
+  [x:string]:Matches
+}
 
 app.get('/match/:token/sync', function (req:any, res:any) {
   console.log("match sync!")
-  res.set('Cache-Control', 'public, max-age=1'); // cache 1sec for delayed live
-  const r = match[req.params.token].sync
-  //console.log(r)
+  var sync = match[req.params.token].sync
+  var r: any;
+  res.set('Cache-Control', 'public, max-age=5'); // cache 5sec for delayed live
+  if (req.query.fragment) {
+    r = {
+      tick: sync.full_received_tick[req.query.fragment],
+      rtdelay: sync.rtdelay(req.query.fragment),
+      rcvage: sync.rcvage(),
+      fragment: req.query.fragment,
+      signup_fragment: sync.signup_fragment,
+      tps: sync.tps,
+      protocol: sync.protocol,
+    }
+  }
+  else {
+    var frag = sync.fragment - config.frag_delay;
+    r = {
+      tick: sync.tick,
+      rtdelay: sync.rtdelay(frag),
+      rcvage: sync.rcvage(),
+      fragment: frag,
+      signup_fragment: sync.signup_fragment,
+      tps: sync.tps,
+      protocol: sync.protocol,
+    }
+  }
+  
+  console.log(r)
   res.send(r);
 })
 
 app.get('/match/:token/:fragment_number/:frametype', function (req:any, res:any) {
   console.log('Fragment request for',req.params.fragment_number)
-  res.set('Cache-Control', 'public, max-age=1'); // cache 1sec for delayed live
+  res.set('Cache-Control', 'public, max-age=86400'); // cache 1sec for delayed live
   res.setHeader('Content-Type', 'application/octet-stream')
   var p = Buffer.alloc(16, 0, 'binary');
   if (req.params.frametype == 'start') {
@@ -172,6 +230,7 @@ app.post('/:token/:fragment_number/:frametype', function (req:any, res:any) {
     match[req.params.token].sync.signup_fragment = req.params.fragment_number
     match[req.params.token].start[req.params.fragment_number] = req.body
     match[req.params.token].token = req.params.token
+    match[req.params.token].auth = req.headers["x-origin-auth"]
   }
   else {
     if (match[req.params.token].sync.signup_fragment == -1) {
@@ -195,6 +254,8 @@ app.post('/:token/:fragment_number/:frametype', function (req:any, res:any) {
         res.status(200).send("OK");
         match[req.params.token].sync.fragment = req.params.fragment_number
         match[req.params.token].full[req.params.fragment_number] = req.body
+        match[req.params.token].sync.full_received[req.params.fragment_number] = new Date()
+        match[req.params.token].sync.full_received_tick[req.params.fragment_number] = req.query.tick
         if (match[req.params.token].firstsync.fragment == -1) {
           match[req.params.token].firstsync.fragment = req.params.fragment_number
         }
@@ -207,6 +268,6 @@ app.post('/:token/:fragment_number/:frametype', function (req:any, res:any) {
   }
 })
 
-app.listen(3000, function () {
-  console.log('CSGO broadcast server listening on port 3000!');
+app.listen(config.port, function () {
+  console.log(`CSGO broadcast server listening on port ${config.port}!`);
 });
diff --git a/views/plays.pug b/views/plays.pug
@@ -1,20 +1,42 @@
 head
   title #{title}
-  script(src="https://code.jquery.com/jquery-3.4.1.min.js")
-  script(src="./public/js/hostname.js ")
+    meta(charset="utf-8")
+    meta(name="viewport" content="width=device-width, initial-scale=1.0")
+    // Compiled and minified CSS
+    link( rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0/css/materialize.min.css")
+    // Compiled and minified JavaScript
+    script(src="https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0/js/materialize.min.js")
+    link(rel='stylesheet', href="css/style.css")
 body
   table
     thead
       tr
-        th Play
-        td timestamp
+        th Play w/Delay
+        th Replay
+        th Replay-A (f=1 with /sync)
+        th Replay-C (f=0 w/o /sync)
+        th Replay-F (specific frag with /sync)
+        td time
+        td auth
         td token
     tbody
       each item in matches
-        tr
-          th
-            a(id="a_match" href=`${item.token}`) Play
-          th
-            a(id="a_replay" href=`${item.token}`) Replay
-          td=item.time
-          td=item.token
+          tr
+            th
+              a(data-type="a_match" href=`${item.token}`) Play
+            th
+              a(data-type="a_replay" href=`${item.token}`) Replay
+            th
+              a(data-type="a_replay-a" href=`${item.token}`) Replay-A
+            th
+              a(data-type="a_replay-c" href=`${item.token}`) Replay-C
+            th(data-type="a_replay-f")
+              a(href=`${item.token}` data-token=`${item.token}`) Replay-F 
+              input(type="number" placeholder="frag number" data-type="a_replay-f-specify")
+            td=item.time
+            td=item.auth
+            td=item.token
+
+  script(src="https://code.jquery.com/jquery-3.4.1.min.js")
+  script(src="./public/js/hostname.js")
+  

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,7 @@`
`1`	`1`	`module.exports = {`
	`2`	`+ port: 3000,`
`2`	`3`	`EnableAuth : false,`
`3`	`4`	`auth: "SuperStrongPassword",`
`4`		`- DropS1Frag: false`
	`5`	`+ DropS1Frag: false,`
	`6`	`+ frag_delay: 10`
`5`	`7`	`}`