npm - @arcanewizards/timecode-toolbox - Versions diffs - 0.1.3 → 0.1.5 - Mend

@arcanewizards/timecode-toolbox 0.1.3 → 0.1.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (15) hide show

package/README.md +3 -3
package/dist/components/frontend/index.d.mts +2 -1
package/dist/components/frontend/index.d.ts +2 -1
package/dist/components/frontend/index.js +1261 -193
package/dist/components/frontend/index.mjs +1319 -222
package/dist/entrypoint.css +29 -3
package/dist/entrypoint.js +2863 -753
package/dist/entrypoint.js.map +4 -4
package/dist/frontend.js +2863 -753
package/dist/frontend.js.map +4 -4
package/dist/index.js +184 -27
package/dist/index.mjs +184 -27
package/dist/start.js +184 -27
package/dist/start.mjs +184 -27
package/package.json +7 -6

package/dist/index.js CHANGED Viewed

@@ -30,6 +30,53 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+// ../../node_modules/.pnpm/escape-html@1.0.3/node_modules/escape-html/index.js
+var require_escape_html = __commonJS({
+  "../../node_modules/.pnpm/escape-html@1.0.3/node_modules/escape-html/index.js"(exports2, module2) {
+    "use strict";
+    var matchHtmlRegExp = /["'&<>]/;
+    module2.exports = escapeHtml;
+    function escapeHtml(string) {
+      var str = "" + string;
+      var match = matchHtmlRegExp.exec(str);
+      if (!match) {
+        return str;
+      }
+      var escape;
+      var html = "";
+      var index = 0;
+      var lastIndex = 0;
+      for (index = match.index; index < str.length; index++) {
+        switch (str.charCodeAt(index)) {
+          case 34:
+            escape = "&quot;";
+            break;
+          case 38:
+            escape = "&amp;";
+            break;
+          case 39:
+            escape = "&#39;";
+            break;
+          case 60:
+            escape = "&lt;";
+            break;
+          case 62:
+            escape = "&gt;";
+            break;
+          default:
+            continue;
+        }
+        if (lastIndex !== index) {
+          html += str.substring(lastIndex, index);
+        }
+        lastIndex = index + 1;
+        html += escape;
+      }
+      return lastIndex !== index ? html + str.substring(lastIndex, index) : html;
+    }
+  }
+});
 // ../../node_modules/.pnpm/lodash@4.17.23/node_modules/lodash/_listCacheClear.js
 var require_listCacheClear = __commonJS({
   "../../node_modules/.pnpm/lodash@4.17.23/node_modules/lodash/_listCacheClear.js"(exports2, module2) {
@@ -1654,6 +1701,7 @@ var import_data = require("@arcanejs/react-toolkit/data");
 var import_react_toolkit2 = require("@arcanejs/react-toolkit");
 var import_toolkit = require("@arcanejs/toolkit");
 var import_events = require("events");
+var import_escape_html = __toESM(require_escape_html(), 1);
 var import_jsx_runtime = require("react/jsx-runtime");
 // ../../packages/net-utils/dist/index.js
@@ -1861,6 +1909,26 @@ var runSigilApp = ({
       debug: upstreamLogger.debug.bind(upstreamLogger)
     },
     title,
+    htmlPage: (context) => `
+          <html>
+            <head>
+              <title>${(0, import_escape_html.default)(context.title)}</title>
+              <meta charset="utf-8">
+              <meta name="viewport" content="width=device-width, user-scalable=no" />
+              <style type="text/css">
+                @font-face {
+                  font-family: 'Material Symbols Outlined';
+                  font-style: normal;
+                  src: url(${context.coreAssets.materialSymbolsOutlined}) format('woff');
+                }
+              </style>
+              ${context.coreAssets.entrypointCss ? `<link rel="stylesheet" href="${context.coreAssets.entrypointCss}" />` : ""}
+            </head>
+            <body>
+              <div id="root"></div>
+              <script type="text/javascript" src="${context.coreAssets.entrypointJs}"></script>
+            </body>
+          </html>`,
     ...toolkitOptions
   });
   toolkit.start({
@@ -2056,7 +2124,8 @@ var AppListenerManager = ({
             const resolvedConnectionDetails = {
               config,
               host,
-              port
+              port,
+              internal: !!config.interface && !!interfaces[config.interface]?.internal
             };
             try {
               const listener = await toolkit.listen({
@@ -2127,11 +2196,21 @@ var AppListenerManager = ({
   }, [appRegistration, listenerConfig, logger, toolkit, updateReactState]);
   (0, import_react3.useEffect)(() => {
     for (const state of Object.values(listenerState)) {
+      let preferredConnection = null;
       if (state.state === "connected") {
+        if (!preferredConnection) {
+          preferredConnection = state;
+        }
+        if (!preferredConnection.internal && state.internal) {
+          preferredConnection = state;
+        }
+      }
+      if (preferredConnection) {
         setWindowUrl(
-          new URL(`http://${state.host ?? "localhost"}:${state.port}/`)
+          new URL(
+            `http://${preferredConnection.host ?? "localhost"}:${preferredConnection.port}/`
+          )
         );
-        return;
       }
     }
   });
@@ -6204,6 +6283,24 @@ var SIGIL_COLOR = external_exports.enum([
   "gray"
 ]);
+// ../../packages/sigil/dist/shared/config.js
+var APP_LISTENER_CONFIG = zod_default.object({
+  port: zod_default.union([
+    zod_default.number().int().min(1).max(65535),
+    zod_default.object({
+      from: zod_default.number().int().min(1).max(65535),
+      to: zod_default.number().int().min(1).max(65535)
+    }).refine((data) => data.to >= data.from, {
+      message: '"to" must be greater than or equal to "from"'
+    })
+  ]),
+  interface: zod_default.string().optional()
+});
+var ALL_APP_LISTENER_CONFIG = zod_default.record(
+  zod_default.string(),
+  APP_LISTENER_CONFIG
+);
 // src/components/proto.ts
 var NET_UTILS_GENERAL_TARGET_DEFINITION = zod_default.union([
   zod_default.object({
@@ -6284,6 +6381,7 @@ var OUTPUT_CONFIG = zod_default.object({
   link: INPUT_OR_GENERATOR_INSTANCE_ID.nullable()
 });
 var TOOLBOX_CONFIG = zod_default.object({
+  appListener: APP_LISTENER_CONFIG.partial().optional(),
   inputs: zod_default.record(zod_default.string(), INPUT_CONFIG),
   generators: zod_default.record(zod_default.string(), GENERATOR_CONFIG),
   outputs: zod_default.record(zod_default.string(), OUTPUT_CONFIG),
@@ -6317,7 +6415,11 @@ var DEFAULT_PROPS2 = {
     updates: null
   },
   handlers: { children: {} },
-  license: ""
+  license: "",
+  network: {
+    envPort: null,
+    defaultPort: -1
+  }
 };
 var ToolboxRoot = class extends import_base2.Base {
   /** @hidden */
@@ -6346,7 +6448,8 @@ var ToolboxRoot = class extends import_base2.Base {
       config: this.props.config,
       state: this.props.state,
       handlers: this.props.handlers,
-      license: this.props.license
+      license: this.props.license,
+      network: this.props.network
     };
   }
   /** @hidden */
@@ -6729,9 +6832,27 @@ var createArtnet = (config) => {
     })();
     return connectPromise;
   };
+  const getNextFrameTiming = (mode, timeMillis) => {
+    const timecode = getTimecodeFromMillis(mode, timeMillis);
+    timecode.frame += 1;
+    if (timecode.frame >= TIMECODE_FPS[mode]) {
+      timecode.frame = 0;
+      timecode.seconds += 1;
+      if (timecode.seconds >= 60) {
+        timecode.seconds = 0;
+        timecode.minutes += 1;
+        if (timecode.minutes >= 60) {
+          timecode.minutes = 0;
+          timecode.hours += 1;
+        }
+      }
+    }
+    const nextFrameTimeMillis = getTimeMillisFromTimecode(timecode);
+    return { nextFrameTimeMillis };
+  };
   const sendTimecode = (mode, timeMillis) => {
     if (timeMillis < 0) {
-      return Promise.resolve();
+      return Promise.resolve(getNextFrameTiming(mode, timeMillis));
     }
     if (!sendSocket) {
       return Promise.reject(new Error("ArtNet connection has not been opened"));
@@ -6772,7 +6893,7 @@ var createArtnet = (config) => {
             events.emit("error", error);
             reject(error);
           } else {
-            resolve();
+            resolve(getNextFrameTiming(mode, timeMillis));
           }
         }
       )
@@ -6785,6 +6906,7 @@ var createArtnet = (config) => {
   };
   return {
     connect,
+    getNextFrameTiming,
     sendTimecode,
     on,
     addListener,
@@ -6865,7 +6987,7 @@ var ArtnetInputConnection = ({
     created.connect().then(() => {
       artnet = created;
       setArtnetInstance(created);
-      log.info("ArtNet Timecode output initialized");
+      log.info("ArtNet Timecode input initialized");
       setConnection({ ...connectionConfig, status: "active" });
     }).catch((err) => {
       const error = new Error("Failed to start ArtNet Timecode output");
@@ -14189,12 +14311,30 @@ var ArtnetOutputConnection = ({
     }
     if (timecodeState?.state === "playing" || timecodeState?.state === "lagging") {
       const tcState = timecodeState;
-      const interval = setInterval(() => {
+      let timeoutId = null;
+      const sendNextFrame = () => {
         const time = (Date.now() - tcState.effectiveStartTimeMillis) * tcState.speed;
-        artnetInstance.sendTimecode(mode, time);
-      }, 1e3 / TIMECODE_FPS[mode]);
+        artnetInstance.sendTimecode(mode, time).then(({ nextFrameTimeMillis }) => {
+          const delay = nextFrameTimeMillis - time + 1;
+          timeoutId = setTimeout(sendNextFrame, delay);
+        }).catch(() => {
+          scheduleNextFrame();
+        });
+      };
+      const scheduleNextFrame = () => {
+        const time = (Date.now() - tcState.effectiveStartTimeMillis) * tcState.speed;
+        const { nextFrameTimeMillis } = artnetInstance.getNextFrameTiming(
+          mode,
+          time
+        );
+        const delay = nextFrameTimeMillis - time + 1;
+        timeoutId = setTimeout(sendNextFrame, delay);
+      };
+      scheduleNextFrame();
       return () => {
-        clearInterval(interval);
+        if (timeoutId) {
+          clearTimeout(timeoutId);
+        }
       };
     } else if (timecodeState?.state === "stopped") {
       artnetInstance.sendTimecode(mode, timecodeState?.positionMillis ?? 0);
@@ -14448,6 +14588,8 @@ var ClockGenerator = ({
           timecode: {
             metadata: null,
             name: null,
+            errors: [],
+            warnings: [],
             state: {
               accuracyMillis: null,
               smpteMode: null,
@@ -14649,10 +14791,7 @@ var UpdateChecker = ({
 // src/env.ts
 var getEnv = (logger) => {
-  const PORT = process.env.PORT ? parseInt(process.env.PORT, 10) : {
-    from: 4100,
-    to: 4200
-  };
+  const PORT = process.env.PORT && parseInt(process.env.PORT, 10) || null;
   let API_BASE_URL;
   try {
     API_BASE_URL = process.env.API_BASE_URL ? new URL(process.env.API_BASE_URL) : new URL("https://arcanewizards.com");
@@ -14670,6 +14809,7 @@ var getEnv = (logger) => {
 // src/app.tsx
 var import_jsx_runtime9 = require("react/jsx-runtime");
+var DEFAULT_PORT = { from: 4100, to: 4200 };
 var App = ({
   title,
   version: version2,
@@ -14727,14 +14867,16 @@ var App = ({
     [handlers]
   );
   const license = useLicense();
-  const appListenerConfig = (0, import_react10.useMemo)(
-    () => ({
-      default: {
-        port: env.PORT
-      }
-    }),
-    [env.PORT]
-  );
+  const appListenerConfig = (0, import_react10.useMemo)(() => {
+    const baseConfig = {
+      port: data.appListener?.port ?? DEFAULT_PORT,
+      interface: data.appListener?.interface ?? void 0
+    };
+    if (env.PORT) {
+      baseConfig.port = env.PORT;
+    }
+    return baseConfig;
+  }, [env.PORT, data.appListener]);
   if (!license) {
     return;
   }
@@ -14747,7 +14889,11 @@ var App = ({
         handlers: availableHandlers,
         onUpdateConfig,
         onCallHandler: callHandler,
-        license: license.text
+        license: license.text,
+        network: {
+          envPort: env.PORT,
+          defaultPort: DEFAULT_PORT
+        }
       }
     ),
     /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(InputConnections, { state, setState }),
@@ -14799,7 +14945,7 @@ var App = ({
           {
             toolkit,
             setWindowUrl,
-            listenerConfig: appListenerConfig
+            listenerConfig: { appListenerConfig }
           }
         )
       ]
@@ -14817,7 +14963,7 @@ var createApp = (props) => {
 };
 // package.json
-var version = "0.1.3";
+var version = "0.1.5";
 // src/urls.ts
 var urls_exports = {};
@@ -14891,3 +15037,14 @@ lodash/lodash.js:
    * Copyright Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
    *)
 */
+/*! Bundled license information:
+escape-html/index.js:
+  (*!
+   * escape-html
+   * Copyright(c) 2012-2013 TJ Holowaychuk
+   * Copyright(c) 2015 Andreas Lubbe
+   * Copyright(c) 2015 Tiancheng "Timothy" Gu
+   * MIT Licensed
+   *)
+*/