From 25b35769c56be336aa0b3e2c9ab7e73bbe6342b4 Mon Sep 17 00:00:00 2001 From: Sam Atkins Date: Thu, 25 Apr 2024 16:29:44 +0100 Subject: [PATCH 01/68] chore: Set-up eslint eslint is a static analysis tool that tries to identify bugs and mistakes in the code. We have quite a variety of code in this repo so the config is a little complicated, but I've tried to make it clear. It's found a *lot* of issues (over 1700), and while many of which will not be actual problems, (it doesn't like us using window properties without `window.`,) but some definitely are. --- eslint.config.js | 106 ++++++ package-lock.json | 798 ++++++++++++++++++++++++++++++++++------------ package.json | 3 + 3 files changed, 707 insertions(+), 200 deletions(-) create mode 100644 eslint.config.js diff --git a/eslint.config.js b/eslint.config.js new file mode 100644 index 000000000..4bae3fb27 --- /dev/null +++ b/eslint.config.js @@ -0,0 +1,106 @@ +import js from "@eslint/js"; +import globals from "globals"; + +export default [ + js.configs.recommended, + + { + // Global ignores + ignores: [ + "**/*.min.js", + "**/src/lib/**", + "**/dist/", + "packages/backend/src/public/assets/**", + ], + }, + { + // Top-level and tools use Node + files: [ + "tools/**/*.js", + ], + languageOptions: { + globals: { + ...globals.node, + } + } + }, + { + // Back end + files: [ + "packages/backend/**/*.js", + "dev-server.js", + "utils.js", + ], + languageOptions: { + globals: { + ...globals.node, + "kv": true, + } + } + }, + { + // Front end + files: [ + "index.js", + "initgui.js", + "src/**/*.js", + "packages/**/*.js", + ], + ignores: [ + "packages/backend/**/*.js", + ], + languageOptions: { + globals: { + ...globals.browser, + ...globals.commonjs, + "puter": true, + "i18n": true, + "html_encode": true, + "html_decode": true, + "isMobile": true, + // Libraries + "saveAs": true, // FileSaver + "iro": true, // iro.js color picker + "$": true, // jQuery + "jQuery": true, // jQuery + "JSZip": true, // JSZip + "_": true, // lodash + "QRCode": true, // qrcode + "io": true, // socket.io + "timeago": true, // timeago + "SelectionArea": true, // viselect + } + } + }, + { + // Tests + files: [ + "**/test/**/*.js", + ], + languageOptions: { + globals: { + ...globals.mocha, + } + } + }, + { + // Phoenix + files: [ + "packages/phoenix/**/*.js", + ], + languageOptions: { + globals: { + ...globals.node, + } + } + }, + { + // Global rule settings + rules: { + "no-prototype-builtins": "off", // Complains about any use of hasOwnProperty() + "no-unused-vars": "off", // Temporary, we just have a lot of these + "no-debugger": "warn", + "no-async-promise-executor": "off", // We do this quite often and it's fine + } + }, +]; diff --git a/package-lock.json b/package-lock.json index ba610ac6d..ae585914a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,10 +16,13 @@ "uuid": "^9.0.1" }, "devDependencies": { + "@eslint/js": "^9.1.1", "chalk": "^4.1.0", "clean-css": "^5.3.2", "dotenv": "^16.4.5", + "eslint": "^9.1.1", "express": "^4.18.2", + "globals": "^15.0.0", "html-entities": "^2.3.3", "nodemon": "^3.1.0", "uglify-js": "^3.17.4", @@ -27,6 +30,15 @@ "webpack-cli": "^5.1.1" } }, + "node_modules/@aashutoshrathi/word-wrap": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz", + "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/@ampproject/remapping": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz", @@ -407,6 +419,15 @@ "node": ">=6.9.0" } }, + "node_modules/@babel/traverse/node_modules/globals": { + "version": "11.12.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", + "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", + "dev": true, + "engines": { + "node": ">=4" + } + }, "node_modules/@babel/types": { "version": "7.24.0", "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.24.0.tgz", @@ -448,6 +469,86 @@ "node": ">=10.0.0" } }, + "node_modules/@eslint-community/eslint-utils": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz", + "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==", + "dev": true, + "dependencies": { + "eslint-visitor-keys": "^3.3.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "peerDependencies": { + "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0" + } + }, + "node_modules/@eslint-community/eslint-utils/node_modules/eslint-visitor-keys": { + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", + "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", + "dev": true, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/@eslint-community/regexpp": { + "version": "4.10.0", + "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.10.0.tgz", + "integrity": "sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==", + "dev": true, + "engines": { + "node": "^12.0.0 || ^14.0.0 || >=16.0.0" + } + }, + "node_modules/@eslint/eslintrc": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.0.2.tgz", + "integrity": "sha512-wV19ZEGEMAC1eHgrS7UQPqsdEiCIbTKTasEfcXAigzoXICcqZSjBZEHlZwNVvKg6UBCjSlos84XiLqsRJnIcIg==", + "dev": true, + "dependencies": { + "ajv": "^6.12.4", + "debug": "^4.3.2", + "espree": "^10.0.1", + "globals": "^14.0.0", + "ignore": "^5.2.0", + "import-fresh": "^3.2.1", + "js-yaml": "^4.1.0", + "minimatch": "^3.1.2", + "strip-json-comments": "^3.1.1" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/@eslint/eslintrc/node_modules/globals": { + "version": "14.0.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-14.0.0.tgz", + "integrity": "sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==", + "dev": true, + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/@eslint/js": { + "version": "9.1.1", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.1.1.tgz", + "integrity": "sha512-5WoDz3Y19Bg2BnErkZTp0en+c/i9PvgFS7MBe1+m60HjFr0hrphlAGp4yzI7pxpt4xShln4ZyYp4neJm8hmOkQ==", + "dev": true, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + } + }, "node_modules/@grpc/grpc-js": { "version": "1.10.6", "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.10.6.tgz", @@ -621,6 +722,52 @@ "resolved": "packages/terminal", "link": true }, + "node_modules/@humanwhocodes/config-array": { + "version": "0.13.0", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.13.0.tgz", + "integrity": "sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw==", + "dev": true, + "dependencies": { + "@humanwhocodes/object-schema": "^2.0.3", + "debug": "^4.3.1", + "minimatch": "^3.0.5" + }, + "engines": { + "node": ">=10.10.0" + } + }, + "node_modules/@humanwhocodes/module-importer": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", + "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", + "dev": true, + "engines": { + "node": ">=12.22" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/nzakas" + } + }, + "node_modules/@humanwhocodes/object-schema": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz", + "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==", + "dev": true + }, + "node_modules/@humanwhocodes/retry": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.2.3.tgz", + "integrity": "sha512-X38nUbachlb01YMlvPFojKoiXq+LzZvuSce70KPMPdeM1Rj03k4dR7lDslhbqXn3Ang4EU3+EAmwEAsbrjHW3g==", + "dev": true, + "engines": { + "node": ">=18.18" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/nzakas" + } + }, "node_modules/@istanbuljs/load-nyc-config": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz", @@ -1305,6 +1452,41 @@ "node-pre-gyp": "bin/node-pre-gyp" } }, + "node_modules/@nodelib/fs.scandir": { + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", + "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", + "dev": true, + "dependencies": { + "@nodelib/fs.stat": "2.0.5", + "run-parallel": "^1.1.9" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.stat": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", + "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", + "dev": true, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.walk": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", + "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", + "dev": true, + "dependencies": { + "@nodelib/fs.scandir": "2.1.5", + "fastq": "^1.6.0" + }, + "engines": { + "node": ">= 8" + } + }, "node_modules/@opentelemetry/api": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-1.4.1.tgz", @@ -3948,6 +4130,15 @@ "acorn": "^8" } }, + "node_modules/acorn-jsx": { + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", + "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", + "dev": true, + "peerDependencies": { + "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" + } + }, "node_modules/agent-base": { "version": "6.0.2", "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", @@ -4612,6 +4803,15 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/callsites": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", + "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", + "dev": true, + "engines": { + "node": ">=6" + } + }, "node_modules/camelcase": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.0.0.tgz", @@ -5308,6 +5508,12 @@ "node": ">=4.0.0" } }, + "node_modules/deep-is": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", + "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", + "dev": true + }, "node_modules/default-require-extensions": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/default-require-extensions/-/default-require-extensions-3.0.1.tgz", @@ -5618,6 +5824,57 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/eslint": { + "version": "9.1.1", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.1.1.tgz", + "integrity": "sha512-b4cRQ0BeZcSEzPpY2PjFY70VbO32K7BStTGtBsnIGdTSEEQzBi8hPBcGQmTG2zUvFr9uLe0TK42bw8YszuHEqg==", + "dev": true, + "dependencies": { + "@eslint-community/eslint-utils": "^4.2.0", + "@eslint-community/regexpp": "^4.6.1", + "@eslint/eslintrc": "^3.0.2", + "@eslint/js": "9.1.1", + "@humanwhocodes/config-array": "^0.13.0", + "@humanwhocodes/module-importer": "^1.0.1", + "@humanwhocodes/retry": "^0.2.3", + "@nodelib/fs.walk": "^1.2.8", + "ajv": "^6.12.4", + "chalk": "^4.0.0", + "cross-spawn": "^7.0.2", + "debug": "^4.3.2", + "escape-string-regexp": "^4.0.0", + "eslint-scope": "^8.0.1", + "eslint-visitor-keys": "^4.0.0", + "espree": "^10.0.1", + "esquery": "^1.4.2", + "esutils": "^2.0.2", + "fast-deep-equal": "^3.1.3", + "file-entry-cache": "^8.0.0", + "find-up": "^5.0.0", + "glob-parent": "^6.0.2", + "ignore": "^5.2.0", + "imurmurhash": "^0.1.4", + "is-glob": "^4.0.0", + "is-path-inside": "^3.0.3", + "json-stable-stringify-without-jsonify": "^1.0.1", + "levn": "^0.4.1", + "lodash.merge": "^4.6.2", + "minimatch": "^3.1.2", + "natural-compare": "^1.4.0", + "optionator": "^0.9.3", + "strip-ansi": "^6.0.1", + "text-table": "^0.2.0" + }, + "bin": { + "eslint": "bin/eslint.js" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, "node_modules/eslint-scope": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", @@ -5631,6 +5888,55 @@ "node": ">=8.0.0" } }, + "node_modules/eslint-visitor-keys": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.0.0.tgz", + "integrity": "sha512-OtIRv/2GyiF6o/d8K7MYKKbXrOUBIK6SfkIRM4Z0dY3w+LiQ0vy3F57m0Z71bjbyeiWFiHJ8brqnmE6H6/jEuw==", + "dev": true, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/eslint/node_modules/eslint-scope": { + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.0.1.tgz", + "integrity": "sha512-pL8XjgP4ZOmmwfFE8mEhSxA7ZY4C+LWyqjQ3o4yWkkmD0qcMT9kkW3zWHOczhWcjTSgqycYAgwSlXvZltv65og==", + "dev": true, + "dependencies": { + "esrecurse": "^4.3.0", + "estraverse": "^5.2.0" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/eslint/node_modules/estraverse": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", + "dev": true, + "engines": { + "node": ">=4.0" + } + }, + "node_modules/eslint/node_modules/glob-parent": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", + "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", + "dev": true, + "dependencies": { + "is-glob": "^4.0.3" + }, + "engines": { + "node": ">=10.13.0" + } + }, "node_modules/esm": { "version": "3.2.25", "resolved": "https://registry.npmjs.org/esm/-/esm-3.2.25.tgz", @@ -5639,6 +5945,23 @@ "node": ">=6" } }, + "node_modules/espree": { + "version": "10.0.1", + "resolved": "https://registry.npmjs.org/espree/-/espree-10.0.1.tgz", + "integrity": "sha512-MWkrWZbJsL2UwnjxTX3gG8FneachS/Mwg7tdGXce011sJd5b0JG54vat5KHnfSBODZ3Wvzd2WnjxyzsRoVv+ww==", + "dev": true, + "dependencies": { + "acorn": "^8.11.3", + "acorn-jsx": "^5.3.2", + "eslint-visitor-keys": "^4.0.0" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, "node_modules/esprima": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", @@ -5652,6 +5975,27 @@ "node": ">=4" } }, + "node_modules/esquery": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz", + "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==", + "dev": true, + "dependencies": { + "estraverse": "^5.1.0" + }, + "engines": { + "node": ">=0.10" + } + }, + "node_modules/esquery/node_modules/estraverse": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", + "dev": true, + "engines": { + "node": ">=4.0" + } + }, "node_modules/esrecurse": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", @@ -5682,6 +6026,15 @@ "node": ">=4.0" } }, + "node_modules/esutils": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", + "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/etag": { "version": "1.8.1", "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", @@ -5817,6 +6170,12 @@ "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", "dev": true }, + "node_modules/fast-levenshtein": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", + "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", + "dev": true + }, "node_modules/fastest-levenshtein": { "version": "1.0.16", "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz", @@ -5826,11 +6185,32 @@ "node": ">= 4.9.1" } }, + "node_modules/fastq": { + "version": "1.17.1", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz", + "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==", + "dev": true, + "dependencies": { + "reusify": "^1.0.4" + } + }, "node_modules/fecha": { "version": "4.2.3", "resolved": "https://registry.npmjs.org/fecha/-/fecha-4.2.3.tgz", "integrity": "sha512-OP2IUU6HeYKJi3i0z4A19kHMQoLVs4Hc+DPqqxI2h/DPZHTm/vjsfC6P0b4jCMy14XizLBqvndQ+UilD7707Jw==" }, + "node_modules/file-entry-cache": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz", + "integrity": "sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==", + "dev": true, + "dependencies": { + "flat-cache": "^4.0.0" + }, + "engines": { + "node": ">=16.0.0" + } + }, "node_modules/file-stream-rotator": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/file-stream-rotator/-/file-stream-rotator-0.6.1.tgz", @@ -5943,6 +6323,25 @@ "flat": "cli.js" } }, + "node_modules/flat-cache": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-4.0.1.tgz", + "integrity": "sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==", + "dev": true, + "dependencies": { + "flatted": "^3.2.9", + "keyv": "^4.5.4" + }, + "engines": { + "node": ">=16" + } + }, + "node_modules/flatted": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz", + "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==", + "dev": true + }, "node_modules/fn.name": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/fn.name/-/fn.name-1.1.0.tgz", @@ -6328,12 +6727,15 @@ } }, "node_modules/globals": { - "version": "11.12.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", - "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", + "version": "15.0.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-15.0.0.tgz", + "integrity": "sha512-m/C/yR4mjO6pXDTm9/R/SpYTAIyaUB4EOzcaaMEl7mds7Mshct9GfejiJNQGjHHbdMPey13Kpu4TMbYi9ex1pw==", "dev": true, "engines": { - "node": ">=4" + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/gopd": { @@ -6548,6 +6950,15 @@ "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz", "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==" }, + "node_modules/ignore": { + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz", + "integrity": "sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==", + "dev": true, + "engines": { + "node": ">= 4" + } + }, "node_modules/ignore-by-default": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/ignore-by-default/-/ignore-by-default-1.0.1.tgz", @@ -6567,6 +6978,31 @@ "resolved": "https://registry.npmjs.org/@types/node/-/node-16.9.1.tgz", "integrity": "sha512-QpLcX9ZSsq3YYUUnD3nFDY8H7wctAhQj/TFKL8Ya8v5fMm3CFXxo8zStsLAl780ltoYoo1WvKUVGBQK+1ifr7g==" }, + "node_modules/import-fresh": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", + "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", + "dev": true, + "dependencies": { + "parent-module": "^1.0.0", + "resolve-from": "^4.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/import-fresh/node_modules/resolve-from": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", + "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", + "dev": true, + "engines": { + "node": ">=4" + } + }, "node_modules/import-in-the-middle": { "version": "1.7.1", "resolved": "https://registry.npmjs.org/import-in-the-middle/-/import-in-the-middle-1.7.1.tgz", @@ -6758,6 +7194,15 @@ "node": ">=0.12.0" } }, + "node_modules/is-path-inside": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", + "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, "node_modules/is-plain-obj": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz", @@ -7133,6 +7578,12 @@ "bignumber.js": "^9.0.0" } }, + "node_modules/json-buffer": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", + "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", + "dev": true + }, "node_modules/json-parse-even-better-errors": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", @@ -7145,6 +7596,12 @@ "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", "dev": true }, + "node_modules/json-stable-stringify-without-jsonify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", + "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==", + "dev": true + }, "node_modules/json5": { "version": "2.2.3", "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", @@ -7201,6 +7658,15 @@ "safe-buffer": "^5.0.1" } }, + "node_modules/keyv": { + "version": "4.5.4", + "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", + "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", + "dev": true, + "dependencies": { + "json-buffer": "3.0.1" + } + }, "node_modules/kind-of": { "version": "6.0.3", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", @@ -7273,6 +7739,19 @@ "node": ">=0.10.0" } }, + "node_modules/levn": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", + "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", + "dev": true, + "dependencies": { + "prelude-ls": "^1.2.1", + "type-check": "~0.4.0" + }, + "engines": { + "node": ">= 0.8.0" + } + }, "node_modules/load-bmfont": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/load-bmfont/-/load-bmfont-1.4.1.tgz", @@ -7855,6 +8334,12 @@ "resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-1.0.2.tgz", "integrity": "sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==" }, + "node_modules/natural-compare": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", + "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", + "dev": true + }, "node_modules/negotiator": { "version": "0.6.3", "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", @@ -8323,6 +8808,23 @@ "undici-types": "~5.26.4" } }, + "node_modules/optionator": { + "version": "0.9.3", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz", + "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==", + "dev": true, + "dependencies": { + "@aashutoshrathi/word-wrap": "^1.2.3", + "deep-is": "^0.1.3", + "fast-levenshtein": "^2.0.6", + "levn": "^0.4.1", + "prelude-ls": "^1.2.1", + "type-check": "^0.4.0" + }, + "engines": { + "node": ">= 0.8.0" + } + }, "node_modules/p-limit": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", @@ -8394,6 +8896,18 @@ "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz", "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==" }, + "node_modules/parent-module": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", + "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", + "dev": true, + "dependencies": { + "callsites": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, "node_modules/parse-bmfont-ascii": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/parse-bmfont-ascii/-/parse-bmfont-ascii-1.0.6.tgz", @@ -8708,6 +9222,15 @@ "node": ">=10" } }, + "node_modules/prelude-ls": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", + "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", + "dev": true, + "engines": { + "node": ">= 0.8.0" + } + }, "node_modules/process": { "version": "0.11.10", "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", @@ -8852,6 +9375,26 @@ "node": ">=0.4.x" } }, + "node_modules/queue-microtask": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", + "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ] + }, "node_modules/randombytes": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", @@ -9089,6 +9632,16 @@ "node": ">= 0.6" } }, + "node_modules/reusify": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", + "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", + "dev": true, + "engines": { + "iojs": ">=1.0.0", + "node": ">=0.10.0" + } + }, "node_modules/rimraf": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", @@ -9122,6 +9675,29 @@ "url": "https://github.com/sponsors/isaacs" } }, + "node_modules/run-parallel": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", + "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "dependencies": { + "queue-microtask": "^1.2.2" + } + }, "node_modules/rxjs": { "version": "7.8.1", "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz", @@ -9976,6 +10552,12 @@ "resolved": "https://registry.npmjs.org/text-hex/-/text-hex-1.0.0.tgz", "integrity": "sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg==" }, + "node_modules/text-table": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", + "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", + "dev": true + }, "node_modules/tiktoken": { "version": "1.0.14", "resolved": "https://registry.npmjs.org/tiktoken/-/tiktoken-1.0.14.tgz", @@ -10132,6 +10714,18 @@ "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", "integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==" }, + "node_modules/type-check": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", + "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", + "dev": true, + "dependencies": { + "prelude-ls": "^1.2.1" + }, + "engines": { + "node": ">= 0.8.0" + } + }, "node_modules/type-detect": { "version": "4.0.8", "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", @@ -10957,38 +11551,6 @@ "node-pty": "^1.0.0" } }, - "packages/phoenix/node_modules/@nodelib/fs.scandir": { - "version": "2.1.5", - "dev": true, - "license": "MIT", - "dependencies": { - "@nodelib/fs.stat": "2.0.5", - "run-parallel": "^1.1.9" - }, - "engines": { - "node": ">= 8" - } - }, - "packages/phoenix/node_modules/@nodelib/fs.stat": { - "version": "2.0.5", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 8" - } - }, - "packages/phoenix/node_modules/@nodelib/fs.walk": { - "version": "1.2.8", - "dev": true, - "license": "MIT", - "dependencies": { - "@nodelib/fs.scandir": "2.1.5", - "fastq": "^1.6.0" - }, - "engines": { - "node": ">= 8" - } - }, "packages/phoenix/node_modules/@pkgjs/parseargs": { "version": "0.11.0", "license": "MIT", @@ -11284,14 +11846,6 @@ "node": ">=8.6.0" } }, - "packages/phoenix/node_modules/fastq": { - "version": "1.15.0", - "dev": true, - "license": "ISC", - "dependencies": { - "reusify": "^1.0.4" - } - }, "packages/phoenix/node_modules/fs-extra": { "version": "8.1.0", "dev": true, @@ -11353,14 +11907,6 @@ "node": ">=8" } }, - "packages/phoenix/node_modules/ignore": { - "version": "5.2.4", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 4" - } - }, "packages/phoenix/node_modules/is-builtin-module": { "version": "3.2.1", "dev": true, @@ -11456,25 +12002,6 @@ "node": ">=8" } }, - "packages/phoenix/node_modules/queue-microtask": { - "version": "1.2.3", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "license": "MIT" - }, "packages/phoenix/node_modules/randomstring": { "version": "1.3.0", "license": "MIT", @@ -11492,15 +12019,6 @@ "version": "2.0.3", "license": "MIT" }, - "packages/phoenix/node_modules/reusify": { - "version": "1.0.4", - "dev": true, - "license": "MIT", - "engines": { - "iojs": ">=1.0.0", - "node": ">=0.10.0" - } - }, "packages/phoenix/node_modules/rollup": { "version": "3.21.4", "dev": true, @@ -11531,28 +12049,6 @@ "node": ">=8.3" } }, - "packages/phoenix/node_modules/run-parallel": { - "version": "1.2.0", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "license": "MIT", - "dependencies": { - "queue-microtask": "^1.2.2" - } - }, "packages/phoenix/node_modules/sinon": { "version": "17.0.1", "license": "BSD-3-Clause", @@ -11671,38 +12167,6 @@ "rollup-plugin-copy": "^3.4.0" } }, - "packages/terminal/node_modules/@nodelib/fs.scandir": { - "version": "2.1.5", - "dev": true, - "license": "MIT", - "dependencies": { - "@nodelib/fs.stat": "2.0.5", - "run-parallel": "^1.1.9" - }, - "engines": { - "node": ">= 8" - } - }, - "packages/terminal/node_modules/@nodelib/fs.stat": { - "version": "2.0.5", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 8" - } - }, - "packages/terminal/node_modules/@nodelib/fs.walk": { - "version": "1.2.8", - "dev": true, - "license": "MIT", - "dependencies": { - "@nodelib/fs.scandir": "2.1.5", - "fastq": "^1.6.0" - }, - "engines": { - "node": ">= 8" - } - }, "packages/terminal/node_modules/@rollup/plugin-commonjs": { "version": "24.1.0", "dev": true, @@ -11903,14 +12367,6 @@ "node": ">=8.6.0" } }, - "packages/terminal/node_modules/fastq": { - "version": "1.15.0", - "dev": true, - "license": "ISC", - "dependencies": { - "reusify": "^1.0.4" - } - }, "packages/terminal/node_modules/fs-extra": { "version": "8.1.0", "dev": true, @@ -12042,14 +12498,6 @@ "node": ">=0.10.0" } }, - "packages/terminal/node_modules/ignore": { - "version": "5.2.4", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 4" - } - }, "packages/terminal/node_modules/is-builtin-module": { "version": "3.2.1", "dev": true, @@ -12168,39 +12616,11 @@ "url": "https://github.com/sponsors/ljharb" } }, - "packages/terminal/node_modules/queue-microtask": { - "version": "1.2.3", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "license": "MIT" - }, "packages/terminal/node_modules/requires-port": { "version": "1.0.0", "dev": true, "license": "MIT" }, - "packages/terminal/node_modules/reusify": { - "version": "1.0.4", - "dev": true, - "license": "MIT", - "engines": { - "iojs": ">=1.0.0", - "node": ">=0.10.0" - } - }, "packages/terminal/node_modules/rollup": { "version": "3.23.0", "dev": true, @@ -12231,28 +12651,6 @@ "node": ">=8.3" } }, - "packages/terminal/node_modules/run-parallel": { - "version": "1.2.0", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "license": "MIT", - "dependencies": { - "queue-microtask": "^1.2.2" - } - }, "packages/terminal/node_modules/secure-compare": { "version": "3.0.1", "dev": true, diff --git a/package.json b/package.json index 339b62aa9..203820aa9 100644 --- a/package.json +++ b/package.json @@ -11,10 +11,13 @@ "lib": "lib" }, "devDependencies": { + "@eslint/js": "^9.1.1", "chalk": "^4.1.0", "clean-css": "^5.3.2", "dotenv": "^16.4.5", + "eslint": "^9.1.1", "express": "^4.18.2", + "globals": "^15.0.0", "html-entities": "^2.3.3", "nodemon": "^3.1.0", "uglify-js": "^3.17.4", From 4a426ce0451244e4bab5e53ce2ae290fb38daf52 Mon Sep 17 00:00:00 2001 From: Sam Atkins Date: Thu, 25 Apr 2024 15:44:59 +0100 Subject: [PATCH 02/68] chore: Remove duplicate translation keys --- src/i18n/translations/en.js | 1 - src/i18n/translations/ig.js | 1 - src/i18n/translations/nl.js | 1 - src/i18n/translations/tr.js | 1 - 4 files changed, 4 deletions(-) diff --git a/src/i18n/translations/en.js b/src/i18n/translations/en.js index 2e5d9fefa..aa04ddebf 100644 --- a/src/i18n/translations/en.js +++ b/src/i18n/translations/en.js @@ -255,7 +255,6 @@ const en = { yes_release_it: 'Yes, Release It', you_have_been_referred_to_puter_by_a_friend: "You have been referred to Puter by a friend!", zip: "Zip", - storage_puter_used: "used by Puter", } }; diff --git a/src/i18n/translations/ig.js b/src/i18n/translations/ig.js index 34731bd6f..9276a8a85 100644 --- a/src/i18n/translations/ig.js +++ b/src/i18n/translations/ig.js @@ -249,7 +249,6 @@ const ig = { yes_release_it: 'Ee, Hapụ ya', you_have_been_referred_to_puter_by_a_friend: "Otu enyi zigara gị na Puter!", zip: "Zip", - storage_puter_used: "nke Puter na-eji", } }; diff --git a/src/i18n/translations/nl.js b/src/i18n/translations/nl.js index de53dd04b..568af6fc5 100644 --- a/src/i18n/translations/nl.js +++ b/src/i18n/translations/nl.js @@ -99,7 +99,6 @@ const nl = { license: "Licentie", loading: 'Laden', log_in: "Inloggen", - log_into_another_account_anyway: 'Log into another account anyway', log_into_another_account_anyway: 'Alsnog met ander account inloggen', log_out: 'Uitloggen', move: 'Verplaatsen', diff --git a/src/i18n/translations/tr.js b/src/i18n/translations/tr.js index 57241e5a5..49e8ee23f 100644 --- a/src/i18n/translations/tr.js +++ b/src/i18n/translations/tr.js @@ -225,7 +225,6 @@ const tr = { yes_release_it: "Evet, Bırak", you_have_been_referred_to_puter_by_a_friend: "Bir arkadaşınız tarafından Puter'a yönlendirildiniz!", zip: "Sıkıştır", - storage_puter_used: "Puter tarafından kullanılıyor", } }; From 8cf6379de36d8a42d5277e238228ba4f437be9de Mon Sep 17 00:00:00 2001 From: Sam Atkins Date: Thu, 25 Apr 2024 16:24:18 +0100 Subject: [PATCH 03/68] chore: Correct eslint errors in backend filesystem Removes or disables the following eslint errors/warnings: /puter/packages/backend/src/api/filesystem/FlagParam.js 33:19 error 'APIError' is not defined no-undef 47:19 error 'APIError' is not defined no-undef 58:15 error 'APIError' is not defined no-undef /puter/packages/backend/src/api/filesystem/StringParam.js 32:19 error 'APIError' is not defined no-undef 39:13 error 'APIError' is not defined no-undef 46:19 error 'APIError' is not defined no-undef /puter/packages/backend/src/filesystem/FilesystemService.js 141:17 warning Unexpected 'debugger' statement no-debugger 366:21 error 'services' is not defined no-undef /puter/packages/backend/src/filesystem/batch/BatchExecutor.js 121:21 error Do not assign to the exception parameter no-ex-assign /puter/packages/backend/src/filesystem/hl_operations/hl_data_read.js 44:19 error 'APIError' is not defined no-undef 47:22 error 'chkperm' is not defined no-undef 48:19 error 'APIError' is not defined no-undef 51:29 error 'LLRead' is not defined no-undef 54:13 error 'version_id' is not defined no-undef 88:35 error 'PassThrough' is not defined no-undef /puter/packages/backend/src/filesystem/hl_operations/hl_mkdir.js 68:49 error 'fs' is not defined no-undef /puter/packages/backend/src/filesystem/hl_operations/hl_move.js 102:33 error 'get_user' is not defined no-undef 104:35 error 'get_user' is not defined no-undef 110:33 error 'df' is not defined no-undef /puter/packages/backend/src/filesystem/hl_operations/hl_read.js 54:13 error 'stream' is constant no-const-assign /puter/packages/backend/src/filesystem/hl_operations/hl_stat.js 40:37 error 'APIError' is not defined no-undef /puter/packages/backend/src/filesystem/lib/PuterPath.js 67:5 error Expected to return a value in getter 'hasRelativePortion' getter-return /puter/packages/backend/src/filesystem/ll_operations/ll_copy_idea.js 53:21 error 'UploadProgressTracker' is not defined no-undef 73:17 error 'PuterS3StorageStrategy' is not defined no-undef 137:22 error 'LLFilesystemOperation' is not defined no-undef /puter/packages/backend/src/filesystem/ll_operations/ll_read.js 102:65 error 'offset' is not defined no-undef 102:73 error 'offset' is not defined no-undef 102:80 error 'length' is not defined no-undef /puter/packages/backend/src/filesystem/ll_operations/ll_rmnode.js 43:23 error 'APIError' is not defined no-undef /puter/packages/backend/src/filesystem/storage/SystemFSEntryService.js 101:26 error '_path' is not defined no-undef /puter/packages/backend/src/filesystem/validation.js 27:29 error Unexpected control character(s) in regular expression: \x00, \x1f no-control-regex 28:29 error Unexpected control character(s) in regular expression: \x00, \x1f no-control-regex 28:31 error Unnecessary escape character: \/ no-useless-escape --- packages/backend/src/api/filesystem/FlagParam.js | 2 ++ packages/backend/src/api/filesystem/StringParam.js | 2 ++ packages/backend/src/filesystem/FilesystemService.js | 3 +-- packages/backend/src/filesystem/batch/BatchExecutor.js | 2 +- .../backend/src/filesystem/hl_operations/hl_data_read.js | 5 +++++ packages/backend/src/filesystem/hl_operations/hl_mkdir.js | 1 + packages/backend/src/filesystem/hl_operations/hl_move.js | 2 +- packages/backend/src/filesystem/hl_operations/hl_read.js | 2 +- packages/backend/src/filesystem/hl_operations/hl_stat.js | 1 + packages/backend/src/filesystem/lib/PuterPath.js | 4 ---- .../backend/src/filesystem/ll_operations/ll_copy_idea.js | 1 + packages/backend/src/filesystem/ll_operations/ll_read.js | 2 +- packages/backend/src/filesystem/ll_operations/ll_rmnode.js | 1 + .../backend/src/filesystem/storage/SystemFSEntryService.js | 1 + packages/backend/src/filesystem/validation.js | 4 +++- 15 files changed, 22 insertions(+), 11 deletions(-) diff --git a/packages/backend/src/api/filesystem/FlagParam.js b/packages/backend/src/api/filesystem/FlagParam.js index 1a688e113..3ba1b2b1c 100644 --- a/packages/backend/src/api/filesystem/FlagParam.js +++ b/packages/backend/src/api/filesystem/FlagParam.js @@ -16,6 +16,8 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ +const { APIError } = require('../../api/APIError'); + module.exports = class FlagParam { constructor (srckey, options) { this.srckey = srckey; diff --git a/packages/backend/src/api/filesystem/StringParam.js b/packages/backend/src/api/filesystem/StringParam.js index 674f21803..17e46231e 100644 --- a/packages/backend/src/api/filesystem/StringParam.js +++ b/packages/backend/src/api/filesystem/StringParam.js @@ -16,6 +16,8 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ +const { APIError } = require('../../api/APIError'); + module.exports = class StringParam { constructor (srckey, options) { this.srckey = srckey; diff --git a/packages/backend/src/filesystem/FilesystemService.js b/packages/backend/src/filesystem/FilesystemService.js index 3322e07fc..959264d88 100644 --- a/packages/backend/src/filesystem/FilesystemService.js +++ b/packages/backend/src/filesystem/FilesystemService.js @@ -138,7 +138,6 @@ class FilesystemService extends AdvancedBase { return permission.startsWith('fs:'); }, checker: async (actor, permission) => { - debugger; if ( !(actor.type instanceof UserActorType) ) { return undefined; } @@ -363,7 +362,7 @@ class FilesystemService extends AdvancedBase { [new_path, old_path.length + 1, old_path + '%', user_id] ); - const log = services.get('log-service').create('update_child_paths'); + const log = this.services.get('log-service').create('update_child_paths'); log.info(`updated ${old_path} -> ${new_path}`); monitor.end(); diff --git a/packages/backend/src/filesystem/batch/BatchExecutor.js b/packages/backend/src/filesystem/batch/BatchExecutor.js index bf4e6562c..6da8e00bc 100644 --- a/packages/backend/src/filesystem/batch/BatchExecutor.js +++ b/packages/backend/src/filesystem/batch/BatchExecutor.js @@ -118,7 +118,7 @@ class BatchExecutor extends AdvancedBase { alarm: true, }); - e = APIError.adapt(e); + e = APIError.adapt(e); // eslint-disable-line no-ex-assign } // Consume stream if there's a file diff --git a/packages/backend/src/filesystem/hl_operations/hl_data_read.js b/packages/backend/src/filesystem/hl_operations/hl_data_read.js index a942fa346..e19e9530a 100644 --- a/packages/backend/src/filesystem/hl_operations/hl_data_read.js +++ b/packages/backend/src/filesystem/hl_operations/hl_data_read.js @@ -18,6 +18,9 @@ */ const { stream_to_buffer } = require("../../util/streamutil"); const { HLFilesystemOperation } = require("./definitions"); +const { chkperm } = require('../../helpers'); +const { LLRead } = require('../ll_operations/ll_read'); +const { APIError } = require('../../api/APIError'); /** * HLDataRead reads a stream of objects from a file containing structured data. @@ -38,6 +41,7 @@ class HLDataRead extends HLFilesystemOperation { const { fsNode, + version_id, } = this.values; if ( ! await fsNode.exists() ) { @@ -85,6 +89,7 @@ class HLDataRead extends HLFilesystemOperation { } _stream_jsonl_lines_to_objects (stream) { + const { PassThrough } = this.modules.stream; const output_stream = new PassThrough(); (async () => { for await (const line of stream) { diff --git a/packages/backend/src/filesystem/hl_operations/hl_mkdir.js b/packages/backend/src/filesystem/hl_operations/hl_mkdir.js index 86f84ca77..7a3692443 100644 --- a/packages/backend/src/filesystem/hl_operations/hl_mkdir.js +++ b/packages/backend/src/filesystem/hl_operations/hl_mkdir.js @@ -63,6 +63,7 @@ class MkTree extends HLFilesystemOperation { async _run () { const { values, context } = this; + const fs = context.get('services').get('filesystem'); await this.create_branch_({ parent_node: values.parent || await fs.node(new RootNodeSelector()), diff --git a/packages/backend/src/filesystem/hl_operations/hl_move.js b/packages/backend/src/filesystem/hl_operations/hl_move.js index a545f517d..1fd4b801c 100644 --- a/packages/backend/src/filesystem/hl_operations/hl_move.js +++ b/packages/backend/src/filesystem/hl_operations/hl_move.js @@ -17,7 +17,7 @@ * along with this program. If not, see . */ const APIError = require("../../api/APIError"); -const { chkperm, validate_fsentry_name, is_ancestor_of } = require("../../helpers"); +const { chkperm, validate_fsentry_name, is_ancestor_of, df, get_user } = require("../../helpers"); const { LLMove } = require("../ll_operations/ll_move"); const { RootNodeSelector } = require("../node/selectors"); const { HLFilesystemOperation } = require("./definitions"); diff --git a/packages/backend/src/filesystem/hl_operations/hl_read.js b/packages/backend/src/filesystem/hl_operations/hl_read.js index 130b974dd..56de932a8 100644 --- a/packages/backend/src/filesystem/hl_operations/hl_read.js +++ b/packages/backend/src/filesystem/hl_operations/hl_read.js @@ -41,7 +41,7 @@ class HLRead extends HLFilesystemOperation { } const ll_read = new LLRead(); - const stream = await ll_read.run({ + let stream = await ll_read.run({ fsNode, actor, version_id, ...(byte_count !== undefined ? { diff --git a/packages/backend/src/filesystem/hl_operations/hl_stat.js b/packages/backend/src/filesystem/hl_operations/hl_stat.js index ed5d21f1e..a8ea07a3d 100644 --- a/packages/backend/src/filesystem/hl_operations/hl_stat.js +++ b/packages/backend/src/filesystem/hl_operations/hl_stat.js @@ -19,6 +19,7 @@ const { chkperm } = require("../../helpers"); const { Context } = require("../../util/context"); const { HLFilesystemOperation } = require("./definitions"); +const { APIError } = require('../../api/APIError'); class HLStat extends HLFilesystemOperation { static MODULES = { diff --git a/packages/backend/src/filesystem/lib/PuterPath.js b/packages/backend/src/filesystem/lib/PuterPath.js index db12145b2..2d2d676ca 100644 --- a/packages/backend/src/filesystem/lib/PuterPath.js +++ b/packages/backend/src/filesystem/lib/PuterPath.js @@ -64,10 +64,6 @@ class PuterPath { return ! this.isAbsolute(); } - get hasRelativePortion () { - - } - get reference () { if ( this.isAbsolute ) return this.constructor.NULL_UUID; diff --git a/packages/backend/src/filesystem/ll_operations/ll_copy_idea.js b/packages/backend/src/filesystem/ll_operations/ll_copy_idea.js index 3ee21ac92..e3909defe 100644 --- a/packages/backend/src/filesystem/ll_operations/ll_copy_idea.js +++ b/packages/backend/src/filesystem/ll_operations/ll_copy_idea.js @@ -30,6 +30,7 @@ - easier to diagnose stuck operations */ +/* eslint-disable */ const STEPS_COPY_CONTENTS = [ { diff --git a/packages/backend/src/filesystem/ll_operations/ll_read.js b/packages/backend/src/filesystem/ll_operations/ll_read.js index c2279e9c6..a133c74b3 100644 --- a/packages/backend/src/filesystem/ll_operations/ll_read.js +++ b/packages/backend/src/filesystem/ll_operations/ll_read.js @@ -91,7 +91,7 @@ class LLRead extends LLFilesystemOperation { const context = a.iget('context'); const svc_fileCache = context.get('services').get('file-cache'); - const { fsNode } = a.values(); + const { fsNode, offset, length } = a.values(); const maybe_buffer = await svc_fileCache.try_get(fsNode, a.log); if ( maybe_buffer ) { diff --git a/packages/backend/src/filesystem/ll_operations/ll_rmnode.js b/packages/backend/src/filesystem/ll_operations/ll_rmnode.js index cb4d24692..0fa6c11fc 100644 --- a/packages/backend/src/filesystem/ll_operations/ll_rmnode.js +++ b/packages/backend/src/filesystem/ll_operations/ll_rmnode.js @@ -19,6 +19,7 @@ const { Context } = require("../../util/context"); const { ParallelTasks } = require("../../util/otelutil"); const { LLFilesystemOperation } = require("./definitions"); +const { APIError } = require("../../api/APIError"); class LLRmNode extends LLFilesystemOperation { async _run () { diff --git a/packages/backend/src/filesystem/storage/SystemFSEntryService.js b/packages/backend/src/filesystem/storage/SystemFSEntryService.js index e9abb9bae..6cc8ef4b6 100644 --- a/packages/backend/src/filesystem/storage/SystemFSEntryService.js +++ b/packages/backend/src/filesystem/storage/SystemFSEntryService.js @@ -17,6 +17,7 @@ * along with this program. If not, see . */ const { PuterPath } = require("../lib/PuterPath"); +const _path = require('path'); // Redis keys: // ::::: diff --git a/packages/backend/src/filesystem/validation.js b/packages/backend/src/filesystem/validation.js index bec9875a6..a9cf934eb 100644 --- a/packages/backend/src/filesystem/validation.js +++ b/packages/backend/src/filesystem/validation.js @@ -22,10 +22,12 @@ This module contains functions that validate filesystem operations. */ +/* eslint-disable no-control-regex */ + const config = require("../config"); const path_excludes = () => /[\x00-\x1F]/g; -const node_excludes = () => /[\/\x00-\x1F]/g; +const node_excludes = () => /[/\x00-\x1F]/g; // this characters are not allowed in path names because // they might be used to trick the user into thinking From 11f3e29604a6e7801a9a64cd4491a4e9ca48f66b Mon Sep 17 00:00:00 2001 From: Sam Atkins Date: Thu, 25 Apr 2024 16:45:49 +0100 Subject: [PATCH 04/68] chore: Disable eslint checks on puter-js tests These currently work in a way that's different from what eslint expects, so disable it. At some point it would be good if it could check them (and if the tests could run on CI) but right now they just make a lot of noise. --- packages/puter-js/test/fs.test.js | 2 ++ packages/puter-js/test/kv.test.js | 2 ++ 2 files changed, 4 insertions(+) diff --git a/packages/puter-js/test/fs.test.js b/packages/puter-js/test/fs.test.js index ba5887dcb..c194ef381 100644 --- a/packages/puter-js/test/fs.test.js +++ b/packages/puter-js/test/fs.test.js @@ -1,3 +1,5 @@ +/* eslint-disable */ +// TODO: Make these more compatible with eslint naughtyStrings = [ "文件.txt", // Chinese characters "файл.txt", // Cyrillic characters diff --git a/packages/puter-js/test/kv.test.js b/packages/puter-js/test/kv.test.js index 5dad4b4a4..16de6ab37 100644 --- a/packages/puter-js/test/kv.test.js +++ b/packages/puter-js/test/kv.test.js @@ -1,3 +1,5 @@ +/* eslint-disable */ +// TODO: Make these more compatible with eslint window.kvTests = [ testSetKeyWithValue = async function() { try { From 8ab1cd0ca84504455f2d51fd48fedaf2a44b26a2 Mon Sep 17 00:00:00 2001 From: Sam Atkins Date: Thu, 25 Apr 2024 16:51:38 +0100 Subject: [PATCH 05/68] chore: Remove unused 'connective' source files --- packages/backend/src/connective/data_model.js | 25 --------------- packages/backend/src/connective/registry.js | 31 ------------------- 2 files changed, 56 deletions(-) delete mode 100644 packages/backend/src/connective/data_model.js delete mode 100644 packages/backend/src/connective/registry.js diff --git a/packages/backend/src/connective/data_model.js b/packages/backend/src/connective/data_model.js deleted file mode 100644 index eaa8e55bc..000000000 --- a/packages/backend/src/connective/data_model.js +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright (C) 2024 Puter Technologies Inc. - * - * This file is part of Puter. - * - * Puter is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero 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 Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ -{ - registries: { - type: { - description: 'high-level types' - } - } -} diff --git a/packages/backend/src/connective/registry.js b/packages/backend/src/connective/registry.js deleted file mode 100644 index 1e45aa3a9..000000000 --- a/packages/backend/src/connective/registry.js +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (C) 2024 Puter Technologies Inc. - * - * This file is part of Puter. - * - * Puter is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero 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 Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ -class Registry { - constructor() { - this._registry = {}; - } - - put(name, value) { - this._registry[name] = value; - } - - get(name) { - return this._registry[name]; - } -} From 4879ee93bfc912addaacdd676ef496435df1c7c6 Mon Sep 17 00:00:00 2001 From: Sam Atkins Date: Thu, 25 Apr 2024 17:00:05 +0100 Subject: [PATCH 06/68] chore: Fix eslint errors in backend/src/helpers.js /puter/packages/backend/src/helpers.js 682:9 error 'sharing_users' is not defined no-undef 689:12 error 'sharing_users' is not defined no-undef 690:28 error 'sharing_users' is not defined no-undef 695:28 error 'sharing_users' is not defined no-undef 720:9 error 'shared_fsentries' is not defined no-undef 733:12 error 'shared_fsentries' is not defined no-undef 734:28 error 'shared_fsentries' is not defined no-undef 735:17 error 'shared_fsentries' is not defined no-undef 735:58 error 'shared_fsentries' is not defined no-undef 736:31 error 'shared_fsentries' is not defined no-undef 900:57 error 'e' is not defined no-undef 1849:18 error Empty block statement no-empty --- packages/backend/src/helpers.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/backend/src/helpers.js b/packages/backend/src/helpers.js index 2c951ae42..06cabf757 100644 --- a/packages/backend/src/helpers.js +++ b/packages/backend/src/helpers.js @@ -681,7 +681,7 @@ const get_descendants_0 = async (path, user, depth, return_thumbnail = false) => [user.id] ); // users that have shared files/dirs with this user - sharing_users = await db.read( + const sharing_users = await db.read( `SELECT DISTINCT(owner_user_id), user.username FROM share INNER JOIN user ON user.id = share.owner_user_id @@ -719,7 +719,7 @@ const get_descendants_0 = async (path, user, depth, return_thumbnail = false) => return []; // shared files/dirs with this user - shared_fsentries = await db.read( + const shared_fsentries = await db.read( `SELECT fsentries.id, fsentries.user_id, fsentries.uuid, fsentries.parent_uid, fsentries.bucket, fsentries.bucket_region, fsentries.name, fsentries.shortcut_to, fsentries.is_shortcut, fsentries.metadata, fsentries.is_dir, fsentries.modified, @@ -899,7 +899,7 @@ const get_descendants = async (...args) => { if ( ! result || ! result[0] ) { errors.report('id2path.select', { alarm: true, - message: `no result for ${entry_uid}: ${e.message}`, + message: `no result for ${entry_uid}`, extra: { entry_uid, } @@ -953,12 +953,12 @@ function cp(source_path, dest_path, user, overwrite, change_name, check_perms = throw new Error(`legacy copy function called`); } -isString = function (variable) { +function isString(variable) { return typeof variable === 'string' || variable instanceof String; } // checks to see if given variable is an object -isObject = function (variable) { +function isObject(variable) { return variable !== null && typeof variable === 'object'; } @@ -1809,7 +1809,7 @@ async function get_taskbar_items(user) { try { taskbar_items_from_db = JSON.parse(user.taskbar_items); }catch(e){ - + // ignore errors } } From b4af28a91bfd29cf008da1c194bfd05fedabb502 Mon Sep 17 00:00:00 2001 From: Sam Atkins Date: Thu, 25 Apr 2024 17:05:28 +0100 Subject: [PATCH 07/68] chore: Miscellaneous eslint fixes /puter/packages/backend/src/om/entitystorage/ValidationES.js 89:25 error Do not assign to the exception parameter no-ex-assign /puter/packages/backend/src/om/proptypes/__all__.js 166:17 warning Unexpected 'debugger' statement no-debugger /puter/packages/backend/src/routers/_default.js 405:31 error 'err' is not defined no-undef --- packages/backend/src/om/entitystorage/ValidationES.js | 1 + packages/backend/src/om/proptypes/__all__.js | 2 +- packages/backend/src/routers/_default.js | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/backend/src/om/entitystorage/ValidationES.js b/packages/backend/src/om/entitystorage/ValidationES.js index a624ac6ee..affe7e446 100644 --- a/packages/backend/src/om/entitystorage/ValidationES.js +++ b/packages/backend/src/om/entitystorage/ValidationES.js @@ -86,6 +86,7 @@ class ValidationES extends BaseES { } catch ( e ) { if ( ! (e instanceof APIError) ) { console.log('THIS IS HAPPENING', e); + // eslint-disable-next-line no-ex-assign e = APIError.create('field_invalid', null, { key: prop.name, converted_from_another_error: true, diff --git a/packages/backend/src/om/proptypes/__all__.js b/packages/backend/src/om/proptypes/__all__.js index e57b66edb..231d75000 100644 --- a/packages/backend/src/om/proptypes/__all__.js +++ b/packages/backend/src/om/proptypes/__all__.js @@ -163,7 +163,7 @@ module.exports = { }, async adapt (value, { descriptor }) { if ( descriptor.debug ) { - debugger; + debugger; // eslint-disable-line no-debugger } if ( ! descriptor.service ) return value; if ( ! value ) return null; diff --git a/packages/backend/src/routers/_default.js b/packages/backend/src/routers/_default.js index d8ef7ec49..ff95a02aa 100644 --- a/packages/backend/src/routers/_default.js +++ b/packages/backend/src/routers/_default.js @@ -402,7 +402,7 @@ router.all('*', async function(req, res, next) { }); } catch (e) { console.error('error from sendFile', e); - return res.status(err.statusCode).send('Error /apps/') + return res.status(e.statusCode).send('Error /apps/') } } // -------------------------------------- From 0c0846eef9e890da2bf16df80ed7e314b4a0dff2 Mon Sep 17 00:00:00 2001 From: Sam Atkins Date: Thu, 25 Apr 2024 17:26:27 +0100 Subject: [PATCH 08/68] chore: Fix some backend router eslint issues /puter/packages/backend/src/routers/auth/list-permissions.js 36:15 error 'APIError' is not defined no-undef /puter/packages/backend/src/routers/auth/list-sessions.js 17:15 error 'APIError' is not defined no-undef /puter/packages/backend/src/routers/auth/revoke-user-app.js 34:15 error 'APIError' is not defined no-undef 43:15 error 'APIError' is not defined no-undef /puter/packages/backend/src/routers/delete-site.js 43:11 error Unexpected empty object pattern no-empty-pattern /puter/packages/backend/src/routers/drivers/usage.js 146:11 error 'k' is not defined no-undef 147:21 error 'k' is not defined no-undef 147:52 error 'k' is not defined no-undef /puter/packages/backend/src/routers/drivers/xd.js 68:5 error 'window' is not defined no-undef 69:21 error Parsing error: The keyword 'interface' is reserved /puter/packages/backend/src/routers/filesystem_api/batch/all.js 51:21 error 'get_app' is not defined no-undef 224:13 error Unexpected constant condition no-constant-condition /puter/packages/backend/src/routers/filesystem_api/copy.js 70:10 error Unexpected constant condition no-constant-condition 106:13 error Duplicate key 'new_name' no-dupe-keys /puter/packages/backend/src/routers/filesystem_api/read.js 80:5 error Unreachable code no-unreachable /puter/packages/backend/src/routers/filesystem_api/token-read.js 53:9 error Unreachable code no-unreachable 58:9 error Unreachable code no-unreachable 104:5 error Unreachable code no-unreachable /puter/packages/backend/src/routers/hosting/puter-site.js 65:21 error Unexpected constant nullishness on the left-hand side of a `??` expression no-constant-binary-expression --- .../src/routers/auth/list-permissions.js | 1 + .../backend/src/routers/auth/list-sessions.js | 1 + .../src/routers/auth/revoke-user-app.js | 1 + packages/backend/src/routers/delete-site.js | 1 - packages/backend/src/routers/drivers/usage.js | 2 +- packages/backend/src/routers/drivers/xd.js | 7 +++--- .../src/routers/filesystem_api/batch/all.js | 23 +------------------ .../src/routers/filesystem_api/copy.js | 13 ----------- .../src/routers/filesystem_api/read.js | 11 --------- .../src/routers/filesystem_api/token-read.js | 13 ----------- .../backend/src/routers/hosting/puter-site.js | 2 +- 11 files changed, 10 insertions(+), 65 deletions(-) diff --git a/packages/backend/src/routers/auth/list-permissions.js b/packages/backend/src/routers/auth/list-permissions.js index 486b509a6..096ba23c0 100644 --- a/packages/backend/src/routers/auth/list-permissions.js +++ b/packages/backend/src/routers/auth/list-permissions.js @@ -21,6 +21,7 @@ const { get_app, get_user } = require("../../helpers"); const { UserActorType } = require("../../services/auth/Actor"); const { DB_READ } = require("../../services/database/consts"); const { Context } = require("../../util/context"); +const { APIError } = require('../../api/APIError'); module.exports = eggspress('/auth/list-permissions', { subdomain: 'api', diff --git a/packages/backend/src/routers/auth/list-sessions.js b/packages/backend/src/routers/auth/list-sessions.js index a163c78c7..9d4992c08 100644 --- a/packages/backend/src/routers/auth/list-sessions.js +++ b/packages/backend/src/routers/auth/list-sessions.js @@ -1,6 +1,7 @@ const eggspress = require("../../api/eggspress"); const { UserActorType } = require("../../services/auth/Actor"); const { Context } = require("../../util/context"); +const { APIError } = require('../../api/APIError'); module.exports = eggspress('/auth/list-sessions', { subdomain: 'api', diff --git a/packages/backend/src/routers/auth/revoke-user-app.js b/packages/backend/src/routers/auth/revoke-user-app.js index 00d81b38c..7087b9766 100644 --- a/packages/backend/src/routers/auth/revoke-user-app.js +++ b/packages/backend/src/routers/auth/revoke-user-app.js @@ -19,6 +19,7 @@ const eggspress = require("../../api/eggspress"); const { UserActorType } = require("../../services/auth/Actor"); const { Context } = require("../../util/context"); +const { APIError } = require('../../api/APIError'); module.exports = eggspress('/auth/revoke-user-app', { subdomain: 'api', diff --git a/packages/backend/src/routers/delete-site.js b/packages/backend/src/routers/delete-site.js index 66ce2f297..fc152e1f6 100644 --- a/packages/backend/src/routers/delete-site.js +++ b/packages/backend/src/routers/delete-site.js @@ -40,7 +40,6 @@ router.post('/delete-site', auth, express.json(), async (req, res, next)=>{ return res.status(400).send('site_uuid is required') // modules - const {} = require('../helpers'); const db = req.services.get('database').get(DB_WRITE, 'subdomains:legacy'); await db.write( diff --git a/packages/backend/src/routers/drivers/usage.js b/packages/backend/src/routers/drivers/usage.js index 67fab56b2..5d53f7bbd 100644 --- a/packages/backend/src/routers/drivers/usage.js +++ b/packages/backend/src/routers/drivers/usage.js @@ -143,7 +143,7 @@ module.exports = eggspress('/drivers/usage', { // usages.apps.push(usage); } - for ( k in usages.apps ) { + for ( const k in usages.apps ) { usages.apps[k] = Object.values(usages.apps[k]); } diff --git a/packages/backend/src/routers/drivers/xd.js b/packages/backend/src/routers/drivers/xd.js index e413fefb1..cf08d44a1 100644 --- a/packages/backend/src/routers/drivers/xd.js +++ b/packages/backend/src/routers/drivers/xd.js @@ -65,8 +65,9 @@ const script = async function script () { return await response.json(); }; + /* global window */ window.addEventListener('message', async event => { - const { id, interface, method, params } = event.data; + const { id, interface: interface_, method, params } = event.data; let has_file = false; for ( const k in params ) { if ( params[k] instanceof File ) { @@ -75,11 +76,11 @@ const script = async function script () { } } const result = has_file ? await fcall({ - interface_name: interface, + interface_name: interface_, method_name: method, params, }) : await call({ - interface_name: interface, + interface_name: interface_, method_name: method, params, }); diff --git a/packages/backend/src/routers/filesystem_api/batch/all.js b/packages/backend/src/routers/filesystem_api/batch/all.js index ed4c6b584..f09b6d45f 100644 --- a/packages/backend/src/routers/filesystem_api/batch/all.js +++ b/packages/backend/src/routers/filesystem_api/batch/all.js @@ -26,6 +26,7 @@ const Busboy = require('busboy'); const { BatchExecutor } = require("../../../filesystem/batch/BatchExecutor"); const { TeePromise } = require("../../../util/promise"); const { EWMA, MovingMode } = require("../../../util/opmath"); +const { get_app } = require('../../../helpers'); const commands = require('../../../filesystem/batch/commands.js').commands; @@ -221,28 +222,6 @@ module.exports = eggspress('/batch', { let ps = []; busboy.on('file', async (fieldname, stream, detais) => { - if (false) { - ended[i] = false; - ps[i] = new TeePromise(); - const this_i = i; - stream.on('end', () => { - ps[this_i].resolve(); - ended[this_i] = true; - batch_widget.ec++; - }); - if ( i > 0 ) { - if ( ! ended[i-1] ) { - batch_widget.sc++; - // stream.pause(); - batch_widget.wc++; - await Promise.all(Array(i).fill(0).map((_, j) => ps[j])); - batch_widget.wc--; - // stream.resume(); - } - } - i++; - } - if ( batch_exe.total_tbd ) { batch_exe.total_tbd = false; batch_widget.ic = pending_operations.length; diff --git a/packages/backend/src/routers/filesystem_api/copy.js b/packages/backend/src/routers/filesystem_api/copy.js index bc070cc6a..9860c0f1d 100644 --- a/packages/backend/src/routers/filesystem_api/copy.js +++ b/packages/backend/src/routers/filesystem_api/copy.js @@ -66,18 +66,6 @@ module.exports = eggspress('/copy', { x.set(operationTraceSvc.ckey('frame'), frame); } - // TEMP: Testing copy with its own sql queue - if ( false ) { - const x = Context.get(); - const svc = new ProxyContainer(x.get('services')); - const s = new DatabaseFSEntryService({ - services: x.get('services'), - label: 'Copy-DatabaseFSEntryService', - }); - svc.set('systemFSEntryService', s); - x.set('services', svc); - } - const log = req.services.get('log-service').create('copy'); const filesystem = req.services.get('filesystem'); @@ -103,7 +91,6 @@ module.exports = eggspress('/copy', { source: req.values.source, new_name: req.body.new_name, - new_name: req.body.new_name, overwrite: req.body.overwrite ?? false, dedupe_name, diff --git a/packages/backend/src/routers/filesystem_api/read.js b/packages/backend/src/routers/filesystem_api/read.js index 8536f5520..320d2026c 100644 --- a/packages/backend/src/routers/filesystem_api/read.js +++ b/packages/backend/src/routers/filesystem_api/read.js @@ -74,15 +74,4 @@ module.exports = eggspress('/read', { res.set('Content-Type', 'application/octet-stream'); stream.pipe(res); - - return; - - const filesystem = req.services.get('filesystem'); - await filesystem.read(req.fs, res, { - ...req.values, - user: req.user, - version_id: req.query.version_id, - line_count, - byte_count, - }); }); diff --git a/packages/backend/src/routers/filesystem_api/token-read.js b/packages/backend/src/routers/filesystem_api/token-read.js index 2da57f73b..d00be92e4 100644 --- a/packages/backend/src/routers/filesystem_api/token-read.js +++ b/packages/backend/src/routers/filesystem_api/token-read.js @@ -49,12 +49,10 @@ module.exports = eggspress('/token-read', { const actor = await svc_auth.authenticate_from_token(access_jwt); if ( ! actor ) { - throw new Error('A'); throw APIError.create('token_auth_failed'); } if ( ! (actor.type instanceof AccessTokenActorType) ) { - throw new Error('B'); throw APIError.create('token_auth_failed'); } @@ -98,16 +96,5 @@ module.exports = eggspress('/token-read', { res.setHeader('Content-Type', mime_type); stream.pipe(res); - - return; - - const filesystem = req.services.get('filesystem'); - await filesystem.read(req.fs, res, { - ...req.values, - user: req.user, - version_id: req.query.version_id, - line_count, - byte_count, - }); }); diff --git a/packages/backend/src/routers/hosting/puter-site.js b/packages/backend/src/routers/hosting/puter-site.js index 1a59e645e..fab6ba458 100644 --- a/packages/backend/src/routers/hosting/puter-site.js +++ b/packages/backend/src/routers/hosting/puter-site.js @@ -62,7 +62,7 @@ class PuterSiteMiddleware extends AdvancedBase { req.subdomains[0] === 'devtest' ? 'devtest' : req.hostname.slice(0, -1 * (config.static_hosting_domain.length + 1)); - let path = (req.baseUrl + req.path) ?? 'index.html'; + let path = (req.baseUrl + req.path) || 'index.html'; const context = Context.get(); const services = context.get('services'); From ca3f9a823d8d4c609e4468701048b2dc81d7ae84 Mon Sep 17 00:00:00 2001 From: Sam Atkins Date: Thu, 25 Apr 2024 17:53:30 +0100 Subject: [PATCH 09/68] chore: Fix some eslint issues in routers /puter/packages/backend/src/routers/open_item.js 48:10 error Unexpected negating the left operand of 'instanceof' operator no-unsafe-negation /puter/packages/backend/src/routers/save_account.js 106:34 error 'get_user' is not defined no-undef /puter/packages/backend/src/routers/sign.js 37:10 error Unexpected negating the left operand of 'instanceof' operator no-unsafe-negation --- packages/backend/src/routers/open_item.js | 2 +- packages/backend/src/routers/save_account.js | 2 +- packages/backend/src/routers/sign.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/backend/src/routers/open_item.js b/packages/backend/src/routers/open_item.js index b4d0599d0..cdd94f863 100644 --- a/packages/backend/src/routers/open_item.js +++ b/packages/backend/src/routers/open_item.js @@ -45,7 +45,7 @@ module.exports = eggspress('/open_item', { const subject = req.values.subject; const actor = Context.get('actor'); - if ( ! actor.type instanceof UserActorType ) { + if ( ! (actor.type instanceof UserActorType) ) { throw APIError.create('forbidden'); } diff --git a/packages/backend/src/routers/save_account.js b/packages/backend/src/routers/save_account.js index 67876fbfb..de58daf3c 100644 --- a/packages/backend/src/routers/save_account.js +++ b/packages/backend/src/routers/save_account.js @@ -19,7 +19,7 @@ "use strict" const express = require('express'); const router = new express.Router(); -const {get_taskbar_items, username_exists, send_email_verification_code, send_email_verification_token, invalidate_cached_user} = require('../helpers'); +const {get_taskbar_items, username_exists, send_email_verification_code, send_email_verification_token, invalidate_cached_user, get_user } = require('../helpers'); const auth = require('../middleware/auth.js'); const config = require('../config'); const { Context } = require('../util/context'); diff --git a/packages/backend/src/routers/sign.js b/packages/backend/src/routers/sign.js index 9a8d6aa58..2e6330ca9 100644 --- a/packages/backend/src/routers/sign.js +++ b/packages/backend/src/routers/sign.js @@ -34,7 +34,7 @@ module.exports = eggspress('/sign', { allowedMethods: ['POST'], }, async (req, res, next)=>{ const actor = Context.get('actor'); - if ( ! actor.type instanceof UserActorType ) { + if ( ! (actor.type instanceof UserActorType) ) { throw APIError.create('forbidden'); } From 60523dc7a72693b650b21cd1fddd4320e1bcd931 Mon Sep 17 00:00:00 2001 From: Sam Atkins Date: Thu, 25 Apr 2024 18:08:13 +0100 Subject: [PATCH 10/68] chore: Fix some eslint issues in services /puter/packages/backend/src/services/ContextInitService.js 57:18 error 'async_factory' is not defined no-undef /puter/packages/backend/src/services/StorageService.js 22:5 error Expected to call 'super()' constructor-super /puter/packages/backend/src/services/WebServerService.js 258:35 error 'services' is not defined no-undef /puter/packages/backend/src/services/auth/AuthService.js 52:13 error Unreachable code no-unreachable /puter/packages/backend/src/services/drivers/implementations/BaseImplementation.js 64:25 error 'services' is not defined no-undef 75:39 error 'services' is not defined no-undef 117:39 error 'services' is not defined no-undef 123:42 error 'services' is not defined no-undef 149:42 error 'services' is not defined no-undef 168:38 error 'services' is not defined no-undef /puter/packages/backend/src/services/drivers/implementations/PuterDriverProxy.js 43:5 error Expected to call 'super()' constructor-super 44:9 error 'this' is not allowed before 'super()' no-this-before-super /puter/packages/backend/src/services/drivers/meta/Construct.js 125:9 error Unreachable code no-unreachable /puter/packages/backend/src/services/runtime-analysis/PagerService.js 49:41 error 'util' is not defined no-undef --- .../src/services/ContextInitService.js | 2 +- .../backend/src/services/StorageService.js | 1 + .../backend/src/services/WebServerService.js | 2 +- .../backend/src/services/auth/AuthService.js | 21 ------------------- .../implementations/BaseImplementation.js | 1 + .../implementations/PuterDriverProxy.js | 1 + .../src/services/drivers/meta/Construct.js | 4 ---- .../services/runtime-analysis/PagerService.js | 1 + 8 files changed, 6 insertions(+), 27 deletions(-) diff --git a/packages/backend/src/services/ContextInitService.js b/packages/backend/src/services/ContextInitService.js index ac30cfb3b..3267d8819 100644 --- a/packages/backend/src/services/ContextInitService.js +++ b/packages/backend/src/services/ContextInitService.js @@ -52,7 +52,7 @@ class ContextInitService extends BaseService { key, value, }); } - register_async_factory (key, factory) { + register_async_factory (key, async_factory) { this.mw.register_initializer({ key, async_factory, }); diff --git a/packages/backend/src/services/StorageService.js b/packages/backend/src/services/StorageService.js index 8e67d3e48..c10f98125 100644 --- a/packages/backend/src/services/StorageService.js +++ b/packages/backend/src/services/StorageService.js @@ -20,6 +20,7 @@ const { AdvancedBase } = require("@heyputer/puter-js-common"); class StorageService extends AdvancedBase { constructor ({ services }) { + super(services); // } } \ No newline at end of file diff --git a/packages/backend/src/services/WebServerService.js b/packages/backend/src/services/WebServerService.js index 76db5cd1a..597c3fa73 100644 --- a/packages/backend/src/services/WebServerService.js +++ b/packages/backend/src/services/WebServerService.js @@ -255,7 +255,7 @@ class WebServerService extends BaseService { onFinished(res, () => { if ( res.statusCode !== 500 ) return; if ( req.__error_handled ) return; - const alarm = services.get('alarm'); + const alarm = this.services.get('alarm'); alarm.create('responded-500', 'server sent a 500 response', { error: req.__error_source, url: req.url, diff --git a/packages/backend/src/services/auth/AuthService.js b/packages/backend/src/services/auth/AuthService.js index 5df6fd187..b6d282317 100644 --- a/packages/backend/src/services/auth/AuthService.js +++ b/packages/backend/src/services/auth/AuthService.js @@ -55,27 +55,6 @@ class AuthService extends BaseService { if ( ! decoded.hasOwnProperty('type') ) { throw new LegacyTokenError(); - const user = await this.db.requireRead( - "SELECT * FROM `user` WHERE `uuid` = ? LIMIT 1", - [decoded.uuid], - ); - - if ( ! user[0] ) { - throw APIError.create('token_auth_failed'); - } - - if ( user[0].suspended ) { - throw APIError.create('account_suspended'); - } - - const actor_type = new UserActorType({ - user: user[0], - }); - - return new Actor({ - user_uid: decoded.uuid, - type: actor_type, - }); } if ( decoded.type === 'session' ) { diff --git a/packages/backend/src/services/drivers/implementations/BaseImplementation.js b/packages/backend/src/services/drivers/implementations/BaseImplementation.js index a7797f942..af1a5ac94 100644 --- a/packages/backend/src/services/drivers/implementations/BaseImplementation.js +++ b/packages/backend/src/services/drivers/implementations/BaseImplementation.js @@ -60,6 +60,7 @@ class BaseImplementation extends AdvancedBase { async _sla_enforcement (method) { const context = Context.get(); + const services = context.get('services'); const method_key = `${this.constructor.ID}:${method}`; const svc_sla = services.get('sla'); diff --git a/packages/backend/src/services/drivers/implementations/PuterDriverProxy.js b/packages/backend/src/services/drivers/implementations/PuterDriverProxy.js index a3f72920a..422bdc9d7 100644 --- a/packages/backend/src/services/drivers/implementations/PuterDriverProxy.js +++ b/packages/backend/src/services/drivers/implementations/PuterDriverProxy.js @@ -41,6 +41,7 @@ class PuterDriverProxy extends AdvancedBase { } constructor ({ target }) { + super(); this.target = target; } diff --git a/packages/backend/src/services/drivers/meta/Construct.js b/packages/backend/src/services/drivers/meta/Construct.js index b073745e5..57f8cf93d 100644 --- a/packages/backend/src/services/drivers/meta/Construct.js +++ b/packages/backend/src/services/drivers/meta/Construct.js @@ -119,10 +119,6 @@ class TypeSpec extends BasicBase { equals (other) { return this.raw.$ === other.raw.$; - // for ( k in this.raw ) { - // if ( this.raw[k] !== other.raw[k] ) return false; - // } - return true; } toString () { diff --git a/packages/backend/src/services/runtime-analysis/PagerService.js b/packages/backend/src/services/runtime-analysis/PagerService.js index ccdc304f3..82d98a37b 100644 --- a/packages/backend/src/services/runtime-analysis/PagerService.js +++ b/packages/backend/src/services/runtime-analysis/PagerService.js @@ -18,6 +18,7 @@ */ const pdjs = require('@pagerduty/pdjs'); const BaseService = require('../BaseService'); +const util = require('util'); class PagerService extends BaseService { async _construct () { From 9b3dd6b7539f8db47bafc5ba10885126979e0a97 Mon Sep 17 00:00:00 2001 From: Sam Atkins Date: Thu, 25 Apr 2024 18:14:08 +0100 Subject: [PATCH 11/68] chore: Fix eslint issues in backend util /puter/packages/backend/src/util/stdioutil.js 26:24 error Unexpected control character(s) in regular expression: \x1b no-control-regex /puter/packages/backend/src/util/streamutil.js 368:1 error 'string_to_stream' is not defined no-undef 463:5 error 'string_to_stream' is not defined no-undef /puter/packages/backend/src/util/strutil.js 42:1 error 'format_as_usd' is not defined no-undef 56:5 error 'format_as_usd' is not defined no-undef --- packages/backend/src/util/stdioutil.js | 1 + packages/backend/src/util/streamutil.js | 2 +- packages/backend/src/util/strutil.js | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/backend/src/util/stdioutil.js b/packages/backend/src/util/stdioutil.js index 1cfd99db0..c8abb4b45 100644 --- a/packages/backend/src/util/stdioutil.js +++ b/packages/backend/src/util/stdioutil.js @@ -23,6 +23,7 @@ * @param {*} str */ const visible_length = (str) => { + // eslint-disable-next-line no-control-regex return str.replace(/\x1b\[[0-9;]*m/g, '').length; }; diff --git a/packages/backend/src/util/streamutil.js b/packages/backend/src/util/streamutil.js index d6b2596a7..bd0e92dcb 100644 --- a/packages/backend/src/util/streamutil.js +++ b/packages/backend/src/util/streamutil.js @@ -365,7 +365,7 @@ const stuck_detector_stream = (source, { return stream; } -string_to_stream = (str, chunk_size) => { +const string_to_stream = (str, chunk_size) => { const s = new Readable(); s._read = () => {}; // redundant? see update below // split string into chunks diff --git a/packages/backend/src/util/strutil.js b/packages/backend/src/util/strutil.js index c520836e6..4701fc475 100644 --- a/packages/backend/src/util/strutil.js +++ b/packages/backend/src/util/strutil.js @@ -39,7 +39,7 @@ const osclink = (url, text) => { return `\x1B]8;;${url}\x1B\\${text}\x1B]8;;\x1B\\`; } -format_as_usd = (amount) => { +const format_as_usd = (amount) => { if ( amount < 0.01 ) { if ( amount < 0.00001 ) { // scientific notation From 01ab6b88ea99e9e4641975db54ae8426e5c9904f Mon Sep 17 00:00:00 2001 From: Sam Atkins Date: Wed, 1 May 2024 10:38:33 +0100 Subject: [PATCH 12/68] chore: Remove unused uses of uuid_user in save_account.js The variable doesn't exist, and we never use it after this. Seems like a copy-paste error. Solves these eslint errors: /puter/packages/backend/src/routers/save_account.js 90:9 error 'uuid_user' is not defined no-undef 91:9 error 'uuid_user' is not defined no-undef 91:21 error 'uuid_user' is not defined no-undef --- packages/backend/src/routers/save_account.js | 5 ----- 1 file changed, 5 deletions(-) diff --git a/packages/backend/src/routers/save_account.js b/packages/backend/src/routers/save_account.js index de58daf3c..d28c52f1e 100644 --- a/packages/backend/src/routers/save_account.js +++ b/packages/backend/src/routers/save_account.js @@ -85,11 +85,6 @@ router.post('/save_account', auth, express.json(), async (req, res, next)=>{ // get pseudo user, if exists let pseudo_user = await db.read(`SELECT * FROM user WHERE email = ? AND password IS NULL`, [req.body.email]); pseudo_user = pseudo_user[0]; - // get uuid user, if exists - if(req.body.uuid){ - uuid_user = await db.read(`SELECT * FROM user WHERE uuid = ? LIMIT 1`, [req.body.uuid]); - uuid_user = uuid_user[0]; - } // send_confirmation_code req.body.send_confirmation_code = req.body.send_confirmation_code ?? true; From 0df0de6507d6b283c3f656a7dda4f00df07c12da Mon Sep 17 00:00:00 2001 From: Sam Atkins Date: Wed, 1 May 2024 10:47:58 +0100 Subject: [PATCH 13/68] chore: Define def() and defv() using const Fixes these eslint issues: /puter/packages/backend/src/services/auth/TokenService.js 3:1 error 'def' is not defined no-undef 18:1 error 'defv' is not defined no-undef 61:11 error 'def' is not defined no-undef 69:21 error 'defv' is not defined no-undef --- packages/backend/src/services/auth/TokenService.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/backend/src/services/auth/TokenService.js b/packages/backend/src/services/auth/TokenService.js index 1dda5ff1b..f3febad10 100644 --- a/packages/backend/src/services/auth/TokenService.js +++ b/packages/backend/src/services/auth/TokenService.js @@ -1,6 +1,6 @@ const BaseService = require("../BaseService"); -def = o => { +const def = o => { for ( let k in o ) { if ( typeof o[k] === 'string' ) { o[k] = { short: o[k] }; @@ -15,7 +15,7 @@ def = o => { }; } -defv = o => { +const defv = o => { return { to_short: o, to_long: Object.keys(o).reduce((acc, key) => { From 2094e05a2ef3ac1759ffacf008f5e05a894883bb Mon Sep 17 00:00:00 2001 From: Sam Atkins Date: Wed, 1 May 2024 10:50:14 +0100 Subject: [PATCH 14/68] chore: Comment out unreachable code in ExpectationService The `return` looks temporary but I don't know this code well enough. Solves this eslint issue: /puter/packages/backend/src/services/runtime-analysis/ExpectationService.js 94:9 error Unreachable code no-unreachable --- .../services/runtime-analysis/ExpectationService.js | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/packages/backend/src/services/runtime-analysis/ExpectationService.js b/packages/backend/src/services/runtime-analysis/ExpectationService.js index df24dc2d3..fc1070e09 100644 --- a/packages/backend/src/services/runtime-analysis/ExpectationService.js +++ b/packages/backend/src/services/runtime-analysis/ExpectationService.js @@ -91,12 +91,13 @@ class ExpectationService extends BaseService { purgeExpectations_ () { return; - for ( let i=0 ; i < this.expectations_.length ; i++ ) { - if ( this.expectations_[i].check() ) { - this.expectations_[i] = null; - } - } - this.expectations_ = this.expectations_.filter(v => v !== null); + // TODO: Re-enable this + // for ( let i=0 ; i < this.expectations_.length ; i++ ) { + // if ( this.expectations_[i].check() ) { + // this.expectations_[i] = null; + // } + // } + // this.expectations_ = this.expectations_.filter(v => v !== null); } expect_eventually ({ workUnit, checkpoint }) { From 64c886bfebf3f1a8c81ee9dab757f4b9ad49fce4 Mon Sep 17 00:00:00 2001 From: Sam Atkins Date: Wed, 1 May 2024 10:51:29 +0100 Subject: [PATCH 15/68] chore: Clarify setter to not return a value Solves this eslint issue: /puter/packages/phoenix/src/ansi-shell/ANSIShell.js 86:23 error Setter cannot return a value no-setter-return --- packages/phoenix/src/ansi-shell/ANSIShell.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/phoenix/src/ansi-shell/ANSIShell.js b/packages/phoenix/src/ansi-shell/ANSIShell.js index 0eb151e8c..68f260a48 100644 --- a/packages/phoenix/src/ansi-shell/ANSIShell.js +++ b/packages/phoenix/src/ansi-shell/ANSIShell.js @@ -83,7 +83,7 @@ export class ANSIShell extends EventTarget { Object.defineProperty(this.env, 'PWD', { enumerable: true, get: () => this.variables.pwd, - set: v => this.variables.pwd = v + set: v => { this.variables.pwd = v } }) Object.defineProperty(this.env, 'ROWS', { enumerable: true, From d4c2b492ef4864804776d3cb7d24797fdc536886 Mon Sep 17 00:00:00 2001 From: Sam Atkins Date: Wed, 1 May 2024 10:52:56 +0100 Subject: [PATCH 16/68] fix: Correct inverted instanceof check in SignalReader.read() Also make tmp_value non-const because it gets modified later. Solves these eslint issues: /puter/packages/phoenix/src/ansi-shell/ioutil/SignalReader.js 45:14 error Unexpected negating the left operand of 'instanceof' operator no-unsafe-negation 46:13 error 'tmp_value' is constant no-const-assign --- packages/phoenix/src/ansi-shell/ioutil/SignalReader.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/phoenix/src/ansi-shell/ioutil/SignalReader.js b/packages/phoenix/src/ansi-shell/ioutil/SignalReader.js index b7eafc86e..17ea234b5 100644 --- a/packages/phoenix/src/ansi-shell/ioutil/SignalReader.js +++ b/packages/phoenix/src/ansi-shell/ioutil/SignalReader.js @@ -40,9 +40,9 @@ export class SignalReader extends ProxyReader { return { value, done }; } - const tmp_value = value; + let tmp_value = value; - if ( ! tmp_value instanceof Uint8Array ) { + if ( ! (tmp_value instanceof Uint8Array) ) { tmp_value = encoder.encode(value); } From 6d895dff42d851f5d4b517d6eaa6f12340255bb6 Mon Sep 17 00:00:00 2001 From: Sam Atkins Date: Wed, 1 May 2024 10:58:23 +0100 Subject: [PATCH 17/68] chore: Remove empty block statement Resolves this eslint issue: /puter/packages/phoenix/src/ansi-shell/parsing/PuterShellParser.js 25:9 error Empty block statement no-empty --- packages/phoenix/src/ansi-shell/parsing/PuterShellParser.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/packages/phoenix/src/ansi-shell/parsing/PuterShellParser.js b/packages/phoenix/src/ansi-shell/parsing/PuterShellParser.js index 8dc2626c9..3c87dbf89 100644 --- a/packages/phoenix/src/ansi-shell/parsing/PuterShellParser.js +++ b/packages/phoenix/src/ansi-shell/parsing/PuterShellParser.js @@ -21,10 +21,7 @@ import { buildParserFirstHalf } from "./buildParserFirstHalf.js"; import { buildParserSecondHalf } from "./buildParserSecondHalf.js"; export class PuterShellParser { - constructor () { - { - } - } + constructor () {} parseLineForSyntax () {} parseLineForProcessing (input) { const sp = new StrataParser(); From 50d75cd2f9c4517683d44ab07dc13deb56a5004d Mon Sep 17 00:00:00 2001 From: Sam Atkins Date: Wed, 1 May 2024 11:08:06 +0100 Subject: [PATCH 18/68] refactor: Make loop condition non-constant Resolves this eslint issue: /puter/packages/phoenix/src/ansi-shell/readline/readline.js 154:33 error Unexpected constant condition no-constant-condition --- packages/phoenix/src/ansi-shell/readline/readline.js | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/packages/phoenix/src/ansi-shell/readline/readline.js b/packages/phoenix/src/ansi-shell/readline/readline.js index 0a9c04901..0d1b83268 100644 --- a/packages/phoenix/src/ansi-shell/readline/readline.js +++ b/packages/phoenix/src/ansi-shell/readline/readline.js @@ -151,11 +151,7 @@ const ReadlineProcessorBuilder = builder => builder if ( completions.length > 1 ) { let inCommon = ''; - for ( let i=0 ; true ; i++ ) { - if ( ! completions.every(completion => { - return completion.length > i; - }) ) break; - + for ( let i=0 ; completions.every(completion => completion.length > i) ; i++ ) { let matches = true; const chrFirst = completions[0][i]; From 6ad8f5e06abd050d319271f818d72debf5bc8e44 Mon Sep 17 00:00:00 2001 From: Sam Atkins Date: Wed, 1 May 2024 11:10:20 +0100 Subject: [PATCH 19/68] fix: Parse octal echo escapes Found by this eslint issue: /puter/packages/phoenix/src/puter-shell/coreutils/coreutil_lib/echo_escapes.js 107:59 error 'hexchars' is not defined no-undef --- .../src/puter-shell/coreutils/coreutil_lib/echo_escapes.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/phoenix/src/puter-shell/coreutils/coreutil_lib/echo_escapes.js b/packages/phoenix/src/puter-shell/coreutils/coreutil_lib/echo_escapes.js index c084d7230..8bcc0be1b 100644 --- a/packages/phoenix/src/puter-shell/coreutils/coreutil_lib/echo_escapes.js +++ b/packages/phoenix/src/puter-shell/coreutils/coreutil_lib/echo_escapes.js @@ -104,7 +104,7 @@ const echo_escapes = { caller.output(NUL); return; } - caller.output(String.fromCharCode(Number.parseInt(hexchars, 8))); + caller.output(String.fromCharCode(Number.parseInt(octchars, 8))); }, '\\': caller => caller.output('\\'), }; From 71f8afab9ae162c4aace18332ef2088884580a4f Mon Sep 17 00:00:00 2001 From: Sam Atkins Date: Wed, 1 May 2024 11:12:42 +0100 Subject: [PATCH 20/68] chore: Adjust comment for eslint This was confusing its fallthrough detection: /puter/packages/phoenix/src/puter-shell/coreutils/date.js 132:21 error Expected a 'break' statement before 'case' no-fallthrough --- packages/phoenix/src/puter-shell/coreutils/date.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/phoenix/src/puter-shell/coreutils/date.js b/packages/phoenix/src/puter-shell/coreutils/date.js index f694544f1..fd3bcc685 100644 --- a/packages/phoenix/src/puter-shell/coreutils/date.js +++ b/packages/phoenix/src/puter-shell/coreutils/date.js @@ -126,9 +126,9 @@ export default { break; } - // "Locale's abbreviated month name." + // b: "Locale's abbreviated month name." + // h: "A synonym for %b." case 'b': - // "A synonym for %b." case 'h': { output += date.toLocaleDateString(locale, { timeZone: timeZone, month: 'short' }); break; From c8a20cadbfd539d185d32f4558916825fcf265ba Mon Sep 17 00:00:00 2001 From: Sam Atkins Date: Wed, 1 May 2024 11:28:32 +0100 Subject: [PATCH 21/68] fix: Correct grep output when asking for line numbers A couple of issues here: - We didn't pass the line number to do_grep_line() so `i` was undefined - Operator precedence messed with the ternary so when line numbers were requested, the line wouldn't be output. Found thanks to this now-solved eslint issue: /puter/packages/phoenix/src/puter-shell/coreutils/grep.js 100:60 error 'i' is not defined no-undef --- .../phoenix/src/puter-shell/coreutils/grep.js | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/packages/phoenix/src/puter-shell/coreutils/grep.js b/packages/phoenix/src/puter-shell/coreutils/grep.js index 29351e1cc..eb1831444 100644 --- a/packages/phoenix/src/puter-shell/coreutils/grep.js +++ b/packages/phoenix/src/puter-shell/coreutils/grep.js @@ -78,7 +78,7 @@ export default { } } - const do_grep_line = async ( line ) => { + const do_grep_line = async ( line, lineNumber ) => { if ( line.endsWith('\n') ) line = line.slice(0, -1); const re = new RegExp( pattern, @@ -97,10 +97,9 @@ export default { ); if ( lxor(values['invert-match'], re.test(line)) ) { - const lineNumber = values['line-number'] ? i + 1 : ''; - const lineToPrint = - lineNumber ? lineNumber + ':' : '' + - line; + const lineToPrint = values['line-number'] + ? `${lineNumber + 1}:${line}` + : line; console.log(`LINE{${lineToPrint}}`); await ctx.externs.out.write(lineToPrint + '\n'); @@ -111,7 +110,7 @@ export default { for ( let i=0 ; i < lines.length ; i++ ) { const line = lines[i]; - await do_grep_line(line); + await do_grep_line(line, i); } } @@ -139,10 +138,10 @@ export default { for ( let file of files ) { if ( file === '-' ) { - for ( ;; ) { + for ( let i = 0; ; i++) { const { value, done } = await ctx.externs.in_.read(); if ( done ) break; - await do_grep_line(value); + await do_grep_line(value, i); } } else { file = resolveRelativePath(ctx.vars, file); From 96e9c154bd741dfbfe3c9c6890873e73ab26aef4 Mon Sep 17 00:00:00 2001 From: Sam Atkins Date: Wed, 1 May 2024 11:32:18 +0100 Subject: [PATCH 22/68] chore: Fix a couple of regex related eslint issues /puter/packages/phoenix/src/puter-shell/providers/ScriptCommandProvider.js 27:38 error Unnecessary escape character: \/ no-useless-escape /puter/packages/phoenix/src/util/wrap-text.js 24:33 error Unexpected control character(s) in regular expression: \x1b no-control-regex --- .../phoenix/src/puter-shell/providers/ScriptCommandProvider.js | 2 +- packages/phoenix/src/util/wrap-text.js | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/phoenix/src/puter-shell/providers/ScriptCommandProvider.js b/packages/phoenix/src/puter-shell/providers/ScriptCommandProvider.js index 66be2041f..1e50a0894 100644 --- a/packages/phoenix/src/puter-shell/providers/ScriptCommandProvider.js +++ b/packages/phoenix/src/puter-shell/providers/ScriptCommandProvider.js @@ -24,7 +24,7 @@ export class ScriptCommandProvider { async lookup (id, { ctx }) { const { filesystem } = ctx.platform; - const is_path = id.match(/^[.\/]/); + const is_path = id.match(/^[./]/); if ( ! is_path ) return undefined; const absPath = resolveRelativePath(ctx.vars, id); diff --git a/packages/phoenix/src/util/wrap-text.js b/packages/phoenix/src/util/wrap-text.js index 478f1e76b..86adfe840 100644 --- a/packages/phoenix/src/util/wrap-text.js +++ b/packages/phoenix/src/util/wrap-text.js @@ -16,6 +16,8 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ +/* eslint-disable no-control-regex */ + export function lengthIgnoringEscapes(text) { const escape = '\x1b'; // There are a lot of different ones, but we only use graphics-mode ones, so only parse those for now. From 33785b378602f8c480d2ad7bfab6752497b88151 Mon Sep 17 00:00:00 2001 From: Sam Atkins Date: Wed, 1 May 2024 11:39:01 +0100 Subject: [PATCH 23/68] chore: Add missing imports for node:process --- packages/phoenix/rollup.config.js | 1 + packages/terminal/rollup.config.js | 1 + run-selfhosted.js | 2 ++ 3 files changed, 4 insertions(+) diff --git a/packages/phoenix/rollup.config.js b/packages/phoenix/rollup.config.js index 27c803247..fd090bbb8 100644 --- a/packages/phoenix/rollup.config.js +++ b/packages/phoenix/rollup.config.js @@ -19,6 +19,7 @@ import { nodeResolve } from '@rollup/plugin-node-resolve' import commonjs from '@rollup/plugin-commonjs'; import copy from 'rollup-plugin-copy'; +import process from 'node:process'; const configFile = process.env.CONFIG_FILE ?? 'config/dev.js'; await import(`./${configFile}`); diff --git a/packages/terminal/rollup.config.js b/packages/terminal/rollup.config.js index 1ce2a15b3..1ea7ebcf4 100644 --- a/packages/terminal/rollup.config.js +++ b/packages/terminal/rollup.config.js @@ -19,6 +19,7 @@ import { nodeResolve } from '@rollup/plugin-node-resolve' import commonjs from '@rollup/plugin-commonjs'; import copy from 'rollup-plugin-copy'; +import process from 'node:process'; const configFile = process.env.CONFIG_FILE ?? 'config/dev.js'; await import(`./${configFile}`); diff --git a/run-selfhosted.js b/run-selfhosted.js index a9104bbfc..a974db399 100644 --- a/run-selfhosted.js +++ b/run-selfhosted.js @@ -5,6 +5,8 @@ // The implementation of this in packages/backend might not // work in older versions of node, so we instead re-implement // it here. +import process from 'node:process'; + const surrounding_box = (col, lines) => { const lengths = lines.map(line => line.length); From ca65ed1258937fd7b4a49721335138612a0382ef Mon Sep 17 00:00:00 2001 From: Sam Atkins Date: Wed, 1 May 2024 11:39:46 +0100 Subject: [PATCH 24/68] chore: Use `this` to refer to itemWatchCallbackFunctions field Solves these eslint issues: /puter/packages/puter-js/src/modules/UI.js 418:20 error 'itemWatchCallbackFunctions' is not defined no-undef 418:74 error 'itemWatchCallbackFunctions' is not defined no-undef 419:21 error 'itemWatchCallbackFunctions' is not defined no-undef --- packages/puter-js/src/modules/UI.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/puter-js/src/modules/UI.js b/packages/puter-js/src/modules/UI.js index 03501313b..a8bf3c620 100644 --- a/packages/puter-js/src/modules/UI.js +++ b/packages/puter-js/src/modules/UI.js @@ -415,8 +415,8 @@ class UI extends EventListener { // Item Watch response else if(e.data.msg === "itemChanged" && e.data.data && e.data.data.uid){ //excute callback - if(itemWatchCallbackFunctions[e.data.data.uid] && typeof itemWatchCallbackFunctions[e.data.data.uid] === 'function') - itemWatchCallbackFunctions[e.data.data.uid](e.data.data); + if(this.itemWatchCallbackFunctions[e.data.data.uid] && typeof this.itemWatchCallbackFunctions[e.data.data.uid] === 'function') + this.itemWatchCallbackFunctions[e.data.data.uid](e.data.data); } // Broadcasts else if (e.data.msg === 'broadcast') { From 280479c0c64a35b0129d567da5249cabf462c246 Mon Sep 17 00:00:00 2001 From: Sam Atkins Date: Wed, 1 May 2024 14:07:35 +0100 Subject: [PATCH 25/68] chore: Clarify usage of window fields in IPC.js Resolves these eslint errors: /puter/src/IPC.js 53:69 error 'appCallbackFunctions' is not defined no-undef 55:9 error 'appCallbackFunctions' is not defined no-undef 57:16 error 'appCallbackFunctions' is not defined no-undef 81:33 error 'window_for_app_instance' is not defined no-undef 84:27 error 'iframe_for_app_instance' is not defined no-undef 105:48 error Empty block statement no-empty 180:18 error 'api_origin' is not defined no-undef 190:44 error 'auth_token' is not defined no-undef 194:21 error 'logout' is not defined no-undef 207:18 error 'api_origin' is not defined no-undef 216:44 error 'auth_token' is not defined no-undef 220:21 error 'logout' is not defined no-undef 239:18 error 'api_origin' is not defined no-undef 248:44 error 'auth_token' is not defined no-undef 252:21 error 'logout' is not defined no-undef 268:13 error 'is_auth' is not defined no-undef 309:13 error 'is_auth' is not defined no-undef 348:27 error 'window_for_app_instance' is not defined no-undef 360:27 error 'window_for_app_instance' is not defined no-undef 576:35 error 'uuidv4' is not defined no-undef 582:9 error 'launch_app' is not defined no-undef 597:37 error 'appdata_path' is not defined no-undef 629:12 error 'appdata_signatures' is not defined no-undef 633:23 error 'appdata_signatures' is not defined no-undef 638:30 error 'appdata_path' is not defined no-undef 647:25 error 'appdata_signatures' is not defined no-undef 664:29 error 'appdata_signatures' is not defined no-undef 682:13 error 'is_auth' is not defined no-undef 717:13 error 'is_auth' is not defined no-undef 745:13 error 'is_auth' is not defined no-undef 773:13 error 'is_auth' is not defined no-undef 783:22 error 'api_origin' is not defined no-undef 793:48 error 'auth_token' is not defined no-undef 797:25 error 'logout' is not defined no-undef 825:13 error 'is_auth' is not defined no-undef 857:36 error 'operation_id' is not defined no-undef 872:41 error 'auth_token' is not defined no-undef 873:41 error 'api_origin' is not defined no-undef 939:45 error 'item_icon' is not defined no-undef 951:33 error 'sort_items' is not defined no-undef 954:29 error 'show_save_account_notice_if_needed' is not defined no-undef 998:38 error 'busy_indicator_hide_delay' is not defined no-undef 1004:33 error 'busy_indicator_hide_delay' is not defined no-undef 1018:37 error 'pictures_path' is not defined no-undef 1020:37 error 'desktop_path' is not defined no-undef 1022:37 error 'documents_path' is not defined no-undef 1024:37 error 'videos_path' is not defined no-undef 1026:37 error 'audio_path' is not defined no-undef 1028:37 error 'appdata_path' is not defined no-undef 1032:13 error 'is_auth' is not defined no-undef 1044:28 error 'operation_id' is not defined no-undef 1059:33 error 'auth_token' is not defined no-undef 1060:33 error 'api_origin' is not defined no-undef 1145:31 error 'iframe_for_app_instance' is not defined no-undef 1163:31 error 'window_for_app_instance' is not defined no-undef 1178:36 error 'get_apps' is not defined no-undef 1199:11 error 'window_for_app_instance' is not defined no-undef --- src/IPC.js | 113 +++++++++++++++++++++++++++-------------------------- 1 file changed, 57 insertions(+), 56 deletions(-) diff --git a/src/IPC.js b/src/IPC.js index ed96c175a..a566ed510 100644 --- a/src/IPC.js +++ b/src/IPC.js @@ -50,11 +50,11 @@ window.addEventListener('message', async (event) => { // -------------------------------------------------------- // A response to a GUI message received from the app. // -------------------------------------------------------- - if (typeof event.data.original_msg_id !== "undefined" && typeof appCallbackFunctions[event.data.original_msg_id] !== "undefined") { + if (typeof event.data.original_msg_id !== "undefined" && typeof window.appCallbackFunctions[event.data.original_msg_id] !== "undefined") { // Execute callback - appCallbackFunctions[event.data.original_msg_id](event.data); + window.appCallbackFunctions[event.data.original_msg_id](event.data); // Remove this callback function since it won't be needed again - delete appCallbackFunctions[event.data.original_msg_id]; + delete window.appCallbackFunctions[event.data.original_msg_id]; // Done return; @@ -78,10 +78,10 @@ window.addEventListener('message', async (event) => { return; } - const $el_parent_window = $(window_for_app_instance(event.data.appInstanceID)); + const $el_parent_window = $(window.window_for_app_instance(event.data.appInstanceID)); const parent_window_id = $el_parent_window.attr('data-id'); const $el_parent_disable_mask = $el_parent_window.find('.window-disable-mask'); - const target_iframe = iframe_for_app_instance(event.data.appInstanceID); + const target_iframe = window.iframe_for_app_instance(event.data.appInstanceID); const msg_id = event.data.uuid; const app_name = $(target_iframe).attr('data-app'); const app_uuid = $el_parent_window.attr('data-app_uuid'); @@ -103,6 +103,7 @@ window.addEventListener('message', async (event) => { // windowFocused //------------------------------------------------- else if(event.data.msg === 'windowFocused'){ + // TODO: Respond to this } //-------------------------------------------------------- // ALERT @@ -177,7 +178,7 @@ window.addEventListener('message', async (event) => { else if(event.data.msg === 'setItem' && event.data.key && event.data.value){ // todo: validate key and value to avoid unnecessary api calls return await $.ajax({ - url: api_origin + "/setItem", + url: window.api_origin + "/setItem", type: 'POST', data: JSON.stringify({ app: app_uuid, @@ -187,11 +188,11 @@ window.addEventListener('message', async (event) => { async: true, contentType: "application/json", headers: { - "Authorization": "Bearer "+auth_token + "Authorization": "Bearer "+window.auth_token }, statusCode: { 401: function () { - logout(); + window.logout(); }, }, success: function (fsentry){ @@ -204,7 +205,7 @@ window.addEventListener('message', async (event) => { else if(event.data.msg === 'getItem' && event.data.key){ // todo: validate key to avoid unnecessary api calls $.ajax({ - url: api_origin + "/getItem", + url: window.api_origin + "/getItem", type: 'POST', data: JSON.stringify({ key: event.data.key, @@ -213,11 +214,11 @@ window.addEventListener('message', async (event) => { async: true, contentType: "application/json", headers: { - "Authorization": "Bearer "+auth_token + "Authorization": "Bearer "+window.auth_token }, statusCode: { 401: function () { - logout(); + window.logout(); }, }, success: function (result){ @@ -236,7 +237,7 @@ window.addEventListener('message', async (event) => { else if(event.data.msg === 'removeItem' && event.data.key){ // todo: validate key to avoid unnecessary api calls $.ajax({ - url: api_origin + "/removeItem", + url: window.api_origin + "/removeItem", type: 'POST', data: JSON.stringify({ key: event.data.key, @@ -245,11 +246,11 @@ window.addEventListener('message', async (event) => { async: true, contentType: "application/json", headers: { - "Authorization": "Bearer "+auth_token + "Authorization": "Bearer "+window.auth_token }, statusCode: { 401: function () { - logout(); + window.logout(); }, }, success: function (result){ @@ -265,7 +266,7 @@ window.addEventListener('message', async (event) => { //-------------------------------------------------------- else if(event.data.msg === 'showOpenFilePicker'){ // Auth - if(!is_auth() && !(await UIWindowSignup({referrer: app_name}))) + if(!window.is_auth() && !(await UIWindowSignup({referrer: app_name}))) return; // Disable parent window @@ -306,7 +307,7 @@ window.addEventListener('message', async (event) => { //-------------------------------------------------------- else if(event.data.msg === 'showDirectoryPicker'){ // Auth - if(!is_auth() && !(await UIWindowSignup({referrer: app_name}))) + if(!window.is_auth() && !(await UIWindowSignup({referrer: app_name}))) return; // Disable parent window @@ -345,7 +346,7 @@ window.addEventListener('message', async (event) => { // setWindowTitle //-------------------------------------------------------- else if(event.data.msg === 'setWindowTitle' && event.data.new_title !== undefined){ - const el_window = window_for_app_instance(event.data.appInstanceID); + const el_window = window.window_for_app_instance(event.data.appInstanceID); // set window title $(el_window).find(`.window-head-title`).html(html_encode(event.data.new_title)); // send confirmation to requester window @@ -357,7 +358,7 @@ window.addEventListener('message', async (event) => { // setMenubar //-------------------------------------------------------- else if(event.data.msg === 'setMenubar') { - const el_window = window_for_app_instance(event.data.appInstanceID); + const el_window = window.window_for_app_instance(event.data.appInstanceID); console.error(`EXPERIMENTAL: setMenubar is a work-in-progress`); const hydrator = puter.util.rpc.getHydrator({ @@ -573,13 +574,13 @@ window.addEventListener('message', async (event) => { else if(event.data.msg === 'launchApp'){ // TODO: Determine if the app is allowed to launch child apps? We may want to limit this to prevent abuse. // remember app for launch callback later - const child_instance_id = uuidv4(); + const child_instance_id = window.uuidv4(); window.child_launch_callbacks[child_instance_id] = { parent_instance_id: event.data.appInstanceID, launch_msg_id: msg_id, }; // launch child app - launch_app({ + window.launch_app({ name: event.data.app_name ?? app_name, args: event.data.args ?? {}, parent_instance_id: event.data.appInstanceID, @@ -594,7 +595,7 @@ window.addEventListener('message', async (event) => { event.data.path = path.resolve(event.data.path); // join with appdata dir - const file_path = path.join(appdata_path, app_uuid, event.data.path); + const file_path = path.join(window.appdata_path, app_uuid, event.data.path); puter.fs.sign(app_uuid, { path: file_path, @@ -626,16 +627,16 @@ window.addEventListener('message', async (event) => { //-------------------------------------------------------- // todo appdata should be provided from the /open_item api call else if(event.data.msg === 'getAppData'){ - if(appdata_signatures[app_uuid]){ + if(window.appdata_signatures[app_uuid]){ target_iframe.contentWindow.postMessage({ msg: "getAppDataSucceeded", original_msg_id: msg_id, - item: appdata_signatures[app_uuid], + item: window.appdata_signatures[app_uuid], }, '*'); } // make app directory if it doesn't exist puter.fs.mkdir({ - path: path.join( appdata_path, app_uuid), + path: path.join( window.appdata_path, app_uuid), rename: false, overwrite: false, success: function(dir){ @@ -644,7 +645,7 @@ window.addEventListener('message', async (event) => { action: 'write', success: function(signature){ signature = signature.items; - appdata_signatures[app_uuid] = signature; + window.appdata_signatures[app_uuid] = signature; // send confirmation to requester window target_iframe.contentWindow.postMessage({ msg: "getAppDataSucceeded", @@ -661,7 +662,7 @@ window.addEventListener('message', async (event) => { action: 'write', success: function(signature){ signature = signature.items; - appdata_signatures[app_uuid] = signature; + window.appdata_signatures[app_uuid] = signature; // send confirmation to requester window target_iframe.contentWindow.postMessage({ msg: "getAppDataSucceeded", @@ -679,7 +680,7 @@ window.addEventListener('message', async (event) => { //-------------------------------------------------------- else if(event.data.msg === 'requestPermission'){ // auth - if(!is_auth() && !(await UIWindowSignup({referrer: app_name}))) + if(!window.is_auth() && !(await UIWindowSignup({referrer: app_name}))) return; // options must be an object @@ -714,7 +715,7 @@ window.addEventListener('message', async (event) => { //-------------------------------------------------------- else if(event.data.msg === 'showFontPicker'){ // auth - if(!is_auth() && !(await UIWindowSignup({referrer: app_name}))) + if(!window.is_auth() && !(await UIWindowSignup({referrer: app_name}))) return; // set options @@ -742,7 +743,7 @@ window.addEventListener('message', async (event) => { //-------------------------------------------------------- else if(event.data.msg === 'showColorPicker'){ // Auth - if(!is_auth() && !(await UIWindowSignup({referrer: app_name}))) + if(!window.is_auth() && !(await UIWindowSignup({referrer: app_name}))) return; // set options @@ -770,7 +771,7 @@ window.addEventListener('message', async (event) => { //-------------------------------------------------------- else if(event.data.msg === 'setWallpaper'){ // Auth - if(!is_auth() && !(await UIWindowSignup({referrer: app_name}))) + if(!window.is_auth() && !(await UIWindowSignup({referrer: app_name}))) return; // No options? @@ -780,7 +781,7 @@ window.addEventListener('message', async (event) => { // /set-desktop-bg try{ await $.ajax({ - url: api_origin + "/set-desktop-bg", + url: window.api_origin + "/set-desktop-bg", type: 'POST', data: JSON.stringify({ url: event.data.readURL, @@ -790,11 +791,11 @@ window.addEventListener('message', async (event) => { async: true, contentType: "application/json", headers: { - "Authorization": "Bearer "+auth_token + "Authorization": "Bearer "+window.auth_token }, statusCode: { 401: function () { - logout(); + window.logout(); }, }, }); @@ -822,7 +823,7 @@ window.addEventListener('message', async (event) => { //-------------------------------------------------------- else if(event.data.msg === 'showSaveFilePicker'){ //auth - if(!is_auth() && !(await UIWindowSignup({referrer: app_name}))) + if(!window.is_auth() && !(await UIWindowSignup({referrer: app_name}))) return; //disable parent window @@ -854,7 +855,7 @@ window.addEventListener('message', async (event) => { // ------------------------------------- if(event.data.url){ // download progress tracker - let dl_op_id = operation_id++; + let dl_op_id = window.operation_id++; // upload progress tracker defaults window.progress_tracker[dl_op_id] = []; @@ -869,8 +870,8 @@ window.addEventListener('message', async (event) => { url: event.data.url, name: path.basename(target_path), dest_path: path.dirname(target_path), - auth_token: auth_token, - api_origin: api_origin, + auth_token: window.auth_token, + api_origin: window.api_origin, dedupe_name: false, overwrite: false, operation_id: dl_op_id, @@ -936,7 +937,7 @@ window.addEventListener('message', async (event) => { immutable: res.immutable, associated_app_name: res.associated_app?.name, path: target_path, - icon: await item_icon(res), + icon: await window.item_icon(res), name: path.basename(target_path), uid: res.uid, size: res.size, @@ -948,10 +949,10 @@ window.addEventListener('message', async (event) => { }); // sort each window $(`.item-container[data-path="${html_encode(path.dirname(target_path))}" i]`).each(function(){ - sort_items(this, $(this).attr('data-sort_by'), $(this).attr('data-sort_order')) + window.sort_items(this, $(this).attr('data-sort_by'), $(this).attr('data-sort_order')) }); $(el_filedialog_window).close(); - show_save_account_notice_if_needed(); + window.show_save_account_notice_if_needed(); } catch(err){ // item with same name exists @@ -995,13 +996,13 @@ window.addEventListener('message', async (event) => { // done let busy_duration = (Date.now() - busy_init_ts); - if( busy_duration >= busy_indicator_hide_delay){ + if( busy_duration >= window.busy_indicator_hide_delay){ $(el_filedialog_window).close(); }else{ setTimeout(() => { // close this dialog $(el_filedialog_window).close(); - }, Math.abs(busy_indicator_hide_delay - busy_duration)); + }, Math.abs(window.busy_indicator_hide_delay - busy_duration)); } } }); @@ -1015,21 +1016,21 @@ window.addEventListener('message', async (event) => { let create_missing_ancestors = false; if(event.data.msg === 'saveToPictures') - target_path = path.join(pictures_path, event.data.filename); + target_path = path.join(window.pictures_path, event.data.filename); else if(event.data.msg === 'saveToDesktop') - target_path = path.join(desktop_path, event.data.filename); + target_path = path.join(window.desktop_path, event.data.filename); else if(event.data.msg === 'saveToDocuments') - target_path = path.join(documents_path, event.data.filename); + target_path = path.join(window.documents_path, event.data.filename); else if(event.data.msg === 'saveToVideos') - target_path = path.join(videos_path, event.data.filename); + target_path = path.join(window.videos_path, event.data.filename); else if(event.data.msg === 'saveToAudio') - target_path = path.join(audio_path, event.data.filename); + target_path = path.join(window.audio_path, event.data.filename); else if(event.data.msg === 'saveToAppData'){ - target_path = path.join(appdata_path, app_uuid, event.data.filename); + target_path = path.join(window.appdata_path, app_uuid, event.data.filename); create_missing_ancestors = true; } //auth - if(!is_auth() && !(await UIWindowSignup({referrer: app_name}))) + if(!window.is_auth() && !(await UIWindowSignup({referrer: app_name}))) return; let item_with_same_name_already_exists = true; @@ -1041,7 +1042,7 @@ window.addEventListener('message', async (event) => { if(event.data.url){ let overwrite = false; // download progress tracker - let dl_op_id = operation_id++; + let dl_op_id = window.operation_id++; // upload progress tracker defaults window.progress_tracker[dl_op_id] = []; @@ -1056,8 +1057,8 @@ window.addEventListener('message', async (event) => { url: event.data.url, name: path.basename(target_path), dest_path: path.dirname(target_path), - auth_token: auth_token, - api_origin: api_origin, + auth_token: window.auth_token, + api_origin: window.api_origin, dedupe_name: true, overwrite: false, operation_id: dl_op_id, @@ -1142,7 +1143,7 @@ window.addEventListener('message', async (event) => { // TODO: Track message traffic between apps // pass on the message - const target_iframe = iframe_for_app_instance(targetAppInstanceID); + const target_iframe = window.iframe_for_app_instance(targetAppInstanceID); if (!target_iframe) { console.error('Failed to send message to non-existent app', event); return; @@ -1160,7 +1161,7 @@ window.addEventListener('message', async (event) => { else if (event.data.msg === 'closeApp') { const { appInstanceID, targetAppInstanceID } = event.data; - const target_window = window_for_app_instance(targetAppInstanceID); + const target_window = window.window_for_app_instance(targetAppInstanceID); if (!target_window) { console.warn(`Failed to close non-existent app ${targetAppInstanceID}`); return; @@ -1175,7 +1176,7 @@ window.addEventListener('message', async (event) => { } // God-mode apps can close anything - const app_info = await get_apps(app_name); + const app_info = await window.get_apps(app_name); if (app_info.godmode === 1) { console.log(`⚠️ Allowing GODMODE app ${appInstanceID} to close app ${targetAppInstanceID}`); return true; @@ -1196,6 +1197,6 @@ window.addEventListener('message', async (event) => { // exit //-------------------------------------------------------- else if(event.data.msg === 'exit'){ - $(window_for_app_instance(event.data.appInstanceID)).close({bypass_iframe_messaging: true}); + $(window.window_for_app_instance(event.data.appInstanceID)).close({bypass_iframe_messaging: true}); } }); \ No newline at end of file From 8d4a1e0ed3872e2c82b9e4be9b6d8b359e9cea09 Mon Sep 17 00:00:00 2001 From: Sam Atkins Date: Wed, 1 May 2024 14:25:31 +0100 Subject: [PATCH 26/68] fix: Add missing TextEncoder to PTT Solves this eslint issue: /puter/packages/terminal/src/pty/PTT.js 35:29 error 'encoder' is not defined no-undef --- packages/terminal/src/pty/PTT.js | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/terminal/src/pty/PTT.js b/packages/terminal/src/pty/PTT.js index ff122b8fd..c39d08396 100644 --- a/packages/terminal/src/pty/PTT.js +++ b/packages/terminal/src/pty/PTT.js @@ -21,6 +21,7 @@ */ export class PTT { constructor(pty) { + const encoder = new TextEncoder(); this.readableStream = new ReadableStream({ start: controller => { this.readController = controller; From d17e0b80b382e7af5bcfa9225f00ff99b93243c3 Mon Sep 17 00:00:00 2001 From: Sam Atkins Date: Wed, 1 May 2024 14:30:03 +0100 Subject: [PATCH 27/68] chore: Add missing import for node:console Solves these eslint issues: /puter/run-selfhosted.js 49:9 error 'console' is not defined no-undef 64:5 error 'console' is not defined no-undef 127:5 error 'console' is not defined no-undef --- run-selfhosted.js | 1 + 1 file changed, 1 insertion(+) diff --git a/run-selfhosted.js b/run-selfhosted.js index a974db399..e8621d02c 100644 --- a/run-selfhosted.js +++ b/run-selfhosted.js @@ -5,6 +5,7 @@ // The implementation of this in packages/backend might not // work in older versions of node, so we instead re-implement // it here. +import console from 'node:console'; import process from 'node:process'; const surrounding_box = (col, lines) => { From c2ef0a95787a15d75b4fffc56a61926b5a9bd75e Mon Sep 17 00:00:00 2001 From: Sam Atkins Date: Wed, 1 May 2024 14:31:26 +0100 Subject: [PATCH 28/68] chore: Clarify usage of window fields in Settings app Solves these eslint issues: /puter/src/UI/Settings/UITabAccount.js 34:13 error 'user' is not defined no-undef 47:99 error 'user' is not defined no-undef 55:12 error 'user' is not defined no-undef 59:105 error 'user' is not defined no-undef /puter/src/UI/Settings/UITabLanguage.js 35:37 error 'listSupportedLanguages' is not defined no-undef /puter/src/UI/Settings/UITabUsage.js 45:18 error 'api_origin' is not defined no-undef 50:46 error 'auth_token' is not defined no-undef 54:21 error 'logout' is not defined no-undef 96:18 error 'api_origin' is not defined no-undef 101:46 error 'auth_token' is not defined no-undef 105:21 error 'logout' is not defined no-undef 116:51 error 'byte_format' is not defined no-undef 123:41 error 'byte_format' is not defined no-undef 124:45 error 'byte_format' is not defined no-undef /puter/src/UI/Settings/UIWindowChangeEmail.js 96:18 error 'api_origin' is not defined no-undef 100:44 error 'auth_token' is not defined no-undef /puter/src/UI/Settings/UIWindowFinalizeUserDeletion.js 29:12 error 'user' is not defined no-undef 97:16 error 'user' is not defined no-undef 115:22 error 'api_origin' is not defined no-undef 120:50 error 'auth_token' is not defined no-undef 127:25 error 'logout' is not defined no-undef 139:25 error 'logout' is not defined no-undef /puter/src/UI/Settings/UIWindowSettings.js 48:162 error 'icons' is not defined no-undef 86:13 error Duplicate key 'height' no-dupe-keys --- src/UI/Settings/UITabAccount.js | 8 ++++---- src/UI/Settings/UITabLanguage.js | 2 +- src/UI/Settings/UITabUsage.js | 18 +++++++++--------- src/UI/Settings/UIWindowChangeEmail.js | 4 ++-- .../Settings/UIWindowFinalizeUserDeletion.js | 12 ++++++------ src/UI/Settings/UIWindowSettings.js | 3 +-- 6 files changed, 23 insertions(+), 24 deletions(-) diff --git a/src/UI/Settings/UITabAccount.js b/src/UI/Settings/UITabAccount.js index 4ed08ea00..d05442065 100644 --- a/src/UI/Settings/UITabAccount.js +++ b/src/UI/Settings/UITabAccount.js @@ -31,7 +31,7 @@ export default { let h = `

${i18n('account')}

`; // change password button - if(!user.is_temp){ + if(!window.user.is_temp){ h += `
`; h += `${i18n('password')}`; h += `
`; @@ -44,7 +44,7 @@ export default { h += `
`; h += `
`; h += `${i18n('username')}`; - h += `${html_encode(user.username)}`; + h += `${html_encode(window.user.username)}`; h += `
`; h += `
`; h += ``; @@ -52,11 +52,11 @@ export default { h += `
`; // change email button - if(user.email){ + if(window.user.email){ h += `
`; h += `
`; h += `${i18n('email')}`; - h += `${html_encode(user.email)}`; + h += `${html_encode(window.user.email)}`; h += `
`; h += `
`; h += ``; diff --git a/src/UI/Settings/UITabLanguage.js b/src/UI/Settings/UITabLanguage.js index 5bb09a68b..c65f611be 100644 --- a/src/UI/Settings/UITabLanguage.js +++ b/src/UI/Settings/UITabLanguage.js @@ -32,7 +32,7 @@ export default {
`; // list of languages - const available_languages = listSupportedLanguages(); + const available_languages = window.listSupportedLanguages(); h += `
`; for (let lang of available_languages) { h += `
${html_encode(lang.name)}
`; diff --git a/src/UI/Settings/UITabUsage.js b/src/UI/Settings/UITabUsage.js index 976475cfb..ba72bd618 100644 --- a/src/UI/Settings/UITabUsage.js +++ b/src/UI/Settings/UITabUsage.js @@ -42,16 +42,16 @@ export default { }, init: ($el_window) => { $.ajax({ - url: api_origin + "/drivers/usage", + url: window.api_origin + "/drivers/usage", type: 'GET', async: true, contentType: "application/json", headers: { - "Authorization": "Bearer " + auth_token + "Authorization": "Bearer " + window.auth_token }, statusCode: { 401: function () { - logout(); + window.logout(); }, }, success: function (res) { @@ -93,16 +93,16 @@ export default { // df $.ajax({ - url: api_origin + "/df", + url: window.api_origin + "/df", type: 'GET', async: true, contentType: "application/json", headers: { - "Authorization": "Bearer " + auth_token + "Authorization": "Bearer " + window.auth_token }, statusCode: { 401: function () { - logout(); + window.logout(); }, }, success: function (res) { @@ -113,15 +113,15 @@ export default { let host_usage_percentage = 0; if ( res.host_used ) { - $('#storage-puter-used').html(byte_format(res.used)); + $('#storage-puter-used').html(window.byte_format(res.used)); $('#storage-puter-used-w').show(); general_used = res.host_used; host_usage_percentage = ((res.host_used - res.used) / res.capacity * 100).toFixed(0); } - $('#storage-used').html(byte_format(general_used)); - $('#storage-capacity').html(byte_format(res.capacity)); + $('#storage-used').html(window.byte_format(general_used)); + $('#storage-capacity').html(window.byte_format(res.capacity)); $('#storage-used-percent').html( usage_percentage + '%' + (host_usage_percentage > 0 diff --git a/src/UI/Settings/UIWindowChangeEmail.js b/src/UI/Settings/UIWindowChangeEmail.js index 61f6a2882..1b28c0aee 100644 --- a/src/UI/Settings/UIWindowChangeEmail.js +++ b/src/UI/Settings/UIWindowChangeEmail.js @@ -93,11 +93,11 @@ async function UIWindowChangeEmail(options){ $(el_window).find('.new-email').attr('disabled', true); $.ajax({ - url: api_origin + "/change_email/start", + url: window.api_origin + "/change_email/start", type: 'POST', async: true, headers: { - "Authorization": "Bearer "+auth_token + "Authorization": "Bearer "+window.auth_token }, contentType: "application/json", data: JSON.stringify({ diff --git a/src/UI/Settings/UIWindowFinalizeUserDeletion.js b/src/UI/Settings/UIWindowFinalizeUserDeletion.js index 505a6270f..e4511f4e5 100644 --- a/src/UI/Settings/UIWindowFinalizeUserDeletion.js +++ b/src/UI/Settings/UIWindowFinalizeUserDeletion.js @@ -26,7 +26,7 @@ async function UIWindowFinalizeUserDeletion(options){ let h = ''; // if user is temporary, ask them to type in 'confirm' to delete their account - if(user.is_temp){ + if(window.user.is_temp){ h += `
`; h += `
×
`; h += ``; @@ -94,7 +94,7 @@ async function UIWindowFinalizeUserDeletion(options){ $(el_window).find('.proceed-with-user-deletion').on('click', function(){ $(el_window).find('.error-message').hide(); // if user is temporary, check if they typed 'confirm' - if(user.is_temp){ + if(window.user.is_temp){ if($(el_window).find('.confirm-temporary-user-deletion').val() !== 'confirm'){ $(el_window).find('.error-message').html(i18n('type_confirm_to_delete_account'), false); $(el_window).find('.error-message').show(); @@ -112,19 +112,19 @@ async function UIWindowFinalizeUserDeletion(options){ // delete user $.ajax({ - url: api_origin + "/delete-own-user", + url: window.api_origin + "/delete-own-user", type: 'POST', async: true, contentType: "application/json", headers: { - "Authorization": "Bearer " + auth_token + "Authorization": "Bearer " + window.auth_token }, data: JSON.stringify({ password: $(el_window).find('.confirm-user-deletion-password').val(), }), statusCode: { 401: function () { - logout(); + window.logout(); }, 400: function(){ $(el_window).find('.error-message').html(i18n('incorrect_password')); @@ -136,7 +136,7 @@ async function UIWindowFinalizeUserDeletion(options){ // mark user as deleted window.user.deleted = true; // log user out - logout(); + window.logout(); } else{ $(el_window).find('.error-message').html(html_encode(data.error)); diff --git a/src/UI/Settings/UIWindowSettings.js b/src/UI/Settings/UIWindowSettings.js index 2a720372e..28300f231 100644 --- a/src/UI/Settings/UIWindowSettings.js +++ b/src/UI/Settings/UIWindowSettings.js @@ -45,7 +45,7 @@ async function UIWindowSettings(options){ // side bar h += `
`; tabs.forEach((tab, i) => { - h += `
${i18n(tab.title_i18n_key)}
`; + h += `
${i18n(tab.title_i18n_key)}
`; }); h += `
`; @@ -82,7 +82,6 @@ async function UIWindowSettings(options){ allow_user_select: true, backdrop: false, width: 800, - height: 500, height: 'auto', dominant: true, show_in_taskbar: false, From 63347843cb0d741b78a112def0f5b36cc62d94e1 Mon Sep 17 00:00:00 2001 From: Sam Atkins Date: Wed, 1 May 2024 14:43:26 +0100 Subject: [PATCH 29/68] chore: Clarify usage of window fields in UIAlert.js /puter/src/UI/UIAlert.js 26:12 error 'isString' is not defined no-undef --- src/UI/UIAlert.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/UI/UIAlert.js b/src/UI/UIAlert.js index c5763ea0b..dcf46cdda 100644 --- a/src/UI/UIAlert.js +++ b/src/UI/UIAlert.js @@ -23,7 +23,7 @@ function UIAlert(options){ // set sensible defaults if(arguments.length > 0){ // if first argument is a string, then assume it is the message - if(isString(arguments[0])){ + if(window.isString(arguments[0])){ options = {}; options.message = arguments[0]; } From dd7361441d0ee88b686544e89f95113084f57e09 Mon Sep 17 00:00:00 2001 From: Sam Atkins Date: Wed, 1 May 2024 14:43:35 +0100 Subject: [PATCH 30/68] chore: Clarify usage of window fields in UIContextMenu.js /puter/src/UI/UIContextMenu.js 23:21 error 'global_element_id' is not defined no-undef 117:57 error 'taskbar_height' is not defined no-undef 118:52 error 'taskbar_height' is not defined no-undef 260:17 error 'make_taskbar_sortable' is not defined no-undef --- src/UI/UIContextMenu.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/UI/UIContextMenu.js b/src/UI/UIContextMenu.js index 9f5f65d3c..367bc33cd 100644 --- a/src/UI/UIContextMenu.js +++ b/src/UI/UIContextMenu.js @@ -20,7 +20,7 @@ function UIContextMenu(options){ $('.window-active .window-app-iframe').css('pointer-events', 'none'); - const menu_id = global_element_id++; + const menu_id = window.global_element_id++; let h = ''; h += `
(window.innerHeight - taskbar_height - 10)) - y_pos = window.innerHeight - menu_height - taskbar_height - 10; + if( (start_y + menu_height) > (window.innerHeight - window.taskbar_height - 10)) + y_pos = window.innerHeight - menu_height - window.taskbar_height - 10; else y_pos = start_y; @@ -257,7 +257,7 @@ function UIContextMenu(options){ $(options.parent_element).css('overflow', 'scroll'); $(options.parent_element).removeClass('has-open-contextmenu'); if($(options.parent_element).hasClass('taskbar-item')){ - make_taskbar_sortable() + window.make_taskbar_sortable() } } }) From 9fc983f54abf1c73a1591251070ccd1ed8cb7f02 Mon Sep 17 00:00:00 2001 From: Sam Atkins Date: Wed, 1 May 2024 15:02:55 +0100 Subject: [PATCH 31/68] chore: Clarify usage of window fields in UIDesktop.js /puter/src/UI/UIDesktop.js 44:24 error 'gui_origin' is not defined no-undef 46:25 error 'auth_token' is not defined no-undef 86:5 error 'socket' is not defined no-undef 95:5 error 'socket' is not defined no-undef 104:5 error 'socket' is not defined no-undef 105:43 error 'trash_path' is not defined no-undef 106:45 error 'trash_path' is not defined no-undef 109:49 error 'trash_path' is not defined no-undef 112:5 error 'socket' is not defined no-undef 118:9 error 'launch_apps' is not defined no-undef 121:9 error 'launch_apps' is not defined no-undef 121:39 error 'launch_apps' is not defined no-undef 124:9 error 'launch_apps' is not defined no-undef 124:30 error 'launch_apps' is not defined no-undef 127:5 error 'socket' is not defined no-undef 146:5 error 'socket' is not defined no-undef 153:85 error 'truncate_filename' is not defined no-undef 153:114 error 'TRUNCATE_LENGTH' is not defined no-undef 156:77 error 'item_icon' is not defined no-undef 192:13 error 'update_window_path' is not defined no-undef 199:13 error 'sort_items' is not defined no-undef 203:5 error 'socket' is not defined no-undef 206:9 error 'sendItemChangeEventToWatchingApps' is not defined no-undef 220:25 error 'fsentry.path' is assigned to itself no-self-assign 233:17 error 'update_explorer_footer_item_count' is not defined no-undef 234:17 error 'update_explorer_footer_selected_items_count' is not defined no-undef 239:26 error 'trash_path' is not defined no-undef 249:17 error 'update_window_path' is not defined no-undef 253:26 error 'trash_path' is not defined no-undef 280:25 error 'item_icon' is not defined no-undef 281:34 error 'trash_path' is not defined no-undef 287:39 error 'trash_path' is not defined no-undef 308:37 error 'item_icon' is not defined no-undef 319:17 error 'sort_items' is not defined no-undef 324:13 error 'sort_items' is not defined no-undef 328:5 error 'socket' is not defined no-undef 333:9 error 'refresh_user_data' is not defined no-undef 336:5 error 'socket' is not defined no-undef 341:9 error 'refresh_user_data' is not defined no-undef 344:5 error 'socket' is not defined no-undef 346:9 error 'sendItemChangeEventToWatchingApps' is not defined no-undef 360:85 error 'truncate_filename' is not defined no-undef 360:114 error 'TRUNCATE_LENGTH' is not defined no-undef 363:77 error 'item_icon' is not defined no-undef 398:13 error 'update_window_path' is not defined no-undef 405:13 error 'sort_items' is not defined no-undef 409:5 error 'socket' is not defined no-undef 415:9 error 'sendItemChangeEventToWatchingApps' is not defined no-undef 440:81 error 'item_icon' is not defined no-undef 445:17 error 'sort_items' is not defined no-undef 455:29 error 'item_icon' is not defined no-undef 463:17 error Duplicate key 'associated_app_name' no-dupe-keys 470:17 error 'sort_items' is not defined no-undef 491:42 error 'desktop_path' is not defined no-undef 496:5 error 'getItem' is not defined no-undef 508:8 error 'url_query_params' is not defined no-undef 525:9 error 'update_user_preferences' is not defined no-undef 560:17 error 'upload_items' is not defined no-undef 560:52 error 'desktop_path' is not defined no-undef 577:16 error 'mouseover_window' is not defined no-undef 585:69 error 'desktop_path' is not defined no-undef 613:17 error 'copy_items' is not defined no-undef 613:43 error 'desktop_path' is not defined no-undef 617:17 error 'move_items' is not defined no-undef 617:43 error 'desktop_path' is not defined no-undef 649:39 error 'is_auto_arrange_enabled' is not defined no-undef 651:37 error 'is_auto_arrange_enabled' is not defined no-undef 651:64 error 'is_auto_arrange_enabled' is not defined no-undef 652:37 error 'store_auto_arrange_preference' is not defined no-undef 652:67 error 'is_auto_arrange_enabled' is not defined no-undef 653:40 error 'is_auto_arrange_enabled' is not defined no-undef 654:41 error 'sort_items' is not defined no-undef 655:41 error 'set_sort_by' is not defined no-undef 656:41 error 'clear_desktop_item_positions' is not defined no-undef 658:41 error 'set_desktop_item_positions' is not defined no-undef 668:44 error 'is_auto_arrange_enabled' is not defined no-undef 671:37 error 'sort_items' is not defined no-undef 672:37 error 'set_sort_by' is not defined no-undef 677:44 error 'is_auto_arrange_enabled' is not defined no-undef 680:37 error 'sort_items' is not defined no-undef 681:37 error 'set_sort_by' is not defined no-undef 686:44 error 'is_auto_arrange_enabled' is not defined no-undef 689:37 error 'sort_items' is not defined no-undef 690:37 error 'set_sort_by' is not defined no-undef 695:44 error 'is_auto_arrange_enabled' is not defined no-undef 698:37 error 'sort_items' is not defined no-undef 699:37 error 'set_sort_by' is not defined no-undef 708:44 error 'is_auto_arrange_enabled' is not defined no-undef 712:37 error 'sort_items' is not defined no-undef 713:37 error 'set_sort_by' is not defined no-undef 718:44 error 'is_auto_arrange_enabled' is not defined no-undef 722:37 error 'sort_items' is not defined no-undef 723:37 error 'set_sort_by' is not defined no-undef 757:43 error 'desktop_path' is not defined no-undef 767:35 error 'clipboard' is not defined no-undef 769:32 error 'clipboard_op' is not defined no-undef 770:33 error 'copy_clipboard_items' is not defined no-undef 770:54 error 'desktop_path' is not defined no-undef 771:37 error 'clipboard_op' is not defined no-undef 772:33 error 'move_clipboard_items' is not defined no-undef 780:35 error 'actions_history' is not defined no-undef 782:29 error 'undo_last_action' is not defined no-undef 791:29 error 'init_upload_using_dialog' is not defined no-undef 818:9 error 'is_embedded' is not defined no-undef 911:12 error 'user' is not defined no-undef 922:13 error 'is_embedded' is not defined no-undef 940:8 error 'url_query_params' is not defined no-undef 941:28 error 'url_query_params' is not defined no-undef 943:35 error 'home_path' is not defined no-undef 944:16 error 'url_query_params' is not defined no-undef 945:34 error 'url_query_params' is not defined no-undef 950:29 error 'item_icon' is not defined no-undef 966:13 error 'launch_app' is not defined no-undef 967:23 error 'app_launched_from_url' is not defined no-undef 970:25 error 'app_query_params' is not defined no-undef 1017:40 error 'taskbar_height' is not defined no-undef 1023:40 error 'user' is not defined no-undef 1024:9 error 'getItem' is not defined no-undef 1031:21 error 'setItem' is not defined no-undef 1125:47 error 'user' is not defined no-undef 1128:48 error 'user' is not defined no-undef 1131:25 error 'update_auth_data' is not defined no-undef 1170:37 error 'listSupportedLanguages' is not defined no-undef 1249:29 error 'logout' is not defined no-undef 1253:25 error 'logout' is not defined no-undef 1261:9 error 'is_fullscreen' is not defined no-undef 1308:5 error 'launch_app' is not defined no-undef 1381:9 error 'launch_apps' is not defined no-undef 1460:14 error 'api_origin' is not defined no-undef 1468:40 error 'auth_token' is not defined no-undef 1488:14 error 'toolbar_height' is not defined no-undef 1502:9 error 'reset_window_size_and_position' is not defined no-undef 1513:5 error 'refresh_desktop_background' is not defined no-undef 1520:26 error 'window_border_radius' is not defined no-undef --- src/UI/UIDesktop.js | 250 ++++++++++++++++++++++---------------------- 1 file changed, 123 insertions(+), 127 deletions(-) diff --git a/src/UI/UIDesktop.js b/src/UI/UIDesktop.js index be26556e2..92d3bf822 100644 --- a/src/UI/UIDesktop.js +++ b/src/UI/UIDesktop.js @@ -41,9 +41,9 @@ async function UIDesktop(options){ let h = ''; // connect socket. - window.socket = io(gui_origin + '/', { + window.socket = io(window.gui_origin + '/', { query: { - auth_token: auth_token + auth_token: window.auth_token } }); @@ -83,7 +83,7 @@ async function UIDesktop(options){ console.error('GUI Socket Error:', error); }); - socket.on('upload.progress', (msg) => { + window.socket.on('upload.progress', (msg) => { if(window.progress_tracker[msg.operation_id]){ window.progress_tracker[msg.operation_id].cloud_uploaded += msg.loaded_diff if(window.progress_tracker[msg.operation_id][msg.item_upload_id]){ @@ -92,7 +92,7 @@ async function UIDesktop(options){ } }); - socket.on('download.progress', (msg) => { + window.socket.on('download.progress', (msg) => { if(window.progress_tracker[msg.operation_id]){ if(window.progress_tracker[msg.operation_id][msg.item_upload_id]){ window.progress_tracker[msg.operation_id][msg.item_upload_id].downloaded = msg.loaded; @@ -101,30 +101,30 @@ async function UIDesktop(options){ } }); - socket.on('trash.is_empty', async (msg) => { - $(`.item[data-path="${html_encode(trash_path)}" i]`).find('.item-icon > img').attr('src', msg.is_empty ? window.icons['trash.svg'] : window.icons['trash-full.svg']); - $(`.window[data-path="${html_encode(trash_path)}" i]`).find('.window-head-icon').attr('src', msg.is_empty ? window.icons['trash.svg'] : window.icons['trash-full.svg']); + window.socket.on('trash.is_empty', async (msg) => { + $(`.item[data-path="${html_encode(window.trash_path)}" i]`).find('.item-icon > img').attr('src', msg.is_empty ? window.icons['trash.svg'] : window.icons['trash-full.svg']); + $(`.window[data-path="${html_encode(window.trash_path)}" i]`).find('.window-head-icon').attr('src', msg.is_empty ? window.icons['trash.svg'] : window.icons['trash-full.svg']); // empty trash windows if needed if(msg.is_empty) - $(`.window[data-path="${html_encode(trash_path)}" i]`).find('.item-container').empty(); + $(`.window[data-path="${html_encode(window.trash_path)}" i]`).find('.item-container').empty(); }) - socket.on('app.opened', async (app) => { + window.socket.on('app.opened', async (app) => { // don't update if this is the original client that initiated the action if(app.original_client_socket_id === window.socket.id) return; // add the app to the beginning of the array - launch_apps.recent.unshift(app); + window.launch_apps.recent.unshift(app); // dedupe the array by uuid, uid, and id - launch_apps.recent = _.uniqBy(launch_apps.recent, 'name'); + window.launch_apps.recent = _.uniqBy(window.launch_apps.recent, 'name'); // limit to 5 - launch_apps.recent = launch_apps.recent.slice(0, window.launch_recent_apps_count); + window.launch_apps.recent = window.launch_apps.recent.slice(0, window.launch_recent_apps_count); }) - socket.on('item.removed', async (item) => { + window.socket.on('item.removed', async (item) => { // don't update if this is the original client that initiated the action if(item.original_client_socket_id === window.socket.id) return; @@ -143,17 +143,17 @@ async function UIDesktop(options){ }); }) - socket.on('item.updated', async (item) => { + window.socket.on('item.updated', async (item) => { // Don't update if this is the original client that initiated the action if(item.original_client_socket_id === window.socket.id) return; // Update matching items // set new item name - $(`.item[data-uid='${html_encode(item.uid)}'] .item-name`).html(html_encode(truncate_filename(item.name, TRUNCATE_LENGTH)).replaceAll(' ', ' ')); + $(`.item[data-uid='${html_encode(item.uid)}'] .item-name`).html(html_encode(window.truncate_filename(item.name, window.TRUNCATE_LENGTH)).replaceAll(' ', ' ')); // Set new icon - const new_icon = (item.is_dir ? window.icons['folder.svg'] : (await item_icon(item)).image); + const new_icon = (item.is_dir ? window.icons['folder.svg'] : (await window.item_icon(item)).image); $(`.item[data-uid='${item.uid}']`).find('.item-icon-thumb').attr('src', new_icon); $(`.item[data-uid='${item.uid}']`).find('.item-icon-icon').attr('src', new_icon); @@ -189,21 +189,21 @@ async function UIDesktop(options){ // Update all exact-matching windows $(`.window-${item.uid}`).each(function(){ - update_window_path(this, new_path); + window.update_window_path(this, new_path); }) // Set new name for matching open windows $(`.window-${item.uid} .window-head-title`).text(item.name); // Re-sort all matching item containers $(`.item[data-uid='${item.uid}']`).parent('.item-container').each(function(){ - sort_items(this, $(this).closest('.item-container').attr('data-sort_by'), $(this).closest('.item-container').attr('data-sort_order')); + window.sort_items(this, $(this).closest('.item-container').attr('data-sort_by'), $(this).closest('.item-container').attr('data-sort_order')); }) }) - socket.on('item.moved', async (resp) => { + window.socket.on('item.moved', async (resp) => { let fsentry = resp; // Notify all apps that are watching this item - sendItemChangeEventToWatchingApps(fsentry.uid, { + window.sendItemChangeEventToWatchingApps(fsentry.uid, { event: 'moved', uid: fsentry.uid, name: fsentry.name, @@ -216,9 +216,6 @@ async function UIDesktop(options){ let dest_path = path.dirname(fsentry.path); let metadata = fsentry.metadata; - // path must use the real name from DB - fsentry.path = fsentry.path; - // update all shortcut_to_path $(`.item[data-shortcut_to_path="${html_encode(resp.old_path)}" i]`).attr(`data-shortcut_to_path`, html_encode(fsentry.path)); @@ -230,13 +227,13 @@ async function UIDesktop(options){ $(this).removeItems(); // update parent windows' item counts $(parent_windows).each(function(index){ - update_explorer_footer_item_count(this); - update_explorer_footer_selected_items_count(this) + window.update_explorer_footer_item_count(this); + window.update_explorer_footer_selected_items_count(this) }); }) // if trashing, close windows of trashed items and its descendants - if(dest_path === trash_path){ + if(dest_path === window.trash_path){ $(`.window[data-path="${html_encode(resp.old_path)}" i]`).close(); // todo this has to be case-insensitive but the `i` selector doesn't work on ^= $(`.window[data-path^="${html_encode(resp.old_path)}/"]`).close(); @@ -246,11 +243,11 @@ async function UIDesktop(options){ else{ // todo this has to be case-insensitive but the `i` selector doesn't work on ^= $(`.window[data-path^="${html_encode(resp.old_path)}/"], .window[data-path="${html_encode(resp.old_path)}" i]`).each(function(){ - update_window_path(this, $(this).attr('data-path').replace(resp.old_path, fsentry.path)); + window.update_window_path(this, $(this).attr('data-path').replace(resp.old_path, fsentry.path)); }) } - if(dest_path === trash_path){ + if(dest_path === window.trash_path){ $(`.item[data-uid="${fsentry.uid}"]`).find('.item-is-shared').fadeOut(300); // if trashing dir... @@ -277,14 +274,14 @@ async function UIDesktop(options){ immutable: fsentry.immutable, uid: fsentry.uid, path: fsentry.path, - icon: await item_icon(fsentry), - name: (dest_path === trash_path) ? metadata.original_name : fsentry.name, + icon: await window.item_icon(fsentry), + name: (dest_path === window.trash_path) ? metadata.original_name : fsentry.name, is_dir: fsentry.is_dir, size: fsentry.size, type: fsentry.type, modified: fsentry.modified, is_selected: false, - is_shared: (dest_path === trash_path) ? false : fsentry.is_shared, + is_shared: (dest_path === window.trash_path) ? false : fsentry.is_shared, is_shortcut: fsentry.is_shortcut, shortcut_to: fsentry.shortcut_to, shortcut_to_path: fsentry.shortcut_to_path, @@ -305,7 +302,7 @@ async function UIDesktop(options){ immutable: false, uid: dir.uid, path: dir.path, - icon: await item_icon(dir), + icon: await window.item_icon(dir), name: dir.name, size: dir.size, type: dir.type, @@ -316,34 +313,34 @@ async function UIDesktop(options){ has_website: false, }); } - sort_items(item_container, $(item_container).attr('data-sort_by'), $(item_container).attr('data-sort_order')); + window.sort_items(item_container, $(item_container).attr('data-sort_by'), $(item_container).attr('data-sort_order')); }); } //sort each container $(`.item-container[data-path='${html_encode(dest_path)}' i]`).each(function(){ - sort_items(this, $(this).attr('data-sort_by'), $(this).attr('data-sort_order')) + window.sort_items(this, $(this).attr('data-sort_by'), $(this).attr('data-sort_order')) }) }); - socket.on('user.email_confirmed', (msg) => { + window.socket.on('user.email_confirmed', (msg) => { // don't update if this is the original client that initiated the action if(msg.original_client_socket_id === window.socket.id) return; - refresh_user_data(window.auth_token); + window.refresh_user_data(window.auth_token); }); - socket.on('user.email_changed', (msg) => { + window.socket.on('user.email_changed', (msg) => { // don't update if this is the original client that initiated the action if(msg.original_client_socket_id === window.socket.id) return; - refresh_user_data(window.auth_token); + window.refresh_user_data(window.auth_token); }); - socket.on('item.renamed', async (item) => { + window.socket.on('item.renamed', async (item) => { // Notify all apps that are watching this item - sendItemChangeEventToWatchingApps(item.uid, { + window.sendItemChangeEventToWatchingApps(item.uid, { event: 'rename', uid: item.uid, // path: item.path, @@ -357,10 +354,10 @@ async function UIDesktop(options){ // Update matching items // Set new item name - $(`.item[data-uid='${html_encode(item.uid)}'] .item-name`).html(html_encode(truncate_filename(item.name, TRUNCATE_LENGTH)).replaceAll(' ', ' ')); + $(`.item[data-uid='${html_encode(item.uid)}'] .item-name`).html(html_encode(window.truncate_filename(item.name, window.TRUNCATE_LENGTH)).replaceAll(' ', ' ')); // Set new icon - const new_icon = (item.is_dir ? window.icons['folder.svg'] : (await item_icon(item)).image); + const new_icon = (item.is_dir ? window.icons['folder.svg'] : (await window.item_icon(item)).image); $(`.item[data-uid='${item.uid}']`).find('.item-icon-icon').attr('src', new_icon); // Set new data-name @@ -395,24 +392,24 @@ async function UIDesktop(options){ // Update all exact-matching windows $(`.window-${item.uid}`).each(function(){ - update_window_path(this, new_path); + window.update_window_path(this, new_path); }) // Set new name for matching open windows $(`.window-${item.uid} .window-head-title`).text(item.name); // Re-sort all matching item containers $(`.item[data-uid='${item.uid}']`).parent('.item-container').each(function(){ - sort_items(this, $(this).closest('.item-container').attr('data-sort_by'), $(this).closest('.item-container').attr('data-sort_order')); + window.sort_items(this, $(this).closest('.item-container').attr('data-sort_by'), $(this).closest('.item-container').attr('data-sort_order')); }) }); - socket.on('item.added', async (item) => { + window.socket.on('item.added', async (item) => { // if item is empty, don't proceed if(_.isEmpty(item)) return; // Notify all apps that are watching this item - sendItemChangeEventToWatchingApps(item.uid, { + window.sendItemChangeEventToWatchingApps(item.uid, { event: 'write', uid: item.uid, // path: item.path, @@ -437,12 +434,12 @@ async function UIDesktop(options){ 'data-type': item.type, }) // set new icon - const new_icon = (item.is_dir ? window.icons['folder.svg'] : (await item_icon(item)).image); + const new_icon = (item.is_dir ? window.icons['folder.svg'] : (await window.item_icon(item)).image); $(`.item[data-uid="${item.overwritten_uid}"]`).find('.item-icon > img').attr('src', new_icon); //sort each window $(`.item-container[data-path='${html_encode(item.dirpath)}' i]`).each(function(){ - sort_items(this, $(this).attr('data-sort_by'), $(this).attr('data-sort_order')) + window.sort_items(this, $(this).attr('data-sort_by'), $(this).attr('data-sort_order')) }) } else{ @@ -452,7 +449,7 @@ async function UIDesktop(options){ immutable: item.immutable, associated_app_name: item.associated_app?.name, path: item.path, - icon: await item_icon(item), + icon: await window.item_icon(item), name: item.name, size: item.size, type: item.type, @@ -460,14 +457,13 @@ async function UIDesktop(options){ is_dir: item.is_dir, is_shared: item.is_shared, is_shortcut: item.is_shortcut, - associated_app_name: item.associated_app?.name, shortcut_to: item.shortcut_to, shortcut_to_path: item.shortcut_to_path, }); //sort each window $(`.item-container[data-path='${html_encode(item.dirpath)}' i]`).each(function(){ - sort_items(this, $(this).attr('data-sort_by'), $(this).attr('data-sort_order')) + window.sort_items(this, $(this).attr('data-sort_by'), $(this).attr('data-sort_order')) }) } }); @@ -488,12 +484,12 @@ async function UIDesktop(options){ data-uid="${options.desktop_fsentry.uid}" data-sort_by="${!options.desktop_fsentry.sort_by ? 'name' : options.desktop_fsentry.sort_by}" data-sort_order="${!options.desktop_fsentry.sort_order ? 'asc' : options.desktop_fsentry.sort_order}" - data-path="${html_encode(desktop_path)}" + data-path="${html_encode(window.desktop_path)}" >`; h += `
`; // Get window sidebar width - getItem({ + window.getItem({ key: "window_sidebar_width", success: async function(res){ let value = parseInt(res.value); @@ -505,7 +501,7 @@ async function UIDesktop(options){ }) // Remove `?ref=...` from navbar URL - if(url_query_params.has('ref')){ + if(window.url_query_params.has('ref')){ window.history.pushState(null, document.title, '/'); } @@ -522,7 +518,7 @@ async function UIDesktop(options){ user_preferences[default_app_keys[key].substring(17)] = await puter.kv.get(default_app_keys[key]); } - update_user_preferences(user_preferences); + window.update_user_preferences(user_preferences); }); // Append to @@ -557,7 +553,7 @@ async function UIDesktop(options){ return false; // recursively create directories and upload files if(e.dataTransfer?.items?.length>0){ - upload_items(e.dataTransfer.items, desktop_path); + window.upload_items(e.dataTransfer.items, window.desktop_path); } e.stopPropagation(); @@ -574,7 +570,7 @@ async function UIDesktop(options){ tolerance: "intersect", drop: function( event, ui ) { // Check if item was actually dropped on desktop and not a window - if(mouseover_window !== undefined) + if(window.mouseover_window !== undefined) return; // Can't drop anything but UIItems on desktop @@ -582,7 +578,7 @@ async function UIDesktop(options){ return; // Don't move an item to its current directory - if( path.dirname($(ui.draggable).attr('data-path')) === desktop_path && !event.ctrlKey) + if( path.dirname($(ui.draggable).attr('data-path')) === window.desktop_path && !event.ctrlKey) return; // If ctrl is pressed and source is Trashed, cancel whole operation @@ -610,11 +606,11 @@ async function UIDesktop(options){ if(path.dirname($(ui.draggable).attr('data-path')) === window.trash_path) return; - copy_items(items_to_move, desktop_path) + window.copy_items(items_to_move, window.desktop_path) } // otherwise, move items else{ - move_items(items_to_move, desktop_path); + window.move_items(items_to_move, window.desktop_path); } } }); @@ -646,16 +642,16 @@ async function UIDesktop(options){ items: [ { html: i18n('auto_arrange'), - icon: is_auto_arrange_enabled ? '✓' : '', + icon: window.is_auto_arrange_enabled ? '✓' : '', onClick: async function(){ - is_auto_arrange_enabled = !is_auto_arrange_enabled; - store_auto_arrange_preference(is_auto_arrange_enabled); - if(is_auto_arrange_enabled){ - sort_items(el_desktop, $(el_desktop).attr('data-sort_by'), $(el_desktop).attr('data-sort_order')); - set_sort_by(options.desktop_fsentry.uid, $(el_desktop).attr('data-sort_by'), $(el_desktop).attr('data-sort_order')) - clear_desktop_item_positions(el_desktop); + window.is_auto_arrange_enabled = !window.is_auto_arrange_enabled; + window.store_auto_arrange_preference(window.is_auto_arrange_enabled); + if(window.is_auto_arrange_enabled){ + window.sort_items(el_desktop, $(el_desktop).attr('data-sort_by'), $(el_desktop).attr('data-sort_order')); + window.set_sort_by(options.desktop_fsentry.uid, $(el_desktop).attr('data-sort_by'), $(el_desktop).attr('data-sort_order')) + window.clear_desktop_item_positions(el_desktop); }else{ - set_desktop_item_positions(el_desktop) + window.set_desktop_item_positions(el_desktop) } } }, @@ -665,38 +661,38 @@ async function UIDesktop(options){ '-', { html: i18n('name'), - disabled: !is_auto_arrange_enabled, + disabled: !window.is_auto_arrange_enabled, icon: $(el_desktop).attr('data-sort_by') === 'name' ? '✓' : '', onClick: async function(){ - sort_items(el_desktop, 'name', $(el_desktop).attr('data-sort_order')); - set_sort_by(options.desktop_fsentry.uid, 'name', $(el_desktop).attr('data-sort_order')) + window.sort_items(el_desktop, 'name', $(el_desktop).attr('data-sort_order')); + window.set_sort_by(options.desktop_fsentry.uid, 'name', $(el_desktop).attr('data-sort_order')) } }, { html: i18n('date_modified'), - disabled: !is_auto_arrange_enabled, + disabled: !window.is_auto_arrange_enabled, icon: $(el_desktop).attr('data-sort_by') === 'modified' ? '✓' : '', onClick: async function(){ - sort_items(el_desktop, 'modified', $(el_desktop).attr('data-sort_order')); - set_sort_by(options.desktop_fsentry.uid, 'modified', $(el_desktop).attr('data-sort_order')) + window.sort_items(el_desktop, 'modified', $(el_desktop).attr('data-sort_order')); + window.set_sort_by(options.desktop_fsentry.uid, 'modified', $(el_desktop).attr('data-sort_order')) } }, { html: i18n('type'), - disabled: !is_auto_arrange_enabled, + disabled: !window.is_auto_arrange_enabled, icon: $(el_desktop).attr('data-sort_by') === 'type' ? '✓' : '', onClick: async function(){ - sort_items(el_desktop, 'type', $(el_desktop).attr('data-sort_order')); - set_sort_by(options.desktop_fsentry.uid, 'type', $(el_desktop).attr('data-sort_order')) + window.sort_items(el_desktop, 'type', $(el_desktop).attr('data-sort_order')); + window.set_sort_by(options.desktop_fsentry.uid, 'type', $(el_desktop).attr('data-sort_order')) } }, { html: i18n('size'), - disabled: !is_auto_arrange_enabled, + disabled: !window.is_auto_arrange_enabled, icon: $(el_desktop).attr('data-sort_by') === 'size' ? '✓' : '', onClick: async function(){ - sort_items(el_desktop, 'size', $(el_desktop).attr('data-sort_order')); - set_sort_by(options.desktop_fsentry.uid, 'size', $(el_desktop).attr('data-sort_order')) + window.sort_items(el_desktop, 'size', $(el_desktop).attr('data-sort_order')); + window.set_sort_by(options.desktop_fsentry.uid, 'size', $(el_desktop).attr('data-sort_order')) } }, // ------------------------------------------- @@ -705,22 +701,22 @@ async function UIDesktop(options){ '-', { html: i18n('ascending'), - disabled: !is_auto_arrange_enabled, + disabled: !window.is_auto_arrange_enabled, icon: $(el_desktop).attr('data-sort_order') === 'asc' ? '✓' : '', onClick: async function(){ const sort_by = $(el_desktop).attr('data-sort_by') - sort_items(el_desktop, sort_by, 'asc'); - set_sort_by(options.desktop_fsentry.uid, sort_by, 'asc') + window.sort_items(el_desktop, sort_by, 'asc'); + window.set_sort_by(options.desktop_fsentry.uid, sort_by, 'asc') } }, { html: i18n('descending'), - disabled: !is_auto_arrange_enabled, + disabled: !window.is_auto_arrange_enabled, icon: $(el_desktop).attr('data-sort_order') === 'desc' ? '✓' : '', onClick: async function(){ const sort_by = $(el_desktop).attr('data-sort_by') - sort_items(el_desktop, sort_by, 'desc'); - set_sort_by(options.desktop_fsentry.uid, sort_by, 'desc') + window.sort_items(el_desktop, sort_by, 'desc'); + window.set_sort_by(options.desktop_fsentry.uid, sort_by, 'desc') } }, ] @@ -754,7 +750,7 @@ async function UIDesktop(options){ // ------------------------------------------- // New File // ------------------------------------------- - new_context_menu_item(desktop_path, el_desktop), + new_context_menu_item(window.desktop_path, el_desktop), // ------------------------------------------- // - // ------------------------------------------- @@ -764,12 +760,12 @@ async function UIDesktop(options){ // ------------------------------------------- { html: i18n('paste'), - disabled: clipboard.length > 0 ? false : true, + disabled: window.clipboard.length > 0 ? false : true, onClick: function(){ - if(clipboard_op === 'copy') - copy_clipboard_items(desktop_path, el_desktop); - else if(clipboard_op === 'move') - move_clipboard_items(el_desktop) + if(window.clipboard_op === 'copy') + window.copy_clipboard_items(window.desktop_path, el_desktop); + else if(window.clipboard_op === 'move') + window.move_clipboard_items(el_desktop) } }, // ------------------------------------------- @@ -777,9 +773,9 @@ async function UIDesktop(options){ // ------------------------------------------- { html: i18n('undo'), - disabled: actions_history.length > 0 ? false : true, + disabled: window.actions_history.length > 0 ? false : true, onClick: function(){ - undo_last_action(); + window.undo_last_action(); } }, // ------------------------------------------- @@ -788,7 +784,7 @@ async function UIDesktop(options){ { html: i18n('upload_here'), onClick: function(){ - init_upload_using_dialog(el_desktop); + window.init_upload_using_dialog(el_desktop); } }, // ------------------------------------------- @@ -815,7 +811,7 @@ async function UIDesktop(options){ // we don't need to get the desktop items if we're in embedded or fullpage mode // because the items aren't visible anyway and we don't need to waste bandwidth/server resources //------------------------------------------- - if(!is_embedded && !window.is_fullpage_mode){ + if(!window.is_embedded && !window.is_fullpage_mode){ refresh_item_container(el_desktop, {fadeInItems: true}) } @@ -908,7 +904,7 @@ async function UIDesktop(options){ } // refer - if(user.referral_code){ + if(window.user.referral_code){ ht += `
`; } @@ -919,7 +915,7 @@ async function UIDesktop(options){ } // qr code button -- only show if not embedded - if(!is_embedded) + if(!window.is_embedded) ht += `
`; // user options menu @@ -937,17 +933,17 @@ async function UIDesktop(options){ // --------------------------------------------- // Run apps from insta-login URL // --------------------------------------------- - if(url_query_params.has('app')){ - let url_app_name = url_query_params.get('app'); + if(window.url_query_params.has('app')){ + let url_app_name = window.url_query_params.get('app'); if(url_app_name === 'explorer'){ - let predefined_path = home_path; - if(url_query_params.has('path')) - predefined_path =url_query_params.get('path') + let predefined_path = window.home_path; + if(window.url_query_params.has('path')) + predefined_path =window.url_query_params.get('path') // launch explorer UIWindow({ path: predefined_path, title: path.basename(predefined_path), - icon: await item_icon({is_dir: true, path: predefined_path}), + icon: await window.item_icon({is_dir: true, path: predefined_path}), // todo // uid: $(el_item).attr('data-uid'), is_dir: true, @@ -963,11 +959,11 @@ async function UIDesktop(options){ else if(window.app_launched_from_url){ let qparams = new URLSearchParams(window.location.search); if(!qparams.has('c')){ - launch_app({ - name: app_launched_from_url, + window.launch_app({ + name: window.app_launched_from_url, readURL: qparams.get('readURL'), maximized: qparams.get('maximized'), - params: app_query_params ?? [], + params: window.app_query_params ?? [], is_fullpage: window.is_fullpage_mode, window_options: { stay_on_top: false, @@ -1014,21 +1010,21 @@ async function UIDesktop(options){ var x1=month + "/" + dt + "/" + x.getFullYear(); x1 = x1 + " - " + hours + ":" + minutes + ":" + seconds + " " + ampm; $('#clock').html(x1); - $('#clock').css('line-height', taskbar_height + 'px'); + $('#clock').css('line-height', window.taskbar_height + 'px'); } setInterval(display_ct, 1000); // show referral notice window - if(window.show_referral_notice && !user.email_confirmed){ - getItem({ + if(window.show_referral_notice && !window.user.email_confirmed){ + window.getItem({ key: "shown_referral_notice", success: async function(res){ if(!res){ setTimeout(() => { UIWindowClaimReferral(); }, 1000); - setItem({ + window.setItem({ key: "shown_referral_notice", value: true, }) @@ -1122,13 +1118,13 @@ $(document).on('click', '.user-options-menu-btn', async function(e){ items.push( { html: l_user.username, - icon: l_user.username === user.username ? '✓' : '', + icon: l_user.username === window.user.username ? '✓' : '', onClick: async function(val){ // don't reload everything if clicked on already-logged-in user - if(l_user.username === user.username) + if(l_user.username === window.user.username) return; // update auth data - update_auth_data(l_user.auth_token, l_user); + window.update_auth_data(l_user.auth_token, l_user); // refresh location.reload(); } @@ -1167,7 +1163,7 @@ $(document).on('click', '.user-options-menu-btn', async function(e){ // ------------------------------------------- // Load available languages // ------------------------------------------- - const supportedLanguagesItems = listSupportedLanguages().map(lang => { + const supportedLanguagesItems = window.listSupportedLanguages().map(lang => { return { html: lang.name, icon: window.locale === lang.code ? '✓' : '', @@ -1246,11 +1242,11 @@ $(document).on('click', '.user-options-menu-btn', async function(e){ ] }) if(alert_resp === 'close_and_log_out') - logout(); + window.logout(); } // no open windows else - logout(); + window.logout(); } }, ] @@ -1258,7 +1254,7 @@ $(document).on('click', '.user-options-menu-btn', async function(e){ }) $(document).on('click', '.fullscreen-btn', async function (e) { - if(!is_fullscreen()) { + if(!window.is_fullscreen()) { var elem = document.documentElement; if (elem.requestFullscreen) { elem.requestFullscreen(); @@ -1305,7 +1301,7 @@ $(document).on('click', '.refer-btn', async function(e){ }) $(document).on('click', '.start-app', async function(e){ - launch_app({ + window.launch_app({ name: $(this).attr('data-app-name') }) // close popovers @@ -1367,7 +1363,7 @@ $(document).on('focus', '.launch-search', function(e){ }) $(document).on('change keyup keypress keydown paste', '.launch-search', function(e){ - // search launch_apps.recommended for query + // search window.launch_apps.recommended for query const query = $(this).val().toLowerCase(); if(query === ''){ $('.launch-search-clear').hide(); @@ -1378,7 +1374,7 @@ $(document).on('change keyup keypress keydown paste', '.launch-search', function $('.launch-apps-recent').hide(); $('.start-section-heading').hide(); $('.launch-search-clear').show(); - launch_apps.recommended.forEach((app)=>{ + window.launch_apps.recommended.forEach((app)=>{ if(app.title.toLowerCase().includes(query.toLowerCase())){ $(`.start-app-card[data-name="${app.name}"]`).show(); }else{ @@ -1457,7 +1453,7 @@ window.update_taskbar = function(){ // update taskbar in the server-side $.ajax({ - url: api_origin + "/update-taskbar-items", + url: window.api_origin + "/update-taskbar-items", type: 'POST', data: JSON.stringify({ items: items, @@ -1465,7 +1461,7 @@ window.update_taskbar = function(){ async: true, contentType: "application/json", headers: { - "Authorization": "Bearer "+auth_token + "Authorization": "Bearer "+window.auth_token }, }) } @@ -1485,7 +1481,7 @@ window.enter_fullpage_mode = (el_window)=>{ $(el_window).css({ width: '100%', height: '100%', - top: toolbar_height + 'px', + top: window.toolbar_height + 'px', left: 0, 'border-radius': 0, }); @@ -1499,7 +1495,7 @@ window.exit_fullpage_mode = (el_window)=>{ refresh_item_container($('.desktop.item-container'), {fadeInItems: true}); $(el_window).removeAttr('data-is_fullpage'); if(el_window){ - reset_window_size_and_position(el_window) + window.reset_window_size_and_position(el_window) $(el_window).find('.window-head').show(); } @@ -1510,14 +1506,14 @@ window.exit_fullpage_mode = (el_window)=>{ $('.show-desktop-btn').hide(); // refresh desktop background - refresh_desktop_background(); + window.refresh_desktop_background(); } window.reset_window_size_and_position = (el_window)=>{ $(el_window).css({ width: 680, height: 380, - 'border-radius': window_border_radius, + 'border-radius': window.window_border_radius, top: 'calc(50% - 190px)', left: 'calc(50% - 340px)', }); From 620a1a13348fe61b102740015593f0ca88b5a689 Mon Sep 17 00:00:00 2001 From: Sam Atkins Date: Wed, 1 May 2024 15:17:43 +0100 Subject: [PATCH 32/68] chore: Clarify usage of window fields in UIItem.js /puter/src/UI/UIItem.js 42:21 error 'global_element_id' is not defined no-undef 62:23 error 'determine_website_url' is not defined no-undef 100:58 error 'timeago' is not defined no-undef 104:42 error 'byte_format' is not defined no-undef 161:151 error 'truncate_filename' is not defined no-undef 161:183 error 'TRUNCATE_LENGTH' is not defined no-undef 171:5 error 'show_or_hide_empty_folder_message' is not defined no-undef 178:64 error 'trash_path' is not defined no-undef 186:9 error 'update_explorer_footer_item_count' is not defined no-undef 190:10 error 'is_auto_arrange_enabled' is not defined no-undef 217:21 error 'upload_items' is not defined no-undef 336:16 error 'mouseover_window' is not defined no-undef 337:39 error 'mouseover_window' is not defined no-undef 338:23 error 'mouseover_window' is not defined no-undef 341:24 error 'mouseX' is not defined no-undef 341:46 error 'mouseX' is not defined no-undef 341:69 error 'mouseY' is not defined no-undef 341:90 error 'mouseY' is not defined no-undef 342:88 error 'mouseX' is not defined no-undef 342:113 error 'mouseY' is not defined no-undef 350:18 error 'is_auto_arrange_enabled' is not defined no-undef 350:78 error 'trash_path' is not defined no-undef 352:17 error 'mouseover_window' is not defined no-undef 358:17 error 'desktop_item_positions' is not defined no-undef 359:17 error 'save_desktop_item_positions' is not defined no-undef 383:73 error 'mouseover_window' is not defined no-undef 427:21 error 'launch_app' is not defined no-undef 448:25 error 'copy_items' is not defined no-undef 450:25 error 'copy_items' is not defined no-undef 455:25 error 'create_shortcut' is not defined no-undef 468:32 error 'desktop_item_positions' is not defined no-undef 469:25 error 'save_desktop_item_positions' is not defined no-undef 471:21 error 'move_items' is not defined no-undef 483:89 error 'mouseover_window' is not defined no-undef 525:13 error 'open_item' is not defined no-undef 540:13 error 'open_item' is not defined no-undef 579:9 error 'update_explorer_footer_selected_items_count' is not defined no-undef 596:13 error 'update_explorer_footer_selected_items_count' is not defined no-undef 651:34 error 'truncate_filename' is not defined no-undef 651:66 error 'TRUNCATE_LENGTH' is not defined no-undef 661:9 error 'rename_file' is not defined no-undef 678:13 error 'last_enter_pressed_to_rename_ts' is not defined no-undef 679:13 error 'update_explorer_footer_selected_items_count' is not defined no-undef 718:25 error 'activate_item_name_editor' is not defined no-undef 763:78 error 'trash_path' is not defined no-undef 775:29 error 'move_items' is not defined no-undef 796:25 error 'zipItems' is not defined no-undef 810:25 error 'zipItems' is not defined no-undef 875:39 error 'delete_item' is not defined no-undef 877:63 error 'trash_path' is not defined no-undef 885:67 error 'trash_path' is not defined no-undef 885:116 error 'trash_path' is not defined no-undef 886:69 error 'trash_path' is not defined no-undef 906:29 error 'create_shortcut' is not defined no-undef 925:25 error 'move_items' is not defined no-undef 925:53 error 'trash_path' is not defined no-undef 936:63 error 'trash_path' is not defined no-undef 936:122 error 'trash_path' is not defined no-undef 945:25 error 'open_item' is not defined no-undef 962:49 error 'suggest_apps_for_fsentry' is not defined no-undef 984:37 error 'user_preferences' is not defined no-undef 987:43 error 'user_preferences' is not defined no-undef 989:42 error 'user_preferences' is not defined no-undef 1007:41 error 'user_preferences' is not defined no-undef 1008:72 error 'user_preferences' is not defined no-undef 1011:33 error 'launch_app' is not defined no-undef 1047:29 error 'open_item' is not defined no-undef 1093:25 error 'launch_app' is not defined no-undef 1114:25 error 'empty_trash' is not defined no-undef 1127:29 error 'zipItems' is not defined no-undef 1129:29 error 'trigger_download' is not defined no-undef 1140:25 error 'zipItems' is not defined no-undef 1151:41 error 'JSZip' is not defined no-undef 1180:25 error 'move_items' is not defined no-undef 1219:31 error 'clipboard' is not defined no-undef 1221:28 error 'clipboard_op' is not defined no-undef 1222:29 error 'copy_clipboard_items' is not defined no-undef 1223:33 error 'clipboard_op' is not defined no-undef 1224:29 error 'move_clipboard_items' is not defined no-undef 1247:25 error 'create_shortcut' is not defined no-undef 1265:25 error 'move_items' is not defined no-undef 1265:47 error 'trash_path' is not defined no-undef 1290:35 error 'delete_item' is not defined no-undef 1292:63 error 'trash_path' is not defined no-undef 1299:67 error 'trash_path' is not defined no-undef 1299:128 error 'trash_path' is not defined no-undef 1300:57 error 'trash_path' is not defined no-undef 1313:25 error 'activate_item_name_editor' is not defined no-undef 1373:9 error 'sort_items' is not defined no-undef 1376:9 error 'activate_item_name_editor' is not defined no-undef 1433:31 error 'copy_to_clipboard' is not defined no-undef 1517:9 error 'show_or_hide_empty_folder_message' is not defined no-undef --- src/UI/UIItem.js | 156 +++++++++++++++++++++++------------------------ 1 file changed, 78 insertions(+), 78 deletions(-) diff --git a/src/UI/UIItem.js b/src/UI/UIItem.js index f2c2c49a4..b601df1c8 100644 --- a/src/UI/UIItem.js +++ b/src/UI/UIItem.js @@ -39,7 +39,7 @@ function UIItem(options){ return; } - const item_id = global_element_id++; + const item_id = window.global_element_id++; let last_mousedown_ts = 999999999999999; let rename_cancelled = false; @@ -59,7 +59,7 @@ function UIItem(options){ options.sort_container_after_append = (options.sort_container_after_append !== undefined ? options.sort_container_after_append : false); const is_shared_with_me = (options.path !== '/'+window.user.username && !options.path.startsWith('/'+window.user.username+'/')); - let website_url = determine_website_url(options.path); + let website_url = window.determine_website_url(options.path); // do a quick check to see if the target parent has any file type restrictions const appendto_allowed_file_types = $(options.appendTo).attr('data-allowed_file_types') @@ -101,7 +101,7 @@ function UIItem(options){ h += `
`; // size h += `
`; - h += `${options.size ? byte_format(options.size) : '-'}`; + h += `${options.size ? window.byte_format(options.size) : '-'}`; h += `
`; // type h += `
`; @@ -158,7 +158,7 @@ function UIItem(options){ h += `
`; // name - h += `${options.is_trash ? i18n('trash') : html_encode(truncate_filename(options.name, TRUNCATE_LENGTH)).replaceAll(' ', ' ')}` + h += `${options.is_trash ? i18n('trash') : html_encode(window.truncate_filename(options.name, window.TRUNCATE_LENGTH)).replaceAll(' ', ' ')}` // name editor h += `` h += `
`; @@ -168,14 +168,14 @@ function UIItem(options){ // updte item_container const item_container = $(options.appendTo).closest('.item-container'); - show_or_hide_empty_folder_message(item_container); + window.show_or_hide_empty_folder_message(item_container); // get all the elements needed const el_item = document.getElementById(`item-${item_id}`); const el_item_name = document.querySelector(`#item-${item_id} > .item-name`); const el_item_icon = document.querySelector(`#item-${item_id} .item-icon`); const el_item_name_editor = document.querySelector(`#item-${item_id} > .item-name-editor`); - const is_trashed = $(el_item).attr('data-path').startsWith(trash_path + '/'); + const is_trashed = $(el_item).attr('data-path').startsWith(window.trash_path + '/'); // update parent window's explorer item count if applicable if(options.appendTo !== undefined){ @@ -183,11 +183,11 @@ function UIItem(options){ if(!$(el_window).hasClass('.window')) el_window = $(el_window).closest('.window'); - update_explorer_footer_item_count(el_window); + window.update_explorer_footer_item_count(el_window); } // manual positioning - if( !is_auto_arrange_enabled && + if( !window.is_auto_arrange_enabled && options.position && // item is on the desktop (must be desktop itself and not a window, hence the '.desktop' class check) $(el_item).closest('.item-container.desktop').attr('data-path') === window.desktop_path @@ -214,7 +214,7 @@ function UIItem(options){ $(el_item).removeClass('item-selected'); // if files were dropped... if(e.dataTransfer?.items?.length > 0){ - upload_items( e.dataTransfer.items, $(el_item).attr('data-path')) + window.upload_items( e.dataTransfer.items, $(el_item).attr('data-path')) } e.stopPropagation(); @@ -333,13 +333,13 @@ function UIItem(options){ } // send drag event to iframe if mouse is inside iframe - if(mouseover_window){ - const $app_iframe = $(mouseover_window).find('.window-app-iframe'); - if(!$(mouseover_window).hasClass('window-disabled') && $app_iframe.length > 0){ + if(window.mouseover_window){ + const $app_iframe = $(window.mouseover_window).find('.window-app-iframe'); + if(!$(window.mouseover_window).hasClass('window-disabled') && $app_iframe.length > 0){ var rect = $app_iframe.get(0).getBoundingClientRect(); // if mouse is inside iframe, send drag message to iframe - if(mouseX > rect.left && mouseX < rect.right && mouseY > rect.top && mouseY < rect.bottom){ - $app_iframe.get(0).contentWindow.postMessage({msg: "drag", x: (mouseX - rect.left), y: (mouseY - rect.top)}, '*'); + if(window.mouseX > rect.left && window.mouseX < rect.right && window.mouseY > rect.top && window.mouseY < rect.bottom){ + $app_iframe.get(0).contentWindow.postMessage({msg: "drag", x: (window.mouseX - rect.left), y: (window.mouseY - rect.top)}, '*'); } } } @@ -347,16 +347,16 @@ function UIItem(options){ stop: function(event, ui){ // Allow rearranging only if item is on desktop, not trash container, auto arrange is disabled and item is not dropped into another item if($(el_item).closest('.item-container').attr('data-path') === window.desktop_path && - !is_auto_arrange_enabled && $(el_item).attr('data-path') !== trash_path && !ui.helper.data('dropped') && + !window.is_auto_arrange_enabled && $(el_item).attr('data-path') !== window.trash_path && !ui.helper.data('dropped') && // Item must be dropped on the Desktop and not on the taskbar - mouseover_window === undefined && ui.position.top <= window.desktop_height - window.taskbar_height - 15){ + window.mouseover_window === undefined && ui.position.top <= window.desktop_height - window.taskbar_height - 15){ el_item.style.position = 'absolute'; el_item.style.left = ui.position.left + 'px'; el_item.style.top = ui.position.top + 'px'; $('.ui-draggable-dragging').remove(); - desktop_item_positions[$(el_item).attr('data-uid')] = ui.position; - save_desktop_item_positions() + window.desktop_item_positions[$(el_item).attr('data-uid')] = ui.position; + window.save_desktop_item_positions() } $('.item-selected-clone').remove(); @@ -380,7 +380,7 @@ function UIItem(options){ tolerance: 'pointer', drop: async function( event, ui ) { // Check if hovering over an item that is VISIBILE - if($(event.target).closest('.window').attr('data-id') !== $(mouseover_window).attr('data-id')) + if($(event.target).closest('.window').attr('data-id') !== $(window.mouseover_window).attr('data-id')) return; // If ctrl is pressed and source is Trashed, cancel whole operation @@ -424,7 +424,7 @@ function UIItem(options){ // open each item for (let i = 0; i < items_to_open.length; i++) { const item = items_to_open[i]; - launch_app({ + window.launch_app({ name: options.associated_app_name, file_path: item.path, // app_obj: open_item_meta.suggested_apps[0], @@ -445,14 +445,14 @@ function UIItem(options){ // If ctrl key is down, copy items. Except if target or source is Trash if(event.ctrlKey){ if(options.is_dir && $(el_item).attr('data-path') !== window.trash_path ) - copy_items(items_to_move, $(el_item).attr('data-path')) + window.copy_items(items_to_move, $(el_item).attr('data-path')) else if(!options.is_dir) - copy_items(items_to_move, path.dirname($(el_item).attr('data-path'))); + window.copy_items(items_to_move, path.dirname($(el_item).attr('data-path'))); } // If alt key is down, create shortcut items else if(event.altKey && window.feature_flags.create_shortcut){ items_to_move.forEach((item_to_move) => { - create_shortcut( + window.create_shortcut( path.basename($(item_to_move).attr('data-path')), $(item_to_move).attr('data-is_dir') === '1', options.is_dir ? $(el_item).attr('data-path') : path.dirname($(el_item).attr('data-path')), @@ -465,10 +465,10 @@ function UIItem(options){ // Otherwise, move items else if(options.is_dir){ if($(el_item).closest('.item-container').attr('data-path') === window.desktop_path){ - delete desktop_item_positions[$(el_item).attr('data-uid')]; - save_desktop_item_positions() + delete window.desktop_item_positions[$(el_item).attr('data-uid')]; + window.save_desktop_item_positions() } - move_items(items_to_move, $(el_item).attr('data-shortcut_to_path') !== '' ? $(el_item).attr('data-shortcut_to_path') : $(el_item).attr('data-path')); + window.move_items(items_to_move, $(el_item).attr('data-shortcut_to_path') !== '' ? $(el_item).attr('data-shortcut_to_path') : $(el_item).attr('data-path')); } } @@ -480,7 +480,7 @@ function UIItem(options){ over: function(event, ui){ // Check hovering over an item that is VISIBILE const $event_parent_win = $(event.target).closest('.window') - if( $event_parent_win.length > 0 && $event_parent_win.attr('data-id') !== $(mouseover_window).attr('data-id')) + if( $event_parent_win.length > 0 && $event_parent_win.attr('data-id') !== $(window.mouseover_window).attr('data-id')) return; // Don't do anything if the dragged item is NOT a UIItem if(!$(ui.draggable).hasClass('item')) @@ -522,7 +522,7 @@ function UIItem(options){ if($(e.target).hasClass('item-name-editor')) return false; - open_item({ + window.open_item({ item: el_item, maximized: true, }); @@ -537,7 +537,7 @@ function UIItem(options){ if($(e.target).hasClass('item-name-editor')) return false; - open_item({ + window.open_item({ item: el_item, new_window: e.metaKey || e.ctrlKey, }); @@ -576,7 +576,7 @@ function UIItem(options){ else{ $(this).addClass('item-selected') } - update_explorer_footer_selected_items_count($el_parent_window) + window.update_explorer_footer_selected_items_count($el_parent_window) }); // -------------------------------------------------------- // Click @@ -593,7 +593,7 @@ function UIItem(options){ // CTRL/Command key is pressed or clicking an item that is already selected if(!e.ctrlKey && !e.metaKey){ $(this).closest('.item-container').find('.item-selected').not(this).removeClass('item-selected'); - update_explorer_footer_selected_items_count($el_parent_window) + window.update_explorer_footer_selected_items_count($el_parent_window) } //---------------------------------------------------------------- // On an OpenFileDialog? @@ -648,7 +648,7 @@ function UIItem(options){ UIAlert(`The name ".." is not allowed, because it is a reserved name. Please choose another name.`) } - $(el_item_name).html(truncate_filename(options.name, TRUNCATE_LENGTH).replaceAll(' ', ' ')); + $(el_item_name).html(window.truncate_filename(options.name, window.TRUNCATE_LENGTH).replaceAll(' ', ' ')); $(el_item_name).show(); $(el_item_name_editor).val($(el_item).attr('data-name')); $(el_item_name_editor).hide(); @@ -658,7 +658,7 @@ function UIItem(options){ $(el_item_name_editor).removeClass('item-name-editor-active'); // Perform rename request - rename_file(options, new_name, old_name, old_path, el_item, el_item_name, el_item_icon, el_item_name_editor, website_url); + window.rename_file(options, new_name, old_name, old_path, el_item, el_item_name, el_item_icon, el_item_name_editor, website_url); } // -------------------------------------------------------- @@ -675,8 +675,8 @@ function UIItem(options){ e.preventDefault(); $(el_item_name_editor).blur(); $(el_item).addClass('item-selected'); - last_enter_pressed_to_rename_ts = Date.now(); - update_explorer_footer_selected_items_count($(el_item).closest('.item-container')); + window.last_enter_pressed_to_rename_ts = Date.now(); + window.update_explorer_footer_selected_items_count($(el_item).closest('.item-container')); return false; } }) @@ -715,7 +715,7 @@ function UIItem(options){ setTimeout(() => { if(!skip_a_rename_click && (Date.now() - last_mousedown_ts) > 400){ if (!e.ctrlKey && !e.metaKey) - activate_item_name_editor(el_item) + window.activate_item_name_editor(el_item) last_mousedown_ts = 0 }else{ last_mousedown_ts = Date.now() + 500; @@ -760,7 +760,7 @@ function UIItem(options){ // Multiple items selected // ------------------------------------------------------- if($selected_items.length > 1){ - const are_trashed = $selected_items.attr('data-path').startsWith(trash_path + '/'); + const are_trashed = $selected_items.attr('data-path').startsWith(window.trash_path + '/'); menu_items = [] // ------------------------------------------- // Restore @@ -772,7 +772,7 @@ function UIItem(options){ $selected_items.each(function() { const ell = this; let metadata = $(ell).attr('data-metadata') === '' ? {} : JSON.parse($(ell).attr('data-metadata')) - move_items([ell], path.dirname(metadata.original_path)); + window.move_items([ell], path.dirname(metadata.original_path)); }) } }); @@ -793,7 +793,7 @@ function UIItem(options){ items.push($selected_items[index]); } - zipItems(items, path.dirname($(el_item).attr('data-path')), true); + window.zipItems(items, path.dirname($(el_item).attr('data-path')), true); } }); // ------------------------------------------- @@ -807,7 +807,7 @@ function UIItem(options){ items.push($selected_items[index]); } - zipItems(items, path.dirname($(el_item).attr('data-path')), false); + window.zipItems(items, path.dirname($(el_item).attr('data-path')), false); } }); // ------------------------------------------- @@ -872,9 +872,9 @@ function UIItem(options){ if((alert_resp) === 'Delete'){ for (let index = 0; index < $selected_items.length; index++) { const element = $selected_items[index]; - await delete_item(element); + await window.delete_item(element); } - const trash = await puter.fs.stat(trash_path); + const trash = await puter.fs.stat(window.trash_path); // update other clients if(window.socket){ @@ -882,8 +882,8 @@ function UIItem(options){ } if(trash.is_empty){ - $(`.item[data-path="${html_encode(trash_path)}" i], .item[data-shortcut_to_path="${trash_path}" i]`).find('.item-icon > img').attr('src', window.icons['trash.svg']); - $(`.window[data-path="${html_encode(trash_path)}"]`).find('.window-head-icon').attr('src', window.icons['trash.svg']); + $(`.item[data-path="${html_encode(window.trash_path)}" i], .item[data-shortcut_to_path="${window.trash_path}" i]`).find('.item-icon > img').attr('src', window.icons['trash.svg']); + $(`.window[data-path="${html_encode(window.trash_path)}"]`).find('.window-head-icon').attr('src', window.icons['trash.svg']); } } } @@ -903,7 +903,7 @@ function UIItem(options){ base_dir = window.desktop_path; } // create shortcut - create_shortcut( + window.create_shortcut( path.basename($(this).attr('data-path')), $(this).attr('data-is_dir') === '1', base_dir, @@ -922,7 +922,7 @@ function UIItem(options){ menu_items.push({ html: i18n('delete'), onClick: async function(){ - move_items($selected_items, trash_path); + window.move_items($selected_items, window.trash_path); } }); } @@ -933,7 +933,7 @@ function UIItem(options){ // One item selected // ------------------------------------------------------- else{ - const is_trash = $(el_item).attr('data-path') === trash_path || $(el_item).attr('data-shortcut_to_path') === trash_path; + const is_trash = $(el_item).attr('data-path') === window.trash_path || $(el_item).attr('data-shortcut_to_path') === window.trash_path; menu_items = []; // ------------------------------------------- // Open @@ -942,7 +942,7 @@ function UIItem(options){ menu_items.push({ html: i18n('open'), onClick: function(){ - open_item({item: el_item}); + window.open_item({item: el_item}); } }); @@ -959,7 +959,7 @@ function UIItem(options){ let items = []; if(!options.suggested_apps || options.suggested_apps.length === 0){ // try to find suitable apps - const suitable_apps = await suggest_apps_for_fsentry({ + const suitable_apps = await window.suggest_apps_for_fsentry({ uid: options.uid, path: options.path, }); @@ -981,12 +981,12 @@ function UIItem(options){ onClick: async function(){ var extension = path.extname($(el_item).attr('data-path')).toLowerCase(); if( - user_preferences[`default_apps${extension}`] !== suggested_app.name + window.user_preferences[`default_apps${extension}`] !== suggested_app.name && ( - (!user_preferences[`default_apps${extension}`] && index > 0) + (!window.user_preferences[`default_apps${extension}`] && index > 0) || - (user_preferences[`default_apps${extension}`]) + (window.user_preferences[`default_apps${extension}`]) ) ){ const alert_resp = await UIAlert({ @@ -1004,11 +1004,11 @@ function UIItem(options){ ] }) if((alert_resp) === 'yes'){ - user_preferences['default_apps' + extension] = suggested_app.name; - window.mutate_user_preferences(user_preferences); + window.user_preferences['default_apps' + extension] = suggested_app.name; + window.mutate_user_preferences(window.user_preferences); } } - launch_app({ + window.launch_app({ name: suggested_app.name, file_path: $(el_item).attr('data-path'), window_title: $(el_item).attr('data-name'), @@ -1044,7 +1044,7 @@ function UIItem(options){ html: i18n('open_in_new_window'), onClick: function(){ if(options.is_dir){ - open_item({item: el_item, new_window: true}) + window.open_item({item: el_item, new_window: true}) } } }); @@ -1090,7 +1090,7 @@ function UIItem(options){ html: i18n('deploy_as_app'), disabled: !options.is_dir, onClick: async function () { - launch_app({ + window.launch_app({ name: 'dev-center', file_path: $(el_item).attr('data-path'), file_uid: $(el_item).attr('data-uid'), @@ -1111,7 +1111,7 @@ function UIItem(options){ menu_items.push({ html: i18n('empty_trash'), onClick: async function(){ - empty_trash(); + window.empty_trash(); } }); } @@ -1124,9 +1124,9 @@ function UIItem(options){ disabled: options.is_dir && !window.feature_flags.download_directory, onClick: async function(){ if(options.is_dir) - zipItems(el_item, path.dirname($(el_item).attr('data-path')), true); + window.zipItems(el_item, path.dirname($(el_item).attr('data-path')), true); else - trigger_download([options.path]); + window.trigger_download([options.path]); } }); } @@ -1137,7 +1137,7 @@ function UIItem(options){ menu_items.push({ html: i18n('zip'), onClick: function(){ - zipItems(el_item, path.dirname($(el_item).attr('data-path')), false); + window.zipItems(el_item, path.dirname($(el_item).attr('data-path')), false); } }) } @@ -1177,7 +1177,7 @@ function UIItem(options){ html: i18n('restore'), onClick: async function(){ let metadata = $(el_item).attr('data-metadata') === '' ? {} : JSON.parse($(el_item).attr('data-metadata')) - move_items([el_item], path.dirname(metadata.original_path)); + window.move_items([el_item], path.dirname(metadata.original_path)); } }); } @@ -1216,12 +1216,12 @@ function UIItem(options){ if($(el_item).attr('data-is_dir') === '1' && !is_trashed && !is_trash){ menu_items.push({ html: i18n('paste_into_folder'), - disabled: clipboard.length > 0 ? false : true, + disabled: window.clipboard.length > 0 ? false : true, onClick: function(){ - if(clipboard_op === 'copy') - copy_clipboard_items($(el_item).attr('data-path'), null); - else if(clipboard_op === 'move') - move_clipboard_items(null, $(el_item).attr('data-path')) + if(window.clipboard_op === 'copy') + window.copy_clipboard_items($(el_item).attr('data-path'), null); + else if(window.clipboard_op === 'move') + window.move_clipboard_items(null, $(el_item).attr('data-path')) } }) } @@ -1244,7 +1244,7 @@ function UIItem(options){ base_dir = window.desktop_path; } - create_shortcut( + window.create_shortcut( path.basename($(el_item).attr('data-path')), options.is_dir, base_dir, @@ -1262,7 +1262,7 @@ function UIItem(options){ menu_items.push({ html: i18n('delete'), onClick: async function(){ - move_items([el_item], trash_path); + window.move_items([el_item], window.trash_path); } }); } @@ -1287,17 +1287,17 @@ function UIItem(options){ }) if((alert_resp) === 'Delete'){ - await delete_item(el_item); + await window.delete_item(el_item); // check if trash is empty - const trash = await puter.fs.stat(trash_path); + const trash = await puter.fs.stat(window.trash_path); // update other clients if(window.socket){ window.socket.emit('trash.is_empty', {is_empty: trash.is_empty}); } // update this client if(trash.is_empty){ - $(`.item[data-path="${html_encode(trash_path)}" i], .item[data-shortcut_to_path="${html_encode(trash_path)}" i]`).find('.item-icon > img').attr('src', window.icons['trash.svg']); - $(`.window[data-path="${trash_path}"]`).find('.window-head-icon').attr('src', window.icons['trash.svg']); + $(`.item[data-path="${html_encode(window.trash_path)}" i], .item[data-shortcut_to_path="${html_encode(window.trash_path)}" i]`).find('.item-icon > img').attr('src', window.icons['trash.svg']); + $(`.window[data-path="${window.trash_path}"]`).find('.window-head-icon').attr('src', window.icons['trash.svg']); } } } @@ -1310,7 +1310,7 @@ function UIItem(options){ menu_items.push({ html: i18n('rename'), onClick: function(){ - activate_item_name_editor(el_item) + window.activate_item_name_editor(el_item) } }); } @@ -1370,10 +1370,10 @@ function UIItem(options){ }) if(options.sort_container_after_append){ - sort_items(options.appendTo, $(el_item).closest('.item-container').attr('data-sort_by'), $(el_item).closest('.item-container').attr('data-sort_order')); + window.sort_items(options.appendTo, $(el_item).closest('.item-container').attr('data-sort_by'), $(el_item).closest('.item-container').attr('data-sort_order')); } if(options.editable){ - activate_item_name_editor(el_item) + window.activate_item_name_editor(el_item) } } @@ -1430,7 +1430,7 @@ $(document).on('contextmenu', '.item-has-website-url-badge', async function(e){ onClick: async function(){ const website_url = $(e.target).closest('.item').attr('data-website_url'); if(website_url){ - await copy_to_clipboard(website_url); + await window.copy_to_clipboard(website_url); } } }, @@ -1514,7 +1514,7 @@ $.fn.removeItems = async function(options) { $(this).each(async function() { const parent_container = $(this).closest('.item-container'); $(this).remove(); - show_or_hide_empty_folder_message(parent_container); + window.show_or_hide_empty_folder_message(parent_container); }); return this; From eecaf759ea8ba85ed685bbf5c6bcb8afb243689a Mon Sep 17 00:00:00 2001 From: Sam Atkins Date: Wed, 1 May 2024 15:32:33 +0100 Subject: [PATCH 33/68] chore: Clarify usage of window fields in UINotification.js The click handler also makes use of the `options` parameter from UINotification(), which isn't available there, so I've commented that out. This needs more work. /puter/src/UI/UINotification.js 21:5 error 'global_element_id' is not defined no-undef 26:39 error 'global_element_id' is not defined no-undef 34:73 error 'global_element_id' is not defined no-undef 47:14 error 'toolbar_height' is not defined no-undef 55:12 error 'options' is not defined no-undef 55:36 error 'options' is not defined no-undef 56:13 error 'options' is not defined no-undef --- src/UI/UINotification.js | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/UI/UINotification.js b/src/UI/UINotification.js index 697d23e39..e110ea232 100644 --- a/src/UI/UINotification.js +++ b/src/UI/UINotification.js @@ -18,12 +18,12 @@ */ function UINotification(options){ - global_element_id++; + window.global_element_id++; options.content = options.content ?? ''; let h = ''; - h += `
`; + h += `
`; h += ``; h += html_encode(options.content); h += `
`; @@ -31,7 +31,7 @@ function UINotification(options){ $('body').append(h); - const el_notification = document.getElementById(`ui-notification__${global_element_id}`); + const el_notification = document.getElementById(`ui-notification__${window.global_element_id}`); $(el_notification).show(0, function(e){ // options.onAppend() @@ -44,7 +44,7 @@ function UINotification(options){ $(el_notification).delay(100).show(0). // In the right position (the mouse) css({ - top: toolbar_height + 15, + top: window.toolbar_height + 15, }); return el_notification; @@ -52,9 +52,10 @@ function UINotification(options){ $(document).on('click', '.notification', function(e){ if($(e.target).hasClass('notification')){ - if(options.click && typeof options.click === 'function'){ - options.click(e); - } + // TODO: options isn't available here + // if(options.click && typeof options.click === 'function'){ + // options.click(e); + // } window.close_notification(e.target); }else{ window.close_notification($(e.target).closest('.notification')); From c5612beff90f8d0a3777c831de67a9f5b5a4ab17 Mon Sep 17 00:00:00 2001 From: Sam Atkins Date: Wed, 1 May 2024 15:34:53 +0100 Subject: [PATCH 34/68] chore: Clarify usage of window fields in UIPopover.js /puter/src/UI/UIPopover.js 28:5 error 'global_element_id' is not defined no-undef 33:30 error 'global_element_id' is not defined no-undef 40:59 error 'global_element_id' is not defined no-undef 76:59 error 'taskbar_height' is not defined no-undef --- src/UI/UIPopover.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/UI/UIPopover.js b/src/UI/UIPopover.js index 69f7ddaaf..23f6f21bb 100644 --- a/src/UI/UIPopover.js +++ b/src/UI/UIPopover.js @@ -25,19 +25,19 @@ function UIPopover(options){ $('.window-active .window-app-iframe').css('pointer-events', 'none'); - global_element_id++; + window.global_element_id++; options.content = options.content ?? ''; let h = ''; - h += `
`; + h += `
`; h += options.content; h += `
`; $('body').append(h); - const el_popover = document.getElementById(`popover-${global_element_id}`); + const el_popover = document.getElementById(`popover-${window.global_element_id}`); $(el_popover).show(0, function(e){ // options.onAppend() @@ -73,7 +73,7 @@ function UIPopover(options){ // Y position const popover_height = options.height ?? $(el_popover).height(); if(options.center_horizontally){ - y_pos = options.top ?? (window.innerHeight - (taskbar_height + popover_height + 10)); + y_pos = options.top ?? (window.innerHeight - (window.taskbar_height + popover_height + 10)); }else{ y_pos = options.top ?? ($(options.snapToElement).offset().top + $(options.snapToElement).height() + 5); } From a5821815bf4b03cd26bfcc9d11e38c1e96d8ecb3 Mon Sep 17 00:00:00 2001 From: Sam Atkins Date: Wed, 1 May 2024 15:36:16 +0100 Subject: [PATCH 35/68] chore: Clarify usage of window fields in UIPrompt.js /puter/src/UI/UIPrompt.js 26:12 error 'isString' is not defined no-undef --- src/UI/UIPrompt.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/UI/UIPrompt.js b/src/UI/UIPrompt.js index 7d48f72c0..56b8f4ea4 100644 --- a/src/UI/UIPrompt.js +++ b/src/UI/UIPrompt.js @@ -23,7 +23,7 @@ function UIPrompt(options){ // set sensible defaults if(arguments.length > 0){ // if first argument is a string, then assume it is the message - if(isString(arguments[0])){ + if(window.isString(arguments[0])){ options = {}; options.message = arguments[0]; } From 94291c4968a65ce95a6646b675b8aedca0d481f8 Mon Sep 17 00:00:00 2001 From: Sam Atkins Date: Wed, 1 May 2024 15:39:59 +0100 Subject: [PATCH 36/68] chore: Clarify usage of window fields in UITaskbar.js /puter/src/UI/UITaskbar.js 24:5 error 'global_element_id' is not defined no-undef 31:14 error 'api_origin' is not defined no-undef 36:40 error 'auth_token' is not defined no-undef 44:33 error 'global_element_id' is not defined no-undef 77:17 error 'launch_apps' is not defined no-undef 77:33 error 'launch_apps' is not defined no-undef 77:55 error 'launch_apps' is not defined no-undef 79:17 error 'launch_apps' is not defined no-undef 80:26 error 'api_origin' is not defined no-undef 85:52 error 'auth_token' is not defined no-undef 99:16 error 'launch_apps' is not defined no-undef 105:88 error 'launch_apps' is not defined no-undef 106:38 error 'launch_apps' is not defined no-undef 119:16 error 'launch_apps' is not defined no-undef 121:107 error 'launch_apps' is not defined no-undef 125:45 error 'launch_apps' is not defined no-undef 126:38 error 'launch_apps' is not defined no-undef 179:17 error 'launch_app' is not defined no-undef 201:25 error 'launch_app' is not defined no-undef 215:39 error 'trash_path' is not defined no-undef 228:68 error 'trash_path' is not defined no-undef 230:17 error 'launch_app' is not defined no-undef 236:13 error 'move_items' is not defined no-undef 236:31 error 'trash_path' is not defined no-undef 240:5 error 'make_taskbar_sortable' is not defined no-undef 262:22 error Empty block statement no-empty 284:29 error 'launch_app' is not defined no-undef 297:17 error 'update_taskbar' is not defined no-undef 301:17 error 'update_taskbar' is not defined no-undef --- src/UI/UITaskbar.js | 53 ++++++++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 27 deletions(-) diff --git a/src/UI/UITaskbar.js b/src/UI/UITaskbar.js index 43b7a603e..2184f4c46 100644 --- a/src/UI/UITaskbar.js +++ b/src/UI/UITaskbar.js @@ -21,19 +21,19 @@ import UITaskbarItem from './UITaskbarItem.js' import UIPopover from './UIPopover.js' async function UITaskbar(options){ - global_element_id++; + window.global_element_id++; options = options ?? {}; options.content = options.content ?? ''; // get launch apps $.ajax({ - url: api_origin + "/get-launch-apps", + url: window.api_origin + "/get-launch-apps", type: 'GET', async: true, contentType: "application/json", headers: { - "Authorization": "Bearer "+auth_token + "Authorization": "Bearer "+window.auth_token }, success: function (apps){ window.launch_apps = apps; @@ -41,7 +41,7 @@ async function UITaskbar(options){ }); let h = ''; - h += `
`; + h += `
`; $('.desktop').append(h); @@ -74,15 +74,15 @@ async function UITaskbar(options){ // In the rare case that launch_apps is not populated yet, get it from the server // then populate the popover - if(!launch_apps || !launch_apps.recent || launch_apps.recent.length === 0){ + if(!window.launch_apps || !window.launch_apps.recent || window.launch_apps.recent.length === 0){ // get launch apps - launch_apps = await $.ajax({ - url: api_origin + "/get-launch-apps", + window.launch_apps = await $.ajax({ + url: window.api_origin + "/get-launch-apps", type: 'GET', async: true, contentType: "application/json", headers: { - "Authorization": "Bearer "+auth_token + "Authorization": "Bearer "+window.auth_token }, }); } @@ -96,14 +96,14 @@ async function UITaskbar(options){ // ------------------------------------------- // Recent apps // ------------------------------------------- - if(launch_apps.recent.length > 0){ + if(window.launch_apps.recent.length > 0){ // heading apps_str += `

${i18n('recent')}

`; // apps apps_str += `
`; - for (let index = 0; index < window.launch_recent_apps_count && index < launch_apps.recent.length; index++) { - const app_info = launch_apps.recent[index]; + for (let index = 0; index < window.launch_recent_apps_count && index < window.launch_apps.recent.length; index++) { + const app_info = window.launch_apps.recent[index]; apps_str += `
`; apps_str += `
`; apps_str += ``; @@ -116,14 +116,14 @@ async function UITaskbar(options){ // ------------------------------------------- // Reccomended apps // ------------------------------------------- - if(launch_apps.recommended.length > 0){ + if(window.launch_apps.recommended.length > 0){ // heading - apps_str += `

Recommended

`; + apps_str += `

Recommended

`; // apps apps_str += `
`; - for (let index = 0; index < launch_apps.recommended.length; index++) { - const app_info = launch_apps.recommended[index]; + for (let index = 0; index < window.launch_apps.recommended.length; index++) { + const app_info = window.launch_apps.recommended[index]; apps_str += `
`; apps_str += `
`; apps_str += ``; @@ -176,7 +176,7 @@ async function UITaskbar(options){ onClick: function(){ let open_window_count = parseInt($(`.taskbar-item[data-app="explorer"]`).attr('data-open-windows')); if(open_window_count === 0){ - launch_app({ name: 'explorer', path: window.home_path}); + window.launch_app({ name: 'explorer', path: window.home_path}); }else{ return false; } @@ -198,7 +198,7 @@ async function UITaskbar(options){ onClick: function(){ let open_window_count = parseInt($(`.taskbar-item[data-app="${app_info.name}"]`).attr('data-open-windows')); if(open_window_count === 0){ - launch_app({ + window.launch_app({ name: app_info.name, }) }else{ @@ -212,7 +212,7 @@ async function UITaskbar(options){ //--------------------------------------------- // add `Trash` to the taskbar //--------------------------------------------- - const trash = await puter.fs.stat(trash_path); + const trash = await puter.fs.stat(window.trash_path); if(window.socket){ window.socket.emit('trash.is_empty', {is_empty: trash.is_empty}); } @@ -225,19 +225,19 @@ async function UITaskbar(options){ keep_in_taskbar: true, lock_keep_in_taskbar: true, onClick: function(){ - let open_windows = $(`.window[data-path="${html_encode(trash_path)}"]`); + let open_windows = $(`.window[data-path="${html_encode(window.trash_path)}"]`); if(open_windows.length === 0){ - launch_app({ name: 'explorer', path: window.trash_path}); + window.launch_app({ name: 'explorer', path: window.trash_path}); }else{ open_windows.focusWindow(); } }, onItemsDrop: function(items){ - move_items(items, trash_path); + window.move_items(items, window.trash_path); } }) - make_taskbar_sortable(); + window.make_taskbar_sortable(); } window.make_taskbar_sortable = function(){ @@ -259,7 +259,6 @@ window.make_taskbar_sortable = function(){ $(this).sortable('cancel'); $('.taskbar .start-app').remove(); return; - }else{ } } }, @@ -281,7 +280,7 @@ window.make_taskbar_sortable = function(){ onClick: function(){ let open_window_count = parseInt($(`.taskbar-item[data-app="${$(ui.item).attr('data-app-name')}"]`).attr('data-open-windows')); if(open_window_count === 0){ - launch_app({ + window.launch_app({ name: $(ui.item).attr('data-app-name'), }) }else{ @@ -293,12 +292,12 @@ window.make_taskbar_sortable = function(){ $(el).insertAfter(ui.item); // $(ui.item).insertBefore(`

Hello!

`); $(el).show(); - $(ui.item).removeItems(); - update_taskbar(); + $(ui.item).removeItems(); + window.update_taskbar(); } // only proceed to update DB if the item sorted was a pinned item otherwise no point in updating the taskbar in DB else if($(ui.item).attr('data-keep-in-taskbar') === 'true'){ - update_taskbar(); + window.update_taskbar(); } }, }); From 126b00b35c06c72993fc356ff2ded957ebe1c955 Mon Sep 17 00:00:00 2001 From: Sam Atkins Date: Wed, 1 May 2024 15:50:10 +0100 Subject: [PATCH 37/68] chore: Clarify usage of window fields in UITaskbarItem.js /puter/src/UI/UITaskbarItem.js 31:24 error 'global_element_id' is not defined no-undef 124:21 error 'launch_app' is not defined no-undef 143:21 error 'empty_trash' is not defined no-undef 158:25 error 'remove_taskbar_item' is not defined no-undef 160:21 error 'update_taskbar' is not defined no-undef 174:21 error 'update_taskbar' is not defined no-undef 250:73 error 'mouseover_window' is not defined no-undef 254:33 error 'path' is not defined no-undef 297:21 error 'launch_app' is not defined no-undef 328:89 error 'mouseover_window' is not defined no-undef --- src/UI/UITaskbarItem.js | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/UI/UITaskbarItem.js b/src/UI/UITaskbarItem.js index 478962a89..6d5b7e699 100644 --- a/src/UI/UITaskbarItem.js +++ b/src/UI/UITaskbarItem.js @@ -18,6 +18,7 @@ */ import UIContextMenu from './UIContextMenu.js'; +import path from '../lib/path.js'; let tray_item_id = 1; @@ -28,7 +29,7 @@ function UITaskbarItem(options){ options.open_windows_count = options.open_windows_count ?? 0; options.lock_keep_in_taskbar = options.lock_keep_in_taskbar ?? false; options.append_to_taskbar = options.append_to_taskbar ?? true; - const element_id = global_element_id++; + const element_id = window.global_element_id++; h += `
0 && $event_parent_win.attr('data-id') !== $(mouseover_window).attr('data-id')) + if( $event_parent_win.length > 0 && $event_parent_win.attr('data-id') !== $(window.mouseover_window).attr('data-id')) return; // Don't do anything if the dragged item is NOT a UIItem if(!$(ui.draggable).hasClass('item')) From d39fd8659e3aed20b9816296ce83c338eb15b17c Mon Sep 17 00:00:00 2001 From: Sam Atkins Date: Wed, 1 May 2024 16:26:32 +0100 Subject: [PATCH 38/68] chore: Clarify usage of window fields in UIWindow.js And also add some missing imports. /puter/src/UI/UIWindow.js 33:20 error 'global_element_id' is not defined no-undef 34:5 error 'last_window_zindex' is not defined no-undef 48:5 error 'window_stack' is not defined no-undef 69:52 error 'uuidv4' is not defined no-undef 90:9 error 'is_embedded' is not defined no-undef 174:52 error 'last_window_zindex' is not defined no-undef 174:94 error 'last_window_zindex' is not defined no-undef 244:77 error 'is_embedded' is not defined no-undef 289:57 error 'navbar_path' is not defined no-undef 436:25 error 'launch_app' is not defined no-undef 456:9 error 'window_nav_history' is not defined no-undef 457:9 error 'window_nav_history_current_position' is not defined no-undef 524:9 error 'animate_window_opening' is not defined no-undef 599:17 error 'validate_fsentry_name' is not defined no-undef 790:9 error 'navbar_path_droppable' is not defined no-undef 791:9 error 'sidebar_item_droppable' is not defined no-undef 801:33 error 'window_nav_history' is not defined no-undef 801:63 error 'window_nav_history_current_position' is not defined no-undef 804:46 error 'root_dirname' is not defined no-undef 812:17 error 'window_nav_history_current_position' is not defined no-undef 812:68 error 'window_nav_history_current_position' is not defined no-undef 813:34 error 'window_nav_history' is not defined no-undef 813:64 error 'window_nav_history_current_position' is not defined no-undef 815:17 error 'update_window_path' is not defined no-undef 825:29 error 'window_nav_history_current_position' is not defined no-undef 826:38 error 'window_nav_history' is not defined no-undef 834:25 error 'window_nav_history_current_position' is not defined no-undef 835:42 error 'window_nav_history' is not defined no-undef 835:72 error 'window_nav_history_current_position' is not defined no-undef 840:59 error 'root_dirname' is not defined no-undef 847:29 error 'update_window_path' is not defined no-undef 869:33 error 'window_nav_history' is not defined no-undef 869:63 error 'window_nav_history_current_position' is not defined no-undef 872:46 error 'root_dirname' is not defined no-undef 880:17 error 'window_nav_history_current_position' is not defined no-undef 882:37 error 'window_nav_history' is not defined no-undef 882:67 error 'window_nav_history_current_position' is not defined no-undef 885:21 error 'update_window_path' is not defined no-undef 896:29 error 'window_nav_history_current_position' is not defined no-undef 896:86 error 'window_nav_history' is not defined no-undef 897:38 error 'window_nav_history' is not defined no-undef 905:25 error 'window_nav_history_current_position' is not defined no-undef 906:42 error 'window_nav_history' is not defined no-undef 906:72 error 'window_nav_history_current_position' is not defined no-undef 911:59 error 'root_dirname' is not defined no-undef 918:29 error 'update_window_path' is not defined no-undef 941:50 error 'root_dirname' is not defined no-undef 950:17 error 'window_nav_history' is not defined no-undef 950:46 error 'window_nav_history' is not defined no-undef 950:82 error 'window_nav_history_current_position' is not defined no-undef 951:17 error 'window_nav_history' is not defined no-undef 952:17 error 'window_nav_history_current_position' is not defined no-undef 954:17 error 'update_window_path' is not defined no-undef 968:25 error 'update_window_layout' is not defined no-undef 983:25 error 'update_window_layout' is not defined no-undef 986:25 error 'update_window_layout' is not defined no-undef 997:13 error 'is_auth' is not defined no-undef 1023:13 error 'update_explorer_footer_selected_items_count' is not defined no-undef 1106:21 error 'active_element' is not defined no-undef 1117:13 error 'update_explorer_footer_selected_items_count' is not defined no-undef 1143:18 error 'mouseover_window' is not defined no-undef 1205:82 error 'mouseX' is not defined no-undef 1205:107 error 'mouseY' is not defined no-undef 1219:83 error 'mouseover_window' is not defined no-undef 1244:31 error 'mouseover_window' is not defined no-undef 1246:17 error 'copy_items' is not defined no-undef 1246:45 error 'mouseover_window' is not defined no-undef 1252:21 error 'create_shortcut' is not defined no-undef 1255:27 error 'mouseover_window' is not defined no-undef 1264:17 error 'move_items' is not defined no-undef 1264:45 error 'mouseover_window' is not defined no-undef 1286:13 error 'scale_window' is not defined no-undef 1302:13 error 'scale_window' is not defined no-undef 1359:21 error 'upload_items' is not defined no-undef 1413:47 error 'window_width_threshold_for_sidebar' is not defined no-undef 1414:49 error 'window_width_threshold_for_sidebar' is not defined no-undef 1420:53 error 'window_width_threshold_for_sidebar' is not defined no-undef 1435:17 error 'last_window_zindex' is not defined no-undef 1460:29 error 'current_active_snap_zone' is not defined no-undef 1469:50 error 'current_active_snap_zone' is not defined no-undef 1473:43 error 'desktop_height' is not defined no-undef 1474:40 error 'toolbar_height' is not defined no-undef 1476:44 error 'last_window_zindex' is not defined no-undef 1480:55 error 'current_active_snap_zone' is not defined no-undef 1484:43 error 'desktop_height' is not defined no-undef 1485:40 error 'toolbar_height' is not defined no-undef 1487:44 error 'last_window_zindex' is not defined no-undef 1491:55 error 'current_active_snap_zone' is not defined no-undef 1495:43 error 'desktop_height' is not defined no-undef 1496:40 error 'toolbar_height' is not defined no-undef 1497:41 error 'desktop_width' is not defined no-undef 1498:44 error 'last_window_zindex' is not defined no-undef 1502:55 error 'current_active_snap_zone' is not defined no-undef 1506:43 error 'desktop_height' is not defined no-undef 1507:40 error 'toolbar_height' is not defined no-undef 1510:44 error 'last_window_zindex' is not defined no-undef 1514:55 error 'current_active_snap_zone' is not defined no-undef 1517:42 error 'desktop_width' is not defined no-undef 1518:43 error 'desktop_height' is not defined no-undef 1519:40 error 'toolbar_height' is not defined no-undef 1521:44 error 'last_window_zindex' is not defined no-undef 1525:55 error 'current_active_snap_zone' is not defined no-undef 1528:40 error 'toolbar_height' is not defined no-undef 1528:57 error 'desktop_height' is not defined no-undef 1531:43 error 'desktop_height' is not defined no-undef 1532:44 error 'last_window_zindex' is not defined no-undef 1536:55 error 'current_active_snap_zone' is not defined no-undef 1539:40 error 'toolbar_height' is not defined no-undef 1539:57 error 'desktop_height' is not defined no-undef 1540:41 error 'desktop_width' is not defined no-undef 1542:43 error 'desktop_height' is not defined no-undef 1543:44 error 'last_window_zindex' is not defined no-undef 1559:52 error 'current_active_snap_zone' is not defined no-undef 1590:28 error 'current_active_snap_zone' is not defined no-undef 1592:40 error 'toolbar_height' is not defined no-undef 1595:43 error 'desktop_height' is not defined no-undef 1599:33 error 'current_active_snap_zone' is not defined no-undef 1601:40 error 'toolbar_height' is not defined no-undef 1604:43 error 'desktop_height' is not defined no-undef 1608:33 error 'current_active_snap_zone' is not defined no-undef 1610:40 error 'toolbar_height' is not defined no-undef 1613:43 error 'desktop_height' is not defined no-undef 1617:33 error 'current_active_snap_zone' is not defined no-undef 1619:40 error 'toolbar_height' is not defined no-undef 1619:57 error 'desktop_height' is not defined no-undef 1622:43 error 'desktop_height' is not defined no-undef 1626:33 error 'current_active_snap_zone' is not defined no-undef 1628:40 error 'toolbar_height' is not defined no-undef 1628:57 error 'desktop_height' is not defined no-undef 1629:41 error 'desktop_width' is not defined no-undef 1631:43 error 'desktop_height' is not defined no-undef 1635:33 error 'current_active_snap_zone' is not defined no-undef 1637:40 error 'toolbar_height' is not defined no-undef 1640:43 error 'desktop_height' is not defined no-undef 1644:33 error 'current_active_snap_zone' is not defined no-undef 1645:29 error 'scale_window' is not defined no-undef 1656:51 error 'window_width_threshold_for_sidebar' is not defined no-undef 1657:53 error 'window_width_threshold_for_sidebar' is not defined no-undef 1663:57 error 'window_width_threshold_for_sidebar' is not defined no-undef 1674:71 error 'taskbar_height' is not defined no-undef 1676:51 error 'taskbar_height' is not defined no-undef 1703:35 error 'window_width_threshold_for_sidebar' is not defined no-undef 1718:36 error 'window_width_threshold_for_sidebar' is not defined no-undef 1719:49 error 'window_width_threshold_for_sidebar' is not defined no-undef 1725:42 error 'window_width_threshold_for_sidebar' is not defined no-undef 1733:50 error 'toolbar_height' is not defined no-undef 1734:38 error 'toolbar_height' is not defined no-undef 1736:32 error 'toolbar_height' is not defined no-undef 1773:13 error 'setItem' is not defined no-undef 1820:21 error 'scale_window' is not defined no-undef 1867:51 error 'trash_path' is not defined no-undef 1881:41 error 'sort_items' is not defined no-undef 1882:41 error 'set_sort_by' is not defined no-undef 1889:41 error 'sort_items' is not defined no-undef 1890:41 error 'set_sort_by' is not defined no-undef 1897:41 error 'sort_items' is not defined no-undef 1898:41 error 'set_sort_by' is not defined no-undef 1905:41 error 'sort_items' is not defined no-undef 1906:41 error 'set_sort_by' is not defined no-undef 1918:41 error 'sort_items' is not defined no-undef 1919:41 error 'set_sort_by' is not defined no-undef 1927:41 error 'sort_items' is not defined no-undef 1928:41 error 'set_sort_by' is not defined no-undef 1973:40 error 'clipboard' is not defined no-undef 1975:36 error 'clipboard_op' is not defined no-undef 1976:37 error 'copy_clipboard_items' is not defined no-undef 1977:41 error 'clipboard_op' is not defined no-undef 1978:37 error 'move_clipboard_items' is not defined no-undef 1986:39 error 'actions_history' is not defined no-undef 1988:33 error 'undo_last_action' is not defined no-undef 1998:33 error 'init_upload_using_dialog' is not defined no-undef 2014:48 error 'UIWindowSaveAccount' is not defined no-undef 2023:85 error 'UIWindowEmailConfirmationRequired' is not defined no-undef 2036:33 error 'launch_app' is not defined no-undef 2059:44 error 'mouseX' is not defined no-undef 2063:43 error 'mouseY' is not defined no-undef 2102:68 error 'trash_path' is not defined no-undef 2103:37 error 'delete_item' is not defined no-undef 2110:67 error 'trash_path' is not defined no-undef 2110:128 error 'trash_path' is not defined no-undef 2146:21 error 'upload_items' is not defined no-undef 2163:13 error 'enter_fullpage_mode' is not defined no-undef 2173:8 error 'active_element' is not defined no-undef 2174:9 error 'active_element' is not defined no-undef 2195:25 error 'item_icon' is not defined no-undef 2210:9 error 'window_nav_history' is not defined no-undef 2210:45 error 'window_nav_history' is not defined no-undef 2210:88 error 'window_nav_history_current_position' is not defined no-undef 2211:9 error 'window_nav_history' is not defined no-undef 2212:9 error 'window_nav_history_current_position' is not defined no-undef 2214:9 error 'update_window_path' is not defined no-undef 2257:37 error 'item_icon' is not defined no-undef 2364:9 error 'update_window_path' is not defined no-undef 2380:38 error 'root_dirname' is not defined no-undef 2389:9 error 'window_nav_history' is not defined no-undef 2389:45 error 'window_nav_history' is not defined no-undef 2389:88 error 'window_nav_history_current_position' is not defined no-undef 2390:9 error 'window_nav_history' is not defined no-undef 2391:9 error 'window_nav_history_current_position' is not defined no-undef 2391:62 error 'window_nav_history' is not defined no-undef 2392:9 error 'update_window_path' is not defined no-undef 2436:59 error 'root_dirname' is not defined no-undef 2453:19 error 'clipboard' is not defined no-undef 2455:16 error 'clipboard_op' is not defined no-undef 2456:17 error 'copy_clipboard_items' is not defined no-undef 2457:21 error 'clipboard_op' is not defined no-undef 2458:17 error 'move_clipboard_items' is not defined no-undef 2484:18 error 'mouseover_window' is not defined no-undef 2503:21 error 'create_shortcut' is not defined no-undef 2515:17 error 'move_items' is not defined no-undef 2525:18 error 'mouseover_window' is not defined no-undef 2605:12 error 'window_nav_history' is not defined no-undef 2605:42 error 'window_nav_history' is not defined no-undef 2605:84 error 'window_nav_history_current_position' is not defined no-undef 2612:12 error 'window_nav_history_current_position' is not defined no-undef 2626:55 error 'navbar_path' is not defined no-undef 2687:17 error 'update_window_layout' is not defined no-undef 2690:21 error 'update_details_layout_sort_visuals' is not defined no-undef 2698:13 error 'update_window_path' is not defined no-undef 2707:54 error 'root_dirname' is not defined no-undef 2712:9 error 'navbar_path_droppable' is not defined no-undef 2715:5 error 'update_explorer_footer_selected_items_count' is not defined no-undef 2727:18 error 'mouseover_window' is not defined no-undef 2746:21 error 'create_shortcut' is not defined no-undef 2758:17 error 'move_items' is not defined no-undef 2768:18 error 'mouseover_window' is not defined no-undef 2807:36 error 'sendWindowWillCloseMsg' is not defined no-undef 2819:23 error 'window_stack' is not defined no-undef 2829:17 error 'remove_taskbar_item' is not defined no-undef 2836:17 error 'exit_fullpage_mode' is not defined no-undef 2853:31 error 'window_stack' is not defined no-undef 2854:73 error 'window_stack' is not defined no-undef 2854:86 error 'window_stack' is not defined no-undef 2857:47 error 'window_stack' is not defined no-undef 2857:60 error 'window_stack' is not defined no-undef 2916:22 error 'window_stack' is not defined no-undef 2924:13 error 'active_item_container' is not defined no-undef 2949:20 error 'toolbar_height' is not defined no-undef 3007:14 error 'api_origin' is not defined no-undef 3017:40 error 'auth_token' is not defined no-undef 3021:17 error 'logout' is not defined no-undef 3083:43 error 'last_window_zindex' is not defined no-undef 3123:38 error 'last_window_zindex' is not defined no-undef 3127:98 error 'last_window_zindex' is not defined no-undef 3131:100 error 'last_window_zindex' is not defined no-undef 3147:81 error 'mouseX' is not defined no-undef 3147:106 error 'mouseY' is not defined no-undef 3151:9 error 'active_item_container' is not defined no-undef 3153:34 error 'active_item_container' is not defined no-undef 3155:9 error 'window_stack' is not defined no-undef 3157:11 error 'active_item_container' is not defined no-undef 3252:5 error 'sort_items' is not defined no-undef 3253:5 error 'set_sort_by' is not defined no-undef 3258:14 error 'api_origin' is not defined no-undef 3267:40 error 'auth_token' is not defined no-undef 3271:17 error 'logout' is not defined no-undef 3280:21 error 'update_details_layout_sort_visuals' is not defined no-undef --- src/UI/UIWindow.js | 456 +++++++++++++++++++++++---------------------- 1 file changed, 229 insertions(+), 227 deletions(-) diff --git a/src/UI/UIWindow.js b/src/UI/UIWindow.js index 60a1abb84..ed182a55f 100644 --- a/src/UI/UIWindow.js +++ b/src/UI/UIWindow.js @@ -26,12 +26,14 @@ import UIWindowPublishWebsite from './UIWindowPublishWebsite.js'; import UIWindowItemProperties from './UIWindowItemProperties.js'; import new_context_menu_item from '../helpers/new_context_menu_item.js'; import refresh_item_container from '../helpers/refresh_item_container.js'; +import UIWindowSaveAccount from './UIWindowSaveAccount.js'; +import UIWindowEmailConfirmationRequired from './UIWindowEmailConfirmationRequired.js'; const el_body = document.getElementsByTagName('body')[0]; async function UIWindow(options) { - const win_id = global_element_id++; - last_window_zindex++; + const win_id = window.global_element_id++; + window.last_window_zindex++; // options.dominant places the window in center close to top. options.dominant = options.dominant ?? false; @@ -45,7 +47,7 @@ async function UIWindow(options) { window.window_counter++; // add this window's id to the window_stack - window_stack.push(win_id); + window.window_stack.push(win_id); // ===================================== // set options defaults @@ -66,7 +68,7 @@ async function UIWindow(options) { options.body_css = options.body_css ?? {}; options.border_radius = options.border_radius ?? undefined; options.draggable_body = options.draggable_body ?? false; - options.element_uuid = options.element_uuid ?? uuidv4(); + options.element_uuid = options.element_uuid ?? window.uuidv4(); options.center = options.center ?? false; options.close_on_backdrop_click = options.close_on_backdrop_click ?? true; options.disable_parent_window = options.disable_parent_window ?? false; @@ -87,7 +89,7 @@ async function UIWindow(options) { // in the embedded/fullpage mode every window is on top since there is no taskbar to switch between windows // if user has specifically asked for this window to NOT stay on top, honor it. - if((is_embedded || window.is_fullpage_mode) && !options.parent_uuid && options.stay_on_top !== false) + if((window.is_embedded || window.is_fullpage_mode) && !options.parent_uuid && options.stay_on_top !== false) options.stay_on_top = true; // Keep the window on top of all previously opened windows options.stay_on_top = options.stay_on_top ?? false; @@ -171,7 +173,7 @@ async function UIWindow(options) { let h = ''; // Window - let zindex = options.stay_on_top ? (99999999 + last_window_zindex + 1 + ' !important') : last_window_zindex; + let zindex = options.stay_on_top ? (99999999 + window.last_window_zindex + 1 + ' !important') : window.last_window_zindex; let user_set_url_params = []; if (options.params !== undefined) { for (let key in options.params) { @@ -241,7 +243,7 @@ async function UIWindow(options) { h += ``; h += `
`; // Minimize button, only if window is resizable and not embedded - if(options.is_resizable && options.show_minimize_button && !is_embedded) + if(options.is_resizable && options.show_minimize_button && !window.is_embedded) h += ``; // Maximize button if(options.is_resizable && options.show_maximize_button) @@ -286,7 +288,7 @@ async function UIWindow(options) { h += ``; h += `
`; // Path - h += `
${navbar_path(options.path, window.user.username)}
`; + h += `
${window.navbar_path(options.path, window.user.username)}
`; // Path editor h += ``; // Layout settings @@ -433,7 +435,7 @@ async function UIWindow(options) { onClick: function(){ let open_window_count = parseInt($(`.taskbar-item[data-app="${options.app}"]`).attr('data-open-windows')); if(open_window_count === 0){ - launch_app({ + window.launch_app({ name: options.app, }) }else{ @@ -453,8 +455,8 @@ async function UIWindow(options) { // if directory, set window_nav_history and window_nav_history_current_position if(options.is_dir){ - window_nav_history[win_id] = [options.path]; - window_nav_history_current_position[win_id] = 0; + window.window_nav_history[win_id] = [options.path]; + window.window_nav_history_current_position[win_id] = 0; } // get all the elements needed @@ -521,7 +523,7 @@ async function UIWindow(options) { $(el_window).focusWindow(); } - if (animate_window_opening) { + if (window.animate_window_opening) { // animate window opening $(el_window).css({ 'opacity': '0', @@ -596,7 +598,7 @@ async function UIWindow(options) { $(el_savefiledialog_save_btn).on('click', function(e){ const filename = $(el_savefiledialog_filename).val(); try{ - validate_fsentry_name(filename) + window.validate_fsentry_name(filename) }catch(err){ UIAlert(err.message, 'error', 'OK') return; @@ -787,8 +789,8 @@ async function UIWindow(options) { } if(options.is_dir){ - navbar_path_droppable(el_window); - sidebar_item_droppable(el_window); + window.navbar_path_droppable(el_window); + window.sidebar_item_droppable(el_window); // -------------------------------------------------------- // Back button // -------------------------------------------------------- @@ -798,10 +800,10 @@ async function UIWindow(options) { return; // if ctrl/cmd are pressed, open in new window if(e.ctrlKey || e.metaKey){ - const dirpath = window_nav_history[win_id].at(window_nav_history_current_position[win_id] - 1); + const dirpath = window.window_nav_history[win_id].at(window.window_nav_history_current_position[win_id] - 1); UIWindow({ path: dirpath, - title: dirpath === '/' ? root_dirname : path.basename(dirpath), + title: dirpath === '/' ? window.root_dirname : path.basename(dirpath), icon: window.icons['folder.svg'], // uid: $(el_item).attr('data-uid'), is_dir: true, @@ -809,10 +811,10 @@ async function UIWindow(options) { } // ... otherwise, open in same window else{ - window_nav_history_current_position[win_id] > 0 && window_nav_history_current_position[win_id]--; - const new_path = window_nav_history[win_id].at(window_nav_history_current_position[win_id]); + window.window_nav_history_current_position[win_id] > 0 && window.window_nav_history_current_position[win_id]--; + const new_path = window.window_nav_history[win_id].at(window.window_nav_history_current_position[win_id]); // update window path - update_window_path(el_window, new_path); + window.update_window_path(el_window, new_path); } }) // -------------------------------------------------------- @@ -822,8 +824,8 @@ async function UIWindow(options) { let items = []; const pos = el_window_navbar_back_btn.getBoundingClientRect(); - for(let index = window_nav_history_current_position[win_id] - 1; index >= 0; index--){ - const history_item = window_nav_history[win_id].at(index); + for(let index = window.window_nav_history_current_position[win_id] - 1; index >= 0; index--){ + const history_item = window.window_nav_history[win_id].at(index); // build item for context menu items.push({ @@ -831,20 +833,20 @@ async function UIWindow(options) { val: index, onClick: async function(e){ let history_index = e.value; - window_nav_history_current_position[win_id] = history_index; - const new_path = window_nav_history[win_id].at(window_nav_history_current_position[win_id]); + window.window_nav_history_current_position[win_id] = history_index; + const new_path = window.window_nav_history[win_id].at(window.window_nav_history_current_position[win_id]); // if ctrl/cmd are pressed, open in new window if(e.ctrlKey || e.metaKey && (new_path !== undefined && new_path !== null)){ UIWindow({ path: new_path, - title: new_path === '/' ? root_dirname : path.basename(new_path), + title: new_path === '/' ? window.root_dirname : path.basename(new_path), icon: window.icons['folder.svg'], is_dir: true, }); } // update window path else{ - update_window_path(el_window, new_path); + window.update_window_path(el_window, new_path); } } }) @@ -866,10 +868,10 @@ async function UIWindow(options) { return; // if ctrl/cmd are pressed, open in new window if(e.ctrlKey || e.metaKey){ - const dirpath = window_nav_history[win_id].at(window_nav_history_current_position[win_id] + 1); + const dirpath = window.window_nav_history[win_id].at(window.window_nav_history_current_position[win_id] + 1); UIWindow({ path: dirpath, - title: dirpath === '/' ? root_dirname : path.basename(dirpath), + title: dirpath === '/' ? window.root_dirname : path.basename(dirpath), icon: window.icons['folder.svg'], // uid: $(el_item).attr('data-uid'), is_dir: true, @@ -877,12 +879,12 @@ async function UIWindow(options) { } // ... otherwise, open in same window else{ - window_nav_history_current_position[win_id]++; + window.window_nav_history_current_position[win_id]++; // get last path in history - const target_path = window_nav_history[win_id].at(window_nav_history_current_position[win_id]); + const target_path = window.window_nav_history[win_id].at(window.window_nav_history_current_position[win_id]); // update window path if(target_path !== undefined){ - update_window_path(el_window, target_path); + window.update_window_path(el_window, target_path); } } }) @@ -893,8 +895,8 @@ async function UIWindow(options) { let items = []; const pos = el_window_navbar_forward_btn.getBoundingClientRect(); - for(let index = window_nav_history_current_position[win_id] + 1; index < window_nav_history[win_id].length; index++){ - const history_item = window_nav_history[win_id].at(index); + for(let index = window.window_nav_history_current_position[win_id] + 1; index < window.window_nav_history[win_id].length; index++){ + const history_item = window.window_nav_history[win_id].at(index); // build item for context menu items.push({ @@ -902,20 +904,20 @@ async function UIWindow(options) { val: index, onClick: async function(e){ let history_index = e.value; - window_nav_history_current_position[win_id] = history_index; - const new_path = window_nav_history[win_id].at(window_nav_history_current_position[win_id]); + window.window_nav_history_current_position[win_id] = history_index; + const new_path = window.window_nav_history[win_id].at(window.window_nav_history_current_position[win_id]); // if ctrl/cmd are pressed, open in new window if(e.ctrlKey || e.metaKey && (new_path !== undefined && new_path !== null)){ UIWindow({ path: new_path, - title: new_path === '/' ? root_dirname : path.basename(new_path), + title: new_path === '/' ? window.root_dirname : path.basename(new_path), icon: window.icons['folder.svg'], is_dir: true, }); } // update window path else{ - update_window_path(el_window, new_path); + window.update_window_path(el_window, new_path); } } }) @@ -938,7 +940,7 @@ async function UIWindow(options) { if(e.ctrlKey || e.metaKey && (target_path !== undefined && target_path !== null)){ UIWindow({ path: target_path, - title: target_path === '/' ? root_dirname : path.basename(target_path), + title: target_path === '/' ? window.root_dirname : path.basename(target_path), icon: window.icons['folder.svg'], // uid: $(el_item).attr('data-uid'), is_dir: true, @@ -947,11 +949,11 @@ async function UIWindow(options) { // ... otherwise, open in same window else if(target_path !== undefined && target_path !== null){ // update history - window_nav_history[win_id] = window_nav_history[win_id].slice(0, window_nav_history_current_position[win_id]+1); - window_nav_history[win_id].push(target_path); - window_nav_history_current_position[win_id]++; + window.window_nav_history[win_id] = window.window_nav_history[win_id].slice(0, window.window_nav_history_current_position[win_id]+1); + window.window_nav_history[win_id].push(target_path); + window.window_nav_history_current_position[win_id]++; // update window path - update_window_path(el_window, target_path); + window.update_window_path(el_window, target_path); } }) @@ -965,7 +967,7 @@ async function UIWindow(options) { html: `${layouts[i]}`, icon: cur_layout === layouts[i] ? '✓' : '', onClick: async function(e){ - update_window_layout(el_window, layouts[i]); + window.update_window_layout(el_window, layouts[i]); window.set_layout($(el_window).attr('data-uid'), layouts[i]); } }) @@ -980,10 +982,10 @@ async function UIWindow(options) { for(let i=0; i { - create_shortcut( + window.create_shortcut( path.basename($(item_to_move).attr('data-path')), $(item_to_move).attr('data-is_dir') === '1', - $(mouseover_window).attr('data-path'), + $(window.mouseover_window).attr('data-path'), null, $(item_to_move).attr('data-shortcut_to') === '' ? $(item_to_move).attr('data-uid') : $(item_to_move).attr('data-shortcut_to'), $(item_to_move).attr('data-shortcut_to_path') === '' ? $(item_to_move).attr('data-path') : $(item_to_move).attr('data-shortcut_to_path'), @@ -1261,7 +1263,7 @@ async function UIWindow(options) { } // otherwise, move items else{ - move_items(items_to_move, $(mouseover_window).attr('data-path')); + window.move_items(items_to_move, $(window.mouseover_window).attr('data-path')); } }, over: function(event, ui){ @@ -1283,7 +1285,7 @@ async function UIWindow(options) { // -------------------------------------------------------- if(options.is_resizable){ $(el_window_head).dblclick(function () { - scale_window(el_window); + window.scale_window(el_window); }) } @@ -1299,7 +1301,7 @@ async function UIWindow(options) { // -------------------------------------------------------- if(options.is_resizable){ $(el_window_head_scale_btn).click(function () { - scale_window(el_window); + window.scale_window(el_window); }) } @@ -1356,7 +1358,7 @@ async function UIWindow(options) { if(options.is_dir){ // if files were dropped... if(e.dataTransfer?.items?.length>0){ - upload_items(e.dataTransfer.items, $(el_window).attr('data-path')) + window.upload_items(e.dataTransfer.items, $(el_window).attr('data-path')) } // de-highlight all windows $('.item-container').removeClass('item-container-active'); @@ -1410,14 +1412,14 @@ async function UIWindow(options) { }); // if at any point the window's width is "too small", hide the sidebar - if($(el_window).width() < window_width_threshold_for_sidebar){ - if(width_before_snap >= window_width_threshold_for_sidebar && !sidebar_hidden){ + if($(el_window).width() < window.window_width_threshold_for_sidebar){ + if(width_before_snap >= window.window_width_threshold_for_sidebar && !sidebar_hidden){ $(el_window_sidebar).hide(); } sidebar_hidden = true; } // if at any point the window's width is "big enough", show the sidebar - else if($(el_window).width() >= window_width_threshold_for_sidebar){ + else if($(el_window).width() >= window.window_width_threshold_for_sidebar){ if(sidebar_hidden){ $(el_window_sidebar).show(); } @@ -1432,7 +1434,7 @@ async function UIWindow(options) { // since jquery draggable sets the z-index automatically we need this to // bring windows to the front when they are clicked. - last_window_zindex = parseInt($(el_window).css('z-index')); + window.last_window_zindex = parseInt($(el_window).css('z-index')); //transform causes draggable to start inaccurately $(el_window).css('transform', 'none'); @@ -1457,7 +1459,7 @@ async function UIWindow(options) { // if window is not snapped, check if it should be snapped snap_trigger_timeout = setTimeout(function(){ // if cursor is not in a snap zone, don't snap - if(!current_active_snap_zone){ + if(!window.current_active_snap_zone){ return; } // if dragging has stopped by now, don't snap @@ -1466,81 +1468,81 @@ async function UIWindow(options) { } // W - if(!window_is_snapped && current_active_snap_zone === 'w'){ + if(!window_is_snapped && window.current_active_snap_zone === 'w'){ window_snap_placeholder.css({ 'display': 'block', 'width': '50%', - 'height': desktop_height, - 'top': toolbar_height, + 'height': window.desktop_height, + 'top': window.toolbar_height, 'left': 0, - 'z-index': last_window_zindex - 1, + 'z-index': window.last_window_zindex - 1, }) } // NW - else if(!window_is_snapped && current_active_snap_zone === 'nw'){ + else if(!window_is_snapped && window.current_active_snap_zone === 'nw'){ window_snap_placeholder.css({ 'display': 'block', 'width': '50%', - 'height': desktop_height/2, - 'top': toolbar_height, + 'height': window.desktop_height/2, + 'top': window.toolbar_height, 'left': 0, - 'z-index': last_window_zindex - 1, + 'z-index': window.last_window_zindex - 1, }) } // NE - else if(!window_is_snapped && current_active_snap_zone ==='ne'){ + else if(!window_is_snapped && window.current_active_snap_zone ==='ne'){ window_snap_placeholder.css({ 'display': 'block', 'width': '50%', - 'height': desktop_height/2, - 'top': toolbar_height, - 'left': desktop_width/2, - 'z-index': last_window_zindex - 1, + 'height': window.desktop_height/2, + 'top': window.toolbar_height, + 'left': window.desktop_width/2, + 'z-index': window.last_window_zindex - 1, }) } // E - else if(!window_is_snapped && current_active_snap_zone ==='e'){ + else if(!window_is_snapped && window.current_active_snap_zone ==='e'){ window_snap_placeholder.css({ 'display': 'block', 'width': '50%', - 'height': desktop_height, - 'top': toolbar_height, + 'height': window.desktop_height, + 'top': window.toolbar_height, 'left': 'initial', 'right': 0, - 'z-index': last_window_zindex - 1, + 'z-index': window.last_window_zindex - 1, }) } // N - else if(!window_is_snapped && current_active_snap_zone ==='n'){ + else if(!window_is_snapped && window.current_active_snap_zone ==='n'){ window_snap_placeholder.css({ 'display': 'block', - 'width': desktop_width, - 'height': desktop_height, - 'top': toolbar_height, + 'width': window.desktop_width, + 'height': window.desktop_height, + 'top': window.toolbar_height, 'left': 0, - 'z-index': last_window_zindex - 1, + 'z-index': window.last_window_zindex - 1, }) } // SW - else if(!window_is_snapped && current_active_snap_zone ==='sw'){ + else if(!window_is_snapped && window.current_active_snap_zone ==='sw'){ window_snap_placeholder.css({ 'display': 'block', - 'top': toolbar_height + desktop_height/2, + 'top': window.toolbar_height + window.desktop_height/2, 'left': 0, 'width': '50%', - 'height': desktop_height/2, - 'z-index': last_window_zindex - 1, + 'height': window.desktop_height/2, + 'z-index': window.last_window_zindex - 1, }) } // SE - else if(!window_is_snapped && current_active_snap_zone ==='se'){ + else if(!window_is_snapped && window.current_active_snap_zone ==='se'){ window_snap_placeholder.css({ 'display': 'block', - 'top': toolbar_height + desktop_height/2, - 'left': desktop_width/2, + 'top': window.toolbar_height + window.desktop_height/2, + 'left': window.desktop_width/2, 'width': '50%', - 'height': desktop_height/2, - 'z-index': last_window_zindex - 1, + 'height': window.desktop_height/2, + 'z-index': window.last_window_zindex - 1, }) } @@ -1556,7 +1558,7 @@ async function UIWindow(options) { }, 500); // if mouse is not in a snap zone, hide snap placeholder - if(snap_placeholder_active && !current_active_snap_zone){ + if(snap_placeholder_active && !window.current_active_snap_zone){ snap_placeholder_active = false; window_snap_placeholder.fadeOut(80); } @@ -1587,62 +1589,62 @@ async function UIWindow(options) { setTimeout(function(){ // snap to w - if(current_active_snap_zone === 'w'){ + if(window.current_active_snap_zone === 'w'){ $(el_window).css({ - 'top': toolbar_height, + 'top': window.toolbar_height, 'left': 0, 'width': '50%', - 'height': desktop_height, + 'height': window.desktop_height, }) } // snap to nw - else if(current_active_snap_zone === 'nw'){ + else if(window.current_active_snap_zone === 'nw'){ $(el_window).css({ - 'top': toolbar_height, + 'top': window.toolbar_height, 'left': 0, 'width': '50%', - 'height': desktop_height/2, + 'height': window.desktop_height/2, }) } // snap to ne - else if(current_active_snap_zone === 'ne'){ + else if(window.current_active_snap_zone === 'ne'){ $(el_window).css({ - 'top': toolbar_height, + 'top': window.toolbar_height, 'left': '50%', 'width': '50%', - 'height': desktop_height/2, + 'height': window.desktop_height/2, }) } // snap to sw - else if(current_active_snap_zone === 'sw'){ + else if(window.current_active_snap_zone === 'sw'){ $(el_window).css({ - 'top': toolbar_height + desktop_height/2, + 'top': window.toolbar_height + window.desktop_height/2, 'left': 0, 'width': '50%', - 'height': desktop_height/2, + 'height': window.desktop_height/2, }) } // snap to se - else if(current_active_snap_zone === 'se'){ + else if(window.current_active_snap_zone === 'se'){ $(el_window).css({ - 'top': toolbar_height + desktop_height/2, - 'left': desktop_width/2, + 'top': window.toolbar_height + window.desktop_height/2, + 'left': window.desktop_width/2, 'width': '50%', - 'height': desktop_height/2, + 'height': window.desktop_height/2, }) } // snap to e - else if(current_active_snap_zone === 'e'){ + else if(window.current_active_snap_zone === 'e'){ $(el_window).css({ - 'top': toolbar_height, + 'top': window.toolbar_height, 'left': '50%', 'width': '50%', - 'height': desktop_height, + 'height': window.desktop_height, }) } // snap to n - else if(current_active_snap_zone === 'n'){ - scale_window(el_window); + else if(window.current_active_snap_zone === 'n'){ + window.scale_window(el_window); } // snap placeholder is no longer active snap_placeholder_active = false; @@ -1653,14 +1655,14 @@ async function UIWindow(options) { window_is_snapped = true; // if at any point the window's width is "too small", hide the sidebar - if($(el_window).width() < window_width_threshold_for_sidebar){ - if(width_before_snap >= window_width_threshold_for_sidebar && !sidebar_hidden){ + if($(el_window).width() < window.window_width_threshold_for_sidebar){ + if(width_before_snap >= window.window_width_threshold_for_sidebar && !sidebar_hidden){ $(el_window_sidebar).hide(); } sidebar_hidden = true; } // if at any point the window's width is "big enough", show the sidebar - else if($(el_window).width() >= window_width_threshold_for_sidebar){ + else if($(el_window).width() >= window.window_width_threshold_for_sidebar){ if(sidebar_hidden){ $(el_window_sidebar).show(); } @@ -1671,9 +1673,9 @@ async function UIWindow(options) { // if window is dropped below the taskbar, move it up // the lst '- 30' is to account for the window head - if($(el_window).position().top > window.innerHeight - taskbar_height - 30 && !window_will_snap){ + if($(el_window).position().top > window.innerHeight - window.taskbar_height - 30 && !window_will_snap){ $(el_window).animate({ - top: window.innerHeight - taskbar_height - 60, + top: window.innerHeight - window.taskbar_height - 60, }, 100); } // if window is dropped too far to the right, move it left @@ -1700,7 +1702,7 @@ async function UIWindow(options) { // Resizable // -------------------------------------------------------- if(options.is_resizable){ - if($(el_window).width() < window_width_threshold_for_sidebar){ + if($(el_window).width() < window.window_width_threshold_for_sidebar){ $(el_window_sidebar).hide(); sidebar_hidden = true; } @@ -1715,14 +1717,14 @@ async function UIWindow(options) { }, resize: function (e, ui) { // if at any point the window's width is "too small", hide the sidebar - if(ui.size.width < window_width_threshold_for_sidebar){ - if(ui.originalSize.width >= window_width_threshold_for_sidebar && !sidebar_hidden){ + if(ui.size.width < window.window_width_threshold_for_sidebar){ + if(ui.originalSize.width >= window.window_width_threshold_for_sidebar && !sidebar_hidden){ $(el_window_sidebar).hide(); } sidebar_hidden = true; } // if at any point the window's width is "big enough", show the sidebar - else if(ui.size.width >= window_width_threshold_for_sidebar){ + else if(ui.size.width >= window.window_width_threshold_for_sidebar){ if(sidebar_hidden){ $(el_window_sidebar).show(); } @@ -1730,10 +1732,10 @@ async function UIWindow(options) { } // when resizing the top of the window, make sure the window head is not hidden behind the toolbar - if($(el_window).position().top < toolbar_height){ - var difference = toolbar_height - $(el_window).position().top; + if($(el_window).position().top < window.toolbar_height){ + var difference = window.toolbar_height - $(el_window).position().top; $(el_window).css({ - 'top': toolbar_height, + 'top': window.toolbar_height, 'height': ui.size.height - difference // Reduce the height by the difference }); // don't resize @@ -1770,7 +1772,7 @@ async function UIWindow(options) { $('.window').css('pointer-events', 'initial'); const new_width = $(el_window_sidebar).width(); // save new width in the cloud, to user's settings - setItem({key: "window_sidebar_width", value: new_width}); + window.setItem({key: "window_sidebar_width", value: new_width}); // save new width locally, to window object window.window_sidebar_width = new_width; } @@ -1817,7 +1819,7 @@ async function UIWindow(options) { html: $(el_window).attr('data-is_maximized') === '0' ? 'Maximize' : 'Restore', onClick: function(){ // maximize window - scale_window(el_window); + window.scale_window(el_window); } }); menu_items.push({ @@ -1864,7 +1866,7 @@ async function UIWindow(options) { event.preventDefault(); if(options.allow_context_menu && event.target === el_window_body){ // Regular directories - if($(el_window).attr('data-path') !== trash_path){ + if($(el_window).attr('data-path') !== window.trash_path){ UIContextMenu({ parent_element: el_window_body, items: [ @@ -1878,32 +1880,32 @@ async function UIWindow(options) { html: i18n('name'), icon: $(el_window).attr('data-sort_by') === 'name' ? '✓' : '', onClick: async function(){ - sort_items(el_window_body, 'name', $(el_window).attr('data-sort_order')); - set_sort_by($(el_window).attr('data-uid'), 'name', $(el_window).attr('data-sort_order')) + window.sort_items(el_window_body, 'name', $(el_window).attr('data-sort_order')); + window.set_sort_by($(el_window).attr('data-uid'), 'name', $(el_window).attr('data-sort_order')) } }, { html: i18n('date_modified'), icon: $(el_window).attr('data-sort_by') === 'modified' ? '✓' : '', onClick: async function(){ - sort_items(el_window_body, 'modified', $(el_window).attr('data-sort_order')); - set_sort_by($(el_window).attr('data-uid'), 'modified', $(el_window).attr('data-sort_order')) + window.sort_items(el_window_body, 'modified', $(el_window).attr('data-sort_order')); + window.set_sort_by($(el_window).attr('data-uid'), 'modified', $(el_window).attr('data-sort_order')) } }, { html: i18n('type'), icon: $(el_window).attr('data-sort_by') === 'type' ? '✓' : '', onClick: async function(){ - sort_items(el_window_body, 'type', $(el_window).attr('data-sort_order')); - set_sort_by($(el_window).attr('data-uid'), 'type', $(el_window).attr('data-sort_order')) + window.sort_items(el_window_body, 'type', $(el_window).attr('data-sort_order')); + window.set_sort_by($(el_window).attr('data-uid'), 'type', $(el_window).attr('data-sort_order')) } }, { html: i18n('size'), icon: $(el_window).attr('data-sort_by') === 'size' ? '✓' : '', onClick: async function(){ - sort_items(el_window_body, 'size', $(el_window).attr('data-sort_order')); - set_sort_by($(el_window).attr('data-uid'), 'size', $(el_window).attr('data-sort_order')) + window.sort_items(el_window_body, 'size', $(el_window).attr('data-sort_order')); + window.set_sort_by($(el_window).attr('data-uid'), 'size', $(el_window).attr('data-sort_order')) } }, // ------------------------------------------- @@ -1915,8 +1917,8 @@ async function UIWindow(options) { icon: $(el_window).attr('data-sort_order') === 'asc' ? '✓' : '', onClick: async function(){ const sort_by = $(el_window).attr('data-sort_by') - sort_items(el_window_body, sort_by, 'asc'); - set_sort_by($(el_window).attr('data-uid'), sort_by, 'asc') + window.sort_items(el_window_body, sort_by, 'asc'); + window.set_sort_by($(el_window).attr('data-uid'), sort_by, 'asc') } }, { @@ -1924,8 +1926,8 @@ async function UIWindow(options) { icon: $(el_window).attr('data-sort_order') === 'desc' ? '✓' : '', onClick: async function(){ const sort_by = $(el_window).attr('data-sort_by') - sort_items(el_window_body, sort_by, 'desc'); - set_sort_by($(el_window).attr('data-uid'), sort_by, 'desc') + window.sort_items(el_window_body, sort_by, 'desc'); + window.set_sort_by($(el_window).attr('data-uid'), sort_by, 'desc') } }, @@ -1970,12 +1972,12 @@ async function UIWindow(options) { // ------------------------------------------- { html: i18n('paste'), - disabled: (clipboard.length === 0 || $(el_window).attr('data-path') === '/') ? true : false, + disabled: (window.clipboard.length === 0 || $(el_window).attr('data-path') === '/') ? true : false, onClick: function(){ - if(clipboard_op === 'copy') - copy_clipboard_items($(el_window).attr('data-path'), el_window_body); - else if(clipboard_op === 'move') - move_clipboard_items(el_window_body) + if(window.clipboard_op === 'copy') + window.copy_clipboard_items($(el_window).attr('data-path'), el_window_body); + else if(window.clipboard_op === 'move') + window.move_clipboard_items(el_window_body) } }, // ------------------------------------------- @@ -1983,9 +1985,9 @@ async function UIWindow(options) { // ------------------------------------------- { html: i18n('undo'), - disabled: actions_history.length > 0 ? false : true, + disabled: window.actions_history.length > 0 ? false : true, onClick: function(){ - undo_last_action(); + window.undo_last_action(); } }, // ------------------------------------------- @@ -1995,7 +1997,7 @@ async function UIWindow(options) { html: i18n('upload_here'), disabled: $(el_window).attr('data-path') === '/' ? true : false, onClick: function(){ - init_upload_using_dialog(el_window_body, $(el_window).attr('data-path') + '/'); + window.init_upload_using_dialog(el_window_body, $(el_window).attr('data-path') + '/'); } }, // ------------------------------------------- @@ -2033,7 +2035,7 @@ async function UIWindow(options) { html: i18n('deploy_as_app'), disabled: !options.is_dir, onClick: async function () { - launch_app({ + window.launch_app({ name: 'dev-center', file_path: $(el_window).attr('data-path'), file_uid: $(el_window).attr('data-uid'), @@ -2056,11 +2058,11 @@ async function UIWindow(options) { let window_height = 500; let window_width = 450; - let left = mouseX; + let left = window.mouseX; left -= 200; left = left > (window.innerWidth - window_width)? (window.innerWidth - window_width) : left; - let top = mouseY; + let top = window.mouseY; top = top > (window.innerHeight - (window_height + window.taskbar_height + window.toolbar_height))? (window.innerHeight - (window_height + window.taskbar_height + window.toolbar_height)) : top; UIWindowItemProperties(options.title, options.path, options.uid, left, top, window_width, window_height); @@ -2099,15 +2101,15 @@ async function UIWindow(options) { return; // todo this has to be case-insensitive but the `i` selector doesn't work on ^= - $(`.item[data-path^="${html_encode(trash_path)}/"]`).each(function(){ - delete_item(this); + $(`.item[data-path^="${html_encode(window.trash_path)}/"]`).each(function(){ + window.delete_item(this); }) // update other clients if(window.socket){ window.socket.emit('trash.is_empty', {is_empty: true}); } // use the 'empty trash' icon - $(`.item[data-path="${html_encode(trash_path)}" i], .item[data-shortcut_to_path="${html_encode(trash_path)}" i]`).find('.item-icon > img').attr('src', window.icons['trash.svg']); + $(`.item[data-path="${html_encode(window.trash_path)}" i], .item[data-shortcut_to_path="${html_encode(window.trash_path)}" i]`).find('.item-icon > img').attr('src', window.icons['trash.svg']); } }, ] @@ -2143,7 +2145,7 @@ async function UIWindow(options) { $(el_item).removeClass('item-selected'); // if files were dropped... if(e.dataTransfer?.items?.length > 0){ - upload_items(e.dataTransfer.items, $(el_item).attr('data-path')) + window.upload_items(e.dataTransfer.items, $(el_item).attr('data-path')) } e.stopPropagation(); @@ -2160,7 +2162,7 @@ async function UIWindow(options) { if(options.is_fullpage){ $(el_window).hide() setTimeout(function(){ - enter_fullpage_mode(el_window); + window.enter_fullpage_mode(el_window); $(el_window).show() }, 5); } @@ -2170,8 +2172,8 @@ async function UIWindow(options) { function delete_window_element (el_window){ // if this is the active element, set it to null - if(active_element === el_window){ - active_element = null; + if(window.active_element === el_window){ + window.active_element = null; } // remove DOM element $(el_window).remove(); @@ -2192,7 +2194,7 @@ $(document).on('click', '.window-sidebar-item', async function(e){ UIWindow({ path: item_path, title: path.basename(item_path), - icon: await item_icon({is_dir: true, path: item_path}), + icon: await window.item_icon({is_dir: true, path: item_path}), // todo // uid: $(el_item).attr('data-uid'), is_dir: true, @@ -2207,11 +2209,11 @@ $(document).on('click', '.window-sidebar-item', async function(e){ } // update window path only if it's a new path AND no ctrl/cmd key pressed else if(item_path !== $(el_window).attr('data-path')){ - window_nav_history[parent_win_id] = window_nav_history[parent_win_id].slice(0, window_nav_history_current_position[parent_win_id] + 1); - window_nav_history[parent_win_id].push(item_path); - window_nav_history_current_position[parent_win_id]++; + window.window_nav_history[parent_win_id] = window.window_nav_history[parent_win_id].slice(0, window.window_nav_history_current_position[parent_win_id] + 1); + window.window_nav_history[parent_win_id].push(item_path); + window.window_nav_history_current_position[parent_win_id]++; - update_window_path(el_window, item_path); + window.update_window_path(el_window, item_path); } }) @@ -2254,7 +2256,7 @@ $(document).on('contextmenu taphold', '.window-sidebar-item', function(event){ UIWindow({ path: item_path, title: path.basename(item_path), - icon: await item_icon({is_dir: true, path: item_path}), + icon: await window.item_icon({is_dir: true, path: item_path}), // todo // uid: $(el_item).attr('data-uid'), is_dir: true, @@ -2361,7 +2363,7 @@ $(document).on('blur', '.window-navbar-path-input', function(e){ $(document).on('keyup', '.window-navbar-path-input', function(e){ if (e.key === 'Enter' || e.keyCode === 13) { - update_window_path($(e.target).closest('.window'), $(e.target).val()); + window.update_window_path($(e.target).closest('.window'), $(e.target).val()); $(e.target).hide(); $(e.target).siblings('.window-navbar-path').show().select(); } @@ -2377,7 +2379,7 @@ $(document).on('click', '.window-navbar-path-dirname', function(e){ const dirpath = $(this).attr('data-path'); UIWindow({ path: dirpath, - title: dirpath === '/' ? root_dirname : path.basename(dirpath), + title: dirpath === '/' ? window.root_dirname : path.basename(dirpath), icon: window.icons['folder.svg'], // uid: $(el_item).attr('data-uid'), is_dir: true, @@ -2386,10 +2388,10 @@ $(document).on('click', '.window-navbar-path-dirname', function(e){ } // only change dir if target is not the same as current path else if($el_parent_window.attr('data-path') !== $(this).attr('data-path')){ - window_nav_history[parent_win_id] = window_nav_history[parent_win_id].slice(0, window_nav_history_current_position[parent_win_id]+1); - window_nav_history[parent_win_id].push($(this).attr('data-path')); - window_nav_history_current_position[parent_win_id] = window_nav_history[parent_win_id].length - 1; - update_window_path($el_parent_window, $(this).attr('data-path')); + window.window_nav_history[parent_win_id] = window.window_nav_history[parent_win_id].slice(0, window.window_nav_history_current_position[parent_win_id]+1); + window.window_nav_history[parent_win_id].push($(this).attr('data-path')); + window.window_nav_history_current_position[parent_win_id] = window.window_nav_history[parent_win_id].length - 1; + window.update_window_path($el_parent_window, $(this).attr('data-path')); } }) @@ -2433,7 +2435,7 @@ $(document).on('contextmenu taphold', '.window-navbar-path-dirname', function(ev onClick: function(){ UIWindow({ path: $(el).attr('data-path'), - title: $(el).attr('data-path') === '/' ? root_dirname : path.basename($(el).attr('data-path')), + title: $(el).attr('data-path') === '/' ? window.root_dirname : path.basename($(el).attr('data-path')), icon: window.icons['folder.svg'], uid: $(el).attr('data-uid'), is_dir: true, @@ -2450,12 +2452,12 @@ $(document).on('contextmenu taphold', '.window-navbar-path-dirname', function(ev // ------------------------------------------- menu_items.push({ html: "Paste", - disabled: clipboard.length > 0 ? false : true, + disabled: window.clipboard.length > 0 ? false : true, onClick: function(){ - if(clipboard_op === 'copy') - copy_clipboard_items($(el).attr('data-path'), null); - else if(clipboard_op === 'move') - move_clipboard_items(null, $(el).attr('data-path')) + if(window.clipboard_op === 'copy') + window.copy_clipboard_items($(el).attr('data-path'), null); + else if(window.clipboard_op === 'move') + window.move_clipboard_items(null, $(el).attr('data-path')) } }) @@ -2481,7 +2483,7 @@ window.navbar_path_droppable = (el_window)=>{ tolerance: 'pointer', drop: function( event, ui ) { // check if item was actually dropped on this navbar path - if($(mouseover_window).attr('data-id') !== $(el_window).attr('data-id')){ + if($(window.mouseover_window).attr('data-id') !== $(el_window).attr('data-id')){ return; } const items_to_move = [] @@ -2500,7 +2502,7 @@ window.navbar_path_droppable = (el_window)=>{ // if alt key is down, create shortcut items if(event.altKey){ items_to_move.forEach((item_to_move) => { - create_shortcut( + window.create_shortcut( path.basename($(item_to_move).attr('data-path')), $(item_to_move).attr('data-is_dir') === '1', $(this).attr('data-path'), @@ -2512,7 +2514,7 @@ window.navbar_path_droppable = (el_window)=>{ } // move items else{ - move_items(items_to_move, $(this).attr('data-path')); + window.move_items(items_to_move, $(this).attr('data-path')); } $('.item-container').droppable('enable') @@ -2522,7 +2524,7 @@ window.navbar_path_droppable = (el_window)=>{ }, over: function(event, ui){ // check if item was actually hovered over this window - if($(mouseover_window).attr('data-id') !== $(el_window).attr('data-id')) + if($(window.mouseover_window).attr('data-id') !== $(el_window).attr('data-id')) return; // Don't do anything if the dragged item is NOT a UIItem @@ -2602,14 +2604,14 @@ window.update_window_path = async function(el_window, target_path){ if(is_dir){ // if nav history for this window is empty, disable forward btn - if(window_nav_history[win_id] && window_nav_history[win_id].length - 1 === window_nav_history_current_position[win_id]) + if(window.window_nav_history[win_id] && window.window_nav_history[win_id].length - 1 === window.window_nav_history_current_position[win_id]) $(el_window_navbar_forward_btn).addClass('window-navbar-btn-disabled'); // ... else, enable forawrd btn else $(el_window_navbar_forward_btn).removeClass('window-navbar-btn-disabled'); // disable back button if path is root - if(window_nav_history_current_position[win_id] === 0) + if(window.window_nav_history_current_position[win_id] === 0) $(el_window_navbar_back_btn).addClass('window-navbar-btn-disabled'); // ... enable back btn in all other cases else @@ -2623,7 +2625,7 @@ window.update_window_path = async function(el_window, target_path){ $(el_window_navbar_up_btn).removeClass('window-navbar-btn-disabled'); $(el_window_item_container).attr('data-path', target_path); - $(el_window).find('.window-navbar-path').html(navbar_path(target_path, window.user.username)); + $(el_window).find('.window-navbar-path').html(window.navbar_path(target_path, window.user.username)); // empty body to be filled with the results of /readdir $(el_window_body).find('.item').removeItems() @@ -2684,10 +2686,10 @@ window.update_window_path = async function(el_window, target_path){ $(el_window_navbar_path_input).val(target_path); $(el_window_navbar_path_input).attr('data-path', target_path); // update layout - update_window_layout(el_window, fsentry.layout); + window.update_window_layout(el_window, fsentry.layout); // update explore header if in details view if(fsentry.layout === 'details'){ - update_details_layout_sort_visuals(el_window, fsentry.sort_by, fsentry.sort_order); + window.update_details_layout_sort_visuals(el_window, fsentry.sort_by, fsentry.sort_order); } }); }catch(err){ @@ -2695,7 +2697,7 @@ window.update_window_path = async function(el_window, target_path){ // todo optim: this is dumb because updating the window should only happen if this /readdir request is successful, // in that case there is no need for using update_window_path on error!! - update_window_path(el_window, old_path); + window.update_window_path(el_window, old_path); } } // path is '/' (global root) @@ -2704,15 +2706,15 @@ window.update_window_path = async function(el_window, target_path){ $(el_window).addClass('window-null'); $(el_window).attr('data-uid', 'null'); $(el_window).attr('data-name', ''); - $(el_window).find('.window-head-title').text(root_dirname); + $(el_window).find('.window-head-title').text(window.root_dirname); } if(is_dir){ refresh_item_container(el_window_body); - navbar_path_droppable(el_window) + window.navbar_path_droppable(el_window) } - update_explorer_footer_selected_items_count(el_window); + window.update_explorer_footer_selected_items_count(el_window); } // -------------------------------------------------------- @@ -2724,7 +2726,7 @@ window.sidebar_item_droppable = (el_window)=>{ tolerance: 'pointer', drop: function( event, ui ) { // check if item was actually dropped on this navbar path - if($(mouseover_window).attr('data-id') !== $(el_window).attr('data-id')){ + if($(window.mouseover_window).attr('data-id') !== $(el_window).attr('data-id')){ return; } const items_to_move = [] @@ -2743,7 +2745,7 @@ window.sidebar_item_droppable = (el_window)=>{ // if alt key is down, create shortcut items if(event.altKey){ items_to_move.forEach((item_to_move) => { - create_shortcut( + window.create_shortcut( path.basename($(item_to_move).attr('data-path')), $(item_to_move).attr('data-is_dir') === '1', $(this).attr('data-path'), @@ -2755,7 +2757,7 @@ window.sidebar_item_droppable = (el_window)=>{ } // move items else{ - move_items(items_to_move, $(this).attr('data-path')); + window.move_items(items_to_move, $(this).attr('data-path')); } $('.item-container').droppable('enable') @@ -2765,7 +2767,7 @@ window.sidebar_item_droppable = (el_window)=>{ }, over: function(event, ui){ // check if item was actually hovered over this window - if($(mouseover_window).attr('data-id') !== $(el_window).attr('data-id')) + if($(window.mouseover_window).attr('data-id') !== $(el_window).attr('data-id')) return; // Don't do anything if the dragged item is NOT a UIItem @@ -2804,7 +2806,7 @@ $.fn.close = async function(options) { // tell child app that this window is about to close, get its response if(app_uses_sdk){ if(!options.bypass_iframe_messaging){ - const resp = await sendWindowWillCloseMsg(el_iframe.get(0)); + const resp = await window.sendWindowWillCloseMsg(el_iframe.get(0)); if(!resp.msg){ return false; } @@ -2815,8 +2817,8 @@ $.fn.close = async function(options) { if($(this).hasClass('window')){ const win_id = parseInt($(this).attr('data-id')); let window_uuid = $(this).attr('data-element_uuid'); - // remove all instances of win_id from window_stack - _.pullAll(window_stack, [win_id]); + // remove all instances of win_id from window.window_stack + _.pullAll(window.window_stack, [win_id]); // taskbar update let open_window_count = parseInt($(`.taskbar-item[data-app="${$(this).attr('data-app')}"]`).attr('data-open-windows')); // update open window count of corresponding taskbar item @@ -2826,14 +2828,14 @@ $.fn.close = async function(options) { // decide whether to remove taskbar item if(open_window_count === 1){ $(`.taskbar-item[data-app="${$(this).attr('data-app')}"] .active-taskbar-indicator`).hide(); - remove_taskbar_item($(`.taskbar-item[data-app="${$(this).attr('data-app')}"][data-keep-in-taskbar="false"]`)); + window.remove_taskbar_item($(`.taskbar-item[data-app="${$(this).attr('data-app')}"][data-keep-in-taskbar="false"]`)); } // if no more windows of this app are open, remove taskbar item if(open_window_count - 1 === 0) $(`.taskbar-item[data-app="${$(this).attr('data-app')}"] .active-taskbar-indicator`).hide(); // if a fullpage window is closed, show desktop and taskbar if($(this).attr('data-is_fullpage') === '1'){ - exit_fullpage_mode(); + window.exit_fullpage_mode(); } // FileDialog closed @@ -2850,11 +2852,11 @@ $.fn.close = async function(options) { // close any open FileDialogs belonging to this window $(`.window-filedialog[data-parent_uuid="${window_uuid}"]`).close(); // bring focus to the last window in the window-stack (only if not minimized) - if(!_.isEmpty(window_stack)){ - const $last_window_in_stack = $(`.window[data-id="${window_stack[window_stack.length - 1]}"]`); + if(!_.isEmpty(window.window_stack)){ + const $last_window_in_stack = $(`.window[data-id="${window.window_stack[window.window_stack.length - 1]}"]`); // check if previous window is not minimized if($last_window_in_stack !== null && $last_window_in_stack.attr('data-is_minimized') !== '1' && $last_window_in_stack.attr('data-is_minimized') !== 'true'){ - $(`.window[data-id="${window_stack[window_stack.length - 1]}"]`).focusWindow(); + $(`.window[data-id="${window.window_stack[window.window_stack.length - 1]}"]`).focusWindow(); } // otherwise, change URL/Title to desktop else{ @@ -2913,7 +2915,7 @@ $.fn.close = async function(options) { } } // focus back to desktop? - if(_.isEmpty(window_stack)){ + if(_.isEmpty(window.window_stack)){ // The following is to make sure the iphone keyboard is dismissed when the last window is closed if(isMobile.phone || isMobile.tablet){ document.activeElement.blur(); @@ -2921,7 +2923,7 @@ $.fn.close = async function(options) { } // focus back to desktop $('.desktop').find('.item-blurred').removeClass('item-blurred'); - active_item_container = $('.desktop.item-container').get(0); + window.active_item_container = $('.desktop.item-container').get(0); } }) @@ -2946,7 +2948,7 @@ window.scale_window = (el_window)=>{ // set new size and position $(el_window).css({ - 'top': toolbar_height+'px', + 'top': window.toolbar_height+'px', 'left': '0', 'width': '100%', 'height': `calc(100% - ${window.taskbar_height + window.toolbar_height + 1}px)`, @@ -3004,7 +3006,7 @@ window.set_sort_by = function(item_uid, sort_by, sort_order){ sort_order = 'asc'; $.ajax({ - url: api_origin + "/set_sort_by", + url: window.api_origin + "/set_sort_by", type: 'POST', data: JSON.stringify({ sort_by: sort_by, @@ -3014,11 +3016,11 @@ window.set_sort_by = function(item_uid, sort_by, sort_order){ async: true, contentType: "application/json", headers: { - "Authorization": "Bearer "+auth_token + "Authorization": "Bearer "+window.auth_token }, statusCode: { 401: function () { - logout(); + window.logout(); }, }, success: function (){ @@ -3080,7 +3082,7 @@ $.fn.showWindow = async function(options) { width: $(el_window).attr('data-orig-width') + 'px', height: $(el_window).attr('data-orig-height') + 'px', }); - $(el_window).css('z-index', ++last_window_zindex); + $(el_window).css('z-index', ++window.last_window_zindex); setTimeout(() => { $(this).focusWindow(); @@ -3120,15 +3122,15 @@ $.fn.focusWindow = function(event) { $('.window-app-iframe').not($app_iframe).css('pointer-events', 'none'); // bring this window to front, only if it's not stay_on_top if($(this).attr('data-stay_on_top') !== 'true'){ - $(this).css('z-index', ++last_window_zindex); + $(this).css('z-index', ++window.last_window_zindex); } // if this window has a parent, bring them to the front too if($(this).attr('data-parent_uuid') !== 'null'){ - $(`.window[data-element_uuid="${$(this).attr('data-parent_uuid')}"]`).css('z-index', last_window_zindex); + $(`.window[data-element_uuid="${$(this).attr('data-parent_uuid')}"]`).css('z-index', window.last_window_zindex); } // if this window has child windows, bring them to the front too if($(this).attr('data-element_uuid') !== 'null'){ - $(`.window[data-parent_uuid="${$(this).attr('data-element_uuid')}"]`).css('z-index', ++last_window_zindex); + $(`.window[data-parent_uuid="${$(this).attr('data-element_uuid')}"]`).css('z-index', ++window.last_window_zindex); } // // if this has an iframe, focus on it @@ -3144,17 +3146,17 @@ $.fn.focusWindow = function(event) { event !== undefined && (event.type === 'click' || event.type === 'dblclick' || event.type === 'contextmenu' || event.type === 'mousedown' || event.type === 'mouseup' || event.type === 'mousemove') ){ - $app_iframe.get(0).contentWindow.postMessage({msg: "click", x: (mouseX - rect.left), y: (mouseY - rect.top)}, '*'); + $app_iframe.get(0).contentWindow.postMessage({msg: "click", x: (window.mouseX - rect.left), y: (window.mouseY - rect.top)}, '*'); } } // set active_item_container - active_item_container = $(this).find('.item-container').get(0); + window.active_item_container = $(this).find('.item-container').get(0); // grey out all selected items on other windows/desktop - $('.item-container').not(active_item_container).find('.item-selected').addClass('item-blurred'); + $('.item-container').not(window.active_item_container).find('.item-selected').addClass('item-blurred'); // update window-stack - window_stack.push(parseInt($(this).attr('data-id'))); + window.window_stack.push(parseInt($(this).attr('data-id'))); // remove blurred class from items on this window - $(active_item_container).find('.item-blurred').removeClass('item-blurred'); + $(window.active_item_container).find('.item-blurred').removeClass('item-blurred'); //change window URL const update_window_url = $(this).attr('data-update_window_url'); if(update_window_url === 'true' || update_window_url === null){ @@ -3249,13 +3251,13 @@ $(document).on('click', '.explore-table-headers-th', function(e){ } // sort - sort_items($(e.target).closest('.window-body'), sort_by, sort_order); - set_sort_by($(e.target).closest('.window').attr('data-uid'), sort_by, sort_order) + window.sort_items($(e.target).closest('.window-body'), sort_by, sort_order); + window.set_sort_by($(e.target).closest('.window').attr('data-uid'), sort_by, sort_order) }) window.set_layout = function(item_uid, layout){ $.ajax({ - url: api_origin + "/set_layout", + url: window.api_origin + "/set_layout", type: 'POST', data: JSON.stringify({ item_uid: item_uid, @@ -3264,11 +3266,11 @@ window.set_layout = function(item_uid, layout){ async: true, contentType: "application/json", headers: { - "Authorization": "Bearer "+auth_token + "Authorization": "Bearer "+window.auth_token }, statusCode: { 401: function () { - logout(); + window.logout(); }, }, success: function (){ @@ -3277,7 +3279,7 @@ window.set_layout = function(item_uid, layout){ if(el_window.length > 0){ let sort_by = el_window.attr('data-sort_by'); let sort_order = el_window.attr('data-sort_order'); - update_details_layout_sort_visuals(el_window, sort_by, sort_order); + window.update_details_layout_sort_visuals(el_window, sort_by, sort_order); } } } From e3fb25cf459e6b6b0a37b6b93f025b170f0706bd Mon Sep 17 00:00:00 2001 From: Sam Atkins Date: Wed, 1 May 2024 16:29:52 +0100 Subject: [PATCH 39/68] chore: Clarify usage of window fields in UIWindowChangePassword.js /puter/src/UI/UIWindowChangePassword.js 107:31 error 'check_password_strength' is not defined no-undef 117:18 error 'api_origin' is not defined no-undef 121:44 error 'auth_token' is not defined no-undef --- src/UI/UIWindowChangePassword.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/UI/UIWindowChangePassword.js b/src/UI/UIWindowChangePassword.js index 8aeeda5d7..9301ed162 100644 --- a/src/UI/UIWindowChangePassword.js +++ b/src/UI/UIWindowChangePassword.js @@ -104,7 +104,7 @@ async function UIWindowChangePassword(options){ return; } // check password strength - const pass_strength = check_password_strength(new_password); + const pass_strength = window.check_password_strength(new_password); if(!pass_strength.overallPass){ $(el_window).find('.form-error-msg').html(i18n('password_strength_error')); $(el_window).find('.form-error-msg').fadeIn(); @@ -114,11 +114,11 @@ async function UIWindowChangePassword(options){ $(el_window).find('.form-error-msg').hide(); $.ajax({ - url: api_origin + "/passwd", + url: window.api_origin + "/passwd", type: 'POST', async: true, headers: { - "Authorization": "Bearer "+auth_token + "Authorization": "Bearer "+window.auth_token }, contentType: "application/json", data: JSON.stringify({ From ff28d2919b11b5567bc97c0963a9b4c0a55ab439 Mon Sep 17 00:00:00 2001 From: Sam Atkins Date: Wed, 1 May 2024 16:30:36 +0100 Subject: [PATCH 40/68] chore: Clarify usage of window fields in UIWindowChangeUsername.js /puter/src/UI/UIWindowChangeUsername.js 97:18 error 'api_origin' is not defined no-undef 101:44 error 'auth_token' is not defined no-undef --- src/UI/UIWindowChangeUsername.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/UI/UIWindowChangeUsername.js b/src/UI/UIWindowChangeUsername.js index dadf9d01f..e901c10c1 100644 --- a/src/UI/UIWindowChangeUsername.js +++ b/src/UI/UIWindowChangeUsername.js @@ -94,11 +94,11 @@ async function UIWindowChangeUsername(options){ $(el_window).find('.new-username').attr('disabled', true); $.ajax({ - url: api_origin + "/change_username", + url: window.api_origin + "/change_username", type: 'POST', async: true, headers: { - "Authorization": "Bearer "+auth_token + "Authorization": "Bearer "+window.auth_token }, contentType: "application/json", data: JSON.stringify({ From 3de32c2acc17421d2079ed63b8eae3f4c0778b22 Mon Sep 17 00:00:00 2001 From: Sam Atkins Date: Wed, 1 May 2024 16:32:10 +0100 Subject: [PATCH 41/68] chore: Clarify usage of window fields in UIWindowColorPicker.js /puter/src/UI/UIWindowColorPicker.js 26:12 error 'isString' is not defined no-undef --- src/UI/UIWindowColorPicker.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/UI/UIWindowColorPicker.js b/src/UI/UIWindowColorPicker.js index 400adbb3c..70fe2b799 100644 --- a/src/UI/UIWindowColorPicker.js +++ b/src/UI/UIWindowColorPicker.js @@ -23,7 +23,7 @@ async function UIWindowColorPicker(options){ // set sensible defaults if(arguments.length > 0){ // if first argument is a string, then assume it is the default color - if(isString(arguments[0])){ + if(window.isString(arguments[0])){ options = {}; options.default = arguments[0]; } From 2f6fcdb8781c89f1f0fa25863bc93d04f9f9c579 Mon Sep 17 00:00:00 2001 From: Sam Atkins Date: Wed, 1 May 2024 16:32:51 +0100 Subject: [PATCH 42/68] chore: Clarify usage of window fields in UIWindowDownloadProgress.js /puter/src/UI/UIWindowDownloadProgress.js 74:9 error 'operation_cancelled' is not defined no-undef --- src/UI/UIWindowCopyProgress.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/UI/UIWindowCopyProgress.js b/src/UI/UIWindowCopyProgress.js index d40bda97e..297de7270 100644 --- a/src/UI/UIWindowCopyProgress.js +++ b/src/UI/UIWindowCopyProgress.js @@ -71,7 +71,7 @@ async function UIWindowCopyProgress(options){ }); $(el_window).find('.copy-cancel-btn').on('click', function(e){ - operation_cancelled[options.operation_id] = true; + window.operation_cancelled[options.operation_id] = true; $(el_window).close(); }) From dea3bc1a7f1e90349d3729081d038560b73ffd79 Mon Sep 17 00:00:00 2001 From: Sam Atkins Date: Wed, 1 May 2024 16:34:22 +0100 Subject: [PATCH 43/68] chore: Clarify use of window fields in UIWindowEmailConfirmationRequired /puter/src/UI/UIWindowEmailConfirmationRequired.js 113:26 error 'api_origin' is not defined no-undef 121:52 error 'auth_token' is not defined no-undef 125:29 error 'logout' is not defined no-undef 131:29 error 'refresh_user_data' is not defined no-undef 160:22 error 'api_origin' is not defined no-undef 165:48 error 'auth_token' is not defined no-undef 169:25 error 'logout' is not defined no-undef 188:13 error 'logout' is not defined no-undef --- src/UI/UIWindowEmailConfirmationRequired.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/UI/UIWindowEmailConfirmationRequired.js b/src/UI/UIWindowEmailConfirmationRequired.js index 46bba008a..4c472f7f3 100644 --- a/src/UI/UIWindowEmailConfirmationRequired.js +++ b/src/UI/UIWindowEmailConfirmationRequired.js @@ -110,7 +110,7 @@ function UIWindowEmailConfirmationRequired(options){ setTimeout(() => { $.ajax({ - url: api_origin + "/confirm-email", + url: window.api_origin + "/confirm-email", type: 'POST', data: JSON.stringify({ code: final_code, @@ -118,17 +118,17 @@ function UIWindowEmailConfirmationRequired(options){ async: true, contentType: "application/json", headers: { - "Authorization": "Bearer "+auth_token + "Authorization": "Bearer "+window.auth_token }, statusCode: { 401: function () { - logout(); + window.logout(); }, }, success: function (res){ if(res.email_confirmed){ $(el_window).close(); - refresh_user_data(window.auth_token) + window.refresh_user_data(window.auth_token) resolve(true); }else{ $(el_window).find('.error').html('Invalid confirmation code.'); @@ -157,16 +157,16 @@ function UIWindowEmailConfirmationRequired(options){ // send email confirmation $(el_window).find('.send-conf-email').on('click', function(e){ $.ajax({ - url: api_origin + "/send-confirm-email", + url: window.api_origin + "/send-confirm-email", type: 'POST', async: true, contentType: "application/json", headers: { - "Authorization": "Bearer "+auth_token + "Authorization": "Bearer "+window.auth_token }, statusCode: { 401: function () { - logout(); + window.logout(); }, }, success: async function (res){ @@ -185,7 +185,7 @@ function UIWindowEmailConfirmationRequired(options){ // logout $(el_window).find('.conf-email-log-out').on('click', function(e){ - logout(); + window.logout(); $(el_window).close(); }) From 93e13cdb065d628d70731e64fae985c7e7ceb690 Mon Sep 17 00:00:00 2001 From: Sam Atkins Date: Wed, 1 May 2024 16:36:00 +0100 Subject: [PATCH 44/68] chore: Clarify usage of window fields in UIWindowDesktopBGSettings.js /puter/src/UI/UIWindowDesktopBGSettings.js 168:26 error 'api_origin' is not defined no-undef 178:52 error 'auth_token' is not defined no-undef 182:29 error 'logout' is not defined no-undef 188:24 error Empty block statement no-empty --- src/UI/UIWindowDesktopBGSettings.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/UI/UIWindowDesktopBGSettings.js b/src/UI/UIWindowDesktopBGSettings.js index 49bace6f3..45a253f51 100644 --- a/src/UI/UIWindowDesktopBGSettings.js +++ b/src/UI/UIWindowDesktopBGSettings.js @@ -165,7 +165,7 @@ async function UIWindowDesktopBGSettings(options){ // /set-desktop-bg try{ $.ajax({ - url: api_origin + "/set-desktop-bg", + url: window.api_origin + "/set-desktop-bg", type: 'POST', data: JSON.stringify({ url: window.desktop_bg_url, @@ -175,17 +175,18 @@ async function UIWindowDesktopBGSettings(options){ async: true, contentType: "application/json", headers: { - "Authorization": "Bearer "+auth_token + "Authorization": "Bearer "+window.auth_token }, statusCode: { 401: function () { - logout(); + window.logout(); }, }, }) $(el_window).close(); resolve(true); }catch(err){ + // Ignore } }) From 7f050dc61aa091f86c38da7aa91c0d777c230df4 Mon Sep 17 00:00:00 2001 From: Sam Atkins Date: Wed, 1 May 2024 16:39:14 +0100 Subject: [PATCH 45/68] chore: Clarify usage of window fields in UIWindowDownloadProgress.js /puter/src/UI/UIWindowDownloadProgress.js 74:9 error 'operation_cancelled' is not defined no-undef --- src/UI/UIWindowDownloadProgress.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/UI/UIWindowDownloadProgress.js b/src/UI/UIWindowDownloadProgress.js index a9f3159a5..337fdcda7 100644 --- a/src/UI/UIWindowDownloadProgress.js +++ b/src/UI/UIWindowDownloadProgress.js @@ -71,7 +71,7 @@ async function UIWindowDownloadProgress(options){ // cancel download button clicked $(el_window).find('.download-cancel-btn').on('click', function(){ - operation_cancelled[options.operation_id] = true; + window.operation_cancelled[options.operation_id] = true; $(el_window).close(); }) From c44e0ca737afffa040f39ca19f656bd2b7f1dacc Mon Sep 17 00:00:00 2001 From: Sam Atkins Date: Wed, 1 May 2024 16:39:47 +0100 Subject: [PATCH 46/68] chore: Clarify usage of window fields in UIWindowFeedback.js /puter/src/UI/UIWindowFeedback.js 79:22 error 'api_origin' is not defined no-undef 84:48 error 'auth_token' is not defined no-undef --- src/UI/UIWindowFeedback.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/UI/UIWindowFeedback.js b/src/UI/UIWindowFeedback.js index 5e0b18f7c..92ab92a5a 100644 --- a/src/UI/UIWindowFeedback.js +++ b/src/UI/UIWindowFeedback.js @@ -76,12 +76,12 @@ async function UIWindowQR(options){ if(message) $(this).prop('disabled', true); $.ajax({ - url: api_origin + "/contactUs", + url: window.api_origin + "/contactUs", type: 'POST', async: true, contentType: "application/json", headers: { - "Authorization": "Bearer "+auth_token + "Authorization": "Bearer "+window.auth_token }, data: JSON.stringify({ message: message, From 0ebcbe516c8db77bc3a4a2a766989f9d0c6f7038 Mon Sep 17 00:00:00 2001 From: Sam Atkins Date: Wed, 1 May 2024 16:49:42 +0100 Subject: [PATCH 47/68] chore: Clarify usage of window fields in UIWindowFontPicker.js /puter/src/UI/UIWindowFontPicker.js 45:12 error 'isString' is not defined no-undef 95:21 error 'scrollParentToChild' is not defined no-undef --- src/UI/UIWindowFontPicker.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/UI/UIWindowFontPicker.js b/src/UI/UIWindowFontPicker.js index a802e5499..a3bcacf42 100644 --- a/src/UI/UIWindowFontPicker.js +++ b/src/UI/UIWindowFontPicker.js @@ -42,7 +42,7 @@ async function UIWindowFontPicker(options){ // set sensible defaults if(arguments.length > 0){ // if first argument is a string, then assume it is the default color - if(isString(arguments[0])){ + if(window.isString(arguments[0])){ options = {}; options.default = arguments[0]; } @@ -92,7 +92,7 @@ async function UIWindowFontPicker(options){ onAppend: function(window){ let active_font = $(window).find('.font-selector-active'); if(active_font.length > 0){ - scrollParentToChild($(window).find('.font-list').get(0), active_font.get(0)); + window.scrollParentToChild($(window).find('.font-list').get(0), active_font.get(0)); } }, window_class: 'window-login', From 6903ce004368a6c1fdeafdc6c30fee87f6831c57 Mon Sep 17 00:00:00 2001 From: Sam Atkins Date: Wed, 1 May 2024 16:54:31 +0100 Subject: [PATCH 48/68] chore: Clarify usage of window fields in UIWindowItemProperties.js /puter/src/UI/UIWindowItemProperties.js 135:26 error Empty block statement no-empty 147:120 error 'byte_format' is not defined no-undef 155:395 error 'extractSubdomain' is not defined no-undef --- src/UI/UIWindowItemProperties.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/UI/UIWindowItemProperties.js b/src/UI/UIWindowItemProperties.js index 2458341f1..21d46d356 100644 --- a/src/UI/UIWindowItemProperties.js +++ b/src/UI/UIWindowItemProperties.js @@ -132,7 +132,9 @@ async function UIWindowItemProperties(item_name, item_path, item_uid, left, top, $(el_window).find('.item-prop-val-original-path').text(metadata.original_path); $(el_window).find('.item-prop-original-path').show(); } - }catch(e){} + }catch(e){ + // Ignored + } } // shortcut to @@ -144,7 +146,7 @@ async function UIWindowItemProperties(item_name, item_path, item_uid, left, top, // type $(el_window).find('.item-prop-val-type').html(fsentry.is_dir ? 'Directory' : (fsentry.type === null ? '-' : fsentry.type)); // size - $(el_window).find('.item-prop-val-size').html(fsentry.size === null || fsentry.size === undefined ? '-' : byte_format(fsentry.size)); + $(el_window).find('.item-prop-val-size').html(fsentry.size === null || fsentry.size === undefined ? '-' : window.byte_format(fsentry.size)); // modified $(el_window).find('.item-prop-val-modified').html(fsentry.modified === 0 ? '-' : timeago.format(fsentry.modified*1000)); // created @@ -152,7 +154,7 @@ async function UIWindowItemProperties(item_name, item_path, item_uid, left, top, // subdomains if(fsentry.subdomains && fsentry.subdomains.length > 0 ){ fsentry.subdomains.forEach(subdomain => { - $(el_window).find('.item-prop-val-websites').append(`

${html_encode(subdomain.address)} (disassociate)

`); + $(el_window).find('.item-prop-val-websites').append(`

${html_encode(subdomain.address)} (disassociate)

`); }); } else{ From 2ed258cb6934e258b98f4f5ccfac9d487c8578d8 Mon Sep 17 00:00:00 2001 From: Sam Atkins Date: Wed, 1 May 2024 16:57:27 +0100 Subject: [PATCH 49/68] chore: Clarify usage of window fields in UIWindowLogin.js /puter/src/UI/UIWindowLogin.js 141:16 error 'is_email' is not defined no-undef 160:22 error 'gui_origin' is not defined no-undef 167:21 error 'update_auth_data' is not defined no-undef 180:59 error 'gui_origin' is not defined no-undef 186:29 error 'app_domain' is not defined no-undef 188:54 error 'gui_origin' is not defined no-undef --- src/UI/UIWindowLogin.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/UI/UIWindowLogin.js b/src/UI/UIWindowLogin.js index b8e1c1ba9..cafd17928 100644 --- a/src/UI/UIWindowLogin.js +++ b/src/UI/UIWindowLogin.js @@ -138,7 +138,7 @@ async function UIWindowLogin(options){ const password = $(el_window).find('.password').val(); let data; - if(is_email(email_username)){ + if(window.is_email(email_username)){ data = JSON.stringify({ email: email_username, password: password @@ -157,14 +157,14 @@ async function UIWindowLogin(options){ headers = window.custom_headers; $.ajax({ - url: gui_origin + "/login", + url: window.gui_origin + "/login", type: 'POST', async: false, headers: headers, contentType: "application/json", data: data, success: function (data){ - update_auth_data(data.token, data.user); + window.update_auth_data(data.token, data.user); if(options.reload_on_success){ window.onbeforeunload = null; @@ -177,15 +177,15 @@ async function UIWindowLogin(options){ const $errorMessage = $(el_window).find('.login-error-msg'); if (err.status === 404) { // Don't include the whole 404 page - $errorMessage.html(`Error 404: "${gui_origin}/login" not found`); + $errorMessage.html(`Error 404: "${window.gui_origin}/login" not found`); } else if (err.responseText) { $errorMessage.html(html_encode(err.responseText)); } else { // No message was returned. *Probably* this means we couldn't reach the server. // If this is a self-hosted instance, it's probably a configuration issue. - if (app_domain !== 'puter.com') { + if (window.app_domain !== 'puter.com') { $errorMessage.html(`
-

Error reaching "${gui_origin}/login". This is likely to be a configuration issue.

+

Error reaching "${window.gui_origin}/login". This is likely to be a configuration issue.

Make sure of the following:

  • domain in config.json is set to the domain you're using to access puter
    • From abc70f2e929974111c5022269612b2d06d49a262 Mon Sep 17 00:00:00 2001 From: Sam Atkins Date: Wed, 1 May 2024 16:58:23 +0100 Subject: [PATCH 50/68] chore: Clarify usage of window fields in UIWindowManageSessions.js /puter/src/UI/UIWindowManageSessions.js 91:41 error 'api_origin' is not defined no-undef 122:37 error 'api_origin' is not defined no-undef --- src/UI/UIWindowManageSessions.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/UI/UIWindowManageSessions.js b/src/UI/UIWindowManageSessions.js index 11f631bb3..bfa26326a 100644 --- a/src/UI/UIWindowManageSessions.js +++ b/src/UI/UIWindowManageSessions.js @@ -88,7 +88,7 @@ const UIWindowManageSessions = async function UIWindowManageSessions (options) { return; } - const resp = await fetch(`${api_origin}/auth/revoke-session`, { + const resp = await fetch(`${window.api_origin}/auth/revoke-session`, { method: 'POST', headers: { Authorization: `Bearer ${puter.authToken}`, @@ -119,7 +119,7 @@ const UIWindowManageSessions = async function UIWindowManageSessions (options) { }; const reload_sessions = async () => { - const resp = await fetch(`${api_origin}/auth/list-sessions`, { + const resp = await fetch(`${window.api_origin}/auth/list-sessions`, { headers: { Authorization: `Bearer ${puter.authToken}`, }, From ece37b62f21bcb3381eabb93e9d5ad7148fc7b0b Mon Sep 17 00:00:00 2001 From: Sam Atkins Date: Wed, 1 May 2024 16:58:45 +0100 Subject: [PATCH 51/68] chore: Clarify usage of window fields in progress dialogs /puter/src/UI/UIWindowMoveProgress.js 74:9 error 'operation_cancelled' is not defined no-undef /puter/src/UI/UIWindowNewFolderProgress.js 67:9 error 'operation_cancelled' is not defined no-undef /puter/src/UI/UIWindowProgressEmptyTrash.js 67:9 error 'operation_cancelled' is not defined no-undef --- src/UI/UIWindowMoveProgress.js | 2 +- src/UI/UIWindowNewFolderProgress.js | 2 +- src/UI/UIWindowProgressEmptyTrash.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/UI/UIWindowMoveProgress.js b/src/UI/UIWindowMoveProgress.js index 270e797d7..5ec740629 100644 --- a/src/UI/UIWindowMoveProgress.js +++ b/src/UI/UIWindowMoveProgress.js @@ -71,7 +71,7 @@ async function UIWindowMoveProgress(options){ }); $(el_window).find('.move-cancel-btn').on('click', function(e){ - operation_cancelled[options.operation_id] = true; + window.operation_cancelled[options.operation_id] = true; $(el_window).close(); }) diff --git a/src/UI/UIWindowNewFolderProgress.js b/src/UI/UIWindowNewFolderProgress.js index 2975e94a6..08d694a4c 100644 --- a/src/UI/UIWindowNewFolderProgress.js +++ b/src/UI/UIWindowNewFolderProgress.js @@ -64,7 +64,7 @@ async function UIWindowNewFolderProgress(options){ }); $(el_window).find('.newfolder-cancel-btn').on('click', function(e){ - operation_cancelled[options.operation_id] = true; + window.operation_cancelled[options.operation_id] = true; $(el_window).close(); }) diff --git a/src/UI/UIWindowProgressEmptyTrash.js b/src/UI/UIWindowProgressEmptyTrash.js index b8efabd72..8f8a8aff2 100644 --- a/src/UI/UIWindowProgressEmptyTrash.js +++ b/src/UI/UIWindowProgressEmptyTrash.js @@ -64,7 +64,7 @@ async function UIWindowProgressEmptyTrash(options){ }); $(el_window).find('.newfolder-cancel-btn').on('click', function(e){ - operation_cancelled[options.operation_id] = true; + window.operation_cancelled[options.operation_id] = true; $(el_window).close(); }) From b042f3c738ade05270e717d70514f8634ede7caa Mon Sep 17 00:00:00 2001 From: Sam Atkins Date: Wed, 1 May 2024 16:59:40 +0100 Subject: [PATCH 52/68] chore: Clarify usage of window fields in UIWindowMyWebsites.js /puter/src/UI/UIWindowMyWebsites.js 156:30 error 'api_origin' is not defined no-undef 164:56 error 'auth_token' is not defined no-undef 168:33 error 'logout' is not defined no-undef --- src/UI/UIWindowMyWebsites.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/UI/UIWindowMyWebsites.js b/src/UI/UIWindowMyWebsites.js index d4e23fbe5..33864ad09 100644 --- a/src/UI/UIWindowMyWebsites.js +++ b/src/UI/UIWindowMyWebsites.js @@ -153,7 +153,7 @@ $(document).on('click', '.mywebsites-site-setting', function(e){ } $.ajax({ - url: api_origin + "/delete-site", + url: window.api_origin + "/delete-site", type: 'POST', data: JSON.stringify({ site_uuid: $(e.target).attr('data-site-uuid'), @@ -161,11 +161,11 @@ $(document).on('click', '.mywebsites-site-setting', function(e){ async: false, contentType: "application/json", headers: { - "Authorization": "Bearer "+auth_token + "Authorization": "Bearer "+window.auth_token }, statusCode: { 401: function () { - logout(); + window.logout(); }, }, success: function (){ From e983e9e9b79953bd78cb8eee29191fcfd01d38c1 Mon Sep 17 00:00:00 2001 From: Sam Atkins Date: Wed, 1 May 2024 17:01:40 +0100 Subject: [PATCH 53/68] chore: Clarify usage of window fields in UIWindowNewPassword.js /puter/src/UI/UIWindowNewPassword.js 48:38 error 'api_origin' is not defined no-undef 153:35 error 'check_password_strength' is not defined no-undef 163:22 error 'api_origin' is not defined no-undef --- src/UI/UIWindowNewPassword.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/UI/UIWindowNewPassword.js b/src/UI/UIWindowNewPassword.js index 1b5d579a6..a097911c8 100644 --- a/src/UI/UIWindowNewPassword.js +++ b/src/UI/UIWindowNewPassword.js @@ -45,7 +45,7 @@ async function UIWindowNewPassword(options){ h += ``; h += `
`; - const response = await fetch(api_origin + "/verify-pass-recovery-token", { + const response = await fetch(window.api_origin + "/verify-pass-recovery-token", { method: 'POST', headers: { 'Content-Type': 'application/json', @@ -150,7 +150,7 @@ async function UIWindowNewPassword(options){ } // check password strength - const pass_strength = check_password_strength(new_password); + const pass_strength = window.check_password_strength(new_password); if(!pass_strength.overallPass){ $(el_window).find('.form-error-msg').html(i18n('password_strength_error')); $(el_window).find('.form-error-msg').fadeIn(); @@ -160,7 +160,7 @@ async function UIWindowNewPassword(options){ $(el_window).find('.form-error-msg').hide(); $.ajax({ - url: api_origin + "/set-pass-using-token", + url: window.api_origin + "/set-pass-using-token", type: 'POST', async: true, contentType: "application/json", From 2f30ae7a825adcd8da95888c38fe39c34acee0ff Mon Sep 17 00:00:00 2001 From: Sam Atkins Date: Wed, 1 May 2024 17:12:52 +0100 Subject: [PATCH 54/68] fix: Make url variable accessible to all users of it Line 107 tries to use `url` but can't see it. Also, clarify usage of window fields. /puter/src/UI/UIWindowPublishWebsite.js 67:67 error 'generate_identifier' is not defined no-undef 107:54 error 'url' is not defined no-undef 110:17 error 'update_sites_cache' is not defined no-undef --- src/UI/UIWindowPublishWebsite.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/UI/UIWindowPublishWebsite.js b/src/UI/UIWindowPublishWebsite.js index 1693c8727..751a2ed3b 100644 --- a/src/UI/UIWindowPublishWebsite.js +++ b/src/UI/UIWindowPublishWebsite.js @@ -64,7 +64,7 @@ async function UIWindowPublishWebsite(target_dir_uid, target_dir_name, target_di width: 450, dominant: true, onAppend: function(this_window){ - $(this_window).find(`.publish-website-subdomain`).val(generate_identifier()); + $(this_window).find(`.publish-website-subdomain`).val(window.generate_identifier()); $(this_window).find(`.publish-website-subdomain`).get(0).focus({preventScroll:true}); }, window_class: 'window-publishWebsite', @@ -91,8 +91,8 @@ async function UIWindowPublishWebsite(target_dir_uid, target_dir_name, target_di puter.hosting.create( subdomain, target_dir_path).then((res)=>{ + let url = 'https://' + subdomain + '.' + window.hosting_domain + '/'; $(el_window).find('.window-publishWebsite-form').hide(100, function(){ - let url = 'https://' + subdomain + '.' + window.hosting_domain + '/'; $(el_window).find('.publishWebsite-published-link').attr('href', url); $(el_window).find('.publishWebsite-published-link').text(url); $(el_window).find('.window-publishWebsite-success').show(100) @@ -107,7 +107,7 @@ async function UIWindowPublishWebsite(target_dir_uid, target_dir_name, target_di $(this).attr('data-website_url', url + $(this).attr('data-path').substring(target_dir_path.length)); }) - update_sites_cache(); + window.update_sites_cache(); }).catch((err)=>{ err = err.error; $(el_window).find('.publish-website-error-msg').html( From 130b57b986affacf397ddb142916872df8d09207 Mon Sep 17 00:00:00 2001 From: Sam Atkins Date: Wed, 1 May 2024 17:13:28 +0100 Subject: [PATCH 55/68] chore: Clarify usage of window fields in UIWindowRecoverPassword.js /puter/src/UI/UIWindowRecoverPassword.js 84:16 error 'is_email' is not defined no-undef 91:22 error 'api_origin' is not defined no-undef 101:25 error 'logout' is not defined no-undef --- src/UI/UIWindowRecoverPassword.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/UI/UIWindowRecoverPassword.js b/src/UI/UIWindowRecoverPassword.js index 64bc462ff..87e0ec271 100644 --- a/src/UI/UIWindowRecoverPassword.js +++ b/src/UI/UIWindowRecoverPassword.js @@ -81,14 +81,14 @@ function UIWindowRecoverPassword(options){ $(el_window).find('.send-recovery-email').on('click', function(e){ let email, username; let input = $(el_window).find('.pass-recovery-username-or-email').val(); - if(is_email(input)) + if(window.is_email(input)) email = input; else username = input; // todo validation before sending $.ajax({ - url: api_origin + "/send-pass-recovery-email", + url: window.api_origin + "/send-pass-recovery-email", type: 'POST', async: true, contentType: "application/json", @@ -98,7 +98,7 @@ function UIWindowRecoverPassword(options){ }), statusCode: { 401: function () { - logout(); + window.logout(); }, }, success: async function (res){ From e5d4be6250484d97b83070855c4588ddcb48c993 Mon Sep 17 00:00:00 2001 From: Sam Atkins Date: Wed, 1 May 2024 17:15:38 +0100 Subject: [PATCH 56/68] chore: Clarify usage of window fields in UIWindowRefer.js /puter/src/UI/UIWindowRefer.js 25:20 error 'gui_origin' is not defined no-undef 25:37 error 'user' is not defined no-undef 73:30 error 'socialLink' is not defined no-undef --- src/UI/UIWindowRefer.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/UI/UIWindowRefer.js b/src/UI/UIWindowRefer.js index a37f8e4fb..0d81dee50 100644 --- a/src/UI/UIWindowRefer.js +++ b/src/UI/UIWindowRefer.js @@ -22,7 +22,7 @@ import UIPopover from './UIPopover.js' async function UIWindowRefer(options){ let h = ''; - const url = `${gui_origin}/?r=${user.referral_code}`; + const url = `${window.gui_origin}/?r=${window.user.referral_code}`; h += `
`; h += `
×
`; @@ -70,7 +70,7 @@ async function UIWindowRefer(options){ $(el_window).find('.window-body .downloadable-link').val(url); $(el_window).find('.window-body .share-copy-link-on-social').on('click', function(e){ - const social_links = socialLink({url: url, title: i18n('refer_friends_social_media_c2a'), description: i18n('refer_friends_social_media_c2a')}); + const social_links = window.socialLink({url: url, title: i18n('refer_friends_social_media_c2a'), description: i18n('refer_friends_social_media_c2a')}); let social_links_html = ``; social_links_html += `
`; From 66cdf981903c50944fff4ef37731a2457cc782a1 Mon Sep 17 00:00:00 2001 From: Sam Atkins Date: Wed, 1 May 2024 17:16:40 +0100 Subject: [PATCH 57/68] chore: Clarify usage of window fields in UIWindowSaveAccount.js /puter/src/UI/UIWindowSaveAccount.js 130:22 error 'api_origin' is not defined no-undef 142:48 error 'auth_token' is not defined no-undef 145:21 error 'update_auth_data' is not defined no-undef --- src/UI/UIWindowSaveAccount.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/UI/UIWindowSaveAccount.js b/src/UI/UIWindowSaveAccount.js index 6048ccd1a..f0c7b8611 100644 --- a/src/UI/UIWindowSaveAccount.js +++ b/src/UI/UIWindowSaveAccount.js @@ -127,7 +127,7 @@ async function UIWindowSaveAccount(options){ $(el_window).find('.signup-btn').prop('disabled', true); $.ajax({ - url: api_origin + "/save_account", + url: window.api_origin + "/save_account", type: 'POST', async: true, contentType: "application/json", @@ -139,10 +139,10 @@ async function UIWindowSaveAccount(options){ send_confirmation_code: options.send_confirmation_code, }), headers: { - "Authorization": "Bearer "+auth_token + "Authorization": "Bearer "+window.auth_token }, - success: async function (data){ - update_auth_data(data.token, data.user) + success: async function (data){ + window.update_auth_data(data.token, data.user) //close this window if(data.user.email_confirmation_required){ From 72c0e118c327a44d96fcea3986c741072e5318ec Mon Sep 17 00:00:00 2001 From: Sam Atkins Date: Wed, 1 May 2024 17:18:08 +0100 Subject: [PATCH 58/68] chore: Clarify usage of window fields in UIWindowSessionList.js /puter/src/UI/UIWindowSessionList.js 33:117 error 'icons' is not defined no-undef 34:41 error 'logged_in_users' is not defined no-undef 35:32 error 'logged_in_users' is not defined no-undef 134:36 error 'logged_in_users' is not defined no-undef 141:17 error 'update_auth_data' is not defined no-undef --- src/UI/UIWindowSessionList.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/UI/UIWindowSessionList.js b/src/UI/UIWindowSessionList.js index a0d8bdb90..751f2e185 100644 --- a/src/UI/UIWindowSessionList.js +++ b/src/UI/UIWindowSessionList.js @@ -30,9 +30,9 @@ async function UIWindowSessionList(options){ h += `
`; h += `
${i18n('signing_in')}
` h += `
`; - h += `

${i18n('sign_in_with_puter')}

` - for (let index = 0; index < logged_in_users.length; index++) { - const l_user = logged_in_users[index]; + h += `

${i18n('sign_in_with_puter')}

` + for (let index = 0; index < window.logged_in_users.length; index++) { + const l_user = window.logged_in_users[index]; h += `
${l_user.username}
`; } h += `
`; @@ -131,14 +131,14 @@ async function UIWindowSessionList(options){ let selected_uuid = $(this).attr('data-uuid'); let selected_user; for (let index = 0; index < window.logged_in_users.length; index++) { - const l_user = logged_in_users[index]; + const l_user = window.logged_in_users[index]; if(l_user.uuid === selected_uuid){ selected_user = l_user; } } // new logged in user - update_auth_data(selected_user.auth_token, selected_user); + window.update_auth_data(selected_user.auth_token, selected_user); if(options.reload_on_success){ // disable native browser exit confirmation window.onbeforeunload = null; From 766da391389769132fc0551f13f9a9e8e1197f93 Mon Sep 17 00:00:00 2001 From: Sam Atkins Date: Wed, 1 May 2024 17:19:22 +0100 Subject: [PATCH 59/68] chore: Clarify usage of window fields in UIWindowSignup.js /puter/src/UI/UIWindowSignup.js 154:22 error 'is_email' is not defined no-undef 170:35 error 'check_password_strength' is not defined no-undef 188:22 error 'gui_origin' is not defined no-undef 203:21 error 'update_auth_data' is not defined no-undef --- src/UI/UIWindowSignup.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/UI/UIWindowSignup.js b/src/UI/UIWindowSignup.js index 956a90e1e..292f2cb9d 100644 --- a/src/UI/UIWindowSignup.js +++ b/src/UI/UIWindowSignup.js @@ -151,7 +151,7 @@ function UIWindowSignup(options){ return; } // must be a valid email - else if(!is_email(email)){ + else if(!window.is_email(email)){ $(el_window).find('.signup-error-msg').html(i18n('email_invalid')); $(el_window).find('.signup-error-msg').fadeIn(); return; @@ -167,7 +167,7 @@ function UIWindowSignup(options){ return; } // check password strength - const pass_strength = check_password_strength(password); + const pass_strength = window.check_password_strength(password); if(!pass_strength.overallPass){ $(el_window).find('.signup-error-msg').html(i18n('password_strength_error')); $(el_window).find('.signup-error-msg').fadeIn(); @@ -185,7 +185,7 @@ function UIWindowSignup(options){ headers = window.custom_headers; $.ajax({ - url: gui_origin + "/signup", + url: window.gui_origin + "/signup", type: 'POST', async: true, headers: headers, @@ -200,7 +200,7 @@ function UIWindowSignup(options){ p102xyzname: p102xyzname, }), success: async function (data){ - update_auth_data(data.token, data.user) + window.update_auth_data(data.token, data.user) //send out the login event if(options.reload_on_success){ From e5cd2bed875869a163e9343d585efd22a60eca8f Mon Sep 17 00:00:00 2001 From: Sam Atkins Date: Wed, 1 May 2024 17:19:53 +0100 Subject: [PATCH 60/68] chore: Clarify usage of window fields in globals.js /puter/src/globals.js 124:65 error 'first_visit_animation' is not defined no-undef --- src/globals.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/globals.js b/src/globals.js index 3860f9219..0effd52c2 100644 --- a/src/globals.js +++ b/src/globals.js @@ -121,7 +121,7 @@ window.first_visit_animation = false; window.show_twitter_link = true; window.animate_window_opening = true; window.animate_window_closing = true; -window.desktop_loading_fade_delay = (window.first_visit_ever && first_visit_animation ? 6000 : 1000); +window.desktop_loading_fade_delay = (window.first_visit_ever && window.first_visit_animation ? 6000 : 1000); window.watchItems = []; window.appdata_signatures = {}; window.appCallbackFunctions = []; From eefc0d41e169aaeff0215fb7c4355108a3321dc5 Mon Sep 17 00:00:00 2001 From: Sam Atkins Date: Thu, 2 May 2024 16:54:17 +0100 Subject: [PATCH 61/68] chore: Fix eslint issues in helpers.js Most of these are window fields that wanted `window.` prepended, but a couple of issues are code that was using undefined variables (`ht` and `dir_uuid`) and some switch-cases that I believe are intentionally falling through. /puter/src/helpers.js 39:55 error 'auth_token' is not defined no-undef 47:14 error 'api_origin' is not defined no-undef 55:40 error 'auth_token' is not defined no-undef 59:17 error 'logout' is not defined no-undef 199:14 error 'api_origin' is not defined no-undef 208:40 error 'auth_token' is not defined no-undef 212:17 error 'logout' is not defined no-undef 224:14 error 'api_origin' is not defined no-undef 234:40 error 'auth_token' is not defined no-undef 238:17 error 'logout' is not defined no-undef 316:13 error Expected a 'break' statement before 'case' no-fallthrough 323:13 error Expected a 'break' statement before 'case' no-fallthrough 330:13 error Expected a 'break' statement before 'case' no-fallthrough 337:13 error Expected a 'break' statement before 'case' no-fallthrough 367:47 error Unnecessary escape character: \/ no-useless-escape 411:14 error 'isString' is not defined no-undef 420:47 error 'config' is not defined no-undef 519:21 error 'globToRegExp' is not defined no-undef 651:14 error Empty block statement no-empty 656:9 error 'update_auth_data' is not defined no-undef 678:36 error 'api_origin' is not defined no-undef 722:5 error 'update_user_preferences' is not defined no-undef 740:24 error 'uuidv4' is not defined no-undef 746:9 error 'appCallbackFunctions' is not defined no-undef 789:14 error 'api_origin' is not defined no-undef 794:40 error 'auth_token' is not defined no-undef 861:33 error 'trash_path' is not defined no-undef 867:21 error Empty block statement no-empty 889:70 error 'trash_path' is not defined no-undef 891:59 error 'trash_path' is not defined no-undef 894:49 error 'trash_path' is not defined no-undef 907:29 error 'docs_path' is not defined no-undef 909:35 error 'pictures_path' is not defined no-undef 911:35 error 'home_path' is not defined no-undef 913:35 error 'videos_path' is not defined no-undef 915:35 error 'desktop_path' is not defined no-undef 1037:5 error 'getItem' is not defined no-undef 1041:17 error 'setItem' is not defined no-undef 1070:54 error Empty block statement no-empty 1089:51 error 'ht' is not defined no-undef 1091:20 error 'desktop_loading_fade_delay' is not defined no-undef 1150:27 error 'operation_id' is not defined no-undef 1151:5 error 'operation_cancelled' is not defined no-undef 1169:21 error 'activate_item_name_editor' is not defined no-undef 1172:21 error 'actions_history' is not defined no-undef 1181:54 error 'copy_progress_hide_delay' is not defined no-undef 1187:37 error 'copy_progress_hide_delay' is not defined no-undef 1211:21 error 'activate_item_name_editor' is not defined no-undef 1214:21 error 'actions_history' is not defined no-undef 1245:22 error 'operation_id' is not defined no-undef 1246:5 error 'operation_cancelled' is not defined no-undef 1249:5 error 'update_explorer_footer_selected_items_count' is not defined no-undef 1263:24 error 'clipboard' is not defined no-undef 1264:29 error 'clipboard' is not defined no-undef 1273:20 error 'operation_cancelled' is not defined no-undef 1302:38 error 'clipboard' is not defined no-undef 1303:38 error 'clipboard' is not defined no-undef 1327:9 error 'actions_history' is not defined no-undef 1335:40 error 'copy_progress_hide_delay' is not defined no-undef 1341:29 error 'copy_progress_hide_delay' is not defined no-undef 1354:22 error 'operation_id' is not defined no-undef 1377:20 error 'operation_cancelled' is not defined no-undef 1432:9 error 'actions_history' is not defined no-undef 1440:40 error 'copy_progress_hide_delay' is not defined no-undef 1446:29 error 'copy_progress_hide_delay' is not defined no-undef 1486:17 error 'update_explorer_footer_item_count' is not defined no-undef 1487:17 error 'update_explorer_footer_selected_items_count' is not defined no-undef 1500:8 error 'clipboard' is not defined no-undef 1501:24 error 'clipboard' is not defined no-undef 1502:61 error 'clipboard' is not defined no-undef 1505:13 error 'move_items' is not defined no-undef 1508:5 error 'clipboard' is not defined no-undef 1537:23 error 'api_origin' is not defined no-undef 1537:84 error 'auth_token' is not defined no-undef 1556:34 error 'uuidv4' is not defined no-undef 1565:45 error 'get_apps' is not defined no-undef 1572:13 error This branch can never execute. Its condition is a duplicate or covered by previous conditions in the if-else-if chain no-dupe-else-if 1639:21 error 'root_dirname' is not defined no-undef 1684:37 error 'gui_origin' is not defined no-undef 1711:60 error 'app_domain' is not defined no-undef 1723:64 error 'auth_token' is not defined no-undef 1737:49 error 'auth_token' is not defined no-undef 1748:12 error 'api_origin' is not defined no-undef 1749:64 error 'api_origin' is not defined no-undef 1800:13 error 'launch_apps' is not defined no-undef 1803:13 error 'launch_apps' is not defined no-undef 1803:43 error 'launch_apps' is not defined no-undef 1806:13 error 'launch_apps' is not defined no-undef 1806:34 error 'launch_apps' is not defined no-undef 1810:22 error 'api_origin' is not defined no-undef 1819:48 error 'auth_token' is not defined no-undef 1867:56 error 'trash_path' is not defined no-undef 1873:34 error 'trash_path' is not defined no-undef 1942:30 error 'busy_indicator_hide_delay' is not defined no-undef 1948:25 error 'busy_indicator_hide_delay' is not defined no-undef 1954:48 error 'user_preferences' is not defined no-undef 1955:9 error 'launch_app' is not defined no-undef 1956:19 error 'user_preferences' is not defined no-undef 1967:9 error 'launch_app' is not defined no-undef 1978:25 error 'item_icon' is not defined no-undef 1992:9 error 'window_nav_history' is not defined no-undef 1992:45 error 'window_nav_history' is not defined no-undef 1992:88 error 'window_nav_history_current_position' is not defined no-undef 1993:9 error 'window_nav_history' is not defined no-undef 1994:9 error 'window_nav_history_current_position' is not defined no-undef 1996:9 error 'update_window_path' is not defined no-undef 2009:22 error 'api_origin' is not defined no-undef 2017:48 error 'auth_token' is not defined no-undef 2021:25 error 'logout' is not defined no-undef 2025:20 error Empty block statement no-empty 2029:70 error 'suggest_apps_for_fsentry' is not defined no-undef 2040:17 error 'unzipItem' is not defined no-undef 2057:17 error 'trigger_download' is not defined no-undef 2065:13 error 'launch_app' is not defined no-undef 2087:22 error 'operation_id' is not defined no-undef 2088:5 error 'operation_cancelled' is not defined no-undef 2129:12 error 'operation_cancelled' is not defined no-undef 2166:30 error Empty block statement no-empty 2173:20 error 'operation_cancelled' is not defined no-undef 2182:34 error 'trash_path' is not defined no-undef 2196:55 error 'trash_path' is not defined no-undef 2196:116 error 'trash_path' is not defined no-undef 2197:57 error 'trash_path' is not defined no-undef 2201:46 error 'trash_path' is not defined no-undef 2215:47 error 'trash_path' is not defined no-undef 2254:25 error 'update_explorer_footer_item_count' is not defined no-undef 2255:25 error 'update_explorer_footer_selected_items_count' is not defined no-undef 2260:34 error 'trash_path' is not defined no-undef 2270:25 error 'update_window_path' is not defined no-undef 2274:34 error 'trash_path' is not defined no-undef 2279:46 error 'dir_uuid' is not defined no-undef 2302:33 error 'item_icon' is not defined no-undef 2303:42 error 'trash_path' is not defined no-undef 2309:47 error 'trash_path' is not defined no-undef 2331:41 error 'item_icon' is not defined no-undef 2343:21 error 'sort_items' is not defined no-undef 2348:21 error 'sort_items' is not defined no-undef 2391:47 error 'trash_path' is not defined no-undef 2397:51 error 'trash_path' is not defined no-undef 2398:53 error 'trash_path' is not defined no-undef 2413:34 error 'trash_path' is not defined no-undef 2414:9 error 'actions_history' is not defined no-undef 2418:40 error 'trash_path' is not defined no-undef 2419:9 error 'actions_history' is not defined no-undef 2428:12 error 'copy_progress_hide_delay' is not defined no-undef 2641:21 error 'upload_items' is not defined no-undef 2659:21 error 'trash_path' is not defined no-undef 2679:21 error 'show_save_account_notice_if_needed' is not defined no-undef 2683:17 error 'active_uploads' is not defined no-undef 2695:17 error 'active_uploads' is not defined no-undef 2714:17 error 'actions_history' is not defined no-undef 2722:25 error 'show_save_account_notice_if_needed' is not defined no-undef 2723:33 error 'upload_progress_hide_delay' is not defined no-undef 2726:24 error 'active_uploads' is not defined no-undef 2733:24 error 'active_uploads' is not defined no-undef 2739:24 error 'active_uploads' is not defined no-undef 2766:17 error 'uuidv4' is not defined no-undef 2772:16 error 'trash_path' is not defined no-undef 2782:47 error 'trash_path' is not defined no-undef 2782:108 error 'trash_path' is not defined no-undef 2783:37 error 'trash_path' is not defined no-undef 2786:36 error 'trash_path' is not defined no-undef 2788:13 error 'update_explorer_footer_item_count' is not defined no-undef 2788:71 error 'trash_path' is not defined no-undef 2793:28 error 'copy_progress_hide_delay' is not defined no-undef 2799:28 error 'copy_progress_hide_delay' is not defined no-undef 2815:18 error 'api_origin' is not defined no-undef 2818:42 error 'auth_token' is not defined no-undef 2991:28 error 'copy_progress_hide_delay' is not defined no-undef 2998:28 error 'copy_progress_hide_delay' is not defined no-undef 3066:24 error 'copy_progress_hide_delay' is not defined no-undef 3074:24 error 'copy_progress_hide_delay' is not defined no-undef 3086:17 error 'actions_history' is not defined no-undef 3095:17 error 'suggest_apps_for_fsentry' is not defined no-undef 3104:95 error 'truncate_filename' is not defined no-undef 3104:123 error 'TRUNCATE_LENGTH' is not defined no-undef 3111:84 error 'item_icon' is not defined no-undef 3150:23 error 'update_sites_cache' is not defined no-undef 3153:27 error 'determine_website_url' is not defined no-undef 3158:17 error 'update_window_path' is not defined no-undef 3166:17 error 'sort_items' is not defined no-undef 3171:34 error 'truncate_filename' is not defined no-undef 3171:66 error 'TRUNCATE_LENGTH' is not defined no-undef 3205:9 error 'actions_history' is not defined no-undef 3206:29 error 'actions_history' is not defined no-undef 3211:13 error 'undo_create_file_or_folder' is not defined no-undef 3214:13 error 'rename_file' is not defined no-undef 3217:13 error 'undo_upload' is not defined no-undef 3220:13 error 'undo_copy' is not defined no-undef 3223:13 error 'undo_move' is not defined no-undef 3226:13 error 'undo_delete' is not defined no-undef 3249:26 error 'get_html_element_from_options' is not defined no-undef 3251:9 error 'move_items' is not defined no-undef 3257:26 error 'get_html_element_from_options' is not defined no-undef 3259:9 error 'move_items' is not defined no-undef 3265:21 error 'global_element_id' is not defined no-undef 3282:23 error 'determine_website_url' is not defined no-undef 3324:42 error 'byte_format' is not defined no-undef 3381:116 error 'truncate_filename' is not defined no-undef 3381:148 error 'TRUNCATE_LENGTH' is not defined no-undef 3396:5 error 'is_auto_arrange_enabled' is not defined no-undef 3398:5 error 'desktop_item_positions' is not defined no-undef 3408:8 error 'reset_item_positions' is not defined no-undef 3409:9 error 'delete_desktop_item_positions' is not defined no-undef 3415:26 error 'desktop_item_positions' is not defined no-undef 3426:44 error 'desktop_item_positions' is not defined no-undef 3430:5 error 'desktop_item_positions' is not defined no-undef 3438:28 error 'is_fullscreen' is not defined no-undef 3462:14 error 'window_for_app_instance' is not defined no-undef 3469:31 error 'iframe_for_app_instance' is not defined no-undef 3483:23 error 'window_for_app_instance' is not defined no-undef 3514:42 error Unnecessary escape character: \[ no-useless-escape 3514:59 error Unnecessary escape character: \/ no-useless-escape --- src/helpers.js | 398 +++++++++++++++++++++++++------------------------ 1 file changed, 202 insertions(+), 196 deletions(-) diff --git a/src/helpers.js b/src/helpers.js index f895bac97..0c4521eac 100644 --- a/src/helpers.js +++ b/src/helpers.js @@ -36,7 +36,7 @@ import UIWindowDownloadDirProg from './UI/UIWindowDownloadDirProg.js'; import { PROCESS_RUNNING, PortalProcess, PseudoProcess } from "./definitions.js"; window.is_auth = ()=>{ - if(localStorage.getItem("auth_token") === null || auth_token === null) + if(localStorage.getItem("auth_token") === null || window.auth_token === null) return false; else return true; @@ -44,7 +44,7 @@ window.is_auth = ()=>{ window.suggest_apps_for_fsentry = async (options)=>{ let res = await $.ajax({ - url: api_origin + "/suggest_apps", + url: window.api_origin + "/suggest_apps", type: 'POST', contentType: "application/json", data: JSON.stringify({ @@ -52,11 +52,11 @@ window.suggest_apps_for_fsentry = async (options)=>{ path: options.path ?? undefined, }), headers: { - "Authorization": "Bearer "+auth_token + "Authorization": "Bearer "+window.auth_token }, statusCode: { 401: function () { - logout(); + window.logout(); }, }, success: function (res){ @@ -196,7 +196,7 @@ window.scrollParentToChild = (parent, child)=>{ window.getItem = async function(options){ return $.ajax({ - url: api_origin + "/getItem", + url: window.api_origin + "/getItem", type: 'POST', data: JSON.stringify({ key: options.key, @@ -205,11 +205,11 @@ window.getItem = async function(options){ async: true, contentType: "application/json", headers: { - "Authorization": "Bearer "+auth_token + "Authorization": "Bearer "+window.auth_token }, statusCode: { 401: function () { - logout(); + window.logout(); }, }, success: function (result){ @@ -221,7 +221,7 @@ window.getItem = async function(options){ window.setItem = async function(options){ return $.ajax({ - url: api_origin + "/setItem", + url: window.api_origin + "/setItem", type: 'POST', data: JSON.stringify({ app: options.app_uid, @@ -231,11 +231,11 @@ window.setItem = async function(options){ async: true, contentType: "application/json", headers: { - "Authorization": "Bearer "+auth_token + "Authorization": "Bearer "+window.auth_token }, statusCode: { 401: function () { - logout(); + window.logout(); }, }, success: function (fsentry){ @@ -312,6 +312,7 @@ window.globToRegExp = function (glob, opts) { reStr += "."; break; } + // fallthrough case "[": case "]": @@ -319,6 +320,7 @@ window.globToRegExp = function (glob, opts) { reStr += c; break; } + // fallthrough case "{": if (extended) { @@ -326,6 +328,7 @@ window.globToRegExp = function (glob, opts) { reStr += "("; break; } + // fallthrough case "}": if (extended) { @@ -333,6 +336,7 @@ window.globToRegExp = function (glob, opts) { reStr += ")"; break; } + // fallthrough case ",": if (inGroup) { @@ -364,7 +368,7 @@ window.globToRegExp = function (glob, opts) { if (isGlobstar) { // it's a globstar, so match zero or more path segments - reStr += "((?:[^/]*(?:\/|$))*)"; + reStr += "((?:[^/]*(?:/|$))*)"; i++; // move over the "/" } else { // it's not a globstar, so only match one path segment @@ -408,7 +412,7 @@ window.globToRegExp = function (glob, opts) { window.validate_fsentry_name = function(name){ if(!name) throw {message: i18n('name_cannot_be_empty')} - else if(!isString(name)) + else if(!window.isString(name)) throw {message: i18n('name_must_be_string')} else if(name.includes('/')) throw {message: i18n('name_cannot_contain_slash')} @@ -417,7 +421,7 @@ window.validate_fsentry_name = function(name){ else if(name === '..') throw {message: i18n('name_cannot_contain_double_period')}; else if(name.length > window.max_item_name_length) - throw {message: i18n('name_too_long', config.max_item_name_length)} + throw {message: i18n('name_too_long', window.max_item_name_length)} else return true } @@ -516,7 +520,7 @@ window.check_fsentry_against_allowed_file_types_string =function (fsentry, allow } // MIME types (e.g. text/plain) - else if(globToRegExp(allowed_file_type).test(fsentry.type?.toLowerCase())){ + else if(window.globToRegExp(allowed_file_type).test(fsentry.type?.toLowerCase())){ passes_allowed_file_type_filter = true; break; } @@ -649,11 +653,11 @@ window.refresh_user_data = async (auth_token)=>{ try{ whoami = await puter.os.user(); }catch(e){ - + // Ignored } // update local user data if(whoami){ - update_auth_data(auth_token, whoami) + window.update_auth_data(auth_token, whoami) } } @@ -675,7 +679,7 @@ window.update_auth_data = (auth_token, user)=>{ localStorage.setItem('user', JSON.stringify(window.user)); // re-initialize the Puter.js objects with the new auth token - puter.setAuthToken(auth_token, api_origin) + puter.setAuthToken(auth_token, window.api_origin) //update the logged_in_users array entry for this user if(window.user){ @@ -719,7 +723,7 @@ window.mutate_user_preferences = function(user_preferences_delta) { puter.kv.set(`user_preferences.${key}`, value); } // There may be syncing issues across multiple devices - update_user_preferences({ ...window.user_preferences, ...user_preferences_delta }); + window.update_user_preferences({ ...window.user_preferences, ...user_preferences_delta }); } window.update_user_preferences = function(user_preferences) { @@ -737,13 +741,13 @@ window.update_user_preferences = function(user_preferences) { window.sendWindowWillCloseMsg = function(iframe_element) { return new Promise(function(resolve){ - const msg_id = uuidv4(); + const msg_id = window.uuidv4(); iframe_element.contentWindow.postMessage({ msg: "windowWillClose", msg_id: msg_id }, '*'); //register callback - appCallbackFunctions[msg_id] = resolve; + window.appCallbackFunctions[msg_id] = resolve; }) } @@ -786,12 +790,12 @@ window.get_apps = async (app_names, callback)=>{ return []; let res = await $.ajax({ - url: api_origin + "/apps/"+app_names, + url: window.api_origin + "/apps/"+app_names, type: 'GET', async: true, contentType: "application/json", headers: { - "Authorization": "Bearer "+auth_token + "Authorization": "Bearer "+window.auth_token }, success: function (res){ } @@ -858,13 +862,14 @@ window.item_icon = async (fsentry)=>{ // -------------------------------------------------- // If this file is Trashed then set the name to the original name of the file before it was trashed // -------------------------------------------------- - if(fsentry.path?.startsWith(trash_path + '/')){ + if(fsentry.path?.startsWith(window.trash_path + '/')){ if(fsentry.metadata){ try{ let metadata = JSON.parse(fsentry.metadata); fsentry.name = (metadata && metadata.original_name) ? metadata.original_name : fsentry.name } catch(e){ + // Ignored } } } @@ -886,12 +891,12 @@ window.item_icon = async (fsentry)=>{ // -------------------------------------------------- // Trash // -------------------------------------------------- - else if(fsentry.shortcut_to_path && fsentry.shortcut_to_path === trash_path){ + else if(fsentry.shortcut_to_path && fsentry.shortcut_to_path === window.trash_path){ // get trash image, this is needed to get the correct empty vs full trash icon - let trash_img = $(`.item[data-path="${html_encode(trash_path)}" i] .item-icon-icon`).attr('src') + let trash_img = $(`.item[data-path="${html_encode(window.trash_path)}" i] .item-icon-icon`).attr('src') // if trash_img is undefined that's probably because trash wasn't added anywhere, do a direct lookup to see if trash is empty or no if(!trash_img){ - let trashstat = await puter.fs.stat(trash_path); + let trashstat = await puter.fs.stat(window.trash_path); if(trashstat.is_empty !== undefined && trashstat.is_empty === true) trash_img = window.icons['trash.svg']; else @@ -904,15 +909,15 @@ window.item_icon = async (fsentry)=>{ // -------------------------------------------------- else if(fsentry.is_dir){ // System Directories - if(fsentry.path === docs_path) + if(fsentry.path === window.docs_path) return {image: window.icons['folder-documents.svg'], type: 'icon'}; - else if (fsentry.path === pictures_path) + else if (fsentry.path === window.pictures_path) return { image: window.icons['folder-pictures.svg'], type: 'icon' }; - else if (fsentry.path === home_path) + else if (fsentry.path === window.home_path) return { image: window.icons['folder-home.svg'], type: 'icon' }; - else if (fsentry.path === videos_path) + else if (fsentry.path === window.videos_path) return { image: window.icons['folder-videos.svg'], type: 'icon' }; - else if (fsentry.path === desktop_path) + else if (fsentry.path === window.desktop_path) return { image: window.icons['folder-desktop.svg'], type: 'icon' }; // regular directories else @@ -1034,11 +1039,11 @@ window.item_icon = async (fsentry)=>{ */ window.show_save_account_notice_if_needed = function(message){ - getItem({ + window.getItem({ key: "save_account_notice_shown", success: async function(value){ if(!value && window.user?.is_temp){ - setItem({key: "save_account_notice_shown", value: true}); + window.setItem({key: "save_account_notice_shown", value: true}); // Show the notice setTimeout(async () => { @@ -1068,6 +1073,7 @@ window.show_save_account_notice_if_needed = function(message){ }) if(alert_resp === 'remind-later'){ + // TODO } if(alert_resp === 'save-session'){ let saved = await UIWindowSaveAccount({ @@ -1085,10 +1091,9 @@ window.show_save_account_notice_if_needed = function(message){ close_on_backdrop_click: false, } }); - if(!login_result) - $('.toolbar').prepend(ht); + // FIXME: Report login error. } - }, desktop_loading_fade_delay + 1000); + }, window.desktop_loading_fade_delay + 1000); } } }) @@ -1147,8 +1152,8 @@ window.create_folder = async(basedir, appendto_element)=>{ let dirname = basedir; let folder_name = 'New Folder'; - let newfolder_op_id = operation_id++; - operation_cancelled[newfolder_op_id] = false; + let newfolder_op_id = window.operation_id++; + window.operation_cancelled[newfolder_op_id] = false; let newfolder_progress_window_init_ts = Date.now(); let progwin; @@ -1166,10 +1171,10 @@ window.create_folder = async(basedir, appendto_element)=>{ success: function (data){ const el_created_dir = $(appendto_element).find('.item[data-path="'+html_encode(dirname)+'/'+html_encode(data.name)+'"]'); if(el_created_dir.length > 0){ - activate_item_name_editor(el_created_dir); + window.activate_item_name_editor(el_created_dir); // Add action to actions_history for undo ability - actions_history.push({ + window.actions_history.push({ operation: 'create_folder', data: el_created_dir }); @@ -1178,13 +1183,13 @@ window.create_folder = async(basedir, appendto_element)=>{ // done let newfolder_duration = (Date.now() - newfolder_progress_window_init_ts); - if( progwin && newfolder_duration >= copy_progress_hide_delay){ + if( progwin && newfolder_duration >= window.copy_progress_hide_delay){ $(progwin).close(); }else if(progwin){ setTimeout(() => { setTimeout(() => { $(progwin).close(); - }, Math.abs(copy_progress_hide_delay - newfolder_duration)); + }, Math.abs(window.copy_progress_hide_delay - newfolder_duration)); }) } } @@ -1208,10 +1213,10 @@ window.create_file = async(options)=>{ success: async function (data){ const created_file = $(appendto_element).find('.item[data-path="'+html_encode(dirname)+'/'+html_encode(data.name)+'"]'); if(created_file.length > 0){ - activate_item_name_editor(created_file); + window.activate_item_name_editor(created_file); // Add action to actions_history for undo ability - actions_history.push({ + window.actions_history.push({ operation: 'create_file', data: created_file }); @@ -1242,11 +1247,11 @@ window.create_shortcut = async(filename, is_dir, basedir, appendto_element, shor } window.copy_clipboard_items = async function(dest_path, dest_container_element){ - let copy_op_id = operation_id++; - operation_cancelled[copy_op_id] = false; + let copy_op_id = window.operation_id++; + window.operation_cancelled[copy_op_id] = false; // unselect previously selected items in the target container $(dest_container_element).children('.item-selected').removeClass('item-selected'); - update_explorer_footer_selected_items_count($(dest_container_element).closest('.window')); + window.update_explorer_footer_selected_items_count($(dest_container_element).closest('.window')); let overwrite_all = false; (async()=>{ @@ -1260,8 +1265,8 @@ window.copy_clipboard_items = async function(dest_path, dest_container_element){ const copied_item_paths = [] - for(let i=0; i${html_encode(err.entry_name)} already exists.`, buttons:[ {label: i18n('replace'), type: 'primary', value: 'replace'}, - ... (clipboard.length > 1) ? [{label: i18n('replace_all'), value: 'replace_all'}] : [], - ... (clipboard.length > 1) ? [{label: i18n('skip'), value: 'skip'}] : [{label: i18n('cancel'), value: 'cancel'}], + ... (window.clipboard.length > 1) ? [{label: i18n('replace_all'), value: 'replace_all'}] : [], + ... (window.clipboard.length > 1) ? [{label: i18n('skip'), value: 'skip'}] : [{label: i18n('cancel'), value: 'cancel'}], ] }) if(alert_resp === 'replace'){ @@ -1324,7 +1329,7 @@ window.copy_clipboard_items = async function(dest_path, dest_container_element){ // done // Add action to actions_history for undo ability - actions_history.push({ + window.actions_history.push({ operation: 'copy', data: copied_item_paths }); @@ -1332,13 +1337,13 @@ window.copy_clipboard_items = async function(dest_path, dest_container_element){ clearTimeout(progwin_timeout); let copy_duration = (Date.now() - copy_progress_window_init_ts); - if(progwin && copy_duration >= copy_progress_hide_delay){ + if(progwin && copy_duration >= window.copy_progress_hide_delay){ $(progwin).close(); }else if(progwin){ setTimeout(() => { setTimeout(() => { $(progwin).close(); - }, Math.abs(copy_progress_hide_delay - copy_duration)); + }, Math.abs(window.copy_progress_hide_delay - copy_duration)); }) } })(); @@ -1351,7 +1356,7 @@ window.copy_clipboard_items = async function(dest_path, dest_container_element){ * @param {string} dest_path - Destination path to copy items to */ window.copy_items = function(el_items, dest_path){ - let copy_op_id = operation_id++; + let copy_op_id = window.operation_id++; let overwrite_all = false; (async()=>{ let copy_progress_window_init_ts = Date.now(); @@ -1374,7 +1379,7 @@ window.copy_items = function(el_items, dest_path){ if(overwrite) item_with_same_name_already_exists = false; // cancelled? - if(operation_cancelled[copy_op_id]) + if(window.operation_cancelled[copy_op_id]) return; try{ let resp = await puter.fs.copy({ @@ -1429,7 +1434,7 @@ window.copy_items = function(el_items, dest_path){ // done // Add action to actions_history for undo ability - actions_history.push({ + window.actions_history.push({ operation: 'copy', data: copied_item_paths }); @@ -1437,13 +1442,13 @@ window.copy_items = function(el_items, dest_path){ clearTimeout(progwin_timeout); let copy_duration = (Date.now() - copy_progress_window_init_ts); - if(progwin && copy_duration >= copy_progress_hide_delay){ + if(progwin && copy_duration >= window.copy_progress_hide_delay){ $(progwin).close(); }else if(progwin){ setTimeout(() => { setTimeout(() => { $(progwin).close(); - }, Math.abs(copy_progress_hide_delay - copy_duration)); + }, Math.abs(window.copy_progress_hide_delay - copy_duration)); }) } })() @@ -1483,8 +1488,8 @@ window.delete_item = async function(el_item, descendants_only = false){ $(`.item[data-uid='${$(el_item).attr('data-uid')}']`).removeItems(); // update parent windows' item counts $(parent_windows).each(function(index){ - update_explorer_footer_item_count(this); - update_explorer_footer_selected_items_count(this); + window.update_explorer_footer_item_count(this); + window.update_explorer_footer_selected_items_count(this); }); // update all shortcuts to this item $(`.item[data-shortcut_to_path="${html_encode($(el_item).attr('data-path'))}" i]`).attr(`data-shortcut_to_path`, ''); @@ -1497,15 +1502,15 @@ window.delete_item = async function(el_item, descendants_only = false){ window.move_clipboard_items = function (el_target_container, target_path){ let dest_path = target_path === undefined ? $(el_target_container).attr('data-path') : target_path; let el_items = []; - if(clipboard.length > 0){ - for(let i=0; i 0){ + for(let i=0; i 0) - move_items(el_items, dest_path); + window.move_items(el_items, dest_path); } - clipboard = []; + window.clipboard = []; } /** @@ -1534,7 +1539,7 @@ window.trigger_download = (paths)=>{ let urls = []; for (let index = 0; index < paths.length; index++) { urls.push({ - download: api_origin + "/down?path=" + paths[index] + "&auth_token=" + auth_token, + download: window.api_origin + "/down?path=" + paths[index] + "&auth_token=" + window.auth_token, filename: path.basename(paths[index]), }); } @@ -1553,7 +1558,7 @@ window.trigger_download = (paths)=>{ * @param {*} options */ window.launch_app = async (options)=>{ - const uuid = options.uuid ?? uuidv4(); + const uuid = options.uuid ?? window.uuidv4(); let icon, title, file_signature; const window_options = options.window_options ?? {}; @@ -1562,15 +1567,13 @@ window.launch_app = async (options)=>{ } // try to get 3rd-party app info - let app_info = options.app_obj ?? await get_apps(options.name); + let app_info = options.app_obj ?? await window.get_apps(options.name); //----------------------------------- // icon //----------------------------------- if(app_info.icon) icon = app_info.icon; - else if(app_info.icon) - icon = window.icons['app.svg']; else if(options.name === 'explorer') icon = window.icons['folder.svg']; else @@ -1636,7 +1639,7 @@ window.launch_app = async (options)=>{ title = 'Trash'; } else if(!options.path) - title = root_dirname; + title = window.root_dirname; else title = path.dirname(options.path); @@ -1681,7 +1684,7 @@ window.launch_app = async (options)=>{ iframe_url = new URL('https://'+options.name+'.' + window.app_domain + `/index.html`); } else if ( app_info.index_url.startsWith(BUILTIN_PREFIX) ) { const name = app_info.index_url.slice(BUILTIN_PREFIX.length); - iframe_url = new URL(`${gui_origin}/builtin/${name}`); + iframe_url = new URL(`${window.gui_origin}/builtin/${name}`); } else { iframe_url = new URL(app_info.index_url); } @@ -1708,7 +1711,7 @@ window.launch_app = async (options)=>{ iframe_url.searchParams.append('puter.item.accessed', file_signature.fsentry_accessed); iframe_url.searchParams.append('puter.item.modified', file_signature.fsentry_modified); iframe_url.searchParams.append('puter.item.created', file_signature.fsentry_created); - iframe_url.searchParams.append('puter.domain', app_domain); + iframe_url.searchParams.append('puter.domain', window.app_domain); } else if(options.readURL){ iframe_url.searchParams.append('puter.item.name', options.filename); @@ -1720,7 +1723,7 @@ window.launch_app = async (options)=>{ if (app_info.godmode && app_info.godmode === 1){ // Add auth_token to GODMODE apps - iframe_url.searchParams.append('puter.auth.token', auth_token); + iframe_url.searchParams.append('puter.auth.token', window.auth_token); iframe_url.searchParams.append('puter.auth.username', window.user.username); iframe_url.searchParams.append('puter.domain', window.app_domain); } else if (options.token){ @@ -1734,7 +1737,7 @@ window.launch_app = async (options)=>{ let response = await fetch(window.api_origin + "/auth/get-user-app-token", { "headers": { "Content-Type": "application/json", - "Authorization": "Bearer "+ auth_token, + "Authorization": "Bearer "+ window.auth_token, }, "body": JSON.stringify({app_uid: app_info.uid ?? app_info.uuid}), "method": "POST", @@ -1745,8 +1748,8 @@ window.launch_app = async (options)=>{ } } - if(api_origin) - iframe_url.searchParams.append('puter.api_origin', api_origin); + if(window.api_origin) + iframe_url.searchParams.append('puter.api_origin', window.api_origin); // Add options.params to URL if(options.params){ @@ -1797,17 +1800,17 @@ window.launch_app = async (options)=>{ // send post request to /rao to record app open if(options.name !== 'explorer'){ // add the app to the beginning of the array - launch_apps.recent.unshift(app_info); + window.launch_apps.recent.unshift(app_info); // dedupe the array by uuid, uid, and id - launch_apps.recent = _.uniqBy(launch_apps.recent, 'name'); + window.launch_apps.recent = _.uniqBy(window.launch_apps.recent, 'name'); // limit to window.launch_recent_apps_count - launch_apps.recent = launch_apps.recent.slice(0, window.launch_recent_apps_count); + window.launch_apps.recent = window.launch_apps.recent.slice(0, window.launch_recent_apps_count); // send post request to /rao to record app open $.ajax({ - url: api_origin + "/rao", + url: window.api_origin + "/rao", type: 'POST', data: JSON.stringify({ original_client_socket_id: window.socket?.id, @@ -1816,7 +1819,7 @@ window.launch_app = async (options)=>{ async: true, contentType: "application/json", headers: { - "Authorization": "Bearer "+auth_token + "Authorization": "Bearer "+window.auth_token }, }) } @@ -1864,13 +1867,13 @@ window.open_item = async function(options){ //---------------------------------------------------------------- // Is this a shortcut whose source is trashed? //---------------------------------------------------------------- - else if(is_shortcut && shortcut_to_path.startsWith(trash_path + '/')){ + else if(is_shortcut && shortcut_to_path.startsWith(window.trash_path + '/')){ UIAlert(`This shortcut can't be opened because its source has been deleted.`) } //---------------------------------------------------------------- // Is this a trashed file? //---------------------------------------------------------------- - else if(item_path.startsWith(trash_path + '/')){ + else if(item_path.startsWith(window.trash_path + '/')){ UIAlert(`This item can't be opened because it's in the trash. To use this item, first drag it out of the Trash.`) } //---------------------------------------------------------------- @@ -1939,21 +1942,21 @@ window.open_item = async function(options){ } // done let busy_duration = (Date.now() - busy_init_ts); - if( busy_duration >= busy_indicator_hide_delay){ + if( busy_duration >= window.busy_indicator_hide_delay){ $el_parent_window.close(); }else{ setTimeout(() => { // close this dialog $el_parent_window.close(); - }, Math.abs(busy_indicator_hide_delay - busy_duration)); + }, Math.abs(window.busy_indicator_hide_delay - busy_duration)); } } //---------------------------------------------------------------- // Does the user have a preference for this file type? //---------------------------------------------------------------- - else if(!associated_app_name && !is_dir && user_preferences[`default_apps${path.extname(item_path).toLowerCase()}`]) { - launch_app({ - name: user_preferences[`default_apps${path.extname(item_path).toLowerCase()}`], + else if(!associated_app_name && !is_dir && window.user_preferences[`default_apps${path.extname(item_path).toLowerCase()}`]) { + window.launch_app({ + name: window.user_preferences[`default_apps${path.extname(item_path).toLowerCase()}`], file_path: item_path, window_title: path.basename(item_path), maximized: options.maximized, @@ -1964,7 +1967,7 @@ window.open_item = async function(options){ // Is there an app associated with this item? //---------------------------------------------------------------- else if(associated_app_name !== ''){ - launch_app({ + window.launch_app({ name: associated_app_name, }) } @@ -1975,7 +1978,7 @@ window.open_item = async function(options){ UIWindow({ path: item_path, title: path.basename(item_path), - icon: await item_icon({is_dir: true, path: item_path}), + icon: await window.item_icon({is_dir: true, path: item_path}), uid: $(el_item).attr('data-uid'), is_dir: is_dir, app: 'explorer', @@ -1989,11 +1992,11 @@ window.open_item = async function(options){ // Dir with an open window: change the path of the open window //---------------------------------------------------------------- else if($el_parent_window.length > 0 && is_dir){ - window_nav_history[parent_win_id] = window_nav_history[parent_win_id].slice(0, window_nav_history_current_position[parent_win_id]+1); - window_nav_history[parent_win_id].push(item_path); - window_nav_history_current_position[parent_win_id]++; + window.window_nav_history[parent_win_id] = window.window_nav_history[parent_win_id].slice(0, window.window_nav_history_current_position[parent_win_id]+1); + window.window_nav_history[parent_win_id].push(item_path); + window.window_nav_history_current_position[parent_win_id]++; - update_window_path($el_parent_window, item_path); + window.update_window_path($el_parent_window, item_path); } //---------------------------------------------------------------- // all other cases: try to open using an app @@ -2006,7 +2009,7 @@ window.open_item = async function(options){ // get all info needed to open an item try{ open_item_meta = await $.ajax({ - url: api_origin + "/open_item", + url: window.api_origin + "/open_item", type: 'POST', contentType: "application/json", data: JSON.stringify({ @@ -2014,19 +2017,20 @@ window.open_item = async function(options){ path: fspath ?? undefined, }), headers: { - "Authorization": "Bearer "+auth_token + "Authorization": "Bearer "+window.auth_token }, statusCode: { 401: function () { - logout(); + window.logout(); }, }, }); }catch(err){ + // Ignored } // get a list of suggested apps for this file type. - let suggested_apps = open_item_meta?.suggested_apps ?? await suggest_apps_for_fsentry({uid: fsuid, path: fspath}); + let suggested_apps = open_item_meta?.suggested_apps ?? await window.suggest_apps_for_fsentry({uid: fsuid, path: fspath}); //--------------------------------------------- // No suitable apps, ask if user would like to @@ -2037,7 +2041,7 @@ window.open_item = async function(options){ // If .zip file, unzip it //--------------------------------------------- if(path.extname(item_path) === '.zip'){ - unzipItem(item_path); + window.unzipItem(item_path); return; } const alert_resp = await UIAlert( @@ -2054,7 +2058,7 @@ window.open_item = async function(options){ } ]) if(alert_resp === 'download_file'){ - trigger_download([item_path]); + window.trigger_download([item_path]); } return; } @@ -2062,7 +2066,7 @@ window.open_item = async function(options){ // First suggested app is default app to open this item //--------------------------------------------- else{ - launch_app({ + window.launch_app({ name: suggested_apps[0].name, token: open_item_meta.token, file_path: item_path, @@ -2084,8 +2088,8 @@ window.open_item = async function(options){ * @returns {Promise} */ window.move_items = async function(el_items, dest_path, is_undo = false){ - let move_op_id = operation_id++; - operation_cancelled[move_op_id] = false; + let move_op_id = window.operation_id++; + window.operation_cancelled[move_op_id] = false; // -------------------------------------------------------- // Optimization: in case all items being moved @@ -2126,7 +2130,7 @@ window.move_items = async function(el_items, dest_path, is_undo = false){ let el_item = el_items[i]; // if operation cancelled by user, stop - if(operation_cancelled[move_op_id]) + if(window.operation_cancelled[move_op_id]) return; // cannot move an immutable item, skip it @@ -2164,13 +2168,14 @@ window.move_items = async function(el_items, dest_path, is_undo = false){ try{ metadata = JSON.parse(metadata) }catch(e){ + // Ignored } } let new_name; // user cancelled? - if(operation_cancelled[move_op_id]) + if(window.operation_cancelled[move_op_id]) return; // indicates whether this is a recycling operation @@ -2179,7 +2184,7 @@ window.move_items = async function(el_items, dest_path, is_undo = false){ // -------------------------------------------------------- // Trashing // -------------------------------------------------------- - if(dest_path === trash_path){ + if(dest_path === window.trash_path){ new_name = $(el_item).attr('data-uid'); metadata = { original_name: $(el_item).attr('data-name'), @@ -2193,12 +2198,12 @@ window.move_items = async function(el_items, dest_path, is_undo = false){ // change trash icons to 'trash-full.svg' $(`[data-app="trash"]`).find('.taskbar-icon > img').attr('src', window.icons['trash-full.svg']); - $(`.item[data-path="${html_encode(trash_path)}" i], .item[data-shortcut_to_path="${html_encode(trash_path)}" i]`).find('.item-icon > img').attr('src', window.icons['trash-full.svg']); - $(`.window[data-path="${html_encode(trash_path)}" i]`).find('.window-head-icon').attr('src', window.icons['trash-full.svg']); + $(`.item[data-path="${html_encode(window.trash_path)}" i], .item[data-shortcut_to_path="${html_encode(window.trash_path)}" i]`).find('.item-icon > img').attr('src', window.icons['trash-full.svg']); + $(`.window[data-path="${html_encode(window.trash_path)}" i]`).find('.window-head-icon').attr('src', window.icons['trash-full.svg']); } // moving an item into a trashed directory? deny. - else if(dest_path.startsWith(trash_path)){ + else if(dest_path.startsWith(window.trash_path)){ $(progwin).close(); UIAlert('Cannot move items into a deleted folder.'); return; @@ -2212,7 +2217,7 @@ window.move_items = async function(el_items, dest_path, is_undo = false){ new_name = metadata.original_name; metadata = {}; untrashed_at_least_one_item = true; - path_to_show_on_progwin = trash_path + '/' + new_name; + path_to_show_on_progwin = window.trash_path + '/' + new_name; } // -------------------------------------------------------- @@ -2251,13 +2256,13 @@ window.move_items = async function(el_items, dest_path, is_undo = false){ $(this).removeItems(); // update parent windows' item counts and selected item counts in their footers $(parent_windows).each(function(){ - update_explorer_footer_item_count(this); - update_explorer_footer_selected_items_count(this) + window.update_explorer_footer_item_count(this); + window.update_explorer_footer_selected_items_count(this) }); }) // if trashing, close windows of trashed items and its descendants - if(dest_path === trash_path){ + if(dest_path === window.trash_path){ $(`.window[data-path="${html_encode($(el_item).attr('data-path'))}" i]`).close(); // todo this has to be case-insensitive but the `i` selector doesn't work on ^= $(`.window[data-path^="${html_encode($(el_item).attr('data-path'))}/"]`).close(); @@ -2267,16 +2272,17 @@ window.move_items = async function(el_items, dest_path, is_undo = false){ else{ // todo this has to be case-insensitive but the `i` selector doesn't work on ^= $(`.window[data-path^="${html_encode($(el_item).attr('data-path'))}/"], .window[data-path="${html_encode($(el_item).attr('data-path'))}" i]`).each(function(){ - update_window_path(this, $(this).attr('data-path').replace($(el_item).attr('data-path'), path.join(dest_path, fsentry.name))); + window.update_window_path(this, $(this).attr('data-path').replace($(el_item).attr('data-path'), path.join(dest_path, fsentry.name))); }) } - if(dest_path === trash_path){ + if(dest_path === window.trash_path){ // if trashing dir... if($(el_item).attr('data-is_dir') === '1'){ // disassociate all its websites // todo, some client-side check to see if this dir has at least one associated website before sending ajax request - puter.hosting.delete(dir_uuid) + // FIXME: dir_uuid is not defined, is this the same as the data-uid attribute? + // puter.hosting.delete(dir_uuid) $(`.mywebsites-dir-path[data-uuid="${$(el_item).attr('data-uid')}"]`).remove(); // remove the website badge from all instances of the dir @@ -2299,14 +2305,14 @@ window.move_items = async function(el_items, dest_path, is_undo = false){ associated_app_name: fsentry.associated_app?.name, uid: fsentry.uid, path: fsentry.path, - icon: await item_icon(fsentry), - name: (dest_path === trash_path) ? $(el_item).attr('data-name') : fsentry.name, + icon: await window.item_icon(fsentry), + name: (dest_path === window.trash_path) ? $(el_item).attr('data-name') : fsentry.name, is_dir: fsentry.is_dir, size: fsentry.size, type: fsentry.type, modified: fsentry.modified, is_selected: false, - is_shared: (dest_path === trash_path) ? false : fsentry.is_shared, + is_shared: (dest_path === window.trash_path) ? false : fsentry.is_shared, is_shortcut: fsentry.is_shortcut, shortcut_to: fsentry.shortcut_to, shortcut_to_path: fsentry.shortcut_to_path, @@ -2328,7 +2334,7 @@ window.move_items = async function(el_items, dest_path, is_undo = false){ immutable: false, uid: dir.uid, path: dir.path, - icon: await item_icon(dir), + icon: await window.item_icon(dir), name: dir.name, size: dir.size, type: dir.type, @@ -2340,12 +2346,12 @@ window.move_items = async function(el_items, dest_path, is_undo = false){ suggested_apps: dir.suggested_apps, }); } - sort_items(item_container); + window.sort_items(item_container); }); //sort each container $(`.item-container[data-path="${html_encode(dest_path)}" i]`).each(function(){ - sort_items(this, $(this).attr('data-sort_by'), $(this).attr('data-sort_order')) + window.sort_items(this, $(this).attr('data-sort_by'), $(this).attr('data-sort_order')) }) }catch(err){ // ----------------------------------------------------------------------- @@ -2388,14 +2394,14 @@ window.move_items = async function(el_items, dest_path, is_undo = false){ // check if trash is empty if(untrashed_at_least_one_item){ - const trash = await puter.fs.stat(trash_path); + const trash = await puter.fs.stat(window.trash_path); if(window.socket){ window.socket.emit('trash.is_empty', {is_empty: trash.is_empty}); } if(trash.is_empty){ $(`[data-app="trash"]`).find('.taskbar-icon > img').attr('src', window.icons['trash.svg']); - $(`.item[data-path="${html_encode(trash_path)}" i]`).find('.item-icon > img').attr('src', window.icons['trash.svg']); - $(`.window[data-path="${html_encode(trash_path)}" i]`).find('.window-head-icon').attr('src', window.icons['trash.svg']); + $(`.item[data-path="${html_encode(window.trash_path)}" i]`).find('.item-icon > img').attr('src', window.icons['trash.svg']); + $(`.window[data-path="${html_encode(window.trash_path)}" i]`).find('.window-head-icon').attr('src', window.icons['trash.svg']); } } } @@ -2410,13 +2416,13 @@ window.move_items = async function(el_items, dest_path, is_undo = false){ // DONE! close progress window with delay to allow user to see 100% progress // ----------------------------------------------------------------------- // Add action to actions_history for undo ability - if(!is_undo && dest_path !== trash_path){ - actions_history.push({ + if(!is_undo && dest_path !== window.trash_path){ + window.actions_history.push({ operation: 'move', data: moved_items, }); - }else if(!is_undo && dest_path === trash_path){ - actions_history.push({ + }else if(!is_undo && dest_path === window.trash_path){ + window.actions_history.push({ operation: 'delete', data: moved_items, }); @@ -2425,7 +2431,7 @@ window.move_items = async function(el_items, dest_path, is_undo = false){ if(progwin){ setTimeout(() => { $(progwin).close(); - }, copy_progress_hide_delay); + }, window.copy_progress_hide_delay); } } @@ -2638,7 +2644,7 @@ window.init_upload_using_dialog = function(el_target_container, target_path = nu const files = $('#upload-file-dialog')[0].files; if(files.length > 0){ try{ - upload_items(files, target_path); + window.upload_items(files, target_path); } catch(err){ UIAlert(err.message ?? err) @@ -2656,7 +2662,7 @@ window.upload_items = async function(items, dest_path){ let upload_progress_window; let opid; - if(dest_path == trash_path){ + if(dest_path == window.trash_path){ UIAlert('Uploading to trash is not allowed!'); return; } @@ -2676,11 +2682,11 @@ window.upload_items = async function(items, dest_path){ // cancel btn $(upload_progress_window).find('.upload-cancel-btn').on('click', function(e){ $(upload_progress_window).close(); - show_save_account_notice_if_needed(); + window.show_save_account_notice_if_needed(); xhr.abort(); }) // add to active_uploads - active_uploads[opid] = 0; + window.active_uploads[opid] = 0; }, // start start: async function(){ @@ -2692,7 +2698,7 @@ window.upload_items = async function(items, dest_path){ $(`[data-upload-operation-id="${operation_id}"]`).find('.upload-progress-bar').css( 'width', op_progress+'%'); $(`[data-upload-operation-id="${operation_id}"]`).find('.upload-progress-percent').html(op_progress+'%'); // update active_uploads - active_uploads[opid] = op_progress; + window.active_uploads[opid] = op_progress; // update title if window is not visible if(document.visibilityState !== "visible"){ update_title_based_on_uploads(); @@ -2711,32 +2717,32 @@ window.upload_items = async function(items, dest_path){ files.push(items.path) } - actions_history.push({ + window.actions_history.push({ operation: 'upload', data: files }); // close progress window after a bit of delay for a better UX setTimeout(() => { setTimeout(() => { - $(upload_progress_window).close(); - show_save_account_notice_if_needed(); - }, Math.abs(upload_progress_hide_delay)); + $(upload_progress_window).close(); + window.show_save_account_notice_if_needed(); + }, Math.abs(window.upload_progress_hide_delay)); }) // remove from active_uploads - delete active_uploads[opid]; + delete window.active_uploads[opid]; }, // error error: async function(err){ $(upload_progress_window).close(); // UIAlert(err?.message ?? 'An error occurred while uploading.'); // remove from active_uploads - delete active_uploads[opid]; + delete window.active_uploads[opid]; }, // abort abort: async function(operation_id){ // console.log('upload aborted'); // remove from active_uploads - delete active_uploads[opid]; + delete window.active_uploads[opid]; } } ); @@ -2763,13 +2769,13 @@ window.empty_trash = async function(){ // only show progress window if it takes longer than 500ms to create folder let init_ts = Date.now(); let progwin; - let op_id = uuidv4(); + let op_id = window.uuidv4(); let progwin_timeout = setTimeout(async () => { progwin = await UIWindowProgressEmptyTrash({operation_id: op_id}); }, 500); await puter.fs.delete({ - paths: trash_path, + paths: window.trash_path, descendantsOnly: true, recursive: true, success: async function (resp){ @@ -2779,24 +2785,24 @@ window.empty_trash = async function(){ } // use the 'empty trash' icon for Trash $(`[data-app="trash"]`).find('.taskbar-icon > img').attr('src', window.icons['trash.svg']); - $(`.item[data-path="${html_encode(trash_path)}" i], .item[data-shortcut_to_path="${html_encode(trash_path)}" i]`).find('.item-icon > img').attr('src', window.icons['trash.svg']); - $(`.window[data-path="${trash_path}"]`).find('.window-head-icon').attr('src', window.icons['trash.svg']); + $(`.item[data-path="${html_encode(window.trash_path)}" i], .item[data-shortcut_to_path="${html_encode(window.trash_path)}" i]`).find('.item-icon > img').attr('src', window.icons['trash.svg']); + $(`.window[data-path="${window.trash_path}"]`).find('.window-head-icon').attr('src', window.icons['trash.svg']); // remove all items with trash paths // todo this has to be case-insensitive but the `i` selector doesn't work on ^= - $(`.item[data-path^="${trash_path}/"]`).removeItems(); + $(`.item[data-path^="${window.trash_path}/"]`).removeItems(); // update the footer item count for Trash - update_explorer_footer_item_count($(`.window[data-path="${trash_path}"]`)) + window. update_explorer_footer_item_count($(`.window[data-path="${window.trash_path}"]`)) // close progress window clearTimeout(progwin_timeout); setTimeout(() => { $(progwin).close(); - }, Math.max(0, copy_progress_hide_delay - (Date.now() - init_ts))); + }, Math.max(0, window.copy_progress_hide_delay - (Date.now() - init_ts))); }, error: async function (err){ clearTimeout(progwin_timeout); setTimeout(() => { $(progwin).close(); - }, Math.max(0, copy_progress_hide_delay - (Date.now() - init_ts))); + }, Math.max(0, window.copy_progress_hide_delay - (Date.now() - init_ts))); } }); } @@ -2812,10 +2818,10 @@ window.copy_to_clipboard = async function(text){ } window.getUsage = () => { - return fetch(api_origin + "/drivers/usage", { + return fetch(window.api_origin + "/drivers/usage", { headers: { "Content-Type": "application/json", - "Authorization": "Bearer " + auth_token + "Authorization": "Bearer " + window.auth_token }, method: "GET" }) @@ -2988,14 +2994,14 @@ window.zipItems = async function(el_items, targetDirPath, download = true) { clearTimeout(progwin_timeout); setTimeout(() => { $(progwin).close(); - }, Math.max(0, copy_progress_hide_delay - (Date.now() - start_ts))); + }, Math.max(0, window.copy_progress_hide_delay - (Date.now() - start_ts))); }) .catch(function (err) { // close progress window clearTimeout(progwin_timeout); setTimeout(() => { $(progwin).close(); - }, Math.max(0, copy_progress_hide_delay - (Date.now() - start_ts))); + }, Math.max(0, window.copy_progress_hide_delay - (Date.now() - start_ts))); // handle errors console.error("Error in zipping files: ", err); @@ -3063,7 +3069,7 @@ window.unzipItem = async function(itemPath) { clearTimeout(progwin_timeout); setTimeout(() => { $(progwin).close(); - }, Math.max(0, copy_progress_hide_delay - (Date.now() - start_ts))); + }, Math.max(0, window.copy_progress_hide_delay - (Date.now() - start_ts))); }).catch(function (e) { // UIAlert(e.message); @@ -3071,7 +3077,7 @@ window.unzipItem = async function(itemPath) { clearTimeout(progwin_timeout); setTimeout(() => { $(progwin).close(); - }, Math.max(0, copy_progress_hide_delay - (Date.now() - start_ts))); + }, Math.max(0, window.copy_progress_hide_delay - (Date.now() - start_ts))); }) } @@ -3083,7 +3089,7 @@ window.rename_file = async(options, new_name, old_name, old_path, el_item, el_it success: async (fsentry)=>{ // Add action to actions_history for undo ability if (!is_undo) - actions_history.push({ + window.actions_history.push({ operation: 'rename', data: {options, new_name, old_name, old_path, el_item, el_item_name, el_item_icon, el_item_name_editor, website_url} }); @@ -3092,7 +3098,7 @@ window.rename_file = async(options, new_name, old_name, old_path, el_item, el_it const old_extension = path.extname(old_name); const new_extension = path.extname(new_name); if(old_extension !== new_extension){ - suggest_apps_for_fsentry({ + window.suggest_apps_for_fsentry({ uid: options.uid, onSuccess: function(suggested_apps){ options.suggested_apps = suggested_apps; @@ -3101,14 +3107,14 @@ window.rename_file = async(options, new_name, old_name, old_path, el_item, el_it } // Set new item name - $(`.item[data-uid='${$(el_item).attr('data-uid')}'] .item-name`).html(html_encode(truncate_filename(new_name, TRUNCATE_LENGTH)).replaceAll(' ', ' ')); + $(`.item[data-uid='${$(el_item).attr('data-uid')}'] .item-name`).html(html_encode(window.truncate_filename(new_name, window.TRUNCATE_LENGTH)).replaceAll(' ', ' ')); $(el_item_name).show(); // Hide item name editor $(el_item_name_editor).hide(); // Set new icon - const new_icon = (options.is_dir ? window.icons['folder.svg'] : (await item_icon(fsentry)).image); + const new_icon = (options.is_dir ? window.icons['folder.svg'] : (await window.item_icon(fsentry)).image); $(el_item_icon).find('.item-icon-icon').attr('src', new_icon); // Set new data-name @@ -3147,15 +3153,15 @@ window.rename_file = async(options, new_name, old_name, old_path, el_item, el_it // Update the 'Sites Cache' if($(el_item).attr('data-has_website') === '1') - await update_sites_cache(); + await window.update_sites_cache(); // Update website_url - website_url = determine_website_url(new_path); + website_url = window.determine_website_url(new_path); $(el_item).attr('data-website_url', website_url); // Update all exact-matching windows $(`.window-${options.uid}`).each(function(){ - update_window_path(this, options.path); + window.update_window_path(this, options.path); }) // Set new name for corresponding open windows @@ -3163,12 +3169,12 @@ window.rename_file = async(options, new_name, old_name, old_path, el_item, el_it // Re-sort all matching item containers $(`.item[data-uid='${$(el_item).attr('data-uid')}']`).parent('.item-container').each(function(){ - sort_items(this, $(el_item).closest('.item-container').attr('data-sort_by'), $(el_item).closest('.item-container').attr('data-sort_order')); + window.sort_items(this, $(el_item).closest('.item-container').attr('data-sort_by'), $(el_item).closest('.item-container').attr('data-sort_order')); }) }, error: function (err){ // reset to old name - $(el_item_name).text(truncate_filename(options.name, TRUNCATE_LENGTH)); + $(el_item_name).text(window.truncate_filename(options.name, window.TRUNCATE_LENGTH)); $(el_item_name).show(); // hide item name editor @@ -3202,28 +3208,28 @@ window.delete_item_with_path = async function(path){ } window.undo_last_action = async()=>{ - if (actions_history.length > 0) { - const last_action = actions_history.pop(); + if (window.actions_history.length > 0) { + const last_action = window.actions_history.pop(); // Undo the create file action if (last_action.operation === 'create_file' || last_action.operation === 'create_folder') { const lastCreatedItem = last_action.data; - undo_create_file_or_folder(lastCreatedItem); + window.undo_create_file_or_folder(lastCreatedItem); } else if(last_action.operation === 'rename') { const {options, new_name, old_name, old_path, el_item, el_item_name, el_item_icon, el_item_name_editor, website_url} = last_action.data; - rename_file(options, old_name, new_name, old_path, el_item, el_item_name, el_item_icon, el_item_name_editor, website_url, true); + window.rename_file(options, old_name, new_name, old_path, el_item, el_item_name, el_item_icon, el_item_name_editor, website_url, true); } else if(last_action.operation === 'upload') { const files = last_action.data; - undo_upload(files); + window.undo_upload(files); } else if(last_action.operation === 'copy') { const files = last_action.data; - undo_copy(files); + window.undo_copy(files); } else if(last_action.operation === 'move') { const items = last_action.data; - undo_move(items); + window.undo_move(items); } else if(last_action.operation === 'delete') { const items = last_action.data; - undo_delete(items); + window.undo_delete(items); } } } @@ -3246,23 +3252,23 @@ window.undo_copy = async(files)=>{ window.undo_move = async(items)=>{ for (const item of items) { - const el = await get_html_element_from_options(item.options); + const el = await window.get_html_element_from_options(item.options); console.log(item.original_path) - move_items([el], path.dirname(item.original_path), true); + window.move_items([el], path.dirname(item.original_path), true); } } window.undo_delete = async(items)=>{ for (const item of items) { - const el = await get_html_element_from_options(item.options); + const el = await window.get_html_element_from_options(item.options); let metadata = $(el).attr('data-metadata') === '' ? {} : JSON.parse($(el).attr('data-metadata')) - move_items([el], path.dirname(metadata.original_path), true); + window.move_items([el], path.dirname(metadata.original_path), true); } } window.get_html_element_from_options = async function(options){ - const item_id = global_element_id++; + const item_id = window.global_element_id++; options.disabled = options.disabled ?? false; options.visible = options.visible ?? 'visible'; // one of 'visible', 'revealed', 'hidden' @@ -3279,7 +3285,7 @@ window.get_html_element_from_options = async function(options){ options.sort_container_after_append = (options.sort_container_after_append !== undefined ? options.sort_container_after_append : false); const is_shared_with_me = (options.path !== '/'+window.user.username && !options.path.startsWith('/'+window.user.username+'/')); - let website_url = determine_website_url(options.path); + let website_url = window.determine_website_url(options.path); // do a quick check to see if the target parent has any file type restrictions const appendto_allowed_file_types = $(options.appendTo).attr('data-allowed_file_types') @@ -3321,7 +3327,7 @@ window.get_html_element_from_options = async function(options){ h += `
`; // size h += `
`; - h += `${options.size ? byte_format(options.size) : '-'}`; + h += `${options.size ? window.byte_format(options.size) : '-'}`; h += `
`; // type h += `
`; @@ -3378,7 +3384,7 @@ window.get_html_element_from_options = async function(options){ h += `
`; // name - h += `${html_encode(truncate_filename(options.name, TRUNCATE_LENGTH)).replaceAll(' ', ' ')}` + h += `${html_encode(window.truncate_filename(options.name, window.TRUNCATE_LENGTH)).replaceAll(' ', ' ')}` // name editor h += `` h += `
`; @@ -3393,9 +3399,9 @@ window.store_auto_arrange_preference = (preference)=>{ window.get_auto_arrange_data = async()=>{ const preferenceValue = await puter.kv.get('user_preferences.auto_arrange_desktop'); - is_auto_arrange_enabled = preferenceValue === null ? true : preferenceValue; + window.is_auto_arrange_enabled = preferenceValue === null ? true : preferenceValue; const positions = await puter.kv.get('desktop_item_positions') - desktop_item_positions = (!positions || typeof positions !== 'object' || Array.isArray(positions)) ? {} : positions; + window.desktop_item_positions = (!positions || typeof positions !== 'object' || Array.isArray(positions)) ? {} : positions; } window.clear_desktop_item_positions = async(el_desktop)=>{ @@ -3405,14 +3411,14 @@ window.clear_desktop_item_positions = async(el_desktop)=>{ $(el_item).css('left', ''); $(el_item).css('top', ''); }); - if(reset_item_positions){ - delete_desktop_item_positions() + if(window.reset_item_positions){ + window.delete_desktop_item_positions() } } window.set_desktop_item_positions = async(el_desktop)=>{ $(el_desktop).find('.item').each(async function(){ - const position = desktop_item_positions[$(this).attr('data-uid')] + const position = window.desktop_item_positions[$(this).attr('data-uid')] const el_item = $(this)[0]; if(position){ $(el_item).css('position', 'absolute'); @@ -3423,11 +3429,11 @@ window.set_desktop_item_positions = async(el_desktop)=>{ } window.save_desktop_item_positions = ()=>{ - puter.kv.set('desktop_item_positions', desktop_item_positions); + puter.kv.set('desktop_item_positions', window.desktop_item_positions); } window.delete_desktop_item_positions = ()=>{ - desktop_item_positions = {} + window.desktop_item_positions = {} puter.kv.del('desktop_item_positions'); } @@ -3435,7 +3441,7 @@ window.change_clock_visible = (clock_visible) => { let newValue = clock_visible || window.user_preferences.clock_visible; - newValue === 'auto' && is_fullscreen() ? $('#clock').show() : $('#clock').hide(); + newValue === 'auto' && window.is_fullscreen() ? $('#clock').show() : $('#clock').hide(); newValue === 'show' && $('#clock').show(); newValue === 'hide' && $('#clock').hide(); @@ -3459,14 +3465,14 @@ window.window_for_app_instance = (instance_id) => { // Finds the `iframe` element for the given app instance ID window.iframe_for_app_instance = (instance_id) => { - return $(window_for_app_instance(instance_id)).find('.window-app-iframe').get(0); + return $(window.window_for_app_instance(instance_id)).find('.window-app-iframe').get(0); }; // Run any callbacks to say that the app has launched window.report_app_launched = (instance_id, { uses_sdk = true }) => { const child_launch_callback = window.child_launch_callbacks[instance_id]; if (child_launch_callback) { - const parent_iframe = iframe_for_app_instance(child_launch_callback.parent_instance_id); + const parent_iframe = window.iframe_for_app_instance(child_launch_callback.parent_instance_id); // send confirmation to requester window parent_iframe.contentWindow.postMessage({ msg: 'childAppLaunched', @@ -3480,7 +3486,7 @@ window.report_app_launched = (instance_id, { uses_sdk = true }) => { // Run any callbacks to say that the app has closed window.report_app_closed = (instance_id) => { - const el_window = window_for_app_instance(instance_id); + const el_window = window.window_for_app_instance(instance_id); // notify parent app, if we have one, that we're closing const parent_id = el_window.dataset['parent_instance_id']; @@ -3511,7 +3517,7 @@ window.check_password_strength = (password) => { hasUpperCase: /[A-Z]/.test(password), hasLowerCase: /[a-z]/.test(password), hasNumber: /\d/.test(password), - hasSpecialChar: /[!@#$%^&*()_+\-=\[\]{};':"\\|,.<>\/?]/.test(password) + hasSpecialChar: /[!@#$%^&*()_+\-=[\]{};':"\\|,.<>/?]/.test(password) }; let overallPass = true; From b6c491171cabb20fb1056ada5d634ac40c29ab05 Mon Sep 17 00:00:00 2001 From: Sam Atkins Date: Thu, 2 May 2024 17:02:53 +0100 Subject: [PATCH 62/68] chore: Fix eslint issues in helper/ files /puter/src/helpers/determine_active_container_parent.js 22:30 error 'active_element' is not defined no-undef 25:30 error 'active_element' is not defined no-undef 29:30 error 'active_element' is not defined no-undef 32:41 error 'active_element' is not defined no-undef 32:61 error 'active_element' is not defined no-undef 33:30 error 'active_element' is not defined no-undef 36:41 error 'active_item_container' is not defined no-undef 37:28 error 'active_item_container' is not defined no-undef /puter/src/helpers/download.js 51:27 error 'api_origin' is not defined no-undef 52:59 error 'auth_token' is not defined no-undef 92:16 error 'operation_cancelled' is not defined no-undef /puter/src/helpers/new_context_menu_item.js 38:21 error 'create_folder' is not defined no-undef 48:21 error 'create_file' is not defined no-undef 56:21 error 'create_file' is not defined no-undef 70:25 error 'create_file' is not defined no-undef /puter/src/helpers/refresh_item_container.js 83:13 error 'update_window_layout' is not defined no-undef 86:13 error 'update_details_layout_sort_visuals' is not defined no-undef 124:35 error 'trash_path' is not defined no-undef 162:29 error Empty block statement no-empty 166:51 error 'path' is not defined no-undef 168:34 error 'trash_path' is not defined no-undef 168:62 error 'appdata_path' is not defined no-undef 171:38 error 'desktop_item_positions' is not defined no-undef 178:37 error 'item_icon' is not defined no-undef 207:31 error 'trash_path' is not defined no-undef 216:21 error 'sort_items' is not defined no-undef 217:26 error Empty block statement no-empty 222:13 error 'sort_items' is not defined no-undef 233:17 error 'update_explorer_footer_item_count' is not defined no-undef /puter/src/helpers/update_title_based_on_uploads.js 21:41 error 'active_uploads' is not defined no-undef 22:59 error 'active_uploads' is not defined no-undef 23:51 error 'active_uploads' is not defined no-undef 27:51 error 'active_uploads' is not defined no-undef --- .../determine_active_container_parent.js | 14 +++++----- src/helpers/download.js | 6 ++-- src/helpers/new_context_menu_item.js | 8 +++--- src/helpers/refresh_item_container.js | 28 ++++++++++--------- src/helpers/update_title_based_on_uploads.js | 8 +++--- 5 files changed, 33 insertions(+), 31 deletions(-) diff --git a/src/helpers/determine_active_container_parent.js b/src/helpers/determine_active_container_parent.js index 32a8388d6..c66d03f68 100644 --- a/src/helpers/determine_active_container_parent.js +++ b/src/helpers/determine_active_container_parent.js @@ -19,22 +19,22 @@ const determine_active_container_parent = function(){ // the container is either an ancestor of active element... - let parent_container = $(active_element).closest('.item-container'); + let parent_container = $(window.active_element).closest('.item-container'); // ... or a descendant of it... if(parent_container.length === 0){ - parent_container = $(active_element).find('.item-container'); + parent_container = $(window.active_element).find('.item-container'); } // ... or siblings or cousins if(parent_container.length === 0){ - parent_container = $(active_element).closest('.window').find('.item-container'); + parent_container = $(window.active_element).closest('.window').find('.item-container'); } // ... or the active element itself (if it's a container) - if(parent_container.length === 0 && active_element && $(active_element).hasClass('item-container')){ - parent_container = $(active_element); + if(parent_container.length === 0 && window.active_element && $(window.active_element).hasClass('item-container')){ + parent_container = $(window.active_element); } // ... or if there is no active element, the selected item that is not blurred - if(parent_container.length === 0 && active_item_container){ - parent_container = active_item_container; + if(parent_container.length === 0 && window.active_item_container){ + parent_container = window.active_item_container; } return parent_container; diff --git a/src/helpers/download.js b/src/helpers/download.js index 3429b6648..5ccbb8a26 100644 --- a/src/helpers/download.js +++ b/src/helpers/download.js @@ -48,8 +48,8 @@ const download = function(options){ let item_download_progress = batch_download_progress[options.item_upload_id]; let xhr = new XMLHttpRequest(); - xhr.open("post", (api_origin + '/download'), true); - xhr.setRequestHeader("Authorization", "Bearer " + auth_token); + xhr.open("post", (window.api_origin + '/download'), true); + xhr.setRequestHeader("Authorization", "Bearer " + window.auth_token); xhr.setRequestHeader("Content-Type", "application/json;charset=UTF-8"); xhr.addEventListener('load', function(e){ @@ -89,7 +89,7 @@ const download = function(options){ // Regularly check if this operation has been cancelled by the user //---------------------------------------------- cancel_check_interval = setInterval(() => { - if(operation_cancelled[options.operation_id]){ + if(window.operation_cancelled[options.operation_id]){ xhr.abort(); clearInterval(cancel_check_interval); clearInterval(progress_check_interval); diff --git a/src/helpers/new_context_menu_item.js b/src/helpers/new_context_menu_item.js index 05a7eeaf9..6c2ea49e1 100644 --- a/src/helpers/new_context_menu_item.js +++ b/src/helpers/new_context_menu_item.js @@ -35,7 +35,7 @@ const new_context_menu_item = function(dirname, append_to_element){ html: i18n('new_folder'), icon: ``, onClick: function(){ - create_folder(dirname, append_to_element); + window.create_folder(dirname, append_to_element); } }, // divider @@ -45,7 +45,7 @@ const new_context_menu_item = function(dirname, append_to_element){ html: i18n('text_document'), icon: ``, onClick: async function(){ - create_file({dirname: dirname, append_to_element: append_to_element, name: 'New File.txt'}); + window.create_file({dirname: dirname, append_to_element: append_to_element, name: 'New File.txt'}); } }, // HTML Document @@ -53,7 +53,7 @@ const new_context_menu_item = function(dirname, append_to_element){ html: i18n('html_document'), icon: ``, onClick: async function(){ - create_file({dirname: dirname, append_to_element: append_to_element, name: 'New File.html'}); + window.create_file({dirname: dirname, append_to_element: append_to_element, name: 'New File.html'}); } }, // JPG Image @@ -67,7 +67,7 @@ const new_context_menu_item = function(dirname, append_to_element){ canvas.height = 600; canvas.toBlob((blob) =>{ - create_file({dirname: dirname, append_to_element: append_to_element, name: 'New Image.jpg', content: blob}); + window.create_file({dirname: dirname, append_to_element: append_to_element, name: 'New Image.jpg', content: blob}); }); } }, diff --git a/src/helpers/refresh_item_container.js b/src/helpers/refresh_item_container.js index d111a04f9..51cb1d755 100644 --- a/src/helpers/refresh_item_container.js +++ b/src/helpers/refresh_item_container.js @@ -17,6 +17,7 @@ * along with this program. If not, see . */ +import path from '../lib/path.js'; import UIItem from '../UI/UIItem.js'; const refresh_item_container = function(el_item_container, options){ @@ -80,10 +81,10 @@ const refresh_item_container = function(el_item_container, options){ $(el_item_container).attr('data-sort_order', fsentry.sort_order ?? 'asc'); // update layout if(el_window && el_window.length > 0) - update_window_layout(el_window, fsentry.layout); + window.update_window_layout(el_window, fsentry.layout); // if(fsentry.layout === 'details'){ - update_details_layout_sort_visuals(el_window, fsentry.sort_by, fsentry.sort_order); + window.update_details_layout_sort_visuals(el_window, fsentry.sort_by, fsentry.sort_order); } }); @@ -121,7 +122,7 @@ const refresh_item_container = function(el_item_container, options){ } // trash icon - if(container_path === trash_path && el_window_head_icon){ + if(container_path === window.trash_path && el_window_head_icon){ if(fsentries.length > 0){ $(el_window_head_icon).attr('src', window.icons['trash-full.svg']); }else{ @@ -160,22 +161,23 @@ const refresh_item_container = function(el_item_container, options){ metadata = JSON.parse(fsentry.metadata); } catch(e){ + // Ignored } } const item_path = fsentry.path ?? path.join($(el_window).attr('data-path'), fsentry.name); // render any item but Trash/AppData - if(item_path !== trash_path && item_path !== appdata_path){ + if(item_path !== window.trash_path && item_path !== window.appdata_path){ // if this is trash, get original name from item metadata fsentry.name = (metadata && metadata.original_name !== undefined) ? metadata.original_name : fsentry.name; - const position = desktop_item_positions[fsentry.uid] ?? undefined; + const position = window.desktop_item_positions[fsentry.uid] ?? undefined; UIItem({ appendTo: el_item_container, uid: fsentry.uid, immutable: fsentry.immutable, associated_app_name: fsentry.associated_app?.name, path: item_path, - icon: await item_icon(fsentry), + icon: await window.item_icon(fsentry), name: (metadata && metadata.original_name !== undefined) ? metadata.original_name : fsentry.name, is_dir: fsentry.is_dir, multiselectable: !is_openFileDialog, @@ -204,7 +206,7 @@ const refresh_item_container = function(el_item_container, options){ appendTo: el_item_container, uid: trash.id, immutable: trash.immutable, - path: trash_path, + path: window.trash_path, icon: {image: (trash.is_empty ? window.icons['trash.svg'] : window.icons['trash-full.svg']), type: 'icon'}, name: trash.name, is_dir: trash.is_dir, @@ -213,15 +215,15 @@ const refresh_item_container = function(el_item_container, options){ is_trash: true, sortable: false, }); - sort_items(el_item_container, $(el_item_container).attr('data-sort_by'), $(el_item_container).attr('data-sort_order')); + window.sort_items(el_item_container, $(el_item_container).attr('data-sort_by'), $(el_item_container).attr('data-sort_order')); }catch(e){ - + // Ignored } } // sort items - sort_items( - el_item_container, - $(el_item_container).attr('data-sort_by'), + window.sort_items( + el_item_container, + $(el_item_container).attr('data-sort_by'), $(el_item_container).attr('data-sort_order') ); @@ -230,7 +232,7 @@ const refresh_item_container = function(el_item_container, options){ // update footer item count if this is an explorer window if(el_window) - update_explorer_footer_item_count(el_window); + window.update_explorer_footer_item_count(el_window); }, // This makes sure the loading spinner shows up if the request takes longer than 1 second // and stay there for at least 1 second since the flickering is annoying diff --git a/src/helpers/update_title_based_on_uploads.js b/src/helpers/update_title_based_on_uploads.js index d7fc76f5a..aa0beadd7 100644 --- a/src/helpers/update_title_based_on_uploads.js +++ b/src/helpers/update_title_based_on_uploads.js @@ -18,13 +18,13 @@ */ const update_title_based_on_uploads = function(){ - const active_uploads_count = _.size(active_uploads); - if(active_uploads_count === 1 && !isNaN(Object.values(active_uploads)[0])){ - document.title = Math.round(Object.values(active_uploads)[0]) + '% Uploading'; + const active_uploads_count = _.size(window.active_uploads); + if(active_uploads_count === 1 && !isNaN(Object.values(window.active_uploads)[0])){ + document.title = Math.round(Object.values(window.active_uploads)[0]) + '% Uploading'; }else if(active_uploads_count > 1){ // get the average progress let total_progress = 0; - for (const [key, value] of Object.entries(active_uploads)) { + for (const [key, value] of Object.entries(window.active_uploads)) { total_progress += Math.round(value); } const avgprog = Math.round(total_progress / active_uploads_count) From 5198081c2b11d13f9348fc1a6df4d06f4e9ea335 Mon Sep 17 00:00:00 2001 From: Sam Atkins Date: Thu, 2 May 2024 17:23:20 +0100 Subject: [PATCH 63/68] chore: Fix eslint issues in initgui.js Almost entirely clarifying use of window fields /puter/src/initgui.js 82:28 error 'api_origin' is not defined no-undef 118:34 error 'url_query_params' is not defined no-undef 120:17 error 'app_query_params' is not defined no-undef 136:8 error 'url_query_params' is not defined no-undef 136:51 error 'url_query_params' is not defined no-undef 136:105 error 'url_query_params' is not defined no-undef 138:14 error 'url_query_params' is not defined no-undef 138:57 error 'url_query_params' is not defined no-undef 138:110 error 'url_query_params' is not defined no-undef 154:8 error 'url_query_params' is not defined no-undef 154:54 error 'url_query_params' is not defined no-undef 154:110 error 'url_query_params' is not defined no-undef 164:17 error 'openerOrigin' is not defined no-undef 171:30 error 'openerOrigin' is not defined no-undef 173:37 error 'is_auth' is not defined no-undef 184:23 error 'getUserAppToken' is not defined no-undef 184:39 error 'openerOrigin' is not defined no-undef 186:41 error 'is_auth' is not defined no-undef 195:23 error 'getUserAppToken' is not defined no-undef 195:39 error 'openerOrigin' is not defined no-undef 205:8 error 'url_query_params' is not defined no-undef 206:32 error 'url_query_params' is not defined no-undef 218:23 error 'url_query_params' is not defined no-undef 219:22 error 'openerOrigin' is not defined no-undef 219:38 error 'url_query_params' is not defined no-undef 220:26 error 'url_query_params' is not defined no-undef 228:29 error 'embedded_in_popup' is not defined no-undef 238:20 error 'url_query_params' is not defined no-undef 239:21 error 'url_query_params' is not defined no-undef 270:36 error 'openerOrigin' is not defined no-undef 271:30 error 'checkUserSiteRelationship' is not defined no-undef 271:56 error 'openerOrigin' is not defined no-undef 274:44 error 'logged_in_users' is not defined no-undef 274:76 error 'userAppToken' is not defined no-undef 274:92 error 'url_query_params' is not defined no-undef 284:17 error 'userAppToken' is not defined no-undef 288:25 error 'is_auth' is not defined no-undef 302:13 error 'url_query_params' is not defined no-undef 303:38 error 'url_query_params' is not defined no-undef 309:17 error 'logout' is not defined no-undef 331:13 error 'update_auth_data' is not defined no-undef 363:8 error 'is_auth' is not defined no-undef 388:13 error 'update_auth_data' is not defined no-undef 394:23 error 'get_auto_arrange_data' is not defined no-undef 395:31 error 'desktop_path' is not defined no-undef 403:30 error 'url_query_params' is not defined no-undef 405:38 error 'getUserAppToken' is not defined no-undef 405:62 error 'openerOrigin' is not defined no-undef 415:35 error 'user' is not defined no-undef 417:24 error 'openerOrigin' is not defined no-undef 430:24 error 'openerOrigin' is not defined no-undef 438:20 error 'openerOrigin' is not defined no-undef 439:37 error 'getAppUIDFromOrigin' is not defined no-undef 439:57 error 'openerOrigin' is not defined no-undef 444:35 error 'url_query_params' is not defined no-undef 508:46 error 'url_query_params' is not defined no-undef 630:54 error 'busy_indicator_hide_delay' is not defined no-undef 636:49 error 'busy_indicator_hide_delay' is not defined no-undef 647:13 error 'update_sites_cache' is not defined no-undef 656:9 error 'refresh_desktop_background' is not defined no-undef 661:9 error 'is_auth' is not defined no-undef 661:23 error 'first_visit_ever' is not defined no-undef 662:12 error 'logged_in_users' is not defined no-undef 679:14 error 'is_auth' is not defined no-undef 679:27 error 'first_visit_ever' is not defined no-undef 693:12 error 'url_query_params' is not defined no-undef 696:47 error 'url_query_params' is not defined no-undef 704:18 error 'gui_origin' is not defined no-undef 715:17 error 'update_auth_data' is not defined no-undef 728:8 error 'feature_flags' is not defined no-undef 746:19 error 'get_auto_arrange_data' is not defined no-undef 747:27 error 'desktop_path' is not defined no-undef 755:26 error 'url_query_params' is not defined no-undef 758:34 error 'getUserAppToken' is not defined no-undef 758:58 error 'openerOrigin' is not defined no-undef 768:31 error 'user' is not defined no-undef 770:20 error 'openerOrigin' is not defined no-undef 783:20 error 'openerOrigin' is not defined no-undef 792:16 error 'openerOrigin' is not defined no-undef 793:33 error 'getAppUIDFromOrigin' is not defined no-undef 793:53 error 'openerOrigin' is not defined no-undef 801:31 error 'url_query_params' is not defined no-undef 864:42 error 'url_query_params' is not defined no-undef 987:50 error 'busy_indicator_hide_delay' is not defined no-undef 993:45 error 'busy_indicator_hide_delay' is not defined no-undef 1021:13 error 'update_explorer_footer_selected_items_count' is not defined no-undef 1057:13 error 'active_item_container' is not defined no-undef 1061:17 error 'active_item_container' is not defined no-undef 1065:21 error 'active_item_container' is not defined no-undef 1071:9 error 'active_element' is not defined no-undef 1179:21 error 'select_ctxmenu_item' is not defined no-undef 1185:21 error 'select_ctxmenu_item' is not defined no-undef 1198:21 error 'select_ctxmenu_item' is not defined no-undef 1211:21 error 'select_ctxmenu_item' is not defined no-undef 1222:25 error 'select_ctxmenu_item' is not defined no-undef 1255:22 error 'active_item_container' is not defined no-undef 1256:39 error 'active_item_container' is not defined no-undef 1257:21 error 'active_element' is not defined no-undef 1258:23 error 'active_item_container' is not defined no-undef 1263:27 error 'active_item_container' is not defined no-undef 1264:39 error 'active_item_container' is not defined no-undef 1267:27 error 'active_item_container' is not defined no-undef 1268:39 error 'active_element' is not defined no-undef 1268:74 error 'active_element' is not defined no-undef 1268:93 error 'active_element' is not defined no-undef 1271:27 error 'active_item_container' is not defined no-undef 1272:39 error 'active_item_container' is not defined no-undef 1275:39 error 'active_element' is not defined no-undef 1275:74 error 'active_element' is not defined no-undef 1275:93 error 'active_element' is not defined no-undef 1323:114 error 'active_item_container' is not defined no-undef 1331:21 error 'active_element' is not defined no-undef 1334:27 error 'active_item_container' is not defined no-undef 1390:37 error 'active_element' is not defined no-undef 1407:31 error 'delete_item' is not defined no-undef 1419:37 error 'active_element' is not defined no-undef 1419:115 error 'trash_path' is not defined no-undef 1436:31 error 'delete_item' is not defined no-undef 1438:55 error 'trash_path' is not defined no-undef 1445:59 error 'trash_path' is not defined no-undef 1446:61 error 'trash_path' is not defined no-undef 1452:37 error 'active_element' is not defined no-undef 1456:25 error 'move_items' is not defined no-undef 1456:53 error 'trash_path' is not defined no-undef 1467:16 error 'keypress_item_seach_term' is not defined no-undef 1468:30 error 'keypress_item_seach_buffer_timeout' is not defined no-undef 1470:13 error 'keypress_item_seach_buffer_timeout' is not defined no-undef 1471:17 error 'keypress_item_seach_term' is not defined no-undef 1474:13 error 'keypress_item_seach_term' is not defined no-undef 1477:38 error 'active_item_container' is not defined no-undef 1480:108 error 'keypress_item_seach_term' is not defined no-undef 1485:30 error 'active_item_container' is not defined no-undef 1487:78 error 'keypress_item_seach_term' is not defined no-undef 1505:19 error 'active_item_container' is not defined no-undef 1509:17 error 'update_explorer_footer_selected_items_count' is not defined no-undef 1509:63 error 'active_element' is not defined no-undef 1518:16 error 'keypress_item_seach_term' is not defined no-undef 1519:30 error 'keypress_item_seach_buffer_timeout' is not defined no-undef 1521:13 error 'keypress_item_seach_buffer_timeout' is not defined no-undef 1522:17 error 'keypress_item_seach_term' is not defined no-undef 1525:13 error 'keypress_item_seach_term' is not defined no-undef 1531:97 error 'keypress_item_seach_term' is not defined no-undef 1538:67 error 'keypress_item_seach_term' is not defined no-undef 1581:39 error 'active_element' is not defined no-undef 1583:39 error 'active_element' is not defined no-undef 1590:17 error 'update_explorer_footer_selected_items_count' is not defined no-undef 1600:36 error 'active_element' is not defined no-undef 1602:36 error 'active_element' is not defined no-undef 1615:15 error 'mouseover_window' is not defined no-undef 1616:15 error 'mouseover_window' is not defined no-undef 1616:55 error 'trash_path' is not defined no-undef 1621:38 error 'active_element' is not defined no-undef 1623:38 error 'active_element' is not defined no-undef 1628:21 error 'clipboard' is not defined no-undef 1629:21 error 'clipboard_op' is not defined no-undef 1632:58 error 'trash_path' is not defined no-undef 1636:25 error 'clipboard' is not defined no-undef 1648:38 error 'active_element' is not defined no-undef 1650:38 error 'active_element' is not defined no-undef 1655:21 error 'clipboard' is not defined no-undef 1656:21 error 'clipboard_op' is not defined no-undef 1658:25 error 'clipboard' is not defined no-undef 1668:107 error 'last_enter_pressed_to_rename_ts' is not defined no-undef 1682:21 error 'launch_app' is not defined no-undef 1705:21 error 'select_ctxmenu_item' is not defined no-undef 1713:21 error 'active_item_container' is not defined no-undef 1714:37 error 'active_item_container' is not defined no-undef 1717:25 error 'open_item' is not defined no-undef 1736:16 error 'clipboard' is not defined no-undef 1745:37 error 'trash_path' is not defined no-undef 1745:74 error 'trash_path' is not defined no-undef 1745:96 error 'clipboard_op' is not defined no-undef 1748:20 error 'clipboard_op' is not defined no-undef 1749:21 error 'copy_clipboard_items' is not defined no-undef 1750:25 error 'clipboard_op' is not defined no-undef 1751:21 error 'move_clipboard_items' is not defined no-undef 1760:13 error 'undo_last_action' is not defined no-undef 1767:9 error 'mouseX' is not defined no-undef 1768:9 error 'mouseY' is not defined no-undef 1771:13 error 'mouseX' is not defined no-undef 1771:29 error 'mouseY' is not defined no-undef 1771:38 error 'toolbar_height' is not defined no-undef 1771:63 error 'mouseX' is not defined no-undef 1771:78 error 'mouseY' is not defined no-undef 1772:13 error 'current_active_snap_zone' is not defined no-undef 1774:17 error 'mouseX' is not defined no-undef 1774:32 error 'mouseY' is not defined no-undef 1774:49 error 'mouseY' is not defined no-undef 1774:58 error 'desktop_height' is not defined no-undef 1775:13 error 'current_active_snap_zone' is not defined no-undef 1777:17 error 'mouseX' is not defined no-undef 1777:32 error 'mouseY' is not defined no-undef 1777:41 error 'desktop_height' is not defined no-undef 1778:13 error 'current_active_snap_zone' is not defined no-undef 1780:17 error 'mouseX' is not defined no-undef 1780:26 error 'desktop_width' is not defined no-undef 1780:48 error 'mouseY' is not defined no-undef 1780:65 error 'mouseY' is not defined no-undef 1780:74 error 'desktop_height' is not defined no-undef 1781:13 error 'current_active_snap_zone' is not defined no-undef 1783:18 error 'mouseX' is not defined no-undef 1783:27 error 'desktop_width' is not defined no-undef 1783:50 error 'mouseY' is not defined no-undef 1783:59 error 'toolbar_height' is not defined no-undef 1783:84 error 'mouseX' is not defined no-undef 1783:93 error 'desktop_width' is not defined no-undef 1783:115 error 'mouseY' is not defined no-undef 1784:13 error 'current_active_snap_zone' is not defined no-undef 1786:17 error 'mouseX' is not defined no-undef 1786:26 error 'desktop_width' is not defined no-undef 1786:48 error 'mouseY' is not defined no-undef 1786:58 error 'desktop_height' is not defined no-undef 1787:13 error 'current_active_snap_zone' is not defined no-undef 1789:17 error 'mouseY' is not defined no-undef 1789:26 error 'toolbar_height' is not defined no-undef 1789:49 error 'mouseX' is not defined no-undef 1789:66 error 'mouseX' is not defined no-undef 1789:75 error 'desktop_width' is not defined no-undef 1790:13 error 'current_active_snap_zone' is not defined no-undef 1793:13 error 'current_active_snap_zone' is not defined no-undef 1802:21 error 'mouseX' is not defined no-undef 1802:41 error 'mouseX' is not defined no-undef 1802:75 error 'mouseY' is not defined no-undef 1802:95 error 'mouseY' is not defined no-undef 1819:21 error 'mouseX' is not defined no-undef 1819:41 error 'mouseX' is not defined no-undef 1819:75 error 'mouseY' is not defined no-undef 1819:95 error 'mouseY' is not defined no-undef 1840:12 error 'mouseover_window' is not defined no-undef 1841:15 error 'mouseover_window' is not defined no-undef 1876:17 error 'upload_items' is not defined no-undef 1934:21 error 'logout' is not defined no-undef 1936:17 error 'logout' is not defined no-undef 1946:22 error 'gui_origin' is not defined no-undef 1951:50 error 'auth_token' is not defined no-undef 1958:18 error Empty block statement no-empty --- src/initgui.js | 354 ++++++++++++++++++++++++------------------------- 1 file changed, 177 insertions(+), 177 deletions(-) diff --git a/src/initgui.js b/src/initgui.js index 459c06549..c752eaca7 100644 --- a/src/initgui.js +++ b/src/initgui.js @@ -79,7 +79,7 @@ window.initgui = async function(){ puter.setAuthToken(window.auth_token); // update SDK if api_origin is different from the one in the SDK if(window.api_origin && puter.APIOrigin !== window.api_origin) - puter.setAPIOrigin(api_origin); + puter.setAPIOrigin(window.api_origin); // Checks the type of device the user is on (phone, tablet, or desktop). // Depending on the device type, it sets a class attribute on the body tag @@ -115,9 +115,9 @@ window.initgui = async function(){ // get query params, any param that doesn't start with 'puter.' will be passed to the app window.app_query_params = {}; - for (let [key, value] of url_query_params) { + for (let [key, value] of window.url_query_params) { if(!key.startsWith('puter.')) - app_query_params[key] = value; + window.app_query_params[key] = value; } } @@ -133,9 +133,9 @@ window.initgui = async function(){ // Determine if we are in full-page mode // i.e. https://puter.com/app//?puter.fullpage=true //-------------------------------------------------------------------------------------- - if(url_query_params.has('puter.fullpage') && (url_query_params.get('puter.fullpage') === 'false' || url_query_params.get('puter.fullpage') === '0')){ + if(window.url_query_params.has('puter.fullpage') && (window.url_query_params.get('puter.fullpage') === 'false' || window.url_query_params.get('puter.fullpage') === '0')){ window.is_fullpage_mode = false; - }else if(url_query_params.has('puter.fullpage') && (url_query_params.get('puter.fullpage') === 'true' || url_query_params.get('puter.fullpage') === '1')){ + }else if(window.url_query_params.has('puter.fullpage') && (window.url_query_params.get('puter.fullpage') === 'true' || window.url_query_params.get('puter.fullpage') === '1')){ // In fullpage mode, we want to hide the taskbar for better UX window.taskbar_height = 0; @@ -151,7 +151,7 @@ window.initgui = async function(){ // Is GUI embedded in a popup? // i.e. https://puter.com/?embedded_in_popup=true //-------------------------------------------------------------------------------------- - if(url_query_params.has('embedded_in_popup') && (url_query_params.get('embedded_in_popup') === 'true' || url_query_params.get('embedded_in_popup') === '1')){ + if(window.url_query_params.has('embedded_in_popup') && (window.url_query_params.get('embedded_in_popup') === 'true' || window.url_query_params.get('embedded_in_popup') === '1')){ window.embedded_in_popup = true; $('body').addClass('embedded-in-popup'); @@ -161,16 +161,16 @@ window.initgui = async function(){ // if no referrer, request it from the opener via messaging if(!document.referrer){ try{ - openerOrigin = await requestOpenerOrigin(); + window.openerOrigin = await requestOpenerOrigin(); }catch(e){ throw new Error('No referrer found'); } } // this is the referrer in terms of user acquisition - window.referrerStr = openerOrigin; + window.referrerStr = window.openerOrigin; - if(action === 'sign-in' && !is_auth()){ + if(action === 'sign-in' && !window.is_auth()){ // show signup window if(await UIWindowSignup({ reload_on_success: false, @@ -181,9 +181,9 @@ window.initgui = async function(){ cover_page: true, } })) - await getUserAppToken(openerOrigin); + await window.getUserAppToken(window.openerOrigin); } - else if(action === 'sign-in' && is_auth()){ + else if(action === 'sign-in' && window.is_auth()){ picked_a_user_for_sdk_login = await UIWindowSessionList({ reload_on_success: false, draggable_body: false, @@ -192,7 +192,7 @@ window.initgui = async function(){ }); if(picked_a_user_for_sdk_login){ - await getUserAppToken(openerOrigin); + await window.getUserAppToken(window.openerOrigin); } } @@ -202,8 +202,8 @@ window.initgui = async function(){ // Get user referral code from URL query params // i.e. https://puter.com/?r=123456 //-------------------------------------------------------------------------------------- - if(url_query_params.has('r')){ - window.referral_code = url_query_params.get('r'); + if(window.url_query_params.has('r')){ + window.referral_code = window.url_query_params.get('r'); // remove 'r' from URL window.history.pushState(null, document.title, '/'); // show referral notice, this will be used later if Desktop is loaded @@ -215,9 +215,9 @@ window.initgui = async function(){ // Action: Request Permission //-------------------------------------------------------------------------------------- if(action === 'request-permission'){ - let app_uid = url_query_params.get('app_uid'); - let origin = openerOrigin ?? url_query_params.get('origin'); - let permission = url_query_params.get('permission'); + let app_uid = window.url_query_params.get('app_uid'); + let origin = window.openerOrigin ?? window.url_query_params.get('origin'); + let permission = window.url_query_params.get('permission'); let granted = await UIWindowRequestPermission({ app_uid: app_uid, @@ -225,7 +225,7 @@ window.initgui = async function(){ permission: permission, }); - let messageTarget = embedded_in_popup ? window.opener : window.parent; + let messageTarget = window.embedded_in_popup ? window.opener : window.parent; messageTarget.postMessage({ msg: "permissionGranted", granted: granted, @@ -235,8 +235,8 @@ window.initgui = async function(){ // Action: Password recovery //-------------------------------------------------------------------------------------- else if(action === 'set-new-password'){ - let user = url_query_params.get('user'); - let token = url_query_params.get('token'); + let user = window.url_query_params.get('user'); + let token = window.url_query_params.get('token'); await UIWindowNewPassword({ user: user, @@ -267,11 +267,11 @@ window.initgui = async function(){ // if yes, we need to get the user app token and send it to the opener // if not, we need to ask the user for confirmation before proceeding BUT only if the action is a file-picker action // ------------------------------------------------------------------------------------- - if(window.embedded_in_popup && openerOrigin){ - let response = await checkUserSiteRelationship(openerOrigin); + if(window.embedded_in_popup && window.openerOrigin){ + let response = await window.checkUserSiteRelationship(window.openerOrigin); window.userAppToken = response.token; - if(!picked_a_user_for_sdk_login && logged_in_users.length > 0 && (!userAppToken || url_query_params.get('request_auth') )){ + if(!picked_a_user_for_sdk_login && window.logged_in_users.length > 0 && (!window.userAppToken || window.url_query_params.get('request_auth') )){ await UIWindowSessionList({ reload_on_success: false, draggable_body: false, @@ -281,11 +281,11 @@ window.initgui = async function(){ } // if not and action is show-open-file-picker, we need confirmation before proceeding if(action === 'show-open-file-picker' || action === 'show-save-file-picker' || action === 'show-directory-picker'){ - if(!userAppToken){ + if(!window.userAppToken){ let is_confirmed = await PuterDialog(); if(is_confirmed === false){ - if(!is_auth()){ + if(!window.is_auth()){ window.first_visit_ever = false; localStorage.removeItem("has_visited_before", true); } @@ -299,14 +299,14 @@ window.initgui = async function(){ // ------------------------------------------------------------------------------------- // `auth_token` provided in URL, use it to log in // ------------------------------------------------------------------------------------- - else if(url_query_params.has('auth_token')){ - let query_param_auth_token = url_query_params.get('auth_token'); + else if(window.url_query_params.has('auth_token')){ + let query_param_auth_token = window.url_query_params.get('auth_token'); try{ whoami = await puter.os.user(); }catch(e){ if(e.status === 401){ - logout(); + window.logout(); return; } } @@ -328,7 +328,7 @@ window.initgui = async function(){ // show login progress window UIWindowLoginInProgress({user_info: whoami}); // update auth data - update_auth_data(query_param_auth_token, whoami); + window.update_auth_data(query_param_auth_token, whoami); } // remove auth_token from URL window.history.pushState(null, document.title, '/'); @@ -360,7 +360,7 @@ window.initgui = async function(){ // ------------------------------------------------------------------------------------- // Authed // ------------------------------------------------------------------------------------- - if(is_auth()){ + if(window.is_auth()){ // try to get user data using /whoami, only if that data is missing if(!whoami){ try{ @@ -385,14 +385,14 @@ window.initgui = async function(){ } while(!is_verified) } - update_auth_data(whoami.token || window.auth_token, whoami); + window.update_auth_data(whoami.token || window.auth_token, whoami); // ------------------------------------------------------------------------------------- // Load desktop, only if we're not embedded in a popup // ------------------------------------------------------------------------------------- if(!window.embedded_in_popup){ - await get_auto_arrange_data() - puter.fs.stat(desktop_path, async function(desktop_fsentry){ + await window.get_auto_arrange_data() + puter.fs.stat(window.desktop_path, async function(desktop_fsentry){ UIDesktop({desktop_fsentry: desktop_fsentry}); }) } @@ -400,9 +400,9 @@ window.initgui = async function(){ // If embedded in a popup, send the token to the opener and close the popup // ------------------------------------------------------------------------------------- else{ - let msg_id = url_query_params.get('msg_id'); + let msg_id = window.url_query_params.get('msg_id'); try{ - let data = await getUserAppToken(new URL(openerOrigin).origin); + let data = await window.getUserAppToken(new URL(window.openerOrigin).origin); // This is an implicit app and the app_uid is sent back from the server // we cache it here so that we can use it later window.host_app_uid = data.app_uid; @@ -412,9 +412,9 @@ window.initgui = async function(){ success: true, token: data.token, app_uid: data.app_uid, - username: user.username, + username: window.user.username, msg_id: msg_id, - }, openerOrigin); + }, window.openerOrigin); // close popup if(!action || action==='sign-in'){ window.close(); @@ -427,7 +427,7 @@ window.initgui = async function(){ success: false, token: null, msg_id: msg_id, - }, openerOrigin); + }, window.openerOrigin); // close popup window.close(); window.open('','_self').close(); @@ -435,13 +435,13 @@ window.initgui = async function(){ let app_uid; - if(openerOrigin){ - app_uid = await getAppUIDFromOrigin(openerOrigin); + if(window.openerOrigin){ + app_uid = await window.getAppUIDFromOrigin(window.openerOrigin); window.host_app_uid = app_uid; } if(action === 'show-open-file-picker'){ - let options = url_query_params.get('options'); + let options = window.url_query_params.get('options'); options = JSON.parse(options ?? '{}'); // Open dialog @@ -505,7 +505,7 @@ window.initgui = async function(){ // Action: Show Save File Dialog //-------------------------------------------------------------------------------------- else if(action === 'show-save-file-picker'){ - let allowed_file_types = url_query_params.get('allowed_file_types'); + let allowed_file_types = window.url_query_params.get('allowed_file_types'); // send 'sendMeFileData' event to parent window.opener.postMessage({ @@ -627,13 +627,13 @@ window.initgui = async function(){ // done let busy_duration = (Date.now() - busy_init_ts); - if( busy_duration >= busy_indicator_hide_delay){ + if( busy_duration >= window.busy_indicator_hide_delay){ $(el_filedialog_window).close(); }else{ setTimeout(() => { // close this dialog $(el_filedialog_window).close(); - }, Math.abs(busy_indicator_hide_delay - busy_duration)); + }, Math.abs(window.busy_indicator_hide_delay - busy_duration)); } } }); @@ -644,7 +644,7 @@ window.initgui = async function(){ // ---------------------------------------------------------- // Get user's sites // ---------------------------------------------------------- - update_sites_cache(); + window.update_sites_cache(); } } // ------------------------------------------------------------------------------------- @@ -653,13 +653,13 @@ window.initgui = async function(){ // because it's not visible anyway and it's a waste of bandwidth // ------------------------------------------------------------------------------------- if(!window.is_fullpage_mode && !window.embedded_in_popup){ - refresh_desktop_background(); + window.refresh_desktop_background(); } // ------------------------------------------------------------------------------------- // Un-authed but not first visit -> try to log in/sign up // ------------------------------------------------------------------------------------- - if(!is_auth() && !first_visit_ever){ - if(logged_in_users.length > 0){ + if(!window.is_auth() && !window.first_visit_ever){ + if(window.logged_in_users.length > 0){ UIWindowSessionList(); } else{ @@ -676,7 +676,7 @@ window.initgui = async function(){ // ------------------------------------------------------------------------------------- // Un-authed and first visit ever -> create temp user // ------------------------------------------------------------------------------------- - else if(!is_auth() && first_visit_ever){ + else if(!window.is_auth() && window.first_visit_ever){ let referrer; try{ referrer = new URL(window.location.href).pathname; @@ -690,10 +690,10 @@ window.initgui = async function(){ window.referrerStr = referrer; // in case there is also a referrer query param, add it to the referrer URL - if(url_query_params.has('ref')){ + if(window.url_query_params.has('ref')){ if(!referrer) referrer = '/'; - referrer += '?ref=' + html_encode(url_query_params.get('ref')); + referrer += '?ref=' + html_encode(window.url_query_params.get('ref')); } @@ -701,7 +701,7 @@ window.initgui = async function(){ if(window.custom_headers) headers = window.custom_headers; $.ajax({ - url: gui_origin + "/signup", + url: window.gui_origin + "/signup", type: 'POST', async: true, headers: headers, @@ -712,7 +712,7 @@ window.initgui = async function(){ is_temp: true, }), success: async function (data){ - update_auth_data(data.token, data.user); + window.update_auth_data(data.token, data.user); document.dispatchEvent(new Event("login", { bubbles: true})); }, error: function (err){ @@ -725,7 +725,7 @@ window.initgui = async function(){ } // if there is at least one window open (only non-Explorer windows), ask user for confirmation when navigating away - if(feature_flags.prompt_user_when_navigation_away_from_puter){ + if(window.feature_flags.prompt_user_when_navigation_away_from_puter){ window.onbeforeunload = function(){ if($(`.window:not(.window[data-app="explorer"])`).length > 0) return true; @@ -743,8 +743,8 @@ window.initgui = async function(){ // Load desktop, if not embedded in a popup // ------------------------------------------------------------------------------------- if(!window.embedded_in_popup){ - await get_auto_arrange_data(); - puter.fs.stat(desktop_path, function (desktop_fsentry) { + await window.get_auto_arrange_data(); + puter.fs.stat(window.desktop_path, function (desktop_fsentry) { UIDesktop({ desktop_fsentry: desktop_fsentry }); }) } @@ -752,10 +752,10 @@ window.initgui = async function(){ // If embedded in a popup, send the 'ready' event to referrer and close the popup // ------------------------------------------------------------------------------------- else{ - let msg_id = url_query_params.get('msg_id'); + let msg_id = window.url_query_params.get('msg_id'); try{ - let data = await getUserAppToken(new URL(openerOrigin).origin); + let data = await window.getUserAppToken(new URL(window.openerOrigin).origin); // This is an implicit app and the app_uid is sent back from the server // we cache it here so that we can use it later window.host_app_uid = data.app_uid; @@ -765,9 +765,9 @@ window.initgui = async function(){ success: true, msg_id: msg_id, token: data.token, - username: user.username, + username: window.user.username, app_uid: data.app_uid, - }, openerOrigin); + }, window.openerOrigin); // close popup if(!action || action==='sign-in'){ window.close(); @@ -780,7 +780,7 @@ window.initgui = async function(){ msg_id: msg_id, success: false, token: null, - }, openerOrigin); + }, window.openerOrigin); // close popup window.close(); window.open('','_self').close(); @@ -789,8 +789,8 @@ window.initgui = async function(){ let app_uid; - if(openerOrigin){ - app_uid = await getAppUIDFromOrigin(openerOrigin); + if(window.openerOrigin){ + app_uid = await window.getAppUIDFromOrigin(window.openerOrigin); window.host_app_uid = app_uid; } @@ -798,7 +798,7 @@ window.initgui = async function(){ // Action: Show Open File Picker //-------------------------------------------------------------------------------------- if(action === 'show-open-file-picker'){ - let options = url_query_params.get('options'); + let options = window.url_query_params.get('options'); options = JSON.parse(options ?? '{}'); // Open dialog @@ -861,7 +861,7 @@ window.initgui = async function(){ // Action: Show Save File Dialog //-------------------------------------------------------------------------------------- else if(action === 'show-save-file-picker'){ - let allowed_file_types = url_query_params.get('allowed_file_types'); + let allowed_file_types = window.url_query_params.get('allowed_file_types'); // send 'sendMeFileData' event to parent window.opener.postMessage({ @@ -984,13 +984,13 @@ window.initgui = async function(){ // done let busy_duration = (Date.now() - busy_init_ts); - if( busy_duration >= busy_indicator_hide_delay){ + if( busy_duration >= window.busy_indicator_hide_delay){ $(el_filedialog_window).close(); }else{ setTimeout(() => { // close this dialog $(el_filedialog_window).close(); - }, Math.abs(busy_indicator_hide_delay - busy_duration)); + }, Math.abs(window.busy_indicator_hide_delay - busy_duration)); } } @@ -1018,7 +1018,7 @@ window.initgui = async function(){ // If .item-container clicked, unselect all its item children if($(e.target).hasClass('item-container') && !e.ctrlKey && !e.metaKey){ $(e.target).children('.item-selected').removeClass('item-selected'); - update_explorer_footer_selected_items_count(e.target); + window.update_explorer_footer_selected_items_count(e.target); } // If the clicked element is not a context menu, remove all context menus @@ -1054,21 +1054,21 @@ window.initgui = async function(){ // update active_item_container if($(e.target).hasClass('item-container')){ - active_item_container = e.target; + window.active_item_container = e.target; }else{ let ic = $(e.target).closest('.item-container') if(ic.length > 0){ - active_item_container = ic.get(0); + window.active_item_container = ic.get(0); }else{ let pp = $(e.target).find('.item-container') if(pp.length > 0){ - active_item_container = pp.get(0); + window.active_item_container = pp.get(0); } } } //active element - active_element = e.target; + window.active_element = e.target; }); $(document).bind('keydown', async function(e){ @@ -1176,13 +1176,13 @@ window.initgui = async function(){ // if no item is selected and down arrow is pressed, select the first item if($('.context-menu-active .context-menu-item-active').length === 0 && (e.which === 40)){ let selected_item = $('.context-menu-active .context-menu-item').get(0); - select_ctxmenu_item(selected_item); + window.select_ctxmenu_item(selected_item); return false; } // if no item is selected and up arrow is pressed, select the last item else if($('.context-menu-active .context-menu-item-active').length === 0 && (e.which === 38)){ let selected_item = $('.context-menu .context-menu-item').get($('.context-menu .context-menu-item').length - 1); - select_ctxmenu_item(selected_item); + window.select_ctxmenu_item(selected_item); return false; } // if an item is selected and down arrow is pressed, select the next enabled item @@ -1195,7 +1195,7 @@ window.initgui = async function(){ new_selected_item_index = new_selected_item_index + 1; new_selected_item = $('.context-menu-active .context-menu-item').get(new_selected_item_index); } - select_ctxmenu_item(new_selected_item); + window.select_ctxmenu_item(new_selected_item); return false; } // if an item is selected and up arrow is pressed, select the previous enabled item @@ -1208,7 +1208,7 @@ window.initgui = async function(){ new_selected_item_index = new_selected_item_index - 1; new_selected_item = $('.context-menu-active .context-menu-item').get(new_selected_item_index); } - select_ctxmenu_item(new_selected_item); + window.select_ctxmenu_item(new_selected_item); return false; } // if right arrow is pressed, open the submenu by triggering a mouseover event @@ -1219,7 +1219,7 @@ window.initgui = async function(){ if($(selected_item).hasClass('context-menu-item-submenu') === true){ $(selected_item).removeClass('context-menu-item-active'); $(selected_item).addClass('context-menu-item-active-blurred'); - select_ctxmenu_item($('.context-menu[data-is-submenu="true"] .context-menu-item').get(0)); + window.select_ctxmenu_item($('.context-menu[data-is-submenu="true"] .context-menu-item').get(0)); } return false; } @@ -1252,27 +1252,27 @@ window.initgui = async function(){ else if(!$(focused_el).is('input') && !$(focused_el).is('textarea') && (e.which === 37 || e.which === 38 || e.which === 39 || e.which === 40)){ let item_width = 110, item_height = 110, selected_item; // select first item in container if none is selected - if($(active_item_container).find('.item-selected').length === 0){ - selected_item = $(active_item_container).find('.item').get(0); - active_element = selected_item; - $(active_item_container).find('.item-selected').removeClass('item-selected'); + if($(window.active_item_container).find('.item-selected').length === 0){ + selected_item = $(window.active_item_container).find('.item').get(0); + window.active_element = selected_item; + $(window.active_item_container).find('.item-selected').removeClass('item-selected'); $(selected_item).addClass('item-selected'); return false; } // if Shift key is pressed and ONE item is already selected, pick that item - else if($(active_item_container).find('.item-selected').length === 1 && e.shiftKey){ - selected_item = $(active_item_container).find('.item-selected').get(0); + else if($(window.active_item_container).find('.item-selected').length === 1 && e.shiftKey){ + selected_item = $(window.active_item_container).find('.item-selected').get(0); } // if Shift key is pressed and MORE THAN ONE item is selected, pick the latest active item - else if($(active_item_container).find('.item-selected').length > 1 && e.shiftKey){ - selected_item = $(active_element).hasClass('item') ? active_element : $(active_element).closest('.item').get(0); + else if($(window.active_item_container).find('.item-selected').length > 1 && e.shiftKey){ + selected_item = $(window.active_element).hasClass('item') ? window.active_element : $(window.active_element).closest('.item').get(0); } // otherwise if an item is selected, pick that item - else if($(active_item_container).find('.item-selected').length === 1){ - selected_item = $(active_item_container).find('.item-selected').get(0); + else if($(window.active_item_container).find('.item-selected').length === 1){ + selected_item = $(window.active_item_container).find('.item-selected').get(0); } else{ - selected_item = $(active_element).hasClass('item') ? active_element : $(active_element).closest('.item').get(0); + selected_item = $(window.active_element).hasClass('item') ? window.active_element : $(window.active_element).closest('.item').get(0); } // override the default behavior of ctrl/meta key @@ -1320,7 +1320,7 @@ window.initgui = async function(){ let next_item; for (let index = 0; index < elements_at_next_pos.length; index++) { const elem_at_next_pos = elements_at_next_pos[index]; - if($(elem_at_next_pos).hasClass('item') && $(elem_at_next_pos).closest('.item-container').is(active_item_container)){ + if($(elem_at_next_pos).hasClass('item') && $(elem_at_next_pos).closest('.item-container').is(window.active_item_container)){ next_item = elem_at_next_pos; break; } @@ -1328,10 +1328,10 @@ window.initgui = async function(){ if(next_item){ selected_item = next_item; - active_element = next_item; + window.active_element = next_item; // if ctrl or meta key is not pressed, unselect all items if(!e.shiftKey){ - $(active_item_container).find('.item').removeClass('item-selected'); + $(window.active_item_container).find('.item').removeClass('item-selected'); } $(next_item).addClass('item-selected'); window.latest_selected_item = next_item; @@ -1387,7 +1387,7 @@ window.initgui = async function(){ // Permanent delete bypassing trash after alert //----------------------------------------------------------------------- if((e.keyCode === 46 && e.shiftKey) || (e.altKey && e.metaKey && e.keyCode === 8)) { - let $selected_items = $(active_element).closest(`.item-container`).find(`.item-selected`); + let $selected_items = $(window.active_element).closest(`.item-container`).find(`.item-selected`); if($selected_items.length > 0){ const alert_resp = await UIAlert({ message: i18n('confirm_delete_multiple_items'), @@ -1404,7 +1404,7 @@ window.initgui = async function(){ if((alert_resp) === 'Delete'){ for (let index = 0; index < $selected_items.length; index++) { const element = $selected_items[index]; - await delete_item(element); + await window.delete_item(element); } } } @@ -1416,7 +1416,7 @@ window.initgui = async function(){ //----------------------------------------------------------------------- if(e.keyCode === 46 || (e.keyCode === 8 && (e.ctrlKey || e.metaKey))) { // permanent delete? - let $selected_items = $(active_element).closest(`.item-container`).find(`.item-selected[data-path^="${trash_path + '/'}"]`); + let $selected_items = $(window.active_element).closest(`.item-container`).find(`.item-selected[data-path^="${window.trash_path + '/'}"]`); if($selected_items.length > 0){ const alert_resp = await UIAlert({ message: i18n('confirm_delete_multiple_items'), @@ -1433,27 +1433,27 @@ window.initgui = async function(){ if((alert_resp) === 'Delete'){ for (let index = 0; index < $selected_items.length; index++) { const element = $selected_items[index]; - await delete_item(element); + await window.delete_item(element); } - const trash = await puter.fs.stat(trash_path); + const trash = await puter.fs.stat(window.trash_path); if(window.socket){ window.socket.emit('trash.is_empty', {is_empty: trash.is_empty}); } if(trash.is_empty){ $(`[data-app="trash"]`).find('.taskbar-icon > img').attr('src', window.icons['trash.svg']); - $(`.item[data-path="${html_encode(trash_path)}" i]`).find('.item-icon > img').attr('src', window.icons['trash.svg']); - $(`.window[data-path="${html_encode(trash_path)}"]`).find('.window-head-icon').attr('src', window.icons['trash.svg']); + $(`.item[data-path="${html_encode(window.trash_path)}" i]`).find('.item-icon > img').attr('src', window.icons['trash.svg']); + $(`.window[data-path="${html_encode(window.trash_path)}"]`).find('.window-head-icon').attr('src', window.icons['trash.svg']); } } } // regular delete? else{ - $selected_items = $(active_element).closest('.item-container').find('.item-selected'); + $selected_items = $(window.active_element).closest('.item-container').find('.item-selected'); if($selected_items.length > 0){ // Only delete the items if we're not renaming one. if ($selected_items.children('.item-name-editor-active').length === 0) { - move_items($selected_items, trash_path); + window.move_items($selected_items, window.trash_path); } } } @@ -1464,27 +1464,27 @@ window.initgui = async function(){ // A letter or number is pressed and there is no context menu open: search items by name //----------------------------------------------------------------------- if(!e.ctrlKey && !e.metaKey && !$(focused_el).is('input') && !$(focused_el).is('textarea') && $('.context-menu').length === 0){ - if(keypress_item_seach_term !== '') - clearTimeout(keypress_item_seach_buffer_timeout); + if(window.keypress_item_seach_term !== '') + clearTimeout(window.keypress_item_seach_buffer_timeout); - keypress_item_seach_buffer_timeout = setTimeout(()=>{ - keypress_item_seach_term = ''; + window.keypress_item_seach_buffer_timeout = setTimeout(()=>{ + window.keypress_item_seach_term = ''; }, 700); - keypress_item_seach_term += e.key.toLocaleLowerCase(); + window.keypress_item_seach_term += e.key.toLocaleLowerCase(); let matches= []; - const selected_items = $(active_item_container).find(`.item-selected`).not('.item-disabled').first(); + const selected_items = $(window.active_item_container).find(`.item-selected`).not('.item-disabled').first(); // if one item is selected and the selected item matches the search term, don't continue search and select this item again - if(selected_items.length === 1 && $(selected_items).attr('data-name').toLowerCase().startsWith(keypress_item_seach_term)){ + if(selected_items.length === 1 && $(selected_items).attr('data-name').toLowerCase().startsWith(window.keypress_item_seach_term)){ return false; } // search for matches - let haystack = $(active_item_container).find(`.item`).not('.item-disabled'); + let haystack = $(window.active_item_container).find(`.item`).not('.item-disabled'); for(let j=0; j < haystack.length; j++){ - if($(haystack[j]).attr('data-name').toLowerCase().startsWith(keypress_item_seach_term)){ + if($(haystack[j]).attr('data-name').toLowerCase().startsWith(window.keypress_item_seach_term)){ matches.push(haystack[j]) } } @@ -1502,11 +1502,11 @@ window.initgui = async function(){ matches.splice(0, match_index+1); } // deselect all selected sibling items - $(active_item_container).find(`.item-selected`).removeClass('item-selected'); + $(window.active_item_container).find(`.item-selected`).removeClass('item-selected'); // select matching item $(matches[0]).not('.item-disabled').addClass('item-selected'); matches[0].scrollIntoView(false); - update_explorer_footer_selected_items_count($(active_element).closest('.window')); + window.update_explorer_footer_selected_items_count($(window.active_element).closest('.window')); } return false; @@ -1515,27 +1515,27 @@ window.initgui = async function(){ // A letter or number is pressed and there is a context menu open: search items by name //----------------------------------------------------------------------- else if(!e.ctrlKey && !e.metaKey && !$(focused_el).is('input') && !$(focused_el).is('textarea') && $('.context-menu').length > 0){ - if(keypress_item_seach_term !== '') - clearTimeout(keypress_item_seach_buffer_timeout); + if(window.keypress_item_seach_term !== '') + clearTimeout(window.keypress_item_seach_buffer_timeout); - keypress_item_seach_buffer_timeout = setTimeout(()=>{ - keypress_item_seach_term = ''; + window.keypress_item_seach_buffer_timeout = setTimeout(()=>{ + window.keypress_item_seach_term = ''; }, 700); - keypress_item_seach_term += e.key.toLocaleLowerCase(); + window.keypress_item_seach_term += e.key.toLocaleLowerCase(); let matches= []; const selected_items = $('.context-menu').find(`.context-menu-item-active`).first(); // if one item is selected and the selected item matches the search term, don't continue search and select this item again - if(selected_items.length === 1 && $(selected_items).text().toLowerCase().startsWith(keypress_item_seach_term)){ + if(selected_items.length === 1 && $(selected_items).text().toLowerCase().startsWith(window.keypress_item_seach_term)){ return false; } // search for matches let haystack = $('.context-menu-active').find(`.context-menu-item`); for(let j=0; j < haystack.length; j++){ - if($(haystack[j]).text().toLowerCase().startsWith(keypress_item_seach_term)){ + if($(haystack[j]).text().toLowerCase().startsWith(window.keypress_item_seach_term)){ matches.push(haystack[j]) } } @@ -1557,7 +1557,7 @@ window.initgui = async function(){ // select matching item $(matches[0]).addClass('context-menu-item-active'); // matches[0].scrollIntoView(false); - // update_explorer_footer_selected_items_count($(active_element).closest('.window')); + // update_explorer_footer_selected_items_count($(window.active_element).closest('.window')); } return false; @@ -1578,16 +1578,16 @@ window.initgui = async function(){ // ctrl/command + a, will select all items on desktop and windows //----------------------------------------------------------------------------- if((e.ctrlKey || e.metaKey) && e.which === 65 && !$(focused_el).is('input') && !$(focused_el).is('textarea')){ - let $parent_container = $(active_element).closest('.item-container'); + let $parent_container = $(window.active_element).closest('.item-container'); if($parent_container.length === 0) - $parent_container = $(active_element).find('.item-container'); + $parent_container = $(window.active_element).find('.item-container'); if($parent_container.attr('data-multiselectable') === 'false') return false; if($parent_container){ $($parent_container).find('.item').not('.item-disabled').addClass('item-selected'); - update_explorer_footer_selected_items_count($parent_container.closest('.window')); + window.update_explorer_footer_selected_items_count($parent_container.closest('.window')); } return false; @@ -1597,9 +1597,9 @@ window.initgui = async function(){ // ctrl + w, will close the active window //----------------------------------------------------------------------------- if(e.ctrlKey && e.which === 87){ - let $parent_window = $(active_element).closest('.window'); + let $parent_window = $(window.active_element).closest('.window'); if($parent_window.length === 0) - $parent_window = $(active_element).find('.window'); + $parent_window = $(window.active_element).find('.window'); if($parent_window !== null){ @@ -1612,28 +1612,28 @@ window.initgui = async function(){ // ctrl/command + c, will copy selected items on the active element to the clipboard //----------------------------------------------------------------------------- if((e.ctrlKey || e.metaKey) && e.which === 67 && - $(mouseover_window).attr('data-is_dir') !== 'false' && - $(mouseover_window).attr('data-path') !== trash_path && + $(window.mouseover_window).attr('data-is_dir') !== 'false' && + $(window.mouseover_window).attr('data-path') !== window.trash_path && !$(focused_el).is('input') && !$(focused_el).is('textarea')){ let $selected_items; - let parent_container = $(active_element).closest('.item-container'); + let parent_container = $(window.active_element).closest('.item-container'); if(parent_container.length === 0) - parent_container = $(active_element).find('.item-container'); + parent_container = $(window.active_element).find('.item-container'); if(parent_container !== null){ $selected_items = $(parent_container).find('.item-selected'); if($selected_items.length > 0){ - clipboard = []; - clipboard_op = 'copy'; + window.clipboard = []; + window.clipboard_op = 'copy'; $selected_items.each(function() { // error if trash is being copied - if($(this).attr('data-path') === trash_path){ + if($(this).attr('data-path') === window.trash_path){ return; } // add to clipboard - clipboard.push({path: $(this).attr('data-path'), uid: $(this).attr('data-uid'), metadata: $(this).attr('data-metadata')}); + window.clipboard.push({path: $(this).attr('data-path'), uid: $(this).attr('data-uid'), metadata: $(this).attr('data-metadata')}); }) } } @@ -1645,17 +1645,17 @@ window.initgui = async function(){ //----------------------------------------------------------------------------- if((e.ctrlKey || e.metaKey) && e.which === 88 && !$(focused_el).is('input') && !$(focused_el).is('textarea')){ let $selected_items; - let parent_container = $(active_element).closest('.item-container'); + let parent_container = $(window.active_element).closest('.item-container'); if(parent_container.length === 0) - parent_container = $(active_element).find('.item-container'); + parent_container = $(window.active_element).find('.item-container'); if(parent_container !== null){ $selected_items = $(parent_container).find('.item-selected'); if($selected_items.length > 0){ - clipboard = []; - clipboard_op = 'move'; + window.clipboard = []; + window.clipboard_op = 'move'; $selected_items.each(function() { - clipboard.push($(this).attr('data-path')); + window.clipboard.push($(this).attr('data-path')); }) } } @@ -1665,7 +1665,7 @@ window.initgui = async function(){ // Open // Enter key on a selected item will open it //----------------------------------------------------------------------- - if(e.which === 13 && !$(focused_el).is('input') && !$(focused_el).is('textarea') && (Date.now() - last_enter_pressed_to_rename_ts) >200 + if(e.which === 13 && !$(focused_el).is('input') && !$(focused_el).is('textarea') && (Date.now() - window.last_enter_pressed_to_rename_ts) >200 // prevent firing twice, because this will be fired on both keyup and keydown && e.type === 'keydown'){ let $selected_items; @@ -1679,7 +1679,7 @@ window.initgui = async function(){ if($('.launch-app-selected').length > 0){ // close launch menu $(".launch-popover").fadeOut(200, function(){ - launch_app({ + window.launch_app({ name: $('.launch-app-selected').attr('data-name'), }) $(".launch-popover").remove(); @@ -1702,7 +1702,7 @@ window.initgui = async function(){ $(selected_item).trigger('click'); if($('.context-menu[data-is-submenu="true"]').length > 0){ let selected_item = $('.context-menu[data-is-submenu="true"] .context-menu-item').get(0); - select_ctxmenu_item(selected_item); + window.select_ctxmenu_item(selected_item); } return false; @@ -1710,11 +1710,11 @@ window.initgui = async function(){ // --------------------------------------------- // if this is a selected item, open it // --------------------------------------------- - else if(active_item_container){ - $selected_items = $(active_item_container).find('.item-selected'); + else if(window.active_item_container){ + $selected_items = $(window.active_item_container).find('.item-selected'); if($selected_items.length > 0){ $selected_items.each(function() { - open_item({ + window.open_item({ item: this, new_window: e.metaKey || e.ctrlKey, }); @@ -1733,7 +1733,7 @@ window.initgui = async function(){ let target_path, target_el; // continue only if there is something in the clipboard - if(clipboard.length === 0) + if(window.clipboard.length === 0) return; let parent_container = determine_active_container_parent(); @@ -1742,13 +1742,13 @@ window.initgui = async function(){ target_el = parent_container; target_path = $(parent_container).attr('data-path'); // don't allow pasting in Trash - if((target_path === trash_path || target_path.startsWith(trash_path + '/')) && clipboard_op !== 'move') + if((target_path === window.trash_path || target_path.startsWith(window.trash_path + '/')) && window.clipboard_op !== 'move') return; // execute clipboard operation - if(clipboard_op === 'copy') - copy_clipboard_items(target_path); - else if(clipboard_op === 'move') - move_clipboard_items(target_el, target_path); + if(window.clipboard_op === 'copy') + window.copy_clipboard_items(target_path); + else if(window.clipboard_op === 'move') + window.move_clipboard_items(target_el, target_path); } return false; } @@ -1757,40 +1757,40 @@ window.initgui = async function(){ // ctrl/command + z, will undo last action //----------------------------------------------------------------------------- if((e.ctrlKey || e.metaKey) && e.which === 90){ - undo_last_action(); + window.undo_last_action(); return false; } }); // update mouse position coordinates $(document).mousemove(function(event){ - mouseX = event.clientX; - mouseY = event.clientY; + window.mouseX = event.clientX; + window.mouseY = event.clientY; // mouse in top-left corner of screen - if((mouseX < 150 && mouseY < toolbar_height + 20) || (mouseX < 20 && mouseY < 150)) - current_active_snap_zone = 'nw'; + if((window.mouseX < 150 && window.mouseY < window.toolbar_height + 20) || (window.mouseX < 20 && window.mouseY < 150)) + window.current_active_snap_zone = 'nw'; // mouse in left edge of screen - else if(mouseX < 20 && mouseY >= 150 && mouseY < desktop_height - 150) - current_active_snap_zone = 'w'; + else if(window.mouseX < 20 && window.mouseY >= 150 && window.mouseY < window.desktop_height - 150) + window.current_active_snap_zone = 'w'; // mouse in bottom-left corner of screen - else if(mouseX < 20 && mouseY > desktop_height - 150) - current_active_snap_zone = 'sw'; + else if(window.mouseX < 20 && window.mouseY > window.desktop_height - 150) + window.current_active_snap_zone = 'sw'; // mouse in right edge of screen - else if(mouseX > desktop_width - 20 && mouseY >= 150 && mouseY < desktop_height - 150) - current_active_snap_zone = 'e'; + else if(window.mouseX > window.desktop_width - 20 && window.mouseY >= 150 && window.mouseY < window.desktop_height - 150) + window.current_active_snap_zone = 'e'; // mouse in top-right corner of screen - else if((mouseX > desktop_width - 150 && mouseY < toolbar_height + 20) || (mouseX > desktop_width - 20 && mouseY < 150)) - current_active_snap_zone = 'ne'; + else if((window.mouseX > window.desktop_width - 150 && window.mouseY < window.toolbar_height + 20) || (window.mouseX > window.desktop_width - 20 && window.mouseY < 150)) + window.current_active_snap_zone = 'ne'; // mouse in bottom-right corner of screen - else if(mouseX > desktop_width - 20 && mouseY >= desktop_height - 150) - current_active_snap_zone = 'se'; + else if(window.mouseX > window.desktop_width - 20 && window.mouseY >= window.desktop_height - 150) + window.current_active_snap_zone = 'se'; // mouse in top edge of screen - else if(mouseY < toolbar_height + 20 && mouseX >= 150 && mouseX < desktop_width - 150) - current_active_snap_zone = 'n'; + else if(window.mouseY < window.toolbar_height + 20 && window.mouseX >= 150 && window.mouseX < window.desktop_width - 150) + window.current_active_snap_zone = 'n'; // not in any snap zone else - current_active_snap_zone = undefined; + window.current_active_snap_zone = undefined; // mouseover_window var windows = document.getElementsByClassName("window"); @@ -1799,7 +1799,7 @@ window.initgui = async function(){ let highest_window_zindex = 0; for(let i=0; i rect.x && mouseX < (rect.x + rect.width) && mouseY > rect.y && mouseY < (rect.y + rect.height)){ + if( window.mouseX > rect.x && window.mouseX < (rect.x + rect.width) && window.mouseY > rect.y && window.mouseY < (rect.y + rect.height)){ if(parseInt($(windows[i]).css('z-index')) >= highest_window_zindex){ active_win = windows[i]; highest_window_zindex = parseInt($(windows[i]).css('z-index')); @@ -1816,7 +1816,7 @@ window.initgui = async function(){ let highest_window_zindex = 0; for(let i=0; i rect.x && mouseX < (rect.x + rect.width) && mouseY > rect.y && mouseY < (rect.y + rect.height)){ + if( window.mouseX > rect.x && window.mouseX < (rect.x + rect.width) && window.mouseY > rect.y && window.mouseY < (rect.y + rect.height)){ let active_container_zindex = parseInt($(item_containers[i]).closest('.window').css('z-index')); if( !isNaN(active_container_zindex) && active_container_zindex >= highest_window_zindex){ active_ic = item_containers[i]; @@ -1837,8 +1837,8 @@ window.initgui = async function(){ return; // if mouse is clicked on a window, activate it - if(mouseover_window !== undefined){ - $(mouseover_window).focusWindow(e); + if(window.mouseover_window !== undefined){ + $(window.mouseover_window).focusWindow(e); } }) @@ -1873,7 +1873,7 @@ window.initgui = async function(){ if(items?.length>0){ let parent_container = determine_active_container_parent(); if(parent_container){ - upload_items(items, $(parent_container).attr('data-path')); + window.upload_items(items, $(parent_container).attr('data-path')); } } @@ -1931,9 +1931,9 @@ window.initgui = async function(){ default_username: window.user.username }); if(saved) - logout(); + window.logout(); }else if (alert_resp === 'log_out'){ - logout(); + window.logout(); } else{ return; @@ -1943,12 +1943,12 @@ window.initgui = async function(){ // logout try{ await $.ajax({ - url: gui_origin + "/logout", + url: window.gui_origin + "/logout", type: 'POST', async: true, contentType: "application/json", headers: { - "Authorization": "Bearer " + auth_token + "Authorization": "Bearer " + window.auth_token }, statusCode: { 401: function () { @@ -1956,7 +1956,7 @@ window.initgui = async function(){ }, }) }catch(e){ - + // Ignored } // remove this user from the array of logged_in_users From 23d959bf6471641c69e866c69ae70096691ed729 Mon Sep 17 00:00:00 2001 From: Sam Atkins Date: Thu, 2 May 2024 17:26:41 +0100 Subject: [PATCH 64/68] chore: Clarify usage of window fields in index.js /puter/src/index.js 58:15 error 'loadScript' is not defined no-undef 59:15 error 'loadScript' is not defined no-undef 65:13 error 'gui_env' is not defined no-undef 66:15 error 'loadScript' is not defined no-undef 68:15 error 'loadCSS' is not defined no-undef 69:15 error 'loadScript' is not defined no-undef 73:5 error 'initgui' is not defined no-undef --- src/index.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/index.js b/src/index.js index 0a9404721..2dc7defd9 100644 --- a/src/index.js +++ b/src/index.js @@ -55,22 +55,22 @@ window.gui = async function(options){ // DEV: Load the initgui.js file if we are in development mode if(!window.gui_env || window.gui_env === "dev"){ - await loadScript('/sdk/puter.dev.js'); - await loadScript('/initgui.js', {isModule: true}); + await window.loadScript('/sdk/puter.dev.js'); + await window.loadScript('/initgui.js', {isModule: true}); } // PROD: load the minified bundles if we are in production mode // note: the order of the bundles is important // note: Build script will prepend `window.gui_env="prod"` to the top of the file - else if(gui_env === "prod"){ - await loadScript('https://js.puter.com/v2/'); + else if(window.gui_env === "prod"){ + await window.loadScript('https://js.puter.com/v2/'); // Load the minified bundles - await loadCSS('/dist/bundle.min.css'); - await loadScript('/dist/bundle.min.js'); + await window.loadCSS('/dist/bundle.min.css'); + await window.loadScript('/dist/bundle.min.js'); } // 🚀 Launch the GUI 🚀 - initgui(); + window.initgui(); } /** From 52d52993744dffa9f7f59a232da5df9077560731 Mon Sep 17 00:00:00 2001 From: Sam Atkins Date: Thu, 2 May 2024 17:30:53 +0100 Subject: [PATCH 65/68] fix: Use correct variable for version number /puter/packages/backend/src/services/ComplainAboutVersionsService.js 30:36 error 'current_version' is not defined no-undef --- packages/backend/src/services/ComplainAboutVersionsService.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/backend/src/services/ComplainAboutVersionsService.js b/packages/backend/src/services/ComplainAboutVersionsService.js index 4a65ba492..61d084b87 100644 --- a/packages/backend/src/services/ComplainAboutVersionsService.js +++ b/packages/backend/src/services/ComplainAboutVersionsService.js @@ -27,7 +27,7 @@ class ComplainAboutVersionsService extends BaseService { if ( ! current_version_data ) { this.log.warn( - `failed to check ${current_version} in the EOL database` + `failed to check ${major} in the EOL database` ); return; } From fa3b86fa7e5c7a8653bd77be257a9447374c0198 Mon Sep 17 00:00:00 2001 From: Sam Atkins Date: Thu, 2 May 2024 17:31:17 +0100 Subject: [PATCH 66/68] chore: Amend empty blocks in upload.js /puter/packages/puter-js/src/modules/FileSystem/operations/upload.js 63:22 error Empty block statement no-empty 173:22 error Empty block statement no-empty --- packages/puter-js/src/modules/FileSystem/operations/upload.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/puter-js/src/modules/FileSystem/operations/upload.js b/packages/puter-js/src/modules/FileSystem/operations/upload.js index 4b7fe525f..90bbff013 100644 --- a/packages/puter-js/src/modules/FileSystem/operations/upload.js +++ b/packages/puter-js/src/modules/FileSystem/operations/upload.js @@ -60,8 +60,6 @@ const upload = async function(items, dirPath, options = {}){ for(let i=0; i Date: Thu, 2 May 2024 17:39:01 +0100 Subject: [PATCH 67/68] fix: Correct variables used in errors in sign.js I couldn't figure out how to get a name for the no_suitable_app error unfortunately, so that's just commented out. /puter/packages/backend/src/routers/sign.js 65:74 error 'subject' is not defined no-undef 114:59 error 'subject' is not defined no-undef --- packages/backend/src/routers/sign.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/backend/src/routers/sign.js b/packages/backend/src/routers/sign.js index 2e6330ca9..df91c9bff 100644 --- a/packages/backend/src/routers/sign.js +++ b/packages/backend/src/routers/sign.js @@ -62,7 +62,8 @@ module.exports = eggspress('/sign', { app = await get_app({ uid: req.body.app_uid }); if ( ! app ) { - throw APIError.create('no_suitable_app', null, { entry_name: subject.entry.name }); + // FIXME: subject.entry.name isn't available here + throw APIError.create('no_suitable_app', null); //, { entry_name: subject.entry.name }); } // Generate user-app token const svc_auth = Context.get('services').get('auth'); @@ -111,7 +112,7 @@ module.exports = eggspress('/sign', { const svc_acl = Context.get('services').get('acl'); if ( ! await svc_acl.check(actor, node, 'see') ) { - throw await svc_acl.get_safe_acl_error(actor, subject, 'see'); + throw await svc_acl.get_safe_acl_error(actor, node, 'see'); } if ( app !== null ) { From 44aa4f1b0ad2782bb3e155c8f6d4f52b45ab9150 Mon Sep 17 00:00:00 2001 From: Sam Atkins Date: Thu, 2 May 2024 17:41:14 +0100 Subject: [PATCH 68/68] chore: Remove debugger calls /puter/packages/phoenix/src/ansi-shell/arg-parsers/simple-parser.js 30:38 warning Unexpected 'debugger' statement no-debugger /puter/packages/phoenix/src/ansi-shell/pipeline/Coupler.js 71:32 warning Unexpected 'debugger' statement no-debugger --- packages/phoenix/src/ansi-shell/arg-parsers/simple-parser.js | 1 - packages/phoenix/src/ansi-shell/pipeline/Coupler.js | 1 - 2 files changed, 2 deletions(-) diff --git a/packages/phoenix/src/ansi-shell/arg-parsers/simple-parser.js b/packages/phoenix/src/ansi-shell/arg-parsers/simple-parser.js index a0fc8ff4d..2d806b00b 100644 --- a/packages/phoenix/src/ansi-shell/arg-parsers/simple-parser.js +++ b/packages/phoenix/src/ansi-shell/arg-parsers/simple-parser.js @@ -27,7 +27,6 @@ export default { let result; try { - if ( ! ctx.locals.args ) debugger; result = parseArgs({ ...spec, args: ctx.locals.args }); } catch (e) { await ctx.externs.out.write( diff --git a/packages/phoenix/src/ansi-shell/pipeline/Coupler.js b/packages/phoenix/src/ansi-shell/pipeline/Coupler.js index 7ad454a74..ad40b9c08 100644 --- a/packages/phoenix/src/ansi-shell/pipeline/Coupler.js +++ b/packages/phoenix/src/ansi-shell/pipeline/Coupler.js @@ -68,7 +68,6 @@ export class Coupler { break; } if ( this.on_ ) { - if ( ! value ) debugger; await this.target.write(value); } }