jeawin-astro 3.0.37 → 3.0.39

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "jeawin-astro",
-    "version": "3.0.37",
+    "version": "3.0.39",
     "author": "chaegumi <chaegumi@qq.com>",
     "description": "",
     "license": "MIT",

package/src/components/detail_images.astro

@@ -15,6 +15,7 @@ import Youtube from "./youtube.astro";
 import Vimeo from "./vimeo.astro";
 import { img_add_link, render_value,img_change_attrs } from "../scripts/util.js";
 import view360img from "../assets/images/360_view.svg";
+import IframeVideo from "./iframe_video.astro";
 
 type JWVIDEO = {
   poster: string; // 图片
@@ -40,6 +41,12 @@ const { node_title, nodepics = [], video, view360 } = Astro.props;
     x-data={`{
       isVideoPoppedUp:false,
       closeVideo(){
+        if(this.$refs.video){
+          const iframe = this.$refs.video.querySelector('iframe');
+          if(iframe){
+            iframe.src = iframe.src;
+          }
+        }
         this.isVideoPoppedUp = false;
       },
       openVideo(){
@@ -150,7 +157,7 @@ const { node_title, nodepics = [], video, view360 } = Astro.props;
         </swiper-container>
         {
           video ? (
-            <div
+            <div x-ref="video" 
               x-bind:class="{ 'flex': isVideoPoppedUp, 'hidden': !isVideoPoppedUp }"
               class="fixed inset-0 w-full h-full flex items-center justify-center hidden z-10"
             >
@@ -186,17 +193,7 @@ const { node_title, nodepics = [], video, view360 } = Astro.props;
                             ) : video.platform == 'vimeo' ? (
                               <Vimeo id={render_value(video, 'id')} />
                             ) : (
-                              <iframe
-                                x-ref="video"
-                                width="560"
-                                height="315"
-                                src={video.id}
-                                title="video player"
-                                frameborder="0"
-                                allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share"
-                                referrerpolicy="strict-origin-when-cross-origin"
-                                allowfullscreen>
-                              </iframe>
+                              <IframeVideo id={render_value(video, 'id')} />
                             )
                           }                          
                         </Fragment>
@@ -206,7 +203,7 @@ const { node_title, nodepics = [], video, view360 } = Astro.props;
                   ) : video.type == 'code' ? (
                     <Fragment set:html={video.code} />
                   ) : (
-                    <video x-ref="video" class="rounded-lg w-full max-w-2xl" controls>
+                    <video class="rounded-lg w-full max-w-2xl" controls>
                       <source src={video.local_url} type="video/mp4" />
                     </video>
                   )

package/src/components/iframe_video.astro

@@ -0,0 +1,21 @@
+---
+import dayjs from 'dayjs';
+const { id, width = 560, height = 315, title = 'Video player' } = Astro.props;
+let url = id;
+
+const currenttime = dayjs().unix();
+---
+
+<div id={`iframe-video-placeholder${currenttime}`} style={`width:${width}px;height:${height}px;`}></div>
+
+<script is:inline define:vars={{currenttime, url: url, width, height, title}}>
+  window.addEventListener('load', function() {
+    let iframe = document.createElement('iframe');
+    iframe.src = url;
+    iframe.width = width;
+    iframe.height = height;
+    iframe.title = title;
+    iframe.allowFullscreen = true;
+    document.getElementById(`iframe-video-placeholder${currenttime}`).appendChild(iframe);
+  });
+</script>

package/src/components/index.ts

@@ -57,6 +57,7 @@ export {default as Tabs} from "./tabs.astro";
 export {default as TagsCategoryList} from "./tags_category_list.astro";
 export {default as Vimeo} from "./vimeo.astro";
 export {default as Youtube} from "./youtube.astro";
+export {default as IframeVideo} from "./iframe_video.astro";
 export {default as Chatbot} from "./chatbot.astro";
 
 export * from "./bgs/index.ts";

package/src/components/vimeo.astro

@@ -1,5 +1,6 @@
 ---
-const { id } = Astro.props;
+import dayjs from 'dayjs';
+const { id, width = 640, height = 360, title = 'Vimeo player' } = Astro.props;
 let url = "";
 if (id.indexOf("https") !== -1) {
   // 是url形式
@@ -8,12 +9,18 @@ if (id.indexOf("https") !== -1) {
   // 是id形式
   url = `https://player.vimeo.com/video/${id}`;
 }
+const currenttime = dayjs().unix();
 ---
+<div id={`vimeo-placeholder${currenttime}`} style={`width:${width}px;height:${height}px;`}></div>
 
-<iframe
-  title="vimeo-player"
-  src={url}
-  width="640"
-  height="360"
-  frameborder="0"
-  allowfullscreen></iframe>
+<script is:inline define:vars={{currenttime, url: url, width, height, title}}>
+  window.addEventListener('load', function() {
+    let iframe = document.createElement('iframe');
+    iframe.src = url;
+    iframe.width = width;
+    iframe.height = height;
+    iframe.title = title;
+    iframe.allowFullscreen = true;
+    document.getElementById(`vimeo-placeholder${currenttime}`).appendChild(iframe);
+  });
+</script>

package/src/components/youtube.astro

@@ -1,5 +1,6 @@
 ---
-const { id } = Astro.props;
+import dayjs from 'dayjs';
+const { id, width = 560, height = 315, title = 'Youtube video player' } = Astro.props;
 let url = "";
 if (id.indexOf("https") !== -1) {
   // 是url形式
@@ -8,14 +9,20 @@ if (id.indexOf("https") !== -1) {
   // 是id形式
   url = `https://www.youtube.com/embed/${id}`;
 }
+
+const currenttime = dayjs().unix();
 ---
 
-<iframe
-  width="560"
-  height="315"
-  src={url}
-  title="YouTube video player"
-  frameborder="0"
-  allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share"
-  referrerpolicy="strict-origin-when-cross-origin"
-  allowfullscreen></iframe>
+<div id={`youtube-placeholder${currenttime}`} style={`width:${width}px;height:${height}px;`}></div>
+
+<script is:inline define:vars={{currenttime, url: url, width, height, title}}>
+  window.addEventListener('load', function() {
+    let iframe = document.createElement('iframe');
+    iframe.src = url;
+    iframe.width = width;
+    iframe.height = height;
+    iframe.title = title;
+    iframe.allowFullscreen = true;
+    document.getElementById(`youtube-placeholder${currenttime}`).appendChild(iframe);
+  });
+</script>

package/src/integrations/jeawin-astro-toolbar/toolbar.ts

@@ -6,7 +6,18 @@ export default defineToolbarApp({
         // canvas.appendChild(text);
         app.onToggled(async (options) => {
             // 清除缓存
-            await fetch('/clear_cache');
+            if(window.location.href.indexOf('preview.jeawin')){
+                // 是预览，第一段uri
+                // 获取路径部分
+                const path = window.location.pathname;
+
+                // 分割路径并获取第一段
+                const segments = path.split('/').filter(segment => segment.length > 0); // 过滤掉空字符串
+                const firstSegment = segments.length > 0 ? segments[0] : null;
+                await fetch(`/${firstSegment ? `${firstSegment}/` : ''}clear_cache`);
+            }else{
+                await fetch('/clear_cache');
+            }
             alert('清除缓存成功');
             
         });

package/src/integrations/jeawin-common-route/index.ts

@@ -7,6 +7,7 @@
  * @email		chaegumi@jeawin.com
  * @filesource
  */
+import _ from 'lodash';
 import {writeFile,mkdir} from "node:fs/promises";
 import {fileURLToPath} from "node:url";
 import {defineIntegration, addVirtualImports,createResolver} from "astro-integration-kit";
@@ -26,53 +27,55 @@ export default defineIntegration({
 
                     const {config, addMiddleware, injectRoute} = params;
 
+                    const viteBase = _.get(config, ['vite.base'], '');
+
                     // addMiddleware({
                     //     entrypoint: '',
                     //     order:'pre'
                     // });
 
                     injectRoute({
-                        pattern: '/robots.txt',
+                        pattern: `/${viteBase ? `${viteBase}/` : ''}robots.txt`,
                         entrypoint: resolve('./routes/robots.txt.ts'),
                         prerender: true
                     });
                     injectRoute({
-                        pattern: '/clear_cache',
+                        pattern: `/${viteBase ? `${viteBase}/` : ''}clear_cache`,
                         entrypoint: resolve('./routes/clear_cache.ts'),
                         prerender: true
                     });
                     injectRoute({
-                        pattern: '/manifest.json',
+                        pattern: `/${viteBase ? `${viteBase}/` : ''}manifest.json`,
                         entrypoint: resolve('./routes/manifest.json.ts'),
                         prerender: true
                     });
                     injectRoute({
-                        pattern: '/opensearch.xml',
+                        pattern: `/${viteBase ? `${viteBase}/` : ''}opensearch.xml`,
                         entrypoint: resolve('./routes/opensearch.xml.ts'),
                         prerender: true
                     });
                     injectRoute({
-                        pattern: '/rss.xml',
+                        pattern: `/${viteBase ? `${viteBase}/` : ''}rss.xml`,
                         entrypoint: resolve('./routes/rss.xml.ts'),
                         prerender: true
                     });
                     injectRoute({
-                        pattern: '/site.webmanifest',
+                        pattern: `/${viteBase ? `${viteBase}/` : ''}site.webmanifest`,
                         entrypoint: resolve('./routes/site.webmanifest.ts'),
                         prerender: true
                     });
                     injectRoute({
-                        pattern: '/sitemap.txt',
+                        pattern: `/${viteBase ? `${viteBase}/` : ''}sitemap.txt`,
                         entrypoint: resolve('./routes/sitemap.txt.ts'),
                         prerender: true
                     });
                     injectRoute({
-                        pattern: '/sitemap.xml',
+                        pattern: `/${viteBase ? `${viteBase}/` : ''}sitemap.xml`,
                         entrypoint: resolve('./routes/sitemap.xml.ts'),
                         prerender: true
                     });
                     injectRoute({
-                        pattern: '/sitemap.xsl',
+                        pattern: `/${viteBase ? `${viteBase}/` : ''}sitemap.xsl`,
                         entrypoint: resolve('./routes/sitemap.xsl.ts'),
                         prerender: true
                     });
@@ -80,12 +83,12 @@ export default defineIntegration({
                     if(options?.amp){
                         // AMP需要的文件
                         injectRoute({
-                            pattern: '/sw.js',
+                            pattern: `/${viteBase ? `${viteBase}/` : ''}sw.js`,
                             entrypoint: resolve('./routes/sw.js.ts'),
                             prerender: true
                         });
                         injectRoute({
-                            pattern: '/install_sw.html',
+                            pattern: `/${viteBase ? `${viteBase}/` : ''}install_sw.html`,
                             entrypoint: resolve('./routes/install_sw.html.ts'),
                             prerender: true
                         });                        
@@ -93,12 +96,12 @@ export default defineIntegration({
 
                     // 谷歌验证文件
                     injectRoute({
-                        pattern: '/google644a0e8e598e1092.html',
+                        pattern: `/${viteBase ? `${viteBase}/` : ''}google644a0e8e598e1092.html`,
                         entrypoint: resolve('./routes/google644a0e8e598e1092.html.ts'),
                         prerender: true
                     });
                     injectRoute({
-                        pattern: '/googlef1564b538eef5383.html',
+                        pattern: `/${viteBase ? `${viteBase}/` : ''}googlef1564b538eef5383.html`,
                         entrypoint: resolve('./routes/googlef1564b538eef5383.html.ts'),
                         prerender: true
                     });