fix types

.github/workflows/docker.yml

@@ -1,20 +1,6 @@
-name: Docker
-
-# This workflow uses actions that are not certified by GitHub.
-# They are provided by a third-party and are governed by
-# separate terms of service, privacy policy, and support
-# documentation.
-
 on:
   push:
-    # Publish semver tags as releases.
-    tags: [ '*.*.*' ]
-
-env:
-  # Use docker.io for Docker Hub if empty
-  REGISTRY: ghcr.io
-  # github.repository as <account>/<repo>
-  IMAGE_NAME: ${{ github.repository }}
+    tags: [ '*' ]
 
 
 jobs:
@@ -52,70 +38,4 @@ jobs:
         with:
           make_latest: true
           body_path: changelog.txt
-          files: '*.tgz'
-
-      - name: Compile Worker
-        run: npx selflare compile
-
-      - name: Generate Dockerfile
-        run: npx selflare docker
-
-      # Install the cosign tool except on PR
-      # https://github.com/sigstore/cosign-installer
-      - name: Install cosign
-        if: github.event_name != 'pull_request'
-        uses: sigstore/cosign-installer@59acb6260d9c0ba8f4a2f9d9b48431a222b68e20 #v3.5.0
-        with:
-          cosign-release: 'v2.2.4'
-
-      # Set up BuildKit Docker container builder to be able to build
-      # multi-platform images and export cache
-      # https://github.com/docker/setup-buildx-action
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@f95db51fddba0c2d1ec667646a06c2ce06100226 # v3.0.0
-
-      # Login against a Docker registry except on PR
-      # https://github.com/docker/login-action
-      - name: Log into registry ${{ env.REGISTRY }}
-        if: github.event_name != 'pull_request'
-        uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3.0.0
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      # Extract metadata (tags, labels) for Docker
-      # https://github.com/docker/metadata-action
-      - name: Extract Docker metadata
-        id: meta
-        uses: docker/metadata-action@96383f45573cb7f253c731d3b3ab81c87ef81934 # v5.0.0
-        with:
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-
-      # Build and push Docker image with Buildx (don't push on PR)
-      # https://github.com/docker/build-push-action
-      - name: Build and push Docker image
-        id: build-and-push
-        uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 # v5.0.0
-        with:
-          context: .
-          push: ${{ github.event_name != 'pull_request' }}
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-
-      # Sign the resulting Docker image digest except on PRs.
-      # This will only write to the public Rekor transparency log when the Docker
-      # repository is public to avoid leaking data.  If you would like to publish
-      # transparency data even for private images, pass --force to cosign below.
-      # https://github.com/sigstore/cosign
-      - name: Sign the published Docker image
-        if: ${{ github.event_name != 'pull_request' }}
-        env:
-          # https://docs.github.com/en/actions/security-guides/security-hardening-for-github-actions#using-an-intermediate-environment-variable
-          TAGS: ${{ steps.meta.outputs.tags }}
-          DIGEST: ${{ steps.build-and-push.outputs.digest }}
-        # This step uses the identity token to provision an ephemeral certificate
-        # against the sigstore community Fulcio instance.
-        run: echo "${TAGS}" | xargs -I {} cosign sign --yes {}@${DIGEST}
+          files: '*.tgz'

static_src/SugoiAuthProvider.ts

@@ -1,5 +1,20 @@
 import * as TwitchAuth from "./TwitchAuth.ts";
-import { AccessTokenMaybeWithUserId, AuthProvider, AccessToken, AccessTokenWithUserId } from "@twurple/auth";
+import { AccessTokenMaybeWithUserId, AuthProvider, AccessTokenWithUserId } from "@twurple/auth";
+
+/**
+ * A type that represents a user and contains a user ID.
+ */
+interface UserIdResolvableType {
+    /**
+     * The ID of the user.
+     */
+    id: string;
+}
+
+/**
+ * A user ID or a user or channel object.
+ */
+type UserIdResolvable = string | number | UserIdResolvableType;
 
 type Token = TwitchAuth.TwitchToken & AccessTokenMaybeWithUserId
 
@@ -59,7 +74,7 @@ export default class SugoiAuthProvider implements AuthProvider {
         this.#token = null
     }
 
-    async getAccessTokenForUser(user: string | number, ...scopeSets: string[][]) {
+    async getAccessTokenForUser(user: UserIdResolvable, ...scopeSets: string[][]) {
         if ((!scopeSets[0]) && (this.#token)) {
             return this.#token as AccessTokenWithUserId
         }
@@ -72,18 +87,18 @@ export default class SugoiAuthProvider implements AuthProvider {
         return this.#token as AccessTokenWithUserId
     }
 
-    async getAnyAccessToken(user: string | number) {
+    async getAnyAccessToken(user: UserIdResolvable) {
         return this.#token || TwitchAuth.getAppToken(this.clientId).then(getTwurpleProxy)
     }
 
-    getCurrentScopesForUser(user: string | number) {
+    getCurrentScopesForUser(user: UserIdResolvable) {
         if (!this.#token || this.#token instanceof Promise) {
             return []
         }
         return this.#token.scope
     }
 
-    async refreshAccessTokenForUser(user: string | number) {
+    async refreshAccessTokenForUser(user: UserIdResolvable) {
         this.#token = await TwitchAuth.refreshToken(this.clientId, this.#token.refresh_token).then(this.#setToken)
         return this.#token as AccessTokenWithUserId
     }

static_src/WebStorage.ts

@@ -20,12 +20,13 @@ export default class WebStorage {
      * @param {import('@twurple/auth').AuthProvider} auth_provider used to add the authentication header to requests for web storage
      * @param {fetch} fetch defaults to `globalThis.fetch`, allows you to further customize fetch behavior via chaining, for example with `fetch-retry`
      */
-    constructor(auth_provider: import('@twurple/auth').AuthProvider, fetch: typeof globalThis.fetch = (resource,options)=>{return globalThis.fetch(resource,options)}) {
+    constructor(auth_provider: import('@twurple/auth').AuthProvider, fetch: typeof globalThis.fetch = globalThis.fetch, origin?: string) {
         this.#fetch = fetch
         this.#auth_provider = auth_provider
         auth_provider.getAccessTokenForUser(undefined)
             .then(token => caches.open(token.userId + '/' + auth_provider.clientId))
             .then(cache => this.#cache = cache)
+        if (origin) this.#origin = origin
     }
 
     /**

static_src/index.ts

@@ -1,2 +1,2 @@
-export * as SugoiAuth from './SugoiAuthProvider'
-export * as WebStorage from './WebStorage'
+export { default as SugoiAuthProvider } from "./SugoiAuthProvider"
+export { default as WebStorage } from "./WebStorage"