From f77f0f08ebbb804422bd59c91723de8c93deabc8 Mon Sep 17 00:00:00 2001
From: Untone <anton.rewin@gmail.com>
Date: Wed, 1 May 2024 21:34:35 +0300
Subject: [PATCH] sessionfix+bufferfix

---
 package-lock.json                             | 26 ++-----------------
 package.json                                  |  3 +--
 .../Editor/AudioUploader/AudioUploader.tsx    |  7 +----
 src/context/session.tsx                       |  9 +++----
 vite.config.ts                                |  2 +-
 5 files changed, 8 insertions(+), 39 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d2e84e56..34c74d64 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,7 +10,6 @@
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
-        "buffer": "6.0.3",
         "form-data": "4.0.0",
         "idb": "8.0.0",
         "mailgun.js": "10.1.0"
@@ -4948,6 +4947,7 @@
       "version": "1.5.1",
       "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
       "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
+      "dev": true,
       "funding": [
         {
           "type": "github",
@@ -5098,29 +5098,6 @@
         "node-int64": "^0.4.0"
       }
     },
-    "node_modules/buffer": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
-      "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "dependencies": {
-        "base64-js": "^1.3.1",
-        "ieee754": "^1.2.1"
-      }
-    },
     "node_modules/buffer-from": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
@@ -7172,6 +7149,7 @@
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
       "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
+      "dev": true,
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 4d86b777..92856e9e 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,6 @@
     "typecheck:watch": "tsc --noEmit --watch"
   },
   "dependencies": {
-    "buffer": "6.0.3",
     "form-data": "4.0.0",
     "idb": "8.0.0",
     "mailgun.js": "10.1.0"
@@ -144,4 +143,4 @@
   "trustedDependencies": [
     "@biomejs/biome"
   ]
-}
\ No newline at end of file
+}
diff --git a/src/components/Editor/AudioUploader/AudioUploader.tsx b/src/components/Editor/AudioUploader/AudioUploader.tsx
index 8805f47f..22db8e7f 100644
--- a/src/components/Editor/AudioUploader/AudioUploader.tsx
+++ b/src/components/Editor/AudioUploader/AudioUploader.tsx
@@ -9,12 +9,7 @@ import { DropArea } from '../../_shared/DropArea'
 
 import styles from './AudioUploader.module.scss'
 
-try {
-  // biome-ignore lint/style/useNodejsImportProtocol: it works like this
-  window.Buffer = (await import('buffer')).Buffer
-} catch (_e) {
-  window.Buffer = (await import('node:buffer')).Buffer
-}
+window.Buffer = (await import('node:buffer')).Buffer
 
 type Props = {
   class?: string
diff --git a/src/context/session.tsx b/src/context/session.tsx
index 8fbd38e5..c2bad423 100644
--- a/src/context/session.tsx
+++ b/src/context/session.tsx
@@ -271,12 +271,9 @@ export const SessionProvider = (props: {
 
   // callback state updater
   createEffect(
-    on(
-      () => props.onStateChangeCallback,
-      () => {
-        props.onStateChangeCallback(session())
-      },
-    ),
+    on([() => props.onStateChangeCallback, session], ([_, ses]) => {
+      ses?.user?.id && props.onStateChangeCallback(ses)
+    }),
   )
 
   const [authCallback, setAuthCallback] = createSignal<() => void>(noop)
diff --git a/vite.config.ts b/vite.config.ts
index 4cece488..f5146681 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -66,7 +66,7 @@ export default defineConfig(({ mode, command }) => {
     },
     build: {
       rollupOptions: {
-        external: ['buffer'],
+        external: [],
       },
       chunkSizeWarningLimit: 1024,
       target: 'esnext',