parse-comcigan 0.0.5 → 0.2.0

package/README.md

@@ -7,7 +7,7 @@
 ## 경고
 
 본 라이브러리는 **비공식적**으로 컴시간알리미의 데이터를 파싱합니다.  
-상업적으로 사용하다 문제가 발생할경우, **제작자는 책임을 지지 않습니다.**
+상업적으로 사용하다 문제가 발생할경우, **제작자는 책임을 지지 않습니다.**  
 
 ## 설치
 
@@ -25,6 +25,7 @@ Comcigan 클래스의 인스턴스를 생성하여 사용합니다.
 |cacheMs|number|0|캐시될 시간(밀리초)입니다. 0일때 캐시를 비활성화합니다.|
 |doNotThrow|boolean|true|[Axios](https://axios-http.com/)에서 validateStatus를 항상 true로 반환할 지에 대한 여부입니다.|
 |debug|(msg: string) => any|undefined|디버그 메시지를 처리하는 콜백입니다. 이 콜백은 주로 컴시간과 통신할 때 호출됩니다.|
+|appVersion|string|2.11|컴시간알리미 안드로이드 앱의 버전입니다.|
 
 ```typescript
 import Comcigan from 'parse-comcigan';
@@ -141,6 +142,16 @@ comci.GetClassList(96211).then(data => {
 
 ## 업데이트 로그
 
+### 0.2.0
+
+- 버전 넘버링 수정
+- 앱 버전 수정 기능 추가
+- 시간표 버그 수정
+
+### 0.0.6
+
+- 모듈이 불러와지지 않던 버그 수정
+
 ### 0.0.5
 
 - 문서의 많은 오류 수정

package/dist/cache.d.ts

@@ -0,0 +1,8 @@
+export default class Cache {
+    private _cacheStorage;
+    register(id: string, data: any, duration: number): void;
+    delete(id: string): void;
+    clear(): void;
+    has(id: string): boolean;
+    get(id: string): any;
+}

package/dist/cache.js

@@ -0,0 +1,32 @@
+export default class Cache {
+    constructor() {
+        this._cacheStorage = {};
+    }
+    register(id, data, duration) {
+        this._cacheStorage[id] = {
+            "timeout": setTimeout(() => {
+                delete this._cacheStorage[id];
+            }, duration),
+            "data": data
+        };
+    }
+    delete(id) {
+        clearTimeout(this._cacheStorage[id].timeout);
+        delete this._cacheStorage[id];
+    }
+    clear() {
+        const caches = Object.keys(this._cacheStorage);
+        for (let cache of caches) {
+            clearTimeout(this._cacheStorage[cache].timeout);
+            delete this._cacheStorage[cache];
+        }
+    }
+    has(id) {
+        return Boolean(this._cacheStorage[id]);
+    }
+    get(id) {
+        var _a;
+        return (_a = this._cacheStorage[id]) === null || _a === void 0 ? void 0 : _a.data;
+    }
+}
+//# sourceMappingURL=cache.js.map

package/dist/cache.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"cache.js","sourceRoot":"","sources":["../src/cache.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,OAAO,OAAO,KAAK;IAA1B;QACY,kBAAa,GAGhB,EAAE,CAAC;IA2BZ,CAAC;IAzBU,QAAQ,CAAC,EAAU,EAAE,IAAS,EAAE,QAAgB;QACnD,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,GAAG;YACrB,SAAS,EAAE,UAAU,CAAC,GAAG,EAAE;gBACvB,OAAO,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;YAClC,CAAC,EAAE,QAAQ,CAAC;YACZ,MAAM,EAAE,IAAI;SACf,CAAC;IACN,CAAC;IACM,MAAM,CAAC,EAAU;QACpB,YAAY,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC;QAC7C,OAAO,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;IAClC,CAAC;IACM,KAAK;QACR,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAC/C,KAAK,IAAI,KAAK,IAAI,MAAM,EAAE,CAAC;YACvB,YAAY,CAAC,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC;YAChD,OAAO,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QACrC,CAAC;IACL,CAAC;IACM,GAAG,CAAC,EAAU;QACjB,OAAO,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC,CAAC;IAC3C,CAAC;IACM,GAAG,CAAC,EAAU;;QACjB,OAAO,MAAA,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,0CAAE,IAAI,CAAC;IACxC,CAAC;CACJ"}

package/dist/index.d.ts

@@ -0,0 +1,138 @@
+export type GetTimetableOptions = {
+    /**
+     * 컴시간 학교 코드입니다.
+     */
+    "schoolCode": number;
+    /**
+     * 구분을 어떻게 할지 여부입니다.
+     *
+     * - weekday로 설정하면 시간표[교시][요일]로 과목과 선생님을 불러옵니다.
+     * - period로 설정하면 시간표[요일][교시]로 과목과 선생님을 불러옵니다.
+     */
+    "criteria": "weekday" | "period";
+    /**
+     * 학년입니다.
+     */
+    "grade": number;
+    /**
+     * 반입니다.
+     */
+    "classN": number;
+    /**
+     * 8교시를 빼고 리턴할지 여부입니다.
+     */
+    "without8th"?: boolean;
+};
+export interface ComciganInitializeType {
+    /**
+     * 이 기간동안 컴시간과 통신한 데이터가 캐시됩니다.
+     *
+     * 기본값은 0ms이며, 0ms일때는 캐시를 하지 않습니다.
+     */
+    cacheMs?: number;
+    /**
+     * axios에서 요청을 보내고 status가 오류 status일 때 throw할 지 여부입니다.
+     * 만약 false일 때 요청에 status가 오류 status면 그 타입에서 빈 값을 리턴합니다.
+     *
+     * 기본값은 false입니다.
+     */
+    doNotThrow?: boolean;
+    /**
+     * 디버그 메시지를 파라메터로 받습니다.
+     *
+     * 기본값은 없습니다.
+     */
+    debug?: (msg: string) => any;
+    /**
+     * 컴시간알리미의 앱 버전입니다.
+     *
+     * 기본값은 2.11입니다.
+     */
+    appVersion?: string;
+}
+export type ComciganSearched = {
+    /**
+     * 학교의 지역입니다.
+     */
+    region: string;
+    /**
+     * 학교의 이름입니다.
+     */
+    name: string;
+    /**
+     * 학교의 코드입니다.
+     */
+    code: number;
+};
+export type ComciganTimetableObject = {
+    /**
+     * 과목입니다.
+     */
+    subject: string;
+    /**
+     * 교사 성명입니다.
+     */
+    teacher: string;
+    /**
+     * 만약 변경되었을때 이 값이 주어집니다.
+     */
+    original?: {
+        /**
+         * 과목입니다.
+         */
+        subject: string;
+        /**
+         * 교사 성명입니다.
+         */
+        teacher: string;
+    };
+};
+export type ComciganTimetable = {
+    /**
+     * 컴시간알리미 앱의 최신 버전입니다.
+     */
+    latestVersion: string;
+    /**
+     * 수정일입니다.
+     */
+    changed: string;
+    /**
+     * 시간표입니다.
+     */
+    timetable: ComciganTimetableObject[][];
+};
+export default class Comcigan {
+    private _options;
+    private _cache;
+    private mSb;
+    private mTh;
+    private unusable;
+    private request;
+    private EUC_KR_encodeURI;
+    /**
+     * 파서를 초기화 합니다.
+     * @param options 파서의 옵션입니다.
+     */
+    constructor(options?: ComciganInitializeType);
+    /**
+     * 학교를 검색합니다.
+     * 마지막 "없으면 추가 검색 하세요" 문구는 빠져서 나옵니다.
+     * @param query 검색어
+     * @returns 검색된 학교들
+     */
+    SearchSchool(query: string): Promise<ComciganSearched[]>;
+    /**
+     * 시간표를 가져옵니다.
+     *
+     * @param schoolCode
+     * @param criteria
+     */
+    GetTimetable(options: GetTimetableOptions): Promise<ComciganTimetable | undefined>;
+    /**
+     * 학급 목록을 가져옵니다.
+     *
+     * @param schoolCode 학교 코드입니다.
+     * @returns (학년)-(반) 문자열이 모인 배열
+     */
+    GetClassList(schoolCode: number): Promise<string[]>;
+}

package/dist/index.js

@@ -0,0 +1,216 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+import axios from 'axios';
+import iconv from 'iconv-lite';
+import Cache from './cache.js';
+//#endregion
+export default class Comcigan {
+    mSb(mm, m2) { if (m2 == 100) {
+        return mm % m2;
+    } return Math.floor(mm / m2); }
+    mTh(mm, m2) { if (m2 == 100) {
+        return Math.floor(mm / m2);
+    } return mm % m2; }
+    unusable(object, array) {
+        if (object === array[0])
+            return;
+        return object;
+    }
+    request(route, doNotParse) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this._cache.has(route)) {
+                this._options.debug ? this._options.debug(`[request] Return cache with id registered as ${route}`) : 0;
+                return this._cache.get(route);
+            }
+            this._options.debug ? this._options.debug(`[request] Requesting to http://comci.kr:4081/${route}`) : 0;
+            const r = yield axios.get(`http://comci.kr:4081/${route}`, Object.assign({}, (this._options.doNotThrow && { "validateStatus": () => true })));
+            if (doNotParse) {
+                if (this._options.cacheMs && this._options.cacheMs !== 0) {
+                    this._options.debug ? this._options.debug(`[request] Registered cache with id ${route}`) : 0;
+                    this._cache.register(route, r.data, this._options.cacheMs);
+                }
+                return r.data;
+            }
+            const data = JSON.parse(r.data.slice(0, r.data.indexOf("}") + 1));
+            if (this._options.cacheMs && this._options.cacheMs !== 0) {
+                this._options.debug ? this._options.debug(`[request] Registered cache with id ${route}`) : 0;
+                this._cache.register(route, data, this._options.cacheMs);
+            }
+            return data;
+        });
+    }
+    EUC_KR_encodeURI(str) {
+        const buffer = iconv.encode(str, 'euc-kr');
+        return Array.from(buffer)
+            .map((byte) => '%' + byte.toString(16).toUpperCase().padStart(2, '0'))
+            .join('');
+    }
+    /**
+     * 파서를 초기화 합니다.
+     * @param options 파서의 옵션입니다.
+     */
+    constructor(options) {
+        this._options = {
+            "cacheMs": 0,
+            "doNotThrow": false,
+            "appVersion": "2.11",
+        };
+        this._cache = new Cache();
+        this._options = Object.assign(Object.assign({}, this._options), options);
+    }
+    /**
+     * 학교를 검색합니다.
+     * 마지막 "없으면 추가 검색 하세요" 문구는 빠져서 나옵니다.
+     * @param query 검색어
+     * @returns 검색된 학교들
+     */
+    SearchSchool(query) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const r = yield this.request(`sc_${this.EUC_KR_encodeURI(query)}`);
+            return r.학교검색.map(v => ({
+                "region": v[1],
+                "name": v[2],
+                "code": v[3]
+            })).filter(v => v.code !== 0);
+        });
+    }
+    /**
+     * 시간표를 가져옵니다.
+     *
+     * @param schoolCode
+     * @param criteria
+     */
+    GetTimetable(options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b, _c, _d, _e, _f, _g;
+            const { schoolCode, criteria, grade, classN, without8th } = options;
+            const { appVersion } = this._options;
+            const str = `36174_${schoolCode}_1_4_0_3_${appVersion}`;
+            const route = (str.substring(9) + str.substring(0, 9)).split("").reverse().join("");
+            const data = yield this.request(`7813?${route}`, true);
+            const [latestVersion, step1] = data.split("^");
+            const edited = step1.substring(0, step1.indexOf("{"));
+            const step2 = step1.slice(step1.indexOf("{"));
+            const json = JSON.parse(step2.slice(0, step2.indexOf("}") + 1));
+            const WEEKDAY = ["월", "화", "수", "목", "금"];
+            const sep = (_a = json.분리) !== null && _a !== void 0 ? _a : 100;
+            if (!json.시간표)
+                return undefined;
+            // 시간표[학년][반][요일][교시]
+            const origin = json.시간표[grade][classN];
+            const today = json.학급시간표[grade][classN];
+            const toReturn = [];
+            if (criteria === "period") {
+                for (let weekday = 1; weekday < WEEKDAY.length + 1; weekday++) {
+                    const weekdayList = [];
+                    for (let period = 1; period < (without8th ? 8 : 9); period++) {
+                        const o = origin[weekday][period];
+                        const t = today[weekday][period];
+                        if (o === undefined || t === undefined) {
+                            weekdayList.push({
+                                "subject": "-",
+                                "teacher": "-"
+                            });
+                            continue;
+                        }
+                        const originSubject = json.과목명[this.mSb(o, sep) % sep];
+                        const originTeacher = json.성명[this.mTh(o, sep) % sep];
+                        if (o === t) {
+                            weekdayList.push({
+                                "subject": (_b = this.unusable(originSubject, json.과목명)) !== null && _b !== void 0 ? _b : "-",
+                                "teacher": (_c = this.unusable(originTeacher, json.성명)) !== null && _c !== void 0 ? _c : "-"
+                            });
+                            continue;
+                        }
+                        const changedSubject = json.과목명[this.mSb(t, sep) % sep];
+                        const changedTeacher = json.성명[this.mTh(t, sep) % sep];
+                        weekdayList.push({
+                            "subject": (_d = this.unusable(changedSubject, json.과목명)) !== null && _d !== void 0 ? _d : "-",
+                            "teacher": (_e = this.unusable(changedTeacher, json.성명)) !== null && _e !== void 0 ? _e : "-",
+                            "original": {
+                                "subject": (_f = this.unusable(originSubject, json.과목명)) !== null && _f !== void 0 ? _f : "-",
+                                "teacher": (_g = this.unusable(originTeacher, json.성명)) !== null && _g !== void 0 ? _g : "-",
+                            }
+                        });
+                    }
+                    toReturn.push(weekdayList);
+                }
+            }
+            else {
+                for (let period = 1; period < (without8th ? 8 : 9); period++) {
+                    const periodList = [];
+                    for (let weekday = 1; weekday < WEEKDAY.length + 1; weekday++) {
+                        const o = origin[weekday][period];
+                        const t = today[weekday][period];
+                        if (!o || !t) {
+                            periodList.push({
+                                "subject": "-",
+                                "teacher": "-"
+                            });
+                            continue;
+                        }
+                        const originSubject = json.과목명[this.mSb(o, sep) % sep];
+                        const originTeacher = json.성명[this.mTh(o, sep) % sep];
+                        if (o === t) {
+                            periodList.push({
+                                "subject": originSubject,
+                                "teacher": originTeacher
+                            });
+                            continue;
+                        }
+                        const changedSubject = json.과목명[this.mSb(t, sep) % sep];
+                        const changedTeacher = json.성명[this.mTh(t, sep) % sep];
+                        periodList.push({
+                            "subject": originSubject,
+                            "teacher": originTeacher,
+                            "original": {
+                                "subject": changedSubject,
+                                "teacher": changedTeacher
+                            }
+                        });
+                    }
+                    toReturn.push(periodList);
+                }
+            }
+            return {
+                "changed": edited,
+                latestVersion,
+                "timetable": toReturn
+            };
+        });
+    }
+    /**
+     * 학급 목록을 가져옵니다.
+     *
+     * @param schoolCode 학교 코드입니다.
+     * @returns (학년)-(반) 문자열이 모인 배열
+     */
+    GetClassList(schoolCode) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const str = `36174_${schoolCode}_1_4_0_3_1.00`;
+            const route = (str.substring(9) + str.substring(0, 9)).split("").reverse().join("");
+            const data = yield this.request(`7813?${route}`, true);
+            const step1 = data.split("^")[1];
+            const step2 = step1.slice(step1.indexOf("{"));
+            const json = JSON.parse(step2.slice(0, step2.indexOf("}") + 1));
+            const rawClasses = json.학급수;
+            if (!rawClasses)
+                return [];
+            const toReturn = [];
+            for (let g = 1; g < rawClasses.length; g++) {
+                for (let c = 1; c < rawClasses[g] + 1; c++) {
+                    toReturn.push(`${g}-${c}`);
+                }
+            }
+            return toReturn;
+        });
+    }
+}
+//# sourceMappingURL=index.js.map

