-10. **Open Page Link** - *macOS only*, opens the extension browser page
+10. **Open Page Link** - _macOS only_, opens the extension browser page
11. **Enable Injection toggle** - turns on/off page script injection (on/off switch)
12. **Refresh View** - refreshes the popup view
13. **Available Updates View** - the extension periodically checks all userscripts in your save location for updates and when an update is found, it is shown in this view
@@ -121,53 +122,53 @@ After installing Userscripts on macOS, you **do not** need to select a userscrip
Userscripts Safari currently supports the following userscript metadata:
-- `@name` - This will be the name that displays in the sidebar and be used as the filename - you can *not* use the same name for multiple files of the same type
+- `@name` - This will be the name that displays in the sidebar and be used as the filename - you can _not_ use the same name for multiple files of the same type
- `@description`- Use this to describe what your userscript does - this will be displayed in the sidebar - there is a setting to hide descriptions
- `@icon` - This doesn't have a function with this userscript manager, but the **first value** provided in the metadata will be accessible in the `GM_/GM.info` object
- `@match` - Domain match patterns - you can use several instances of this field if you'd like multiple domain matches - view [this article for more information on constructing patterns](https://developer.chrome.com/extensions/match_patterns)
- - **Note:** this extension only supports `http/s`
-- `@exclude-match` - Domain patterns where you do *not* want the script to run
+ - **Note:** this extension only supports `http/s`
+- `@exclude-match` - Domain patterns where you do _not_ want the script to run
- `@include` - Used to match against urls for injection, globs and regular expressions are allowed, [read more here](https://wiki.greasespot.net/Include_and_exclude_rules)
- `@exclude` - Functions in a similar way as `@include` but rather than injecting, a match against this key's value will prevent injection
- `@inject-into` - allows the user to choose which context to inject the script into
- - allows the user to choose which context to inject the script into
- - values: `auto` (default), `content`, `page`
- - `GM` apis are only available when using `content`
- - works like [violentmonkey](https://violentmonkey.github.io/api/metadata-block/#inject-into)
+ - allows the user to choose which context to inject the script into
+ - values: `auto` (default), `content`, `page`
+ - `GM` apis are only available when using `content`
+ - works like [violentmonkey](https://violentmonkey.github.io/api/metadata-block/#inject-into)
- `@run-at`
- - allows the user to choose the injection timing
- - document-start, document-end (default), document-idle
- - works like [violentmonkey](https://violentmonkey.github.io/api/metadata-block/#run-at)
- - **JS Only**
+ - allows the user to choose the injection timing
+ - document-start, document-end (default), document-idle
+ - works like [violentmonkey](https://violentmonkey.github.io/api/metadata-block/#run-at)
+ - **JS Only**
- `@weight`
- - allows the user to further adjust script injection timing
- - can be used to ensure one script injects before another
- - ONLY accepts integers (floats, strings and everything else will be ignored)
- - min value = 1, max value = 999, higher numbers (“heavier”) execute earlier
+ - allows the user to further adjust script injection timing
+ - can be used to ensure one script injects before another
+ - ONLY accepts integers (floats, strings and everything else will be ignored)
+ - min value = 1, max value = 999, higher numbers (“heavier”) execute earlier
- `@require`
- - allows users to include remote resources in their scripts
- - the value must be a valid url, currently no local file support
- - must require a resource of the same file type (JS for JS, CSS for CSS)
- - when a resource is required, it is downloaded and saved locally
- - the resources is downloaded once at save and never checked for updates or parsed in anyway
- - if you want to update the require resources, and the url does not change, you must remove the resources, save, then re-input it
- - **require remote resources at your own risk, the extension never validates remote resource code in any way and be aware that using remote resources from untrusted sources can jeopardize your personal security**
+ - allows users to include remote resources in their scripts
+ - the value must be a valid url, currently no local file support
+ - must require a resource of the same file type (JS for JS, CSS for CSS)
+ - when a resource is required, it is downloaded and saved locally
+ - the resources is downloaded once at save and never checked for updates or parsed in anyway
+ - if you want to update the require resources, and the url does not change, you must remove the resources, save, then re-input it
+ - **require remote resources at your own risk, the extension never validates remote resource code in any way and be aware that using remote resources from untrusted sources can jeopardize your personal security**
- `@version`
- - used to determine the current version of a userscript
- - when paired with `@updateURL`, this will allow the user to update a userscript from a remote source, if the version on their machine is `<` version at the update URL
- - `@version` does nothing by itself, it needs to be paired with` @updateURL` for remote updating to function properly
+ - used to determine the current version of a userscript
+ - when paired with `@updateURL`, this will allow the user to update a userscript from a remote source, if the version on their machine is `<` version at the update URL
+ - `@version` does nothing by itself, it needs to be paired with` @updateURL` for remote updating to function properly
- `@updateURL`
- - the remote url to check version against
- - if the version of the file located at the update URL is `>` the version on the local machine, the file will be updated
- - `@updateURL` does nothing by itself, it needs to be paired with `@version` for remote updating to function properly
+ - the remote url to check version against
+ - if the version of the file located at the update URL is `>` the version on the local machine, the file will be updated
+ - `@updateURL` does nothing by itself, it needs to be paired with `@version` for remote updating to function properly
- `@downloadURL`
- - optional download location for a remotely updateable file (*i.e. a file that has both `@version` and `@updateURL`)
- - when paired with `@version` and `@updateURL`, if the local version is `<` the version of the file that `@updateURL` points to, the extension will attempt to update the file's code with the contents of the file located at the `@downloadURL`
- - `@downloadURL` does nothing by itself, it needs `@version` and `@updateURL` to present in order to function properly
+ - optional download location for a remotely updateable file (\*i.e. a file that has both `@version` and `@updateURL`)
+ - when paired with `@version` and `@updateURL`, if the local version is `<` the version of the file that `@updateURL` points to, the extension will attempt to update the file's code with the contents of the file located at the `@downloadURL`
+ - `@downloadURL` does nothing by itself, it needs `@version` and `@updateURL` to present in order to function properly
- `@noframes`
- - this key takes no value
- - prevents code from being injected into nested frames
-
+ - this key takes no value
+ - prevents code from being injected into nested frames
+
**All userscripts need at least 1 `@match` or `@include` to run!**
## API
@@ -175,95 +176,97 @@ Userscripts Safari currently supports the following userscript metadata:
Userscripts currently supports the following api methods. All methods are asynchronous unless otherwise noted. Users must `@grant` these methods in order to use them in a userscript. When using API methods, it's only possible to inject into the content script scope due to security concerns.
- `GM.addStyle(css)`
- - `css: String`
- - on success returns a promise resolved with the css string argument provided
+ - `css: String`
+ - returns a [`Promise`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise), resolved if succeeds, rejected with error message if fails
- `GM.setValue(key, value)`
- - `key: String`, `value: Any`
- - on success returns a promise resolved with an object indicating success
+ - `key: String`
+ - `value: Any` - any can be JSON-serialized
+ - returns a [`Promise`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise), resolved if succeeds, rejected with error message if fails
- `GM.getValue(key, defaultValue)`
- - `key: String`, `defaultValue: Any`
- - on success returns a promise resolved with the value that was set or default value provided
+ - `key: String`
+ - `defaultValue: Any` - optional
+ - returns a [`Promise`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise), resolved with the `value` that was set or `defaultValue` provided or `undefined` if succeeds, rejected with error message if fails
- `GM.deleteValue(key)`
- - `key: String`
- - on success returns a promise resolved with an object indicating success
+ - `key: String`
+ - returns a [`Promise`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise), resolved if succeeds, rejected with error message if fails
- `GM.listValues()`
- - on success returns a promise resolved with an array of the key names of **presently set** values
+ - returns a [`Promise`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise), resolved with an array of the key names of **presently set** values if succeeds, rejected with error message if fails
- `GM.getTab()`
- - on success returns a promise resolved with `Any` data that is persistent as long as this tab is open
+ - returns a [`Promise`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise), resolved with `Any` data that is persistent as long as this tab is open if succeeds, rejected with error message if fails
- `GM.saveTab(tabObj)`
- - `tabObj: Any`
- - on success returns a promise resolved with an object indicating success
+ - `tabObj: Any` - any can be JSON-serialized
+ - returns a [`Promise`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise), resolved if succeeds, rejected with error message if fails
- `GM.openInTab(url, openInBackground)`
- - `url: String`, `openInBackground: Bool`
- - on success returns a promise resolved with the [tab data](https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/API/tabs/Tab) for the tab just opened
+ - `url: String`
+ - `openInBackground: Bool` - optional, `false` by default
+ - returns a [`Promise`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise), resolved with [tab data](https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/API/tabs/Tab) for the tab just opened if succeeds, rejected with error message if fails
- `GM.closeTab(tabId)`
- - `tabId: Int`
- - `tabId` is **optional** and if omitted the tab that called `US.closeTab` will be closed
- - on success returns a promise resolved with an object indicating success
+ - `tabId: Int` - optional, the `caller tab` by default
+ - returns a [`Promise`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise), resolved if succeeds, rejected with error message if fails
- `GM.setClipboard(data, type)`
- - `data: String` - **required**
- - `type: String` - **optional** and defaults to `text/plain`
- - [read more here](https://developer.mozilla.org/en-US/docs/Web/API/ClipboardEvent/clipboardData)
- - on success returns a promise resolved with a `Bool` indicating success
+ - `data: String`
+ - `type: String` - optional, `text/plain` by default
+ - [read more here](https://developer.mozilla.org/en-US/docs/Web/API/ClipboardEvent/clipboardData)
+ - returns a [`Promise`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise), resolved with a `Bool` value indicating succeeds or fails, rejected with error message if fails
- `GM.info` && `GM_info`
- - is available without needing to add it to `@grant`
- - an object containing information about the running userscript
- - `scriptHandler: String` - returns `Userscripts`
- - `version: String` - the version of Userscripts app
- - `scriptMetaStr: String` - the metablock for the currently running script
- - `script: Object` - contains data about the currently running script
- - `description: String`
- - `exclude-match: [String]`
- - `excludes: [String]`
- - `grant: [String]`
- - `includes: [String]`
- - `inject-into: String`
- - `matches: [String]`
- - `name: String`
- - `namespace: String`
- - `noframes: Bool`
- - `require: [String]`
- - `resources: [String]` - *currently not implemented*
- - `run-at: String`
- - `version: String` - *the userscript version value*
+ - is available without needing to add it to `@grant`
+ - an object containing information about the running userscript
+ - `scriptHandler: String` - returns `Userscripts`
+ - `version: String` - the version of Userscripts app
+ - `scriptMetaStr: String` - the metablock for the currently running script
+ - `script: Object` - contains data about the currently running script
+ - `description: String`
+ - `exclude-match: [String]`
+ - `excludes: [String]`
+ - `grant: [String]`
+ - `includes: [String]`
+ - `inject-into: String`
+ - `matches: [String]`
+ - `name: String`
+ - `namespace: String`
+ - `noframes: Bool`
+ - `require: [String]`
+ - `resources: [String]` - _currently not implemented_
+ - `run-at: String`
+ - `version: String` - _the userscript version value_
- `GM.xmlHttpRequest(details)`
- - `details: Object`
- - the `details` object accepts the following properties
- - `url` - `String` - **required**
- - `method` - `String` - defaults to `GET`
- - `user` - `String`
- - `password` - `String`
- - `headers` - `Object`
- - `overrideMimeType`
- - `timeout` - `Int`
- - `binary` - `Bool`
- - `data` - `String`
- - `responseType` - `String`
- - read more about [XMLHttpRequests here](https://developer.mozilla.org/en-US/docs/Web/API/XMLHttpRequest)
- - event handlers:
- - `onabort` - `function`
- - `onerror` - `function`
- - `onload` - `function`
- - `onloadend` - `function`
- - `onloadstart` - `function`
- - `onprogress` - `function`
- - `onreadystatechange` - `function`
- - `ontimeout` - `function`
- - the response object passed to the event handlers has the following properties:
- - `readyState`
- - `response`
- - `responseHeaders`
- - `responseType`
- - `responseURL`
- - `status`
- - `statusText`
- - `timeout`
- - `withCredentials`
- - `responseText` (when `responseType` is `text`)
- - returns an object with a single property, `abort`, which is a `function`
- - usage: `const foo = GM.xmlHttpRequest({...});` ... `foo.abort()` to abort the request
+ - `details: Object`
+ - the `details` object accepts the following properties
+ - `url: String` - required
+ - `method: String` - optional, `GET` by default
+ - `user: String` - optional
+ - `password: String` - optional
+ - `headers: Object` - optional
+ - `overrideMimeTyp: String` - optional
+ - `timeout: Int` - optional
+ - `binary: Bool` - optional
+ - `data: String` - optional
+ - `responseType: String` - optional
+ - refer to [`XMLHttpRequests`](https://developer.mozilla.org/en-US/docs/Web/API/XMLHttpRequest)
+ - event handlers:
+ - `onabort: Function` - optional
+ - `onerror: Function` - optional
+ - `onload: Function` - optional
+ - `onloadend: Function` - optional
+ - `onloadstart: Function` - optional
+ - `onprogress: Function` - optional
+ - `onreadystatechange: Function` - optional
+ - `ontimeout: Function` - optional
+ - the response object passed to the event handlers has the following properties:
+ - `readyState`
+ - `response`
+ - `responseHeaders`
+ - `responseType`
+ - `responseURL`
+ - `status`
+ - `statusText`
+ - `timeout`
+ - `withCredentials`
+ - `responseText` (when `responseType` is `text`)
+ - returns an object with a single property, `abort`, which is a `Function`
+ - usage: `const foo = GM.xmlHttpRequest({...});` ... `foo.abort();` to abort the request
- `GM_xmlhttpRequest(details)`
- - an alias for `GM.xmlHttpRequest`, works exactly the same
+ - an alias for `GM.xmlHttpRequest`, works exactly the same
## Scripts Directory
@@ -277,7 +280,7 @@ This is the directory where the app/extension will read from and write to. This
## Getting Help
-If you encounter a problem while using this app/extension or are in need of some assistance, please open an issue here in the repository. When doing so, please provide as much detail as possible. This includes listing system specs and what website and script you are trying to execute. *Please follow the issue template!*
+If you encounter a problem while using this app/extension or are in need of some assistance, please open an issue here in the repository. When doing so, please provide as much detail as possible. This includes listing system specs and what website and script you are trying to execute. _Please follow the issue template!_
## FAQs
@@ -299,22 +302,25 @@ If you encounter a problem while using this app/extension or are in need of some
**When I use `@require`, where are the required files stored?**
-> All required files are saved *as Javascript files* in the extension container folder in macOS 11.x. That folder is located in the default save location, at: `~/Library/Containers/Userscripts/Data/Documents/require/`.
+> All required files are saved _as Javascript files_ in the extension container folder in macOS 11.x. That folder is located in the default save location, at: `~/Library/Containers/Userscripts/Data/Documents/require/`.
>
> If you move files from the require folder or manually edit the `manifest.json` file, you will likely break app/extension functionality.
## Contributing
-Code level contributions are welcome. *I prefer to collaborate directly with contributors rather than receiving spontaneous pull requests*. If you feel you can improve the project in some way, please reach out to me by email or by opening an issue with your improvement/feature request.
+
+Code level contributions are welcome. _I prefer to collaborate directly with contributors rather than receiving spontaneous pull requests_. If you feel you can improve the project in some way, please reach out to me by email or by opening an issue with your improvement/feature request.
Further, any issue marked "help wanted" is actively seeking assistance. Please respond to those issues with feedback, guidance or offers of coding assistance.
Notes:
+
- use [semantic commit messages](https://gist.github.com/joshbuchea/6f47e86d2510bce28f8e7f42ae84c716)
- under most circumstances, you should fork the most current version of the `develop` branch for your contributions
**Please ensure your contributions align with the project's license before committing anything.**
## Support
+
The quickest and easiest way to support the project is by [leaving a positive review on the App Store](https://apps.apple.com/us/app/userscripts/id1463298887) if you enjoy the extension and want to see future improvements. Seeing these reviews let me know I am doing something right, or wrong, and motivates me to continue working on the project.
The second best way to help out is to sign up to beta test new versions of the app. Since this extension values your privacy, and **does not collect any data from users**, it is difficult to gauge how the extension is being used. By signing up to be a beta tester it not only allows you to test upcoming features, but also gives me the opportunity to elicit direct feedback from real users.
@@ -324,10 +330,11 @@ The second best way to help out is to sign up to beta test new versions of the a
**[macOS Beta Sign Up Form](https://forms.gle/cUDtKg1ip4Vc9Xhc7)**
## Privacy Policy
+
Userscripts does not collect any data from its users nor monitor activities or actions you perform within the application and extension. This means everything that you do with the application and extension is private to you and is never shared with the developers or third parties. Since there is no data collection, there is no data retention of any kind.
## License
-Copyright (c) 2022 Justin Wasack
+Copyright (c) 2018-2023 Justin Wasack
Licensed under the [GNU General Public License v3.0](/LICENSE) license for all open source applications. A commercial license is required for all other applications.
diff --git a/docs/contributing.md b/docs/contributing.md
index b039ead6..5b2c616b 100644
--- a/docs/contributing.md
+++ b/docs/contributing.md
@@ -6,11 +6,16 @@ We hope this guide will helps you understand how to contribute to this project.
For development and build environments please refer to [development guide](dev.md).
-**Note: Portions of this guide are outdated. Some processes are still being tweaked and optimized, we will update them in due course.**
+> [!NOTE]
+> Portions of this guide are outdated. Some processes are still being tweaked and optimized, we will update them in due course.
+
+> [!IMPORTANT]
+> Any pull requests must first go through code formatting and linters, otherwise you will fail the CI check. Refer to the `scripts` in [`package.json`](../package.json)
# Branches
### `main`: default branch
+
- corresponding to development channel
- all development work around this branch
- protected branches not accept commits
@@ -18,6 +23,7 @@ For development and build environments please refer to [development guide](dev.m
- all sub-branches will be merged via PRs
### `beta`: latest test version
+
- generated from the master branch
- corresponding to TestFlight channel
- only accept version number commits
@@ -25,6 +31,7 @@ For development and build environments please refer to [development guide](dev.m
- never merge back into master branch
### `release`: latest public version
+
- generated from the beta branch
- generate GitHub Releases and Tags
- corresponding to App Store channel
@@ -32,6 +39,7 @@ For development and build environments please refer to [development guide](dev.m
- always merge back into master branch
# Commits
+
### Please use semantic commit messages
Format: `
-
- 
-
-
- Userscripts dev
- - - -- This is the development preview environment -
-
+
+ {@html logo}
+
+ {version}
+ {build}
+
+
+ + You can turn on the Userscripts iOS Safari extension in Settings. + + Read the docs. + +
+ +CURRENT DIRECTORY:
+
+
+
+
+
+
+
+
+ Userscripts dev
+ ++ + native-app + , + + action-popup + , + + extension-page + +
+ +This is the development preview environment
+
+
+ {#if !active}
+
+ {/if}
+ {#if showInstallPrompt}
+
+
+ Userscript
+ {#if scriptChecking}
+ {showInstallPrompt}
+ {:else}
+ {scriptInstalled ? "Installed" : "Detected"}:
+
+ {/if}
+
+ {/if}
+ {#if errorNotification}
+
+ {errorNotification}
+ (errorNotification = undefined)}
+ title={"Clear error"}
+ />
+
+ {/if}
+
+ {#if loading}
+
+ {#if !inactive && platform === "macos"}
+
+ {/if}
+{/if}
+
+
diff --git a/src/ext/action-popup/Components/PopupItem.svelte b/src/ext/action-popup/Components/PopupItem.svelte
new file mode 100644
index 00000000..f83fee4b
--- /dev/null
+++ b/src/ext/action-popup/Components/PopupItem.svelte
@@ -0,0 +1,97 @@
+
+
+Popup inactive on extension page
+ {:else if firstGuide}
+
+
+ {:else if initError}
+ Welcome, first use please:
+ +to complete the initialization
+
+ Something went wrong:
+
+
+ {:else if items.length < 1}
+ No matched userscripts
+ {:else}
+
+ {#each list as item, i (item.filename)}
+ toggleItem(item)}
+ />
+ {/each}
+
+ {/if}
+
+
+
+
+
diff --git a/src/ext/action-popup/Components/View.svelte b/src/ext/action-popup/Components/View.svelte
new file mode 100644
index 00000000..4a7564e7
--- /dev/null
+++ b/src/ext/action-popup/Components/View.svelte
@@ -0,0 +1,76 @@
+
+
+{name}
+ {#if subframe}SUB
{/if}
+
+
+
+
diff --git a/src/ext/action-popup/Components/Views/AllItemsView.svelte b/src/ext/action-popup/Components/Views/AllItemsView.svelte
new file mode 100644
index 00000000..b5457123
--- /dev/null
+++ b/src/ext/action-popup/Components/Views/AllItemsView.svelte
@@ -0,0 +1,58 @@
+
+
+{#if allItems.length}
+
+ {headerTitle}
+
+
+ {#if loading && showLoaderOnDisabled}
+
+Slot content is required...
+ {#each list as item (item.filename)}
+ allItemsToggleItem(item)}
+ />
+ {/each}
+
+{:else}
+ No valid files found in directory
+{/if}
+
+
diff --git a/src/ext/action-popup/Components/Views/InstallView.svelte b/src/ext/action-popup/Components/Views/InstallView.svelte
new file mode 100644
index 00000000..d4d23d2b
--- /dev/null
+++ b/src/ext/action-popup/Components/Views/InstallView.svelte
@@ -0,0 +1,176 @@
+
+
+
+ {#if installError}
+
+
+
diff --git a/src/ext/action-popup/Components/Views/UpdateView.svelte b/src/ext/action-popup/Components/Views/UpdateView.svelte
new file mode 100644
index 00000000..957925c1
--- /dev/null
+++ b/src/ext/action-popup/Components/Views/UpdateView.svelte
@@ -0,0 +1,83 @@
+
+
+{#if updates.length}
+ {#each updates as item (item.name)}
+
+
+
+ {@html iconError}
+
+ {:else if userscript}
+ Couldn't install userscript
+ {installError}
+-
+
- {userscript.name} + {#if userscript.description} +
- {userscript.description} + {/if} + {#if userscript.match} +
-
+ @match+ {#each userscript.match as match} +{match}+ {/each} +
+ {/if}
+ {#if userscript.include}
+
-
+ @include+ {#each userscript.include as include} +{include}+ {/each} +
+ {/if}
+ {#if userscript.require}
+
-
+ @require+ {#each userscript.require as require} +{require}+ {/each} +
+ {/if}
+ {#if userscript.grant}
+
-
+ @grant+ {#each userscript.grant as grant} +{grant}+ {/each} +
+ {/if}
+
+
+
+
+
+ {/if}
+
+ Be sure you trust the author before installing. Nefarious code can
+ exploit your security and privacy.
+
+
+
+ {/each}
+ {item.name}
+ Source
+
+ Be sure you trust the author before saving remote code to your device.
+ +{:else} +
+
+ {@html iconUpdate}
+
+{/if}
+
+
diff --git a/src/ext/action-popup/app.css b/src/ext/action-popup/app.css
new file mode 100644
index 00000000..e0a88c6e
--- /dev/null
+++ b/src/ext/action-popup/app.css
@@ -0,0 +1,76 @@
+html {
+ font-size: 100%;
+ overflow: hidden;
+}
+
+body {
+ background-color: var(--color-bg-secondary);
+ color: var(--text-color-primary);
+ font: var(--text-medium);
+ letter-spacing: var(--letter-spacing-medium);
+ text-rendering: optimizelegibility;
+ -webkit-font-smoothing: antialiased;
+ position: relative;
+ width: 18rem;
+ height: 26rem;
+}
+
+/* ios */
+@supports (-webkit-touch-callout: none) {
+ html {
+ font-size: 125%;
+ overflow: visible;
+ overscroll-behavior: none;
+ }
+
+ body {
+ width: auto;
+ min-width: 16rem;
+ height: auto;
+ }
+
+ /* non-fixed width need to stretch */
+ @media (width < 320px) {
+ body {
+ width: 18rem;
+ min-height: 16rem;
+ }
+ }
+}
+
+noscript {
+ display: block;
+}
+
+#app {
+ display: flex;
+ flex-direction: column;
+ height: 100%;
+ justify-content: space-between;
+}
+
+button {
+ border: none;
+ cursor: pointer;
+ padding: 0;
+ user-select: none;
+}
+
+button:disabled {
+ opacity: var(--opacity-disabled);
+ pointer-events: none;
+}
+
+a,
+.link {
+ background: none;
+ color: var(--color-blue);
+ cursor: pointer;
+ text-decoration: underline;
+}
+
+.truncate {
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+}
diff --git a/src/ext/action-popup/main.js b/src/ext/action-popup/main.js
new file mode 100644
index 00000000..2829a2c0
--- /dev/null
+++ b/src/ext/action-popup/main.js
@@ -0,0 +1,44 @@
+import "../shared/reset.css";
+import "../shared/variables.css";
+import "./app.css";
+import App from "./App.svelte";
+
+// vite feat that only import in dev mode
+if (import.meta.env.MODE === "development") {
+ const modules = import.meta.glob("../shared/dev.js", { eager: true });
+ const browser = modules["../shared/dev.js"]["browser"];
+ console.debug("DEV-ENV", import.meta.env, modules, browser);
+ if (!window?.browser?.extension) {
+ // assign to window simulation WebExtension APIs
+ window.browser = browser;
+ // macos popup simulation
+ const style = document.createElement("style");
+ style.textContent = `
+body {
+ top: 20px;
+ left: 20px;
+ box-sizing: content-box;
+ border: 2px solid #0c0e0f;
+ border-radius: 10px;
+ box-shadow: 2px 2px 20px rgba(0, 0, 0, 0.2);
+}
+body:before {
+ content: "";
+ position: absolute;
+ top: -1px;
+ left: -1px;
+ right: -1px;
+ bottom: -1px;
+ border: 1px solid #54575a;
+ border-radius: 9px;
+}
+`;
+ browser.platform === "macos" && document.head.append(style);
+ }
+}
+
+const app = new App({
+ target: document.getElementById("app"),
+});
+
+export default app;
diff --git a/src/ext/background/main.js b/src/ext/background/main.js
new file mode 100644
index 00000000..4260f153
--- /dev/null
+++ b/src/ext/background/main.js
@@ -0,0 +1,539 @@
+import { openExtensionPage } from "../shared/utils.js";
+import * as settingsStorage from "../shared/settings.js";
+import { connectNative, sendNativeMessage } from "../shared/native.js";
+
+// first sorts files by run-at value, then by weight value
+function userscriptSort(a, b) {
+ // map the run-at values to numeric values
+ const runAtValues = {
+ "document-start": 1,
+ "document-end": 2,
+ "document-idle": 3,
+ };
+ const runAtA = a.scriptObject["run-at"];
+ const runAtB = b.scriptObject["run-at"];
+ if (runAtA !== runAtB && runAtValues[runAtA] && runAtValues[runAtB]) {
+ return runAtValues[runAtA] > runAtValues[runAtB];
+ }
+ return Number(a.scriptObject.weight) < Number(b.scriptObject.weight);
+}
+
+async function readAsDataURL(blob) {
+ return new Promise((resolve) => {
+ const reader = new FileReader();
+ reader.readAsDataURL(blob);
+ reader.onloadend = () => resolve(reader.result); // base64data
+ });
+}
+
+async function getPlatform() {
+ let platform = localStorage.getItem("platform");
+ if (!platform) {
+ const message = { name: "REQ_PLATFORM" };
+ const response = await sendNativeMessage(message);
+ if (!response.platform) {
+ console.error("Failed to get platform");
+ return "";
+ }
+ platform = response.platform;
+ localStorage.setItem("platform", platform);
+ }
+ return platform;
+}
+
+function setClipboard(data, type = "text/plain") {
+ // future enhancement?
+ // https://developer.mozilla.org/en-US/docs/Web/API/Clipboard/write
+ // https://developer.mozilla.org/en-US/docs/Web/API/Clipboard/writeText
+ const onCopy = (e) => {
+ e.stopImmediatePropagation();
+ e.preventDefault();
+ e.clipboardData.setData(type, data);
+ document.removeEventListener("copy", onCopy, true);
+ };
+
+ const textarea = document.createElement("textarea");
+ textarea.textContent = "
+ There are no file updates available
+
+ +
+ + +
+
+ {@html logo}
+ {#if $state.includes("init-error")}
+ Failed to initialize app, check the browser console
+ {:else}
+ Initializing app...
+ {/if}
+
+{/if}
+
+
+-
+ {#each $notifications as item (item.id)}
+
+ {#if $state.includes("editor-loading") || $state.includes("fetching")}
+
+
+
diff --git a/src/ext/extension-page/Components/Editor/EditorSearch.svelte b/src/ext/extension-page/Components/Editor/EditorSearch.svelte
new file mode 100644
index 00000000..cc1f70db
--- /dev/null
+++ b/src/ext/extension-page/Components/Editor/EditorSearch.svelte
@@ -0,0 +1,207 @@
+
+
+{#if active}
+ No Item Selected
+ {/if}
+
+
+
+
+
+
+
+ {name}
+
+
+
+ {#if $state.includes("saving")}
+ Saving...
+ {:else if $state.includes("trashing")}
+ （◞‸◟）
+ {:else if $state.includes("updating")}
+ Updating code,
+ {:else if remote}
+ Code was remotely fetched,
+ check carefully before saving!
+ {:else if temp}
+ Ready for code!
+ {:else}
+ Last modified: {lastModified}
+ {/if}
+
+
+
+
+
+
+ {rangesIndex}/{query ? ranges.length : "?"}
+ next()} />
+ previous()} />
+
+{/if}
+
+
diff --git a/src/ext/extension-page/Components/Notification.svelte b/src/ext/extension-page/Components/Notification.svelte
new file mode 100644
index 00000000..f79e5343
--- /dev/null
+++ b/src/ext/extension-page/Components/Notification.svelte
@@ -0,0 +1,154 @@
+
+
+
+
+
+{@html icon}
+ {item.message}
+
+
+
+
+
+
diff --git a/src/ext/extension-page/Components/Sidebar/Sidebar.svelte b/src/ext/extension-page/Components/Sidebar/Sidebar.svelte
new file mode 100644
index 00000000..99dacae0
--- /dev/null
+++ b/src/ext/extension-page/Components/Sidebar/Sidebar.svelte
@@ -0,0 +1,264 @@
+
+
+
+
+
diff --git a/src/ext/extension-page/Components/Sidebar/SidebarFilter.svelte b/src/ext/extension-page/Components/Sidebar/SidebarFilter.svelte
new file mode 100644
index 00000000..f0746326
--- /dev/null
+++ b/src/ext/extension-page/Components/Sidebar/SidebarFilter.svelte
@@ -0,0 +1,122 @@
+
+
+ state.remove("settings")}>
+
+
+
+
+
+ state.remove("settings")}
+ />
+
+ Editor Settings
+
+
+ update("autoCloseBrackets", !$settings.autoCloseBrackets)}
+ />
+
+ Auto Close Brackets
+
+ update("autoHint", !$settings.autoHint)}
+ />
+
+ Auto Hint
+
+ update("descriptions", !$settings.descriptions)}
+ />
+
+ Hide Descriptions
+
+ update("lint", !$settings.lint)}
+ />
+
+ Javascript Linter
+
+ update("showInvisibles", !$settings.showInvisibles)}
+ />
+
+ Show Invisibles
+
+
+ Tab Size
+
+
+
+
+
+ General Settings
+
+ update("active", !$settings.active)}
+ />
+
+ Enable Injection
+
+ update("showCount", !$settings.showCount)}
+ />
+
+ Show Toolbar Count
+
+
+ Save Location
+
+
+
+
+ Global exclude match patterns
+
+ {#if blacklistSaving}{@html iconLoader}{/if}
+
+
+
+
+ Information
+
+ Userscripts Safari Version {$settings.version} ({$settings.build})
+
+ You can review the documentation, report bugs and get more information about
+ this extension by visiting
+
+
+ If you enjoy using this extension, please consider
+
+ on the App Store or
+
+
+
+
+
+
+ +
+ +
+ +
+ {#if query}
+ (query = "")} {disabled} />
+ {/if}
+
+
+
diff --git a/src/ext/extension-page/Components/Sidebar/SidebarItem.svelte b/src/ext/extension-page/Components/Sidebar/SidebarItem.svelte
new file mode 100644
index 00000000..c4cd2bd7
--- /dev/null
+++ b/src/ext/extension-page/Components/Sidebar/SidebarItem.svelte
@@ -0,0 +1,102 @@
+
+
++ +
+ +
+ +
+
+
+
diff --git a/src/ext/extension-page/app.css b/src/ext/extension-page/app.css
new file mode 100644
index 00000000..425bcaa4
--- /dev/null
+++ b/src/ext/extension-page/app.css
@@ -0,0 +1,50 @@
+html {
+ font-size: 100%;
+ height: 100vh;
+ overflow: hidden;
+}
+
+body {
+ background-color: var(--color-bg-primary);
+ color: var(--text-color-primary);
+ font: var(--text-default);
+ height: 100%;
+ text-rendering: optimizelegibility;
+ -webkit-font-smoothing: antialiased;
+}
+
+noscript {
+ display: block;
+}
+
+#app {
+ display: flex;
+ flex-direction: column;
+ height: 100%;
+}
+
+a,
+.link {
+ background: none;
+ color: var(--color-blue);
+ cursor: pointer;
+ text-decoration: underline;
+}
+
+.truncate {
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+}
+
+button {
+ border: none;
+ cursor: pointer;
+ padding: 0;
+ user-select: none;
+}
+
+button:disabled {
+ opacity: var(--opacity-disabled);
+ pointer-events: none;
+}
diff --git a/src/ext/extension-page/codemirror.css b/src/ext/extension-page/codemirror.css
new file mode 100644
index 00000000..3741538f
--- /dev/null
+++ b/src/ext/extension-page/codemirror.css
@@ -0,0 +1,214 @@
+.CodeMirror {
+ background-color: transparent;
+ color: var(--editor-default);
+ font-family: var(--editor-font);
+ font-size: var(--editor-font-size);
+ font-weight: 400;
+ height: 100%;
+ line-height: var(--editor-line-height);
+ text-rendering: unset;
+ -webkit-font-smoothing: antialiased;
+}
+
+.CodeMirror-gutters {
+ background-color: transparent;
+ border-right: 0;
+}
+
+.CodeMirror-activeline-background,
+.CodeMirror-activeline-gutter {
+ background-color: var(--editor-active-line);
+}
+
+.CodeMirror-linenumber {
+ color: var(--text-color-primary);
+ font-size: var(--editor-font-size);
+ opacity: 0.25;
+}
+
+.CodeMirror-activeline .CodeMirror-linenumber {
+ opacity: 0.5;
+}
+
+.CodeMirror-cursor {
+ border-left: 2px solid var(--text-color-secondary); /* check */
+}
+
+.CodeMirror-hints {
+ background-color: var(--color-black);
+ border: 1px solid black;
+ box-shadow: var(--box-shadow);
+ font: var(--text-small);
+ font-family: var(--editor-font);
+ line-height: 1.5rem;
+}
+
+.CodeMirror-hint {
+ color: var(--text-color-secondary);
+}
+
+li.CodeMirror-hint-active {
+ background-color: var(--color-blue);
+ color: var(--color-black);
+}
+
+.cm-s-default .CodeMirror-selected {
+ background-color: var(--editor-selected-bg);
+}
+
+div.CodeMirror span.CodeMirror-matchingbracket {
+ color: var(--editor-matching-bracket-color);
+ border-bottom: 2px solid var(--editor-matching-bracket-border);
+}
+
+div.CodeMirror span.CodeMirror-nonmatchingbracket {
+ color: var(--editor-non-matching-bracket);
+}
+
+.CodeMirror .CodeMirror-placeholder,
+.cm-s-default .cm-comment {
+ color: var(--editor-comment);
+}
+
+.cm-s-default .cm-keyword {
+ color: var(--editor-keyword);
+}
+
+.cm-s-default .cm-def {
+ color: var(--editor-def);
+}
+
+.cm-s-default .cm-variable,
+.cm-s-default .cm-variable-2 {
+ color: inherit;
+}
+
+.cm-s-default .cm-operator {
+ color: var(--editor-operator);
+}
+
+.cm-s-default .cm-property {
+ color: var(--editor-property);
+}
+
+.cm-s-default .cm-string {
+ color: var(--editor-string);
+}
+
+.cm-s-default .cm-string-2 {
+ color: var(--editor-string-2);
+}
+
+.cm-s-default .cm-number {
+ color: var(--editor-number);
+}
+
+.cm-s-default .cm-atom {
+ color: var(--editor-atom);
+}
+
+.cm-s-default .cm-error {
+ color: var(--color-red);
+}
+
+.CodeMirror .cm-whitespace::before,
+.CodeMirror .CodeMirror-line > span::after,
+.CodeMirror .CodeMirror-code > div > pre > span::after {
+ color: var(--editor-invisible);
+}
+
+.cm-s-default .cm-variable-3,
+.cm-s-default .cm-builtin,
+.cm-s-default .cm-qualifier,
+.cm-s-default .cm-tag {
+ color: var(--editor-def);
+}
+
+.cm-s-default .cm-searching {
+ background-color: var(--editor-search-highlight);
+ padding: 3px 0;
+}
+
+.cm-s-default .cm-search-mark {
+ border-bottom: 2px solid var(--editor-matching-bracket-border);
+}
+
+/*
+.cm-s-default .cm-matchhighlight {
+ background-color: var(--editor-matched-highlight);
+}
+*/
+
+.CodeMirror-lint-markers {
+ width: 8px;
+}
+
+.CodeMirror-lint-marker {
+ border-radius: 50%;
+ cursor: default;
+ height: 0.375rem;
+ left: 0.25rem;
+ position: relative;
+ width: 0.375rem;
+}
+
+.CodeMirror-lint-marker-error,
+.CodeMirror-lint-marker-warning {
+ background: var(--color-yellow);
+ top: -1px;
+}
+
+.CodeMirror-lint-marker-error {
+ background-color: var(--editor-error);
+}
+
+.CodeMirror-lint-marker-multiple {
+ background: var(--editor-def);
+ left: 0;
+ position: absolute;
+ top: 0;
+}
+
+.CodeMirror-lint-mark-warning {
+ background: none;
+ border-bottom: 2px solid var(--color-yellow);
+}
+
+.CodeMirror-lint-mark-error {
+ background: none;
+ border-bottom: 2px solid var(--editor-error);
+}
+
+.CodeMirror-lint-tooltip {
+ background-color: var(--color-black);
+ border: 1px solid black;
+ border-radius: var(--border-radius);
+ box-shadow: var(--box-shadow);
+ color: var(--text-color-secondary);
+ font: var(--text-small);
+ padding: 0.5rem;
+ transition: opacity 200ms;
+}
+
+.CodeMirror-lint-message-error,
+.CodeMirror-lint-message-warning {
+ background: none;
+ padding-left: 1rem;
+ position: relative;
+}
+
+.CodeMirror-lint-message-error::before,
+.CodeMirror-lint-message-warning::before {
+ background-color: var(--color-yellow);
+ border-radius: 50%;
+ content: "";
+ height: 0.5rem;
+ left: 0;
+ position: absolute;
+ top: 0.25rem;
+ width: 0.5rem;
+}
+
+.CodeMirror-lint-message-error::before {
+ background-color: var(--editor-error);
+}
diff --git a/src/page/codemirror.js b/src/ext/extension-page/codemirror.js
similarity index 100%
rename from src/page/codemirror.js
rename to src/ext/extension-page/codemirror.js
diff --git a/src/ext/extension-page/main.js b/src/ext/extension-page/main.js
new file mode 100644
index 00000000..ec2580e9
--- /dev/null
+++ b/src/ext/extension-page/main.js
@@ -0,0 +1,21 @@
+import "../shared/reset.css";
+import "../shared/variables.css";
+import "./app.css";
+import App from "./App.svelte";
+
+// vite feat that only import in dev mode
+if (import.meta.env.MODE === "development") {
+ const modules = import.meta.glob("../shared/dev.js", { eager: true });
+ const browser = modules["../shared/dev.js"]["browser"];
+ console.debug("DEV-ENV", import.meta.env, modules, browser);
+ if (!window?.browser?.extension) {
+ // assign to window simulation WebExtension APIs
+ window.browser = browser;
+ }
+}
+
+const app = new App({
+ target: document.getElementById("app"),
+});
+
+export default app;
diff --git a/src/ext/extension-page/store.js b/src/ext/extension-page/store.js
new file mode 100644
index 00000000..dc9b0234
--- /dev/null
+++ b/src/ext/extension-page/store.js
@@ -0,0 +1,145 @@
+import { writable } from "svelte/store";
+import { uniqueId } from "../shared/utils.js";
+import * as settingsStorage from "../shared/settings.js";
+import { sendNativeMessage } from "../shared/native.js";
+
+function notificationStore() {
+ const { subscribe, update } = writable([]);
+ const add = (item) => {
+ update((a) => {
+ a.push(item);
+ return a;
+ });
+ };
+ const remove = (id) => update((a) => a.filter((b) => b.id !== id));
+ return { subscribe, add, remove };
+}
+export const notifications = notificationStore();
+
+function logStore() {
+ const { subscribe, set, update } = writable([]);
+ const add = (message, type, notify) => {
+ const item = { id: uniqueId(), message, time: Date.now(), type };
+ if (notify || type === "error") notifications.add(item); // always notify on error
+ update((a) => {
+ a.push(item);
+ return a;
+ });
+ };
+ const remove = (id) => update((a) => a.filter((b) => b.id !== id));
+ const reset = () => set([]);
+ return { subscribe, add, remove, reset };
+}
+export const log = logStore();
+
+function stateStore() {
+ const { subscribe, update } = writable(["init"]);
+ // store oldState to see how state transitioned
+ // ex. if (newState === foo && oldState === bar) baz();
+ let oldState = [];
+ const add = (stateModifier) =>
+ update((state) => {
+ // list of acceptable states, mostly for state definition tracking
+ const states = [
+ "init", // the uninitialized app state (start screen)
+ "init-error", // unique error when initialization fails, shows error on load screen
+ "settings", // when the settings modal is shown
+ "items-loading", // when the sidebar items are loading
+ "saving", // when a file in the editor is being saved
+ "fetching", // when a new remote file has been added and it being fetched
+ "trashing", // when deleting the file in the editor
+ "updating", // when the file in the editor is being updating
+ ];
+ // disallow adding undefined states
+ if (!states.includes(stateModifier)) {
+ console.error("invalid state");
+ return state;
+ }
+ // save pre-changed state to oldState var
+ oldState = [...state];
+ // if current state modifier not present, add it to state array
+ if (!state.includes(stateModifier)) state.push(stateModifier);
+ // ready state only when no other states present, remove it if present
+ if (state.includes("ready")) state.splice(state.indexOf("ready"), 1);
+ log.add(
+ `App state updated to: ${state} from: ${oldState}`,
+ "info",
+ false,
+ );
+ return state;
+ });
+ const remove = (stateModifier) =>
+ update((state) => {
+ // save pre-changed state to oldState var
+ oldState = [...state];
+ // if current state modifier present, remove it from state array
+ if (state.includes(stateModifier))
+ state.splice(state.indexOf(stateModifier), 1);
+ // if no other states, push ready state
+ if (state.length === 0) state.push("ready");
+ log.add(
+ `App state updated to: ${state} from: ${oldState}`,
+ "info",
+ false,
+ );
+ return state;
+ });
+ const getOldState = () => oldState;
+ return { subscribe, add, getOldState, remove };
+}
+export const state = stateStore();
+
+function settingsStore() {
+ const { subscribe, update, set } = writable({});
+ const init = async (initData) => {
+ // import legacy settings data just one-time
+ await settingsStorage.legacyImport();
+ // for compatibility with legacy getting names only
+ // once all new name is used, use settingsStorage.get()
+ const settings = await settingsStorage.legacyGet();
+ console.info("store.js settingsStore init", initData, settings);
+ set({ ...initData, ...settings });
+ // sync popup, backgound, etc... settings changes
+ settingsStorage.onChangedSettings((sets, area) => {
+ console.info(`store.js storage.${area}.onChanged`, sets);
+ update((obj) => Object.assign(obj, sets));
+ });
+ };
+ const reset = async (keys) => {
+ await settingsStorage.reset(keys);
+ // once all new name is used, use settingsStorage.get()
+ const settings = await settingsStorage.legacyGet();
+ console.info("store.js settingsStore reset", settings);
+ update((obj) => Object.assign(obj, settings));
+ };
+
+ const updateSingleSettingOld = (key, value) => {
+ // blacklist not stored in normal setting object in manifest, so handle differently
+ if (key === "blacklist") {
+ // update blacklist on swift side
+ const message = { name: "PAGE_UPDATE_BLACKLIST", blacklist: value };
+ sendNativeMessage(message).then((response) => {
+ response.error && log.add(response.error, "error", true);
+ });
+ }
+ if (key === "active") {
+ sendNativeMessage({ name: "TOGGLE_EXTENSION", active: String(value) });
+ }
+ };
+ const updateSingleSetting = (key, value) => {
+ // update(settings => (settings[key] = value, settings));
+ update((settings) => {
+ settings[key] = value;
+ return settings;
+ });
+ // for compatibility with legacy setting names only
+ // once all new name is used, use settingsStorage.set()
+ settingsStorage.legacySet({ [key]: value }); // Durable Storage
+ // temporarily keep the old storage method until it is confirmed that all dependencies are removed
+ updateSingleSettingOld(key, value);
+ };
+ return { subscribe, set, init, reset, updateSingleSetting };
+}
+export const settings = settingsStore();
+
+export const items = writable([]);
diff --git a/src/ext/global.d.ts b/src/ext/global.d.ts
new file mode 100644
index 00000000..167d6d97
--- /dev/null
+++ b/src/ext/global.d.ts
@@ -0,0 +1,13 @@
+// https://www.typescriptlang.org/docs/handbook/declaration-files/introduction.html
+
+///
+
+ {#if description}
+ {data.name}
+
+ {description}
+
+ {/if}
+
+
+
+
diff --git a/src/ext/shared/Components/IconButton.svelte b/src/ext/shared/Components/IconButton.svelte
new file mode 100644
index 00000000..b9636042
--- /dev/null
+++ b/src/ext/shared/Components/IconButton.svelte
@@ -0,0 +1,65 @@
+
+
+
+
+
diff --git a/src/ext/shared/Components/Loader.svelte b/src/ext/shared/Components/Loader.svelte
new file mode 100644
index 00000000..666ae404
--- /dev/null
+++ b/src/ext/shared/Components/Loader.svelte
@@ -0,0 +1,60 @@
+
+
+-
+
- At least one slot is required... +
+
+ {@html iconLoader}
+ {#if abort}
+
+
+
diff --git a/src/ext/shared/Components/Tag.svelte b/src/ext/shared/Components/Tag.svelte
new file mode 100644
index 00000000..80e00954
--- /dev/null
+++ b/src/ext/shared/Components/Tag.svelte
@@ -0,0 +1,55 @@
+
+
+
+
+
diff --git a/src/ext/shared/Components/Toggle.svelte b/src/ext/shared/Components/Toggle.svelte
new file mode 100644
index 00000000..a724fecb
--- /dev/null
+++ b/src/ext/shared/Components/Toggle.svelte
@@ -0,0 +1,72 @@
+
+
+
+
+
+
+
+
diff --git a/src/ext/shared/dev.js b/src/ext/shared/dev.js
new file mode 100644
index 00000000..6d9a754c
--- /dev/null
+++ b/src/ext/shared/dev.js
@@ -0,0 +1,521 @@
+import { parse, uniqueId, wait } from "./utils";
+
+/**
+ *
+ * @param {("css"|"js")} type
+ * @param {boolean?} updates
+ * @param {boolean?} longName
+ * @returns
+ */
+function generateFile(
+ type,
+ updates = false,
+ longName = false,
+ request = false,
+) {
+ let canUpdate = updates;
+ const uid = uniqueId();
+ let name = request ? `${uid}-request-${type}` : `${uid}-example-${type}`;
+ if (longName) name = `${uid}${uid}${uid}-example-${type}`;
+ const randomDate = +(
+ Number(new Date()) - Math.floor(Math.random() * 10000000000)
+ );
+ let content =
+ "// ==UserScript==" +
+ `\n// @name ${name}` +
+ `\n// @description Custom description for userscript with name "${name}"` +
+ "\n// @match *://*.*" +
+ "\n// @exclude-match https://github.com/quoid/userscripts" +
+ "\n// @version 1.0" +
+ "\n// @noframes" +
+ "\n// ==/UserScript==" +
+ `\n\nconsole.log("I am ${name}");`;
+ if (type === "css") {
+ content = content.replace("// ==UserScript==", "/* ==UserStyle==");
+ content = content.replace("// ==/UserScript==", "==/UserStyle== */");
+ content = content.replaceAll("// @", "@");
+ content = content.replace(
+ `console.log("I am ${name}");`,
+ "#id,\n.class\n.pseudo-element::after {\n color: red\n}",
+ );
+ canUpdate = false;
+ }
+ if (request) {
+ content = content.replace(
+ "// @noframes",
+ "// @noframes\n// @run-at request",
+ );
+ }
+ if (canUpdate) {
+ content = content.replace(
+ "1.0",
+ "1.0\n// @updateURL https://www.k21p.com/example.user.js",
+ );
+ content = content.replace(
+ `console.log("I am ${name}");`,
+ `console.log("I am ${name} and you can update me!");`,
+ );
+ }
+ return {
+ content,
+ filename: `${name}.${type}`,
+ lastModified: randomDate,
+ name,
+ request,
+ type,
+ };
+}
+
+/**
+ * @typedef {Object} File
+ * @property {string} content - ...
+ * @property {string} filename - ...
+ * @property {number} lastModified - ...
+ * @property {string} [name] - ...
+ * @property {boolean} [request] - ...
+ * @property {"css" | "js"} [type] - ...
+ */
+/** @type {File[]} */
+const files = [
+ generateFile("js", true, true),
+ generateFile("css"),
+ generateFile("js", false, false, true),
+ ...Array.from({ length: 7 }, () => generateFile("js")),
+];
+
+const _browser = {
+ delay: 200,
+ platform: "macos", // ios || macos
+ runtime: {
+ getURL() {
+ return "https://www.example.com/";
+ },
+ async sendMessage(message, responseCallback) {
+ const name = message.name;
+ console.info(`Got message: ${name}`);
+ let response = {};
+ if (name === "REFRESH_SESSION_RULES") {
+ response = { success: true };
+ }
+ if (!responseCallback) {
+ return new Promise((resolve) => {
+ setTimeout(() => resolve(response), _browser.delay);
+ });
+ }
+ setTimeout(() => responseCallback(response), _browser.delay);
+ },
+ async sendNativeMessage(application, message, responseCallback) {
+ const name = message.name;
+ console.info(`Got message: ${name}`);
+ /** @type {any} */
+ let response = {};
+ if (name === "PAGE_INIT_DATA") {
+ response = {
+ saveLocation: "/Users/someone/Library/Directory",
+ version: "5.0.0",
+ build: "55",
+ };
+ } else if (name === "PAGE_LEGACY_IMPORT") {
+ response = {
+ active: "true",
+ autoCloseBrackets: "true",
+ autoHint: "true",
+ blacklist: [],
+ descriptions: "true",
+ languageCode: "en",
+ lint: "true",
+ log: "false",
+ showCount: "true",
+ showInvisibles: "true",
+ sortOrder: "lastModifiedDesc",
+ tabSize: "4",
+ };
+ } else if (name === "PAGE_ALL_FILES") {
+ response = [];
+ files.forEach((file) => {
+ const content = file.content;
+ const parsed = parse(content);
+ const metadata = parsed.metadata;
+ const canUpdate = !!(metadata.version && metadata.updateURL);
+ const scriptData = {
+ canUpdate,
+ content,
+ description: metadata.description ? metadata.description[0] : "",
+ disabled: false,
+ filename: file.filename,
+ lastModified: file.lastModified,
+ metadata,
+ name: metadata.name[0],
+ request: file.request,
+ // type: file.filename.substring(file.filename.lastIndexOf(".") + 1)
+ type: file.type,
+ };
+ response.push(scriptData);
+ });
+ } else if (name === "TOGGLE_ITEM") {
+ response = { success: true };
+ // response = {error: true};
+ } else if (name === "PAGE_UPDATE_SETTINGS") {
+ response = { success: true };
+ } else if (name === "PAGE_UPDATE_BLACKLIST") {
+ response = { success: true };
+ } else if (name === "PAGE_NEW_REMOTE") {
+ const result = await getRemoteFileContents(message.url);
+ response = result;
+ } else if (name === "PAGE_SAVE") {
+ const newContent = message.content;
+ const oldFilename = message.item.filename;
+ const parsed = parse(newContent);
+ const lastModified = Date.now();
+ let canUpdate = false;
+ // script failed to parse
+ if (!parsed) {
+ return { error: "save failed, file has invalid metadata" };
+ }
+ const metaName = parsed.metadata.name[0];
+ const newFilename = `${metaName}.${message.item.type}`;
+ // filename length too long
+ if (newFilename.length > 255) {
+ return { error: "save failed, filename too long!" };
+ }
+
+ // check if file can be remotely updated
+ if (parsed.metadata.version && parsed.metadata.updateURL) {
+ canUpdate = true;
+ }
+
+ const success = {
+ canUpdate,
+ content: newContent,
+ filename: newFilename,
+ lastModified,
+ name,
+ };
+
+ // add description if in file metadata
+ if (parsed.metadata.description) {
+ // const foo = parsed.metadata;
+ success.description = parsed.metadata.description[0];
+ }
+ // check if declarative network request
+ if (
+ parsed.metadata["run-at"] &&
+ parsed.metadata["run-at"][0] === "request"
+ ) {
+ success.request = true;
+ }
+ // overwriting
+ if (newFilename.toLowerCase() === oldFilename.toLowerCase()) {
+ saveFile(newContent, lastModified, newFilename, oldFilename);
+ return success;
+ }
+
+ // not overwriting, check if filename for that type is taken
+ if (
+ files.find(
+ (a) => a.filename.toLowerCase() === newFilename.toLowerCase(),
+ )
+ ) {
+ return { error: "save failed, name already taken!" };
+ }
+
+ // not overwriting but all validation passed
+ saveFile(newContent, lastModified, newFilename, oldFilename);
+ return success;
+ } else if (name === "PAGE_UPDATE") {
+ const url = parse(message.content).metadata.updateURL;
+ await wait(500);
+ const result = await getRemoteFileContents(url);
+ response = result;
+ // response.error = "Something went wrong!";
+ // response.info = "No updates found";
+ } else if (name === "TOGGLE_EXTENSION") {
+ // response = {error: "Failed toggle extension"};
+ response = { success: true };
+ } else if (
+ name === "POPUP_UPDATE_ALL" ||
+ name === "POPUP_UPDATE_SINGLE"
+ ) {
+ // response = {error: "Failed refresh scripts"};
+ response = {
+ items: [
+ {
+ name: "Google Images Restored",
+ filename: "Google Images Restored.js",
+ disabled: false,
+ type: "js",
+ },
+ {
+ name: "Wikipedia Mobile Redirect",
+ filename: "Wikipedia Mobile Redirect.js",
+ disabled: true,
+ type: "js",
+ },
+ {
+ name: "A Special Userscript",
+ filename: "A Special Userscript.js",
+ disabled: false,
+ type: "js",
+ },
+ {
+ name: "CSS Adblock",
+ filename: "CSS Adblock.css",
+ disabled: false,
+ type: "css",
+ },
+ {
+ name: "New Userscript With a Really Really Long Name",
+ filename: "New Userscript With a Really Really Long Name.css",
+ disabled: true,
+ type: "css",
+ },
+ {
+ name: "Subframe Script Managerial Staffing Company",
+ filename: "Subframe Script.js",
+ disabled: false,
+ subframe: true,
+ type: "css",
+ },
+ ],
+ updates: [],
+ };
+ } else if (name === "POPUP_CHECK_UPDATES") {
+ response = {
+ updates: [
+ {
+ filename: "Google Images Restored.js",
+ name: "Google Images Restored",
+ url: "https://www.k21p.com",
+ },
+ {
+ filename: "New Userscript With a Really Really Long Name.js",
+ name: "New Userscript With a Really Really Long Name",
+ url: "https://www.filmgarb.com",
+ },
+ ],
+ };
+ } else if (name === "POPUP_MATCHES") {
+ response = {
+ matches: [
+ ...files,
+ {
+ name: "Subframe Script Managerial Staffing Company",
+ filename: "Subframe Script.js",
+ disabled: false,
+ subframe: true,
+ type: "js",
+ },
+ ],
+ };
+ } else if (name === "POPUP_UPDATES") {
+ response = {
+ updates: [
+ {
+ filename: "Google Images Restored.js",
+ name: "Google Images Restored",
+ url: "https://www.k21p.com",
+ },
+ {
+ filename: "New Userscript With a Really Really Long Name.js",
+ name: "New Userscript With a Really Really Long Name",
+ url: "https://www.filmgarb.com",
+ },
+ ],
+ };
+ response.updates = [];
+ } else if (name === "REQ_PLATFORM") {
+ response = { platform: _browser.platform };
+ } else if (name === "POPUP_OPEN_EXTENSION_PAGE") {
+ response = { error: "Failed to get page url" };
+ window.open("https://github.com/quoid/userscripts");
+ } else if (name === "OPEN_SAVE_LOCATION") {
+ if (_browser.platform === "macos") {
+ response = { success: true };
+ } else {
+ response = {
+ items: [
+ {
+ name: "Google Images Restored",
+ filename: "Google Images Restored.js",
+ disabled: false,
+ type: "js",
+ metadata: [],
+ },
+ {
+ name: "Subframe Script Managerial Staffing Company",
+ filename: "Subframe Script.js",
+ disabled: false,
+ type: "css",
+ metadata: [],
+ },
+ {
+ name: "Another Script from Managerial Staffing Company",
+ filename: "Cool Script.js",
+ disabled: false,
+ type: "js",
+ metadata: [],
+ },
+ ],
+ };
+ }
+ } else if (name === "POPUP_INSTALL_CHECK") {
+ response = random([
+ { success: "Click to install", installed: false },
+ { success: "Click to re-install", installed: true },
+ ]);
+ response.metadata = {
+ description:
+ 'This userscript re-implements the "View Image" and "Search by image" buttons into google images.',
+ grant: ["GM.getValue", "GM.setValue", "GM.xmlHttpRequest"],
+ match: [
+ "https://www.example.com/*",
+ "https://www.example.com/somethingReallylong/goesRightHere",
+ ],
+ name: "Test Install Userscript",
+ require: [
+ "https://code.jquery.com/jquery-3.5.1.min.js",
+ "https://code.jquery.com/jquery-1.7.1.min.js",
+ ],
+ source:
+ "https://greasyforx.org/scripts/00000-something-something-long-name/code/Something%20something%20long20name.user.js",
+ };
+ // response.error = "something went wrong (dev)";
+ }
+ if (!responseCallback) {
+ return new Promise((resolve) => {
+ setTimeout(() => resolve(response), _browser.delay);
+ });
+ }
+ setTimeout(() => responseCallback(response), _browser.delay);
+ },
+ connectNative: () => ({
+ onMessage: {
+ addListener: () => console.info("connectNative - addListener"),
+ },
+ }),
+ },
+ tabs: {
+ getCurrent(/* responseCallback */) {
+ const response = random([
+ { url: "https://www.filmgarb.com/foo.user.js", id: 101 },
+ {
+ url: `${window.location.origin}/src/ext/shared/dev/DEMO.Alert-URL.user.js`,
+ id: 102,
+ },
+ // increase probability
+ {
+ url: `${window.location.origin}/src/ext/shared/dev/DEMO.Alert-URL.user.js`,
+ id: 103,
+ },
+ { url: window.location.href, id: 10 },
+ ]);
+ console.info("browser.tabs.getCurrent", response);
+ return new Promise((resolve) => {
+ setTimeout(() => resolve(response), _browser.delay);
+ });
+ },
+ query(message, responseCallback) {
+ const response = [
+ { url: "https://www.filmgarb.com/foo.user.js", id: 101 },
+ ];
+ if (!responseCallback) {
+ return new Promise((resolve) => {
+ setTimeout(() => resolve(response), _browser.delay);
+ });
+ }
+ setTimeout(() => responseCallback(response), _browser.delay);
+ },
+ sendMessage(tabId, message, responseCallback) {
+ let response = {};
+ if (message.name === "DEMO_MSG") {
+ response = {};
+ // response.error = "something went wrong (dev)";
+ }
+ if (!responseCallback) {
+ return new Promise((resolve) => {
+ setTimeout(() => resolve(response), _browser.delay);
+ });
+ }
+ setTimeout(() => responseCallback(response), _browser.delay);
+ },
+ },
+ webNavigation: {
+ getAllFrames(message, responseCallback) {
+ const response = [];
+ if (!responseCallback) {
+ return new Promise((resolve) => {
+ setTimeout(() => resolve(response), _browser.delay);
+ });
+ }
+ setTimeout(() => responseCallback(response), _browser.delay);
+ },
+ },
+ storage: {
+ local: {
+ get(items, responseCallback) {
+ const response = {};
+ if (!responseCallback) {
+ return new Promise((resolve) => {
+ setTimeout(() => resolve(response), _browser.delay);
+ });
+ }
+ setTimeout(() => responseCallback(response), _browser.delay);
+ },
+ set() {
+ return new Promise((resolve) => {
+ setTimeout(() => resolve(), _browser.delay);
+ });
+ },
+ remove: () =>
+ new Promise((resolve) => {
+ setTimeout(() => resolve(), _browser.delay);
+ }),
+ },
+ onChanged: {
+ addListener: () => undefined,
+ },
+ },
+};
+
+async function getRemoteFileContents(url) {
+ const result = {};
+ await fetch(url)
+ .then((response) => {
+ if (!response.ok) throw Error(response.statusText);
+ return response.text();
+ })
+ .then((text) => {
+ result.content = text;
+ })
+ .catch((error) => {
+ console.error(error);
+ result.error = "Remote url bad response!";
+ });
+ return result;
+}
+
+function saveFile(content, lastMod, newFilename, oldName) {
+ const ind = files.findIndex((f) => f.filename === oldName);
+ const s = {
+ content,
+ filename: newFilename,
+ lastModified: lastMod,
+ };
+ if (ind !== -1) {
+ // overwrite at index
+ files[ind] = s;
+ } else {
+ // add to beginning of array
+ files.unshift(s);
+ }
+}
+
+function random(array) {
+ return array[Math.floor(Math.random() * array.length)];
+}
+
+export const browser = _browser;
+
+export default {
+ browser: _browser,
+};
diff --git a/src/shared/dev/DEMO.Alert-URL.user.js b/src/ext/shared/dev/DEMO.Alert-URL.user.js
similarity index 83%
rename from src/shared/dev/DEMO.Alert-URL.user.js
rename to src/ext/shared/dev/DEMO.Alert-URL.user.js
index 97868afb..2b093394 100644
--- a/src/shared/dev/DEMO.Alert-URL.user.js
+++ b/src/ext/shared/dev/DEMO.Alert-URL.user.js
@@ -11,6 +11,6 @@
/* eslint-disable */
(function () {
- 'use strict';
- alert("DEBUG.Alert-URL:\n\n" + location);
-})();
\ No newline at end of file
+ "use strict";
+ alert("DEBUG.Alert-URL:\n\n" + location);
+})();
diff --git a/src/shared/img/icon-arrow-down.svg b/src/ext/shared/img/icon-arrow-down.svg
similarity index 100%
rename from src/shared/img/icon-arrow-down.svg
rename to src/ext/shared/img/icon-arrow-down.svg
diff --git a/src/shared/img/icon-arrow-left.svg b/src/ext/shared/img/icon-arrow-left.svg
similarity index 100%
rename from src/shared/img/icon-arrow-left.svg
rename to src/ext/shared/img/icon-arrow-left.svg
diff --git a/src/shared/img/icon-arrow-up.svg b/src/ext/shared/img/icon-arrow-up.svg
similarity index 100%
rename from src/shared/img/icon-arrow-up.svg
rename to src/ext/shared/img/icon-arrow-up.svg
diff --git a/src/shared/img/icon-check.svg b/src/ext/shared/img/icon-check.svg
similarity index 100%
rename from src/shared/img/icon-check.svg
rename to src/ext/shared/img/icon-check.svg
diff --git a/src/shared/img/icon-clear.svg b/src/ext/shared/img/icon-clear.svg
similarity index 100%
rename from src/shared/img/icon-clear.svg
rename to src/ext/shared/img/icon-clear.svg
diff --git a/src/shared/img/icon-close.svg b/src/ext/shared/img/icon-close.svg
similarity index 100%
rename from src/shared/img/icon-close.svg
rename to src/ext/shared/img/icon-close.svg
diff --git a/src/shared/img/icon-download.svg b/src/ext/shared/img/icon-download.svg
similarity index 100%
rename from src/shared/img/icon-download.svg
rename to src/ext/shared/img/icon-download.svg
diff --git a/src/shared/img/icon-edit.svg b/src/ext/shared/img/icon-edit.svg
similarity index 100%
rename from src/shared/img/icon-edit.svg
rename to src/ext/shared/img/icon-edit.svg
diff --git a/src/shared/img/icon-error.svg b/src/ext/shared/img/icon-error.svg
similarity index 100%
rename from src/shared/img/icon-error.svg
rename to src/ext/shared/img/icon-error.svg
diff --git a/src/shared/img/icon-info.svg b/src/ext/shared/img/icon-info.svg
similarity index 100%
rename from src/shared/img/icon-info.svg
rename to src/ext/shared/img/icon-info.svg
diff --git a/src/shared/img/icon-loader.svg b/src/ext/shared/img/icon-loader.svg
similarity index 100%
rename from src/shared/img/icon-loader.svg
rename to src/ext/shared/img/icon-loader.svg
diff --git a/src/shared/img/icon-loupe.svg b/src/ext/shared/img/icon-loupe.svg
similarity index 100%
rename from src/shared/img/icon-loupe.svg
rename to src/ext/shared/img/icon-loupe.svg
diff --git a/src/shared/img/icon-open.svg b/src/ext/shared/img/icon-open.svg
similarity index 100%
rename from src/shared/img/icon-open.svg
rename to src/ext/shared/img/icon-open.svg
diff --git a/src/shared/img/icon-plus.svg b/src/ext/shared/img/icon-plus.svg
similarity index 100%
rename from src/shared/img/icon-plus.svg
rename to src/ext/shared/img/icon-plus.svg
diff --git a/src/shared/img/icon-power.svg b/src/ext/shared/img/icon-power.svg
similarity index 100%
rename from src/shared/img/icon-power.svg
rename to src/ext/shared/img/icon-power.svg
diff --git a/src/shared/img/icon-refresh.svg b/src/ext/shared/img/icon-refresh.svg
similarity index 100%
rename from src/shared/img/icon-refresh.svg
rename to src/ext/shared/img/icon-refresh.svg
diff --git a/src/shared/img/icon-settings.svg b/src/ext/shared/img/icon-settings.svg
similarity index 100%
rename from src/shared/img/icon-settings.svg
rename to src/ext/shared/img/icon-settings.svg
diff --git a/src/shared/img/icon-sort.svg b/src/ext/shared/img/icon-sort.svg
similarity index 100%
rename from src/shared/img/icon-sort.svg
rename to src/ext/shared/img/icon-sort.svg
diff --git a/src/shared/img/icon-sync.svg b/src/ext/shared/img/icon-sync.svg
similarity index 100%
rename from src/shared/img/icon-sync.svg
rename to src/ext/shared/img/icon-sync.svg
diff --git a/src/shared/img/icon-trash.svg b/src/ext/shared/img/icon-trash.svg
similarity index 100%
rename from src/shared/img/icon-trash.svg
rename to src/ext/shared/img/icon-trash.svg
diff --git a/src/shared/img/icon-update.svg b/src/ext/shared/img/icon-update.svg
similarity index 100%
rename from src/shared/img/icon-update.svg
rename to src/ext/shared/img/icon-update.svg
diff --git a/src/shared/img/icon-warn.svg b/src/ext/shared/img/icon-warn.svg
similarity index 100%
rename from src/shared/img/icon-warn.svg
rename to src/ext/shared/img/icon-warn.svg
diff --git a/src/ext/shared/img/logo.svg b/src/ext/shared/img/logo.svg
new file mode 100644
index 00000000..9bf95127
--- /dev/null
+++ b/src/ext/shared/img/logo.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/ext/shared/native.js b/src/ext/shared/native.js
new file mode 100644
index 00000000..524f3613
--- /dev/null
+++ b/src/ext/shared/native.js
@@ -0,0 +1,28 @@
+/**
+ * @file exchange messages between `web extension` and `native application`
+ * @see {@link https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/Native_messaging}
+ * @see {@link https://developer.apple.com/documentation/safariservices/safari_web_extensions/messaging_between_the_app_and_javascript_in_a_safari_web_extension}
+ */
+
+/**
+ * @see {@link https://vitejs.dev/guide/env-and-mode.html}
+ * @returns {string}
+ */
+const application = () => import.meta.env.NATIVE_APP ?? "application";
+
+/**
+ * @see {@link https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/API/runtime/connectNative}
+ * @returns {object} A `runtime.Port` object
+ */
+export function connectNative() {
+ return browser.runtime.connectNative(application());
+}
+
+/**
+ * @see {@link https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/API/runtime/sendNativeMessage}
+ * @param {any} message
+ * @returns {Promise
+ Fetching resources,
+
+ {/if}
+The download should have started.
"; + a.textContent = o.filename; + document.body.append(a); + }; + // Safari currently unable to stably executeScript on tab loading status + try { + await browser.tabs.executeScript(tab.id, { + code: `(${exscript})(${JSON.stringify(exchange)});`, + }); + } catch { + const handleUpdated = async (tabId) => { + if (tabId !== tab.id) return; + try { + await browser.tabs.executeScript(tabId, { + code: `(${exscript})(${JSON.stringify(exchange)});`, + }); + console.info(`[${filename}] Download is starting...`); + } catch { + console.info(`[${filename}] Start download failed, retrying...`); + } + }; + browser.tabs.onUpdated.addListener(handleUpdated); + // Remove the listener when tab closing + const handleRemoved = (tabId) => { + if (tabId !== tab.id) return; + browser.tabs.onUpdated.removeListener(handleUpdated); + browser.tabs.onRemoved.removeListener(handleRemoved); + }; + browser.tabs.onRemoved.addListener(handleRemoved); + } +} diff --git a/src/ext/shared/variables.css b/src/ext/shared/variables.css new file mode 100644 index 00000000..0c641d23 --- /dev/null +++ b/src/ext/shared/variables.css @@ -0,0 +1,52 @@ +:root { + --border-radius: 0.188rem; + --box-shadow: 0 0.5rem 1rem 0 rgb(0 0 0 / 0.25); + --color-bg-primary: #323639; + --color-bg-secondary: #2f3337; + --color-script-highlighted: #364049; /* rgba(116, 178, 235, 0.1); */ + --color-black: #1d2023; + --color-blue: #74b1eb; + --color-green: #60f36c; + --color-grey: rgb(255 255 255 / 0.15); + --color-red: #ff453a; + --color-yellow: #e4f360; + --letter-spacing-large: -0.031rem; + --letter-spacing-default: -0.029rem; + --letter-spacing-medium: -0.018rem; + --letter-spacing-small: -0.008rem; + --opacity-disabled: 0.3; + --text-color-primary: rgb(255 255 255); + --text-color-secondary: rgb(255 255 255 / 0.65); + --text-color-disabled: rgb(255 255 255 / 0.4); + --font-family: system-ui, -apple-system, "Helvetica Neue", "Helvetica", + sans-serif; + --text-default: 1rem/1.5rem var(--font-family); + --text-large: 1.25rem/1.5rem var(--font-family); + --text-medium: 0.875rem/1.313rem var(--font-family); + --text-small: 0.719rem/1rem var(--font-family); + + /* editor variables */ + --editor-font: monaco, monospace; + --editor-font-size: 14px; + --editor-line-height: 24px; + --editor-invisible: rgb(255 255 255 / 0.15); + --editor-active-line: var(--color-bg-secondary); + --editor-selected-bg: rgb(116 178 235 / 0.35); + --editor-matched-highlight: rgb(116 178 235 / 0.2); + --editor-search-highlight: rgb(255 166 0 / 0.3); + --editor-number: #77e26a; + --editor-comment: rgb(255 255 255 / 0.35); + --editor-def: #efc371; + --editor-default: #cdcfd1; + --editor-keyword: #96c3ed; + --editor-atom: #59ebf5; + --editor-operator: #8c99a7; + --editor-property: #e86c8a; + --editor-string: #f5eea2; + --editor-string-2: #cdabff; + --editor-error: var(--color-red); + --editor-cursor: #e3e7eb; + --editor-matching-bracket-color: #fff; + --editor-matching-bracket-border: var(--editor-number); + --editor-non-matching-bracket: var(--editor-error); +} diff --git a/src/page/App.svelte b/src/page/App.svelte deleted file mode 100644 index 62e46a66..00000000 --- a/src/page/App.svelte +++ /dev/null @@ -1,133 +0,0 @@ - - -
- {@html logo}
- {#if $state.includes("init-error")}
- Failed to initialize app, check the browser console
- {:else}
- Initializing app...
- {/if}
-
-{/if}
-
-
--
- {#each $notifications as item (item.id)}
-
- {#if $state.includes("editor-loading") || $state.includes("fetching")}
-
-
-
diff --git a/src/page/Components/Editor/EditorSearch.svelte b/src/page/Components/Editor/EditorSearch.svelte
deleted file mode 100644
index ff1833cb..00000000
--- a/src/page/Components/Editor/EditorSearch.svelte
+++ /dev/null
@@ -1,199 +0,0 @@
-
-
-{#if active}
- No Item Selected
- {/if}
-
-
-
-
-
-
-
-
- {name}
-
-
-
- {#if $state.includes("saving")}
- Saving...
- {:else if $state.includes("trashing")}
- （◞‸◟）
- {:else if $state.includes("updating")}
- Updating code,
- {:else if remote}
- Code was remotely fetched, check carefully before saving!
- {:else if temp}
- Ready for code!
- {:else}
- Last modified: {lastModified}
- {/if}
-
-
-
-
-
-
- {rangesIndex}/{query ? ranges.length : "?"}
- next()}/>
- previous()}/>
-
-
-{/if}
-
-
diff --git a/src/page/Components/Notification.svelte b/src/page/Components/Notification.svelte
deleted file mode 100644
index c0f07e61..00000000
--- a/src/page/Components/Notification.svelte
+++ /dev/null
@@ -1,148 +0,0 @@
-
-
-
-
-{@html icon}
- {item.message}
-
-
-
-
-
-
diff --git a/src/page/Components/Sidebar/Sidebar.svelte b/src/page/Components/Sidebar/Sidebar.svelte
deleted file mode 100644
index 4504b4a1..00000000
--- a/src/page/Components/Sidebar/Sidebar.svelte
+++ /dev/null
@@ -1,260 +0,0 @@
-
-
-
-
-
diff --git a/src/page/Components/Sidebar/SidebarFilter.svelte b/src/page/Components/Sidebar/SidebarFilter.svelte
deleted file mode 100644
index 7854163a..00000000
--- a/src/page/Components/Sidebar/SidebarFilter.svelte
+++ /dev/null
@@ -1,120 +0,0 @@
-
-
- state.remove("settings")}>
-
-
-
-
-
- state.remove("settings")}/>
-
- Editor Settings
-
- update("autoCloseBrackets", !$settings.autoCloseBrackets)}
- />
-
- Auto Close Brackets
-
- update("autoHint", !$settings.autoHint)}
- />
-
- Auto Hint
-
- update("descriptions", !$settings.descriptions)}
- />
-
- Hide Descriptions
-
- update("lint", !$settings.lint)}
- />
-
- Javascript Linter
-
- update("showInvisibles", !$settings.showInvisibles)}
- />
-
- Show Invisibles
-
-
- Tab Size
-
-
-
-
-
- General Settings
-
- update("active", !$settings.active)}
- />
-
- Enable Injection
-
- update("showCount", !$settings.showCount)}
- />
-
- Show Toolbar Count
-
-
- Save Location
-
-
-
-
- Global exclude match patterns
- { #if blacklistSaving}{@html iconLoader}{/if}
-
-
-
-
- Information
-
- Userscripts Safari Version {$settings.version} ({$settings.build})
-
- You can review the documentation, report bugs and get more information about this extension by visiting
-
-
- If you enjoy using this extension, please consider
-
- on the App Store or
-
-
-
-
-
-
- -
- -
- -
- {#if query}
- query = ""} {disabled}/>
- {/if}
-
-
-
diff --git a/src/page/Components/Sidebar/SidebarItem.svelte b/src/page/Components/Sidebar/SidebarItem.svelte
deleted file mode 100644
index b7915c49..00000000
--- a/src/page/Components/Sidebar/SidebarItem.svelte
+++ /dev/null
@@ -1,102 +0,0 @@
-
-
-- -
- -
- -
-
-
-
diff --git a/src/page/app.css b/src/page/app.css
deleted file mode 100644
index 1ede8fc1..00000000
--- a/src/page/app.css
+++ /dev/null
@@ -1,50 +0,0 @@
-html {
- font-size: 100%;
- height: 100vh;
- overflow: hidden;
-}
-
-body {
- background-color: var(--color-bg-primary);
- color: var(--text-color-primary);
- font: var(--text-default);
- height: 100%;
- text-rendering: optimizelegibility;
- -webkit-font-smoothing: antialiased;
-}
-
-noscript {
- display: block;
-}
-
-#app {
- display: flex;
- flex-direction: column;
- height: 100%;
-}
-
-a,
-.link {
- background: none;
- color: var(--color-blue);
- cursor: pointer;
- text-decoration: underline;
-}
-
-.truncate {
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
-}
-
-button {
- border: none;
- cursor: pointer;
- padding: 0;
- user-select: none;
-}
-
-button:disabled {
- opacity: var(--opacity-disabled);
- pointer-events: none;
-}
diff --git a/src/page/cm.css b/src/page/cm.css
deleted file mode 100644
index 27b7210b..00000000
--- a/src/page/cm.css
+++ /dev/null
@@ -1,214 +0,0 @@
-.CodeMirror {
- background-color: transparent;
- color: var(--editor-default);
- font-family: var(--editor-font);
- font-size: var(--editor-font-size);
- font-weight: 400;
- height: 100%;
- line-height: var(--editor-line-height);
- text-rendering: unset;
- -webkit-font-smoothing: antialiased;
-}
-
-.CodeMirror-gutters {
- background-color: transparent;
- border-right: 0;
-}
-
-.CodeMirror-activeline-background,
-.CodeMirror-activeline-gutter {
- background-color: var(--editor-active-line);
-}
-
-.CodeMirror-linenumber {
- color: var(--text-color-primary);
- font-size: var(--editor-font-size);
- opacity: 0.25;
-}
-
-.CodeMirror-activeline .CodeMirror-linenumber {
- opacity: 0.5;
-}
-
-.CodeMirror-cursor {
- border-left: 2px solid var(--text-color-secondary); /* check */
-}
-
-.CodeMirror-hints {
- background-color: var(--color-black);
- border: 1px solid black;
- box-shadow: var(--box-shadow);
- font: var(--text-small);
- font-family: var(--editor-font);
- line-height: 1.5rem;
-}
-
-.CodeMirror-hint {
- color: var(--text-color-secondary);
-}
-
-li.CodeMirror-hint-active {
- background-color: var(--color-blue);
- color: var(--color-black);
-}
-
-.cm-s-default .CodeMirror-selected {
- background-color: var(--editor-selected-bg);
-}
-
-div.CodeMirror span.CodeMirror-matchingbracket {
- color: var(--editor-matching-bracket-color);
- border-bottom: 2px solid var(--editor-matching-bracket-border);
-}
-
-div.CodeMirror span.CodeMirror-nonmatchingbracket {
- color: var(--editor-non-matching-bracket);
-}
-
-.CodeMirror .CodeMirror-placeholder,
-.cm-s-default .cm-comment {
- color: var(--editor-comment);
-}
-
-.cm-s-default .cm-keyword {
- color: var(--editor-keyword);
-}
-
-.cm-s-default .cm-def {
- color: var(--editor-def);
-}
-
-.cm-s-default .cm-variable,
-.cm-s-default .cm-variable-2 {
- color: inherit;
-}
-
-.cm-s-default .cm-operator {
- color: var(--editor-operator);
-}
-
-.cm-s-default .cm-property {
- color: var(--editor-property);
-}
-
-.cm-s-default .cm-string {
- color: var(--editor-string);
-}
-
-.cm-s-default .cm-string-2 {
- color: var(--editor-string-2);
-}
-
-.cm-s-default .cm-number {
- color: var(--editor-number);
-}
-
-.cm-s-default .cm-atom {
- color: var(--editor-atom);
-}
-
-.cm-s-default .cm-error {
- color: var(--color-red);
-}
-
-.CodeMirror .cm-whitespace::before,
-.CodeMirror .CodeMirror-line > span::after,
-.CodeMirror .CodeMirror-code > div > pre > span::after {
- color: var(--editor-invisible);
-}
-
-.cm-s-default .cm-variable-3,
-.cm-s-default .cm-builtin,
-.cm-s-default .cm-qualifier,
-.cm-s-default .cm-tag {
- color: var(--editor-def);
-}
-
-.cm-s-default .cm-searching {
- background-color: var(--editor-search-highlight);
- padding: 3px 0;
-}
-
-.cm-s-default .cm-search-mark {
- border-bottom: 2px solid var(--editor-matching-bracket-border);
-}
-
-/*
-.cm-s-default .cm-matchhighlight {
- background-color: var(--editor-matched-highlight);
-}
-*/
-
-.CodeMirror-lint-markers {
- width: 8px;
-}
-
-.CodeMirror-lint-marker {
- border-radius: 50%;
- cursor: default;
- height: 0.375rem;
- left: 0.25rem;
- position: relative;
- width: 0.375rem;
-}
-
-.CodeMirror-lint-marker-error,
-.CodeMirror-lint-marker-warning {
- background: var(--color-yellow);
- top: -1px;
-}
-
-.CodeMirror-lint-marker-error {
- background-color: var(--editor-error);
-}
-
-.CodeMirror-lint-marker-multiple {
- background: var(--editor-def);
- left: 0;
- position: absolute;
- top: 0;
-}
-
-.CodeMirror-lint-mark-warning {
- background: none;
- border-bottom: 2px solid var(--color-yellow);
-}
-
-.CodeMirror-lint-mark-error {
- background: none;
- border-bottom: 2px solid var(--editor-error);
-}
-
-.CodeMirror-lint-tooltip {
- background-color: var(--color-black);
- border: 1px solid black;
- border-radius: var(--border-radius);
- box-shadow: var(--box-shadow);
- color: var(--text-color-secondary);
- font: var(--text-small);
- padding: 0.5rem;
- transition: opacity 200ms;
-}
-
-.CodeMirror-lint-message-error,
-.CodeMirror-lint-message-warning {
- background: none;
- padding-left: 1rem;
- position: relative;
-}
-
-.CodeMirror-lint-message-error::before,
-.CodeMirror-lint-message-warning::before {
- background-color: var(--color-yellow);
- border-radius: 50%;
- content: "";
- height: 0.5rem;
- left: 0;
- position: absolute;
- top: 0.25rem;
- width: 0.5rem;
-}
-
-.CodeMirror-lint-message-error::before {
- background-color: var(--editor-error);
-}
diff --git a/src/page/main.js b/src/page/main.js
deleted file mode 100644
index 66ad9d11..00000000
--- a/src/page/main.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import "./app.css";
-import "../shared/reset.css";
-import "../shared/variables.css";
-import App from "./App.svelte";
-import "./cm.css";
-
-if (import.meta.env.DEV) { // vite feat that only import in dev mode
- const modules = import.meta.glob("../shared/dev.js", {eager: true});
- window.browser = modules["../shared/dev.js"].browser;
- console.info("DEV-ENV", import.meta.env, modules, browser);
-}
-
-const app = new App({
- target: document.getElementById("app")
-});
-
-export default app;
diff --git a/src/page/store.js b/src/page/store.js
deleted file mode 100644
index 4b607bba..00000000
--- a/src/page/store.js
+++ /dev/null
@@ -1,133 +0,0 @@
-import {writable} from "svelte/store";
-import {uniqueId} from "../shared/utils.js";
-// eslint-disable-next-line import/no-namespace
-import * as settingsStorage from "../shared/settings.js";
-
-function notificationStore() {
- const {subscribe, update} = writable([]);
- const add = item => {
- update(a => {
- a.push(item);
- return a;
- });
- };
- const remove = id => update(a => a.filter(b => b.id !== id));
- return {subscribe, add, remove};
-}
-export const notifications = notificationStore();
-
-function logStore() {
- const {subscribe, set, update} = writable([]);
- const add = (message, type, notify) => {
- const item = {id: uniqueId(), message, time: Date.now(), type};
- if (notify || type === "error") notifications.add(item); // always notify on error
- update(a => {
- a.push(item);
- return a;
- });
- };
- const remove = id => update(a => a.filter(b => b.id !== id));
- const reset = () => set([]);
- return {subscribe, add, remove, reset};
-}
-export const log = logStore();
-
-function stateStore() {
- const {subscribe, update} = writable(["init"]);
- // store oldState to see how state transitioned
- // ex. if (newState === foo && oldState === bar) baz();
- let oldState = [];
- const add = stateModifier => update(state => {
- // list of acceptable states, mostly for state definition tracking
- const states = [
- "init", // the uninitialized app state (start screen)
- "init-error", // unique error when initialization fails, shows error on load screen
- "settings", // when the settings modal is shown
- "items-loading", // when the sidebar items are loading
- "saving", // when a file in the editor is being saved
- "fetching", // when a new remote file has been added and it being fetched
- "trashing", // when deleting the file in the editor
- "updating" // when the file in the editor is being updating
- ];
- // disallow adding undefined states
- if (!states.includes(stateModifier)) return console.error("invalid state");
- // save pre-changed state to oldState var
- oldState = [...state];
- // if current state modifier not present, add it to state array
- if (!state.includes(stateModifier)) state.push(stateModifier);
- // ready state only when no other states present, remove it if present
- if (state.includes("ready")) state.splice(state.indexOf("ready"), 1);
- log.add(`App state updated to: ${state} from: ${oldState}`, "info", false);
- return state;
- });
- const remove = stateModifier => update(state => {
- // save pre-changed state to oldState var
- oldState = [...state];
- // if current state modifier present, remove it from state array
- if (state.includes(stateModifier)) state.splice(state.indexOf(stateModifier), 1);
- // if no other states, push ready state
- if (state.length === 0) state.push("ready");
- log.add(`App state updated to: ${state} from: ${oldState}`, "info", false);
- return state;
- });
- const getOldState = () => oldState;
- return {subscribe, add, getOldState, remove};
-}
-export const state = stateStore();
-
-function settingsStore() {
- const {subscribe, update, set} = writable({});
- const init = async initData => {
- // import legacy settings data just one-time
- await settingsStorage.legacyImport();
- // for compatibility with legacy getting names only
- // once all new name is used, use settingsStorage.get()
- const settings = await settingsStorage.legacyGet();
- console.info("store.js settingsStore init", initData, settings);
- set({...initData, ...settings});
- // sync popup, backgound, etc... settings changes
- settingsStorage.onChanged((s, area) => {
- console.info(`store.js storage.${area}.onChanged`, s);
- update(obj => Object.assign(obj, s));
- });
- };
- const reset = async keys => {
- await settingsStorage.reset(keys);
- // once all new name is used, use settingsStorage.get()
- const settings = await settingsStorage.legacyGet();
- console.info("store.js settingsStore reset", settings);
- update(obj => Object.assign(obj, settings));
- };
-
- const updateSingleSettingOld = (key, value) => {
- // blacklist not stored in normal setting object in manifest, so handle differently
- if (key === "blacklist") {
- // update blacklist on swift side
- const message = {name: "PAGE_UPDATE_BLACKLIST", blacklist: value};
- browser.runtime.sendNativeMessage(message, response => {
- if (response.error) {
- log.add("Failed to save blacklist to disk", "error", true);
- }
- });
- }
- if (key === "active") {
- browser.runtime.sendNativeMessage({name: "TOGGLE_EXTENSION", active: String(value)});
- }
- };
- const updateSingleSetting = (key, value) => {
- // update(settings => (settings[key] = value, settings));
- update(settings => {
- settings[key] = value;
- return settings;
- });
- // for compatibility with legacy setting names only
- // once all new name is used, use settingsStorage.set()
- settingsStorage.legacySet({[key]: value}); // Durable Storage
- // temporarily keep the old storage method until it is confirmed that all dependencies are removed
- updateSingleSettingOld(key, value);
- };
- return {subscribe, set, init, reset, updateSingleSetting};
-}
-export const settings = settingsStore();
-
-export const items = writable([]);
diff --git a/src/popup/App.svelte b/src/popup/App.svelte
deleted file mode 100644
index 52cb2cb8..00000000
--- a/src/popup/App.svelte
+++ /dev/null
@@ -1,740 +0,0 @@
-
-
-
-
-
- {#if description}
- {data.name}
-
- {description}
-
- {/if}
-
- showUpdates = true}
- title={"Show updates"}
- {disabled}
- />
-
-{#if !active}
-
-{/if}
-{#if showInstallPrompt}
-
- Userscript
- {#if scriptChecking}
- {showInstallPrompt}
- {:else}
- {scriptInstalled ? "Installed" : "Detected"}:
-
- {/if}
-
-{/if}
-{#if errorNotification}
-
- {errorNotification}
- errorNotification = undefined}
- title={"Clear error"}
- />
-
-{/if}
-
- {#if loading}
-
-{#if !inactive && platform === "macos"}
-
-{/if}
-{#if showUpdates}
- Popup inactive on extension page
- {:else if firstGuide}
-
- Welcome, first please:
-
-
- {:else if initError}
-
- Something went wrong:
-
-
- {:else if items.length < 1}
- No matched userscripts
- {:else}
-
- {#each list as item, i (item.filename)}
- toggleItem(item)}
- />
- {/each}
-
- {/if}
- {/if}
-
-
-
-
-
diff --git a/src/popup/Components/View.svelte b/src/popup/Components/View.svelte
deleted file mode 100644
index 71115f7b..00000000
--- a/src/popup/Components/View.svelte
+++ /dev/null
@@ -1,80 +0,0 @@
-
-
-{name}
- {#if subframe}SUB
{/if}
-
-
-
-
diff --git a/src/popup/Components/Views/AllItemsView.svelte b/src/popup/Components/Views/AllItemsView.svelte
deleted file mode 100644
index a5a59553..00000000
--- a/src/popup/Components/Views/AllItemsView.svelte
+++ /dev/null
@@ -1,58 +0,0 @@
-
-
-{#if allItems.length}
-
- {headerTitle}
-
-
- {#if loading && showLoaderOnDisabled}
-
-Slot content is required...
- {#each list as item (item.filename)}
- allItemsToggleItem(item)}
- />
- {/each}
-
-{:else}
- No valid files found in directory
-{/if}
-
-
diff --git a/src/popup/Components/Views/InstallView.svelte b/src/popup/Components/Views/InstallView.svelte
deleted file mode 100644
index 9d9cd3fe..00000000
--- a/src/popup/Components/Views/InstallView.svelte
+++ /dev/null
@@ -1,180 +0,0 @@
-
-
-
- {#if installError}
-
-
-
diff --git a/src/popup/Components/Views/UpdateView.svelte b/src/popup/Components/Views/UpdateView.svelte
deleted file mode 100644
index fd121c84..00000000
--- a/src/popup/Components/Views/UpdateView.svelte
+++ /dev/null
@@ -1,88 +0,0 @@
-
-
-{#if updates.length}
- {#each updates as item (item.name)}
-
-
- {@html iconError}
-
- {:else if userscript}
- Couldn't install userscript
- {installError}
--
-
- {userscript.name} - {#if userscript.description} -
- {userscript.description} - {/if} - {#if userscript.match} -
-
- @match- {#each userscript.match as match} -{match}- {/each} -
- {/if}
- {#if userscript.include}
-
-
- @include- {#each userscript.include as include} -{include}- {/each} -
- {/if}
- {#if userscript.require}
-
-
- @require- {#each userscript.require as require} -{require}- {/each} -
- {/if}
- {#if userscript.grant}
-
-
- @grant- {#each userscript.grant as grant} -{grant}- {/each} -
- {/if}
-
-
-
-
- {/if}
-Be sure you trust the author before installing. Nefarious code can exploit your security and privacy.
-
-
- {/each}
- {item.name}
-
- Source
-
-
- Be sure you trust the author before saving remote code to your device.
- -{:else} -
- {@html iconUpdate}
-
-{/if}
-
-
diff --git a/src/popup/app.css b/src/popup/app.css
deleted file mode 100644
index 8bbc54fe..00000000
--- a/src/popup/app.css
+++ /dev/null
@@ -1,86 +0,0 @@
-html {
- font-size: 100%;
- overflow: hidden;
-}
-
-body {
- background-color: var(--color-bg-secondary);
- color: var(--text-color-primary);
- font: var(--text-medium);
- letter-spacing: var(--letter-spacing-medium);
- position: relative;
- text-rendering: optimizelegibility;
- width: 18rem;
- -webkit-font-smoothing: antialiased;
-}
-
-/* attempts to detect iOS */
-@media (hover: none) {
- html {
- font-size: 125%;
- }
-
- body {
- width: 100vw;
- }
-}
-
-@media screen and (width >= 481px) and (orientation: portrait) and (hover: none) {
- body {
- width: 18rem;
- }
-}
-
-@media screen and (width >= 1024px) and (orientation: landscape) and (hover: none) {
- body {
- width: 18rem;
- }
-}
-
-body.ipados {
- width: 18rem;
- height: 100vh;
-}
-
-body.ipados #app {
- height: 100%;
-}
-
-body.ios {
- height: 100vh;
- width: 100vw;
-}
-
-body.ios #app {
- height: 100%;
-}
-
-noscript {
- display: block;
-}
-
-button {
- border: none;
- cursor: pointer;
- padding: 0;
- user-select: none;
-}
-
-button:disabled {
- opacity: var(--opacity-disabled);
- pointer-events: none;
-}
-
-a,
-.link {
- background: none;
- color: var(--color-blue);
- cursor: pointer;
- text-decoration: underline;
-}
-
-.truncate {
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
-}
diff --git a/src/popup/main.js b/src/popup/main.js
deleted file mode 100644
index 03752163..00000000
--- a/src/popup/main.js
+++ /dev/null
@@ -1,39 +0,0 @@
-import "./app.css";
-import "../shared/reset.css";
-import "../shared/variables.css";
-import App from "./App.svelte";
-
-if (import.meta.env.DEV) { // vite feat that only import in dev mode
- const modules = import.meta.glob("../shared/dev.js", {eager: true});
- window.browser = modules["../shared/dev.js"].browser;
- console.info("DEV-ENV", import.meta.env, modules, browser);
- // macos popup simulation
- const style = document.createElement("style");
- style.textContent = `
-body {
- top: 20px;
- left: 20px;
- box-sizing: content-box;
- border: 2px solid #0c0e0f;
- border-radius: 10px;
- box-shadow: 2px 2px 20px rgba(0, 0, 0, 0.2);
-}
-body:before {
- content: "";
- position: absolute;
- top: -1px;
- left: -1px;
- right: -1px;
- bottom: -1px;
- border: 1px solid #54575a;
- border-radius: 9px;
-}
-`;
- browser.platform === "macos" && document.head.append(style);
-}
-
-const app = new App({
- target: document.getElementById("app")
-});
-
-export default app;
diff --git a/src/shared/Components/Dropdown.svelte b/src/shared/Components/Dropdown.svelte
deleted file mode 100644
index 6e7b5c75..00000000
--- a/src/shared/Components/Dropdown.svelte
+++ /dev/null
@@ -1,115 +0,0 @@
-
-
-
- There are no file updates available
-
- -
- - -
-
-
-
diff --git a/src/shared/Components/IconButton.svelte b/src/shared/Components/IconButton.svelte
deleted file mode 100644
index 40197ace..00000000
--- a/src/shared/Components/IconButton.svelte
+++ /dev/null
@@ -1,64 +0,0 @@
-
-
-
-
-
diff --git a/src/shared/Components/Loader.svelte b/src/shared/Components/Loader.svelte
deleted file mode 100644
index 3e1d5f0d..00000000
--- a/src/shared/Components/Loader.svelte
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
--
-
- At least one slot is required... -
- {@html iconLoader}
- {#if abort}
-
-
-
diff --git a/src/shared/Components/Tag.svelte b/src/shared/Components/Tag.svelte
deleted file mode 100644
index 13e80cf2..00000000
--- a/src/shared/Components/Tag.svelte
+++ /dev/null
@@ -1,55 +0,0 @@
-
-
-
-
-
diff --git a/src/shared/Components/Toggle.svelte b/src/shared/Components/Toggle.svelte
deleted file mode 100644
index 72a43a6b..00000000
--- a/src/shared/Components/Toggle.svelte
+++ /dev/null
@@ -1,72 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/src/shared/dev.js b/src/shared/dev.js
deleted file mode 100644
index 03ab9296..00000000
--- a/src/shared/dev.js
+++ /dev/null
@@ -1,471 +0,0 @@
-import {parse, uniqueId, wait} from "./utils";
-
-/**
- *
- * @param {("css"|"js")} type
- * @param {boolean?} updates
- * @param {boolean?} longName
- * @returns
- */
-function generateFile(type, updates = false, longName = false, request = false) {
- let canUpdate = updates;
- const uid = uniqueId();
- let name = request ? `${uid}-request-${type}` : `${uid}-example-${type}`;
- if (longName) name = `${uid}${uid}${uid}-example-${type}`;
- const randomDate = +(new Date() - Math.floor(Math.random() * 10000000000));
- let content = "// ==UserScript=="
- + `\n// @name ${name}`
- + `\n// @description Custom description for userscript with name "${name}"`
- + "\n// @match *://*.*"
- + "\n// @exclude-match https://github.com/quoid/userscripts"
- + "\n// @version 1.0"
- + "\n// @noframes"
- + "\n// ==/UserScript=="
- + `\n\nconsole.log("I am ${name}");`;
- if (type === "css") {
- content = content.replace("// ==UserScript==", "/* ==UserStyle==");
- content = content.replace("// ==/UserScript==", "==/UserStyle== */");
- content = content.replaceAll("// @", "@");
- content = content.replace(
- `console.log("I am ${name}");`,
- "#id,\n.class\n.pseudo-element::after {\n color: red\n}"
- );
- canUpdate = false;
- }
- if (request) {
- content = content.replace("// @noframes", "// @noframes\n// @run-at request");
- }
- if (canUpdate) {
- content = content.replace(
- "1.0",
- "1.0\n// @updateURL https://www.k21p.com/example.user.js"
- );
- content = content.replace(
- `console.log("I am ${name}");`,
- `console.log("I am ${name} and you can update me!");`
- );
- }
- return {
- content,
- filename: `${name}.${type}`,
- lastModified: randomDate,
- name,
- request,
- type
- };
-}
-
-const files = [
- generateFile("js", true, true),
- generateFile("css"),
- generateFile("js", false, false, true),
- ...Array.from({length: 7}, () => generateFile("js"))
-];
-
-const _browser = {
- delay: 200,
- platform: "macos", // ios || macos
- runtime: {
- getURL() {
- return "https://www.example.com/";
- },
- async sendMessage(message, responseCallback) {
- const name = message.name;
- console.info(`Got message: ${name}`);
- let response = {};
- if (name === "REFRESH_SESSION_RULES") {
- response = {success: true};
- }
- if (!responseCallback) {
- return new Promise(resolve => {
- setTimeout(() => resolve(response), _browser.delay);
- });
- }
- setTimeout(() => responseCallback(response), _browser.delay);
- },
- async sendNativeMessage(message, responseCallback) {
- const name = message.name;
- console.info(`Got message: ${name}`);
- let response = {};
- if (name === "PAGE_INIT_DATA") {
- response = {
- saveLocation: "/Users/someone/Library/Directory",
- version: "5.0.0",
- build: "55"
- };
- } else if (name === "PAGE_LEGACY_IMPORT") {
- response = {
- active: "true",
- autoCloseBrackets: "true",
- autoHint: "true",
- blacklist: [],
- descriptions: "true",
- languageCode: "en",
- lint: "true",
- log: "false",
- showCount: "true",
- showInvisibles: "true",
- sortOrder: "lastModifiedDesc",
- tabSize: "4"
- };
- } else if (name === "PAGE_ALL_FILES") {
- response = [];
- files.forEach(file => {
- const content = file.content;
- const parsed = parse(content);
- const metadata = parsed.metadata;
- const canUpdate = !!(metadata.version && metadata.updateURL);
- const scriptData = {
- canUpdate,
- content,
- description: metadata.description ? metadata.description[0] : "",
- disabled: false,
- filename: file.filename,
- lastModified: file.lastModified,
- metadata,
- name: metadata.name[0],
- request: file.request,
- // type: file.filename.substring(file.filename.lastIndexOf(".") + 1)
- type: file.type
- };
- response.push(scriptData);
- });
- } else if (name === "TOGGLE_ITEM") {
- response = {success: true};
- // response = {error: true};
- } else if (name === "PAGE_UPDATE_SETTINGS") {
- response = {success: true};
- } else if (name === "PAGE_UPDATE_BLACKLIST") {
- response = {success: true};
- } else if (name === "PAGE_NEW_REMOTE") {
- const result = await getRemoteFileContents(message.url);
- response = result;
- } else if (name === "PAGE_SAVE") {
- const newContent = message.content;
- const oldFilename = message.item.filename;
- const parsed = parse(newContent);
- const lastModified = Date.now();
- let canUpdate = false;
- // script failed to parse
- if (!parsed) {
- return {error: "save failed, file has invalid metadata"};
- }
- const metaName = parsed.metadata.name[0];
- const newFilename = `${metaName}.${message.item.type}`;
- // filename length too long
- if (newFilename.length > 255) {
- return {error: "save failed, filename too long!"};
- }
-
- // check if file can be remotely updated
- if (parsed.metadata.version && parsed.metadata.updateURL) {
- canUpdate = true;
- }
-
- const success = {
- canUpdate,
- content: newContent,
- filename: newFilename,
- lastModified,
- name
- };
-
- // add description if in file metadata
- if (parsed.metadata.description) {
- // const foo = parsed.metadata;
- success.description = parsed.metadata.description[0];
- }
- // check if declarative network request
- if (
- parsed.metadata["run-at"]
- && parsed.metadata["run-at"][0] === "request"
- ) {
- success.request = true;
- }
- // overwriting
- if (newFilename.toLowerCase() === oldFilename.toLowerCase()) {
- saveFile(newContent, lastModified, newFilename, oldFilename);
- return success;
- }
-
- // not overwriting, check if filename for that type is taken
- if (files.find(a => a.filename.toLowerCase() === newFilename.toLowerCase())) {
- return {error: "save failed, name already taken!"};
- }
-
- // not overwriting but all validation passed
- saveFile(newContent, lastModified, newFilename, oldFilename);
- return success;
- } else if (name === "PAGE_UPDATE") {
- const url = parse(message.content).metadata.updateURL;
- await wait(500);
- const result = await getRemoteFileContents(url);
- response = result;
- // response.error = "Something went wrong!";
- // response.info = "No updates found";
- } else if (name === "TOGGLE_EXTENSION") {
- // response = {error: "Failed toggle extension"};
- response = {success: true};
- } else if (name === "POPUP_UPDATE_ALL" || name === "POPUP_UPDATE_SINGLE") {
- // response = {error: "Failed refresh scripts"};
- response = {
- items: [
- {
- name: "Google Images Restored",
- filename: "Google Images Restored.js",
- disabled: false,
- type: "js"
- },
- {
- name: "Wikipedia Mobile Redirect",
- filename: "Wikipedia Mobile Redirect.js",
- disabled: true,
- type: "js"
- },
- {
- name: "A Special Userscript",
- filename: "A Special Userscript.js",
- disabled: false,
- type: "js"
- },
- {
- name: "CSS Adblock",
- filename: "CSS Adblock.css",
- disabled: false,
- type: "css"
- },
- {
- name: "New Userscript With a Really Really Long Name",
- filename: "New Userscript With a Really Really Long Name.css",
- disabled: true,
- type: "css"
- },
- {
- name: "Subframe Script Managerial Staffing Company",
- filename: "Subframe Script.js",
- disabled: false,
- subframe: true,
- type: "css"
- }
- ],
- updates: []
- };
- } else if (name === "POPUP_CHECK_UPDATES") {
- response = {
- updates: [
- {
- filename: "Google Images Restored.js",
- name: "Google Images Restored",
- url: "https://www.k21p.com"
- },
- {
- filename: "New Userscript With a Really Really Long Name.js",
- name: "New Userscript With a Really Really Long Name",
- url: "https://www.filmgarb.com"
- }
- ]
- };
- } else if (name === "POPUP_MATCHES") {
- response = {
- matches: [
- ...files,
- {
- name: "Subframe Script Managerial Staffing Company",
- filename: "Subframe Script.js",
- disabled: false,
- subframe: true,
- type: "js"
- }
- ]
- };
- } else if (name === "POPUP_UPDATES") {
- response = {
- updates: [
- {
- filename: "Google Images Restored.js",
- name: "Google Images Restored",
- url: "https://www.k21p.com"
- },
- {
- filename: "New Userscript With a Really Really Long Name.js",
- name: "New Userscript With a Really Really Long Name",
- url: "https://www.filmgarb.com"
- }
- ]
- };
- response.updates = [];
- } else if (name === "REQ_PLATFORM") {
- response = {platform: _browser.platform};
- } else if (name === "POPUP_OPEN_EXTENSION_PAGE") {
- response = {error: "Failed to get page url"};
- window.open("https://github.com/quoid/userscripts");
- } else if (name === "OPEN_SAVE_LOCATION") {
- if (_browser.platform === "macos") {
- response = {success: true};
- } else {
- response = {
- items: [
- {
- name: "Google Images Restored",
- filename: "Google Images Restored.js",
- disabled: false,
- type: "js",
- metadata: []
- },
- {
- name: "Subframe Script Managerial Staffing Company",
- filename: "Subframe Script.js",
- disabled: false,
- type: "css",
- metadata: []
- },
- {
- name: "Another Script from Managerial Staffing Company",
- filename: "Cool Script.js",
- disabled: false,
- type: "js",
- metadata: []
- }
- ]
- };
- }
- } else if (name === "POPUP_INSTALL_CHECK") {
- response = random([
- {success: "Click to install", installed: false},
- {success: "Click to re-install", installed: true}
- ]);
- response.metadata = {
- description: "This userscript re-implements the \"View Image\" and \"Search by image\" buttons into google images.",
- grant: ["GM.getValue", "GM.setValue", "GM.xmlHttpRequest"],
- match: ["https://www.example.com/*", "https://www.example.com/somethingReallylong/goesRightHere"],
- name: "Test Install Userscript",
- require: ["https://code.jquery.com/jquery-3.5.1.min.js", "https://code.jquery.com/jquery-1.7.1.min.js"],
- source: "https://greasyforx.org/scripts/00000-something-something-long-name/code/Something%20something%20long20name.user.js"
- };
- // response.error = "something went wrong (dev)";
- }
- if (!responseCallback) {
- return new Promise(resolve => {
- setTimeout(() => resolve(response), _browser.delay);
- });
- }
- setTimeout(() => responseCallback(response), _browser.delay);
- },
- connectNative: () => ({
- onMessage: {
- addListener: () => console.info("connectNative - addListener")
- }
- })
- },
- tabs: {
- getCurrent(/* responseCallback */) {
- const response = random([
- {url: "https://www.filmgarb.com/foo.user.js", id: 101},
- {url: `${window.location.origin}/src/shared/dev/DEMO.Alert-URL.user.js`, id: 102},
- {url: `${window.location.origin}/src/shared/dev/DEMO.Alert-URL.user.js`, id: 103}, // increase probability
- {url: window.location.href, id: 10}
- ]);
- console.info("browser.tabs.getCurrent", response);
- return new Promise(resolve => {
- setTimeout(() => resolve(response), _browser.delay);
- });
- },
- query(message, responseCallback) {
- const response = [{url: "https://www.filmgarb.com/foo.user.js", id: 101}];
- if (!responseCallback) {
- return new Promise(resolve => {
- setTimeout(() => resolve(response), _browser.delay);
- });
- }
- setTimeout(() => responseCallback(response), _browser.delay);
- },
- sendMessage(tabId, message, responseCallback) {
- let response = {};
- if (message.name === "DEMO_MSG") {
- response = {};
- // response.error = "something went wrong (dev)";
- }
- if (!responseCallback) {
- return new Promise(resolve => {
- setTimeout(() => resolve(response), _browser.delay);
- });
- }
- setTimeout(() => responseCallback(response), _browser.delay);
- }
- },
- webNavigation: {
- getAllFrames(message, responseCallback) {
- const response = [];
- if (!responseCallback) {
- return new Promise(resolve => {
- setTimeout(() => resolve(response), _browser.delay);
- });
- }
- setTimeout(() => responseCallback(response), _browser.delay);
- }
- },
- storage: {
- local: {
- get(items, responseCallback) {
- const response = {};
- if (!responseCallback) {
- return new Promise(resolve => {
- setTimeout(() => resolve(response), _browser.delay);
- });
- }
- setTimeout(() => responseCallback(response), _browser.delay);
- },
- set() {
- return new Promise(resolve => {
- setTimeout(() => resolve(), _browser.delay);
- });
- },
- remove: () => new Promise(resolve => {
- setTimeout(() => resolve(), _browser.delay);
- }),
- onChanged: {
- addListener: () => undefined
- }
- }
- }
-};
-
-async function getRemoteFileContents(url) {
- const result = {};
- await fetch(url).then(response => {
- if (!response.ok) throw Error(response.statusText);
- return response.text();
- }).then(text => {
- result.content = text;
- }).catch(error => {
- console.error(error);
- result.error = "Remote url bad response!";
- });
- return result;
-}
-
-function saveFile(content, lastMod, newFilename, oldName) {
- const ind = files.findIndex(f => f.filename === oldName);
- const s = {
- content,
- filename: newFilename,
- lastModified: lastMod
- };
- if (ind !== -1) {
- // overwrite at index
- files[ind] = s;
- } else {
- // add to beginning of array
- files.unshift(s);
- }
-}
-
-function random(array) {
- return array[Math.floor(Math.random() * array.length)];
-}
-
-export const browser = _browser;
-
-export default {
- browser: _browser
-};
diff --git a/src/shared/settings.js b/src/shared/settings.js
deleted file mode 100644
index 059870b6..00000000
--- a/src/shared/settings.js
+++ /dev/null
@@ -1,695 +0,0 @@
-// wrap a relatively independent settings storage with its own functions
-
-const storagePrefix = "US_";
-const storageKey = key => storagePrefix + key.toUpperCase();
-// const storageRef = async area => { // dynamic storage reference
-// browser.storage.sync.area = "sync";
-// browser.storage.local.area = "local";
-// if (area === "sync") return browser.storage.sync;
-// if (area === "local") return browser.storage.local;
-// const key = storageKey("settings_sync");
-// const result = await browser.storage.local.get(key);
-// if (result?.[key] === true) {
-// return browser.storage.sync;
-// } else {
-// return browser.storage.local;
-// }
-// };
-
-// https://developer.apple.com/documentation/safariservices/safari_web_extensions/assessing_your_safari_web_extension_s_browser_compatibility#3584139
-// since storage sync is not implemented in Safari, currently only returns using local storage
-const storageRef = async () => {
- browser.storage.local.area = "local";
- return browser.storage.local;
-};
-
-const settingDefault = deepFreeze({
- name: "setting_default",
- type: undefined,
- local: false,
- values: [],
- default: undefined,
- protect: false,
- confirm: false,
- platforms: ["macos", "ipados", "ios"],
- langLabel: {},
- langTitle: {},
- group: "",
- legacy: "",
- nodeType: "",
- nodeClass: {}
-});
-
-export const settingsDefine = deepFreeze([
- {
- name: "error_native",
- type: "object",
- local: true,
- default: {error: undefined},
- platforms: ["macos", "ipados", "ios"],
- group: "Internal"
- },
- {
- name: "legacy_imported",
- type: "number",
- local: true,
- default: 0,
- protect: true,
- platforms: ["macos"],
- group: "Internal"
- },
- {
- name: "language_code",
- type: "string",
- default: "en",
- platforms: ["macos", "ipados", "ios"],
- group: "Internal",
- legacy: "languageCode"
- },
- {
- name: "scripts_settings",
- type: "object",
- default: {},
- platforms: ["macos", "ipados", "ios"],
- langLabel: {
- en: "Scripts update check active",
- zh_hans: "脚本更新检查激活"
- },
- langTitle: {
- en: "Whether to enable each single script update check",
- zh_hans: "是否开启单个脚本更新检查"
- },
- group: "Internal",
- nodeType: "Subpage"
- },
- // {
- // name: "settings_sync",
- // type: "boolean",
- // local: true,
- // default: false,
- // protect: true,
- // platforms: ["macos", "ipados", "ios"],
- // langLabel: {
- // en: "Sync settings",
- // zh_hans: "同步设置"
- // },
- // langTitle: {
- // en: "Sync settings across devices",
- // zh_hans: "跨设备同步设置"
- // },
- // group: "General",
- // nodeType: "Toggle"
- // },
- {
- name: "toolbar_badge_count",
- type: "boolean",
- default: true,
- platforms: ["macos", "ipados"],
- langLabel: {
- en: "Show Toolbar Count",
- zh_hans: "工具栏图标显示计数徽章"
- },
- langTitle: {
- en: "displays a badge on the toolbar icon with a number that represents how many enabled scripts match the url for the page you are on",
- zh_hans: "简体中文描述"
- },
- group: "General",
- legacy: "showCount",
- nodeType: "Toggle"
- },
- {
- name: "global_active",
- type: "boolean",
- local: true,
- default: true,
- platforms: ["macos"],
- langLabel: {
- en: "Enable Injection",
- zh_hans: "启用注入"
- },
- langTitle: {
- en: "toggle on/off script injection for the pages you visit",
- zh_hans: "简体中文描述"
- },
- group: "General",
- legacy: "active",
- nodeType: "Toggle",
- nodeClass: {red: false}
- },
- {
- name: "global_scripts_update_check",
- type: "boolean",
- default: true,
- platforms: ["macos", "ipados", "ios"],
- langLabel: {
- en: "Global scripts update check",
- zh_hans: "全局脚本更新检查"
- },
- langTitle: {
- en: "Whether to enable global periodic script update check",
- zh_hans: "是否开启全局定期脚本更新检查"
- },
- group: "General",
- nodeType: "Toggle"
- },
- {
- name: "scripts_update_check_interval",
- type: "number",
- default: 86400000,
- platforms: ["macos", "ipados", "ios"],
- langLabel: {
- en: "Scripts update check interval",
- zh_hans: "脚本更新检查间隔"
- },
- langTitle: {
- en: "The interval for script update check in background",
- zh_hans: "脚本更新检查的间隔时间"
- },
- group: "General",
- nodeType: "Toggle"
- },
- {
- name: "scripts_update_check_lasttime",
- type: "number",
- default: 0,
- platforms: ["macos", "ipados", "ios"],
- langLabel: {
- en: "Scripts update check lasttime",
- zh_hans: "脚本更新上次检查时间"
- },
- langTitle: {
- en: "The lasttime for script update check in background",
- zh_hans: "后台脚本更新上次检查时间"
- },
- group: "Internal"
- },
- {
- name: "scripts_auto_update",
- type: "boolean",
- default: false,
- confirm: true,
- platforms: ["macos", "ipados", "ios"],
- langLabel: {
- en: "Scripts silent auto update",
- zh_hans: "脚本后台静默自动更新"
- },
- langTitle: {
- en: "Script silently auto-updates in the background, which is dangerous and may introduce unconfirmed malicious code",
- zh_hans: "脚本在后台静默自动更新，这是危险的，可能引入未经确认的恶意代码"
- },
- group: "General",
- nodeType: "Toggle",
- nodeClass: {warn: true}
- },
- {
- name: "global_exclude_match",
- type: "object",
- default: [],
- platforms: ["macos", "ipados", "ios"],
- langLabel: {
- en: "Global exclude match patterns",
- zh_hans: "全局排除匹配模式列表"
- },
- langTitle: {
- en: "this input accepts a comma separated list of @match patterns, a page url that matches against a pattern in this list will be ignored for script injection",
- zh_hans: "简体中文描述"
- },
- group: "General",
- legacy: "blacklist",
- nodeType: "textarea",
- nodeClass: {red: "blacklistError"}
- },
- {
- name: "editor_close_brackets",
- type: "boolean",
- default: true,
- platforms: ["macos"],
- langLabel: {
- en: "Auto Close Brackets",
- zh_hans: "自动关闭括号"
- },
- langTitle: {
- en: "toggles on/off auto closing of brackets in the editor, this affects the following characters: () [] {} \"\" ''",
- zh_hans: "简体中文描述"
- },
- group: "Editor",
- legacy: "autoCloseBrackets",
- nodeType: "Toggle"
- },
- {
- name: "editor_auto_hint",
- type: "boolean",
- default: true,
- platforms: ["macos"],
- langLabel: {
- en: "Auto Hint",
- zh_hans: "自动提示(Hint)"
- },
- langTitle: {
- en: "automatically shows completion hints while editing",
- zh_hans: "简体中文描述"
- },
- group: "Editor",
- legacy: "autoHint",
- nodeType: "Toggle"
- },
- {
- name: "editor_list_sort",
- type: "string",
- values: ["nameAsc", "nameDesc", "lastModifiedAsc", "lastModifiedDesc"],
- default: "lastModifiedDesc",
- platforms: ["macos"],
- langLabel: {
- en: "Sort order",
- zh_hans: "排序顺序"
- },
- langTitle: {
- en: "Display order of items in sidebar",
- zh_hans: "侧栏中项目的显示顺序"
- },
- group: "Editor",
- legacy: "sortOrder",
- nodeType: "Dropdown"
- },
- {
- name: "editor_list_descriptions",
- type: "boolean",
- default: true,
- platforms: ["macos"],
- langLabel: {
- en: "Show List Descriptions",
- zh_hans: "显示列表项目描述"
- },
- langTitle: {
- en: "show or hides the item descriptions in the sidebar",
- zh_hans: "简体中文描述"
- },
- group: "Editor",
- legacy: "descriptions",
- nodeType: "Toggle"
- },
- {
- name: "editor_javascript_lint",
- type: "boolean",
- default: false,
- platforms: ["macos"],
- langLabel: {
- en: "Javascript Linter",
- zh_hans: "Javascript Linter"
- },
- langTitle: {
- en: "toggles basic Javascript linting within the editor",
- zh_hans: "简体中文描述"
- },
- group: "Editor",
- legacy: "lint",
- nodeType: "Toggle"
- },
- {
- name: "editor_show_whitespace",
- type: "boolean",
- default: true,
- platforms: ["macos"],
- langLabel: {
- en: "Show whitespace characters",
- zh_hans: "显示空白字符"
- },
- langTitle: {
- en: "toggles the display of invisible characters in the editor",
- zh_hans: "简体中文描述"
- },
- group: "Editor",
- legacy: "showInvisibles",
- nodeType: "Toggle"
- },
- {
- name: "editor_tab_size",
- type: "number",
- values: [2, 4],
- default: 4,
- platforms: ["macos"],
- langLabel: {
- en: "Tab Size",
- zh_hans: "制表符大小"
- },
- langTitle: {
- en: "the number of spaces a tab is equal to while editing",
- zh_hans: "简体中文描述"
- },
- group: "Editor",
- legacy: "tabSize",
- nodeType: "select"
- }
-].reduce(settingsDefineReduceCallback, {}));
-
-// populate the settingsDefine with settingDefault
-// and convert settingsDefine to storageKey object
-function settingsDefineReduceCallback(settings, setting) {
- setting.key = storageKey(setting.name);
- settings[setting.key] = {...settingDefault, ...setting};
- return settings;
-}
-
-// prevent settings define from being modified in any case
-// otherwise user settings may be lost in the worst case
-function deepFreeze(object) {
- for (const p in object) {
- if (typeof object[p] == "object") {
- deepFreeze(object[p]);
- }
- }
- return Object.freeze(object);
-}
-
-// @todo remove this polyfill when browser limitation is set above 15.4
-// compatibility polyfill for Safari < 15.4
-if (Object.hasOwn === undefined) {
- Object.hasOwn = (obj, prop) => Object.prototype.hasOwnProperty.call(obj, prop);
-}
-
-// export and define the operation method of settings storage
-// they are similar to browser.storage but slightly different
-
-export async function get(keys, area) {
- if (![undefined, "local", "sync"].includes(area)) {
- return console.error("Unexpected storage area:", area);
- }
- // validate setting value and fix surprises to default
- const valueFix = (key, val) => {
- if (!key || !Object.hasOwn(settingsDefine, key)) return;
- const def = settingsDefine[key].default;
- // check if value type conforms to settingsDefine
- const type = settingsDefine[key].type;
- // eslint-disable-next-line valid-typeof -- type known to be valid string literal
- if (typeof val != type) {
- console.warn(`Unexpected ${key} value type '${typeof val}' should '${type}', fix to default`);
- return def;
- }
- // check if value conforms to settingsDefine
- const values = settingsDefine[key].values;
- if (values.length && !values.includes(val)) {
- console.warn(`Unexpected ${key} value '${val}' should one of '${values}', fix to default`);
- return def;
- }
- // verified, pass original value
- return val;
- };
- if (typeof keys == "string") { // [single setting]
- const key = storageKey(keys);
- // check if key exist in settingsDefine
- if (!Object.hasOwn(settingsDefine, key)) {
- return console.error("unexpected settings key:", key);
- }
- // check if only locally stored setting
- // eslint-disable-next-line no-param-reassign -- change the area is expected
- settingsDefine[key].local === true && (area = "local");
- const storage = await storageRef(area);
- const result = await storage.get(key);
- if (Object.hasOwn(result, key)) return valueFix(key, result[key]);
- return settingsDefine[key].default;
- }
- const complexGet = async (settingsDefault, areaKeys) => {
- const storage = await storageRef(area);
- let local = {}, sync = {};
- if (storage.area === "sync") {
- if (areaKeys.sync.length) {
- sync = await storage.get(areaKeys.sync);
- }
- if (areaKeys.local.length) {
- const storageLocal = await storageRef("local");
- local = await storageLocal.get(areaKeys.local);
- }
- } else {
- local = await storage.get(areaKeys.all);
- }
- const result = Object.assign(settingsDefault, local, sync);
- // revert settings object property name
- return Object.entries(result).reduce((p, c) => {
- p[settingsDefine[c[0]].name] = valueFix(...c);
- return p;
- }, {});
- };
- if (Array.isArray(keys)) { // [muilt settings]
- if (!keys.length) {
- return console.error("Settings keys empty:", keys);
- }
- const settingsDefault = {};
- const areaKeys = {local: [], sync: [], all: []};
- for (const k of keys) {
- const key = storageKey(k);
- // check if key exist in settingsDefine
- if (!Object.hasOwn(settingsDefine, key)) {
- return console.error("unexpected settings key:", key);
- }
- settingsDefault[key] = settingsDefine[key].default;
- // detach only locally stored settings
- settingsDefine[key].local === true
- ? areaKeys.local.push(key)
- : areaKeys.sync.push(key);
- // record all keys in case sync storage is not enabled
- areaKeys.all.push(key);
- }
- return complexGet(settingsDefault, areaKeys);
- }
- if (typeof keys == "undefined" || keys === null) { // [all settings]
- const settingsDefault = {};
- const areaKeys = {local: [], sync: [], all: []};
- for (const key of Object.keys(settingsDefine)) {
- settingsDefault[key] = settingsDefine[key].default;
- // detach only locally stored settings
- settingsDefine[key].local === true
- ? areaKeys.local.push(key)
- : areaKeys.sync.push(key);
- // record all keys in case sync storage is not enabled
- areaKeys.all.push(key);
- }
- return complexGet(settingsDefault, areaKeys);
- }
- return console.error("Unexpected keys type:", keys);
-}
-
-export async function set(keys, area) {
- if (![undefined, "local", "sync"].includes(area)) {
- return console.error("unexpected storage area:", area);
- }
- if (typeof keys != "object") {
- return console.error("Unexpected keys type:", keys);
- }
- if (!Object.keys(keys).length) {
- return console.error("Settings object empty:", keys);
- }
- const areaKeys = {local: {}, sync: {}, all: {}};
- for (const k of Object.keys(keys)) {
- const key = storageKey(k);
- // check if key exist in settingsDefine
- if (!Object.hasOwn(settingsDefine, key)) {
- return console.error("Unexpected settings keys:", key);
- }
- // check if value type conforms to settingsDefine
- const type = settingsDefine[key].type;
- // eslint-disable-next-line valid-typeof -- type known to be valid string literal
- if (typeof keys[k] != type) {
- if (type === "number" && !Number.isNaN(Number(keys[k]))) { // compatible with string numbers
- keys[k] = Number(keys[k]); // still store it as a number type
- } else {
- return console.error(`Unexpected ${k} value type '${typeof keys[k]}' should '${type}'`);
- }
- }
- // check if value conforms to settingsDefine
- const values = settingsDefine[key].values;
- if (values.length && !values.includes(keys[k])) {
- return console.error(`Unexpected ${k} value '${keys[k]}' should one of '${values}'`);
- }
- // detach only locally stored settings
- settingsDefine[key].local === true
- ? areaKeys.local[key] = keys[k]
- : areaKeys.sync[key] = keys[k];
- // record all keys in case sync storage is not enabled
- areaKeys.all[key] = keys[k];
- }
- const storage = await storageRef(area);
- // complexSet
- try {
- if (storage.area === "sync") {
- if (Object.keys(areaKeys.sync).length) {
- await storage.set(areaKeys.sync);
- }
- if (Object.keys(areaKeys.local).length) {
- const storageLocal = await storageRef("local");
- await storageLocal.set(areaKeys.local);
- }
- } else {
- await storage.set(areaKeys.all);
- }
- return true;
- } catch (error) {
- return console.error(error);
- }
-}
-
-export async function reset(keys, area) { // reset to default
- if (![undefined, "local", "sync"].includes(area)) {
- return console.error("unexpected storage area:", area);
- }
- if (typeof keys == "string") { // [single setting]
- const key = storageKey(keys);
- // check if key exist in settingsDefine
- if (!Object.hasOwn(settingsDefine, key)) {
- return console.error("unexpected settings key:", key);
- }
- // check if key is protected
- if (settingsDefine[key].protect === true) {
- return console.error("protected settings key:", key);
- }
- // eslint-disable-next-line no-param-reassign -- change the area is expected
- settingsDefine[key].local === true && (area = "local");
- const storage = await storageRef(area);
- return storage.remove(key);
- }
- const complexRemove = async areaKeys => {
- const storage = await storageRef(area);
- try {
- if (storage.area === "sync") {
- if (areaKeys.sync.length) {
- await storage.remove(areaKeys.sync);
- }
- if (areaKeys.local.length) {
- const storageLocal = await storageRef("local");
- await storageLocal.remove(areaKeys.local);
- }
- } else {
- await storage.remove(areaKeys.all);
- }
- return true;
- } catch (error) {
- return console.error(error);
- }
- };
- if (Array.isArray(keys)) { // [muilt settings]
- if (!keys.length) {
- return console.error("Settings keys empty:", keys);
- }
- const areaKeys = {local: [], sync: [], all: []};
- for (const k of keys) {
- const key = storageKey(k);
- // check if key exist in settingsDefine
- if (!Object.hasOwn(settingsDefine, key)) {
- return console.error("unexpected settings key:", key);
- }
- // check if key is protected
- if (settingsDefine[key].protect === true) {
- return console.error("protected settings key:", key);
- }
- // detach only locally stored settings
- settingsDefine[key].local === true
- ? areaKeys.local.push(key)
- : areaKeys.sync.push(key);
- // record all keys in case sync storage is not enabled
- areaKeys.all.push(key);
- }
- return complexRemove(areaKeys);
- }
- if (typeof keys == "undefined" || keys === null) { // [all settings]
- const areaKeys = {local: [], sync: [], all: []};
- for (const key in settingsDefine) {
- // skip protected keys
- if (settingsDefine[key].protect === true) continue;
- // detach only locally stored settings
- settingsDefine[key].local === true
- ? areaKeys.local.push(key)
- : areaKeys.sync.push(key);
- // record all keys in case sync storage is not enabled
- areaKeys.all.push(key);
- }
- return complexRemove(areaKeys);
- }
- return console.error("Unexpected keys type:", keys);
-}
-
-// this function is convenient for the svelte store to update the state
-export function onChanged(callback) { // complex onChanged
- if (typeof callback != "function") {
- return console.error("Unexpected callback:", callback);
- }
- console.info("storage onChanged addListener");
- const handle = (changes, area) => {
- // console.log(`storage.${area}.onChanged`, changes);
- try {
- const settings = {};
- for (const key in changes) {
- if (!Object.hasOwn(settingsDefine, key)) continue;
- settings[settingsDefine[key].name] = changes[key].newValue;
- }
- callback(settings, area);
- } catch (error) {
- console.error("onChanged callback:", error);
- }
- };
- // comment for now same reason as `storageRef` function
- // browser.storage.sync.onChanged.addListener(c => handle(c, "sync"));
- browser.storage.local.onChanged.addListener(c => handle(c, "local"));
-}
-
-// the following functions are used only for compatibility transition periods
-// these functions will be removed in the future, perhaps in version 5.0
-
-export async function legacyGet(keys) {
- const result = await get(keys);
- // console.log("legacy_get", keys, result);
- for (const key of Object.keys(result)) {
- const legacy = settingsDefine[storageKey(key)]?.legacy;
- if (legacy) result[legacy] = result[key];
- }
- return result;
-}
-
-export async function legacySet(keys) {
- if (typeof keys != "object") {
- return console.error("Unexpected arg type:", keys);
- }
- if (!Object.keys(keys).length) {
- return console.error("Settings object empty:", keys);
- }
- const settings = {};
- for (const key of Object.keys(settingsDefine)) {
- const setting = settingsDefine[key];
- if (!setting.legacy) continue;
- if (setting.legacy in keys) {
- settings[setting.name] = keys[setting.legacy];
- }
- }
- // console.log("legacy_set", keys, settings);
- return set(settings);
-}
-
-export async function legacyImport() {
- // if legacy data has already been imported, skip this process
- const imported = await get("legacy_imported");
- if (imported) return console.info("Legacy settings has already imported");
- // start the one-time import process
- const result = await browser.runtime.sendNativeMessage({name: "PAGE_LEGACY_IMPORT"});
- if (result.error) return console.error(result.error);
- console.info("Import settings data from legacy manifest file");
- const settings = {};
- for (const key of Object.keys(settingsDefine)) {
- const legacy = settingsDefine[key].legacy;
- if (legacy in result) {
- let value = result[legacy];
- switch (settingsDefine[key].type) {
- case "boolean": value = JSON.parse(value); break;
- case "number": value = Number(value); break;
- }
- console.info(`Importing legacy setting: ${legacy}`, value);
- settings[settingsDefine[key].name] = value;
- }
- }
- // import complete tag, to ensure will only be import once
- Object.assign(settings, {legacy_imported: Date.now()});
- if (await set(settings, "local")) {
- console.info("Import legacy settings complete");
- // send a message to the Swift layer to safely clean up legacy data
- // browser.runtime.sendNativeMessage({name: "PAGE_LEGACY_IMPORTED"});
- return true;
- }
- return console.error("Import legacy settings abort");
-}
diff --git a/src/shared/utils.js b/src/shared/utils.js
deleted file mode 100644
index 46e7661c..00000000
--- a/src/shared/utils.js
+++ /dev/null
@@ -1,244 +0,0 @@
-/**
- * @param {number} ms millisecond timestamp
- * @returns {string}
- */
-export function formatDate(ms) {
- const d = new Date(ms);
- const yr = new Intl.DateTimeFormat("en", {year: "numeric"}).format(d);
- const mo = new Intl.DateTimeFormat("en", {month: "short"}).format(d);
- const dd = new Intl.DateTimeFormat("en", {day: "2-digit"}).format(d);
- const hr = d.getHours();
- const mn = d.getMinutes();
- return `${mo} ${dd}, ${yr} at ${hr}:${mn}`;
-}
-
-export function uniqueId() {
- return Math.random().toString(36).substring(2, 10);
-}
-
-/**
- * awaitable function for waiting an arbitrary amount of time
- * @param {number} ms the amount of time to wait in milliseconds
- * @returns {Promise
- Fetching resources,
-
- {/if}
-The download should have started.
"; - a.textContent = o.filename; - document.body.append(a); - }; - // Safari currently unable to stably executeScript on tab loading status - try { - await browser.tabs.executeScript(tab.id, { - code: `(${exscript})(${JSON.stringify(exchange)});` - }); - } catch { - const handleUpdated = async tabId => { - if (tabId !== tab.id) return; - try { - await browser.tabs.executeScript(tabId, { - code: `(${exscript})(${JSON.stringify(exchange)});` - }); - console.info(`[${filename}] Download is starting...`); - } catch { - console.info(`[${filename}] Start download failed, retrying...`); - } - }; - browser.tabs.onUpdated.addListener(handleUpdated); - // Remove the listener when tab closing - const handleRemoved = tabId => { - if (tabId !== tab.id) return; - browser.tabs.onUpdated.removeListener(handleUpdated); - browser.tabs.onRemoved.removeListener(handleRemoved); - }; - browser.tabs.onRemoved.addListener(handleRemoved); - } -} diff --git a/src/shared/variables.css b/src/shared/variables.css deleted file mode 100644 index acdc671d..00000000 --- a/src/shared/variables.css +++ /dev/null @@ -1,51 +0,0 @@ -:root { - --border-radius: 0.188rem; - --box-shadow: 0 0.5rem 1rem 0 rgb(0 0 0 / 0.25); - --color-bg-primary: #323639; - --color-bg-secondary: #2f3337; - --color-script-highlighted: #364049; /* rgba(116, 178, 235, 0.1); */ - --color-black: #1d2023; - --color-blue: #74b1eb; - --color-green: #60f36c; - --color-grey: rgb(255 255 255 / 0.15); - --color-red: #ff453a; - --color-yellow: #e4f360; - --letter-spacing-large: -0.031rem; - --letter-spacing-default: -0.029rem; - --letter-spacing-medium: -0.018rem; - --letter-spacing-small: -0.008rem; - --opacity-disabled: 0.3; - --text-color-primary: rgb(255 255 255); - --text-color-secondary: rgb(255 255 255 / 0.65); - --text-color-disabled: rgb(255 255 255 / 0.4); - --font-family: system-ui, -apple-system, "Helvetica Neue", "Helvetica", sans-serif; - --text-default: 1rem/1.5rem var(--font-family); - --text-large: 1.25rem/1.5rem var(--font-family); - --text-medium: 0.875rem/1.313rem var(--font-family); - --text-small: 0.719rem/1rem var(--font-family); - - /* editor variables */ - --editor-font: monaco, monospace; - --editor-font-size: 14px; - --editor-line-height: 24px; - --editor-invisible: rgb(255 255 255 / 0.15); - --editor-active-line: var(--color-bg-secondary); - --editor-selected-bg: rgb(116 178 235 / 0.35); - --editor-matched-highlight: rgb(116 178 235 / 0.2); - --editor-search-highlight: rgb(255 166 0 / 0.3); - --editor-number: #77e26a; - --editor-comment: rgb(255 255 255 / 0.35); - --editor-def: #efc371; - --editor-default: #cdcfd1; - --editor-keyword: #96c3ed; - --editor-atom: #59ebf5; - --editor-operator: #8c99a7; - --editor-property: #e86c8a; - --editor-string: #f5eea2; - --editor-string-2: #cdabff; - --editor-error: var(--color-red); - --editor-cursor: #e3e7eb; - --editor-matching-bracket-color: #fff; - --editor-matching-bracket-border: var(--editor-number); - --editor-non-matching-bracket: var(--editor-error); -} diff --git a/vite.config.js b/vite.config.js index 044b986d..f7cf2b45 100644 --- a/vite.config.js +++ b/vite.config.js @@ -1,44 +1,25 @@ -import {resolve} from "path"; -import {defineConfig} from "vite"; -import {svelte} from "@sveltejs/vite-plugin-svelte"; +import { defineConfig } from "vite"; +import { svelte } from "@sveltejs/vite-plugin-svelte"; -// [inline-svg] -// TODO: remove this once vite resolved issue -// https://github.com/vitejs/vite/issues/1204 -// import fs from "fs"; -// import svgpkg from "svg-inline-loader"; -// export function svgInline() { // custom plugin -// return { -// name: "transform-file", -// transform(code, id) { -// if (id.endsWith(".svg")) { -// const svg = fs.readFileSync(id, "utf8"); -// const ret = svgpkg.getExtractedSVG(svg, {}); -// return `export default '${ret}'`; -// } -// } -// }; -// } -// [inline-svg] -// NOW: use `?raw` suffix import svg assets as inline -// https://vitejs.dev/guide/assets.html#importing-asset-as-string +/** + * About `inline-svg` + * use `?raw` suffix import svg assets as inline + * @see {@link https://vitejs.dev/guide/assets.html#importing-asset-as-string} + * Ignore lint errors `{@html}`, since these are deterministic local svg resources, + * there is no risk of Cross-Site Scripting (XSS) attacks and can be safely disabled. + * @see {@link https://sveltejs.github.io/eslint-plugin-svelte/rules/no-at-html-tags/} + */ -// [autoprefixer] -// https://vitejs.dev/guide/features.html#postcss -// have config with `.postcssrc.json` file -// about `missing peer postcss` error, ignore it +/** + * About `autoprefixer` + * have config with `.postcssrc.json` file + * @see {@link https://vitejs.dev/guide/features.html#postcss} + * about `missing peer postcss` error, ignore it + */ -// https://vitejs.dev/config/ +/** @see {@link https://vitejs.dev/config/} */ export default defineConfig({ - plugins: [svelte()], - base: "./", - build: { - outDir: "xcode/Safari-Extension/Resources/dist/", - rollupOptions: { - input: { - page: resolve(__dirname, "entry-page.html"), - popup: resolve(__dirname, "entry-popup.html") - } - } - } + publicDir: "public/ext/vendor/", + plugins: [svelte()], + base: "./", }); diff --git a/xcode/Mac-App/App.entitlements b/xcode/App-Mac/App.entitlements similarity index 100% rename from xcode/Mac-App/App.entitlements rename to xcode/App-Mac/App.entitlements diff --git a/xcode/App-Mac/AppDelegate.swift b/xcode/App-Mac/AppDelegate.swift new file mode 100644 index 00000000..ffdf0758 --- /dev/null +++ b/xcode/App-Mac/AppDelegate.swift @@ -0,0 +1,70 @@ +import Cocoa + +@NSApplicationMain +class AppDelegate: NSObject, NSApplicationDelegate { + + private var window: NSWindow! + private var windowForego = false + private var windowLoaded = false + + @IBOutlet weak var enbaleNativeLogger: NSMenuItem! + + func application(_ application: NSApplication, open urls: [URL]) { + // if open panel is already open, stop processing the URL scheme + if NSApplication.shared.keyWindow?.accessibilityIdentifier() == "open-panel" { return } + for url in urls { + if url.host == "changesavelocation" { + // avoid opening the panel repeatedly and playing unnecessary warning sounds + if NSApplication.shared.keyWindow?.identifier?.rawValue == "changeSaveLocation" { continue } + if windowLoaded { + let viewController = window.contentViewController as? ViewController + viewController?.changeSaveLocation(nil) + } else { + windowForego = true + schemeChangeSaveLocation() + } + } + } + } + + func applicationDidFinishLaunching(_ aNotification: Notification) { + // Initialize menu items + enbaleNativeLogger.state = Preferences.enableLogger ? .on : .off + if windowForego { return } + let storyboard = NSStoryboard(name: "View", bundle: Bundle.main) + let windowController = storyboard.instantiateInitialController() as! NSWindowController +// let viewController = windowController.contentViewController as! ViewController + window = windowController.window + window.setIsVisible(true) + windowLoaded = true + } + + func applicationShouldHandleReopen(_ sender: NSApplication, hasVisibleWindows flag: Bool) -> Bool { + return true + } + + func applicationWillTerminate(_ aNotification: Notification) { + // Insert code here to tear down your application + } + + func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool { + return true + } + + @IBAction func enableLogger(_ sender: NSMenuItem) { + if sender.state == .on { + Preferences.enableLogger = false + sender.state = .off + } else { + Preferences.enableLogger = true + sender.state = .on + } + } + + @IBAction func applicationHelp(_ sender: NSMenuItem) { + if let url = URL(string: "https://github.com/quoid/userscripts") { + NSWorkspace.shared.open(url) + } + } + +} diff --git a/xcode/Mac-App/Assets.xcassets/AppIcon.appiconset/1024.png b/xcode/App-Mac/Assets.xcassets/AppIcon.appiconset/1024.png similarity index 100% rename from xcode/Mac-App/Assets.xcassets/AppIcon.appiconset/1024.png rename to xcode/App-Mac/Assets.xcassets/AppIcon.appiconset/1024.png diff --git a/xcode/Mac-App/Assets.xcassets/AppIcon.appiconset/128.png b/xcode/App-Mac/Assets.xcassets/AppIcon.appiconset/128.png similarity index 100% rename from xcode/Mac-App/Assets.xcassets/AppIcon.appiconset/128.png rename to xcode/App-Mac/Assets.xcassets/AppIcon.appiconset/128.png diff --git a/xcode/Mac-App/Assets.xcassets/AppIcon.appiconset/16.png b/xcode/App-Mac/Assets.xcassets/AppIcon.appiconset/16.png similarity index 100% rename from xcode/Mac-App/Assets.xcassets/AppIcon.appiconset/16.png rename to xcode/App-Mac/Assets.xcassets/AppIcon.appiconset/16.png diff --git a/xcode/Mac-App/Assets.xcassets/AppIcon.appiconset/256.png b/xcode/App-Mac/Assets.xcassets/AppIcon.appiconset/256-1.png similarity index 100% rename from xcode/Mac-App/Assets.xcassets/AppIcon.appiconset/256.png rename to xcode/App-Mac/Assets.xcassets/AppIcon.appiconset/256-1.png diff --git a/xcode/iOS-App/Resources/Icon.png b/xcode/App-Mac/Assets.xcassets/AppIcon.appiconset/256.png similarity index 100% rename from xcode/iOS-App/Resources/Icon.png rename to xcode/App-Mac/Assets.xcassets/AppIcon.appiconset/256.png diff --git a/xcode/Mac-App/Assets.xcassets/AppIcon.appiconset/32-1.png b/xcode/App-Mac/Assets.xcassets/AppIcon.appiconset/32-1.png similarity index 100% rename from xcode/Mac-App/Assets.xcassets/AppIcon.appiconset/32-1.png rename to xcode/App-Mac/Assets.xcassets/AppIcon.appiconset/32-1.png diff --git a/xcode/Mac-App/Assets.xcassets/AppIcon.appiconset/32.png b/xcode/App-Mac/Assets.xcassets/AppIcon.appiconset/32.png similarity index 100% rename from xcode/Mac-App/Assets.xcassets/AppIcon.appiconset/32.png rename to xcode/App-Mac/Assets.xcassets/AppIcon.appiconset/32.png diff --git a/xcode/Mac-App/Assets.xcassets/AppIcon.appiconset/512-1.png b/xcode/App-Mac/Assets.xcassets/AppIcon.appiconset/512-1.png similarity index 100% rename from xcode/Mac-App/Assets.xcassets/AppIcon.appiconset/512-1.png rename to xcode/App-Mac/Assets.xcassets/AppIcon.appiconset/512-1.png diff --git a/xcode/Mac-App/Assets.xcassets/AppIcon.appiconset/512.png b/xcode/App-Mac/Assets.xcassets/AppIcon.appiconset/512.png similarity index 100% rename from xcode/Mac-App/Assets.xcassets/AppIcon.appiconset/512.png rename to xcode/App-Mac/Assets.xcassets/AppIcon.appiconset/512.png diff --git a/xcode/Mac-App/Assets.xcassets/AppIcon.appiconset/64.png b/xcode/App-Mac/Assets.xcassets/AppIcon.appiconset/64.png similarity index 100% rename from xcode/Mac-App/Assets.xcassets/AppIcon.appiconset/64.png rename to xcode/App-Mac/Assets.xcassets/AppIcon.appiconset/64.png diff --git a/xcode/Mac-App/Assets.xcassets/AppIcon.appiconset/Contents.json b/xcode/App-Mac/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from xcode/Mac-App/Assets.xcassets/AppIcon.appiconset/Contents.json rename to xcode/App-Mac/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/xcode/Mac-App/Assets.xcassets/Contents.json b/xcode/App-Mac/Assets.xcassets/Contents.json similarity index 100% rename from xcode/Mac-App/Assets.xcassets/Contents.json rename to xcode/App-Mac/Assets.xcassets/Contents.json diff --git a/xcode/Mac-App/Base.lproj/Main.storyboard b/xcode/App-Mac/Base.lproj/Main.storyboard similarity index 57% rename from xcode/Mac-App/Base.lproj/Main.storyboard rename to xcode/App-Mac/Base.lproj/Main.storyboard index ed7ecf33..859f7dde 100644 --- a/xcode/Mac-App/Base.lproj/Main.storyboard +++ b/xcode/App-Mac/Base.lproj/Main.storyboard @@ -1,8 +1,8 @@ -
v0.1 (0)
You can turn on the Userscripts iOS Safari extension in Settings. Read the docs.
CURRENT DIRECTORY:
init