Merge PR James pre/fix (#24)

BREAKING CHANGE: Rewrite to ESM, remove broken deps

* Updated npm scripts
Updated package contributors
Updated semantic-release
Remove more unused deps

* Added `status` subcommand
Fixed 403 for landing page

* Added restart flag

* Fixes, use `beforeExit`

* Minor changes

* Keep search params

* Fix `fetch`

* fix build

* update Node.js in CI/CD

* Update readme

* Added small API section

* Add back support for middleware

* Revert readme changes

* formatting

---------

Co-authored-by: James Prevett <[email protected]>

Author: jcubic

.prettierrc.json

@@ -0,0 +1,6 @@
+{
+  "useTabs": false,
+  "tabWidth": 2,
+  "printWidth": 120,
+  "singleQuote": true
+}

.vscode/launch.json

@@ -1,17 +1,15 @@
 {
-    // Use IntelliSense to learn about possible Node.js debug attributes.
-    // Hover to view descriptions of existing attributes.
-    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "type": "node",
-            "request": "launch",
-            "name": "Launch micro",
-            "program": "${workspaceRoot}/node_modules/micro/bin/micro.js",
-            "args": [
-                "index.js"
-            ]
-        }
-    ]
-}
+  // Use IntelliSense to learn about possible Node.js debug attributes.
+  // Hover to view descriptions of existing attributes.
+  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "type": "node",
+      "request": "launch",
+      "name": "Launch micro",
+      "program": "${workspaceRoot}/node_modules/micro/bin/micro.js",
+      "args": ["index.js"]
+    }
+  ]
+}

LICENSE.md

@@ -4,4 +4,4 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of
 
 The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

README.md

@@ -18,22 +18,22 @@ npm install @isomorphic-git/cors-proxy
 Start proxy on default port 9999:
 
 ```sh
-cors-proxy start
+cors-proxy run
 ```
 
 Start proxy on a custom port:
 
 ```sh
-cors-proxy start -p 9889
+cors-proxy run -p 9889
 ```
 
-Start proxy in daemon mode. It will write the PID of the daemon process to `$PWD/cors-proxy.pid`:
+Start proxy in daemon mode.
 
 ```sh
-cors-proxy start -d
+cors-proxy start
 ```
 
-Kill the process with the PID specified in `$PWD/cors-proxy.pid`:
+Kill the daemon process:
 
 ```sh
 cors-proxy stop
@@ -42,35 +42,35 @@ cors-proxy stop
 ### CLI configuration
 
 Environment variables:
+
 - `PORT` the port to listen to (if run with `npm start`)
 - `ALLOW_ORIGIN` the value for the 'Access-Control-Allow-Origin' CORS header
 - `INSECURE_HTTP_ORIGINS` comma separated list of origins for which HTTP should be used instead of HTTPS (added to make developing against locally running git servers easier)
 
-
 ## Middleware usage
 
 You can also use the `cors-proxy` as a middleware in your own server.
 
 ```js
-const express = require('express')
-const corsProxy = require('@isomorphic-git/cors-proxy/middleware.js')
+import express from 'express';
+import corsProxy from '@isomorphic-git/cors-proxy';
 
-const app = express()
-const options = {}
-
-app.use(corsProxy(options))
+const app = express();
+const options = {};
 
+app.use(corsProxy(options));
 ```
 
 ### Middleware configuration
 
-*The middleware doesn't use the environment variables.* The options object supports the following properties:
+_The middleware doesn't use the environment variables._ The options object supports the following properties:
 
 - `origin`: _string_. The value for the 'Access-Control-Allow-Origin' CORS header
 - `insecure_origins`: _string[]_. Array of origins for which HTTP should be used instead of HTTPS (added to make developing against locally running git servers easier)
 - `authorization`: _(req, res, next) => void_. A middleware function you can use to handle custom authorization. Is run after filtering for git-like requests and handling CORS but before the request is proxied.
 
 _Example:_
+
 ```ts
 app.use(
   corsProxy({
@@ -83,7 +83,7 @@ app.use(
         return res.status(401).send("Unable to authenticate you with [Company]'s git proxy");
       }
     },
-  })
+  }),
 );
 
 // Only requests with a valid JSON Web Token will be proxied
