diff --git a/.dependabot/config.yml b/.dependabot/config.yml index 38c7a4c9d..a04f0d11c 100644 --- a/.dependabot/config.yml +++ b/.dependabot/config.yml @@ -16,3 +16,17 @@ update_configs: # # But you have been warned... dependency_name: "systemjs" + default_reviewers: + - "remusao" + - "private-face" + - "luciancor" + default_labels: + - "chore" + automerged_updates: + # Here we indicate to dependabot that whenever a dev dependency is + # updated, and CI is green, and the version bump is withing version range + # specified in package.json, then it should be safe to merge + # automatically. + - match: + dependency_type: "development" + update_type: "in_range" diff --git a/.editorconfig b/.editorconfig index e35020ffe..6e58f4c8b 100644 --- a/.editorconfig +++ b/.editorconfig @@ -14,7 +14,7 @@ insert_final_newline = true charset = utf-8 trim_trailing_whitespace = true -[*.{es,js,json,jsm,jsx,ts,tsx}] +[*.{es,js,json,jsm,jsx,ts,tsx,yml}] indent_style = space indent_size = 2 diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 000000000..60277f4f0 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,16 @@ +# Changelog + +## [1.46.0] - 2020-05-12 + + * Update visuals on Cliqz Tab + * Improve UI in quick search dropdown + * Telemetry improvements (generic UI analyses, fix in search sessions) + +## [1.45.0] - 2020-04-07 + + * Make Cliqz default search for 5% of new desktop browser users + * Fix page breakage for auto-consent (cookie pop-up blocker) + * Improve UI in various places (like on-boarding, Cliqz Tab) + * Clean-up and reduce telemetry by removing legacy code + * Using only bundled versions of anti-tracking resources to save bandwidth and storage + * On-going work to clean-up and trim-down extension bundle for better performance diff --git a/CODEOWNERS b/CODEOWNERS index 0354bf8a2..6eaad1be9 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -20,6 +20,7 @@ /configs/common/urls-myoffrz.js @luciancor /configs/offers.js @luciancor /configs/releases/offers-chip-chrome.js @luciancor +/configs/releases/offers-chip-edge.js @luciancor /configs/releases/offers-chip-firefox.js @luciancor /configs/releases/offers-chrome.js @luciancor /configs/releases/offers-edge.js @luciancor diff --git a/Dockerfile.benchmark b/Dockerfile.benchmark index f17b8ba80..659657513 100644 --- a/Dockerfile.benchmark +++ b/Dockerfile.benchmark @@ -6,15 +6,20 @@ RUN apt-get update --no-install-recommends \ && apt-get install -y time jq \ && rm -rf /var/lib/apt/lists/* -RUN mkdir /app +RUN mkdir -p /app/benchmarks RUN chown node:node -R /app USER node +WORKDIR /app/ + +# Install benchmark dependencies +COPY benchmarks/package.json /app/benchmarks/ +COPY benchmarks/package-lock.json /app/benchmarks/ +RUN cd ./benchmarks && npm ci + COPY package.json /app/ COPY package-lock.json /app/ -WORKDIR /app/ - RUN mkdir -p /app/benchmarks && wget -O - https://s3.amazonaws.com/cdncliqz/extension-profiles/session_2018-10-15.jl.gz | gunzip > /app/benchmarks/session.jl RUN wget -O - https://cdn.cliqz.com/adblocking/requests_top500.json.gz | gunzip | head -n 100000 > /app/benchmarks/requests.jl RUN npm ci diff --git a/Dockerfile.ci b/Dockerfile.ci index a1fdbb640..481bc6cce 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -20,6 +20,8 @@ RUN apt-get update --no-install-recommends \ libdbus-glib-1-2 \ libfontconfig1 \ libfreetype6 \ + libgbm-dev \ + libgbm1 \ libgcc1 \ libgconf-2-4 \ libgdk-pixbuf2.0-0 \ diff --git a/Jenkinsfile.benchmark b/Jenkinsfile.benchmark index 6ae5190e9..bd259a4bb 100644 --- a/Jenkinsfile.benchmark +++ b/Jenkinsfile.benchmark @@ -45,6 +45,7 @@ node('docker && !gpu && us-east-1') { withEnv(["CLIQZ_CONFIG_PATH=./configs/${params.CONFIG}"]) { stage('fern build') { sh 'cp -r /app/node_modules ./' + sh 'cp -r /app/benchmarks/node_modules ./benchmarks/' sh './fern.js build' } diff --git a/Jenkinsfile.multibranch b/Jenkinsfile.multibranch index 7dbfc83a2..e42734af1 100644 --- a/Jenkinsfile.multibranch +++ b/Jenkinsfile.multibranch @@ -84,6 +84,10 @@ if (env.BRANCH_NAME.startsWith('v12.')) { matrix['cliqz-geckoview'] = [ 'config': 'cliqz-geckoview.js', ] + matrix['ghostery-geckoview'] = [ + 'config': 'ghostery-geckoview.js', + ] + } if (env.BRANCH_NAME.startsWith('v13.')) { @@ -99,6 +103,9 @@ if (env.BRANCH_NAME.startsWith('v14.')) { matrix['offers-chip-chrome'] = [ 'config': 'releases/offers-chip-chrome.js', ] + matrix['offers-chip-edge'] = [ + 'config': 'releases/offers-chip-edge.js', + ] } if (isIntegrationBranch) { @@ -158,6 +165,10 @@ if (isIntegrationBranch) { 'config': 'cliqz-geckoview.js', ] + matrix['ghostery-geckoview'] = [ + 'config': 'ghostery-geckoview.js', + ] + matrix['lumen-ios'] = [ 'config': 'lumen-ios.js', ] diff --git a/VERSION b/VERSION index cbc91f9f0..d811568bc 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v7.45.2 +v7.47.0 diff --git a/amocleaner.js b/amocleaner.js index 8b1b0c0a3..bb61532ee 100755 --- a/amocleaner.js +++ b/amocleaner.js @@ -15,12 +15,12 @@ const CONFIGS = { sparalarm: { configs: ['offers.js'], 'configs/common': [...COMMON_CONFIGS, 'urls-myoffrz.js'], - 'configs/releases': ['offers-chip-firefox.js', 'offers-chip-chrome.js'], + 'configs/releases': ['offers-chip-firefox.js', 'offers-chip-chrome.js', 'offers-chip-edge.js'], }, myoffrz: { configs: ['offers.js'], 'configs/common': [...COMMON_CONFIGS, 'urls-myoffrz.js'], - 'configs/releases': ['offers-chip-firefox.js', 'offers-chip-chrome.js'], + 'configs/releases': ['offers-firefox.js', 'offers-chrome.js'], }, gt: { configs: ['ghostery-tab-base.js', 'ghostery-tab-firefox.js', 'ghostery-tab-chrome.js'], diff --git a/benchmarks/package-lock.json b/benchmarks/package-lock.json new file mode 100644 index 000000000..ceef25da0 --- /dev/null +++ b/benchmarks/package-lock.json @@ -0,0 +1,1070 @@ +{ + "name": "browser-core-benchmarks", + "version": "0.0.1", + "lockfileVersion": 1, + "requires": true, + "dependencies": { + "@babel/polyfill": { + "version": "7.8.7", + "resolved": "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.8.7.tgz", + "integrity": "sha512-LeSfP9bNZH2UOZgcGcZ0PIHUt1ZuHub1L3CVmEyqLxCeDLm4C5Gi8jRH8ZX2PNpDhQCo0z6y/+DIs2JlliXW8w==", + "requires": { + "core-js": "^2.6.5", + "regenerator-runtime": "^0.13.4" + } + }, + "@cliqz/webextension-emulator": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/@cliqz/webextension-emulator/-/webextension-emulator-0.2.1.tgz", + "integrity": "sha512-AFuSjBx3UH+ZgARc7RQDBytxvMO7MGtcJ7z7GLJDICXfS/2HOiRZYYzVygSO3/woIh89ABuaMCKYNzbgNv6mqw==", + "requires": { + "atob": "^2.1.2", + "blob": "0.0.5", + "btoa": "^1.2.1", + "fake-indexeddb": "^2.0.5", + "filereader": "^0.10.3", + "indexeddbshim": "^4.1.0", + "node-fetch": "^2.3.0", + "node-webcrypto-ossl": "^1.0.44", + "webextension-polyfill": "^0.3.1" + } + }, + "abbrev": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", + "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==" + }, + "ajv": { + "version": "6.12.2", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.2.tgz", + "integrity": "sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ==", + "requires": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + } + }, + "ansi-regex": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" + }, + "aproba": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", + "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==" + }, + "are-we-there-yet": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz", + "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==", + "requires": { + "delegates": "^1.0.0", + "readable-stream": "^2.0.6" + } + }, + "argsarray": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/argsarray/-/argsarray-0.0.1.tgz", + "integrity": "sha1-bnIHtOzbObCviDA/pa4ivajfYcs=" + }, + "asn1": { + "version": "0.2.4", + "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz", + "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==", + "requires": { + "safer-buffer": "~2.1.0" + } + }, + "assert-plus": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", + "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=" + }, + "asynckit": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", + "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=" + }, + "atob": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz", + "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==" + }, + "aws-sign2": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", + "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=" + }, + "aws4": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.9.1.tgz", + "integrity": "sha512-wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug==" + }, + "balanced-match": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", + "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" + }, + "base64-arraybuffer-es6": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/base64-arraybuffer-es6/-/base64-arraybuffer-es6-0.5.0.tgz", + "integrity": "sha512-UCIPaDJrNNj5jG2ZL+nzJ7czvZV/ZYX6LaIRgfVU1k1edJOQg7dkbiSKzwHkNp6aHEHER/PhlFBrMYnlvJJQEw==" + }, + "bcrypt-pbkdf": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", + "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=", + "requires": { + "tweetnacl": "^0.14.3" + } + }, + "blob": { + "version": "0.0.5", + "resolved": "https://registry.npmjs.org/blob/-/blob-0.0.5.tgz", + "integrity": "sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig==" + }, + "brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "requires": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "btoa": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/btoa/-/btoa-1.2.1.tgz", + "integrity": "sha512-SB4/MIGlsiVkMcHmT+pSmIPoNDoHg+7cMzmt3Uxt628MTz2487DKSqK/fuhFBrkuqrYv5UCEnACpF4dTFNKc/g==" + }, + "caseless": { + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", + "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=" + }, + "chownr": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", + "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==" + }, + "code-point-at": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", + "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=" + }, + "combined-stream": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "requires": { + "delayed-stream": "~1.0.0" + } + }, + "concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" + }, + "console-control-strings": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", + "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=" + }, + "core-js": { + "version": "2.6.11", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz", + "integrity": "sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==" + }, + "core-util-is": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", + "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" + }, + "dashdash": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", + "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", + "requires": { + "assert-plus": "^1.0.0" + } + }, + "debug": { + "version": "3.2.6", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", + "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", + "requires": { + "ms": "^2.1.1" + } + }, + "deep-extend": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", + "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==" + }, + "delayed-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=" + }, + "delegates": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", + "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=" + }, + "detect-libc": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz", + "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=" + }, + "domexception": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/domexception/-/domexception-1.0.1.tgz", + "integrity": "sha512-raigMkn7CJNNo6Ihro1fzG7wr3fHuYVytzquZKX5n0yizGsTcYgzdIUwj1X9pK0VvjeihV+XiclP+DjwbsSKug==", + "requires": { + "webidl-conversions": "^4.0.2" + } + }, + "ecc-jsbn": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", + "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=", + "requires": { + "jsbn": "~0.1.0", + "safer-buffer": "^2.1.0" + } + }, + "eventtargeter": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/eventtargeter/-/eventtargeter-0.5.0.tgz", + "integrity": "sha512-FQbP+ToTYLKEF3VpyaciNbaexbvIOrXW1V1Hg7kKCT+AiX6sq8rUn1NIQiYEpA04eWzHpopH/QRHqm3K2KnLtQ==", + "requires": { + "@babel/polyfill": "^7.0.0" + } + }, + "extend": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", + "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==" + }, + "extsprintf": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", + "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=" + }, + "fake-indexeddb": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/fake-indexeddb/-/fake-indexeddb-2.1.1.tgz", + "integrity": "sha512-di5PzbH6/gleD4qcpxT1IDtNNMTKuEs+C2KeJDP1e4mwP2L0UY+vPcTkCdIGq8IcaUUph6IkCrUZJvtpFUdhfg==", + "requires": { + "core-js": "^2.4.1", + "realistic-structured-clone": "^2.0.1", + "setimmediate": "^1.0.5" + } + }, + "fast-deep-equal": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz", + "integrity": "sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==" + }, + "fast-json-stable-stringify": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==" + }, + "filereader": { + "version": "0.10.3", + "resolved": "https://registry.npmjs.org/filereader/-/filereader-0.10.3.tgz", + "integrity": "sha1-x0fUos2PYeVBinwH/hJXpD8KzbE=" + }, + "forever-agent": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", + "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=" + }, + "form-data": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", + "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", + "requires": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.6", + "mime-types": "^2.1.12" + } + }, + "fs-minipass": { + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz", + "integrity": "sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==", + "requires": { + "minipass": "^2.6.0" + } + }, + "fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" + }, + "gauge": { + "version": "2.7.4", + "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz", + "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=", + "requires": { + "aproba": "^1.0.3", + "console-control-strings": "^1.0.0", + "has-unicode": "^2.0.0", + "object-assign": "^4.1.0", + "signal-exit": "^3.0.0", + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1", + "wide-align": "^1.1.0" + } + }, + "getpass": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", + "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", + "requires": { + "assert-plus": "^1.0.0" + } + }, + "glob": { + "version": "7.1.6", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", + "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", + "requires": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } + }, + "har-schema": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", + "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=" + }, + "har-validator": { + "version": "5.1.3", + "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz", + "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==", + "requires": { + "ajv": "^6.5.5", + "har-schema": "^2.0.0" + } + }, + "has-unicode": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", + "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=" + }, + "http-signature": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", + "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", + "requires": { + "assert-plus": "^1.0.0", + "jsprim": "^1.2.2", + "sshpk": "^1.7.0" + } + }, + "iconv-lite": { + "version": "0.4.24", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "requires": { + "safer-buffer": ">= 2.1.2 < 3" + } + }, + "ignore-walk": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.3.tgz", + "integrity": "sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw==", + "requires": { + "minimatch": "^3.0.4" + } + }, + "immediate": { + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.2.3.tgz", + "integrity": "sha1-0UD6j2FGWb1lQSMwl92qwlzdmRw=" + }, + "indexeddbshim": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/indexeddbshim/-/indexeddbshim-4.1.0.tgz", + "integrity": "sha512-gnhy0Fz1fWU9pnIo16uKC9dGimsv/vKlXzZ9zasN2EUkx/KxtHkCIfR8I1XRqujsuTelQmn1/34RpDFycNVxtw==", + "requires": { + "@babel/polyfill": "^7.0.0", + "eventtargeter": "0.5.0", + "sync-promise": "git+https://github.com/brettz9/sync-promise.git#full-sync-missing-promise-features", + "typeson": "5.11.0", + "typeson-registry": "1.0.0-alpha.26", + "websql": "git+https://github.com/brettz9/node-websql.git#configurable-secure2" + }, + "dependencies": { + "base64-arraybuffer-es6": { + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/base64-arraybuffer-es6/-/base64-arraybuffer-es6-0.4.2.tgz", + "integrity": "sha512-HaJx92u12By863ZXVHZs4Bp1nkKaLpbs3Ec9SI1OKzq60Hz+Ks6z7UvdD8pIx61Ck3e8F9MH/IPEu5T0xKSbkQ==" + }, + "typeson": { + "version": "5.11.0", + "resolved": "https://registry.npmjs.org/typeson/-/typeson-5.11.0.tgz", + "integrity": "sha512-S5KtLzcU4dr4BXh8VuJDYugsRGsDQYlumCbrmwuAX1a1GNpbVYK4p9wluCIfTVPFvVyV6wRfExXX6Q1+YDItEQ==" + }, + "typeson-registry": { + "version": "1.0.0-alpha.26", + "resolved": "https://registry.npmjs.org/typeson-registry/-/typeson-registry-1.0.0-alpha.26.tgz", + "integrity": "sha512-R0wwXIYSiJMh+1XfvyUsCnEGVERoJcNrMl9e/ka30dJ+gQyh4/0NU9WHaqUm8oHtZzZYCz+A5fDRCiXYIq7H1Q==", + "requires": { + "base64-arraybuffer-es6": "0.4.2", + "typeson": "5.11.0", + "uuid": "3.3.2", + "whatwg-url": "7.0.0" + } + }, + "whatwg-url": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.0.0.tgz", + "integrity": "sha512-37GeVSIJ3kn1JgKyjiYNmSLP1yzbpb29jdmwBSgkD9h40/hyrR/OifpVUndji3tmwGgD8qpw7iQu3RSbCrBpsQ==", + "requires": { + "lodash.sortby": "^4.7.0", + "tr46": "^1.0.1", + "webidl-conversions": "^4.0.2" + } + } + } + }, + "inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", + "requires": { + "once": "^1.3.0", + "wrappy": "1" + } + }, + "inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" + }, + "ini": { + "version": "1.3.5", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", + "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==" + }, + "is-fullwidth-code-point": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", + "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", + "requires": { + "number-is-nan": "^1.0.0" + } + }, + "is-typedarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", + "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=" + }, + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" + }, + "isstream": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", + "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=" + }, + "jsbn": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", + "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=" + }, + "json-schema": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", + "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=" + }, + "json-schema-traverse": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==" + }, + "json-stringify-safe": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", + "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=" + }, + "jsprim": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", + "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=", + "requires": { + "assert-plus": "1.0.0", + "extsprintf": "1.3.0", + "json-schema": "0.2.3", + "verror": "1.10.0" + } + }, + "lodash.sortby": { + "version": "4.7.0", + "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz", + "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=" + }, + "mime-db": { + "version": "1.43.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.43.0.tgz", + "integrity": "sha512-+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ==" + }, + "mime-types": { + "version": "2.1.26", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.26.tgz", + "integrity": "sha512-01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ==", + "requires": { + "mime-db": "1.43.0" + } + }, + "minimatch": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", + "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "requires": { + "brace-expansion": "^1.1.7" + } + }, + "minimist": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==" + }, + "minipass": { + "version": "2.9.0", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz", + "integrity": "sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==", + "requires": { + "safe-buffer": "^5.1.2", + "yallist": "^3.0.0" + } + }, + "minizlib": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz", + "integrity": "sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==", + "requires": { + "minipass": "^2.9.0" + } + }, + "mkdirp": { + "version": "0.5.5", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", + "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", + "requires": { + "minimist": "^1.2.5" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + }, + "nan": { + "version": "2.14.1", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.1.tgz", + "integrity": "sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw==" + }, + "needle": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/needle/-/needle-2.4.1.tgz", + "integrity": "sha512-x/gi6ijr4B7fwl6WYL9FwlCvRQKGlUNvnceho8wxkwXqN8jvVmmmATTmZPRRG7b/yC1eode26C2HO9jl78Du9g==", + "requires": { + "debug": "^3.2.6", + "iconv-lite": "^0.4.4", + "sax": "^1.2.4" + } + }, + "node-fetch": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz", + "integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==" + }, + "node-pre-gyp": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.11.0.tgz", + "integrity": "sha512-TwWAOZb0j7e9eGaf9esRx3ZcLaE5tQ2lvYy1pb5IAaG1a2e2Kv5Lms1Y4hpj+ciXJRofIxxlt5haeQ/2ANeE0Q==", + "requires": { + "detect-libc": "^1.0.2", + "mkdirp": "^0.5.1", + "needle": "^2.2.1", + "nopt": "^4.0.1", + "npm-packlist": "^1.1.6", + "npmlog": "^4.0.2", + "rc": "^1.2.7", + "rimraf": "^2.6.1", + "semver": "^5.3.0", + "tar": "^4" + } + }, + "node-webcrypto-ossl": { + "version": "1.0.49", + "resolved": "https://registry.npmjs.org/node-webcrypto-ossl/-/node-webcrypto-ossl-1.0.49.tgz", + "integrity": "sha512-Zs73PeTWoUXUFicvAaxZC6ZyVCuq1Eg/Q4rYqiWyBY4eWIbZPFiRIi/KRM0A9GVKBPRNraaXsVmRAC83jEQ6nw==", + "requires": { + "mkdirp": "^0.5.5", + "nan": "^2.14.0", + "tslib": "^1.11.1", + "webcrypto-core": "^0.1.27" + } + }, + "noop-fn": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/noop-fn/-/noop-fn-1.0.0.tgz", + "integrity": "sha1-XzPUfxPSFQ35PgywNmmemC94/78=" + }, + "nopt": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz", + "integrity": "sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==", + "requires": { + "abbrev": "1", + "osenv": "^0.1.4" + } + }, + "npm-bundled": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.1.tgz", + "integrity": "sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA==", + "requires": { + "npm-normalize-package-bin": "^1.0.1" + } + }, + "npm-normalize-package-bin": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz", + "integrity": "sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==" + }, + "npm-packlist": { + "version": "1.4.8", + "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.8.tgz", + "integrity": "sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A==", + "requires": { + "ignore-walk": "^3.0.1", + "npm-bundled": "^1.0.1", + "npm-normalize-package-bin": "^1.0.1" + } + }, + "npmlog": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz", + "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==", + "requires": { + "are-we-there-yet": "~1.1.2", + "console-control-strings": "~1.1.0", + "gauge": "~2.7.3", + "set-blocking": "~2.0.0" + } + }, + "number-is-nan": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", + "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=" + }, + "oauth-sign": { + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", + "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==" + }, + "object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" + }, + "once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "requires": { + "wrappy": "1" + } + }, + "os-homedir": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", + "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=" + }, + "os-tmpdir": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", + "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=" + }, + "osenv": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz", + "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==", + "requires": { + "os-homedir": "^1.0.0", + "os-tmpdir": "^1.0.0" + } + }, + "path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=" + }, + "performance-now": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", + "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=" + }, + "process-nextick-args": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", + "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==" + }, + "psl": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz", + "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==" + }, + "punycode": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", + "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==" + }, + "qs": { + "version": "6.5.2", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz", + "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==" + }, + "rc": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz", + "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==", + "requires": { + "deep-extend": "^0.6.0", + "ini": "~1.3.0", + "minimist": "^1.2.0", + "strip-json-comments": "~2.0.1" + } + }, + "readable-stream": { + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", + "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "realistic-structured-clone": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/realistic-structured-clone/-/realistic-structured-clone-2.0.2.tgz", + "integrity": "sha512-5IEvyfuMJ4tjQOuKKTFNvd+H9GSbE87IcendSBannE28PTrbolgaVg5DdEApRKhtze794iXqVUFKV60GLCNKEg==", + "requires": { + "core-js": "^2.5.3", + "domexception": "^1.0.1", + "typeson": "^5.8.2", + "typeson-registry": "^1.0.0-alpha.20" + } + }, + "regenerator-runtime": { + "version": "0.13.5", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz", + "integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==" + }, + "request": { + "version": "2.88.2", + "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz", + "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==", + "requires": { + "aws-sign2": "~0.7.0", + "aws4": "^1.8.0", + "caseless": "~0.12.0", + "combined-stream": "~1.0.6", + "extend": "~3.0.2", + "forever-agent": "~0.6.1", + "form-data": "~2.3.2", + "har-validator": "~5.1.3", + "http-signature": "~1.2.0", + "is-typedarray": "~1.0.0", + "isstream": "~0.1.2", + "json-stringify-safe": "~5.0.1", + "mime-types": "~2.1.19", + "oauth-sign": "~0.9.0", + "performance-now": "^2.1.0", + "qs": "~6.5.2", + "safe-buffer": "^5.1.2", + "tough-cookie": "~2.5.0", + "tunnel-agent": "^0.6.0", + "uuid": "^3.3.2" + } + }, + "rimraf": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", + "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", + "requires": { + "glob": "^7.1.3" + } + }, + "safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" + }, + "safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" + }, + "sax": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", + "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==" + }, + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" + }, + "set-blocking": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", + "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=" + }, + "setimmediate": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", + "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=" + }, + "signal-exit": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz", + "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==" + }, + "sqlite3": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/sqlite3/-/sqlite3-4.1.1.tgz", + "integrity": "sha512-CvT5XY+MWnn0HkbwVKJAyWEMfzpAPwnTiB3TobA5Mri44SrTovmmh499NPQP+gatkeOipqPlBLel7rn4E/PCQg==", + "requires": { + "nan": "^2.12.1", + "node-pre-gyp": "^0.11.0", + "request": "^2.87.0" + } + }, + "sshpk": { + "version": "1.16.1", + "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz", + "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==", + "requires": { + "asn1": "~0.2.3", + "assert-plus": "^1.0.0", + "bcrypt-pbkdf": "^1.0.0", + "dashdash": "^1.12.0", + "ecc-jsbn": "~0.1.1", + "getpass": "^0.1.1", + "jsbn": "~0.1.0", + "safer-buffer": "^2.0.2", + "tweetnacl": "~0.14.0" + } + }, + "string-width": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", + "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", + "requires": { + "code-point-at": "^1.0.0", + "is-fullwidth-code-point": "^1.0.0", + "strip-ansi": "^3.0.0" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "requires": { + "safe-buffer": "~5.1.0" + } + }, + "strip-ansi": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "requires": { + "ansi-regex": "^2.0.0" + } + }, + "strip-json-comments": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", + "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=" + }, + "sync-promise": { + "version": "git+https://github.com/brettz9/sync-promise.git#25845a49a00aa2d2c985a5149b97c86a1fcdc75a", + "from": "git+https://github.com/brettz9/sync-promise.git#full-sync-missing-promise-features" + }, + "tar": { + "version": "4.4.13", + "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.13.tgz", + "integrity": "sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==", + "requires": { + "chownr": "^1.1.1", + "fs-minipass": "^1.2.5", + "minipass": "^2.8.6", + "minizlib": "^1.2.1", + "mkdirp": "^0.5.0", + "safe-buffer": "^5.1.2", + "yallist": "^3.0.3" + } + }, + "tiny-queue": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/tiny-queue/-/tiny-queue-0.2.1.tgz", + "integrity": "sha1-JaZ/LG4lOyypQZd7XvdELvl6YEY=" + }, + "tough-cookie": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", + "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", + "requires": { + "psl": "^1.1.28", + "punycode": "^2.1.1" + } + }, + "tr46": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz", + "integrity": "sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk=", + "requires": { + "punycode": "^2.1.0" + } + }, + "tslib": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.11.1.tgz", + "integrity": "sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA==" + }, + "tunnel-agent": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", + "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", + "requires": { + "safe-buffer": "^5.0.1" + } + }, + "tweetnacl": { + "version": "0.14.5", + "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", + "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=" + }, + "typeson": { + "version": "5.18.2", + "resolved": "https://registry.npmjs.org/typeson/-/typeson-5.18.2.tgz", + "integrity": "sha512-Vetd+OGX05P4qHyHiSLdHZ5Z5GuQDrHHwSdjkqho9NSCYVSLSfRMjklD/unpHH8tXBR9Z/R05rwJSuMpMFrdsw==" + }, + "typeson-registry": { + "version": "1.0.0-alpha.35", + "resolved": "https://registry.npmjs.org/typeson-registry/-/typeson-registry-1.0.0-alpha.35.tgz", + "integrity": "sha512-a/NffrpFswBTyU6w2d6vjk62K1TZ45H64af9AfRbn7LXqNEfL+h+gw3OV2IaG+enfwqgLB5WmbkrNBaQuc/97A==", + "requires": { + "base64-arraybuffer-es6": "0.5.0", + "typeson": "5.18.2", + "whatwg-url": "7.1.0" + } + }, + "uri-js": { + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz", + "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==", + "requires": { + "punycode": "^2.1.0" + } + }, + "util-deprecate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" + }, + "uuid": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz", + "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==" + }, + "verror": { + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", + "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", + "requires": { + "assert-plus": "^1.0.0", + "core-util-is": "1.0.2", + "extsprintf": "^1.2.0" + } + }, + "webcrypto-core": { + "version": "0.1.27", + "resolved": "https://registry.npmjs.org/webcrypto-core/-/webcrypto-core-0.1.27.tgz", + "integrity": "sha512-r0MSFxvqaIjoqIKerm80P9+7n1dWBG88PYnshJk57J4uZuXlqNX8yQixrEIe3CGqrJ7xwfGM2SQGR4AlJYr02g==", + "requires": { + "tslib": "^1.7.1" + } + }, + "webextension-polyfill": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/webextension-polyfill/-/webextension-polyfill-0.3.1.tgz", + "integrity": "sha512-ISB42vlgMyM7xE1u6pREeCqmmXjLsYu/nqAR8Dl/gIAnylb+KpRpvKbVkUYNFePhhXn0Obkkc3jasOII9ztUtg==" + }, + "webidl-conversions": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz", + "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==" + }, + "websql": { + "version": "git+https://github.com/brettz9/node-websql.git#5149bc0763376ca757fc32dc74345ada0467bfbb", + "from": "git+https://github.com/brettz9/node-websql.git#configurable-secure2", + "requires": { + "argsarray": "^0.0.1", + "immediate": "^3.2.2", + "noop-fn": "^1.0.0", + "sqlite3": "^4.0.0", + "tiny-queue": "^0.2.1" + } + }, + "whatwg-url": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.1.0.tgz", + "integrity": "sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==", + "requires": { + "lodash.sortby": "^4.7.0", + "tr46": "^1.0.1", + "webidl-conversions": "^4.0.2" + } + }, + "wide-align": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz", + "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==", + "requires": { + "string-width": "^1.0.2 || 2" + } + }, + "wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" + }, + "yallist": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", + "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==" + } + } +} diff --git a/benchmarks/package.json b/benchmarks/package.json new file mode 100644 index 000000000..a9f695ca6 --- /dev/null +++ b/benchmarks/package.json @@ -0,0 +1,14 @@ +{ + "name": "browser-core-benchmarks", + "version": "0.0.1", + "description": "Benchmarks for browser-core", + "main": "run_benchmarks.js", + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1" + }, + "author": "", + "license": "MPL-2.0", + "dependencies": { + "@cliqz/webextension-emulator": "^0.2.1" + } +} diff --git a/broccoli/resources.js b/broccoli/resources.js index b04adfd07..0fdcafe33 100644 --- a/broccoli/resources.js +++ b/broccoli/resources.js @@ -16,7 +16,7 @@ let fileContents = ''; if (config.resources && config.resources.bundling === 'require') { const pathVariable = path => path.replace('/', '_').replace('.', '_').replace('-', '_'); - const assets = config.resources.include.map(path => [pathVariable(path), path]); + const assets = config.resources.include.map(path => ({ varName: pathVariable(path), resourcePath: path })); const importStatements = assets.map((args) => { const varName = args.varName; const resourceName = args.resourcePath; diff --git a/configs/browser.js b/configs/browser.js index d0a06e1f8..0435c495a 100644 --- a/configs/browser.js +++ b/configs/browser.js @@ -70,8 +70,8 @@ module.exports = { 'modules.offers-templates.enabled': false, 'modules.cookie-monster.enabled': true, 'friends.enable.level': 'development', - 'modules.search.operators.addCompletion.useTitle': false, - 'modules.freshtab.customBackground': false, + 'modules.search.operators.addCompletion.useTitle': true, + 'modules.freshtab.customBackground': true, }, modules: [ 'core', @@ -98,6 +98,7 @@ module.exports = { 'adblocker', 'https-everywhere', 'onboarding-v4', + 'offboarding', 'history', 'offers-templates', 'video-downloader', @@ -112,6 +113,7 @@ module.exports = { 'dat', 'youtube-fixer', 'my-name-is-cliqz', + 'whotracksme' ], bundles: [ 'anolysis-cc/dashboard/anolysis.bundle.js', @@ -124,9 +126,11 @@ module.exports = { 'offers-templates/offers-checkout.bundle.js', 'offers-templates/offers-control-center.bundle.js', 'offers-templates/offers-control-center-after.bundle.js', + 'offers-v2/environment.bundle.js', 'freshtab/home.bundle.js', 'history/home.bundle.js', 'onboarding-v4/app.bundle.js', + 'offboarding/app.bundle.js', 'dropdown/dropdown.bundle.js', 'dropdown/debug.bundle.js', 'control-center/control-center-react.bundle.js', diff --git a/configs/cliqz-android.js b/configs/cliqz-android.js index 5554a739b..5e7caad40 100644 --- a/configs/cliqz-android.js +++ b/configs/cliqz-android.js @@ -63,7 +63,7 @@ module.exports = { 'core/logo-database.json', 'antitracking/prob.json', 'antitracking/config.json', - 'antitracking/tracker_db_v2.json', + 'core/tracker_db_v2.json', ] } }; diff --git a/configs/cliqz-geckoview.js b/configs/cliqz-geckoview.js index 38fc6629b..f700b23e6 100644 --- a/configs/cliqz-geckoview.js +++ b/configs/cliqz-geckoview.js @@ -10,24 +10,15 @@ * Privacy config: * Privacy components (anti-tracking, adblocker etc) as a webextension for the Geckoview platform. */ - const urls = require('./common/urls-cliqz'); +const configBase = require('./geckoview'); const publish = require('./common/publish'); -module.exports = { - platform: 'webextension', - brocfile: 'Brocfile.webextension.js', - specific: 'geckoview', - baseURL: '/modules/', - pack: 'web-ext build -s build -a .', +module.exports = Object.assign({}, configBase, { publish: publish.toPrerelease('cliqz', 'cliqz-geckoview', 'zip'), - sourceMaps: false, - versionPrefix: '12', - settings: { + settings: Object.assign({}, configBase.settings, { ...urls, channel: 'MA60', - MSGCHANNEL: 'web-extension', - ATTRACK_TELEMETRY_PROVIDER: 'hpnv2', antitrackingPlaceholder: 'cliqz.com/tracking', antitrackingHeader: 'CLIQZ-AntiTracking', telemetry: { @@ -37,53 +28,11 @@ module.exports = { platform: 'android', }, }, - // Human Web Lite: // Available proxies are: https://proxy[1-100].(cliqz|humanweb).foxyproxy.com HUMAN_WEB_LITE_COLLECTOR_VIA_PROXY: 'https://proxy*.cliqz.foxyproxy.com', HUMAN_WEB_LITE_COLLECTOR_DIRECT: 'https://collector-hpn.cliqz.com', HW_CHANNEL: 'android', ALLOWED_COUNTRY_CODES: ['de', 'at', 'ch', 'es', 'us', 'fr', 'nl', 'gb', 'it', 'se'], - - // Enable "auto-trigger" mode, which means that the extension will use the - // network (e.g. doublefetch, sending messages) without guidance from the browser. - HUMAN_WEB_LITE_AUTO_TRIGGER: true, - - // Insights interval triggering - INSIGHTS_INTERNAL: true, - }, - default_prefs: { - 'modules.webextension-specific.enabled': true, - 'cliqz-adb': 1, - 'cliqz-adb-strict': true, - attrackBloomFilter: true, - attrackTelemetryMode: 0, - attrackDefaultAction: 'placeholder', - sendAntiTrackingHeader: false, - attrackCookieTrustReferers: true, - 'attrack.cookieMode': 'trackers', - attrackBlockCookieTracking: true, - 'modules.cookie-monster.enabled': true, - 'cookie-monster.expireSession': true, - 'cookie-monster.nonTracker': true, - showConsoleLogs: true, - }, - bundles: [ - 'core/cliqz.bundle.js', - 'core/content-script.bundle.js', - ], - modules: [ - 'core', - 'antitracking', - 'webrequest-pipeline', - 'adblocker', - 'anolysis', - 'abtests-legacy', - 'webextension-specific', - 'cookie-monster', - 'autoconsent', - 'dat', - 'human-web-lite', - 'insights', - ], -}; + }), +}); diff --git a/configs/common/amo-settings.js b/configs/common/amo-settings.js index 73da4be5c..54b50d99e 100644 --- a/configs/common/amo-settings.js +++ b/configs/common/amo-settings.js @@ -19,6 +19,7 @@ module.exports = { antitrackingHeader: 'CLIQZ-AntiTracking', FRESHTAB_TITLE: 'Cliqz Tab', OFFERS_BRAND: 'cliqz', + URL_CHANGED_EVENT_DEBOUNCE: 500, ENABLE_OFFER_COLLECTIONS: false, MAX_GROUPS_IN_OFFER_COLLECTIONS: 3, }; diff --git a/configs/common/urls.js b/configs/common/urls.js index c8da41655..58006e642 100644 --- a/configs/common/urls.js +++ b/configs/common/urls.js @@ -26,7 +26,10 @@ module.exports = (base, cdn = 'cdn') => ({ // not used as URL, but as key to signal to ambassor to fetch news HB_NEWS: `hb-news.${base}`, // freshtab/sources/news.es, history/sources/rich-header-proxy.es OFFERS_BE_BASE_URL: `https://offers-api.${base}`, + // expected to be unbranded as this is only use for testing purpouses + OFFERS_STAGING_BASE_URL: 'https://offers-api-staging-myo.myoffrz.ninja', PRIVACY_SCORE_URL: `https://anti-tracking.${base}/api/v1/score?`, // antitracking/sources/privacy-score.es + TRACKER_SCORE_URL: `https://${cdn}.${base}/privacy-score/privacy_score.json`, // whotracksme/source/background.es RESULTS_PROVIDER: `https://api.${base}/api/v2/results?nrh=1&q=`, // core/config.es RESULTS_PROVIDER_LOG: `https://api.${base}/api/v1/logging?q=`, // core/config.es RICH_HEADER: `https://api.${base}/api/v2/rich-header?path=/v2/map`, diff --git a/configs/geckoview.js b/configs/geckoview.js new file mode 100644 index 000000000..29c601282 --- /dev/null +++ b/configs/geckoview.js @@ -0,0 +1,71 @@ +/*! + * Copyright (c) 2014-present Cliqz GmbH. All rights reserved. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +/** + * Geckoview config: + * Privacy components (anti-tracking, adblocker etc) as a webextension for the Geckoview platform. + */ + +const publish = require('./common/publish'); + +module.exports = { + platform: 'webextension', + brocfile: 'Brocfile.webextension.js', + specific: 'geckoview', + baseURL: '/modules/', + pack: 'web-ext build -s build -a .', + publish: publish.toPrerelease('cliqz', 'cliqz-geckoview', 'zip'), + sourceMaps: false, + versionPrefix: '12', + settings: { + // ...urls, + MSGCHANNEL: 'web-extension', + ATTRACK_TELEMETRY_PROVIDER: 'hpnv2', + // Enable "auto-trigger" mode, which means that the extension will use the + // network (e.g. doublefetch, sending messages) without guidance from the browser. + HUMAN_WEB_LITE_AUTO_TRIGGER: true, + + // Insights internal triggering + INSIGHTS_INTERNAL: true, + }, + default_prefs: { + 'modules.webextension-specific.enabled': true, + 'cliqz-adb': 1, + 'cliqz-adb-strict': true, + attrackBloomFilter: true, + attrackTelemetryMode: 0, + attrackDefaultAction: 'placeholder', + sendAntiTrackingHeader: false, + attrackCookieTrustReferers: true, + 'attrack.cookieMode': 'trackers', + attrackBlockCookieTracking: true, + 'modules.cookie-monster.enabled': true, + 'cookie-monster.expireSession': true, + 'cookie-monster.nonTracker': true, + showConsoleLogs: true, + }, + bundles: [ + 'core/cliqz.bundle.js', + 'core/content-script.bundle.js', + ], + modules: [ + 'core', + 'antitracking', + 'webrequest-pipeline', + 'adblocker', + 'anolysis', + 'abtests-legacy', + 'webextension-specific', + 'cookie-monster', + 'autoconsent', + 'dat', + 'human-web-lite', + 'hpn-lite', + 'insights', + ], +}; diff --git a/configs/ghostery-geckoview.js b/configs/ghostery-geckoview.js new file mode 100644 index 000000000..6dc804bcb --- /dev/null +++ b/configs/ghostery-geckoview.js @@ -0,0 +1,37 @@ +/*! + * Copyright (c) 2014-present Cliqz GmbH. All rights reserved. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +/** + * Privacy config: + * Privacy components (anti-tracking, adblocker etc) as a webextension for the Geckoview platform. + */ +const urls = require('./common/urls-ghostery'); +const configBase = require('./geckoview'); +const publish = require('./common/publish'); + +module.exports = Object.assign({}, configBase, { + publish: publish.toPrerelease('cliqz', 'ghostery-geckoview', 'zip'), + settings: Object.assign({}, configBase.settings, { + ...urls, + channel: 'MA60', + antitrackingPlaceholder: 'ghostery', + antitrackingHeader: 'Ghostery-AntiTracking', + telemetry: { + demographics: { + brand: 'ghostery', + name: 'browser', + platform: 'android', + }, + }, + // Human Web Lite: + HUMAN_WEB_LITE_COLLECTOR_VIA_PROXY: 'https://collector-hpn.ghostery.net', + HUMAN_WEB_LITE_COLLECTOR_DIRECT: 'https://collector-hpn.ghostery.net', + HW_CHANNEL: 'android', + ALLOWED_COUNTRY_CODES: ['de', 'at', 'ch', 'es', 'us', 'fr', 'nl', 'gb', 'it', 'be', 'se', 'dk', 'fi', 'cz', 'gr', 'hu', 'ro', 'no', 'ca', 'au', 'ru', 'ua', 'in', 'pl', 'jp', 'br', 'mx', 'cn', 'ar'], + }), +}); diff --git a/configs/ghostery-tab-base.js b/configs/ghostery-tab-base.js index b7b53efb3..72f6bd76f 100644 --- a/configs/ghostery-tab-base.js +++ b/configs/ghostery-tab-base.js @@ -47,6 +47,7 @@ module.exports = { 'freshtab.search.mode': 'search', 'freshtab.search.autofocus': false, 'offers2UserEnabled': false, + 'modules.freshtab.customBackground': true, }, modules: [ 'core', @@ -65,7 +66,8 @@ module.exports = { 'anolysis-cc', 'overlay', 'control-center', - 'toolbox' + 'toolbox', + 'whotracksme', ], bundles: [ 'hpnv2/worker.wasm.bundle.js', diff --git a/configs/ghostery.js b/configs/ghostery.js index 9271039a0..f9f92b26b 100644 --- a/configs/ghostery.js +++ b/configs/ghostery.js @@ -21,6 +21,7 @@ module.exports = { channel: 'CH80', MSGCHANNEL: 'web-extension', OFFERS_CHANNEL: 'ghostery', + URL_CHANGED_EVENT_DEBOUNCE: 500, ENABLE_OFFER_COLLECTIONS: false, MAX_GROUPS_IN_OFFER_COLLECTIONS: 3, ATTRACK_TELEMETRY_PROVIDER: 'hpnv2', @@ -34,6 +35,8 @@ module.exports = { name: 'extension', }, }, + HUMAN_WEB_LITE_COLLECTOR_VIA_PROXY: 'https://collector-hpn.ghostery.net', + HUMAN_WEB_LITE_COLLECTOR_DIRECT: 'https://collector-hpn.ghostery.net', }), default_prefs: { 'modules.human-web.enabled': true, @@ -65,6 +68,7 @@ module.exports = { 'offers-templates/offers-checkout.bundle.js', 'offers-templates/offers-control-center.bundle.js', 'offers-templates/offers-control-center-after.bundle.js', + 'offers-v2/environment.bundle.js', ], modules: [ 'core', @@ -80,6 +84,8 @@ module.exports = { 'anti-phishing', 'myoffrz-helper', 'insights', + 'hpn-lite', + 'human-web-lite', ], buildTargets: { firefox: 52, diff --git a/configs/offers.js b/configs/offers.js index 3d77f1886..f5288642d 100644 --- a/configs/offers.js +++ b/configs/offers.js @@ -35,6 +35,7 @@ module.exports = { OFFBOARDING_URL: 'https://myoffrz.com/off-boarding/', SHOW_ONBOARDING_OVERLAY: true, THROTTLE_OFFER_APPEARANCE_MODE: 'PER_DOMAIN', + URL_CHANGED_EVENT_DEBOUNCE: 500, ENABLE_OFFER_COLLECTIONS: true, MAX_GROUPS_IN_OFFER_COLLECTIONS: 3, telemetry: { @@ -75,6 +76,7 @@ module.exports = { 'offers-templates/offers-checkout.bundle.js', 'offers-templates/offers-control-center.bundle.js', 'offers-templates/offers-control-center-after.bundle.js', + 'offers-v2/environment.bundle.js', 'onboarding-overlay/app.bundle.js', ], builderDefault: Object.assign({}, base.builderConfig, { diff --git a/configs/releases/amo-webextension.js b/configs/releases/amo-webextension.js index 50f10f27c..46c4faf43 100644 --- a/configs/releases/amo-webextension.js +++ b/configs/releases/amo-webextension.js @@ -74,6 +74,7 @@ module.exports = { 'offers-templates/offers-control-center.bundle.js', 'offers-templates/offers-control-center-after.bundle.js', 'offers-banner/app.bundle.js', + 'offers-v2/environment.bundle.js', 'human-web/page.bundle.js', 'human-web/rusha.bundle.js', 'onboarding-overlay/app.bundle.js', diff --git a/configs/releases/offers-chip-chrome.js b/configs/releases/offers-chip-chrome.js index 247501811..b0e50f610 100644 --- a/configs/releases/offers-chip-chrome.js +++ b/configs/releases/offers-chip-chrome.js @@ -21,7 +21,7 @@ module.exports = Object.assign({}, configBase, { channel: 'MC10', // CHIP Sparalarm Chrome Release OFFERS_CHANNEL: 'chip', OFFERS_BRAND: 'chip', - ONBOARDING_URL: 'https://sparalarm.chip.de/onboarding#step-0', + ONBOARDING_URL: 'https://sparalarm.chip.de/welcome/#step-0', OFFBOARDING_URL: 'https://sparalarm.chip.de/offboarding', SUPPORTED_LANGS: ['de'], 'dynamic-offers.enabled': false, diff --git a/configs/releases/offers-chip-edge.js b/configs/releases/offers-chip-edge.js new file mode 100644 index 000000000..2f7a73482 --- /dev/null +++ b/configs/releases/offers-chip-edge.js @@ -0,0 +1,33 @@ +/*! + * Copyright (c) 2014-present Cliqz GmbH. All rights reserved. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +const configBase = require('../offers'); +const publish = require('../common/publish'); + +const id = 'nhceipmndngbhhhadbohlngbaehbiogj'; + +module.exports = Object.assign({}, configBase, { + publish: publish.toPrereleaseFullName('chip_sparalarm', 'offers_pre', 'edge', 'zip'), + settings: Object.assign({}, configBase.settings, { + id, + name: 'chipAppName', + description: 'chipAppDesc', + storeName: id, + channel: 'MC20', // CHIP Sparalarm Edge Release + OFFERS_CHANNEL: 'chip', + OFFERS_BRAND: 'chip', + ONBOARDING_URL: 'https://sparalarm.chip.de/welcome/#step-0', + OFFBOARDING_URL: 'https://sparalarm.chip.de/offboarding', + SUPPORTED_LANGS: ['de'], + 'dynamic-offers.enabled': false, + }), + versionPrefix: '14', + specific: 'offers', + PRODUCT_PREFIX: 'chip', + PRODUCT_TITLE: 'CHIP Sparalarm', +}); diff --git a/configs/releases/offers-chip-firefox.js b/configs/releases/offers-chip-firefox.js index e1c88779b..37bd6f4f4 100644 --- a/configs/releases/offers-chip-firefox.js +++ b/configs/releases/offers-chip-firefox.js @@ -21,7 +21,7 @@ module.exports = Object.assign({}, configBase, { channel: 'MC00', // CHIP Sparalarm Firefox Release OFFERS_CHANNEL: 'chip', OFFERS_BRAND: 'chip', - ONBOARDING_URL: 'https://sparalarm.chip.de/onboarding#step-0', + ONBOARDING_URL: 'https://sparalarm.chip.de/welcome/#step-0', OFFBOARDING_URL: 'https://sparalarm.chip.de/offboarding', SUPPORTED_LANGS: ['de'], 'dynamic-offers.enabled': false, diff --git a/configs/user-agent-ios.js b/configs/user-agent-ios.js index fb28df59c..5da52fe33 100644 --- a/configs/user-agent-ios.js +++ b/configs/user-agent-ios.js @@ -49,12 +49,11 @@ module.exports = { modules: [ 'core', 'human-web-lite', + 'hpn-lite', 'search', 'anolysis', 'geolocation', - 'news', 'insights', - 'autoconsent', ], bundles: [ ], @@ -62,7 +61,7 @@ module.exports = { bundling: 'assets', include: [ 'core/logo-database.json', - 'autoconsent/cosmetics.json', + 'core/tracker_db_v2.json', ] } }; diff --git a/modules/anolysis-cc/sources/templates/about.hbs b/modules/anolysis-cc/sources/templates/about.hbs index f42c55a65..5228a4d01 100644 --- a/modules/anolysis-cc/sources/templates/about.hbs +++ b/modules/anolysis-cc/sources/templates/about.hbs @@ -8,40 +8,19 @@
Anolysis is a new approach for collecting usage data - without relying on user profiles. The approach is inspired - by the principle of group anonymity; making sure that K users - are indistinguishable from each other. Users send sanitized browser - attributes in the form of a group identity, and usage data through - multiple messages, in a way that this data cannot be pieced together and - used as an identifier. + without relying on user profiles. Users send a limited set of + sanitized browser attributes and usage data through multiple messages + to our backend. Note that many messages do not even send browser attributes + at all.

