twitter-snap 0.0.23 → 0.0.25

package/README.md

@@ -13,6 +13,10 @@ npx twitter-snap 1518623997054918657
 
 ![image](./docs/img/output.png)
 
+## Install
+
+`npm -g i twitter-snap@latest`
+
 ## Arguments
 
 ```shell
@@ -20,44 +24,53 @@ $ bin/run --help
 Create beautiful Tweet images fast
 
 USAGE
-  $ twitter-snap  ID [--api
-    getTweetResultByRestId|getTweetDetail|getSearchTimeline|getHomeTimeline|getHomeLatestTimeline|getListLatestTweetsTimeline|getUserTweets|getUserTweetsAndReplies|getUserMedia|getLikes|ge
-    tBookmarks] [--theme RenderBasic] [-o <value>] [--cleanup] [--max <value>] [--debug] [--sleep <value>] [--session_type <value>] [--cookies_file <value>] [--browser_profile <value>]
-    [--browser_headless]
+  $ twitter-snap  ID [--api getTweetResultByRestId|getTweetDetail|getSearchTimeline|getHomeTimeline|getHomeLatestTimeline|getListLatestTweetsTimeline|getUserTweets|getUserTweetsAndReplies|getUserMedia|getLikes|getBookmarks] [--browserHeadless] [--browserProfile <value>] [--cookiesFile
+    <value>] [--debug] [--limit <value>] [--noCleanup] [-o <value>] [--sessionType <value>] [--simpleLog] [--sleep <value>] [--theme RenderBasic] [--ffmpegAdditonalOption <value>] [--ffmpegPath <value>] [--ffprobePath <value>]
 
 ARGUMENTS
   ID  Twitter status id
 
 FLAGS
-  -o, --output=<value>           [default: {id}.{if-photo:png:mp4}] Output file name
-      --api=<option>             [default: getTweetResultByRestId] API type
-                                 <options: getTweetResultByRestId|getTweetDetail|getSearchTimeline|getHomeTimeline|getHomeLatestTimeline|getListLatestTweetsTimeline|getUserTweets|getUserTw
-                                 eetsAndReplies|getUserMedia|getLikes|getBookmarks>
-      --browser_headless         Browser headless
-      --browser_profile=<value>  [default: C:\Users\yuki/.cache/twitter-snap/profiles] Browser profile
-      --cleanup                  Cleanup
-      --cookies_file=<value>     [default: cookies.json] Cookies file
-      --debug                    Debug
-      --max=<value>              [default: 30] Max count
-      --session_type=<value>     [default: guest] Session type
-      --sleep=<value>            Sleep (ms)
-      --theme=<option>           [default: RenderBasic] Theme type
-                                 <options: RenderBasic>
+  -o, --output=<value>                 [default: {id}.{if-photo:png:mp4}] Output file name
+      --api=<option>                   [default: getTweetResultByRestId] API type
+                                       <options: getTweetResultByRestId|getTweetDetail|getSearchTimeline|getHomeTimeline|getHomeLatestTimeline|getListLatestTweetsTimeline|getUserTweets|getUserTweetsAndReplies|getUserMedia|getLikes|getBookmarks>
+      --browserHeadless                Browser headless
+      --browserProfile=<value>         [default: C:\Users\yuki/.cache/twitter-snap/profiles] Browser profile
+      --cookiesFile=<value>            [default: cookies.json] Cookies file
+      --debug                          Debug
+      --ffmpegAdditonalOption=<value>  FFmpeg additonal option
+      --ffmpegPath=<value>             [default: ffmpeg] FFmpeg path
+      --ffprobePath=<value>            [default: ffprobe] FFprobe path
+      --limit=<value>                  [default: 30] Limit count
+      --noCleanup                      Cleanup
+      --sessionType=<value>            [default: guest] Session type
+      --simpleLog                      Simple log
+      --sleep=<value>                  Sleep (ms)
+      --theme=<option>                 [default: RenderBasic] Theme type
+                                       <options: RenderBasic>
 
 DESCRIPTION
   Create beautiful Tweet images fast
   https://github.com/fa0311/twitter-snap
 
 EXAMPLES
-  $ twitter-snap 1765415187161464972
+  $ twitter-snap 1349129669258448897
+
+  $ twitter-snap 1349129669258448897 --session-type browser
+
+  $ twitter-snap 1349129669258448897 --session-type file --cookies-file cookies.json
+
+  $ twitter-snap 44196397 --api getUserTweets --limit 10
+
+  $ twitter-snap 44196397 --api getUserTweets -o "data/{user-screen-name}/{id}.{if-photo:png:mp4}"
 
-  $ twitter-snap 1765415187161464972 --session_type browser
+  $ twitter-snap https://twitter.com/elonmusk
 
-  $ twitter-snap 1765415187161464972 --session_type file --cookies_file cookies.json
+  $ twitter-snap https://twitter.com/elonmusk/status/1349129669258448897
 
-  $ twitter-snap 44196397 --api getUserTweets --max 10
+  $ twitter-snap 44196397 --api getUserTweets -o "{user-screen-name}/{count}.png"
 
-  $ twitter-snap 44196397 --api getUserTweets --output "data/{user-screen-name}/{id}.{if-photo:png:mp4}"
+  $ twitter-snap 44196397 --api getUserTweets -o "{time-tweet-yyyy}-{time-tweet-mm}-{time-tweet-dd}/{id}.png"
 ```
 
 ## Dependence

