saloe 0.0.7 → 0.0.9

package/demos/demo-listener/package.json

@@ -23,7 +23,7 @@
   "license": "ISC",
   "devDependencies": {
     "@cloudflare/kv-asset-handler": "^0.3.4",
-    "saloe": "^0.0.6",
+    "saloe": "^0.0.8",
     "vite": "^5.4.3"
   }
 }

package/demos/demo-listener/public/load.js

@@ -1,5 +1,14 @@
+// import { setCookie, getCookie } from 'saloe/cookie'
+
+
 const load = ({ e, srcElement }) => {
     console.log('--- load')
+
+    // const key = 'test'
+    // setCookie({ key, value: '1234' })
+
+    // const value = getCookie({ key })
+    // console.log('--- value =', value)
 }
 
 export { load }

package/demos/demo-listener/server.js

@@ -51,9 +51,9 @@ const isServerOnlyCallback = ({ request }) => {
                 `,
                 scripts: () => html`
                     ${getScriptListener()}
-                    <script>
+                    <!-- <script>
                         console.log('Hello world!')
-                    </script>
+                    </script> -->
                 `,
                 env,
             })

package/demos/demo-listener/vite.config.js

@@ -5,7 +5,7 @@ export default defineConfig({
     define: {
         __ENV__: `'${process.env.ENV}'`,
         __BUILD_TIME__: `'${new Date().toISOString()}'`,
-        __APP_NAME__: `'demo-server'`,
+        __APP_NAME__: `'demo-listener'`,
     },
     plugins: [],
     build: {

package/dist/router.cjs.js

@@ -4,9 +4,9 @@ const urlpattern = require("./urlpattern.cjs.js");
 const worker = require("./worker.cjs.js");
 const router = /* @__PURE__ */ new Map();
 const getRouter = () => router;
-const getRoute = ({ pathname }) => router.get(pathname);
-const addRoute = ({ pathname, route }) => router.set(pathname, route);
-const removeRoute = ({ pathname }) => router.delete(pathname);
+const getRoute = ({ pathname: pathname2 }) => router.get(pathname2);
+const addRoute = ({ pathname: pathname2, route }) => router.set(pathname2, route);
+const removeRoute = ({ pathname: pathname2 }) => router.delete(pathname2);
 const findPatternFromUrl = ({ url }) => {
   var _a;
   const patternPathname = [...new Set((_a = getRouter()) == null ? void 0 : _a.keys())].find((patternPathname2) => {
@@ -15,9 +15,12 @@ const findPatternFromUrl = ({ url }) => {
   });
   return patternPathname ? urlpattern.getURLPatern({ pathname: patternPathname }) : null;
 };
-const getRedirectResponse = ({ origin, pathname, isRedirectableCallback }) => {
-  if (origin !== (self == null ? void 0 : self.origin)) return;
-  const isRedirectable = isRedirectableCallback({ pathname });
+const getRedirectResponse = ({ origin, request, isRedirectableCallback }) => {
+  const url = new URL(request.url);
+  const requestOrigin = url.origin;
+  if (origin !== requestOrigin) return;
+  if (!isRedirectableCallback) return;
+  const isRedirectable = isRedirectableCallback({ request });
   const response = isRedirectable ? Response.redirect(pathname.slice(0, -1), 301) : null;
   return { response };
 };
@@ -29,13 +32,19 @@ const getNotFoundResponse = async ({ request }) => {
   return { response };
 };
 const getForbiddenResponse = ({ origin, request, isForbiddenCallback }) => {
-  if (origin !== (self == null ? void 0 : self.origin)) return;
+  const url = new URL(request.url);
+  const requestOrigin = url.origin;
+  if (origin !== requestOrigin) return;
+  if (!isForbiddenCallback) return;
   const isForbidden = isForbiddenCallback({ request });
   if (!isForbidden) return;
   return { response: new Response(`${request == null ? void 0 : request.url} is forbidden`, { status: 503 }) };
 };
 const getServerOnlyResponse = ({ origin, request, isServerOnlyCallback }) => {
-  if (origin !== (self == null ? void 0 : self.origin)) return;
+  const url = new URL(request.url);
+  const requestOrigin = url.origin;
+  if (origin !== requestOrigin) return;
+  if (!isServerOnlyCallback) return;
   const isServerOnly = isServerOnlyCallback({ request });
   if (!isServerOnly) return;
   return worker.fetch({ request });

package/dist/router.es.js

@@ -2,9 +2,9 @@ import { getURLPatern } from "./urlpattern.es.js";
 import { fetch } from "./worker.es.js";
 const router = /* @__PURE__ */ new Map();
 const getRouter = () => router;
-const getRoute = ({ pathname }) => router.get(pathname);
-const addRoute = ({ pathname, route }) => router.set(pathname, route);
-const removeRoute = ({ pathname }) => router.delete(pathname);
+const getRoute = ({ pathname: pathname2 }) => router.get(pathname2);
+const addRoute = ({ pathname: pathname2, route }) => router.set(pathname2, route);
+const removeRoute = ({ pathname: pathname2 }) => router.delete(pathname2);
 const findPatternFromUrl = ({ url }) => {
   var _a;
   const patternPathname = [...new Set((_a = getRouter()) == null ? void 0 : _a.keys())].find((patternPathname2) => {
@@ -13,9 +13,12 @@ const findPatternFromUrl = ({ url }) => {
   });
   return patternPathname ? getURLPatern({ pathname: patternPathname }) : null;
 };
-const getRedirectResponse = ({ origin, pathname, isRedirectableCallback }) => {
-  if (origin !== (self == null ? void 0 : self.origin)) return;
-  const isRedirectable = isRedirectableCallback({ pathname });
+const getRedirectResponse = ({ origin, request, isRedirectableCallback }) => {
+  const url = new URL(request.url);
+  const requestOrigin = url.origin;
+  if (origin !== requestOrigin) return;
+  if (!isRedirectableCallback) return;
+  const isRedirectable = isRedirectableCallback({ request });
   const response = isRedirectable ? Response.redirect(pathname.slice(0, -1), 301) : null;
   return { response };
 };
@@ -27,13 +30,19 @@ const getNotFoundResponse = async ({ request }) => {
   return { response };
 };
 const getForbiddenResponse = ({ origin, request, isForbiddenCallback }) => {
-  if (origin !== (self == null ? void 0 : self.origin)) return;
+  const url = new URL(request.url);
+  const requestOrigin = url.origin;
+  if (origin !== requestOrigin) return;
+  if (!isForbiddenCallback) return;
   const isForbidden = isForbiddenCallback({ request });
   if (!isForbidden) return;
   return { response: new Response(`${request == null ? void 0 : request.url} is forbidden`, { status: 503 }) };
 };
 const getServerOnlyResponse = ({ origin, request, isServerOnlyCallback }) => {
-  if (origin !== (self == null ? void 0 : self.origin)) return;
+  const url = new URL(request.url);
+  const requestOrigin = url.origin;
+  if (origin !== requestOrigin) return;
+  if (!isServerOnlyCallback) return;
   const isServerOnly = isServerOnlyCallback({ request });
   if (!isServerOnly) return;
   return fetch({ request });

package/package.json

@@ -1,10 +1,10 @@
 {
     "name": "saloe",
-    "version": "0.0.7",
+    "version": "0.0.9",
     "description": "Tools for making web development easy and efficient",
     "scripts": {
         "build": "vite build",
-        "publish": "npm run build && npm publish --access public --loglevel verbose"
+        "deploy": "npm run build && npm publish --access public --loglevel verbose"
     },
     "repository": {
         "type": "git",

package/src/router.js

@@ -19,10 +19,16 @@ const findPatternFromUrl = ({ url }) => {
     return patternPathname ? getURLPatern({ pathname: patternPathname }) : null
 }
 
-const getRedirectResponse = ({ origin, pathname, isRedirectableCallback }) => {
-    if (origin !== self?.origin) return
-    const isRedirectable = isRedirectableCallback({ pathname })
+const getRedirectResponse = ({ origin, request, isRedirectableCallback }) => {
+    const url = new URL(request.url)
+    const requestOrigin = url.origin
+    if (origin !== requestOrigin) return
+
+    if (!isRedirectableCallback) return
+
+    const isRedirectable = isRedirectableCallback({ request })
     const response = isRedirectable ? Response.redirect(pathname.slice(0, -1), 301) : null
+
     return { response }
 }
 
@@ -34,16 +40,28 @@ const getNotFoundResponse = async ({ request }) => {
 }
 
 const getForbiddenResponse = ({ origin, request, isForbiddenCallback }) => {  
-    if (origin !== self?.origin) return  
+    const url = new URL(request.url)
+    const requestOrigin = url.origin
+    if (origin !== requestOrigin) return
+
+    if (!isForbiddenCallback) return
+
     const isForbidden = isForbiddenCallback({ request })
     if (!isForbidden) return
+
     return { response: new Response(`${request?.url} is forbidden`, { status: 503 }) }
 }
 
 const getServerOnlyResponse = ({ origin, request, isServerOnlyCallback }) => {
-    if (origin !== self?.origin) return
+    const url = new URL(request.url)
+    const requestOrigin = url.origin
+    if (origin !== requestOrigin) return
+
+    if (!isServerOnlyCallback) return
+
     const isServerOnly = isServerOnlyCallback({ request })
     if (!isServerOnly) return
+    
     return fetchAsWorker({ request })
 }