Merge pull request #3 from copilot-extensions/sdk

refactor: use `@copilot-extensions/preview-sdk`

Author: JasonEtco

package-lock.json

@@ -1,25 +1,25 @@
 {
   "name": "gh-models",
   "version": "1.0.0",
-  "main": "index.js",
+  "type": "module",
   "scripts": {
     "start": "node dist/index.js",
     "build": "tsc",
-    "dev": "nodemon src/index.ts"
+    "dev": "tsx --watch src/index.ts"
   },
   "keywords": [],
   "author": "",
   "license": "ISC",
   "description": "",
   "dependencies": {
+    "@copilot-extensions/preview-sdk": "^1.0.0",
     "express": "^4.19.2",
     "openai": "^4.55.0"
   },
   "devDependencies": {
     "@types/express": "^4.17.21",
     "@types/node": "^22.1.0",
-    "nodemon": "^3.1.4",
-    "ts-node": "^10.9.2",
+    "tsx": "^4.18.0",
     "typescript": "^5.5.4"
   }
-}
+}

package.json

@@ -1,5 +1,5 @@
 import OpenAI from "openai";
-import { ModelsAPI } from "./models-api";
+import { ModelsAPI } from "./models-api.js";
 
 // defaultModel is the model used for internal calls - for tool calling,
 // or just for chat completions.

src/functions.ts

@@ -1,5 +1,5 @@
 import OpenAI from "openai";
-import { RunnerResponse, defaultModel, Tool } from "../functions";
+import { RunnerResponse, defaultModel, Tool } from "../functions.js";
 
 export class describeModel extends Tool {
   static definition = {

src/functions/describe-model.ts

@@ -1,5 +1,5 @@
 import OpenAI from "openai";
-import { RunnerResponse, Tool } from "../functions";
+import { RunnerResponse, Tool } from "../functions.js";
 
 type MessageWithReferences = OpenAI.ChatCompletionMessageParam & {
   copilot_references: Reference[];

src/functions/execute-model.ts

@@ -1,5 +1,5 @@
 import OpenAI from "openai";
-import { RunnerResponse, defaultModel, Tool } from "../functions";
+import { RunnerResponse, defaultModel, Tool } from "../functions.js";
 
 export class listModels extends Tool {
   static definition = {

src/functions/list-models.ts

@@ -1,5 +1,5 @@
 import OpenAI from "openai";
-import { RunnerResponse, defaultModel, Tool } from "../functions";
+import { RunnerResponse, defaultModel, Tool } from "../functions.js";
 
 export class recommendModel extends Tool {
   static definition = {

src/functions/recommend-model.ts

@@ -1,12 +1,12 @@
 import express from "express";
 import OpenAI from "openai";
-import { verifySignatureMiddleware } from "./validate-signature";
-import { describeModel } from "./functions/describe-model";
-import { executeModel } from "./functions/execute-model";
-import { listModels } from "./functions/list-models";
-import { RunnerResponse } from "./functions";
-import { recommendModel } from "./functions/recommend-model";
-import { ModelsAPI } from "./models-api";
+import { verifySignatureMiddleware } from "./validate-signature.js";
+import { describeModel } from "./functions/describe-model.js";
+import { executeModel } from "./functions/execute-model.js";
+import { listModels } from "./functions/list-models.js";
+import { RunnerResponse } from "./functions.js";
+import { recommendModel } from "./functions/recommend-model.js";
+import { ModelsAPI } from "./models-api.js";
 const app = express();
 
 app.post("/", verifySignatureMiddleware, express.json(), async (req, res) => {

src/index.ts

@@ -1,15 +1,5 @@
 import express, { type Request, Response, NextFunction } from "express";
-import crypto from "crypto";
-
-const GITHUB_KEYS_URI = "https://api.github.com/meta/public_keys/copilot_api";
-
-interface GitHubKeysPayload {
-  public_keys: Array<{
-    key: string;
-    key_identifier: string;
-    is_current: boolean;
-  }>;
-}
+import { verify } from "@copilot-extensions/preview-sdk";
 
 export async function verifySignatureMiddleware(
   req: Request,
@@ -21,7 +11,15 @@ export async function verifySignatureMiddleware(
       const signature = req.get("GitHub-Public-Key-Signature") as string;
       const keyID = req.get("GitHub-Public-Key-Identifier") as string;
       const tokenForUser = req.get("X-GitHub-Token") as string;
-      await verifySignature(req.body, signature, keyID, tokenForUser);
+      const verified = await verify(req.body, signature, keyID, {
+        token: tokenForUser,
+      });
+      if (!verified) {
+        console.log("Signature verification failed");
+        return res.status(401).send("Unauthorized");
+      }
+
+      console.log("Signature verified");
 
       req.body = JSON.parse(req.body.toString("utf-8"));
       next();
@@ -31,36 +29,3 @@ export async function verifySignatureMiddleware(
     }
   });
 }
-
-async function verifySignature(
-  payload: string,
-  signature: string,
-  keyID: string,
-  tokenForUser: string | null
-): Promise<void> {
-  if (typeof payload !== "string" || payload.length === 0) {
-    throw new Error("Invalid payload");
-  }
-  if (typeof signature !== "string" || signature.length === 0) {
-    throw new Error("Invalid signature");
-  }
-  if (typeof keyID !== "string" || keyID.length === 0) {
-    throw new Error("Invalid keyID");
-  }
-
-  const keys = (await fetch(GITHUB_KEYS_URI, {
-    method: "GET",
-    headers: {
-      Authorization: `Bearer ${tokenForUser}`,
-    },
-  }).then((res) => res.json())) as GitHubKeysPayload;
-  const publicKey = keys.public_keys.find((k) => k.key_identifier === keyID);
-  if (!publicKey) {
-    throw new Error("No public key found matching key identifier");
-  }
-
-  const verify = crypto.createVerify("SHA256").update(payload);
-  if (!verify.verify(publicKey.key, signature, "base64")) {
-    throw new Error("Signature does not match payload");
-  }
-}

src/validate-signature.ts

@@ -1,12 +1,13 @@
 {
   "compilerOptions": {
-    "target": "es2016",
-    "module": "commonjs",
+    "target": "ES2020",
+    "module": "NodeNext",
+    "moduleResolution": "NodeNext",
     "rootDir": "./src",
     "outDir": "./dist",
     "esModuleInterop": true,
-    "forceConsistentCasingInFileNames": true,  
+    "forceConsistentCasingInFileNames": true,
     "strict": true,
     "skipLibCheck": true
   }
-}
+}