package/bin/run.js

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
 
 import {execute} from '@oclif/core'
 

package/dist/commands/index.d.ts

@@ -3,22 +3,27 @@ export default class Default extends Command {
     static args: {
         id: import("@oclif/core/lib/interfaces/parser.js").Arg<string, Record<string, unknown>>;
     };
+    static browserProfile: string;
     static description: string;
     static examples: string[];
-    static browser_profile: string;
     static flags: {
         api: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<"getTweetDetail" | "getSearchTimeline" | "getHomeTimeline" | "getHomeLatestTimeline" | "getListLatestTweetsTimeline" | "getUserTweets" | "getUserTweetsAndReplies" | "getUserMedia" | "getLikes" | "getBookmarks" | "getTweetResultByRestId", import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
-        theme: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<"RenderBasic", import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
-        output: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
-        cleanup: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
-        max: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<number, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+        browserHeadless: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
+        browserProfile: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+        cookiesFile: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
         debug: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
+        ffmpegAdditonalOption: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+        ffmpegPath: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+        ffprobePath: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+        limit: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<number, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+        noCleanup: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
+        output: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+        sessionType: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<"browser" | "file" | "guest", import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+        simpleLog: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
         sleep: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<number, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
-        session_type: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<"guest" | "browser" | "file", import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
-        cookies_file: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
-        browser_profile: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
-        browser_headless: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
+        theme: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<"RenderBasic", import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
     };
+    main(): Promise<void>;
     run(): Promise<void>;
 }
 //# sourceMappingURL=index.d.ts.map

package/dist/commands/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/commands/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAO,OAAO,EAAQ,MAAM,aAAa,CAAA;AAwBhD,MAAM,CAAC,OAAO,OAAO,OAAQ,SAAQ,OAAO;IAC1C,MAAM,CAAC,IAAI;;MAEV;IAED,MAAM,CAAC,WAAW,SAA8F;IAChH,MAAM,CAAC,QAAQ,WAMd;IAED,MAAM,CAAC,eAAe,SAAiD;IAEvE,MAAM,CAAC,KAAK;;;;;;;;;;;;MAYX;IAEK,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CA2D3B"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/commands/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAO,OAAO,EAAQ,MAAM,aAAa,CAAA;AAShD,MAAM,CAAC,OAAO,OAAO,OAAQ,SAAQ,OAAO;IAC1C,MAAM,CAAC,IAAI;;MAEV;IAED,MAAM,CAAC,cAAc,SAAiD;IACtE,MAAM,CAAC,WAAW,SAA8F;IAEhH,MAAM,CAAC,QAAQ,WAUd;IAED,MAAM,CAAC,KAAK;;;;;;;;;;;;;;;;MAwEX;IAEK,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IA6ErB,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAO3B"}

package/dist/commands/index.js

@@ -1,44 +1,43 @@
 var _a;
 import { Args, Command, Flags } from '@oclif/core';
-import os from 'os';
-import { themeList } from 'twitter-snap-core';
+import os from 'node:os';
+import { FFmpegInfrastructure, themeList } from 'twitter-snap-core';
 import { twitterSnapCookies, twitterSnapGuest, twitterSnapPuppeteer } from '../core/core.js';
