From 9497c99e9e4c57b1c196f133b9ae5b5340799b99 Mon Sep 17 00:00:00 2001
From: Felix Roos <roos@entrecode.de>
Date: Sun, 21 Aug 2022 11:21:19 +0200
Subject: [PATCH] merge evaluator and scheduler hooks + use getTime

---
 packages/react/examples/nano-repl/src/App.jsx | 22 ++++++----
 packages/react/src/hooks/useEvaluator.jsx     | 36 ---------------
 packages/react/src/hooks/useScheduler.jsx     | 18 --------
 packages/react/src/hooks/useStrudel.mjs       | 44 +++++++++++++++++++
 4 files changed, 57 insertions(+), 63 deletions(-)
 delete mode 100644 packages/react/src/hooks/useEvaluator.jsx
 delete mode 100644 packages/react/src/hooks/useScheduler.jsx
 create mode 100644 packages/react/src/hooks/useStrudel.mjs

diff --git a/packages/react/examples/nano-repl/src/App.jsx b/packages/react/examples/nano-repl/src/App.jsx
index 95c590cb..e1ca3e42 100644
--- a/packages/react/examples/nano-repl/src/App.jsx
+++ b/packages/react/examples/nano-repl/src/App.jsx
@@ -2,10 +2,9 @@ import controls from '@strudel.cycles/core/controls.mjs';
 import { evalScope } from '@strudel.cycles/eval';
 import { getAudioContext, panic, webaudioOutput } from '@strudel.cycles/webaudio';
 import { useCallback, useState } from 'react';
-import useScheduler from '../../../src/hooks/useScheduler';
-import useEvaluator from '../../../src/hooks/useEvaluator';
-import useKeydown from '../../../src/hooks/useKeydown.mjs';
 import CodeMirror, { flash } from '../../../src/components/CodeMirror6';
+import useKeydown from '../../../src/hooks/useKeydown.mjs';
+import useStrudel from '../../../src/hooks/useStrudel';
 import './style.css';
 // import { prebake } from '../../../../../repl/src/prebake.mjs';
 
@@ -63,16 +62,21 @@ stack(
   .echoWith(4,.125,(x,n)=>x.gain(.15*1/(n+1))) // echo notes
   //.hush()
 )
-.cps(2/3)`;
+.fast(2/3)`;
 
 // await prebake();
 
+const ctx = getAudioContext();
+
 function App() {
   const [code, setCode] = useState(defaultTune);
-  const { evaluate, pattern, isDirty, error: evaluatorError } = useEvaluator({ code });
-  const { scheduler, error: schedulerError } = useScheduler(pattern, webaudioOutput);
+  const { scheduler, evaluate, schedulerError, evalError, isDirty } = useStrudel({
+    code,
+    defaultOutput: webaudioOutput,
+    getTime: () => ctx.currentTime,
+  });
   const [view, setView] = useState();
-  const error = evaluatorError || schedulerError;
+  const error = evalError || schedulerError;
   useKeydown(
     useCallback(
       (e) => {
@@ -105,8 +109,8 @@ function App() {
       <nav className="z-[12] w-full flex justify-center absolute bottom-0">
         <div className="bg-slate-500 space-x-2 px-2 rounded-t-md">
           <button
-            onClick={() => {
-              getAudioContext().resume();
+            onClick={async () => {
+              await getAudioContext().resume();
               scheduler.start();
             }}
           >
diff --git a/packages/react/src/hooks/useEvaluator.jsx b/packages/react/src/hooks/useEvaluator.jsx
deleted file mode 100644
index 26ee86ae..00000000
--- a/packages/react/src/hooks/useEvaluator.jsx
+++ /dev/null
@@ -1,36 +0,0 @@
-import { useRef, useState, useCallback, useEffect } from 'react';
-import { evaluate as _evaluate } from '@strudel.cycles/eval';
-
-function useEvaluator({ code, evalOnMount = true }) {
-  const [error, setError] = useState();
-  const [activeCode, setActiveCode] = useState(code);
-  const [pattern, setPattern] = useState();
-  const isDirty = code !== activeCode;
-
-  const evaluate = useCallback(async () => {
-    if (!code) {
-      console.log('no code..');
-      return;
-    }
-    try {
-      // TODO: let user inject custom eval function?
-      const { pattern: _pattern } = await _evaluate(code);
-      setActiveCode(code);
-      setPattern(_pattern);
-      setError();
-    } catch (err) {
-      setError(err);
-      console.warn('eval error', err);
-    }
-  }, [code, scheduler]);
-  const inited = useRef();
-  useEffect(() => {
-    if (!inited.current && evalOnMount) {
-      inited.current = true;
-      evaluate();
-    }
-  }, [evaluate, evalOnMount]);
-  return { error, evaluate, activeCode, pattern, isDirty };
-}
-
-export default useEvaluator;
diff --git a/packages/react/src/hooks/useScheduler.jsx b/packages/react/src/hooks/useScheduler.jsx
deleted file mode 100644
index 52c61ef4..00000000
--- a/packages/react/src/hooks/useScheduler.jsx
+++ /dev/null
@@ -1,18 +0,0 @@
-import { Scheduler } from '@strudel.cycles/core';
-import { useEffect, useMemo, useState } from 'react';
-
-function useScheduler(pattern, defaultOutput, interval = 0.1) {
-  const [error, setError] = useState();
-  // TODO: how / when to remove schedulerError?
-  const scheduler = useMemo(
-    () => new Scheduler({ interval, onTrigger: defaultOutput, onError: setError }),
-    [defaultOutput, interval],
-  );
-  useEffect(() => {
-    // console.log('pattern', pattern);
-    pattern && scheduler?.setPattern(pattern);
-  }, [pattern, scheduler]);
-  return { error, scheduler };
-}
-
-export default useScheduler;
diff --git a/packages/react/src/hooks/useStrudel.mjs b/packages/react/src/hooks/useStrudel.mjs
new file mode 100644
index 00000000..7420bc3e
--- /dev/null
+++ b/packages/react/src/hooks/useStrudel.mjs
@@ -0,0 +1,44 @@
+import { Scheduler } from '@strudel.cycles/core';
+import { useRef, useCallback, useEffect, useMemo, useState } from 'react';
+import { evaluate as _evaluate } from '@strudel.cycles/eval';
+
+function useStrudel({ defaultOutput, interval, getTime, code, evalOnMount = true }) {
+  // scheduler
+  const [schedulerError, setSchedulerError] = useState();
+  const [evalError, setEvalError] = useState();
+  const [activeCode, setActiveCode] = useState(code);
+  const isDirty = code !== activeCode;
+  // TODO: how / when to remove schedulerError?
+  const scheduler = useMemo(
+    () => new Scheduler({ interval, onTrigger: defaultOutput, onError: setSchedulerError, getTime }),
+    [defaultOutput, interval],
+  );
+  const evaluate = useCallback(async () => {
+    if (!code) {
+      console.log('no code..');
+      return;
+    }
+    try {
+      // TODO: let user inject custom eval function?
+      const { pattern } = await _evaluate(code);
+      setActiveCode(code);
+      scheduler?.setPattern(pattern);
+      setEvalError();
+    } catch (err) {
+      setEvalError(err);
+      console.warn('eval error', err);
+    }
+  }, [code, scheduler]);
+
+  const inited = useRef();
+  useEffect(() => {
+    if (!inited.current && evalOnMount) {
+      inited.current = true;
+      evaluate();
+    }
+  }, [evaluate, evalOnMount]);
+
+  return { schedulerError, scheduler, evalError, evaluate, activeCode, isDirty };
+}
+
+export default useStrudel;