Merge branch 'master' into 1.3.3

.github/workflows/publish.yml

@@ -0,0 +1,54 @@
+name: publish ccx and make tag
+
+on: 
+  workflow_dispatch:
+    inputs:
+      tag_name:
+        description: 'tag name'     
+        required: true
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Create Release Asset
+        shell: bash
+        run: |
+            cd $GITHUB_WORKSPACE
+            npm i
+            npm run publish
+            node build-script/pack-ccx.mjs --version ${{ github.event.inputs.tag_name }}
+              
+      - name: Create Release
+        id: create_release
+        uses: actions/create-release@v1
+        env:
+            GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+            tag_name: v${{ github.event.inputs.tag_name }}
+            release_name: v${{ github.event.inputs.tag_name }}
+            draft: true
+            prerelease: false
+
+      - name: Upload ZIP
+        uses: actions/upload-release-asset@v1
+        env:
+            GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+            upload_url: ${{ steps.create_release.outputs.upload_url }}
+            asset_path: ./Auto.Photoshop.SD.plugin_v${{ github.event.inputs.tag_name }}.zip
+            asset_name: Auto.Photoshop.SD.plugin_v${{ github.event.inputs.tag_name }}.zip
+            asset_content_type: application/zip
+
+      - name: Upload CCX
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./Auto.Photoshop.SD.plugin_v${{ github.event.inputs.tag_name }}.ccx
+          asset_name: Auto.Photoshop.SD.plugin_v${{ github.event.inputs.tag_name }}.ccx
+          asset_content_type: application/zip

.gitignore

@@ -17,6 +17,7 @@ experimental/
 start_server.sh
 start_server.bat
 *.ccx
+*.zip
 expanded_mask.png
 original_mask.png
 /config

build-script/pack-ccx.mjs

@@ -0,0 +1,69 @@
+import chalk from 'chalk';
+import { program } from 'commander';
+import { createWriteStream, readFileSync, statSync, writeFileSync } from 'fs';
+import { globSync } from 'glob';
+import { dirname, join, relative } from 'path';
+import { fileURLToPath } from 'url';
+import yazl from 'yazl'
+
+const __dirname = dirname(fileURLToPath(import.meta.url))
+const basePath = join(__dirname, '..')
+
+program
+    .requiredOption("--version <platform>", "the target platform")
+    .parse();
+
+const version = program.opts().version;
+if (!version.match(/\d+\.\d+\.\d+/)) throw new Error(`invalid version format: ${version}`);
+
+console.log(chalk.cyan("rewriting manifest.json's version field to " + version));
+const manifest = JSON.parse(readFileSync(`${basePath}/manifest.json`, 'utf-8'));
+manifest.version = version;
+writeFileSync(`${basePath}/manifest.json`, JSON.stringify(manifest));
+
+console.log(chalk.cyan("rewriting package.json's version field to " + version));
+const packageJSON = JSON.parse(readFileSync(`${basePath}/package.json`, 'utf-8'));
+packageJSON.version = version;
+writeFileSync(`${basePath}/package.json`, JSON.stringify(packageJSON));
+
+console.log(chalk.cyan("packaging .ccx"));
+const zipList = [
+    './manifest.json',
+    './i18n/**/*',
+    './icon/**/*',
+    './jimp/**/*',
+    './scripts/**/*',
+    './typescripts/dist/**/*',
+    './utility/**/*',
+    './server/**/*',
+    './*.js',
+    './package.json',
+    './tsconfig.json',
+    './*.html',
+    './*.py',
+    './*.txt',
+    './*.md',
+    './*.png',
+]
+
+const zipfile = new yazl.ZipFile();
+
+zipList.forEach(globber => {
+    globSync(
+        join(basePath, globber).replace(/\\/g, '/')
+    ).forEach(filepath => {
+        if (statSync(filepath).isDirectory()) return;
+
+        const rpath = relative(basePath, filepath);
+        zipfile.addFile(filepath, rpath)
+    })
+})
+
+zipfile.outputStream.pipe(
+    createWriteStream(join(basePath, `Auto.Photoshop.SD.plugin_v${version}.ccx`))
+);
+zipfile.outputStream.pipe(
+    createWriteStream(join(basePath, `Auto.Photoshop.SD.plugin_v${version}.zip`))
+);
+
+zipfile.end()

webpack.config.js → build-script/webpack.config.js

@@ -4,10 +4,10 @@ const CopyPlugin = require('copy-webpack-plugin')
 
 module.exports = {
     entry: {
-        bundle: './typescripts/entry.ts',
+        bundle: path.resolve(__dirname, '../typescripts/entry.ts'),
     },
     output: {
-        path: path.resolve(__dirname, './typescripts/dist'),
+        path: path.resolve(__dirname, '../typescripts/dist'),
         filename: '[name].js',
         libraryTarget: 'commonjs2',
     },
@@ -36,7 +36,7 @@ module.exports = {
                 loader: 'ts-loader',
                 exclude: /node_modules/,
                 options: {
-                    configFile: 'tsconfig.json',
+                    configFile: path.resolve(__dirname, '../typescripts/tsconfig.json'),
                 },
             },
             {

index.js

@@ -8,9 +8,7 @@ const _log = console.log
 const _warn = console.warn
 const _error = console.error
 let g_timer_value = 300 // temporary global variable for testing the timer pause function
-
-let g_version = 'v1.3.2'
-
+let g_version = 'v' + JSON.parse(require('fs').readFileSync("plugin:manifest.json", 'utf-8')).version
 let g_sd_url = 'http://127.0.0.1:7860'
 let g_online_data_url =
     'https://raw.githubusercontent.com/AbdullahAlfaraj/Auto-Photoshop-StableDiffusion-Plugin/master/utility/online_data.json'

manifest.json

@@ -1,13 +1,11 @@
 {
   "id": "auto.photoshop.stable.diffusion.plugin",
   "name": "Auto Photoshop Stable Diffusion Plugin",
-  "version": "1.1.0",
-  "host": [
-    {
-      "app": "PS",
-      "minVersion": "24.0.0"
-    }
-  ],
+  "version": "1.3.1",
+  "host": {
+    "app": "PS",
+    "minVersion": "24.0.0"
+  },
   "main": "index.html",
   "manifestVersion": 5,
   "requiredPermissions": {