diff --git a/config.json b/config.json index 17f4dcf..ac5b524 100644 --- a/config.json +++ b/config.json @@ -22,7 +22,7 @@ "scriptPath": "autoscripts/caffeine.js", "selector": "caffeine", "icon": "/caffeine.png", - "minversion": 300, + "minversion": 200, "maxversion": 300 }, "reboot_to_rcm": { diff --git a/gadgetcaches/2ebfb277960a871764701d90758286e3.json b/gadgetcaches/1.0.0_2ebfb277960a871764701d90758286e3.json similarity index 100% rename from gadgetcaches/2ebfb277960a871764701d90758286e3.json rename to gadgetcaches/1.0.0_2ebfb277960a871764701d90758286e3.json diff --git a/gadgetcaches/2.0.0_0a6daa2bcac6640382213d7a0ac99dbe.json b/gadgetcaches/2.0.0_0a6daa2bcac6640382213d7a0ac99dbe.json new file mode 100644 index 0000000..d9b2432 --- /dev/null +++ b/gadgetcaches/2.0.0_0a6daa2bcac6640382213d7a0ac99dbe.json @@ -0,0 +1 @@ +{"0,4,0,169,2,12,1,169,4,20,2,169,6,28,3,169":4404912,"2,12,65,169,4,20,66,169,6,28,67,169,8,36,68,169":4404768,"128,2,63,214,253,123,66,169,244,79,65,169,255,195,0,145,192,3,95,214":11715352,"253,123,66,169,244,79,65,169,255,195,0,145,192,3,95,214":13700,"253,123,65,169,128,2,0,249,244,79,194,168,192,3,95,214":1054764,"253,123,65,169,224,3,19,170,243,7,66,248,192,3,95,214":25136,"0,4,64,249,192,3,95,214":1943876,"0,8,64,249,192,3,95,214":735812,"255,3,1,209,244,79,2,169,253,123,3,169,253,195,0,145,83,-1,-1,-1,115,-1,-1,-1,96,34,0,145,8,252,223,8,72,1,0,55":223536,"224,3,31,170,192,3,95,214":263596,"249,15,27,248,248,95,1,169,246,87,2,169,244,79,3,169,253,123,4,169,253,3,1,145,243,3,0,170,121,6,64,249,104,146,64,57":13971760,"224,15,31,248,225,3,0,212":3915632,"65,4,0,212,192,3,95,214":3915664,"253,123,65,169,96,2,0,249,243,7,66,248,192,3,95,214":1040204,"224,7,64,249,253,123,65,169,255,131,0,145,192,3,95,214":591064,"253,123,193,168,0,2,31,214":3835568,"243,23,64,249,253,123,67,169,255,3,1,145,192,3,95,214":171688,"65,1,0,212":3915400,"193,2,0,212,192,3,95,214":3915552} \ No newline at end of file diff --git a/gadgetcaches/2.0.0_316e106d0a6f3fc918d410f8a43a5302.json b/gadgetcaches/2.0.0_316e106d0a6f3fc918d410f8a43a5302.json new file mode 100644 index 0000000..6d490a3 --- /dev/null +++ b/gadgetcaches/2.0.0_316e106d0a6f3fc918d410f8a43a5302.json @@ -0,0 +1 @@ +{"0,4,0,169,2,12,1,169,4,20,2,169,6,28,3,169":4408572,"2,12,65,169,4,20,66,169,6,28,67,169,8,36,68,169":4408428,"128,2,63,214,253,123,66,169,244,79,65,169,255,195,0,145,192,3,95,214":11715352,"253,123,66,169,244,79,65,169,255,195,0,145,192,3,95,214":14728,"253,123,65,169,128,2,0,249,244,79,194,168,192,3,95,214":1054764,"253,123,65,169,224,3,19,170,243,7,66,248,192,3,95,214":27324,"0,4,64,249,192,3,95,214":1947868,"0,8,64,249,192,3,95,214":738668,"255,3,1,209,244,79,2,169,253,123,3,169,253,195,0,145,83,-1,-1,-1,115,-1,-1,-1,96,34,0,145,8,252,223,8,72,1,0,55":223536,"224,3,31,170,192,3,95,214":266012,"249,15,27,248,248,95,1,169,246,87,2,169,244,79,3,169,253,123,4,169,253,3,1,145,243,3,0,170,121,6,64,249,104,146,64,57":13971760,"224,15,31,248,225,3,0,212":3919264,"65,4,0,212,192,3,95,214":3919296,"253,123,65,169,96,2,0,249,243,7,66,248,192,3,95,214":1044196,"224,7,64,249,253,123,65,169,255,131,0,145,192,3,95,214":593920,"253,123,193,168,0,2,31,214":3839200,"243,23,64,249,253,123,67,169,255,3,1,145,192,3,95,214":174104,"65,1,0,212":3919032,"193,2,0,212,192,3,95,214":3919184} \ No newline at end of file diff --git a/gadgetcaches/2.1.0_98ba40b0bd9ca7b1c50acd41927c51bd.json b/gadgetcaches/2.1.0_98ba40b0bd9ca7b1c50acd41927c51bd.json new file mode 100644 index 0000000..25d8b90 --- /dev/null +++ b/gadgetcaches/2.1.0_98ba40b0bd9ca7b1c50acd41927c51bd.json @@ -0,0 +1 @@ +{"0,4,0,169,2,12,1,169,4,20,2,169,6,28,3,169":4408572,"2,12,65,169,4,20,66,169,6,28,67,169,8,36,68,169":4408428,"128,2,63,214,253,123,66,169,244,79,65,169,255,195,0,145,192,3,95,214":11717388,"253,123,66,169,244,79,65,169,255,195,0,145,192,3,95,214":14728,"253,123,65,169,128,2,0,249,244,79,194,168,192,3,95,214":1056296,"253,123,65,169,224,3,19,170,243,7,66,248,192,3,95,214":27324,"0,4,64,249,192,3,95,214":1947868,"0,8,64,249,192,3,95,214":738668,"255,3,1,209,244,79,2,169,253,123,3,169,253,195,0,145,83,-1,-1,-1,115,-1,-1,-1,96,34,0,145,8,252,223,8,72,1,0,55":223660,"224,3,31,170,192,3,95,214":266012,"249,15,27,248,248,95,1,169,246,87,2,169,244,79,3,169,253,123,4,169,253,3,1,145,243,3,0,170,121,6,64,249,104,146,64,57":13974416,"224,15,31,248,225,3,0,212":3919264,"65,4,0,212,192,3,95,214":3919296,"253,123,65,169,96,2,0,249,243,7,66,248,192,3,95,214":1044196,"224,7,64,249,253,123,65,169,255,131,0,145,192,3,95,214":593920,"253,123,193,168,0,2,31,214":3839200,"243,23,64,249,253,123,67,169,255,3,1,145,192,3,95,214":174104,"65,1,0,212":3919032,"193,2,0,212,192,3,95,214":3919184} \ No newline at end of file diff --git a/gadgetcaches/2.1.0_d157eacdce44b6b5a8e892ec3bd7b12b.json b/gadgetcaches/2.1.0_d157eacdce44b6b5a8e892ec3bd7b12b.json new file mode 100644 index 0000000..42afed3 --- /dev/null +++ b/gadgetcaches/2.1.0_d157eacdce44b6b5a8e892ec3bd7b12b.json @@ -0,0 +1 @@ +{"0,4,0,169,2,12,1,169,4,20,2,169,6,28,3,169":4404912,"2,12,65,169,4,20,66,169,6,28,67,169,8,36,68,169":4404768,"128,2,63,214,253,123,66,169,244,79,65,169,255,195,0,145,192,3,95,214":11717388,"253,123,66,169,244,79,65,169,255,195,0,145,192,3,95,214":13700,"253,123,65,169,128,2,0,249,244,79,194,168,192,3,95,214":1056296,"253,123,65,169,224,3,19,170,243,7,66,248,192,3,95,214":25136,"0,4,64,249,192,3,95,214":1943876,"0,8,64,249,192,3,95,214":735812,"255,3,1,209,244,79,2,169,253,123,3,169,253,195,0,145,83,-1,-1,-1,115,-1,-1,-1,96,34,0,145,8,252,223,8,72,1,0,55":223660,"224,3,31,170,192,3,95,214":263596,"249,15,27,248,248,95,1,169,246,87,2,169,244,79,3,169,253,123,4,169,253,3,1,145,243,3,0,170,121,6,64,249,104,146,64,57":13974416,"224,15,31,248,225,3,0,212":3915632,"65,4,0,212,192,3,95,214":3915664,"253,123,65,169,96,2,0,249,243,7,66,248,192,3,95,214":1040204,"224,7,64,249,253,123,65,169,255,131,0,145,192,3,95,214":591064,"253,123,193,168,0,2,31,214":3835568,"243,23,64,249,253,123,67,169,255,3,1,145,192,3,95,214":171688,"65,1,0,212":3915400,"193,2,0,212,192,3,95,214":3915552} \ No newline at end of file diff --git a/gadgetcaches/3d8c0a2fd4612f81084c6a8d3ab485e9.json b/gadgetcaches/3.0.0_3d8c0a2fd4612f81084c6a8d3ab485e9.json similarity index 70% rename from gadgetcaches/3d8c0a2fd4612f81084c6a8d3ab485e9.json rename to gadgetcaches/3.0.0_3d8c0a2fd4612f81084c6a8d3ab485e9.json index 0b82d22..b3fa663 100644 --- a/gadgetcaches/3d8c0a2fd4612f81084c6a8d3ab485e9.json +++ b/gadgetcaches/3.0.0_3d8c0a2fd4612f81084c6a8d3ab485e9.json @@ -1 +1 @@ -{"0,4,0,169,2,12,1,169,4,20,2,169,6,28,3,169":4575592,"2,12,65,169,4,20,66,169,6,28,67,169,8,36,68,169":4586420,"128,2,63,214,253,123,66,169,244,79,65,169,255,195,0,145,192,3,95,214":11549784,"253,123,66,169,244,79,65,169,255,195,0,145,192,3,95,214":21568,"253,123,65,169,128,2,0,249,244,79,194,168,192,3,95,214":1045332,"253,123,65,169,224,3,19,170,243,7,66,248,192,3,95,214":11064,"0,4,64,249,192,3,95,214":1976772,"0,8,64,249,192,3,95,214":58972,"255,3,1,209,244,79,2,169,253,123,3,169,253,195,0,145,115,-1,-1,-1,115,-1,-1,-1,96,34,0,145,8,252,223,8,72,1,0,55":224748,"224,3,31,170,192,3,95,214":301780,"249,15,27,248,248,95,1,169,246,87,2,169,244,79,3,169,253,123,4,169,253,3,1,145,243,3,0,170,121,6,64,249,104,146,64,57":13809700,"224,15,31,248,225,3,0,212":4113140,"65,4,0,212,192,3,95,214":4113172,"193,2,0,212,192,3,95,214":4113060,"253,123,65,169,96,2,0,249,243,7,66,248,192,3,95,214":304428,"224,7,64,249,253,123,65,169,255,131,0,145,192,3,95,214":176220,"253,123,193,168,0,2,31,214":4024120,"243,23,64,249,253,123,67,169,255,3,1,145,192,3,95,214":495032,"65,1,0,212":4112908} \ No newline at end of file +{"0,4,0,169,2,12,1,169,4,20,2,169,6,28,3,169":4575592,"2,12,65,169,4,20,66,169,6,28,67,169,8,36,68,169":4586420,"128,2,63,214,253,123,66,169,244,79,65,169,255,195,0,145,192,3,95,214":11549784,"253,123,66,169,244,79,65,169,255,195,0,145,192,3,95,214":21568,"253,123,65,169,128,2,0,249,244,79,194,168,192,3,95,214":1045332,"253,123,65,169,224,3,19,170,243,7,66,248,192,3,95,214":11064,"0,4,64,249,192,3,95,214":1976772,"0,8,64,249,192,3,95,214":58972,"255,3,1,209,244,79,2,169,253,123,3,169,253,195,0,145,115,-1,-1,-1,115,-1,-1,-1,96,34,0,145,8,252,223,8,72,1,0,55":224748,"224,3,31,170,192,3,95,214":301780,"249,15,27,248,248,95,1,169,246,87,2,169,244,79,3,169,253,123,4,169,253,3,1,145,243,3,0,170,121,6,64,249,104,146,64,57":13809700,"224,15,31,248,225,3,0,212":4113140,"65,4,0,212,192,3,95,214":4113172,"253,123,65,169,96,2,0,249,243,7,66,248,192,3,95,214":304428,"224,7,64,249,253,123,65,169,255,131,0,145,192,3,95,214":176220,"253,123,193,168,0,2,31,214":4024120,"243,23,64,249,253,123,67,169,255,3,1,145,192,3,95,214":495032,"65,1,0,212":4112908,"193,2,0,212,192,3,95,214":4113060} \ No newline at end of file diff --git a/gadgetcaches/b1c6a6bc606fa2453fcc82a4fe5110a6.json b/gadgetcaches/3.0.0_b1c6a6bc606fa2453fcc82a4fe5110a6.json similarity index 100% rename from gadgetcaches/b1c6a6bc606fa2453fcc82a4fe5110a6.json rename to gadgetcaches/3.0.0_b1c6a6bc606fa2453fcc82a4fe5110a6.json diff --git a/start.js b/start.js index 0d86a27..6b604b7 100644 --- a/start.js +++ b/start.js @@ -200,10 +200,11 @@ app.get('/nros/:nroname', function (req, res) { }); app.get('/cache', function (req, res) { + var md5 = crypto.createHash('md5'); md5.update(req.headers['user-agent']); md5 = md5.digest('hex'); - var fn = path.resolve(__dirname, 'gadgetcaches/' + md5 + '.json'); + var fn = path.resolve(__dirname, 'gadgetcaches/' + getVersionStringFromNumber(getVersionFromUA(req.headers['user-agent'])) + "_" + md5 + '.json'); if (fs.existsSync(fn)) { res.end(fs.readFileSync(fn)); } else { @@ -258,7 +259,7 @@ app.post('/cache', function (req, res) { var md5 = crypto.createHash('md5'); md5.update(req.headers['user-agent']); md5 = md5.digest('hex'); - var fn = path.resolve(__dirname, 'gadgetcaches/' + md5 + '.json'); + var fn = path.resolve(__dirname, 'gadgetcaches/' + getVersionStringFromNumber(getVersionFromUA(req.headers['user-agent'])) + "_" + md5 + '.json'); let cache = req.body.msg; fs.writeFileSync(fn, JSON.stringify(cache)); return res.sendStatus(200); diff --git a/startpega.bat b/startpega.bat index 38d563a..34272cc 100644 --- a/startpega.bat +++ b/startpega.bat @@ -1 +1 @@ -node start.js --webapplet --ip 192.168.43.135 --host 192.168.43.135 \ No newline at end of file +node start.js --ip 192.168.0.11 --host 192.168.0.11 \ No newline at end of file diff --git a/startpega_webapplet.bat b/startpega_webapplet.bat new file mode 100644 index 0000000..cde92a7 --- /dev/null +++ b/startpega_webapplet.bat @@ -0,0 +1 @@ +node start.js --webapplet --ip 192.168.0.11 --host 192.168.0.11 \ No newline at end of file