@editframe/vite-plugin 0.5.0-beta.2 → 0.5.0-beta.8

package/dist/{assets → lib/assets}/tasks/generateTrack.mjs

@@ -1,5 +1,5 @@
 import { idempotentTask } from "../idempotentTask.mjs";
-import { MP4File } from "../../editor/util/MP4File.mjs";
+import { MP4File } from "../../av/MP4File.mjs";
 import debug from "debug";
 import { mp4FileWritable } from "../mp4FileWritable.mjs";
 import { PassThrough } from "stream";

package/dist/{assets → lib/assets}/tasks/generateTrackFragmentIndex.mjs

@@ -1,5 +1,5 @@
 import { idempotentTask } from "../idempotentTask.mjs";
-import { MP4File } from "../../editor/util/MP4File.mjs";
+import { MP4File } from "../../av/MP4File.mjs";
 import debug from "debug";
 import { mp4FileWritable } from "../mp4FileWritable.mjs";
 import { basename } from "path";

package/dist/{editor/util → lib/av}/MP4File.mjs

@@ -82,60 +82,59 @@ class MP4File extends MP4Box.ISOFile {
         if (trak.samples === void 0) {
           throw new Error("trak.samples is undefined");
         }
-        eachSample:
-          while (trak.nextSample < trak.samples.length) {
-            let result = void 0;
-            if (trak?.samples[trak.nextSample]) {
-              fragmentStartSamples[fragTrak.id] ||= trak.samples[trak.nextSample];
-            }
-            try {
-              result = this.createFragment(
-                fragTrak.id,
-                trak.nextSample,
-                fragTrak.segmentStream
-              );
-            } catch (error) {
-              console.log("Failed to createFragment", error);
-            }
-            if (result) {
-              fragTrak.segmentStream = result;
-              trak.nextSample++;
-            } else {
-              finishedReading = await this.waitForMoreSamples();
-              break eachSample;
-            }
-            const nextSample = trak.samples[trak.nextSample];
-            const emitSegment = (
-              // if rapAlignement is true, we emit a fragment when we have a rap sample coming up next
-              fragTrak.rapAlignement === true && nextSample?.is_sync || // if rapAlignement is false, we emit a fragment when we have the required number of samples
-              !fragTrak.rapAlignement && trak.nextSample % fragTrak.nb_samples === 0 || // // if this is the last sample, we emit the fragment
-              // finished ||
-              // if we have more samples than the number of samples requested, we emit the fragment
-              trak.nextSample >= trak.samples.length
+        eachSample: while (trak.nextSample < trak.samples.length) {
+          let result = void 0;
+          if (trak?.samples[trak.nextSample]) {
+            fragmentStartSamples[fragTrak.id] ||= trak.samples[trak.nextSample];
+          }
+          try {
+            result = this.createFragment(
+              fragTrak.id,
+              trak.nextSample,
+              fragTrak.segmentStream
             );
-            if (emitSegment) {
-              if (trak.nextSample >= trak.samples.length) {
-                trackInfo[fragTrak.id].complete = true;
-              }
-              const startSample = fragmentStartSamples[fragTrak.id];
-              const endSample = trak.samples[trak.nextSample - 1];
-              if (!startSample || !endSample) {
-                throw new Error("startSample or endSample is undefined");
-              }
-              yield {
-                track: fragTrak.id,
-                segment: trackInfo[fragTrak.id].index,
-                data: fragTrak.segmentStream.buffer,
-                complete: trackInfo[fragTrak.id].complete,
-                cts: startSample.cts,
-                dts: startSample.dts,
-                duration: endSample.dts - startSample.dts + endSample.duration
-              };
-              trackInfo[fragTrak.id].index += 1;
-              fragTrak.segmentStream = null;
-              delete fragmentStartSamples[fragTrak.id];
+          } catch (error) {
+            console.log("Failed to createFragment", error);
+          }
+          if (result) {
+            fragTrak.segmentStream = result;
+            trak.nextSample++;
+          } else {
+            finishedReading = await this.waitForMoreSamples();
+            break eachSample;
+          }
+          const nextSample = trak.samples[trak.nextSample];
+          const emitSegment = (
+            // if rapAlignement is true, we emit a fragment when we have a rap sample coming up next
+            fragTrak.rapAlignement === true && nextSample?.is_sync || // if rapAlignement is false, we emit a fragment when we have the required number of samples
+            !fragTrak.rapAlignement && trak.nextSample % fragTrak.nb_samples === 0 || // // if this is the last sample, we emit the fragment
+            // finished ||
+            // if we have more samples than the number of samples requested, we emit the fragment
+            trak.nextSample >= trak.samples.length
+          );
+          if (emitSegment) {
+            if (trak.nextSample >= trak.samples.length) {
+              trackInfo[fragTrak.id].complete = true;
             }
+            const startSample = fragmentStartSamples[fragTrak.id];
+            const endSample = trak.samples[trak.nextSample - 1];
+            if (!startSample || !endSample) {
+              throw new Error("startSample or endSample is undefined");
+            }
+            yield {
+              track: fragTrak.id,
+              segment: trackInfo[fragTrak.id].index,
+              data: fragTrak.segmentStream.buffer,
+              complete: trackInfo[fragTrak.id].complete,
+              cts: startSample.cts,
+              dts: startSample.dts,
+              duration: endSample.dts - startSample.dts + endSample.duration
+            };
+            trackInfo[fragTrak.id].index += 1;
+            fragTrak.segmentStream = null;
+            delete fragmentStartSamples[fragTrak.id];
           }
+        }
       }
       finishedReading = await this.waitForMoreSamples();
     }

package/dist/{vite-plugin → packages/vite-plugin}/src/vite-plugin-editframe.mjs

@@ -1,10 +1,10 @@
 import path from "path";
 import debug from "debug";
-import { findOrCreateCaptions } from "../../assets/tasks/findOrCreateCaptions.mjs";
-import { generateTrackFragmentIndex } from "../../assets/tasks/generateTrackFragmentIndex.mjs";
-import { generateTrack } from "../../assets/tasks/generateTrack.mjs";
-import { cacheImage } from "../../assets/tasks/cacheImage.mjs";
-import { md5FilePath } from "../../assets/md5.mjs";
+import { findOrCreateCaptions } from "../../../lib/assets/tasks/findOrCreateCaptions.mjs";
+import { generateTrackFragmentIndex } from "../../../lib/assets/tasks/generateTrackFragmentIndex.mjs";
+import { generateTrack } from "../../../lib/assets/tasks/generateTrack.mjs";
+import { cacheImage } from "../../../lib/assets/tasks/cacheImage.mjs";
+import { md5FilePath } from "../../../lib/assets/md5.mjs";
 import { forbidRelativePaths } from "./forbidRelativePaths.mjs";
 import { sendTaskResult } from "./sendTaskResult.mjs";
 const vitePluginEditframe = (options) => {

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@editframe/vite-plugin",
-  "version": "0.5.0-beta.2",
+  "version": "0.5.0-beta.8",
   "description": "Editframe vite plugin",
   "exports": {
-    ".": "./dist/vite-plugin/src/vite-plugin-editframe.mjs"
+    ".": "./dist/packages/vite-plugin/src/vite-plugin-editframe.mjs"
   },
   "scripts": {
     "build": "vite build"
@@ -17,6 +17,7 @@
     "vite": "^5.2.11"
   },
   "devDependencies": {
-    "connect": "^3.7.0"
+    "connect": "^3.7.0",
+    "vite-tsconfig-paths": "^4.3.2"
   }
 }

package/docker-compose.yaml

@@ -1,17 +0,0 @@
-
-services:
-  build-vite-plugin:
-    image: telecine-runner
-    depends_on:
-      - runner
-    working_dir: /app
-    env_file:
-      - ${PWD}/.env
-    volumes_from:
-      - runner
-    stop_grace_period: 1s
-    init: true
-    scale: 1
-    environment:
-      - SHELL=/bin/sh
-    command: npx vite build --config lib/vite-plugin/vite.config.ts lib/vite-plugin/src/vite-plugin-editframe.ts --watch

package/src/forbidRelativePaths.ts

@@ -1,7 +0,0 @@
-import type { IncomingMessage } from "connect";
-
-export const forbidRelativePaths = (req: IncomingMessage) => {
-  if (req.url?.includes("..")) {
-    throw new Error("Relative paths are forbidden");
-  }
-};

package/src/sendTaskResult.ts

@@ -1,65 +0,0 @@
-import { createReadStream, statSync } from "fs";
-import type { ServerResponse } from "http";
-
-import mime from "mime";
-import debug from "debug";
-import type { IncomingMessage } from "connect";
-
-import type { TaskResult } from "@/assets/idempotentTask";
-
-export const sendTaskResult = (
-  req: IncomingMessage,
-  res: ServerResponse<IncomingMessage>,
-  taskResult: TaskResult,
-) => {
-  const { cachePath, md5Sum } = taskResult;
-  const filePath = cachePath;
-  const headers = {
-    etag: md5Sum,
-  };
-  const log = debug("@ef:sendfile");
-  try {
-    log(`Sending file ${filePath}`);
-    const stats = statSync(filePath);
-
-    if (req.headers.range) {
-      let [x, y] = req.headers.range.replace("bytes=", "").split("-");
-      let end = parseInt(y ?? "0", 10) || stats.size - 1;
-      let start = parseInt(x ?? "0", 10) || 0;
-
-      if (end >= stats.size) {
-        end = stats.size - 1;
-      }
-
-      if (start >= stats.size) {
-        log("Range start is greater than file size");
-        res.setHeader("Content-Range", `bytes */${stats.size}`);
-        res.statusCode = 416;
-        return res.end();
-      }
-
-      res.writeHead(206, {
-        ...headers,
-        "Content-Type": mime.getType(filePath) || "text/plain",
-        "Content-Range": `bytes ${start}-${end}/${stats.size}`,
-        "Content-Length": end - start + 1,
-        "Accept-Ranges": "bytes",
-      });
-      log(`Sending ${filePath} range ${start}-${end}/${stats.size}`);
-      const readStream = createReadStream(filePath, { start, end });
-      readStream.pipe(res);
-    } else {
-      res.writeHead(200, {
-        ...headers,
-        "Content-Type": mime.getType(filePath) || "text/plain",
-        "Contetn-Length": stats.size,
-      });
-      log(`Sending ${filePath}`);
-      const readStream = createReadStream(filePath);
-      readStream.pipe(res);
-    }
-  } catch (error) {
-    log("Error sending file", error);
-    console.error(error);
-  }
-};

package/src/vite-plugin-editframe.ts

@@ -1,95 +0,0 @@
-import path from "path";
-
-import { Plugin } from "vite";
-import debug from "debug";
-
-import { findOrCreateCaptions } from "@/assets/tasks/findOrCreateCaptions";
-import { generateTrackFragmentIndex } from "@/assets/tasks/generateTrackFragmentIndex";
-import { generateTrack } from "@/assets/tasks/generateTrack";
-import { cacheImage } from "@/assets/tasks/cacheImage";
-import { md5FilePath } from "@/assets/md5";
-
-import { forbidRelativePaths } from "./forbidRelativePaths";
-import { sendTaskResult } from "./sendTaskResult";
-
-interface VitePluginEditframeOptions {
-  root: string;
-  cacheRoot: string;
-}
-
-export const vitePluginEditframe = (options: VitePluginEditframeOptions) => {
-  return {
-    name: "vite-plugin-editframe",
-
-    configureServer(server) {
-      server.middlewares.use(async (req, res, next) => {
-        const log = debug("@ef:vite-plugin");
-        // Forbid relative paths in any request
-        if (req.url?.startsWith("/@ef")) {
-          forbidRelativePaths(req);
-        } else {
-          return next();
-        }
-
-        log(`Handling ${req.url}`);
-
-        const requestPath = req.url.replace(new RegExp("^/@ef-[^/]+/"), "");
-        const assetPath = requestPath.replace(/\?.*$/, "");
-        const absolutePath = path
-          .join(options.root, assetPath)
-          .replace("dist/", "src/");
-
-        options.cacheRoot = options.cacheRoot.replace("dist/", "src/");
-
-        const efPrefix = req.url.split("/")[1];
-
-        switch (efPrefix) {
-          case "@ef-asset": {
-            if (req.method !== "HEAD") {
-              res.writeHead(405, { Allow: "HEAD" });
-              res.end();
-            }
-            md5FilePath(absolutePath)
-              .then((md5) => {
-                res.writeHead(200, {
-                  etag: md5,
-                });
-                res.end();
-              })
-              .catch(next);
-            break;
-          }
-          case "@ef-track-fragment-index": {
-            log(`Serving track fragment index for ${absolutePath}`);
-            generateTrackFragmentIndex(options.cacheRoot, absolutePath)
-              .then((taskResult) => sendTaskResult(req, res, taskResult))
-              .catch(next);
-            break;
-          }
-          case "@ef-track": {
-            log(`Serving track for ${absolutePath}`);
-            generateTrack(options.cacheRoot, absolutePath, req.url)
-              .then((taskResult) => sendTaskResult(req, res, taskResult))
-              .catch(next);
-            break;
-          }
-          case "@ef-captions":
-            log(`Serving captions for ${absolutePath}`);
-            findOrCreateCaptions(options.cacheRoot, absolutePath)
-              .then((taskResult) => sendTaskResult(req, res, taskResult))
-              .catch(next);
-            break;
-          case "@ef-image":
-            log(`Serving image file ${absolutePath}`);
-            cacheImage(options.cacheRoot, absolutePath)
-              .then((taskResult) => sendTaskResult(req, res, taskResult))
-              .catch(next);
-            break;
-          default:
-            log(`Unknown asset type ${efPrefix}`);
-            break;
-        }
-      });
-    },
-  } satisfies Plugin;
-};

package/tsconfig.json

@@ -1,15 +0,0 @@
-{
-  "compilerOptions": {
-    "target": "esnext",
-    "module": "ES2015",
-    "outDir": "./dist",
-    "strict": true,
-    "esModuleInterop": true,
-    "skipLibCheck": true,
-    "forceConsistentCasingInFileNames": true,
-    "moduleResolution": "node"
-  },
-  "include": ["src/**/*.ts"],
-  "exclude": ["node_modules"],
-  "extends": "../../tsconfig.json"
-}

package/vite.config.ts

@@ -1,41 +0,0 @@
-import path from "path";
-import { defineConfig } from "vite";
-import tsconfigPaths from "vite-tsconfig-paths";
-import rollupTsConfigPaths from "rollup-plugin-tsconfig-paths";
-
-const __dirname = path.dirname(new URL(import.meta.url).pathname);
-
-export default defineConfig({
-  esbuild: {
-    target: "es2022",
-    platform: "browser",
-    include: /\.(m?[jt]s|[jt]sx)$/,
-    exclude: [],
-  },
-  plugins: [tsconfigPaths()],
-  appType: "custom",
-  root: __dirname,
-  css: {
-    postcss: __dirname,
-  },
-  build: {
-    ssr: true,
-    target: "es2022",
-    rollupOptions: {
-      treeshake: "recommended",
-      output: {
-        inlineDynamicImports: false,
-        preserveModules: true,
-      },
-      plugins: [rollupTsConfigPaths({})],
-    },
-    emptyOutDir: true,
-    outDir: path.join(__dirname, "dist/"),
-    lib: {
-      entry: path.join(__dirname, "src", "vite-plugin-editframe.ts"),
-      name: "vite-plugin-editframe",
-      fileName: "vite-plugin-editframe",
-      formats: ["es"],
-    },
-  },
-});