@tenjuu99/blog 0.1.2 → 0.1.3

package/.github/workflows/github-page.yml

@@ -29,6 +29,11 @@ jobs:
       - name: Checkout
         uses: actions/checkout@master
 
+      - name: Use nodejs
+        uses: actions/setup-node@v4
+        with:
+          node-version: '22.x'
+
       - name: npm install
         run: npm install --omit=dev
 

package/.node-version

@@ -0,0 +1 @@
+22.7.0

package/bin/generate

@@ -0,0 +1,4 @@
+#!/usr/bin/env node
+
+import generate from '../lib/generate.js'
+generate()

package/bin/server

@@ -0,0 +1,26 @@
+#!/usr/bin/env node
+
+import server from '../lib/server.js'
+import { srcDir, pageDir } from '../lib/dir.js'
+import { watchers, watch } from '../lib/watcher.js'
+import generate from '../lib/generate.js'
+
+watchers.push({
+  paths: srcDir,
+  watchOptions: {
+    ignored: pageDir
+  },
+  callback: generate
+})
+watchers.push({
+  paths: pageDir,
+  callback: generate,
+  watchOptions: {
+    ignoreInitial: true
+  },
+  event: ['change', 'unlink', 'add']
+})
+watch()
+generate()
+
+server().listen(process.env.PORT || 8000)

package/lib/applyTemplate.js

@@ -1,15 +1,9 @@
 "use strict"
 import fs from "node:fs/promises";
-import { applyCss, watchCss } from './cssGenerator.js'
-import {
-  replaceIfFilter,
-  replaceScriptFilter,
-  replaceVariablesFilter,
-  includeFilter
-} from './filter.js'
-import { marked } from "marked";
+import applyCss from './cssGenerator.js'
+import { includeFilter } from './filter.js'
 import { templateDir, cssDir } from './dir.js'
-import chokidar from 'chokidar'
+import { watchers } from './watcher.js'
 
 let templates = {}
 
@@ -24,26 +18,9 @@ const applyTemplate = async (name = 'default.html') => {
   return templateContent
 }
 
-const render = async (templateName, data) => {
-  let template = await applyTemplate(templateName)
-  template = replaceIfFilter(template, data)
-  template = await replaceScriptFilter(template, data)
+watchers.push({
+  paths: [cssDir, templateDir],
+  callback: () => { templates = {} }
+})
 
-  let markdown = data.markdown
-  markdown = await includeFilter(markdown)
-  markdown = await replaceIfFilter(markdown, data)
-  markdown = await replaceScriptFilter(markdown, data)
-  data.markdown = data.__filetype === 'md' ? marked.parse(markdown) : markdown
-
-
-  return replaceVariablesFilter(template, data)
-}
-
-const watchTemplate = () => {
-  chokidar.watch([cssDir, templateDir]).on('change', () => {
-    templates = {}
-  })
-  watchCss()
-}
-
-export { render, watchTemplate }
+export default applyTemplate

package/lib/cssGenerator.js

@@ -4,7 +4,8 @@ import { minifyCss } from './minify.js'
 import { createHash } from 'crypto'
 import path from 'path'
 import { distDir as distRoot, cssDir } from './dir.js'
-import chokidar from 'chokidar'
+import { watchers } from './watcher.js'
+import { styleText } from 'node:util'
 
 let cacheBuster = {}
 const cacheBusterQuery = 't'
