A fully open source & end-to-end encrypted note taking alternative to Evernote.
TypeScript asp-net-coredotnet-coreelectronfosshacktoberfestnote-managmentnote-takingnote-taking-appnotebooknotesnotes-appopen-sourceopensourceprivacyproductivityreactreact-nativereactjsself-hosted
server(theme): add support for cloudflare kv for counter persistance
Abdullah Atta70fdcf2b441a
diff --git a/servers/themes/package-lock.json b/servers/themes/package-lock.jsonindex 9dbce6b8c..d5d3b1abc 100644--- a/servers/themes/package-lock.json+++ b/servers/themes/package-lock.json@@ -11,6 +11,7 @@"dependencies": {"@notesnook/theme": "file:../../packages/theme","@orama/orama": "^1.0.8",+ "@sagi.io/workers-kv": "^0.0.15","@trpc/server": "10.45.2","async-mutex": "0.5.0","cors": "^2.8.5",@@ -699,6 +700,12 @@"win32"]},+ "node_modules/@sagi.io/workers-kv": {+ "version": "0.0.15",+ "resolved": "https://registry.npmjs.org/@sagi.io/workers-kv/-/workers-kv-0.0.15.tgz",+ "integrity": "sha512-a7TyxTGCkrFmGVn39kdtMqYQFXSvqme50Dffm6nPpNHh3PL+xSd3pRArKn9kRb6qTkUg/xxwaPiE2dmiEtdJEQ==",+ "license": "MIT"+ },"node_modules/@trpc/server": {"version": "10.45.2","resolved": "https://registry.npmjs.org/@trpc/server/-/server-10.45.2.tgz",@@ -737,9 +744,13 @@}},"node_modules/available-typed-arrays": {- "version": "1.0.5",- "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz",- "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==",+ "version": "1.0.7",+ "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz",+ "integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==",+ "license": "MIT",+ "dependencies": {+ "possible-typed-array-names": "^1.0.0"+ },"engines": {"node": ">= 0.4"},@@ -757,12 +768,47 @@}},"node_modules/call-bind": {+ "version": "1.0.8",+ "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.8.tgz",+ "integrity": "sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==",+ "license": "MIT",+ "dependencies": {+ "call-bind-apply-helpers": "^1.0.0",+ "es-define-property": "^1.0.0",+ "get-intrinsic": "^1.2.4",+ "set-function-length": "^1.2.2"+ },+ "engines": {+ "node": ">= 0.4"+ },+ "funding": {+ "url": "https://github.com/sponsors/ljharb"+ }+ },+ "node_modules/call-bind-apply-helpers": {"version": "1.0.2",- "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",- "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",+ "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz",+ "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==",+ "license": "MIT",+ "dependencies": {+ "es-errors": "^1.3.0",+ "function-bind": "^1.1.2"+ },+ "engines": {+ "node": ">= 0.4"+ }+ },+ "node_modules/call-bound": {+ "version": "1.0.4",+ "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz",+ "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==",+ "license": "MIT","dependencies": {- "function-bind": "^1.1.1",- "get-intrinsic": "^1.0.2"+ "call-bind-apply-helpers": "^1.0.2",+ "get-intrinsic": "^1.3.0"+ },+ "engines": {+ "node": ">= 0.4"},"funding": {"url": "https://github.com/sponsors/ljharb"@@ -797,12 +843,73 @@}}},+ "node_modules/define-data-property": {+ "version": "1.1.4",+ "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",+ "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",+ "license": "MIT",+ "dependencies": {+ "es-define-property": "^1.0.0",+ "es-errors": "^1.3.0",+ "gopd": "^1.0.1"+ },+ "engines": {+ "node": ">= 0.4"+ },+ "funding": {+ "url": "https://github.com/sponsors/ljharb"+ }+ },+ "node_modules/dunder-proto": {+ "version": "1.0.1",+ "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",+ "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==",+ "license": "MIT",+ "dependencies": {+ "call-bind-apply-helpers": "^1.0.1",+ "es-errors": "^1.3.0",+ "gopd": "^1.2.0"+ },+ "engines": {+ "node": ">= 0.4"+ }+ },+ "node_modules/es-define-property": {+ "version": "1.0.1",+ "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",+ "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==",+ "license": "MIT",+ "engines": {+ "node": ">= 0.4"+ }+ },+ "node_modules/es-errors": {+ "version": "1.3.0",+ "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",+ "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",+ "license": "MIT",+ "engines": {+ "node": ">= 0.4"+ }+ },"node_modules/es-module-lexer": {"version": "1.6.0","resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.6.0.tgz","integrity": "sha512-qqnD1yMU6tk/jnaMosogGySTZP8YtUgAffA9nMN+E/rjxcfRQ6IEk7IiozUjgxKoFHBGjTLnrHB/YC45r/59EQ==","dev": true},+ "node_modules/es-object-atoms": {+ "version": "1.1.1",+ "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz",+ "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==",+ "license": "MIT",+ "dependencies": {+ "es-errors": "^1.3.0"+ },+ "engines": {+ "node": ">= 0.4"+ }+ },"node_modules/esbuild": {"version": "0.21.5","resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.21.5.tgz",@@ -843,11 +950,18 @@}},"node_modules/for-each": {- "version": "0.3.3",- "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",- "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",+ "version": "0.3.5",+ "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.5.tgz",+ "integrity": "sha512-dKx12eRCVIzqCxFGplyFKJMPvLEWgmNtUrpTiJIR5u97zEhRG8ySrtboPHZXx7daLxQVrl643cTzbab2tkQjxg==",+ "license": "MIT","dependencies": {- "is-callable": "^1.1.3"+ "is-callable": "^1.2.7"+ },+ "engines": {+ "node": ">= 0.4"+ },+ "funding": {+ "url": "https://github.com/sponsors/ljharb"}},"node_modules/fsevents": {@@ -865,50 +979,56 @@}},"node_modules/function-bind": {- "version": "1.1.1",- "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",- "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="- },- "node_modules/get-intrinsic": {- "version": "1.2.1",- "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz",- "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==",- "dependencies": {- "function-bind": "^1.1.1",- "has": "^1.0.3",- "has-proto": "^1.0.1",- "has-symbols": "^1.0.3"- },+ "version": "1.1.2",+ "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",+ "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",+ "license": "MIT","funding": {"url": "https://github.com/sponsors/ljharb"}},- "node_modules/gopd": {- "version": "1.0.1",- "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",- "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",+ "node_modules/get-intrinsic": {+ "version": "1.3.0",+ "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz",+ "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==",+ "license": "MIT","dependencies": {- "get-intrinsic": "^1.1.3"+ "call-bind-apply-helpers": "^1.0.2",+ "es-define-property": "^1.0.1",+ "es-errors": "^1.3.0",+ "es-object-atoms": "^1.1.1",+ "function-bind": "^1.1.2",+ "get-proto": "^1.0.1",+ "gopd": "^1.2.0",+ "has-symbols": "^1.1.0",+ "hasown": "^2.0.2",+ "math-intrinsics": "^1.1.0"+ },+ "engines": {+ "node": ">= 0.4"},"funding": {"url": "https://github.com/sponsors/ljharb"}},- "node_modules/has": {- "version": "1.0.3",- "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",- "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",+ "node_modules/get-proto": {+ "version": "1.0.1",+ "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz",+ "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==",+ "license": "MIT","dependencies": {- "function-bind": "^1.1.1"+ "dunder-proto": "^1.0.1",+ "es-object-atoms": "^1.0.0"},"engines": {- "node": ">= 0.4.0"+ "node": ">= 0.4"}},- "node_modules/has-proto": {- "version": "1.0.1",- "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",- "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==",+ "node_modules/gopd": {+ "version": "1.2.0",+ "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",+ "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",+ "license": "MIT","engines": {"node": ">= 0.4"},@@ -916,10 +1036,23 @@"url": "https://github.com/sponsors/ljharb"}},+ "node_modules/has-property-descriptors": {+ "version": "1.0.2",+ "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",+ "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",+ "license": "MIT",+ "dependencies": {+ "es-define-property": "^1.0.0"+ },+ "funding": {+ "url": "https://github.com/sponsors/ljharb"+ }+ },"node_modules/has-symbols": {- "version": "1.0.3",- "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",- "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",+ "version": "1.1.0",+ "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz",+ "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==",+ "license": "MIT","engines": {"node": ">= 0.4"},@@ -928,11 +1061,12 @@}},"node_modules/has-tostringtag": {- "version": "1.0.0",- "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",- "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",+ "version": "1.0.2",+ "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",+ "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",+ "license": "MIT","dependencies": {- "has-symbols": "^1.0.2"+ "has-symbols": "^1.0.3"},"engines": {"node": ">= 0.4"@@ -941,6 +1075,18 @@"url": "https://github.com/sponsors/ljharb"}},+ "node_modules/hasown": {+ "version": "2.0.2",+ "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",+ "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",+ "license": "MIT",+ "dependencies": {+ "function-bind": "^1.1.2"+ },+ "engines": {+ "node": ">= 0.4"+ }+ },"node_modules/inherits": {"version": "2.0.4","resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",@@ -965,6 +1111,7 @@"version": "1.2.7","resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz","integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",+ "license": "MIT","engines": {"node": ">= 0.4"},@@ -987,15 +1134,12 @@}},"node_modules/is-typed-array": {- "version": "1.1.10",- "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.10.tgz",- "integrity": "sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A==",+ "version": "1.1.15",+ "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.15.tgz",+ "integrity": "sha512-p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ==",+ "license": "MIT","dependencies": {- "available-typed-arrays": "^1.0.5",- "call-bind": "^1.0.2",- "for-each": "^0.3.3",- "gopd": "^1.0.1",- "has-tostringtag": "^1.0.0"+ "which-typed-array": "^1.1.16"},"engines": {"node": ">= 0.4"@@ -1020,6 +1164,15 @@"loose-envify": "cli.js"}},+ "node_modules/math-intrinsics": {+ "version": "1.1.0",+ "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",+ "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==",+ "license": "MIT",+ "engines": {+ "node": ">= 0.4"+ }+ },"node_modules/ms": {"version": "2.1.3","resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",@@ -1064,6 +1217,15 @@"integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==","dev": true},+ "node_modules/possible-typed-array-names": {+ "version": "1.1.0",+ "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.1.0.tgz",+ "integrity": "sha512-/+5VFTchJDoVj3bhoqi6UeymcD00DAwb1nJwamzPvHEszJ4FpF6SNNbUbOS8yI56qHzdV8eK0qEfOSiodkTdxg==",+ "license": "MIT",+ "engines": {+ "node": ">= 0.4"+ }+ },"node_modules/postcss": {"version": "8.5.1","resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.1.tgz",@@ -1141,6 +1303,23 @@"fsevents": "~2.3.2"}},+ "node_modules/set-function-length": {+ "version": "1.2.2",+ "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",+ "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",+ "license": "MIT",+ "dependencies": {+ "define-data-property": "^1.1.4",+ "es-errors": "^1.3.0",+ "function-bind": "^1.1.2",+ "get-intrinsic": "^1.2.4",+ "gopd": "^1.0.1",+ "has-property-descriptors": "^1.0.2"+ },+ "engines": {+ "node": ">= 0.4"+ }+ },"node_modules/source-map-js": {"version": "1.2.1","resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",@@ -1257,16 +1436,18 @@}},"node_modules/which-typed-array": {- "version": "1.1.9",- "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.9.tgz",- "integrity": "sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA==",+ "version": "1.1.19",+ "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.19.tgz",+ "integrity": "sha512-rEvr90Bck4WZt9HHFC4DJMsjvu7x+r6bImz0/BrbWb7A2djJ8hnZMrWnHo9F8ssv0OMErasDhftrfROTyqSDrw==",+ "license": "MIT","dependencies": {- "available-typed-arrays": "^1.0.5",- "call-bind": "^1.0.2",- "for-each": "^0.3.3",- "gopd": "^1.0.1",- "has-tostringtag": "^1.0.0",- "is-typed-array": "^1.1.10"+ "available-typed-arrays": "^1.0.7",+ "call-bind": "^1.0.8",+ "call-bound": "^1.0.4",+ "for-each": "^0.3.5",+ "get-proto": "^1.0.1",+ "gopd": "^1.2.0",+ "has-tostringtag": "^1.0.2"},"engines": {"node": ">= 0.4"@@ -1599,6 +1780,11 @@"dev": true,"optional": true},+ "@sagi.io/workers-kv": {+ "version": "0.0.15",+ "resolved": "https://registry.npmjs.org/@sagi.io/workers-kv/-/workers-kv-0.0.15.tgz",+ "integrity": "sha512-a7TyxTGCkrFmGVn39kdtMqYQFXSvqme50Dffm6nPpNHh3PL+xSd3pRArKn9kRb6qTkUg/xxwaPiE2dmiEtdJEQ=="+ },"@trpc/server": {"version": "10.45.2","resolved": "https://registry.npmjs.org/@trpc/server/-/server-10.45.2.tgz",@@ -1634,9 +1820,12 @@}},"available-typed-arrays": {- "version": "1.0.5",- "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz",- "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw=="+ "version": "1.0.7",+ "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz",+ "integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==",+ "requires": {+ "possible-typed-array-names": "^1.0.0"+ }},"cac": {"version": "6.7.14",@@ -1645,12 +1834,32 @@"dev": true},"call-bind": {+ "version": "1.0.8",+ "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.8.tgz",+ "integrity": "sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==",+ "requires": {+ "call-bind-apply-helpers": "^1.0.0",+ "es-define-property": "^1.0.0",+ "get-intrinsic": "^1.2.4",+ "set-function-length": "^1.2.2"+ }+ },+ "call-bind-apply-helpers": {"version": "1.0.2",- "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",- "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",+ "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz",+ "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==",+ "requires": {+ "es-errors": "^1.3.0",+ "function-bind": "^1.1.2"+ }+ },+ "call-bound": {+ "version": "1.0.4",+ "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz",+ "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==","requires": {- "function-bind": "^1.1.1",- "get-intrinsic": "^1.0.2"+ "call-bind-apply-helpers": "^1.0.2",+ "get-intrinsic": "^1.3.0"}},"cors": {@@ -1671,12 +1880,50 @@"ms": "^2.1.3"}},+ "define-data-property": {+ "version": "1.1.4",+ "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",+ "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",+ "requires": {+ "es-define-property": "^1.0.0",+ "es-errors": "^1.3.0",+ "gopd": "^1.0.1"+ }+ },+ "dunder-proto": {+ "version": "1.0.1",+ "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",+ "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==",+ "requires": {+ "call-bind-apply-helpers": "^1.0.1",+ "es-errors": "^1.3.0",+ "gopd": "^1.2.0"+ }+ },+ "es-define-property": {+ "version": "1.0.1",+ "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",+ "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g=="+ },+ "es-errors": {+ "version": "1.3.0",+ "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",+ "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw=="+ },"es-module-lexer": {"version": "1.6.0","resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.6.0.tgz","integrity": "sha512-qqnD1yMU6tk/jnaMosogGySTZP8YtUgAffA9nMN+E/rjxcfRQ6IEk7IiozUjgxKoFHBGjTLnrHB/YC45r/59EQ==","dev": true},+ "es-object-atoms": {+ "version": "1.1.1",+ "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz",+ "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==",+ "requires": {+ "es-errors": "^1.3.0"+ }+ },"esbuild": {"version": "0.21.5","resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.21.5.tgz",@@ -1709,11 +1956,11 @@}},"for-each": {- "version": "0.3.3",- "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",- "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",+ "version": "0.3.5",+ "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.5.tgz",+ "integrity": "sha512-dKx12eRCVIzqCxFGplyFKJMPvLEWgmNtUrpTiJIR5u97zEhRG8ySrtboPHZXx7daLxQVrl643cTzbab2tkQjxg==","requires": {- "is-callable": "^1.1.3"+ "is-callable": "^1.2.7"}},"fsevents": {@@ -1724,53 +1971,68 @@"optional": true},"function-bind": {- "version": "1.1.1",- "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",- "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="+ "version": "1.1.2",+ "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",+ "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA=="},"get-intrinsic": {- "version": "1.2.1",- "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz",- "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==",+ "version": "1.3.0",+ "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz",+ "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==","requires": {- "function-bind": "^1.1.1",- "has": "^1.0.3",- "has-proto": "^1.0.1",- "has-symbols": "^1.0.3"- }- },- "gopd": {+ "call-bind-apply-helpers": "^1.0.2",+ "es-define-property": "^1.0.1",+ "es-errors": "^1.3.0",+ "es-object-atoms": "^1.1.1",+ "function-bind": "^1.1.2",+ "get-proto": "^1.0.1",+ "gopd": "^1.2.0",+ "has-symbols": "^1.1.0",+ "hasown": "^2.0.2",+ "math-intrinsics": "^1.1.0"+ }+ },+ "get-proto": {"version": "1.0.1",- "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",- "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",+ "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz",+ "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==","requires": {- "get-intrinsic": "^1.1.3"+ "dunder-proto": "^1.0.1",+ "es-object-atoms": "^1.0.0"}},- "has": {- "version": "1.0.3",- "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",- "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",+ "gopd": {+ "version": "1.2.0",+ "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",+ "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg=="+ },+ "has-property-descriptors": {+ "version": "1.0.2",+ "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",+ "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==","requires": {- "function-bind": "^1.1.1"+ "es-define-property": "^1.0.0"}},- "has-proto": {- "version": "1.0.1",- "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",- "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg=="- },"has-symbols": {- "version": "1.0.3",- "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",- "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="+ "version": "1.1.0",+ "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz",+ "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ=="},"has-tostringtag": {- "version": "1.0.0",- "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",- "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",+ "version": "1.0.2",+ "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",+ "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",+ "requires": {+ "has-symbols": "^1.0.3"+ }+ },+ "hasown": {+ "version": "2.0.2",+ "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",+ "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==","requires": {- "has-symbols": "^1.0.2"+ "function-bind": "^1.1.2"}},"inherits": {@@ -1801,15 +2063,11 @@}},"is-typed-array": {- "version": "1.1.10",- "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.10.tgz",- "integrity": "sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A==",+ "version": "1.1.15",+ "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.15.tgz",+ "integrity": "sha512-p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ==","requires": {- "available-typed-arrays": "^1.0.5",- "call-bind": "^1.0.2",- "for-each": "^0.3.3",- "gopd": "^1.0.1",- "has-tostringtag": "^1.0.0"+ "which-typed-array": "^1.1.16"}},"js-tokens": {@@ -1825,6 +2083,11 @@"js-tokens": "^3.0.0 || ^4.0.0"}},+ "math-intrinsics": {+ "version": "1.1.0",+ "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",+ "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g=="+ },"ms": {"version": "2.1.3","resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",@@ -1854,6 +2117,11 @@"integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==","dev": true},+ "possible-typed-array-names": {+ "version": "1.1.0",+ "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.1.0.tgz",+ "integrity": "sha512-/+5VFTchJDoVj3bhoqi6UeymcD00DAwb1nJwamzPvHEszJ4FpF6SNNbUbOS8yI56qHzdV8eK0qEfOSiodkTdxg=="+ },"postcss": {"version": "8.5.1","resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.1.tgz",@@ -1902,6 +2170,19 @@"fsevents": "~2.3.2"}},+ "set-function-length": {+ "version": "1.2.2",+ "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",+ "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",+ "requires": {+ "define-data-property": "^1.1.4",+ "es-errors": "^1.3.0",+ "function-bind": "^1.1.2",+ "get-intrinsic": "^1.2.4",+ "gopd": "^1.0.1",+ "has-property-descriptors": "^1.0.2"+ }+ },"source-map-js": {"version": "1.2.1","resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",@@ -1956,16 +2237,17 @@}},"which-typed-array": {- "version": "1.1.9",- "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.9.tgz",- "integrity": "sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA==",+ "version": "1.1.19",+ "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.19.tgz",+ "integrity": "sha512-rEvr90Bck4WZt9HHFC4DJMsjvu7x+r6bImz0/BrbWb7A2djJ8hnZMrWnHo9F8ssv0OMErasDhftrfROTyqSDrw==","requires": {- "available-typed-arrays": "^1.0.5",- "call-bind": "^1.0.2",- "for-each": "^0.3.3",- "gopd": "^1.0.1",- "has-tostringtag": "^1.0.0",- "is-typed-array": "^1.1.10"+ "available-typed-arrays": "^1.0.7",+ "call-bind": "^1.0.8",+ "call-bound": "^1.0.4",+ "for-each": "^0.3.5",+ "get-proto": "^1.0.1",+ "gopd": "^1.2.0",+ "has-tostringtag": "^1.0.2"}},"zod": {diff --git a/servers/themes/package.json b/servers/themes/package.jsonindex 0bb154d39..1ae9d1a10 100644--- a/servers/themes/package.json+++ b/servers/themes/package.json@@ -13,6 +13,7 @@"dependencies": {"@notesnook/theme": "file:../../packages/theme","@orama/orama": "^1.0.8",+ "@sagi.io/workers-kv": "^0.0.15","@trpc/server": "10.45.2","async-mutex": "0.5.0","cors": "^2.8.5",diff --git a/servers/themes/src/constants.ts b/servers/themes/src/constants.tsindex 9b7f92c81..2d49ac323 100644--- a/servers/themes/src/constants.ts+++ b/servers/themes/src/constants.ts@@ -19,7 +19,15 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.import path from "path";import { fileURLToPath } from "url";-import { Counter } from "./counter";+import { FsCounter } from "./counter/fs";+import { readSecrets } from "./secrets";+import { KVCounter } from "./counter/kv";++const env = readSecrets([+ "CLOUDFLARE_ACCOUNT_ID",+ "CLOUDFLARE_AUTH_TOKEN",+ "CLOUDFLARE_INSTALLS_KV_NAMESPACE_ID"+]);const __dirname = path.dirname(fileURLToPath(import.meta.url));@@ -32,4 +40,13 @@ export const THEME_METADATA_JSON = path.join(__dirname, "themes-metadata.json");export const THEME_REPO_DIR_PATH = path.resolve(path.join(__dirname, "..", THEME_REPO_DIR_NAME));-export const InstallsCounter = new Counter("installs", path.dirname(__dirname));+export const InstallsCounter =+ env.CLOUDFLARE_ACCOUNT_ID &&+ env.CLOUDFLARE_AUTH_TOKEN &&+ env.CLOUDFLARE_INSTALLS_KV_NAMESPACE_ID+ ? new KVCounter({+ cfAccountId: env.CLOUDFLARE_ACCOUNT_ID,+ cfAuthToken: env.CLOUDFLARE_AUTH_TOKEN,+ namespaceId: env.CLOUDFLARE_INSTALLS_KV_NAMESPACE_ID+ })+ : new FsCounter(path.join(path.dirname(__dirname), "..", "installs.json"));diff --git a/servers/themes/src/counter.ts b/servers/themes/src/counter/fs.tssimilarity index 83%rename from servers/themes/src/counter.tsrename to servers/themes/src/counter/fs.tsindex 83205c987..16e5c4511 100644--- a/servers/themes/src/counter.ts+++ b/servers/themes/src/counter/fs.ts@@ -18,21 +18,20 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.*/import { readFile, writeFile } from "fs/promises";-import path from "path";import { Mutex } from "async-mutex";type Counts = Record<string, string[]>;-export class Counter {+export class FsCounter {private path: string;private readonly mutex: Mutex;- constructor(id: string, baseDirectory: string) {- this.path = path.join(baseDirectory, `${id}.json`);+ constructor(id: string) {+ this.path = id;this.mutex = new Mutex();}async increment(key: string, uid: string) {await this.mutex.runExclusive(async () => {- const counts = await this.counts();+ const counts = await this.all();counts[key] = counts[key] || [];if (counts[key].includes(uid)) return;counts[key].push(uid);@@ -44,7 +43,13 @@ export class Counter {await writeFile(this.path, JSON.stringify(counts));}- async counts(): Promise<Counts> {+ counts(key: string): Promise<number> {+ return this.all().then((counts) => {+ return (counts[key] || []).length;+ });+ }++ private async all(): Promise<Counts> {try {return JSON.parse(await readFile(this.path, "utf-8"));} catch {diff --git a/servers/themes/src/counter/kv.ts b/servers/themes/src/counter/kv.tsnew file mode 100644index 000000000..f17e0ee70--- /dev/null+++ b/servers/themes/src/counter/kv.ts@@ -0,0 +1,76 @@+/*+This file is part of the Notesnook project (https://notesnook.com/)++Copyright (C) 2023 Streetwriters (Private) Limited++This program is free software: you can redistribute it and/or modify+it under the terms of the GNU General Public License as published by+the Free Software Foundation, either version 3 of the License, or+(at your option) any later version.++This program is distributed in the hope that it will be useful,+but WITHOUT ANY WARRANTY; without even the implied warranty of+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the+GNU General Public License for more details.++You should have received a copy of the GNU General Public License+along with this program. If not, see <http://www.gnu.org/licenses/>.+*/++import { Mutex } from "async-mutex";+import WorkersKVREST from "@sagi.io/workers-kv";++export class KVCounter {+ private readonly kv: WorkersKVREST;+ private readonly mutex: Mutex;+ constructor(config: {+ cfAccountId: string;+ cfAuthToken: string;+ namespaceId: string;+ }) {+ this.mutex = new Mutex();+ this.kv = new WorkersKVREST(config);+ }++ async increment(key: string, uid: string) {+ await this.mutex.runExclusive(async () => {+ const existing = await read<string[]>(this.kv, key, []);+ await write(this.kv, key, Array.from(new Set([...existing, uid])));+ });+ }++ async counts(key: string): Promise<number> {+ const installs = await read<string[]>(this.kv, key, []);+ return installs.length;+ }+}++async function read<T>(+ kv: WorkersKVREST,+ key: string,+ fallback: T+): Promise<T> {+ try {+ const response = await kv.readKey({+ key+ });+ if (typeof response === "object" && !response.success) {+ // console.error("failed:", response.errors);+ return fallback;+ }+ return (+ JSON.parse(typeof response === "string" ? response : response.result) ||+ fallback+ );+ } catch (e) {+ // console.error(e);+ return fallback;+ }+}++async function write<T>(kv: WorkersKVREST, key: string, data: T) {+ await kv.writeKey({+ key,+ value: JSON.stringify(data)+ });+}diff --git a/servers/themes/src/orama.ts b/servers/themes/src/orama.tsindex 3127363d4..8785042b7 100644--- a/servers/themes/src/orama.ts+++ b/servers/themes/src/orama.ts@@ -19,6 +19,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.import { Orama, SearchParams, create, search } from "@orama/orama";import { CompiledThemeDefinition, ThemeMetadata } from "./sync";import { ThemeQuerySchema } from "./schemas";+import { InstallsCounter } from "./constants";export let ThemesDatabase: Orama | null = null;export async function initializeDatabase(): Promise<Orama> {@@ -89,13 +90,16 @@ export async function getThemes(query: (typeof ThemeQuerySchema)["_type"]) {}}const results = await search(ThemesDatabase!, searchParams);- const themes = results.hits.map((hit) => {- return {- ...(hit.document as CompiledThemeDefinition),+ const themes: ThemeMetadata[] = [];+ for (const hit of results.hits) {+ const theme = hit.document as CompiledThemeDefinition;+ themes.push({+ ...theme,scopes: undefined,- codeBlockCSS: undefined- } as ThemeMetadata;- });+ codeBlockCSS: undefined,+ totalInstalls: await InstallsCounter.counts(theme.id)+ } as ThemeMetadata);+ }return {themes,diff --git a/servers/themes/src/secrets.ts b/servers/themes/src/secrets.tsnew file mode 100644index 000000000..b86f490cc--- /dev/null+++ b/servers/themes/src/secrets.ts@@ -0,0 +1,40 @@+/*+This file is part of the Notesnook project (https://notesnook.com/)++Copyright (C) 2023 Streetwriters (Private) Limited++This program is free software: you can redistribute it and/or modify+it under the terms of the GNU General Public License as published by+the Free Software Foundation, either version 3 of the License, or+(at your option) any later version.++This program is distributed in the hope that it will be useful,+but WITHOUT ANY WARRANTY; without even the implied warranty of+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the+GNU General Public License for more details.++You should have received a copy of the GNU General Public License+along with this program. If not, see <http://www.gnu.org/licenses/>.+*/++import { readFileSync } from "node:fs";++export function readSecrets<T extends string>(+ names: T[]+): Record<T, string | undefined> {+ const result: Record<T, string | undefined> = {} as Record<+ T,+ string | undefined+ >;+ for (const name of names) result[name] = readSecret(name);+ return result;+}++export function readSecret(name: string): string | undefined {+ const value = process.env[name];+ if (value) return value;+ const file = process.env[`${name}_FILE`];+ if (file) {+ return readFileSync(file, "utf-8");+ }+}diff --git a/servers/themes/src/sync.ts b/servers/themes/src/sync.tsindex 98b679378..379b90a84 100644--- a/servers/themes/src/sync.ts+++ b/servers/themes/src/sync.ts@@ -17,14 +17,10 @@ You should have received a copy of the GNU General Public Licensealong with this program. If not, see <http://www.gnu.org/licenses/>.*/import { execSync } from "child_process";-import fs from "fs";+import fs from "node:fs";import { readdir, readFile } from "fs/promises";import path from "path";-import {- InstallsCounter,- THEMES_REPO_URL,- THEME_REPO_DIR_PATH-} from "./constants";+import { THEMES_REPO_URL, THEME_REPO_DIR_PATH } from "./constants";import { insertMultiple } from "@orama/orama";import { initializeDatabase } from "./orama";import {@@ -70,7 +66,6 @@ async function generateThemesMetadata() {const THEMES_PATH = path.join(THEME_REPO_DIR_PATH, "themes");const themes = await readdir(THEMES_PATH);- const counts = await InstallsCounter.counts();for (const themeId of themes) {for (const version of THEME_COMPATIBILITY_VERSIONS) {@@ -96,7 +91,7 @@ async function generateThemesMetadata() {...theme,sourceURL: `https://github.com/streetwriters/notesnook-themes/tree/main/themes/${themeId}/v${version}/`,codeBlockCSS,- totalInstalls: counts[theme.id]?.length || 0,+ totalInstalls: 0,previewColors: getPreviewColors(theme)});}