- We are able to achieve privacy by design, by representing browser - attributes hierarchically in a tree structure and algorithmically creating - anonymous groups, hence moving away from the concept of a user identity, - and embrace a group identity instead. - -

- - So here's what you can take away from this: - - + Some messages send an ephemerid, a + ephemeral, non-unique key that allows for determining rolling retention, + for example. Each message type has a different ephemerid so that different + messages types cannot be linked together. On top, each ephemerid changes + over time so that even messages of the same type cannot be linked together + infinitely.
Drop us a line if you have any questions: diff --git a/modules/anolysis-cc/sources/templates/analyses.hbs b/modules/anolysis-cc/sources/templates/analyses.hbs index 3bdfed800..14530386f 100644 --- a/modules/anolysis-cc/sources/templates/analyses.hbs +++ b/modules/anolysis-cc/sources/templates/analyses.hbs @@ -1,18 +1,25 @@
-
Available Analyses
+
Messages Sent to Backend
An analysis is the way we define client side aggregation "tasks" or functions. Each analysis exists to learn something or verify a hypothesis. Concretely, an analysis is a function that accesses - metrics collected in the browser during a specified period of time, + internal metrics collected in the browser during a specified period of time, and creates an aggregation or summary which will be sent to the backend. Each analysis will be triggered automatically by Anolysis - once a day, using the metrics collected from the previous day. + once a day, using the internal metrics collected from the previous day. + +

