Fixes

app.js

@@ -1,16 +1,20 @@
-const express = require('express');
-const stream = require('stream');
-const bodyParser = require('body-parser');
-const fs = require('fs');
-const path = require('path');
-const { Utils, FileUploader, PerformanceRecorder } = require('common-utils');
-const { ZipFiles, UnzipFiles } = require('common-utils');
-const OracleStorage = require('./common-creds/oracle/storage.json');
-const axios = require('axios');
-const { spawn, exec, ChildProcess } = require('child_process');
-const { FireStoreDB } = require('multi-db-orm')
-var syllableCounter = require('syllable-count-english')
-var kill = require('tree-kill');
+import express from 'express';
+import stream from 'stream';
+import bodyParser from 'body-parser';
+import { existsSync, unlinkSync, readFileSync, writeFileSync, copyFileSync, readdirSync, mkdirSync, createReadStream, createWriteStream } from 'fs';
+import { resolve as _resolve, join } from 'path';
+import { Utils, FileUploader, PerformanceRecorder } from 'common-utils';
+import { ZipFiles, UnzipFiles } from 'common-utils';
+import OracleStorage from './common-creds/oracle/storage.json'  assert { type: "json" };
+import { spawn, exec, ChildProcess } from 'child_process';
+import { FireStoreDB } from 'multi-db-orm';
+import { syllableCount } from 'syllable-count-english';
+import kill from 'tree-kill';
+import { fileURLToPath } from 'url';
+import { dirname } from 'path';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename)
 
 let pl = {
   onLog: console.log
@@ -24,12 +28,12 @@ function render() {
 
   return new Promise((resolve, reject) => {
 
-    if (fs.existsSync(outputFile)) {
-      fs.unlinkSync(outputFile)
+    if (existsSync(outputFile)) {
+      unlinkSync(outputFile)
     }
     const SEMIBI_MEDIA_RENDERER = "../semibit-media-render-farm"
     const options = {
-      cwd: path.resolve(SEMIBI_MEDIA_RENDERER),
+      cwd: _resolve(SEMIBI_MEDIA_RENDERER),
     };
     const npmCommand = process.platform === 'win32' ? 'npm.cmd' : 'npm';
     var script = spawn(npmCommand, ['run', 'render-build', '--', outputFile], options);
@@ -80,13 +84,13 @@ function render() {
   })
 }
 
-const db = new FireStoreDB(path.join(__dirname, 'common-creds/firebase/semibitmedia.json'))
+const db = new FireStoreDB(join(__dirname, 'common-creds/firebase/semibitmedia.json'))
 
 function modifyFiles(originalManuscript, originalManuscriptFile) {
 
-  let fname = path.join(__dirname, "./src/textWithBgImage/SequentialScene.orig.tsx")
-  let fnameTarget = path.join(__dirname, "./src/textWithBgImage/SequentialScene.tsx")
-  let SequentialSceneText = fs.readFileSync(fname).toString()
+  let fname = join(__dirname, "./src/textWithBgImage/SequentialScene.orig.tsx")
+  let fnameTarget = join(__dirname, "./src/textWithBgImage/SequentialScene.tsx")
+  let SequentialSceneText = readFileSync(fname).toString()
   let seqScene = "";
   let script = originalManuscript.transcript
   for (let index = 0; index < script.length; index++) {
@@ -96,9 +100,9 @@ function modifyFiles(originalManuscript, originalManuscriptFile) {
   }
 
   generateSubtitles(originalManuscript)
-  fs.writeFileSync(originalManuscriptFile, JSON.stringify(originalManuscript, null, 2))
+  writeFileSync(originalManuscriptFile, JSON.stringify(originalManuscript, null, 2))
 
-  fs.writeFileSync(fnameTarget, SequentialSceneText.replace("{getScene(contents[0])}", seqScene));
+  writeFileSync(fnameTarget, SequentialSceneText.replace("{getScene(contents[0])}", seqScene));
 
 }
 
@@ -107,18 +111,24 @@ function generateSubtitles(originalManuscript) {
   let transcript = originalManuscript.transcript
   for (let index = 0; index < transcript.length; index++) {
     const section = transcript[index];
+    section.total_syllables = getDurationForSentenceByPhenone(section.text.trim())
+    let speakerSyllablesPs = section.total_syllables / section.durationInSeconds
+    let calc = 0
     section.subtitles = section.text.split(".").map(t => {
+      let c = (getDurationForSentenceByPhenone(t.trim()) / speakerSyllablesPs)
+      calc += c
       return {
-        text: t,
-        expectedDurationSec: getDurationForSentenceByPhenone(t)
+        text: t.trim(),
+        expectedDurationSec: c
       }
     })
+    section.calculate_duration_sec = calc
   }
   return originalManuscript
 }
 
 function getDurationForSentenceByPhenone(text) {
-  return syllableCounter.syllableCount(text)
+  return text.length;//syllableCount(text)
 }
 
 async function extract(filePath) {
@@ -126,13 +136,13 @@ async function extract(filePath) {
 }
 
 async function generateOutputBundle(jobId) {
-  let outDir = path.join(__dirname, 'out')
-  let outFile = path.join(__dirname, 'out', `${jobId}.zip`)
-  let manuFile = path.join(__dirname, `public/original_manuscript.json`)
-  fs.copyFileSync(manuFile, path.join(__dirname, 'out', `original_manuscript.json`))
-  let outputFiles = fs.readdirSync(outDir)
+  let outDir = join(__dirname, 'out')
+  let outFile = join(__dirname, 'out', `${jobId}.zip`)
+  let manuFile = join(__dirname, `public/original_manuscript.json`)
+  copyFileSync(manuFile, join(__dirname, 'out', `original_manuscript.json`))
+  let outputFiles = readdirSync(outDir)
     .map(fname => {
-      const filePath = path.join(outDir, fname);
+      const filePath = join(outDir, fname);
       return filePath
     })
   await ZipFiles(outputFiles, outFile)
@@ -162,9 +172,9 @@ async function notify(jobId, origManu, outputUrl, bundleUrl, status, time_taken)
 const app = express()
 function clear() {
   const foldersToPreserve = ['assets', 'mp3'];
-  Utils.clearFolder(path.join(__dirname, "./public"), foldersToPreserve)
-  Utils.clearFolder(path.join(__dirname, "./out"))
-  Utils.clearFolder(path.join(__dirname, "./uploads"))
+  Utils.clearFolder(join(__dirname, "./public"), foldersToPreserve)
+  Utils.clearFolder(join(__dirname, "./out"))
+  Utils.clearFolder(join(__dirname, "./uploads"))
 }
 app.all('/clear', async (req, res) => {
   clear()
@@ -173,7 +183,7 @@ app.all('/clear', async (req, res) => {
 
 app.all('/config', (req, res) => {
   res.send({
-    transitions: JSON.parse(fs.readFileSync('public/assets/transitions.json').toString())
+    transitions: JSON.parse(readFileSync('public/assets/transitions.json').toString())
   })
 })
 
@@ -204,28 +214,28 @@ app.all('/render', async (req, res) => {
   let bundleUrl = req.query.fileUrl
   let skipRender = req.query.skipRender
   let fileName = decodeURIComponent(Utils.getFileName(bundleUrl))
-  let filePath = req.query.filePath || path.join(__dirname, `public/${fileName}`)
+  let filePath = req.query.filePath || join(__dirname, `public/${fileName}`)
   if (bundleUrl) {
     console.log('Downloading remote asset bundle from', bundleUrl)
     await Utils.downloadFile(bundleUrl, filePath, true)
     console.log('Downloaded remote asset bundle', 'to', filePath)
   }
-  if (fs.existsSync(filePath)) {
+  if (existsSync(filePath)) {
     await extract(filePath)
-    let manuFile = path.join(__dirname, `public/original_manuscript.json`)
-    if (!fs.existsSync) {
+    let manuFile = join(__dirname, `public/original_manuscript.json`)
+    if (!existsSync) {
       res.status(400)
       res.send({
         message: 'The asset bundle dosent contain a original_manuscript.json at root'
       })
     }
-    let manuObj = JSON.parse(fs.readFileSync(manuFile).toString())
+    let manuObj = JSON.parse(readFileSync(manuFile).toString())
     currentRenderJobId = manuObj.id
     let jobID = manuObj.id
     modifyFiles(manuObj, manuFile)
     const uploader = new FileUploader('oracle', OracleStorage.semibit_media)
     if (!skipRender) {
-      Utils.clearFolder(path.join(__dirname, 'out'))
+      Utils.clearFolder(join(__dirname, 'out'))
       res.writeHead(200, jobID, {
         'job_id': jobID,
         'content-type': 'application/json'
@@ -306,15 +316,15 @@ app.all('/render', async (req, res) => {
   }
 })
 
-app.use('/public', express.static(path.join(__dirname, 'public')));
-app.use('/out', express.static(path.join(__dirname, 'out')));
+app.use('/public', express.static(join(__dirname, 'public')));
+app.use('/out', express.static(join(__dirname, 'out')));
 
 
-const uploadDir = path.join(__dirname, 'uploads');
+const uploadDir = join(__dirname, 'uploads');
 const oracleAPI = OracleStorage.semibit_media.url
 
-if (!fs.existsSync(uploadDir)) {
-  fs.mkdirSync(uploadDir);
+if (!existsSync(uploadDir)) {
+  mkdirSync(uploadDir);
 }
 
 app.post('/upload', async (req, res) => {
@@ -322,15 +332,15 @@ app.post('/upload', async (req, res) => {
     const file = req.files.file;
     const uploadUrl = oracleAPI + encodeURIComponent(file.name);
 
-    const readStream = fs.createReadStream(file.path);
-    const writeStream = fs.createWriteStream(path.join(uploadDir, file.name));
+    const readStream = createReadStream(file.path);
+    const writeStream = createWriteStream(join(uploadDir, file.name));
     readStream.pipe(writeStream);
 
     await new Promise((resolve) => {
       writeStream.on('finish', resolve);
     });
 
-    const fileData = fs.readFileSync(path.join(uploadDir, file.name));
+    const fileData = readFileSync(join(uploadDir, file.name));
 
     await axios.put(uploadUrl, fileData);
 
@@ -445,24 +455,24 @@ function doRenderPoster(jobId, statusCb) {
   })
 }
 
-let indexFile = path.join(__dirname, 'index.html')
+let indexFile = join(__dirname, 'index.html')
 app.get('/', (req, res) => {
   res.sendFile(indexFile);
 });
 
-fs.writeFileSync(indexFile, fs.readFileSync(indexFile).toString().replace("___ORACLE_API_BASE___", oracleAPI))
+writeFileSync(indexFile, readFileSync(indexFile).toString().replace("___ORACLE_API_BASE___", oracleAPI))
 
 
 
-module.exports = app
+export default app
 
 // doRender()
 
 if (process.env.MODIFY_FILES) {
   let filePath = 'public/@export_607c230fef.zip'
   extract(filePath).then(() => {
-    let manuFile = path.join(__dirname, 'public/original_manuscript.json')
-    let manuObj = JSON.parse(fs.readFileSync(manuFile).toString())
+    let manuFile = join(__dirname, 'public/original_manuscript.json')
+    let manuObj = JSON.parse(readFileSync(manuFile).toString())
     modifyFiles(manuObj, manuFile)
     console.log('Sequence Generated')
   })

package.json

@@ -1,6 +1,7 @@
 {
   "name": "semibit-media-render-farm",
   "version": "1.0.0",
+  "type": "module",
   "description": "semibit media renderer",
   "sideEffects": [
     "*.css"
@@ -72,4 +73,4 @@
     "zod": "^3.21.4"
   },
   "packageManager": "npm@8.19.4"
-}
+}

server.js

@@ -1,12 +1,12 @@
-const app = require('./app')
+import app from './app.js';
 let port = process.env.PORT || 8083
 
-const express = require('express');
-const http = require('http');
-const socketIO = require('socket.io');
+import express from 'express';
+import { createServer } from 'http';
+import { Server } from 'socket.io';
 
-const server = http.createServer(app);
-const io = socketIO(server);
+const server = createServer(app);
+const io = new Server(server);
 
 const usersSubscribedToJobs = new Map();