@@ -111,29 +111,30 @@ function getAuthorizedUser(req: Request, header: string = 'Authorization') {
 There is no official chart for this project, helm or otherwise. You can make your own, but keep in mind cors-proxy uses the Micro server, which will return a 403 error for any requests that do not have the user agent header.
 
 _Example:_
+
 ```yaml
-  containers:
-      - name: cors-proxy
-        image: node:lts-alpine
-        env:
-        - name: ALLOW_ORIGIN
-          value: https://mydomain.com
-        command:
-        - npx
-        args:
-        - '@isomorphic-git/cors-proxy'
-        - start
-        ports:
-        - containerPort: 9999
-          hostPort: 9999
-          name: proxy
-          protocol: TCP
-        livenessProbe:
-          tcpSocket:
-            port: proxy
-        readinessProbe:
-          tcpSocket:
-            port: proxy
+containers:
+  - name: cors-proxy
+    image: node:lts-alpine
+    env:
+      - name: ALLOW_ORIGIN
+        value: https://mydomain.com
+    command:
+      - npx
+    args:
+      - '@isomorphic-git/cors-proxy'
+      - start
+    ports:
+      - containerPort: 9999
+        hostPort: 9999
+        name: proxy
+        protocol: TCP
+    livenessProbe:
+      tcpSocket:
+        port: proxy
+    readinessProbe:
+      tcpSocket:
+        port: proxy
 ```
 
 ## License

allow-request.js

@@ -1,32 +1,32 @@
 jobs:
-- job: Linux
+  - job: Linux
 
-  pool:
-    vmImage: 'ubuntu-latest'
+    pool:
+      vmImage: 'ubuntu-latest'
 
-  steps:
-  - task: NodeTool@0
-    inputs:
-      versionSpec: '10.x'
-    displayName: 'Install Node.js'
+    steps:
+      - task: NodeTool@0
+        inputs:
+          versionSpec: '22.x'
+        displayName: 'Install Node.js'
 
-  - script: npm ci
-    displayName: 'Install dependencies'
+      - script: npm ci
+        displayName: 'Install dependencies'
 
-  - script: npm pack
-    displayName: 'Prepare installable tarball'
-    condition: succeededOrFailed()
+      - script: npm pack
+        displayName: 'Prepare installable tarball'
+        condition: succeededOrFailed()
 
-  - task: PublishBuildArtifacts@1
-    displayName: 'Save npm-tarball.tgz'
-    condition: and(succeededOrFailed(), ne(variables['system.pullrequest.isfork'], true))
-    inputs:
-      artifactName: 'npm-tarball.tgz'
-      PathtoPublish: '$(System.DefaultWorkingDirectory)/isomorphic-git-cors-proxy-0.0.0-development.tgz'
+      - task: PublishBuildArtifacts@1
+        displayName: 'Save npm-tarball.tgz'
+        condition: and(succeededOrFailed(), ne(variables['system.pullrequest.isfork'], true))
+        inputs:
+          artifactName: 'npm-tarball.tgz'
+          PathtoPublish: '$(System.DefaultWorkingDirectory)/isomorphic-git-cors-proxy-0.0.0-development.tgz'
 
-  - script: npm run semantic-release
-    displayName: 'Publish to npm'
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
-    env:
-      GH_TOKEN: $(GITHUB_TOKEN)
-      NPM_TOKEN: $(Npm.Token)
+      - script: npm run semantic-release
+        displayName: 'Publish to npm'
+        condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+        env:
+          GH_TOKEN: $(GITHUB_TOKEN)
+          NPM_TOKEN: $(Npm.Token)