package/dist/index.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "parse-comcigan",
-  "version": "0.0.5",
+  "version": "0.2.0",
   "description": "컴시간 알리미에서 시간표를 가져오는 라이브러리입니다.",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -11,7 +11,9 @@
     "pack": "npm run clean && npm run build",
     "build": "tsc",
     "clean": "tsc --build --clean",
-    "dev": "nodemon --exec ts-node src/index.ts"
+    "dev": "nodemon --exec ts-node src/index.ts",
+    "test": "npm run pack && node \"test.js\"",
+    "publish": "npm run pack && npm publish"
   },
   "devDependencies": {
     "@types/node": "^22.15.30",

package/src/index.ts

@@ -48,6 +48,12 @@ export interface ComciganInitializeType {
      * 기본값은 없습니다.
      */
     debug?: (msg: string) => any;
+    /**
+     * 컴시간알리미의 앱 버전입니다.
+     * 
+     * 기본값은 2.11입니다.
+     */
+    appVersion?: string;
 }
 export type ComciganSearched = {
     /**
@@ -105,13 +111,20 @@ export type ComciganTimetable = {
 export default class Comcigan {
     private _options: ComciganInitializeType = {
         "cacheMs": 0,
-        "doNotThrow": false
+        "doNotThrow": false,
+        "appVersion": "2.11",
     };
     private _cache = new Cache();
 
     private mSb(mm: number, m2: number) { if (m2 == 100) { return mm % m2; } return Math.floor(mm / m2); }
     private mTh(mm: number, m2: number) { if (m2 == 100) { return Math.floor(mm / m2); } return mm % m2; }
 
+    private unusable(object: any, array: any[]) {
+        if (object === array[0]) return;
+
+        return object;
+    }
+
     private async request<T = any>(route: string, doNotParse?: boolean): Promise<T> {
         if (this._cache.has(route)) {
             this._options.debug ? this._options.debug(`[request] Return cache with id registered as ${route}`) : 0;
@@ -181,8 +194,9 @@ export default class Comcigan {
      */
     public async GetTimetable(options: GetTimetableOptions): Promise<ComciganTimetable | undefined> {
         const { schoolCode, criteria, grade, classN, without8th } = options;
+        const { appVersion } = this._options;
 
-        const str = `36174_${schoolCode}_1_4_0_3_1.00`;
+        const str = `36174_${schoolCode}_1_4_0_3_${appVersion}`;
         const route = (str.substring(9) + str.substring(0, 9)).split("").reverse().join("");
         const data = await this.request<string>(`7813?${route}`, true);
 
@@ -209,7 +223,7 @@ export default class Comcigan {
                     const o = origin[weekday][period];
                     const t = today[weekday][period];
 
-                    if (!o || !t) {
+                    if (o === undefined || t === undefined) {
                         weekdayList.push({
                             "subject": "-",
                             "teacher": "-"
@@ -222,8 +236,8 @@ export default class Comcigan {
 
                     if (o === t) {
                         weekdayList.push({
-                            "subject": originSubject,
-                            "teacher": originTeacher
+                            "subject": this.unusable(originSubject, json.과목명) ?? "-",
+                            "teacher": this.unusable(originTeacher, json.성명) ?? "-"
                         });
                         continue;
                     }
@@ -232,11 +246,11 @@ export default class Comcigan {
                     const changedTeacher = json.성명[this.mTh(t, sep) % sep];
 
                     weekdayList.push({
-                        "subject": originSubject,
-                        "teacher": originTeacher,
+                        "subject": this.unusable(changedSubject, json.과목명) ?? "-",
+                        "teacher": this.unusable(changedTeacher, json.성명) ?? "-",
                         "original": {
-                            "subject": changedSubject,
-                            "teacher": changedTeacher
+                            "subject": this.unusable(originSubject, json.과목명) ?? "-",
+                            "teacher": this.unusable(originTeacher, json.성명) ?? "-",
                         }
                     });
                 }