chore: use env vars, code / type cleanup

Author: RyKilleen

src/getPlatform.ts

@@ -56,18 +56,17 @@ function extname(filename: string) {
   return filename.split('.').pop() || ''
 }
 
+export type Asset = { name: string; browser_download_url: string }
+
 export async function findAssetSignature(
   fileName: string,
-  assets: any[],
+  assets: Asset[],
 ): Promise<string | undefined> {
   // check in our assets if we have a file: `fileName.sig`
   // by example fileName can be: App-1.0.0.zip
-  const matches = [
-    `${fileName.toLowerCase()}.gz.sig`,
-    `${fileName.toLowerCase()}.sig`,
-  ]
-  const foundSignature = assets.find((asset) =>
-    asset.name.toLowerCase() === `${fileName.toLowerCase()}.sig`,
+
+  const foundSignature = assets.find(
+    (asset) => asset.name.toLowerCase() === `${fileName.toLowerCase()}.sig`,
   )
 
   if (!foundSignature) {

src/handler.ts

@@ -1,4 +1,5 @@
 import {
+  Asset,
   checkPlatform,
   findAssetSignature,
   sanitizeVersion,
@@ -7,17 +8,19 @@ import {
 import semverValid from 'semver/functions/valid'
 import semverGt from 'semver/functions/gt'
 
-
 type TauriUpdateResponse = {
-  url: string,
-  version: string,
-  notes?: string,
-  pub_date?: string,
+  url: string
+  version: string
+  notes?: string
+  pub_date?: string
   signature?: string
 }
 
-const GITHUB_ACCOUNT = 'killeencode'
-const GITHUB_REPO = 'brancato'
+declare global {
+  const GITHUB_ACCOUNT: string
+  const GITHUB_REPO: string
+}
+
 export async function handleRequest(request: Request): Promise<Response> {
   const path = new URL(request.url).pathname
   const [platform, version] = path.slice(1).split('/')
@@ -36,8 +39,8 @@ export async function handleRequest(request: Request): Promise<Response> {
 
   const release = (await releaseResponse.clone().json()) as {
     tag_name: string
-    assets: any
-    body: any
+    assets: Asset[]
+    body: string
     published_at: string
   }
   if (!platform || !validatePlatform(platform) || !version) {
@@ -48,7 +51,7 @@ export async function handleRequest(request: Request): Promise<Response> {
   if (!remoteVersion || !semverValid(remoteVersion)) {
     return new Response('Not found', { status: 404 })
   }
-  
+
   const shouldUpdate = semverGt(remoteVersion, version)
   if (!shouldUpdate) {
     return new Response(null, { status: 204 })
@@ -63,17 +66,16 @@ export async function handleRequest(request: Request): Promise<Response> {
 
     // try to find signature for this asset
     const signature = await findAssetSignature(name, release.assets)
-    const data : TauriUpdateResponse = {
+    const data: TauriUpdateResponse = {
       url: browser_download_url,
       version: remoteVersion,
       notes: release.body,
       pub_date: release.published_at,
       signature,
     }
-    return new Response(
-      JSON.stringify(data),
-      { headers: { 'Content-Type': 'application/json; charset=utf-8' } },
-    )
+    return new Response(JSON.stringify(data), {
+      headers: { 'Content-Type': 'application/json; charset=utf-8' },
+    })
   }
 
   return new Response(JSON.stringify({ remoteVersion, version, shouldUpdate }))

wrangler.toml

@@ -6,6 +6,10 @@ route = ""
 workers_dev = true
 compatibility_date = "2022-03-26"
 
+[vars]
+GITHUB_ACCOUNT = 'killeencode'
+GITHUB_REPO = 'brancato'
+
 [build]
 command = "npm install && npm run build"
 [build.upload]