[FIX] reorder OPRF and de-chunking for TEEs

Author: Scratch-net

src/tests/http-provider.test.ts

@@ -15,7 +15,7 @@ describeWithServer('HTTP Provider', opts => {
 		const resp = await createClaimOnAttestor({
 			name: 'http',
 			params: {
-				url: 'https://news.ycombinator.{{param1}}/{{param4}}',
+				url: 'https://news.ycombinator.com/{{param4}}',
 				method: 'GET',
 				responseMatches: [{
 					type: 'regex',
@@ -40,6 +40,7 @@ describeWithServer('HTTP Provider', opts => {
 			client: opts.client,
 			zkEngine: 'gnark'
 		})
+		console.log('ERROOOOOR' + resp.error?.message)
 		assert.ok(!resp.error)
 		assert.match(
 			resp.claim?.context || '',
@@ -66,7 +67,7 @@ describeWithServer('HTTP Provider', opts => {
 						hash: 'oprf'
 					}
 				],
-				paramValues:{ domain:'Example Domain' }
+				paramValues: { domain: 'Example Domain' }
 			},
 			secretParams: {
 				cookieStr: '<cookie-str>'

src/utils/http-parser.ts

@@ -6,38 +6,38 @@ import { findIndexInUint8Array, uint8ArrayToStr } from '#src/utils/generics.ts'
 import { REDACTION_CHAR_CODE } from '#src/utils/redactions.ts'
 
 export type HttpRequest = {
-	method: string
-	url: string
-	protocol: string
-	headers: IncomingHttpHeaders
-	body?: Uint8Array
+    method: string
+    url: string
+    protocol: string
+    headers: IncomingHttpHeaders
+    body?: Uint8Array
 }
 
 export type HttpResponse = {
-	statusCode: number
-	statusMessage: string
-	headers: IncomingHttpHeaders
-	body: Uint8Array
-	headersComplete: boolean
-	complete: boolean
-
-	/**
-	 * Index of the first byte of the status line
-	 */
-	statusLineEndIndex?: number
-	/**
-	 * Index of the first byte of the body
-	 * in the complete response
-	 */
-	bodyStartIndex?: number
-	/**
-	 * If using chunked transfer encoding,
-	 * this will be set & contain indices of each
-	 * chunk in the complete response
-	 */
-	chunks?: ArraySlice[]
-
-	headerIndices: Map<string, ArraySlice>
+    statusCode: number
+    statusMessage: string
+    headers: IncomingHttpHeaders
+    body: Uint8Array
+    headersComplete: boolean
+    complete: boolean
+
+    /**
+     * Index of the first byte of the status line
+     */
+    statusLineEndIndex?: number
+    /**
+     * Index of the first byte of the body
+     * in the complete response
+     */
+    bodyStartIndex?: number
+    /**
+     * If using chunked transfer encoding,
+     * this will be set & contain indices of each
+     * chunk in the complete response
+     */
+    chunks?: ArraySlice[]
+
+    headerIndices: Map<string, ArraySlice>
 	/**
 	 * index of separator \r\n\r\n between headers and body
 	 */
@@ -58,7 +58,7 @@ export function makeHttpResponseParser() {
 		body: new Uint8Array(),
 		complete: false,
 		headersComplete: false,
-		headerIndices: new Map<string, ArraySlice>(),
+		headerIndices:new Map<string, ArraySlice>(),
 		headerEndIdx: 0
 	}
 
@@ -70,9 +70,9 @@ export function makeHttpResponseParser() {
 	return {
 		res,
 		/**
-		 * Parse the next chunk of data
-		 * @param data the data to parse
-		 */
+         * Parse the next chunk of data
+         * @param data the data to parse
+         */
 		onChunk(data: Uint8Array) {
 			// concatenate the remaining data from the last chunk
 			remaining = concatenateUint8Arrays([remaining, data])
@@ -110,8 +110,8 @@ export function makeHttpResponseParser() {
 						const [key, value] = line.split(': ')
 						res.headers[key.toLowerCase()] = value
 						res.headerIndices[key.toLowerCase()] = {
-							fromIndex: currentByteIdx - line.length - HTTP_HEADER_LINE_END.length,
-							toIndex: currentByteIdx - HTTP_HEADER_LINE_END.length
+							fromIndex:currentByteIdx - line.length - HTTP_HEADER_LINE_END.length,
+							toIndex:currentByteIdx - HTTP_HEADER_LINE_END.length
 						}
 					} else {
 						throw new Error('got more data after response was complete')
@@ -166,9 +166,9 @@ export function makeHttpResponseParser() {
 			}
 		},
 		/**
-		 * Call to prevent further parsing; indicating the end of the request
-		 * Checks that the response is valid & complete, otherwise throws an error
-		 */
+         * Call to prevent further parsing; indicating the end of the request
+         * Checks that the response is valid & complete, otherwise throws an error
+         */
 		streamEnded() {
 			if(!res.headersComplete) {
 				throw new Error('stream ended before headers were complete')