@aj-archipelago/cortex 1.1.27 → 1.1.28

package/helper-apps/cortex-file-handler/blobHandler.js

@@ -1,6 +1,6 @@
 import fs from "fs";
 import path from "path";
-import { BlobServiceClient } from "@azure/storage-blob";
+import { generateBlobSASQueryParameters, StorageSharedKeyCredential, BlobServiceClient } from "@azure/storage-blob";
 import { v4 as uuidv4 } from "uuid";
 import Busboy from "busboy";
 import { PassThrough } from "stream";
@@ -53,6 +53,7 @@ function isBase64(str) {
   }
 }
 
+const { SAS_TOKEN_LIFE_DAYS = 30 } = process.env;
 const GCP_SERVICE_ACCOUNT_KEY =
   process.env.GCP_SERVICE_ACCOUNT_KEY_BASE64 ||
   process.env.GCP_SERVICE_ACCOUNT_KEY ||
@@ -138,6 +139,7 @@ async function saveFileToBlob(chunkPath, requestId) {
   const { containerClient } = await getBlobClient();
   // Use the filename with a UUID as the blob name
   const blobName = `${requestId}/${uuidv4()}_${encodeURIComponent(path.basename(chunkPath))}`;
+  const sasToken = generateSASToken(containerClient, blobName);
 
   // Create a read stream for the chunk file
   const fileStream = fs.createReadStream(chunkPath);
@@ -147,10 +149,28 @@ async function saveFileToBlob(chunkPath, requestId) {
   await blockBlobClient.uploadStream(fileStream);
 
   // Return the full URI of the uploaded blob
-  const blobUrl = blockBlobClient.url;
+  const blobUrl = `${blockBlobClient.url}?${sasToken}`;
   return blobUrl;
 }
 
+const generateSASToken = (containerClient, blobName, expiryTimeSeconds = 
+    parseInt(SAS_TOKEN_LIFE_DAYS) * 24 * 60 * 60
+) => {
+  const { accountName, accountKey } = containerClient.credential;
+  const sharedKeyCredential = new StorageSharedKeyCredential(accountName, accountKey);
+
+  const sasOptions = {
+    containerName: containerClient.containerName,
+    blobName: blobName,
+    permissions: "r", // Read permission
+    startsOn: new Date(),
+    expiresOn: new Date(new Date().valueOf() + expiryTimeSeconds * 1000)
+  };
+
+  const sasToken = generateBlobSASQueryParameters(sasOptions, sharedKeyCredential).toString();
+  return sasToken;
+};
+
 //deletes blob that has the requestId
 async function deleteBlob(requestId) {
   if (!requestId) throw new Error("Missing requestId parameter");
@@ -271,8 +291,9 @@ async function uploadFile(context, requestId, body, saveToLocal, useGoogle, file
     await blockBlobClient.uploadStream(passThroughStream, undefined, undefined, options);
 
     const message = `File '${encodedFilename}' uploaded successfully.`;
-    const url = blockBlobClient.url;
     context.log(message);
+    const sasToken = generateSASToken(containerClient, encodedFilename);
+    const url = `${blockBlobClient.url}?${sasToken}`;
     body = { message, url };
   }
 

package/helper-apps/cortex-file-handler/fileChunker.js

@@ -118,7 +118,8 @@ const ytdlDownload = async (url, filename, video = false) => {
             ? { filter: 'audioandvideo' }  // audio and video
             : { quality: 'highestaudio' }; // audio only
 
-        const videoStream = ytdl(url, videoOptions);
+        const encodedUrl = encodeURI(url);
+        const videoStream = ytdl(encodedUrl, videoOptions);
         let lastLoggedTime = Date.now();
 
         videoStream.on('error', (error) => {

package/helper-apps/cortex-file-handler/package-lock.json

@@ -9,7 +9,7 @@
       "version": "1.0.0",
       "dependencies": {
         "@azure/storage-blob": "^12.13.0",
-        "@distube/ytdl-core": "^4.13.5",
+        "@distube/ytdl-core": "^4.14.3",
         "@google-cloud/storage": "^7.10.0",
         "axios": "^1.3.6",
         "busboy": "^1.6.0",
@@ -158,19 +158,19 @@
       }
     },
     "node_modules/@distube/ytdl-core": {
-      "version": "4.13.5",
-      "resolved": "https://registry.npmjs.org/@distube/ytdl-core/-/ytdl-core-4.13.5.tgz",
-      "integrity": "sha512-g+4UJIR/auAJbia7iB0aWvaJDbs22P53NySWa47b1NT4xMTDJYguxHFArPrvRkcJrb/AgKjv/XoSZGghpL0CJA==",
+      "version": "4.14.3",
+      "resolved": "https://registry.npmjs.org/@distube/ytdl-core/-/ytdl-core-4.14.3.tgz",
+      "integrity": "sha512-z6i5EVGEuKhuvuRNyIqafBSs5aRA28HssnWehCRhEtYrxeFgXImfmpKTjUusHYU5vQt1swSVPVb2JCd22P0CPA==",
       "dependencies": {
         "http-cookie-agent": "^6.0.5",
         "m3u8stream": "^0.8.6",
         "miniget": "^4.2.3",
         "sax": "^1.4.1",
         "tough-cookie": "^4.1.4",
-        "undici": "^6.19.2"
+        "undici": "five"
       },
       "engines": {
-        "node": ">=16"
+        "node": ">=14.0"
       },
       "funding": {
         "url": "https://github.com/distubejs/ytdl-core?sponsor"
@@ -3073,16 +3073,16 @@
       }
     },
     "@distube/ytdl-core": {
-      "version": "4.13.5",
-      "resolved": "https://registry.npmjs.org/@distube/ytdl-core/-/ytdl-core-4.13.5.tgz",
-      "integrity": "sha512-g+4UJIR/auAJbia7iB0aWvaJDbs22P53NySWa47b1NT4xMTDJYguxHFArPrvRkcJrb/AgKjv/XoSZGghpL0CJA==",
+      "version": "4.14.3",
+      "resolved": "https://registry.npmjs.org/@distube/ytdl-core/-/ytdl-core-4.14.3.tgz",
+      "integrity": "sha512-z6i5EVGEuKhuvuRNyIqafBSs5aRA28HssnWehCRhEtYrxeFgXImfmpKTjUusHYU5vQt1swSVPVb2JCd22P0CPA==",
       "requires": {
         "http-cookie-agent": "^6.0.5",
         "m3u8stream": "^0.8.6",
         "miniget": "^4.2.3",
         "sax": "^1.4.1",
         "tough-cookie": "^4.1.4",
-        "undici": "^6.19.2"
+        "undici": "five"
       }
     },
     "@google-cloud/paginator": {

package/helper-apps/cortex-file-handler/package.json

@@ -10,7 +10,7 @@
   },
   "dependencies": {
     "@azure/storage-blob": "^12.13.0",
-    "@distube/ytdl-core": "^4.13.5",
+    "@distube/ytdl-core": "^4.14.3",
     "@google-cloud/storage": "^7.10.0",
     "axios": "^1.3.6",
     "busboy": "^1.6.0",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aj-archipelago/cortex",
-  "version": "1.1.27",
+  "version": "1.1.28",
   "description": "Cortex is a GraphQL API for AI. It provides a simple, extensible interface for using AI services from OpenAI, Azure and others.",
   "private": false,
   "repository": {