@@ -29,16 +30,16 @@ const cssGenerator = async (src, dist) => {
   css = minifyCss(css)
   cacheBuster[key] = createHash('md5').update(css).digest('hex')
 
-  return await fs.mkdir(`${distRoot}${path.dirname(dist)}`, { recursive: true }).then(async () => {
-    await fs.writeFile(`${distRoot}${dist}`, css)
-    console.log(`generate ${src} => ${distRoot}${dist}`)
+  return await fs.mkdir(`${distRoot}${path.dirname(dist)}`, { recursive: true }).then(() => {
+    fs.writeFile(`${distRoot}${dist}`, css)
+    console.log(styleText('green', '[generate]'), `${src} => ${distRoot}${dist}`)
     return cacheBuster[key]
   })
 }
 
 /**
  * 次のような記述を想定している。
- * <link rel="stylesheet" href="${/css/layout.css:/css/base.css,/css/page.css}">
+ * <link rel="stylesheet" href="${/css/layout.css<<base.css,page.css}">
  * href の記述は ${dist:src} の関係になっている。
  *
  * これを
@@ -59,10 +60,9 @@ const applyCss = async (text) => {
   return text
 }
 
-const watchCss = () => {
-  chokidar.watch([cssDir]).on('change', (path) => {
-    cacheBuster = {}
-  })
-}
+watchers.push({
+  paths: cssDir,
+  callback: () => { cacheBuster = {} }
+})
 
-export { applyCss, watchCss }
+export default applyCss

package/lib/dir.js

@@ -1,6 +1,7 @@
 const rootDir = process.cwd()
 const srcDir = `${rootDir}/${process.env.SRC_DIR}`
 const distDir = `${rootDir}/${process.env.DIST_DIR}`
+const pageDir = `${srcDir}/pages`
 const templateDir = `${srcDir}/template`
 const cssDir = `${srcDir}/css`
 const cacheDir = `${rootDir}/.cache`
@@ -9,6 +10,7 @@ export {
   rootDir,
   srcDir,
   distDir,
+  pageDir,
   templateDir,
   cssDir,
   cacheDir,

package/lib/distribute.js

@@ -2,13 +2,14 @@
 import fs from "node:fs/promises";
 import path from 'path'
 import { minifyHtml } from './minify.js'
-import { render, watchTemplate } from './applyTemplate.js'
+import render from './render.js'
+import { styleText } from 'node:util'
 
-const distribute = async (data, srcDir, distDir) => {
-  if (data['__deleted']) {
-    for (const i in data['__deleted']) {
-      console.log(`unlink ${distDir}${data['__deleted'][i].__output}`)
-      fs.unlink(`${distDir}${data['__deleted'][i].__output}`)
+const distribute = async (data, deleted, srcDir, distDir) => {
+  if (deleted) {
+    for (const obj of deleted) {
+      console.log(styleText('red', '[unlink]'), `${distDir}${obj.__output}`)
+      fs.unlink(`${distDir}${obj.__output}`)
     }
     delete data['__deleted']
   }
@@ -18,7 +19,7 @@ const distribute = async (data, srcDir, distDir) => {
     let writeTo = `${distDir}${data[name].__output}`
     fs.mkdir(path.dirname(writeTo), { recursive: true}).then(() => {
       fs.writeFile(writeTo, minifyHtml(rendered))
-      console.log(`generate ${writeTo}`)
+      console.log(styleText('green', '[generate]'), writeTo)
     })
   }
   const distributeRaw = process.env.DISTRIBUTE_RAW.split(',')
@@ -27,9 +28,10 @@ const distribute = async (data, srcDir, distDir) => {
       await fs.stat(`${distDir}/${copyDir}/`).catch(async err => await fs.mkdir(`${distDir}/${copyDir}/`))
       files.forEach(file => {
         fs.copyFile(`${srcDir}/${copyDir}/${file}`, `${distDir}/${copyDir}/${file}`)
+        console.log(styleText('green', '[copy]'), `${srcDir}/${copyDir}/${file} => ${distDir}/${copyDir}/${file}`)
       })
     })
   })
 }
 
-export { distribute, watchTemplate }
+export default distribute

package/lib/generate.js

@@ -1,15 +1,16 @@
 "use strict"
-import { distribute } from './distribute.js'
-import { indexing } from './indexer.js'
+import distribute from './distribute.js'
+import { indexing, allData, deleted } from './indexer.js'
 import { srcDir, distDir } from './dir.js'
+import { styleText } from 'node:util'
 
 const generate = async () => {
   const start = performance.now()
-  const data = await indexing(srcDir + '/pages/')
+  await indexing()
 
-  await distribute(data, srcDir, distDir)
+  await distribute(allData, deleted, srcDir, distDir)
   const end = performance.now()
-  console.log('build: ' + (end - start) + "ms")
+  console.log(styleText('blue', '[build: ' + (end - start) + "ms]"))
 }
 
 export default generate

package/lib/indexer.js

@@ -1,82 +1,33 @@
 "use strict"
 import fs from "node:fs/promises";
-import { cacheDir } from './dir.js'
-
-const parseMetaData = (markdown, filename) => {
-  const regexp = new RegExp(/^(<!|-)--(?<variables>[\s\S]*?)--(-|>)/)
-  const matched = markdown.match(regexp)
-  const markdownReplaced = markdown.replace(regexp, '')
-  const metaDataDefault = {
-    name: filename,
-    title: filename,
-    url: `/${filename}`,
-    description: '',
-    og_description: '',
-    published: '1970-01-01',
-    index: true,
-    noindex: false,
-    lang: 'ja',
-    site_name: process.env.SITE_NAME,
-    url_base: process.env.URL_BASE,
-    gtag_id: process.env.GTAG_ID,
-    markdown: markdownReplaced,
-    relative_path: process.env.RELATIVE_PATH || '',
-    template: 'default.html',
-    ext: 'html',
-    __output: `/${filename}.html`
-  }
-  if (!matched) {
-    return metaDataDefault
-  }
-  const metaData = Object.fromEntries(
-    matched.groups.variables.split('\n').filter(line => line.includes(':'))
-    .map(line => {
-      const index = line.indexOf(':')
-      const key = line.slice(0, index)
-      let value = line.slice(index + 1).trim()
-      if (value === 'true' || value === 'false') {
-        value = JSON.parse(value)
-      }
-      return [key, value]
-    })
-  )
-  const metaDataMerged = Object.assign(metaDataDefault, metaData)
-  if (!metaDataMerged.description) {
-    metaDataMerged.description = markdownReplaced.replace(/(<([^>]+)>)/gi, '').slice(0, 200).replaceAll("\n", '') + '...'
-  }
-  if (!metaDataMerged.og_description) {
-    metaDataMerged.og_description = metaDataMerged.og_description
-  }
-  metaDataMerged['__output'] = filename === 'index' ? '/index.html' : `${metaDataMerged.url}.${metaDataMerged.ext}`
-
-  return metaDataMerged
-}
+import { pageDir, cacheDir } from './dir.js'
+import makePageData from './pageData.js'
 
 const indexFile = `${cacheDir}/index.json`
 
-const newIndex = []
-const allData = {}
+let allData = {}
+let deleted = []
 
-const indexing = async (targetDir) => {
-  const targets = await fs.readdir(targetDir).then(files => {
-    return files.filter(fileName => fileName.match('\.(md|html)$'))
+const indexing = async () => {
+  const oldIndex = await fs.readFile(indexFile, 'utf8').then(text => JSON.parse(text)).catch(error => [])
+
+  const newIndex = []
+  allData = {}
+  deleted = []
+  await fs.readdir(pageDir).then(files => {
+    files
+      .filter(fileName => fileName.match('\.(md|html)$'))
+      .forEach(file => {
+        const metaData = makePageData(file)
+        allData[metaData.name] = metaData
+        const { name, url, __output } = metaData
+        newIndex.push({ name, url, __output })
+      })
   })
-  for (const file of targets) {
-    const markdownText = await fs.readFile(`${targetDir}/${file}`, 'utf8')
-    const [target, ext] = file.split('.')
-    const metaData = parseMetaData(markdownText, target)
-    metaData.__filetype = ext
-    allData[target] = metaData
-    let { name, title, index, url, published, modified, __output } = metaData
-    newIndex.push({ name, title, index, url, published, modified, __output })
-  }
-  await fs.writeFile(indexFile, JSON.stringify(newIndex))
+  fs.writeFile(indexFile, JSON.stringify(newIndex))
 
   // 旧インデックスから差分を計算して削除対象をピックアップする
-  const oldIndex = await fs.readFile(indexFile, 'utf8').then(text => JSON.parse(text)).catch(error => [])
-  const deleted = oldIndex.filter(oi => !newIndex.map(ni => ni.__output).includes(oi.__output))
-  allData['__deleted'] = deleted
-  return allData
+  deleted = oldIndex.filter(oi => !newIndex.map(ni => ni.__output).includes(oi.__output))
 }
 
-export { indexing, allData }
+export { indexing, allData, deleted }

package/lib/pageData.js

@@ -0,0 +1,66 @@
+"use strict"
+import fs from "node:fs";
+import { pageDir } from './dir.js'
+
+const load = (path) => {
+  return fs.readFileSync(path, 'utf8')
+}
+
+const makePageData = (filename) => {
+  const content = load(`${pageDir}/${filename}`)
+  const [name, ext] = filename.split('.')
+  return parse(content, name, ext)
+}
+
+const parse = (content, name, ext) => {
+  const regexp = new RegExp(/^(<!|-)--(?<variables>[\s\S]*?)--(-|>)/)
+  const matched = content.match(regexp)
+  const markdownReplaced = content.replace(regexp, '')
+  const metaDataDefault = {
+    name,
+    title: name,
+    url: `/${name}`,
+    description: '',
+    og_description: '',
+    published: '1970-01-01',
+    index: true,
+    noindex: false,
+    lang: 'ja',
+    site_name: process.env.SITE_NAME,
+    url_base: process.env.URL_BASE,
+    gtag_id: process.env.GTAG_ID,
+    markdown: markdownReplaced,
+    relative_path: process.env.RELATIVE_PATH || '',
+    template: 'default.html',
+    ext: 'html',
+    __output: `/${name}.html`,
+    __filetype: ext,
+  }
+  if (!matched) {
+    return metaDataDefault
+  }
+  const metaData = Object.fromEntries(
+    matched.groups.variables.split('\n').filter(line => line.includes(':'))
+    .map(line => {
+      const index = line.indexOf(':')
+      const key = line.slice(0, index)
+      let value = line.slice(index + 1).trim()
+      if (value === 'true' || value === 'false') {
+        value = JSON.parse(value)
+      }
+      return [key, value]
+    })
+  )
+  const metaDataMerged = Object.assign(metaDataDefault, metaData)
+  if (!metaDataMerged.description) {
+    metaDataMerged.description = markdownReplaced.replace(/(<([^>]+)>)/gi, '').slice(0, 200).replaceAll("\n", '') + '...'
+  }
+  if (!metaDataMerged.og_description) {
+    metaDataMerged.og_description = metaDataMerged.og_description
+  }
+  metaDataMerged['__output'] = name === 'index' ? '/index.html' : `${metaDataMerged.url}.${metaDataMerged.ext}`
+
+  return metaDataMerged
+}
+
+export default makePageData

package/lib/render.js

@@ -0,0 +1,24 @@
+import {
+  replaceIfFilter,
+  replaceScriptFilter,
+  replaceVariablesFilter,
+  includeFilter
+} from './filter.js'
+import { marked } from "marked";
+import applyTemplate from './applyTemplate.js'
+
+const render = async (templateName, data) => {
+  let template = await applyTemplate(templateName)
+  template = replaceIfFilter(template, data)
+  template = await replaceScriptFilter(template, data)
+
+  let markdown = data.markdown
+  markdown = await includeFilter(markdown)
+  markdown = await replaceIfFilter(markdown, data)
+  markdown = await replaceScriptFilter(markdown, data)
+  data.markdown = data.__filetype === 'md' ? marked.parse(markdown) : markdown
+
+  return replaceVariablesFilter(template, data)
+}
+
+export default render

package/lib/server.js

@@ -0,0 +1,64 @@
+import http from 'http'
+import url from 'url'
+import fs from 'node:fs'
+import { distDir } from './dir.js'
+import { styleText } from 'node:util'
+
+const contentType = (ext) => {
+    switch (ext) {
+      case 'html':
+      case 'css':
+        return `text/${ext}`
+      case 'js':
+        return 'text/javascript'
+      case 'jpeg':
+      case 'png':
+      case 'webp':
+      case 'avif':
+        return `image/${ext}`
+      case 'jpg':
+        return 'image/jpeg'
+      case 'svg':
+        return 'image/svg+xml'
+      case 'xml':
+      case 'json':
+        return `application/${ext}`
+      case 'rdf':
+        return 'application/rdf+xml.rdf'
+      default:
+        return 'application/octet-stream'
+    }
+}
+
+const server = () => {
+  return http.createServer((request, response) => {
+    const url = new URL(`http://${request.headers.host}${request.url}`)
+    let path = url.pathname === '/' ? '/index.html' : decodeURIComponent(url.pathname)
+    if (!path.includes('.')) {
+      path += '.html'
+    }
+    if (!fs.existsSync(`${distDir}${path}`)) {
+      console.log(styleText('red', `[${request.method}] 404`), request.url)
+      const errorContent = fs.readFileSync(`${distDir}/404.html`)
+      response.writeHead(404)
+      response.end(errorContent)
+      return
+    }
+    try {
+      const content = fs.readFileSync(`${distDir}${path}`, 'binary')
+
+      const ext = path.split('.')[1]
+      console.log(styleText('green', `[${request.method}] 200`), request.url)
+      response.writeHead(200, { 'Content-Type': `${contentType(ext)}; charset=utf-8` })
+      response.end(content, 'binary')
+    } catch (e) {
+      console.log(e)
+      console.log(styleText('red', `[${request.method}] 500`), request.url)
+      const errorContent = fs.readFileSync(`${distDir}/404.html`)
+      response.writeHead(500)
+      response.end(errorContent)
+    }
+  })
+}
+
+export default server

package/lib/watcher.js

@@ -0,0 +1,28 @@
+import chokidar from 'chokidar'
+
+const container = []
+
+const watchers = {
+  push({ paths, event = 'change', callback, watchOptions }) {
+    if (!paths || !callback || typeof callback !== 'function') {
+      throw new Error('Invalid object type for watcher.')
+    }
+    container.push({ paths, event, callback, watchOptions })
+  }
+}
+
+const watch = () => {
+  container.forEach((watcher) => {
+    const { paths, event, callback, watchOptions } = watcher
+    const cwatcher = chokidar.watch(paths, watchOptions)
+    if (Array.isArray(event)) {
+      event.forEach(e => cwatcher.on(e, callback))
+    } else if (typeof event === 'string') {
+      cwatcher.on(event, callback)
+    } else {
+      throw new Error('Invalid event for watcher.')
+    }
+  })
+}
+
+export { watchers , watch }

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@tenjuu99/blog",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "blog template",
   "main": "index.js",
   "scripts": {
-    "serve": "eval $(cat .env | tr \"\n\" \" \") node server.js",
-    "generate": "eval $(cat .env | tr \"\n\" \" \") node generate.js",
+    "dev": "eval $(cat .env | tr \"\n\" \" \") node bin/server",
+    "generate": "eval $(cat .env | tr \"\n\" \" \") node bin/generate",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "bin": {
-    "generate": "generate.js",
-    "server": "server.js"
+    "generate": "bin/generate",
+    "server": "bin/server"
   },
   "author": "AmashigeSeiji",
   "repository": {
@@ -22,5 +22,8 @@
     "chokidar": "^3.6.0",
     "marked": "^13.x"
   },
-  "type": "module"
+  "type": "module",
+  "engines": {
+    "node": ">=21.7"
+  }
 }

package/performance.js

@@ -1,22 +1,22 @@
 "use strict"
 import distribute from './lib/distribute.js'
-import { indexing } from './lib/indexer.js'
+import { indexing, allData, deleted } from './lib/indexer.js'
 import { srcDir, distDir } from './lib/dir.js'
 
 process.env.FORCE_BUILD = true
-const execute = async () => {
+const doBuild = async () => {
   const start = performance.now()
-  const data = await indexing(srcDir)
-  await distribute(data, srcDir, distDir)
+  await indexing()
+  await distribute(allData, deleted, srcDir, distDir)
   const end = performance.now()
   return end - start
 }
 const times = 100
 let executed = 0
-//for (let i = 0; i < times; i++) {
-  //console.log(await executed())
-  const buildTime = await execute()
-  //executed += (buildTime)
+for (let i = 0; i < times; i++) {
+  // console.log(await executed())
+  const buildTime = await doBuild()
+  executed += (buildTime)
   console.log(buildTime)
-//}
-//console.log('build average: 100 times: ' + (executed/times) + "ms")
+}
+console.log('build average: 100 times: ' + (executed/times) + "ms")

package/generate.js

@@ -1,4 +0,0 @@
-#!/usr/bin/env node
-
-import generate from './lib/generate.js'
-generate()

package/server.js

@@ -1,58 +0,0 @@
-#!/usr/bin/env node
-
-import http from 'http'
-import url from 'url'
-import fs from 'node:fs/promises'
-import { srcDir, distDir } from './lib/dir.js'
-import chokidar from 'chokidar'
-import generate from './lib/generate.js'
-import { watchTemplate } from './lib/applyTemplate.js'
-
-chokidar.watch(srcDir).on('change', (event, path) => {
-  generate()
-})
-watchTemplate()
-generate()
-const contentType = (ext) => {
-    switch (ext) {
-      case 'html':
-        return 'text/html'
-      case 'css':
-        return 'text/css'
-      case 'js':
-      case 'javascript':
-        return 'text/javascript'
-      case 'json':
-        return 'application/json'
-      case 'jpg':
-      case 'jpeg':
-        return 'image/jpeg'
-      case 'svg':
-        return 'image/svg+xml'
-      case 'xml':
-        return 'application/xml'
-      case 'rdf':
-        return 'application/rdf+xml.rdf'
-      default:
-        return 'application/octet-stream'
-    }
-}
-
-http.createServer((request, response) => {
-  console.log(request.method, request.url)
-  const url = new URL(`http://${request.headers.host}${request.url}`)
-  let path = url.pathname === '/' ? '/index.html' : decodeURIComponent(url.pathname)
-  if (!path.includes('.')) {
-    path += '.html'
-  }
-  fs.readFile(`${distDir}${path}`, 'binary').catch(async (error) => {
-    const errorContent = await fs.readFile(`${distDir}/404.html`)
-    console.log(error)
-    response.writeHead(404)
-    response.end(errorContent)
-  }).then(file => {
-    const ext = path.split('.')[1]
-    response.writeHead(200, { 'Content-Type': `${contentType(ext)}; charset=utf-8` })
-    response.end(file, 'binary')
-  })
-}).listen(process.env.PORT || 8000)