+ + In addition, some metrics will be sent to the backend + in case aggregating does not add value. For example, metrics reporting the + on-off state of a feature are triggered once a day, therefore aggregating + into a daily analysis would be superfluous.
- Here's a list of all current analyses: + Here's a list of all current messages sent to the backend:
    @@ -31,7 +38,7 @@ {{this.name}} - ⏺ + ●
    @@ -48,7 +55,7 @@ {{/each}}
    - Note: Each analysis is sent separately, and they cannot be linked + Note: Each message is sent separately, and they cannot be linked on the backend.
    -
\ No newline at end of file +
diff --git a/modules/anolysis-cc/sources/templates/browser_attributes.hbs b/modules/anolysis-cc/sources/templates/browser_attributes.hbs index 630e9bda7..e38a541a9 100644 --- a/modules/anolysis-cc/sources/templates/browser_attributes.hbs +++ b/modules/anolysis-cc/sources/templates/browser_attributes.hbs @@ -15,11 +15,4 @@ {{/each}}
-
- Sometimes it happens that the combination of the browser attributes, - is not shared by many users, which is why Anolysis - will safely generalize these attributes until they - are shared by a critical number of users. More on this in - Group Identity. -
diff --git a/modules/anolysis-cc/sources/templates/main.hbs b/modules/anolysis-cc/sources/templates/main.hbs index 9e5503327..4a2a540c9 100644 --- a/modules/anolysis-cc/sources/templates/main.hbs +++ b/modules/anolysis-cc/sources/templates/main.hbs @@ -8,10 +8,10 @@ Browser Attributes
  • - Analyses + Messages
  • - Metrics + Internal Metrics
  • What is Anolysis diff --git a/modules/anolysis-cc/sources/templates/metrics.hbs b/modules/anolysis-cc/sources/templates/metrics.hbs index 335276e8f..a2b4d27df 100644 --- a/modules/anolysis-cc/sources/templates/metrics.hbs +++ b/modules/anolysis-cc/sources/templates/metrics.hbs @@ -1,15 +1,15 @@
    -
    Available Metrics
    +
    Internal Metrics
    - A metric is a signal used to measure types of behavior inside - the browser (e.g.: when users interact with some components, click on + An internal metric is a signal used to measure types of behavior inside + the browser (e.g., when users interact with some components, click on buttons, change settings, select results in the dropdown, etc.). Metrics are generally not meant to be sent to the backend, but will instead be stored by Anolysis and made available for analyses to create aggregations.
    - Here's a list of all current metrics: + Here's a list of all current internal metrics:
    @@ -40,6 +40,7 @@ {{/each}}
    - Note: Metrics are stored inside the browser and are never sent to the backend. + Note: Internal metrics are stored inside the browser and are never sent to the backend.
    -
    \ No newline at end of file +
    • + diff --git a/modules/anolysis/sources/background.es b/modules/anolysis/sources/background.es index 5fd5e5611..82eb84a70 100644 --- a/modules/anolysis/sources/background.es +++ b/modules/anolysis/sources/background.es @@ -50,9 +50,9 @@ function storeNewVersionInPrefs() { * This function will instantiate an Anolysis class. It will also check if the * internal states need to be reset (on version bump). */ -async function instantiateAnolysis(configTs, browser, demographics) { +async function instantiateAnolysis(configTs, browser, demographics, settings) { const date = SafeDate.fromConfig(configTs); - const config = await createConfig(browser, demographics); + const config = await createConfig(browser, demographics, settings); let anolysis = new Anolysis(date, config); @@ -158,6 +158,7 @@ export default background({ getSynchronizedDateFormatted(), browser, this.demographics, + this.settings, ); // Because Anolysis module can be initialized/unloaded on pref change diff --git a/modules/anolysis/sources/cliqz-config.es b/modules/anolysis/sources/cliqz-config.es index fa4b72c93..171f633b0 100644 --- a/modules/anolysis/sources/cliqz-config.es +++ b/modules/anolysis/sources/cliqz-config.es @@ -12,7 +12,6 @@ import { getChannel } from '../platform/demographics'; import { isBetaVersion } from '../platform/platform'; import { platformName } from '../core/platform'; -import config from '../core/config'; import { httpPost } from '../core/http'; import prefs from '../core/prefs'; import inject from '../core/kord/inject'; @@ -56,15 +55,15 @@ const isMobileConnection = async (browser) => { return ['wimax', '2g', '3g', '4g'].includes(connectionInfo.type); }; -export default async function (browser, demographics) { +export default async function (browser, demographics, settings) { return { // Session ID of the users to generate ephemerid. session: (inject.service('session', ['getSession'])).getSession(), backend: { url: ((await shouldUseStaging()) - ? config.settings.ANOLYSIS_STAGING_BACKEND_URL - : config.settings.ANOLYSIS_BACKEND_URL + ? settings.ANOLYSIS_STAGING_BACKEND_URL + : settings.ANOLYSIS_BACKEND_URL ), // Helper function used to send a json `payload` to `url` using a POST // request. This returns a promise resolving to the answer if any, or diff --git a/modules/anolysis/sources/internals/demographics.ts b/modules/anolysis/sources/internals/demographics.ts index 0f758e31d..336374989 100644 --- a/modules/anolysis/sources/internals/demographics.ts +++ b/modules/anolysis/sources/internals/demographics.ts @@ -14,11 +14,6 @@ export type DemographicTrait = // - cliqz/mobile/cliqz-for-ios // - cliqz/add-on/cliqz-for-firefox | 'product' - // Contains information about the platform used. Examples: - // - mobile/ios/13/1 - // - desktop/windows/10 - // - desktop/linux/ubuntu/18/04 - | 'platform' // Information about country of user (alpha2 code). Examples: // - de // - fr @@ -26,7 +21,10 @@ export type DemographicTrait = // Information about distribution which led to this installation. | 'campaign' // Install date: YYYY/MM/DD - | 'install_date'; + | 'install_date' + | 'extension' + | 'browser' + | 'os'; export type Demographics = { [demographic in DemographicTrait]: string; diff --git a/modules/anolysis/sources/internals/internal-schemas.ts b/modules/anolysis/sources/internals/internal-schemas.ts index 6620e348e..d481208ed 100644 --- a/modules/anolysis/sources/internals/internal-schemas.ts +++ b/modules/anolysis/sources/internals/internal-schemas.ts @@ -6,6 +6,21 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ +import { Records } from './records'; +import { Schema } from './schema'; + +const ACTIONS = ['click', 'show', 'hover', 'scroll', 'swipe'] as const; + +type Action = typeof ACTIONS; + +interface Interaction { + component: string; + action: Action; + view?: string; + target?: string; + count: number; +} + export default [ /** * This metric can be emitted when an internal exception is raised in @@ -22,13 +37,7 @@ export default [ unit: 'day', n: 1, }, - demographics: [ - 'install_date', - 'product', - 'extension', - 'browser', - 'os', - ], + demographics: ['install_date', 'product', 'extension', 'browser', 'os'], }, schema: { required: ['context', 'exception'], @@ -38,7 +47,7 @@ export default [ autoPrivateMode: { type: 'boolean' }, }, }, - }, + } as Schema, { name: 'metrics.anolysis.health.storage', description: 'emitted when internal storage cannot be initialized', @@ -49,13 +58,7 @@ export default [ unit: 'day', n: 1, }, - demographics: [ - 'install_date', - 'product', - 'extension', - 'browser', - 'os', - ], + demographics: ['install_date', 'product', 'extension', 'browser', 'os'], }, schema: { properties: { @@ -66,5 +69,94 @@ export default [ }, }, }, - }, + } as Schema, + /** + * Generic interactions + */ + { + name: 'ui.metric.interaction', + description: 'Generic interaction metrics', + schema: { + required: ['component', 'action'], + type: 'object', + properties: { + component: { type: 'string' }, + view: { type: 'string' }, + target: { type: 'string' }, + action: { type: 'string', enum: ACTIONS }, + }, + }, + } as Schema, + { + name: 'ui.analysis.interaction', + description: 'Generic interaction metrics', + sendToBackend: { + version: 1, + demographics: ['product', 'extension', 'browser'], + }, + metrics: ['ui.metric.interaction'], + generate: async ({ + records, + }: { + records: Records; + }): Promise => { + // Aggregate all freshtab signals per `type`, `action`, `view`, and `target`. + const counter: Map = new Map(); + const metrics: { + component: string; + view?: string; + target?: string; + action: Action; + }[] = records.get('ui.metric.interaction'); + + for (const { component, view, target, action } of metrics) { + const key = `${component}.${view}.${target}.${action}`; + counter.set(key, (counter.get(key) || 0) + 1); + } + + if (counter.size === 0) { + return []; + } + + // Create final summary with all counts + const aggregation: Interaction[] = []; + + for (const [key, count] of counter.entries()) { + const [component, view, target, action] = key.split('.'); + const signal: Interaction = { + count, + component, + action: (action as unknown) as Action, + }; + + if (view !== 'undefined') { + signal.view = view; + } + + if (target !== 'undefined') { + signal.target = target; + } + + aggregation.push(signal); + } + + return [aggregation]; + }, + + schema: { + type: 'array', + items: { + additionalProperties: false, + required: ['component', 'action', 'count'], + type: 'object', + properties: { + component: { type: 'string' }, + action: { type: 'string', enum: ACTIONS }, + view: { type: 'string' }, + target: { type: 'string' }, + count: { type: 'integer', minimum: 0 }, + }, + }, + }, + } as Schema, ]; diff --git a/modules/anolysis/sources/internals/signal.ts b/modules/anolysis/sources/internals/signal.ts index 793fb1e6f..b90b82cc4 100644 --- a/modules/anolysis/sources/internals/signal.ts +++ b/modules/anolysis/sources/internals/signal.ts @@ -8,7 +8,7 @@ import { Demographics } from './demographics'; -export type Behavior = object; +export type Behavior = any; export interface Meta { demographics: Partial; diff --git a/modules/anolysis/tests/unit/internals/internal-schemas-test.es b/modules/anolysis/tests/unit/internals/internal-schemas-test.es new file mode 100644 index 000000000..ae5986d4c --- /dev/null +++ b/modules/anolysis/tests/unit/internals/internal-schemas-test.es @@ -0,0 +1,70 @@ +/*! + * Copyright (c) 2014-present Cliqz GmbH. All rights reserved. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +/* global chai */ + +require('../telemetry-schemas-test-helpers')({ + name: 'ui.analysis.interaction', + schemas: [ + 'anolysis/internals/internal-schemas', + ], + tests: (generateAnalysisResults) => { + it('generates no signal when no metric', async () => { + chai.expect(await generateAnalysisResults({})).to.have.length(0); + }); + + it('aggregates all interaction metrics', async () => { + const signals = await generateAnalysisResults({ + 'ui.metric.interaction': [ + { + component: 'freshtab', + action: 'click', + target: 'edit_favorite', + }, + { + component: 'freshtab', + action: 'click', + target: 'edit_favorite', + }, + { + component: 'freshtab', + action: 'show', + }, + { + component: 'freshtab', + action: 'click', + target: 'close', + view: 'settings', + }, + ], + }); + + chai.expect(signals).to.have.length(1); + chai.expect(signals[0]).to.have.deep.members([ + { + component: 'freshtab', + action: 'show', + count: 1, + }, + { + component: 'freshtab', + action: 'click', + target: 'edit_favorite', + count: 2, + }, + { + component: 'freshtab', + action: 'click', + view: 'settings', + target: 'close', + count: 1, + }, + ]); + }); + }, +}); diff --git a/modules/autoconsent/sources/background.es b/modules/autoconsent/sources/background.es index dc42069dc..c9b256d18 100644 --- a/modules/autoconsent/sources/background.es +++ b/modules/autoconsent/sources/background.es @@ -9,19 +9,17 @@ import AutoConsent from '@cliqz/autoconsent'; import background from '../core/base/background'; import tabs from '../platform/tabs'; -import { browser } from '../platform/globals'; import Logger from '../core/logger'; import { parse } from '../core/url'; import prefs from '../core/prefs'; import inject from '../core/kord/inject'; -import config from '../core/config'; -import { fetch } from '../core/http'; import pacemaker from '../core/services/pacemaker'; import ConsentSettings from './settings'; import { setOnboardingWasCompleted, setOnboardingWasDeferred, shouldShowOnboardingPopup, onBoardingWasDismissed } from './onboarding'; import Cosmetics from './cosmetics'; import Telemetry from './telemetry'; +import Loader from './loader'; // Telemetry schemas import metrics from './telemetry/metrics'; @@ -29,8 +27,6 @@ import analyses from './telemetry/analyses'; const tabGuards = new Set(); -const DISABLED_CMPS_URL = `${config.settings.CDN_BASEURL}/autoconsent/disabled_cmps.json`; - export const POPUP_ACTIONS = { ASK: 'ask', ALLOW: 'allow', @@ -125,15 +121,16 @@ export default background({ @method init @param settings */ - init() { + init(settings, browser) { inject.service('telemetry', ['register']).register(this.telemetrySchemas); this.logger = Logger.get('autoconsent', { level: 'log' }); - this.autoconsent = new AutoConsent((tabId, msg, { frameId }) => + this.autoconsent = new AutoConsent(browser, (tabId, msg, { frameId }) => this.core.action('callContentAction', 'autoconsent', 'dispatchAutoconsentMessage', { windowId: tabId, frameId }, msg).catch(() => false)); + this.loader = new Loader(this.autoconsent, this.logger); this.settings = new ConsentSettings(); this.tabConsentManagers = new Map(); this.cosmetics = new Cosmetics(this.settings); @@ -141,8 +138,8 @@ export default background({ this.disabledCmps = []; this.lastAction = null; - this.fetchDisabledCmps(); - pacemaker.everyHour(this.fetchDisabledCmps.bind(this)); + this.loader.init(); + this.updater = pacemaker.everyHour(this.loader.checkUpdate.bind(this.loader)); this.onTabUpdated = async (tabId, changeInfo, tabInfo) => { if (changeInfo.status === 'complete' && !tabGuards.has(tabId)) { @@ -163,7 +160,7 @@ export default background({ await cmp.checked; this.logger.log(cmp); const hasCmp = cmp.getCMPName() !== null - && this.disabledCmps.indexOf(cmp.getCMPName()) === -1; + && this.loader.disabledCmps.indexOf(cmp.getCMPName()) === -1; if (hasCmp) { const tabStatus = new TabConsent(url, cmp, this.settings, this.telemetry); this.tabConsentManagers.set(tabId, tabStatus); @@ -237,7 +234,7 @@ export default background({ tabs.onUpdated.addListener(this.onTabUpdated); tabs.onRemoved.addListener(this.onTabRemoved); - chrome.webNavigation.onDOMContentLoaded.addListener(this.onFrameLoaded, { + chrome.webNavigation.onCompleted.addListener(this.onFrameLoaded, { url: [{ schemes: ['http', 'https'] }] }); @@ -245,7 +242,11 @@ export default background({ }, unload() { + // stop pacemaker + this.updater.stop(); + // unregister telemetry schemas inject.service('telemetry', ['unregister']).unregister(this.telemetrySchemas); + // clean up tab event listeners if (this.onTabRemoved || this.onTabUpdated) { tabs.onUpdated.removeListener(this.onTabUpdated); tabs.onRemoved.removeListener(this.onTabRemoved); @@ -297,14 +298,6 @@ export default background({ return this.core.action('callContentAction', 'autoconsent', 'showModal', { windowId: tabId }); }, - async fetchDisabledCmps() { - try { - this.disabledCmps = await (await fetch(DISABLED_CMPS_URL)).json(); - } catch (e) { - this.disabledCmps = []; - } - }, - events: {}, actions: { diff --git a/modules/autoconsent/sources/loader.es b/modules/autoconsent/sources/loader.es new file mode 100644 index 000000000..37564a479 --- /dev/null +++ b/modules/autoconsent/sources/loader.es @@ -0,0 +1,56 @@ +import config from '../core/config'; +import { fetch } from '../core/http'; +import { Resource } from '../core/resource-loader'; +import { isBetaVersion } from '../platform/platform'; + +const CONFIG_URL = `${config.settings.CDN_BASEURL}/autoconsent/${isBetaVersion() ? 'staging-' : ''}config.json`; + +export default class AutoconsentLoader { + constructor(autoconsent, logger) { + this.autoconsent = autoconsent; + this.logger = logger; + this.ruleResource = new Resource(['autoconsent', 'rules.json'], { + dataType: 'json', + }); + this.version = null; + this.disabledCmps = []; + this.initialRulesLength = this.autoconsent.rules.length; + } + + async init() { + // load from local if available + await this.ruleResource.load().then(rules => this.processUpdate(rules), () => null); + await this.checkUpdate(); + } + + async checkUpdate() { + try { + const autoconsentConfig = await (await fetch(CONFIG_URL)).json(); + this.disabledCmps = autoconsentConfig.disabled || []; + if (autoconsentConfig.ruleVersion !== this.version) { + const rules = await this.ruleResource.updateFromURL(`${config.settings.CDN_BASEURL}/autoconsent/rules/${autoconsentConfig.ruleVersion}.json.br`); + this.processUpdate(rules); + } + } catch (e) { + this.logger.warn('Error updating autoconsent config', e); + } + } + + processUpdate(rules) { + const { + version, + autoconsent, + consentomatic + } = rules; + // clear rules from previous version + this.autoconsent.rules = this.autoconsent.rules.slice(0, this.initialRulesLength); + autoconsent.forEach((rule) => { + this.autoconsent.addCMP(rule); + }); + Object.keys(consentomatic).forEach((name) => { + this.autoconsent.addConsentomaticCMP(name, consentomatic[name]); + }); + this.version = version; + this.logger.info(`Loaded autoconsent rules version ${version}`); + } +} diff --git a/modules/browser-panel/tests/integration/signals-test.es b/modules/browser-panel/tests/integration/signals-test.es index e0b44163f..e8ae8c34e 100644 --- a/modules/browser-panel/tests/integration/signals-test.es +++ b/modules/browser-panel/tests/integration/signals-test.es @@ -34,6 +34,7 @@ export default function () { let timeout = 7; beforeEach(async function () { + app.prefs.set('telemetry', true); // default await mockOffersBackend({ dest: 'browser-panel', timeout diff --git a/modules/antitracking/dist/tracker_db_v2.json b/modules/core/dist/tracker_db_v2.json similarity index 100% rename from modules/antitracking/dist/tracker_db_v2.json rename to modules/core/dist/tracker_db_v2.json diff --git a/modules/core/sources/background.es b/modules/core/sources/background.es index 58040d95e..eb0bccf36 100644 --- a/modules/core/sources/background.es +++ b/modules/core/sources/background.es @@ -24,7 +24,7 @@ import logger from './logger'; import { queryCliqz, openLink, openTab, getOpenTabs, getReminders } from '../platform/browser-actions'; import providesServices from './services'; import { httpHandler } from './http'; -import { updateTab, closeTab, query, getCurrentTab } from './tabs'; +import { updateTab, closeTab, query, getCurrentTab as getCurrentTabPlatform } from './tabs'; import { enableRequestSanitizer, disableRequestSanitizer } from './request-sanitizer'; import ResourceLoader from './resource-loader'; import { getResourceUrl } from './platform'; @@ -135,15 +135,25 @@ export default background({ getWindowStatusFromModules(win) { let currentTab; + const getCurrentTab = async () => { + if (!currentTab) { + currentTab = await getCurrentTabPlatform(win.id); + } + return currentTab; + }; + return Object.keys(this.app.modules).map(async (module) => { const backgroundModule = this.app.modules[module].background; let status = null; if (backgroundModule && backgroundModule.currentWindowStatus) { - if (!currentTab) { - currentTab = await getCurrentTab(win.id); + currentTab = await getCurrentTab(win.id); + if (currentTab) { + status = await backgroundModule.currentWindowStatus(currentTab); + return { module, status }; } - status = await backgroundModule.currentWindowStatus(currentTab); - } else if (backgroundModule && backgroundModule.status) { + } + + if (backgroundModule && backgroundModule.status) { status = await backgroundModule.status(); } return { module, status }; @@ -216,8 +226,8 @@ export default background({ return telemetry.push(signal, schema, instant); }, - queryCliqz(q) { - queryCliqz(q); + queryCliqz(q, options) { + queryCliqz(q, options); }, async openLink( @@ -244,7 +254,7 @@ export default background({ }); const tab = tabs.find(t => t.url === fixedURL); if (tab) { - const currentTab = await getCurrentTab(); + const currentTab = await getCurrentTabPlatform(); id = tab.id; updateTab(id, { active: true }); if (currentTab && currentTab.url === getResourceUrl(config.settings.NEW_TAB_URL)) { diff --git a/modules/core/sources/decorators.es b/modules/core/sources/decorators.es index f2b9d111a..e814d9faa 100644 --- a/modules/core/sources/decorators.es +++ b/modules/core/sources/decorators.es @@ -7,6 +7,7 @@ */ import sleep from './helpers/sleep'; +import { clearTimeout, setTimeout } from '../core/timers'; export function throttle(window, fn, threshhold) { let last; @@ -27,6 +28,30 @@ export function throttle(window, fn, threshhold) { }; } +/** + * simple version of https://davidwalsh.name/javascript-debounce-function, + * without options to cancel or execute immediately. + * + * @param {Function} fn + * @param {number} [delay] in ms + * @returns {Function} the debounced function, + * or the given function when delay is falsy. + */ +export function debounce(fn, delay) { + let timeout = null; + return !delay ? fn : function debounced(...args) { + // https://developer.mozilla.org/en-US/docs/Web/API/WindowOrWorkerGlobalScope/clearTimeout + // Passing an invalid ID to clearTimeout() silently does nothing; no exception is thrown. + clearTimeout(timeout); + + const delayed = () => { + timeout = null; + fn(...args); + }; + timeout = setTimeout(delayed, delay); + }; +} + export function deadline(promise, timeout) { return Promise.race([ sleep(timeout), diff --git a/modules/core/sources/fs.es b/modules/core/sources/fs.es deleted file mode 100644 index 45c0d5a94..000000000 --- a/modules/core/sources/fs.es +++ /dev/null @@ -1,133 +0,0 @@ -/*! - * Copyright (c) 2014-present Cliqz GmbH. All rights reserved. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at https://mozilla.org/MPL/2.0/. - */ - -import { notImplemented } from './platform'; -import * as fs from '../platform/fs'; - -const notImplementedPromise = () => new Promise(() => notImplemented()); - -/** - * Read file from default location. - * - * @param {string|Array} path - * @param {Object} options - {bool} isText: decodes data before returning - * @returns {Promise} - */ -export const readFile = fs.readFile || notImplementedPromise; - -/** - * Write to file from default location. - * - * @param {string|Array} path - * @param {data} data - in a format accepted by the platform - * @param {Object} options - {bool} isText: encodes data before writing - * @returns {Promise} - */ -export const writeFile = fs.writeFile || notImplementedPromise; - -/** - * Create directory in default location, does not fail if directory exists. - * - * @param {string|Array} path - * @returns {Promise} - */ -export const mkdir = fs.mkdir || notImplementedPromise; - -/** - * Similar to writeFile, but this one does not do atomic write. Always truncates file. - * - * @param {string|Array} path - * @param {data} data - in a format accepted by the platform - * @param {Object} options - {bool} isText: encodes data before writing - * @returns {Promise} - */ -export const write = fs.write || notImplementedPromise; - -/** - * Renames old path to new path. - * - * @param {string|Array} oldPath - * @param {string|Array} newPath - * @returns {Promise} - */ -export const renameFile = fs.renameFile || notImplementedPromise; - -/** - * Returns whether it exists a file with given path or not. - * - * @param {string|Array} path - * @returns {Promise} - */ -export const fileExists = fs.fileExists || notImplementedPromise; - -/** - * Truncates file with given path. - * - * @param {string|Array} path - * @returns {Promise} - */ -export const truncateFile = fs.truncateFile || notImplementedPromise; - -/** - * Opens file with given file (creating if does not exist) and return - * file object to be used in writeFD and closeFD functions. - * - * @param {string|Array} path - * @returns {Promise} - */ -export const openForAppend = fs.openForAppend || notImplementedPromise; - -/** - * Writes to given open file. - * - * @param {Object} openFile - * @param {data} data - in a format accepted by the platform - * @param {Object} options - {bool} isText: encodes data before writing - * @returns {Promise} - */ -export const writeFD = fs.writeFD || notImplementedPromise; - -/** - * Closes given open file. - * - * @param {Object} openFile - * @returns {Promise} - */ -export const closeFD = fs.closeFD || notImplementedPromise; - -/** - * Removes file with given path, does not fail if file does not exist. - * - * @param {string|Array} path - * @returns {Promise} - */ -export const removeFile = fs.removeFile || notImplementedPromise; - -/** - * Creates empty file with given path. - * - * @param {string|Array} path - * @returns {Promise} - */ -export const createFile = fs.createFile || notImplementedPromise; - -/** - * Returns file size. - * - * @param {string|Array} path - * @returns {Promise} - */ -export const getFileSize = fs.getFileSize || notImplementedPromise; - -/** - * Joins the given path components. - * - * @param {Array} paths - * @returns {Promise} - */ -export const pathJoin = fs.pathJoin || notImplementedPromise; diff --git a/modules/core/sources/helpers/deep-freeze.es b/modules/core/sources/helpers/deep-freeze.es deleted file mode 100644 index 68622c70e..000000000 --- a/modules/core/sources/helpers/deep-freeze.es +++ /dev/null @@ -1,31 +0,0 @@ -/*! - * Copyright (c) 2014-present Cliqz GmbH. All rights reserved. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at https://mozilla.org/MPL/2.0/. - */ - -// https://github.com/substack/deep-freeze -/* eslint-disable */ -export default function deepFreeze(o) { - Object.freeze(o); - - Object.getOwnPropertyNames(o).forEach(function (prop) { - try { - if (o.hasOwnProperty(prop) - && o[prop] !== null - && (typeof o[prop] === "object" || typeof o[prop] === "function") - && !Object.isFrozen(o[prop])) { - deepFreeze(o[prop]); - } - } catch (e) { - // due to react-native for android bug, function cannot be freezed - // `Object.freeze` and `Object.isFrozen` throw a Type error - // https://github.com/facebook/react-native/issues/2033 - } - }); - - return o; -} -/* eslint-enable */ diff --git a/modules/core/sources/helpers/string-cache.ts b/modules/core/sources/helpers/string-cache.ts index 05929c62e..1f746b0dd 100644 --- a/modules/core/sources/helpers/string-cache.ts +++ b/modules/core/sources/helpers/string-cache.ts @@ -9,9 +9,14 @@ export default class Cache { public readonly size: number; public readonly cache: Array<{ key: string | undefined; value: Value | undefined }> = []; + private bitMask: number; constructor(size: number) { + if (size <= 0 || size & (size - 1) !== 0) { + throw new Error('size must be a power of 2'); + } this.size = size; + this.bitMask = size - 1; this.clear(); } @@ -23,7 +28,7 @@ export default class Cache { } get(key: string): Value | undefined { - const val = this.cache[key.length % this.size]; + const val = this.cache[key.length & this.bitMask]; if (val.key !== key) { return undefined; @@ -33,7 +38,7 @@ export default class Cache { } set(key: string, value: Value): Value { - const current = this.cache[key.length % this.size]; + const current = this.cache[key.length & this.bitMask]; current.key = key; current.value = value; return value; diff --git a/modules/core/sources/incremental-storage.es b/modules/core/sources/incremental-storage.es deleted file mode 100644 index 2ae3cbb9a..000000000 --- a/modules/core/sources/incremental-storage.es +++ /dev/null @@ -1,326 +0,0 @@ -/*! - * Copyright (c) 2014-present Cliqz GmbH. All rights reserved. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at https://mozilla.org/MPL/2.0/. - */ - -import md5 from './helpers/md5'; -import console from './console'; -import { renameFile, fileExists, readFile, write, removeFile, createFile, - openForAppend, closeFD, mkdir, writeFD } from './fs'; - -/* - * This class should be useful for modifying a JSON object persisted on disk - * without having to rewrite the JSON file on each change. Essentially, we keep - * two files: snapshot and journal. For each event that changes the data structure, we first - * append it to the journal (fast) and then apply it on the in-memory data. So on each moment, - * the state of the in-memory data can be recovered by reading the snapshot and applying on it - * all the changes of the journal. From time to time we will do some 'merge' operation on the - journal, which means rewriting the current snapshot so that the journal can be emptied. - */ - -// TODO: open lock? -export default class IncrementalStorage { - // processFunction is a function which will apply an event change on the current JSON object: - // function(event, json) - constructor() { - this.setInitialState(); - } - - open(dbName, processFunction, dirName, exactName = false, immediateSnap = false) { - if (this.isOpening) { - return new Error('already opening incremental-storage db'); - } - if (this.isOpen) { - return new Error('already open incremental-storage db'); - } - this.filePrefix = exactName ? dbName : md5(dbName); - this.processFunction = processFunction; - this.dir = Array.isArray(dirName) ? dirName : [dirName]; - this.immediateSnap = immediateSnap; - this.isOpening = true; - return this.recoverBadState() // Also does the init for an empty DB - .then(() => this.readFromDisk()) - .catch(() => this.handleCorrupt()) // TODO: maybe an error does not mean corrupt data... - .then(() => openForAppend(this.getJournalFile())) - .then((f) => { - this.journalFile = f; - this.isOpen = true; - this.isOpening = false; - this.onShutdown = () => this.close(); - }); - } - - close() { - if (this.isOpen) { - this.isOpen = false; - clearTimeout(this.flushTimer); - this.setInitialState(); - } - return Promise.resolve(); - } - - snapshot() { - this.scheduledSnapshot = true; - this.flush(); - } - - processEvent(event) { - if (!this.isOpen) { - throw new Error('IncrementalStorage instance is not open'); - } - const error = this.processAux(event); - if (!error) { - this.appendToJournal(event); - } else { - console.error('[incremental-storage]', this.dbName, 'Event:', event, 'Error:', error); - this.appendError(event, error); - } - } - - destroy() { - if (this.isOpen) { - const nsf = this.getNewSnapshotFile(); - const njf = this.getNewJournalFile(); - const jf = this.getJournalFile(); - const sf = this.getSnapshotFile(); - const ef = this.getErrorFile(); - - this.close(); - - return removeFile(nsf) - .then(() => removeFile(njf)) - .then(() => removeFile(jf)) - .then(() => removeFile(sf)) - .then(() => removeFile(ef)); - } - return Promise.resolve(); - } - - // Replaces internal object by new one - replace(obj) { - this.obj = obj; - this.toFlush = []; - this.snapshot(); - return this.flush(); - } - - // PRIVATE - setInitialState() { - this.obj = {}; - this.dir = null; - this.isOpen = false; - this.acumTime = 0; - this.journalFile = null; - this.dirty = false; - this.toFlush = []; - this.isOpening = false; - this.onShutdown = null; - this.flushResolver = null; - this.flushTimer = null; - this.processFunction = null; - this.filePrefix = null; - } - - handleCorrupt() { - return renameFile(this.getNewSnapshotFile(), this.getNewSnapshotFile(true)) - .catch(() => {}) - .then(() => renameFile(this.getNewJournalFile(), this.getNewJournalFile(true))) - .catch(() => {}) - .then(() => renameFile(this.getJournalFile(), this.getJournalFile(true))) - .catch(() => {}) - .then(() => renameFile(this.getSnapshotFile(), this.getSnapshotFile(true))) - .catch(() => {}) - .then(() => renameFile(this.getErrorFile(), this.getErrorFile(true))) - .catch(() => {}) - .then(() => this.recoverBadState()); - } - - processAux(event) { - const now = Date.now(); - try { - this.processFunction(event, this.obj); - } catch (e) { - let error; - if (!e) { - error = 'Error'; - } else if (e.stack || e.message) { - error = `Error: ${e.message} || ${e.stack}`; - } else { - error = `Error: ${e}`; - } - return error; - } - this.acumTime += Date.now() - now; - return null; - } - - doRealSnapshot() { - const s = this.getSnapshotFile(); - const j = this.getJournalFile(); - const sn = this.getNewSnapshotFile(); - const jn = this.getNewJournalFile(); - return openForAppend(jn) - .then((f) => { - closeFD(this.journalFile); - this.journalFile = f; - this.toFlush = []; - this.dirty = false; - return write(sn, JSON.stringify(this.obj), { isText: true }); - }) - .then(() => removeFile(s)) - .then(() => renameFile(jn, j)) - .then(() => renameFile(sn, s)) - .catch((e) => { - if (this.isOpen) { - console.log(e, 'FATAL: Snapshot error'); - return this.recoverBadState(); - } - return null; - }) - .then(() => { - this.scheduledSnapshot = false; - this.acumTime = 0; - }); - } - - _flush() { - const data = this.toFlush.splice(0, this.toFlush.length).join(''); - return writeFD(this.journalFile, data, { isText: true }); - } - - flush() { - if (!this.isOpen) { - return Promise.reject(new Error('incremental-storage not open')); - } - if (!this.flushPromise) { - const flusher = () => { - this._flush() - .catch(e => this.error('Error in flush', e)) - .then(() => { - if ( - this.isOpen - && (this.scheduledSnapshot - || (this.dirty && (this.immediateSnap || this.acumTime >= 1000)))) { - return this.doRealSnapshot(); - } - return null; - }) - .then(() => { - const resolve = this.flushResolver; - this.flushTimer = null; - this.flushPromise = null; - this.flushResolver = null; - resolve(); - if (this.isOpen && this.toFlush.length > 0) { - this.flush(); - } - }); - }; - this.flushTimer = setTimeout(flusher, 0); - this.flushPromise = new Promise((resolve) => { - this.flushResolver = resolve; - }); - } - return this.flushPromise; - } - - recoverBadState() { - this.acumTime = 0; - const s = this.getSnapshotFile(); - const j = this.getJournalFile(); - const sn = this.getNewSnapshotFile(); - const jn = this.getNewJournalFile(); - const files = [s, j, sn, jn]; - return mkdir(this.dir) - .then(() => Promise.all(files.map(fileExists))) - .then((present) => { - if (!present[2] && !present[3]) { // Initialize (or do nothing) - if (!present[1]) { - return write(s, JSON.stringify(this.obj), { isText: true }) - .then(() => createFile(j)); - } - if (present[0]) { - return null; - } - throw new Error('unknown file state(1)'); - } else if (present[0] && present[1]) { // Rollback - return Promise.all([removeFile(sn), removeFile(jn)]); - } else if (!present[0]) { // Commit - // TODO: This stage is already in snapshot, refactor - if (present[3]) { - return renameFile(jn, j).then(() => renameFile(sn, s)); - } - return renameFile(sn, s); - } - throw new Error('unknown file state(2)'); - }) - .then(() => readFile(j, { isText: true })) - .then((data) => { - // If journal does not end in endline, truncate to last endline found - const lastEndline = data.lastIndexOf('\n') + 1; - if (lastEndline !== data.length) { - return write(jn, data.slice(0, lastEndline), { isText: true }) - .then(() => renameFile(jn, j)); - } - return null; - }); - } - - // Pre: !this.isOpen - readFromDisk() { - const snapshotFile = this.getSnapshotFile(); - const journalFile = this.getJournalFile(); - return Promise.all([ - readFile(snapshotFile, { isText: true }), - readFile(journalFile, { isText: true }), - ]).then((results) => { - this.obj = JSON.parse(results[0]); - const lines = results[1].split('\n').filter(x => x !== ''); - this.dirty = lines.length > 0; - lines.forEach(e => this.processAux(JSON.parse(e))); - }); - } - - getJournalFile(corrupt = false) { - return this.getFile(`${this.filePrefix}.journal${corrupt ? '.corrupt' : ''}`); - } - - getNewJournalFile(corrupt = false) { - return this.getFile(`${this.filePrefix}.journal_new${corrupt ? '.corrupt' : ''}`); - } - - getSnapshotFile(corrupt = false) { - return this.getFile(`${this.filePrefix}${corrupt ? '.corrupt' : ''}`); - } - - getNewSnapshotFile(corrupt = false) { - return this.getFile(`${this.filePrefix}.new${corrupt ? '.corrupt' : ''}`); - } - - getErrorFile(corrupt = false) { - return this.getFile(`${this.filePrefix}.error${corrupt ? '.corrupt' : ''}`); - } - - getFile(filename) { - return this.dir.concat(filename); - } - - appendToJournal(e) { - this.dirty = true; - this.toFlush.push(`${JSON.stringify(e)}\n`); - this.flush(); - } - - appendError(event, error) { - openForAppend(this.getErrorFile()) - .then((f) => { - const data = { ts: (new Date()).toISOString(), event, error }; - return writeFD(f, `${JSON.stringify(data)}\n`, { isText: true }) - .catch(() => {}) - .then(() => closeFD(f)); - }); - } -} diff --git a/modules/core/sources/kord.es b/modules/core/sources/kord.es index f3d0a75df..4bf8a4671 100644 --- a/modules/core/sources/kord.es +++ b/modules/core/sources/kord.es @@ -6,10 +6,13 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -import inject, { setGlobal as injectSetGlobal } from './kord/inject'; +import inject, { getModuleList, setGlobal as injectSetGlobal } from './kord/inject'; export default { inject, + get modules() { + return getModuleList(); + }, }; export function setApp(app) { diff --git a/modules/core/sources/kord/inject.es b/modules/core/sources/kord/inject.es index 93b3d305d..1fa4a8fdf 100644 --- a/modules/core/sources/kord/inject.es +++ b/modules/core/sources/kord/inject.es @@ -123,3 +123,10 @@ export const actionFallback = fallbackValue => (error) => { } throw error; }; + +export const getModuleList = () => { + if (!app) { + return []; + } + return app.moduleList; +}; diff --git a/modules/core/sources/resource-loader.es b/modules/core/sources/resource-loader.es index 01c6e5e03..6924e3c1a 100644 --- a/modules/core/sources/resource-loader.es +++ b/modules/core/sources/resource-loader.es @@ -65,6 +65,7 @@ export class Resource { this.chromeURL = options.chromeURL || `${config.baseURL}${this.name.join('/')}`; this.storage = new Storage(this.filePath); this.remoteOnly = options.remoteOnly || platformName === 'mobile'; + this.localOnly = options.localOnly || false; this.compress = options.compress || (isMobile ? false : isWebExtension); this.size = 0; } @@ -95,10 +96,14 @@ export class Resource { } }) .then(data => this.parseData(data)) - .catch(() => { + .catch(async () => { if (this.remoteOnly) { return Promise.reject(new Error('Should update only from remote')); } + if (this.localOnly) { + const data = await get(this.chromeURL); + return this.parseData(data); + } return this.updateFromURL(this.chromeURL); }) .catch(() => this.updateFromRemote()); @@ -284,28 +289,20 @@ export default class ResourceLoader extends UpdateCallbackHandler { * A Resource that is bundled with the extension and never remotely updated. */ export class BundledResource { - constructor(name, options = {}) { - this.name = (typeof name === 'string') ? [name] : name; - this.dataType = options.dataType || 'json'; - this.filePath = ['cliqz', ...this.name]; - this.chromeURL = options.chromeURL || `${config.baseURL}${this.name.join('/')}`; - - // delete any storage associated with this resource (this is to clean out storage - // for older clients who previously had this resource persisted) - new Storage(this.filePath).delete(); + constructor(name) { + this.resource = new Resource(name, { + localOnly: true, + }); } async load() { - const res = await fetch(this.chromeURL); - if (!res.ok) { - throw new Error(res.statusText); - } - if (this.dataType === 'json') { - return res.json(); - } - if (this.dataType === 'binary') { - return res.arrayBuffer(); + // delete any storage associated with this resource (this is to clean out storage + // for older clients who previously had this resource persisted) + try { + await this.resource.storage.delete(); + } catch (e) { + // may be deleted already } - return res.text(); + return this.resource.load(); } } diff --git a/modules/core/sources/services/cliqz-config.es b/modules/core/sources/services/cliqz-config.es index 3a6f84fc1..babfdab26 100644 --- a/modules/core/sources/services/cliqz-config.es +++ b/modules/core/sources/services/cliqz-config.es @@ -7,7 +7,6 @@ */ import { fetch } from '../http'; -import CONFIG from '../config'; import events from '../events'; import i18n from '../i18n'; import prefs from '../prefs'; @@ -51,8 +50,8 @@ const EXPECTED_CONFIGS = new Set([ 'ts', ]); -async function updateCliqzConfig() { - return fetch(CONFIG.settings.CONFIG_PROVIDER) +async function updateCliqzConfig(CONFIG_PROVIDER_URL) { + return fetch(CONFIG_PROVIDER_URL) .then(r => r.json()) .then((config) => { Object.keys(config).forEach((k) => { @@ -82,7 +81,7 @@ async function updateCliqzConfig() { }).catch(e => console.log('cliqz-config update failed', e)); } -export function service() { +export function service(app) { let interval = null; nextTick(() => { interval = pacemaker.everyHour(updateCliqzConfig); @@ -95,7 +94,7 @@ export function service() { } }; - return updateCliqzConfig(); + return updateCliqzConfig(app.settings.CONFIG_PROVIDER); } export default inject.service('cliqz-config', []); diff --git a/modules/core/sources/services/domain-info.es b/modules/core/sources/services/domain-info.es index 3b827ede8..19cb33fa8 100644 --- a/modules/core/sources/services/domain-info.es +++ b/modules/core/sources/services/domain-info.es @@ -73,7 +73,7 @@ export const service = async function service() { domainInfo.domainOwners = revList; } - const loader = new BundledResource(['antitracking', 'tracker_db_v2.json']); + const loader = new BundledResource(['core', 'tracker_db_v2.json']); parseDomainOwners(await loader.load()); service.unload = () => { diff --git a/modules/core/sources/simple-storage.es b/modules/core/sources/simple-storage.es deleted file mode 100644 index 030ebc9cf..000000000 --- a/modules/core/sources/simple-storage.es +++ /dev/null @@ -1,128 +0,0 @@ -/*! - * Copyright (c) 2014-present Cliqz GmbH. All rights reserved. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at https://mozilla.org/MPL/2.0/. - */ - -import IncrementalStorage from './incremental-storage'; - -// This used to be an automatically persisting JSON object implemented using a Proxy object, but -// Proxy implementation was removed for compatibility reasons. Now it can be used in the -// following way: - - -// let ss = new SimpleStorage(); -// ss.open('databaseName', 'directoryName').then(() => { -// ss.set('whatever', 5); // Persisted! -// ss.get('whatever'); // -> 5 - -// // Modify subojects -// ss.set('myobject', {nestedobject:[]}); -// ss.set(['myobject', 'nestedobject'], [1, 2, 3]); -// ss.get('myobject'); // -> {nestedobject:[1, 2, 3]} - -// // Apply functions to objects -// ss.apply(['myobject', 'nestedobject'], 'push', 4, 5, 6); -// ss.get(['myobject', 'nestedobject']); // -> [1, 2, 3, 4, 5, 6] -// ss.storage.whatever = 5; // Persisted! -// ss.storage.foo = [1,2,3]; // Persisted! -// ss.storage.foo[0] = 4; // Persisted! -// }) - -// ss.close(); // When finished... -export default class SimpleStorage { - // inMemory = true for testing purposes, no need to call open in that case - constructor(inMemory = false) { - this.inMemory = inMemory; - if (!inMemory) { - this.istorage = new IncrementalStorage(); - } else { - this.istorage = { obj: {} }; - } - } - - open(dbName, dirName, exactName = false, immediateSnap = false) { - if (!this.inMemory) { - return this.istorage.open( - dbName, - e => this.processEvent(e), - dirName, - exactName, - immediateSnap, - ); - } - return Promise.resolve(); - } - - close() { - if (!this.inMemory) { - this.istorage.close(); - } - } - - flush() { - if (!this.inMemory) { - return this.istorage.flush(); - } - return Promise.resolve(); - } - - get isInit() { - if (!this.inMemory) { - return this.istorage.isOpen; - } - return true; - } - - destroy() { - if (!this.inMemory) { - return this.istorage.destroy(); - } - this.istorage.obj = {}; - return Promise.resolve(); - } - - get(path) { - const mutPath = Array.isArray(path) ? path : [path]; - return mutPath.reduce((a, b) => a[b], this.istorage.obj); - } - - set(path, value) { - const mutPath = Array.isArray(path) ? path : [path]; - this._processEvent(['set', mutPath, value]); - } - - delete(path) { - const mutPath = Array.isArray(path) ? path : [path]; - this._processEvent(['delete', mutPath]); - } - - apply(path, fun, ...args) { - const mutPath = Array.isArray(path) ? path : [path]; - this._processEvent(['apply', mutPath, fun, ...args]); - } - - _processEvent(...args) { - if (!this.inMemory) { - this.istorage.processEvent(...args); - } else { - this.processEvent(...args); - } - } - - // Private - processEvent([type, path, ...args]) { - const obj = path.slice(0, -1).reduce((a, b) => a[b], this.istorage.obj); - const last = path[path.length - 1]; - if (type === 'set') { - obj[last] = args[0]; - } else if (type === 'delete') { - delete obj[last]; - } else if (type === 'apply') { - const [fun, ...rest] = args; - obj[last][fun](...rest); - } - } -} diff --git a/modules/core/sources/url.ts b/modules/core/sources/url.ts index 26fceb0d2..dacc8a056 100644 --- a/modules/core/sources/url.ts +++ b/modules/core/sources/url.ts @@ -321,12 +321,21 @@ const KNOWN_PROTOCOLS = new Set([ 'chrome-extension', 'view-source', 'data', - 'dat', 'resource', ]); function isKnownProtocol(protocol: string): boolean { - return KNOWN_PROTOCOLS.has(protocol); + const known = KNOWN_PROTOCOLS.has(protocol); + if ( + !known && + typeof browser !== 'undefined' && + browser.cliqz && + browser.cliqz.externalProtocolHandlerExists(protocol) + ) { + KNOWN_PROTOCOLS.add(protocol); + return true; + } + return known; } const LD = 'a-z0-9'; @@ -393,7 +402,7 @@ export function isIpAddress(host: string): boolean { return isIpv4Address(host) || isIpv6Address(host); } -const urlCache: Cache = new Cache(100); +const urlCache: Cache = new Cache(128); /** * This is an abstraction over URL with caching and basic error handling built in. The main @@ -424,13 +433,13 @@ export function parse(url: string): URL | null { } export function fixURL(url: string): string | null { - let fixed = url; + let fixed = strip(url, { spaces: true }); let uri = parse(fixed); if (uri === null || !uri.scheme || !isKnownProtocol(uri.scheme)) { // The following regex will strip any prefix which looks like a protocol to // clean-up `url`. This allows to then prepend a generic http:// protocol // and try parsing the input again. - fixed = `http://${url.replace(/^:?\/*/, '')}`; + fixed = `http://${fixed.replace(/^:?\/*/, '')}`; uri = parse(fixed); } @@ -561,7 +570,7 @@ function* toggleWWW(urlObj: URL, enabled: boolean): IterableIterator { yield urlObj; } -export function getUrlVariations(url: string, { protocol = true, www = true } = {}): string[] { +export function getUrlVariations(url: string, { protocol = true, www = true, trailingSlash = true } = {}): string[] { let protocols = protocol ? ['http:', 'https:'] : []; // NOTE: here we should not use URLInfo (cached) because the resulting `u` @@ -593,17 +602,19 @@ export function getUrlVariations(url: string, { protocol = true, www = true } = // Two more variants: with and without trailing slash let href = u.href; urlSet.add(href); - if (u.pathname !== '/' && !u.pathname.endsWith('/')) { - u.pathname = `${u.pathname}/`; - href = u.href; - } else if (u.search.startsWith('?')) { - href = href.replace('/?', '?'); - } else if (u.hash.startsWith('#')) { - href = href.replace('/#', '#'); - } else if (href.endsWith('/')) { - href = href.slice(0, -1); + if (trailingSlash) { + if (u.pathname !== '/' && !u.pathname.endsWith('/')) { + u.pathname = `${u.pathname}/`; + href = u.href; + } else if (u.search.startsWith('?')) { + href = href.replace('/?', '?'); + } else if (u.hash.startsWith('#')) { + href = href.replace('/#', '#'); + } else if (href.endsWith('/')) { + href = href.slice(0, -1); + } + urlSet.add(href); } - urlSet.add(href); } /* eslint-enable no-unused-vars, no-shadow */ } diff --git a/modules/core/tests/integration/config-test.es b/modules/core/tests/integration/config-test.es index 1b4117cfc..ebf4a61e6 100644 --- a/modules/core/tests/integration/config-test.es +++ b/modules/core/tests/integration/config-test.es @@ -30,6 +30,7 @@ function mockConfigReponse(response) { result: JSON.stringify(response), }).then(function () { app.config.settings.CONFIG_PROVIDER = testServer.getBaseUrl('/api/v1/config'); + app.settings.CONFIG_PROVIDER = app.config.settings.CONFIG_PROVIDER; }); } @@ -64,7 +65,7 @@ export default function () { const p = waitForPrefChange('config_backends'); await mockConfigReponse(response); - await app.services['cliqz-config']._initializer(); + await app.services['cliqz-config']._initializer(app); await p; }); @@ -89,7 +90,7 @@ export default function () { context('unexpected configs', function () { beforeEach(async function () { await mockConfigReponse({ test_configs: 'test' }); - await app.services['cliqz-config']._initializer(); + await app.services['cliqz-config']._initializer(app); }); it('the prefs were not added', function () { diff --git a/modules/core/tests/test-helpers-freshtab.es b/modules/core/tests/test-helpers-freshtab.es index 2865e661a..37f7570ec 100644 --- a/modules/core/tests/test-helpers-freshtab.es +++ b/modules/core/tests/test-helpers-freshtab.es @@ -104,7 +104,7 @@ export const mockMessage = { type: 'notification', title: 'It’s not only the inner values that count!', description: 'Now you can change the style on Cliqz Tab.', - icon: 'settings-icon_blue.svg', + icon: 'customize-icon.svg', cta_text: 'TRY IT NOW', cta_url: 'home-action:settings', handler: 'MESSAGE_HANDLER_FRESHTAB_MIDDLE', @@ -920,12 +920,12 @@ export function checkTelemetry({ } export const allBackgrounds = [ - { name: 'dark', bgSelector: 'body.theme-bg-dark', iconSelector: 'img[data-bg="bg-dark"]', className: 'theme-bg-dark' }, - { name: 'light', bgSelector: 'body.theme-bg-light', iconSelector: 'img[data-bg="bg-light"]', className: 'theme-bg-light' }, - { name: 'matterhorn', bgSelector: 'body.theme-bg-matterhorn', iconSelector: 'img[data-bg="bg-matterhorn"]', className: 'theme-bg-matterhorn' }, - { name: 'winter', bgSelector: 'body.theme-bg-winter', iconSelector: 'img[data-bg="bg-winter"]', className: 'theme-bg-winter' }, - { name: 'spring', bgSelector: 'body.theme-bg-spring', iconSelector: 'img[data-bg="bg-spring"]', className: 'theme-bg-spring' }, - { name: 'summer', bgSelector: 'body.theme-bg-summer', iconSelector: 'img[data-bg="bg-summer"]', className: 'theme-bg-summer' }, - { name: 'worldcup', bgSelector: 'body.theme-bg-worldcup', iconSelector: 'img[data-bg="bg-worldcup"]', className: 'theme-bg-worldcup' }, - { name: 'autumn', bgSelector: 'body.theme-bg-autumn', iconSelector: 'img[data-bg="bg-autumn"]', className: 'theme-bg-autumn' }, + { name: 'dark', bgSelector: 'body.theme-bg-dark', iconSelector: 'div[data-bg="bg-dark"]', className: 'theme-bg-dark' }, + { name: 'light', bgSelector: 'body.theme-bg-light', iconSelector: 'div[data-bg="bg-light"]', className: 'theme-bg-light' }, + { name: 'matterhorn', bgSelector: 'body.theme-bg-matterhorn', iconSelector: 'div[data-bg="bg-matterhorn"]', className: 'theme-bg-matterhorn' }, + { name: 'winter', bgSelector: 'body.theme-bg-winter', iconSelector: 'div[data-bg="bg-winter"]', className: 'theme-bg-winter' }, + { name: 'spring', bgSelector: 'body.theme-bg-spring', iconSelector: 'div[data-bg="bg-spring"]', className: 'theme-bg-spring' }, + { name: 'summer', bgSelector: 'body.theme-bg-summer', iconSelector: 'div[data-bg="bg-summer"]', className: 'theme-bg-summer' }, + { name: 'worldcup', bgSelector: 'body.theme-bg-worldcup', iconSelector: 'div[data-bg="bg-worldcup"]', className: 'theme-bg-worldcup' }, + { name: 'autumn', bgSelector: 'body.theme-bg-autumn', iconSelector: 'div[data-bg="bg-autumn"]', className: 'theme-bg-autumn' }, ]; diff --git a/modules/core/tests/unit/decorators-test.es b/modules/core/tests/unit/decorators-test.es index 1063a1a25..4373ac6cc 100644 --- a/modules/core/tests/unit/decorators-test.es +++ b/modules/core/tests/unit/decorators-test.es @@ -66,4 +66,49 @@ export default describeModule('core/decorators', }); }); }); + + describe('#debounce', () => { + let target; + let debounce; + let debounced; + let clock; + + beforeEach(function () { + debounce = this.module().debounce; + target = sinon.spy(); + debounced = debounce(target, 500); + clock = sinon.useFakeTimers(); + }); + + afterEach(() => { + target.resetHistory(); + clock.restore(); + }); + + it('should be exported', async () => { + chai.expect(typeof debounce).to.equal('function'); + }); + + it('should delay a single call', () => { + debounced('a', 'b', 'c'); + clock.tick(499); + chai.expect(target.notCalled).to.be.true; + clock.tick(1); + chai.expect(target.calledWith('a', 'b', 'c')).to.be.true; + }); + + it('should debounce sequential calls', () => { + debounced('first'); + clock.tick(300); + debounced('second'); + clock.tick(300); + debounced('third'); + clock.tick(499); + chai.expect(target.notCalled).to.be.true; + clock.tick(1); + chai.expect(target.calledWith('third')).to.be.true; + clock.tick(2000); + chai.expect(target.calledOnce).to.be.true; + }); + }); }); diff --git a/modules/core/tests/unit/incremental-storage-test.es b/modules/core/tests/unit/incremental-storage-test.es deleted file mode 100644 index 0da726d33..000000000 --- a/modules/core/tests/unit/incremental-storage-test.es +++ /dev/null @@ -1,260 +0,0 @@ -/*! - * Copyright (c) 2014-present Cliqz GmbH. All rights reserved. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at https://mozilla.org/MPL/2.0/. - */ - -/* global chai */ -/* global describeModule */ - -/* eslint no-param-reassign: off */ - -const expect = chai.expect; -const crypto = require('crypto'); -const _path = require('path'); -const FSBuilder = require('./utils/fs'); - -const _fs = FSBuilder(_path); - -export default describeModule('core/incremental-storage', - () => ({ - 'core/helpers/md5': { - default: data => crypto.createHash('md5').update(data).digest('hex'), - }, - 'core/fs': _fs, - 'core/console': console, - }), - () => { - describe('IncrementalStorageTest', function () { - this.timeout(5000); - let IncrementalStorage; - beforeEach(function () { - IncrementalStorage = this.module().default; - }); - - function processFunction(event, obj) { - obj.value = obj.value || 0; - if (event.type === 'add') { - obj.value += event.value; - } else if (event.type === 'multiply') { - obj.value *= event.value; - } else if (event.type === 'divide') { - obj.value /= event.value; - } else if (event.type === 'subtract') { - obj.value -= event.value; - } - if (obj.value === -Infinity || obj.value === Infinity || isNaN(obj.value)) { - obj.value = 0; - } - } - - let seed = 7; - function random(max, min) { - max = max || 1; - min = min || 0; - seed = ((seed * 9301) + 49297) % 233280; - const rnd = seed / 233280; - return min + (rnd * (max - min)); - } - - it('IncrementalStorage - simple', function () { - const dbname = `test${Math.round(Math.random() * 1000000000)}`; - const dirName = 'StorageTests'; - const exactName = false; - const immediateSnap = false; - let storage = new IncrementalStorage(); - - return storage.open(dbname, processFunction, dirName, exactName, immediateSnap) - .then(() => { - storage.processEvent({ type: 'add', value: 5 }); - storage.processEvent({ type: 'add', value: 6 }); - storage.processEvent({ type: 'add', value: 7 }); - storage.processEvent({ type: 'add', value: 8 }); - storage.processEvent({ type: 'multiply', value: 3 }); - storage.processEvent({ type: 'divide', value: 2 }); - storage.processEvent({ type: 'subtract', value: 2 }); - expect(storage.obj.value).to.equal(37); - return storage.flush().then(() => storage.close()); - }) - .then(() => { - storage = new IncrementalStorage(); - return storage.open(dbname, processFunction, dirName, exactName, immediateSnap); - }) - .then(() => { - storage.processEvent({ type: 'add', value: 5 }); - storage.processEvent({ type: 'multiply', value: 3 }); - expect(storage.obj.value).to.equal(126); - return storage.flush().then(() => storage.close()); - }) - .then(() => { - storage = new IncrementalStorage(); - return storage.open(dbname, processFunction, dirName, exactName, immediateSnap); - }) - .then(() => { - expect(storage.obj.value).to.equal(126); - return storage.flush().then(() => storage.close()); - }); - }); - - it('IncrementalStorage - snapshot', function () { - const dbname = `test${Math.round(Math.random() * 1000000000)}`; - const dirName = 'StorageTests'; - const exactName = true; - const immediateSnap = false; - let storage = new IncrementalStorage(); - - return storage.open(dbname, processFunction, dirName, exactName, immediateSnap) - .then(() => { - storage.processEvent({ type: 'add', value: 5 }); - storage.processEvent({ type: 'add', value: 6 }); - storage.processEvent({ type: 'add', value: 7 }); - storage.processEvent({ type: 'add', value: 8 }); - storage.processEvent({ type: 'multiply', value: 3 }); - storage.processEvent({ type: 'divide', value: 2 }); - storage.processEvent({ type: 'subtract', value: 2 }); - expect(storage.obj.value).to.equal(37); - storage.snapshot(); - return new Promise((resolve, reject) => { - setTimeout(() => { - _fs.readFile(storage.getJournalFile(), { isText: true }) - .then((s) => { - if (s === '') { - resolve(); - } else { - reject(new Error('Snapshot not correct')); - } - }); - }, 2000); - }); - }) - .then(() => storage.flush()) - .then(() => storage.close()) - .then(() => { - storage = new IncrementalStorage(); - return storage.open(dbname, processFunction, dirName, exactName, immediateSnap); - }) - .then(() => { - expect(storage.obj.value).to.equal(37); - return storage.flush().then(() => storage.close()); - }); - }); - - it('IncrementalStorage - auto snapshot', function () { - const dbname = `test${Math.round(Math.random() * 1000000000)}`; - const dirName = 'StorageTests'; - const exactName = true; - const immediateSnap = true; - let storage = new IncrementalStorage(); - - return storage.open(dbname, processFunction, dirName, exactName, immediateSnap) - .then(() => { - storage.processEvent({ type: 'add', value: 5 }); - storage.processEvent({ type: 'add', value: 6 }); - storage.processEvent({ type: 'add', value: 7 }); - storage.processEvent({ type: 'add', value: 8 }); - storage.processEvent({ type: 'multiply', value: 3 }); - storage.processEvent({ type: 'divide', value: 2 }); - storage.processEvent({ type: 'subtract', value: 2 }); - expect(storage.obj.value).to.equal(37); - return new Promise((resolve, reject) => { - setTimeout(() => { - _fs.readFile(storage.getJournalFile(), { isText: true }) - .then((s) => { - if (s === '') { - resolve(); - } else { - reject(new Error('Snapshot not correct')); - } - }); - }, 2000); - }); - }) - .then(() => storage.flush()) - .then(() => storage.close()) - .then(() => { - storage = new IncrementalStorage(); - return storage.open(dbname, processFunction, dirName, exactName, immediateSnap); - }) - .then(() => { - expect(storage.obj.value).to.equal(37); - return storage.flush().then(() => storage.close()); - }); - }); - - it('IncrementalStorage - big test', function () { - const dbname = `test${Math.round(Math.random() * 1000000000)}`; - const dirName = 'StorageTests'; - const exactName = true; - const immediateSnap = false; - let storage = new IncrementalStorage(); - let N = 5000; - const operations = ['add', 'subtract', 'multiply', 'divide']; - const obj = {}; - - return storage.open(dbname, processFunction, dirName, exactName, immediateSnap) - .then(() => { - while (N !== 1) { - N -= 1; - const op = operations[Math.floor(random() * 4)]; - const event = { type: op, value: Math.floor(1 + (random() * 10)) }; - processFunction(event, obj); - storage.processEvent(event); - expect(storage.obj.value).to.equal(obj.value); - } - }) - .then(() => storage.flush()) - .then(() => storage.close()) - .then(() => { - storage = new IncrementalStorage(); - return storage.open(dbname, processFunction, dirName, exactName, immediateSnap); - }) - .then(() => { - expect(storage.obj.value).to.equal(obj.value); - return storage.flush().then(() => storage.close()); - }) - .then(() => { - storage = new IncrementalStorage(); - return storage.open(dbname, processFunction, dirName, exactName, true); - }) - .then(() => { - storage.snapshot(); - return new Promise((resolve) => { - setTimeout(() => { - resolve(); - }, 2000); - }); - }) - .then(() => - _fs.readFile(storage.getJournalFile(), { isText: true }) - .then((s) => { - if (s !== '') { - return Promise.reject(new Error('Snapshot not correct: journal not empty')); - } - return undefined; - })) - .then(() => { - N = 5000; - while (N !== 1) { - N -= 1; - const op = operations[Math.floor(random() * 4)]; - const event = { type: op, value: Math.floor(1 + (random() * 10)) }; - processFunction(event, obj); - storage.processEvent(event); - expect(storage.obj.value).to.equal(obj.value); - } - }) - .then(() => storage.flush()) - .then(() => storage.close()) - .then(() => { - storage = new IncrementalStorage(); - return storage.open(dbname, processFunction, dirName, exactName, true); - }) - .then(() => { - expect(storage.obj.value).to.equal(obj.value); - return storage.flush().then(() => storage.close()); - }); - }); - }); - }); diff --git a/modules/core/tests/unit/simple-storage-test.es b/modules/core/tests/unit/simple-storage-test.es deleted file mode 100644 index 94db78f32..000000000 --- a/modules/core/tests/unit/simple-storage-test.es +++ /dev/null @@ -1,81 +0,0 @@ -/*! - * Copyright (c) 2014-present Cliqz GmbH. All rights reserved. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at https://mozilla.org/MPL/2.0/. - */ - -/* global chai */ -/* global describeModule */ - -const expect = chai.expect; -const crypto = require('crypto'); -const _path = require('path'); -const FSBuilder = require('./utils/fs'); - -const _fs = FSBuilder(_path); - -export default describeModule('core/simple-storage', - () => ({ - 'core/helpers/md5': { - default: data => crypto.createHash('md5').update(data).digest('hex'), - }, - 'core/fs': _fs, - 'core/console': console, - }), - () => { - describe('SimpleStorageTest', function () { - this.timeout(5000); - let SimpleStorage; - beforeEach(function () { - SimpleStorage = this.module().default; - }); - - it('SimpleStorage - basic', function () { - const dbname = `test${Math.round(Math.random() * 1000000000)}`; - const dirName = 'StorageTests'; - const exactName = true; - const immediateSnap = false; - let ss = new SimpleStorage(); - - return ss.open(dbname, dirName, exactName, immediateSnap) - .then(() => { - ss.set('test', [1, 2, 3, 4, 5]); - ss.apply('test', 'push', 6, 7, 8, 9); - return ss.flush().then(() => ss.close()); - }) - .then(() => { - ss = new SimpleStorage(); - return ss.open(dbname, dirName, exactName, immediateSnap); - }) - .then(() => { - expect(JSON.stringify(ss.get('test'))).to.equal('[1,2,3,4,5,6,7,8,9]'); - ss.set('other', 5); - ss.delete('test'); - return ss.flush().then(() => ss.close()); - }) - .then(() => { - ss = new SimpleStorage(); - return ss.open(dbname, dirName, exactName, immediateSnap); - }) - .then(() => { - expect(ss.get('other')).to.equal(5); - expect(ss.get('test')).to.be.undefined; - ss.set('other', { nested: [] }); - ss.set(['other', 'nested'], { nested: [] }); - ss.apply(['other', 'nested', 'nested'], 'push', 1, 2, 3); - ss.apply(['other', 'nested', 'nested'], 'splice', 1, 1); - return ss.flush().then(() => ss.close()); - }) - .then(() => { - ss = new SimpleStorage(); - return ss.open(dbname, dirName, exactName, immediateSnap); - }) - .then(() => { - expect(JSON.stringify(ss.get(['other', 'nested', 'nested']))).to.equal('[1,3]'); - return ss.flush().then(() => ss.close()); - }); - }); - }); - }); diff --git a/modules/dropdown/sources/dropdown.bundle.es b/modules/dropdown/sources/dropdown.bundle.es index 4762c527e..398e10073 100644 --- a/modules/dropdown/sources/dropdown.bundle.es +++ b/modules/dropdown/sources/dropdown.bundle.es @@ -91,8 +91,8 @@ const exportedActions = { searchModule.startSearch(query, searchOptions); }, - stopSearch({ entryPoint }) { - searchModule.stopSearch({ entryPoint }); + stopSearch() { + searchModule.stopSearch(); }, reportSelection(selection) { diff --git a/modules/dropdown/sources/managers/base.es b/modules/dropdown/sources/managers/base.es index b2577e19f..b7908048b 100644 --- a/modules/dropdown/sources/managers/base.es +++ b/modules/dropdown/sources/managers/base.es @@ -138,7 +138,10 @@ export default class BaseDropdownManager { return this._queryId; } - async _queryCliqz(_query, { allowEmptyQuery = false } = {}) { + async _queryCliqz(_query, { + allowEmptyQuery = false, + entryPoint = this.entryPoint + } = {}) { // Don't create a tick if possible if (!this._iframeWrapperDefer.isSettled) { await this.iframeWrapperReady; @@ -161,6 +164,7 @@ export default class BaseDropdownManager { isPrivate: incognito, isTyped, keyCode, + entryPoint, targetModule: this.targetModule, }); } else { @@ -335,8 +339,8 @@ export default class BaseDropdownManager { this._iframeWrapperDefer.resolve(); } - close() { - this.dropdownAction.stopSearch({ entryPoint: this.entryPoint }); + close = () => { + this.dropdownAction.stopSearch(); this.collapse(); } @@ -354,7 +358,7 @@ export default class BaseDropdownManager { clearTimeout(this._delayedBlur); } - onInput() { + onInput(ev = null, mixerOptions = {}) { // eslint-disable-line no-unused-vars if (this._lastEvent && KEYS_TO_IGNORE.has(this._lastEvent.key)) { // No need to trigger search on "dead" and "unidentified" keystrokes return false; @@ -368,7 +372,7 @@ export default class BaseDropdownManager { current_length: this.query.length, }); } - this._queryCliqz(); + this._queryCliqz(null, mixerOptions); return true; } diff --git a/modules/dropdown/sources/managers/browser.es b/modules/dropdown/sources/managers/browser.es index 0fa976757..3f9b04456 100644 --- a/modules/dropdown/sources/managers/browser.es +++ b/modules/dropdown/sources/managers/browser.es @@ -168,6 +168,7 @@ export default class BrowserDropdownManager extends BaseDropdownManager { if (newTab || this._isPrivate() || !url + || !result.query.trim() || isFromFirstAutocompletedURL || isUrl(result.query) ) { @@ -214,6 +215,14 @@ export default class BrowserDropdownManager extends BaseDropdownManager { _setUrlbarValue(value) { this.urlbar.value = value; + // Update the user interface to indicate whether the new urlbar value + // is different than the loaded page. + if (this.urlbar.setPageProxyState + && value !== this.urlbar._lastValidURLStr + && this.urlbar.getAttribute('pageproxystate') === 'valid' + ) { + this.urlbar.setPageProxyState('invalid'); + } } _setUrlbarVisibleValue(value) { @@ -225,8 +234,7 @@ export default class BrowserDropdownManager extends BaseDropdownManager { } _setSelectionRange(selectionStart, selectionEnd) { - this.urlbar.selectionStart = selectionStart; - this.urlbar.selectionEnd = selectionEnd; + this.inputField.setSelectionRange(selectionStart, selectionEnd, 'backward'); } _getSelectionRange() { @@ -281,7 +289,7 @@ export default class BrowserDropdownManager extends BaseDropdownManager { this.onDrop(event); break; case 'input': - preventDefault = this.onInput(); + preventDefault = this.onInput(event); break; case 'keydown': if (event.key === 'Escape' && this.urlbar.controller.input) { @@ -329,7 +337,7 @@ export default class BrowserDropdownManager extends BaseDropdownManager { this.inputField.value = value; // Update completion - this.inputField.setSelectionRange(selectionStart + 1, value.length); + this._setSelectionRange(selectionStart + 1, value.length); } break; } diff --git a/modules/freshtab/dist/home.html b/modules/freshtab/dist/home.html index 2631acccc..b2c9dff91 100644 --- a/modules/freshtab/dist/home.html +++ b/modules/freshtab/dist/home.html @@ -4,12 +4,12 @@ + {{FRESHTAB_TITLE}} -
    diff --git a/modules/freshtab/dist/images/blue-cliqz-logo.svg b/modules/freshtab/dist/images/blue-cliqz-logo.svg new file mode 100644 index 000000000..69938b2e0 --- /dev/null +++ b/modules/freshtab/dist/images/blue-cliqz-logo.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/modules/freshtab/dist/images/blue-search-icon.svg b/modules/freshtab/dist/images/blue-search-icon.svg new file mode 100644 index 000000000..494736c68 --- /dev/null +++ b/modules/freshtab/dist/images/blue-search-icon.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/modules/freshtab/dist/images/cliqz_icon2_1024.svg b/modules/freshtab/dist/images/cliqz_icon2_1024.svg deleted file mode 100644 index 0d0b049d9..000000000 --- a/modules/freshtab/dist/images/cliqz_icon2_1024.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - Group 29 - Created with Sketch. - - - diff --git a/modules/freshtab/dist/images/customize-icon.svg b/modules/freshtab/dist/images/customize-icon.svg new file mode 100644 index 000000000..9ea576d66 --- /dev/null +++ b/modules/freshtab/dist/images/customize-icon.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/modules/freshtab/dist/images/dark-ghostery-tab-logo.svg b/modules/freshtab/dist/images/dark-ghostery-tab-logo.svg new file mode 100644 index 000000000..413a62f7b --- /dev/null +++ b/modules/freshtab/dist/images/dark-ghostery-tab-logo.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/modules/freshtab/dist/images/light-ghostery-tab-logo.svg b/modules/freshtab/dist/images/light-ghostery-tab-logo.svg new file mode 100644 index 000000000..76e04dbad --- /dev/null +++ b/modules/freshtab/dist/images/light-ghostery-tab-logo.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/modules/freshtab/dist/images/white-cliqz-logo.svg b/modules/freshtab/dist/images/white-cliqz-logo.svg new file mode 100644 index 000000000..b8e7fcd8e --- /dev/null +++ b/modules/freshtab/dist/images/white-cliqz-logo.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/modules/freshtab/dist/setup.js b/modules/freshtab/dist/setup.js index 4271c04ef..a596fec08 100644 --- a/modules/freshtab/dist/setup.js +++ b/modules/freshtab/dist/setup.js @@ -10,9 +10,14 @@ 'use strict'; (function setup() { - const theme = localStorage.theme; + const { theme, customBgSrc } = localStorage; if (theme) { document.body.classList.add(['theme-', theme].join('')); + if (customBgSrc) { + document.body.style.backgroundImage = `url(${customBgSrc})`; + } else { + document.body.style.backgroundImage = ''; + } } if (chrome.extension diff --git a/modules/freshtab/sources/background.es b/modules/freshtab/sources/background.es index d316c7638..056d19aa0 100644 --- a/modules/freshtab/sources/background.es +++ b/modules/freshtab/sources/background.es @@ -92,6 +92,14 @@ const createBlueThemeManager = (hostPrefs) => { }; }; +async function getBlobAsDataURL(blob) { + const reader = new FileReader(); + return new Promise((resolve) => { + reader.addEventListener('load', () => resolve(reader.result)); + reader.readAsDataURL(blob); + }); +} + /** * @module freshtab * @namespace freshtab @@ -169,6 +177,7 @@ export default background({ this.db.close(); this.db = null; } + URL.revokeObjectURL(this._customBackgroundURL); }, status() { @@ -273,11 +282,11 @@ export default background({ return activeTooltip; }, - async getComponentsState() { + async getComponentsState(sender) { const freshtabConfig = prefs.getObject(FRESHTAB_CONFIG_PREF); const backgroundName = (freshtabConfig.background && freshtabConfig.background.image) || getDefaultWallpaper(product); - const wallpapers = await getWallpapers(); + const wallpapers = await this.getWallpapers(sender.tab.incognito); return { historyDials: { ...COMPONENT_STATE_VISIBLE, ...freshtabConfig.historyDials }, customDials: { @@ -299,26 +308,47 @@ export default background({ image: backgroundName, index: wallpapers.findIndex(bg => bg.name === backgroundName), }, - stats: { ...COMPONENT_STATE_VISIBLE, ...freshtabConfig.stats }, + stats: { + ...(isAMO ? COMPONENT_STATE_INVISIBLE : COMPONENT_STATE_VISIBLE), + ...freshtabConfig.stats, + }, }; }, - async getWallpapers() { + async getWallpapers(isPrivate = false) { const wallpapers = getWallpapers(product); - if (this.isCustomBackgroundSupported) { - const customWp = await this.db.wallpapers.get('1'); - if (customWp) { - const src = URL.createObjectURL(customWp.blob); - const wp = { - alias: 'custom-background', - isDefault: false, - name: config.constants.CUSTOM_BG, - src, - thumbnailSrc: src, - }; - wallpapers.push(wp); + if (!this.isCustomBackgroundSupported) { + return wallpapers; + } + + let src = (isPrivate && this._customBackgroundDataURL) + || (!isPrivate && this._customBackgroundURL); + + if (!src) { + try { + const { blob } = await this.db.wallpapers.get('1'); + if (isPrivate) { + this._customBackgroundDataURL = await getBlobAsDataURL(blob); + src = this._customBackgroundDataURL; + } else { + URL.revokeObjectURL(this._customBackgroundURL); + this._customBackgroundURL = URL.createObjectURL(blob); + src = this._customBackgroundURL; + } + } catch (e) { + console.error('Could not get custom wallpaper', e); + return wallpapers; } } + + wallpapers.push({ + alias: 'custom-background', + isDefault: false, + name: config.constants.CUSTOM_BG, + src, + thumbnailSrc: src, + }); + return wallpapers; }, @@ -413,19 +443,21 @@ export default background({ }); }, - async saveCustomBackgroundImage(src) { - // TODO: we could skip fetching resource here if we stored - // the image directly on the freshtab page + async saveCustomBackgroundImage(src, sender) { const response = await fetch(src); if (!response.ok) { - console.error('Could not load custom background:', response.statusText); - return; + throw new Error(`Could not load custom background: ${response.statusText}`); } try { const blob = await response.blob(); await this.db.wallpapers.put({ id: '1', blob }); + URL.revokeObjectURL(this._customBackgroundURL); + this._customBackgroundURL = URL.createObjectURL(blob); + if (sender.tab?.incognito) { + this._customBackgroundDataURL = src; + } } catch (e) { - console.error('Could not save custom background:', e); + throw new Error(`Could not save custom background: ${e.message}`); } }, @@ -672,7 +704,7 @@ export default background({ * @method getConfig */ async getConfig(sender) { - const tabIndex = sender.tab.id; + const { id: tabIndex, incognito } = sender.tab; // delete import bookmarks top notification in case of onboarding v4 if (this.onboardingVersion() === 4) { @@ -687,7 +719,8 @@ export default background({ isBrowserThemeSupported: this.isBrowserThemeSupported, isAllPrefsLinkSupported: this.isAllPreferencesLinkSupported, isCustomBackgroundSupported: this.isCustomBackgroundSupported, - wallpapers: await this.getWallpapers(product), + isAutofocusEnabled: prefs.get(FRESHTAB_AUTOFOCUS_PREF, false), + wallpapers: await this.getWallpapers(incognito), product, tabIndex, messages: this.messages, @@ -695,7 +728,7 @@ export default background({ this.history.isEnabled() && config.settings.HISTORY_URL !== undefined ), - componentsState: await this.getComponentsState(), + componentsState: await this.getComponentsState(sender), developer: prefs.get('developer', false), cliqzPostPosition: 'bottom-left', // bottom-right, top-right isStatsSupported: this.settings.freshTabStats, @@ -761,8 +794,8 @@ export default background({ return this.browserTheme(); }, - getComponentsState() { - return this.getComponentsState(); + getComponentsState(sender) { + return this.getComponentsState(sender); }, isHumanWebEnabled() { diff --git a/modules/freshtab/sources/home/components/app.jsx b/modules/freshtab/sources/home/components/app.jsx index 089df99db..fc0a879e8 100644 --- a/modules/freshtab/sources/home/components/app.jsx +++ b/modules/freshtab/sources/home/components/app.jsx @@ -31,6 +31,22 @@ import Pagination from './pagination'; import AsideLeft from './aside-left'; import AsideRight from './aside-right'; +/** + * Hardcoded components' heights depending on the browser window's width. + * Copied from: modules/freshtab/sources/styles/_configs.scss + * + * Format: + * 'component name' : [[, ]...] + */ +const COMPONENT_SIZES = { + logo: [[0, 46], [920, 66], [1600, 86]], + search: [[0, 34 * 2], [920, 48 * 2], [1600, 63 * 2]], + historyDials: [[0, 110 + 12], [920, 125 + 12], [1600, 140 + 12]], + customDials: [[0, 110 + 20], [920, 125 + 20], [1600, 140 + 20]], + stats: [[0, 175 + 18], [650, 185 + 18], [920, 175 + 18], [1024, 195 + 18], [1600, 175 + 18]], + news: [[0, 175], [650, 185], [920, 175], [1024, 195], [1600, 175]], +}; + const getVisibleComponents = ({ componentsState }) => Object.keys(componentsState).filter(key => componentsState[key].visible); @@ -38,6 +54,7 @@ class App extends React.Component { constructor(props) { super(props); this.freshtab = cliqz.freshtab; + const visibleComponents = getVisibleComponents(props.config); this.state = { config: this.getConfigWithBGImage(props.config), dials: { @@ -50,6 +67,7 @@ class App extends React.Component { version: '', }, hasHistorySpeedDialsToRestore: false, + logoVisible: this.isLogoVisible(visibleComponents), isModalOpen: false, isOverlayOpen: false, isSettingsOpen: false, @@ -58,7 +76,7 @@ class App extends React.Component { results: [], stats: {}, tooltipShown: false, - visibleComponents: getVisibleComponents(props.config), + visibleComponents, }; const self = this; @@ -80,13 +98,11 @@ class App extends React.Component { window.addEventListener('beforeunload', () => sendHomeUnloadSignal({ tabIndex })); window.addEventListener('blur', () => sendHomeBlurSignal({ tabIndex })); window.addEventListener('focus', () => sendHomeFocusSignal({ tabIndex })); + window.addEventListener('resize', this.handleResize); document.body.addEventListener('dragover', event => event.preventDefault()); document.body.addEventListener('drop', (event) => { - const file = event.dataTransfer.files[0]; - if (file && file.type.split('/')[0] === 'image') { - this.onCustomBackgroundImageUploaded(URL.createObjectURL(file)); - } + this.onCustomBackgroundImageUploaded(event.dataTransfer.files[0]); event.preventDefault(); }); @@ -111,6 +127,7 @@ class App extends React.Component { window.removeEventListener('beforeunload', sendHomeUnloadSignal); window.removeEventListener('blur', sendHomeBlurSignal); window.removeEventListener('focus', sendHomeFocusSignal); + window.removeEventListener('resize', this.handleResize); } onDeveloperModulesOpen = async () => { @@ -140,6 +157,39 @@ class App extends React.Component { }); } + getActualSize(clientWidth, component) { + let searchHeight = 0; + COMPONENT_SIZES[component].some(([stopPoint, size]) => { + if (clientWidth < stopPoint) { + return true; + } + searchHeight = size; + return false; + }); + return searchHeight; + } + + isLogoVisible(components) { + const { clientHeight, clientWidth, scrollHeight } = window.document.documentElement; + if (scrollHeight > clientHeight) { + return false; + } + + const requiredHeight = components + .reduce( + (height, component) => height + this.getActualSize(clientWidth, component), + this.getActualSize(clientWidth, 'logo') + ); + + return clientHeight >= requiredHeight; + } + + handleResize = () => { + this.setState(({ visibleComponents }) => ({ + logoVisible: this.isLogoVisible(visibleComponents), + })); + } + onBackgroundImageChanged(bg, index) { cliqz.freshtab.saveBackgroundImage(bg, index); this.updateTheme(bg); @@ -159,21 +209,63 @@ class App extends React.Component { })); } - async onCustomBackgroundImageUploaded(src) { - // add new image to the list of wallpapers and select it - await cliqz.freshtab.saveCustomBackgroundImage(src); + resizeCustomBackground(src) { + const MAX_WIDTH = 2500; + const MAX_HEIGHT = 1600; + const image = new Image(); + const canvas = document.createElement('canvas'); + const ctx = canvas.getContext('2d'); + + return new Promise((resolve, reject) => { + image.onload = () => { + let { width, height } = image; + if (width > MAX_WIDTH) { + height = Math.floor((height * MAX_WIDTH) / width); + width = MAX_WIDTH; + } + if (height > MAX_HEIGHT) { + width = Math.floor((width * MAX_HEIGHT) / height); + height = MAX_HEIGHT; + } + canvas.width = width; + canvas.height = height; + ctx.drawImage(image, 0, 0, width, height); + resolve(canvas.toDataURL('image/jpeg', 0.85)); + }; + image.onerror = reject; + + image.src = src; + }); + } + + async onCustomBackgroundImageUploaded(file) { + let fileSrc; + const customWallpapers = []; + + if (!file || file.type.split('/')[0] !== 'image') { + return; + } + + try { + fileSrc = URL.createObjectURL(file); + const src = await this.resizeCustomBackground(fileSrc); + await cliqz.freshtab.saveCustomBackgroundImage(src); + customWallpapers.push({ + alias: 'custom-background', + isDefault: false, + name: config.constants.CUSTOM_BG, + src, + thumbnailSrc: src, + }); + } finally { + URL.revokeObjectURL(fileSrc); + } let index = 0; this.setState((prevState) => { const wallpapers = prevState.config.wallpapers .filter(w => w.name !== config.constants.CUSTOM_BG) - .concat([{ - alias: 'custom-background', - isDefault: false, - name: config.constants.CUSTOM_BG, - src, - thumbnailSrc: src, - }]); + .concat(customWallpapers); index = wallpapers.length - 1; const newState = { @@ -275,27 +367,36 @@ class App extends React.Component { .then(data => this.setState({ stats: data })); } - // TODO: come up with a better name setCustomBackground = (bg, freshtabConfig) => { const wallpapers = (freshtabConfig || this.state.config).wallpapers; if (bg === config.constants.CUSTOM_BG) { const customWallpaper = wallpapers .find(w => w.name === config.constants.CUSTOM_BG); + if (!customWallpaper) { + return false; + } document.body.style.backgroundImage = `url(${customWallpaper.src})`; + localStorage.setItem('customBgSrc', customWallpaper.src); } else { document.body.style.backgroundImage = ''; + localStorage.removeItem('customBgSrc'); } + return true; } /* * theme is also set inside of home.html */ updateTheme(bg) { - localStorage.setItem('theme', bg); + const { CUSTOM_BG } = config.constants; const classList = document.body.classList; - if (classList.contains(`theme-${bg}`) - && bg !== config.constants.CUSTOM_BG) { + localStorage.setItem('theme', bg); + if (bg !== CUSTOM_BG) { + localStorage.removeItem('customBgSrc'); + } + + if (classList.contains(`theme-${bg}`) && bg !== CUSTOM_BG) { return; } this.setCustomBackground(bg); @@ -430,6 +531,8 @@ class App extends React.Component { visibleComponents: getVisibleComponents(newConfigState), }; }); + + this.handleResize(); } toggleBlueTheme = () => { @@ -533,6 +636,13 @@ class App extends React.Component { return cliqz.freshtab.isHumanWebEnabled(); } + get classes() { + return ` + product-${this.state.config.product.toLowerCase()} + ${this.state.logoVisible ? '' : 'no-logo'} + `; + } + render() { const { config: freshtabConfig, @@ -546,9 +656,10 @@ class App extends React.Component { const { data: newsData } = news; return ( -
    + <>
    { this.urlbarElem = c; }} results={this.state.results} isHumanWebActive={this.isHumanWebActive} + isAutofocusEnabled={freshtabConfig.isAutofocusEnabled} isAMO={freshtabConfig.isAMO} showOverlay={this.showOverlay} toggleComponent={this.toggleComponent} @@ -654,8 +766,6 @@ class App extends React.Component { )} -
    -
    {this.shouldShowStats && (
    @@ -693,7 +803,7 @@ class App extends React.Component { this.onBackgroundImageChanged(bg, index)} - onCustomBackgroundImageUploaded={src => this.onCustomBackgroundImageUploaded(src)} + onCustomBackgroundImageUploaded={file => this.onCustomBackgroundImageUploaded(file)} onDeveloperModulesOpen={this.onDeveloperModulesOpen} onNewsSelectionChanged={country => this.onNewsSelectionChanged(country)} resetStatistics={() => this.resetStatistics()} @@ -709,7 +819,7 @@ class App extends React.Component { />
    -
    + ); } } diff --git a/modules/freshtab/sources/home/components/aside-left.jsx b/modules/freshtab/sources/home/components/aside-left.jsx index b5500ca46..58ef04c0a 100644 --- a/modules/freshtab/sources/home/components/aside-left.jsx +++ b/modules/freshtab/sources/home/components/aside-left.jsx @@ -18,7 +18,7 @@ function AsideLeft({ onHistoryClick, }) { return ( -