-import { Logger } from '../utils/logger.js';
+import { Logger, LoggerSimple } from '../utils/logger.js';
+import { twitterUrlConvert } from '../utils/url.js';
 import { getTweetList } from './../utils/types.js';
-const apiFlag = Flags.custom({
-    description: 'API type',
-    options: ['getTweetResultByRestId', ...getTweetList],
-    default: 'getTweetResultByRestId',
-});
-const themeNameFlag = Flags.custom({
-    description: 'Theme type',
-    options: Object.keys(themeList),
-    default: 'RenderBasic',
-});
-const sessionType = Flags.custom({
-    description: 'Session type',
-    default: 'guest',
-});
 class Default extends Command {
-    async run() {
+    async main() {
         const { args, flags } = await this.parse(_a);
-        const logger = new Logger();
+        const logger = flags.simpleLog ? new LoggerSimple(this.log.bind(this)) : new Logger();
         console.log = flags.debug ? logger.log.bind(logger) : (_) => { };
-        console.debug = flags.debug ? logger.debug.bind(logger) : (_) => { };
+        console.debug = flags.debug ? logger.log.bind(logger) : (_) => { };
         console.warn = logger.warn.bind(logger);
         console.error = logger.error.bind(logger);
         const getClient = (() => {
-            switch (flags.session_type) {
+            switch (flags.sessionType) {
                 case 'guest':
                     return twitterSnapGuest();
                 case 'browser':
-                    return twitterSnapPuppeteer(flags.browser_headless, flags.browser_profile);
+                    return twitterSnapPuppeteer(flags.browserHeadless, flags.browserProfile);
                 case 'file':
-                    return twitterSnapCookies(flags.cookies_file);
+                    return twitterSnapCookies(flags.cookiesFile);
+            }
+        })();
+        const [client, api] = await logger.guard({ text: 'Loading client' }, getClient);
+        const [id, type] = await (async () => {
+            if (args.id.startsWith('http')) {
+                const convert = twitterUrlConvert({ url: args.id });
+                if (typeof convert === 'function') {
+                    return await logger.guard({ text: 'Get user id' }, convert(api));
+                }
+                else if (typeof convert === 'object') {
+                    return convert;
+                }
             }
+            return [args.id, flags.api];
         })();
-        const client = await logger.guard({ text: 'Loading Client' }, getClient);
-        const logHandler = async ({ type, user, id }) => {
+        const logHandler = async ({ id, type, user }) => {
             switch (type) {
                 case 'start':
                     return logger.update(`Rendering tweet ${user}/${id}`);
@@ -49,54 +48,131 @@ class Default extends Command {
             }
         };
         const sleep = async (ms) => new Promise((resolve) => setTimeout(resolve, ms));
-        const render = client({ id: args.id, type: flags.api, max: flags.max }, async (render) => {
+        const render = client({ id, limit: flags.limit, type }, async (render) => {
             try {
                 const finalize = await render({
+                    handler: logHandler,
+                    output: flags.output,
                     themeName: flags.theme,
                     themeParam: {
+                        ffmpeg: new FFmpegInfrastructure({
+                            ffmpegPath: flags.ffmpegPath,
+                            ffprobePath: flags.ffprobePath,
+                        }),
+                        ffmpegAdditonalOption: flags.ffmpegAdditonalOption?.split(' ') ?? [],
                         width: 600,
                     },
-                    output: flags.output,
-                    handler: logHandler,
                 });
                 await finalize({
-                    cleanup: true,
+                    cleanup: !flags.noCleanup,
                 });
                 logger.succeed();
             }
-            catch (e) {
-                logger.catch(e);
+            catch (error) {
+                logger.catchFail(error);
             }
             await sleep(flags.sleep);
         });
-        await logger.guardProgress({ text: 'Rendering tweet', max: flags.max }, render);
+        await logger.guardProgress({ max: flags.limit, text: 'Rendering tweet' }, render);
+    }
+    async run() {
+        try {
+            await this.main();
+        }
+        catch (error) {
+            console.error(error);
+        }
     }
 }
 _a = Default;
 Default.args = {
     id: Args.string({ description: 'Twitter status id', required: true }),
 };
+Default.browserProfile = `${os.homedir()}/.cache/twitter-snap/profiles`;
 Default.description = ['Create beautiful Tweet images fast', 'https://github.com/fa0311/twitter-snap'].join('\n');
 Default.examples = [
-    'twitter-snap 1765415187161464972',
-    'twitter-snap 1765415187161464972 --session_type browser',
-    'twitter-snap 1765415187161464972 --session_type file --cookies_file cookies.json',
-    'twitter-snap 44196397 --api getUserTweets --max 10',
-    'twitter-snap 44196397 --api getUserTweets --output "data/{user-screen-name}/{id}.{if-photo:png:mp4}"',
+    'twitter-snap 1349129669258448897',
+    'twitter-snap 1349129669258448897 --session-type browser',
+    'twitter-snap 1349129669258448897 --session-type file --cookies-file cookies.json',
+    'twitter-snap 44196397 --api getUserTweets --limit 10',
+    'twitter-snap 44196397 --api getUserTweets -o "data/{user-screen-name}/{id}.{if-photo:png:mp4}"',
+    'twitter-snap https://twitter.com/elonmusk',
+    'twitter-snap https://twitter.com/elonmusk/status/1349129669258448897',
+    'twitter-snap 44196397 --api getUserTweets -o "{user-screen-name}/{count}.png"',
+    'twitter-snap 44196397 --api getUserTweets -o "{time-tweet-yyyy}-{time-tweet-mm}-{time-tweet-dd}/{id}.png"',
 ];
-Default.browser_profile = `${os.homedir()}/.cache/twitter-snap/profiles`;
 Default.flags = {
-    api: apiFlag(),
-    theme: themeNameFlag(),
-    output: Flags.string({ char: 'o', description: 'Output file name', default: '{id}.{if-photo:png:mp4}' }),
-    cleanup: Flags.boolean({ description: 'Cleanup', default: true }),
-    max: Flags.integer({ description: 'Max count', default: 30 }),
-    debug: Flags.boolean({ description: 'Debug', default: false }),
-    sleep: Flags.integer({ description: 'Sleep (ms)', default: 0 }),
-    session_type: sessionType(),
-    cookies_file: Flags.file({ description: 'Cookies file', default: 'cookies.json' }),
-    browser_profile: Flags.string({ description: 'Browser profile', default: _a.browser_profile }),
-    browser_headless: Flags.boolean({ description: 'Browser headless', default: false }),
+    api: Flags.custom({
+        default: 'getTweetResultByRestId',
+        description: 'API type',
+        options: ['getTweetResultByRestId', ...getTweetList],
+    })(),
+    browserHeadless: Flags.boolean({
+        aliases: ['browser-headless'],
+        default: false,
+        description: 'Browser headless',
+    }),
+    browserProfile: Flags.string({
+        aliases: ['browser-profile'],
+        default: _a.browserProfile,
+        description: 'Browser profile',
+    }),
+    cookiesFile: Flags.file({
+        aliases: ['cookies-file'],
+        default: 'cookies.json',
+        description: 'Cookies file',
+    }),
+    debug: Flags.boolean({
+        default: false,
+        description: 'Debug',
+    }),
+    ffmpegAdditonalOption: Flags.string({
+        aliases: ['ffmpeg-additonal-option'],
+        description: 'FFmpeg additonal option',
+    }),
+    ffmpegPath: Flags.string({
+        aliases: ['ffmpeg-path'],
+        default: 'ffmpeg',
+        description: 'FFmpeg path',
+    }),
+    ffprobePath: Flags.string({
+        aliases: ['ffprobe-path'],
+        default: 'ffprobe',
+        description: 'FFprobe path',
+    }),
+    limit: Flags.integer({
+        default: 30,
+        description: 'Limit count',
+    }),
+    noCleanup: Flags.boolean({
+        aliases: ['no-cleanup'],
+        default: false,
+        description: 'Cleanup',
+    }),
+    output: Flags.string({
+        char: 'o',
+        default: '{id}.{if-photo:png:mp4}',
+        description: 'Output file name',
+    }),
+    sessionType: Flags.custom({
+        aliases: ['session-type'],
+        default: 'guest',
+        description: 'Session type',
+    })(),
+    simpleLog: Flags.boolean({
+        aliases: ['simple-log'],
+        default: false,
+        description: 'Simple log',
+    }),
+    sleep: Flags.integer({
+        default: 0,
+        description: 'Sleep (ms)',
+    }),
+    theme: Flags.custom({
+        default: 'RenderBasic',
+        description: 'Theme type',
+        options: Object.keys(themeList),
+    })(),
 };
 export default Default;
 //# sourceMappingURL=index.js.map

package/dist/commands/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/commands/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/commands/index.ts"],"names":[],"mappings":"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"}

package/dist/core/core.d.ts

@@ -1,27 +1,28 @@
-import { TweetApiUtilsData } from 'twitter-openapi-typescript';
+import { TweetApiUtilsData, TwitterOpenApiClient } from 'twitter-openapi-typescript';
 import { ThemeNameType } from 'twitter-snap-core';
 import { GetTweetApi, ThemeParamType } from '../utils/types.js';
-export declare const twitterSnapGuest: () => Promise<({ id, type, max }: tweetApiSnapParam, handler: (e: ReturnType<typeof twitterRender>) => Promise<void>) => Promise<void>>;
-export declare const twitterSnapPuppeteer: (headless?: boolean, userDataDir?: string) => Promise<({ id, type, max }: tweetApiSnapParam, handler: (e: ReturnType<typeof twitterRender>) => Promise<void>) => Promise<void>>;
-export declare const twitterSnapCookies: (path: string) => Promise<({ id, type, max }: tweetApiSnapParam, handler: (e: ReturnType<typeof twitterRender>) => Promise<void>) => Promise<void>>;
+export declare const twitterSnapGuest: () => Promise<readonly [({ id, limit, type }: tweetApiSnapParam, handler: handlerType) => Promise<void>, TwitterOpenApiClient]>;
+export declare const twitterSnapPuppeteer: (headless?: boolean, userDataDir?: string) => Promise<readonly [({ id, limit, type }: tweetApiSnapParam, handler: handlerType) => Promise<void>, TwitterOpenApiClient]>;
+export declare const twitterSnapCookies: (path: string) => Promise<readonly [({ id, limit, type }: tweetApiSnapParam, handler: handlerType) => Promise<void>, TwitterOpenApiClient]>;
 type tweetApiSnapParam = {
     id: string;
+    limit: number;
     type?: 'getTweetResultByRestId' | keyof GetTweetApi;
-    max: number;
 };
-type HandlerTypeLiteral = 'start' | 'image' | 'video';
+type handlerType = (e: ReturnType<typeof twitterRender>) => Promise<void>;
+type HandlerTypeLiteral = 'image' | 'start' | 'video';
 export type HandlerType = {
+    id: string;
     type: HandlerTypeLiteral;
     user: string;
-    id: string;
 };
 type twitterRenderParam = {
+    handler?: (e: HandlerType) => void;
+    output: string;
     themeName: ThemeNameType;
     themeParam: ThemeParamType;
-    output: string;
-    handler?: (e: HandlerType) => void;
 };
-declare const twitterRender: (data: TweetApiUtilsData) => ({ themeName, themeParam, output, handler }: twitterRenderParam) => Promise<({ cleanup }: FinalizeParam) => Promise<void>>;
+declare const twitterRender: (data: TweetApiUtilsData, count: number) => ({ handler, output, themeName, themeParam }: twitterRenderParam) => Promise<({ cleanup }: FinalizeParam) => Promise<void>>;
 type FinalizeParam = {
     cleanup: boolean;
 };

package/dist/core/core.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"core.d.ts","sourceRoot":"","sources":["../../src/core/core.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,iBAAiB,EAAuC,MAAM,4BAA4B,CAAA;AAGlG,OAAO,EAAC,aAAa,EAAY,MAAM,mBAAmB,CAAA;AAC1D,OAAO,EAAC,WAAW,EAAE,cAAc,EAAe,MAAM,mBAAmB,CAAA;AAE3E,eAAO,MAAM,gBAAgB,oCA4CR,iBAAiB,eACrB,WAAW,oBAAoB,CAAC,KAAK,QAAQ,IAAI,CAAC,mBAzClE,CAAA;AAED,eAAO,MAAM,oBAAoB,cAAqB,OAAO,gBAAgB,MAAM,iCAsC9D,iBAAiB,eACrB,WAAW,oBAAoB,CAAC,KAAK,QAAQ,IAAI,CAAC,mBAnBlE,CAAA;AAED,eAAO,MAAM,kBAAkB,SAAgB,MAAM,iCAgBhC,iBAAiB,eACrB,WAAW,oBAAoB,CAAC,KAAK,QAAQ,IAAI,CAAC,mBAXlE,CAAA;AAED,KAAK,iBAAiB,GAAG;IACvB,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,CAAC,EAAE,wBAAwB,GAAG,MAAM,WAAW,CAAA;IACnD,GAAG,EAAE,MAAM,CAAA;CACZ,CAAA;AA4CD,KAAK,kBAAkB,GAAG,OAAO,GAAG,OAAO,GAAG,OAAO,CAAA;AACrD,MAAM,MAAM,WAAW,GAAG;IAAC,IAAI,EAAE,kBAAkB,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,MAAM,CAAA;CAAC,CAAA;AAE9E,KAAK,kBAAkB,GAAG;IACxB,SAAS,EAAE,aAAa,CAAA;IACxB,UAAU,EAAE,cAAc,CAAA;IAC1B,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,CAAC,EAAE,CAAC,CAAC,EAAE,WAAW,KAAK,IAAI,CAAA;CACnC,CAAA;AAED,QAAA,MAAM,aAAa,SAAU,iBAAiB,kDAKY,kBAAkB,2BAsDjD,aAAa,mBANvC,CAAA;AAED,KAAK,aAAa,GAAG;IACnB,OAAO,EAAE,OAAO,CAAA;CACjB,CAAA"}
+{"version":3,"file":"core.d.ts","sourceRoot":"","sources":["../../src/core/core.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,iBAAiB,EAAkB,oBAAoB,EAAC,MAAM,4BAA4B,CAAA;AAClG,OAAO,EAAC,aAAa,EAAY,MAAM,mBAAmB,CAAA;AAE1D,OAAO,EAAC,WAAW,EAAE,cAAc,EAAe,MAAM,mBAAmB,CAAA;AAE3E,eAAO,MAAM,gBAAgB,gDA6CM,iBAAiB,WAAW,WAAW,0CAzCzE,CAAA;AAED,eAAO,MAAM,oBAAoB,cAAqB,OAAO,gBAAgB,MAAM,6CAuChD,iBAAiB,WAAW,WAAW,0CAnBzE,CAAA;AAED,eAAO,MAAM,kBAAkB,SAAgB,MAAM,6CAiBlB,iBAAiB,WAAW,WAAW,0CAXzE,CAAA;AAED,KAAK,iBAAiB,GAAG;IACvB,EAAE,EAAE,MAAM,CAAA;IACV,KAAK,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,wBAAwB,GAAG,MAAM,WAAW,CAAA;CACpD,CAAA;AAED,KAAK,WAAW,GAAG,CAAC,CAAC,EAAE,UAAU,CAAC,OAAO,aAAa,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;AAyCzE,KAAK,kBAAkB,GAAG,OAAO,GAAG,OAAO,GAAG,OAAO,CAAA;AACrD,MAAM,MAAM,WAAW,GAAG;IAAC,EAAE,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,kBAAkB,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAC,CAAA;AAE9E,KAAK,kBAAkB,GAAG;IACxB,OAAO,CAAC,EAAE,CAAC,CAAC,EAAE,WAAW,KAAK,IAAI,CAAA;IAClC,MAAM,EAAE,MAAM,CAAA;IACd,SAAS,EAAE,aAAa,CAAA;IACxB,UAAU,EAAE,cAAc,CAAA;CAC3B,CAAA;AAED,QAAA,MAAM,aAAa,SAAU,iBAAiB,SAAS,MAAM,kDAMH,kBAAkB,2BAqExD,aAAa,mBAPhC,CAAA;AAED,KAAK,aAAa,GAAG;IACnB,OAAO,EAAE,OAAO,CAAA;CACjB,CAAA"}

package/dist/core/core.js

@@ -1,62 +1,61 @@
 import { ImageResponse } from '@vercel/og';
-import { promises as fs } from 'fs';
+import { promises as fs } from 'node:fs';
+import { launch } from 'puppeteer';
 import { TwitterOpenApi } from 'twitter-openapi-typescript';
-import puppeteer from 'puppeteer';
 import { themeList } from 'twitter-snap-core';
 import { getTweetList } from '../utils/types.js';
 export const twitterSnapGuest = async () => {
     const twitter = new TwitterOpenApi();
     const api = await twitter.getGuestClient();
-    return tweetApiSnap(api);
+    return [tweetApiSnap(api), api];
 };
 export const twitterSnapPuppeteer = async (headless, userDataDir) => {
-    const browser = await puppeteer.launch({
-        headless: headless,
+    const browser = await launch({
+        headless,
         timeout: 0,
-        userDataDir: userDataDir,
+        userDataDir,
     });
     const [page] = await browser.pages();
     await page.goto('https://twitter.com/login');
     page.setDefaultNavigationTimeout(0);
     page.setDefaultTimeout(0);
-    await page.waitForResponse((res) => {
-        return RegExp('https://twitter.com/i/api/graphql/[a-zA-Z0-9_-]+/HomeTimeline?.*').test(res.url());
-    });
+    const pattern = 'https://twitter.com/i/api/graphql/[a-zA-Z0-9_-]+/HomeTimeline?.*';
+    await page.waitForResponse((res) => new RegExp(pattern).test(res.url()));
     const cookies = await page.cookies();
     await browser.close();
     const twitter = new TwitterOpenApi();
-    const api = await twitter.getClientFromCookies(cookies.reduce((acc, e) => ({ ...acc, [e.name]: e.value }), {}));
-    return tweetApiSnap(api);
+    const api = await twitter.getClientFromCookies(Object.fromEntries(cookies.map((e) => [e.name, e.value])));
+    return [tweetApiSnap(api), api];
 };
 export const twitterSnapCookies = async (path) => {
-    const data = await fs.readFile(path, 'utf-8');
+    const data = await fs.readFile(path, 'utf8');
     const cookies = JSON.parse(data);
     const twitter = new TwitterOpenApi();
-    const api = await twitter.getClientFromCookies(cookies.reduce((acc, e) => ({ ...acc, [e.name]: e.value }), {}));
-    return tweetApiSnap(api);
+    const api = await twitter.getClientFromCookies(Object.fromEntries(cookies.map((e) => [e.name, e.value])));
+    return [tweetApiSnap(api), api];
 };
 const tweetApiSnap = (client) => {
-    return async ({ id, type, max }, handler) => {
-        const key = getTweetList.find((k) => k == type);
+    return async ({ id, limit, type }, handler) => {
+        const key = getTweetList.find((k) => k === type);
         if (key) {
             const that = client.getTweetApi();
             const api = that[key].bind(that);
             let count = 0;
             const cursor = [];
-            while (count < max) {
+            while (count < limit) {
                 const res = await api({
+                    cursor: cursor.length > 0 ? cursor.pop() : undefined,
                     focalTweetId: id,
-                    rawQuery: id,
                     listId: id,
+                    rawQuery: id,
                     userId: id,
-                    cursor: cursor.length ? cursor.pop() : undefined,
                 });
                 for (const e of res.data.data) {
                     if (e.promotedMetadata)
                         continue;
-                    if (count >= max)
+                    if (count >= limit)
                         return;
-                    await handler(twitterRender(e));
+                    await handler(twitterRender(e, count));
                     count++;
                 }
                 if (res.data.cursor.bottom) {
@@ -72,37 +71,51 @@ const tweetApiSnap = (client) => {
                 tweetId: id,
             });
             if (res.data)
-                await handler(twitterRender(res.data));
+                await handler(twitterRender(res.data, 0));
         }
     };
 };
-const twitterRender = (data) => {
+const twitterRender = (data, count) => {
+    const legacy = data.tweet.legacy;
     const extEntities = data.tweet.legacy?.extendedEntities;
     const extMedia = extEntities?.media ?? [];
-    const isVideoData = !!extMedia.find((e) => e.type !== 'photo');
-    return async ({ themeName, themeParam, output, handler }) => {
-        handler && handler({ type: 'start', user: data.user.legacy.screenName, id: data.tweet.restId });
-        const theme = Object.entries(themeList).find(([k, _]) => k == themeName)?.[1];
-        const replacData = [
+    const isVideoData = extMedia.some((e) => e.type !== 'photo');
+    return async ({ handler, output, themeName, themeParam }) => {
+        handler && handler({ id: data.tweet.restId, type: 'start', user: data.user.legacy.screenName });
+        const Theme = Object.entries(themeList).find(([k, _]) => k === themeName)[1];
+        const replaceData = [
             ['{id}', data.tweet.restId],
             ['{user-screen-name}', data.user.legacy.screenName],
             ['{if-photo:(?<true>.+?):(?<false>.+?)}', isVideoData ? '$2' : '$1'],
+            ['{count}', count.toString()],
+            ['{time-now-yyyy}', new Date().getFullYear().toString().padStart(4, '0')],
+            ['{time-now-mm}', (new Date().getMonth() + 1).toString().padStart(2, '0')],
+            ['{time-now-dd}', new Date().getDate().toString().padStart(2, '0')],
+            ['{time-now-hh}', new Date().getHours().toString().padStart(2, '0')],
+            ['{time-now-mi}', new Date().getMinutes().toString().padStart(2, '0')],
+            ['{time-now-ss}', new Date().getSeconds().toString().padStart(2, '0')],
+            ['{time-tweet-yyyy}', new Date(legacy.createdAt).getFullYear().toString().padStart(4, '0')],
+            ['{time-tweet-mm}', (new Date(legacy.createdAt).getMonth() + 1).toString().padStart(2, '0')],
+            ['{time-tweet-dd}', new Date(legacy.createdAt).getDate().toString().padStart(2, '0')],
+            ['{time-tweet-hh}', new Date(legacy.createdAt).getHours().toString().padStart(2, '0')],
+            ['{time-tweet-mi}', new Date(legacy.createdAt).getMinutes().toString().padStart(2, '0')],
+            ['{time-tweet-ss}', new Date(legacy.createdAt).getSeconds().toString().padStart(2, '0')],
         ];
-        const repOutput = replacData.reduce((acc, [k, v]) => acc.replace(new RegExp(k, 'g'), v), output);
-        const video = repOutput.split('.').pop() != 'png';
-        const pngOutput = video ? repOutput.replace(/\.\w+$/, '.png') : repOutput;
-        const render = new theme({
+        const repOutput = replaceData.reduce((acc, [k, v]) => acc.replaceAll(new RegExp(k, 'g'), v), output);
+        const video = repOutput.split('.').pop() !== 'png';
+        const pngOutput = video ? repOutput.split('.').slice(0, -1).join('.') + '.png' : repOutput;
+        const render = new Theme({
             ...themeParam,
-            video: video,
+            video,
         });
-        handler && handler({ type: 'image', user: data.user.legacy.screenName, id: data.tweet.restId });
+        handler && handler({ id: data.tweet.restId, type: 'image', user: data.user.legacy.screenName });
         const element = render.imageRender({
-            data: data,
+            data,
         });
         const img = new ImageResponse(element, {
-            width: themeParam.width,
-            height: undefined,
             emoji: 'twemoji',
+            height: undefined,
+            width: themeParam.width,
         });
         const png = Buffer.from(await img.arrayBuffer());
         if (pngOutput.split('/').length > 1) {
@@ -110,24 +123,20 @@ const twitterRender = (data) => {
         }
         await fs.writeFile(pngOutput, png);
         if (video) {
-            handler && handler({ type: 'video', user: data.user.legacy.screenName, id: data.tweet.restId });
+            handler && handler({ id: data.tweet.restId, type: 'video', user: data.user.legacy.screenName });
             const res = await render.videoRender({
-                data: data,
+                data,
                 image: pngOutput,
                 output: repOutput,
             });
             return finalize(res.temp);
         }
-        else {
-            return finalize([]);
-        }
+        return finalize([]);
     };
 };
-const finalize = async (temp) => {
-    return async ({ cleanup }) => {
-        if (cleanup) {
-            temp.forEach(async (e) => await fs.unlink(e));
-        }
-    };
+const finalize = async (temp) => async ({ cleanup }) => {
+    if (cleanup) {
+        await Promise.all(temp.map((e) => fs.rm(e)));
+    }
 };
 //# sourceMappingURL=core.js.map