From 4b3f743f33657e1e81e55575e50aa7374105f622 Mon Sep 17 00:00:00 2001 From: Your Name Date: Fri, 12 Jan 2024 14:43:24 +0800 Subject: [PATCH] 2024-01-06, update for ibon/tixcraft. --- chrome_tixcraft.py | 2 +- config_launcher.py | 2 +- settings.py | 2 +- webdriver/Maxbotplus_1.0.0/jquery.min.js | 16 ++ webdriver/Maxbotplus_1.0.0/js/ibon_area.js | 99 ++++++++++- webdriver/Maxbotplus_1.0.0/js/ibon_detail.js | 166 +++++++++++++++++- webdriver/Maxbotplus_1.0.0/js/ibon_ticket.js | 126 ++++++++++++- .../Maxbotplus_1.0.0/js/ibon_ticket_next.js | 105 +++++++++++ .../js/kktix_registrations_assign.js | 19 +- .../js/kktix_registrations_reload.js | 9 +- .../Maxbotplus_1.0.0/js/tixcraft_area.js | 17 +- .../Maxbotplus_1.0.0/js/tixcraft_game.js | 8 +- .../Maxbotplus_1.0.0/js/tixcraft_ticket.js | 132 ++++++++++++-- webdriver/Maxbotplus_1.0.0/manifest.json | 15 +- webdriver/Maxbotplus_1.0.0/options.html | 164 +++++++++-------- webdriver/Maxbotplus_1.0.0/options.js | 25 ++- 16 files changed, 777 insertions(+), 130 deletions(-) create mode 100644 webdriver/Maxbotplus_1.0.0/js/ibon_ticket_next.js diff --git a/chrome_tixcraft.py b/chrome_tixcraft.py index 8d9a954..29fe6de 100644 --- a/chrome_tixcraft.py +++ b/chrome_tixcraft.py @@ -41,7 +41,7 @@ try: except Exception as exc: pass -CONST_APP_VERSION = "MaxBot (2024.01.05)" +CONST_APP_VERSION = "MaxBot (2024.01.06)" CONST_MAXBOT_ANSWER_ONLINE_FILE = "MAXBOT_ONLINE_ANSWER.txt" CONST_MAXBOT_CONFIG_FILE = "settings.json" diff --git a/config_launcher.py b/config_launcher.py index b8d154e..fa1923d 100644 --- a/config_launcher.py +++ b/config_launcher.py @@ -22,7 +22,7 @@ import sys import threading import webbrowser -CONST_APP_VERSION = "MaxBot (2024.01.05)" +CONST_APP_VERSION = "MaxBot (2024.01.06)" CONST_MAXBOT_LAUNCHER_FILE = "config_launcher.json" CONST_MAXBOT_CONFIG_FILE = "settings.json" diff --git a/settings.py b/settings.py index 5d1b455..48a667f 100644 --- a/settings.py +++ b/settings.py @@ -38,7 +38,7 @@ try: except Exception as exc: pass -CONST_APP_VERSION = "MaxBot (2024.01.05)" +CONST_APP_VERSION = "MaxBot (2024.01.06)" CONST_MAXBOT_ANSWER_ONLINE_FILE = "MAXBOT_ONLINE_ANSWER.txt" CONST_MAXBOT_CONFIG_FILE = "settings.json" diff --git a/webdriver/Maxbotplus_1.0.0/jquery.min.js b/webdriver/Maxbotplus_1.0.0/jquery.min.js index b5329e9..5944cea 100644 --- a/webdriver/Maxbotplus_1.0.0/jquery.min.js +++ b/webdriver/Maxbotplus_1.0.0/jquery.min.js @@ -1,2 +1,18 @@ /*! jQuery v3.6.3 | (c) OpenJS Foundation and other contributors | jquery.org/license */ !function(e,t){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(C,e){"use strict";var t=[],r=Object.getPrototypeOf,s=t.slice,g=t.flat?function(e){return t.flat.call(e)}:function(e){return t.concat.apply([],e)},u=t.push,i=t.indexOf,n={},o=n.toString,y=n.hasOwnProperty,a=y.toString,l=a.call(Object),v={},m=function(e){return"function"==typeof e&&"number"!=typeof e.nodeType&&"function"!=typeof e.item},x=function(e){return null!=e&&e===e.window},S=C.document,c={type:!0,src:!0,nonce:!0,noModule:!0};function b(e,t,n){var r,i,o=(n=n||S).createElement("script");if(o.text=e,t)for(r in c)(i=t[r]||t.getAttribute&&t.getAttribute(r))&&o.setAttribute(r,i);n.head.appendChild(o).parentNode.removeChild(o)}function w(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?n[o.call(e)]||"object":typeof e}var f="3.6.3",E=function(e,t){return new E.fn.init(e,t)};function p(e){var t=!!e&&"length"in e&&e.length,n=w(e);return!m(e)&&!x(e)&&("array"===n||0===t||"number"==typeof t&&0+~]|"+M+")"+M+"*"),U=new RegExp(M+"|>"),X=new RegExp(F),V=new RegExp("^"+I+"$"),G={ID:new RegExp("^#("+I+")"),CLASS:new RegExp("^\\.("+I+")"),TAG:new RegExp("^("+I+"|[*])"),ATTR:new RegExp("^"+W),PSEUDO:new RegExp("^"+F),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new RegExp("^(?:"+R+")$","i"),needsContext:new RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},Y=/HTML$/i,Q=/^(?:input|select|textarea|button)$/i,J=/^h\d$/i,K=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ee=/[+~]/,te=new RegExp("\\\\[\\da-fA-F]{1,6}"+M+"?|\\\\([^\\r\\n\\f])","g"),ne=function(e,t){var n="0x"+e.slice(1)-65536;return t||(n<0?String.fromCharCode(n+65536):String.fromCharCode(n>>10|55296,1023&n|56320))},re=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,ie=function(e,t){return t?"\0"===e?"\ufffd":e.slice(0,-1)+"\\"+e.charCodeAt(e.length-1).toString(16)+" ":"\\"+e},oe=function(){T()},ae=be(function(e){return!0===e.disabled&&"fieldset"===e.nodeName.toLowerCase()},{dir:"parentNode",next:"legend"});try{H.apply(t=O.call(p.childNodes),p.childNodes),t[p.childNodes.length].nodeType}catch(e){H={apply:t.length?function(e,t){L.apply(e,O.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function se(t,e,n,r){var i,o,a,s,u,l,c,f=e&&e.ownerDocument,p=e?e.nodeType:9;if(n=n||[],"string"!=typeof t||!t||1!==p&&9!==p&&11!==p)return n;if(!r&&(T(e),e=e||C,S)){if(11!==p&&(u=Z.exec(t)))if(i=u[1]){if(9===p){if(!(a=e.getElementById(i)))return n;if(a.id===i)return n.push(a),n}else if(f&&(a=f.getElementById(i))&&v(e,a)&&a.id===i)return n.push(a),n}else{if(u[2])return H.apply(n,e.getElementsByTagName(t)),n;if((i=u[3])&&d.getElementsByClassName&&e.getElementsByClassName)return H.apply(n,e.getElementsByClassName(i)),n}if(d.qsa&&!N[t+" "]&&(!y||!y.test(t))&&(1!==p||"object"!==e.nodeName.toLowerCase())){if(c=t,f=e,1===p&&(U.test(t)||z.test(t))){(f=ee.test(t)&&ve(e.parentNode)||e)===e&&d.scope||((s=e.getAttribute("id"))?s=s.replace(re,ie):e.setAttribute("id",s=E)),o=(l=h(t)).length;while(o--)l[o]=(s?"#"+s:":scope")+" "+xe(l[o]);c=l.join(",")}try{if(d.cssSupportsSelector&&!CSS.supports("selector(:is("+c+"))"))throw new Error;return H.apply(n,f.querySelectorAll(c)),n}catch(e){N(t,!0)}finally{s===E&&e.removeAttribute("id")}}}return g(t.replace(B,"$1"),e,n,r)}function ue(){var r=[];return function e(t,n){return r.push(t+" ")>b.cacheLength&&delete e[r.shift()],e[t+" "]=n}}function le(e){return e[E]=!0,e}function ce(e){var t=C.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function fe(e,t){var n=e.split("|"),r=n.length;while(r--)b.attrHandle[n[r]]=t}function pe(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&e.sourceIndex-t.sourceIndex;if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function de(t){return function(e){return"input"===e.nodeName.toLowerCase()&&e.type===t}}function he(n){return function(e){var t=e.nodeName.toLowerCase();return("input"===t||"button"===t)&&e.type===n}}function ge(t){return function(e){return"form"in e?e.parentNode&&!1===e.disabled?"label"in e?"label"in e.parentNode?e.parentNode.disabled===t:e.disabled===t:e.isDisabled===t||e.isDisabled!==!t&&ae(e)===t:e.disabled===t:"label"in e&&e.disabled===t}}function ye(a){return le(function(o){return o=+o,le(function(e,t){var n,r=a([],e.length,o),i=r.length;while(i--)e[n=r[i]]&&(e[n]=!(t[n]=e[n]))})})}function ve(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}for(e in d=se.support={},i=se.isXML=function(e){var t=e&&e.namespaceURI,n=e&&(e.ownerDocument||e).documentElement;return!Y.test(t||n&&n.nodeName||"HTML")},T=se.setDocument=function(e){var t,n,r=e?e.ownerDocument||e:p;return r!=C&&9===r.nodeType&&r.documentElement&&(a=(C=r).documentElement,S=!i(C),p!=C&&(n=C.defaultView)&&n.top!==n&&(n.addEventListener?n.addEventListener("unload",oe,!1):n.attachEvent&&n.attachEvent("onunload",oe)),d.scope=ce(function(e){return a.appendChild(e).appendChild(C.createElement("div")),"undefined"!=typeof e.querySelectorAll&&!e.querySelectorAll(":scope fieldset div").length}),d.cssSupportsSelector=ce(function(){return CSS.supports("selector(*)")&&C.querySelectorAll(":is(:jqfake)")&&!CSS.supports("selector(:is(*,:jqfake))")}),d.attributes=ce(function(e){return e.className="i",!e.getAttribute("className")}),d.getElementsByTagName=ce(function(e){return e.appendChild(C.createComment("")),!e.getElementsByTagName("*").length}),d.getElementsByClassName=K.test(C.getElementsByClassName),d.getById=ce(function(e){return a.appendChild(e).id=E,!C.getElementsByName||!C.getElementsByName(E).length}),d.getById?(b.filter.ID=function(e){var t=e.replace(te,ne);return function(e){return e.getAttribute("id")===t}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&S){var n=t.getElementById(e);return n?[n]:[]}}):(b.filter.ID=function(e){var n=e.replace(te,ne);return function(e){var t="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return t&&t.value===n}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&S){var n,r,i,o=t.getElementById(e);if(o){if((n=o.getAttributeNode("id"))&&n.value===e)return[o];i=t.getElementsByName(e),r=0;while(o=i[r++])if((n=o.getAttributeNode("id"))&&n.value===e)return[o]}return[]}}),b.find.TAG=d.getElementsByTagName?function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):d.qsa?t.querySelectorAll(e):void 0}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},b.find.CLASS=d.getElementsByClassName&&function(e,t){if("undefined"!=typeof t.getElementsByClassName&&S)return t.getElementsByClassName(e)},s=[],y=[],(d.qsa=K.test(C.querySelectorAll))&&(ce(function(e){var t;a.appendChild(e).innerHTML="",e.querySelectorAll("[msallowcapture^='']").length&&y.push("[*^$]="+M+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||y.push("\\["+M+"*(?:value|"+R+")"),e.querySelectorAll("[id~="+E+"-]").length||y.push("~="),(t=C.createElement("input")).setAttribute("name",""),e.appendChild(t),e.querySelectorAll("[name='']").length||y.push("\\["+M+"*name"+M+"*="+M+"*(?:''|\"\")"),e.querySelectorAll(":checked").length||y.push(":checked"),e.querySelectorAll("a#"+E+"+*").length||y.push(".#.+[+~]"),e.querySelectorAll("\\\f"),y.push("[\\r\\n\\f]")}),ce(function(e){e.innerHTML="";var t=C.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),e.querySelectorAll("[name=d]").length&&y.push("name"+M+"*[*^$|!~]?="),2!==e.querySelectorAll(":enabled").length&&y.push(":enabled",":disabled"),a.appendChild(e).disabled=!0,2!==e.querySelectorAll(":disabled").length&&y.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),y.push(",.*:")})),(d.matchesSelector=K.test(c=a.matches||a.webkitMatchesSelector||a.mozMatchesSelector||a.oMatchesSelector||a.msMatchesSelector))&&ce(function(e){d.disconnectedMatch=c.call(e,"*"),c.call(e,"[s!='']:x"),s.push("!=",F)}),d.cssSupportsSelector||y.push(":has"),y=y.length&&new RegExp(y.join("|")),s=s.length&&new RegExp(s.join("|")),t=K.test(a.compareDocumentPosition),v=t||K.test(a.contains)?function(e,t){var n=9===e.nodeType&&e.documentElement||e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},j=t?function(e,t){if(e===t)return l=!0,0;var n=!e.compareDocumentPosition-!t.compareDocumentPosition;return n||(1&(n=(e.ownerDocument||e)==(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!d.sortDetached&&t.compareDocumentPosition(e)===n?e==C||e.ownerDocument==p&&v(p,e)?-1:t==C||t.ownerDocument==p&&v(p,t)?1:u?P(u,e)-P(u,t):0:4&n?-1:1)}:function(e,t){if(e===t)return l=!0,0;var n,r=0,i=e.parentNode,o=t.parentNode,a=[e],s=[t];if(!i||!o)return e==C?-1:t==C?1:i?-1:o?1:u?P(u,e)-P(u,t):0;if(i===o)return pe(e,t);n=e;while(n=n.parentNode)a.unshift(n);n=t;while(n=n.parentNode)s.unshift(n);while(a[r]===s[r])r++;return r?pe(a[r],s[r]):a[r]==p?-1:s[r]==p?1:0}),C},se.matches=function(e,t){return se(e,null,null,t)},se.matchesSelector=function(e,t){if(T(e),d.matchesSelector&&S&&!N[t+" "]&&(!s||!s.test(t))&&(!y||!y.test(t)))try{var n=c.call(e,t);if(n||d.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(e){N(t,!0)}return 0":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(te,ne),e[3]=(e[3]||e[4]||e[5]||"").replace(te,ne),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||se.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&se.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return G.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&X.test(n)&&(t=h(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(te,ne).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=m[e+" "];return t||(t=new RegExp("(^|"+M+")"+e+"("+M+"|$)"))&&m(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(n,r,i){return function(e){var t=se.attr(e,n);return null==t?"!="===r:!r||(t+="","="===r?t===i:"!="===r?t!==i:"^="===r?i&&0===t.indexOf(i):"*="===r?i&&-1:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;function j(e,n,r){return m(n)?E.grep(e,function(e,t){return!!n.call(e,t,e)!==r}):n.nodeType?E.grep(e,function(e){return e===n!==r}):"string"!=typeof n?E.grep(e,function(e){return-1)[^>]*|#([\w-]+))$/;(E.fn.init=function(e,t,n){var r,i;if(!e)return this;if(n=n||D,"string"==typeof e){if(!(r="<"===e[0]&&">"===e[e.length-1]&&3<=e.length?[null,e,null]:q.exec(e))||!r[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(r[1]){if(t=t instanceof E?t[0]:t,E.merge(this,E.parseHTML(r[1],t&&t.nodeType?t.ownerDocument||t:S,!0)),N.test(r[1])&&E.isPlainObject(t))for(r in t)m(this[r])?this[r](t[r]):this.attr(r,t[r]);return this}return(i=S.getElementById(r[2]))&&(this[0]=i,this.length=1),this}return e.nodeType?(this[0]=e,this.length=1,this):m(e)?void 0!==n.ready?n.ready(e):e(E):E.makeArray(e,this)}).prototype=E.fn,D=E(S);var L=/^(?:parents|prev(?:Until|All))/,H={children:!0,contents:!0,next:!0,prev:!0};function O(e,t){while((e=e[t])&&1!==e.nodeType);return e}E.fn.extend({has:function(e){var t=E(e,this),n=t.length;return this.filter(function(){for(var e=0;e\x20\t\r\n\f]*)/i,he=/^$|^module$|\/(?:java|ecma)script/i;ce=S.createDocumentFragment().appendChild(S.createElement("div")),(fe=S.createElement("input")).setAttribute("type","radio"),fe.setAttribute("checked","checked"),fe.setAttribute("name","t"),ce.appendChild(fe),v.checkClone=ce.cloneNode(!0).cloneNode(!0).lastChild.checked,ce.innerHTML="",v.noCloneChecked=!!ce.cloneNode(!0).lastChild.defaultValue,ce.innerHTML="",v.option=!!ce.lastChild;var ge={thead:[1,"","
"],col:[2,"","
"],tr:[2,"","
"],td:[3,"","
"],_default:[0,"",""]};function ye(e,t){var n;return n="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):[],void 0===t||t&&A(e,t)?E.merge([e],n):n}function ve(e,t){for(var n=0,r=e.length;n",""]);var me=/<|&#?\w+;/;function xe(e,t,n,r,i){for(var o,a,s,u,l,c,f=t.createDocumentFragment(),p=[],d=0,h=e.length;d\s*$/g;function je(e,t){return A(e,"table")&&A(11!==t.nodeType?t:t.firstChild,"tr")&&E(e).children("tbody")[0]||e}function De(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function qe(e){return"true/"===(e.type||"").slice(0,5)?e.type=e.type.slice(5):e.removeAttribute("type"),e}function Le(e,t){var n,r,i,o,a,s;if(1===t.nodeType){if(Y.hasData(e)&&(s=Y.get(e).events))for(i in Y.remove(t,"handle events"),s)for(n=0,r=s[i].length;n").attr(n.scriptAttrs||{}).prop({charset:n.scriptCharset,src:n.url}).on("load error",i=function(e){r.remove(),i=null,e&&t("error"===e.type?404:200,e.type)}),S.head.appendChild(r[0])},abort:function(){i&&i()}}});var Ut,Xt=[],Vt=/(=)\?(?=&|$)|\?\?/;E.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Xt.pop()||E.expando+"_"+Ct.guid++;return this[e]=!0,e}}),E.ajaxPrefilter("json jsonp",function(e,t,n){var r,i,o,a=!1!==e.jsonp&&(Vt.test(e.url)?"url":"string"==typeof e.data&&0===(e.contentType||"").indexOf("application/x-www-form-urlencoded")&&Vt.test(e.data)&&"data");if(a||"jsonp"===e.dataTypes[0])return r=e.jsonpCallback=m(e.jsonpCallback)?e.jsonpCallback():e.jsonpCallback,a?e[a]=e[a].replace(Vt,"$1"+r):!1!==e.jsonp&&(e.url+=(St.test(e.url)?"&":"?")+e.jsonp+"="+r),e.converters["script json"]=function(){return o||E.error(r+" was not called"),o[0]},e.dataTypes[0]="json",i=C[r],C[r]=function(){o=arguments},n.always(function(){void 0===i?E(C).removeProp(r):C[r]=i,e[r]&&(e.jsonpCallback=t.jsonpCallback,Xt.push(r)),o&&m(i)&&i(o[0]),o=i=void 0}),"script"}),v.createHTMLDocument=((Ut=S.implementation.createHTMLDocument("").body).innerHTML="
",2===Ut.childNodes.length),E.parseHTML=function(e,t,n){return"string"!=typeof e?[]:("boolean"==typeof t&&(n=t,t=!1),t||(v.createHTMLDocument?((r=(t=S.implementation.createHTMLDocument("")).createElement("base")).href=S.location.href,t.head.appendChild(r)):t=S),o=!n&&[],(i=N.exec(e))?[t.createElement(i[1])]:(i=xe([e],t,o),o&&o.length&&E(o).remove(),E.merge([],i.childNodes)));var r,i,o},E.fn.load=function(e,t,n){var r,i,o,a=this,s=e.indexOf(" ");return-1").append(E.parseHTML(e)).find(r):e)}).always(n&&function(e,t){a.each(function(){n.apply(this,o||[e.responseText,t,e])})}),this},E.expr.pseudos.animated=function(t){return E.grep(E.timers,function(e){return t===e.elem}).length},E.offset={setOffset:function(e,t,n){var r,i,o,a,s,u,l=E.css(e,"position"),c=E(e),f={};"static"===l&&(e.style.position="relative"),s=c.offset(),o=E.css(e,"top"),u=E.css(e,"left"),("absolute"===l||"fixed"===l)&&-1<(o+u).indexOf("auto")?(a=(r=c.position()).top,i=r.left):(a=parseFloat(o)||0,i=parseFloat(u)||0),m(t)&&(t=t.call(e,n,E.extend({},s))),null!=t.top&&(f.top=t.top-s.top+a),null!=t.left&&(f.left=t.left-s.left+i),"using"in t?t.using.call(e,f):c.css(f)}},E.fn.extend({offset:function(t){if(arguments.length)return void 0===t?this:this.each(function(e){E.offset.setOffset(this,t,e)});var e,n,r=this[0];return r?r.getClientRects().length?(e=r.getBoundingClientRect(),n=r.ownerDocument.defaultView,{top:e.top+n.pageYOffset,left:e.left+n.pageXOffset}):{top:0,left:0}:void 0},position:function(){if(this[0]){var e,t,n,r=this[0],i={top:0,left:0};if("fixed"===E.css(r,"position"))t=r.getBoundingClientRect();else{t=this.offset(),n=r.ownerDocument,e=r.offsetParent||n.documentElement;while(e&&(e===n.body||e===n.documentElement)&&"static"===E.css(e,"position"))e=e.parentNode;e&&e!==r&&1===e.nodeType&&((i=E(e).offset()).top+=E.css(e,"borderTopWidth",!0),i.left+=E.css(e,"borderLeftWidth",!0))}return{top:t.top-i.top-E.css(r,"marginTop",!0),left:t.left-i.left-E.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent;while(e&&"static"===E.css(e,"position"))e=e.offsetParent;return e||re})}}),E.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(t,i){var o="pageYOffset"===i;E.fn[t]=function(e){return B(this,function(e,t,n){var r;if(x(e)?r=e:9===e.nodeType&&(r=e.defaultView),void 0===n)return r?r[i]:e[t];r?r.scrollTo(o?r.pageXOffset:n,o?n:r.pageYOffset):e[t]=n},t,e,arguments.length)}}),E.each(["top","left"],function(e,n){E.cssHooks[n]=_e(v.pixelPosition,function(e,t){if(t)return t=Be(e,n),Pe.test(t)?E(e).position()[n]+"px":t})}),E.each({Height:"height",Width:"width"},function(a,s){E.each({padding:"inner"+a,content:s,"":"outer"+a},function(r,o){E.fn[o]=function(e,t){var n=arguments.length&&(r||"boolean"!=typeof e),i=r||(!0===e||!0===t?"margin":"border");return B(this,function(e,t,n){var r;return x(e)?0===o.indexOf("outer")?e["inner"+a]:e.document.documentElement["client"+a]:9===e.nodeType?(r=e.documentElement,Math.max(e.body["scroll"+a],r["scroll"+a],e.body["offset"+a],r["offset"+a],r["client"+a])):void 0===n?E.css(e,t,i):E.style(e,t,n,i)},s,n?e:void 0,n)}})}),E.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){E.fn[t]=function(e){return this.on(t,e)}}),E.fn.extend({bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)},hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)}}),E.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(e,n){E.fn[n]=function(e,t){return 0 tbody > tr.disabled").remove(); -$("table > tbody > tr.sold-out").remove(); +$("table.table > tbody > tr.disabled").remove(); +$("table.table > tbody > tr.sold-out").remove(); $("div.map > div > img").remove(); $("footer").remove(); -let $tr=$("table > tbody > tr[onclick]"); + +var $tr=$("table.table > tbody > tr[onclick]"); //console.log("$tr.length:"+$tr.length); if($tr.length==1) { //console.log("$tr.html:"+$tr.html()); $tr.click(); } +function ibon_area_ready(settings) { + let area_keyword_array = []; + if(settings) { + if(settings.area_auto_select.area_keyword.length > 0) { + if(settings.area_auto_select.area_keyword!='""') { + area_keyword_array = JSON.parse('[' + settings.area_auto_select.area_keyword +']'); + } + } + } + //let target_area = []; + + let target_row=null; + let all_row = $("table.table > tbody > tr[onclick]"); + if (all_row.length > 0) + { + if (all_row.length == 1) { + // single select. + target_row=all_row; + } else { + // multi select. + all_row.each(function () + { + //console.log(all_row.index(this)); + let is_match_keyword = false; + if(all_row.index(this)==0) { + target_row=$(this); + } else { + if(area_keyword_array.length) { + let html_text=$(this).text(); + //console.log("html:"+html_text); + + for (let i = 0; i < area_keyword_array.length; i++) { + // TOOD: multi item matched, need sort. + // target_area = get_target_area_with_order(settings, matched_block); + + if(html_text.indexOf(area_keyword_array[i])>-1) { + is_match_keyword = true; + target_row=$(this); + break; + } + } + } else { + if(all_row.index(this)==0) { + is_match_keyword = true; + target_row=$(this); + } + } + } + //console.log("is_match_keyword:"+is_match_keyword); + if(is_match_keyword) { + return; + } + }); + } + if(target_row) { + target_row.click(); + } + } else { + location.reload(); + } +} + +function ibon_area_clean_exclude(settings) +{ + let exclude_keyword_array = []; + if(settings) { + if(settings.keyword_exclude.length > 0) { + if(settings.keyword_exclude != '""') { + exclude_keyword_array = JSON.parse('[' + settings.keyword_exclude +']'); + } + } + } + for (let i = 0; i < exclude_keyword_array.length; i++) { + $("table.table > tbody > tr").each(function () + { + let html_text=$(this).text(); + //console.log("html:"+html_text); + if(html_text.indexOf(exclude_keyword_array[i])>-1) { + $(this).remove(); + } + }); + } +} + + function ibon_area_main() { let reload=false; - let $tr=$("table > tbody > tr[onclick]"); + let $tr=$("table.table > tbody > tr[onclick]"); if($tr.length==0) { reload=true; } @@ -33,6 +121,9 @@ function ibon_area_main() { location.reload(); }, auto_reload_page_interval * 1000); } + } else { + ibon_area_clean_exclude(settings); + ibon_area_ready(settings); } } diff --git a/webdriver/Maxbotplus_1.0.0/js/ibon_detail.js b/webdriver/Maxbotplus_1.0.0/js/ibon_detail.js index 780193b..40b07eb 100644 --- a/webdriver/Maxbotplus_1.0.0/js/ibon_detail.js +++ b/webdriver/Maxbotplus_1.0.0/js/ibon_detail.js @@ -1,2 +1,164 @@ -// TODO: ... -console.log("TODO: date auto click..."); \ No newline at end of file +const storage = chrome.storage.local; +var settings = null; + +function ibon_detail_ajax_done(game_info) +{ + let date_keyword_array = []; + if(settings) { + if(settings.date_auto_select.date_keyword.length > 0) { + date_keyword_array = JSON.parse('[' + settings.date_auto_select.date_keyword +']'); + } + } + + let reload=false; + let target_href = ""; + + //console.log(game_info.Item); + if(game_info.Item.GIHtmls.length) { + // one of game able to buy. + let one_can_buy = false; + + for (let i = 0; i < game_info.Item.GIHtmls.length; i++) { + let rs = game_info.Item.GIHtmls[i]; + if(game_info.Item.GIHtmls.length==1) { + // single row. + if(rs.Href==null) { + reload=true; + } else { + if(rs.CanBuy==false) { + reload=true; + } else { + one_can_buy = true; + target_href = rs.Href; + } + } + if(reload) { + break; + } + } else { + // multi rows. + if(settings) { + let is_match_row = false; + if(date_keyword_array.length) { + for (let j = 0; j < date_keyword_array.length; j++) { + // TOOD: multi item matched, need sort. + // target_area = get_target_area_with_order(settings, matched_block); + + if(rs.ShowSaleDate.indexOf(date_keyword_array[j])>-1) { + is_match_row = true; + } + if(rs.GameInfoName.indexOf(date_keyword_array[j])>-1) { + is_match_row = true; + } + if(is_match_row) { + break; + } + } + } else { + // empty keyword. + is_match_row = true; + } + if(is_match_row) { + if(rs.Href!=null) { + if(rs.CanBuy!=false) { + one_can_buy = true; + target_href = rs.Href; + break; + } + } + } + } + } + } + + if(!reload) { + if(one_can_buy == false) reload=true; + } + + } + + console.log("reload:"+reload); + console.log("target_href:"+target_href); + if(reload) { + let auto_reload_page_interval = 0.0; + if(settings) { + auto_reload_page_interval = settings.advanced.auto_reload_page_interval; + } + if(auto_reload_page_interval == 0) { + //console.log('Start to reload now.'); + location.reload(); + } else { + console.log('We are going to reload after few seconeds.'); + setTimeout(function () { + location.reload(); + }, auto_reload_page_interval * 1000); + } + } + else { + // goto target event. + //console.log(target_href); + if(target_href.length > 0) { + location.href= "https://ticket.ibon.com.tw/" + target_href; + } + } +} + +function ibon_event_status_check() +{ + const currentUrl = window.location.href; + const event_code = currentUrl.split('/')[5]; + //console.log(currentUrl); + //console.log(event_code); + if(event_code){ + let api_url = "https://ticketapi.ibon.com.tw/api/ActivityInfo/GetGameInfoList"; + + "{\"id\":38042,\"hasDeadline\":true,\"SystemBrowseType\":0}" + dataJSON = { + id: parseInt(event_code, 10), + hasDeadline: true, + SystemBrowseType: 0 + } + $.ajax({ + url: api_url, + data: JSON.stringify(dataJSON), + type: "POST", + dataType: "json", + xhrFields: { + withCredentials: true + }, + headers: { + "x-xsrf-token": getCookie("XSRF-TOKEN") + }, + contentType: "application/json", + success: function(returnData){ + ibon_detail_ajax_done(returnData); + //console.log(returnData); + }, + error: function(xhr, ajaxOptions, thrownError){ + //console.log(xhr.status); + //console.log(thrownError); + } + }); + } +} + +storage.get('settings', function (items) +{ + if (items.settings) + { + settings = items.settings; + } +}); + +storage.get('status', function (items) +{ + if (items.status && items.status=='ON') + { + console.log("start to ibon detail."); + //console.log(document.cookie); + //console.log(getCookie("XSRF-TOKEN")); + ibon_event_status_check(); + } else { + console.log('no status found'); + } +}); diff --git a/webdriver/Maxbotplus_1.0.0/js/ibon_ticket.js b/webdriver/Maxbotplus_1.0.0/js/ibon_ticket.js index c59352f..ada410d 100644 --- a/webdriver/Maxbotplus_1.0.0/js/ibon_ticket.js +++ b/webdriver/Maxbotplus_1.0.0/js/ibon_ticket.js @@ -3,7 +3,7 @@ var settings = null; $("footer").remove(); -function assign_ticket_number(ticket_number) +function ibon_assign_ticket_number(ticket_number) { let $main_table = $("table.table"); if ($main_table.length > 0) @@ -36,7 +36,7 @@ function assign_ticket_number(ticket_number) } } -function assign_adjacent_seat(flag) { +function ibon_assign_adjacent_seat(flag) { //console.log("disable_adjacent_seat flag:"+flag); if(flag) { $('input[type=checkbox]').each(function() { @@ -45,21 +45,133 @@ function assign_adjacent_seat(flag) { } } -function focus_on_captcha() +function ibon_focus_on_captcha() { $("div.editor-box > div > input[type='text']").focus(); } +var myInterval = null; + +function ibon_get_ocr_image() +{ + //console.log("get_ocr_image"); + let image_data = ""; + + // PS: tixcraft have different domain to use the same content script. + const currentUrl = window.location.href; + const domain = currentUrl.split('/')[2]; + + let image_id = 'chk_pic'; + let img = document.getElementById(image_id); + if(img!=null) { + let canvas = document.createElement('canvas'); + let context = canvas.getContext('2d'); + canvas.height = img.naturalHeight; + canvas.width = img.naturalWidth; + context.drawImage(img, 0, 0); + let img_data = canvas.toDataURL(); + if(img_data) { + image_data = img_data.split(",")[1]; + //console.log(image_data); + } + } + return image_data; +} + +chrome.runtime.onMessage.addListener((message) => { + //console.log('sent from background', message); + ibon_set_ocr_answer(message.answer); +}); + +function ibon_set_ocr_answer(answer) +{ + console.log("answer:"+answer); + if(answer.length > 0) { + $("div.editor-box > div > input[type='text']").val(answer); + //console.log($("div#ticket-wrap a[onclick]").length); + //$("div#ticket-wrap a[onclick]").click(); + //$("#aspnetForm").submit(); + let done_div=""; + $("body").append(done_div); + + } +} + +async function ibon_get_ocr_answer(api_url, image_data) +{ + let bundle = { + action: 'ocr', + data: { + 'url': api_url + 'ocr', + 'image_data':image_data, + } + }; + + let bundle_string = JSON.stringify(bundle); + const return_answer = await chrome.runtime.sendMessage(bundle); + //console.log(return_answer); +} + +function ibon_orc_image_ready(api_url) +{ + let ret=false; + let image_data = ibon_get_ocr_image(); + if(image_data.length>0) { + ret=true; + if(myInterval) clearInterval(myInterval); + ibon_get_ocr_answer(api_url, image_data); + } + //console.log("ibon_orc_image_ready:"+ret); + return ret; +} + storage.get('settings', function (items) { if (items.settings) { settings = items.settings; - //console.log("ticket_number:"+ settings.ticket_number); - assign_ticket_number(settings.ticket_number); - assign_adjacent_seat(settings.advanced.disable_adjacent_seat); - focus_on_captcha(); } else { console.log('no settings found'); } }); + + +storage.get('settings', function (items) +{ + if (items.settings) + { + settings = items.settings; + } +}); + +storage.get('status', function (items) +{ + if (items.status && items.status=='ON') + { + //console.log("ticket_number:"+ settings.ticket_number); + ibon_assign_ticket_number(settings.ticket_number); + ibon_assign_adjacent_seat(settings.advanced.disable_adjacent_seat); + + // ocr + if(settings.ocr_captcha.enable) { + let remote_url_string = ""; + let remote_url_array = []; + if(settings.advanced.remote_url.length > 0) { + remote_url_array = JSON.parse('[' + settings.advanced.remote_url +']'); + } + if(remote_url_array.length) { + remote_url_string = remote_url_array[0]; + } + if(!ibon_orc_image_ready(remote_url_string)) { + myInterval = setInterval(() => { + ibon_orc_image_ready(remote_url_string); + }, 100); + } + } else { + // no orc, just focus; + ibon_focus_on_captcha(); + } + } else { + console.log('no status found'); + } +}); diff --git a/webdriver/Maxbotplus_1.0.0/js/ibon_ticket_next.js b/webdriver/Maxbotplus_1.0.0/js/ibon_ticket_next.js new file mode 100644 index 0000000..4e53827 --- /dev/null +++ b/webdriver/Maxbotplus_1.0.0/js/ibon_ticket_next.js @@ -0,0 +1,105 @@ +var myInterval = null; +//console.log("assign appear"); + +function kktix_area_keyword(settings, register_info) +{ + let area_keyword_array = []; + if(settings.area_auto_select.area_keyword.length > 0) { + area_keyword_array = JSON.parse('[' + settings.area_auto_select.area_keyword +']'); + } + // console.log(area_keyword_array); + let target_area = []; + if(area_keyword_array.length) { + for (let i = 0; i < area_keyword_array.length; i++) { + let matched_block=[]; + + $("div.ticket-unit").each(function () + { + let html_text=$(this).text(); + if(html_text.indexOf(area_keyword_array[i])>-1) { + matched_block.push($(this)); + } + target_area = get_target_area_with_order(settings, matched_block); + }); + + if (matched_block.length) { + console.log("match keyword:" + area_keyword_array[i]); + break; + } + } + } else { + let query_string = "div.ticket-unit"; + let matched_block=$(query_string); + target_area = get_target_area_with_order(settings, matched_block); + } + + if (target_area.length) { + let first_node = target_area.find(":first-child"); + let link_id = first_node.attr("id"); + //console.log("link_id: " + link_id); + if(link_id) { + $('input[type=checkbox]').each(function() { + //$(this).prop('checked', true); + if(!$(this).is(':checked')) { + $(this).click(); + } + }); + + let seat_inventory_key=link_id.split("_")[1]; + let seat_inventory_number=register_info.inventory.seatInventory[seat_inventory_key]; + let ticket_number = settings.ticket_number; + if(seat_inventory_number0) { + /* + let target_input = target_area.find("input"); + target_input.click(); + target_input.prop("value", ticket_number); + let down = $.Event('keydown'); + down.key=""+ticket_number; + target_input.trigger(down); + + let up = $.Event('keyup'); + up.key=""+ticket_number; + target_input.trigger(up); + */ + let add_button = target_area.find('button[ng-click="quantityBtnClick(1)"]'); + for(let i=0; i button'); + $next_btn.click(); + } + } + } else { + console.log("not target_area found.") + } +} + +function begin() +{ + console.log("begin to next"); + $("div#ticket-wrap a[onclick]").click(); +} + +function dom_ready() +{ + let ret=false; + if($("#done").length>0) { + $("#done").remove(); + ret=true; + if(myInterval) clearInterval(myInterval); + begin(); + } + console.log("dom_ready:"+ret); + return ret; +} + +if(!dom_ready()) { + myInterval = setInterval(() => { + dom_ready(); + }, 100); +} diff --git a/webdriver/Maxbotplus_1.0.0/js/kktix_registrations_assign.js b/webdriver/Maxbotplus_1.0.0/js/kktix_registrations_assign.js index 8a76dc8..d81f71b 100644 --- a/webdriver/Maxbotplus_1.0.0/js/kktix_registrations_assign.js +++ b/webdriver/Maxbotplus_1.0.0/js/kktix_registrations_assign.js @@ -4,32 +4,29 @@ var myInterval = null; function kktix_area_keyword(settings, register_info) { let area_keyword_array = []; - if(settings.area_auto_select.area_keyword.length > 0) { - area_keyword_array = JSON.parse('[' + settings.area_auto_select.area_keyword +']'); + if(settings) { + if(settings.area_auto_select.area_keyword.length > 0) { + if(settings.area_auto_select.area_keyword!='""') { + area_keyword_array = JSON.parse('[' + settings.area_auto_select.area_keyword +']'); + } + } } // console.log(area_keyword_array); let target_area = []; if(area_keyword_array.length) { for (let i = 0; i < area_keyword_array.length; i++) { - let matched_flag=false; let matched_block=[]; $("div.ticket-unit").each(function () { let html_text=$(this).text(); - if(html_text.indexOf(exclude_keyword_array[i])>-1) { - is_match_keyword=true; - } - if(is_match_keyword) { + if(html_text.indexOf(area_keyword_array[i])>-1) { matched_block.push($(this)); } target_area = get_target_area_with_order(settings, matched_block); - if (target_area.length) { - matched_flag=true; - } }); - if (matched_flag) { + if (matched_block.length) { console.log("match keyword:" + area_keyword_array[i]); break; } diff --git a/webdriver/Maxbotplus_1.0.0/js/kktix_registrations_reload.js b/webdriver/Maxbotplus_1.0.0/js/kktix_registrations_reload.js index 2cdd060..8d7dc1a 100644 --- a/webdriver/Maxbotplus_1.0.0/js/kktix_registrations_reload.js +++ b/webdriver/Maxbotplus_1.0.0/js/kktix_registrations_reload.js @@ -5,9 +5,14 @@ var myInterval = null; function kktix_clean_exclude(settings, register_info) { let exclude_keyword_array = []; - if(settings.keyword_exclude.length > 0) { - exclude_keyword_array = JSON.parse('[' + settings.keyword_exclude +']'); + if(settings) { + if(settings.keyword_exclude.length > 0) { + if(settings.keyword_exclude != '""') { + exclude_keyword_array = JSON.parse('[' + settings.keyword_exclude +']'); + } + } } + for (let i = 0; i < exclude_keyword_array.length; i++) { $("div.ticket-unit").each(function () { diff --git a/webdriver/Maxbotplus_1.0.0/js/tixcraft_area.js b/webdriver/Maxbotplus_1.0.0/js/tixcraft_area.js index b307094..45a7147 100644 --- a/webdriver/Maxbotplus_1.0.0/js/tixcraft_area.js +++ b/webdriver/Maxbotplus_1.0.0/js/tixcraft_area.js @@ -8,9 +8,14 @@ $("footer").remove(); function tixcraft_clean_exclude(settings) { let exclude_keyword_array = []; - if(settings.keyword_exclude.length > 0) { - exclude_keyword_array = JSON.parse('[' + settings.keyword_exclude +']'); + if(settings) { + if(settings.keyword_exclude.length > 0) { + if(settings.keyword_exclude != '""') { + exclude_keyword_array = JSON.parse('[' + settings.keyword_exclude +']'); + } + } } + for (let i = 0; i < exclude_keyword_array.length; i++) { $("ul.area-list > li > a:contains('"+ exclude_keyword_array[i] +"')").each(function () { @@ -23,8 +28,12 @@ function tixcraft_clean_exclude(settings) function tixcraft_area_keyword(settings) { let area_keyword_array = []; - if(settings.area_auto_select.area_keyword.length > 0) { - area_keyword_array = JSON.parse('[' + settings.area_auto_select.area_keyword +']'); + if(settings) { + if(settings.area_auto_select.area_keyword.length > 0) { + if(settings.area_auto_select.area_keyword!='""') { + area_keyword_array = JSON.parse('[' + settings.area_auto_select.area_keyword +']'); + } + } } // console.log(area_keyword_array); let target_area=[]; diff --git a/webdriver/Maxbotplus_1.0.0/js/tixcraft_game.js b/webdriver/Maxbotplus_1.0.0/js/tixcraft_game.js index 2236991..f113ed0 100644 --- a/webdriver/Maxbotplus_1.0.0/js/tixcraft_game.js +++ b/webdriver/Maxbotplus_1.0.0/js/tixcraft_game.js @@ -27,8 +27,12 @@ function date_clean() function date_keyword(settings) { let date_keyword_array = []; - if(settings.date_auto_select.date_keyword.length > 0) { - date_keyword_array = JSON.parse('[' + settings.date_auto_select.date_keyword +']'); + if(settings) { + if(settings.date_auto_select.date_keyword.length > 0) { + if(settings.date_auto_select.date_keyword!='""') { + date_keyword_array = JSON.parse('[' + settings.date_auto_select.date_keyword +']'); + } + } } //console.log(date_keyword_array); let target_date; diff --git a/webdriver/Maxbotplus_1.0.0/js/tixcraft_ticket.js b/webdriver/Maxbotplus_1.0.0/js/tixcraft_ticket.js index 6aacd86..e245fea 100644 --- a/webdriver/Maxbotplus_1.0.0/js/tixcraft_ticket.js +++ b/webdriver/Maxbotplus_1.0.0/js/tixcraft_ticket.js @@ -9,26 +9,99 @@ $('input[type=checkbox]').each(function () $("img[style='width: 100%; padding: 0;']").remove(); $("footer").remove(); -function assign_ticket_number(ticket_number) +function tixcraft_ticket_clean_exclude(settings) { - if ($("#ticketPriceList select").length > 0) + let exclude_keyword_array = []; + if(settings) { + if(settings.keyword_exclude.length > 0) { + if(settings.keyword_exclude!='""') { + exclude_keyword_array = JSON.parse('[' + settings.keyword_exclude +']'); + } + } + } + for (let i = 0; i < exclude_keyword_array.length; i++) { + $("#ticketPriceList > tbody > tr").each(function () + { + let html_text=$(this).text(); + //console.log("html:"+html_text); + if(html_text.indexOf(exclude_keyword_array[i])>-1) { + $(this).remove(); + } + }); + } +} + +function tixcraft_assign_ticket_number(settings) +{ + let area_keyword_array = []; + if(settings) { + if(settings.area_auto_select.area_keyword.length > 0) { + if(settings.area_auto_select.area_keyword!='""') { + area_keyword_array = JSON.parse('[' + settings.area_auto_select.area_keyword +']'); + } + } + } + //let target_area = []; + + let target_row=null; + let all_row = $("#ticketPriceList > tbody > tr"); + if (all_row.length > 0) { - let $ticket_options = $("#ticketPriceList select:first option"); + if (all_row.length == 1) { + // single select. + target_row=all_row; + } else { + // single select. + all_row.each(function () + { + //console.log(all_row.index(this)); + let is_match_keyword = false; + if(all_row.index(this)==0) { + target_row=$(this); + } else { + if(area_keyword_array.length) { + let html_text=$(this).text(); + //console.log("html:"+html_text); + + for (let i = 0; i < area_keyword_array.length; i++) { + // TOOD: multi item matched, need sort. + // target_area = get_target_area_with_order(settings, matched_block); + + if(html_text.indexOf(area_keyword_array[i])>-1) { + is_match_keyword = true; + target_row=$(this); + break; + } + } + } else { + if(all_row.index(this)==0) { + is_match_keyword = true; + target_row=$(this); + } + } + } + //console.log("is_match_keyword:"+is_match_keyword); + if(is_match_keyword) { + return; + } + }); + } + + let $ticket_options = target_row.find("option"); if ($ticket_options.length) { let is_ticket_number_assign = false; - if (ticket_number > 0) + if (settings.ticket_number > 0) { $ticket_options.each(function () { - if ($(this).val() == ticket_number) + if ($(this).val() == settings.ticket_number) { $(this).prop('selected', true); is_ticket_number_assign = true; return false; } - } - ); + }); } if (!is_ticket_number_assign) { @@ -68,19 +141,19 @@ function get_ocr_image() chrome.runtime.onMessage.addListener((message) => { //console.log('sent from background', message); - set_ocr_answer(message.answer); + tixcraft_set_ocr_answer(message.answer); }); -function set_ocr_answer(answer) +function tixcraft_set_ocr_answer(answer) { - console.log("answer:"+answer); + //console.log("answer:"+answer); if(answer.length > 0) { $('#TicketForm_verifyCode').val(answer); $("button[type='submit']").click(); } } -async function get_ocr_answer(api_url, image_data) +async function tixcraft_get_ocr_answer(api_url, image_data) { let bundle = { action: 'ocr', @@ -98,27 +171,47 @@ async function get_ocr_answer(api_url, image_data) //ocr(bundle.data.url, bundle.data.image_data, bundle.data.callback); } -function orc_image_ready(api_url) +function tixcraft_orc_image_ready(api_url) { let ret=false; let image_data = get_ocr_image(); if(image_data.length>0) { ret=true; if(myInterval) clearInterval(myInterval); - get_ocr_answer(api_url, image_data); + tixcraft_get_ocr_answer(api_url, image_data); } - console.log("orc_image_ready:"+ret); + //console.log("orc_image_ready:"+ret); return ret; } - storage.get('settings', function (items) { if (items.settings) { settings = items.settings; + } else { + console.log('no settings found'); + } +}); + +storage.get('settings', function (items) +{ + if (items.settings) + { + settings = items.settings; + } +}); + +storage.get('status', function (items) +{ + if (items.status && items.status=='ON') + { + tixcraft_ticket_clean_exclude(settings); + //console.log("ticket_number:"+ settings.ticket_number); - assign_ticket_number(settings.ticket_number); + tixcraft_assign_ticket_number(settings); + + // ocr if(settings.ocr_captcha.enable) { let remote_url_string = ""; let remote_url_array = []; @@ -128,13 +221,14 @@ storage.get('settings', function (items) if(remote_url_array.length) { remote_url_string = remote_url_array[0]; } - if(!orc_image_ready(remote_url_string)) { + if(!tixcraft_orc_image_ready(remote_url_string)) { myInterval = setInterval(() => { - orc_image_ready(remote_url_string); + tixcraft_orc_image_ready(remote_url_string); }, 100); } } + } else { - console.log('no settings found'); + console.log('no status found'); } }); diff --git a/webdriver/Maxbotplus_1.0.0/manifest.json b/webdriver/Maxbotplus_1.0.0/manifest.json index 44d781d..f0c6e67 100644 --- a/webdriver/Maxbotplus_1.0.0/manifest.json +++ b/webdriver/Maxbotplus_1.0.0/manifest.json @@ -91,7 +91,7 @@ "https://ticketmaster.sg/ticket/ticket/*" ], "run_at": "document_end", - "js" : [ "jquery.min.js", "js/tixcraft_ticket.js" ] + "js" : [ "jquery.min.js", "js/common.js", "js/tixcraft_ticket.js" ] }, { "matches" : [ "https://ticket.com.tw/application/utk01/utk0101_.aspx" ], @@ -141,7 +141,7 @@ }, { "matches" : [ "https://ticket.ibon.com.tw/ActivityInfo/Details/*" ], - "run_at": "document_end", + "run_at": "document_start", "js" : [ "jquery.min.js", "js/ibon_detail.js" ] }, { @@ -157,6 +157,15 @@ "run_at": "document_end", "js" : [ "jquery.min.js", "js/ibon_ticket.js" ] }, + { + "matches" : [ + "https://orders.ibon.com.tw/application/UTK02/UTK0201_001.aspx?PERFORMANCE_ID=*PERFORMANCE_PRICE_AREA_ID=*", + "https://orders.ibon.com.tw/application/UTK02/UTK0202_.aspx?PERFORMANCE_ID=*PERFORMANCE_PRICE_AREA_ID=*" + ], + "run_at": "document_end", + "world": "MAIN", + "js" : [ "jquery.min.js", "js/ibon_ticket_next.js" ] + }, { "matches" : [ "https://msg.cityline.com/*.html*" @@ -224,5 +233,5 @@ "js" : [ "jquery.min.js", "js/common.js", "js/kktix_registrations_reload.js" ] } ], - "version": "1.0.3" + "version": "1.0.4" } \ No newline at end of file diff --git a/webdriver/Maxbotplus_1.0.0/options.html b/webdriver/Maxbotplus_1.0.0/options.html index 98a89d3..ab8eb4c 100644 --- a/webdriver/Maxbotplus_1.0.0/options.html +++ b/webdriver/Maxbotplus_1.0.0/options.html @@ -12,90 +12,112 @@

MaxBot Settings

-
- - -
-
- - -
-
- - -
+ -
- - -
-
- - -
- -
- - -
+
+
+ +
+
+ + +
-
- - -
+
+ + +
+
+ + +
-
-
- - +
+ + +
+
+ + +
+ +
+ + +
-
-
-
- - +
+
+ +
+
+ + +
+ +
+
+ + +
+
+ +
+
+ + +
+
+ +
+ + +
+
- - - -
- - -
+
+ \ No newline at end of file diff --git a/webdriver/Maxbotplus_1.0.0/options.js b/webdriver/Maxbotplus_1.0.0/options.js index 50524b1..8a10972 100644 --- a/webdriver/Maxbotplus_1.0.0/options.js +++ b/webdriver/Maxbotplus_1.0.0/options.js @@ -29,10 +29,23 @@ async function saveChanges() if(settings) { settings.ticket_number = ticket_number_value; settings.date_auto_select.mode = date_select_mode.value; - settings.date_auto_select.date_keyword = date_keyword.value; + + let date_keyword_string = date_keyword.value; + if(date_keyword_string.indexOf('"')==-1) { + date_keyword_string = '"' + date_keyword_string + '"'; + } + settings.date_auto_select.date_keyword = date_keyword_string; + settings.area_auto_select.mode = area_select_mode.value; - settings.area_auto_select.area_keyword = area_keyword.value; + + let area_keyword_string = area_keyword.value; + if(area_keyword_string.indexOf('"')==-1) { + area_keyword_string = '"' + area_keyword_string + '"'; + } + settings.area_auto_select.area_keyword = area_keyword_string; + settings.keyword_exclude = keyword_exclude.value; + settings.advanced.auto_reload_page_interval = auto_reload_page_interval.value; settings.advanced.disable_adjacent_seat = disable_adjacent_seat.checked; settings.ocr_captcha.enable = ocr_captcha_enable.checked; @@ -67,8 +80,16 @@ function loadChanges() ticket_number.value = settings.ticket_number; date_select_mode.value = settings.date_auto_select.mode; date_keyword.value = settings.date_auto_select.date_keyword; + if(date_keyword.value=='""') { + date_keyword.value=''; + } + area_select_mode.value = settings.area_auto_select.mode; area_keyword.value = settings.area_auto_select.area_keyword; + if(area_keyword.value=='""') { + area_keyword.value=''; + } + keyword_exclude.value = settings.keyword_exclude; auto_reload_page_interval.value = settings.advanced.auto_reload_page_interval; disable_adjacent_seat.checked = settings.advanced.disable_adjacent_seat;