Fixes

.gitignore

@@ -9,4 +9,5 @@ ffmpeg/
 public/
 **.zip
 yarn.lock
-package-lock.json
+package-lock.json
+functions/*.log

server.ts → app.js

@@ -1,21 +1,19 @@
-
-import express from 'express'
-import stream from 'stream'
-import bodyParser from 'body-parser';
-import { spawn } from 'child_process';
-import fs from 'fs'
-import path from 'path'
-import { Utils } from './common-utils';
-import { UnzipFiles } from './common-utils/utils/FileZipper';
-import { OriginalManuscript } from './src/OriginalManuscriptModel';
-import OracheStorage from './common-creds/oracle/storage.json'
-import axios from 'axios';
+const express = require('express');
+const stream = require('stream');
+const bodyParser = require('body-parser');
+const { spawn } = require('child_process');
+const fs = require('fs');
+const path = require('path');
+const { Utils } = require('common-utils');
+const { ZipFiles, UnzipFiles } = require('common-utils');
+const OracleStorage = require('./common-creds/oracle/storage.json');
+const axios = require('axios');
 
 let pl = {
   onLog: console.log
 }
 
-let jobs: any = {}
+let jobs = {}
 function render() {
   let outputFile = '';
   let thumbnailFile = '';
@@ -80,7 +78,7 @@ function render() {
 }
 
 
-function modifyFiles(originalManuscript: OriginalManuscript) {
+function modifyFiles(originalManuscript) {
 
   let fname = path.join(__dirname, "./src/textWithBgImage/SequentialScene.orig.tsx")
   let fnameTarget = path.join(__dirname, "./src/textWithBgImage/SequentialScene.tsx")
@@ -96,7 +94,7 @@ function modifyFiles(originalManuscript: OriginalManuscript) {
   fs.writeFileSync(fnameTarget, SequentialSceneText.replace("{getScene(contents[0])}", seqScene));
 
 }
-async function extract(filePath: string) {
+async function extract(filePath) {
   await UnzipFiles(filePath, './public')
 }
 
@@ -146,7 +144,7 @@ app.all('/render', async (req, res) => {
         message: 'The asset bundle dosent contain a original_manuscript.json at root'
       })
     }
-    let manuObj: OriginalManuscript = JSON.parse(fs.readFileSync(manuFile).toString())
+    let manuObj = JSON.parse(fs.readFileSync(manuFile).toString())
     modifyFiles(manuObj)
 
     res.send({
@@ -165,7 +163,7 @@ app.use('/out', express.static(path.join(__dirname, 'out')));
 
 
 const uploadDir = path.join(__dirname, 'uploads');
-const oracleAPI = OracheStorage.semibit_media.url
+const oracleAPI = OracleStorage.semibit_media.url
 
 if (!fs.existsSync(uploadDir)) {
   fs.mkdirSync(uploadDir);
@@ -204,12 +202,9 @@ app.get('/', (req, res) => {
 
 fs.writeFileSync('index.html', fs.readFileSync('index.html').toString().replace("___ORACLE_API_BASE___", oracleAPI))
 
-let port = process.env.PORT || 8083
-app.listen(port, () => {
-  console.log("Remote renderer listenting at port", port)
-})
 
 
+module.exports = app
 
 // let manuFile = path.join(__dirname, 'public/original_manuscript.json')
 // let manuObj: OriginalManuscript = JSON.parse(fs.readFileSync(manuFile).toString())

ffmpeg-fix.js

@@ -22,7 +22,7 @@ async function createSymlink(targetPath, symlinkPath) {
     await fs.symlink(targetPath, symlinkPath);
     console.log('Symlink created successfully:', symlinkPath);
   } catch (error) {
-    console.error('An error occurred:', error);
+    console.error('An error occurred:', error.message);
   }
 }
 
@@ -33,7 +33,7 @@ async function findAndCreateSymlink(targetExecutable, ffmpegPath) {
     const symlinkPath = path.join(__dirname, 'node_modules', '@remotion', 'compositor-win32-x64-msvc', 'ffmpeg', 'remotion', 'bin', targetExecutable);
     await createSymlink(ffmpegPath, symlinkPath);
   } catch (error) {
-    console.error('An error occurred while locating ffmpeg:', error);
+    console.error('An error occurred while creating symlink ffmpeg:', error);
   }
 }
 const ffmpegtargetExecutable = os.platform() === 'win32' ? 'ffmpeg.exe' : 'ffmpeg';

firebase.json

@@ -0,0 +1,19 @@
+{
+  "functions": {
+    "codebase": "semibitmedia",
+    "predeploy": [
+      "echo Hey"
+    ]
+  },
+  "emulators": {
+    "functions": {
+      "port": 5001
+    },
+    "firestore": {
+      "port": 8080
+    },
+    "ui": {
+      "enabled": true
+    }
+  }
+}

functions/index.js

@@ -0,0 +1,24 @@
+const { logger } = require("firebase-functions");
+const { onRequest } = require("firebase-functions/v2/https");
+const { setGlobalOptions } = require("firebase-functions/v2");
+
+const { initializeApp } = require("firebase-admin/app");
+const { default: app } = require("../app");
+setGlobalOptions({
+  region: "us-central1",
+  // memory: "2GiB",
+  maxInstances: 1,
+  minInstances: 0
+});
+
+initializeApp();
+
+exports.ping = onRequest(async (req, res) => {
+  const original = req.query.text;
+
+  res.json({ result: `Working` });
+});
+
+
+exports.ping = onRequest(app);
+

functions/package.json

@@ -0,0 +1,27 @@
+{
+  "name": "functions",
+  "description": "Cloud Functions for Firebase",
+  "dependencies": {
+    "firebase-admin": "^11.9.0",
+    "firebase-functions": "^4.4.1"
+  },
+  "devDependencies": {
+    "chai": "^4.3.6",
+    "chai-as-promised": "^7.1.1",
+    "eslint": "^8.40.0",
+    "mocha": "^7.2.0",
+    "sinon": "^9.2.4"
+  },
+  "scripts": {
+    "serve": "firebase emulators:start --only functions --project semibitmedia",
+    "shell": "firebase functions:shell --project semibitmedia",
+    "start": "npm run shell",
+    "deploy": "firebase deploy --only functions --project semibitmedia",
+    "logs": "firebase functions:log --project semibitmedia",
+    "compile": "cp ../tsconfig.json ./tsconfig-compile.json && tsc --project tsconfig-compile.json && cd .. && npm run build"
+  },
+  "engines": {
+    "node": "16"
+  },
+  "private": true
+}

package.json

@@ -8,12 +8,12 @@
   "scripts": {
     "start": "ts-node-dev --respawn --transpile-only server.ts",
     "preview": "remotion studio",
-    "render-build": "remotion render  SemibitComposition  ",
+    "render-build": "remotion render --image-format=jpeg --quality=70 --gl=angle SemibitComposition  ",
     "render-still": "remotion still --image-format=jpeg SemibitCompositionPoster  ",
-    "build": "remotion render --image-format=jpeg --quality=70 --gl=angle SemibitComposition  ",
+    "build": "tsc --noEmitOnError --noUnusedLocals --noUnusedParameters --allowUnusedLabels",
     "upgrade": "remotion upgrade",
     "test": "eslint src --ext ts,tsx,js,jsx && tsc",
-    "postinstall": "node ffmpeg-fix.js"
+    "postinstall": "cd node_modules/common-utils && npm run build && cd ../../ && node ffmpeg-fix.js"
   },
   "repository": {},
   "license": "UNLICENSED",
@@ -33,6 +33,7 @@
     "@remotion/zod-types": "4.0.19",
     "axios": "^1.4.0",
     "body-parser": "^1.20.2",
+    "common-utils": "file:common-utils",
     "express": "^4.18.2",
     "ffbinaries": "^1.1.5",
     "fs-extra": "^11.1.1",

server.js

@@ -0,0 +1,5 @@
+const app = require('./app')
+let port = process.env.PORT || 8083
+app.listen(port, () => {
+  console.log("Remote renderer listenting at port", port)
+})

tsconfig.json

@@ -1,5 +1,6 @@
 {
 	"compilerOptions": {
+		"allowSyntheticDefaultImports": true,
 		"target": "ES2018",
 		"resolveJsonModule": true,
 		"module": "commonjs",